diff --git a/.dockerignore b/.dockerignore
index 9d990ab9ce6..fe87f6e6006 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -5,6 +5,7 @@
 .gitattributes
 .gitignore
 .github
+.vscode
 public/system
 public/assets
 public/packs
@@ -20,6 +21,7 @@ postgres14
 redis
 elasticsearch
 chart
+storybook-static
 .yarn/
 !.yarn/patches
 !.yarn/plugins
diff --git a/.env.production.sample b/.env.production.sample
index 12e3d32be73..52a2838cbf5 100644
--- a/.env.production.sample
+++ b/.env.production.sample
@@ -91,9 +91,6 @@ SESSION_RETENTION_PERIOD=31556952
 
 # Fetch All Replies Behavior
 # --------------------------
-# When a user expands a post (DetailedStatus view), fetch all of its replies
-# (default: false)
-FETCH_REPLIES_ENABLED=false
 
 # Period to wait between fetching replies (in minutes)
 FETCH_REPLIES_COOLDOWN_MINUTES=15
diff --git a/.github/ISSUE_TEMPLATE/1.web_bug_report.yml b/.github/ISSUE_TEMPLATE/1.web_bug_report.yml
index bb4b71dd9f7..2261275a432 100644
--- a/.github/ISSUE_TEMPLATE/1.web_bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/1.web_bug_report.yml
@@ -1,6 +1,6 @@
 name: Bug Report (Web Interface)
 description: There is a problem using Mastodon's web interface.
-labels: ['status/to triage', 'area/web interface']
+labels: ['area/web interface']
 type: Bug
 body:
   - type: markdown
diff --git a/.github/ISSUE_TEMPLATE/2.server_bug_report.yml b/.github/ISSUE_TEMPLATE/2.server_bug_report.yml
index c6d7e8e16b6..99ec9cf146f 100644
--- a/.github/ISSUE_TEMPLATE/2.server_bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/2.server_bug_report.yml
@@ -1,7 +1,6 @@
 name: Bug Report (server / API)
 description: |
   There is a problem with the HTTP server, REST API, ActivityPub interaction, etc.
-labels: ['status/to triage']
 type: 'Bug'
 body:
   - type: markdown
diff --git a/.github/renovate.json5 b/.github/renovate.json5
index 1850a45bbcd..c1a1c99eb70 100644
--- a/.github/renovate.json5
+++ b/.github/renovate.json5
@@ -6,6 +6,7 @@
     ':labels(dependencies)',
     ':prConcurrentLimitNone', // Remove limit for open PRs at any time.
     ':prHourlyLimit2', // Rate limit PR creation to a maximum of two per hour.
+    ':enableVulnerabilityAlertsWithLabel(security)',
   ],
   rebaseWhen: 'conflicted',
   minimumReleaseAge: '3', // Wait 3 days after the package has been published before upgrading it
@@ -23,7 +24,6 @@
       matchManagers: ['npm'],
       matchPackageNames: [
         'tesseract.js', // Requires code changes
-        'react-hotkeys', // Requires code changes
 
         // react-router: Requires manual upgrade
         'history',
@@ -94,6 +94,19 @@
       matchUpdateTypes: ['patch', 'minor'],
       groupName: 'eslint (non-major)',
     },
+    {
+      // Group all Storybook-related packages in the same PR
+      matchManagers: ['npm'],
+      matchPackageNames: [
+        'chromatic',
+        'storybook',
+        '@storybook/*',
+        'msw',
+        'msw-storybook-addon',
+      ],
+      matchUpdateTypes: ['patch', 'minor'],
+      groupName: 'storybook (non-major)',
+    },
     {
       // Group actions/*-artifact in the same PR
       matchManagers: ['github-actions'],
@@ -142,6 +155,12 @@
       matchUpdateTypes: ['patch', 'minor'],
       groupName: 'opentelemetry-ruby (non-major)',
     },
+    {
+      // Group Playwright Ruby & JS deps in the same PR, as they need to be in sync
+      matchManagers: ['bundler', 'npm'],
+      matchPackageNames: ['playwright-ruby-client', 'playwright'],
+      groupName: 'Playwright',
+    },
     // Add labels depending on package manager
     { matchManagers: ['npm', 'nvm'], addLabels: ['javascript'] },
     { matchManagers: ['bundler', 'ruby-version'], addLabels: ['ruby'] },
diff --git a/.github/workflows/build-security.yml b/.github/workflows/build-security.yml
index d3cb4e5e0ae..72729b544b3 100644
--- a/.github/workflows/build-security.yml
+++ b/.github/workflows/build-security.yml
@@ -9,7 +9,6 @@ permissions:
 jobs:
   compute-suffix:
     runs-on: ubuntu-latest
-    if: github.repository == 'mastodon/mastodon'
     steps:
       - id: version_vars
         env:
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 8690e9ed6d1..c864e12d2d8 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -25,8 +25,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        language: ['javascript', 'ruby']
-        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
+        language: ['actions', 'javascript', 'ruby']
+        # CodeQL supports [ 'actions', 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
         # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
 
     steps:
diff --git a/.github/workflows/crowdin-download-stable.yml b/.github/workflows/crowdin-download-stable.yml
index 6d9a0586298..8e18a9d0a0f 100644
--- a/.github/workflows/crowdin-download-stable.yml
+++ b/.github/workflows/crowdin-download-stable.yml
@@ -50,7 +50,7 @@ jobs:
 
       # Create or update the pull request
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v7.0.6
+        uses: peter-evans/create-pull-request@v7.0.8
         with:
           commit-message: 'New Crowdin translations'
           title: 'New Crowdin Translations for ${{ github.base_ref || github.ref_name }} (automated)'
diff --git a/.github/workflows/crowdin-upload.yml b/.github/workflows/crowdin-upload.yml
index 4f4d917d15a..d0d79d91996 100644
--- a/.github/workflows/crowdin-upload.yml
+++ b/.github/workflows/crowdin-upload.yml
@@ -14,6 +14,7 @@ on:
       - config/locales/devise.en.yml
       - config/locales/doorkeeper.en.yml
       - .github/workflows/crowdin-upload.yml
+  workflow_dispatch:
 
 jobs:
   upload-translations:
diff --git a/.nvmrc b/.nvmrc
index 4a203c23d83..403f75d0382 100644
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-22.17
+22.20
diff --git a/.rubocop/metrics.yml b/.rubocop/metrics.yml
index 89532af42ab..bb15e6ff313 100644
--- a/.rubocop/metrics.yml
+++ b/.rubocop/metrics.yml
@@ -1,17 +1,21 @@
 ---
 Metrics/AbcSize:
-  Exclude:
-    - lib/mastodon/cli/*.rb
+  Enabled: false
 
 Metrics/BlockLength:
   Enabled: false
 
+Metrics/BlockNesting:
+  Enabled: false
+
 Metrics/ClassLength:
   Enabled: false
 
+Metrics/CollectionLiteralLength:
+  Enabled: false
+
 Metrics/CyclomaticComplexity:
-  Exclude:
-    - lib/mastodon/cli/*.rb
+  Enabled: false
 
 Metrics/MethodLength:
   Enabled: false
@@ -20,4 +24,7 @@ Metrics/ModuleLength:
   Enabled: false
 
 Metrics/ParameterLists:
-  CountKeywordArgs: false
+  Enabled: false
+
+Metrics/PerceivedComplexity:
+  Enabled: false
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 4ec92f34121..0cc9c8d8fc1 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,32 +1,11 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config --auto-gen-only-exclude --no-offense-counts --no-auto-gen-timestamp`
-# using RuboCop version 1.77.0.
+# using RuboCop version 1.80.2.
 # 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
 # versions of RuboCop, may require this file to be generated again.
 
-Lint/NonLocalExitFromIterator:
-  Exclude:
-    - 'app/helpers/json_ld_helper.rb'
-
-# Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes.
-Metrics/AbcSize:
-  Max: 82
-
-# Configuration parameters: CountBlocks, CountModifierForms, Max.
-Metrics/BlockNesting:
-  Exclude:
-    - 'lib/tasks/mastodon.rake'
-
-# Configuration parameters: AllowedMethods, AllowedPatterns.
-Metrics/CyclomaticComplexity:
-  Max: 25
-
-# Configuration parameters: AllowedMethods, AllowedPatterns.
-Metrics/PerceivedComplexity:
-  Max: 27
-
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowedVars, DefaultToNil.
 Style/FetchEnvVar:
diff --git a/.ruby-version b/.ruby-version
index f9892605c75..2aa51319921 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-3.4.4
+3.4.7
diff --git a/.storybook/main.ts b/.storybook/main.ts
index 72321cbf3f1..bb69f0c6649 100644
--- a/.storybook/main.ts
+++ b/.storybook/main.ts
@@ -1,3 +1,5 @@
+import { resolve } from 'node:path';
+
 import type { StorybookConfig } from '@storybook/react-vite';
 
 const config: StorybookConfig = {
@@ -26,6 +28,12 @@ const config: StorybookConfig = {
       'oops.png',
     ].map((path) => ({ from: `../public/${path}`, to: `/${path}` })),
   ],
+  viteFinal(config) {
+    // For an unknown reason, Storybook does not use the root
+    // from the Vite config so we need to set it manually.
+    config.root = resolve(__dirname, '../app/javascript');
+    return config;
+  },
 };
 
 export default config;
diff --git a/.storybook/preview-body.html b/.storybook/preview-body.html
new file mode 100644
index 00000000000..1870d95b8fe
--- /dev/null
+++ b/.storybook/preview-body.html
@@ -0,0 +1,2 @@
+<html class="no-reduce-motion">
+</html>
\ No newline at end of file
diff --git a/.storybook/preview.tsx b/.storybook/preview.tsx
index f25d0547e83..d66f0fb11a8 100644
--- a/.storybook/preview.tsx
+++ b/.storybook/preview.tsx
@@ -12,13 +12,14 @@ import { initialize, mswLoader } from 'msw-storybook-addon';
 import { action } from 'storybook/actions';
 
 import type { LocaleData } from '@/mastodon/locales';
-import { reducerWithInitialState, rootReducer } from '@/mastodon/reducers';
+import { reducerWithInitialState } from '@/mastodon/reducers';
 import { defaultMiddleware } from '@/mastodon/store/store';
 import { mockHandlers, unhandledRequestHandler } from '@/testing/api';
 
 // If you want to run the dark theme during development,
 // you can change the below to `/application.scss`
 import '../app/javascript/styles/mastodon-light.scss';
+import './styles.css';
 
 const localeFiles = import.meta.glob('@/mastodon/locales/*.json', {
   query: { as: 'json' },
@@ -49,12 +50,23 @@ const preview: Preview = {
     locale: 'en',
   },
   decorators: [
-    (Story, { parameters }) => {
+    (Story, { parameters, globals, args }) => {
+      // Get the locale from the global toolbar
+      // and merge it with any parameters or args state.
+      const { locale } = globals as { locale: string };
       const { state = {} } = parameters;
-      let reducer = rootReducer;
-      if (typeof state === 'object' && state) {
-        reducer = reducerWithInitialState(state as Record<string, unknown>);
-      }
+      const { state: argsState = {} } = args;
+
+      const reducer = reducerWithInitialState(
+        {
+          meta: {
+            locale,
+          },
+        },
+        state as Record<string, unknown>,
+        argsState as Record<string, unknown>,
+      );
+
       const store = configureStore({
         reducer,
         middleware(getDefaultMiddleware) {
diff --git a/.storybook/static/mockServiceWorker.js b/.storybook/static/mockServiceWorker.js
index de7bc0f292d..15623f1090b 100644
--- a/.storybook/static/mockServiceWorker.js
+++ b/.storybook/static/mockServiceWorker.js
@@ -7,8 +7,8 @@
  * - Please do NOT modify this file.
  */
 
-const PACKAGE_VERSION = '2.10.2'
-const INTEGRITY_CHECKSUM = 'f5825c521429caf22a4dd13b66e243af'
+const PACKAGE_VERSION = '2.11.3'
+const INTEGRITY_CHECKSUM = '4db4a41e972cec1b64cc569c66952d82'
 const IS_MOCKED_RESPONSE = Symbol('isMockedResponse')
 const activeClientIds = new Set()
 
@@ -71,11 +71,6 @@ addEventListener('message', async function (event) {
       break
     }
 
-    case 'MOCK_DEACTIVATE': {
-      activeClientIds.delete(clientId)
-      break
-    }
-
     case 'CLIENT_CLOSED': {
       activeClientIds.delete(clientId)
 
@@ -94,6 +89,8 @@ addEventListener('message', async function (event) {
 })
 
 addEventListener('fetch', function (event) {
+  const requestInterceptedAt = Date.now()
+
   // Bypass navigation requests.
   if (event.request.mode === 'navigate') {
     return
@@ -110,23 +107,29 @@ addEventListener('fetch', function (event) {
 
   // Bypass all requests when there are no active clients.
   // Prevents the self-unregistered worked from handling requests
-  // after it's been deleted (still remains active until the next reload).
+  // after it's been terminated (still remains active until the next reload).
   if (activeClientIds.size === 0) {
     return
   }
 
   const requestId = crypto.randomUUID()
-  event.respondWith(handleRequest(event, requestId))
+  event.respondWith(handleRequest(event, requestId, requestInterceptedAt))
 })
 
 /**
  * @param {FetchEvent} event
  * @param {string} requestId
+ * @param {number} requestInterceptedAt
  */
-async function handleRequest(event, requestId) {
+async function handleRequest(event, requestId, requestInterceptedAt) {
   const client = await resolveMainClient(event)
   const requestCloneForEvents = event.request.clone()
-  const response = await getResponse(event, client, requestId)
+  const response = await getResponse(
+    event,
+    client,
+    requestId,
+    requestInterceptedAt,
+  )
 
   // Send back the response clone for the "response:*" life-cycle events.
   // Ensure MSW is active and ready to handle the message, otherwise
@@ -204,7 +207,7 @@ async function resolveMainClient(event) {
  * @param {string} requestId
  * @returns {Promise<Response>}
  */
-async function getResponse(event, client, requestId) {
+async function getResponse(event, client, requestId, requestInterceptedAt) {
   // Clone the request because it might've been already used
   // (i.e. its body has been read and sent to the client).
   const requestClone = event.request.clone()
@@ -255,6 +258,7 @@ async function getResponse(event, client, requestId) {
       type: 'REQUEST',
       payload: {
         id: requestId,
+        interceptedAt: requestInterceptedAt,
         ...serializedRequest,
       },
     },
diff --git a/.storybook/styles.css b/.storybook/styles.css
new file mode 100644
index 00000000000..ac29890895e
--- /dev/null
+++ b/.storybook/styles.css
@@ -0,0 +1,8 @@
+a {
+  color: inherit;
+  text-decoration: none;
+}
+
+a:hover {
+  text-decoration: underline;
+}
diff --git a/CHANGELOG.md b/CHANGELOG.md
index efdd3adf120..249596dc055 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,129 @@
 
 All notable changes to this project will be documented in this file.
 
-## [4.4.0] - UNRELEASED
+## [4.4.6] - 2025-10-13
+
+### Security
+
+- Update dependencies `rack` and `uri`
+- Fix streaming server connection not being closed on user suspension (by @ThisIsMissEm, [GHSA-r2fh-jr9c-9pxh](https://github.com/mastodon/mastodon/security/advisories/GHSA-r2fh-jr9c-9pxh))
+- Fix password change through admin CLI not invalidating existing sessions and access tokens (by @ThisIsMissEm, [GHSA-f3q3-rmf7-9655](https://github.com/mastodon/mastodon/security/advisories/GHSA-f3q3-rmf7-9655))
+- Fix streaming server allowing access to public timelines even without the `read` or `read:statuses` OAuth scopes (by @ThisIsMissEm, [GHSA-7gwh-mw97-qjgp](https://github.com/mastodon/mastodon/security/advisories/GHSA-7gwh-mw97-qjgp))
+
+### Added
+
+- Add support for processing quotes of deleted posts signaled through a `Tombstone` (#36381 by @ClearlyClaire)
+
+### Fixed
+
+- Fix quote post state sometimes not being updated through streaming server (#36408 by @ClearlyClaire)
+- Fix inconsistent “pending tags” count on admin dashboard (#36404 by @mjankowski)
+- Fix JSON payload being potentially mutated when processing interaction policies (#36392 by @ClearlyClaire)
+- Fix quotes not being displayed in email notifications (#36379 by @diondiondion)
+- Fix redirect to external object when URL is missing or malformed (#36347 by @ClearlyClaire)
+- Fix quotes not being displayed in the featured carousel (#36335 by @diondiondion)
+
+## [4.4.5] - 2025-09-23
+
+### Security
+
+- Update dependencies
+
+### Added
+
+- Add support for `has:quote` in search (#36217 by @ClearlyClaire)
+
+### Changed
+
+- Change quoted posts from silenced accounts to use a click-through rather than being hidden (#36166 and #36167 by @ClearlyClaire)
+
+### Fixed
+
+- Fix processing of out-of-order `Update` as implicit updates (#36190 by @ClearlyClaire)
+- Fix getting `Create` and `Update` out of order (#36176 by @ClearlyClaire)
+- Fix quotes with Content Warnings but no text being shown without Content Warnings (#36150 by @ClearlyClaire)
+
+## [4.4.4] - 2025-09-16
+
+### Security
+
+- Update dependencies
+
+### Fixed
+
+- Fix missing memoization in `Web::PushNotificationWorker` (#36085 by @ClearlyClaire)
+- Fix unresponsive areas around GIFV modals in some cases (#36059 by @ClearlyClaire)
+- Fix missing `beforeUnload` confirmation when a poll is being authored (#36030 by @ClearlyClaire)
+- Fix processing of remote edited statuses with new media and no text (#35970 by @unfokus)
+- Fix polls not being displayed in moderation interface (#35644 and #35933 by @ThisIsMissEm)
+- Fix WebUI handling of deleted quoted posts (#35909 and #35918 by @ClearlyClaire and @diondiondion)
+- Fix “Edit” and “Delete & Redraft” on a poll not inserting empty option (#35892 by @ClearlyClaire)
+- Fix loading of some compatibility CSS on some configurations (#35876 by @shleeable)
+- Fix HttpLog not being enabled with `RAILS_LOG_LEVEL=debug` (#35833 by @mjankowski)
+- Fix self-destruct scheduler behavior on some Redis setups (#35823 by @ClearlyClaire)
+- Fix `tootctl admin create` not bypassing reserved username checks (#35779 by @ClearlyClaire)
+- Fix interaction policy changes in implicit updates not being saved (#35751 by @ClearlyClaire)
+- Fix quote revocation not being streamed (#35710 by @ClearlyClaire)
+- Fix export of large user archives by enabling Zip64 (#35850 by @ClearlyClaire)
+
+### Changed
+
+- Change labels for quote policy settings (#35893 by @ClearlyClaire)
+- Change standalone “Share” page to redirect to web interface after posting (#35763 by @ChaosExAnima)
+
+## [4.4.3] - 2025-08-05
+
+### Security
+
+- Update dependencies
+- Fix incorrect rate-limit handling [GHSA-84ch-6436-c7mg](https://github.com/mastodon/mastodon/security/advisories/GHSA-84ch-6436-c7mg)
+
+### Fixed
+
+- Fix race condition caused by ActiveRecord query cache in `Create` critical path (#35662 by @ClearlyClaire)
+- Fix race condition caused by quote post processing (#35657 by @ClearlyClaire)
+- Fix WebUI crashing for accounts with `null` URL (#35651 by @ClearlyClaire)
+- Fix friends-of-friends recommendations suggesting already-requested accounts (#35604 by @ClearlyClaire)
+- Fix synchronous recursive fetching of deeply-nested quoted posts (#35600 by @ClearlyClaire)
+- Fix “Expand this post” link including user `@undefined` (#35478 by @ClearlyClaire)
+
+### Changed
+
+- Change `StatusReachFinder` to consider quotes as well as reblogs (#35601 by @ClearlyClaire)
+- Add restrictions on which quote posts can trend (#35507 by @ClearlyClaire)
+- Change quote verification to not bypass authorization flow for mentions (#35528 by @ClearlyClaire)
+
+## [4.4.2] - 2025-07-23
+
+### Security
+
+- Update dependencies
+
+### Fixed
+
+- Fix menu not clickable in Firefox (#35390 and #35414 by @diondiondion)
+- Add `lang` attribute to current composer language in alt text modal (#35412 by @diondiondion)
+- Fix quote posts styling on notifications page (#35411 by @diondiondion)
+- Improve a11y of custom select menus in notifications settings (#35403 by @diondiondion)
+- Fix selected item in poll select menus is unreadable in Firefox (#35402 by @diondiondion)
+- Update age limit wording (#35387 by @diondiondion)
+- Fix support for quote verification in implicit status updates (#35384 by @ClearlyClaire)
+- Improve `Dropdown` component accessibility (#35373 by @diondiondion)
+- Fix processing some incoming quotes failing because of missing JSON-LD context (#35354 and #35380 by @ClearlyClaire)
+- Make bio hashtags open the local page instead of the remote instance (#35349 by @ChaosExAnima)
+- Fix styling of external log-in button (#35320 by @ClearlyClaire)
+
+## [4.4.1] - 2025-07-09
+
+### Fixed
+
+- Fix nearly every sub-directory being crawled as part of Vite build (#35323 by @ClearlyClaire)
+- Fix assets not building when Redis is unavailable (#35321 by @oneiros)
+- Fix replying from media modal or pop-in-player tagging user `@undefined` (#35317 by @ClearlyClaire)
+- Fix support for special characters in various environment variables (#35314 by @mjankowski and @ClearlyClaire)
+- Fix some database migrations failing for indexes manually removed by admins (#35309 by @mjankowski)
+
+## [4.4.0] - 2025-07-08
 
 ### Added
 
@@ -38,7 +160,7 @@ All notable changes to this project will be documented in this file.
   Server administrators can now chose to opt in to transmit referrer information when following an external link. Only the domain name is transmitted, not the referrer path.
 - Add double tap to zoom and swipe to dismiss to media modal in web UI (#34210 by @Gargron)
 - Add link from Web UI for Hashtags to the Moderation UI (#31448 by @ThisIsMissEm)
-- **Add terms of service** (#33055, #33233, #33230, #33703, #33699, #33994, #33993, #34105, #34122, #34200, #34527, #35053, #35115, #35126 and #35127 by @ClearlyClaire, @Gargron, @mjankowski, and @oneiros)\
+- **Add terms of service** (#33055, #33233, #33230, #33703, #33699, #33994, #33993, #34105, #34122, #34200, #34527, #35053, #35115, #35126, #35127 and #35233 by @ClearlyClaire, @Gargron, @mjankowski, and @oneiros)\
   Server administrators can now fill in Terms of Service and notify their users of upcoming changes.
 - Add optional bulk mailer settings (#35191 and #35203 by @oneiros)\
   This adds the optional environment variables `BULK_SMTP_PORT`, `BULK_SMTP_SERVER`, `BULK_SMTP_LOGIN` and so on analogous to `SMTP_PORT`, `SMTP_SERVER`, `SMTP_LOGIN` and related SMTP configuration environment variables.\
@@ -51,7 +173,7 @@ All notable changes to this project will be documented in this file.
 - Add ability to dismiss alt text badge by tapping it in web UI (#33737 by @Gargron)
 - Add loading indicator to timeline gap indicators in web UI (#33762 by @Gargron)
 - Add interaction modal when trying to interact with a poll while logged out (#32609 by @ThisIsMissEm)
-- **Add experimental FASP support** (#34031, #34415, #34765, #34965, #34964, #34033 and #35218 by @oneiros)\
+- **Add experimental FASP support** (#34031, #34415, #34765, #34965, #34964, #34033, #35218, #35262 and #35263 by @oneiros)\
   This is a first step towards supporting “Fediverse Auxiliary Service Providers” (https://github.com/mastodon/fediverse_auxiliary_service_provider_specifications). This is mostly interesting to developers who would like to implement their own FASP, but also includes the capability to share data with a discovery provider (see https://www.fediscovery.org).
 - Add ability for admins to send announcements to all users via email (#33928 and #34411 by @ClearlyClaire)\
   This is meant for critical announcements only, as this will potentially send a lot of emails and cannot be opted out of by users.
@@ -64,7 +186,7 @@ All notable changes to this project will be documented in this file.
 - Add dropdown menu with quick actions to lists of accounts in web UI (#34391, #34709, and #34767 by @Gargron, @diondiondion, and @mkljczk)
 - Add support for displaying “year in review” notification in web UI (#32710, #32765, #32709, #32807, #32914, #33148, and #33882 by @Gargron and @mjankowski)\
   Note that the notification is currently not generated automatically, and at the moment requires a manual undocumented administrator action.
-- Add experimental support for receiving HTTP Message Signatures (RFC9421) (#34814, #35033 and #35109 by @oneiros)\
+- Add experimental support for receiving HTTP Message Signatures (RFC9421) (#34814, #35033, #35109 and #35278 by @oneiros)\
   For now, this needs to be explicitly enabled through the `http_message_signatures` feature flag (`EXPERIMENTAL_FEATURES=http_message_signatures`). This currently only covers verifying such signatures (inbound HTTP requests), not issuing them (outbound HTTP requests).
 - Add experimental Async Refreshes API (#34918 by @oneiros)
 - Add experimental server-side feature to fetch remote replies (#32615, #34147, #34149, #34151, #34615, #34682, and #34702 by @ClearlyClaire and @sneakers-the-rat)\
@@ -218,6 +340,7 @@ All notable changes to this project will be documented in this file.
 - Fix admin dashboard crash on specific Elasticsearch connection errors (#34683 by @ClearlyClaire)
 - Fix OIDC account creation failing for long display names (#34639 by @defnull)
 - Fix use of the deprecated `/api/v1/instance` endpoint in the moderation interface (#34613 by @renchap)
+- Fix inaccessible “Clear search” button (#35152 and #35281 by @diondiondion)
 - Fix search operators sometimes getting lost (#35190 by @ClearlyClaire)
 - Fix directory scroll position reset (#34560 by @przucidlo)
 - Fix needlessly complex SVG paths for oEmbed and logo (#34538 by @edent)
@@ -232,7 +355,7 @@ All notable changes to this project will be documented in this file.
 - Fix extra space under left-indented vertical videos (#34313 by @ClearlyClaire)
 - Fix glitchy iOS media attachment drag interactions (#35057 by @diondiondion)
 - Fix zoomed images being blurry in Safari (#35052 by @diondiondion)
-- Fix redundant focus stop within status component in Web UI and make focus style more noticeable (#35037, #35051, #35096 and #35150 by @diondiondion)
+- Fix redundant focus stop within status component in Web UI and make focus style more noticeable (#35037, #35051, #35096, #35150 and #35251 by @diondiondion)
 - Fix digits in media player time readout not having a consistent width (#35038 by @diondiondion)
 - Fix wrong text color for “Open in advanced web interface” banner in high-contrast theme (#35032 by @diondiondion)
 - Fix hover card for limited accounts not hiding information as expected (#35024 by @diondiondion)
@@ -530,7 +653,6 @@ The following changelog entries focus on changes visible to users, administrator
   You can now separately filter or drop notifications from people you don't follow, people who don't follow you, accounts created within the past 30 days, as well as unsolicited private mentions, and accounts limited by the moderation.\
   Instead of being outright dropped, notifications that you chose to filter are put in a separate “Filtered notifications” box that you can review separately without it clogging your main notifications.\
   This adds the following REST API endpoints:
-
   - `GET /api/v2/notifications/policy`: https://docs.joinmastodon.org/methods/notifications/#get-policy
   - `PATCH /api/v2/notifications/policy`: https://docs.joinmastodon.org/methods/notifications/#update-the-filtering-policy-for-notifications
   - `GET /api/v1/notifications/requests`: https://docs.joinmastodon.org/methods/notifications/#get-requests
@@ -542,7 +664,6 @@ The following changelog entries focus on changes visible to users, administrator
   - `GET /api/v1/notifications/requests/merged`: https://docs.joinmastodon.org/methods/notifications/#requests-merged
 
   In addition, accepting one or more notification requests generates a new streaming event:
-
   - `notifications_merged`: an event of this type indicates accepted notification requests have finished merging, and the notifications list should be refreshed
 
 - **Add notifications of severed relationships** (#27511, #29665, #29668, #29670, #29700, #29714, #29712, and #29731 by @ClearlyClaire and @Gargron)\
diff --git a/Dockerfile b/Dockerfile
index 6cb4a2a1c0a..ad8150552a4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-# syntax=docker/dockerfile:1.12
+# syntax=docker/dockerfile:1.18
 
 # This file is designed for production server deployment, not local development work
 # For a containerized local dev environment, see: https://github.com/mastodon/mastodon/blob/main/docs/DEVELOPMENT.md#docker
@@ -13,15 +13,15 @@ ARG BASE_REGISTRY="docker.io"
 
 # Ruby image to use for base image, change with [--build-arg RUBY_VERSION="3.4.x"]
 # renovate: datasource=docker depName=docker.io/ruby
-ARG RUBY_VERSION="3.4.4"
+ARG RUBY_VERSION="3.4.7"
 # # Node.js version to use in base image, change with [--build-arg NODE_MAJOR_VERSION="20"]
 # renovate: datasource=node-version depName=node
 ARG NODE_MAJOR_VERSION="22"
-# Debian image to use for base image, change with [--build-arg DEBIAN_VERSION="bookworm"]
-ARG DEBIAN_VERSION="bookworm"
-# Node.js image to use for base image based on combined variables (ex: 20-bookworm-slim)
+# Debian image to use for base image, change with [--build-arg DEBIAN_VERSION="trixie"]
+ARG DEBIAN_VERSION="trixie"
+# Node.js image to use for base image based on combined variables (ex: 20-trixie-slim)
 FROM ${BASE_REGISTRY}/node:${NODE_MAJOR_VERSION}-${DEBIAN_VERSION}-slim AS node
-# Ruby image to use for base image based on combined variables (ex: 3.4.x-slim-bookworm)
+# Ruby image to use for base image based on combined variables (ex: 3.4.x-slim-trixie)
 FROM ${BASE_REGISTRY}/ruby:${RUBY_VERSION}-slim-${DEBIAN_VERSION} AS ruby
 
 # Resulting version string is vX.X.X-MASTODON_VERSION_PRERELEASE+MASTODON_VERSION_METADATA
@@ -96,9 +96,6 @@ RUN \
 # Set /opt/mastodon as working directory
 WORKDIR /opt/mastodon
 
-# Add backport repository for some specific packages where we need the latest version
-RUN echo 'deb http://deb.debian.org/debian bookworm-backports main' >> /etc/apt/sources.list
-
 # hadolint ignore=DL3008,DL3005
 RUN \
   # Mount Apt cache and lib directories from Docker buildx caches
@@ -161,11 +158,11 @@ RUN \
   libexif-dev \
   libexpat1-dev \
   libgirepository1.0-dev \
-  libheif-dev/bookworm-backports \
+  libheif-dev \
+  libhwy-dev \
   libimagequant-dev \
   libjpeg62-turbo-dev \
   liblcms2-dev \
-  liborc-dev \
   libspng-dev \
   libtiff-dev \
   libwebp-dev \
@@ -186,7 +183,7 @@ FROM build AS libvips
 
 # libvips version to compile, change with [--build-arg VIPS_VERSION="8.15.2"]
 # renovate: datasource=github-releases depName=libvips packageName=libvips/libvips
-ARG VIPS_VERSION=8.17.0
+ARG VIPS_VERSION=8.17.2
 # libvips download URL, change with [--build-arg VIPS_URL="https://github.com/libvips/libvips/releases/download"]
 ARG VIPS_URL=https://github.com/libvips/libvips/releases/download
 
@@ -209,7 +206,7 @@ FROM build AS ffmpeg
 
 # ffmpeg version to compile, change with [--build-arg FFMPEG_VERSION="7.0.x"]
 # renovate: datasource=repology depName=ffmpeg packageName=openpkg_current/ffmpeg
-ARG FFMPEG_VERSION=7.1
+ARG FFMPEG_VERSION=8.0
 # ffmpeg download URL, change with [--build-arg FFMPEG_URL="https://ffmpeg.org/releases"]
 ARG FFMPEG_URL=https://ffmpeg.org/releases
 
@@ -327,28 +324,28 @@ RUN \
   # Apt update install non-dev versions of necessary components
   apt-get install -y --no-install-recommends \
   libexpat1 \
-  libglib2.0-0 \
-  libicu72 \
+  libglib2.0-0t64 \
+  libicu76 \
   libidn12 \
   libpq5 \
-  libreadline8 \
-  libssl3 \
+  libreadline8t64 \
+  libssl3t64 \
   libyaml-0-2 \
   # libvips components
   libcgif0 \
   libexif12 \
-  libheif1/bookworm-backports \
+  libheif1 \
+  libhwy1t64 \
   libimagequant0 \
   libjpeg62-turbo \
   liblcms2-2 \
-  liborc-0.4-0 \
   libspng0 \
   libtiff6 \
   libwebp7 \
   libwebpdemux2 \
   libwebpmux3 \
   # ffmpeg components
-  libdav1d6 \
+  libdav1d7 \
   libmp3lame0 \
   libopencore-amrnb0 \
   libopencore-amrwb0 \
@@ -358,9 +355,9 @@ RUN \
   libvorbis0a \
   libvorbisenc2 \
   libvorbisfile3 \
-  libvpx7 \
+  libvpx9 \
   libx264-164 \
-  libx265-199 \
+  libx265-215 \
   ;
 
 # Copy Mastodon sources into final layer
diff --git a/Gemfile b/Gemfile
index ffd5371b06d..aa201d1e72b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,12 +4,12 @@ source 'https://rubygems.org'
 ruby '>= 3.2.0', '< 3.5.0'
 
 gem 'propshaft'
-gem 'puma', '~> 6.3'
+gem 'puma', '~> 7.0'
 gem 'rails', '~> 8.0'
 gem 'thor', '~> 1.2'
 
 gem 'dotenv'
-gem 'haml-rails', '~>2.0'
+gem 'haml-rails', '~>3.0'
 gem 'pg', '~> 1.5'
 gem 'pghero'
 
@@ -62,7 +62,7 @@ gem 'inline_svg'
 gem 'irb', '~> 1.8'
 gem 'kaminari', '~> 1.2'
 gem 'link_header', '~> 0.0'
-gem 'linzer', '~> 0.7.2'
+gem 'linzer', '~> 0.7.7'
 gem 'mario-redis-lock', '~> 1.2', require: 'redis_lock'
 gem 'mime-types', '~> 3.7.0', require: 'mime/types/columnar'
 gem 'mutex_m'
@@ -82,13 +82,13 @@ gem 'rqrcode', '~> 3.0'
 gem 'ruby-progressbar', '~> 1.13'
 gem 'sanitize', '~> 7.0'
 gem 'scenic', '~> 1.7'
-gem 'sidekiq', '< 8'
+gem 'sidekiq', '< 9'
 gem 'sidekiq-bulk', '~> 0.2.0'
-gem 'sidekiq-scheduler', '~> 5.0'
+gem 'sidekiq-scheduler', '~> 6.0'
 gem 'sidekiq-unique-jobs', '> 8'
 gem 'simple_form', '~> 5.2'
 gem 'simple-navigation', '~> 4.4'
-gem 'stoplight', '~> 4.1'
+gem 'stoplight'
 gem 'strong_migrations'
 gem 'tty-prompt', '~> 0.23', require: false
 gem 'twitter-text', '~> 3.1.0'
@@ -102,23 +102,23 @@ gem 'rdf-normalize', '~> 0.5'
 
 gem 'prometheus_exporter', '~> 2.2', require: false
 
-gem 'opentelemetry-api', '~> 1.5.0'
+gem 'opentelemetry-api', '~> 1.7.0'
 
 group :opentelemetry do
   gem 'opentelemetry-exporter-otlp', '~> 0.30.0', require: false
-  gem 'opentelemetry-instrumentation-active_job', '~> 0.8.0', require: false
-  gem 'opentelemetry-instrumentation-active_model_serializers', '~> 0.22.0', require: false
-  gem 'opentelemetry-instrumentation-concurrent_ruby', '~> 0.22.0', require: false
-  gem 'opentelemetry-instrumentation-excon', '~> 0.23.0', require: false
-  gem 'opentelemetry-instrumentation-faraday', '~> 0.27.0', require: false
-  gem 'opentelemetry-instrumentation-http', '~> 0.25.0', require: false
-  gem 'opentelemetry-instrumentation-http_client', '~> 0.23.0', require: false
-  gem 'opentelemetry-instrumentation-net_http', '~> 0.23.0', require: false
-  gem 'opentelemetry-instrumentation-pg', '~> 0.30.0', require: false
-  gem 'opentelemetry-instrumentation-rack', '~> 0.26.0', require: false
-  gem 'opentelemetry-instrumentation-rails', '~> 0.36.0', require: false
-  gem 'opentelemetry-instrumentation-redis', '~> 0.26.0', require: false
-  gem 'opentelemetry-instrumentation-sidekiq', '~> 0.26.0', require: false
+  gem 'opentelemetry-instrumentation-active_job', '~> 0.9.0', require: false
+  gem 'opentelemetry-instrumentation-active_model_serializers', '~> 0.23.0', require: false
+  gem 'opentelemetry-instrumentation-concurrent_ruby', '~> 0.23.0', require: false
+  gem 'opentelemetry-instrumentation-excon', '~> 0.25.0', require: false
+  gem 'opentelemetry-instrumentation-faraday', '~> 0.29.0', require: false
+  gem 'opentelemetry-instrumentation-http', '~> 0.26.0', require: false
+  gem 'opentelemetry-instrumentation-http_client', '~> 0.25.0', require: false
+  gem 'opentelemetry-instrumentation-net_http', '~> 0.25.0', require: false
+  gem 'opentelemetry-instrumentation-pg', '~> 0.31.0', require: false
+  gem 'opentelemetry-instrumentation-rack', '~> 0.28.0', require: false
+  gem 'opentelemetry-instrumentation-rails', '~> 0.38.0', require: false
+  gem 'opentelemetry-instrumentation-redis', '~> 0.27.0', require: false
+  gem 'opentelemetry-instrumentation-sidekiq', '~> 0.27.0', require: false
   gem 'opentelemetry-sdk', '~> 1.4', require: false
 end
 
@@ -138,6 +138,7 @@ group :test do
   # Browser integration testing
   gem 'capybara', '~> 3.39'
   gem 'capybara-playwright-driver'
+  gem 'playwright-ruby-client', '1.55.0', require: false # Pinning the exact version as it needs to be kept in sync with the installed npm package
 
   # Used to reset the database between system tests
   gem 'database_cleaner-active_record'
@@ -146,7 +147,7 @@ group :test do
   gem 'climate_control'
 
   # Validate schemas in specs
-  gem 'json-schema', '~> 5.0'
+  gem 'json-schema', '~> 6.0'
 
   # Test harness fo rack components
   gem 'rack-test', '~> 2.1'
@@ -159,6 +160,9 @@ group :test do
 
   # Stub web requests for specs
   gem 'webmock', '~> 3.18'
+
+  # Websocket driver for testing integration between rails/sidekiq and streaming
+  gem 'websocket-driver', '~> 0.8', require: false
 end
 
 group :development do
@@ -223,7 +227,7 @@ gem 'connection_pool', require: false
 gem 'xorcist', '~> 1.1'
 
 gem 'net-http', '~> 0.6.0'
-gem 'rubyzip', '~> 2.3'
+gem 'rubyzip', '~> 3.0'
 
 gem 'hcaptcha', '~> 7.1'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index b2eff8ad359..1d63e0d955c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -10,29 +10,29 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (8.0.2)
-      actionpack (= 8.0.2)
-      activesupport (= 8.0.2)
+    actioncable (8.0.3)
+      actionpack (= 8.0.3)
+      activesupport (= 8.0.3)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
       zeitwerk (~> 2.6)
-    actionmailbox (8.0.2)
-      actionpack (= 8.0.2)
-      activejob (= 8.0.2)
-      activerecord (= 8.0.2)
-      activestorage (= 8.0.2)
-      activesupport (= 8.0.2)
+    actionmailbox (8.0.3)
+      actionpack (= 8.0.3)
+      activejob (= 8.0.3)
+      activerecord (= 8.0.3)
+      activestorage (= 8.0.3)
+      activesupport (= 8.0.3)
       mail (>= 2.8.0)
-    actionmailer (8.0.2)
-      actionpack (= 8.0.2)
-      actionview (= 8.0.2)
-      activejob (= 8.0.2)
-      activesupport (= 8.0.2)
+    actionmailer (8.0.3)
+      actionpack (= 8.0.3)
+      actionview (= 8.0.3)
+      activejob (= 8.0.3)
+      activesupport (= 8.0.3)
       mail (>= 2.8.0)
       rails-dom-testing (~> 2.2)
-    actionpack (8.0.2)
-      actionview (= 8.0.2)
-      activesupport (= 8.0.2)
+    actionpack (8.0.3)
+      actionview (= 8.0.3)
+      activesupport (= 8.0.3)
       nokogiri (>= 1.8.5)
       rack (>= 2.2.4)
       rack-session (>= 1.0.1)
@@ -40,15 +40,15 @@ GEM
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
       useragent (~> 0.16)
-    actiontext (8.0.2)
-      actionpack (= 8.0.2)
-      activerecord (= 8.0.2)
-      activestorage (= 8.0.2)
-      activesupport (= 8.0.2)
+    actiontext (8.0.3)
+      actionpack (= 8.0.3)
+      activerecord (= 8.0.3)
+      activestorage (= 8.0.3)
+      activesupport (= 8.0.3)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (8.0.2)
-      activesupport (= 8.0.2)
+    actionview (8.0.3)
+      activesupport (= 8.0.3)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
@@ -58,22 +58,22 @@ GEM
       activemodel (>= 4.1)
       case_transform (>= 0.2)
       jsonapi-renderer (>= 0.1.1.beta1, < 0.3)
-    activejob (8.0.2)
-      activesupport (= 8.0.2)
+    activejob (8.0.3)
+      activesupport (= 8.0.3)
       globalid (>= 0.3.6)
-    activemodel (8.0.2)
-      activesupport (= 8.0.2)
-    activerecord (8.0.2)
-      activemodel (= 8.0.2)
-      activesupport (= 8.0.2)
+    activemodel (8.0.3)
+      activesupport (= 8.0.3)
+    activerecord (8.0.3)
+      activemodel (= 8.0.3)
+      activesupport (= 8.0.3)
       timeout (>= 0.4.0)
-    activestorage (8.0.2)
-      actionpack (= 8.0.2)
-      activejob (= 8.0.2)
-      activerecord (= 8.0.2)
-      activesupport (= 8.0.2)
+    activestorage (8.0.3)
+      actionpack (= 8.0.3)
+      activejob (= 8.0.3)
+      activerecord (= 8.0.3)
+      activesupport (= 8.0.3)
       marcel (~> 1.0)
-    activesupport (8.0.2)
+    activesupport (8.0.3)
       base64
       benchmark (>= 0.3)
       bigdecimal
@@ -90,13 +90,13 @@ GEM
       public_suffix (>= 2.0.2, < 7.0)
     aes_key_wrap (1.1.0)
     android_key_attestation (0.3.0)
-    annotaterb (4.16.0)
+    annotaterb (4.19.0)
       activerecord (>= 6.0.0)
       activesupport (>= 6.0.0)
     ast (2.4.3)
     attr_required (1.0.2)
-    aws-eventstream (1.3.2)
-    aws-partitions (1.1103.0)
+    aws-eventstream (1.4.0)
+    aws-partitions (1.1168.0)
     aws-sdk-core (3.215.1)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
@@ -109,9 +109,9 @@ GEM
       aws-sdk-core (~> 3, >= 3.210.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
-    aws-sigv4 (1.11.0)
+    aws-sigv4 (1.12.1)
       aws-eventstream (~> 1, >= 1.0.2)
-    azure-blob (0.5.8)
+    azure-blob (0.5.9.1)
       rexml
     base64 (0.3.0)
     bcp47_spec (0.2.1)
@@ -121,7 +121,7 @@ GEM
       erubi (>= 1.0.0)
       rack (>= 0.9.0)
       rouge (>= 1.0.0)
-    bigdecimal (3.2.2)
+    bigdecimal (3.2.3)
     bindata (2.5.1)
     binding_of_caller (1.0.1)
       debug_inspector (>= 1.2.0)
@@ -144,13 +144,13 @@ GEM
       rack-test (>= 0.6.3)
       regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
-    capybara-playwright-driver (0.5.6)
+    capybara-playwright-driver (0.5.7)
       addressable
       capybara
       playwright-ruby-client (>= 1.16.0)
     case_transform (0.2)
       activesupport
-    cbor (0.5.9.8)
+    cbor (0.5.10.1)
     cgi (0.4.2)
     charlock_holmes (0.7.9)
     chewy (7.6.0)
@@ -164,7 +164,7 @@ GEM
     cocoon (1.2.15)
     color_diff (0.1)
     concurrent-ruby (1.3.5)
-    connection_pool (2.5.3)
+    connection_pool (2.5.4)
     cose (1.3.1)
       cbor (~> 0.5.9)
       openssl-signature_algorithm (~> 1.0)
@@ -175,9 +175,9 @@ GEM
     css_parser (1.21.1)
       addressable
     csv (3.3.5)
-    database_cleaner-active_record (2.2.1)
+    database_cleaner-active_record (2.2.2)
       activerecord (>= 5.a)
-      database_cleaner-core (~> 2.0.0)
+      database_cleaner-core (~> 2.0)
     database_cleaner-core (2.0.1)
     date (3.4.1)
     debug (1.11.0)
@@ -207,7 +207,7 @@ GEM
       railties (>= 5)
     dotenv (3.1.8)
     drb (2.2.3)
-    dry-cli (1.2.0)
+    dry-cli (1.3.0)
     elasticsearch (7.17.11)
       elasticsearch-api (= 7.17.11)
       elasticsearch-transport (= 7.17.11)
@@ -224,24 +224,24 @@ GEM
       mail (~> 2.7)
     email_validator (2.2.4)
       activemodel
-    erb (5.0.1)
+    erb (5.0.2)
     erubi (1.13.1)
-    et-orbi (1.2.11)
+    et-orbi (1.4.0)
       tzinfo
-    excon (1.2.5)
+    excon (1.3.0)
       logger
     fabrication (3.0.0)
     faker (3.5.2)
       i18n (>= 1.8.11, < 2)
-    faraday (2.13.1)
+    faraday (2.14.0)
       faraday-net_http (>= 2.0, < 3.5)
       json
       logger
-    faraday-follow_redirects (0.3.0)
+    faraday-follow_redirects (0.4.0)
       faraday (>= 1, < 3)
     faraday-httpclient (2.0.2)
       httpclient (>= 2.2)
-    faraday-net_http (3.4.0)
+    faraday-net_http (3.4.1)
       net-http (>= 0.5.0)
     fast_blank (1.0.1)
     fastimage (2.4.0)
@@ -266,42 +266,43 @@ GEM
     fog-openstack (1.1.5)
       fog-core (~> 2.1)
       fog-json (>= 1.0)
-    formatador (1.1.0)
+    formatador (1.2.1)
+      reline
     forwardable (1.3.3)
-    fugit (1.11.1)
-      et-orbi (~> 1, >= 1.2.11)
+    fugit (1.12.0)
+      et-orbi (~> 1.4)
       raabro (~> 1.4)
-    globalid (1.2.1)
+    globalid (1.3.0)
       activesupport (>= 6.1)
-    google-protobuf (4.31.0)
+    google-protobuf (4.32.1)
       bigdecimal
       rake (>= 13)
-    googleapis-common-protos-types (1.20.0)
-      google-protobuf (>= 3.18, < 5.a)
+    googleapis-common-protos-types (1.21.0)
+      google-protobuf (~> 4.26)
     haml (6.3.0)
       temple (>= 0.8.2)
       thor
       tilt
-    haml-rails (2.1.0)
+    haml-rails (3.0.0)
       actionpack (>= 5.1)
       activesupport (>= 5.1)
       haml (>= 4.0.6)
       railties (>= 5.1)
-    haml_lint (0.64.0)
+    haml_lint (0.66.0)
       haml (>= 5.0)
       parallel (~> 1.10)
       rainbow
       rubocop (>= 1.0)
       sysexits (~> 1.1)
-    hashdiff (1.1.2)
+    hashdiff (1.2.1)
     hashie (5.0.0)
     hcaptcha (7.1.0)
       json
     highline (3.1.2)
       reline
     hiredis (0.6.3)
-    hiredis-client (0.24.0)
-      redis-client (= 0.24.0)
+    hiredis-client (0.26.1)
+      redis-client (= 0.26.1)
     hkdf (0.3.0)
     htmlentities (4.3.4)
     http (5.3.1)
@@ -309,13 +310,13 @@ GEM
       http-cookie (~> 1.0)
       http-form_data (~> 2.2)
       llhttp-ffi (~> 0.5.0)
-    http-cookie (1.0.8)
+    http-cookie (1.1.0)
       domain_name (~> 0.5)
     http-form_data (2.3.0)
     http_accept_language (2.1.1)
     httpclient (2.9.0)
       mutex_m
-    httplog (1.7.0)
+    httplog (1.7.3)
       rack (>= 2.0)
       rainbow (>= 2.0.0)
     i18n (1.14.7)
@@ -335,7 +336,7 @@ GEM
     inline_svg (1.10.0)
       activesupport (>= 3.0)
       nokogiri (>= 1.6)
-    io-console (0.8.0)
+    io-console (0.8.1)
     irb (1.15.2)
       pp (>= 0.6.0)
       rdoc (>= 4.0.0)
@@ -345,9 +346,9 @@ GEM
       azure-blob (~> 0.5.2)
       hashie (~> 5.0)
     jmespath (1.6.2)
-    json (2.12.2)
+    json (2.15.1)
     json-canonicalization (1.0.0)
-    json-jwt (1.16.7)
+    json-jwt (1.17.0)
       activesupport (>= 4.2)
       aes_key_wrap
       base64
@@ -362,14 +363,14 @@ GEM
       rack (>= 2.2, < 4)
       rdf (~> 3.3)
       rexml (~> 3.2)
-    json-ld-preloaded (3.3.1)
+    json-ld-preloaded (3.3.2)
       json-ld (~> 3.3)
       rdf (~> 3.3)
-    json-schema (5.1.1)
+    json-schema (6.0.0)
       addressable (~> 2.8)
       bigdecimal (~> 3.1)
     jsonapi-renderer (0.2.2)
-    jwt (2.10.1)
+    jwt (2.10.2)
       base64
     kaminari (1.2.2)
       activesupport (>= 4.1.0)
@@ -403,7 +404,7 @@ GEM
       rexml
     link_header (0.0.8)
     lint_roller (1.1.0)
-    linzer (0.7.3)
+    linzer (0.7.7)
       cgi (~> 0.4.2)
       forwardable (~> 1.3, >= 1.3.3)
       logger (~> 1.7, >= 1.7.0)
@@ -433,24 +434,26 @@ GEM
     marcel (1.0.4)
     mario-redis-lock (1.2.1)
       redis (>= 3.0.5)
-    matrix (0.4.2)
+    matrix (0.4.3)
     memory_profiler (1.1.0)
     mime-types (3.7.0)
       logger
       mime-types-data (~> 3.2025, >= 3.2025.0507)
-    mime-types-data (3.2025.0514)
+    mime-types-data (3.2025.0924)
     mini_mime (1.1.5)
     mini_portile2 (2.8.9)
     minitest (5.25.5)
     msgpack (1.8.0)
-    multi_json (1.15.0)
+    multi_json (1.17.0)
     mutex_m (0.3.0)
     net-http (0.6.0)
       uri
-    net-imap (0.5.8)
+    net-imap (0.5.12)
       date
       net-protocol
-    net-ldap (0.19.0)
+    net-ldap (0.20.0)
+      base64
+      ostruct
     net-pop (0.1.2)
       net-protocol
     net-protocol (0.2.2)
@@ -458,17 +461,18 @@ GEM
     net-smtp (0.5.1)
       net-protocol
     nio4r (2.7.4)
-    nokogiri (1.18.8)
+    nokogiri (1.18.10)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     oj (3.16.11)
       bigdecimal (>= 3.0)
       ostruct (>= 0.2)
-    omniauth (2.1.3)
+    omniauth (2.1.4)
       hashie (>= 3.4.6)
+      logger
       rack (>= 2.2.3)
       rack-protection
-    omniauth-cas (3.0.1)
+    omniauth-cas (3.0.2)
       addressable (~> 2.8)
       nokogiri (~> 1.12)
       omniauth (~> 2.1)
@@ -494,10 +498,10 @@ GEM
       tzinfo
       validate_url
       webfinger (~> 2.0)
-    openssl (3.3.0)
+    openssl (3.3.1)
     openssl-signature_algorithm (1.3.0)
       openssl (> 2.0)
-    opentelemetry-api (1.5.0)
+    opentelemetry-api (1.7.0)
     opentelemetry-common (0.22.0)
       opentelemetry-api (~> 1.0)
     opentelemetry-exporter-otlp (0.30.0)
@@ -507,113 +511,88 @@ GEM
       opentelemetry-common (~> 0.20)
       opentelemetry-sdk (~> 1.2)
       opentelemetry-semantic_conventions
-    opentelemetry-helpers-sql (0.1.1)
-      opentelemetry-api (~> 1.0)
+    opentelemetry-helpers-sql (0.2.0)
+      opentelemetry-api (~> 1.7)
     opentelemetry-helpers-sql-obfuscation (0.3.0)
       opentelemetry-common (~> 0.21)
-    opentelemetry-instrumentation-action_mailer (0.4.0)
-      opentelemetry-api (~> 1.0)
+    opentelemetry-instrumentation-action_mailer (0.5.0)
       opentelemetry-instrumentation-active_support (~> 0.7)
-      opentelemetry-instrumentation-base (~> 0.23.0)
-    opentelemetry-instrumentation-action_pack (0.12.1)
-      opentelemetry-api (~> 1.0)
-      opentelemetry-instrumentation-base (~> 0.23.0)
+    opentelemetry-instrumentation-action_pack (0.14.1)
       opentelemetry-instrumentation-rack (~> 0.21)
-    opentelemetry-instrumentation-action_view (0.9.0)
-      opentelemetry-api (~> 1.0)
+    opentelemetry-instrumentation-action_view (0.10.0)
       opentelemetry-instrumentation-active_support (~> 0.7)
-      opentelemetry-instrumentation-base (~> 0.23.0)
-    opentelemetry-instrumentation-active_job (0.8.0)
-      opentelemetry-api (~> 1.0)
-      opentelemetry-instrumentation-base (~> 0.23.0)
-    opentelemetry-instrumentation-active_model_serializers (0.22.0)
-      opentelemetry-api (~> 1.0)
+    opentelemetry-instrumentation-active_job (0.9.2)
+      opentelemetry-instrumentation-base (~> 0.24)
+    opentelemetry-instrumentation-active_model_serializers (0.23.0)
       opentelemetry-instrumentation-active_support (>= 0.7.0)
-      opentelemetry-instrumentation-base (~> 0.23.0)
-    opentelemetry-instrumentation-active_record (0.9.0)
-      opentelemetry-api (~> 1.0)
-      opentelemetry-instrumentation-base (~> 0.23.0)
-    opentelemetry-instrumentation-active_storage (0.1.1)
-      opentelemetry-api (~> 1.0)
+    opentelemetry-instrumentation-active_record (0.10.1)
+      opentelemetry-instrumentation-base (~> 0.24)
+    opentelemetry-instrumentation-active_storage (0.2.0)
       opentelemetry-instrumentation-active_support (~> 0.7)
-      opentelemetry-instrumentation-base (~> 0.23.0)
-    opentelemetry-instrumentation-active_support (0.8.0)
-      opentelemetry-api (~> 1.0)
-      opentelemetry-instrumentation-base (~> 0.23.0)
-    opentelemetry-instrumentation-base (0.23.0)
-      opentelemetry-api (~> 1.0)
+    opentelemetry-instrumentation-active_support (0.9.1)
+      opentelemetry-instrumentation-base (~> 0.24)
+    opentelemetry-instrumentation-base (0.24.0)
+      opentelemetry-api (~> 1.7)
       opentelemetry-common (~> 0.21)
       opentelemetry-registry (~> 0.1)
-    opentelemetry-instrumentation-concurrent_ruby (0.22.0)
-      opentelemetry-api (~> 1.0)
-      opentelemetry-instrumentation-base (~> 0.23.0)
-    opentelemetry-instrumentation-excon (0.23.0)
-      opentelemetry-api (~> 1.0)
-      opentelemetry-instrumentation-base (~> 0.23.0)
-    opentelemetry-instrumentation-faraday (0.27.0)
-      opentelemetry-api (~> 1.0)
-      opentelemetry-instrumentation-base (~> 0.23.0)
-    opentelemetry-instrumentation-http (0.25.1)
-      opentelemetry-api (~> 1.0)
-      opentelemetry-instrumentation-base (~> 0.23.0)
-    opentelemetry-instrumentation-http_client (0.23.0)
-      opentelemetry-api (~> 1.0)
-      opentelemetry-instrumentation-base (~> 0.23.0)
-    opentelemetry-instrumentation-net_http (0.23.0)
-      opentelemetry-api (~> 1.0)
-      opentelemetry-instrumentation-base (~> 0.23.0)
-    opentelemetry-instrumentation-pg (0.30.1)
-      opentelemetry-api (~> 1.0)
+    opentelemetry-instrumentation-concurrent_ruby (0.23.1)
+      opentelemetry-instrumentation-base (~> 0.24)
+    opentelemetry-instrumentation-excon (0.25.2)
+      opentelemetry-instrumentation-base (~> 0.24)
+    opentelemetry-instrumentation-faraday (0.29.1)
+      opentelemetry-instrumentation-base (~> 0.24)
+    opentelemetry-instrumentation-http (0.26.1)
+      opentelemetry-instrumentation-base (~> 0.24)
+    opentelemetry-instrumentation-http_client (0.25.1)
+      opentelemetry-instrumentation-base (~> 0.24)
+    opentelemetry-instrumentation-net_http (0.25.1)
+      opentelemetry-instrumentation-base (~> 0.24)
+    opentelemetry-instrumentation-pg (0.31.1)
       opentelemetry-helpers-sql
       opentelemetry-helpers-sql-obfuscation
-      opentelemetry-instrumentation-base (~> 0.23.0)
-    opentelemetry-instrumentation-rack (0.26.0)
-      opentelemetry-api (~> 1.0)
-      opentelemetry-instrumentation-base (~> 0.23.0)
-    opentelemetry-instrumentation-rails (0.36.0)
-      opentelemetry-api (~> 1.0)
-      opentelemetry-instrumentation-action_mailer (~> 0.4.0)
-      opentelemetry-instrumentation-action_pack (~> 0.12.0)
-      opentelemetry-instrumentation-action_view (~> 0.9.0)
-      opentelemetry-instrumentation-active_job (~> 0.8.0)
-      opentelemetry-instrumentation-active_record (~> 0.9.0)
-      opentelemetry-instrumentation-active_storage (~> 0.1.0)
-      opentelemetry-instrumentation-active_support (~> 0.8.0)
-      opentelemetry-instrumentation-base (~> 0.23.0)
-      opentelemetry-instrumentation-concurrent_ruby (~> 0.22.0)
-    opentelemetry-instrumentation-redis (0.26.1)
-      opentelemetry-api (~> 1.0)
-      opentelemetry-instrumentation-base (~> 0.23.0)
-    opentelemetry-instrumentation-sidekiq (0.26.1)
-      opentelemetry-api (~> 1.0)
-      opentelemetry-instrumentation-base (~> 0.23.0)
+      opentelemetry-instrumentation-base (~> 0.24)
+    opentelemetry-instrumentation-rack (0.28.2)
+      opentelemetry-instrumentation-base (~> 0.24)
+    opentelemetry-instrumentation-rails (0.38.0)
+      opentelemetry-instrumentation-action_mailer (~> 0.4)
+      opentelemetry-instrumentation-action_pack (~> 0.13)
+      opentelemetry-instrumentation-action_view (~> 0.9)
+      opentelemetry-instrumentation-active_job (~> 0.8)
+      opentelemetry-instrumentation-active_record (~> 0.9)
+      opentelemetry-instrumentation-active_storage (~> 0.1)
+      opentelemetry-instrumentation-active_support (~> 0.8)
+      opentelemetry-instrumentation-concurrent_ruby (~> 0.22)
+    opentelemetry-instrumentation-redis (0.27.1)
+      opentelemetry-instrumentation-base (~> 0.24)
+    opentelemetry-instrumentation-sidekiq (0.27.1)
+      opentelemetry-instrumentation-base (~> 0.24)
     opentelemetry-registry (0.4.0)
       opentelemetry-api (~> 1.1)
-    opentelemetry-sdk (1.8.0)
+    opentelemetry-sdk (1.9.0)
       opentelemetry-api (~> 1.1)
       opentelemetry-common (~> 0.20)
       opentelemetry-registry (~> 0.2)
       opentelemetry-semantic_conventions
-    opentelemetry-semantic_conventions (1.11.0)
+    opentelemetry-semantic_conventions (1.36.0)
       opentelemetry-api (~> 1.0)
     orm_adapter (0.5.0)
-    ostruct (0.6.1)
+    ostruct (0.6.3)
     ox (2.14.23)
       bigdecimal (>= 3.0)
     parallel (1.27.0)
-    parser (3.3.8.0)
+    parser (3.3.9.0)
       ast (~> 2.4.1)
       racc
     parslet (2.0.0)
     pastel (0.8.0)
       tty-color (~> 0.5)
-    pg (1.5.9)
+    pg (1.6.2)
     pghero (3.7.0)
       activerecord (>= 7.1)
-    playwright-ruby-client (1.52.0)
+    playwright-ruby-client (1.55.0)
       concurrent-ruby (>= 1.1.6)
       mime-types (>= 3.0)
-    pp (0.6.2)
+    pp (0.6.3)
       prettyprint
     premailer (1.27.0)
       addressable
@@ -624,25 +603,24 @@ GEM
       net-smtp
       premailer (~> 1.7, >= 1.7.9)
     prettyprint (0.2.0)
-    prism (1.4.0)
-    prometheus_exporter (2.2.0)
+    prism (1.5.1)
+    prometheus_exporter (2.3.0)
       webrick
-    propshaft (1.1.0)
+    propshaft (1.3.1)
       actionpack (>= 7.0.0)
       activesupport (>= 7.0.0)
       rack
-      railties (>= 7.0.0)
     psych (5.2.6)
       date
       stringio
     public_suffix (6.0.2)
-    puma (6.6.0)
+    puma (7.0.4)
       nio4r (~> 2.0)
-    pundit (2.5.0)
+    pundit (2.5.2)
       activesupport (>= 3.0.0)
     raabro (1.4.0)
     racc (1.8.1)
-    rack (3.1.16)
+    rack (3.2.3)
     rack-attack (6.7.0)
       rack (>= 1.0, < 4)
     rack-cors (3.0.0)
@@ -668,76 +646,81 @@ GEM
       rack (>= 1.3)
     rackup (2.2.1)
       rack (>= 3)
-    rails (8.0.2)
-      actioncable (= 8.0.2)
-      actionmailbox (= 8.0.2)
-      actionmailer (= 8.0.2)
-      actionpack (= 8.0.2)
-      actiontext (= 8.0.2)
-      actionview (= 8.0.2)
-      activejob (= 8.0.2)
-      activemodel (= 8.0.2)
-      activerecord (= 8.0.2)
-      activestorage (= 8.0.2)
-      activesupport (= 8.0.2)
+    rails (8.0.3)
+      actioncable (= 8.0.3)
+      actionmailbox (= 8.0.3)
+      actionmailer (= 8.0.3)
+      actionpack (= 8.0.3)
+      actiontext (= 8.0.3)
+      actionview (= 8.0.3)
+      activejob (= 8.0.3)
+      activemodel (= 8.0.3)
+      activerecord (= 8.0.3)
+      activestorage (= 8.0.3)
+      activesupport (= 8.0.3)
       bundler (>= 1.15.0)
-      railties (= 8.0.2)
-    rails-dom-testing (2.2.0)
+      railties (= 8.0.3)
+    rails-dom-testing (2.3.0)
       activesupport (>= 5.0.0)
       minitest
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.6.2)
       loofah (~> 2.21)
       nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
-    rails-i18n (8.0.1)
+    rails-i18n (8.0.2)
       i18n (>= 0.7, < 2)
       railties (>= 8.0.0, < 9)
-    railties (8.0.2)
-      actionpack (= 8.0.2)
-      activesupport (= 8.0.2)
+    railties (8.0.3)
+      actionpack (= 8.0.3)
+      activesupport (= 8.0.3)
       irb (~> 1.13)
       rackup (>= 1.0.0)
       rake (>= 12.2)
       thor (~> 1.0, >= 1.2.2)
+      tsort (>= 0.2)
       zeitwerk (~> 2.6)
     rainbow (3.1.1)
     rake (13.3.0)
-    rdf (3.3.2)
+    rdf (3.3.4)
       bcp47_spec (~> 0.2)
       bigdecimal (~> 3.1, >= 3.1.5)
       link_header (~> 0.0, >= 0.0.8)
+      logger (~> 1.5)
+      ostruct (~> 0.6)
+      readline (~> 0.0)
     rdf-normalize (0.7.0)
       rdf (~> 3.3)
-    rdoc (6.14.1)
+    rdoc (6.15.0)
       erb
       psych (>= 4.0.0)
+      tsort
+    readline (0.0.4)
+      reline
     redcarpet (3.6.1)
     redis (4.8.1)
-    redis-client (0.24.0)
+    redis-client (0.26.1)
       connection_pool
-    redlock (1.3.2)
-      redis (>= 3.0.0, < 6.0)
-    regexp_parser (2.10.0)
-    reline (0.6.1)
+    regexp_parser (2.11.3)
+    reline (0.6.2)
       io-console (~> 0.5)
     request_store (1.7.0)
       rack (>= 1.4)
     responders (3.1.1)
       actionpack (>= 5.2)
       railties (>= 5.2)
-    rexml (3.4.1)
+    rexml (3.4.4)
     rotp (6.3.0)
-    rouge (4.5.2)
+    rouge (4.6.1)
     rpam2 (4.0.2)
     rqrcode (3.1.0)
       chunky_png (~> 1.0)
       rqrcode_core (~> 2.0)
     rqrcode_core (2.0.0)
-    rspec (3.13.0)
+    rspec (3.13.1)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
       rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.4)
+    rspec-core (3.13.5)
       rspec-support (~> 3.13.0)
     rspec-expectations (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
@@ -747,7 +730,7 @@ GEM
     rspec-mocks (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-rails (8.0.1)
+    rspec-rails (8.0.2)
       actionpack (>= 7.2)
       activesupport (>= 7.2)
       railties (>= 7.2)
@@ -755,13 +738,13 @@ GEM
       rspec-expectations (~> 3.13)
       rspec-mocks (~> 3.13)
       rspec-support (~> 3.13)
-    rspec-sidekiq (5.1.0)
+    rspec-sidekiq (5.2.0)
       rspec-core (~> 3.0)
       rspec-expectations (~> 3.0)
       rspec-mocks (~> 3.0)
       sidekiq (>= 5, < 9)
-    rspec-support (3.13.4)
-    rubocop (1.77.0)
+    rspec-support (3.13.6)
+    rubocop (1.81.1)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
@@ -769,10 +752,10 @@ GEM
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.45.1, < 2.0)
+      rubocop-ast (>= 1.47.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.45.1)
+    rubocop-ast (1.47.1)
       parser (>= 3.3.7.2)
       prism (~> 1.4)
     rubocop-capybara (2.22.1)
@@ -781,17 +764,17 @@ GEM
     rubocop-i18n (3.2.3)
       lint_roller (~> 1.1)
       rubocop (>= 1.72.1)
-    rubocop-performance (1.25.0)
+    rubocop-performance (1.26.0)
       lint_roller (~> 1.1)
       rubocop (>= 1.75.0, < 2.0)
-      rubocop-ast (>= 1.38.0, < 2.0)
-    rubocop-rails (2.32.0)
+      rubocop-ast (>= 1.44.0, < 2.0)
+    rubocop-rails (2.33.4)
       activesupport (>= 4.2.0)
       lint_roller (~> 1.1)
       rack (>= 1.1)
       rubocop (>= 1.75.0, < 2.0)
       rubocop-ast (>= 1.44.0, < 2.0)
-    rubocop-rspec (3.6.0)
+    rubocop-rspec (3.7.0)
       lint_roller (~> 1.1)
       rubocop (~> 1.72, >= 1.72.1)
     rubocop-rspec_rails (2.31.0)
@@ -801,38 +784,37 @@ GEM
     ruby-prof (1.7.2)
       base64
     ruby-progressbar (1.13.0)
-    ruby-saml (1.18.0)
+    ruby-saml (1.18.1)
       nokogiri (>= 1.13.10)
       rexml
-    ruby-vips (2.2.4)
+    ruby-vips (2.2.5)
       ffi (~> 1.12)
       logger
-    rubyzip (2.4.1)
+    rubyzip (3.1.1)
     rufus-scheduler (3.9.2)
       fugit (~> 1.1, >= 1.11.1)
-    safety_net_attestation (0.4.0)
-      jwt (~> 2.0)
+    safety_net_attestation (0.5.0)
+      jwt (>= 2.0, < 4.0)
     sanitize (7.0.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.16.8)
-    scenic (1.8.0)
+    scenic (1.9.0)
       activerecord (>= 4.0.0)
       railties (>= 4.0.0)
     securerandom (0.4.1)
     shoulda-matchers (6.5.0)
       activesupport (>= 5.2.0)
-    sidekiq (7.3.9)
-      base64
-      connection_pool (>= 2.3.0)
-      logger
-      rack (>= 2.2.4)
-      redis-client (>= 0.22.2)
+    sidekiq (8.0.8)
+      connection_pool (>= 2.5.0)
+      json (>= 2.9.0)
+      logger (>= 1.6.2)
+      rack (>= 3.1.0)
+      redis-client (>= 0.23.2)
     sidekiq-bulk (0.2.0)
       sidekiq
-    sidekiq-scheduler (5.0.6)
+    sidekiq-scheduler (6.0.1)
       rufus-scheduler (~> 3.2)
-      sidekiq (>= 6, < 8)
-      tilt (>= 1.4.0, < 3)
+      sidekiq (>= 7.3, < 9)
     sidekiq-unique-jobs (8.0.11)
       concurrent-ruby (~> 1.0, >= 1.0.5)
       sidekiq (>= 7.0.0, < 9.0.0)
@@ -846,16 +828,16 @@ GEM
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
-    simplecov-html (0.13.1)
-    simplecov-lcov (0.8.0)
+    simplecov-html (0.13.2)
+    simplecov-lcov (0.9.0)
     simplecov_json_formatter (0.1.4)
     stackprof (0.2.27)
     starry (0.2.0)
       base64
-    stoplight (4.1.1)
-      redlock (~> 1.0)
+    stoplight (5.3.8)
+      zeitwerk
     stringio (3.1.7)
-    strong_migrations (2.4.0)
+    strong_migrations (2.5.1)
       activerecord (>= 7.1)
     swd (2.0.3)
       activesupport (>= 3)
@@ -863,19 +845,20 @@ GEM
       faraday (~> 2.0)
       faraday-follow_redirects
     sysexits (1.2.0)
-    temple (0.10.3)
+    temple (0.10.4)
     terminal-table (4.0.0)
       unicode-display_width (>= 1.1.1, < 4)
-    terrapin (1.1.0)
+    terrapin (1.1.1)
       climate_control
     test-prof (1.4.4)
-    thor (1.3.2)
-    tilt (2.6.0)
+    thor (1.4.0)
+    tilt (2.6.1)
     timeout (0.4.3)
     tpm-key_attestation (0.14.1)
       bindata (~> 2.4)
       openssl (> 2.0)
       openssl-signature_algorithm (~> 1.0)
+    tsort (0.2.0)
     tty-color (0.6.0)
     tty-cursor (0.7.1)
     tty-prompt (0.23.1)
@@ -896,10 +879,10 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.9.1)
-    unicode-display_width (3.1.4)
-      unicode-emoji (~> 4.0, >= 4.0.4)
-    unicode-emoji (4.0.4)
-    uri (1.0.3)
+    unicode-display_width (3.2.0)
+      unicode-emoji (~> 4.1)
+    unicode-emoji (4.1.0)
+    uri (1.0.4)
     useragent (0.16.11)
     validate_url (1.0.15)
       activemodel (>= 3.0.0)
@@ -915,13 +898,13 @@ GEM
       zeitwerk (~> 2.2)
     warden (1.2.9)
       rack (>= 2.0.9)
-    webauthn (3.4.1)
+    webauthn (3.4.2)
       android_key_attestation (~> 0.3.0)
       bindata (~> 2.4)
       cbor (~> 0.5.9)
       cose (~> 1.1)
       openssl (>= 2.2)
-      safety_net_attestation (~> 0.4.0)
+      safety_net_attestation (~> 0.5.0)
       tpm-key_attestation (~> 0.14.0)
     webfinger (2.1.3)
       activesupport
@@ -932,7 +915,7 @@ GEM
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
     webrick (1.9.1)
-    websocket-driver (0.7.7)
+    websocket-driver (0.8.0)
       base64
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
@@ -985,7 +968,7 @@ DEPENDENCIES
   flatware-rspec
   fog-core (<= 2.6.0)
   fog-openstack (~> 1.0)
-  haml-rails (~> 2.0)
+  haml-rails (~> 3.0)
   haml_lint
   hcaptcha (~> 7.1)
   hiredis (~> 0.6)
@@ -1002,13 +985,13 @@ DEPENDENCIES
   jd-paperclip-azure (~> 3.0)
   json-ld
   json-ld-preloaded (~> 3.2)
-  json-schema (~> 5.0)
+  json-schema (~> 6.0)
   kaminari (~> 1.2)
   kt-paperclip (~> 7.2)
   letter_opener (~> 1.8)
   letter_opener_web (~> 3.0)
   link_header (~> 0.0)
-  linzer (~> 0.7.2)
+  linzer (~> 0.7.7)
   lograge (~> 0.12)
   mail (~> 2.8)
   mario-redis-lock (~> 1.2)
@@ -1024,31 +1007,32 @@ DEPENDENCIES
   omniauth-rails_csrf_protection (~> 1.0)
   omniauth-saml (~> 2.0)
   omniauth_openid_connect (~> 0.8.0)
-  opentelemetry-api (~> 1.5.0)
+  opentelemetry-api (~> 1.7.0)
   opentelemetry-exporter-otlp (~> 0.30.0)
-  opentelemetry-instrumentation-active_job (~> 0.8.0)
-  opentelemetry-instrumentation-active_model_serializers (~> 0.22.0)
-  opentelemetry-instrumentation-concurrent_ruby (~> 0.22.0)
-  opentelemetry-instrumentation-excon (~> 0.23.0)
-  opentelemetry-instrumentation-faraday (~> 0.27.0)
-  opentelemetry-instrumentation-http (~> 0.25.0)
-  opentelemetry-instrumentation-http_client (~> 0.23.0)
-  opentelemetry-instrumentation-net_http (~> 0.23.0)
-  opentelemetry-instrumentation-pg (~> 0.30.0)
-  opentelemetry-instrumentation-rack (~> 0.26.0)
-  opentelemetry-instrumentation-rails (~> 0.36.0)
-  opentelemetry-instrumentation-redis (~> 0.26.0)
-  opentelemetry-instrumentation-sidekiq (~> 0.26.0)
+  opentelemetry-instrumentation-active_job (~> 0.9.0)
+  opentelemetry-instrumentation-active_model_serializers (~> 0.23.0)
+  opentelemetry-instrumentation-concurrent_ruby (~> 0.23.0)
+  opentelemetry-instrumentation-excon (~> 0.25.0)
+  opentelemetry-instrumentation-faraday (~> 0.29.0)
+  opentelemetry-instrumentation-http (~> 0.26.0)
+  opentelemetry-instrumentation-http_client (~> 0.25.0)
+  opentelemetry-instrumentation-net_http (~> 0.25.0)
+  opentelemetry-instrumentation-pg (~> 0.31.0)
+  opentelemetry-instrumentation-rack (~> 0.28.0)
+  opentelemetry-instrumentation-rails (~> 0.38.0)
+  opentelemetry-instrumentation-redis (~> 0.27.0)
+  opentelemetry-instrumentation-sidekiq (~> 0.27.0)
   opentelemetry-sdk (~> 1.4)
   ox (~> 2.14)
   parslet
   pg (~> 1.5)
   pghero
+  playwright-ruby-client (= 1.55.0)
   premailer-rails
   prometheus_exporter (~> 2.2)
   propshaft
   public_suffix (~> 6.0)
-  puma (~> 6.3)
+  puma (~> 7.0)
   pundit (~> 2.3)
   rack-attack (~> 6.6)
   rack-cors
@@ -1072,20 +1056,20 @@ DEPENDENCIES
   ruby-prof
   ruby-progressbar (~> 1.13)
   ruby-vips (~> 2.2)
-  rubyzip (~> 2.3)
+  rubyzip (~> 3.0)
   sanitize (~> 7.0)
   scenic (~> 1.7)
   shoulda-matchers
-  sidekiq (< 8)
+  sidekiq (< 9)
   sidekiq-bulk (~> 0.2.0)
-  sidekiq-scheduler (~> 5.0)
+  sidekiq-scheduler (~> 6.0)
   sidekiq-unique-jobs (> 8)
   simple-navigation (~> 4.4)
   simple_form (~> 5.2)
   simplecov (~> 0.22)
   simplecov-lcov (~> 0.8)
   stackprof
-  stoplight (~> 4.1)
+  stoplight
   strong_migrations
   test-prof
   thor (~> 1.2)
@@ -1096,10 +1080,11 @@ DEPENDENCIES
   webauthn (~> 3.0)
   webmock (~> 3.18)
   webpush!
+  websocket-driver (~> 0.8)
   xorcist (~> 1.1)
 
 RUBY VERSION
    ruby 3.4.1p0
 
 BUNDLED WITH
-   2.6.9
+   2.7.2
diff --git a/README.md b/README.md
index 552940fbea7..5c0e596b727 100644
--- a/README.md
+++ b/README.md
@@ -51,14 +51,14 @@ Mastodon is a **free, open-source social network server** based on [ActivityPub]
 - [Redis](https://redis.io/) and [Sidekiq](https://sidekiq.org/) are used for caching and queueing.
 - [Node.js](https://nodejs.org/) powers the streaming API.
 - [React.js](https://reactjs.org/) and [Redux](https://redux.js.org/) are used for the dynamic parts of the interface.
-- [BrowserStack](https://www.browserstack.com/) supports testing on real devices and browsers.
-- [Chromatic](https://www.chromatic.com/) provides visual regression testing.
+- [BrowserStack](https://www.browserstack.com/) supports testing on real devices and browsers. (This project is tested with BrowserStack)
+- [Chromatic](https://www.chromatic.com/) provides visual regression testing. (This project is tested with Chromatic)
 
 ### Requirements
 
 - **Ruby** 3.2+
 - **PostgreSQL** 13+
-- **Redis** 6.2+
+- **Redis** 7.0+
 - **Node.js** 20+
 
 This repository includes deployment configurations for **Docker and docker-compose**, as well as for other environments like Heroku and Scalingo. For Helm charts, reference the [mastodon/chart repository](https://github.com/mastodon/chart). A [**standalone** installation guide](https://docs.joinmastodon.org/admin/install/) is available in the main documentation.
diff --git a/SECURITY.md b/SECURITY.md
index 26c06e67f83..19f431fac59 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -13,8 +13,9 @@ A "vulnerability in Mastodon" is a vulnerability in the code distributed through
 
 ## Supported Versions
 
-| Version | Supported |
-| ------- | --------- |
-| 4.3.x   | Yes       |
-| 4.2.x   | Yes       |
-| < 4.2   | No        |
+| Version | Supported        |
+| ------- | ---------------- |
+| 4.4.x   | Yes              |
+| 4.3.x   | Yes              |
+| 4.2.x   | Until 2026-01-08 |
+| < 4.2   | No               |
diff --git a/Vagrantfile b/Vagrantfile
index ce456060cdd..0a343670240 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -54,6 +54,7 @@ sudo apt-get install \
   pkg-config \
   protobuf-compiler \
   zlib1g-dev \
+  libvips42t64 \
   -y
 
 # Install rvm
@@ -134,7 +135,7 @@ VAGRANTFILE_API_VERSION = "2"
 
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 
-  config.vm.box = "ubuntu/focal64"
+  config.vm.box = "bento/ubuntu-24.04"
 
   config.vm.provider :virtualbox do |vb|
     vb.name = "mastodon"
diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb
index c3131edce93..efd0c92cef2 100644
--- a/app/controllers/accounts_controller.rb
+++ b/app/controllers/accounts_controller.rb
@@ -71,6 +71,10 @@ class AccountsController < ApplicationController
     params[:username]
   end
 
+  def account_id_param
+    params[:id]
+  end
+
   def skip_temporary_suspension_response?
     request.format == :json
   end
diff --git a/app/controllers/activitypub/contexts_controller.rb b/app/controllers/activitypub/contexts_controller.rb
new file mode 100644
index 00000000000..4daa75552e2
--- /dev/null
+++ b/app/controllers/activitypub/contexts_controller.rb
@@ -0,0 +1,82 @@
+# frozen_string_literal: true
+
+class ActivityPub::ContextsController < ActivityPub::BaseController
+  vary_by -> { 'Signature' if authorized_fetch_mode? }
+
+  before_action :require_account_signature!, if: :authorized_fetch_mode?
+  before_action :set_conversation
+  before_action :set_items
+
+  DESCENDANTS_LIMIT = 60
+
+  def show
+    expires_in 3.minutes, public: public_fetch_mode?
+    render_with_cache json: context_presenter, serializer: ActivityPub::ContextSerializer, adapter: ActivityPub::Adapter, content_type: 'application/activity+json'
+  end
+
+  def items
+    expires_in 3.minutes, public: public_fetch_mode?
+    render_with_cache json: items_collection_presenter, serializer: ActivityPub::CollectionSerializer, adapter: ActivityPub::Adapter, content_type: 'application/activity+json'
+  end
+
+  private
+
+  def account_required?
+    false
+  end
+
+  def set_conversation
+    account_id, status_id = params[:id].split('-')
+    @conversation = Conversation.local.find_by(parent_account_id: account_id, parent_status_id: status_id)
+  end
+
+  def set_items
+    @items = @conversation.statuses.distributable_visibility.paginate_by_min_id(DESCENDANTS_LIMIT, params[:min_id])
+  end
+
+  def context_presenter
+    first_page = ActivityPub::CollectionPresenter.new(
+      id: items_context_url(@conversation, page_params),
+      type: :unordered,
+      part_of: items_context_url(@conversation),
+      next: next_page,
+      items: @items.map { |status| status.local? ? ActivityPub::TagManager.instance.uri_for(status) : status.uri }
+    )
+
+    ActivityPub::ContextPresenter.from_conversation(@conversation).tap do |presenter|
+      presenter.first = first_page
+    end
+  end
+
+  def items_collection_presenter
+    page = ActivityPub::CollectionPresenter.new(
+      id: items_context_url(@conversation, page_params),
+      type: :unordered,
+      part_of: items_context_url(@conversation),
+      next: next_page,
+      items: @items.map { |status| status.local? ? ActivityPub::TagManager.instance.uri_for(status) : status.uri }
+    )
+
+    return page if page_requested?
+
+    ActivityPub::CollectionPresenter.new(
+      id: items_context_url(@conversation),
+      type: :unordered,
+      first: page
+    )
+  end
+
+  def page_requested?
+    truthy_param?(:page)
+  end
+
+  def next_page
+    return nil if @items.size < DESCENDANTS_LIMIT
+
+    items_context_url(@conversation, page: true, min_id: @items.last.id)
+  end
+
+  def page_params
+    params.permit(:page, :min_id)
+  end
+end
diff --git a/app/controllers/activitypub/likes_controller.rb b/app/controllers/activitypub/likes_controller.rb
index 4aa6a4a771f..e875517b021 100644
--- a/app/controllers/activitypub/likes_controller.rb
+++ b/app/controllers/activitypub/likes_controller.rb
@@ -28,7 +28,7 @@ class ActivityPub::LikesController < ActivityPub::BaseController
 
   def likes_collection_presenter
     ActivityPub::CollectionPresenter.new(
-      id: account_status_likes_url(@account, @status),
+      id: ActivityPub::TagManager.instance.likes_uri_for(@status),
       type: :unordered,
       size: @status.favourites_count
     )
diff --git a/app/controllers/activitypub/outboxes_controller.rb b/app/controllers/activitypub/outboxes_controller.rb
index a9476b806f5..928977768b9 100644
--- a/app/controllers/activitypub/outboxes_controller.rb
+++ b/app/controllers/activitypub/outboxes_controller.rb
@@ -73,6 +73,8 @@ class ActivityPub::OutboxesController < ActivityPub::BaseController
   end
 
   def set_account
-    @account = params[:account_username].present? ? Account.find_local!(username_param) : Account.representative
+    return super if params[:account_username].present? || params[:account_id].present?
+
+    @account = Account.representative
   end
 end
diff --git a/app/controllers/activitypub/quote_authorizations_controller.rb b/app/controllers/activitypub/quote_authorizations_controller.rb
new file mode 100644
index 00000000000..f2f5313e1ad
--- /dev/null
+++ b/app/controllers/activitypub/quote_authorizations_controller.rb
@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+class ActivityPub::QuoteAuthorizationsController < ActivityPub::BaseController
+  include Authorization
+
+  vary_by -> { 'Signature' if authorized_fetch_mode? }
+
+  before_action :require_account_signature!, if: :authorized_fetch_mode?
+  before_action :set_quote_authorization
+
+  def show
+    expires_in 30.seconds, public: true if @quote.status.distributable? && public_fetch_mode?
+    render json: @quote, serializer: ActivityPub::QuoteAuthorizationSerializer, adapter: ActivityPub::Adapter, content_type: 'application/activity+json'
+  end
+
+  private
+
+  def pundit_user
+    signed_request_account
+  end
+
+  def set_quote_authorization
+    @quote = Quote.accepted.where(quoted_account: @account).find(params[:id])
+    return not_found unless @quote.status.present? && @quote.quoted_status.present?
+
+    authorize @quote.status, :show?
+  rescue Mastodon::NotPermittedError
+    not_found
+  end
+end
diff --git a/app/controllers/activitypub/replies_controller.rb b/app/controllers/activitypub/replies_controller.rb
index 0a19275d38e..1959f50d676 100644
--- a/app/controllers/activitypub/replies_controller.rb
+++ b/app/controllers/activitypub/replies_controller.rb
@@ -37,7 +37,7 @@ class ActivityPub::RepliesController < ActivityPub::BaseController
 
   def replies_collection_presenter
     page = ActivityPub::CollectionPresenter.new(
-      id: account_status_replies_url(@account, @status, page_params),
+      id: ActivityPub::TagManager.instance.replies_uri_for(@status, page_params),
       type: :unordered,
       part_of: account_status_replies_url(@account, @status),
       next: next_page,
@@ -47,7 +47,7 @@ class ActivityPub::RepliesController < ActivityPub::BaseController
     return page if page_requested?
 
     ActivityPub::CollectionPresenter.new(
-      id: account_status_replies_url(@account, @status),
+      id: ActivityPub::TagManager.instance.replies_uri_for(@status),
       type: :unordered,
       first: page
     )
@@ -66,8 +66,7 @@ class ActivityPub::RepliesController < ActivityPub::BaseController
       # Only consider remote accounts
       return nil if @replies.size < DESCENDANTS_LIMIT
 
-      account_status_replies_url(
-        @account,
+      ActivityPub::TagManager.instance.replies_uri_for(
         @status,
         page: true,
         min_id: @replies&.last&.id,
@@ -77,8 +76,7 @@ class ActivityPub::RepliesController < ActivityPub::BaseController
       # For now, we're serving only self-replies, but next page might be other accounts
       next_only_other_accounts = @replies&.last&.account_id != @account.id || @replies.size < DESCENDANTS_LIMIT
 
-      account_status_replies_url(
-        @account,
+      ActivityPub::TagManager.instance.replies_uri_for(
         @status,
         page: true,
         min_id: next_only_other_accounts ? nil : @replies&.last&.id,
diff --git a/app/controllers/activitypub/shares_controller.rb b/app/controllers/activitypub/shares_controller.rb
index 65b4a5b3831..2d1e389885a 100644
--- a/app/controllers/activitypub/shares_controller.rb
+++ b/app/controllers/activitypub/shares_controller.rb
@@ -28,7 +28,7 @@ class ActivityPub::SharesController < ActivityPub::BaseController
 
   def shares_collection_presenter
     ActivityPub::CollectionPresenter.new(
-      id: account_status_shares_url(@account, @status),
+      id: ActivityPub::TagManager.instance.shares_uri_for(@status),
       type: :unordered,
       size: @status.reblogs_count
     )
diff --git a/app/controllers/admin/account_actions_controller.rb b/app/controllers/admin/account_actions_controller.rb
index 91849811e36..3cfd1e17617 100644
--- a/app/controllers/admin/account_actions_controller.rb
+++ b/app/controllers/admin/account_actions_controller.rb
@@ -14,16 +14,20 @@ module Admin
     def create
       authorize @account, :show?
 
-      account_action                 = Admin::AccountAction.new(resource_params)
-      account_action.target_account  = @account
-      account_action.current_account = current_account
+      @account_action                 = Admin::AccountAction.new(resource_params)
+      @account_action.target_account  = @account
+      @account_action.current_account = current_account
 
-      account_action.save!
-
-      if account_action.with_report?
-        redirect_to admin_reports_path, notice: I18n.t('admin.reports.processed_msg', id: resource_params[:report_id])
+      if @account_action.save
+        if @account_action.with_report?
+          redirect_to admin_reports_path, notice: I18n.t('admin.reports.processed_msg', id: resource_params[:report_id])
+        else
+          redirect_to admin_account_path(@account.id)
+        end
       else
-        redirect_to admin_account_path(@account.id)
+        @warning_presets = AccountWarningPreset.all
+
+        render :new
       end
     end
 
diff --git a/app/controllers/admin/accounts_controller.rb b/app/controllers/admin/accounts_controller.rb
index 10391aa3e21..e1406930147 100644
--- a/app/controllers/admin/accounts_controller.rb
+++ b/app/controllers/admin/accounts_controller.rb
@@ -16,11 +16,14 @@ module Admin
     def batch
       authorize :account, :index?
 
-      @form = Form::AccountBatch.new(form_account_batch_params)
-      @form.current_account = current_account
-      @form.action = action_from_button
-      @form.select_all_matching = params[:select_all_matching]
-      @form.query = filtered_accounts
+      @form = Form::AccountBatch.new(
+        form_account_batch_params.merge(
+          action: action_from_button,
+          current_account:,
+          query: filtered_accounts,
+          select_all_matching: params[:select_all_matching]
+        )
+      )
       @form.save
     rescue ActionController::ParameterMissing
       flash[:alert] = I18n.t('admin.accounts.no_account_selected')
diff --git a/app/controllers/admin/action_logs_controller.rb b/app/controllers/admin/action_logs_controller.rb
index 8b8e83fde77..61ca1661898 100644
--- a/app/controllers/admin/action_logs_controller.rb
+++ b/app/controllers/admin/action_logs_controller.rb
@@ -6,7 +6,7 @@ module Admin
 
     def index
       authorize :audit_log, :index?
-      @auditable_accounts = Account.auditable.select(:id, :username)
+      @auditable_accounts = Account.auditable.select(:id, :username).order(username: :asc)
     end
 
     private
diff --git a/app/controllers/admin/confirmations_controller.rb b/app/controllers/admin/confirmations_controller.rb
index 702550eecc1..5d1555796f4 100644
--- a/app/controllers/admin/confirmations_controller.rb
+++ b/app/controllers/admin/confirmations_controller.rb
@@ -19,15 +19,13 @@ module Admin
 
       log_action :resend, @user
 
-      flash[:notice] = I18n.t('admin.accounts.resend_confirmation.success')
-      redirect_to admin_accounts_path
+      redirect_to admin_accounts_path, notice: t('admin.accounts.resend_confirmation.success')
     end
 
     private
 
     def redirect_confirmed_user
-      flash[:error] = I18n.t('admin.accounts.resend_confirmation.already_confirmed')
-      redirect_to admin_accounts_path
+      redirect_to admin_accounts_path, flash: { error: t('admin.accounts.resend_confirmation.already_confirmed') }
     end
 
     def user_confirmed?
diff --git a/app/controllers/admin/dashboard_controller.rb b/app/controllers/admin/dashboard_controller.rb
index 5b0867dcfba..fe314daeca6 100644
--- a/app/controllers/admin/dashboard_controller.rb
+++ b/app/controllers/admin/dashboard_controller.rb
@@ -9,10 +9,16 @@ module Admin
 
       @pending_appeals_count = Appeal.pending.async_count
       @pending_reports_count = Report.unresolved.async_count
-      @pending_tags_count    = Tag.pending_review.async_count
+      @pending_tags_count    = pending_tags.async_count
       @pending_users_count   = User.pending.async_count
       @system_checks         = Admin::SystemCheck.perform(current_user)
       @time_period           = (29.days.ago.to_date...Time.now.utc.to_date)
     end
+
+    private
+
+    def pending_tags
+      ::Trends::TagFilter.new(status: :pending_review).results
+    end
   end
 end
diff --git a/app/controllers/admin/disputes/appeals_controller.rb b/app/controllers/admin/disputes/appeals_controller.rb
index 0c415536767..7c70603e231 100644
--- a/app/controllers/admin/disputes/appeals_controller.rb
+++ b/app/controllers/admin/disputes/appeals_controller.rb
@@ -18,7 +18,7 @@ class Admin::Disputes::AppealsController < Admin::BaseController
   end
 
   def reject
-    authorize @appeal, :approve?
+    authorize @appeal, :reject?
     log_action :reject, @appeal
     @appeal.reject!(current_account)
     UserMailer.appeal_rejected(@appeal.account.user, @appeal).deliver_later
diff --git a/app/controllers/admin/domain_blocks_controller.rb b/app/controllers/admin/domain_blocks_controller.rb
index c3443b70776..5e1074b224a 100644
--- a/app/controllers/admin/domain_blocks_controller.rb
+++ b/app/controllers/admin/domain_blocks_controller.rb
@@ -36,7 +36,7 @@ module Admin
     end
 
     def edit
-      authorize :domain_block, :create?
+      authorize :domain_block, :update?
     end
 
     def create
@@ -129,7 +129,7 @@ module Admin
     end
 
     def requires_confirmation?
-      @domain_block.valid? && (@domain_block.new_record? || @domain_block.severity_changed?) && @domain_block.severity.to_s == 'suspend' && !params[:confirm]
+      @domain_block.valid? && (@domain_block.new_record? || @domain_block.severity_changed?) && @domain_block.suspend? && !params[:confirm]
     end
   end
 end
diff --git a/app/controllers/admin/export_domain_allows_controller.rb b/app/controllers/admin/export_domain_allows_controller.rb
index ca88c6525e0..d1a2ea5bbf2 100644
--- a/app/controllers/admin/export_domain_allows_controller.rb
+++ b/app/controllers/admin/export_domain_allows_controller.rb
@@ -49,8 +49,8 @@ module Admin
 
     def export_data
       CSV.generate(headers: export_headers, write_headers: true) do |content|
-        DomainAllow.allowed_domains.each do |instance|
-          content << [instance.domain]
+        DomainAllow.allowed_domains.each do |domain|
+          content << [domain]
         end
       end
     end
diff --git a/app/controllers/admin/reports/actions_controller.rb b/app/controllers/admin/reports/actions_controller.rb
index 554f7906f83..fb7b6878bae 100644
--- a/app/controllers/admin/reports/actions_controller.rb
+++ b/app/controllers/admin/reports/actions_controller.rb
@@ -13,27 +13,9 @@ class Admin::Reports::ActionsController < Admin::BaseController
 
     case action_from_button
     when 'delete', 'mark_as_sensitive'
-      status_batch_action = Admin::StatusBatchAction.new(
-        type: action_from_button,
-        status_ids: @report.status_ids,
-        current_account: current_account,
-        report_id: @report.id,
-        send_email_notification: !@report.spam?,
-        text: params[:text]
-      )
-
-      status_batch_action.save!
+      Admin::StatusBatchAction.new(status_batch_action_params).save!
     when 'silence', 'suspend'
-      account_action = Admin::AccountAction.new(
-        type: action_from_button,
-        report_id: @report.id,
-        target_account: @report.target_account,
-        current_account: current_account,
-        send_email_notification: !@report.spam?,
-        text: params[:text]
-      )
-
-      account_action.save!
+      Admin::AccountAction.new(account_action_params).save!
     else
       return redirect_to admin_report_path(@report), alert: I18n.t('admin.reports.unknown_action_msg', action: action_from_button)
     end
@@ -43,6 +25,26 @@ class Admin::Reports::ActionsController < Admin::BaseController
 
   private
 
+  def status_batch_action_params
+    shared_params
+      .merge(status_ids: @report.status_ids)
+  end
+
+  def account_action_params
+    shared_params
+      .merge(target_account: @report.target_account)
+  end
+
+  def shared_params
+    {
+      current_account: current_account,
+      report_id: @report.id,
+      send_email_notification: !@report.spam?,
+      text: params[:text],
+      type: action_from_button,
+    }
+  end
+
   def set_report
     @report = Report.find(params[:report_id])
   end
diff --git a/app/controllers/admin/settings_controller.rb b/app/controllers/admin/settings_controller.rb
index 2ae5ec82556..a08375e0a41 100644
--- a/app/controllers/admin/settings_controller.rb
+++ b/app/controllers/admin/settings_controller.rb
@@ -14,8 +14,7 @@ module Admin
       @admin_settings = Form::AdminSettings.new(settings_params)
 
       if @admin_settings.save
-        flash[:notice] = I18n.t('generic.changes_saved_msg')
-        redirect_to after_update_redirect_path
+        redirect_to after_update_redirect_path, notice: t('generic.changes_saved_msg')
       else
         render :show
       end
diff --git a/app/controllers/admin/tags_controller.rb b/app/controllers/admin/tags_controller.rb
index a7bfd647944..f2c28328f86 100644
--- a/app/controllers/admin/tags_controller.rb
+++ b/app/controllers/admin/tags_controller.rb
@@ -5,6 +5,7 @@ module Admin
     before_action :set_tag, except: [:index]
 
     PER_PAGE = 20
+    PERIOD_DAYS = 6.days
 
     def index
       authorize :tag, :index?
@@ -15,7 +16,7 @@ module Admin
     def show
       authorize @tag, :show?
 
-      @time_period = (6.days.ago.to_date...Time.now.utc.to_date)
+      @time_period = report_range
     end
 
     def update
@@ -24,7 +25,7 @@ module Admin
       if @tag.update(tag_params.merge(reviewed_at: Time.now.utc))
         redirect_to admin_tag_path(@tag.id), notice: I18n.t('admin.tags.updated_msg')
       else
-        @time_period = (6.days.ago.to_date...Time.now.utc.to_date)
+        @time_period = report_range
 
         render :show
       end
@@ -36,6 +37,10 @@ module Admin
       @tag = Tag.find(params[:id])
     end
 
+    def report_range
+      (PERIOD_DAYS.ago.to_date...Time.now.utc.to_date)
+    end
+
     def tag_params
       params
         .expect(tag: [:name, :display_name, :trendable, :usable, :listable])
diff --git a/app/controllers/admin/username_blocks_controller.rb b/app/controllers/admin/username_blocks_controller.rb
new file mode 100644
index 00000000000..22ac9408178
--- /dev/null
+++ b/app/controllers/admin/username_blocks_controller.rb
@@ -0,0 +1,77 @@
+# frozen_string_literal: true
+
+class Admin::UsernameBlocksController < Admin::BaseController
+  before_action :set_username_block, only: [:edit, :update]
+
+  def index
+    authorize :username_block, :index?
+    @username_blocks = UsernameBlock.order(username: :asc).page(params[:page])
+    @form = Form::UsernameBlockBatch.new
+  end
+
+  def batch
+    authorize :username_block, :index?
+
+    @form = Form::UsernameBlockBatch.new(form_username_block_batch_params.merge(current_account: current_account, action: action_from_button))
+    @form.save
+  rescue ActionController::ParameterMissing
+    flash[:alert] = I18n.t('admin.username_blocks.no_username_block_selected')
+  rescue Mastodon::NotPermittedError
+    flash[:alert] = I18n.t('admin.username_blocks.not_permitted')
+  ensure
+    redirect_to admin_username_blocks_path
+  end
+
+  def new
+    authorize :username_block, :create?
+    @username_block = UsernameBlock.new(exact: true)
+  end
+
+  def edit
+    authorize @username_block, :update?
+  end
+
+  def create
+    authorize :username_block, :create?
+
+    @username_block = UsernameBlock.new(resource_params)
+
+    if @username_block.save
+      log_action :create, @username_block
+      redirect_to admin_username_blocks_path, notice: I18n.t('admin.username_blocks.created_msg')
+    else
+      render :new
+    end
+  end
+
+  def update
+    authorize @username_block, :update?
+
+    if @username_block.update(resource_params)
+      log_action :update, @username_block
+      redirect_to admin_username_blocks_path, notice: I18n.t('admin.username_blocks.updated_msg')
+    else
+      render :new
+    end
+  end
+
+  private
+
+  def set_username_block
+    @username_block = UsernameBlock.find(params[:id])
+  end
+
+  def form_username_block_batch_params
+    params
+      .expect(form_username_block_batch: [username_block_ids: []])
+  end
+
+  def resource_params
+    params
+      .expect(username_block: [:username, :comparison, :allow_with_approval])
+  end
+
+  def action_from_button
+    'delete' if params[:delete]
+  end
+end
diff --git a/app/controllers/api/v1/accounts/credentials_controller.rb b/app/controllers/api/v1/accounts/credentials_controller.rb
index b90036a5cd9..2c46afff609 100644
--- a/app/controllers/api/v1/accounts/credentials_controller.rb
+++ b/app/controllers/api/v1/accounts/credentials_controller.rb
@@ -48,6 +48,7 @@ class Api::V1::Accounts::CredentialsController < Api::BaseController
         default_privacy: source_params.fetch(:privacy, @account.user.setting_default_privacy),
         default_sensitive: source_params.fetch(:sensitive, @account.user.setting_default_sensitive),
         default_language: source_params.fetch(:language, @account.user.setting_default_language),
+        default_quote_policy: source_params.fetch(:quote_policy, @account.user.setting_default_quote_policy),
       },
     }
   end
diff --git a/app/controllers/api/v1/admin/tags_controller.rb b/app/controllers/api/v1/admin/tags_controller.rb
index 283383acb4a..dd272120e21 100644
--- a/app/controllers/api/v1/admin/tags_controller.rb
+++ b/app/controllers/api/v1/admin/tags_controller.rb
@@ -2,6 +2,7 @@
 
 class Api::V1::Admin::TagsController < Api::BaseController
   include Authorization
+
   before_action -> { authorize_if_got_token! :'admin:read' }, only: [:index, :show]
   before_action -> { authorize_if_got_token! :'admin:write' }, only: :update
 
diff --git a/app/controllers/api/v1/invites_controller.rb b/app/controllers/api/v1/invites_controller.rb
index ea17ba74038..7b24cec7918 100644
--- a/app/controllers/api/v1/invites_controller.rb
+++ b/app/controllers/api/v1/invites_controller.rb
@@ -7,6 +7,7 @@ class Api::V1::InvitesController < Api::BaseController
   skip_around_action :set_locale
 
   before_action :set_invite
+  before_action :check_valid_usage!
   before_action :check_enabled_registrations!
 
   # Override `current_user` to avoid reading session cookies
@@ -22,9 +23,11 @@ class Api::V1::InvitesController < Api::BaseController
     @invite = Invite.find_by!(code: params[:invite_code])
   end
 
-  def check_enabled_registrations!
-    return render json: { error: I18n.t('invites.invalid') }, status: 401 unless @invite.valid_for_use?
+  def check_valid_usage!
+    render json: { error: I18n.t('invites.invalid') }, status: 401 unless @invite.valid_for_use?
+  end
 
+  def check_enabled_registrations!
     raise Mastodon::NotPermittedError unless allowed_registration?(request.remote_ip, @invite)
   end
 end
diff --git a/app/controllers/api/v1/push/subscriptions_controller.rb b/app/controllers/api/v1/push/subscriptions_controller.rb
index f2c52f2846e..3b0cda7d931 100644
--- a/app/controllers/api/v1/push/subscriptions_controller.rb
+++ b/app/controllers/api/v1/push/subscriptions_controller.rb
@@ -16,16 +16,7 @@ class Api::V1::Push::SubscriptionsController < Api::BaseController
   def create
     with_redis_lock("push_subscription:#{current_user.id}") do
       destroy_web_push_subscriptions!
-
-      @push_subscription = Web::PushSubscription.create!(
-        endpoint: subscription_params[:endpoint],
-        key_p256dh: subscription_params[:keys][:p256dh],
-        key_auth: subscription_params[:keys][:auth],
-        standard: subscription_params[:standard] || false,
-        data: data_params,
-        user_id: current_user.id,
-        access_token_id: doorkeeper_token.id
-      )
+      @push_subscription = Web::PushSubscription.create!(web_push_subscription_params)
     end
 
     render json: @push_subscription, serializer: REST::WebPushSubscriptionSerializer
@@ -55,6 +46,18 @@ class Api::V1::Push::SubscriptionsController < Api::BaseController
     not_found if @push_subscription.nil?
   end
 
+  def web_push_subscription_params
+    {
+      access_token_id: doorkeeper_token.id,
+      data: data_params,
+      endpoint: subscription_params[:endpoint],
+      key_auth: subscription_params[:keys][:auth],
+      key_p256dh: subscription_params[:keys][:p256dh],
+      standard: subscription_params[:standard] || false,
+      user_id: current_user.id,
+    }
+  end
+
   def subscription_params
     params.expect(subscription: [:endpoint, :standard, keys: [:auth, :p256dh]])
   end
diff --git a/app/controllers/api/v1/statuses/interaction_policies_controller.rb b/app/controllers/api/v1/statuses/interaction_policies_controller.rb
new file mode 100644
index 00000000000..5cfb2d0e8fd
--- /dev/null
+++ b/app/controllers/api/v1/statuses/interaction_policies_controller.rb
@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+class Api::V1::Statuses::InteractionPoliciesController < Api::V1::Statuses::BaseController
+  include Api::InteractionPoliciesConcern
+
+  before_action -> { doorkeeper_authorize! :write, :'write:statuses' }
+
+  def update
+    authorize @status, :update?
+
+    @status.update!(quote_approval_policy: quote_approval_policy)
+
+    broadcast_updates! if @status.quote_approval_policy_previously_changed?
+
+    render json: @status, serializer: REST::StatusSerializer
+  end
+
+  private
+
+  def status_params
+    params.permit(:quote_approval_policy)
+  end
+
+  def broadcast_updates!
+    DistributionWorker.perform_async(@status.id, { 'update' => true, 'skip_notifications' => true })
+    ActivityPub::StatusUpdateDistributionWorker.perform_async(@status.id, { 'updated_at' => Time.now.utc.iso8601 })
+  end
+end
diff --git a/app/controllers/api/v1/statuses/quotes_controller.rb b/app/controllers/api/v1/statuses/quotes_controller.rb
new file mode 100644
index 00000000000..be3a4edc83d
--- /dev/null
+++ b/app/controllers/api/v1/statuses/quotes_controller.rb
@@ -0,0 +1,74 @@
+# frozen_string_literal: true
+
+class Api::V1::Statuses::QuotesController < Api::V1::Statuses::BaseController
+  before_action -> { doorkeeper_authorize! :read, :'read:statuses' }, only: :index
+  before_action -> { doorkeeper_authorize! :write, :'write:statuses' }, only: :revoke
+
+  before_action :set_statuses, only: :index
+
+  before_action :set_quote, only: :revoke
+  after_action :insert_pagination_headers, only: :index
+
+  def index
+    cache_if_unauthenticated!
+    render json: @statuses, each_serializer: REST::StatusSerializer
+  end
+
+  def revoke
+    authorize @quote, :revoke?
+
+    RevokeQuoteService.new.call(@quote)
+
+    render json: @quote.status, serializer: REST::StatusSerializer
+  end
+
+  private
+
+  def set_quote
+    @quote = @status.quotes.find_by!(status_id: params[:id])
+  end
+
+  def set_statuses
+    scope = default_statuses
+    scope = scope.not_excluded_by_account(current_account) unless current_account.nil?
+    @statuses = scope.merge(paginated_quotes).to_a
+
+    # Store next page info before filtering
+    @records_continue = @statuses.size == limit_param(DEFAULT_STATUSES_LIMIT)
+    @pagination_since_id = @statuses.first.quote.id unless @statuses.empty?
+    @pagination_max_id = @statuses.last.quote.id if @records_continue
+
+    if current_account&.id != @status.account_id
+      domains = @statuses.filter_map(&:account_domain).uniq
+      account_ids = @statuses.map(&:account_id).uniq
+      relations = current_account&.relations_map(account_ids, domains) || {}
+      @statuses.reject! { |status| StatusFilter.new(status, current_account, relations).filtered? }
+    end
+  end
+
+  def default_statuses
+    Status.includes(:quote).references(:quote)
+  end
+
+  def paginated_quotes
+    @status.quotes.accepted.paginate_by_max_id(
+      limit_param(DEFAULT_STATUSES_LIMIT),
+      params[:max_id],
+      params[:since_id]
+    )
+  end
+
+  def next_path
+    api_v1_status_quotes_url pagination_params(max_id: pagination_max_id) if records_continue?
+  end
+
+  def prev_path
+    api_v1_status_quotes_url pagination_params(since_id: pagination_since_id) unless @statuses.empty?
+  end
+
+  attr_reader :pagination_max_id, :pagination_since_id
+
+  def records_continue?
+    @records_continue
+  end
+end
diff --git a/app/controllers/api/v1/statuses_controller.rb b/app/controllers/api/v1/statuses_controller.rb
index d3b0e89e97b..6c4e7619b7b 100644
--- a/app/controllers/api/v1/statuses_controller.rb
+++ b/app/controllers/api/v1/statuses_controller.rb
@@ -2,6 +2,8 @@
 
 class Api::V1::StatusesController < Api::BaseController
   include Authorization
+  include AsyncRefreshesConcern
+  include Api::InteractionPoliciesConcern
 
   before_action -> { authorize_if_got_token! :read, :'read:statuses' }, except: [:create, :update, :destroy]
   before_action -> { doorkeeper_authorize! :write, :'write:statuses' }, only:   [:create, :update, :destroy]
@@ -9,6 +11,7 @@ class Api::V1::StatusesController < Api::BaseController
   before_action :set_statuses, only:         [:index]
   before_action :set_status, only:           [:show, :context]
   before_action :set_thread, only:           [:create]
+  before_action :set_quoted_status, only:    [:create]
   before_action :check_statuses_limit, only: [:index]
 
   override_rate_limit_headers :create, family: :statuses
@@ -57,9 +60,21 @@ class Api::V1::StatusesController < Api::BaseController
     @context = Context.new(ancestors: loaded_ancestors, descendants: loaded_descendants)
     statuses = [@status] + @context.ancestors + @context.descendants
 
-    render json: @context, serializer: REST::ContextSerializer, relationships: StatusRelationshipsPresenter.new(statuses, current_user&.account_id)
+    refresh_key = "context:#{@status.id}:refresh"
+    async_refresh = AsyncRefresh.new(refresh_key)
 
-    ActivityPub::FetchAllRepliesWorker.perform_async(@status.id) if !current_account.nil? && @status.should_fetch_replies?
+    if async_refresh.running?
+      add_async_refresh_header(async_refresh)
+    elsif !current_account.nil? && @status.should_fetch_replies?
+      add_async_refresh_header(AsyncRefresh.create(refresh_key))
+
+      WorkerBatch.new.within do |batch|
+        batch.connect(refresh_key, threshold: 1.0)
+        ActivityPub::FetchAllRepliesWorker.perform_async(@status.id, { 'batch_id' => batch.id })
+      end
+    end
+
+    render json: @context, serializer: REST::ContextSerializer, relationships: StatusRelationshipsPresenter.new(statuses, current_user&.account_id)
   end
 
   def create
@@ -67,6 +82,8 @@ class Api::V1::StatusesController < Api::BaseController
       current_user.account,
       text: status_params[:status],
       thread: @thread,
+      quoted_status: @quoted_status,
+      quote_approval_policy: quote_approval_policy,
       media_ids: status_params[:media_ids],
       sensitive: status_params[:sensitive],
       spoiler_text: status_params[:spoiler_text],
@@ -98,7 +115,8 @@ class Api::V1::StatusesController < Api::BaseController
       sensitive: status_params[:sensitive],
       language: status_params[:language],
       spoiler_text: status_params[:spoiler_text],
-      poll: status_params[:poll]
+      poll: status_params[:poll],
+      quote_approval_policy: quote_approval_policy
     )
 
     render json: @status, serializer: REST::StatusSerializer
@@ -138,6 +156,14 @@ class Api::V1::StatusesController < Api::BaseController
     render json: { error: I18n.t('statuses.errors.in_reply_not_found') }, status: 404
   end
 
+  def set_quoted_status
+    @quoted_status = Status.find(status_params[:quoted_status_id]) if status_params[:quoted_status_id].present?
+    authorize(@quoted_status, :quote?) if @quoted_status.present?
+  rescue ActiveRecord::RecordNotFound, Mastodon::NotPermittedError
+    # TODO: distinguish between non-existing and non-quotable posts
+    render json: { error: I18n.t('statuses.errors.quoted_status_not_found') }, status: 404
+  end
+
   def check_statuses_limit
     raise(Mastodon::ValidationError) if status_ids.size > DEFAULT_STATUSES_LIMIT
   end
@@ -154,6 +180,8 @@ class Api::V1::StatusesController < Api::BaseController
     params.permit(
       :status,
       :in_reply_to_id,
+      :quoted_status_id,
+      :quote_approval_policy,
       :sensitive,
       :spoiler_text,
       :visibility,
diff --git a/app/controllers/api/v1/timelines/base_controller.rb b/app/controllers/api/v1/timelines/base_controller.rb
index 1dba4a5bb21..e79eba79ee5 100644
--- a/app/controllers/api/v1/timelines/base_controller.rb
+++ b/app/controllers/api/v1/timelines/base_controller.rb
@@ -3,14 +3,8 @@
 class Api::V1::Timelines::BaseController < Api::BaseController
   after_action :insert_pagination_headers, unless: -> { @statuses.empty? }
 
-  before_action :require_user!, if: :require_auth?
-
   private
 
-  def require_auth?
-    !Setting.timeline_preview
-  end
-
   def pagination_collection
     @statuses
   end
diff --git a/app/controllers/api/v1/timelines/home_controller.rb b/app/controllers/api/v1/timelines/home_controller.rb
index b8384a13687..a07faae7208 100644
--- a/app/controllers/api/v1/timelines/home_controller.rb
+++ b/app/controllers/api/v1/timelines/home_controller.rb
@@ -3,8 +3,8 @@
 class Api::V1::Timelines::HomeController < Api::V1::Timelines::BaseController
   include AsyncRefreshesConcern
 
-  before_action -> { doorkeeper_authorize! :read, :'read:statuses' }, only: [:show]
-  before_action :require_user!, only: [:show]
+  before_action -> { doorkeeper_authorize! :read, :'read:statuses' }
+  before_action :require_user!
 
   PERMITTED_PARAMS = %i(local limit).freeze
 
diff --git a/app/controllers/api/v1/timelines/link_controller.rb b/app/controllers/api/v1/timelines/link_controller.rb
index 37ed084f062..9e6ddd69243 100644
--- a/app/controllers/api/v1/timelines/link_controller.rb
+++ b/app/controllers/api/v1/timelines/link_controller.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Api::V1::Timelines::LinkController < Api::V1::Timelines::BaseController
+class Api::V1::Timelines::LinkController < Api::V1::Timelines::TopicController
   before_action -> { authorize_if_got_token! :read, :'read:statuses' }
   before_action :set_preview_card
   before_action :set_statuses
diff --git a/app/controllers/api/v1/timelines/public_controller.rb b/app/controllers/api/v1/timelines/public_controller.rb
index 029e8fc2c13..670c3b02b6b 100644
--- a/app/controllers/api/v1/timelines/public_controller.rb
+++ b/app/controllers/api/v1/timelines/public_controller.rb
@@ -2,6 +2,7 @@
 
 class Api::V1::Timelines::PublicController < Api::V1::Timelines::BaseController
   before_action -> { authorize_if_got_token! :read, :'read:statuses' }
+  before_action :require_user!, if: :require_auth?
 
   PERMITTED_PARAMS = %i(local remote limit only_media).freeze
 
@@ -13,6 +14,16 @@ class Api::V1::Timelines::PublicController < Api::V1::Timelines::BaseController
 
   private
 
+  def require_auth?
+    if truthy_param?(:local)
+      Setting.local_live_feed_access != 'public'
+    elsif truthy_param?(:remote)
+      Setting.remote_live_feed_access != 'public'
+    else
+      Setting.local_live_feed_access != 'public' || Setting.remote_live_feed_access != 'public'
+    end
+  end
+
   def load_statuses
     preloaded_public_statuses_page
   end
diff --git a/app/controllers/api/v1/timelines/tag_controller.rb b/app/controllers/api/v1/timelines/tag_controller.rb
index 2b097aab0f8..dc3c6a72157 100644
--- a/app/controllers/api/v1/timelines/tag_controller.rb
+++ b/app/controllers/api/v1/timelines/tag_controller.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Api::V1::Timelines::TagController < Api::V1::Timelines::BaseController
+class Api::V1::Timelines::TagController < Api::V1::Timelines::TopicController
   before_action -> { authorize_if_got_token! :read, :'read:statuses' }
   before_action :load_tag
 
@@ -14,10 +14,6 @@ class Api::V1::Timelines::TagController < Api::V1::Timelines::BaseController
 
   private
 
-  def require_auth?
-    !Setting.timeline_preview
-  end
-
   def load_tag
     @tag = Tag.find_normalized(params[:id])
   end
diff --git a/app/controllers/api/v1/timelines/topic_controller.rb b/app/controllers/api/v1/timelines/topic_controller.rb
new file mode 100644
index 00000000000..6faf54f7083
--- /dev/null
+++ b/app/controllers/api/v1/timelines/topic_controller.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class Api::V1::Timelines::TopicController < Api::V1::Timelines::BaseController
+  before_action :require_user!, if: :require_auth?
+
+  private
+
+  def require_auth?
+    if truthy_param?(:local)
+      Setting.local_topic_feed_access != 'public'
+    elsif truthy_param?(:remote)
+      Setting.remote_topic_feed_access != 'public'
+    else
+      Setting.local_topic_feed_access != 'public' || Setting.remote_topic_feed_access != 'public'
+    end
+  end
+end
diff --git a/app/controllers/api/v2/search_controller.rb b/app/controllers/api/v2/search_controller.rb
index 3ca13cc4275..c00ddf92cc0 100644
--- a/app/controllers/api/v2/search_controller.rb
+++ b/app/controllers/api/v2/search_controller.rb
@@ -20,7 +20,7 @@ class Api::V2::SearchController < Api::BaseController
     @search = Search.new(search_results)
     render json: @search, serializer: REST::SearchSerializer
   rescue Mastodon::SyntaxError
-    unprocessable_entity
+    unprocessable_content
   rescue ActiveRecord::RecordNotFound
     not_found
   end
diff --git a/app/controllers/api/web/push_subscriptions_controller.rb b/app/controllers/api/web/push_subscriptions_controller.rb
index 2711071b4a5..ced68d39fc7 100644
--- a/app/controllers/api/web/push_subscriptions_controller.rb
+++ b/app/controllers/api/web/push_subscriptions_controller.rb
@@ -49,7 +49,7 @@ class Api::Web::PushSubscriptionsController < Api::Web::BaseController
     {
       policy: 'all',
       alerts: Notification::TYPES.index_with { alerts_enabled },
-    }
+    }.deep_stringify_keys
   end
 
   def alerts_enabled
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 42abe990483..82d9e8380fc 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -28,7 +28,7 @@ class ApplicationController < ActionController::Base
   rescue_from Mastodon::NotPermittedError, with: :forbidden
   rescue_from ActionController::RoutingError, ActiveRecord::RecordNotFound, with: :not_found
   rescue_from ActionController::UnknownFormat, with: :not_acceptable
-  rescue_from ActionController::InvalidAuthenticityToken, with: :unprocessable_entity
+  rescue_from ActionController::InvalidAuthenticityToken, with: :unprocessable_content
   rescue_from Mastodon::RateLimitExceededError, with: :too_many_requests
 
   rescue_from(*Mastodon::HTTP_CONNECTION_ERRORS, with: :internal_server_error)
@@ -123,7 +123,7 @@ class ApplicationController < ActionController::Base
     respond_with_error(410)
   end
 
-  def unprocessable_entity
+  def unprocessable_content
     respond_with_error(422)
   end
 
diff --git a/app/controllers/auth/omniauth_callbacks_controller.rb b/app/controllers/auth/omniauth_callbacks_controller.rb
index 9d496220a3d..16de03fd72d 100644
--- a/app/controllers/auth/omniauth_callbacks_controller.rb
+++ b/app/controllers/auth/omniauth_callbacks_controller.rb
@@ -38,8 +38,7 @@ class Auth::OmniauthCallbacksController < Devise::OmniauthCallbacksController
   private
 
   def record_login_activity
-    LoginActivity.create(
-      user: @user,
+    @user.login_activities.create(
       success: true,
       authentication_method: :omniauth,
       provider: @provider,
diff --git a/app/controllers/auth/passwords_controller.rb b/app/controllers/auth/passwords_controller.rb
index 7c1ff59671d..2680a1c5fdc 100644
--- a/app/controllers/auth/passwords_controller.rb
+++ b/app/controllers/auth/passwords_controller.rb
@@ -19,8 +19,7 @@ class Auth::PasswordsController < Devise::PasswordsController
   private
 
   def redirect_invalid_reset_token
-    flash[:error] = I18n.t('auth.invalid_reset_password_token')
-    redirect_to new_password_path(resource_name)
+    redirect_to new_password_path(resource_name), flash: { error: t('auth.invalid_reset_password_token') }
   end
 
   def reset_password_token_is_valid?
diff --git a/app/controllers/auth/registrations_controller.rb b/app/controllers/auth/registrations_controller.rb
index 3b42dc48ba9..fc430544fbe 100644
--- a/app/controllers/auth/registrations_controller.rb
+++ b/app/controllers/auth/registrations_controller.rb
@@ -23,11 +23,11 @@ class Auth::RegistrationsController < Devise::RegistrationsController
     super(&:build_invite_request)
   end
 
-  def edit # rubocop:disable Lint/UselessMethodDefinition
+  def edit
     super
   end
 
-  def create # rubocop:disable Lint/UselessMethodDefinition
+  def create
     super
   end
 
diff --git a/app/controllers/auth/sessions_controller.rb b/app/controllers/auth/sessions_controller.rb
index 2808066aaf9..182f242ae5b 100644
--- a/app/controllers/auth/sessions_controller.rb
+++ b/app/controllers/auth/sessions_controller.rb
@@ -12,6 +12,8 @@ class Auth::SessionsController < Devise::SessionsController
   skip_before_action :require_functional!
   skip_before_action :update_user_sign_in
 
+  around_action :preserve_stored_location, only: :destroy, if: :continue_after?
+
   prepend_before_action :check_suspicious!, only: [:create]
 
   include Auth::TwoFactorAuthenticationConcern
@@ -31,11 +33,9 @@ class Auth::SessionsController < Devise::SessionsController
   end
 
   def destroy
-    tmp_stored_location = stored_location_for(:user)
     super
     session.delete(:challenge_passed_at)
     flash.delete(:notice)
-    store_location_for(:user, tmp_stored_location) if continue_after?
   end
 
   def webauthn_options
@@ -96,6 +96,12 @@ class Auth::SessionsController < Devise::SessionsController
 
   private
 
+  def preserve_stored_location
+    original_stored_location = stored_location_for(:user)
+    yield
+    store_location_for(:user, original_stored_location)
+  end
+
   def check_suspicious!
     user = find_user
     @login_is_suspicious = suspicious_sign_in?(user) unless user.nil?
@@ -151,12 +157,11 @@ class Auth::SessionsController < Devise::SessionsController
     sign_in(user)
     flash.delete(:notice)
 
-    LoginActivity.create(
-      user: user,
-      success: true,
-      authentication_method: security_measure,
-      ip: request.remote_ip,
-      user_agent: request.user_agent
+    user.login_activities.create(
+      request_details.merge(
+        authentication_method: security_measure,
+        success: true
+      )
     )
 
     UserMailer.suspicious_sign_in(user, request.remote_ip, request.user_agent, Time.now.utc).deliver_later! if @login_is_suspicious
@@ -167,13 +172,12 @@ class Auth::SessionsController < Devise::SessionsController
   end
 
   def on_authentication_failure(user, security_measure, failure_reason)
-    LoginActivity.create(
-      user: user,
-      success: false,
-      authentication_method: security_measure,
-      failure_reason: failure_reason,
-      ip: request.remote_ip,
-      user_agent: request.user_agent
+    user.login_activities.create(
+      request_details.merge(
+        authentication_method: security_measure,
+        failure_reason: failure_reason,
+        success: false
+      )
     )
 
     # Only send a notification email every hour at most
@@ -182,6 +186,13 @@ class Auth::SessionsController < Devise::SessionsController
     UserMailer.failed_2fa(user, request.remote_ip, request.user_agent, Time.now.utc).deliver_later!
   end
 
+  def request_details
+    {
+      ip: request.remote_ip,
+      user_agent: request.user_agent,
+    }
+  end
+
   def second_factor_attempts_key(user)
     "2fa_auth_attempts:#{user.id}:#{Time.now.utc.hour}"
   end
diff --git a/app/controllers/concerns/account_owned_concern.rb b/app/controllers/concerns/account_owned_concern.rb
index 2b132417f7c..7b3cd4d3ea6 100644
--- a/app/controllers/concerns/account_owned_concern.rb
+++ b/app/controllers/concerns/account_owned_concern.rb
@@ -18,7 +18,11 @@ module AccountOwnedConcern
   end
 
   def set_account
-    @account = Account.find_local!(username_param)
+    @account = username_param.present? ? Account.find_local!(username_param) : Account.local.find(account_id_param)
+  end
+
+  def account_id_param
+    params[:account_id]
   end
 
   def username_param
diff --git a/app/controllers/concerns/api/interaction_policies_concern.rb b/app/controllers/concerns/api/interaction_policies_concern.rb
new file mode 100644
index 00000000000..f1e1480c0c0
--- /dev/null
+++ b/app/controllers/concerns/api/interaction_policies_concern.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Api::InteractionPoliciesConcern
+  extend ActiveSupport::Concern
+
+  def quote_approval_policy
+    case status_params[:quote_approval_policy].presence || current_user.setting_default_quote_policy
+    when 'public'
+      Status::QUOTE_APPROVAL_POLICY_FLAGS[:public] << 16
+    when 'followers'
+      Status::QUOTE_APPROVAL_POLICY_FLAGS[:followers] << 16
+    when 'nobody'
+      0
+    else
+      # TODO: raise more useful message
+      raise ActiveRecord::RecordInvalid
+    end
+  end
+end
diff --git a/app/controllers/concerns/async_refreshes_concern.rb b/app/controllers/concerns/async_refreshes_concern.rb
index 29122e16b5e..2d0e9ff4ff4 100644
--- a/app/controllers/concerns/async_refreshes_concern.rb
+++ b/app/controllers/concerns/async_refreshes_concern.rb
@@ -6,6 +6,9 @@ module AsyncRefreshesConcern
   def add_async_refresh_header(async_refresh, retry_seconds: 3)
     return unless async_refresh.running?
 
-    response.headers['Mastodon-Async-Refresh'] = "id=\"#{async_refresh.id}\", retry=#{retry_seconds}"
+    value = "id=\"#{async_refresh.id}\", retry=#{retry_seconds}"
+    value += ", result_count=#{async_refresh.result_count}" unless async_refresh.result_count.nil?
+
+    response.headers['Mastodon-Async-Refresh'] = value
   end
 end
diff --git a/app/controllers/concerns/auth/captcha_concern.rb b/app/controllers/concerns/auth/captcha_concern.rb
index c01da212499..a6232db943b 100644
--- a/app/controllers/concerns/auth/captcha_concern.rb
+++ b/app/controllers/concerns/auth/captcha_concern.rb
@@ -5,6 +5,18 @@ module Auth::CaptchaConcern
 
   include Hcaptcha::Adapters::ViewMethods
 
+  CAPTCHA_DIRECTIVES = %w(
+    connect_src
+    frame_src
+    script_src
+    style_src
+  ).freeze
+
+  CAPTCHA_SOURCES = %w(
+    https://*.hcaptcha.com
+    https://hcaptcha.com
+  ).freeze
+
   included do
     helper_method :render_captcha
   end
@@ -42,20 +54,9 @@ module Auth::CaptchaConcern
   end
 
   def extend_csp_for_captcha!
-    policy = request.content_security_policy&.clone
+    return unless captcha_required? && request.content_security_policy.present?
 
-    return unless captcha_required? && policy.present?
-
-    %w(script_src frame_src style_src connect_src).each do |directive|
-      values = policy.send(directive)
-
-      values << 'https://hcaptcha.com' unless values.include?('https://hcaptcha.com') || values.include?('https:')
-      values << 'https://*.hcaptcha.com' unless values.include?('https://*.hcaptcha.com') || values.include?('https:')
-
-      policy.send(directive, *values)
-    end
-
-    request.content_security_policy = policy
+    request.content_security_policy = captcha_adjusted_policy
   end
 
   def render_captcha
@@ -63,4 +64,24 @@ module Auth::CaptchaConcern
 
     hcaptcha_tags
   end
+
+  private
+
+  def captcha_adjusted_policy
+    request.content_security_policy.clone.tap do |policy|
+      populate_captcha_policy(policy)
+    end
+  end
+
+  def populate_captcha_policy(policy)
+    CAPTCHA_DIRECTIVES.each do |directive|
+      values = policy.send(directive)
+
+      CAPTCHA_SOURCES.each do |source|
+        values << source unless values.include?(source) || values.include?('https:')
+      end
+
+      policy.send(directive, *values)
+    end
+  end
 end
diff --git a/app/controllers/concerns/signature_verification.rb b/app/controllers/concerns/signature_verification.rb
index 902feef6838..2bdd3558643 100644
--- a/app/controllers/concerns/signature_verification.rb
+++ b/app/controllers/concerns/signature_verification.rb
@@ -9,6 +9,8 @@ module SignatureVerification
 
   EXPIRATION_WINDOW_LIMIT = 12.hours
   CLOCK_SKEW_MARGIN       = 1.hour
+  STOPLIGHT_COOL_OFF_TIME = 5.minutes.seconds
+  STOPLIGHT_THRESHOLD = 1
 
   def require_account_signature!
     render json: signature_verification_failure_reason, status: signature_verification_failure_code unless signed_request_account
@@ -64,6 +66,9 @@ module SignatureVerification
     return (@signed_request_actor = actor) if signed_request.verified?(actor)
 
     fail_with! "Verification failed for #{actor.to_log_human_identifier} #{actor.uri}"
+  rescue Mastodon::MalformedHeaderError => e
+    @signature_verification_failure_code = 400
+    fail_with! e.message
   rescue Mastodon::SignatureVerificationError => e
     fail_with! e.message
   rescue *Mastodon::HTTP_CONNECTION_ERRORS => e
@@ -104,10 +109,12 @@ module SignatureVerification
   end
 
   def stoplight_wrapper
-    Stoplight("source:#{request.remote_ip}")
-      .with_threshold(1)
-      .with_cool_off_time(5.minutes.seconds)
-      .with_error_handler { |error, handle| error.is_a?(HTTP::Error) || error.is_a?(OpenSSL::SSL::SSLError) ? handle.call(error) : raise(error) }
+    Stoplight(
+      "source:#{request.remote_ip}",
+      cool_off_time: STOPLIGHT_COOL_OFF_TIME,
+      threshold: STOPLIGHT_THRESHOLD,
+      tracked_errors: [HTTP::Error, OpenSSL::SSL::SSLError]
+    )
   end
 
   def actor_refresh_key!(actor)
diff --git a/app/controllers/follower_accounts_controller.rb b/app/controllers/follower_accounts_controller.rb
index f4c7b37088a..e9727b756a4 100644
--- a/app/controllers/follower_accounts_controller.rb
+++ b/app/controllers/follower_accounts_controller.rb
@@ -60,17 +60,17 @@ class FollowerAccountsController < ApplicationController
   def collection_presenter
     if page_requested?
       ActivityPub::CollectionPresenter.new(
-        id: account_followers_url(@account, page: params.fetch(:page, 1)),
+        id: page_url(params.fetch(:page, 1)),
         type: :ordered,
         size: @account.followers_count,
         items: follows.map { |follow| ActivityPub::TagManager.instance.uri_for(follow.account) },
-        part_of: account_followers_url(@account),
+        part_of: ActivityPub::TagManager.instance.followers_uri_for(@account),
         next: next_page_url,
         prev: prev_page_url
       )
     else
       ActivityPub::CollectionPresenter.new(
-        id: account_followers_url(@account),
+        id: ActivityPub::TagManager.instance.followers_uri_for(@account),
         type: :ordered,
         size: @account.followers_count,
         first: page_url(1)
diff --git a/app/controllers/following_accounts_controller.rb b/app/controllers/following_accounts_controller.rb
index 268fad96d09..803d6e342a9 100644
--- a/app/controllers/following_accounts_controller.rb
+++ b/app/controllers/following_accounts_controller.rb
@@ -49,7 +49,7 @@ class FollowingAccountsController < ApplicationController
   end
 
   def page_url(page)
-    account_following_index_url(@account, page: page) unless page.nil?
+    ActivityPub::TagManager.instance.following_uri_for(@account, page: page) unless page.nil?
   end
 
   def next_page_url
@@ -63,17 +63,17 @@ class FollowingAccountsController < ApplicationController
   def collection_presenter
     if page_requested?
       ActivityPub::CollectionPresenter.new(
-        id: account_following_index_url(@account, page: params.fetch(:page, 1)),
+        id: page_url(params.fetch(:page, 1)),
         type: :ordered,
         size: @account.following_count,
         items: follows.map { |follow| ActivityPub::TagManager.instance.uri_for(follow.target_account) },
-        part_of: account_following_index_url(@account),
+        part_of: ActivityPub::TagManager.instance.following_uri_for(@account),
         next: next_page_url,
         prev: prev_page_url
       )
     else
       ActivityPub::CollectionPresenter.new(
-        id: account_following_index_url(@account),
+        id: ActivityPub::TagManager.instance.following_uri_for(@account),
         type: :ordered,
         size: @account.following_count,
         first: page_url(1)
diff --git a/app/controllers/settings/login_activities_controller.rb b/app/controllers/settings/login_activities_controller.rb
index 50e2d70cb9a..ae32dbf5570 100644
--- a/app/controllers/settings/login_activities_controller.rb
+++ b/app/controllers/settings/login_activities_controller.rb
@@ -5,6 +5,6 @@ class Settings::LoginActivitiesController < Settings::BaseController
   skip_before_action :require_functional!
 
   def index
-    @login_activities = LoginActivity.where(user: current_user).order(id: :desc).page(params[:page])
+    @login_activities = current_user.login_activities.order(id: :desc).page(params[:page])
   end
 end
diff --git a/app/controllers/settings/migration/redirects_controller.rb b/app/controllers/settings/migration/redirects_controller.rb
index d850e05e94f..08b01d6b108 100644
--- a/app/controllers/settings/migration/redirects_controller.rb
+++ b/app/controllers/settings/migration/redirects_controller.rb
@@ -22,7 +22,7 @@ class Settings::Migration::RedirectsController < Settings::BaseController
   end
 
   def destroy
-    if current_account.moved_to_account_id.present?
+    if current_account.moved?
       current_account.update!(moved_to_account: nil)
       ActivityPub::UpdateDistributionWorker.perform_async(current_account.id)
     end
diff --git a/app/controllers/settings/preferences/posting_defaults_controller.rb b/app/controllers/settings/preferences/posting_defaults_controller.rb
new file mode 100644
index 00000000000..dcff94fc712
--- /dev/null
+++ b/app/controllers/settings/preferences/posting_defaults_controller.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class Settings::Preferences::PostingDefaultsController < Settings::Preferences::BaseController
+  private
+
+  def after_update_redirect_path
+    settings_preferences_posting_defaults_path
+  end
+
+  def user_params
+    super.tap do |params|
+      params[:settings_attributes][:default_quote_policy] = 'nobody' if params[:settings_attributes][:default_privacy] == 'private'
+    end
+  end
+end
diff --git a/app/controllers/settings/sessions_controller.rb b/app/controllers/settings/sessions_controller.rb
index ee2fc5dc80f..fe59bdc4917 100644
--- a/app/controllers/settings/sessions_controller.rb
+++ b/app/controllers/settings/sessions_controller.rb
@@ -8,8 +8,7 @@ class Settings::SessionsController < Settings::BaseController
 
   def destroy
     @session.destroy!
-    flash[:notice] = I18n.t('sessions.revoke_success')
-    redirect_to edit_user_registration_path
+    redirect_to edit_user_registration_path, notice: t('sessions.revoke_success')
   end
 
   private
diff --git a/app/controllers/settings/two_factor_authentication/webauthn_credentials_controller.rb b/app/controllers/settings/two_factor_authentication/webauthn_credentials_controller.rb
index 9714d54f954..83dedb411d4 100644
--- a/app/controllers/settings/two_factor_authentication/webauthn_credentials_controller.rb
+++ b/app/controllers/settings/two_factor_authentication/webauthn_credentials_controller.rb
@@ -52,7 +52,7 @@ module Settings
             end
           else
             flash[:error] = I18n.t('webauthn_credentials.create.error')
-            status = :unprocessable_entity
+            status = :unprocessable_content
           end
         else
           flash[:error] = t('webauthn_credentials.create.error')
@@ -86,13 +86,11 @@ module Settings
       private
 
       def redirect_invalid_otp
-        flash[:error] = t('webauthn_credentials.otp_required')
-        redirect_to settings_two_factor_authentication_methods_path
+        redirect_to settings_two_factor_authentication_methods_path, flash: { error: t('webauthn_credentials.otp_required') }
       end
 
       def redirect_invalid_webauthn
-        flash[:error] = t('webauthn_credentials.not_enabled')
-        redirect_to settings_two_factor_authentication_methods_path
+        redirect_to settings_two_factor_authentication_methods_path, flash: { error: t('webauthn_credentials.not_enabled') }
       end
     end
   end
diff --git a/app/controllers/statuses_controller.rb b/app/controllers/statuses_controller.rb
index 341b0e64729..af6bebf36fd 100644
--- a/app/controllers/statuses_controller.rb
+++ b/app/controllers/statuses_controller.rb
@@ -11,6 +11,7 @@ class StatusesController < ApplicationController
   before_action :require_account_signature!, only: [:show, :activity], if: -> { request.format == :json && authorized_fetch_mode? }
   before_action :set_status
   before_action :redirect_to_original, only: :show
+  before_action :verify_embed_allowed, only: :embed
 
   after_action :set_link_headers
 
@@ -40,8 +41,6 @@ class StatusesController < ApplicationController
   end
 
   def embed
-    return not_found if @status.hidden? || @status.reblog?
-
     expires_in 180, public: true
     response.headers.delete('X-Frame-Options')
 
@@ -50,6 +49,10 @@ class StatusesController < ApplicationController
 
   private
 
+  def verify_embed_allowed
+    not_found if @status.hidden? || @status.reblog?
+  end
+
   def set_link_headers
     response.headers['Link'] = LinkHeader.new(
       [[ActivityPub::TagManager.instance.uri_for(@status), [%w(rel alternate), %w(type application/activity+json)]]]
diff --git a/app/helpers/admin/action_logs_helper.rb b/app/helpers/admin/action_logs_helper.rb
index 859f9246876..4a55a36ecd1 100644
--- a/app/helpers/admin/action_logs_helper.rb
+++ b/app/helpers/admin/action_logs_helper.rb
@@ -13,6 +13,8 @@ module Admin::ActionLogsHelper
       end
     when 'UserRole'
       link_to log.human_identifier, admin_roles_path(log.target_id)
+    when 'UsernameBlock'
+      link_to log.human_identifier, edit_admin_username_block_path(log.target_id)
     when 'Report'
       link_to "##{log.human_identifier.presence || log.target_id}", admin_report_path(log.target_id)
     when 'Instance', 'DomainBlock', 'DomainAllow', 'UnavailableDomain'
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 5a5ee055321..80cff698298 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -66,7 +66,7 @@ module ApplicationHelper
 
   def provider_sign_in_link(provider)
     label = Devise.omniauth_configs[provider]&.strategy&.display_name.presence || I18n.t("auth.providers.#{provider}", default: provider.to_s.chomp('_oauth2').capitalize)
-    link_to label, omniauth_authorize_path(:user, provider), class: "button button-#{provider}", method: :post
+    link_to label, omniauth_authorize_path(:user, provider), class: "btn button-#{provider}", method: :post
   end
 
   def locale_direction
@@ -102,6 +102,16 @@ module ApplicationHelper
     policy(record).public_send(:"#{action}?")
   end
 
+  def conditional_link_to(condition, name, options = {}, html_options = {}, &block)
+    if condition && !current_page?(block_given? ? name : options)
+      link_to(name, options, html_options, &block)
+    elsif block_given?
+      content_tag(:span, options, html_options, &block)
+    else
+      content_tag(:span, name, html_options)
+    end
+  end
+
   def material_symbol(icon, attributes = {})
     safe_join(
       [
@@ -233,6 +243,10 @@ module ApplicationHelper
     tag.input(type: :text, maxlength: 999, spellcheck: false, readonly: true, **options)
   end
 
+  def recent_tag_users(tag)
+    tag.statuses.public_visibility.joins(:account).merge(Account.without_suspended.without_silenced).includes(:account).limit(3).map(&:account)
+  end
+
   def recent_tag_usage(tag)
     people = tag.history.aggregate(2.days.ago.to_date..Time.zone.today).accounts
     I18n.t 'user_mailer.welcome.hashtags_recent_count', people: number_with_delimiter(people), count: people
@@ -246,6 +260,10 @@ module ApplicationHelper
     'https://play.google.com/store/apps/details?id=org.joinmastodon.android'
   end
 
+  def within_authorization_flow?
+    session[:user_return_to].present? && Rails.application.routes.recognize_path(session[:user_return_to])[:controller] == 'oauth/authorizations'
+  end
+
   private
 
   def storage_host_var
diff --git a/app/helpers/context_helper.rb b/app/helpers/context_helper.rb
index 33d7267905b..885f578fd0d 100644
--- a/app/helpers/context_helper.rb
+++ b/app/helpers/context_helper.rb
@@ -26,6 +26,12 @@ module ContextHelper
     suspended: { 'toot' => 'http://joinmastodon.org/ns#', 'suspended' => 'toot:suspended' },
     attribution_domains: { 'toot' => 'http://joinmastodon.org/ns#', 'attributionDomains' => { '@id' => 'toot:attributionDomains', '@type' => '@id' } },
     quote_requests: { 'QuoteRequest' => 'https://w3id.org/fep/044f#QuoteRequest' },
+    quotes: {
+      'quote' => 'https://w3id.org/fep/044f#quote',
+      'quoteUri' => 'http://fedibird.com/ns#quoteUri',
+      '_misskey_quote' => 'https://misskey-hub.net/ns#_misskey_quote',
+      'quoteAuthorization' => { '@id' => 'https://w3id.org/fep/044f#quoteAuthorization', '@type' => '@id' },
+    },
     interaction_policies: {
       'gts' => 'https://gotosocial.org/ns#',
       'interactionPolicy' => { '@id' => 'gts:interactionPolicy', '@type' => '@id' },
@@ -33,6 +39,12 @@ module ContextHelper
       'automaticApproval' => { '@id' => 'gts:automaticApproval', '@type' => '@id' },
       'manualApproval' => { '@id' => 'gts:manualApproval', '@type' => '@id' },
     },
+    quote_authorizations: {
+      'gts' => 'https://gotosocial.org/ns#',
+      'quoteAuthorization' => { '@id' => 'https://w3id.org/fep/044f#quoteAuthorization', '@type' => '@id' },
+      'interactingObject' => { '@id' => 'gts:interactingObject' },
+      'interactionTarget' => { '@id' => 'gts:interactionTarget' },
+    },
   }.freeze
 
   def full_context
diff --git a/app/helpers/email_helper.rb b/app/helpers/email_helper.rb
deleted file mode 100644
index 0800601f98b..00000000000
--- a/app/helpers/email_helper.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-module EmailHelper
-  def self.included(base)
-    base.extend(self)
-  end
-
-  def email_to_canonical_email(str)
-    username, domain = str.downcase.split('@', 2)
-    username, = username.delete('.').split('+', 2)
-
-    "#{username}@#{domain}"
-  end
-
-  def email_to_canonical_email_hash(str)
-    Digest::SHA2.new(256).hexdigest(email_to_canonical_email(str))
-  end
-end
diff --git a/app/helpers/formatting_helper.rb b/app/helpers/formatting_helper.rb
index 1b364a000cf..68aad4f6771 100644
--- a/app/helpers/formatting_helper.rb
+++ b/app/helpers/formatting_helper.rb
@@ -27,7 +27,9 @@ module FormattingHelper
   module_function :extract_status_plain_text
 
   def status_content_format(status)
-    html_aware_format(status.text, status.local?, preloaded_accounts: [status.account] + (status.respond_to?(:active_mentions) ? status.active_mentions.map(&:account) : []))
+    quoted_status = status.quote&.quoted_status if status.local?
+
+    html_aware_format(status.text, status.local?, preloaded_accounts: [status.account] + (status.respond_to?(:active_mentions) ? status.active_mentions.map(&:account) : []), quoted_status: quoted_status)
   end
 
   def rss_status_content_format(status)
@@ -65,12 +67,12 @@ module FormattingHelper
   end
 
   def rss_content_preroll(status)
-    if status.spoiler_text?
-      safe_join [
-        tag.p { spoiler_with_warning(status) },
-        tag.hr,
-      ]
-    end
+    return unless status.spoiler_text?
+
+    safe_join [
+      tag.p { spoiler_with_warning(status) },
+      tag.hr,
+    ]
   end
 
   def spoiler_with_warning(status)
@@ -81,10 +83,10 @@ module FormattingHelper
   end
 
   def rss_content_postroll(status)
-    if status.preloadable_poll
-      tag.p do
-        poll_option_tags(status)
-      end
+    return unless status.preloadable_poll
+
+    tag.p do
+      poll_option_tags(status)
     end
   end
 
diff --git a/app/helpers/home_helper.rb b/app/helpers/home_helper.rb
index c5b83326db3..59bc06031ee 100644
--- a/app/helpers/home_helper.rb
+++ b/app/helpers/home_helper.rb
@@ -21,7 +21,13 @@ module HomeHelper
                         end
                     end
                   else
-                    link_to(path || ActivityPub::TagManager.instance.url_for(account), class: 'account__display-name') do
+                    account_url = if account.suspended?
+                                    ActivityPub::TagManager.instance.url_for(account)
+                                  else
+                                    web_url("@#{account.pretty_acct}")
+                                  end
+
+                    link_to(path || account_url, class: 'account__display-name') do
                       content_tag(:div, class: 'account__avatar-wrapper') do
                         image_tag(full_asset_url(current_account&.user&.setting_auto_play_gif ? account.avatar_original_url : account.avatar_static_url), class: 'account__avatar', width: 46, height: 46)
                       end +
@@ -39,18 +45,8 @@ module HomeHelper
     end
   end
 
-  def obscured_counter(count)
-    if count <= 0
-      '0'
-    elsif count == 1
-      '1'
-    else
-      '1+'
-    end
-  end
-
-  def custom_field_classes(field)
-    if field.verified?
+  def field_verified_class(verified)
+    if verified
       'verified'
     else
       'emojify'
diff --git a/app/helpers/json_ld_helper.rb b/app/helpers/json_ld_helper.rb
index 078aba456ae..675d8b87309 100644
--- a/app/helpers/json_ld_helper.rb
+++ b/app/helpers/json_ld_helper.rb
@@ -134,7 +134,7 @@ module JsonLdHelper
         patch_for_forwarding!(value, compacted_value)
       elsif value.is_a?(Array)
         compacted_value = [compacted_value] unless compacted_value.is_a?(Array)
-        return if value.size != compacted_value.size
+        return nil if value.size != compacted_value.size
 
         compacted[key] = value.zip(compacted_value).map do |v, vc|
           if v.is_a?(Hash) && vc.is_a?(Hash)
diff --git a/app/helpers/languages_helper.rb b/app/helpers/languages_helper.rb
index 0a8ebcde549..ddb6b79c866 100644
--- a/app/helpers/languages_helper.rb
+++ b/app/helpers/languages_helper.rb
@@ -107,6 +107,7 @@ module LanguagesHelper
     mk: ['Macedonian', 'македонски јазик'].freeze,
     ml: ['Malayalam', 'മലയാളം'].freeze,
     mn: ['Mongolian', 'Монгол хэл'].freeze,
+    'mn-Mong': ['Traditional Mongolian', 'ᠮᠣᠩᠭᠣᠯ ᠬᠡᠯᠡ'].freeze,
     mr: ['Marathi', 'मराठी'].freeze,
     ms: ['Malay', 'Bahasa Melayu'].freeze,
     'ms-Arab': ['Jawi Malay', 'بهاس ملايو'].freeze,
diff --git a/app/helpers/statuses_helper.rb b/app/helpers/statuses_helper.rb
index 16b9d3fb531..68e9b130478 100644
--- a/app/helpers/statuses_helper.rb
+++ b/app/helpers/statuses_helper.rb
@@ -57,6 +57,20 @@ module StatusesHelper
     components.compact_blank.join("\n\n")
   end
 
+  # This logic should be kept in sync with https://github.com/mastodon/mastodon/blob/425311e1d95c8a64ddac6c724fca247b8b893a82/app/javascript/mastodon/features/status/components/card.jsx#L160
+  def preview_card_aspect_ratio_classname(preview_card)
+    interactive = preview_card.type == 'video'
+    large_image = (preview_card.image.present? && preview_card.width > preview_card.height) || interactive
+
+    if large_image && interactive
+      'status-card__image--video'
+    elsif large_image
+      'status-card__image--large'
+    else
+      'status-card__image--normal'
+    end
+  end
+
   def visibility_icon(status)
     VISIBLITY_ICONS[status.visibility.to_sym]
   end
@@ -64,4 +78,16 @@ module StatusesHelper
   def prefers_autoplay?
     ActiveModel::Type::Boolean.new.cast(params[:autoplay]) || current_user&.setting_auto_play_gif
   end
+
+  def render_seo_schema(status)
+    json = ActiveModelSerializers::SerializableResource.new(
+      status,
+      serializer: SEO::SocialMediaPostingSerializer,
+      adapter: SEO::Adapter
+    ).to_json
+
+    # rubocop:disable Rails/OutputSafety
+    content_tag(:script, json_escape(json).html_safe, type: 'application/ld+json')
+    # rubocop:enable Rails/OutputSafety
+  end
 end
diff --git a/app/helpers/theme_helper.rb b/app/helpers/theme_helper.rb
index 0f24063385b..00b4a6d2b3f 100644
--- a/app/helpers/theme_helper.rb
+++ b/app/helpers/theme_helper.rb
@@ -24,24 +24,24 @@ module ThemeHelper
   end
 
   def custom_stylesheet
-    if active_custom_stylesheet.present?
-      stylesheet_link_tag(
-        custom_css_path(active_custom_stylesheet),
-        host: root_url,
-        media: :all,
-        skip_pipeline: true
-      )
-    end
+    return if active_custom_stylesheet.blank?
+
+    stylesheet_link_tag(
+      custom_css_path(active_custom_stylesheet),
+      host: root_url,
+      media: :all,
+      skip_pipeline: true
+    )
   end
 
   private
 
   def active_custom_stylesheet
-    if cached_custom_css_digest.present?
-      [:custom, cached_custom_css_digest.to_s.first(8)]
-        .compact_blank
-        .join('-')
-    end
+    return if cached_custom_css_digest.blank?
+
+    [:custom, cached_custom_css_digest.to_s.first(8)]
+      .compact_blank
+      .join('-')
   end
 
   def cached_custom_css_digest
diff --git a/app/javascript/config/html-tags.json b/app/javascript/config/html-tags.json
new file mode 100644
index 00000000000..c788113487c
--- /dev/null
+++ b/app/javascript/config/html-tags.json
@@ -0,0 +1,61 @@
+{
+  "global": {
+    "class": "className",
+    "id": true,
+    "title": true,
+    "dir": true,
+    "lang": true
+  },
+  "tags": {
+    "p": {},
+    "br": {
+      "children": false
+    },
+    "span": {
+      "attributes": {
+        "translate": true
+      }
+    },
+    "a": {
+      "attributes": {
+        "href": true,
+        "rel": true,
+        "translate": true,
+        "target": true
+      }
+    },
+    "del": {},
+    "s": {},
+    "pre": {},
+    "blockquote": {},
+    "code": {},
+    "b": {},
+    "strong": {},
+    "u": {},
+    "i": {},
+    "img": {
+      "children": false,
+      "attributes": {
+        "src": true,
+        "alt": true,
+        "title": true
+      }
+    },
+    "em": {},
+    "ul": {},
+    "ol": {
+      "attributes": {
+        "start": true,
+        "reversed": true
+      }
+    },
+    "li": {
+      "attributes": {
+        "value": true
+      }
+    },
+    "ruby": {},
+    "rt": {},
+    "rp": {}
+  }
+}
diff --git a/app/javascript/entrypoints/admin.tsx b/app/javascript/entrypoints/admin.tsx
index a60778f0c04..af9309d342c 100644
--- a/app/javascript/entrypoints/admin.tsx
+++ b/app/javascript/entrypoints/admin.tsx
@@ -1,6 +1,7 @@
 import { createRoot } from 'react-dom/client';
 
 import Rails from '@rails/ujs';
+import { decode, ValidationError } from 'blurhash';
 
 import ready from '../mastodon/ready';
 
@@ -362,6 +363,46 @@ ready(() => {
   document.querySelectorAll('[data-admin-component]').forEach((element) => {
     void mountReactComponent(element);
   });
+
+  document
+    .querySelectorAll<HTMLCanvasElement>('canvas[data-blurhash]')
+    .forEach((canvas) => {
+      const blurhash = canvas.dataset.blurhash;
+      if (blurhash) {
+        try {
+          // decode returns a Uint8ClampedArray<ArrayBufferLike> not Uint8ClampedArray<ArrayBuffer>
+          const pixels = decode(
+            blurhash,
+            32,
+            32,
+          ) as Uint8ClampedArray<ArrayBuffer>;
+          const ctx = canvas.getContext('2d');
+          const imageData = new ImageData(pixels, 32, 32);
+
+          ctx?.putImageData(imageData, 0, 0);
+        } catch (err) {
+          if (err instanceof ValidationError) {
+            // ignore blurhash validation errors
+            return;
+          }
+
+          throw err;
+        }
+      }
+    });
+
+  document
+    .querySelectorAll<HTMLDivElement>('.preview-card')
+    .forEach((previewCard) => {
+      const spoilerButton = previewCard.querySelector('.spoiler-button');
+      if (!spoilerButton) {
+        return;
+      }
+
+      spoilerButton.addEventListener('click', () => {
+        previewCard.classList.toggle('preview-card--image-visible');
+      });
+    });
 }).catch((reason: unknown) => {
   throw reason;
 });
diff --git a/app/javascript/entrypoints/public.tsx b/app/javascript/entrypoints/public.tsx
index 0970fc585e6..fea3eb0d792 100644
--- a/app/javascript/entrypoints/public.tsx
+++ b/app/javascript/entrypoints/public.tsx
@@ -70,7 +70,7 @@ function loaded() {
   };
 
   document.querySelectorAll('.emojify').forEach((content) => {
-    content.innerHTML = emojify(content.innerHTML);
+    content.innerHTML = emojify(content.innerHTML, {}, true); // Force emojify as public doesn't load the new emoji system.
   });
 
   document
@@ -145,6 +145,10 @@ function loaded() {
       );
     });
 
+  updateDefaultQuotePrivacyFromPrivacy(
+    document.querySelector('#user_settings_attributes_default_privacy'),
+  );
+
   const reactComponents = document.querySelectorAll('[data-component]');
 
   if (reactComponents.length > 0) {
@@ -347,6 +351,31 @@ const setInputDisabled = (
   }
 };
 
+const setInputHint = (
+  input: HTMLInputElement | HTMLSelectElement,
+  hintPrefix: string,
+) => {
+  const fieldWrapper = input.closest<HTMLElement>('.fields-group > .input');
+  if (!fieldWrapper) return;
+
+  const hint = fieldWrapper.dataset[`${hintPrefix}Hint`];
+  const hintElement =
+    fieldWrapper.querySelector<HTMLSpanElement>(':scope > .hint');
+
+  if (hint) {
+    if (hintElement) {
+      hintElement.textContent = hint;
+    } else {
+      const newHintElement = document.createElement('span');
+      newHintElement.className = 'hint';
+      newHintElement.textContent = hint;
+      fieldWrapper.appendChild(newHintElement);
+    }
+  } else {
+    hintElement?.remove();
+  }
+};
+
 Rails.delegate(
   document,
   '#account_statuses_cleanup_policy_enabled',
@@ -364,6 +393,36 @@ Rails.delegate(
   },
 );
 
+const updateDefaultQuotePrivacyFromPrivacy = (
+  privacySelect: EventTarget | null,
+) => {
+  if (!(privacySelect instanceof HTMLSelectElement) || !privacySelect.form)
+    return;
+
+  const select = privacySelect.form.querySelector<HTMLSelectElement>(
+    'select#user_settings_attributes_default_quote_policy',
+  );
+  if (!select) return;
+
+  setInputHint(select, privacySelect.value);
+
+  if (privacySelect.value === 'private') {
+    select.value = 'nobody';
+    setInputDisabled(select, true);
+  } else {
+    setInputDisabled(select, false);
+  }
+};
+
+Rails.delegate(
+  document,
+  '#user_settings_attributes_default_privacy',
+  'change',
+  ({ target }) => {
+    updateDefaultQuotePrivacyFromPrivacy(target);
+  },
+);
+
 // Empty the honeypot fields in JS in case something like an extension
 // automatically filled them.
 Rails.delegate(document, '#registration_new_user,#new_user', 'submit', () => {
diff --git a/app/javascript/images/mailer-new/heading/README.md b/app/javascript/images/mailer-new/heading/README.md
index ecd4b949e76..9fb6841f14b 100644
--- a/app/javascript/images/mailer-new/heading/README.md
+++ b/app/javascript/images/mailer-new/heading/README.md
@@ -1 +1,3 @@
 Images in this folder are based on [Tabler.io icons](https://tabler.io/icons).
+
+Seems to be 1.5 width icons scaled to 64×64px and centered above a blue square with round corners (24px).
diff --git a/app/javascript/images/mailer-new/heading/quote.png b/app/javascript/images/mailer-new/heading/quote.png
new file mode 100644
index 00000000000..c2af73282f1
Binary files /dev/null and b/app/javascript/images/mailer-new/heading/quote.png differ
diff --git a/app/javascript/mastodon/actions/compose.js b/app/javascript/mastodon/actions/compose.js
index d70834cec65..ccb69f0a3d3 100644
--- a/app/javascript/mastodon/actions/compose.js
+++ b/app/javascript/mastodon/actions/compose.js
@@ -84,6 +84,7 @@ export const COMPOSE_FOCUS = 'COMPOSE_FOCUS';
 const messages = defineMessages({
   uploadErrorLimit: { id: 'upload_error.limit', defaultMessage: 'File upload limit exceeded.' },
   uploadErrorPoll:  { id: 'upload_error.poll', defaultMessage: 'File upload not allowed with polls.' },
+  uploadQuote: { id: 'upload_error.quote', defaultMessage: 'File upload not allowed with quotes.' },
   open: { id: 'compose.published.open', defaultMessage: 'Open' },
   published: { id: 'compose.published.body', defaultMessage: 'Post published.' },
   saved: { id: 'compose.saved.body', defaultMessage: 'Post saved.' },
@@ -96,12 +97,17 @@ export const ensureComposeIsVisible = (getState) => {
 };
 
 export function setComposeToStatus(status, text, spoiler_text) {
-  return{
-    type: COMPOSE_SET_STATUS,
-    status,
-    text,
-    spoiler_text,
-  };
+  return (dispatch, getState) => {
+    const maxOptions = getState().server.getIn(['server', 'configuration', 'polls', 'max_options']);
+
+    dispatch({
+      type: COMPOSE_SET_STATUS,
+      status,
+      text,
+      spoiler_text,
+      maxOptions,
+    });
+  }
 }
 
 export function changeCompose(text) {
@@ -146,7 +152,7 @@ export function resetCompose() {
   };
 }
 
-export const focusCompose = (defaultText) => (dispatch, getState) => {
+export const focusCompose = (defaultText = '') => (dispatch, getState) => {
   dispatch({
     type: COMPOSE_FOCUS,
     defaultText,
@@ -183,13 +189,15 @@ export function directCompose(account) {
   };
 }
 
-export function submitCompose() {
+export function submitCompose(successCallback) {
   return function (dispatch, getState) {
     const status   = getState().getIn(['compose', 'text'], '');
     const media    = getState().getIn(['compose', 'media_attachments']);
     const statusId = getState().getIn(['compose', 'id'], null);
+    const hasQuote = !!getState().getIn(['compose', 'quoted_status_id']);
+    const spoiler_text = getState().getIn(['compose', 'spoiler']) ? getState().getIn(['compose', 'spoiler_text'], '') : '';
 
-    if ((!status || !status.length) && media.size === 0) {
+    if (!(status?.length || media.size !== 0 || (hasQuote && spoiler_text?.length))) {
       return;
     }
 
@@ -215,19 +223,22 @@ export function submitCompose() {
       });
     }
 
+    const visibility = getState().getIn(['compose', 'privacy']);
     api().request({
       url: statusId === null ? '/api/v1/statuses' : `/api/v1/statuses/${statusId}`,
       method: statusId === null ? 'post' : 'put',
       data: {
         status,
+        spoiler_text,
         in_reply_to_id: getState().getIn(['compose', 'in_reply_to'], null),
         media_ids: media.map(item => item.get('id')),
         media_attributes,
         sensitive: getState().getIn(['compose', 'sensitive']),
-        spoiler_text: getState().getIn(['compose', 'spoiler']) ? getState().getIn(['compose', 'spoiler_text'], '') : '',
-        visibility: getState().getIn(['compose', 'privacy']),
+        visibility: visibility,
         poll: getState().getIn(['compose', 'poll'], null),
         language: getState().getIn(['compose', 'language']),
+        quoted_status_id: getState().getIn(['compose', 'quoted_status_id']),
+        quote_approval_policy: visibility === 'private' || visibility === 'direct' ? 'nobody' : getState().getIn(['compose', 'quote_policy']),
       },
       headers: {
         'Idempotency-Key': getState().getIn(['compose', 'idempotencyKey']),
@@ -239,6 +250,9 @@ export function submitCompose() {
 
       dispatch(insertIntoTagHistory(response.data.tags, status));
       dispatch(submitComposeSuccess({ ...response.data }));
+      if (typeof successCallback === 'function') {
+        successCallback(response.data);
+      }
 
       // To make the app more responsive, immediately push the status
       // into the columns
@@ -298,6 +312,11 @@ export function submitComposeFail(error) {
 
 export function uploadCompose(files) {
   return function (dispatch, getState) {
+    // Exit if there's a quote.
+    if (getState().compose.get('quoted_status_id')) {
+      dispatch(showAlert({ message: messages.uploadQuote }));
+      return;
+    }
     const uploadLimit = getState().getIn(['server', 'server', 'configuration', 'statuses', 'max_media_attachments']);
     const media = getState().getIn(['compose', 'media_attachments']);
     const pending = getState().getIn(['compose', 'pending_media_attachments']);
diff --git a/app/javascript/mastodon/actions/compose_typed.ts b/app/javascript/mastodon/actions/compose_typed.ts
index 97f0d68c514..0f9bf5cfb3c 100644
--- a/app/javascript/mastodon/actions/compose_typed.ts
+++ b/app/javascript/mastodon/actions/compose_typed.ts
@@ -1,9 +1,47 @@
+import { defineMessages } from 'react-intl';
+
+import { createAction } from '@reduxjs/toolkit';
 import type { List as ImmutableList, Map as ImmutableMap } from 'immutable';
 
 import { apiUpdateMedia } from 'mastodon/api/compose';
+import { apiGetSearch } from 'mastodon/api/search';
 import type { ApiMediaAttachmentJSON } from 'mastodon/api_types/media_attachments';
 import type { MediaAttachment } from 'mastodon/models/media_attachment';
-import { createDataLoadingThunk } from 'mastodon/store/typed_functions';
+import {
+  createDataLoadingThunk,
+  createAppThunk,
+} from 'mastodon/store/typed_functions';
+
+import type { ApiQuotePolicy } from '../api_types/quotes';
+import type { Status } from '../models/status';
+
+import { showAlert } from './alerts';
+import { focusCompose } from './compose';
+import { importFetchedStatuses } from './importer';
+import { openModal } from './modal';
+
+const messages = defineMessages({
+  quoteErrorEdit: {
+    id: 'quote_error.edit',
+    defaultMessage: 'Quotes cannot be added when editing a post.',
+  },
+  quoteErrorUpload: {
+    id: 'quote_error.upload',
+    defaultMessage: 'Quoting is not allowed with media attachments.',
+  },
+  quoteErrorPoll: {
+    id: 'quote_error.poll',
+    defaultMessage: 'Quoting is not allowed with polls.',
+  },
+  quoteErrorQuote: {
+    id: 'quote_error.quote',
+    defaultMessage: 'Only one quote at a time is allowed.',
+  },
+  quoteErrorUnauthorized: {
+    id: 'quote_error.unauthorized',
+    defaultMessage: 'You are not authorized to quote this post.',
+  },
+});
 
 type SimulatedMediaAttachmentJSON = ApiMediaAttachmentJSON & {
   unattached?: boolean;
@@ -68,3 +106,111 @@ export const changeUploadCompose = createDataLoadingThunk(
     useLoadingBar: false,
   },
 );
+
+export const quoteCompose = createAppThunk(
+  'compose/quoteComposeStatus',
+  (status: Status, { dispatch }) => {
+    dispatch(focusCompose());
+    return status;
+  },
+);
+
+export const quoteComposeByStatus = createAppThunk(
+  (status: Status, { dispatch, getState }) => {
+    const state = getState();
+    const composeState = state.compose;
+    const mediaAttachments = composeState.get('media_attachments');
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+    const wasQuietPostHintModalDismissed: boolean =
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
+      state.settings.getIn(
+        ['dismissed_banners', 'quote/quiet_post_hint'],
+        false,
+      );
+
+    if (composeState.get('id')) {
+      dispatch(showAlert({ message: messages.quoteErrorEdit }));
+    } else if (composeState.get('poll')) {
+      dispatch(showAlert({ message: messages.quoteErrorPoll }));
+    } else if (
+      composeState.get('is_uploading') ||
+      (mediaAttachments &&
+        typeof mediaAttachments !== 'string' &&
+        typeof mediaAttachments !== 'number' &&
+        typeof mediaAttachments !== 'boolean' &&
+        mediaAttachments.size !== 0)
+    ) {
+      dispatch(showAlert({ message: messages.quoteErrorUpload }));
+    } else if (composeState.get('quoted_status_id')) {
+      dispatch(showAlert({ message: messages.quoteErrorQuote }));
+    } else if (
+      status.getIn(['quote_approval', 'current_user']) !== 'automatic' &&
+      status.getIn(['quote_approval', 'current_user']) !== 'manual'
+    ) {
+      dispatch(showAlert({ message: messages.quoteErrorUnauthorized }));
+    } else if (
+      status.get('visibility') === 'unlisted' &&
+      !wasQuietPostHintModalDismissed
+    ) {
+      dispatch(
+        openModal({
+          modalType: 'CONFIRM_QUIET_QUOTE',
+          modalProps: { status },
+        }),
+      );
+    } else {
+      dispatch(quoteCompose(status));
+    }
+  },
+);
+
+export const quoteComposeById = createAppThunk(
+  (statusId: string, { dispatch, getState }) => {
+    const status = getState().statuses.get(statusId);
+    if (status) {
+      dispatch(quoteComposeByStatus(status));
+    }
+  },
+);
+
+export const pasteLinkCompose = createDataLoadingThunk(
+  'compose/pasteLink',
+  async ({ url }: { url: string }) => {
+    return await apiGetSearch({
+      q: url,
+      type: 'statuses',
+      resolve: true,
+      limit: 2,
+    });
+  },
+  (data, { dispatch, getState }) => {
+    const composeState = getState().compose;
+
+    if (
+      composeState.get('quoted_status_id') ||
+      composeState.get('is_submitting') ||
+      composeState.get('poll') ||
+      composeState.get('is_uploading') ||
+      composeState.get('id')
+    )
+      return;
+
+    dispatch(importFetchedStatuses(data.statuses));
+
+    if (
+      data.statuses.length === 1 &&
+      data.statuses[0] &&
+      ['automatic', 'manual'].includes(
+        data.statuses[0].quote_approval?.current_user ?? 'denied',
+      )
+    ) {
+      dispatch(quoteComposeById(data.statuses[0].id));
+    }
+  },
+);
+
+export const quoteComposeCancel = createAction('compose/quoteComposeCancel');
+
+export const setComposeQuotePolicy = createAction<ApiQuotePolicy>(
+  'compose/setQuotePolicy',
+);
diff --git a/app/javascript/mastodon/actions/importer/normalizer.js b/app/javascript/mastodon/actions/importer/normalizer.js
index 330da74000b..7723379804c 100644
--- a/app/javascript/mastodon/actions/importer/normalizer.js
+++ b/app/javascript/mastodon/actions/importer/normalizer.js
@@ -21,6 +21,15 @@ export function normalizeFilterResult(result) {
   return normalResult;
 }
 
+function stripQuoteFallback(text) {
+  const wrapper = document.createElement('div');
+  wrapper.innerHTML = text;
+
+  wrapper.querySelector('.quote-inline')?.remove();
+
+  return wrapper.innerHTML;
+}
+
 export function normalizeStatus(status, normalOldStatus) {
   const normalStatus   = { ...status };
 
@@ -72,7 +81,7 @@ export function normalizeStatus(status, normalOldStatus) {
   } 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.
-    if (normalStatus.spoiler_text && !normalStatus.content) {
+    if (normalStatus.spoiler_text && !normalStatus.content && !normalStatus.quote) {
       normalStatus.content = normalStatus.spoiler_text;
       normalStatus.spoiler_text = '';
     }
@@ -86,6 +95,11 @@ export function normalizeStatus(status, normalOldStatus) {
     normalStatus.spoilerHtml  = emojify(escapeTextContentForBrowser(spoilerText), emojiMap);
     normalStatus.hidden       = expandSpoilers ? false : spoilerText.length > 0 || normalStatus.sensitive;
 
+    // Remove quote fallback link from the DOM so it doesn't mess with paragraph margins
+    if (normalStatus.quote) {
+      normalStatus.contentHtml = stripQuoteFallback(normalStatus.contentHtml);
+    }
+
     if (normalStatus.url && !(normalStatus.url.startsWith('http://') || normalStatus.url.startsWith('https://'))) {
       normalStatus.url = null;
     }
@@ -125,6 +139,11 @@ export function normalizeStatusTranslation(translation, status) {
     spoiler_text: translation.spoiler_text,
   };
 
+  // Remove quote fallback link from the DOM so it doesn't mess with paragraph margins
+  if (status.get('quote')) {
+    normalTranslation.contentHtml = stripQuoteFallback(normalTranslation.contentHtml);
+  }
+
   return normalTranslation;
 }
 
diff --git a/app/javascript/mastodon/actions/interactions_typed.ts b/app/javascript/mastodon/actions/interactions_typed.ts
index f58faffa86d..36f9f85b9cc 100644
--- a/app/javascript/mastodon/actions/interactions_typed.ts
+++ b/app/javascript/mastodon/actions/interactions_typed.ts
@@ -1,8 +1,13 @@
-import { apiReblog, apiUnreblog } from 'mastodon/api/interactions';
+import {
+  apiReblog,
+  apiUnreblog,
+  apiRevokeQuote,
+  apiGetQuotes,
+} from 'mastodon/api/interactions';
 import type { StatusVisibility } from 'mastodon/models/status';
 import { createDataLoadingThunk } from 'mastodon/store/typed_functions';
 
-import { importFetchedStatus } from './importer';
+import { importFetchedStatus, importFetchedStatuses } from './importer';
 
 export const reblog = createDataLoadingThunk(
   'status/reblog',
@@ -33,3 +38,35 @@ export const unreblog = createDataLoadingThunk(
     return discardLoadData;
   },
 );
+
+export const revokeQuote = createDataLoadingThunk(
+  'status/revoke_quote',
+  ({
+    statusId,
+    quotedStatusId,
+  }: {
+    statusId: string;
+    quotedStatusId: string;
+  }) => apiRevokeQuote(quotedStatusId, statusId),
+  (data, { dispatch, discardLoadData }) => {
+    dispatch(importFetchedStatus(data));
+
+    return discardLoadData;
+  },
+);
+
+export const fetchQuotes = createDataLoadingThunk(
+  'status/fetch_quotes',
+  async ({ statusId, next }: { statusId: string; next?: string }) => {
+    const { links, statuses } = await apiGetQuotes(statusId, next);
+
+    return {
+      links,
+      statuses,
+      replace: !next,
+    };
+  },
+  (payload, { dispatch }) => {
+    dispatch(importFetchedStatuses(payload.statuses));
+  },
+);
diff --git a/app/javascript/mastodon/actions/notification_groups.ts b/app/javascript/mastodon/actions/notification_groups.ts
index 43863254818..2d03ef080f5 100644
--- a/app/javascript/mastodon/actions/notification_groups.ts
+++ b/app/javascript/mastodon/actions/notification_groups.ts
@@ -30,8 +30,21 @@ import { importFetchedAccounts, importFetchedStatuses } from './importer';
 import { NOTIFICATIONS_FILTER_SET } from './notifications';
 import { saveSettings } from './settings';
 
+function notificationTypeForFilter(type: NotificationType) {
+  if (type === 'quoted_update') return 'update';
+  else return type;
+}
+
+function notificationTypeForQuickFilter(type: NotificationType) {
+  if (type === 'quoted_update') return 'update';
+  else if (type === 'quote') return 'mention';
+  else return type;
+}
+
 function excludeAllTypesExcept(filter: string) {
-  return allNotificationTypes.filter((item) => item !== filter);
+  return allNotificationTypes.filter(
+    (item) => notificationTypeForQuickFilter(item) !== filter,
+  );
 }
 
 function getExcludedTypes(state: RootState) {
@@ -155,13 +168,17 @@ export const processNewNotificationForGroups = createAppAsyncThunk(
 
     const showInColumn =
       activeFilter === 'all'
-        ? notificationShows[notification.type] !== false
-        : activeFilter === notification.type;
+        ? notificationShows[notificationTypeForFilter(notification.type)] !==
+          false
+        : activeFilter === notificationTypeForQuickFilter(notification.type);
 
     if (!showInColumn) return;
 
     if (
-      (notification.type === 'mention' || notification.type === 'update') &&
+      (notification.type === 'mention' ||
+        notification.type === 'quote' ||
+        notification.type === 'update' ||
+        notification.type === 'quoted_update') &&
       notification.status?.filtered
     ) {
       const filters = notification.status.filtered.filter((result) =>
diff --git a/app/javascript/mastodon/actions/notifications.js b/app/javascript/mastodon/actions/notifications.js
index 2499b8da1d7..558390b9cff 100644
--- a/app/javascript/mastodon/actions/notifications.js
+++ b/app/javascript/mastodon/actions/notifications.js
@@ -31,7 +31,7 @@ export function updateNotifications(notification, intlMessages, intlLocale) {
 
     let filtered = false;
 
-    if (['mention', 'status'].includes(notification.type) && notification.status.filtered) {
+    if (['mention', 'quote', 'status'].includes(notification.type) && notification.status.filtered) {
       const filters = notification.status.filtered.filter(result => result.filter.context.includes('notifications'));
 
       if (filters.some(result => result.filter.filter_action === 'hide')) {
diff --git a/app/javascript/mastodon/actions/statuses.js b/app/javascript/mastodon/actions/statuses.js
index 42d0c1c0f11..7572efe95f5 100644
--- a/app/javascript/mastodon/actions/statuses.js
+++ b/app/javascript/mastodon/actions/statuses.js
@@ -1,9 +1,12 @@
+import { defineMessages } from 'react-intl';
+
 import { browserHistory } from 'mastodon/components/router';
 
 import api from '../api';
 
+import { showAlert } from './alerts';
 import { ensureComposeIsVisible, setComposeToStatus } from './compose';
-import { importFetchedStatus, importFetchedStatuses, importFetchedAccount } from './importer';
+import { importFetchedStatus, importFetchedAccount } from './importer';
 import { fetchContext } from './statuses_typed';
 import { deleteFromTimelines } from './timelines';
 
@@ -40,6 +43,10 @@ export const STATUS_TRANSLATE_SUCCESS = 'STATUS_TRANSLATE_SUCCESS';
 export const STATUS_TRANSLATE_FAIL    = 'STATUS_TRANSLATE_FAIL';
 export const STATUS_TRANSLATE_UNDO    = 'STATUS_TRANSLATE_UNDO';
 
+const messages = defineMessages({
+  deleteSuccess: { id: 'status.delete.success', defaultMessage: 'Post deleted' },
+});
+
 export function fetchStatusRequest(id, skipLoading) {
   return {
     type: STATUS_FETCH_REQUEST,
@@ -48,7 +55,18 @@ export function fetchStatusRequest(id, skipLoading) {
   };
 }
 
-export function fetchStatus(id, forceFetch = false, alsoFetchContext = true) {
+/**
+ * @param {string} id
+ * @param {Object} [options]
+ * @param {boolean} [options.forceFetch]
+ * @param {boolean} [options.alsoFetchContext]
+ * @param {string | null | undefined} [options.parentQuotePostId]
+ */
+export function fetchStatus(id, {
+  forceFetch = false,
+  alsoFetchContext = true,
+  parentQuotePostId,
+} = {}) {
   return (dispatch, getState) => {
     const skipLoading = !forceFetch && getState().getIn(['statuses', id], null) !== null;
 
@@ -66,7 +84,7 @@ export function fetchStatus(id, forceFetch = false, alsoFetchContext = true) {
       dispatch(importFetchedStatus(response.data));
       dispatch(fetchStatusSuccess(skipLoading));
     }).catch(error => {
-      dispatch(fetchStatusFail(id, error, skipLoading));
+      dispatch(fetchStatusFail(id, error, skipLoading, parentQuotePostId));
     });
   };
 }
@@ -78,21 +96,27 @@ export function fetchStatusSuccess(skipLoading) {
   };
 }
 
-export function fetchStatusFail(id, error, skipLoading) {
+export function fetchStatusFail(id, error, skipLoading, parentQuotePostId) {
   return {
     type: STATUS_FETCH_FAIL,
     id,
     error,
+    parentQuotePostId,
     skipLoading,
     skipAlert: true,
   };
 }
 
 export function redraft(status, raw_text) {
-  return {
-    type: REDRAFT,
-    status,
-    raw_text,
+  return (dispatch, getState) => {
+    const maxOptions = getState().server.getIn(['server', 'configuration', 'polls', 'max_options']);
+
+    dispatch({
+      type: REDRAFT,
+      status,
+      raw_text,
+      maxOptions,
+    });
   };
 }
 
@@ -137,7 +161,7 @@ export function deleteStatus(id, withRedraft = false) {
 
     dispatch(deleteStatusRequest(id));
 
-    api().delete(`/api/v1/statuses/${id}`, { params: { delete_media: !withRedraft } }).then(response => {
+    return api().delete(`/api/v1/statuses/${id}`, { params: { delete_media: !withRedraft } }).then(response => {
       dispatch(deleteStatusSuccess(id));
       dispatch(deleteFromTimelines(id));
       dispatch(importFetchedAccount(response.data.account));
@@ -145,9 +169,14 @@ export function deleteStatus(id, withRedraft = false) {
       if (withRedraft) {
         dispatch(redraft(status, response.data.text));
         ensureComposeIsVisible(getState);
+      } else {
+        dispatch(showAlert({ message: messages.deleteSuccess }));
       }
+
+      return response;
     }).catch(error => {
       dispatch(deleteStatusFail(id, error));
+      throw error;
     });
   };
 }
diff --git a/app/javascript/mastodon/actions/statuses_typed.ts b/app/javascript/mastodon/actions/statuses_typed.ts
index b98abbe122e..be9bec71bb3 100644
--- a/app/javascript/mastodon/actions/statuses_typed.ts
+++ b/app/javascript/mastodon/actions/statuses_typed.ts
@@ -1,18 +1,44 @@
-import { apiGetContext } from 'mastodon/api/statuses';
+import { createAction } from '@reduxjs/toolkit';
+
+import { apiGetContext, apiSetQuotePolicy } from 'mastodon/api/statuses';
 import { createDataLoadingThunk } from 'mastodon/store/typed_functions';
 
+import type { ApiQuotePolicy } from '../api_types/quotes';
+
 import { importFetchedStatuses } from './importer';
 
 export const fetchContext = createDataLoadingThunk(
   'status/context',
-  ({ statusId }: { statusId: string }) => apiGetContext(statusId),
-  (context, { dispatch }) => {
+  ({ statusId }: { statusId: string; prefetchOnly?: boolean }) =>
+    apiGetContext(statusId),
+  ({ context, refresh }, { dispatch, actionArg: { prefetchOnly = false } }) => {
     const statuses = context.ancestors.concat(context.descendants);
 
     dispatch(importFetchedStatuses(statuses));
 
     return {
       context,
+      refresh,
+      prefetchOnly,
     };
   },
 );
+
+export const completeContextRefresh = createAction<{ statusId: string }>(
+  'status/context/complete',
+);
+
+export const showPendingReplies = createAction<{ statusId: string }>(
+  'status/context/showPendingReplies',
+);
+
+export const clearPendingReplies = createAction<{ statusId: string }>(
+  'status/context/clearPendingReplies',
+);
+
+export const setStatusQuotePolicy = createDataLoadingThunk(
+  'status/setQuotePolicy',
+  ({ statusId, policy }: { statusId: string; policy: ApiQuotePolicy }) => {
+    return apiSetQuotePolicy(statusId, policy);
+  },
+);
diff --git a/app/javascript/mastodon/api.ts b/app/javascript/mastodon/api.ts
index dc9c20b5085..1820e00a537 100644
--- a/app/javascript/mastodon/api.ts
+++ b/app/javascript/mastodon/api.ts
@@ -20,6 +20,50 @@ export const getLinks = (response: AxiosResponse) => {
   return LinkHeader.parse(value);
 };
 
+export interface AsyncRefreshHeader {
+  id: string;
+  retry: number;
+}
+
+const isAsyncRefreshHeader = (obj: object): obj is AsyncRefreshHeader =>
+  'id' in obj && 'retry' in obj;
+
+export const getAsyncRefreshHeader = (
+  response: AxiosResponse,
+): AsyncRefreshHeader | null => {
+  const value = response.headers['mastodon-async-refresh'] as
+    | string
+    | undefined;
+
+  if (!value) {
+    return null;
+  }
+
+  const asyncRefreshHeader: Record<string, unknown> = {};
+
+  value.split(/,\s*/).forEach((pair) => {
+    const [key, val] = pair.split('=', 2);
+
+    let typedValue: string | number;
+
+    if (key && ['id', 'retry'].includes(key) && val) {
+      if (val.startsWith('"')) {
+        typedValue = val.slice(1, -1);
+      } else {
+        typedValue = parseInt(val);
+      }
+
+      asyncRefreshHeader[key] = typedValue;
+    }
+  });
+
+  if (isAsyncRefreshHeader(asyncRefreshHeader)) {
+    return asyncRefreshHeader;
+  }
+
+  return null;
+};
+
 const csrfHeader: RawAxiosRequestHeaders = {};
 
 const setCSRFHeader = () => {
@@ -83,7 +127,7 @@ export default function api(withAuthorization = true) {
   return instance;
 }
 
-type ApiUrl = `v${1 | 2}/${string}`;
+type ApiUrl = `v${1 | '1_alpha' | 2}/${string}`;
 type RequestParamsOrData = Record<string, unknown>;
 
 export async function apiRequest<ApiResponse = unknown>(
diff --git a/app/javascript/mastodon/api/async_refreshes.ts b/app/javascript/mastodon/api/async_refreshes.ts
new file mode 100644
index 00000000000..953300a4a86
--- /dev/null
+++ b/app/javascript/mastodon/api/async_refreshes.ts
@@ -0,0 +1,5 @@
+import { apiRequestGet } from 'mastodon/api';
+import type { ApiAsyncRefreshJSON } from 'mastodon/api_types/async_refreshes';
+
+export const apiGetAsyncRefresh = (id: string) =>
+  apiRequestGet<ApiAsyncRefreshJSON>(`v1_alpha/async_refreshes/${id}`);
diff --git a/app/javascript/mastodon/api/interactions.ts b/app/javascript/mastodon/api/interactions.ts
index 118b5f06d20..36aaeef1866 100644
--- a/app/javascript/mastodon/api/interactions.ts
+++ b/app/javascript/mastodon/api/interactions.ts
@@ -1,10 +1,28 @@
-import { apiRequestPost } from 'mastodon/api';
-import type { Status, StatusVisibility } from 'mastodon/models/status';
+import api, { apiRequestPost, getLinks } from 'mastodon/api';
+import type { ApiStatusJSON } from 'mastodon/api_types/statuses';
+import type { StatusVisibility } from 'mastodon/models/status';
 
 export const apiReblog = (statusId: string, visibility: StatusVisibility) =>
-  apiRequestPost<{ reblog: Status }>(`v1/statuses/${statusId}/reblog`, {
+  apiRequestPost<{ reblog: ApiStatusJSON }>(`v1/statuses/${statusId}/reblog`, {
     visibility,
   });
 
 export const apiUnreblog = (statusId: string) =>
-  apiRequestPost<Status>(`v1/statuses/${statusId}/unreblog`);
+  apiRequestPost<ApiStatusJSON>(`v1/statuses/${statusId}/unreblog`);
+
+export const apiRevokeQuote = (quotedStatusId: string, statusId: string) =>
+  apiRequestPost<ApiStatusJSON>(
+    `v1/statuses/${quotedStatusId}/quotes/${statusId}/revoke`,
+  );
+
+export const apiGetQuotes = async (statusId: string, url?: string) => {
+  const response = await api().request<ApiStatusJSON[]>({
+    method: 'GET',
+    url: url ?? `/api/v1/statuses/${statusId}/quotes`,
+  });
+
+  return {
+    statuses: response.data,
+    links: getLinks(response),
+  };
+};
diff --git a/app/javascript/mastodon/api/statuses.ts b/app/javascript/mastodon/api/statuses.ts
index 921a7bfe636..123f2759d09 100644
--- a/app/javascript/mastodon/api/statuses.ts
+++ b/app/javascript/mastodon/api/statuses.ts
@@ -1,5 +1,31 @@
-import { apiRequestGet } from 'mastodon/api';
-import type { ApiContextJSON } from 'mastodon/api_types/statuses';
+import api, { apiRequestPut, getAsyncRefreshHeader } from 'mastodon/api';
+import type {
+  ApiContextJSON,
+  ApiStatusJSON,
+} from 'mastodon/api_types/statuses';
 
-export const apiGetContext = (statusId: string) =>
-  apiRequestGet<ApiContextJSON>(`v1/statuses/${statusId}/context`);
+import type { ApiQuotePolicy } from '../api_types/quotes';
+
+export const apiGetContext = async (statusId: string) => {
+  const response = await api().request<ApiContextJSON>({
+    method: 'GET',
+    url: `/api/v1/statuses/${statusId}/context`,
+  });
+
+  return {
+    context: response.data,
+    refresh: getAsyncRefreshHeader(response),
+  };
+};
+
+export const apiSetQuotePolicy = async (
+  statusId: string,
+  policy: ApiQuotePolicy,
+) => {
+  return apiRequestPut<ApiStatusJSON>(
+    `v1/statuses/${statusId}/interaction_policy`,
+    {
+      quote_approval_policy: policy,
+    },
+  );
+};
diff --git a/app/javascript/mastodon/api_types/accounts.ts b/app/javascript/mastodon/api_types/accounts.ts
index b93054a1f6f..913a201fef4 100644
--- a/app/javascript/mastodon/api_types/accounts.ts
+++ b/app/javascript/mastodon/api_types/accounts.ts
@@ -37,7 +37,7 @@ export interface BaseApiAccountJSON {
   roles?: ApiAccountJSON[];
   statuses_count: number;
   uri: string;
-  url: string;
+  url?: string;
   username: string;
   moved?: ApiAccountJSON;
   suspended?: boolean;
diff --git a/app/javascript/mastodon/api_types/announcements.ts b/app/javascript/mastodon/api_types/announcements.ts
new file mode 100644
index 00000000000..03e8922d8f1
--- /dev/null
+++ b/app/javascript/mastodon/api_types/announcements.ts
@@ -0,0 +1,28 @@
+// See app/serializers/rest/announcement_serializer.rb
+
+import type { ApiCustomEmojiJSON } from './custom_emoji';
+import type { ApiMentionJSON, ApiStatusJSON, ApiTagJSON } from './statuses';
+
+export interface ApiAnnouncementJSON {
+  id: string;
+  content: string;
+  starts_at: null | string;
+  ends_at: null | string;
+  all_day: boolean;
+  published_at: string;
+  updated_at: null | string;
+  read: boolean;
+  mentions: ApiMentionJSON[];
+  statuses: ApiStatusJSON[];
+  tags: ApiTagJSON[];
+  emojis: ApiCustomEmojiJSON[];
+  reactions: ApiAnnouncementReactionJSON[];
+}
+
+export interface ApiAnnouncementReactionJSON {
+  name: string;
+  count: number;
+  me: boolean;
+  url?: string;
+  static_url?: string;
+}
diff --git a/app/javascript/mastodon/api_types/async_refreshes.ts b/app/javascript/mastodon/api_types/async_refreshes.ts
new file mode 100644
index 00000000000..2d2fed24127
--- /dev/null
+++ b/app/javascript/mastodon/api_types/async_refreshes.ts
@@ -0,0 +1,7 @@
+export interface ApiAsyncRefreshJSON {
+  async_refresh: {
+    id: string;
+    status: 'running' | 'finished';
+    result_count: number;
+  };
+}
diff --git a/app/javascript/mastodon/api_types/notifications.ts b/app/javascript/mastodon/api_types/notifications.ts
index 190d8c83966..533e9903682 100644
--- a/app/javascript/mastodon/api_types/notifications.ts
+++ b/app/javascript/mastodon/api_types/notifications.ts
@@ -7,12 +7,13 @@ import type { ApiReportJSON } from './reports';
 import type { ApiStatusJSON } from './statuses';
 
 // See app/model/notification.rb
-export const allNotificationTypes = [
+export const allNotificationTypes: NotificationType[] = [
   'follow',
   'follow_request',
   'favourite',
   'reblog',
   'mention',
+  'quote',
   'poll',
   'status',
   'update',
@@ -28,8 +29,10 @@ export type NotificationWithStatusType =
   | 'reblog'
   | 'status'
   | 'mention'
+  | 'quote'
   | 'poll'
-  | 'update';
+  | 'update'
+  | 'quoted_update';
 
 export type NotificationType =
   | NotificationWithStatusType
diff --git a/app/javascript/mastodon/api_types/quotes.ts b/app/javascript/mastodon/api_types/quotes.ts
new file mode 100644
index 00000000000..f42a3eb7289
--- /dev/null
+++ b/app/javascript/mastodon/api_types/quotes.ts
@@ -0,0 +1,39 @@
+import type { ApiStatusJSON } from './statuses';
+
+export type ApiQuoteState = 'accepted' | 'pending' | 'revoked' | 'unauthorized';
+export type ApiQuotePolicy =
+  | 'public'
+  | 'followers'
+  | 'following'
+  | 'nobody'
+  | 'unsupported_policy';
+export type ApiUserQuotePolicy = 'automatic' | 'manual' | 'denied' | 'unknown';
+
+interface ApiQuoteEmptyJSON {
+  state: Exclude<ApiQuoteState, 'accepted'>;
+  quoted_status: null;
+}
+
+interface ApiNestedQuoteJSON {
+  state: 'accepted';
+  quoted_status_id: string;
+}
+
+interface ApiQuoteAcceptedJSON {
+  state: 'accepted';
+  quoted_status: Omit<ApiStatusJSON, 'quote'> & {
+    quote: ApiNestedQuoteJSON | ApiQuoteEmptyJSON;
+  };
+}
+
+export type ApiQuoteJSON = ApiQuoteAcceptedJSON | ApiQuoteEmptyJSON;
+
+export interface ApiQuotePolicyJSON {
+  automatic: ApiQuotePolicy[];
+  manual: ApiQuotePolicy[];
+  current_user: ApiUserQuotePolicy;
+}
+
+export function isQuotePolicy(policy: string): policy is ApiQuotePolicy {
+  return ['public', 'followers', 'nobody'].includes(policy);
+}
diff --git a/app/javascript/mastodon/api_types/statuses.ts b/app/javascript/mastodon/api_types/statuses.ts
index 09bd2349b39..00418a13d29 100644
--- a/app/javascript/mastodon/api_types/statuses.ts
+++ b/app/javascript/mastodon/api_types/statuses.ts
@@ -4,6 +4,7 @@ import type { ApiAccountJSON } from './accounts';
 import type { ApiCustomEmojiJSON } from './custom_emoji';
 import type { ApiMediaAttachmentJSON } from './media_attachments';
 import type { ApiPollJSON } from './polls';
+import type { ApiQuoteJSON, ApiQuotePolicyJSON } from './quotes';
 
 // See app/modals/status.rb
 export type StatusVisibility =
@@ -95,6 +96,7 @@ export interface ApiStatusJSON {
   replies_count: number;
   reblogs_count: number;
   favorites_count: number;
+  quotes_count: number;
   edited_at?: string;
 
   favorited?: boolean;
@@ -118,9 +120,23 @@ export interface ApiStatusJSON {
 
   card?: ApiPreviewCardJSON;
   poll?: ApiPollJSON;
+  quote?: ApiQuoteJSON;
+  quote_approval?: ApiQuotePolicyJSON;
 }
 
 export interface ApiContextJSON {
   ancestors: ApiStatusJSON[];
   descendants: ApiStatusJSON[];
 }
+
+export interface ApiStatusSourceJSON {
+  id: string;
+  text: string;
+  spoiler_text: string;
+}
+
+export function isStatusVisibility(
+  visibility: string,
+): visibility is StatusVisibility {
+  return ['public', 'unlisted', 'private', 'direct'].includes(visibility);
+}
diff --git a/app/javascript/mastodon/components/__tests__/__snapshots__/display_name-test.jsx.snap b/app/javascript/mastodon/components/__tests__/__snapshots__/display_name-test.jsx.snap
deleted file mode 100644
index 9d1b236fad0..00000000000
--- a/app/javascript/mastodon/components/__tests__/__snapshots__/display_name-test.jsx.snap
+++ /dev/null
@@ -1,27 +0,0 @@
-// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
-
-exports[`<DisplayName /> > renders display name + account name 1`] = `
-<span
-  className="display-name"
-  onMouseEnter={[Function]}
-  onMouseLeave={[Function]}
->
-  <bdi>
-    <strong
-      className="display-name__html"
-      dangerouslySetInnerHTML={
-        {
-          "__html": "<p>Foo</p>",
-        }
-      }
-    />
-  </bdi>
-   
-  <span
-    className="display-name__account"
-  >
-    @
-    bar@baz
-  </span>
-</span>
-`;
diff --git a/app/javascript/mastodon/components/__tests__/display_name-test.jsx b/app/javascript/mastodon/components/__tests__/display_name-test.jsx
deleted file mode 100644
index 05a0f47170f..00000000000
--- a/app/javascript/mastodon/components/__tests__/display_name-test.jsx
+++ /dev/null
@@ -1,19 +0,0 @@
-import { fromJS }  from 'immutable';
-
-import renderer from 'react-test-renderer';
-
-import { DisplayName } from '../display_name';
-
-describe('<DisplayName />', () => {
-  it('renders display name + account name', () => {
-    const account = fromJS({
-      username: 'bar',
-      acct: 'bar@baz',
-      display_name_html: '<p>Foo</p>',
-    });
-    const component = renderer.create(<DisplayName account={account} />);
-    const tree      = component.toJSON();
-
-    expect(tree).toMatchSnapshot();
-  });
-});
diff --git a/app/javascript/mastodon/components/account/index.tsx b/app/javascript/mastodon/components/account/index.tsx
index 8397695a443..3aebedc9497 100644
--- a/app/javascript/mastodon/components/account/index.tsx
+++ b/app/javascript/mastodon/components/account/index.tsx
@@ -5,6 +5,7 @@ import { defineMessages, useIntl, FormattedMessage } from 'react-intl';
 import classNames from 'classnames';
 import { Link } from 'react-router-dom';
 
+import { EmojiHTML } from '@/mastodon/components/emoji/html';
 import MoreHorizIcon from '@/material-icons/400-24px/more_horiz.svg?react';
 import {
   blockAccount,
@@ -331,9 +332,10 @@ export const Account: React.FC<AccountProps> = ({
           {account &&
             withBio &&
             (account.note.length > 0 ? (
-              <div
+              <EmojiHTML
                 className='account__note translate'
-                dangerouslySetInnerHTML={{ __html: account.note_emojified }}
+                htmlString={account.note_emojified}
+                extraEmojis={account.emojis}
               />
             ) : (
               <div className='account__note account__note--missing'>
diff --git a/app/javascript/mastodon/components/account_bio.tsx b/app/javascript/mastodon/components/account_bio.tsx
index 301ffcbb247..e87ae654fdf 100644
--- a/app/javascript/mastodon/components/account_bio.tsx
+++ b/app/javascript/mastodon/components/account_bio.tsx
@@ -1,20 +1,91 @@
+import { useCallback } from 'react';
+
+import classNames from 'classnames';
+
 import { useLinks } from 'mastodon/hooks/useLinks';
 
-export const AccountBio: React.FC<{
-  note: string;
-  className: string;
-}> = ({ note, className }) => {
-  const handleClick = useLinks();
+import { useAppSelector } from '../store';
+import { isModernEmojiEnabled } from '../utils/environment';
 
-  if (note.length === 0 || note === '<p></p>') {
+import { EmojiHTML } from './emoji/html';
+import { useElementHandledLink } from './status/handled_link';
+
+interface AccountBioProps {
+  className: string;
+  accountId: string;
+  showDropdown?: boolean;
+}
+
+export const AccountBio: React.FC<AccountBioProps> = ({
+  className,
+  accountId,
+  showDropdown = false,
+}) => {
+  const handleClick = useLinks(showDropdown);
+  const handleNodeChange = useCallback(
+    (node: HTMLDivElement | null) => {
+      if (
+        !showDropdown ||
+        !node ||
+        node.childNodes.length === 0 ||
+        isModernEmojiEnabled()
+      ) {
+        return;
+      }
+      addDropdownToHashtags(node, accountId);
+    },
+    [showDropdown, accountId],
+  );
+
+  const htmlHandlers = useElementHandledLink({
+    hashtagAccountId: showDropdown ? accountId : undefined,
+  });
+
+  const note = useAppSelector((state) => {
+    const account = state.accounts.get(accountId);
+    if (!account) {
+      return '';
+    }
+    return account.note_emojified;
+  });
+  const extraEmojis = useAppSelector((state) => {
+    const account = state.accounts.get(accountId);
+    return account?.emojis;
+  });
+
+  if (note.length === 0) {
     return null;
   }
 
   return (
-    <div
-      className={`${className} translate`}
-      dangerouslySetInnerHTML={{ __html: note }}
+    <EmojiHTML
+      htmlString={note}
+      extraEmojis={extraEmojis}
+      className={classNames(className, 'translate')}
       onClickCapture={handleClick}
+      ref={handleNodeChange}
+      {...htmlHandlers}
     />
   );
 };
+
+function addDropdownToHashtags(node: HTMLElement | null, accountId: string) {
+  if (!node) {
+    return;
+  }
+  for (const childNode of node.childNodes) {
+    if (!(childNode instanceof HTMLElement)) {
+      continue;
+    }
+    if (
+      childNode instanceof HTMLAnchorElement &&
+      (childNode.classList.contains('hashtag') ||
+        childNode.innerText.startsWith('#')) &&
+      !childNode.dataset.menuHashtag
+    ) {
+      childNode.dataset.menuHashtag = accountId;
+    } else if (childNode.childNodes.length > 0) {
+      addDropdownToHashtags(childNode, accountId);
+    }
+  }
+}
diff --git a/app/javascript/mastodon/components/account_fields.tsx b/app/javascript/mastodon/components/account_fields.tsx
index 4ce55f7896a..dd17b89d865 100644
--- a/app/javascript/mastodon/components/account_fields.tsx
+++ b/app/javascript/mastodon/components/account_fields.tsx
@@ -1,42 +1,70 @@
+import { useIntl } from 'react-intl';
+
 import classNames from 'classnames';
 
 import CheckIcon from '@/material-icons/400-24px/check.svg?react';
 import { Icon } from 'mastodon/components/icon';
-import { useLinks } from 'mastodon/hooks/useLinks';
 import type { Account } from 'mastodon/models/account';
 
-export const AccountFields: React.FC<{
-  fields: Account['fields'];
-  limit: number;
-}> = ({ fields, limit = -1 }) => {
-  const handleClick = useLinks();
+import { CustomEmojiProvider } from './emoji/context';
+import { EmojiHTML } from './emoji/html';
+import { useElementHandledLink } from './status/handled_link';
+
+export const AccountFields: React.FC<Pick<Account, 'fields' | 'emojis'>> = ({
+  fields,
+  emojis,
+}) => {
+  const intl = useIntl();
+  const htmlHandlers = useElementHandledLink();
 
   if (fields.size === 0) {
     return null;
   }
 
   return (
-    <div className='account-fields' onClickCapture={handleClick}>
-      {fields.take(limit).map((pair, i) => (
-        <dl
-          key={i}
-          className={classNames({ verified: pair.get('verified_at') })}
-        >
-          <dt
-            dangerouslySetInnerHTML={{ __html: pair.get('name_emojified') }}
+    <CustomEmojiProvider emojis={emojis}>
+      {fields.map((pair, i) => (
+        <dl key={i} className={classNames({ verified: pair.verified_at })}>
+          <EmojiHTML
+            as='dt'
+            htmlString={pair.name_emojified}
             className='translate'
+            {...htmlHandlers}
           />
 
-          <dd className='translate' title={pair.get('value_plain') ?? ''}>
-            {pair.get('verified_at') && (
-              <Icon id='check' icon={CheckIcon} className='verified__mark' />
-            )}
-            <span
-              dangerouslySetInnerHTML={{ __html: pair.get('value_emojified') }}
+          <dd className='translate' title={pair.value_plain ?? ''}>
+            {pair.verified_at && (
+              <span
+                title={intl.formatMessage(
+                  {
+                    id: 'account.link_verified_on',
+                    defaultMessage:
+                      'Ownership of this link was checked on {date}',
+                  },
+                  {
+                    date: intl.formatDate(pair.verified_at, dateFormatOptions),
+                  },
+                )}
+              >
+                <Icon id='check' icon={CheckIcon} className='verified__mark' />
+              </span>
+            )}{' '}
+            <EmojiHTML
+              as='span'
+              htmlString={pair.value_emojified}
+              {...htmlHandlers}
             />
           </dd>
         </dl>
       ))}
-    </div>
+    </CustomEmojiProvider>
   );
 };
+
+const dateFormatOptions: Intl.DateTimeFormatOptions = {
+  month: 'short',
+  day: 'numeric',
+  year: 'numeric',
+  hour: '2-digit',
+  minute: '2-digit',
+};
diff --git a/app/javascript/mastodon/components/alert/alert.stories.tsx b/app/javascript/mastodon/components/alert/alert.stories.tsx
new file mode 100644
index 00000000000..f12f06751d7
--- /dev/null
+++ b/app/javascript/mastodon/components/alert/alert.stories.tsx
@@ -0,0 +1,125 @@
+import type { Meta, StoryObj } from '@storybook/react-vite';
+import { fn, expect } from 'storybook/test';
+
+import { Alert } from '.';
+
+const meta = {
+  title: 'Components/Alert',
+  component: Alert,
+  args: {
+    isActive: true,
+    isLoading: false,
+    animateFrom: 'side',
+    title: '',
+    message: '',
+    action: '',
+    onActionClick: fn(),
+  },
+  argTypes: {
+    isActive: {
+      control: 'boolean',
+      type: 'boolean',
+      description: 'Animate to the active (displayed) state of the alert',
+    },
+    isLoading: {
+      control: 'boolean',
+      type: 'boolean',
+      description:
+        'Display a loading indicator in the alert, replacing the dismiss button if present',
+    },
+    animateFrom: {
+      control: 'radio',
+      type: 'string',
+      options: ['side', 'below'],
+      description:
+        'Direction that the alert animates in from when activated. `side` is dependent on reading direction, defaulting to left in ltr languages.',
+    },
+    title: {
+      control: 'text',
+      type: 'string',
+      description: '(Optional) title of the alert',
+    },
+    message: {
+      control: 'text',
+      type: 'string',
+      description: 'Main alert text',
+    },
+    action: {
+      control: 'text',
+      type: 'string',
+      description:
+        'Label of the alert action (requires `onActionClick` handler)',
+    },
+  },
+  tags: ['test'],
+} satisfies Meta<typeof Alert>;
+
+export default meta;
+
+type Story = StoryObj<typeof meta>;
+
+export const Simple: Story = {
+  args: {
+    message: 'Post published.',
+  },
+  render: (args) => (
+    <div style={{ overflow: 'clip', padding: '1rem' }}>
+      <Alert {...args} />
+    </div>
+  ),
+};
+
+export const WithAction: Story = {
+  args: {
+    ...Simple.args,
+    action: 'Open',
+  },
+  render: Simple.render,
+  play: async ({ args, canvas, userEvent }) => {
+    const button = await canvas.findByRole('button', { name: 'Open' });
+    await userEvent.click(button);
+    await expect(args.onActionClick).toHaveBeenCalled();
+  },
+};
+
+export const WithTitle: Story = {
+  args: {
+    title: 'Warning:',
+    message: 'This is an alert',
+  },
+  render: Simple.render,
+};
+
+export const WithDismissButton: Story = {
+  args: {
+    message: 'More replies found',
+    action: 'Show',
+    onDismiss: fn(),
+  },
+  render: Simple.render,
+};
+
+export const InSizedContainer: Story = {
+  args: WithDismissButton.args,
+  render: (args) => (
+    <div
+      style={{
+        overflow: 'clip',
+        padding: '1rem',
+        width: '380px',
+        maxWidth: '100%',
+        boxSizing: 'border-box',
+      }}
+    >
+      <Alert {...args} />
+    </div>
+  ),
+};
+
+export const WithLoadingIndicator: Story = {
+  args: {
+    ...WithDismissButton.args,
+    isLoading: true,
+  },
+  render: InSizedContainer.render,
+};
diff --git a/app/javascript/mastodon/components/alert/index.tsx b/app/javascript/mastodon/components/alert/index.tsx
new file mode 100644
index 00000000000..72fee0a4a30
--- /dev/null
+++ b/app/javascript/mastodon/components/alert/index.tsx
@@ -0,0 +1,77 @@
+import { useIntl } from 'react-intl';
+
+import classNames from 'classnames';
+
+import CloseIcon from '@/material-icons/400-24px/close.svg?react';
+import { LoadingIndicator } from 'mastodon/components/loading_indicator';
+
+import { IconButton } from '../icon_button';
+
+/**
+ * Snackbar/Toast-style notification component.
+ */
+export const Alert: React.FC<{
+  title?: string;
+  message: string;
+  action?: string;
+  onActionClick?: () => void;
+  onDismiss?: () => void;
+  isActive?: boolean;
+  isLoading?: boolean;
+  animateFrom?: 'side' | 'below';
+}> = ({
+  title,
+  message,
+  action,
+  onActionClick,
+  onDismiss,
+  isActive,
+  isLoading,
+  animateFrom = 'side',
+}) => {
+  const intl = useIntl();
+
+  const hasAction = Boolean(action && onActionClick);
+
+  return (
+    <div
+      className={classNames('notification-bar', {
+        'notification-bar--active': isActive,
+        'from-side': animateFrom === 'side',
+        'from-below': animateFrom === 'below',
+      })}
+    >
+      <span className='notification-bar__content'>
+        {Boolean(title) && (
+          <span className='notification-bar__title'>{title}</span>
+        )}
+        {message}
+      </span>
+
+      {hasAction && (
+        <button className='notification-bar__action' onClick={onActionClick}>
+          {action}
+        </button>
+      )}
+
+      {isLoading && (
+        <span className='notification-bar__loading-indicator'>
+          <LoadingIndicator />
+        </span>
+      )}
+
+      {onDismiss && !isLoading && (
+        <IconButton
+          title={intl.formatMessage({
+            id: 'dismissable_banner.dismiss',
+            defaultMessage: 'Dismiss',
+          })}
+          icon='times'
+          iconComponent={CloseIcon}
+          className='notification-bar__dismiss-button'
+          onClick={onDismiss}
+        />
+      )}
+    </div>
+  );
+};
diff --git a/app/javascript/mastodon/components/alerts_controller.tsx b/app/javascript/mastodon/components/alerts_controller.tsx
index 26749fa1037..aa97feeca58 100644
--- a/app/javascript/mastodon/components/alerts_controller.tsx
+++ b/app/javascript/mastodon/components/alerts_controller.tsx
@@ -3,16 +3,16 @@ import { useState, useEffect } from 'react';
 import { useIntl } from 'react-intl';
 import type { IntlShape } from 'react-intl';
 
-import classNames from 'classnames';
-
 import { dismissAlert } from 'mastodon/actions/alerts';
 import type {
-  Alert,
+  Alert as AlertType,
   TranslatableString,
   TranslatableValues,
 } from 'mastodon/models/alert';
 import { useAppSelector, useAppDispatch } from 'mastodon/store';
 
+import { Alert } from './alert';
+
 const formatIfNeeded = (
   intl: IntlShape,
   message: TranslatableString,
@@ -25,8 +25,8 @@ const formatIfNeeded = (
   return message;
 };
 
-const Alert: React.FC<{
-  alert: Alert;
+const TimedAlert: React.FC<{
+  alert: AlertType;
   dismissAfter: number;
 }> = ({
   alert: { key, title, message, values, action, onClick },
@@ -62,29 +62,13 @@ const Alert: React.FC<{
   }, [dispatch, setActive, key, dismissAfter]);
 
   return (
-    <div
-      className={classNames('notification-bar', {
-        'notification-bar-active': active,
-      })}
-    >
-      <div className='notification-bar-wrapper'>
-        {title && (
-          <span className='notification-bar-title'>
-            {formatIfNeeded(intl, title, values)}
-          </span>
-        )}
-
-        <span className='notification-bar-message'>
-          {formatIfNeeded(intl, message, values)}
-        </span>
-
-        {action && (
-          <button className='notification-bar-action' onClick={onClick}>
-            {formatIfNeeded(intl, action, values)}
-          </button>
-        )}
-      </div>
-    </div>
+    <Alert
+      isActive={active}
+      title={title ? formatIfNeeded(intl, title, values) : undefined}
+      message={formatIfNeeded(intl, message, values)}
+      action={action ? formatIfNeeded(intl, action, values) : undefined}
+      onActionClick={onClick}
+    />
   );
 };
 
@@ -98,7 +82,11 @@ export const AlertsController: React.FC = () => {
   return (
     <div className='notification-list'>
       {alerts.map((alert, idx) => (
-        <Alert key={alert.key} alert={alert} dismissAfter={5000 + idx * 1000} />
+        <TimedAlert
+          key={alert.key}
+          alert={alert}
+          dismissAfter={5000 + idx * 1000}
+        />
       ))}
     </div>
   );
diff --git a/app/javascript/mastodon/components/alt_text_badge.tsx b/app/javascript/mastodon/components/alt_text_badge.tsx
index 07369795aca..c7fb0cd81b1 100644
--- a/app/javascript/mastodon/components/alt_text_badge.tsx
+++ b/app/javascript/mastodon/components/alt_text_badge.tsx
@@ -13,9 +13,9 @@ import { useSelectableClick } from 'mastodon/hooks/useSelectableClick';
 const offset = [0, 4] as OffsetValue;
 const popperConfig = { strategy: 'fixed' } as UsePopperOptions;
 
-export const AltTextBadge: React.FC<{
-  description: string;
-}> = ({ description }) => {
+export const AltTextBadge: React.FC<{ description: string }> = ({
+  description,
+}) => {
   const accessibilityId = useId();
   const anchorRef = useRef<HTMLButtonElement>(null);
   const [open, setOpen] = useState(false);
@@ -56,7 +56,7 @@ export const AltTextBadge: React.FC<{
         {({ props }) => (
           <div {...props} className='hover-card-controller'>
             <div // eslint-disable-line jsx-a11y/no-noninteractive-element-interactions
-              className='media-gallery__alt__popover dropdown-animation'
+              className='info-tooltip dropdown-animation'
               role='region'
               id={accessibilityId}
               onMouseDown={handleMouseDown}
diff --git a/app/javascript/mastodon/components/autosuggest_textarea.jsx b/app/javascript/mastodon/components/autosuggest_textarea.jsx
index c7ec3779f3f..68cf9e17fc9 100644
--- a/app/javascript/mastodon/components/autosuggest_textarea.jsx
+++ b/app/javascript/mastodon/components/autosuggest_textarea.jsx
@@ -53,6 +53,7 @@ const AutosuggestTextarea = forwardRef(({
   onFocus,
   autoFocus = true,
   lang,
+  className,
 }, textareaRef) => {
 
   const [suggestionsHidden, setSuggestionsHidden] = useState(true);
@@ -149,10 +150,7 @@ const AutosuggestTextarea = forwardRef(({
   }, [suggestions, onSuggestionSelected, textareaRef]);
 
   const handlePaste = useCallback((e) => {
-    if (e.clipboardData && e.clipboardData.files.length === 1) {
-      onPaste(e.clipboardData.files);
-      e.preventDefault();
-    }
+    onPaste(e);
   }, [onPaste]);
 
   // Show the suggestions again whenever they change and the textarea is focused
@@ -192,7 +190,7 @@ const AutosuggestTextarea = forwardRef(({
   };
 
   return (
-    <div className='autosuggest-textarea'>
+    <div className={classNames('autosuggest-textarea', className)}>
       <Textarea
         ref={textareaRef}
         className='autosuggest-textarea__textarea'
diff --git a/app/javascript/mastodon/components/blurhash.tsx b/app/javascript/mastodon/components/blurhash.tsx
index 8e2a8af23e5..b7331755b7f 100644
--- a/app/javascript/mastodon/components/blurhash.tsx
+++ b/app/javascript/mastodon/components/blurhash.tsx
@@ -30,9 +30,12 @@ const Blurhash: React.FC<Props> = ({
     try {
       const pixels = decode(hash, width, height);
       const ctx = canvas.getContext('2d');
-      const imageData = new ImageData(pixels, width, height);
+      const imageData = ctx?.createImageData(width, height);
+      imageData?.data.set(pixels);
 
-      ctx?.putImageData(imageData, 0, 0);
+      if (imageData) {
+        ctx?.putImageData(imageData, 0, 0);
+      }
     } catch (err) {
       console.error('Blurhash decoding failure', { err, hash });
     }
diff --git a/app/javascript/mastodon/components/button/button.stories.tsx b/app/javascript/mastodon/components/button/button.stories.tsx
index 4bcb9edbb88..6827097c50e 100644
--- a/app/javascript/mastodon/components/button/button.stories.tsx
+++ b/app/javascript/mastodon/components/button/button.stories.tsx
@@ -8,6 +8,7 @@ const meta = {
   component: Button,
   args: {
     secondary: false,
+    plain: false,
     compact: false,
     dangerous: false,
     disabled: false,
@@ -57,6 +58,14 @@ export const Secondary: Story = {
   play: buttonTest,
 };
 
+export const Plain: Story = {
+  args: {
+    plain: true,
+    children: 'Plain button',
+  },
+  play: buttonTest,
+};
+
 export const Compact: Story = {
   args: {
     compact: true,
@@ -101,6 +110,14 @@ export const SecondaryDisabled: Story = {
   play: disabledButtonTest,
 };
 
+export const PlainDisabled: Story = {
+  args: {
+    ...Plain.args,
+    disabled: true,
+  },
+  play: disabledButtonTest,
+};
+
 const loadingButtonTest: Story['play'] = async ({
   args,
   canvas,
diff --git a/app/javascript/mastodon/components/button/index.tsx b/app/javascript/mastodon/components/button/index.tsx
index 6d2a37cf85f..f940c07d056 100644
--- a/app/javascript/mastodon/components/button/index.tsx
+++ b/app/javascript/mastodon/components/button/index.tsx
@@ -9,6 +9,7 @@ interface BaseProps
   extends Omit<React.ButtonHTMLAttributes<HTMLButtonElement>, 'children'> {
   block?: boolean;
   secondary?: boolean;
+  plain?: boolean;
   compact?: boolean;
   dangerous?: boolean;
   loading?: boolean;
@@ -35,6 +36,7 @@ export const Button: React.FC<Props> = ({
   disabled,
   block,
   secondary,
+  plain,
   compact,
   dangerous,
   loading,
@@ -62,6 +64,7 @@ export const Button: React.FC<Props> = ({
     <button
       className={classNames('button', className, {
         'button-secondary': secondary,
+        'button--plain': plain,
         'button--compact': compact,
         'button--block': block,
         'button--dangerous': dangerous,
diff --git a/app/javascript/mastodon/components/content_warning.tsx b/app/javascript/mastodon/components/content_warning.tsx
index 6bcae1d6f73..a407ec146e3 100644
--- a/app/javascript/mastodon/components/content_warning.tsx
+++ b/app/javascript/mastodon/components/content_warning.tsx
@@ -1,15 +1,38 @@
+import type { List } from 'immutable';
+
+import type { CustomEmoji } from '../models/custom_emoji';
+import type { Status } from '../models/status';
+
+import { EmojiHTML } from './emoji/html';
 import { StatusBanner, BannerVariant } from './status_banner';
 
 export const ContentWarning: React.FC<{
-  text: string;
+  status: Status;
   expanded?: boolean;
   onClick?: () => void;
-}> = ({ text, expanded, onClick }) => (
-  <StatusBanner
-    expanded={expanded}
-    onClick={onClick}
-    variant={BannerVariant.Warning}
-  >
-    <span dangerouslySetInnerHTML={{ __html: text }} />
-  </StatusBanner>
-);
+}> = ({ status, expanded, onClick }) => {
+  const hasSpoiler = !!status.get('spoiler_text');
+  if (!hasSpoiler) {
+    return null;
+  }
+
+  const text =
+    status.getIn(['translation', 'spoilerHtml']) || status.get('spoilerHtml');
+  if (typeof text !== 'string' || text.length === 0) {
+    return null;
+  }
+
+  return (
+    <StatusBanner
+      expanded={expanded}
+      onClick={onClick}
+      variant={BannerVariant.Warning}
+    >
+      <EmojiHTML
+        as='span'
+        htmlString={text}
+        extraEmojis={status.get('emoji') as List<CustomEmoji>}
+      />
+    </StatusBanner>
+  );
+};
diff --git a/app/javascript/mastodon/components/dismissable_banner.tsx b/app/javascript/mastodon/components/dismissable_banner.tsx
index bc40e46f8da..a874f4792e4 100644
--- a/app/javascript/mastodon/components/dismissable_banner.tsx
+++ b/app/javascript/mastodon/components/dismissable_banner.tsx
@@ -1,8 +1,3 @@
-/* eslint-disable @typescript-eslint/no-unsafe-call,
-                  @typescript-eslint/no-unsafe-return,
-                  @typescript-eslint/no-unsafe-assignment,
-                  @typescript-eslint/no-unsafe-member-access
-                  -- the settings store is not yet typed */
 import type { PropsWithChildren } from 'react';
 import { useCallback, useState, useEffect } from 'react';
 
@@ -23,31 +18,48 @@ interface Props {
   id: string;
 }
 
-export const DismissableBanner: React.FC<PropsWithChildren<Props>> = ({
-  id,
-  children,
-}) => {
-  const dismissed = useAppSelector((state) =>
+export function useDismissableBannerState({ id }: Props) {
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+  const dismissed: boolean = useAppSelector((state) =>
+    /* eslint-disable-next-line */
     state.settings.getIn(['dismissed_banners', id], false),
   );
+
+  const [isVisible, setIsVisible] = useState(
+    !bannerSettings.get(id) && !dismissed,
+  );
+
   const dispatch = useAppDispatch();
 
-  const [visible, setVisible] = useState(!bannerSettings.get(id) && !dismissed);
-  const intl = useIntl();
-
-  const handleDismiss = useCallback(() => {
-    setVisible(false);
+  const dismiss = useCallback(() => {
+    setIsVisible(false);
     bannerSettings.set(id, true);
     dispatch(changeSetting(['dismissed_banners', id], true));
   }, [id, dispatch]);
 
   useEffect(() => {
-    if (!visible && !dismissed) {
+    // Store legacy localStorage setting on server
+    if (!isVisible && !dismissed) {
       dispatch(changeSetting(['dismissed_banners', id], true));
     }
-  }, [id, dispatch, visible, dismissed]);
+  }, [id, dispatch, isVisible, dismissed]);
 
-  if (!visible) {
+  return {
+    wasDismissed: !isVisible,
+    dismiss,
+  };
+}
+
+export const DismissableBanner: React.FC<PropsWithChildren<Props>> = ({
+  id,
+  children,
+}) => {
+  const intl = useIntl();
+  const { wasDismissed, dismiss } = useDismissableBannerState({
+    id,
+  });
+
+  if (wasDismissed) {
     return null;
   }
 
@@ -58,7 +70,7 @@ export const DismissableBanner: React.FC<PropsWithChildren<Props>> = ({
           icon='times'
           iconComponent={CloseIcon}
           title={intl.formatMessage(messages.dismiss)}
-          onClick={handleDismiss}
+          onClick={dismiss}
         />
       </div>
 
diff --git a/app/javascript/mastodon/components/display_name.tsx b/app/javascript/mastodon/components/display_name.tsx
deleted file mode 100644
index 8409244827e..00000000000
--- a/app/javascript/mastodon/components/display_name.tsx
+++ /dev/null
@@ -1,122 +0,0 @@
-import React from 'react';
-
-import type { List } from 'immutable';
-
-import type { Account } from 'mastodon/models/account';
-
-import { autoPlayGif } from '../initial_state';
-
-import { Skeleton } from './skeleton';
-
-interface Props {
-  account?: Account;
-  others?: List<Account>;
-  localDomain?: string;
-}
-
-export class DisplayName extends React.PureComponent<Props> {
-  handleMouseEnter: React.ReactEventHandler<HTMLSpanElement> = ({
-    currentTarget,
-  }) => {
-    if (autoPlayGif) {
-      return;
-    }
-
-    const emojis =
-      currentTarget.querySelectorAll<HTMLImageElement>('img.custom-emoji');
-
-    emojis.forEach((emoji) => {
-      const originalSrc = emoji.getAttribute('data-original');
-      if (originalSrc != null) emoji.src = originalSrc;
-    });
-  };
-
-  handleMouseLeave: React.ReactEventHandler<HTMLSpanElement> = ({
-    currentTarget,
-  }) => {
-    if (autoPlayGif) {
-      return;
-    }
-
-    const emojis =
-      currentTarget.querySelectorAll<HTMLImageElement>('img.custom-emoji');
-
-    emojis.forEach((emoji) => {
-      const staticSrc = emoji.getAttribute('data-static');
-      if (staticSrc != null) emoji.src = staticSrc;
-    });
-  };
-
-  render() {
-    const { others, localDomain } = this.props;
-
-    let displayName: React.ReactNode,
-      suffix: React.ReactNode,
-      account: Account | undefined;
-
-    if (others && others.size > 0) {
-      account = others.first();
-    } else if (this.props.account) {
-      account = this.props.account;
-    }
-
-    if (others && others.size > 1) {
-      displayName = others
-        .take(2)
-        .map((a) => (
-          <bdi key={a.get('id')}>
-            <strong
-              className='display-name__html'
-              dangerouslySetInnerHTML={{ __html: a.get('display_name_html') }}
-            />
-          </bdi>
-        ))
-        .reduce((prev, cur) => [prev, ', ', cur]);
-
-      if (others.size - 2 > 0) {
-        suffix = `+${others.size - 2}`;
-      }
-    } else if (account) {
-      let acct = account.get('acct');
-
-      if (!acct.includes('@') && localDomain) {
-        acct = `${acct}@${localDomain}`;
-      }
-
-      displayName = (
-        <bdi>
-          <strong
-            className='display-name__html'
-            dangerouslySetInnerHTML={{
-              __html: account.get('display_name_html'),
-            }}
-          />
-        </bdi>
-      );
-      suffix = <span className='display-name__account'>@{acct}</span>;
-    } else {
-      displayName = (
-        <bdi>
-          <strong className='display-name__html'>
-            <Skeleton width='10ch' />
-          </strong>
-        </bdi>
-      );
-      suffix = (
-        <span className='display-name__account'>
-          <Skeleton width='7ch' />
-        </span>
-      );
-    }
-
-    return (
-      <span
-        className='display-name'
-        onMouseEnter={this.handleMouseEnter}
-        onMouseLeave={this.handleMouseLeave}
-      >
-        {displayName} {suffix}
-      </span>
-    );
-  }
-}
diff --git a/app/javascript/mastodon/components/display_name/default.tsx b/app/javascript/mastodon/components/display_name/default.tsx
new file mode 100644
index 00000000000..57ae24ab26f
--- /dev/null
+++ b/app/javascript/mastodon/components/display_name/default.tsx
@@ -0,0 +1,36 @@
+import { useMemo } from 'react';
+import type { ComponentPropsWithoutRef, FC } from 'react';
+
+import { Skeleton } from '../skeleton';
+
+import type { DisplayNameProps } from './index';
+import { DisplayNameWithoutDomain } from './no-domain';
+
+export const DisplayNameDefault: FC<
+  Omit<DisplayNameProps, 'variant'> & ComponentPropsWithoutRef<'span'>
+> = ({ account, localDomain, className, ...props }) => {
+  const username = useMemo(() => {
+    if (!account) {
+      return null;
+    }
+    let acct = account.get('acct');
+
+    if (!acct.includes('@') && localDomain) {
+      acct = `${acct}@${localDomain}`;
+    }
+    return `@${acct}`;
+  }, [account, localDomain]);
+
+  return (
+    <DisplayNameWithoutDomain
+      account={account}
+      className={className}
+      {...props}
+    >
+      {' '}
+      <span className='display-name__account'>
+        {username ?? <Skeleton width='7ch' />}
+      </span>
+    </DisplayNameWithoutDomain>
+  );
+};
diff --git a/app/javascript/mastodon/components/display_name/display_name.stories.tsx b/app/javascript/mastodon/components/display_name/display_name.stories.tsx
new file mode 100644
index 00000000000..d546fdd135e
--- /dev/null
+++ b/app/javascript/mastodon/components/display_name/display_name.stories.tsx
@@ -0,0 +1,79 @@
+import type { ComponentProps } from 'react';
+
+import type { Meta, StoryObj } from '@storybook/react-vite';
+
+import { accountFactoryState } from '@/testing/factories';
+
+import { DisplayName, LinkedDisplayName } from './index';
+
+type PageProps = Omit<ComponentProps<typeof DisplayName>, 'account'> & {
+  name: string;
+  username: string;
+  loading: boolean;
+};
+
+const meta = {
+  title: 'Components/DisplayName',
+  args: {
+    username: 'mastodon@mastodon.social',
+    name: 'Test User 🧪',
+    loading: false,
+    localDomain: 'mastodon.social',
+  },
+  tags: [],
+  render({ name, username, loading, ...args }) {
+    const account = !loading
+      ? accountFactoryState({
+          display_name: name,
+          acct: username,
+        })
+      : undefined;
+    return <DisplayName {...args} account={account} />;
+  },
+} satisfies Meta<PageProps>;
+
+export default meta;
+
+type Story = StoryObj<typeof meta>;
+
+export const Primary: Story = {
+  args: {},
+};
+
+export const Loading: Story = {
+  args: {
+    loading: true,
+  },
+};
+
+export const NoDomain: Story = {
+  args: {
+    variant: 'noDomain',
+  },
+};
+
+export const Simple: Story = {
+  args: {
+    variant: 'simple',
+  },
+};
+
+export const LocalUser: Story = {
+  args: {
+    username: 'localuser',
+    name: 'Local User',
+    localDomain: '',
+  },
+};
+
+export const Linked: Story = {
+  render({ name, username, loading, ...args }) {
+    const account = !loading
+      ? accountFactoryState({
+          display_name: name,
+          acct: username,
+        })
+      : undefined;
+    return <LinkedDisplayName {...args} displayProps={{ account }} />;
+  },
+};
diff --git a/app/javascript/mastodon/components/display_name/index.tsx b/app/javascript/mastodon/components/display_name/index.tsx
new file mode 100644
index 00000000000..06bc380a10b
--- /dev/null
+++ b/app/javascript/mastodon/components/display_name/index.tsx
@@ -0,0 +1,51 @@
+import type { ComponentPropsWithoutRef, FC } from 'react';
+
+import type { LinkProps } from 'react-router-dom';
+import { Link } from 'react-router-dom';
+
+import type { Account } from '@/mastodon/models/account';
+
+import { DisplayNameDefault } from './default';
+import { DisplayNameWithoutDomain } from './no-domain';
+import { DisplayNameSimple } from './simple';
+
+export interface DisplayNameProps {
+  account?: Account;
+  localDomain?: string;
+  variant?: 'default' | 'simple' | 'noDomain';
+}
+
+export const DisplayName: FC<
+  DisplayNameProps & ComponentPropsWithoutRef<'span'>
+> = ({ variant = 'default', ...props }) => {
+  if (variant === 'simple') {
+    return <DisplayNameSimple {...props} />;
+  } else if (variant === 'noDomain') {
+    return <DisplayNameWithoutDomain {...props} />;
+  }
+  return <DisplayNameDefault {...props} />;
+};
+
+export const LinkedDisplayName: FC<
+  Omit<LinkProps, 'to'> & {
+    displayProps: DisplayNameProps & ComponentPropsWithoutRef<'span'>;
+  }
+> = ({ displayProps, children, ...linkProps }) => {
+  const { account } = displayProps;
+  if (!account) {
+    return <DisplayName {...displayProps} />;
+  }
+
+  return (
+    <Link
+      to={`/@${account.acct}`}
+      title={`@${account.acct}`}
+      data-id={account.id}
+      data-hover-card-account={account.id}
+      {...linkProps}
+    >
+      {children}
+      <DisplayName {...displayProps} />
+    </Link>
+  );
+};
diff --git a/app/javascript/mastodon/components/display_name/no-domain.tsx b/app/javascript/mastodon/components/display_name/no-domain.tsx
new file mode 100644
index 00000000000..ee6e84050c3
--- /dev/null
+++ b/app/javascript/mastodon/components/display_name/no-domain.tsx
@@ -0,0 +1,38 @@
+import type { ComponentPropsWithoutRef, FC } from 'react';
+
+import classNames from 'classnames';
+
+import { AnimateEmojiProvider } from '../emoji/context';
+import { EmojiHTML } from '../emoji/html';
+import { Skeleton } from '../skeleton';
+
+import type { DisplayNameProps } from './index';
+
+export const DisplayNameWithoutDomain: FC<
+  Omit<DisplayNameProps, 'variant' | 'localDomain'> &
+    ComponentPropsWithoutRef<'span'>
+> = ({ account, className, children, ...props }) => {
+  return (
+    <AnimateEmojiProvider
+      {...props}
+      as='span'
+      className={classNames('display-name', className)}
+    >
+      <bdi>
+        {account ? (
+          <EmojiHTML
+            className='display-name__html'
+            htmlString={account.get('display_name_html')}
+            as='strong'
+            extraEmojis={account.get('emojis')}
+          />
+        ) : (
+          <strong className='display-name__html'>
+            <Skeleton width='10ch' />
+          </strong>
+        )}
+      </bdi>
+      {children}
+    </AnimateEmojiProvider>
+  );
+};
diff --git a/app/javascript/mastodon/components/display_name/simple.tsx b/app/javascript/mastodon/components/display_name/simple.tsx
new file mode 100644
index 00000000000..29d9ee217b1
--- /dev/null
+++ b/app/javascript/mastodon/components/display_name/simple.tsx
@@ -0,0 +1,25 @@
+import type { ComponentPropsWithoutRef, FC } from 'react';
+
+import { EmojiHTML } from '../emoji/html';
+
+import type { DisplayNameProps } from './index';
+
+export const DisplayNameSimple: FC<
+  Omit<DisplayNameProps, 'variant' | 'localDomain'> &
+    ComponentPropsWithoutRef<'span'>
+> = ({ account, ...props }) => {
+  if (!account) {
+    return null;
+  }
+
+  return (
+    <bdi>
+      <EmojiHTML
+        {...props}
+        as='span'
+        htmlString={account.get('display_name_html')}
+        extraEmojis={account.get('emojis')}
+      />
+    </bdi>
+  );
+};
diff --git a/app/javascript/mastodon/components/dropdown/index.tsx b/app/javascript/mastodon/components/dropdown/index.tsx
new file mode 100644
index 00000000000..b6a04b9027f
--- /dev/null
+++ b/app/javascript/mastodon/components/dropdown/index.tsx
@@ -0,0 +1,141 @@
+import { useCallback, useId, useMemo, useRef, useState } from 'react';
+import type { ComponentPropsWithoutRef, FC } from 'react';
+
+import { useIntl } from 'react-intl';
+import type { MessageDescriptor } from 'react-intl';
+
+import classNames from 'classnames';
+
+import Overlay from 'react-overlays/Overlay';
+
+import UnfoldMoreIcon from '@/material-icons/400-24px/unfold_more.svg?react';
+
+import type { SelectItem } from '../dropdown_selector';
+import { DropdownSelector } from '../dropdown_selector';
+import { Icon } from '../icon';
+
+import { matchWidth } from './utils';
+
+interface DropdownProps {
+  disabled?: boolean;
+  items: SelectItem[];
+  onChange: (value: string) => void;
+  current: string;
+  labelId: string;
+  descriptionId?: string;
+  emptyText?: MessageDescriptor;
+  classPrefix: string;
+}
+
+export const Dropdown: FC<
+  DropdownProps & Omit<ComponentPropsWithoutRef<'button'>, keyof DropdownProps>
+> = ({
+  disabled,
+  items,
+  current,
+  onChange,
+  labelId,
+  descriptionId,
+  classPrefix,
+  className,
+  id,
+  ...buttonProps
+}) => {
+  const intl = useIntl();
+  const buttonRef = useRef<HTMLButtonElement>(null);
+  const uniqueId = useId();
+  const buttonId = id ?? `${uniqueId}-button`;
+  const listboxId = `${uniqueId}-listbox`;
+
+  const [open, setOpen] = useState(false);
+
+  const handleToggle = useCallback(() => {
+    if (!disabled) {
+      setOpen((prevOpen) => {
+        buttonRef.current?.focus();
+        return !prevOpen;
+      });
+    }
+  }, [disabled]);
+
+  const handleClose = useCallback(() => {
+    setOpen(false);
+    buttonRef.current?.focus();
+  }, []);
+
+  const currentText = useMemo(
+    () =>
+      items.find((i) => i.value === current)?.text ??
+      intl.formatMessage({
+        id: 'dropdown.empty',
+        defaultMessage: 'Select an option',
+      }),
+    [current, intl, items],
+  );
+
+  return (
+    <>
+      <button
+        type='button'
+        {...buttonProps}
+        id={buttonId}
+        aria-labelledby={`${labelId} ${buttonId}`}
+        aria-describedby={descriptionId}
+        aria-expanded={open}
+        aria-controls={listboxId}
+        onClick={handleToggle}
+        disabled={disabled}
+        className={classNames(
+          `${classPrefix}__button`,
+          {
+            active: open,
+            disabled,
+          },
+          className,
+        )}
+        ref={buttonRef}
+      >
+        {currentText}
+        <Icon
+          id='unfold-icon'
+          icon={UnfoldMoreIcon}
+          className={`${classPrefix}__icon`}
+        />
+      </button>
+
+      <Overlay
+        show={open}
+        offset={[0, 0]}
+        placement='bottom-start'
+        onHide={handleClose}
+        flip
+        target={buttonRef.current}
+        popperConfig={{
+          strategy: 'fixed',
+          modifiers: [matchWidth],
+        }}
+      >
+        {({ props, placement }) => (
+          <div {...props} className={`${classPrefix}__overlay`}>
+            <div
+              className={classNames(
+                'dropdown-animation',
+                `${classPrefix}__dropdown`,
+                placement,
+              )}
+              id={listboxId}
+            >
+              <DropdownSelector
+                items={items}
+                value={current}
+                onClose={handleClose}
+                onChange={onChange}
+                classNamePrefix={classPrefix}
+              />
+            </div>
+          </div>
+        )}
+      </Overlay>
+    </>
+  );
+};
diff --git a/app/javascript/mastodon/components/dropdown/utils.ts b/app/javascript/mastodon/components/dropdown/utils.ts
new file mode 100644
index 00000000000..b45d2cc9d28
--- /dev/null
+++ b/app/javascript/mastodon/components/dropdown/utils.ts
@@ -0,0 +1,17 @@
+import type { Modifier, UsePopperState } from 'react-overlays/esm/usePopper';
+
+export const matchWidth: Modifier<'sameWidth', UsePopperState> = {
+  name: 'sameWidth',
+  enabled: true,
+  phase: 'beforeWrite',
+  requires: ['computeStyles'],
+  fn: ({ state }) => {
+    if (state.styles.popper) {
+      state.styles.popper.width = `${state.rects.reference.width}px`;
+    }
+  },
+  effect: ({ state }) => {
+    const reference = state.elements.reference as HTMLElement;
+    state.elements.popper.style.width = `${reference.offsetWidth}px`;
+  },
+};
diff --git a/app/javascript/mastodon/components/dropdown_menu.tsx b/app/javascript/mastodon/components/dropdown_menu.tsx
index 23d77f0dda2..afcd4176e05 100644
--- a/app/javascript/mastodon/components/dropdown_menu.tsx
+++ b/app/javascript/mastodon/components/dropdown_menu.tsx
@@ -5,6 +5,7 @@ import {
   useCallback,
   cloneElement,
   Children,
+  useId,
 } from 'react';
 
 import classNames from 'classnames';
@@ -16,6 +17,7 @@ import Overlay from 'react-overlays/Overlay';
 import type {
   OffsetValue,
   UsePopperOptions,
+  Placement,
 } from 'react-overlays/esm/usePopper';
 
 import { fetchRelationships } from 'mastodon/actions/accounts';
@@ -34,18 +36,22 @@ import {
 import type { MenuItem } from 'mastodon/models/dropdown_menu';
 import { useAppDispatch, useAppSelector } from 'mastodon/store';
 
+import { Icon } from './icon';
 import type { IconProp } from './icon';
 import { IconButton } from './icon_button';
 
 let id = 0;
 
-type RenderItemFn<Item = MenuItem> = (
+export interface RenderItemFnHandlers {
+  onClick: React.MouseEventHandler;
+  onKeyUp: React.KeyboardEventHandler;
+}
+
+export type RenderItemFn<Item = MenuItem> = (
   item: Item,
   index: number,
-  handlers: {
-    onClick: (e: React.MouseEvent) => void;
-    onKeyUp: (e: React.KeyboardEvent) => void;
-  },
+  handlers: RenderItemFnHandlers,
+  focusRefCallback?: (c: HTMLAnchorElement | HTMLButtonElement | null) => void,
 ) => React.ReactNode;
 
 type ItemClickFn<Item = MenuItem> = (item: Item, index: number) => void;
@@ -63,6 +69,27 @@ interface DropdownMenuProps<Item = MenuItem> {
   onItemClick?: ItemClickFn<Item>;
 }
 
+export const DropdownMenuItemContent: React.FC<{ item: MenuItem }> = ({
+  item,
+}) => {
+  if (item === null) {
+    return null;
+  }
+
+  const { text, description, icon } = item;
+  return (
+    <>
+      {icon && <Icon icon={icon} id={`${text}-icon`} />}
+      <span className='dropdown-menu__item-content'>
+        {text}
+        {Boolean(description) && (
+          <span className='dropdown-menu__item-subtitle'>{description}</span>
+        )}
+      </span>
+    </>
+  );
+};
+
 export const DropdownMenu = <Item = MenuItem,>({
   items,
   loading,
@@ -159,19 +186,22 @@ export const DropdownMenu = <Item = MenuItem,>({
     (e: React.MouseEvent | React.KeyboardEvent) => {
       const i = Number(e.currentTarget.getAttribute('data-index'));
       const item = items?.[i];
+      const isItemDisabled = Boolean(
+        item && typeof item === 'object' && 'disabled' in item && item.disabled,
+      );
 
-      onClose();
-
-      if (!item) {
+      if (!item || isItemDisabled) {
         return;
       }
 
+      onClose();
+
       if (typeof onItemClick === 'function') {
         e.preventDefault();
         onItemClick(item, i);
       } else if (isActionItem(item)) {
         e.preventDefault();
-        item.action();
+        item.action(e);
       }
     },
     [onClose, onItemClick, items],
@@ -195,7 +225,7 @@ export const DropdownMenu = <Item = MenuItem,>({
       return <li key={`sep-${i}`} className='dropdown-menu__separator' />;
     }
 
-    const { text, dangerous } = option;
+    const { text, highlighted, disabled, dangerous } = option;
 
     let element: React.ReactElement;
 
@@ -206,8 +236,9 @@ export const DropdownMenu = <Item = MenuItem,>({
           onClick={handleItemClick}
           onKeyUp={handleItemKeyUp}
           data-index={i}
+          aria-disabled={disabled}
         >
-          {text}
+          <DropdownMenuItemContent item={option} />
         </button>
       );
     } else if (isExternalLinkItem(option)) {
@@ -222,7 +253,7 @@ export const DropdownMenu = <Item = MenuItem,>({
           onKeyUp={handleItemKeyUp}
           data-index={i}
         >
-          {text}
+          <DropdownMenuItemContent item={option} />
         </a>
       );
     } else {
@@ -234,7 +265,7 @@ export const DropdownMenu = <Item = MenuItem,>({
           onKeyUp={handleItemKeyUp}
           data-index={i}
         >
-          {text}
+          <DropdownMenuItemContent item={option} />
         </Link>
       );
     }
@@ -242,6 +273,7 @@ export const DropdownMenu = <Item = MenuItem,>({
     return (
       <li
         className={classNames('dropdown-menu__item', {
+          'dropdown-menu__item--highlighted': highlighted,
           'dropdown-menu__item--dangerous': dangerous,
         })}
         key={`${text}-${i}`}
@@ -275,10 +307,15 @@ export const DropdownMenu = <Item = MenuItem,>({
           })}
         >
           {items.map((option, i) =>
-            renderItemMethod(option, i, {
-              onClick: handleItemClick,
-              onKeyUp: handleItemKeyUp,
-            }),
+            renderItemMethod(
+              option,
+              i,
+              {
+                onClick: handleItemClick,
+                onKeyUp: handleItemKeyUp,
+              },
+              i === 0 ? handleFocusedItemRef : undefined,
+            ),
           )}
         </ul>
       )}
@@ -286,7 +323,7 @@ export const DropdownMenu = <Item = MenuItem,>({
   );
 };
 
-interface DropdownProps<Item = MenuItem> {
+interface DropdownProps<Item extends object | null = MenuItem> {
   children?: React.ReactElement;
   icon?: string;
   iconComponent?: IconProp;
@@ -295,19 +332,26 @@ interface DropdownProps<Item = MenuItem> {
   title?: string;
   disabled?: boolean;
   scrollable?: boolean;
+  placement?: Placement;
+  offset?: OffsetValue;
+  /**
+   * Prevent the `ScrollableList` with this scrollKey
+   * from being scrolled while the dropdown is open
+   */
   scrollKey?: string;
   status?: ImmutableMap<string, unknown>;
   forceDropdown?: boolean;
   renderItem?: RenderItemFn<Item>;
   renderHeader?: RenderHeaderFn<Item>;
-  onOpen?: () => void;
+  onOpen?: // Must use a union type for the full function as a union with void is not allowed.
+  | ((event: React.MouseEvent | React.KeyboardEvent) => void)
+    | ((event: React.MouseEvent | React.KeyboardEvent) => boolean);
   onItemClick?: ItemClickFn<Item>;
 }
 
-const offset = [5, 5] as OffsetValue;
 const popperConfig = { strategy: 'fixed' } as UsePopperOptions;
 
-export const Dropdown = <Item = MenuItem,>({
+export const Dropdown = <Item extends object | null = MenuItem>({
   children,
   icon,
   iconComponent,
@@ -316,6 +360,8 @@ export const Dropdown = <Item = MenuItem,>({
   title = 'Menu',
   disabled,
   scrollable,
+  placement = 'bottom',
+  offset = [5, 5],
   status,
   forceDropdown = false,
   renderItem,
@@ -331,16 +377,15 @@ export const Dropdown = <Item = MenuItem,>({
   );
   const [currentId] = useState(id++);
   const open = currentId === openDropdownId;
-  const activeElement = useRef<HTMLElement | null>(null);
-  const targetRef = useRef<HTMLButtonElement | null>(null);
+  const buttonRef = useRef<HTMLButtonElement | null>(null);
+  const menuId = useId();
   const prefetchAccountId = status
     ? status.getIn(['account', 'id'])
     : undefined;
 
   const handleClose = useCallback(() => {
-    if (activeElement.current) {
-      activeElement.current.focus({ preventScroll: true });
-      activeElement.current = null;
+    if (buttonRef.current) {
+      buttonRef.current.focus({ preventScroll: true });
     }
 
     dispatch(
@@ -369,20 +414,23 @@ export const Dropdown = <Item = MenuItem,>({
         onItemClick(item, i);
       } else if (isActionItem(item)) {
         e.preventDefault();
-        item.action();
+        item.action(e);
       }
     },
     [handleClose, onItemClick, items],
   );
 
-  const handleClick = useCallback(
+  const toggleDropdown = useCallback(
     (e: React.MouseEvent | React.KeyboardEvent) => {
       const { type } = e;
 
       if (open) {
         handleClose();
       } else {
-        onOpen?.();
+        const allow = onOpen?.(e);
+        if (allow === false) {
+          return;
+        }
 
         if (prefetchAccountId) {
           dispatch(fetchRelationships([prefetchAccountId]));
@@ -423,38 +471,6 @@ export const Dropdown = <Item = MenuItem,>({
     ],
   );
 
-  const handleMouseDown = useCallback(() => {
-    if (!open && document.activeElement instanceof HTMLElement) {
-      activeElement.current = document.activeElement;
-    }
-  }, [open]);
-
-  const handleButtonKeyDown = useCallback(
-    (e: React.KeyboardEvent) => {
-      switch (e.key) {
-        case ' ':
-        case 'Enter':
-          handleMouseDown();
-          break;
-      }
-    },
-    [handleMouseDown],
-  );
-
-  const handleKeyPress = useCallback(
-    (e: React.KeyboardEvent) => {
-      switch (e.key) {
-        case ' ':
-        case 'Enter':
-          handleClick(e);
-          e.stopPropagation();
-          e.preventDefault();
-          break;
-      }
-    },
-    [handleClick],
-  );
-
   useEffect(() => {
     return () => {
       if (currentId === openDropdownId) {
@@ -465,14 +481,16 @@ export const Dropdown = <Item = MenuItem,>({
 
   let button: React.ReactElement;
 
+  const buttonProps = {
+    disabled,
+    onClick: toggleDropdown,
+    'aria-expanded': open,
+    'aria-controls': menuId,
+    ref: buttonRef,
+  };
+
   if (children) {
-    button = cloneElement(Children.only(children), {
-      onClick: handleClick,
-      onMouseDown: handleMouseDown,
-      onKeyDown: handleButtonKeyDown,
-      onKeyPress: handleKeyPress,
-      ref: targetRef,
-    });
+    button = cloneElement(Children.only(children), buttonProps);
   } else if (icon && iconComponent) {
     button = (
       <IconButton
@@ -480,12 +498,7 @@ export const Dropdown = <Item = MenuItem,>({
         iconComponent={iconComponent}
         title={title}
         active={open}
-        disabled={disabled}
-        onClick={handleClick}
-        onMouseDown={handleMouseDown}
-        onKeyDown={handleButtonKeyDown}
-        onKeyPress={handleKeyPress}
-        ref={targetRef}
+        {...buttonProps}
       />
     );
   } else {
@@ -499,13 +512,13 @@ export const Dropdown = <Item = MenuItem,>({
       <Overlay
         show={open}
         offset={offset}
-        placement='bottom'
+        placement={placement}
         flip
-        target={targetRef}
+        target={buttonRef}
         popperConfig={popperConfig}
       >
         {({ props, arrowProps, placement }) => (
-          <div {...props}>
+          <div {...props} id={menuId}>
             <div className={`dropdown-animation dropdown-menu ${placement}`}>
               <div
                 className={`dropdown-menu__arrow ${placement}`}
diff --git a/app/javascript/mastodon/components/dropdown_selector.tsx b/app/javascript/mastodon/components/dropdown_selector.tsx
index 99bbd182e56..8b8fea42b14 100644
--- a/app/javascript/mastodon/components/dropdown_selector.tsx
+++ b/app/javascript/mastodon/components/dropdown_selector.tsx
@@ -13,8 +13,8 @@ const listenerOptions = supportsPassiveEvents
   ? { passive: true, capture: true }
   : true;
 
-export interface SelectItem {
-  value: string;
+export interface SelectItem<Value extends string = string> {
+  value: Value;
   icon?: string;
   iconComponent?: IconProp;
   text: string;
@@ -24,7 +24,7 @@ export interface SelectItem {
 
 interface Props {
   value: string;
-  classNamePrefix: string;
+  classNamePrefix?: string;
   style?: React.CSSProperties;
   items: SelectItem[];
   onChange: (value: string) => void;
@@ -39,24 +39,10 @@ export const DropdownSelector: React.FC<Props> = ({
   onClose,
   onChange,
 }) => {
-  const nodeRef = useRef<HTMLUListElement>(null);
+  const listRef = useRef<HTMLUListElement>(null);
   const focusedItemRef = useRef<HTMLLIElement>(null);
   const [currentValue, setCurrentValue] = useState(value);
 
-  const handleDocumentClick = useCallback(
-    (e: MouseEvent | TouchEvent) => {
-      if (
-        nodeRef.current &&
-        e.target instanceof Node &&
-        !nodeRef.current.contains(e.target)
-      ) {
-        onClose();
-        e.stopPropagation();
-      }
-    },
-    [nodeRef, onClose],
-  );
-
   const handleClick = useCallback(
     (
       e: React.MouseEvent<HTMLLIElement> | React.KeyboardEvent<HTMLLIElement>,
@@ -88,30 +74,30 @@ export const DropdownSelector: React.FC<Props> = ({
           break;
         case 'ArrowDown':
           element =
-            nodeRef.current?.children[index + 1] ??
-            nodeRef.current?.firstElementChild;
+            listRef.current?.children[index + 1] ??
+            listRef.current?.firstElementChild;
           break;
         case 'ArrowUp':
           element =
-            nodeRef.current?.children[index - 1] ??
-            nodeRef.current?.lastElementChild;
+            listRef.current?.children[index - 1] ??
+            listRef.current?.lastElementChild;
           break;
         case 'Tab':
           if (e.shiftKey) {
             element =
-              nodeRef.current?.children[index + 1] ??
-              nodeRef.current?.firstElementChild;
+              listRef.current?.children[index - 1] ??
+              listRef.current?.lastElementChild;
           } else {
             element =
-              nodeRef.current?.children[index - 1] ??
-              nodeRef.current?.lastElementChild;
+              listRef.current?.children[index + 1] ??
+              listRef.current?.firstElementChild;
           }
           break;
         case 'Home':
-          element = nodeRef.current?.firstElementChild;
+          element = listRef.current?.firstElementChild;
           break;
         case 'End':
-          element = nodeRef.current?.lastElementChild;
+          element = listRef.current?.lastElementChild;
           break;
       }
 
@@ -123,12 +109,24 @@ export const DropdownSelector: React.FC<Props> = ({
         e.stopPropagation();
       }
     },
-    [nodeRef, items, onClose, handleClick, setCurrentValue],
+    [items, onClose, handleClick, setCurrentValue],
   );
 
   useEffect(() => {
+    const handleDocumentClick = (e: MouseEvent | TouchEvent) => {
+      if (
+        listRef.current &&
+        e.target instanceof Node &&
+        !listRef.current.contains(e.target)
+      ) {
+        onClose();
+        e.stopPropagation();
+      }
+    };
+
     document.addEventListener('click', handleDocumentClick, { capture: true });
     document.addEventListener('touchend', handleDocumentClick, listenerOptions);
+
     focusedItemRef.current?.focus({ preventScroll: true });
 
     return () => {
@@ -141,10 +139,10 @@ export const DropdownSelector: React.FC<Props> = ({
         listenerOptions,
       );
     };
-  }, [handleDocumentClick]);
+  }, [onClose]);
 
   return (
-    <ul style={style} role='listbox' ref={nodeRef}>
+    <ul style={style} role='listbox' ref={listRef}>
       {items.map((item) => (
         <li
           role='option'
diff --git a/app/javascript/mastodon/components/emoji/context.tsx b/app/javascript/mastodon/components/emoji/context.tsx
new file mode 100644
index 00000000000..9fda5714d97
--- /dev/null
+++ b/app/javascript/mastodon/components/emoji/context.tsx
@@ -0,0 +1,108 @@
+import type { MouseEventHandler, PropsWithChildren } from 'react';
+import {
+  createContext,
+  useCallback,
+  useContext,
+  useMemo,
+  useState,
+} from 'react';
+
+import classNames from 'classnames';
+
+import { cleanExtraEmojis } from '@/mastodon/features/emoji/normalize';
+import { autoPlayGif } from '@/mastodon/initial_state';
+import { polymorphicForwardRef } from '@/types/polymorphic';
+import type {
+  CustomEmojiMapArg,
+  ExtraCustomEmojiMap,
+} from 'mastodon/features/emoji/types';
+
+// Animation context
+export const AnimateEmojiContext = createContext<boolean | null>(null);
+
+// Polymorphic provider component
+type AnimateEmojiProviderProps = Required<PropsWithChildren> & {
+  className?: string;
+};
+
+export const AnimateEmojiProvider = polymorphicForwardRef<
+  'div',
+  AnimateEmojiProviderProps
+>(
+  (
+    {
+      children,
+      as: Wrapper = 'div',
+      className,
+      onMouseEnter,
+      onMouseLeave,
+      ...props
+    },
+    ref,
+  ) => {
+    const [animate, setAnimate] = useState(autoPlayGif ?? false);
+
+    const handleEnter: MouseEventHandler<HTMLDivElement> = useCallback(
+      (event) => {
+        onMouseEnter?.(event);
+        if (!autoPlayGif) {
+          setAnimate(true);
+        }
+      },
+      [onMouseEnter],
+    );
+    const handleLeave: MouseEventHandler<HTMLDivElement> = useCallback(
+      (event) => {
+        onMouseLeave?.(event);
+        if (!autoPlayGif) {
+          setAnimate(false);
+        }
+      },
+      [onMouseLeave],
+    );
+
+    // If there's a parent context or GIFs autoplay, we don't need handlers.
+    const parentContext = useContext(AnimateEmojiContext);
+    if (parentContext !== null || autoPlayGif === true) {
+      return (
+        <Wrapper
+          {...props}
+          className={classNames(className, 'animate-parent')}
+          ref={ref}
+        >
+          {children}
+        </Wrapper>
+      );
+    }
+
+    return (
+      <Wrapper
+        {...props}
+        className={classNames(className, 'animate-parent')}
+        onMouseEnter={handleEnter}
+        onMouseLeave={handleLeave}
+        ref={ref}
+      >
+        <AnimateEmojiContext.Provider value={animate}>
+          {children}
+        </AnimateEmojiContext.Provider>
+      </Wrapper>
+    );
+  },
+);
+AnimateEmojiProvider.displayName = 'AnimateEmojiProvider';
+
+// Handle custom emoji
+export const CustomEmojiContext = createContext<ExtraCustomEmojiMap>({});
+
+export const CustomEmojiProvider = ({
+  children,
+  emojis: rawEmojis,
+}: PropsWithChildren<{ emojis?: CustomEmojiMapArg }>) => {
+  const emojis = useMemo(() => cleanExtraEmojis(rawEmojis) ?? {}, [rawEmojis]);
+  return (
+    <CustomEmojiContext.Provider value={emojis}>
+      {children}
+    </CustomEmojiContext.Provider>
+  );
+};
diff --git a/app/javascript/mastodon/components/emoji/emoji.stories.tsx b/app/javascript/mastodon/components/emoji/emoji.stories.tsx
new file mode 100644
index 00000000000..a5e283158d6
--- /dev/null
+++ b/app/javascript/mastodon/components/emoji/emoji.stories.tsx
@@ -0,0 +1,56 @@
+import type { ComponentProps } from 'react';
+
+import type { Meta, StoryObj } from '@storybook/react-vite';
+
+import { importCustomEmojiData } from '@/mastodon/features/emoji/loader';
+
+import { Emoji } from './index';
+
+type EmojiProps = ComponentProps<typeof Emoji> & { state: string };
+
+const meta = {
+  title: 'Components/Emoji',
+  component: Emoji,
+  args: {
+    code: '🖤',
+    state: 'auto',
+  },
+  argTypes: {
+    code: {
+      name: 'Emoji',
+    },
+    state: {
+      control: {
+        type: 'select',
+        labels: {
+          auto: 'Auto',
+          native: 'Native',
+          twemoji: 'Twemoji',
+        },
+      },
+      options: ['auto', 'native', 'twemoji'],
+      name: 'Emoji Style',
+      mapping: {
+        auto: { meta: { emoji_style: 'auto' } },
+        native: { meta: { emoji_style: 'native' } },
+        twemoji: { meta: { emoji_style: 'twemoji' } },
+      },
+    },
+  },
+  render(args) {
+    void importCustomEmojiData();
+    return <Emoji {...args} />;
+  },
+} satisfies Meta<EmojiProps>;
+
+export default meta;
+
+type Story = StoryObj<typeof meta>;
+
+export const Default: Story = {};
+
+export const CustomEmoji: Story = {
+  args: {
+    code: ':custom:',
+  },
+};
diff --git a/app/javascript/mastodon/components/emoji/html.tsx b/app/javascript/mastodon/components/emoji/html.tsx
new file mode 100644
index 00000000000..628385f6493
--- /dev/null
+++ b/app/javascript/mastodon/components/emoji/html.tsx
@@ -0,0 +1,90 @@
+import { useMemo } from 'react';
+
+import classNames from 'classnames';
+
+import type { CustomEmojiMapArg } from '@/mastodon/features/emoji/types';
+import { isModernEmojiEnabled } from '@/mastodon/utils/environment';
+import type {
+  OnAttributeHandler,
+  OnElementHandler,
+} from '@/mastodon/utils/html';
+import { htmlStringToComponents } from '@/mastodon/utils/html';
+import { polymorphicForwardRef } from '@/types/polymorphic';
+
+import { AnimateEmojiProvider, CustomEmojiProvider } from './context';
+import { textToEmojis } from './index';
+
+export interface EmojiHTMLProps {
+  htmlString: string;
+  extraEmojis?: CustomEmojiMapArg;
+  className?: string;
+  onElement?: OnElementHandler;
+  onAttribute?: OnAttributeHandler;
+}
+
+export const ModernEmojiHTML = polymorphicForwardRef<'div', EmojiHTMLProps>(
+  (
+    {
+      extraEmojis,
+      htmlString,
+      as: asProp = 'div', // Rename for syntax highlighting
+      className = '',
+      onElement,
+      onAttribute,
+      ...props
+    },
+    ref,
+  ) => {
+    const contents = useMemo(
+      () =>
+        htmlStringToComponents(htmlString, {
+          onText: textToEmojis,
+          onElement,
+          onAttribute,
+        }),
+      [htmlString, onAttribute, onElement],
+    );
+
+    return (
+      <CustomEmojiProvider emojis={extraEmojis}>
+        <AnimateEmojiProvider
+          {...props}
+          as={asProp}
+          className={className}
+          ref={ref}
+        >
+          {contents}
+        </AnimateEmojiProvider>
+      </CustomEmojiProvider>
+    );
+  },
+);
+ModernEmojiHTML.displayName = 'ModernEmojiHTML';
+
+export const LegacyEmojiHTML = polymorphicForwardRef<'div', EmojiHTMLProps>(
+  (props, ref) => {
+    const {
+      as: asElement,
+      htmlString,
+      extraEmojis,
+      className,
+      onElement,
+      onAttribute,
+      ...rest
+    } = props;
+    const Wrapper = asElement ?? 'div';
+    return (
+      <Wrapper
+        {...rest}
+        ref={ref}
+        dangerouslySetInnerHTML={{ __html: htmlString }}
+        className={classNames(className, 'animate-parent')}
+      />
+    );
+  },
+);
+LegacyEmojiHTML.displayName = 'LegacyEmojiHTML';
+
+export const EmojiHTML = isModernEmojiEnabled()
+  ? ModernEmojiHTML
+  : LegacyEmojiHTML;
diff --git a/app/javascript/mastodon/components/emoji/index.tsx b/app/javascript/mastodon/components/emoji/index.tsx
new file mode 100644
index 00000000000..0dff8314ffc
--- /dev/null
+++ b/app/javascript/mastodon/components/emoji/index.tsx
@@ -0,0 +1,99 @@
+import type { FC } from 'react';
+import { useContext, useEffect, useState } from 'react';
+
+import { EMOJI_TYPE_CUSTOM } from '@/mastodon/features/emoji/constants';
+import { useEmojiAppState } from '@/mastodon/features/emoji/mode';
+import { unicodeHexToUrl } from '@/mastodon/features/emoji/normalize';
+import {
+  isStateLoaded,
+  loadEmojiDataToState,
+  shouldRenderImage,
+  stringToEmojiState,
+  tokenizeText,
+} from '@/mastodon/features/emoji/render';
+
+import { AnimateEmojiContext, CustomEmojiContext } from './context';
+
+interface EmojiProps {
+  code: string;
+  showFallback?: boolean;
+  showLoading?: boolean;
+}
+
+export const Emoji: FC<EmojiProps> = ({
+  code,
+  showFallback = true,
+  showLoading = true,
+}) => {
+  const customEmoji = useContext(CustomEmojiContext);
+
+  // First, set the emoji state based on the input code.
+  const [state, setState] = useState(() =>
+    stringToEmojiState(code, customEmoji),
+  );
+
+  // If we don't have data, then load emoji data asynchronously.
+  const appState = useEmojiAppState();
+  useEffect(() => {
+    if (state !== null) {
+      void loadEmojiDataToState(state, appState.currentLocale).then(setState);
+    }
+  }, [appState.currentLocale, state]);
+
+  const animate = useContext(AnimateEmojiContext);
+  const fallback = showFallback ? code : null;
+
+  // If the code is invalid or we otherwise know it's not valid, show the fallback.
+  if (!state) {
+    return fallback;
+  }
+
+  if (!shouldRenderImage(state, appState.mode)) {
+    return code;
+  }
+
+  if (!isStateLoaded(state)) {
+    if (showLoading) {
+      return <span className='emojione emoji-loading' title={code} />;
+    }
+    return fallback;
+  }
+
+  if (state.type === EMOJI_TYPE_CUSTOM) {
+    const shortcode = `:${state.code}:`;
+    return (
+      <img
+        src={animate ? state.data.url : state.data.static_url}
+        alt={shortcode}
+        title={shortcode}
+        className='emojione custom-emoji'
+        loading='lazy'
+      />
+    );
+  }
+
+  const src = unicodeHexToUrl(state.code, appState.darkTheme);
+
+  return (
+    <img
+      src={src}
+      alt={state.data.unicode}
+      title={state.data.label}
+      className='emojione'
+      loading='lazy'
+    />
+  );
+};
+
+/**
+ * Takes a text string and converts it to an array of React nodes.
+ * @param text The text to be tokenized and converted.
+ */
+export function textToEmojis(text: string) {
+  return tokenizeText(text).map((token, index) => {
+    if (typeof token === 'string') {
+      return token;
+    }
+    return <Emoji code={token.code} key={`emoji-${token.code}-${index}`} />;
+  });
+}
diff --git a/app/javascript/mastodon/components/exit_animation_wrapper.tsx b/app/javascript/mastodon/components/exit_animation_wrapper.tsx
new file mode 100644
index 00000000000..ab0642b8b23
--- /dev/null
+++ b/app/javascript/mastodon/components/exit_animation_wrapper.tsx
@@ -0,0 +1,53 @@
+import { useEffect, useState } from 'react';
+
+/**
+ * A helper component for managing the rendering of components that
+ * need to stay in the DOM a bit longer to finish their CSS exit animation.
+ *
+ * In the future, replace this component with plain CSS once that is feasible.
+ * This will require broader support for `transition-behavior: allow-discrete`
+ * and https://developer.mozilla.org/en-US/docs/Web/CSS/overlay.
+ */
+export const ExitAnimationWrapper: React.FC<{
+  /**
+   * Set this to true to indicate that the nested component should be rendered
+   */
+  isActive: boolean;
+  /**
+   * How long the component should be rendered after `isActive` was set to `false`
+   */
+  delayMs?: number;
+  /**
+   * Set this to true to also delay the entry of the nested component until after
+   * another one has exited full.
+   */
+  withEntryDelay?: boolean;
+  /**
+   * Render prop that provides the nested component with the `delayedIsActive` flag
+   */
+  children: (delayedIsActive: boolean) => React.ReactNode;
+}> = ({ isActive = false, delayMs = 500, withEntryDelay, children }) => {
+  const [delayedIsActive, setDelayedIsActive] = useState(false);
+
+  useEffect(() => {
+    if (isActive && !withEntryDelay) {
+      setDelayedIsActive(true);
+
+      return () => '';
+    } else {
+      const timeout = setTimeout(() => {
+        setDelayedIsActive(isActive);
+      }, delayMs);
+
+      return () => {
+        clearTimeout(timeout);
+      };
+    }
+  }, [isActive, delayMs, withEntryDelay]);
+
+  if (!isActive && !delayedIsActive) {
+    return null;
+  }
+
+  return children(isActive && delayedIsActive);
+};
diff --git a/app/javascript/mastodon/components/featured_carousel.tsx b/app/javascript/mastodon/components/featured_carousel.tsx
index 195331ef9f5..df64c43b421 100644
--- a/app/javascript/mastodon/components/featured_carousel.tsx
+++ b/app/javascript/mastodon/components/featured_carousel.tsx
@@ -20,7 +20,7 @@ import { useDrag } from '@use-gesture/react';
 import { expandAccountFeaturedTimeline } from '@/mastodon/actions/timelines';
 import { Icon } from '@/mastodon/components/icon';
 import { IconButton } from '@/mastodon/components/icon_button';
-import StatusContainer from '@/mastodon/containers/status_container';
+import { StatusQuoteManager } from '@/mastodon/components/status_quoted';
 import { usePrevious } from '@/mastodon/hooks/usePrevious';
 import { useAppDispatch, useAppSelector } from '@/mastodon/store';
 import ChevronLeftIcon from '@/material-icons/400-24px/chevron_left.svg?react';
@@ -218,12 +218,7 @@ const FeaturedCarouselItem: React.FC<
       ref={handleRef}
       {...props}
     >
-      <StatusContainer
-        // @ts-expect-error inferred props are wrong
-        id={statusId}
-        contextType='account'
-        withCounters
-      />
+      <StatusQuoteManager id={statusId} contextType='account' withCounters />
     </animated.div>
   );
 };
diff --git a/app/javascript/mastodon/components/follow_button.tsx b/app/javascript/mastodon/components/follow_button.tsx
index 4a22bb1c3f8..97aaecd1aac 100644
--- a/app/javascript/mastodon/components/follow_button.tsx
+++ b/app/javascript/mastodon/components/follow_button.tsx
@@ -5,24 +5,61 @@ import { useIntl, defineMessages } from 'react-intl';
 import classNames from 'classnames';
 
 import { useIdentity } from '@/mastodon/identity_context';
-import { fetchRelationships, followAccount } from 'mastodon/actions/accounts';
+import {
+  fetchRelationships,
+  followAccount,
+  unmuteAccount,
+} from 'mastodon/actions/accounts';
 import { openModal } from 'mastodon/actions/modal';
 import { Button } from 'mastodon/components/button';
 import { LoadingIndicator } from 'mastodon/components/loading_indicator';
 import { me } from 'mastodon/initial_state';
 import { useAppDispatch, useAppSelector } from 'mastodon/store';
 
-const messages = defineMessages({
+import { useBreakpoint } from '../features/ui/hooks/useBreakpoint';
+
+const longMessages = defineMessages({
   unfollow: { id: 'account.unfollow', defaultMessage: 'Unfollow' },
+  unblock: { id: 'account.unblock_short', defaultMessage: 'Unblock' },
+  unmute: { id: 'account.unmute_short', defaultMessage: 'Unmute' },
   follow: { id: 'account.follow', defaultMessage: 'Follow' },
   followBack: { id: 'account.follow_back', defaultMessage: 'Follow back' },
+  followRequest: {
+    id: 'account.follow_request',
+    defaultMessage: 'Request to follow',
+  },
+  followRequestCancel: {
+    id: 'account.follow_request_cancel',
+    defaultMessage: 'Cancel request',
+  },
   editProfile: { id: 'account.edit_profile', defaultMessage: 'Edit profile' },
 });
 
+const shortMessages = {
+  ...longMessages, // Align type signature of shortMessages and longMessages
+  ...defineMessages({
+    followBack: {
+      id: 'account.follow_back_short',
+      defaultMessage: 'Follow back',
+    },
+    followRequest: {
+      id: 'account.follow_request_short',
+      defaultMessage: 'Request',
+    },
+    followRequestCancel: {
+      id: 'account.follow_request_cancel_short',
+      defaultMessage: 'Cancel',
+    },
+    editProfile: { id: 'account.edit_profile_short', defaultMessage: 'Edit' },
+  }),
+};
+
 export const FollowButton: React.FC<{
   accountId?: string;
   compact?: boolean;
-}> = ({ accountId, compact }) => {
+  labelLength?: 'auto' | 'short' | 'long';
+  className?: string;
+}> = ({ accountId, compact, labelLength = 'auto', className }) => {
   const intl = useIntl();
   const dispatch = useAppDispatch();
   const { signedIn } = useIdentity();
@@ -46,7 +83,6 @@ export const FollowButton: React.FC<{
         openModal({
           modalType: 'INTERACTION',
           modalProps: {
-            type: 'follow',
             accountId: accountId,
             url: account?.url,
           },
@@ -58,29 +94,60 @@ export const FollowButton: React.FC<{
 
     if (accountId === me) {
       return;
-    } else if (account && (relationship.following || relationship.requested)) {
+    } else if (relationship.muting) {
+      dispatch(unmuteAccount(accountId));
+    } else if (account && relationship.following) {
       dispatch(
         openModal({ modalType: 'CONFIRM_UNFOLLOW', modalProps: { account } }),
       );
+    } else if (account && relationship.requested) {
+      dispatch(
+        openModal({
+          modalType: 'CONFIRM_WITHDRAW_REQUEST',
+          modalProps: { account },
+        }),
+      );
+    } else if (relationship.blocking) {
+      dispatch(
+        openModal({
+          modalType: 'CONFIRM_UNBLOCK',
+          modalProps: { account },
+        }),
+      );
     } else {
       dispatch(followAccount(accountId));
     }
   }, [dispatch, accountId, relationship, account, signedIn]);
 
+  const isNarrow = useBreakpoint('narrow');
+  const useShortLabel =
+    labelLength === 'short' || (labelLength === 'auto' && isNarrow);
+  const messages = useShortLabel ? shortMessages : longMessages;
+
+  const followMessage = account?.locked
+    ? messages.followRequest
+    : messages.follow;
+
   let label;
 
   if (!signedIn) {
-    label = intl.formatMessage(messages.follow);
+    label = intl.formatMessage(followMessage);
   } else if (accountId === me) {
     label = intl.formatMessage(messages.editProfile);
   } else if (!relationship) {
     label = <LoadingIndicator />;
-  } else if (relationship.following || relationship.requested) {
+  } else if (relationship.muting) {
+    label = intl.formatMessage(messages.unmute);
+  } else if (relationship.following) {
     label = intl.formatMessage(messages.unfollow);
-  } else if (relationship.followed_by) {
+  } else if (relationship.blocking) {
+    label = intl.formatMessage(messages.unblock);
+  } else if (relationship.requested) {
+    label = intl.formatMessage(messages.followRequestCancel);
+  } else if (relationship.followed_by && !account?.locked) {
     label = intl.formatMessage(messages.followBack);
   } else {
-    label = intl.formatMessage(messages.follow);
+    label = intl.formatMessage(followMessage);
   }
 
   if (accountId === me) {
@@ -89,7 +156,7 @@ export const FollowButton: React.FC<{
         href='/settings/profile'
         target='_blank'
         rel='noopener'
-        className={classNames('button button-secondary', {
+        className={classNames(className, 'button button-secondary', {
           'button--compact': compact,
         })}
       >
@@ -103,13 +170,12 @@ export const FollowButton: React.FC<{
       onClick={handleClick}
       disabled={
         relationship?.blocked_by ||
-        relationship?.blocking ||
         (!(relationship?.following || relationship?.requested) &&
           (account?.suspended || !!account?.moved))
       }
       secondary={following}
       compact={compact}
-      className={following ? 'button--destructive' : undefined}
+      className={classNames(className, { 'button--destructive': following })}
     >
       {label}
     </Button>
diff --git a/app/javascript/mastodon/components/gifv.tsx b/app/javascript/mastodon/components/gifv.tsx
index 8e3a434c14b..d7d0b5f2ce0 100644
--- a/app/javascript/mastodon/components/gifv.tsx
+++ b/app/javascript/mastodon/components/gifv.tsx
@@ -37,7 +37,6 @@ export const GIFV = forwardRef<HTMLVideoElement, Props>(
             role='button'
             tabIndex={0}
             aria-label={alt}
-            title={alt}
             lang={lang}
             onClick={handleClick}
           />
@@ -49,7 +48,6 @@ export const GIFV = forwardRef<HTMLVideoElement, Props>(
           role='button'
           tabIndex={0}
           aria-label={alt}
-          title={alt}
           lang={lang}
           width={width}
           height={height}
diff --git a/app/javascript/mastodon/components/hashtag_bar.tsx b/app/javascript/mastodon/components/hashtag_bar.tsx
index 4f88385bef9..f6b72d43404 100644
--- a/app/javascript/mastodon/components/hashtag_bar.tsx
+++ b/app/javascript/mastodon/components/hashtag_bar.tsx
@@ -33,7 +33,7 @@ function isNodeLinkHashtag(element: Node): element is HTMLLinkElement {
   return (
     element instanceof HTMLAnchorElement &&
     // it may be a <a> starting with a hashtag
-    (element.textContent?.[0] === '#' ||
+    (element.textContent.startsWith('#') ||
       // or a #<a>
       element.previousSibling?.textContent?.[
         element.previousSibling.textContent.length - 1
diff --git a/app/javascript/mastodon/components/hotkeys/hotkeys.stories.tsx b/app/javascript/mastodon/components/hotkeys/hotkeys.stories.tsx
new file mode 100644
index 00000000000..b95c9410e18
--- /dev/null
+++ b/app/javascript/mastodon/components/hotkeys/hotkeys.stories.tsx
@@ -0,0 +1,171 @@
+import { useState } from 'react';
+
+import type { Meta, StoryObj } from '@storybook/react-vite';
+import { expect } from 'storybook/test';
+
+import type { HandlerMap } from '.';
+import { Hotkeys } from '.';
+
+const meta = {
+  title: 'Components/Hotkeys',
+  component: Hotkeys,
+  args: {
+    global: undefined,
+    focusable: undefined,
+    handlers: {},
+  },
+  tags: ['test'],
+} satisfies Meta<typeof Hotkeys>;
+
+export default meta;
+
+type Story = StoryObj<typeof meta>;
+
+const hotkeyTest: Story['play'] = async ({ canvas, userEvent }) => {
+  async function confirmHotkey(name: string, shouldFind = true) {
+    // 'status' is the role of the 'output' element
+    const output = await canvas.findByRole('status');
+    if (shouldFind) {
+      await expect(output).toHaveTextContent(name);
+    } else {
+      await expect(output).not.toHaveTextContent(name);
+    }
+  }
+
+  const button = await canvas.findByRole('button');
+  await userEvent.click(button);
+
+  await userEvent.keyboard('n');
+  await confirmHotkey('new');
+
+  await userEvent.keyboard('/');
+  await confirmHotkey('search');
+
+  await userEvent.keyboard('o');
+  await confirmHotkey('open');
+
+  await userEvent.keyboard('{Alt>}N{/Alt}');
+  await confirmHotkey('forceNew');
+
+  await userEvent.keyboard('gh');
+  await confirmHotkey('goToHome');
+
+  await userEvent.keyboard('gn');
+  await confirmHotkey('goToNotifications');
+
+  await userEvent.keyboard('gf');
+  await confirmHotkey('goToFavourites');
+
+  /**
+   * Ensure that hotkeys are not triggered when certain
+   * interactive elements are focused:
+   */
+
+  await userEvent.keyboard('{enter}');
+  await confirmHotkey('open', false);
+
+  const input = await canvas.findByRole('textbox');
+  await userEvent.click(input);
+
+  await userEvent.keyboard('n');
+  await confirmHotkey('new', false);
+
+  await userEvent.keyboard('{backspace}');
+  await confirmHotkey('None', false);
+
+  /**
+   * Reset playground:
+   */
+
+  await userEvent.click(button);
+  await userEvent.keyboard('{backspace}');
+};
+
+export const Default = {
+  render: function Render() {
+    const [matchedHotkey, setMatchedHotkey] = useState<keyof HandlerMap | null>(
+      null,
+    );
+
+    const handlers = {
+      back: () => {
+        setMatchedHotkey(null);
+      },
+      new: () => {
+        setMatchedHotkey('new');
+      },
+      forceNew: () => {
+        setMatchedHotkey('forceNew');
+      },
+      search: () => {
+        setMatchedHotkey('search');
+      },
+      open: () => {
+        setMatchedHotkey('open');
+      },
+      goToHome: () => {
+        setMatchedHotkey('goToHome');
+      },
+      goToNotifications: () => {
+        setMatchedHotkey('goToNotifications');
+      },
+      goToFavourites: () => {
+        setMatchedHotkey('goToFavourites');
+      },
+    };
+
+    return (
+      <Hotkeys handlers={handlers}>
+        <div
+          style={{
+            display: 'flex',
+            flexDirection: 'column',
+            gap: 8,
+            padding: '1em',
+            border: '1px dashed #ccc',
+            fontSize: 14,
+            color: '#222',
+          }}
+        >
+          <h1
+            style={{
+              fontSize: 22,
+              marginBottom: '0.3em',
+            }}
+          >
+            Hotkey playground
+          </h1>
+          <p>
+            Last pressed hotkey: <output>{matchedHotkey ?? 'None'}</output>
+          </p>
+          <p>
+            Click within the dashed border and press the &quot;<kbd>n</kbd>
+            &quot; or &quot;<kbd>/</kbd>&quot; key. Press &quot;
+            <kbd>Backspace</kbd>&quot; to clear the displayed hotkey.
+          </p>
+          <p>
+            Try typing a sequence, like &quot;<kbd>g</kbd>&quot; shortly
+            followed by &quot;<kbd>h</kbd>&quot;, &quot;<kbd>n</kbd>&quot;, or
+            &quot;<kbd>f</kbd>&quot;
+          </p>
+          <p>
+            Note that this playground doesn&apos;t support all hotkeys we use in
+            the app.
+          </p>
+          <p>
+            When a <button>Button</button> is focused, &quot;
+            <kbd>Enter</kbd>
+            &quot; should not trigger &quot;open&quot;, but &quot;<kbd>o</kbd>
+            &quot; should.
+          </p>
+          <p>
+            When an input element is focused, hotkeys should not interfere with
+            regular typing:
+          </p>
+          <input type='text' />
+        </div>
+      </Hotkeys>
+    );
+  },
+  play: hotkeyTest,
+};
diff --git a/app/javascript/mastodon/components/hotkeys/index.tsx b/app/javascript/mastodon/components/hotkeys/index.tsx
new file mode 100644
index 00000000000..b1484ec3acb
--- /dev/null
+++ b/app/javascript/mastodon/components/hotkeys/index.tsx
@@ -0,0 +1,284 @@
+import { useEffect, useRef } from 'react';
+
+import { normalizeKey, isKeyboardEvent } from './utils';
+
+/**
+ * In case of multiple hotkeys matching the pressed key(s),
+ * the hotkey with a higher priority is selected. All others
+ * are ignored.
+ */
+const hotkeyPriority = { singleKey: 0, combo: 1, sequence: 2 } as const;
+
+/**
+ * This type of function receives a keyboard event and an array of
+ * previously pressed keys (within the last second), and returns
+ * `isMatch` (whether the pressed keys match a hotkey) and `priority`
+ * (a weighting used to resolve conflicts when two hotkeys match the
+ * pressed keys)
+ */
+type KeyMatcher = (
+  event: KeyboardEvent,
+  bufferedKeys?: string[],
+) => {
+  /**
+   * Whether the event.key matches the hotkey
+   */
+  isMatch: boolean;
+  /**
+   * If there are multiple matching hotkeys, the
+   * first one with the highest priority will be handled
+   */
+  priority: (typeof hotkeyPriority)[keyof typeof hotkeyPriority];
+};
+
+/**
+ * Matches a single key
+ */
+function just(keyName: string): KeyMatcher {
+  return (event) => ({
+    isMatch:
+      normalizeKey(event.key) === keyName &&
+      !event.altKey &&
+      !event.ctrlKey &&
+      !event.metaKey,
+    priority: hotkeyPriority.singleKey,
+  });
+}
+
+/**
+ * Matches any single key out of those provided
+ */
+function any(...keys: string[]): KeyMatcher {
+  return (event) => ({
+    isMatch: keys.some((keyName) => just(keyName)(event).isMatch),
+    priority: hotkeyPriority.singleKey,
+  });
+}
+
+/**
+ * Matches a single key combined with the option/alt modifier
+ */
+function optionPlus(key: string): KeyMatcher {
+  return (event) => ({
+    // Matching against event.code here as alt combos are often
+    // mapped to other characters
+    isMatch: event.altKey && event.code === `Key${key.toUpperCase()}`,
+    priority: hotkeyPriority.combo,
+  });
+}
+
+/**
+ * Matches when all provided keys are pressed in sequence.
+ */
+function sequence(...sequence: string[]): KeyMatcher {
+  return (event, bufferedKeys) => {
+    const lastKeyInSequence = sequence.at(-1);
+    const startOfSequence = sequence.slice(0, -1);
+    const relevantBufferedKeys = bufferedKeys?.slice(-startOfSequence.length);
+
+    const bufferMatchesStartOfSequence =
+      !!relevantBufferedKeys &&
+      startOfSequence.join('') === relevantBufferedKeys.join('');
+
+    return {
+      isMatch:
+        bufferMatchesStartOfSequence &&
+        normalizeKey(event.key) === lastKeyInSequence,
+      priority: hotkeyPriority.sequence,
+    };
+  };
+}
+
+/**
+ * This is a map of all global hotkeys we support.
+ * To trigger a hotkey, a handler with a matching name must be
+ * provided to the `useHotkeys` hook or `Hotkeys` component.
+ */
+const hotkeyMatcherMap = {
+  help: just('?'),
+  search: any('s', '/'),
+  back: just('backspace'),
+  new: just('n'),
+  forceNew: optionPlus('n'),
+  focusColumn: any('1', '2', '3', '4', '5', '6', '7', '8', '9'),
+  focusLoadMore: just('l'),
+  reply: just('r'),
+  favourite: just('f'),
+  boost: just('b'),
+  quote: just('q'),
+  mention: just('m'),
+  open: any('enter', 'o'),
+  openProfile: just('p'),
+  moveDown: just('j'),
+  moveUp: just('k'),
+  toggleHidden: just('x'),
+  toggleSensitive: just('h'),
+  toggleComposeSpoilers: optionPlus('x'),
+  openMedia: just('e'),
+  onTranslate: just('t'),
+  goToHome: sequence('g', 'h'),
+  goToNotifications: sequence('g', 'n'),
+  goToLocal: sequence('g', 'l'),
+  goToFederated: sequence('g', 't'),
+  goToDirect: sequence('g', 'd'),
+  goToStart: sequence('g', 's'),
+  goToFavourites: sequence('g', 'f'),
+  goToPinned: sequence('g', 'p'),
+  goToProfile: sequence('g', 'u'),
+  goToBlocked: sequence('g', 'b'),
+  goToMuted: sequence('g', 'm'),
+  goToRequests: sequence('g', 'r'),
+  cheat: sequence(
+    'up',
+    'up',
+    'down',
+    'down',
+    'left',
+    'right',
+    'left',
+    'right',
+    'b',
+    'a',
+    'enter',
+  ),
+} as const;
+
+type HotkeyName = keyof typeof hotkeyMatcherMap;
+
+export type HandlerMap = Partial<
+  Record<HotkeyName, (event: KeyboardEvent) => void>
+>;
+
+export function useHotkeys<T extends HTMLElement>(handlers: HandlerMap) {
+  const ref = useRef<T>(null);
+  const bufferedKeys = useRef<string[]>([]);
+  const sequenceTimer = useRef<ReturnType<typeof setTimeout> | null>(null);
+
+  /**
+   * Store the latest handlers object in a ref so we don't need to
+   * add it as a dependency to the main event listener effect
+   */
+  const handlersRef = useRef(handlers);
+  useEffect(() => {
+    handlersRef.current = handlers;
+  }, [handlers]);
+
+  useEffect(() => {
+    const element = ref.current ?? document;
+
+    function listener(event: Event) {
+      // Ignore key presses from input, textarea, or select elements
+      const tagName = (event.target as HTMLElement).tagName.toLowerCase();
+      const shouldHandleEvent =
+        isKeyboardEvent(event) &&
+        !event.defaultPrevented &&
+        !['input', 'textarea', 'select'].includes(tagName) &&
+        !(
+          ['a', 'button'].includes(tagName) &&
+          normalizeKey(event.key) === 'enter'
+        );
+
+      if (shouldHandleEvent) {
+        const matchCandidates: {
+          handler: (event: KeyboardEvent) => void;
+          priority: number;
+        }[] = [];
+
+        (Object.keys(hotkeyMatcherMap) as HotkeyName[]).forEach(
+          (handlerName) => {
+            const handler = handlersRef.current[handlerName];
+
+            if (handler) {
+              const hotkeyMatcher = hotkeyMatcherMap[handlerName];
+
+              const { isMatch, priority } = hotkeyMatcher(
+                event,
+                bufferedKeys.current,
+              );
+
+              if (isMatch) {
+                matchCandidates.push({ handler, priority });
+              }
+            }
+          },
+        );
+
+        // Sort all matches by priority
+        matchCandidates.sort((a, b) => b.priority - a.priority);
+
+        const bestMatchingHandler = matchCandidates.at(0)?.handler;
+        if (bestMatchingHandler) {
+          bestMatchingHandler(event);
+          event.stopPropagation();
+          event.preventDefault();
+        }
+
+        // Add last keypress to buffer
+        bufferedKeys.current.push(normalizeKey(event.key));
+
+        // Reset the timeout
+        if (sequenceTimer.current) {
+          clearTimeout(sequenceTimer.current);
+        }
+        sequenceTimer.current = setTimeout(() => {
+          bufferedKeys.current = [];
+        }, 1000);
+      }
+    }
+    element.addEventListener('keydown', listener);
+
+    return () => {
+      element.removeEventListener('keydown', listener);
+      if (sequenceTimer.current) {
+        clearTimeout(sequenceTimer.current);
+      }
+    };
+  }, []);
+
+  return ref;
+}
+
+/**
+ * The Hotkeys component allows us to globally register keyboard combinations
+ * under a name and assign actions to them, either globally or scoped to a portion
+ * of the app.
+ *
+ * ### How to use
+ *
+ * To add a new hotkey, add its key combination to the `hotkeyMatcherMap` object
+ * and give it a name.
+ *
+ * Use the `<Hotkeys>` component or the `useHotkeys` hook in the part of of the app
+ * where you want to handle the action, and pass in a handlers object.
+ *
+ * ```tsx
+ * <Hotkeys handlers={{open: openStatus}} />
+ * ```
+ *
+ * Now this function will be called when the 'open' hotkey is pressed by the user.
+ */
+export const Hotkeys: React.FC<{
+  /**
+   * An object containing functions to be run when a hotkey is pressed.
+   * The key must be the name of a registered hotkey, e.g. "help" or "search"
+   */
+  handlers: HandlerMap;
+  /**
+   * When enabled, hotkeys will be matched against the document root
+   * rather than only inside of this component's DOM node.
+   */
+  global?: boolean;
+  /**
+   * Allow the rendered `div` to be focused
+   */
+  focusable?: boolean;
+  children: React.ReactNode;
+}> = ({ handlers, global, focusable = true, children }) => {
+  const ref = useHotkeys<HTMLDivElement>(handlers);
+
+  return (
+    <div ref={global ? undefined : ref} tabIndex={focusable ? -1 : undefined}>
+      {children}
+    </div>
+  );
+};
diff --git a/app/javascript/mastodon/components/hotkeys/utils.ts b/app/javascript/mastodon/components/hotkeys/utils.ts
new file mode 100644
index 00000000000..1430e1685b3
--- /dev/null
+++ b/app/javascript/mastodon/components/hotkeys/utils.ts
@@ -0,0 +1,29 @@
+export function isKeyboardEvent(event: Event): event is KeyboardEvent {
+  return 'key' in event;
+}
+
+export function normalizeKey(key: string): string {
+  const lowerKey = key.toLowerCase();
+
+  switch (lowerKey) {
+    case ' ':
+    case 'spacebar': // for older browsers
+      return 'space';
+
+    case 'arrowup':
+      return 'up';
+    case 'arrowdown':
+      return 'down';
+    case 'arrowleft':
+      return 'left';
+    case 'arrowright':
+      return 'right';
+
+    case 'esc':
+    case 'escape':
+      return 'escape';
+
+    default:
+      return lowerKey;
+  }
+}
diff --git a/app/javascript/mastodon/components/hover_card_account.tsx b/app/javascript/mastodon/components/hover_card_account.tsx
index a6bdda21686..471d4884157 100644
--- a/app/javascript/mastodon/components/hover_card_account.tsx
+++ b/app/javascript/mastodon/components/hover_card_account.tsx
@@ -23,6 +23,8 @@ import { domain } from 'mastodon/initial_state';
 import { getAccountHidden } from 'mastodon/selectors/accounts';
 import { useAppSelector, useAppDispatch } from 'mastodon/store';
 
+import { useLinks } from '../hooks/useLinks';
+
 export const HoverCardAccount = forwardRef<
   HTMLDivElement,
   { accountId?: string }
@@ -64,6 +66,8 @@ export const HoverCardAccount = forwardRef<
     !isMutual &&
     !isFollower;
 
+  const handleClick = useLinks();
+
   return (
     <div
       ref={ref}
@@ -102,10 +106,17 @@ export const HoverCardAccount = forwardRef<
             <>
               <div className='hover-card__text-row'>
                 <AccountBio
-                  note={account.note_emojified}
+                  accountId={account.id}
                   className='hover-card__bio'
                 />
-                <AccountFields fields={account.fields} limit={2} />
+
+                <div className='account-fields' onClickCapture={handleClick}>
+                  <AccountFields
+                    fields={account.fields.take(2)}
+                    emojis={account.emojis}
+                  />
+                </div>
+
                 {note && note.length > 0 && (
                   <dl className='hover-card__note'>
                     <dt className='hover-card__note-label'>
diff --git a/app/javascript/mastodon/components/html_block/html_block.stories.tsx b/app/javascript/mastodon/components/html_block/html_block.stories.tsx
new file mode 100644
index 00000000000..6fb3206df0e
--- /dev/null
+++ b/app/javascript/mastodon/components/html_block/html_block.stories.tsx
@@ -0,0 +1,66 @@
+import type { Meta, StoryObj } from '@storybook/react-vite';
+import { expect } from 'storybook/test';
+
+import { HTMLBlock } from './index';
+
+const meta = {
+  title: 'Components/HTMLBlock',
+  component: HTMLBlock,
+  args: {
+    htmlString: `<p>Hello, world!</p>
+<p><a href="#">A link</a></p>
+<p>This should be filtered out: <button>Bye!</button></p>
+<p>This also has emoji: 🖤</p>`,
+  },
+  argTypes: {
+    extraEmojis: {
+      table: {
+        disable: true,
+      },
+    },
+    onElement: {
+      table: {
+        disable: true,
+      },
+    },
+    onAttribute: {
+      table: {
+        disable: true,
+      },
+    },
+  },
+  render(args) {
+    return (
+      // Just for visual clarity in Storybook.
+      <HTMLBlock
+        {...args}
+        style={{
+          border: '1px solid black',
+          padding: '1rem',
+          minWidth: '300px',
+        }}
+      />
+    );
+  },
+  // Force Twemoji to demonstrate emoji rendering.
+  parameters: {
+    state: {
+      meta: {
+        emoji_style: 'twemoji',
+      },
+    },
+  },
+} satisfies Meta<typeof HTMLBlock>;
+
+export default meta;
+
+type Story = StoryObj<typeof meta>;
+
+export const Default: Story = {
+  async play({ canvas }) {
+    const link = canvas.queryByRole('link');
+    await expect(link).toBeInTheDocument();
+    const button = canvas.queryByRole('button');
+    await expect(button).not.toBeInTheDocument();
+  },
+};
diff --git a/app/javascript/mastodon/components/html_block/index.tsx b/app/javascript/mastodon/components/html_block/index.tsx
new file mode 100644
index 00000000000..69fa1d9bf55
--- /dev/null
+++ b/app/javascript/mastodon/components/html_block/index.tsx
@@ -0,0 +1,30 @@
+import { useCallback } from 'react';
+
+import type { OnElementHandler } from '@/mastodon/utils/html';
+import { polymorphicForwardRef } from '@/types/polymorphic';
+
+import type { EmojiHTMLProps } from '../emoji/html';
+import { ModernEmojiHTML } from '../emoji/html';
+import { useElementHandledLink } from '../status/handled_link';
+
+export const HTMLBlock = polymorphicForwardRef<
+  'div',
+  EmojiHTMLProps & Parameters<typeof useElementHandledLink>[0]
+>(
+  ({
+    onElement: onParentElement,
+    hrefToMention,
+    hashtagAccountId,
+    ...props
+  }) => {
+    const { onElement: onLinkElement } = useElementHandledLink({
+      hrefToMention,
+      hashtagAccountId,
+    });
+    const onElement: OnElementHandler = useCallback(
+      (...args) => onParentElement?.(...args) ?? onLinkElement(...args),
+      [onLinkElement, onParentElement],
+    );
+    return <ModernEmojiHTML {...props} onElement={onElement} />;
+  },
+);
diff --git a/app/javascript/mastodon/components/icon_button.tsx b/app/javascript/mastodon/components/icon_button.tsx
index cd0234e39a3..9d32ab1f528 100644
--- a/app/javascript/mastodon/components/icon_button.tsx
+++ b/app/javascript/mastodon/components/icon_button.tsx
@@ -14,7 +14,6 @@ interface Props {
   onClick?: React.MouseEventHandler<HTMLButtonElement>;
   onMouseDown?: React.MouseEventHandler<HTMLButtonElement>;
   onKeyDown?: React.KeyboardEventHandler<HTMLButtonElement>;
-  onKeyPress?: React.KeyboardEventHandler<HTMLButtonElement>;
   active?: boolean;
   expanded?: boolean;
   style?: React.CSSProperties;
@@ -45,7 +44,6 @@ export const IconButton = forwardRef<HTMLButtonElement, Props>(
       activeStyle,
       onClick,
       onKeyDown,
-      onKeyPress,
       onMouseDown,
       active = false,
       disabled = false,
@@ -85,16 +83,6 @@ export const IconButton = forwardRef<HTMLButtonElement, Props>(
       [disabled, onClick],
     );
 
-    const handleKeyPress: React.KeyboardEventHandler<HTMLButtonElement> =
-      useCallback(
-        (e) => {
-          if (!disabled) {
-            onKeyPress?.(e);
-          }
-        },
-        [disabled, onKeyPress],
-      );
-
     const handleMouseDown: React.MouseEventHandler<HTMLButtonElement> =
       useCallback(
         (e) => {
@@ -161,7 +149,6 @@ export const IconButton = forwardRef<HTMLButtonElement, Props>(
         onClick={handleClick}
         onMouseDown={handleMouseDown}
         onKeyDown={handleKeyDown}
-        onKeyPress={handleKeyPress} // eslint-disable-line @typescript-eslint/no-deprecated
         style={buttonStyle}
         tabIndex={tabIndex}
         disabled={disabled}
diff --git a/app/javascript/mastodon/components/learn_more_link.tsx b/app/javascript/mastodon/components/learn_more_link.tsx
new file mode 100644
index 00000000000..b5337794c95
--- /dev/null
+++ b/app/javascript/mastodon/components/learn_more_link.tsx
@@ -0,0 +1,63 @@
+import { useState, useRef, useCallback, useId } from 'react';
+
+import { FormattedMessage } from 'react-intl';
+
+import Overlay from 'react-overlays/Overlay';
+
+export const LearnMoreLink: React.FC<{ children: React.ReactNode }> = ({
+  children,
+}) => {
+  const accessibilityId = useId();
+  const [open, setOpen] = useState(false);
+  const triggerRef = useRef(null);
+
+  const handleClick = useCallback(() => {
+    setOpen(!open);
+  }, [open, setOpen]);
+
+  return (
+    <>
+      <button
+        className='link-button'
+        ref={triggerRef}
+        onClick={handleClick}
+        aria-expanded={open}
+        aria-controls={accessibilityId}
+      >
+        <FormattedMessage
+          id='learn_more_link.learn_more'
+          defaultMessage='Learn more'
+        />
+      </button>
+
+      <Overlay
+        show={open}
+        rootClose
+        onHide={handleClick}
+        offset={[5, 5]}
+        placement='bottom-end'
+        target={triggerRef}
+      >
+        {({ props }) => (
+          <div
+            {...props}
+            role='region'
+            id={accessibilityId}
+            className='account__domain-pill__popout learn-more__popout dropdown-animation'
+          >
+            <div className='learn-more__popout__content'>{children}</div>
+
+            <div>
+              <button className='link-button' onClick={handleClick}>
+                <FormattedMessage
+                  id='learn_more_link.got_it'
+                  defaultMessage='Got it'
+                />
+              </button>
+            </div>
+          </div>
+        )}
+      </Overlay>
+    </>
+  );
+};
diff --git a/app/javascript/mastodon/components/poll.tsx b/app/javascript/mastodon/components/poll.tsx
index d9e76617d0e..a9229e6ee49 100644
--- a/app/javascript/mastodon/components/poll.tsx
+++ b/app/javascript/mastodon/components/poll.tsx
@@ -8,6 +8,7 @@ import classNames from 'classnames';
 import { animated, useSpring } from '@react-spring/web';
 import escapeTextContentForBrowser from 'escape-html';
 
+import { EmojiHTML } from '@/mastodon/components/emoji/html';
 import CheckIcon from '@/material-icons/400-24px/check.svg?react';
 import { openModal } from 'mastodon/actions/modal';
 import { fetchPoll, vote } from 'mastodon/actions/polls';
@@ -109,7 +110,6 @@ export const Poll: React.FC<PollProps> = ({ pollId, disabled, status }) => {
         openModal({
           modalType: 'INTERACTION',
           modalProps: {
-            type: 'vote',
             accountId: status.getIn(['account', 'id']),
             url: status.get('uri'),
           },
@@ -306,10 +306,11 @@ const PollOption: React.FC<PollOptionProps> = (props) => {
           </span>
         )}
 
-        <span
+        <EmojiHTML
           className='poll__option__text translate'
           lang={lang}
-          dangerouslySetInnerHTML={{ __html: titleHtml }}
+          htmlString={titleHtml}
+          extraEmojis={poll.emojis}
         />
 
         {!!voted && (
diff --git a/app/javascript/mastodon/components/router.tsx b/app/javascript/mastodon/components/router.tsx
index 815b4b59abd..1dc1d45083d 100644
--- a/app/javascript/mastodon/components/router.tsx
+++ b/app/javascript/mastodon/components/router.tsx
@@ -1,6 +1,7 @@
 import type { PropsWithChildren } from 'react';
 import type React from 'react';
 
+import type { useLocation } from 'react-router';
 import { Router as OriginalRouter, useHistory } from 'react-router';
 
 import type {
@@ -18,7 +19,9 @@ interface MastodonLocationState {
   mastodonModalKey?: string;
 }
 
-type LocationState = MastodonLocationState | null | undefined;
+export type LocationState = MastodonLocationState | null | undefined;
+
+export type MastodonLocation = ReturnType<typeof useLocation<LocationState>>;
 
 type HistoryPath = Path | LocationDescriptor<LocationState>;
 
diff --git a/app/javascript/mastodon/components/scrollable_list.jsx b/app/javascript/mastodon/components/scrollable_list.jsx
index 22ec18afa9c..38c3cd991bc 100644
--- a/app/javascript/mastodon/components/scrollable_list.jsx
+++ b/app/javascript/mastodon/components/scrollable_list.jsx
@@ -10,7 +10,7 @@ import { connect } from 'react-redux';
 import { supportsPassiveEvents } from 'detect-passive-events';
 import { throttle } from 'lodash';
 
-import ScrollContainer from 'mastodon/containers/scroll_container';
+import { ScrollContainer } from 'mastodon/containers/scroll_container';
 
 import IntersectionObserverArticleContainer from '../containers/intersection_observer_article_container';
 import { attachFullscreenListener, detachFullscreenListener, isFullscreen } from '../features/ui/util/fullscreen';
@@ -399,7 +399,7 @@ class ScrollableList extends PureComponent {
 
     if (trackScroll) {
       return (
-        <ScrollContainer scrollKey={scrollKey}>
+        <ScrollContainer scrollKey={scrollKey} childRef={this.setRef}>
           {scrollableArea}
         </ScrollContainer>
       );
diff --git a/app/javascript/mastodon/components/status.jsx b/app/javascript/mastodon/components/status.jsx
index 29fd4234dd5..2a8c9bfb2d8 100644
--- a/app/javascript/mastodon/components/status.jsx
+++ b/app/javascript/mastodon/components/status.jsx
@@ -8,10 +8,10 @@ import { Link } from 'react-router-dom';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
-import { HotKeys } from 'react-hotkeys';
-
 import AlternateEmailIcon from '@/material-icons/400-24px/alternate_email.svg?react';
 import RepeatIcon from '@/material-icons/400-24px/repeat.svg?react';
+import CancelFillIcon from '@/material-icons/400-24px/cancel-fill.svg?react';
+import { Hotkeys } from 'mastodon/components/hotkeys';
 import { ContentWarning } from 'mastodon/components/content_warning';
 import { FilterWarning } from 'mastodon/components/filter_warning';
 import { Icon }  from 'mastodon/components/icon';
@@ -28,17 +28,29 @@ import { displayMedia } from '../initial_state';
 
 import { Avatar } from './avatar';
 import { AvatarOverlay } from './avatar_overlay';
-import { DisplayName } from './display_name';
+import { LinkedDisplayName } from './display_name';
 import { getHashtagBarForStatus } from './hashtag_bar';
 import { RelativeTimestamp } from './relative_timestamp';
 import StatusActionBar from './status_action_bar';
 import StatusContent from './status_content';
 import { StatusThreadLabel } from './status_thread_label';
 import { VisibilityIcon } from './visibility_icon';
+import { IconButton } from './icon_button';
 
 const domParser = new DOMParser();
 
-export const textForScreenReader = (intl, status, rebloggedByText = false) => {
+const messages = defineMessages({
+  public_short: { id: 'privacy.public.short', defaultMessage: 'Public' },
+  unlisted_short: { id: 'privacy.unlisted.short', defaultMessage: 'Quiet public' },
+  private_short: { id: 'privacy.private.short', defaultMessage: 'Followers' },
+  direct_short: { id: 'privacy.direct.short', defaultMessage: 'Specific people' },
+  edited: { id: 'status.edited', defaultMessage: 'Edited {date}' },
+  quote_noun: { id: 'status.quote_noun', defaultMessage: 'Quote', description: 'Quote as a noun' },
+  contains_quote: { id: 'status.contains_quote', defaultMessage: 'Contains quote' },
+  quote_cancel: { id: 'status.quote.cancel', defaultMessage: 'Cancel quote' },
+});
+
+export const textForScreenReader = ({intl, status, rebloggedByText = false, isQuote = false}) => {
   const displayName = status.getIn(['account', 'display_name']);
 
   const spoilerText = status.getIn(['translation', 'spoiler_text']) || status.get('spoiler_text');
@@ -46,15 +58,14 @@ export const textForScreenReader = (intl, status, rebloggedByText = false) => {
   const contentText = domParser.parseFromString(contentHtml, 'text/html').documentElement.textContent;
 
   const values = [
+    isQuote ? intl.formatMessage(messages.quote_noun) : undefined,
     displayName.length === 0 ? status.getIn(['account', 'acct']).split('@')[0] : displayName,
     spoilerText && status.get('hidden') ? spoilerText : contentText,
+    !!status.get('quote') ? intl.formatMessage(messages.contains_quote) : undefined,
     intl.formatDate(status.get('created_at'), { hour: '2-digit', minute: '2-digit', month: 'short', day: 'numeric' }),
     status.getIn(['account', 'acct']),
-  ];
-
-  if (rebloggedByText) {
-    values.push(rebloggedByText);
-  }
+    rebloggedByText,
+  ].filter(val => !!val);
 
   return values.join(', ');
 };
@@ -71,14 +82,6 @@ export const defaultMediaVisibility = (status) => {
   return !status.get('matched_media_filters') && (displayMedia !== 'hide_all' && !status.get('sensitive') || displayMedia === 'show_all');
 };
 
-const messages = defineMessages({
-  public_short: { id: 'privacy.public.short', defaultMessage: 'Public' },
-  unlisted_short: { id: 'privacy.unlisted.short', defaultMessage: 'Quiet public' },
-  private_short: { id: 'privacy.private.short', defaultMessage: 'Followers' },
-  direct_short: { id: 'privacy.direct.short', defaultMessage: 'Specific people' },
-  edited: { id: 'status.edited', defaultMessage: 'Edited {date}' },
-});
-
 class Status extends ImmutablePureComponent {
 
   static contextType = SensitiveMediaContext;
@@ -94,6 +97,7 @@ class Status extends ImmutablePureComponent {
     onReply: PropTypes.func,
     onFavourite: PropTypes.func,
     onReblog: PropTypes.func,
+    onQuote: PropTypes.func,
     onDelete: PropTypes.func,
     onDirect: PropTypes.func,
     onMention: PropTypes.func,
@@ -108,13 +112,13 @@ class Status extends ImmutablePureComponent {
     onToggleCollapsed: PropTypes.func,
     onTranslate: PropTypes.func,
     onInteractionModal: PropTypes.func,
+    onQuoteCancel: PropTypes.func,
     muted: PropTypes.bool,
     hidden: PropTypes.bool,
     unread: PropTypes.bool,
-    onMoveUp: PropTypes.func,
-    onMoveDown: PropTypes.func,
     showThread: PropTypes.bool,
     isQuotedPost: PropTypes.bool,
+    shouldHighlightOnMount: PropTypes.bool,
     getScrollPosition: PropTypes.func,
     updateScrollBottom: PropTypes.func,
     cacheMediaWidth: PropTypes.func,
@@ -128,6 +132,7 @@ class Status extends ImmutablePureComponent {
       inUse: PropTypes.bool,
       available: PropTypes.bool,
     }),
+    contextType: PropTypes.string,
     ...WithOptionalRouterPropTypes,
   };
 
@@ -274,6 +279,10 @@ class Status extends ImmutablePureComponent {
     this.props.onReblog(this._properStatus(), e);
   };
 
+  handleHotkeyQuote = () => {
+    this.props.onQuote(this._properStatus());
+  };
+
   handleHotkeyMention = e => {
     e.preventDefault();
     this.props.onMention(this._properStatus().get('account'));
@@ -324,14 +333,6 @@ class Status extends ImmutablePureComponent {
     history.push(`/@${status.getIn(['account', 'acct'])}`);
   };
 
-  handleHotkeyMoveUp = e => {
-    this.props.onMoveUp(this.props.status.get('id'), e.target.getAttribute('data-featured'));
-  };
-
-  handleHotkeyMoveDown = e => {
-    this.props.onMoveDown(this.props.status.get('id'), e.target.getAttribute('data-featured'));
-  };
-
   handleHotkeyToggleHidden = () => {
     const { onToggleHidden } = this.props;
     const status = this._properStatus();
@@ -361,6 +362,10 @@ class Status extends ImmutablePureComponent {
     this.setState(state => ({ ...state, showDespiteFilter: !state.showDespiteFilter }));
   };
 
+  handleQuoteCancel = () => {
+    this.props.onQuoteCancel?.();
+  }
+
   _properStatus () {
     const { status } = this.props;
 
@@ -388,11 +393,10 @@ class Status extends ImmutablePureComponent {
       reply: this.handleHotkeyReply,
       favourite: this.handleHotkeyFavourite,
       boost: this.handleHotkeyBoost,
+      quote: this.handleHotkeyQuote,
       mention: this.handleHotkeyMention,
       open: this.handleHotkeyOpen,
       openProfile: this.handleHotkeyOpenProfile,
-      moveUp: this.handleHotkeyMoveUp,
-      moveDown: this.handleHotkeyMoveDown,
       toggleHidden: this.handleHotkeyToggleHidden,
       toggleSensitive: this.handleHotkeyToggleSensitive,
       openMedia: this.handleHotkeyOpenMedia,
@@ -407,12 +411,20 @@ class Status extends ImmutablePureComponent {
     const matchedFilters = status.get('matched_filters');
 
     if (status.get('reblog', null) !== null && typeof status.get('reblog') === 'object') {
-      const display_name_html = { __html: status.getIn(['account', 'display_name_html']) };
+      const name = (
+        <LinkedDisplayName
+          displayProps={{
+            account: status.get('account'),
+            variant: 'simple'
+          }}
+          className='status__display-name muted'
+        />
+      )
 
       prepend = (
         <div className='status__prepend'>
           <div className='status__prepend__icon'><Icon id='retweet' icon={RepeatIcon} /></div>
-          <FormattedMessage id='status.reblogged_by' defaultMessage='{name} boosted' values={{ name: <Link data-id={status.getIn(['account', 'id'])} data-hover-card-account={status.getIn(['account', 'id'])} to={`/@${status.getIn(['account', 'acct'])}`} className='status__display-name muted'><bdi><strong dangerouslySetInnerHTML={display_name_html} /></bdi></Link> }} />
+          <FormattedMessage id='status.reblogged_by' defaultMessage='{name} boosted' values={{ name }} />
         </div>
       );
 
@@ -437,13 +449,13 @@ class Status extends ImmutablePureComponent {
 
     if (hidden) {
       return (
-        <HotKeys handlers={handlers} tabIndex={unfocusable ? null : -1}>
+        <Hotkeys handlers={handlers} focusable={!unfocusable}>
           <div ref={this.handleRef} className={classNames('status__wrapper', { focusable: !this.props.muted })} tabIndex={unfocusable ? null : 0}>
             <span>{status.getIn(['account', 'display_name']) || status.getIn(['account', 'username'])}</span>
             {status.get('spoiler_text').length > 0 && (<span>{status.get('spoiler_text')}</span>)}
             {expanded && <span>{status.get('content')}</span>}
           </div>
-        </HotKeys>
+        </Hotkeys>
       );
     }
 
@@ -543,8 +555,8 @@ class Status extends ImmutablePureComponent {
     const {statusContentProps, hashtagBar} = getHashtagBarForStatus(status);
 
     return (
-      <HotKeys handlers={handlers} tabIndex={unfocusable ? null : -1}>
-        <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 || unfocusable ? null : 0} data-featured={featured ? 'true' : null} aria-label={textForScreenReader(intl, status, rebloggedByText)} ref={this.handleRef} data-nosnippet={status.getIn(['account', 'noindex'], true) || undefined}>
+      <Hotkeys handlers={handlers} focusable={!unfocusable}>
+        <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 || unfocusable ? null : 0} data-featured={featured ? 'true' : null} aria-label={textForScreenReader({intl, status, rebloggedByText, isQuote: isQuotedPost})} ref={this.handleRef} data-nosnippet={status.getIn(['account', 'noindex'], true) || undefined}>
           {!skipPrepend && prepend}
 
           <div
@@ -556,6 +568,7 @@ class Status extends ImmutablePureComponent {
                 'status--first-in-thread': previousId && (!connectUp || connectToRoot), muted: this.props.muted,
                 'status--is-quote': isQuotedPost,
                 'status--has-quote': !!status.get('quote'),
+                'status--highlighted-entry': this.props.shouldHighlightOnMount,
               })
             }
             data-id={status.get('id')}
@@ -568,18 +581,26 @@ class Status extends ImmutablePureComponent {
                 <RelativeTimestamp timestamp={status.get('created_at')} />{status.get('edited_at') && <abbr title={intl.formatMessage(messages.edited, { date: intl.formatDate(status.get('edited_at'), { year: 'numeric', month: 'short', day: '2-digit', hour: '2-digit', minute: '2-digit' }) })}> *</abbr>}
               </Link>
 
-              <Link to={`/@${status.getIn(['account', 'acct'])}`} title={status.getIn(['account', 'acct'])} data-hover-card-account={status.getIn(['account', 'id'])} className='status__display-name'>
+              <LinkedDisplayName displayProps={{account: status.get('account')}} className='status__display-name'>
                 <div className='status__avatar'>
                   {statusAvatar}
                 </div>
+              </LinkedDisplayName>
 
-                <DisplayName account={status.get('account')} />
-              </Link>
+              {isQuotedPost && !!this.props.onQuoteCancel &&  (
+                <IconButton
+                  onClick={this.handleQuoteCancel}
+                  className='status__quote-cancel'
+                  title={intl.formatMessage(messages.quote_cancel)}
+                  icon="cancel-fill"
+                  iconComponent={CancelFillIcon}
+                />
+              )}
             </div>
 
             {matchedFilters && <FilterWarning title={matchedFilters.join(', ')} expanded={this.state.showDespiteFilter} onClick={this.handleFilterToggle} />}
 
-            {(status.get('spoiler_text').length > 0 && (!matchedFilters || this.state.showDespiteFilter)) && <ContentWarning text={status.getIn(['translation', 'spoilerHtml']) || status.get('spoilerHtml')} expanded={expanded} onClick={this.handleExpandedToggle} />}
+            {(!matchedFilters || this.state.showDespiteFilter) && <ContentWarning status={status} expanded={expanded} onClick={this.handleExpandedToggle} />}
 
             {expanded && (
               <>
@@ -604,7 +625,7 @@ class Status extends ImmutablePureComponent {
             }
           </div>
         </div>
-      </HotKeys>
+      </Hotkeys>
     );
   }
 
diff --git a/app/javascript/mastodon/components/status/boost_button.stories.tsx b/app/javascript/mastodon/components/status/boost_button.stories.tsx
new file mode 100644
index 00000000000..402695a8295
--- /dev/null
+++ b/app/javascript/mastodon/components/status/boost_button.stories.tsx
@@ -0,0 +1,77 @@
+import type { Meta, StoryObj } from '@storybook/react-vite';
+
+import type { StatusVisibility } from '@/mastodon/api_types/statuses';
+import { statusFactoryState } from '@/testing/factories';
+
+import { BoostButton } from './boost_button';
+
+interface StoryProps {
+  visibility: StatusVisibility;
+  quoteAllowed: boolean;
+  alreadyBoosted: boolean;
+  reblogCount: number;
+}
+
+const meta = {
+  title: 'Components/Status/BoostButton',
+  args: {
+    visibility: 'public',
+    quoteAllowed: true,
+    alreadyBoosted: false,
+    reblogCount: 0,
+  },
+  argTypes: {
+    visibility: {
+      name: 'Visibility',
+      control: { type: 'select' },
+      options: ['public', 'unlisted', 'private', 'direct'],
+    },
+    reblogCount: {
+      name: 'Boost Count',
+      description: 'More than 0 will show the counter',
+    },
+    quoteAllowed: {
+      name: 'Quotes allowed',
+    },
+    alreadyBoosted: {
+      name: 'Already boosted',
+    },
+  },
+  render: (args) => (
+    <BoostButton status={argsToStatus(args)} counters={args.reblogCount > 0} />
+  ),
+} satisfies Meta<StoryProps>;
+
+export default meta;
+
+function argsToStatus({
+  reblogCount,
+  visibility,
+  quoteAllowed,
+  alreadyBoosted,
+}: StoryProps) {
+  return statusFactoryState({
+    reblogs_count: reblogCount,
+    visibility,
+    reblogged: alreadyBoosted,
+    quote_approval: {
+      automatic: [],
+      manual: [],
+      current_user: quoteAllowed ? 'automatic' : 'denied',
+    },
+  });
+}
+
+type Story = StoryObj<typeof meta>;
+
+export const Default: Story = {};
+
+export const Mine: Story = {
+  parameters: {
+    state: {
+      meta: {
+        me: '1',
+      },
+    },
+  },
+};
diff --git a/app/javascript/mastodon/components/status/boost_button.tsx b/app/javascript/mastodon/components/status/boost_button.tsx
new file mode 100644
index 00000000000..337eca50717
--- /dev/null
+++ b/app/javascript/mastodon/components/status/boost_button.tsx
@@ -0,0 +1,190 @@
+import { useCallback, useMemo } from 'react';
+import type { FC, KeyboardEvent, MouseEvent } from 'react';
+
+import { useIntl } from 'react-intl';
+
+import classNames from 'classnames';
+
+import { quoteComposeById } from '@/mastodon/actions/compose_typed';
+import { toggleReblog } from '@/mastodon/actions/interactions';
+import { openModal } from '@/mastodon/actions/modal';
+import type { ActionMenuItem } from '@/mastodon/models/dropdown_menu';
+import type { Status } from '@/mastodon/models/status';
+import { useAppDispatch, useAppSelector } from '@/mastodon/store';
+import type { SomeRequired } from '@/mastodon/utils/types';
+
+import type { RenderItemFn, RenderItemFnHandlers } from '../dropdown_menu';
+import { Dropdown, DropdownMenuItemContent } from '../dropdown_menu';
+import { IconButton } from '../icon_button';
+
+import {
+  boostItemState,
+  messages,
+  quoteItemState,
+  selectStatusState,
+} from './boost_button_utils';
+
+const renderMenuItem: RenderItemFn<ActionMenuItem> = (
+  item,
+  index,
+  handlers,
+  focusRefCallback,
+) => (
+  <ReblogMenuItem
+    index={index}
+    item={item}
+    handlers={handlers}
+    key={`${item.text}-${index}`}
+    focusRefCallback={focusRefCallback}
+  />
+);
+
+interface ReblogButtonProps {
+  status: Status;
+  counters?: boolean;
+}
+
+type ActionMenuItemWithIcon = SomeRequired<ActionMenuItem, 'icon'>;
+
+export const BoostButton: FC<ReblogButtonProps> = ({ status, counters }) => {
+  const intl = useIntl();
+  const dispatch = useAppDispatch();
+  const statusState = useAppSelector((state) =>
+    selectStatusState(state, status),
+  );
+  const {
+    isLoggedIn,
+    isReblogged,
+    isReblogAllowed,
+    isQuoteAutomaticallyAccepted,
+    isQuoteManuallyAccepted,
+  } = statusState;
+
+  const isMenuDisabled =
+    !isQuoteAutomaticallyAccepted &&
+    !isQuoteManuallyAccepted &&
+    !isReblogAllowed;
+
+  const statusId = status.get('id') as string;
+  const wasBoosted = !!status.get('reblogged');
+
+  const showLoginPrompt = useCallback(() => {
+    dispatch(
+      openModal({
+        modalType: 'INTERACTION',
+        modalProps: {
+          accountId: status.getIn(['account', 'id']),
+          url: status.get('uri'),
+        },
+      }),
+    );
+  }, [dispatch, status]);
+
+  const items = useMemo(() => {
+    const boostItem = boostItemState(statusState);
+    const quoteItem = quoteItemState(statusState);
+    return [
+      {
+        text: intl.formatMessage(boostItem.title),
+        description: boostItem.meta
+          ? intl.formatMessage(boostItem.meta)
+          : undefined,
+        icon: boostItem.iconComponent,
+        highlighted: wasBoosted,
+        disabled: boostItem.disabled,
+        action: (event) => {
+          dispatch(toggleReblog(statusId, event.shiftKey));
+        },
+      },
+      {
+        text: intl.formatMessage(quoteItem.title),
+        description: quoteItem.meta
+          ? intl.formatMessage(quoteItem.meta)
+          : undefined,
+        icon: quoteItem.iconComponent,
+        disabled: quoteItem.disabled,
+        action: () => {
+          dispatch(quoteComposeById(statusId));
+        },
+      },
+    ] satisfies [ActionMenuItemWithIcon, ActionMenuItemWithIcon];
+  }, [dispatch, intl, statusId, statusState, wasBoosted]);
+
+  const boostIcon = items[0].icon;
+
+  const handleDropdownOpen = useCallback(
+    (event: MouseEvent | KeyboardEvent) => {
+      if (!isLoggedIn) {
+        showLoginPrompt();
+        return false;
+      }
+
+      if (event.shiftKey) {
+        dispatch(toggleReblog(status.get('id'), true));
+        return false;
+      }
+      return true;
+    },
+    [dispatch, isLoggedIn, showLoginPrompt, status],
+  );
+
+  return (
+    <Dropdown
+      placement='bottom-start'
+      offset={[-19, 5]} // This aligns button icon with menu icons
+      items={items}
+      renderItem={renderMenuItem}
+      onOpen={handleDropdownOpen}
+      disabled={isMenuDisabled}
+    >
+      <IconButton
+        title={intl.formatMessage(
+          isMenuDisabled ? messages.all_disabled : messages.reblog_or_quote,
+        )}
+        icon='retweet'
+        iconComponent={boostIcon}
+        counter={
+          counters
+            ? (status.get('reblogs_count') as number) +
+              (status.get('quotes_count') as number)
+            : undefined
+        }
+        active={isReblogged}
+      />
+    </Dropdown>
+  );
+};
+
+interface ReblogMenuItemProps {
+  item: ActionMenuItem;
+  index: number;
+  handlers: RenderItemFnHandlers;
+  focusRefCallback?: (c: HTMLAnchorElement | HTMLButtonElement | null) => void;
+}
+
+const ReblogMenuItem: FC<ReblogMenuItemProps> = ({
+  index,
+  item,
+  handlers,
+  focusRefCallback,
+}) => {
+  const { text, highlighted, disabled } = item;
+
+  return (
+    <li
+      className={classNames('dropdown-menu__item reblog-menu-item', {
+        'dropdown-menu__item--highlighted': highlighted,
+      })}
+      key={`${text}-${index}`}
+    >
+      <button
+        {...handlers}
+        ref={focusRefCallback}
+        aria-disabled={disabled}
+        data-index={index}
+      >
+        <DropdownMenuItemContent item={item} />
+      </button>
+    </li>
+  );
+};
diff --git a/app/javascript/mastodon/components/status/boost_button_utils.ts b/app/javascript/mastodon/components/status/boost_button_utils.ts
new file mode 100644
index 00000000000..5fc77ed30b6
--- /dev/null
+++ b/app/javascript/mastodon/components/status/boost_button_utils.ts
@@ -0,0 +1,167 @@
+import { defineMessages } from 'react-intl';
+import type { MessageDescriptor } from 'react-intl';
+
+import type { Status, StatusVisibility } from '@/mastodon/models/status';
+import { createAppSelector } from '@/mastodon/store';
+import FormatQuote from '@/material-icons/400-24px/format_quote-fill.svg?react';
+import FormatQuoteOff from '@/material-icons/400-24px/format_quote_off-fill.svg?react';
+import RepeatIcon from '@/material-icons/400-24px/repeat.svg?react';
+import RepeatActiveIcon from '@/svg-icons/repeat_active.svg?react';
+import RepeatDisabledIcon from '@/svg-icons/repeat_disabled.svg?react';
+import RepeatPrivateIcon from '@/svg-icons/repeat_private.svg?react';
+import RepeatPrivateActiveIcon from '@/svg-icons/repeat_private_active.svg?react';
+
+import type { IconProp } from '../icon';
+
+export const messages = defineMessages({
+  all_disabled: {
+    id: 'status.all_disabled',
+    defaultMessage: 'Boosts and quotes are disabled',
+  },
+  quote: {
+    id: 'status.quote',
+    defaultMessage: 'Quote',
+    description: 'Quote as a verb (e.g. Quote this post)',
+  },
+  quote_cannot: {
+    id: 'status.cannot_quote',
+    defaultMessage: 'You are not allowed to quote this post',
+  },
+  quote_followers_only: {
+    id: 'status.quote_followers_only',
+    defaultMessage: 'Only followers can quote this post',
+  },
+  quote_manual_review: {
+    id: 'status.quote_manual_review',
+    defaultMessage: 'Author will manually review',
+  },
+  quote_private: {
+    id: 'status.quote_private',
+    defaultMessage: 'Private posts cannot be quoted',
+  },
+  reblog: { id: 'status.reblog', defaultMessage: 'Boost' },
+  reblog_or_quote: {
+    id: 'status.reblog_or_quote',
+    defaultMessage: 'Boost or quote',
+  },
+  reblog_cancel: {
+    id: 'status.cancel_reblog_private',
+    defaultMessage: 'Unboost',
+  },
+  reblog_private: {
+    id: 'status.reblog_private',
+    defaultMessage: 'Share again with your followers',
+  },
+  reblog_cannot: {
+    id: 'status.cannot_reblog',
+    defaultMessage: 'This post cannot be boosted',
+  },
+  request_quote: {
+    id: 'status.request_quote',
+    defaultMessage: 'Request to quote',
+  },
+});
+
+export const selectStatusState = createAppSelector(
+  [
+    (state) => state.meta.get('me') as string | undefined,
+    (_, status: Status) => status,
+  ],
+  (userId, status) => {
+    const isPublic = ['public', 'unlisted'].includes(
+      status.get('visibility') as StatusVisibility,
+    );
+    const isMineAndPrivate =
+      userId === status.getIn(['account', 'id']) &&
+      status.get('visibility') === 'private';
+    return {
+      isLoggedIn: !!userId,
+      isPublic,
+      isMine: userId === status.getIn(['account', 'id']),
+      isPrivateReblog:
+        userId === status.getIn(['account', 'id']) &&
+        status.get('visibility') === 'private',
+      isReblogged: !!status.get('reblogged'),
+      isReblogAllowed: isPublic || isMineAndPrivate,
+      isQuoteAutomaticallyAccepted:
+        status.getIn(['quote_approval', 'current_user']) === 'automatic' &&
+        (isPublic || isMineAndPrivate),
+      isQuoteManuallyAccepted:
+        status.getIn(['quote_approval', 'current_user']) === 'manual' &&
+        (isPublic || isMineAndPrivate),
+      isQuoteFollowersOnly:
+        status.getIn(['quote_approval', 'automatic', 0]) === 'followers' ||
+        status.getIn(['quote_approval', 'manual', 0]) === 'followers',
+    };
+  },
+);
+
+export type StatusState = ReturnType<typeof selectStatusState>;
+
+export interface MenuItemState {
+  title: MessageDescriptor;
+  meta?: MessageDescriptor;
+  iconComponent: IconProp;
+  disabled?: boolean;
+}
+
+export function boostItemState({
+  isPublic,
+  isPrivateReblog,
+  isReblogged,
+}: StatusState): MenuItemState {
+  if (isReblogged) {
+    return {
+      title: messages.reblog_cancel,
+      iconComponent: isPublic ? RepeatActiveIcon : RepeatPrivateActiveIcon,
+    };
+  }
+  const iconText: MenuItemState = {
+    title: messages.reblog,
+    iconComponent: RepeatIcon,
+  };
+
+  if (isPrivateReblog) {
+    iconText.meta = messages.reblog_private;
+    iconText.iconComponent = RepeatPrivateIcon;
+  } else if (!isPublic) {
+    iconText.meta = messages.reblog_cannot;
+    iconText.iconComponent = RepeatDisabledIcon;
+    iconText.disabled = true;
+  }
+  return iconText;
+}
+
+export function quoteItemState({
+  isLoggedIn,
+  isMine,
+  isQuoteAutomaticallyAccepted,
+  isQuoteManuallyAccepted,
+  isQuoteFollowersOnly,
+  isPublic,
+}: StatusState): MenuItemState {
+  const iconText: MenuItemState = {
+    title: messages.quote,
+    iconComponent: FormatQuote,
+  };
+
+  if (!isPublic && !isMine) {
+    iconText.disabled = true;
+    iconText.iconComponent = FormatQuoteOff;
+    iconText.meta = messages.quote_private;
+  } else if (isQuoteAutomaticallyAccepted) {
+    iconText.title = messages.quote;
+  } else if (isQuoteManuallyAccepted) {
+    iconText.title = messages.request_quote;
+    iconText.meta = messages.quote_manual_review;
+    // We don't show the disabled state when logged out
+  } else if (isLoggedIn) {
+    iconText.disabled = true;
+    iconText.iconComponent = FormatQuoteOff;
+    iconText.meta = isQuoteFollowersOnly
+      ? messages.quote_followers_only
+      : messages.quote_cannot;
+  }
+
+  return iconText;
+}
diff --git a/app/javascript/mastodon/components/status/handled_link.stories.tsx b/app/javascript/mastodon/components/status/handled_link.stories.tsx
new file mode 100644
index 00000000000..e3438337048
--- /dev/null
+++ b/app/javascript/mastodon/components/status/handled_link.stories.tsx
@@ -0,0 +1,102 @@
+import type { Meta, StoryObj } from '@storybook/react-vite';
+
+import { HashtagMenuController } from '@/mastodon/features/ui/components/hashtag_menu_controller';
+import { accountFactoryState } from '@/testing/factories';
+
+import { HoverCardController } from '../hover_card_controller';
+
+import type { HandledLinkProps } from './handled_link';
+import { HandledLink } from './handled_link';
+
+type HandledLinkStoryProps = Pick<
+  HandledLinkProps,
+  'href' | 'text' | 'prevText'
+> & {
+  mentionAccount: 'local' | 'remote' | 'none';
+  hashtagAccount: boolean;
+};
+
+const meta = {
+  title: 'Components/Status/HandledLink',
+  render({ mentionAccount, hashtagAccount, ...args }) {
+    let mention: HandledLinkProps['mention'] | undefined;
+    if (mentionAccount === 'local') {
+      mention = { id: '1', acct: 'testuser' };
+    } else if (mentionAccount === 'remote') {
+      mention = { id: '2', acct: 'remoteuser@mastodon.social' };
+    }
+    return (
+      <>
+        <HandledLink
+          {...args}
+          mention={mention}
+          hashtagAccountId={hashtagAccount ? '1' : undefined}
+        >
+          <span>{args.text}</span>
+        </HandledLink>
+        <HashtagMenuController />
+        <HoverCardController />
+      </>
+    );
+  },
+  args: {
+    href: 'https://example.com/path/subpath?query=1#hash',
+    text: 'https://example.com',
+    mentionAccount: 'none',
+    hashtagAccount: false,
+  },
+  argTypes: {
+    mentionAccount: {
+      control: { type: 'select' },
+      options: ['local', 'remote', 'none'],
+      defaultValue: 'none',
+    },
+  },
+  parameters: {
+    state: {
+      accounts: {
+        '1': accountFactoryState({ id: '1', acct: 'hashtaguser' }),
+      },
+    },
+  },
+} satisfies Meta<HandledLinkStoryProps>;
+
+export default meta;
+
+type Story = StoryObj<typeof meta>;
+
+export const Default: Story = {};
+
+export const Simple: Story = {
+  args: {
+    href: 'https://example.com/test',
+  },
+};
+
+export const Hashtag: Story = {
+  args: {
+    text: '#example',
+    hashtagAccount: true,
+  },
+};
+
+export const Mention: Story = {
+  args: {
+    text: '@user',
+    mentionAccount: 'local',
+  },
+};
+
+export const InternalLink: Story = {
+  args: {
+    href: '/about',
+    text: 'About',
+  },
+};
+
+export const InvalidURL: Story = {
+  args: {
+    href: 'ht!tp://invalid-url',
+    text: 'ht!tp://invalid-url -- invalid!',
+  },
+};
diff --git a/app/javascript/mastodon/components/status/handled_link.tsx b/app/javascript/mastodon/components/status/handled_link.tsx
new file mode 100644
index 00000000000..3c8973992bd
--- /dev/null
+++ b/app/javascript/mastodon/components/status/handled_link.tsx
@@ -0,0 +1,109 @@
+import { useCallback } from 'react';
+import type { ComponentProps, FC } from 'react';
+
+import classNames from 'classnames';
+import { Link } from 'react-router-dom';
+
+import type { ApiMentionJSON } from '@/mastodon/api_types/statuses';
+import type { OnElementHandler } from '@/mastodon/utils/html';
+
+export interface HandledLinkProps {
+  href: string;
+  text: string;
+  prevText?: string;
+  hashtagAccountId?: string;
+  mention?: Pick<ApiMentionJSON, 'id' | 'acct'>;
+}
+
+export const HandledLink: FC<HandledLinkProps & ComponentProps<'a'>> = ({
+  href,
+  text,
+  prevText,
+  hashtagAccountId,
+  mention,
+  className,
+  children,
+  ...props
+}) => {
+  // Handle hashtags
+  if (text.startsWith('#') || prevText?.endsWith('#')) {
+    const hashtag = text.slice(1).trim();
+    return (
+      <Link
+        className={classNames('mention hashtag', className)}
+        to={`/tags/${hashtag}`}
+        rel='tag'
+        data-menu-hashtag={hashtagAccountId}
+      >
+        {children}
+      </Link>
+    );
+  } else if ((text.startsWith('@') || prevText?.endsWith('@')) && mention) {
+    // Handle mentions
+    return (
+      <Link
+        className={classNames('mention', className)}
+        to={`/@${mention.acct}`}
+        title={`@${mention.acct}`}
+        data-hover-card-account={mention.id}
+      >
+        {children}
+      </Link>
+    );
+  }
+
+  // Non-absolute paths treated as internal links. This shouldn't happen, but just in case.
+  if (href.startsWith('/')) {
+    return (
+      <Link className={classNames('unhandled-link', className)} to={href}>
+        {children}
+      </Link>
+    );
+  }
+
+  return (
+    <a
+      {...props}
+      href={href}
+      title={href}
+      className={classNames('unhandled-link', className)}
+      target='_blank'
+      rel='noreferrer noopener'
+      translate='no'
+    >
+      {children}
+    </a>
+  );
+};
+
+export const useElementHandledLink = ({
+  hashtagAccountId,
+  hrefToMention,
+}: {
+  hashtagAccountId?: string;
+  hrefToMention?: (href: string) => ApiMentionJSON | undefined;
+} = {}) => {
+  const onElement = useCallback<OnElementHandler>(
+    (element, { key, ...props }, children) => {
+      if (element instanceof HTMLAnchorElement) {
+        const mention = hrefToMention?.(element.href);
+        return (
+          <HandledLink
+            {...props}
+            key={key as string} // React requires keys to not be part of spread props.
+            href={element.href}
+            text={element.innerText}
+            prevText={element.previousSibling?.textContent ?? undefined}
+            hashtagAccountId={hashtagAccountId}
+            mention={mention}
+          >
+            {children}
+          </HandledLink>
+        );
+      }
+      return undefined;
+    },
+    [hashtagAccountId, hrefToMention],
+  );
+  return { onElement };
+};
diff --git a/app/javascript/mastodon/components/status_action_bar.jsx b/app/javascript/mastodon/components/status_action_bar/index.jsx
similarity index 83%
rename from app/javascript/mastodon/components/status_action_bar.jsx
rename to app/javascript/mastodon/components/status_action_bar/index.jsx
index ec5a9780cb7..3e82912ab19 100644
--- a/app/javascript/mastodon/components/status_action_bar.jsx
+++ b/app/javascript/mastodon/components/status_action_bar/index.jsx
@@ -2,7 +2,6 @@ import PropTypes from 'prop-types';
 
 import { defineMessages, injectIntl } from 'react-intl';
 
-import classNames from 'classnames';
 import { withRouter } from 'react-router-dom';
 
 import ImmutablePropTypes from 'react-immutable-proptypes';
@@ -12,23 +11,20 @@ import { connect } from 'react-redux';
 import BookmarkIcon from '@/material-icons/400-24px/bookmark-fill.svg?react';
 import BookmarkBorderIcon from '@/material-icons/400-24px/bookmark.svg?react';
 import MoreHorizIcon from '@/material-icons/400-24px/more_horiz.svg?react';
-import RepeatIcon from '@/material-icons/400-24px/repeat.svg?react';
 import ReplyIcon from '@/material-icons/400-24px/reply.svg?react';
 import ReplyAllIcon from '@/material-icons/400-24px/reply_all.svg?react';
 import StarIcon from '@/material-icons/400-24px/star-fill.svg?react';
 import StarBorderIcon from '@/material-icons/400-24px/star.svg?react';
-import RepeatActiveIcon from '@/svg-icons/repeat_active.svg?react';
-import RepeatDisabledIcon from '@/svg-icons/repeat_disabled.svg?react';
-import RepeatPrivateIcon from '@/svg-icons/repeat_private.svg?react';
-import RepeatPrivateActiveIcon from '@/svg-icons/repeat_private_active.svg?react';
 import { identityContextPropShape, withIdentity } from 'mastodon/identity_context';
 import { PERMISSION_MANAGE_USERS, PERMISSION_MANAGE_FEDERATION } from 'mastodon/permissions';
 import { WithRouterPropTypes } from 'mastodon/utils/react_router';
 
 import { Dropdown } from 'mastodon/components/dropdown_menu';
-import { me } from '../initial_state';
+import { me } from '../../initial_state';
 
-import { IconButton } from './icon_button';
+import { IconButton } from '../icon_button';
+import { BoostButton } from '../status/boost_button';
+import { RemoveQuoteHint } from './remove_quote_hint';
 
 const messages = defineMessages({
   delete: { id: 'status.delete', defaultMessage: 'Delete' },
@@ -42,10 +38,6 @@ const messages = defineMessages({
   share: { id: 'status.share', defaultMessage: 'Share' },
   more: { id: 'status.more', defaultMessage: 'More' },
   replyAll: { id: 'status.replyAll', defaultMessage: 'Reply to thread' },
-  reblog: { id: 'status.reblog', defaultMessage: 'Boost' },
-  reblog_private: { id: 'status.reblog_private', defaultMessage: 'Boost with original visibility' },
-  cancel_reblog_private: { id: 'status.cancel_reblog_private', defaultMessage: 'Unboost' },
-  cannot_reblog: { id: 'status.cannot_reblog', defaultMessage: 'This post cannot be boosted' },
   favourite: { id: 'status.favourite', defaultMessage: 'Favorite' },
   removeFavourite: { id: 'status.remove_favourite', defaultMessage: 'Remove from favorites' },
   bookmark: { id: 'status.bookmark', defaultMessage: 'Bookmark' },
@@ -67,21 +59,30 @@ const messages = defineMessages({
   unblock: { id: 'account.unblock', defaultMessage: 'Unblock @{name}' },
   filter: { id: 'status.filter', defaultMessage: 'Filter this post' },
   openOriginalPage: { id: 'account.open_original_page', defaultMessage: 'Open original page' },
+  revokeQuote: { id: 'status.revoke_quote', defaultMessage: 'Remove my post from @{name}’s post' },
+  quotePolicyChange: { id: 'status.quote_policy_change', defaultMessage: 'Change who can quote' },
 });
 
-const mapStateToProps = (state, { status }) => ({
-  relationship: state.getIn(['relationships', status.getIn(['account', 'id'])]),
-});
+const mapStateToProps = (state, { status }) => {
+  const quotedStatusId = status.getIn(['quote', 'quoted_status']);
+  return ({
+    relationship: state.getIn(['relationships', status.getIn(['account', 'id'])]),
+    quotedAccountId: quotedStatusId ? state.getIn(['statuses', quotedStatusId, 'account']) : null,
+  });
+};
 
 class StatusActionBar extends ImmutablePureComponent {
   static propTypes = {
     identity: identityContextPropShape,
     status: ImmutablePropTypes.map.isRequired,
     relationship: ImmutablePropTypes.record,
+    quotedAccountId: PropTypes.string,
+    contextType: PropTypes.string,
     onReply: PropTypes.func,
     onFavourite: PropTypes.func,
-    onReblog: PropTypes.func,
     onDelete: PropTypes.func,
+    onRevokeQuote: PropTypes.func,
+    onQuotePolicyChange: PropTypes.func,
     onDirect: PropTypes.func,
     onMention: PropTypes.func,
     onMute: PropTypes.func,
@@ -110,6 +111,7 @@ class StatusActionBar extends ImmutablePureComponent {
   updateOnProps = [
     'status',
     'relationship',
+    'quotedAccountId',
     'withDismiss',
   ];
 
@@ -119,7 +121,7 @@ class StatusActionBar extends ImmutablePureComponent {
     if (signedIn) {
       this.props.onReply(this.props.status);
     } else {
-      this.props.onInteractionModal('reply', this.props.status);
+      this.props.onInteractionModal(this.props.status);
     }
   };
 
@@ -137,17 +139,7 @@ class StatusActionBar extends ImmutablePureComponent {
     if (signedIn) {
       this.props.onFavourite(this.props.status);
     } else {
-      this.props.onInteractionModal('favourite', this.props.status);
-    }
-  };
-
-  handleReblogClick = e => {
-    const { signedIn } = this.props.identity;
-
-    if (signedIn) {
-      this.props.onReblog(this.props.status, e);
-    } else {
-      this.props.onInteractionModal('reblog', this.props.status);
+      this.props.onInteractionModal(this.props.status);
     }
   };
 
@@ -190,6 +182,14 @@ class StatusActionBar extends ImmutablePureComponent {
     }
   };
 
+  handleRevokeQuoteClick = () => {
+    this.props.onRevokeQuote(this.props.status);
+  };
+
+  handleQuotePolicyChange = () => {
+    this.props.onQuotePolicyChange(this.props.status);
+  };
+
   handleBlockClick = () => {
     const { status, relationship, onBlock, onUnblock } = this.props;
     const account = status.get('account');
@@ -241,7 +241,7 @@ class StatusActionBar extends ImmutablePureComponent {
   };
 
   render () {
-    const { status, relationship, intl, withDismiss, withCounters, scrollKey } = this.props;
+    const { status, relationship, quotedAccountId, contextType, intl, withDismiss, withCounters, scrollKey } = this.props;
     const { signedIn, permissions } = this.props.identity;
 
     const publicStatus       = ['public', 'unlisted'].includes(status.get('visibility'));
@@ -250,6 +250,7 @@ class StatusActionBar extends ImmutablePureComponent {
     const account            = status.get('account');
     const writtenByMe        = status.getIn(['account', 'id']) === me;
     const isRemote           = status.getIn(['account', 'username']) !== status.getIn(['account', 'acct']);
+    const isQuotingMe        = quotedAccountId === me;
 
     let menu = [];
 
@@ -279,6 +280,9 @@ class StatusActionBar extends ImmutablePureComponent {
 
       if (writtenByMe || withDismiss) {
         menu.push({ text: intl.formatMessage(mutingConversation ? messages.unmuteConversation : messages.muteConversation), action: this.handleConversationMuteClick });
+        if (writtenByMe && !['private', 'direct'].includes(status.get('visibility'))) {
+          menu.push({ text: intl.formatMessage(messages.quotePolicyChange), action: this.handleQuotePolicyChange });
+        }
         menu.push(null);
       }
 
@@ -291,6 +295,10 @@ class StatusActionBar extends ImmutablePureComponent {
         menu.push({ text: intl.formatMessage(messages.direct, { name: account.get('username') }), action: this.handleDirectClick });
         menu.push(null);
 
+        if (isQuotingMe) {
+          menu.push({ text: intl.formatMessage(messages.revokeQuote, { name: account.get('username') }), action: this.handleRevokeQuoteClick, dangerous: true });
+        }
+
         if (relationship && relationship.get('muting')) {
           menu.push({ text: intl.formatMessage(messages.unmute, { name: account.get('username') }), action: this.handleMuteClick });
         } else {
@@ -351,28 +359,11 @@ class StatusActionBar extends ImmutablePureComponent {
       replyTitle = intl.formatMessage(messages.replyAll);
     }
 
-    const reblogPrivate = status.getIn(['account', 'id']) === me && status.get('visibility') === 'private';
-
-    let reblogTitle, reblogIconComponent;
-
-    if (status.get('reblogged')) {
-      reblogTitle = intl.formatMessage(messages.cancel_reblog_private);
-      reblogIconComponent = publicStatus ? RepeatActiveIcon : RepeatPrivateActiveIcon;
-    } else if (publicStatus) {
-      reblogTitle = intl.formatMessage(messages.reblog);
-      reblogIconComponent = RepeatIcon;
-    } else if (reblogPrivate) {
-      reblogTitle = intl.formatMessage(messages.reblog_private);
-      reblogIconComponent = RepeatPrivateIcon;
-    } else {
-      reblogTitle = intl.formatMessage(messages.cannot_reblog);
-      reblogIconComponent = RepeatDisabledIcon;
-    }
-
-
     const bookmarkTitle = intl.formatMessage(status.get('bookmarked') ? messages.removeBookmark : messages.bookmark);
     const favouriteTitle = intl.formatMessage(status.get('favourited') ? messages.removeFavourite : messages.favourite);
     const isReply = status.get('in_reply_to_account_id') === status.getIn(['account', 'id']);
+  
+    const shouldShowQuoteRemovalHint = isQuotingMe && contextType === 'notifications';
 
     return (
       <div className='status__action-bar'>
@@ -380,7 +371,7 @@ class StatusActionBar extends ImmutablePureComponent {
           <IconButton className='status__action-bar__button' title={replyTitle} icon={isReply ? 'reply' : replyIcon} iconComponent={isReply ? ReplyIcon : replyIconComponent} onClick={this.handleReplyClick} counter={status.get('replies_count')} />
         </div>
         <div className='status__action-bar__button-wrapper'>
-          <IconButton className={classNames('status__action-bar__button', { reblogPrivate })} disabled={!publicStatus && !reblogPrivate} active={status.get('reblogged')} title={reblogTitle} icon='retweet' iconComponent={reblogIconComponent} onClick={this.handleReblogClick} counter={withCounters ? status.get('reblogs_count') : undefined} />
+          <BoostButton status={status} counters={withCounters} />
         </div>
         <div className='status__action-bar__button-wrapper'>
           <IconButton className='status__action-bar__button star-icon' animate active={status.get('favourited')} title={favouriteTitle} icon='star' iconComponent={status.get('favourited') ? StarIcon : StarBorderIcon} onClick={this.handleFavouriteClick} counter={withCounters ? status.get('favourites_count') : undefined} />
@@ -388,17 +379,23 @@ class StatusActionBar extends ImmutablePureComponent {
         <div className='status__action-bar__button-wrapper'>
           <IconButton className='status__action-bar__button bookmark-icon' disabled={!signedIn} active={status.get('bookmarked')} title={bookmarkTitle} icon='bookmark' iconComponent={status.get('bookmarked') ? BookmarkIcon : BookmarkBorderIcon} onClick={this.handleBookmarkClick} />
         </div>
-        <div className='status__action-bar__button-wrapper'>
-          <Dropdown
-            scrollKey={scrollKey}
-            status={status}
-            items={menu}
-            icon='ellipsis-h'
-            iconComponent={MoreHorizIcon}
-            direction='right'
-            title={intl.formatMessage(messages.more)}
-          />
-        </div>
+        <RemoveQuoteHint className='status__action-bar__button-wrapper' canShowHint={shouldShowQuoteRemovalHint}>
+          {(dismissQuoteHint) => (
+            <Dropdown
+              scrollKey={scrollKey}
+              status={status}
+              items={menu}
+              icon='ellipsis-h'
+              iconComponent={MoreHorizIcon}
+              direction='right'
+              title={intl.formatMessage(messages.more)}
+              onOpen={() => {
+                dismissQuoteHint();
+                return true;
+              }}
+            />
+          )}
+        </RemoveQuoteHint>
       </div>
     );
   }
diff --git a/app/javascript/mastodon/components/status_action_bar/remove_quote_hint.tsx b/app/javascript/mastodon/components/status_action_bar/remove_quote_hint.tsx
new file mode 100644
index 00000000000..dec9c3ef38c
--- /dev/null
+++ b/app/javascript/mastodon/components/status_action_bar/remove_quote_hint.tsx
@@ -0,0 +1,119 @@
+import { useEffect, useRef, useState, useId } from 'react';
+
+import { FormattedMessage, useIntl } from 'react-intl';
+
+import classNames from 'classnames';
+
+import Overlay from 'react-overlays/Overlay';
+
+import MoreHorizIcon from '@/material-icons/400-24px/more_horiz.svg?react';
+
+import { Button } from '../button';
+import { useDismissableBannerState } from '../dismissable_banner';
+import { Icon } from '../icon';
+
+const DISMISSABLE_BANNER_ID = 'notifications/remove_quote_hint';
+
+/**
+ * We don't want to show this hint in the UI more than once,
+ * so the first time it renders, we store a unique component ID
+ * here to prevent any other hints from being displayed after it.
+ */
+let firstHintId: string | null = null;
+
+export const RemoveQuoteHint: React.FC<{
+  canShowHint: boolean;
+  className?: string;
+  children: (dismiss: () => void) => React.ReactNode;
+}> = ({ canShowHint, className, children }) => {
+  const anchorRef = useRef<HTMLDivElement>(null);
+  const intl = useIntl();
+
+  const { wasDismissed, dismiss } = useDismissableBannerState({
+    id: DISMISSABLE_BANNER_ID,
+  });
+
+  const shouldShowHint = !wasDismissed && canShowHint;
+
+  const uniqueId = useId();
+  const [isOnlyHint, setIsOnlyHint] = useState(false);
+  useEffect(() => {
+    if (!shouldShowHint) {
+      return () => null;
+    }
+
+    if (!firstHintId) {
+      firstHintId = uniqueId;
+      setIsOnlyHint(true);
+    }
+
+    return () => {
+      if (firstHintId === uniqueId) {
+        firstHintId = null;
+        setIsOnlyHint(false);
+      }
+    };
+  }, [shouldShowHint, uniqueId]);
+
+  return (
+    <div className={className} ref={anchorRef}>
+      {children(dismiss)}
+      {shouldShowHint && isOnlyHint && (
+        <Overlay
+          show
+          flip
+          offset={[12, 10]}
+          placement='bottom-end'
+          target={anchorRef.current}
+          container={anchorRef.current}
+        >
+          {({ props, placement }) => (
+            <div
+              {...props}
+              className={classNames(
+                'info-tooltip info-tooltip--solid dropdown-animation',
+                placement,
+              )}
+            >
+              <h4>
+                <FormattedMessage
+                  id='remove_quote_hint.title'
+                  defaultMessage='Want to remove your quoted post?'
+                />
+              </h4>
+              <FormattedMessage
+                id='remove_quote_hint.message'
+                defaultMessage='You can do so from the {icon} options menu.'
+                values={{
+                  icon: (
+                    <Icon
+                      id='ellipsis-h'
+                      icon={MoreHorizIcon}
+                      aria-label={intl.formatMessage({
+                        id: 'status.more',
+                        defaultMessage: 'More',
+                      })}
+                      style={{ verticalAlign: 'middle' }}
+                    />
+                  ),
+                }}
+              >
+                {(text) => <p>{text}</p>}
+              </FormattedMessage>
+              <FormattedMessage
+                id='remove_quote_hint.button_label'
+                defaultMessage='Got it'
+              >
+                {(text) => (
+                  <Button plain compact onClick={dismiss}>
+                    {text}
+                  </Button>
+                )}
+              </FormattedMessage>
+            </div>
+          )}
+        </Overlay>
+      )}
+    </div>
+  );
+};
diff --git a/app/javascript/mastodon/components/status_banner.tsx b/app/javascript/mastodon/components/status_banner.tsx
index e11b2c9279b..a1d200133f8 100644
--- a/app/javascript/mastodon/components/status_banner.tsx
+++ b/app/javascript/mastodon/components/status_banner.tsx
@@ -3,6 +3,8 @@ import { useCallback, useRef, useId } from 'react';
 
 import { FormattedMessage } from 'react-intl';
 
+import { AnimateEmojiProvider } from './emoji/context';
+
 export enum BannerVariant {
   Warning = 'warning',
   Filter = 'filter',
@@ -34,8 +36,7 @@ export const StatusBanner: React.FC<{
 
   return (
     // Element clicks are passed on to button
-    // eslint-disable-next-line jsx-a11y/click-events-have-key-events, jsx-a11y/no-static-element-interactions
-    <div
+    <AnimateEmojiProvider
       className={
         variant === BannerVariant.Warning
           ? 'content-warning'
@@ -69,6 +70,6 @@ export const StatusBanner: React.FC<{
           />
         )}
       </button>
-    </div>
+    </AnimateEmojiProvider>
   );
 };
diff --git a/app/javascript/mastodon/components/status_content.jsx b/app/javascript/mastodon/components/status_content.jsx
index 0628e0791b5..14779ce3a43 100644
--- a/app/javascript/mastodon/components/status_content.jsx
+++ b/app/javascript/mastodon/components/status_content.jsx
@@ -13,7 +13,12 @@ import ChevronRightIcon from '@/material-icons/400-24px/chevron_right.svg?react'
 import { Icon }  from 'mastodon/components/icon';
 import { Poll } from 'mastodon/components/poll';
 import { identityContextPropShape, withIdentity } from 'mastodon/identity_context';
-import { autoPlayGif, languages as preloadedLanguages } from 'mastodon/initial_state';
+import { languages as preloadedLanguages } from 'mastodon/initial_state';
+
+import { isModernEmojiEnabled } from '../utils/environment';
+
+import { EmojiHTML } from './emoji/html';
+import { HandledLink } from './status/handled_link';
 
 const MAX_HEIGHT = 706; // 22px * 32 (+ 2px padding at the top)
 
@@ -43,13 +48,13 @@ class TranslateButton extends PureComponent {
 
       return (
         <div className='translate-button'>
-          <div className='translate-button__meta'>
-            <FormattedMessage id='status.translated_from_with' defaultMessage='Translated from {lang} using {provider}' values={{ lang: languageName, provider }} />
-          </div>
-
           <button className='link-button' onClick={onClick}>
             <FormattedMessage id='status.show_original' defaultMessage='Show original' />
           </button>
+
+          <div className='translate-button__meta'>
+            <FormattedMessage id='status.translated_from_with' defaultMessage='Translated from {lang} using {provider}' values={{ lang: languageName, provider }} />
+          </div>
         </div>
       );
     }
@@ -92,6 +97,23 @@ class StatusContent extends PureComponent {
     }
 
     const { status, onCollapsedToggle } = this.props;
+    if (status.get('collapsed', null) === null && onCollapsedToggle) {
+      const { collapsible, onClick } = this.props;
+
+      const collapsed =
+          collapsible
+          && onClick
+          && node.clientHeight > MAX_HEIGHT
+          && status.get('spoiler_text').length === 0;
+
+      onCollapsedToggle(collapsed);
+    }
+
+    // Exit if modern emoji is enabled, as it handles links using the HandledLink component.
+    if (isModernEmojiEnabled()) {
+      return;
+    }
+
     const links = node.querySelectorAll('a');
 
     let link, mention;
@@ -121,46 +143,8 @@ class StatusContent extends PureComponent {
         link.classList.add('unhandled-link');
       }
     }
-
-    if (status.get('collapsed', null) === null && onCollapsedToggle) {
-      const { collapsible, onClick } = this.props;
-
-      const collapsed =
-          collapsible
-          && onClick
-          && node.clientHeight > MAX_HEIGHT
-          && status.get('spoiler_text').length === 0;
-
-      onCollapsedToggle(collapsed);
-    }
   }
 
-  handleMouseEnter = ({ currentTarget }) => {
-    if (autoPlayGif) {
-      return;
-    }
-
-    const emojis = currentTarget.querySelectorAll('.custom-emoji');
-
-    for (var i = 0; i < emojis.length; i++) {
-      let emoji = emojis[i];
-      emoji.src = emoji.getAttribute('data-original');
-    }
-  };
-
-  handleMouseLeave = ({ currentTarget }) => {
-    if (autoPlayGif) {
-      return;
-    }
-
-    const emojis = currentTarget.querySelectorAll('.custom-emoji');
-
-    for (var i = 0; i < emojis.length; i++) {
-      let emoji = emojis[i];
-      emoji.src = emoji.getAttribute('data-static');
-    }
-  };
-
   componentDidMount () {
     this._updateStatusLinks();
   }
@@ -220,6 +204,27 @@ class StatusContent extends PureComponent {
     this.node = c;
   };
 
+  handleElement = (element, { key, ...props }, children) => {
+    if (element instanceof HTMLAnchorElement) {
+      const mention = this.props.status.get('mentions').find(item => element.href === item.get('url'));
+      return (
+        <HandledLink
+          {...props}
+          href={element.href}
+          text={element.innerText}
+          hashtagAccountId={this.props.status.getIn(['account', 'id'])}
+          mention={mention?.toJSON()}
+          key={key}
+        >
+          {children}
+        </HandledLink>
+      );
+    } else if (element instanceof HTMLParagraphElement && element.classList.contains('quote-inline')) {
+      return null;
+    }
+    return undefined;
+  }
+
   render () {
     const { status, intl, statusContent } = this.props;
 
@@ -228,7 +233,7 @@ class StatusContent extends PureComponent {
     const targetLanguages = this.props.languages?.get(status.get('language') || 'und');
     const renderTranslate = this.props.onTranslate && this.props.identity.signedIn && ['public', 'unlisted'].includes(status.get('visibility')) && status.get('search_index').trim().length > 0 && targetLanguages?.includes(contentLocale);
 
-    const content = { __html: statusContent ?? getStatusContent(status) };
+    const content = statusContent ?? getStatusContent(status);
     const language = status.getIn(['translation', 'language']) || status.get('language');
     const classNames = classnames('status__content', {
       'status__content--with-action': this.props.onClick && this.props.history,
@@ -252,8 +257,20 @@ class StatusContent extends PureComponent {
     if (this.props.onClick) {
       return (
         <>
-          <div className={classNames} ref={this.setRef} onMouseDown={this.handleMouseDown} onMouseUp={this.handleMouseUp} key='status-content' onMouseEnter={this.handleMouseEnter} onMouseLeave={this.handleMouseLeave}>
-            <div className='status__content__text status__content__text--visible translate' lang={language} dangerouslySetInnerHTML={content} />
+          <div
+            className={classNames}
+            ref={this.setRef}
+            onMouseDown={this.handleMouseDown}
+            onMouseUp={this.handleMouseUp}
+            key='status-content'
+          >
+            <EmojiHTML
+              className='status__content__text status__content__text--visible translate'
+              lang={language}
+              htmlString={content}
+              extraEmojis={status.get('emojis')}
+              onElement={this.handleElement.bind(this)}
+            />
 
             {poll}
             {translateButton}
@@ -264,8 +281,14 @@ class StatusContent extends PureComponent {
       );
     } else {
       return (
-        <div className={classNames} ref={this.setRef} onMouseEnter={this.handleMouseEnter} onMouseLeave={this.handleMouseLeave}>
-          <div className='status__content__text status__content__text--visible translate' lang={language} dangerouslySetInnerHTML={content} />
+        <div className={classNames} ref={this.setRef}>
+          <EmojiHTML
+            className='status__content__text status__content__text--visible translate'
+            lang={language}
+            htmlString={content}
+            extraEmojis={status.get('emojis')}
+            onElement={this.handleElement.bind(this)}
+          />
 
           {poll}
           {translateButton}
diff --git a/app/javascript/mastodon/components/status_list.jsx b/app/javascript/mastodon/components/status_list.jsx
index 390659e9b6a..cb2a7464cb0 100644
--- a/app/javascript/mastodon/components/status_list.jsx
+++ b/app/javascript/mastodon/components/status_list.jsx
@@ -14,6 +14,7 @@ import { StatusQuoteManager } from '../components/status_quoted';
 import { LoadGap } from './load_gap';
 import ScrollableList from './scrollable_list';
 
+
 export default class StatusList extends ImmutablePureComponent {
 
   static propTypes = {
@@ -40,47 +41,11 @@ export default class StatusList extends ImmutablePureComponent {
     trackScroll: true,
   };
 
-  getFeaturedStatusCount = () => {
-    return this.props.featuredStatusIds ? this.props.featuredStatusIds.size : 0;
-  };
-
-  getCurrentStatusIndex = (id, featured) => {
-    if (featured) {
-      return this.props.featuredStatusIds.indexOf(id);
-    } else {
-      return this.props.statusIds.indexOf(id) + this.getFeaturedStatusCount();
-    }
-  };
-
-  handleMoveUp = (id, featured) => {
-    const elementIndex = this.getCurrentStatusIndex(id, featured) - 1;
-    this._selectChild(elementIndex, true);
-  };
-
-  handleMoveDown = (id, featured) => {
-    const elementIndex = this.getCurrentStatusIndex(id, featured) + 1;
-    this._selectChild(elementIndex, false);
-  };
-
   handleLoadOlder = debounce(() => {
     const { statusIds, lastId, onLoadMore } = this.props;
     onLoadMore(lastId || (statusIds.size > 0 ? statusIds.last() : undefined));
   }, 300, { leading: true });
 
-  _selectChild (index, align_top) {
-    const container = this.node.node;
-    const element = container.querySelector(`article:nth-of-type(${index + 1}) .focusable`);
-
-    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();
-    }
-  }
-
   setRef = c => {
     this.node = c;
   };
@@ -116,8 +81,6 @@ export default class StatusList extends ImmutablePureComponent {
             <StatusQuoteManager
               key={statusId}
               id={statusId}
-              onMoveUp={this.handleMoveUp}
-              onMoveDown={this.handleMoveDown}
               contextType={timelineId}
               scrollKey={this.props.scrollKey}
               showThread
@@ -134,8 +97,6 @@ export default class StatusList extends ImmutablePureComponent {
           key={`f-${statusId}`}
           id={statusId}
           featured
-          onMoveUp={this.handleMoveUp}
-          onMoveDown={this.handleMoveDown}
           contextType={timelineId}
           showThread
           withCounters={this.props.withCounters}
@@ -149,5 +110,4 @@ export default class StatusList extends ImmutablePureComponent {
       </ScrollableList>
     );
   }
-
 }
diff --git a/app/javascript/mastodon/components/status_quoted.tsx b/app/javascript/mastodon/components/status_quoted.tsx
index d3d8b58c33d..8c8216701a6 100644
--- a/app/javascript/mastodon/components/status_quoted.tsx
+++ b/app/javascript/mastodon/components/status_quoted.tsx
@@ -1,107 +1,154 @@
-import { useEffect, useMemo } from 'react';
+import { useCallback, useEffect, useMemo, useRef } from 'react';
 
 import { FormattedMessage } from 'react-intl';
 
-import classNames from 'classnames';
-import { Link } from 'react-router-dom';
-
 import type { Map as ImmutableMap } from 'immutable';
 
-import ArticleIcon from '@/material-icons/400-24px/article.svg?react';
-import ChevronRightIcon from '@/material-icons/400-24px/chevron_right.svg?react';
-import { Icon } from 'mastodon/components/icon';
+import { LearnMoreLink } from 'mastodon/components/learn_more_link';
 import StatusContainer from 'mastodon/containers/status_container';
+import { domain } from 'mastodon/initial_state';
+import type { Account } from 'mastodon/models/account';
 import type { Status } from 'mastodon/models/status';
 import type { RootState } from 'mastodon/store';
 import { useAppDispatch, useAppSelector } from 'mastodon/store';
 
-import QuoteIcon from '../../images/quote.svg?react';
+import { revealAccount } from '../actions/accounts_typed';
 import { fetchStatus } from '../actions/statuses';
-import { makeGetStatus } from '../selectors';
+import { makeGetStatusWithExtraInfo } from '../selectors';
+import { getAccountHidden } from '../selectors/accounts';
+
+import { Button } from './button';
 
 const MAX_QUOTE_POSTS_NESTING_LEVEL = 1;
 
-const QuoteWrapper: React.FC<{
-  isError?: boolean;
-  children: React.ReactElement;
-}> = ({ isError, children }) => {
-  return (
-    <div
-      className={classNames('status__quote', {
-        'status__quote--error': isError,
-      })}
-    >
-      <Icon id='quote' icon={QuoteIcon} className='status__quote-icon' />
-      {children}
-    </div>
-  );
-};
+const NestedQuoteLink: React.FC<{ status: Status }> = ({ status }) => {
+  const accountObjectOrId = status.get('account') as string | Account;
+  const accountId =
+    typeof accountObjectOrId === 'string'
+      ? accountObjectOrId
+      : accountObjectOrId.id;
 
-const NestedQuoteLink: React.FC<{
-  status: Status;
-}> = ({ status }) => {
-  const accountId = status.get('account') as string;
   const account = useAppSelector((state) =>
     accountId ? state.accounts.get(accountId) : undefined,
   );
 
-  const quoteAuthorName = account?.display_name_html;
+  const quoteAuthorName = account?.acct;
 
   if (!quoteAuthorName) {
     return null;
   }
 
-  const quoteAuthorElement = (
-    <span dangerouslySetInnerHTML={{ __html: quoteAuthorName }} />
-  );
-  const quoteUrl = `/@${account.get('acct')}/${status.get('id') as string}`;
-
   return (
-    <Link to={quoteUrl} className='status__quote-author-button'>
+    <div className='status__quote-author-button'>
       <FormattedMessage
         id='status.quote_post_author'
-        defaultMessage='Post by {name}'
-        values={{ name: quoteAuthorElement }}
+        defaultMessage='Quoted a post by @{name}'
+        values={{ name: quoteAuthorName }}
       />
-      <Icon id='chevron_right' icon={ChevronRightIcon} />
-      <Icon id='article' icon={ArticleIcon} />
-    </Link>
+    </div>
   );
 };
 
-type QuoteMap = ImmutableMap<'state' | 'quoted_status', string | null>;
 type GetStatusSelector = (
   state: RootState,
   props: { id?: string | null; contextType?: string },
-) => Status | null;
+) => {
+  status: Status | null;
+  loadingState: 'not-found' | 'loading' | 'filtered' | 'complete';
+};
 
-export const QuotedStatus: React.FC<{
+type QuoteMap = ImmutableMap<'state' | 'quoted_status', string | null>;
+
+const LimitedAccountHint: React.FC<{ accountId: string }> = ({ accountId }) => {
+  const dispatch = useAppDispatch();
+  const reveal = useCallback(() => {
+    dispatch(revealAccount({ id: accountId }));
+  }, [dispatch, accountId]);
+
+  return (
+    <>
+      <FormattedMessage
+        id='status.quote_error.limited_account_hint.title'
+        defaultMessage='This account has been hidden by the moderators of {domain}.'
+        values={{ domain }}
+      />
+      <button onClick={reveal} className='link-button'>
+        <FormattedMessage
+          id='status.quote_error.limited_account_hint.action'
+          defaultMessage='Show anyway'
+        />
+      </button>
+    </>
+  );
+};
+
+interface QuotedStatusProps {
   quote: QuoteMap;
   contextType?: string;
+  parentQuotePostId?: string | null;
   variant?: 'full' | 'link';
   nestingLevel?: number;
-}> = ({ quote, contextType, nestingLevel = 1, variant = 'full' }) => {
+  onQuoteCancel?: () => void; // Used for composer.
+}
+
+export const QuotedStatus: React.FC<QuotedStatusProps> = ({
+  quote,
+  contextType,
+  parentQuotePostId,
+  nestingLevel = 1,
+  variant = 'full',
+  onQuoteCancel,
+}) => {
   const dispatch = useAppDispatch();
-  const quotedStatusId = quote.get('quoted_status');
-  const quoteState = quote.get('state');
-  const status = useAppSelector((state) =>
-    quotedStatusId ? state.statuses.get(quotedStatusId) : undefined,
+  const quoteState = useAppSelector((state) =>
+    parentQuotePostId
+      ? state.statuses.getIn([parentQuotePostId, 'quote', 'state'])
+      : quote.get('state'),
   );
 
+  const quotedStatusId = quote.get('quoted_status');
+  const getStatusSelector = useMemo(
+    () => makeGetStatusWithExtraInfo() as GetStatusSelector,
+    [],
+  );
+  const { status, loadingState } = useAppSelector((state) =>
+    getStatusSelector(state, { id: quotedStatusId, contextType }),
+  );
+
+  const accountId: string | null = status?.get('account')
+    ? (status.get('account') as Account).id
+    : null;
+  const hiddenAccount = useAppSelector(
+    (state) => accountId && getAccountHidden(state, accountId),
+  );
+
+  const shouldFetchQuote =
+    !status?.get('isLoading') &&
+    quoteState !== 'deleted' &&
+    loadingState === 'not-found';
+  const isLoaded = loadingState === 'complete';
+
+  const isFetchingQuoteRef = useRef(false);
+
   useEffect(() => {
-    if (!status && quotedStatusId) {
-      dispatch(fetchStatus(quotedStatusId));
+    if (isLoaded) {
+      isFetchingQuoteRef.current = false;
     }
-  }, [status, quotedStatusId, dispatch]);
+  }, [isLoaded]);
 
-  // In order to find out whether the quoted post should be completely hidden
-  // due to a matching filter, we run it through the selector used by `status_container`.
-  // If this returns null even though `status` exists, it's because it's filtered.
-  const getStatus = useMemo(() => makeGetStatus(), []) as GetStatusSelector;
-  const statusWithExtraData = useAppSelector((state) =>
-    getStatus(state, { id: quotedStatusId, contextType }),
-  );
-  const isFilteredAndHidden = status && statusWithExtraData === null;
+  useEffect(() => {
+    if (shouldFetchQuote && quotedStatusId && !isFetchingQuoteRef.current) {
+      dispatch(
+        fetchStatus(quotedStatusId, {
+          parentQuotePostId,
+          alsoFetchContext: false,
+        }),
+      );
+      isFetchingQuoteRef.current = true;
+    }
+  }, [shouldFetchQuote, quotedStatusId, parentQuotePostId, dispatch]);
+
+  const isFilteredAndHidden = loadingState === 'filtered';
 
   let quoteError: React.ReactNode = null;
 
@@ -112,45 +159,64 @@ export const QuotedStatus: React.FC<{
         defaultMessage='Hidden due to one of your filters'
       />
     );
-  } else if (quoteState === 'deleted') {
-    quoteError = (
-      <FormattedMessage
-        id='status.quote_error.removed'
-        defaultMessage='This post was removed by its author.'
-      />
-    );
-  } else if (quoteState === 'unauthorized') {
-    quoteError = (
-      <FormattedMessage
-        id='status.quote_error.unauthorized'
-        defaultMessage='This post cannot be displayed as you are not authorized to view it.'
-      />
-    );
   } else if (quoteState === 'pending') {
     quoteError = (
-      <FormattedMessage
-        id='status.quote_error.pending_approval'
-        defaultMessage='This post is pending approval from the original author.'
-      />
+      <>
+        <FormattedMessage
+          id='status.quote_error.pending_approval'
+          defaultMessage='Post pending'
+        />
+
+        <LearnMoreLink>
+          <p>
+            <FormattedMessage
+              id='status.quote_error.pending_approval_popout.body'
+              defaultMessage="On Mastodon, you can control whether someone can quote you. This post is pending while we're getting the original author's approval."
+            />
+          </p>
+        </LearnMoreLink>
+      </>
     );
-  } else if (quoteState === 'rejected' || quoteState === 'revoked') {
+  } else if (quoteState === 'revoked') {
     quoteError = (
       <FormattedMessage
-        id='status.quote_error.rejected'
-        defaultMessage='This post cannot be displayed as the original author does not allow it to be quoted.'
+        id='status.quote_error.revoked'
+        defaultMessage='Post removed by author'
       />
     );
-  } else if (!status || !quotedStatusId) {
+  } else if (
+    !status ||
+    !quotedStatusId ||
+    quoteState === 'deleted' ||
+    quoteState === 'rejected' ||
+    quoteState === 'unauthorized'
+  ) {
     quoteError = (
       <FormattedMessage
-        id='status.quote_error.not_found'
-        defaultMessage='This post cannot be displayed.'
+        id='status.quote_error.not_available'
+        defaultMessage='Post unavailable'
       />
     );
+  } else if (hiddenAccount && accountId) {
+    quoteError = <LimitedAccountHint accountId={accountId} />;
   }
 
   if (quoteError) {
-    return <QuoteWrapper isError>{quoteError}</QuoteWrapper>;
+    const hasRemoveButton = contextType === 'composer' && !!onQuoteCancel;
+
+    return (
+      <div className='status__quote status__quote--error'>
+        {quoteError}
+        {hasRemoveButton && (
+          <Button compact plain onClick={onQuoteCancel}>
+            <FormattedMessage
+              id='status.remove_quote'
+              defaultMessage='Remove'
+            />
+          </Button>
+        )}
+      </div>
+    );
   }
 
   if (variant === 'link' && status) {
@@ -162,17 +228,19 @@ export const QuotedStatus: React.FC<{
     childQuote && nestingLevel <= MAX_QUOTE_POSTS_NESTING_LEVEL;
 
   return (
-    <QuoteWrapper>
+    <div className='status__quote'>
       {/* @ts-expect-error Status is not yet typed */}
       <StatusContainer
         isQuotedPost
         id={quotedStatusId}
         contextType={contextType}
-        avatarSize={40}
+        avatarSize={32}
+        onQuoteCancel={onQuoteCancel}
       >
         {canRenderChildQuote && (
           <QuotedStatus
             quote={childQuote}
+            parentQuotePostId={quotedStatusId}
             contextType={contextType}
             variant={
               nestingLevel === MAX_QUOTE_POSTS_NESTING_LEVEL ? 'link' : 'full'
@@ -181,7 +249,7 @@ export const QuotedStatus: React.FC<{
           />
         )}
       </StatusContainer>
-    </QuoteWrapper>
+    </div>
   );
 };
 
@@ -208,7 +276,11 @@ export const StatusQuoteManager = (props: StatusQuoteManagerProps) => {
   if (quote) {
     return (
       <StatusContainer {...props}>
-        <QuotedStatus quote={quote} contextType={props.contextType} />
+        <QuotedStatus
+          quote={quote}
+          parentQuotePostId={status?.get('id') as string}
+          contextType={props.contextType}
+        />
       </StatusContainer>
     );
   }
diff --git a/app/javascript/mastodon/components/status_thread_label.tsx b/app/javascript/mastodon/components/status_thread_label.tsx
index b18aca6dcbe..e1fc3b8cdac 100644
--- a/app/javascript/mastodon/components/status_thread_label.tsx
+++ b/app/javascript/mastodon/components/status_thread_label.tsx
@@ -2,9 +2,10 @@ import { FormattedMessage } from 'react-intl';
 
 import ReplyIcon from '@/material-icons/400-24px/reply.svg?react';
 import { Icon } from 'mastodon/components/icon';
-import { DisplayedName } from 'mastodon/features/notifications_v2/components/displayed_name';
 import { useAppSelector } from 'mastodon/store';
 
+import { LinkedDisplayName } from './display_name';
+
 export const StatusThreadLabel: React.FC<{
   accountId: string;
   inReplyToAccountId: string;
@@ -27,7 +28,13 @@ export const StatusThreadLabel: React.FC<{
       <FormattedMessage
         id='status.replied_to'
         defaultMessage='Replied to {name}'
-        values={{ name: <DisplayedName accountIds={[inReplyToAccountId]} /> }}
+        values={{
+          name: (
+            <LinkedDisplayName
+              displayProps={{ account: inReplyToAccount, variant: 'simple' }}
+            />
+          ),
+        }}
       />
     );
   } else {
diff --git a/app/javascript/mastodon/components/verified_badge.tsx b/app/javascript/mastodon/components/verified_badge.tsx
index 626cc500d6a..43edbc79518 100644
--- a/app/javascript/mastodon/components/verified_badge.tsx
+++ b/app/javascript/mastodon/components/verified_badge.tsx
@@ -1,10 +1,17 @@
+import { EmojiHTML } from '@/mastodon/components/emoji/html';
 import CheckIcon from '@/material-icons/400-24px/check.svg?react';
 
+import { isModernEmojiEnabled } from '../utils/environment';
+import type { OnAttributeHandler } from '../utils/html';
+
 import { Icon } from './icon';
 
 const domParser = new DOMParser();
 
 const stripRelMe = (html: string) => {
+  if (isModernEmojiEnabled()) {
+    return html;
+  }
   const document = domParser.parseFromString(html, 'text/html').documentElement;
 
   document.querySelectorAll<HTMLAnchorElement>('a[rel]').forEach((link) => {
@@ -15,7 +22,23 @@ const stripRelMe = (html: string) => {
   });
 
   const body = document.querySelector('body');
-  return body ? { __html: body.innerHTML } : undefined;
+  return body?.innerHTML ?? '';
+};
+
+const onAttribute: OnAttributeHandler = (name, value, tagName) => {
+  if (name === 'rel' && tagName === 'a') {
+    if (value === 'me') {
+      return null;
+    }
+    return [
+      name,
+      value
+        .split(' ')
+        .filter((x) => x !== 'me')
+        .join(' '),
+    ];
+  }
+  return undefined;
 };
 
 interface Props {
@@ -24,6 +47,10 @@ interface Props {
 export const VerifiedBadge: React.FC<Props> = ({ link }) => (
   <span className='verified-badge'>
     <Icon id='check' icon={CheckIcon} className='verified-badge__mark' />
-    <span dangerouslySetInnerHTML={stripRelMe(link)} />
+    <EmojiHTML
+      as='span'
+      htmlString={stripRelMe(link)}
+      onAttribute={onAttribute}
+    />
   </span>
 );
diff --git a/app/javascript/mastodon/containers/compose_container.jsx b/app/javascript/mastodon/containers/compose_container.jsx
index a2513cc552d..3e6d20c74c4 100644
--- a/app/javascript/mastodon/containers/compose_container.jsx
+++ b/app/javascript/mastodon/containers/compose_container.jsx
@@ -5,7 +5,7 @@ import { fetchServer } from 'mastodon/actions/server';
 import { hydrateStore } from 'mastodon/actions/store';
 import { Router } from 'mastodon/components/router';
 import Compose from 'mastodon/features/standalone/compose';
-import initialState from 'mastodon/initial_state';
+import { initialState } from 'mastodon/initial_state';
 import { IntlProvider } from 'mastodon/locales';
 import { store } from 'mastodon/store';
 
diff --git a/app/javascript/mastodon/containers/mastodon.jsx b/app/javascript/mastodon/containers/mastodon.jsx
index 8dcda3b0a94..ee861366a50 100644
--- a/app/javascript/mastodon/containers/mastodon.jsx
+++ b/app/javascript/mastodon/containers/mastodon.jsx
@@ -5,7 +5,6 @@ import { Route } from 'react-router-dom';
 
 import { Provider as ReduxProvider } from 'react-redux';
 
-import { ScrollContext } from 'react-router-scroll-4';
 
 import { fetchCustomEmojis } from 'mastodon/actions/custom_emojis';
 import { hydrateStore } from 'mastodon/actions/store';
@@ -14,12 +13,14 @@ import ErrorBoundary from 'mastodon/components/error_boundary';
 import { Router } from 'mastodon/components/router';
 import UI from 'mastodon/features/ui';
 import { IdentityContext, createIdentityContext } from 'mastodon/identity_context';
-import initialState, { title as siteTitle } from 'mastodon/initial_state';
+import { initialState, title as siteTitle } from 'mastodon/initial_state';
 import { IntlProvider } from 'mastodon/locales';
 import { store } from 'mastodon/store';
 import { isProduction } from 'mastodon/utils/environment';
 import { BodyScrollLock } from 'mastodon/features/ui/components/body_scroll_lock';
 
+import { ScrollContext } from './scroll_container/scroll_context';
+
 const title = isProduction() ? siteTitle : `${siteTitle} (Dev)`;
 
 const hydrateAction = hydrateStore(initialState);
@@ -45,10 +46,6 @@ export default class Mastodon extends PureComponent {
     }
   }
 
-  shouldUpdateScroll (prevRouterProps, { location }) {
-    return !(location.state?.mastodonModalKey && location.state?.mastodonModalKey !== prevRouterProps?.location?.state?.mastodonModalKey);
-  }
-
   render () {
     return (
       <IdentityContext.Provider value={this.identity}>
@@ -56,7 +53,7 @@ export default class Mastodon extends PureComponent {
           <ReduxProvider store={store}>
             <ErrorBoundary>
               <Router>
-                <ScrollContext shouldUpdateScroll={this.shouldUpdateScroll}>
+                <ScrollContext>
                   <Route path='/' component={UI} />
                 </ScrollContext>
                 <BodyScrollLock />
diff --git a/app/javascript/mastodon/containers/scroll_container.js b/app/javascript/mastodon/containers/scroll_container.js
deleted file mode 100644
index d21ff63687d..00000000000
--- a/app/javascript/mastodon/containers/scroll_container.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import { ScrollContainer as OriginalScrollContainer } from 'react-router-scroll-4';
-
-// ScrollContainer is used to automatically scroll to the top when pushing a
-// new history state and remembering the scroll position when going back.
-// There are a few things we need to do differently, though.
-const defaultShouldUpdateScroll = (prevRouterProps, { location }) => {
-  // If the change is caused by opening a modal, do not scroll to top
-  return !(location.state?.mastodonModalKey && location.state?.mastodonModalKey !== prevRouterProps?.location?.state?.mastodonModalKey);
-};
-
-export default
-class ScrollContainer extends OriginalScrollContainer {
-
-  static defaultProps = {
-    shouldUpdateScroll: defaultShouldUpdateScroll,
-  };
-
-}
diff --git a/app/javascript/mastodon/containers/scroll_container/default_should_update_scroll.tsx b/app/javascript/mastodon/containers/scroll_container/default_should_update_scroll.tsx
new file mode 100644
index 00000000000..b8726a1a751
--- /dev/null
+++ b/app/javascript/mastodon/containers/scroll_container/default_should_update_scroll.tsx
@@ -0,0 +1,25 @@
+import type { MastodonLocation } from 'mastodon/components/router';
+
+export type ShouldUpdateScrollFn = (
+  prevLocationContext: MastodonLocation | null,
+  locationContext: MastodonLocation,
+) => boolean;
+
+/**
+ * ScrollBehavior will automatically scroll to the top on navigations
+ * or restore saved scroll positions, but on some location changes we
+ * need to prevent this.
+ */
+
+export const defaultShouldUpdateScroll: ShouldUpdateScrollFn = (
+  prevLocation,
+  location,
+) => {
+  // If the change is caused by opening a modal, do not scroll to top
+  const shouldUpdateScroll = !(
+    location.state?.mastodonModalKey &&
+    location.state.mastodonModalKey !== prevLocation?.state?.mastodonModalKey
+  );
+
+  return shouldUpdateScroll;
+};
diff --git a/app/javascript/mastodon/containers/scroll_container/index.tsx b/app/javascript/mastodon/containers/scroll_container/index.tsx
new file mode 100644
index 00000000000..0d0ab364dc0
--- /dev/null
+++ b/app/javascript/mastodon/containers/scroll_container/index.tsx
@@ -0,0 +1,76 @@
+import React, {
+  useContext,
+  useEffect,
+  useImperativeHandle,
+  useRef,
+} from 'react';
+
+import { defaultShouldUpdateScroll } from './default_should_update_scroll';
+import type { ShouldUpdateScrollFn } from './default_should_update_scroll';
+import { ScrollBehaviorContext } from './scroll_context';
+
+interface ScrollContainerProps {
+  /**
+   * This key must be static for the element & not change
+   * while the component is mounted.
+   */
+  scrollKey: string;
+  shouldUpdateScroll?: ShouldUpdateScrollFn;
+  childRef?: React.ForwardedRef<HTMLElement | undefined>;
+  children: React.ReactElement;
+}
+
+/**
+ * `ScrollContainer` is used to manage the scroll position of elements on the page
+ * that can be scrolled independently of the page body.
+ * This component is a port of the unmaintained https://github.com/ytase/react-router-scroll/
+ */
+
+export const ScrollContainer: React.FC<ScrollContainerProps> = ({
+  children,
+  scrollKey,
+  childRef,
+  shouldUpdateScroll = defaultShouldUpdateScroll,
+}) => {
+  const scrollBehaviorContext = useContext(ScrollBehaviorContext);
+
+  const containerRef = useRef<HTMLElement>();
+
+  /**
+   * If a childRef is passed, sync it with the containerRef. This
+   * is necessary because in this component's return statement,
+   * we're overwriting the immediate child component's ref prop.
+   */
+  useImperativeHandle(childRef, () => containerRef.current, []);
+
+  /**
+   * Register/unregister scrollable element with ScrollBehavior
+   */
+  useEffect(() => {
+    if (!scrollBehaviorContext || !containerRef.current) {
+      return;
+    }
+
+    scrollBehaviorContext.registerElement(
+      scrollKey,
+      containerRef.current,
+      (prevLocation, location) => {
+        // Hack to allow accessing scrollBehavior._stateStorage
+        return shouldUpdateScroll.call(
+          scrollBehaviorContext.scrollBehavior,
+          prevLocation,
+          location,
+        );
+      },
+    );
+
+    return () => {
+      scrollBehaviorContext.unregisterElement(scrollKey);
+    };
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+
+  return React.Children.only(
+    React.cloneElement(children, { ref: containerRef }),
+  );
+};
diff --git a/app/javascript/mastodon/containers/scroll_container/scroll_context.tsx b/app/javascript/mastodon/containers/scroll_container/scroll_context.tsx
new file mode 100644
index 00000000000..a7eb7808003
--- /dev/null
+++ b/app/javascript/mastodon/containers/scroll_container/scroll_context.tsx
@@ -0,0 +1,141 @@
+import React, { useEffect, useMemo, useRef, useState } from 'react';
+
+import { useLocation, useHistory } from 'react-router-dom';
+
+import type { LocationBase } from 'scroll-behavior';
+import ScrollBehavior from 'scroll-behavior';
+
+import type {
+  LocationState,
+  MastodonLocation,
+} from 'mastodon/components/router';
+import { usePrevious } from 'mastodon/hooks/usePrevious';
+
+import { defaultShouldUpdateScroll } from './default_should_update_scroll';
+import type { ShouldUpdateScrollFn } from './default_should_update_scroll';
+import { SessionStorage } from './state_storage';
+
+type ScrollBehaviorInstance = InstanceType<
+  typeof ScrollBehavior<LocationBase, MastodonLocation>
+>;
+
+export interface ScrollBehaviorContextType {
+  registerElement: (
+    key: string,
+    element: HTMLElement,
+    shouldUpdateScroll: (
+      prevLocationContext: MastodonLocation | null,
+      locationContext: MastodonLocation,
+    ) => boolean,
+  ) => void;
+  unregisterElement: (key: string) => void;
+  scrollBehavior?: ScrollBehaviorInstance;
+}
+
+export const ScrollBehaviorContext =
+  React.createContext<ScrollBehaviorContextType | null>(null);
+
+interface ScrollContextProps {
+  shouldUpdateScroll?: ShouldUpdateScrollFn;
+  children: React.ReactElement;
+}
+
+/**
+ * A top-level wrapper that provides the app with an instance of the
+ * ScrollBehavior object. scroll-behavior is a library for managing the
+ * scroll position of a single-page app in the same way the browser would
+ * normally do for a multi-page app. This means it'll scroll back to top
+ * when navigating to a new page, and will restore the scroll position
+ * when navigating e.g. using `history.back`.
+ * The library keeps a record of scroll positions in session storage.
+ *
+ * This component is a port of the unmaintained https://github.com/ytase/react-router-scroll/
+ */
+
+export const ScrollContext: React.FC<ScrollContextProps> = ({
+  children,
+  shouldUpdateScroll = defaultShouldUpdateScroll,
+}) => {
+  const location = useLocation<LocationState>();
+  const history = useHistory<LocationState>();
+
+  /**
+   * Keep the current location in a mutable ref so that ScrollBehavior's
+   * `getCurrentLocation` can access it without having to recreate the
+   * whole ScrollBehavior object
+   */
+  const currentLocationRef = useRef(location);
+  useEffect(() => {
+    currentLocationRef.current = location;
+  }, [location]);
+
+  /**
+   * Initialise ScrollBehavior object once – using state rather
+   * than a ref to simplify the types and ensure it's defined immediately.
+   */
+  const [scrollBehavior] = useState(
+    (): ScrollBehaviorInstance =>
+      new ScrollBehavior({
+        addNavigationListener: history.listen.bind(history),
+        stateStorage: new SessionStorage(),
+        getCurrentLocation: () =>
+          currentLocationRef.current as unknown as LocationBase,
+        shouldUpdateScroll: (
+          prevLocationContext: MastodonLocation | null,
+          locationContext: MastodonLocation,
+        ) =>
+          // Hack to allow accessing scrollBehavior._stateStorage
+          shouldUpdateScroll.call(
+            scrollBehavior,
+            prevLocationContext,
+            locationContext,
+          ),
+      }),
+  );
+
+  /**
+   * Handle scroll update when location changes
+   */
+  const prevLocation = usePrevious(location) ?? null;
+  useEffect(() => {
+    scrollBehavior.updateScroll(prevLocation, location);
+  }, [location, prevLocation, scrollBehavior]);
+
+  /**
+   * Stop Scrollbehavior on unmount
+   */
+  useEffect(() => {
+    return () => {
+      scrollBehavior.stop();
+    };
+  }, [scrollBehavior]);
+
+  /**
+   * Provide the app with a way to register separately scrollable
+   * elements to also be tracked by ScrollBehavior. (By default
+   * ScrollBehavior only handles scrolling on the main document body.)
+   */
+  const contextValue = useMemo<ScrollBehaviorContextType>(
+    () => ({
+      registerElement: (key, element, shouldUpdateScroll) => {
+        scrollBehavior.registerElement(
+          key,
+          element,
+          shouldUpdateScroll,
+          location,
+        );
+      },
+      unregisterElement: (key) => {
+        scrollBehavior.unregisterElement(key);
+      },
+      scrollBehavior,
+    }),
+    [location, scrollBehavior],
+  );
+
+  return (
+    <ScrollBehaviorContext.Provider value={contextValue}>
+      {React.Children.only(children)}
+    </ScrollBehaviorContext.Provider>
+  );
+};
diff --git a/app/javascript/mastodon/containers/scroll_container/state_storage.ts b/app/javascript/mastodon/containers/scroll_container/state_storage.ts
new file mode 100644
index 00000000000..fe8a208aae4
--- /dev/null
+++ b/app/javascript/mastodon/containers/scroll_container/state_storage.ts
@@ -0,0 +1,46 @@
+import type { LocationBase, ScrollPosition } from 'scroll-behavior';
+
+const STATE_KEY_PREFIX = '@@scroll|';
+
+interface LocationBaseWithKey extends LocationBase {
+  key?: string;
+}
+
+/**
+ * This module is part of our port of https://github.com/ytase/react-router-scroll/
+ * and handles storing scroll positions in SessionStorage.
+ * Stored positions (`[x, y]`) are keyed by the location key and an optional
+ * `scrollKey` that's used for to track separately scrollable elements other
+ * than the document body.
+ */
+
+export class SessionStorage {
+  read(
+    location: LocationBaseWithKey,
+    key: string | null,
+  ): ScrollPosition | null {
+    const stateKey = this.getStateKey(location, key);
+
+    try {
+      const value = sessionStorage.getItem(stateKey);
+      return value ? (JSON.parse(value) as ScrollPosition) : null;
+    } catch {
+      return null;
+    }
+  }
+
+  save(location: LocationBaseWithKey, key: string | null, value: unknown) {
+    const stateKey = this.getStateKey(location, key);
+    const storedValue = JSON.stringify(value);
+
+    try {
+      sessionStorage.setItem(stateKey, storedValue);
+    } catch {}
+  }
+
+  getStateKey(location: LocationBaseWithKey, key: string | null) {
+    const locationKey = location.key;
+    const stateKeyBase = `${STATE_KEY_PREFIX}${locationKey}`;
+    return key == null ? stateKeyBase : `${stateKeyBase}|${key}`;
+  }
+}
diff --git a/app/javascript/mastodon/containers/status_container.jsx b/app/javascript/mastodon/containers/status_container.jsx
index 0fb5f255607..baf4157f96e 100644
--- a/app/javascript/mastodon/containers/status_container.jsx
+++ b/app/javascript/mastodon/containers/status_container.jsx
@@ -12,6 +12,7 @@ import {
   mentionCompose,
   directCompose,
 } from '../actions/compose';
+import { quoteComposeById } from '../actions/compose_typed';
 import {
   initDomainBlockModal,
   unblockDomain,
@@ -41,6 +42,7 @@ import {
   translateStatus,
   undoStatusTranslation,
 } from '../actions/statuses';
+import { setStatusQuotePolicy } from '../actions/statuses_typed';
 import Status from '../components/status';
 import { deleteModal } from '../initial_state';
 import { makeGetStatus, makeGetPictureInPicture } from '../selectors';
@@ -75,6 +77,10 @@ const mapDispatchToProps = (dispatch, { contextType }) => ({
   onReblog (status, e) {
     dispatch(toggleReblog(status.get('id'), e.shiftKey));
   },
+  
+  onQuote (status) {
+    dispatch(quoteComposeById(status.get('id')));
+  },
 
   onFavourite (status) {
     dispatch(toggleFavourite(status.get('id')));
@@ -107,10 +113,30 @@ const mapDispatchToProps = (dispatch, { contextType }) => ({
     if (!deleteModal) {
       dispatch(deleteStatus(status.get('id'), withRedraft));
     } else {
-      dispatch(openModal({ modalType: 'CONFIRM_DELETE_STATUS', modalProps: { statusId: status.get('id'), withRedraft } }));
+      dispatch(openModal({
+        modalType: 'CONFIRM_DELETE_STATUS',
+        modalProps: {
+          statusId: status.get('id'),
+          withRedraft
+        }
+      }));
     }
   },
 
+  onRevokeQuote (status) {
+    dispatch(openModal({ modalType: 'CONFIRM_REVOKE_QUOTE', modalProps: { statusId: status.get('id'), quotedStatusId: status.getIn(['quote', 'quoted_status']) }}));
+  },
+
+  onQuotePolicyChange(status) {
+    const statusId = status.get('id');
+    const handleChange = (_, quotePolicy) => {
+      dispatch(
+        setStatusQuotePolicy({ policy: quotePolicy, statusId }),
+      );
+    }
+    dispatch(openModal({ modalType: 'COMPOSE_PRIVACY', modalProps: { statusId, onChange: handleChange } }));
+  },
+
   onEdit (status) {
     dispatch((_, getState) => {
       let state = getState();
@@ -205,11 +231,10 @@ const mapDispatchToProps = (dispatch, { contextType }) => ({
     dispatch(deployPictureInPicture({statusId: status.get('id'), accountId: status.getIn(['account', 'id']), playerType: type, props: mediaProps}));
   },
 
-  onInteractionModal (type, status) {
+  onInteractionModal (status) {
     dispatch(openModal({
       modalType: 'INTERACTION',
       modalProps: {
-        type,
         accountId: status.getIn(['account', 'id']),
         url: status.get('uri'),
       },
diff --git a/app/javascript/mastodon/features/account/components/follow_request_note.jsx b/app/javascript/mastodon/features/account/components/follow_request_note.jsx
index d57fd030b2d..9c20f1e0626 100644
--- a/app/javascript/mastodon/features/account/components/follow_request_note.jsx
+++ b/app/javascript/mastodon/features/account/components/follow_request_note.jsx
@@ -6,6 +6,7 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
 import CheckIcon from '@/material-icons/400-24px/check.svg?react';
 import CloseIcon from '@/material-icons/400-24px/close.svg?react';
 import { Icon }  from 'mastodon/components/icon';
+import { DisplayName } from '@/mastodon/components/display_name';
 
 export default class FollowRequestNote extends ImmutablePureComponent {
 
@@ -19,7 +20,7 @@ export default class FollowRequestNote extends ImmutablePureComponent {
     return (
       <div className='follow-request-banner'>
         <div className='follow-request-banner__message'>
-          <FormattedMessage id='account.requested_follow' defaultMessage='{name} has requested to follow you' values={{ name: <bdi><strong dangerouslySetInnerHTML={{ __html: account.get('display_name_html') }} /></bdi> }} />
+          <FormattedMessage id='account.requested_follow' defaultMessage='{name} has requested to follow you' values={{ name: <DisplayName account={account} variant='simple' /> }} />
         </div>
 
         <div className='follow-request-banner__action'>
diff --git a/app/javascript/mastodon/features/account_timeline/components/account_header.tsx b/app/javascript/mastodon/features/account_timeline/components/account_header.tsx
index 30433151c6f..2bf636d060d 100644
--- a/app/javascript/mastodon/features/account_timeline/components/account_header.tsx
+++ b/app/javascript/mastodon/features/account_timeline/components/account_header.tsx
@@ -6,7 +6,10 @@ import classNames from 'classnames';
 import { Helmet } from 'react-helmet';
 import { NavLink } from 'react-router-dom';
 
-import CheckIcon from '@/material-icons/400-24px/check.svg?react';
+import { AccountBio } from '@/mastodon/components/account_bio';
+import { AccountFields } from '@/mastodon/components/account_fields';
+import { DisplayName } from '@/mastodon/components/display_name';
+import { AnimateEmojiProvider } from '@/mastodon/components/emoji/context';
 import LockIcon from '@/material-icons/400-24px/lock.svg?react';
 import MoreHorizIcon from '@/material-icons/400-24px/more_horiz.svg?react';
 import NotificationsIcon from '@/material-icons/400-24px/notifications.svg?react';
@@ -31,7 +34,6 @@ import { initMuteModal } from 'mastodon/actions/mutes';
 import { initReport } from 'mastodon/actions/reports';
 import { Avatar } from 'mastodon/components/avatar';
 import { Badge, AutomatedBadge, GroupBadge } from 'mastodon/components/badge';
-import { Button } from 'mastodon/components/button';
 import { CopyIconButton } from 'mastodon/components/copy_icon_button';
 import {
   FollowersCounter,
@@ -184,14 +186,6 @@ const titleFromAccount = (account: Account) => {
   return `${prefix} (@${acct})`;
 };
 
-const dateFormatOptions: Intl.DateTimeFormatOptions = {
-  month: 'short',
-  day: 'numeric',
-  year: 'numeric',
-  hour: '2-digit',
-  minute: '2-digit',
-};
-
 export const AccountHeader: React.FC<{
   accountId: string;
   hideTabs?: boolean;
@@ -377,41 +371,11 @@ export const AccountHeader: React.FC<{
     });
   }, [account]);
 
-  const handleMouseEnter = useCallback(
-    ({ currentTarget }: React.MouseEvent) => {
-      if (autoPlayGif) {
-        return;
-      }
-
-      currentTarget
-        .querySelectorAll<HTMLImageElement>('.custom-emoji')
-        .forEach((emoji) => {
-          emoji.src = emoji.getAttribute('data-original') ?? '';
-        });
-    },
-    [],
-  );
-
-  const handleMouseLeave = useCallback(
-    ({ currentTarget }: React.MouseEvent) => {
-      if (autoPlayGif) {
-        return;
-      }
-
-      currentTarget
-        .querySelectorAll<HTMLImageElement>('.custom-emoji')
-        .forEach((emoji) => {
-          emoji.src = emoji.getAttribute('data-static') ?? '';
-        });
-    },
-    [],
-  );
-
   const suspended = account?.suspended;
   const isRemote = account?.acct !== account?.username;
   const remoteDomain = isRemote ? account?.acct.split('@')[1] : null;
 
-  const menu = useMemo(() => {
+  const menuItems = useMemo(() => {
     const arr: MenuItem[] = [];
 
     if (!account) {
@@ -633,6 +597,15 @@ export const AccountHeader: React.FC<{
     handleUnblockDomain,
   ]);
 
+  const menu = accountId !== me && (
+    <Dropdown
+      disabled={menuItems.length === 0}
+      items={menuItems}
+      icon='ellipsis-v'
+      iconComponent={MoreHorizIcon}
+    />
+  );
+
   if (!account) {
     return null;
   }
@@ -746,21 +719,16 @@ export const AccountHeader: React.FC<{
     );
   }
 
-  if (relationship?.blocking) {
+  const isMovedAndUnfollowedAccount = account.moved && !relationship?.following;
+
+  if (!isMovedAndUnfollowedAccount) {
     actionBtn = (
-      <Button
-        text={intl.formatMessage(messages.unblock, {
-          name: account.username,
-        })}
-        onClick={handleBlock}
+      <FollowButton
+        accountId={accountId}
+        className='account__header__follow-button'
+        labelLength='long'
       />
     );
-  } else {
-    actionBtn = <FollowButton accountId={accountId} />;
-  }
-
-  if (account.moved && !relationship?.following) {
-    actionBtn = '';
   }
 
   if (account.locked) {
@@ -773,8 +741,6 @@ export const AccountHeader: React.FC<{
     );
   }
 
-  const content = { __html: account.note_emojified };
-  const displayNameHtml = { __html: account.display_name_html };
   const fields = account.fields;
   const isLocal = !account.acct.includes('@');
   const username = account.acct.split('@')[0];
@@ -807,12 +773,10 @@ export const AccountHeader: React.FC<{
         <MovedNote accountId={account.id} targetAccountId={account.moved} />
       )}
 
-      <div
+      <AnimateEmojiProvider
         className={classNames('account__header', {
           inactive: !!account.moved,
         })}
-        onMouseEnter={handleMouseEnter}
-        onMouseLeave={handleMouseLeave}
       >
         {!(suspended || hidden || account.moved) &&
           relationship?.requested_by && (
@@ -846,24 +810,17 @@ export const AccountHeader: React.FC<{
               />
             </a>
 
-            <div className='account__header__tabs__buttons'>
+            <div className='account__header__buttons account__header__buttons--desktop'>
+              {!hidden && actionBtn}
               {!hidden && bellBtn}
               {!hidden && shareBtn}
-              {accountId !== me && (
-                <Dropdown
-                  disabled={menu.length === 0}
-                  items={menu}
-                  icon='ellipsis-v'
-                  iconComponent={MoreHorizIcon}
-                />
-              )}
-              {!hidden && actionBtn}
+              {menu}
             </div>
           </div>
 
           <div className='account__header__tabs__name'>
             <h1>
-              <span dangerouslySetInnerHTML={displayNameHtml} />
+              <DisplayName account={account} variant='simple' />
               <small>
                 <span>
                   @{username}
@@ -887,6 +844,12 @@ export const AccountHeader: React.FC<{
             <FamiliarFollowers accountId={accountId} />
           )}
 
+          <div className='account__header__buttons account__header__buttons--mobile'>
+            {!hidden && actionBtn}
+            {!hidden && bellBtn}
+            {menu}
+          </div>
+
           {!(suspended || hidden) && (
             <div className='account__header__extra'>
               <div
@@ -897,12 +860,10 @@ export const AccountHeader: React.FC<{
                   <AccountNote accountId={accountId} />
                 )}
 
-                {account.note.length > 0 && account.note !== '<p></p>' && (
-                  <div
-                    className='account__header__content translate'
-                    dangerouslySetInnerHTML={content}
-                  />
-                )}
+                <AccountBio
+                  accountId={accountId}
+                  className='account__header__content'
+                />
 
                 <div className='account__header__fields'>
                   <dl>
@@ -922,46 +883,7 @@ export const AccountHeader: React.FC<{
                     </dd>
                   </dl>
 
-                  {fields.map((pair, i) => (
-                    <dl
-                      key={i}
-                      className={classNames({
-                        verified: pair.verified_at,
-                      })}
-                    >
-                      <dt
-                        dangerouslySetInnerHTML={{
-                          __html: pair.name_emojified,
-                        }}
-                        title={pair.name}
-                        className='translate'
-                      />
-
-                      <dd className='translate' title={pair.value_plain ?? ''}>
-                        {pair.verified_at && (
-                          <span
-                            title={intl.formatMessage(messages.linkVerifiedOn, {
-                              date: intl.formatDate(
-                                pair.verified_at,
-                                dateFormatOptions,
-                              ),
-                            })}
-                          >
-                            <Icon
-                              id='check'
-                              icon={CheckIcon}
-                              className='verified__mark'
-                            />
-                          </span>
-                        )}{' '}
-                        <span
-                          dangerouslySetInnerHTML={{
-                            __html: pair.value_emojified,
-                          }}
-                        />
-                      </dd>
-                    </dl>
-                  ))}
+                  <AccountFields fields={fields} emojis={account.emojis} />
                 </div>
               </div>
 
@@ -1001,7 +923,7 @@ export const AccountHeader: React.FC<{
             </div>
           )}
         </div>
-      </div>
+      </AnimateEmojiProvider>
 
       {!(hideTabs || hidden) && (
         <div className='account__section-headline'>
diff --git a/app/javascript/mastodon/features/account_timeline/components/familiar_followers.tsx b/app/javascript/mastodon/features/account_timeline/components/familiar_followers.tsx
index 41bd8ab4ba8..cc6434c6ee6 100644
--- a/app/javascript/mastodon/features/account_timeline/components/familiar_followers.tsx
+++ b/app/javascript/mastodon/features/account_timeline/components/familiar_followers.tsx
@@ -1,33 +1,26 @@
 import { FormattedMessage } from 'react-intl';
 
-import { Link } from 'react-router-dom';
-
 import { Avatar } from '@/mastodon/components/avatar';
 import { AvatarGroup } from '@/mastodon/components/avatar_group';
+import { LinkedDisplayName } from '@/mastodon/components/display_name';
 import type { Account } from '@/mastodon/models/account';
 
 import { useFetchFamiliarFollowers } from '../hooks/familiar_followers';
 
-const AccountLink: React.FC<{ account?: Account }> = ({ account }) => {
-  if (!account) {
-    return null;
-  }
-
-  return (
-    <Link
-      to={`/@${account.acct}`}
-      data-hover-card-account={account.id}
-      dangerouslySetInnerHTML={{ __html: account.display_name_html }}
-    />
-  );
-};
-
 const FamiliarFollowersReadout: React.FC<{ familiarFollowers: Account[] }> = ({
   familiarFollowers,
 }) => {
   const messageData = {
-    name1: <AccountLink account={familiarFollowers.at(0)} />,
-    name2: <AccountLink account={familiarFollowers.at(1)} />,
+    name1: (
+      <LinkedDisplayName
+        displayProps={{ account: familiarFollowers.at(0), variant: 'simple' }}
+      />
+    ),
+    name2: (
+      <LinkedDisplayName
+        displayProps={{ account: familiarFollowers.at(1), variant: 'simple' }}
+      />
+    ),
     othersCount: familiarFollowers.length - 2,
   };
 
diff --git a/app/javascript/mastodon/features/account_timeline/components/moved_note.tsx b/app/javascript/mastodon/features/account_timeline/components/moved_note.tsx
index 51dbb93c8b6..f2457dedd74 100644
--- a/app/javascript/mastodon/features/account_timeline/components/moved_note.tsx
+++ b/app/javascript/mastodon/features/account_timeline/components/moved_note.tsx
@@ -2,8 +2,8 @@ import { FormattedMessage } from 'react-intl';
 
 import { Link } from 'react-router-dom';
 
+import { DisplayName } from '@/mastodon/components/display_name';
 import { AvatarOverlay } from 'mastodon/components/avatar_overlay';
-import { DisplayName } from 'mastodon/components/display_name';
 import { useAppSelector } from 'mastodon/store';
 
 export const MovedNote: React.FC<{
@@ -20,15 +20,7 @@ export const MovedNote: React.FC<{
           id='account.moved_to'
           defaultMessage='{name} has indicated that their new account is now:'
           values={{
-            name: (
-              <bdi>
-                <strong
-                  dangerouslySetInnerHTML={{
-                    __html: from?.display_name_html ?? '',
-                  }}
-                />
-              </bdi>
-            ),
+            name: <DisplayName account={from} variant='simple' />,
           }}
         />
       </div>
diff --git a/app/javascript/mastodon/features/alt_text_modal/index.tsx b/app/javascript/mastodon/features/alt_text_modal/index.tsx
index 8a91e14e312..f285c35929c 100644
--- a/app/javascript/mastodon/features/alt_text_modal/index.tsx
+++ b/app/javascript/mastodon/features/alt_text_modal/index.tsx
@@ -261,7 +261,9 @@ export const AltTextModal = forwardRef<ModalRef, Props & Partial<RestoreProps>>(
     );
     const lang = useAppSelector(
       (state) =>
-        (state.compose as ImmutableMap<string, unknown>).get('lang') as string,
+        (state.compose as ImmutableMap<string, unknown>).get(
+          'language',
+        ) as string,
     );
     const focusX =
       (media?.getIn(['meta', 'focus', 'x'], 0) as number | undefined) ?? 0;
diff --git a/app/javascript/mastodon/features/annual_report/highlighted_post.tsx b/app/javascript/mastodon/features/annual_report/highlighted_post.tsx
index 3a2a70713da..7edbb2e614f 100644
--- a/app/javascript/mastodon/features/annual_report/highlighted_post.tsx
+++ b/app/javascript/mastodon/features/annual_report/highlighted_post.tsx
@@ -6,6 +6,7 @@ import { useCallback } from 'react';
 
 import { FormattedMessage } from 'react-intl';
 
+import { DisplayName } from '@/mastodon/components/display_name';
 import { toggleStatusSpoilers } from 'mastodon/actions/statuses';
 import { DetailedStatus } from 'mastodon/features/status/components/detailed_status';
 import { me } from 'mastodon/initial_state';
@@ -79,11 +80,7 @@ export const HighlightedPost: React.FC<{
           id='annual_report.summary.highlighted_post.possessive'
           defaultMessage="{name}'s"
           values={{
-            name: account && (
-              <bdi
-                dangerouslySetInnerHTML={{ __html: account.display_name_html }}
-              />
-            ),
+            name: <DisplayName account={account} variant='simple' />,
           }}
         />
       </strong>
diff --git a/app/javascript/mastodon/features/compose/components/compose_form.jsx b/app/javascript/mastodon/features/compose/components/compose_form.jsx
index 6dd3dbd0545..ac0a4969391 100644
--- a/app/javascript/mastodon/features/compose/components/compose_form.jsx
+++ b/app/javascript/mastodon/features/compose/components/compose_form.jsx
@@ -15,10 +15,8 @@ import { missingAltTextModal } from 'mastodon/initial_state';
 import AutosuggestInput from 'mastodon/components/autosuggest_input';
 import AutosuggestTextarea from 'mastodon/components/autosuggest_textarea';
 import { Button } from 'mastodon/components/button';
-import { LoadingIndicator } from 'mastodon/components/loading_indicator';
 import EmojiPickerDropdown from '../containers/emoji_picker_dropdown_container';
 import PollButtonContainer from '../containers/poll_button_container';
-import PrivacyDropdownContainer from '../containers/privacy_dropdown_container';
 import SpoilerButtonContainer from '../containers/spoiler_button_container';
 import UploadButtonContainer from '../containers/upload_button_container';
 import { countableText } from '../util/counter';
@@ -31,6 +29,8 @@ import { PollForm } from "./poll_form";
 import { ReplyIndicator } from './reply_indicator';
 import { UploadForm } from './upload_form';
 import { Warning } from './warning';
+import { ComposeQuotedStatus } from './quoted_post';
+import { VisibilityButton } from './visibility_button';
 
 const allowedAroundShortCode = '><\u0085\u0020\u00a0\u1680\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029\u0009\u000a\u000b\u000c\u000d';
 
@@ -73,6 +73,7 @@ class ComposeForm extends ImmutablePureComponent {
     singleColumn: PropTypes.bool,
     lang: PropTypes.string,
     maxChars: PropTypes.number,
+    redirectOnSuccess: PropTypes.bool,
   };
 
   static defaultProps = {
@@ -92,10 +93,29 @@ class ComposeForm extends ImmutablePureComponent {
     this.props.onChange(e.target.value);
   };
 
-  handleKeyDown = (e) => {
-    if (e.keyCode === 13 && (e.ctrlKey || e.metaKey)) {
-      this.handleSubmit();
+  blurOnEscape = (e) => {
+    if (['esc', 'escape'].includes(e.key.toLowerCase())) {
+      e.target.blur();
     }
+  }
+
+  handleKeyDownPost = (e) => {
+    if (e.key.toLowerCase() === 'enter' && (e.ctrlKey || e.metaKey)) {
+        this.handleSubmit();
+    }
+    this.blurOnEscape(e);
+  };
+
+  handleKeyDownSpoiler = (e) => {
+    if (e.key.toLowerCase() === 'enter') {
+      if (e.ctrlKey || e.metaKey) {
+        this.handleSubmit();
+      } else {
+        e.preventDefault();
+        this.textareaRef.current?.focus();
+      }
+    }
+    this.blurOnEscape(e);
   };
 
   getFulltextForCharacterCounting = () => {
@@ -236,62 +256,62 @@ class ComposeForm extends ImmutablePureComponent {
         <Warning />
 
         <div className={classNames('compose-form__highlightable', { active: highlighted })} ref={this.setRef}>
-          <div className='compose-form__scrollable'>
-            <EditIndicator />
+          <EditIndicator />
 
-            {this.props.spoiler && (
-              <div className='spoiler-input'>
-                <div className='spoiler-input__border' />
-
-                <AutosuggestInput
-                  placeholder={intl.formatMessage(messages.spoiler_placeholder)}
-                  value={this.props.spoilerText}
-                  disabled={isSubmitting}
-                  onChange={this.handleChangeSpoilerText}
-                  onKeyDown={this.handleKeyDown}
-                  ref={this.setSpoilerText}
-                  suggestions={this.props.suggestions}
-                  onSuggestionsFetchRequested={this.onSuggestionsFetchRequested}
-                  onSuggestionsClearRequested={this.onSuggestionsClearRequested}
-                  onSuggestionSelected={this.onSpoilerSuggestionSelected}
-                  searchTokens={[':']}
-                  id='cw-spoiler-input'
-                  className='spoiler-input__input'
-                  lang={this.props.lang}
-                  spellCheck
-                />
-
-                <div className='spoiler-input__border' />
-              </div>
-            )}
-
-            <AutosuggestTextarea
-              ref={this.textareaRef}
-              placeholder={intl.formatMessage(messages.placeholder)}
-              disabled={isSubmitting}
-              value={this.props.text}
-              onChange={this.handleChange}
-              suggestions={this.props.suggestions}
-              onFocus={this.handleFocus}
-              onKeyDown={this.handleKeyDown}
-              onSuggestionsFetchRequested={this.onSuggestionsFetchRequested}
-              onSuggestionsClearRequested={this.onSuggestionsClearRequested}
-              onSuggestionSelected={this.onSuggestionSelected}
-              onPaste={onPaste}
-              autoFocus={autoFocus}
-              lang={this.props.lang}
-            />
+          <div className='compose-form__dropdowns'>
+            <VisibilityButton disabled={this.props.isEditing} />
+            <LanguageDropdown />
           </div>
 
+          {this.props.spoiler && (
+            <div className='spoiler-input'>
+              <div className='spoiler-input__border' />
+
+              <AutosuggestInput
+                placeholder={intl.formatMessage(messages.spoiler_placeholder)}
+                value={this.props.spoilerText}
+                disabled={isSubmitting}
+                onChange={this.handleChangeSpoilerText}
+                onKeyDown={this.handleKeyDownSpoiler}
+                ref={this.setSpoilerText}
+                suggestions={this.props.suggestions}
+                onSuggestionsFetchRequested={this.onSuggestionsFetchRequested}
+                onSuggestionsClearRequested={this.onSuggestionsClearRequested}
+                onSuggestionSelected={this.onSpoilerSuggestionSelected}
+                searchTokens={[':']}
+                id='cw-spoiler-input'
+                className='spoiler-input__input'
+                lang={this.props.lang}
+                spellCheck
+              />
+
+              <div className='spoiler-input__border' />
+            </div>
+          )}
+
+          <AutosuggestTextarea
+            ref={this.textareaRef}
+            placeholder={intl.formatMessage(messages.placeholder)}
+            disabled={isSubmitting}
+            value={this.props.text}
+            onChange={this.handleChange}
+            suggestions={this.props.suggestions}
+            onFocus={this.handleFocus}
+            onKeyDown={this.handleKeyDownPost}
+            onSuggestionsFetchRequested={this.onSuggestionsFetchRequested}
+            onSuggestionsClearRequested={this.onSuggestionsClearRequested}
+            onSuggestionSelected={this.onSuggestionSelected}
+            onPaste={onPaste}
+            autoFocus={autoFocus}
+            lang={this.props.lang}
+            className='compose-form__input'
+          />
+
           <UploadForm />
           <PollForm />
+          <ComposeQuotedStatus />
 
           <div className='compose-form__footer'>
-            <div className='compose-form__dropdowns'>
-              <PrivacyDropdownContainer disabled={this.props.isEditing} />
-              <LanguageDropdown />
-            </div>
-
             <div className='compose-form__actions'>
               <div className='compose-form__buttons'>
                 <UploadButtonContainer />
@@ -310,7 +330,7 @@ class ComposeForm extends ImmutablePureComponent {
                 >
                   {intl.formatMessage(
                     this.props.isEditing ?
-                      messages.saveChanges : 
+                      messages.saveChanges :
                       (this.props.isInReply ? messages.reply : messages.publish)
                   )}
                 </Button>
diff --git a/app/javascript/mastodon/features/compose/components/edit_indicator.jsx b/app/javascript/mastodon/features/compose/components/edit_indicator.jsx
index 106ff7bdaa4..3fa37bb8c8b 100644
--- a/app/javascript/mastodon/features/compose/components/edit_indicator.jsx
+++ b/app/javascript/mastodon/features/compose/components/edit_indicator.jsx
@@ -50,9 +50,7 @@ export const EditIndicator = () => {
 
       <EmbeddedStatusContent
         className='edit-indicator__content translate'
-        content={status.get('contentHtml')}
-        language={status.get('language')}
-        mentions={status.get('mentions')}
+        status={status}
       />
 
       {(status.get('poll') || status.get('media_attachments').size > 0) && (
diff --git a/app/javascript/mastodon/features/compose/components/language_dropdown.tsx b/app/javascript/mastodon/features/compose/components/language_dropdown.tsx
index d11891308f5..72742153b1c 100644
--- a/app/javascript/mastodon/features/compose/components/language_dropdown.tsx
+++ b/app/javascript/mastodon/features/compose/components/language_dropdown.tsx
@@ -396,7 +396,7 @@ export const LanguageDropdown: React.FC = () => {
           warning: guess !== '' && guess !== value,
         })}
       >
-        <Icon id='' icon={TranslateIcon} />
+        <Icon id='translate' icon={TranslateIcon} />
         <span className='dropdown-button__label'>{current[2] ?? value}</span>
       </button>
 
diff --git a/app/javascript/mastodon/features/compose/components/privacy_dropdown.jsx b/app/javascript/mastodon/features/compose/components/privacy_dropdown.jsx
index 15df5ab7297..1c9434502c0 100644
--- a/app/javascript/mastodon/features/compose/components/privacy_dropdown.jsx
+++ b/app/javascript/mastodon/features/compose/components/privacy_dropdown.jsx
@@ -14,11 +14,11 @@ import QuietTimeIcon from '@/material-icons/400-24px/quiet_time.svg?react';
 import { DropdownSelector } from 'mastodon/components/dropdown_selector';
 import { Icon }  from 'mastodon/components/icon';
 
-const messages = defineMessages({
+export const messages = defineMessages({
   public_short: { id: 'privacy.public.short', defaultMessage: 'Public' },
   public_long: { id: 'privacy.public.long', defaultMessage: 'Anyone on and off Mastodon' },
   unlisted_short: { id: 'privacy.unlisted.short', defaultMessage: 'Quiet public' },
-  unlisted_long: { id: 'privacy.unlisted.long', defaultMessage: 'Fewer algorithmic fanfares' },
+  unlisted_long: { id: 'privacy.unlisted.long', defaultMessage: 'Hidden from Mastodon search results, trending, and public timelines' },
   private_short: { id: 'privacy.private.short', defaultMessage: 'Followers' },
   private_long: { id: 'privacy.private.long', defaultMessage: 'Only your followers' },
   direct_short: { id: 'privacy.direct.short', defaultMessage: 'Specific people' },
diff --git a/app/javascript/mastodon/features/compose/components/quoted_post.tsx b/app/javascript/mastodon/features/compose/components/quoted_post.tsx
new file mode 100644
index 00000000000..f09d6fcd344
--- /dev/null
+++ b/app/javascript/mastodon/features/compose/components/quoted_post.tsx
@@ -0,0 +1,44 @@
+import { useCallback, useMemo } from 'react';
+import type { FC } from 'react';
+
+import { Map } from 'immutable';
+
+import { quoteComposeCancel } from '@/mastodon/actions/compose_typed';
+import { QuotedStatus } from '@/mastodon/components/status_quoted';
+import { useAppDispatch, useAppSelector } from '@/mastodon/store';
+
+export const ComposeQuotedStatus: FC = () => {
+  const quotedStatusId = useAppSelector(
+    (state) => state.compose.get('quoted_status_id') as string | null,
+  );
+
+  const isEditing = useAppSelector((state) => !!state.compose.get('id'));
+
+  const quote = useMemo(
+    () =>
+      quotedStatusId
+        ? Map<'state' | 'quoted_status', string>([
+            ['state', 'accepted'],
+            ['quoted_status', quotedStatusId],
+          ])
+        : null,
+    [quotedStatusId],
+  );
+
+  const dispatch = useAppDispatch();
+  const handleQuoteCancel = useCallback(() => {
+    dispatch(quoteComposeCancel());
+  }, [dispatch]);
+
+  if (!quote) {
+    return null;
+  }
+
+  return (
+    <QuotedStatus
+      quote={quote}
+      contextType='composer'
+      onQuoteCancel={!isEditing ? handleQuoteCancel : undefined}
+    />
+  );
+};
diff --git a/app/javascript/mastodon/features/compose/components/reply_indicator.jsx b/app/javascript/mastodon/features/compose/components/reply_indicator.jsx
index cf5bae2e074..e746fe6a6d2 100644
--- a/app/javascript/mastodon/features/compose/components/reply_indicator.jsx
+++ b/app/javascript/mastodon/features/compose/components/reply_indicator.jsx
@@ -25,7 +25,7 @@ export const ReplyIndicator = () => {
       <div className='reply-indicator__line' />
 
       <Link to={`/@${account.get('acct')}`} className='detailed-status__display-avatar'>
-        <Avatar account={account} size={46} />
+        <Avatar key={`avatar-${account.get('id')}`} account={account} size={46} />
       </Link>
 
       <div className='reply-indicator__main'>
@@ -35,9 +35,7 @@ export const ReplyIndicator = () => {
 
         <EmbeddedStatusContent
           className='reply-indicator__content translate'
-          content={status.get('contentHtml')}
-          language={status.get('language')}
-          mentions={status.get('mentions')}
+          status={status}
         />
 
         {(status.get('poll') || status.get('media_attachments').size > 0) && (
diff --git a/app/javascript/mastodon/features/compose/components/search.tsx b/app/javascript/mastodon/features/compose/components/search.tsx
index ae242190e8a..2d44772ba2d 100644
--- a/app/javascript/mastodon/features/compose/components/search.tsx
+++ b/app/javascript/mastodon/features/compose/components/search.tsx
@@ -47,10 +47,6 @@ const labelForRecentSearch = (search: RecentSearch) => {
   }
 };
 
-const unfocus = () => {
-  document.querySelector('.ui')?.parentElement?.focus();
-};
-
 const ClearButton: React.FC<{
   onClick: () => void;
   hasValue: boolean;
@@ -107,6 +103,11 @@ export const Search: React.FC<{
   }, [initialValue]);
   const searchOptions: SearchOption[] = [];
 
+  const unfocus = useCallback(() => {
+    document.querySelector('.ui')?.parentElement?.focus();
+    setExpanded(false);
+  }, []);
+
   if (searchEnabled) {
     searchOptions.push(
       {
@@ -282,7 +283,7 @@ export const Search: React.FC<{
       history.push({ pathname: '/search', search: queryParams.toString() });
       unfocus();
     },
-    [dispatch, history],
+    [dispatch, history, unfocus],
   );
 
   const handleChange = useCallback(
@@ -402,7 +403,7 @@ export const Search: React.FC<{
 
       setQuickActions(newQuickActions);
     },
-    [dispatch, history, signedIn, setValue, setQuickActions, submit],
+    [signedIn, dispatch, unfocus, history, submit],
   );
 
   const handleClear = useCallback(() => {
@@ -410,7 +411,7 @@ export const Search: React.FC<{
     setQuickActions([]);
     setSelectedOption(-1);
     unfocus();
-  }, [setValue, setQuickActions, setSelectedOption]);
+  }, [unfocus]);
 
   const handleKeyDown = useCallback(
     (e: React.KeyboardEvent) => {
@@ -461,7 +462,7 @@ export const Search: React.FC<{
           break;
       }
     },
-    [navigableOptions, value, selectedOption, setSelectedOption, submit],
+    [unfocus, navigableOptions, selectedOption, submit, value],
   );
 
   const handleFocus = useCallback(() => {
@@ -481,12 +482,38 @@ export const Search: React.FC<{
   }, [setExpanded, setSelectedOption, singleColumn]);
 
   const handleBlur = useCallback(() => {
-    setExpanded(false);
     setSelectedOption(-1);
-  }, [setExpanded, setSelectedOption]);
+  }, [setSelectedOption]);
+
+  const formRef = useRef<HTMLFormElement>(null);
+
+  useEffect(() => {
+    // If the search popover is expanded, close it when tabbing or
+    // clicking outside of it or the search form, while allowing
+    // tabbing or clicking inside of the popover
+    if (expanded) {
+      function closeOnLeave(event: FocusEvent | MouseEvent) {
+        const form = formRef.current;
+        const isClickInsideForm =
+          form &&
+          (form === event.target || form.contains(event.target as Node));
+        if (!isClickInsideForm) {
+          setExpanded(false);
+        }
+      }
+      document.addEventListener('focusin', closeOnLeave);
+      document.addEventListener('click', closeOnLeave);
+
+      return () => {
+        document.removeEventListener('focusin', closeOnLeave);
+        document.removeEventListener('click', closeOnLeave);
+      };
+    }
+    return () => null;
+  }, [expanded]);
 
   return (
-    <form className={classNames('search', { active: expanded })}>
+    <form ref={formRef} className={classNames('search', { active: expanded })}>
       <input
         ref={searchInputRef}
         className='search__input'
@@ -506,7 +533,7 @@ export const Search: React.FC<{
 
       <ClearButton hasValue={hasValue} onClick={handleClear} />
 
-      <div className='search__popout'>
+      <div className='search__popout' tabIndex={-1}>
         {!hasValue && (
           <>
             <h4>
diff --git a/app/javascript/mastodon/features/compose/components/visibility_button.tsx b/app/javascript/mastodon/features/compose/components/visibility_button.tsx
new file mode 100644
index 00000000000..1ea504ab1a3
--- /dev/null
+++ b/app/javascript/mastodon/features/compose/components/visibility_button.tsx
@@ -0,0 +1,145 @@
+import { useCallback, useMemo } from 'react';
+import type { FC } from 'react';
+
+import { defineMessages, useIntl } from 'react-intl';
+
+import classNames from 'classnames';
+
+import { changeComposeVisibility } from '@/mastodon/actions/compose';
+import { setComposeQuotePolicy } from '@/mastodon/actions/compose_typed';
+import { openModal } from '@/mastodon/actions/modal';
+import type { ApiQuotePolicy } from '@/mastodon/api_types/quotes';
+import type { StatusVisibility } from '@/mastodon/api_types/statuses';
+import { Icon } from '@/mastodon/components/icon';
+import { useAppSelector, useAppDispatch } from '@/mastodon/store';
+import AlternateEmailIcon from '@/material-icons/400-24px/alternate_email.svg?react';
+import LockIcon from '@/material-icons/400-24px/lock.svg?react';
+import PublicIcon from '@/material-icons/400-24px/public.svg?react';
+import QuietTimeIcon from '@/material-icons/400-24px/quiet_time.svg?react';
+
+import type { VisibilityModalCallback } from '../../ui/components/visibility_modal';
+
+import { messages as privacyMessages } from './privacy_dropdown';
+
+const messages = defineMessages({
+  anyone_quote: {
+    id: 'privacy.quote.anyone',
+    defaultMessage: '{visibility}, anyone can quote',
+  },
+  limited_quote: {
+    id: 'privacy.quote.limited',
+    defaultMessage: '{visibility}, quotes limited',
+  },
+  disabled_quote: {
+    id: 'privacy.quote.disabled',
+    defaultMessage: '{visibility}, quotes disabled',
+  },
+});
+
+interface PrivacyDropdownProps {
+  disabled?: boolean;
+}
+
+export const VisibilityButton: FC<PrivacyDropdownProps> = (props) => {
+  return <PrivacyModalButton {...props} />;
+};
+
+const visibilityOptions = {
+  public: {
+    icon: 'globe',
+    iconComponent: PublicIcon,
+    value: 'public',
+    text: privacyMessages.public_short,
+  },
+  unlisted: {
+    icon: 'unlock',
+    iconComponent: QuietTimeIcon,
+    value: 'unlisted',
+    text: privacyMessages.unlisted_short,
+  },
+  private: {
+    icon: 'lock',
+    iconComponent: LockIcon,
+    value: 'private',
+    text: privacyMessages.private_short,
+  },
+  direct: {
+    icon: 'at',
+    iconComponent: AlternateEmailIcon,
+    value: 'direct',
+    text: privacyMessages.direct_short,
+  },
+};
+
+const PrivacyModalButton: FC<PrivacyDropdownProps> = ({ disabled = false }) => {
+  const intl = useIntl();
+
+  const quotePolicy = useAppSelector(
+    (state) => state.compose.get('quote_policy') as ApiQuotePolicy,
+  );
+  const visibility = useAppSelector(
+    (state) => state.compose.get('privacy') as StatusVisibility,
+  );
+
+  const { icon, iconComponent } = useMemo(() => {
+    const option = visibilityOptions[visibility];
+    return { icon: option.icon, iconComponent: option.iconComponent };
+  }, [visibility]);
+  const text = useMemo(() => {
+    const visibilityText = intl.formatMessage(
+      visibilityOptions[visibility].text,
+    );
+    if (visibility === 'private' || visibility === 'direct') {
+      return visibilityText;
+    }
+    if (quotePolicy === 'nobody') {
+      return intl.formatMessage(messages.disabled_quote, {
+        visibility: visibilityText,
+      });
+    }
+    if (quotePolicy !== 'public') {
+      return intl.formatMessage(messages.limited_quote, {
+        visibility: visibilityText,
+      });
+    }
+    return intl.formatMessage(messages.anyone_quote, {
+      visibility: visibilityText,
+    });
+  }, [quotePolicy, visibility, intl]);
+
+  const dispatch = useAppDispatch();
+
+  const handleChange: VisibilityModalCallback = useCallback(
+    (newVisibility, newQuotePolicy) => {
+      if (newVisibility !== visibility) {
+        dispatch(changeComposeVisibility(newVisibility));
+      }
+      if (newQuotePolicy !== quotePolicy) {
+        dispatch(setComposeQuotePolicy(newQuotePolicy));
+      }
+    },
+    [dispatch, quotePolicy, visibility],
+  );
+
+  const handleOpen = useCallback(() => {
+    dispatch(
+      openModal({
+        modalType: 'COMPOSE_PRIVACY',
+        modalProps: { onChange: handleChange },
+      }),
+    );
+  }, [dispatch, handleChange]);
+
+  return (
+    <button
+      type='button'
+      title={intl.formatMessage(privacyMessages.change_privacy)}
+      onClick={handleOpen}
+      disabled={disabled}
+      className={classNames('dropdown-button')}
+    >
+      <Icon id={icon} icon={iconComponent} />
+      <span className='dropdown-button__label'>{text}</span>
+    </button>
+  );
+};
diff --git a/app/javascript/mastodon/features/compose/containers/compose_form_container.js b/app/javascript/mastodon/features/compose/containers/compose_form_container.js
index 15ccabf7487..3dad46bc520 100644
--- a/app/javascript/mastodon/features/compose/containers/compose_form_container.js
+++ b/app/javascript/mastodon/features/compose/containers/compose_form_container.js
@@ -10,10 +10,13 @@ import {
   insertEmojiCompose,
   uploadCompose,
 } from 'mastodon/actions/compose';
+import { pasteLinkCompose } from 'mastodon/actions/compose_typed';
 import { openModal } from 'mastodon/actions/modal';
 
 import ComposeForm from '../components/compose_form';
 
+const urlLikeRegex = /^https?:\/\/[^\s]+\/[^\s]+$/i;
+
 const mapStateToProps = state => ({
   text: state.getIn(['compose', 'text']),
   suggestions: state.getIn(['compose', 'suggestions']),
@@ -34,7 +37,7 @@ const mapStateToProps = state => ({
   maxChars: state.getIn(['server', 'server', 'configuration', 'statuses', 'max_characters'], 500),
 });
 
-const mapDispatchToProps = (dispatch) => ({
+const mapDispatchToProps = (dispatch, props) => ({
 
   onChange (text) {
     dispatch(changeCompose(text));
@@ -47,7 +50,11 @@ const mapDispatchToProps = (dispatch) => ({
         modalProps: {},
       }));
     } else {
-      dispatch(submitCompose());
+      dispatch(submitCompose((status) => {
+        if (props.redirectOnSuccess) {
+          window.location.assign(status.url);
+        }
+      }));
     }
   },
 
@@ -67,8 +74,21 @@ const mapDispatchToProps = (dispatch) => ({
     dispatch(changeComposeSpoilerText(checked));
   },
 
-  onPaste (files) {
-    dispatch(uploadCompose(files));
+  onPaste (e) {
+    if (e.clipboardData && e.clipboardData.files.length === 1) {
+      dispatch(uploadCompose(e.clipboardData.files));
+      e.preventDefault();
+    } else if (e.clipboardData && e.clipboardData.files.length === 0) {
+      const data = e.clipboardData.getData('text/plain');
+      if (!data.match(urlLikeRegex)) return;
+
+      try {
+        const url = new URL(data);
+        dispatch(pasteLinkCompose({ url }));
+      } catch {
+        return;
+      }
+    }
   },
 
   onPickEmoji (position, data, needsSpace) {
diff --git a/app/javascript/mastodon/features/compose/containers/poll_button_container.js b/app/javascript/mastodon/features/compose/containers/poll_button_container.js
index 9de388f64aa..e8fa9798c56 100644
--- a/app/javascript/mastodon/features/compose/containers/poll_button_container.js
+++ b/app/javascript/mastodon/features/compose/containers/poll_button_container.js
@@ -3,10 +3,16 @@ import { connect } from 'react-redux';
 import { addPoll, removePoll } from '../../../actions/compose';
 import PollButton from '../components/poll_button';
 
-const mapStateToProps = state => ({
-  disabled: state.getIn(['compose', 'is_uploading']) || (state.getIn(['compose', 'media_attachments']).size > 0),
-  active: state.getIn(['compose', 'poll']) !== null,
-});
+const mapStateToProps = state => {
+  const readyAttachmentsSize = state.compose.get('media_attachments').size ?? 0;
+  const hasAttachments = readyAttachmentsSize > 0 || !!state.compose.get('is_uploading');
+  const hasQuote = !!state.compose.get('quoted_status_id');
+
+  return ({
+    disabled: hasAttachments || hasQuote,
+    active: state.getIn(['compose', 'poll']) !== null,
+  });
+};
 
 const mapDispatchToProps = dispatch => ({
 
diff --git a/app/javascript/mastodon/features/compose/containers/upload_button_container.js b/app/javascript/mastodon/features/compose/containers/upload_button_container.js
index 7cdc12663d7..a5ae874b066 100644
--- a/app/javascript/mastodon/features/compose/containers/upload_button_container.js
+++ b/app/javascript/mastodon/features/compose/containers/upload_button_container.js
@@ -11,9 +11,10 @@ const mapStateToProps = state => {
   const attachmentsSize = readyAttachmentsSize + pendingAttachmentsSize;
   const isOverLimit = attachmentsSize > state.getIn(['server', 'server', 'configuration', 'statuses', 'max_media_attachments'])-1;
   const hasVideoOrAudio = state.getIn(['compose', 'media_attachments']).some(m => ['video', 'audio'].includes(m.get('type')));
+  const hasQuote = !!state.compose.get('quoted_status_id');
 
   return {
-    disabled: isPoll || isUploading || isOverLimit || hasVideoOrAudio,
+    disabled: isPoll || isUploading || isOverLimit || hasVideoOrAudio || hasQuote,
     resetFileKey: state.getIn(['compose', 'resetFileKey']),
   };
 };
diff --git a/app/javascript/mastodon/features/direct_timeline/components/conversation.jsx b/app/javascript/mastodon/features/direct_timeline/components/conversation.jsx
index c27cd3727f1..fbe37f58a29 100644
--- a/app/javascript/mastodon/features/direct_timeline/components/conversation.jsx
+++ b/app/javascript/mastodon/features/direct_timeline/components/conversation.jsx
@@ -10,23 +10,22 @@ import { createSelector } from '@reduxjs/toolkit';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { useDispatch, useSelector } from 'react-redux';
 
-
-import { HotKeys } from 'react-hotkeys';
-
 import MoreHorizIcon from '@/material-icons/400-24px/more_horiz.svg?react';
 import ReplyIcon from '@/material-icons/400-24px/reply.svg?react';
 import { replyCompose } from 'mastodon/actions/compose';
 import { markConversationRead, deleteConversation } from 'mastodon/actions/conversations';
 import { openModal } from 'mastodon/actions/modal';
 import { muteStatus, unmuteStatus, toggleStatusSpoilers } from 'mastodon/actions/statuses';
+import { Hotkeys } from 'mastodon/components/hotkeys';
 import AttachmentList from 'mastodon/components/attachment_list';
 import AvatarComposite from 'mastodon/components/avatar_composite';
 import { IconButton } from 'mastodon/components/icon_button';
 import { RelativeTimestamp } from 'mastodon/components/relative_timestamp';
 import StatusContent from 'mastodon/components/status_content';
 import { Dropdown } from 'mastodon/components/dropdown_menu';
-import { autoPlayGif } from 'mastodon/initial_state';
 import { makeGetStatus } from 'mastodon/selectors';
+import { LinkedDisplayName } from '@/mastodon/components/display_name';
+import { AnimateEmojiProvider } from '@/mastodon/components/emoji/context';
 
 const messages = defineMessages({
   more: { id: 'status.more', defaultMessage: 'More' },
@@ -47,7 +46,7 @@ const getAccounts = createSelector(
 
 const getStatus = makeGetStatus();
 
-export const Conversation = ({ conversation, scrollKey, onMoveUp, onMoveDown }) => {
+export const Conversation = ({ conversation, scrollKey }) => {
   const id = conversation.get('id');
   const unread = conversation.get('unread');
   const lastStatusId = conversation.get('last_status');
@@ -58,32 +57,6 @@ export const Conversation = ({ conversation, scrollKey, onMoveUp, onMoveDown })
   const lastStatus = useSelector(state => getStatus(state, { id: lastStatusId }));
   const accounts = useSelector(state => getAccounts(state, accountIds));
 
-  const handleMouseEnter = useCallback(({ currentTarget }) => {
-    if (autoPlayGif) {
-      return;
-    }
-
-    const emojis = currentTarget.querySelectorAll('.custom-emoji');
-
-    for (var i = 0; i < emojis.length; i++) {
-      let emoji = emojis[i];
-      emoji.src = emoji.getAttribute('data-original');
-    }
-  }, []);
-
-  const handleMouseLeave = useCallback(({ currentTarget }) => {
-    if (autoPlayGif) {
-      return;
-    }
-
-    const emojis = currentTarget.querySelectorAll('.custom-emoji');
-
-    for (var i = 0; i < emojis.length; i++) {
-      let emoji = emojis[i];
-      emoji.src = emoji.getAttribute('data-static');
-    }
-  }, []);
-
   const handleClick = useCallback(() => {
     if (unread) {
       dispatch(markConversationRead(id));
@@ -112,14 +85,6 @@ export const Conversation = ({ conversation, scrollKey, onMoveUp, onMoveDown })
     dispatch(deleteConversation(id));
   }, [dispatch, id]);
 
-  const handleHotkeyMoveUp = useCallback(() => {
-    onMoveUp(id);
-  }, [id, onMoveUp]);
-
-  const handleHotkeyMoveDown = useCallback(() => {
-    onMoveDown(id);
-  }, [id, onMoveDown]);
-
   const handleConversationMute = useCallback(() => {
     if (lastStatus.get('muted')) {
       dispatch(unmuteStatus(lastStatus.get('id')));
@@ -149,27 +114,18 @@ export const Conversation = ({ conversation, scrollKey, onMoveUp, onMoveDown })
 
   menu.push({ text: intl.formatMessage(messages.delete), action: handleDelete });
 
-  const names = accounts.map(a => (
-    <Link to={`/@${a.get('acct')}`} key={a.get('id')} data-hover-card-account={a.get('id')}>
-      <bdi>
-        <strong
-          className='display-name__html'
-          dangerouslySetInnerHTML={{ __html: a.get('display_name_html') }}
-        />
-      </bdi>
-    </Link>
+  const names = accounts.map((account) => (
+    <LinkedDisplayName displayProps={{account, variant: 'simple'}} key={account.get('id')} />
   )).reduce((prev, cur) => [prev, ', ', cur]);
 
   const handlers = {
     reply: handleReply,
     open: handleClick,
-    moveUp: handleHotkeyMoveUp,
-    moveDown: handleHotkeyMoveDown,
     toggleHidden: handleShowMore,
   };
 
   return (
-    <HotKeys handlers={handlers}>
+    <Hotkeys handlers={handlers}>
       <div className={classNames('conversation focusable muted', { unread })} tabIndex={0}>
         <div className='conversation__avatar' onClick={handleClick} role='presentation'>
           <AvatarComposite accounts={accounts} size={48} />
@@ -181,9 +137,9 @@ export const Conversation = ({ conversation, scrollKey, onMoveUp, onMoveDown })
               {unread && <span className='conversation__unread' />} <RelativeTimestamp timestamp={lastStatus.get('created_at')} />
             </div>
 
-            <div className='conversation__content__names' onMouseEnter={handleMouseEnter} onMouseLeave={handleMouseLeave}>
+            <AnimateEmojiProvider className='conversation__content__names'>
               <FormattedMessage id='conversation.with' defaultMessage='With {names}' values={{ names: <span>{names}</span> }} />
-            </div>
+            </AnimateEmojiProvider>
           </div>
 
           <StatusContent
@@ -219,13 +175,11 @@ export const Conversation = ({ conversation, scrollKey, onMoveUp, onMoveDown })
           </div>
         </div>
       </div>
-    </HotKeys>
+    </Hotkeys>
   );
 };
 
 Conversation.propTypes = {
   conversation: ImmutablePropTypes.map.isRequired,
   scrollKey: PropTypes.string,
-  onMoveUp: PropTypes.func,
-  onMoveDown: PropTypes.func,
 };
diff --git a/app/javascript/mastodon/features/direct_timeline/components/conversations_list.jsx b/app/javascript/mastodon/features/direct_timeline/components/conversations_list.jsx
index c9fc098a527..dac68864d3d 100644
--- a/app/javascript/mastodon/features/direct_timeline/components/conversations_list.jsx
+++ b/app/javascript/mastodon/features/direct_timeline/components/conversations_list.jsx
@@ -10,20 +10,6 @@ import ScrollableList from 'mastodon/components/scrollable_list';
 
 import { Conversation } from './conversation';
 
-const focusChild = (node, index, alignTop) => {
-  const element = node.querySelector(`article:nth-of-type(${index + 1}) .focusable`);
-
-  if (element) {
-    if (alignTop && node.scrollTop > element.offsetTop) {
-      element.scrollIntoView(true);
-    } else if (!alignTop && node.scrollTop + node.clientHeight < element.offsetTop + element.offsetHeight) {
-      element.scrollIntoView(false);
-    }
-
-    element.focus();
-  }
-};
-
 export const ConversationsList = ({ scrollKey, ...other }) => {
   const listRef = useRef();
   const conversations = useSelector(state => state.getIn(['conversations', 'items']));
@@ -32,16 +18,6 @@ export const ConversationsList = ({ scrollKey, ...other }) => {
   const dispatch = useDispatch();
   const lastStatusId = conversations.last()?.get('last_status');
 
-  const handleMoveUp = useCallback(id => {
-    const elementIndex = conversations.findIndex(x => x.get('id') === id) - 1;
-    focusChild(listRef.current.node, elementIndex, true);
-  }, [listRef, conversations]);
-
-  const handleMoveDown = useCallback(id => {
-    const elementIndex = conversations.findIndex(x => x.get('id') === id) + 1;
-    focusChild(listRef.current.node, elementIndex, false);
-  }, [listRef, conversations]);
-
   const debouncedLoadMore = useMemo(() => debounce(id => {
     dispatch(expandConversations({ maxId: id }));
   }, 300, { leading: true }), [dispatch]);
@@ -58,8 +34,6 @@ export const ConversationsList = ({ scrollKey, ...other }) => {
         <Conversation
           key={item.get('id')}
           conversation={item}
-          onMoveUp={handleMoveUp}
-          onMoveDown={handleMoveDown}
           scrollKey={scrollKey}
         />
       ))}
diff --git a/app/javascript/mastodon/features/directory/components/account_card.tsx b/app/javascript/mastodon/features/directory/components/account_card.tsx
index 2a0470bb728..562a72b4e8b 100644
--- a/app/javascript/mastodon/features/directory/components/account_card.tsx
+++ b/app/javascript/mastodon/features/directory/components/account_card.tsx
@@ -1,168 +1,24 @@
-import type { MouseEventHandler } from 'react';
-import { useCallback } from 'react';
+import { FormattedMessage } from 'react-intl';
 
-import { FormattedMessage, defineMessages, useIntl } from 'react-intl';
-
-import classNames from 'classnames';
 import { Link } from 'react-router-dom';
 
-import {
-  followAccount,
-  unblockAccount,
-  unmuteAccount,
-} from 'mastodon/actions/accounts';
-import { openModal } from 'mastodon/actions/modal';
+import { EmojiHTML } from '@/mastodon/components/emoji/html';
 import { Avatar } from 'mastodon/components/avatar';
-import { Button } from 'mastodon/components/button';
 import { DisplayName } from 'mastodon/components/display_name';
+import { FollowButton } from 'mastodon/components/follow_button';
 import { ShortNumber } from 'mastodon/components/short_number';
-import { autoPlayGif, me } from 'mastodon/initial_state';
+import { autoPlayGif } from 'mastodon/initial_state';
 import type { Account } from 'mastodon/models/account';
 import { makeGetAccount } from 'mastodon/selectors';
-import { useAppDispatch, useAppSelector } from 'mastodon/store';
-
-const messages = defineMessages({
-  unfollow: { id: 'account.unfollow', defaultMessage: 'Unfollow' },
-  follow: { id: 'account.follow', defaultMessage: 'Follow' },
-  cancel_follow_request: {
-    id: 'account.cancel_follow_request',
-    defaultMessage: 'Withdraw follow request',
-  },
-  requested: {
-    id: 'account.requested',
-    defaultMessage: 'Awaiting approval. Click to cancel follow request',
-  },
-  unblock: { id: 'account.unblock_short', defaultMessage: 'Unblock' },
-  unmute: { id: 'account.unmute_short', defaultMessage: 'Unmute' },
-  edit_profile: { id: 'account.edit_profile', defaultMessage: 'Edit profile' },
-});
+import { useAppSelector } from 'mastodon/store';
 
 const getAccount = makeGetAccount();
 
 export const AccountCard: React.FC<{ accountId: string }> = ({ accountId }) => {
-  const intl = useIntl();
   const account = useAppSelector((s) => getAccount(s, accountId));
-  const dispatch = useAppDispatch();
-
-  const handleMouseEnter = useCallback<MouseEventHandler>(
-    ({ currentTarget }) => {
-      if (autoPlayGif) {
-        return;
-      }
-      const emojis =
-        currentTarget.querySelectorAll<HTMLImageElement>('.custom-emoji');
-
-      emojis.forEach((emoji) => {
-        const original = emoji.getAttribute('data-original');
-        if (original) emoji.src = original;
-      });
-    },
-    [],
-  );
-
-  const handleMouseLeave = useCallback<MouseEventHandler>(
-    ({ currentTarget }) => {
-      if (autoPlayGif) {
-        return;
-      }
-
-      const emojis =
-        currentTarget.querySelectorAll<HTMLImageElement>('.custom-emoji');
-
-      emojis.forEach((emoji) => {
-        const staticUrl = emoji.getAttribute('data-static');
-        if (staticUrl) emoji.src = staticUrl;
-      });
-    },
-    [],
-  );
-
-  const handleFollow = useCallback(() => {
-    if (!account) return;
-
-    if (
-      account.getIn(['relationship', 'following']) ||
-      account.getIn(['relationship', 'requested'])
-    ) {
-      dispatch(
-        openModal({ modalType: 'CONFIRM_UNFOLLOW', modalProps: { account } }),
-      );
-    } else {
-      dispatch(followAccount(account.get('id')));
-    }
-  }, [account, dispatch]);
-
-  const handleBlock = useCallback(() => {
-    if (account?.relationship?.blocking) {
-      dispatch(unblockAccount(account.get('id')));
-    }
-  }, [account, dispatch]);
-
-  const handleMute = useCallback(() => {
-    if (account?.relationship?.muting) {
-      dispatch(unmuteAccount(account.get('id')));
-    }
-  }, [account, dispatch]);
-
-  const handleEditProfile = useCallback(() => {
-    window.open('/settings/profile', '_blank');
-  }, []);
 
   if (!account) return null;
 
-  let actionBtn;
-
-  if (me !== account.get('id')) {
-    if (!account.get('relationship')) {
-      // Wait until the relationship is loaded
-      actionBtn = '';
-    } else if (account.getIn(['relationship', 'requested'])) {
-      actionBtn = (
-        <Button
-          text={intl.formatMessage(messages.cancel_follow_request)}
-          title={intl.formatMessage(messages.requested)}
-          onClick={handleFollow}
-        />
-      );
-    } else if (account.getIn(['relationship', 'muting'])) {
-      actionBtn = (
-        <Button
-          text={intl.formatMessage(messages.unmute)}
-          onClick={handleMute}
-        />
-      );
-    } else if (!account.getIn(['relationship', 'blocking'])) {
-      actionBtn = (
-        <Button
-          disabled={account.relationship?.blocked_by}
-          className={classNames({
-            'button--destructive': account.getIn(['relationship', 'following']),
-          })}
-          text={intl.formatMessage(
-            account.getIn(['relationship', 'following'])
-              ? messages.unfollow
-              : messages.follow,
-          )}
-          onClick={handleFollow}
-        />
-      );
-    } else if (account.getIn(['relationship', 'blocking'])) {
-      actionBtn = (
-        <Button
-          text={intl.formatMessage(messages.unblock)}
-          onClick={handleBlock}
-        />
-      );
-    }
-  } else {
-    actionBtn = (
-      <Button
-        text={intl.formatMessage(messages.edit_profile)}
-        onClick={handleEditProfile}
-      />
-    );
-  }
-
   return (
     <div className='account-card'>
       <Link to={`/@${account.get('acct')}`} className='account-card__permalink'>
@@ -184,11 +40,10 @@ export const AccountCard: React.FC<{ accountId: string }> = ({ accountId }) => {
       </Link>
 
       {account.get('note').length > 0 && (
-        <div
+        <EmojiHTML
           className='account-card__bio translate'
-          onMouseEnter={handleMouseEnter}
-          onMouseLeave={handleMouseLeave}
-          dangerouslySetInnerHTML={{ __html: account.get('note_emojified') }}
+          htmlString={account.get('note_emojified')}
+          extraEmojis={account.get('emojis')}
         />
       )}
 
@@ -222,7 +77,9 @@ export const AccountCard: React.FC<{ accountId: string }> = ({ accountId }) => {
           </div>
         </div>
 
-        <div className='account-card__actions__button'>{actionBtn}</div>
+        <div className='account-card__actions__button'>
+          <FollowButton accountId={account.get('id')} />
+        </div>
       </div>
     </div>
   );
diff --git a/app/javascript/mastodon/features/directory/index.tsx b/app/javascript/mastodon/features/directory/index.tsx
index a29febcd1ab..0fe140b4eb4 100644
--- a/app/javascript/mastodon/features/directory/index.tsx
+++ b/app/javascript/mastodon/features/directory/index.tsx
@@ -21,7 +21,7 @@ import { ColumnHeader } from 'mastodon/components/column_header';
 import { LoadMore } from 'mastodon/components/load_more';
 import { LoadingIndicator } from 'mastodon/components/loading_indicator';
 import { RadioButton } from 'mastodon/components/radio_button';
-import ScrollContainer from 'mastodon/containers/scroll_container';
+import { ScrollContainer } from 'mastodon/containers/scroll_container';
 import { useSearchParam } from 'mastodon/hooks/useSearchParam';
 import { useAppDispatch, useAppSelector } from 'mastodon/store';
 
@@ -206,7 +206,6 @@ export const Directory: React.FC<{
       />
 
       {multiColumn && !pinned ? (
-        // @ts-expect-error ScrollContainer is not properly typed yet
         <ScrollContainer scrollKey='directory'>
           {scrollableArea}
         </ScrollContainer>
diff --git a/app/javascript/mastodon/features/emoji/constants.ts b/app/javascript/mastodon/features/emoji/constants.ts
new file mode 100644
index 00000000000..42d22e4054d
--- /dev/null
+++ b/app/javascript/mastodon/features/emoji/constants.ts
@@ -0,0 +1,118 @@
+// Utility codes
+export const VARIATION_SELECTOR_CODE = 0xfe0f;
+export const KEYCAP_CODE = 0x20e3;
+
+// Gender codes
+export const GENDER_FEMALE_CODE = 0x2640;
+export const GENDER_MALE_CODE = 0x2642;
+
+// Skin tone codes
+export const SKIN_TONE_CODES = [
+  0x1f3fb, // Light skin tone
+  0x1f3fc, // Medium-light skin tone
+  0x1f3fd, // Medium skin tone
+  0x1f3fe, // Medium-dark skin tone
+  0x1f3ff, // Dark skin tone
+] as const;
+
+// Emoji rendering modes. A mode is what we are using to render emojis, a style is what the user has selected.
+export const EMOJI_MODE_NATIVE = 'native';
+export const EMOJI_MODE_NATIVE_WITH_FLAGS = 'native-flags';
+export const EMOJI_MODE_TWEMOJI = 'twemoji';
+
+export const EMOJI_TYPE_UNICODE = 'unicode';
+export const EMOJI_TYPE_CUSTOM = 'custom';
+
+export const EMOJIS_WITH_DARK_BORDER = [
+  '🎱', // 1F3B1
+  '🐜', // 1F41C
+  '⚫', // 26AB
+  '🖤', // 1F5A4
+  '⬛', // 2B1B
+  '◼️', // 25FC-FE0F
+  '◾', // 25FE
+  '◼️', // 25FC-FE0F
+  '✒️', // 2712-FE0F
+  '▪️', // 25AA-FE0F
+  '💣', // 1F4A3
+  '🎳', // 1F3B3
+  '📷', // 1F4F7
+  '📸', // 1F4F8
+  '♣️', // 2663-FE0F
+  '🕶️', // 1F576-FE0F
+  '✴️', // 2734-FE0F
+  '🔌', // 1F50C
+  '💂‍♀️', // 1F482-200D-2640-FE0F
+  '📽️', // 1F4FD-FE0F
+  '🍳', // 1F373
+  '🦍', // 1F98D
+  '💂', // 1F482
+  '🔪', // 1F52A
+  '🕳️', // 1F573-FE0F
+  '🕹️', // 1F579-FE0F
+  '🕋', // 1F54B
+  '🖊️', // 1F58A-FE0F
+  '🖋️', // 1F58B-FE0F
+  '💂‍♂️', // 1F482-200D-2642-FE0F
+  '🎤', // 1F3A4
+  '🎓', // 1F393
+  '🎥', // 1F3A5
+  '🎼', // 1F3BC
+  '♠️', // 2660-FE0F
+  '🎩', // 1F3A9
+  '🦃', // 1F983
+  '📼', // 1F4FC
+  '📹', // 1F4F9
+  '🎮', // 1F3AE
+  '🐃', // 1F403
+  '🏴', // 1F3F4
+  '🐞', // 1F41E
+  '🕺', // 1F57A
+  '📱', // 1F4F1
+  '📲', // 1F4F2
+  '🚲', // 1F6B2
+  '🪮', // 1FAA6
+  '🐦‍⬛', // 1F426-200D-2B1B
+];
+
+export const EMOJIS_WITH_LIGHT_BORDER = [
+  '👽', // 1F47D
+  '⚾', // 26BE
+  '🐔', // 1F414
+  '☁️', // 2601-FE0F
+  '💨', // 1F4A8
+  '🕊️', // 1F54A-FE0F
+  '👀', // 1F440
+  '🍥', // 1F365
+  '👻', // 1F47B
+  '🐐', // 1F410
+  '❕', // 2755
+  '❔', // 2754
+  '⛸️', // 26F8-FE0F
+  '🌩️', // 1F329-FE0F
+  '🔊', // 1F50A
+  '🔇', // 1F507
+  '📃', // 1F4C3
+  '🌧️', // 1F327-FE0F
+  '🐏', // 1F40F
+  '🍚', // 1F35A
+  '🍙', // 1F359
+  '🐓', // 1F413
+  '🐑', // 1F411
+  '💀', // 1F480
+  '☠️', // 2620-FE0F
+  '🌨️', // 1F328-FE0F
+  '🔉', // 1F509
+  '🔈', // 1F508
+  '💬', // 1F4AC
+  '💭', // 1F4AD
+  '🏐', // 1F3D0
+  '🏳️', // 1F3F3-FE0F
+  '⚪', // 26AA
+  '⬜', // 2B1C
+  '◽', // 25FD
+  '◻️', // 25FB-FE0F
+  '▫️', // 25AB-FE0F
+  '🪽', // 1FAE8
+  '🪿', // 1FABF
+];
diff --git a/app/javascript/mastodon/features/emoji/database.test.ts b/app/javascript/mastodon/features/emoji/database.test.ts
new file mode 100644
index 00000000000..0689fd7c542
--- /dev/null
+++ b/app/javascript/mastodon/features/emoji/database.test.ts
@@ -0,0 +1,139 @@
+import { IDBFactory } from 'fake-indexeddb';
+
+import { unicodeEmojiFactory } from '@/testing/factories';
+
+import {
+  putEmojiData,
+  loadEmojiByHexcode,
+  searchEmojisByHexcodes,
+  searchEmojisByTag,
+  testClear,
+  testGet,
+} from './database';
+
+describe('emoji database', () => {
+  afterEach(() => {
+    testClear();
+    indexedDB = new IDBFactory();
+  });
+  describe('putEmojiData', () => {
+    test('adds to loaded locales', async () => {
+      const { loadedLocales } = await testGet();
+      expect(loadedLocales).toHaveLength(0);
+      await putEmojiData([], 'en');
+      expect(loadedLocales).toContain('en');
+    });
+
+    test('loads emoji into indexedDB', async () => {
+      await putEmojiData([unicodeEmojiFactory()], 'en');
+      const { db } = await testGet();
+      await expect(db.get('en', 'test')).resolves.toEqual(
+        unicodeEmojiFactory(),
+      );
+    });
+  });
+
+  describe('loadEmojiByHexcode', () => {
+    test('throws if the locale is not loaded', async () => {
+      await expect(loadEmojiByHexcode('en', 'test')).rejects.toThrowError(
+        'Locale en',
+      );
+    });
+
+    test('retrieves the emoji', async () => {
+      await putEmojiData([unicodeEmojiFactory()], 'en');
+      await expect(loadEmojiByHexcode('test', 'en')).resolves.toEqual(
+        unicodeEmojiFactory(),
+      );
+    });
+
+    test('returns undefined if not found', async () => {
+      await putEmojiData([], 'en');
+      await expect(loadEmojiByHexcode('test', 'en')).resolves.toBeUndefined();
+    });
+  });
+
+  describe('searchEmojisByHexcodes', () => {
+    const data = [
+      unicodeEmojiFactory({ hexcode: 'not a number' }),
+      unicodeEmojiFactory({ hexcode: '1' }),
+      unicodeEmojiFactory({ hexcode: '2' }),
+      unicodeEmojiFactory({ hexcode: '3' }),
+      unicodeEmojiFactory({ hexcode: 'another not a number' }),
+    ];
+    beforeEach(async () => {
+      await putEmojiData(data, 'en');
+    });
+    test('finds emoji in consecutive range', async () => {
+      const actual = await searchEmojisByHexcodes(['1', '2', '3'], 'en');
+      expect(actual).toHaveLength(3);
+    });
+
+    test('finds emoji in split range', async () => {
+      const actual = await searchEmojisByHexcodes(['1', '3'], 'en');
+      expect(actual).toHaveLength(2);
+      expect(actual).toContainEqual(data.at(1));
+      expect(actual).toContainEqual(data.at(3));
+    });
+
+    test('finds emoji with non-numeric range', async () => {
+      const actual = await searchEmojisByHexcodes(
+        ['3', 'not a number', '1'],
+        'en',
+      );
+      expect(actual).toHaveLength(3);
+      expect(actual).toContainEqual(data.at(0));
+      expect(actual).toContainEqual(data.at(1));
+      expect(actual).toContainEqual(data.at(3));
+    });
+
+    test('not found emoji are not returned', async () => {
+      const actual = await searchEmojisByHexcodes(['not found'], 'en');
+      expect(actual).toHaveLength(0);
+    });
+
+    test('only found emojis are returned', async () => {
+      const actual = await searchEmojisByHexcodes(
+        ['another not a number', 'not found'],
+        'en',
+      );
+      expect(actual).toHaveLength(1);
+      expect(actual).toContainEqual(data.at(4));
+    });
+  });
+
+  describe('searchEmojisByTag', () => {
+    const data = [
+      unicodeEmojiFactory({ hexcode: 'test1', tags: ['test 1'] }),
+      unicodeEmojiFactory({
+        hexcode: 'test2',
+        tags: ['test 2', 'something else'],
+      }),
+      unicodeEmojiFactory({ hexcode: 'test3', tags: ['completely different'] }),
+    ];
+    beforeEach(async () => {
+      await putEmojiData(data, 'en');
+    });
+    test('finds emojis with tag', async () => {
+      const actual = await searchEmojisByTag('test 1', 'en');
+      expect(actual).toHaveLength(1);
+      expect(actual).toContainEqual(data.at(0));
+    });
+
+    test('finds emojis starting with tag', async () => {
+      const actual = await searchEmojisByTag('test', 'en');
+      expect(actual).toHaveLength(2);
+      expect(actual).not.toContainEqual(data.at(2));
+    });
+
+    test('does not find emojis ending with tag', async () => {
+      const actual = await searchEmojisByTag('else', 'en');
+      expect(actual).toHaveLength(0);
+    });
+
+    test('finds nothing with invalid tag', async () => {
+      const actual = await searchEmojisByTag('not found', 'en');
+      expect(actual).toHaveLength(0);
+    });
+  });
+});
diff --git a/app/javascript/mastodon/features/emoji/database.ts b/app/javascript/mastodon/features/emoji/database.ts
new file mode 100644
index 00000000000..b7f8a32f76c
--- /dev/null
+++ b/app/javascript/mastodon/features/emoji/database.ts
@@ -0,0 +1,228 @@
+import { SUPPORTED_LOCALES } from 'emojibase';
+import type { Locale } from 'emojibase';
+import type { DBSchema, IDBPDatabase } from 'idb';
+import { openDB } from 'idb';
+
+import { toSupportedLocale, toSupportedLocaleOrCustom } from './locale';
+import type {
+  CustomEmojiData,
+  UnicodeEmojiData,
+  LocaleOrCustom,
+} from './types';
+import { emojiLogger } from './utils';
+
+interface EmojiDB extends LocaleTables, DBSchema {
+  custom: {
+    key: string;
+    value: CustomEmojiData;
+    indexes: {
+      category: string;
+    };
+  };
+  etags: {
+    key: LocaleOrCustom;
+    value: string;
+  };
+}
+
+interface LocaleTable {
+  key: string;
+  value: UnicodeEmojiData;
+  indexes: {
+    group: number;
+    label: string;
+    order: number;
+    tags: string[];
+  };
+}
+type LocaleTables = Record<Locale, LocaleTable>;
+
+type Database = IDBPDatabase<EmojiDB>;
+
+const SCHEMA_VERSION = 1;
+
+const loadedLocales = new Set<Locale>();
+
+const log = emojiLogger('database');
+
+// Loads the database in a way that ensures it's only loaded once.
+const loadDB = (() => {
+  let dbPromise: Promise<Database> | null = null;
+
+  // Actually load the DB.
+  async function initDB() {
+    const db = await openDB<EmojiDB>('mastodon-emoji', SCHEMA_VERSION, {
+      upgrade(database) {
+        const customTable = database.createObjectStore('custom', {
+          keyPath: 'shortcode',
+          autoIncrement: false,
+        });
+        customTable.createIndex('category', 'category');
+
+        database.createObjectStore('etags');
+
+        for (const locale of SUPPORTED_LOCALES) {
+          const localeTable = database.createObjectStore(locale, {
+            keyPath: 'hexcode',
+            autoIncrement: false,
+          });
+          localeTable.createIndex('group', 'group');
+          localeTable.createIndex('label', 'label');
+          localeTable.createIndex('order', 'order');
+          localeTable.createIndex('tags', 'tags', { multiEntry: true });
+        }
+      },
+    });
+    await syncLocales(db);
+    return db;
+  }
+
+  // Loads the database, or returns the existing promise if it hasn't resolved yet.
+  const loadPromise = async (): Promise<Database> => {
+    if (dbPromise) {
+      return dbPromise;
+    }
+    dbPromise = initDB();
+    return dbPromise;
+  };
+  // Special way to reset the database, used for unit testing.
+  loadPromise.reset = () => {
+    dbPromise = null;
+  };
+  return loadPromise;
+})();
+
+export async function putEmojiData(emojis: UnicodeEmojiData[], locale: Locale) {
+  loadedLocales.add(locale);
+  const db = await loadDB();
+  const trx = db.transaction(locale, 'readwrite');
+  await Promise.all(emojis.map((emoji) => trx.store.put(emoji)));
+  await trx.done;
+}
+
+export async function putCustomEmojiData(emojis: CustomEmojiData[]) {
+  const db = await loadDB();
+  const trx = db.transaction('custom', 'readwrite');
+  await Promise.all(emojis.map((emoji) => trx.store.put(emoji)));
+  await trx.done;
+}
+
+export async function putLatestEtag(etag: string, localeString: string) {
+  const locale = toSupportedLocaleOrCustom(localeString);
+  const db = await loadDB();
+  await db.put('etags', etag, locale);
+}
+
+export async function loadEmojiByHexcode(
+  hexcode: string,
+  localeString: string,
+) {
+  const db = await loadDB();
+  const locale = toLoadedLocale(localeString);
+  return db.get(locale, hexcode);
+}
+
+export async function searchEmojisByHexcodes(
+  hexcodes: string[],
+  localeString: string,
+) {
+  const db = await loadDB();
+  const locale = toLoadedLocale(localeString);
+  const sortedCodes = hexcodes.toSorted();
+  const results = await db.getAll(
+    locale,
+    IDBKeyRange.bound(sortedCodes.at(0), sortedCodes.at(-1)),
+  );
+  return results.filter((emoji) => hexcodes.includes(emoji.hexcode));
+}
+
+export async function searchEmojisByTag(tag: string, localeString: string) {
+  const db = await loadDB();
+  const locale = toLoadedLocale(localeString);
+  const range = IDBKeyRange.bound(
+    tag.toLowerCase(),
+    `${tag.toLowerCase()}\uffff`,
+  );
+  return db.getAllFromIndex(locale, 'tags', range);
+}
+
+export async function loadCustomEmojiByShortcode(shortcode: string) {
+  const db = await loadDB();
+  return db.get('custom', shortcode);
+}
+
+export async function searchCustomEmojisByShortcodes(shortcodes: string[]) {
+  const db = await loadDB();
+  const sortedCodes = shortcodes.toSorted();
+  const results = await db.getAll(
+    'custom',
+    IDBKeyRange.bound(sortedCodes.at(0), sortedCodes.at(-1)),
+  );
+  return results.filter((emoji) => shortcodes.includes(emoji.shortcode));
+}
+
+export async function loadLatestEtag(localeString: string) {
+  const locale = toSupportedLocaleOrCustom(localeString);
+  const db = await loadDB();
+  const rowCount = await db.count(locale);
+  if (!rowCount) {
+    return null; // No data for this locale, return null even if there is an etag.
+  }
+  const etag = await db.get('etags', locale);
+  return etag ?? null;
+}
+
+// Private functions
+
+async function syncLocales(db: Database) {
+  const locales = await Promise.all(
+    SUPPORTED_LOCALES.map(
+      async (locale) =>
+        [locale, await hasLocale(locale, db)] satisfies [Locale, boolean],
+    ),
+  );
+  for (const [locale, loaded] of locales) {
+    if (loaded) {
+      loadedLocales.add(locale);
+    } else {
+      loadedLocales.delete(locale);
+    }
+  }
+  log('Loaded %d locales: %o', loadedLocales.size, loadedLocales);
+}
+
+function toLoadedLocale(localeString: string) {
+  const locale = toSupportedLocale(localeString);
+  if (localeString !== locale) {
+    log(`Locale ${locale} is different from provided ${localeString}`);
+  }
+  if (!loadedLocales.has(locale)) {
+    throw new LocaleNotLoadedError(locale);
+  }
+  return locale;
+}
+
+export class LocaleNotLoadedError extends Error {
+  constructor(locale: Locale) {
+    super(`Locale ${locale} is not loaded in emoji database`);
+    this.name = 'LocaleNotLoadedError';
+  }
+}
+
+async function hasLocale(locale: Locale, db: Database): Promise<boolean> {
+  if (loadedLocales.has(locale)) {
+    return true;
+  }
+  const rowCount = await db.count(locale);
+  return !!rowCount;
+}
+
+// Testing helpers
+export async function testGet() {
+  const db = await loadDB();
+  return { db, loadedLocales };
+}
+export function testClear() {
+  loadedLocales.clear();
+  loadDB.reset();
+}
diff --git a/app/javascript/mastodon/features/emoji/emoji.js b/app/javascript/mastodon/features/emoji/emoji.js
index d1843c33bda..cc0d6fe195f 100644
--- a/app/javascript/mastodon/features/emoji/emoji.js
+++ b/app/javascript/mastodon/features/emoji/emoji.js
@@ -1,5 +1,6 @@
 import Trie from 'substring-trie';
 
+import { isModernEmojiEnabled } from '@/mastodon/utils/environment';
 import { assetHost } from 'mastodon/utils/config';
 
 import { autoPlayGif } from '../../initial_state';
@@ -148,7 +149,17 @@ const emojifyNode = (node, customEmojis) => {
   }
 };
 
-const emojify = (str, customEmojis = {}) => {
+/**
+ * Legacy emoji processing function.
+ * @param {string} str
+ * @param {object} customEmojis
+ * @param {boolean} force If true, always emojify even if modern emoji is enabled
+ * @returns {string}
+ */
+const emojify = (str, customEmojis = {}, force = false) => {
+  if (isModernEmojiEnabled() && !force) {
+    return str;
+  }
   const wrapper = document.createElement('div');
   wrapper.innerHTML = str;
 
diff --git a/app/javascript/mastodon/features/emoji/emoji_picker.tsx b/app/javascript/mastodon/features/emoji/emoji_picker.tsx
index f5300c9fece..f9367c775cc 100644
--- a/app/javascript/mastodon/features/emoji/emoji_picker.tsx
+++ b/app/javascript/mastodon/features/emoji/emoji_picker.tsx
@@ -2,9 +2,12 @@ import type { EmojiProps, PickerProps } from 'emoji-mart';
 import EmojiRaw from 'emoji-mart/dist-es/components/emoji/nimble-emoji';
 import PickerRaw from 'emoji-mart/dist-es/components/picker/nimble-picker';
 
+import { isModernEmojiEnabled } from '@/mastodon/utils/environment';
 import { assetHost } from 'mastodon/utils/config';
 
+import { EMOJI_MODE_NATIVE } from './constants';
 import EmojiData from './emoji_data.json';
+import { useEmojiAppState } from './mode';
 
 const backgroundImageFnDefault = () => `${assetHost}/emoji/sheet_15_1.png`;
 
@@ -16,6 +19,7 @@ const Emoji = ({
   backgroundImageFn = backgroundImageFnDefault,
   ...props
 }: EmojiProps) => {
+  const { mode } = useEmojiAppState();
   return (
     <EmojiRaw
       data={EmojiData}
@@ -23,6 +27,7 @@ const Emoji = ({
       sheetSize={sheetSize}
       sheetColumns={sheetColumns}
       sheetRows={sheetRows}
+      native={mode === EMOJI_MODE_NATIVE && isModernEmojiEnabled()}
       backgroundImageFn={backgroundImageFn}
       {...props}
     />
@@ -37,6 +42,7 @@ const Picker = ({
   backgroundImageFn = backgroundImageFnDefault,
   ...props
 }: PickerProps) => {
+  const { mode } = useEmojiAppState();
   return (
     <PickerRaw
       data={EmojiData}
@@ -45,6 +51,7 @@ const Picker = ({
       sheetColumns={sheetColumns}
       sheetRows={sheetRows}
       backgroundImageFn={backgroundImageFn}
+      native={mode === EMOJI_MODE_NATIVE && isModernEmojiEnabled()}
       {...props}
     />
   );
diff --git a/app/javascript/mastodon/features/emoji/handlers.ts b/app/javascript/mastodon/features/emoji/handlers.ts
new file mode 100644
index 00000000000..3b02028f3c3
--- /dev/null
+++ b/app/javascript/mastodon/features/emoji/handlers.ts
@@ -0,0 +1,61 @@
+import { autoPlayGif } from '@/mastodon/initial_state';
+
+const PARENT_MAX_DEPTH = 10;
+
+export function handleAnimateGif(event: MouseEvent) {
+  // We already check this in ui/index.jsx, but just to be sure.
+  if (autoPlayGif) {
+    return;
+  }
+
+  const { target, type } = event;
+  const animate = type === 'mouseover'; // Mouse over = animate, mouse out = don't animate.
+
+  if (target instanceof HTMLImageElement) {
+    setAnimateGif(target, animate);
+  } else if (!(target instanceof HTMLElement) || target === document.body) {
+    return;
+  }
+
+  let parent: HTMLElement | null = null;
+  let iter = 0;
+
+  if (target.classList.contains('animate-parent')) {
+    parent = target;
+  } else {
+    // Iterate up to PARENT_MAX_DEPTH levels up the DOM tree to find a parent with the class 'animate-parent'.
+    let current: HTMLElement | null = target;
+    while (current) {
+      if (iter >= PARENT_MAX_DEPTH) {
+        return; // We can just exit right now.
+      }
+      current = current.parentElement;
+      if (current?.classList.contains('animate-parent')) {
+        parent = current;
+        break;
+      }
+      iter++;
+    }
+  }
+
+  // Affect all animated children within the parent.
+  if (parent) {
+    const animatedChildren =
+      parent.querySelectorAll<HTMLImageElement>('img.custom-emoji');
+    for (const child of animatedChildren) {
+      setAnimateGif(child, animate);
+    }
+  }
+}
+
+function setAnimateGif(image: HTMLImageElement, animate: boolean) {
+  const { classList, dataset } = image;
+  if (
+    !classList.contains('custom-emoji') ||
+    !dataset.static ||
+    !dataset.original
+  ) {
+    return;
+  }
+  image.src = animate ? dataset.original : dataset.static;
+}
diff --git a/app/javascript/mastodon/features/emoji/index.ts b/app/javascript/mastodon/features/emoji/index.ts
new file mode 100644
index 00000000000..3701ad67679
--- /dev/null
+++ b/app/javascript/mastodon/features/emoji/index.ts
@@ -0,0 +1,75 @@
+import { initialState } from '@/mastodon/initial_state';
+import { loadWorker } from '@/mastodon/utils/workers';
+
+import { toSupportedLocale } from './locale';
+import { emojiLogger } from './utils';
+
+const userLocale = toSupportedLocale(initialState?.meta.locale ?? 'en');
+
+let worker: Worker | null = null;
+
+const log = emojiLogger('index');
+
+const WORKER_TIMEOUT = 1_000; // 1 second
+
+export function initializeEmoji() {
+  log('initializing emojis');
+  if (!worker && 'Worker' in window) {
+    try {
+      worker = loadWorker(new URL('./worker', import.meta.url), {
+        type: 'module',
+      });
+    } catch (err) {
+      console.warn('Error creating web worker:', err);
+    }
+  }
+
+  if (worker) {
+    // Assign worker to const to make TS happy inside the event listener.
+    const thisWorker = worker;
+    const timeoutId = setTimeout(() => {
+      log('worker is not ready after timeout');
+      worker = null;
+      void fallbackLoad();
+    }, WORKER_TIMEOUT);
+    thisWorker.addEventListener('message', (event: MessageEvent<string>) => {
+      const { data: message } = event;
+      if (message === 'ready') {
+        log('worker ready, loading data');
+        clearTimeout(timeoutId);
+        thisWorker.postMessage('custom');
+        void loadEmojiLocale(userLocale);
+        // Load English locale as well, because people are still used to
+        // using it from before we supported other locales.
+        if (userLocale !== 'en') {
+          void loadEmojiLocale('en');
+        }
+      } else {
+        log('got worker message: %s', message);
+      }
+    });
+  } else {
+    void fallbackLoad();
+  }
+}
+
+async function fallbackLoad() {
+  log('falling back to main thread for loading');
+  const { importCustomEmojiData } = await import('./loader');
+  await importCustomEmojiData();
+  await loadEmojiLocale(userLocale);
+  if (userLocale !== 'en') {
+    await loadEmojiLocale('en');
+  }
+}
+
+export async function loadEmojiLocale(localeString: string) {
+  const locale = toSupportedLocale(localeString);
+
+  if (worker) {
+    worker.postMessage(locale);
+  } else {
+    const { importEmojiData } = await import('./loader');
+    await importEmojiData(locale);
+  }
+}
diff --git a/app/javascript/mastodon/features/emoji/loader.ts b/app/javascript/mastodon/features/emoji/loader.ts
new file mode 100644
index 00000000000..3196b28b9c6
--- /dev/null
+++ b/app/javascript/mastodon/features/emoji/loader.ts
@@ -0,0 +1,82 @@
+import { flattenEmojiData } from 'emojibase';
+import type { CompactEmoji, FlatCompactEmoji } from 'emojibase';
+
+import {
+  putEmojiData,
+  putCustomEmojiData,
+  loadLatestEtag,
+  putLatestEtag,
+} from './database';
+import { toSupportedLocale, toSupportedLocaleOrCustom } from './locale';
+import type { CustomEmojiData, LocaleOrCustom } from './types';
+import { emojiLogger } from './utils';
+
+const log = emojiLogger('loader');
+
+export async function importEmojiData(localeString: string) {
+  const locale = toSupportedLocale(localeString);
+  const emojis = await fetchAndCheckEtag<CompactEmoji[]>(locale);
+  if (!emojis) {
+    return;
+  }
+  const flattenedEmojis: FlatCompactEmoji[] = flattenEmojiData(emojis);
+  log('loaded %d for %s locale', flattenedEmojis.length, locale);
+  await putEmojiData(flattenedEmojis, locale);
+}
+
+export async function importCustomEmojiData() {
+  const emojis = await fetchAndCheckEtag<CustomEmojiData[]>('custom');
+  if (!emojis) {
+    return;
+  }
+  log('loaded %d custom emojis', emojis.length);
+  await putCustomEmojiData(emojis);
+}
+
+async function fetchAndCheckEtag<ResultType extends object[]>(
+  localeOrCustom: LocaleOrCustom,
+): Promise<ResultType | null> {
+  const locale = toSupportedLocaleOrCustom(localeOrCustom);
+
+  // Use location.origin as this script may be loaded from a CDN domain.
+  const url = new URL(location.origin);
+  if (locale === 'custom') {
+    url.pathname = '/api/v1/custom_emojis';
+  } else {
+    // This doesn't use isDevelopment() as that module loads initial state
+    // which breaks workers, as they cannot access the DOM.
+    url.pathname = `/packs${import.meta.env.DEV ? '-dev' : ''}/emoji/${locale}.json`;
+  }
+
+  const oldEtag = await loadLatestEtag(locale);
+  const response = await fetch(url, {
+    headers: {
+      'Content-Type': 'application/json',
+      'If-None-Match': oldEtag ?? '', // Send the old ETag to check for modifications
+    },
+  });
+  // If not modified, return null
+  if (response.status === 304) {
+    return null;
+  }
+  if (!response.ok) {
+    throw new Error(
+      `Failed to fetch emoji data for ${localeOrCustom}: ${response.statusText}`,
+    );
+  }
+
+  const data = (await response.json()) as ResultType;
+  if (!Array.isArray(data)) {
+    throw new Error(
+      `Unexpected data format for ${localeOrCustom}: expected an array`,
+    );
+  }
+
+  // Store the ETag for future requests
+  const etag = response.headers.get('ETag');
+  if (etag) {
+    await putLatestEtag(etag, localeOrCustom);
+  }
+
+  return data;
+}
diff --git a/app/javascript/mastodon/features/emoji/locale.test.ts b/app/javascript/mastodon/features/emoji/locale.test.ts
index 0e098b2d447..5a474e94284 100644
--- a/app/javascript/mastodon/features/emoji/locale.test.ts
+++ b/app/javascript/mastodon/features/emoji/locale.test.ts
@@ -1,52 +1,6 @@
-import { flattenEmojiData, SUPPORTED_LOCALES } from 'emojibase';
-import emojiEnData from 'emojibase-data/en/compact.json';
-import emojiFrData from 'emojibase-data/fr/compact.json';
+import { SUPPORTED_LOCALES } from 'emojibase';
 
-import { toSupportedLocale, unicodeToLocaleLabel } from './locale';
-
-describe('unicodeToLocaleLabel', () => {
-  const emojiTestCases = [
-    '1F3CB-1F3FF-200D-2640-FE0F', // 🏋🏿‍♀️ Woman weightlifter, dark skin
-    '1F468-1F3FB', // 👨🏻 Man, light skin
-    '1F469-1F3FB-200D-2695-FE0F', // 👩🏻‍⚕️ Woman health worker, light skin
-    '1F468-1F3FD-200D-1F692', // 👨🏽‍🚒 Man firefighter, medium skin
-    '1F469-1F3FE', // 👩🏾 Woman, medium-dark skin
-    '1F469-1F3FF-200D-1F4BB', // 👩🏿‍💻 Woman technologist, dark skin
-    '1F478-1F3FF', // 👸🏿 Princess with dark skin tone
-    '1F935-1F3FC-200D-2640-FE0F', // 🤵🏼‍♀️ Woman in tuxedo, medium-light skin
-    '1F9D1-1F3FC', // 🧑🏼 Person, medium-light skin
-    '1F9D4-1F3FE', // 🧔🏾 Person with beard, medium-dark skin
-  ];
-
-  const flattenedEnData = flattenEmojiData(emojiEnData);
-  const flattenedFrData = flattenEmojiData(emojiFrData);
-
-  const emojiTestEnLabels = new Map(
-    emojiTestCases.map((code) => [
-      code,
-      flattenedEnData.find((emoji) => emoji.hexcode === code)?.label,
-    ]),
-  );
-  const emojiTestFrLabels = new Map(
-    emojiTestCases.map((code) => [
-      code,
-      flattenedFrData.find((emoji) => emoji.hexcode === code)?.label,
-    ]),
-  );
-
-  test.for(
-    emojiTestCases.flatMap((code) => [
-      [code, 'en', emojiTestEnLabels.get(code)],
-      [code, 'fr', emojiTestFrLabels.get(code)],
-    ]) satisfies [string, string, string | undefined][],
-  )(
-    'returns correct label for %s for %s locale',
-    async ([unicodeHex, locale, expectedLabel]) => {
-      const label = await unicodeToLocaleLabel(unicodeHex, locale);
-      expect(label).toBe(expectedLabel);
-    },
-  );
-});
+import { toSupportedLocale, toSupportedLocaleOrCustom } from './locale';
 
 describe('toSupportedLocale', () => {
   test('returns the same locale if it is supported', () => {
@@ -62,3 +16,14 @@ describe('toSupportedLocale', () => {
     }
   });
 });
+
+describe('toSupportedLocaleOrCustom', () => {
+  test('returns custom for "custom" locale', () => {
+    expect(toSupportedLocaleOrCustom('custom')).toBe('custom');
+  });
+  test('returns supported locale for valid locales', () => {
+    for (const locale of SUPPORTED_LOCALES) {
+      expect(toSupportedLocaleOrCustom(locale)).toBe(locale);
+    }
+  });
+});
diff --git a/app/javascript/mastodon/features/emoji/locale.ts b/app/javascript/mastodon/features/emoji/locale.ts
index aac6c376b03..8ff23f5161a 100644
--- a/app/javascript/mastodon/features/emoji/locale.ts
+++ b/app/javascript/mastodon/features/emoji/locale.ts
@@ -1,51 +1,23 @@
-import type { CompactEmoji, Locale } from 'emojibase';
-import { flattenEmojiData, SUPPORTED_LOCALES } from 'emojibase';
+import type { Locale } from 'emojibase';
+import { SUPPORTED_LOCALES } from 'emojibase';
 
-// Simple cache. This will be replaced with an IndexedDB cache in the future.
-const localeCache = new Map<Locale, Map<string, CompactEmoji>>();
+import type { LocaleOrCustom } from './types';
 
-export async function unicodeToLocaleLabel(
-  unicodeHex: string,
-  localeString: string,
-) {
-  const locale = toSupportedLocale(localeString);
-  let hexMap = localeCache.get(locale);
-  if (!hexMap) {
-    hexMap = await loadLocaleLabels(locale);
-    localeCache.set(locale, hexMap);
-  }
-
-  const label = hexMap.get(unicodeHex)?.label;
-  if (!label) {
-    throw new Error(
-      `Label for unicode hex ${unicodeHex} not found in locale ${locale}`,
-    );
-  }
-  return label;
-}
-
-async function loadLocaleLabels(
-  locale: Locale,
-): Promise<Map<string, CompactEmoji>> {
-  const { default: localeEmoji } = ((await import(
-    `emojibase-data/${locale}/compact.json`
-  )) ?? { default: [] }) as { default: CompactEmoji[] };
-  if (!Array.isArray(localeEmoji)) {
-    throw new Error(`Locale data for ${locale} not found`);
-  }
-  const hexMapEntries = flattenEmojiData(localeEmoji).map(
-    (emoji) => [emoji.hexcode, emoji] satisfies [string, CompactEmoji],
-  );
-  return new Map(hexMapEntries);
-}
-
-export function toSupportedLocale(locale: string): Locale {
+export function toSupportedLocale(localeBase: string): Locale {
+  const locale = localeBase.toLowerCase();
   if (isSupportedLocale(locale)) {
     return locale;
   }
   return 'en'; // Default to English if unsupported
 }
 
-function isSupportedLocale(locale: string): locale is Locale {
-  return SUPPORTED_LOCALES.includes(locale as Locale);
+export function toSupportedLocaleOrCustom(locale: string): LocaleOrCustom {
+  if (locale.toLowerCase() === 'custom') {
+    return 'custom';
+  }
+  return toSupportedLocale(locale);
+}
+
+function isSupportedLocale(locale: string): locale is Locale {
+  return SUPPORTED_LOCALES.includes(locale.toLowerCase() as Locale);
 }
diff --git a/app/javascript/mastodon/features/emoji/mode.ts b/app/javascript/mastodon/features/emoji/mode.ts
new file mode 100644
index 00000000000..afb8a78ebcc
--- /dev/null
+++ b/app/javascript/mastodon/features/emoji/mode.ts
@@ -0,0 +1,140 @@
+// Credit to Nolan Lawson for the original implementation.
+// See: https://github.com/nolanlawson/emoji-picker-element/blob/master/src/picker/utils/testColorEmojiSupported.js
+
+import { createAppSelector, useAppSelector } from '@/mastodon/store';
+import { isDevelopment } from '@/mastodon/utils/environment';
+
+import {
+  EMOJI_MODE_NATIVE,
+  EMOJI_MODE_NATIVE_WITH_FLAGS,
+  EMOJI_MODE_TWEMOJI,
+} from './constants';
+import { toSupportedLocale } from './locale';
+import type { EmojiAppState, EmojiMode } from './types';
+
+const modeSelector = createAppSelector(
+  [(state) => state.meta.get('emoji_style') as string],
+  (emoji_style) => determineEmojiMode(emoji_style),
+);
+
+export function useEmojiAppState(): EmojiAppState {
+  const locale = useAppSelector((state) =>
+    toSupportedLocale(state.meta.get('locale') as string),
+  );
+  const mode = useAppSelector(modeSelector);
+
+  return {
+    currentLocale: locale,
+    locales: [locale],
+    mode,
+    darkTheme: document.body.classList.contains('theme-default'),
+  };
+}
+
+type Feature = Uint8ClampedArray;
+
+// See: https://github.com/nolanlawson/emoji-picker-element/blob/master/src/picker/constants.js
+const FONT_FAMILY =
+  '"Twemoji Mozilla","Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol",' +
+  '"Noto Color Emoji","EmojiOne Color","Android Emoji",sans-serif';
+
+function getTextFeature(text: string, color: string) {
+  const canvas = document.createElement('canvas');
+  canvas.width = canvas.height = 1;
+
+  const ctx = canvas.getContext('2d', {
+    // Improves the performance of `getImageData()`
+    // https://developer.mozilla.org/en-US/docs/Web/API/CanvasRenderingContext2D/getContextAttributes#willreadfrequently
+    willReadFrequently: true,
+  });
+  if (!ctx) {
+    throw new Error('Canvas context not available');
+  }
+  ctx.textBaseline = 'top';
+  ctx.font = `100px ${FONT_FAMILY}`;
+  ctx.fillStyle = color;
+  ctx.scale(0.01, 0.01);
+  ctx.fillText(text, 0, 0);
+
+  return ctx.getImageData(0, 0, 1, 1).data satisfies Feature;
+}
+
+function compareFeatures(feature1: Feature, feature2: Feature) {
+  const feature1Str = [...feature1].join(',');
+  const feature2Str = [...feature2].join(',');
+  // This is RGBA, so for 0,0,0, we are checking that the first RGB is not all zeroes.
+  // Most of the time when unsupported this is 0,0,0,0, but on Chrome on Mac it is
+  // 0,0,0,61 - there is a transparency here.
+  return feature1Str === feature2Str && !feature1Str.startsWith('0,0,0,');
+}
+
+function testEmojiSupport(text: string) {
+  // Render white and black and then compare them to each other and ensure they're the same
+  // color, and neither one is black. This shows that the emoji was rendered in color.
+  const feature1 = getTextFeature(text, '#000');
+  const feature2 = getTextFeature(text, '#fff');
+  return compareFeatures(feature1, feature2);
+}
+
+const EMOJI_VERSION_TEST_EMOJI = '🫨'; // shaking head, from v15
+const EMOJI_FLAG_TEST_EMOJI = '🇨🇭';
+
+export function determineEmojiMode(style: string): EmojiMode {
+  if (style === EMOJI_MODE_NATIVE) {
+    // If flags are not supported, we replace them with Twemoji.
+    if (shouldReplaceFlags()) {
+      return EMOJI_MODE_NATIVE_WITH_FLAGS;
+    }
+    return EMOJI_MODE_NATIVE;
+  }
+  if (style === EMOJI_MODE_TWEMOJI) {
+    return EMOJI_MODE_TWEMOJI;
+  }
+
+  // Auto style so determine based on browser capabilities.
+  if (shouldUseTwemoji()) {
+    return EMOJI_MODE_TWEMOJI;
+  } else if (shouldReplaceFlags()) {
+    return EMOJI_MODE_NATIVE_WITH_FLAGS;
+  }
+  return EMOJI_MODE_NATIVE;
+}
+
+export function shouldUseTwemoji(): boolean {
+  if (typeof window === 'undefined') {
+    return false;
+  }
+  try {
+    // Test a known color emoji to see if 15.1 is supported.
+    return !testEmojiSupport(EMOJI_VERSION_TEST_EMOJI);
+  } catch (err: unknown) {
+    // If an error occurs, fall back to Twemoji to be safe.
+    if (isDevelopment()) {
+      console.warn(
+        'Emoji rendering test failed, defaulting to Twemoji. Error:',
+        err,
+      );
+    }
+    return true;
+  }
+}
+
+// Based on https://github.com/talkjs/country-flag-emoji-polyfill/blob/master/src/index.ts#L19
+export function shouldReplaceFlags(): boolean {
+  if (typeof window === 'undefined') {
+    return false;
+  }
+  try {
+    // Test a known flag emoji to see if it is rendered in color.
+    return !testEmojiSupport(EMOJI_FLAG_TEST_EMOJI);
+  } catch (err: unknown) {
+    // If an error occurs, assume flags should be replaced.
+    if (isDevelopment()) {
+      console.warn(
+        'Flag emoji rendering test failed, defaulting to replacement. Error:',
+        err,
+      );
+    }
+    return true;
+  }
+}
diff --git a/app/javascript/mastodon/features/emoji/normalize.test.ts b/app/javascript/mastodon/features/emoji/normalize.test.ts
index 29255d52916..b4c76699611 100644
--- a/app/javascript/mastodon/features/emoji/normalize.test.ts
+++ b/app/javascript/mastodon/features/emoji/normalize.test.ts
@@ -1,9 +1,14 @@
 import { readdir } from 'fs/promises';
 import { basename, resolve } from 'path';
 
-import unicodeEmojis from 'emojibase-data/en/data.json';
+import { flattenEmojiData } from 'emojibase';
+import unicodeRawEmojis from 'emojibase-data/en/data.json';
 
-import { twemojiToUnicodeInfo, unicodeToTwemojiHex } from './normalize';
+import {
+  twemojiToUnicodeInfo,
+  unicodeToTwemojiHex,
+  emojiToUnicodeHex,
+} from './normalize';
 
 const emojiSVGFiles = await readdir(
   // This assumes tests are run from project root
@@ -13,60 +18,61 @@ const emojiSVGFiles = await readdir(
   },
 );
 const svgFileNames = emojiSVGFiles
-  .filter(
-    (file) =>
-      file.isFile() &&
-      file.name.endsWith('.svg') &&
-      !file.name.endsWith('_border.svg'),
-  )
-  .map((file) => basename(file.name, '.svg').toUpperCase());
+  .filter((file) => file.isFile() && file.name.endsWith('.svg'))
+  .map((file) => basename(file.name, '.svg'));
+const svgFileNamesWithoutBorder = svgFileNames.filter(
+  (fileName) => !fileName.endsWith('_border'),
+);
 
-describe('normalizeEmoji', () => {
-  describe('unicodeToSVGName', () => {
-    test.concurrent.for(
-      unicodeEmojis
-        // Our version of Twemoji only supports up to version 15.1
-        .filter((emoji) => emoji.version < 16)
-        .map((emoji) => [emoji.hexcode, emoji.label] as [string, string]),
-    )('verifying an emoji exists for %s (%s)', ([hexcode], { expect }) => {
-      const result = unicodeToTwemojiHex(hexcode);
-      expect(svgFileNames).toContain(result);
-    });
-  });
+const unicodeEmojis = flattenEmojiData(unicodeRawEmojis);
 
-  describe('twemojiToUnicodeInfo', () => {
-    const unicodeMap = new Map(
-      unicodeEmojis.flatMap((emoji) => {
-        const base: [string, string][] = [[emoji.hexcode, emoji.label]];
-        if (emoji.skins) {
-          base.push(
-            ...emoji.skins.map(
-              (skin) => [skin.hexcode, skin.label] as [string, string],
-            ),
-          );
-        }
-        return base;
-      }),
-    );
+describe('emojiToUnicodeHex', () => {
+  test.concurrent.for([
+    ['🎱', '1F3B1'],
+    ['🐜', '1F41C'],
+    ['⚫', '26AB'],
+    ['🖤', '1F5A4'],
+    ['💀', '1F480'],
+    ['💂‍♂️', '1F482-200D-2642-FE0F'],
+  ] as const)(
+    'emojiToUnicodeHex converts %s to %s',
+    ([emoji, hexcode], { expect }) => {
+      expect(emojiToUnicodeHex(emoji)).toBe(hexcode);
+    },
+  );
+});
 
-    test.concurrent.for(svgFileNames)(
-      'verifying SVG file %s maps to Unicode emoji',
-      (svgFileName, { expect }) => {
-        assert(!!svgFileName);
-        const result = twemojiToUnicodeInfo(svgFileName);
-        const hexcode =
-          typeof result === 'string' ? result : result.unqualified;
-        if (!hexcode) {
-          // No hexcode means this is a special case like the Shibuya 109 emoji
-          expect(result).toHaveProperty('label');
-          return;
-        }
-        assert(!!hexcode);
-        expect(
-          unicodeMap.has(hexcode),
-          `${hexcode} (${svgFileName}) not found`,
-        ).toBeTruthy();
-      },
-    );
+describe('unicodeToTwemojiHex', () => {
+  test.concurrent.for(
+    unicodeEmojis
+      // Our version of Twemoji only supports up to version 15.1
+      .filter((emoji) => emoji.version < 16)
+      .map((emoji) => [emoji.hexcode, emoji.label] as [string, string]),
+  )('verifying an emoji exists for %s (%s)', ([hexcode], { expect }) => {
+    const result = unicodeToTwemojiHex(hexcode);
+    expect(svgFileNamesWithoutBorder).toContain(result);
   });
 });
+
+describe('twemojiToUnicodeInfo', () => {
+  const unicodeCodeSet = new Set(unicodeEmojis.map((emoji) => emoji.hexcode));
+
+  test.concurrent.for(svgFileNamesWithoutBorder)(
+    'verifying SVG file %s maps to Unicode emoji',
+    (svgFileName, { expect }) => {
+      assert(!!svgFileName);
+      const result = twemojiToUnicodeInfo(svgFileName);
+      const hexcode = typeof result === 'string' ? result : result.unqualified;
+      if (!hexcode) {
+        // No hexcode means this is a special case like the Shibuya 109 emoji
+        expect(result).toHaveProperty('label');
+        return;
+      }
+      assert(!!hexcode);
+      expect(
+        unicodeCodeSet.has(hexcode),
+        `${hexcode} (${svgFileName}) not found`,
+      ).toBeTruthy();
+    },
+  );
+});
diff --git a/app/javascript/mastodon/features/emoji/normalize.ts b/app/javascript/mastodon/features/emoji/normalize.ts
index 024cd536252..a09505e97fc 100644
--- a/app/javascript/mastodon/features/emoji/normalize.ts
+++ b/app/javascript/mastodon/features/emoji/normalize.ts
@@ -1,19 +1,17 @@
-// Utility codes
-const VARIATION_SELECTOR_CODE = 0xfe0f;
-const KEYCAP_CODE = 0x20e3;
+import { isList } from 'immutable';
 
-// Gender codes
-const GENDER_FEMALE_CODE = 0x2640;
-const GENDER_MALE_CODE = 0x2642;
+import { assetHost } from '@/mastodon/utils/config';
 
-// Skin tone codes
-const SKIN_TONE_CODES = [
-  0x1f3fb, // Light skin tone
-  0x1f3fc, // Medium-light skin tone
-  0x1f3fd, // Medium skin tone
-  0x1f3fe, // Medium-dark skin tone
-  0x1f3ff, // Dark skin tone
-] as const;
+import {
+  VARIATION_SELECTOR_CODE,
+  KEYCAP_CODE,
+  GENDER_FEMALE_CODE,
+  GENDER_MALE_CODE,
+  SKIN_TONE_CODES,
+  EMOJIS_WITH_DARK_BORDER,
+  EMOJIS_WITH_LIGHT_BORDER,
+} from './constants';
+import type { CustomEmojiMapArg, ExtraCustomEmojiMap } from './types';
 
 // Misc codes that have special handling
 const SKIER_CODE = 0x26f7;
@@ -24,6 +22,17 @@ const LEVITATING_PERSON_CODE = 0x1f574;
 const SPEECH_BUBBLE_CODE = 0x1f5e8;
 const MS_CLAUS_CODE = 0x1f936;
 
+export function emojiToUnicodeHex(emoji: string): string {
+  const codes: number[] = [];
+  for (const char of emoji) {
+    const code = char.codePointAt(0);
+    if (code !== undefined) {
+      codes.push(code);
+    }
+  }
+  return hexNumbersToString(codes);
+}
+
 export function unicodeToTwemojiHex(unicodeHex: string): string {
   const codes = hexStringToNumbers(unicodeHex);
   const normalizedCodes: number[] = [];
@@ -47,7 +56,26 @@ export function unicodeToTwemojiHex(unicodeHex: string): string {
     normalizedCodes.push(code);
   }
 
-  return hexNumbersToString(normalizedCodes, 0);
+  return hexNumbersToString(normalizedCodes, 0).toLowerCase();
+}
+
+export const CODES_WITH_DARK_BORDER =
+  EMOJIS_WITH_DARK_BORDER.map(emojiToUnicodeHex);
+
+export const CODES_WITH_LIGHT_BORDER =
+  EMOJIS_WITH_LIGHT_BORDER.map(emojiToUnicodeHex);
+
+export function unicodeHexToUrl(unicodeHex: string, darkMode: boolean): string {
+  const normalizedHex = unicodeToTwemojiHex(unicodeHex);
+  let url = `${assetHost}/emoji/${normalizedHex}`;
+  if (darkMode && CODES_WITH_LIGHT_BORDER.includes(normalizedHex)) {
+    url += '_border';
+  }
+  if (CODES_WITH_DARK_BORDER.includes(normalizedHex)) {
+    url += '_border';
+  }
+  url += '.svg';
+  return url;
 }
 
 interface TwemojiSpecificEmoji {
@@ -84,11 +112,16 @@ export function twemojiToUnicodeInfo(
   let gender: undefined | number;
   let skin: undefined | number;
   for (const code of codes) {
-    if (code in GENDER_CODES_MAP) {
+    if (!gender && code in GENDER_CODES_MAP) {
       gender = GENDER_CODES_MAP[code];
-    } else if (code in SKIN_TONE_CODES) {
+    } else if (!skin && code in SKIN_TONE_CODES) {
       skin = code;
     }
+
+    // Exit if we have both skin and gender
+    if (skin && gender) {
+      break;
+    }
   }
 
   let mappedCodes: unknown[] = codes;
@@ -103,8 +136,8 @@ export function twemojiToUnicodeInfo(
     // For key emoji, insert the variation selector
     mappedCodes = [codes[0], VARIATION_SELECTOR_CODE, KEYCAP_CODE];
   } else if (
-    codes.at(0) === SKIER_CODE ||
-    codes.at(0) === LEVITATING_PERSON_CODE
+    (codes.at(0) === SKIER_CODE || codes.at(0) === LEVITATING_PERSON_CODE) &&
+    codes.length > 1
   ) {
     // Twemoji offers more gender and skin options for the skier and levitating person emoji.
     return {
@@ -117,6 +150,27 @@ export function twemojiToUnicodeInfo(
   return hexNumbersToString(mappedCodes);
 }
 
+export function cleanExtraEmojis(extraEmojis?: CustomEmojiMapArg) {
+  if (!extraEmojis) {
+    return null;
+  }
+  if (Array.isArray(extraEmojis)) {
+    return extraEmojis.reduce<ExtraCustomEmojiMap>(
+      (acc, emoji) => ({ ...acc, [emoji.shortcode]: emoji }),
+      {},
+    );
+  }
+  if (isList(extraEmojis)) {
+    return extraEmojis
+      .toJS()
+      .reduce<ExtraCustomEmojiMap>(
+        (acc, emoji) => ({ ...acc, [emoji.shortcode]: emoji }),
+        {},
+      );
+  }
+  return extraEmojis;
+}
+
 function hexStringToNumbers(hexString: string): number[] {
   return hexString
     .split('-')
diff --git a/app/javascript/mastodon/features/emoji/render.test.ts b/app/javascript/mastodon/features/emoji/render.test.ts
new file mode 100644
index 00000000000..05dbc388c45
--- /dev/null
+++ b/app/javascript/mastodon/features/emoji/render.test.ts
@@ -0,0 +1,178 @@
+import { customEmojiFactory, unicodeEmojiFactory } from '@/testing/factories';
+
+import * as db from './database';
+import * as loader from './loader';
+import {
+  loadEmojiDataToState,
+  stringToEmojiState,
+  tokenizeText,
+} from './render';
+
+describe('tokenizeText', () => {
+  test('returns an array of text to be a single token', () => {
+    expect(tokenizeText('Hello')).toEqual(['Hello']);
+  });
+
+  test('returns tokens for text with emoji', () => {
+    expect(tokenizeText('Hello 😊 🇿🇼!!')).toEqual([
+      'Hello ',
+      {
+        type: 'unicode',
+        code: '😊',
+      },
+      ' ',
+      {
+        type: 'unicode',
+        code: '🇿🇼',
+      },
+      '!!',
+    ]);
+  });
+
+  test('returns tokens for text with custom emoji', () => {
+    expect(tokenizeText('Hello :smile:!!')).toEqual([
+      'Hello ',
+      {
+        type: 'custom',
+        code: ':smile:',
+      },
+      '!!',
+    ]);
+  });
+
+  test('handles custom emoji with underscores and numbers', () => {
+    expect(tokenizeText('Hello :smile_123:!!')).toEqual([
+      'Hello ',
+      {
+        type: 'custom',
+        code: ':smile_123:',
+      },
+      '!!',
+    ]);
+  });
+
+  test('returns tokens for text with mixed emoji', () => {
+    expect(tokenizeText('Hello 😊 :smile:!!')).toEqual([
+      'Hello ',
+      {
+        type: 'unicode',
+        code: '😊',
+      },
+      ' ',
+      {
+        type: 'custom',
+        code: ':smile:',
+      },
+      '!!',
+    ]);
+  });
+
+  test('does not capture custom emoji with invalid characters', () => {
+    expect(tokenizeText('Hello :smile-123:!!')).toEqual([
+      'Hello :smile-123:!!',
+    ]);
+  });
+});
+
+describe('stringToEmojiState', () => {
+  test('returns unicode emoji state for valid unicode emoji', () => {
+    expect(stringToEmojiState('😊')).toEqual({
+      type: 'unicode',
+      code: '1F60A',
+    });
+  });
+
+  test('returns custom emoji state for valid custom emoji', () => {
+    expect(stringToEmojiState(':smile:')).toEqual({
+      type: 'custom',
+      code: 'smile',
+      data: undefined,
+    });
+  });
+
+  test('returns custom emoji state with data when provided', () => {
+    const customEmoji = {
+      smile: customEmojiFactory({
+        shortcode: 'smile',
+        url: 'https://example.com/smile.png',
+        static_url: 'https://example.com/smile_static.png',
+      }),
+    };
+    expect(stringToEmojiState(':smile:', customEmoji)).toEqual({
+      type: 'custom',
+      code: 'smile',
+      data: customEmoji.smile,
+    });
+  });
+
+  test('returns null for invalid emoji strings', () => {
+    expect(stringToEmojiState('notanemoji')).toBeNull();
+    expect(stringToEmojiState(':invalid-emoji:')).toBeNull();
+  });
+});
+
+describe('loadEmojiDataToState', () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  test('loads unicode data into state', async () => {
+    const dbCall = vi
+      .spyOn(db, 'loadEmojiByHexcode')
+      .mockResolvedValue(unicodeEmojiFactory());
+    const unicodeState = { type: 'unicode', code: '1F60A' } as const;
+    const result = await loadEmojiDataToState(unicodeState, 'en');
+    expect(dbCall).toHaveBeenCalledWith('1F60A', 'en');
+    expect(result).toEqual({
+      type: 'unicode',
+      code: '1F60A',
+      data: unicodeEmojiFactory(),
+    });
+  });
+
+  test('loads custom emoji data into state', async () => {
+    const dbCall = vi
+      .spyOn(db, 'loadCustomEmojiByShortcode')
+      .mockResolvedValueOnce(customEmojiFactory());
+    const customState = { type: 'custom', code: 'smile' } as const;
+    const result = await loadEmojiDataToState(customState, 'en');
+    expect(dbCall).toHaveBeenCalledWith('smile');
+    expect(result).toEqual({
+      type: 'custom',
+      code: 'smile',
+      data: customEmojiFactory(),
+    });
+  });
+
+  test('returns null if unicode emoji not found in database', async () => {
+    vi.spyOn(db, 'loadEmojiByHexcode').mockResolvedValueOnce(undefined);
+    const unicodeState = { type: 'unicode', code: '1F60A' } as const;
+    const result = await loadEmojiDataToState(unicodeState, 'en');
+    expect(result).toBeNull();
+  });
+
+  test('returns null if custom emoji not found in database', async () => {
+    vi.spyOn(db, 'loadCustomEmojiByShortcode').mockResolvedValueOnce(undefined);
+    const customState = { type: 'custom', code: 'smile' } as const;
+    const result = await loadEmojiDataToState(customState, 'en');
+    expect(result).toBeNull();
+  });
+
+  test('retries loading emoji data once if initial load fails', async () => {
+    const dbCall = vi
+      .spyOn(db, 'loadEmojiByHexcode')
+      .mockRejectedValue(new db.LocaleNotLoadedError('en'));
+    vi.spyOn(loader, 'importEmojiData').mockResolvedValueOnce();
+    const consoleCall = vi
+      .spyOn(console, 'warn')
+      .mockImplementationOnce(() => null);
+
+    const unicodeState = { type: 'unicode', code: '1F60A' } as const;
+    const result = await loadEmojiDataToState(unicodeState, 'en');
+
+    expect(dbCall).toHaveBeenCalledTimes(2);
+    expect(loader.importEmojiData).toHaveBeenCalledWith('en');
+    expect(consoleCall).toHaveBeenCalled();
+    expect(result).toBeNull();
+  });
+});
diff --git a/app/javascript/mastodon/features/emoji/render.ts b/app/javascript/mastodon/features/emoji/render.ts
new file mode 100644
index 00000000000..574d5ef59b2
--- /dev/null
+++ b/app/javascript/mastodon/features/emoji/render.ts
@@ -0,0 +1,186 @@
+import {
+  EMOJI_MODE_NATIVE,
+  EMOJI_MODE_NATIVE_WITH_FLAGS,
+  EMOJI_TYPE_UNICODE,
+  EMOJI_TYPE_CUSTOM,
+} from './constants';
+import {
+  loadCustomEmojiByShortcode,
+  loadEmojiByHexcode,
+  LocaleNotLoadedError,
+} from './database';
+import { importEmojiData } from './loader';
+import { emojiToUnicodeHex } from './normalize';
+import type {
+  EmojiLoadedState,
+  EmojiMode,
+  EmojiState,
+  EmojiStateCustom,
+  EmojiStateUnicode,
+  ExtraCustomEmojiMap,
+} from './types';
+import {
+  anyEmojiRegex,
+  emojiLogger,
+  isCustomEmoji,
+  isUnicodeEmoji,
+  stringHasUnicodeFlags,
+} from './utils';
+
+const log = emojiLogger('render');
+
+type TokenizedText = (string | EmojiState)[];
+
+/**
+ * Tokenizes text into strings and emoji states.
+ * @param text Text to tokenize.
+ * @returns Array of strings and emoji states.
+ */
+export function tokenizeText(text: string): TokenizedText {
+  if (!text.trim()) {
+    return [text];
+  }
+
+  const tokens = [];
+  let lastIndex = 0;
+  for (const match of text.matchAll(anyEmojiRegex())) {
+    if (match.index > lastIndex) {
+      tokens.push(text.slice(lastIndex, match.index));
+    }
+
+    const code = match[0];
+
+    if (code.startsWith(':') && code.endsWith(':')) {
+      // Custom emoji
+      tokens.push({
+        type: EMOJI_TYPE_CUSTOM,
+        code,
+      } satisfies EmojiStateCustom);
+    } else {
+      // Unicode emoji
+      tokens.push({
+        type: EMOJI_TYPE_UNICODE,
+        code: code,
+      } satisfies EmojiStateUnicode);
+    }
+    lastIndex = match.index + code.length;
+  }
+  if (lastIndex < text.length) {
+    tokens.push(text.slice(lastIndex));
+  }
+  return tokens;
+}
+
+/**
+ * Parses emoji string to extract emoji state.
+ * @param code Hex code or custom shortcode.
+ * @param customEmoji Extra custom emojis.
+ */
+export function stringToEmojiState(
+  code: string,
+  customEmoji: ExtraCustomEmojiMap = {},
+): EmojiState | null {
+  if (isUnicodeEmoji(code)) {
+    return {
+      type: EMOJI_TYPE_UNICODE,
+      code: emojiToUnicodeHex(code),
+    };
+  }
+
+  if (isCustomEmoji(code)) {
+    const shortCode = code.slice(1, -1);
+    return {
+      type: EMOJI_TYPE_CUSTOM,
+      code: shortCode,
+      data: customEmoji[shortCode],
+    };
+  }
+
+  return null;
+}
+
+/**
+ * Loads emoji data into the given state if not already loaded.
+ * @param state Emoji state to load data for.
+ * @param locale Locale to load data for. Only for Unicode emoji.
+ * @param retry Internal. Whether this is a retry after loading the locale.
+ */
+export async function loadEmojiDataToState(
+  state: EmojiState,
+  locale: string,
+  retry = false,
+): Promise<EmojiLoadedState | null> {
+  if (isStateLoaded(state)) {
+    return state;
+  }
+
+  // First, try to load the data from IndexedDB.
+  try {
+    // This is duplicative, but that's because TS can't distinguish the state type easily.
+    if (state.type === EMOJI_TYPE_UNICODE) {
+      const data = await loadEmojiByHexcode(state.code, locale);
+      if (data) {
+        return {
+          ...state,
+          data,
+        };
+      }
+    } else {
+      const data = await loadCustomEmojiByShortcode(state.code);
+      if (data) {
+        return {
+          ...state,
+          data,
+        };
+      }
+    }
+    // If not found, assume it's not an emoji and return null.
+    log(
+      'Could not find emoji %s of type %s for locale %s',
+      state.code,
+      state.type,
+      locale,
+    );
+    return null;
+  } catch (err: unknown) {
+    // If the locale is not loaded, load it and retry once.
+    if (!retry && err instanceof LocaleNotLoadedError) {
+      log(
+        'Error loading emoji %s for locale %s, loading locale and retrying.',
+        state.code,
+        locale,
+      );
+      await importEmojiData(locale); // Use this from the loader file as it can be awaited.
+      return loadEmojiDataToState(state, locale, true);
+    }
+
+    console.warn('Error loading emoji data, not retrying:', state, locale, err);
+    return null;
+  }
+}
+
+export function isStateLoaded(state: EmojiState): state is EmojiLoadedState {
+  return !!state.data;
+}
+
+/**
+ * Determines if the given token should be rendered as an image based on the emoji mode.
+ * @param state Emoji state to parse.
+ * @param mode Rendering mode.
+ * @returns Whether to render as an image.
+ */
+export function shouldRenderImage(state: EmojiState, mode: EmojiMode): boolean {
+  if (state.type === EMOJI_TYPE_UNICODE) {
+    // If the mode is native or native with flags for non-flag emoji
+    // we can just append the text node directly.
+    if (
+      mode === EMOJI_MODE_NATIVE ||
+      (mode === EMOJI_MODE_NATIVE_WITH_FLAGS &&
+        !stringHasUnicodeFlags(state.code))
+    ) {
+      return false;
+    }
+  }
+
+  return true;
+}
diff --git a/app/javascript/mastodon/features/emoji/types.ts b/app/javascript/mastodon/features/emoji/types.ts
new file mode 100644
index 00000000000..8cd0902aa4a
--- /dev/null
+++ b/app/javascript/mastodon/features/emoji/types.ts
@@ -0,0 +1,64 @@
+import type { List as ImmutableList } from 'immutable';
+
+import type { FlatCompactEmoji, Locale } from 'emojibase';
+
+import type { ApiCustomEmojiJSON } from '@/mastodon/api_types/custom_emoji';
+import type { CustomEmoji } from '@/mastodon/models/custom_emoji';
+
+import type {
+  EMOJI_MODE_NATIVE,
+  EMOJI_MODE_NATIVE_WITH_FLAGS,
+  EMOJI_MODE_TWEMOJI,
+  EMOJI_TYPE_CUSTOM,
+  EMOJI_TYPE_UNICODE,
+} from './constants';
+
+export type EmojiMode =
+  | typeof EMOJI_MODE_NATIVE
+  | typeof EMOJI_MODE_NATIVE_WITH_FLAGS
+  | typeof EMOJI_MODE_TWEMOJI;
+
+export type LocaleOrCustom = Locale | typeof EMOJI_TYPE_CUSTOM;
+
+export interface EmojiAppState {
+  locales: Locale[];
+  currentLocale: Locale;
+  mode: EmojiMode;
+  darkTheme: boolean;
+}
+
+export type CustomEmojiData = ApiCustomEmojiJSON;
+export type UnicodeEmojiData = FlatCompactEmoji;
+export type AnyEmojiData = CustomEmojiData | UnicodeEmojiData;
+
+type CustomEmojiRenderFields = Pick<
+  CustomEmojiData,
+  'shortcode' | 'static_url' | 'url'
+>;
+
+export interface EmojiStateUnicode {
+  type: typeof EMOJI_TYPE_UNICODE;
+  code: string;
+  data?: UnicodeEmojiData;
+}
+export interface EmojiStateCustom {
+  type: typeof EMOJI_TYPE_CUSTOM;
+  code: string;
+  data?: CustomEmojiRenderFields;
+}
+export type EmojiState = EmojiStateUnicode | EmojiStateCustom;
+
+export type EmojiLoadedState =
+  | Required<EmojiStateUnicode>
+  | Required<EmojiStateCustom>;
+
+export type CustomEmojiMapArg =
+  | ExtraCustomEmojiMap
+  | ImmutableList<CustomEmoji>
+  | CustomEmoji[]
+  | ApiCustomEmojiJSON[];
+
+export type ExtraCustomEmojiMap = Record<
+  string,
+  Pick<CustomEmojiData, 'shortcode' | 'static_url' | 'url'>
+>;
diff --git a/app/javascript/mastodon/features/emoji/utils.test.ts b/app/javascript/mastodon/features/emoji/utils.test.ts
new file mode 100644
index 00000000000..3844c814a10
--- /dev/null
+++ b/app/javascript/mastodon/features/emoji/utils.test.ts
@@ -0,0 +1,49 @@
+import { isCustomEmoji, isUnicodeEmoji, stringHasUnicodeFlags } from './utils';
+
+describe('isUnicodeEmoji', () => {
+  test.concurrent.for([
+    ['😊', true],
+    ['🇿🇼', true],
+    ['🏴‍☠️', true],
+    ['🏳️‍🌈', true],
+    ['foo', false],
+    [':smile:', false],
+    ['😊foo', false],
+  ] as const)('isUnicodeEmoji("%s") is %o', ([input, expected], { expect }) => {
+    expect(isUnicodeEmoji(input)).toBe(expected);
+  });
+});
+
+describe('isCustomEmoji', () => {
+  test.concurrent.for([
+    [':smile:', true],
+    [':smile_123:', true],
+    [':SMILE:', true],
+    ['😊', false],
+    ['foo', false],
+    [':smile', false],
+    ['smile:', false],
+  ] as const)('isCustomEmoji("%s") is %o', ([input, expected], { expect }) => {
+    expect(isCustomEmoji(input)).toBe(expected);
+  });
+});
+
+describe('stringHasUnicodeFlags', () => {
+  test.concurrent.for([
+    ['EU 🇪🇺', true],
+    ['Germany 🇩🇪', true],
+    ['Canada 🇨🇦', true],
+    ['São Tomé & Príncipe 🇸🇹', true],
+    ['Scotland 🏴󠁧󠁢󠁳󠁣󠁴󠁿', true],
+    ['black flag 🏴', false],
+    ['arrr 🏴‍☠️', false],
+    ['rainbow flag 🏳️‍🌈', false],
+    ['non-flag 🔥', false],
+    ['only text', false],
+  ] as const)(
+    'stringHasFlags has flag in "%s": %o',
+    ([text, expected], { expect }) => {
+      expect(stringHasUnicodeFlags(text)).toBe(expected);
+    },
+  );
+});
diff --git a/app/javascript/mastodon/features/emoji/utils.ts b/app/javascript/mastodon/features/emoji/utils.ts
new file mode 100644
index 00000000000..c567afc2ccc
--- /dev/null
+++ b/app/javascript/mastodon/features/emoji/utils.ts
@@ -0,0 +1,56 @@
+import debug from 'debug';
+
+import { emojiRegexPolyfill } from '@/mastodon/polyfills';
+
+export function emojiLogger(segment: string) {
+  return debug(`emojis:${segment}`);
+}
+
+export function isUnicodeEmoji(input: string): boolean {
+  return (
+    input.length > 0 &&
+    new RegExp(`^(${EMOJI_REGEX})+$`, supportedFlags()).test(input)
+  );
+}
+
+export function stringHasUnicodeFlags(input: string): boolean {
+  if (supportsRegExpSets()) {
+    return new RegExp(
+      '\\p{RGI_Emoji_Flag_Sequence}|\\p{RGI_Emoji_Tag_Sequence}',
+      'v',
+    ).test(input);
+  }
+  return new RegExp(
+    // First range is regional indicator symbols,
+    // Second is a black flag + 0-9|a-z tag chars + cancel tag.
+    // See: https://en.wikipedia.org/wiki/Regional_indicator_symbol
+    '(?:\uD83C[\uDDE6-\uDDFF]){2}|\uD83C\uDFF4(?:\uDB40[\uDC30-\uDC7A])+\uDB40\uDC7F',
+  ).test(input);
+}
+
+// Constant as this is supported by all browsers.
+const CUSTOM_EMOJI_REGEX = /:([a-z0-9_]+):/i;
+// Use the polyfill regex or the Unicode property escapes if supported.
+const EMOJI_REGEX = emojiRegexPolyfill?.source ?? '\\p{RGI_Emoji}';
+
+export function isCustomEmoji(input: string): boolean {
+  return new RegExp(`^${CUSTOM_EMOJI_REGEX.source}$`, 'i').test(input);
+}
+
+export function anyEmojiRegex() {
+  return new RegExp(
+    `${EMOJI_REGEX}|${CUSTOM_EMOJI_REGEX.source}`,
+    supportedFlags('gi'),
+  );
+}
+
+function supportsRegExpSets() {
+  return 'unicodeSets' in RegExp.prototype;
+}
+
+function supportedFlags(flags = '') {
+  if (supportsRegExpSets()) {
+    return `${flags}v`;
+  }
+  return flags;
+}
diff --git a/app/javascript/mastodon/features/emoji/worker.ts b/app/javascript/mastodon/features/emoji/worker.ts
new file mode 100644
index 00000000000..6fb7d36e936
--- /dev/null
+++ b/app/javascript/mastodon/features/emoji/worker.ts
@@ -0,0 +1,18 @@
+import { importEmojiData, importCustomEmojiData } from './loader';
+
+addEventListener('message', handleMessage);
+self.postMessage('ready'); // After the worker is ready, notify the main thread
+
+function handleMessage(event: MessageEvent<string>) {
+  const { data: locale } = event;
+  void loadData(locale);
+}
+
+async function loadData(locale: string) {
+  if (locale !== 'custom') {
+    await importEmojiData(locale);
+  } else {
+    await importCustomEmojiData();
+  }
+  self.postMessage(`loaded ${locale}`);
+}
diff --git a/app/javascript/mastodon/features/explore/components/author_link.jsx b/app/javascript/mastodon/features/explore/components/author_link.jsx
deleted file mode 100644
index 764ae753412..00000000000
--- a/app/javascript/mastodon/features/explore/components/author_link.jsx
+++ /dev/null
@@ -1,25 +0,0 @@
-import PropTypes from 'prop-types';
-
-import { Link } from 'react-router-dom';
-
-import { Avatar } from 'mastodon/components/avatar';
-import { useAppSelector } from 'mastodon/store';
-
-export const AuthorLink = ({ accountId }) => {
-  const account = useAppSelector(state => state.getIn(['accounts', accountId]));
-
-  if (!account) {
-    return null;
-  }
-
-  return (
-    <Link to={`/@${account.get('acct')}`} className='story__details__shared__author-link' data-hover-card-account={accountId}>
-      <Avatar account={account} size={16} />
-      <bdi dangerouslySetInnerHTML={{ __html: account.get('display_name_html') }} />
-    </Link>
-  );
-};
-
-AuthorLink.propTypes = {
-  accountId: PropTypes.string.isRequired,
-};
diff --git a/app/javascript/mastodon/features/explore/components/author_link.tsx b/app/javascript/mastodon/features/explore/components/author_link.tsx
new file mode 100644
index 00000000000..a4667693a59
--- /dev/null
+++ b/app/javascript/mastodon/features/explore/components/author_link.tsx
@@ -0,0 +1,22 @@
+import type { FC } from 'react';
+
+import { LinkedDisplayName } from '@/mastodon/components/display_name';
+import { Avatar } from 'mastodon/components/avatar';
+import { useAppSelector } from 'mastodon/store';
+
+export const AuthorLink: FC<{ accountId: string }> = ({ accountId }) => {
+  const account = useAppSelector((state) => state.accounts.get(accountId));
+
+  if (!account) {
+    return null;
+  }
+
+  return (
+    <LinkedDisplayName
+      displayProps={{ account, variant: 'simple' }}
+      className='story__details__shared__author-link'
+    >
+      <Avatar account={account} size={16} />
+    </LinkedDisplayName>
+  );
+};
diff --git a/app/javascript/mastodon/features/firehose/index.jsx b/app/javascript/mastodon/features/firehose/index.jsx
index ff80aac2200..69db171cddc 100644
--- a/app/javascript/mastodon/features/firehose/index.jsx
+++ b/app/javascript/mastodon/features/firehose/index.jsx
@@ -13,7 +13,7 @@ import { changeSetting } from 'mastodon/actions/settings';
 import { connectPublicStream, connectCommunityStream } from 'mastodon/actions/streaming';
 import { expandPublicTimeline, expandCommunityTimeline } from 'mastodon/actions/timelines';
 import { DismissableBanner } from 'mastodon/components/dismissable_banner';
-import { domain } from 'mastodon/initial_state';
+import { localLiveFeedAccess, remoteLiveFeedAccess, me, domain } from 'mastodon/initial_state';
 import { useAppDispatch, useAppSelector } from 'mastodon/store';
 
 import Column from '../../components/column';
@@ -165,19 +165,21 @@ const Firehose = ({ feedType, multiColumn }) => {
         <ColumnSettings />
       </ColumnHeader>
 
-      <div className='account__section-headline'>
-        <NavLink exact to='/public/local'>
-          <FormattedMessage tagName='div' id='firehose.local' defaultMessage='This server' />
-        </NavLink>
+      {(signedIn || (localLiveFeedAccess === 'public' && remoteLiveFeedAccess === 'public')) && (
+        <div className='account__section-headline'>
+          <NavLink exact to='/public/local'>
+            <FormattedMessage tagName='div' id='firehose.local' defaultMessage='This server' />
+          </NavLink>
 
-        <NavLink exact to='/public/remote'>
-          <FormattedMessage tagName='div' id='firehose.remote' defaultMessage='Other servers' />
-        </NavLink>
+          <NavLink exact to='/public/remote'>
+            <FormattedMessage tagName='div' id='firehose.remote' defaultMessage='Other servers' />
+          </NavLink>
 
-        <NavLink exact to='/public'>
-          <FormattedMessage tagName='div' id='firehose.all' defaultMessage='All' />
-        </NavLink>
-      </div>
+          <NavLink exact to='/public'>
+            <FormattedMessage tagName='div' id='firehose.all' defaultMessage='All' />
+          </NavLink>
+        </div>
+      )}
 
       <StatusListContainer
         prepend={prependBanner}
diff --git a/app/javascript/mastodon/features/follow_requests/components/account_authorize.jsx b/app/javascript/mastodon/features/follow_requests/components/account_authorize.jsx
index dd308c87cb1..e865b606fe3 100644
--- a/app/javascript/mastodon/features/follow_requests/components/account_authorize.jsx
+++ b/app/javascript/mastodon/features/follow_requests/components/account_authorize.jsx
@@ -10,9 +10,10 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
 import CheckIcon from '@/material-icons/400-24px/check.svg?react';
 import CloseIcon from '@/material-icons/400-24px/close.svg?react';
 
-import { Avatar } from '../../../components/avatar';
-import { DisplayName } from '../../../components/display_name';
-import { IconButton } from '../../../components/icon_button';
+import { Avatar } from '@/mastodon/components/avatar';
+import { DisplayName } from '@/mastodon/components/display_name';
+import { IconButton } from '@/mastodon/components/icon_button';
+import { EmojiHTML } from '@/mastodon/components/emoji/html';
 
 const messages = defineMessages({
   authorize: { id: 'follow_request.authorize', defaultMessage: 'Authorize' },
@@ -30,7 +31,6 @@ class AccountAuthorize extends ImmutablePureComponent {
 
   render () {
     const { intl, account, onAuthorize, onReject } = this.props;
-    const content = { __html: account.get('note_emojified') };
 
     return (
       <div className='account-authorize__wrapper'>
@@ -40,7 +40,11 @@ class AccountAuthorize extends ImmutablePureComponent {
             <DisplayName account={account} />
           </Link>
 
-          <div className='account__header__content translate' dangerouslySetInnerHTML={content} />
+          <EmojiHTML
+            className='account__header__content translate'
+            htmlString={account.get('note_emojified')}
+            extraEmojis={account.get('emojis')}
+          />
         </div>
 
         <div className='account--panel'>
diff --git a/app/javascript/mastodon/features/getting_started/components/announcements.jsx b/app/javascript/mastodon/features/getting_started/components/announcements.jsx
index 87d7e2a3bec..96bd995d2b1 100644
--- a/app/javascript/mastodon/features/getting_started/components/announcements.jsx
+++ b/app/javascript/mastodon/features/getting_started/components/announcements.jsx
@@ -111,42 +111,14 @@ class ContentWithRouter extends ImmutablePureComponent {
     }
   };
 
-  handleMouseEnter = ({ currentTarget }) => {
-    if (autoPlayGif) {
-      return;
-    }
-
-    const emojis = currentTarget.querySelectorAll('.custom-emoji');
-
-    for (var i = 0; i < emojis.length; i++) {
-      let emoji = emojis[i];
-      emoji.src = emoji.getAttribute('data-original');
-    }
-  };
-
-  handleMouseLeave = ({ currentTarget }) => {
-    if (autoPlayGif) {
-      return;
-    }
-
-    const emojis = currentTarget.querySelectorAll('.custom-emoji');
-
-    for (var i = 0; i < emojis.length; i++) {
-      let emoji = emojis[i];
-      emoji.src = emoji.getAttribute('data-static');
-    }
-  };
-
   render () {
     const { announcement } = this.props;
 
     return (
       <div
-        className='announcements__item__content translate'
+        className='announcements__item__content translate animate-parent'
         ref={this.setRef}
         dangerouslySetInnerHTML={{ __html: announcement.get('contentHtml') }}
-        onMouseEnter={this.handleMouseEnter}
-        onMouseLeave={this.handleMouseLeave}
       />
     );
   }
@@ -238,9 +210,21 @@ class Reaction extends ImmutablePureComponent {
     }
 
     return (
-      <animated.button className={classNames('reactions-bar__item', { active: reaction.get('me') })} onClick={this.handleClick} onMouseEnter={this.handleMouseEnter} onMouseLeave={this.handleMouseLeave} title={`:${shortCode}:`} style={this.props.style}>
-        <span className='reactions-bar__item__emoji'><Emoji hovered={this.state.hovered} emoji={reaction.get('name')} emojiMap={this.props.emojiMap} /></span>
-        <span className='reactions-bar__item__count'><AnimatedNumber value={reaction.get('count')} /></span>
+      <animated.button
+        className={classNames('reactions-bar__item', { active: reaction.get('me') })}
+        onClick={this.handleClick}
+        title={`:${shortCode}:`}
+        style={this.props.style}
+        // This does not use animate-parent as this component is directly rendered by React.
+        onMouseEnter={this.handleMouseEnter}
+        onMouseLeave={this.handleMouseLeave}
+      >
+        <span className='reactions-bar__item__emoji'>
+          <Emoji hovered={this.state.hovered} emoji={reaction.get('name')} emojiMap={this.props.emojiMap} />
+        </span>
+        <span className='reactions-bar__item__count'>
+          <AnimatedNumber value={reaction.get('count')} />
+        </span>
       </animated.button>
     );
   }
diff --git a/app/javascript/mastodon/features/hashtag_timeline/index.jsx b/app/javascript/mastodon/features/hashtag_timeline/index.jsx
index ab3c32e6a7b..1a7ffa6c23f 100644
--- a/app/javascript/mastodon/features/hashtag_timeline/index.jsx
+++ b/app/javascript/mastodon/features/hashtag_timeline/index.jsx
@@ -16,15 +16,21 @@ import { expandHashtagTimeline, clearTimeline } from 'mastodon/actions/timelines
 import Column from 'mastodon/components/column';
 import ColumnHeader from 'mastodon/components/column_header';
 import { identityContextPropShape, withIdentity } from 'mastodon/identity_context';
+import { remoteTopicFeedAccess, me } from 'mastodon/initial_state';
 
 import StatusListContainer from '../ui/containers/status_list_container';
 
 import { HashtagHeader } from './components/hashtag_header';
 import ColumnSettingsContainer from './containers/column_settings_container';
 
-const mapStateToProps = (state, props) => ({
-  hasUnread: state.getIn(['timelines', `hashtag:${props.params.id}${props.params.local ? ':local' : ''}`, 'unread']) > 0,
-});
+const mapStateToProps = (state, props) => {
+  const local = props.params.local || (!me && remoteTopicFeedAccess !== 'public');
+
+  return ({
+    local,
+    hasUnread: state.getIn(['timelines', `hashtag:${props.params.id}${local ? ':local' : ''}`, 'unread']) > 0,
+  });
+};
 
 class HashtagTimeline extends PureComponent {
   disconnects = [];
@@ -113,16 +119,16 @@ class HashtagTimeline extends PureComponent {
   }
 
   _unload () {
-    const { dispatch } = this.props;
-    const { id, local } = this.props.params;
+    const { dispatch, local } = this.props;
+    const { id } = this.props.params;
 
     this._unsubscribe();
     dispatch(clearTimeline(`hashtag:${id}${local ? ':local' : ''}`));
   }
 
   _load() {
-    const { dispatch } = this.props;
-    const { id, tags, local } = this.props.params;
+    const { dispatch, local } = this.props;
+    const { id, tags } = this.props.params;
 
     this._subscribe(dispatch, id, tags, local);
     dispatch(expandHashtagTimeline(id, { tags, local }));
@@ -133,8 +139,8 @@ class HashtagTimeline extends PureComponent {
   }
 
   componentDidUpdate (prevProps) {
-    const { params } = this.props;
-    const { id, tags, local } = prevProps.params;
+    const { params, local } = this.props;
+    const { id, tags } = prevProps.params;
 
     if (id !== params.id || !isEqual(tags, params.tags) || !isEqual(local, params.local)) {
       this._unload();
@@ -151,15 +157,15 @@ class HashtagTimeline extends PureComponent {
   };
 
   handleLoadMore = maxId => {
-    const { dispatch, params } = this.props;
-    const { id, tags, local }  = params;
+    const { dispatch, params, local } = this.props;
+    const { id, tags }  = params;
 
     dispatch(expandHashtagTimeline(id, { maxId, tags, local }));
   };
 
   render () {
-    const { hasUnread, columnId, multiColumn } = this.props;
-    const { id, local } = this.props.params;
+    const { hasUnread, columnId, multiColumn, local } = this.props;
+    const { id } = this.props.params;
     const pinned = !!columnId;
 
     return (
diff --git a/app/javascript/mastodon/features/home_timeline/components/announcements/announcement.tsx b/app/javascript/mastodon/features/home_timeline/components/announcements/announcement.tsx
new file mode 100644
index 00000000000..8513e6169bd
--- /dev/null
+++ b/app/javascript/mastodon/features/home_timeline/components/announcements/announcement.tsx
@@ -0,0 +1,119 @@
+import { useEffect, useState } from 'react';
+import type { FC } from 'react';
+
+import { FormattedDate, FormattedMessage } from 'react-intl';
+
+import type { ApiAnnouncementJSON } from '@/mastodon/api_types/announcements';
+import { AnimateEmojiProvider } from '@/mastodon/components/emoji/context';
+import { EmojiHTML } from '@/mastodon/components/emoji/html';
+
+import { ReactionsBar } from './reactions';
+
+export interface IAnnouncement extends ApiAnnouncementJSON {
+  contentHtml: string;
+}
+
+interface AnnouncementProps {
+  announcement: IAnnouncement;
+  selected: boolean;
+}
+
+export const Announcement: FC<AnnouncementProps> = ({
+  announcement,
+  selected,
+}) => {
+  const [unread, setUnread] = useState(!announcement.read);
+  useEffect(() => {
+    // Only update `unread` marker once the announcement is out of view
+    if (!selected && unread !== !announcement.read) {
+      setUnread(!announcement.read);
+    }
+  }, [announcement.read, selected, unread]);
+
+  return (
+    <AnimateEmojiProvider className='announcements__item'>
+      <strong className='announcements__item__range'>
+        <FormattedMessage
+          id='announcement.announcement'
+          defaultMessage='Announcement'
+        />
+        <span>
+          {' · '}
+          <Timestamp announcement={announcement} />
+        </span>
+      </strong>
+
+      <EmojiHTML
+        className='announcements__item__content translate'
+        htmlString={announcement.contentHtml}
+        extraEmojis={announcement.emojis}
+      />
+
+      <ReactionsBar reactions={announcement.reactions} id={announcement.id} />
+
+      {unread && <span className='announcements__item__unread' />}
+    </AnimateEmojiProvider>
+  );
+};
+
+const Timestamp: FC<Pick<AnnouncementProps, 'announcement'>> = ({
+  announcement,
+}) => {
+  const startsAt = announcement.starts_at && new Date(announcement.starts_at);
+  const endsAt = announcement.ends_at && new Date(announcement.ends_at);
+  const now = new Date();
+  const hasTimeRange = startsAt && endsAt;
+  const skipTime = announcement.all_day;
+
+  if (hasTimeRange) {
+    const skipYear =
+      startsAt.getFullYear() === endsAt.getFullYear() &&
+      endsAt.getFullYear() === now.getFullYear();
+    const skipEndDate =
+      startsAt.getDate() === endsAt.getDate() &&
+      startsAt.getMonth() === endsAt.getMonth() &&
+      startsAt.getFullYear() === endsAt.getFullYear();
+    return (
+      <>
+        <FormattedDate
+          value={startsAt}
+          year={
+            skipYear || startsAt.getFullYear() === now.getFullYear()
+              ? undefined
+              : 'numeric'
+          }
+          month='short'
+          day='2-digit'
+          hour={skipTime ? undefined : '2-digit'}
+          minute={skipTime ? undefined : '2-digit'}
+        />{' '}
+        -{' '}
+        <FormattedDate
+          value={endsAt}
+          year={
+            skipYear || endsAt.getFullYear() === now.getFullYear()
+              ? undefined
+              : 'numeric'
+          }
+          month={skipEndDate ? undefined : 'short'}
+          day={skipEndDate ? undefined : '2-digit'}
+          hour={skipTime ? undefined : '2-digit'}
+          minute={skipTime ? undefined : '2-digit'}
+        />
+      </>
+    );
+  }
+  const publishedAt = new Date(announcement.published_at);
+  return (
+    <FormattedDate
+      value={publishedAt}
+      year={
+        publishedAt.getFullYear() === now.getFullYear() ? undefined : 'numeric'
+      }
+      month='short'
+      day='2-digit'
+      hour={skipTime ? undefined : '2-digit'}
+      minute={skipTime ? undefined : '2-digit'}
+    />
+  );
+};
diff --git a/app/javascript/mastodon/features/home_timeline/components/announcements/index.tsx b/app/javascript/mastodon/features/home_timeline/components/announcements/index.tsx
new file mode 100644
index 00000000000..8c7c704849d
--- /dev/null
+++ b/app/javascript/mastodon/features/home_timeline/components/announcements/index.tsx
@@ -0,0 +1,118 @@
+import { useCallback, useState } from 'react';
+import type { FC } from 'react';
+
+import { defineMessages, useIntl } from 'react-intl';
+
+import type { Map, List } from 'immutable';
+
+import ReactSwipeableViews from 'react-swipeable-views';
+
+import elephantUIPlane from '@/images/elephant_ui_plane.svg';
+import { CustomEmojiProvider } from '@/mastodon/components/emoji/context';
+import { IconButton } from '@/mastodon/components/icon_button';
+import LegacyAnnouncements from '@/mastodon/features/getting_started/containers/announcements_container';
+import { mascot, reduceMotion } from '@/mastodon/initial_state';
+import { createAppSelector, useAppSelector } from '@/mastodon/store';
+import { isModernEmojiEnabled } from '@/mastodon/utils/environment';
+import ChevronLeftIcon from '@/material-icons/400-24px/chevron_left.svg?react';
+import ChevronRightIcon from '@/material-icons/400-24px/chevron_right.svg?react';
+
+import type { IAnnouncement } from './announcement';
+import { Announcement } from './announcement';
+
+const messages = defineMessages({
+  close: { id: 'lightbox.close', defaultMessage: 'Close' },
+  previous: { id: 'lightbox.previous', defaultMessage: 'Previous' },
+  next: { id: 'lightbox.next', defaultMessage: 'Next' },
+});
+
+const announcementSelector = createAppSelector(
+  [(state) => state.announcements as Map<string, List<Map<string, unknown>>>],
+  (announcements) =>
+    (announcements.get('items')?.toJS() as IAnnouncement[] | undefined) ?? [],
+);
+
+export const ModernAnnouncements: FC = () => {
+  const intl = useIntl();
+
+  const announcements = useAppSelector(announcementSelector);
+  const emojis = useAppSelector((state) => state.custom_emojis);
+
+  const [index, setIndex] = useState(0);
+  const handleChangeIndex = useCallback(
+    (idx: number) => {
+      setIndex(idx % announcements.length);
+    },
+    [announcements.length],
+  );
+  const handleNextIndex = useCallback(() => {
+    setIndex((prevIndex) => (prevIndex + 1) % announcements.length);
+  }, [announcements.length]);
+  const handlePrevIndex = useCallback(() => {
+    setIndex((prevIndex) =>
+      prevIndex === 0 ? announcements.length - 1 : prevIndex - 1,
+    );
+  }, [announcements.length]);
+
+  if (announcements.length === 0) {
+    return null;
+  }
+
+  return (
+    <div className='announcements'>
+      <img
+        className='announcements__mastodon'
+        alt=''
+        draggable='false'
+        src={mascot ?? elephantUIPlane}
+      />
+
+      <div className='announcements__container'>
+        <CustomEmojiProvider emojis={emojis}>
+          <ReactSwipeableViews
+            animateHeight
+            animateTransitions={!reduceMotion}
+            index={index}
+            onChangeIndex={handleChangeIndex}
+          >
+            {announcements
+              .map((announcement, idx) => (
+                <Announcement
+                  key={announcement.id}
+                  announcement={announcement}
+                  selected={index === idx}
+                />
+              ))
+              .reverse()}
+          </ReactSwipeableViews>
+        </CustomEmojiProvider>
+
+        {announcements.length > 1 && (
+          <div className='announcements__pagination'>
+            <IconButton
+              disabled={announcements.length === 1}
+              title={intl.formatMessage(messages.previous)}
+              icon='chevron-left'
+              iconComponent={ChevronLeftIcon}
+              onClick={handlePrevIndex}
+            />
+            <span>
+              {index + 1} / {announcements.length}
+            </span>
+            <IconButton
+              disabled={announcements.length === 1}
+              title={intl.formatMessage(messages.next)}
+              icon='chevron-right'
+              iconComponent={ChevronRightIcon}
+              onClick={handleNextIndex}
+            />
+          </div>
+        )}
+      </div>
+    </div>
+  );
+};
+
+export const Announcements = isModernEmojiEnabled()
+  ? ModernAnnouncements
+  : LegacyAnnouncements;
diff --git a/app/javascript/mastodon/features/home_timeline/components/announcements/reactions.tsx b/app/javascript/mastodon/features/home_timeline/components/announcements/reactions.tsx
new file mode 100644
index 00000000000..481e87f190b
--- /dev/null
+++ b/app/javascript/mastodon/features/home_timeline/components/announcements/reactions.tsx
@@ -0,0 +1,108 @@
+import { useCallback, useMemo } from 'react';
+import type { FC, HTMLAttributes } from 'react';
+
+import classNames from 'classnames';
+
+import type { AnimatedProps } from '@react-spring/web';
+import { animated, useTransition } from '@react-spring/web';
+
+import { addReaction, removeReaction } from '@/mastodon/actions/announcements';
+import type { ApiAnnouncementReactionJSON } from '@/mastodon/api_types/announcements';
+import { AnimatedNumber } from '@/mastodon/components/animated_number';
+import { Emoji } from '@/mastodon/components/emoji';
+import { Icon } from '@/mastodon/components/icon';
+import EmojiPickerDropdown from '@/mastodon/features/compose/containers/emoji_picker_dropdown_container';
+import { isUnicodeEmoji } from '@/mastodon/features/emoji/utils';
+import { useAppDispatch } from '@/mastodon/store';
+import AddIcon from '@/material-icons/400-24px/add.svg?react';
+
+export const ReactionsBar: FC<{
+  reactions: ApiAnnouncementReactionJSON[];
+  id: string;
+}> = ({ reactions, id }) => {
+  const visibleReactions = useMemo(
+    () => reactions.filter((x) => x.count > 0),
+    [reactions],
+  );
+
+  const dispatch = useAppDispatch();
+  const handleEmojiPick = useCallback(
+    (emoji: { native: string }) => {
+      dispatch(addReaction(id, emoji.native.replaceAll(/:/g, '')));
+    },
+    [dispatch, id],
+  );
+
+  const transitions = useTransition(visibleReactions, {
+    from: {
+      scale: 0,
+    },
+    enter: {
+      scale: 1,
+    },
+    leave: {
+      scale: 0,
+    },
+    keys: visibleReactions.map((x) => x.name),
+  });
+
+  return (
+    <div
+      className={classNames('reactions-bar', {
+        'reactions-bar--empty': visibleReactions.length === 0,
+      })}
+    >
+      {transitions(({ scale }, reaction) => (
+        <Reaction
+          key={reaction.name}
+          reaction={reaction}
+          style={{ transform: scale.to((s) => `scale(${s})`) }}
+          id={id}
+        />
+      ))}
+
+      {visibleReactions.length < 8 && (
+        <EmojiPickerDropdown
+          onPickEmoji={handleEmojiPick}
+          button={<Icon id='plus' icon={AddIcon} />}
+        />
+      )}
+    </div>
+  );
+};
+
+const Reaction: FC<{
+  reaction: ApiAnnouncementReactionJSON;
+  id: string;
+  style: AnimatedProps<HTMLAttributes<HTMLButtonElement>>['style'];
+}> = ({ id, reaction, style }) => {
+  const dispatch = useAppDispatch();
+  const handleClick = useCallback(() => {
+    if (reaction.me) {
+      dispatch(removeReaction(id, reaction.name));
+    } else {
+      dispatch(addReaction(id, reaction.name));
+    }
+  }, [dispatch, id, reaction.me, reaction.name]);
+
+  const code = isUnicodeEmoji(reaction.name)
+    ? reaction.name
+    : `:${reaction.name}:`;
+
+  return (
+    <animated.button
+      className={classNames('reactions-bar__item', {
+        active: reaction.me,
+      })}
+      onClick={handleClick}
+      style={style}
+    >
+      <span className='reactions-bar__item__emoji'>
+        <Emoji code={code} />
+      </span>
+      <span className='reactions-bar__item__count'>
+        <AnimatedNumber value={reaction.count} />
+      </span>
+    </animated.button>
+  );
+};
diff --git a/app/javascript/mastodon/features/home_timeline/components/inline_follow_suggestions.tsx b/app/javascript/mastodon/features/home_timeline/components/inline_follow_suggestions.tsx
index 777ffb4e188..05799ccb824 100644
--- a/app/javascript/mastodon/features/home_timeline/components/inline_follow_suggestions.tsx
+++ b/app/javascript/mastodon/features/home_timeline/components/inline_follow_suggestions.tsx
@@ -1,4 +1,4 @@
-import { useEffect, useCallback, useRef, useState } from 'react';
+import { useEffect, useCallback, useRef, useState, useId } from 'react';
 
 import { FormattedMessage, useIntl, defineMessages } from 'react-intl';
 
@@ -19,13 +19,12 @@ import { DisplayName } from 'mastodon/components/display_name';
 import { FollowButton } from 'mastodon/components/follow_button';
 import { Icon } from 'mastodon/components/icon';
 import { IconButton } from 'mastodon/components/icon_button';
+import { LoadingIndicator } from 'mastodon/components/loading_indicator';
 import { VerifiedBadge } from 'mastodon/components/verified_badge';
 import { domain } from 'mastodon/initial_state';
 import { useAppDispatch, useAppSelector } from 'mastodon/store';
 
 const messages = defineMessages({
-  follow: { id: 'account.follow', defaultMessage: 'Follow' },
-  unfollow: { id: 'account.unfollow', defaultMessage: 'Unfollow' },
   previous: { id: 'lightbox.previous', defaultMessage: 'Previous' },
   next: { id: 'lightbox.next', defaultMessage: 'Next' },
   dismiss: {
@@ -56,9 +55,7 @@ const messages = defineMessages({
   },
 });
 
-const Source: React.FC<{
-  id: ApiSuggestionSourceJSON;
-}> = ({ id }) => {
+const Source: React.FC<{ id: ApiSuggestionSourceJSON }> = ({ id }) => {
   const intl = useIntl();
 
   let label, hint;
@@ -168,10 +165,11 @@ const Card: React.FC<{
 
 const DISMISSIBLE_ID = 'home/follow-suggestions';
 
-export const InlineFollowSuggestions: React.FC<{
-  hidden?: boolean;
-}> = ({ hidden }) => {
+export const InlineFollowSuggestions: React.FC<{ hidden?: boolean }> = ({
+  hidden,
+}) => {
   const intl = useIntl();
+  const uniqueId = useId();
   const dispatch = useAppDispatch();
   const suggestions = useAppSelector((state) => state.suggestions.items);
   const isLoading = useAppSelector((state) => state.suggestions.isLoading);
@@ -257,9 +255,14 @@ export const InlineFollowSuggestions: React.FC<{
   }
 
   return (
-    <div className='inline-follow-suggestions'>
+    <div
+      role='group'
+      aria-labelledby={uniqueId}
+      className='inline-follow-suggestions focusable'
+      tabIndex={-1}
+    >
       <div className='inline-follow-suggestions__header'>
-        <h3>
+        <h3 id={uniqueId}>
           <FormattedMessage
             id='follow_suggestions.who_to_follow'
             defaultMessage='Who to follow'
@@ -288,13 +291,17 @@ export const InlineFollowSuggestions: React.FC<{
           ref={bodyRef}
           onScroll={handleScroll}
         >
-          {suggestions.map((suggestion) => (
-            <Card
-              key={suggestion.account_id}
-              id={suggestion.account_id}
-              sources={suggestion.sources}
-            />
-          ))}
+          {isLoading ? (
+            <LoadingIndicator />
+          ) : (
+            suggestions.map((suggestion) => (
+              <Card
+                key={suggestion.account_id}
+                id={suggestion.account_id}
+                sources={suggestion.sources}
+              />
+            ))
+          )}
         </div>
 
         {canScrollLeft && (
diff --git a/app/javascript/mastodon/features/home_timeline/index.jsx b/app/javascript/mastodon/features/home_timeline/index.jsx
index 39a8355b899..8c5555fd49e 100644
--- a/app/javascript/mastodon/features/home_timeline/index.jsx
+++ b/app/javascript/mastodon/features/home_timeline/index.jsx
@@ -14,7 +14,6 @@ import { SymbolLogo } from 'mastodon/components/logo';
 import { fetchAnnouncements, toggleShowAnnouncements } from 'mastodon/actions/announcements';
 import { IconWithBadge } from 'mastodon/components/icon_with_badge';
 import { NotSignedInIndicator } from 'mastodon/components/not_signed_in_indicator';
-import AnnouncementsContainer from 'mastodon/features/getting_started/containers/announcements_container';
 import { identityContextPropShape, withIdentity } from 'mastodon/identity_context';
 import { criticalUpdatesPending } from 'mastodon/initial_state';
 import { withBreakpoint } from 'mastodon/features/ui/hooks/useBreakpoint';
@@ -27,6 +26,7 @@ import StatusListContainer from '../ui/containers/status_list_container';
 
 import { ColumnSettings } from './components/column_settings';
 import { CriticalUpdateBanner } from './components/critical_update_banner';
+import { Announcements } from './components/announcements';
 
 const messages = defineMessages({
   title: { id: 'column.home', defaultMessage: 'Home' },
@@ -162,7 +162,7 @@ class HomeTimeline extends PureComponent {
           pinned={pinned}
           multiColumn={multiColumn}
           extraButton={announcementsButton}
-          appendContent={hasAnnouncements && showAnnouncements && <AnnouncementsContainer />}
+          appendContent={hasAnnouncements && showAnnouncements && <Announcements />}
         >
           <ColumnSettings />
         </ColumnHeader>
diff --git a/app/javascript/mastodon/features/interaction_modal/index.tsx b/app/javascript/mastodon/features/interaction_modal/index.tsx
index 40d498d1ae1..d17521d1e3d 100644
--- a/app/javascript/mastodon/features/interaction_modal/index.tsx
+++ b/app/javascript/mastodon/features/interaction_modal/index.tsx
@@ -7,15 +7,10 @@ import classNames from 'classnames';
 import { escapeRegExp } from 'lodash';
 import { useDebouncedCallback } from 'use-debounce';
 
-import InsertChartIcon from '@/material-icons/400-24px/insert_chart.svg?react';
-import PersonAddIcon from '@/material-icons/400-24px/person_add.svg?react';
-import RepeatIcon from '@/material-icons/400-24px/repeat.svg?react';
-import ReplyIcon from '@/material-icons/400-24px/reply.svg?react';
-import StarIcon from '@/material-icons/400-24px/star.svg?react';
+import { DisplayName } from '@/mastodon/components/display_name';
 import { openModal, closeModal } from 'mastodon/actions/modal';
 import { apiRequest } from 'mastodon/api';
 import { Button } from 'mastodon/components/button';
-import { Icon } from 'mastodon/components/icon';
 import {
   domain as localDomain,
   registrationsOpen,
@@ -408,18 +403,15 @@ const LoginForm: React.FC<{
 const InteractionModal: React.FC<{
   accountId: string;
   url: string;
-  type: 'reply' | 'reblog' | 'favourite' | 'follow' | 'vote';
-}> = ({ accountId, url, type }) => {
+}> = ({ accountId, url }) => {
   const dispatch = useAppDispatch();
-  const displayNameHtml = useAppSelector(
-    (state) => state.accounts.get(accountId)?.display_name_html ?? '',
-  );
   const signupUrl = useAppSelector(
     (state) =>
       (state.server.getIn(['server', 'registrations', 'url'], null) ||
         '/auth/sign_up') as string,
   );
-  const name = <bdi dangerouslySetInnerHTML={{ __html: displayNameHtml }} />;
+  const account = useAppSelector((state) => state.accounts.get(accountId));
+  const name = <DisplayName account={account} variant='simple' />;
 
   const handleSignupClick = useCallback(() => {
     dispatch(
@@ -437,93 +429,6 @@ const InteractionModal: React.FC<{
     );
   }, [dispatch]);
 
-  let title: React.ReactNode,
-    icon: React.ReactNode,
-    actionPrompt: React.ReactNode;
-
-  switch (type) {
-    case 'reply':
-      icon = <Icon id='reply' icon={ReplyIcon} />;
-      title = (
-        <FormattedMessage
-          id='interaction_modal.title.reply'
-          defaultMessage="Reply to {name}'s post"
-          values={{ name }}
-        />
-      );
-      actionPrompt = (
-        <FormattedMessage
-          id='interaction_modal.action.reply'
-          defaultMessage='To continue, you need to reply from your account.'
-        />
-      );
-      break;
-    case 'reblog':
-      icon = <Icon id='retweet' icon={RepeatIcon} />;
-      title = (
-        <FormattedMessage
-          id='interaction_modal.title.reblog'
-          defaultMessage="Boost {name}'s post"
-          values={{ name }}
-        />
-      );
-      actionPrompt = (
-        <FormattedMessage
-          id='interaction_modal.action.reblog'
-          defaultMessage='To continue, you need to reblog from your account.'
-        />
-      );
-      break;
-    case 'favourite':
-      icon = <Icon id='star' icon={StarIcon} />;
-      title = (
-        <FormattedMessage
-          id='interaction_modal.title.favourite'
-          defaultMessage="Favorite {name}'s post"
-          values={{ name }}
-        />
-      );
-      actionPrompt = (
-        <FormattedMessage
-          id='interaction_modal.action.favourite'
-          defaultMessage='To continue, you need to favorite from your account.'
-        />
-      );
-      break;
-    case 'follow':
-      icon = <Icon id='user-plus' icon={PersonAddIcon} />;
-      title = (
-        <FormattedMessage
-          id='interaction_modal.title.follow'
-          defaultMessage='Follow {name}'
-          values={{ name }}
-        />
-      );
-      actionPrompt = (
-        <FormattedMessage
-          id='interaction_modal.action.follow'
-          defaultMessage='To continue, you need to follow from your account.'
-        />
-      );
-      break;
-    case 'vote':
-      icon = <Icon id='tasks' icon={InsertChartIcon} />;
-      title = (
-        <FormattedMessage
-          id='interaction_modal.title.vote'
-          defaultMessage="Vote in {name}'s poll"
-          values={{ name }}
-        />
-      );
-      actionPrompt = (
-        <FormattedMessage
-          id='interaction_modal.action.vote'
-          defaultMessage='To continue, you need to vote from your account.'
-        />
-      );
-      break;
-  }
-
   let signupButton;
 
   if (sso_redirect) {
@@ -559,9 +464,18 @@ const InteractionModal: React.FC<{
     <div className='modal-root__modal interaction-modal'>
       <div className='interaction-modal__lead'>
         <h3>
-          <span className='interaction-modal__icon'>{icon}</span> {title}
+          <FormattedMessage
+            id='interaction_modal.title'
+            defaultMessage='Sign in to continue'
+          />
         </h3>
-        <p>{actionPrompt}</p>
+        <p>
+          <FormattedMessage
+            id='interaction_modal.action'
+            defaultMessage="To interact with {name}'s post, you need to sign into your account on whatever Mastodon server you use."
+            values={{ name }}
+          />
+        </p>
       </div>
 
       <LoginForm resourceUrl={url} />
diff --git a/app/javascript/mastodon/features/keyboard_shortcuts/index.jsx b/app/javascript/mastodon/features/keyboard_shortcuts/index.jsx
index 285f0ea7cfe..01a4f0e1fd9 100644
--- a/app/javascript/mastodon/features/keyboard_shortcuts/index.jsx
+++ b/app/javascript/mastodon/features/keyboard_shortcuts/index.jsx
@@ -62,6 +62,10 @@ class KeyboardShortcuts extends ImmutablePureComponent {
                 <td><kbd>b</kbd></td>
                 <td><FormattedMessage id='keyboard_shortcuts.boost' defaultMessage='to boost' /></td>
               </tr>
+              <tr>
+                <td><kbd>q</kbd></td>
+                <td><FormattedMessage id='keyboard_shortcuts.quote' defaultMessage='Quote post' /></td>
+              </tr>
               <tr>
                 <td><kbd>enter</kbd>, <kbd>o</kbd></td>
                 <td><FormattedMessage id='keyboard_shortcuts.enter' defaultMessage='to open status' /></td>
@@ -83,13 +87,17 @@ class KeyboardShortcuts extends ImmutablePureComponent {
                 <td><FormattedMessage id='keyboard_shortcuts.toggle_sensitivity' defaultMessage='to show/hide media' /></td>
               </tr>
               <tr>
-                <td><kbd>up</kbd>, <kbd>k</kbd></td>
+                <td><kbd>k</kbd></td>
                 <td><FormattedMessage id='keyboard_shortcuts.up' defaultMessage='to move up in the list' /></td>
               </tr>
               <tr>
-                <td><kbd>down</kbd>, <kbd>j</kbd></td>
+                <td><kbd>j</kbd></td>
                 <td><FormattedMessage id='keyboard_shortcuts.down' defaultMessage='to move down in the list' /></td>
               </tr>
+              <tr>
+                <td><kbd>l</kbd></td>
+                <td><FormattedMessage id='keyboard_shortcuts.load_more' defaultMessage='Focus "Load more" button' /></td>
+              </tr>
               <tr>
                 <td><kbd>1</kbd>-<kbd>9</kbd></td>
                 <td><FormattedMessage id='keyboard_shortcuts.column' defaultMessage='to focus a status in one of the columns' /></td>
diff --git a/app/javascript/mastodon/features/navigation_panel/components/more_link.tsx b/app/javascript/mastodon/features/navigation_panel/components/more_link.tsx
index a26935eacf8..a3477ec4e55 100644
--- a/app/javascript/mastodon/features/navigation_panel/components/more_link.tsx
+++ b/app/javascript/mastodon/features/navigation_panel/components/more_link.tsx
@@ -50,16 +50,22 @@ export const MoreLink: React.FC = () => {
 
   const menu = useMemo(() => {
     const arr: MenuItem[] = [
-      { text: intl.formatMessage(messages.filters), href: '/filters' },
-      { text: intl.formatMessage(messages.mutes), to: '/mutes' },
-      { text: intl.formatMessage(messages.blocks), to: '/blocks' },
       {
-        text: intl.formatMessage(messages.domainBlocks),
-        to: '/domain_blocks',
+        href: '/filters',
+        text: intl.formatMessage(messages.filters),
+      },
+      {
+        to: '/mutes',
+        text: intl.formatMessage(messages.mutes),
+      },
+      {
+        to: '/blocks',
+        text: intl.formatMessage(messages.blocks),
+      },
+      {
+        to: '/domain_blocks',
+        text: intl.formatMessage(messages.domainBlocks),
       },
-    ];
-
-    arr.push(
       null,
       {
         href: '/settings/privacy',
@@ -77,7 +83,7 @@ export const MoreLink: React.FC = () => {
         href: '/settings/export',
         text: intl.formatMessage(messages.importExport),
       },
-    );
+    ];
 
     if (canManageReports(permissions)) {
       arr.push(null, {
@@ -106,7 +112,7 @@ export const MoreLink: React.FC = () => {
   }, [intl, dispatch, permissions]);
 
   return (
-    <Dropdown items={menu}>
+    <Dropdown items={menu} placement='bottom-start'>
       <button className='column-link column-link--transparent'>
         <Icon id='' icon={MoreHorizIcon} className='column-link__icon' />
 
diff --git a/app/javascript/mastodon/features/navigation_panel/index.tsx b/app/javascript/mastodon/features/navigation_panel/index.tsx
index b62e8f9fa62..d509bfb6c1d 100644
--- a/app/javascript/mastodon/features/navigation_panel/index.tsx
+++ b/app/javascript/mastodon/features/navigation_panel/index.tsx
@@ -35,7 +35,12 @@ import { Search } from 'mastodon/features/compose/components/search';
 import { ColumnLink } from 'mastodon/features/ui/components/column_link';
 import { useBreakpoint } from 'mastodon/features/ui/hooks/useBreakpoint';
 import { useIdentity } from 'mastodon/identity_context';
-import { timelinePreview, trendsEnabled, me } from 'mastodon/initial_state';
+import {
+  localLiveFeedAccess,
+  remoteLiveFeedAccess,
+  trendsEnabled,
+  me,
+} from 'mastodon/initial_state';
 import { transientSingleColumn } from 'mastodon/is_mobile';
 import { selectUnreadNotificationGroupsCount } from 'mastodon/selectors/notifications';
 import { useAppSelector, useAppDispatch } from 'mastodon/store';
@@ -257,10 +262,16 @@ export const NavigationPanel: React.FC<{ multiColumn?: boolean }> = ({
           />
         )}
 
-        {(signedIn || timelinePreview) && (
+        {(signedIn ||
+          localLiveFeedAccess === 'public' ||
+          remoteLiveFeedAccess === 'public') && (
           <ColumnLink
             transparent
-            to='/public/local'
+            to={
+              signedIn || localLiveFeedAccess === 'public'
+                ? '/public/local'
+                : '/public/remote'
+            }
             icon='globe'
             iconComponent={PublicIcon}
             isActive={isFirehoseActive}
@@ -431,6 +442,7 @@ export const CollapsibleNavigationPanel: React.FC = () => {
       filterTaps: true,
       bounds: isLtrDir ? { left: 0 } : { right: 0 },
       rubberband: true,
+      enabled: openable,
     },
   );
 
diff --git a/app/javascript/mastodon/features/notifications/components/column_settings.jsx b/app/javascript/mastodon/features/notifications/components/column_settings.jsx
index 9616adcb937..b1f4e598185 100644
--- a/app/javascript/mastodon/features/notifications/components/column_settings.jsx
+++ b/app/javascript/mastodon/features/notifications/components/column_settings.jsx
@@ -143,6 +143,17 @@ class ColumnSettings extends PureComponent {
           </div>
         </section>
 
+        <section role='group' aria-labelledby='notifications-quote'>
+          <h3 id='notifications-quote'><FormattedMessage id='notifications.column_settings.quote' defaultMessage='Quotes:' /></h3>
+
+          <div className='column-settings__row'>
+            <SettingToggle disabled={browserPermission === 'denied'} prefix='notifications_desktop' settings={settings} settingPath={['alerts', 'quote']} onChange={onChange} label={alertStr} />
+            {showPushSettings && <SettingToggle prefix='notifications_push' settings={pushSettings} settingPath={['alerts', 'quote']} onChange={this.onPushChange} label={pushStr} />}
+            <SettingToggle prefix='notifications' settings={settings} settingPath={['shows', 'quote']} onChange={onChange} label={showStr} />
+            <SettingToggle prefix='notifications' settings={settings} settingPath={['sounds', 'quote']} onChange={onChange} label={soundStr} />
+          </div>
+        </section>
+
         <section role='group' aria-labelledby='notifications-poll'>
           <h3 id='notifications-poll'><FormattedMessage id='notifications.column_settings.poll' defaultMessage='Poll results:' /></h3>
 
diff --git a/app/javascript/mastodon/features/notifications/components/notification.jsx b/app/javascript/mastodon/features/notifications/components/notification.jsx
index 86431f62fd5..4fbae1e047e 100644
--- a/app/javascript/mastodon/features/notifications/components/notification.jsx
+++ b/app/javascript/mastodon/features/notifications/components/notification.jsx
@@ -8,10 +8,9 @@ import { Link, withRouter } from 'react-router-dom';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 
-import { HotKeys } from 'react-hotkeys';
-
 import EditIcon from '@/material-icons/400-24px/edit.svg?react';
 import FlagIcon from '@/material-icons/400-24px/flag-fill.svg?react';
+import FormatQuoteIcon from '@/material-icons/400-24px/format_quote-fill.svg?react';
 import HomeIcon from '@/material-icons/400-24px/home-fill.svg?react';
 import InsertChartIcon from '@/material-icons/400-24px/insert_chart.svg?react';
 import PersonIcon from '@/material-icons/400-24px/person-fill.svg?react';
@@ -19,7 +18,9 @@ import PersonAddIcon from '@/material-icons/400-24px/person_add-fill.svg?react';
 import RepeatIcon from '@/material-icons/400-24px/repeat.svg?react';
 import StarIcon from '@/material-icons/400-24px/star-fill.svg?react';
 import { Account } from 'mastodon/components/account';
+import { LinkedDisplayName } from '@/mastodon/components/display_name';
 import { Icon }  from 'mastodon/components/icon';
+import { Hotkeys } from 'mastodon/components/hotkeys';
 import { StatusQuoteManager } from 'mastodon/components/status_quoted';
 import { me } from 'mastodon/initial_state';
 import { WithRouterPropTypes } from 'mastodon/utils/react_router';
@@ -38,10 +39,12 @@ const messages = defineMessages({
   reblog: { id: 'notification.reblog', defaultMessage: '{name} boosted your post' },
   status: { id: 'notification.status', defaultMessage: '{name} just posted' },
   update: { id: 'notification.update', defaultMessage: '{name} edited a post' },
+  quoted_update: { id: 'notification.quoted_update', defaultMessage: '{name} edited a post you have quoted' },
   adminSignUp: { id: 'notification.admin.sign_up', defaultMessage: '{name} signed up' },
   adminReport: { id: 'notification.admin.report', defaultMessage: '{name} reported {target}' },
   relationshipsSevered: { id: 'notification.relationships_severance_event', defaultMessage: 'Lost connections with {name}' },
   moderationWarning: { id: 'notification.moderation_warning', defaultMessage: 'You have received a moderation warning' },
+  quote: { id: 'notification.label.quote', defaultMessage: '{name} quoted your post'}
 });
 
 const notificationForScreenReader = (intl, message, timestamp) => {
@@ -56,8 +59,6 @@ class Notification extends ImmutablePureComponent {
   static propTypes = {
     notification: ImmutablePropTypes.map.isRequired,
     hidden: PropTypes.bool,
-    onMoveUp: PropTypes.func.isRequired,
-    onMoveDown: PropTypes.func.isRequired,
     onMention: PropTypes.func.isRequired,
     onFavourite: PropTypes.func.isRequired,
     onReblog: PropTypes.func.isRequired,
@@ -72,16 +73,6 @@ class Notification extends ImmutablePureComponent {
     ...WithRouterPropTypes,
   };
 
-  handleMoveUp = () => {
-    const { notification, onMoveUp } = this.props;
-    onMoveUp(notification.get('id'));
-  };
-
-  handleMoveDown = () => {
-    const { notification, onMoveDown } = this.props;
-    onMoveDown(notification.get('id'));
-  };
-
   handleOpen = () => {
     const { notification } = this.props;
 
@@ -127,8 +118,6 @@ class Notification extends ImmutablePureComponent {
       mention: this.handleMention,
       open: this.handleOpen,
       openProfile: this.handleOpenProfile,
-      moveUp: this.handleMoveUp,
-      moveDown: this.handleMoveDown,
       toggleHidden: this.handleHotkeyToggleHidden,
     };
   }
@@ -137,7 +126,7 @@ class Notification extends ImmutablePureComponent {
     const { intl, unread } = this.props;
 
     return (
-      <HotKeys handlers={this.getHandlers()}>
+      <Hotkeys handlers={this.getHandlers()}>
         <div className={classNames('notification notification-follow focusable', { unread })} tabIndex={0} aria-label={notificationForScreenReader(intl, intl.formatMessage(messages.follow, { name: account.get('acct') }), notification.get('created_at'))}>
           <div className='notification__message'>
             <Icon id='user-plus' icon={PersonAddIcon} />
@@ -149,7 +138,7 @@ class Notification extends ImmutablePureComponent {
 
           <Account id={account.get('id')} hidden={this.props.hidden} />
         </div>
-      </HotKeys>
+      </Hotkeys>
     );
   }
 
@@ -157,7 +146,7 @@ class Notification extends ImmutablePureComponent {
     const { intl, unread } = this.props;
 
     return (
-      <HotKeys handlers={this.getHandlers()}>
+      <Hotkeys handlers={this.getHandlers()}>
         <div className={classNames('notification notification-follow-request focusable', { unread })} tabIndex={0} aria-label={notificationForScreenReader(intl, intl.formatMessage({ id: 'notification.follow_request', defaultMessage: '{name} has requested to follow you' }, { name: account.get('acct') }), notification.get('created_at'))}>
           <div className='notification__message'>
             <Icon id='user' icon={PersonIcon} />
@@ -169,7 +158,7 @@ class Notification extends ImmutablePureComponent {
 
           <FollowRequestContainer id={account.get('id')} hidden={this.props.hidden} />
         </div>
-      </HotKeys>
+      </Hotkeys>
     );
   }
 
@@ -179,8 +168,6 @@ class Notification extends ImmutablePureComponent {
         id={notification.get('status')}
         withDismiss
         hidden={this.props.hidden}
-        onMoveDown={this.handleMoveDown}
-        onMoveUp={this.handleMoveUp}
         contextType='notifications'
         getScrollPosition={this.props.getScrollPosition}
         updateScrollBottom={this.props.updateScrollBottom}
@@ -195,7 +182,7 @@ class Notification extends ImmutablePureComponent {
     const { intl, unread } = this.props;
 
     return (
-      <HotKeys handlers={this.getHandlers()}>
+      <Hotkeys handlers={this.getHandlers()}>
         <div className={classNames('notification notification-favourite focusable', { unread })} tabIndex={0} aria-label={notificationForScreenReader(intl, intl.formatMessage(messages.favourite, { name: notification.getIn(['account', 'acct']) }), notification.get('created_at'))}>
           <div className='notification__message'>
             <Icon id='star' icon={StarIcon} className='star-icon' />
@@ -217,7 +204,7 @@ class Notification extends ImmutablePureComponent {
             cacheMediaWidth={this.props.cacheMediaWidth}
           />
         </div>
-      </HotKeys>
+      </Hotkeys>
     );
   }
 
@@ -225,7 +212,7 @@ class Notification extends ImmutablePureComponent {
     const { intl, unread } = this.props;
 
     return (
-      <HotKeys handlers={this.getHandlers()}>
+      <Hotkeys handlers={this.getHandlers()}>
         <div className={classNames('notification notification-reblog focusable', { unread })} tabIndex={0} aria-label={notificationForScreenReader(intl, intl.formatMessage(messages.reblog, { name: notification.getIn(['account', 'acct']) }), notification.get('created_at'))}>
           <div className='notification__message'>
             <Icon id='retweet' icon={RepeatIcon} />
@@ -247,7 +234,37 @@ class Notification extends ImmutablePureComponent {
             cacheMediaWidth={this.props.cacheMediaWidth}
           />
         </div>
-      </HotKeys>
+      </Hotkeys>
+    );
+  }
+
+  renderQuote (notification, link) {
+    const { intl, unread } = this.props;
+
+    return (
+      <Hotkeys handlers={this.getHandlers()}>
+        <div className={classNames('notification notification-quote focusable', { unread })} tabIndex={0} aria-label={notificationForScreenReader(intl, intl.formatMessage(messages.quote, { name: notification.getIn(['account', 'acct']) }), notification.get('created_at'))}>
+          <div className='notification__message'>
+            <Icon id='quote' icon={FormatQuoteIcon} />
+
+            <span title={notification.get('created_at')}>
+              <FormattedMessage id='notification.label.quote' defaultMessage='{name} quoted your post' values={{ name: link }} />
+            </span>
+          </div>
+
+          <StatusQuoteManager
+            id={notification.get('status')}
+            account={notification.get('account')}
+            muted
+            withDismiss
+            hidden={this.props.hidden}
+            getScrollPosition={this.props.getScrollPosition}
+            updateScrollBottom={this.props.updateScrollBottom}
+            cachedMediaWidth={this.props.cachedMediaWidth}
+            cacheMediaWidth={this.props.cacheMediaWidth}
+          />
+        </div>
+      </Hotkeys>
     );
   }
 
@@ -259,7 +276,7 @@ class Notification extends ImmutablePureComponent {
     }
 
     return (
-      <HotKeys handlers={this.getHandlers()}>
+      <Hotkeys handlers={this.getHandlers()}>
         <div className={classNames('notification notification-status focusable', { unread })} tabIndex={0} aria-label={notificationForScreenReader(intl, intl.formatMessage(messages.status, { name: notification.getIn(['account', 'acct']) }), notification.get('created_at'))}>
           <div className='notification__message'>
             <Icon id='home' icon={HomeIcon} />
@@ -282,7 +299,7 @@ class Notification extends ImmutablePureComponent {
             cacheMediaWidth={this.props.cacheMediaWidth}
           />
         </div>
-      </HotKeys>
+      </Hotkeys>
     );
   }
 
@@ -294,7 +311,7 @@ class Notification extends ImmutablePureComponent {
     }
 
     return (
-      <HotKeys handlers={this.getHandlers()}>
+      <Hotkeys handlers={this.getHandlers()}>
         <div className={classNames('notification notification-update focusable', { unread })} tabIndex={0} aria-label={notificationForScreenReader(intl, intl.formatMessage(messages.update, { name: notification.getIn(['account', 'acct']) }), notification.get('created_at'))}>
           <div className='notification__message'>
             <Icon id='pencil' icon={EditIcon} />
@@ -317,7 +334,42 @@ class Notification extends ImmutablePureComponent {
             cacheMediaWidth={this.props.cacheMediaWidth}
           />
         </div>
-      </HotKeys>
+      </Hotkeys>
+    );
+  }
+
+  renderQuotedUpdate (notification, link) {
+    const { intl, unread, status } = this.props;
+
+    if (!status) {
+      return null;
+    }
+
+    return (
+      <Hotkeys handlers={this.getHandlers()}>
+        <div className={classNames('notification notification-update focusable', { unread })} tabIndex={0} aria-label={notificationForScreenReader(intl, intl.formatMessage(messages.update, { name: notification.getIn(['account', 'acct']) }), notification.get('created_at'))}>
+          <div className='notification__message'>
+            <Icon id='pencil' icon={EditIcon} />
+
+            <span title={notification.get('created_at')}>
+              <FormattedMessage id='notification.quoted_update' defaultMessage='{name} edited a post you have quoted' values={{ name: link }} />
+            </span>
+          </div>
+
+          <StatusQuoteManager
+            id={notification.get('status')}
+            account={notification.get('account')}
+            contextType='notifications'
+            muted
+            withDismiss
+            hidden={this.props.hidden}
+            getScrollPosition={this.props.getScrollPosition}
+            updateScrollBottom={this.props.updateScrollBottom}
+            cachedMediaWidth={this.props.cachedMediaWidth}
+            cacheMediaWidth={this.props.cacheMediaWidth}
+          />
+        </div>
+      </Hotkeys>
     );
   }
 
@@ -331,7 +383,7 @@ class Notification extends ImmutablePureComponent {
     }
 
     return (
-      <HotKeys handlers={this.getHandlers()}>
+      <Hotkeys handlers={this.getHandlers()}>
         <div className={classNames('notification notification-poll focusable', { unread })} tabIndex={0} aria-label={notificationForScreenReader(intl, message, notification.get('created_at'))}>
           <div className='notification__message'>
             <Icon id='tasks' icon={InsertChartIcon} />
@@ -358,7 +410,7 @@ class Notification extends ImmutablePureComponent {
             cacheMediaWidth={this.props.cacheMediaWidth}
           />
         </div>
-      </HotKeys>
+      </Hotkeys>
     );
   }
 
@@ -371,7 +423,7 @@ class Notification extends ImmutablePureComponent {
     }
 
     return (
-      <HotKeys handlers={this.getHandlers()}>
+      <Hotkeys handlers={this.getHandlers()}>
         <div className={classNames('notification notification-severed-relationships focusable', { unread })} tabIndex={0} aria-label={notificationForScreenReader(intl, intl.formatMessage(messages.relationshipsSevered, { name: notification.getIn(['event', 'target_name']) }), notification.get('created_at'))}>
           <RelationshipsSeveranceEvent
             type={event.get('type')}
@@ -381,7 +433,7 @@ class Notification extends ImmutablePureComponent {
             hidden={hidden}
           />
         </div>
-      </HotKeys>
+      </Hotkeys>
     );
   }
 
@@ -394,7 +446,7 @@ class Notification extends ImmutablePureComponent {
     }
 
     return (
-      <HotKeys handlers={this.getHandlers()}>
+      <Hotkeys handlers={this.getHandlers()}>
         <div className={classNames('notification notification-moderation-warning focusable', { unread })} tabIndex={0} aria-label={notificationForScreenReader(intl, intl.formatMessage(messages.moderationWarning), notification.get('created_at'))}>
           <ModerationWarning
             action={warning.get('action')}
@@ -402,7 +454,7 @@ class Notification extends ImmutablePureComponent {
             hidden={hidden}
           />
         </div>
-      </HotKeys>
+      </Hotkeys>
     );
   }
 
@@ -410,7 +462,7 @@ class Notification extends ImmutablePureComponent {
     const { intl, unread } = this.props;
 
     return (
-      <HotKeys handlers={this.getHandlers()}>
+      <Hotkeys handlers={this.getHandlers()}>
         <div className={classNames('notification notification-admin-sign-up focusable', { unread })} tabIndex={0} aria-label={notificationForScreenReader(intl, intl.formatMessage(messages.adminSignUp, { name: account.get('acct') }), notification.get('created_at'))}>
           <div className='notification__message'>
             <Icon id='user-plus' icon={PersonAddIcon} />
@@ -422,7 +474,7 @@ class Notification extends ImmutablePureComponent {
 
           <Account id={account.get('id')} hidden={this.props.hidden} />
         </div>
-      </HotKeys>
+      </Hotkeys>
     );
   }
 
@@ -434,11 +486,13 @@ class Notification extends ImmutablePureComponent {
     }
 
     const targetAccount = report.get('target_account');
-    const targetDisplayNameHtml = { __html: targetAccount.get('display_name_html') };
-    const targetLink = <bdi><Link className='notification__display-name' title={targetAccount.get('acct')} data-hover-card-account={targetAccount.get('id')} to={`/@${targetAccount.get('acct')}`} dangerouslySetInnerHTML={targetDisplayNameHtml} /></bdi>;
+    const targetLink = <LinkedDisplayName
+      className='notification__display-name'
+      displayProps={{account:targetAccount, variant: 'simple'}}
+    />;
 
     return (
-      <HotKeys handlers={this.getHandlers()}>
+      <Hotkeys handlers={this.getHandlers()}>
         <div className={classNames('notification notification-admin-report focusable', { unread })} tabIndex={0} aria-label={notificationForScreenReader(intl, intl.formatMessage(messages.adminReport, { name: account.get('acct'), target: notification.getIn(['report', 'target_account', 'acct']) }), notification.get('created_at'))}>
           <div className='notification__message'>
             <Icon id='flag' icon={FlagIcon} />
@@ -450,15 +504,14 @@ class Notification extends ImmutablePureComponent {
 
           <Report account={account} report={notification.get('report')} hidden={this.props.hidden} />
         </div>
-      </HotKeys>
+      </Hotkeys>
     );
   }
 
   render () {
     const { notification } = this.props;
     const account          = notification.get('account');
-    const displayNameHtml  = { __html: account.get('display_name_html') };
-    const link             = <bdi><Link className='notification__display-name' href={`/@${account.get('acct')}`} title={account.get('acct')} data-hover-card-account={account.get('id')} to={`/@${account.get('acct')}`} dangerouslySetInnerHTML={displayNameHtml} /></bdi>;
+    const link             = <LinkedDisplayName className='notification__display-name' displayProps={{account, variant: 'simple'}} />;
 
     switch(notification.get('type')) {
     case 'follow':
@@ -467,6 +520,8 @@ class Notification extends ImmutablePureComponent {
       return this.renderFollowRequest(notification, account, link);
     case 'mention':
       return this.renderMention(notification);
+    case 'quote':
+      return this.renderQuote(notification);
     case 'favourite':
       return this.renderFavourite(notification, link);
     case 'reblog':
@@ -475,6 +530,8 @@ class Notification extends ImmutablePureComponent {
       return this.renderStatus(notification, link);
     case 'update':
       return this.renderUpdate(notification, link);
+    case 'quoted_update':
+      return this.renderQuotedUpdate(notification, link);
     case 'poll':
       return this.renderPoll(notification, account);
     case 'severed_relationships':
diff --git a/app/javascript/mastodon/features/notifications/components/notification_request.jsx b/app/javascript/mastodon/features/notifications/components/notification_request.jsx
index 381bb1153f4..76ac99894e3 100644
--- a/app/javascript/mastodon/features/notifications/components/notification_request.jsx
+++ b/app/javascript/mastodon/features/notifications/components/notification_request.jsx
@@ -16,6 +16,7 @@ import { acceptNotificationRequest, dismissNotificationRequest } from 'mastodon/
 import { initReport } from 'mastodon/actions/reports';
 import { Avatar } from 'mastodon/components/avatar';
 import { CheckBox } from 'mastodon/components/check_box';
+import { DisplayName } from '@/mastodon/components/display_name';
 import { IconButton } from 'mastodon/components/icon_button';
 import { Dropdown } from 'mastodon/components/dropdown_menu';
 import { makeGetAccount } from 'mastodon/selectors';
@@ -96,7 +97,7 @@ export const NotificationRequest = ({ id, accountId, notificationsCount, checked
 
         <div className='notification-request__name'>
           <div className='notification-request__name__display-name'>
-            <bdi><strong dangerouslySetInnerHTML={{ __html: account?.get('display_name_html') }} /></bdi>
+            <DisplayName account={account} variant='simple' />
           </div>
 
           <span>@{account?.get('acct')}</span>
diff --git a/app/javascript/mastodon/features/notifications/components/policy_controls.tsx b/app/javascript/mastodon/features/notifications/components/policy_controls.tsx
index 032c0ea4835..a4743b0c221 100644
--- a/app/javascript/mastodon/features/notifications/components/policy_controls.tsx
+++ b/app/javascript/mastodon/features/notifications/components/policy_controls.tsx
@@ -122,98 +122,93 @@ export const PolicyControls: React.FC = () => {
           value={notificationPolicy.for_not_following}
           onChange={handleFilterNotFollowing}
           options={options}
-        >
-          <strong>
+          label={
             <FormattedMessage
               id='notifications.policy.filter_not_following_title'
               defaultMessage="People you don't follow"
             />
-          </strong>
-          <span className='hint'>
+          }
+          hint={
             <FormattedMessage
               id='notifications.policy.filter_not_following_hint'
               defaultMessage='Until you manually approve them'
             />
-          </span>
-        </SelectWithLabel>
+          }
+        />
 
         <SelectWithLabel
           value={notificationPolicy.for_not_followers}
           onChange={handleFilterNotFollowers}
           options={options}
-        >
-          <strong>
+          label={
             <FormattedMessage
               id='notifications.policy.filter_not_followers_title'
               defaultMessage='People not following you'
             />
-          </strong>
-          <span className='hint'>
+          }
+          hint={
             <FormattedMessage
               id='notifications.policy.filter_not_followers_hint'
               defaultMessage='Including people who have been following you fewer than {days, plural, one {one day} other {# days}}'
               values={{ days: 3 }}
             />
-          </span>
-        </SelectWithLabel>
+          }
+        />
 
         <SelectWithLabel
           value={notificationPolicy.for_new_accounts}
           onChange={handleFilterNewAccounts}
           options={options}
-        >
-          <strong>
+          label={
             <FormattedMessage
               id='notifications.policy.filter_new_accounts_title'
               defaultMessage='New accounts'
             />
-          </strong>
-          <span className='hint'>
+          }
+          hint={
             <FormattedMessage
               id='notifications.policy.filter_new_accounts.hint'
               defaultMessage='Created within the past {days, plural, one {one day} other {# days}}'
               values={{ days: 30 }}
             />
-          </span>
-        </SelectWithLabel>
+          }
+        />
 
         <SelectWithLabel
           value={notificationPolicy.for_private_mentions}
           onChange={handleFilterPrivateMentions}
           options={options}
-        >
-          <strong>
+          label={
             <FormattedMessage
               id='notifications.policy.filter_private_mentions_title'
               defaultMessage='Unsolicited private mentions'
             />
-          </strong>
-          <span className='hint'>
+          }
+          hint={
             <FormattedMessage
               id='notifications.policy.filter_private_mentions_hint'
               defaultMessage="Filtered unless it's in reply to your own mention or if you follow the sender"
             />
-          </span>
-        </SelectWithLabel>
+          }
+        />
 
         <SelectWithLabel
           value={notificationPolicy.for_limited_accounts}
           onChange={handleFilterLimitedAccounts}
           options={options}
-        >
-          <strong>
+          label={
             <FormattedMessage
               id='notifications.policy.filter_limited_accounts_title'
               defaultMessage='Moderated accounts'
             />
-          </strong>
-          <span className='hint'>
+          }
+          hint={
             <FormattedMessage
               id='notifications.policy.filter_limited_accounts_hint'
               defaultMessage='Limited by server moderators'
             />
-          </span>
-        </SelectWithLabel>
+          }
+        />
       </div>
     </section>
   );
diff --git a/app/javascript/mastodon/features/notifications/components/select_with_label.tsx b/app/javascript/mastodon/features/notifications/components/select_with_label.tsx
index 413267c0f8c..0b755702d93 100644
--- a/app/javascript/mastodon/features/notifications/components/select_with_label.tsx
+++ b/app/javascript/mastodon/features/notifications/components/select_with_label.tsx
@@ -1,5 +1,5 @@
 import type { PropsWithChildren } from 'react';
-import { useCallback, useState, useRef } from 'react';
+import { useCallback, useState, useRef, useId } from 'react';
 
 import classNames from 'classnames';
 
@@ -16,6 +16,8 @@ interface DropdownProps {
   options: SelectItem[];
   disabled?: boolean;
   onChange: (value: string) => void;
+  'aria-labelledby': string;
+  'aria-describedby'?: string;
   placement?: Placement;
 }
 
@@ -24,51 +26,33 @@ const Dropdown: React.FC<DropdownProps> = ({
   options,
   disabled,
   onChange,
+  'aria-labelledby': ariaLabelledBy,
+  'aria-describedby': ariaDescribedBy,
   placement: initialPlacement = 'bottom-end',
 }) => {
-  const activeElementRef = useRef<Element | null>(null);
-  const containerRef = useRef(null);
+  const containerRef = useRef<HTMLDivElement>(null);
+  const buttonRef = useRef<HTMLButtonElement>(null);
   const [isOpen, setOpen] = useState<boolean>(false);
   const [placement, setPlacement] = useState<Placement>(initialPlacement);
-
-  const handleToggle = useCallback(() => {
-    if (
-      isOpen &&
-      activeElementRef.current &&
-      activeElementRef.current instanceof HTMLElement
-    ) {
-      activeElementRef.current.focus({ preventScroll: true });
-    }
-
-    setOpen(!isOpen);
-  }, [isOpen, setOpen]);
-
-  const handleMouseDown = useCallback(() => {
-    if (!isOpen) activeElementRef.current = document.activeElement;
-  }, [isOpen]);
-
-  const handleKeyDown = useCallback(
-    (e: React.KeyboardEvent) => {
-      switch (e.key) {
-        case ' ':
-        case 'Enter':
-          if (!isOpen) activeElementRef.current = document.activeElement;
-          break;
-      }
-    },
-    [isOpen],
-  );
+  const uniqueId = useId();
+  const menuId = `${uniqueId}-menu`;
+  const buttonLabelId = `${uniqueId}-button`;
 
   const handleClose = useCallback(() => {
-    if (
-      isOpen &&
-      activeElementRef.current &&
-      activeElementRef.current instanceof HTMLElement
-    )
-      activeElementRef.current.focus({ preventScroll: true });
+    if (isOpen && buttonRef.current) {
+      buttonRef.current.focus({ preventScroll: true });
+    }
     setOpen(false);
   }, [isOpen]);
 
+  const handleToggle = useCallback(() => {
+    if (isOpen) {
+      handleClose();
+    } else {
+      setOpen(true);
+    }
+  }, [isOpen, handleClose]);
+
   const handleOverlayEnter = useCallback(
     (state: Partial<PopperState>) => {
       if (state.placement) setPlacement(state.placement);
@@ -82,13 +66,18 @@ const Dropdown: React.FC<DropdownProps> = ({
     <div ref={containerRef}>
       <button
         type='button'
+        ref={buttonRef}
         onClick={handleToggle}
-        onMouseDown={handleMouseDown}
-        onKeyDown={handleKeyDown}
         disabled={disabled}
+        aria-expanded={isOpen}
+        aria-controls={menuId}
+        aria-labelledby={`${ariaLabelledBy} ${buttonLabelId}`}
+        aria-describedby={ariaDescribedBy}
         className={classNames('dropdown-button', { active: isOpen })}
       >
-        <span className='dropdown-button__label'>{valueOption?.text}</span>
+        <span id={buttonLabelId} className='dropdown-button__label'>
+          {valueOption?.text}
+        </span>
         <Icon id='down' icon={ArrowDropDownIcon} />
       </button>
 
@@ -101,7 +90,7 @@ const Dropdown: React.FC<DropdownProps> = ({
         popperConfig={{ strategy: 'fixed', onFirstUpdate: handleOverlayEnter }}
       >
         {({ props, placement }) => (
-          <div {...props}>
+          <div {...props} id={menuId}>
             <div
               className={`dropdown-animation privacy-dropdown__dropdown ${placement}`}
             >
@@ -123,6 +112,8 @@ const Dropdown: React.FC<DropdownProps> = ({
 interface Props {
   value: string;
   options: SelectItem[];
+  label: string | React.ReactElement;
+  hint: string | React.ReactElement;
   disabled?: boolean;
   onChange: (value: string) => void;
 }
@@ -130,23 +121,36 @@ interface Props {
 export const SelectWithLabel: React.FC<PropsWithChildren<Props>> = ({
   value,
   options,
+  label,
+  hint,
   disabled,
-  children,
   onChange,
 }) => {
+  const uniqueId = useId();
+  const labelId = `${uniqueId}-label`;
+  const descId = `${uniqueId}-desc`;
+
   return (
+    // This label is only used for its click-forwarding behaviour,
+    // accessible names are assigned manually
+    // eslint-disable-next-line jsx-a11y/label-has-associated-control
     <label className='app-form__toggle'>
-      <div className='app-form__toggle__label'>{children}</div>
+      <div className='app-form__toggle__label'>
+        <strong id={labelId}>{label}</strong>
+        <span className='hint' id={descId}>
+          {hint}
+        </span>
+      </div>
 
       <div className='app-form__toggle__toggle'>
-        <div>
-          <Dropdown
-            value={value}
-            onChange={onChange}
-            disabled={disabled}
-            options={options}
-          />
-        </div>
+        <Dropdown
+          value={value}
+          onChange={onChange}
+          disabled={disabled}
+          aria-labelledby={labelId}
+          aria-describedby={descId}
+          options={options}
+        />
       </div>
     </label>
   );
diff --git a/app/javascript/mastodon/features/notifications/request.jsx b/app/javascript/mastodon/features/notifications/request.jsx
index a7e5180a4f7..bf0ccc54092 100644
--- a/app/javascript/mastodon/features/notifications/request.jsx
+++ b/app/javascript/mastodon/features/notifications/request.jsx
@@ -31,21 +31,6 @@ const messages = defineMessages({
   dismiss: { id: 'notification_requests.dismiss', defaultMessage: 'Dismiss' },
 });
 
-const selectChild = (ref, index, alignTop) => {
-  const container = ref.current.node;
-  const element = container.querySelector(`article:nth-of-type(${index + 1}) .focusable`);
-
-  if (element) {
-    if (alignTop && container.scrollTop > element.offsetTop) {
-      element.scrollIntoView(true);
-    } else if (!alignTop && container.scrollTop + container.clientHeight < element.offsetTop + element.offsetHeight) {
-      element.scrollIntoView(false);
-    }
-
-    element.focus();
-  }
-};
-
 export const NotificationRequest = ({ multiColumn, params: { id } }) => {
   const columnRef = useRef();
   const intl = useIntl();
@@ -74,16 +59,6 @@ export const NotificationRequest = ({ multiColumn, params: { id } }) => {
     dispatch(acceptNotificationRequest({ id }));
   }, [dispatch, id]);
 
-  const handleMoveUp = useCallback(id => {
-    const elementIndex = notifications.findIndex(item => item !== null && item.get('id') === id) - 1;
-    selectChild(columnRef, elementIndex, true);
-  }, [columnRef, notifications]);
-
-  const handleMoveDown = useCallback(id => {
-    const elementIndex = notifications.findIndex(item => item !== null && item.get('id') === id) + 1;
-    selectChild(columnRef, elementIndex, false);
-  }, [columnRef, notifications]);
-
   useEffect(() => {
     dispatch(fetchNotificationRequest({ id }));
   }, [dispatch, id]);
@@ -146,8 +121,6 @@ export const NotificationRequest = ({ multiColumn, params: { id } }) => {
               key={item.get('id')}
               notification={item}
               accountId={item.get('account')}
-              onMoveUp={handleMoveUp}
-              onMoveDown={handleMoveDown}
             />
           ))}
         </ScrollableList>
diff --git a/app/javascript/mastodon/features/notifications_v2/components/displayed_name.tsx b/app/javascript/mastodon/features/notifications_v2/components/displayed_name.tsx
deleted file mode 100644
index 82ecb93ee5f..00000000000
--- a/app/javascript/mastodon/features/notifications_v2/components/displayed_name.tsx
+++ /dev/null
@@ -1,22 +0,0 @@
-import { Link } from 'react-router-dom';
-
-import { useAppSelector } from 'mastodon/store';
-
-export const DisplayedName: React.FC<{
-  accountIds: string[];
-}> = ({ accountIds }) => {
-  const lastAccountId = accountIds[0] ?? '0';
-  const account = useAppSelector((state) => state.accounts.get(lastAccountId));
-
-  if (!account) return null;
-
-  return (
-    <Link
-      to={`/@${account.acct}`}
-      title={`@${account.acct}`}
-      data-hover-card-account={account.id}
-    >
-      <bdi dangerouslySetInnerHTML={{ __html: account.display_name_html }} />
-    </Link>
-  );
-};
diff --git a/app/javascript/mastodon/features/notifications_v2/components/embedded_status.tsx b/app/javascript/mastodon/features/notifications_v2/components/embedded_status.tsx
index f63d42f8260..49bf364f055 100644
--- a/app/javascript/mastodon/features/notifications_v2/components/embedded_status.tsx
+++ b/app/javascript/mastodon/features/notifications_v2/components/embedded_status.tsx
@@ -6,6 +6,8 @@ import { useHistory } from 'react-router-dom';
 
 import type { List as ImmutableList, RecordOf } from 'immutable';
 
+import type { ApiMentionJSON } from '@/mastodon/api_types/statuses';
+import { AnimateEmojiProvider } from '@/mastodon/components/emoji/context';
 import BarChart4BarsIcon from '@/material-icons/400-24px/bar_chart_4_bars.svg?react';
 import PhotoLibraryIcon from '@/material-icons/400-24px/photo_library.svg?react';
 import { toggleStatusSpoilers } from 'mastodon/actions/statuses';
@@ -17,7 +19,7 @@ import { useAppSelector, useAppDispatch } from 'mastodon/store';
 
 import { EmbeddedStatusContent } from './embedded_status_content';
 
-export type Mention = RecordOf<{ url: string; acct: string }>;
+export type Mention = RecordOf<ApiMentionJSON>;
 
 export const EmbeddedStatus: React.FC<{ statusId: string }> = ({
   statusId,
@@ -76,32 +78,6 @@ export const EmbeddedStatus: React.FC<{ statusId: string }> = ({
     [clickCoordinatesRef, statusId, account, history],
   );
 
-  const handleMouseEnter = useCallback<React.MouseEventHandler<HTMLDivElement>>(
-    ({ currentTarget }) => {
-      const emojis =
-        currentTarget.querySelectorAll<HTMLImageElement>('.custom-emoji');
-
-      for (const emoji of emojis) {
-        const newSrc = emoji.getAttribute('data-original');
-        if (newSrc) emoji.src = newSrc;
-      }
-    },
-    [],
-  );
-
-  const handleMouseLeave = useCallback<React.MouseEventHandler<HTMLDivElement>>(
-    ({ currentTarget }) => {
-      const emojis =
-        currentTarget.querySelectorAll<HTMLImageElement>('.custom-emoji');
-
-      for (const emoji of emojis) {
-        const newSrc = emoji.getAttribute('data-static');
-        if (newSrc) emoji.src = newSrc;
-      }
-    },
-    [],
-  );
-
   const handleContentWarningClick = useCallback(() => {
     dispatch(toggleStatusSpoilers(statusId));
   }, [dispatch, statusId]);
@@ -111,45 +87,36 @@ export const EmbeddedStatus: React.FC<{ statusId: string }> = ({
   }
 
   // Assign status attributes to variables with a forced type, as status is not yet properly typed
-  const contentHtml = status.get('contentHtml') as string;
-  const contentWarning = status.get('spoilerHtml') as string;
+  const hasContentWarning = !!status.get('spoiler_text');
   const poll = status.get('poll');
-  const language = status.get('language') as string;
-  const mentions = status.get('mentions') as ImmutableList<Mention>;
-  const expanded = !status.get('hidden') || !contentWarning;
+  const expanded = !status.get('hidden') || !hasContentWarning;
   const mediaAttachmentsSize = (
     status.get('media_attachments') as ImmutableList<unknown>
   ).size;
 
   return (
-    <div
+    <AnimateEmojiProvider
       className='notification-group__embedded-status'
       role='button'
       tabIndex={-1}
       onMouseDown={handleMouseDown}
       onMouseUp={handleMouseUp}
-      onMouseEnter={handleMouseEnter}
-      onMouseLeave={handleMouseLeave}
     >
       <div className='notification-group__embedded-status__account'>
         <Avatar account={account} size={16} />
         <DisplayName account={account} />
       </div>
 
-      {contentWarning && (
-        <ContentWarning
-          text={contentWarning}
-          onClick={handleContentWarningClick}
-          expanded={expanded}
-        />
-      )}
+      <ContentWarning
+        status={status}
+        onClick={handleContentWarningClick}
+        expanded={expanded}
+      />
 
-      {(!contentWarning || expanded) && (
+      {(!hasContentWarning || expanded) && (
         <EmbeddedStatusContent
           className='notification-group__embedded-status__content reply-indicator__content translate'
-          content={contentHtml}
-          language={language}
-          mentions={mentions}
+          status={status}
         />
       )}
 
@@ -176,6 +143,6 @@ export const EmbeddedStatus: React.FC<{ statusId: string }> = ({
           )}
         </div>
       )}
-    </div>
+    </AnimateEmojiProvider>
   );
 };
diff --git a/app/javascript/mastodon/features/notifications_v2/components/embedded_status_content.tsx b/app/javascript/mastodon/features/notifications_v2/components/embedded_status_content.tsx
index 1a38be536ba..b7dc998a479 100644
--- a/app/javascript/mastodon/features/notifications_v2/components/embedded_status_content.tsx
+++ b/app/javascript/mastodon/features/notifications_v2/components/embedded_status_content.tsx
@@ -1,4 +1,4 @@
-import { useCallback } from 'react';
+import { useCallback, useMemo } from 'react';
 
 import { useHistory } from 'react-router-dom';
 
@@ -6,16 +6,22 @@ import type { List } from 'immutable';
 
 import type { History } from 'history';
 
+import type { ApiMentionJSON } from '@/mastodon/api_types/statuses';
+import { EmojiHTML } from '@/mastodon/components/emoji/html';
+import { useElementHandledLink } from '@/mastodon/components/status/handled_link';
+import type { Status } from '@/mastodon/models/status';
+import { isModernEmojiEnabled } from '@/mastodon/utils/environment';
+
 import type { Mention } from './embedded_status';
 
 const handleMentionClick = (
   history: History,
-  mention: Mention,
+  mention: ApiMentionJSON,
   e: MouseEvent,
 ) => {
   if (e.button === 0 && !(e.ctrlKey || e.metaKey)) {
     e.preventDefault();
-    history.push(`/@${mention.get('acct')}`);
+    history.push(`/@${mention.acct}`);
   }
 };
 
@@ -31,16 +37,25 @@ const handleHashtagClick = (
 };
 
 export const EmbeddedStatusContent: React.FC<{
-  content: string;
-  mentions: List<Mention>;
-  language: string;
+  status: Status;
   className?: string;
-}> = ({ content, mentions, language, className }) => {
+}> = ({ status, className }) => {
   const history = useHistory();
 
+  const mentions = useMemo(
+    () => (status.get('mentions') as List<Mention>).toJS(),
+    [status],
+  );
+  const htmlHandlers = useElementHandledLink({
+    hashtagAccountId: status.get('account') as string | undefined,
+    hrefToMention(href) {
+      return mentions.find((item) => item.url === href);
+    },
+  });
+
   const handleContentRef = useCallback(
     (node: HTMLDivElement | null) => {
-      if (!node) {
+      if (!node || isModernEmojiEnabled()) {
         return;
       }
 
@@ -53,7 +68,7 @@ export const EmbeddedStatusContent: React.FC<{
 
         link.classList.add('status-link');
 
-        const mention = mentions.find((item) => link.href === item.get('url'));
+        const mention = mentions.find((item) => link.href === item.url);
 
         if (mention) {
           link.addEventListener(
@@ -61,10 +76,10 @@ export const EmbeddedStatusContent: React.FC<{
             handleMentionClick.bind(null, history, mention),
             false,
           );
-          link.setAttribute('title', `@${mention.get('acct')}`);
-          link.setAttribute('href', `/@${mention.get('acct')}`);
+          link.setAttribute('title', `@${mention.acct}`);
+          link.setAttribute('href', `/@${mention.acct}`);
         } else if (
-          link.textContent?.[0] === '#' ||
+          link.textContent.startsWith('#') ||
           link.previousSibling?.textContent?.endsWith('#')
         ) {
           link.addEventListener(
@@ -83,11 +98,12 @@ export const EmbeddedStatusContent: React.FC<{
   );
 
   return (
-    <div
+    <EmojiHTML
+      {...htmlHandlers}
       className={className}
       ref={handleContentRef}
-      lang={language}
-      dangerouslySetInnerHTML={{ __html: content }}
+      lang={status.get('language') as string}
+      htmlString={status.get('contentHtml') as string}
     />
   );
 };
diff --git a/app/javascript/mastodon/features/notifications_v2/components/notification_admin_report.tsx b/app/javascript/mastodon/features/notifications_v2/components/notification_admin_report.tsx
index e41a6b2736c..03f047fb7fe 100644
--- a/app/javascript/mastodon/features/notifications_v2/components/notification_admin_report.tsx
+++ b/app/javascript/mastodon/features/notifications_v2/components/notification_admin_report.tsx
@@ -2,6 +2,7 @@ import { FormattedMessage, useIntl, defineMessages } from 'react-intl';
 
 import classNames from 'classnames';
 
+import { DisplayName } from '@/mastodon/components/display_name';
 import FlagIcon from '@/material-icons/400-24px/flag-fill.svg?react';
 import { Icon } from 'mastodon/components/icon';
 import { RelativeTimestamp } from 'mastodon/components/relative_timestamp';
@@ -42,11 +43,9 @@ export const NotificationAdminReport: React.FC<{
 
   if (!account || !targetAccount) return null;
 
-  const domain = account.acct.split('@')[1];
-
   const values = {
-    name: <bdi>{domain ?? `@${account.acct}`}</bdi>,
-    target: <bdi>@{targetAccount.acct}</bdi>,
+    name: <DisplayName account={account} variant='simple' />,
+    target: <DisplayName account={targetAccount} variant='simple' />,
     category: intl.formatMessage(messages[report.category]),
     count: report.status_ids.length,
   };
diff --git a/app/javascript/mastodon/features/notifications_v2/components/notification_group.tsx b/app/javascript/mastodon/features/notifications_v2/components/notification_group.tsx
index d5eb851985c..d6962114652 100644
--- a/app/javascript/mastodon/features/notifications_v2/components/notification_group.tsx
+++ b/app/javascript/mastodon/features/notifications_v2/components/notification_group.tsx
@@ -1,9 +1,8 @@
 import { useMemo } from 'react';
 
-import { HotKeys } from 'react-hotkeys';
-
 import { navigateToProfile } from 'mastodon/actions/accounts';
 import { mentionComposeById } from 'mastodon/actions/compose';
+import { Hotkeys } from 'mastodon/components/hotkeys';
 import type { NotificationGroup as NotificationGroupModel } from 'mastodon/models/notification_group';
 import { useAppSelector, useAppDispatch } from 'mastodon/store';
 
@@ -16,6 +15,8 @@ import { NotificationFollowRequest } from './notification_follow_request';
 import { NotificationMention } from './notification_mention';
 import { NotificationModerationWarning } from './notification_moderation_warning';
 import { NotificationPoll } from './notification_poll';
+import { NotificationQuote } from './notification_quote';
+import { NotificationQuotedUpdate } from './notification_quoted_update';
 import { NotificationReblog } from './notification_reblog';
 import { NotificationSeveredRelationships } from './notification_severed_relationships';
 import { NotificationStatus } from './notification_status';
@@ -24,9 +25,7 @@ import { NotificationUpdate } from './notification_update';
 export const NotificationGroup: React.FC<{
   notificationGroupId: NotificationGroupModel['group_key'];
   unread: boolean;
-  onMoveUp: (groupId: string) => void;
-  onMoveDown: (groupId: string) => void;
-}> = ({ notificationGroupId, unread, onMoveUp, onMoveDown }) => {
+}> = ({ notificationGroupId, unread }) => {
   const notificationGroup = useAppSelector((state) =>
     state.notificationGroups.groups.find(
       (item) => item.type !== 'gap' && item.group_key === notificationGroupId,
@@ -42,14 +41,6 @@ export const NotificationGroup: React.FC<{
 
   const handlers = useMemo(
     () => ({
-      moveUp: () => {
-        onMoveUp(notificationGroupId);
-      },
-
-      moveDown: () => {
-        onMoveDown(notificationGroupId);
-      },
-
       openProfile: () => {
         if (accountId) dispatch(navigateToProfile(accountId));
       },
@@ -58,7 +49,7 @@ export const NotificationGroup: React.FC<{
         if (accountId) dispatch(mentionComposeById(accountId));
       },
     }),
-    [dispatch, notificationGroupId, accountId, onMoveUp, onMoveDown],
+    [dispatch, accountId],
   );
 
   if (!notificationGroup || notificationGroup.type === 'gap') return null;
@@ -92,6 +83,11 @@ export const NotificationGroup: React.FC<{
         <NotificationMention unread={unread} notification={notificationGroup} />
       );
       break;
+    case 'quote':
+      content = (
+        <NotificationQuote unread={unread} notification={notificationGroup} />
+      );
+      break;
     case 'follow':
       content = (
         <NotificationFollow unread={unread} notification={notificationGroup} />
@@ -120,6 +116,14 @@ export const NotificationGroup: React.FC<{
         <NotificationUpdate unread={unread} notification={notificationGroup} />
       );
       break;
+    case 'quoted_update':
+      content = (
+        <NotificationQuotedUpdate
+          unread={unread}
+          notification={notificationGroup}
+        />
+      );
+      break;
     case 'admin.sign_up':
       content = (
         <NotificationAdminSignUp
@@ -156,5 +160,5 @@ export const NotificationGroup: React.FC<{
       return null;
   }
 
-  return <HotKeys handlers={handlers}>{content}</HotKeys>;
+  return <Hotkeys handlers={handlers}>{content}</Hotkeys>;
 };
diff --git a/app/javascript/mastodon/features/notifications_v2/components/notification_group_with_status.tsx b/app/javascript/mastodon/features/notifications_v2/components/notification_group_with_status.tsx
index e7ed8792f67..00746560dac 100644
--- a/app/javascript/mastodon/features/notifications_v2/components/notification_group_with_status.tsx
+++ b/app/javascript/mastodon/features/notifications_v2/components/notification_group_with_status.tsx
@@ -3,19 +3,18 @@ import type { JSX } from 'react';
 
 import classNames from 'classnames';
 
-import { HotKeys } from 'react-hotkeys';
-
+import { LinkedDisplayName } from '@/mastodon/components/display_name';
 import { replyComposeById } from 'mastodon/actions/compose';
 import { navigateToStatus } from 'mastodon/actions/statuses';
 import { Avatar } from 'mastodon/components/avatar';
 import { AvatarGroup } from 'mastodon/components/avatar_group';
+import { Hotkeys } from 'mastodon/components/hotkeys';
 import type { IconProp } from 'mastodon/components/icon';
 import { Icon } from 'mastodon/components/icon';
 import { RelativeTimestamp } from 'mastodon/components/relative_timestamp';
 import { NOTIFICATIONS_GROUP_MAX_AVATARS } from 'mastodon/models/notification_group';
 import { useAppSelector, useAppDispatch } from 'mastodon/store';
 
-import { DisplayedName } from './displayed_name';
 import { EmbeddedStatus } from './embedded_status';
 
 const AVATAR_SIZE = 28;
@@ -62,15 +61,18 @@ export const NotificationGroupWithStatus: React.FC<{
   additionalContent,
 }) => {
   const dispatch = useAppDispatch();
+  const account = useAppSelector((state) =>
+    state.accounts.get(accountIds.at(0) ?? ''),
+  );
 
   const label = useMemo(
     () =>
       labelRenderer(
-        <DisplayedName accountIds={accountIds} />,
+        <LinkedDisplayName displayProps={{ account, variant: 'simple' }} />,
         count,
         labelSeeMoreHref,
       ),
-    [labelRenderer, accountIds, count, labelSeeMoreHref],
+    [labelRenderer, account, count, labelSeeMoreHref],
   );
 
   const isPrivateMention = useAppSelector(
@@ -91,7 +93,7 @@ export const NotificationGroupWithStatus: React.FC<{
   );
 
   return (
-    <HotKeys handlers={handlers}>
+    <Hotkeys handlers={handlers}>
       <div
         role='button'
         className={classNames(
@@ -149,6 +151,6 @@ export const NotificationGroupWithStatus: React.FC<{
           )}
         </div>
       </div>
-    </HotKeys>
+    </Hotkeys>
   );
 };
diff --git a/app/javascript/mastodon/features/notifications_v2/components/notification_quote.tsx b/app/javascript/mastodon/features/notifications_v2/components/notification_quote.tsx
new file mode 100644
index 00000000000..9772966ad59
--- /dev/null
+++ b/app/javascript/mastodon/features/notifications_v2/components/notification_quote.tsx
@@ -0,0 +1,33 @@
+import { FormattedMessage } from 'react-intl';
+
+import FormatQuoteIcon from '@/material-icons/400-24px/format_quote-fill.svg?react';
+import type { NotificationGroupQuote } from 'mastodon/models/notification_group';
+
+import type { LabelRenderer } from './notification_group_with_status';
+import { NotificationWithStatus } from './notification_with_status';
+
+const quoteLabelRenderer: LabelRenderer = (displayName) => (
+  <FormattedMessage
+    id='notification.label.quote'
+    defaultMessage='{name} quoted your post'
+    values={{ name: displayName }}
+  />
+);
+
+export const NotificationQuote: React.FC<{
+  notification: NotificationGroupQuote;
+  unread: boolean;
+}> = ({ notification, unread }) => {
+  return (
+    <NotificationWithStatus
+      type='quote'
+      icon={FormatQuoteIcon}
+      iconId='quote'
+      accountIds={notification.sampleAccountIds}
+      count={notification.notifications_count}
+      statusId={notification.statusId}
+      labelRenderer={quoteLabelRenderer}
+      unread={unread}
+    />
+  );
+};
diff --git a/app/javascript/mastodon/features/notifications_v2/components/notification_quoted_update.tsx b/app/javascript/mastodon/features/notifications_v2/components/notification_quoted_update.tsx
new file mode 100644
index 00000000000..a48dd9b2b08
--- /dev/null
+++ b/app/javascript/mastodon/features/notifications_v2/components/notification_quoted_update.tsx
@@ -0,0 +1,31 @@
+import { FormattedMessage } from 'react-intl';
+
+import EditIcon from '@/material-icons/400-24px/edit.svg?react';
+import type { NotificationGroupQuotedUpdate } from 'mastodon/models/notification_group';
+
+import type { LabelRenderer } from './notification_group_with_status';
+import { NotificationWithStatus } from './notification_with_status';
+
+const labelRenderer: LabelRenderer = (displayedName) => (
+  <FormattedMessage
+    id='notification.quoted_update'
+    defaultMessage='{name} edited a post you have quoted'
+    values={{ name: displayedName }}
+  />
+);
+
+export const NotificationQuotedUpdate: React.FC<{
+  notification: NotificationGroupQuotedUpdate;
+  unread: boolean;
+}> = ({ notification, unread }) => (
+  <NotificationWithStatus
+    type='update'
+    icon={EditIcon}
+    iconId='edit'
+    accountIds={notification.sampleAccountIds}
+    count={notification.notifications_count}
+    statusId={notification.statusId}
+    labelRenderer={labelRenderer}
+    unread={unread}
+  />
+);
diff --git a/app/javascript/mastodon/features/notifications_v2/components/notification_with_status.tsx b/app/javascript/mastodon/features/notifications_v2/components/notification_with_status.tsx
index de484322fb0..bc219cba12c 100644
--- a/app/javascript/mastodon/features/notifications_v2/components/notification_with_status.tsx
+++ b/app/javascript/mastodon/features/notifications_v2/components/notification_with_status.tsx
@@ -2,21 +2,20 @@ import { useMemo } from 'react';
 
 import classNames from 'classnames';
 
-import { HotKeys } from 'react-hotkeys';
-
+import { LinkedDisplayName } from '@/mastodon/components/display_name';
 import { replyComposeById } from 'mastodon/actions/compose';
 import { toggleReblog, toggleFavourite } from 'mastodon/actions/interactions';
 import {
   navigateToStatus,
   toggleStatusSpoilers,
 } from 'mastodon/actions/statuses';
+import { Hotkeys } from 'mastodon/components/hotkeys';
 import type { IconProp } from 'mastodon/components/icon';
 import { Icon } from 'mastodon/components/icon';
 import { StatusQuoteManager } from 'mastodon/components/status_quoted';
 import { getStatusHidden } from 'mastodon/selectors/filters';
 import { useAppSelector, useAppDispatch } from 'mastodon/store';
 
-import { DisplayedName } from './displayed_name';
 import type { LabelRenderer } from './notification_group_with_status';
 
 export const NotificationWithStatus: React.FC<{
@@ -40,9 +39,16 @@ export const NotificationWithStatus: React.FC<{
 }) => {
   const dispatch = useAppDispatch();
 
+  const account = useAppSelector((state) =>
+    state.accounts.get(accountIds.at(0) ?? ''),
+  );
   const label = useMemo(
-    () => labelRenderer(<DisplayedName accountIds={accountIds} />, count),
-    [labelRenderer, accountIds, count],
+    () =>
+      labelRenderer(
+        <LinkedDisplayName displayProps={{ account, variant: 'simple' }} />,
+        count,
+      ),
+    [labelRenderer, account, count],
   );
 
   const isPrivateMention = useAppSelector(
@@ -83,7 +89,7 @@ export const NotificationWithStatus: React.FC<{
   if (!statusId || isFiltered) return null;
 
   return (
-    <HotKeys handlers={handlers}>
+    <Hotkeys handlers={handlers}>
       <div
         role='button'
         className={classNames(
@@ -111,6 +117,6 @@ export const NotificationWithStatus: React.FC<{
           unfocusable
         />
       </div>
-    </HotKeys>
+    </Hotkeys>
   );
 };
diff --git a/app/javascript/mastodon/features/notifications_v2/index.tsx b/app/javascript/mastodon/features/notifications_v2/index.tsx
index bb476fe51fc..7c73d602fc7 100644
--- a/app/javascript/mastodon/features/notifications_v2/index.tsx
+++ b/app/javascript/mastodon/features/notifications_v2/index.tsx
@@ -99,29 +99,6 @@ export const Notifications: React.FC<{
 
   const columnRef = useRef<ColumnRef>(null);
 
-  const selectChild = useCallback((index: number, alignTop: boolean) => {
-    const container = columnRef.current?.node as HTMLElement | undefined;
-
-    if (!container) return;
-
-    const element = container.querySelector<HTMLElement>(
-      `article:nth-of-type(${index + 1}) .focusable`,
-    );
-
-    if (element) {
-      if (alignTop && container.scrollTop > element.offsetTop) {
-        element.scrollIntoView(true);
-      } else if (
-        !alignTop &&
-        container.scrollTop + container.clientHeight <
-          element.offsetTop + element.offsetHeight
-      ) {
-        element.scrollIntoView(false);
-      }
-      element.focus();
-    }
-  }, []);
-
   // Keep track of mounted components for unread notification handling
   useEffect(() => {
     void dispatch(mountNotifications());
@@ -187,28 +164,6 @@ export const Notifications: React.FC<{
     columnRef.current?.scrollTop();
   }, []);
 
-  const handleMoveUp = useCallback(
-    (id: string) => {
-      const elementIndex =
-        notifications.findIndex(
-          (item) => item.type !== 'gap' && item.group_key === id,
-        ) - 1;
-      selectChild(elementIndex, true);
-    },
-    [notifications, selectChild],
-  );
-
-  const handleMoveDown = useCallback(
-    (id: string) => {
-      const elementIndex =
-        notifications.findIndex(
-          (item) => item.type !== 'gap' && item.group_key === id,
-        ) + 1;
-      selectChild(elementIndex, false);
-    },
-    [notifications, selectChild],
-  );
-
   const handleMarkAsRead = useCallback(() => {
     dispatch(markNotificationsAsRead());
     void dispatch(submitMarkers({ immediate: true }));
@@ -241,8 +196,6 @@ export const Notifications: React.FC<{
         <NotificationGroup
           key={item.group_key}
           notificationGroupId={item.group_key}
-          onMoveUp={handleMoveUp}
-          onMoveDown={handleMoveDown}
           unread={
             lastReadId !== '0' &&
             !!item.page_max_id &&
@@ -251,15 +204,7 @@ export const Notifications: React.FC<{
         />
       ),
     );
-  }, [
-    notifications,
-    isLoading,
-    hasMore,
-    lastReadId,
-    handleLoadGap,
-    handleMoveUp,
-    handleMoveDown,
-  ]);
+  }, [notifications, isLoading, hasMore, lastReadId, handleLoadGap]);
 
   const prepend = (
     <>
diff --git a/app/javascript/mastodon/features/onboarding/profile.tsx b/app/javascript/mastodon/features/onboarding/profile.tsx
index d9b394acfbb..7e725e97cc3 100644
--- a/app/javascript/mastodon/features/onboarding/profile.tsx
+++ b/app/javascript/mastodon/features/onboarding/profile.tsx
@@ -54,9 +54,7 @@ export const Profile: React.FC<{
     me ? state.accounts.get(me) : undefined,
   );
   const [displayName, setDisplayName] = useState(account?.display_name ?? '');
-  const [note, setNote] = useState(
-    account ? (unescapeHTML(account.note) ?? '') : '',
-  );
+  const [note, setNote] = useState(account ? unescapeHTML(account.note) : '');
   const [avatar, setAvatar] = useState<File>();
   const [header, setHeader] = useState<File>();
   const [discoverable, setDiscoverable] = useState(
diff --git a/app/javascript/mastodon/features/picture_in_picture/components/footer.tsx b/app/javascript/mastodon/features/picture_in_picture/components/footer.tsx
index 26cb2172a94..e848e692995 100644
--- a/app/javascript/mastodon/features/picture_in_picture/components/footer.tsx
+++ b/app/javascript/mastodon/features/picture_in_picture/components/footer.tsx
@@ -1,26 +1,24 @@
-import { useCallback } from 'react';
+import { useCallback, useMemo } from 'react';
 
 import { defineMessages, useIntl } from 'react-intl';
 
-import classNames from 'classnames';
 import { useHistory } from 'react-router-dom';
 
 import OpenInNewIcon from '@/material-icons/400-24px/open_in_new.svg?react';
-import RepeatIcon from '@/material-icons/400-24px/repeat.svg?react';
 import ReplyIcon from '@/material-icons/400-24px/reply.svg?react';
 import ReplyAllIcon from '@/material-icons/400-24px/reply_all.svg?react';
 import StarIcon from '@/material-icons/400-24px/star-fill.svg?react';
 import StarBorderIcon from '@/material-icons/400-24px/star.svg?react';
-import RepeatActiveIcon from '@/svg-icons/repeat_active.svg?react';
-import RepeatDisabledIcon from '@/svg-icons/repeat_disabled.svg?react';
-import RepeatPrivateIcon from '@/svg-icons/repeat_private.svg?react';
-import RepeatPrivateActiveIcon from '@/svg-icons/repeat_private_active.svg?react';
 import { replyCompose } from 'mastodon/actions/compose';
-import { toggleReblog, toggleFavourite } from 'mastodon/actions/interactions';
+import { toggleFavourite } from 'mastodon/actions/interactions';
 import { openModal } from 'mastodon/actions/modal';
 import { IconButton } from 'mastodon/components/icon_button';
+import { BoostButton } from 'mastodon/components/status/boost_button';
 import { useIdentity } from 'mastodon/identity_context';
-import { me } from 'mastodon/initial_state';
+import type { Account } from 'mastodon/models/account';
+import type { Status } from 'mastodon/models/status';
+import { makeGetStatus } from 'mastodon/selectors';
+import type { RootState } from 'mastodon/store';
 import { useAppSelector, useAppDispatch } from 'mastodon/store';
 
 const messages = defineMessages({
@@ -29,7 +27,7 @@ const messages = defineMessages({
   reblog: { id: 'status.reblog', defaultMessage: 'Boost' },
   reblog_private: {
     id: 'status.reblog_private',
-    defaultMessage: 'Boost with original visibility',
+    defaultMessage: 'Share again with your followers',
   },
   cancel_reblog_private: {
     id: 'status.cancel_reblog_private',
@@ -47,6 +45,11 @@ const messages = defineMessages({
   open: { id: 'status.open', defaultMessage: 'Expand this status' },
 });
 
+type GetStatusSelector = (
+  state: RootState,
+  props: { id?: string | null; contextType?: string },
+) => Status | null;
+
 export const Footer: React.FC<{
   statusId: string;
   withOpenButton?: boolean;
@@ -56,11 +59,9 @@ export const Footer: React.FC<{
   const intl = useIntl();
   const history = useHistory();
   const dispatch = useAppDispatch();
-  const status = useAppSelector((state) => state.statuses.get(statusId));
-  const accountId = status?.get('account') as string | undefined;
-  const account = useAppSelector((state) =>
-    accountId ? state.accounts.get(accountId) : undefined,
-  );
+  const getStatus = useMemo(() => makeGetStatus(), []) as GetStatusSelector;
+  const status = useAppSelector((state) => getStatus(state, { id: statusId }));
+  const account = status?.get('account') as Account | undefined;
   const askReplyConfirmation = useAppSelector(
     (state) => (state.compose.get('text') as string).trim().length !== 0,
   );
@@ -85,7 +86,6 @@ export const Footer: React.FC<{
         openModal({
           modalType: 'INTERACTION',
           modalProps: {
-            type: 'reply',
             accountId: status.getIn(['account', 'id']),
             url: status.get('uri'),
           },
@@ -106,7 +106,6 @@ export const Footer: React.FC<{
         openModal({
           modalType: 'INTERACTION',
           modalProps: {
-            type: 'favourite',
             accountId: status.getIn(['account', 'id']),
             url: status.get('uri'),
           },
@@ -115,30 +114,6 @@ export const Footer: React.FC<{
     }
   }, [dispatch, status, signedIn]);
 
-  const handleReblogClick = useCallback(
-    (e: React.MouseEvent) => {
-      if (!status) {
-        return;
-      }
-
-      if (signedIn) {
-        dispatch(toggleReblog(status.get('id'), e.shiftKey));
-      } else {
-        dispatch(
-          openModal({
-            modalType: 'INTERACTION',
-            modalProps: {
-              type: 'reblog',
-              accountId: status.getIn(['account', 'id']),
-              url: status.get('uri'),
-            },
-          }),
-        );
-      }
-    },
-    [dispatch, status, signedIn],
-  );
-
   const handleOpenClick = useCallback(
     (e: React.MouseEvent) => {
       if (e.button !== 0 || !status) {
@@ -156,13 +131,6 @@ export const Footer: React.FC<{
     return null;
   }
 
-  const publicStatus = ['public', 'unlisted'].includes(
-    status.get('visibility') as string,
-  );
-  const reblogPrivate =
-    status.getIn(['account', 'id']) === me &&
-    status.get('visibility') === 'private';
-
   let replyIcon, replyIconComponent, replyTitle;
 
   if (status.get('in_reply_to_id', null) === null) {
@@ -175,24 +143,6 @@ export const Footer: React.FC<{
     replyTitle = intl.formatMessage(messages.replyAll);
   }
 
-  let reblogTitle, reblogIconComponent;
-
-  if (status.get('reblogged')) {
-    reblogTitle = intl.formatMessage(messages.cancel_reblog_private);
-    reblogIconComponent = publicStatus
-      ? RepeatActiveIcon
-      : RepeatPrivateActiveIcon;
-  } else if (publicStatus) {
-    reblogTitle = intl.formatMessage(messages.reblog);
-    reblogIconComponent = RepeatIcon;
-  } else if (reblogPrivate) {
-    reblogTitle = intl.formatMessage(messages.reblog_private);
-    reblogIconComponent = RepeatPrivateIcon;
-  } else {
-    reblogTitle = intl.formatMessage(messages.cannot_reblog);
-    reblogIconComponent = RepeatDisabledIcon;
-  }
-
   const favouriteTitle = intl.formatMessage(
     status.get('favourited') ? messages.removeFavourite : messages.favourite,
   );
@@ -218,16 +168,7 @@ export const Footer: React.FC<{
         counter={status.get('replies_count') as number}
       />
 
-      <IconButton
-        className={classNames('status__action-bar-button', { reblogPrivate })}
-        disabled={!publicStatus && !reblogPrivate}
-        active={status.get('reblogged') as boolean}
-        title={reblogTitle}
-        icon='retweet'
-        iconComponent={reblogIconComponent}
-        onClick={handleReblogClick}
-        counter={status.get('reblogs_count') as number}
-      />
+      <BoostButton counters status={status} />
 
       <IconButton
         className='status__action-bar-button star-icon'
diff --git a/app/javascript/mastodon/features/quotes/index.tsx b/app/javascript/mastodon/features/quotes/index.tsx
new file mode 100644
index 00000000000..56cf2f71f11
--- /dev/null
+++ b/app/javascript/mastodon/features/quotes/index.tsx
@@ -0,0 +1,151 @@
+import { useCallback, useEffect } from 'react';
+
+import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
+
+import { Helmet } from 'react-helmet';
+
+import { List as ImmutableList } from 'immutable';
+
+import RefreshIcon from '@/material-icons/400-24px/refresh.svg?react';
+import { fetchQuotes } from 'mastodon/actions/interactions_typed';
+import { ColumnHeader } from 'mastodon/components/column_header';
+import { Icon } from 'mastodon/components/icon';
+import { LoadingIndicator } from 'mastodon/components/loading_indicator';
+import StatusList from 'mastodon/components/status_list';
+import { useIdentity } from 'mastodon/identity_context';
+import { domain } from 'mastodon/initial_state';
+import { useAppDispatch, useAppSelector } from 'mastodon/store';
+
+import Column from '../ui/components/column';
+
+const messages = defineMessages({
+  refresh: { id: 'refresh', defaultMessage: 'Refresh' },
+});
+
+const emptyList = ImmutableList();
+
+export const Quotes: React.FC<{
+  multiColumn?: boolean;
+  params?: { statusId: string };
+}> = ({ multiColumn, params }) => {
+  const intl = useIntl();
+  const dispatch = useAppDispatch();
+
+  const statusId = params?.statusId;
+
+  const { accountId: me } = useIdentity();
+
+  const isCorrectStatusId: boolean = useAppSelector(
+    (state) => state.status_lists.getIn(['quotes', 'statusId']) === statusId,
+  );
+  const quotedAccountId = useAppSelector(
+    (state) =>
+      state.statuses.getIn([statusId, 'account']) as string | undefined,
+  );
+  const quotedAccount = useAppSelector((state) =>
+    quotedAccountId ? state.accounts.get(quotedAccountId) : undefined,
+  );
+  const statusIds = useAppSelector((state) =>
+    state.status_lists.getIn(['quotes', 'items'], emptyList),
+  );
+  const nextUrl = useAppSelector(
+    (state) =>
+      state.status_lists.getIn(['quotes', 'next']) as string | undefined,
+  );
+  const isLoading = useAppSelector((state) =>
+    state.status_lists.getIn(['quotes', 'isLoading'], true),
+  );
+  const hasMore = !!nextUrl;
+
+  useEffect(() => {
+    if (statusId) void dispatch(fetchQuotes({ statusId }));
+  }, [dispatch, statusId]);
+
+  const handleLoadMore = useCallback(() => {
+    if (statusId && isCorrectStatusId && nextUrl)
+      void dispatch(fetchQuotes({ statusId, next: nextUrl }));
+  }, [dispatch, statusId, isCorrectStatusId, nextUrl]);
+
+  const handleRefresh = useCallback(() => {
+    if (statusId) void dispatch(fetchQuotes({ statusId }));
+  }, [dispatch, statusId]);
+
+  if (!statusIds || !isCorrectStatusId) {
+    return (
+      <Column>
+        <LoadingIndicator />
+      </Column>
+    );
+  }
+
+  const emptyMessage = (
+    <FormattedMessage
+      id='status.quotes.empty'
+      defaultMessage='No one has quoted this post yet. When someone does, it will show up here.'
+    />
+  );
+
+  let prependMessage;
+
+  if (me === quotedAccountId) {
+    prependMessage = null;
+  } else if (quotedAccount?.username === quotedAccount?.acct) {
+    // Local account, we know this to be exhaustive
+    prependMessage = (
+      <div className='follow_requests-unlocked_explanation'>
+        <FormattedMessage
+          id='status.quotes.local_other_disclaimer'
+          defaultMessage='Quotes rejected by the author will not be shown.'
+        />
+      </div>
+    );
+  } else {
+    prependMessage = (
+      <div className='follow_requests-unlocked_explanation'>
+        <FormattedMessage
+          id='status.quotes.remote_other_disclaimer'
+          defaultMessage='Only quotes from {domain} are guaranteed to be shown here. Quotes rejected by the author will not be shown.'
+          values={{ domain: <strong>{domain}</strong> }}
+        />
+      </div>
+    );
+  }
+
+  return (
+    <Column bindToDocument={!multiColumn}>
+      <ColumnHeader
+        showBackButton
+        multiColumn={multiColumn}
+        extraButton={
+          <button
+            type='button'
+            className='column-header__button'
+            title={intl.formatMessage(messages.refresh)}
+            aria-label={intl.formatMessage(messages.refresh)}
+            onClick={handleRefresh}
+          >
+            <Icon id='refresh' icon={RefreshIcon} />
+          </button>
+        }
+      />
+
+      <StatusList
+        scrollKey='quotes_timeline'
+        statusIds={statusIds}
+        onLoadMore={handleLoadMore}
+        hasMore={hasMore}
+        isLoading={isLoading}
+        emptyMessage={emptyMessage}
+        bindToDocument={!multiColumn}
+        prepend={prependMessage}
+      />
+
+      <Helmet>
+        <meta name='robots' content='noindex' />
+      </Helmet>
+    </Column>
+  );
+};
+
+// eslint-disable-next-line import/no-default-export
+export default Quotes;
diff --git a/app/javascript/mastodon/features/standalone/compose/index.jsx b/app/javascript/mastodon/features/standalone/compose/index.jsx
index 3aff78ffee5..5d336275d4f 100644
--- a/app/javascript/mastodon/features/standalone/compose/index.jsx
+++ b/app/javascript/mastodon/features/standalone/compose/index.jsx
@@ -5,7 +5,7 @@ import ModalContainer from 'mastodon/features/ui/containers/modal_container';
 
 const Compose = () => (
   <>
-    <ComposeFormContainer autoFocus withoutNavigation />
+    <ComposeFormContainer autoFocus withoutNavigation redirectOnSuccess />
     <AlertsController />
     <ModalContainer />
     <LoadingBarContainer className='loading-bar' />
diff --git a/app/javascript/mastodon/features/standalone/status/index.tsx b/app/javascript/mastodon/features/standalone/status/index.tsx
index 8d1b8314673..a53d6e6b237 100644
--- a/app/javascript/mastodon/features/standalone/status/index.tsx
+++ b/app/javascript/mastodon/features/standalone/status/index.tsx
@@ -11,7 +11,7 @@ import { hydrateStore } from 'mastodon/actions/store';
 import { Router } from 'mastodon/components/router';
 import { DetailedStatus } from 'mastodon/features/status/components/detailed_status';
 import { useRenderSignal } from 'mastodon/hooks/useRenderSignal';
-import initialState from 'mastodon/initial_state';
+import { initialState } from 'mastodon/initial_state';
 import { IntlProvider } from 'mastodon/locales';
 import { makeGetStatus, makeGetPictureInPicture } from 'mastodon/selectors';
 import { store, useAppSelector, useAppDispatch } from 'mastodon/store';
@@ -32,7 +32,7 @@ const Embed: React.FC<{ id: string }> = ({ id }) => {
   const dispatchRenderSignal = useRenderSignal();
 
   useEffect(() => {
-    dispatch(fetchStatus(id, false, false));
+    dispatch(fetchStatus(id, { alsoFetchContext: false }));
   }, [dispatch, id]);
 
   const handleToggleHidden = useCallback(() => {
diff --git a/app/javascript/mastodon/features/status/components/action_bar.jsx b/app/javascript/mastodon/features/status/components/action_bar.jsx
index 81f8163fffe..6156cf19162 100644
--- a/app/javascript/mastodon/features/status/components/action_bar.jsx
+++ b/app/javascript/mastodon/features/status/components/action_bar.jsx
@@ -3,29 +3,23 @@ import { PureComponent } from 'react';
 
 import { defineMessages, injectIntl } from 'react-intl';
 
-import classNames from 'classnames';
-
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { connect } from 'react-redux';
 
 import BookmarkIcon from '@/material-icons/400-24px/bookmark-fill.svg?react';
 import BookmarkBorderIcon from '@/material-icons/400-24px/bookmark.svg?react';
 import MoreHorizIcon from '@/material-icons/400-24px/more_horiz.svg?react';
-import RepeatIcon from '@/material-icons/400-24px/repeat.svg?react';
 import ReplyIcon from '@/material-icons/400-24px/reply.svg?react';
 import ReplyAllIcon from '@/material-icons/400-24px/reply_all.svg?react';
 import StarIcon from '@/material-icons/400-24px/star-fill.svg?react';
 import StarBorderIcon from '@/material-icons/400-24px/star.svg?react';
-import RepeatActiveIcon from '@/svg-icons/repeat_active.svg?react';
-import RepeatDisabledIcon from '@/svg-icons/repeat_disabled.svg?react';
-import RepeatPrivateIcon from '@/svg-icons/repeat_private.svg?react';
-import RepeatPrivateActiveIcon from '@/svg-icons/repeat_private_active.svg?react';
 import { identityContextPropShape, withIdentity } from 'mastodon/identity_context';
 import { PERMISSION_MANAGE_USERS, PERMISSION_MANAGE_FEDERATION } from 'mastodon/permissions';
 
 import { IconButton } from '../../../components/icon_button';
 import { Dropdown } from 'mastodon/components/dropdown_menu';
 import { me } from '../../../initial_state';
+import { BoostButton } from '@/mastodon/components/status/boost_button';
 
 const messages = defineMessages({
   delete: { id: 'status.delete', defaultMessage: 'Delete' },
@@ -34,10 +28,6 @@ const messages = defineMessages({
   direct: { id: 'status.direct', defaultMessage: 'Privately mention @{name}' },
   mention: { id: 'status.mention', defaultMessage: 'Mention @{name}' },
   reply: { id: 'status.reply', defaultMessage: 'Reply' },
-  reblog: { id: 'status.reblog', defaultMessage: 'Boost' },
-  reblog_private: { id: 'status.reblog_private', defaultMessage: 'Boost with original visibility' },
-  cancel_reblog_private: { id: 'status.cancel_reblog_private', defaultMessage: 'Unboost' },
-  cannot_reblog: { id: 'status.cannot_reblog', defaultMessage: 'This post cannot be boosted' },
   favourite: { id: 'status.favourite', defaultMessage: 'Favorite' },
   removeFavourite: { id: 'status.remove_favourite', defaultMessage: 'Remove from favorites' },
   bookmark: { id: 'status.bookmark', defaultMessage: 'Bookmark' },
@@ -61,22 +51,31 @@ const messages = defineMessages({
   unmute: { id: 'account.unmute', defaultMessage: 'Unmute @{name}' },
   unblock: { id: 'account.unblock', defaultMessage: 'Unblock @{name}' },
   openOriginalPage: { id: 'account.open_original_page', defaultMessage: 'Open original page' },
+  revokeQuote: { id: 'status.revoke_quote', defaultMessage: 'Remove my post from @{name}’s post' },
+  quotePolicyChange: { id: 'status.quote_policy_change', defaultMessage: 'Change who can quote' },
 });
 
-const mapStateToProps = (state, { status }) => ({
-  relationship: state.getIn(['relationships', status.getIn(['account', 'id'])]),
-});
+const mapStateToProps = (state, { status }) => {
+  const quotedStatusId = status.getIn(['quote', 'quoted_status']);
+  return ({
+    relationship: state.getIn(['relationships', status.getIn(['account', 'id'])]),
+    quotedAccountId: quotedStatusId ? state.getIn(['statuses', quotedStatusId, 'account']) : null,
+  });
+};
 
 class ActionBar extends PureComponent {
   static propTypes = {
     identity: identityContextPropShape,
     status: ImmutablePropTypes.map.isRequired,
     relationship: ImmutablePropTypes.record,
+    quotedAccountId: ImmutablePropTypes.string,
     onReply: PropTypes.func.isRequired,
     onReblog: PropTypes.func.isRequired,
     onFavourite: PropTypes.func.isRequired,
     onBookmark: PropTypes.func.isRequired,
     onDelete: PropTypes.func.isRequired,
+    onRevokeQuote: PropTypes.func,
+    onQuotePolicyChange: PropTypes.func,
     onEdit: PropTypes.func.isRequired,
     onDirect: PropTypes.func.isRequired,
     onMention: PropTypes.func.isRequired,
@@ -113,6 +112,14 @@ class ActionBar extends PureComponent {
     this.props.onDelete(this.props.status);
   };
 
+  handleRevokeQuoteClick = () => {
+    this.props.onRevokeQuote(this.props.status);
+  };
+
+  handleQuotePolicyChange = () => {
+    this.props.onQuotePolicyChange(this.props.status);
+  };
+
   handleRedraftClick = () => {
     this.props.onDelete(this.props.status, true);
   };
@@ -193,7 +200,7 @@ class ActionBar extends PureComponent {
   };
 
   render () {
-    const { status, relationship, intl } = this.props;
+    const { status, relationship, quotedAccountId, intl } = this.props;
     const { signedIn, permissions } = this.props.identity;
 
     const publicStatus       = ['public', 'unlisted'].includes(status.get('visibility'));
@@ -229,6 +236,9 @@ class ActionBar extends PureComponent {
         }
 
         menu.push({ text: intl.formatMessage(mutingConversation ? messages.unmuteConversation : messages.muteConversation), action: this.handleConversationMuteClick });
+        if (!['private', 'direct'].includes(status.get('visibility'))) {
+          menu.push({ text: intl.formatMessage(messages.quotePolicyChange), action: this.handleQuotePolicyChange });
+        }
         menu.push(null);
         menu.push({ text: intl.formatMessage(messages.edit), action: this.handleEditClick });
         menu.push({ text: intl.formatMessage(messages.delete), action: this.handleDeleteClick, dangerous: true });
@@ -237,6 +247,10 @@ class ActionBar extends PureComponent {
         menu.push({ text: intl.formatMessage(messages.mention, { name: status.getIn(['account', 'username']) }), action: this.handleMentionClick });
         menu.push(null);
 
+        if (quotedAccountId === me) {
+          menu.push({ text: intl.formatMessage(messages.revokeQuote, { name: account.get('username') }), action: this.handleRevokeQuoteClick, dangerous: true });
+        }
+
         if (relationship && relationship.get('muting')) {
           menu.push({ text: intl.formatMessage(messages.unmute, { name: account.get('username') }), action: this.handleMuteClick });
         } else {
@@ -288,31 +302,15 @@ class ActionBar extends PureComponent {
       replyIconComponent = ReplyAllIcon;
     }
 
-    const reblogPrivate = status.getIn(['account', 'id']) === me && status.get('visibility') === 'private';
-
-    let reblogTitle, reblogIconComponent;
-
-    if (status.get('reblogged')) {
-      reblogTitle = intl.formatMessage(messages.cancel_reblog_private);
-      reblogIconComponent = publicStatus ? RepeatActiveIcon : RepeatPrivateActiveIcon;
-    } else if (publicStatus) {
-      reblogTitle = intl.formatMessage(messages.reblog);
-      reblogIconComponent = RepeatIcon;
-    } else if (reblogPrivate) {
-      reblogTitle = intl.formatMessage(messages.reblog_private);
-      reblogIconComponent = RepeatPrivateIcon;
-    } else {
-      reblogTitle = intl.formatMessage(messages.cannot_reblog);
-      reblogIconComponent = RepeatDisabledIcon;
-    }
-
     const bookmarkTitle = intl.formatMessage(status.get('bookmarked') ? messages.removeBookmark : messages.bookmark);
     const favouriteTitle = intl.formatMessage(status.get('favourited') ? messages.removeFavourite : messages.favourite);
 
     return (
       <div className='detailed-status__action-bar'>
         <div className='detailed-status__button'><IconButton title={intl.formatMessage(messages.reply)} icon={status.get('in_reply_to_account_id') === status.getIn(['account', 'id']) ? 'reply' : replyIcon} iconComponent={status.get('in_reply_to_account_id') === status.getIn(['account', 'id']) ? ReplyIcon : replyIconComponent}  onClick={this.handleReplyClick} /></div>
-        <div className='detailed-status__button'><IconButton className={classNames({ reblogPrivate })} disabled={!publicStatus && !reblogPrivate} active={status.get('reblogged')} title={reblogTitle} icon='retweet' iconComponent={reblogIconComponent} onClick={this.handleReblogClick} /></div>
+        <div className='detailed-status__button'>
+          <BoostButton status={status} />
+        </div>
         <div className='detailed-status__button'><IconButton className='star-icon' animate active={status.get('favourited')} title={favouriteTitle} icon='star' iconComponent={status.get('favourited') ? StarIcon : StarBorderIcon} onClick={this.handleFavouriteClick} /></div>
         <div className='detailed-status__button'><IconButton className='bookmark-icon' disabled={!signedIn} active={status.get('bookmarked')} title={bookmarkTitle} icon='bookmark' iconComponent={status.get('bookmarked') ? BookmarkIcon : BookmarkBorderIcon} onClick={this.handleBookmarkClick} /></div>
 
diff --git a/app/javascript/mastodon/features/status/components/card.jsx b/app/javascript/mastodon/features/status/components/card.jsx
index f8d5a26aff4..308555b77f6 100644
--- a/app/javascript/mastodon/features/status/components/card.jsx
+++ b/app/javascript/mastodon/features/status/components/card.jsx
@@ -37,18 +37,20 @@ const getHostname = url => {
 
 const domParser = new DOMParser();
 
-const addAutoPlay = html => {
+const handleIframeUrl = (html, url, providerName) => {
   const document = domParser.parseFromString(html, 'text/html').documentElement;
   const iframe = document.querySelector('iframe');
+  const startTime = new URL(url).searchParams.get('t')
 
   if (iframe) {
-    if (iframe.src.indexOf('?') !== -1) {
-      iframe.src += '&';
-    } else {
-      iframe.src += '?';
-    }
+    const iframeUrl = new URL(iframe.src)
 
-    iframe.src += 'autoplay=1&auto_play=1';
+    iframeUrl.searchParams.set('autoplay', 1)
+    iframeUrl.searchParams.set('auto_play', 1)
+
+    if (startTime && providerName === "YouTube") iframeUrl.searchParams.set('start', startTime)
+
+    iframe.src = iframeUrl.href
 
     // DOM parser creates html/body elements around original HTML fragment,
     // so we need to get innerHTML out of the body and not the entire document
@@ -114,7 +116,7 @@ export default class Card extends PureComponent {
 
   renderVideo () {
     const { card } = this.props;
-    const content = { __html: addAutoPlay(card.get('html')) };
+    const content = { __html: handleIframeUrl(card.get('html'), card.get('url'), card.get('provider_name')) };
 
     return (
       <div
diff --git a/app/javascript/mastodon/features/status/components/detailed_status.tsx b/app/javascript/mastodon/features/status/components/detailed_status.tsx
index ec6aa003e26..9b525b616c7 100644
--- a/app/javascript/mastodon/features/status/components/detailed_status.tsx
+++ b/app/javascript/mastodon/features/status/components/detailed_status.tsx
@@ -31,6 +31,7 @@ import { VisibilityIcon } from 'mastodon/components/visibility_icon';
 import { Audio } from 'mastodon/features/audio';
 import scheduleIdleTask from 'mastodon/features/ui/util/schedule_idle_task';
 import { Video } from 'mastodon/features/video';
+import { useIdentity } from 'mastodon/identity_context';
 
 import Card from './card';
 
@@ -74,6 +75,8 @@ export const DetailedStatus: React.FC<{
   const [showDespiteFilter, setShowDespiteFilter] = useState(false);
   const nodeRef = useRef<HTMLDivElement>();
 
+  const { signedIn } = useIdentity();
+
   const handleOpenVideo = useCallback(
     (options: VideoModalOptions) => {
       const lang = (status.getIn(['translation', 'language']) ||
@@ -127,6 +130,7 @@ export const DetailedStatus: React.FC<{
   let media;
   let applicationLink;
   let reblogLink;
+  let quotesLink;
   let attachmentAspectRatio;
 
   if (properStatus.get('media_attachments').getIn([0, 'type']) === 'video') {
@@ -279,6 +283,39 @@ export const DetailedStatus: React.FC<{
     );
   }
 
+  if (['private', 'direct'].includes(status.get('visibility') as string)) {
+    quotesLink = '';
+  } else if (signedIn) {
+    quotesLink = (
+      <Link
+        to={`/@${status.getIn(['account', 'acct'])}/${status.get('id')}/quotes`}
+        className='detailed-status__link'
+      >
+        <span className='detailed-status__quotes'>
+          <AnimatedNumber value={status.get('quotes_count')} />
+        </span>
+        <FormattedMessage
+          id='status.quotes'
+          defaultMessage='{count, plural, one {quote} other {quotes}}'
+          values={{ count: status.get('quotes_count') }}
+        />
+      </Link>
+    );
+  } else {
+    quotesLink = (
+      <span className='detailed-status__link'>
+        <span className='detailed-status__quotes'>
+          <AnimatedNumber value={status.get('quotes_count')} />
+        </span>
+        <FormattedMessage
+          id='status.quotes'
+          defaultMessage='{count, plural, one {quote} other {quotes}}'
+          values={{ count: status.get('quotes_count') }}
+        />
+      </span>
+    );
+  }
+
   const favouriteLink = (
     <Link
       to={`/@${status.getIn(['account', 'acct'])}/${status.get('id')}/favourites`}
@@ -357,17 +394,13 @@ export const DetailedStatus: React.FC<{
           />
         )}
 
-        {status.get('spoiler_text').length > 0 &&
-          (!matchedFilters || showDespiteFilter) && (
-            <ContentWarning
-              text={
-                status.getIn(['translation', 'spoilerHtml']) ||
-                status.get('spoilerHtml')
-              }
-              expanded={expanded}
-              onClick={handleExpandedToggle}
-            />
-          )}
+        {(!matchedFilters || showDespiteFilter) && (
+          <ContentWarning
+            status={status}
+            expanded={expanded}
+            onClick={handleExpandedToggle}
+          />
+        )}
 
         {expanded && (
           <>
@@ -381,7 +414,10 @@ export const DetailedStatus: React.FC<{
             {hashtagBar}
 
             {status.get('quote') && (
-              <QuotedStatus quote={status.get('quote')} />
+              <QuotedStatus
+                quote={status.get('quote')}
+                parentQuotePostId={status.get('id')}
+              />
             )}
           </>
         )}
@@ -420,6 +456,8 @@ export const DetailedStatus: React.FC<{
           <div className='detailed-status__meta__line'>
             {reblogLink}
             {reblogLink && <>·</>}
+            {quotesLink}
+            {quotesLink && <>·</>}
             {favouriteLink}
           </div>
         </div>
diff --git a/app/javascript/mastodon/features/status/components/refresh_controller.tsx b/app/javascript/mastodon/features/status/components/refresh_controller.tsx
new file mode 100644
index 00000000000..8297922cbb1
--- /dev/null
+++ b/app/javascript/mastodon/features/status/components/refresh_controller.tsx
@@ -0,0 +1,199 @@
+import { useEffect, useState, useCallback } from 'react';
+
+import { useIntl, defineMessages } from 'react-intl';
+
+import {
+  fetchContext,
+  completeContextRefresh,
+  showPendingReplies,
+  clearPendingReplies,
+} from 'mastodon/actions/statuses';
+import type { AsyncRefreshHeader } from 'mastodon/api';
+import { apiGetAsyncRefresh } from 'mastodon/api/async_refreshes';
+import { Alert } from 'mastodon/components/alert';
+import { ExitAnimationWrapper } from 'mastodon/components/exit_animation_wrapper';
+import { LoadingIndicator } from 'mastodon/components/loading_indicator';
+import { useAppSelector, useAppDispatch } from 'mastodon/store';
+
+const AnimatedAlert: React.FC<
+  React.ComponentPropsWithoutRef<typeof Alert> & { withEntryDelay?: boolean }
+> = ({ isActive = false, withEntryDelay, ...props }) => (
+  <ExitAnimationWrapper withEntryDelay isActive={isActive}>
+    {(delayedIsActive) => <Alert isActive={delayedIsActive} {...props} />}
+  </ExitAnimationWrapper>
+);
+
+const messages = defineMessages({
+  moreFound: {
+    id: 'status.context.more_replies_found',
+    defaultMessage: 'More replies found',
+  },
+  show: {
+    id: 'status.context.show',
+    defaultMessage: 'Show',
+  },
+  loadingInitial: {
+    id: 'status.context.loading',
+    defaultMessage: 'Loading',
+  },
+  success: {
+    id: 'status.context.loading_success',
+    defaultMessage: 'All replies loaded',
+  },
+  error: {
+    id: 'status.context.loading_error',
+    defaultMessage: "Couldn't load new replies",
+  },
+  retry: {
+    id: 'status.context.retry',
+    defaultMessage: 'Retry',
+  },
+});
+
+type LoadingState = 'idle' | 'more-available' | 'loading' | 'success' | 'error';
+
+export const RefreshController: React.FC<{
+  statusId: string;
+}> = ({ statusId }) => {
+  const dispatch = useAppDispatch();
+  const intl = useIntl();
+
+  const refreshHeader = useAppSelector(
+    (state) => state.contexts.refreshing[statusId],
+  );
+  const hasPendingReplies = useAppSelector(
+    (state) => !!state.contexts.pendingReplies[statusId]?.length,
+  );
+  const [partialLoadingState, setLoadingState] = useState<LoadingState>(
+    refreshHeader ? 'loading' : 'idle',
+  );
+  const loadingState = hasPendingReplies
+    ? 'more-available'
+    : partialLoadingState;
+
+  const [wasDismissed, setWasDismissed] = useState(false);
+  const dismissPrompt = useCallback(() => {
+    setWasDismissed(true);
+    setLoadingState('idle');
+    dispatch(clearPendingReplies({ statusId }));
+  }, [dispatch, statusId]);
+
+  useEffect(() => {
+    let timeoutId: ReturnType<typeof setTimeout>;
+
+    const scheduleRefresh = (refresh: AsyncRefreshHeader) => {
+      timeoutId = setTimeout(() => {
+        void apiGetAsyncRefresh(refresh.id).then((result) => {
+          // If the refresh status is not finished,
+          // schedule another refresh and exit
+          if (result.async_refresh.status !== 'finished') {
+            scheduleRefresh(refresh);
+            return;
+          }
+
+          // Refresh status is finished. The action below will clear `refreshHeader`
+          dispatch(completeContextRefresh({ statusId }));
+
+          // Exit if there's nothing to fetch
+          if (result.async_refresh.result_count === 0) {
+            setLoadingState('idle');
+            return;
+          }
+
+          // A positive result count means there _might_ be new replies,
+          // so we fetch the context in the background to check if there
+          // are any new replies.
+          // If so, they will populate `contexts.pendingReplies[statusId]`
+          void dispatch(fetchContext({ statusId, prefetchOnly: true }))
+            .then(() => {
+              // Reset loading state to `idle` – but if the fetch
+              // has resulted in new pending replies, the `hasPendingReplies`
+              // flag will switch the loading state to 'more-available'
+              setLoadingState('idle');
+            })
+            .catch(() => {
+              // Show an error if the fetch failed
+              setLoadingState('error');
+            });
+        });
+      }, refresh.retry * 1000);
+    };
+
+    // Initialise a refresh
+    if (refreshHeader && !wasDismissed) {
+      scheduleRefresh(refreshHeader);
+      setLoadingState('loading');
+    }
+
+    return () => {
+      clearTimeout(timeoutId);
+    };
+  }, [dispatch, statusId, refreshHeader, wasDismissed]);
+
+  useEffect(() => {
+    // Hide success message after a short delay
+    if (loadingState === 'success') {
+      const timeoutId = setTimeout(() => {
+        setLoadingState('idle');
+      }, 3000);
+
+      return () => {
+        clearTimeout(timeoutId);
+      };
+    }
+    return () => '';
+  }, [loadingState]);
+
+  useEffect(() => {
+    // Clear pending replies on unmount
+    return () => {
+      dispatch(clearPendingReplies({ statusId }));
+    };
+  }, [dispatch, statusId]);
+
+  const handleClick = useCallback(() => {
+    dispatch(showPendingReplies({ statusId }));
+    setLoadingState('success');
+  }, [dispatch, statusId]);
+
+  if (loadingState === 'loading') {
+    return (
+      <div
+        className='load-more load-gap'
+        aria-busy
+        aria-live='polite'
+        aria-label={intl.formatMessage(messages.loadingInitial)}
+      >
+        <LoadingIndicator />
+      </div>
+    );
+  }
+
+  return (
+    <div className='column__alert' role='status' aria-live='polite'>
+      <AnimatedAlert
+        isActive={loadingState === 'more-available'}
+        message={intl.formatMessage(messages.moreFound)}
+        action={intl.formatMessage(messages.show)}
+        onActionClick={handleClick}
+        onDismiss={dismissPrompt}
+        animateFrom='below'
+      />
+      <AnimatedAlert
+        withEntryDelay
+        isActive={loadingState === 'error'}
+        message={intl.formatMessage(messages.error)}
+        action={intl.formatMessage(messages.retry)}
+        onActionClick={handleClick}
+        onDismiss={dismissPrompt}
+        animateFrom='below'
+      />
+      <AnimatedAlert
+        withEntryDelay
+        isActive={loadingState === 'success'}
+        message={intl.formatMessage(messages.success)}
+        animateFrom='below'
+      />
+    </div>
+  );
+};
diff --git a/app/javascript/mastodon/features/status/index.jsx b/app/javascript/mastodon/features/status/index.jsx
index 0f02e7b50ff..ff32d63e870 100644
--- a/app/javascript/mastodon/features/status/index.jsx
+++ b/app/javascript/mastodon/features/status/index.jsx
@@ -1,23 +1,22 @@
 import PropTypes from 'prop-types';
 
-import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
+import { defineMessages, injectIntl } from 'react-intl';
 
 import classNames from 'classnames';
 import { Helmet } from 'react-helmet';
 import { withRouter } from 'react-router-dom';
+import { difference } from 'lodash';
 
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { connect } from 'react-redux';
 
-import { HotKeys } from 'react-hotkeys';
-
 import VisibilityIcon from '@/material-icons/400-24px/visibility.svg?react';
 import VisibilityOffIcon from '@/material-icons/400-24px/visibility_off.svg?react';
+import { Hotkeys }  from 'mastodon/components/hotkeys';
 import { Icon }  from 'mastodon/components/icon';
 import { LoadingIndicator } from 'mastodon/components/loading_indicator';
-import { TimelineHint } from 'mastodon/components/timeline_hint';
-import ScrollContainer from 'mastodon/containers/scroll_container';
+import { ScrollContainer } from 'mastodon/containers/scroll_container';
 import BundleColumnError from 'mastodon/features/ui/components/bundle_column_error';
 import { identityContextPropShape, withIdentity } from 'mastodon/identity_context';
 import { WithRouterPropTypes } from 'mastodon/utils/react_router';
@@ -58,6 +57,7 @@ import {
   translateStatus,
   undoStatusTranslation,
 } from '../../actions/statuses';
+import { setStatusQuotePolicy } from '../../actions/statuses_typed';
 import ColumnHeader from '../../components/column_header';
 import { textForScreenReader, defaultMediaVisibility } from '../../components/status';
 import { StatusQuoteManager } from '../../components/status_quoted';
@@ -69,7 +69,8 @@ import { attachFullscreenListener, detachFullscreenListener, isFullscreen } from
 
 import ActionBar from './components/action_bar';
 import { DetailedStatus } from './components/detailed_status';
-
+import { RefreshController } from './components/refresh_controller';
+import { quoteComposeById } from '@/mastodon/actions/compose_typed';
 
 const messages = defineMessages({
   revealAll: { id: 'status.show_more_all', defaultMessage: 'Show more for all' },
@@ -150,6 +151,11 @@ class Status extends ImmutablePureComponent {
     fullscreen: false,
     showMedia: defaultMediaVisibility(this.props.status),
     loadedStatusId: undefined,
+    /**
+     * Holds the ids of newly added replies, excluding the initial load.
+     * Used to highlight newly added replies in the UI
+     */
+    newRepliesIds: [],
   };
 
   UNSAFE_componentWillMount () {
@@ -186,7 +192,6 @@ class Status extends ImmutablePureComponent {
       dispatch(openModal({
         modalType: 'INTERACTION',
         modalProps: {
-          type: 'favourite',
           accountId: status.getIn(['account', 'id']),
           url: status.get('uri'),
         },
@@ -216,7 +221,6 @@ class Status extends ImmutablePureComponent {
       dispatch(openModal({
         modalType: 'INTERACTION',
         modalProps: {
-          type: 'reply',
           accountId: status.getIn(['account', 'id']),
           url: status.get('uri'),
         },
@@ -234,7 +238,6 @@ class Status extends ImmutablePureComponent {
       dispatch(openModal({
         modalType: 'INTERACTION',
         modalProps: {
-          type: 'reblog',
           accountId: status.getIn(['account', 'id']),
           url: status.get('uri'),
         },
@@ -251,15 +254,51 @@ class Status extends ImmutablePureComponent {
   };
 
   handleDeleteClick = (status, withRedraft = false) => {
-    const { dispatch } = this.props;
+    const { dispatch, history } = this.props;
+
+    const handleDeleteSuccess = () => {
+      history.push('/');
+    };
 
     if (!deleteModal) {
-      dispatch(deleteStatus(status.get('id'), withRedraft));
+      dispatch(deleteStatus(status.get('id'), withRedraft))
+        .then(() => {
+          if (!withRedraft) {
+            handleDeleteSuccess();
+          }
+        })
+        .catch(() => {
+          // Error handling - could show error message
+        });
     } else {
-      dispatch(openModal({ modalType: 'CONFIRM_DELETE_STATUS', modalProps: { statusId: status.get('id'), withRedraft } }));
+      dispatch(openModal({ 
+        modalType: 'CONFIRM_DELETE_STATUS', 
+        modalProps: { 
+          statusId: status.get('id'), 
+          withRedraft,
+          onDeleteSuccess: handleDeleteSuccess
+        } 
+      }));
     }
   };
 
+  handleRevokeQuoteClick = (status) => {
+    const { dispatch } = this.props;
+
+    dispatch(openModal({ modalType: 'CONFIRM_REVOKE_QUOTE', modalProps: { statusId: status.get('id'), quotedStatusId: status.getIn(['quote', 'quoted_status']) }}));
+  };
+
+  handleQuotePolicyChange = (status) => {
+    const statusId = status.get('id');
+    const { dispatch } = this.props;
+    const handleChange = (_, quotePolicy) => {
+      dispatch(
+        setStatusQuotePolicy({ policy: quotePolicy, statusId }),
+      );
+    }
+    dispatch(openModal({ modalType: 'COMPOSE_PRIVACY', modalProps: { statusId, onChange: handleChange } }));
+  };
+
   handleEditClick = (status) => {
     const { dispatch, askReplyConfirmation } = this.props;
 
@@ -380,15 +419,6 @@ class Status extends ImmutablePureComponent {
     this.props.dispatch(unblockDomain(domain));
   };
 
-
-  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);
@@ -402,6 +432,10 @@ class Status extends ImmutablePureComponent {
     this.handleReblogClick(this.props.status);
   };
 
+  handleHotkeyQuote = () => {
+    this.props.dispatch(quoteComposeById(this.props.status.get('id')));
+  };
+
   handleHotkeyMention = e => {
     e.preventDefault();
     this.handleMentionClick(this.props.status.get('account'));
@@ -423,54 +457,6 @@ class Status extends ImmutablePureComponent {
     this.handleTranslate(this.props.status);
   };
 
-  handleMoveUp = id => {
-    const { status, ancestorsIds, descendantsIds } = this.props;
-
-    if (id === status.get('id')) {
-      this._selectChild(ancestorsIds.length - 1, true);
-    } else {
-      let index = ancestorsIds.indexOf(id);
-
-      if (index === -1) {
-        index = descendantsIds.indexOf(id);
-        this._selectChild(ancestorsIds.length + index, true);
-      } else {
-        this._selectChild(index - 1, true);
-      }
-    }
-  };
-
-  handleMoveDown = id => {
-    const { status, ancestorsIds, descendantsIds } = this.props;
-
-    if (id === status.get('id')) {
-      this._selectChild(ancestorsIds.length + 1, false);
-    } else {
-      let index = ancestorsIds.indexOf(id);
-
-      if (index === -1) {
-        index = descendantsIds.indexOf(id);
-        this._selectChild(ancestorsIds.length + 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();
-    }
-  }
-
   renderChildren (list, ancestors) {
     const { params: { statusId } } = this.props;
 
@@ -478,12 +464,11 @@ class Status extends ImmutablePureComponent {
       <StatusQuoteManager
         key={id}
         id={id}
-        onMoveUp={this.handleMoveUp}
-        onMoveDown={this.handleMoveDown}
         contextType='thread'
         previousId={i > 0 ? list[i - 1] : undefined}
         nextId={list[i + 1] || (ancestors && statusId)}
         rootId={statusId}
+        shouldHighlightOnMount={this.state.newRepliesIds.includes(id)}
       />
     ));
   }
@@ -517,11 +502,20 @@ class Status extends ImmutablePureComponent {
   }
 
   componentDidUpdate (prevProps) {
-    const { status, ancestorsIds } = this.props;
+    const { status, ancestorsIds, descendantsIds } = this.props;
 
     if (status && (ancestorsIds.length > prevProps.ancestorsIds.length || prevProps.status?.get('id') !== status.get('id'))) {
       this._scrollStatusIntoView();
     }
+
+    // Only highlight replies after the initial load
+    if (prevProps.descendantsIds.length) {
+      const newRepliesIds = difference(descendantsIds, prevProps.descendantsIds);
+      
+      if (newRepliesIds.length) {
+        this.setState({newRepliesIds});
+      }
+    }
   }
 
   componentWillUnmount () {
@@ -532,9 +526,9 @@ class Status extends ImmutablePureComponent {
     this.setState({ fullscreen: isFullscreen() });
   };
 
-  shouldUpdateScroll = (prevRouterProps, { location }) => {
+  shouldUpdateScroll = (prevLocation, location) => {
     // Do not change scroll when opening a modal
-    if (location.state?.mastodonModalKey !== prevRouterProps?.location?.state?.mastodonModalKey) {
+    if (location.state?.mastodonModalKey !== prevLocation?.state?.mastodonModalKey) {
       return false;
     }
 
@@ -549,7 +543,7 @@ class Status extends ImmutablePureComponent {
 
   render () {
     let ancestors, descendants, remoteHint;
-    const { isLoading, status, ancestorsIds, descendantsIds, intl, domain, multiColumn, pictureInPicture } = this.props;
+    const { isLoading, status, ancestorsIds, descendantsIds, refresh, intl, domain, multiColumn, pictureInPicture } = this.props;
     const { fullscreen } = this.state;
 
     if (isLoading) {
@@ -579,21 +573,17 @@ class Status extends ImmutablePureComponent {
 
     if (!isLocal) {
       remoteHint = (
-        <TimelineHint
-          className={classNames(!!descendants && 'timeline-hint--with-descendants')}
-          url={status.get('url')}
-          message={<FormattedMessage id='hints.threads.replies_may_be_missing' defaultMessage='Replies from other servers may be missing.' />}
-          label={<FormattedMessage id='hints.threads.see_more' defaultMessage='See more replies on {domain}' values={{ domain: <strong>{status.getIn(['account', 'acct']).split('@')[1]}</strong> }} />}
+        <RefreshController
+          statusId={status.get('id')}
         />
       );
     }
 
     const handlers = {
-      moveUp: this.handleHotkeyMoveUp,
-      moveDown: this.handleHotkeyMoveDown,
       reply: this.handleHotkeyReply,
       favourite: this.handleHotkeyFavourite,
       boost: this.handleHotkeyBoost,
+      quote: this.handleHotkeyQuote,
       mention: this.handleHotkeyMention,
       openProfile: this.handleHotkeyOpenProfile,
       toggleHidden: this.handleHotkeyToggleHidden,
@@ -612,12 +602,12 @@ class Status extends ImmutablePureComponent {
           )}
         />
 
-        <ScrollContainer scrollKey='thread' shouldUpdateScroll={this.shouldUpdateScroll}>
-          <div className={classNames('scrollable', { fullscreen })} ref={this.setContainerRef}>
+        <ScrollContainer scrollKey='thread' shouldUpdateScroll={this.shouldUpdateScroll} childRef={this.setContainerRef}>
+          <div className={classNames('item-list scrollable scrollable--flex', { fullscreen })} ref={this.setContainerRef}>
             {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)} ref={this.setStatusRef}>
+            <Hotkeys handlers={handlers}>
+              <div className={classNames('focusable', 'detailed-status__wrapper', `detailed-status__wrapper-${status.get('visibility')}`)} tabIndex={0} aria-label={textForScreenReader({intl, status})} ref={this.setStatusRef}>
                 <DetailedStatus
                   key={`details-${status.get('id')}`}
                   status={status}
@@ -639,6 +629,8 @@ class Status extends ImmutablePureComponent {
                   onReblog={this.handleReblogClick}
                   onBookmark={this.handleBookmarkClick}
                   onDelete={this.handleDeleteClick}
+                  onRevokeQuote={this.handleRevokeQuoteClick}
+                  onQuotePolicyChange={this.handleQuotePolicyChange}
                   onEdit={this.handleEditClick}
                   onDirect={this.handleDirectClick}
                   onMention={this.handleMentionClick}
@@ -654,7 +646,7 @@ class Status extends ImmutablePureComponent {
                   onEmbed={this.handleEmbed}
                 />
               </div>
-            </HotKeys>
+            </Hotkeys>
 
             {descendants}
             {remoteHint}
diff --git a/app/javascript/mastodon/features/ui/components/actions_modal.tsx b/app/javascript/mastodon/features/ui/components/actions_modal.tsx
index da42b863927..2577b21a17c 100644
--- a/app/javascript/mastodon/features/ui/components/actions_modal.tsx
+++ b/app/javascript/mastodon/features/ui/components/actions_modal.tsx
@@ -1,6 +1,7 @@
 import classNames from 'classnames';
 import { Link } from 'react-router-dom';
 
+import { DropdownMenuItemContent } from 'mastodon/components/dropdown_menu';
 import type { MenuItem } from 'mastodon/models/dropdown_menu';
 import {
   isActionItem,
@@ -18,14 +19,14 @@ export const ActionsModal: React.FC<{
           return <li key={`sep-${i}`} className='dropdown-menu__separator' />;
         }
 
-        const { text, dangerous } = option;
+        const { text, highlighted, disabled, dangerous } = option;
 
         let element: React.ReactElement;
 
         if (isActionItem(option)) {
           element = (
-            <button onClick={onClick} data-index={i}>
-              {text}
+            <button onClick={onClick} data-index={i} disabled={disabled}>
+              <DropdownMenuItemContent item={option} />
             </button>
           );
         } else if (isExternalLinkItem(option)) {
@@ -38,21 +39,22 @@ export const ActionsModal: React.FC<{
               onClick={onClick}
               data-index={i}
             >
-              {text}
+              <DropdownMenuItemContent item={option} />
             </a>
           );
         } else {
           element = (
             <Link to={option.to} onClick={onClick} data-index={i}>
-              {text}
+              <DropdownMenuItemContent item={option} />
             </Link>
           );
         }
 
         return (
           <li
-            className={classNames({
+            className={classNames('dropdown-menu__item', {
               'dropdown-menu__item--dangerous': dangerous,
+              'dropdown-menu__item--highlighted': highlighted,
             })}
             key={`${text}-${i}`}
           >
diff --git a/app/javascript/mastodon/features/ui/components/compare_history_modal.jsx b/app/javascript/mastodon/features/ui/components/compare_history_modal.jsx
index 4227c741317..c9a58265660 100644
--- a/app/javascript/mastodon/features/ui/components/compare_history_modal.jsx
+++ b/app/javascript/mastodon/features/ui/components/compare_history_modal.jsx
@@ -15,6 +15,8 @@ import InlineAccount from 'mastodon/components/inline_account';
 import MediaAttachments from 'mastodon/components/media_attachments';
 import { RelativeTimestamp } from 'mastodon/components/relative_timestamp';
 import emojify from 'mastodon/features/emoji/emoji';
+import { EmojiHTML } from '@/mastodon/components/emoji/html';
+import { CustomEmojiProvider } from '@/mastodon/components/emoji/context';
 
 const mapStateToProps = (state, { statusId }) => ({
   language: state.getIn(['statuses', statusId, 'language']),
@@ -51,8 +53,8 @@ class CompareHistoryModal extends PureComponent {
       return obj;
     }, {});
 
-    const content = { __html: emojify(currentVersion.get('content'), emojiMap) };
-    const spoilerContent = { __html: emojify(escapeTextContentForBrowser(currentVersion.get('spoiler_text')), emojiMap) };
+    const content = emojify(currentVersion.get('content'), emojiMap);
+    const spoilerContent = emojify(escapeTextContentForBrowser(currentVersion.get('spoiler_text')), emojiMap);
 
     const formattedDate = <RelativeTimestamp timestamp={currentVersion.get('created_at')} short={false} />;
     const formattedName = <InlineAccount accountId={currentVersion.get('account')} />;
@@ -65,43 +67,50 @@ class CompareHistoryModal extends PureComponent {
 
     return (
       <div className='modal-root__modal compare-history-modal'>
-        <div className='report-modal__target'>
-          <IconButton className='report-modal__close' icon='times' iconComponent={CloseIcon} onClick={onClose} size={20} />
-          {label}
-        </div>
-
-        <div className='compare-history-modal__container'>
-          <div className='status__content'>
-            {currentVersion.get('spoiler_text').length > 0 && (
-              <>
-                <div className='translate' dangerouslySetInnerHTML={spoilerContent} lang={language} />
-                <hr />
-              </>
-            )}
-
-            <div className='status__content__text status__content__text--visible translate' dangerouslySetInnerHTML={content} lang={language} />
-
-            {!!currentVersion.get('poll') && (
-              <div className='poll'>
-                <ul>
-                  {currentVersion.getIn(['poll', 'options']).map(option => (
-                    <li key={option.get('title')}>
-                      <span className='poll__input disabled' />
-
-                      <span
-                        className='poll__option__text translate'
-                        dangerouslySetInnerHTML={{ __html: emojify(escapeTextContentForBrowser(option.get('title')), emojiMap) }}
-                        lang={language}
-                      />
-                    </li>
-                  ))}
-                </ul>
-              </div>
-            )}
-
-            <MediaAttachments status={currentVersion} lang={language} />
+        <CustomEmojiProvider emojis={currentVersion.get('emojis')}>
+          <div className='report-modal__target'>
+            <IconButton className='report-modal__close' icon='times' iconComponent={CloseIcon} onClick={onClose} size={20} />
+            {label}
           </div>
-        </div>
+
+          <div className='compare-history-modal__container'>
+            <div className='status__content'>
+              {currentVersion.get('spoiler_text').length > 0 && (
+                <>
+                  <EmojiHTML className='translate' htmlString={spoilerContent} lang={language} />
+                  <hr />
+                </>
+              )}
+
+              <EmojiHTML
+                className='status__content__text status__content__text--visible translate'
+                htmlString={content}
+                lang={language}
+              />
+
+              {!!currentVersion.get('poll') && (
+                <div className='poll'>
+                  <ul>
+                    {currentVersion.getIn(['poll', 'options']).map(option => (
+                      <li key={option.get('title')}>
+                        <span className='poll__input disabled' />
+
+                        <EmojiHTML
+                          as="span"
+                          className='poll__option__text translate'
+                          htmlString={emojify(escapeTextContentForBrowser(option.get('title')), emojiMap)}
+                          lang={language}
+                        />
+                      </li>
+                    ))}
+                  </ul>
+                </div>
+              )}
+
+              <MediaAttachments status={currentVersion} lang={language} />
+            </div>
+          </div>
+        </CustomEmojiProvider>
       </div>
     );
   }
diff --git a/app/javascript/mastodon/features/ui/components/confirmation_modals/confirmation_modal.tsx b/app/javascript/mastodon/features/ui/components/confirmation_modals/confirmation_modal.tsx
index 7a0bfe6a944..47f9fca8904 100644
--- a/app/javascript/mastodon/features/ui/components/confirmation_modals/confirmation_modal.tsx
+++ b/app/javascript/mastodon/features/ui/components/confirmation_modals/confirmation_modal.tsx
@@ -11,7 +11,7 @@ export interface BaseConfirmationModalProps {
 export const ConfirmationModal: React.FC<
   {
     title: React.ReactNode;
-    message: React.ReactNode;
+    message?: React.ReactNode;
     confirm: React.ReactNode;
     cancel?: React.ReactNode;
     secondary?: React.ReactNode;
@@ -43,22 +43,18 @@ export const ConfirmationModal: React.FC<
     onSecondary?.();
   }, [onClose, onSecondary]);
 
-  const handleCancel = useCallback(() => {
-    onClose();
-  }, [onClose]);
-
   return (
     <div className='modal-root__modal safety-action-modal'>
       <div className='safety-action-modal__top'>
         <div className='safety-action-modal__confirmation'>
           <h1>{title}</h1>
-          <p>{message}</p>
+          {message && <p>{message}</p>}
         </div>
       </div>
 
       <div className='safety-action-modal__bottom'>
         <div className='safety-action-modal__actions'>
-          <button onClick={handleCancel} className='link-button'>
+          <button onClick={onClose} className='link-button'>
             {cancel ?? (
               <FormattedMessage
                 id='confirmation_modal.cancel'
diff --git a/app/javascript/mastodon/features/ui/components/confirmation_modals/delete_status.tsx b/app/javascript/mastodon/features/ui/components/confirmation_modals/delete_status.tsx
index 39e80cf7410..215ba31a464 100644
--- a/app/javascript/mastodon/features/ui/components/confirmation_modals/delete_status.tsx
+++ b/app/javascript/mastodon/features/ui/components/confirmation_modals/delete_status.tsx
@@ -40,14 +40,23 @@ export const ConfirmDeleteStatusModal: React.FC<
   {
     statusId: string;
     withRedraft: boolean;
+    onDeleteSuccess?: () => void;
   } & BaseConfirmationModalProps
-> = ({ statusId, withRedraft, onClose }) => {
+> = ({ statusId, withRedraft, onClose, onDeleteSuccess }) => {
   const intl = useIntl();
   const dispatch = useAppDispatch();
 
   const onConfirm = useCallback(() => {
-    dispatch(deleteStatus(statusId, withRedraft));
-  }, [dispatch, statusId, withRedraft]);
+    void dispatch(deleteStatus(statusId, withRedraft))
+      .then(() => {
+        onDeleteSuccess?.();
+        onClose();
+      })
+      .catch(() => {
+        // Error handling - still close modal
+        onClose();
+      });
+  }, [dispatch, statusId, withRedraft, onDeleteSuccess, onClose]);
 
   return (
     <ConfirmationModal
diff --git a/app/javascript/mastodon/features/ui/components/confirmation_modals/index.ts b/app/javascript/mastodon/features/ui/components/confirmation_modals/index.ts
index 25ffb3b6291..9aff30eeac1 100644
--- a/app/javascript/mastodon/features/ui/components/confirmation_modals/index.ts
+++ b/app/javascript/mastodon/features/ui/components/confirmation_modals/index.ts
@@ -5,8 +5,12 @@ export {
   ConfirmReplyModal,
   ConfirmEditStatusModal,
 } from './discard_draft_confirmation';
+export { ConfirmWithdrawRequestModal } from './withdraw_follow_request';
 export { ConfirmUnfollowModal } from './unfollow';
+export { ConfirmUnblockModal } from './unblock';
 export { ConfirmClearNotificationsModal } from './clear_notifications';
 export { ConfirmLogOutModal } from './log_out';
 export { ConfirmFollowToListModal } from './follow_to_list';
 export { ConfirmMissingAltTextModal } from './missing_alt_text';
+export { ConfirmRevokeQuoteModal } from './revoke_quote';
+export { QuietPostQuoteInfoModal } from './quiet_post_quote_info';
diff --git a/app/javascript/mastodon/features/ui/components/confirmation_modals/quiet_post_quote_info.tsx b/app/javascript/mastodon/features/ui/components/confirmation_modals/quiet_post_quote_info.tsx
new file mode 100644
index 00000000000..534d72e6cec
--- /dev/null
+++ b/app/javascript/mastodon/features/ui/components/confirmation_modals/quiet_post_quote_info.tsx
@@ -0,0 +1,77 @@
+import { useCallback } from 'react';
+
+import { defineMessages, useIntl } from 'react-intl';
+
+import { quoteCompose } from '@/mastodon/actions/compose_typed';
+import { closeModal } from '@/mastodon/actions/modal';
+import { changeSetting } from '@/mastodon/actions/settings';
+import type { Status } from '@/mastodon/models/status';
+import { useAppDispatch } from '@/mastodon/store';
+
+import { ConfirmationModal } from './confirmation_modal';
+
+const messages = defineMessages({
+  title: {
+    id: 'confirmations.quiet_post_quote_info.title',
+    defaultMessage: 'Quoting quiet public posts',
+  },
+  message: {
+    id: 'confirmations.quiet_post_quote_info.message',
+    defaultMessage:
+      'When quoting a quiet public post, your post will be hidden from trending timelines.',
+  },
+  got_it: {
+    id: 'confirmations.quiet_post_quote_info.got_it',
+    defaultMessage: 'Got it',
+  },
+  dismiss: {
+    id: 'confirmations.quiet_post_quote_info.dismiss',
+    defaultMessage: "Don't remind me again",
+  },
+});
+
+/**
+ * [1] Since we only want this modal to have two buttons – "Don't ask again" and
+ * "Got it" – , we have to use the `onClose` handler to handle the "Don't ask again"
+ * functionality. Because of this, we need to set `closeWhenConfirm` to false and
+ * close the modal manually.
+ * This prevents the modal from being dismissed permanently when just confirming.
+ */
+
+export const QuietPostQuoteInfoModal: React.FC<{ status: Status }> = ({
+  status,
+}) => {
+  const intl = useIntl();
+  const dispatch = useAppDispatch();
+
+  const confirm = useCallback(() => {
+    dispatch(quoteCompose(status));
+    // [1]
+    dispatch(
+      closeModal({ modalType: 'CONFIRM_QUIET_QUOTE', ignoreFocus: true }),
+    );
+  }, [dispatch, status]);
+
+  const dismiss = useCallback(() => {
+    dispatch(quoteCompose(status));
+    dispatch(
+      changeSetting(['dismissed_banners', 'quote/quiet_post_hint'], true),
+    );
+    // [1]
+    dispatch(
+      closeModal({ modalType: 'CONFIRM_QUIET_QUOTE', ignoreFocus: true }),
+    );
+  }, [dispatch, status]);
+
+  return (
+    <ConfirmationModal
+      closeWhenConfirm={false} // [1]
+      title={intl.formatMessage(messages.title)}
+      message={intl.formatMessage(messages.message)}
+      confirm={intl.formatMessage(messages.got_it)}
+      cancel={intl.formatMessage(messages.dismiss)}
+      onConfirm={confirm}
+      onClose={dismiss}
+    />
+  );
+};
diff --git a/app/javascript/mastodon/features/ui/components/confirmation_modals/revoke_quote.tsx b/app/javascript/mastodon/features/ui/components/confirmation_modals/revoke_quote.tsx
new file mode 100644
index 00000000000..83964aa5fe8
--- /dev/null
+++ b/app/javascript/mastodon/features/ui/components/confirmation_modals/revoke_quote.tsx
@@ -0,0 +1,48 @@
+import { useCallback } from 'react';
+
+import { defineMessages, useIntl } from 'react-intl';
+
+import { revokeQuote } from 'mastodon/actions/interactions_typed';
+import { useAppDispatch } from 'mastodon/store';
+
+import type { BaseConfirmationModalProps } from './confirmation_modal';
+import { ConfirmationModal } from './confirmation_modal';
+
+const messages = defineMessages({
+  revokeQuoteTitle: {
+    id: 'confirmations.revoke_quote.title',
+    defaultMessage: 'Remove post?',
+  },
+  revokeQuoteMessage: {
+    id: 'confirmations.revoke_quote.message',
+    defaultMessage: 'This action cannot be undone.',
+  },
+  revokeQuoteConfirm: {
+    id: 'confirmations.revoke_quote.confirm',
+    defaultMessage: 'Remove post',
+  },
+});
+
+export const ConfirmRevokeQuoteModal: React.FC<
+  {
+    statusId: string;
+    quotedStatusId: string;
+  } & BaseConfirmationModalProps
+> = ({ statusId, quotedStatusId, onClose }) => {
+  const intl = useIntl();
+  const dispatch = useAppDispatch();
+
+  const onConfirm = useCallback(() => {
+    void dispatch(revokeQuote({ quotedStatusId, statusId }));
+  }, [dispatch, statusId, quotedStatusId]);
+
+  return (
+    <ConfirmationModal
+      title={intl.formatMessage(messages.revokeQuoteTitle)}
+      message={intl.formatMessage(messages.revokeQuoteMessage)}
+      confirm={intl.formatMessage(messages.revokeQuoteConfirm)}
+      onConfirm={onConfirm}
+      onClose={onClose}
+    />
+  );
+};
diff --git a/app/javascript/mastodon/features/ui/components/confirmation_modals/unblock.tsx b/app/javascript/mastodon/features/ui/components/confirmation_modals/unblock.tsx
new file mode 100644
index 00000000000..e2154ef48df
--- /dev/null
+++ b/app/javascript/mastodon/features/ui/components/confirmation_modals/unblock.tsx
@@ -0,0 +1,45 @@
+import { useCallback } from 'react';
+
+import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
+
+import { unblockAccount } from 'mastodon/actions/accounts';
+import type { Account } from 'mastodon/models/account';
+import { useAppDispatch } from 'mastodon/store';
+
+import type { BaseConfirmationModalProps } from './confirmation_modal';
+import { ConfirmationModal } from './confirmation_modal';
+
+const messages = defineMessages({
+  unblockConfirm: {
+    id: 'confirmations.unblock.confirm',
+    defaultMessage: 'Unblock',
+  },
+});
+
+export const ConfirmUnblockModal: React.FC<
+  {
+    account: Account;
+  } & BaseConfirmationModalProps
+> = ({ account, onClose }) => {
+  const intl = useIntl();
+  const dispatch = useAppDispatch();
+
+  const onConfirm = useCallback(() => {
+    dispatch(unblockAccount(account.id));
+  }, [dispatch, account.id]);
+
+  return (
+    <ConfirmationModal
+      title={
+        <FormattedMessage
+          id='confirmations.unblock.title'
+          defaultMessage='Unblock {name}?'
+          values={{ name: `@${account.acct}` }}
+        />
+      }
+      confirm={intl.formatMessage(messages.unblockConfirm)}
+      onConfirm={onConfirm}
+      onClose={onClose}
+    />
+  );
+};
diff --git a/app/javascript/mastodon/features/ui/components/confirmation_modals/unfollow.tsx b/app/javascript/mastodon/features/ui/components/confirmation_modals/unfollow.tsx
index 58e39da07bf..45b8d458b10 100644
--- a/app/javascript/mastodon/features/ui/components/confirmation_modals/unfollow.tsx
+++ b/app/javascript/mastodon/features/ui/components/confirmation_modals/unfollow.tsx
@@ -10,10 +10,6 @@ import type { BaseConfirmationModalProps } from './confirmation_modal';
 import { ConfirmationModal } from './confirmation_modal';
 
 const messages = defineMessages({
-  unfollowTitle: {
-    id: 'confirmations.unfollow.title',
-    defaultMessage: 'Unfollow user?',
-  },
   unfollowConfirm: {
     id: 'confirmations.unfollow.confirm',
     defaultMessage: 'Unfollow',
@@ -34,12 +30,11 @@ export const ConfirmUnfollowModal: React.FC<
 
   return (
     <ConfirmationModal
-      title={intl.formatMessage(messages.unfollowTitle)}
-      message={
+      title={
         <FormattedMessage
-          id='confirmations.unfollow.message'
-          defaultMessage='Are you sure you want to unfollow {name}?'
-          values={{ name: <strong>@{account.acct}</strong> }}
+          id='confirmations.unfollow.title'
+          defaultMessage='Unfollow {name}?'
+          values={{ name: `@${account.acct}` }}
         />
       }
       confirm={intl.formatMessage(messages.unfollowConfirm)}
diff --git a/app/javascript/mastodon/features/ui/components/confirmation_modals/withdraw_follow_request.tsx b/app/javascript/mastodon/features/ui/components/confirmation_modals/withdraw_follow_request.tsx
new file mode 100644
index 00000000000..a0bd2366374
--- /dev/null
+++ b/app/javascript/mastodon/features/ui/components/confirmation_modals/withdraw_follow_request.tsx
@@ -0,0 +1,45 @@
+import { useCallback } from 'react';
+
+import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
+
+import { unfollowAccount } from 'mastodon/actions/accounts';
+import type { Account } from 'mastodon/models/account';
+import { useAppDispatch } from 'mastodon/store';
+
+import type { BaseConfirmationModalProps } from './confirmation_modal';
+import { ConfirmationModal } from './confirmation_modal';
+
+const messages = defineMessages({
+  withdrawConfirm: {
+    id: 'confirmations.withdraw_request.confirm',
+    defaultMessage: 'Withdraw request',
+  },
+});
+
+export const ConfirmWithdrawRequestModal: React.FC<
+  {
+    account: Account;
+  } & BaseConfirmationModalProps
+> = ({ account, onClose }) => {
+  const intl = useIntl();
+  const dispatch = useAppDispatch();
+
+  const onConfirm = useCallback(() => {
+    dispatch(unfollowAccount(account.id));
+  }, [dispatch, account.id]);
+
+  return (
+    <ConfirmationModal
+      title={
+        <FormattedMessage
+          id='confirmations.withdraw_request.title'
+          defaultMessage='Withdraw request to follow {name}?'
+          values={{ name: `@${account.acct}` }}
+        />
+      }
+      confirm={intl.formatMessage(messages.withdrawConfirm)}
+      onConfirm={onConfirm}
+      onClose={onClose}
+    />
+  );
+};
diff --git a/app/javascript/mastodon/features/ui/components/embed_modal.tsx b/app/javascript/mastodon/features/ui/components/embed_modal.tsx
index b78d5b64c4f..0290b01d2f5 100644
--- a/app/javascript/mastodon/features/ui/components/embed_modal.tsx
+++ b/app/javascript/mastodon/features/ui/components/embed_modal.tsx
@@ -36,6 +36,7 @@ const EmbedModal: React.FC<{
         }
 
         iframeDocument.open();
+        // eslint-disable-next-line @typescript-eslint/no-deprecated
         iframeDocument.write(data.html);
         iframeDocument.close();
 
diff --git a/app/javascript/mastodon/features/ui/components/filter_modal.jsx b/app/javascript/mastodon/features/ui/components/filter_modal.jsx
index 477575bd7b3..a1a39ba0abf 100644
--- a/app/javascript/mastodon/features/ui/components/filter_modal.jsx
+++ b/app/javascript/mastodon/features/ui/components/filter_modal.jsx
@@ -38,7 +38,7 @@ class FilterModal extends ImmutablePureComponent {
 
   handleSuccess = () => {
     const { dispatch, statusId } = this.props;
-    dispatch(fetchStatus(statusId, true));
+    dispatch(fetchStatus(statusId, {forceFetch: true}));
     this.setState({ isSubmitting: false, isSubmitted: true, step: 'submitted' });
   };
 
diff --git a/app/javascript/mastodon/features/ui/components/hashtag_menu_controller.tsx b/app/javascript/mastodon/features/ui/components/hashtag_menu_controller.tsx
index 6707b246728..6833073813d 100644
--- a/app/javascript/mastodon/features/ui/components/hashtag_menu_controller.tsx
+++ b/app/javascript/mastodon/features/ui/components/hashtag_menu_controller.tsx
@@ -11,6 +11,8 @@ import type {
 } from 'react-overlays/esm/usePopper';
 
 import { DropdownMenu } from 'mastodon/components/dropdown_menu';
+import { useIdentity } from 'mastodon/identity_context';
+import type { MenuItem } from 'mastodon/models/dropdown_menu';
 import { useAppSelector } from 'mastodon/store';
 
 const messages = defineMessages({
@@ -45,6 +47,7 @@ interface TargetParams {
 
 export const HashtagMenuController: React.FC = () => {
   const intl = useIntl();
+  const { signedIn } = useIdentity();
   const [open, setOpen] = useState(false);
   const [{ accountId, hashtag }, setTargetParams] = useState<TargetParams>({});
   const targetRef = useRef<HTMLAnchorElement | null>(null);
@@ -96,8 +99,8 @@ export const HashtagMenuController: React.FC = () => {
     targetRef.current = null;
   }, [setOpen]);
 
-  const menu = useMemo(
-    () => [
+  const menu = useMemo(() => {
+    const arr: MenuItem[] = [
       {
         text: intl.formatMessage(messages.browseHashtag, {
           hashtag,
@@ -111,17 +114,20 @@ export const HashtagMenuController: React.FC = () => {
         }),
         to: `/@${account?.acct}/tagged/${hashtag}`,
       },
-      null,
-      {
+    ];
+
+    if (signedIn) {
+      arr.push(null, {
         text: intl.formatMessage(messages.muteHashtag, {
           hashtag,
         }),
         href: '/filters',
         dangerous: true,
-      },
-    ],
-    [intl, hashtag, account],
-  );
+      });
+    }
+
+    return arr;
+  }, [intl, hashtag, account, signedIn]);
 
   if (!open) {
     return null;
diff --git a/app/javascript/mastodon/features/ui/components/media_modal.jsx b/app/javascript/mastodon/features/ui/components/media_modal.jsx
index 01901485553..2ce13bf1d39 100644
--- a/app/javascript/mastodon/features/ui/components/media_modal.jsx
+++ b/app/javascript/mastodon/features/ui/components/media_modal.jsx
@@ -201,8 +201,6 @@ class MediaModal extends ImmutablePureComponent {
             preview={image.get('preview_url')}
             blurhash={image.get('blurhash')}
             src={image.get('url')}
-            width={image.get('width')}
-            height={image.get('height')}
             frameRate={image.getIn(['meta', 'original', 'frame_rate'])}
             aspectRatio={`${image.getIn(['meta', 'original', 'width'])} / ${image.getIn(['meta', 'original', 'height'])}`}
             startTime={currentTime || 0}
@@ -219,8 +217,6 @@ class MediaModal extends ImmutablePureComponent {
         return (
           <GIFV
             src={image.get('url')}
-            width={width}
-            height={height}
             key={image.get('url')}
             alt={description}
             lang={lang}
diff --git a/app/javascript/mastodon/features/ui/components/modal_root.jsx b/app/javascript/mastodon/features/ui/components/modal_root.jsx
index 4a98de0a31a..944feb325e9 100644
--- a/app/javascript/mastodon/features/ui/components/modal_root.jsx
+++ b/app/javascript/mastodon/features/ui/components/modal_root.jsx
@@ -32,16 +32,21 @@ import {
   ConfirmDeleteListModal,
   ConfirmReplyModal,
   ConfirmEditStatusModal,
+  ConfirmUnblockModal,
   ConfirmUnfollowModal,
+  ConfirmWithdrawRequestModal,
   ConfirmClearNotificationsModal,
   ConfirmLogOutModal,
   ConfirmFollowToListModal,
   ConfirmMissingAltTextModal,
+  ConfirmRevokeQuoteModal,
+  QuietPostQuoteInfoModal,
 } from './confirmation_modals';
 import { ImageModal } from './image_modal';
 import MediaModal from './media_modal';
 import { ModalPlaceholder } from './modal_placeholder';
 import VideoModal from './video_modal';
+import { VisibilityModal } from './visibility_modal';
 
 export const MODAL_COMPONENTS = {
   'MEDIA': () => Promise.resolve({ default: MediaModal }),
@@ -54,11 +59,15 @@ export const MODAL_COMPONENTS = {
   'CONFIRM_DELETE_LIST': () => Promise.resolve({ default: ConfirmDeleteListModal }),
   'CONFIRM_REPLY': () => Promise.resolve({ default: ConfirmReplyModal }),
   'CONFIRM_EDIT_STATUS': () => Promise.resolve({ default: ConfirmEditStatusModal }),
+  'CONFIRM_UNBLOCK': () => Promise.resolve({ default: ConfirmUnblockModal }),
   'CONFIRM_UNFOLLOW': () => Promise.resolve({ default: ConfirmUnfollowModal }),
+  'CONFIRM_WITHDRAW_REQUEST': () => Promise.resolve({ default: ConfirmWithdrawRequestModal }),
   'CONFIRM_CLEAR_NOTIFICATIONS': () => Promise.resolve({ default: ConfirmClearNotificationsModal }),
   'CONFIRM_LOG_OUT': () => Promise.resolve({ default: ConfirmLogOutModal }),
   'CONFIRM_FOLLOW_TO_LIST': () => Promise.resolve({ default: ConfirmFollowToListModal }),
   'CONFIRM_MISSING_ALT_TEXT': () => Promise.resolve({ default: ConfirmMissingAltTextModal }),
+  'CONFIRM_REVOKE_QUOTE': () => Promise.resolve({ default: ConfirmRevokeQuoteModal }),
+  'CONFIRM_QUIET_QUOTE': () => Promise.resolve({ default: QuietPostQuoteInfoModal }),
   'MUTE': MuteModal,
   'BLOCK': BlockModal,
   'DOMAIN_BLOCK': DomainBlockModal,
@@ -74,6 +83,7 @@ export const MODAL_COMPONENTS = {
   'CLOSED_REGISTRATIONS': ClosedRegistrationsModal,
   'IGNORE_NOTIFICATIONS': IgnoreNotificationsModal,
   'ANNUAL_REPORT': AnnualReportModal,
+  'COMPOSE_PRIVACY': () => Promise.resolve({ default: VisibilityModal }),
 };
 
 export default class ModalRoot extends PureComponent {
diff --git a/app/javascript/mastodon/features/ui/components/visibility_modal.tsx b/app/javascript/mastodon/features/ui/components/visibility_modal.tsx
new file mode 100644
index 00000000000..afd9ee7ed06
--- /dev/null
+++ b/app/javascript/mastodon/features/ui/components/visibility_modal.tsx
@@ -0,0 +1,380 @@
+import { forwardRef, useCallback, useId, useMemo, useState } from 'react';
+import type { FC } from 'react';
+
+import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
+
+import classNames from 'classnames';
+
+import type { ApiQuotePolicy } from '@/mastodon/api_types/quotes';
+import { isQuotePolicy } from '@/mastodon/api_types/quotes';
+import { isStatusVisibility } from '@/mastodon/api_types/statuses';
+import type { StatusVisibility } from '@/mastodon/api_types/statuses';
+import { Button } from '@/mastodon/components/button';
+import { Dropdown } from '@/mastodon/components/dropdown';
+import type { SelectItem } from '@/mastodon/components/dropdown_selector';
+import { IconButton } from '@/mastodon/components/icon_button';
+import { messages as privacyMessages } from '@/mastodon/features/compose/components/privacy_dropdown';
+import { createAppSelector, useAppSelector } from '@/mastodon/store';
+import AlternateEmailIcon from '@/material-icons/400-24px/alternate_email.svg?react';
+import CloseIcon from '@/material-icons/400-24px/close.svg?react';
+import LockIcon from '@/material-icons/400-24px/lock.svg?react';
+import PublicIcon from '@/material-icons/400-24px/public.svg?react';
+import QuietTimeIcon from '@/material-icons/400-24px/quiet_time.svg?react';
+
+import type { BaseConfirmationModalProps } from './confirmation_modals/confirmation_modal';
+
+const messages = defineMessages({
+  close: { id: 'lightbox.close', defaultMessage: 'Close' },
+  buttonTitle: {
+    id: 'visibility_modal.button_title',
+    defaultMessage: 'Set visibility',
+  },
+  quotePublic: {
+    id: 'visibility_modal.quote_public',
+    defaultMessage: 'Anyone',
+  },
+  quoteFollowers: {
+    id: 'visibility_modal.quote_followers',
+    defaultMessage: 'Followers only',
+  },
+  quoteNobody: {
+    id: 'visibility_modal.quote_nobody',
+    defaultMessage: 'Just me',
+  },
+});
+
+export type VisibilityModalCallback = (
+  visibility: StatusVisibility,
+  quotePolicy: ApiQuotePolicy,
+) => void;
+
+interface VisibilityModalProps extends BaseConfirmationModalProps {
+  statusId?: string;
+  onChange: VisibilityModalCallback;
+}
+
+const selectStatusPolicy = createAppSelector(
+  [
+    (state) => state.statuses,
+    (_state, statusId?: string) => statusId,
+    (state) => state.compose.get('quote_policy') as ApiQuotePolicy,
+  ],
+  (statuses, statusId, composeQuotePolicy) => {
+    if (!statusId) {
+      return composeQuotePolicy;
+    }
+    const status = statuses.get(statusId);
+    if (!status) {
+      return 'public';
+    }
+    const policy =
+      (status.getIn(['quote_approval', 'automatic', 0]) as string) || 'nobody';
+    const visibility = status.get('visibility') as StatusVisibility;
+
+    // If the status is private or direct, it cannot be quoted by anyone.
+    if (visibility === 'private' || visibility === 'direct') {
+      return 'nobody';
+    }
+
+    // If the status has a specific quote policy, return it.
+    if (isQuotePolicy(policy)) {
+      return policy;
+    }
+
+    // Otherwise, return the default based on visibility.
+    if (visibility === 'unlisted') {
+      return 'followers';
+    }
+    return 'public';
+  },
+);
+
+const selectDisablePublicVisibilities = createAppSelector(
+  [
+    (state) => state.statuses,
+    (_state, statusId?: string) => !!statusId,
+    (state) => state.compose.get('quoted_status_id') as string | null,
+  ],
+  (statuses, isEditing, statusId) => {
+    if (isEditing || !statusId) return false;
+
+    const status = statuses.get(statusId);
+    if (!status) {
+      return false;
+    }
+
+    return status.get('visibility') === 'private';
+  },
+);
+
+export const VisibilityModal: FC<VisibilityModalProps> = forwardRef(
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  ({ onClose, onChange, statusId }, _ref) => {
+    const intl = useIntl();
+    const currentVisibility = useAppSelector((state) =>
+      statusId
+        ? ((state.statuses.getIn([statusId, 'visibility'], 'public') as
+            | StatusVisibility
+            | undefined) ?? 'public')
+        : (state.compose.get('privacy') as StatusVisibility),
+    );
+    const currentQuotePolicy = useAppSelector((state) =>
+      selectStatusPolicy(state, statusId),
+    );
+
+    const [visibility, setVisibility] = useState(currentVisibility);
+    const [quotePolicy, setQuotePolicy] = useState(currentQuotePolicy);
+
+    const disableVisibility = !!statusId;
+    const disableQuotePolicy =
+      visibility === 'private' || visibility === 'direct';
+    const disablePublicVisibilities: boolean = useAppSelector(
+      selectDisablePublicVisibilities,
+    );
+
+    const visibilityItems = useMemo<SelectItem<StatusVisibility>[]>(() => {
+      const items: SelectItem<StatusVisibility>[] = [
+        {
+          value: 'private',
+          text: intl.formatMessage(privacyMessages.private_short),
+          meta: intl.formatMessage(privacyMessages.private_long),
+          icon: 'lock',
+          iconComponent: LockIcon,
+        },
+        {
+          value: 'direct',
+          text: intl.formatMessage(privacyMessages.direct_short),
+          meta: intl.formatMessage(privacyMessages.direct_long),
+          icon: 'at',
+          iconComponent: AlternateEmailIcon,
+        },
+      ];
+
+      if (!disablePublicVisibilities) {
+        items.unshift(
+          {
+            value: 'public',
+            text: intl.formatMessage(privacyMessages.public_short),
+            meta: intl.formatMessage(privacyMessages.public_long),
+            icon: 'globe',
+            iconComponent: PublicIcon,
+          },
+          {
+            value: 'unlisted',
+            text: intl.formatMessage(privacyMessages.unlisted_short),
+            meta: intl.formatMessage(privacyMessages.unlisted_long),
+            icon: 'unlock',
+            iconComponent: QuietTimeIcon,
+          },
+        );
+      }
+
+      return items;
+    }, [intl, disablePublicVisibilities]);
+    const quoteItems = useMemo<SelectItem<ApiQuotePolicy>[]>(
+      () => [
+        { value: 'public', text: intl.formatMessage(messages.quotePublic) },
+        {
+          value: 'followers',
+          text: intl.formatMessage(messages.quoteFollowers),
+        },
+        { value: 'nobody', text: intl.formatMessage(messages.quoteNobody) },
+      ],
+      [intl],
+    );
+
+    const handleVisibilityChange = useCallback((value: string) => {
+      if (isStatusVisibility(value)) {
+        setVisibility(value);
+      }
+    }, []);
+    const handleQuotePolicyChange = useCallback((value: string) => {
+      if (isQuotePolicy(value)) {
+        setQuotePolicy(value);
+      }
+    }, []);
+    const handleSave = useCallback(() => {
+      onChange(visibility, quotePolicy);
+      onClose();
+    }, [onChange, onClose, visibility, quotePolicy]);
+
+    const uniqueId = useId();
+    const visibilityLabelId = `${uniqueId}-visibility-label`;
+    const visibilityDescriptionId = `${uniqueId}-visibility-desc`;
+    const quoteLabelId = `${uniqueId}-quote-label`;
+    const quoteDescriptionId = `${uniqueId}-quote-desc`;
+
+    return (
+      <div className='modal-root__modal dialog-modal visibility-modal'>
+        <div className='dialog-modal__header'>
+          <IconButton
+            className='dialog-modal__header__close'
+            title={intl.formatMessage(messages.close)}
+            icon='times'
+            iconComponent={CloseIcon}
+            onClick={onClose}
+          />
+          <FormattedMessage
+            id='visibility_modal.header'
+            defaultMessage='Visibility and interaction'
+          >
+            {(chunks) => (
+              <span className='dialog-modal__header__title'>{chunks}</span>
+            )}
+          </FormattedMessage>
+        </div>
+        <div className='dialog-modal__content'>
+          <div className='dialog-modal__content__description'>
+            <FormattedMessage
+              id='visibility_modal.instructions'
+              defaultMessage='Control who can interact with this post. You can also apply settings to all future posts by navigating to <link>Preferences > Posting defaults</link>.'
+              values={{
+                link: (chunks) => (
+                  <a href='/settings/preferences/posting_defaults'>{chunks}</a>
+                ),
+              }}
+              tagName='p'
+            />
+          </div>
+          <div className='dialog-modal__content__form'>
+            <div
+              className={classNames('visibility-dropdown', {
+                disabled: disableVisibility,
+              })}
+            >
+              {/* eslint-disable-next-line jsx-a11y/label-has-associated-control */}
+              <label
+                className='visibility-dropdown__label'
+                id={visibilityLabelId}
+              >
+                <FormattedMessage
+                  id='visibility_modal.privacy_label'
+                  defaultMessage='Visibility'
+                />
+              </label>
+
+              <Dropdown
+                items={visibilityItems}
+                current={visibility}
+                onChange={handleVisibilityChange}
+                labelId={visibilityLabelId}
+                descriptionId={visibilityDescriptionId}
+                classPrefix='visibility-dropdown'
+                disabled={disableVisibility}
+              />
+              {!!statusId && (
+                <p
+                  className='visibility-dropdown__helper'
+                  id='visibilityDescriptionId'
+                >
+                  <FormattedMessage
+                    id='visibility_modal.helper.privacy_editing'
+                    defaultMessage="Visibility can't be changed after a post is published."
+                  />
+                </p>
+              )}
+              {!statusId && disablePublicVisibilities && (
+                <p
+                  className='visibility-dropdown__helper'
+                  id='visibilityDescriptionId'
+                >
+                  <FormattedMessage
+                    id='visibility_modal.helper.privacy_private_self_quote'
+                    defaultMessage='Self-quotes of private posts cannot be made public.'
+                  />
+                </p>
+              )}
+            </div>
+
+            <div
+              className={classNames('visibility-dropdown', {
+                disabled: disableQuotePolicy,
+              })}
+            >
+              {/* eslint-disable-next-line jsx-a11y/label-has-associated-control */}
+              <label className='visibility-dropdown__label' id={quoteLabelId}>
+                <FormattedMessage
+                  id='visibility_modal.quote_label'
+                  defaultMessage='Who can quote'
+                />
+              </label>
+
+              <Dropdown
+                items={quoteItems}
+                current={disableQuotePolicy ? 'nobody' : quotePolicy}
+                onChange={handleQuotePolicyChange}
+                labelId={quoteLabelId}
+                descriptionId={quoteDescriptionId}
+                classPrefix='visibility-dropdown'
+                disabled={disableQuotePolicy}
+              />
+              <QuotePolicyHelper
+                policy={quotePolicy}
+                visibility={visibility}
+                className='visibility-dropdown__helper'
+                id={quoteDescriptionId}
+              />
+            </div>
+          </div>
+          <div className='dialog-modal__content__actions'>
+            <Button onClick={onClose} secondary>
+              <FormattedMessage
+                id='confirmation_modal.cancel'
+                defaultMessage='Cancel'
+              />
+            </Button>
+            <Button onClick={handleSave}>
+              <FormattedMessage
+                id='visibility_modal.save'
+                defaultMessage='Save'
+              />
+            </Button>
+          </div>
+        </div>
+      </div>
+    );
+  },
+);
+VisibilityModal.displayName = 'VisibilityModal';
+
+const QuotePolicyHelper: FC<
+  {
+    policy: ApiQuotePolicy;
+    visibility: StatusVisibility;
+  } & React.ComponentPropsWithoutRef<'p'>
+> = ({ policy, visibility, ...otherProps }) => {
+  let hintText: React.ReactElement | undefined;
+
+  if (visibility === 'unlisted' && policy !== 'nobody') {
+    hintText = (
+      <FormattedMessage
+        id='visibility_modal.helper.unlisted_quoting'
+        defaultMessage='When people quote you, their post will also be hidden from trending timelines.'
+      />
+    );
+  }
+
+  if (visibility === 'private') {
+    hintText = (
+      <FormattedMessage
+        id='visibility_modal.helper.private_quoting'
+        defaultMessage="Follower-only posts authored on Mastodon can't be quoted by others."
+      />
+    );
+  }
+
+  if (visibility === 'direct') {
+    hintText = (
+      <FormattedMessage
+        id='visibility_modal.helper.direct_quoting'
+        defaultMessage="Private mentions authored on Mastodon can't be quoted by others."
+      />
+    );
+  }
+
+  if (!hintText) {
+    return null;
+  }
+
+  return <p {...otherProps}>{hintText}</p>;
+};
diff --git a/app/javascript/mastodon/features/ui/components/zoomable_image.tsx b/app/javascript/mastodon/features/ui/components/zoomable_image.tsx
index 09b39d3efab..1297d243d0d 100644
--- a/app/javascript/mastodon/features/ui/components/zoomable_image.tsx
+++ b/app/javascript/mastodon/features/ui/components/zoomable_image.tsx
@@ -306,10 +306,8 @@ export const ZoomableImage: React.FC<ZoomableImageProps> = ({
 
       <animated.img
         style={{ transform }}
-        role='presentation'
         ref={imageRef}
         alt={alt}
-        title={alt}
         lang={lang}
         src={src}
         width={width}
diff --git a/app/javascript/mastodon/features/ui/hooks/useBreakpoint.tsx b/app/javascript/mastodon/features/ui/hooks/useBreakpoint.tsx
index af96ab37663..cb7b3551f22 100644
--- a/app/javascript/mastodon/features/ui/hooks/useBreakpoint.tsx
+++ b/app/javascript/mastodon/features/ui/hooks/useBreakpoint.tsx
@@ -1,11 +1,12 @@
 import { useState, useEffect } from 'react';
 
 const breakpoints = {
+  narrow: 479, // Device width under which horizontal space is constrained
   openable: 759, // Device width at which the sidebar becomes an openable hamburger menu
   full: 1174, // Device width at which all 3 columns can be displayed
 };
 
-type Breakpoint = 'openable' | 'full';
+type Breakpoint = keyof typeof breakpoints;
 
 export const useBreakpoint = (breakpoint: Breakpoint) => {
   const [isMatching, setIsMatching] = useState(false);
diff --git a/app/javascript/mastodon/features/ui/index.jsx b/app/javascript/mastodon/features/ui/index.jsx
index c9834eb0a48..04c7f33dfd5 100644
--- a/app/javascript/mastodon/features/ui/index.jsx
+++ b/app/javascript/mastodon/features/ui/index.jsx
@@ -9,24 +9,25 @@ import { Redirect, Route, withRouter } from 'react-router-dom';
 import { connect } from 'react-redux';
 
 import { debounce } from 'lodash';
-import { HotKeys } from 'react-hotkeys';
 
 import { focusApp, unfocusApp, changeLayout } from 'mastodon/actions/app';
 import { synchronouslySubmitMarkers, submitMarkers, fetchMarkers } from 'mastodon/actions/markers';
 import { fetchNotifications } from 'mastodon/actions/notification_groups';
 import { INTRODUCTION_VERSION } from 'mastodon/actions/onboarding';
 import { AlertsController } from 'mastodon/components/alerts_controller';
+import { Hotkeys } from 'mastodon/components/hotkeys';
 import { HoverCardController } from 'mastodon/components/hover_card_controller';
 import { PictureInPicture } from 'mastodon/features/picture_in_picture';
 import { identityContextPropShape, withIdentity } from 'mastodon/identity_context';
 import { layoutFromWindow } from 'mastodon/is_mobile';
 import { WithRouterPropTypes } from 'mastodon/utils/react_router';
 
+import { handleAnimateGif } from '../emoji/handlers';
 import { uploadCompose, resetCompose, changeComposeSpoilerness } from '../../actions/compose';
 import { clearHeight } from '../../actions/height_cache';
 import { fetchServer, fetchServerTranslationLanguages } from '../../actions/server';
 import { expandHomeTimeline } from '../../actions/timelines';
-import initialState, { me, owner, singleUserMode, trendsEnabled, trendsAsLanding, disableHoverCards } from '../../initial_state';
+import { initialState, me, owner, singleUserMode, trendsEnabled, trendsAsLanding, disableHoverCards, autoPlayGif } from '../../initial_state';
 
 import BundleColumnError from './components/bundle_column_error';
 import { NavigationBar } from './components/navigation_bar';
@@ -75,8 +76,10 @@ import {
   PrivacyPolicy,
   TermsOfService,
   AccountFeatured,
+  Quotes,
 } from './util/async-components';
 import { ColumnsContextProvider } from './util/columns_context';
+import { focusColumn, getFocusedItemIndex, focusItemSibling } from './util/focusUtils';
 import { WrappedSwitch, WrappedRoute } from './util/react_router_helpers';
 
 // Dummy import, to make sure that <Status /> ends up in the application bundle.
@@ -90,48 +93,13 @@ const messages = defineMessages({
 const mapStateToProps = state => ({
   layout: state.getIn(['meta', 'layout']),
   isComposing: state.getIn(['compose', 'is_composing']),
-  hasComposingText: state.getIn(['compose', 'text']).trim().length !== 0,
-  hasMediaAttachments: state.getIn(['compose', 'media_attachments']).size > 0,
+  hasComposingContents: state.getIn(['compose', 'text']).trim().length !== 0 || state.getIn(['compose', 'media_attachments']).size > 0 || state.getIn(['compose', 'poll']) !== null || state.getIn(['compose', 'quoted_status_id']) !== null,
   canUploadMore: !state.getIn(['compose', 'media_attachments']).some(x => ['audio', 'video'].includes(x.get('type'))) && state.getIn(['compose', 'media_attachments']).size < state.getIn(['server', 'server', 'configuration', 'statuses', 'max_media_attachments']),
   firstLaunch: state.getIn(['settings', 'introductionVersion'], 0) < INTRODUCTION_VERSION,
   newAccount: !state.getIn(['accounts', me, 'note']) && !state.getIn(['accounts', me, 'bot']) && state.getIn(['accounts', me, 'following_count'], 0) === 0 && state.getIn(['accounts', me, 'statuses_count'], 0) === 0,
   username: state.getIn(['accounts', me, 'username']),
 });
 
-const keyMap = {
-  help: '?',
-  new: 'n',
-  search: ['s', '/'],
-  forceNew: 'option+n',
-  toggleComposeSpoilers: 'option+x',
-  focusColumn: ['1', '2', '3', '4', '5', '6', '7', '8', '9'],
-  reply: 'r',
-  favourite: 'f',
-  boost: 'b',
-  mention: 'm',
-  open: ['enter', 'o'],
-  openProfile: 'p',
-  moveDown: ['down', 'j'],
-  moveUp: ['up', 'k'],
-  back: 'backspace',
-  goToHome: 'g h',
-  goToNotifications: 'g n',
-  goToLocal: 'g l',
-  goToFederated: 'g t',
-  goToDirect: 'g d',
-  goToStart: 'g s',
-  goToFavourites: 'g f',
-  goToPinned: 'g p',
-  goToProfile: 'g u',
-  goToBlocked: 'g b',
-  goToMuted: 'g m',
-  goToRequests: 'g r',
-  toggleHidden: 'x',
-  toggleSensitive: 'h',
-  openMedia: 'e',
-  onTranslate: 't',
-};
-
 class SwitchingColumnsArea extends PureComponent {
   static propTypes = {
     identity: identityContextPropShape,
@@ -242,6 +210,7 @@ class SwitchingColumnsArea extends PureComponent {
             <WrappedRoute path='/@:acct/:statusId' exact component={Status} content={children} />
             <WrappedRoute path='/@:acct/:statusId/reblogs' component={Reblogs} content={children} />
             <WrappedRoute path='/@:acct/:statusId/favourites' component={Favourites} content={children} />
+            <WrappedRoute path='/@:acct/:statusId/quotes' component={Quotes} content={children} />
 
             {/* Legacy routes, cannot be easily factored with other routes because they share a param name */}
             <WrappedRoute path='/timelines/tag/:id' component={HashtagTimeline} content={children} />
@@ -272,8 +241,7 @@ class UI extends PureComponent {
     dispatch: PropTypes.func.isRequired,
     children: PropTypes.node,
     isComposing: PropTypes.bool,
-    hasComposingText: PropTypes.bool,
-    hasMediaAttachments: PropTypes.bool,
+    hasComposingContents: PropTypes.bool,
     canUploadMore: PropTypes.bool,
     intl: PropTypes.object.isRequired,
     layout: PropTypes.string.isRequired,
@@ -288,11 +256,11 @@ class UI extends PureComponent {
   };
 
   handleBeforeUnload = e => {
-    const { intl, dispatch, isComposing, hasComposingText, hasMediaAttachments } = this.props;
+    const { intl, dispatch, isComposing, hasComposingContents } = this.props;
 
     dispatch(synchronouslySubmitMarkers());
 
-    if (isComposing && (hasComposingText || hasMediaAttachments)) {
+    if (isComposing && hasComposingContents) {
       e.preventDefault();
       // Setting returnValue to any string causes confirmation dialog.
       // Many browsers no longer display this text to users,
@@ -400,6 +368,10 @@ class UI extends PureComponent {
     }
   };
 
+  handleDonate = () => {
+    location.href = 'https://joinmastodon.org/sponsors#donate'
+  }
+
   componentDidMount () {
     const { signedIn } = this.props.identity;
 
@@ -408,6 +380,11 @@ class UI extends PureComponent {
     window.addEventListener('beforeunload', this.handleBeforeUnload, false);
     window.addEventListener('resize', this.handleResize, { passive: true });
 
+    if (!autoPlayGif) {
+      window.addEventListener('mouseover', handleAnimateGif, { passive: true });
+      window.addEventListener('mouseout', handleAnimateGif, { passive: true });
+    }
+
     document.addEventListener('dragenter', this.handleDragEnter, false);
     document.addEventListener('dragover', this.handleDragOver, false);
     document.addEventListener('drop', this.handleDrop, false);
@@ -426,10 +403,6 @@ class UI extends PureComponent {
 
       setTimeout(() => this.props.dispatch(fetchServer()), 3000);
     }
-
-    this.hotkeys.__mousetrap__.stopCallback = (e, element) => {
-      return ['TEXTAREA', 'SELECT', 'INPUT'].includes(element.tagName);
-    };
   }
 
   componentWillUnmount () {
@@ -437,6 +410,8 @@ class UI extends PureComponent {
     window.removeEventListener('blur', this.handleWindowBlur);
     window.removeEventListener('beforeunload', this.handleBeforeUnload);
     window.removeEventListener('resize', this.handleResize);
+    window.removeEventListener('mouseover', handleAnimateGif);
+    window.removeEventListener('mouseout', handleAnimateGif);
 
     document.removeEventListener('dragenter', this.handleDragEnter);
     document.removeEventListener('dragover', this.handleDragOver);
@@ -480,20 +455,34 @@ class UI extends PureComponent {
   };
 
   handleHotkeyFocusColumn = e => {
-    const index  = (e.key * 1) + 1; // First child is drawer, skip that
-    const column = this.node.querySelector(`.column:nth-child(${index})`);
-    if (!column) return;
-    const container = column.querySelector('.scrollable');
+    focusColumn({index: e.key * 1});
+  };
 
-    if (container) {
-      const status = container.querySelector('.focusable');
+  handleHotkeyLoadMore = () => {
+    document.querySelector('.load-more')?.focus();
+  };
 
-      if (status) {
-        if (container.scrollTop > status.offsetTop) {
-          status.scrollIntoView(true);
-        }
-        status.focus();
-      }
+  handleMoveUp = () => {
+    const currentItemIndex = getFocusedItemIndex();
+    if (currentItemIndex === -1) {
+      focusColumn({
+        index: 1,
+        focusItem: 'first-visible',
+      });
+    } else {
+      focusItemSibling(currentItemIndex, -1);
+    }
+  };
+
+  handleMoveDown = () => {
+    const currentItemIndex = getFocusedItemIndex();
+    if (currentItemIndex === -1) {
+      focusColumn({
+        index: 1,
+        focusItem: 'first-visible',
+      });
+    } else {
+      focusItemSibling(currentItemIndex, 1);
     }
   };
 
@@ -509,10 +498,6 @@ class UI extends PureComponent {
     }
   };
 
-  setHotkeysRef = c => {
-    this.hotkeys = c;
-  };
-
   handleHotkeyToggleHelp = () => {
     if (this.props.location.pathname === '/keyboard-shortcuts') {
       this.props.history.goBack();
@@ -580,6 +565,9 @@ class UI extends PureComponent {
       forceNew: this.handleHotkeyForceNew,
       toggleComposeSpoilers: this.handleHotkeyToggleComposeSpoilers,
       focusColumn: this.handleHotkeyFocusColumn,
+      focusLoadMore: this.handleHotkeyLoadMore,
+      moveDown: this.handleMoveDown,
+      moveUp: this.handleMoveUp,
       back: this.handleHotkeyBack,
       goToHome: this.handleHotkeyGoToHome,
       goToNotifications: this.handleHotkeyGoToNotifications,
@@ -593,10 +581,11 @@ class UI extends PureComponent {
       goToBlocked: this.handleHotkeyGoToBlocked,
       goToMuted: this.handleHotkeyGoToMuted,
       goToRequests: this.handleHotkeyGoToRequests,
+      cheat: this.handleDonate,
     };
 
     return (
-      <HotKeys keyMap={keyMap} handlers={handlers} ref={this.setHotkeysRef} attach={window} focused>
+      <Hotkeys global handlers={handlers}>
         <div className={classNames('ui', { 'is-composing': isComposing })} ref={this.setRef}>
           <SwitchingColumnsArea identity={this.props.identity} location={location} singleColumn={layout === 'mobile' || layout === 'single-column'} forceOnboarding={firstLaunch && newAccount}>
             {children}
@@ -611,7 +600,7 @@ class UI extends PureComponent {
           <ModalContainer />
           <UploadArea active={draggingOver} onClose={this.closeUploadModal} />
         </div>
-      </HotKeys>
+      </Hotkeys>
     );
   }
 
diff --git a/app/javascript/mastodon/features/ui/util/async-components.js b/app/javascript/mastodon/features/ui/util/async-components.js
index d865f7d7a53..6cd46837c0e 100644
--- a/app/javascript/mastodon/features/ui/util/async-components.js
+++ b/app/javascript/mastodon/features/ui/util/async-components.js
@@ -86,6 +86,10 @@ export function Favourites () {
   return import('../../favourites');
 }
 
+export function Quotes () {
+  return import('../../quotes');
+}
+
 export function FollowRequests () {
   return import('../../follow_requests');
 }
diff --git a/app/javascript/mastodon/features/ui/util/focusUtils.ts b/app/javascript/mastodon/features/ui/util/focusUtils.ts
new file mode 100644
index 00000000000..e46ede3553f
--- /dev/null
+++ b/app/javascript/mastodon/features/ui/util/focusUtils.ts
@@ -0,0 +1,122 @@
+import { initialState } from '@/mastodon/initial_state';
+
+interface FocusColumnOptions {
+  index?: number;
+  focusItem?: 'first' | 'first-visible';
+}
+
+/**
+ * Move focus to the column of the passed index (1-based).
+ * Can either focus the topmost item or the first one in the viewport
+ */
+export function focusColumn({
+  index = 1,
+  focusItem = 'first',
+}: FocusColumnOptions = {}) {
+  // Skip the leftmost drawer in multi-column mode
+  const indexOffset = initialState?.meta.advanced_layout ? 1 : 0;
+
+  const column = document.querySelector(
+    `.column:nth-child(${index + indexOffset})`,
+  );
+
+  if (!column) return;
+
+  const container = column.querySelector('.scrollable');
+
+  if (!container) return;
+
+  let itemToFocus: HTMLElement | null = null;
+
+  if (focusItem === 'first-visible') {
+    const focusableItems = Array.from(
+      container.querySelectorAll<HTMLElement>(
+        '.focusable:not(.status__quote .focusable)',
+      ),
+    );
+
+    const viewportHeight =
+      window.innerHeight || document.documentElement.clientHeight;
+
+    // Find first item visible in the viewport
+    itemToFocus =
+      focusableItems.find((item) => {
+        const { top } = item.getBoundingClientRect();
+        return top >= 0 && top < viewportHeight;
+      }) ?? null;
+  } else {
+    itemToFocus = container.querySelector('.focusable');
+  }
+
+  if (itemToFocus) {
+    if (container.scrollTop > itemToFocus.offsetTop) {
+      itemToFocus.scrollIntoView(true);
+    }
+    itemToFocus.focus();
+  }
+}
+
+/**
+ * Get the index of the currently focused item in one of our item lists
+ */
+export function getFocusedItemIndex() {
+  const focusedItem = document.activeElement?.closest('.item-list > *');
+  if (!focusedItem) return -1;
+
+  const { parentElement } = focusedItem;
+  if (!parentElement) return -1;
+
+  const items = Array.from(parentElement.children);
+  return items.indexOf(focusedItem);
+}
+
+/**
+ * Focus the item next to the one with the provided index
+ */
+export function focusItemSibling(
+  index: number,
+  direction: 1 | -1,
+  scrollThreshold = 62,
+) {
+  const focusedElement = document.activeElement;
+  const itemList = focusedElement?.closest('.item-list');
+
+  const siblingItem = itemList?.querySelector<HTMLElement>(
+    // :nth-child uses 1-based indexing
+    `.item-list > :nth-child(${index + 1 + direction})`,
+  );
+
+  if (!siblingItem) {
+    return;
+  }
+
+  // If sibling element is empty, we skip it
+  if (siblingItem.matches(':empty')) {
+    focusItemSibling(index + direction, direction);
+    return;
+  }
+
+  // Check if the sibling is a post or a 'follow suggestions' widget
+  let targetElement = siblingItem.querySelector<HTMLElement>('.focusable');
+
+  // Otherwise, check if the item is a 'load more' button.
+  if (!targetElement && siblingItem.matches('.load-more')) {
+    targetElement = siblingItem;
+  }
+
+  if (targetElement) {
+    const elementRect = targetElement.getBoundingClientRect();
+
+    const isFullyVisible =
+      elementRect.top >= scrollThreshold &&
+      elementRect.bottom <= window.innerHeight;
+
+    if (!isFullyVisible) {
+      targetElement.scrollIntoView({
+        block: direction === 1 ? 'start' : 'center',
+      });
+    }
+
+    targetElement.focus();
+  }
+}
diff --git a/app/javascript/mastodon/hooks/useLinks.ts b/app/javascript/mastodon/hooks/useLinks.ts
index c99f3f41991..77609181be9 100644
--- a/app/javascript/mastodon/hooks/useLinks.ts
+++ b/app/javascript/mastodon/hooks/useLinks.ts
@@ -7,14 +7,17 @@ import { isFulfilled, isRejected } from '@reduxjs/toolkit';
 import { openURL } from 'mastodon/actions/search';
 import { useAppDispatch } from 'mastodon/store';
 
+import { isModernEmojiEnabled } from '../utils/environment';
+
 const isMentionClick = (element: HTMLAnchorElement) =>
-  element.classList.contains('mention');
+  element.classList.contains('mention') &&
+  !element.classList.contains('hashtag');
 
 const isHashtagClick = (element: HTMLAnchorElement) =>
-  element.textContent?.[0] === '#' ||
+  element.textContent.startsWith('#') ||
   element.previousSibling?.textContent?.endsWith('#');
 
-export const useLinks = () => {
+export const useLinks = (skipHashtags?: boolean) => {
   const history = useHistory();
   const dispatch = useAppDispatch();
 
@@ -52,6 +55,11 @@ export const useLinks = () => {
 
   const handleClick = useCallback(
     (e: React.MouseEvent) => {
+      // Exit early if modern emoji is enabled, as this is handled by HandledLink.
+      if (isModernEmojiEnabled()) {
+        return;
+      }
+
       const target = (e.target as HTMLElement).closest('a');
 
       if (!target || e.button !== 0 || e.ctrlKey || e.metaKey) {
@@ -61,12 +69,12 @@ export const useLinks = () => {
       if (isMentionClick(target)) {
         e.preventDefault();
         void handleMentionClick(target);
-      } else if (isHashtagClick(target)) {
+      } else if (isHashtagClick(target) && !skipHashtags) {
         e.preventDefault();
         handleHashtagClick(target);
       }
     },
-    [handleMentionClick, handleHashtagClick],
+    [skipHashtags, handleMentionClick, handleHashtagClick],
   );
 
   return handleClick;
diff --git a/app/javascript/mastodon/initial_state.js b/app/javascript/mastodon/initial_state.js
deleted file mode 100644
index 093422ac87b..00000000000
--- a/app/javascript/mastodon/initial_state.js
+++ /dev/null
@@ -1,143 +0,0 @@
-// @ts-check
-
-
-/**
- * @typedef {[code: string, name: string, localName: string]} InitialStateLanguage
- */
-
-/**
- * @typedef InitialStateMeta
- * @property {string} access_token
- * @property {boolean=} advanced_layout
- * @property {boolean} auto_play_gif
- * @property {boolean} activity_api_enabled
- * @property {string} admin
- * @property {boolean=} boost_modal
- * @property {boolean=} delete_modal
- * @property {boolean=} missing_alt_text_modal
- * @property {boolean=} disable_swiping
- * @property {boolean=} disable_hover_cards
- * @property {string=} disabled_account_id
- * @property {string} display_media
- * @property {string} domain
- * @property {boolean=} expand_spoilers
- * @property {boolean} limited_federation_mode
- * @property {string} locale
- * @property {string | null} mascot
- * @property {string=} me
- * @property {string=} moved_to_account_id
- * @property {string=} owner
- * @property {boolean} profile_directory
- * @property {boolean} registrations_open
- * @property {boolean} reduce_motion
- * @property {string} repository
- * @property {boolean} search_enabled
- * @property {boolean} trends_enabled
- * @property {boolean} single_user_mode
- * @property {string} source_url
- * @property {string} streaming_api_base_url
- * @property {boolean} timeline_preview
- * @property {string} title
- * @property {boolean} show_trends
- * @property {boolean} trends_as_landing_page
- * @property {boolean} use_blurhash
- * @property {boolean=} use_pending_items
- * @property {string} version
- * @property {string} sso_redirect
- * @property {string} status_page_url
- * @property {boolean} terms_of_service_enabled
- */
-
-/**
- * @typedef Role
- * @property {string} id
- * @property {string} name
- * @property {string} permissions
- * @property {string} color
- * @property {boolean} highlighted
- */
-
-/**
- * @typedef InitialState
- * @property {Record<string, import("./api_types/accounts").ApiAccountJSON>} accounts
- * @property {InitialStateLanguage[]} languages
- * @property {boolean=} critical_updates_pending
- * @property {InitialStateMeta} meta
- * @property {Role?} role
- */
-
-const element = document.getElementById('initial-state');
-/** @type {InitialState | undefined} */
-const initialState = element?.textContent && JSON.parse(element.textContent);
-
-/** @type {string} */
-const initialPath = document.querySelector("head meta[name=initialPath]")?.getAttribute("content") ?? '';
-/** @type {boolean} */
-export const hasMultiColumnPath = initialPath === '/'
-  || initialPath === '/getting-started'
-  || initialPath === '/home'
-  || initialPath.startsWith('/deck');
-
-/**
- * @template {keyof InitialStateMeta} K
- * @param {K} prop
- * @returns {InitialStateMeta[K] | undefined}
- */
-const getMeta = (prop) => initialState?.meta && initialState.meta[prop];
-
-export const activityApiEnabled = getMeta('activity_api_enabled');
-export const autoPlayGif = getMeta('auto_play_gif');
-export const boostModal = getMeta('boost_modal');
-export const deleteModal = getMeta('delete_modal');
-export const missingAltTextModal = getMeta('missing_alt_text_modal');
-export const disableSwiping = getMeta('disable_swiping');
-export const disableHoverCards = getMeta('disable_hover_cards');
-export const disabledAccountId = getMeta('disabled_account_id');
-export const displayMedia = getMeta('display_media');
-export const domain = getMeta('domain');
-export const expandSpoilers = getMeta('expand_spoilers');
-export const forceSingleColumn = !getMeta('advanced_layout');
-export const limitedFederationMode = getMeta('limited_federation_mode');
-export const mascot = getMeta('mascot');
-export const me = getMeta('me');
-export const movedToAccountId = getMeta('moved_to_account_id');
-export const owner = getMeta('owner');
-export const profile_directory = getMeta('profile_directory');
-export const reduceMotion = getMeta('reduce_motion');
-export const registrationsOpen = getMeta('registrations_open');
-export const repository = getMeta('repository');
-export const searchEnabled = getMeta('search_enabled');
-export const trendsEnabled = getMeta('trends_enabled');
-export const showTrends = getMeta('show_trends');
-export const singleUserMode = getMeta('single_user_mode');
-export const source_url = getMeta('source_url');
-export const timelinePreview = getMeta('timeline_preview');
-export const title = getMeta('title');
-export const trendsAsLanding = getMeta('trends_as_landing_page');
-export const useBlurhash = getMeta('use_blurhash');
-export const usePendingItems = getMeta('use_pending_items');
-export const version = getMeta('version');
-export const criticalUpdatesPending = initialState?.critical_updates_pending;
-export const statusPageUrl = getMeta('status_page_url');
-export const sso_redirect = getMeta('sso_redirect');
-export const termsOfServiceEnabled = getMeta('terms_of_service_enabled');
-
-const displayNames = Intl.DisplayNames && new Intl.DisplayNames(getMeta('locale'), {
-  type: 'language',
-  fallback: 'none',
-  languageDisplay: 'standard',
-});
-
-export const languages = initialState?.languages?.map(lang => {
-  // zh-YUE is not a valid CLDR unicode_language_id
-  return [lang[0], displayNames?.of(lang[0].replace('zh-YUE', 'yue')) || lang[1], lang[2]];
-});
-
-/**
- * @returns {string | undefined}
- */
-export function getAccessToken() {
-  return getMeta('access_token');
-}
-
-export default initialState;
diff --git a/app/javascript/mastodon/initial_state.ts b/app/javascript/mastodon/initial_state.ts
new file mode 100644
index 00000000000..f28d81a10ce
--- /dev/null
+++ b/app/javascript/mastodon/initial_state.ts
@@ -0,0 +1,147 @@
+import type { ApiAccountJSON } from './api_types/accounts';
+
+type InitialStateLanguage = [code: string, name: string, localName: string];
+
+interface InitialStateMeta {
+  access_token: string;
+  advanced_layout?: boolean;
+  auto_play_gif: boolean;
+  activity_api_enabled: boolean;
+  admin: string;
+  boost_modal?: boolean;
+  delete_modal?: boolean;
+  missing_alt_text_modal?: boolean;
+  disable_swiping?: boolean;
+  disable_hover_cards?: boolean;
+  disabled_account_id?: string;
+  display_media: string;
+  domain: string;
+  expand_spoilers?: boolean;
+  limited_federation_mode: boolean;
+  locale: string;
+  mascot: string | null;
+  me?: string;
+  moved_to_account_id?: string;
+  owner?: string;
+  profile_directory: boolean;
+  registrations_open: boolean;
+  reduce_motion: boolean;
+  repository: string;
+  search_enabled: boolean;
+  trends_enabled: boolean;
+  single_user_mode: boolean;
+  source_url: string;
+  streaming_api_base_url: string;
+  local_live_feed_access: 'public' | 'authenticated';
+  remote_live_feed_access: 'public' | 'authenticated';
+  local_topic_feed_access: 'public' | 'authenticated';
+  remote_topic_feed_access: 'public' | 'authenticated';
+  title: string;
+  show_trends: boolean;
+  trends_as_landing_page: boolean;
+  use_blurhash: boolean;
+  use_pending_items?: boolean;
+  version: string;
+  sso_redirect: string;
+  status_page_url: string;
+  terms_of_service_enabled: boolean;
+  emoji_style?: string;
+}
+
+interface Role {
+  id: string;
+  name: string;
+  permissions: string;
+  color: string;
+  highlighted: boolean;
+}
+
+export interface InitialState {
+  accounts: Record<string, ApiAccountJSON>;
+  languages: InitialStateLanguage[];
+  critical_updates_pending?: boolean;
+  meta: InitialStateMeta;
+  role?: Role;
+  features: string[];
+}
+
+const element = document.getElementById('initial-state');
+export const initialState: InitialState | undefined = element?.textContent
+  ? (JSON.parse(element.textContent) as InitialState)
+  : undefined;
+
+const initialPath: string =
+  document
+    .querySelector('head meta[name=initialPath]')
+    ?.getAttribute('content') ?? '';
+export const hasMultiColumnPath: boolean =
+  initialPath === '/' ||
+  initialPath === '/getting-started' ||
+  initialPath === '/home' ||
+  initialPath.startsWith('/deck');
+
+function getMeta<K extends keyof InitialStateMeta>(
+  prop: K,
+): InitialStateMeta[K] | undefined {
+  return initialState?.meta[prop];
+}
+
+export const activityApiEnabled = getMeta('activity_api_enabled');
+export const autoPlayGif = getMeta('auto_play_gif');
+export const boostModal = getMeta('boost_modal');
+export const deleteModal = getMeta('delete_modal');
+export const missingAltTextModal = getMeta('missing_alt_text_modal');
+export const disableSwiping = getMeta('disable_swiping');
+export const disableHoverCards = getMeta('disable_hover_cards');
+export const disabledAccountId = getMeta('disabled_account_id');
+export const displayMedia = getMeta('display_media');
+export const domain = getMeta('domain');
+export const emojiStyle = getMeta('emoji_style') ?? 'auto';
+export const expandSpoilers = getMeta('expand_spoilers');
+export const forceSingleColumn = !getMeta('advanced_layout');
+export const limitedFederationMode = getMeta('limited_federation_mode');
+export const mascot = getMeta('mascot');
+export const me = getMeta('me');
+export const movedToAccountId = getMeta('moved_to_account_id');
+export const owner = getMeta('owner');
+export const profile_directory = getMeta('profile_directory');
+export const reduceMotion = getMeta('reduce_motion');
+export const registrationsOpen = getMeta('registrations_open');
+export const repository = getMeta('repository');
+export const searchEnabled = getMeta('search_enabled');
+export const trendsEnabled = getMeta('trends_enabled');
+export const showTrends = getMeta('show_trends');
+export const singleUserMode = getMeta('single_user_mode');
+export const source_url = getMeta('source_url');
+export const localLiveFeedAccess = getMeta('local_live_feed_access');
+export const remoteLiveFeedAccess = getMeta('remote_live_feed_access');
+export const localTopicFeedAccess = getMeta('local_topic_feed_access');
+export const remoteTopicFeedAccess = getMeta('remote_topic_feed_access');
+export const title = getMeta('title');
+export const trendsAsLanding = getMeta('trends_as_landing_page');
+export const useBlurhash = getMeta('use_blurhash');
+export const usePendingItems = getMeta('use_pending_items');
+export const version = getMeta('version');
+export const criticalUpdatesPending = initialState?.critical_updates_pending;
+export const statusPageUrl = getMeta('status_page_url');
+export const sso_redirect = getMeta('sso_redirect');
+export const termsOfServiceEnabled = getMeta('terms_of_service_enabled');
+
+const displayNames = new Intl.DisplayNames(getMeta('locale'), {
+  type: 'language',
+  fallback: 'none',
+  languageDisplay: 'standard',
+});
+
+export const languages = initialState?.languages.map((lang) => {
+  // zh-YUE is not a valid CLDR unicode_language_id
+  return [
+    lang[0],
+    displayNames.of(lang[0].replace('zh-YUE', 'yue')) ?? lang[1],
+    lang[2],
+  ];
+});
+
+export function getAccessToken(): string | undefined {
+  return getMeta('access_token');
+}
diff --git a/app/javascript/mastodon/locales/af.json b/app/javascript/mastodon/locales/af.json
index 045da7e843e..7ab1d793ed4 100644
--- a/app/javascript/mastodon/locales/af.json
+++ b/app/javascript/mastodon/locales/af.json
@@ -1,6 +1,7 @@
 {
   "about.blocks": "Gemodereerde bedieners",
   "about.contact": "Kontak:",
+  "about.default_locale": "Verstek",
   "about.disclaimer": "Mastodon is gratis oopbronsagteware en ’n handelsmerk van Mastodon gGmbH.",
   "about.domain_blocks.no_reason_available": "Rede nie beskikbaar nie",
   "about.domain_blocks.preamble": "Mastodon generally allows you to view content from and interact with users from any other server in the fediverse. These are the exceptions that have been made on this particular server.",
@@ -43,7 +44,6 @@
   "account.posts": "Plasings",
   "account.posts_with_replies": "Plasings en antwoorde",
   "account.report": "Rapporteer @{name}",
-  "account.requested": "Wag op goedkeuring. Klik om volgversoek te kanselleer",
   "account.requested_follow": "{name} het versoek om jou te volg",
   "account.share": "Deel @{name} se profiel",
   "account.show_reblogs": "Wys aangestuurde plasings van @{name}",
@@ -168,9 +168,6 @@
   "hashtag.column_settings.tag_toggle": "Voeg meer etikette by hierdie kolom",
   "hashtag.follow": "Volg hutsetiket",
   "home.column_settings.show_reblogs": "Wys aangestuurde plasings",
-  "interaction_modal.title.follow": "Volg {name}",
-  "interaction_modal.title.reblog": "Stuur {name} se plasing aan",
-  "interaction_modal.title.reply": "Reageer op {name} se plasing",
   "intervals.full.days": "{number, plural, one {# dag} other {# dae}}",
   "intervals.full.hours": "{number, plural, one {# uur} other {# uur}}",
   "intervals.full.minutes": "{number, plural, one {# minuut} other {# minute}}",
@@ -255,7 +252,6 @@
   "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}",
   "status.open": "Brei hierdie plasing uit",
   "status.reblog": "Stuur aan",
-  "status.reblog_private": "Stuur aan met oorspronklike sigbaarheid",
   "status.reblogged_by": "Aangestuur deur {name}",
   "status.reblogs.empty": "Hierdie plasing is nog deur niemand aangestuur nie. As iemand dit aanstuur, sal jy dit hier sien.",
   "status.reply": "Reageer",
diff --git a/app/javascript/mastodon/locales/an.json b/app/javascript/mastodon/locales/an.json
index 95d55ca2972..6733b1b929b 100644
--- a/app/javascript/mastodon/locales/an.json
+++ b/app/javascript/mastodon/locales/an.json
@@ -44,7 +44,6 @@
   "account.posts": "Publicacions",
   "account.posts_with_replies": "Publicacions y respuestas",
   "account.report": "Denunciar a @{name}",
-  "account.requested": "Esperando l'aprebación",
   "account.requested_follow": "{name} ha demandau seguir-te",
   "account.share": "Compartir lo perfil de @{name}",
   "account.show_reblogs": "Amostrar retutz de @{name}",
@@ -134,7 +133,6 @@
   "confirmations.mute.confirm": "Silenciar",
   "confirmations.redraft.confirm": "Borrar y tornar ta borrador",
   "confirmations.unfollow.confirm": "Deixar de seguir",
-  "confirmations.unfollow.message": "Yes seguro que quiers deixar de seguir a {name}?",
   "conversation.delete": "Borrar conversación",
   "conversation.mark_as_read": "Marcar como leyiu",
   "conversation.open": "Veyer conversación",
@@ -233,9 +231,6 @@
   "home.show_announcements": "Amostrar anuncios",
   "interaction_modal.on_another_server": "En un servidor diferent",
   "interaction_modal.on_this_server": "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}",
   "intervals.full.days": "{number, plural, one {# día} other {# días}}",
   "intervals.full.hours": "{number, plural, one {# hora} other {# horas}}",
   "intervals.full.minutes": "{number, plural, one {# menuto} other {# menutos}}",
@@ -442,7 +437,6 @@
   "status.pin": "Fixar",
   "status.read_more": "Leyer mas",
   "status.reblog": "Retutar",
-  "status.reblog_private": "Empentar con l'audiencia orichinal",
   "status.reblogged_by": "Retutau per {name}",
   "status.reblogs.empty": "Dengún no ha retutau encara este tut. Quan belún lo faiga, amaneixerá aquí.",
   "status.redraft": "Borrar y tornar ta borrador",
diff --git a/app/javascript/mastodon/locales/ar.json b/app/javascript/mastodon/locales/ar.json
index 92c269fc3dd..514a8d7f289 100644
--- a/app/javascript/mastodon/locales/ar.json
+++ b/app/javascript/mastodon/locales/ar.json
@@ -1,7 +1,7 @@
 {
   "about.blocks": "خوادم تحت الإشراف",
   "about.contact": "للاتصال:",
-  "about.default_locale": "الافتراضية",
+  "about.default_locale": "افتراضي",
   "about.disclaimer": "ماستدون برنامج حر ومفتوح المصدر وعلامة تجارية لـ Mastodon GmbH.",
   "about.domain_blocks.no_reason_available": "السبب غير متوفر",
   "about.domain_blocks.preamble": "يتيح مَستُدون عمومًا لمستخدميه مطالعة المحتوى من المستخدمين من الخواديم الأخرى في الفدرالية والتفاعل معهم. وهذه هي الاستثناءات التي وضعت على هذا الخادوم.",
@@ -70,7 +70,6 @@
   "account.posts_with_replies": "المنشورات والرُدود",
   "account.remove_from_followers": "إزالة {name} من المتابعين",
   "account.report": "الإبلاغ عن @{name}",
-  "account.requested": "في انتظار القبول. اضغط لإلغاء طلب المُتابعة",
   "account.requested_follow": "لقد طلب {name} متابعتك",
   "account.requests_to_follow_you": "طلبات المتابعة",
   "account.share": "شارِك الملف التعريفي لـ @{name}",
@@ -110,12 +109,12 @@
   "announcement.announcement": "إعلان",
   "annual_report.summary.archetype.booster": "The cool-hunter",
   "annual_report.summary.archetype.lurker": "المتصفح الصامت",
-  "annual_report.summary.archetype.oracle": "حكيم",
+  "annual_report.summary.archetype.oracle": "الحكيم",
   "annual_report.summary.archetype.pollster": "مستطلع للرأي",
   "annual_report.summary.archetype.replier": "الفراشة الاجتماعية",
   "annual_report.summary.followers.followers": "المُتابِعُون",
   "annual_report.summary.followers.total": "{count} في المجمل",
-  "annual_report.summary.here_it_is": "هذا ملخص الخص بك لسنة {year}:",
+  "annual_report.summary.here_it_is": "فيما يلي ملخصك لسنة {year}:",
   "annual_report.summary.highlighted_post.by_favourites": "المنشور ذو أعلى عدد تفضيلات",
   "annual_report.summary.highlighted_post.by_reblogs": "أكثر منشور مُعاد نشره",
   "annual_report.summary.highlighted_post.by_replies": "المنشور بأعلى عدد تعليقات",
@@ -239,15 +238,20 @@
   "confirmations.missing_alt_text.secondary": "انشر على أي حال",
   "confirmations.missing_alt_text.title": "أضف نصًا بديلًا؟",
   "confirmations.mute.confirm": "أكتم",
+  "confirmations.quiet_post_quote_info.dismiss": "لا تُذكرني مرة أخرى",
+  "confirmations.quiet_post_quote_info.got_it": "مفهوم",
+  "confirmations.quiet_post_quote_info.message": "عندما تقتبس منشورا هادئا للعامة، فإن منشورك سيكون أيضا مخفيا عن الخيوط الزمنية الرائجة.",
+  "confirmations.quiet_post_quote_info.title": "اقتباس المنشورات العامة الهادئة",
   "confirmations.redraft.confirm": "إزالة وإعادة الصياغة",
   "confirmations.redraft.message": "هل أنت متأكد من أنك تريد حذف هذا المنشور و إعادة صياغته؟ سوف تفقد جميع الإعجابات و الترقيات أما الردود المتصلة به فستُصبِح يتيمة.",
   "confirmations.redraft.title": "أتريد حذف وإعادة صياغة المنشور؟",
   "confirmations.remove_from_followers.confirm": "إزالة المتابع",
   "confirmations.remove_from_followers.message": "سيتوقف {name} عن متابعتك. هل بالتأكيد تريد المتابعة؟",
   "confirmations.remove_from_followers.title": "إزالة المتابع؟",
+  "confirmations.revoke_quote.confirm": "إزالة المنشور",
+  "confirmations.revoke_quote.message": "لا يمكن التراجع عن هذا الإجراء.",
+  "confirmations.revoke_quote.title": "أتريد إزالة المنشور؟",
   "confirmations.unfollow.confirm": "إلغاء المتابعة",
-  "confirmations.unfollow.message": "متأكد من أنك تريد إلغاء متابعة {name} ؟",
-  "confirmations.unfollow.title": "إلغاء متابعة المستخدم؟",
   "content_warning.hide": "إخفاء المنشور",
   "content_warning.show": "إظهار على أي حال",
   "content_warning.show_more": "إظهار المزيد",
@@ -289,6 +293,7 @@
   "domain_pill.your_handle": "عنوانك الكامل:",
   "domain_pill.your_server": "موطِنك الرقمي، حيث توجد فيه كافة منشوراتك. ألا يعجبك المكان؟ يمكنك الانتقال بين الخوادم في أي وقت واصطحاب متابعيك أيضاً.",
   "domain_pill.your_username": "معرفك الفريد على هذا الخادم. من الممكن العثور على مستخدمين بنفس إسم المستخدم على خوادم مختلفة.",
+  "dropdown.empty": "حدد خيارا",
   "embed.instructions": "يمكنكم إدماج هذا المنشور على موقعكم الإلكتروني عن طريق نسخ الشفرة أدناه.",
   "embed.preview": "إليك ما سيبدو عليه:",
   "emoji_button.activity": "الأنشطة",
@@ -424,8 +429,6 @@
   "hints.profiles.see_more_followers": "عرض المزيد من المتابعين على {domain}",
   "hints.profiles.see_more_follows": "اطلع على المزيد من المتابعين على {domain}",
   "hints.profiles.see_more_posts": "عرض المزيد من المنشورات من {domain}",
-  "hints.threads.replies_may_be_missing": "قد تكون الردود الواردة من الخوادم الأخرى غائبة.",
-  "hints.threads.see_more": "اطلع على المزيد من الردود على {domain}",
   "home.column_settings.show_quotes": "إظهار الاقتباسات",
   "home.column_settings.show_reblogs": "اعرض المعاد نشرها",
   "home.column_settings.show_replies": "اعرض الردود",
@@ -447,20 +450,12 @@
   "ignore_notifications_modal.private_mentions_title": "تجاهل الإشعارات للرسائل التي لم تطلبها؟",
   "info_button.label": "المساعدة",
   "info_button.what_is_alt_text": "<h1> ماهو النص البديل؟</h1><p> يوفر النص البديل أوصافا للصور للأشخاص الذين يعانون من إعاقات بصرية أو اتصالات شبكة ضعيفة أو أولئك الذين يبحثون عن سياق إضافي.</p><p> يمكنك تحسين إمكانية الوصول والفهم للجميع من خلال كتابة نص بديل واضح وموجز وموضوعي. </p><ul><li> حدد العناصر المهمة</li><li>لخص النص في الصور</li><li>استخدام بنية الجمل العادية</li><li>تجنب المعلومات الزائدة</li><li> ركز على الاتجاهات والنتائج الرئيسية في العناصر المرئية المعقدة (مثل الرسوم البيانية أو الخرائط)</li></ul>",
-  "interaction_modal.action.favourite": "للمتابعة، تحتاج إلى تفضيل المنشور من حسابك.",
-  "interaction_modal.action.follow": "للمتابعة، تحتاج إلى متابعة المنشور من حسابك.",
-  "interaction_modal.action.reblog": "للمتابعة، تحتاج إلى إعادة نشر المنشور من حسابك.",
-  "interaction_modal.action.reply": "للمتابعة، تحتاج إلى الرد من حسابك.",
-  "interaction_modal.action.vote": "للمتابعة، تحتاج إلى التصويت من حسابك.",
+  "interaction_modal.action": "للتفاعل مع منشور {name}، تحتاج إلى تسجيل الدخول إلى حسابك على أي خادم ماستدون تستخدمه.",
   "interaction_modal.go": "اذهب",
   "interaction_modal.no_account_yet": "لا تملك حساباً بعد؟",
   "interaction_modal.on_another_server": "على خادم مختلف",
   "interaction_modal.on_this_server": "على هذا الخادم",
-  "interaction_modal.title.favourite": "إضافة منشور {name} إلى المفضلة",
-  "interaction_modal.title.follow": "اتبع {name}",
-  "interaction_modal.title.reblog": "إعادة نشر منشور {name}",
-  "interaction_modal.title.reply": "الرد على منشور {name}",
-  "interaction_modal.title.vote": "صوّت في استطلاع {name}",
+  "interaction_modal.title": "قم بتسجيل الدخول للمتابعة",
   "interaction_modal.username_prompt": "مثلاً {example}",
   "intervals.full.days": "{number, plural, one {# يوم} other {# أيام}}",
   "intervals.full.hours": "{number, plural, one {# ساعة} other {# ساعات}}",
@@ -489,6 +484,7 @@
   "keyboard_shortcuts.open_media": "لفتح الوسائط",
   "keyboard_shortcuts.pinned": "لفتح قائمة المنشورات المثبتة",
   "keyboard_shortcuts.profile": "لفتح الملف التعريفي للناشر",
+  "keyboard_shortcuts.quote": "اقتباس المنشور",
   "keyboard_shortcuts.reply": "للردّ",
   "keyboard_shortcuts.requests": "لفتح قائمة طلبات المتابعة",
   "keyboard_shortcuts.search": "للتركيز على البحث",
@@ -500,6 +496,8 @@
   "keyboard_shortcuts.translate": "لترجمة منشور",
   "keyboard_shortcuts.unfocus": "لإلغاء التركيز على حقل النص أو نافذة البحث",
   "keyboard_shortcuts.up": "للانتقال إلى أعلى القائمة",
+  "learn_more_link.got_it": "مفهوم",
+  "learn_more_link.learn_more": "تعلم المزيد",
   "lightbox.close": "إغلاق",
   "lightbox.next": "التالي",
   "lightbox.previous": "العودة",
@@ -600,6 +598,7 @@
   "notification.label.mention": "إشارة",
   "notification.label.private_mention": "إشارة خاصة",
   "notification.label.private_reply": "رد خاص",
+  "notification.label.quote": "اقتبس {name} منشورا لك",
   "notification.label.reply": "ردّ",
   "notification.mention": "إشارة",
   "notification.mentioned_you": "أشارَ إليك {name}",
@@ -614,6 +613,7 @@
   "notification.moderation_warning.action_suspend": "لقد تم تعليق حسابك.",
   "notification.own_poll": "انتهى استطلاعك للرأي",
   "notification.poll": "لقد انتهى استطلاع رأي صوتت فيه",
+  "notification.quoted_update": "قام {name} بتعديل منشور اقتبسته",
   "notification.reblog": "قام {name} بمشاركة منشورك",
   "notification.reblog.name_and_others_with_link": "{name} و<a>{count, plural, zero {}one {شخص آخر} two {شخصان آخرين} few {# أشخاص آخرون} many {# أشخاص آخرون} other {# أشخاص آخرون}}</a> قاموا بإعادة نشر منشورك",
   "notification.relationships_severance_event": "فقدت الاتصالات مع {name}",
@@ -657,6 +657,7 @@
   "notifications.column_settings.mention": "الإشارات:",
   "notifications.column_settings.poll": "نتائج استطلاع الرأي:",
   "notifications.column_settings.push": "الإشعارات",
+  "notifications.column_settings.quote": "الاقتباسات:",
   "notifications.column_settings.reblog": "المعاد نشرها:",
   "notifications.column_settings.show": "اعرِضها في عمود",
   "notifications.column_settings.sound": "أصدر صوتا",
@@ -732,11 +733,16 @@
   "privacy.private.short": "للمتابِعين",
   "privacy.public.long": "أي شخص على أو خارج ماستدون",
   "privacy.public.short": "للعامة",
+  "privacy.quote.anyone": "{visibility}، يمكن لأي شخص الاقتباس",
+  "privacy.quote.disabled": "{visibility}، الاقتباس معطل",
+  "privacy.quote.limited": "{visibility}، الاقتباسات محدودة",
   "privacy.unlisted.additional": "هذا يتصرف بالضبط مثل النشر للعامة، باستثناء أن المنشور لن يظهر في الموجزات الحية أو في الوسوم أو في الإستكشاف، أو في نتائج بحث ماستدون، حتى وإن قمت بتفعيله على مستوى الحساب.",
-  "privacy.unlisted.long": "خوارزميات أقل",
   "privacy.unlisted.short": "للعامة دون صخب",
   "privacy_policy.last_updated": "آخر تحديث {date}",
   "privacy_policy.title": "سياسة الخصوصية",
+  "quote_error.poll": "الاقتباس غير مسموح باستطلاعات الرأي.",
+  "quote_error.quote": "لا يسمح إلا باقتباس واحد في كل مرة.",
+  "quote_error.unauthorized": "غير مصرح لك باقتباس هذا المنشور.",
   "recommended": "موصى به",
   "refresh": "أنعِش",
   "regeneration_indicator.please_stand_by": "الرجاء الانتظار.",
@@ -752,6 +758,9 @@
   "relative_time.minutes": "{number}د",
   "relative_time.seconds": "{number}ثا",
   "relative_time.today": "اليوم",
+  "remove_quote_hint.button_label": "مفهوم",
+  "remove_quote_hint.message": "يمكنك فعل ذلك من خلال قائمة خيارات {icon}.",
+  "remove_quote_hint.title": "هل ترغب في إزالة منشورك المقتبس؟",
   "reply_indicator.attachments": "{count, plural, zero {}one {# مرفق} two {# المرفقات} few {# مرفقات} many {# مرفقات} other {# مرفقًا}}",
   "reply_indicator.cancel": "إلغاء",
   "reply_indicator.poll": "استطلاع رأي",
@@ -843,13 +852,16 @@
   "status.admin_account": "افتح الواجهة الإدارية لـ @{name}",
   "status.admin_domain": "فتح واجهة الإشراف لـ {domain}",
   "status.admin_status": "افتح هذا المنشور على واجهة الإشراف",
+  "status.all_disabled": "إعادات النشر والاقتباسات معطلة",
   "status.block": "احجب @{name}",
   "status.bookmark": "أضفه إلى الفواصل المرجعية",
   "status.cancel_reblog_private": "إلغاء إعادة النشر",
+  "status.cannot_quote": "غير مصرح لك باقتباس هذا المنشور",
   "status.cannot_reblog": "لا يمكن إعادة نشر هذا المنشور",
   "status.continued_thread": "تكملة للخيط",
   "status.copy": "انسخ رابط الرسالة",
   "status.delete": "احذف",
+  "status.delete.success": "المنشور محذوف",
   "status.detailed_status": "تفاصيل المحادثة",
   "status.direct": "إشارة خاصة لـ @{name}",
   "status.direct_indicator": "إشارة خاصة",
@@ -872,27 +884,38 @@
   "status.mute_conversation": "كتم المحادثة",
   "status.open": "وسّع هذا المنشور",
   "status.pin": "دبّسه على الصفحة التعريفية",
+  "status.quote": "اقتباس",
+  "status.quote.cancel": "إلغاء الاقتباس",
   "status.quote_error.filtered": "مُخفي بسبب إحدى إعدادات التصفية خاصتك",
-  "status.quote_error.not_found": "لا يمكن عرض هذا المنشور.",
-  "status.quote_error.pending_approval": "هذا المنشور ينتظر موافقة صاحب المنشور الأصلي.",
-  "status.quote_error.rejected": "لا يمكن عرض هذا المنشور لأن صاحب المنشور الأصلي لا يسمح له بأن يكون مقتبس.",
-  "status.quote_error.removed": "تمت إزالة المنشور من قبل صاحبه.",
-  "status.quote_error.unauthorized": "لا يمكن عرض هذا المنشور لأنك لست مخولاً برؤيته.",
-  "status.quote_post_author": "منشور من {name}",
+  "status.quote_error.limited_account_hint.action": "إظهاره على أي حال",
+  "status.quote_error.not_available": "المنشور غير متوفر",
+  "status.quote_error.pending_approval": "المنشور معلق",
+  "status.quote_error.pending_approval_popout.body": "في ماستدون، يمكنك التحكم في ما إذا كان بإمكان شخص ما أن يقتبس منك أو لا. هذا المنشور معلق في انتظار الحصول على موافقة الكاتب الأصلي.",
+  "status.quote_error.revoked": "تمت إزالة المنشور من قبل صاحبه",
+  "status.quote_followers_only": "يمكن فقط للمتابعين اقتباس هذا المنشور",
+  "status.quote_manual_review": "الكاتب سوف يراجع يدوياً",
+  "status.quote_policy_change": "تغيير من يمكنه الاقتباس",
+  "status.quote_post_author": "اقتبس @{name} منشورا",
+  "status.quote_private": "المنشورات الخاصة لا يمكن اقتباسها",
+  "status.quotes.empty": "لا أحد اقتبس هذا المنشور بعد. عندما يقوم أحدهم بذلك سوف يظهر هنا.",
   "status.read_more": "اقرأ المزيد",
   "status.reblog": "إعادة النشر",
-  "status.reblog_private": "إعادة النشر إلى الجمهور الأصلي",
+  "status.reblog_or_quote": "إعادة النشر أو اقتباس",
+  "status.reblog_private": "شارك مرة أخرى مع متابعيك",
   "status.reblogged_by": "شارَكَه {name}",
   "status.reblogs": "{count, plural, one {إعادة نشر واحدة} two {معاد نشرها مرتان} few {# إعادات نشر} many {# إعادات نشر} other {# إعادة نشر}}",
   "status.reblogs.empty": "لم يقم أي أحد بمشاركة هذا المنشور بعد. عندما يقوم أحدهم بذلك سوف يظهر هنا.",
   "status.redraft": "إزالة وإعادة الصياغة",
   "status.remove_bookmark": "احذفه مِن الفواصل المرجعية",
   "status.remove_favourite": "إزالة من التفضيلات",
+  "status.remove_quote": "إزالة",
   "status.replied_in_thread": "رد في خيط",
   "status.replied_to": "رَدًا على {name}",
   "status.reply": "ردّ",
   "status.replyAll": "رُد على الخيط",
   "status.report": "ابلِغ عن @{name}",
+  "status.request_quote": "طلب اقتباس",
+  "status.revoke_quote": "إزالة منشوري من اقتباس @{name}",
   "status.sensitive_warning": "محتوى حساس",
   "status.share": "مشاركة",
   "status.show_less_all": "طي الكل",
@@ -930,6 +953,7 @@
   "upload_button.label": "إضافة وسائط",
   "upload_error.limit": "لقد تم بلوغ الحد الأقصى المسموح به لإرسال الملفات.",
   "upload_error.poll": "لا يمكن إدراج ملفات في استطلاعات الرأي.",
+  "upload_error.quote": "تحميل الملفات غير مسموح بها مع الاقتباسات.",
   "upload_form.drag_and_drop.instructions": "لحمل مرفق، اضغط على space أو Enter. وفي أثناء السحب، استخدم مفاتيح الأسهم لتنقل المرفق في أية اتجاه. اضغط على Space أو Enter مجدداً لتنقل المرفق إلى موضعه الجديد، أو اضغط Escape للإلغاء.",
   "upload_form.drag_and_drop.on_drag_cancel": "تم إلغاء السحب. تم إسقاط مرفقات الوسائط {item}.",
   "upload_form.drag_and_drop.on_drag_end": "تم إضافة المرفق {item}.",
@@ -952,5 +976,14 @@
   "video.skip_forward": "تخطي للأمام",
   "video.unmute": "إلغاء الكتم",
   "video.volume_down": "خفض الصوت",
-  "video.volume_up": "رفع الصوت"
+  "video.volume_up": "رفع الصوت",
+  "visibility_modal.button_title": "اختر مدى الظهور",
+  "visibility_modal.header": "مدى الظهور والتفاعل",
+  "visibility_modal.helper.unlisted_quoting": "عندما يقتبس الناس منك ، فإن منشورهم سيكون أيضا مخفيا عن الخيوط الزمنية الرائجة.",
+  "visibility_modal.privacy_label": "مدى الظهور",
+  "visibility_modal.quote_followers": "للمتابِعين فقط",
+  "visibility_modal.quote_label": "من يستطيع الاقتباس",
+  "visibility_modal.quote_nobody": "أنا فقط",
+  "visibility_modal.quote_public": "أيا كان",
+  "visibility_modal.save": "حفظ"
 }
diff --git a/app/javascript/mastodon/locales/ast.json b/app/javascript/mastodon/locales/ast.json
index e039b9e6128..50b0122297d 100644
--- a/app/javascript/mastodon/locales/ast.json
+++ b/app/javascript/mastodon/locales/ast.json
@@ -155,8 +155,6 @@
   "confirmations.redraft.confirm": "Desaniciar y reeditar",
   "confirmations.redraft.title": "¿Desaniciar y reeditar la publicación?",
   "confirmations.unfollow.confirm": "Dexar de siguir",
-  "confirmations.unfollow.message": "¿De xuru que quies dexar de siguir a {name}?",
-  "confirmations.unfollow.title": "¿Dexar de siguir al usuariu?",
   "content_warning.hide": "Esconder la publicación",
   "content_warning.show": "Amosar de toes toes",
   "content_warning.show_more": "Amosar más",
@@ -266,7 +264,6 @@
   "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",
-  "hints.threads.replies_may_be_missing": "Ye posible que falten les rempuestes d'otros sirvidores.",
   "home.column_settings.show_reblogs": "Amosar los artículos compartíos",
   "home.column_settings.show_replies": "Amosar les rempuestes",
   "home.pending_critical_update.body": "¡Anueva'l sirvidor de Mastodon namás que puedas!",
@@ -276,9 +273,6 @@
   "interaction_modal.no_account_yet": "¿Tovía nun tienes una cuenta?",
   "interaction_modal.on_another_server": "N'otru sirvidor",
   "interaction_modal.on_this_server": "Nesti sirvidor",
-  "interaction_modal.title.follow": "Siguir a {name}",
-  "interaction_modal.title.reply": "Rempuesta a la publicación de: {name}",
-  "interaction_modal.title.vote": "Vota na encuesta de {name}",
   "intervals.full.days": "{number, plural, one {# día} other {# díes}}",
   "intervals.full.hours": "{number, plural, one {# hora} other {# hores}}",
   "intervals.full.minutes": "{number, plural, one {# minutu} other {# minutos}}",
diff --git a/app/javascript/mastodon/locales/az.json b/app/javascript/mastodon/locales/az.json
index 72cc1edd022..720719d84df 100644
--- a/app/javascript/mastodon/locales/az.json
+++ b/app/javascript/mastodon/locales/az.json
@@ -1,13 +1,15 @@
 {
-  "about.blocks": "Moderasiya olunan serverlər",
+  "about.blocks": "Moderasiya edilmiş serverlər",
   "about.contact": "Əlaqə:",
-  "about.disclaimer": "Mastodon pulsuz, açıq-mənbəli proqram təminatıdır və Mastodon gGmbH-nin əmtəə nişanıdır.",
-  "about.domain_blocks.no_reason_available": "Səbəb naməlumdur",
-  "about.domain_blocks.preamble": "Mastodon adətən fediversedəki hər hansısa bir serverdən olan məzmuna baxmaq və istifadəçilərlə qarşılıqlı əlaqədə olmaq imkanı verir. Bunlar bu serverdə edilmiş istisnalardır.",
+  "about.default_locale": "İlkin",
+  "about.disclaimer": "Mastodon ödənişsiz, açıq-mənbəli yazılımdır və Mastodon gGmbH-nin əmtəə nişanıdır.",
+  "about.domain_blocks.no_reason_available": "Səbəb mövcud deyil",
+  "about.domain_blocks.preamble": "Mastodon, adətən fediverse-dəki hər hansısa bir serverdən məzmuna baxmağınıza və istifadəçilərlə qarşılıqlı əlaqədə olmağınıza imkanı verir. Bunlar, bu serverdə edilmiş istisnalardır.",
   "about.domain_blocks.silenced.explanation": "Siz bu serverdəki profilləri və məzmunu xüsusi olaraq axtarmasanız və ya izləməsəniz ümumiyyətlə görməyəcəksiniz.",
   "about.domain_blocks.silenced.title": "Məhdudlaşdırılmış",
-  "about.domain_blocks.suspended.explanation": "Bu serverdən heç bir data emal edilməyəcək, saxlanılmayacaq və ya mübadilə edilməyəcək və bu serverdən olan istifadəçilərlə hər hansı qarşılıqlı əlaqə qeyri-mümkün olacaq.",
+  "about.domain_blocks.suspended.explanation": "Bu serverdəki heç bir veri emal edilməyəcək, saxlanılmayacaq və ya mübadilə edilməyəcək, bu serverdəki istifadəçilərlə hər hansısa bir qarşılıqlı əlaqə və ya ünsiyyət mümkünsüz olacaq.",
   "about.domain_blocks.suspended.title": "Qadağa qoyulub",
+  "about.language_label": "Dil",
   "about.not_available": "Bu məlumat bu serverdə əlçatan edilməyib.",
   "about.powered_by": "{mastodon} tərəfindən təchiz edilən desentralizasiya edilmiş sosial media",
   "about.rules": "Server qaydaları",
@@ -19,6 +21,7 @@
   "account.block_domain": "{domain} domenini blokla",
   "account.block_short": "Blok",
   "account.blocked": "Bloklanıb",
+  "account.blocking": "Əngəlləmə",
   "account.cancel_follow_request": "İzləməni ləğv et",
   "account.copy": "Profil linkini kopyala",
   "account.direct": "@{name} istifadəçisini fərdi olaraq etiketlə",
@@ -27,6 +30,11 @@
   "account.edit_profile": "Profili redaktə et",
   "account.enable_notifications": "@{name} paylaşım edəndə mənə bildiriş göndər",
   "account.endorse": "Profildə seçilmişlərə əlavə et",
+  "account.familiar_followers_many": "{name1}, {name2} və tanıdığınız digər {othersCount, plural, one {digər bir nəfər} other {# nəfər}} izləyir",
+  "account.familiar_followers_one": "{name1} izləyir",
+  "account.familiar_followers_two": "{name1} və {name2} izləyir",
+  "account.featured": "Seçilmiş",
+  "account.featured.accounts": "Profillər",
   "account.featured.hashtags": "Etiketler",
   "account.featured_tags.last_status_at": "Son paylaşım {date} tarixində olub",
   "account.featured_tags.last_status_never": "Paylaşım yoxdur",
@@ -35,16 +43,18 @@
   "account.followers": "İzləyicilər",
   "account.followers.empty": "Bu istifadəçini hələ ki, heç kim izləmir.",
   "account.followers_counter": "{count, plural, one {{counter} izləyici} other {{counter} izləyici}}",
+  "account.followers_you_know_counter": "bildiyiniz {counter}",
   "account.following": "İzləyir",
   "account.following_counter": "{count, plural, one {{counter} izləyir} other {{counter} izləyir}}",
   "account.follows.empty": "Bu istifadəçi hələ ki, heç kimi izləmir.",
+  "account.follows_you": "Sizi izləyir",
   "account.go_to_profile": "Profilə get",
-  "account.hide_reblogs": "@{name} istifadəçisindən olan gücləndirmələri gizlət",
+  "account.hide_reblogs": "@{name} - təkrar paylaşımlarını gizlət",
   "account.in_memoriam": "Xatirə.",
   "account.joined_short": "Qoşulub",
   "account.languages": "Abunə olunmuş dilləri dəyiş",
   "account.link_verified_on": "Bu linkin dəqiqliyi {date} tarixində yoxlanılıb",
-  "account.locked_info": "Bu hesabın məxfilik statusu kilidlənib. Hesabın sahibi onu kimin izləyə biləcəyini manual olaraq təyin edir.",
+  "account.locked_info": "Bu hesabın məxfilik statusu kilidlənib. Sahibi, onu kimin izləyə biləcəyini manual olaraq incələyir.",
   "account.media": "Media",
   "account.mention": "@{name} istifadəçisini teq et",
   "account.moved_to": "{name} onun yeni hesabının artıq bu olduğunu bildirdi:",
@@ -52,18 +62,22 @@
   "account.mute_notifications_short": "Bildirişləri səssizləşdir",
   "account.mute_short": "Səssizləşdir",
   "account.muted": "Səssizləşdirilib",
+  "account.muting": "Səssizə alınır",
+  "account.mutual": "Bir-birinizi izləyirsiniz",
   "account.no_bio": "Təsvir göstərilməyib.",
   "account.open_original_page": "Orijinal səhifəni aç",
   "account.posts": "Paylaşım",
   "account.posts_with_replies": "Paylaşım və cavablar",
+  "account.remove_from_followers": "{name} - izləyicilərdən çıxart",
   "account.report": "@{name} istifadəçisini şikayət et",
-  "account.requested": "Təsdiq edilməsi gözlənilir. İzləmə sorğusunu ləğv etmək üçün kliklə",
   "account.requested_follow": "{name} sizi izləmək sorğusu göndərib",
+  "account.requests_to_follow_you": "Sizi izləmək istəyir",
   "account.share": "@{name} profilini paylaş",
-  "account.show_reblogs": "@{name} istifadəçisindən olan gücləndirmələri göstər",
+  "account.show_reblogs": "@{name} - təkrar paylaşımlarını göstər",
   "account.statuses_counter": "{count, plural, one {{counter} paylaşım} other {{counter} paylaşım}}",
   "account.unblock": "@{name} blokunu aç",
   "account.unblock_domain": "{domain} domeninin blokunu aç",
+  "account.unblock_domain_short": "Əngəldən çıxart",
   "account.unblock_short": "Bloku aç",
   "account.unendorse": "Profildə seçilmişlərə əlavə etmə",
   "account.unfollow": "İzləmədən çıxar",
@@ -102,7 +116,7 @@
   "annual_report.summary.followers.total": "Cəmi {count}",
   "annual_report.summary.here_it_is": "{year} icmalınız:",
   "annual_report.summary.highlighted_post.by_favourites": "ən çox sevilən postu",
-  "annual_report.summary.highlighted_post.by_reblogs": "ən çox gücləndirilən paylaşımı",
+  "annual_report.summary.highlighted_post.by_reblogs": "ən çox təkrar paylaşılan göndəriş",
   "annual_report.summary.highlighted_post.by_replies": "ən çox cavabı olan paylaşımı",
   "annual_report.summary.highlighted_post.possessive": "{name} istifadəçisinin",
   "annual_report.summary.most_used_app.most_used_app": "ən çox istifadə etdiyi tətbiq",
@@ -114,7 +128,7 @@
   "annual_report.summary.thanks": "Mastodonun bir parçası olduğunuz üçün təşəkkür edirik!",
   "attachments_list.unprocessed": "(emal edilməyib)",
   "audio.hide": "Audionu gizlət",
-  "block_modal.remote_users_caveat": "Biz {domain} serverindən qərarınıza hörmət etməsini xahiş edəcəyik. Bununla belə, bəzi serverlər blokları fərqli şəkildə idarə edə bildiyi üçün uyğunluğa zəmanət verilmir. İctimai paylaşımlar hələ də daxil olmayan istifadəçilərə görünə bilər.",
+  "block_modal.remote_users_caveat": "{domain} serverindən qərarınıza hörmət etməsini xahiş edəcəyik. Ancaq, bəzi serverlər əngəlləmələri fərqli şəkildə idarə edə bilər deyə, qərarınıza uymağına zəmanət verilmir. Hər kəsə açıq göndərişlər, hələ də sistemə giriş etməmiş istifadəçilərə görünə bilər.",
   "block_modal.show_less": "Daha az göstər",
   "block_modal.show_more": "Daha çox göstər",
   "block_modal.they_cant_mention": "O səni teq edə bilməz və ya izləyə bilməz.",
@@ -123,8 +137,8 @@
   "block_modal.title": "İstifadəçi bloklansın?",
   "block_modal.you_wont_see_mentions": "Onu teq edən postları görməyəcəksən.",
   "boost_modal.combo": "Növbəti dəfə bunu atlamaq üçün {combo} klikləyə bilərsən",
-  "boost_modal.reblog": "Paylaşım gücləndirilsin?",
-  "boost_modal.undo_reblog": "Paylaşımın gücləndirilməsi ləğv edilsin?",
+  "boost_modal.reblog": "Paylaşım təkrar paylaşılsın?",
+  "boost_modal.undo_reblog": "Təkrar paylaşım ləğv edilsin?",
   "bundle_column_error.copy_stacktrace": "Xəta hesabatını kopyala",
   "bundle_column_error.error.body": "Tələb olunan səhifəni göstərmək mümkün olmadı. Bu, kodumuzdakı səhv və ya brauzer uyğunluğu problemi ilə bağlı ola bilər.",
   "bundle_column_error.error.title": "Ah, yox!",
@@ -159,14 +173,14 @@
   "column.lists": "Siyahılar",
   "column.mutes": "Səssizləşdirilmiş istifadəçilər",
   "column.notifications": "Bildirişlər",
-  "column.pins": "Bərkidilmiş paylaşımlar",
+  "column.pins": "Sancılmış göndərişlər",
   "column.public": "Federasiya zaman qrafiki",
   "column_back_button.label": "Geriyə",
-  "column_header.hide_settings": "Parametrləri gizlət",
+  "column_header.hide_settings": "Ayarları gizlət",
   "column_header.moveLeft_settings": "Sütunu sola köçür",
   "column_header.moveRight_settings": "Sütunu sağa köçür",
   "column_header.pin": "Bərkit",
-  "column_header.show_settings": "Parametrləri göstər",
+  "column_header.show_settings": "Ayarları göstər",
   "column_header.unpin": "Bərkitmə",
   "column_search.cancel": "İmtina",
   "community.column_settings.local_only": "Sadəcə lokalda",
@@ -192,7 +206,7 @@
   "compose_form.poll.type": "Stil",
   "compose_form.publish": "Paylaş",
   "compose_form.reply": "Cavabla",
-  "compose_form.save_changes": "Yenilə",
+  "compose_form.save_changes": "Güncəllə",
   "compose_form.spoiler.marked": "Məzmun xəbərdarlığını sil",
   "compose_form.spoiler.unmarked": "Məzmun xəbərdarlığı əlavə et",
   "compose_form.spoiler_placeholder": "Məzmun xəbərdarlığı (məcburi deyil)",
@@ -204,6 +218,13 @@
   "confirmations.delete_list.confirm": "Sil",
   "confirmations.delete_list.message": "Bu siyahını həmişəlik silmək istədiyinizə əminsiniz?",
   "confirmations.delete_list.title": "Siyahı silinsin?",
+  "confirmations.discard_draft.confirm": "Silib davam et",
+  "confirmations.discard_draft.edit.cancel": "Düzəliş etməyə davam",
+  "confirmations.discard_draft.edit.message": "Davam etsəniz, hazırda düzəliş etdiyiniz göndərişdəki bütün dəyişikliklər silinəcək.",
+  "confirmations.discard_draft.edit.title": "Göndərişinizə etdiyiniz bütün dəyişikliklər silinsin?",
+  "confirmations.discard_draft.post.cancel": "Qaralama kimi davam etdir",
+  "confirmations.discard_draft.post.message": "Davam etsəniz, hazırda tərtib etdiyiniz göndəriş silinəcək.",
+  "confirmations.discard_draft.post.title": "Qaralama göndərişiniz silinsin?",
   "confirmations.discard_edit_media.confirm": "Ləğv et",
   "confirmations.discard_edit_media.message": "Media təsvirində və ya önizləmədə yadda saxlanmamış dəyişiklikləriniz var, ləğv edilsin?",
   "confirmations.follow_to_list.confirm": "İzlə və siyahıya əlavə et",
@@ -213,16 +234,20 @@
   "confirmations.logout.message": "Çıxmaq istədiyinizə əminsiniz?",
   "confirmations.logout.title": "Çıxış edilsin?",
   "confirmations.missing_alt_text.confirm": "Alternativ mətn əlavə et",
-  "confirmations.missing_alt_text.message": "Paylaşımınız alternativ mətn ehtiva etmir. Təsvir əlavə etmək onun daha çox insan üçün əlçatan olmasına kömək edir.",
+  "confirmations.missing_alt_text.message": "Göndərişinizdə alternativ mətn yoxdur. Daha çox insanın məzmununuza erişməsinə kömək etmək üçün açıqlama əlavə edin.",
   "confirmations.missing_alt_text.secondary": "Yenə də paylaş",
   "confirmations.missing_alt_text.title": "Alternativ mətn əlavə edilsin?",
   "confirmations.mute.confirm": "Səssizləşdir",
   "confirmations.redraft.confirm": "Sil və qaralamaya köçür",
-  "confirmations.redraft.message": "Bu paylaşımı silmək və qaralamaya köçürmək istədiyinizə əminsiniz? Bəyənmələr və gücləndirmələr itəcək və orijinal paylaşıma olan cavablar tənha qalacaq.",
+  "confirmations.redraft.message": "Bu göndərişi silib yenidən qaralama kimi saxlamaq istədiyinizə əminsiniz? Sevimlilər və təkrar paylaşımlar silinəcək, orijinal göndərişə verilən cavablar isə əlaqəsiz qalacaq.",
   "confirmations.redraft.title": "Paylaşım silinsin & qaralamaya köçürülsün?",
+  "confirmations.remove_from_followers.confirm": "İzləyicini çıxart",
+  "confirmations.remove_from_followers.message": "{name} sizi izləməyəcək. Davam etmək istədiyinizə əminsiniz?",
+  "confirmations.remove_from_followers.title": "İzləyici çıxarılsın?",
+  "confirmations.revoke_quote.confirm": "Göndərişi sil",
+  "confirmations.revoke_quote.message": "Bu əməliyyatın geri dönüşü yoxdur.",
+  "confirmations.revoke_quote.title": "Göndəriş silinsin?",
   "confirmations.unfollow.confirm": "İzləmədən çıxar",
-  "confirmations.unfollow.message": "{name} izləmədən çıxmaq istədiyinizə əminsiniz?",
-  "confirmations.unfollow.title": "İstifadəçi izləmədən çıxarılsın?",
   "content_warning.hide": "Paylaşımı gizlət",
   "content_warning.show": "Yenə də göstər",
   "content_warning.show_more": "Daha çox göstər",
@@ -232,12 +257,12 @@
   "conversation.with": "{names} ilə",
   "copy_icon_button.copied": "Mübadilə buferinə köçürüldü",
   "copypaste.copied": "Kopyalandı",
-  "copypaste.copy_to_clipboard": "Kopyala",
+  "copypaste.copy_to_clipboard": "Lövhəyə kopyala",
   "directory.federated": "Bilinən fediversedən",
   "directory.local": "Sadəcə {domain}",
   "directory.new_arrivals": "Yeni gələnlər",
   "directory.recently_active": "Bayaq aktiv olanlar",
-  "disabled_account_banner.account_settings": "Hesab parametrləri",
+  "disabled_account_banner.account_settings": "Hesab ayarları",
   "disabled_account_banner.text": "Sizin hesabınız {disabledAccount} hal-hazırda deaktiv edilib.",
   "dismissable_banner.community_timeline": "Bunlar, hesabları {domain} serverində yerləşən insanların ən son ictimai paylaşımlarıdır.",
   "dismissable_banner.dismiss": "Bağla",
@@ -264,6 +289,7 @@
   "domain_pill.your_handle": "Tanıdıcınız:",
   "domain_pill.your_server": "Bütün paylaşımlarınızın yaşadığı rəqəmsal ev. Buranı bəyənmirsiniz? İstədiyiniz vaxt serverdən köçün və izləyicilərinizi də aparın.",
   "domain_pill.your_username": "Serverdəki unikal identifikatoruz. Fərqli serverlərdə eyni istifadəçi adı ilə istifadəçilər tapmaq mümkündür.",
+  "dropdown.empty": "Bir seçim et",
   "embed.instructions": "Aşağıdakı kodu kopyalayaraq bu postu veb-saytınıza yerləşdirin.",
   "embed.preview": "Belə görünəcək:",
   "emoji_button.activity": "Aktivlik",
@@ -273,7 +299,7 @@
   "emoji_button.food": "Yemək və içki",
   "emoji_button.label": "Emoji daxil et",
   "emoji_button.nature": "Təbiət",
-  "emoji_button.not_found": "Uyğun emoji tapılmadı",
+  "emoji_button.not_found": "Uyuşan emoji tapılmadı",
   "emoji_button.objects": "Obyektlər",
   "emoji_button.people": "İnsanlar",
   "emoji_button.recent": "Tez-tez istifadə edilən",
@@ -296,6 +322,614 @@
   "empty_column.follow_requests": "İzləmə sorğularınız yoxdur. Qəbul etdikdə burada görəcəksiniz.",
   "empty_column.followed_tags": "Heç bir heşteq izləmirsiniz. İzlədikdə burada görünəcək.",
   "empty_column.hashtag": "Bu heşteqdə hələ ki, heç nə yoxdur.",
+  "empty_column.home": "Əsas zaman xəttiniz boşdur! Doldurmaq üçün bir neçə istifadəçini izləyin.",
+  "empty_column.list": "Hələ bu siyahıda heç nə yoxdur. Bu siyahıdakı üzvlər yeni göndəriş paylaşdığı zaman burada görünəcək.",
+  "empty_column.mutes": "Hələ heç bir istifadəçini səssizə almamısınız.",
+  "empty_column.notification_requests": "Hamısı hazırdır! Burada heç nə yoxdur. Yeni bildiriş aldığınız zaman, ayarlarınıza görə burada görünəcək.",
+  "empty_column.notifications": "Hələ heç bir bildirişiniz yoxdur. Başqaları sizinlə qarşılıqlı əlaqə qurduğu zaman, onu burada görəcəksiniz.",
+  "empty_column.public": "Burada hələ heç nə yoxdur! Buranı doldurmaq üçün hər kəsə açıq bir şey yazın və ya digər serverlərdəki istifadəçiləri izləyin.",
+  "error.unexpected_crash.explanation": "Kodumuzdakı bir xətaya, ya da brauzer uyumluluq probleminə görə, bu səhifə düzgün nümayiş etdirilə bilmədi.",
+  "error.unexpected_crash.explanation_addons": "Bu səhifə düzgün nümayiş etdirilə bilmədi. Bu xəta, yəqin ki, brauzer əlavəsi və ya avtomatik tərcümə alətlərindən qaynaqlanır.",
+  "error.unexpected_crash.next_steps": "Səhifəni təzələməyi sınayın. Bu kömək etməzsə, Mastodon-u başqa bir brauzer və ya yerli tətbiq vasitəsilə istifadə edə bilərsiniz.",
+  "error.unexpected_crash.next_steps_addons": "Onları sıradan çıxartmağı və səhifəni təzələməyi sınayın. Bu kömək etməzsə, Mastodon-u başqa bir brauzer və ya yerli tətbiq vasitəsilə istifadə edə bilərsiniz.",
+  "errors.unexpected_crash.report_issue": "Problemi bildir",
+  "explore.suggested_follows": "İnsanlar",
+  "explore.title": "Trendlər",
+  "explore.trending_links": "Xəbərlər",
+  "explore.trending_statuses": "Göndərişlər",
+  "explore.trending_tags": "Mövzu etiketləri",
+  "featured_carousel.header": "{count, plural, one {Sancılmış göndəriş} other {Sancılmış göndərişlər}}",
+  "featured_carousel.next": "Növbəti",
+  "featured_carousel.post": "Göndəriş",
+  "featured_carousel.previous": "Əvvəlki",
+  "featured_carousel.slide": "{index}/{total}",
+  "filter_modal.added.context_mismatch_explanation": "Bu filtr kateqoriyası, bu göndərişdə erişdiyiniz kontekstə aid deyil. Əgər göndərişin bu kontekstdə də filtrlənməsini istəyirsinizsə, filtrə düzəliş etməyiniz lazımdır.",
+  "filter_modal.added.context_mismatch_title": "Kontekst uyuşmur!",
+  "filter_modal.added.expired_explanation": "Bu filtr kateqoriyasının vaxtı bitib, filtri tətbiq etmək üçün bitmə tarixini dəyişdirməlisiniz.",
+  "filter_modal.added.expired_title": "Vaxtı bitmiş filtr!",
+  "filter_modal.added.review_and_configure": "Bu filt kateqoriyasını incələmək və daha detallı konfiqurasiya etmək üçün {settings_link} ünvanına gedin.",
+  "filter_modal.added.review_and_configure_title": "Filtr ayarları",
+  "filter_modal.added.settings_link": "ayarlar səhifəsi",
+  "filter_modal.added.short_explanation": "Bu göndəriş, aşağıdakı filtr kateqoriyasına əlavə edilib: {title}.",
+  "filter_modal.added.title": "Filtr əlavə edilib!",
+  "filter_modal.select_filter.context_mismatch": "bu kontektsə tətbiq olunmur",
+  "filter_modal.select_filter.expired": "müddəti bitib",
+  "filter_modal.select_filter.prompt_new": "Yeni kateqoriya: {name}",
+  "filter_modal.select_filter.search": "Axtar və ya yarat",
+  "filter_modal.select_filter.subtitle": "Mövcud bir kateqoriyanı istifadə et, ya da yenisini yarat",
+  "filter_modal.select_filter.title": "Bu göndərişi filtrlə",
+  "filter_modal.title.status": "Bir göndərişi filtrlə",
+  "filter_warning.matches_filter": "“<span>{title}</span>” filtri ilə uyuşur",
+  "filtered_notifications_banner.pending_requests": "Tanıdığınız {count, plural, =0 {heç kimdən} one {bir şəxsdən} other {# şəxsdən}}",
+  "filtered_notifications_banner.title": "Filtrlənmiş bildirişlər",
+  "firehose.all": "Hamısı",
+  "firehose.local": "Bu server",
+  "firehose.remote": "Digər serverlər",
+  "follow_request.authorize": "Səlahiyyət ver",
+  "follow_request.reject": "Rədd et",
+  "follow_requests.unlocked_explanation": "Hesabınız kilidli olmasa da, {domain} heyəti bu hesabların izləmə tələblərini manual olaraq incələmək istəyə biləcəyinizi düşündü.",
+  "follow_suggestions.curated_suggestion": "Heyətin seçimi",
+  "follow_suggestions.dismiss": "Təkrar göstərmə",
+  "follow_suggestions.featured_longer": "{domain} komandası tərəfindən əllə seçildi",
+  "follow_suggestions.friends_of_friends_longer": "İzlədiyiniz insanlar arasında məşhur",
+  "follow_suggestions.hints.featured": "Bu profil {domain} komandası tərəfindən əllə seçilib.",
   "follow_suggestions.hints.friends_of_friends": "Bu profil izlədiyiniz insanlar arasında populyardır.",
-  "follow_suggestions.hints.most_followed": "Bu profil {domain} serverində ən çox izlənilənlərdən biridir."
+  "follow_suggestions.hints.most_followed": "Bu profil {domain} serverində ən çox izlənilənlərdən biridir.",
+  "follow_suggestions.hints.most_interactions": "Bu profil son zamanlar {domain} üzərində çox diqqət çəkir.",
+  "follow_suggestions.hints.similar_to_recently_followed": "Bu profil, son vaxtlar izlədiyiniz profillərə bənzəyir.",
+  "follow_suggestions.personalized_suggestion": "Fərdiləşdirilmiş təklif",
+  "follow_suggestions.popular_suggestion": "Məşhur təklif",
+  "follow_suggestions.popular_suggestion_longer": "{domain} üzərində məşhur",
+  "follow_suggestions.similar_to_recently_followed_longer": "Son zaman izlədiyiniz profillərə oxşar",
+  "follow_suggestions.view_all": "Hamısına bax",
+  "follow_suggestions.who_to_follow": "İzləyə bilərsən",
+  "followed_tags": "İzlənilən mövzu etiketləri",
+  "footer.about": "Haqqında",
+  "footer.directory": "Profil kataloqu",
+  "footer.get_app": "Tətbiqi əldə et",
+  "footer.keyboard_shortcuts": "Klaviatura qısayolları",
+  "footer.privacy_policy": "Gizlilik siyasəti",
+  "footer.source_code": "Mənbə koduna bax",
+  "footer.status": "Status",
+  "footer.terms_of_service": "Xidmət şərtləri",
+  "generic.saved": "Saxlanıldı",
+  "getting_started.heading": "Başlayaq",
+  "hashtag.admin_moderation": "#{name} üçün moderasiya interfeysini aç",
+  "hashtag.browse": "#{hashtag} göndərişlərinə bax",
+  "hashtag.browse_from_account": "@{name} - #{hashtag} göndərişlərinə bax",
+  "hashtag.column_header.tag_mode.all": "və {additional}",
+  "hashtag.column_header.tag_mode.any": "və ya {additional}",
+  "hashtag.column_header.tag_mode.none": "{additional} olmadan",
+  "hashtag.column_settings.select.no_options_message": "Heç bir təklif tapılmadı",
+  "hashtag.column_settings.select.placeholder": "Mövzu etiketlərini daxil edin…",
+  "hashtag.column_settings.tag_mode.all": "Bunların hamısı",
+  "hashtag.column_settings.tag_mode.any": "Bunlardan hər hansısa biri",
+  "hashtag.column_settings.tag_mode.none": "Bunların heç biri",
+  "hashtag.column_settings.tag_toggle": "Bu sütun üçün əlavə etiketləri daxil et",
+  "hashtag.counter_by_accounts": "{count, plural, one {{counter} iştirakçı} other {{counter} iştirakçı}}",
+  "hashtag.counter_by_uses": "{count, plural, one {{counter} göndəriş} other {{counter} göndəriş}}",
+  "hashtag.counter_by_uses_today": "Bu gün {count, plural, one {{counter} göndəriş} other {{counter} göndəriş}}",
+  "hashtag.feature": "Profildə önə çıxart",
+  "hashtag.follow": "Mövzu etiketini izlə",
+  "hashtag.mute": "#{hashtag} - səssizə al",
+  "hashtag.unfeature": "Profildə önə çıxarılmasın",
+  "hashtag.unfollow": "Mövzu etiketini izləmə",
+  "hashtags.and_other": "…və daha {count, plural, one {}other {# ədəd}}",
+  "hints.profiles.followers_may_be_missing": "Bu profilin izləyiciləri əskik ola bilər.",
+  "hints.profiles.follows_may_be_missing": "Bu profilin izləyənləri əskik ola bilər.",
+  "hints.profiles.posts_may_be_missing": "Bu profilin bəzi göndərişləri əskik ola bilər.",
+  "hints.profiles.see_more_followers": "{domain} üzərində daha çox izləyici gör",
+  "hints.profiles.see_more_follows": "{domain} üzərində izlənilən gör",
+  "hints.profiles.see_more_posts": "{domain} üzərində daha çox göndəriş gör",
+  "home.column_settings.show_quotes": "Sitatları göstər",
+  "home.column_settings.show_reblogs": "Təkrar paylaşmaları göstər",
+  "home.column_settings.show_replies": "Cavabları göstər",
+  "home.hide_announcements": "Elanları gizlət",
+  "home.pending_critical_update.body": "Lütfən Mastodon serverinizi mümkün olan ən qısa müddətdə güncəlləyin!",
+  "home.pending_critical_update.link": "Güncəlləmələrə bax",
+  "home.pending_critical_update.title": "Kritik güvənlik güncəlləməsi mövcuddur!",
+  "home.show_announcements": "Elanları göstər",
+  "ignore_notifications_modal.disclaimer": "Mastodon, bildirişlərini yox saydığınız istifadəçiləri məlumatlandırmır. Bildirişləri yox saymaq, mesajların göndərilməsini dayandırmayacaq.",
+  "ignore_notifications_modal.filter_instead": "Əvəzinə filtrlə",
+  "ignore_notifications_modal.filter_to_act_users": "Hələ də istifadəçiləri qəbul edə, rədd edə və ya bildirə bilərsiniz",
+  "ignore_notifications_modal.filter_to_avoid_confusion": "Filtrləmə, mümkün çaşqınlığın qarşısını almağa kömək edir.",
+  "ignore_notifications_modal.filter_to_review_separately": "Filtrlənmiş bildirişləri ayrı-ayrı incələyə bilərsiniz",
+  "ignore_notifications_modal.ignore": "Bildirişləri yox say",
+  "ignore_notifications_modal.limited_accounts_title": "Moderasiya edilmiş hesabların bildirişləri yox sayılsın?",
+  "ignore_notifications_modal.new_accounts_title": "Yeni hesabların bildirişləri yox sayılsın?",
+  "ignore_notifications_modal.not_followers_title": "Sizi izləməyən şəxslərin bildirişləri yox sayılsın?",
+  "ignore_notifications_modal.not_following_title": "İzləmədiyiniz şəxslərin bildirişləri yox sayılsın?",
+  "ignore_notifications_modal.private_mentions_title": "İstənilməyən Şəxsi Adçəkmələrdən gələn bildirişlər yox sayılsın?",
+  "info_button.label": "Kömək",
+  "interaction_modal.go": "Get",
+  "interaction_modal.no_account_yet": "Hələ heç bir hesabınız yoxdur?",
+  "interaction_modal.on_another_server": "Fərqli bir serverdə",
+  "interaction_modal.on_this_server": "Bu serverdə",
+  "interaction_modal.username_prompt": "Məs: {example}",
+  "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 {# dəqiqə} other {# dəqiqə}}",
+  "keyboard_shortcuts.back": "Geri get",
+  "keyboard_shortcuts.blocked": "Əngəllənən istifadəçilərin siyahısını aç",
+  "keyboard_shortcuts.boost": "Göndərişi təkrar paylaş",
+  "keyboard_shortcuts.column": "Sütuna fokuslan",
+  "keyboard_shortcuts.compose": "Mətn yazma sahəsinə fokuslan",
+  "keyboard_shortcuts.description": "Açıqlama",
+  "keyboard_shortcuts.direct": "şəxsi adçəkmələr sütununu açmaq üçün",
+  "keyboard_shortcuts.down": "Siyahıda aşağı daşı",
+  "keyboard_shortcuts.enter": "Göndərişi aç",
+  "keyboard_shortcuts.favourite": "Göndərişi sevimlilərə əlavə et",
+  "keyboard_shortcuts.favourites": "Sevimli siyahını aç",
+  "keyboard_shortcuts.heading": "Klaviatura qısayolları",
+  "keyboard_shortcuts.home": "Əsas ekran zaman xəttini aç",
+  "keyboard_shortcuts.hotkey": "Qısayol düyməsi",
+  "keyboard_shortcuts.legend": "Bu əfsanəni nümayiş etdir",
+  "keyboard_shortcuts.local": "Lokal zaman xəttini aç",
+  "keyboard_shortcuts.mention": "Müəllifin adını çək",
+  "keyboard_shortcuts.muted": "Səssizdəki istifadəçilərin siyahısını aç",
+  "keyboard_shortcuts.my_profile": "Profilinizi açın",
+  "keyboard_shortcuts.notifications": "Bildirişlər sütununu aç",
+  "keyboard_shortcuts.open_media": "Medianı aç",
+  "keyboard_shortcuts.pinned": "Sancılmış göndərişlərin siyahısını aç",
+  "keyboard_shortcuts.profile": "Müəllifin profilini aç",
+  "keyboard_shortcuts.reply": "Göndərişə cavab ver",
+  "keyboard_shortcuts.requests": "İzləmə istəyi siyahısını aç",
+  "keyboard_shortcuts.search": "Axtarış çubuğuna fokuslan",
+  "keyboard_shortcuts.spoilers": "CW xanasını göstər/gizlət",
+  "keyboard_shortcuts.start": "\"Başlayaq\" sütununu aç",
+  "keyboard_shortcuts.toggle_hidden": "CW arxasındakı mətni göstər/gizlət",
+  "keyboard_shortcuts.toggle_sensitivity": "Medianı göstər/gizlət",
+  "keyboard_shortcuts.toot": "Yeni bir göndəriş başlat",
+  "keyboard_shortcuts.translate": "bir göndərişi tərcümə etmək üçün",
+  "keyboard_shortcuts.unfocus": "Fokusu göndəriş yazma xanasından/axtarışdan götür",
+  "keyboard_shortcuts.up": "Siyahıda yuxarı daşı",
+  "learn_more_link.got_it": "Anladım",
+  "learn_more_link.learn_more": "Daha ətraflı",
+  "lightbox.close": "Bağla",
+  "lightbox.next": "Növbəti",
+  "lightbox.previous": "Əvvəlki",
+  "lightbox.zoom_in": "Həqiqi ölçüyə qayıt",
+  "lightbox.zoom_out": "Sığacaq şəkildə yaxınlaşdır",
+  "limited_account_hint.action": "Yenə də profili göstər",
+  "limited_account_hint.title": "Bu profil, {domain} moderatorları tərəfindən gizlədildi.",
+  "link_preview.author": "Müəllif: {name}",
+  "link_preview.more_from_author": "{name} - daha çox",
+  "link_preview.shares": "{count, plural, one {{counter} göndəriş} other {{counter} göndəriş}}",
+  "lists.add_member": "Əlavə et",
+  "lists.add_to_list": "Siyahıya əlavə et",
+  "lists.add_to_lists": "{name} - siyahılara əlavə et",
+  "lists.create": "Yarat",
+  "lists.create_a_list_to_organize": "Əsas ekran lentinizi təşkil etmək üçün yeni bir siyahı yaradın",
+  "lists.create_list": "Siyahı yarat",
+  "lists.delete": "Siyahını sil",
+  "lists.done": "Hazırdır",
+  "lists.edit": "Siyahıya düzəliş et",
+  "lists.exclusive": "Əsas ekranda üzvləri gizlət",
+  "lists.exclusive_hint": "Kimsə bu siyahıdadırsa, onun göndərişləri bir dəfədən çox görünməməsi üçün Əsas ekran lentində gizlədilir.",
+  "lists.find_users_to_add": "Əlavə ediləcək istifadəçiləri tap",
+  "lists.list_members_count": "{count, plural, one {# üzv} other {# üzv}}",
+  "lists.list_name": "Siyahı adı",
+  "lists.new_list_name": "Yeni siyahı adı",
+  "lists.no_lists_yet": "Hələ siyahı yoxdur.",
+  "lists.no_members_yet": "Hələ üzv yoxdur.",
+  "lists.no_results_found": "Heç bir nəticə tapılmadı.",
+  "lists.remove_member": "Çıxart",
+  "lists.replies_policy.followed": "İstənilən izlənilən istifadəçi",
+  "lists.replies_policy.list": "Siyahıdakı üzvlər",
+  "lists.replies_policy.none": "Heç kim",
+  "lists.save": "Saxla",
+  "lists.search": "Axtar",
+  "lists.show_replies_to": "Siyahı üzvlərinin cavablarını daxil et",
+  "load_pending": "{count, plural, one {# yeni element} other {# yeni element}}",
+  "loading_indicator.label": "Yüklənir…",
+  "media_gallery.hide": "Gizlət",
+  "moved_to_account_banner.text": "{disabledAccount} hesabınız, {movedToAccount} hesabına keçdiyiniz üçün hazırda sıradan çıxarılıb.",
+  "mute_modal.hide_from_notifications": "Bildirişlərdə gizlət",
+  "mute_modal.hide_options": "Seçimləri gizlət",
+  "mute_modal.indefinite": "Mən səsini açana qədər",
+  "mute_modal.show_options": "Seçimləri göstər",
+  "mute_modal.they_can_mention_and_follow": "Sizin adınızı çəkə və sizi izləyə bilər, ancaq siz onları görə bilməzsiniz.",
+  "mute_modal.they_wont_know": "Onlar, səssizə alındıqlarını bilməyəcəklər.",
+  "mute_modal.title": "İstifadəçi səssizə alınsın?",
+  "mute_modal.you_wont_see_mentions": "Onların adı çəkilən göndərişləri görməyəcəksiniz.",
+  "mute_modal.you_wont_see_posts": "Onlar hələ də göndərişlərinizi görə biləcək, ancaq onların göndərişlərini görməyəcəksiniz.",
+  "navigation_bar.about": "Haqqında",
+  "navigation_bar.account_settings": "Parol və təhlükəsizlik",
+  "navigation_bar.administration": "Administrasiya",
+  "navigation_bar.advanced_interface": "Qabaqcıl veb interfeysində aç",
+  "navigation_bar.automated_deletion": "Göndərişin avtomatik silinməsi",
+  "navigation_bar.blocks": "Əngəllənmiş istifadəçilər",
+  "navigation_bar.bookmarks": "Əlfəcinlər",
+  "navigation_bar.direct": "Şəxsi adçəkmələr",
+  "navigation_bar.domain_blocks": "Əngəllənmiş domenlər",
+  "navigation_bar.favourites": "Sevimlilər",
+  "navigation_bar.filters": "Səssizə alınmış sözlər",
+  "navigation_bar.follow_requests": "İzləmə istəkləri",
+  "navigation_bar.followed_tags": "İzlənilən mövzu etiketləri",
+  "navigation_bar.follows_and_followers": "İzlənilənlər və izləyicilər",
+  "navigation_bar.import_export": "Daxilə və xaricə köçürmə",
+  "navigation_bar.lists": "Siyahılar",
+  "navigation_bar.live_feed_local": "Canlı lent (lokal)",
+  "navigation_bar.live_feed_public": "Canlı lent (hər kəsə açıq)",
+  "navigation_bar.logout": "Çıxış",
+  "navigation_bar.moderation": "Moderasiya",
+  "navigation_bar.more": "Daha çox",
+  "navigation_bar.mutes": "Səssizə alınmış istifadəçilər",
+  "navigation_bar.opened_in_classic_interface": "Göndərişlər, hesablar və digər müəyyən səhifələr klassik veb interfeysində ilkin olaraq açılır.",
+  "navigation_bar.preferences": "Tərcihlər",
+  "navigation_bar.privacy_and_reach": "Gizlilik və əlçatanlıq",
+  "navigation_bar.search": "Axtar",
+  "navigation_bar.search_trends": "Axtar / Trendlər",
+  "navigation_panel.collapse_followed_tags": "İzlənilən mövzu etiketləri menyusunu yığcamlaşdır",
+  "navigation_panel.collapse_lists": "Siyahı menyusunu yığcamlaşdır",
+  "navigation_panel.expand_followed_tags": "İzlənilən mövzu etiketləri menyusunu genişləndir",
+  "navigation_panel.expand_lists": "Siyahı menyusunu genişləndir",
+  "not_signed_in_indicator.not_signed_in": "Bu resursa erişmək üçün giriş etməlisiniz.",
+  "notification.admin.report": "{name} şikayət etdi: {target}",
+  "notification.admin.report_account": "{name}, {category} üçün şikayət etdi: {target} - {count, plural, one {bir göndəriş} other {# göndəriş}}",
+  "notification.admin.report_account_other": "{name} şikayət etdi: {target} - {count, plural, one {bir göndəriş} other {# göndəriş}}",
+  "notification.admin.report_statuses": "{name}, {category} üçün şikayət etdi: {target}",
+  "notification.admin.report_statuses_other": "{name} şikayət etdi: {target}",
+  "notification.admin.sign_up": "{name} qeydiyyatdan keçib",
+  "notification.admin.sign_up.name_and_others": "{name} və digər {count, plural, one {# nəfər} other {# nəfər}} qeydiyyatdan keçib",
+  "notification.annual_report.view": "#Wrapstodon-a bax",
+  "notification.favourite": "{name} göndərişinizi sevimlilərinə əlavə etdi",
+  "notification.favourite.name_and_others_with_link": "{name} və digər <a>{count, plural, one {# nəfər} other {# nəfər}}</a> göndərişinizi sevimlilərinə əlavə etdi",
+  "notification.favourite_pm": "{name}, şəxsi adçəkmənizi sevimlilərinə əlavə etdi",
+  "notification.favourite_pm.name_and_others_with_link": "{name} və digər <a>{count, plural, one {# nəfər} other {# nəfər}}</a> şəxsi adçəkmənizi sevimlilərinə əlavə etdi",
+  "notification.follow": "{name} sizi izləyir",
+  "notification.follow.name_and_others": "{name} və digər <a>{count, plural, one {# nəfər} other {# nəfər}}</a> sizi izləyir",
+  "notification.follow_request": "{name} sizi izləmək üçün istək göndərdi",
+  "notification.follow_request.name_and_others": "{name} və digər {count, plural, one {# nəfər} other {# nəfər}} sizi izləmək üçün istək göndərdi",
+  "notification.label.mention": "Adçəkmə",
+  "notification.label.private_mention": "Şəxsi adçəkmə",
+  "notification.label.private_reply": "Şəxsi cavab",
+  "notification.label.quote": "{name} göndərişinizi sitat gətirdi",
+  "notification.label.reply": "Cavab",
+  "notification.mention": "Adçəkmə",
+  "notification.mentioned_you": "{name} adınızı çəkdi",
+  "notification.moderation-warning.learn_more": "Daha ətraflı",
+  "notification.moderation_warning": "Bir moderasiya xəbərdarlığı aldınız",
+  "notification.moderation_warning.action_delete_statuses": "Bəzi göndərişləriniz silindi.",
+  "notification.moderation_warning.action_disable": "Hesabınız sıradan çıxarılıb.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Bəzi göndərişləriniz həssas olaraq işarələnib.",
+  "notification.moderation_warning.action_none": "Hesabınız bir moderasiya xəbərdarlığı aldı.",
+  "notification.moderation_warning.action_sensitive": "Göndərişləriniz artıq həssas olaraq işarələnəcək.",
+  "notification.moderation_warning.action_silence": "Hesabınız məhdudlaşdırılıb.",
+  "notification.moderation_warning.action_suspend": "Hesabınızın fəaliyyəti dayandırılıb.",
+  "notification.own_poll": "Anketiniz bitdi",
+  "notification.poll": "Səs verdiyiniz anket bitdi",
+  "notification.reblog": "{name} göndərişinizi təkrar paylaşdı",
+  "notification.reblog.name_and_others_with_link": "{name} və <a>{count, plural, one {digər # nəfər} other {digər # nəfər}}</a> göndərişinizi təkrar paylaşdı",
+  "notification.relationships_severance_event": "{name} ilə bağlantı qopdu",
+  "notification.relationships_severance_event.account_suspension": "{from} admini {target} fəaliyyətini dayandırıb, bu da o deməkdir ki, artıq onlardan güncəlləmələr ala və ya onlarla qarşılıqlı əlaqə qura bilməyəcəyiniz.",
+  "notification.relationships_severance_event.domain_block": "{target}, {from} admini tərəfindən əngəllənib, buna {followersCount} izləyiciniz və izlədiyiniz {followingCount, plural, one {# hesab} other {# hesab}} daxildir.",
+  "notification.relationships_severance_event.learn_more": "Daha ətraflı",
+  "notification.relationships_severance_event.user_domain_block": "{target} əngəlləmisiniz, bununla {followersCount} izləyiciniz və izlədiyiniz {followingCount, plural, one {# hesab} other {# hesab}} silinib.",
+  "notification.status": "{name} indicə paylaşdı",
+  "notification.update": "{name} bir göndərişə düzəliş etdi",
+  "notification_requests.accept": "Qəbul et",
+  "notification_requests.accept_multiple": "{count, plural, one {# istəyi qəbul et…} other {# istəyi qəbul et…}}",
+  "notification_requests.confirm_accept_multiple.button": "{count, plural, one {İstəyi qəbul et} other {İstəkləri qəbul et}}",
+  "notification_requests.confirm_accept_multiple.message": "{count, plural, one {Bir bildiriş istəyini} other {# bildiriş istəklərini}} qəbul etmək üzrəsiniz. Davam etmək istədiyinizə əminsiniz?",
+  "notification_requests.confirm_accept_multiple.title": "Bildiriş istəkləri qəbul edilsin?",
+  "notification_requests.confirm_dismiss_multiple.button": "{count, plural, one {İstəyi rədd et} other {İstəkləri rədd et}}",
+  "notification_requests.confirm_dismiss_multiple.message": "{count, plural, one {bir bildiriş sorğusunu} other {# bildiriş sorğusunu}} bağlamaq üzrəsiniz. {count, plural, one {Ona} other {Onlara}} yenidən asanlıqla erişə bilməyəcəksiniz. Davam etmək istədiyinizə əminsiniz?",
+  "notification_requests.confirm_dismiss_multiple.title": "Bildiriş istəklərinə rədd cavabı verilsin?",
+  "notification_requests.dismiss": "Rədd et",
+  "notification_requests.dismiss_multiple": "{count, plural, one {# istəyi rədd et…} other {# istəyi rədd et…}}",
+  "notification_requests.edit_selection": "Düzəliş et",
+  "notification_requests.exit_selection": "Hazırdır",
+  "notification_requests.explainer_for_limited_account": "Hesab, bir moderator tərəfindən məhdudlaşdırıldığı üçün bu hesabın bildirişləri filtrləndi.",
+  "notification_requests.explainer_for_limited_remote_account": "Hesab və ya onun serveri, bir moderator tərəfindən məhdudlaşdırıldığı üçün bu hesabın bildirişləri filtrləndi.",
+  "notification_requests.maximize": "Böyüt",
+  "notification_requests.minimize_banner": "Filtrlənmiş bildirişlər bannerini kiçilt",
+  "notification_requests.notifications_from": "{name} - bildirişləri",
+  "notification_requests.title": "Filtrlənmiş bildirişlər",
+  "notification_requests.view": "Bildirişlərə bax",
+  "notifications.clear": "Bildirişləri təmizlə",
+  "notifications.clear_confirmation": "Bütün bildirişlərinizi həmişəlik təmizləmək istədiyinizə əminsiniz?",
+  "notifications.clear_title": "Bildirişlər təmizlənsin?",
+  "notifications.column_settings.admin.report": "Yeni hesabatlar:",
+  "notifications.column_settings.admin.sign_up": "Yeni qeydiyyatlar:",
+  "notifications.column_settings.alert": "Masaüstü bildirişlər",
+  "notifications.column_settings.favourite": "Sevimlilər:",
+  "notifications.column_settings.filter_bar.advanced": "Bütün kateqoriyaları nümayiş etdir",
+  "notifications.column_settings.filter_bar.category": "Cəld filtr çubuğu",
+  "notifications.column_settings.follow": "Yeni izləyicilər:",
+  "notifications.column_settings.follow_request": "Yeni izləmə istəkləri:",
+  "notifications.column_settings.group": "Qrup",
+  "notifications.column_settings.mention": "Adçəkmələr:",
+  "notifications.column_settings.poll": "Anket nəticələri:",
+  "notifications.column_settings.push": "Ani bildirişlər",
+  "notifications.column_settings.quote": "Sitatlar:",
+  "notifications.column_settings.reblog": "Təkrar paylaşmalar:",
+  "notifications.column_settings.show": "Sütunda göstər",
+  "notifications.column_settings.sound": "Səs oxut",
+  "notifications.column_settings.status": "Yeni göndərişlər:",
+  "notifications.column_settings.unread_notifications.category": "Oxunmamış bildirişlər",
+  "notifications.column_settings.unread_notifications.highlight": "Oxunmamış bildirişləri vurğula",
+  "notifications.column_settings.update": "Düzəlişlər:",
+  "notifications.filter.all": "Hamısı",
+  "notifications.filter.boosts": "Təkrar paylaşmalar",
+  "notifications.filter.favourites": "Sevimlilər",
+  "notifications.filter.follows": "İzlənilənlər",
+  "notifications.filter.mentions": "Adçəkmələr",
+  "notifications.filter.polls": "Anket nəticələri",
+  "notifications.filter.statuses": "İzlədiyiniz şəxslərdən güncəlləmələr",
+  "notifications.grant_permission": "İcazəni ver.",
+  "notifications.group": "{count} bildiriş",
+  "notifications.mark_as_read": "Hər bir bildiriş oxunmuş olaraq işarələ",
+  "notifications.permission_denied": "Brauzer icazələri istəyinə daha əvvəl rədd cavabı verildiyi üçün masaüstü bildirişləri əlçatmazdır",
+  "notifications.permission_denied_alert": "Brauzer icazəsinə daha əvvəl rədd cavabı verildiyi üçün masaüstü bildirişləri fəallaşdırıla bilmir",
+  "notifications.permission_required": "Tələb olunan icazə verilmədiyi üçün masaüstü bildirişləri əlçatmazdır.",
+  "notifications.policy.accept": "Qəbul et",
+  "notifications.policy.accept_hint": "Bildirişlərdə göstər",
+  "notifications.policy.drop": "Yox say",
+  "notifications.policy.filter": "Filtr",
+  "notifications.policy.filter_hint": "Filtrlənmiş bildirişlər gələn qutusuna göndər",
+  "notifications.policy.filter_limited_accounts_hint": "Server moderatorları tərəfindən məhdudlaşdırılıb",
+  "notifications.policy.filter_limited_accounts_title": "Moderasiya edilmiş hesablar",
+  "notifications.policy.filter_new_accounts.hint": "Son {days, plural, one {bir gündə} other {# gündə}} yaradıldı",
+  "notifications.policy.filter_new_accounts_title": "Yeni hesablar",
+  "notifications.policy.filter_not_followers_hint": "Sizi {days, plural, one {bir gündən} other {# gündən}} az müddətdir izləyən insanlar daxildir",
+  "notifications.policy.filter_not_followers_title": "Sizi izləməyən insanlar",
+  "notifications.policy.filter_not_following_hint": "Onları manual qəbul edənə qədər",
+  "notifications.policy.filter_not_following_title": "İzləmədiyiniz insanlar",
+  "notifications.policy.title": "Bildirişləri idarə et…",
+  "notifications_permission_banner.enable": "Masaüstü bildirişləri fəallaşdır",
+  "notifications_permission_banner.title": "Heç nəyi buraxmayın",
+  "onboarding.follows.back": "Geri",
+  "onboarding.follows.done": "Hazırdır",
+  "onboarding.follows.search": "Axtar",
+  "onboarding.follows.title": "Başlamaq üçün insanları izləyin",
+  "onboarding.profile.discoverable": "Profilimi kəşf edilə bilən et",
+  "onboarding.profile.discoverable_hint": "Mastodon-da kəşf edilə bilməni aktivləşdirsəniz, göndərişləriniz axtarış nəticələrində və trendlərdə görünə bilər və profiliniz sizinlə oxşar maraqlara sahib şəxslərə təklif edilə bilər.",
+  "onboarding.profile.display_name": "Ekran adı",
+  "onboarding.profile.display_name_hint": "Tam adınız və ya ləqəbiniz…",
+  "onboarding.profile.note": "Bioqrafiya",
+  "onboarding.profile.note_hint": "Digər insanların @adını_çəkə və ya #mövzu_etiketləri istifadə edə bilərsiniz…",
+  "onboarding.profile.save_and_continue": "Saxla və davam et",
+  "onboarding.profile.title": "Profili ayarla",
+  "onboarding.profile.upload_avatar": "Profil şəkli yüklə",
+  "onboarding.profile.upload_header": "Profil başlığı yüklə",
+  "password_confirmation.exceeds_maxlength": "Parol təsdiqi, maksimum parol uzunluğunu aşır",
+  "password_confirmation.mismatching": "Parol təsdiqi uyuşmur",
+  "picture_in_picture.restore": "Geri qoy",
+  "poll.closed": "Bağlandı",
+  "poll.refresh": "Təzələ",
+  "poll.reveal": "Nəticələrə bax",
+  "poll.total_people": "{count, plural, one {# nəfər} other {# nəfər}}",
+  "poll.total_votes": "{count, plural, one {# səs} other {# səs}}",
+  "poll.vote": "Səs ver",
+  "poll.voted": "Bu cavaba səs verdiniz",
+  "poll.votes": "{votes, plural, one {# səs} other {# səs}}",
+  "poll_button.add_poll": "Bir anket əlavə et",
+  "poll_button.remove_poll": "Anketi sil",
+  "privacy.change": "Göndəriş gizliliyini dəyişdir",
+  "privacy.direct.long": "Göndərişdə adı çəkilən hər kəs",
+  "privacy.direct.short": "Şəxsi adçəkmə",
+  "privacy.private.long": "Yalnız izləyiciləriniz",
+  "privacy.private.short": "İzləyicilər",
+  "privacy.public.long": "Mastodon-da olan və olmayan hər kəs",
+  "privacy.public.short": "Hər kəsə açıq",
+  "privacy.unlisted.short": "Səssiz hər kəsə açıq",
+  "privacy_policy.last_updated": "Son güncəlləmə {date}",
+  "privacy_policy.title": "Gizlilik Siyasəti",
+  "recommended": "Tövsiyə edilən",
+  "refresh": "Təzələ",
+  "regeneration_indicator.please_stand_by": "Lütfən gözləyin.",
+  "regeneration_indicator.preparing_your_home_feed": "Əsas ekran lentiniz hazırlanır…",
+  "relative_time.days": "{number} gü",
+  "relative_time.full.days": "{number, plural, one {# gün} other {# gün}} əvvəl",
+  "relative_time.full.hours": "{number, plural, one {# saat} other {# saat}} əvvəl",
+  "relative_time.full.just_now": "indicə",
+  "relative_time.full.minutes": "{number, plural, one {# dəqiqə} other {# dəqiqə}} əvvəl",
+  "relative_time.full.seconds": "{number, plural, one {# saniyə} other {# saniyə}} əvvəl",
+  "relative_time.hours": "{number} sa",
+  "relative_time.just_now": "indi",
+  "relative_time.minutes": "{number} dəq",
+  "relative_time.seconds": "{number} san",
+  "relative_time.today": "bu gün",
+  "reply_indicator.attachments": "{count, plural, one {# qoşma} other {# qoşma}}",
+  "reply_indicator.cancel": "İmtina",
+  "reply_indicator.poll": "Anket",
+  "report.block": "Əngəllə",
+  "report.block_explanation": "Onun göndərişlərini görməyəcəksiniz. O, göndərişlərinizi görə və ya sizi izləyə bilməz. Əngəllədiyinizi anlaya biləcək.",
+  "report.categories.legal": "Hüquqi",
+  "report.categories.other": "Digər",
+  "report.categories.spam": "Spam",
+  "report.categories.violation": "Məzmun, bir və ya daha çox server qaydasını pozur",
+  "report.category.subtitle": "Ən çox uyuşanı seçin",
+  "report.category.title": "Bu {type} ilə bağlı nələrin baş verdiyini bizə deyin",
+  "report.category.title_account": "profil",
+  "report.category.title_status": "göndəriş",
+  "report.close": "Hazırdır",
+  "report.comment.title": "Bilməyimizi istədiyiniz başqa nəsə var?",
+  "report.forward": "Bura yönləndir: {target}",
+  "report.forward_hint": "Hesab, başqa bir serverdəndir. Hesabatın anonim bir kopyası ora da göndərilsin?",
+  "report.mute": "Səssizə al",
+  "report.mute_explanation": "Onun göndərişlərini görməyəcəksiniz. O, sizi izləməyə və göndərişlərinizi görməyə davam edə bilər, ancaq səssizə alındığını bilməyəcək.",
+  "report.next": "Növbəti",
+  "report.placeholder": "Əlavə rəylər",
+  "report.reasons.dislike": "Bunu bəyənmədim",
+  "report.reasons.dislike_description": "Bu, görmək istədiyiniz bir şey deyil",
+  "report.reasons.legal": "Qanunsuzdur",
+  "report.reasons.legal_description": "Sizin və ya serverinizin olduğu ölkənin qanunlarını pozduğuna inanırsınız",
+  "report.reasons.other": "Başqa bir şeydir",
+  "report.reasons.other_description": "Problem, digər kateqoriyalara uyğun gəlmir",
+  "report.reasons.spam": "Spamdır",
+  "report.reasons.spam_description": "Zərərli keçidlər, saxta qarşılıqlı əlaqə və ya təkrarlanan cavablar",
+  "report.reasons.violation": "Server qaydalarını pozur",
+  "report.reasons.violation_description": "Müəyyən qaydaları pozduğundan xəbərdarsınız",
+  "report.rules.subtitle": "Uyğun olanların hamısını seçin",
+  "report.rules.title": "Hansı qaydalar pozulub?",
+  "report.statuses.subtitle": "Uyğun olanların hamısını seçin",
+  "report.statuses.title": "Bu şikayəti dəstəkləyən hər hansısa bir göndəriş var?",
+  "report.submit": "Təqdim et",
+  "report.target": "{target} şikayət edilir",
+  "report.thanks.take_action": "Mastodon-da nə görə biləcəyinizi idarə etmək üçün seçimləriniz bunlardır:",
+  "report.thanks.take_action_actionable": "Biz bunu incələdiyimiz müddətdə, siz @{name} ilə bağlı bunları edə bilərsiniz:",
+  "report.thanks.title": "Bunu görmək istəmirsiniz?",
+  "report.thanks.title_actionable": "Şikayət etdiyiniz üçün təşəkkürlər, məsələyə baxacağıq.",
+  "report.unfollow": "@{name} - izləmədən çıxart",
+  "report.unfollow_explanation": "Bu hesabı izləyirsiniz. Əsas ekran lentinizdə onun göndərişlərini artıq görmək istəmirsinizsə, onu izləmədən çıxarın.",
+  "report_notification.attached_statuses": "{count, plural, one {{count} göndəriş} other {{count} göndəriş}} əlavə edildi",
+  "report_notification.categories.legal": "Hüquqi",
+  "report_notification.categories.legal_sentence": "qanunsuz məzmun",
+  "report_notification.categories.other": "Digər",
+  "report_notification.categories.other_sentence": "digər",
+  "report_notification.categories.spam": "Spam",
+  "report_notification.categories.spam_sentence": "spam",
+  "report_notification.categories.violation": "Qayda pozuntusu",
+  "report_notification.categories.violation_sentence": "qayda pozuntusu",
+  "report_notification.open": "Hesabatı aç",
+  "search.clear": "Axtarışı təmizlə",
+  "search.no_recent_searches": "Son axtarışlar yoxdur",
+  "search.placeholder": "Axtar",
+  "search.quick_action.account_search": "Uyuşan profillər {x}",
+  "search.quick_action.go_to_account": "{x} profilinə get",
+  "search.quick_action.go_to_hashtag": "{x} mövzu etiketinə get",
+  "search.quick_action.open_url": "URL-ni Mastodon-da aç",
+  "search.quick_action.status_search": "Uyuşan göndərişlər {x}",
+  "search.search_or_paste": "Axtar və ya URL-ni yapışdır",
+  "search_popout.full_text_search_disabled_message": "{domain} domenində mövcud deyil.",
+  "search_popout.full_text_search_logged_out_message": "Yalnız giriş edildiyi zaman əlçatandır.",
+  "search_popout.language_code": "ISO dil kodu",
+  "search_popout.options": "Axtarış seçimləri",
+  "search_popout.quick_actions": "Cəld əməliyyatlar",
+  "search_popout.recent": "Son axtarışlar",
+  "search_popout.specific_date": "müəyyən tarix",
+  "search_popout.user": "istifadəçi",
+  "search_results.accounts": "Profillər",
+  "search_results.all": "Hamısı",
+  "search_results.hashtags": "Mövzu etiketləri",
+  "search_results.no_results": "Nəticə yoxdur.",
+  "search_results.no_search_yet": "Göndərişləri, profilləri və ya mövzu etiketlərini axtarmağa çalışın.",
+  "search_results.see_all": "Hamısına bax",
+  "search_results.statuses": "Göndərişlər",
+  "search_results.title": "\"{q}\" axtar",
+  "server_banner.about_active_users": "Son 30 gündə bu serveri istifadə edənlər (aylıq aktiv istifadəçilər)",
+  "server_banner.active_users": "aktiv istifadəçilər",
+  "server_banner.administered_by": "Administrasiya:",
+  "server_banner.is_one_of_many": "{domain}, fediverse-də iştirak etmək üçün istifadə edə biləcəyiniz bir neçə müstəqil Mastodon serverlərindən biridir.",
+  "server_banner.server_stats": "Server statistikaları:",
+  "sign_in_banner.create_account": "Hesab yarat",
+  "sign_in_banner.follow_anyone": "fediverse-dəki hər kəsi izləyin və hamısına xronoloji ardıcıllıqla baxın. Heç bir alqoritm, reklam və ya klikləmə tələsi yoxdur.",
+  "sign_in_banner.mastodon_is": "Mastodon, baş verənlərdən xəbərdar olmağın ən yaxşı yoldur.",
+  "sign_in_banner.sign_in": "Giriş",
+  "sign_in_banner.sso_redirect": "Giriş və ya Qeydiyyat",
+  "status.admin_account": "@{name} üçün moderasiya interfeysini aç",
+  "status.admin_domain": "{domain} üçün moderasiya interfeysini aç",
+  "status.admin_status": "Moderasiya interfeysində bu göndərişi aç",
+  "status.block": "Əngəllə: @{name}",
+  "status.bookmark": "Əlfəcin",
+  "status.cancel_reblog_private": "Təkrar paylaşımı geri al",
+  "status.cannot_reblog": "Bu göndəriş təkrar paylaşıla bilməz",
+  "status.continued_thread": "Davam edən mövzu",
+  "status.copy": "Göndəriş keçidini kopyala",
+  "status.delete": "Sil",
+  "status.detailed_status": "Detallı danışıq görünüşü",
+  "status.direct": "Şəxsi olaraq adını çək: @{name}",
+  "status.direct_indicator": "Şəxsi olaraq adını çək",
+  "status.edit": "Düzəliş et",
+  "status.edited": "Son düzəliş {date}",
+  "status.edited_x_times": "{count, plural, one {{count} dəfə} other {{count} dəfə}} düzəliş edilib",
+  "status.favourite": "Sevimli",
+  "status.favourites": "{count, plural, one {sevimli} other {sevimli}}",
+  "status.filter": "Bu göndərişi filtrlə",
+  "status.history.created": "{name}, {date} yaratdı",
+  "status.history.edited": "{name}, {date} düzəliş etdi",
+  "status.load_more": "Daha çoxunu yüklə",
+  "status.media.open": "Açmaq üçün kliklə",
+  "status.media.show": "Göstərmək üçün kliklə",
+  "status.media_hidden": "Media gizlidir",
+  "status.mention": "Adını çək: @{name}",
+  "status.more": "Daha çox",
+  "status.mute": "@{name} - səssizə al",
+  "status.mute_conversation": "Danışığın səsini kəs",
+  "status.open": "Bu göndərişi genişləndir",
+  "status.pin": "Profildə sanc",
+  "status.quote_error.filtered": "Bəzi filtrlərinizə görə gizlidir",
+  "status.quote_error.not_available": "Göndəriş əlçatmazdır",
+  "status.quote_error.pending_approval": "Göndəriş gözləmədədir",
+  "status.quote_post_author": "@{name} göndərişini sitat gətirdi",
+  "status.read_more": "Daha çoxunu oxu",
+  "status.reblog": "Təkrar paylaş",
+  "status.reblogged_by": "{name} təkrar paylaşdı",
+  "status.reblogs": "{count, plural, one {təkrar paylaşma} other {təkrar paylaşma}}",
+  "status.reblogs.empty": "Hələ heç kim bu göndərişi təkrar paylaşmayıb. Kimsə paylaşdığı zaman, burada görünəcək.",
+  "status.remove_bookmark": "Əlfəcini sil",
+  "status.remove_favourite": "Sevimlilərdən sil",
+  "status.replied_in_thread": "Mövzuda cavablandırıldı",
+  "status.replied_to": "Cavab verildi: {name}",
+  "status.reply": "Cavabla",
+  "status.replyAll": "Mövzuda cavab ver",
+  "status.report": "Bildir: @{name}",
+  "status.revoke_quote": "@{name} - göndərişindən mənim göndərişimi sil",
+  "status.sensitive_warning": "Həssas məzmun",
+  "status.share": "Paylaş",
+  "status.show_less_all": "Hamısı üçün daha az göstər",
+  "status.show_more_all": "Hamısı üçün daha çox göstər",
+  "status.show_original": "Orijinalı göstər",
+  "status.title.with_attachments": "{user} {attachmentCount, plural, one {bir qoşma} other {{attachmentCount} qoşma}} paylaşdı",
+  "status.translate": "Tərcümə et",
+  "status.translated_from_with": "{provider} ilə {lang} dilindən tərcümə edilib",
+  "status.uncached_media_warning": "Önizləmə mövcud deyil",
+  "status.unmute_conversation": "Danışığın səsini aç",
+  "status.unpin": "Profil sancağı götür",
+  "subscribed_languages.lead": "Dəyişiklikdən sonra əsas ekran və siyahı zaman xəttinizdə yalnız seçdiyiniz dillərdəki göndərişlər görünəcək. Bütün dillərdə göndəriş almaq üçün heç birini seçməyin.",
+  "subscribed_languages.save": "Dəyişiklikləri saxla",
+  "subscribed_languages.target": "{target} üçün abunə olunmuş dilləri dəyişdir",
+  "tabs_bar.home": "Ana səhifə",
+  "tabs_bar.menu": "Menyu",
+  "tabs_bar.notifications": "Bildirişlər",
+  "tabs_bar.publish": "Yeni göndəriş",
+  "tabs_bar.search": "Axtar",
+  "terms_of_service.effective_as_of": "{date} etibarilə qüvvədə",
+  "terms_of_service.title": "Xidmət Şərtləri",
+  "terms_of_service.upcoming_changes_on": "{date} tarixində ediləcək dəyişikliklər",
+  "time_remaining.days": "{number, plural, one {# gün} other {# gün}} qalıb",
+  "time_remaining.hours": "{number, plural, one {# saat} other {# saat}} qalıb",
+  "time_remaining.minutes": "{number, plural, one {# dəqiqə} other {# dəqiqə}} qalıb",
+  "time_remaining.moments": "Bir neçə dəqiqə qalıb",
+  "time_remaining.seconds": "{number, plural, one {# saniyə} other {# saniyə}} qalıb",
+  "trends.counter_by_accounts": "Son {days, plural, one {bir gündə} other {{days} gündə}} {count, plural, one {{counter} nəfər} other {{counter} nəfər}}",
+  "trends.trending_now": "İndi trenddədir",
+  "ui.beforeunload": "Mastodon-u tərk etsəniz, qaralamanız itəcək.",
+  "units.short.billion": "{count} mlyrd",
+  "units.short.million": "{count} mlyn",
+  "units.short.thousand": "{count} min",
+  "upload_area.title": "Yükləmək üçün sürüklə və burax",
+  "upload_button.label": "Təsvir, video və ya səs faylı əlavə et",
+  "upload_error.limit": "Fayl yükləmə limiti aşılıb.",
+  "upload_error.poll": "Anketlərdə fayl yükləməyə icazə verilmir.",
+  "upload_form.drag_and_drop.instructions": "Bir media qoşmasını daşımaq üçün boşluq və ya enter düyməsinə basın. Sürükləmə zamanı, media qoşmasını hər hansısa bir yönə hərəkət etdirmək üçün ox düymələrini istifadə edin. Media qoşmasını yeni mövqeyinə buraxmaq üçün təkrar boşluq və ya enter düyməsinə basın, ləğv etmək üçün escape düyməsinə basın.",
+  "upload_form.drag_and_drop.on_drag_cancel": "Sürükləmə ləğv edilib. {item} media qoşması buraxıldı.",
+  "upload_form.drag_and_drop.on_drag_end": "{item} media qoşması buraxıldı.",
+  "upload_form.drag_and_drop.on_drag_over": "{item} media qoşması daşındı.",
+  "upload_form.drag_and_drop.on_drag_start": "{item} media qoşması alındı.",
+  "upload_form.edit": "Düzəliş et",
+  "upload_progress.label": "Yüklənir...",
+  "upload_progress.processing": "Emal edilir…",
+  "username.taken": "Bu istifadəçi adı götürülüb. Başqasını sınayın",
+  "video.close": "Videonu bağla",
+  "video.download": "Faylı endir",
+  "video.exit_fullscreen": "Tam ekrandan çıx",
+  "video.expand": "Videonu genişləndir",
+  "video.fullscreen": "Tam ekran",
+  "video.hide": "Videonu gizlət",
+  "video.mute": "Səsi kəs",
+  "video.pause": "Fasilə ver",
+  "video.play": "Oxut",
+  "video.skip_backward": "Geri ötür",
+  "video.skip_forward": "İrəli ötür",
+  "video.unmute": "Səsi aç",
+  "video.volume_down": "Həcmi azalt",
+  "video.volume_up": "Həcmi artır",
+  "visibility_modal.button_title": "Görünməni ayarla",
+  "visibility_modal.header": "Görünmə və qarşılıqlı əlaqə",
+  "visibility_modal.helper.unlisted_quoting": "İnsanlar sizdən sitat gətirdiyi zaman, onların göndərişləri də trend zaman xəttindən gizlədiləcək.",
+  "visibility_modal.quote_followers": "Yalnız izləyicilər",
+  "visibility_modal.quote_public": "Hər kəs"
 }
diff --git a/app/javascript/mastodon/locales/be.json b/app/javascript/mastodon/locales/be.json
index b1567a8b6b8..dc02cf731a9 100644
--- a/app/javascript/mastodon/locales/be.json
+++ b/app/javascript/mastodon/locales/be.json
@@ -1,6 +1,7 @@
 {
   "about.blocks": "Мадэраваныя серверы",
   "about.contact": "Кантакт:",
+  "about.default_locale": "Прадвызначаная",
   "about.disclaimer": "Mastodon - свабоднае праграмнае забеспячэнне, з адкрытым зыходным кодам, і гандлёвай маркай Mastodon gGmbH.",
   "about.domain_blocks.no_reason_available": "Прычына недаступная",
   "about.domain_blocks.preamble": "Mastodon, у асноўным, дазваляе вам праглядаць кантэнт і ўзаемадзейнічаць з карыстальнікамі з іншых сервераў у федэсвету. Гэтыя выключэнні былі зроблены дакладна на гэтым серверы.",
@@ -8,6 +9,7 @@
   "about.domain_blocks.silenced.title": "Абмежаваны",
   "about.domain_blocks.suspended.explanation": "Ніякая інфармацыя з гэтага сервера не будзе апрацавана, захавана або абменена, узаемадзеянне або камунікацыя з карыстальнікамі гэтага сервера немагчымы.",
   "about.domain_blocks.suspended.title": "Прыпынены",
+  "about.language_label": "Мова",
   "about.not_available": "Дадзеная інфармацыя не дасяжная на гэтым серверы.",
   "about.powered_by": "Дэцэнтралізаваная сацыяльная сетка, створаная {mastodon}",
   "about.rules": "Правілы сервера",
@@ -19,23 +21,39 @@
   "account.block_domain": "Заблакіраваць дамен {domain}",
   "account.block_short": "Заблакіраваць",
   "account.blocked": "Заблакіраваны",
+  "account.blocking": "Блакіраванне",
   "account.cancel_follow_request": "Скасаваць запыт на падпіску",
   "account.copy": "Скапіраваць спасылку на профіль",
   "account.direct": "Згадаць асабіста @{name}",
   "account.disable_notifications": "Не паведамляць мне пра публікацыі @{name}",
+  "account.domain_blocking": "Блакіраванне дамена",
   "account.edit_profile": "Рэдагаваць профіль",
+  "account.edit_profile_short": "Рэдагаваць",
   "account.enable_notifications": "Апавяшчаць мяне пра допісы @{name}",
   "account.endorse": "Паказваць у профілі",
+  "account.familiar_followers_many": "Мае сярод падпісчыкаў {name1}, {name2}, і {othersCount, plural, one {яшчэ # чалавека, знаёмага вам} few {яшчэ # чалавекі, знаёмыя вам} many {яшчэ # чалавек, знаёмых вам} other {яшчэ # чалавекі, знаёмыя вам}}",
+  "account.familiar_followers_one": "Мае сярод падпісчыкаў {name1}",
+  "account.familiar_followers_two": "Мае сярод падпісчыкаў {name1} і {name2}",
+  "account.featured": "Рэкамендаванае",
+  "account.featured.accounts": "Профілі",
+  "account.featured.hashtags": "Хэштэгі",
   "account.featured_tags.last_status_at": "Апошні допіс ад {date}",
   "account.featured_tags.last_status_never": "Няма допісаў",
   "account.follow": "Падпісацца",
   "account.follow_back": "Падпісацца ў адказ",
+  "account.follow_back_short": "Падпісацца ў адказ",
+  "account.follow_request": "Даслаць запыт на падпіску",
+  "account.follow_request_cancel": "Скасаваць запыт",
+  "account.follow_request_cancel_short": "Скасаваць",
+  "account.follow_request_short": "Запыт",
   "account.followers": "Падпісчыкі",
   "account.followers.empty": "Ніхто пакуль не падпісаны на гэтага карыстальніка.",
   "account.followers_counter": "{count, plural, one {{counter} падпісчык} few {{counter} падпісчыкі} many {{counter} падпісчыкаў} other {{counter} падпісчыка}}",
+  "account.followers_you_know_counter": "{count, plural, one {{counter}, знаёмы вам} other {{counter}, знаёмых вам}}",
   "account.following": "Падпіскі",
   "account.following_counter": "{count, plural, one {{counter} падпіска} few {{counter} падпіскі} many {{counter} падпісак} other {{counter} падпіскі}}",
   "account.follows.empty": "Карыстальнік ні на каго не падпісаны.",
+  "account.follows_you": "Падпісаны на вас",
   "account.go_to_profile": "Перайсці да профілю",
   "account.hide_reblogs": "Схаваць пашырэнні ад @{name}",
   "account.in_memoriam": "У памяць.",
@@ -45,23 +63,27 @@
   "account.locked_info": "Гэты ўліковы запіс пазначаны як схаваны. Уладальнік сам вырашае, хто можа падпісвацца на яго.",
   "account.media": "Медыя",
   "account.mention": "Згадаць @{name}",
-  "account.moved_to": "{name} указаў, што яго/яе новы ўліковы запіс цяпер:",
+  "account.moved_to": "{name} указаў(-ла), што яго/яе новы ўліковы запіс цяпер:",
   "account.mute": "Ігнараваць @{name}",
   "account.mute_notifications_short": "Не апавяшчаць",
   "account.mute_short": "Ігнараваць",
   "account.muted": "Ігнаруецца",
+  "account.muting": "Ігнараванне",
+  "account.mutual": "Вы падпісаны адно на аднаго",
   "account.no_bio": "Апісанне адсутнічае.",
   "account.open_original_page": "Адкрыць арыгінальную старонку",
   "account.posts": "Допісы",
   "account.posts_with_replies": "Допісы і адказы",
+  "account.remove_from_followers": "Выдаліць {name} з падпісчыкаў",
   "account.report": "Паскардзіцца на @{name}",
-  "account.requested": "Чакаецца ўхваленне. Націсніце, каб скасаваць запыт на падпіску",
-  "account.requested_follow": "{name} адправіў запыт на падпіску",
+  "account.requested_follow": "{name} адправіў(-ла) запыт на падпіску",
+  "account.requests_to_follow_you": "Хоча падпісацца на вас",
   "account.share": "Абагуліць профіль @{name}",
   "account.show_reblogs": "Паказаць падштурхоўванні ад @{name}",
   "account.statuses_counter": "{count, plural, one {{counter} допіс} few {{counter} допісы} many {{counter} допісаў} other {{counter} допісу}}",
   "account.unblock": "Разблакіраваць @{name}",
   "account.unblock_domain": "Разблакіраваць дамен {domain}",
+  "account.unblock_domain_short": "Разблакіраваць",
   "account.unblock_short": "Разблакіраваць",
   "account.unendorse": "Не паказваць у профілі",
   "account.unfollow": "Адпісацца",
@@ -83,34 +105,40 @@
   "alert.unexpected.message": "Узнікла нечаканая памылка.",
   "alert.unexpected.title": "Вой!",
   "alt_text_badge.title": "Альтэрнатыўны тэкст",
+  "alt_text_modal.add_alt_text": "Дадаць альтэрнатыўны тэкст",
+  "alt_text_modal.add_text_from_image": "Дадаць тэкст з відарыса",
+  "alt_text_modal.cancel": "Скасаваць",
+  "alt_text_modal.change_thumbnail": "Змяніць мініяцюру",
+  "alt_text_modal.describe_for_people_with_hearing_impairments": "Апішыце гэта людзям з праблемамі са слыхам…",
+  "alt_text_modal.describe_for_people_with_visual_impairments": "Апішыце гэта людзям з праблемамі са зрокам…",
   "alt_text_modal.done": "Гатова",
   "announcement.announcement": "Аб'ява",
-  "annual_report.summary.archetype.booster": "Трэнда-сьледнік",
+  "annual_report.summary.archetype.booster": "Паляўнічы на трэнды",
   "annual_report.summary.archetype.lurker": "Назіральнік",
   "annual_report.summary.archetype.oracle": "Аракул",
   "annual_report.summary.archetype.pollster": "Апытвальнік",
-  "annual_report.summary.archetype.replier": "Душа кампанійі",
-  "annual_report.summary.followers.followers": "падпісанты",
-  "annual_report.summary.followers.total": "Усяго {count}",
-  "annual_report.summary.here_it_is": "Вось вашыя вынікі {year} году:",
+  "annual_report.summary.archetype.replier": "Душа кампаніі",
+  "annual_report.summary.followers.followers": "падпісчыкі",
+  "annual_report.summary.followers.total": "Агулам {count}",
+  "annual_report.summary.here_it_is": "Вось Вашы вынікі {year} за год:",
   "annual_report.summary.highlighted_post.by_favourites": "самы ўпадабаны допіс",
   "annual_report.summary.highlighted_post.by_reblogs": "самы пашыраны допіс",
   "annual_report.summary.highlighted_post.by_replies": "самы каментаваны допіс",
   "annual_report.summary.highlighted_post.possessive": "{name}",
-  "annual_report.summary.most_used_app.most_used_app": "самая выкарыстоўваная аплікацыя",
-  "annual_report.summary.most_used_hashtag.most_used_hashtag": "самы выкарыстоўваны гэштаґ",
+  "annual_report.summary.most_used_app.most_used_app": "праграма, якой карысталіся найчасцей",
+  "annual_report.summary.most_used_hashtag.most_used_hashtag": "хэштэг, якім карысталіся найчасцей",
   "annual_report.summary.most_used_hashtag.none": "Няма",
   "annual_report.summary.new_posts.new_posts": "новыя допісы",
-  "annual_report.summary.percentile.text": "<topLabel>Мэта месьціць вас у топ</topLabel><percentage></percentage><bottomLabel> карыстальнікаў {domain}.</bottomLabel>",
-  "annual_report.summary.percentile.we_wont_tell_bernie": "Мы ня скажам аб гэтым Сіняпальцаму.",
+  "annual_report.summary.percentile.text": "<topLabel>Гэта падымае Вас у топ</topLabel><percentage></percentage><bottomLabel> карыстальнікаў {domain}.</bottomLabel>",
+  "annual_report.summary.percentile.we_wont_tell_bernie": "КДБ пра гэта не даведаецца.",
   "annual_report.summary.thanks": "Дзякуй за ўдзел у Mastodon!",
   "attachments_list.unprocessed": "(неапрацаваны)",
   "audio.hide": "Схаваць аўдыя",
-  "block_modal.remote_users_caveat": "Мы папросім сервер {domain} паважаць ваш выбар. Аднак гэта не гарантуецца, паколькі некаторыя серверы могуць апрацоўваць блакіроўкі іншым чынам. Публічныя паведамленні могуць заставацца бачнымі для ананімных карыстальнікаў.",
+  "block_modal.remote_users_caveat": "Мы папросім сервер {domain} паважаць Ваш выбар. Аднак гэта не гарантуецца, паколькі некаторыя серверы могуць апрацоўваць блакіроўкі іншым чынам. Публічныя паведамленні могуць заставацца бачнымі для ананімных карыстальнікаў.",
   "block_modal.show_less": "Паказаць меньш",
   "block_modal.show_more": "Паказаць больш",
   "block_modal.they_cant_mention": "Карыстальнік не зможа згадваць або сачыць за вамі.",
-  "block_modal.they_cant_see_posts": "Карыстальнік не будзе бачыць вашых допісаў, а вы — карыстальніка.",
+  "block_modal.they_cant_see_posts": "Карыстальнік не будзе бачыць Вашых допісаў, а Вы — ягоных.",
   "block_modal.they_will_know": "Карыстальнік убачыць, што адбылася блакіроўка.",
   "block_modal.title": "Заблакіраваць карыстальніка?",
   "block_modal.you_wont_see_mentions": "Вы не ўбачыце паведамленняў са згадваннем карыстальніка.",
@@ -127,7 +155,7 @@
   "bundle_column_error.routing.body": "Запытаная старонка не знойдзена. Вы ўпэўнены, што URL у адрасным радку правільны?",
   "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "Закрыць",
-  "bundle_modal_error.message": "Падчас загрузкі гэтага экрана штосьці пайшло ня так.",
+  "bundle_modal_error.message": "Падчас загрузкі гэтага экрана штосьці пайшло не так.",
   "bundle_modal_error.retry": "Паспрабуйце зноў",
   "closed_registrations.other_server_instructions": "Паколькі Mastodon дэцэнтралізаваны, вы можаце стварыць уліковы запіс на іншым серверы і працягваць узаемадзейнічаць з ім.",
   "closed_registrations_modal.description": "Стварэнне ўліковага запісу на {domain} цяпер немагчыма. Заўважце, што няма неабходнасці мець уліковы запіс менавіта на {domain}, каб выкарыстоўваць Mastodon.",
@@ -139,7 +167,7 @@
   "column.bookmarks": "Закладкі",
   "column.community": "Лакальная стужка",
   "column.create_list": "Стварыць спіс",
-  "column.direct": "Асабістыя згадванні",
+  "column.direct": "Прыватныя згадванні",
   "column.directory": "Праглядзець профілі",
   "column.domain_blocks": "Заблакіраваныя дамены",
   "column.edit_list": "Рэдагаваць спіс",
@@ -147,7 +175,7 @@
   "column.firehose": "Стужкі",
   "column.follow_requests": "Запыты на падпіску",
   "column.home": "Галоўная",
-  "column.list_members": "Кіраванне ўдзельнікамі спісу",
+  "column.list_members": "Кіраванне ўдзельнікамі спіса",
   "column.lists": "Спісы",
   "column.mutes": "Ігнараваныя карыстальнікі",
   "column.notifications": "Апавяшчэнні",
@@ -194,24 +222,47 @@
   "confirmations.delete.message": "Вы ўпэўненыя, што хочаце выдаліць гэты допіс?",
   "confirmations.delete.title": "Выдаліць допіс?",
   "confirmations.delete_list.confirm": "Выдаліць",
-  "confirmations.delete_list.message": "Вы ўпэўненыя, што хочаце беззваротна выдаліць гэты чарнавік?",
+  "confirmations.delete_list.message": "Вы ўпэўненыя, што хочаце беззваротна выдаліць гэты спіс?",
   "confirmations.delete_list.title": "Выдаліць спіс?",
+  "confirmations.discard_draft.confirm": "Адмовіцца і працягнуць",
+  "confirmations.discard_draft.edit.cancel": "Працягнуць рэдагаванне",
+  "confirmations.discard_draft.edit.message": "Калі працягнуць, то ўсе змены, што Вы зрабілі ў гэтым допісе, будуць адмененыя.",
+  "confirmations.discard_draft.edit.title": "Адмовіцца ад змен у Вашым допісе?",
+  "confirmations.discard_draft.post.cancel": "Працягнуць чарнавік",
+  "confirmations.discard_draft.post.message": "Калі працягнуць, то допіс, які Вы зараз пішаце, не будзе апублікаваны.",
+  "confirmations.discard_draft.post.title": "Скасаваць чарнавік?",
   "confirmations.discard_edit_media.confirm": "Адмяніць",
   "confirmations.discard_edit_media.message": "У вас ёсць незахаваныя змены ў апісанні або прэв'ю, усе роўна скасаваць іх?",
-  "confirmations.follow_to_list.confirm": "Падпісацца й дадаць у сьпіс",
-  "confirmations.follow_to_list.message": "Вы мусіце быць падпісаныя на {name} каб дадаць яго ў сьпіс.",
+  "confirmations.follow_to_list.confirm": "Падпісацца і дадаць у спіс",
+  "confirmations.follow_to_list.message": "Вам трэба падпісацца на {name}, каб дадаць яго/яе ў спіс.",
   "confirmations.follow_to_list.title": "Падпісацца на карыстальніка?",
   "confirmations.logout.confirm": "Выйсці",
   "confirmations.logout.message": "Вы ўпэўненыя, што хочаце выйсці?",
   "confirmations.logout.title": "Выйсці?",
-  "confirmations.missing_alt_text.title": "Дадаць апісаньне?",
+  "confirmations.missing_alt_text.confirm": "Дадаць альтэрнатыўны тэкст",
+  "confirmations.missing_alt_text.message": "У Вашым допісе ёсць медыя без альтэрнатыўнага тэксту. Дадаванне апісання дапамагае зрабіць Ваш допіс даступным для большай колькасці людзей.",
+  "confirmations.missing_alt_text.secondary": "Усё адно апублікаваць",
+  "confirmations.missing_alt_text.title": "Дадаць альтэрнатыўны тэкст?",
   "confirmations.mute.confirm": "Ігнараваць",
+  "confirmations.quiet_post_quote_info.dismiss": "Не нагадваць зноў",
+  "confirmations.quiet_post_quote_info.got_it": "Зразумела",
+  "confirmations.quiet_post_quote_info.message": "Калі будзеце цытаваць ціхі публічны допіс, Ваш допіс будзе схаваны ад трэндавых стужак.",
+  "confirmations.quiet_post_quote_info.title": "Цытаванне ціхіх публічных допісаў",
   "confirmations.redraft.confirm": "Выдаліць і перапісаць",
   "confirmations.redraft.message": "Вы ўпэўнены, што хочаце выдаліць допіс і перапісаць яго? Упадабанні і пашырэнні згубяцца, а адказы да арыгінальнага допісу асірацеюць.",
   "confirmations.redraft.title": "Выдаліць і перапісаць допіс?",
+  "confirmations.remove_from_followers.confirm": "Выдаліць падпісчыка",
+  "confirmations.remove_from_followers.message": "{name} больш не будзе падпісаны(-ая) на Вас. Упэўненыя, што хочаце працягнуць?",
+  "confirmations.remove_from_followers.title": "Выдаліць падпісчыка?",
+  "confirmations.revoke_quote.confirm": "Выдаліць допіс",
+  "confirmations.revoke_quote.message": "Гэтае дзеянне немагчыма адмяніць.",
+  "confirmations.revoke_quote.title": "Выдаліць допіс?",
+  "confirmations.unblock.confirm": "Разблакіраваць",
+  "confirmations.unblock.title": "Разблакіраваць {name}?",
   "confirmations.unfollow.confirm": "Адпісацца",
-  "confirmations.unfollow.message": "Вы ўпэўненыя, што хочаце адпісацца ад {name}?",
-  "confirmations.unfollow.title": "Адпісацца ад карыстальніка?",
+  "confirmations.unfollow.title": "Адпісацца ад {name}?",
+  "confirmations.withdraw_request.confirm": "Адклікаць запыт",
+  "confirmations.withdraw_request.title": "Адклікаць запыт на падпіску на {name}?",
   "content_warning.hide": "Схаваць допіс",
   "content_warning.show": "Усё адно паказаць",
   "content_warning.show_more": "Паказаць усё роўна",
@@ -221,8 +272,8 @@
   "conversation.with": "З {names}",
   "copy_icon_button.copied": "Скапіявана ў буфер абмену",
   "copypaste.copied": "Скапіравана",
-  "copypaste.copy_to_clipboard": "Капіраваць у буфер абмену",
-  "directory.federated": "З вядомага федэсвету",
+  "copypaste.copy_to_clipboard": "Скапіяваць у буфер абмену",
+  "directory.federated": "З вядомага федэральнага сусвету",
   "directory.local": "Толькі з {domain}",
   "directory.new_arrivals": "Новыя карыстальнікі",
   "directory.recently_active": "Нядаўна актыўныя",
@@ -230,7 +281,7 @@
   "disabled_account_banner.text": "Ваш уліковы запіс {disabledAccount} часова адключаны.",
   "dismissable_banner.community_timeline": "Гэта самыя апошнія допісы ад людзей, уліковыя запісы якіх размяшчаюцца на {domain}.",
   "dismissable_banner.dismiss": "Адхіліць",
-  "dismissable_banner.public_timeline": "Гэта самыя новыя публічныя допісы ад карыстальнікаў фэдывёрсу на якіх падпісаныя карыстальнікі {domain}.",
+  "dismissable_banner.public_timeline": "Вось апошнія публічныя допісы ад карыстальнікаў федэральнага сусвету, на якіх падпісаныя карыстальнікі {domain}.",
   "domain_block_modal.block": "Заблакіраваць сервер",
   "domain_block_modal.block_account_instead": "Заблакіраваць @{name} замест гэтага",
   "domain_block_modal.they_can_interact_with_old_posts": "Людзі з гэтага сервера змогуць узаемадзейнічаць з вашымі старымі допісамі.",
@@ -248,12 +299,13 @@
   "domain_pill.their_username": "Унікальны ідэнтыфікатар карыстальніка на серверы. Можна знайсці карыстальнікаў з аднолькавым іменем карыстальніка на розных серверах.",
   "domain_pill.username": "Імя карыстальніка",
   "domain_pill.whats_in_a_handle": "Што такое ідэнтыфікатар карыстальніка?",
-  "domain_pill.who_they_are": "Паколькі ідэнтыфікатары кажуць аб тым, хто гэты чалавек і якім серверам ён карыстаецца, вы можаце ўзаемадзейнічаць з карыстальнікамі <button> платформ, якія падтрымліваюць ActivityPub</button>.",
-  "domain_pill.who_you_are": "Паколькі ваш ідэнтыфікатар кажа аб тым, хто вы і дзе знаходзіцеся, людзі могуць узаемадзейнічаць з вамі ў сацыяльнай сетцы <button> на платформах, якія падтрымліваюць ActivityPub</button>.",
+  "domain_pill.who_they_are": "Паколькі ідэнтыфікатары кажуць аб тым, хто гэты чалавек і якім серверам ён карыстаецца, Вы можаце ўзаемадзейнічаць з карыстальнікамі <button> платформ, якія падтрымліваюць ActivityPub</button>.",
+  "domain_pill.who_you_are": "Паколькі Ваш ідэнтыфікатар кажа аб тым, хто Вы і дзе знаходзіцеся, людзі могуць узаемадзейнічаць з вамі ў сацыяльнай сетцы <button> на платформах, якія падтрымліваюць ActivityPub</button>.",
   "domain_pill.your_handle": "Ваш ідэнтыфікатар:",
   "domain_pill.your_server": "Ваш лічбавы дом, дзе захоўваюцца ўсе вашыя допісы. Не падабаецца гэты сервер? Змяніце сервер у любы час з захаваннем сваіх падпісчыкаў.",
   "domain_pill.your_username": "Ваш унікальны ідэнтыфікатар на гэтым серверы. Можна знайсці карыстальнікаў з аднолькавым іменем карыстальніка на розных серверах.",
-  "embed.instructions": "Убудуйце гэты пост на свой сайт, скапіраваўшы прыведзены ніжэй код",
+  "dropdown.empty": "Выбраць варыянт",
+  "embed.instructions": "Убудуйце гэты допіс на свой сайт, скапіраваўшы прыведзены ніжэй код.",
   "embed.preview": "Вось як гэта будзе выглядаць:",
   "emoji_button.activity": "Актыўнасць",
   "emoji_button.clear": "Ачысціць",
@@ -265,50 +317,59 @@
   "emoji_button.not_found": "Адпаведныя эмодзі не знойдзены",
   "emoji_button.objects": "Прадметы",
   "emoji_button.people": "Людзі",
-  "emoji_button.recent": "Чата выкарыстаныя",
+  "emoji_button.recent": "Часта выкарыстоўваемыя",
   "emoji_button.search": "Пошук...",
   "emoji_button.search_results": "Вынікі пошуку",
   "emoji_button.symbols": "Сімвалы",
   "emoji_button.travel": "Падарожжы і месцы",
+  "empty_column.account_featured.me": "Вы яшчэ нічога не паказалі. Ці ведалі Вы, што ў сваім профілі Вы можаце паказаць свае хэштэгі, якімі найбольш карыстаецеся, і нават профілі сваіх сяброў?",
+  "empty_column.account_featured.other": "{acct} яшчэ нічога не паказаў. Ці ведалі Вы, што ў сваім профілі Вы можаце паказаць свае хэштэгі, якімі найбольш карыстаецеся, і нават профілі сваіх сяброў?",
+  "empty_column.account_featured_other.unknown": "Гэты ўліковы запіс яшчэ нічога не паказаў.",
   "empty_column.account_hides_collections": "Гэты карыстальнік вырашыў схаваць гэтую інфармацыю",
   "empty_column.account_suspended": "Уліковы запіс прыпынены",
   "empty_column.account_timeline": "Тут няма допісаў!",
   "empty_column.account_unavailable": "Профіль недаступны",
   "empty_column.blocks": "Вы яшчэ нікога не заблакіравалі.",
-  "empty_column.bookmarked_statuses": "У вас яшчэ няма паведамленняў з закладкамі. Калі вы дадасце закладку, яна з'явіцца тут.",
-  "empty_column.community": "Мясцовая стужка пустая. Напішыце што-небудзь публічна, каб зрушыць з месца!",
-  "empty_column.direct": "Пакуль у вас няма асабістых згадак. Калі вы дашляце або атрымаеце штось, яно з'явіцца тут.",
+  "empty_column.bookmarked_statuses": "У Вашых закладках яшчэ няма допісаў. Калі Вы дадасце закладку, яна з’явіцца тут.",
+  "empty_column.community": "Мясцовая стужка пустая. Напішыце нешта публічнае, каб разварушыць справу!",
+  "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.favourited_statuses": "Вы яшчэ не ўпадабалі ніводны допіс. Калі гэта адбудзецца, Вы ўбачыце яго тут.",
+  "empty_column.favourites": "Ніхто яшчэ не ўпадабаў гэты допіс. Калі гэта адбудзецца, Вы ўбачыце гэтых людзей тут.",
+  "empty_column.follow_requests": "У Вас яшчэ няма запытаў на падпіску. Калі Вы атрымаеце запыт, ён з’явіцца тут.",
+  "empty_column.followed_tags": "Вы пакуль не падпісаны ні на адзін хэштэг. Калі падпішацеся, яны з’явяцца тут.",
   "empty_column.hashtag": "Па гэтаму хэштэгу пакуль што нічога няма.",
   "empty_column.home": "Галоўная стужка пустая! Падпішыцеся на іншых людзей, каб запоўніць яе. {suggestions}",
-  "empty_column.list": "У гэтым спісе пакуль што нічога няма. Калі члены лісту апублікуюць новыя запісы, яны з'явяцца тут.",
+  "empty_column.list": "У гэтым спісе пакуль што нічога няма. Калі члены спіса апублікуюць новыя запісы, яны з'явяцца тут.",
   "empty_column.mutes": "Вы яшчэ нікога не ігнаруеце.",
-  "empty_column.notification_requests": "Чысціня! Тут нічога няма. Калі вы будзеце атрымліваць новыя апавяшчэння, яны будуць з'яўляцца тут у адпаведнасці з вашымі наладамі.",
-  "empty_column.notifications": "У вас няма ніякіх апавяшчэнняў. Калі іншыя людзі ўзаемадзейнічаюць з вамі, вы ўбачыце гэта тут.",
+  "empty_column.notification_requests": "Чысціня! Тут нічога няма. Калі Вы будзеце атрымліваць новыя апавяшчэнні, яны будуць з'яўляцца тут у адпаведнасці з Вашымі наладамі.",
+  "empty_column.notifications": "У Вас няма ніякіх апавяшчэнняў. Калі іншыя людзі захочуць узаемадзейнічаць з Вамі, Вы ўбачыце гэта тут.",
   "empty_column.public": "Тут нічога няма! Апублікуйце што-небудзь, або падпішыцеся на карыстальнікаў з другіх сервераў",
   "error.unexpected_crash.explanation": "Гэта старонка не можа быць адлюстравана карэктна з-за памылкі ў нашым кодзе, або праблемы з сумяшчальнасцю браўзера.",
-  "error.unexpected_crash.explanation_addons": "Гэтая старонка не можа быць адлюстравана карэктна. Верагодна, гэтая памылка выклікана дадатковым кампанентам браўзера або інструментамі аўтаматычнага перакладу",
-  "error.unexpected_crash.next_steps": "Паспрабуйце абнавіць старонку. Калі гэта не дапаможа, вы можаце паспрабаваць іншы браўзер, альбо выкарыстаць усталяваную праграму.",
-  "error.unexpected_crash.next_steps_addons": "Паспрабуйце выключыць іх і аднавіць старонку. Калі гэта не дапаможа, вы можаце карыстацца Мастадонт праз другі браўзер ці аплікацыю.",
+  "error.unexpected_crash.explanation_addons": "Гэтая старонка не можа быць адлюстравана карэктна. Верагодна, гэтая памылка выкліканая дадатковым кампанентам браўзера або інструментамі аўтаматычнага перакладу.",
+  "error.unexpected_crash.next_steps": "Паспрабуйце абнавіць старонку. Калі гэта не дапаможа, Вы можаце паспрабаваць іншы браўзер, альбо выкарыстаць усталяваную праграму.",
+  "error.unexpected_crash.next_steps_addons": "Паспрабуйце выключыць іх і абнавіць старонку. Калі гэта не дапамагае, Вы ўсё яшчэ можаце карыстацца Mastodon праз іншы браўзер ці асобную праграму.",
   "errors.unexpected_crash.copy_stacktrace": "Дадаць дыягнастычны стэк у буфер абмену",
   "errors.unexpected_crash.report_issue": "Паведаміць аб праблеме",
   "explore.suggested_follows": "Людзі",
+  "explore.title": "Трэндавае",
   "explore.trending_links": "Навіны",
   "explore.trending_statuses": "Допісы",
   "explore.trending_tags": "Хэштэгі",
-  "filter_modal.added.context_mismatch_explanation": "Гэтая катэгорыя фільтра не прымяняецца да кантэксту, у якім вы адкрылі гэты пост. Калі вы хочаце, каб паведамленне таксама было адфільтравана ў гэтым кантэксце, вам трэба будзе адрэдагаваць фільтр",
+  "featured_carousel.header": "{count, plural,one {Замацаваны допіс} other {Замацаваныя допісы}}",
+  "featured_carousel.next": "Далей",
+  "featured_carousel.post": "Допіс",
+  "featured_carousel.previous": "Назад",
+  "featured_carousel.slide": "{index} з {total}",
+  "filter_modal.added.context_mismatch_explanation": "Гэтая катэгорыя фільтра не прымяняецца да кантэксту, у якім Вы адкрылі гэты допіс. Калі Вы хочаце, каб паведамленне таксама было адфільтраванае ў гэтым кантэксце, Вам трэба будзе адрэдагаваць фільтр.",
   "filter_modal.added.context_mismatch_title": "Неадпаведны кантэкст!",
   "filter_modal.added.expired_explanation": "Тэрмін дзеяння гэтай катэгорыі фільтраў скончыўся, вам трэба будзе змяніць дату заканчэння тэрміну дзеяння, каб яна прымянялася",
   "filter_modal.added.expired_title": "Пратэрмінаваны фільтр!",
   "filter_modal.added.review_and_configure": "Для прагляду і наступнай канфігурацыі фільтра катэгорый, перайдзіце на {settings_link}.",
   "filter_modal.added.review_and_configure_title": "Налады фільтра",
   "filter_modal.added.settings_link": "старонка наладаў",
-  "filter_modal.added.short_explanation": "Гэты пост быў дабаўлены ў катэгорыю з наступным фільтрам: {title}.",
+  "filter_modal.added.short_explanation": "Гэты допіс быў дададзены ў катэгорыю з наступным фільтрам: {title}.",
   "filter_modal.added.title": "Фільтр дабаўлены!",
   "filter_modal.select_filter.context_mismatch": "Не мае дачынення да кантэксту ",
   "filter_modal.select_filter.expired": "пратэрмінавана",
@@ -318,27 +379,27 @@
   "filter_modal.select_filter.title": "Фільтраваць гэты допіс",
   "filter_modal.title.status": "Фільтраваць допіс",
   "filter_warning.matches_filter": "Адпавядае фільтру \"<span>{title}</span>\"",
-  "filtered_notifications_banner.pending_requests": "Ад {count, plural, =0 {# людзей якіх} one {# чалавека якіх} few {# чалавек якіх} many {# людзей якіх} other {# чалавека якіх}} вы магчыма ведаеце",
+  "filtered_notifications_banner.pending_requests": "Ад {count, plural, =0 {# людзей якіх} one {# чалавека якіх} few {# чалавек якіх} many {# людзей якіх} other {# чалавека якіх}} Вы магчыма ведаеце",
   "filtered_notifications_banner.title": "Адфільтраваныя апавяшчэнні",
   "firehose.all": "Усе",
   "firehose.local": "Гэты сервер",
   "firehose.remote": "Іншыя серверы",
   "follow_request.authorize": "Аўтарызацыя",
   "follow_request.reject": "Адхіліць",
-  "follow_requests.unlocked_explanation": "Ваш акаўнт не схаваны, аднак прадстаўнікі {domain} палічылі, што вы можаце захацець праглядзець запыты на падпіску з гэтых профіляў уручную.",
+  "follow_requests.unlocked_explanation": "Ваш уліковы запіс не схаваны, аднак прадстаўнікі {domain} палічылі, што Вы можаце захацець праглядзець запыты на падпіску з гэтых уліковых запісаў уручную.",
   "follow_suggestions.curated_suggestion": "Выбар адміністрацыі",
   "follow_suggestions.dismiss": "Не паказваць зноў",
   "follow_suggestions.featured_longer": "Адабраныя камандай {domain} уручную",
-  "follow_suggestions.friends_of_friends_longer": "Папулярнае сярод людзей, на якіх Вы падпісаны",
+  "follow_suggestions.friends_of_friends_longer": "Папулярнае сярод людзей, на якіх Вы падпісаныя",
   "follow_suggestions.hints.featured": "Гэты профіль быў выбраны ўручную камандай {domain}.",
-  "follow_suggestions.hints.friends_of_friends": "Гэты профіль папулярны сярод людзей, на якіх вы падпісаліся.",
+  "follow_suggestions.hints.friends_of_friends": "Гэты профіль папулярны сярод людзей, на якіх Вы падпісаліся.",
   "follow_suggestions.hints.most_followed": "Гэты профіль - адзін з профіляў з самай вялікай колькасцю падпісак на {domain}.",
   "follow_suggestions.hints.most_interactions": "У апошні час гэты профіль прыцягвае шмат увагі на {domain}.",
-  "follow_suggestions.hints.similar_to_recently_followed": "Гэты профіль падобны на профілі, на якія вы нядаўна падпісаліся.",
+  "follow_suggestions.hints.similar_to_recently_followed": "Гэты профіль падобны на профілі, на якія Вы нядаўна падпісаліся.",
   "follow_suggestions.personalized_suggestion": "Персаналізаваная прапанова",
   "follow_suggestions.popular_suggestion": "Папулярная прапанова",
   "follow_suggestions.popular_suggestion_longer": "Папулярнае на {domain}",
-  "follow_suggestions.similar_to_recently_followed_longer": "Падобныя профілі, за якімі вы нядаўна сачылі",
+  "follow_suggestions.similar_to_recently_followed_longer": "Падобныя профілі, за якімі Вы нядаўна сачылі",
   "follow_suggestions.view_all": "Праглядзець усё",
   "follow_suggestions.who_to_follow": "На каго падпісацца",
   "followed_tags": "Падпіскі",
@@ -349,10 +410,12 @@
   "footer.privacy_policy": "Палітыка прыватнасці",
   "footer.source_code": "Прагледзець зыходны код",
   "footer.status": "Статус",
-  "footer.terms_of_service": "Умовы абслугоўваньня",
+  "footer.terms_of_service": "Умовы выкарыстання",
   "generic.saved": "Захавана",
   "getting_started.heading": "Пачатак працы",
-  "hashtag.admin_moderation": "Адкрыць інтэрфэйс мадаратара для #{name}",
+  "hashtag.admin_moderation": "Адкрыць інтэрфейс мадэратара для #{name}",
+  "hashtag.browse": "Праглядзець допісы ў #{hashtag}",
+  "hashtag.browse_from_account": "Праглядзець допісы ад @{name} у #{hashtag}",
   "hashtag.column_header.tag_mode.all": "і {additional}",
   "hashtag.column_header.tag_mode.any": "або {additional}",
   "hashtag.column_header.tag_mode.none": "без {additional}",
@@ -365,7 +428,10 @@
   "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.feature": "Паказваць у профілі",
   "hashtag.follow": "Падпісацца на хэштэг",
+  "hashtag.mute": "Ігнараваць #{hashtag}",
+  "hashtag.unfeature": "Не паказваць у профілі",
   "hashtag.unfollow": "Адпісацца ад хэштэга",
   "hashtags.and_other": "…і яшчэ {count, plural,  other {#}}",
   "hints.profiles.followers_may_be_missing": "Падпісчыкі гэтага профілю могуць адсутнічаць.",
@@ -374,35 +440,34 @@
   "hints.profiles.see_more_followers": "Глядзець больш падпісаных на {domain}",
   "hints.profiles.see_more_follows": "Глядзець больш падпісак на {domain}",
   "hints.profiles.see_more_posts": "Глядзець больш допісаў на {domain}",
-  "hints.threads.replies_may_be_missing": "Адказы зь іншых сэрвэраў могуць адсутнічаць.",
-  "hints.threads.see_more": "Глядзіце больш адказаў на {domain}",
+  "home.column_settings.show_quotes": "Паказаць цытаты",
   "home.column_settings.show_reblogs": "Паказваць пашырэнні",
   "home.column_settings.show_replies": "Паказваць адказы",
   "home.hide_announcements": "Схаваць аб'явы",
-  "home.pending_critical_update.body": "Калі ласка, абнавіце свой сервер Mastodon як мага хутчэй!",
+  "home.pending_critical_update.body": "Абнавіце свой сервер Mastodon як мага хутчэй!",
   "home.pending_critical_update.link": "Прагледзець абнаўленні",
   "home.pending_critical_update.title": "Даступна крытычнае абнаўленне бяспекі!",
   "home.show_announcements": "Паказаць аб'явы",
-  "ignore_notifications_modal.disclaimer": "Mastodon ня можа йнфармаваць карыстальнікаў аб тым, што вы прайігнаравалі йх паведамленьні. Ігнараваньне паведамленьняў не спыніць іх адпраўку.",
+  "ignore_notifications_modal.disclaimer": "Mastodon не можа паведамляць карыстальнікам, што Вы праігнаравалі апавяшчэнні ад іх. Ігнараванне апавяшчэнняў не спыніць адпраўку саміх паведамленняў.",
   "ignore_notifications_modal.filter_instead": "Замест гэтага адфільтраваць",
   "ignore_notifications_modal.filter_to_act_users": "Вы па-ранейшаму зможаце прымаць, адхіляць ці скардзіцца на карыстальнікаў",
-  "ignore_notifications_modal.filter_to_avoid_confusion": "Фільтраваньне дапамагае пазьбегнуць патэнцыйнай блытаніны",
-  "ignore_notifications_modal.filter_to_review_separately": "Вы можаце прагледзець адфільтраваныя паведамленьні асобна",
-  "ignore_notifications_modal.ignore": "Ігнараваць паведамленьні",
-  "ignore_notifications_modal.limited_accounts_title": "Ігнараваць паведамленьні ад абмежаваных уліковых запісаў?",
-  "ignore_notifications_modal.new_accounts_title": "Ігнараваць паведамленьні ад новых уліковых запісаў?",
-  "ignore_notifications_modal.not_followers_title": "Ігнараваць паведамленьні ад людзей, якія ня падпісаныя на вас?",
-  "ignore_notifications_modal.not_following_title": "Ігнараваць апавяшчэнні ад людзей на якіх вы не падпісаны?",
-  "ignore_notifications_modal.private_mentions_title": "Ігнараваць паведамленьні аб непажаданых прыватных згадках?",
+  "ignore_notifications_modal.filter_to_avoid_confusion": "Выкарыстанне фільтраў дапамагае пазбягаць патэнцыйнай блытаніны",
+  "ignore_notifications_modal.filter_to_review_separately": "Вы можаце прагледзець адфільтраваныя апавяшчэнні асобна",
+  "ignore_notifications_modal.ignore": "Ігнараваць апавяшчэнні",
+  "ignore_notifications_modal.limited_accounts_title": "Ігнараваць апавяшчэнні ад уліковых запісаў пад мадэрацыяй?",
+  "ignore_notifications_modal.new_accounts_title": "Ігнараваць апавяшчэнні ад новых уліковых запісаў?",
+  "ignore_notifications_modal.not_followers_title": "Ігнараваць апавяшчэнні ад людзей, якія не падпісаныя на вас?",
+  "ignore_notifications_modal.not_following_title": "Ігнараваць апавяшчэнні ад людзей, на якіх Вы не падпісаныя?",
+  "ignore_notifications_modal.private_mentions_title": "Ігнараваць апавяшчэнні пра непажаданыя прыватныя згадванні?",
   "info_button.label": "Даведка",
-  "interaction_modal.action.favourite": "Каб працягнуць, вы мусіце ўпадабаць з вашага ўліковага запісу.",
-  "interaction_modal.action.follow": "Каб працягнуць, вы мусіце падпісацца з вашага ўліковага запісу.",
+  "info_button.what_is_alt_text": "<h1>Што такое альтэрнатыўны тэкст?</h1> <p>Альтэрнатыўны тэкст апісвае відарыс людзям з парушэннем зроку, павольным злучэннем або тым, каму патрэбны дадатковы кантэкст.</p> <p>Вы можаце зрабіць відарыс больш дасяжным і зразумелым для ўсіх, напісаўшы зразумелы, сціслы і аб'ектыўны альтэрнатыўны тэкст.</p> <ul><li>Ахоплівайце важныя элементы</li> <li>Тлумачце тэкст на відарысе</li> <li>Карыстайцеся звычайнымі сказамі</li> <li>Пазбягайце залішняй інфармацыі</li> <li>Засяроджвайцеся на тэндэнцыях і ключавых высновах у цяжкіх для разумення візуальных матэрыялах (напрыклад, дыяграмах або картах)</li></ul>",
+  "interaction_modal.action": "Каб узаемадзейнічаць з допісам {name}, Вам трэба ўвайсці ў свой уліковы запіс на любым серверы Mastodon, якім Вы карыстаецеся.",
+  "interaction_modal.go": "Перайсці",
+  "interaction_modal.no_account_yet": "Не маеце ўліковага запісу?",
   "interaction_modal.on_another_server": "На іншым серверы",
   "interaction_modal.on_this_server": "На гэтым серверы",
-  "interaction_modal.title.favourite": "Упадабаць допіс {name}",
-  "interaction_modal.title.follow": "Падпісацца на {name}",
-  "interaction_modal.title.reblog": "Пашырыць допіс ад {name}",
-  "interaction_modal.title.reply": "Адказаць на допіс {name}",
+  "interaction_modal.title": "Увайдзіце, каб працягнуць",
+  "interaction_modal.username_prompt": "Напр., {example}",
   "intervals.full.days": "{number, plural, one {# дзень} few {# дні} many {# дзён} other {# дня}}",
   "intervals.full.hours": "{number, plural, one {# гадзіна} few {# гадзіны} many {# гадзін} other {# гадзіны}}",
   "intervals.full.minutes": "{number, plural, one {# хвіліна} few {# хвіліны} many {# хвілін} other {# хвіліны}}",
@@ -422,6 +487,7 @@
   "keyboard_shortcuts.home": "Адкрыць хатнюю храналагічную стужку",
   "keyboard_shortcuts.hotkey": "Спалучэнне клавіш",
   "keyboard_shortcuts.legend": "Паказаць легенду",
+  "keyboard_shortcuts.load_more": "Навесці на кнопку \"Загрузіць болей\"",
   "keyboard_shortcuts.local": "Адкрыць хатнюю храналагічную стужку",
   "keyboard_shortcuts.mention": "Згадаць аўтара",
   "keyboard_shortcuts.muted": "Адкрыць спіс ігнараваных карыстальнікаў",
@@ -430,6 +496,7 @@
   "keyboard_shortcuts.open_media": "Адкрыць медыя",
   "keyboard_shortcuts.pinned": "Адкрыць спіс замацаваных допісаў",
   "keyboard_shortcuts.profile": "Адкрыць профіль аўтара",
+  "keyboard_shortcuts.quote": "Цытаваць допіс",
   "keyboard_shortcuts.reply": "Адказаць на допіс",
   "keyboard_shortcuts.requests": "Адкрыць спіс запытаў на падпіску",
   "keyboard_shortcuts.search": "Сфакусіраваць пошукавы радок",
@@ -438,108 +505,157 @@
   "keyboard_shortcuts.toggle_hidden": "Паказаць/схаваць тэкст за папярэджаннем пра кантэнт",
   "keyboard_shortcuts.toggle_sensitivity": "Паказаць/схаваць медыя",
   "keyboard_shortcuts.toot": "Стварыць новы допіс",
-  "keyboard_shortcuts.unfocus": "Расфакусаваць тэкставую вобласць/пошукавы радок",
+  "keyboard_shortcuts.translate": "каб перакласці допіс",
+  "keyboard_shortcuts.unfocus": "Расфакусіраваць тэкставую вобласць/пошукавы радок",
   "keyboard_shortcuts.up": "Перамясціцца ўверх па спісе",
+  "learn_more_link.got_it": "Зразумеў(-ла)",
+  "learn_more_link.learn_more": "Падрабязней",
   "lightbox.close": "Закрыць",
   "lightbox.next": "Далей",
   "lightbox.previous": "Назад",
+  "lightbox.zoom_in": "Маштабаваць да фактычнага памеру",
+  "lightbox.zoom_out": "Дапасаваць усё змесціва пад памеры экрана",
   "limited_account_hint.action": "Усе роўна паказваць профіль",
-  "limited_account_hint.title": "Гэты профіль быў схаваны мадэратарамі",
+  "limited_account_hint.title": "Гэты профіль быў схаваны мадэратарамі {domain}.",
   "link_preview.author": "Ад {name}",
   "link_preview.more_from_author": "Больш ад {name}",
   "link_preview.shares": "{count, plural, one {{counter} допіс} few {{counter} допісы} many {{counter} допісаў} other {{counter} допісу}}",
   "lists.add_member": "Дадаць",
+  "lists.add_to_list": "Дадаць у спіс",
+  "lists.add_to_lists": "Дадаць {name} у спісы",
   "lists.create": "Стварыць",
+  "lists.create_a_list_to_organize": "Стварыце новы спіс, каб арганізаваць сваю Галоўную старонку",
   "lists.create_list": "Стварыць спіс",
   "lists.delete": "Выдаліць спіс",
+  "lists.done": "Гатова",
   "lists.edit": "Рэдагаваць спіс",
+  "lists.exclusive": "Схаваць карыстальнікаў на Галоўнай старонцы",
+  "lists.exclusive_hint": "Калі ў гэтым спісе нехта ёсць, схавайце яго на сваёй Галоўнай старонцы, каб не бачыць яго допісы двойчы.",
+  "lists.find_users_to_add": "Знайсці карыстальнікаў, каб дадаць",
+  "lists.list_members_count": "{count, plural,one {# карыстальнік}other {# карыстальнікі}}",
+  "lists.list_name": "Назва спіса",
+  "lists.new_list_name": "Назва новага спіса",
+  "lists.no_lists_yet": "Пакуль няма спісаў.",
+  "lists.no_members_yet": "Пакуль няма ўдзельнікаў.",
+  "lists.no_results_found": "Нічога не знойдзена.",
   "lists.remove_member": "Выдаліць",
-  "lists.replies_policy.followed": "Любы карыстальнік, на якога вы падпісаліся",
+  "lists.replies_policy.followed": "Любы карыстальнік, на якога Вы падпісаліся",
   "lists.replies_policy.list": "Удзельнікі гэтага спісу",
   "lists.replies_policy.none": "Нікога",
   "lists.save": "Захаваць",
   "lists.search": "Пошук",
+  "lists.show_replies_to": "Уключыць адказы ад карыстальнікаў са спіса",
   "load_pending": "{count, plural, one {# новы элемент} few {# новыя элементы} many {# новых элементаў} other {# новых элементаў}}",
-  "loading_indicator.label": "Загрузка…",
+  "loading_indicator.label": "Ідзе загрузка…",
   "media_gallery.hide": "Схаваць",
-  "moved_to_account_banner.text": "Ваш уліковы запіс {disabledAccount} зараз адключаны таму што вы перанесены на {movedToAccount}.",
+  "moved_to_account_banner.text": "Ваш уліковы запіс {disabledAccount} зараз адключаны, таму што Вы перайшлі на {movedToAccount}.",
   "mute_modal.hide_from_notifications": "Схаваць з апавяшчэнняў",
   "mute_modal.hide_options": "Схаваць опцыі",
   "mute_modal.indefinite": "Пакуль я не прыбяру ігнараванне",
   "mute_modal.show_options": "Паказаць опцыі",
-  "mute_modal.they_can_mention_and_follow": "Карыстальнік зможа згадваць вас і падпісацца на вас, але вы гэтага не ўбачыце.",
+  "mute_modal.they_can_mention_and_follow": "Карыстальнік зможа згадваць Вас і падпісацца на Вас, але Вы гэтага не ўбачыце.",
   "mute_modal.they_wont_know": "Карыстальнік не будзе ведаць пра ігнараванне.",
   "mute_modal.title": "Ігнараваць карыстальніка?",
   "mute_modal.you_wont_see_mentions": "Вы не ўбачыце паведамленняў са згадваннем карыстальніка.",
-  "mute_modal.you_wont_see_posts": "Карыстальнік па-ранейшаму будзе бачыць вашыя паведамленні, але вы не будзеце паведамленні карыстальніка.",
+  "mute_modal.you_wont_see_posts": "Карыстальнік па-ранейшаму будзе бачыць Вашыя допісы, але Вы не будзеце бачыць ягоныя.",
   "navigation_bar.about": "Пра нас",
+  "navigation_bar.account_settings": "Пароль і бяспека",
+  "navigation_bar.administration": "Адміністрацыя",
   "navigation_bar.advanced_interface": "Адкрыць у пашыраным вэб-інтэрфейсе",
+  "navigation_bar.automated_deletion": "Аўтаматычнае выдаленне допісаў",
   "navigation_bar.blocks": "Заблакіраваныя карыстальнікі",
   "navigation_bar.bookmarks": "Закладкі",
-  "navigation_bar.direct": "Асабістыя згадванні",
+  "navigation_bar.direct": "Прыватныя згадванні",
   "navigation_bar.domain_blocks": "Заблакіраваныя дамены",
   "navigation_bar.favourites": "Упадабанае",
   "navigation_bar.filters": "Ігнараваныя словы",
   "navigation_bar.follow_requests": "Запыты на падпіску",
   "navigation_bar.followed_tags": "Падпіскі",
   "navigation_bar.follows_and_followers": "Падпіскі і падпісчыкі",
+  "navigation_bar.import_export": "Імпарт і экспарт",
   "navigation_bar.lists": "Спісы",
+  "navigation_bar.live_feed_local": "Жывая стужка (лакальная)",
+  "navigation_bar.live_feed_public": "Жывая стужка (публічная)",
   "navigation_bar.logout": "Выйсці",
   "navigation_bar.moderation": "Мадэрацыя",
+  "navigation_bar.more": "Больш",
   "navigation_bar.mutes": "Ігнараваныя карыстальнікі",
   "navigation_bar.opened_in_classic_interface": "Допісы, уліковыя запісы і іншыя спецыфічныя старонкі па змоўчанні адчыняюцца ў класічным вэб-інтэрфейсе.",
   "navigation_bar.preferences": "Налады",
+  "navigation_bar.privacy_and_reach": "Прыватнасць і пошук",
   "navigation_bar.search": "Пошук",
+  "navigation_bar.search_trends": "Пошук / Трэндавае",
+  "navigation_panel.collapse_followed_tags": "Згарнуць меню падпісак на хэштэгі",
+  "navigation_panel.collapse_lists": "Згарнуць меню спісаў",
+  "navigation_panel.expand_followed_tags": "Разгарнуць меню падпісак на хэштэгі",
+  "navigation_panel.expand_lists": "Разгарнуць меню спіса",
   "not_signed_in_indicator.not_signed_in": "Вам трэба ўвайсці каб атрымаць доступ да гэтага рэсурсу.",
-  "notification.admin.report": "{name} паскардзіўся на {target}",
-  "notification.admin.report_account": "{name} паскардзіўся на {count, plural, one {# допіс} many {# допісаў} other {# допіса}} ад {target} з прычыны {category}",
-  "notification.admin.report_account_other": "{name} паскардзіўся на {count, plural, one {# допіс} many {# допісаў} other {# допіса}} ад {target}",
-  "notification.admin.report_statuses": "{name} паскардзіўся на {target} з прычыны {category}",
-  "notification.admin.report_statuses_other": "{name} паскардзіўся на {target}",
-  "notification.admin.sign_up": "{name} зарэгістраваўся",
-  "notification.favourite": "Ваш допіс упадабаны {name}",
-  "notification.follow": "{name} падпісаўся на вас",
-  "notification.follow_request": "{name} адправіў запыт на падпіску",
+  "notification.admin.report": "{name} паскардзіўся(-лась) на {target}",
+  "notification.admin.report_account": "{name} паскардзіўся(-лась) на {count, plural, one {# допіс} many {# допісаў} other {# допіса}} ад {target} з прычыны {category}",
+  "notification.admin.report_account_other": "{name} паскардзіўся(-лась) на {count, plural, one {# допіс} many {# допісаў} other {# допіса}} ад {target}",
+  "notification.admin.report_statuses": "{name} паскардзіўся(-лась) на {target} з прычыны {category}",
+  "notification.admin.report_statuses_other": "{name} паскардзіўся(-лась) на {target}",
+  "notification.admin.sign_up": "{name} зарэгістраваўся(-лась)",
+  "notification.admin.sign_up.name_and_others": "{name} і {count, plural, one {# іншы(-ая)} other {# іншых}} зарэгістраваліся",
+  "notification.annual_report.message": "Вас чакае Ваш #Wrapstodon нумар {year}! Падзяліцеся сваімі галоўнымі падзеямі і запамінальнымі момантамі ў Mastodon!",
+  "notification.annual_report.view": "Перайсці да #Wrapstodon",
+  "notification.favourite": "{name} упадабаў(-ла) Ваш допіс",
+  "notification.favourite.name_and_others_with_link": "{name} і <a>{count, plural, one {# іншы(-ая)} other {# іншыя}}</a> ўпадабалі Ваш допіс",
+  "notification.favourite_pm": "{name} упадабаў(-ла) Вашае прыватнае згадванне",
+  "notification.favourite_pm.name_and_others_with_link": "{name} і <a>{count, plural, one {# іншы(-ая)} few {# іншыя} many {# іншых} other {# іншых}}</a> ўпадабалі ваша асабістае згадванне",
+  "notification.follow": "{name} падпісаўся(-лась) на Вас",
+  "notification.follow.name_and_others": "{name} і <a>{count, plural, one {# іншы(-ая)} other {# іншыя}}</a> падпісаліся на Вас",
+  "notification.follow_request": "{name} адправіў(-ла) запыт на падпіску",
   "notification.follow_request.name_and_others": "{name} і {count, plural, one {# іншы} many {# іншых} other {# іншых}} запыталіся падпісацца на вас",
   "notification.label.mention": "Згадванне",
   "notification.label.private_mention": "Асабістае згадванне",
   "notification.label.private_reply": "Асабісты адказ",
+  "notification.label.quote": "{name} цытаваў(-ла) Ваш допіс",
   "notification.label.reply": "Адказ",
   "notification.mention": "Згадванне",
-  "notification.mentioned_you": "{name} згадаў вас",
+  "notification.mentioned_you": "{name} згадаў(-ла) Вас",
   "notification.moderation-warning.learn_more": "Даведацца больш",
-  "notification.moderation_warning": "Вы атрымалі папярэджанне аб мадэрацыі",
-  "notification.moderation_warning.action_delete_statuses": "Некаторыя вашыя допісы былі выдаленыя.",
+  "notification.moderation_warning": "Вы атрымалі папярэджанне ад мадэратараў",
+  "notification.moderation_warning.action_delete_statuses": "Некаторыя Вашыя допісы былі выдаленыя.",
   "notification.moderation_warning.action_disable": "Ваш уліковы запіс быў адключаны.",
   "notification.moderation_warning.action_mark_statuses_as_sensitive": "Некаторыя з вашых допісаў былі пазначаныя як далікатныя.",
   "notification.moderation_warning.action_none": "Ваш уліковы запіс атрымаў папярэджанне ад мадэратараў.",
   "notification.moderation_warning.action_sensitive": "З гэтага моманту вашыя допісы будуць пазначаныя як далікатныя.",
   "notification.moderation_warning.action_silence": "Ваш уліковы запіс быў абмежаваны.",
-  "notification.moderation_warning.action_suspend": "Ваш уліковы запіс быў прыпынены.",
+  "notification.moderation_warning.action_suspend": "Ваш уліковы запіс быў заблакіраваны.",
   "notification.own_poll": "Ваша апытанне скончылася",
-  "notification.poll": "Апытанне, дзе вы прынялі ўдзел, скончылася",
-  "notification.reblog": "{name} пашырыў ваш допіс",
-  "notification.reblog.name_and_others_with_link": "{name} і <a>{count, plural, one {# іншы} many {# іншых} other {# іншых}}</a> абагулілі ваш допіс",
+  "notification.poll": "Апытанне, дзе Вы прынялі ўдзел, скончылася",
+  "notification.quoted_update": "{name} адрэдагаваў(-ла) допіс, які Вы цытавалі",
+  "notification.reblog": "{name} пашырыў(-ла) Ваш допіс",
+  "notification.reblog.name_and_others_with_link": "{name} і <a>{count, plural, one {# іншы(-ая)} many {# іншых} other {# іншых}}</a> пашырылі Ваш допіс",
   "notification.relationships_severance_event": "Страціў сувязь з {name}",
-  "notification.relationships_severance_event.account_suspension": "Адміністратар з {from} прыпыніў працу {target}, што азначае, што вы больш не можаце атрымліваць ад іх абнаўлення ці ўзаемадзейнічаць з імі.",
+  "notification.relationships_severance_event.account_suspension": "Адміністратар з {from} прыпыніў працу ўліковага запісу {target}, што азначае, што Вы больш не можаце атрымліваць ад іх абнаўленні ці ўзаемадзейнічаць з імі.",
   "notification.relationships_severance_event.domain_block": "Адміністратар з {from} заблакіраваў {target}, у тым ліку {followersCount} вашых падпісчыка(-аў) і {followingCount, plural, one {# уліковы запіс} few {# уліковыя запісы} many {# уліковых запісаў} other {# уліковых запісаў}}.",
   "notification.relationships_severance_event.learn_more": "Даведацца больш",
-  "notification.relationships_severance_event.user_domain_block": "Вы заблакіравалі {target} выдаліўшы {followersCount} сваіх падпісчыкаў і {followingCount, plural, one {# уліковы запіс} few {# уліковыя запісы} many {# уліковых запісаў} other {# уліковых запісаў}}, за якімі вы сочыце.",
+  "notification.relationships_severance_event.user_domain_block": "Вы заблакіравалі {target} выдаліўшы {followersCount} сваіх падпісчыкаў і {followingCount, plural, one {# уліковы запіс} few {# уліковыя запісы} many {# уліковых запісаў} other {# уліковых запісаў}}, за якімі Вы сочыце.",
   "notification.status": "Новы допіс ад {name}",
   "notification.update": "Допіс {name} адрэдагаваны",
   "notification_requests.accept": "Прыняць",
+  "notification_requests.accept_multiple": "{count, plural,one {Прыняць # запыт…} other {Прыняць # запытаў…}}",
+  "notification_requests.confirm_accept_multiple.button": "{count, plural,one {Прыняць запыт} other {Прыняць запыты}}",
+  "notification_requests.confirm_accept_multiple.message": "Вы збіраецеся прыняць {count, plural, one {адзін запыт на апавяшчэнне} other {# запытаў на апавяшчэнне}}. Упэўненыя, што хочаце працягнуць?",
   "notification_requests.confirm_accept_multiple.title": "Прыняць запыты на апавяшчэнні?",
+  "notification_requests.confirm_dismiss_multiple.button": "{count, plural,one {Адмовіцца ад запыту} other {Адмовіцца ад запытаў}}",
+  "notification_requests.confirm_dismiss_multiple.message": "Вы збіраецеся адмовіцца ад {count, plural, one {аднаго запыту на апавяшчэнне} other {# запытаў на апавяшчэнне}}. Вы не зможаце зноў лёгка атрымаць доступ да {count, plural, one {яго} other {іх}}. Упэўненыя, што хочаце працягнуць?",
   "notification_requests.confirm_dismiss_multiple.title": "Адхіліць запыты на апавяшчэнні?",
   "notification_requests.dismiss": "Адхіліць",
+  "notification_requests.dismiss_multiple": "{count, plural,one {Адмовіцца ад запыту…} other {Адмовіцца ад запытаў…}}",
   "notification_requests.edit_selection": "Рэдагаваць",
   "notification_requests.exit_selection": "Гатова",
+  "notification_requests.explainer_for_limited_account": "Апавяшчэнне з гэтага ўліковага запісу было адфільтраванае, бо гэты ўліковы запіс абмежаваў мадэратар.",
+  "notification_requests.explainer_for_limited_remote_account": "Апавяшчэнні з гэтага ўліковага запісу былі адфільтраваныя, бо гэты ўліковы запіс абмежаваў мадэратар.",
   "notification_requests.maximize": "Разгарнуць",
   "notification_requests.minimize_banner": "Згарнуць банер адфільтраваных апавяшчэнняў",
   "notification_requests.notifications_from": "Апавяшчэнні ад {name}",
   "notification_requests.title": "Адфільтраваныя апавяшчэнні",
   "notification_requests.view": "Прагляд апавяшчэнняў",
   "notifications.clear": "Ачысціць апавяшчэнні",
-  "notifications.clear_confirmation": "Вы ўпэўнены, што жадаеце назаўсёды сцерці ўсё паведамленні?",
+  "notifications.clear_confirmation": "Вы ўпэўнены, што хочаце назаўсёды сцерці ўсе свае паведамленні?",
   "notifications.clear_title": "Ачысціць апавяшчэнні?",
   "notifications.column_settings.admin.report": "Новыя скаргі:",
   "notifications.column_settings.admin.sign_up": "Новыя ўваходы:",
@@ -549,10 +665,11 @@
   "notifications.column_settings.filter_bar.category": "Панэль хуткай фільтрацыі",
   "notifications.column_settings.follow": "Новыя падпісчыкі:",
   "notifications.column_settings.follow_request": "Новыя запыты на падпіску:",
-  "notifications.column_settings.group": "Аб'яднаць апавяшчэнні ад падпісчыкаў",
+  "notifications.column_settings.group": "Аб’яднаць апавяшчэнні ад падпісчыкаў",
   "notifications.column_settings.mention": "Згадванні:",
   "notifications.column_settings.poll": "Вынікі апытання:",
   "notifications.column_settings.push": "Push-апавяшчэнні",
+  "notifications.column_settings.quote": "Цытаваныя допісы:",
   "notifications.column_settings.reblog": "Пашырэнні:",
   "notifications.column_settings.show": "Паказваць у слупку",
   "notifications.column_settings.sound": "Прайграваць гук",
@@ -566,46 +683,49 @@
   "notifications.filter.follows": "Падпісаны на",
   "notifications.filter.mentions": "Згадванні",
   "notifications.filter.polls": "Вынікі апытання",
-  "notifications.filter.statuses": "Навіны ад людзей, на якіх вы падпісаны",
+  "notifications.filter.statuses": "Навіны ад людзей, на якіх Вы падпісаныя",
   "notifications.grant_permission": "Дазволіць.",
   "notifications.group": "{count} Апавяшчэнняў",
   "notifications.mark_as_read": "Пазначыць усе апавяшчэнні як прачытаныя",
   "notifications.permission_denied": "Апавяшчэнні на працоўным стале недаступныя з-за папярэдне адхіленага запыта праў браўзера",
-  "notifications.permission_denied_alert": "Апавяшчэнні на працоўным стале не могуць быць уключаныя, з-за таго што запыт браўзера быў адхілены",
+  "notifications.permission_denied_alert": "З-за таго, што запыт браўзера быў раней адхілены, немагчыма ўключыць апавяшчэнні на працоўным стале",
   "notifications.permission_required": "Апавяшчэнні на працоўным стале недаступныя, з-за таго што неабходны дазвол не быў дадзены.",
   "notifications.policy.accept": "Прыняць",
   "notifications.policy.accept_hint": "Паказваць у апавяшчэннях",
   "notifications.policy.drop": "Iгнараваць",
+  "notifications.policy.drop_hint": "Адправіць у бездань, адкуль больш ніколі не ўбачыце",
   "notifications.policy.filter": "Фільтраваць",
-  "notifications.policy.filter_limited_accounts_title": "Абмежаваныя ўліковыя запісы",
+  "notifications.policy.filter_hint": "Адправіць у скрыню адфільтраваных апавяшчэнняў",
+  "notifications.policy.filter_limited_accounts_hint": "Абмежавана мадэратарамі сервера",
+  "notifications.policy.filter_limited_accounts_title": "Уліковыя запісы пад мадэрацыяй",
   "notifications.policy.filter_new_accounts.hint": "Створаныя на працягу {days, plural, one {апошняга # дня} few {апошніх # дзён} many {апошніх # дзён} other {апошняй # дня}}",
   "notifications.policy.filter_new_accounts_title": "Новыя ўліковыя запісы",
   "notifications.policy.filter_not_followers_hint": "Уключаючы людзей, якія падпісаны на вас менш, чым {days, plural, one {# дзень} few {# дні} many {# дзён} other {# дня}}",
   "notifications.policy.filter_not_followers_title": "Людзі, якія не падпісаны на вас",
   "notifications.policy.filter_not_following_hint": "Пакуль вы не пацвердзіце іх уручную",
-  "notifications.policy.filter_not_following_title": "Людзі, на якіх вы не падпісаны",
-  "notifications.policy.filter_private_mentions_hint": "Фільтруецца за выключэннем адказу на вашае згадванне ці калі вы падпісаны на адпраўніка",
-  "notifications.policy.filter_private_mentions_title": "Непажаданыя асаблівыя згадванні",
+  "notifications.policy.filter_not_following_title": "Людзі, на якіх Вы не падпісаныя",
+  "notifications.policy.filter_private_mentions_hint": "Фільтруецца, за выключэннем адказу на Вашае згадванне ці калі Вы падпісаныя на адпраўніка",
+  "notifications.policy.filter_private_mentions_title": "Непажаданыя прыватныя згадванні",
   "notifications.policy.title": "Наладзіць апавяшчэнні ад…",
   "notifications_permission_banner.enable": "Уключыць апавяшчэнні на працоўным стале",
   "notifications_permission_banner.how_to_control": "Каб атрымліваць апавяшчэнні, калі Mastodon не адкрыты, уключыце апавяшчэнні працоўнага стала. Вы зможаце дакладна кантраляваць, якія падзеі будуць ствараць апавяшчэнні з дапамогай {icon} кнопкі, як толькі яны будуць уключаны.",
   "notifications_permission_banner.title": "Не прапусціце нічога",
   "onboarding.follows.back": "Назад",
   "onboarding.follows.done": "Гатова",
-  "onboarding.follows.empty": "На жаль, зараз немагчыма паказаць вынікі. Вы можаце паспрабаваць выкарыстоўваць пошук і праглядзець старонку агляду, каб знайсці людзей, на якіх можна падпісацца, або паўтарыце спробу пазней.",
+  "onboarding.follows.empty": "На жаль, зараз немагчыма паказаць вынікі. Вы можаце паспрабаваць выкарыстоўваць пошук і праглядзець старонку агляду, каб знайсці людзей, на якіх можна падпісацца, або паўтарыць спробу пазней.",
   "onboarding.follows.search": "Пошук",
-  "onboarding.follows.title": "Падпішыцеся каб пачаць",
+  "onboarding.follows.title": "Падпішыцеся на некага, каб пачаць",
   "onboarding.profile.discoverable": "Зрабіць мой профіль бачным",
-  "onboarding.profile.discoverable_hint": "Калі вы звяртаецеся да адкрытасці на Mastodon, вашы паведамленні могуць з'яўляцца ў выніках пошуку і тэндэнцый, а ваш профіль можа быць прапанаваны людзям з такімі ж інтарэсамі.",
+  "onboarding.profile.discoverable_hint": "Калі Вы звяртаецеся да адкрытасці на Mastodon, Вашы допісы могуць з'яўляцца ў выніках пошуку і трэндах, а Ваш профіль можа быць прапанаваны людзям з такімі ж інтарэсамі.",
   "onboarding.profile.display_name": "Бачнае імя",
   "onboarding.profile.display_name_hint": "Ваша поўнае імя або ваш псеўданім…",
   "onboarding.profile.note": "Біяграфія",
-  "onboarding.profile.note_hint": "Вы можаце @згадаць іншых людзей або выкарыстоўваць #хэштэгі…",
+  "onboarding.profile.note_hint": "Вы можаце @згадваць іншых людзей або выкарыстоўваць #хэштэгі…",
   "onboarding.profile.save_and_continue": "Захаваць і працягнуць",
   "onboarding.profile.title": "Налады профілю",
   "onboarding.profile.upload_avatar": "Загрузіць фота профілю",
   "onboarding.profile.upload_header": "Загрузіць шапку профілю",
-  "password_confirmation.exceeds_maxlength": "Пароль пацьверджання перавышае максімальна дапушчальную даўжыню",
+  "password_confirmation.exceeds_maxlength": "Пароль пацвярджэння перавышае максімальна дапушчальную даўжыню",
   "password_confirmation.mismatching": "Пароль пацьверджання не супадае",
   "picture_in_picture.restore": "Вярніце назад",
   "poll.closed": "Закрыта",
@@ -620,19 +740,27 @@
   "poll_button.remove_poll": "Выдаліць апытанне",
   "privacy.change": "Змяніць прыватнасць допісу",
   "privacy.direct.long": "Усе згаданыя ў допісе",
+  "privacy.direct.short": "Асабістае згадванне",
   "privacy.private.long": "Толькі вашыя падпісчыкі",
   "privacy.private.short": "Падпісчыкі",
   "privacy.public.long": "Усе, хто ёсць і каго няма ў Mastodon",
   "privacy.public.short": "Публічны",
-  "privacy.unlisted.additional": "Паводзіць сябе гэтак жа, як і публічны, за выключэннем таго, што пост не будзе адлюстроўвацца ў жывой стужцы, хэштэгах, аглядзе або ў пошуку Mastodon, нават калі вы ўключылі бачнасць у пошуку ў наладах.",
-  "privacy.unlisted.long": "Менш фанфар ад алгарытмаў",
+  "privacy.quote.anyone": "{visibility}, усе могуць цытаваць",
+  "privacy.quote.disabled": "{visibility}, цытаты адключаныя",
+  "privacy.quote.limited": "{visibility}, абмежаваныя цытаты",
+  "privacy.unlisted.additional": "Паводзіць сябе гэтак жа, як і публічны, за выключэннем таго, што допіс не будзе адлюстроўвацца ў жывой стужцы, хэштэгах, аглядзе або ў пошуку Mastodon, нават калі Вы ўключылі бачнасць у пошуку ў наладах.",
+  "privacy.unlisted.long": "Схаваны ад вынікаў пошуку Mastodon, трэндавага і публічных стужак",
   "privacy.unlisted.short": "Ціхі публічны",
   "privacy_policy.last_updated": "Адноўлена {date}",
   "privacy_policy.title": "Палітыка канфідэнцыйнасці",
-  "recommended": "Рэкамендуем",
+  "quote_error.poll": "Нельга цытаваць з апытаннямі.",
+  "quote_error.quote": "За раз дазволена рабіць толькі адну цытату.",
+  "quote_error.unauthorized": "Вы не ўвайшлі, каб цытаваць гэты допіс.",
+  "quote_error.upload": "Нельга цытаваць з медыя далучэннямі.",
+  "recommended": "Рэкамендаванае",
   "refresh": "Абнавiць",
-  "regeneration_indicator.please_stand_by": "Калі ласка, пачакайце.",
-  "regeneration_indicator.preparing_your_home_feed": "Рыхтуем вашую стужку…",
+  "regeneration_indicator.please_stand_by": "Пачакайце.",
+  "regeneration_indicator.preparing_your_home_feed": "Рыхтуем вашу галоўную стужку…",
   "relative_time.days": "{number} д",
   "relative_time.full.days": "{number, plural, one {# дзень} few {# дні} many {# дзён} other {# дня}} таму",
   "relative_time.full.hours": "{number, plural, one {# гадзіна} few {# гадзіны} many {# гадзін} other {# гадзіны}} таму",
@@ -644,12 +772,15 @@
   "relative_time.minutes": "{number} хв",
   "relative_time.seconds": "{number} с",
   "relative_time.today": "сёння",
+  "remove_quote_hint.button_label": "Зразумела",
+  "remove_quote_hint.message": "Можаце зрабіце гэта ў {icon} меню налад.",
+  "remove_quote_hint.title": "Хочаце выдаліць Ваш допіс з цытатай?",
   "reply_indicator.attachments": "{count, plural, one {# далучэнне} few {# далучэнні} many {# далучэнняў} other {# далучэння}}",
   "reply_indicator.cancel": "Скасаваць",
   "reply_indicator.poll": "Апытанне",
   "report.block": "Заблакіраваць",
-  "report.block_explanation": "Вы перастанеце бачыць допісы гэтага карыстальніка. Ён не зможа сачыць за вамі і бачыць вашы допісы. Ён зможа зразумець, што яго заблакіравалі.",
-  "report.categories.legal": "Права",
+  "report.block_explanation": "Вы перастанеце бачыць допісы гэтага карыстальніка. Ён не зможа сачыць за Вамі і бачыць Вашы допісы. Ён зможа зразумець, што яго заблакіравалі.",
+  "report.categories.legal": "Звязанае з правам",
   "report.categories.other": "Іншае",
   "report.categories.spam": "Спам",
   "report.categories.violation": "Змест парушае адно ці некалькі правілаў сервера",
@@ -662,9 +793,9 @@
   "report.forward": "Пераслаць на {target}",
   "report.forward_hint": "Гэты ўліковы запіс з іншага сервера. Даслаць ананімную копію скаргі і туды?",
   "report.mute": "Ігнараваць",
-  "report.mute_explanation": "Вы не будзеце бачыць допісы гэтага карыстальніка. Ён усё яшчэ зможа сачыць за вамі і бачыць вашы допісы, не ведаючы, што яго ігнаруюць.",
+  "report.mute_explanation": "Вы не будзеце бачыць допісы гэтага карыстальніка. Ён усё яшчэ зможа сачыць за Вамі і бачыць Вашы допісы, не ведаючы, што яго ігнаруюць.",
   "report.next": "Далей",
-  "report.placeholder": "Дадатковы каментар",
+  "report.placeholder": "Дадатковыя каментарыі",
   "report.reasons.dislike": "Мне ён не падабаецца",
   "report.reasons.dislike_description": "Гэта тое, што Вы не хочаце бачыць",
   "report.reasons.legal": "Гэта незаконна",
@@ -681,9 +812,9 @@
   "report.statuses.title": "Ці ёсць допісы, каб падмацаваць гэтую скаргу?",
   "report.submit": "Адправіць",
   "report.target": "Скарга на {target}",
-  "report.thanks.take_action": "Вось вашыя варыянты кантролю над тым, што вы бачыце в Mastodon:",
-  "report.thanks.take_action_actionable": "Пакуль мы разглядаем яе, вы можаце распачаць дзеянні супраць @{name}:",
-  "report.thanks.title": "Ці хочаце вы бачыць гэта?",
+  "report.thanks.take_action": "Вось Вашыя варыянты кантролю над тым, што Вы бачыце в Mastodon:",
+  "report.thanks.take_action_actionable": "Пакуль мы разглядаем яе, Вы можаце распачаць дзеянні супраць @{name}:",
+  "report.thanks.title": "Ці хочаце Вы бачыць гэта?",
   "report.thanks.title_actionable": "Дзякуем за зварот, мы разбяромся з гэтым.",
   "report.unfollow": "Адпісацца ад @{name}",
   "report.unfollow_explanation": "Вы падпісаныя на гэты ўліковы запіс. Каб не бачыць допісы з яго ў вашай стужцы, адпішыцеся.",
@@ -697,6 +828,7 @@
   "report_notification.categories.violation": "Парушэнне правілаў",
   "report_notification.categories.violation_sentence": "парушэнне правілаў",
   "report_notification.open": "Адкрыць скаргу",
+  "search.clear": "Ачысціць пошук",
   "search.no_recent_searches": "Гісторыя пошуку пустая",
   "search.placeholder": "Пошук",
   "search.quick_action.account_search": "Супадзенне профіляў {x}",
@@ -716,31 +848,41 @@
   "search_results.accounts": "Профілі",
   "search_results.all": "Усё",
   "search_results.hashtags": "Хэштэгі",
-  "search_results.no_results": "Анічога ня знойдзена.",
-  "search_results.no_search_yet": "Паспрабуйце пашукаць допісы, профілі або гэштаґі.",
+  "search_results.no_results": "Няма вынікаў.",
+  "search_results.no_search_yet": "Паспрабуйце пашукаць допісы, профілі або хэштэгі.",
   "search_results.see_all": "Праглядзець усе",
   "search_results.statuses": "Допісы",
   "search_results.title": "Шукаць \"{q}\"",
-  "server_banner.about_active_users": "Людзі, якія карыстаюцца гэтым сервера на працягу апошніх 30 дзён (Штомесячна Актыўныя Карыстальнікі)",
+  "server_banner.about_active_users": "Людзі, якія карысталіся гэтым серверам на працягу апошніх 30 дзён (штомесячна актыўныя карыстальнікі)",
   "server_banner.active_users": "актыўныя карыстальнікі",
   "server_banner.administered_by": "Адміністратар:",
-  "server_banner.is_one_of_many": "{domain} - гэта адзін з многіх незалежных сервераў Mastodon, якія вы можаце выкарыстоўваць для ўдзелу ў fediverse.",
+  "server_banner.is_one_of_many": "{domain} - гэта адзін з многіх незалежных сервераў Mastodon, які Вы можаце выкарыстоўваць для ўдзелу ў федэральным сусвеце.",
   "server_banner.server_stats": "Статыстыка сервера:",
   "sign_in_banner.create_account": "Стварыць уліковы запіс",
-  "sign_in_banner.follow_anyone": "Сачыце за кім заўгодна ва ўсім fediverse і глядзіце ўсё ў храналагічным парадку. Ніякіх алгарытмаў, рэкламы або клікбэйту.",
-  "sign_in_banner.mastodon_is": "Mastodon - лепшы спосаб быць у курсе ўсяго, што адбываецца.",
+  "sign_in_banner.follow_anyone": "Падпісвайцеся на каго захочаце ва ўсім федэральным сусвеце і глядзіце ўсё ў храналагічным парадку. Ніякіх алгарытмаў, рэкламы або клікбэйту.",
+  "sign_in_banner.mastodon_is": "Mastodon - найлепшы спосаб быць у курсе ўсяго, што адбываецца.",
   "sign_in_banner.sign_in": "Увайсці",
   "sign_in_banner.sso_redirect": "Уваход ці рэгістрацыя",
   "status.admin_account": "Адкрыць інтэрфейс мадэратара для @{name}",
   "status.admin_domain": "Адкрыць інтэрфейс мадэратара для {domain}",
   "status.admin_status": "Адкрыць гэты допіс у інтэрфейсе мадэрацыі",
-  "status.block": "Заблакаваць @{name}",
+  "status.all_disabled": "Пашырэнні і цытаванні адключаны",
+  "status.block": "Заблакіраваць @{name}",
   "status.bookmark": "Дадаць закладку",
   "status.cancel_reblog_private": "Прыбраць",
-  "status.cannot_reblog": "Гэты пост нельга пашырыць",
-  "status.continued_thread": "Працяг тэмы",
+  "status.cannot_quote": "Вы не маеце дазвол цытаваць гэты допіс",
+  "status.cannot_reblog": "Гэты допіс нельга пашырыць",
+  "status.contains_quote": "Утрымлівае цытату",
+  "status.context.loading": "Загружаюцца іншыя адказы",
+  "status.context.loading_error": "Немагчыма загрузіць новыя адказы",
+  "status.context.loading_success": "Усе адказы загружаныя",
+  "status.context.more_replies_found": "Знойдзеныя іншыя адказы",
+  "status.context.retry": "Паспрабаваць зноў",
+  "status.context.show": "Паказаць",
+  "status.continued_thread": "Працяг ланцужка",
   "status.copy": "Скапіраваць спасылку на допіс",
   "status.delete": "Выдаліць",
+  "status.delete.success": "Допіс быў выдалены",
   "status.detailed_status": "Дэтальны агляд размовы",
   "status.direct": "Згадаць асабіста @{name}",
   "status.direct_indicator": "Асабістае згадванне",
@@ -749,7 +891,7 @@
   "status.edited_x_times": "Рэдагавана {count, plural, one {{count} раз} few {{count} разы} many {{count} разоў} other {{count} разу}}",
   "status.embed": "Атрымаць убудаваны код",
   "status.favourite": "Упадабанае",
-  "status.favourites": "{count, plural, one {# упадабанае} few {# упадабаныя} many {# упадабаных} other {# упадабанага}}",
+  "status.favourites": "{count, plural, one {упадабанне} few {упадабанні} other {упадабанняў}}",
   "status.filter": "Фільтраваць гэты допіс",
   "status.history.created": "Створана {name} {date}",
   "status.history.edited": "Адрэдагавана {name} {date}",
@@ -763,19 +905,43 @@
   "status.mute_conversation": "Ігнараваць размову",
   "status.open": "Разгарнуць гэты допіс",
   "status.pin": "Замацаваць у профілі",
+  "status.quote": "Цытаваць",
+  "status.quote.cancel": "Адмяніць цытаванне",
+  "status.quote_error.filtered": "Схавана адным з Вашых фільтраў",
+  "status.quote_error.limited_account_hint.action": "Усё адно паказаць",
+  "status.quote_error.limited_account_hint.title": "Гэты ўліковы запіс быў схаваны мадэратарамі {domain}.",
+  "status.quote_error.not_available": "Допіс недаступны",
+  "status.quote_error.pending_approval": "Допіс чакае пацвярджэння",
+  "status.quote_error.pending_approval_popout.body": "У Mastodon можна кантраляваць магчымасць іншых цытаваць Вас. Гэты допіс будзе знаходзіцца ў стане чакання, пакуль мы не атрымаем ухваленне на цытаванне ад аўтара арыгінальнага допісу.",
+  "status.quote_error.revoked": "Аўтар выдаліў допіс",
+  "status.quote_followers_only": "Толькі падпісчыкі могуць цытаваць гэты допіс",
+  "status.quote_manual_review": "Аўтар зробіць агляд уручную",
+  "status.quote_noun": "Цытаваць",
+  "status.quote_policy_change": "Змяніць, хто можа цытаваць",
+  "status.quote_post_author": "Цытаваў допіс @{name}",
+  "status.quote_private": "Прыватныя допісы нельга цытаваць",
+  "status.quotes": "{count, plural,one {цытата} few {цытаты} other {цытат}}",
+  "status.quotes.empty": "Яшчэ ніхто не цытаваў гэты допіс. Калі гэта адбудзецца, то Вы пабачыце гэта тут.",
+  "status.quotes.local_other_disclaimer": "Цытаты, у якіх адмовіў аўтар, паказаныя не будуць.",
+  "status.quotes.remote_other_disclaimer": "Толькі цытаты з {domain} тут будуць гарантавана паказаныя. Цытаты, у якіх адмовіў аўтар, паказаныя не будуць.",
   "status.read_more": "Чытаць болей",
   "status.reblog": "Пашырыць",
-  "status.reblog_private": "Пашырыць з першапачатковай бачнасцю",
+  "status.reblog_or_quote": "Пашырыць ці цытаваць",
+  "status.reblog_private": "Зноў падзяліцца са сваімі падпісчыкамі",
   "status.reblogged_by": "{name} пашырыў(-ла)",
-  "status.reblogs": "{count, plural, one {# пашырэнне} few {# пашырэнні} many {# пашырэнняў} other {# пашырэння}}",
+  "status.reblogs": "{count, plural, one {пашырэнне} few {пашырэнні} many {пашырэнняў} other {пашырэння}}",
   "status.reblogs.empty": "Гэты допіс яшчэ ніхто не пашырыў. Калі гэта адбудзецца, гэтых людзей будзе бачна тут.",
-  "status.redraft": "Выдаліць і паправіць",
+  "status.redraft": "Выдаліць і перапісаць",
   "status.remove_bookmark": "Выдаліць закладку",
-  "status.replied_in_thread": "Адказаў у тэме",
-  "status.replied_to": "Адказаў {name}",
+  "status.remove_favourite": "Выдаліць з упадабаных",
+  "status.remove_quote": "Выдаліць",
+  "status.replied_in_thread": "Адказаў(-ла) у ланцужку",
+  "status.replied_to": "Адказаў(-ла) {name}",
   "status.reply": "Адказаць",
   "status.replyAll": "Адказаць у ланцугу",
   "status.report": "Паскардзіцца на @{name}",
+  "status.request_quote": "Даслаць запыт на цытаванне",
+  "status.revoke_quote": "Выдаліць мой допіс з допісу @{name}",
   "status.sensitive_warning": "Уражвальны змест",
   "status.share": "Абагуліць",
   "status.show_less_all": "Згарнуць усё",
@@ -791,8 +957,13 @@
   "subscribed_languages.save": "Захаваць змены",
   "subscribed_languages.target": "Змяніць мовы падпіскі для {target}",
   "tabs_bar.home": "Галоўная",
+  "tabs_bar.menu": "Меню",
   "tabs_bar.notifications": "Апавяшчэнні",
-  "terms_of_service.title": "Умовы абслугоўваньня",
+  "tabs_bar.publish": "Новы допіс",
+  "tabs_bar.search": "Пошук",
+  "terms_of_service.effective_as_of": "Дзейнічае да {date}",
+  "terms_of_service.title": "Умовы выкарыстання",
+  "terms_of_service.upcoming_changes_on": "Змены, якія адбудуцца {date}",
   "time_remaining.days": "{number, plural, one {застаўся # дзень} few {засталося # дні} many {засталося # дзён} other {засталося # дня}}",
   "time_remaining.hours": "{number, plural, one {засталася # гадзіна} few {засталося # гадзіны} many {засталося # гадзін} other {засталося # гадзіны}}",
   "time_remaining.minutes": "{number, plural, one {засталася # хвіліна} few {засталося # хвіліны} many {засталося # хвілін} other {засталося # хвіліны}}",
@@ -800,7 +971,7 @@
   "time_remaining.seconds": "{number, plural, one {засталася # секунда} few {засталося # секунды} many {засталося # секунд} other {засталося # секунды}}",
   "trends.counter_by_accounts": "{count, plural, one {{counter} чалавек} few {{counter} чалавекі} many {{counter} людзей} other {{counter} чалавек}} за {days, plural, one {{days} апошні дзень} few {{days} апошнія дні} many {{days} апошніх дзён} other {{days} апошніх дзён}}",
   "trends.trending_now": "Актуальнае",
-  "ui.beforeunload": "Ваш чарнавік знішчыцца калі вы пакінеце Mastodon.",
+  "ui.beforeunload": "Ваш чарнавік будзе страчаны, калі Вы пакінеце Mastodon.",
   "units.short.billion": "{count} млрд.",
   "units.short.million": "{count} міл.",
   "units.short.thousand": "{count} тыс.",
@@ -808,6 +979,12 @@
   "upload_button.label": "Дадаць выяву, відэа- ці аўдыяфайл",
   "upload_error.limit": "Перавышана колькасць файлаў.",
   "upload_error.poll": "Немагчыма прымацаваць файл да апытання.",
+  "upload_error.quote": "Нельга запампоўваць файл пры цытаванні.",
+  "upload_form.drag_and_drop.instructions": "Каб абраць медыя ўлажэнне, націсніце прабел ці Enter. Падчас перасоўвання выкарыстоўвайце кнопкі са стрэлкамі, каб пасунуць медыя далучэнне ў любым напрамку. Націсніце прабел ці Enter зноў, каб перасунуць медыя далучэнне ў новае месца, або Escape для адмены.",
+  "upload_form.drag_and_drop.on_drag_cancel": "Перасоўванне адмененае. Медыя ўлажэнне {item} на месцы.",
+  "upload_form.drag_and_drop.on_drag_end": "Медыя ўлажэнне {item} на месцы.",
+  "upload_form.drag_and_drop.on_drag_over": "Медыя ўлажэнне {item} перасунутае.",
+  "upload_form.drag_and_drop.on_drag_start": "Абранае медыя ўлажэнне {item}.",
   "upload_form.edit": "Рэдагаваць",
   "upload_progress.label": "Запампоўванне...",
   "upload_progress.processing": "Апрацоўка…",
@@ -818,6 +995,26 @@
   "video.expand": "Разгарнуць відэа",
   "video.fullscreen": "Увесь экран",
   "video.hide": "Схаваць відэа",
+  "video.mute": "Выключыць гук",
   "video.pause": "Паўза",
-  "video.play": "Прайграць"
+  "video.play": "Прайграць",
+  "video.skip_backward": "Праматаць назад",
+  "video.skip_forward": "Праматаць уперад",
+  "video.unmute": "Уключыць гук",
+  "video.volume_down": "Паменшыць гучнасць",
+  "video.volume_up": "Павялічыць гучнасць",
+  "visibility_modal.button_title": "Вызначыць бачнасць",
+  "visibility_modal.header": "Бачнасць і ўзаемадзеянне",
+  "visibility_modal.helper.direct_quoting": "Прыватныя згадванні, створаныя на Mastodon, нельга цытаваць іншым людзям.",
+  "visibility_modal.helper.privacy_editing": "Бачнасць нельга змяніць у апублікаваным допісе.",
+  "visibility_modal.helper.privacy_private_self_quote": "Самацытаванне прыватных допісаў не можа быць публічным.",
+  "visibility_modal.helper.private_quoting": "Допісы для падпісчыкаў, створаныя на Mastodon, нельга цытаваць іншым людзям.",
+  "visibility_modal.helper.unlisted_quoting": "Калі людзі працытуюць Вас, іх допіс таксама будзе схаваны ад стужкі трэндаў.",
+  "visibility_modal.instructions": "Кантралюйце, хто можа ўзаемадзейнічаць з гэтым допісам. Вы таксама можаце ўжыць налады для ўсіх будучых допісаў, перайшоўшы ў <link>Налады > Публікаваць па змаўчанні </link>.",
+  "visibility_modal.privacy_label": "Бачнасць",
+  "visibility_modal.quote_followers": "Толькі падпісчыкі",
+  "visibility_modal.quote_label": "Хто можа цытаваць",
+  "visibility_modal.quote_nobody": "Толькі я",
+  "visibility_modal.quote_public": "Усе",
+  "visibility_modal.save": "Захаваць"
 }
diff --git a/app/javascript/mastodon/locales/bg.json b/app/javascript/mastodon/locales/bg.json
index 80d881c2f12..60256398848 100644
--- a/app/javascript/mastodon/locales/bg.json
+++ b/app/javascript/mastodon/locales/bg.json
@@ -1,6 +1,7 @@
 {
   "about.blocks": "Модерирани сървъри",
   "about.contact": "За контакти:",
+  "about.default_locale": "По подразбиране",
   "about.disclaimer": "Mastodon е безплатен софтуер с отворен изходен код и търговска марка на Mastodon gGmbH.",
   "about.domain_blocks.no_reason_available": "Няма налична причина",
   "about.domain_blocks.preamble": "Mastodon обикновено позволява да разглеждате съдържание и да взаимодействате с други потребители от всякакви сървъри във Федивселената. Има изключения, направени конкретно за този сървър.",
@@ -8,6 +9,7 @@
   "about.domain_blocks.silenced.title": "Ограничено",
   "about.domain_blocks.suspended.explanation": "Никакви данни от този сървър няма да се обработват, съхраняват или обменят, правещи невъзможно всяко взаимодействие или комуникация с потребители от тези сървъри.",
   "about.domain_blocks.suspended.title": "Спряно",
+  "about.language_label": "Език",
   "about.not_available": "Тази информация не е публична на този сървър.",
   "about.powered_by": "Децентрализирана социална мрежа, захранвана от {mastodon}",
   "about.rules": "Правила на сървъра",
@@ -28,6 +30,7 @@
   "account.edit_profile": "Редактиране на профила",
   "account.enable_notifications": "Известяване при публикуване от @{name}",
   "account.endorse": "Представи в профила",
+  "account.familiar_followers_many": "Последвано от {name1}, {name2}, и {othersCount, plural, one {един друг, когото познавате} other {# други, които познавате}}",
   "account.familiar_followers_one": "Последвано от {name1}",
   "account.familiar_followers_two": "Последвано от {name1} и {name2}",
   "account.featured": "Препоръчано",
@@ -40,6 +43,7 @@
   "account.followers": "Последователи",
   "account.followers.empty": "Още никой не следва потребителя.",
   "account.followers_counter": "{count, plural, one {{counter} последовател} other {{counter} последователи}}",
+  "account.followers_you_know_counter": "{counter} познавате",
   "account.following": "Последвано",
   "account.following_counter": "{count, plural, one {{counter} последван} other {{counter} последвани}}",
   "account.follows.empty": "Потребителят още никого не следва.",
@@ -66,7 +70,6 @@
   "account.posts_with_replies": "Публ. и отговори",
   "account.remove_from_followers": "Премахване на {name} от последователи",
   "account.report": "Докладване на @{name}",
-  "account.requested": "Чака се одобрение. Щракнете за отмяна на заявката за последване",
   "account.requested_follow": "{name} поиска да ви последва",
   "account.requests_to_follow_you": "Заявки да ви последват",
   "account.share": "Споделяне на профила на @{name}",
@@ -185,7 +188,7 @@
   "community.column_settings.remote_only": "Само отдалечено",
   "compose.language.change": "Смяна на езика",
   "compose.language.search": "Търсене на езици...",
-  "compose.published.body": "Публикувана публикация.",
+  "compose.published.body": "Публикувано.",
   "compose.published.open": "Отваряне",
   "compose.saved.body": "Запазена публикация.",
   "compose_form.direct_message_warning_learn_more": "Още информация",
@@ -215,6 +218,13 @@
   "confirmations.delete_list.confirm": "Изтриване",
   "confirmations.delete_list.message": "Наистина ли искате да изтриете завинаги списъка?",
   "confirmations.delete_list.title": "Изтривате ли списъка?",
+  "confirmations.discard_draft.confirm": "Изхвърляне и продължаване",
+  "confirmations.discard_draft.edit.cancel": "Възобновяване на редактиране",
+  "confirmations.discard_draft.edit.message": "Продължаването ще изхвърли всякакви промени, които сте правили в публикацията, която сега редактирате.",
+  "confirmations.discard_draft.edit.title": "Изхвърляте ли промените в публикацията си?",
+  "confirmations.discard_draft.post.cancel": "Възстановка на чернова",
+  "confirmations.discard_draft.post.message": "Продължаването ще изхвърли публикацията, която сега съставяте.",
+  "confirmations.discard_draft.post.title": "Изхвърляте ли черновата си публикация?",
   "confirmations.discard_edit_media.confirm": "Отхвърляне",
   "confirmations.discard_edit_media.message": "Не сте запазили промени на описанието или огледа на мултимедията, отхвърляте ли ги?",
   "confirmations.follow_to_list.confirm": "Последване и добавяне в списък",
@@ -234,9 +244,10 @@
   "confirmations.remove_from_followers.confirm": "Премахване на последовател",
   "confirmations.remove_from_followers.message": "{name} ще спре да ви следва. Наистина ли искате да продължите?",
   "confirmations.remove_from_followers.title": "Премахвате ли последовател?",
+  "confirmations.revoke_quote.confirm": "Премахване на публикация",
+  "confirmations.revoke_quote.message": "Действието е неотменимо.",
+  "confirmations.revoke_quote.title": "Премахвате ли публикацията?",
   "confirmations.unfollow.confirm": "Без следване",
-  "confirmations.unfollow.message": "Наистина ли искате вече да не следвате {name}?",
-  "confirmations.unfollow.title": "Спирате ли да следвате потребителя?",
   "content_warning.hide": "Скриване на публ.",
   "content_warning.show": "Нека се покаже",
   "content_warning.show_more": "Показване на още",
@@ -278,6 +289,7 @@
   "domain_pill.your_handle": "Вашият адрес:",
   "domain_pill.your_server": "Цифровият ви дом, където живеят всичките ви публикации. Не харесвате ли този? Прехвърляте се на сървъри по всяко време и докарвате последователите си също.",
   "domain_pill.your_username": "Неповторимият ви идентификатор на този сървър. Възможно е да се намерят потребители със същото потребителско име на други сървъри.",
+  "dropdown.empty": "Изберете възможност",
   "embed.instructions": "Вградете публикацията в уебсайта си, копирайки кода долу.",
   "embed.preview": "Ето как ще изглежда:",
   "emoji_button.activity": "Дейност",
@@ -324,9 +336,15 @@
   "errors.unexpected_crash.copy_stacktrace": "Копиране на трасето на стека в буферната памет",
   "errors.unexpected_crash.report_issue": "Сигнал за проблем",
   "explore.suggested_follows": "Хора",
+  "explore.title": "Вървежно",
   "explore.trending_links": "Новини",
   "explore.trending_statuses": "Публикации",
   "explore.trending_tags": "Хаштагове",
+  "featured_carousel.header": "{count, plural, one {закачена публикация} other {закачени публикации}}",
+  "featured_carousel.next": "Напред",
+  "featured_carousel.post": "Публикация",
+  "featured_carousel.previous": "Назад",
+  "featured_carousel.slide": "{index} от {total}",
   "filter_modal.added.context_mismatch_explanation": "Тази категория филтър не е приложима към контекста, в който достъпвате тази публикация. Ако желаете да филтрирате публикациите в този контекст, трябва да изберете друг филтър.",
   "filter_modal.added.context_mismatch_title": "Несъвпадащ контекст!",
   "filter_modal.added.expired_explanation": "Валидността на тази категория филтър е изтекла. Сменете срока на валидност, за да я приложите.",
@@ -403,8 +421,7 @@
   "hints.profiles.see_more_followers": "Преглед на още последователи на {domain}",
   "hints.profiles.see_more_follows": "Преглед на още последвания на {domain}",
   "hints.profiles.see_more_posts": "Преглед на още публикации на {domain}",
-  "hints.threads.replies_may_be_missing": "Отговори от други сървъри може да липсват.",
-  "hints.threads.see_more": "Преглед на още отговори на {domain}",
+  "home.column_settings.show_quotes": "Показване на цитираното",
   "home.column_settings.show_reblogs": "Показване на подсилванията",
   "home.column_settings.show_replies": "Показване на отговорите",
   "home.hide_announcements": "Скриване на оповестяванията",
@@ -425,20 +442,10 @@
   "ignore_notifications_modal.private_mentions_title": "Пренебрегвате ли известия от непоискани лични споменавания?",
   "info_button.label": "Помощ",
   "info_button.what_is_alt_text": "<h1>Какво е алтернативен текст?</h1> <p>Алтернативният текст осигурява описания на изображение за хора със зрителни увреждания, връзки с ниска честотна лента или търсещите допълнителен контекст.</p> <p>Може да подобрите достъпността и разбираемостта за всеки, пишейки ясен, кратък и обективен алтернативен текст.</p> <ul> <li>Уловете важните елементи</li> <li>Обобщете текста в образите</li> <li>Употребявайте правилна структура на изречението</li> <li>Избягвайте излишна информация</li> <li>Съсредоточете се върху тенденциите и ключови констатации в сложни онагледявания (като диаграми и карти)</li> </ul>",
-  "interaction_modal.action.favourite": "Трябва да направите любимо от акаунта си, за да продължите.",
-  "interaction_modal.action.follow": "Трябва да последвате от акаунта си, за да продължите.",
-  "interaction_modal.action.reblog": "Трябва да разпространите нечий блог от акаунта си, за да продължите.",
-  "interaction_modal.action.reply": "Трябва да отговорите от акаунта си, за да продължите.",
-  "interaction_modal.action.vote": "Трябва да гласувате от акаунта си, за да продължите.",
   "interaction_modal.go": "Напред",
   "interaction_modal.no_account_yet": "Още ли нямате акаунт?",
   "interaction_modal.on_another_server": "На различен сървър",
   "interaction_modal.on_this_server": "На този сървър",
-  "interaction_modal.title.favourite": "Означавам публикация на {name} като любима",
-  "interaction_modal.title.follow": "Последване на {name}",
-  "interaction_modal.title.reblog": "Подсилване на публикацията на {name}",
-  "interaction_modal.title.reply": "Отговаряне на публикацията на {name}",
-  "interaction_modal.title.vote": "Гласувайте в анкетата на {name}",
   "interaction_modal.username_prompt": "Напр. {example}",
   "intervals.full.days": "{number, plural, one {# ден} other {# дни}}",
   "intervals.full.hours": "{number, plural, one {# час} other {# часа}}",
@@ -478,6 +485,8 @@
   "keyboard_shortcuts.translate": "за превод на публикация",
   "keyboard_shortcuts.unfocus": "Разфокусиране на текстовото поле за съставяне/търсене",
   "keyboard_shortcuts.up": "Преместване нагоре в списъка",
+  "learn_more_link.got_it": "Разбрах",
+  "learn_more_link.learn_more": "Научете повече",
   "lightbox.close": "Затваряне",
   "lightbox.next": "Напред",
   "lightbox.previous": "Назад",
@@ -527,8 +536,10 @@
   "mute_modal.you_wont_see_mentions": "Няма да виждате споменаващите ги публикации.",
   "mute_modal.you_wont_see_posts": "Още могат да виждат публикациите ви, но вие техните не.",
   "navigation_bar.about": "Относно",
+  "navigation_bar.account_settings": "Парола и сигурност",
   "navigation_bar.administration": "Администрация",
   "navigation_bar.advanced_interface": "Отваряне в разширен уебинтерфейс",
+  "navigation_bar.automated_deletion": "Автоматично изтриване на публикации",
   "navigation_bar.blocks": "Блокирани потребители",
   "navigation_bar.bookmarks": "Отметки",
   "navigation_bar.direct": "Частни споменавания",
@@ -538,13 +549,17 @@
   "navigation_bar.follow_requests": "Заявки за последване",
   "navigation_bar.followed_tags": "Последвани хаштагове",
   "navigation_bar.follows_and_followers": "Последвания и последователи",
+  "navigation_bar.import_export": "Внасяне и изнасяне",
   "navigation_bar.lists": "Списъци",
   "navigation_bar.logout": "Излизане",
   "navigation_bar.moderation": "Модериране",
+  "navigation_bar.more": "Още",
   "navigation_bar.mutes": "Заглушени потребители",
   "navigation_bar.opened_in_classic_interface": "Публикации, акаунти и други особени страници се отварят по подразбиране в класическия мрежови интерфейс.",
   "navigation_bar.preferences": "Предпочитания",
+  "navigation_bar.privacy_and_reach": "Поверителност и обхват",
   "navigation_bar.search": "Търсене",
+  "navigation_bar.search_trends": "Търсене / Вървежно",
   "not_signed_in_indicator.not_signed_in": "Трябва ви вход за достъп до ресурса.",
   "notification.admin.report": "{name} докладва {target}",
   "notification.admin.report_account": "{name} докладва {count, plural, one {публикация} other {# публикации}} от {target} за {category}",
@@ -566,6 +581,7 @@
   "notification.label.mention": "Споменаване",
   "notification.label.private_mention": "Частно споменаване",
   "notification.label.private_reply": "Личен отговор",
+  "notification.label.quote": "{name} цитира ваша публикация",
   "notification.label.reply": "Отговор",
   "notification.mention": "Споменаване",
   "notification.mentioned_you": "{name} ви спомена",
@@ -623,6 +639,7 @@
   "notifications.column_settings.mention": "Споменавания:",
   "notifications.column_settings.poll": "Резултати от анкета:",
   "notifications.column_settings.push": "Изскачащи известия",
+  "notifications.column_settings.quote": "Цитати:",
   "notifications.column_settings.reblog": "Подсилвания:",
   "notifications.column_settings.show": "Показване в колоната",
   "notifications.column_settings.sound": "Пускане на звук",
@@ -699,7 +716,6 @@
   "privacy.public.long": "Всеки във и извън Mastodon",
   "privacy.public.short": "Публично",
   "privacy.unlisted.additional": "Това действие е точно като публичното, с изключение на това, че публикацията няма да се появява в каналите на живо, хаштаговете, разглеждането или търсенето в Mastodon, дори ако сте избрали да се публично видими на ниво акаунт.",
-  "privacy.unlisted.long": "По-малко алгоритмични фанфари",
   "privacy.unlisted.short": "Тиха публика",
   "privacy_policy.last_updated": "Последно осъвременяване на {date}",
   "privacy_policy.title": "Политика за поверителност",
@@ -771,6 +787,7 @@
   "report_notification.categories.violation": "Нарушение на правилото",
   "report_notification.categories.violation_sentence": "нарушение на правило",
   "report_notification.open": "Отваряне на доклада",
+  "search.clear": "Изчистване на търсенето",
   "search.no_recent_searches": "Няма скорошни търсения",
   "search.placeholder": "Търсене",
   "search.quick_action.account_search": "Съвпадение на профили {x}",
@@ -837,9 +854,13 @@
   "status.mute_conversation": "Заглушаване на разговора",
   "status.open": "Разширяване на публикацията",
   "status.pin": "Закачане в профила",
+  "status.quote_error.filtered": "Скрито поради един от филтрите ви",
+  "status.quote_error.not_available": "Неналична публикация",
+  "status.quote_error.pending_approval": "Публикацията чака одобрение",
+  "status.quote_policy_change": "Промяна кой може да цитира",
+  "status.quote_post_author": "Цитирах публикация от @{name}",
   "status.read_more": "Още за четене",
   "status.reblog": "Подсилване",
-  "status.reblog_private": "Подсилване с оригиналната видимост",
   "status.reblogged_by": "{name} подсили",
   "status.reblogs": "{count, plural, one {подсилване} other {подсилвания}}",
   "status.reblogs.empty": "Още никого не е подсилвал публикацията. Подсилващият ще се покаже тук.",
@@ -851,6 +872,7 @@
   "status.reply": "Отговор",
   "status.replyAll": "Отговор на нишка",
   "status.report": "Докладване на @{name}",
+  "status.revoke_quote": "Премахване на моя публикация от публикацията на @{name}",
   "status.sensitive_warning": "Деликатно съдържание",
   "status.share": "Споделяне",
   "status.show_less_all": "Показване на по-малко за всички",
@@ -866,7 +888,10 @@
   "subscribed_languages.save": "Запазване на промените",
   "subscribed_languages.target": "Промяна на абонираните езици за {target}",
   "tabs_bar.home": "Начало",
+  "tabs_bar.menu": "Меню",
   "tabs_bar.notifications": "Известия",
+  "tabs_bar.publish": "Нова публикация",
+  "tabs_bar.search": "Търсене",
   "terms_of_service.effective_as_of": "В сила от {date}",
   "terms_of_service.title": "Условия на услугата",
   "terms_of_service.upcoming_changes_on": "Предстоящи промени на {date}",
@@ -907,5 +932,9 @@
   "video.skip_forward": "Прескок напред",
   "video.unmute": "Без заглушаване",
   "video.volume_down": "Намаляване на звука",
-  "video.volume_up": "Увеличаване на звука"
+  "video.volume_up": "Увеличаване на звука",
+  "visibility_modal.button_title": "Задаване на видимост",
+  "visibility_modal.header": "Видимост и взаимодействие",
+  "visibility_modal.quote_followers": "Само последователи",
+  "visibility_modal.quote_public": "Някой"
 }
diff --git a/app/javascript/mastodon/locales/bn.json b/app/javascript/mastodon/locales/bn.json
index 2339f607d66..526248e76c6 100644
--- a/app/javascript/mastodon/locales/bn.json
+++ b/app/javascript/mastodon/locales/bn.json
@@ -53,7 +53,6 @@
   "account.posts": "পোষ্টসমূহ",
   "account.posts_with_replies": "টুট এবং মতামত",
   "account.report": "@{name} কে রিপোর্ট করুন",
-  "account.requested": "অনুমতির অপেক্ষা। অনুসরণ করার অনুরোধ বাতিল করতে এখানে ক্লিক করুন",
   "account.requested_follow": "{name} আপনাকে অনুসরণ করার জন্য অনুরোধ করেছে",
   "account.share": "@{name} র প্রোফাইল অন্যদের দেখান",
   "account.show_reblogs": "@{name} র সমর্থনগুলো দেখান",
@@ -153,7 +152,6 @@
   "confirmations.mute.confirm": "সরিয়ে ফেলুন",
   "confirmations.redraft.confirm": "মুছে ফেলুন এবং আবার সম্পাদন করুন",
   "confirmations.unfollow.confirm": "অনুসরণ বন্ধ করো",
-  "confirmations.unfollow.message": "তুমি কি নিশ্চিত {name} কে আর অনুসরণ করতে চাও না?",
   "conversation.delete": "কথোপকথন মুছে ফেলুন",
   "conversation.mark_as_read": "পঠিত হিসেবে চিহ্নিত করুন",
   "conversation.open": "কথপোকথন দেখান",
@@ -377,7 +375,6 @@
   "status.pin": "নিজের পাতায় এটা পিন করতে",
   "status.read_more": "আরো পড়ুন",
   "status.reblog": "সমর্থন দিতে",
-  "status.reblog_private": "আপনার অনুসরণকারীদের কাছে এটার সমর্থন দেখাতে",
   "status.reblogged_by": "{name} সমর্থন দিয়েছে",
   "status.reblogs.empty": "এখনো কেও এটাতে সমর্থন দেয়নি। যখন কেও দেয়, সেটা তখন এখানে দেখা যাবে।",
   "status.redraft": "মুছে আবার নতুন করে লিখতে",
diff --git a/app/javascript/mastodon/locales/br.json b/app/javascript/mastodon/locales/br.json
index b0e21ab3be0..3d87c0fd93d 100644
--- a/app/javascript/mastodon/locales/br.json
+++ b/app/javascript/mastodon/locales/br.json
@@ -7,12 +7,13 @@
   "about.domain_blocks.preamble": "Gant Mastodon e c'hellit gwelet danvez hag eskemm gant implijerien·ezed eus forzh peseurt servijer er fedibed peurliesañ. Setu an nemedennoù a zo bet graet evit ar servijer-mañ e-unan.",
   "about.domain_blocks.silenced.explanation": "Ne vo ket gwelet profiloù eus ar servijer-mañ ganeoc'h peurliesañ, nemet ma vefec'h o klask war o lec'h pe choazfec'h o heuliañ.",
   "about.domain_blocks.silenced.title": "Bevennet",
-  "about.domain_blocks.suspended.explanation": "Roadenn ebet eus ar servijer-mañ ne vo keweriet, kadavet pe eskemmet, ar pezh a lako an etreweriañ pe ar c'hehentiñ gant implijerien adalek ar servijer-mañ dibosupl.",
+  "about.domain_blocks.suspended.explanation": "Roadenn ebet eus ar servijer-mañ ne vo keweriet, kadavet pe eskemmet, ar pezh a lako an etreweriañ pe ar c'hehentiñ gant implijerien·ezed adalek ar servijer-mañ dibosupl.",
   "about.domain_blocks.suspended.title": "Astalet",
   "about.language_label": "Yezh",
   "about.not_available": "An titour-mañ ne c'heller ket gwelet war ar servijer-mañ.",
   "about.powered_by": "Rouedad sokial digreizenned kaset gant {mastodon}",
   "about.rules": "Reolennoù ar servijer",
+  "account.account_note_header": "Notenn bersonel",
   "account.add_or_remove_from_list": "Ouzhpenn pe dilemel eus al listennadoù",
   "account.badges.bot": "Robot",
   "account.badges.group": "Strollad",
@@ -20,25 +21,36 @@
   "account.block_domain": "Stankañ an domani {domain}",
   "account.block_short": "Stankañ",
   "account.blocked": "Stanket",
+  "account.blocking": "Stanket",
   "account.cancel_follow_request": "Nullañ ar reked heuliañ",
   "account.copy": "Eilañ al liamm war-zu ho profil",
   "account.direct": "Menegiñ @{name} ent-prevez",
   "account.disable_notifications": "Paouez d'am c'hemenn pa vez embannet traoù gant @{name}",
+  "account.domain_blocking": "Domani stanket",
   "account.edit_profile": "Kemmañ ar profil",
+  "account.edit_profile_short": "Kemmañ",
   "account.enable_notifications": "Ma c'hemenn pa vez embannet traoù gant @{name}",
-  "account.endorse": "Lakaat war-wel war ar profil",
-  "account.familiar_followers_one": "Heuilhet gant {name1}",
-  "account.familiar_followers_two": "Heuilhet gant {name1} ha {name2}",
-  "account.featured_tags.last_status_at": "Toud diwezhañ : {date}",
-  "account.featured_tags.last_status_never": "Embannadur ebet",
+  "account.endorse": "Lakaat en a-raok war ar profil",
+  "account.familiar_followers_one": "Heuliet gant {name1}",
+  "account.familiar_followers_two": "Heuliet gant {name1} ha {name2}",
+  "account.featured": "En a-raok",
+  "account.featured.accounts": "Profiloù",
+  "account.featured.hashtags": "Gerioù-klik",
+  "account.featured_tags.last_status_at": "Embann diwezhañ: {date}",
+  "account.featured_tags.last_status_never": "Embann ebet",
   "account.follow": "Heuliañ",
   "account.follow_back": "Heuliañ d'ho tro",
+  "account.follow_back_short": "Heuliañ d'ho tro",
+  "account.follow_request": "Reked d'ho heuliañ",
+  "account.follow_request_cancel": "Nullañ ar reked",
+  "account.follow_request_cancel_short": "Nullañ",
   "account.followers": "Tud koumanantet",
   "account.followers.empty": "Den na heul an implijer·ez-mañ c'hoazh.",
   "account.followers_counter": "{count, plural, one {{counter} heulier} two {{counter} heulier} few {{counter} heulier} many {{counter} heulier} other {{counter} heulier}}",
   "account.followers_you_know_counter": "{counter} a anavezit",
   "account.following": "Koumanantoù",
   "account.follows.empty": "An implijer·ez-mañ na heul den ebet.",
+  "account.follows_you": "Ho heuilh",
   "account.go_to_profile": "Gwelet ar profil",
   "account.hide_reblogs": "Kuzh skignadennoù gant @{name}",
   "account.in_memoriam": "E koun.",
@@ -53,20 +65,24 @@
   "account.mute_notifications_short": "Kuzhat ar c'hemennoù",
   "account.mute_short": "Kuzhat",
   "account.muted": "Kuzhet",
+  "account.muting": "O kuzhat",
+  "account.mutual": "Heuliañ a rit an eil egile",
   "account.no_bio": "Deskrivadur ebet da gaout.",
   "account.open_original_page": "Digeriñ ar bajenn orin",
   "account.posts": "Embannadurioù",
   "account.posts_with_replies": "Embannadurioù ha respontoù",
+  "account.remove_from_followers": "Dilemel {name} eus an heulierien·ezed",
   "account.report": "Disklêriañ @{name}",
-  "account.requested": "O c'hortoz an asant. Klikit evit nullañ ar goulenn heuliañ",
   "account.requested_follow": "Gant {name} eo bet goulennet ho heuliañ",
+  "account.requests_to_follow_you": "Rekedoù d'ho heuliañ",
   "account.share": "Skignañ profil @{name}",
   "account.show_reblogs": "Diskouez skignadennoù @{name}",
   "account.statuses_counter": "{count, plural, one {{counter} embannadur} two {{counter} embannadur} few {{counter} embannadur} many {{counter} embannadur} other {{counter} embannadur}}",
-  "account.unblock": "Diverzañ @{name}",
-  "account.unblock_domain": "Diverzañ an domani {domain}",
+  "account.unblock": "Distankañ @{name}",
+  "account.unblock_domain": "Distankañ an domani {domain}",
+  "account.unblock_domain_short": "Distankañ",
   "account.unblock_short": "Distankañ",
-  "account.unendorse": "Paouez da lakaat war-wel war ar profil",
+  "account.unendorse": "Na lakaat ket en a-raok war ar profil",
   "account.unfollow": "Diheuliañ",
   "account.unmute": "Diguzhat @{name}",
   "account.unmute_notifications_short": "Diguzhat ar c'hemennoù",
@@ -76,27 +92,39 @@
   "admin.dashboard.monthly_retention": "Feur azdalc'h an implijerien·ezed dre viz goude bezañ lakaet o anv",
   "admin.dashboard.retention.average": "Keidenn",
   "admin.dashboard.retention.cohort": "Miz an enrolladur",
-  "admin.dashboard.retention.cohort_size": "Implijerien.erezed nevez",
+  "admin.dashboard.retention.cohort_size": "Implijerien·ezed nevez",
   "admin.impact_report.instance_accounts": "Profiloù kontoù a vefe dilamet",
-  "admin.impact_report.instance_followers": "Heulierien a gollfe hon implijerien",
-  "admin.impact_report.instance_follows": "Heulierien a gollfe o implijerien",
+  "admin.impact_report.instance_followers": "Heulierien a gollfe hon implijerien·ezed",
+  "admin.impact_report.instance_follows": "Heulierien a gollfe o implijerien·ezed",
   "alert.rate_limited.message": "Klaskit en-dro a-benn {retry_time, time, medium}.",
   "alert.rate_limited.title": "Feur bevennet",
   "alert.unexpected.message": "Ur fazi dic'hortozet zo degouezhet.",
   "alert.unexpected.title": "Hopala !",
+  "alt_text_badge.title": "Eiltestenn",
+  "alt_text_modal.add_alt_text": "Ouzhpennañ un eiltestenn",
   "alt_text_modal.cancel": "Nullañ",
   "alt_text_modal.change_thumbnail": "Kemmañ ar velvenn",
   "alt_text_modal.done": "Graet",
   "announcement.announcement": "Kemennad",
   "annual_report.summary.followers.followers": "heulier",
+  "annual_report.summary.followers.total": "{count} en holl",
+  "annual_report.summary.highlighted_post.by_favourites": "embannadur karet ar muiañ",
+  "annual_report.summary.highlighted_post.by_reblogs": "embannadur skignet ar muiañ",
+  "annual_report.summary.highlighted_post.by_replies": "embannadur gant ar muiañ a respontoù",
   "annual_report.summary.highlighted_post.possessive": "{name}",
+  "annual_report.summary.most_used_app.most_used_app": "arload muiañ implijet",
+  "annual_report.summary.most_used_hashtag.most_used_hashtag": "ar gerioù-klik implijet ar muiañ",
   "annual_report.summary.most_used_hashtag.none": "Hini ebet",
-  "annual_report.summary.new_posts.new_posts": "toudoù nevez",
+  "annual_report.summary.new_posts.new_posts": "embannadurioù nevez",
   "attachments_list.unprocessed": "(ket meret)",
   "audio.hide": "Kuzhat ar c'hleved",
   "block_modal.show_less": "Diskouez nebeutoc'h",
   "block_modal.show_more": "Diskouez muioc'h",
+  "block_modal.they_cant_mention": "Ne c'hall na menegiñ na heuliañ ac'hanoc'h.",
+  "block_modal.title": "Stankañ an implijer·ez?",
   "boost_modal.combo": "Ar wezh kentañ e c'halliot gwaskañ war {combo} evit tremen hebiou",
+  "boost_modal.reblog": "Skignañ an embannadur?",
+  "boost_modal.undo_reblog": "Paouez da skignañ an embannadur?",
   "bundle_column_error.copy_stacktrace": "Eilañ an danevell fazi",
   "bundle_column_error.error.body": "N'haller ket skrammañ ar bajenn goulennet. Gallout a ra bezañ abalamour d'ur beug er c'hod pe d'ur gudenn keverlec'hded gant ar merdeer.",
   "bundle_column_error.error.title": "Chaous !",
@@ -114,20 +142,20 @@
   "closed_registrations_modal.preamble": "Digreizennet eo Mastodon, forzh pelec'h e vefe krouet ho kont e viot gouest da heuliañ hag etreweriañ gant an holl war ar servijer-mañ. Gallout a rit herbec'hiañ anezhañ hoc'h-unan zoken!",
   "closed_registrations_modal.title": "Enskrivadurioù war Mastodon",
   "column.about": "Diwar-benn",
-  "column.blocks": "Implijer·ezed·ien berzet",
+  "column.blocks": "Implijerien·ezed stanket",
   "column.bookmarks": "Sinedoù",
   "column.community": "Red-amzer lec'hel",
   "column.create_list": "Krouiñ ul listenn",
   "column.direct": "Menegoù prevez",
   "column.directory": "Mont a-dreuz ar profiloù",
-  "column.domain_blocks": "Domani berzet",
+  "column.domain_blocks": "Domani stanket",
   "column.edit_list": "Kemmañ al listenn",
   "column.favourites": "Muiañ-karet",
   "column.firehose": "Redoù war-eeun",
   "column.follow_requests": "Rekedoù heuliañ",
   "column.home": "Degemer",
   "column.lists": "Listennoù",
-  "column.mutes": "Implijer·ion·ezed kuzhet",
+  "column.mutes": "Implijerien·ezed kuzhet",
   "column.notifications": "Kemennoù",
   "column.pins": "Embannadurioù spilhennet",
   "column.public": "Red-amzer kevredet",
@@ -148,9 +176,9 @@
   "compose.published.open": "Digeriñ",
   "compose.saved.body": "Enrollet.",
   "compose_form.direct_message_warning_learn_more": "Gouzout hiroc'h",
-  "compose_form.encryption_warning": "Toudoù war Mastodon na vezont ket sifret penn-da-benn. Na rannit ket titouroù kizidik dre Mastodon.",
-  "compose_form.hashtag_warning": "This post won't be listed under any hashtag as it is unlisted. Only public posts can be searched by hashtag.",
-  "compose_form.lock_disclaimer": "N'eo ket {locked} ho kont. An holl a c'hal ho heuliañ evit gwelet ho toudoù prevez.",
+  "compose_form.encryption_warning": "Embannadurioù war Mastodon na vezont ket sifret a-benn-da-benn. Na rannit ket titouroù kizidik dre Mastodon.",
+  "compose_form.hashtag_warning": "Ne vo ket listennet an embannadur-mañ dindan gerioù-klik ebet dre m'eo anlistennet. N'eus nemet an embannadurioù foran a c'hall bezañ klasket dre c'her-klik.",
+  "compose_form.lock_disclaimer": "N'eo ket {locked} ho kont. An holl a c'hal ho heuliañ evit gwelet hoc'h embannadurioù prevez.",
   "compose_form.lock_disclaimer.lock": "prennet",
   "compose_form.placeholder": "Petra emaoc'h o soñjal e-barzh ?",
   "compose_form.poll.duration": "Pad ar sontadeg",
@@ -167,23 +195,45 @@
   "confirmation_modal.cancel": "Nullañ",
   "confirmations.block.confirm": "Stankañ",
   "confirmations.delete.confirm": "Dilemel",
-  "confirmations.delete.message": "Ha sur oc'h e fell deoc'h dilemel an toud-mañ ?",
+  "confirmations.delete.message": "Ha sur oc'h e fell deoc'h dilemel an embannadur-mañ?",
+  "confirmations.delete.title": "Dilemel an embannadur?",
   "confirmations.delete_list.confirm": "Dilemel",
   "confirmations.delete_list.message": "Ha sur eo hoc'h eus c'hoant da zilemel ar roll-mañ da vat ?",
   "confirmations.delete_list.title": "Dilemel al listenn?",
+  "confirmations.discard_draft.confirm": "Diverkañ ha kenderc'hel",
+  "confirmations.discard_draft.edit.cancel": "Distreiñ d'an embann",
+  "confirmations.discard_draft.post.cancel": "Distreiñ d'ar brouilhed",
+  "confirmations.discard_draft.post.title": "Dilemel ho prouilhed?",
   "confirmations.discard_edit_media.confirm": "Nac'hañ",
   "confirmations.discard_edit_media.message": "Bez ez eus kemmoù n'int ket enrollet e deskrivadur ar media pe ar rakwel, nullañ anezho evelato?",
+  "confirmations.follow_to_list.confirm": "Heuliañ hag ouzhpennañ d'al listenn",
   "confirmations.follow_to_list.title": "Heuliañ an implijer·ez?",
   "confirmations.logout.confirm": "Digevreañ",
   "confirmations.logout.message": "Ha sur oc'h e fell deoc'h digevreañ ?",
+  "confirmations.logout.title": "Digevreañ?",
+  "confirmations.missing_alt_text.confirm": "Ouzhpennañ un eiltestenn",
+  "confirmations.missing_alt_text.secondary": "Embann memes tra",
+  "confirmations.missing_alt_text.title": "Ouzhpennañ an eiltestenn?",
   "confirmations.mute.confirm": "Kuzhat",
+  "confirmations.quiet_post_quote_info.got_it": "Mat eo",
   "confirmations.redraft.confirm": "Diverkañ ha skrivañ en-dro",
+  "confirmations.redraft.title": "Diverkañ ha skrivañ an embann en-dro?",
+  "confirmations.remove_from_followers.confirm": "Dilemel an heulier·ez",
+  "confirmations.remove_from_followers.title": "Dilemel an heulier·ez?",
+  "confirmations.revoke_quote.confirm": "Dilemel an embannadur",
+  "confirmations.revoke_quote.title": "Dilemel an embannadur?",
+  "confirmations.unblock.confirm": "Distankañ",
+  "confirmations.unblock.title": "Distankañ {name}?",
   "confirmations.unfollow.confirm": "Diheuliañ",
-  "confirmations.unfollow.message": "Ha sur oc'h e fell deoc'h paouez da heuliañ {name} ?",
+  "confirmations.unfollow.title": "Diheuliañ {name}?",
+  "confirmations.withdraw_request.confirm": "Nullañ ar reked",
+  "confirmations.withdraw_request.title": "Nullañ ho reked da heuliañ {name}?",
+  "content_warning.hide": "Kuzhat an embannadur",
+  "content_warning.show": "Diskwel memes tra",
   "content_warning.show_more": "Diskouez muioc'h",
   "conversation.delete": "Dilemel ar gaozeadenn",
   "conversation.mark_as_read": "Merkañ evel lennet",
-  "conversation.open": "Gwelout ar gaozeadenn",
+  "conversation.open": "Gwelet ar gaozeadenn",
   "conversation.with": "Gant {names}",
   "copy_icon_button.copied": "Eilet er golver",
   "copypaste.copied": "Eilet",
@@ -194,11 +244,18 @@
   "directory.recently_active": "Oberiant nevez zo",
   "disabled_account_banner.account_settings": "Arventennoù ar gont",
   "disabled_account_banner.text": "Ho kont {disabledAccount} zo divev evit bremañ.",
-  "dismissable_banner.community_timeline": "Setu toudoù foran nevesañ an dud a zo herberc’hiet o c'hontoù gant {domain}.",
+  "dismissable_banner.community_timeline": "Setu embannadurioù foran nevesañ an dud a zo herberc’hiet o c’hontoù gant {domain}.",
   "dismissable_banner.dismiss": "Diverkañ",
+  "domain_block_modal.block": "Stankañ ar servijer",
+  "domain_block_modal.block_account_instead": "Stankañ @{name} kentoc'h",
+  "domain_block_modal.title": "Stankañ an domani?",
   "domain_pill.server": "Dafariad",
+  "domain_pill.their_handle": "H·ec'h anaouder:",
   "domain_pill.username": "Anv-implijer",
-  "embed.instructions": "Enframmit an toud-mañ en ho lec'hienn en ur eilañ ar c'hod amañ-dindan.",
+  "domain_pill.whats_in_a_handle": "Petra eo an anaouder?",
+  "domain_pill.your_handle": "Hoc'h anaouder:",
+  "dropdown.empty": "Diuzit un dibarzh",
+  "embed.instructions": "Enframmit an embannadur-mañ en ho lec’hienn en ur eilañ ar c’hod amañ-dindan.",
   "embed.preview": "Setu penaos e teuio war wel :",
   "emoji_button.activity": "Obererezh",
   "emoji_button.clear": "Diverkañ",
@@ -215,22 +272,23 @@
   "emoji_button.search_results": "Disoc'hoù an enklask",
   "emoji_button.symbols": "Arouezioù",
   "emoji_button.travel": "Beajiñ & Lec'hioù",
-  "empty_column.account_suspended": "Kont ehanet",
-  "empty_column.account_timeline": "Toud ebet amañ !",
+  "empty_column.account_featured_other.unknown": "N'eo ket bet lakaet netra en a-raok gant ar gont-mañ.",
+  "empty_column.account_suspended": "Kont astalet",
+  "empty_column.account_timeline": "Embannadur ebet amañ!",
   "empty_column.account_unavailable": "Profil dihegerz",
-  "empty_column.blocks": "N'eus ket bet berzet implijer·ez ganeoc'h c'hoazh.",
+  "empty_column.blocks": "N'eus ket bet stanket implijer·ez ganeoc'h c'hoazh.",
   "empty_column.bookmarked_statuses": "N'ho peus embannadur ebet enrollet en ho sinedoù c'hoazh. Pa vo ouzhpennet unan e teuio war wel amañ.",
   "empty_column.community": "Goulo eo ar red-amzer lec'hel. Skrivit'ta un dra evit lakaat tan dezhi !",
-  "empty_column.domain_blocks": "N'eus domani kuzh ebet c'hoazh.",
+  "empty_column.domain_blocks": "N'eus domani stanket ebet c'hoazh.",
   "empty_column.explore_statuses": "N'eus tuadur ebet evit c'hoazh. Distroit diwezhatoc'h !",
   "empty_column.follow_requests": "N'ho peus reked heuliañ ebet c'hoazh. Pa vo resevet unan e teuio war wel amañ.",
-  "empty_column.followed_tags": "N'emaoc'h oc'h heuliañ hashtag ebet evit poent. Pa vioc'h e vo d'o gwelet amañ.",
-  "empty_column.hashtag": "N'eus netra en hashtag-mañ c'hoazh.",
+  "empty_column.followed_tags": "N'emaoc'h oc'h heuliañ ger-klik ebet evit poent. Pa vioc'h e vo d'o gwelet amañ.",
+  "empty_column.hashtag": "N'eus netra er ger-klik-mañ c'hoazh.",
   "empty_column.home": "Goullo eo ho red-amzer degemer! Kit da weladenniñ {public} pe implijit ar c'hlask evit kregiñ ganti ha kejañ gant implijer·ien·ezed all.",
-  "empty_column.list": "Goullo eo al listenn-mañ evit c'hoazh. Pa vo embannet toudoù nevez gant e izili e teuint war wel amañ.",
-  "empty_column.mutes": "N'ho peus kuzhet implijer ebet c'hoazh.",
+  "empty_column.list": "Goullo eo al listenn-mañ evit c'hoazh. Pa vo embannet un dra nevez gant e izili e teuio war wel amañ.",
+  "empty_column.mutes": "N'ho peus kuzhet implijer·ez ebet c'hoazh.",
   "empty_column.notifications": "N'ho peus kemenn ebet c'hoazh. Grit gant implijer·ezed·ien all evit loc'hañ ar gomz.",
-  "empty_column.public": "N'eus netra amañ! Skrivit un dra bennak foran pe heuilhit implijer·ien·ezed eus dafariadoù all evit leuniañ",
+  "empty_column.public": "N'eus netra amañ! Skrivit un dra bennak foran pe heuilhit implijerien·ezed eus servijerioù all evit leuniañ",
   "error.unexpected_crash.explanation": "Abalamour d'ur beug en hor c'hod pe d'ur gudenn geverlec'hded n'hallomp ket skrammañ ar bajenn-mañ en un doare dereat.",
   "error.unexpected_crash.explanation_addons": "Ar bajenn-mañ ne c'hell ket bezañ skrammet mat. Ar fazi-se a zo kaoz d'un astenn pe d'un ostilh troidigezh emgefreek war ho merdeer.",
   "error.unexpected_crash.next_steps": "Klaskit azbevaat ar bajenn. Ma n'a ket en-dro e c'hallit klask ober gant Mastodon dre ur merdeer disheñvel pe dre an arload genidik.",
@@ -241,24 +299,24 @@
   "explore.title": "Diouzh ar c'hiz",
   "explore.trending_links": "Keleier",
   "explore.trending_statuses": "Embannadurioù",
-  "explore.trending_tags": "Hashtagoù",
+  "explore.trending_tags": "Gerioù-klik",
   "featured_carousel.next": "War-raok",
-  "featured_carousel.post": "Embannadenn",
+  "featured_carousel.post": "Embannadur",
   "featured_carousel.previous": "War-gil",
   "featured_carousel.slide": "{index} diwar {total}",
   "filter_modal.added.context_mismatch_title": "Kenarroud digenglotus !",
   "filter_modal.added.expired_title": "Sil deuet d'e dermen !",
   "filter_modal.added.review_and_configure_title": "Arventennoù ar sil",
   "filter_modal.added.settings_link": "pajenn an arventennoù",
-  "filter_modal.added.short_explanation": "An toud-mañ zo bet ouzhpennet d'ar rummad sil-mañ : {title}.",
+  "filter_modal.added.short_explanation": "Ouzhpennet eo bet an embannadur-mañ d'ar rummad sil-mañ: {title}.",
   "filter_modal.added.title": "Sil ouzhpennet !",
   "filter_modal.select_filter.context_mismatch": "na glot ket gant ar c'henarroud-mañ",
   "filter_modal.select_filter.expired": "zo deuet d'e dermen",
   "filter_modal.select_filter.prompt_new": "Rummad nevez : {name}",
   "filter_modal.select_filter.search": "Klask pe krouiñ",
   "filter_modal.select_filter.subtitle": "Implijout ur rummad a zo anezhañ pe krouiñ unan nevez",
-  "filter_modal.select_filter.title": "Silañ an toud-mañ",
-  "filter_modal.title.status": "Silañ un toud",
+  "filter_modal.select_filter.title": "Silañ an embannadur-mañ",
+  "filter_modal.title.status": "Silañ un embannadur",
   "filter_warning.matches_filter": "A glot gant ar sil “<span>{title}</span>”",
   "firehose.all": "Pep tra",
   "firehose.local": "Ar servijer-mañ",
@@ -266,10 +324,12 @@
   "follow_request.authorize": "Aotren",
   "follow_request.reject": "Nac'hañ",
   "follow_requests.unlocked_explanation": "Daoust ma n'eo ket ho kont prennet, skipailh {domain} a soñj e fellfe deoc'h gwiriekaat pedadennoù heuliañ deus ar c'hontoù-se diwar-zorn.",
+  "follow_suggestions.dismiss": "Na ziskouez ket ken",
   "follow_suggestions.friends_of_friends_longer": "Diouzh ar c'hiz e-touez an dud heuliet ganeoc'h",
   "follow_suggestions.popular_suggestion_longer": "Diouzh ar c'hiz war {domain}",
   "follow_suggestions.view_all": "Gwelet pep tra",
-  "followed_tags": "Hashtagoù o heuliañ",
+  "follow_suggestions.who_to_follow": "Piv heuliañ",
+  "followed_tags": "Gerioù-klik heuliet",
   "footer.about": "Diwar-benn",
   "footer.directory": "Kavlec'h ar profiloù",
   "footer.get_app": "Pellgargañ an arload",
@@ -281,20 +341,26 @@
   "generic.saved": "Enrollet",
   "getting_started.heading": "Loc'hañ",
   "hashtag.admin_moderation": "Digeriñ an etrefas evezhiañ evit #{name}",
+  "hashtag.browse": "Furchal dre an embannadurioù gant #{hashtag}",
+  "hashtag.browse_from_account": "Furchal dre an embannadurioù gant @{name} gant #{hashtag}",
   "hashtag.column_header.tag_mode.all": "ha(g) {additional}",
   "hashtag.column_header.tag_mode.any": "pe {additional}",
   "hashtag.column_header.tag_mode.none": "hep {additional}",
   "hashtag.column_settings.select.no_options_message": "N'eus bet kavet ali ebet",
-  "hashtag.column_settings.select.placeholder": "Ouzhpennañ hashtagoù…",
+  "hashtag.column_settings.select.placeholder": "Ouzhpennañ gerioù-klik…",
   "hashtag.column_settings.tag_mode.all": "An holl anezho",
   "hashtag.column_settings.tag_mode.any": "Unan e mesk anezho",
   "hashtag.column_settings.tag_mode.none": "Hini ebet anezho",
   "hashtag.column_settings.tag_toggle": "Endelc'her gerioù-alc'hwez ouzhpenn evit ar bannad-mañ",
   "hashtag.counter_by_uses": "{count, plural, one {{counter} embannadur} other {{counter} embannadur}}",
   "hashtag.counter_by_uses_today": "{count, plural, one {{counter} embannadur} other {{counter} embannadur}} hiziv",
+  "hashtag.feature": "Lakaat en a-raok war ar profil",
   "hashtag.follow": "Heuliañ ar ger-klik",
-  "hashtag.unfollow": "Paouez heuliañ an hashtag",
+  "hashtag.mute": "Kuzhat #{hashtag}",
+  "hashtag.unfeature": "Na lakaat ket en a-raok war ar profil",
+  "hashtag.unfollow": "Diheuliañ ar ger-klik",
   "hashtags.and_other": "…{count, plural, one {hag # all} other {ha # all}}",
+  "hints.profiles.see_more_posts": "Gwelet embannadurioù ouzhpenn eus {domain}",
   "home.column_settings.show_quotes": "Diskouez an arroudennoù",
   "home.column_settings.show_reblogs": "Diskouez ar skignadennoù",
   "home.column_settings.show_replies": "Diskouez ar respontoù",
@@ -302,24 +368,23 @@
   "home.pending_critical_update.body": "Hizivait ho servijer Mastodon kerkent ha ma c'hallit mar plij!",
   "home.pending_critical_update.link": "Gwelet an hizivadennoù",
   "home.show_announcements": "Diskouez ar c'hemennoù",
+  "interaction_modal.go": "Mont di",
+  "interaction_modal.no_account_yet": "N'ho peus ket ur gont c'hoazh?",
   "interaction_modal.on_another_server": "War ur servijer all",
   "interaction_modal.on_this_server": "War ar servijer-mañ",
-  "interaction_modal.title.favourite": "Ouzhpennañ embannadur {name} d'ar re vuiañ-karet",
-  "interaction_modal.title.follow": "Heuliañ {name}",
-  "interaction_modal.title.reblog": "Skignañ toud {name}",
-  "interaction_modal.title.reply": "Respont da doud {name}",
+  "interaction_modal.username_prompt": "D.s. {example}",
   "intervals.full.days": "{number, plural, one {# devezh} other{# a zevezhioù}}",
   "intervals.full.hours": "{number, plural, one {# eurvezh} other{# eurvezh}}",
   "intervals.full.minutes": "{number, plural, one {# munut} other{# a vunutoù}}",
   "keyboard_shortcuts.back": "Distreiñ",
-  "keyboard_shortcuts.blocked": "Digeriñ roll an implijer.ezed.rien stanket",
-  "keyboard_shortcuts.boost": "Skignañ an toud",
+  "keyboard_shortcuts.blocked": "Digeriñ roll an implijerien·ezed stanket",
+  "keyboard_shortcuts.boost": "Skignañ an embannadur",
   "keyboard_shortcuts.column": "Fokus ar bann",
   "keyboard_shortcuts.compose": "Fokus an takad testenn",
   "keyboard_shortcuts.description": "Deskrivadur",
   "keyboard_shortcuts.direct": "to open direct messages column",
   "keyboard_shortcuts.down": "Diskennañ er roll",
-  "keyboard_shortcuts.enter": "Digeriñ an toud",
+  "keyboard_shortcuts.enter": "Digeriñ an embannadur",
   "keyboard_shortcuts.favourite": "Ouzhpennañ an embannadur d'ar re vuiañ-karet",
   "keyboard_shortcuts.favourites": "Digeriñ roll an embannadurioù muiañ-karet",
   "keyboard_shortcuts.federated": "Digeriñ ar red-amzer kevredet",
@@ -329,74 +394,101 @@
   "keyboard_shortcuts.legend": "Skrammañ ar skrid-se",
   "keyboard_shortcuts.local": "Digeriñ red-amzer lec'hel",
   "keyboard_shortcuts.mention": "Menegiñ an aozer.ez",
-  "keyboard_shortcuts.muted": "Digeriñ roll an implijer.ezed.ien kuzhet",
+  "keyboard_shortcuts.muted": "Digeriñ roll an implijerien·ezed kuzhet",
   "keyboard_shortcuts.my_profile": "Digeriñ ho profil",
   "keyboard_shortcuts.notifications": "Digeriñ bann ar c'hemennoù",
   "keyboard_shortcuts.open_media": "Digeriñ ar media",
-  "keyboard_shortcuts.pinned": "Digeriñ listenn an toudoù spilhennet",
+  "keyboard_shortcuts.pinned": "Digeriñ listenn an embannadurioù spilhennet",
   "keyboard_shortcuts.profile": "Digeriñ profil an aozer.ez",
-  "keyboard_shortcuts.reply": "Respont d'an toud",
+  "keyboard_shortcuts.quote": "Menegiñ an embannadur",
+  "keyboard_shortcuts.reply": "Respont d'an embannadur",
   "keyboard_shortcuts.requests": "Digeriñ roll goulennoù heuliañ",
   "keyboard_shortcuts.search": "Fokus barenn klask",
   "keyboard_shortcuts.spoilers": "da guzhat/ziguzhat tachenn CW",
   "keyboard_shortcuts.start": "Digeriñ bann \"Kregiñ\"",
   "keyboard_shortcuts.toggle_hidden": "da guzhat/ziguzhat an desten a-dreñv CW",
   "keyboard_shortcuts.toggle_sensitivity": "da guzhat/ziguzhat ur media",
-  "keyboard_shortcuts.toot": "Kregiñ gant un toud nevez",
+  "keyboard_shortcuts.toot": "Kregiñ gant un embannadur nevez",
+  "keyboard_shortcuts.translate": "da dreiñ un embannadur",
   "keyboard_shortcuts.unfocus": "Difokus an dachenn testenn/klask",
   "keyboard_shortcuts.up": "Pignat er roll",
+  "learn_more_link.got_it": "Mat eo",
   "lightbox.close": "Serriñ",
   "lightbox.next": "Da-heul",
   "lightbox.previous": "A-raok",
-  "limited_account_hint.action": "Diskouez an aelad memes tra",
+  "limited_account_hint.action": "Diskouez ar profil memes tra",
   "limited_account_hint.title": "Kuzhet eo bet ar profil-mañ gant an evezhierien eus {domain}.",
   "link_preview.author": "Gant {name}",
+  "link_preview.more_from_author": "Muioc'h gant {name}",
+  "link_preview.shares": "{count, plural, one {{counter} embannadur} two {{counter} embannadur} few {{counter} embannadur} many {{counter} embannadur} other {{counter} embannadur}}",
   "lists.add_member": "Ouzhpennañ",
   "lists.add_to_list": "Ouzhpennañ d'al listenn",
   "lists.create": "Krouiñ",
+  "lists.create_a_list_to_organize": "Krouit ul listenn evit renkañ ho red degemer",
   "lists.create_list": "Krouiñ ul listenn",
   "lists.delete": "Dilemel al listenn",
   "lists.done": "Graet",
   "lists.edit": "Kemmañ al listenn",
   "lists.list_name": "Anv al listenn",
-  "lists.replies_policy.followed": "Pep implijer.ez heuliet",
+  "lists.new_list_name": "Anv nevez al listenn",
+  "lists.no_lists_yet": "Listenn ebet c'hoazh.",
+  "lists.remove_member": "Dilemel",
+  "lists.replies_policy.followed": "Pep implijer·ez heuliet",
   "lists.replies_policy.list": "Izili ar roll",
   "lists.replies_policy.none": "Den ebet",
+  "lists.save": "Enrollañ",
+  "lists.search": "Klask",
   "load_pending": "{count, plural, one {# dra nevez} other {# dra nevez}}",
   "loading_indicator.label": "O kargañ…",
+  "media_gallery.hide": "Kuzhat",
+  "mute_modal.hide_from_notifications": "Kuzhat er c'hemennoù",
+  "mute_modal.hide_options": "Dibarzhioù ar c'huzhat",
+  "mute_modal.show_options": "Dibarzhioù an diskwel",
+  "mute_modal.title": "Kuzhat an implijer·ez?",
   "navigation_bar.about": "Diwar-benn",
   "navigation_bar.account_settings": "Ger-tremen ha surentez",
+  "navigation_bar.administration": "Merañ",
   "navigation_bar.automated_deletion": "Dilemel an embannadenn ent-emgefreek",
-  "navigation_bar.blocks": "Implijer·ezed·ien berzet",
+  "navigation_bar.blocks": "Implijerien·ezed stanket",
   "navigation_bar.bookmarks": "Sinedoù",
   "navigation_bar.direct": "Menegoù prevez",
-  "navigation_bar.domain_blocks": "Domanioù kuzhet",
+  "navigation_bar.domain_blocks": "Domanioù stanket",
   "navigation_bar.favourites": "Muiañ-karet",
   "navigation_bar.filters": "Gerioù kuzhet",
-  "navigation_bar.follow_requests": "Pedadoù heuliañ",
-  "navigation_bar.followed_tags": "Hashtagoù o heuliañ",
+  "navigation_bar.follow_requests": "Rekedoù heuliañ",
+  "navigation_bar.followed_tags": "Gerioù-klik heuliet",
   "navigation_bar.follows_and_followers": "Heuliadennoù ha heulier·ezed·ien",
   "navigation_bar.import_export": "Enporzhiañ hag ezporzhiañ",
   "navigation_bar.lists": "Listennoù",
-  "navigation_bar.logout": "Digennaskañ",
+  "navigation_bar.live_feed_local": "Red war-eeun (lec'hel)",
+  "navigation_bar.live_feed_public": "Red war-eeun (foran)",
+  "navigation_bar.logout": "Digevreañ",
+  "navigation_bar.moderation": "Habaskadur",
   "navigation_bar.more": "Muioc'h",
-  "navigation_bar.mutes": "Implijer·ion·ezed kuzhet",
+  "navigation_bar.mutes": "Implijerien·ezed kuzhet",
   "navigation_bar.preferences": "Gwellvezioù",
   "navigation_bar.search": "Klask",
   "navigation_bar.search_trends": "Klask / Diouzh ar c'hiz",
   "not_signed_in_indicator.not_signed_in": "Ret eo deoc'h kevreañ evit tizhout an danvez-se.",
   "notification.admin.report": "Disklêriet eo bet {target} gant {name}",
   "notification.admin.sign_up": "{name} en·he deus lakaet e·hec'h anv",
+  "notification.favourite": "Gant {name} eo bet ouzhpennet hoc'h embannadur d'h·e re vuiañ-karet",
   "notification.follow": "heuliañ a ra {name} ac'hanoc'h",
   "notification.follow.name_and_others": "{name} <a>{count, plural, one {hag # den all} two {ha # zen all} few {ha # den all} many {ha # den all} other {ha # den all}}</a> zo o heuliañ ac'hanoc'h",
   "notification.follow_request": "Gant {name} eo bet goulennet ho heuliañ",
+  "notification.label.quote": "Gant {name} eo bet meneget hoc'h embannadur",
   "notification.label.reply": "Respont",
+  "notification.mention": "Meneg",
+  "notification.mentioned_you": "Gant {name} oc'h bet meneget",
   "notification.moderation-warning.learn_more": "Gouzout hiroc'h",
+  "notification.moderation_warning.action_disable": "Diweredekaet eo bet ho kont.",
+  "notification.moderation_warning.action_suspend": "Astalet eo bet ho kont.",
   "notification.own_poll": "Echu eo ho sontadeg",
-  "notification.reblog": "Gant {name} eo bet skignet ho toud",
+  "notification.quoted_update": "Gant {name} eo bet kemmet un embannadur meneget ganeoc'h",
+  "notification.reblog": "Gant {name} eo bet skignet hoc'h embannadur",
   "notification.relationships_severance_event.learn_more": "Gouzout hiroc'h",
-  "notification.status": "Emañ {name} o paouez toudañ",
-  "notification.update": "Gant {name} ez eus bet kemmet un toud",
+  "notification.status": "Emañ {name} o paouez embann",
+  "notification.update": "Gant {name} ez eus bet kemmet un embannadur",
   "notification_requests.accept": "Asantiñ",
   "notification_requests.dismiss": "Diverkañ",
   "notification_requests.edit_selection": "Kemmañ",
@@ -407,19 +499,21 @@
   "notifications.column_settings.admin.sign_up": "Enskrivadurioù nevez :",
   "notifications.column_settings.alert": "Kemennoù war ar burev",
   "notifications.column_settings.favourite": "Muiañ-karet:",
+  "notifications.column_settings.filter_bar.advanced": "Diskouez an holl rummadoù",
   "notifications.column_settings.follow": "Heulierien nevez:",
-  "notifications.column_settings.follow_request": "Pedadoù heuliañ nevez :",
+  "notifications.column_settings.follow_request": "Rekedoù heuliañ nevez:",
   "notifications.column_settings.group": "Strollañ",
   "notifications.column_settings.mention": "Menegoù:",
   "notifications.column_settings.poll": "Disoc'hoù ar sontadeg:",
   "notifications.column_settings.push": "Kemennoù push",
+  "notifications.column_settings.quote": "Menegoù:",
   "notifications.column_settings.reblog": "Skignadennoù:",
   "notifications.column_settings.show": "Diskouez er bann",
   "notifications.column_settings.sound": "Seniñ",
-  "notifications.column_settings.status": "Toudoù nevez :",
+  "notifications.column_settings.status": "Embannadurioù nevez:",
   "notifications.column_settings.unread_notifications.category": "Kemennoù anlennet",
   "notifications.column_settings.unread_notifications.highlight": "Uslinennañ ar c'hemennoù anlennet",
-  "notifications.column_settings.update": "Kemmoù :",
+  "notifications.column_settings.update": "Kemmoù:",
   "notifications.filter.all": "Pep tra",
   "notifications.filter.boosts": "Skignadennoù",
   "notifications.filter.favourites": "Muiañ-karet",
@@ -431,13 +525,15 @@
   "notifications.group": "{count} a gemennoù",
   "notifications.mark_as_read": "Merkañ an holl kemennoù evel bezañ lennet",
   "notifications.permission_denied": "Kemennoù war ar burev n'int ket hegerz rak pedadenn aotren ar merdeer a zo bet nullet araok",
-  "notifications.permission_denied_alert": "Kemennoù wa ar burev na c'hellont ket bezañ lezelet, rak aotre ar merdeer a zo bet nac'het a-raok",
+  "notifications.permission_denied_alert": "Kemennoù war ar burev na c'hellont ket bezañ lezelet, rak aotre ar merdeer a zo bet nac'het a-raok",
   "notifications.permission_required": "Kemennoù war ar burev n'int ket hegerz abalamour d'an aotre rekis n'eo ket bet roet.",
   "notifications.policy.accept": "Asantiñ",
   "notifications.policy.accept_hint": "Diskouez er c’hemennoù",
   "notifications.policy.drop": "Tremen e-bioù",
   "notifications.policy.filter": "Silañ",
   "notifications.policy.filter_new_accounts_title": "Kontoù nevez",
+  "notifications.policy.filter_not_followers_title": "Tud na heuliont ket ac'hanoc'h",
+  "notifications.policy.filter_not_following_title": "Tud n'int ket heuliet ganeoc'h",
   "notifications_permission_banner.enable": "Lezel kemennoù war ar burev",
   "notifications_permission_banner.how_to_control": "Evit reseviñ kemennoù pa ne vez ket digoret Mastodon, lezelit kemennoù war ar burev. Gallout a rit kontrollañ peseurt eskemmoù a c'henel kemennoù war ar burev gant ar {icon} nozelenn a-us kentre ma'z int lezelet.",
   "notifications_permission_banner.title": "Na vankit netra morse",
@@ -447,8 +543,9 @@
   "onboarding.profile.display_name": "Anv diskouezet",
   "onboarding.profile.display_name_hint": "Hoc'h anv klok pe hoc'h anv fentus…",
   "onboarding.profile.note": "Berr-ha-berr",
-  "onboarding.profile.note_hint": "Gallout a rit @menegiñ tud all pe #hashtagoù…",
+  "onboarding.profile.note_hint": "Gallout a rit @menegiñ tud all pe #gerioù-klik…",
   "onboarding.profile.save_and_continue": "Enrollañ ha kenderc'hel",
+  "onboarding.profile.title": "Kefluniañ ar profil",
   "onboarding.profile.upload_avatar": "Enporzhiañ ur skeudenn profil",
   "password_confirmation.mismatching": "Disheñvel eo an daou c'her-termen-se",
   "picture_in_picture.restore": "Adlakaat",
@@ -463,12 +560,18 @@
   "poll_button.add_poll": "Ouzhpennañ ur sontadeg",
   "poll_button.remove_poll": "Dilemel ar sontadeg",
   "privacy.change": "Cheñch prevezded an embannadur",
+  "privacy.direct.long": "Pep hini meneget en embannadur",
+  "privacy.private.long": "Hoc'h heulierien·ezed hepken",
   "privacy.private.short": "Heulierien",
   "privacy.public.short": "Publik",
+  "privacy.quote.anyone": "{visibility}, n'eus forzh piv a c'hall menegiñ",
+  "privacy.quote.disabled": "{visibility}, menegoù diweredekaet",
   "privacy_policy.last_updated": "Hizivadenn ziwezhañ {date}",
   "privacy_policy.title": "Reolennoù Prevezded",
+  "quote_error.poll": "N'haller ket menegiñ sontadegoù.",
   "recommended": "Erbedet",
   "refresh": "Freskaat",
+  "regeneration_indicator.preparing_your_home_feed": "O prientiñ ho red degemer…",
   "relative_time.days": "{number}d",
   "relative_time.full.days": "{number, plural, one {# devezh} two {# zevezh} few {# devezh} many {# a devezh} other {# devezh}} zo",
   "relative_time.full.hours": "{number, plural, one {# eurvezh} two {# eurvezh} few {# eurvezh} many {# eur} other {# eurvezh}} zo",
@@ -480,10 +583,12 @@
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}eil",
   "relative_time.today": "hiziv",
+  "remove_quote_hint.button_label": "Mat eo",
+  "remove_quote_hint.title": "Fellout a ra deoc'h dilemel ho menegiñ an embannadur?",
   "reply_indicator.cancel": "Nullañ",
   "reply_indicator.poll": "Sontadeg",
   "report.block": "Stankañ",
-  "report.block_explanation": "Ne vo ket gwelet toudoù ar gont-se ken. Ne welo ket ho toudoù ha ne c'hello ket ho heuliañ ken. Gouzout a raio eo bet stanket ganeoc'h.",
+  "report.block_explanation": "Ne vo ket gwelet embannadurioù ar gont-se ken. Ne welo ket hoc'h embannadurioù ha ne c'hello ket ho heuliañ ken. Gouzout a raio eo bet stanket ganeoc'h.",
   "report.categories.legal": "Lezennel",
   "report.categories.other": "All",
   "report.categories.spam": "Spam",
@@ -491,13 +596,13 @@
   "report.category.subtitle": "Choazit ar pezh a glot ar gwellañ",
   "report.category.title": "Lârit deomp petra c'hoarvez gant {type}",
   "report.category.title_account": "profil",
-  "report.category.title_status": "an toud-mañ",
+  "report.category.title_status": "an embannadur-mañ",
   "report.close": "Graet",
   "report.comment.title": "Ha traoù all a rankfemp gouzout ?",
   "report.forward": "Treuzkas da: {target}",
   "report.forward_hint": "War ur servijer all emañ ar c'hont-se. Kas dezhañ un adskrid disanv eus an danevell ivez?",
   "report.mute": "Kuzhat",
-  "report.mute_explanation": "Ne vo ket gwelet toudoù ar gont-se ken. Gwelet ho toudoù ha ho heuliañ a c'hello ha ne ouezo ket eo bet kuzhet ganeoc'h.",
+  "report.mute_explanation": "Ne vo ket gwelet embannadurioù ar gont-se ken. Gwelet hoc'h embannadurioù ha ho heuliañ a c'hello ha ne ouezo ket eo bet kuzhet ganeoc'h.",
   "report.next": "War-raok",
   "report.placeholder": "Askelennoù ouzhpenn",
   "report.reasons.dislike": "Ne blij ket din",
@@ -512,7 +617,7 @@
   "report.rules.subtitle": "Diuzit an holl draoù a glot",
   "report.rules.title": "Pesort reolennoù zo bet torret ?",
   "report.statuses.subtitle": "Diuzit an holl draoù a glot",
-  "report.statuses.title": "Ha toudoù all zo a c'hallfe nerzhañ an disklêriadenn-se ?",
+  "report.statuses.title": "Hag embannadurioù all zo a c'hallfe nerzhañ an disklêriadenn-se?",
   "report.submit": "Kinnig",
   "report.target": "O tisklêriañ {target}",
   "report.thanks.title": "Ne fell ket deoc'h gwelet an dra-se ?",
@@ -528,9 +633,9 @@
   "search.placeholder": "Klask",
   "search.quick_action.account_search": "Profiloù a glot gant {x}",
   "search.quick_action.go_to_account": "Mont d'ar profil {x}",
-  "search.quick_action.go_to_hashtag": "Mont d'an hashtag {x}",
+  "search.quick_action.go_to_hashtag": "Mont d'ar ger-klik {x}",
   "search.quick_action.open_url": "Digeriñ an URL e-barzh Mastodon",
-  "search.quick_action.status_search": "Embannadurioù a glot gant {x}",
+  "search.quick_action.status_search": "Toudoù a glot gant {x}",
   "search.search_or_paste": "Klask pe pegañ un URL",
   "search_popout.full_text_search_disabled_message": "N'eo ket da gaout war {domain}.",
   "search_popout.language_code": "Kod yezh ISO",
@@ -541,7 +646,7 @@
   "search_popout.user": "implijer·ez",
   "search_results.accounts": "Profiloù",
   "search_results.all": "Pep tra",
-  "search_results.hashtags": "Hashtagoù",
+  "search_results.hashtags": "Gerioù-klik",
   "search_results.no_results": "Disoc'h ebet.",
   "search_results.see_all": "Gwelet pep tra",
   "search_results.statuses": "Toudoù",
@@ -550,16 +655,18 @@
   "server_banner.server_stats": "Stadegoù ar servijer :",
   "sign_in_banner.create_account": "Krouiñ ur gont",
   "sign_in_banner.sign_in": "Kevreañ",
-  "sign_in_banner.sso_redirect": "Kennaskañ pe lakaat hoc'h anv",
+  "sign_in_banner.sso_redirect": "Kevreañ pe lakaat hoc'h anv",
   "status.admin_account": "Digeriñ etrefas evezhiañ evit @{name}",
   "status.admin_domain": "Digeriñ an etrefas evezhiañ evit {domain}",
   "status.admin_status": "Digeriñ an embannadenn e-barzh an etrefas evezhiañ",
-  "status.block": "Berzañ @{name}",
+  "status.all_disabled": "Diweredekaet eo ar skignañ hag ar menegiñ",
+  "status.block": "Stankañ @{name}",
   "status.bookmark": "Ouzhpennañ d'ar sinedoù",
   "status.cancel_reblog_private": "Nac'hañ ar skignadenn",
   "status.cannot_reblog": "Ar c'hannad-se na c'hall ket bezañ skignet",
   "status.copy": "Eilañ liamm ar c'hannad",
   "status.delete": "Dilemel",
+  "status.delete.success": "Embannadur dilamet",
   "status.detailed_status": "Gwel kaozeadenn munudek",
   "status.direct": "Menegiñ @{name} ent-prevez",
   "status.direct_indicator": "Meneg prevez",
@@ -580,14 +687,19 @@
   "status.mute_conversation": "Kuzhat ar gaozeadenn",
   "status.open": "Digeriñ ar c'hannad-mañ",
   "status.pin": "Spilhennañ d'ar profil",
-  "status.quote_post_author": "Embannadenn gant {name}",
+  "status.quote": "Menegiñ",
+  "status.quote.cancel": "Nullañ ar menegiñ",
+  "status.quote_error.not_available": "Embannadur dihegerz",
+  "status.quote_policy_change": "Cheñch piv a c'hall menegiñ",
   "status.read_more": "Lenn muioc'h",
   "status.reblog": "Skignañ",
-  "status.reblog_private": "Skignañ gant ar weledenn gentañ",
+  "status.reblog_or_quote": "Skignañ pe menegiñ",
+  "status.reblog_private": "Skignañ d'hoc'h heulierien·ezed adarre",
   "status.reblogged_by": "Skignet gant {name}",
   "status.reblogs.empty": "Den ebet n'eus skignet ar c'hannad-mañ c'hoazh. Pa vo graet gant unan bennak e teuio war wel amañ.",
   "status.redraft": "Diverkañ ha skrivañ en-dro",
   "status.remove_bookmark": "Dilemel ar sined",
+  "status.remove_favourite": "Dilemel eus ar re vuiañ-karet",
   "status.replied_to": "Respont da {name}",
   "status.reply": "Respont",
   "status.replyAll": "Respont d'ar gaozeadenn",
@@ -606,6 +718,7 @@
   "subscribed_languages.save": "Enrollañ ar cheñchamantoù",
   "subscribed_languages.target": "Cheñch ar yezhoù koumanantet evit {target}",
   "tabs_bar.home": "Degemer",
+  "tabs_bar.menu": "Lañser",
   "tabs_bar.notifications": "Kemennoù",
   "tabs_bar.publish": "Embannadenn nevez",
   "tabs_bar.search": "Klask",
@@ -636,5 +749,11 @@
   "video.fullscreen": "Skramm a-bezh",
   "video.hide": "Kuzhat ar video",
   "video.pause": "Paouez",
-  "video.play": "Lenn"
+  "video.play": "Lenn",
+  "visibility_modal.privacy_label": "Gwelusted",
+  "visibility_modal.quote_followers": "Tud koumanantet hepken",
+  "visibility_modal.quote_label": "Piv a c'hall menegiñ",
+  "visibility_modal.quote_nobody": "Me hepken",
+  "visibility_modal.quote_public": "Pep den",
+  "visibility_modal.save": "Enrollañ"
 }
diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json
index 5c29a0ca3a6..956420026ac 100644
--- a/app/javascript/mastodon/locales/ca.json
+++ b/app/javascript/mastodon/locales/ca.json
@@ -28,6 +28,7 @@
   "account.disable_notifications": "Deixa de notificar-me els tuts de @{name}",
   "account.domain_blocking": "Bloquem el domini",
   "account.edit_profile": "Edita el perfil",
+  "account.edit_profile_short": "Edita",
   "account.enable_notifications": "Notifica'm els tuts de @{name}",
   "account.endorse": "Recomana en el perfil",
   "account.familiar_followers_many": "Seguit per {name1}, {name2} i {othersCount, plural, one {# altre compte} other {# altres comptes}} que coneixeu",
@@ -40,6 +41,11 @@
   "account.featured_tags.last_status_never": "No hi ha tuts",
   "account.follow": "Segueix",
   "account.follow_back": "Segueix tu també",
+  "account.follow_back_short": "Segueix tu també",
+  "account.follow_request": "Sol·licita seguir",
+  "account.follow_request_cancel": "Cancel·la la petició",
+  "account.follow_request_cancel_short": "Cancel·la",
+  "account.follow_request_short": "Petició",
   "account.followers": "Seguidors",
   "account.followers.empty": "A aquest usuari encara no el segueix ningú.",
   "account.followers_counter": "{count, plural, one {{counter} seguidor} other {{counter} seguidors}}",
@@ -70,7 +76,6 @@
   "account.posts_with_replies": "Tuts i respostes",
   "account.remove_from_followers": "Elimina {name} dels seguidors",
   "account.report": "Informa sobre @{name}",
-  "account.requested": "S'espera l'aprovació. Clica per a cancel·lar la petició de seguiment",
   "account.requested_follow": "{name} ha demanat de seguir-te",
   "account.requests_to_follow_you": "Peticions de seguir-vos",
   "account.share": "Comparteix el perfil de @{name}",
@@ -219,6 +224,13 @@
   "confirmations.delete_list.confirm": "Elimina",
   "confirmations.delete_list.message": "Segur que vols suprimir permanentment aquesta llista?",
   "confirmations.delete_list.title": "Eliminar la llista?",
+  "confirmations.discard_draft.confirm": "Descarta i continua",
+  "confirmations.discard_draft.edit.cancel": "Continua l'edició",
+  "confirmations.discard_draft.edit.message": "Continuar descartarà tots els canvis que hàgiu fet a la publicació que editeu.",
+  "confirmations.discard_draft.edit.title": "Descartar els canvis a la publicació?",
+  "confirmations.discard_draft.post.cancel": "Reprendre l'esborrany",
+  "confirmations.discard_draft.post.message": "Continuar descartarà la publicació que escriviu.",
+  "confirmations.discard_draft.post.title": "Descartar l'esborrany?",
   "confirmations.discard_edit_media.confirm": "Descarta",
   "confirmations.discard_edit_media.message": "Tens canvis no desats en la descripció del contingut o en la previsualització, els vols descartar?",
   "confirmations.follow_to_list.confirm": "Seguir i afegir a una llista",
@@ -232,15 +244,23 @@
   "confirmations.missing_alt_text.secondary": "Publica-la igualment",
   "confirmations.missing_alt_text.title": "Hi voleu afegir text alternatiu?",
   "confirmations.mute.confirm": "Silencia",
+  "confirmations.quiet_post_quote_info.dismiss": "No m'ho tornis a recordar",
+  "confirmations.quiet_post_quote_info.got_it": "Entesos",
   "confirmations.redraft.confirm": "Esborra i reescriu",
   "confirmations.redraft.message": "Segur que vols eliminar aquest tut i tornar a escriure'l? Es perdran tots els impulsos i els favorits, i les respostes al tut original quedaran aïllades.",
   "confirmations.redraft.title": "Esborrar i reescriure la publicació?",
   "confirmations.remove_from_followers.confirm": "Elimina el seguidor",
   "confirmations.remove_from_followers.message": "{name} deixarà de seguir-vos. Tirem endavant?",
   "confirmations.remove_from_followers.title": "Eliminem el seguidor?",
+  "confirmations.revoke_quote.confirm": "Eliminar la publicació",
+  "confirmations.revoke_quote.message": "Aquesta acció no es pot desfer.",
+  "confirmations.revoke_quote.title": "Eliminar la publicació?",
+  "confirmations.unblock.confirm": "Desbloca",
+  "confirmations.unblock.title": "Desblocar {name}?",
   "confirmations.unfollow.confirm": "Deixa de seguir",
-  "confirmations.unfollow.message": "Segur que vols deixar de seguir {name}?",
-  "confirmations.unfollow.title": "Deixar de seguir l'usuari?",
+  "confirmations.unfollow.title": "Deixar de seguir {name}?",
+  "confirmations.withdraw_request.confirm": "Retirar la sol·licitud",
+  "confirmations.withdraw_request.title": "Retirar la sol·licitud de seguir {name}?",
   "content_warning.hide": "Amaga la publicació",
   "content_warning.show": "Mostra-la igualment",
   "content_warning.show_more": "Mostra'n més",
@@ -282,6 +302,7 @@
   "domain_pill.your_handle": "El vostre identificador:",
   "domain_pill.your_server": "La vostra llar digital, on són totes les vostres publicacions. No us agrada aquesta? Canvieu de servidor quan vulgueu i emporteu-vos els vostres seguidors.",
   "domain_pill.your_username": "El vostre identificador únic en aquest servidor. Hi pot haver usuaris amb el mateix nom a diferents servidors.",
+  "dropdown.empty": "Seleccioneu una opció",
   "embed.instructions": "Incrusta aquest tut a la teva pàgina web copiant el codi següent.",
   "embed.preview": "Aquest aspecte tindrà:",
   "emoji_button.activity": "Activitat",
@@ -417,8 +438,6 @@
   "hints.profiles.see_more_followers": "Vegeu més seguidors a {domain}",
   "hints.profiles.see_more_follows": "Vegeu més seguiments a {domain}",
   "hints.profiles.see_more_posts": "Vegeu més publicacions a {domain}",
-  "hints.threads.replies_may_be_missing": "Es poden haver perdut respostes d'altres servidors.",
-  "hints.threads.see_more": "Vegeu més respostes a {domain}",
   "home.column_settings.show_quotes": "Mostrar les cites",
   "home.column_settings.show_reblogs": "Mostra els impulsos",
   "home.column_settings.show_replies": "Mostra les respostes",
@@ -439,20 +458,12 @@
   "ignore_notifications_modal.not_following_title": "Voleu ignorar les notificacions de qui no seguiu?",
   "ignore_notifications_modal.private_mentions_title": "Voleu ignorar les notificacions de mencions privades no sol·licitades?",
   "info_button.label": "Ajuda",
-  "interaction_modal.action.favourite": "Per a continuar heu d'afavorir des del vostre compte.",
-  "interaction_modal.action.follow": "Per a continuar heu de seguir des del vostre compte.",
-  "interaction_modal.action.reblog": "Per a continuar heu d'impulsar des del vostre compte.",
-  "interaction_modal.action.reply": "Per a continuar heu de respondre des del vostre compte.",
-  "interaction_modal.action.vote": "Per a continuar heu de votar des del vostre compte.",
+  "interaction_modal.action": "Per a interactuar amb la publicació de {name} cal que inicieu la sessió en el servidor que feu servir.",
   "interaction_modal.go": "Endavant",
   "interaction_modal.no_account_yet": "Encara no teniu cap compte?",
   "interaction_modal.on_another_server": "A un altre servidor",
   "interaction_modal.on_this_server": "En aquest servidor",
-  "interaction_modal.title.favourite": "Afavoreix el tut de {name}",
-  "interaction_modal.title.follow": "Segueix {name}",
-  "interaction_modal.title.reblog": "Impulsa el tut de {name}",
-  "interaction_modal.title.reply": "Respon al tut de {name}",
-  "interaction_modal.title.vote": "Voteu l'enquesta de {name}",
+  "interaction_modal.title": "Inicieu la sessió per a continuar",
   "interaction_modal.username_prompt": "P. ex. {example}",
   "intervals.full.days": "{number, plural, one {# dia} other {# dies}}",
   "intervals.full.hours": "{number, plural, one {# hora} other {# hores}}",
@@ -481,6 +492,7 @@
   "keyboard_shortcuts.open_media": "Obre mèdia",
   "keyboard_shortcuts.pinned": "Obre la llista de tuts fixats",
   "keyboard_shortcuts.profile": "Obre el perfil de l'autor",
+  "keyboard_shortcuts.quote": "Citar la publicació",
   "keyboard_shortcuts.reply": "Respon al tut",
   "keyboard_shortcuts.requests": "Obre la llista de sol·licituds de seguiment",
   "keyboard_shortcuts.search": "Centra la barra de cerca",
@@ -492,6 +504,8 @@
   "keyboard_shortcuts.translate": "per a traduir una publicació",
   "keyboard_shortcuts.unfocus": "Descentra l'àrea de composició de text/cerca",
   "keyboard_shortcuts.up": "Apuja a la llista",
+  "learn_more_link.got_it": "Entesos",
+  "learn_more_link.learn_more": "Per a saber-ne més",
   "lightbox.close": "Tanca",
   "lightbox.next": "Següent",
   "lightbox.previous": "Anterior",
@@ -556,6 +570,8 @@
   "navigation_bar.follows_and_followers": "Seguint i seguidors",
   "navigation_bar.import_export": "Importació i exportació",
   "navigation_bar.lists": "Llistes",
+  "navigation_bar.live_feed_local": "Canal en directe (local)",
+  "navigation_bar.live_feed_public": "Canal en directe (públic)",
   "navigation_bar.logout": "Tanca la sessió",
   "navigation_bar.moderation": "Moderació",
   "navigation_bar.more": "Més",
@@ -564,7 +580,10 @@
   "navigation_bar.preferences": "Preferències",
   "navigation_bar.privacy_and_reach": "Privacitat i abast",
   "navigation_bar.search": "Cerca",
+  "navigation_bar.search_trends": "Cerca / En tendència",
+  "navigation_panel.collapse_followed_tags": "Comprimeix el menú d'etiquetes seguides",
   "navigation_panel.collapse_lists": "Tanca el menú",
+  "navigation_panel.expand_followed_tags": "Expandeix el menú d'etiquetes seguides",
   "navigation_panel.expand_lists": "Expandeix el menú",
   "not_signed_in_indicator.not_signed_in": "Cal que iniciïs la sessió per a accedir a aquest recurs.",
   "notification.admin.report": "{name} ha reportat {target}",
@@ -587,6 +606,7 @@
   "notification.label.mention": "Menció",
   "notification.label.private_mention": "Menció privada",
   "notification.label.private_reply": "Resposta en privat",
+  "notification.label.quote": "{name} ha citat la vostra publicació",
   "notification.label.reply": "Resposta",
   "notification.mention": "Menció",
   "notification.mentioned_you": "{name} us ha mencionat",
@@ -601,6 +621,7 @@
   "notification.moderation_warning.action_suspend": "S'ha suspès el vostre compte.",
   "notification.own_poll": "La teva enquesta ha finalitzat",
   "notification.poll": "Ha finalitzat una enquesta que heu respost",
+  "notification.quoted_update": "{name} ha editat una publicació que has citat",
   "notification.reblog": "{name} t'ha impulsat",
   "notification.reblog.name_and_others_with_link": "{name} i <a>{count, plural, one {# altre} other {# altres}}</a> han impulsat la vostra publicació",
   "notification.relationships_severance_event": "S'han perdut les connexions amb {name}",
@@ -644,6 +665,7 @@
   "notifications.column_settings.mention": "Mencions:",
   "notifications.column_settings.poll": "Resultats de l’enquesta:",
   "notifications.column_settings.push": "Notificacions push",
+  "notifications.column_settings.quote": "Cites:",
   "notifications.column_settings.reblog": "Impulsos:",
   "notifications.column_settings.show": "Mostra a la columna",
   "notifications.column_settings.sound": "Reprodueix so",
@@ -719,11 +741,18 @@
   "privacy.private.short": "Seguidors",
   "privacy.public.long": "Tothom dins o fora Mastodon",
   "privacy.public.short": "Públic",
+  "privacy.quote.anyone": "{visibility}, qualsevol pot citar",
+  "privacy.quote.disabled": "{visibility}, cites desactivades",
+  "privacy.quote.limited": "{visibility}, cites limitades",
   "privacy.unlisted.additional": "Es comporta igual que públic, excepte que la publicació no apareixerà als canals en directe o etiquetes, l'explora o a la cerca de Mastodon, fins i tot si ho heu activat a nivell de compte.",
-  "privacy.unlisted.long": "Menys fanfàrries algorísmiques",
+  "privacy.unlisted.long": "Amagat dels resultats de cerca de Mastodon, de les tendències i de les línies temporals",
   "privacy.unlisted.short": "Públic silenciós",
   "privacy_policy.last_updated": "Darrera actualització {date}",
   "privacy_policy.title": "Política de Privacitat",
+  "quote_error.poll": "Amb les enquestes no es permeten cites.",
+  "quote_error.quote": "Només es permet una cita alhora.",
+  "quote_error.unauthorized": "No se us permet de citar aquesta publicació.",
+  "quote_error.upload": "Amb media adjunts no es permeten cites.",
   "recommended": "Recomanat",
   "refresh": "Actualitza",
   "regeneration_indicator.please_stand_by": "Espereu.",
@@ -739,6 +768,9 @@
   "relative_time.minutes": "{number}min",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "avui",
+  "remove_quote_hint.button_label": "Entesos",
+  "remove_quote_hint.message": "Ho podeu fer des de {icon} al menú d'opcions.",
+  "remove_quote_hint.title": "Voleu eliminar la vostra publicació citada?",
   "reply_indicator.attachments": "{count, plural, one {# adjunt} other {# adjunts}}",
   "reply_indicator.cancel": "Cancel·la",
   "reply_indicator.poll": "Enquesta",
@@ -792,6 +824,7 @@
   "report_notification.categories.violation": "Violació de norma",
   "report_notification.categories.violation_sentence": "violació de normes",
   "report_notification.open": "Obre l'informe",
+  "search.clear": "Esborra la cerca",
   "search.no_recent_searches": "No hi ha cerques recents",
   "search.placeholder": "Cerca",
   "search.quick_action.account_search": "Perfils coincidint amb {x}",
@@ -829,13 +862,23 @@
   "status.admin_account": "Obre la interfície de moderació per a @{name}",
   "status.admin_domain": "Obre la interfície de moderació per a @{domain}",
   "status.admin_status": "Obre aquest tut a la interfície de moderació",
+  "status.all_disabled": "S'han deshabilitat impulsos i cites",
   "status.block": "Bloca @{name}",
   "status.bookmark": "Marca",
   "status.cancel_reblog_private": "Desfés l'impuls",
+  "status.cannot_quote": "No se't permet de citar aquesta publicació",
   "status.cannot_reblog": "No es pot impulsar aquest tut",
+  "status.contains_quote": "Conté una cita",
+  "status.context.loading": "Es carreguen més respostes",
+  "status.context.loading_error": "No s'han pogut carregar respostes noves",
+  "status.context.loading_success": "S'han carregat totes les respostes",
+  "status.context.more_replies_found": "S'han trobat més respostes",
+  "status.context.retry": "Torna-ho a provar",
+  "status.context.show": "Mostra",
   "status.continued_thread": "Continuació del fil",
   "status.copy": "Copia l'enllaç al tut",
   "status.delete": "Elimina",
+  "status.delete.success": "Publicació esborrada",
   "status.detailed_status": "Vista detallada de la conversa",
   "status.direct": "Menciona privadament @{name}",
   "status.direct_indicator": "Menció privada",
@@ -858,27 +901,43 @@
   "status.mute_conversation": "Silencia la conversa",
   "status.open": "Amplia el tut",
   "status.pin": "Fixa en el perfil",
+  "status.quote": "Cita",
+  "status.quote.cancel": "Canceŀlar la citació",
   "status.quote_error.filtered": "No es mostra a causa d'un dels vostres filtres",
-  "status.quote_error.not_found": "No es pot mostrar aquesta publicació.",
-  "status.quote_error.pending_approval": "Aquesta publicació està pendent d'aprovació per l'autor original.",
-  "status.quote_error.rejected": "No es pot mostrar aquesta publicació perquè l'autor original no en permet la citació.",
-  "status.quote_error.removed": "Aquesta publicació ha estat eliminada per l'autor.",
-  "status.quote_error.unauthorized": "No es pot mostrar aquesta publicació perquè no teniu autorització per a veure-la.",
-  "status.quote_post_author": "Publicació de {name}",
+  "status.quote_error.limited_account_hint.action": "Mostra-la igualment",
+  "status.quote_error.limited_account_hint.title": "Aquest perfil l'han amagat els moderadors de {domain}.",
+  "status.quote_error.not_available": "Publicació no disponible",
+  "status.quote_error.pending_approval": "Publicació pendent",
+  "status.quote_error.pending_approval_popout.body": "A Mastodon pots controlar si algú et pot citar. Aquesta publicació està pendent mentre esperem l'aprovació de l'autor original.",
+  "status.quote_error.revoked": "Publicació eliminada per l'autor",
+  "status.quote_followers_only": "Només els seguidors poden citar aquesta publicació",
+  "status.quote_manual_review": "L'autor ho revisarà manualment",
+  "status.quote_noun": "Cita",
+  "status.quote_policy_change": "Canvieu qui us pot citar",
+  "status.quote_post_author": "S'ha citat una publicació de @{name}",
+  "status.quote_private": "No es poden citar les publicacions privades",
+  "status.quotes": "{count, plural, one {cita} other {cites}}",
+  "status.quotes.empty": "Encara no ha citat aquesta publicació ningú. Quan ho faci algú apareixerà aquí.",
+  "status.quotes.local_other_disclaimer": "No es mostraran les cites rebutjades per l'autor.",
+  "status.quotes.remote_other_disclaimer": "Només es garanteix que es mostraran aquí les cites de {domain}. No es mostraran les rebutjades per l'autor.",
   "status.read_more": "Més informació",
   "status.reblog": "Impulsa",
-  "status.reblog_private": "Impulsa amb la visibilitat original",
+  "status.reblog_or_quote": "Impuls or cita",
+  "status.reblog_private": "Compartiu de nou amb els vostres seguidors",
   "status.reblogged_by": "impulsat per {name}",
   "status.reblogs": "{count, plural, one {impuls} other {impulsos}}",
   "status.reblogs.empty": "Encara no ha impulsat ningú aquest tut. Quan algú ho faci, apareixerà aquí.",
   "status.redraft": "Esborra i reescriu",
   "status.remove_bookmark": "Elimina el marcador",
   "status.remove_favourite": "Elimina dels preferits",
+  "status.remove_quote": "Elimina",
   "status.replied_in_thread": "Respost al fil",
   "status.replied_to": "En resposta a {name}",
   "status.reply": "Respon",
   "status.replyAll": "Respon al fil",
   "status.report": "Denuncia @{name}",
+  "status.request_quote": "Petició per a citar",
+  "status.revoke_quote": "Elimina la meva publicació de la de @{name}",
   "status.sensitive_warning": "Contingut sensible",
   "status.share": "Comparteix",
   "status.show_less_all": "Mostra'n menys per a tot",
@@ -916,6 +975,7 @@
   "upload_button.label": "Afegeix imatges, un vídeo o un fitxer d'àudio",
   "upload_error.limit": "S'ha superat el límit de càrrega d'arxius.",
   "upload_error.poll": "No es permet carregar fitxers a les enquestes.",
+  "upload_error.quote": "No es permet de carregat fitxer amb cites.",
   "upload_form.drag_and_drop.instructions": "Per a agafar un fitxer multimèdia adjunt, premeu l'espai o la tecla Enter. Mentre l'arrossegueu, utilitzeu les fletxes per a moure l'adjunt en qualsevol direcció. Premeu espai o Enter un altre cop per a deixar-lo anar a la seva nova posició, o premeu la tecla d'escapament per cancel·lar.",
   "upload_form.drag_and_drop.on_drag_cancel": "S'ha cancel·lat l'arrossegament. S'ha deixat anar l'adjunt multimèdia {item}.",
   "upload_form.drag_and_drop.on_drag_end": "S'ha deixat anar l'adjunt multimèdia {item}.",
@@ -938,5 +998,16 @@
   "video.skip_forward": "Salta endavant",
   "video.unmute": "Deixa de silenciar",
   "video.volume_down": "Abaixa el volum",
-  "video.volume_up": "Apuja el volum"
+  "video.volume_up": "Apuja el volum",
+  "visibility_modal.button_title": "Establiu la visibilitat",
+  "visibility_modal.header": "Visibilitat i interacció",
+  "visibility_modal.helper.direct_quoting": "No es poden citar mencions privades fetes a Mastondon.",
+  "visibility_modal.helper.private_quoting": "No es poden citar publicacions fetes a Mastodon només per a seguidors.",
+  "visibility_modal.helper.unlisted_quoting": "Quan la gent et citi les seves publicacions estaran amagades de les línies de temps de tendències.",
+  "visibility_modal.privacy_label": "Visibilitat",
+  "visibility_modal.quote_followers": "Només seguidors",
+  "visibility_modal.quote_label": "Qui pot citar",
+  "visibility_modal.quote_nobody": "Només jo",
+  "visibility_modal.quote_public": "Qualsevol",
+  "visibility_modal.save": "Desa"
 }
diff --git a/app/javascript/mastodon/locales/ckb.json b/app/javascript/mastodon/locales/ckb.json
index 7a7a1213d0c..ea27df84921 100644
--- a/app/javascript/mastodon/locales/ckb.json
+++ b/app/javascript/mastodon/locales/ckb.json
@@ -52,7 +52,6 @@
   "account.posts": "نووسراوەکان",
   "account.posts_with_replies": "توتس و وەڵامەکان",
   "account.report": "گوزارشت @{name}",
-  "account.requested": "چاوەڕێی ڕەزامەندین. کرتە بکە بۆ هەڵوەشاندنەوەی داواکاری شوێنکەوتن",
   "account.requested_follow": "{name} داوای کردووە شوێنت بکەوێت",
   "account.share": "پرۆفایلی @{name} هاوبەش بکە",
   "account.show_reblogs": "پیشاندانی بەرزکردنەوەکان لە @{name}",
@@ -161,7 +160,6 @@
   "confirmations.redraft.confirm": "سڕینەوە & دووبارە ڕەشکردنەوە",
   "confirmations.redraft.message": "دڵنیای دەتەوێت ئەم پۆستە بسڕیتەوە و دووبارە دایبڕێژیتەوە؟ فەڤۆریت و بووستەکان لەدەست دەچن، وەڵامەکانی پۆستە ئەسڵیەکەش هەتیو دەبن.",
   "confirmations.unfollow.confirm": "بەدوادانەچو",
-  "confirmations.unfollow.message": "ئایا دڵنیایت لەوەی دەتەوێت پەیڕەوی {name}?",
   "conversation.delete": "سڕینەوەی گفتوگۆ",
   "conversation.mark_as_read": "نیشانەکردن وەک خوێندراوە",
   "conversation.open": "نیشاندان گفتوگۆ",
@@ -275,9 +273,6 @@
   "home.show_announcements": "پیشاندانی راگەیەنراوەکان",
   "interaction_modal.on_another_server": "لەسەر ڕاژەیەکی جیا",
   "interaction_modal.on_this_server": "لەسەر ئەم ڕاژەیە",
-  "interaction_modal.title.follow": "دوای {name} بکەوە",
-  "interaction_modal.title.reblog": "پۆستی {name} زیاد بکە",
-  "interaction_modal.title.reply": "وەڵامی پۆستەکەی {name} بدەرەوە",
   "intervals.full.days": "{number, plural, one {# ڕۆژ} other {# ڕۆژەک}}",
   "intervals.full.hours": "{number, plural, one {# کات} other {# کات}}",
   "intervals.full.minutes": "{number, plural, one {# خولەک} other {# خولەک}}",
@@ -496,7 +491,6 @@
   "status.pin": "لکاندن لەسەر پرۆفایل",
   "status.read_more": "زیاتر بخوێنەوە",
   "status.reblog": "بەهێزکردن",
-  "status.reblog_private": "بەهێزکردن بۆ بینەرانی سەرەتایی",
   "status.reblogged_by": "{name} توتی کردەوە",
   "status.reblogs.empty": "کەس ئەم توتەی دووبارە نەتوتاندوە ،کاتێک کەسێک وا بکات، لێرە دەرئەکەون.",
   "status.redraft": "سڕینەوەی و دووبارە ڕەشنووس",
diff --git a/app/javascript/mastodon/locales/co.json b/app/javascript/mastodon/locales/co.json
index 27620400e79..ce58faf5e00 100644
--- a/app/javascript/mastodon/locales/co.json
+++ b/app/javascript/mastodon/locales/co.json
@@ -24,7 +24,6 @@
   "account.posts": "Statuti",
   "account.posts_with_replies": "Statuti è risposte",
   "account.report": "Palisà @{name}",
-  "account.requested": "In attesa d'apprubazione. Cliccate per annullà a dumanda",
   "account.share": "Sparte u prufile di @{name}",
   "account.show_reblogs": "Vede spartere da @{name}",
   "account.unblock": "Sbluccà @{name}",
@@ -88,7 +87,6 @@
   "confirmations.mute.confirm": "Piattà",
   "confirmations.redraft.confirm": "Sguassà è riscrive",
   "confirmations.unfollow.confirm": "Disabbunassi",
-  "confirmations.unfollow.message": "Site sicuru·a ch'ùn vulete più siguità @{name}?",
   "conversation.delete": "Sguassà a cunversazione",
   "conversation.mark_as_read": "Marcà cum'è lettu",
   "conversation.open": "Vede a cunversazione",
@@ -288,7 +286,6 @@
   "status.pin": "Puntarulà à u prufile",
   "status.read_more": "Leghje di più",
   "status.reblog": "Sparte",
-  "status.reblog_private": "Sparte à l'audienza uriginale",
   "status.reblogged_by": "{name} hà spartutu",
   "status.reblogs.empty": "Per avà nisunu hà spartutu u statutu. Quandu qualch'unu u sparterà, u so contu sarà mustratu quì.",
   "status.redraft": "Sguassà è riscrive",
diff --git a/app/javascript/mastodon/locales/cs.json b/app/javascript/mastodon/locales/cs.json
index f64a6196074..3ba60cb04c3 100644
--- a/app/javascript/mastodon/locales/cs.json
+++ b/app/javascript/mastodon/locales/cs.json
@@ -28,6 +28,7 @@
   "account.disable_notifications": "Přestat mě upozorňovat, když @{name} zveřejní příspěvek",
   "account.domain_blocking": "Blokované domény",
   "account.edit_profile": "Upravit profil",
+  "account.edit_profile_short": "Upravit",
   "account.enable_notifications": "Oznamovat mi příspěvky @{name}",
   "account.endorse": "Zvýraznit na profilu",
   "account.familiar_followers_many": "Sleduje je {name1}, {name2} a {othersCount, plural, one {jeden další, které znáte} few {# další, které znáte} many {# dalších, které znáte} other {# dalších, které znáte}}",
@@ -40,6 +41,11 @@
   "account.featured_tags.last_status_never": "Žádné příspěvky",
   "account.follow": "Sledovat",
   "account.follow_back": "Také sledovat",
+  "account.follow_back_short": "Také sledovat",
+  "account.follow_request": "Požádat o sledování",
+  "account.follow_request_cancel": "Zrušit požadavek",
+  "account.follow_request_cancel_short": "Zrušit",
+  "account.follow_request_short": "Požádat",
   "account.followers": "Sledující",
   "account.followers.empty": "Tohoto uživatele zatím nikdo nesleduje.",
   "account.followers_counter": "{count, plural, one {{counter} sledující} few {{counter} sledující} many {{counter} sledujících} other {{counter} sledujících}}",
@@ -70,7 +76,6 @@
   "account.posts_with_replies": "Příspěvky a odpovědi",
   "account.remove_from_followers": "Odebrat {name} ze sledujících",
   "account.report": "Nahlásit @{name}",
-  "account.requested": "Čeká na schválení. Kliknutím žádost o sledování zrušíte",
   "account.requested_follow": "{name} tě požádal o sledování",
   "account.requests_to_follow_you": "Žádosti o sledování",
   "account.share": "Sdílet profil @{name}",
@@ -239,15 +244,25 @@
   "confirmations.missing_alt_text.secondary": "Přesto odeslat",
   "confirmations.missing_alt_text.title": "Přidat popisek?",
   "confirmations.mute.confirm": "Skrýt",
+  "confirmations.quiet_post_quote_info.dismiss": "Znovu nepřípomínat",
+  "confirmations.quiet_post_quote_info.got_it": "Rozumím",
+  "confirmations.quiet_post_quote_info.message": "Při citování ztišeného veřejného příspěvku, váš příspěvek bude skrytý z os populárních příspěvků.",
+  "confirmations.quiet_post_quote_info.title": "Citování ztišených veřejných příspěvků",
   "confirmations.redraft.confirm": "Smazat a přepsat",
   "confirmations.redraft.message": "Jste si jistí, že chcete odstranit tento příspěvek a vytvořit z něj koncept? Oblíbené a boosty budou ztraceny a odpovědi na původní příspěvek ztratí kontext.",
   "confirmations.redraft.title": "Smazat a přepracovat příspěvek na koncept?",
   "confirmations.remove_from_followers.confirm": "Odstranit sledujícího",
   "confirmations.remove_from_followers.message": "{name} vás přestane sledovat. Jste si jisti, že chcete pokračovat?",
   "confirmations.remove_from_followers.title": "Odstranit sledujícího?",
+  "confirmations.revoke_quote.confirm": "Odstranit příspěvek",
+  "confirmations.revoke_quote.message": "Tuto akci nelze vrátit zpět.",
+  "confirmations.revoke_quote.title": "Odstranit příspěvek?",
+  "confirmations.unblock.confirm": "Odblokovat",
+  "confirmations.unblock.title": "Odblokovat {name}?",
   "confirmations.unfollow.confirm": "Přestat sledovat",
-  "confirmations.unfollow.message": "Opravdu chcete {name} přestat sledovat?",
-  "confirmations.unfollow.title": "Přestat sledovat uživatele?",
+  "confirmations.unfollow.title": "Přestat sledovat {name}?",
+  "confirmations.withdraw_request.confirm": "Zrušit žádost",
+  "confirmations.withdraw_request.title": "Zrušit žádost na sledování {name}?",
   "content_warning.hide": "Skrýt příspěvek",
   "content_warning.show": "Přesto zobrazit",
   "content_warning.show_more": "Zobrazit více",
@@ -289,6 +304,7 @@
   "domain_pill.your_handle": "Tvůj handle:",
   "domain_pill.your_server": "Tvůj digitální domov, kde žijí všechny tvé příspěvky. Nelíbí se ti? Kdykoliv se přesuň na jiný server a vezmi si sebou i své sledující.",
   "domain_pill.your_username": "Tvůj jedinečný identifikátor na tomto serveru. Je možné najít uživatele se stejným uživatelským jménem na jiných serverech.",
+  "dropdown.empty": "Vyberte možnost",
   "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",
@@ -424,8 +440,6 @@
   "hints.profiles.see_more_followers": "Zobrazit více sledujících na {domain}",
   "hints.profiles.see_more_follows": "Zobrazit další sledování na {domain}",
   "hints.profiles.see_more_posts": "Zobrazit další příspěvky na {domain}",
-  "hints.threads.replies_may_be_missing": "Odpovědi z jiných serverů mohou chybět.",
-  "hints.threads.see_more": "Zobrazit další odpovědi na {domain}",
   "home.column_settings.show_quotes": "Zobrazit citace",
   "home.column_settings.show_reblogs": "Zobrazit boosty",
   "home.column_settings.show_replies": "Zobrazit odpovědi",
@@ -447,20 +461,12 @@
   "ignore_notifications_modal.private_mentions_title": "Ignorovat oznámení z nevyžádaných soukromých zmínek?",
   "info_button.label": "Nápověda",
   "info_button.what_is_alt_text": "<h1>Co je to alt text?</h1> <p>Alt text poskytuje popis obrázků pro lidi se zrakovými postižením, špatným připojením něbo těm, kteří potřebují více kontextu.</p> <p>Můžete zlepšit přístupnost a porozumění napsáním jasného, stručného a objektivního alt textu.</p> <ul> <li>Zachyťte důležité prvky</li> <li>Shrňte text v obrázku</li> <li>Použijte pravidelnou větnou skladbu</li> <li>Vyhněte se nadbytečným informacím</li> <li>U komplexních vizualizací (diagramy, mapy...) se zaměřte na trendy a klíčová zjištění</li> </ul>",
-  "interaction_modal.action.favourite": "Chcete-li pokračovat, musíte oblíbit z vašeho účtu.",
-  "interaction_modal.action.follow": "Chcete-li pokračovat, musíte sledovat z vašeho účtu.",
-  "interaction_modal.action.reblog": "Chcete-li pokračovat, musíte dát boost z vašeho účtu.",
-  "interaction_modal.action.reply": "Chcete-li pokračovat, musíte odpovědět z vašeho účtu.",
-  "interaction_modal.action.vote": "Chcete-li pokračovat, musíte hlasovat z vašeho účtu.",
+  "interaction_modal.action": "Chcete-li interagovat s příspěvkem {name}, budete se muset přihlásit do vašeho účtu na Mastodon serveru, který používáte.",
   "interaction_modal.go": "Přejít",
   "interaction_modal.no_account_yet": "Ještě nemáte účet?",
   "interaction_modal.on_another_server": "Na jiném serveru",
   "interaction_modal.on_this_server": "Na tomto serveru",
-  "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}",
-  "interaction_modal.title.vote": "Hlasujte v anketě {name}",
+  "interaction_modal.title": "Chcete-li pokračovat, přihlaste se",
   "interaction_modal.username_prompt": "např. {example}",
   "intervals.full.days": "{number, plural, one {# den} few {# dny} many {# dní} other {# dní}}",
   "intervals.full.hours": "{number, plural, one {# hodina} few {# hodiny} many {# hodin} other {# hodin}}",
@@ -481,6 +487,7 @@
   "keyboard_shortcuts.home": "Otevřít domovskou časovou osu",
   "keyboard_shortcuts.hotkey": "Klávesová zkratka",
   "keyboard_shortcuts.legend": "Zobrazit tuto legendu",
+  "keyboard_shortcuts.load_more": "Zvýraznit tlačítko „Načíst více“",
   "keyboard_shortcuts.local": "Otevřít místní časovou osu",
   "keyboard_shortcuts.mention": "Zmínit autora",
   "keyboard_shortcuts.muted": "Otevřít seznam skrytých uživatelů",
@@ -489,6 +496,7 @@
   "keyboard_shortcuts.open_media": "Otevřít média",
   "keyboard_shortcuts.pinned": "Otevřít seznam připnutých příspěvků",
   "keyboard_shortcuts.profile": "Otevřít autorův profil",
+  "keyboard_shortcuts.quote": "Citovat příspěvek",
   "keyboard_shortcuts.reply": "Odpovědět na příspěvek",
   "keyboard_shortcuts.requests": "Otevřít seznam žádostí o sledování",
   "keyboard_shortcuts.search": "Zaměřit se na vyhledávací lištu",
@@ -500,6 +508,8 @@
   "keyboard_shortcuts.translate": "k přeložení příspěvku",
   "keyboard_shortcuts.unfocus": "Zrušit zaměření na nový příspěvek/hledání",
   "keyboard_shortcuts.up": "Posunout v seznamu nahoru",
+  "learn_more_link.got_it": "Rozumím",
+  "learn_more_link.learn_more": "Zjistit více",
   "lightbox.close": "Zavřít",
   "lightbox.next": "Další",
   "lightbox.previous": "Předchozí",
@@ -507,7 +517,7 @@
   "lightbox.zoom_out": "Přizpůsobit velikost",
   "limited_account_hint.action": "Přesto profil zobrazit",
   "limited_account_hint.title": "Tento profil byl skryt moderátory {domain}.",
-  "link_preview.author": "Podle {name}",
+  "link_preview.author": "Od {name}",
   "link_preview.more_from_author": "Více od {name}",
   "link_preview.shares": "{count, plural, one {{counter} příspěvek} few {{counter} příspěvky} many {{counter} příspěvků} other {{counter} příspěvků}}",
   "lists.add_member": "Přidat",
@@ -600,6 +610,7 @@
   "notification.label.mention": "Zmínka",
   "notification.label.private_mention": "Soukromá zmínka",
   "notification.label.private_reply": "Privátní odpověď",
+  "notification.label.quote": "{name} citovali váš příspěvek",
   "notification.label.reply": "Odpověď",
   "notification.mention": "Zmínka",
   "notification.mentioned_you": "{name} vás zmínil",
@@ -614,6 +625,7 @@
   "notification.moderation_warning.action_suspend": "Váš účet byl pozastaven.",
   "notification.own_poll": "Vaše anketa skončila",
   "notification.poll": "Anketa, ve které jste hlasovali, skončila",
+  "notification.quoted_update": "{name} upravili příspěvek, který jste citovali",
   "notification.reblog": "Uživatel {name} boostnul váš příspěvek",
   "notification.reblog.name_and_others_with_link": "{name} a {count, plural, one {<a># další</a> boostnul} few {<a># další</a> boostnuli} other {<a># dalších</a> boostnulo}} Váš příspěvek",
   "notification.relationships_severance_event": "Kontakt ztracen s {name}",
@@ -657,6 +669,7 @@
   "notifications.column_settings.mention": "Zmínky:",
   "notifications.column_settings.poll": "Výsledky anket:",
   "notifications.column_settings.push": "Push oznámení",
+  "notifications.column_settings.quote": "Citace:",
   "notifications.column_settings.reblog": "Boosty:",
   "notifications.column_settings.show": "Zobrazit ve sloupci",
   "notifications.column_settings.sound": "Přehrát zvuk",
@@ -732,11 +745,18 @@
   "privacy.private.short": "Sledující",
   "privacy.public.long": "Kdokoliv na Mastodonu i mimo něj",
   "privacy.public.short": "Veřejné",
+  "privacy.quote.anyone": "{visibility}, kdokoliv může citovat",
+  "privacy.quote.disabled": "{visibility}, citování je zakázáno",
+  "privacy.quote.limited": "{visibility}, citování je omezené",
   "privacy.unlisted.additional": "Chová se stejně jako veřejný, až na to, že se příspěvek neobjeví v živých kanálech nebo hashtazích, v objevování nebo vyhledávání na Mastodonu, a to i když je účet nastaven tak, aby se zde všude tyto příspěvky zobrazovaly.",
-  "privacy.unlisted.long": "Méně algoritmických fanfár",
+  "privacy.unlisted.long": "Skryté z výsledků vyhledávání na Mastodonu, trendujících příspěvků a veřejné časové osy",
   "privacy.unlisted.short": "Ztišené veřejné",
   "privacy_policy.last_updated": "Naposledy aktualizováno {date}",
   "privacy_policy.title": "Zásady ochrany osobních údajů",
+  "quote_error.poll": "Citování není u dotazníků povoleno.",
+  "quote_error.quote": "Je povoleno citovat pouze jednou.",
+  "quote_error.unauthorized": "Nemáte oprávnění citovat tento příspěvek.",
+  "quote_error.upload": "Není povoleno citovat s přílohami.",
   "recommended": "Doporučeno",
   "refresh": "Obnovit",
   "regeneration_indicator.please_stand_by": "Počkej prosím.",
@@ -752,6 +772,9 @@
   "relative_time.minutes": "{number} m",
   "relative_time.seconds": "{number} s",
   "relative_time.today": "dnes",
+  "remove_quote_hint.button_label": "Chápu",
+  "remove_quote_hint.message": "Můžete to udělat z {icon} nabídky možností.",
+  "remove_quote_hint.title": "Chcete odstranit citovaný příspěvek?",
   "reply_indicator.attachments": "{count, plural, one {{counter} příloha} few {{counter} přílohy} other {{counter} příloh}}",
   "reply_indicator.cancel": "Zrušit",
   "reply_indicator.poll": "Anketa",
@@ -843,13 +866,23 @@
   "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í",
+  "status.all_disabled": "Boosty a citace jsou zakázány",
   "status.block": "Blokovat @{name}",
   "status.bookmark": "Přidat do záložek",
   "status.cancel_reblog_private": "Zrušit boostnutí",
+  "status.cannot_quote": "Nemáte oprávnění citovat tento příspěvek",
   "status.cannot_reblog": "Tento příspěvek nemůže být boostnutý",
+  "status.contains_quote": "Obsahuje citaci",
+  "status.context.loading": "Načítání dalších odpovědí",
+  "status.context.loading_error": "Nelze načíst nové odpovědi",
+  "status.context.loading_success": "Všechny odpovědi načteny",
+  "status.context.more_replies_found": "Nalezeny další odpovědi",
+  "status.context.retry": "Zkusit znovu",
+  "status.context.show": "Zobrazit",
   "status.continued_thread": "Pokračuje ve vlákně",
   "status.copy": "Zkopírovat odkaz na příspěvek",
   "status.delete": "Smazat",
+  "status.delete.success": "Příspěvek byl smazán",
   "status.detailed_status": "Podrobné zobrazení konverzace",
   "status.direct": "Soukromě zmínit @{name}",
   "status.direct_indicator": "Soukromá zmínka",
@@ -872,27 +905,43 @@
   "status.mute_conversation": "Skrýt konverzaci",
   "status.open": "Rozbalit tento příspěvek",
   "status.pin": "Připnout na profil",
+  "status.quote": "Citovat",
+  "status.quote.cancel": "Zrušit citování",
   "status.quote_error.filtered": "Skryté kvůli jednomu z vašich filtrů",
-  "status.quote_error.not_found": "Tento příspěvek nelze zobrazit.",
-  "status.quote_error.pending_approval": "Tento příspěvek čeká na schválení od původního autora.",
-  "status.quote_error.rejected": "Tento příspěvek nemůže být zobrazen, protože původní autor neumožňuje, aby byl citován.",
-  "status.quote_error.removed": "Tento příspěvek byl odstraněn jeho autorem.",
-  "status.quote_error.unauthorized": "Tento příspěvek nelze zobrazit, protože nemáte oprávnění k jeho zobrazení.",
-  "status.quote_post_author": "Příspěvek od {name}",
+  "status.quote_error.limited_account_hint.action": "Přesto zobrazit",
+  "status.quote_error.limited_account_hint.title": "Tento účet byl skryt moderátory {domain}.",
+  "status.quote_error.not_available": "Příspěvek není dostupný",
+  "status.quote_error.pending_approval": "Příspěvek čeká na schválení",
+  "status.quote_error.pending_approval_popout.body": "Na Mastodonu můžete kontrolovat, zda vás někdo může citovat. Tento příspěvek čeká, dokud neobdržíme schválení od původního autora.",
+  "status.quote_error.revoked": "Příspěvek odstraněn autorem",
+  "status.quote_followers_only": "Pouze moji sledující mohou citovat tento příspěvek",
+  "status.quote_manual_review": "Autor provede manuální kontrolu",
+  "status.quote_noun": "Citace",
+  "status.quote_policy_change": "Změňte, kdo může citovat",
+  "status.quote_post_author": "Citovali příspěvek od @{name}",
+  "status.quote_private": "Soukromé příspěvky nelze citovat",
+  "status.quotes": "{count, plural, one {citace} few {citace} other {citací}}",
+  "status.quotes.empty": "Tento příspěvek zatím nikdo necitoval. Pokud tak někdo učiní, uvidíte to zde.",
+  "status.quotes.local_other_disclaimer": "Citace zamítnuté autorem nebudou zobrazeny.",
+  "status.quotes.remote_other_disclaimer": "Pouze citace z {domain} zde budou zaručeně ukázány. Citace zamítnuté autorem nebudou zobrazeny.",
   "status.read_more": "Číst více",
   "status.reblog": "Boostnout",
-  "status.reblog_private": "Boostnout s původní viditelností",
+  "status.reblog_or_quote": "Boostnout nebo citovat",
+  "status.reblog_private": "Sdílejte znovu se svými sledujícími",
   "status.reblogged_by": "Uživatel {name} boostnul",
   "status.reblogs": "{count, plural, one {boost} few {boosty} many {boostů} other {boostů}}",
   "status.reblogs.empty": "Tento příspěvek ještě nikdo neboostnul. Pokud to někdo udělá, zobrazí se zde.",
   "status.redraft": "Smazat a přepsat",
   "status.remove_bookmark": "Odstranit ze záložek",
   "status.remove_favourite": "Odebrat z oblíbených",
+  "status.remove_quote": "Odstranit",
   "status.replied_in_thread": "Odpověděli ve vlákně",
   "status.replied_to": "Odpověděl/a uživateli {name}",
   "status.reply": "Odpovědět",
   "status.replyAll": "Odpovědět na vlákno",
   "status.report": "Nahlásit @{name}",
+  "status.request_quote": "Požádat o možnost citovat",
+  "status.revoke_quote": "Odstranit můj příspěvek z příspěvku @{name}",
   "status.sensitive_warning": "Citlivý obsah",
   "status.share": "Sdílet",
   "status.show_less_all": "Zobrazit méně pro všechny",
@@ -930,6 +979,7 @@
   "upload_button.label": "Přidat obrázky, video nebo audio soubor",
   "upload_error.limit": "Byl překročen limit nahraných souborů.",
   "upload_error.poll": "Nahrávání souborů není povoleno s anketami.",
+  "upload_error.quote": "Nahrávání souboru není povoleno s citacemi.",
   "upload_form.drag_and_drop.instructions": "Chcete-li zvednout přílohu, stiskněte mezerník nebo enter. Při přetažení použijte klávesnicové šipky k přesunutí mediální přílohy v libovolném směru. Stiskněte mezerník nebo enter pro vložení přílohy do nové pozice, nebo stiskněte Esc pro ukončení.",
   "upload_form.drag_and_drop.on_drag_cancel": "Přetažení bylo zrušeno. Příloha {item} byla vrácena.",
   "upload_form.drag_and_drop.on_drag_end": "Příloha {item} byla vrácena.",
@@ -952,5 +1002,19 @@
   "video.skip_forward": "Přeskočit vpřed",
   "video.unmute": "Zrušit ztlumení",
   "video.volume_down": "Snížit hlasitost",
-  "video.volume_up": "Zvýšit hlasitost"
+  "video.volume_up": "Zvýšit hlasitost",
+  "visibility_modal.button_title": "Nastavit viditelnost",
+  "visibility_modal.header": "Viditelnost a interakce",
+  "visibility_modal.helper.direct_quoting": "Soukromé zmínky, které jsou vytvořeny na Mastodonu, nemohou být citovány ostatními.",
+  "visibility_modal.helper.privacy_editing": "Viditelnost nelze změnit po publikování příspěvku.",
+  "visibility_modal.helper.privacy_private_self_quote": "Citace vlastních soukromých příspěvků nelze zveřejnit.",
+  "visibility_modal.helper.private_quoting": "Příspěvky pouze pro sledující, které jsou vytvořeny na Mastodonu, nemohou být citovány ostatními.",
+  "visibility_modal.helper.unlisted_quoting": "Když vás lidé citují, jejich příspěvek bude v časové ose populárních příspěvků také skryt.",
+  "visibility_modal.instructions": "Nastavte, kdo bude moci interagovat s tímto příspěvkem. Tyto nastavení též můžete změnit pro všechny budoucí příspěvky v <link>Nastavení > Výchozí nastavení příspěvků</link>.",
+  "visibility_modal.privacy_label": "Viditelnost",
+  "visibility_modal.quote_followers": "Pouze sledující",
+  "visibility_modal.quote_label": "Kdo může citovat",
+  "visibility_modal.quote_nobody": "Jen já",
+  "visibility_modal.quote_public": "Kdokoliv",
+  "visibility_modal.save": "Uložit"
 }
diff --git a/app/javascript/mastodon/locales/cy.json b/app/javascript/mastodon/locales/cy.json
index da40f1e010b..7bd83922d92 100644
--- a/app/javascript/mastodon/locales/cy.json
+++ b/app/javascript/mastodon/locales/cy.json
@@ -28,6 +28,7 @@
   "account.disable_notifications": "Stopiwch fy hysbysu pan fydd @{name} yn postio",
   "account.domain_blocking": "Parthau'n cael eu rhwystro",
   "account.edit_profile": "Golygu'r proffil",
+  "account.edit_profile_short": "Golygu",
   "account.enable_notifications": "Rhowch wybod i fi pan fydd @{name} yn postio",
   "account.endorse": "Dangos ar fy mhroffil",
   "account.familiar_followers_many": "Yn cael ei ddilyn gan {name1},{name2}, a {othersCount, plural, one {one other you know} other{# others you know}}",
@@ -40,6 +41,11 @@
   "account.featured_tags.last_status_never": "Dim postiadau",
   "account.follow": "Dilyn",
   "account.follow_back": "Dilyn nôl",
+  "account.follow_back_short": "Dilyn nôl",
+  "account.follow_request": "Cais i ddilyn",
+  "account.follow_request_cancel": "Diddymu cais",
+  "account.follow_request_cancel_short": "Diddymu",
+  "account.follow_request_short": "Gofyn",
   "account.followers": "Dilynwyr",
   "account.followers.empty": "Does neb yn dilyn y defnyddiwr hwn eto.",
   "account.followers_counter": "{count, plural, one {{counter} dilynwr} two {{counter} ddilynwr} other {{counter} dilynwr}}",
@@ -70,7 +76,6 @@
   "account.posts_with_replies": "Postiadau ac ymatebion",
   "account.remove_from_followers": "Tynnu {name} o'ch dilynwyr",
   "account.report": "Adrodd @{name}",
-  "account.requested": "Aros am gymeradwyaeth. Cliciwch er mwyn canslo cais dilyn",
   "account.requested_follow": "Mae {name} wedi gwneud cais i'ch dilyn",
   "account.requests_to_follow_you": "Ceisiadau i'ch dilyn",
   "account.share": "Rhannu proffil @{name}",
@@ -239,15 +244,25 @@
   "confirmations.missing_alt_text.secondary": "Postio beth bynnag",
   "confirmations.missing_alt_text.title": "Ychwanegu testun amgen?",
   "confirmations.mute.confirm": "Tewi",
+  "confirmations.quiet_post_quote_info.dismiss": "Peidio fy atgoff eto",
+  "confirmations.quiet_post_quote_info.got_it": "Iawn",
+  "confirmations.quiet_post_quote_info.message": "Wrth ddyfynnu postiad cyhoeddus tawel, bydd eich postiad yn cael ei guddio rhag llinellau amser sy'n trendio.",
+  "confirmations.quiet_post_quote_info.title": "Yn dyfynnu postiadau cyhoeddus tawel",
   "confirmations.redraft.confirm": "Dileu ac ailddrafftio",
   "confirmations.redraft.message": "Ydych chi wir eisiau'r dileu'r postiad hwn a'i ail lunio? Bydd ffefrynnau a hybiau'n cael eu colli, a bydd atebion i'r postiad gwreiddiol yn mynd yn amddifad.",
   "confirmations.redraft.title": "Dileu ac ail lunio'r postiad?",
   "confirmations.remove_from_followers.confirm": "Dileu dilynwr",
   "confirmations.remove_from_followers.message": "Bydd {name} yn rhoi'r gorau i'ch dilyn. A ydych yn siŵr eich bod am fwrw ymlaen?",
   "confirmations.remove_from_followers.title": "Tynnu dilynwr?",
+  "confirmations.revoke_quote.confirm": "Dileu'r postiad",
+  "confirmations.revoke_quote.message": "Does dim modd dadwneud y weithred hon.",
+  "confirmations.revoke_quote.title": "Dileu'r postiad?",
+  "confirmations.unblock.confirm": "Dadrwystro",
+  "confirmations.unblock.title": "Dadrwystro {name}?",
   "confirmations.unfollow.confirm": "Dad-ddilyn",
-  "confirmations.unfollow.message": "Ydych chi'n siŵr eich bod am ddad-ddilyn {name}?",
-  "confirmations.unfollow.title": "Dad-ddilyn defnyddiwr?",
+  "confirmations.unfollow.title": "Dad-ddilyn {name}",
+  "confirmations.withdraw_request.confirm": "Tynnu'r cais yn ôl",
+  "confirmations.withdraw_request.title": "Tynnu nôl y cais i ddilyn {name}?",
   "content_warning.hide": "Cuddio'r postiad",
   "content_warning.show": "Dangos beth bynnag",
   "content_warning.show_more": "Dangos rhagor",
@@ -289,6 +304,7 @@
   "domain_pill.your_handle": "Eich handlen:",
   "domain_pill.your_server": "Eich cartref digidol, lle mae'ch holl bostiadau'n byw. Ddim yn hoffi'r un hon? Trosglwyddwch weinyddion ar unrhyw adeg a dewch â'ch dilynwyr hefyd.",
   "domain_pill.your_username": "Eich dynodwr unigryw ar y gweinydd hwn. Mae'n bosibl dod o hyd i ddefnyddwyr gyda'r un enw defnyddiwr ar wahanol weinyddion.",
+  "dropdown.empty": "Dewis dewis",
   "embed.instructions": "Gosodwch y post hwn ar eich gwefan drwy gopïo'r côd isod.",
   "embed.preview": "Dyma sut olwg fydd arno:",
   "emoji_button.activity": "Gweithgarwch",
@@ -424,8 +440,6 @@
   "hints.profiles.see_more_followers": "Gweld mwy o ddilynwyr ar {domain}",
   "hints.profiles.see_more_follows": "Gweld mwy o 'yn dilyn' ar {domain}",
   "hints.profiles.see_more_posts": "Gweld mwy o bostiadau ar {domain}",
-  "hints.threads.replies_may_be_missing": "Mae'n bosibl y bydd ymatebion gan weinyddion eraill ar goll.",
-  "hints.threads.see_more": "Gweld mwy o ymatebion ar {domain}",
   "home.column_settings.show_quotes": "Dangos dyfyniadau",
   "home.column_settings.show_reblogs": "Dangos hybiau",
   "home.column_settings.show_replies": "Dangos ymatebion",
@@ -447,20 +461,12 @@
   "ignore_notifications_modal.private_mentions_title": "Anwybyddu hysbysiadau o Grybwylliadau Preifat digymell?",
   "info_button.label": "Cymorth",
   "info_button.what_is_alt_text": "<h1>Beth yw testun amgen?</h1><p> Mae Testun Amgen yn darparu disgrifiadau delwedd ar gyfer pobl â nam ar eu golwg, cysylltiadau lled band isel, neu'r rhai sy'n ceisio cyd-destun ychwanegol.</p><p> Gallwch wella hygyrchedd a dealltwriaeth i bawb trwy ysgrifennu testun amgen clir, cryno a gwrthrychol.</p><ul><li> Dal elfennau pwysig</li><li> Crynhoi testun mewn delweddau</li><li> Defnyddiwch strwythur brawddegau rheolaidd</li><li> Osgoi gwybodaeth ddiangen</li><li> Canolbwyntio ar dueddiadau a chanfyddiadau allweddol mewn delweddau cymhleth (fel diagramau neu fapiau)</li></ul>",
-  "interaction_modal.action.favourite": "I barhau, mae angen i chi hoffi o'ch cyfrif.",
-  "interaction_modal.action.follow": "I barhau, mae angen i chi ddilyn o'ch cyfrif.",
-  "interaction_modal.action.reblog": "I barhau, mae angen i chi ail-flogio o'ch cyfrif.",
-  "interaction_modal.action.reply": "I barhau, mae angen i chi ymateb o'ch cyfrif.",
-  "interaction_modal.action.vote": "I barhau, mae angen i chi bleidleisio o'ch cyfrif.",
+  "interaction_modal.action": "I ryngweithio â phostiad {name}, mae angen i chi fewngofnodi i'ch cyfrif ar ba bynnag weinydd Mastodon rydych chi'n ei ddefnyddio.",
   "interaction_modal.go": "Mynd",
   "interaction_modal.no_account_yet": "Dim cyfrif eto?",
   "interaction_modal.on_another_server": "Ar weinydd gwahanol",
   "interaction_modal.on_this_server": "Ar y gweinydd hwn",
-  "interaction_modal.title.favourite": "Ffafrio postiad {name}",
-  "interaction_modal.title.follow": "Dilyn {name}",
-  "interaction_modal.title.reblog": "Hybu postiad {name}",
-  "interaction_modal.title.reply": "Ymateb i bostiad {name}",
-  "interaction_modal.title.vote": "Pleidleisiwch ym mhleidlais {name}",
+  "interaction_modal.title": "Mewngofnodwch i barhau",
   "interaction_modal.username_prompt": "e.e. {example}",
   "intervals.full.days": "{number, plural, one {# diwrnod} two {# ddiwrnod} other {# diwrnod}}",
   "intervals.full.hours": "{number, plural, one {# awr} other {# awr}}",
@@ -481,6 +487,7 @@
   "keyboard_shortcuts.home": "Agor ffrwd gartref",
   "keyboard_shortcuts.hotkey": "Bysell boeth",
   "keyboard_shortcuts.legend": "Dangos yr allwedd hon",
+  "keyboard_shortcuts.load_more": "Canolbwyntio ar y botwm \"Llwytho rhagor\"",
   "keyboard_shortcuts.local": "Agor ffrwd lleol",
   "keyboard_shortcuts.mention": "Crybwyll yr awdur",
   "keyboard_shortcuts.muted": "Agor rhestr defnyddwyr rydych wedi'u tewi",
@@ -489,6 +496,7 @@
   "keyboard_shortcuts.open_media": "Agor cyfryngau",
   "keyboard_shortcuts.pinned": "Agor rhestr postiadau wedi'u pinio",
   "keyboard_shortcuts.profile": "Agor proffil yr awdur",
+  "keyboard_shortcuts.quote": "Dyfynnu postiad",
   "keyboard_shortcuts.reply": "Ateb postiad",
   "keyboard_shortcuts.requests": "Agor rhestr ceisiadau dilyn",
   "keyboard_shortcuts.search": "Ffocysu ar y bar chwilio",
@@ -500,6 +508,8 @@
   "keyboard_shortcuts.translate": "i gyfieithu postiad",
   "keyboard_shortcuts.unfocus": "Dad-ffocysu ardal cyfansoddi testun/chwilio",
   "keyboard_shortcuts.up": "Symud yn uwch yn y rhestr",
+  "learn_more_link.got_it": "Iawn",
+  "learn_more_link.learn_more": "Dysgu rhagor",
   "lightbox.close": "Cau",
   "lightbox.next": "Nesaf",
   "lightbox.previous": "Blaenorol",
@@ -560,7 +570,7 @@
   "navigation_bar.favourites": "Ffefrynnau",
   "navigation_bar.filters": "Geiriau wedi'u tewi",
   "navigation_bar.follow_requests": "Ceisiadau dilyn",
-  "navigation_bar.followed_tags": "Hashnodau a ddilynir",
+  "navigation_bar.followed_tags": "Hashnodau sy'n cael eu dilyn",
   "navigation_bar.follows_and_followers": "Yn dilyn a dilynwyr",
   "navigation_bar.import_export": "Mewnforio ac allforio",
   "navigation_bar.lists": "Rhestrau",
@@ -600,6 +610,7 @@
   "notification.label.mention": "Crybwyll",
   "notification.label.private_mention": "Crybwyll preifat",
   "notification.label.private_reply": "Ymateb preifat",
+  "notification.label.quote": "Mae {name} wedi dyfynnu eich postiad",
   "notification.label.reply": "Ymateb",
   "notification.mention": "Crybwyll",
   "notification.mentioned_you": "Rydych wedi'ch crybwyll gan {name}",
@@ -614,6 +625,7 @@
   "notification.moderation_warning.action_suspend": "Mae eich cyfrif wedi'i atal.",
   "notification.own_poll": "Mae eich pleidlais wedi dod i ben",
   "notification.poll": "Mae arolwg rydych wedi pleidleisio ynddo wedi dod i ben",
+  "notification.quoted_update": "Golygodd {name} bostiad rydych chi wedi'i ddyfynnu",
   "notification.reblog": "Hybodd {name} eich post",
   "notification.reblog.name_and_others_with_link": "Mae {name} a <a>{count, plural, one {# arall} other {# arall}}</a> wedi hybu eich postiad",
   "notification.relationships_severance_event": "Wedi colli cysylltiad â {name}",
@@ -657,6 +669,7 @@
   "notifications.column_settings.mention": "Crybwylliadau:",
   "notifications.column_settings.poll": "Canlyniadau pleidlais:",
   "notifications.column_settings.push": "Hysbysiadau gwthio",
+  "notifications.column_settings.quote": "Dyfyniadau:",
   "notifications.column_settings.reblog": "Hybiau:",
   "notifications.column_settings.show": "Dangos yn y golofn",
   "notifications.column_settings.sound": "Chwarae sain",
@@ -732,11 +745,18 @@
   "privacy.private.short": "Dilynwyr",
   "privacy.public.long": "Unrhyw un ar ac oddi ar Mastodon",
   "privacy.public.short": "Cyhoeddus",
+  "privacy.quote.anyone": "{visibility}, gall unrhyw un ddyfynnu",
+  "privacy.quote.disabled": "{visibility}, dyfyniadau wedi'u hanalluogi",
+  "privacy.quote.limited": "{visibility}, dyfyniadau wedi'u cyfyngu",
   "privacy.unlisted.additional": "Mae hwn yn ymddwyn yn union fel y cyhoeddus, ac eithrio na fydd y postiad yn ymddangos mewn ffrydiau byw neu hashnodau, archwilio, neu chwiliad Mastodon, hyd yn oed os ydych wedi eich cynnwys ar draws y cyfrif.",
-  "privacy.unlisted.long": "Llai o ddathliadau algorithmig",
+  "privacy.unlisted.long": "Wedi'i guddio rhag canlyniadau chwilio Mastodon, trendio, a llinellau amser cyhoeddus",
   "privacy.unlisted.short": "Tewi'r cyhoeddus",
   "privacy_policy.last_updated": "Diweddarwyd ddiwethaf ar {date}",
   "privacy_policy.title": "Polisi Preifatrwydd",
+  "quote_error.poll": "Dyw dyfynnu ddim yn cael ei ganiatáu gyda pholau.",
+  "quote_error.quote": "Dim ond un dyfyniad ar y tro sy'n cael ei ganiatáu.",
+  "quote_error.unauthorized": "Does gennych chi ddim awdurdod i ddyfynnu'r postiad hwn.",
+  "quote_error.upload": "Dyw dyfynnu ddim yn cael ei ganiatáu gydag atodiadau cyfryngau.",
   "recommended": "Argymhellwyd",
   "refresh": "Adnewyddu",
   "regeneration_indicator.please_stand_by": "Arhoswch am dipyn.",
@@ -752,6 +772,9 @@
   "relative_time.minutes": "{number} munud",
   "relative_time.seconds": "{number} eiliad",
   "relative_time.today": "heddiw",
+  "remove_quote_hint.button_label": "Iawn",
+  "remove_quote_hint.message": "Gallwch wneud hynny o'r ddewislen dewisiadau {icon}.",
+  "remove_quote_hint.title": "Eisiau dileu eich postiad sy'n cael ei ddyfynnu?",
   "reply_indicator.attachments": "{count, plural, one {# atodiad} other {# atodiad}}",
   "reply_indicator.cancel": "Diddymu",
   "reply_indicator.poll": "Pleidlais",
@@ -843,13 +866,23 @@
   "status.admin_account": "Agor rhyngwyneb cymedroli @{name}",
   "status.admin_domain": "Agor rhyngwyneb cymedroli {domain}",
   "status.admin_status": "Agor y postiad hwn yn y rhyngwyneb cymedroli",
+  "status.all_disabled": "Mae hybu a dyfynnu wedi'u hanalluogi",
   "status.block": "Rhwystro @{name}",
   "status.bookmark": "Nod tudalen",
   "status.cancel_reblog_private": "Dadhybu",
+  "status.cannot_quote": "Does dim caniatâd i chi ddyfynnu'r postiad hwn",
   "status.cannot_reblog": "Does dim modd hybu'r postiad hwn",
+  "status.contains_quote": "Yn cynnwys dyfyniad",
+  "status.context.loading": "Yn llwytho mwy o atebion",
+  "status.context.loading_error": "Wedi methu llwytho atebion newydd",
+  "status.context.loading_success": "Wedi llwytho'r holl atebion",
+  "status.context.more_replies_found": "Mwy o atebion wedi'u canfod",
+  "status.context.retry": "Ceisio eto",
+  "status.context.show": "Dangos",
   "status.continued_thread": "Edefyn parhaus",
   "status.copy": "Copïo dolen i'r post",
   "status.delete": "Dileu",
+  "status.delete.success": "Postiad wedi'i ddileu",
   "status.detailed_status": "Golwg manwl o'r sgwrs",
   "status.direct": "Crybwyll yn breifat @{name}",
   "status.direct_indicator": "Crybwyll preifat",
@@ -872,27 +905,43 @@
   "status.mute_conversation": "Anwybyddu sgwrs",
   "status.open": "Ehangu'r post hwn",
   "status.pin": "Pinio ar y proffil",
+  "status.quote": "Dyfynnu",
+  "status.quote.cancel": "Diddymu'r dyfyniad",
   "status.quote_error.filtered": "Wedi'i guddio oherwydd un o'ch hidlwyr",
-  "status.quote_error.not_found": "Does dim modd dangos y postiad hwn.",
-  "status.quote_error.pending_approval": "Mae'r postiad hwn yn aros am gymeradwyaeth yr awdur gwreiddiol.",
-  "status.quote_error.rejected": "Does dim modd dangos y postiad hwn gan nad yw'r awdur gwreiddiol yn caniatáu iddo gael ei ddyfynnu.",
-  "status.quote_error.removed": "Cafodd y postiad hwn ei ddileu gan ei awdur.",
-  "status.quote_error.unauthorized": "Does dim modd dangos y postiad hwn gan nad oes gennych awdurdod i'w weld.",
-  "status.quote_post_author": "Postiad gan {name}",
+  "status.quote_error.limited_account_hint.action": "Dangos beth bynnag",
+  "status.quote_error.limited_account_hint.title": "Mae'r cyfrif hwn wedi'i guddio gan gymedrolwyr {domain}.",
+  "status.quote_error.not_available": "Postiad ddim ar gael",
+  "status.quote_error.pending_approval": "Postiad yn yr arfaeth",
+  "status.quote_error.pending_approval_popout.body": "Ar Mastodon, gallwch reoli os yw rhywun yn gallu eich dyfynnu. Mae'r postiad hwn yn cael ei ddal nôl tra'n bod yn cael cymeradwyaeth yr awdur gwreiddiol.",
+  "status.quote_error.revoked": "Postiad wedi'i ddileu gan yr awdur",
+  "status.quote_followers_only": "Dim ond dilynwyr all ddyfynnu'r postiad hwn",
+  "status.quote_manual_review": "Bydd yr awdur yn ei adolygu ei hyn",
+  "status.quote_noun": "Dyfynnu",
+  "status.quote_policy_change": "Newid pwy all ddyfynnu",
+  "status.quote_post_author": "Wedi dyfynnu postiad gan @{name}",
+  "status.quote_private": "Does dim modd dyfynnu postiadau preifat",
+  "status.quotes": "{count, plural, zero {dyfyniadau} one {dyfyniad} two {ddyfyniad} few {dyfyniad} many {dyfyniad} other {dyfyniad}}",
+  "status.quotes.empty": "Does neb wedi dyfynnu'r postiad hwn eto. Pan fydd rhywun yn gwneud hynny, bydd yn ymddangos yma.",
+  "status.quotes.local_other_disclaimer": "Bydd dyfyniadau wedi'u gwrthod gan yr awdur ddim yn cael eu dangos.",
+  "status.quotes.remote_other_disclaimer": "Dim ond dyfyniadau o {domain} sy'n siŵr o gael eu dangos yma. Bydd dyfyniadau wedi'u gwrthod gan yr awdur ddim yn cael eu dangos.",
   "status.read_more": "Darllen rhagor",
   "status.reblog": "Hybu",
-  "status.reblog_private": "Hybu i'r gynulleidfa wreiddiol",
+  "status.reblog_or_quote": "Hybu neu ddyfynnu",
+  "status.reblog_private": "Rhannwch eto gyda'ch dilynwyr",
   "status.reblogged_by": "Hybodd {name}",
   "status.reblogs": "{count, plural, one {# hwb} other {# hwb}}",
   "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 ail lunio",
   "status.remove_bookmark": "Tynnu nod tudalen",
   "status.remove_favourite": "Tynnu o'r ffefrynnau",
+  "status.remove_quote": "Tynnu",
   "status.replied_in_thread": "Wedi ateb mewn edefyn",
   "status.replied_to": "Wedi ymateb i {name}",
   "status.reply": "Ymateb",
   "status.replyAll": "Ateb edefyn",
   "status.report": "Adrodd ar @{name}",
+  "status.request_quote": "Gofyn i gael dyfynnu",
+  "status.revoke_quote": "Dileu fy mhostiad o bostiad @{name}",
   "status.sensitive_warning": "Cynnwys sensitif",
   "status.share": "Rhannu",
   "status.show_less_all": "Dangos llai i bawb",
@@ -930,6 +979,7 @@
   "upload_button.label": "Ychwanegwch delweddau, fideo neu ffeil sain",
   "upload_error.limit": "Wedi mynd heibio'r uchafswm llwytho.",
   "upload_error.poll": "Does dim modd llwytho ffeiliau â phleidleisiau.",
+  "upload_error.quote": "Does dim hawl llwytho i fyny gyda dyfyniadau.",
   "upload_form.drag_and_drop.instructions": "I godi atodiad cyfryngau, pwyswch y space neu enter. Wrth lusgo, defnyddiwch y bysellau saeth i symud yr atodiad cyfryngau i unrhyw gyfeiriad penodol. Pwyswch space neu enter eto i ollwng yr atodiad cyfryngau yn ei safle newydd, neu pwyswch escape i ddiddymu.",
   "upload_form.drag_and_drop.on_drag_cancel": "Cafodd llusgo ei ddiddymu. Cafodd atodi cyfryngau {item} ei ollwng.",
   "upload_form.drag_and_drop.on_drag_end": "Cafodd atodiad cyfryngau {item} ei ollwng.",
@@ -952,5 +1002,19 @@
   "video.skip_forward": "Symud ymlaen",
   "video.unmute": "Dad-dewi",
   "video.volume_down": "Lefel sain i lawr",
-  "video.volume_up": "Lefel sain i fyny"
+  "video.volume_up": "Lefel sain i fyny",
+  "visibility_modal.button_title": "Gosod gwelededd",
+  "visibility_modal.header": "Gwelededd a rhyngweithio",
+  "visibility_modal.helper.direct_quoting": "Does dim modd dyfynnu crybwylliadau preifat ysgrifennwyd ar Mastodon.",
+  "visibility_modal.helper.privacy_editing": "Does dim modd newid gwelededd ar ôl i bostiad gael ei gyhoeddi.",
+  "visibility_modal.helper.privacy_private_self_quote": "Does dim modd cyhoeddi hunan-ddyfyniadau o bostiadau preifat.",
+  "visibility_modal.helper.private_quoting": "Does dim modd dyfynnu crybwylliadau preifat ysgrifennwyd gan ddilynwyr.",
+  "visibility_modal.helper.unlisted_quoting": "Pan fydd pobl yn eich dyfynnu, bydd eu postiad hefyd yn cael ei guddio rhag llinellau amser sy'n trendio.",
+  "visibility_modal.instructions": "Rheolwch bwy all ryngweithio â'r postiad hwn. Gallwch hefyd osod gosodiadau i bob postiad yn y dyfodol drwy lywio i<link> Dewisiadau >Rhagosodiadau postio</link> .",
+  "visibility_modal.privacy_label": "Gwelededd",
+  "visibility_modal.quote_followers": "Dilynwyr yn unig",
+  "visibility_modal.quote_label": "Pwy sy'n gallu dyfynnu",
+  "visibility_modal.quote_nobody": "Dim ond fi",
+  "visibility_modal.quote_public": "Pawb",
+  "visibility_modal.save": "Cadw"
 }
diff --git a/app/javascript/mastodon/locales/da.json b/app/javascript/mastodon/locales/da.json
index ea5fbad94a3..255b41e871a 100644
--- a/app/javascript/mastodon/locales/da.json
+++ b/app/javascript/mastodon/locales/da.json
@@ -28,6 +28,7 @@
   "account.disable_notifications": "Giv mig ikke længere en notifikation, når @{name} laver indlæg",
   "account.domain_blocking": "Blokerer domæne",
   "account.edit_profile": "Redigér profil",
+  "account.edit_profile_short": "Redigér",
   "account.enable_notifications": "Giv mig besked, når @{name} laver indlæg",
   "account.endorse": "Fremhæv på profil",
   "account.familiar_followers_many": "Følges af {name1}, {name2} og {othersCount, plural, one {# mere, man kender} other {# mere, du kender}}",
@@ -40,6 +41,11 @@
   "account.featured_tags.last_status_never": "Ingen indlæg",
   "account.follow": "Følg",
   "account.follow_back": "Følg tilbage",
+  "account.follow_back_short": "Følg tilbage",
+  "account.follow_request": "Anmod om at følge",
+  "account.follow_request_cancel": "Annuller anmodning",
+  "account.follow_request_cancel_short": "Annullér",
+  "account.follow_request_short": "Anmod",
   "account.followers": "Følgere",
   "account.followers.empty": "Ingen følger denne bruger endnu.",
   "account.followers_counter": "{count, plural, one {{counter} følger} other {{counter} følgere}}",
@@ -62,7 +68,7 @@
   "account.mute_notifications_short": "Sluk for notifikationer",
   "account.mute_short": "Skjul",
   "account.muted": "Skjult",
-  "account.muting": "Tavsgørelse",
+  "account.muting": "Skjuler",
   "account.mutual": "I følger hinanden",
   "account.no_bio": "Ingen beskrivelse til rådighed.",
   "account.open_original_page": "Åbn oprindelig side",
@@ -70,7 +76,6 @@
   "account.posts_with_replies": "Indlæg og svar",
   "account.remove_from_followers": "Fjern {name} fra følgere",
   "account.report": "Anmeld @{name}",
-  "account.requested": "Afventer godkendelse. Tryk for at annullere følgeanmodning",
   "account.requested_follow": "{name} har anmodet om at følge dig",
   "account.requests_to_follow_you": "Anmodninger om at følge dig",
   "account.share": "Del @{name}s profil",
@@ -83,7 +88,7 @@
   "account.unendorse": "Vis ikke på profil",
   "account.unfollow": "Følg ikke længere",
   "account.unmute": "Vis @{name} igen",
-  "account.unmute_notifications_short": "Tænd for notifikationer",
+  "account.unmute_notifications_short": "Vis notifikationer igen",
   "account.unmute_short": "Vis igen",
   "account_note.placeholder": "Klik for at tilføje notat",
   "admin.dashboard.daily_retention": "Brugerfastholdelsesrate pr. dag efter tilmelding",
@@ -130,7 +135,7 @@
   "attachments_list.unprocessed": "(ubehandlet)",
   "audio.hide": "Skjul lyd",
   "block_modal.remote_users_caveat": "Serveren {domain} vil blive bedt om at respektere din beslutning. Overholdelse er dog ikke garanteret, da nogle servere kan håndtere blokke forskelligt. Offentlige indlæg kan stadig være synlige for ikke-indloggede brugere.",
-  "block_modal.show_less": "Vis færre",
+  "block_modal.show_less": "Vis mindre",
   "block_modal.show_more": "Vis flere",
   "block_modal.they_cant_mention": "Vedkommende kan ikke omtale eller følge dig.",
   "block_modal.they_cant_see_posts": "Vedkommende kan ikke se dine indlæg, og du vil ikke se vedkommendes.",
@@ -208,9 +213,9 @@
   "compose_form.publish": "Publicér",
   "compose_form.reply": "Svar",
   "compose_form.save_changes": "Opdatér",
-  "compose_form.spoiler.marked": "Fjern emnefelt",
-  "compose_form.spoiler.unmarked": "Tilføj emnefelt",
-  "compose_form.spoiler_placeholder": "Emnefelt (valgfrit)",
+  "compose_form.spoiler.marked": "Fjern indholdsadvarsel",
+  "compose_form.spoiler.unmarked": "Tilføj indholdsadvarsel",
+  "compose_form.spoiler_placeholder": "Indholdsadvarsel (valgfri)",
   "confirmation_modal.cancel": "Afbryd",
   "confirmations.block.confirm": "Blokér",
   "confirmations.delete.confirm": "Slet",
@@ -239,15 +244,25 @@
   "confirmations.missing_alt_text.secondary": "Læg op alligevel",
   "confirmations.missing_alt_text.title": "Tilføj alt-tekst?",
   "confirmations.mute.confirm": "Skjul",
-  "confirmations.redraft.confirm": "Slet og omformulér",
+  "confirmations.quiet_post_quote_info.dismiss": "Påmind mig ikke igen",
+  "confirmations.quiet_post_quote_info.got_it": "Forstået",
+  "confirmations.quiet_post_quote_info.message": "Når du citerer et stille offentligt indlæg, vil dit indlæg blive skjult fra trendtidslinjer.",
+  "confirmations.quiet_post_quote_info.title": "Citering af stille offentlige indlæg",
+  "confirmations.redraft.confirm": "Slet og omskriv",
   "confirmations.redraft.message": "Sikker på, at dette indlæg skal slettes og omskrives? Favoritter og fremhævelser går tabt, og svar til det oprindelige indlæg mister tilknytningen.",
-  "confirmations.redraft.title": "Slet og omformulér indlæg?",
+  "confirmations.redraft.title": "Slet og omskriv indlæg?",
   "confirmations.remove_from_followers.confirm": "Fjern følger",
   "confirmations.remove_from_followers.message": "{name} vil ikke længere følge dig. Er du sikker på, at du vil fortsætte?",
   "confirmations.remove_from_followers.title": "Fjern følger?",
+  "confirmations.revoke_quote.confirm": "Fjern indlæg",
+  "confirmations.revoke_quote.message": "Denne handling kan ikke fortrydes.",
+  "confirmations.revoke_quote.title": "Fjern indlæg?",
+  "confirmations.unblock.confirm": "Fjern blokering",
+  "confirmations.unblock.title": "Fjern blokering af {name}?",
   "confirmations.unfollow.confirm": "Følg ikke længere",
-  "confirmations.unfollow.message": "Er du sikker på, at du ikke længere vil følge {name}?",
-  "confirmations.unfollow.title": "Følg ikke længere bruger?",
+  "confirmations.unfollow.title": "Følg ikke længere {name}?",
+  "confirmations.withdraw_request.confirm": "Annullér anmodning",
+  "confirmations.withdraw_request.title": "Annullér anmodning om at følge {name}?",
   "content_warning.hide": "Skjul indlæg",
   "content_warning.show": "Vis alligevel",
   "content_warning.show_more": "Vis flere",
@@ -279,16 +294,17 @@
   "domain_pill.activitypub_lets_connect": "Det muliggører at forbinde og interagere med folk, ikke kun på Mastodon, men også på tværs af forskellige sociale apps.",
   "domain_pill.activitypub_like_language": "ActivityPub er \"sproget\", som Mastodon taler med andre sociale netværk.",
   "domain_pill.server": "Server",
-  "domain_pill.their_handle": "Deres greb:",
+  "domain_pill.their_handle": "Deres handle:",
   "domain_pill.their_server": "Det digitale hjem, hvor alle indlæggene findes.",
   "domain_pill.their_username": "Entydig identifikator på denne server. Det er muligt at finde brugere med samme brugernavn på forskellige servere.",
   "domain_pill.username": "Brugernavn",
-  "domain_pill.whats_in_a_handle": "Hvad er der i et greb?",
+  "domain_pill.whats_in_a_handle": "Hvad indeholder et handle?",
   "domain_pill.who_they_are": "Da et handle fortæller, hvem nogen er, og hvor de er, kan du interagere med folk på tværs af det sociale net af <button>ActivityPub-drevne platforme</button>.",
   "domain_pill.who_you_are": "Fordi dit handle fortæller, hvem du er, og hvor du er, kan du interagere med folk på tværs af det sociale net af <button>ActivityPub-drevne platforme</button>.",
-  "domain_pill.your_handle": "Dit greb:",
+  "domain_pill.your_handle": "Dit handle:",
   "domain_pill.your_server": "Dit digitale hjem, hvor alle dine indlæg lever. Synes ikke om den her server? Du kan til enhver tid rykke over på en anden server og beholde dine følgere.",
   "domain_pill.your_username": "Din entydige identifikator på denne server. Det er muligt at finde brugere med samme brugernavn på forskellige servere.",
+  "dropdown.empty": "Vælg en indstilling",
   "embed.instructions": "Indlejr dette indlæg på din hjemmeside ved at kopiere nedenstående kode.",
   "embed.preview": "Sådan kommer det til at se ud:",
   "emoji_button.activity": "Aktivitet",
@@ -324,7 +340,7 @@
   "empty_column.follow_requests": "Du har endnu ingen følgeanmodninger. Når du modtager én, vil den dukke op her.",
   "empty_column.followed_tags": "Ingen hashtags følges endnu. Når det sker, vil de fremgå her.",
   "empty_column.hashtag": "Der er intet med dette hashtag endnu.",
-  "empty_column.home": "Din hjemmetidslinje er tom! Følg nogle personer, for at fylde den op.",
+  "empty_column.home": "Din hjem-tidslinje er tom! Følg nogle personer, for at fylde den op.",
   "empty_column.list": "Der er ikke noget på denne liste endnu. Når medlemmer af denne liste udgiver nye indlæg, vil de blive vist her.",
   "empty_column.mutes": "Du har endnu ikke skjult nogle brugere.",
   "empty_column.notification_requests": "Alt er klar! Der er intet her. Når der modtages nye notifikationer, fremgår de her jævnfør dine indstillinger.",
@@ -350,7 +366,7 @@
   "filter_modal.added.context_mismatch_title": "Kontekstmisforhold!",
   "filter_modal.added.expired_explanation": "Denne filterkategori er udløbet. Ændr dens udløbsdato, for at anvende den.",
   "filter_modal.added.expired_title": "Udløbet filter!",
-  "filter_modal.added.review_and_configure": "Gå til {settings_link} for at gennemse og yderligere opsætte denne filterkategori.",
+  "filter_modal.added.review_and_configure": "Gå til {settings_link} for at gennemgå og konfigurere denne filterkategori yderligere.",
   "filter_modal.added.review_and_configure_title": "Filterindstillinger",
   "filter_modal.added.settings_link": "indstillingsside",
   "filter_modal.added.short_explanation": "Dette indlæg er nu føjet til følgende filterkategori: {title}.",
@@ -386,7 +402,7 @@
   "follow_suggestions.similar_to_recently_followed_longer": "Minder om profiler, du har fulgt for nylig",
   "follow_suggestions.view_all": "Vis alle",
   "follow_suggestions.who_to_follow": "Hvem, som skal følges",
-  "followed_tags": "Hashtag, som følges",
+  "followed_tags": "Hashtags, som følges",
   "footer.about": "Om",
   "footer.directory": "Profiloversigt",
   "footer.get_app": "Hent appen",
@@ -414,7 +430,7 @@
   "hashtag.counter_by_uses_today": "{count, plural, one {{counter} indlæg} other {{counter} indlæg}} i dag",
   "hashtag.feature": "Fremhæv på profil",
   "hashtag.follow": "Følg hashtag",
-  "hashtag.mute": "Tavsgør #{hashtag}",
+  "hashtag.mute": "Skjul #{hashtag}",
   "hashtag.unfeature": "Fremhæv ikke på profil",
   "hashtag.unfollow": "Følg ikke længere hashtag",
   "hashtags.and_other": "…og {count, plural, one {}other {# flere}}",
@@ -424,8 +440,6 @@
   "hints.profiles.see_more_followers": "Se flere følgere på {domain}",
   "hints.profiles.see_more_follows": "Se flere fulgte på {domain}",
   "hints.profiles.see_more_posts": "Se flere indlæg på {domain}",
-  "hints.threads.replies_may_be_missing": "Der kan mangle svar fra andre servere.",
-  "hints.threads.see_more": "Se flere svar på {domain}",
   "home.column_settings.show_quotes": "Vis citater",
   "home.column_settings.show_reblogs": "Vis fremhævelser",
   "home.column_settings.show_replies": "Vis svar",
@@ -447,20 +461,12 @@
   "ignore_notifications_modal.private_mentions_title": "Ignorér notifikationer fra uopfordrede private omtaler?",
   "info_button.label": "Hjælp",
   "info_button.what_is_alt_text": "<h1>Hvad er alt-tekst?</h1> <p>Alt-tekst leverer billedbeskrivelser til folk med synsnedsættelser, lav båndbredde-forbindelser eller med ønske om ekstra kontekst.</p> <p>Tilgængelighed og forståelse kan forbedres for alle ved at skrive klar, kortfattet og objektiv alt-tekst.</p> <ul> <li>Fang vigtige elementer</li> <li>Opsummér tekst i billeder</li> <li>Brug almindelig sætningsstruktur</li> <li>Undgå overflødig information</li> <li>Fokusér på tendenser og centrale resultater i kompleks grafik (såsom diagrammer eller kort)</li> </ul>",
-  "interaction_modal.action.favourite": "For at fortsætte, skal du føje til favoritter fra din konto.",
-  "interaction_modal.action.follow": "For at fortsætte skal du følge fra din konto.",
-  "interaction_modal.action.reblog": "For at fortsætte, skal du vælge fremhæv fra din konto.",
-  "interaction_modal.action.reply": "For at fortsætte, skal du besvare fra din konto.",
-  "interaction_modal.action.vote": "For at fortsætte, skal du stemme fra din konto.",
+  "interaction_modal.action": "For at interagere med {name}'s indlæg skal du logge ind på din konto på den Mastodon-server, du bruger.",
   "interaction_modal.go": "Gå",
   "interaction_modal.no_account_yet": "Har endnu ingen konto?",
   "interaction_modal.on_another_server": "På en anden server",
   "interaction_modal.on_this_server": "På denne server",
-  "interaction_modal.title.favourite": "Føj {name}s indlæg til favoritter",
-  "interaction_modal.title.follow": "Følg {name}",
-  "interaction_modal.title.reblog": "Fremhæv {name}s indlæg",
-  "interaction_modal.title.reply": "Besvar {name}s indlæg",
-  "interaction_modal.title.vote": "Stem i {name}s afstemning",
+  "interaction_modal.title": "Log ind for at fortsætte",
   "interaction_modal.username_prompt": "F.eks. {example}",
   "intervals.full.days": "{number, plural, one {# dag} other {# dage}}",
   "intervals.full.hours": "{number, plural, one {# time} other {# timer}}",
@@ -478,9 +484,10 @@
   "keyboard_shortcuts.favourites": "Åbn favoritlisten",
   "keyboard_shortcuts.federated": "Åbn fødereret tidslinje",
   "keyboard_shortcuts.heading": "Tastaturgenveje",
-  "keyboard_shortcuts.home": "Åbn hjemmetidslinje",
+  "keyboard_shortcuts.home": "Åbn hjem-tidslinje",
   "keyboard_shortcuts.hotkey": "Hurtigtast",
   "keyboard_shortcuts.legend": "Vis dette symbol",
+  "keyboard_shortcuts.load_more": "Fokusér knappen \"Indlæs flere\"",
   "keyboard_shortcuts.local": "Åbn lokal tidslinje",
   "keyboard_shortcuts.mention": "Omtal forfatter",
   "keyboard_shortcuts.muted": "Åbn listen over skjulte brugere",
@@ -489,17 +496,20 @@
   "keyboard_shortcuts.open_media": "Åbn medier",
   "keyboard_shortcuts.pinned": "Åbn liste over fastgjorte indlæg",
   "keyboard_shortcuts.profile": "Åbn forfatters profil",
+  "keyboard_shortcuts.quote": "Citér indlæg",
   "keyboard_shortcuts.reply": "Besvar indlægget",
   "keyboard_shortcuts.requests": "Åbn liste over følgeanmodninger",
   "keyboard_shortcuts.search": "Fokusér søgebjælke",
-  "keyboard_shortcuts.spoilers": "Vis/skjul emnefelt",
+  "keyboard_shortcuts.spoilers": "Vis/skjul indholdsadvarsel-felt",
   "keyboard_shortcuts.start": "Åbn \"komme i gang\"-kolonne",
-  "keyboard_shortcuts.toggle_hidden": "Vis/skjul tekst bag emnefelt",
+  "keyboard_shortcuts.toggle_hidden": "Vis/skjul tekst bag indholdsadvarsel",
   "keyboard_shortcuts.toggle_sensitivity": "Vis/skjul medier",
   "keyboard_shortcuts.toot": "Påbegynd nyt indlæg",
   "keyboard_shortcuts.translate": "for at oversætte et indlæg",
   "keyboard_shortcuts.unfocus": "Fjern fokus fra tekstskrivningsområde/søgning",
   "keyboard_shortcuts.up": "Flyt opad på listen",
+  "learn_more_link.got_it": "Forstået",
+  "learn_more_link.learn_more": "Få mere at vide",
   "lightbox.close": "Luk",
   "lightbox.next": "Næste",
   "lightbox.previous": "Forrige",
@@ -520,7 +530,7 @@
   "lists.done": "Færdig",
   "lists.edit": "Redigér liste",
   "lists.exclusive": "Skjul medlemmer i Hjem",
-  "lists.exclusive_hint": "Er nogen er på denne liste, skjul personen i hjemme-feeds for at undgå at se vedkommendes indlæg to gange.",
+  "lists.exclusive_hint": "Hvis nogen er på denne liste, så skjul dem i hjem-feed for at undgå at se deres indlæg to gange.",
   "lists.find_users_to_add": "Find brugere at tilføje",
   "lists.list_members_count": "{count, plural, one {# medlem} other {# medlemmer}}",
   "lists.list_name": "Listetitel",
@@ -543,10 +553,10 @@
   "mute_modal.hide_options": "Skjul valgmuligheder",
   "mute_modal.indefinite": "Indtil jeg vælger at se dem igen",
   "mute_modal.show_options": "Vis valgmuligheder",
-  "mute_modal.they_can_mention_and_follow": "De kan omtale og følge dig, men du vil ikke se dem.",
+  "mute_modal.they_can_mention_and_follow": "Vedkommende kan nævne og følge dig, men vil ikke blive vist.",
   "mute_modal.they_wont_know": "De vil ikke vide, at de er blevet skjult.",
   "mute_modal.title": "Skjul bruger?",
-  "mute_modal.you_wont_see_mentions": "Du vil ikke se indlæg som omtaler dem.",
+  "mute_modal.you_wont_see_mentions": "Indlæg, som nævner vedkommende, vises ikke.",
   "mute_modal.you_wont_see_posts": "De kan stadig se dine indlæg, men du vil ikke se deres.",
   "navigation_bar.about": "Om",
   "navigation_bar.account_settings": "Adgangskode og sikkerhed",
@@ -560,7 +570,7 @@
   "navigation_bar.favourites": "Favoritter",
   "navigation_bar.filters": "Skjulte ord",
   "navigation_bar.follow_requests": "Følgeanmodninger",
-  "navigation_bar.followed_tags": "Hashtag, som følges",
+  "navigation_bar.followed_tags": "Hashtags, som følges",
   "navigation_bar.follows_and_followers": "Følges og følgere",
   "navigation_bar.import_export": "Import og eksport",
   "navigation_bar.lists": "Lister",
@@ -572,7 +582,7 @@
   "navigation_bar.mutes": "Skjulte brugere",
   "navigation_bar.opened_in_classic_interface": "Indlæg, konti og visse andre sider åbnes som standard i den klassiske webgrænseflade.",
   "navigation_bar.preferences": "Præferencer",
-  "navigation_bar.privacy_and_reach": "Fortrolighed og udbredelse",
+  "navigation_bar.privacy_and_reach": "Fortrolighed og rækkevidde",
   "navigation_bar.search": "Søg",
   "navigation_bar.search_trends": "Søg/Trender",
   "navigation_panel.collapse_followed_tags": "Sammenfold menuen Fulgte hashtags",
@@ -600,6 +610,7 @@
   "notification.label.mention": "Omtale",
   "notification.label.private_mention": "Privat omtale",
   "notification.label.private_reply": "Privat svar",
+  "notification.label.quote": "{name} citerede dit indlæg",
   "notification.label.reply": "Svar",
   "notification.mention": "Omtale",
   "notification.mentioned_you": "{name} omtalte dig",
@@ -614,6 +625,7 @@
   "notification.moderation_warning.action_suspend": "Din konto er suspenderet.",
   "notification.own_poll": "Din afstemning er afsluttet",
   "notification.poll": "En afstemning, hvori du har stemt, er slut",
+  "notification.quoted_update": "{name} redigerede et indlæg, du har citeret",
   "notification.reblog": "{name} fremhævede dit indlæg",
   "notification.reblog.name_and_others_with_link": "{name} og <a>{count, plural, one {# anden} other {# andre}}</a> fremhævede dit indlæg",
   "notification.relationships_severance_event": "Mistede forbindelser med {name}",
@@ -657,6 +669,7 @@
   "notifications.column_settings.mention": "Omtaler:",
   "notifications.column_settings.poll": "Afstemningsresultater:",
   "notifications.column_settings.push": "Push-notifikationer",
+  "notifications.column_settings.quote": "Citater:",
   "notifications.column_settings.reblog": "Fremhævelser:",
   "notifications.column_settings.show": "Vis i kolonne",
   "notifications.column_settings.sound": "Afspil lyd",
@@ -686,11 +699,11 @@
   "notifications.policy.filter_limited_accounts_hint": "Begrænset af servermoderatorer",
   "notifications.policy.filter_limited_accounts_title": "Modererede konti",
   "notifications.policy.filter_new_accounts.hint": "Oprettet indenfor {days, plural, one {den seneste dag} other {de seneste # dage}}",
-  "notifications.policy.filter_new_accounts_title": "Ny konti",
-  "notifications.policy.filter_not_followers_hint": "Inklusiv personer, som har fulgt dig {days, plural, one {mindre end én dag} other {færre end # dage}}",
-  "notifications.policy.filter_not_followers_title": "Folk, som ikke følger dig",
+  "notifications.policy.filter_new_accounts_title": "Nye konti",
+  "notifications.policy.filter_not_followers_hint": "Inklusiv personer, som har fulgt dig {days, plural, one {mindre end én dag} other {mindre end # dage}}",
+  "notifications.policy.filter_not_followers_title": "Personer, som ikke følger dig",
   "notifications.policy.filter_not_following_hint": "Indtil du manuelt godkender dem",
-  "notifications.policy.filter_not_following_title": "Folk, du ikke følger",
+  "notifications.policy.filter_not_following_title": "Personer, du ikke følger",
   "notifications.policy.filter_private_mentions_hint": "Filtreret, medmindre det er i svar på egen omtale, eller hvis afsenderen følges",
   "notifications.policy.filter_private_mentions_title": "Uopfordrede private omtaler",
   "notifications.policy.title": "Håndtér notifikationer fra…",
@@ -732,11 +745,18 @@
   "privacy.private.short": "Følgere",
   "privacy.public.long": "Alle på og udenfor Mastodon",
   "privacy.public.short": "Offentlig",
+  "privacy.quote.anyone": "{visibility}, alle kan citere",
+  "privacy.quote.disabled": "{visibility}, citering deaktiveret",
+  "privacy.quote.limited": "{visibility}, citering begrænset",
   "privacy.unlisted.additional": "Dette svarer til offentlig, bortset fra at indlægget ikke vises i live-feeds eller hashtags, udforsk eller Mastodon-søgning, selvom du har tilvalgt dette for kontoen.",
-  "privacy.unlisted.long": "Færre algoritmiske fanfarer",
+  "privacy.unlisted.long": "Skjult fra Mastodons søgeresultater, trender og offentlige tidslinjer",
   "privacy.unlisted.short": "Offentlig (stille)",
   "privacy_policy.last_updated": "Senest opdateret {date}",
   "privacy_policy.title": "Privatlivspolitik",
+  "quote_error.poll": "Citering ikke tilladt i afstemninger.",
+  "quote_error.quote": "Kun ét citat ad gangen er tilladt.",
+  "quote_error.unauthorized": "Du har ikke tilladelse til at citere dette indlæg.",
+  "quote_error.upload": "Citering ikke tilladt ved medievedhæftninger.",
   "recommended": "Anbefalet",
   "refresh": "Genindlæs",
   "regeneration_indicator.please_stand_by": "Vent venligst.",
@@ -752,6 +772,9 @@
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "i dag",
+  "remove_quote_hint.button_label": "Forstået",
+  "remove_quote_hint.message": "Du kan gøre dette fra menuen {icon} indstillinger.",
+  "remove_quote_hint.title": "Vil du fjerne dit citerede indlæg?",
   "reply_indicator.attachments": "{count, plural, one {# vedhæftning} other {# vedhæftninger}}",
   "reply_indicator.cancel": "Afbryd",
   "reply_indicator.poll": "Afstemning",
@@ -794,7 +817,7 @@
   "report.thanks.title": "Ønsker ikke at se dette?",
   "report.thanks.title_actionable": "Tak for anmeldelsen, der vil blive set nærmere på dette.",
   "report.unfollow": "Følg ikke længere @{name}",
-  "report.unfollow_explanation": "Du følger denne konto. For ikke længere at se vedkommendes indlæg i din hjemmestrøm, kan du stoppe med at følge dem.",
+  "report.unfollow_explanation": "Du følger denne konto. Hvis du ikke længere vil se vedkommendes indlæg i dit hjem-feed, så stop med at følge dem.",
   "report_notification.attached_statuses": "{count, plural, one {{count} indlæg} other {{count} indlæg}} vedhæftet",
   "report_notification.categories.legal": "Juridisk",
   "report_notification.categories.legal_sentence": "ikke-tilladt indhold",
@@ -830,7 +853,7 @@
   "search_results.see_all": "Vis alle",
   "search_results.statuses": "Indlæg",
   "search_results.title": "Søg efter \"{q}\"",
-  "server_banner.about_active_users": "Folk, som brugte denne server de seneste 30 dage (månedlige aktive brugere)",
+  "server_banner.about_active_users": "Personer, som brugte denne server de seneste 30 dage (månedlige aktive brugere)",
   "server_banner.active_users": "aktive brugere",
   "server_banner.administered_by": "Håndteres af:",
   "server_banner.is_one_of_many": "{domain} er en af de mange uafhængige Mastodon-servere, du kan bruge for at deltage i fediverset.",
@@ -843,13 +866,23 @@
   "status.admin_account": "Åbn modereringsbrugerflade for @{name}",
   "status.admin_domain": "Åbn modereringsbrugerflade for {domain}",
   "status.admin_status": "Åbn dette indlæg i modereringsbrugerfladen",
+  "status.all_disabled": "Fremhævelser og citater er deaktiveret",
   "status.block": "Blokér @{name}",
   "status.bookmark": "Bogmærk",
   "status.cancel_reblog_private": "Fjern fremhævelse",
+  "status.cannot_quote": "Du har ikke tilladelse til at citere dette indlæg",
   "status.cannot_reblog": "Dette indlæg kan ikke fremhæves",
+  "status.contains_quote": "Indeholder citat",
+  "status.context.loading": "Indlæser flere svar",
+  "status.context.loading_error": "Kunne ikke indlæse nye svar",
+  "status.context.loading_success": "Alle svar indlæst",
+  "status.context.more_replies_found": "Flere svar fundet",
+  "status.context.retry": "Prøv igen",
+  "status.context.show": "Vis",
   "status.continued_thread": "Fortsat tråd",
   "status.copy": "Kopiér link til indlæg",
   "status.delete": "Slet",
+  "status.delete.success": "Indlæg slettet",
   "status.detailed_status": "Detaljeret samtalevisning",
   "status.direct": "Nævn @{name} privat",
   "status.direct_indicator": "Privat omtale",
@@ -872,27 +905,43 @@
   "status.mute_conversation": "Skjul samtale",
   "status.open": "Udvid dette indlæg",
   "status.pin": "Fastgør til profil",
+  "status.quote": "Citér",
+  "status.quote.cancel": "Annullér citat",
   "status.quote_error.filtered": "Skjult grundet et af filterne",
-  "status.quote_error.not_found": "Dette indlæg kan ikke vises.",
-  "status.quote_error.pending_approval": "Dette indlæg afventer godkendelse fra den oprindelige forfatter.",
-  "status.quote_error.rejected": "Dette indlæg kan ikke vises, da den oprindelige forfatter ikke tillader citering heraf.",
-  "status.quote_error.removed": "Dette indlæg er fjernet af forfatteren.",
-  "status.quote_error.unauthorized": "Dette indlæg kan ikke vises, da man ikke har tilladelse til at se det.",
-  "status.quote_post_author": "Indlæg fra {name}",
+  "status.quote_error.limited_account_hint.action": "Vis alligevel",
+  "status.quote_error.limited_account_hint.title": "Denne profil er blevet skjult af {domain}-moderatorerne.",
+  "status.quote_error.not_available": "Indlæg utilgængeligt",
+  "status.quote_error.pending_approval": "Afventende indlæg",
+  "status.quote_error.pending_approval_popout.body": "På Mastodon kan du kontrollere, om nogen kan citere dig. Dette indlæg afventer, mens vi får den oprindelige forfatters godkendelse.",
+  "status.quote_error.revoked": "Indlæg fjernet af forfatter",
+  "status.quote_followers_only": "Kun følgere kan citere dette indlæg",
+  "status.quote_manual_review": "Forfatter vil manuelt gennemgå",
+  "status.quote_noun": "Citat",
+  "status.quote_policy_change": "Ændr hvem der kan citere",
+  "status.quote_post_author": "Citerede et indlæg fra @{name}",
+  "status.quote_private": "Private indlæg kan ikke citeres",
+  "status.quotes": "{count, plural, one {citat} other {citater}}",
+  "status.quotes.empty": "Ingen har citeret dette indlæg endnu. Når det sker, vil det fremgå her.",
+  "status.quotes.local_other_disclaimer": "Citater afvist af forfatteren vil ikke blive vist.",
+  "status.quotes.remote_other_disclaimer": "Kun citater fra {domain} vises med garanti her. Citater afvist af forfatteren vil ikke blive vist.",
   "status.read_more": "Læs mere",
   "status.reblog": "Fremhæv",
-  "status.reblog_private": "Fremhæv med oprindelig synlighed",
+  "status.reblog_or_quote": "Fremhæv eller citér",
+  "status.reblog_private": "Del igen med dine følgere",
   "status.reblogged_by": "{name} fremhævede",
   "status.reblogs": "{count, plural, one {# fremhævelse} other {# fremhævelser}}",
   "status.reblogs.empty": "Ingen har endnu fremhævet dette indlæg. Når nogen gør, vil det fremgå hér.",
-  "status.redraft": "Slet og omformulér",
+  "status.redraft": "Slet og omskriv",
   "status.remove_bookmark": "Fjern bogmærke",
   "status.remove_favourite": "Fjern fra favoritter",
-  "status.replied_in_thread": "Svaret i tråd",
+  "status.remove_quote": "Fjern",
+  "status.replied_in_thread": "Svarede i tråd",
   "status.replied_to": "Svarede {name}",
   "status.reply": "Besvar",
   "status.replyAll": "Svar alle",
   "status.report": "Anmeld @{name}",
+  "status.request_quote": "Anmod om citeringsmulighed",
+  "status.revoke_quote": "Fjern eget indlæg fra @{name}s indlæg",
   "status.sensitive_warning": "Følsomt indhold",
   "status.share": "Del",
   "status.show_less_all": "Vis mindre for alle",
@@ -902,7 +951,7 @@
   "status.translate": "Oversæt",
   "status.translated_from_with": "Oversat fra {lang} ved brug af {provider}",
   "status.uncached_media_warning": "Ingen forhåndsvisning",
-  "status.unmute_conversation": "Genaktivér samtale",
+  "status.unmute_conversation": "Vis samtale",
   "status.unpin": "Frigør fra profil",
   "subscribed_languages.lead": "Efter ændringen vises kun indlæg på de valgte sprog på din hjem- og listetidslinje. Vælger du ingen, vil du modtage indlæg på alle sprog.",
   "subscribed_languages.save": "Gem ændringer",
@@ -930,6 +979,7 @@
   "upload_button.label": "Tilføj billed-, video- eller lydfil(er)",
   "upload_error.limit": "Grænse for filupload nået.",
   "upload_error.poll": "Filupload ikke tilladt for afstemninger.",
+  "upload_error.quote": "Fil-upload ikke tilladt i citater.",
   "upload_form.drag_and_drop.instructions": "For at opsamle en medievedhæftning, tryk på Mellemrum eller Retur. Mens der trækkes, benyt piletasterne til at flytte medievedhæftningen i en given retning. Tryk på Mellemrum eller Retur igen for at slippe medievedhæftningen på den nye position, eller tryk på Escape for at afbryde.",
   "upload_form.drag_and_drop.on_drag_cancel": "Træk blev afbrudt. Medievedhæftningen {item} blev sluppet.",
   "upload_form.drag_and_drop.on_drag_end": "Medievedhæftningen {item} er sluppet.",
@@ -952,5 +1002,19 @@
   "video.skip_forward": "Overspring fremad",
   "video.unmute": "Slå lyd tl",
   "video.volume_down": "Lydstyrke ned",
-  "video.volume_up": "Lydstyrke op"
+  "video.volume_up": "Lydstyrke op",
+  "visibility_modal.button_title": "Indstil synlighed",
+  "visibility_modal.header": "Synlighed og interaktion",
+  "visibility_modal.helper.direct_quoting": "Private omtaler forfattet på Mastodon kan ikke citeres af andre.",
+  "visibility_modal.helper.privacy_editing": "Synlighed kan ikke ændres, efter at et indlæg er offentliggjort.",
+  "visibility_modal.helper.privacy_private_self_quote": "Selvcitater fra private indlæg kan ikke gøres offentlige.",
+  "visibility_modal.helper.private_quoting": "Kun-følger indlæg forfattet på Mastodon kan ikke citeres af andre.",
+  "visibility_modal.helper.unlisted_quoting": "Når folk citerer dig, vil deres indlæg også blive skjult fra trendtidslinjer.",
+  "visibility_modal.instructions": "Kontroller, hvem der kan interagere med dette indlæg. Du kan også anvende indstillingerne på alle fremtidige indlæg ved at gå til <link>Præferencer > Standardindstillinger for indlæg</link>.",
+  "visibility_modal.privacy_label": "Synlighed",
+  "visibility_modal.quote_followers": "Kun følgere",
+  "visibility_modal.quote_label": "Hvem kan citere",
+  "visibility_modal.quote_nobody": "Kun mig",
+  "visibility_modal.quote_public": "Alle",
+  "visibility_modal.save": "Gem"
 }
diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json
index f0beb106051..c1d848ee079 100644
--- a/app/javascript/mastodon/locales/de.json
+++ b/app/javascript/mastodon/locales/de.json
@@ -6,7 +6,7 @@
   "about.domain_blocks.no_reason_available": "Grund unbekannt",
   "about.domain_blocks.preamble": "Mastodon erlaubt es dir grundsätzlich, alle Inhalte von allen Nutzer*innen auf allen Servern im Fediverse zu sehen und mit ihnen zu interagieren. Für diesen Server gibt es aber ein paar Ausnahmen.",
   "about.domain_blocks.silenced.explanation": "Standardmäßig werden von diesem Server keine Inhalte oder Profile angezeigt. Du kannst die Profile und Inhalte aber dennoch sehen, wenn du explizit nach diesen suchst oder diesen folgst.",
-  "about.domain_blocks.silenced.title": "Stummgeschaltet",
+  "about.domain_blocks.silenced.title": "Ausgeblendet",
   "about.domain_blocks.suspended.explanation": "Es werden keine Daten von diesem Server verarbeitet, gespeichert oder ausgetauscht, sodass eine Interaktion oder Kommunikation mit Nutzer*innen dieses Servers nicht möglich ist.",
   "about.domain_blocks.suspended.title": "Gesperrt",
   "about.language_label": "Sprache",
@@ -28,6 +28,7 @@
   "account.disable_notifications": "Höre auf mich zu benachrichtigen wenn @{name} etwas postet",
   "account.domain_blocking": "Domain blockiert",
   "account.edit_profile": "Profil bearbeiten",
+  "account.edit_profile_short": "Bearbeiten",
   "account.enable_notifications": "Benachrichtige mich wenn @{name} etwas postet",
   "account.endorse": "Im Profil vorstellen",
   "account.familiar_followers_many": "Gefolgt von {name1}, {name2} und {othersCount, plural, one {einem weiteren Profil, das dir bekannt ist} other {# weiteren Profilen, die dir bekannt sind}}",
@@ -40,6 +41,11 @@
   "account.featured_tags.last_status_never": "Keine Beiträge",
   "account.follow": "Folgen",
   "account.follow_back": "Ebenfalls folgen",
+  "account.follow_back_short": "Ebenfalls folgen",
+  "account.follow_request": "Anfrage zum Folgen",
+  "account.follow_request_cancel": "Anfrage zurückziehen",
+  "account.follow_request_cancel_short": "Abbrechen",
+  "account.follow_request_short": "Anfragen",
   "account.followers": "Follower",
   "account.followers.empty": "Diesem Profil folgt noch niemand.",
   "account.followers_counter": "{count, plural, one {{counter} Follower} other {{counter} Follower}}",
@@ -70,7 +76,6 @@
   "account.posts_with_replies": "Beiträge und Antworten",
   "account.remove_from_followers": "{name} als Follower entfernen",
   "account.report": "@{name} melden",
-  "account.requested": "Die Genehmigung steht noch aus. Klicke hier, um die Follower-Anfrage zurückzuziehen",
   "account.requested_follow": "{name} möchte dir folgen",
   "account.requests_to_follow_you": "Möchte dir folgen",
   "account.share": "Profil von @{name} teilen",
@@ -225,7 +230,7 @@
   "confirmations.discard_draft.edit.title": "Änderungen an diesem Beitrag verwerfen?",
   "confirmations.discard_draft.post.cancel": "Entwurf fortsetzen",
   "confirmations.discard_draft.post.message": "Beim Fortfahren wird der gerade verfasste Beitrag verworfen.",
-  "confirmations.discard_draft.post.title": "Beitragsentwurf verwerfen?",
+  "confirmations.discard_draft.post.title": "Entwurf verwerfen?",
   "confirmations.discard_edit_media.confirm": "Verwerfen",
   "confirmations.discard_edit_media.message": "Du hast Änderungen an der Medienbeschreibung oder -vorschau vorgenommen, die noch nicht gespeichert sind. Trotzdem verwerfen?",
   "confirmations.follow_to_list.confirm": "Folgen und zur Liste hinzufügen",
@@ -239,15 +244,25 @@
   "confirmations.missing_alt_text.secondary": "Trotzdem veröffentlichen",
   "confirmations.missing_alt_text.title": "Bildbeschreibung hinzufügen?",
   "confirmations.mute.confirm": "Stummschalten",
+  "confirmations.quiet_post_quote_info.dismiss": "Nicht mehr anzeigen",
+  "confirmations.quiet_post_quote_info.got_it": "Verstanden",
+  "confirmations.quiet_post_quote_info.message": "Beim Zitieren eines Beitrags mit der Sichtbarkeit „Öffentlich (still)“ wird dein zitierter Beitrag ebenfalls nicht in den Trends und öffentlichen Timelines angezeigt.",
+  "confirmations.quiet_post_quote_info.title": "Zitieren eines Beitrags mit der Sichtbarkeit „Öffentlich (still)“",
   "confirmations.redraft.confirm": "Löschen und neu erstellen",
   "confirmations.redraft.message": "Möchtest du diesen Beitrag wirklich löschen und neu verfassen? Alle Favoriten sowie die bisher geteilten Beiträge werden verloren gehen und Antworten auf den ursprünglichen Beitrag verlieren den Zusammenhang.",
   "confirmations.redraft.title": "Beitrag löschen und neu verfassen?",
   "confirmations.remove_from_followers.confirm": "Follower entfernen",
   "confirmations.remove_from_followers.message": "{name} wird dir nicht länger folgen. Bist du dir sicher?",
   "confirmations.remove_from_followers.title": "Follower entfernen?",
+  "confirmations.revoke_quote.confirm": "Beitrag entfernen",
+  "confirmations.revoke_quote.message": "Diese Aktion kann nicht rückgängig gemacht werden.",
+  "confirmations.revoke_quote.title": "Beitrag entfernen?",
+  "confirmations.unblock.confirm": "Entsperren",
+  "confirmations.unblock.title": "{name} entsperren?",
   "confirmations.unfollow.confirm": "Entfolgen",
-  "confirmations.unfollow.message": "Möchtest du {name} wirklich entfolgen?",
-  "confirmations.unfollow.title": "Profil entfolgen?",
+  "confirmations.unfollow.title": "{name} entfolgen?",
+  "confirmations.withdraw_request.confirm": "Anfrage zurückziehen",
+  "confirmations.withdraw_request.title": "Anfrage zum Folgen von {name} zurückziehen?",
   "content_warning.hide": "Beitrag ausblenden",
   "content_warning.show": "Trotzdem anzeigen",
   "content_warning.show_more": "Beitrag anzeigen",
@@ -289,6 +304,7 @@
   "domain_pill.your_handle": "Deine Adresse:",
   "domain_pill.your_server": "Deine digitale Heimat. Hier „leben“ alle Beiträge von dir. Falls es dir hier nicht gefällt, kannst du jederzeit den Server wechseln und ebenso deine Follower übertragen.",
   "domain_pill.your_username": "Deine eindeutige Identität auf diesem Server. Es ist möglich, Profile mit dem gleichen Profilnamen auf verschiedenen Servern zu finden.",
+  "dropdown.empty": "Option auswählen",
   "embed.instructions": "Du kannst diesen Beitrag auf deiner Website einbetten, indem du den nachfolgenden Code kopierst.",
   "embed.preview": "Vorschau:",
   "emoji_button.activity": "Aktivitäten",
@@ -362,7 +378,7 @@
   "filter_modal.select_filter.subtitle": "Einem vorhandenen Filter hinzufügen oder einen neuen erstellen",
   "filter_modal.select_filter.title": "Diesen Beitrag filtern",
   "filter_modal.title.status": "Beitrag per Filter ausblenden",
-  "filter_warning.matches_filter": "Übereinstimmend mit dem Filter „<span>{title}</span>“",
+  "filter_warning.matches_filter": "Ausgeblendet wegen des Filters „<span>{title}</span>“",
   "filtered_notifications_banner.pending_requests": "Von {count, plural, =0 {keinem Profil, das dir möglicherweise bekannt ist} one {einem Profil, das dir möglicherweise bekannt ist} other {# Profilen, die dir möglicherweise bekannt sind}}",
   "filtered_notifications_banner.title": "Gefilterte Benachrichtigungen",
   "firehose.all": "Alle Server",
@@ -424,8 +440,6 @@
   "hints.profiles.see_more_followers": "Weitere Follower auf {domain} ansehen",
   "hints.profiles.see_more_follows": "Weitere gefolgte Profile auf {domain} ansehen",
   "hints.profiles.see_more_posts": "Weitere Beiträge auf {domain} ansehen",
-  "hints.threads.replies_may_be_missing": "Möglicherweise werden nicht alle Antworten von anderen Servern angezeigt.",
-  "hints.threads.see_more": "Weitere Antworten auf {domain} ansehen",
   "home.column_settings.show_quotes": "Zitierte Beiträge anzeigen",
   "home.column_settings.show_reblogs": "Geteilte Beiträge anzeigen",
   "home.column_settings.show_replies": "Antworten anzeigen",
@@ -447,20 +461,12 @@
   "ignore_notifications_modal.private_mentions_title": "Benachrichtigungen von unerwünschten privaten Erwähnungen ignorieren?",
   "info_button.label": "Hilfe",
   "info_button.what_is_alt_text": "<h1>Was ist Alt-Text?</h1> <p>Alt-Text bietet Bildbeschreibungen für Personen mit einer Sehschwäche, einer schlechten Internetverbindung und für alle, die zusätzlichen Kontext möchten.</p> <p>Du kannst die Zugänglichkeit und die Verständlichkeit für alle verbessern, indem du eine klare, genaue und objektive Bildbeschreibung hinzufügst.</p> <ul> <li>Erfasse wichtige Elemente</li> <li>Fasse Text in Bildern zusammen</li> <li>Verwende einen korrekten Satzbau</li> <li>Vermeide unwichtige Informationen</li> <li>Konzentriere dich bei komplexen Darstellungen (z. B. Diagramme oder Karten) auf Trends und wichtige Erkenntnisse</li> </ul>",
-  "interaction_modal.action.favourite": "Du musst von deinem Konto aus favorisieren, um fortzufahren.",
-  "interaction_modal.action.follow": "Du musst von deinem Konto aus folgen, um fortzufahren.",
-  "interaction_modal.action.reblog": "Du musst von deinem Konto aus teilen, um fortzufahren.",
-  "interaction_modal.action.reply": "Du musst von deinem Konto aus antworten, um fortzufahren.",
-  "interaction_modal.action.vote": "Du musst von deinem Konto aus abstimmen, um fortzufahren.",
+  "interaction_modal.action": "Melde dich auf deinem Mastodon-Server an, damit du mit dem Beitrag von {name} interagieren kannst.",
   "interaction_modal.go": "Los",
   "interaction_modal.no_account_yet": "Du hast noch kein Konto?",
   "interaction_modal.on_another_server": "Auf einem anderen Server",
   "interaction_modal.on_this_server": "Auf diesem Server",
-  "interaction_modal.title.favourite": "Beitrag von {name} favorisieren",
-  "interaction_modal.title.follow": "Folge {name}",
-  "interaction_modal.title.reblog": "Beitrag von {name} teilen",
-  "interaction_modal.title.reply": "Auf Beitrag von {name} antworten",
-  "interaction_modal.title.vote": "An der Umfrage von {name} teilnehmen",
+  "interaction_modal.title": "Melde dich an, um fortzufahren",
   "interaction_modal.username_prompt": "z. B. {example}",
   "intervals.full.days": "{number, plural, one {# Tag} other {# Tage}}",
   "intervals.full.hours": "{number, plural, one {# Stunde} other {# Stunden}}",
@@ -481,6 +487,7 @@
   "keyboard_shortcuts.home": "Startseite öffnen",
   "keyboard_shortcuts.hotkey": "Tastenkürzel",
   "keyboard_shortcuts.legend": "Tastenkombinationen anzeigen",
+  "keyboard_shortcuts.load_more": "Schaltfläche „Mehr laden“ fokussieren",
   "keyboard_shortcuts.local": "Lokale Timeline öffnen",
   "keyboard_shortcuts.mention": "Profil erwähnen",
   "keyboard_shortcuts.muted": "Liste stummgeschalteter Profile öffnen",
@@ -489,6 +496,7 @@
   "keyboard_shortcuts.open_media": "Medieninhalt öffnen",
   "keyboard_shortcuts.pinned": "Liste angehefteter Beiträge öffnen",
   "keyboard_shortcuts.profile": "Profil aufrufen",
+  "keyboard_shortcuts.quote": "Beitrag zitieren",
   "keyboard_shortcuts.reply": "Auf Beitrag antworten",
   "keyboard_shortcuts.requests": "Liste der Follower-Anfragen aufrufen",
   "keyboard_shortcuts.search": "Suchleiste fokussieren",
@@ -500,6 +508,8 @@
   "keyboard_shortcuts.translate": "Beitrag übersetzen",
   "keyboard_shortcuts.unfocus": "Eingabefeld/Suche nicht mehr fokussieren",
   "keyboard_shortcuts.up": "Ansicht nach oben bewegen",
+  "learn_more_link.got_it": "Verstanden",
+  "learn_more_link.learn_more": "Mehr erfahren",
   "lightbox.close": "Schließen",
   "lightbox.next": "Vor",
   "lightbox.previous": "Zurück",
@@ -600,6 +610,7 @@
   "notification.label.mention": "Erwähnung",
   "notification.label.private_mention": "Private Erwähnung",
   "notification.label.private_reply": "Private Antwort",
+  "notification.label.quote": "{name} zitierte deinen Beitrag",
   "notification.label.reply": "Antwort",
   "notification.mention": "Erwähnung",
   "notification.mentioned_you": "{name} erwähnte dich",
@@ -614,6 +625,7 @@
   "notification.moderation_warning.action_suspend": "Dein Konto wurde gesperrt.",
   "notification.own_poll": "Deine Umfrage ist beendet",
   "notification.poll": "Eine Umfrage, an der du teilgenommen hast, ist beendet",
+  "notification.quoted_update": "{name} bearbeitete einen von dir zitierten Beitrag",
   "notification.reblog": "{name} teilte deinen Beitrag",
   "notification.reblog.name_and_others_with_link": "{name} und <a>{count, plural, one {# weiteres Profil} other {# weitere Profile}}</a> teilten deinen Beitrag",
   "notification.relationships_severance_event": "Verbindungen mit {name} verloren",
@@ -657,6 +669,7 @@
   "notifications.column_settings.mention": "Erwähnungen:",
   "notifications.column_settings.poll": "Umfrageergebnisse:",
   "notifications.column_settings.push": "Push-Benachrichtigungen",
+  "notifications.column_settings.quote": "Zitate:",
   "notifications.column_settings.reblog": "Geteilte Beiträge:",
   "notifications.column_settings.show": "In dieser Spalte anzeigen",
   "notifications.column_settings.sound": "Ton abspielen",
@@ -732,11 +745,18 @@
   "privacy.private.short": "Follower",
   "privacy.public.long": "Alle in und außerhalb von Mastodon",
   "privacy.public.short": "Öffentlich",
+  "privacy.quote.anyone": "{visibility} – alle dürfen zitieren",
+  "privacy.quote.disabled": "{visibility} – niemand darf zitieren",
+  "privacy.quote.limited": "{visibility} – eingeschränktes Zitieren",
   "privacy.unlisted.additional": "Das Verhalten ist wie bei „Öffentlich“, jedoch gibt es einige Einschränkungen. Der Beitrag wird nicht in „Live-Feeds“, „Erkunden“, Hashtags oder über die Mastodon-Suchfunktion auffindbar sein – selbst wenn die zugehörige Einstellung aktiviert wurde.",
-  "privacy.unlisted.long": "Weniger im Algorithmus berücksichtigt",
+  "privacy.unlisted.long": "Wird nicht in den Suchergebnissen, Trends oder öffentlichen Timelines von Mastodon angezeigt",
   "privacy.unlisted.short": "Öffentlich (still)",
   "privacy_policy.last_updated": "Stand: {date}",
   "privacy_policy.title": "Datenschutzerklärung",
+  "quote_error.poll": "Zitieren ist bei Umfragen nicht gestattet.",
+  "quote_error.quote": "Es ist jeweils nur ein Zitat zulässig.",
+  "quote_error.unauthorized": "Du bist nicht berechtigt, diesen Beitrag zu zitieren.",
+  "quote_error.upload": "Zitieren ist mit Medien-Anhängen nicht möglich.",
   "recommended": "Empfohlen",
   "refresh": "Aktualisieren",
   "regeneration_indicator.please_stand_by": "Bitte warten.",
@@ -752,6 +772,9 @@
   "relative_time.minutes": "{number} Min.",
   "relative_time.seconds": "{number} Sek.",
   "relative_time.today": "heute",
+  "remove_quote_hint.button_label": "Verstanden",
+  "remove_quote_hint.message": "Klicke dafür im Beitrag auf „{icon} Mehr“.",
+  "remove_quote_hint.title": "Möchtest du aus dem zitierten Beitrag entfernt werden?",
   "reply_indicator.attachments": "{count, plural, one {# Anhang} other {# Anhänge}}",
   "reply_indicator.cancel": "Abbrechen",
   "reply_indicator.poll": "Umfrage",
@@ -843,13 +866,23 @@
   "status.admin_account": "@{name} moderieren",
   "status.admin_domain": "{domain} moderieren",
   "status.admin_status": "Beitrag moderieren",
+  "status.all_disabled": "Teilen und Zitieren von Beiträgen ist deaktiviert",
   "status.block": "@{name} blockieren",
   "status.bookmark": "Lesezeichen setzen",
   "status.cancel_reblog_private": "Beitrag nicht mehr teilen",
+  "status.cannot_quote": "Dir ist es nicht gestattet, diesen Beitrag zu zitieren",
   "status.cannot_reblog": "Dieser Beitrag kann nicht geteilt werden",
+  "status.contains_quote": "Enthält Zitat",
+  "status.context.loading": "Weitere Antworten laden",
+  "status.context.loading_error": "Weitere Antworten konnten nicht geladen werden",
+  "status.context.loading_success": "Alle weiteren Antworten geladen",
+  "status.context.more_replies_found": "Weitere Antworten verfügbar",
+  "status.context.retry": "Erneut versuchen",
+  "status.context.show": "Anzeigen",
   "status.continued_thread": "Fortgeführter Thread",
   "status.copy": "Link zum Beitrag kopieren",
   "status.delete": "Beitrag löschen",
+  "status.delete.success": "Beitrag gelöscht",
   "status.detailed_status": "Detaillierte Ansicht der Unterhaltung",
   "status.direct": "@{name} privat erwähnen",
   "status.direct_indicator": "Private Erwähnung",
@@ -872,27 +905,43 @@
   "status.mute_conversation": "Unterhaltung stummschalten",
   "status.open": "Beitrag öffnen",
   "status.pin": "Im Profil anheften",
+  "status.quote": "Zitieren",
+  "status.quote.cancel": "Zitat abbrechen",
   "status.quote_error.filtered": "Ausgeblendet wegen eines deiner Filter",
-  "status.quote_error.not_found": "Dieser Beitrag kann nicht angezeigt werden.",
-  "status.quote_error.pending_approval": "Dieser Beitrag muss noch durch das ursprüngliche Profil genehmigt werden.",
-  "status.quote_error.rejected": "Dieser Beitrag kann nicht angezeigt werden, weil das ursprüngliche Profil das Zitieren nicht erlaubt.",
-  "status.quote_error.removed": "Dieser Beitrag wurde durch das Profil entfernt.",
-  "status.quote_error.unauthorized": "Dieser Beitrag kann nicht angezeigt werden, weil du zum Ansehen nicht berechtigt bist.",
-  "status.quote_post_author": "Beitrag von {name}",
+  "status.quote_error.limited_account_hint.action": "Trotzdem anzeigen",
+  "status.quote_error.limited_account_hint.title": "Dieses Profil wurde von den Moderator*innen von {domain} ausgeblendet.",
+  "status.quote_error.not_available": "Beitrag nicht verfügbar",
+  "status.quote_error.pending_approval": "Beitragsveröffentlichung ausstehend",
+  "status.quote_error.pending_approval_popout.body": "Auf Mastodon kann festgelegt werden, ob man zitiert werden möchte. Wir warten auf die Genehmigung des ursprünglichen Profils. Bis dahin steht deine Beitragsveröffentlichung noch aus.",
+  "status.quote_error.revoked": "Beitrag durch Autor*in entfernt",
+  "status.quote_followers_only": "Nur Follower können diesen Beitrag zitieren",
+  "status.quote_manual_review": "Zitierte*r überprüft manuell",
+  "status.quote_noun": "Zitat",
+  "status.quote_policy_change": "Ändern, wer zitieren darf",
+  "status.quote_post_author": "Zitierte einen Beitrag von @{name}",
+  "status.quote_private": "Private Beiträge können nicht zitiert werden",
+  "status.quotes": "{count, plural, one {Mal zitiert} other {Mal zitiert}}",
+  "status.quotes.empty": "Diesen Beitrag hat bisher noch niemand zitiert. Sobald es jemand tut, wird das Profil hier erscheinen.",
+  "status.quotes.local_other_disclaimer": "Durch Autor*in abgelehnte Zitate werden nicht angezeigt.",
+  "status.quotes.remote_other_disclaimer": "Nur Zitate von {domain} werden hier garantiert angezeigt. Durch Autor*in abgelehnte Zitate werden nicht angezeigt.",
   "status.read_more": "Gesamten Beitrag anschauen",
   "status.reblog": "Teilen",
-  "status.reblog_private": "Mit der ursprünglichen Zielgruppe teilen",
+  "status.reblog_or_quote": "Teilen oder zitieren",
+  "status.reblog_private": "Erneut mit deinen Followern teilen",
   "status.reblogged_by": "{name} teilte",
   "status.reblogs": "{count, plural, one {Mal geteilt} other {Mal geteilt}}",
   "status.reblogs.empty": "Diesen Beitrag hat bisher noch niemand geteilt. Sobald es jemand tut, wird das Profil hier erscheinen.",
   "status.redraft": "Löschen und neu erstellen",
   "status.remove_bookmark": "Lesezeichen entfernen",
   "status.remove_favourite": "Aus Favoriten entfernen",
+  "status.remove_quote": "Entfernen",
   "status.replied_in_thread": "Antwortete im Thread",
   "status.replied_to": "Antwortete {name}",
   "status.reply": "Antworten",
   "status.replyAll": "Allen antworten",
   "status.report": "@{name} melden",
+  "status.request_quote": "Anfrage zum Zitieren",
+  "status.revoke_quote": "Meinen zitierten Beitrag aus dem Beitrag von @{name} entfernen",
   "status.sensitive_warning": "Inhaltswarnung",
   "status.share": "Teilen",
   "status.show_less_all": "Alles einklappen",
@@ -930,6 +979,7 @@
   "upload_button.label": "Bilder, Video oder Audio hinzufügen",
   "upload_error.limit": "Dateiupload-Limit überschritten.",
   "upload_error.poll": "Medien-Anhänge sind zusammen mit Umfragen nicht erlaubt.",
+  "upload_error.quote": "Medien-Anhänge sind zusammen mit Zitaten nicht erlaubt.",
   "upload_form.drag_and_drop.instructions": "Drücke zum Aufnehmen eines Medienanhangs die Eingabe- oder Leertaste. Verwende beim Ziehen die Pfeiltasten, um den Medienanhang zur gewünschten Position zu bewegen. Drücke erneut die Eingabe- oder Leertaste, um den Medienanhang an der gewünschten Position abzulegen. Mit der Escape-Taste kannst du den Vorgang abbrechen.",
   "upload_form.drag_and_drop.on_drag_cancel": "Das Ziehen wurde abgebrochen und der Medienanhang {item} wurde abgelegt.",
   "upload_form.drag_and_drop.on_drag_end": "Der Medienanhang {item} wurde abgelegt.",
@@ -952,5 +1002,19 @@
   "video.skip_forward": "Vorspulen",
   "video.unmute": "Stummschaltung aufheben",
   "video.volume_down": "Leiser",
-  "video.volume_up": "Lauter"
+  "video.volume_up": "Lauter",
+  "visibility_modal.button_title": "Sichtbarkeit festlegen",
+  "visibility_modal.header": "Sichtbarkeit und Interaktion",
+  "visibility_modal.helper.direct_quoting": "Private Erwähnungen, die auf Mastodon verfasst wurden, können nicht von anderen zitiert werden.",
+  "visibility_modal.helper.privacy_editing": "Die Sichtbarkeit eines bereits veröffentlichten Beitrags kann nachträglich nicht mehr geändert werden.",
+  "visibility_modal.helper.privacy_private_self_quote": "Beiträge mit privaten Erwähnungen können öffentlich nicht zitiert werden.",
+  "visibility_modal.helper.private_quoting": "Beiträge, die nur für deine Follower bestimmt sind und auf Mastodon verfasst wurden, können nicht von anderen zitiert werden.",
+  "visibility_modal.helper.unlisted_quoting": "Sollten dich andere zitieren, werden ihre zitierten Beiträge ebenfalls nicht in den Trends und öffentlichen Timelines angezeigt.",
+  "visibility_modal.instructions": "Lege fest, wer mit diesem Beitrag interagieren darf. Du hast auch die Möglichkeit, diese Einstellung auf alle zukünftigen Beiträge anzuwenden. Gehe zu: <link>Einstellungen > Standardeinstellungen für Beiträge</link>",
+  "visibility_modal.privacy_label": "Sichtbarkeit",
+  "visibility_modal.quote_followers": "Nur Follower",
+  "visibility_modal.quote_label": "Wer zitieren darf",
+  "visibility_modal.quote_nobody": "Nur ich",
+  "visibility_modal.quote_public": "Alle",
+  "visibility_modal.save": "Speichern"
 }
diff --git a/app/javascript/mastodon/locales/el.json b/app/javascript/mastodon/locales/el.json
index ee6de69d41a..5c94e6d858a 100644
--- a/app/javascript/mastodon/locales/el.json
+++ b/app/javascript/mastodon/locales/el.json
@@ -4,7 +4,7 @@
   "about.default_locale": "Προεπιλογή",
   "about.disclaimer": "Το Mastodon είναι ελεύθερο λογισμικό ανοιχτού κώδικα και εμπορικό σήμα της Mastodon gGmbH.",
   "about.domain_blocks.no_reason_available": "Αιτιολογία μη διαθέσιμη",
-  "about.domain_blocks.preamble": "Σε γενικές γραμμές το Mastodon σού επιτρέπει να βλέπεις περιεχόμενο και να αλληλεπιδράς με χρήστες από οποιονδήποτε άλλο διακομιστή σε ένα διασυνδεδεμένο σύμπαν διακομιστών (fediverse). Ακολουθούν οι εξαιρέσεις που ισχύουν για τον συγκεκριμένο διακομιστή.",
+  "about.domain_blocks.preamble": "Σε γενικές γραμμές το Mastodon σου επιτρέπει να βλέπεις περιεχόμενο και να αλληλεπιδράς με χρήστες από οποιονδήποτε άλλο διακομιστή σε ένα διασυνδεδεμένο σύμπαν διακομιστών (fediverse). Ακολουθούν οι εξαιρέσεις που ισχύουν για τον συγκεκριμένο διακομιστή.",
   "about.domain_blocks.silenced.explanation": "Συνήθως δε θα βλέπεις προφίλ και περιεχόμενο απ' αυτόν τον διακομιστή, εκτός αν κάνεις συγκεκριμένη αναζήτηση ή επιλέξεις να τον ακολουθήσεις.",
   "about.domain_blocks.silenced.title": "Περιορισμένος",
   "about.domain_blocks.suspended.explanation": "Τα δεδομένα αυτού του διακομιστή, δε θα επεξεργάζονται, δε θα αποθηκεύονται και δε θα ανταλλάσσονται, καθιστώντας οποιαδήποτε αλληλεπίδραση ή επικοινωνία με χρήστες από αυτόν το διακομιστή αδύνατη.",
@@ -28,6 +28,7 @@
   "account.disable_notifications": "Σταμάτα να με ειδοποιείς όταν δημοσιεύει ο @{name}",
   "account.domain_blocking": "Αποκλείεται ο τομέας",
   "account.edit_profile": "Επεξεργασία προφίλ",
+  "account.edit_profile_short": "Επεξεργασία",
   "account.enable_notifications": "Ειδοποίησέ με όταν δημοσιεύει ο @{name}",
   "account.endorse": "Προβολή στο προφίλ",
   "account.familiar_followers_many": "Ακολουθείται από {name1}, {name2}, και {othersCount, plural, one {ένας ακόμα που ξέρεις} other {# ακόμα που ξέρεις}}",
@@ -40,6 +41,11 @@
   "account.featured_tags.last_status_never": "Καμία ανάρτηση",
   "account.follow": "Ακολούθησε",
   "account.follow_back": "Ακολούθησε και εσύ",
+  "account.follow_back_short": "Ακολούθησε και εσύ",
+  "account.follow_request": "Αίτημα για ακολούθηση",
+  "account.follow_request_cancel": "Ακύρωση αιτήματος",
+  "account.follow_request_cancel_short": "Ακύρωση",
+  "account.follow_request_short": "Αίτημα",
   "account.followers": "Ακόλουθοι",
   "account.followers.empty": "Κανείς δεν ακολουθεί αυτόν τον χρήστη ακόμα.",
   "account.followers_counter": "{count, plural, one {{counter} ακόλουθος} other {{counter} ακόλουθοι}}",
@@ -65,12 +71,11 @@
   "account.muting": "Σίγαση",
   "account.mutual": "Ακολουθείτε ο ένας τον άλλο",
   "account.no_bio": "Δεν υπάρχει περιγραφή.",
-  "account.open_original_page": "Ανοικτό",
+  "account.open_original_page": "Άνοιγμα αυθεντικής σελίδας",
   "account.posts": "Τουτ",
   "account.posts_with_replies": "Τουτ και απαντήσεις",
   "account.remove_from_followers": "Κατάργηση {name} από τους ακόλουθους",
   "account.report": "Κατάγγειλε @{name}",
-  "account.requested": "Εκκρεμεί έγκριση. Κάνε κλικ για να ακυρώσεις το αίτημα παρακολούθησης",
   "account.requested_follow": "Ο/Η {name} αιτήθηκε να σε ακολουθήσει",
   "account.requests_to_follow_you": "Αιτήματα για να σε ακολουθήσουν",
   "account.share": "Κοινοποίηση του προφίλ @{name}",
@@ -194,9 +199,9 @@
   "compose.saved.body": "Η ανάρτηση αποθηκεύτηκε.",
   "compose_form.direct_message_warning_learn_more": "Μάθε περισσότερα",
   "compose_form.encryption_warning": "Οι δημοσιεύσεις στο Mastodon δεν είναι κρυπτογραφημένες από άκρο σε άκρο. Μη μοιράζεσαι ευαίσθητες πληροφορίες μέσω του Mastodon.",
-  "compose_form.hashtag_warning": "Αυτή η δημοσίευση δεν θα εμφανίζεται κάτω από οποιαδήποτε ετικέτα καθώς δεν είναι δημόσια. Μόνο οι δημόσιες δημοσιεύσεις μπορούν να αναζητηθούν με ετικέτα.",
+  "compose_form.hashtag_warning": "Αυτή η ανάρτηση δεν θα εμφανίζεται κάτω από οποιαδήποτε ετικέτα καθώς δεν είναι δημόσια. Μόνο οι δημόσιες αναρτήσεις μπορούν να αναζητηθούν με ετικέτα.",
   "compose_form.lock_disclaimer": "Ο λογαριασμός σου δεν είναι {locked}. Οποιοσδήποτε μπορεί να σε ακολουθήσει για να δει τις δημοσιεύσεις σου προς τους ακολούθους σου.",
-  "compose_form.lock_disclaimer.lock": "κλειδωμένο",
+  "compose_form.lock_disclaimer.lock": "κλειδωμένος",
   "compose_form.placeholder": "Τι σκέφτεσαι;",
   "compose_form.poll.duration": "Διάρκεια δημοσκόπησης",
   "compose_form.poll.multiple": "Πολλαπλή επιλογή",
@@ -214,11 +219,18 @@
   "confirmation_modal.cancel": "Άκυρο",
   "confirmations.block.confirm": "Αποκλεισμός",
   "confirmations.delete.confirm": "Διαγραφή",
-  "confirmations.delete.message": "Σίγουρα θες να διαγράψεις αυτή τη δημοσίευση;",
+  "confirmations.delete.message": "Σίγουρα θες να διαγράψεις αυτή την ανάρτηση;",
   "confirmations.delete.title": "Διαγραφή ανάρτησης;",
   "confirmations.delete_list.confirm": "Διαγραφή",
   "confirmations.delete_list.message": "Σίγουρα θες να διαγράψεις οριστικά αυτή τη λίστα;",
   "confirmations.delete_list.title": "Διαγραφή λίστας;",
+  "confirmations.discard_draft.confirm": "Απόρριψη και συνέχεια",
+  "confirmations.discard_draft.edit.cancel": "Συνέχιση επεξεργασίας",
+  "confirmations.discard_draft.edit.message": "Συνεχίζοντας θα απορρίψει τυχόν αλλαγές που έχετε κάνει στην ανάρτηση που επεξεργάζεστε.",
+  "confirmations.discard_draft.edit.title": "Απόρριψη αλλαγών στην ανάρτηση σας;",
+  "confirmations.discard_draft.post.cancel": "Συνέχιση προχείρου",
+  "confirmations.discard_draft.post.message": "Συνεχίζοντας θα απορρίψει την ανάρτηση που συνθέτετε.",
+  "confirmations.discard_draft.post.title": "Απόρριψη της πρόχειρης ανάρτησης σας;",
   "confirmations.discard_edit_media.confirm": "Απόρριψη",
   "confirmations.discard_edit_media.message": "Έχεις μη αποθηκευμένες αλλαγές στην περιγραφή πολυμέσων ή στην προεπισκόπηση, απόρριψη ούτως ή άλλως;",
   "confirmations.follow_to_list.confirm": "Ακολούθησε και πρόσθεσε στη λίστα",
@@ -230,17 +242,27 @@
   "confirmations.missing_alt_text.confirm": "Προσθήκη εναλ κειμένου",
   "confirmations.missing_alt_text.message": "Η ανάρτησή σου περιέχει πολυμέσα χωρίς εναλλακτικό κείμενο. Η προσθήκη περιγραφών βοηθά να γίνει το περιεχόμενό σου προσβάσιμο σε περισσότερους ανθρώπους.",
   "confirmations.missing_alt_text.secondary": "Δημοσίευση όπως και να ΄χει",
-  "confirmations.missing_alt_text.title": "Προσθήκη alt κειμένου;",
+  "confirmations.missing_alt_text.title": "Προσθήκη εναλλακτικού κειμένου;",
   "confirmations.mute.confirm": "Αποσιώπηση",
+  "confirmations.quiet_post_quote_info.dismiss": "Μη μου το ξαναθυμίσεις",
+  "confirmations.quiet_post_quote_info.got_it": "Το κατάλαβα",
+  "confirmations.quiet_post_quote_info.message": "Όταν παραθέτετε μια ήσυχη δημόσια ανάρτηση, η ανάρτηση σας θα είναι κρυμμένη από τις δημοφιλείς ροές.",
+  "confirmations.quiet_post_quote_info.title": "Παράθεση ήσυχων δημόσιων αναρτήσεων",
   "confirmations.redraft.confirm": "Διαγραφή & ξαναγράψιμο",
   "confirmations.redraft.message": "Σίγουρα θέλεις να σβήσεις αυτή την ανάρτηση και να την ξαναγράψεις; Οι προτιμήσεις και προωθήσεις θα χαθούν και οι απαντήσεις στην αρχική ανάρτηση θα μείνουν ορφανές.",
   "confirmations.redraft.title": "Διαγραφή & επανασύνταξη;",
   "confirmations.remove_from_followers.confirm": "Αφαίρεση ακολούθου",
   "confirmations.remove_from_followers.message": "Ο χρήστης {name} θα σταματήσει να σε ακολουθεί. Σίγουρα θες να συνεχίσεις;",
   "confirmations.remove_from_followers.title": "Αφαίρεση ακολούθου;",
+  "confirmations.revoke_quote.confirm": "Αφαίρεση ανάρτησης",
+  "confirmations.revoke_quote.message": "Αυτή η ενέργεια δεν μπορεί να αναιρεθεί.",
+  "confirmations.revoke_quote.title": "Αφαίρεση ανάρτησης;",
+  "confirmations.unblock.confirm": "Άρση αποκλεισμού",
+  "confirmations.unblock.title": "Άρση αποκλεισμού {name};",
   "confirmations.unfollow.confirm": "Άρση ακολούθησης",
-  "confirmations.unfollow.message": "Σίγουρα θες να πάψεις να ακολουθείς τον/την {name};",
-  "confirmations.unfollow.title": "Άρση ακολούθησης;",
+  "confirmations.unfollow.title": "Κατάργηση ακολούθησης του/της {name};",
+  "confirmations.withdraw_request.confirm": "Απόσυρση αιτήματος",
+  "confirmations.withdraw_request.title": "Απόσυρση αιτήματος για να ακολουθήσετε τον/την {name};",
   "content_warning.hide": "Απόκρυψη ανάρτησης",
   "content_warning.show": "Εμφάνιση ούτως ή άλλως",
   "content_warning.show_more": "Εμφάνιση περισσότερων",
@@ -269,7 +291,7 @@
   "domain_block_modal.you_will_lose_num_followers": "Θα χάσετε {followersCount, plural, one {{followersCountDisplay} ακόλουθο} other {{followersCountDisplay} ακόλουθους}} και {followingCount, plural, one {{followingCountDisplay} άτομο που ακολουθείτε} other {{followingCountDisplay} άτομα που ακολουθείτε}}.",
   "domain_block_modal.you_will_lose_relationships": "Θα χάσετε όλους τους ακόλουθους και τα άτομα που ακολουθείτε από αυτόν τον διακομιστή.",
   "domain_block_modal.you_wont_see_posts": "Δεν θα βλέπεις αναρτήσεις ή ειδοποιήσεις από χρήστες σε αυτόν το διακομιστή.",
-  "domain_pill.activitypub_lets_connect": "Σού επιτρέπει να συνδεθείς και να αλληλεπιδράσεις με τους ανθρώπους όχι μόνο στο Mastodon, αλλά και σε διαφορετικές κοινωνικές εφαρμογές.",
+  "domain_pill.activitypub_lets_connect": "Σου επιτρέπει να συνδεθείς και να αλληλεπιδράσεις με τους ανθρώπους όχι μόνο στο Mastodon, αλλά και σε διαφορετικές κοινωνικές εφαρμογές.",
   "domain_pill.activitypub_like_language": "Το ActivityPub είναι σαν τη γλώσσα Mastodon μιλάει με άλλα κοινωνικά δίκτυα.",
   "domain_pill.server": "Διακομιστής",
   "domain_pill.their_handle": "Το πλήρες όνομα χρήστη:",
@@ -282,6 +304,7 @@
   "domain_pill.your_handle": "Το πλήρες όνομα χρήστη σου:",
   "domain_pill.your_server": "Το ψηφιακό σου σπίτι, όπου ζουν όλες σου οι αναρτήσεις. Δε σ' αρέσει αυτός; Μετακινήσου σε διακομιστές ανά πάσα στιγμή και πάρε και τους ακόλουθούς σου.",
   "domain_pill.your_username": "Το μοναδικό σου αναγνωριστικό σε τούτο τον διακομιστή. Είναι πιθανό να βρεις χρήστες με το ίδιο όνομα χρήστη σε διαφορετικούς διακομιστές.",
+  "dropdown.empty": "Διαλέξτε μια επιλογή",
   "embed.instructions": "Ενσωμάτωσε αυτή την ανάρτηση στην ιστοσελίδα σου αντιγράφοντας τον παρακάτω κώδικα.",
   "embed.preview": "Ορίστε πως θα φαίνεται:",
   "emoji_button.activity": "Δραστηριότητα",
@@ -308,14 +331,14 @@
   "empty_column.account_unavailable": "Μη διαθέσιμο προφίλ",
   "empty_column.blocks": "Δεν έχεις αποκλείσει κανέναν χρήστη ακόμα.",
   "empty_column.bookmarked_statuses": "Δεν έχεις καμία ανάρτηση με σελιδοδείκτη ακόμα. Μόλις βάλεις κάποιον, θα εμφανιστεί εδώ.",
-  "empty_column.community": "Η τοπική ροή είναι κενή. Γράψε κάτι δημόσιο παραμύθι ν' αρχινίσει!",
+  "empty_column.community": "Η τοπική ροή είναι κενή. Γράψε κάτι δημόσια για να αρχίσει να κυλά η μπάλα!",
   "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.followed_tags": "Δεν έχετε ακολουθήσει ακόμα καμία ετικέτα. Όταν το κάνετε, θα εμφανιστούν εδώ.",
   "empty_column.hashtag": "Δεν υπάρχει ακόμα κάτι για αυτή την ετικέτα.",
   "empty_column.home": "Η τοπική σου ροή είναι κενή! Πήγαινε στο {public} ή κάνε αναζήτηση για να ξεκινήσεις και να γνωρίσεις άλλους χρήστες.",
   "empty_column.list": "Δεν υπάρχει τίποτα σε αυτή τη λίστα ακόμα. Όταν τα μέλη της δημοσιεύσουν νέες καταστάσεις, θα εμφανιστούν εδώ.",
@@ -379,7 +402,7 @@
   "follow_suggestions.similar_to_recently_followed_longer": "Παρόμοια με προφίλ που ακολούθησες πρόσφατα",
   "follow_suggestions.view_all": "Εμφάνιση όλων",
   "follow_suggestions.who_to_follow": "Ποιον να ακολουθήσεις",
-  "followed_tags": "Ετικέτες που ακολουθούνται",
+  "followed_tags": "Ακολουθούμενες ετικέτες",
   "footer.about": "Σχετικά με",
   "footer.directory": "Κατάλογος προφίλ",
   "footer.get_app": "Αποκτήστε την εφαρμογή",
@@ -410,15 +433,13 @@
   "hashtag.mute": "Σίγαση #{hashtag}",
   "hashtag.unfeature": "Να μην αναδεικνύεται στο προφίλ",
   "hashtag.unfollow": "Διακοπή παρακολούθησης ετικέτας",
-  "hashtags.and_other": "…και {count, plural, one {}other {# ακόμη}}",
+  "hashtags.and_other": "…και {count, plural, other {# ακόμη}}",
   "hints.profiles.followers_may_be_missing": "Μπορεί να λείπουν ακόλουθοι για αυτό το προφίλ.",
   "hints.profiles.follows_may_be_missing": "Άτομα που ακολουθούνται μπορεί να λείπουν απ' αυτό το προφίλ.",
   "hints.profiles.posts_may_be_missing": "Κάποιες αναρτήσεις από αυτό το προφίλ μπορεί να λείπουν.",
   "hints.profiles.see_more_followers": "Δες περισσότερους ακόλουθους στο {domain}",
   "hints.profiles.see_more_follows": "Δες περισσότερα άτομα που ακολουθούνται στο {domain}",
   "hints.profiles.see_more_posts": "Δες περισσότερες αναρτήσεις στο {domain}",
-  "hints.threads.replies_may_be_missing": "Απαντήσεις από άλλους διακομιστές μπορεί να λείπουν.",
-  "hints.threads.see_more": "Δες περισσότερες αναρτήσεις στο {domain}",
   "home.column_settings.show_quotes": "Εμφάνιση παραθεμάτων",
   "home.column_settings.show_reblogs": "Εμφάνιση προωθήσεων",
   "home.column_settings.show_replies": "Εμφάνιση απαντήσεων",
@@ -440,20 +461,12 @@
   "ignore_notifications_modal.private_mentions_title": "Αγνόηση ειδοποιήσεων από μη ζητηθείσες ιδιωτικές αναφορές;",
   "info_button.label": "Βοήθεια",
   "info_button.what_is_alt_text": "Το εναλλακτικό κείμενο παρέχει περιγραφές εικόνας για άτομα με προβλήματα όρασης, διαδικτυακές συνδέσεις χαμηλής ταχύτητας ή για άτομα που αναζητούν επιπλέον περιεχόμενο.\\n\\nΜπορείς να βελτιώσεις την προσβασιμότητα και την κατανόηση για όλους, γράφοντας σαφές, συνοπτικό και αντικειμενικό εναλλακτικό κείμενο.\\n\\n<ul><li>Κατέγραψε σημαντικά στοιχεία</li>\\n<li>Συνόψισε το κείμενο στις εικόνες</li>\\n<li>Χρησιμοποίησε δομή κανονικής πρότασης</li>\\n<li>Απέφυγε περιττές πληροφορίες</li>\\n<li>Εστίασε στις τάσεις και τα βασικά ευρήματα σε σύνθετα οπτικά στοιχεία (όπως διαγράμματα ή χάρτες)</li></ul>",
-  "interaction_modal.action.favourite": "Για να συνεχίσεις, θα πρέπει να αγαπήσεις από τον λογαριασμό σου.",
-  "interaction_modal.action.follow": "Για να συνεχίσεις, θα πρέπει να ακολουθήσεις από τον λογαριασμό σου.",
-  "interaction_modal.action.reblog": "Για να συνεχίσεις, θα πρέπει να αναδημοσιεύσεις από τον λογαριασμό σου.",
-  "interaction_modal.action.reply": "Για να συνεχίσεις, θα πρέπει να απαντήσεις από τον λογαριασμό σου.",
-  "interaction_modal.action.vote": "Για να συνεχίσεις, θα πρέπει να ψηφίσεις από τον λογαριασμό σου.",
+  "interaction_modal.action": "Για να αλληλεπιδράσετε με την ανάρτηση του/της {name}, πρέπει να συνδεθείτε στον λογαριασμό σας σε οποιονδήποτε διακομιστή Mastodon χρησιμοποιείτε.",
   "interaction_modal.go": "Πάμε",
   "interaction_modal.no_account_yet": "Δεν έχεις ακόμη λογαριασμό;",
   "interaction_modal.on_another_server": "Σε διαφορετικό διακομιστή",
   "interaction_modal.on_this_server": "Σε αυτόν τον διακομιστή",
-  "interaction_modal.title.favourite": "Favorite {name}'s post\nΠροτίμησε την ανάρτηση της/του {name}",
-  "interaction_modal.title.follow": "Ακολούθησε {name}",
-  "interaction_modal.title.reblog": "Ενίσχυσε την ανάρτηση του {name}",
-  "interaction_modal.title.reply": "Απάντηση στην ανάρτηση του {name}",
-  "interaction_modal.title.vote": "Ψήφισε στη δημοσκόπηση του χρήστη {name}",
+  "interaction_modal.title": "Συνδεθείτε για να συνεχίσετε",
   "interaction_modal.username_prompt": "Πχ. {example}",
   "intervals.full.days": "{number, plural, one {# μέρα} other {# μέρες}}",
   "intervals.full.hours": "{number, plural, one {# ώρα} other {# ώρες}}",
@@ -461,38 +474,42 @@
   "keyboard_shortcuts.back": "Μετάβαση πίσω",
   "keyboard_shortcuts.blocked": "Άνοιγμα λίστας αποκλεισμένων χρηστών",
   "keyboard_shortcuts.boost": "Ενίσχυση ανάρτησης",
-  "keyboard_shortcuts.column": "Στήλη εστίασης",
-  "keyboard_shortcuts.compose": "Περιοχή συγγραφής κειμένου εστίασης",
+  "keyboard_shortcuts.column": "Εστίαση στη στήλη",
+  "keyboard_shortcuts.compose": "Εστίαση στην περιοχή συγγραφής κειμένου",
   "keyboard_shortcuts.description": "Περιγραφή",
   "keyboard_shortcuts.direct": "για το άνοιγμα της στήλης ιδιωτικών επισημάνσεων",
-  "keyboard_shortcuts.down": "κίνηση προς τα κάτω στη λίστα",
-  "keyboard_shortcuts.enter": "Εμφάνιση ανάρτησης",
-  "keyboard_shortcuts.favourite": "Αγαπημένη δημοσίευση",
+  "keyboard_shortcuts.down": "Μετακίνηση προς τα κάτω στη λίστα",
+  "keyboard_shortcuts.enter": "Άνοιγμα ανάρτησης",
+  "keyboard_shortcuts.favourite": "Αγάπησε την ανάρτηση",
   "keyboard_shortcuts.favourites": "Άνοιγμα λίστας αγαπημένων",
-  "keyboard_shortcuts.federated": "Άνοιγμα ροής συναλλαγών",
+  "keyboard_shortcuts.federated": "Άνοιγμα ομοσπονδιακής ροής",
   "keyboard_shortcuts.heading": "Συντομεύσεις πληκτρολογίου",
   "keyboard_shortcuts.home": "Άνοιγμα ροής αρχικής σελίδας",
   "keyboard_shortcuts.hotkey": "Συντόμευση",
   "keyboard_shortcuts.legend": "Εμφάνιση αυτού του οδηγού",
+  "keyboard_shortcuts.load_more": "Εστίαση στο κουμπί \"Φόρτωση περισσότερων\"",
   "keyboard_shortcuts.local": "Άνοιγμα τοπικής ροής",
-  "keyboard_shortcuts.mention": "Επισήμανση συγγραφέα",
+  "keyboard_shortcuts.mention": "Επισήμανση συντάκτη",
   "keyboard_shortcuts.muted": "Άνοιγμα λίστας αποσιωπημένων χρηστών",
   "keyboard_shortcuts.my_profile": "Άνοιγμα του προφίλ σου",
   "keyboard_shortcuts.notifications": "Άνοιγμα στήλης ειδοποιήσεων",
   "keyboard_shortcuts.open_media": "Άνοιγμα πολυμέσων",
   "keyboard_shortcuts.pinned": "Άνοιγμα λίστας καρφιτσωμένων αναρτήσεων",
-  "keyboard_shortcuts.profile": "Άνοιγμα προφίλ συγγραφέα",
+  "keyboard_shortcuts.profile": "Άνοιγμα προφίλ συντάκτη",
+  "keyboard_shortcuts.quote": "Παράθεση ανάρτησης",
   "keyboard_shortcuts.reply": "Απάντηση στην ανάρτηση",
   "keyboard_shortcuts.requests": "Άνοιγμα λίστας αιτημάτων ακολούθησης",
-  "keyboard_shortcuts.search": "Γραμμή αναζήτησης εστίασης",
+  "keyboard_shortcuts.search": "Εστίαση στη γραμμή αναζήτησης",
   "keyboard_shortcuts.spoilers": "Εμφάνιση/απόκρυψη πεδίου CW",
   "keyboard_shortcuts.start": "Άνοιγμα της στήλης \"Ας ξεκινήσουμε\"",
   "keyboard_shortcuts.toggle_hidden": "Εμφάνιση/απόκρυψη κειμένου πίσω από το CW",
   "keyboard_shortcuts.toggle_sensitivity": "Εμφάνιση/απόκρυψη πολυμέσων",
   "keyboard_shortcuts.toot": "Δημιουργία νέας ανάρτησης",
-  "keyboard_shortcuts.translate": "να μεταφράσει μια δημοσίευση",
+  "keyboard_shortcuts.translate": "για να μεταφραστεί μια ανάρτηση",
   "keyboard_shortcuts.unfocus": "Αποεστίαση του πεδίου σύνθεσης/αναζήτησης",
   "keyboard_shortcuts.up": "Μετακίνηση προς τα πάνω στη λίστα",
+  "learn_more_link.got_it": "Το κατάλαβα",
+  "learn_more_link.learn_more": "Μάθε περισσότερα",
   "lightbox.close": "Κλείσιμο",
   "lightbox.next": "Επόμενο",
   "lightbox.previous": "Προηγούμενο",
@@ -553,10 +570,12 @@
   "navigation_bar.favourites": "Αγαπημένα",
   "navigation_bar.filters": "Αποσιωπημένες λέξεις",
   "navigation_bar.follow_requests": "Αιτήματα ακολούθησης",
-  "navigation_bar.followed_tags": "Ετικέτες που ακολουθούνται",
+  "navigation_bar.followed_tags": "Ακολουθούμενες ετικέτες",
   "navigation_bar.follows_and_followers": "Ακολουθείς και σε ακολουθούν",
   "navigation_bar.import_export": "Εισαγωγή και εξαγωγή",
   "navigation_bar.lists": "Λίστες",
+  "navigation_bar.live_feed_local": "Ζωντανή ροή (τοπική)",
+  "navigation_bar.live_feed_public": "Ζωντανή ροή (δημόσια)",
   "navigation_bar.logout": "Αποσύνδεση",
   "navigation_bar.moderation": "Συντονισμός",
   "navigation_bar.more": "Περισσότερα",
@@ -566,9 +585,9 @@
   "navigation_bar.privacy_and_reach": "Ιδιωτικότητα και προσιτότητα",
   "navigation_bar.search": "Αναζήτηση",
   "navigation_bar.search_trends": "Αναζήτηση / Τάσεις",
-  "navigation_panel.collapse_followed_tags": "Σύμπτυξη μενού ετικετών που ακολουθούνται",
+  "navigation_panel.collapse_followed_tags": "Σύμπτυξη μενού ετικετών που ακολουθείτε",
   "navigation_panel.collapse_lists": "Σύμπτυξη μενού λίστας",
-  "navigation_panel.expand_followed_tags": "Επέκταση μενού ετικετών που ακολουθούνται",
+  "navigation_panel.expand_followed_tags": "Επέκταση μενού ετικετών που ακολουθείτε",
   "navigation_panel.expand_lists": "Επέκταση μενού λίστας",
   "not_signed_in_indicator.not_signed_in": "Πρέπει να συνδεθείς για να αποκτήσεις πρόσβαση σε αυτόν τον πόρο.",
   "notification.admin.report": "Ο/Η {name} ανέφερε τον {target}",
@@ -580,17 +599,18 @@
   "notification.admin.sign_up.name_and_others": "{name} και {count, plural, one {# ακόμη} other {# ακόμη}} έχουν εγγραφεί",
   "notification.annual_report.message": "Το #Wrapstodon {year} σε περιμένει! Αποκάλυψε τα στιγμιότυπα της χρονιάς και αξέχαστες στιγμές σου στο Mastodon!",
   "notification.annual_report.view": "Προβολή #Wrapstodon",
-  "notification.favourite": "{name} favorited your post\n{name} προτίμησε την ανάρτηση σου",
+  "notification.favourite": "{name} αγάπησε την ανάρτηση σου",
   "notification.favourite.name_and_others_with_link": "{name} και <a>{count, plural, one {# ακόμη} other {# ακόμη}}</a> αγάπησαν την ανάρτησή σου",
   "notification.favourite_pm": "Ο χρήστης {name} αγάπησε την ιδιωτική σου επισήμανση",
   "notification.favourite_pm.name_and_others_with_link": "Ο χρήστης {name} και <a>{count, plural, one {# ακόμη} other {# ακόμη}}</a> αγάπησαν την ιδωτική σου επισήμανση",
-  "notification.follow": "Ο/Η {name} σε ακολούθησε",
+  "notification.follow": "Ο χρήστης {name} σε ακολούθησε",
   "notification.follow.name_and_others": "Ο χρήστης {name} και <a>{count, plural, one {# ακόμη} other {# ακόμη}}</a> σε ακολούθησαν",
   "notification.follow_request": "Ο/H {name} ζήτησε να σε ακολουθήσει",
   "notification.follow_request.name_and_others": "{name} και {count, plural, one {# άλλος} other {# άλλοι}} ζήτησαν να σε ακολουθήσουν",
   "notification.label.mention": "Επισήμανση",
   "notification.label.private_mention": "Ιδιωτική επισήμανση",
   "notification.label.private_reply": "Ιδιωτική απάντηση",
+  "notification.label.quote": "Ο/Η {name} έκανε παράθεση της ανάρτησής σου",
   "notification.label.reply": "Απάντηση",
   "notification.mention": "Επισήμανση",
   "notification.mentioned_you": "Ο χρήστης {name} σε επισήμανε",
@@ -605,7 +625,8 @@
   "notification.moderation_warning.action_suspend": "Ο λογαριασμός σου έχει ανασταλεί.",
   "notification.own_poll": "Η δημοσκόπησή σου έληξε",
   "notification.poll": "Μία ψηφοφορία στην οποία συμμετείχες έχει τελειώσει",
-  "notification.reblog": "Ο/Η {name} ενίσχυσε τη δημοσίευσή σου",
+  "notification.quoted_update": "Ο χρήστης {name} επεξεργάστηκε μία ανάρτηση που παρέθεσες",
+  "notification.reblog": "Ο/Η {name} ενίσχυσε την ανάρτηση σου",
   "notification.reblog.name_and_others_with_link": "{name} και <a>{count, plural, one {# ακόμη} other {# ακόμη}}</a> ενίσχυσαν την ανάρτησή σου",
   "notification.relationships_severance_event": "Χάθηκε η σύνδεση με το {name}",
   "notification.relationships_severance_event.account_suspension": "Ένας διαχειριστής από το {from} ανέστειλε το {target}, πράγμα που σημαίνει ότι δεν μπορείς πλέον να λαμβάνεις ενημερώσεις από αυτούς ή να αλληλεπιδράς μαζί τους.",
@@ -613,7 +634,7 @@
   "notification.relationships_severance_event.learn_more": "Μάθε περισσότερα",
   "notification.relationships_severance_event.user_domain_block": "Έχεις αποκλείσει τον λογαριασμό {target}, αφαιρώντας {followersCount} από τους ακόλουθούς σου και {followingCount, plural, one {# λογαριασμό} other {# λογαριασμοί}} που ακολουθείς.",
   "notification.status": "Ο/Η {name} μόλις ανέρτησε κάτι",
-  "notification.update": "ο/η {name} επεξεργάστηκε μια ανάρτηση",
+  "notification.update": "Ο/Η {name} επεξεργάστηκε μια ανάρτηση",
   "notification_requests.accept": "Αποδοχή",
   "notification_requests.accept_multiple": "{count, plural, one {Αποδοχή # αιτήματος…} other {Αποδοχή # αιτημάτων…}}",
   "notification_requests.confirm_accept_multiple.button": "{count, plural, one {Αποδοχή αιτήματος} other {Αποδοχή αιτημάτων}}",
@@ -648,6 +669,7 @@
   "notifications.column_settings.mention": "Επισημάνσεις:",
   "notifications.column_settings.poll": "Αποτελέσματα δημοσκόπησης:",
   "notifications.column_settings.push": "Ειδοποιήσεις Push",
+  "notifications.column_settings.quote": "Παραθέσεις:",
   "notifications.column_settings.reblog": "Ενισχύσεις:",
   "notifications.column_settings.show": "Εμφάνισε σε στήλη",
   "notifications.column_settings.sound": "Αναπαραγωγή ήχου",
@@ -717,17 +739,24 @@
   "poll_button.add_poll": "Προσθήκη δημοσκόπησης",
   "poll_button.remove_poll": "Αφαίρεση δημοσκόπησης",
   "privacy.change": "Προσαρμογή ιδιωτικότητας ανάρτησης",
-  "privacy.direct.long": "Όλοι όσοι αναφέρθηκαν στη δημοσίευση",
+  "privacy.direct.long": "Όλοι όσοι αναφέρθηκαν στην ανάρτηση",
   "privacy.direct.short": "Ιδιωτική επισήμανση",
   "privacy.private.long": "Μόνο οι ακόλουθοί σας",
   "privacy.private.short": "Ακόλουθοι",
   "privacy.public.long": "Όλοι εντός και εκτός του Mastodon",
-  "privacy.public.short": "Δημόσιο",
+  "privacy.public.short": "Δημόσια",
+  "privacy.quote.anyone": "{visibility}, ο καθένας μπορεί να παραθέσει",
+  "privacy.quote.disabled": "{visibility}, παραθέσεις απενεργοποιημένες",
+  "privacy.quote.limited": "{visibility}, παραθέσεις περιορισμένες",
   "privacy.unlisted.additional": "Αυτό συμπεριφέρεται ακριβώς όπως το δημόσιο, εκτός από το ότι η ανάρτηση δεν θα εμφανιστεί σε ζωντανές ροές ή ετικέτες, εξερεύνηση ή αναζήτηση στο Mastodon, ακόμη και αν το έχεις επιλέξει για τον λογαριασμό σου.",
-  "privacy.unlisted.long": "Λιγότερα αλγοριθμικά κόλπα",
+  "privacy.unlisted.long": "Κρυμμένη από τα αποτελέσματα αναζήτησης Mastodon, τις τάσεις και τις δημόσιες ροές",
   "privacy.unlisted.short": "Ήσυχα δημόσια",
   "privacy_policy.last_updated": "Τελευταία ενημέρωση {date}",
   "privacy_policy.title": "Πολιτική Απορρήτου",
+  "quote_error.poll": "Η παράθεση δεν επιτρέπεται με δημοσκοπήσεις.",
+  "quote_error.quote": "Επιτρέπεται μόνο μία παράθεση τη φορά.",
+  "quote_error.unauthorized": "Δεν είστε εξουσιοδοτημένοι να παραθέσετε αυτή την ανάρτηση.",
+  "quote_error.upload": "Η παράθεση δεν επιτρέπεται με συνημμένα πολυμέσων.",
   "recommended": "Προτεινόμενα",
   "refresh": "Ανανέωση",
   "regeneration_indicator.please_stand_by": "Παρακαλούμε περίμενε.",
@@ -743,6 +772,9 @@
   "relative_time.minutes": "{number}λ",
   "relative_time.seconds": "{number}δ",
   "relative_time.today": "σήμερα",
+  "remove_quote_hint.button_label": "Το 'πιασα",
+  "remove_quote_hint.message": "Μπορείτε να το κάνεις από το μενού επιλογών {icon}.",
+  "remove_quote_hint.title": "Θες να αφαιρέσεις την ανάρτηση που παρέθεσες;",
   "reply_indicator.attachments": "{count, plural, one {# συνημμένο} other {# συνημμένα}}",
   "reply_indicator.cancel": "Άκυρο",
   "reply_indicator.poll": "Δημοσκόπηση",
@@ -795,7 +827,8 @@
   "report_notification.categories.spam_sentence": "ανεπιθύμητα",
   "report_notification.categories.violation": "Παραβίαση κανόνα",
   "report_notification.categories.violation_sentence": "παραβίαση κανόνα",
-  "report_notification.open": "Ανοιχτή αναφορά",
+  "report_notification.open": "Άνοιγμα αναφοράς",
+  "search.clear": "Εκκαθάριση αναζήτησης",
   "search.no_recent_searches": "Καμία πρόσφατη αναζήτηση",
   "search.placeholder": "Αναζήτηση",
   "search.quick_action.account_search": "Προφίλ που ταιριάζουν με {x}",
@@ -833,13 +866,23 @@
   "status.admin_account": "Άνοιγμα διεπαφής συντονισμού για τον/την @{name}",
   "status.admin_domain": "Άνοιγμα λειτουργίας διαμεσολάβησης για {domain}",
   "status.admin_status": "Άνοιγμα αυτής της ανάρτησης σε διεπαφή συντονισμού",
+  "status.all_disabled": "Ενισχύσεις και παραθέσεις είναι απενεργοποιημένες",
   "status.block": "Αποκλεισμός @{name}",
   "status.bookmark": "Σελιδοδείκτης",
   "status.cancel_reblog_private": "Ακύρωση ενίσχυσης",
+  "status.cannot_quote": "Δε σας επιτρέπετε να παραθέσετε αυτή την ανάρτηση",
   "status.cannot_reblog": "Αυτή η ανάρτηση δεν μπορεί να ενισχυθεί",
+  "status.contains_quote": "Περιέχει παράθεση",
+  "status.context.loading": "Φόρτωση περισσότερων απαντήσεων",
+  "status.context.loading_error": "Αδυναμία φόρτωσης νέων απαντήσεων",
+  "status.context.loading_success": "Όλες οι απαντήσεις φορτώθηκαν",
+  "status.context.more_replies_found": "Βρέθηκαν περισσότερες απαντήσεις",
+  "status.context.retry": "Επανάληψη",
+  "status.context.show": "Εμφάνιση",
   "status.continued_thread": "Συνεχιζόμενο νήματος",
   "status.copy": "Αντιγραφή συνδέσμου ανάρτησης",
   "status.delete": "Διαγραφή",
+  "status.delete.success": "Η ανάρτηση διαγράφηκε",
   "status.detailed_status": "Προβολή λεπτομερούς συζήτησης",
   "status.direct": "Ιδιωτική επισήμανση @{name}",
   "status.direct_indicator": "Ιδιωτική επισήμανση",
@@ -848,7 +891,7 @@
   "status.edited_x_times": "Επεξεργάστηκε {count, plural, one {{count} φορά} other {{count} φορές}}",
   "status.embed": "Απόκτηση κώδικα ενσωμάτωσης",
   "status.favourite": "Αγαπημένα",
-  "status.favourites": "{count, plural, one {# αγαπημένο} other {# αγαπημένα}}",
+  "status.favourites": "{count, plural, one {αγαπημένο} other {αγαπημένα}}",
   "status.filter": "Φιλτράρισμα αυτής της ανάρτησης",
   "status.history.created": "{name} δημιούργησε στις {date}",
   "status.history.edited": "{name} επεξεργάστηκε στις {date}",
@@ -862,31 +905,47 @@
   "status.mute_conversation": "Σίγαση συνομιλίας",
   "status.open": "Επέκταση ανάρτησης",
   "status.pin": "Καρφίτσωσε στο προφίλ",
+  "status.quote": "Παράθεση",
+  "status.quote.cancel": "Ακύρωση παράθεσης",
   "status.quote_error.filtered": "Κρυφό λόγω ενός από τα φίλτρα σου",
-  "status.quote_error.not_found": "Αυτή η ανάρτηση δεν μπορεί να εμφανιστεί.",
-  "status.quote_error.pending_approval": "Αυτή η ανάρτηση εκκρεμεί έγκριση από τον αρχικό συντάκτη.",
-  "status.quote_error.rejected": "Αυτή η ανάρτηση δεν μπορεί να εμφανιστεί καθώς ο αρχικός συντάκτης δεν επιτρέπει τις παραθέσεις.",
-  "status.quote_error.removed": "Αυτή η ανάρτηση αφαιρέθηκε από τον συντάκτη της.",
-  "status.quote_error.unauthorized": "Αυτή η ανάρτηση δεν μπορεί να εμφανιστεί καθώς δεν έχεις εξουσιοδότηση για να τη δεις.",
-  "status.quote_post_author": "Ανάρτηση από {name}",
+  "status.quote_error.limited_account_hint.action": "Εμφάνιση ούτως ή άλλως",
+  "status.quote_error.limited_account_hint.title": "Αυτό το προφίλ έχει αποκρυφτεί από τους διαχειριστές του διακομιστή {domain}.",
+  "status.quote_error.not_available": "Ανάρτηση μη διαθέσιμη",
+  "status.quote_error.pending_approval": "Ανάρτηση σε αναμονή",
+  "status.quote_error.pending_approval_popout.body": "Στο Mastodon, μπορείς να ελέγξεις αν κάποιος μπορεί να σε παραθέσει. Αυτή η ανάρτηση εκκρεμεί ενώ λαμβάνουμε την έγκριση του αρχικού συντάκτη.",
+  "status.quote_error.revoked": "Η ανάρτηση αφαιρέθηκε από τον συντάκτη",
+  "status.quote_followers_only": "Μόνο οι ακόλουθοι μπορούν να παραθέσουν αυτή την ανάρτηση",
+  "status.quote_manual_review": "Ο συντάκτης θα επανεξετάσει χειροκίνητα",
+  "status.quote_noun": "Παράθεση",
+  "status.quote_policy_change": "Αλλάξτε ποιός μπορεί να κάνει παράθεση",
+  "status.quote_post_author": "Παρατίθεται μια ανάρτηση από @{name}",
+  "status.quote_private": "Ιδιωτικές αναρτήσεις δεν μπορούν να παρατεθούν",
+  "status.quotes": "{count, plural, one {# παράθεση} other {# παραθέσεις}}",
+  "status.quotes.empty": "Κανείς δεν έχει παραθέσει αυτή την ανάρτηση ακόμα. Μόλις το κάνει, θα εμφανιστεί εδώ.",
+  "status.quotes.local_other_disclaimer": "Οι παραθέσεις που απορρίφθηκαν από τον συντάκτη δε θα εμφανιστούν.",
+  "status.quotes.remote_other_disclaimer": "Μόνο παραθέσεις από το {domain} είναι εγγυημένες ότι θα εμφανιστούν εδώ. Παραθέσεις που απορρίφθηκαν από τον συντάκτη δε θα εμφανιστούν.",
   "status.read_more": "Διάβασε περισότερα",
   "status.reblog": "Ενίσχυση",
-  "status.reblog_private": "Ενίσχυση με αρχική ορατότητα",
+  "status.reblog_or_quote": "Ενίσχυση ή παράθεση",
+  "status.reblog_private": "Μοιράσου ξανά με τους ακόλουθούς σου",
   "status.reblogged_by": "{name} προώθησε",
-  "status.reblogs": "{count, plural, one {# ενίσχυση} other {# ενισχύσεις}}",
+  "status.reblogs": "{count, plural, one {ενίσχυση} other {ενισχύσεις}}",
   "status.reblogs.empty": "Κανείς δεν ενίσχυσε αυτή την ανάρτηση ακόμα. Μόλις το κάνει κάποιος, θα εμφανιστεί εδώ.",
   "status.redraft": "Σβήσε & ξαναγράψε",
   "status.remove_bookmark": "Αφαίρεση σελιδοδείκτη",
   "status.remove_favourite": "Κατάργηση από τα αγαπημένα",
+  "status.remove_quote": "Αφαίρεση",
   "status.replied_in_thread": "Απαντήθηκε σε νήμα",
   "status.replied_to": "Απάντησε στον {name}",
   "status.reply": "Απάντησε",
   "status.replyAll": "Απάντησε στο νήμα συζήτησης",
   "status.report": "Αναφορά @{name}",
+  "status.request_quote": "Αίτημα για παράθεση",
+  "status.revoke_quote": "Αφαίρεση της ανάρτησης μου από την ανάρτηση του/της @{name}",
   "status.sensitive_warning": "Ευαίσθητο περιεχόμενο",
   "status.share": "Κοινοποίηση",
-  "status.show_less_all": "Δείξε λιγότερα για όλα",
-  "status.show_more_all": "Δείξε περισσότερα για όλα",
+  "status.show_less_all": "Δείξε λιγότερο για όλες",
+  "status.show_more_all": "Δείξε περισσότερο για όλες",
   "status.show_original": "Εμφάνιση αρχικού",
   "status.title.with_attachments": "{user} δημοσίευσε {attachmentCount, plural, one {ένα συνημμένο} other {{attachmentCount} συνημμένα}}",
   "status.translate": "Μετάφραση",
@@ -894,7 +953,7 @@
   "status.uncached_media_warning": "Μη διαθέσιμη προεπισκόπηση",
   "status.unmute_conversation": "Αναίρεση σίγασης συνομιλίας",
   "status.unpin": "Ξεκαρφίτσωσε από το προφίλ",
-  "subscribed_languages.lead": "Μόνο αναρτήσεις σε επιλεγμένες γλώσσες θα εμφανίζονται στην αρχική σου και θα παραθέτονται χρονοδιαγράμματα μετά την αλλαγή. Επέλεξε καμία για να λαμβάνεις αναρτήσεις σε όλες τις γλώσσες.",
+  "subscribed_languages.lead": "Μόνο αναρτήσεις σε επιλεγμένες γλώσσες θα εμφανίζονται στην αρχική σου και θα παραθέτονται ροές μετά την αλλαγή. Επέλεξε καμία για να λαμβάνεις αναρτήσεις σε όλες τις γλώσσες.",
   "subscribed_languages.save": "Αποθήκευση αλλαγών",
   "subscribed_languages.target": "Αλλαγή εγγεγραμμένων γλωσσών για {target}",
   "tabs_bar.home": "Αρχική",
@@ -920,6 +979,7 @@
   "upload_button.label": "Πρόσθεσε εικόνες, ένα βίντεο ή ένα αρχείο ήχου",
   "upload_error.limit": "Υπέρβαση ορίου μεγέθους ανεβασμένων αρχείων.",
   "upload_error.poll": "Στις δημοσκοπήσεις δεν επιτρέπεται η μεταφόρτωση αρχείου.",
+  "upload_error.quote": "Δεν επιτρέπεται η μεταφόρτωση αρχείου με παραθέσεις.",
   "upload_form.drag_and_drop.instructions": "Για να επιλέξετε ένα συνημμένο αρχείο πολυμέσων, πατήστε το Space ή το Enter. Ενώ το σέρνετε, χρησιμοποιήστε τα πλήκτρα βέλους για να μετακινήσετε το συνημμένο αρχείο πολυμέσων προς οποιαδήποτε κατεύθυνση. Πατήστε ξανά το Space ή το Enter για να αποθέσετε το συνημμένο αρχείο πολυμέσων στη νέα του θέση ή πατήστε το Escape για ακύρωση.",
   "upload_form.drag_and_drop.on_drag_cancel": "Η μετακίνηση ακυρώθηκε. Έγινε απόθεση του συνημμένου αρχείου πολυμέσων «{item}».",
   "upload_form.drag_and_drop.on_drag_end": "Έγινε απόθεση του συνημμένου αρχείου πολυμέσων «{item}».",
@@ -942,5 +1002,19 @@
   "video.skip_forward": "Παράλειψη εμπρός",
   "video.unmute": "Άρση σίγασης",
   "video.volume_down": "Μείωση έντασης",
-  "video.volume_up": "Αύξηση έντασης"
+  "video.volume_up": "Αύξηση έντασης",
+  "visibility_modal.button_title": "Ορισμός ορατότητας",
+  "visibility_modal.header": "Ορατότητα και αλληλεπίδραση",
+  "visibility_modal.helper.direct_quoting": "Ιδιωτικές αναφορές που έχουν συνταχθεί στο Mastodon δεν μπορούν να γίνουν παράθεση από άλλους.",
+  "visibility_modal.helper.privacy_editing": "Η ορατότητα δεν μπορεί να αλλάξει μετά τη δημοσίευση μιας ανάρτησης.",
+  "visibility_modal.helper.privacy_private_self_quote": "Αυτο-παραθέσεις ιδιωτικών αναρτήσεων δεν μπορούν να γίνουν δημόσιες.",
+  "visibility_modal.helper.private_quoting": "Αναρτήσεις για ακολούθους μόνο που έχουν συνταχθεί στο Mastodon, δεν μπορούν να γίνουν παράθεση από άλλους.",
+  "visibility_modal.helper.unlisted_quoting": "Όταν οι άνθρωποι σας παραθέτουν, η ανάρτησή τους θα είναι επίσης κρυμμένη από τις δημοφιλείς ροές.",
+  "visibility_modal.instructions": "Ελέγξτε ποιος μπορεί να αλληλεπιδράσει με αυτή την ανάρτηση. Μπορείτε επίσης να εφαρμόσετε ρυθμίσεις σε όλες τις μελλοντικές αναρτήσεις πλοηγώντας σε <link>Προτιμήσεις > Προεπιλογές ανάρτησης</link>.",
+  "visibility_modal.privacy_label": "Ορατότητα",
+  "visibility_modal.quote_followers": "Μόνο ακόλουθοι",
+  "visibility_modal.quote_label": "Ποιος μπορεί να παραθέσει",
+  "visibility_modal.quote_nobody": "Μόνο εγώ",
+  "visibility_modal.quote_public": "Οποιοσδήποτε",
+  "visibility_modal.save": "Αποθήκευση"
 }
diff --git a/app/javascript/mastodon/locales/en-GB.json b/app/javascript/mastodon/locales/en-GB.json
index 588576ad0a5..908c0509efc 100644
--- a/app/javascript/mastodon/locales/en-GB.json
+++ b/app/javascript/mastodon/locales/en-GB.json
@@ -70,7 +70,6 @@
   "account.posts_with_replies": "Posts and replies",
   "account.remove_from_followers": "Remove {name} from followers",
   "account.report": "Report @{name}",
-  "account.requested": "Awaiting approval. Click to cancel follow request",
   "account.requested_follow": "{name} has requested to follow you",
   "account.requests_to_follow_you": "Requests to follow you",
   "account.share": "Share @{name}'s profile",
@@ -219,6 +218,13 @@
   "confirmations.delete_list.confirm": "Delete",
   "confirmations.delete_list.message": "Are you sure you want to permanently delete this list?",
   "confirmations.delete_list.title": "Delete list?",
+  "confirmations.discard_draft.confirm": "Discard and continue",
+  "confirmations.discard_draft.edit.cancel": "Resume editing",
+  "confirmations.discard_draft.edit.message": "Continuing will discard any changes you have made to the post you are currently editing.",
+  "confirmations.discard_draft.edit.title": "Discard changes to your post?",
+  "confirmations.discard_draft.post.cancel": "Resume draft",
+  "confirmations.discard_draft.post.message": "Continuing will discard the post you are currently composing.",
+  "confirmations.discard_draft.post.title": "Discard your draft post?",
   "confirmations.discard_edit_media.confirm": "Discard",
   "confirmations.discard_edit_media.message": "You have unsaved changes to the media description or preview, discard them anyway?",
   "confirmations.follow_to_list.confirm": "Follow and add to list",
@@ -239,8 +245,6 @@
   "confirmations.remove_from_followers.message": "{name} will stop following you. Are you sure you want to proceed?",
   "confirmations.remove_from_followers.title": "Remove follower?",
   "confirmations.unfollow.confirm": "Unfollow",
-  "confirmations.unfollow.message": "Are you sure you want to unfollow {name}?",
-  "confirmations.unfollow.title": "Unfollow user?",
   "content_warning.hide": "Hide post",
   "content_warning.show": "Show anyway",
   "content_warning.show_more": "Show more",
@@ -330,6 +334,7 @@
   "errors.unexpected_crash.copy_stacktrace": "Copy stacktrace to clipboard",
   "errors.unexpected_crash.report_issue": "Report issue",
   "explore.suggested_follows": "People",
+  "explore.title": "Trending",
   "explore.trending_links": "News",
   "explore.trending_statuses": "Posts",
   "explore.trending_tags": "Hashtags",
@@ -416,8 +421,6 @@
   "hints.profiles.see_more_followers": "See more followers on {domain}",
   "hints.profiles.see_more_follows": "See more follows on {domain}",
   "hints.profiles.see_more_posts": "See more posts on {domain}",
-  "hints.threads.replies_may_be_missing": "Replies from other servers may be missing.",
-  "hints.threads.see_more": "See more replies on {domain}",
   "home.column_settings.show_quotes": "Show quotes",
   "home.column_settings.show_reblogs": "Show boosts",
   "home.column_settings.show_replies": "Show replies",
@@ -439,20 +442,10 @@
   "ignore_notifications_modal.private_mentions_title": "Ignore notifications from unsolicited Private Mentions?",
   "info_button.label": "Help",
   "info_button.what_is_alt_text": "<h1>What is alt text?</h1> <p>Alt text provides image descriptions for people with vision impairments, low-bandwidth connections, or those seeking extra context.</p> <p>You can improve accessibility and understanding for everyone by writing clear, concise, and objective alt text.</p> <ul> <li>Capture important elements</li> <li>Summarise text in images</li> <li>Use regular sentence structure</li> <li>Avoid redundant information</li> <li>Focus on trends and key findings in complex visuals (like diagrams or maps)</li> </ul>",
-  "interaction_modal.action.favourite": "To continue, you need to favourite from your account.",
-  "interaction_modal.action.follow": "To continue, you need to follow from your account.",
-  "interaction_modal.action.reblog": "To continue, you need to reblog from your account.",
-  "interaction_modal.action.reply": "To continue, you need to reply from your account.",
-  "interaction_modal.action.vote": "To continue, you need to vote from your account.",
   "interaction_modal.go": "Go",
   "interaction_modal.no_account_yet": "Don't have an account yet?",
   "interaction_modal.on_another_server": "On a different server",
   "interaction_modal.on_this_server": "On this server",
-  "interaction_modal.title.favourite": "Favourite {name}'s post",
-  "interaction_modal.title.follow": "Follow {name}",
-  "interaction_modal.title.reblog": "Boost {name}'s post",
-  "interaction_modal.title.reply": "Reply to {name}'s post",
-  "interaction_modal.title.vote": "Vote in {name}'s poll",
   "interaction_modal.username_prompt": "E.g. {example}",
   "intervals.full.days": "{number, plural, one {# day} other {# days}}",
   "intervals.full.hours": "{number, plural, one {# hour} other {# hours}}",
@@ -541,8 +534,10 @@
   "mute_modal.you_wont_see_mentions": "You won't see posts that mention them.",
   "mute_modal.you_wont_see_posts": "They can still see your posts, but you won't see theirs.",
   "navigation_bar.about": "About",
+  "navigation_bar.account_settings": "Password and security",
   "navigation_bar.administration": "Administration",
   "navigation_bar.advanced_interface": "Open in advanced web interface",
+  "navigation_bar.automated_deletion": "Automated post deletion",
   "navigation_bar.blocks": "Blocked users",
   "navigation_bar.bookmarks": "Bookmarks",
   "navigation_bar.direct": "Private mentions",
@@ -552,13 +547,23 @@
   "navigation_bar.follow_requests": "Follow requests",
   "navigation_bar.followed_tags": "Followed hashtags",
   "navigation_bar.follows_and_followers": "Follows and followers",
+  "navigation_bar.import_export": "Import and export",
   "navigation_bar.lists": "Lists",
+  "navigation_bar.live_feed_local": "Live feed (local)",
+  "navigation_bar.live_feed_public": "Live feed (public)",
   "navigation_bar.logout": "Logout",
   "navigation_bar.moderation": "Moderation",
+  "navigation_bar.more": "More",
   "navigation_bar.mutes": "Muted users",
   "navigation_bar.opened_in_classic_interface": "Posts, accounts, and other specific pages are opened by default in the classic web interface.",
   "navigation_bar.preferences": "Preferences",
+  "navigation_bar.privacy_and_reach": "Privacy and reach",
   "navigation_bar.search": "Search",
+  "navigation_bar.search_trends": "Search / Trending",
+  "navigation_panel.collapse_followed_tags": "Collapse followed hashtags menu",
+  "navigation_panel.collapse_lists": "Collapse list menu",
+  "navigation_panel.expand_followed_tags": "Expand followed hashtags menu",
+  "navigation_panel.expand_lists": "Expand list menu",
   "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
   "notification.admin.report": "{name} reported {target}",
   "notification.admin.report_account": "{name} reported {count, plural, one {one post} other {# posts}} from {target} for {category}",
@@ -594,7 +599,7 @@
   "notification.moderation_warning.action_suspend": "Your account has been suspended.",
   "notification.own_poll": "Your poll has ended",
   "notification.poll": "A poll you voted in has ended",
-  "notification.reblog": "{name} boosted your status",
+  "notification.reblog": "{name} boosted your post",
   "notification.reblog.name_and_others_with_link": "{name} and <a>{count, plural, one {# other} other {# others}}</a> boosted your post",
   "notification.relationships_severance_event": "Lost connections with {name}",
   "notification.relationships_severance_event.account_suspension": "An admin from {from} has suspended {target}, which means you can no longer receive updates from them or interact with them.",
@@ -713,7 +718,6 @@
   "privacy.public.long": "Anyone on and off Mastodon",
   "privacy.public.short": "Public",
   "privacy.unlisted.additional": "This behaves exactly like public, except the post will not appear in live feeds or hashtags, explore, or Mastodon search, even if you are opted-in account-wide.",
-  "privacy.unlisted.long": "Fewer algorithmic fanfares",
   "privacy.unlisted.short": "Quiet public",
   "privacy_policy.last_updated": "Last updated {date}",
   "privacy_policy.title": "Privacy Policy",
@@ -785,6 +789,7 @@
   "report_notification.categories.violation": "Rule violation",
   "report_notification.categories.violation_sentence": "rule violation",
   "report_notification.open": "Open report",
+  "search.clear": "Clear search",
   "search.no_recent_searches": "No recent searches",
   "search.placeholder": "Search",
   "search.quick_action.account_search": "Profiles matching {x}",
@@ -852,15 +857,8 @@
   "status.open": "Expand this post",
   "status.pin": "Pin on profile",
   "status.quote_error.filtered": "Hidden due to one of your filters",
-  "status.quote_error.not_found": "This post cannot be displayed.",
-  "status.quote_error.pending_approval": "This post is pending approval from the original author.",
-  "status.quote_error.rejected": "This post cannot be displayed as the original author does not allow it to be quoted.",
-  "status.quote_error.removed": "This post was removed by its author.",
-  "status.quote_error.unauthorized": "This post cannot be displayed as you are not authorised",
-  "status.quote_post_author": "Post by {name}",
   "status.read_more": "Read more",
   "status.reblog": "Boost",
-  "status.reblog_private": "Boost with original visibility",
   "status.reblogged_by": "{name} boosted",
   "status.reblogs": "{count, plural, one {boost} other {boosts}}",
   "status.reblogs.empty": "No one has boosted this post yet. When someone does, they will show up here.",
@@ -887,7 +885,10 @@
   "subscribed_languages.save": "Save changes",
   "subscribed_languages.target": "Change subscribed languages for {target}",
   "tabs_bar.home": "Home",
+  "tabs_bar.menu": "Menu",
   "tabs_bar.notifications": "Notifications",
+  "tabs_bar.publish": "New Post",
+  "tabs_bar.search": "Search",
   "terms_of_service.effective_as_of": "Effective as of {date}",
   "terms_of_service.title": "Terms of Service",
   "terms_of_service.upcoming_changes_on": "Upcoming changes on {date}",
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index 59d39a15361..5ecf32ff6d6 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -28,6 +28,7 @@
   "account.disable_notifications": "Stop notifying me when @{name} posts",
   "account.domain_blocking": "Blocking domain",
   "account.edit_profile": "Edit profile",
+  "account.edit_profile_short": "Edit",
   "account.enable_notifications": "Notify me when @{name} posts",
   "account.endorse": "Feature on profile",
   "account.familiar_followers_many": "Followed by {name1}, {name2}, and {othersCount, plural, one {one other you know} other {# others you know}}",
@@ -40,6 +41,11 @@
   "account.featured_tags.last_status_never": "No posts",
   "account.follow": "Follow",
   "account.follow_back": "Follow back",
+  "account.follow_back_short": "Follow back",
+  "account.follow_request": "Request to follow",
+  "account.follow_request_cancel": "Cancel request",
+  "account.follow_request_cancel_short": "Cancel",
+  "account.follow_request_short": "Request",
   "account.followers": "Followers",
   "account.followers.empty": "No one follows this user yet.",
   "account.followers_counter": "{count, plural, one {{counter} follower} other {{counter} followers}}",
@@ -70,7 +76,6 @@
   "account.posts_with_replies": "Posts and replies",
   "account.remove_from_followers": "Remove {name} from followers",
   "account.report": "Report @{name}",
-  "account.requested": "Awaiting approval. Click to cancel follow request",
   "account.requested_follow": "{name} has requested to follow you",
   "account.requests_to_follow_you": "Requests to follow you",
   "account.share": "Share @{name}'s profile",
@@ -239,15 +244,25 @@
   "confirmations.missing_alt_text.secondary": "Post anyway",
   "confirmations.missing_alt_text.title": "Add alt text?",
   "confirmations.mute.confirm": "Mute",
+  "confirmations.quiet_post_quote_info.dismiss": "Don't remind me again",
+  "confirmations.quiet_post_quote_info.got_it": "Got it",
+  "confirmations.quiet_post_quote_info.message": "When quoting a quiet public post, your post will be hidden from trending timelines.",
+  "confirmations.quiet_post_quote_info.title": "Quoting quiet public posts",
   "confirmations.redraft.confirm": "Delete & redraft",
   "confirmations.redraft.message": "Are you sure you want to delete this post and re-draft it? Favorites and boosts will be lost, and replies to the original post will be orphaned.",
   "confirmations.redraft.title": "Delete & redraft post?",
   "confirmations.remove_from_followers.confirm": "Remove follower",
   "confirmations.remove_from_followers.message": "{name} will stop following you. Are you sure you want to proceed?",
   "confirmations.remove_from_followers.title": "Remove follower?",
+  "confirmations.revoke_quote.confirm": "Remove post",
+  "confirmations.revoke_quote.message": "This action cannot be undone.",
+  "confirmations.revoke_quote.title": "Remove post?",
+  "confirmations.unblock.confirm": "Unblock",
+  "confirmations.unblock.title": "Unblock {name}?",
   "confirmations.unfollow.confirm": "Unfollow",
-  "confirmations.unfollow.message": "Are you sure you want to unfollow {name}?",
-  "confirmations.unfollow.title": "Unfollow user?",
+  "confirmations.unfollow.title": "Unfollow {name}?",
+  "confirmations.withdraw_request.confirm": "Withdraw request",
+  "confirmations.withdraw_request.title": "Withdraw request to follow {name}?",
   "content_warning.hide": "Hide post",
   "content_warning.show": "Show anyway",
   "content_warning.show_more": "Show more",
@@ -289,6 +304,7 @@
   "domain_pill.your_handle": "Your handle:",
   "domain_pill.your_server": "Your digital home, where all of your posts live. Don’t like this one? Transfer servers at any time and bring your followers, too.",
   "domain_pill.your_username": "Your unique identifier on this server. It’s possible to find users with the same username on different servers.",
+  "dropdown.empty": "Select an option",
   "embed.instructions": "Embed this post on your website by copying the code below.",
   "embed.preview": "Here is what it will look like:",
   "emoji_button.activity": "Activity",
@@ -424,8 +440,6 @@
   "hints.profiles.see_more_followers": "See more followers on {domain}",
   "hints.profiles.see_more_follows": "See more follows on {domain}",
   "hints.profiles.see_more_posts": "See more posts on {domain}",
-  "hints.threads.replies_may_be_missing": "Replies from other servers may be missing.",
-  "hints.threads.see_more": "See more replies on {domain}",
   "home.column_settings.show_quotes": "Show quotes",
   "home.column_settings.show_reblogs": "Show boosts",
   "home.column_settings.show_replies": "Show replies",
@@ -447,20 +461,12 @@
   "ignore_notifications_modal.private_mentions_title": "Ignore notifications from unsolicited Private Mentions?",
   "info_button.label": "Help",
   "info_button.what_is_alt_text": "<h1>What is alt text?</h1> <p>Alt text provides image descriptions for people with vision impairments, low-bandwidth connections, or those seeking extra context.</p> <p>You can improve accessibility and understanding for everyone by writing clear, concise, and objective alt text.</p> <ul> <li>Capture important elements</li> <li>Summarize text in images</li> <li>Use regular sentence structure</li> <li>Avoid redundant information</li> <li>Focus on trends and key findings in complex visuals (like diagrams or maps)</li> </ul>",
-  "interaction_modal.action.favourite": "To continue, you need to favorite from your account.",
-  "interaction_modal.action.follow": "To continue, you need to follow from your account.",
-  "interaction_modal.action.reblog": "To continue, you need to reblog from your account.",
-  "interaction_modal.action.reply": "To continue, you need to reply from your account.",
-  "interaction_modal.action.vote": "To continue, you need to vote from your account.",
+  "interaction_modal.action": "To interact with {name}'s post, you need to sign into your account on whatever Mastodon server you use.",
   "interaction_modal.go": "Go",
   "interaction_modal.no_account_yet": "Don't have an account yet?",
   "interaction_modal.on_another_server": "On a different server",
   "interaction_modal.on_this_server": "On this server",
-  "interaction_modal.title.favourite": "Favorite {name}'s post",
-  "interaction_modal.title.follow": "Follow {name}",
-  "interaction_modal.title.reblog": "Boost {name}'s post",
-  "interaction_modal.title.reply": "Reply to {name}'s post",
-  "interaction_modal.title.vote": "Vote in {name}'s poll",
+  "interaction_modal.title": "Sign in to continue",
   "interaction_modal.username_prompt": "E.g. {example}",
   "intervals.full.days": "{number, plural, one {# day} other {# days}}",
   "intervals.full.hours": "{number, plural, one {# hour} other {# hours}}",
@@ -481,6 +487,7 @@
   "keyboard_shortcuts.home": "Open home timeline",
   "keyboard_shortcuts.hotkey": "Hotkey",
   "keyboard_shortcuts.legend": "Display this legend",
+  "keyboard_shortcuts.load_more": "Focus \"Load more\" button",
   "keyboard_shortcuts.local": "Open local timeline",
   "keyboard_shortcuts.mention": "Mention author",
   "keyboard_shortcuts.muted": "Open muted users list",
@@ -489,6 +496,7 @@
   "keyboard_shortcuts.open_media": "Open media",
   "keyboard_shortcuts.pinned": "Open pinned posts list",
   "keyboard_shortcuts.profile": "Open author's profile",
+  "keyboard_shortcuts.quote": "Quote post",
   "keyboard_shortcuts.reply": "Reply to post",
   "keyboard_shortcuts.requests": "Open follow requests list",
   "keyboard_shortcuts.search": "Focus search bar",
@@ -500,6 +508,8 @@
   "keyboard_shortcuts.translate": "to translate a post",
   "keyboard_shortcuts.unfocus": "Unfocus compose textarea/search",
   "keyboard_shortcuts.up": "Move up in the list",
+  "learn_more_link.got_it": "Got it",
+  "learn_more_link.learn_more": "Learn more",
   "lightbox.close": "Close",
   "lightbox.next": "Next",
   "lightbox.previous": "Previous",
@@ -600,6 +610,7 @@
   "notification.label.mention": "Mention",
   "notification.label.private_mention": "Private mention",
   "notification.label.private_reply": "Private reply",
+  "notification.label.quote": "{name} quoted your post",
   "notification.label.reply": "Reply",
   "notification.mention": "Mention",
   "notification.mentioned_you": "{name} mentioned you",
@@ -614,6 +625,7 @@
   "notification.moderation_warning.action_suspend": "Your account has been suspended.",
   "notification.own_poll": "Your poll has ended",
   "notification.poll": "A poll you voted in has ended",
+  "notification.quoted_update": "{name} edited a post you have quoted",
   "notification.reblog": "{name} boosted your post",
   "notification.reblog.name_and_others_with_link": "{name} and <a>{count, plural, one {# other} other {# others}}</a> boosted your post",
   "notification.relationships_severance_event": "Lost connections with {name}",
@@ -657,6 +669,7 @@
   "notifications.column_settings.mention": "Mentions:",
   "notifications.column_settings.poll": "Poll results:",
   "notifications.column_settings.push": "Push notifications",
+  "notifications.column_settings.quote": "Quotes:",
   "notifications.column_settings.reblog": "Boosts:",
   "notifications.column_settings.show": "Show in column",
   "notifications.column_settings.sound": "Play sound",
@@ -732,11 +745,19 @@
   "privacy.private.short": "Followers",
   "privacy.public.long": "Anyone on and off Mastodon",
   "privacy.public.short": "Public",
+  "privacy.quote.anyone": "{visibility}, anyone can quote",
+  "privacy.quote.disabled": "{visibility}, quotes disabled",
+  "privacy.quote.limited": "{visibility}, quotes limited",
   "privacy.unlisted.additional": "This behaves exactly like public, except the post will not appear in live feeds or hashtags, explore, or Mastodon search, even if you are opted-in account-wide.",
-  "privacy.unlisted.long": "Fewer algorithmic fanfares",
+  "privacy.unlisted.long": "Hidden from Mastodon search results, trending, and public timelines",
   "privacy.unlisted.short": "Quiet public",
   "privacy_policy.last_updated": "Last updated {date}",
   "privacy_policy.title": "Privacy Policy",
+  "quote_error.edit": "Quotes cannot be added when editing a post.",
+  "quote_error.poll": "Quoting is not allowed with polls.",
+  "quote_error.quote": "Only one quote at a time is allowed.",
+  "quote_error.unauthorized": "You are not authorized to quote this post.",
+  "quote_error.upload": "Quoting is not allowed with media attachments.",
   "recommended": "Recommended",
   "refresh": "Refresh",
   "regeneration_indicator.please_stand_by": "Please stand by.",
@@ -752,6 +773,9 @@
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "today",
+  "remove_quote_hint.button_label": "Got it",
+  "remove_quote_hint.message": "You can do so from the {icon} options menu.",
+  "remove_quote_hint.title": "Want to remove your quoted post?",
   "reply_indicator.attachments": "{count, plural, one {# attachment} other {# attachments}}",
   "reply_indicator.cancel": "Cancel",
   "reply_indicator.poll": "Poll",
@@ -843,13 +867,23 @@
   "status.admin_account": "Open moderation interface for @{name}",
   "status.admin_domain": "Open moderation interface for {domain}",
   "status.admin_status": "Open this post in the moderation interface",
+  "status.all_disabled": "Boosts and quotes are disabled",
   "status.block": "Block @{name}",
   "status.bookmark": "Bookmark",
   "status.cancel_reblog_private": "Unboost",
+  "status.cannot_quote": "You are not allowed to quote this post",
   "status.cannot_reblog": "This post cannot be boosted",
+  "status.contains_quote": "Contains quote",
+  "status.context.loading": "Loading more replies",
+  "status.context.loading_error": "Couldn't load new replies",
+  "status.context.loading_success": "All replies loaded",
+  "status.context.more_replies_found": "More replies found",
+  "status.context.retry": "Retry",
+  "status.context.show": "Show",
   "status.continued_thread": "Continued thread",
   "status.copy": "Copy link to post",
   "status.delete": "Delete",
+  "status.delete.success": "Post deleted",
   "status.detailed_status": "Detailed conversation view",
   "status.direct": "Privately mention @{name}",
   "status.direct_indicator": "Private mention",
@@ -872,27 +906,43 @@
   "status.mute_conversation": "Mute conversation",
   "status.open": "Expand this post",
   "status.pin": "Pin on profile",
+  "status.quote": "Quote",
+  "status.quote.cancel": "Cancel quote",
   "status.quote_error.filtered": "Hidden due to one of your filters",
-  "status.quote_error.not_found": "This post cannot be displayed.",
-  "status.quote_error.pending_approval": "This post is pending approval from the original author.",
-  "status.quote_error.rejected": "This post cannot be displayed as the original author does not allow it to be quoted.",
-  "status.quote_error.removed": "This post was removed by its author.",
-  "status.quote_error.unauthorized": "This post cannot be displayed as you are not authorized to view it.",
-  "status.quote_post_author": "Post by {name}",
+  "status.quote_error.limited_account_hint.action": "Show anyway",
+  "status.quote_error.limited_account_hint.title": "This account has been hidden by the moderators of {domain}.",
+  "status.quote_error.not_available": "Post unavailable",
+  "status.quote_error.pending_approval": "Post pending",
+  "status.quote_error.pending_approval_popout.body": "On Mastodon, you can control whether someone can quote you. This post is pending while we're getting the original author's approval.",
+  "status.quote_error.revoked": "Post removed by author",
+  "status.quote_followers_only": "Only followers can quote this post",
+  "status.quote_manual_review": "Author will manually review",
+  "status.quote_noun": "Quote",
+  "status.quote_policy_change": "Change who can quote",
+  "status.quote_post_author": "Quoted a post by @{name}",
+  "status.quote_private": "Private posts cannot be quoted",
+  "status.quotes": "{count, plural, one {quote} other {quotes}}",
+  "status.quotes.empty": "No one has quoted this post yet. When someone does, it will show up here.",
+  "status.quotes.local_other_disclaimer": "Quotes rejected by the author will not be shown.",
+  "status.quotes.remote_other_disclaimer": "Only quotes from {domain} are guaranteed to be shown here. Quotes rejected by the author will not be shown.",
   "status.read_more": "Read more",
   "status.reblog": "Boost",
-  "status.reblog_private": "Boost with original visibility",
+  "status.reblog_or_quote": "Boost or quote",
+  "status.reblog_private": "Share again with your followers",
   "status.reblogged_by": "{name} boosted",
   "status.reblogs": "{count, plural, one {boost} other {boosts}}",
   "status.reblogs.empty": "No one has boosted this post yet. When someone does, they will show up here.",
   "status.redraft": "Delete & re-draft",
   "status.remove_bookmark": "Remove bookmark",
   "status.remove_favourite": "Remove from favorites",
+  "status.remove_quote": "Remove",
   "status.replied_in_thread": "Replied in thread",
   "status.replied_to": "Replied to {name}",
   "status.reply": "Reply",
   "status.replyAll": "Reply to thread",
   "status.report": "Report @{name}",
+  "status.request_quote": "Request to quote",
+  "status.revoke_quote": "Remove my post from @{name}’s post",
   "status.sensitive_warning": "Sensitive content",
   "status.share": "Share",
   "status.show_less_all": "Show less for all",
@@ -930,6 +980,7 @@
   "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_error.quote": "File upload not allowed with quotes.",
   "upload_form.drag_and_drop.instructions": "To pick up a media attachment, press space or enter. While dragging, use the arrow keys to move the media attachment in any given direction. Press space or enter again to drop the media attachment in its new position, or press escape to cancel.",
   "upload_form.drag_and_drop.on_drag_cancel": "Dragging was cancelled. Media attachment {item} was dropped.",
   "upload_form.drag_and_drop.on_drag_end": "Media attachment {item} was dropped.",
@@ -952,5 +1003,19 @@
   "video.skip_forward": "Skip forward",
   "video.unmute": "Unmute",
   "video.volume_down": "Volume down",
-  "video.volume_up": "Volume up"
+  "video.volume_up": "Volume up",
+  "visibility_modal.button_title": "Set visibility",
+  "visibility_modal.header": "Visibility and interaction",
+  "visibility_modal.helper.direct_quoting": "Private mentions authored on Mastodon can't be quoted by others.",
+  "visibility_modal.helper.privacy_editing": "Visibility can't be changed after a post is published.",
+  "visibility_modal.helper.privacy_private_self_quote": "Self-quotes of private posts cannot be made public.",
+  "visibility_modal.helper.private_quoting": "Follower-only posts authored on Mastodon can't be quoted by others.",
+  "visibility_modal.helper.unlisted_quoting": "When people quote you, their post will also be hidden from trending timelines.",
+  "visibility_modal.instructions": "Control who can interact with this post. You can also apply settings to all future posts by navigating to <link>Preferences > Posting defaults</link>.",
+  "visibility_modal.privacy_label": "Visibility",
+  "visibility_modal.quote_followers": "Followers only",
+  "visibility_modal.quote_label": "Who can quote",
+  "visibility_modal.quote_nobody": "Just me",
+  "visibility_modal.quote_public": "Anyone",
+  "visibility_modal.save": "Save"
 }
diff --git a/app/javascript/mastodon/locales/eo.json b/app/javascript/mastodon/locales/eo.json
index 3af96c22c45..6ce220a5384 100644
--- a/app/javascript/mastodon/locales/eo.json
+++ b/app/javascript/mastodon/locales/eo.json
@@ -1,7 +1,7 @@
 {
   "about.blocks": "Reguligitaj serviloj",
   "about.contact": "Kontakto:",
-  "about.default_locale": "기본",
+  "about.default_locale": "Defaŭlta",
   "about.disclaimer": "Mastodon estas libera, malfermitkoda programo kaj varmarko de la firmao Mastodon gGmbH.",
   "about.domain_blocks.no_reason_available": "Kialo ne disponeblas",
   "about.domain_blocks.preamble": "Mastodon ĝenerale rajtigas vidi la enhavojn de uzantoj el aliaj serviloj en la fediverso, kaj komuniki kun ili. Jen la limigoj deciditaj de tiu ĉi servilo mem.",
@@ -30,6 +30,8 @@
   "account.edit_profile": "Redakti la profilon",
   "account.enable_notifications": "Sciigu min kiam @{name} afiŝos",
   "account.endorse": "Montri en profilo",
+  "account.familiar_followers_one": "Sekvita de {name1}",
+  "account.familiar_followers_two": "Sekvita de {name1} kaj {name2}",
   "account.featured": "Montrita",
   "account.featured.accounts": "Profiloj",
   "account.featured.hashtags": "Kradvortoj",
@@ -40,6 +42,7 @@
   "account.followers": "Sekvantoj",
   "account.followers.empty": "Ankoraŭ neniu sekvas ĉi tiun uzanton.",
   "account.followers_counter": "{count, plural, one{{counter} sekvanto} other {{counter} sekvantoj}}",
+  "account.followers_you_know_counter": "Vi scias {counter}",
   "account.following": "Sekvatoj",
   "account.following_counter": "{count, plural, one {{counter} sekvato} other {{counter} sekvatoj}}",
   "account.follows.empty": "La uzanto ankoraŭ ne sekvas iun ajn.",
@@ -66,7 +69,6 @@
   "account.posts_with_replies": "Afiŝoj kaj respondoj",
   "account.remove_from_followers": "Forigi {name}-n de sekvantoj",
   "account.report": "Raporti @{name}",
-  "account.requested": "Atendo de aprobo. Klaku por nuligi la peton por sekvado",
   "account.requested_follow": "{name} petis sekvi vin",
   "account.requests_to_follow_you": "Petoj sekvi vin",
   "account.share": "Diskonigi la profilon de @{name}",
@@ -215,6 +217,12 @@
   "confirmations.delete_list.confirm": "Forigi",
   "confirmations.delete_list.message": "Ĉu vi certas, ke vi volas porĉiame forigi ĉi tiun liston?",
   "confirmations.delete_list.title": "Ĉu forigi liston?",
+  "confirmations.discard_draft.confirm": "Forĵetu kaj daŭrigu",
+  "confirmations.discard_draft.edit.cancel": "Daŭrigi redaktadon",
+  "confirmations.discard_draft.edit.title": "Ĉu forĵeti ŝanĝojn al via afiŝo?",
+  "confirmations.discard_draft.post.cancel": "Daŭrigi malneton",
+  "confirmations.discard_draft.post.message": "Daŭrigo forigos la afiŝon, kiun vi nun verkas.",
+  "confirmations.discard_draft.post.title": "Ĉu forĵeti vian malneton?",
   "confirmations.discard_edit_media.confirm": "Forĵeti",
   "confirmations.discard_edit_media.message": "Vi havas nekonservitajn ŝanĝojn de la priskribo aŭ la antaŭvidigo de la vidaŭdaĵo, ĉu vi forĵetu ilin malgraŭe?",
   "confirmations.follow_to_list.confirm": "Sekvi kaj aldoni al listo",
@@ -228,15 +236,18 @@
   "confirmations.missing_alt_text.secondary": "Afiŝi ĉiuokaze",
   "confirmations.missing_alt_text.title": "Ĉu aldoni alttekston?",
   "confirmations.mute.confirm": "Silentigi",
+  "confirmations.quiet_post_quote_info.dismiss": "Ne memorigu min denove",
+  "confirmations.quiet_post_quote_info.got_it": "Komprenite",
   "confirmations.redraft.confirm": "Forigi kaj reskribi",
   "confirmations.redraft.message": "Ĉu vi certas ke vi volas forigi tiun afiŝon kaj reskribi ĝin? Ĉiuj diskonigoj kaj stelumoj estos perditaj, kaj respondoj al la originala mesaĝo estos senparentaj.",
   "confirmations.redraft.title": "Ĉu forigi kaj redakcii afiŝon?",
   "confirmations.remove_from_followers.confirm": "Forigi sekvanton",
   "confirmations.remove_from_followers.message": "{name} ne plu sekvos vin. Ĉu vi certas ke vi volas daŭri?",
   "confirmations.remove_from_followers.title": "Forigi sekvanton?",
+  "confirmations.revoke_quote.confirm": "Forigi afiŝon",
+  "confirmations.revoke_quote.message": "Ĉi tiu ago ne povas esti malfarita.",
+  "confirmations.revoke_quote.title": "Ĉu forigi afiŝon?",
   "confirmations.unfollow.confirm": "Ne plu sekvi",
-  "confirmations.unfollow.message": "Ĉu vi certas, ke vi volas ĉesi sekvi {name}?",
-  "confirmations.unfollow.title": "Ĉu ĉesi sekvi uzanton?",
   "content_warning.hide": "Kaŝi afiŝon",
   "content_warning.show": "Montri ĉiukaze",
   "content_warning.show_more": "Montri pli",
@@ -278,6 +289,7 @@
   "domain_pill.your_handle": "Via identigo:",
   "domain_pill.your_server": "Via cifereca hejmo, kie loĝas ĉiuj viaj afiŝoj. Ĉu vi ne ŝatas ĉi tiun? Transloku servilojn iam ajn kaj alportu ankaŭ viajn sekvantojn.",
   "domain_pill.your_username": "Via unika identigilo sur ĉi tiu servilo. Eblas trovi uzantojn kun la sama uzantnomo sur malsamaj serviloj.",
+  "dropdown.empty": "Elektu opcion",
   "embed.instructions": "Enkorpigu ĉi tiun afiŝon en vian retejon per kopio de la suba kodo.",
   "embed.preview": "Ĝi aperos tiel:",
   "emoji_button.activity": "Agadoj",
@@ -295,6 +307,7 @@
   "emoji_button.search_results": "Serĉaj rezultoj",
   "emoji_button.symbols": "Simboloj",
   "emoji_button.travel": "Vojaĝoj kaj lokoj",
+  "empty_column.account_featured.me": "Vi ankoraŭ nenion prezentis. Ĉu vi sciis, ke vi povas prezenti viajn plej ofte uzatajn kradvortojn, kaj eĉ la kontojn de viaj amikoj sur via profilo?",
   "empty_column.account_featured_other.unknown": "Ĉi tiu konto ankoraŭ ne montris ion ajn.",
   "empty_column.account_hides_collections": "Ĉi tiu uzanto elektis ne disponebligi ĉi tiu informon",
   "empty_column.account_suspended": "Konto suspendita",
@@ -328,9 +341,11 @@
   "explore.trending_links": "Novaĵoj",
   "explore.trending_statuses": "Afiŝoj",
   "explore.trending_tags": "Kradvortoj",
+  "featured_carousel.header": "{count, plural, one {Alpinglita afiŝo} other {Alpinglitaj afiŝoj}}",
   "featured_carousel.next": "Antaŭen",
   "featured_carousel.post": "Afiŝi",
   "featured_carousel.previous": "Malantaŭen",
+  "featured_carousel.slide": "{index} de {total}",
   "filter_modal.added.context_mismatch_explanation": "Ĉi tiu filtrilkategorio ne kongruas kun la kunteksto en kiu vi akcesis ĉi tiun afiŝon. Se vi volas ke la afiŝo estas ankaŭ filtrita en ĉi tiu kunteksto, vi devus redakti la filtrilon.",
   "filter_modal.added.context_mismatch_title": "Ne kongruas la kunteksto!",
   "filter_modal.added.expired_explanation": "Ĉi tiu filtrilkategorio eksvalidiĝis, vu bezonos ŝanĝi la eksvaliddaton por ĝi.",
@@ -409,8 +424,7 @@
   "hints.profiles.see_more_followers": "Vidi pli da sekvantoj sur {domain}",
   "hints.profiles.see_more_follows": "Vidi pli da sekvatoj sur {domain}",
   "hints.profiles.see_more_posts": "Vidi pli da afiŝoj sur {domain}",
-  "hints.threads.replies_may_be_missing": "Respondoj de aliaj serviloj eble mankas.",
-  "hints.threads.see_more": "Vidi pli da respondoj sur {domain}",
+  "home.column_settings.show_quotes": "Montri citaĵojn",
   "home.column_settings.show_reblogs": "Montri diskonigojn",
   "home.column_settings.show_replies": "Montri respondojn",
   "home.hide_announcements": "Kaŝi la anoncojn",
@@ -431,20 +445,10 @@
   "ignore_notifications_modal.private_mentions_title": "Ĉu ignori sciigojn de nepetitaj privataj mencioj?",
   "info_button.label": "Helpo",
   "info_button.what_is_alt_text": "<h1>Kio estas la alternativa teksto?</h1> <p>La alternativa teksto ofertas priskribojn de la bildoj por individuoj kun vidaj malfacilaĵoj, konektoj kun malalta larĝa bando aŭ kiuj serĉas plian kuntekston.</p> <p>Vi povas plibonigi alireblecon kaj komprenon por ĉiuj per skribado de klaraj, koncizaj, kaj objektivaj alternativaj tekstoj.</p><ul><li>Kaptu gravajn elementojn.</li><li> Resumu tekston en bildoj.</li> <li>Uzu regulan frazstrukturon.</li> <li>Evitu redundan informon.</li><li>Fokusu sur tendencoj kaj ĉefaj trovoj en kompleksaj visualoj (kiel diagramoj aŭ mapoj).</li></ul>",
-  "interaction_modal.action.favourite": "Por daŭrigi, vi devas stelumi el via konto.",
-  "interaction_modal.action.follow": "Por daŭrigi, vi devas sekvi el via konto.",
-  "interaction_modal.action.reblog": "Por daŭrigi, vi devas diskonigi el via konto.",
-  "interaction_modal.action.reply": "Por daŭrigi, vi devas respondi el via konto.",
-  "interaction_modal.action.vote": "Por daŭrigi, vi devas voĉdoni el via konto.",
   "interaction_modal.go": "Iru",
   "interaction_modal.no_account_yet": "Ĉu vi ankoraŭ ne havas konton?",
   "interaction_modal.on_another_server": "En alia servilo",
   "interaction_modal.on_this_server": "En ĉi tiu servilo",
-  "interaction_modal.title.favourite": "Stelumi la afiŝon de {name}",
-  "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}",
-  "interaction_modal.title.vote": "Voĉdonu en la balotenketo de {name}",
   "interaction_modal.username_prompt": "Ekz. {example}",
   "intervals.full.days": "{number, plural, one {# tago} other {# tagoj}}",
   "intervals.full.hours": "{number, plural, one {# horo} other {# horoj}}",
@@ -473,6 +477,7 @@
   "keyboard_shortcuts.open_media": "Malfermi vidaŭdaĵon",
   "keyboard_shortcuts.pinned": "Malfermu alpinglitajn afiŝojn-liston",
   "keyboard_shortcuts.profile": "Malfermu la profilon de aŭtoroprofilo",
+  "keyboard_shortcuts.quote": "Citi afiŝon",
   "keyboard_shortcuts.reply": "Respondu al afiŝo",
   "keyboard_shortcuts.requests": "Malfermi la liston de petoj por sekvado",
   "keyboard_shortcuts.search": "Enfokusigi la serĉbreton",
@@ -484,6 +489,8 @@
   "keyboard_shortcuts.translate": "Traduki afiŝon",
   "keyboard_shortcuts.unfocus": "Senfokusigi verki tekstareon/serĉon",
   "keyboard_shortcuts.up": "Movu supren en la listo",
+  "learn_more_link.got_it": "Komprenite",
+  "learn_more_link.learn_more": "Lernu pli",
   "lightbox.close": "Fermi",
   "lightbox.next": "Antaŭen",
   "lightbox.previous": "Malantaŭen",
@@ -533,8 +540,10 @@
   "mute_modal.you_wont_see_mentions": "Vi ne vidos afiŝojn, kiuj mencias ilin.",
   "mute_modal.you_wont_see_posts": "Ili ankoraŭ povas vidi viajn afiŝojn, sed vi ne vidos iliajn.",
   "navigation_bar.about": "Pri",
+  "navigation_bar.account_settings": "Pasvorto kaj sekureco",
   "navigation_bar.administration": "Administrado",
   "navigation_bar.advanced_interface": "Malfermi altnivelan retpaĝan interfacon",
+  "navigation_bar.automated_deletion": "Aŭtomata forigo de afiŝoj",
   "navigation_bar.blocks": "Blokitaj uzantoj",
   "navigation_bar.bookmarks": "Legosignoj",
   "navigation_bar.direct": "Privataj mencioj",
@@ -544,6 +553,7 @@
   "navigation_bar.follow_requests": "Petoj de sekvado",
   "navigation_bar.followed_tags": "Sekvataj kradvortoj",
   "navigation_bar.follows_and_followers": "Sekvatoj kaj sekvantoj",
+  "navigation_bar.import_export": "Importo kaj eksporto",
   "navigation_bar.lists": "Listoj",
   "navigation_bar.logout": "Elsaluti",
   "navigation_bar.moderation": "Modereco",
@@ -551,7 +561,10 @@
   "navigation_bar.mutes": "Silentigitaj uzantoj",
   "navigation_bar.opened_in_classic_interface": "Afiŝoj, kontoj, kaj aliaj specifaj paĝoj kiuj estas malfermititaj defaulta en la klasika reta interfaco.",
   "navigation_bar.preferences": "Preferoj",
+  "navigation_bar.privacy_and_reach": "Privateco kaj atingo",
   "navigation_bar.search": "Serĉi",
+  "navigation_panel.expand_followed_tags": "Malfermi la menuon de sekvataj haŝetikedoj",
+  "navigation_panel.expand_lists": "Malfermi la listmenuon",
   "not_signed_in_indicator.not_signed_in": "Necesas saluti por aliri tiun rimedon.",
   "notification.admin.report": "{name} raportis {target}",
   "notification.admin.report_account": "{name} raportis {count, plural, one {afiŝon} other {# afiŝojn}} de {target} por {category}",
@@ -573,6 +586,7 @@
   "notification.label.mention": "Mencii",
   "notification.label.private_mention": "Privata mencio",
   "notification.label.private_reply": "Privata respondo",
+  "notification.label.quote": "{name} citis vian afiŝon",
   "notification.label.reply": "Respondi",
   "notification.mention": "Mencii",
   "notification.mentioned_you": "{name} menciis vin",
@@ -587,6 +601,7 @@
   "notification.moderation_warning.action_suspend": "Via konto estas malakceptita.",
   "notification.own_poll": "Via balotenketo finiĝitis",
   "notification.poll": "Balotenketo, en kiu vi voĉdonis, finiĝis",
+  "notification.quoted_update": "{name} redaktis afiŝon, kiun vi citis",
   "notification.reblog": "{name} diskonigis vian afiŝon",
   "notification.reblog.name_and_others_with_link": "{name} kaj <a>{count, plural, one {# alia} other {# aliaj}}</a> diskonigis vian afiŝon",
   "notification.relationships_severance_event": "Perditaj konektoj kun {name}",
@@ -630,6 +645,7 @@
   "notifications.column_settings.mention": "Mencioj:",
   "notifications.column_settings.poll": "Balotenketaj rezultoj:",
   "notifications.column_settings.push": "Puŝsciigoj",
+  "notifications.column_settings.quote": "Citaĵoj:",
   "notifications.column_settings.reblog": "Diskonigoj:",
   "notifications.column_settings.show": "Montri en kolumno",
   "notifications.column_settings.sound": "Eligi sonon",
@@ -705,11 +721,16 @@
   "privacy.private.short": "Sekvantoj",
   "privacy.public.long": "Ĉiujn ajn ĉe kaj ekster Mastodon",
   "privacy.public.short": "Publika",
+  "privacy.quote.anyone": "{visibility}, iu ajn povas citi",
+  "privacy.quote.disabled": "{visibility}, malŝaltitaj citaĵoj",
+  "privacy.quote.limited": "{visibility}, limigitaj citaĵoj",
   "privacy.unlisted.additional": "Ĉi tio kondutas ekzakte kiel publika, krom ke la afiŝo ne aperos en vivaj fluoj aŭ kradvortoj, esploro aŭ Mastodon-serĉo, eĉ se vi estas enskribita en la tuta konto.",
-  "privacy.unlisted.long": "Malpli algoritmaj fanfaroj",
   "privacy.unlisted.short": "Diskrete publika",
   "privacy_policy.last_updated": "Laste ĝisdatigita en {date}",
   "privacy_policy.title": "Politiko de privateco",
+  "quote_error.poll": "Citado ne estas permesita ĉe balotenketoj.",
+  "quote_error.quote": "Nur unu citaĵo samtempe estas permesita.",
+  "quote_error.unauthorized": "Vi ne rajtas citi tiun ĉi afiŝon.",
   "recommended": "Rekomendita",
   "refresh": "Refreŝigu",
   "regeneration_indicator.please_stand_by": "Bonvolu atendi.",
@@ -725,6 +746,9 @@
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "hodiaŭ",
+  "remove_quote_hint.button_label": "Komprenite",
+  "remove_quote_hint.message": "Vi povas fari tion el la menuo de opcioj {icon}.",
+  "remove_quote_hint.title": "Ĉu vi volas forigi vian cititan afiŝon?",
   "reply_indicator.attachments": "{count, plural, one {# aldonaĵo} other {# aldonaĵoj}}",
   "reply_indicator.cancel": "Nuligi",
   "reply_indicator.poll": "Balotenketo",
@@ -787,7 +811,7 @@
   "search.quick_action.open_url": "Malfermi URL en Mastodono",
   "search.quick_action.status_search": "Afiŝoj kiuj konformas kun {x}",
   "search.search_or_paste": "Serĉu aŭ algluu URL-on",
-  "search_popout.full_text_search_disabled_message": "Ne havebla sur {domain}.",
+  "search_popout.full_text_search_disabled_message": "Ne disponebla sur {domain}.",
   "search_popout.full_text_search_logged_out_message": "Disponebla nur kiam ensalutinte.",
   "search_popout.language_code": "ISO-lingva kodo",
   "search_popout.options": "Serĉaj opcioj",
@@ -816,13 +840,16 @@
   "status.admin_account": "Malfermi fasadon de la reguligado por @{name}",
   "status.admin_domain": "Malfermi fasadon de la reguligado por {domain}",
   "status.admin_status": "Malfermi ĉi tiun afiŝon en la fasado de la reguligado",
+  "status.all_disabled": "Diskonigoj kaj citaĵoj estas \tmalvalidigitaj",
   "status.block": "Bloki @{name}",
   "status.bookmark": "Aldoni al la legosignoj",
   "status.cancel_reblog_private": "Ne plu diskonigi",
+  "status.cannot_quote": "Vi ne rajtas citi ĉi tiun afiŝon",
   "status.cannot_reblog": "Ĉi tiun afiŝon ne eblas diskonigi",
   "status.continued_thread": "Daŭrigis fadenon",
   "status.copy": "Kopii la ligilon al la afiŝo",
   "status.delete": "Forigi",
+  "status.delete.success": "Afiŝo forigita",
   "status.detailed_status": "Detala konversacia vido",
   "status.direct": "Private mencii @{name}",
   "status.direct_indicator": "Privata mencio",
@@ -845,20 +872,38 @@
   "status.mute_conversation": "Silentigi konversacion",
   "status.open": "Pligrandigu ĉi tiun afiŝon",
   "status.pin": "Alpingli al la profilo",
+  "status.quote": "Citaĵo",
+  "status.quote.cancel": "Nuligi citaĵon",
+  "status.quote_error.filtered": "Kaŝita pro unu el viaj filtriloj",
+  "status.quote_error.not_available": "Afiŝo ne disponebla",
+  "status.quote_error.pending_approval": "Pritraktata afiŝo",
+  "status.quote_error.pending_approval_popout.body": "Ĉe Mastodon, vi povas kontroli ĉu iu rajtas citi vin. Ĉi tiu afiŝo estas atendata dum ni akiras la aprobon de la originala aŭtoro.",
+  "status.quote_error.revoked": "Afiŝo forigita de aŭtoro",
+  "status.quote_followers_only": "Nur sekvantoj rajtas citi tiun ĉi afiŝon",
+  "status.quote_manual_review": "Aŭtoro permane revizios",
+  "status.quote_policy_change": "Ŝanĝi kiu povas citi",
+  "status.quote_post_author": "Citis afiŝon de @{name}",
+  "status.quote_private": "Privataj afiŝoj ne povas esti cititaj",
+  "status.quotes": "{count, plural,one {citaĵo} other {citaĵoj}}",
+  "status.quotes.empty": "Neniu citis ĉi tiun afiŝon ankoraŭ. Kiam iu faros tion, ĝi aperos ĉi tie.",
   "status.read_more": "Legi pli",
   "status.reblog": "Diskonigi",
-  "status.reblog_private": "Diskonigi kun la sama videbleco",
+  "status.reblog_or_quote": "Diskonigi aŭ citi",
+  "status.reblog_private": "Kunhavigu denove kun viaj sekvantoj",
   "status.reblogged_by": "{name} diskonigis",
   "status.reblogs": "{count, plural, one {diskonigo} other {diskonigoj}}",
   "status.reblogs.empty": "Ankoraŭ neniu diskonigis tiun afiŝon. Kiam iu faras tion, ri aperos ĉi tie.",
   "status.redraft": "Forigi kaj reskribi",
   "status.remove_bookmark": "Forigi legosignon",
   "status.remove_favourite": "Forigi el plej ŝatataj",
+  "status.remove_quote": "Forigi",
   "status.replied_in_thread": "Respondis en fadeno",
   "status.replied_to": "Respondis al {name}",
   "status.reply": "Respondi",
   "status.replyAll": "Respondi al la fadeno",
   "status.report": "Raporti @{name}",
+  "status.request_quote": "Peto por citi",
+  "status.revoke_quote": "Forigu mian afiŝon el la afiŝo de @{name}",
   "status.sensitive_warning": "Tikla enhavo",
   "status.share": "Kundividi",
   "status.show_less_all": "Montri malpli ĉiun",
@@ -876,6 +921,7 @@
   "tabs_bar.home": "Hejmo",
   "tabs_bar.menu": "Menuo",
   "tabs_bar.notifications": "Sciigoj",
+  "tabs_bar.publish": "Nova afiŝo",
   "tabs_bar.search": "Serĉi",
   "terms_of_service.effective_as_of": "Ĝi ekvalidas de {date}",
   "terms_of_service.title": "Kondiĉoj de uzado",
@@ -895,6 +941,7 @@
   "upload_button.label": "Aldonu bildojn, filmeton aŭ sondosieron",
   "upload_error.limit": "Limo de dosiera alŝutado transpasita.",
   "upload_error.poll": "Alŝuto de dosiero ne permesita kun balotenketo.",
+  "upload_error.quote": "Ne estas permesita alŝuto de dosieroj kun citaĵoj.",
   "upload_form.drag_and_drop.instructions": "Por preni amaskomunikilaron aldonaĵon, premu spacoklavon aŭ enen-klavon. Dum trenado, uzu la sagoklavojn por movi la amaskomunikilaron aldonaĵon en iu ajn direkto. Premu spacoklavon aŭ enen-klavon denove por faligi la amaskomunikilaron aldonaĵon en ĝia nova pozicio, aŭ premu eskapan klavon por nuligi.",
   "upload_form.drag_and_drop.on_drag_cancel": "Trenado estis nuligita. Amaskomunikila aldonaĵo {item} estis forigita.",
   "upload_form.drag_and_drop.on_drag_end": "Amaskomunikila aldonaĵo {item} estis forigita.",
@@ -917,5 +964,18 @@
   "video.skip_forward": "Preterpasi antaŭen",
   "video.unmute": "Ne plu silentigi",
   "video.volume_down": "Laŭteco Malpliigi",
-  "video.volume_up": "Laŭteco pliigi"
+  "video.volume_up": "Laŭteco pliigi",
+  "visibility_modal.button_title": "Agordu videblon",
+  "visibility_modal.header": "Videblo kaj interago",
+  "visibility_modal.helper.direct_quoting": "Privataj mencioj verkitaj ĉe Mastodon ne povas esti cititaj de aliaj.",
+  "visibility_modal.helper.privacy_editing": "Videbleco ne povas esti ŝanĝita post publikigo de afiŝo.",
+  "visibility_modal.helper.privacy_private_self_quote": "Memcitaĵoj de privataj afiŝoj ne povas esti publikigitaj.",
+  "visibility_modal.helper.private_quoting": "Afiŝoj nur por sekvantoj verkitaj ĉe Mastodon ne povas esti cititaj de aliaj.",
+  "visibility_modal.helper.unlisted_quoting": "Kiam homoj citas vin, ilia afiŝo ankaŭ estos kaŝita de tendencaj templinioj.",
+  "visibility_modal.privacy_label": "Videbleco",
+  "visibility_modal.quote_followers": "Nur sekvantoj",
+  "visibility_modal.quote_label": "Kiu povas citi",
+  "visibility_modal.quote_nobody": "Nur mi",
+  "visibility_modal.quote_public": "Iu ajn",
+  "visibility_modal.save": "Konservi"
 }
diff --git a/app/javascript/mastodon/locales/es-AR.json b/app/javascript/mastodon/locales/es-AR.json
index a3bd2b82448..cb6ba17612b 100644
--- a/app/javascript/mastodon/locales/es-AR.json
+++ b/app/javascript/mastodon/locales/es-AR.json
@@ -28,6 +28,7 @@
   "account.disable_notifications": "Dejar de notificarme cuando @{name} envíe mensajes",
   "account.domain_blocking": "Dominio bloqueado",
   "account.edit_profile": "Editar perfil",
+  "account.edit_profile_short": "Editar",
   "account.enable_notifications": "Notificarme cuando @{name} envíe mensajes",
   "account.endorse": "Destacar en el perfil",
   "account.familiar_followers_many": "Seguido por {name1}, {name2} y {othersCount, plural, one {# cuenta más que conocés} other {# cuentas más que conocés}}",
@@ -40,6 +41,11 @@
   "account.featured_tags.last_status_never": "Sin mensajes",
   "account.follow": "Seguir",
   "account.follow_back": "Seguir",
+  "account.follow_back_short": "Seguir",
+  "account.follow_request": "Solicitud para seguir",
+  "account.follow_request_cancel": "Cancelar solicitud",
+  "account.follow_request_cancel_short": "Cancelar",
+  "account.follow_request_short": "Solicitar",
   "account.followers": "Seguidores",
   "account.followers.empty": "Todavía nadie sigue a este usuario.",
   "account.followers_counter": "{count, plural, one {{counter} seguidor} other {{counter} seguidores}}",
@@ -51,7 +57,7 @@
   "account.go_to_profile": "Ir al perfil",
   "account.hide_reblogs": "Ocultar adhesiones de @{name}",
   "account.in_memoriam": "Cuenta conmemorativa.",
-  "account.joined_short": "En este servidor desde",
+  "account.joined_short": "En este servidor desde el",
   "account.languages": "Cambiar idiomas suscritos",
   "account.link_verified_on": "La propiedad de este enlace fue verificada el {date}",
   "account.locked_info": "Esta cuenta es privada. El propietario manualmente revisa quién puede seguirle.",
@@ -70,7 +76,6 @@
   "account.posts_with_replies": "Mnsjs y resp. públicas",
   "account.remove_from_followers": "Quitar a {name} de tus seguidores",
   "account.report": "Denunciar a @{name}",
-  "account.requested": "Esperando aprobación. Hacé clic para cancelar la solicitud de seguimiento",
   "account.requested_follow": "{name} solicitó seguirte",
   "account.requests_to_follow_you": "Solicita seguirte",
   "account.share": "Compartir el perfil de @{name}",
@@ -239,15 +244,25 @@
   "confirmations.missing_alt_text.secondary": "Enviar de todos modos",
   "confirmations.missing_alt_text.title": "¿Agregar texto alternativo?",
   "confirmations.mute.confirm": "Silenciar",
+  "confirmations.quiet_post_quote_info.dismiss": "No recordar de nuevo",
+  "confirmations.quiet_post_quote_info.got_it": "Entendido",
+  "confirmations.quiet_post_quote_info.message": "Al citar un mensaje público pero silencioso, tu mensaje se ocultará de las líneas temporales de tendencias.",
+  "confirmations.quiet_post_quote_info.title": "Citado de mensajes públicos pero silenciosos",
   "confirmations.redraft.confirm": "Eliminar mensaje original y editarlo",
   "confirmations.redraft.message": "¿Estás seguro que querés eliminar este mensaje y volver a editarlo? Se perderán las veces marcadas como favorito y sus adhesiones, y las respuestas al mensaje original quedarán huérfanas.",
   "confirmations.redraft.title": "¿Eliminar y volver a redactar mensaje?",
   "confirmations.remove_from_followers.confirm": "Quitar seguidor",
   "confirmations.remove_from_followers.message": "{name} dejará de seguirte. ¿Estás seguro de que querés continuar?",
   "confirmations.remove_from_followers.title": "¿Quitar seguidor?",
+  "confirmations.revoke_quote.confirm": "Eliminar mensaje",
+  "confirmations.revoke_quote.message": "Esta acción no se puede deshacer.",
+  "confirmations.revoke_quote.title": "¿Eliminar mensaje?",
+  "confirmations.unblock.confirm": "Desbloquear",
+  "confirmations.unblock.title": "¿Desbloquear a {name}?",
   "confirmations.unfollow.confirm": "Dejar de seguir",
-  "confirmations.unfollow.message": "¿Estás seguro que querés dejar de seguir a {name}?",
-  "confirmations.unfollow.title": "¿Dejar de seguir al usuario?",
+  "confirmations.unfollow.title": "¿Dejar de seguir a {name}?",
+  "confirmations.withdraw_request.confirm": "Retirar solicitud",
+  "confirmations.withdraw_request.title": "¿Retirar solicitud de seguimiento a {name}?",
   "content_warning.hide": "Ocultar mensaje",
   "content_warning.show": "Mostrar de todos modos",
   "content_warning.show_more": "Mostrar más",
@@ -289,6 +304,7 @@
   "domain_pill.your_handle": "Tu alias:",
   "domain_pill.your_server": "Tu hogar digital, donde residen todos tus mensajes. ¿No te gusta este sitio? Mudate a otro servidor en cualquier momento y llevate a tus seguidores.",
   "domain_pill.your_username": "Tu identificador único en este servidor. Es posible encontrar cuentas con el mismo nombre de usuario en diferentes servidores.",
+  "dropdown.empty": "Seleccioná una opción",
   "embed.instructions": "Insertá este mensaje a tu sitio web copiando el código de abajo.",
   "embed.preview": "Así es cómo se verá:",
   "emoji_button.activity": "Actividad",
@@ -424,8 +440,6 @@
   "hints.profiles.see_more_followers": "Ver más seguidores en {domain}",
   "hints.profiles.see_more_follows": "Ver más seguimientos en {domain}",
   "hints.profiles.see_more_posts": "Ver más mensajes en {domain}",
-  "hints.threads.replies_may_be_missing": "Es posible que falten respuestas de otros servidores.",
-  "hints.threads.see_more": "Ver más respuestas en {domain}",
   "home.column_settings.show_quotes": "Mostrar citas",
   "home.column_settings.show_reblogs": "Mostrar adhesiones",
   "home.column_settings.show_replies": "Mostrar respuestas",
@@ -447,20 +461,12 @@
   "ignore_notifications_modal.private_mentions_title": "¿Ignorar notificaciones de menciones privadas no solicitadas?",
   "info_button.label": "Ayuda",
   "info_button.what_is_alt_text": "<h1>¿Qué es el texto alternativo?</h1> <p>El texto alternativo proporciona descripciones de las imágenes para personas con dificultades visuales, conexiones con escaso ancho de banda o que buscan un contexto adicional.</p> <p>Podés mejorar la accesibilidad y la comprensión para todos escribiendo un texto alternativo claro, conciso y objetivo.</p> <ul><li>Captura los elementos importantes.</li><li>Resumí el texto en imágenes.</li><li>Usá una estructura de frases normal.</li><li>Evitá la información redundante.</li><li>Focalizate en las tendencias y conclusiones clave de los elementos visuales complejos (como diagramas o mapas).</li></ul>",
-  "interaction_modal.action.favourite": "Para continuar, tenés que marcar como favorito desde tu cuenta.",
-  "interaction_modal.action.follow": "Para continuar, tenés que seguir desde tu cuenta.",
-  "interaction_modal.action.reblog": "Para continuar, tenés que adherir desde tu cuenta.",
-  "interaction_modal.action.reply": "Para continuar, tenés que responder desde tu cuenta.",
-  "interaction_modal.action.vote": "Para continuar, tenés que votar desde tu cuenta.",
+  "interaction_modal.action": "Para interactuar con el mensaje de {name}, tenés que iniciar sesión en la cuenta del servidor de Mastodon que usés.",
   "interaction_modal.go": "Ir",
   "interaction_modal.no_account_yet": "¿Todavía no tenés cuenta?",
   "interaction_modal.on_another_server": "En un servidor diferente",
   "interaction_modal.on_this_server": "En este servidor",
-  "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}",
-  "interaction_modal.title.reply": "Responder al mensaje de {name}",
-  "interaction_modal.title.vote": "Votá en la encuesta de {name}",
+  "interaction_modal.title": "Iniciá sesión para continuar",
   "interaction_modal.username_prompt": "Por ejemplo: {example}",
   "intervals.full.days": "{number, plural, one {# día} other {# días}}",
   "intervals.full.hours": "{number, plural, one {# hora} other {# horas}}",
@@ -481,6 +487,7 @@
   "keyboard_shortcuts.home": "Abrir línea temporal principal",
   "keyboard_shortcuts.hotkey": "Atajo",
   "keyboard_shortcuts.legend": "Mostrar este texto",
+  "keyboard_shortcuts.load_more": "Focalizar el botón «Cargar más»",
   "keyboard_shortcuts.local": "Abrirlínea temporal local",
   "keyboard_shortcuts.mention": "Mencionar al autor",
   "keyboard_shortcuts.muted": "Abrir lista de usuarios silenciados",
@@ -489,6 +496,7 @@
   "keyboard_shortcuts.open_media": "Abrir archivos de medios",
   "keyboard_shortcuts.pinned": "Abrir lista de mensajes fijados",
   "keyboard_shortcuts.profile": "Abrir perfil del autor",
+  "keyboard_shortcuts.quote": "Citar mensaje",
   "keyboard_shortcuts.reply": "Responder al mensaje",
   "keyboard_shortcuts.requests": "Abrir lista de solicitudes de seguimiento",
   "keyboard_shortcuts.search": "Enfocar barra de búsqueda",
@@ -500,6 +508,8 @@
   "keyboard_shortcuts.translate": "para traducir un mensaje",
   "keyboard_shortcuts.unfocus": "Quitar el foco del área de texto de redacción o de búsqueda",
   "keyboard_shortcuts.up": "Subir en la lista",
+  "learn_more_link.got_it": "Entendido",
+  "learn_more_link.learn_more": "Aprendé más",
   "lightbox.close": "Cerrar",
   "lightbox.next": "Siguiente",
   "lightbox.previous": "Anterior",
@@ -564,8 +574,8 @@
   "navigation_bar.follows_and_followers": "Cuentas seguidas y seguidores",
   "navigation_bar.import_export": "Importación y exportación",
   "navigation_bar.lists": "Listas",
-  "navigation_bar.live_feed_local": "Cronología local",
-  "navigation_bar.live_feed_public": "Cronología pública",
+  "navigation_bar.live_feed_local": "Línea temporal (local)",
+  "navigation_bar.live_feed_public": "Línea temporal (federada)",
   "navigation_bar.logout": "Cerrar sesión",
   "navigation_bar.moderation": "Moderación",
   "navigation_bar.more": "Más",
@@ -600,6 +610,7 @@
   "notification.label.mention": "Mención",
   "notification.label.private_mention": "Mención privada",
   "notification.label.private_reply": "Respuesta privada",
+  "notification.label.quote": "{name} citó tu mensaje",
   "notification.label.reply": "Respuesta",
   "notification.mention": "Mención",
   "notification.mentioned_you": "{name} te mencionó",
@@ -614,6 +625,7 @@
   "notification.moderation_warning.action_suspend": "Tu cuenta fue suspendida.",
   "notification.own_poll": "Tu encuesta finalizó",
   "notification.poll": "Finalizó una encuesta en la que votaste",
+  "notification.quoted_update": "{name} editó un mensaje que citaste",
   "notification.reblog": "{name} adhirió a tu mensaje",
   "notification.reblog.name_and_others_with_link": "{name} y <a>{count, plural, one {# cuenta más} other {# cuentas más}}</a> marcaron tu mensaje como favorito",
   "notification.relationships_severance_event": "Conexiones perdidas con {name}",
@@ -657,6 +669,7 @@
   "notifications.column_settings.mention": "Menciones:",
   "notifications.column_settings.poll": "Resultados de la encuesta:",
   "notifications.column_settings.push": "Notificaciones push",
+  "notifications.column_settings.quote": "Citas:",
   "notifications.column_settings.reblog": "Adhesiones:",
   "notifications.column_settings.show": "Mostrar en columna",
   "notifications.column_settings.sound": "Reproducir sonido",
@@ -732,11 +745,18 @@
   "privacy.private.short": "Seguidores",
   "privacy.public.long": "Cualquier persona dentro y fuera de Mastodon",
   "privacy.public.short": "Público",
-  "privacy.unlisted.additional": "Esto se comporta exactamente igual que con la configuración de privacidad de mensaje \"Público\", excepto que el mensaje no aparecerá en los líneas temporales en vivo, ni en las etiquetas, ni en la línea temporal \"Explorá\", ni en la búsqueda de Mastodon; incluso si optaste por hacer tu cuenta visible.",
-  "privacy.unlisted.long": "Menos fanfarrias algorítmicas",
+  "privacy.quote.anyone": "{visibility}, todos pueden citar",
+  "privacy.quote.disabled": "{visibility}, citas deshabilitadas",
+  "privacy.quote.limited": "{visibility}, citas limitadas",
+  "privacy.unlisted.additional": "Esto se comporta exactamente igual que con la configuración de privacidad de mensaje «Público», excepto que el mensaje no aparecerá en las líneas temporales en vivo, ni en las etiquetas, ni en la línea temporal «Explorá», ni en la búsqueda de Mastodon; incluso si optaste por hacer tu cuenta visible.",
+  "privacy.unlisted.long": "Oculto de los resultados de búsqueda, tendencias y líneas temporales públicas de Mastodon",
   "privacy.unlisted.short": "Público silencioso",
   "privacy_policy.last_updated": "Última actualización: {date}",
   "privacy_policy.title": "Política de privacidad",
+  "quote_error.poll": "No se permite citar encuestas.",
+  "quote_error.quote": "Solo se permite una cita a la vez.",
+  "quote_error.unauthorized": "No tenés autorización para citar este mensaje.",
+  "quote_error.upload": "No se permite citar con archivos multimedia.",
   "recommended": "Opción recomendada",
   "refresh": "Refrescar",
   "regeneration_indicator.please_stand_by": "Esperá, por favor.",
@@ -752,6 +772,9 @@
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "hoy",
+  "remove_quote_hint.button_label": "Entendido",
+  "remove_quote_hint.message": "Podés hacerlo desde el menú de opciones {icon}.",
+  "remove_quote_hint.title": "¿Querés eliminar tu mensaje citado?",
   "reply_indicator.attachments": "{count, plural,one {# adjunto} other {# adjuntos}}",
   "reply_indicator.cancel": "Cancelar",
   "reply_indicator.poll": "Encuesta",
@@ -843,13 +866,23 @@
   "status.admin_account": "Abrir interface de moderación para @{name}",
   "status.admin_domain": "Abrir interface de moderación para {domain}",
   "status.admin_status": "Abrir este mensaje en la interface de moderación",
+  "status.all_disabled": "Las adhesiones y citas están deshabilitadas",
   "status.block": "Bloquear a @{name}",
   "status.bookmark": "Marcar",
   "status.cancel_reblog_private": "Quitar adhesión",
+  "status.cannot_quote": "No te es permitido citar este mensaje",
   "status.cannot_reblog": "No se puede adherir a este mensaje",
+  "status.contains_quote": "Contiene cita",
+  "status.context.loading": "Cargando más respuestas",
+  "status.context.loading_error": "No se pudieron cargar nuevas respuestas",
+  "status.context.loading_success": "Se cargaron todas las respuestas",
+  "status.context.more_replies_found": "Se encontraron más respuestas",
+  "status.context.retry": "Reintentar",
+  "status.context.show": "Mostrar",
   "status.continued_thread": "Continuación de hilo",
   "status.copy": "Copiar enlace al mensaje",
   "status.delete": "Eliminar",
+  "status.delete.success": "Mensaje eliminado",
   "status.detailed_status": "Vista de conversación detallada",
   "status.direct": "Mención privada a @{name}",
   "status.direct_indicator": "Mención privada",
@@ -858,7 +891,7 @@
   "status.edited_x_times": "Editado {count, plural, one {{count} vez} other {{count} veces}}",
   "status.embed": "Obtener código para insertar",
   "status.favourite": "Marcar como favorito",
-  "status.favourites": "{count, plural, one {# vez marcado como favorito} other {# veces marcado como favorito}}",
+  "status.favourites": "{count, plural, one {vez marcado como favorito} other {veces marcado como favorito}}",
   "status.filter": "Filtrar este mensaje",
   "status.history.created": "Creado por {name}, {date}",
   "status.history.edited": "Editado por {name}, {date}",
@@ -872,27 +905,43 @@
   "status.mute_conversation": "Silenciar conversación",
   "status.open": "Expandir este mensaje",
   "status.pin": "Fijar en el perfil",
+  "status.quote": "Citar",
+  "status.quote.cancel": "Cancelar cita",
   "status.quote_error.filtered": "Oculto debido a uno de tus filtros",
-  "status.quote_error.not_found": "No se puede mostrar este mensaje.",
-  "status.quote_error.pending_approval": "Este mensaje está pendiente de aprobación del autor original.",
-  "status.quote_error.rejected": "No se puede mostrar este mensaje, ya que el autor original no permite que se cite.",
-  "status.quote_error.removed": "Este mensaje fue eliminado por su autor.",
-  "status.quote_error.unauthorized": "No se puede mostrar este mensaje, ya que no tenés autorización para verlo.",
-  "status.quote_post_author": "Mensaje de @{name}",
+  "status.quote_error.limited_account_hint.action": "Mostrar de todos modos",
+  "status.quote_error.limited_account_hint.title": "Esta cuenta fue ocultada por los moderadores de {domain}.",
+  "status.quote_error.not_available": "Mensaje no disponible",
+  "status.quote_error.pending_approval": "Mensaje pendiente",
+  "status.quote_error.pending_approval_popout.body": "En Mastodon, podés controlar si alguien te puede citar. Este mensaje está pendiente hasta obtener la aprobación del autor original.",
+  "status.quote_error.revoked": "Mensaje eliminado por el autor",
+  "status.quote_followers_only": "Solo los seguidores pueden citar este mensaje",
+  "status.quote_manual_review": "El autor revisará manualmente",
+  "status.quote_noun": "Cita",
+  "status.quote_policy_change": "Cambiá quién puede citar",
+  "status.quote_post_author": "Se citó un mensaje de @{name}",
+  "status.quote_private": "No se pueden citar los mensajes privados",
+  "status.quotes": "{count, plural, one {# voto} other {# votos}}",
+  "status.quotes.empty": "Todavía nadie citó este mensaje. Cuando alguien lo haga, se mostrará acá.",
+  "status.quotes.local_other_disclaimer": "Las citas rechazadas por el autor no serán mostradas.",
+  "status.quotes.remote_other_disclaimer": "Solo las citas de {domain} están garantizadas de ser mostradas acá. Las citas rechazadas por el autor no serán mostradas.",
   "status.read_more": "Leé más",
   "status.reblog": "Adherir",
-  "status.reblog_private": "Adherir a la audiencia original",
+  "status.reblog_or_quote": "Adherir o citar",
+  "status.reblog_private": "Compartir de nuevo con tus seguidores",
   "status.reblogged_by": "{name} adhirió",
   "status.reblogs": "{count, plural, one {adhesión} other {adhesiones}}",
   "status.reblogs.empty": "Todavía nadie adhirió a este mensaje. Cuando alguien lo haga, se mostrará acá.",
   "status.redraft": "Eliminar mensaje original y editarlo",
   "status.remove_bookmark": "Quitar marcador",
   "status.remove_favourite": "Quitar de favoritos",
+  "status.remove_quote": "Quitar",
   "status.replied_in_thread": "Respuesta en hilo",
   "status.replied_to": "Respondió a {name}",
   "status.reply": "Responder",
   "status.replyAll": "Responder al hilo",
   "status.report": "Denunciar a @{name}",
+  "status.request_quote": "Solicitud para citar",
+  "status.revoke_quote": "Eliminar mi mensaje de la cita de @{name}",
   "status.sensitive_warning": "Contenido sensible",
   "status.share": "Compartir",
   "status.show_less_all": "Mostrar menos para todo",
@@ -930,6 +979,7 @@
   "upload_button.label": "Agregá imágenes, o un archivo de audio o video",
   "upload_error.limit": "Se excedió el límite de subida de archivos.",
   "upload_error.poll": "No se permite la subida de archivos en encuestas.",
+  "upload_error.quote": "No se permite subir archivos con citas.",
   "upload_form.drag_and_drop.instructions": "Para recoger un archivo multimedia, pulsá la barra espaciadora o la tecla Enter. Mientras arrastrás, usá las teclas de flecha para mover el archivo multimedia en cualquier dirección. Volvé a pulsar la barra espaciadora o la tecla Enter para soltar el archivo multimedia en su nueva posición, o pulsá la tecla Escape para cancelar.",
   "upload_form.drag_and_drop.on_drag_cancel": "Se canceló el arrastre. Se eliminó el archivo adjunto {item}.",
   "upload_form.drag_and_drop.on_drag_end": "El archivo adjunto {item} fue soltado.",
@@ -952,5 +1002,19 @@
   "video.skip_forward": "Adelantar",
   "video.unmute": "Quitar silenciado",
   "video.volume_down": "Bajar volumen",
-  "video.volume_up": "Subir volumen"
+  "video.volume_up": "Subir volumen",
+  "visibility_modal.button_title": "Establecer visibilidad",
+  "visibility_modal.header": "Visibilidad e interacción",
+  "visibility_modal.helper.direct_quoting": "Las menciones privadas redactadas en Mastodon no pueden ser citadas por otras cuentas.",
+  "visibility_modal.helper.privacy_editing": "La visibilidad no se puede cambiar después de que se haya enviado un mensaje.",
+  "visibility_modal.helper.privacy_private_self_quote": "Las citas propias de mensajes privados no pueden hacerse públicas.",
+  "visibility_modal.helper.private_quoting": "Los mensajes solo para seguidores redactados en Mastodon no pueden ser citados por otras cuentas.",
+  "visibility_modal.helper.unlisted_quoting": "Cuando otras cuentas te citen, sus publicaciones también se ocultarán de las líneas temporales de tendencias.",
+  "visibility_modal.instructions": "Controlá quién puede interactuar con este mensaje. También podés aplicar los ajustes para todos los mensajes futuros accediendo a <link>«Configuración» > «Configuración predeterminada de mensajes»</link>.",
+  "visibility_modal.privacy_label": "Visibilidad",
+  "visibility_modal.quote_followers": "Solo para seguidores",
+  "visibility_modal.quote_label": "Quién puede citar",
+  "visibility_modal.quote_nobody": "Solo yo",
+  "visibility_modal.quote_public": "Cualquier cuenta",
+  "visibility_modal.save": "Guardar"
 }
diff --git a/app/javascript/mastodon/locales/es-MX.json b/app/javascript/mastodon/locales/es-MX.json
index d764b3dac97..59b0b68c880 100644
--- a/app/javascript/mastodon/locales/es-MX.json
+++ b/app/javascript/mastodon/locales/es-MX.json
@@ -28,6 +28,7 @@
   "account.disable_notifications": "Dejar de notificarme cuando @{name} publique algo",
   "account.domain_blocking": "Bloqueando dominio",
   "account.edit_profile": "Editar perfil",
+  "account.edit_profile_short": "Editar",
   "account.enable_notifications": "Notificarme cuando @{name} publique algo",
   "account.endorse": "Destacar en mi perfil",
   "account.familiar_followers_many": "Seguido por {name1}, {name2} y {othersCount, plural,one {# más que conoces}other {# más que conoces}}",
@@ -40,6 +41,11 @@
   "account.featured_tags.last_status_never": "Sin publicaciones",
   "account.follow": "Seguir",
   "account.follow_back": "Seguir también",
+  "account.follow_back_short": "Seguir también",
+  "account.follow_request": "Solicitud de seguimiento",
+  "account.follow_request_cancel": "Cancelar solicitud",
+  "account.follow_request_cancel_short": "Cancelar",
+  "account.follow_request_short": "Solicitar",
   "account.followers": "Seguidores",
   "account.followers.empty": "Nadie sigue a este usuario todavía.",
   "account.followers_counter": "{count, plural, one {{counter} seguidor} other {{counter} seguidores}}",
@@ -70,7 +76,6 @@
   "account.posts_with_replies": "Publicaciones y respuestas",
   "account.remove_from_followers": "Eliminar {name} de tus seguidores",
   "account.report": "Denunciar a @{name}",
-  "account.requested": "Esperando aprobación. Haz clic para cancelar la solicitud de seguimiento",
   "account.requested_follow": "{name} ha solicitado seguirte",
   "account.requests_to_follow_you": "Solicita seguirte",
   "account.share": "Compartir el perfil de @{name}",
@@ -239,15 +244,25 @@
   "confirmations.missing_alt_text.secondary": "Publicar de todas maneras",
   "confirmations.missing_alt_text.title": "¿Añadir texto alternativo?",
   "confirmations.mute.confirm": "Silenciar",
+  "confirmations.quiet_post_quote_info.dismiss": "No me lo recuerdes otra vez",
+  "confirmations.quiet_post_quote_info.got_it": "Entendido",
+  "confirmations.quiet_post_quote_info.message": "Al citar una publicación pública discreta, tu publicación se ocultará de las cronologías de tendencias.",
+  "confirmations.quiet_post_quote_info.title": "Citar publicaciones públicas discretas",
   "confirmations.redraft.confirm": "Borrar y volver a borrador",
-  "confirmations.redraft.message": "¿Estás seguro que quieres borrar esta publicación y editarla? Los favoritos e impulsos se perderán, y las respuestas a la publicación original quedarán separadas.",
-  "confirmations.redraft.title": "¿Borrar y volver a redactar la publicación?",
+  "confirmations.redraft.message": "¿Estás seguro de que quieres borrar esta publicación y editarla? Los favoritos e impulsos se perderán, y las respuestas a la publicación original quedarán separadas.",
+  "confirmations.redraft.title": "¿Deseas borrar y volver a redactar la publicación?",
   "confirmations.remove_from_followers.confirm": "Eliminar seguidor",
   "confirmations.remove_from_followers.message": "{name} dejará de seguirte. ¿Estás seguro de que quieres continuar?",
   "confirmations.remove_from_followers.title": "¿Eliminar seguidor?",
+  "confirmations.revoke_quote.confirm": "Eliminar publicación",
+  "confirmations.revoke_quote.message": "Esta acción no se puede deshacer.",
+  "confirmations.revoke_quote.title": "¿Deseas eliminar la publicación?",
+  "confirmations.unblock.confirm": "Desbloquear",
+  "confirmations.unblock.title": "¿Desbloquear a {name}?",
   "confirmations.unfollow.confirm": "Dejar de seguir",
-  "confirmations.unfollow.message": "¿Estás seguro de que quieres dejar de seguir a {name}?",
-  "confirmations.unfollow.title": "¿Dejar de seguir al usuario?",
+  "confirmations.unfollow.title": "¿Dejar de seguir a {name}?",
+  "confirmations.withdraw_request.confirm": "Retirar solicitud",
+  "confirmations.withdraw_request.title": "¿Retirar solicitud de seguimiento a {name}?",
   "content_warning.hide": "Ocultar publicación",
   "content_warning.show": "Mostrar de todos modos",
   "content_warning.show_more": "Mostrar más",
@@ -289,6 +304,7 @@
   "domain_pill.your_handle": "Tu alias:",
   "domain_pill.your_server": "Tu hogar digital, donde residen todas tus publicaciones. ¿No te gusta este sitio? Muévete a otro servidor en cualquier momento y llévate a tus seguidores.",
   "domain_pill.your_username": "Tu identificador único en este servidor. Es posible encontrar usuarios con el mismo nombre de usuario en diferentes servidores.",
+  "dropdown.empty": "Elige una opción",
   "embed.instructions": "Añade esta publicación a tu sitio web con el siguiente código.",
   "embed.preview": "Así es como se verá:",
   "emoji_button.activity": "Actividad",
@@ -315,7 +331,7 @@
   "empty_column.account_unavailable": "Perfil no disponible",
   "empty_column.blocks": "Aún no has bloqueado a ningún usuario.",
   "empty_column.bookmarked_statuses": "Aún no tienes ninguna publicación guardada como marcador. Cuando guardes una, se mostrará aquí.",
-  "empty_column.community": "La línea de tiempo local está vacía. ¡Escribe algo para empezar la fiesta!",
+  "empty_column.community": "La cronología local está vacía. ¡Escribe algo públicamente para ponerla en marcha!",
   "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!",
@@ -329,7 +345,7 @@
   "empty_column.mutes": "Aún no has silenciado a ningún usuario.",
   "empty_column.notification_requests": "¡Todo limpio! No hay nada aquí. Cuando recibas nuevas notificaciones, aparecerán aquí conforme a tu configuración.",
   "empty_column.notifications": "No tienes ninguna notificación aún. Interactúa con otros para empezar una conversación.",
-  "empty_column.public": "¡No hay nada aquí! Escribe algo públicamente, o sigue usuarios de otras instancias manualmente para llenarlo",
+  "empty_column.public": "¡Aquí no hay nada! Escribe algo públicamente o sigue manualmente a usuarios de otros servidores para llenarlo",
   "error.unexpected_crash.explanation": "Debido a un error en nuestro código o a un problema de compatibilidad con el navegador, esta página no se ha podido mostrar correctamente.",
   "error.unexpected_crash.explanation_addons": "No se pudo mostrar correctamente esta página. Este error probablemente fue causado por un complemento del navegador web o por herramientas de traducción automática.",
   "error.unexpected_crash.next_steps": "Intenta actualizar la página. Si eso no ayuda, es posible que puedas usar Mastodon a través de otro navegador o aplicación nativa.",
@@ -424,8 +440,6 @@
   "hints.profiles.see_more_followers": "Ver más seguidores en {domain}",
   "hints.profiles.see_more_follows": "Ver más perfiles seguidos en {domain}",
   "hints.profiles.see_more_posts": "Ver más publicaciones en {domain}",
-  "hints.threads.replies_may_be_missing": "Puede que no se muestren algunas respuestas de otros servidores.",
-  "hints.threads.see_more": "Ver más respuestas en {domain}",
   "home.column_settings.show_quotes": "Mostrar citas",
   "home.column_settings.show_reblogs": "Mostrar impulsos",
   "home.column_settings.show_replies": "Mostrar respuestas",
@@ -447,20 +461,12 @@
   "ignore_notifications_modal.private_mentions_title": "¿Ignorar notificaciones de menciones privadas no solicitadas?",
   "info_button.label": "Ayuda",
   "info_button.what_is_alt_text": "<h1>¿Qué es el texto alternativo?</h1> <p>El texto alternativo ofrece descripciones de las imágenes para individuos con dificultades visuales, conexiones de bajo ancho de banda o que buscan un contexto adicional.</p> <p>Puedes mejorar la accesibilidad y la comprensión para todos redactando un texto alternativo claro, breve y objetivo.</p> <ul><li>Captura los elementos clave.</li><li>Resume el texto en imágenes.</li><li>Utiliza una estructura de oraciones estándar.</li><li>Evita la información repetitiva.</li><li>Enfócate en las tendencias y conclusiones principales de los elementos visuales complejos (como gráficos o mapas).</li></ul>",
-  "interaction_modal.action.favourite": "Para continuar, debes marcar como favorito desde tu cuenta.",
-  "interaction_modal.action.follow": "Para continuar, debes seguir desde tu cuenta.",
-  "interaction_modal.action.reblog": "Para continuar, debes impulsar desde tu cuenta.",
-  "interaction_modal.action.reply": "Para continuar, debes responder desde tu cuenta.",
-  "interaction_modal.action.vote": "Para continuar, debes votar desde tu cuenta.",
+  "interaction_modal.action": "Para interactuar con la publicación de {name}, debes iniciar sesión en tu cuenta en cualquier servidor Mastodon que utilices.",
   "interaction_modal.go": "Ir",
   "interaction_modal.no_account_yet": "¿Aún no tienes una cuenta?",
   "interaction_modal.on_another_server": "En un servidor diferente",
   "interaction_modal.on_this_server": "En este servidor",
-  "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}",
-  "interaction_modal.title.vote": "Votar en la encuesta de {name}",
+  "interaction_modal.title": "Inicia sesión para continuar",
   "interaction_modal.username_prompt": "Por ejemplo: {example}",
   "intervals.full.days": "{number, plural, one {# día} other {# días}}",
   "intervals.full.hours": "{number, plural, one {# hora} other {# horas}}",
@@ -481,6 +487,7 @@
   "keyboard_shortcuts.home": "Abrir cronología principal",
   "keyboard_shortcuts.hotkey": "Tecla de acceso rápido",
   "keyboard_shortcuts.legend": "Mostrar esta leyenda",
+  "keyboard_shortcuts.load_more": "Enfoque en el botón \"Cargar más\"",
   "keyboard_shortcuts.local": "Abrir cronología local",
   "keyboard_shortcuts.mention": "Mencionar al autor",
   "keyboard_shortcuts.muted": "Abrir la lista de usuarios silenciados",
@@ -489,6 +496,7 @@
   "keyboard_shortcuts.open_media": "Abrir multimedia",
   "keyboard_shortcuts.pinned": "Abrir la lista de publicaciones fijadas",
   "keyboard_shortcuts.profile": "Abrir perfil del autor",
+  "keyboard_shortcuts.quote": "Citar publicación",
   "keyboard_shortcuts.reply": "Responder a la publicación",
   "keyboard_shortcuts.requests": "Abrir lista de solicitudes de seguimiento",
   "keyboard_shortcuts.search": "Enfocar la barra de búsqueda",
@@ -500,6 +508,8 @@
   "keyboard_shortcuts.translate": "para traducir una publicación",
   "keyboard_shortcuts.unfocus": "Desenfocar área de redacción/búsqueda",
   "keyboard_shortcuts.up": "Ascender en la lista",
+  "learn_more_link.got_it": "Entendido",
+  "learn_more_link.learn_more": "Más información",
   "lightbox.close": "Cerrar",
   "lightbox.next": "Siguiente",
   "lightbox.previous": "Anterior",
@@ -600,6 +610,7 @@
   "notification.label.mention": "Mención",
   "notification.label.private_mention": "Mención privada",
   "notification.label.private_reply": "Respuesta privada",
+  "notification.label.quote": "{name} citó tu publicación",
   "notification.label.reply": "Respuesta",
   "notification.mention": "Mención",
   "notification.mentioned_you": "{name} te mencionó",
@@ -614,6 +625,7 @@
   "notification.moderation_warning.action_suspend": "Tu cuenta ha sido suspendida.",
   "notification.own_poll": "Tu encuesta ha terminado",
   "notification.poll": "Una encuesta en la que has votado ha terminado",
+  "notification.quoted_update": "{name} editó una publicación que has citado",
   "notification.reblog": "{name} ha impulsado tu publicación",
   "notification.reblog.name_and_others_with_link": "{name} y <a>{count, plural, one {# otro} other {# otros}}</a> impulsaron tu publicación",
   "notification.relationships_severance_event": "Conexiones perdidas con {name}",
@@ -657,6 +669,7 @@
   "notifications.column_settings.mention": "Menciones:",
   "notifications.column_settings.poll": "Resultados de la votación:",
   "notifications.column_settings.push": "Notificaciones push",
+  "notifications.column_settings.quote": "Citas:",
   "notifications.column_settings.reblog": "Impulsos:",
   "notifications.column_settings.show": "Mostrar en columna",
   "notifications.column_settings.sound": "Reproducir sonido",
@@ -732,11 +745,18 @@
   "privacy.private.short": "Seguidores",
   "privacy.public.long": "Cualquiera dentro y fuera de Mastodon",
   "privacy.public.short": "Público",
+  "privacy.quote.anyone": "{visibility}, cualquiera puede citar",
+  "privacy.quote.disabled": "{visibility}, citas desactivadas",
+  "privacy.quote.limited": "{visibility}, citas limitadas",
   "privacy.unlisted.additional": "Esto se comporta exactamente igual que el público, excepto que el post no aparecerá en las cronologías en directo o en las etiquetas, la exploración o busquedas en Mastodon, incluso si está optado por activar la cuenta de usuario.",
-  "privacy.unlisted.long": "Menos fanfares algorítmicos",
-  "privacy.unlisted.short": "Público silencioso",
+  "privacy.unlisted.long": "Oculto de los resultados de búsquedas, tendencias y cronologías públicas de Mastodon",
+  "privacy.unlisted.short": "Pública, pero discreta",
   "privacy_policy.last_updated": "Actualizado por última vez {date}",
   "privacy_policy.title": "Política de Privacidad",
+  "quote_error.poll": "No se permite citar encuestas.",
+  "quote_error.quote": "Solo se permite una cita a la vez.",
+  "quote_error.unauthorized": "No estás autorizado a citar esta publicación.",
+  "quote_error.upload": "No se permite citar con archivos multimedia.",
   "recommended": "Recomendado",
   "refresh": "Actualizar",
   "regeneration_indicator.please_stand_by": "Espera, por favor.",
@@ -752,6 +772,9 @@
   "relative_time.minutes": "{number} m",
   "relative_time.seconds": "{number} s",
   "relative_time.today": "hoy",
+  "remove_quote_hint.button_label": "Entendido",
+  "remove_quote_hint.message": "Puedes hacerlo desde el menú de opciones {icon}.",
+  "remove_quote_hint.title": "¿Quieres eliminar tu publicación citada?",
   "reply_indicator.attachments": "{count, plural, one {# adjunto} other {# adjuntos}}",
   "reply_indicator.cancel": "Cancelar",
   "reply_indicator.poll": "Encuesta",
@@ -843,13 +866,23 @@
   "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",
+  "status.all_disabled": "Los impulsos y las citas están desactivadas",
   "status.block": "Bloquear a @{name}",
   "status.bookmark": "Añadir marcador",
   "status.cancel_reblog_private": "Deshacer impulso",
+  "status.cannot_quote": "No está permitido citar esta publicación",
   "status.cannot_reblog": "Esta publicación no puede ser impulsada",
+  "status.contains_quote": "Contiene cita",
+  "status.context.loading": "Cargando más respuestas",
+  "status.context.loading_error": "No se pudieron cargar nuevas respuestas",
+  "status.context.loading_success": "Todas las respuestas cargadas",
+  "status.context.more_replies_found": "Se han encontrado más respuestas",
+  "status.context.retry": "Reintentar",
+  "status.context.show": "Mostrar",
   "status.continued_thread": "Hilo continuado",
   "status.copy": "Copiar enlace al estado",
   "status.delete": "Borrar",
+  "status.delete.success": "Publicación eliminada",
   "status.detailed_status": "Vista de conversación detallada",
   "status.direct": "Mención privada @{name}",
   "status.direct_indicator": "Mención privada",
@@ -872,27 +905,43 @@
   "status.mute_conversation": "Silenciar conversación",
   "status.open": "Expandir estado",
   "status.pin": "Fijar",
+  "status.quote": "Citar",
+  "status.quote.cancel": "Cancelar cita",
   "status.quote_error.filtered": "Oculto debido a uno de tus filtros",
-  "status.quote_error.not_found": "No se puede mostrar esta publicación.",
-  "status.quote_error.pending_approval": "Esta publicación está pendiente de aprobación del autor original.",
-  "status.quote_error.rejected": "No se puede mostrar esta publicación, puesto que el autor original no permite que sea citado.",
-  "status.quote_error.removed": "Esta publicación fue eliminada por su autor.",
-  "status.quote_error.unauthorized": "No se puede mostrar esta publicación, puesto que no estás autorizado a verla.",
-  "status.quote_post_author": "Publicado por {name}",
+  "status.quote_error.limited_account_hint.action": "Mostrar de todas formas",
+  "status.quote_error.limited_account_hint.title": "Esta cuenta ha sido ocultada por los moderadores de {domain}.",
+  "status.quote_error.not_available": "Publicación no disponible",
+  "status.quote_error.pending_approval": "Publicación pendiente",
+  "status.quote_error.pending_approval_popout.body": "En Mastodon, puedes controlar si alguien puede citarte. Esta publicación está pendiente mientras obtenemos la aprobación del autor original.",
+  "status.quote_error.revoked": "Publicación eliminada por el autor",
+  "status.quote_followers_only": "Solo los seguidores pueden citar esta publicación",
+  "status.quote_manual_review": "El autor la revisará manualmente",
+  "status.quote_noun": "Cita",
+  "status.quote_policy_change": "Cambia quién puede citarte",
+  "status.quote_post_author": "Ha citado una publicación de @{name}",
+  "status.quote_private": "Las publicaciones privadas no pueden citarse",
+  "status.quotes": "{count, plural,one {cita} other {citas}}",
+  "status.quotes.empty": "Nadie ha citado esta publicación todavía. Cuando alguien lo haga, aparecerá aquí.",
+  "status.quotes.local_other_disclaimer": "Las citas rechazadas por el autor no se mostrarán.",
+  "status.quotes.remote_other_disclaimer": "Solo se garantiza que se muestren las citas de {domain}. Las citas rechazadas por el autor no se mostrarán.",
   "status.read_more": "Leer más",
   "status.reblog": "Impulsar",
-  "status.reblog_private": "Implusar a la audiencia original",
+  "status.reblog_or_quote": "Impulsar o citar",
+  "status.reblog_private": "Compartir de nuevo con tus seguidores",
   "status.reblogged_by": "Impulsado por {name}",
   "status.reblogs": "{count, plural, one {impulso} other {impulsos}}",
   "status.reblogs.empty": "Nadie impulsó esta publicación todavía. Cuando alguien lo haga, aparecerá aquí.",
   "status.redraft": "Borrar y volver a borrador",
   "status.remove_bookmark": "Eliminar marcador",
   "status.remove_favourite": "Eliminar de favoritos",
+  "status.remove_quote": "Eliminar",
   "status.replied_in_thread": "Respondido en el hilo",
   "status.replied_to": "Respondió a {name}",
   "status.reply": "Responder",
   "status.replyAll": "Responder al hilo",
   "status.report": "Reportar @{name}",
+  "status.request_quote": "Solicitud de citación",
+  "status.revoke_quote": "Eliminar mi publicación de la cita de @{name}",
   "status.sensitive_warning": "Contenido sensible",
   "status.share": "Compartir",
   "status.show_less_all": "Mostrar menos para todo",
@@ -930,6 +979,7 @@
   "upload_button.label": "Subir multimedia (JPEG, PNG, GIF, WebM, MP4, MOV)",
   "upload_error.limit": "Límite de subida de archivos excedido.",
   "upload_error.poll": "No se permite subir archivos con las encuestas.",
+  "upload_error.quote": "No se permite subir archivos a las citas.",
   "upload_form.drag_and_drop.instructions": "Para recoger un archivo adjunto, pulsa la barra espaciadora o la tecla Intro. Mientras arrastras, usa las teclas de flecha para mover el archivo adjunto en cualquier dirección. Vuelve a pulsar la barra espaciadora o la tecla Intro para soltar el archivo adjunto en su nueva posición, o pulsa la tecla Escape para cancelar.",
   "upload_form.drag_and_drop.on_drag_cancel": "Arrastre cancelado. El archivo adjunto {item} fue eliminado.",
   "upload_form.drag_and_drop.on_drag_end": "El archivo adjunto {item} fue eliminado.",
@@ -952,5 +1002,19 @@
   "video.skip_forward": "Saltar adelante",
   "video.unmute": "Dejar de silenciar",
   "video.volume_down": "Bajar el volumen",
-  "video.volume_up": "Subir el volumen"
+  "video.volume_up": "Subir el volumen",
+  "visibility_modal.button_title": "Establece la visibilidad",
+  "visibility_modal.header": "Visibilidad e interacción",
+  "visibility_modal.helper.direct_quoting": "Las menciones privadas creadas en Mastodon no pueden ser citadas por otros.",
+  "visibility_modal.helper.privacy_editing": "La visibilidad no se puede cambiar después de que se haya hecho una publicación.",
+  "visibility_modal.helper.privacy_private_self_quote": "Las citas propias de publicaciones privadas no pueden hacerse públicas.",
+  "visibility_modal.helper.private_quoting": "Las publicaciones solo para seguidores creadas en Mastodon no pueden ser citadas por otros.",
+  "visibility_modal.helper.unlisted_quoting": "Cuando las personas te citen, sus publicaciones también se ocultarán de las cronologías de tendencias.",
+  "visibility_modal.instructions": "Controla quién puede interactuar con esta publicación. También puedes modificar la configuración a todas las publicaciones futuras accediendo a <link>Preferencias > Publicaciones por defecto</link>.",
+  "visibility_modal.privacy_label": "Visibilidad",
+  "visibility_modal.quote_followers": "Solo seguidores",
+  "visibility_modal.quote_label": "Quién puede citar",
+  "visibility_modal.quote_nobody": "Solo yo",
+  "visibility_modal.quote_public": "Cualquiera",
+  "visibility_modal.save": "Guardar"
 }
diff --git a/app/javascript/mastodon/locales/es.json b/app/javascript/mastodon/locales/es.json
index c68a19c58b9..9985cdea1e4 100644
--- a/app/javascript/mastodon/locales/es.json
+++ b/app/javascript/mastodon/locales/es.json
@@ -28,6 +28,7 @@
   "account.disable_notifications": "Dejar de notificarme cuando @{name} publique algo",
   "account.domain_blocking": "Bloqueando dominio",
   "account.edit_profile": "Editar perfil",
+  "account.edit_profile_short": "Editar",
   "account.enable_notifications": "Notificarme cuando @{name} publique algo",
   "account.endorse": "Destacar en el perfil",
   "account.familiar_followers_many": "Seguido por {name1}, {name2} y {othersCount, plural,one {# más que conoces}other {# más que conoces}}",
@@ -40,6 +41,11 @@
   "account.featured_tags.last_status_never": "Sin publicaciones",
   "account.follow": "Seguir",
   "account.follow_back": "Seguir también",
+  "account.follow_back_short": "Seguir también",
+  "account.follow_request": "Solicitud de seguimiento",
+  "account.follow_request_cancel": "Cancelar solicitud",
+  "account.follow_request_cancel_short": "Cancelar",
+  "account.follow_request_short": "Solicitar",
   "account.followers": "Seguidores",
   "account.followers.empty": "Todavía nadie sigue a este usuario.",
   "account.followers_counter": "{count, plural, one {{counter} seguidor} other {{counter} seguidores}}",
@@ -70,14 +76,13 @@
   "account.posts_with_replies": "Publicaciones y respuestas",
   "account.remove_from_followers": "Eliminar {name} de tus seguidores",
   "account.report": "Reportar a @{name}",
-  "account.requested": "Esperando aprobación. Haz clic para cancelar la solicitud de seguimiento",
   "account.requested_follow": "{name} ha solicitado seguirte",
   "account.requests_to_follow_you": "Solicita seguirte",
   "account.share": "Compartir el perfil de @{name}",
   "account.show_reblogs": "Mostrar impulsos de @{name}",
   "account.statuses_counter": "{count, plural, one {{counter} publicación} other {{counter} publicaciones}}",
   "account.unblock": "Desbloquear a @{name}",
-  "account.unblock_domain": "Desbloquear dominio {domain}",
+  "account.unblock_domain": "Desbloquear el dominio {domain}",
   "account.unblock_domain_short": "Desbloquear",
   "account.unblock_short": "Desbloquear",
   "account.unendorse": "No mostrar en el perfil",
@@ -239,15 +244,25 @@
   "confirmations.missing_alt_text.secondary": "Publicar de todos modos",
   "confirmations.missing_alt_text.title": "¿Deseas añadir texto alternativo?",
   "confirmations.mute.confirm": "Silenciar",
+  "confirmations.quiet_post_quote_info.dismiss": "No me lo vuelvas a recordar",
+  "confirmations.quiet_post_quote_info.got_it": "Entendido",
+  "confirmations.quiet_post_quote_info.message": "Cuando cites una publicación pública silenciosa, tu publicación se ocultará de las cronologías de tendencias.",
+  "confirmations.quiet_post_quote_info.title": "Citar publicaciones públicas silenciosas",
   "confirmations.redraft.confirm": "Borrar y volver a borrador",
   "confirmations.redraft.message": "¿Estás seguro de querer borrar esta publicación y reescribirla? Los favoritos e impulsos se perderán, y las respuestas a la publicación original quedarán sin contexto.",
   "confirmations.redraft.title": "¿Borrar y volver a redactar la publicación?",
   "confirmations.remove_from_followers.confirm": "Eliminar seguidor",
   "confirmations.remove_from_followers.message": "{name} dejará de seguirte. ¿Estás seguro de que quieres continuar?",
   "confirmations.remove_from_followers.title": "¿Eliminar seguidor?",
+  "confirmations.revoke_quote.confirm": "Eliminar publicación",
+  "confirmations.revoke_quote.message": "Esta acción no tiene vuelta atrás.",
+  "confirmations.revoke_quote.title": "¿Eliminar la publicación?",
+  "confirmations.unblock.confirm": "Desbloquear",
+  "confirmations.unblock.title": "¿Desbloquear a {name}?",
   "confirmations.unfollow.confirm": "Dejar de seguir",
-  "confirmations.unfollow.message": "¿Seguro que quieres dejar de seguir a {name}?",
-  "confirmations.unfollow.title": "¿Dejar de seguir al usuario?",
+  "confirmations.unfollow.title": "¿Dejar de seguir a {name}?",
+  "confirmations.withdraw_request.confirm": "Retirar solicitud",
+  "confirmations.withdraw_request.title": "¿Retirar solicitud de seguimiento a {name}?",
   "content_warning.hide": "Ocultar publicación",
   "content_warning.show": "Mostrar de todos modos",
   "content_warning.show_more": "Mostrar más",
@@ -289,6 +304,7 @@
   "domain_pill.your_handle": "Tu alias:",
   "domain_pill.your_server": "Tu hogar digital, donde residen todas tus publicaciones. ¿No te gusta este sitio? Muévete a otro servidor en cualquier momento y llévate a tus seguidores.",
   "domain_pill.your_username": "Tu identificador único en este servidor. Es posible encontrar usuarios con el mismo nombre de usuario en diferentes servidores.",
+  "dropdown.empty": "Selecciona una opción",
   "embed.instructions": "Añade esta publicación a tu sitio web con el siguiente código.",
   "embed.preview": "Así es como se verá:",
   "emoji_button.activity": "Actividad",
@@ -424,8 +440,6 @@
   "hints.profiles.see_more_followers": "Ver más seguidores en {domain}",
   "hints.profiles.see_more_follows": "Ver más perfiles seguidos en {domain}",
   "hints.profiles.see_more_posts": "Ver más publicaciones en {domain}",
-  "hints.threads.replies_may_be_missing": "Puede que no se muestren algunas respuestas de otros servidores.",
-  "hints.threads.see_more": "Ver más respuestas en {domain}",
   "home.column_settings.show_quotes": "Mostrar citas",
   "home.column_settings.show_reblogs": "Mostrar impulsos",
   "home.column_settings.show_replies": "Mostrar respuestas",
@@ -447,20 +461,12 @@
   "ignore_notifications_modal.private_mentions_title": "¿Ignorar notificaciones de menciones privadas no solicitadas?",
   "info_button.label": "Ayuda",
   "info_button.what_is_alt_text": "<h1>¿Qué es el texto alternativo?</h1> <p>El texto alternativo proporciona descripciones de las imágenes para personas con problemas de visión, conexiones con poco ancho de banda o que buscan un contexto adicional.</p> <p>Puedes mejorar la accesibilidad y la comprensión para todos escribiendo un texto alternativo claro, conciso y objetivo.</p> <ul><li>Captura los elementos importantes.</li><li>Resume el texto en imágenes.</li><li>Usa una estructura de frases normal.</li><li>Evita la información redundante.</li><li>Céntrate en las tendencias y conclusiones clave de los elementos visuales complejos (como diagramas o mapas).</li></ul>",
-  "interaction_modal.action.favourite": "Para continuar, tienes que marcar como favorito desde tu cuenta.",
-  "interaction_modal.action.follow": "Para continuar, tienes que seguir desde tu cuenta.",
-  "interaction_modal.action.reblog": "Para continuar, tienes que impulsar desde tu cuenta.",
-  "interaction_modal.action.reply": "Para continuar, tienes que responder desde tu cuenta.",
-  "interaction_modal.action.vote": "Para continuar, tienes que votar desde tu cuenta.",
+  "interaction_modal.action": "Para interactuar con la publicación de {name}, debes iniciar sesión en tu cuenta en cualquier servidor Mastodon que utilices.",
   "interaction_modal.go": "Ir",
   "interaction_modal.no_account_yet": "¿Todavía no tienes cuenta?",
   "interaction_modal.on_another_server": "En un servidor diferente",
   "interaction_modal.on_this_server": "En este servidor",
-  "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}",
-  "interaction_modal.title.vote": "Vota en la encuesta de {name}",
+  "interaction_modal.title": "Inicia sesión para continuar",
   "interaction_modal.username_prompt": "Por ejemplo: {example}",
   "intervals.full.days": "{number, plural, one {# día} other {# días}}",
   "intervals.full.hours": "{number, plural, one {# hora} other {# horas}}",
@@ -481,6 +487,7 @@
   "keyboard_shortcuts.home": "Abrir cronología principal",
   "keyboard_shortcuts.hotkey": "Tecla rápida",
   "keyboard_shortcuts.legend": "Mostrar esta leyenda",
+  "keyboard_shortcuts.load_more": "Poner el foco en el botón \"Cargar más\"",
   "keyboard_shortcuts.local": "Abrir cronología local",
   "keyboard_shortcuts.mention": "Mencionar autor",
   "keyboard_shortcuts.muted": "Abrir lista de usuarios silenciados",
@@ -489,6 +496,7 @@
   "keyboard_shortcuts.open_media": "Abrir multimedia",
   "keyboard_shortcuts.pinned": "Abrir la lista de publicaciones destacadas",
   "keyboard_shortcuts.profile": "Abrir perfil del autor",
+  "keyboard_shortcuts.quote": "Citar publicación",
   "keyboard_shortcuts.reply": "Responder a una publicación",
   "keyboard_shortcuts.requests": "Abrir lista de solicitudes de seguimiento",
   "keyboard_shortcuts.search": "Focalizar barra de búsqueda",
@@ -500,6 +508,8 @@
   "keyboard_shortcuts.translate": "para traducir una publicación",
   "keyboard_shortcuts.unfocus": "Quitar el foco de la caja de redacción/búsqueda",
   "keyboard_shortcuts.up": "Moverse hacia arriba en la lista",
+  "learn_more_link.got_it": "Entendido",
+  "learn_more_link.learn_more": "Más información",
   "lightbox.close": "Cerrar",
   "lightbox.next": "Siguiente",
   "lightbox.previous": "Anterior",
@@ -600,6 +610,7 @@
   "notification.label.mention": "Mención",
   "notification.label.private_mention": "Mención privada",
   "notification.label.private_reply": "Respuesta privada",
+  "notification.label.quote": "{name} citó tu publicación",
   "notification.label.reply": "Respuesta",
   "notification.mention": "Mención",
   "notification.mentioned_you": "{name} te ha mencionado",
@@ -614,6 +625,7 @@
   "notification.moderation_warning.action_suspend": "Tu cuenta ha sido suspendida.",
   "notification.own_poll": "Tu encuesta ha terminado",
   "notification.poll": "Una encuesta ha terminado",
+  "notification.quoted_update": "{name} editó una publicación que has citado",
   "notification.reblog": "{name} ha impulsado tu publicación",
   "notification.reblog.name_and_others_with_link": "{name} y <a>{count, plural, one {# más} other {# más}}</a> impulsaron tu publicación",
   "notification.relationships_severance_event": "Conexiones perdidas con {name}",
@@ -657,6 +669,7 @@
   "notifications.column_settings.mention": "Menciones:",
   "notifications.column_settings.poll": "Resultados de la votación:",
   "notifications.column_settings.push": "Notificaciones push",
+  "notifications.column_settings.quote": "Citas:",
   "notifications.column_settings.reblog": "Impulsos:",
   "notifications.column_settings.show": "Mostrar en columna",
   "notifications.column_settings.sound": "Reproducir sonido",
@@ -732,11 +745,18 @@
   "privacy.private.short": "Seguidores",
   "privacy.public.long": "Visible por todo el mundo, dentro y fuera de Mastodon",
   "privacy.public.short": "Pública",
+  "privacy.quote.anyone": "{visibility}, cualquiera puede citar",
+  "privacy.quote.disabled": "{visibility}, citas deshabilitadas",
+  "privacy.quote.limited": "{visibility}, citas limitadas",
   "privacy.unlisted.additional": "Se comporta exactamente igual que la visibilidad pública, excepto que la publicación no aparecerá en las cronologías públicas o en las etiquetas, la sección de Explorar o la búsqueda de Mastodon, incluso si has habilitado la opción de búsqueda en tu perfil.",
-  "privacy.unlisted.long": "Sin algoritmos de descubrimiento",
+  "privacy.unlisted.long": "Oculto de los resultados de búsquedas, tendencias y cronologías públicas de Mastodon",
   "privacy.unlisted.short": "Pública silenciosa",
   "privacy_policy.last_updated": "Actualizado por última vez {date}",
   "privacy_policy.title": "Política de Privacidad",
+  "quote_error.poll": "No es posible citar encuestas.",
+  "quote_error.quote": "Solo se permite una cita a la vez.",
+  "quote_error.unauthorized": "No tienes permiso para citar esta publicación.",
+  "quote_error.upload": "No se permite citar con archivos multimedia.",
   "recommended": "Recomendado",
   "refresh": "Actualizar",
   "regeneration_indicator.please_stand_by": "Espera, por favor.",
@@ -752,6 +772,9 @@
   "relative_time.minutes": "{number} m",
   "relative_time.seconds": "{number} s",
   "relative_time.today": "hoy",
+  "remove_quote_hint.button_label": "Entendido",
+  "remove_quote_hint.message": "Puedes hacerlo desde el menú de opciones {icon}.",
+  "remove_quote_hint.title": "¿Quieres eliminar tu publicación citada?",
   "reply_indicator.attachments": "{count, plural, one {# adjunto} other {# adjuntos}}",
   "reply_indicator.cancel": "Cancelar",
   "reply_indicator.poll": "Encuesta",
@@ -795,7 +818,7 @@
   "report.thanks.title_actionable": "Gracias por informar, estudiaremos esto.",
   "report.unfollow": "Dejar de seguir a @{name}",
   "report.unfollow_explanation": "Estás siguiendo esta cuenta. Para dejar de ver sus publicaciones en tu página de inicio, deja de seguirla.",
-  "report_notification.attached_statuses": "{count, plural, one {{count} publicación} other {{count} publicaciones}} adjunta(s)",
+  "report_notification.attached_statuses": "{count, plural, one {{count} publicación adjunta} other {{count} publicaciones adjuntas}}",
   "report_notification.categories.legal": "Legal",
   "report_notification.categories.legal_sentence": "contenido ilegal",
   "report_notification.categories.other": "Otros",
@@ -843,15 +866,25 @@
   "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",
+  "status.all_disabled": "Los impulsos y las citas están deshabilitados",
   "status.block": "Bloquear a @{name}",
   "status.bookmark": "Añadir marcador",
   "status.cancel_reblog_private": "Deshacer impulso",
+  "status.cannot_quote": "No tienes permiso para citar esta publicación",
   "status.cannot_reblog": "Esta publicación no se puede impulsar",
+  "status.contains_quote": "Contiene cita",
+  "status.context.loading": "Cargando más respuestas",
+  "status.context.loading_error": "No se pudieron cargar nuevas respuestas",
+  "status.context.loading_success": "Se cargaron todas las respuestas",
+  "status.context.more_replies_found": "Se encontraron más respuestas",
+  "status.context.retry": "Reintentar",
+  "status.context.show": "Mostrar",
   "status.continued_thread": "Continuó el hilo",
   "status.copy": "Copiar enlace a la publicación",
   "status.delete": "Borrar",
+  "status.delete.success": "Publicación eliminada",
   "status.detailed_status": "Vista de conversación detallada",
-  "status.direct": "Mención privada @{name}",
+  "status.direct": "Mencionar en privado a @{name}",
   "status.direct_indicator": "Mención privada",
   "status.edit": "Editar",
   "status.edited": "Última edición {date}",
@@ -872,27 +905,43 @@
   "status.mute_conversation": "Silenciar conversación",
   "status.open": "Expandir publicación",
   "status.pin": "Fijar",
+  "status.quote": "Citar",
+  "status.quote.cancel": "Cancelar cita",
   "status.quote_error.filtered": "Oculto debido a uno de tus filtros",
-  "status.quote_error.not_found": "No se puede mostrar esta publicación.",
-  "status.quote_error.pending_approval": "Esta publicación está pendiente de aprobación del autor original.",
-  "status.quote_error.rejected": "Esta publicación no puede mostrarse porque el autor original no permite que se cite.",
-  "status.quote_error.removed": "Esta publicación fue eliminada por su autor.",
-  "status.quote_error.unauthorized": "Esta publicación no puede mostrarse, ya que no estás autorizado a verla.",
-  "status.quote_post_author": "Publicación de {name}",
+  "status.quote_error.limited_account_hint.action": "Mostrar de todos modos",
+  "status.quote_error.limited_account_hint.title": "Esta cuenta ha sido ocultada por los moderadores de {domain}.",
+  "status.quote_error.not_available": "Publicación no disponible",
+  "status.quote_error.pending_approval": "Publicación pendiente",
+  "status.quote_error.pending_approval_popout.body": "En Mastodon, puedes controlar si alguien puede citarte. Esta publicación está pendiente mientras obtenemos la aprobación del autor original.",
+  "status.quote_error.revoked": "Publicación eliminada por el autor",
+  "status.quote_followers_only": "Solo los seguidores pueden citar esta publicación",
+  "status.quote_manual_review": "El autor revisará manualmente",
+  "status.quote_noun": "Cita",
+  "status.quote_policy_change": "Cambia quién puede citarte",
+  "status.quote_post_author": "Ha citado una publicación de @{name}",
+  "status.quote_private": "Las publicaciones privadas no pueden ser citadas",
+  "status.quotes": "{count, plural,one {cita} other {citas}}",
+  "status.quotes.empty": "Nadie ha citado esta publicación todavía. Cuando alguien lo haga, aparecerá aquí.",
+  "status.quotes.local_other_disclaimer": "Las citas rechazadas por el autor no se mostrarán.",
+  "status.quotes.remote_other_disclaimer": "Solo se garantiza que se muestren las citas de {domain}. Las citas rechazadas por el autor no se mostrarán.",
   "status.read_more": "Leer más",
   "status.reblog": "Impulsar",
-  "status.reblog_private": "Impulsar a la audiencia original",
+  "status.reblog_or_quote": "Impulsar o citar",
+  "status.reblog_private": "Compartir de nuevo con tus seguidores",
   "status.reblogged_by": "Impulsado por {name}",
   "status.reblogs": "{count, plural, one {impulso} other {impulsos}}",
   "status.reblogs.empty": "Nadie ha impulsado esta publicación todavía. Cuando alguien lo haga, aparecerá aquí.",
   "status.redraft": "Borrar y volver a borrador",
   "status.remove_bookmark": "Eliminar marcador",
   "status.remove_favourite": "Eliminar de favoritos",
+  "status.remove_quote": "Eliminar",
   "status.replied_in_thread": "Respondió en el hilo",
   "status.replied_to": "Respondió a {name}",
   "status.reply": "Responder",
   "status.replyAll": "Responder al hilo",
   "status.report": "Reportar a @{name}",
+  "status.request_quote": "Solicitud de citación",
+  "status.revoke_quote": "Eliminar mi publicación de la publicación de @{name}",
   "status.sensitive_warning": "Contenido sensible",
   "status.share": "Compartir",
   "status.show_less_all": "Mostrar menos para todo",
@@ -930,6 +979,7 @@
   "upload_button.label": "Añadir imágenes, un fichero de vídeo o de audio",
   "upload_error.limit": "Límite de subida de archivos excedido.",
   "upload_error.poll": "No se permite la subida de archivos con encuestas.",
+  "upload_error.quote": "No se permite subir archivos a las citas.",
   "upload_form.drag_and_drop.instructions": "Para recoger un archivo multimedia, pulsa la barra espaciadora o la tecla Enter. Mientras arrastras, utiliza las teclas de flecha para mover el archivo multimedia en cualquier dirección. Vuelve a pulsar la barra espaciadora o la tecla Enter para soltar el archivo multimedia en su nueva posición, o pulsa Escape para cancelar.",
   "upload_form.drag_and_drop.on_drag_cancel": "Se canceló el arrastre. Se eliminó el archivo adjunto {item}.",
   "upload_form.drag_and_drop.on_drag_end": "El archivo adjunto {item} ha sido eliminado.",
@@ -952,5 +1002,19 @@
   "video.skip_forward": "Adelantar",
   "video.unmute": "Dejar de silenciar",
   "video.volume_down": "Bajar volumen",
-  "video.volume_up": "Subir volumen"
+  "video.volume_up": "Subir volumen",
+  "visibility_modal.button_title": "Configura la visibilidad",
+  "visibility_modal.header": "Visibilidad e interacciones",
+  "visibility_modal.helper.direct_quoting": "Las menciones privadas publicadas en Mastodon no pueden ser citadas por otros usuarios.",
+  "visibility_modal.helper.privacy_editing": "La visibilidad no se puede cambiar después de que se haya hecho una publicación.",
+  "visibility_modal.helper.privacy_private_self_quote": "Las citas propias de publicaciones privadas no pueden hacerse públicas.",
+  "visibility_modal.helper.private_quoting": "Las publicaciones solo para seguidores hechas en Mastodon no pueden ser citadas por otros usuarios.",
+  "visibility_modal.helper.unlisted_quoting": "Cuando la gente te cite, su publicación tampoco se mostrará en las cronologías públicas.",
+  "visibility_modal.instructions": "Controla quién puede interactuar con esta publicación. También puede modificar los ajustes para todas las publicaciones futuras accediendo a <link>Preferencias > Publicaciones por defecto</link>.",
+  "visibility_modal.privacy_label": "Visibilidad",
+  "visibility_modal.quote_followers": "Sólo seguidores",
+  "visibility_modal.quote_label": "Quién puede citar",
+  "visibility_modal.quote_nobody": "Solo yo",
+  "visibility_modal.quote_public": "Cualquiera",
+  "visibility_modal.save": "Guardar"
 }
diff --git a/app/javascript/mastodon/locales/et.json b/app/javascript/mastodon/locales/et.json
index b4b4c380cd4..4848c4f7e15 100644
--- a/app/javascript/mastodon/locales/et.json
+++ b/app/javascript/mastodon/locales/et.json
@@ -28,6 +28,7 @@
   "account.disable_notifications": "Peata teavitused @{name} postitustest",
   "account.domain_blocking": "Blokeeritud domeen",
   "account.edit_profile": "Muuda profiili",
+  "account.edit_profile_short": "Muuda",
   "account.enable_notifications": "Teavita mind @{name} postitustest",
   "account.endorse": "Too profiilil esile",
   "account.familiar_followers_many": "Jälgijateks {name1}, {name2} ja veel {othersCount, plural, one {üks kasutaja, keda tead} other {# kasutajat, keda tead}}",
@@ -40,6 +41,11 @@
   "account.featured_tags.last_status_never": "Postitusi pole",
   "account.follow": "Jälgi",
   "account.follow_back": "Jälgi vastu",
+  "account.follow_back_short": "Jälgi vastu",
+  "account.follow_request": "Jälgimispäring",
+  "account.follow_request_cancel": "Tühista päring",
+  "account.follow_request_cancel_short": "Katkesta",
+  "account.follow_request_short": "Koosta päring",
   "account.followers": "Jälgijad",
   "account.followers.empty": "Keegi ei jälgi veel seda kasutajat.",
   "account.followers_counter": "{count, plural, one {{counter} jälgija} other {{counter} jälgijat}}",
@@ -70,7 +76,6 @@
   "account.posts_with_replies": "Postitused ja vastused",
   "account.remove_from_followers": "Eemalda {name} jälgijate seast",
   "account.report": "Raporteeri @{name}",
-  "account.requested": "Ootab kinnitust. Klõpsa jälgimise soovi tühistamiseks",
   "account.requested_follow": "{name} on taodelnud sinu jälgimist",
   "account.requests_to_follow_you": "soovib sind jälgida",
   "account.share": "Jaga @{name} profiili",
@@ -167,7 +172,7 @@
   "column.domain_blocks": "Peidetud domeenid",
   "column.edit_list": "Muuda loendit",
   "column.favourites": "Lemmikud",
-  "column.firehose": "Laiv lõimed",
+  "column.firehose": "Postitused reaalajas",
   "column.follow_requests": "Jälgimistaotlused",
   "column.home": "Kodu",
   "column.list_members": "Halda loendi liikmeid",
@@ -239,15 +244,25 @@
   "confirmations.missing_alt_text.secondary": "Postita siiski",
   "confirmations.missing_alt_text.title": "Lisada alt-tekst?",
   "confirmations.mute.confirm": "Vaigista",
+  "confirmations.quiet_post_quote_info.dismiss": "Ära tuleta enam meelde",
+  "confirmations.quiet_post_quote_info.got_it": "Sain aru",
+  "confirmations.quiet_post_quote_info.message": "Vaikse, aga avaliku postituse tsiteerimisel sinu postitus on peidetud populaarsust koguvatel ajajoontel.",
+  "confirmations.quiet_post_quote_info.title": "Vaikse, aga avaliku postituse tsiteerimine",
   "confirmations.redraft.confirm": "Kustuta & taasalusta",
   "confirmations.redraft.message": "Kindel, et soovid postituse kustutada ja võtta uue aluseks? Lemmikuks märkimised ja jagamised lähevad kaotsi ning vastused jäävad ilma algse postituseta.",
   "confirmations.redraft.title": "Kustudada ja luua postituse mustand?",
   "confirmations.remove_from_followers.confirm": "Eemalda jälgija",
   "confirmations.remove_from_followers.message": "{name} lõpetab sellega sinu jälgimise. Kas oled kindel, et soovid jätkata?",
   "confirmations.remove_from_followers.title": "Kas eemaldame jälgija?",
+  "confirmations.revoke_quote.confirm": "Eemalda postitus",
+  "confirmations.revoke_quote.message": "Seda tegevust ei saa tagasi pöörata.",
+  "confirmations.revoke_quote.title": "Kas eemaldame postituse?",
+  "confirmations.unblock.confirm": "Lõpeta blokeerimine",
+  "confirmations.unblock.title": "Kas lõpetad {name} kasutaja blokeerimise?",
   "confirmations.unfollow.confirm": "Ära jälgi",
-  "confirmations.unfollow.message": "Oled kindel, et ei soovi rohkem jälgida kasutajat {name}?",
-  "confirmations.unfollow.title": "Ei jälgi enam kasutajat?",
+  "confirmations.unfollow.title": "Kas lõpetad {name} kasutaja jälgimise?",
+  "confirmations.withdraw_request.confirm": "Tühista päring",
+  "confirmations.withdraw_request.title": "Tühistad päringu {name} kasutaja jälgimiseks?",
   "content_warning.hide": "Peida postitus",
   "content_warning.show": "Näita ikkagi",
   "content_warning.show_more": "Näita rohkem",
@@ -269,7 +284,7 @@
   "dismissable_banner.public_timeline": "Need on värskeimad avalikud postitused inimestelt fediversiumis, mida domeeni {domain} inimesed jälgivad.",
   "domain_block_modal.block": "Blokeeri server",
   "domain_block_modal.block_account_instead": "Selle asemel blokeeri @{name}",
-  "domain_block_modal.they_can_interact_with_old_posts": "Inimesed sellest serverist saavad interakteeruda sinu vanade postitustega.",
+  "domain_block_modal.they_can_interact_with_old_posts": "Inimesed sellest serverist saavad suhestuda sinu vanade postitustega.",
   "domain_block_modal.they_cant_follow": "Sellest serverist ei saa keegi sind jälgida.",
   "domain_block_modal.they_wont_know": "Nad ei tea, et nad on blokeeritud.",
   "domain_block_modal.title": "Blokeerida domeen?",
@@ -289,6 +304,7 @@
   "domain_pill.your_handle": "Sinu tunnus:",
   "domain_pill.your_server": "Sinu digitaalne kodu, kus on kõik sinu postitused. Sulle ei meeldi see? Vaheta mistahes ajal serverit ja võta jälgijad ka.",
   "domain_pill.your_username": "Sinu unikaalne identifikaator siin serveris. On võimalik, et leiad teistes serverites samasuguse kasutajanimega kasutajaid.",
+  "dropdown.empty": "Vali üks variantidest",
   "embed.instructions": "Lisa see postitus oma veebilehele, kopeerides alloleva koodi.",
   "embed.preview": "Nii näeb see välja:",
   "emoji_button.activity": "Tegevus",
@@ -320,7 +336,7 @@
   "empty_column.domain_blocks": "Siin ei ole veel peidetud domeene.",
   "empty_column.explore_statuses": "Praegu pole ühtegi trendi. Tule hiljem tagasi!",
   "empty_column.favourited_statuses": "Pole veel lemmikpostitusi. Kui märgid mõne, näed neid siin.",
-  "empty_column.favourites": "Keegi pole veel seda postitust lemmikuks märkinud. Kui keegi seda teeb, näed seda siin.",
+  "empty_column.favourites": "Keegi pole veel seda postitust lemmikuks märkinud. Kui keegi seda teeb, siis on ta nähtav siin.",
   "empty_column.follow_requests": "Pole hetkel ühtegi jälgimistaotlust. Kui saad mõne, näed neid siin.",
   "empty_column.followed_tags": "Sa ei jälgi veel ühtegi märksõna. Kui jälgid, ilmuvad need siia.",
   "empty_column.hashtag": "Selle sildi all ei ole ühtegi postitust.",
@@ -337,7 +353,7 @@
   "errors.unexpected_crash.copy_stacktrace": "Kopeeri stacktrace lõikelauale",
   "errors.unexpected_crash.report_issue": "Teavita veast",
   "explore.suggested_follows": "Inimesed",
-  "explore.title": "Populaarsust kohuv",
+  "explore.title": "Populaarsust koguv",
   "explore.trending_links": "Uudised",
   "explore.trending_statuses": "Postitused",
   "explore.trending_tags": "Sildid",
@@ -389,7 +405,7 @@
   "followed_tags": "Jälgitavad märksõnad",
   "footer.about": "Teave",
   "footer.directory": "Profiilikataloog",
-  "footer.get_app": "Tõmba äpp",
+  "footer.get_app": "Laadi rakendus",
   "footer.keyboard_shortcuts": "Kiirklahvid",
   "footer.privacy_policy": "Isikuandmete kaitse",
   "footer.source_code": "Lähtekood",
@@ -424,8 +440,6 @@
   "hints.profiles.see_more_followers": "Vaata rohkem jälgijaid kohas {domain}",
   "hints.profiles.see_more_follows": "Vaata rohkem jälgitavaid kohas {domain}",
   "hints.profiles.see_more_posts": "Vaata rohkem postitusi kohas {domain}",
-  "hints.threads.replies_may_be_missing": "Vastuseid teistest serveritest võib olla puudu.",
-  "hints.threads.see_more": "Vaata rohkem vastuseid kohas {domain}",
   "home.column_settings.show_quotes": "Näita tsiteeritut",
   "home.column_settings.show_reblogs": "Näita jagamisi",
   "home.column_settings.show_replies": "Näita vastuseid",
@@ -447,20 +461,12 @@
   "ignore_notifications_modal.private_mentions_title": "Ignoreeri soovimatute eraviisiliste mainimiste teateid?",
   "info_button.label": "Abi",
   "info_button.what_is_alt_text": "<h1>Mis on alt-tekst?</h1> <p>Alt-tekst pakub pildi kirjeldust nägemispuudega inimeste jaoks või neile, kel on aeglane internet või neile, kes otsivad lisaselgitust</p> <p>Saad parandada ligipääsetavust ja mõistmist kõigi jaoks, kirjutades selge, lühida ja objektiivse alt-teksti.</p> <ul> <li>Lisa tähtsad elemendid</li> <li>Tee pildil olevast tekstist kokkuvõte</li> <li>Kasuta reeglipärast lausestruktuuri</li> <li>Väldi ebaolulist infot</li> <li>Keskendu keerukate vaadete puhul (näiteks diagrammid ja kaardid) puhul trendidele ja põhiseostele</li> </ul>",
-  "interaction_modal.action.favourite": "Jätkamiseks pead oma konto alt lemmikuks märkima.",
-  "interaction_modal.action.follow": "Jätkamiseks pead oma konto alt lemmikuks märkima.",
-  "interaction_modal.action.reblog": "Jätkamiseks pead jagama oma konto alt.",
-  "interaction_modal.action.reply": "Jätkamiseks pead vastama oma konto alt.",
-  "interaction_modal.action.vote": "Jätkamiseks pead hääletama oma konto alt.",
+  "interaction_modal.action": "Suhestumaks kasutaja {name} postitusega palun logi sisse oma Mastodoni kasutajakontoga sõltumata serverist, mida kasutad.",
   "interaction_modal.go": "Mine",
   "interaction_modal.no_account_yet": "Pole veel kontot?",
   "interaction_modal.on_another_server": "Teises serveris",
   "interaction_modal.on_this_server": "Selles serveris",
-  "interaction_modal.title.favourite": "Lisa konto {name} postitus lemmikuks",
-  "interaction_modal.title.follow": "Jälgi kontot {name}",
-  "interaction_modal.title.reblog": "Jaga {name} postitust",
-  "interaction_modal.title.reply": "Vasta kasutaja {name} postitusele",
-  "interaction_modal.title.vote": "Hääleta {name} küsitluses",
+  "interaction_modal.title": "Jätkamiseks logi sisse",
   "interaction_modal.username_prompt": "Nt {example}",
   "intervals.full.days": "{number, plural, one {# päev} other {# päeva}}",
   "intervals.full.hours": "{number, plural, one {# tund} other {# tundi}}",
@@ -481,6 +487,7 @@
   "keyboard_shortcuts.home": "Ava kodu ajajoon",
   "keyboard_shortcuts.hotkey": "Kiirklahv",
   "keyboard_shortcuts.legend": "Kuva see legend",
+  "keyboard_shortcuts.load_more": "Fookus „Laadi veel“ nupule",
   "keyboard_shortcuts.local": "Ava kohalik ajajoon",
   "keyboard_shortcuts.mention": "Maini autorit",
   "keyboard_shortcuts.muted": "Ava vaigistatud kasutajate loetelu",
@@ -489,6 +496,7 @@
   "keyboard_shortcuts.open_media": "Ava meedia",
   "keyboard_shortcuts.pinned": "Ava kinnitatud postituste loetelu",
   "keyboard_shortcuts.profile": "Ava autori profiil",
+  "keyboard_shortcuts.quote": "Tsiteeri postitust",
   "keyboard_shortcuts.reply": "Vasta postitusele",
   "keyboard_shortcuts.requests": "Ava jälgimistaotluste loetelu",
   "keyboard_shortcuts.search": "Fookus otsingule",
@@ -500,6 +508,8 @@
   "keyboard_shortcuts.translate": "postituse tõlkimiseks",
   "keyboard_shortcuts.unfocus": "Fookus tekstialalt/otsingult ära",
   "keyboard_shortcuts.up": "Liigu loetelus üles",
+  "learn_more_link.got_it": "Sain aru",
+  "learn_more_link.learn_more": "Lisateave",
   "lightbox.close": "Sulge",
   "lightbox.next": "Järgmine",
   "lightbox.previous": "Eelmine",
@@ -600,6 +610,7 @@
   "notification.label.mention": "Mainimine",
   "notification.label.private_mention": "Privaatne mainimine",
   "notification.label.private_reply": "Privaatne vastus",
+  "notification.label.quote": "{name} tsiteeris sinu postitust",
   "notification.label.reply": "Vastus",
   "notification.mention": "Mainimine",
   "notification.mentioned_you": "{name} mainis sind",
@@ -614,6 +625,7 @@
   "notification.moderation_warning.action_suspend": "Su konto on peatatud.",
   "notification.own_poll": "Su küsitlus on lõppenud",
   "notification.poll": "Hääletus, millel osalesid, on lõppenud",
+  "notification.quoted_update": "{name} on muutnud sinu poolt tsiteeritud postitust",
   "notification.reblog": "{name} jagas edasi postitust",
   "notification.reblog.name_and_others_with_link": "{name} ja <a>{count, plural, one {# veel} other {# teist}}</a> jagas su postitust",
   "notification.relationships_severance_event": "Kadunud ühendus kasutajaga {name}",
@@ -657,6 +669,7 @@
   "notifications.column_settings.mention": "Mainimised:",
   "notifications.column_settings.poll": "Küsitluse tulemused:",
   "notifications.column_settings.push": "Push teated",
+  "notifications.column_settings.quote": "Tsitaadid:",
   "notifications.column_settings.reblog": "Jagamised:",
   "notifications.column_settings.show": "Kuva tulbas",
   "notifications.column_settings.sound": "Mängi heli",
@@ -732,11 +745,18 @@
   "privacy.private.short": "Jälgijad",
   "privacy.public.long": "Nii kasutajad kui mittekasutajad",
   "privacy.public.short": "Avalik",
+  "privacy.quote.anyone": "{visibility}, kõik võivad tsiteerida",
+  "privacy.quote.disabled": "{visibility}, tsiteerimine pole lubatud",
+  "privacy.quote.limited": "{visibility}, tsiteerimine on piiratud",
   "privacy.unlisted.additional": "See on olemuselt küll avalik, aga postitus ei ilmu voogudes ega märksõnades, lehitsedes ega Mastodoni otsingus, isegi kui konto on seadistustes avalik.",
-  "privacy.unlisted.long": "Vähem algoritmilisi teavitusi",
+  "privacy.unlisted.long": "Peidetud Mastodoni otsingutulemustest, pupulaarsust koguva sisu voost ja avalikult ajajoonelt",
   "privacy.unlisted.short": "Vaikselt avalik",
   "privacy_policy.last_updated": "Viimati uuendatud {date}",
   "privacy_policy.title": "Isikuandmete kaitse",
+  "quote_error.poll": "Tsiteerimine pole küsitlustes lubatud.",
+  "quote_error.quote": "Korraga on lubatud vaid üks tsitaat.",
+  "quote_error.unauthorized": "Sul pole õigust seda postitust tsiteerida.",
+  "quote_error.upload": "Tsiteerimine pole manuste puhul lubatud.",
   "recommended": "Soovitatud",
   "refresh": "Värskenda",
   "regeneration_indicator.please_stand_by": "Palun oota.",
@@ -752,6 +772,9 @@
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "täna",
+  "remove_quote_hint.button_label": "Sain aru",
+  "remove_quote_hint.message": "Sa saad teha seda {icon} eelistuste menüüst.",
+  "remove_quote_hint.title": "Kas sa soovid oma tsiteeritud postituse eemaldada?",
   "reply_indicator.attachments": "{count, plural, one {# lisa} other {# lisa}}",
   "reply_indicator.cancel": "Tühista",
   "reply_indicator.poll": "Küsitlus",
@@ -831,7 +854,7 @@
   "search_results.statuses": "Postitused",
   "search_results.title": "Otsi märksõna: {q}",
   "server_banner.about_active_users": "Inimesed, kes kasutavad seda serverit viimase 30 päeva jooksul (kuu aktiivsed kasutajad)",
-  "server_banner.active_users": "aktiivsed kasutajad",
+  "server_banner.active_users": "aktiivset kasutajaid",
   "server_banner.administered_by": "Administraator:",
   "server_banner.is_one_of_many": "{domain} on üks paljudest sõltumatutest Mastodoni serveritest, mida saab fediversumis osalemiseks kasutada.",
   "server_banner.server_stats": "Serveri statistika:",
@@ -843,13 +866,23 @@
   "status.admin_account": "Ava @{name} moderaatorivaates",
   "status.admin_domain": "Ava {domain} modeereerimisliides",
   "status.admin_status": "Ava postitus moderaatorivaates",
+  "status.all_disabled": "Hooandmine ja tsiteerimine pole lubatud",
   "status.block": "Blokeeri @{name}",
   "status.bookmark": "Järjehoidja",
   "status.cancel_reblog_private": "Lõpeta jagamine",
+  "status.cannot_quote": "Sul pole õigust seda postitust tsiteerida",
   "status.cannot_reblog": "Seda postitust ei saa jagada",
+  "status.contains_quote": "Sisaldab tsitaati",
+  "status.context.loading": "Laadin veel vastuseid",
+  "status.context.loading_error": "Uute vastuste laadimine ei õnnestunud",
+  "status.context.loading_success": "Kõik vastused on laaditud",
+  "status.context.more_replies_found": "Leidub veel vastuseid",
+  "status.context.retry": "Proovi uuesti",
+  "status.context.show": "Näita",
   "status.continued_thread": "Jätkatud lõim",
   "status.copy": "Kopeeri postituse link",
   "status.delete": "Kustuta",
+  "status.delete.success": "Postitus on kustutatud",
   "status.detailed_status": "Detailne vestluskuva",
   "status.direct": "Maini privaatselt @{name}",
   "status.direct_indicator": "Privaatne mainimine",
@@ -858,11 +891,11 @@
   "status.edited_x_times": "Muudetud {count, plural, one{{count} kord} other {{count} korda}}",
   "status.embed": "Hangi manustamiskood",
   "status.favourite": "Lemmik",
-  "status.favourites": "{count, plural, one {lemmik} other {lemmikud}}",
+  "status.favourites": "{count, plural, one {lemmik} other {lemmikut}}",
   "status.filter": "Filtreeri seda postitust",
   "status.history.created": "{name} lõi {date}",
   "status.history.edited": "{name} muutis {date}",
-  "status.load_more": "Lae rohkem",
+  "status.load_more": "Laadi veel",
   "status.media.open": "Avamiseks klõpsa",
   "status.media.show": "Näitamiseks klõpsa",
   "status.media_hidden": "Meedia peidetud",
@@ -872,27 +905,43 @@
   "status.mute_conversation": "Vaigista vestlus",
   "status.open": "Laienda postitus",
   "status.pin": "Kinnita profiilile",
+  "status.quote": "Tsiteeri",
+  "status.quote.cancel": "Katkesta tsiteerimine",
   "status.quote_error.filtered": "Peidetud mõne kasutatud filtri tõttu",
-  "status.quote_error.not_found": "Seda postitust ei saa näidata.",
-  "status.quote_error.pending_approval": "See postitus on algse autori kinnituse ootel.",
-  "status.quote_error.rejected": "Seda postitust ei saa näidata, kuina algne autor ei luba teda tsiteerida.",
-  "status.quote_error.removed": "Autor kustutas selle postituse.",
-  "status.quote_error.unauthorized": "Kuna sul pole luba selle postituse nägemiseks, siis seda ei saa kuvada.",
-  "status.quote_post_author": "Postitajaks {name}",
+  "status.quote_error.limited_account_hint.action": "Näita ikkagi",
+  "status.quote_error.limited_account_hint.title": "See profiil on peidetud {domain} serveri moderaatorite poolt.",
+  "status.quote_error.not_available": "Postitus pole saadaval",
+  "status.quote_error.pending_approval": "Postitus on ootel",
+  "status.quote_error.pending_approval_popout.body": "Mastodonis saad sa kontrollida seda, kes võib sind tsiteerida. See postitus on seni ootel, kuni pole algse autori kinnitust tsiteerimisele.",
+  "status.quote_error.revoked": "Autor on postituse eemaldanud",
+  "status.quote_followers_only": "Vaid jälgijad saavad seda postitust tsiteerida",
+  "status.quote_manual_review": "Autor vaatab selle üle",
+  "status.quote_noun": "Tsitaat",
+  "status.quote_policy_change": "Muuda neid, kes võivad tsiteerida",
+  "status.quote_post_author": "Tsiteeris kasutaja @{name} postitust",
+  "status.quote_private": "Otsepostituste tsiteerimine pole võimalik",
+  "status.quotes": "{count, plural, one {# tsiteerimine} other {# tsiteerimist}}",
+  "status.quotes.empty": "Keegi pole seda postitust veel tsiteerinud. Kui keegi seda teeb, siis on ta nähtav siin.",
+  "status.quotes.local_other_disclaimer": "Autori poolt tagasilükatud tsitaate ei kuvata.",
+  "status.quotes.remote_other_disclaimer": "Kui kasutaja on {domain} domeenist, siis siin on tagatud vaid tema tsitaatide näitamine. Autori poolt tagasilükatud tsitaate ei kuvata.",
   "status.read_more": "Loe veel",
   "status.reblog": "Jaga",
-  "status.reblog_private": "Jaga algse nähtavusega",
+  "status.reblog_or_quote": "Anna hoogu või tsiteeri",
+  "status.reblog_private": "Jaga uuesti oma jälgijatele",
   "status.reblogged_by": "{name} jagas",
   "status.reblogs": "{count, plural, one {jagamine} other {jagamist}}",
-  "status.reblogs.empty": "Keegi pole seda postitust veel jaganud. Kui keegi seda teeb, näeb seda siin.",
+  "status.reblogs.empty": "Keegi pole seda postitust veel jaganud. Kui keegi seda teeb, siis on ta nähtav siin.",
   "status.redraft": "Kustuta & alga uuesti",
   "status.remove_bookmark": "Eemalda järjehoidja",
   "status.remove_favourite": "Eemalda lemmikute seast",
+  "status.remove_quote": "Eemalda",
   "status.replied_in_thread": "Vastatud lõimes",
   "status.replied_to": "Vastas kasutajale {name}",
   "status.reply": "Vasta",
   "status.replyAll": "Vasta lõimele",
   "status.report": "Raporteeri @{name}",
+  "status.request_quote": "Küsi võimalust tsiteerida",
+  "status.revoke_quote": "Eemalda minu tsitaat postituses, mille tegi @{name}",
   "status.sensitive_warning": "Tundlik sisu",
   "status.share": "Jaga",
   "status.show_less_all": "Peida kogu tundlik sisu",
@@ -926,11 +975,12 @@
   "units.short.billion": "{count} mld",
   "units.short.million": "{count} mln",
   "units.short.thousand": "{count} tuh",
-  "upload_area.title": "Lohista & aseta üleslaadimiseks",
-  "upload_button.label": "Lisa meedia (JPEG, PNG, GIF, WebM, MP4, MOV)",
-  "upload_error.limit": "Faili üleslaadimise limiit ületatud.",
+  "upload_area.title": "Lohista ja aseta üleslaadimiseks",
+  "upload_button.label": "Lisa pilte, üks video- või helifail",
+  "upload_error.limit": "Faili üleslaadimise piir ületatud.",
   "upload_error.poll": "Küsitlustes pole faili üleslaadimine lubatud.",
-  "upload_form.drag_and_drop.instructions": "Vajuta tühikut või enterit, et tõsta manus. Lohistamise ajal kasuta nooleklahve, et manust liigutada teatud suunas. Vajuta tühikut või enterit uuesti, et paigutada manus oma uuele kohale, või escape tühistamiseks.",
+  "upload_error.quote": "Tsiteerimisel pole faili üleslaadimine lubatud.",
+  "upload_form.drag_and_drop.instructions": "Manuse valimiseks vajuta tühikut või sisestusklahvi. Lohistamise ajal kasuta nooleklahve, et manust liigutada teatud suunas. Vajuta tühikut või enterit uuesti, et paigutada manus oma uuele kohale, või escape tühistamiseks.",
   "upload_form.drag_and_drop.on_drag_cancel": "Lohistamine tühistati. Manus {item} on asetatud.",
   "upload_form.drag_and_drop.on_drag_end": "Manus {item} on asetatud.",
   "upload_form.drag_and_drop.on_drag_over": "Manus {item} on liigutatud.",
@@ -940,7 +990,7 @@
   "upload_progress.processing": "Töötlen…",
   "username.taken": "See kasutajanimi on juba kasutusel. Proovi teist",
   "video.close": "Sulge video",
-  "video.download": "Faili allalaadimine",
+  "video.download": "Laadi fail alla",
   "video.exit_fullscreen": "Välju täisekraanist",
   "video.expand": "Suurenda video",
   "video.fullscreen": "Täisekraan",
@@ -952,5 +1002,19 @@
   "video.skip_forward": "Keri edasi",
   "video.unmute": "Lõpeta vaigistamine",
   "video.volume_down": "Heli vaiksemaks",
-  "video.volume_up": "Heli valjemaks"
+  "video.volume_up": "Heli valjemaks",
+  "visibility_modal.button_title": "Muuda nähtavust",
+  "visibility_modal.header": "Nähtavus ja kasutus",
+  "visibility_modal.helper.direct_quoting": "Ainult mainituile mõeldud Mastodoni postitusi ei saa teiste poolt tsiteerida.",
+  "visibility_modal.helper.privacy_editing": "Nähtavust ei saa peale postituse avaldamist muuta.",
+  "visibility_modal.helper.privacy_private_self_quote": "Privaatsete postituste tsiteerimist oma enda poolt pole võimalik teha avalikuks.",
+  "visibility_modal.helper.private_quoting": "Ainult jälgijatele mõeldud Mastodoni postitusi ei saa teiste poolt tsiteerida.",
+  "visibility_modal.helper.unlisted_quoting": "Kui teised kasutajad sind tsiteerivad, siis nende postitused peidetakse ajajoonelt, mis näitavad populaarsust koguvaid postitusi.",
+  "visibility_modal.instructions": "Halda seda, kes võivad antud postitusega suhestuda. Lisaks võid kõikide tulevaste postituste seadistusi muuta valikust <link>Eelistused > Postituse vaikeseadistused</link>.",
+  "visibility_modal.privacy_label": "Nähtavus",
+  "visibility_modal.quote_followers": "Ainult jälgijad",
+  "visibility_modal.quote_label": "Kes võivad tsiteerida",
+  "visibility_modal.quote_nobody": "Ainult mina",
+  "visibility_modal.quote_public": "Kõik",
+  "visibility_modal.save": "Salvesta"
 }
diff --git a/app/javascript/mastodon/locales/eu.json b/app/javascript/mastodon/locales/eu.json
index f3528024c9a..945ae1cd278 100644
--- a/app/javascript/mastodon/locales/eu.json
+++ b/app/javascript/mastodon/locales/eu.json
@@ -1,6 +1,7 @@
 {
   "about.blocks": "Moderatutako zerbitzariak",
   "about.contact": "Kontaktua:",
+  "about.default_locale": "Lehenetsia",
   "about.disclaimer": "Mastodon software libre eta kode irekikoa da, eta Mastodon gGmbH-ren marka erregistratua.",
   "about.domain_blocks.no_reason_available": "Arrazoia ez dago eskuragarri",
   "about.domain_blocks.preamble": "Mastodonek orokorrean aukera ematen dizu fedibertsoko beste zerbitzarietako erabiltzaileen edukia ikusi eta haiekin komunikatzeko. Zerbitzari zehatz honi ezarritako salbuespenak hauek dira.",
@@ -8,6 +9,7 @@
   "about.domain_blocks.silenced.title": "Mugatua",
   "about.domain_blocks.suspended.explanation": "Ez da zerbitzari honetako daturik prozesatuko, gordeko, edo partekatuko, zerbitzari honetako erabiltzaileekin komunikatzea ezinezkoa eginez.",
   "about.domain_blocks.suspended.title": "Kanporatua",
+  "about.language_label": "Hizkuntza",
   "about.not_available": "Zerbitzari honek ez du informazio hau eskuragarri jarri.",
   "about.powered_by": "{mastodon} erabiltzen duen sare sozial deszentralizatua",
   "about.rules": "Zerbitzariaren arauak",
@@ -19,13 +21,21 @@
   "account.block_domain": "Blokeatu {domain} domeinua",
   "account.block_short": "Blokeatu",
   "account.blocked": "Blokeatuta",
+  "account.blocking": "Eragotzitakoak",
   "account.cancel_follow_request": "Baztertu jarraitzeko eskaera",
   "account.copy": "Kopiatu profilerako esteka",
   "account.direct": "Aipatu pribatuki @{name}",
   "account.disable_notifications": "Utzi jakinarazteari @{name} erabiltzaileak argitaratzean",
+  "account.domain_blocking": "Eragotzitako domeinua",
   "account.edit_profile": "Editatu profila",
   "account.enable_notifications": "Jakinarazi @{name} erabiltzaileak argitaratzean",
   "account.endorse": "Nabarmendu profilean",
+  "account.familiar_followers_many": "Jarraitzaileak: {name1}, {name2} eta beste {othersCount, plural, one {ezagun bat} other {# ezagun}}",
+  "account.familiar_followers_one": "{name1}-k jarraitzen du",
+  "account.familiar_followers_two": "{name1}-k eta {name2}-k jarraitzen dute",
+  "account.featured": "Gailenak",
+  "account.featured.accounts": "Profilak",
+  "account.featured.hashtags": "Traolak",
   "account.featured_tags.last_status_at": "Azken bidalketa {date} datan",
   "account.featured_tags.last_status_never": "Bidalketarik ez",
   "account.follow": "Jarraitu",
@@ -33,9 +43,11 @@
   "account.followers": "Jarraitzaileak",
   "account.followers.empty": "Ez du inork erabiltzaile hau jarraitzen oraindik.",
   "account.followers_counter": "{count, plural, one {{counter} jarraitzaile} other {{counter} jarraitzaile}}",
+  "account.followers_you_know_counter": "{counter} ezagutzen dituzu",
   "account.following": "Jarraitzen",
   "account.following_counter": "{count, plural, one {{counter} jarraitzen} other {{counter} jarraitzen}}",
   "account.follows.empty": "Erabiltzaile honek ez du inor jarraitzen oraindik.",
+  "account.follows_you": "Jarraitzen zaitu",
   "account.go_to_profile": "Joan profilera",
   "account.hide_reblogs": "Ezkutatu @{name} erabiltzailearen bultzadak",
   "account.in_memoriam": "Oroimenezkoa.",
@@ -50,18 +62,22 @@
   "account.mute_notifications_short": "Mututu jakinarazpenak",
   "account.mute_short": "Mututu",
   "account.muted": "Mutututa",
+  "account.muting": "Isilarazitakoak",
+  "account.mutual": "Elkar jarraitzen duzue",
   "account.no_bio": "Ez da deskribapenik eman.",
   "account.open_original_page": "Ireki jatorrizko orria",
   "account.posts": "Bidalketa",
   "account.posts_with_replies": "Bidalketak eta erantzunak",
+  "account.remove_from_followers": "Kendu {name} zure jarraitzaileengandik",
   "account.report": "Salatu @{name}",
-  "account.requested": "Onarpenaren zain. Egin klik jarraipen-eskaera ezeztatzeko",
   "account.requested_follow": "{name}-(e)k zu jarraitzeko eskaera egin du",
+  "account.requests_to_follow_you": "Zu jarraitzeko eskaera egin du",
   "account.share": "Partekatu @{name} erabiltzailearen profila",
   "account.show_reblogs": "Erakutsi @{name} erabiltzailearen bultzadak",
   "account.statuses_counter": "{count, plural, one {{counter} bidalketa} other {{counter} bidalketa}}",
   "account.unblock": "Desblokeatu @{name}",
   "account.unblock_domain": "Berriz erakutsi {domain}",
+  "account.unblock_domain_short": "Desblokeatu",
   "account.unblock_short": "Desblokeatu",
   "account.unendorse": "Ez nabarmendu profilean",
   "account.unfollow": "Utzi jarraitzeari",
@@ -87,10 +103,13 @@
   "alt_text_modal.add_text_from_image": "Gehitu testua iruditik",
   "alt_text_modal.cancel": "Utzi",
   "alt_text_modal.change_thumbnail": "Aldatu koadro txikia",
+  "alt_text_modal.describe_for_people_with_hearing_impairments": "Deskribatu hau entzumen arazoak dituzten pertsonentzat…",
+  "alt_text_modal.describe_for_people_with_visual_impairments": "Deskribatu hau ikusmen arazoak dituzten pertsonentzat…",
   "alt_text_modal.done": "Egina",
   "announcement.announcement": "Iragarpena",
   "annual_report.summary.followers.followers": "jarraitzaileak",
   "annual_report.summary.followers.total": "{count} guztira",
+  "annual_report.summary.here_it_is": "Hona hemen zure {year}. urtearen bilduma:",
   "annual_report.summary.highlighted_post.by_favourites": "egindako bidalketa gogokoena",
   "annual_report.summary.highlighted_post.by_reblogs": "egindako bidalketa zabalduena",
   "annual_report.summary.highlighted_post.by_replies": "erantzun gehien izan dituen bidalketa",
@@ -99,6 +118,8 @@
   "annual_report.summary.most_used_hashtag.most_used_hashtag": "traola erabiliena",
   "annual_report.summary.most_used_hashtag.none": "Bat ere ez",
   "annual_report.summary.new_posts.new_posts": "bidalketa berriak",
+  "annual_report.summary.percentile.text": "<topLabel>Horrek jartzen zaitu top </topLabel> <percentage> </percentage>(e)an <bottomLabel> {domain} erabiltzaileen artean </bottomLabel>",
+  "annual_report.summary.percentile.we_wont_tell_bernie": "Bernieri ez diogu ezer esango ;)..",
   "annual_report.summary.thanks": "Eskerrik asko Mastodonen parte izateagatik!",
   "attachments_list.unprocessed": "(prozesatu gabe)",
   "audio.hide": "Ezkutatu audioa",
@@ -192,6 +213,13 @@
   "confirmations.delete_list.confirm": "Ezabatu",
   "confirmations.delete_list.message": "Ziur behin betiko ezabatu nahi duzula zerrenda hau?",
   "confirmations.delete_list.title": "Ezabatu zerrenda?",
+  "confirmations.discard_draft.confirm": "Baztertu eta jarraitu",
+  "confirmations.discard_draft.edit.cancel": "Berrekin edizioari",
+  "confirmations.discard_draft.edit.message": "Jarraitzeak editatzen ari zaren mezuan egindako aldaketak baztertuko ditu.",
+  "confirmations.discard_draft.edit.title": "Baztertu zure argitalpenari egindako aldaketak?",
+  "confirmations.discard_draft.post.cancel": "Zirriborroa berrekin",
+  "confirmations.discard_draft.post.message": "Jarraituz gero, idazten ari zaren sarrera bertan behera geratuko da.",
+  "confirmations.discard_draft.post.title": "Zure argitalpenaren zirriborroa baztertu nahi duzu?",
   "confirmations.discard_edit_media.confirm": "Baztertu",
   "confirmations.discard_edit_media.message": "Multimediaren deskribapen edo aurrebistan gorde gabeko aldaketak daude, baztertu nahi dituzu?",
   "confirmations.follow_to_list.confirm": "Jarraitu eta zerrendan sartu",
@@ -201,15 +229,17 @@
   "confirmations.logout.message": "Ziur saioa amaitu nahi duzula?",
   "confirmations.logout.title": "Itxi saioa?",
   "confirmations.missing_alt_text.confirm": "Gehitu testu alternatiboa",
+  "confirmations.missing_alt_text.message": "Zure argitalpenak \"alt text\"-urik gabeko multimedia edukia dauka. Deskribapenak gehitzeak zure edukia jende gehiagorentzat eskuragarri jartzen laguntzen du.",
   "confirmations.missing_alt_text.secondary": "Bidali edonola ere",
   "confirmations.missing_alt_text.title": "Testu alternatiboa gehitu?",
   "confirmations.mute.confirm": "Mututu",
   "confirmations.redraft.confirm": "Ezabatu eta berridatzi",
   "confirmations.redraft.message": "Ziur argitalpen hau ezabatu eta zirriborroa berriro egitea nahi duzula? Gogokoak eta bultzadak galduko dira, eta jatorrizko argitalpenaren erantzunak zurtz geratuko dira.",
   "confirmations.redraft.title": "Ezabatu eta berridatzi bidalketa?",
+  "confirmations.remove_from_followers.confirm": "Jarraitzailea Kendu",
+  "confirmations.remove_from_followers.message": "{name}-k zu jarraitzeari utziko dio. Seguru zaude jarraitu nahi duzula?",
+  "confirmations.remove_from_followers.title": "Jarraitzailea kendu nahi duzu?",
   "confirmations.unfollow.confirm": "Utzi jarraitzeari",
-  "confirmations.unfollow.message": "Ziur {name} jarraitzeari utzi nahi diozula?",
-  "confirmations.unfollow.title": "Erabiltzailea jarraitzeari utzi?",
   "content_warning.hide": "Tuta ezkutatu",
   "content_warning.show": "Erakutsi hala ere",
   "content_warning.show_more": "Erakutsi gehiago",
@@ -228,12 +258,14 @@
   "disabled_account_banner.text": "Zure {disabledAccount} kontua desgaituta dago une honetan.",
   "dismissable_banner.community_timeline": "Hauek dira {domain} zerbitzarian ostatatutako kontuen bidalketa publiko berrienak.",
   "dismissable_banner.dismiss": "Baztertu",
+  "dismissable_banner.public_timeline": "Hauek dira {domain}-eko jendeak jarraitzen dituen fedibertsoko erabiltzaileen azken mezu publikoak.",
   "domain_block_modal.block": "Blokeatu zerbitzaria",
   "domain_block_modal.block_account_instead": "Blokeatu @{name} bestela",
   "domain_block_modal.they_can_interact_with_old_posts": "Zerbitzari honetako jendea zure argitalpen zaharrekin elkarreragin dezake.",
   "domain_block_modal.they_cant_follow": "Zerbitzari honetako inork ezin zaitu jarraitu.",
   "domain_block_modal.they_wont_know": "Ez dute jakingo blokeatuak izan direnik.",
   "domain_block_modal.title": "Domeinua blokeatu nahi duzu?",
+  "domain_block_modal.you_will_lose_relationships": "Instantzia honetatik jarraitzen dituzun jarraitzaile eta pertsona guztiak galduko dituzu.",
   "domain_block_modal.you_wont_see_posts": "Ez dituzu zerbitzari honetako erabiltzaileen argitalpenik edota jakinarazpenik ikusiko.",
   "domain_pill.activitypub_lets_connect": "Mastodon-en ez ezik, beste sare sozialen aplikazioetako jendearekin konektatzea eta harremanetan jartzea uzten dizu.",
   "domain_pill.activitypub_like_language": "ActivityPub, Mastodon-ek beste sare sozialekin hitz egiteko erabiltzen duen hizkuntza bezalakoxea da.",
@@ -265,6 +297,9 @@
   "emoji_button.search_results": "Bilaketaren emaitzak",
   "emoji_button.symbols": "Sinboloak",
   "emoji_button.travel": "Bidaiak eta tokiak",
+  "empty_column.account_featured.me": "Oraindik ez duzu ezer nabarmendu. Ba al zenekien gehien erabiltzen dituzun traolak eta baita zure lagunen kontuak ere zure profilean nabarmendu ditzakezula?",
+  "empty_column.account_featured.other": "{acct}-ek ez du ezer nabarmendu oraindik. Ba al zenekien gehien erabiltzen dituzun traolak eta baita zure lagunen kontuak ere zure profilean nabarmendu ditzakezula?",
+  "empty_column.account_featured_other.unknown": "Kontu honek ez du ezer nabarmendu oraindik.",
   "empty_column.account_hides_collections": "Erabiltzaile honek informazio hau erabilgarri ez egotea aukeratu du.",
   "empty_column.account_suspended": "Kanporatutako kontua",
   "empty_column.account_timeline": "Ez dago bidalketarik hemen!",
@@ -293,9 +328,14 @@
   "errors.unexpected_crash.copy_stacktrace": "Kopiatu irteera arbelera",
   "errors.unexpected_crash.report_issue": "Eman arazoaren berri",
   "explore.suggested_follows": "Jendea",
+  "explore.title": "Joerak",
   "explore.trending_links": "Berriak",
   "explore.trending_statuses": "Tutak",
   "explore.trending_tags": "Traolak",
+  "featured_carousel.next": "Hurrengoa",
+  "featured_carousel.post": "Argitaratu",
+  "featured_carousel.previous": "Aurrekoa",
+  "featured_carousel.slide": "{total}-tik {index}",
   "filter_modal.added.context_mismatch_explanation": "Iragazki-kategoria hau ez zaio aplikatzen bidalketa honetara sartzeko erabili duzun testuinguruari. Bidalketa testuinguru horretan ere iragaztea nahi baduzu, iragazkia editatu beharko duzu.",
   "filter_modal.added.context_mismatch_title": "Testuingurua ez dator bat!",
   "filter_modal.added.expired_explanation": "Iragazki kategoria hau iraungi da, eragina izan dezan bere iraungitze-data aldatu beharko duzu.",
@@ -348,6 +388,8 @@
   "generic.saved": "Gordea",
   "getting_started.heading": "Menua",
   "hashtag.admin_moderation": "#{name}-(r)en moderazio-interfazea ireki",
+  "hashtag.browse": "Arakatu bidalketak #{hashtag}(e)n",
+  "hashtag.browse_from_account": "Arakatu @{name}(r)en bidalketak #{hashtag}(e)n",
   "hashtag.column_header.tag_mode.all": "eta {osagarria}",
   "hashtag.column_header.tag_mode.any": "edo {osagarria}",
   "hashtag.column_header.tag_mode.none": "gabe {osagarria}",
@@ -360,7 +402,10 @@
   "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.feature": "Nabarmendu profilean",
   "hashtag.follow": "Jarraitu traolari",
+  "hashtag.mute": "Mututu #{hashtag}",
+  "hashtag.unfeature": "Ez nabarmendu profilean",
   "hashtag.unfollow": "Utzi traola jarraitzeari",
   "hashtags.and_other": "…eta {count, plural, one {}other {# gehiago}}",
   "hints.profiles.followers_may_be_missing": "Baliteke profil honen jarraitzaile guztiak ez agertzea.",
@@ -369,8 +414,7 @@
   "hints.profiles.see_more_followers": "Ikusi jarraitzaile gehiago {domain}-(e)n",
   "hints.profiles.see_more_follows": "Ikusi jarraitzaile gehiago {domain}-(e)n",
   "hints.profiles.see_more_posts": "Ikusi bidalketa gehiago {domain}-(e)n",
-  "hints.threads.replies_may_be_missing": "Baliteke beste zerbitzari batzuen erantzun batzuk ez erakustea.",
-  "hints.threads.see_more": "Ikusi erantzun gehiago {domain}-(e)n",
+  "home.column_settings.show_quotes": "Erakutsi aipamenak",
   "home.column_settings.show_reblogs": "Erakutsi bultzadak",
   "home.column_settings.show_replies": "Erakutsi erantzunak",
   "home.hide_announcements": "Ezkutatu iragarpenak",
@@ -389,14 +433,12 @@
   "ignore_notifications_modal.not_followers_title": "Jarraitzen ez zaituzten pertsonen jakinarazpenei ez ikusiarena egin?",
   "ignore_notifications_modal.not_following_title": "Jarraitzen ez dituzun pertsonen jakinarazpenei ez ikusiarena egin?",
   "ignore_notifications_modal.private_mentions_title": "Eskatu gabeko aipamen pribatuen jakinarazpenei ez ikusiarena egin?",
+  "info_button.label": "Laguntza",
+  "info_button.what_is_alt_text": "<h1>Zer da Alt testua?</h1><p>Alt testuak irudiak deskribatzeko aukera ematen du, ikusmen-urritasunak, banda-zabalera txikiko konexioak edo testuinguru gehigarria nahi duten pertsonentzat.</p><p>Alt testu argi, zehatz eta objektiboen bidez, guztion irisgarritasuna eta ulermena hobetu ditzakezu.</p><ul><li>Hartu elementu garrantzitsuenak</li><li>Laburbildu irudietako testua</li><li>Erabili esaldien egitura erregularra</li><li>Baztertu informazio erredundantea.</li><li>Enfokatu joeretan eta funtsezko elementuetan irudi konplexuetan (diagrametan edo mapetan, adibidez)</li></ul>",
   "interaction_modal.go": "Joan",
   "interaction_modal.no_account_yet": "Ez al duzu konturik oraindik?",
   "interaction_modal.on_another_server": "Beste zerbitzari batean",
   "interaction_modal.on_this_server": "Zerbitzari honetan",
-  "interaction_modal.title.favourite": "Egin gogoko {name}(r)en bidalketa",
-  "interaction_modal.title.follow": "Jarraitu {name}(r)i",
-  "interaction_modal.title.reblog": "Bultzatu {name}(r)en bidalketa",
-  "interaction_modal.title.reply": "Erantzun {name}(r)en bidalketari",
   "interaction_modal.username_prompt": "Adib. {example}",
   "intervals.full.days": "{number, plural, one {egun #} other {# egun}}",
   "intervals.full.hours": "{number, plural, one {ordu #} other {# ordu}}",
@@ -433,11 +475,14 @@
   "keyboard_shortcuts.toggle_hidden": "testua erakustea/ezkutatzea abisu baten atzean",
   "keyboard_shortcuts.toggle_sensitivity": "multimedia erakutsi/ezkutatzeko",
   "keyboard_shortcuts.toot": "Hasi bidalketa berri bat",
+  "keyboard_shortcuts.translate": "bidalketa itzultzeko",
   "keyboard_shortcuts.unfocus": "testua konposatzeko area / bilaketatik fokua kentzea",
   "keyboard_shortcuts.up": "zerrendan gora mugitzea",
   "lightbox.close": "Itxi",
   "lightbox.next": "Hurrengoa",
   "lightbox.previous": "Aurrekoa",
+  "lightbox.zoom_in": "Zooma egungo tamainara",
+  "lightbox.zoom_out": "Zooma egokitzeko",
   "limited_account_hint.action": "Erakutsi profila hala ere",
   "limited_account_hint.title": "Profil hau ezkutatu egin dute {domain} zerbitzariko moderatzaileek.",
   "link_preview.author": "Egilea: {name}",
@@ -447,13 +492,24 @@
   "lists.add_to_list": "Gehitu zerrendara",
   "lists.add_to_lists": "Gehitu {name} zerrendetara",
   "lists.create": "Sortu",
+  "lists.create_a_list_to_organize": "Sortu zerrenda berria zure Hasierako jarioa antolatzeko",
   "lists.create_list": "Sortu zerrenda",
   "lists.delete": "Ezabatu zerrenda",
   "lists.done": "Egina",
   "lists.edit": "Editatu zerrenda",
+  "lists.exclusive": "Ezkutatu kideak Hasieran",
+  "lists.exclusive_hint": "Norbait zerrenda honetan badago, ezkutatu zure Hasierako jariotik mezuak bi aldiz ez ikusteko.",
+  "lists.find_users_to_add": "Bilatu erabiltzaileak gehitzeko",
+  "lists.list_name": "Zerrenda izena",
+  "lists.new_list_name": "Zerrenda izen berria",
+  "lists.no_lists_yet": "Ez duzu zerrendarik oraindik.",
+  "lists.no_members_yet": "Ez duzu kiderik oraindik.",
+  "lists.no_results_found": "Ez da emaitzarik aurkitu.",
+  "lists.remove_member": "Ezabatu",
   "lists.replies_policy.followed": "Jarraitutako edozein erabiltzaile",
   "lists.replies_policy.list": "Zerrendako kideak",
   "lists.replies_policy.none": "Bat ere ez",
+  "lists.save": "Gorde",
   "lists.search": "Bilatu",
   "load_pending": "{count, plural, one {elementu berri #} other {# elementu berri}}",
   "loading_indicator.label": "Kargatzen…",
@@ -469,8 +525,10 @@
   "mute_modal.you_wont_see_mentions": "Ez duzu ikusiko bera aipatzen duen argitalpenik.",
   "mute_modal.you_wont_see_posts": "Zure argitalpenak ikus ditzake, baina ez dituzu bereak ikusiko.",
   "navigation_bar.about": "Honi buruz",
+  "navigation_bar.account_settings": "Pasahitza eta segurtasuna",
   "navigation_bar.administration": "Administrazioa",
   "navigation_bar.advanced_interface": "Ireki web interfaze aurreratuan",
+  "navigation_bar.automated_deletion": "Bidalketa automatikoaren ezabaketa",
   "navigation_bar.blocks": "Blokeatutako erabiltzaileak",
   "navigation_bar.bookmarks": "Laster-markak",
   "navigation_bar.direct": "Aipamen pribatuak",
@@ -480,13 +538,19 @@
   "navigation_bar.follow_requests": "Jarraitzeko eskaerak",
   "navigation_bar.followed_tags": "Jarraitutako traolak",
   "navigation_bar.follows_and_followers": "Jarraitutakoak eta jarraitzaileak",
+  "navigation_bar.import_export": "Inportazioa eta esportazioa",
   "navigation_bar.lists": "Zerrendak",
+  "navigation_bar.live_feed_local": "Zuzeneko jarioa (lokala)",
+  "navigation_bar.live_feed_public": "Zuzeneko jarioa (publikoa)",
   "navigation_bar.logout": "Amaitu saioa",
   "navigation_bar.moderation": "Moderazioa",
+  "navigation_bar.more": "Gehiago",
   "navigation_bar.mutes": "Mutututako erabiltzaileak",
   "navigation_bar.opened_in_classic_interface": "Argitalpenak, kontuak eta beste orri jakin batzuk lehenespenez irekitzen dira web-interfaze klasikoan.",
   "navigation_bar.preferences": "Hobespenak",
+  "navigation_bar.privacy_and_reach": "Pribatutasuna eta irismena",
   "navigation_bar.search": "Bilatu",
+  "navigation_bar.search_trends": "Bilatu / Joera",
   "not_signed_in_indicator.not_signed_in": "Baliabide honetara sarbidea izateko saioa hasi behar duzu.",
   "notification.admin.report": "{name} erabiltzaileak {target} salatu du",
   "notification.admin.report_account": "{name}-(e)k {target}-ren {count, plural, one {bidalketa bat} other {# bidalketa}} salatu zituen {category} delakoagatik",
@@ -497,6 +561,7 @@
   "notification.admin.sign_up.name_and_others": "{name} eta {count, plural, one {erabiltzaile # gehiago} other {# erabiltzaile gehiago}} erregistratu dira",
   "notification.favourite": "{name}(e)k zure bidalketa gogoko du",
   "notification.favourite.name_and_others_with_link": "{name} eta <a>{count, plural, one {erabiltzaile # gehiagok} other {# erabiltzaile gehiagok}}</a> zure bidalketa gogoko dute",
+  "notification.favourite_pm": "{name}-ek zure aipamen pribatua gogokoetan jarri du",
   "notification.follow": "{name}(e)k jarraitzen dizu",
   "notification.follow_request": "{name}(e)k zu jarraitzeko eskaera egin du",
   "notification.follow_request.name_and_others": "{name} eta {count, plural, one {erabiltzaile # gehiagok} other {# erabiltzaile gehiagok}} zu jarraitzeko eskaera egin dute",
@@ -505,6 +570,7 @@
   "notification.label.private_reply": "Erantzun pribatua",
   "notification.label.reply": "Erantzuna",
   "notification.mention": "Aipamena",
+  "notification.mentioned_you": "{name}(e)k aipatu zaitu",
   "notification.moderation-warning.learn_more": "Informazio gehiago",
   "notification.moderation_warning": "Moderazio-abisu bat jaso duzu",
   "notification.moderation_warning.action_delete_statuses": "Argitalpen batzuk kendu dira.",
@@ -551,6 +617,7 @@
   "notifications.column_settings.filter_bar.category": "Iragazki-barra bizkorra",
   "notifications.column_settings.follow": "Jarraitzaile berriak:",
   "notifications.column_settings.follow_request": "Jarraitzeko eskaera berriak:",
+  "notifications.column_settings.group": "Taldea",
   "notifications.column_settings.mention": "Aipamenak:",
   "notifications.column_settings.poll": "Inkestaren emaitzak:",
   "notifications.column_settings.push": "Push jakinarazpenak",
@@ -629,7 +696,6 @@
   "privacy.public.long": "Mastodonen dagoen edo ez dagoen edonor",
   "privacy.public.short": "Publikoa",
   "privacy.unlisted.additional": "Aukera honek publiko modua bezala funtzionatzen du, baina argitalpena ez da agertuko zuzeneko jarioetan edo traoletan, \"Arakatu\" atalean edo Mastodonen bilaketan, nahiz eta kontua zabaltzeko onartu duzun.",
-  "privacy.unlisted.long": "Tontakeria algoritmiko gutxiago",
   "privacy.unlisted.short": "Deiadar urrikoa",
   "privacy_policy.last_updated": "Azkenengo eguneraketa {date}",
   "privacy_policy.title": "Pribatutasun politika",
@@ -701,6 +767,7 @@
   "report_notification.categories.violation": "Arau haustea",
   "report_notification.categories.violation_sentence": "arau haustea",
   "report_notification.open": "Ireki salaketa",
+  "search.clear": "Garbitu bilaketa",
   "search.no_recent_searches": "Duela gutxiko bilaketarik ez",
   "search.placeholder": "Bilatu",
   "search.quick_action.account_search": "{x}-(r)ekin bat datozen profilak",
@@ -767,7 +834,6 @@
   "status.pin": "Finkatu profilean",
   "status.read_more": "Irakurri gehiago",
   "status.reblog": "Bultzada",
-  "status.reblog_private": "Bultzada jatorrizko hartzaileei",
   "status.reblogged_by": "{name}(r)en bultzada",
   "status.reblogs": "{count, plural, one {bultzada} other {bultzada}}",
   "status.reblogs.empty": "Inork ez dio bultzada eman bidalketa honi oraindik. Inork egiten badu, hemen agertuko da.",
@@ -793,7 +859,11 @@
   "subscribed_languages.save": "Gorde aldaketak",
   "subscribed_languages.target": "Aldatu {target}(e)n harpidetutako hizkuntzak",
   "tabs_bar.home": "Hasiera",
+  "tabs_bar.menu": "Menua",
   "tabs_bar.notifications": "Jakinarazpenak",
+  "tabs_bar.publish": "Bidalketa berria",
+  "tabs_bar.search": "Bilatu",
+  "terms_of_service.title": "Zerbitzuaren baldintzak",
   "time_remaining.days": "{number, plural, one {egun #} other {# egun}} amaitzeko",
   "time_remaining.hours": "{number, plural, one {ordu #} other {# ordu}} amaitzeko",
   "time_remaining.minutes": "{number, plural, one {minutu #} other {# minutu}} amaitzeko",
@@ -820,5 +890,9 @@
   "video.fullscreen": "Pantaila osoa",
   "video.hide": "Ezkutatu bideoa",
   "video.pause": "Pausatu",
-  "video.play": "Jo"
+  "video.play": "Jo",
+  "video.skip_forward": "Jauzi aurrerantz",
+  "video.unmute": "Soinua ezarri",
+  "video.volume_down": "Bolumena jaitsi",
+  "video.volume_up": "Bolumena Igo"
 }
diff --git a/app/javascript/mastodon/locales/fa.json b/app/javascript/mastodon/locales/fa.json
index e73d1625f6f..48d686a4d6b 100644
--- a/app/javascript/mastodon/locales/fa.json
+++ b/app/javascript/mastodon/locales/fa.json
@@ -39,11 +39,11 @@
   "account.featured_tags.last_status_at": "آخرین فرسته در {date}",
   "account.featured_tags.last_status_never": "بدون فرسته",
   "account.follow": "پی‌گرفتن",
-  "account.follow_back": "دنبال کردن متقابل",
+  "account.follow_back": "پی‌گیری متقابل",
   "account.followers": "پی‌گیرندگان",
   "account.followers.empty": "هنوز کسی پی‌گیر این کاربر نیست.",
   "account.followers_counter": "{count, plural, one {{counter} پی‌گیرنده} other {{counter} پی‌گیرنده}}",
-  "account.followers_you_know_counter": "{counter} را می‌شناسید",
+  "account.followers_you_know_counter": "{counter} نفر را می‌شناسید",
   "account.following": "پی می‌گیرید",
   "account.following_counter": "{count, plural, one {{counter} پی‌گرفته} other {{counter} پی‌گرفته}}",
   "account.follows.empty": "این کاربر هنوز پی‌گیر کسی نیست.",
@@ -62,7 +62,7 @@
   "account.mute_notifications_short": "خموشی آگاهی‌ها",
   "account.mute_short": "خموشی",
   "account.muted": "خموش",
-  "account.muting": "خموش کرده",
+  "account.muting": "خموشش کرده‌اید",
   "account.mutual": "یکدیگر را پی می‌گیرید",
   "account.no_bio": "شرحی فراهم نشده.",
   "account.open_original_page": "گشودن صفحهٔ اصلی",
@@ -70,7 +70,6 @@
   "account.posts_with_replies": "فرسته‌ها و پاسخ‌ها",
   "account.remove_from_followers": "برداشتن {name} از پی‌گیران",
   "account.report": "گزارش ‎@{name}",
-  "account.requested": "منتظر پذیرش است. برای لغو درخواست پی‌گیری کلیک کنید",
   "account.requested_follow": "{name} درخواست پی‌گیریتان را داد",
   "account.requests_to_follow_you": "درخواست پی‌گیریتان را دارد",
   "account.share": "هم‌رسانی نمایهٔ ‎@{name}",
@@ -129,14 +128,14 @@
   "annual_report.summary.thanks": "سپاس که بخشی از ماستودون هستید!",
   "attachments_list.unprocessed": "(پردازش نشده)",
   "audio.hide": "نهفتن صدا",
-  "block_modal.remote_users_caveat": "ما از کارساز {domain} خواهیم خواست که به تصمیم شما احترام بگذارد. با این حال، تضمینی برای رعایت آن وجود ندارد زیرا برخی کارسازها ممکن است بلوک‌ها را به‌طور متفاوتی مدیریت کنند. فرسته‌های عمومی ممکن است همچنان برای کاربران که وارد نشده قابل مشاهده باشند.",
+  "block_modal.remote_users_caveat": "از کارساز {domain} خواهیم خواست که به تصمیمتان احترام بگذارد. با این حال تضمینی برای رعایتش وجود ندارد؛ زیرا برخی کارسازها ممکن است مسدودی را متفاوت مدیریت کنند. ممکن است فرسته‌های عمومی همچنان برای کاربران وارد نشده نمایان باشند.",
   "block_modal.show_less": "نمایش کم‌تر",
   "block_modal.show_more": "نمایش بیش‌تر",
-  "block_modal.they_cant_mention": "نمی‌توانند نامتان را برده یا پی‌تان بگیرند.",
-  "block_modal.they_cant_see_posts": "نمی‌توانند فرسته‌هایتان را دیده و فرسته‌هایشان را نمی‌بینید.",
-  "block_modal.they_will_know": "می‌توانند ببینند که مسدود شده‌اند.",
+  "block_modal.they_cant_mention": "نمی‌تواند نامتان را برده یا پیتان بگیرد.",
+  "block_modal.they_cant_see_posts": "نمی‌تواند فرسته‌هایتان را ببیند و فرسته‌هایش را نمی‌بینید.",
+  "block_modal.they_will_know": "می‌تواند ببینند که مسدود شده.",
   "block_modal.title": "انسداد کاربر؟",
-  "block_modal.you_wont_see_mentions": "فرسته‌هایی که از اون نام برده را نخواهید دید.",
+  "block_modal.you_wont_see_mentions": "فرسته‌هایی که به او اشاره کرده‌اند را نخواهید دید.",
   "boost_modal.combo": "دکمهٔ {combo} را بزنید تا دیگر این را نبینید",
   "boost_modal.reblog": "تقویت فرسته؟",
   "boost_modal.undo_reblog": "ناتقویت فرسته؟",
@@ -219,6 +218,13 @@
   "confirmations.delete_list.confirm": "حذف",
   "confirmations.delete_list.message": "مطمئنید می‌خواهید این سیاهه را برای همیشه حذف کنید؟",
   "confirmations.delete_list.title": "حذف سیاهه؟",
+  "confirmations.discard_draft.confirm": "دور انداختن و ادامه",
+  "confirmations.discard_draft.edit.cancel": "ادامهٔ ویرایش",
+  "confirmations.discard_draft.edit.message": "ادامه دادن هر تغییری که روی فرستهٔ در حال ویرایش داده‌اید را دور خواهد ریخت.",
+  "confirmations.discard_draft.edit.title": "دور ریختن تغییرات فرسته‌تان؟",
+  "confirmations.discard_draft.post.cancel": "از سر گیری پیش‌نویس",
+  "confirmations.discard_draft.post.message": "ادامه دادن باعث دور ریخته شدن تغییرات روی فرسته‌ای که دارید می‌نویسید خواهد شد.",
+  "confirmations.discard_draft.post.title": "دور ریختن فرستهٔ پیش‌نویستان؟",
   "confirmations.discard_edit_media.confirm": "دور انداختن",
   "confirmations.discard_edit_media.message": "تغییرات ذخیره نشده‌ای در توضیحات یا پیش‌نمایش رسانه دارید. همگی نادیده گرفته شوند؟",
   "confirmations.follow_to_list.confirm": "پی‌گیری و افزودن به سیاهه",
@@ -228,7 +234,7 @@
   "confirmations.logout.message": "مطمئنید می‌خواهید خارج شوید؟",
   "confirmations.logout.title": "خروج؟",
   "confirmations.missing_alt_text.confirm": "متن جایگزین را اضافه کنید",
-  "confirmations.missing_alt_text.message": "پست شما حاوی رسانه بدون متن جایگزین است. افزودن توضیحات کمک می کند تا محتوای شما برای افراد بیشتری قابل دسترسی باشد.",
+  "confirmations.missing_alt_text.message": "فرسته‌تان رسانه‌هایی بدون متن جایگزین دارد. افزودن شرح به دسترس‌پذیر شدن محتوایتان برای افراد بیش‌تری کمک می‌کند.",
   "confirmations.missing_alt_text.secondary": "به هر حال پست کن",
   "confirmations.missing_alt_text.title": "متن جایگزین اضافه شود؟",
   "confirmations.mute.confirm": "خموش",
@@ -238,9 +244,10 @@
   "confirmations.remove_from_followers.confirm": "برداشتن پی‌گیرنده",
   "confirmations.remove_from_followers.message": "دیگر {name} پیتان نخواهد گرفت. مطمئنید که می‌خواهید ادامه دهید؟",
   "confirmations.remove_from_followers.title": "برداشتن پی‌گیرنده؟",
+  "confirmations.revoke_quote.confirm": "حذف فرسته",
+  "confirmations.revoke_quote.message": "این اقدام قابل بازگشت نیست.",
+  "confirmations.revoke_quote.title": "آیا فرسته را حذف کنم؟",
   "confirmations.unfollow.confirm": "پی‌نگرفتن",
-  "confirmations.unfollow.message": "مطمئنید که می‌خواهید به پی‌گیری از {name} پایان دهید؟",
-  "confirmations.unfollow.title": "ناپی‌گیری کاربر؟",
   "content_warning.hide": "نهفتن فرسته",
   "content_warning.show": "در هر صورت نشان داده شود",
   "content_warning.show_more": "نمایش بیش‌تر",
@@ -262,9 +269,9 @@
   "dismissable_banner.public_timeline": "این‌ها جدیدترین فرسته‌های عمومی از افرادی روی وب اجتماعیند که اعضای {domain} پی می‌گیرندشان.",
   "domain_block_modal.block": "انسداد کارساز",
   "domain_block_modal.block_account_instead": "انسداد @{name} به جایش",
-  "domain_block_modal.they_can_interact_with_old_posts": "افزارد روی این کراساز می‌توانند با فرسته‌های قدیمیتان تعامل داشته باشند.",
+  "domain_block_modal.they_can_interact_with_old_posts": "افزارد روی این کارساز می‌توانند با فرسته‌های قدیمیتان تعامل داشته باشند.",
   "domain_block_modal.they_cant_follow": "هیچ‌کسی از این کارساز نمی‌تواند پیتان بگیرد.",
-  "domain_block_modal.they_wont_know": "نخواهند دانست که مسدود شده‌اند.",
+  "domain_block_modal.they_wont_know": "نخواهد دانست که مسدود شده.",
   "domain_block_modal.title": "انسداد دامنه؟",
   "domain_block_modal.you_will_lose_num_followers": "شما {followersCount, plural, one {{followersCountDisplay} پی‌گیرنده} other {{followersCountDisplay} پی‌گیرنده}} و {followingCount, plural, one {{followingCountDisplay} فرد پی‌گرفته‌شده} other {{followingCountDisplay} فرد پی‌گرفته‌شده}} را از دست خواهید داد.",
   "domain_block_modal.you_will_lose_relationships": "شما تمام پیگیرکنندگان و افرادی که از این کارساز پیگیری می‌کنید را از دست خواهید داد.",
@@ -282,6 +289,7 @@
   "domain_pill.your_handle": "شناسه‌تان:",
   "domain_pill.your_server": "خانهٔ رقمیتان. جایی که همهٔ فرسته‌هایتان می‌زیند. دوستش ندارید؟ در هر زمان کارسازتان را جابه‌جا کرده و پی‌گیرندگانتان را نیز بیاورید.",
   "domain_pill.your_username": "شناسهٔ یکتایتان روی این کارساز. ممکن است کاربرانی با نام کاربری مشابه روی کارسازهای دیگر باشند.",
+  "dropdown.empty": "انتخاب یک گزینه",
   "embed.instructions": "جاسازی این فرسته روی پایگاهتان با رونوشت کردن کد زیر.",
   "embed.preview": "این گونه دیده خواهد شد:",
   "emoji_button.activity": "فعالیت",
@@ -417,9 +425,7 @@
   "hints.profiles.see_more_followers": "دیدن پی‌گیرندگان بیش‌تر روی {domain}",
   "hints.profiles.see_more_follows": "دیدن پی‌گرفته‌های بیش‌تر روی {domain}",
   "hints.profiles.see_more_posts": "دیدن فرسته‌های بیش‌تر روی {domain}",
-  "hints.threads.replies_may_be_missing": "شاید پاسخ‌ها از دیگر کارسازها نباشند.",
-  "hints.threads.see_more": "دیدن پاسخ‌های بیش‌تر روی {domain}",
-  "home.column_settings.show_quotes": "نمایش نقل‌قول‌ها",
+  "home.column_settings.show_quotes": "نمایش نقل‌ها",
   "home.column_settings.show_reblogs": "نمایش تقویت‌ها",
   "home.column_settings.show_replies": "نمایش پاسخ‌ها",
   "home.hide_announcements": "نهفتن اعلامیه‌ها",
@@ -440,20 +446,10 @@
   "ignore_notifications_modal.private_mentions_title": "چشم‌پوشی از نام‌بری‌های خصوصی ناخواسته؟",
   "info_button.label": "راهنما",
   "info_button.what_is_alt_text": "<h1>متن جایگزین چیست؟</h1> <p>متن جایگزین توضیحات تصویری را برای افراد دارای اختلالات بینایی، اتصالات با پهنای باند کم یا کسانی که به دنبال زمینه اضافی هستند ارائه می دهد.</p> <p>با نوشتن متن جایگزین واضح، مختصر و عینی می توانید دسترسی و درک را برای همه بهبود بخشید.</p> <ul> <li>عناصر مهم را ضبط کنید</li> <li>متن را در تصاویر خلاصه کنید</li> <li>از ساختار جمله منظم استفاده کنید</li> <li>از اطلاعات اضافی خودداری کنید</li> <li>روی روندها و یافته های کلیدی در تصاویر پیچیده (مانند نمودارها یا نقشه ها) تمرکز کنید.</li> </ul>",
-  "interaction_modal.action.favourite": "برای ادامه، باید از حساب خود به دلخواه انتخاب کنید.",
-  "interaction_modal.action.follow": "برای ادامه، باید از حساب کاربری خود دنبال کنید.",
-  "interaction_modal.action.reblog": "برای ادامه، باید از حساب خود مجددا بلاگ کنید.",
-  "interaction_modal.action.reply": "برای ادامه، باید از حساب خود پاسخ دهید.",
-  "interaction_modal.action.vote": "برای ادامه، باید از حساب کاربری خود رای دهید.",
   "interaction_modal.go": "برو",
   "interaction_modal.no_account_yet": "هنوز حساب کاربری ندارید؟",
   "interaction_modal.on_another_server": "روی کارسازی دیگر",
   "interaction_modal.on_this_server": "روی این کارساز",
-  "interaction_modal.title.favourite": "فرسته‌های برگزیدهٔ {name}",
-  "interaction_modal.title.follow": "پیگیری {name}",
-  "interaction_modal.title.reblog": "تقویت فرستهٔ {name}",
-  "interaction_modal.title.reply": "پاسخ به فرستهٔ {name}",
-  "interaction_modal.title.vote": "رأی دادن در نظرسنجی {name}",
   "interaction_modal.username_prompt": "به عنوان مثال {example}",
   "intervals.full.days": "{number, plural, one {# روز} other {# روز}}",
   "intervals.full.hours": "{number, plural, one {# ساعت} other {# ساعت}}",
@@ -493,6 +489,8 @@
   "keyboard_shortcuts.translate": "برای ترجمه یک پست",
   "keyboard_shortcuts.unfocus": "برداشتن تمرکز از ناحیهٔ نوشتن یا جست‌وجو",
   "keyboard_shortcuts.up": "بالا بردن در سیاهه",
+  "learn_more_link.got_it": "متوجه شدم",
+  "learn_more_link.learn_more": "دانستن بیش‌تر",
   "lightbox.close": "بستن",
   "lightbox.next": "بعدی",
   "lightbox.previous": "قبلی",
@@ -536,11 +534,11 @@
   "mute_modal.hide_options": "گزینه‌های نهفتن",
   "mute_modal.indefinite": "تا وقتی ناخموشش کنم",
   "mute_modal.show_options": "نمایش گزینه‌ها",
-  "mute_modal.they_can_mention_and_follow": "می‌توانند به شما اشاره کرده و پیتان بگیرند، ولی نخواهید دیدشان.",
-  "mute_modal.they_wont_know": "نخواهند دانست که خموش شده‌اند.",
+  "mute_modal.they_can_mention_and_follow": "می‌تواند به شما اشاره کرده و پیتان بگیرد؛ ولی نخواهید دیدش.",
+  "mute_modal.they_wont_know": "نخواهد دانست که خموش شده.",
   "mute_modal.title": "خموشی کاربر؟",
   "mute_modal.you_wont_see_mentions": "فرسته‌هایی که به او اشاره کرده‌اند را نخواهید دید.",
-  "mute_modal.you_wont_see_posts": "هنوز می‌توانند فرسته‌هایتان را ببینند، ولی فرسته‌هایشان را نمی‌بینید.",
+  "mute_modal.you_wont_see_posts": "همچنان می‌تواند فرسته‌هایتان را ببینند؛ ولی فرسته‌هایش را نمی‌بینید.",
   "navigation_bar.about": "درباره",
   "navigation_bar.account_settings": "گذرواژه و امنیت",
   "navigation_bar.administration": "مدیریت",
@@ -557,6 +555,8 @@
   "navigation_bar.follows_and_followers": "پی‌گرفتگان و پی‌گیرندگان",
   "navigation_bar.import_export": "درون‌ریزی و برون‌بری",
   "navigation_bar.lists": "سیاهه‌ها",
+  "navigation_bar.live_feed_local": "خوراک زنده (محلی)",
+  "navigation_bar.live_feed_public": "خوراک زنده (عمومی)",
   "navigation_bar.logout": "خروج",
   "navigation_bar.moderation": "نظارت",
   "navigation_bar.more": "بیشتر",
@@ -566,6 +566,10 @@
   "navigation_bar.privacy_and_reach": "محرمانگی و دسترسی",
   "navigation_bar.search": "جست‌وجو",
   "navigation_bar.search_trends": "جستجو \\ پرطرفدار",
+  "navigation_panel.collapse_followed_tags": "جمع کردن فهرست برچسب‌های پی‌گرفته",
+  "navigation_panel.collapse_lists": "جمع کردن فهرست سیاهه",
+  "navigation_panel.expand_followed_tags": "گسترش فهرست برچسب‌های پی‌گرفته",
+  "navigation_panel.expand_lists": "گسترش فهرست سیاهه",
   "not_signed_in_indicator.not_signed_in": "برای دسترسی به این منبع باید وارد شوید.",
   "notification.admin.report": "{name}، {target} را گزارش داد",
   "notification.admin.report_account": "{name} {count, plural, one {یک پست} other {پست}} از {target} برای {category} را گزارش داد",
@@ -587,6 +591,7 @@
   "notification.label.mention": "اشاره",
   "notification.label.private_mention": "اشارهٔ خصوصی",
   "notification.label.private_reply": "پاسخ خصوصی",
+  "notification.label.quote": "{name} فرسته‌تان را نقل کرد",
   "notification.label.reply": "پاسخ",
   "notification.mention": "اشاره",
   "notification.mentioned_you": "‫{name}‬ از شما نام برد",
@@ -644,6 +649,7 @@
   "notifications.column_settings.mention": "اشاره‌ها:",
   "notifications.column_settings.poll": "نتایج نظرسنجی:",
   "notifications.column_settings.push": "آگاهی‌های ارسالی",
+  "notifications.column_settings.quote": "نقل‌قول‌ها:",
   "notifications.column_settings.reblog": "تقویت‌ها:",
   "notifications.column_settings.show": "نمایش در ستون",
   "notifications.column_settings.sound": "پخش صدا",
@@ -674,7 +680,7 @@
   "notifications.policy.filter_limited_accounts_title": "حساب‌های مدیریت شده",
   "notifications.policy.filter_new_accounts.hint": "ساخته شده در {days, plural, one {یک} other {#}} روز اخیر",
   "notifications.policy.filter_new_accounts_title": "حساب‌های جدید",
-  "notifications.policy.filter_not_followers_hint": "از جمله کسانی که کم‌تر از {days, plural, one {یک} other {#}} روز است پی‌تان می‌گیرند",
+  "notifications.policy.filter_not_followers_hint": "از جمله کسانی که کم‌تر از {days, plural, one {یک} other {#}} روز است پیتان می‌گیرند",
   "notifications.policy.filter_not_followers_title": "کسانی که شما را دنبال میکنند",
   "notifications.policy.filter_not_following_hint": "تا به صورت دستی تأییدشان کنید",
   "notifications.policy.filter_not_following_title": "کسانی که پی نمی‌گیرید",
@@ -720,7 +726,6 @@
   "privacy.public.long": "هرکسی در و بیرون از ماستودون",
   "privacy.public.short": "عمومی",
   "privacy.unlisted.additional": "درست مثل عمومی رفتار می‌کند؛ جز این که فرسته در برچسب‌ها یا خوراک‌های زنده، کشف یا جست‌وجوی ماستودون ظاهر نخواهد شد. حتا اگر کلیّت نمایه‌تان اجازه داده باشد.",
-  "privacy.unlisted.long": "سروصدای الگوریتمی کم‌تر",
   "privacy.unlisted.short": "عمومی ساکت",
   "privacy_policy.last_updated": "آخرین به‌روز رسانی در {date}",
   "privacy_policy.title": "سیاست محرمانگی",
@@ -743,7 +748,7 @@
   "reply_indicator.cancel": "لغو",
   "reply_indicator.poll": "نظرسنجی",
   "report.block": "انسداد",
-  "report.block_explanation": "شما فرسته‌هایشان را نخواهید دید. آن‌ها نمی‌توانند فرسته‌هایتان را ببینند یا شما را پی‌بگیرند. آنها می‌توانند بگویند که مسدود شده‌اند.",
+  "report.block_explanation": "فرسته‌هایش را نخواهید دید. نخواهد توانست فرسته‌هایتان را دیده یا پیتان بگیرد. قادر است تشخیص دهد مسدود شده.",
   "report.categories.legal": "حقوقی",
   "report.categories.other": "غیره",
   "report.categories.spam": "هرزنامه",
@@ -757,7 +762,7 @@
   "report.forward": "فرستادن به {target}",
   "report.forward_hint": "این حساب در کارساز دیگری ثبت شده. آیا می‌خواهید رونوشتی ناشناس از این گزارش به آن‌جا هم فرستاده شود؟",
   "report.mute": "خموش",
-  "report.mute_explanation": "شما فرسته‌های آن‌ها را نخواهید دید. آن‌ها همچنان می‌توانند شما را پی‌بگیرند و فرسته‌هایتان را ببینند و نمی‌دانند که خموش شده‌اند.",
+  "report.mute_explanation": "فرسته‌هایش را نخواهید دید. همچنان خواهد توانست پیتان گرفته و فرسته‌هایتان را ببیند. نخواهد دانست که خموش شده.",
   "report.next": "بعدی",
   "report.placeholder": "توضیحات اضافه",
   "report.reasons.dislike": "من آن را دوست ندارم",
@@ -792,6 +797,7 @@
   "report_notification.categories.violation": "تخطّی از قانون",
   "report_notification.categories.violation_sentence": "تخطّی از قانون",
   "report_notification.open": "گشودن گزارش",
+  "search.clear": "پاک‌سازی جست‌وجو",
   "search.no_recent_searches": "جست‌وجوی اخیری نیست",
   "search.placeholder": "جست‌وجو",
   "search.quick_action.account_search": "نمایه‌های جور با {x}",
@@ -858,10 +864,15 @@
   "status.mute_conversation": "خموشاندن گفت‌وگو",
   "status.open": "گسترش این فرسته",
   "status.pin": "سنجاق به نمایه",
-  "status.quote_post_author": "فرسته توسط {name}",
+  "status.quote": "نقل‌قول",
+  "status.quote.cancel": "لغو نقل",
+  "status.quote_error.filtered": "نهفته بنا بر یکی از پالایه‌هایتان",
+  "status.quote_error.not_available": "فرسته در دسترس نیست",
+  "status.quote_error.pending_approval": "فرسته منتظر",
+  "status.quote_policy_change": "تغییر کسانی که می‌توانند نقل کنند",
+  "status.quote_post_author": "فرسته‌ای از @{name} نقل شد",
   "status.read_more": "بیشتر بخوانید",
   "status.reblog": "تقویت",
-  "status.reblog_private": "تقویت برای مخاطبان نخستین",
   "status.reblogged_by": "‫{name}‬ تقویت کرد",
   "status.reblogs": "{count, plural, one {تقویت} other {تقویت}}",
   "status.reblogs.empty": "هنوز هیچ کسی این فرسته را تقویت نکرده است. وقتی کسی چنین کاری کند، این‌جا نمایش داده خواهد شد.",
@@ -873,6 +884,7 @@
   "status.reply": "پاسخ",
   "status.replyAll": "پاسخ به رشته",
   "status.report": "گزارش ‎@{name}",
+  "status.revoke_quote": "حذف فرسته‌ام از فرسته @{name}",
   "status.sensitive_warning": "محتوای حساس",
   "status.share": "هم‌رسانی",
   "status.show_less_all": "نمایش کمتر همه",
@@ -932,5 +944,11 @@
   "video.skip_forward": "پرش به پیش",
   "video.unmute": "ناخموشی",
   "video.volume_down": "کاهش حجم صدا",
-  "video.volume_up": "افزایش حجم صدا"
+  "video.volume_up": "افزایش حجم صدا",
+  "visibility_modal.button_title": "تنظیم نمایانی",
+  "visibility_modal.header": "نمایانی و برهم‌کنش",
+  "visibility_modal.helper.unlisted_quoting": "هنگامی که افراد نقلتان می‌کنند فرسته‌شان هم از خط‌زمانی‌های داغ پنهان خواهد بود.",
+  "visibility_modal.quote_followers": "فقط پی‌گیرندگان",
+  "visibility_modal.quote_public": "هرکسی",
+  "visibility_modal.save": "ذخیره"
 }
diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json
index 7de3fc07ea9..4cdcece7fe3 100644
--- a/app/javascript/mastodon/locales/fi.json
+++ b/app/javascript/mastodon/locales/fi.json
@@ -28,6 +28,7 @@
   "account.disable_notifications": "Lopeta ilmoittamasta minulle, kun @{name} julkaisee",
   "account.domain_blocking": "Verkkotunnus estetty",
   "account.edit_profile": "Muokkaa profiilia",
+  "account.edit_profile_short": "Muokkaa",
   "account.enable_notifications": "Ilmoita minulle, kun @{name} julkaisee",
   "account.endorse": "Suosittele profiilissa",
   "account.familiar_followers_many": "Seuraajina {name1}, {name2} ja {othersCount, plural, one {1 muu, jonka tunnet} other {# muuta, jotka tunnet}}",
@@ -40,6 +41,11 @@
   "account.featured_tags.last_status_never": "Ei julkaisuja",
   "account.follow": "Seuraa",
   "account.follow_back": "Seuraa takaisin",
+  "account.follow_back_short": "Seuraa takaisin",
+  "account.follow_request": "Pyydä lupaa seurata",
+  "account.follow_request_cancel": "Peruuta pyyntö",
+  "account.follow_request_cancel_short": "Peruuta",
+  "account.follow_request_short": "Pyyntö",
   "account.followers": "Seuraajat",
   "account.followers.empty": "Kukaan ei seuraa tätä käyttäjää vielä.",
   "account.followers_counter": "{count, plural, one {{counter} seuraaja} other {{counter} seuraajaa}}",
@@ -70,7 +76,6 @@
   "account.posts_with_replies": "Julkaisut ja vastaukset",
   "account.remove_from_followers": "Poista {name} seuraajista",
   "account.report": "Raportoi @{name}",
-  "account.requested": "Odottaa hyväksyntää. Peruuta seurantapyyntö napsauttamalla",
   "account.requested_follow": "{name} on pyytänyt lupaa seurata sinua",
   "account.requests_to_follow_you": "Pyynnöt seurata sinua",
   "account.share": "Jaa käyttäjän @{name} profiili",
@@ -239,15 +244,25 @@
   "confirmations.missing_alt_text.secondary": "Julkaise silti",
   "confirmations.missing_alt_text.title": "Lisätäänkö vaihtoehtoinen teksti?",
   "confirmations.mute.confirm": "Mykistä",
+  "confirmations.quiet_post_quote_info.dismiss": "Älä muistuta minua uudelleen",
+  "confirmations.quiet_post_quote_info.got_it": "Selvä",
+  "confirmations.quiet_post_quote_info.message": "Kun lainaat vaivihkaa julkisia julkaisuja, oma julkaisusi piilotetaan suosittujen julkaisujen aikajanoilta.",
+  "confirmations.quiet_post_quote_info.title": "Lainataan vaivihkaa julkista julkaisua",
   "confirmations.redraft.confirm": "Poista ja palauta muokattavaksi",
   "confirmations.redraft.message": "Haluatko varmasti poistaa julkaisun ja tehdä siitä luonnoksen? Suosikit ja tehostukset menetetään, ja alkuperäisen julkaisun vastaukset jäävät orvoiksi.",
   "confirmations.redraft.title": "Poistetaanko julkaisu ja palautetaanko se muokattavaksi?",
   "confirmations.remove_from_followers.confirm": "Poista seuraaja",
   "confirmations.remove_from_followers.message": "{name} lakkaa seuraamasta sinua. Haluatko varmasti jatkaa?",
   "confirmations.remove_from_followers.title": "Poistetaanko seuraaja?",
+  "confirmations.revoke_quote.confirm": "Poista julkaisu",
+  "confirmations.revoke_quote.message": "Tätä toimea ei voi peruuttaa.",
+  "confirmations.revoke_quote.title": "Poistetaanko julkaisu?",
+  "confirmations.unblock.confirm": "Kumoa esto",
+  "confirmations.unblock.title": "Kumotaanko käyttäjän {name} esto?",
   "confirmations.unfollow.confirm": "Lopeta seuraaminen",
-  "confirmations.unfollow.message": "Haluatko varmasti lopettaa profiilin {name} seuraamisen?",
-  "confirmations.unfollow.title": "Lopetetaanko käyttäjän seuraaminen?",
+  "confirmations.unfollow.title": "Lopetetaanko käyttäjän {name} seuraaminen?",
+  "confirmations.withdraw_request.confirm": "Peruuta pyyntö",
+  "confirmations.withdraw_request.title": "Peruutetaanko pyyntö seurata käyttäjää {name}?",
   "content_warning.hide": "Piilota julkaisu",
   "content_warning.show": "Näytä kuitenkin",
   "content_warning.show_more": "Näytä lisää",
@@ -289,6 +304,7 @@
   "domain_pill.your_handle": "Käyttäjätunnuksesi:",
   "domain_pill.your_server": "Digitaalinen kotisi, jossa kaikki julkaisusi sijaitsevat. Etkö pidä tästä? Siirry palvelimelta toiselle milloin tahansa ja tuo myös seuraajasi mukanasi.",
   "domain_pill.your_username": "Yksilöllinen tunnisteesi tällä palvelimella. Eri palvelimilta on mahdollista löytää käyttäjiä, joilla on sama käyttäjänimi.",
+  "dropdown.empty": "Valitse vaihtoehto",
   "embed.instructions": "Upota julkaisu verkkosivullesi kopioimalla alla oleva koodi.",
   "embed.preview": "Tältä se näyttää:",
   "emoji_button.activity": "Aktiviteetit",
@@ -311,7 +327,7 @@
   "empty_column.account_featured_other.unknown": "Tämä tili ei suosittele vielä mitään.",
   "empty_column.account_hides_collections": "Käyttäjä on päättänyt pitää nämä tiedot yksityisinä",
   "empty_column.account_suspended": "Tili jäädytetty",
-  "empty_column.account_timeline": "Ei viestejä täällä.",
+  "empty_column.account_timeline": "Ei julkaisuja täällä!",
   "empty_column.account_unavailable": "Profiilia ei ole saatavilla",
   "empty_column.blocks": "Et ole vielä estänyt käyttäjiä.",
   "empty_column.bookmarked_statuses": "Et ole vielä lisännyt julkaisuja kirjanmerkkeihisi. Kun lisäät yhden, se näkyy tässä.",
@@ -424,8 +440,6 @@
   "hints.profiles.see_more_followers": "Näytä lisää seuraajia palvelimella {domain}",
   "hints.profiles.see_more_follows": "Näytä lisää seurattavia palvelimella {domain}",
   "hints.profiles.see_more_posts": "Näytä lisää julkaisuja palvelimella {domain}",
-  "hints.threads.replies_may_be_missing": "Muiden palvelinten vastauksia saattaa puuttua.",
-  "hints.threads.see_more": "Näytä lisää vastauksia palvelimella {domain}",
   "home.column_settings.show_quotes": "Näytä lainaukset",
   "home.column_settings.show_reblogs": "Näytä tehostukset",
   "home.column_settings.show_replies": "Näytä vastaukset",
@@ -447,20 +461,12 @@
   "ignore_notifications_modal.private_mentions_title": "Sivuutetaanko ilmoitukset pyytämättömistä yksityismaininnoista?",
   "info_button.label": "Ohje",
   "info_button.what_is_alt_text": "<h1>Mikä vaihtoehtoinen teksti on?</h1> <p>Vaihtoehtoinen teksti tarjoaa kuvauksen kuvista ihmisille, joilla on näkövamma tai matalan kaistanleveyden yhteys tai jotka kaipaavat lisäkontekstia.</p> <p>Voit parantaa saavutettavuutta ja ymmärrettävyyttä kaikkien näkökulmasta kirjoittamalla selkeän, tiiviin ja objektiivisen vaihtoehtoisen tekstin.</p> <ul> <li>Ota mukaan tärkeät elementit</li> <li>Tiivistä kuvissa oleva teksti</li> <li>Käytä tavallisia lauserakenteita</li> <li>Vältä turhaa tietoa</li> <li>Keskity trendeihin ja keskeisiin tuloksiin monimutkaisissa visuaalisissa esityksissä (kuten kaavioissa tai kartoissa)</li> </ul>",
-  "interaction_modal.action.favourite": "Jotta voit jatkaa, sinun tulee lisätä julkaisu suosikiksesi omalta tililtäsi.",
-  "interaction_modal.action.follow": "Jotta voit jatkaa, sinun tulee seurata käyttäjää omalta tililtäsi.",
-  "interaction_modal.action.reblog": "Jotta voit jatkaa, sinun tulee uudelleenjulkaista omalta tililtäsi.",
-  "interaction_modal.action.reply": "Jotta voit jatkaa, sinun tulee vastata omalta tililtäsi.",
-  "interaction_modal.action.vote": "Jotta voit jatkaa, sinun tulee äänestää omalta tililtäsi.",
+  "interaction_modal.action": "Jotta voit olla vuorovaikutuksessa käyttäjän {name} julkaisun kanssa, sinun on kirjauduttava sisään tilillesi käyttämälläsi Mastodon-palvelimella.",
   "interaction_modal.go": "Siirry",
   "interaction_modal.no_account_yet": "Eikö sinulla ole vielä tiliä?",
   "interaction_modal.on_another_server": "Toisella palvelimella",
   "interaction_modal.on_this_server": "Tällä palvelimella",
-  "interaction_modal.title.favourite": "Lisää käyttäjän {name} julkaisu suosikkeihin",
-  "interaction_modal.title.follow": "Seuraa käyttäjää {name}",
-  "interaction_modal.title.reblog": "Tehosta käyttäjän {name} julkaisua",
-  "interaction_modal.title.reply": "Vastaa käyttäjän {name} julkaisuun",
-  "interaction_modal.title.vote": "Osallistu käyttäjän {name} äänestykseen",
+  "interaction_modal.title": "Jatka kirjautumalla sisään",
   "interaction_modal.username_prompt": "Esim. {example}",
   "intervals.full.days": "{number, plural, one {# päivä} other {# päivää}}",
   "intervals.full.hours": "{number, plural, one {# tunti} other {# tuntia}}",
@@ -481,6 +487,7 @@
   "keyboard_shortcuts.home": "Avaa kotiaikajana",
   "keyboard_shortcuts.hotkey": "Pikanäppäin",
   "keyboard_shortcuts.legend": "Näytä tämä ohje",
+  "keyboard_shortcuts.load_more": "Kohdista ”Lataa lisää” -painikkeeseen",
   "keyboard_shortcuts.local": "Avaa paikallinen aikajana",
   "keyboard_shortcuts.mention": "Mainitse tekijä",
   "keyboard_shortcuts.muted": "Avaa mykistettyjen käyttäjien luettelo",
@@ -489,6 +496,7 @@
   "keyboard_shortcuts.open_media": "Avaa media",
   "keyboard_shortcuts.pinned": "Avaa kiinnitettyjen julkaisujen luettelo",
   "keyboard_shortcuts.profile": "Avaa tekijän profiili",
+  "keyboard_shortcuts.quote": "Lainaa julkaisua",
   "keyboard_shortcuts.reply": "Vastaa julkaisuun",
   "keyboard_shortcuts.requests": "Avaa seurantapyyntöjen luettelo",
   "keyboard_shortcuts.search": "Kohdista hakukenttään",
@@ -500,12 +508,14 @@
   "keyboard_shortcuts.translate": "Käännä julkaisu",
   "keyboard_shortcuts.unfocus": "Poistu kirjoitus- tai hakukentästä",
   "keyboard_shortcuts.up": "Siirry luettelossa taaksepäin",
+  "learn_more_link.got_it": "Selvä",
+  "learn_more_link.learn_more": "Lue lisää",
   "lightbox.close": "Sulje",
   "lightbox.next": "Seuraava",
   "lightbox.previous": "Edellinen",
   "lightbox.zoom_in": "Näytä todellisen kokoisena",
   "lightbox.zoom_out": "Näytä sovitettuna",
-  "limited_account_hint.action": "Näytä profiili joka tapauksessa",
+  "limited_account_hint.action": "Näytä profiili kuitenkin",
   "limited_account_hint.title": "Palvelimen {domain} moderaattorit ovat piilottaneet tämän profiilin.",
   "link_preview.author": "Tehnyt {name}",
   "link_preview.more_from_author": "Lisää tekijältä {name}",
@@ -600,6 +610,7 @@
   "notification.label.mention": "Maininta",
   "notification.label.private_mention": "Yksityismaininta",
   "notification.label.private_reply": "Yksityinen vastaus",
+  "notification.label.quote": "{name} lainasi julkaisuasi",
   "notification.label.reply": "Vastaus",
   "notification.mention": "Maininta",
   "notification.mentioned_you": "{name} mainitsi sinut",
@@ -614,6 +625,7 @@
   "notification.moderation_warning.action_suspend": "Tilisi on jäädytetty.",
   "notification.own_poll": "Äänestyksesi on päättynyt",
   "notification.poll": "Äänestys, johon osallistuit, on päättynyt",
+  "notification.quoted_update": "{name} muokkasi lainaamaasi julkaisua",
   "notification.reblog": "{name} tehosti julkaisuasi",
   "notification.reblog.name_and_others_with_link": "{name} ja <a>{count, plural, one {# muu} other {# muuta}}</a> tehostivat julkaisuasi",
   "notification.relationships_severance_event": "Menetettiin yhteydet palvelimeen {name}",
@@ -657,6 +669,7 @@
   "notifications.column_settings.mention": "Maininnat:",
   "notifications.column_settings.poll": "Äänestystulokset:",
   "notifications.column_settings.push": "Puskuilmoitukset",
+  "notifications.column_settings.quote": "Lainaukset:",
   "notifications.column_settings.reblog": "Tehostukset:",
   "notifications.column_settings.show": "Näytä sarakkeessa",
   "notifications.column_settings.sound": "Äänimerkki",
@@ -732,11 +745,18 @@
   "privacy.private.short": "Seuraajat",
   "privacy.public.long": "Kuka tahansa Mastodonissa ja sen ulkopuolella",
   "privacy.public.short": "Julkinen",
+  "privacy.quote.anyone": "{visibility}, kuka vain voi lainata",
+  "privacy.quote.disabled": "{visibility}, lainaukset poissa käytöstä",
+  "privacy.quote.limited": "{visibility}, lainauksia rajoitettu",
   "privacy.unlisted.additional": "Tämä toimii muuten kuin julkinen, mutta julkaisut eivät näy livesyöte-, aihetunniste- tai selausnäkymissä eivätkä Mastodonin hakutuloksissa, vaikka ne olisivat käyttäjätililläsi yleisesti sallittuina.",
-  "privacy.unlisted.long": "Vähemmän algoritmiperusteista sisältöä",
-  "privacy.unlisted.short": "Vaivihkaisesti julkinen",
+  "privacy.unlisted.long": "Piilotettu Mastodonin hakutuloksista, trendeistä ja julkisilta aikajanoilta",
+  "privacy.unlisted.short": "Vaivihkaa julkinen",
   "privacy_policy.last_updated": "Päivitetty viimeksi {date}",
   "privacy_policy.title": "Tietosuojakäytäntö",
+  "quote_error.poll": "Äänestysten lainaaminen ei ole sallittua.",
+  "quote_error.quote": "Vain yksi lainaus kerrallaan on sallittu.",
+  "quote_error.unauthorized": "Sinulla ei ole valtuuksia lainata tätä julkaisua.",
+  "quote_error.upload": "Medialiitteiden lainaaminen ei ole sallittua.",
   "recommended": "Suositellaan",
   "refresh": "Päivitä",
   "regeneration_indicator.please_stand_by": "Ole valmiina.",
@@ -752,11 +772,14 @@
   "relative_time.minutes": "{number} min",
   "relative_time.seconds": "{number} s",
   "relative_time.today": "tänään",
+  "remove_quote_hint.button_label": "Selvä",
+  "remove_quote_hint.message": "Voit tehdä sen {icon}-valikosta.",
+  "remove_quote_hint.title": "Haluatko poistaa lainatun julkaisusi?",
   "reply_indicator.attachments": "{count, plural, one {# liite} other {# liitettä}}",
   "reply_indicator.cancel": "Peruuta",
   "reply_indicator.poll": "Äänestys",
   "report.block": "Estä",
-  "report.block_explanation": "Et näe hänen viestejään, eikä hän voi nähdä viestejäsi tai seurata sinua. Hän näkee, että olet estänyt hänet.",
+  "report.block_explanation": "Et näe hänen julkaisujaan. Hän ei voi nähdä julkaisujasi eikä seurata sinua. Hän näkee, että olet estänyt hänet.",
   "report.categories.legal": "Lakiseikat",
   "report.categories.other": "Muu",
   "report.categories.spam": "Roskaposti",
@@ -843,13 +866,23 @@
   "status.admin_account": "Avaa tilin @{name} moderointinäkymä",
   "status.admin_domain": "Avaa palvelimen {domain} moderointinäkymä",
   "status.admin_status": "Avaa julkaisu moderointinäkymässä",
+  "status.all_disabled": "Tehostukset ja lainaukset ovat poissa käytöstä",
   "status.block": "Estä @{name}",
   "status.bookmark": "Lisää kirjanmerkki",
   "status.cancel_reblog_private": "Peru tehostus",
+  "status.cannot_quote": "Sinulla ei ole oikeutta lainata tätä julkaisua",
   "status.cannot_reblog": "Tätä julkaisua ei voi tehostaa",
+  "status.contains_quote": "Sisältää lainauksen",
+  "status.context.loading": "Ladataan lisää vastauksia",
+  "status.context.loading_error": "Ei voitu ladata lisää vastauksia",
+  "status.context.loading_success": "Kaikki vastaukset ladattu",
+  "status.context.more_replies_found": "Löytyi lisää vastauksia",
+  "status.context.retry": "Yritä uudelleen",
+  "status.context.show": "Näytä",
   "status.continued_thread": "Jatkoi ketjua",
   "status.copy": "Kopioi linkki julkaisuun",
   "status.delete": "Poista",
+  "status.delete.success": "Julkaisu poistettu",
   "status.detailed_status": "Yksityiskohtainen keskustelunäkymä",
   "status.direct": "Mainitse @{name} yksityisesti",
   "status.direct_indicator": "Yksityismaininta",
@@ -872,27 +905,43 @@
   "status.mute_conversation": "Mykistä keskustelu",
   "status.open": "Laajenna julkaisu",
   "status.pin": "Kiinnitä profiiliin",
+  "status.quote": "Lainaa",
+  "status.quote.cancel": "Peruuta lainaus",
   "status.quote_error.filtered": "Piilotettu jonkin asettamasi suodattimen takia",
-  "status.quote_error.not_found": "Tätä julkaisua ei voi näyttää.",
-  "status.quote_error.pending_approval": "Tämä julkaisu odottaa alkuperäisen tekijänsä hyväksyntää.",
-  "status.quote_error.rejected": "Tätä julkaisua ei voi näyttää, sillä sen alkuperäinen tekijä ei salli lainattavan julkaisua.",
-  "status.quote_error.removed": "Tekijä on poistanut julkaisun.",
-  "status.quote_error.unauthorized": "Tätä julkaisua ei voi näyttää, koska sinulla ei ole oikeutta tarkastella sitä.",
-  "status.quote_post_author": "Julkaisu käyttäjältä {name}",
+  "status.quote_error.limited_account_hint.action": "Näytä kuitenkin",
+  "status.quote_error.limited_account_hint.title": "Palvelimen {domain} moderaattorit ovat piilottaneet tämän profiilin.",
+  "status.quote_error.not_available": "Julkaisu ei saatavilla",
+  "status.quote_error.pending_approval": "Julkaisu odottaa",
+  "status.quote_error.pending_approval_popout.body": "Mastodonissa voit hallita, voiko joku lainata sinua. Tämä julkaisu on vireillä siihen asti, että saamme alkuperäisen tekijän hyväksynnän.",
+  "status.quote_error.revoked": "Tekijä on poistanut julkaisun",
+  "status.quote_followers_only": "Vain seuraajat voivat lainata tätä julkaisua",
+  "status.quote_manual_review": "Tekijä arvioi pyynnön manuaalisesti",
+  "status.quote_noun": "Lainaus",
+  "status.quote_policy_change": "Vaihda, kuka voi lainata",
+  "status.quote_post_author": "Lainaa käyttäjän @{name} julkaisua",
+  "status.quote_private": "Yksityisiä julkaisuja ei voi lainata",
+  "status.quotes": "{count, plural, one {lainaus} other {lainausta}}",
+  "status.quotes.empty": "Kukaan ei ole vielä lainannut tätä julkaisua. Kun joku tekee niin, se tulee tähän näkyviin.",
+  "status.quotes.local_other_disclaimer": "Tekijän hylkäämiä lainauksia ei näytetä.",
+  "status.quotes.remote_other_disclaimer": "Vain palvelimen {domain} lainaukset näkyvät taatusti tässä. Tekijän hylkäämiä lainauksia ei näytetä.",
   "status.read_more": "Näytä enemmän",
   "status.reblog": "Tehosta",
-  "status.reblog_private": "Tehosta alkuperäiselle yleisölle",
+  "status.reblog_or_quote": "Tehosta tai lainaa",
+  "status.reblog_private": "Jaa uudelleen seuraajiesi kanssa",
   "status.reblogged_by": "{name} tehosti",
   "status.reblogs": "{count, plural, one {tehostus} other {tehostusta}}",
   "status.reblogs.empty": "Kukaan ei ole vielä tehostanut tätä julkaisua. Kun joku tekee niin, tulee hän tähän näkyviin.",
   "status.redraft": "Poista ja palauta muokattavaksi",
   "status.remove_bookmark": "Poista kirjanmerkki",
   "status.remove_favourite": "Poista suosikeista",
+  "status.remove_quote": "Poista",
   "status.replied_in_thread": "Vastasi ketjuun",
   "status.replied_to": "Vastaus käyttäjälle {name}",
   "status.reply": "Vastaa",
   "status.replyAll": "Vastaa ketjuun",
   "status.report": "Raportoi @{name}",
+  "status.request_quote": "Pyydä lupaa lainata",
+  "status.revoke_quote": "Poista julkaisuni käyttäjän @{name} julkaisusta",
   "status.sensitive_warning": "Arkaluonteista sisältöä",
   "status.share": "Jaa",
   "status.show_less_all": "Näytä kaikista vähemmän",
@@ -930,6 +979,7 @@
   "upload_button.label": "Lisää kuvia, video tai äänitiedosto",
   "upload_error.limit": "Tiedostolähetysten rajoitus ylitetty.",
   "upload_error.poll": "Tiedostojen lisääminen äänestysten oheen ei ole sallittua.",
+  "upload_error.quote": "Tiedostojen lähettäminen ei ole sallittua lainauksissa.",
   "upload_form.drag_and_drop.instructions": "Valitse medialiite painamalla välilyöntiä tai enteriä. Vetäessäsi käytä nuolinäppäimiä siirtääksesi medialiitettä vastaavaan suuntaan. Paina välilyöntiä tai enteriä uudelleen pudottaaksesi medialiitteen uuteen kohtaansa, tai peru siirto painamalla escape-näppäintä.",
   "upload_form.drag_and_drop.on_drag_cancel": "Veto peruttiin. Medialiitettä {item} ei siirretty.",
   "upload_form.drag_and_drop.on_drag_end": "Medialiite {item} pudotettiin.",
@@ -952,5 +1002,19 @@
   "video.skip_forward": "Siirry eteenpäin",
   "video.unmute": "Poista mykistys",
   "video.volume_down": "Vähennä äänenvoimakkuutta",
-  "video.volume_up": "Lisää äänenvoimakkuutta"
+  "video.volume_up": "Lisää äänenvoimakkuutta",
+  "visibility_modal.button_title": "Aseta näkyvyys",
+  "visibility_modal.header": "Näkyvyys ja vuorovaikutus",
+  "visibility_modal.helper.direct_quoting": "Muut eivät voi lainata Mastodonissa kirjoitettuja yksityismainintoja.",
+  "visibility_modal.helper.privacy_editing": "Näkyvyyttä ei voi muuttaa julkaisun jälkeen.",
+  "visibility_modal.helper.privacy_private_self_quote": "Yksityisten julkaisujen itselainauksista ei voi tehdä julkisia.",
+  "visibility_modal.helper.private_quoting": "Muut eivät voi lainata Mastodonissa kirjoitettuja, vain seuraajille tarkoitettuja julkaisuja.",
+  "visibility_modal.helper.unlisted_quoting": "Kun ihmiset lainaavat sinua, myös heidän julkaisunsa piilotetaan suosittujen julkaisujen aikajanoilta.",
+  "visibility_modal.instructions": "Määritä, kuka voi olla vuorovaikutuksessa tämän julkaisun kanssa. Voit soveltaa asetuksia kaikkiin tuleviin julkaisuihin siirtymällä kohtaan <link>Asetukset > Julkaisun oletukset</link>.",
+  "visibility_modal.privacy_label": "Näkyvyys",
+  "visibility_modal.quote_followers": "Vain seuraajat",
+  "visibility_modal.quote_label": "Kuka voi lainata",
+  "visibility_modal.quote_nobody": "Vain minä",
+  "visibility_modal.quote_public": "Kuka tahansa",
+  "visibility_modal.save": "Tallenna"
 }
diff --git a/app/javascript/mastodon/locales/fil.json b/app/javascript/mastodon/locales/fil.json
index 48e720de746..37db5a1b159 100644
--- a/app/javascript/mastodon/locales/fil.json
+++ b/app/javascript/mastodon/locales/fil.json
@@ -26,6 +26,9 @@
   "account.edit_profile": "Baguhin ang profile",
   "account.enable_notifications": "Ipaalam sa akin kapag nag-post si @{name}",
   "account.endorse": "I-tampok sa profile",
+  "account.familiar_followers_many": "Sinusundan nina {name1}, {name2}, at {othersCount, plural, one {# iba pa na kilala mo} other {# na iba pa na kilala mo}}",
+  "account.familiar_followers_one": "Sinusindan ni/ng {name1}",
+  "account.familiar_followers_two": "Sinusindan nina {name1} at {name2}",
   "account.featured": "Itinatampok",
   "account.featured_tags.last_status_at": "Huling post noong {date}",
   "account.featured_tags.last_status_never": "Walang mga post",
@@ -34,9 +37,11 @@
   "account.followers": "Mga tagasunod",
   "account.followers.empty": "Wala pang sumusunod sa tagagamit na ito.",
   "account.followers_counter": "{count, plural, one {{counter} tagasunod} other {{counter} tagasunod}}",
+  "account.followers_you_know_counter": "{counter} (na) kilala mo",
   "account.following": "Sinusundan",
   "account.following_counter": "{count, plural, one {{counter} sinusundan} other {{counter} sinusundan}}",
   "account.follows.empty": "Wala pang sinusundan ang tagagamit na ito.",
+  "account.follows_you": "Sinusundan ka",
   "account.go_to_profile": "Pumunta sa profile",
   "account.hide_reblogs": "Itago ang mga pagpapalakas mula sa {name}",
   "account.in_memoriam": "Sa Alaala Ni.",
@@ -55,7 +60,6 @@
   "account.open_original_page": "Buksan ang pinagmulang pahina",
   "account.posts": "Mga post",
   "account.report": "I-ulat si/ang @{name}",
-  "account.requested": "Naghihintay ng pag-apruba. I-click upang ikansela ang hiling sa pagsunod",
   "account.requested_follow": "Hinihiling ni {name} na sundan ka",
   "account.share": "Ibahagi ang profile ni @{name}",
   "account.show_reblogs": "Ipakita ang mga pagpapalakas mula sa/kay {name}",
@@ -127,12 +131,14 @@
   "compose_form.reply": "Tumugon",
   "compose_form.spoiler.marked": "Tanggalin ang babala sa nilalaman",
   "compose_form.spoiler.unmarked": "Idagdag ang babala sa nilalaman",
+  "compose_form.spoiler_placeholder": "Babala sa nilalaman (hindi kinailangan)",
   "confirmation_modal.cancel": "Pagpaliban",
   "confirmations.block.confirm": "Harangan",
   "confirmations.delete.message": "Sigurado ka bang gusto mong burahin ang post na ito?",
   "confirmations.delete_list.confirm": "Tanggalin",
   "confirmations.delete_list.message": "Sigurado ka bang gusto mong burahin ang listahang ito?",
   "confirmations.discard_edit_media.confirm": "Ipagpaliban",
+  "content_warning.hide": "Itago ang post",
   "content_warning.show_more": "Magpakita ng higit pa",
   "conversation.mark_as_read": "Markahan bilang nabasa na",
   "conversation.open": "Tingnan ang pag-uusap",
@@ -218,8 +224,6 @@
   "home.pending_critical_update.body": "Mangyaring i-update ang iyong serbiro ng Mastodon sa lalong madaling panahon!",
   "interaction_modal.on_another_server": "Sa ibang serbiro",
   "interaction_modal.on_this_server": "Sa serbirong ito",
-  "interaction_modal.title.follow": "Sundan si {name}",
-  "interaction_modal.title.vote": "Bumoto sa botohan ni {name}",
   "intervals.full.days": "{number, plural, one {# araw} other {# na araw}}",
   "intervals.full.hours": "{number, plural, one {# oras} other {# na oras}}",
   "intervals.full.minutes": "{number, plural, one {# minuto} other {# na minuto}}",
@@ -255,6 +259,8 @@
   "notification.mentioned_you": "Binanggit ka ni {name}",
   "notification.moderation-warning.learn_more": "Matuto nang higit pa",
   "notification.moderation_warning": "Mayroong kang natanggap na babala sa pagtitimpi",
+  "notification.reblog": "Pinalakas ang iyong post ni {name}",
+  "notification.reblog.name_and_others_with_link": "Pinalakas ang iyong post ni/ng {name} at <a>{count, plural,one {# iba pa} other {# na iba pa}}</a>",
   "notification.relationships_severance_event.learn_more": "Matuto nang higit pa",
   "notification_requests.accept": "Tanggapin",
   "notification_requests.maximize": "Palakihin",
@@ -342,6 +348,7 @@
   "search_results.see_all": "Ipakita lahat",
   "server_banner.server_stats": "Katayuan ng serbiro:",
   "status.block": "Harangan si @{name}",
+  "status.cannot_reblog": "Hindi maaring mapalakas ang post na ito",
   "status.delete": "Tanggalin",
   "status.direct": "Palihim na banggitin si/ang @{name}",
   "status.direct_indicator": "Palihim na banggit",
@@ -354,6 +361,7 @@
   "status.mention": "Banggitin ang/si @{name}",
   "status.more": "Higit pa",
   "status.read_more": "Basahin ang higit pa",
+  "status.reblogged_by": "Pinapalakas ni/ng {name}",
   "status.reblogs.empty": "Wala pang nagpalakas ng post na ito. Kung may sinumang nagpalakas, makikita sila rito.",
   "status.remove_favourite": "Tanggalin sa mga paborito",
   "status.reply": "Tumugon",
diff --git a/app/javascript/mastodon/locales/fo.json b/app/javascript/mastodon/locales/fo.json
index afd75afc42b..a83cd427632 100644
--- a/app/javascript/mastodon/locales/fo.json
+++ b/app/javascript/mastodon/locales/fo.json
@@ -19,7 +19,7 @@
   "account.badges.group": "Bólkur",
   "account.block": "Banna @{name}",
   "account.block_domain": "Banna økisnavnið {domain}",
-  "account.block_short": "Blokera",
+  "account.block_short": "Banna",
   "account.blocked": "Bannað/ur",
   "account.blocking": "Banni",
   "account.cancel_follow_request": "Strika fylgjaraumbøn",
@@ -28,6 +28,7 @@
   "account.disable_notifications": "Ikki boða mær frá, tá @{name} skrivar",
   "account.domain_blocking": "Banni økisnavn",
   "account.edit_profile": "Broyt vanga",
+  "account.edit_profile_short": "Rætta",
   "account.enable_notifications": "Boða mær frá, tá @{name} skrivar",
   "account.endorse": "Víst á vangamyndini",
   "account.familiar_followers_many": "{name1}, {name2} og {othersCount, plural, one {ein annar/onnur tú kennir} other {# onnur tú kennir}} fylgja",
@@ -40,6 +41,11 @@
   "account.featured_tags.last_status_never": "Einki uppslag",
   "account.follow": "Fylg",
   "account.follow_back": "Fylg aftur",
+  "account.follow_back_short": "Fylg aftur",
+  "account.follow_request": "Umbønir um at fylgja tær",
+  "account.follow_request_cancel": "Strika víðaribeining",
+  "account.follow_request_cancel_short": "Ógilda",
+  "account.follow_request_short": "Áheitan",
   "account.followers": "Fylgjarar",
   "account.followers.empty": "Ongar fylgjarar enn.",
   "account.followers_counter": "{count, plural, one {{counter} fylgjari} other {{counter} fylgjarar}}",
@@ -70,7 +76,6 @@
   "account.posts_with_replies": "Uppsløg og svar",
   "account.remove_from_followers": "Strika {name} av fylgjaralista",
   "account.report": "Melda @{name}",
-  "account.requested": "Bíðar eftir góðkenning. Trýst fyri at angra umbønina",
   "account.requested_follow": "{name} hevur biðið um at fylgja tær",
   "account.requests_to_follow_you": "Umbønir um at fylgja tær",
   "account.share": "Deil vanga @{name}'s",
@@ -239,15 +244,25 @@
   "confirmations.missing_alt_text.secondary": "Posta allíkavæl",
   "confirmations.missing_alt_text.title": "Legg alternativan tekst afturat?",
   "confirmations.mute.confirm": "Doyv",
+  "confirmations.quiet_post_quote_info.dismiss": "Ikki minna meg á tað aftur",
+  "confirmations.quiet_post_quote_info.got_it": "Eg skilji",
+  "confirmations.quiet_post_quote_info.message": "Tá tú siterar ein stillan almennan post, verður posturin hjá tær fjaldur frá tíðarlinjum, ið vísa vælumtóktar postar.",
+  "confirmations.quiet_post_quote_info.title": "Sitera stillar almennar postar",
   "confirmations.redraft.confirm": "Sletta og skriva umaftur",
   "confirmations.redraft.message": "Vilt tú veruliga strika hendan postin og í staðin gera hann til eina nýggja kladdu? Yndisfrámerki og framhevjanir blíva burtur, og svar til upprunapostin missa tilknýtið.",
   "confirmations.redraft.title": "Strika & ger nýtt uppskot um post?",
   "confirmations.remove_from_followers.confirm": "Strika fylgjara",
   "confirmations.remove_from_followers.message": "{name} fer ikki longur at fylgja tær. Er tú vís/ur í at tú vilt halda fram?",
   "confirmations.remove_from_followers.title": "Strika fylgjara?",
+  "confirmations.revoke_quote.confirm": "Strika post",
+  "confirmations.revoke_quote.message": "Hendan atgerðin kann ikki angrast.",
+  "confirmations.revoke_quote.title": "Strika post?",
+  "confirmations.unblock.confirm": "Banna ikki",
+  "confirmations.unblock.title": "Banna ikki {name}?",
   "confirmations.unfollow.confirm": "Fylg ikki",
-  "confirmations.unfollow.message": "Ert tú vís/ur í, at tú vil steðga við at fylgja {name}?",
-  "confirmations.unfollow.title": "Gevst at fylgja brúkara?",
+  "confirmations.unfollow.title": "Gevst at fylgja {name}?",
+  "confirmations.withdraw_request.confirm": "Tak umbønina aftur",
+  "confirmations.withdraw_request.title": "Tak umbønina um at fylgja {name} aftur?",
   "content_warning.hide": "Fjal post",
   "content_warning.show": "Vís kortini",
   "content_warning.show_more": "Vís meiri",
@@ -289,6 +304,7 @@
   "domain_pill.your_handle": "Títt hald:",
   "domain_pill.your_server": "Títt talgilda heim, har allir tínir postar liva. Dámar tað ikki hendan? Flyt til ein annan ambætara tá tú hevur hug til tess og tak fylgjarar tínar við eisini.",
   "domain_pill.your_username": "Títt eyðmerki á hesum ambætaranum. Tað er møguligt at finna brúkarar við tí sama brúkaranavninum á ymiskum ambætarum.",
+  "dropdown.empty": "Vel ein møguleika",
   "embed.instructions": "Fell hendan postin inní á tínum vevstaði við at taka avrit av koduni niðanfyri.",
   "embed.preview": "Soleiðis fer tað at síggja út:",
   "emoji_button.activity": "Virksemi",
@@ -424,8 +440,6 @@
   "hints.profiles.see_more_followers": "Sí fleiri fylgjarar á {domain}",
   "hints.profiles.see_more_follows": "Sí fleiri, ið viðkomandi fylgir, á {domain}",
   "hints.profiles.see_more_posts": "Sí fleiri postar á {domain}",
-  "hints.threads.replies_may_be_missing": "Svar frá øðrum ambætarum mangla møguliga.",
-  "hints.threads.see_more": "Sí fleiri svar á {domain}",
   "home.column_settings.show_quotes": "Vís siteringar",
   "home.column_settings.show_reblogs": "Vís lyft",
   "home.column_settings.show_replies": "Vís svar",
@@ -447,20 +461,12 @@
   "ignore_notifications_modal.private_mentions_title": "Lat sum um tú ikki sær fráboðanir frá óbiðnum privatum umrøðum?",
   "info_button.label": "Hjálp",
   "info_button.what_is_alt_text": "<h1>Hvat er alt tekstur?</h1> <p>Alt tekstur lýsir myndir fyri fólki, sum síggja illa, ella sum hava ringt net samband ella tey, sum vilja vita meira um samanhangin.</p> <p>Tú kanst bøta um atkomuna og fatanina hjá øllum við at skriva kláran, stuttan og objektivan alt tekst.</p> <ul> <li>Fanga týdningarmikil element</li> <li>Samanfata tekst í myndum</li> <li>Brúka reglubundnan setningsbygnað</li> <li>Lat vera við at siga ting upp í saman</li> <li>Fokusera á rák og høvuðsúrslit í kompleksum myndum (sosum diagrammir og kort)</li> </ul>",
-  "interaction_modal.action.favourite": "Fyri at halda fram, so mást tú yndismerkja frá tínari kontu.",
-  "interaction_modal.action.follow": "Fyri at halda fram, mást tú fylgja frá tínari kontu.",
-  "interaction_modal.action.reblog": "Fyri at halda fram, mást tú endurblogga frá tínari kontu.",
-  "interaction_modal.action.reply": "Fyri at halda fram, mást tú svara frá tínari kontu.",
-  "interaction_modal.action.vote": "Fyri at halda fram, mást tú atkvøða frá tínari kontu.",
+  "interaction_modal.action": "Fyri at samvirka við postin hjá {name}, mást tú rita inn á Mastodon-ambætaranum, sum tú brúkar.",
   "interaction_modal.go": "Far",
   "interaction_modal.no_account_yet": "Hevur tú onga kontu enn?",
   "interaction_modal.on_another_server": "Á øðrum ambætara",
   "interaction_modal.on_this_server": "Á hesum ambætaranum",
-  "interaction_modal.title.favourite": "Dáma postin hjá {name}",
-  "interaction_modal.title.follow": "Fylg {name}",
-  "interaction_modal.title.reblog": "Stimbra postin hjá {name}",
-  "interaction_modal.title.reply": "Svara postinum hjá {name}",
-  "interaction_modal.title.vote": "Atkvøði í spurnarkanningini hjá {name}",
+  "interaction_modal.title": "Rita inn fyri at halda fram",
   "interaction_modal.username_prompt": "T.d. {example}",
   "intervals.full.days": "{number, plural, one {# dagur} other {# dagar}}",
   "intervals.full.hours": "{number, plural, one {# tími} other {# tímar}}",
@@ -481,6 +487,7 @@
   "keyboard_shortcuts.home": "Lat heimatíðarlinju upp",
   "keyboard_shortcuts.hotkey": "Snarknappur",
   "keyboard_shortcuts.legend": "Vís henda tekstin",
+  "keyboard_shortcuts.load_more": "Fokusera á \"Tak meira niður\" knøttin",
   "keyboard_shortcuts.local": "Lat lokala tíðarlinju upp",
   "keyboard_shortcuts.mention": "Nevn rithøvund",
   "keyboard_shortcuts.muted": "Lat upp lista við doyvdum brúkarum",
@@ -489,6 +496,7 @@
   "keyboard_shortcuts.open_media": "Lat miðlar upp",
   "keyboard_shortcuts.pinned": "Lat lista yvir festar postar upp",
   "keyboard_shortcuts.profile": "Lat vangan hjá høvundinum upp",
+  "keyboard_shortcuts.quote": "Sitera post",
   "keyboard_shortcuts.reply": "Svara posti",
   "keyboard_shortcuts.requests": "Lat lista við fylgjaraumbønum upp",
   "keyboard_shortcuts.search": "Fá leitibjálka í miðdepilin",
@@ -500,6 +508,8 @@
   "keyboard_shortcuts.translate": "at umseta ein post",
   "keyboard_shortcuts.unfocus": "Tak skrivi-/leiti-økið úr miðdeplinum",
   "keyboard_shortcuts.up": "Flyt upp á listanum",
+  "learn_more_link.got_it": "Eg skilji",
+  "learn_more_link.learn_more": "Lær meira",
   "lightbox.close": "Lat aftur",
   "lightbox.next": "Fram",
   "lightbox.previous": "Aftur",
@@ -600,6 +610,7 @@
   "notification.label.mention": "Umrøða",
   "notification.label.private_mention": "Privat umrøða",
   "notification.label.private_reply": "Privat svar",
+  "notification.label.quote": "{name} siteraði postin hjá tær",
   "notification.label.reply": "Svara",
   "notification.mention": "Umrøð",
   "notification.mentioned_you": "{name} nevndi teg",
@@ -614,6 +625,7 @@
   "notification.moderation_warning.action_suspend": "Konta tín er ógildað.",
   "notification.own_poll": "Tín atkvøðugreiðsla er endað",
   "notification.poll": "Ein atkvøðugreiðsla, har tú atkvøddi, er endað",
+  "notification.quoted_update": "{name} rættaði ein post, sum tú hevur siterað",
   "notification.reblog": "{name} lyfti tín post",
   "notification.reblog.name_and_others_with_link": "{name} og <a>{count, plural, one {# annar/onnur} other {# onnur}}</a> framhevjaðu tín post",
   "notification.relationships_severance_event": "Mist sambond við {name}",
@@ -657,6 +669,7 @@
   "notifications.column_settings.mention": "Umrøður:",
   "notifications.column_settings.poll": "Úrslit frá atkvøðugreiðslu:",
   "notifications.column_settings.push": "Trýstifráboðanir",
+  "notifications.column_settings.quote": "Sitatir:",
   "notifications.column_settings.reblog": "Stimbranir:",
   "notifications.column_settings.show": "Vís í teigi",
   "notifications.column_settings.sound": "Spæl ljóð",
@@ -732,11 +745,18 @@
   "privacy.private.short": "Fylgjarar",
   "privacy.public.long": "Øll í og uttanfyri Mastodon",
   "privacy.public.short": "Alment",
+  "privacy.quote.anyone": "{visibility}, øll kunnu sitera",
+  "privacy.quote.disabled": "{visibility}, siteringar óvirknar",
+  "privacy.quote.limited": "{visibility}, siteringar avmarkaðar",
   "privacy.unlisted.additional": "Hetta er júst sum almenn, tó verður posturin ikki vístur í samtíðarrásum ella frámerkjum, rannsakan ella Mastodon leitingum, sjálvt um valið er galdandi fyri alla kontuna.",
-  "privacy.unlisted.long": "Færri algoritmiskar fanfarur",
+  "privacy.unlisted.long": "Fjalt frá Mastodon leitiúrslitum og vælumtóktum og almennum tíðarlinjum",
   "privacy.unlisted.short": "Stillur almenningur",
   "privacy_policy.last_updated": "Seinast dagført {date}",
   "privacy_policy.title": "Privatlívspolitikkur",
+  "quote_error.poll": "Tað er ikki loyvt at sitera spurnarkanningar.",
+  "quote_error.quote": "Bara ein sitering er loyvd í senn.",
+  "quote_error.unauthorized": "Tú hevur ikki rættindi at sitera hendan postin.",
+  "quote_error.upload": "Sitering er ikki loyvd um miðlar eru viðheftir.",
   "recommended": "Viðmælt",
   "refresh": "Endurles",
   "regeneration_indicator.please_stand_by": "Bíða við.",
@@ -752,6 +772,9 @@
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "í dag",
+  "remove_quote_hint.button_label": "Eg skilji",
+  "remove_quote_hint.message": "Tú kanst gera tað frá {icon} valmyndini.",
+  "remove_quote_hint.title": "Vilt tú strika siteraða postin hjá tær?",
   "reply_indicator.attachments": "{count, plural, one {# viðfesti} other {# viðfesti}}",
   "reply_indicator.cancel": "Ógilda",
   "reply_indicator.poll": "Atkvøðugreiðsla",
@@ -843,13 +866,23 @@
   "status.admin_account": "Lat kjakleiðaramarkamót upp fyri @{name}",
   "status.admin_domain": "Lat umsjónarmarkamót upp fyri {domain}",
   "status.admin_status": "Lat hendan postin upp í kjakleiðaramarkamótinum",
+  "status.all_disabled": "Stimbranir og sitatir eru gjørd óvirkin",
   "status.block": "Blokera @{name}",
   "status.bookmark": "Goym",
   "status.cancel_reblog_private": "Strika stimbran",
+  "status.cannot_quote": "Tú hevur ikki loyvi at sitera hendan postin",
   "status.cannot_reblog": "Tað ber ikki til at stimbra hendan postin",
+  "status.contains_quote": "Inniheldur sitat",
+  "status.context.loading": "Tekur fleiri svar niður",
+  "status.context.loading_error": "Fekk ikki tikið nýggj svar niður",
+  "status.context.loading_success": "Øll svar tikin niður",
+  "status.context.more_replies_found": "Fleiri svar funnin",
+  "status.context.retry": "Royn aftur",
+  "status.context.show": "Vís",
   "status.continued_thread": "Framhaldandi tráður",
   "status.copy": "Kopiera leinki til postin",
   "status.delete": "Strika",
+  "status.delete.success": "Postur strikaður",
   "status.detailed_status": "Útgreinað samrøðusýni",
   "status.direct": "Umrøð @{name} privat",
   "status.direct_indicator": "Privat umrøða",
@@ -872,27 +905,43 @@
   "status.mute_conversation": "Doyv samrøðu",
   "status.open": "Víðka henda postin",
   "status.pin": "Ger fastan í vangan",
+  "status.quote": "Sitat",
+  "status.quote.cancel": "Ógilda sitat",
   "status.quote_error.filtered": "Eitt av tínum filtrum fjalir hetta",
-  "status.quote_error.not_found": "Tað ber ikki til at vísa hendan postin.",
-  "status.quote_error.pending_approval": "Hesin posturin bíðar eftir góðkenning frá upprunahøvundinum.",
-  "status.quote_error.rejected": "Hesin posturin kann ikki vísast, tí upprunahøvundurin loyvir ikki at posturin verður siteraður.",
-  "status.quote_error.removed": "Hesin posturin var strikaður av høvundinum.",
-  "status.quote_error.unauthorized": "Hesin posturin kann ikki vísast, tí tú hevur ikki rættindi at síggja hann.",
-  "status.quote_post_author": "Postur hjá @{name}",
+  "status.quote_error.limited_account_hint.action": "Vís kortini",
+  "status.quote_error.limited_account_hint.title": "Hendan kontan er fjald av kjakleiðarunum á {domain}.",
+  "status.quote_error.not_available": "Postur ikki tøkur",
+  "status.quote_error.pending_approval": "Postur bíðar",
+  "status.quote_error.pending_approval_popout.body": "Á Mastodon kanst tú avgera, um onkur kann sitera teg. Hesin posturin bíðar eftir góðkenning frá upprunahøvundinum.",
+  "status.quote_error.revoked": "Posturin burturbeindur av høvundinum",
+  "status.quote_followers_only": "Bara fylgjarar kunnu sitera hendan postin",
+  "status.quote_manual_review": "Høvundurin fer at eftirkanna manuelt",
+  "status.quote_noun": "Sitat",
+  "status.quote_policy_change": "Broyt hvør kann sitera",
+  "status.quote_post_author": "Siteraði ein post hjá @{name}",
+  "status.quote_private": "Privatir postar kunnu ikki siterast",
+  "status.quotes": "{count, plural, one {sitat} other {sitat}}",
+  "status.quotes.empty": "Eingin hevur siterað hendan postin enn. Tá onkur siterar postin, verður hann sjónligur her.",
+  "status.quotes.local_other_disclaimer": "Sitatir, sum eru avvíst av høvundanum, verða ikki víst.",
+  "status.quotes.remote_other_disclaimer": "Einans sitatir frá {domain} vera garanterað víst her. Sitatir, sum eru avvíst av høvundanum, verða ikki víst.",
   "status.read_more": "Les meira",
   "status.reblog": "Stimbra",
-  "status.reblog_private": "Stimbra við upprunasýni",
+  "status.reblog_or_quote": "Stimbra ella sitera",
+  "status.reblog_private": "Deil aftur við tínum fylgjarum",
   "status.reblogged_by": "{name} stimbrað",
   "status.reblogs": "{count, plural, one {stimbran} other {stimbranir}}",
   "status.reblogs.empty": "Eingin hevur stimbrað hendan postin enn. Tá onkur stimbrar postin, verður hann sjónligur her.",
   "status.redraft": "Strika & ger nýggja kladdu",
   "status.remove_bookmark": "Gloym",
   "status.remove_favourite": "Strika í yndismerkjum",
+  "status.remove_quote": "Burturbein",
   "status.replied_in_thread": "Svaraði í tráðnum",
   "status.replied_to": "Svaraði {name}",
   "status.reply": "Svara",
   "status.replyAll": "Svara tráðnum",
   "status.report": "Melda @{name}",
+  "status.request_quote": "Fyrispurningur um at sitera",
+  "status.revoke_quote": "Strika postin hjá mær frá postinum hjá @{name}",
   "status.sensitive_warning": "Viðkvæmt tilfar",
   "status.share": "Deil",
   "status.show_less_all": "Vís øllum minni",
@@ -930,6 +979,7 @@
   "upload_button.label": "Legg myndir, sjónfílu ella ljóðfílu afturat",
   "upload_error.limit": "Farið er um markið fyri fíluuppsending.",
   "upload_error.poll": "Ikki loyvt at leggja fílur upp í spurnarkanningum.",
+  "upload_error.quote": "Ikki loyvt at leggja fílur upp við siteringum.",
   "upload_form.drag_and_drop.instructions": "Fyri at heinta eitt miðlaviðfesti, trýst á millumrúm ella returknapp. Meðan tú dregur, brúka pílarnar fyri at flyta miðaviðfesti í einhvønn rætning. Trýst á millumrúm ella returknapp aftur fyri at sleppa miðlaviðfestinum í nýggja staðnum ella trýst á esc-knappin fyri at angra.",
   "upload_form.drag_and_drop.on_drag_cancel": "Draging varð steðgað. Miðlaviðfestið {item} varð slept.",
   "upload_form.drag_and_drop.on_drag_end": "Miðlaviðfestið {item} var slept.",
@@ -952,5 +1002,19 @@
   "video.skip_forward": "Leyp um frameftir",
   "video.unmute": "Doyv ikki",
   "video.volume_down": "Minka ljóðstyrki",
-  "video.volume_up": "Øk um ljóðstyrki"
+  "video.volume_up": "Øk um ljóðstyrki",
+  "visibility_modal.button_title": "Set sýni",
+  "visibility_modal.header": "Sýni og samvirkni",
+  "visibility_modal.helper.direct_quoting": "Privatar umrøður, sum eru skrivaðar á Mastodon, kunnu ikki siterast av øðrum.",
+  "visibility_modal.helper.privacy_editing": "Sýni kann ikki broytast eftir, at ein postur er útgivin.",
+  "visibility_modal.helper.privacy_private_self_quote": "Sjálv-sitering av privatum postum kann ikki gerast almenn.",
+  "visibility_modal.helper.private_quoting": "Postar, sum einans eru fyri fylgjarar á Mastodon, kunnu ikki siterast av øðrum.",
+  "visibility_modal.helper.unlisted_quoting": "Tá fólk sitera teg, so vera teirra postar eisini fjaldir frá tíðarlinjum við ráki.",
+  "visibility_modal.instructions": "Stýr hvør samvirka við hendan postin. Tú kanst eisini áseta stillingar til allar framtíðar postar við at fara til <link>Stillingar > Postingarstillingar</link>.",
+  "visibility_modal.privacy_label": "Sýni",
+  "visibility_modal.quote_followers": "Einans fylgjarar",
+  "visibility_modal.quote_label": "Hvør kann sitera",
+  "visibility_modal.quote_nobody": "Bara eg",
+  "visibility_modal.quote_public": "Ein og hvør",
+  "visibility_modal.save": "Goym"
 }
diff --git a/app/javascript/mastodon/locales/fr-CA.json b/app/javascript/mastodon/locales/fr-CA.json
index cbe3ff33163..d5c282d2f89 100644
--- a/app/javascript/mastodon/locales/fr-CA.json
+++ b/app/javascript/mastodon/locales/fr-CA.json
@@ -68,8 +68,8 @@
   "account.open_original_page": "Ouvrir la page d'origine",
   "account.posts": "Publications",
   "account.posts_with_replies": "Publications et réponses",
+  "account.remove_from_followers": "Retirer {name} des suiveurs",
   "account.report": "Signaler @{name}",
-  "account.requested": "En attente d’approbation. Cliquez pour annuler la demande",
   "account.requested_follow": "{name} a demandé à vous suivre",
   "account.requests_to_follow_you": "Demande a vous suivre",
   "account.share": "Partager le profil de @{name}",
@@ -137,8 +137,8 @@
   "block_modal.title": "Bloquer le compte ?",
   "block_modal.you_wont_see_mentions": "Vous ne verrez pas les messages qui le mentionne.",
   "boost_modal.combo": "Vous pouvez appuyer sur {combo} pour sauter ceci la prochaine fois",
-  "boost_modal.reblog": "Amplifier le message ?",
-  "boost_modal.undo_reblog": "Annuler l'amplification du message ?",
+  "boost_modal.reblog": "Booster le message ?",
+  "boost_modal.undo_reblog": "Annuler le boost du message ?",
   "bundle_column_error.copy_stacktrace": "Copier le rapport d'erreur",
   "bundle_column_error.error.body": "La page demandée n'a pas pu être affichée. Cela pourrait être dû à un bogue dans notre code, ou à un problème de compatibilité avec le navigateur.",
   "bundle_column_error.error.title": "Oh non!",
@@ -218,8 +218,13 @@
   "confirmations.delete_list.confirm": "Supprimer",
   "confirmations.delete_list.message": "Voulez-vous vraiment supprimer définitivement cette liste?",
   "confirmations.delete_list.title": "Supprimer la liste ?",
-  "confirmations.discard_draft.confirm": "Efface et continue",
+  "confirmations.discard_draft.confirm": "Effacer et continuer",
   "confirmations.discard_draft.edit.cancel": "Retour vers l'éditeur",
+  "confirmations.discard_draft.edit.message": "Continued va perdre les changements que vous avez faits dans le message courant.",
+  "confirmations.discard_draft.edit.title": "Jeter les changements faits au message?",
+  "confirmations.discard_draft.post.cancel": "Retour au brouillon",
+  "confirmations.discard_draft.post.message": "En continuant, vous perdez le message que vous êtes en train d'écrire.",
+  "confirmations.discard_draft.post.title": "Jeter le brouillon de message?",
   "confirmations.discard_edit_media.confirm": "Rejeter",
   "confirmations.discard_edit_media.message": "Vous avez des modifications non enregistrées de la description ou de l'aperçu du média, voulez-vous quand même les supprimer?",
   "confirmations.follow_to_list.confirm": "Suivre et ajouter à la liste",
@@ -233,12 +238,25 @@
   "confirmations.missing_alt_text.secondary": "Publier quand-même",
   "confirmations.missing_alt_text.title": "Ajouter un texte alternatif?",
   "confirmations.mute.confirm": "Masquer",
+  "confirmations.quiet_post_quote_info.dismiss": "Ne plus me rappeler",
+  "confirmations.quiet_post_quote_info.got_it": "Compris",
+  "confirmations.quiet_post_quote_info.message": "Lorsque vous citez un message public silencieux, votre message sera caché des fils tendances.",
+  "confirmations.quiet_post_quote_info.title": "Citation de messages publics silencieux",
   "confirmations.redraft.confirm": "Supprimer et réécrire",
   "confirmations.redraft.message": "Êtes-vous sûr·e de vouloir effacer cette publication pour la réécrire? Ses ses mises en favori et boosts seront perdus et ses réponses seront orphelines.",
   "confirmations.redraft.title": "Supprimer et réécrire le message ?",
+  "confirmations.remove_from_followers.confirm": "Supprimer l'abonné·e",
+  "confirmations.remove_from_followers.message": "{name} cessera de vous suivre. Êtes-vous sûr de vouloir continuer ?",
+  "confirmations.remove_from_followers.title": "Supprimer l'abonné·e ?",
+  "confirmations.revoke_quote.confirm": "Retirer la publication",
+  "confirmations.revoke_quote.message": "Cette action ne peut pas être annulée.",
+  "confirmations.revoke_quote.title": "Retirer la publication ?",
+  "confirmations.unblock.confirm": "Débloquer",
+  "confirmations.unblock.title": "Débloquer {name} ?",
   "confirmations.unfollow.confirm": "Ne plus suivre",
-  "confirmations.unfollow.message": "Voulez-vous vraiment arrêter de suivre {name}?",
-  "confirmations.unfollow.title": "Se désabonner de l'utilisateur·rice ?",
+  "confirmations.unfollow.title": "Ne plus suivre {name} ?",
+  "confirmations.withdraw_request.confirm": "Rejeter la demande",
+  "confirmations.withdraw_request.title": "Rejeter la demande de suivre {name} ?",
   "content_warning.hide": "Masquer le message",
   "content_warning.show": "Montrer quand même",
   "content_warning.show_more": "Montrer plus",
@@ -280,6 +298,7 @@
   "domain_pill.your_handle": "Votre identifiant :",
   "domain_pill.your_server": "Votre foyer numérique, là où vos messages résident. Vous souhaitez changer ? Lancez un transfert vers un autre serveur quand vous le voulez et vos abonné·e·s suivront automatiquement.",
   "domain_pill.your_username": "Votre identifiant unique sur ce serveur. Il est possible de rencontrer des utilisateur·rice·s ayant le même nom d'utilisateur sur différents serveurs.",
+  "dropdown.empty": "Sélectionner une option",
   "embed.instructions": "Intégrez cette publication à votre site en copiant le code ci-dessous.",
   "embed.preview": "Voici comment il apparaîtra:",
   "emoji_button.activity": "Activité",
@@ -297,6 +316,9 @@
   "emoji_button.search_results": "Résultats",
   "emoji_button.symbols": "Symboles",
   "emoji_button.travel": "Voyage et lieux",
+  "empty_column.account_featured.me": "Vous n'avez pas encore mis de contenu en avant. Saviez-vous que vous pouviez mettre en avant les hashtags que vous utilisez le plus, et même les comptes de vos amis sur votre profil ?",
+  "empty_column.account_featured.other": "{acct} n'a pas encore mis de contenu en avant. Saviez-vous que vous pouviez mettre en avant les hashtags que vous utilisez le plus, et même les comptes de vos amis sur votre profil ?",
+  "empty_column.account_featured_other.unknown": "Ce compte n'a mis aucun contenu en avant pour l'instant.",
   "empty_column.account_hides_collections": "Cet utilisateur·ice préfère ne pas rendre publiques ces informations",
   "empty_column.account_suspended": "Compte suspendu",
   "empty_column.account_timeline": "Aucune publication ici!",
@@ -325,9 +347,11 @@
   "errors.unexpected_crash.copy_stacktrace": "Copier la trace d'appels dans le presse-papier",
   "errors.unexpected_crash.report_issue": "Signaler un problème",
   "explore.suggested_follows": "Personnes",
+  "explore.title": "Tendances",
   "explore.trending_links": "Nouvelles",
   "explore.trending_statuses": "Messages",
   "explore.trending_tags": "Hashtags",
+  "featured_carousel.header": "{count, plural, one {Pinned Post} other {Pinned Posts}}",
   "featured_carousel.next": "Suivant",
   "featured_carousel.post": "Poste",
   "featured_carousel.previous": "Précédent",
@@ -384,6 +408,8 @@
   "generic.saved": "Sauvegardé",
   "getting_started.heading": "Pour commencer",
   "hashtag.admin_moderation": "Ouvrir l'interface de modération pour #{name}",
+  "hashtag.browse": "Parcourir les posts dans #{hashtag}",
+  "hashtag.browse_from_account": "Parcourir les posts de @{name} dans #{hashtag}",
   "hashtag.column_header.tag_mode.all": "et {additional}",
   "hashtag.column_header.tag_mode.any": "ou {additional}",
   "hashtag.column_header.tag_mode.none": "sans {additional}",
@@ -396,7 +422,10 @@
   "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.feature": "Mettre en avant sur votre profil",
   "hashtag.follow": "Suivre ce hashtag",
+  "hashtag.mute": "Mettre #{hashtag} en sourdine",
+  "hashtag.unfeature": "Ne plus mettre en avant sur votre profil",
   "hashtag.unfollow": "Ne plus suivre ce hashtag",
   "hashtags.and_other": "…et {count, plural, other {# de plus}}",
   "hints.profiles.followers_may_be_missing": "Les abonné·e·s à ce profil peuvent être manquant·e·s.",
@@ -405,8 +434,7 @@
   "hints.profiles.see_more_followers": "Afficher plus d'abonné·e·s sur {domain}",
   "hints.profiles.see_more_follows": "Afficher plus d'abonné·e·s sur {domain}",
   "hints.profiles.see_more_posts": "Voir plus de messages sur {domain}",
-  "hints.threads.replies_may_be_missing": "Les réponses provenant des autres serveurs pourraient être manquantes.",
-  "hints.threads.see_more": "Afficher plus de réponses sur {domain}",
+  "home.column_settings.show_quotes": "Afficher les citations",
   "home.column_settings.show_reblogs": "Afficher boosts",
   "home.column_settings.show_replies": "Afficher réponses",
   "home.hide_announcements": "Masquer les annonces",
@@ -427,20 +455,12 @@
   "ignore_notifications_modal.private_mentions_title": "Ignorer les notifications issues des mentions privées non sollicitées ?",
   "info_button.label": "Aide",
   "info_button.what_is_alt_text": "<h1>Qu'est-ce que le texte alternatif ?</h1> <p>Un texte alternatif fournit une description de l'image aux personnes avec un handicap visuel ou une connexion limitée ou qui souhaitent avoir un contexte supplémentaire.</p> <p>Vous pouvez améliorer l'accessibilité et la compression de tout le monde en écrivant un texte alternatif clair, concis et objectif.</p> <ul> <li>Identifiez les éléments importants</li> <li>Résumez le texte présent à l'image</li> <li>Utilisez une structure de phrase normale</li> <li>Évitez les informations redondantes</li> <li>Pour les visuels complexes (tels que les diagrammes ou les cartes), indiquez les tendances ou points-clés</li> </ul>",
-  "interaction_modal.action.favourite": "Pour continuer, vous devez ajouter en favori depuis votre compte.",
-  "interaction_modal.action.follow": "Pour continuer, vous devez suivre depuis votre compte.",
-  "interaction_modal.action.reblog": "Pour continuer, vous devez booster depuis votre compte.",
-  "interaction_modal.action.reply": "Pour continuer, vous devez répondre depuis votre compte.",
-  "interaction_modal.action.vote": "Pour continuer, vous devez voter depuis votre compte.",
+  "interaction_modal.action": "Pour interagir avec le message de {name}, vous devez vous connecter à votre compte sur le serveur Mastodon que vous utilisez.",
   "interaction_modal.go": "Valider",
   "interaction_modal.no_account_yet": "Vous n'avez pas encore de compte ?",
   "interaction_modal.on_another_server": "Sur un autre serveur",
   "interaction_modal.on_this_server": "Sur ce serveur",
-  "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}",
-  "interaction_modal.title.reply": "Répondre à la publication de {name}",
-  "interaction_modal.title.vote": "Voter pour le sondage de {name}",
+  "interaction_modal.title": "Connectez-vous pour continuer",
   "interaction_modal.username_prompt": "Par exemple : {example}",
   "intervals.full.days": "{number, plural, one {# jour} other {# jours}}",
   "intervals.full.hours": "{number, plural, one {# heure} other {# heures}}",
@@ -461,6 +481,7 @@
   "keyboard_shortcuts.home": "Ouvrir le fil d’accueil",
   "keyboard_shortcuts.hotkey": "Raccourci clavier",
   "keyboard_shortcuts.legend": "Afficher cette légende",
+  "keyboard_shortcuts.load_more": "Bouton Focus \"Charger plus\"",
   "keyboard_shortcuts.local": "Ouvrir le fil local",
   "keyboard_shortcuts.mention": "Mentionner l'auteur·rice",
   "keyboard_shortcuts.muted": "Ouvrir la liste de comptes masqués",
@@ -469,6 +490,7 @@
   "keyboard_shortcuts.open_media": "Ouvrir média",
   "keyboard_shortcuts.pinned": "Ouvrir la liste de publications épinglés",
   "keyboard_shortcuts.profile": "Ouvrir le profil de l’auteur·rice",
+  "keyboard_shortcuts.quote": "Citer la publication",
   "keyboard_shortcuts.reply": "Répondre au message",
   "keyboard_shortcuts.requests": "Ouvrir la liste de demandes d’abonnement",
   "keyboard_shortcuts.search": "Focuser sur le champ de recherche",
@@ -480,6 +502,8 @@
   "keyboard_shortcuts.translate": "traduire un message",
   "keyboard_shortcuts.unfocus": "Ne plus se concentrer sur la zone de rédaction/barre de recherche",
   "keyboard_shortcuts.up": "Monter dans la liste",
+  "learn_more_link.got_it": "Compris",
+  "learn_more_link.learn_more": "En savoir plus",
   "lightbox.close": "Fermer",
   "lightbox.next": "Suivant",
   "lightbox.previous": "Précédent",
@@ -529,8 +553,10 @@
   "mute_modal.you_wont_see_mentions": "Vous ne verrez pas les publications qui le mentionne.",
   "mute_modal.you_wont_see_posts": "Il peut toujours voir vos publications, mais vous ne verrez pas les siennes.",
   "navigation_bar.about": "À propos",
+  "navigation_bar.account_settings": "Mot de passe et sécurité",
   "navigation_bar.administration": "Administration",
   "navigation_bar.advanced_interface": "Ouvrir dans l’interface avancée",
+  "navigation_bar.automated_deletion": "Suppression automatique de messages",
   "navigation_bar.blocks": "Comptes bloqués",
   "navigation_bar.bookmarks": "Signets",
   "navigation_bar.direct": "Mention privée",
@@ -540,13 +566,23 @@
   "navigation_bar.follow_requests": "Demandes d'abonnements",
   "navigation_bar.followed_tags": "Hashtags suivis",
   "navigation_bar.follows_and_followers": "Abonnements et abonnés",
+  "navigation_bar.import_export": "Import et export",
   "navigation_bar.lists": "Listes",
+  "navigation_bar.live_feed_local": "Flux en direct (local)",
+  "navigation_bar.live_feed_public": "Flux en direct (public)",
   "navigation_bar.logout": "Se déconnecter",
   "navigation_bar.moderation": "Modération",
+  "navigation_bar.more": "Plus",
   "navigation_bar.mutes": "Utilisateurs masqués",
   "navigation_bar.opened_in_classic_interface": "Les messages, les comptes et les pages spécifiques sont ouvertes dans l’interface classique.",
   "navigation_bar.preferences": "Préférences",
+  "navigation_bar.privacy_and_reach": "Vie privée et visibilité",
   "navigation_bar.search": "Rechercher",
+  "navigation_bar.search_trends": "Recherche / Tendance",
+  "navigation_panel.collapse_followed_tags": "Réduire le menu des hashtags suivis",
+  "navigation_panel.collapse_lists": "Réduire le menu de la liste",
+  "navigation_panel.expand_followed_tags": "Développer le menu des hashtags suivis",
+  "navigation_panel.expand_lists": "Développer le menu de la liste",
   "not_signed_in_indicator.not_signed_in": "Vous devez vous connecter pour accéder à cette ressource.",
   "notification.admin.report": "{name} a signalé {target}",
   "notification.admin.report_account": "{name} a signalé {count, plural, one {un message} other {# messages}} de {target} pour {category}",
@@ -568,6 +604,7 @@
   "notification.label.mention": "Mention",
   "notification.label.private_mention": "Mention privée",
   "notification.label.private_reply": "Répondre en privé",
+  "notification.label.quote": "{name} a cité votre publication",
   "notification.label.reply": "Réponse",
   "notification.mention": "Mention",
   "notification.mentioned_you": "{name} vous a mentionné·e",
@@ -582,6 +619,7 @@
   "notification.moderation_warning.action_suspend": "Votre compte a été suspendu.",
   "notification.own_poll": "Votre sondage est terminé",
   "notification.poll": "Un sondage auquel vous avez participé vient de se terminer",
+  "notification.quoted_update": "{name} a modifié une publication que vous avez cité",
   "notification.reblog": "{name} a boosté votre message",
   "notification.reblog.name_and_others_with_link": "{name} et <a>{count, plural, one {# autre} other {# autres}}</a> ont boosté votre message",
   "notification.relationships_severance_event": "Connexions perdues avec {name}",
@@ -625,6 +663,7 @@
   "notifications.column_settings.mention": "Mentions:",
   "notifications.column_settings.poll": "Résultats des sondages:",
   "notifications.column_settings.push": "Notifications push",
+  "notifications.column_settings.quote": "Citations:",
   "notifications.column_settings.reblog": "Boosts:",
   "notifications.column_settings.show": "Afficher dans la colonne",
   "notifications.column_settings.sound": "Jouer un son",
@@ -700,11 +739,18 @@
   "privacy.private.short": "Abonnés",
   "privacy.public.long": "Tout le monde sur et en dehors de Mastodon",
   "privacy.public.short": "Public",
+  "privacy.quote.anyone": "{visibility}, n'importe qui peut citer",
+  "privacy.quote.disabled": "{visibility}, citations désactivées",
+  "privacy.quote.limited": "{visibility}, citations limitées",
   "privacy.unlisted.additional": "Se comporte exactement comme « public », sauf que le message n'apparaîtra pas dans les flux en direct, les hashtags, explorer ou la recherche Mastodon, même si vous les avez activé au niveau de votre compte.",
-  "privacy.unlisted.long": "Moins de fanfares algorithmiques",
+  "privacy.unlisted.long": "Caché des résultats de recherche de Mastodon, aux tendances et aux échéanciers publics",
   "privacy.unlisted.short": "Public discret",
   "privacy_policy.last_updated": "Dernière mise à jour {date}",
   "privacy_policy.title": "Politique de confidentialité",
+  "quote_error.poll": "Les citations ne sont pas autorisées avec les sondages.",
+  "quote_error.quote": "Une seule citation à la fois est autorisée.",
+  "quote_error.unauthorized": "Vous n'êtes pas autorisé⋅e à citer cette publication.",
+  "quote_error.upload": "La citation n'est pas autorisée avec un média joint.",
   "recommended": "Recommandé",
   "refresh": "Actualiser",
   "regeneration_indicator.please_stand_by": "Veuillez patienter.",
@@ -720,6 +766,9 @@
   "relative_time.minutes": "{number} min",
   "relative_time.seconds": "{number} s",
   "relative_time.today": "aujourd’hui",
+  "remove_quote_hint.button_label": "Compris",
+  "remove_quote_hint.message": "Vous pouvez le faire à partir du menu des options {icon}.",
+  "remove_quote_hint.title": "Vous voulez supprimer votre message cité ?",
   "reply_indicator.attachments": "{count, plural, one {# pièce jointe} other {# pièces jointes}}",
   "reply_indicator.cancel": "Annuler",
   "reply_indicator.poll": "Sondage",
@@ -773,6 +822,7 @@
   "report_notification.categories.violation": "Infraction aux règles du serveur",
   "report_notification.categories.violation_sentence": "infraction de règle",
   "report_notification.open": "Ouvrir le signalement",
+  "search.clear": "Effacer la recherche",
   "search.no_recent_searches": "Aucune recherche récente",
   "search.placeholder": "Rechercher",
   "search.quick_action.account_search": "Profils correspondant à {x}",
@@ -810,13 +860,23 @@
   "status.admin_account": "Ouvrir l’interface de modération pour @{name}",
   "status.admin_domain": "Ouvrir l’interface de modération pour {domain}",
   "status.admin_status": "Ouvrir ce message dans l’interface de modération",
+  "status.all_disabled": "Partages et citations sont désactivés",
   "status.block": "Bloquer @{name}",
   "status.bookmark": "Ajouter aux signets",
   "status.cancel_reblog_private": "Débooster",
+  "status.cannot_quote": "Vous n'êtes pas autorisé à citer ce message",
   "status.cannot_reblog": "Cette publication ne peut pas être boostée",
+  "status.contains_quote": "Contient la citation",
+  "status.context.loading": "Chargement de réponses supplémentaires",
+  "status.context.loading_error": "Impossible de charger les nouvelles réponses",
+  "status.context.loading_success": "Toutes les réponses sont chargées",
+  "status.context.more_replies_found": "Plus de réponses trouvées",
+  "status.context.retry": "Réessayer",
+  "status.context.show": "Montrer",
   "status.continued_thread": "Suite du fil",
   "status.copy": "Copier un lien vers cette publication",
   "status.delete": "Supprimer",
+  "status.delete.success": "Publication supprimée",
   "status.detailed_status": "Vue détaillée de la conversation",
   "status.direct": "Mention privée @{name}",
   "status.direct_indicator": "Mention privée",
@@ -839,23 +899,43 @@
   "status.mute_conversation": "Masquer la conversation",
   "status.open": "Afficher la publication entière",
   "status.pin": "Épingler sur profil",
-  "status.quote_error.removed": "Ce message a été retiré par son auteur.",
-  "status.quote_error.unauthorized": "Ce message ne peut pas être affiché car vous n'êtes pas autorisé à le voir.",
-  "status.quote_post_author": "Message par {name}",
+  "status.quote": "Citer",
+  "status.quote.cancel": "Annuler la citation",
+  "status.quote_error.filtered": "Caché en raison de l'un de vos filtres",
+  "status.quote_error.limited_account_hint.action": "Afficher quand même",
+  "status.quote_error.limited_account_hint.title": "Ce profil a été masqué par la modération de {domain}.",
+  "status.quote_error.not_available": "Publication non disponible",
+  "status.quote_error.pending_approval": "Publication en attente",
+  "status.quote_error.pending_approval_popout.body": "Sur Mastodon, vous pouvez contrôler si quelqu'un peut vous citer. Ce message est en attente pendant que nous recevons l'approbation de l'auteur original.",
+  "status.quote_error.revoked": "Post supprimé par l'auteur",
+  "status.quote_followers_only": "Seul·e·s les abonné·e·s peuvent citer cette publication",
+  "status.quote_manual_review": "L'auteur va vérifier manuellement",
+  "status.quote_noun": "Citation",
+  "status.quote_policy_change": "Changer qui peut vous citer",
+  "status.quote_post_author": "A cité un message par @{name}",
+  "status.quote_private": "Les publications privées ne peuvent pas être citées",
+  "status.quotes": " {count, plural, one {quote} other {quotes}}",
+  "status.quotes.empty": "Personne n'a encore cité ce message. Quand quelqu'un le fera, il apparaîtra ici.",
+  "status.quotes.local_other_disclaimer": "Les citations rejetées par l'auteur ne seront pas affichées.",
+  "status.quotes.remote_other_disclaimer": "Seules les citations de {domain} sont garanties d'être affichées ici. Les citations rejetées par l'auteur ne seront pas affichées.",
   "status.read_more": "En savoir plus",
   "status.reblog": "Booster",
-  "status.reblog_private": "Booster avec visibilité originale",
+  "status.reblog_or_quote": "Boost ou citation",
+  "status.reblog_private": "Partagez à nouveau avec vos abonnés",
   "status.reblogged_by": "{name} a boosté",
   "status.reblogs": "{count, plural, one {boost} other {boosts}}",
   "status.reblogs.empty": "Personne n’a encore boosté cette publication. Lorsque quelqu’un le fera, elle apparaîtra ici.",
   "status.redraft": "Supprimer et réécrire",
   "status.remove_bookmark": "Retirer des signets",
   "status.remove_favourite": "Retirer des favoris",
+  "status.remove_quote": "Supprimer",
   "status.replied_in_thread": "A répondu dans un fil de discussion",
   "status.replied_to": "A répondu à {name}",
   "status.reply": "Répondre",
   "status.replyAll": "Répondre à cette discussion",
   "status.report": "Signaler @{name}",
+  "status.request_quote": "Demander à citer",
+  "status.revoke_quote": "Retirer mon message du post de @{name}",
   "status.sensitive_warning": "Contenu sensible",
   "status.share": "Partager",
   "status.show_less_all": "Tout replier",
@@ -893,6 +973,7 @@
   "upload_button.label": "Ajouter des images, une vidéo ou un fichier audio",
   "upload_error.limit": "Taille maximale d'envoi de fichier dépassée.",
   "upload_error.poll": "L’envoi de fichiers n’est pas autorisé avec les sondages.",
+  "upload_error.quote": "L’envoi de fichiers n’est pas autorisé avec les sondages.",
   "upload_form.drag_and_drop.instructions": "Pour choisir un média joint, appuyez sur la touche espace ou entrée. Tout en faisant glisser, utilisez les touches fléchées pour déplacer le fichier média dans une direction donnée. Appuyez à nouveau sur la touche espace ou entrée pour déposer le fichier média dans sa nouvelle position, ou appuyez sur la touche Echap pour annuler.",
   "upload_form.drag_and_drop.on_drag_cancel": "Le glissement a été annulé. La pièce jointe {item} n'a pas été ajoutée.",
   "upload_form.drag_and_drop.on_drag_end": "La pièce jointe du média {item} a été déplacée.",
@@ -911,7 +992,23 @@
   "video.mute": "Couper le son",
   "video.pause": "Pause",
   "video.play": "Lecture",
+  "video.skip_backward": "Revenir en arrière",
+  "video.skip_forward": "Avancer",
   "video.unmute": "Rétablir le son",
   "video.volume_down": "Baisser le volume",
-  "video.volume_up": "Augmenter le volume"
+  "video.volume_up": "Augmenter le volume",
+  "visibility_modal.button_title": "Définir la visibilité",
+  "visibility_modal.header": "Visibilité et interactions",
+  "visibility_modal.helper.direct_quoting": "Les mentions privées rédigées sur Mastodon ne peuvent pas être citées par d'autres personnes.",
+  "visibility_modal.helper.privacy_editing": "La visibilité ne peut pas être modifiée après la publication d'un message.",
+  "visibility_modal.helper.privacy_private_self_quote": "Les auto-citations de messages privés ne peuvent pas être rendues publiques.",
+  "visibility_modal.helper.private_quoting": "Les posts accessible uniquement par les followers sur Mastodon ne peuvent être cités par d'autres personnes.",
+  "visibility_modal.helper.unlisted_quoting": "Lorsque les gens vous citent, leur message sera également caché dans les calendriers tendances.",
+  "visibility_modal.instructions": "Contrôlez qui peut interagir avec ce post. Vous pouvez également appliquer ces paramètres à tous les futurs messages en allant dans <link>Préférences > Valeurs par d'éfaut de publication</link>.",
+  "visibility_modal.privacy_label": "Visibilité",
+  "visibility_modal.quote_followers": "Abonné·e·s seulement",
+  "visibility_modal.quote_label": "Autoriser les citations pour",
+  "visibility_modal.quote_nobody": "Juste moi",
+  "visibility_modal.quote_public": "Tout le monde",
+  "visibility_modal.save": "Sauvegarder"
 }
diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json
index ca84ae4ff23..cc70dbc68f2 100644
--- a/app/javascript/mastodon/locales/fr.json
+++ b/app/javascript/mastodon/locales/fr.json
@@ -68,8 +68,8 @@
   "account.open_original_page": "Ouvrir la page d'origine",
   "account.posts": "Messages",
   "account.posts_with_replies": "Messages et réponses",
+  "account.remove_from_followers": "Retirer {name} des suiveurs",
   "account.report": "Signaler @{name}",
-  "account.requested": "En attente d’approbation. Cliquez pour annuler la demande",
   "account.requested_follow": "{name} a demandé à vous suivre",
   "account.requests_to_follow_you": "Demande a vous suivre",
   "account.share": "Partager le profil de @{name}",
@@ -137,8 +137,8 @@
   "block_modal.title": "Bloquer le compte ?",
   "block_modal.you_wont_see_mentions": "Vous ne verrez pas les messages qui le mentionne.",
   "boost_modal.combo": "Vous pouvez appuyer sur {combo} pour passer ceci la prochaine fois",
-  "boost_modal.reblog": "Amplifier le message ?",
-  "boost_modal.undo_reblog": "Annuler l'amplification du message ?",
+  "boost_modal.reblog": "Booster le message ?",
+  "boost_modal.undo_reblog": "Annuler le boost du message ?",
   "bundle_column_error.copy_stacktrace": "Copier le rapport d'erreur",
   "bundle_column_error.error.body": "La page demandée n'a pas pu être affichée. Cela peut être dû à un bogue dans notre code, ou à un problème de compatibilité avec le navigateur.",
   "bundle_column_error.error.title": "Oh non !",
@@ -218,8 +218,13 @@
   "confirmations.delete_list.confirm": "Supprimer",
   "confirmations.delete_list.message": "Voulez-vous vraiment supprimer définitivement cette liste ?",
   "confirmations.delete_list.title": "Supprimer la liste ?",
-  "confirmations.discard_draft.confirm": "Efface et continue",
+  "confirmations.discard_draft.confirm": "Effacer et continuer",
   "confirmations.discard_draft.edit.cancel": "Retour vers l'éditeur",
+  "confirmations.discard_draft.edit.message": "Continued va perdre les changements que vous avez faits dans le message courant.",
+  "confirmations.discard_draft.edit.title": "Jeter les changements faits au message?",
+  "confirmations.discard_draft.post.cancel": "Retour au brouillon",
+  "confirmations.discard_draft.post.message": "En continuant, vous perdez le message que vous êtes en train d'écrire.",
+  "confirmations.discard_draft.post.title": "Jeter le brouillon de message?",
   "confirmations.discard_edit_media.confirm": "Rejeter",
   "confirmations.discard_edit_media.message": "Vous avez des modifications non enregistrées de la description ou de l'aperçu du média, les supprimer quand même ?",
   "confirmations.follow_to_list.confirm": "Suivre et ajouter à la liste",
@@ -233,12 +238,25 @@
   "confirmations.missing_alt_text.secondary": "Publier quand-même",
   "confirmations.missing_alt_text.title": "Ajouter un texte alternatif?",
   "confirmations.mute.confirm": "Masquer",
+  "confirmations.quiet_post_quote_info.dismiss": "Ne plus me rappeler",
+  "confirmations.quiet_post_quote_info.got_it": "Compris",
+  "confirmations.quiet_post_quote_info.message": "Lorsque vous citez un message public silencieux, votre message sera caché des fils tendances.",
+  "confirmations.quiet_post_quote_info.title": "Citation de messages publics silencieux",
   "confirmations.redraft.confirm": "Supprimer et ré-écrire",
   "confirmations.redraft.message": "Voulez-vous vraiment supprimer le message pour le réécrire ? Ses partages ainsi que ses mises en favori seront perdues, et ses réponses seront orphelines.",
   "confirmations.redraft.title": "Supprimer et réécrire le message ?",
+  "confirmations.remove_from_followers.confirm": "Supprimer l'abonné·e",
+  "confirmations.remove_from_followers.message": "{name} cessera de vous suivre. Êtes-vous sûr de vouloir continuer ?",
+  "confirmations.remove_from_followers.title": "Supprimer l'abonné·e ?",
+  "confirmations.revoke_quote.confirm": "Retirer la publication",
+  "confirmations.revoke_quote.message": "Cette action ne peut pas être annulée.",
+  "confirmations.revoke_quote.title": "Retirer la publication ?",
+  "confirmations.unblock.confirm": "Débloquer",
+  "confirmations.unblock.title": "Débloquer {name} ?",
   "confirmations.unfollow.confirm": "Ne plus suivre",
-  "confirmations.unfollow.message": "Voulez-vous vraiment vous désabonner de {name} ?",
-  "confirmations.unfollow.title": "Se désabonner de l'utilisateur·rice ?",
+  "confirmations.unfollow.title": "Ne plus suivre {name} ?",
+  "confirmations.withdraw_request.confirm": "Rejeter la demande",
+  "confirmations.withdraw_request.title": "Rejeter la demande de suivre {name} ?",
   "content_warning.hide": "Masquer le message",
   "content_warning.show": "Montrer quand même",
   "content_warning.show_more": "Montrer plus",
@@ -280,6 +298,7 @@
   "domain_pill.your_handle": "Votre identifiant :",
   "domain_pill.your_server": "Votre foyer numérique, là où vos messages résident. Vous souhaitez changer ? Lancez un transfert vers un autre serveur quand vous le voulez et vos abonné·e·s suivront automatiquement.",
   "domain_pill.your_username": "Votre identifiant unique sur ce serveur. Il est possible de rencontrer des utilisateur·rice·s ayant le même nom d'utilisateur sur différents serveurs.",
+  "dropdown.empty": "Sélectionner une option",
   "embed.instructions": "Intégrez ce message à votre site en copiant le code ci-dessous.",
   "embed.preview": "Il apparaîtra comme cela :",
   "emoji_button.activity": "Activités",
@@ -297,6 +316,9 @@
   "emoji_button.search_results": "Résultats de la recherche",
   "emoji_button.symbols": "Symboles",
   "emoji_button.travel": "Voyage et lieux",
+  "empty_column.account_featured.me": "Vous n'avez pas encore mis de contenu en avant. Saviez-vous que vous pouviez mettre en avant les hashtags que vous utilisez le plus, et même les comptes de vos amis sur votre profil ?",
+  "empty_column.account_featured.other": "{acct} n'a pas encore mis de contenu en avant. Saviez-vous que vous pouviez mettre en avant les hashtags que vous utilisez le plus, et même les comptes de vos amis sur votre profil ?",
+  "empty_column.account_featured_other.unknown": "Ce compte n'a mis aucun contenu en avant pour l'instant.",
   "empty_column.account_hides_collections": "Cet utilisateur·ice préfère ne pas rendre publiques ces informations",
   "empty_column.account_suspended": "Compte suspendu",
   "empty_column.account_timeline": "Aucun message ici !",
@@ -325,9 +347,11 @@
   "errors.unexpected_crash.copy_stacktrace": "Copier la trace d'appels dans le presse-papier",
   "errors.unexpected_crash.report_issue": "Signaler le problème",
   "explore.suggested_follows": "Personnes",
+  "explore.title": "Tendances",
   "explore.trending_links": "Nouvelles",
   "explore.trending_statuses": "Messages",
   "explore.trending_tags": "Hashtags",
+  "featured_carousel.header": "{count, plural, one {Pinned Post} other {Pinned Posts}}",
   "featured_carousel.next": "Suivant",
   "featured_carousel.post": "Poste",
   "featured_carousel.previous": "Précédent",
@@ -384,6 +408,8 @@
   "generic.saved": "Sauvegardé",
   "getting_started.heading": "Pour commencer",
   "hashtag.admin_moderation": "Ouvrir l'interface de modération pour #{name}",
+  "hashtag.browse": "Parcourir les posts dans #{hashtag}",
+  "hashtag.browse_from_account": "Parcourir les posts de @{name} dans #{hashtag}",
   "hashtag.column_header.tag_mode.all": "et {additional}",
   "hashtag.column_header.tag_mode.any": "ou {additional}",
   "hashtag.column_header.tag_mode.none": "sans {additional}",
@@ -396,7 +422,10 @@
   "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.feature": "Mettre en avant sur votre profil",
   "hashtag.follow": "Suivre le hashtag",
+  "hashtag.mute": "Mettre #{hashtag} en sourdine",
+  "hashtag.unfeature": "Ne plus mettre en avant sur votre profil",
   "hashtag.unfollow": "Ne plus suivre le hashtag",
   "hashtags.and_other": "…et {count, plural, other {# de plus}}",
   "hints.profiles.followers_may_be_missing": "Les abonné·e·s à ce profil peuvent être manquant·e·s.",
@@ -405,8 +434,7 @@
   "hints.profiles.see_more_followers": "Afficher plus d'abonné·e·s sur {domain}",
   "hints.profiles.see_more_follows": "Afficher plus d'abonné·e·s sur {domain}",
   "hints.profiles.see_more_posts": "Voir plus de messages sur {domain}",
-  "hints.threads.replies_may_be_missing": "Les réponses provenant des autres serveurs pourraient être manquantes.",
-  "hints.threads.see_more": "Afficher plus de réponses sur {domain}",
+  "home.column_settings.show_quotes": "Afficher les citations",
   "home.column_settings.show_reblogs": "Afficher les partages",
   "home.column_settings.show_replies": "Afficher les réponses",
   "home.hide_announcements": "Masquer les annonces",
@@ -427,20 +455,12 @@
   "ignore_notifications_modal.private_mentions_title": "Ignorer les notifications issues des mentions privées non sollicitées ?",
   "info_button.label": "Aide",
   "info_button.what_is_alt_text": "<h1>Qu'est-ce que le texte alternatif ?</h1> <p>Un texte alternatif fournit une description de l'image aux personnes avec un handicap visuel ou une connexion limitée ou qui souhaitent avoir un contexte supplémentaire.</p> <p>Vous pouvez améliorer l'accessibilité et la compression de tout le monde en écrivant un texte alternatif clair, concis et objectif.</p> <ul> <li>Identifiez les éléments importants</li> <li>Résumez le texte présent à l'image</li> <li>Utilisez une structure de phrase normale</li> <li>Évitez les informations redondantes</li> <li>Pour les visuels complexes (tels que les diagrammes ou les cartes), indiquez les tendances ou points-clés</li> </ul>",
-  "interaction_modal.action.favourite": "Pour continuer, vous devez ajouter en favori depuis votre compte.",
-  "interaction_modal.action.follow": "Pour continuer, vous devez suivre depuis votre compte.",
-  "interaction_modal.action.reblog": "Pour continuer, vous devez booster depuis votre compte.",
-  "interaction_modal.action.reply": "Pour continuer, vous devez répondre depuis votre compte.",
-  "interaction_modal.action.vote": "Pour continuer, vous devez voter depuis votre compte.",
+  "interaction_modal.action": "Pour interagir avec le message de {name}, vous devez vous connecter à votre compte sur le serveur Mastodon que vous utilisez.",
   "interaction_modal.go": "Valider",
   "interaction_modal.no_account_yet": "Vous n'avez pas encore de compte ?",
   "interaction_modal.on_another_server": "Sur un autre serveur",
   "interaction_modal.on_this_server": "Sur ce serveur",
-  "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}",
-  "interaction_modal.title.reply": "Répondre au message de {name}",
-  "interaction_modal.title.vote": "Voter pour le sondage de {name}",
+  "interaction_modal.title": "Connectez-vous pour continuer",
   "interaction_modal.username_prompt": "Par exemple : {example}",
   "intervals.full.days": "{number, plural, one {# jour} other {# jours}}",
   "intervals.full.hours": "{number, plural, one {# heure} other {# heures}}",
@@ -461,6 +481,7 @@
   "keyboard_shortcuts.home": "Ouvrir le fil d’accueil",
   "keyboard_shortcuts.hotkey": "Raccourci clavier",
   "keyboard_shortcuts.legend": "Afficher cet aide-mémoire",
+  "keyboard_shortcuts.load_more": "Bouton Focus \"Charger plus\"",
   "keyboard_shortcuts.local": "Ouvrir le fil public local",
   "keyboard_shortcuts.mention": "Mentionner l’auteur·rice",
   "keyboard_shortcuts.muted": "Ouvrir la liste des comptes masqués",
@@ -469,6 +490,7 @@
   "keyboard_shortcuts.open_media": "Ouvrir le média",
   "keyboard_shortcuts.pinned": "Ouvrir la liste des messages épinglés",
   "keyboard_shortcuts.profile": "Ouvrir le profil de l’auteur·rice",
+  "keyboard_shortcuts.quote": "Citer la publication",
   "keyboard_shortcuts.reply": "Répondre au message",
   "keyboard_shortcuts.requests": "Ouvrir la liste de demandes d’abonnement",
   "keyboard_shortcuts.search": "Se placer dans le champ de recherche",
@@ -480,6 +502,8 @@
   "keyboard_shortcuts.translate": "traduire un message",
   "keyboard_shortcuts.unfocus": "Quitter la zone de rédaction/barre de recherche",
   "keyboard_shortcuts.up": "Monter dans la liste",
+  "learn_more_link.got_it": "Compris",
+  "learn_more_link.learn_more": "En savoir plus",
   "lightbox.close": "Fermer",
   "lightbox.next": "Suivant",
   "lightbox.previous": "Précédent",
@@ -529,8 +553,10 @@
   "mute_modal.you_wont_see_mentions": "Vous ne verrez pas les publications qui le mentionne.",
   "mute_modal.you_wont_see_posts": "Il peut toujours voir vos publications, mais vous ne verrez pas les siennes.",
   "navigation_bar.about": "À propos",
+  "navigation_bar.account_settings": "Mot de passe et sécurité",
   "navigation_bar.administration": "Administration",
   "navigation_bar.advanced_interface": "Ouvrir dans l’interface avancée",
+  "navigation_bar.automated_deletion": "Suppression automatique de messages",
   "navigation_bar.blocks": "Comptes bloqués",
   "navigation_bar.bookmarks": "Marque-pages",
   "navigation_bar.direct": "Mention privée",
@@ -540,13 +566,23 @@
   "navigation_bar.follow_requests": "Demandes d’abonnement",
   "navigation_bar.followed_tags": "Hashtags suivis",
   "navigation_bar.follows_and_followers": "Abonnements et abonnés",
+  "navigation_bar.import_export": "Import et export",
   "navigation_bar.lists": "Listes",
+  "navigation_bar.live_feed_local": "Flux en direct (local)",
+  "navigation_bar.live_feed_public": "Flux en direct (public)",
   "navigation_bar.logout": "Déconnexion",
   "navigation_bar.moderation": "Modération",
+  "navigation_bar.more": "Plus",
   "navigation_bar.mutes": "Comptes masqués",
   "navigation_bar.opened_in_classic_interface": "Les messages, les comptes et les pages spécifiques sont ouvertes dans l’interface classique.",
   "navigation_bar.preferences": "Préférences",
+  "navigation_bar.privacy_and_reach": "Vie privée et visibilité",
   "navigation_bar.search": "Rechercher",
+  "navigation_bar.search_trends": "Recherche / Tendance",
+  "navigation_panel.collapse_followed_tags": "Réduire le menu des hashtags suivis",
+  "navigation_panel.collapse_lists": "Réduire le menu de la liste",
+  "navigation_panel.expand_followed_tags": "Développer le menu des hashtags suivis",
+  "navigation_panel.expand_lists": "Développer le menu de la liste",
   "not_signed_in_indicator.not_signed_in": "Vous devez vous connecter pour accéder à cette ressource.",
   "notification.admin.report": "{name} a signalé {target}",
   "notification.admin.report_account": "{name} a signalé {count, plural, one {un message} other {# messages}} de {target} pour {category}",
@@ -568,6 +604,7 @@
   "notification.label.mention": "Mention",
   "notification.label.private_mention": "Mention privée",
   "notification.label.private_reply": "Répondre en privé",
+  "notification.label.quote": "{name} a cité votre publication",
   "notification.label.reply": "Réponse",
   "notification.mention": "Mention",
   "notification.mentioned_you": "{name} vous a mentionné·e",
@@ -582,6 +619,7 @@
   "notification.moderation_warning.action_suspend": "Votre compte a été suspendu.",
   "notification.own_poll": "Votre sondage est terminé",
   "notification.poll": "Un sondage auquel vous avez participé vient de se terminer",
+  "notification.quoted_update": "{name} a modifié une publication que vous avez cité",
   "notification.reblog": "{name} a partagé votre message",
   "notification.reblog.name_and_others_with_link": "{name} et <a>{count, plural, one {# autre} other {# autres}}</a> ont boosté votre message",
   "notification.relationships_severance_event": "Connexions perdues avec {name}",
@@ -625,6 +663,7 @@
   "notifications.column_settings.mention": "Mentions :",
   "notifications.column_settings.poll": "Résultats des sondages :",
   "notifications.column_settings.push": "Notifications push",
+  "notifications.column_settings.quote": "Citations:",
   "notifications.column_settings.reblog": "Partages :",
   "notifications.column_settings.show": "Afficher dans la colonne",
   "notifications.column_settings.sound": "Jouer un son",
@@ -700,11 +739,18 @@
   "privacy.private.short": "Abonnés",
   "privacy.public.long": "Tout le monde sur et en dehors de Mastodon",
   "privacy.public.short": "Public",
+  "privacy.quote.anyone": "{visibility}, n'importe qui peut citer",
+  "privacy.quote.disabled": "{visibility}, citations désactivées",
+  "privacy.quote.limited": "{visibility}, citations limitées",
   "privacy.unlisted.additional": "Se comporte exactement comme « public », sauf que le message n'apparaîtra pas dans les flux en direct, les hashtags, explorer ou la recherche Mastodon, même si vous les avez activé au niveau de votre compte.",
-  "privacy.unlisted.long": "Moins de fanfares algorithmiques",
+  "privacy.unlisted.long": "Caché des résultats de recherche de Mastodon, aux tendances et aux échéanciers publics",
   "privacy.unlisted.short": "Public discret",
   "privacy_policy.last_updated": "Dernière mise à jour {date}",
   "privacy_policy.title": "Politique de confidentialité",
+  "quote_error.poll": "Les citations ne sont pas autorisées avec les sondages.",
+  "quote_error.quote": "Une seule citation à la fois est autorisée.",
+  "quote_error.unauthorized": "Vous n'êtes pas autorisé⋅e à citer cette publication.",
+  "quote_error.upload": "La citation n'est pas autorisée avec un média joint.",
   "recommended": "Recommandé",
   "refresh": "Actualiser",
   "regeneration_indicator.please_stand_by": "Veuillez patienter.",
@@ -720,6 +766,9 @@
   "relative_time.minutes": "{number} min",
   "relative_time.seconds": "{number} s",
   "relative_time.today": "aujourd’hui",
+  "remove_quote_hint.button_label": "Compris",
+  "remove_quote_hint.message": "Vous pouvez le faire à partir du menu des options {icon}.",
+  "remove_quote_hint.title": "Vous voulez supprimer votre message cité ?",
   "reply_indicator.attachments": "{count, plural, one {# pièce jointe} other {# pièces jointes}}",
   "reply_indicator.cancel": "Annuler",
   "reply_indicator.poll": "Sondage",
@@ -773,6 +822,7 @@
   "report_notification.categories.violation": "Infraction aux règles du serveur",
   "report_notification.categories.violation_sentence": "infraction de règle",
   "report_notification.open": "Ouvrir le signalement",
+  "search.clear": "Effacer la recherche",
   "search.no_recent_searches": "Aucune recherche récente",
   "search.placeholder": "Rechercher",
   "search.quick_action.account_search": "Profils correspondant à {x}",
@@ -810,13 +860,23 @@
   "status.admin_account": "Ouvrir l’interface de modération pour @{name}",
   "status.admin_domain": "Ouvrir l’interface de modération pour {domain}",
   "status.admin_status": "Ouvrir ce message dans l’interface de modération",
+  "status.all_disabled": "Partages et citations sont désactivés",
   "status.block": "Bloquer @{name}",
   "status.bookmark": "Ajouter aux marque-pages",
   "status.cancel_reblog_private": "Annuler le partage",
+  "status.cannot_quote": "Vous n'êtes pas autorisé à citer ce message",
   "status.cannot_reblog": "Ce message ne peut pas être partagé",
+  "status.contains_quote": "Contient la citation",
+  "status.context.loading": "Chargement de réponses supplémentaires",
+  "status.context.loading_error": "Impossible de charger les nouvelles réponses",
+  "status.context.loading_success": "Toutes les réponses sont chargées",
+  "status.context.more_replies_found": "Plus de réponses trouvées",
+  "status.context.retry": "Réessayer",
+  "status.context.show": "Montrer",
   "status.continued_thread": "Suite du fil",
   "status.copy": "Copier le lien vers le message",
   "status.delete": "Supprimer",
+  "status.delete.success": "Publication supprimée",
   "status.detailed_status": "Vue détaillée de la conversation",
   "status.direct": "Mention privée @{name}",
   "status.direct_indicator": "Mention privée",
@@ -839,23 +899,43 @@
   "status.mute_conversation": "Masquer la conversation",
   "status.open": "Afficher le message entier",
   "status.pin": "Épingler sur le profil",
-  "status.quote_error.removed": "Ce message a été retiré par son auteur.",
-  "status.quote_error.unauthorized": "Ce message ne peut pas être affiché car vous n'êtes pas autorisé à le voir.",
-  "status.quote_post_author": "Message par {name}",
-  "status.read_more": "En savoir plus",
+  "status.quote": "Citer",
+  "status.quote.cancel": "Annuler la citation",
+  "status.quote_error.filtered": "Caché en raison de l'un de vos filtres",
+  "status.quote_error.limited_account_hint.action": "Afficher quand même",
+  "status.quote_error.limited_account_hint.title": "Ce profil a été masqué par la modération de {domain}.",
+  "status.quote_error.not_available": "Publication non disponible",
+  "status.quote_error.pending_approval": "Publication en attente",
+  "status.quote_error.pending_approval_popout.body": "Sur Mastodon, vous pouvez contrôler si quelqu'un peut vous citer. Ce message est en attente pendant que nous recevons l'approbation de l'auteur original.",
+  "status.quote_error.revoked": "Post supprimé par l'auteur",
+  "status.quote_followers_only": "Seul·e·s les abonné·e·s peuvent citer cette publication",
+  "status.quote_manual_review": "L'auteur va vérifier manuellement",
+  "status.quote_noun": "Citation",
+  "status.quote_policy_change": "Changer qui peut vous citer",
+  "status.quote_post_author": "A cité un message par @{name}",
+  "status.quote_private": "Les publications privées ne peuvent pas être citées",
+  "status.quotes": " {count, plural, one {quote} other {quotes}}",
+  "status.quotes.empty": "Personne n'a encore cité ce message. Quand quelqu'un le fera, il apparaîtra ici.",
+  "status.quotes.local_other_disclaimer": "Les citations rejetées par l'auteur ne seront pas affichées.",
+  "status.quotes.remote_other_disclaimer": "Seules les citations de {domain} sont garanties d'être affichées ici. Les citations rejetées par l'auteur ne seront pas affichées.",
+  "status.read_more": "Lire la suite",
   "status.reblog": "Partager",
-  "status.reblog_private": "Partager à l’audience originale",
+  "status.reblog_or_quote": "Boost ou citation",
+  "status.reblog_private": "Partagez à nouveau avec vos abonnés",
   "status.reblogged_by": "{name} a partagé",
   "status.reblogs": "{count, plural, one {boost} other {boosts}}",
   "status.reblogs.empty": "Personne n’a encore partagé ce message. Lorsque quelqu’un le fera, il apparaîtra ici.",
   "status.redraft": "Supprimer et réécrire",
   "status.remove_bookmark": "Retirer des marque-pages",
   "status.remove_favourite": "Retirer des favoris",
+  "status.remove_quote": "Supprimer",
   "status.replied_in_thread": "A répondu dans un fil de discussion",
   "status.replied_to": "En réponse à {name}",
   "status.reply": "Répondre",
   "status.replyAll": "Répondre au fil",
   "status.report": "Signaler @{name}",
+  "status.request_quote": "Demander à citer",
+  "status.revoke_quote": "Retirer mon message du post de @{name}",
   "status.sensitive_warning": "Contenu sensible",
   "status.share": "Partager",
   "status.show_less_all": "Tout replier",
@@ -893,6 +973,7 @@
   "upload_button.label": "Ajouter des images, une vidéo ou un fichier audio",
   "upload_error.limit": "Taille maximale d'envoi de fichier dépassée.",
   "upload_error.poll": "L’envoi de fichiers n’est pas autorisé avec les sondages.",
+  "upload_error.quote": "L’envoi de fichiers n’est pas autorisé avec les sondages.",
   "upload_form.drag_and_drop.instructions": "Pour choisir un média joint, appuyez sur la touche espace ou entrée. Tout en faisant glisser, utilisez les touches fléchées pour déplacer le fichier média dans une direction donnée. Appuyez à nouveau sur la touche espace ou entrée pour déposer le fichier média dans sa nouvelle position, ou appuyez sur la touche Echap pour annuler.",
   "upload_form.drag_and_drop.on_drag_cancel": "Le glissement a été annulé. La pièce jointe {item} n'a pas été ajoutée.",
   "upload_form.drag_and_drop.on_drag_end": "La pièce jointe du média {item} a été déplacée.",
@@ -911,7 +992,23 @@
   "video.mute": "Couper le son",
   "video.pause": "Pause",
   "video.play": "Lecture",
+  "video.skip_backward": "Revenir en arrière",
+  "video.skip_forward": "Avancer",
   "video.unmute": "Rétablir le son",
   "video.volume_down": "Baisser le volume",
-  "video.volume_up": "Augmenter le volume"
+  "video.volume_up": "Augmenter le volume",
+  "visibility_modal.button_title": "Définir la visibilité",
+  "visibility_modal.header": "Visibilité et interactions",
+  "visibility_modal.helper.direct_quoting": "Les mentions privées rédigées sur Mastodon ne peuvent pas être citées par d'autres personnes.",
+  "visibility_modal.helper.privacy_editing": "La visibilité ne peut pas être modifiée après la publication d'un message.",
+  "visibility_modal.helper.privacy_private_self_quote": "Les auto-citations de messages privés ne peuvent pas être rendues publiques.",
+  "visibility_modal.helper.private_quoting": "Les posts accessible uniquement par les followers sur Mastodon ne peuvent être cités par d'autres personnes.",
+  "visibility_modal.helper.unlisted_quoting": "Lorsque les gens vous citent, leur message sera également caché dans les calendriers tendances.",
+  "visibility_modal.instructions": "Contrôlez qui peut interagir avec ce post. Vous pouvez également appliquer ces paramètres à tous les futurs messages en allant dans <link>Préférences > Valeurs par d'éfaut de publication</link>.",
+  "visibility_modal.privacy_label": "Visibilité",
+  "visibility_modal.quote_followers": "Abonné·e·s seulement",
+  "visibility_modal.quote_label": "Autoriser les citations pour",
+  "visibility_modal.quote_nobody": "Juste moi",
+  "visibility_modal.quote_public": "Tout le monde",
+  "visibility_modal.save": "Sauvegarder"
 }
diff --git a/app/javascript/mastodon/locales/fy.json b/app/javascript/mastodon/locales/fy.json
index 85d06d063cd..032cdd870fb 100644
--- a/app/javascript/mastodon/locales/fy.json
+++ b/app/javascript/mastodon/locales/fy.json
@@ -70,7 +70,6 @@
   "account.posts_with_replies": "Berjochten en reaksjes",
   "account.remove_from_followers": "{name} as folger fuortsmite",
   "account.report": "@{name} rapportearje",
-  "account.requested": "Wacht op goedkarring. Klik om it folchfersyk te annulearjen",
   "account.requested_follow": "{name} hat dy in folchfersyk stjoerd",
   "account.requests_to_follow_you": "Fersiken om jo te folgjen",
   "account.share": "Profyl fan @{name} diele",
@@ -246,8 +245,6 @@
   "confirmations.remove_from_followers.message": "{name} sil jo net mear folgje. Binne jo wis dat jo trochgean wolle?",
   "confirmations.remove_from_followers.title": "Folger fuortsmite?",
   "confirmations.unfollow.confirm": "Net mear folgje",
-  "confirmations.unfollow.message": "Binne jo wis dat jo {name} net mear folgje wolle?",
-  "confirmations.unfollow.title": "Brûker net mear folgje?",
   "content_warning.hide": "Berjocht ferstopje",
   "content_warning.show": "Dochs toane",
   "content_warning.show_more": "Mear toane",
@@ -424,8 +421,6 @@
   "hints.profiles.see_more_followers": "Besjoch mear folgers op {domain}",
   "hints.profiles.see_more_follows": "Besjoch mear folge accounts op {domain}",
   "hints.profiles.see_more_posts": "Besjoch mear berjochten op {domain}",
-  "hints.threads.replies_may_be_missing": "Antwurden fan oare servers kinne ûntbrekke.",
-  "hints.threads.see_more": "Besjoch mear reaksjes op {domain}",
   "home.column_settings.show_quotes": "Sitaten toane",
   "home.column_settings.show_reblogs": "Boosts toane",
   "home.column_settings.show_replies": "Reaksjes toane",
@@ -447,20 +442,10 @@
   "ignore_notifications_modal.private_mentions_title": "Meldingen negearje fan net frege priveeberjochten?",
   "info_button.label": "Help",
   "info_button.what_is_alt_text": "<h1>Wat is alt-tekst?</h1> <p>Alt-tekst biedt ôfbyldingsbeskriuwingen foar minsken mei in fisuele beheining en ferbiningen mei in lege bânbreedte of foar minsken dy’t nei ekstra kontekst sykje.</p><p>Jo kinne de tagonklikheid en de begryplikheid foar elkenien ferbetterje troch dúdlik, koart en objektyf te skriuwen.</p><ul><li>Beskriuw wichtige eleminten</li><li>Fetsje tekst yn ôfbyldingen gear</li><li>Brûk in normale sinsbou</li><li>Mij oertallige ynformaasje</li><li>Fokusje op trends en wichtige befiningen yn komplekse bylden (lykas diagrammen of kaarten)</li></ul>",
-  "interaction_modal.action.favourite": "Om troch te gaan, moatte jo fan jo eigen account ôf as favoryt markearje.",
-  "interaction_modal.action.follow": "Om troch te gaan, moatte jo fan jo eigen account ôf folgje.",
-  "interaction_modal.action.reblog": "Om troch te gaan, moatte jo fan jo eigen account ôf booste.",
-  "interaction_modal.action.reply": "Om troch te gaan, moatte jo fan jo eigen account ôf reagearje.",
-  "interaction_modal.action.vote": "Om troch te gaan, moatte jo fan jo eigen account ôf as favoryt stimme.",
   "interaction_modal.go": "Gean",
   "interaction_modal.no_account_yet": "Hawwe jo noch gjin account?",
   "interaction_modal.on_another_server": "Op een oare server",
   "interaction_modal.on_this_server": "Op dizze server",
-  "interaction_modal.title.favourite": "Berjocht fan {name} as favoryt markearje",
-  "interaction_modal.title.follow": "{name} folgje",
-  "interaction_modal.title.reblog": "Berjocht fan {name} booste",
-  "interaction_modal.title.reply": "Op it berjocht fan {name} reagearje",
-  "interaction_modal.title.vote": "Stimme yn {name}’s peiling",
   "interaction_modal.username_prompt": "Byg. {example}",
   "intervals.full.days": "{number, plural, one {# dei} other {# dagen}} lyn",
   "intervals.full.hours": "{number, plural, one {# oere} other {# oeren}} lyn",
@@ -564,6 +549,8 @@
   "navigation_bar.follows_and_followers": "Folgers en folgjenden",
   "navigation_bar.import_export": "Ymportearje en eksportearje",
   "navigation_bar.lists": "Listen",
+  "navigation_bar.live_feed_local": "Livefeed (lokaal)",
+  "navigation_bar.live_feed_public": "Livefeed (iepenbier)",
   "navigation_bar.logout": "Ofmelde",
   "navigation_bar.moderation": "Moderaasje",
   "navigation_bar.more": "Mear",
@@ -731,7 +718,6 @@
   "privacy.public.long": "Elkenien op Mastodon en dêrbûten",
   "privacy.public.short": "Iepenbier",
   "privacy.unlisted.additional": "Dit is fergelykber mei iepenbier, útsein dat it berjocht net ferskynt op iepenbiere tiidlijnen of hashtags, ûnder ferkenne of Mastodon sykje, sels as jo jo account dêrfoar ynsteld hawwe.",
-  "privacy.unlisted.long": "Minder algoritmyske fanfare",
   "privacy.unlisted.short": "Minder iepenbier",
   "privacy_policy.last_updated": "Lêst bywurke op {date}",
   "privacy_policy.title": "Privacybelied",
@@ -803,6 +789,7 @@
   "report_notification.categories.violation": "Skeinde regels",
   "report_notification.categories.violation_sentence": "skeinde regels",
   "report_notification.open": "Rapport iepenje",
+  "search.clear": "Sykopdracht wiskje",
   "search.no_recent_searches": "Gjin resinte sykopdrachten",
   "search.placeholder": "Sykje",
   "search.quick_action.account_search": "Accounts dy’t oerienkomme mei {x}",
@@ -870,15 +857,8 @@
   "status.open": "Dit berjocht útklappe",
   "status.pin": "Op profylside fêstsette",
   "status.quote_error.filtered": "Ferburgen troch ien fan jo filters",
-  "status.quote_error.not_found": "Dit berjocht kin net toand wurde.",
-  "status.quote_error.pending_approval": "Dit berjocht is yn ôfwachting fan goedkarring troch de oarspronklike auteur.",
-  "status.quote_error.rejected": "Dit berjocht kin net toand wurde, omdat de oarspronklike auteur net tastiet dat it sitearre wurdt.",
-  "status.quote_error.removed": "Dit berjocht is fuotsmiten troch de auteur.",
-  "status.quote_error.unauthorized": "Dit berjocht kin net toand wurde, omdat jo net it foech hawwe om it te besjen.",
-  "status.quote_post_author": "Berjocht fan {name}",
   "status.read_more": "Mear ynfo",
   "status.reblog": "Booste",
-  "status.reblog_private": "Boost nei oarspronklike ûntfangers",
   "status.reblogged_by": "{name} hat boost",
   "status.reblogs": "{count, plural, one {boost} other {boosts}}",
   "status.reblogs.empty": "Net ien hat dit berjocht noch boost. Wannear’t ien dit docht, falt dat hjir te sjen.",
diff --git a/app/javascript/mastodon/locales/ga.json b/app/javascript/mastodon/locales/ga.json
index 92d06a05cf1..5b0d00d04c6 100644
--- a/app/javascript/mastodon/locales/ga.json
+++ b/app/javascript/mastodon/locales/ga.json
@@ -28,6 +28,7 @@
   "account.disable_notifications": "Éirigh as ag cuir mé in eol nuair bpostálann @{name}",
   "account.domain_blocking": "Fearann a bhlocáil",
   "account.edit_profile": "Cuir an phróifíl in eagar",
+  "account.edit_profile_short": "Cuir in Eagar",
   "account.enable_notifications": "Cuir mé in eol nuair bpostálann @{name}",
   "account.endorse": "Cuir ar an phróifíl mar ghné",
   "account.familiar_followers_many": "Ina dhiaidh sin ag {name1}, {name2}, agus {othersCount, plural, \n    one {duine eile atá aithnid duit} \n    two {# duine eile atá aithnid duit} \n    few {# dhuine eile atá aithnid duit} \n    many {# nduine eile atá aithnid duit} \n    other {# duine eile atá aithnid duit}}",
@@ -40,6 +41,11 @@
   "account.featured_tags.last_status_never": "Gan aon phoist",
   "account.follow": "Lean",
   "account.follow_back": "Leanúint ar ais",
+  "account.follow_back_short": "Lean ar ais",
+  "account.follow_request": "Iarratas chun leanúint",
+  "account.follow_request_cancel": "Cealaigh an t-iarratas",
+  "account.follow_request_cancel_short": "Cealaigh",
+  "account.follow_request_short": "Iarratas",
   "account.followers": "Leantóirí",
   "account.followers.empty": "Ní leanann éinne an t-úsáideoir seo fós.",
   "account.followers_counter": "{count, plural, one {{counter} leantóir} other {{counter} leantóirí}}",
@@ -70,7 +76,6 @@
   "account.posts_with_replies": "Postálacha agus freagraí",
   "account.remove_from_followers": "Bain {name} de na leantóirí",
   "account.report": "Tuairiscigh @{name}",
-  "account.requested": "Ag fanacht le ceadú. Cliceáil chun an iarratas leanúnaí a chealú",
   "account.requested_follow": "D'iarr {name} ort do chuntas a leanúint",
   "account.requests_to_follow_you": "Iarratais chun tú a leanúint",
   "account.share": "Roinn próifíl @{name}",
@@ -239,15 +244,25 @@
   "confirmations.missing_alt_text.secondary": "Post ar aon nós",
   "confirmations.missing_alt_text.title": "Cuir téacs alt leis?",
   "confirmations.mute.confirm": "Balbhaigh",
+  "confirmations.quiet_post_quote_info.dismiss": "Ná cuir i gcuimhne dom arís",
+  "confirmations.quiet_post_quote_info.got_it": "Tuigim é",
+  "confirmations.quiet_post_quote_info.message": "Agus post poiblí ciúin á lua, beidh do phost i bhfolach ó amlínte treochta.",
+  "confirmations.quiet_post_quote_info.title": "Ag lua poist phoiblí chiúine",
   "confirmations.redraft.confirm": "Scrios ⁊ athdhréachtaigh",
   "confirmations.redraft.message": "An bhfuil tú cinnte gur mhaith leat an postáil seo a scriosadh agus é a athdhréachtú? Caillfear ceanáin agus treisithe, agus dílleachtaí freagraí ar an mbunphostála.",
   "confirmations.redraft.title": "Scrios & athdhréachtú postáil?",
   "confirmations.remove_from_followers.confirm": "Bain leantóir",
   "confirmations.remove_from_followers.message": "Scoirfidh {name} de bheith ag leanúint leat. An bhfuil tú cinnte gur mian leat leanúint ar aghaidh?",
   "confirmations.remove_from_followers.title": "Bain an leantóir?",
+  "confirmations.revoke_quote.confirm": "Bain postáil",
+  "confirmations.revoke_quote.message": "Ní féidir an gníomh seo a chealú.",
+  "confirmations.revoke_quote.title": "Bain postáil?",
+  "confirmations.unblock.confirm": "Díbhlocáil",
+  "confirmations.unblock.title": "Díbhlocáil {name}?",
   "confirmations.unfollow.confirm": "Ná lean",
-  "confirmations.unfollow.message": "An bhfuil tú cinnte gur mhaith leat {name} a dhíleanúint?",
-  "confirmations.unfollow.title": "Dílean ​​an t-úsáideoir?",
+  "confirmations.unfollow.title": "Díleanúint {name}?",
+  "confirmations.withdraw_request.confirm": "Iarratas ar tharraingt siar",
+  "confirmations.withdraw_request.title": "Iarratas chun {name} a leanúint a tharraingt siar?",
   "content_warning.hide": "Folaigh postáil",
   "content_warning.show": "Taispeáin ar aon nós",
   "content_warning.show_more": "Taispeáin níos mó",
@@ -289,6 +304,7 @@
   "domain_pill.your_handle": "Do láimhseáil:",
   "domain_pill.your_server": "Do theach digiteach, áit a bhfuil do phoist go léir ina gcónaí. Nach maith leat an ceann seo? Aistrigh freastalaithe am ar bith agus tabhair leat do leantóirí freisin.",
   "domain_pill.your_username": "D'aitheantóir uathúil ar an bhfreastalaí seo. Is féidir teacht ar úsáideoirí leis an ainm úsáideora céanna ar fhreastalaithe éagsúla.",
+  "dropdown.empty": "Roghnaigh rogha",
   "embed.instructions": "Embed this status on your website by copying the code below.",
   "embed.preview": "Seo an chuma a bheidh air:",
   "emoji_button.activity": "Gníomhaíocht",
@@ -424,8 +440,6 @@
   "hints.profiles.see_more_followers": "Féach ar a thuilleadh leantóirí ar {domain}",
   "hints.profiles.see_more_follows": "Féach tuilleadh seo a leanas ar {domain}",
   "hints.profiles.see_more_posts": "Féach ar a thuilleadh postálacha ar {domain}",
-  "hints.threads.replies_may_be_missing": "Seans go bhfuil freagraí ó fhreastalaithe eile in easnamh.",
-  "hints.threads.see_more": "Féach ar a thuilleadh freagraí ar {domain}",
   "home.column_settings.show_quotes": "Taispeáin Sleachta",
   "home.column_settings.show_reblogs": "Taispeáin moltaí",
   "home.column_settings.show_replies": "Taispeán freagraí",
@@ -447,20 +461,12 @@
   "ignore_notifications_modal.private_mentions_title": "An dtugann tú aird ar fhógraí ó Luaintí Príobháideacha gan iarraidh?",
   "info_button.label": "Cabhrú",
   "info_button.what_is_alt_text": "<h1>Cad is téacs altach ann?</h1> <p>Soláthraíonn téacs Alt cur síos ar íomhánna do dhaoine le lagú radhairc, naisc íseal-bandaleithead, nó daoine atá ag lorg comhthéacs breise.</p> <p>Is féidir leat inrochtaineacht agus tuiscint a fheabhsú do chách trí théacs alt soiléir, gonta, oibiachtúil a scríobh.</p> <ul> <li>Glac gnéithe tábhachtacha</li> <li>Déan achoimre ar théacs in íomhánna</li> <li>Úsáid struchtúr abairtí rialta</li> li> <li>Seachain faisnéis iomarcach</li> <li>Fócas ar threochtaí agus ar phríomhthorthaí i bhfíseanna casta (amhail léaráidí nó léarscáileanna)</li> </ul>",
-  "interaction_modal.action.favourite": "Chun leanúint ar aghaidh, ní mór duit an ceann is fearr leat ó do chuntas.",
-  "interaction_modal.action.follow": "Chun leanúint ar aghaidh, ní mór duit leanúint ó do chuntas.",
-  "interaction_modal.action.reblog": "Chun leanúint ar aghaidh, ní mór duit athbhlagáil ó do chuntas.",
-  "interaction_modal.action.reply": "Chun leanúint ar aghaidh, ní mór duit freagra a thabhairt ó do chuntas.",
-  "interaction_modal.action.vote": "Chun leanúint ar aghaidh, ní mór duit vótáil ó do chuntas.",
+  "interaction_modal.action": "Chun idirghníomhú le post {name}, ní mór duit síniú isteach i do chuntas ar cibé freastalaí Mastodon a úsáideann tú.",
   "interaction_modal.go": "Téigh",
   "interaction_modal.no_account_yet": "Níl cuntas agat fós?",
   "interaction_modal.on_another_server": "Ar freastalaí eile",
   "interaction_modal.on_this_server": "Ar an freastalaí seo",
-  "interaction_modal.title.favourite": "An postáil {name} is fearr leat",
-  "interaction_modal.title.follow": "Lean {name}",
-  "interaction_modal.title.reblog": "Mol postáil de chuid {name}",
-  "interaction_modal.title.reply": "Freagair postáil {name}",
-  "interaction_modal.title.vote": "Vótáil i vótaíocht {name}",
+  "interaction_modal.title": "Sínigh isteach le leanúint ar aghaidh",
   "interaction_modal.username_prompt": "M.sh. {example}",
   "intervals.full.days": "{number, plural, one {# lá} other {# lá}}",
   "intervals.full.hours": "{number, plural, one {# uair} other {# uair}}",
@@ -481,6 +487,7 @@
   "keyboard_shortcuts.home": "Oscail amlíne bhaile",
   "keyboard_shortcuts.hotkey": "Eochair aicearra",
   "keyboard_shortcuts.legend": "Taispeáin an finscéal seo",
+  "keyboard_shortcuts.load_more": "Dírigh ar an gcnaipe \"Lódáil níos mó\"",
   "keyboard_shortcuts.local": "Oscail an amlíne áitiúil",
   "keyboard_shortcuts.mention": "Luaigh údar",
   "keyboard_shortcuts.muted": "Oscail liosta na n-úsáideoirí balbhaithe",
@@ -489,6 +496,7 @@
   "keyboard_shortcuts.open_media": "Oscail meáin",
   "keyboard_shortcuts.pinned": "Oscail liosta postálacha pinn",
   "keyboard_shortcuts.profile": "Oscail próifíl an t-údar",
+  "keyboard_shortcuts.quote": "Postáil luachana",
   "keyboard_shortcuts.reply": "Freagair ar phostáil",
   "keyboard_shortcuts.requests": "Oscail liosta iarratas leanúnaí",
   "keyboard_shortcuts.search": "Díriú ar an mbosca cuardaigh",
@@ -500,6 +508,8 @@
   "keyboard_shortcuts.translate": "post a aistriú",
   "keyboard_shortcuts.unfocus": "Unfocus cum textarea/search",
   "keyboard_shortcuts.up": "Bog suas ar an liosta",
+  "learn_more_link.got_it": "Tuigim é",
+  "learn_more_link.learn_more": "Foghlaim níos mó",
   "lightbox.close": "Dún",
   "lightbox.next": "An céad eile",
   "lightbox.previous": "Roimhe seo",
@@ -600,6 +610,7 @@
   "notification.label.mention": "Luaigh",
   "notification.label.private_mention": "Lua príobháideach",
   "notification.label.private_reply": "Freagra príobháideach",
+  "notification.label.quote": "Luaigh {name} do phost",
   "notification.label.reply": "Freagra",
   "notification.mention": "Luaigh",
   "notification.mentioned_you": "Luaigh {name} tú",
@@ -614,6 +625,7 @@
   "notification.moderation_warning.action_suspend": "Cuireadh do chuntas ar fionraí.",
   "notification.own_poll": "Tá do suirbhé críochnaithe",
   "notification.poll": "Tá deireadh le vótaíocht inar vótáil tú",
+  "notification.quoted_update": "Chuir {name} post in eagar a luaigh tú",
   "notification.reblog": "Mhol {name} do phostáil",
   "notification.reblog.name_and_others_with_link": "{name} agus <a>{count, plural, one {# duine eile} other {# daoine eile}}</a> a chuir borradh faoi do phost",
   "notification.relationships_severance_event": "Cailleadh naisc le {name}",
@@ -657,6 +669,7 @@
   "notifications.column_settings.mention": "Tráchtanna:",
   "notifications.column_settings.poll": "Torthaí suirbhéanna:",
   "notifications.column_settings.push": "Brúfhógraí",
+  "notifications.column_settings.quote": "Luachain:",
   "notifications.column_settings.reblog": "Moltaí:",
   "notifications.column_settings.show": "Taispeáin i gcolún",
   "notifications.column_settings.sound": "Seinn an fhuaim",
@@ -732,11 +745,18 @@
   "privacy.private.short": "Leantóirí",
   "privacy.public.long": "Duine ar bith ar agus amach Mastodon",
   "privacy.public.short": "Poiblí",
+  "privacy.quote.anyone": "{visibility}, is féidir le duine ar bith lua",
+  "privacy.quote.disabled": "{visibility}, comharthaí athfhriotail díchumasaithe",
+  "privacy.quote.limited": "{visibility}, luachana teoranta",
   "privacy.unlisted.additional": "Iompraíonn sé seo díreach mar a bheadh ​​poiblí, ach amháin ní bheidh an postáil le feiceáil i bhfothaí beo nó i hashtags, in iniúchadh nó i gcuardach Mastodon, fiú má tá tú liostáilte ar fud an chuntais.",
-  "privacy.unlisted.long": "Níos lú fanfarraí algarthacha",
+  "privacy.unlisted.long": "I bhfolach ó thorthaí cuardaigh Mastodon, treochtaí, agus amlínte poiblí",
   "privacy.unlisted.short": "Poiblí ciúin",
   "privacy_policy.last_updated": "Nuashonraithe {date}",
   "privacy_policy.title": "Polasaí príobháideachais",
+  "quote_error.poll": "Ní cheadaítear lua le pobalbhreitheanna.",
+  "quote_error.quote": "Ní cheadaítear ach luachan amháin ag an am.",
+  "quote_error.unauthorized": "Níl údarás agat an post seo a lua.",
+  "quote_error.upload": "Ní cheadaítear lua a dhéanamh le ceangaltáin sna meáin.",
   "recommended": "Molta",
   "refresh": "Athnuaigh",
   "regeneration_indicator.please_stand_by": "Fan i do sheasamh, le do thoil.",
@@ -752,6 +772,9 @@
   "relative_time.minutes": "{number}n",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "inniu",
+  "remove_quote_hint.button_label": "Tuigim é",
+  "remove_quote_hint.message": "Is féidir leat é sin a dhéanamh ón roghchlár roghanna {icon}.",
+  "remove_quote_hint.title": "Ar mhaith leat do phost luaite a bhaint?",
   "reply_indicator.attachments": "{count, plural, one {# alán} two {# aláin} few {# aláin} many {# aláin} other {# aláin}}",
   "reply_indicator.cancel": "Cealaigh",
   "reply_indicator.poll": "Vótaíocht",
@@ -843,13 +866,23 @@
   "status.admin_account": "Oscail comhéadan modhnóireachta do @{name}",
   "status.admin_domain": "Oscail comhéadan modhnóireachta le haghaidh {domain}",
   "status.admin_status": "Oscail an postáil seo sa chomhéadan modhnóireachta",
+  "status.all_disabled": "Tá borradh agus luachana díchumasaithe",
   "status.block": "Bac @{name}",
   "status.bookmark": "Leabharmharcanna",
   "status.cancel_reblog_private": "Dímhol",
+  "status.cannot_quote": "Ní cheadaítear duit an post seo a lua",
   "status.cannot_reblog": "Ní féidir an phostáil seo a mholadh",
+  "status.contains_quote": "Tá luachan ann",
+  "status.context.loading": "Ag lódáil tuilleadh freagraí",
+  "status.context.loading_error": "Níorbh fhéidir freagraí nua a lódáil",
+  "status.context.loading_success": "Luchtaithe na freagraí uile",
+  "status.context.more_replies_found": "Tuilleadh freagraí aimsithe",
+  "status.context.retry": "Déan iarracht arís",
+  "status.context.show": "Taispeáin",
   "status.continued_thread": "Snáithe ar lean",
   "status.copy": "Cóipeáil an nasc chuig an bpostáil",
   "status.delete": "Scrios",
+  "status.delete.success": "Scriosadh an post",
   "status.detailed_status": "Amharc comhrá mionsonraithe",
   "status.direct": "Luaigh @{name} go príobháideach",
   "status.direct_indicator": "Lua príobháideach",
@@ -872,27 +905,43 @@
   "status.mute_conversation": "Balbhaigh comhrá",
   "status.open": "Leathnaigh an post seo",
   "status.pin": "Pionnáil ar do phróifíl",
+  "status.quote": "Luachan",
+  "status.quote.cancel": "Cealaigh an luachan",
   "status.quote_error.filtered": "I bhfolach mar gheall ar cheann de do scagairí",
-  "status.quote_error.not_found": "Ní féidir an post seo a thaispeáint.",
-  "status.quote_error.pending_approval": "Tá an post seo ag feitheamh ar cheadú ón údar bunaidh.",
-  "status.quote_error.rejected": "Ní féidir an post seo a thaispeáint mar ní cheadaíonn an t-údar bunaidh é a lua.",
-  "status.quote_error.removed": "Baineadh an post seo ag a údar.",
-  "status.quote_error.unauthorized": "Ní féidir an post seo a thaispeáint mar níl údarú agat é a fheiceáil.",
-  "status.quote_post_author": "Postáil le {name}",
+  "status.quote_error.limited_account_hint.action": "Taispeáin ar aon nós",
+  "status.quote_error.limited_account_hint.title": "Tá an cuntas seo i bhfolach ag modhnóirí {domain}.",
+  "status.quote_error.not_available": "Níl an postáil ar fáil",
+  "status.quote_error.pending_approval": "Post ar feitheamh",
+  "status.quote_error.pending_approval_popout.body": "Ar Mastodon, is féidir leat a rialú an féidir le duine tú a lua nó nach féidir. Tá an post seo ar feitheamh fad is atá ceadú an údair bhunaidh á fháil againn.",
+  "status.quote_error.revoked": "Post bainte ag an údar",
+  "status.quote_followers_only": "Ní féidir ach le leantóirí an post seo a lua",
+  "status.quote_manual_review": "Déanfaidh an t-údar athbhreithniú de láimh",
+  "status.quote_noun": "Luachan",
+  "status.quote_policy_change": "Athraigh cé a fhéadann luachan a thabhairt",
+  "status.quote_post_author": "Luaigh mé post le @{name}",
+  "status.quote_private": "Ní féidir poist phríobháideacha a lua",
+  "status.quotes": "{count, plural, one {sliocht} few {sliocht} other {sliocht}}",
+  "status.quotes.empty": "Níl an post seo luaite ag aon duine go fóill. Nuair a dhéanann duine é, taispeánfar anseo é.",
+  "status.quotes.local_other_disclaimer": "Ní thaispeánfar sleachta ar dhiúltaigh an t-údar dóibh.",
+  "status.quotes.remote_other_disclaimer": "Níl ráthaíocht ann go dtaispeánfar anseo ach sleachta ó {domain}. Ní thaispeánfar sleachta ar dhiúltaigh an t-údar dóibh.",
   "status.read_more": "Léan a thuilleadh",
   "status.reblog": "Treisiú",
-  "status.reblog_private": "Mol le léargas bunúsach",
+  "status.reblog_or_quote": "Borradh nó luachan",
+  "status.reblog_private": "Roinn arís le do leanúna",
   "status.reblogged_by": "Mhol {name}",
   "status.reblogs": "{count, plural, one {buaic} other {buaic}}",
   "status.reblogs.empty": "Níor mhol éinne an phostáil seo fós. Nuair a mholfaidh duine éigin í, taispeánfar anseo é sin.",
   "status.redraft": "Scrios ⁊ athdhréachtaigh",
   "status.remove_bookmark": "Bain leabharmharc",
   "status.remove_favourite": "Bain ó cheanáin",
+  "status.remove_quote": "Bain",
   "status.replied_in_thread": "D'fhreagair sa snáithe",
   "status.replied_to": "D'fhreagair {name}",
   "status.reply": "Freagair",
   "status.replyAll": "Freagair le snáithe",
   "status.report": "Tuairiscigh @{name}",
+  "status.request_quote": "Iarratas ar luachan",
+  "status.revoke_quote": "Bain mo phost ó phost @{name}",
   "status.sensitive_warning": "Ábhar íogair",
   "status.share": "Comhroinn",
   "status.show_less_all": "Taispeáin níos lú d'uile",
@@ -930,6 +979,7 @@
   "upload_button.label": "Cuir íomhánna, físeán nó comhad fuaime leis",
   "upload_error.limit": "Sáraíodh an teorainn uaslódála comhaid.",
   "upload_error.poll": "Ní cheadaítear uaslódáil comhad le pobalbhreith.",
+  "upload_error.quote": "Ní cheadaítear uaslódáil comhaid le comharthaí athfhriotail.",
   "upload_form.drag_and_drop.instructions": "Chun ceangaltán meán a phiocadh suas, brúigh spás nó cuir isteach. Agus tú ag tarraingt, bain úsáid as na heochracha saigheada chun an ceangaltán meán a bhogadh i dtreo ar bith. Brúigh spás nó cuir isteach arís chun an ceangaltán meán a scaoileadh ina phost nua, nó brúigh éalú chun cealú.",
   "upload_form.drag_and_drop.on_drag_cancel": "Cuireadh an tarraingt ar ceal. Scaoileadh ceangaltán meán {item}.",
   "upload_form.drag_and_drop.on_drag_end": "Scaoileadh ceangaltán meán {item}.",
@@ -952,5 +1002,19 @@
   "video.skip_forward": "Scipeáil ar aghaidh",
   "video.unmute": "Díbhalbhú",
   "video.volume_down": "Toirt síos",
-  "video.volume_up": "Toirt suas"
+  "video.volume_up": "Toirt suas",
+  "visibility_modal.button_title": "Socraigh infheictheacht",
+  "visibility_modal.header": "Infheictheacht agus idirghníomhaíocht",
+  "visibility_modal.helper.direct_quoting": "Ní féidir le daoine eile tráchtanna príobháideacha a scríobhadh ar Mastodon a lua.",
+  "visibility_modal.helper.privacy_editing": "Ní féidir infheictheacht a athrú tar éis post a fhoilsiú.",
+  "visibility_modal.helper.privacy_private_self_quote": "Ní féidir féin-luachanna ó phoist phríobháideacha a chur ar fáil don phobal.",
+  "visibility_modal.helper.private_quoting": "Ní féidir le daoine eile poist atá scríofa ar Mastodon agus atá dírithe ar leanúna amháin a lua.",
+  "visibility_modal.helper.unlisted_quoting": "Nuair a luann daoine thú, beidh a bpost i bhfolach ó amlínte treochta freisin.",
+  "visibility_modal.instructions": "Rialaigh cé a fhéadfaidh idirghníomhú leis an bpost seo. Is féidir leat socruithe a chur i bhfeidhm ar gach post amach anseo trí nascleanúint a dhéanamh chuig <link>Sainroghanna > Réamhshocruithe Postála</link>.",
+  "visibility_modal.privacy_label": "Infheictheacht",
+  "visibility_modal.quote_followers": "Leantóirí amháin",
+  "visibility_modal.quote_label": "Cé a fhéadfaidh lua",
+  "visibility_modal.quote_nobody": "Mise amháin",
+  "visibility_modal.quote_public": "Aon duine",
+  "visibility_modal.save": "Sábháil"
 }
diff --git a/app/javascript/mastodon/locales/gd.json b/app/javascript/mastodon/locales/gd.json
index 208e117037b..b677f8ec50a 100644
--- a/app/javascript/mastodon/locales/gd.json
+++ b/app/javascript/mastodon/locales/gd.json
@@ -70,7 +70,6 @@
   "account.posts_with_replies": "Postaichean ’s freagairtean",
   "account.remove_from_followers": "Thoir {name} air falbh on luchd-leantainn",
   "account.report": "Dèan gearan mu @{name}",
-  "account.requested": "A’ feitheamh air aontachadh. Briog airson sgur dhen iarrtas leantainn",
   "account.requested_follow": "Dh’iarr {name} ’gad leantainn",
   "account.requests_to_follow_you": "Iarrtasan leantainn",
   "account.share": "Co-roinn a’ phròifil aig @{name}",
@@ -239,15 +238,20 @@
   "confirmations.missing_alt_text.secondary": "Postaich e co-dhiù",
   "confirmations.missing_alt_text.title": "A bheil thu airson roghainn teacsa a chur ris?",
   "confirmations.mute.confirm": "Mùch",
+  "confirmations.quiet_post_quote_info.dismiss": "Na cuiribh seo ’nam chuimhne a-rithist",
+  "confirmations.quiet_post_quote_info.got_it": "Tha mi agaibh",
+  "confirmations.quiet_post_quote_info.message": "Nuair a luaidheas tu post a tha poblach ach sàmhach, thèid am post agad fhalach o loidhnichean-ama nan treandaichean.",
+  "confirmations.quiet_post_quote_info.title": "Luaidh air postaichean poblach ach sàmhach",
   "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.redraft.title": "A bheil thu airson am post a sguabadh às ⁊ dreachd ùr a dhèanamh dheth?",
   "confirmations.remove_from_followers.confirm": "Thoir an neach-leantainn air falbh",
   "confirmations.remove_from_followers.message": "Cha lean {name} thu tuilleadh. A bheil thu cinnteach gu bheil thu airson leantainn air adhart?",
   "confirmations.remove_from_followers.title": "A bheil thu airson an neach-leantainn a thoirt air falbh?",
+  "confirmations.revoke_quote.confirm": "Thoir am post air falbh",
+  "confirmations.revoke_quote.message": "Cha ghabh seo a neo-dhèanamh.",
+  "confirmations.revoke_quote.title": "A bheil thu airson am post a thoirt air falbh?",
   "confirmations.unfollow.confirm": "Na lean tuilleadh",
-  "confirmations.unfollow.message": "A bheil thu cinnteach nach eil thu airson {name} a leantainn tuilleadh?",
-  "confirmations.unfollow.title": "A bheil thu airson sgur de leantainn a chleachdaiche?",
   "content_warning.hide": "Falaich am post",
   "content_warning.show": "Seall e co-dhiù",
   "content_warning.show_more": "Seall barrachd dheth",
@@ -289,6 +293,7 @@
   "domain_pill.your_handle": "An t-aithnichear agad:",
   "domain_pill.your_server": "Do dhachaigh dhigiteach far a bheil na postaichean uile agad a’ fuireach. Nach toigh leat an tè seo? Dèan imrich gu frithealaiche eile uair sam bith is thoir an luchd-leantainn agad leat cuideachd.",
   "domain_pill.your_username": "Seo an t-aithnichear àraidh agad air an fhrithealaiche seo. Dh’fhaoidte gu bheil luchd-cleachdaidh air a bheil an t-aon ainm air frithealaichean eile.",
+  "dropdown.empty": "Tagh roghainn",
   "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:",
   "emoji_button.activity": "Gnìomhachd",
@@ -424,8 +429,6 @@
   "hints.profiles.see_more_followers": "Faic barrachd luchd-leantainn air {domain}",
   "hints.profiles.see_more_follows": "Faic barrachd a tha 'gan leantainn air {domain}",
   "hints.profiles.see_more_posts": "Faic barrachd phostaichean air {domain}",
-  "hints.threads.replies_may_be_missing": "Dh’fhaoidte gu bheil freagairtean o fhrithealaichean eile a dhìth.",
-  "hints.threads.see_more": "Faic barrachd fhreagairtean air {domain}",
   "home.column_settings.show_quotes": "Seall luaidhean",
   "home.column_settings.show_reblogs": "Seall na brosnachaidhean",
   "home.column_settings.show_replies": "Seall na freagairtean",
@@ -447,20 +450,12 @@
   "ignore_notifications_modal.private_mentions_title": "A bheil thu airson na brathan o iomraidhean phrìobhaideach gun iarraidh a leigeil seachad?",
   "info_button.label": "Cobhair",
   "info_button.what_is_alt_text": "<h1>Dè a th’ ann an roghainn teacsa?</h1> <p>Bheir roghainn teacsa tuairisgeulan dhealbhan dhan fheadhainn air a bheil cion lèirsinne, aig a bheil ceangal air leud-banna cumhang no a tha a’ sireadh barrachd co-theacsa.</p> <p>’S urrainn dhut piseach a thoirt air an t-so-ruigsinneachd is an tuigse dhan a h-uile duine ma sgrìobhas tu roghainn teacsa a tha soilleir, goirid is cuspaireach.</p> <ul> <li>Gabh a-steach na nithean cudromach</li> <li>Dèan geàrr-chunntas dhen teacsa sna dealbhan</li> <li>Cleachd structar sheantansan àbhaisteach</li><li>\\nSeachainn fiosrachadh anabarrach</li> <li>Cùm an aire air treandaichean is puingean cudromach ann an dealbhan iom-fhillte (mar diagram no mapa)</li> </ul>",
-  "interaction_modal.action.favourite": "Airson leantainn air adhart, feumaidh tu a chur ris na h-annsachdan on chunntas agad.",
-  "interaction_modal.action.follow": "Airson leantainn air adhart, feumaidh tu a leantainn on chunntas agad.",
-  "interaction_modal.action.reblog": "Airson leantainn air adhart, feumaidh tu a bhrosnachadh on chunntas agad.",
-  "interaction_modal.action.reply": "Airson leantainn air adhart, feumaidh tu fhreagairt on chunntas agad.",
-  "interaction_modal.action.vote": "Airson leantainn air adhart, feumaidh tu bhòtadh on chunntas agad.",
+  "interaction_modal.action": "Mus eadar-ghabh thu leis a’ phost le {name}, feumaidh tu clàradh a-steach dhan chunntas agad air ge b’ e dè am frithealaiche Mastodon a chleachdas tu.",
   "interaction_modal.go": "Siuthad",
   "interaction_modal.no_account_yet": "Nach eil cunntas agad fhathast?",
   "interaction_modal.on_another_server": "Air frithealaiche eile",
   "interaction_modal.on_this_server": "Air an frithealaiche seo",
-  "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}",
-  "interaction_modal.title.vote": "Bhòt sa chunntas-bheachd aig {name}",
+  "interaction_modal.title": "Clàraich a-steach airson leantainn air adhart",
   "interaction_modal.username_prompt": "M.e. {example}",
   "intervals.full.days": "{number, plural, one {# latha} two {# latha} few {# làithean} other {# latha}}",
   "intervals.full.hours": "{number, plural, one {# uair a thìde} two {# uair a thìde} few {# uairean a thìde} other {# uair a thìde}}",
@@ -481,6 +476,7 @@
   "keyboard_shortcuts.home": "Fosgail loidhne-ama na dachaigh",
   "keyboard_shortcuts.hotkey": "Grad-iuchair",
   "keyboard_shortcuts.legend": "Seall an clàr-mìneachaidh seo",
+  "keyboard_shortcuts.load_more": "Cuir am fòcas air a’ phutan “Luchdaich barrachd dheth”",
   "keyboard_shortcuts.local": "Fosgail an loidhne-ama ionadail",
   "keyboard_shortcuts.mention": "Thoir iomradh dhan ùghdar",
   "keyboard_shortcuts.muted": "Fosgail liosta nan cleachdaichean mùchte",
@@ -489,6 +485,7 @@
   "keyboard_shortcuts.open_media": "Fosgail meadhan",
   "keyboard_shortcuts.pinned": "Fosgail liosta nam postaichean prìnichte",
   "keyboard_shortcuts.profile": "Fosgail pròifil an ùghdair",
+  "keyboard_shortcuts.quote": "Luaidh am post",
   "keyboard_shortcuts.reply": "Freagair do phost",
   "keyboard_shortcuts.requests": "Fosgail liosta nan iarrtasan leantainn",
   "keyboard_shortcuts.search": "Cuir am fòcas air a’ bhàr-luirg",
@@ -500,6 +497,8 @@
   "keyboard_shortcuts.translate": "airson post eadar-theangachadh",
   "keyboard_shortcuts.unfocus": "Thoir am fòcas far raon teacsa an sgrìobhaidh/an luirg",
   "keyboard_shortcuts.up": "Gluais suas air an liosta",
+  "learn_more_link.got_it": "Tha mi agaibh",
+  "learn_more_link.learn_more": "Barrachd fiosrachaidh",
   "lightbox.close": "Dùin",
   "lightbox.next": "Air adhart",
   "lightbox.previous": "Air ais",
@@ -600,6 +599,7 @@
   "notification.label.mention": "Iomradh",
   "notification.label.private_mention": "Iomradh prìobhaideach",
   "notification.label.private_reply": "Freagairt phrìobhaideach",
+  "notification.label.quote": "Luaidh {name} am post agad",
   "notification.label.reply": "Freagairt",
   "notification.mention": "Iomradh",
   "notification.mentioned_you": "Thug {name} iomradh ort",
@@ -614,6 +614,7 @@
   "notification.moderation_warning.action_suspend": "Chaidh an cunntas agad a chur à rèim.",
   "notification.own_poll": "Thàinig an cunntas-bheachd agad gu crìoch",
   "notification.poll": "Thàinig cunntas-bheachd sa bhòt thu gu crìoch",
+  "notification.quoted_update": "Dheasaich {name} post a luaidh thu",
   "notification.reblog": "Bhrosnaich {name} am post agad",
   "notification.reblog.name_and_others_with_link": "Bhrosnaich {name} ’s <a>{count, plural, one {# eile} two {# eile} few {# eile} other {# eile}}</a> am post agad",
   "notification.relationships_severance_event": "Chaill thu dàimhean le {name}",
@@ -657,6 +658,7 @@
   "notifications.column_settings.mention": "Iomraidhean:",
   "notifications.column_settings.poll": "Toraidhean cunntais-bheachd:",
   "notifications.column_settings.push": "Brathan putaidh",
+  "notifications.column_settings.quote": "Luaidhean:",
   "notifications.column_settings.reblog": "Brosnachaidhean:",
   "notifications.column_settings.show": "Seall sa cholbh",
   "notifications.column_settings.sound": "Cluich fuaim",
@@ -732,11 +734,18 @@
   "privacy.private.short": "Luchd-leantainn",
   "privacy.public.long": "Duine sam bith taobh a-staigh no a-muigh Mhastodon",
   "privacy.public.short": "Poblach",
+  "privacy.quote.anyone": "{visibility}, faodaidh neach sam bith a luaidh",
+  "privacy.quote.disabled": "{visibility}, luaidhean à comas",
+  "privacy.quote.limited": "{visibility}, luaidhean cuingichte",
   "privacy.unlisted.additional": "Tha seo coltach ris an fhaicsinneachd phoblach ach cha nochd am post air loidhnichean-ama an t-saoghail phoblaich, nan tagaichean hais no an rùrachaidh no ann an toraidhean luirg Mhastodon fiù ’s ma thug thu ro-aonta airson sin seachad.",
-  "privacy.unlisted.long": "Ìre bheag an algairim",
+  "privacy.unlisted.long": "Falaichte o na toraidhean-luirg, na treandaichean ’s na loichnichean-ama poblach",
   "privacy.unlisted.short": "Poblach ach sàmhach",
   "privacy_policy.last_updated": "An t-ùrachadh mu dheireadh {date}",
   "privacy_policy.title": "Poileasaidh prìobhaideachd",
+  "quote_error.poll": "Chan fhaod thu luaidh a chur an cois cunntais-bheachd.",
+  "quote_error.quote": "Chan eil taic ach ri aon luaidh aig an aon àm.",
+  "quote_error.unauthorized": "Chan fhaod thu am post seo a luaidh.",
+  "quote_error.upload": "Chan fhaod thu meadhan a chur ri luaidh.",
   "recommended": "Molta",
   "refresh": "Ath-nuadhaich",
   "regeneration_indicator.please_stand_by": "Fuirich ort.",
@@ -752,6 +761,9 @@
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}d",
   "relative_time.today": "an-diugh",
+  "remove_quote_hint.button_label": "Tha mi agaibh",
+  "remove_quote_hint.message": "Nì thu sin o chlàr-taice {icon} nan roghainnean.",
+  "remove_quote_hint.title": "A bheil thu airson am post agad a thoirt air falbh on luaidh?",
   "reply_indicator.attachments": "{count, plural, one {# cheanglachan} two {# cheanglachan} few {# ceanglachain} other {# ceanglachan}}",
   "reply_indicator.cancel": "Sguir dheth",
   "reply_indicator.poll": "Cunntas-bheachd",
@@ -843,13 +855,16 @@
   "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",
+  "status.all_disabled": "Tha brosnachaidhean ’s luaidhean à comas",
   "status.block": "Bac @{name}",
   "status.bookmark": "Cuir ris na comharran-lìn",
   "status.cancel_reblog_private": "Na brosnaich tuilleadh",
+  "status.cannot_quote": "Chan fhaod thu am post seo a luaidh",
   "status.cannot_reblog": "Cha ghabh am post seo brosnachadh",
   "status.continued_thread": "Pàirt de shnàithlean",
   "status.copy": "Dèan lethbhreac dhen cheangal dhan phost",
   "status.delete": "Sguab às",
+  "status.delete.success": "Chaidh am post a sguabadh às",
   "status.detailed_status": "Mion-shealladh a’ chòmhraidh",
   "status.direct": "Thoir iomradh air @{name} gu prìobhaideach",
   "status.direct_indicator": "Iomradh prìobhaideach",
@@ -872,27 +887,38 @@
   "status.mute_conversation": "Mùch an còmhradh",
   "status.open": "Leudaich am post seo",
   "status.pin": "Prìnich ris a’ phròifil",
+  "status.quote": "Luaidh",
+  "status.quote.cancel": "Sguir dhen luaidh",
   "status.quote_error.filtered": "Falaichte le criathrag a th’ agad",
-  "status.quote_error.not_found": "Chan urrainn dhuinn am post seo a shealltainn.",
-  "status.quote_error.pending_approval": "Tha am post seo a’ feitheamh air aontachadh leis an ùghdar tùsail.",
-  "status.quote_error.rejected": "Chan urrainn dhuinn am post seo a shealltainn air sgàth ’s nach ceadaich an t-ùghdar tùsail aige gun dèid a luaidh.",
-  "status.quote_error.removed": "Chaidh am post seo a thoirt air falbh le ùghdar.",
-  "status.quote_error.unauthorized": "Chan urrainn dhuinn am post seo a shealltainn air sgàth ’s nach eil cead agad fhaicinn.",
-  "status.quote_post_author": "Post le {name}",
+  "status.quote_error.not_available": "Chan eil am post ri fhaighinn",
+  "status.quote_error.pending_approval": "Cha deach dèiligeadh ris a’ phost fhathast",
+  "status.quote_error.pending_approval_popout.body": "Air Mastodon, ’s urrainn dhut stiùireadh am faod cuideigin do luaidh gus nach fhaod. Tha am post seo a’ feitheamh air aonta an ùghdair thùsail.",
+  "status.quote_error.revoked": "Chaidh am post a thoirt air falbh leis an ùghdar",
+  "status.quote_followers_only": "Chan fhaod ach luchd-leantainn am post seo a luaidh",
+  "status.quote_manual_review": "Nì an t-ùghdar lèirmheas air a làimh",
+  "status.quote_policy_change": "Atharraich cò dh’fhaodas luaidh",
+  "status.quote_post_author": "Luaidh air post le @{name}",
+  "status.quote_private": "Chan fhaodar postaichean prìobhaideach a luaidh",
+  "status.quotes": "{count, plural, one {luaidh} two {luaidh} few {luaidhean} other {luaidh}}",
+  "status.quotes.empty": "Chan deach am post seo a luaidh le duine sam bith fhathast. Nuair a luaidheas cuideigin e, nochdaidh iad an-seo.",
   "status.read_more": "Leugh an còrr",
   "status.reblog": "Brosnaich",
-  "status.reblog_private": "Brosnaich leis an t-so-fhaicsinneachd tùsail",
+  "status.reblog_or_quote": "Brosnaich no luaidh",
+  "status.reblog_private": "Co-roinn leis an luchd-leantainn agad a-rithist",
   "status.reblogged_by": "’Ga bhrosnachadh le {name}",
   "status.reblogs": "{count, plural, one {bhrosnachadh} two {bhrosnachadh} few {brosnachaidhean} other {brosnachadh}}",
   "status.reblogs.empty": "Chan deach am post seo a bhrosnachadh le duine sam bith fhathast. Nuair a bhrosnaicheas cuideigin e, nochdaidh iad an-seo.",
   "status.redraft": "Sguab às ⁊ dèan dreachd ùr",
   "status.remove_bookmark": "Thoir an comharra-lìn air falbh",
   "status.remove_favourite": "Thoir air falbh o na h-annsachdan",
+  "status.remove_quote": "Thoir air falbh",
   "status.replied_in_thread": "Freagairt do shnàithlean",
   "status.replied_to": "Air {name} fhreagairt",
   "status.reply": "Freagair",
   "status.replyAll": "Freagair dhan t-snàithlean",
   "status.report": "Dèan gearan mu @{name}",
+  "status.request_quote": "Iarr luaidh",
+  "status.revoke_quote": "Thoir am post agam air falbh on phost le @{name}",
   "status.sensitive_warning": "Susbaint fhrionasach",
   "status.share": "Co-roinn",
   "status.show_less_all": "Seall nas lugha dhen a h-uile",
@@ -930,6 +956,7 @@
   "upload_button.label": "Cuir ris dealbhan, video no faidhle fuaime",
   "upload_error.limit": "Luchdaich thu suas na tha ceadaichte dhut a dh’fhaidhlichean mu thràth.",
   "upload_error.poll": "Chan fhaod thu faidhle a luchdadh suas an cois cunntais-bheachd.",
+  "upload_error.quote": "Chan fhaod thu faidhle a luchdadh suas an cois luaidh.",
   "upload_form.drag_and_drop.instructions": "Airson ceanglachan meadhain a thogail, brùth air space no enter. Fhad ’ a bhios tu ’ga shlaodadh, cleachd na h-iuchraichean-saighde airson an ceanglachan meadhain a ghluasad gu comhair sam bith. Brùth air space no enter a-rithist airson an ceanglachen meadhain a leigeil às air an ionad ùr aige no brùth air escape airson sgur dheth.",
   "upload_form.drag_and_drop.on_drag_cancel": "Chaidh sgur dhen t-slaodadh. Chaidh an ceanglachan meadhain {item} a leigeil às.",
   "upload_form.drag_and_drop.on_drag_end": "Chaidh an ceanglachan meadhain {item} a leigeil às.",
@@ -952,5 +979,19 @@
   "video.skip_forward": "Geàrr leum air adhart",
   "video.unmute": "Dì-mhùch",
   "video.volume_down": "Lùghdaich an fhuaim",
-  "video.volume_up": "Cuir an fhuaim an àirde"
+  "video.volume_up": "Cuir an fhuaim an àirde",
+  "visibility_modal.button_title": "Suidhich an fhaicsinneachd",
+  "visibility_modal.header": "Faicsinneachd ⁊ eadar-ghabhail",
+  "visibility_modal.helper.direct_quoting": "Chan urrainn do chàch iomraidhean prìobhaideach a chaidh a sgrìobhadh le Mastodon a luaidh.",
+  "visibility_modal.helper.privacy_editing": "Chan urrainn dhut faicsinneachd puist atharrachadh às dhèidh fhoillseachadh.",
+  "visibility_modal.helper.privacy_private_self_quote": "Chan fhaodar fèin-luaidhean air postaichean prìobhaideach a dhèanamh poblach.",
+  "visibility_modal.helper.private_quoting": "Chan urrainn do chàch postaichean dhan luchd-leantainn a-mhàin a chaidh a sgrìobhadh le Mastodon a luaidh.",
+  "visibility_modal.helper.unlisted_quoting": "Nuair a luaidheas daoine thu, thèid am post aca-san fhalach o loidhnichean-ama nan treandaichean.",
+  "visibility_modal.instructions": "Stiùirich cò dh’fhaodas eadar-ghabhahil leis a’ phost seo. ’S urrainn dhut do roghainnean airson nam postaichean ri teachd a thaghadh aig <link>Roghainnean > Bun-roghainnean a’ phostaidh</link>",
+  "visibility_modal.privacy_label": "Faicsinneachd",
+  "visibility_modal.quote_followers": "Luchd-leantainn a-mhàin",
+  "visibility_modal.quote_label": "Cò dh’fhaodas luaidh",
+  "visibility_modal.quote_nobody": "Mi fhìn a-mhàin",
+  "visibility_modal.quote_public": "Duine sam bith",
+  "visibility_modal.save": "Sàbhail"
 }
diff --git a/app/javascript/mastodon/locales/gl.json b/app/javascript/mastodon/locales/gl.json
index 7cb227215e4..8ba7a73abe3 100644
--- a/app/javascript/mastodon/locales/gl.json
+++ b/app/javascript/mastodon/locales/gl.json
@@ -28,6 +28,7 @@
   "account.disable_notifications": "Deixar de notificarme cando @{name} publica",
   "account.domain_blocking": "Bloqueo do dominio",
   "account.edit_profile": "Editar perfil",
+  "account.edit_profile_short": "Editar",
   "account.enable_notifications": "Noficarme cando @{name} publique",
   "account.endorse": "Amosar no perfil",
   "account.familiar_followers_many": "Seguida por {name1}, {name2}, e {othersCount, plural, one {outra conta que coñeces} other {outras # contas que coñeces}}",
@@ -40,6 +41,11 @@
   "account.featured_tags.last_status_never": "Sen publicacións",
   "account.follow": "Seguir",
   "account.follow_back": "Seguir tamén",
+  "account.follow_back_short": "Seguir tamén",
+  "account.follow_request": "Solicitar seguir",
+  "account.follow_request_cancel": "Desbotar a petición",
+  "account.follow_request_cancel_short": "Desbotar",
+  "account.follow_request_short": "Solicitar",
   "account.followers": "Seguidoras",
   "account.followers.empty": "Aínda ninguén segue esta usuaria.",
   "account.followers_counter": "{count, plural, one {{counter} seguidora} other {{counter} seguidoras}}",
@@ -70,7 +76,6 @@
   "account.posts_with_replies": "Publicacións e respostas",
   "account.remove_from_followers": "Retirar a {name} das seguidoras",
   "account.report": "Informar sobre @{name}",
-  "account.requested": "Agardando aprobación. Preme para desbotar a solicitude",
   "account.requested_follow": "{name} solicitou seguirte",
   "account.requests_to_follow_you": "Solicita seguirte",
   "account.share": "Compartir o perfil de @{name}",
@@ -239,15 +244,25 @@
   "confirmations.missing_alt_text.secondary": "Publicar igualmente",
   "confirmations.missing_alt_text.title": "Engadir texto descritivo?",
   "confirmations.mute.confirm": "Acalar",
+  "confirmations.quiet_post_quote_info.dismiss": "Non lembrarmo máis",
+  "confirmations.quiet_post_quote_info.got_it": "Entendido",
+  "confirmations.quiet_post_quote_info.message": "Ao citar unha publicación pública limitada a túa publicación non aparecerá nas cronoloxías de tendencias.",
+  "confirmations.quiet_post_quote_info.title": "Citar publicacións públicas limitadas",
   "confirmations.redraft.confirm": "Eliminar e reescribir",
   "confirmations.redraft.message": "Tes a certeza de querer eliminar esta publicación e reescribila? Perderás as promocións e favorecementos, e as respostas á publicación orixinal ficarán orfas.",
   "confirmations.redraft.title": "Eliminar e reescribir a publicación?",
   "confirmations.remove_from_followers.confirm": "Quitar seguidora",
   "confirmations.remove_from_followers.message": "{name} vai deixar de seguirte. É isto o que queres?",
   "confirmations.remove_from_followers.title": "Quitar seguidora?",
+  "confirmations.revoke_quote.confirm": "Eliminar publicación",
+  "confirmations.revoke_quote.message": "Esta acción non se pode desfacer.",
+  "confirmations.revoke_quote.title": "Eliminar publicación?",
+  "confirmations.unblock.confirm": "Desbloquear",
+  "confirmations.unblock.title": "Desbloquear a {name}?",
   "confirmations.unfollow.confirm": "Deixar de seguir",
-  "confirmations.unfollow.message": "Tes certeza de querer deixar de seguir a {name}?",
-  "confirmations.unfollow.title": "Deixar de seguir á usuaria?",
+  "confirmations.unfollow.title": "Deixa de seguir a {name}?",
+  "confirmations.withdraw_request.confirm": "Retirar solicitude",
+  "confirmations.withdraw_request.title": "Retirar a petición de seguimento para {name}?",
   "content_warning.hide": "Agochar publicación",
   "content_warning.show": "Mostrar igualmente",
   "content_warning.show_more": "Mostrar máis",
@@ -289,6 +304,7 @@
   "domain_pill.your_handle": "O teu alcume:",
   "domain_pill.your_server": "O teu fogar dixital, onde están as túas publicacións. Non é do teu agrado? Podes cambiar de servidor cando queiras levando as túas seguidoras contigo.",
   "domain_pill.your_username": "O teu identificador único neste servidor. É posible que atopes usuarias co mesmo nome de usuaria en outros servidores.",
+  "dropdown.empty": "Escolle unha opción",
   "embed.instructions": "Inclúe esta publicación no teu sitio web copiando o seguinte código.",
   "embed.preview": "Vaise ver así:",
   "emoji_button.activity": "Actividade",
@@ -424,8 +440,6 @@
   "hints.profiles.see_more_followers": "Mira máis seguidoras en {domain}",
   "hints.profiles.see_more_follows": "Mira máis seguimentos en {domain}",
   "hints.profiles.see_more_posts": "Mira máis publicacións en {domain}",
-  "hints.threads.replies_may_be_missing": "Poderían faltar respostas desde outros servidores.",
-  "hints.threads.see_more": "Mira máis respostas en {domain}",
   "home.column_settings.show_quotes": "Mostrar citas",
   "home.column_settings.show_reblogs": "Amosar compartidos",
   "home.column_settings.show_replies": "Amosar respostas",
@@ -447,20 +461,12 @@
   "ignore_notifications_modal.private_mentions_title": "Ignorar notificacións de Mencións Privadas non solicitadas?",
   "info_button.label": "Axuda",
   "info_button.what_is_alt_text": "<h1>Que é o Texto Alternativo?</h1> <p>O Text Alt proporciona a descrición das imaxes para as persoas con deficiencias visuais, conexións a internet de baixa calidade ou para engadir contexto ás mesmas.</p> <p>Podes mellorar a accesibilidade e a comprensión da publicación ao escribir un texto alternativo claro, conciso e obxectivo.</p> <ul> <li>Identifica os elementos importantes</li> <li>Inclúe o texto que apareza nas imaxes</li> <li>Utiliza sintaxe estándar nas frases</li> <li>Evita información redundante</li> <li>Céntrate nos elementos principais cando sexan imaxes complexas (como diagramas ou mapas)</li> </ul>",
-  "interaction_modal.action.favourite": "Para continuar, debes favorecer desde a túa conta.",
-  "interaction_modal.action.follow": "Para continuar, debes facer seguimento desde a túa conta.",
-  "interaction_modal.action.reblog": "Para continuar, debes promover desde a túa conta.",
-  "interaction_modal.action.reply": "Para continuar, debes responder desde a túa conta.",
-  "interaction_modal.action.vote": "Para continuar, debes votar desde a túa conta.",
+  "interaction_modal.action": "Para interactuar coa publicación de {name} debes iniciar sesión no servidor Mastodon que utilices.",
   "interaction_modal.go": "Ir",
   "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.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}",
-  "interaction_modal.title.reply": "Responder á publicación de {name}",
-  "interaction_modal.title.vote": "Vota na enquisa de {name}",
+  "interaction_modal.title": "Inicia sesión para continuar",
   "interaction_modal.username_prompt": "Ex. {example}",
   "intervals.full.days": "{number, plural,one {# día} other {# días}}",
   "intervals.full.hours": "{number, plural, one {# hora} other {# horas}}",
@@ -481,6 +487,7 @@
   "keyboard_shortcuts.home": "Para abrir a cronoloxía inicial",
   "keyboard_shortcuts.hotkey": "Tecla de atallo",
   "keyboard_shortcuts.legend": "Para amosar esta lenda",
+  "keyboard_shortcuts.load_more": "Foco no botón \"Cargar máis\"",
   "keyboard_shortcuts.local": "Para abrir a cronoloxía local",
   "keyboard_shortcuts.mention": "Para mencionar a autora",
   "keyboard_shortcuts.muted": "Abrir lista de usuarias acaladas",
@@ -489,6 +496,7 @@
   "keyboard_shortcuts.open_media": "Para abrir o contido multimedia",
   "keyboard_shortcuts.pinned": "Para abrir a listaxe das publicacións fixadas",
   "keyboard_shortcuts.profile": "Para abrir o perfil da autora",
+  "keyboard_shortcuts.quote": "Citar publicación",
   "keyboard_shortcuts.reply": "Para responder",
   "keyboard_shortcuts.requests": "Para abrir a listaxe das peticións de seguimento",
   "keyboard_shortcuts.search": "Por cursor na caixa de busca",
@@ -500,6 +508,8 @@
   "keyboard_shortcuts.translate": "para traducir unha publicación",
   "keyboard_shortcuts.unfocus": "Para deixar de destacar a área de escritura/procura",
   "keyboard_shortcuts.up": "Para mover cara arriba na listaxe",
+  "learn_more_link.got_it": "Entendo",
+  "learn_more_link.learn_more": "Saber máis",
   "lightbox.close": "Fechar",
   "lightbox.next": "Seguinte",
   "lightbox.previous": "Anterior",
@@ -600,6 +610,7 @@
   "notification.label.mention": "Mención",
   "notification.label.private_mention": "Mención privada",
   "notification.label.private_reply": "Resposta privada",
+  "notification.label.quote": "{name} citou a túa publicación",
   "notification.label.reply": "Resposta",
   "notification.mention": "Mención",
   "notification.mentioned_you": "{name} mencionoute",
@@ -614,6 +625,7 @@
   "notification.moderation_warning.action_suspend": "A túa conta foi suspendida.",
   "notification.own_poll": "A túa enquisa rematou",
   "notification.poll": "Rematou a enquisa na que votaches",
+  "notification.quoted_update": "{name} editou unha publicación que citaches",
   "notification.reblog": "{name} compartiu a túa publicación",
   "notification.reblog.name_and_others_with_link": "{name} e <a>{count, plural, one {# máis} other {# máis}}</a> promoveron a túa publicación",
   "notification.relationships_severance_event": "Relacións perdidas con {name}",
@@ -657,6 +669,7 @@
   "notifications.column_settings.mention": "Mencións:",
   "notifications.column_settings.poll": "Resultados da enquisa:",
   "notifications.column_settings.push": "Notificacións emerxentes",
+  "notifications.column_settings.quote": "Citacións:",
   "notifications.column_settings.reblog": "Promocións:",
   "notifications.column_settings.show": "Amosar en columna",
   "notifications.column_settings.sound": "Reproducir son",
@@ -732,11 +745,18 @@
   "privacy.private.short": "Seguidoras",
   "privacy.public.long": "Para todas dentro e fóra de Mastodon",
   "privacy.public.short": "Público",
+  "privacy.quote.anyone": "{visibility}, calquera pode citar",
+  "privacy.quote.disabled": "{visibility}, citas desactivadas",
+  "privacy.quote.limited": "{visibility}, citas limitadas",
   "privacy.unlisted.additional": "Do mesmo xeito que público, menos que a publicación non aparecerá nas cronoloxías en directo ou nos cancelos, en descubrir ou nas buscas de Mastodon, incluso se estivese establecido nas opcións xerais da conta.",
-  "privacy.unlisted.long": "Menor implicación dos algoritmos",
-  "privacy.unlisted.short": "Público limitado",
+  "privacy.unlisted.long": "Non aparece nos resultados de buscas en Mastodon, nas tendencias e cronoloxías públicas",
+  "privacy.unlisted.short": "Pública limitada",
   "privacy_policy.last_updated": "Actualizado por última vez no {date}",
   "privacy_policy.title": "Política de Privacidade",
+  "quote_error.poll": "Non se permite citar as enquisas.",
+  "quote_error.quote": "Só se permite citar unha vez.",
+  "quote_error.unauthorized": "Non tes permiso para citar esta publicación.",
+  "quote_error.upload": "As citas non están permitidas para anexos multimedia.",
   "recommended": "Aconsellable",
   "refresh": "Actualizar",
   "regeneration_indicator.please_stand_by": "Por favor, agarda.",
@@ -752,6 +772,9 @@
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "hoxe",
+  "remove_quote_hint.button_label": "Entendido",
+  "remove_quote_hint.message": "Pódelo facer desde o {icon} menú de opcións.",
+  "remove_quote_hint.title": "Queres eliminar a publicación citada?",
   "reply_indicator.attachments": "{count, plural, one {# adxunto} other {# adxuntos}}",
   "reply_indicator.cancel": "Desbotar",
   "reply_indicator.poll": "Enquisa",
@@ -836,20 +859,30 @@
   "server_banner.is_one_of_many": "{domain} é un dos moitos servidores Mastodon independentes que podes usar para participar do Fediverso.",
   "server_banner.server_stats": "Estatísticas do servidor:",
   "sign_in_banner.create_account": "Crear conta",
-  "sign_in_banner.follow_anyone": "Sigue a quen queiras no Fediverso e le as publicacións en orde cronolóxica. Sen algoritmos, publicidade nin titulares engañosos.",
+  "sign_in_banner.follow_anyone": "Sigue a quen queiras no Fediverso e le as publicacións en orde cronolóxica. Sen algoritmos, publicidade nin titulares enganosos.",
   "sign_in_banner.mastodon_is": "Mastodon é o mellor xeito de estar ao día do que acontece.",
   "sign_in_banner.sign_in": "Iniciar sesión",
   "sign_in_banner.sso_redirect": "Acceder ou Crear conta",
   "status.admin_account": "Abrir interface de moderación para @{name}",
   "status.admin_domain": "Abrir interface de moderación para {domain}",
   "status.admin_status": "Abrir esta publicación na interface de moderación",
+  "status.all_disabled": "As promocións e citas están desactivadas",
   "status.block": "Bloquear a @{name}",
   "status.bookmark": "Marcar",
   "status.cancel_reblog_private": "Desfacer compartido",
+  "status.cannot_quote": "Non tes permiso para citar esta publicación",
   "status.cannot_reblog": "Esta publicación non pode ser promovida",
+  "status.contains_quote": "Contén unha cita",
+  "status.context.loading": "Cargando máis respostas",
+  "status.context.loading_error": "Non se puideron mostrar novas respostas",
+  "status.context.loading_success": "Móstranse todas as respostas",
+  "status.context.more_replies_found": "Existen máis respostas",
+  "status.context.retry": "Volver tentar",
+  "status.context.show": "Mostrar",
   "status.continued_thread": "Continua co fío",
   "status.copy": "Copiar ligazón á publicación",
   "status.delete": "Eliminar",
+  "status.delete.success": "Publicación eliminada",
   "status.detailed_status": "Vista detallada da conversa",
   "status.direct": "Mencionar de xeito privado a @{name}",
   "status.direct_indicator": "Mención privada",
@@ -872,27 +905,43 @@
   "status.mute_conversation": "Silenciar conversa",
   "status.open": "Estender esta publicación",
   "status.pin": "Fixar no perfil",
+  "status.quote": "Citar",
+  "status.quote.cancel": "Cancelar a cita",
   "status.quote_error.filtered": "Oculto debido a un dos teus filtros",
-  "status.quote_error.not_found": "Non se pode mostrar a publicación.",
-  "status.quote_error.pending_approval": "A publicación está pendente da aprobación pola autora orixinal.",
-  "status.quote_error.rejected": "Non se pode mostrar esta publicación xa que a autora orixinal non permite que se cite.",
-  "status.quote_error.removed": "Publicación eliminada pola autora.",
-  "status.quote_error.unauthorized": "Non se pode mostrar esta publicación porque non tes permiso para vela.",
-  "status.quote_post_author": "Publicación de {name}",
+  "status.quote_error.limited_account_hint.action": "Mostrar igualmente",
+  "status.quote_error.limited_account_hint.title": "A moderación de {domain} ocultou esta conta.",
+  "status.quote_error.not_available": "Publicación non dispoñible",
+  "status.quote_error.pending_approval": "Publicación pendente",
+  "status.quote_error.pending_approval_popout.body": "En Mastodon podes establecer se permites que te citen. Esta publicación queda pendente á espera de que a persoa autora orixinal o autorice.",
+  "status.quote_error.revoked": "Publicación retirada pola autora",
+  "status.quote_followers_only": "Só as seguidoras poden citar esta publicación",
+  "status.quote_manual_review": "A autora revisará manualmente",
+  "status.quote_noun": "Cita",
+  "status.quote_policy_change": "Cambia quen pode citarte",
+  "status.quote_post_author": "Citou unha publicación de @{name}",
+  "status.quote_private": "As publicacións privadas non se poden citar",
+  "status.quotes": "{count, plural, one {cita} other {citas}}",
+  "status.quotes.empty": "Aínda ninguén citou esta publicación. Cando alguén o faga aparecerá aquí.",
+  "status.quotes.local_other_disclaimer": "Non se mostrarán as citas rexeitadas pola autora.",
+  "status.quotes.remote_other_disclaimer": "Só se garante que se mostren as citas do dominio {domain}. Non se mostrarán as citas rexeitadas pola persoa autora.",
   "status.read_more": "Ler máis",
   "status.reblog": "Promover",
-  "status.reblog_private": "Compartir coa audiencia orixinal",
+  "status.reblog_or_quote": "Promover ou citar",
+  "status.reblog_private": "Volver a compartir coas túas seguidoras",
   "status.reblogged_by": "{name} promoveu",
   "status.reblogs": "{count, plural, one {promoción} other {promocións}}",
   "status.reblogs.empty": "Aínda ninguén promoveu esta publicación. Cando alguén o faga, amosarase aquí.",
   "status.redraft": "Eliminar e reescribir",
   "status.remove_bookmark": "Eliminar marcador",
   "status.remove_favourite": "Retirar das favoritas",
+  "status.remove_quote": "Retirar",
   "status.replied_in_thread": "Respondeu nun fío",
   "status.replied_to": "Respondeu a {name}",
   "status.reply": "Responder",
   "status.replyAll": "Responder ao tema",
   "status.report": "Denunciar @{name}",
+  "status.request_quote": "Solicitar a citación",
+  "status.revoke_quote": "Retirar a miña publicación da cita de @{name}",
   "status.sensitive_warning": "Contido sensíbel",
   "status.share": "Compartir",
   "status.show_less_all": "Amosar menos para todos",
@@ -930,6 +979,7 @@
   "upload_button.label": "Engadir imaxes, un vídeo ou ficheiro de audio",
   "upload_error.limit": "Límite máximo do ficheiro a subir excedido.",
   "upload_error.poll": "Non se poden subir ficheiros nas enquisas.",
+  "upload_error.quote": "Non se permite subir ficheiros ao citar.",
   "upload_form.drag_and_drop.instructions": "Preme en Espazo ou Enter para escoller un anexo multimedia. Ao arrastrar usa as teclas de frecha para mover o anexo en todas direccións.Preme Espazo ou Enter outra vez para soltalo na súa nova posición, ou preme Escape para desbotar.",
   "upload_form.drag_and_drop.on_drag_cancel": "Cancelouse o movemento. O anexo {item} soltouse.",
   "upload_form.drag_and_drop.on_drag_end": "Soltouse o anexo multimedia {item}.",
@@ -952,5 +1002,19 @@
   "video.skip_forward": "Avanzar",
   "video.unmute": "Non silenciar",
   "video.volume_down": "Baixar volume",
-  "video.volume_up": "Subir volume"
+  "video.volume_up": "Subir volume",
+  "visibility_modal.button_title": "Establece a visibilidade",
+  "visibility_modal.header": "Visibilidade e interaccións",
+  "visibility_modal.helper.direct_quoting": "As mencións privadas creadas con Mastodon non poden ser citadas.",
+  "visibility_modal.helper.privacy_editing": "Non se pode cambiar a visibilidade unha vez foi publicada.",
+  "visibility_modal.helper.privacy_private_self_quote": "Non se poden facer públicas as auto-citas de publicacións privadas.",
+  "visibility_modal.helper.private_quoting": "As publicacións só para seguidoras creadas con Mastodon non poden ser citadas.",
+  "visibility_modal.helper.unlisted_quoting": "Cando alguén te cite, a súa publicación non aparecerá nas cronoloxías de popularidade.",
+  "visibility_modal.instructions": "Establece quen pode interactuar con esta publicación. Tamén podes aplicar os axustes ás publicacións futuras en <link>Preferencias > Por defecto ao publicar</link>.",
+  "visibility_modal.privacy_label": "Visibilidade",
+  "visibility_modal.quote_followers": "Só para seguidoras",
+  "visibility_modal.quote_label": "Quen pode citar",
+  "visibility_modal.quote_nobody": "Só para min",
+  "visibility_modal.quote_public": "Calquera",
+  "visibility_modal.save": "Gardar"
 }
diff --git a/app/javascript/mastodon/locales/he.json b/app/javascript/mastodon/locales/he.json
index cb5ffb52db4..61e8cb2e5f5 100644
--- a/app/javascript/mastodon/locales/he.json
+++ b/app/javascript/mastodon/locales/he.json
@@ -28,6 +28,7 @@
   "account.disable_notifications": "הפסק לשלוח לי התראות כש@{name} מפרסמים",
   "account.domain_blocking": "רשימת השרתים החסומים",
   "account.edit_profile": "עריכת פרופיל",
+  "account.edit_profile_short": "עריכה",
   "account.enable_notifications": "שלח לי התראות כש@{name} מפרסם",
   "account.endorse": "קדם את החשבון בפרופיל",
   "account.familiar_followers_many": "החשבון נעקב על ידי {name1}, {name2} ועוד {othersCount, plural,one {אחד נוסף שמוכר לך}other {# נוספים שמוכרים לך}}",
@@ -40,6 +41,11 @@
   "account.featured_tags.last_status_never": "אין חצרוצים",
   "account.follow": "לעקוב",
   "account.follow_back": "לעקוב בחזרה",
+  "account.follow_back_short": "לעקוב בחזרה",
+  "account.follow_request": "בקשה לעקוב אחרי",
+  "account.follow_request_cancel": "ביטול בקשה",
+  "account.follow_request_cancel_short": "ביטול",
+  "account.follow_request_short": "בקשה",
   "account.followers": "עוקבים",
   "account.followers.empty": "אף אחד לא עוקב אחר המשתמש הזה עדיין.",
   "account.followers_counter": "{count, plural,one {עוקב אחד} other {{counter} עוקבים}}",
@@ -70,7 +76,6 @@
   "account.posts_with_replies": "הודעות ותגובות",
   "account.remove_from_followers": "הסרת {name} מעוקבי",
   "account.report": "דווח על @{name}",
-  "account.requested": "בהמתנה לאישור. לחצי כדי לבטל בקשת מעקב",
   "account.requested_follow": "{name} ביקשו לעקוב אחריך",
   "account.requests_to_follow_you": "ביקשו לעקוב אחריך",
   "account.share": "שתף את הפרופיל של @{name}",
@@ -239,15 +244,25 @@
   "confirmations.missing_alt_text.secondary": "לפרסם בכל זאת",
   "confirmations.missing_alt_text.title": "להוסיף מלל חלופי?",
   "confirmations.mute.confirm": "להשתיק",
+  "confirmations.quiet_post_quote_info.dismiss": "אל תזכיר לי שוב",
+  "confirmations.quiet_post_quote_info.got_it": "הבנתי",
+  "confirmations.quiet_post_quote_info.message": "כשמצטטים הודעה ציבורית שקטה, גם ההודעה המצטטת תוסתר מחלון הנושאים החמים.",
+  "confirmations.quiet_post_quote_info.title": "ציטוט הודעות ציבוריות שקטות",
   "confirmations.redraft.confirm": "מחיקה ועריכה מחדש",
   "confirmations.redraft.message": "למחוק ולהתחיל טיוטה חדשה? חיבובים והדהודים יאבדו, ותגובות להודעה המקורית ישארו יתומות.",
   "confirmations.redraft.title": "מחיקה ועריכה מחדש?",
   "confirmations.remove_from_followers.confirm": "הסרת עוקב",
   "confirmations.remove_from_followers.message": "{name} יוסר/תוסר ממעקב אחריך. האם להמשיך?",
   "confirmations.remove_from_followers.title": "להסיר עוקב/עוקבת?",
+  "confirmations.revoke_quote.confirm": "הסרת הודעה",
+  "confirmations.revoke_quote.message": "פעולה זו אינה הפיכה.",
+  "confirmations.revoke_quote.title": "הסרת הודעה?",
+  "confirmations.unblock.confirm": "הסרת חסימה",
+  "confirmations.unblock.title": "הסרת חסימה מ־{name}?",
   "confirmations.unfollow.confirm": "הפסקת מעקב",
-  "confirmations.unfollow.message": "להפסיק מעקב אחרי {name}?",
-  "confirmations.unfollow.title": "לבטל מעקב אחר המשתמש.ת?",
+  "confirmations.unfollow.title": "בטול מעקב אחרי {name}?",
+  "confirmations.withdraw_request.confirm": "משיכת בקשה",
+  "confirmations.withdraw_request.title": "משיכת בקשת מעקב אחרי {name}?",
   "content_warning.hide": "הסתרת חיצרוץ",
   "content_warning.show": "להציג בכל זאת",
   "content_warning.show_more": "הצג עוד",
@@ -289,6 +304,7 @@
   "domain_pill.your_handle": "הכינוי שלך:",
   "domain_pill.your_server": "הבית המקוון שלך, היכן ששוכנות כל הודעותיך. לא מוצא חן בעיניך? ניתן לעבור שרתים בכל עת וגם לשמור על העוקבים.",
   "domain_pill.your_username": "המזהה הייחודי שלך על שרת זה. ניתן למצוא משתמשים עם שם משתמש זהה על שרתים שונים.",
+  "dropdown.empty": "בחירת אפשרות",
   "embed.instructions": "ניתן להטמיע את ההודעה הזו באתרך ע\"י העתקת הקוד שלהלן.",
   "embed.preview": "דוגמא כיצד זה יראה:",
   "emoji_button.activity": "פעילות",
@@ -346,7 +362,7 @@
   "featured_carousel.post": "הודעה",
   "featured_carousel.previous": "הקודם",
   "featured_carousel.slide": "{index} מתוך {total}",
-  "filter_modal.added.context_mismatch_explanation": "קטגוריית המסנן הזאת לא חלה על ההקשר שממנו הגעת אל ההודעה הזו. אם תרצה/י שההודעה תסונן גם בהקשר זה, תצטרך/י לערוך את הסנן.",
+  "filter_modal.added.context_mismatch_explanation": "קטגוריית הסנן הזאת לא חלה על ההקשר שממנו הגעת אל ההודעה הזו. אם תרצה/י שההודעה תסונן גם בהקשר זה, תצטרך/י לערוך את הסנן.",
   "filter_modal.added.context_mismatch_title": "אין התאמה להקשר!",
   "filter_modal.added.expired_explanation": "פג תוקפה של קטגוריית הסינון הזו, יש צורך לשנות את תאריך התפוגה כדי שהסינון יוחל.",
   "filter_modal.added.expired_title": "פג תוקף המסנן!",
@@ -424,8 +440,6 @@
   "hints.profiles.see_more_followers": "צפיה בעוד עוקבים משרת {domain}",
   "hints.profiles.see_more_follows": "צפיה בעוד נעקבים בשרת {domain}",
   "hints.profiles.see_more_posts": "צפיה בעוד פרסומים בשרת {domain}",
-  "hints.threads.replies_may_be_missing": "תגובות משרתים אחרים עלולות להיות חסרות.",
-  "hints.threads.see_more": "צפיה בעוד תגובות משרת {domain}",
   "home.column_settings.show_quotes": "הצגת ציטוטים",
   "home.column_settings.show_reblogs": "הצגת הדהודים",
   "home.column_settings.show_replies": "הצגת תגובות",
@@ -447,20 +461,12 @@
   "ignore_notifications_modal.private_mentions_title": "להתעלם מהתראות מאיזכורים פרטיים?",
   "info_button.label": "עזרה",
   "info_button.what_is_alt_text": "<h1>מהו כיתוב חלופי?</h1> <p>כיתוב חלופי משמש תיאור מילולי של תמונות לסובלים ממגבלות ראיה, חיבורי רשת איטיים, או אלו הצריכים הקשר יותר מפורט לתוכן המולטימדיה המצורף.</p> <p>ניתן לשפר את הנגישות והבנת התוכן לכולם ע\"י כתיבת תיאור ברור, תמציתי ונטול פניות.</p> <ul> <li>כיסוי היסודות החשובים</li> <li>סיכום המלל שבתמונות</li> <li>שימוש במבנה משפטים רגיל</li> <li>יש להמנע מחזרה על מידע</li> <li>אם העזרים הויזואליים הם דיאגרמות או מפות, התמקדו במגמות וממצאים מרכזיים.</li> </ul>",
-  "interaction_modal.action.favourite": "כדי להמשיך, עליך לחבב מחשבונך.",
-  "interaction_modal.action.follow": "כדי להמשיך, עליך לעקוב מחשבונך.",
-  "interaction_modal.action.reblog": "כדי להמשיך, עליך להדהד מחשבונך.",
-  "interaction_modal.action.reply": "כדי להמשיך, עליך לענות מחשבונך.",
-  "interaction_modal.action.vote": "כדי להמשיך, עליך להצביע מחשבונך.",
+  "interaction_modal.action": "כדי להגיב להודעה של {name}, עליך להזהות בשם המשתמש שלך בשרת המסטודון בו את.ה משתמש.ת.",
   "interaction_modal.go": "המשך",
   "interaction_modal.no_account_yet": "אין לך עדיין חשבון?",
   "interaction_modal.on_another_server": "על שרת אחר",
   "interaction_modal.on_this_server": "על שרת זה",
-  "interaction_modal.title.favourite": "חיבוב החצרוץ של {name}",
-  "interaction_modal.title.follow": "לעקוב אחרי {name}",
-  "interaction_modal.title.reblog": "להדהד את החצרוץ של {name}",
-  "interaction_modal.title.reply": "תשובה לחצרוץ של {name}",
-  "interaction_modal.title.vote": "הצביעו בסקר של {name}",
+  "interaction_modal.title": "יש להזדהות כדי להמשיך",
   "interaction_modal.username_prompt": "למשל {example}",
   "intervals.full.days": "{number, plural, one {# יום} other {# ימים}}",
   "intervals.full.hours": "{number, plural, one {# שעה} other {# שעות}}",
@@ -481,6 +487,7 @@
   "keyboard_shortcuts.home": "פתיחת ציר זמן אישי",
   "keyboard_shortcuts.hotkey": "מקש קיצור",
   "keyboard_shortcuts.legend": "הצגת מקרא",
+  "keyboard_shortcuts.load_more": "התמקדות בכפתור \"טען עוד\"",
   "keyboard_shortcuts.local": "פתיחת ציר זמן קהילתי",
   "keyboard_shortcuts.mention": "לאזכר את המחבר.ת",
   "keyboard_shortcuts.muted": "פתיחת רשימת משתמשים מושתקים",
@@ -489,6 +496,7 @@
   "keyboard_shortcuts.open_media": "פתיחת מדיה",
   "keyboard_shortcuts.pinned": "פתיחת הודעה נעוצות",
   "keyboard_shortcuts.profile": "פתח את פרופיל המשתמש",
+  "keyboard_shortcuts.quote": "לצטט ההודעה",
   "keyboard_shortcuts.reply": "תגובה להודעה",
   "keyboard_shortcuts.requests": "פתיחת רשימת בקשות מעקב",
   "keyboard_shortcuts.search": "להתמקד בחלון החיפוש",
@@ -500,6 +508,8 @@
   "keyboard_shortcuts.translate": "לתרגם הודעה",
   "keyboard_shortcuts.unfocus": "לצאת מתיבת חיבור/חיפוש",
   "keyboard_shortcuts.up": "לנוע במעלה הרשימה",
+  "learn_more_link.got_it": "הבנתי",
+  "learn_more_link.learn_more": "למידע נוסף",
   "lightbox.close": "סגירה",
   "lightbox.next": "הבא",
   "lightbox.previous": "הקודם",
@@ -600,6 +610,7 @@
   "notification.label.mention": "אזכור",
   "notification.label.private_mention": "אזכור פרטי",
   "notification.label.private_reply": "תשובה בפרטי",
+  "notification.label.quote": "{name} ציטט.ה את הודעתך",
   "notification.label.reply": "תשובה",
   "notification.mention": "אזכור",
   "notification.mentioned_you": "אוזכרת על ידי {name}",
@@ -614,6 +625,7 @@
   "notification.moderation_warning.action_suspend": "חשבונך הושעה.",
   "notification.own_poll": "הסקר שלך הסתיים",
   "notification.poll": "סקר שהצבעת בו הסתיים",
+  "notification.quoted_update": "{name} ערך הודעה שהשתמשת בה בציטוט",
   "notification.reblog": "הודעתך הודהדה על ידי {name}",
   "notification.reblog.name_and_others_with_link": "{name} ועוד <a>{count, plural,one {אחד נוסף}other {# נוספים}}</a> הדהדו את הודעתך",
   "notification.relationships_severance_event": "אבד הקשר עם {name}",
@@ -657,6 +669,7 @@
   "notifications.column_settings.mention": "פניות:",
   "notifications.column_settings.poll": "תוצאות סקר:",
   "notifications.column_settings.push": "התראות בדחיפה",
+  "notifications.column_settings.quote": "ציטוטים:",
   "notifications.column_settings.reblog": "הדהודים:",
   "notifications.column_settings.show": "הצגה בטור",
   "notifications.column_settings.sound": "שמע מופעל",
@@ -732,11 +745,18 @@
   "privacy.private.short": "עוקבים",
   "privacy.public.long": "כל הגולשים, מחוברים למסטודון או לא",
   "privacy.public.short": "פומבי",
+  "privacy.quote.anyone": "{visibility}, הציטוט מותר לכל",
+  "privacy.quote.disabled": "{visibility}, האפשרות לציטוט מכובה",
+  "privacy.quote.limited": "{visibility}, האפשרות לציטוט מוגבלת",
   "privacy.unlisted.additional": "ההתנהגות דומה להודעה ציבורית, מלבד שההודעה לא תופיע בפיד החי המקומי או בתגיות, תגליות או חיפוש מסטודון, אפילו אם ביקשת שהחשבון כולו יהיה פומבי.",
-  "privacy.unlisted.long": "פחות חשיפה לאלגוריתמים",
+  "privacy.unlisted.long": "מוסתרת מתוצאות חיפוש במסטודון, נושאים חמים וציר הזמן הציבורי",
   "privacy.unlisted.short": "ציבורי שקט",
   "privacy_policy.last_updated": "עודכן לאחרונה {date}",
   "privacy_policy.title": "מדיניות פרטיות",
+  "quote_error.poll": "לא ניתן לכלול משאל כאשר מחברים הודעת ציטוט.",
+  "quote_error.quote": "רק ציטוט אחד מותר בכל הודעה.",
+  "quote_error.unauthorized": "אין לך הרשאה לצטט את ההודעה הזו.",
+  "quote_error.upload": "ציטוט הכולל מדיה אינו אפשרי.",
   "recommended": "מומלץ",
   "refresh": "רענון",
   "regeneration_indicator.please_stand_by": "נא להמתין.",
@@ -752,6 +772,9 @@
   "relative_time.minutes": "{number} דקות",
   "relative_time.seconds": "{number} שניות",
   "relative_time.today": "היום",
+  "remove_quote_hint.button_label": "הבנתי",
+  "remove_quote_hint.message": "ניתן לעשות זאת מתפריט האפשרויות {icon}",
+  "remove_quote_hint.title": "להסיר את ההודעה המצוטטת?",
   "reply_indicator.attachments": "{count, plural,one {# קובץ מצורף}other {# קבצים מצורפים}}",
   "reply_indicator.cancel": "ביטול",
   "reply_indicator.poll": "משאל",
@@ -843,13 +866,23 @@
   "status.admin_account": "פתח/י ממשק פיקוח דיון עבור @{name}",
   "status.admin_domain": "פתיחת ממשק פיקוח דיון עבור {domain}",
   "status.admin_status": "לפתוח הודעה זו במסך ניהול הדיונים",
+  "status.all_disabled": "הדהודים וציטוטים כובו",
   "status.block": "חסימת @{name}",
   "status.bookmark": "סימניה",
   "status.cancel_reblog_private": "הסרת הדהוד",
+  "status.cannot_quote": "אין לך הרשאה לצטט את ההודעה הזו",
   "status.cannot_reblog": "לא ניתן להדהד חצרוץ זה",
+  "status.contains_quote": "הודעה מכילה ציטוט",
+  "status.context.loading": "נטענות תשובות נוספות",
+  "status.context.loading_error": "טעינת תשובות נוספות נכשלה",
+  "status.context.loading_success": "כל התשובות נטענו",
+  "status.context.more_replies_found": "תשובות נוספות נמצאו",
+  "status.context.retry": "נסה שוב",
+  "status.context.show": "הצג",
   "status.continued_thread": "שרשור מתמשך",
   "status.copy": "העתק/י קישור להודעה זו",
   "status.delete": "מחיקה",
+  "status.delete.success": "ההודעה נמחקה",
   "status.detailed_status": "תצוגת שיחה מפורטת",
   "status.direct": "הודעה פרטית אל @{name}",
   "status.direct_indicator": "הודעה פרטית",
@@ -862,7 +895,7 @@
   "status.filter": "סנן הודעה זו",
   "status.history.created": "{name} יצר/ה {date}",
   "status.history.edited": "{name} ערך/ה {date}",
-  "status.load_more": "עוד",
+  "status.load_more": "טען עוד",
   "status.media.open": "לחץ לפתיחה",
   "status.media.show": "לחץ להצגה",
   "status.media_hidden": "מדיה מוסתרת",
@@ -872,27 +905,43 @@
   "status.mute_conversation": "השתקת שיחה",
   "status.open": "הרחבת הודעה זו",
   "status.pin": "הצמדה לפרופיל שלי",
+  "status.quote": "ציטוט",
+  "status.quote.cancel": "ביטול הודעת ציטוט",
   "status.quote_error.filtered": "מוסתר בהתאם לסננים שלך",
-  "status.quote_error.not_found": "לא ניתן להציג הודעה זו.",
-  "status.quote_error.pending_approval": "הודעה זו מחכה לאישור מידי היוצר המקורי.",
-  "status.quote_error.rejected": "לא ניתן להציג הודעה זו שכן המחבר.ת המקוריים לא הרשו לצטט אותה.",
-  "status.quote_error.removed": "הודעה זו הוסרה על ידי השולחים המקוריים.",
-  "status.quote_error.unauthorized": "הודעה זו לא מוצגת כיוון שאין לך רשות לראותה.",
-  "status.quote_post_author": "פרסום מאת {name}",
+  "status.quote_error.limited_account_hint.action": "להציג בכל זאת",
+  "status.quote_error.limited_account_hint.title": "חשבון הזה הוסתר על ידי מנחי הדיון של {domain}.",
+  "status.quote_error.not_available": "ההודעה לא זמינה",
+  "status.quote_error.pending_approval": "ההודעה בהמתנה לאישור",
+  "status.quote_error.pending_approval_popout.body": "ברשת מסטודון, ניתן להגביל את האפשרות לצטט הודעות. ההודעה הזו ממתינה עד שהמחבר.ת של ההודעה המקורית יאשרו לך את הציטוט.",
+  "status.quote_error.revoked": "ההודעה הוסרה על ידי המחבר.ת",
+  "status.quote_followers_only": "רק עוקביך יוכלו לצטט את ההודעה",
+  "status.quote_manual_review": "מחבר.ת ההודעה יחזרו אליך אחרי בדיקה",
+  "status.quote_noun": "ציטוט",
+  "status.quote_policy_change": "הגדרת הרשאה לציטוט הודעותיך",
+  "status.quote_post_author": "ההודעה צוטטה על ידי @{name}",
+  "status.quote_private": "הודעות פרטיות לא ניתנות לציטוט",
+  "status.quotes": "{count, plural,one {ציטוט}other {ציטוטים}}",
+  "status.quotes.empty": "עוד לא ציטטו את ההודעה הזו. כאשר זה יקרה, הציטוטים יופיעו כאן.",
+  "status.quotes.local_other_disclaimer": "ציטוטים שיידחו על ידי המחברים המקוריים לא יוצגו.",
+  "status.quotes.remote_other_disclaimer": "רק ציטוטים מהשרת {domain} מובטחים שיופיעו פה. ציטוטים שנדחו על ידי המצוטטים לא יופיעו.",
   "status.read_more": "לקרוא עוד",
   "status.reblog": "הדהוד",
-  "status.reblog_private": "להדהד ברמת הנראות המקורית",
+  "status.reblog_or_quote": "להדהד או לצטט",
+  "status.reblog_private": "שיתוף מחדש עם העוקבות והעוקבים שלך",
   "status.reblogged_by": "{name} הידהד/ה:",
   "status.reblogs": "{count, plural, one {הדהוד אחד} two {שני הדהודים} other {# הדהודים}}",
   "status.reblogs.empty": "עוד לא הידהדו את ההודעה הזו. כאשר זה יקרה, ההדהודים יופיעו כאן.",
   "status.redraft": "מחיקה ועריכה מחדש",
   "status.remove_bookmark": "הסרת סימניה",
   "status.remove_favourite": "להסיר מרשימת המועדפים",
+  "status.remove_quote": "הסרת ציטוט",
   "status.replied_in_thread": "תגובה לשרשור",
   "status.replied_to": "בתגובה לחשבון {name}",
   "status.reply": "תגובה",
   "status.replyAll": "תגובה לשרשור",
   "status.report": "דיווח על @{name}",
+  "status.request_quote": "הגשת בקשה להרשות ציטוט",
+  "status.revoke_quote": "הסירו את הודעתי מההודעה של @{name}",
   "status.sensitive_warning": "תוכן רגיש",
   "status.share": "שיתוף",
   "status.show_less_all": "להציג פחות מהכל",
@@ -930,6 +979,7 @@
   "upload_button.label": "הוספת מדיה",
   "upload_error.limit": "קובץ להעלאה חורג מנפח מותר.",
   "upload_error.poll": "לא ניתן להעלות קובץ עם סקר.",
+  "upload_error.quote": "לא ניתן להעלות קובץ כאשר מחברים הודעת ציטוט.",
   "upload_form.drag_and_drop.instructions": "כדי לבחור קובץ מוצמד, יש ללחוץ על מקש רווח או אנטר. בעת הגרירה, השתמשו במקשי החיצים כדי להזיז את הקובץ המוצמד בכל כיוון. לחצו רווח או אנטר בשנית כדי לעזוב את הקובץ במקומו החדש, או לחצו אסקייפ לביטול.",
   "upload_form.drag_and_drop.on_drag_cancel": "הגרירה בוטלה. קובץ המדיה {item} נעזב.",
   "upload_form.drag_and_drop.on_drag_end": "קובץ המדיה {item} נעזב.",
@@ -952,5 +1002,19 @@
   "video.skip_forward": "דילוג קדימה",
   "video.unmute": "ביטול השתקה",
   "video.volume_down": "הנמכת עוצמת השמע",
-  "video.volume_up": "הגברת עוצמת שמע"
+  "video.volume_up": "הגברת עוצמת שמע",
+  "visibility_modal.button_title": "בחירת רמת חשיפה",
+  "visibility_modal.header": "חשיפה והידוּד (אינטראקציה)",
+  "visibility_modal.helper.direct_quoting": "איזכורים פרטיים שנוצרו במסטודון חסומים מציטוט על ידי אחרים.",
+  "visibility_modal.helper.privacy_editing": "רמת החשיפה של ההודעה לא ניתנת לשינוי אחרי הפרסום.",
+  "visibility_modal.helper.privacy_private_self_quote": "ציטוט עצמי של הודעות פרטיות בהודעה ציבורית איננו אפשרי.",
+  "visibility_modal.helper.private_quoting": "הודעות לעוקבים־בלבד שנוצרו במסטודון חסומות מציטוט על ידי אחרים.",
+  "visibility_modal.helper.unlisted_quoting": "כאשר אחרים מצטטים אותך, ההודעות שלהם יוסתרו גם מ\"נושאים חמים\".",
+  "visibility_modal.instructions": "שליטה ביכולות השימוש של קהל הקוראות בהודעה. תוכלו גם לבחור את ברירות המחדל לכל ההודעות העתידיות על ידי ניווט אל <link>העדפות > ברירות מחדל בפרסום</link>.",
+  "visibility_modal.privacy_label": "חשיפה",
+  "visibility_modal.quote_followers": "לעוקבים בלבד",
+  "visibility_modal.quote_label": "למי מותר לצטט",
+  "visibility_modal.quote_nobody": "רק אני",
+  "visibility_modal.quote_public": "כולם",
+  "visibility_modal.save": "שמירה"
 }
diff --git a/app/javascript/mastodon/locales/hi.json b/app/javascript/mastodon/locales/hi.json
index c81a97178a2..63c9be8a8dd 100644
--- a/app/javascript/mastodon/locales/hi.json
+++ b/app/javascript/mastodon/locales/hi.json
@@ -52,7 +52,6 @@
   "account.posts": "टूट्स",
   "account.posts_with_replies": "टूट्स एवं जवाब",
   "account.report": "रिपोर्ट @{name}",
-  "account.requested": "मंजूरी का इंतजार। फॉलो रिक्वेस्ट को रद्द करने के लिए क्लिक करें",
   "account.requested_follow": "{name} ने आपको फॉलो करने के लिए अनुरोध किया है",
   "account.share": "@{name} की प्रोफाइल शेयर करे",
   "account.show_reblogs": "@{name} के बूस्ट दिखाए",
@@ -169,7 +168,6 @@
   "confirmations.redraft.confirm": "मिटायें और पुनःप्रारूपण करें",
   "confirmations.redraft.message": "क्या आप वाकई इस स्टेटस को हटाना चाहते हैं और इसे फिर से ड्राफ्ट करना चाहते हैं? पसंदीदा और बूस्ट खो जाएंगे, और मूल पोस्ट के उत्तर अनाथ हो जाएंगे।",
   "confirmations.unfollow.confirm": "अनफॉलो करें",
-  "confirmations.unfollow.message": "क्या आप वाकई {name} को अनफॉलो करना चाहते हैं?",
   "conversation.delete": "वार्तालाप हटाएँ",
   "conversation.mark_as_read": "पढ़ा गया के रूप में चिह्नित करें",
   "conversation.open": "वार्तालाप देखें",
@@ -287,10 +285,6 @@
   "home.show_announcements": "घोषणाएं दिखाएं",
   "interaction_modal.on_another_server": "एक अलग सर्वर पर",
   "interaction_modal.on_this_server": "इस सर्वर पे",
-  "interaction_modal.title.favourite": "मनपसंद {name} की पोस्ट",
-  "interaction_modal.title.follow": "फॉलो {name}",
-  "interaction_modal.title.reblog": "बूस्ट {name} की पोस्ट",
-  "interaction_modal.title.reply": "{name} की पोस्ट पे रिप्लाई करें",
   "intervals.full.days": "{number, plural,one {# दिन} other {# दिन}}",
   "intervals.full.hours": "{number, plural,one {# घंटा} other {# घंटे}}",
   "keyboard_shortcuts.back": "वापस जाने के लिए",
diff --git a/app/javascript/mastodon/locales/hr.json b/app/javascript/mastodon/locales/hr.json
index bd20756a789..3f8842d91ff 100644
--- a/app/javascript/mastodon/locales/hr.json
+++ b/app/javascript/mastodon/locales/hr.json
@@ -51,7 +51,6 @@
   "account.posts": "Objave",
   "account.posts_with_replies": "Objave i odgovori",
   "account.report": "Prijavi @{name}",
-  "account.requested": "Čekanje na potvrdu. Kliknite za poništavanje zahtjeva za praćenje",
   "account.requested_follow": "{name} zatražio/la je praćenje",
   "account.share": "Podijeli profil @{name}",
   "account.show_reblogs": "Prikaži boostove od @{name}",
@@ -147,7 +146,6 @@
   "confirmations.mute.confirm": "Utišaj",
   "confirmations.redraft.confirm": "Izbriši i ponovno uredi",
   "confirmations.unfollow.confirm": "Prestani pratiti",
-  "confirmations.unfollow.message": "Jeste li sigurni da želite prestati pratiti {name}?",
   "conversation.delete": "Izbriši razgovor",
   "conversation.mark_as_read": "Označi kao pročitano",
   "conversation.open": "Prikaži razgovor",
@@ -240,7 +238,6 @@
   "home.pending_critical_update.title": "Dostupno je kritično sigurnosno ažuriranje!",
   "home.show_announcements": "Prikaži najave",
   "interaction_modal.on_this_server": "Na ovom serveru",
-  "interaction_modal.title.follow": "Prati {name}",
   "intervals.full.days": "{number, plural, one {# dan} other {# dana}}",
   "intervals.full.hours": "{number, plural, one {# sat} few {# sata} other {# sati}}",
   "intervals.full.minutes": "{number, plural, one {# minuta} few {# minute} other {# minuta}}",
@@ -421,7 +418,6 @@
   "status.pin": "Prikvači na profil",
   "status.read_more": "Pročitajte više",
   "status.reblog": "Boostaj",
-  "status.reblog_private": "Boostaj s izvornom vidljivošću",
   "status.reblogged_by": "{name} je boostao/la",
   "status.reblogs.empty": "Nitko još nije boostao ovaj toot. Kada netko to učini, ovdje će biti prikazani.",
   "status.redraft": "Izbriši i ponovno uredi",
diff --git a/app/javascript/mastodon/locales/hu.json b/app/javascript/mastodon/locales/hu.json
index abd9b8ad116..1d1d824a45a 100644
--- a/app/javascript/mastodon/locales/hu.json
+++ b/app/javascript/mastodon/locales/hu.json
@@ -28,6 +28,7 @@
   "account.disable_notifications": "Ne figyelmeztessen, ha @{name} bejegyzést tesz közzé",
   "account.domain_blocking": "Domain tiltás",
   "account.edit_profile": "Profil szerkesztése",
+  "account.edit_profile_short": "Szerkesztés",
   "account.enable_notifications": "Figyelmeztessen, ha @{name} bejegyzést tesz közzé",
   "account.endorse": "Kiemelés a profilodon",
   "account.familiar_followers_many": "{name1}, {name2} és még {othersCount, plural, one {egy valaki} other {# valaki}}, akit ismersz",
@@ -40,6 +41,11 @@
   "account.featured_tags.last_status_never": "Nincs bejegyzés",
   "account.follow": "Követés",
   "account.follow_back": "Viszontkövetés",
+  "account.follow_back_short": "Visszakövetés",
+  "account.follow_request": "Követési kérés",
+  "account.follow_request_cancel": "Kérés törlése",
+  "account.follow_request_cancel_short": "Mégse",
+  "account.follow_request_short": "Kérés",
   "account.followers": "Követő",
   "account.followers.empty": "Ezt a felhasználót még senki sem követi.",
   "account.followers_counter": "{count, plural, one {{counter} követő} other {{counter} követő}}",
@@ -70,7 +76,6 @@
   "account.posts_with_replies": "Bejegyzések és válaszok",
   "account.remove_from_followers": "{name} eltávolítása a követők közül",
   "account.report": "@{name} jelentése",
-  "account.requested": "Jóváhagyásra vár. Kattints a követési kérés visszavonásához",
   "account.requested_follow": "{name} kérte, hogy követhessen",
   "account.requests_to_follow_you": "Kéri, hogy követhessen",
   "account.share": "@{name} profiljának megosztása",
@@ -239,15 +244,25 @@
   "confirmations.missing_alt_text.secondary": "Közzététel mindenképpen",
   "confirmations.missing_alt_text.title": "Helyettesítő szöveg hozzáadása?",
   "confirmations.mute.confirm": "Némítás",
+  "confirmations.quiet_post_quote_info.dismiss": "Ne emlékeztessen újra",
+  "confirmations.quiet_post_quote_info.got_it": "Rendben",
+  "confirmations.quiet_post_quote_info.message": "Ha csendes nyilvános bejegyzést idézel, akkor a bejegyzés el lesz rejtve a felkapottak idővonalairól.",
+  "confirmations.quiet_post_quote_info.title": "Csendes nyilvános bejegyzések idézése",
   "confirmations.redraft.confirm": "Törlés és újraírás",
   "confirmations.redraft.message": "Biztos, hogy ezt a bejegyzést szeretnéd törölni és újraírni? Minden megtolást és kedvencnek jelölést elvesztesz, az eredetire adott válaszok pedig elárvulnak.",
   "confirmations.redraft.title": "Törlöd és újraírod a bejegyzést?",
   "confirmations.remove_from_followers.confirm": "Követő eltávolítása",
   "confirmations.remove_from_followers.message": "{name} követ téged. Biztos, hogy folytatod?",
   "confirmations.remove_from_followers.title": "Követő eltávolítása?",
+  "confirmations.revoke_quote.confirm": "Bejegyzés eltávolítása",
+  "confirmations.revoke_quote.message": "Ez a művelet nem vonható vissza.",
+  "confirmations.revoke_quote.title": "Bejegyzés eltávolítása?",
+  "confirmations.unblock.confirm": "Tiltás feloldása",
+  "confirmations.unblock.title": "{name} tiltásának feloldása?",
   "confirmations.unfollow.confirm": "Követés visszavonása",
-  "confirmations.unfollow.message": "Biztos, hogy vissza szeretnéd vonni {name} követését?",
-  "confirmations.unfollow.title": "Megszünteted a felhasználó követését?",
+  "confirmations.unfollow.title": "{name} követésének megszüntetése?",
+  "confirmations.withdraw_request.confirm": "Kérés visszavonása",
+  "confirmations.withdraw_request.title": "{name} követése kérésének visszavonása?",
   "content_warning.hide": "Bejegyzés elrejtése",
   "content_warning.show": "Megjelenítés mindenképp",
   "content_warning.show_more": "Több megjelenítése",
@@ -289,6 +304,7 @@
   "domain_pill.your_handle": "Saját fióknév:",
   "domain_pill.your_server": "A digitális otthonod, ahol a bejegyzéseid találhatók. Nem tetszik a mostani? Válts kiszolgálót bármikor, és vidd magaddal a követőidet is.",
   "domain_pill.your_username": "Az egyedi azonosítód ezen a kiszolgálón. Lehet, hogy ugyanazon felhasználónév különböző kiszolgálókon is megtalálható.",
+  "dropdown.empty": "Válassz egy lehetőséget",
   "embed.instructions": "Ágyazd be ezt a bejegyzést a weboldaladba az alábbi kód kimásolásával.",
   "embed.preview": "Így fog kinézni:",
   "emoji_button.activity": "Tevékenység",
@@ -424,8 +440,6 @@
   "hints.profiles.see_more_followers": "További követők megtekintése itt: {domain}",
   "hints.profiles.see_more_follows": "További követések megtekintése itt: {domain}",
   "hints.profiles.see_more_posts": "További bejegyzések megtekintése itt: {domain}",
-  "hints.threads.replies_may_be_missing": "A más kiszolgálókról érkező válaszok lehet, hogy hiányoznak.",
-  "hints.threads.see_more": "További válaszok megtekintése itt: {domain}",
   "home.column_settings.show_quotes": "Idézetek megjelenítése",
   "home.column_settings.show_reblogs": "Megtolások megjelenítése",
   "home.column_settings.show_replies": "Válaszok megjelenítése",
@@ -447,20 +461,12 @@
   "ignore_notifications_modal.private_mentions_title": "Figyelmen kívül hagyod a kéretlen privát említéseket?",
   "info_button.label": "Súgó",
   "info_button.what_is_alt_text": "<h1>Mi az alternatív szöveg?</h1> <p>Az alternatív szöveg képleírást biztosít a látássérültek, az alacsony sávszélességű kapcsolatokkal rendelkezők, illetve a bővebb kontextust keresők számára.</p> <p>Az egyértelmű, tömör és objektív alternatív szöveg megírásával mindenki számára akadálymentesebb és könnyebben érthető lesz.</p> <ul> <li>Rögzítsd a fontos elemeket.</li> <li>Foglald össze szövegesen a képeket.</li> <li>Használj szabályos mondatszerkezetet.</li> <li>Kerüld a felesleges információkat.</li> <li>Összetett vizuális ábrákon (például diagramokon vagy térképeken) összpontosíts a trendekre és a legfontosabb megállapításokra.</li> </ul>",
-  "interaction_modal.action.favourite": "A folytatáshoz a fiókodból kell kedvencnek jelölnöd.",
-  "interaction_modal.action.follow": "A folytatáshoz a fiókodból kell követned.",
-  "interaction_modal.action.reblog": "A folytatáshoz a fiókodból kell megosztanod.",
-  "interaction_modal.action.reply": "A folytatáshoz a fiókodból kell válaszolnod rá.",
-  "interaction_modal.action.vote": "A folytatáshoz a fiókodból kell szavaznod.",
+  "interaction_modal.action": "Hogy interakcióba lépj {name} bejegyzésével, be kell jelentkezned a fiókodba az általad használt Mastodon kiszolgálón.",
   "interaction_modal.go": "Ugrás",
   "interaction_modal.no_account_yet": "Még nincs fiókod?",
   "interaction_modal.on_another_server": "Másik kiszolgálón",
   "interaction_modal.on_this_server": "Ezen a kiszolgálón",
-  "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",
-  "interaction_modal.title.reply": "Válasz {name} bejegyzésére",
-  "interaction_modal.title.vote": "Szavazz {name} szavazásában",
+  "interaction_modal.title": "Jelentkezz be a folytatáshoz",
   "interaction_modal.username_prompt": "Például {example}",
   "intervals.full.days": "{number, plural, one {# nap} other {# nap}}",
   "intervals.full.hours": "{number, plural, one {# óra} other {# óra}}",
@@ -481,6 +487,7 @@
   "keyboard_shortcuts.home": "Saját idővonal megnyitása",
   "keyboard_shortcuts.hotkey": "Gyorsbillentyű",
   "keyboard_shortcuts.legend": "Jelmagyarázat megjelenítése",
+  "keyboard_shortcuts.load_more": "Fókuszálás a „Több betöltése” gombra",
   "keyboard_shortcuts.local": "Helyi idővonal megnyitása",
   "keyboard_shortcuts.mention": "Szerző megemlítése",
   "keyboard_shortcuts.muted": "Némított felhasználók listájának megnyitása",
@@ -489,6 +496,7 @@
   "keyboard_shortcuts.open_media": "Média megnyitása",
   "keyboard_shortcuts.pinned": "Kitűzött bejegyzések listájának megnyitása",
   "keyboard_shortcuts.profile": "Szerző profiljának megnyitása",
+  "keyboard_shortcuts.quote": "Bejegyzés idézése",
   "keyboard_shortcuts.reply": "Válasz bejegyzésre",
   "keyboard_shortcuts.requests": "Követési kérések listájának megnyitása",
   "keyboard_shortcuts.search": "Fókuszálás a keresősávra",
@@ -500,6 +508,8 @@
   "keyboard_shortcuts.translate": "Bejegyzés lefordítása",
   "keyboard_shortcuts.unfocus": "Szerkesztés/keresés fókuszból való kivétele",
   "keyboard_shortcuts.up": "Mozgás felfelé a listában",
+  "learn_more_link.got_it": "Rendben",
+  "learn_more_link.learn_more": "További tudnivalók",
   "lightbox.close": "Bezárás",
   "lightbox.next": "Következő",
   "lightbox.previous": "Előző",
@@ -600,6 +610,7 @@
   "notification.label.mention": "Említés",
   "notification.label.private_mention": "Privát említés",
   "notification.label.private_reply": "Privát válasz",
+  "notification.label.quote": "{name} idézte a bejegyzésedet",
   "notification.label.reply": "Válasz",
   "notification.mention": "Említés",
   "notification.mentioned_you": "{name} megemlített",
@@ -614,6 +625,7 @@
   "notification.moderation_warning.action_suspend": "A fiókod felfüggesztésre került.",
   "notification.own_poll": "A szavazásod véget ért",
   "notification.poll": "Véget ért egy szavazás, melyben részt vettél",
+  "notification.quoted_update": "{name} szerkesztett egy bejegyzést, melyet idéztél",
   "notification.reblog": "{name} megtolta a bejegyzésedet",
   "notification.reblog.name_and_others_with_link": "{name} és <a>{count, plural, one {# másik} other {# másik}}</a> megtolta a bejegyzésedet",
   "notification.relationships_severance_event": "Elvesztek a kapcsolatok vele: {name}",
@@ -657,6 +669,7 @@
   "notifications.column_settings.mention": "Megemlítések:",
   "notifications.column_settings.poll": "Szavazási eredmények:",
   "notifications.column_settings.push": "Leküldéses értesítések",
+  "notifications.column_settings.quote": "Idézetek:",
   "notifications.column_settings.reblog": "Megtolások:",
   "notifications.column_settings.show": "Megjelenítés az oszlopban",
   "notifications.column_settings.sound": "Hang lejátszása",
@@ -732,11 +745,18 @@
   "privacy.private.short": "Követők",
   "privacy.public.long": "Bárki a Mastodonon és azon kívül",
   "privacy.public.short": "Nyilvános",
+  "privacy.quote.anyone": "{visibility}, bárki idézheti",
+  "privacy.quote.disabled": "{visibility}, idézés letiltva",
+  "privacy.quote.limited": "{visibility}, idézés korlátozva",
   "privacy.unlisted.additional": "Ez pontosan úgy viselkedik, mint a nyilvános, kivéve, hogy a bejegyzés nem jelenik meg élő hírfolyamokban, hashtagekben, felfedezésben vagy a Mastodonos keresésben, még akkor sem, ha ezt az egész fiókra engedélyezted.",
-  "privacy.unlisted.long": "Kevesebb algoritmikus fanfár",
+  "privacy.unlisted.long": "Elrejtve a Mastodon keresési találataiban, a felkapottak között és a nyilvános idővonalakon",
   "privacy.unlisted.short": "Csendes nyilvános",
   "privacy_policy.last_updated": "Utoljára frissítve: {date}",
   "privacy_policy.title": "Adatvédelmi szabályzat",
+  "quote_error.poll": "Az idézés szavazások esetén nincs engedélyezve.",
+  "quote_error.quote": "Egyszerre csak egy idézet van engedélyezve.",
+  "quote_error.unauthorized": "Nem idézheted ezt a bejegyzést.",
+  "quote_error.upload": "Az idézés médiamellékletek esetén nem engedélyezett.",
   "recommended": "Ajánlott",
   "refresh": "Frissítés",
   "regeneration_indicator.please_stand_by": "Kis türelmet.",
@@ -752,6 +772,9 @@
   "relative_time.minutes": "{number}p",
   "relative_time.seconds": "{number}mp",
   "relative_time.today": "ma",
+  "remove_quote_hint.button_label": "Rendben",
+  "remove_quote_hint.message": "Ezt a {icon} beállítások menüben lehet megtenni.",
+  "remove_quote_hint.title": "Eltávolítod az idézett bejegyzésedet?",
   "reply_indicator.attachments": "{count, plural, one {# melléklet} other {# melléklet}}",
   "reply_indicator.cancel": "Mégsem",
   "reply_indicator.poll": "Szavazás",
@@ -843,13 +866,23 @@
   "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",
   "status.admin_status": "Bejegyzés megnyitása a moderációs felületen",
+  "status.all_disabled": "A megtolások és idézések tiltva vannak",
   "status.block": "@{name} letiltása",
   "status.bookmark": "Könyvjelzőzés",
   "status.cancel_reblog_private": "Megtolás visszavonása",
+  "status.cannot_quote": "Nem idézheted ezt a bejegyzést",
   "status.cannot_reblog": "Ezt a bejegyzést nem lehet megtolni",
+  "status.contains_quote": "Idézést tartalmaz",
+  "status.context.loading": "Több válasz betöltése",
+  "status.context.loading_error": "Az új válaszok nem tölthetőek be",
+  "status.context.loading_success": "Összes válasz betöltve",
+  "status.context.more_replies_found": "Több válasz található",
+  "status.context.retry": "Újra",
+  "status.context.show": "Megjelenítés",
   "status.continued_thread": "Folytatott szál",
   "status.copy": "Link másolása bejegyzésbe",
   "status.delete": "Törlés",
+  "status.delete.success": "Bejegyzés törölve",
   "status.detailed_status": "Részletes beszélgetési nézet",
   "status.direct": "@{name} személyes említése",
   "status.direct_indicator": "Személyes említés",
@@ -872,27 +905,43 @@
   "status.mute_conversation": "Beszélgetés némítása",
   "status.open": "Bejegyzés kibontása",
   "status.pin": "Kitűzés a profilodra",
+  "status.quote": "Idézés",
+  "status.quote.cancel": "Idézés elvetése",
   "status.quote_error.filtered": "A szűrőid miatt rejtett",
-  "status.quote_error.not_found": "Ez a bejegyzés nem jeleníthető meg.",
-  "status.quote_error.pending_approval": "Ez a bejegyzés az eredeti szerző jóváhagyására vár.",
-  "status.quote_error.rejected": "Ez a bejegyzés nem jeleníthető meg, mert az eredeti szerzője nem engedélyezi az idézését.",
-  "status.quote_error.removed": "Ezt a bejegyzés eltávolította a szerzője.",
-  "status.quote_error.unauthorized": "Ez a bejegyzés nem jeleníthető meg, mert nem jogosult a megtekintésére.",
-  "status.quote_post_author": "Szerző: {name}",
+  "status.quote_error.limited_account_hint.action": "Megjelenítés mindenképp",
+  "status.quote_error.limited_account_hint.title": "Ezt a fiókot elrejtették a(z) {domain} moderátorai.",
+  "status.quote_error.not_available": "A bejegyzés nem érhető el",
+  "status.quote_error.pending_approval": "A bejegyzés függőben van",
+  "status.quote_error.pending_approval_popout.body": "A Mastodonon te mondod meg, hogy valaki idézhet-e. Ez a bejegyzés addig függőben marad, amíg az eredeti szerző nem engedélyezi azt.",
+  "status.quote_error.revoked": "A szerző eltávolítta a bejegyzést",
+  "status.quote_followers_only": "Csak a követők idézhetik ezt a bejegyzést",
+  "status.quote_manual_review": "A szerző kézileg fogja jóváhagyni",
+  "status.quote_noun": "Idézés",
+  "status.quote_policy_change": "Módosítás, hogy kik idézhetnek",
+  "status.quote_post_author": "Idézte @{name} bejegyzését",
+  "status.quote_private": "A privát bejegyzések nem idézhetőek",
+  "status.quotes": "{count, plural, one {idézés} other {idézés}}",
+  "status.quotes.empty": "Senki sem idézte még ezt a bejegyzést. Ha valaki megteszi, itt fog megjelenni.",
+  "status.quotes.local_other_disclaimer": "A szerző által elutasított idézések nem fognak megjelenni.",
+  "status.quotes.remote_other_disclaimer": "Csak a(z) {domain} idézései jelennek meg itt garantáltan. A szerző által elutasított idézések nem fognak megjelenni.",
   "status.read_more": "Bővebben",
   "status.reblog": "Megtolás",
-  "status.reblog_private": "Megtolás az eredeti közönségnek",
+  "status.reblog_or_quote": "Megtolás vagy idézés",
+  "status.reblog_private": "Megosztás a követőiddel",
   "status.reblogged_by": "{name} megtolta",
   "status.reblogs": "{count, plural, one {megtolás} other {megtolás}}",
   "status.reblogs.empty": "Senki sem tolta még meg ezt a bejegyzést. Ha valaki megteszi, itt fog megjelenni.",
   "status.redraft": "Törlés és újraírás",
   "status.remove_bookmark": "Könyvjelző eltávolítása",
   "status.remove_favourite": "Eltávolítás a kedvencek közül",
+  "status.remove_quote": "Eltávolítás",
   "status.replied_in_thread": "Válaszolva a szálban",
   "status.replied_to": "Megválaszolva {name} számára",
   "status.reply": "Válasz",
   "status.replyAll": "Válasz a beszélgetésre",
   "status.report": "@{name} bejelentése",
+  "status.request_quote": "Idézés kérése",
+  "status.revoke_quote": "Saját bejegyzés eltávolítása @{name} bejegyzéséből",
   "status.sensitive_warning": "Kényes tartalom",
   "status.share": "Megosztás",
   "status.show_less_all": "Kevesebbet mindenhol",
@@ -930,6 +979,7 @@
   "upload_button.label": "Képek, videó vagy audiófájl hozzáadása",
   "upload_error.limit": "A fájlfeltöltési korlát elérésre került.",
   "upload_error.poll": "Szavazásnál nem lehet fájlt feltölteni.",
+  "upload_error.quote": "Idézésnél nem lehet fájlt feltölteni.",
   "upload_form.drag_and_drop.instructions": "Egy médiamelléklet kiválasztásához nyomj Szóközt vagy Entert. Húzás közben használd a nyílgombokat a médiamelléklet adott irányba történő mozgatásához. A médiamelléklet új pozícióba helyezéséhez nyomd meg a Szóközt vagy az Entert, vagy a megszakításhoz nyomd meg az Esc gombot.",
   "upload_form.drag_and_drop.on_drag_cancel": "Az áthúzás megszakítva. A(z) {item} médiamelléklet el lett dobva.",
   "upload_form.drag_and_drop.on_drag_end": "A(z) {item} médiamelléklet el lett dobva.",
@@ -952,5 +1002,19 @@
   "video.skip_forward": "Előreugrás",
   "video.unmute": "Némítás feloldása",
   "video.volume_down": "Hangerő le",
-  "video.volume_up": "Hangerő fel"
+  "video.volume_up": "Hangerő fel",
+  "visibility_modal.button_title": "Láthatóság beállítása",
+  "visibility_modal.header": "Láthatóság és interakció",
+  "visibility_modal.helper.direct_quoting": "A Mastodonon készült privát említéseket mások nem idézhetik.",
+  "visibility_modal.helper.privacy_editing": "A láthatóság nem módosítható a bejegyzés közzététele után.",
+  "visibility_modal.helper.privacy_private_self_quote": "A privát bejegyzések saját idézései nem tehetőek nyilvánossá.",
+  "visibility_modal.helper.private_quoting": "A Mastodonon írt, csak követőknek szóló bejegyzéseket mások nem idézhetik.",
+  "visibility_modal.helper.unlisted_quoting": "Amikor idéznek tőled, a bejegyzésük rejtve lesz a felkapott bejegyzések hírfolyamain is.",
+  "visibility_modal.instructions": "Állítsd be, hogy ki léphet interakcióba a bejegyzéssel. Az összes bejegyzésre is alkalmazhatod, ha a <link>Beállítások > Bejegyzések alapértelmezései</link> lapra navigálsz.",
+  "visibility_modal.privacy_label": "Láthatóság",
+  "visibility_modal.quote_followers": "Csak követőknek",
+  "visibility_modal.quote_label": "Ki idézhet",
+  "visibility_modal.quote_nobody": "Csak én",
+  "visibility_modal.quote_public": "Bárki",
+  "visibility_modal.save": "Mentés"
 }
diff --git a/app/javascript/mastodon/locales/hy.json b/app/javascript/mastodon/locales/hy.json
index 75f1c69bb9a..0c77efd6cde 100644
--- a/app/javascript/mastodon/locales/hy.json
+++ b/app/javascript/mastodon/locales/hy.json
@@ -43,7 +43,6 @@
   "account.posts": "Գրառումներ",
   "account.posts_with_replies": "Գրառումներ եւ պատասխաններ",
   "account.report": "Բողոքել @{name}֊ի մասին",
-  "account.requested": "Հաստատման կարիք ունի։ Սեղմիր՝ հետեւելու հայցը չեղարկելու համար։",
   "account.requested_follow": "{name}-ը ցանկանում է հետեւել քեզ",
   "account.share": "Կիսուել @{name}֊ի էջով",
   "account.show_reblogs": "Ցուցադրել @{name}֊ի տարածածները",
@@ -125,7 +124,6 @@
   "confirmations.mute.confirm": "Լռեցնել",
   "confirmations.redraft.confirm": "Ջնջել եւ խմբագրել նորից",
   "confirmations.unfollow.confirm": "Ապահետեւել",
-  "confirmations.unfollow.message": "Վստա՞հ ես, որ ուզում ես այլեւս չհետեւել {name}֊ին։",
   "conversation.delete": "Ջնջել խօսակցութիւնը",
   "conversation.mark_as_read": "Նշել որպէս ընթերցուած",
   "conversation.open": "Դիտել խօսակցութիւնը",
@@ -216,10 +214,6 @@
   "home.show_announcements": "Ցուցադրել յայտարարութիւնները",
   "interaction_modal.on_another_server": "Այլ հանգոյցում",
   "interaction_modal.on_this_server": "Այս հանգոյցում",
-  "interaction_modal.title.favourite": "Հաւանել {name}-ի գրառումը",
-  "interaction_modal.title.follow": "Հետեւել {name}-ին",
-  "interaction_modal.title.reblog": "Տարածել {name}-ի գրառումը",
-  "interaction_modal.title.reply": "Պատասխանել {name}-ի գրառմանը",
   "intervals.full.days": "{number, plural, one {# օր} other {# օր}}",
   "intervals.full.hours": "{number, plural, one {# ժամ} other {# ժամ}}",
   "intervals.full.minutes": "{number, plural, one {# րոպէ} other {# րոպէ}}",
@@ -412,7 +406,6 @@
   "status.pin": "Ամրացնել անձնական էջում",
   "status.read_more": "Կարդալ աւելին",
   "status.reblog": "Տարածել",
-  "status.reblog_private": "Տարածել սեփական լսարանին",
   "status.reblogged_by": "{name} տարածել է",
   "status.reblogs.empty": "Այս գրառումը ոչ մէկ դեռ չի տարածել։ Տարածողները կերեւան այստեղ, երբ տարածեն։",
   "status.redraft": "Ջնջել եւ վերակազմել",
diff --git a/app/javascript/mastodon/locales/ia.json b/app/javascript/mastodon/locales/ia.json
index f9deb2f859d..4a9929ddc05 100644
--- a/app/javascript/mastodon/locales/ia.json
+++ b/app/javascript/mastodon/locales/ia.json
@@ -1,6 +1,7 @@
 {
   "about.blocks": "Servitores moderate",
   "about.contact": "Contacto:",
+  "about.default_locale": "Default",
   "about.disclaimer": "Mastodon es software libere, de codice aperte, e un marca de Mastodon gGmbH.",
   "about.domain_blocks.no_reason_available": "Ration non disponibile",
   "about.domain_blocks.preamble": "Mastodon generalmente permitte vider le contento de, e interager con, usatores de qualcunque altere servitor in le fediverso. Istes es le exceptiones que ha essite facite sur iste servitor particular.",
@@ -8,6 +9,7 @@
   "about.domain_blocks.silenced.title": "Limitate",
   "about.domain_blocks.suspended.explanation": "Nulle datos de iste servitor essera processate, immagazinate o excambiate, rendente omne interaction o communication con usatores de iste servitor impossibile.",
   "about.domain_blocks.suspended.title": "Suspendite",
+  "about.language_label": "Lingua",
   "about.not_available": "Iste information non ha essite rendite disponibile sur iste servitor.",
   "about.powered_by": "Rete social decentralisate, actionate per {mastodon}",
   "about.rules": "Regulas del servitor",
@@ -26,6 +28,7 @@
   "account.disable_notifications": "Non plus notificar me quando @{name} publica",
   "account.domain_blocking": "Dominio blocate",
   "account.edit_profile": "Modificar profilo",
+  "account.edit_profile_short": "Modificar",
   "account.enable_notifications": "Notificar me quando @{name} publica",
   "account.endorse": "Evidentiar sur le profilo",
   "account.familiar_followers_many": "Sequite per {name1}, {name2}, e {othersCount, plural, one {un altere que tu cognosce} other {# alteres que tu cognosce}}",
@@ -38,9 +41,15 @@
   "account.featured_tags.last_status_never": "Necun message",
   "account.follow": "Sequer",
   "account.follow_back": "Sequer in retorno",
+  "account.follow_back_short": "Sequer in retorno",
+  "account.follow_request": "Requestar de sequer",
+  "account.follow_request_cancel": "Cancellar requesta",
+  "account.follow_request_cancel_short": "Cancellar",
+  "account.follow_request_short": "Requesta",
   "account.followers": "Sequitores",
   "account.followers.empty": "Necuno seque ancora iste usator.",
   "account.followers_counter": "{count, plural, one {{counter} sequitor} other {{counter} sequitores}}",
+  "account.followers_you_know_counter": "{counter} que tu cognosce",
   "account.following": "Sequente",
   "account.following_counter": "{count, plural, one {{counter} sequite} other {{counter} sequites}}",
   "account.follows.empty": "Iste usator non seque ancora alcuno.",
@@ -67,7 +76,6 @@
   "account.posts_with_replies": "Messages e responsas",
   "account.remove_from_followers": "Remover {name} del sequitores",
   "account.report": "Reportar @{name}",
-  "account.requested": "Attendente le approbation. Clicca pro cancellar le requesta de sequer",
   "account.requested_follow": "{name} ha requestate de sequer te",
   "account.requests_to_follow_you": "Requestas de sequer te",
   "account.share": "Compartir profilo de @{name}",
@@ -216,6 +224,13 @@
   "confirmations.delete_list.confirm": "Deler",
   "confirmations.delete_list.message": "Es tu secur que tu vole deler permanentemente iste lista?",
   "confirmations.delete_list.title": "Deler lista?",
+  "confirmations.discard_draft.confirm": "Discartar e continuar",
+  "confirmations.discard_draft.edit.cancel": "Reprender le modification",
+  "confirmations.discard_draft.edit.message": "Si tu continua, tu perdera tote le modificatione que tu ha apportate al message que tu modifica in iste momento.",
+  "confirmations.discard_draft.edit.title": "Discartar le modificationes de tu message?",
+  "confirmations.discard_draft.post.cancel": "Retornar al esbosso",
+  "confirmations.discard_draft.post.message": "Si tu continua, tu perdera le message que tu compone in iste momento.",
+  "confirmations.discard_draft.post.title": "Discartar tu esbosso de message?",
   "confirmations.discard_edit_media.confirm": "Abandonar",
   "confirmations.discard_edit_media.message": "Tu ha cambiamentos non salvate in le description o previsualisation del objecto multimedial. Abandonar los?",
   "confirmations.follow_to_list.confirm": "Sequer e adder al lista",
@@ -229,15 +244,20 @@
   "confirmations.missing_alt_text.secondary": "Publicar totevia",
   "confirmations.missing_alt_text.title": "Adder texto alternative?",
   "confirmations.mute.confirm": "Silentiar",
+  "confirmations.quiet_post_quote_info.dismiss": "Non rememorar me de novo",
+  "confirmations.quiet_post_quote_info.got_it": "Comprendite",
+  "confirmations.quiet_post_quote_info.message": "Quando tu cita un message public quiete, tu message non apparera in le chronologias de tendentias.",
+  "confirmations.quiet_post_quote_info.title": "Citation de messages public quiete",
   "confirmations.redraft.confirm": "Deler e rescriber",
   "confirmations.redraft.message": "Es tu secur de voler deler iste message e rescriber lo? Le favorites e le impulsos essera perdite, e le responsas al message original essera orphanate.",
   "confirmations.redraft.title": "Deler e rescriber le message?",
   "confirmations.remove_from_followers.confirm": "Remover sequitor",
   "confirmations.remove_from_followers.message": "{name} non plus te sequera. Es tu secur de voler continuar?",
   "confirmations.remove_from_followers.title": "Remover sequitor?",
+  "confirmations.revoke_quote.confirm": "Remover message",
+  "confirmations.revoke_quote.message": "Iste action non pote esser disfacite.",
+  "confirmations.revoke_quote.title": "Remover message?",
   "confirmations.unfollow.confirm": "Non plus sequer",
-  "confirmations.unfollow.message": "Es tu secur que tu vole cessar de sequer {name}?",
-  "confirmations.unfollow.title": "Cessar de sequer le usator?",
   "content_warning.hide": "Celar le message",
   "content_warning.show": "Monstrar in omne caso",
   "content_warning.show_more": "Monstrar plus",
@@ -279,6 +299,7 @@
   "domain_pill.your_handle": "Tu pseudonymo:",
   "domain_pill.your_server": "Tu casa digital, ubi vive tote tu messages. Non te place? Cambia de servitor a omne momento e porta tu sequitores con te.",
   "domain_pill.your_username": "Tu identificator unic sur iste servitor. Es possibile trovar usatores con le mesme nomine de usator sur servitores differente.",
+  "dropdown.empty": "Selige un option",
   "embed.instructions": "Incorpora iste message sur tu sito web con le codice sequente.",
   "embed.preview": "Ecce como illlo parera:",
   "emoji_button.activity": "Activitate",
@@ -296,6 +317,8 @@
   "emoji_button.search_results": "Resultatos de recerca",
   "emoji_button.symbols": "Symbolos",
   "emoji_button.travel": "Viages e locos",
+  "empty_column.account_featured.me": "Tu non ha ancora mittite alcun cosa in evidentia. Sapeva tu que tu pote mitter in evidentia sur tu profilo le hashtags que tu usa le plus e mesmo le contos de tu amicos?",
+  "empty_column.account_featured.other": "{acct} non ha ancora mittite alcun cosa in evidentia. Sapeva tu que tu pote mitter in evidentia sur tu profilo le hashtags que tu usa le plus e mesmo le contos de tu amicos?",
   "empty_column.account_featured_other.unknown": "Iste conto non ha ancora mittite alcun cosa in evidentia.",
   "empty_column.account_hides_collections": "Le usator non ha rendite iste information disponibile",
   "empty_column.account_suspended": "Conto suspendite",
@@ -325,9 +348,15 @@
   "errors.unexpected_crash.copy_stacktrace": "Copiar le traciamento del pila al area de transferentia",
   "errors.unexpected_crash.report_issue": "Reportar problema",
   "explore.suggested_follows": "Personas",
+  "explore.title": "In tendentia",
   "explore.trending_links": "Novas",
   "explore.trending_statuses": "Messages",
   "explore.trending_tags": "Hashtags",
+  "featured_carousel.header": "{count, plural, one {Message fixate} other {Messages fixate}}",
+  "featured_carousel.next": "Sequente",
+  "featured_carousel.post": "Message",
+  "featured_carousel.previous": "Precedente",
+  "featured_carousel.slide": "{index} de {total}",
   "filter_modal.added.context_mismatch_explanation": "Iste categoria de filtros non se applica al contexto in le qual tu ha accedite a iste message. Pro filtrar le message in iste contexto tamben, modifica le filtro.",
   "filter_modal.added.context_mismatch_title": "Contexto incoherente!",
   "filter_modal.added.expired_explanation": "Iste categoria de filtros ha expirate. Tu debe modificar le data de expiration pro applicar lo.",
@@ -380,6 +409,8 @@
   "generic.saved": "Salvate",
   "getting_started.heading": "Prime passos",
   "hashtag.admin_moderation": "Aperir le interfacie de moderation pro #{name}",
+  "hashtag.browse": "Percurrer messages in #{hashtag}",
+  "hashtag.browse_from_account": "Percurrer le messages de @{name} in #{hashtag}",
   "hashtag.column_header.tag_mode.all": "e {additional}",
   "hashtag.column_header.tag_mode.any": "o {additional}",
   "hashtag.column_header.tag_mode.none": "sin {additional}",
@@ -396,7 +427,7 @@
   "hashtag.follow": "Sequer hashtag",
   "hashtag.mute": "Silentiar #{hashtag}",
   "hashtag.unfeature": "Non evidentiar sur le profilo",
-  "hashtag.unfollow": "Non sequer plus le hashtag",
+  "hashtag.unfollow": "Non plus sequer le hashtag",
   "hashtags.and_other": "…e {count, plural, one {un altere} other {# alteres}}",
   "hints.profiles.followers_may_be_missing": "Le sequitores de iste profilo pote mancar.",
   "hints.profiles.follows_may_be_missing": "Le profilos sequite per iste profilo pote mancar.",
@@ -404,8 +435,7 @@
   "hints.profiles.see_more_followers": "Vider plus de sequitores sur {domain}",
   "hints.profiles.see_more_follows": "Vider plus de sequites sur {domain}",
   "hints.profiles.see_more_posts": "Vider plus de messages sur {domain}",
-  "hints.threads.replies_may_be_missing": "Responsas de altere servitores pote mancar.",
-  "hints.threads.see_more": "Vider plus de responsas sur {domain}",
+  "home.column_settings.show_quotes": "Monstrar citationes",
   "home.column_settings.show_reblogs": "Monstrar impulsos",
   "home.column_settings.show_replies": "Monstrar responsas",
   "home.hide_announcements": "Celar annuncios",
@@ -426,20 +456,12 @@
   "ignore_notifications_modal.private_mentions_title": "Ignorar notificationes de mentiones private non requestate?",
   "info_button.label": "Adjuta",
   "info_button.what_is_alt_text": "<h1>Que es texto alternative?</h1><p>Le texto alternative forni descriptiones de imagines a personas con impedimentos visual, con connexiones lente, o qui cerca contexto additional.</p><p>Tu pote meliorar le accessibilitate e le comprension pro totes scribente un texto alternative clar, concise e objective.</p><ul><li>Captura le elementos importante</li><li>Summarisa texto in imagines</li><li>Usa le structura de phrase normal</li><li>Evita information redundante</li><li>In figuras complexe (como diagrammas o mappas), concentra te sur le tendentias e punctos clave</li></ul>",
-  "interaction_modal.action.favourite": "Per favor reveni a tu conto pro marcar isto como favorite.",
-  "interaction_modal.action.follow": "Per favor reveni a tu conto pro sequer.",
-  "interaction_modal.action.reblog": "Per favor reveni a tu conto pro impulsar.",
-  "interaction_modal.action.reply": "Per favor reveni a tu conto pro responder.",
-  "interaction_modal.action.vote": "Per favor reveni a tu conto pro votar.",
+  "interaction_modal.action": "Pro interager con le message de {name}, tu debe acceder a tu conto sur le servitor Mastodon que tu usa.",
   "interaction_modal.go": "Revenir",
   "interaction_modal.no_account_yet": "Tu non ha ancora un conto?",
   "interaction_modal.on_another_server": "Sur un altere servitor",
   "interaction_modal.on_this_server": "Sur iste servitor",
-  "interaction_modal.title.favourite": "Marcar le message de {name} como favorite",
-  "interaction_modal.title.follow": "Sequer {name}",
-  "interaction_modal.title.reblog": "Impulsar le message de {name}",
-  "interaction_modal.title.reply": "Responder al message de {name}",
-  "interaction_modal.title.vote": "Votar in le sondage de {name}",
+  "interaction_modal.title": "Aperi session pro continuar",
   "interaction_modal.username_prompt": "P.ex. {example}",
   "intervals.full.days": "{number, plural, one {# die} other {# dies}}",
   "intervals.full.hours": "{number, plural, one {# hora} other {# horas}}",
@@ -460,6 +482,7 @@
   "keyboard_shortcuts.home": "Aperir le chronologia de initio",
   "keyboard_shortcuts.hotkey": "Clave accelerator",
   "keyboard_shortcuts.legend": "Monstrar iste legenda",
+  "keyboard_shortcuts.load_more": "Focalisar le button “Cargar plus”",
   "keyboard_shortcuts.local": "Aperir le chronologia local",
   "keyboard_shortcuts.mention": "Mentionar le autor",
   "keyboard_shortcuts.muted": "Aperir lista de usatores silentiate",
@@ -468,6 +491,7 @@
   "keyboard_shortcuts.open_media": "Aperir multimedia",
   "keyboard_shortcuts.pinned": "Aperir le lista de messages fixate",
   "keyboard_shortcuts.profile": "Aperir le profilo del autor",
+  "keyboard_shortcuts.quote": "Citar message",
   "keyboard_shortcuts.reply": "Responder al message",
   "keyboard_shortcuts.requests": "Aperir le lista de requestas de sequimento",
   "keyboard_shortcuts.search": "Focalisar barra de recerca",
@@ -479,6 +503,8 @@
   "keyboard_shortcuts.translate": "a traducer un message",
   "keyboard_shortcuts.unfocus": "Disfocalisar le area de composition de texto/de recerca",
   "keyboard_shortcuts.up": "Displaciar in alto in le lista",
+  "learn_more_link.got_it": "Comprendite",
+  "learn_more_link.learn_more": "Pro saper plus",
   "lightbox.close": "Clauder",
   "lightbox.next": "Sequente",
   "lightbox.previous": "Precedente",
@@ -528,8 +554,10 @@
   "mute_modal.you_wont_see_mentions": "Tu non videra le messages que mentiona iste persona.",
   "mute_modal.you_wont_see_posts": "Iste persona pote totevia vider tu messages, ma tu non videra le sues.",
   "navigation_bar.about": "A proposito",
+  "navigation_bar.account_settings": "Contrasigno e securitate",
   "navigation_bar.administration": "Administration",
   "navigation_bar.advanced_interface": "Aperir in le interfacie web avantiate",
+  "navigation_bar.automated_deletion": "Deletion automatic del message",
   "navigation_bar.blocks": "Usatores blocate",
   "navigation_bar.bookmarks": "Marcapaginas",
   "navigation_bar.direct": "Mentiones private",
@@ -539,13 +567,23 @@
   "navigation_bar.follow_requests": "Requestas de sequimento",
   "navigation_bar.followed_tags": "Hashtags sequite",
   "navigation_bar.follows_and_followers": "Sequites e sequitores",
+  "navigation_bar.import_export": "Importar e exportar",
   "navigation_bar.lists": "Listas",
+  "navigation_bar.live_feed_local": "Canal in directo (local)",
+  "navigation_bar.live_feed_public": "Canal in directo (public)",
   "navigation_bar.logout": "Clauder session",
   "navigation_bar.moderation": "Moderation",
+  "navigation_bar.more": "Plus",
   "navigation_bar.mutes": "Usatores silentiate",
   "navigation_bar.opened_in_classic_interface": "Messages, contos e altere paginas specific es aperite per predefinition in le interfacie web classic.",
   "navigation_bar.preferences": "Preferentias",
+  "navigation_bar.privacy_and_reach": "Confidentialitate e portata",
   "navigation_bar.search": "Cercar",
+  "navigation_bar.search_trends": "Cercar / In tendentia",
+  "navigation_panel.collapse_followed_tags": "Contraher le menu de hashtags sequite",
+  "navigation_panel.collapse_lists": "Contraher le menu de listas",
+  "navigation_panel.expand_followed_tags": "Expander le menu de hashtags sequite",
+  "navigation_panel.expand_lists": "Expander le menu de listas",
   "not_signed_in_indicator.not_signed_in": "Es necessari aperir session pro acceder a iste ressource.",
   "notification.admin.report": "{name} ha reportate {target}",
   "notification.admin.report_account": "{name} ha reportate {count, plural, one {un message} other {# messages}} de {target} per {category}",
@@ -567,6 +605,7 @@
   "notification.label.mention": "Mention",
   "notification.label.private_mention": "Mention private",
   "notification.label.private_reply": "Responsa private",
+  "notification.label.quote": "{name} ha citate tu message",
   "notification.label.reply": "Responder",
   "notification.mention": "Mention",
   "notification.mentioned_you": "{name} te ha mentionate",
@@ -581,6 +620,7 @@
   "notification.moderation_warning.action_suspend": "Tu conto ha essite suspendite.",
   "notification.own_poll": "Tu sondage ha finite",
   "notification.poll": "Un sondage in le qual tu ha votate ha finite",
+  "notification.quoted_update": "{name} ha modificate un message que tu ha citate",
   "notification.reblog": "{name} ha impulsate tu message",
   "notification.reblog.name_and_others_with_link": "{name} e <a>{count, plural, one {# altere} other {# alteres}}</a> ha impulsate tu message",
   "notification.relationships_severance_event": "Connexiones perdite con {name}",
@@ -624,6 +664,7 @@
   "notifications.column_settings.mention": "Mentiones:",
   "notifications.column_settings.poll": "Resultatos del sondage:",
   "notifications.column_settings.push": "Notificationes push",
+  "notifications.column_settings.quote": "Citationes:",
   "notifications.column_settings.reblog": "Impulsos:",
   "notifications.column_settings.show": "Monstrar in columna",
   "notifications.column_settings.sound": "Reproducer sono",
@@ -699,11 +740,18 @@
   "privacy.private.short": "Sequitores",
   "privacy.public.long": "Quicunque, sur Mastodon o non",
   "privacy.public.short": "Public",
+  "privacy.quote.anyone": "{visibility}, omnes pote citar",
+  "privacy.quote.disabled": "{visibility}, citation disactivate",
+  "privacy.quote.limited": "{visibility}, citation limitate",
   "privacy.unlisted.additional": "Isto es exactemente como public, excepte que le message non apparera in fluxos in directo, in hashtags, in Explorar, o in le recerca de Mastodon, mesmo si tu ha optate pro render tote le conto discoperibile.",
-  "privacy.unlisted.long": "Minus fanfares algorithmic",
+  "privacy.unlisted.long": "Non apparera in le resultatos de recerca, tendentias e chronologias public de Mastodon",
   "privacy.unlisted.short": "Public, non listate",
   "privacy_policy.last_updated": "Ultime actualisation {date}",
   "privacy_policy.title": "Politica de confidentialitate",
+  "quote_error.poll": "Non es permittite citar sondages.",
+  "quote_error.quote": "Solmente un citation al vice es permittite.",
+  "quote_error.unauthorized": "Tu non es autorisate a citar iste message.",
+  "quote_error.upload": "Non es permittite citar con annexos multimedial.",
   "recommended": "Recommendate",
   "refresh": "Refrescar",
   "regeneration_indicator.please_stand_by": "Un momento, per favor.",
@@ -719,6 +767,9 @@
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "hodie",
+  "remove_quote_hint.button_label": "Comprendite",
+  "remove_quote_hint.message": "Tu pote facer lo desde le menu de optiones {icon}.",
+  "remove_quote_hint.title": "Vole remover tu message citate?",
   "reply_indicator.attachments": "{count, plural, one {# annexo} other {# annexos}}",
   "reply_indicator.cancel": "Cancellar",
   "reply_indicator.poll": "Sondage",
@@ -772,6 +823,7 @@
   "report_notification.categories.violation": "Violation del regulas",
   "report_notification.categories.violation_sentence": "violation del regulas",
   "report_notification.open": "Aperir reporto",
+  "search.clear": "Rader le recerca",
   "search.no_recent_searches": "Nulle recercas recente",
   "search.placeholder": "Cercar",
   "search.quick_action.account_search": "Profilos correspondente a {x}",
@@ -809,13 +861,23 @@
   "status.admin_account": "Aperir le interfacie de moderation pro @{name}",
   "status.admin_domain": "Aperir le interfacie de moderation pro {domain}",
   "status.admin_status": "Aperir iste message in le interfacie de moderation",
+  "status.all_disabled": "Impulso e citation es disactivate",
   "status.block": "Blocar @{name}",
   "status.bookmark": "Adder al marcapaginas",
   "status.cancel_reblog_private": "Disfacer impulso",
+  "status.cannot_quote": "Tu non es autorisate a citar iste message",
   "status.cannot_reblog": "Iste message non pote esser impulsate",
+  "status.contains_quote": "Contine un citation",
+  "status.context.loading": "Cargante plus responsas",
+  "status.context.loading_error": "Non poteva cargar nove responsas",
+  "status.context.loading_success": "Tote le responsas cargate",
+  "status.context.more_replies_found": "Plus responsas trovate",
+  "status.context.retry": "Tentar de novo",
+  "status.context.show": "Monstrar",
   "status.continued_thread": "Continuation del discussion",
   "status.copy": "Copiar ligamine a message",
   "status.delete": "Deler",
+  "status.delete.success": "Message delite",
   "status.detailed_status": "Vista detaliate del conversation",
   "status.direct": "Mentionar privatemente @{name}",
   "status.direct_indicator": "Mention private",
@@ -838,20 +900,41 @@
   "status.mute_conversation": "Silentiar conversation",
   "status.open": "Expander iste message",
   "status.pin": "Fixar sur profilo",
+  "status.quote": "Citar",
+  "status.quote.cancel": "Cancellar le citation",
+  "status.quote_error.filtered": "Celate a causa de un de tu filtros",
+  "status.quote_error.limited_account_hint.action": "Monstrar in omne caso",
+  "status.quote_error.limited_account_hint.title": "Iste conto ha essite celate per le moderatores de {domain}.",
+  "status.quote_error.not_available": "Message indisponibile",
+  "status.quote_error.pending_approval": "Message pendente",
+  "status.quote_error.pending_approval_popout.body": "Sur Mastodon, tu pote controlar si on pote citar te. Iste message attende ora le approbation del autor original.",
+  "status.quote_error.revoked": "Message removite per le autor",
+  "status.quote_followers_only": "Solmente sequitores pote citar iste message",
+  "status.quote_manual_review": "Le autor lo examinara manualmente",
+  "status.quote_noun": "Citation",
+  "status.quote_policy_change": "Cambiar qui pote citar",
+  "status.quote_post_author": "Ha citate un message de @{name}",
+  "status.quote_private": "Le messages private non pote esser citate",
+  "status.quotes": "{count, plural, one {citation} other {citationes}}",
+  "status.quotes.empty": "Necuno ha ancora citate iste message. Quando alcuno lo face, illo apparera hic.",
   "status.read_more": "Leger plus",
   "status.reblog": "Impulsar",
-  "status.reblog_private": "Impulsar con visibilitate original",
+  "status.reblog_or_quote": "Impulsar o citar",
+  "status.reblog_private": "Re-compartir con tu sequitores",
   "status.reblogged_by": "Impulsate per {name}",
   "status.reblogs": "{count, plural, one {impulso} other {impulsos}}",
   "status.reblogs.empty": "Necuno ha ancora impulsate iste message. Quando alcuno lo face, le impulsos apparera hic.",
   "status.redraft": "Deler e reconciper",
   "status.remove_bookmark": "Remover marcapagina",
   "status.remove_favourite": "Remover del favoritos",
-  "status.replied_in_thread": "Respondite in le discussion",
-  "status.replied_to": "Respondite a {name}",
+  "status.remove_quote": "Remover",
+  "status.replied_in_thread": "Responsa in discussion",
+  "status.replied_to": "Responsa a {name}",
   "status.reply": "Responder",
   "status.replyAll": "Responder al discussion",
   "status.report": "Reportar @{name}",
+  "status.request_quote": "Demandar a citar",
+  "status.revoke_quote": "Remover mi message del message de @{name}",
   "status.sensitive_warning": "Contento sensibile",
   "status.share": "Compartir",
   "status.show_less_all": "Monstrar minus pro totes",
@@ -867,9 +950,13 @@
   "subscribed_languages.save": "Salvar le cambiamentos",
   "subscribed_languages.target": "Cambiar le linguas subscribite pro {target}",
   "tabs_bar.home": "Initio",
+  "tabs_bar.menu": "Menu",
   "tabs_bar.notifications": "Notificationes",
+  "tabs_bar.publish": "Nove message",
+  "tabs_bar.search": "Cercar",
   "terms_of_service.effective_as_of": "In vigor a partir de {date}",
   "terms_of_service.title": "Conditiones de servicio",
+  "terms_of_service.upcoming_changes_on": "Cambiamentos a venir le {date}",
   "time_remaining.days": "{number, plural, one {# die} other {# dies}} restante",
   "time_remaining.hours": "{number, plural, one {# hora} other {# horas}} restante",
   "time_remaining.minutes": "{number, plural, one {# minuta} other {# minutas}} restante",
@@ -877,7 +964,7 @@
   "time_remaining.seconds": "{number, plural, one {# secunda} other {# secundas}} restante",
   "trends.counter_by_accounts": "{count, plural, one {{counter} persona} other {{counter} personas}} in le passate {days, plural, one {die} other {{days} dies}}",
   "trends.trending_now": "Ora in tendentias",
-  "ui.beforeunload": "Tu esbosso essera predite si tu exi de Mastodon.",
+  "ui.beforeunload": "Tu esbosso essera perdite si tu exi de Mastodon.",
   "units.short.billion": "{count}B",
   "units.short.million": "{count}M",
   "units.short.thousand": "{count}K",
@@ -885,6 +972,7 @@
   "upload_button.label": "Adde imagines, un video o un file de audio",
   "upload_error.limit": "Limite de incargamento de files excedite.",
   "upload_error.poll": "Incargamento de files non permittite con sondages.",
+  "upload_error.quote": "Non es permittite incargar files con citationes.",
   "upload_form.drag_and_drop.instructions": "Pro prender un annexo multimedial, preme sur le barra de spatios o Enter. Trahente lo, usa le claves de flecha pro displaciar le annexo multimedial in un certe direction. Preme le barra de spatios o Enter de novo pro deponer le annexo multimedial in su nove position, o preme sur Escape pro cancellar.",
   "upload_form.drag_and_drop.on_drag_cancel": "Le displaciamento ha essite cancellate. Le annexo multimedial {item} ha essite deponite.",
   "upload_form.drag_and_drop.on_drag_end": "Le annexo multimedial {item} ha essite deponite.",
@@ -904,7 +992,22 @@
   "video.pause": "Pausa",
   "video.play": "Reproducer",
   "video.skip_backward": "Saltar a retro",
+  "video.skip_forward": "Avantiar",
   "video.unmute": "Non plus silentiar",
   "video.volume_down": "Abassar le volumine",
-  "video.volume_up": "Augmentar le volumine"
+  "video.volume_up": "Augmentar le volumine",
+  "visibility_modal.button_title": "Definir visibilitate",
+  "visibility_modal.header": "Visibilitate e interaction",
+  "visibility_modal.helper.direct_quoting": "Le mentiones private scribite sur Mastodon non pote esser citate per alteres.",
+  "visibility_modal.helper.privacy_editing": "Le visibilitate de un message non pote esser cambiate post su publication.",
+  "visibility_modal.helper.privacy_private_self_quote": "Le auto-citationes de messages private non pote esser rendite public.",
+  "visibility_modal.helper.private_quoting": "Le messages limitate al sequitores scribite sur Mastodon non pote esser citate per alteres.",
+  "visibility_modal.helper.unlisted_quoting": "Quando un persona te cita, su message essera tamben celate del chronologia \"In tendentia\".",
+  "visibility_modal.instructions": "Controla qui pote interager con iste message. Tu pote etiam applicar le parametros a tote le messages futur desde <link>Preferentias > Parametros de publication predefinite</link>.",
+  "visibility_modal.privacy_label": "Visibilitate",
+  "visibility_modal.quote_followers": "Solmente sequitores",
+  "visibility_modal.quote_label": "Qui pote citar",
+  "visibility_modal.quote_nobody": "Solo io",
+  "visibility_modal.quote_public": "Omnes",
+  "visibility_modal.save": "Salvar"
 }
diff --git a/app/javascript/mastodon/locales/id.json b/app/javascript/mastodon/locales/id.json
index f12e1f6e6dd..c8d7d8ef001 100644
--- a/app/javascript/mastodon/locales/id.json
+++ b/app/javascript/mastodon/locales/id.json
@@ -1,13 +1,15 @@
 {
   "about.blocks": "Server yang dimoderasi",
   "about.contact": "Kontak:",
-  "about.disclaimer": "perangkat lunak sumber terbuperangkat lunak sumber terbukaka184124.",
+  "about.default_locale": "Default",
+  "about.disclaimer": "Mastodon adalah perangkat lunak bebas dan sumber terbuka, serta merek dagang milik Mastodon gGmbH.",
   "about.domain_blocks.no_reason_available": "Alasan tidak tersedia",
   "about.domain_blocks.preamble": "Mastodon umumnya mengizinkan Anda untuk melihat konten dan berinteraksi dengan pengguna dari server lain di fediverse. Ini adalah pengecualian yang dibuat untuk beberapa server.",
   "about.domain_blocks.silenced.explanation": "Anda secara umum tidak melihat profil dan konten dari server ini, kecuali jika Anda mencarinya atau memilihnya dengan mengikuti secara eksplisit.",
   "about.domain_blocks.silenced.title": "Terbatas",
   "about.domain_blocks.suspended.explanation": "Tidak ada data yang diproses, disimpan, atau ditukarkan dari server ini, membuat interaksi atau komunikasi dengan pengguna dari server ini tidak mungkin dilakukan.",
   "about.domain_blocks.suspended.title": "Ditangguhkan",
+  "about.language_label": "Bahasa",
   "about.not_available": "Informasi ini belum tersedia di server ini.",
   "about.powered_by": "Media sosial terdesentralisasi diberdayakan oleh {mastodon}",
   "about.rules": "Aturan server",
@@ -28,6 +30,10 @@
   "account.edit_profile": "Ubah profil",
   "account.enable_notifications": "Beritahu saya saat @{name} memposting",
   "account.endorse": "Tampilkan di profil",
+  "account.familiar_followers_one": "Diikuti oleh {name1}",
+  "account.familiar_followers_two": "Diikuti oleh {name1} dan {name2}",
+  "account.featured": "Unggulan",
+  "account.featured.accounts": "Profil",
   "account.featured_tags.last_status_at": "Kiriman terakhir pada {date}",
   "account.featured_tags.last_status_never": "Tidak ada kiriman",
   "account.follow": "Ikuti",
@@ -58,7 +64,6 @@
   "account.posts": "Kiriman",
   "account.posts_with_replies": "Kiriman dan balasan",
   "account.report": "Laporkan @{name}",
-  "account.requested": "Menunggu persetujuan. Klik untuk membatalkan permintaan",
   "account.requested_follow": "{name} ingin mengikuti Anda",
   "account.share": "Bagikan profil @{name}",
   "account.show_reblogs": "Tampilkan boost dari @{name}",
@@ -184,8 +189,6 @@
   "confirmations.redraft.message": "Apakah anda yakin ingin menghapus postingan ini dan menyusun ulang postingan ini? Favorit dan peningkatan akan hilang, dan balasan ke postingan asli tidak akan terhubung ke postingan manapun.",
   "confirmations.redraft.title": "Delete & redraft post?",
   "confirmations.unfollow.confirm": "Berhenti mengikuti",
-  "confirmations.unfollow.message": "Apakah Anda ingin berhenti mengikuti {name}?",
-  "confirmations.unfollow.title": "Unfollow user?",
   "content_warning.hide": "Hide post",
   "content_warning.show": "Show anyway",
   "conversation.delete": "Hapus percakapan",
@@ -267,7 +270,7 @@
   "explore.trending_links": "Berita",
   "explore.trending_statuses": "Kiriman",
   "explore.trending_tags": "Tagar",
-  "filter_modal.added.context_mismatch_explanation": "Indonesia Translate",
+  "filter_modal.added.context_mismatch_explanation": "Kategori filter ini tidak berlaku untuk konteks di mana Anda mengakses postingan ini. Jika Anda ingin postingan tersebut difilter juga dalam konteks ini, Anda perlu mengedit filter.",
   "filter_modal.added.context_mismatch_title": "Konteks tidak cocok!",
   "filter_modal.added.expired_explanation": "Kategori saringan ini telah kedaluwarsa, Anda harus mengubah tanggal kedaluwarsa untuk diterapkan.",
   "filter_modal.added.expired_title": "Saringan kedaluwarsa!",
@@ -329,44 +332,41 @@
   "home.show_announcements": "Tampilkan pengumuman",
   "interaction_modal.on_another_server": "Di server lain",
   "interaction_modal.on_this_server": "Di server ini",
-  "interaction_modal.title.follow": "Ikuti {name}",
-  "interaction_modal.title.reblog": "Boost kiriman {name}",
-  "interaction_modal.title.reply": "Balas ke kiriman {name}",
   "intervals.full.days": "{number, plural, other {# hari}}",
   "intervals.full.hours": "{number, plural, other {# jam}}",
   "intervals.full.minutes": "{number, plural, other {# menit}}",
-  "keyboard_shortcuts.back": "untuk kembali",
-  "keyboard_shortcuts.blocked": "buka daftar pengguna terblokir",
-  "keyboard_shortcuts.boost": "untuk menyebarkan",
+  "keyboard_shortcuts.back": "Kembali ke belakang",
+  "keyboard_shortcuts.blocked": "Buka daftar pengguna yang diblokir",
+  "keyboard_shortcuts.boost": "Tingkatkan postingan",
   "keyboard_shortcuts.column": "Fokus kolom",
-  "keyboard_shortcuts.compose": "untuk fokus ke area penulisan",
+  "keyboard_shortcuts.compose": "Fokus pada kotak teks",
   "keyboard_shortcuts.description": "Deskripsi",
   "keyboard_shortcuts.direct": "to open direct messages column",
-  "keyboard_shortcuts.down": "untuk pindah ke bawah dalam sebuah daftar",
+  "keyboard_shortcuts.down": "Pindah ke bawah dalam daftar",
   "keyboard_shortcuts.enter": "Buka kiriman",
-  "keyboard_shortcuts.federated": "buka linimasa gabungan",
+  "keyboard_shortcuts.federated": "Buka linimasa terpadu",
   "keyboard_shortcuts.heading": "Pintasan keyboard",
   "keyboard_shortcuts.home": "Buka linimasa beranda",
   "keyboard_shortcuts.hotkey": "Pintasan",
-  "keyboard_shortcuts.legend": "tampilkan legenda ini",
-  "keyboard_shortcuts.local": "buka linimasa lokal",
-  "keyboard_shortcuts.mention": "sebut pencipta",
-  "keyboard_shortcuts.muted": "buka daftar pengguna terbisukan",
+  "keyboard_shortcuts.legend": "Tampilkan legenda ini",
+  "keyboard_shortcuts.local": "Buka linimasa lokal",
+  "keyboard_shortcuts.mention": "Sebutkan penulis",
+  "keyboard_shortcuts.muted": "Buka daftar pengguna yang dibisukan",
   "keyboard_shortcuts.my_profile": "Buka profil Anda",
-  "keyboard_shortcuts.notifications": "buka kolom notifikasi",
-  "keyboard_shortcuts.open_media": "membuka media",
+  "keyboard_shortcuts.notifications": "Buka kolom pemberitahuan",
+  "keyboard_shortcuts.open_media": "Buka media",
   "keyboard_shortcuts.pinned": "buka daftar toot tersemat",
-  "keyboard_shortcuts.profile": "buka profil pencipta",
-  "keyboard_shortcuts.reply": "balas",
-  "keyboard_shortcuts.requests": "buka daftar permintaan ikuti",
-  "keyboard_shortcuts.search": "untuk fokus mencari",
-  "keyboard_shortcuts.spoilers": "untuk menampilkan/menyembunyikan bidang CW",
-  "keyboard_shortcuts.start": "buka kolom \"memulai\"",
-  "keyboard_shortcuts.toggle_hidden": "tampilkan/sembunyikan teks di belakang CW",
-  "keyboard_shortcuts.toggle_sensitivity": "tampilkan/sembunyikan media",
-  "keyboard_shortcuts.toot": "mulai toot baru",
-  "keyboard_shortcuts.unfocus": "untuk tidak fokus pada area teks/pencarian",
-  "keyboard_shortcuts.up": "untuk memindah ke atas pada daftar",
+  "keyboard_shortcuts.profile": "Buka profil penulis",
+  "keyboard_shortcuts.reply": "Balas posting",
+  "keyboard_shortcuts.requests": "Buka daftar permintaan mengikuti",
+  "keyboard_shortcuts.search": "Fokus ke kotak pencarian",
+  "keyboard_shortcuts.spoilers": "Tampilkan/sembunyikan bidang CW",
+  "keyboard_shortcuts.start": "Buka kolom “Mulai”",
+  "keyboard_shortcuts.toggle_hidden": "Tampilkan/sembunyikan teks di belakang CW",
+  "keyboard_shortcuts.toggle_sensitivity": "Tampilkan/sembunyikan media",
+  "keyboard_shortcuts.toot": "Buat posting baru",
+  "keyboard_shortcuts.unfocus": "Hapus fokus pada kotak teks/kotak pencarian",
+  "keyboard_shortcuts.up": "Naik ke posisi atas dalam daftar",
   "lightbox.close": "Tutup",
   "lightbox.next": "Selanjutnya",
   "lightbox.previous": "Sebelumnya",
@@ -495,7 +495,7 @@
   "report.statuses.subtitle": "Pilih semua yang berlaku",
   "report.statuses.title": "Adakah kiriman yang mendukung pelaporan ini?",
   "report.submit": "Kirim",
-  "report.target": "Melaporkan",
+  "report.target": "Melaporkan {target}",
   "report.thanks.take_action": "Berikut adalah pilihan Anda untuk mengatur apa yang Anda lihat di Mastodon:",
   "report.thanks.take_action_actionable": "Ketika kami meninjau ini, Anda dapat mengambil tindakan terhadap @{name}:",
   "report.thanks.title": "Tidak ingin melihat ini?",
@@ -544,7 +544,6 @@
   "status.pin": "Sematkan di profil",
   "status.read_more": "Baca lebih banyak",
   "status.reblog": "Boost",
-  "status.reblog_private": "Boost dengan visibilitas asli",
   "status.reblogged_by": "{name} mem-boost",
   "status.reblogs.empty": "Belum ada yang mem-boost toot ini. Ketika seseorang melakukannya, mereka akan muncul di sini.",
   "status.redraft": "Hapus & draf ulang",
diff --git a/app/javascript/mastodon/locales/ie.json b/app/javascript/mastodon/locales/ie.json
index e0c51751660..e978cfafc4b 100644
--- a/app/javascript/mastodon/locales/ie.json
+++ b/app/javascript/mastodon/locales/ie.json
@@ -52,7 +52,6 @@
   "account.posts": "Postas",
   "account.posts_with_replies": "Postas e replicas",
   "account.report": "Raportar @{name}",
-  "account.requested": "Atendent aprobation. Cliccar por anullar li petition de sequer",
   "account.requested_follow": "{name} ha petit sequer te",
   "account.share": "Distribuer li profil de @{name}",
   "account.show_reblogs": "Monstrar boosts de @{name}",
@@ -169,7 +168,6 @@
   "confirmations.redraft.confirm": "Deleter & redacter",
   "confirmations.redraft.message": "Esque tu vermen vole deleter ti-ci posta e redacter it? Favorites e boosts va esser perdit, e responses al posta original va esser orfanat.",
   "confirmations.unfollow.confirm": "Dessequer",
-  "confirmations.unfollow.message": "Esque tu vermen vole dessequer {name}?",
   "conversation.delete": "Deleter conversation",
   "conversation.mark_as_read": "Marcar quam leet",
   "conversation.open": "Vider conversation",
@@ -325,10 +323,6 @@
   "home.show_announcements": "Monstrar proclamationes",
   "interaction_modal.on_another_server": "Sur un servitor diferent",
   "interaction_modal.on_this_server": "Sur ti-ci servitor",
-  "interaction_modal.title.favourite": "Favoritisar li posta de {name}",
-  "interaction_modal.title.follow": "Sequer {name}",
-  "interaction_modal.title.reblog": "Boostar li posta de {name}",
-  "interaction_modal.title.reply": "Responder al posta de {name}",
   "intervals.full.days": "{number, plural, one {# die} other {# dies}}",
   "intervals.full.hours": "{number, plural, one {# hor} other {# hores}}",
   "intervals.full.minutes": "{number, plural, one {# minute} other {# minutes}}",
@@ -509,7 +503,6 @@
   "privacy.public.long": "Quicunc in e ex Mastodon",
   "privacy.public.short": "Public",
   "privacy.unlisted.additional": "It acte just quam public, except que li posta ne va aparir in tendentie o hashtags, explorar, o sercha de Mastodon, mem si tu ha optet por les sur tui tot conto.",
-  "privacy.unlisted.long": "Minu fanfare algoritmic",
   "privacy.unlisted.short": "Quiet public",
   "privacy_policy.last_updated": "Ultimmen actualisat ye {date}",
   "privacy_policy.title": "Politica pri Privatie",
@@ -635,7 +628,6 @@
   "status.pin": "Pinglar sur profil",
   "status.read_more": "Leer plu",
   "status.reblog": "Boostar",
-  "status.reblog_private": "Boostar con li original visibilitá",
   "status.reblogged_by": "{name} boostat",
   "status.reblogs": "{count, plural, one {boost} other {boosts}}",
   "status.reblogs.empty": "Ancor nequi ha boostat ti-ci posta. Quande alqui fa it, ilu va aparir ci.",
diff --git a/app/javascript/mastodon/locales/io.json b/app/javascript/mastodon/locales/io.json
index 69e549ea884..07795897069 100644
--- a/app/javascript/mastodon/locales/io.json
+++ b/app/javascript/mastodon/locales/io.json
@@ -55,7 +55,6 @@
   "account.posts": "Mesaji",
   "account.posts_with_replies": "Afishi e respondi",
   "account.report": "Denuncar @{name}",
-  "account.requested": "Vartante aprobo",
   "account.requested_follow": "{name} demandis sequar tu",
   "account.share": "Partigez profilo di @{name}",
   "account.show_reblogs": "Montrez repeti de @{name}",
@@ -219,8 +218,6 @@
   "confirmations.redraft.message": "Ka vu certe volas efacar ca posto e riskisigar ol? Favoriziti e repeti esos perdita, e respondi al posto originala esos orfanigita.",
   "confirmations.redraft.title": "Ka efacar & riskisar posto?",
   "confirmations.unfollow.confirm": "Desequez",
-  "confirmations.unfollow.message": "Ka vu certe volas desequar {name}?",
-  "confirmations.unfollow.title": "Ka dessequar uzanto?",
   "content_warning.hide": "Celez posto",
   "content_warning.show": "Montrez nur",
   "content_warning.show_more": "Montrar plu",
@@ -383,8 +380,6 @@
   "hints.profiles.see_more_followers": "Vidar plu multa sequanti sur {domain}",
   "hints.profiles.see_more_follows": "Vidar plu multa sequati sur {domain}",
   "hints.profiles.see_more_posts": "Vidar plu multa posti sur {domain}",
-  "hints.threads.replies_may_be_missing": "Respondi de altra servili forsan ne esas hike.",
-  "hints.threads.see_more": "Vidar plu multa demandi sur {domain}",
   "home.column_settings.show_reblogs": "Montrar repeti",
   "home.column_settings.show_replies": "Montrar respondi",
   "home.hide_announcements": "Celez anunci",
@@ -405,20 +400,10 @@
   "ignore_notifications_modal.private_mentions_title": "Ka ignorar savigi de nekonocita privata mencionii?",
   "info_button.label": "Helpo",
   "info_button.what_is_alt_text": "<h1>Quo alternativa texto es?</h1> <p>On povas bonigar adireblo e kompreno por omno per skribar klara, deslonga e fakta alternative texto.</p>",
-  "interaction_modal.action.favourite": "Por durar, vu bezonas prizar de vua konto.",
-  "interaction_modal.action.follow": "Por durar, vu bezonas sequar de vua konto.",
-  "interaction_modal.action.reblog": "Por durar, vu bezonas riblogar de vua konto.",
-  "interaction_modal.action.reply": "Por durar, vu bezonas respondar de vua konto.",
-  "interaction_modal.action.vote": "Por durar, vu bezonas vocdonar de vua konto.",
   "interaction_modal.go": "Irar",
   "interaction_modal.no_account_yet": "Ka vu ne havas konto ankore?",
   "interaction_modal.on_another_server": "Che diferanta servilo",
   "interaction_modal.on_this_server": "Che ca servilo",
-  "interaction_modal.title.favourite": "Favorizez ca posto da {name}",
-  "interaction_modal.title.follow": "Sequez {name}",
-  "interaction_modal.title.reblog": "Repetez posto di {name}",
-  "interaction_modal.title.reply": "Respondez posto di {name}",
-  "interaction_modal.title.vote": "Votar sur votinquesto di {name}",
   "interaction_modal.username_prompt": "Exemple {example}",
   "intervals.full.days": "{number, plural, one {# dio} other {# dii}}",
   "intervals.full.hours": "{number, plural, one {# horo} other {# hori}}",
@@ -679,7 +664,6 @@
   "privacy.public.long": "Ulu de e ne de Mastodon",
   "privacy.public.short": "Publike",
   "privacy.unlisted.additional": "Co kondutas exakte kam publika, ecepte la posto ne aparos en nuna flui o gretvorti, exploro, o sercho di Mastodon, mem se vu esas volunta totkonte.",
-  "privacy.unlisted.long": "Min multa algoritmoridikuli",
   "privacy.unlisted.short": "Deslauta publiko",
   "privacy_policy.last_updated": "Antea novajo ye {date}",
   "privacy_policy.title": "Privatesguidilo",
@@ -819,7 +803,6 @@
   "status.pin": "Pinglagez che profilo",
   "status.read_more": "Lektez plu",
   "status.reblog": "Repetez",
-  "status.reblog_private": "Repetez kun originala videbleso",
   "status.reblogged_by": "{name} repetis",
   "status.reblogs": "{count, plural, one {repeto} other {repeti}}",
   "status.reblogs.empty": "Nulu ja repetis ca posto. Kande ulu facas lo, lu montresos hike.",
diff --git a/app/javascript/mastodon/locales/is.json b/app/javascript/mastodon/locales/is.json
index 52b3f5d97dd..7934d15692c 100644
--- a/app/javascript/mastodon/locales/is.json
+++ b/app/javascript/mastodon/locales/is.json
@@ -28,6 +28,7 @@
   "account.disable_notifications": "Hætta að láta mig vita þegar @{name} sendir inn",
   "account.domain_blocking": "Útiloka lén",
   "account.edit_profile": "Breyta notandasniði",
+  "account.edit_profile_short": "Breyta",
   "account.enable_notifications": "Láta mig vita þegar @{name} sendir inn",
   "account.endorse": "Birta á notandasniði",
   "account.familiar_followers_many": "Fylgt af {name1}, {name2} og {othersCount, plural, one {einum öðrum sem þú þekkir} other {# öðrum sem þú þekkir}}",
@@ -40,6 +41,11 @@
   "account.featured_tags.last_status_never": "Engar færslur",
   "account.follow": "Fylgjast með",
   "account.follow_back": "Fylgjast með til baka",
+  "account.follow_back_short": "Fylgjast með til baka",
+  "account.follow_request": "Beiðni um að fylgjast með",
+  "account.follow_request_cancel": "Hætta við beiðni",
+  "account.follow_request_cancel_short": "Hætta við",
+  "account.follow_request_short": "Beiðni",
   "account.followers": "Fylgjendur",
   "account.followers.empty": "Ennþá fylgist enginn með þessum notanda.",
   "account.followers_counter": "{count, plural, one {Fylgjandi: {counter}} other {Fylgjendur: {counter}}}",
@@ -70,7 +76,6 @@
   "account.posts_with_replies": "Færslur og svör",
   "account.remove_from_followers": "Fjarlægja {name} úr fylgjendum",
   "account.report": "Kæra @{name}",
-  "account.requested": "Bíður eftir samþykki. Smelltu til að hætta við beiðni um að fylgjast með",
   "account.requested_follow": "{name} hefur beðið um að fylgjast með þér",
   "account.requests_to_follow_you": "Bað um að fylgjast með þér",
   "account.share": "Deila notandasniði fyrir @{name}",
@@ -239,15 +244,25 @@
   "confirmations.missing_alt_text.secondary": "Birta samt",
   "confirmations.missing_alt_text.title": "Bæta við hjálpartexta?",
   "confirmations.mute.confirm": "Þagga",
+  "confirmations.quiet_post_quote_info.dismiss": "Ekki minna mig aftur á þetta",
+  "confirmations.quiet_post_quote_info.got_it": "Náði því",
+  "confirmations.quiet_post_quote_info.message": "Þegar þú vitnar í hljóðláta opinbera færslu, verður færslan þín ekki birt á vinsældatímalínum.",
+  "confirmations.quiet_post_quote_info.title": "Vitnað í hljóðlátar opinberar færslur",
   "confirmations.redraft.confirm": "Eyða og endurvinna drög",
   "confirmations.redraft.message": "Ertu viss um að þú viljir eyða þessari færslu og enduvinna drögin? Eftirlæti og endurbirtingar munu glatast og svör við upprunalegu færslunni munu verða munaðarlaus.",
   "confirmations.redraft.title": "Eyða og byrja ný drög að færslu?",
   "confirmations.remove_from_followers.confirm": "Fjarlægja fylgjanda",
   "confirmations.remove_from_followers.message": "{name} mun hætta að fylgjast með þér. Ertu viss um að þú viljir halda áfram?",
   "confirmations.remove_from_followers.title": "Fjarlægja fylgjanda?",
+  "confirmations.revoke_quote.confirm": "Fjarlægja færslu",
+  "confirmations.revoke_quote.message": "Þessa aðgerð er ekki hægt að afturkalla.",
+  "confirmations.revoke_quote.title": "Fjarlægja færslu?",
+  "confirmations.unblock.confirm": "Aflétta útilokun",
+  "confirmations.unblock.title": "Aflétta útilokun á {name}?",
   "confirmations.unfollow.confirm": "Hætta að fylgja",
-  "confirmations.unfollow.message": "Ertu viss um að þú viljir hætta að fylgjast með {name}?",
-  "confirmations.unfollow.title": "Hætta að fylgjast með viðkomandi?",
+  "confirmations.unfollow.title": "Hætta að fylgjast með {name}?",
+  "confirmations.withdraw_request.confirm": "Taka beiðni til baka",
+  "confirmations.withdraw_request.title": "Taka aftur beiðni um að fylgjast með {name}?",
   "content_warning.hide": "Fela færslu",
   "content_warning.show": "Birta samt",
   "content_warning.show_more": "Sýna meira",
@@ -289,6 +304,7 @@
   "domain_pill.your_handle": "Kennislóðin þín:",
   "domain_pill.your_server": "Stafrænt heimili þitt, þar sem allar færslur þínar eru hýstar. Kanntu ekki við þennan netþjón? Þú getur flutt þig á milli netþjóna hvenær sem er og tekið með þér alla fylgjendurna þína.",
   "domain_pill.your_username": "Sértækt auðkenni þitt á þessum netþjóni. Það er mögulegt að finna notendur með sama notandanafn á mismunandi netþjónum.",
+  "dropdown.empty": "Veldu valkost",
   "embed.instructions": "Felldu þessa færslu inn í vefsvæðið þitt með því að afrita kóðann hér fyrir neðan.",
   "embed.preview": "Svona mun þetta líta út:",
   "emoji_button.activity": "Virkni",
@@ -424,8 +440,6 @@
   "hints.profiles.see_more_followers": "Sjá fleiri fylgjendur á {domain}",
   "hints.profiles.see_more_follows": "Sjá fleiri sem þú fylgist með á {domain}",
   "hints.profiles.see_more_posts": "Sjá fleiri færslur á {domain}",
-  "hints.threads.replies_may_be_missing": "Svör af öðrum netþjónum gæti vantað.",
-  "hints.threads.see_more": "Sjá fleiri svör á {domain}",
   "home.column_settings.show_quotes": "Birta tilvitnanir",
   "home.column_settings.show_reblogs": "Sýna endurbirtingar",
   "home.column_settings.show_replies": "Birta svör",
@@ -447,20 +461,12 @@
   "ignore_notifications_modal.private_mentions_title": "Hunsa tilkynningar frá óumbeðnum tilvísunum í einkaspjalli?",
   "info_button.label": "Hjálp",
   "info_button.what_is_alt_text": "<h1>Hvað er alt-texti?</h1> <p>Hjálpartexti eða ALT-myndatexti inniheldur lýsingu á myndefni fyrir fólk með ýmsar gerðir sjónskerðingar, fyrir tengingar með litla bandbreidd, eða til að gefa nánara samhengi fyrir myndefni.</p><p>Þú getur með þessu bætt almennt aðgengi og aukið skilning á efni sem þú birtir með því að skrifa skýran, skorinortan og hlutlægan alt-texta til vara.</p><ul><li>Lýstu mikilvægum atriðum</li>\\n<li>Hafðu yfirlit með þeim texta sem sést í myndum</li><li>Notaðu eðlilega setningaskipan</li><li>Forðastu óþarfar upplýsingar</li><li>Leggðu áherslu á aðalatriði í flóknu myndefni (eins og línuritum eða landakortum)</li></ul>",
-  "interaction_modal.action.favourite": "Til að halda áfram þarftu að setja eitthvað í eftirlæti, verandi inni á aðgangnum þínum.",
-  "interaction_modal.action.follow": "Til að halda áfram þarftu að fylgjast með einhverjum, verandi inni á aðgangnum þínum.",
-  "interaction_modal.action.reblog": "Til að halda áfram þarftu að endurbirta frá einhverjum, verandi inni á aðgangnum þínum.",
-  "interaction_modal.action.reply": "Til að halda áfram þarftu að svara einhverjum, verandi inni á aðgangnum þínum.",
-  "interaction_modal.action.vote": "Til að halda áfram þarftu að greiða atkvæði, verandi inni á aðgangnum þínum.",
+  "interaction_modal.action": "Til að eiga við færsluna frá {name} þarftu að skrá þig inn á reikning þinn á þeim Mastodon-þjóni sem þú notar.",
   "interaction_modal.go": "Áfram",
   "interaction_modal.no_account_yet": "Ertu ekki ennþá með aðgang?",
   "interaction_modal.on_another_server": "Á öðrum netþjóni",
   "interaction_modal.on_this_server": "Á þessum netþjóni",
-  "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}",
-  "interaction_modal.title.reply": "Svara færslunni frá {name}",
-  "interaction_modal.title.vote": "Greiða atkvæði í könnun á vegum {name}",
+  "interaction_modal.title": "Skráðu inn til að halda áfram",
   "interaction_modal.username_prompt": "Til dæmis {example}",
   "intervals.full.days": "{number, plural, one {# dagur} other {# dagar}}",
   "intervals.full.hours": "{number, plural, one {# klukkustund} other {# klukkustundir}}",
@@ -481,6 +487,7 @@
   "keyboard_shortcuts.home": "Opna heimatímalínu",
   "keyboard_shortcuts.hotkey": "Flýtilykill",
   "keyboard_shortcuts.legend": "Birta þessa skýringu",
+  "keyboard_shortcuts.load_more": "Gera \"Hlaða inn meiru\"-hnappinn virkan",
   "keyboard_shortcuts.local": "Opna staðværa tímalínu",
   "keyboard_shortcuts.mention": "Minnast á höfund",
   "keyboard_shortcuts.muted": "Opna lista yfir þaggaða notendur",
@@ -489,6 +496,7 @@
   "keyboard_shortcuts.open_media": "Opna margmiðlunargögn",
   "keyboard_shortcuts.pinned": "Opna lista yfir festar færslur",
   "keyboard_shortcuts.profile": "Opna notandasnið höfundar",
+  "keyboard_shortcuts.quote": "Vitna í færslu",
   "keyboard_shortcuts.reply": "Svara færslu",
   "keyboard_shortcuts.requests": "Opna lista yfir fylgjendabeiðnir",
   "keyboard_shortcuts.search": "Setja virkni í leitarreit",
@@ -500,6 +508,8 @@
   "keyboard_shortcuts.translate": "að þýða færslu",
   "keyboard_shortcuts.unfocus": "Taka virkni úr textainnsetningarreit eða leit",
   "keyboard_shortcuts.up": "Fara ofar í listanum",
+  "learn_more_link.got_it": "Náði því",
+  "learn_more_link.learn_more": "Kanna nánar",
   "lightbox.close": "Loka",
   "lightbox.next": "Næsta",
   "lightbox.previous": "Fyrra",
@@ -600,6 +610,7 @@
   "notification.label.mention": "Minnst á",
   "notification.label.private_mention": "Einkaspjall",
   "notification.label.private_reply": "Einkasvar",
+  "notification.label.quote": "{name} vitnaði í færsluna þína",
   "notification.label.reply": "Svara",
   "notification.mention": "Minnst á",
   "notification.mentioned_you": "{name} minntist á þig",
@@ -614,6 +625,7 @@
   "notification.moderation_warning.action_suspend": "Notandaaðgangurinn þinn hefur verið settur í frysti.",
   "notification.own_poll": "Könnuninni þinni er lokið",
   "notification.poll": "Könnun sem þú greiddir atkvæði í er lokið",
+  "notification.quoted_update": "{name} breytti færslu sem þú hefur vitnað í",
   "notification.reblog": "{name} endurbirti færsluna þína",
   "notification.reblog.name_and_others_with_link": "{name} og <a>{count, plural, one {# í viðbót hefur} other {# í viðbót hafa}}</a> endurbirt færsluna þína",
   "notification.relationships_severance_event": "Missti tengingar við {name}",
@@ -657,6 +669,7 @@
   "notifications.column_settings.mention": "Tilvísanir:",
   "notifications.column_settings.poll": "Niðurstöður könnunar:",
   "notifications.column_settings.push": "Ýti-tilkynningar",
+  "notifications.column_settings.quote": "Tilvitnanir:",
   "notifications.column_settings.reblog": "Endurbirtingar:",
   "notifications.column_settings.show": "Sýna í dálki",
   "notifications.column_settings.sound": "Spila hljóð",
@@ -732,11 +745,18 @@
   "privacy.private.short": "Fylgjendur",
   "privacy.public.long": "Hver sem er, á og utan Mastodon",
   "privacy.public.short": "Opinbert",
+  "privacy.quote.anyone": "{visibility}, hver sem er getur vitnað í færslu",
+  "privacy.quote.disabled": "{visibility}, tilvitnanir eru óvirkar",
+  "privacy.quote.limited": "{visibility}, tilvitnanir eru takmarkaðar",
   "privacy.unlisted.additional": "Þetta hegðar sér eins og opinber færsla, fyrir utan að færslan birtist ekki í beinum streymum eða myllumerkjum, né heldur í Mastodon-leitum jafnvel þótt þú hafir valið að falla undir slíkt í notandasniðinu þínu.",
-  "privacy.unlisted.long": "Minni stælar í reikniritum",
+  "privacy.unlisted.long": "Falið frá leitarniðurstöðum Mastodon, vinsældalistum og opinberum tímalínum",
   "privacy.unlisted.short": "Hljóðlátt opinbert",
   "privacy_policy.last_updated": "Síðast uppfært {date}",
   "privacy_policy.title": "Persónuverndarstefna",
+  "quote_error.poll": "Ekki er leyft að vitna í kannanir.",
+  "quote_error.quote": "Einungis ein tilvitnun er leyfð í einu.",
+  "quote_error.unauthorized": "Þú hefur ekki heimild til að vitna í þessa færslu.",
+  "quote_error.upload": "Ekki er leyft að vitna í myndviðhengi.",
   "recommended": "Mælt með",
   "refresh": "Endurlesa",
   "regeneration_indicator.please_stand_by": "Hinkraðu við.",
@@ -752,6 +772,9 @@
   "relative_time.minutes": "{number}mín",
   "relative_time.seconds": "{number}sek",
   "relative_time.today": "í dag",
+  "remove_quote_hint.button_label": "Náði því",
+  "remove_quote_hint.message": "Þú getur gert það úr {icon} valmyndinni.",
+  "remove_quote_hint.title": "Viltu fjarlægja tilvitnuðu færsluna þína?",
   "reply_indicator.attachments": "{count, plural, one {# viðhengi} other {# viðhengi}}",
   "reply_indicator.cancel": "Hætta við",
   "reply_indicator.poll": "Könnun",
@@ -843,13 +866,23 @@
   "status.admin_account": "Opna umsjónarviðmót fyrir @{name}",
   "status.admin_domain": "Opna umsjónarviðmót fyrir @{domain}",
   "status.admin_status": "Opna þessa færslu í umsjónarviðmótinu",
+  "status.all_disabled": "Endurbirtingar og tilvitnanir eru óvirkar",
   "status.block": "Útiloka @{name}",
   "status.bookmark": "Bókamerki",
   "status.cancel_reblog_private": "Taka úr endurbirtingu",
+  "status.cannot_quote": "Þú hefur ekki heimild til að vitna í þessa færslu",
   "status.cannot_reblog": "Þessa færslu er ekki hægt að endurbirta",
+  "status.contains_quote": "Inniheldur tilvitnun",
+  "status.context.loading": "Hleð inn fleiri svörum",
+  "status.context.loading_error": "Gat ekki hlaðið inn nýjum svörum",
+  "status.context.loading_success": "Öllum svörum hlaðið inn",
+  "status.context.more_replies_found": "Fleiri svör fundust",
+  "status.context.retry": "Reyna aftur",
+  "status.context.show": "Sýna",
   "status.continued_thread": "Hélt samtali áfram",
   "status.copy": "Afrita tengil í færslu",
   "status.delete": "Eyða",
+  "status.delete.success": "Færslu eytt",
   "status.detailed_status": "Nákvæm spjallþráðasýn",
   "status.direct": "Einkaspjall við @{name}",
   "status.direct_indicator": "Einkaspjall",
@@ -872,27 +905,43 @@
   "status.mute_conversation": "Þagga niður í samtali",
   "status.open": "Opna þessa færslu",
   "status.pin": "Festa á notandasnið",
+  "status.quote": "Tilvitnun",
+  "status.quote.cancel": "Hætta við tilvitnun",
   "status.quote_error.filtered": "Falið vegna einnar síu sem er virk",
-  "status.quote_error.not_found": "Þessa færslu er ekki hægt að birta.",
-  "status.quote_error.pending_approval": "Þessi færsla bíður eftir samþykki frá upprunalegum höfundi hennar.",
-  "status.quote_error.rejected": "Þessa færslu er ekki hægt að birta þar sem upphaflegur höfundur hennar leyfir ekki að vitnað sé til hennar.",
-  "status.quote_error.removed": "Þessi færsla var fjarlægð af höfundi hennar.",
-  "status.quote_error.unauthorized": "Þessa færslu er ekki hægt að birta þar sem þú hefur ekki heimild til að skoða hana.",
-  "status.quote_post_author": "Færsla frá {name}",
+  "status.quote_error.limited_account_hint.action": "Birta samt",
+  "status.quote_error.limited_account_hint.title": "Þessi notandaaðgangur hefur verið falinn af stjórnendum á {domain}.",
+  "status.quote_error.not_available": "Færsla ekki tiltæk",
+  "status.quote_error.pending_approval": "Færsla í bið",
+  "status.quote_error.pending_approval_popout.body": "Á Mastodon geturðu stjórnað því hvort aðrir geti vitnað í þig. Þessi færsla bíður eftir samþykki upprunalegs höfundar.",
+  "status.quote_error.revoked": "Færsla fjarlægð af höfundi",
+  "status.quote_followers_only": "Einungis fylgjendur geta vitnað í þessa færslu",
+  "status.quote_manual_review": "Höfundur mun yfirfara handvirkt",
+  "status.quote_noun": "Tilvitnun",
+  "status.quote_policy_change": "Breyttu því hver getur tilvitnað",
+  "status.quote_post_author": "Vitnaði í færslu frá @{name}",
+  "status.quote_private": "Ekki er hægt að vitna í einkafærslur",
+  "status.quotes": "{count, plural, one {tilvitnun} other {tilvitnanir}}",
+  "status.quotes.empty": "Enginn hefur ennþá vitnað í þessa færslu. Þegar einhver gerir það, mun það birtast hér.",
+  "status.quotes.local_other_disclaimer": "Tilvitnanir sem höfundur hafnar verða ekki birtar.",
+  "status.quotes.remote_other_disclaimer": "Aðeins tilvitnanir frá {domain} munu birtast hér. Tilvitnanir sem höfundur hafnar verða ekki birtar.",
   "status.read_more": "Lesa meira",
   "status.reblog": "Endurbirting",
-  "status.reblog_private": "Endurbirta til upphaflegra lesenda",
+  "status.reblog_or_quote": "Endurbirta eða vitna í færslu",
+  "status.reblog_private": "Deildu aftur með þeim sem fylgjast með þér",
   "status.reblogged_by": "{name} endurbirti",
   "status.reblogs": "{count, plural, one {endurbirting} other {endurbirtingar}}",
   "status.reblogs.empty": "Enginn hefur ennþá endurbirt þessa færslu. Þegar einhver gerir það, mun það birtast hér.",
   "status.redraft": "Eyða og endurvinna drög",
   "status.remove_bookmark": "Fjarlægja bókamerki",
   "status.remove_favourite": "Fjarlægja úr eftirlætum",
+  "status.remove_quote": "Fjarlægja",
   "status.replied_in_thread": "Svaraði í samtali",
   "status.replied_to": "Svaraði til {name}",
   "status.reply": "Svara",
   "status.replyAll": "Svara þræði",
   "status.report": "Kæra @{name}",
+  "status.request_quote": "Beiðni um tilvitnun",
+  "status.revoke_quote": "Fjarlægja færsluna mína úr færslu frá @{name}",
   "status.sensitive_warning": "Viðkvæmt efni",
   "status.share": "Deila",
   "status.show_less_all": "Sýna minna fyrir allt",
@@ -930,6 +979,7 @@
   "upload_button.label": "Bæta við myndum, myndskeiði eða hljóðskrá",
   "upload_error.limit": "Fór yfir takmörk á innsendingum skráa.",
   "upload_error.poll": "Innsending skráa er ekki leyfð í könnunum.",
+  "upload_error.quote": "Innsending skráa er ekki leyfð í tilvitnunum.",
   "upload_form.drag_and_drop.instructions": "Til að taka í myndefnisviðhengi skaltu ýta á bilslána eða Enter. Til að draga geturðu notað örvalyklana til að færa viðhengið í samsvarandi áttir. Ýttu aftur á bilslána eða Enter til að sleppa viðhenginu á nýja staðinn, eða ýttu á Escape til að hætta við.",
   "upload_form.drag_and_drop.on_drag_cancel": "Hætt var við að draga. Myndefnisviðhenginu {item} var sleppt.",
   "upload_form.drag_and_drop.on_drag_end": "Myndefnisviðhenginu {item} var sleppt.",
@@ -952,5 +1002,19 @@
   "video.skip_forward": "Stökkva áfram",
   "video.unmute": "Hætta að þagga",
   "video.volume_down": "Lækka hljóðstyrk",
-  "video.volume_up": "Hækka hljóðstyrk"
+  "video.volume_up": "Hækka hljóðstyrk",
+  "visibility_modal.button_title": "Stilla sýnileika",
+  "visibility_modal.header": "Sýnileiki og gagnvirkni",
+  "visibility_modal.helper.direct_quoting": "Ekki er hægt að vitna í einkaspjall sem skrifað er á Mastodon.",
+  "visibility_modal.helper.privacy_editing": "Ekki er hægt að breyta sýnileika færslu eftir að hún hefur verið birt.",
+  "visibility_modal.helper.privacy_private_self_quote": "Tilvitnanir í sjálfan sig úr einkaspjallfærslum er ekki hægt að gera opinberar.",
+  "visibility_modal.helper.private_quoting": "Ekki er hægt að vitna í færslur einungis til fylgjenda sem skrifaðar eru á Mastodon.",
+  "visibility_modal.helper.unlisted_quoting": "Þegar fólk vitnar í þig verða færslurnar þeirr einnig faldar á vinsældatímalínum.",
+  "visibility_modal.instructions": "Stýrðu því hverjir geta átt við þessa færslu. Þú getur líka ákvarðað stillingar fyrir allar færslur í framtíðinni með því að fara í <link>Kjörstillingar > Sjálfgefin gildi við gerð færslna</link>.",
+  "visibility_modal.privacy_label": "Sýnileiki",
+  "visibility_modal.quote_followers": "Einungis fylgjendur",
+  "visibility_modal.quote_label": "Hverjir geta gert tilvitnanir",
+  "visibility_modal.quote_nobody": "Bara ég",
+  "visibility_modal.quote_public": "Hver sem er",
+  "visibility_modal.save": "Vista"
 }
diff --git a/app/javascript/mastodon/locales/it.json b/app/javascript/mastodon/locales/it.json
index f39862e7cc5..bd84dfcadee 100644
--- a/app/javascript/mastodon/locales/it.json
+++ b/app/javascript/mastodon/locales/it.json
@@ -28,6 +28,7 @@
   "account.disable_notifications": "Smetti di avvisarmi quando @{name} pubblica un post",
   "account.domain_blocking": "Account di un dominio bloccato",
   "account.edit_profile": "Modifica profilo",
+  "account.edit_profile_short": "Modifica",
   "account.enable_notifications": "Avvisami quando @{name} pubblica un post",
   "account.endorse": "In evidenza sul profilo",
   "account.familiar_followers_many": "Seguito da {name1}, {name2}, e {othersCount, plural, one {un altro che conosci} other {# altri che conosci}}",
@@ -40,6 +41,11 @@
   "account.featured_tags.last_status_never": "Nessun post",
   "account.follow": "Segui",
   "account.follow_back": "Segui a tua volta",
+  "account.follow_back_short": "Segui a tua volta",
+  "account.follow_request": "Richiesta di seguire",
+  "account.follow_request_cancel": "Annulla la richiesta",
+  "account.follow_request_cancel_short": "Annulla",
+  "account.follow_request_short": "Richiesta",
   "account.followers": "Follower",
   "account.followers.empty": "Ancora nessuno segue questo utente.",
   "account.followers_counter": "{count, plural, one {{counter} seguace} other {{counter} seguaci}}",
@@ -70,7 +76,6 @@
   "account.posts_with_replies": "Post e risposte",
   "account.remove_from_followers": "Rimuovi {name} dai seguaci",
   "account.report": "Segnala @{name}",
-  "account.requested": "In attesa d'approvazione. Clicca per annullare la richiesta di seguire",
   "account.requested_follow": "{name} ha richiesto di seguirti",
   "account.requests_to_follow_you": "Richieste di seguirti",
   "account.share": "Condividi il profilo di @{name}",
@@ -239,15 +244,25 @@
   "confirmations.missing_alt_text.secondary": "Pubblica comunque",
   "confirmations.missing_alt_text.title": "Aggiungere testo alternativo?",
   "confirmations.mute.confirm": "Silenzia",
+  "confirmations.quiet_post_quote_info.dismiss": "Non ricordarmelo più",
+  "confirmations.quiet_post_quote_info.got_it": "Ho capito",
+  "confirmations.quiet_post_quote_info.message": "Quando citi un post pubblico silenzioso, il tuo post verrà nascosto dalle timeline di tendenza.",
+  "confirmations.quiet_post_quote_info.title": "Citazione di post pubblici silenziosi",
   "confirmations.redraft.confirm": "Elimina e riscrivi",
   "confirmations.redraft.message": "Sei sicuro di voler eliminare questo post e riscriverlo? I preferiti e i boost andranno persi e le risposte al post originale non saranno più collegate.",
   "confirmations.redraft.title": "Eliminare e riformulare il post?",
   "confirmations.remove_from_followers.confirm": "Rimuovi il seguace",
   "confirmations.remove_from_followers.message": "{name} smetterà di seguirti. Si è sicuri di voler procedere?",
   "confirmations.remove_from_followers.title": "Rimuovi il seguace?",
+  "confirmations.revoke_quote.confirm": "Elimina il post",
+  "confirmations.revoke_quote.message": "Questa azione non può essere annullata.",
+  "confirmations.revoke_quote.title": "Rimuovere il post?",
+  "confirmations.unblock.confirm": "Sblocca",
+  "confirmations.unblock.title": "Sbloccare {name}?",
   "confirmations.unfollow.confirm": "Smetti di seguire",
-  "confirmations.unfollow.message": "Sei sicuro di voler smettere di seguire {name}?",
-  "confirmations.unfollow.title": "Smettere di seguire l'utente?",
+  "confirmations.unfollow.title": "Smettere di seguire {name}?",
+  "confirmations.withdraw_request.confirm": "Annulla la richiesta",
+  "confirmations.withdraw_request.title": "Annullare la richiesta di seguire {name}?",
   "content_warning.hide": "Nascondi post",
   "content_warning.show": "Mostra comunque",
   "content_warning.show_more": "Mostra di più",
@@ -289,6 +304,7 @@
   "domain_pill.your_handle": "Il tuo nome univoco:",
   "domain_pill.your_server": "La tua casa digitale, dove vivono tutti i tuoi post. Non ti piace questa? Cambia server in qualsiasi momento e porta con te anche i tuoi seguaci.",
   "domain_pill.your_username": "Il tuo identificatore univoco su questo server. È possibile trovare utenti con lo stesso nome utente su server diversi.",
+  "dropdown.empty": "Seleziona un'opzione",
   "embed.instructions": "Incorpora questo post sul tuo sito web, copiando il seguente codice.",
   "embed.preview": "Ecco come apparirà:",
   "emoji_button.activity": "Attività",
@@ -424,8 +440,6 @@
   "hints.profiles.see_more_followers": "Vedi altri seguaci su {domain}",
   "hints.profiles.see_more_follows": "Vedi altri profili seguiti su {domain}",
   "hints.profiles.see_more_posts": "Vedi altri post su {domain}",
-  "hints.threads.replies_may_be_missing": "Le risposte da altri server potrebbero essere mancanti.",
-  "hints.threads.see_more": "Vedi altre risposte su {domain}",
   "home.column_settings.show_quotes": "Mostra le citazioni",
   "home.column_settings.show_reblogs": "Mostra reblog",
   "home.column_settings.show_replies": "Mostra risposte",
@@ -447,20 +461,12 @@
   "ignore_notifications_modal.private_mentions_title": "Ignorare le notifiche provenienti da menzioni private indesiderate?",
   "info_button.label": "Aiuto",
   "info_button.what_is_alt_text": "<h1>Cos'è il testo alternativo?</h1> <p>Il testo alternativo fornisce descrizioni delle immagini per le persone con disturbi della vista, connessioni a bassa larghezza di banda o per coloro che cercano un contesto aggiuntivo.</p> <p>È possibile migliorare l'accessibilità e la comprensione per tutti scrivendo un testo alt chiaro, conciso e obiettivo.</p> <ul> <li>Cattura elementi importanti</li> <li>Riassume il testo nelle immagini</li> <li>Usa la struttura delle frasi regolari</li> <li>Evita le informazioni ridondanti</li> <li>Concentrati sulle tendenze e i risultati chiave in immagini complesse (come diagrammi o mappe)</li> </ul>",
-  "interaction_modal.action.favourite": "Per continuare, devi aggiungere ai preferiti il ​​tuo account.",
-  "interaction_modal.action.follow": "Per continuare, devi seguire dal tuo account.",
-  "interaction_modal.action.reblog": "Per continuare, devi condividere dal tuo account.",
-  "interaction_modal.action.reply": "Per continuare, devi rispondere dal tuo account.",
-  "interaction_modal.action.vote": "Per continuare, devi votare dal tuo account.",
+  "interaction_modal.action": "Per interagire con il post di {name}, devi accedere al tuo account su qualsiasi server Mastodon tu utilizzi.",
   "interaction_modal.go": "Vai",
   "interaction_modal.no_account_yet": "Non hai ancora un account?",
   "interaction_modal.on_another_server": "Su un altro server",
   "interaction_modal.on_this_server": "Su questo server",
-  "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}",
-  "interaction_modal.title.reply": "Rispondi al post di {name}",
-  "interaction_modal.title.vote": "Vota nel sondaggio di {name}",
+  "interaction_modal.title": "Accedi per continuare",
   "interaction_modal.username_prompt": "Es. {example}",
   "intervals.full.days": "{number, plural, one {# giorno} other {# giorni}}",
   "intervals.full.hours": "{number, plural, one {# ora} other {# ore}}",
@@ -481,6 +487,7 @@
   "keyboard_shortcuts.home": "Apre la cronologia domestica",
   "keyboard_shortcuts.hotkey": "Tasto di scelta rapida",
   "keyboard_shortcuts.legend": "Mostra questa legenda",
+  "keyboard_shortcuts.load_more": "Evidenzia il pulsante \"Carica altro\"",
   "keyboard_shortcuts.local": "Apre la cronologia locale",
   "keyboard_shortcuts.mention": "Menziona l'autore",
   "keyboard_shortcuts.muted": "Apre l'elenco degli utenti silenziati",
@@ -489,6 +496,7 @@
   "keyboard_shortcuts.open_media": "Apre i multimedia",
   "keyboard_shortcuts.pinned": "Apre l'elenco dei post fissati",
   "keyboard_shortcuts.profile": "Apre il profilo dell'autore",
+  "keyboard_shortcuts.quote": "Cita il post",
   "keyboard_shortcuts.reply": "Risponde al post",
   "keyboard_shortcuts.requests": "Apre l'elenco delle richieste di seguirti",
   "keyboard_shortcuts.search": "Focalizza sulla barra di ricerca",
@@ -500,6 +508,8 @@
   "keyboard_shortcuts.translate": "Traduce un post",
   "keyboard_shortcuts.unfocus": "Rimuove il focus sull'area di composizione testuale/ricerca",
   "keyboard_shortcuts.up": "Scorre in su nell'elenco",
+  "learn_more_link.got_it": "Ho capito",
+  "learn_more_link.learn_more": "Scopri di più",
   "lightbox.close": "Chiudi",
   "lightbox.next": "Successivo",
   "lightbox.previous": "Precedente",
@@ -600,6 +610,7 @@
   "notification.label.mention": "Menziona",
   "notification.label.private_mention": "Menzione privata",
   "notification.label.private_reply": "Rispondi in privato",
+  "notification.label.quote": "{name} ha citato il tuo post",
   "notification.label.reply": "Rispondi",
   "notification.mention": "Menziona",
   "notification.mentioned_you": "{name} ti ha menzionato",
@@ -614,6 +625,7 @@
   "notification.moderation_warning.action_suspend": "Il tuo account è stato sospeso.",
   "notification.own_poll": "Il tuo sondaggio è terminato",
   "notification.poll": "Un sondaggio in cui hai votato è terminato",
+  "notification.quoted_update": "{name} ha modificato un post che hai citato",
   "notification.reblog": "{name} ha rebloggato il tuo post",
   "notification.reblog.name_and_others_with_link": "{name} e <a>{count,  plural, one {# altro} other {altri #}}</a> hanno condiviso il tuo post",
   "notification.relationships_severance_event": "Connessioni perse con {name}",
@@ -657,6 +669,7 @@
   "notifications.column_settings.mention": "Menzioni:",
   "notifications.column_settings.poll": "Risultati del sondaggio:",
   "notifications.column_settings.push": "Notifiche push",
+  "notifications.column_settings.quote": "Citazioni:",
   "notifications.column_settings.reblog": "Reblog:",
   "notifications.column_settings.show": "Mostra nella colonna",
   "notifications.column_settings.sound": "Riproduci suono",
@@ -732,11 +745,18 @@
   "privacy.private.short": "Follower",
   "privacy.public.long": "Chiunque dentro e fuori Mastodon",
   "privacy.public.short": "Pubblico",
+  "privacy.quote.anyone": "{visibility}, chiunque può citare",
+  "privacy.quote.disabled": "{visibility}, citazioni disabilitate",
+  "privacy.quote.limited": "{visibility}, citazioni limitate",
   "privacy.unlisted.additional": "Si comporta esattamente come pubblico, tranne per il fatto che il post non verrà visualizzato nei feed live o negli hashtag, nell'esplorazione o nella ricerca Mastodon, anche se hai attivato l'attivazione a livello di account.",
-  "privacy.unlisted.long": "Meno fanfare algoritmiche",
+  "privacy.unlisted.long": "Nascosto dai risultati di ricerca di Mastodon, dalle tendenze e dalle timeline pubbliche",
   "privacy.unlisted.short": "Pubblico silenzioso",
   "privacy_policy.last_updated": "Ultimo aggiornamento {date}",
   "privacy_policy.title": "Politica sulla Privacy",
+  "quote_error.poll": "Nei sondaggi non sono consentite le citazioni.",
+  "quote_error.quote": "È consentita una sola citazione alla volta.",
+  "quote_error.unauthorized": "Non sei autorizzato a citare questo post.",
+  "quote_error.upload": "Le citazioni non sono consentite con gli allegati multimediali.",
   "recommended": "Consigliato",
   "refresh": "Ricarica",
   "regeneration_indicator.please_stand_by": "Si prega di rimanere in attesa.",
@@ -752,6 +772,9 @@
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "oggi",
+  "remove_quote_hint.button_label": "Ho capito",
+  "remove_quote_hint.message": "Puoi farlo dal menu delle opzioni {icon}.",
+  "remove_quote_hint.title": "Vuoi rimuovere il tuo post citato?",
   "reply_indicator.attachments": "{count, plural, one {# allegato} other {# allegati}}",
   "reply_indicator.cancel": "Annulla",
   "reply_indicator.poll": "Sondaggio",
@@ -843,13 +866,23 @@
   "status.admin_account": "Apri interfaccia di moderazione per @{name}",
   "status.admin_domain": "Apri l'interfaccia di moderazione per {domain}",
   "status.admin_status": "Apri questo post nell'interfaccia di moderazione",
+  "status.all_disabled": "Condivisioni e citazioni sono disabilitate",
   "status.block": "Blocca @{name}",
   "status.bookmark": "Aggiungi segnalibro",
   "status.cancel_reblog_private": "Annulla reblog",
+  "status.cannot_quote": "Non ti è consentito citare questo post",
   "status.cannot_reblog": "Questo post non può essere condiviso",
+  "status.contains_quote": "Contiene una citazione",
+  "status.context.loading": "Caricamento di altre risposte",
+  "status.context.loading_error": "Impossibile caricare nuove risposte",
+  "status.context.loading_success": "Tutte le risposte caricate",
+  "status.context.more_replies_found": "Sono state trovate altre risposte",
+  "status.context.retry": "Riprova",
+  "status.context.show": "Mostra",
   "status.continued_thread": "Discussione continua",
   "status.copy": "Copia link al post",
   "status.delete": "Elimina",
+  "status.delete.success": "Post eliminato",
   "status.detailed_status": "Vista conversazione dettagliata",
   "status.direct": "Menziona privatamente @{name}",
   "status.direct_indicator": "Menzione privata",
@@ -872,27 +905,43 @@
   "status.mute_conversation": "Silenzia conversazione",
   "status.open": "Espandi questo post",
   "status.pin": "Fissa in cima sul profilo",
+  "status.quote": "Cita",
+  "status.quote.cancel": "Annulla la citazione",
   "status.quote_error.filtered": "Nascosto a causa di uno dei tuoi filtri",
-  "status.quote_error.not_found": "Questo post non può essere visualizzato.",
-  "status.quote_error.pending_approval": "Questo post è in attesa di approvazione dell'autore originale.",
-  "status.quote_error.rejected": "Questo post non può essere visualizzato perché l'autore originale non consente che venga citato.",
-  "status.quote_error.removed": "Questo post è stato rimosso dal suo autore.",
-  "status.quote_error.unauthorized": "Questo post non può essere visualizzato in quanto non sei autorizzato a visualizzarlo.",
-  "status.quote_post_author": "Post di @{name}",
+  "status.quote_error.limited_account_hint.action": "Mostra comunque",
+  "status.quote_error.limited_account_hint.title": "Questo profilo è stato nascosto dai moderatori di {domain}.",
+  "status.quote_error.not_available": "Post non disponibile",
+  "status.quote_error.pending_approval": "Post in attesa",
+  "status.quote_error.pending_approval_popout.body": "Su Mastodon, puoi controllare se qualcuno può citarti. Questo post è in attesa dell'approvazione dell'autore originale.",
+  "status.quote_error.revoked": "Post rimosso dall'autore",
+  "status.quote_followers_only": "Solo i seguaci possono citare questo post",
+  "status.quote_manual_review": "L'autore esaminerà manualmente",
+  "status.quote_noun": "Citazione",
+  "status.quote_policy_change": "Cambia chi può citare",
+  "status.quote_post_author": "Citato un post di @{name}",
+  "status.quote_private": "I post privati non possono essere citati",
+  "status.quotes": "{count, plural, one {citazione} other {citazioni}}",
+  "status.quotes.empty": "Nessuno ha ancora citato questo post. Quando qualcuno lo farà, verrà visualizzato qui.",
+  "status.quotes.local_other_disclaimer": "Le citazioni rifiutate dall'autore non verranno mostrate.",
+  "status.quotes.remote_other_disclaimer": "Solo le citazioni provenienti da {domain} saranno mostrate qui. Le citazioni rifiutate dall'autore non saranno mostrate.",
   "status.read_more": "Leggi di più",
   "status.reblog": "Reblog",
-  "status.reblog_private": "Reblog con visibilità originale",
+  "status.reblog_or_quote": "Condividi o cita",
+  "status.reblog_private": "Condividi di nuovo con i tuoi seguaci",
   "status.reblogged_by": "Rebloggato da {name}",
   "status.reblogs": "{count, plural, one {boost} other {boost}}",
   "status.reblogs.empty": "Ancora nessuno ha rebloggato questo post. Quando qualcuno lo farà, apparirà qui.",
   "status.redraft": "Elimina e riscrivi",
   "status.remove_bookmark": "Rimuovi segnalibro",
   "status.remove_favourite": "Rimuovi dai preferiti",
+  "status.remove_quote": "Rimuovi",
   "status.replied_in_thread": "Ha risposto nella discussione",
   "status.replied_to": "Risposta a {name}",
   "status.reply": "Rispondi",
   "status.replyAll": "Rispondi alla conversazione",
   "status.report": "Segnala @{name}",
+  "status.request_quote": "Richiesta di citazione",
+  "status.revoke_quote": "Rimuovi il mio post da quello di @{name}",
   "status.sensitive_warning": "Contenuto sensibile",
   "status.share": "Condividi",
   "status.show_less_all": "Mostra meno per tutti",
@@ -930,6 +979,7 @@
   "upload_button.label": "Aggiungi un file immagine, video o audio",
   "upload_error.limit": "Limite di caricamento dei file superato.",
   "upload_error.poll": "Caricamento del file non consentito con i sondaggi.",
+  "upload_error.quote": "Caricamento file non consentito con le citazioni.",
   "upload_form.drag_and_drop.instructions": "Per selezionare un allegato multimediale, premi Spazio o Invio. Mentre trascini, usa i tasti con le frecce per spostare l'allegato multimediale in una qualsiasi direzione. Premi di nuovo Spazio o Invio per rilasciare l'allegato multimediale nella sua nuova posizione, oppure premi Esc per annullare.",
   "upload_form.drag_and_drop.on_drag_cancel": "Il trascinamento è stato annullato. L'allegato multimediale {item} è stato eliminato.",
   "upload_form.drag_and_drop.on_drag_end": "L'allegato multimediale {item} è stato eliminato.",
@@ -952,5 +1002,19 @@
   "video.skip_forward": "Vai avanti",
   "video.unmute": "Muta",
   "video.volume_down": "Abbassa volume",
-  "video.volume_up": "Alza volume"
+  "video.volume_up": "Alza volume",
+  "visibility_modal.button_title": "Imposta la visibilità",
+  "visibility_modal.header": "Visibilità e interazione",
+  "visibility_modal.helper.direct_quoting": "Le menzioni private scritte su Mastodon non possono essere citate da altri.",
+  "visibility_modal.helper.privacy_editing": "La visibilità non può essere modificata dopo la pubblicazione di un post.",
+  "visibility_modal.helper.privacy_private_self_quote": "Le autocitazioni di post privati ​​non possono essere rese pubbliche.",
+  "visibility_modal.helper.private_quoting": "I post scritti e riservati ai seguaci su Mastodon non possono essere citati da altri.",
+  "visibility_modal.helper.unlisted_quoting": "Quando le persone ti citano, il loro post verrà nascosto anche dalle timeline di tendenza.",
+  "visibility_modal.instructions": "Controlla chi può interagire con questo post. Puoi anche applicare le impostazioni a tutti i post futuri andando su <link>Preferenze > Impostazioni predefinite per i post</link>.",
+  "visibility_modal.privacy_label": "Visibilità",
+  "visibility_modal.quote_followers": "Solo i seguaci",
+  "visibility_modal.quote_label": "Chi può citare",
+  "visibility_modal.quote_nobody": "Solo io",
+  "visibility_modal.quote_public": "Chiunque",
+  "visibility_modal.save": "Salva"
 }
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index 39d8597df34..ee4cc5c7b3b 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -70,7 +70,6 @@
   "account.posts_with_replies": "投稿と返信",
   "account.remove_from_followers": "{name}さんをフォロワーから削除",
   "account.report": "@{name}さんを通報",
-  "account.requested": "フォロー承認待ちです。クリックしてキャンセル",
   "account.requested_follow": "{name}さんがあなたにフォローリクエストしました",
   "account.requests_to_follow_you": "フォローリクエスト",
   "account.share": "@{name}さんのプロフィールを共有する",
@@ -219,6 +218,13 @@
   "confirmations.delete_list.confirm": "削除",
   "confirmations.delete_list.message": "本当にこのリストを完全に削除しますか？",
   "confirmations.delete_list.title": "リストを削除しようとしています",
+  "confirmations.discard_draft.confirm": "破棄して続ける",
+  "confirmations.discard_draft.edit.cancel": "編集を再開",
+  "confirmations.discard_draft.edit.message": "続行すると、現在編集している投稿に加えた変更は破棄されます。",
+  "confirmations.discard_draft.edit.title": "投稿の変更を破棄しますか？",
+  "confirmations.discard_draft.post.cancel": "下書きを再開",
+  "confirmations.discard_draft.post.message": "続行すると、現在作成中の投稿が破棄されます。",
+  "confirmations.discard_draft.post.title": "下書きを破棄しますか？",
   "confirmations.discard_edit_media.confirm": "破棄",
   "confirmations.discard_edit_media.message": "メディアの説明またはプレビューに保存されていない変更があります。それでも破棄しますか？",
   "confirmations.follow_to_list.confirm": "フォローしてリストに追加",
@@ -232,15 +238,16 @@
   "confirmations.missing_alt_text.secondary": "そのまま投稿する",
   "confirmations.missing_alt_text.title": "代替テキストを追加しますか？",
   "confirmations.mute.confirm": "ミュート",
+  "confirmations.quiet_post_quote_info.dismiss": "次回からこのメッセージを表示しない",
   "confirmations.redraft.confirm": "削除して下書きに戻す",
   "confirmations.redraft.message": "投稿を削除して下書きに戻します。この投稿へのお気に入り登録やブーストは失われ、返信は孤立することになります。よろしいですか？",
   "confirmations.redraft.title": "投稿の削除と下書きの再作成",
   "confirmations.remove_from_followers.confirm": "フォロワーを削除",
   "confirmations.remove_from_followers.message": "{name}さんはあなたをフォローしなくなります。本当によろしいですか？",
   "confirmations.remove_from_followers.title": "フォロワーを削除しますか？",
+  "confirmations.revoke_quote.confirm": "投稿を削除",
+  "confirmations.revoke_quote.title": "投稿を削除しますか?",
   "confirmations.unfollow.confirm": "フォロー解除",
-  "confirmations.unfollow.message": "本当に{name}さんのフォローを解除しますか？",
-  "confirmations.unfollow.title": "フォローを解除しようとしています",
   "content_warning.hide": "内容を隠す",
   "content_warning.show": "承知して表示",
   "content_warning.show_more": "続きを表示",
@@ -330,9 +337,11 @@
   "errors.unexpected_crash.copy_stacktrace": "スタックトレースをクリップボードにコピー",
   "errors.unexpected_crash.report_issue": "問題を報告",
   "explore.suggested_follows": "ユーザー",
+  "explore.title": "トレンド",
   "explore.trending_links": "ニュース",
   "explore.trending_statuses": "投稿",
   "explore.trending_tags": "ハッシュタグ",
+  "featured_carousel.header": "{count, plural, other {固定された投稿}}",
   "featured_carousel.next": "次へ",
   "featured_carousel.post": "投稿",
   "featured_carousel.previous": "前へ",
@@ -415,8 +424,7 @@
   "hints.profiles.see_more_followers": "{domain} で正確な情報を見る",
   "hints.profiles.see_more_follows": "{domain} で正確な情報を見る",
   "hints.profiles.see_more_posts": "{domain} でその他の投稿を見る",
-  "hints.threads.replies_may_be_missing": "リモートの返信は表示されない場合があります。",
-  "hints.threads.see_more": "{domain} でその他の返信を見る",
+  "home.column_settings.show_quotes": "引用を表示",
   "home.column_settings.show_reblogs": "ブースト表示",
   "home.column_settings.show_replies": "返信表示",
   "home.hide_announcements": "お知らせを隠す",
@@ -437,20 +445,10 @@
   "ignore_notifications_modal.private_mentions_title": "本当に「外部からの非公開の返信」を無視するようにしますか？",
   "info_button.label": "ヘルプ",
   "info_button.what_is_alt_text": "<h1>代替テキストとは何ですか？</h1> <p>代替テキストは、視覚障害、低速ネットワーク接続の人や追加コンテンツを求める人に役立つ画像説明です。</p> <p>明確、簡潔、客観的に記述することでアクセシビリティが向上し、より多くの人に理解されるようになります。</p> <ul> <li>要点をとらえる</li> <li>画像内のテキストを要約する</li> <li>平易な文章で説明する</li> <li>情報の重複を避ける</li> <li>複雑な内容 (図や地図など) では傾向やポイントを見つける</li> </ul>",
-  "interaction_modal.action.favourite": "お気に入り登録はあなたのアカウントがあるサーバーで行う必要があります。",
-  "interaction_modal.action.follow": "ユーザーをフォローするには、あなたのアカウントがあるサーバーからフォローする必要があります。",
-  "interaction_modal.action.reblog": "投稿をブーストするには、あなたのアカウントがあるサーバーでブーストする必要があります。",
-  "interaction_modal.action.reply": "リプライを送るには、あなたのアカウントがあるサーバーから送る必要があります。",
-  "interaction_modal.action.vote": "票を入れるには、あなたのアカウントがあるサーバーから投票する必要があります。",
   "interaction_modal.go": "サーバーに移動",
   "interaction_modal.no_account_yet": "アカウントを持っていない場合は:",
   "interaction_modal.on_another_server": "別のサーバー",
   "interaction_modal.on_this_server": "このサーバー",
-  "interaction_modal.title.favourite": "{name}さんの投稿をお気に入り登録",
-  "interaction_modal.title.follow": "{name}さんをフォロー",
-  "interaction_modal.title.reblog": "{name}さんの投稿をブースト",
-  "interaction_modal.title.reply": "{name}さんの投稿にリプライ",
-  "interaction_modal.title.vote": "{name}さんのアンケートに投票",
   "interaction_modal.username_prompt": "例: {example}",
   "intervals.full.days": "{number}日",
   "intervals.full.hours": "{number}時間",
@@ -479,6 +477,7 @@
   "keyboard_shortcuts.open_media": "メディアを開く",
   "keyboard_shortcuts.pinned": "固定した投稿のリストを開く",
   "keyboard_shortcuts.profile": "プロフィールを開く",
+  "keyboard_shortcuts.quote": "引用投稿",
   "keyboard_shortcuts.reply": "返信",
   "keyboard_shortcuts.requests": "フォローリクエストのリストを開く",
   "keyboard_shortcuts.search": "検索欄に移動",
@@ -490,6 +489,7 @@
   "keyboard_shortcuts.translate": "投稿を翻訳する",
   "keyboard_shortcuts.unfocus": "投稿の入力欄・検索欄から離れる",
   "keyboard_shortcuts.up": "カラム内一つ上に移動",
+  "learn_more_link.learn_more": "もっと見る",
   "lightbox.close": "閉じる",
   "lightbox.next": "次",
   "lightbox.previous": "前",
@@ -539,8 +539,10 @@
   "mute_modal.you_wont_see_mentions": "宛先に相手が入っている投稿も閲覧できなくなります。",
   "mute_modal.you_wont_see_posts": "相手はあなたの投稿を今までどおり閲覧できますが、あなたは相手の投稿を閲覧できなくなります。",
   "navigation_bar.about": "概要",
+  "navigation_bar.account_settings": "パスワードとセキュリティ",
   "navigation_bar.administration": "管理",
   "navigation_bar.advanced_interface": "上級者向けUIに戻る",
+  "navigation_bar.automated_deletion": "投稿の自動削除",
   "navigation_bar.blocks": "ブロックしたユーザー",
   "navigation_bar.bookmarks": "ブックマーク",
   "navigation_bar.direct": "非公開の返信",
@@ -550,13 +552,21 @@
   "navigation_bar.follow_requests": "フォローリクエスト",
   "navigation_bar.followed_tags": "フォロー中のハッシュタグ",
   "navigation_bar.follows_and_followers": "フォロー・フォロワー",
+  "navigation_bar.import_export": "インポートとエクスポート",
   "navigation_bar.lists": "リスト",
   "navigation_bar.logout": "ログアウト",
   "navigation_bar.moderation": "モデレーション",
+  "navigation_bar.more": "もっと見る",
   "navigation_bar.mutes": "ミュートしたユーザー",
   "navigation_bar.opened_in_classic_interface": "投稿やプロフィールを直接開いた場合は一時的に標準UIで表示されます。",
   "navigation_bar.preferences": "ユーザー設定",
+  "navigation_bar.privacy_and_reach": "プライバシーとつながりやすさ",
   "navigation_bar.search": "検索",
+  "navigation_bar.search_trends": "検索 / トレンド",
+  "navigation_panel.collapse_followed_tags": "フォロー中のハッシュタグメニューを閉じる",
+  "navigation_panel.collapse_lists": "リストメニューを閉じる",
+  "navigation_panel.expand_followed_tags": "フォロー中のハッシュタグメニューを展開",
+  "navigation_panel.expand_lists": "リストメニューを展開",
   "not_signed_in_indicator.not_signed_in": "この機能を使うにはログインする必要があります。",
   "notification.admin.report": "{name}さんが{target}さんを通報しました",
   "notification.admin.report_account": "{name}さんが{target}さんの投稿{count, plural, other {#件}}を「{category}」として通報しました",
@@ -578,6 +588,7 @@
   "notification.label.mention": "メンション",
   "notification.label.private_mention": "非公開の返信 (メンション)",
   "notification.label.private_reply": "非公開の返信",
+  "notification.label.quote": "{name}さんがあなたの投稿を引用しました",
   "notification.label.reply": "返信",
   "notification.mention": "メンション",
   "notification.mentioned_you": "{name} さんがあなたに返信しました",
@@ -623,25 +634,26 @@
   "notifications.clear": "通知を消去",
   "notifications.clear_confirmation": "本当に通知を消去しますか？",
   "notifications.clear_title": "通知を消去しようとしています",
-  "notifications.column_settings.admin.report": "新しい通報:",
-  "notifications.column_settings.admin.sign_up": "新規登録:",
+  "notifications.column_settings.admin.report": "新しい通報",
+  "notifications.column_settings.admin.sign_up": "新規登録",
   "notifications.column_settings.alert": "デスクトップ通知",
-  "notifications.column_settings.favourite": "お気に入り:",
+  "notifications.column_settings.favourite": "お気に入り",
   "notifications.column_settings.filter_bar.advanced": "すべてのカテゴリを表示",
-  "notifications.column_settings.filter_bar.category": "クイックフィルターバー:",
-  "notifications.column_settings.follow": "新しいフォロワー:",
-  "notifications.column_settings.follow_request": "新しいフォローリクエスト:",
+  "notifications.column_settings.filter_bar.category": "クイックフィルターバー",
+  "notifications.column_settings.follow": "新しいフォロワー",
+  "notifications.column_settings.follow_request": "新しいフォローリクエスト",
   "notifications.column_settings.group": "グループ",
-  "notifications.column_settings.mention": "返信:",
-  "notifications.column_settings.poll": "アンケート結果:",
+  "notifications.column_settings.mention": "返信",
+  "notifications.column_settings.poll": "アンケート結果",
   "notifications.column_settings.push": "プッシュ通知",
-  "notifications.column_settings.reblog": "ブースト:",
+  "notifications.column_settings.quote": "引用",
+  "notifications.column_settings.reblog": "ブースト",
   "notifications.column_settings.show": "カラムに表示",
   "notifications.column_settings.sound": "通知音を再生",
-  "notifications.column_settings.status": "新しい投稿:",
-  "notifications.column_settings.unread_notifications.category": "未読の通知:",
+  "notifications.column_settings.status": "新しい投稿",
+  "notifications.column_settings.unread_notifications.category": "未読の通知",
   "notifications.column_settings.unread_notifications.highlight": "未読の通知を強調表示",
-  "notifications.column_settings.update": "編集:",
+  "notifications.column_settings.update": "編集",
   "notifications.filter.all": "すべて",
   "notifications.filter.boosts": "ブースト",
   "notifications.filter.favourites": "お気に入り",
@@ -655,7 +667,7 @@
   "notifications.permission_denied": "ブラウザの通知が拒否されているためデスクトップ通知は利用できません",
   "notifications.permission_denied_alert": "ブラウザの通知が拒否されているためデスクトップ通知を有効にできません",
   "notifications.permission_required": "必要な権限が付与されていないため、デスクトップ通知は利用できません。",
-  "notifications.policy.accept": "受入れ",
+  "notifications.policy.accept": "受け入れ",
   "notifications.policy.accept_hint": "通知を表示します",
   "notifications.policy.drop": "無視",
   "notifications.policy.drop_hint": "通知を破棄します。再表示はできません。",
@@ -710,8 +722,11 @@
   "privacy.private.short": "フォロワー",
   "privacy.public.long": "すべての人 (Mastodon以外も含む)",
   "privacy.public.short": "公開",
+  "privacy.quote.anyone": "{visibility}、誰でも引用可能",
+  "privacy.quote.disabled": "{visibility}、引用不可",
+  "privacy.quote.limited": "{visibility}、引用は制限",
   "privacy.unlisted.additional": "「公開」とほとんど同じですが、リアルタイムフィードやハッシュタグ、探索機能、Mastodon検索などに投稿が表示されない点で「公開」と異なります。また、アカウント設定で投稿の検索や表示を許可している場合でも、この公開範囲を設定した投稿は前述の機能には表示されません。",
-  "privacy.unlisted.long": "より表示機会の少ない公開",
+  "privacy.unlisted.long": "Mastodonの検索結果、トレンド、公開タイムラインに表示しない",
   "privacy.unlisted.short": "ひかえめな公開",
   "privacy_policy.last_updated": "{date}に更新",
   "privacy_policy.title": "プライバシーポリシー",
@@ -783,6 +798,7 @@
   "report_notification.categories.violation": "ルール違反",
   "report_notification.categories.violation_sentence": "ルール違反",
   "report_notification.open": "通報を開く",
+  "search.clear": "検索をクリア",
   "search.no_recent_searches": "検索履歴はありません",
   "search.placeholder": "検索",
   "search.quick_action.account_search": "{x}に該当するプロフィール",
@@ -823,10 +839,12 @@
   "status.block": "@{name}さんをブロック",
   "status.bookmark": "ブックマーク",
   "status.cancel_reblog_private": "ブースト解除",
+  "status.cannot_quote": "この投稿は引用できません",
   "status.cannot_reblog": "この投稿はブーストできません",
   "status.continued_thread": "続きのスレッド",
   "status.copy": "投稿へのリンクをコピー",
   "status.delete": "削除",
+  "status.delete.success": "投稿を削除しました",
   "status.detailed_status": "詳細な会話ビュー",
   "status.direct": "@{name}さんに非公開で投稿",
   "status.direct_indicator": "非公開の返信",
@@ -849,22 +867,22 @@
   "status.mute_conversation": "会話をミュート",
   "status.open": "詳細を表示",
   "status.pin": "プロフィールに固定表示",
+  "status.quote": "引用",
+  "status.quote.cancel": "引用をキャンセル",
   "status.quote_error.filtered": "あなたのフィルター設定によって非表示になっています",
-  "status.quote_error.not_found": "この投稿は表示できません。",
-  "status.quote_error.pending_approval": "この投稿は投稿者の承認待ちです。",
-  "status.quote_error.rejected": "この投稿は、オリジナルの投稿者が引用することを許可していないため、表示できません。",
-  "status.quote_error.removed": "この投稿は投稿者によって削除されました。",
-  "status.quote_error.unauthorized": "この投稿を表示する権限がないため、表示できません。",
-  "status.quote_post_author": "{name} の投稿",
+  "status.quote_error.pending_approval": "承認待ちの投稿",
+  "status.quote_noun": "引用",
+  "status.quotes": "{count, plural, other {引用}}",
   "status.read_more": "もっと見る",
   "status.reblog": "ブースト",
-  "status.reblog_private": "ブースト",
+  "status.reblog_or_quote": "ブーストか引用",
   "status.reblogged_by": "{name}さんがブースト",
   "status.reblogs": "{count, plural, one {ブースト} other {ブースト}}",
   "status.reblogs.empty": "まだ誰もブーストしていません。ブーストされるとここに表示されます。",
   "status.redraft": "削除して下書きに戻す",
   "status.remove_bookmark": "ブックマークを削除",
   "status.remove_favourite": "お気に入りから削除",
+  "status.remove_quote": "削除",
   "status.replied_in_thread": "ほかのユーザーへ",
   "status.replied_to": "{name}さんへの返信",
   "status.reply": "返信",
@@ -885,7 +903,10 @@
   "subscribed_languages.save": "変更を保存",
   "subscribed_languages.target": "{target}さんの購読言語を変更します",
   "tabs_bar.home": "ホーム",
+  "tabs_bar.menu": "メニュー",
   "tabs_bar.notifications": "通知",
+  "tabs_bar.publish": "新しい投稿",
+  "tabs_bar.search": "検索",
   "terms_of_service.effective_as_of": "{date}より有効",
   "terms_of_service.title": "サービス利用規約",
   "terms_of_service.upcoming_changes_on": "{date}から適用される変更",
@@ -926,5 +947,12 @@
   "video.skip_forward": "前方にスキップ",
   "video.unmute": "ミュート解除",
   "video.volume_down": "音量を下げる",
-  "video.volume_up": "音量を上げる"
+  "video.volume_up": "音量を上げる",
+  "visibility_modal.button_title": "公開範囲の設定",
+  "visibility_modal.privacy_label": "公開範囲",
+  "visibility_modal.quote_followers": "フォロワーのみ",
+  "visibility_modal.quote_label": "引用できるユーザー",
+  "visibility_modal.quote_nobody": "自分のみ",
+  "visibility_modal.quote_public": "誰でも",
+  "visibility_modal.save": "保存"
 }
diff --git a/app/javascript/mastodon/locales/ka.json b/app/javascript/mastodon/locales/ka.json
index 9831d8b1a97..2b495ab0b14 100644
--- a/app/javascript/mastodon/locales/ka.json
+++ b/app/javascript/mastodon/locales/ka.json
@@ -21,7 +21,6 @@
   "account.posts": "პოსტები",
   "account.posts_with_replies": "ტუტები და პასუხები",
   "account.report": "დაარეპორტე @{name}",
-  "account.requested": "დამტკიცების მოლოდინში. დააწკაპუნეთ რომ უარყოთ დადევნების მოთხონვა",
   "account.share": "გააზიარე @{name}-ის პროფილი",
   "account.show_reblogs": "აჩვენე ბუსტები @{name}-სგან",
   "account.unblock": "განბლოკე @{name}",
@@ -72,7 +71,6 @@
   "confirmations.mute.confirm": "დადუმება",
   "confirmations.redraft.confirm": "გაუქმება და გადანაწილება",
   "confirmations.unfollow.confirm": "ნუღარ მიჰყვები",
-  "confirmations.unfollow.message": "დარწმუნებული ხართ, აღარ გსურთ მიჰყვებოდეთ {name}-ს?",
   "embed.instructions": "ეს სტატუსი ჩასვით თქვენს ვებ-საიტზე შემდეგი კოდის კოპირებით.",
   "embed.preview": "ესაა თუ როგორც გამოჩნდება:",
   "emoji_button.activity": "აქტივობა",
@@ -197,7 +195,6 @@
   "status.open": "ამ სტატუსის გაფართოება",
   "status.pin": "აპინე პროფილზე",
   "status.reblog": "ბუსტი",
-  "status.reblog_private": "დაიბუსტოს საწყის აუდიტორიაზე",
   "status.reblogged_by": "{name} დაიბუსტა",
   "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
   "status.redraft": "გაუქმდეს და გადანაწილდეს",
diff --git a/app/javascript/mastodon/locales/kab.json b/app/javascript/mastodon/locales/kab.json
index d825c878946..0add265b63b 100644
--- a/app/javascript/mastodon/locales/kab.json
+++ b/app/javascript/mastodon/locales/kab.json
@@ -1,11 +1,13 @@
 {
   "about.blocks": "Iqeddacen yettwaɛassen",
   "about.contact": "Anermis:",
+  "about.default_locale": "Tamezwert",
   "about.disclaimer": "Mastodon d aseɣẓan ilelli, d aseɣẓan n uɣbalu yeldin, d tnezzut n Mastodon gGmbH.",
   "about.domain_blocks.no_reason_available": "Ulac taɣẓint",
   "about.domain_blocks.preamble": "Maṣṭudun s umata yeḍmen-ak ad teẓreḍ agbur, ad tesdemreḍ akked yimseqdacen-nniḍen seg yal aqeddac deg fedivers. Ha-tent-an ɣur-k tsuraf i yellan deg uqeddac-agi.",
   "about.domain_blocks.silenced.title": "Ɣur-s talast",
   "about.domain_blocks.suspended.title": "Yettwaḥbes",
+  "about.language_label": "Tutlayt",
   "about.not_available": "Talɣut-a ur tettwabder ara deg uqeddac-a.",
   "about.powered_by": "Azeṭṭa inmetti yettwasɣelsen sɣur {mastodon}",
   "about.rules": "Ilugan n uqeddac",
@@ -24,6 +26,9 @@
   "account.edit_profile": "Ẓreg amaɣnu",
   "account.enable_notifications": "Azen-iyi-d ilɣa mi ara d-isuffeɣ @{name}",
   "account.endorse": "Welleh fell-as deg umaɣnu-inek",
+  "account.familiar_followers_many": "Yeṭṭafaṛ-it {name1} d {name2}, akked {othersCount, plural, one {yiwen nniḍen i tessneḍ} other {# nniḍen i tessneḍ}}",
+  "account.familiar_followers_one": "Yeṭṭafar-it {name1}",
+  "account.familiar_followers_two": "Yeṭṭafar-it {name1} akked {name2}",
   "account.featured.accounts": "Imeɣna",
   "account.featured.hashtags": "Ihacṭagen",
   "account.featured_tags.last_status_at": "Tasuffeɣt taneggarut ass n {date}",
@@ -33,6 +38,7 @@
   "account.followers": "Imeḍfaren",
   "account.followers.empty": "Ar tura, ulac yiwen i yeṭṭafaṛen amseqdac-agi.",
   "account.followers_counter": "{count, plural, one {{counter} n umḍfar} other {{counter} n yimeḍfaren}}",
+  "account.followers_you_know_counter": "Tessneḍ {counter}",
   "account.following": "Yeṭṭafaṛ",
   "account.following_counter": "{count, plural, one {{counter} yettwaḍfaren} other {{counter} yettwaḍfaren}}",
   "account.follows.empty": "Ar tura, amseqdac-agi ur yeṭṭafaṛ yiwen.",
@@ -50,12 +56,13 @@
   "account.mute_notifications_short": "Susem ilɣa",
   "account.mute_short": "Sgugem",
   "account.muted": "Yettwasgugem",
+  "account.mutual": "Temmeḍfaṛem",
   "account.no_bio": "Ulac aglam i d-yettunefken.",
   "account.open_original_page": "Ldi asebter anasli",
   "account.posts": "Tisuffaɣ",
   "account.posts_with_replies": "Tisuffaɣ d tririyin",
+  "account.remove_from_followers": "Kkes {name} seg ineḍfaren",
   "account.report": "Cetki ɣef @{name}",
-  "account.requested": "Di laɛḍil ad yettwaqbel. Ssit i wakken ad yefsex usuter n uḍfar",
   "account.requested_follow": "{name} yessuter ad k·m-yeḍfer",
   "account.share": "Bḍu amaɣnu n @{name}",
   "account.show_reblogs": "Ssken-d inebḍa n @{name}",
@@ -81,9 +88,13 @@
   "alt_text_modal.cancel": "Semmet",
   "alt_text_modal.done": "Immed",
   "announcement.announcement": "Ulɣu",
+  "annual_report.summary.followers.followers": "imeḍfaṛen",
+  "annual_report.summary.followers.total": "{count} deg aɣrud",
   "annual_report.summary.most_used_app.most_used_app": "asnas yettwasqedcen s waṭas",
   "annual_report.summary.most_used_hashtag.none": "Ula yiwen",
   "annual_report.summary.new_posts.new_posts": "tisuffaɣ timaynutin",
+  "annual_report.summary.percentile.we_wont_tell_bernie": "Ur as-neqqar i yiwen.",
+  "annual_report.summary.thanks": "Tanemmirt imi i tettekkiḍ deg Mastodon!",
   "audio.hide": "Ffer amesli",
   "block_modal.show_less": "Ssken-d drus",
   "block_modal.show_more": "Ssken-d ugar",
@@ -115,8 +126,10 @@
   "column.domain_blocks": "Taɣulin yeffren",
   "column.edit_list": "Ẓreg tabdart",
   "column.favourites": "Imenyafen",
+  "column.firehose": "Isuddam usriden",
   "column.follow_requests": "Isuturen n teḍfeṛt",
   "column.home": "Agejdan",
+  "column.list_members": "Sefrek iεeggalen n tebdart",
   "column.lists": "Tibdarin",
   "column.mutes": "Imiḍanen yettwasgugmen",
   "column.notifications": "Ilɣa",
@@ -154,6 +167,7 @@
   "compose_form.save_changes": "Leqqem",
   "compose_form.spoiler.marked": "Kkes aḍris yettwaffren deffir n walɣu",
   "compose_form.spoiler.unmarked": "Rnu aḍris yettwaffren deffir n walɣu",
+  "compose_form.spoiler_placeholder": "Alɣu n ugbur (afrayan)",
   "confirmation_modal.cancel": "Sefsex",
   "confirmations.block.confirm": "Sewḥel",
   "confirmations.delete.confirm": "Kkes",
@@ -162,8 +176,10 @@
   "confirmations.delete_list.confirm": "Kkes",
   "confirmations.delete_list.message": "Tebɣiḍ s tidet ad tekkseḍ umuɣ-agi i lebda?",
   "confirmations.delete_list.title": "Tukksa n tebdart?",
+  "confirmations.discard_draft.confirm": "Ttu-t u kemmel",
   "confirmations.discard_edit_media.confirm": "Sefsex",
   "confirmations.follow_to_list.confirm": "Ḍfeṛ-it sakin rnu-t ɣer tebdart",
+  "confirmations.follow_to_list.title": "Ḍfer aseqdac?",
   "confirmations.logout.confirm": "Ffeɣ",
   "confirmations.logout.message": "D tidet tebɣiḍ ad teffɣeḍ?",
   "confirmations.logout.title": "Tebɣiḍ ad teffɣeḍ ssya?",
@@ -171,9 +187,13 @@
   "confirmations.missing_alt_text.secondary": "Suffeɣ akken yebɣu yili",
   "confirmations.missing_alt_text.title": "Rnu aḍris amlellay?",
   "confirmations.mute.confirm": "Sgugem",
+  "confirmations.quiet_post_quote_info.dismiss": "Ur iyi-d-smektay ara",
+  "confirmations.quiet_post_quote_info.got_it": "Gziɣ-t",
   "confirmations.redraft.confirm": "Kkes sakin ɛiwed tira",
+  "confirmations.remove_from_followers.confirm": "Kkes aneḍfar",
+  "confirmations.revoke_quote.confirm": "Kkes tasuffeɣt",
+  "confirmations.revoke_quote.title": "Kkes tasuffeɣt?",
   "confirmations.unfollow.confirm": "Ur ḍḍafaṛ ara",
-  "confirmations.unfollow.message": "Tetḥeqqeḍ belli tebɣiḍ ur teṭafaṛeḍ ara {name}?",
   "content_warning.hide": "Ffer tasuffeɣt",
   "content_warning.show": "Ssken-d akken tebɣu tili",
   "content_warning.show_more": "Sken-d ugar",
@@ -197,8 +217,14 @@
   "domain_block_modal.you_wont_see_posts": "Ur tettuɣaleḍ ara ttwaliḍ tisuffaɣ neɣ ulɣuten n iseqdacen n uqeddac-a.",
   "domain_pill.activitypub_like_language": "ActivityPub am tutlayt yettmeslay Mastodon d izeḍwan inmettiyen nniḍen.",
   "domain_pill.server": "Aqeddac",
+  "domain_pill.their_handle": "Asulay-is:",
   "domain_pill.username": "Isem n useqdac",
+  "domain_pill.whats_in_a_handle": "D acu i yellan deg usulay?",
+  "domain_pill.who_they_are": "Imi isulayen qqaren-d anwa i d yiwen d wanda yella, tzemreḍ ad temyigweḍ d yemdanen deg web anmetti yebnan s <button>tɣeṛɣaṛ yemmugen s ActivityPub</button>.",
+  "domain_pill.who_you_are": "Imi isulay-ik·im yeqqar-d anwa i d kečč·kemmi d wanda i telliḍ, zemren medden ad myigwen yid-k·m deg web anmetti yebnan s <button>tɣeṛɣaṛ yemmugen s ActivityPub</button>.",
+  "domain_pill.your_handle": "Asulay-ik·im:",
   "domain_pill.your_server": "D axxam-inek·inem umḍin, anda i zedɣent akk tsuffaɣ-ik·im. Ur k·m-yeεǧib ara wa? Ssenfel-d iqeddacen melmi i ak·m-yehwa, awi-d daɣen ineḍfaren-ik·im yid-k·m.",
+  "dropdown.empty": "Fren taxtiṛit",
   "embed.instructions": "Ẓẓu addad-agi deg usmel-inek·inem s wenɣal n tangalt yellan sdaw-agi.",
   "embed.preview": "Akka ara d-iban:",
   "emoji_button.activity": "Aqeddic",
@@ -223,6 +249,7 @@
   "empty_column.bookmarked_statuses": "Ulac kra n tsuffeɣt i terniḍ ɣer yismenyifen-ik·im ar tura. Ticki terniḍ yiwet, ad d-tettwasken da.",
   "empty_column.community": "Tasuddemt tazayezt tadigant n yisallen d tilemt. Aru ihi kra akken ad tt-teččareḍ!",
   "empty_column.domain_blocks": "Ulac kra n taɣult yettwaffren ar tura.",
+  "empty_column.explore_statuses": "Ulac ayen yellan d anezzuɣ akka tura. Uɣal-d ticki!",
   "empty_column.follow_requests": "Ulac ɣur-k·m ula yiwen n usuter n teḍfeṛt. Ticki teṭṭfeḍ-d yiwen ad d-yettwasken da.",
   "empty_column.hashtag": "Ar tura ulac kra n ugbur yesɛan assaɣ ɣer uhacṭag-agi.",
   "empty_column.home": "Tasuddemt tagejdant n yisallen d tilemt! Ẓer {public} neɣ nadi ad tafeḍ imseqdacen-nniḍen ad ten-ḍefṛeḍ.",
@@ -234,9 +261,15 @@
   "errors.unexpected_crash.copy_stacktrace": "Nɣel stacktrace ɣef wafus",
   "errors.unexpected_crash.report_issue": "Mmel ugur",
   "explore.suggested_follows": "Imdanen",
+  "explore.title": "Inezzaɣ",
   "explore.trending_links": "Isallen",
   "explore.trending_statuses": "Tisuffaɣ",
   "explore.trending_tags": "Ihacṭagen",
+  "featured_carousel.header": "{count, plural, one {n tsuffeɣt tunṭiḍt} other {n tsuffaɣ tunṭiḍin}}",
+  "featured_carousel.next": "Uḍfiṛ",
+  "featured_carousel.post": "Tasuffeɣt",
+  "featured_carousel.previous": "Uzwir",
+  "featured_carousel.slide": "{index} ɣef {total}",
   "filter_modal.added.review_and_configure_title": "Iɣewwaṛen n imzizdig",
   "filter_modal.added.settings_link": "asebter n yiɣewwaṛen",
   "filter_modal.added.short_explanation": "Tasuffeɣt-a tettwarna ɣer taggayt-a n yimsizdegen: {title}.",
@@ -252,6 +285,7 @@
   "firehose.remote": "Iqeddacen nniḍen",
   "follow_request.authorize": "Ssireg",
   "follow_request.reject": "Agi",
+  "follow_suggestions.curated_suggestion": "Yettwafren sɣur tarbaɛt",
   "follow_suggestions.dismiss": "Dayen ur t-id-skan ara",
   "follow_suggestions.featured_longer": "Yettwafraned s ufus sɣur agraw n {domain}",
   "follow_suggestions.friends_of_friends_longer": "D aɣeṛfan ar wid i teṭṭafareḍ",
@@ -289,26 +323,21 @@
   "hashtag.follow": "Ḍfeṛ ahacṭag",
   "hashtag.mute": "Sgugem #{hashtag}",
   "hashtags.and_other": "…d {count, plural, one {}other {# nniḍen}}",
-  "hints.threads.replies_may_be_missing": "Tiririyin d-yusan deg iqeddacen nniḍen, yezmer ur d-ddant ara.",
-  "hints.threads.see_more": "Wali ugar n tririt deg {domain}",
+  "hints.profiles.see_more_posts": "Wali ugar n tsuffaɣ ɣef {domain}",
+  "home.column_settings.show_quotes": "Sken-d tibdarin",
   "home.column_settings.show_reblogs": "Ssken-d beṭṭu",
   "home.column_settings.show_replies": "Ssken-d tiririyin",
   "home.hide_announcements": "Ffer ulɣuyen",
   "home.pending_critical_update.body": "Ma ulac aɣilif, leqqem aqeddac-ik Mastodon akken kan tzemreḍ !",
   "home.pending_critical_update.link": "Wali ileqman",
   "home.show_announcements": "Ssken-d ulɣuyen",
+  "ignore_notifications_modal.ignore": "Ttu ilɣa",
   "info_button.label": "Tallelt",
-  "interaction_modal.action.favourite": "I wakken ad tkemmleḍ, yessefk ad d-tḥemmleḍ seg umiḍan-ik·im.",
-  "interaction_modal.action.follow": "I wakken ad tkemmleḍ, yessefk ad d-tḍefreḍ seg umiḍan-ik·im.",
-  "interaction_modal.action.reblog": "I wakken ad tkemmleḍ, yessefk ad d-snernuḍ seg umiḍan-ik·im.",
-  "interaction_modal.action.reply": "I wakken ad tkemmleḍ, yessefk ad d-terreḍ seg umiḍan-ik·im.",
-  "interaction_modal.action.vote": "I wakken ad tkemmleḍ, yessefk ad d-tferneḍ seg umiḍan-ik·im.",
   "interaction_modal.go": "Ddu",
   "interaction_modal.no_account_yet": "Werɛad ur tesɛid amiḍan?",
   "interaction_modal.on_another_server": "Deg uqeddac nniḍen",
   "interaction_modal.on_this_server": "Deg uqeddac-ayi",
-  "interaction_modal.title.follow": "Ḍfer {name}",
-  "interaction_modal.title.reply": "Tiririt i tsuffeɣt n {name}",
+  "interaction_modal.title": "Qqen i wakken ad tkemmleḍ",
   "interaction_modal.username_prompt": "Amedya: {example}",
   "intervals.full.days": "{number, plural, one {# wass} other {# wussan}}",
   "intervals.full.hours": "{number, plural, one {# usarag} other {# yisragen}}",
@@ -322,6 +351,7 @@
   "keyboard_shortcuts.direct": "to open direct messages column",
   "keyboard_shortcuts.down": "i kennu ɣer wadda n tebdart",
   "keyboard_shortcuts.enter": "i tildin n tsuffeɣt",
+  "keyboard_shortcuts.favourite": "Smenyef tassuɣeft",
   "keyboard_shortcuts.favourites": "Ldi tabdert n yismenyifen",
   "keyboard_shortcuts.federated": "i tildin n tsuddemt tamatut n yisallen",
   "keyboard_shortcuts.heading": "Inegzumen n unasiw",
@@ -334,8 +364,9 @@
   "keyboard_shortcuts.my_profile": "akken ad d-teldiḍ amaɣnu-ik",
   "keyboard_shortcuts.notifications": "Ad d-yeldi ajgu n yilɣa",
   "keyboard_shortcuts.open_media": "i tiɣwalin yeldin",
-  "keyboard_shortcuts.pinned": "akken ad teldiḍ tabdart n tjewwiqin yettwasentḍen",
+  "keyboard_shortcuts.pinned": "akken ad teldiḍ tabdart n tsuffaɣ tunṭiḍin",
   "keyboard_shortcuts.profile": "akken ad d-teldiḍ amaɣnu n umeskar",
+  "keyboard_shortcuts.quote": "Tanebdurt n tsuffeɣt",
   "keyboard_shortcuts.reply": "i tririt",
   "keyboard_shortcuts.requests": "akken ad d-teldiḍ tabdert n yisuturen n teḍfeṛt",
   "keyboard_shortcuts.search": "to focus search",
@@ -344,8 +375,11 @@
   "keyboard_shortcuts.toggle_hidden": "i uskan/tuffra n uḍris deffir CW",
   "keyboard_shortcuts.toggle_sensitivity": "i teskent/tuffra n yimidyaten",
   "keyboard_shortcuts.toot": "i wakken attebdud tajewwaqt tamaynut",
+  "keyboard_shortcuts.translate": "i usuqel n tsuffeɣt",
   "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
   "keyboard_shortcuts.up": "i tulin ɣer d asawen n tebdart",
+  "learn_more_link.got_it": "Gziɣ-t",
+  "learn_more_link.learn_more": "Issin ugar",
   "lightbox.close": "Mdel",
   "lightbox.next": "Ɣer zdat",
   "lightbox.previous": "Ɣer deffir",
@@ -357,9 +391,11 @@
   "lists.add_to_list": "Rnu ɣer tebdart",
   "lists.add_to_lists": "Rnu {name} ɣer tebdarin",
   "lists.create": "Snulfu-d",
+  "lists.create_list": "Snulfu-d tabdart",
   "lists.delete": "Kkes tabdart",
   "lists.done": "Immed",
   "lists.edit": "Ẓreg tabdart",
+  "lists.find_users_to_add": "Af-d iseqdacen ara ternuḍ",
   "lists.list_name": "Isem n tebdart",
   "lists.new_list_name": "Isem n tebdart tamaynut",
   "lists.no_lists_yet": "Ulac tibdarin akka tura.",
@@ -383,8 +419,10 @@
   "mute_modal.you_wont_see_mentions": "Ur tezmireḍ ara ad twaliḍ tisuffaɣ anda d-yettwabdar.",
   "mute_modal.you_wont_see_posts": "Yezmer ad yettwali tisuffaɣ-ik·im, maca ur tettwaliḍ ara tidak-is.",
   "navigation_bar.about": "Ɣef",
+  "navigation_bar.account_settings": "Awal n uɛeddi akked tɣellist",
   "navigation_bar.administration": "Tadbelt",
   "navigation_bar.advanced_interface": "Ldi deg ugrudem n web leqqayen",
+  "navigation_bar.automated_deletion": "Tukksa tawurmant n tsuffaɣ",
   "navigation_bar.blocks": "Iseqdacen yettusḥebsen",
   "navigation_bar.bookmarks": "Ticraḍ",
   "navigation_bar.direct": "Tibdarin tusligin",
@@ -394,18 +432,27 @@
   "navigation_bar.follow_requests": "Isuturen n teḍfeṛt",
   "navigation_bar.followed_tags": "Ihacṭagen yettwaḍfaren",
   "navigation_bar.follows_and_followers": "Imeḍfaṛen akked wid i teṭṭafaṛeḍ",
+  "navigation_bar.import_export": "Taktert d usifeḍ",
   "navigation_bar.lists": "Tibdarin",
+  "navigation_bar.live_feed_local": "Asuddem usrid (adigan)",
+  "navigation_bar.live_feed_public": "Asuddem usrid (azayaz)",
   "navigation_bar.logout": "Ffeɣ",
   "navigation_bar.moderation": "Aseɣyed",
+  "navigation_bar.more": "Ugar",
   "navigation_bar.mutes": "Iseqdacen yettwasusmen",
   "navigation_bar.opened_in_classic_interface": "Tisuffaɣ, imiḍanen akked isebtar-nniḍen igejdanen ldin-d s wudem amezwer deg ugrudem web aklasiki.",
   "navigation_bar.preferences": "Imenyafen",
+  "navigation_bar.privacy_and_reach": "Tabḍnit akked wagwaḍ",
   "navigation_bar.search": "Nadi",
+  "navigation_bar.search_trends": "Anadi / Anezzuɣ",
+  "navigation_panel.collapse_lists": "Sneḍfes umuɣ n tebdart",
   "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
   "notification.admin.report": "Yemla-t-id {name} {target}",
   "notification.admin.sign_up": "Ijerred {name}",
   "notification.annual_report.view": "Wali #Wrapstodon",
   "notification.favourite": "{name} yesmenyaf addad-ik·im",
+  "notification.favourite_pm": "{name} yesmenyef abdar-ik·im uslig",
+  "notification.favourite_pm.name_and_others_with_link": "{name} akked <a>{count, plural, one {# nnayeḍ} other {# nniḍen}}</a> rnan abdar-ik·im uslig ar ismenyafen-nsen",
   "notification.follow": "iṭṭafar-ik·em-id {name}",
   "notification.follow.name_and_others": "{name} akked <a>{count, plural, one {# nniḍen} other {# nniḍen}}</a> iḍfeṛ-k·m-id",
   "notification.follow_request": "{name} yessuter-d ad k·m-yeḍfeṛ",
@@ -414,10 +461,12 @@
   "notification.label.private_reply": "Tiririt tusligt",
   "notification.label.reply": "Tiririt",
   "notification.mention": "Abdar",
+  "notification.mentioned_you": "{name} yebder-ik·em-id",
   "notification.moderation-warning.learn_more": "Issin ugar",
   "notification.moderation_warning.action_suspend": "Yettwaseḥbes umiḍan-ik.",
   "notification.own_poll": "Tafrant-ik·im tfuk",
   "notification.reblog": "{name} yebḍa tajewwiqt-ik i tikelt-nniḍen",
+  "notification.reblog.name_and_others_with_link": "{name} akked <a>{count, plural, one {# nnayeḍ} other {# nniḍen}}</a> zzuzren tasuffeɣt-ik·im",
   "notification.relationships_severance_event.learn_more": "Issin ugar",
   "notification.status": "{name} akken i d-yessufeɣ",
   "notification_requests.accept": "Qbel",
@@ -426,8 +475,10 @@
   "notification_requests.exit_selection": "Immed",
   "notification_requests.notifications_from": "Ilɣa sɣur {name}",
   "notification_requests.title": "Ilɣa yettwasizdgen",
+  "notification_requests.view": "Wali ilɣa",
   "notifications.clear": "Sfeḍ ilɣa",
   "notifications.clear_confirmation": "Tebɣiḍ s tidet ad tekkseḍ akk ilɣa-inek·em i lebda?",
+  "notifications.clear_title": "Sfeḍ ilɣa?",
   "notifications.column_settings.admin.report": "Ineqqisen imaynuten:",
   "notifications.column_settings.alert": "Ilɣa n tnarit",
   "notifications.column_settings.favourite": "Imenyafen:",
@@ -439,6 +490,7 @@
   "notifications.column_settings.mention": "Abdar:",
   "notifications.column_settings.poll": "Igemmaḍ n usenqed:",
   "notifications.column_settings.push": "Ilɣa yettudemmren",
+  "notifications.column_settings.quote": "Yebder-d:",
   "notifications.column_settings.reblog": "Seǧhed:",
   "notifications.column_settings.show": "Ssken-d tilɣa deg ujgu",
   "notifications.column_settings.sound": "Rmed imesli",
@@ -498,20 +550,25 @@
   "privacy.private.short": "Imeḍfaren",
   "privacy.public.long": "Kra n win yellan deg Masṭudun neɣ berra-s",
   "privacy.public.short": "Azayez",
-  "privacy.unlisted.long": "Kra kan yiwarzimen",
   "privacy.unlisted.short": "Azayez asusam",
   "privacy_policy.last_updated": "Aleqqem aneggaru {date}",
   "privacy_policy.title": "Tasertit tabaḍnit",
   "recommended": "Yettuwelleh",
   "refresh": "Smiren",
   "regeneration_indicator.please_stand_by": "Ttxil rǧu.",
+  "regeneration_indicator.preparing_your_home_feed": "Ha-tt-an tsuddemt-ik·im tagejdant tettwaheggay…",
   "relative_time.days": "{number}u",
+  "relative_time.full.days": "{number, plural, one {# n wass} other {# n wussan}} aya",
+  "relative_time.full.hours": "{number, plural, one {# n usrag} other {# n yesragen}} aya",
   "relative_time.full.just_now": "tura kan",
   "relative_time.hours": "{number}isr",
   "relative_time.just_now": "tura",
   "relative_time.minutes": "{number}tis",
   "relative_time.seconds": "{number}tas",
   "relative_time.today": "ass-a",
+  "remove_quote_hint.button_label": "Gziɣ-t",
+  "remove_quote_hint.title": "D tidet, tebɣiḍ ad tekkseḍ tasuffeɣt-inek·inem i d-yettwabedren?",
+  "reply_indicator.attachments": "{count, plural, one {# n umedday} other {# n imeddayen}}",
   "reply_indicator.cancel": "Sefsex",
   "reply_indicator.poll": "Afmiḍi",
   "report.block": "Sewḥel",
@@ -545,6 +602,7 @@
   "report.thanks.title": "Ur tebɣiḍ ara ad twaliḍ aya?",
   "report.thanks.title_actionable": "Tanemmirt ɣef uneqqis, ad nwali deg waya.",
   "report.unfollow": "Seḥbes aḍfar n @{name}",
+  "report.unfollow_explanation": "Aql-ik·ikem teṭṭafareḍ amiḍan-a. I wakken ur tettwaliḍ ara akk, akka d asawen, tisuffaɣ-is deg tsuddemt-ik·im tagejdant, ur teṭṭafar ara.",
   "report_notification.attached_statuses": "{count, plural, one {{count} n tsuffeɣt} other {{count} n tsuffiɣin}} ttwaqnent",
   "report_notification.categories.legal": "Azerfan",
   "report_notification.categories.other": "Ayen nniḍen",
@@ -552,6 +610,7 @@
   "report_notification.categories.spam": "Aspam",
   "report_notification.categories.spam_sentence": "aspam",
   "report_notification.open": "Ldi aneqqis",
+  "search.clear": "Sfeḍ anadi",
   "search.no_recent_searches": "Ulac inadiyen ineggura",
   "search.placeholder": "Nadi",
   "search.quick_action.account_search": "Imaɣnuten mṣadan d {x}",
@@ -577,6 +636,7 @@
   "search_results.title": "Igemmaḍ n unadi ɣef \"{q}\"",
   "server_banner.active_users": "iseqdacen urmiden",
   "server_banner.administered_by": "Yettwadbel sɣur :",
+  "server_banner.is_one_of_many": "{domain} d yiwen seg seg waṭṭas n iqeddacen imzurag n Mastodon i tzemreḍ ad tsqesdceḍ i wakken ad tettekkiḍ deg fediverse.",
   "server_banner.server_stats": "Tidaddanin n uqeddac:",
   "sign_in_banner.create_account": "Snulfu-d amiḍan",
   "sign_in_banner.sign_in": "Qqen",
@@ -586,9 +646,12 @@
   "status.bookmark": "Creḍ",
   "status.cancel_reblog_private": "Sefsex beṭṭu",
   "status.cannot_reblog": "Tasuffeɣt-a ur tezmir ara ad tettwabḍu tikelt-nniḍen",
+  "status.context.retry": "Ɛreḍ tikkelt nniḍen",
+  "status.context.show": "Sken-d",
   "status.continued_thread": "Asqerdec yettkemmil",
   "status.copy": "Nɣel assaɣ ɣer tasuffeɣt",
   "status.delete": "Kkes",
+  "status.delete.success": "Tettwakkes tsuffeɣt",
   "status.direct": "Bder-d @{name} weḥd-s",
   "status.direct_indicator": "Abdar uslig",
   "status.edit": "Ẓreg",
@@ -610,18 +673,29 @@
   "status.mute_conversation": "Sgugem adiwenni",
   "status.open": "Semɣeṛ tasuffeɣt-ayi",
   "status.pin": "Senteḍ-itt deg umaɣnu",
+  "status.quote": "Tanebdurt",
+  "status.quote.cancel": "Semmet tanebdurt",
+  "status.quote_error.limited_account_hint.action": "Sken-d akken ibɣu yili",
+  "status.quote_error.not_available": "Tasuffeɣt-a ulac-itt",
+  "status.quote_error.revoked": "Tasuffeɣt-a yekkes-itt umeskar-is",
+  "status.quote_noun": "Tanebdurt",
+  "status.quote_policy_change": "Snifel anwa i izemren ad d-yebder",
+  "status.quote_post_author": "Yebder-d tasuffeɣt sɣur @{name}",
   "status.read_more": "Issin ugar",
   "status.reblog": "Bḍu",
+  "status.reblog_or_quote": "Zuzer neɣ ader-d",
   "status.reblogged_by": "Yebḍa-tt {name}",
   "status.reblogs": "{count, plural, one {n usnerni} other {n yisnernuyen}}",
   "status.reblogs.empty": "Ula yiwen ur yebḍi tajewwiqt-agi ar tura. Ticki yebḍa-tt yiwen, ad d-iban da.",
   "status.redraft": "Kkes tɛiwdeḍ tira",
   "status.remove_bookmark": "Kkes tacreḍt",
+  "status.remove_quote": "Kkes",
   "status.replied_in_thread": "Y·t·erra-d deg usqerdec",
   "status.replied_to": "Y·terra-yas i {name}",
   "status.reply": "Err",
   "status.replyAll": "Err i wesqerdec",
   "status.report": "Cetki ɣef @{name}",
+  "status.request_quote": "Suter tabdert",
   "status.sensitive_warning": "Agbur amḥulfu",
   "status.share": "Bḍu",
   "status.show_less_all": "Semẓi akk tisuffɣin",
@@ -629,13 +703,16 @@
   "status.show_original": "Sken aɣbalu",
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
   "status.translate": "Suqel",
-  "status.translated_from_with": "Yettwasuqel seg {lang} s {provider}",
+  "status.translated_from_with": "Tettwasuqel seg {lang} s {provider}",
   "status.uncached_media_warning": "Ulac taskant",
   "status.unmute_conversation": "Kkes asgugem n udiwenni",
   "status.unpin": "Kkes asenteḍ seg umaɣnu",
   "subscribed_languages.save": "Sekles ibeddilen",
   "tabs_bar.home": "Agejdan",
+  "tabs_bar.menu": "Umuɣ",
   "tabs_bar.notifications": "Ilɣa",
+  "tabs_bar.publish": "Tasuffeɣt tamaynut",
+  "tabs_bar.search": "Nadi",
   "terms_of_service.title": "Tiwtilin n useqdec",
   "time_remaining.days": "Mazal {number, plural, one {# wass} other {# wussan}}",
   "time_remaining.hours": "Mazal {number, plural, one {# usarag} other {# yisragen}}",
@@ -643,7 +720,7 @@
   "time_remaining.moments": "Akuden i d-yeqqimen",
   "time_remaining.seconds": "Mazal {number, plural, one {# n tasint} other {# n tsinin}} id yugran",
   "trends.counter_by_accounts": "{count, plural, one {{counter} wemdan} other {{counter} medden}} deg {days, plural, one {ass} other {{days} wussan}} iɛeddan",
-  "trends.trending_now": "Ayen mucaɛen tura",
+  "trends.trending_now": "Anezzuɣ tura",
   "ui.beforeunload": "Arewway-ik·im ad iruḥ ma yella tefeɣ-d deg Maṣṭudun.",
   "units.short.billion": "{count}B",
   "units.short.million": "{count}M",
@@ -665,5 +742,14 @@
   "video.mute": "Sgugem",
   "video.pause": "Sgunfu",
   "video.play": "Seddu",
-  "video.unmute": "Kkes asgugem"
+  "video.skip_backward": "Uɣal ɣer deffir",
+  "video.skip_forward": "Ddu ɣer zdat",
+  "video.unmute": "Kkes asgugem",
+  "visibility_modal.button_title": "Sbadu abani",
+  "visibility_modal.privacy_label": "Abani",
+  "visibility_modal.quote_followers": "Imeḍfaṛen kan",
+  "visibility_modal.quote_label": "Anwa i izemren ad d-yebder",
+  "visibility_modal.quote_nobody": "Nekki kan",
+  "visibility_modal.quote_public": "Yal yiwen",
+  "visibility_modal.save": "Sekles"
 }
diff --git a/app/javascript/mastodon/locales/kk.json b/app/javascript/mastodon/locales/kk.json
index f0e981adb35..8e29c3fbeed 100644
--- a/app/javascript/mastodon/locales/kk.json
+++ b/app/javascript/mastodon/locales/kk.json
@@ -1,6 +1,7 @@
 {
   "about.blocks": "Модерацияланған серверлер",
   "about.contact": "Байланыс:",
+  "about.default_locale": "Әдепкі",
   "about.disclaimer": "Mastodon деген тегін, бастапқы коды ашық бағдарламалық жасақтама және Mastodon gGmbH-тің сауда маркасы.",
   "about.domain_blocks.no_reason_available": "Себеп қолжетімсіз",
   "about.domain_blocks.preamble": "Mastodon әдетте сізге Fediverse'тің кез келген серверінің қолданушыларының контентін көріп, олармен байланысуға мүмкіндік береді. Осы белгілі серверде жасалған ережеден тыс жағдайлар міне.",
@@ -64,7 +65,6 @@
   "account.posts_with_replies": "Постар мен жауаптар",
   "account.remove_from_followers": "{name} жазылушылардан жою",
   "account.report": "Шағымдану @{name}",
-  "account.requested": "Растауын күтіңіз. Жазылудан бас тарту үшін басыңыз",
   "account.requested_follow": "{name} сізге жазылуға сұраныс жіберді",
   "account.requests_to_follow_you": "Сізге жазылу сұраныстары",
   "account.share": "@{name} профилін бөлісу\"",
@@ -140,7 +140,6 @@
   "confirmations.mute.confirm": "Үнсіз қылу",
   "confirmations.redraft.confirm": "Өшіруді құптау",
   "confirmations.unfollow.confirm": "Оқымау",
-  "confirmations.unfollow.message": "\"{name} атты қолданушыға енді жазылғыңыз келмей ме?",
   "conversation.delete": "Пікірталасты өшіру",
   "conversation.mark_as_read": "Оқылды деп белгіле",
   "conversation.open": "Пікірталасты қарау",
@@ -321,7 +320,6 @@
   "status.pin": "Профильде жабыстыру",
   "status.read_more": "Әрі қарай",
   "status.reblog": "Бөлісу",
-  "status.reblog_private": "Негізгі аудиторияға бөлісу",
   "status.reblogged_by": "{name} бөлісті",
   "status.reblogs.empty": "Бұл жазбаны әлі ешкім бөліспеді. Біреу бөліскен кезде осында көрінеді.",
   "status.redraft": "Өшіру & қайта қарастыру",
diff --git a/app/javascript/mastodon/locales/kn.json b/app/javascript/mastodon/locales/kn.json
index ae4e4dd7b33..1d383c6b276 100644
--- a/app/javascript/mastodon/locales/kn.json
+++ b/app/javascript/mastodon/locales/kn.json
@@ -13,7 +13,6 @@
   "account.followers": "ಹಿಂಬಾಲಕರು",
   "account.posts": "ಟೂಟ್‌ಗಳು",
   "account.posts_with_replies": "Toots and replies",
-  "account.requested": "Awaiting approval",
   "account.unblock_domain": "Unhide {domain}",
   "account_note.placeholder": "Click to add a note",
   "alert.unexpected.title": "ಅಯ್ಯೋ!",
diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json
index 6c2cc7ea142..f4681794542 100644
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@@ -63,14 +63,13 @@
   "account.mute_short": "뮤트",
   "account.muted": "뮤트됨",
   "account.muting": "뮤트함",
-  "account.mutual": "서로 팔로우 중입니다",
+  "account.mutual": "서로 팔로우",
   "account.no_bio": "제공된 설명이 없습니다.",
   "account.open_original_page": "원본 페이지 열기",
   "account.posts": "게시물",
   "account.posts_with_replies": "게시물과 답장",
   "account.remove_from_followers": "팔로워에서 {name} 제거",
   "account.report": "@{name} 신고",
-  "account.requested": "승인 대기 중. 클릭해서 취소하기",
   "account.requested_follow": "{name} 님이 팔로우 요청을 보냈습니다",
   "account.requests_to_follow_you": "팔로우 요청",
   "account.share": "@{name}의 프로필 공유",
@@ -239,15 +238,20 @@
   "confirmations.missing_alt_text.secondary": "그냥 게시하기",
   "confirmations.missing_alt_text.title": "대체 텍스트를 추가할까요? ",
   "confirmations.mute.confirm": "뮤트",
+  "confirmations.quiet_post_quote_info.dismiss": "다시 보지 않기",
+  "confirmations.quiet_post_quote_info.got_it": "알겠습니다",
+  "confirmations.quiet_post_quote_info.message": "조용한 공개 게시물을 인용하면 그 게시물은 유행 타임라인에서 나타나지 않을 것입니다.",
+  "confirmations.quiet_post_quote_info.title": "조용한 공개 게시물 인용하기",
   "confirmations.redraft.confirm": "삭제하고 다시 쓰기",
   "confirmations.redraft.message": "정말로 이 게시물을 삭제하고 다시 쓰시겠습니까? 해당 게시물에 대한 부스트와 좋아요를 잃게 되고 원본에 대한 답장은 연결 되지 않습니다.",
   "confirmations.redraft.title": "삭제하고 다시 작성할까요?",
   "confirmations.remove_from_followers.confirm": "팔로워 제거",
   "confirmations.remove_from_followers.message": "{name} 님이 나를 팔로우하지 않게 됩니다. 계속할까요?",
   "confirmations.remove_from_followers.title": "팔로워를 제거할까요?",
+  "confirmations.revoke_quote.confirm": "게시물 삭제",
+  "confirmations.revoke_quote.message": "이 작업은 되돌릴 수 없습니다.",
+  "confirmations.revoke_quote.title": "게시물을 지울까요?",
   "confirmations.unfollow.confirm": "팔로우 해제",
-  "confirmations.unfollow.message": "정말로 {name} 님을 팔로우 해제하시겠습니까?",
-  "confirmations.unfollow.title": "사용자를 언팔로우 할까요?",
   "content_warning.hide": "게시물 숨기기",
   "content_warning.show": "무시하고 보기",
   "content_warning.show_more": "더 보기",
@@ -289,6 +293,7 @@
   "domain_pill.your_handle": "내 핸들:",
   "domain_pill.your_server": "내 게시물들이 살고 있는 나의 디지털 거처입니다. 마음에 들지 않나요? 팔로워를 데리고 언제든지 다른 서버로 거처를 옮길 수도 있습니다.",
   "domain_pill.your_username": "이 서버에서 유일한 내 식별자입니다. 다른 서버에서 같은 사용자명을 가진 사용자를 찾을 수도 있습니다.",
+  "dropdown.empty": "옵션 선택",
   "embed.instructions": "아래의 코드를 복사하여 대화를 원하는 곳으로 공유하세요.",
   "embed.preview": "이렇게 표시됩니다:",
   "emoji_button.activity": "활동",
@@ -424,8 +429,6 @@
   "hints.profiles.see_more_followers": "{domain}에서 더 많은 팔로워 보기",
   "hints.profiles.see_more_follows": "{domain}에서 더 많은 팔로우 보기",
   "hints.profiles.see_more_posts": "{domain}에서 더 많은 게시물 보기",
-  "hints.threads.replies_may_be_missing": "다른 서버의 답글은 일부 누락되었을 수 있습니다.",
-  "hints.threads.see_more": "{domain}에서 더 많은 답글 보기",
   "home.column_settings.show_quotes": "인용 보기",
   "home.column_settings.show_reblogs": "부스트 표시",
   "home.column_settings.show_replies": "답글 표시",
@@ -447,20 +450,10 @@
   "ignore_notifications_modal.private_mentions_title": "요청하지 않은 개인 멘션 알림을 무시할까요?",
   "info_button.label": "도움말",
   "info_button.what_is_alt_text": "<h1>대체 텍스트가 무엇인가요?</h1> <p>대체 텍스트는 저시력자, 낮은 인터넷 대역폭 사용자, 더 자세한 문맥을 위해 이미지에 대한 설명을 제공하는 것입니다.</p> <p>깔끔하고 간결하고 객관적인 대체 텍스트를 작성해 모두가 이해하기 쉽게 만들고 접근성이 높아질 수 있습니다.</p><ul><li>중요한 요소에 중점을 두세요</li> <li>이미지 안의 글자를 요약하세요</li> <li>정형화된 문장 구조를 사용하세요</li> <li>중복된 정보를 피하세요</li> <li>복잡한 시각자료(도표나 지도 같은)에선 추세와 주요 결과에 중점을 두세요</li> </ul>",
-  "interaction_modal.action.favourite": "계속하려면 내 계정으로 즐겨찾기해야 합니다.",
-  "interaction_modal.action.follow": "계속하려면 내 계정으로 팔로우해야 합니다.",
-  "interaction_modal.action.reblog": "계속하려면 내 계정으로 리블로그해야 합니다.",
-  "interaction_modal.action.reply": "계속하려면 내 계정으로 답장해야 합니다.",
-  "interaction_modal.action.vote": "계속하려면 내 계정으로 투표해야 합니다.",
   "interaction_modal.go": "이동",
   "interaction_modal.no_account_yet": "아직 계정이 없나요?",
   "interaction_modal.on_another_server": "다른 서버에",
   "interaction_modal.on_this_server": "이 서버에서",
-  "interaction_modal.title.favourite": "{name} 님의 게시물을 좋아하기",
-  "interaction_modal.title.follow": "{name} 님을 팔로우",
-  "interaction_modal.title.reblog": "{name} 님의 게시물을 부스트",
-  "interaction_modal.title.reply": "{name} 님의 게시물에 답글",
-  "interaction_modal.title.vote": "{name} 님의 투표에 참여",
   "interaction_modal.username_prompt": "예시: {example}",
   "intervals.full.days": "{number} 일",
   "intervals.full.hours": "{number} 시간",
@@ -481,6 +474,7 @@
   "keyboard_shortcuts.home": "홈 타임라인 열기",
   "keyboard_shortcuts.hotkey": "핫키",
   "keyboard_shortcuts.legend": "이 개요 표시",
+  "keyboard_shortcuts.load_more": "\"더 보기\" 버튼에 포커스",
   "keyboard_shortcuts.local": "로컬 타임라인 열기",
   "keyboard_shortcuts.mention": "작성자에게 멘션",
   "keyboard_shortcuts.muted": "뮤트된 사용자 목록 열기",
@@ -489,6 +483,7 @@
   "keyboard_shortcuts.open_media": "미디어 열기",
   "keyboard_shortcuts.pinned": "고정 게시물 리스트 열기",
   "keyboard_shortcuts.profile": "작성자의 프로필 열기",
+  "keyboard_shortcuts.quote": "게시물 인용",
   "keyboard_shortcuts.reply": "게시물에 답장",
   "keyboard_shortcuts.requests": "팔로우 요청 리스트 열기",
   "keyboard_shortcuts.search": "검색창에 포커스",
@@ -500,6 +495,8 @@
   "keyboard_shortcuts.translate": "게시물 번역",
   "keyboard_shortcuts.unfocus": "작성창에서 포커스 해제",
   "keyboard_shortcuts.up": "리스트에서 위로 이동",
+  "learn_more_link.got_it": "확인",
+  "learn_more_link.learn_more": "더 알아보기",
   "lightbox.close": "닫기",
   "lightbox.next": "다음",
   "lightbox.previous": "이전",
@@ -515,7 +512,7 @@
   "lists.add_to_lists": "리스트에 {name} 추가",
   "lists.create": "생성",
   "lists.create_a_list_to_organize": "새 리스트를 만들어 홈 피드를 정리하세요",
-  "lists.create_list": "리스트 생성",
+  "lists.create_list": "리스트 만들기",
   "lists.delete": "리스트 삭제",
   "lists.done": "완료",
   "lists.edit": "리스트 편집",
@@ -600,6 +597,7 @@
   "notification.label.mention": "멘션",
   "notification.label.private_mention": "개인 멘션",
   "notification.label.private_reply": "개인 답글",
+  "notification.label.quote": "{name} 님이 내 게시물을 인용했습니다",
   "notification.label.reply": "답글",
   "notification.mention": "멘션",
   "notification.mentioned_you": "{name} 님의 멘션",
@@ -614,6 +612,7 @@
   "notification.moderation_warning.action_suspend": "계정이 정지되었습니다.",
   "notification.own_poll": "설문을 마침",
   "notification.poll": "참여한 투표가 끝났습니다",
+  "notification.quoted_update": "{name} 님이 내가 인용한 게시물을 수정했습니다",
   "notification.reblog": "{name} 님이 부스트했습니다",
   "notification.reblog.name_and_others_with_link": "{name} 외 <a>{count, plural, other {# 명}}</a>이 내 게시물을 부스트했습니다",
   "notification.relationships_severance_event": "{name} 님과의 연결이 끊어졌습니다",
@@ -657,6 +656,7 @@
   "notifications.column_settings.mention": "멘션:",
   "notifications.column_settings.poll": "설문 결과:",
   "notifications.column_settings.push": "푸시 알림",
+  "notifications.column_settings.quote": "인용:",
   "notifications.column_settings.reblog": "부스트:",
   "notifications.column_settings.show": "컬럼에 표시",
   "notifications.column_settings.sound": "효과음 재생",
@@ -732,11 +732,18 @@
   "privacy.private.short": "팔로워",
   "privacy.public.long": "마스토돈 내외 모두",
   "privacy.public.short": "공개",
+  "privacy.quote.anyone": "{visibility}, 누구나 인용 가능",
+  "privacy.quote.disabled": "{visibility}, 인용 비활성화",
+  "privacy.quote.limited": "{visibility}, 제한된 인용",
   "privacy.unlisted.additional": "공개와 똑같지만 게시물이 실시간 피드나 해시태그, 둘러보기, (계정 설정에서 허용했더라도) 마스토돈 검색에서 제외됩니다.",
-  "privacy.unlisted.long": "더 적은 알고리즘 팡파르",
+  "privacy.unlisted.long": "마스토돈 검색결과, 유행, 공개 타임라인에서 숨기기",
   "privacy.unlisted.short": "조용한 공개",
   "privacy_policy.last_updated": "{date}에 마지막으로 업데이트됨",
   "privacy_policy.title": "개인정보처리방침",
+  "quote_error.poll": "인용과 투표를 함께 사용할 수 없습니다.",
+  "quote_error.quote": "한 번의 인용만 허용됩니다.",
+  "quote_error.unauthorized": "이 글을 인용할 권한이 없습니다.",
+  "quote_error.upload": "인용과 미디어 첨부를 함께 사용할 수 없습니다.",
   "recommended": "추천함",
   "refresh": "새로고침",
   "regeneration_indicator.please_stand_by": "잠시 기다려주세요.",
@@ -752,6 +759,9 @@
   "relative_time.minutes": "{number}분 전",
   "relative_time.seconds": "{number}초 전",
   "relative_time.today": "오늘",
+  "remove_quote_hint.button_label": "알겠습니다",
+  "remove_quote_hint.message": "{icon} 메뉴에서 할 수 있습니다.",
+  "remove_quote_hint.title": "인용된 나의 게시물을 지우고 싶나요?",
   "reply_indicator.attachments": "{count, plural, other {#}} 개의 첨부파일",
   "reply_indicator.cancel": "취소",
   "reply_indicator.poll": "투표",
@@ -843,6 +853,7 @@
   "status.admin_account": "@{name}에 대한 중재 화면 열기",
   "status.admin_domain": "{domain}에 대한 중재 화면 열기",
   "status.admin_status": "중재 화면에서 이 게시물 열기",
+  "status.all_disabled": "부스트와 인용이 비활성화되었습니다",
   "status.block": "@{name} 차단",
   "status.bookmark": "북마크",
   "status.cancel_reblog_private": "부스트 취소",
@@ -850,6 +861,7 @@
   "status.continued_thread": "이어지는 글타래",
   "status.copy": "게시물 링크 복사",
   "status.delete": "삭제",
+  "status.delete.success": "게시물 삭제됨",
   "status.detailed_status": "대화 자세히 보기",
   "status.direct": "@{name} 님에게 개인적으로 멘션",
   "status.direct_indicator": "개인적인 멘션",
@@ -872,16 +884,22 @@
   "status.mute_conversation": "대화 뮤트",
   "status.open": "상세 정보 표시",
   "status.pin": "고정",
+  "status.quote": "인용",
+  "status.quote.cancel": "인용 취소",
   "status.quote_error.filtered": "필터에 의해 가려짐",
-  "status.quote_error.not_found": "이 게시물은 표시할 수 없습니다.",
-  "status.quote_error.pending_approval": "이 게시물은 원작자의 승인을 기다리고 있습니다.",
-  "status.quote_error.rejected": "이 게시물은 원작자가 인용을 허용하지 않았기 때문에 표시할 수 없습니다.",
-  "status.quote_error.removed": "이 게시물은 작성자에 의해 삭제되었습니다.",
-  "status.quote_error.unauthorized": "이 게시물은 권한이 없기 때문에 볼 수 없습니다.",
-  "status.quote_post_author": "{name} 님의 게시물",
+  "status.quote_error.not_available": "게시물 사용 불가",
+  "status.quote_error.pending_approval": "게시물 대기중",
+  "status.quote_followers_only": "팔로워만 이 게시물을 인용할 수 있습니다",
+  "status.quote_manual_review": "작성자가 직접 검토합니다",
+  "status.quote_policy_change": "누가 인용할 수 있는지",
+  "status.quote_post_author": "인용된 @{name} 님의 게시물",
+  "status.quote_private": "비공개 게시물은 인용할 수 없습니다",
+  "status.quotes": "{count, plural, other {#}} 인용",
+  "status.quotes.empty": "아직 아무도 이 게시물을 인용하지 않았습니다. 누군가 인용한다면 여기에 표시됩니다.",
   "status.read_more": "더 보기",
   "status.reblog": "부스트",
-  "status.reblog_private": "원래의 수신자들에게 부스트",
+  "status.reblog_or_quote": "부스트 또는 인용",
+  "status.reblog_private": "팔로워들에게 다시 공유",
   "status.reblogged_by": "{name} 님이 부스트했습니다",
   "status.reblogs": "{count, plural, other {부스트}}",
   "status.reblogs.empty": "아직 아무도 이 게시물을 부스트하지 않았습니다. 부스트 한 사람들이 여기에 표시 됩니다.",
@@ -893,6 +911,8 @@
   "status.reply": "답장",
   "status.replyAll": "글타래에 답장",
   "status.report": "@{name} 신고하기",
+  "status.request_quote": "인용 요청",
+  "status.revoke_quote": "내 게시물을 @{name}의 게시물에서 삭제",
   "status.sensitive_warning": "민감한 내용",
   "status.share": "공유",
   "status.show_less_all": "모두 접기",
@@ -930,6 +950,7 @@
   "upload_button.label": "이미지, 영상, 오디오 파일 추가",
   "upload_error.limit": "파일 업로드 제한에 도달했습니다.",
   "upload_error.poll": "파일 업로드는 설문과 함께 쓸 수 없습니다.",
+  "upload_error.quote": "파일 업로드는 인용과 함께 쓸 수 없습니다.",
   "upload_form.drag_and_drop.instructions": "미디어 첨부파일을 집으려면 스페이스나 엔터를 누르세요. 드래그 하는 동안 방향키를 이용해 원하는 방향으로 이동할 수 있습니다. 스페이스나 엔터를 다시 눌러 새 위치에 놓거나 ESC를 이용해 취소할 수 있습니다.",
   "upload_form.drag_and_drop.on_drag_cancel": "드래그가 취소되었습니다. 미디어 첨부파일 {item}은 이동되지 않았습니다.",
   "upload_form.drag_and_drop.on_drag_end": "미디어 첨부파일 {item}은 이동되지 않았습니다.",
@@ -952,5 +973,14 @@
   "video.skip_forward": "앞으로 건너뛰기",
   "video.unmute": "음소거 해제",
   "video.volume_down": "음량 감소",
-  "video.volume_up": "음량 증가"
+  "video.volume_up": "음량 증가",
+  "visibility_modal.button_title": "공개범위 설정",
+  "visibility_modal.header": "공개범위와 반응",
+  "visibility_modal.helper.unlisted_quoting": "사람들이 나를 인용한 경우 그 게시물 또한 유행에서 제외됩니다.",
+  "visibility_modal.privacy_label": "공개 범위",
+  "visibility_modal.quote_followers": "팔로워만",
+  "visibility_modal.quote_label": "인용할 수 있는 사람",
+  "visibility_modal.quote_nobody": "나에게만",
+  "visibility_modal.quote_public": "아무나",
+  "visibility_modal.save": "저장"
 }
diff --git a/app/javascript/mastodon/locales/ku.json b/app/javascript/mastodon/locales/ku.json
index 63110fda875..cf8d3e2bece 100644
--- a/app/javascript/mastodon/locales/ku.json
+++ b/app/javascript/mastodon/locales/ku.json
@@ -1,6 +1,7 @@
 {
   "about.blocks": "Rajekarên çavdêrkirî",
   "about.contact": "Têkilî:",
+  "about.default_locale": "Berdest",
   "about.disclaimer": "Mastodon belaş e, nermalaveke çavkaniya vekirî ye û markeyeke Mastodon gGmbHê ye.",
   "about.domain_blocks.no_reason_available": "Sedem ne berdest e",
   "about.domain_blocks.preamble": "Mastodon bi gelemperî dihêle ku tu naverokê bibînî û bi bikarhênerên ji rajekareke din a li fendiverse re têkilî dayne. Ev awaretyên ku li ser vê rajekara taybetî hatine çêkirin ev in.",
@@ -8,6 +9,7 @@
   "about.domain_blocks.silenced.title": "Sînorkirî",
   "about.domain_blocks.suspended.explanation": "Dê tu daneya ji van rajekaran neyê berhev kirin, tomarkirin an jî guhertin, ku têkilî an danûstendinek bi bikarhênerên van rajekaran re tune dike.",
   "about.domain_blocks.suspended.title": "Hatiye rawestandin",
+  "about.language_label": "Ziman",
   "about.not_available": "Ev zanyarî li ser vê rajekarê nehatine peydakirin.",
   "about.powered_by": "Medyaya civakî ya nenavendî bi hêzdariya {mastodon}",
   "about.rules": "Rêbazên rajekar",
@@ -19,17 +21,25 @@
   "account.block_domain": "Navpera {domain} asteng bike",
   "account.block_short": "Asteng bike",
   "account.blocked": "Astengkirî",
+  "account.blocking": "Astengkirin",
   "account.cancel_follow_request": "Daxwaza şopandinê vekişîne",
   "account.copy": "Girêdanê bo profîlê jê bigire",
   "account.direct": "Bi taybetî qale @{name} bike",
   "account.disable_notifications": "Êdî min agahdar neke gava @{name} diweşîne",
   "account.edit_profile": "Profîlê serrast bike",
+  "account.edit_profile_short": "Serrast bike",
   "account.enable_notifications": "Min agahdar bike gava @{name} diweşîne",
   "account.endorse": "Taybetiyên li ser profîl",
+  "account.featured.accounts": "Profîl",
+  "account.featured.hashtags": "Hashtag",
   "account.featured_tags.last_status_at": "Şandiya dawî di {date} de",
   "account.featured_tags.last_status_never": "Şandî tune ne",
   "account.follow": "Bişopîne",
   "account.follow_back": "Bişopîne",
+  "account.follow_request": "Bo şopandinê daxwaz bike",
+  "account.follow_request_cancel": "Daxwazê têk bibe",
+  "account.follow_request_cancel_short": "Têk bibe",
+  "account.follow_request_short": "Daxwaz bike",
   "account.followers": "Şopîner",
   "account.followers.empty": "Kesekî hin ev bikarhêner neşopandiye.",
   "account.followers_counter": "{count, plural, one {{counter} şopîner} other {{counter} şopîner}}",
@@ -58,7 +68,6 @@
   "account.posts": "Şandî",
   "account.posts_with_replies": "Şandî û bersiv",
   "account.report": "@{name} ragihîne",
-  "account.requested": "Li benda erêkirinê ye. Ji bo betal kirina daxwazê pêl bikin",
   "account.requested_follow": "{name} dixwaze te bişopîne",
   "account.share": "Profîla @{name} parve bike",
   "account.show_reblogs": "Bilindkirinên ji @{name} nîşan bike",
@@ -170,7 +179,6 @@
   "confirmations.redraft.confirm": "Jê bibe & ji nû ve serrast bike",
   "confirmations.redraft.message": "Bi rastî tu dixwazî şandî ye jê bibî û ji nû ve reşnivîsek çê bikî? Bijarte û şandî wê wenda bibin û bersivên ji bo şandiyê resen wê sêwî bimînin.",
   "confirmations.unfollow.confirm": "Neşopîne",
-  "confirmations.unfollow.message": "Ma tu dixwazî ku dev ji şopa {name} berdî?",
   "content_warning.show_more": "Bêtir nîşan bide",
   "conversation.delete": "Axaftinê jê bibe",
   "conversation.mark_as_read": "Wekî xwendî nîşan bide",
@@ -272,16 +280,12 @@
   "hashtag.column_settings.tag_toggle": "Ji bo vê stûnê hin pêvekan tevlî bike",
   "hashtag.follow": "Hashtagê bişopîne",
   "hashtag.unfollow": "Hashtagê neşopîne",
-  "hints.threads.replies_may_be_missing": "Beriv ji rajekarên din dibe ku wendayî bin.",
   "home.column_settings.show_reblogs": "Bilindkirinan nîşan bike",
   "home.column_settings.show_replies": "Bersivan nîşan bide",
   "home.hide_announcements": "Reklaman veşêre",
   "home.show_announcements": "Reklaman nîşan bide",
   "interaction_modal.on_another_server": "Li ser rajekareke cuda",
   "interaction_modal.on_this_server": "Li ser ev rajekar",
-  "interaction_modal.title.follow": "{name} bişopîne",
-  "interaction_modal.title.reblog": "Şandiyê {name} bilind bike",
-  "interaction_modal.title.reply": "Bersivê bide şandiyê {name}",
   "intervals.full.days": "{number, plural, one {# roj} other {# roj}}",
   "intervals.full.hours": "{number, plural, one {# demjimêr} other {# demjimêr}}\n \n",
   "intervals.full.minutes": "{number, plural, one {# xulek} other {# xulek}}",
@@ -506,7 +510,6 @@
   "status.pin": "Li ser profîlê derzî bike",
   "status.read_more": "Bêtir bixwîne",
   "status.reblog": "Bilind bike",
-  "status.reblog_private": "Bi dîtina resen bilind bike",
   "status.reblogged_by": "{name} bilind kir",
   "status.reblogs.empty": "Kesekî hin ev şandî bilind nekiriye. Gava kesek bilind bike, ew ên li vir werin xuyakirin.",
   "status.redraft": "Jê bibe & ji nû ve reşnivîs bike",
diff --git a/app/javascript/mastodon/locales/kw.json b/app/javascript/mastodon/locales/kw.json
index 9b1d33235fb..d21d75c182b 100644
--- a/app/javascript/mastodon/locales/kw.json
+++ b/app/javascript/mastodon/locales/kw.json
@@ -25,7 +25,6 @@
   "account.posts": "Postow",
   "account.posts_with_replies": "Postow ha gorthebow",
   "account.report": "Reportya @{name}",
-  "account.requested": "Ow kortos komendyans. Klyckyewgh dhe hedhi govyn holya",
   "account.share": "Kevrenna profil @{name}",
   "account.show_reblogs": "Diskwedhes kenerthow a @{name}",
   "account.unblock": "Anlettya @{name}",
@@ -87,7 +86,6 @@
   "confirmations.mute.confirm": "Tawhe",
   "confirmations.redraft.confirm": "Dilea & daskynskrifa",
   "confirmations.unfollow.confirm": "Anholya",
-  "confirmations.unfollow.message": "Owgh hwi sur a vynnes anholya {name}?",
   "conversation.delete": "Dilea kesklapp",
   "conversation.mark_as_read": "Merkya vel redys",
   "conversation.open": "Gweles kesklapp",
@@ -286,7 +284,6 @@
   "status.pin": "Fastya yn profil",
   "status.read_more": "Redya moy",
   "status.reblog": "Kenertha",
-  "status.reblog_private": "Kenertha gans gweladewder derowel",
   "status.reblogged_by": "{name} a generthas",
   "status.reblogs.empty": "Ny wrug nagonan kenertha'n post ma hwath. Pan wra, hynn a wra omdhiskwedhes omma.",
   "status.redraft": "Dilea ha daskynskrifa",
diff --git a/app/javascript/mastodon/locales/la.json b/app/javascript/mastodon/locales/la.json
index 5d34aafafce..720e940996f 100644
--- a/app/javascript/mastodon/locales/la.json
+++ b/app/javascript/mastodon/locales/la.json
@@ -1,6 +1,7 @@
 {
   "about.blocks": "Servī moderātī",
   "about.contact": "Ratio:",
+  "about.default_locale": "Default",
   "about.disclaimer": "Mastodon est software līberum, apertum fontem, et nōtam commercium Mastodon gGmbH.",
   "about.domain_blocks.no_reason_available": "Ratio abdere est",
   "about.domain_blocks.preamble": "Mastodon genērāliter sinit tē contentum ex aliīs servientibus in fedīversō vidēre et cum usoribus ab iīs interāgere. Haē sunt exceptionēs quae in hōc particulārī servientē factae sunt.",
@@ -8,6 +9,7 @@
   "about.domain_blocks.silenced.title": "Limitātus",
   "about.domain_blocks.suspended.explanation": "Nulla data ab hōc servientē processābuntur, servābuntur aut commūtābuntur, faciendumque omnem interactionem aut communicātiōnem cum usoribus ab hōc servientē impossibilem.",
   "about.domain_blocks.suspended.title": "suspensus",
+  "about.language_label": "Linguae",
   "about.not_available": "Haec informātiō in hōc servientē nōn praebita est.",
   "about.powered_by": "Nuntii socīālēs decentralizātī ā {mastodon} sustentātī.",
   "about.rules": "Servo praecepta",
@@ -41,7 +43,12 @@
   "account.followers": "Sectatores",
   "account.followers.empty": "Nemo hunc usorem adhuc sequitur.",
   "account.followers_counter": "{count, plural, one {{counter} sectator} other {{counter} sectatores}}",
+  "account.followers_you_know_counter": "{counter} scis",
+  "account.following": "Sequentia",
   "account.following_counter": "{count, plural, one {{counter} sectans} other {{counter} sectans}}",
+  "account.follows.empty": "Hic usor adhuc neminem sequitur.",
+  "account.follows_you": "Sequitur te",
+  "account.go_to_profile": "Vade ad profile",
   "account.moved_to": "{name} significavit eum suam rationem novam nunc esse:",
   "account.muted": "Confutatus",
   "account.requested_follow": "{name} postulavit ut te sequeretur",
diff --git a/app/javascript/mastodon/locales/lad.json b/app/javascript/mastodon/locales/lad.json
index 2f34c7aaedc..147e362f3b0 100644
--- a/app/javascript/mastodon/locales/lad.json
+++ b/app/javascript/mastodon/locales/lad.json
@@ -63,7 +63,6 @@
   "account.posts": "Publikasyones",
   "account.posts_with_replies": "Kon repuestas",
   "account.report": "Raporta @{name}",
-  "account.requested": "Asperando achetasion. Klika para anular la solisitud de segimiento",
   "account.requested_follow": "{name} tiene solisitado segirte",
   "account.requests_to_follow_you": "Solisita segirte",
   "account.share": "Partaja el profil de @{name}",
@@ -100,6 +99,7 @@
   "announcement.announcement": "Pregon",
   "annual_report.summary.archetype.pollster": "El anketero",
   "annual_report.summary.followers.followers": "suivantes",
+  "annual_report.summary.followers.total": "{count} en total",
   "annual_report.summary.highlighted_post.by_favourites": "la puvlikasyon mas favoritada",
   "annual_report.summary.highlighted_post.by_reblogs": "la puvlikasyon mas repartajada",
   "annual_report.summary.highlighted_post.by_replies": "la puvlikasyon kon mas repuestas",
@@ -130,6 +130,7 @@
   "bundle_column_error.routing.body": "No se pudo trokar la pajina solisitada. Estas siguro ke el adreso URL en la vara de adreso es djusto?",
   "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "Serra",
+  "bundle_modal_error.message": "Algo negro afito al eskargar este ekran.",
   "bundle_modal_error.retry": "Aprova de muevo",
   "closed_registrations.other_server_instructions": "Deke Mastodon es desentralizado, puedes kriyar un kuento en otro sirvidor i ainda enteraktuar kon este.",
   "closed_registrations_modal.description": "Aktualmente no es posivle kriyar un kuento en {domain}, ama por favor akodrate de ke no ay menester de tener un kuento espesifikamente en {domain} para kulanear Mastodon.",
@@ -197,6 +198,7 @@
   "confirmations.delete_list.confirm": "Efasa",
   "confirmations.delete_list.message": "Estas siguro ke keres permanentemente efasar esta lista?",
   "confirmations.delete_list.title": "Efasa lista?",
+  "confirmations.discard_draft.confirm": "Kita i kontinua",
   "confirmations.discard_edit_media.confirm": "Anula",
   "confirmations.discard_edit_media.message": "Tienes trokamientos no guadrados en la deskripsion o vista previa. Keres efasarlos entanto?",
   "confirmations.follow_to_list.title": "Segir utilizador?",
@@ -209,9 +211,9 @@
   "confirmations.redraft.confirm": "Efasa i reeskrive",
   "confirmations.redraft.message": "Estas siguro ke keres efasar esta publikasyon i reeskrivirla? Pedreras todos los favoritos i repartajasyones asosiados kon esta publikasyon i repuestas a eya seran guerfanadas.",
   "confirmations.redraft.title": "Efasar i reeskrivir?",
+  "confirmations.revoke_quote.confirm": "Kita puvlikasyon",
+  "confirmations.revoke_quote.title": "Kitar puvlikasyon?",
   "confirmations.unfollow.confirm": "Desige",
-  "confirmations.unfollow.message": "Estas siguro ke keres deshar de segir a {name}?",
-  "confirmations.unfollow.title": "Desige utilizador?",
   "content_warning.hide": "Eskonde puvlikasyon",
   "content_warning.show": "Amostra entanto",
   "content_warning.show_more": "Amostra mas",
@@ -356,6 +358,7 @@
   "hashtag.counter_by_accounts": "{count, plural, one {{counter} partisipante} other {{counter} partisipantes}}",
   "hashtag.counter_by_uses": "{count, plural, one {{counter} publikasyon} other {{counter} publikasyones}}",
   "hashtag.counter_by_uses_today": "{count, plural, one {{counter} publikasyon} other {{counter} publikasyones}} oy",
+  "hashtag.feature": "Avalia en profil",
   "hashtag.follow": "Sige etiketa",
   "hashtag.mute": "Silensia #{hashtag}",
   "hashtag.unfeature": "No avalia en profil",
@@ -367,8 +370,6 @@
   "hints.profiles.see_more_followers": "Ve mas suivantes en {domain}",
   "hints.profiles.see_more_follows": "Ve mas segidos en {domain}",
   "hints.profiles.see_more_posts": "Ve mas puvlikasyones en {domain}",
-  "hints.threads.replies_may_be_missing": "Puede mankar repuestas de otros sirvidores.",
-  "hints.threads.see_more": "Ve mas repuestas en {domain}",
   "home.column_settings.show_reblogs": "Amostra repartajasyones",
   "home.column_settings.show_replies": "Amostra repuestas",
   "home.hide_announcements": "Eskonde pregones",
@@ -385,11 +386,7 @@
   "info_button.label": "Ayuda",
   "interaction_modal.on_another_server": "En otro sirvidor",
   "interaction_modal.on_this_server": "En este sirvidor",
-  "interaction_modal.title.favourite": "Endika ke te plaze publikasyon de {name}",
-  "interaction_modal.title.follow": "Sige a {name}",
-  "interaction_modal.title.reblog": "Repartaja publikasyon de {name}",
-  "interaction_modal.title.reply": "Arisponde a publikasyon de {name}",
-  "interaction_modal.title.vote": "Vota en la anketa de {name}",
+  "interaction_modal.username_prompt": "Por enshemplo {example}",
   "intervals.full.days": "{number, plural, one {# diya} other {# diyas}}",
   "intervals.full.hours": "{number, plural, one {# ora} other {# oras}}",
   "intervals.full.minutes": "{number, plural, one {# minuto} other {# minutos}}",
@@ -427,6 +424,7 @@
   "keyboard_shortcuts.toot": "Eskrive mueva publikasyon",
   "keyboard_shortcuts.unfocus": "No enfoka en el area de eskrivir/bushkeda",
   "keyboard_shortcuts.up": "Move verso arriva en la lista",
+  "learn_more_link.learn_more": "Ambezate mas",
   "lightbox.close": "Serra",
   "lightbox.next": "Sigiente",
   "lightbox.previous": "Anterior",
@@ -442,6 +440,7 @@
   "lists.delete": "Efasa lista",
   "lists.done": "Fecho",
   "lists.edit": "Edita lista",
+  "lists.list_name": "Nombre de lista",
   "lists.new_list_name": "Nombre de mueva lista",
   "lists.replies_policy.followed": "Kualseker utilizador segido",
   "lists.replies_policy.list": "Miembros de la lista",
@@ -602,7 +601,6 @@
   "privacy.public.long": "Todos en i afuera de Mastodon",
   "privacy.public.short": "Publiko",
   "privacy.unlisted.additional": "Esto funksyona exaktamente komo publiko, eksepto ke la publikasyon no aparesera en linyas publikas o etiketas, la eksplorasyon o bushkedas de Mastodon, inkluzo si kapasites esto para tu kuento.",
-  "privacy.unlisted.long": "Vizivle para todos, ama no en trendes, etiketas o linyas publikas",
   "privacy.unlisted.short": "Publiko i silensyozo",
   "privacy_policy.last_updated": "Ultima aktualizasyon: {date}",
   "privacy_policy.title": "Politika de privasita",
@@ -733,11 +731,11 @@
   "status.pin": "Fiksa en profil",
   "status.read_more": "Melda mas",
   "status.reblog": "Repartaja",
-  "status.reblog_private": "Repartaja kon vizibilita orijinala",
   "status.reblogged_by": "{name} repartajo",
   "status.reblogs.empty": "Ainda nadie tiene repartajado esta publikasyon. Kuando algien lo aga, se amostrara aki.",
   "status.redraft": "Efasa i eskrive de muevo",
   "status.remove_bookmark": "Kita markador",
+  "status.remove_favourite": "Kita de los favoritos",
   "status.replied_in_thread": "Arispondo en filo",
   "status.replied_to": "Arispondio a {name}",
   "status.reply": "Arisponde",
@@ -758,6 +756,7 @@
   "subscribed_languages.save": "Guadra trokamientos",
   "subscribed_languages.target": "Troka linguas abonadas para {target}",
   "tabs_bar.home": "Linya prinsipala",
+  "tabs_bar.menu": "Menu",
   "tabs_bar.notifications": "Avizos",
   "tabs_bar.publish": "Mueva publikasyon",
   "tabs_bar.search": "Bushkeda",
@@ -790,5 +789,8 @@
   "video.mute": "Silensia",
   "video.pause": "Pauza",
   "video.play": "Reproduze",
-  "video.unmute": "Desilensia"
+  "video.unmute": "Desilensia",
+  "visibility_modal.privacy_label": "Vizivilita",
+  "visibility_modal.quote_followers": "Solo suivantes",
+  "visibility_modal.save": "Guadra"
 }
diff --git a/app/javascript/mastodon/locales/lt.json b/app/javascript/mastodon/locales/lt.json
index 944ab8d9649..bf13549d46a 100644
--- a/app/javascript/mastodon/locales/lt.json
+++ b/app/javascript/mastodon/locales/lt.json
@@ -64,7 +64,6 @@
   "account.posts_with_replies": "Įrašai ir atsakymai",
   "account.remove_from_followers": "Šalinti {name} iš sekėjų",
   "account.report": "Pranešti apie @{name}",
-  "account.requested": "Laukiama patvirtinimo. Spustelėk, kad atšauktum sekimo prašymą",
   "account.requested_follow": "{name} paprašė tave sekti",
   "account.requests_to_follow_you": "Prašymai sekti jus",
   "account.share": "Bendrinti @{name} profilį",
@@ -233,8 +232,6 @@
   "confirmations.remove_from_followers.message": "{name} nustos jus sekti. Ar tikrai norite tęsti?",
   "confirmations.remove_from_followers.title": "Šalinti sekėją?",
   "confirmations.unfollow.confirm": "Nebesekti",
-  "confirmations.unfollow.message": "Ar tikrai nori nebesekti {name}?",
-  "confirmations.unfollow.title": "Nebesekti naudotoją?",
   "content_warning.hide": "Slėpti įrašą",
   "content_warning.show": "Rodyti vis tiek",
   "content_warning.show_more": "Rodyti daugiau",
@@ -292,6 +289,7 @@
   "emoji_button.search_results": "Paieškos rezultatai",
   "emoji_button.symbols": "Simboliai",
   "emoji_button.travel": "Kelionės ir vietos",
+  "empty_column.account_featured_other.unknown": "Ši paskyra dar nieko neparodė.",
   "empty_column.account_hides_collections": "Šis (-i) naudotojas (-a) pasirinko nepadaryti šią informaciją prieinamą.",
   "empty_column.account_suspended": "Paskyra pristabdyta.",
   "empty_column.account_timeline": "Nėra čia įrašų.",
@@ -396,8 +394,6 @@
   "hints.profiles.see_more_followers": "Žiūrėti daugiau sekėjų serveryje {domain}",
   "hints.profiles.see_more_follows": "Žiūrėti daugiau sekimų serveryje {domain}",
   "hints.profiles.see_more_posts": "Žiūrėti daugiau įrašų serveryje {domain}",
-  "hints.threads.replies_may_be_missing": "Atsakymai iš kitų serverių gali būti nepateikti.",
-  "hints.threads.see_more": "Žiūrėti daugiau atsakymų serveryje {domain}",
   "home.column_settings.show_reblogs": "Rodyti pakėlimus",
   "home.column_settings.show_replies": "Rodyti atsakymus",
   "home.hide_announcements": "Slėpti skelbimus",
@@ -418,20 +414,10 @@
   "ignore_notifications_modal.private_mentions_title": "Ignoruoti pranešimus iš neprašytų privačių paminėjimų?",
   "info_button.label": "Žinynas",
   "info_button.what_is_alt_text": "<h1>Kas yra alternatyvusis tekstas?</h1> <p>Alternatyvusis tekstas pateikia vaizdų aprašymus asmenims su regos sutrikimais, turintiems mažo pralaidumo ryšį arba ieškantiems papildomo konteksto.</p> <p>Galite pagerinti prieinamumą ir suprantamumą visiems, jei parašysite aiškų, glaustą ir objektyvų alternatyvųjį tekstą.</p> <ul> <li>Užfiksuokite svarbiausius elementus.</li> <li>Apibendrinkite tekstą vaizduose.</li> <li>Naudokite įprasta sakinio struktūrą.</li> <li>Venkite nereikalingos informacijos.</li> <li>Sutelkite dėmesį į tendencijas ir pagrindines išvadas sudėtinguose vaizdiniuose (tokiuose kaip diagramos ar žemėlapiai).</li> </ul>",
-  "interaction_modal.action.favourite": "Kad tęstumėte, turite pamėgti iš savo paskyros.",
-  "interaction_modal.action.follow": "Kad tęstumėte, turite sekti iš savo paskyros.",
-  "interaction_modal.action.reblog": "Kad tęstumėte, turite pasidalinti iš savo paskyros.",
-  "interaction_modal.action.reply": "Kad tęstumėte, turite atsakyti iš savo paskyros.",
-  "interaction_modal.action.vote": "Kad tęstumėte, turite balsuoti iš savo paskyros.",
   "interaction_modal.go": "Eiti",
   "interaction_modal.no_account_yet": "Dar neturite paskyros?",
   "interaction_modal.on_another_server": "Kitame serveryje",
   "interaction_modal.on_this_server": "Šiame serveryje",
-  "interaction_modal.title.favourite": "Pamėgti {name} įrašą",
-  "interaction_modal.title.follow": "Sekti {name}",
-  "interaction_modal.title.reblog": "Pakelti {name} įrašą",
-  "interaction_modal.title.reply": "Atsakyti į {name} įrašą",
-  "interaction_modal.title.vote": "Balsuoti {name} apklausoje",
   "interaction_modal.username_prompt": "Pvz., {example}",
   "intervals.full.days": "{number, plural, one {# diena} few {# dienos} many {# dienos} other {# dienų}}",
   "intervals.full.hours": "{number, plural, one {# valanda} few {# valandos} many {# valandos} other {# valandų}}",
@@ -683,7 +669,6 @@
   "privacy.public.long": "Bet kas iš Mastodon ir ne Mastodon",
   "privacy.public.short": "Vieša",
   "privacy.unlisted.additional": "Tai veikia lygiai taip pat, kaip ir vieša, tik įrašas nebus rodomas tiesioginiuose srautuose, saitažodžiose, naršyme ar Mastodon paieškoje, net jei esi įtraukęs (-usi) visą paskyrą.",
-  "privacy.unlisted.long": "Mažiau algoritminių fanfarų",
   "privacy.unlisted.short": "Tyliai vieša",
   "privacy_policy.last_updated": "Paskutinį kartą atnaujinta {date}",
   "privacy_policy.title": "Privatumo politika",
@@ -822,7 +807,6 @@
   "status.pin": "Prisegti prie profilio",
   "status.read_more": "Skaityti daugiau",
   "status.reblog": "Pakelti",
-  "status.reblog_private": "Pakelti su originaliu matomumu",
   "status.reblogged_by": "{name} pakėlė",
   "status.reblogs.empty": "Šio įrašo dar niekas nepakėlė. Kai kas nors tai padarys, jie bus rodomi čia.",
   "status.redraft": "Ištrinti ir parengti iš naujo",
diff --git a/app/javascript/mastodon/locales/lv.json b/app/javascript/mastodon/locales/lv.json
index 104528c0e13..6f2fcb03729 100644
--- a/app/javascript/mastodon/locales/lv.json
+++ b/app/javascript/mastodon/locales/lv.json
@@ -1,6 +1,7 @@
 {
   "about.blocks": "Moderētie serveri",
   "about.contact": "Kontakts:",
+  "about.default_locale": "Noklusējums",
   "about.disclaimer": "Mastodon ir bezmaksas atklātā pirmkoda programmatūra un Mastodon gGmbH preču zīme.",
   "about.domain_blocks.no_reason_available": "Iemesls nav norādīts",
   "about.domain_blocks.preamble": "Mastodon parasti ļauj apskatīt saturu un mijiedarboties ar lietotājiem no jebkura cita fediversa servera. Šie ir izņēmumi, kas veikti tieši šajā serverī.",
@@ -8,6 +9,7 @@
   "about.domain_blocks.silenced.title": "Ierobežotie",
   "about.domain_blocks.suspended.explanation": "Nekādi dati no šī servera netiks apstrādāti, uzglabāti vai apmainīti, padarot neiespējamu jebkādu mijiedarbību vai saziņu ar šī servera lietotājiem.",
   "about.domain_blocks.suspended.title": "Apturētie",
+  "about.language_label": "Valoda",
   "about.not_available": "Šī informācija nav padarīta pieejama šajā serverī.",
   "about.powered_by": "Decentralizētu sabiedrisko tīklu darbina {mastodon}",
   "about.rules": "Servera noteikumi",
@@ -68,7 +70,6 @@
   "account.posts_with_replies": "Ieraksti un atbildes",
   "account.remove_from_followers": "Dzēst sekotāju {name}",
   "account.report": "Ziņot par @{name}",
-  "account.requested": "Gaida apstiprinājumu. Nospied, lai atceltu sekošanas pieparasījumu",
   "account.requested_follow": "{name} nosūtīja Tev sekošanas pieprasījumu",
   "account.requests_to_follow_you": "Sekošanas pieprasījumi",
   "account.share": "Dalīties ar @{name} profilu",
@@ -95,8 +96,8 @@
   "admin.impact_report.title": "Ietekmes kopsavilkums",
   "alert.rate_limited.message": "Lūdzu, mēģini vēlreiz pēc {retry_time, time, medium}.",
   "alert.rate_limited.title": "Biežums ierobežots",
-  "alert.unexpected.message": "Radās negaidīta kļūda.",
-  "alert.unexpected.title": "Ups!",
+  "alert.unexpected.message": "Atgadījās neparedzēta kļūda.",
+  "alert.unexpected.title": "Ak vai!",
   "alt_text_badge.title": "Alt teksts",
   "alt_text_modal.add_alt_text": "Pievienot aprakstošo tekstu",
   "alt_text_modal.add_text_from_image": "Pievienot tekstu no attēla",
@@ -138,13 +139,14 @@
   "bundle_column_error.copy_stacktrace": "Ievietot kļūdu ziņojumu starpliktuvē",
   "bundle_column_error.error.body": "Pieprasīto lapu nevarēja atveidot. Tas varētu būt saistīts ar kļūdu mūsu kodā, vai tā ir pārlūkprogrammas saderības problēma.",
   "bundle_column_error.error.title": "Ak vai!",
-  "bundle_column_error.network.body": "Mēģinot ielādēt šo lapu, radās kļūda. Tas varētu būt saistīts ar īslaicīgu interneta savienojuma vai šī servera problēmu.",
+  "bundle_column_error.network.body": "Kļūda lapas ielādēšanas laikā. Tas varētu būt īzlaicīgs sarežģījums ar interneta savienojumu vai šo serveri.",
   "bundle_column_error.network.title": "Tīkla kļūda",
   "bundle_column_error.retry": "Mēģināt vēlreiz",
   "bundle_column_error.return": "Atgriezties",
   "bundle_column_error.routing.body": "Pieprasīto lapu nevarēja atrast. Vai esi pārliecināts, ka URL adreses joslā ir pareizs?",
   "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "Aizvērt",
+  "bundle_modal_error.message": "Kaut kas nogāja greizi šī ekrāna ielādēšanas laikā.",
   "bundle_modal_error.retry": "Mēģināt vēlreiz",
   "closed_registrations.other_server_instructions": "Tā kā Mastodon ir decentralizēts, tu vari izveidot kontu citā serverī un joprojām mijiedarboties ar šo.",
   "closed_registrations_modal.description": "Pašlaik nav iespējams izveidot kontu {domain}, bet, lūdzu, ņem vērā, ka Tev nav nepieciešams tieši {domain} konts, lai lietotu Mastodon!",
@@ -199,7 +201,7 @@
   "compose_form.poll.switch_to_multiple": "Mainīt aptaujas veidu, lai atļautu vairākas izvēles",
   "compose_form.poll.switch_to_single": "Mainīt aptaujas veidu, lai atļautu vienu izvēli",
   "compose_form.poll.type": "Stils",
-  "compose_form.publish": "Nosūtīt",
+  "compose_form.publish": "Iesūtīt",
   "compose_form.reply": "Atbildēt",
   "compose_form.save_changes": "Atjaunināt",
   "compose_form.spoiler.marked": "Noņemt satura brīdinājumu",
@@ -213,6 +215,11 @@
   "confirmations.delete_list.confirm": "Dzēst",
   "confirmations.delete_list.message": "Vai tiešām neatgriezeniski izdzēst šo sarakstu?",
   "confirmations.delete_list.title": "Izdzēst sarakstu?",
+  "confirmations.discard_draft.confirm": "Atmest un turpināt",
+  "confirmations.discard_draft.edit.cancel": "Atsākt labošanu",
+  "confirmations.discard_draft.post.cancel": "Atsākt melnrakstu",
+  "confirmations.discard_draft.post.message": "Turpinot tiks atmests pašreiz sastādītais ieraksts.",
+  "confirmations.discard_draft.post.title": "Atmest melnraksta ierakstu?",
   "confirmations.discard_edit_media.confirm": "Atmest",
   "confirmations.discard_edit_media.message": "Ir nesaglabātas izmaiņas informācijas nesēja aprakstā vai priekšskatījumā. Vēlies tās atmest tik un tā?",
   "confirmations.follow_to_list.confirm": "Sekot un pievienot sarakstam",
@@ -232,9 +239,10 @@
   "confirmations.remove_from_followers.confirm": "Dzēst sekotāju",
   "confirmations.remove_from_followers.message": "{name} pārstās sekot jums. Vai tiešām vēlaties turpināt?",
   "confirmations.remove_from_followers.title": "Vai dzēst sekotāju?",
+  "confirmations.revoke_quote.confirm": "Noņemt ierakstu",
+  "confirmations.revoke_quote.message": "Šo darbību nevar atsaukt.",
+  "confirmations.revoke_quote.title": "Noņemt ierakstu?",
   "confirmations.unfollow.confirm": "Pārstāt sekot",
-  "confirmations.unfollow.message": "Vai tiešam vairs nevēlies sekot lietotājam {name}?",
-  "confirmations.unfollow.title": "Pārtraukt sekošanu lietotājam?",
   "content_warning.hide": "Paslēpt ierakstu",
   "content_warning.show": "Tomēr rādīt",
   "content_warning.show_more": "Rādīt vairāk",
@@ -268,6 +276,7 @@
   "domain_pill.who_they_are": "Tā kā turi norāda, kas kāds ir un kur viņi ir atrodami, Tu vari mijiedarboties ar cilvēkiem viscaur sabiedriskajā tīklā no <button>ar ActivityPub darbinātām platformām</button>.",
   "domain_pill.who_you_are": "Tā kā Tavs turis norāda, kas Tu esi un kur atrodies, cilvēki var mijiedarboties ar Tevi viscaur sabiedriskajā tīklā no <button>ar ActivityPub darbinātām platformām</button>.",
   "domain_pill.your_handle": "Tavs turis:",
+  "dropdown.empty": "Atlasīt iespēju",
   "embed.instructions": "Iekļauj šo ierakstu savā tīmekļvietnē, ievietojot zemāk redzamo kodu starpliktuvē!",
   "embed.preview": "Tas izskatīsies šādi:",
   "emoji_button.activity": "Aktivitāte",
@@ -313,10 +322,12 @@
   "errors.unexpected_crash.copy_stacktrace": "Kopēt stacktrace uz starpliktuvi",
   "errors.unexpected_crash.report_issue": "Ziņot par problēmu",
   "explore.suggested_follows": "Cilvēki",
+  "explore.title": "Populārākie",
   "explore.trending_links": "Jaunumi",
   "explore.trending_statuses": "Ieraksti",
   "explore.trending_tags": "Tēmturi",
   "featured_carousel.next": "Tālāk",
+  "featured_carousel.post": "Ieraksts",
   "featured_carousel.previous": "Atpakaļ",
   "featured_carousel.slide": "{index} / {total}",
   "filter_modal.added.context_mismatch_explanation": "Šī atlases kategorija neattiecas uz kontekstu, kurā esi piekļuvis šim ierakstam. Ja vēlies, lai ieraksts tiktu atlasīts arī šajā kontekstā, Tev būs jālabo atlase.",
@@ -335,6 +346,7 @@
   "filter_modal.select_filter.subtitle": "Izmanto esošu kategoriju vai izveido jaunu",
   "filter_modal.select_filter.title": "Atlasīt šo ierakstu",
   "filter_modal.title.status": "Atlasīt ziņu",
+  "filter_warning.matches_filter": "Atbilst atlasītājam “<span>{title}</span>”",
   "filtered_notifications_banner.title": "Filtrētie paziņojumi",
   "firehose.all": "Visi",
   "firehose.local": "Šis serveris",
@@ -386,8 +398,6 @@
   "hints.profiles.see_more_followers": "Skatīt vairāk sekotāju {domain}",
   "hints.profiles.see_more_follows": "Skatīt vairāk sekojumu {domain}",
   "hints.profiles.see_more_posts": "Skatīt vairāk ierakstu {domain}",
-  "hints.threads.replies_may_be_missing": "Var trūkt atbilžu no citiem serveriem.",
-  "hints.threads.see_more": "Skatīt vairāk atbilžu {domain}",
   "home.column_settings.show_quotes": "Rādīt citātus",
   "home.column_settings.show_reblogs": "Rādīt pastiprinātos ierakstus",
   "home.column_settings.show_replies": "Rādīt atbildes",
@@ -399,19 +409,10 @@
   "ignore_notifications_modal.ignore": "Neņemt vērā paziņojumus",
   "ignore_notifications_modal.not_following_title": "Neņemt vērā paziņojumus no cilvēkiem, kuriem neseko?",
   "info_button.label": "Palīdzība",
-  "interaction_modal.action.favourite": "Lai turpinātu, nepieciešams pievienot sava konta izlasei.",
-  "interaction_modal.action.follow": "Lai turpinātu, nepieciešams sekot no sava konta.",
-  "interaction_modal.action.reblog": "Lai turpinātu, nepieciešams pastiprināt no sava konta.",
-  "interaction_modal.action.reply": "Lai turpinātu, nepieciešams atbildēt no sava konta.",
-  "interaction_modal.action.vote": "Lai turpinātu, nepieciešams balsot no sava konta.",
   "interaction_modal.go": "Aiziet",
   "interaction_modal.no_account_yet": "Vēl nav konta?",
   "interaction_modal.on_another_server": "Citā serverī",
   "interaction_modal.on_this_server": "Šajā serverī",
-  "interaction_modal.title.favourite": "Pievienot {name} ierakstu izlasei",
-  "interaction_modal.title.follow": "Sekot {name}",
-  "interaction_modal.title.reblog": "Pastiprināt {name} ierakstu",
-  "interaction_modal.title.reply": "Atbildēt uz {name} ierakstu",
   "interaction_modal.username_prompt": "Piem., {example}",
   "intervals.full.days": "{number, plural, one {# diena} other {# dienas}}",
   "intervals.full.hours": "{number, plural, one {# stunda} other {# stundas}}",
@@ -451,6 +452,8 @@
   "keyboard_shortcuts.translate": "tulkot ierakstu",
   "keyboard_shortcuts.unfocus": "Atfokusēt veidojamā teksta/meklēšanas lauku",
   "keyboard_shortcuts.up": "Pārvietoties augšup sarakstā",
+  "learn_more_link.got_it": "Sapratu",
+  "learn_more_link.learn_more": "Uzzināt vairāk",
   "lightbox.close": "Aizvērt",
   "lightbox.next": "Tālāk",
   "lightbox.previous": "Iepriekšējais",
@@ -468,6 +471,7 @@
   "lists.delete": "Izdzēst sarakstu",
   "lists.done": "Gatavs",
   "lists.edit": "Labot sarakstu",
+  "lists.find_users_to_add": "Atrast lietotājus, kurus pievienot",
   "lists.list_name": "Saraksta nosaukums",
   "lists.remove_member": "Noņemt",
   "lists.replies_policy.followed": "Jebkuram sekotajam lietotājam",
@@ -484,8 +488,10 @@
   "mute_modal.show_options": "Parādīt iespējas",
   "mute_modal.title": "Apklusināt lietotāju?",
   "navigation_bar.about": "Par",
+  "navigation_bar.account_settings": "Parole un drošība",
   "navigation_bar.administration": "Pārvaldība",
   "navigation_bar.advanced_interface": "Atvērt paplašinātā tīmekļa saskarnē",
+  "navigation_bar.automated_deletion": "Automātiska ziņu dzēšana",
   "navigation_bar.blocks": "Bloķētie lietotāji",
   "navigation_bar.bookmarks": "Grāmatzīmes",
   "navigation_bar.direct": "Privātas pieminēšanas",
@@ -494,13 +500,16 @@
   "navigation_bar.filters": "Apklusinātie vārdi",
   "navigation_bar.follow_requests": "Sekošanas pieprasījumi",
   "navigation_bar.followed_tags": "Sekojamie tēmturi",
-  "navigation_bar.follows_and_followers": "Sekojamie un sekotāji",
+  "navigation_bar.follows_and_followers": "Seko un sekotāji",
+  "navigation_bar.import_export": "Imports un eksports",
   "navigation_bar.lists": "Saraksti",
   "navigation_bar.logout": "Iziet",
   "navigation_bar.moderation": "Satura pārraudzība",
+  "navigation_bar.more": "Vairāk",
   "navigation_bar.mutes": "Apklusinātie lietotāji",
   "navigation_bar.opened_in_classic_interface": "Ieraksti, konti un citas noteiktas lapas pēc noklusējuma tiek atvērtas klasiskajā tīmekļa saskarnē.",
   "navigation_bar.preferences": "Iestatījumi",
+  "navigation_bar.privacy_and_reach": "Privātums un sasniedzamība",
   "navigation_bar.search": "Meklēt",
   "not_signed_in_indicator.not_signed_in": "Ir jāpiesakās, lai piekļūtu šim resursam.",
   "notification.admin.report": "{name} ziņoja par {target}",
@@ -533,6 +542,8 @@
   "notification_requests.dismiss": "Noraidīt",
   "notification_requests.edit_selection": "Labot",
   "notification_requests.exit_selection": "Gatavs",
+  "notification_requests.explainer_for_limited_account": "Paziņojumi no šī konta tika atsijāti, jo pārvaldītājs ierobežoja kontu.",
+  "notification_requests.explainer_for_limited_remote_account": "Paziņojumi no šī konta tika atsijāti, jo pārvaldītājs ierobežoja kontu vai tā serveri.",
   "notification_requests.notifications_from": "Paziņojumi no {name}",
   "notification_requests.title": "Atlasītie paziņojumi",
   "notification_requests.view": "Skatīt paziņojumus",
@@ -572,6 +583,7 @@
   "notifications.permission_required": "Darbvirsmas paziņojumi nav pieejami, jo nav piešķirta nepieciešamā atļauja.",
   "notifications.policy.accept": "Pieņemt",
   "notifications.policy.drop": "Ignorēt",
+  "notifications.policy.filter_limited_accounts_hint": "Servera satura pārraudzītāju ierobežots",
   "notifications.policy.filter_new_accounts_title": "Jauni konti",
   "notifications.policy.filter_not_followers_title": "Cilvēki, kuri Tev neseko",
   "notifications.policy.filter_not_following_hint": "Līdz tos pašrocīgi apstiprināsi",
@@ -611,7 +623,6 @@
   "privacy.public.long": "Jebkurš Mastodon un ārpus tā",
   "privacy.public.short": "Redzams visiem",
   "privacy.unlisted.additional": "Šis uzvedas tieši kā publisks, izņemot to, ka ieraksts neparādīsies tiešraides barotnēs vai tēmturos, izpētē vai Mastodon meklēšanā, pat ja esi to norādījis visa konta ietvaros.",
-  "privacy.unlisted.long": "Mazāk algoritmisku fanfaru",
   "privacy_policy.last_updated": "Pēdējo reizi atjaunināta {date}",
   "privacy_policy.title": "Privātuma politika",
   "recommended": "Ieteicams",
@@ -740,15 +751,8 @@
   "status.mute_conversation": "Apklusināt sarunu",
   "status.open": "Izvērst šo ierakstu",
   "status.pin": "Piespraust profilam",
-  "status.quote_error.not_found": "Šo ierakstu nevar parādīt.",
-  "status.quote_error.pending_approval": "Šis ieraksts gaida apstiprinājumu no tā autora.",
-  "status.quote_error.rejected": "Šo ierakstu nevar parādīt, jo tā autors neļauj to citēt.",
-  "status.quote_error.removed": "Šo ierakstu noņēma tā autors.",
-  "status.quote_error.unauthorized": "Šo ierakstu nevar parādīt, jo jums nav atļaujas to skatīt.",
-  "status.quote_post_author": "Publicēja {name}",
   "status.read_more": "Lasīt vairāk",
   "status.reblog": "Pastiprināt",
-  "status.reblog_private": "Pastiprināt ar sākotnējo redzamību",
   "status.reblogged_by": "{name} pastiprināja",
   "status.reblogs": "{count, plural, zero {pastiprinājumu} one {pastiprinājums} other {pastiprinājumi}}",
   "status.reblogs.empty": "Neviens vēl nav pastiprinājis šo ierakstu. Kad kāds to izdarīs, šeit tiks parādīti lietotāji.",
@@ -775,6 +779,7 @@
   "subscribed_languages.target": "Mainīt abonētās valodas priekš {target}",
   "tabs_bar.home": "Sākums",
   "tabs_bar.notifications": "Paziņojumi",
+  "terms_of_service.effective_as_of": "Spēkā no {date}",
   "terms_of_service.title": "Pakalpojuma izmantošanas noteikumi",
   "time_remaining.days": "{number, plural, one {Atlikusi # diena} other {Atlikušas # dienas}}",
   "time_remaining.hours": "{number, plural, one {Atlikusi # stunda} other {Atlikušas # stundas}}",
@@ -808,5 +813,11 @@
   "video.skip_forward": "Tīt uz priekšu",
   "video.unmute": "Ieslēgt skaņu",
   "video.volume_down": "Pagriezt klusāk",
-  "video.volume_up": "Pagriezt skaļāk"
+  "video.volume_up": "Pagriezt skaļāk",
+  "visibility_modal.button_title": "Iestatīt redzamību",
+  "visibility_modal.header": "Redzamība un mijjiedarbība",
+  "visibility_modal.quote_followers": "Tikai sekotāji",
+  "visibility_modal.quote_nobody": "Tikai es",
+  "visibility_modal.quote_public": "Ikviens",
+  "visibility_modal.save": "Saglabāt"
 }
diff --git a/app/javascript/mastodon/locales/mk.json b/app/javascript/mastodon/locales/mk.json
index 67e561dceef..21f7d2d5d02 100644
--- a/app/javascript/mastodon/locales/mk.json
+++ b/app/javascript/mastodon/locales/mk.json
@@ -33,7 +33,6 @@
   "account.posts": "Тутови",
   "account.posts_with_replies": "Тутови и реплики",
   "account.report": "Пријави @{name}",
-  "account.requested": "Се чека одобрување. Кликни за да одкажиш барање за следење",
   "account.share": "Сподели @{name} профил",
   "account.show_reblogs": "Прикажи бустови од @{name}",
   "account.unblock": "Одблокирај @{name}",
@@ -83,7 +82,6 @@
   "confirmations.logout.message": "Дали сте сигурни дека сакате да се одјавите?",
   "confirmations.mute.confirm": "Заќути",
   "confirmations.unfollow.confirm": "Одследи",
-  "confirmations.unfollow.message": "Сигурни сте дека ќе го отследите {name}?",
   "conversation.delete": "Избриши разговор",
   "conversation.mark_as_read": "Означете како прочитано",
   "conversation.open": "Прегледај разговор",
diff --git a/app/javascript/mastodon/locales/ml.json b/app/javascript/mastodon/locales/ml.json
index 753ff3eafde..017ef1ce3f2 100644
--- a/app/javascript/mastodon/locales/ml.json
+++ b/app/javascript/mastodon/locales/ml.json
@@ -44,7 +44,6 @@
   "account.posts": "പോസ്റ്റുകൾ",
   "account.posts_with_replies": "പോസ്റ്റുകളും മറുപടികളും",
   "account.report": "റിപ്പോർട്ട് ചെയ്യുക @{name}",
-  "account.requested": "അനുവാദത്തിനായി കാത്തിരിക്കുന്നു. പിന്തുടരാനുള്ള അപേക്ഷ റദ്ദാക്കുവാൻ ഞെക്കുക",
   "account.share": "@{name} ന്റെ പ്രൊഫൈൽ പങ്കിടുക",
   "account.show_reblogs": "@{name} ൽ നിന്നുള്ള ബൂസ്റ്റുകൾ കാണിക്കുക",
   "account.unblock": "@{name} തടഞ്ഞത് മാറ്റുക",
@@ -140,7 +139,6 @@
   "confirmations.mute.confirm": "നിശ്ശബ്ദമാക്കുക",
   "confirmations.redraft.confirm": "മായിച്ച് മാറ്റങ്ങൾ വരുത്തി വീണ്ടും എഴുതുക",
   "confirmations.unfollow.confirm": "പിന്തുടരുന്നത് നിര്‍ത്തുക",
-  "confirmations.unfollow.message": "നിങ്ങൾ {name} യെ പിന്തുടരുന്നത് നിർത്തുവാൻ തീർച്ചയായും തീരുമാനിച്ചുവോ?",
   "conversation.delete": "സംഭാഷണം മായിക്കുക",
   "conversation.mark_as_read": "വായിച്ചതായി അടയാളപ്പെടുത്തുക",
   "conversation.open": "സംഭാഷണം കാണുക",
@@ -222,8 +220,6 @@
   "home.pending_critical_update.link": "പുതുകൾ കാണുക",
   "home.show_announcements": "പ്രഖ്യാപനങ്ങൾ കാണിക്കുക",
   "interaction_modal.on_this_server": "ഈ സെർവറീൽ",
-  "interaction_modal.title.favourite": "പ്രിയപ്പെട്ട {name}-ന്റെ എഴുതു്",
-  "interaction_modal.title.follow": "{name}-െ പിന്തുടരുക",
   "keyboard_shortcuts.back": "തിരികെ പോകുക",
   "keyboard_shortcuts.blocked": "to open blocked users list",
   "keyboard_shortcuts.boost": "ബൂസ്റ്റ് ചെയ്യുക",
diff --git a/app/javascript/mastodon/locales/mr.json b/app/javascript/mastodon/locales/mr.json
index 8186fec9dbb..6a762c15273 100644
--- a/app/javascript/mastodon/locales/mr.json
+++ b/app/javascript/mastodon/locales/mr.json
@@ -49,7 +49,6 @@
   "account.posts": "Toots",
   "account.posts_with_replies": "Toots and replies",
   "account.report": "@{name} ची तक्रार करा",
-  "account.requested": "Awaiting approval",
   "account.requested_follow": "{name} ने आपल्याला फॉलो करण्याची रिक्वेस्ट केली आहे",
   "account.share": "@{name} चे प्रोफाइल शेअर करा",
   "account.show_reblogs": "{name}चे सर्व बुस्ट्स दाखवा",
@@ -120,9 +119,6 @@
   "home.show_announcements": "घोषणा दाखवा",
   "interaction_modal.on_another_server": "वेगळ्या सर्व्हरवर",
   "interaction_modal.on_this_server": "या सर्व्हरवर",
-  "interaction_modal.title.follow": "{name} चे अनुसरण करा",
-  "interaction_modal.title.reblog": "{name} ची पोस्ट बूस्ट करा",
-  "interaction_modal.title.reply": "{name} च्या पोस्टला उत्तर द्या",
   "intervals.full.days": "{number, plural, one {# day} other {# days}}",
   "intervals.full.hours": "{number, plural, one {# hour} other {# hours}}",
   "intervals.full.minutes": "{number, plural, one {# minute} other {# minutes}}",
diff --git a/app/javascript/mastodon/locales/ms.json b/app/javascript/mastodon/locales/ms.json
index 520990fbe3b..1530736f65b 100644
--- a/app/javascript/mastodon/locales/ms.json
+++ b/app/javascript/mastodon/locales/ms.json
@@ -58,7 +58,6 @@
   "account.posts": "Hantaran",
   "account.posts_with_replies": "Hantaran dan balasan",
   "account.report": "Laporkan @{name}",
-  "account.requested": "Menunggu kelulusan. Klik untuk batalkan permintaan ikut",
   "account.requested_follow": "{name} has requested to follow you",
   "account.share": "Kongsi profil @{name}",
   "account.show_reblogs": "Tunjukkan galakan daripada @{name}",
@@ -223,8 +222,6 @@
   "confirmations.redraft.message": "Adakah anda pasti anda ingin memadam hantaran ini dan gubal semula? Sukaan dan galakan akan hilang, dan balasan ke hantaran asal akan menjadi yatim.",
   "confirmations.redraft.title": "Padam & gubah semula hantaran?",
   "confirmations.unfollow.confirm": "Nyahikut",
-  "confirmations.unfollow.message": "Adakah anda pasti anda ingin nyahikuti {name}?",
-  "confirmations.unfollow.title": "Berhenti mengikut pengguna?",
   "content_warning.hide": "Sorok hantaran",
   "content_warning.show": "Tunjuk saja",
   "content_warning.show_more": "Tunjuk lebih",
@@ -369,13 +366,8 @@
   "home.pending_critical_update.link": "Lihat pengemaskinian",
   "home.pending_critical_update.title": "Kemas kini keselamatan kritikal tersedia!",
   "home.show_announcements": "Tunjukkan pengumuman",
-  "interaction_modal.action.favourite": "Untuk sambung, anda perlu suka dari akaun anda.",
   "interaction_modal.on_another_server": "Di pelayan lain",
   "interaction_modal.on_this_server": "Pada pelayan ini",
-  "interaction_modal.title.favourite": "Suka hantaran {name}",
-  "interaction_modal.title.follow": "Ikuti {name}",
-  "interaction_modal.title.reblog": "Galak hantaran {name}",
-  "interaction_modal.title.reply": "Balas siaran {name}",
   "intervals.full.days": "{number, plural, other {# hari}}",
   "intervals.full.hours": "{number, plural, other {# jam}}",
   "intervals.full.minutes": "{number, plural, other {# minit}}",
@@ -643,7 +635,6 @@
   "status.pin": "Semat di profil",
   "status.read_more": "Baca lagi",
   "status.reblog": "Galakkan",
-  "status.reblog_private": "Galakkan dengan ketampakan asal",
   "status.reblogged_by": "{name} galakkan",
   "status.reblogs": "{count, plural, other {galakan}}",
   "status.reblogs.empty": "Tiada sesiapa yang galakkan hantaran ini. Apabila ada yang galakkan, hantaran akan muncul di sini.",
diff --git a/app/javascript/mastodon/locales/my.json b/app/javascript/mastodon/locales/my.json
index 0f99734aa06..56da51abe93 100644
--- a/app/javascript/mastodon/locales/my.json
+++ b/app/javascript/mastodon/locales/my.json
@@ -51,7 +51,6 @@
   "account.posts": "ပို့စ်များ",
   "account.posts_with_replies": "ပို့စ်နှင့် ရီပလိုင်းများ",
   "account.report": "တိုင်ကြားမည်{name}",
-  "account.requested": "ခွင့်ပြုချက်စောင့်နေသည်။ ဖော်လိုးပယ်ဖျက်ရန်နှိပ်ပါ",
   "account.requested_follow": "{name} က သင့်ကို စောင့်ကြည့်ရန် တောင်းဆိုထားသည်",
   "account.share": "{name}၏ပရိုဖိုင်ကိုမျှဝေပါ",
   "account.show_reblogs": "@{name} မှ မျှ၀ေမှုများကို ပြပါ\n",
@@ -153,7 +152,6 @@
   "confirmations.redraft.confirm": "ဖျက်ပြီး ပြန်လည်ရေးမည်။",
   "confirmations.redraft.message": "သင် ဒီပိုစ့်ကိုဖျက်ပြီး ပြန်တည်းဖြတ်မှာ သေချာပြီလား။ ကြယ်ပွင့်​တွေ နဲ့ ပြန်မျှ​ဝေမှု​တွေကိုဆုံးရှုံးမည်။မူရင်းပို့စ်ဆီကို ပြန်စာ​တွေမှာလည်း​ \nပိုစ့်ကို​တွေ့ရမည်မဟုတ်​တော့ပါ။.",
   "confirmations.unfollow.confirm": "စောင့်ကြည့်ခြင်းအား ပယ်ဖျက်မည်",
-  "confirmations.unfollow.message": "{name} ကို စောင်ကြည့်ခြင်းအား ပယ်ဖျက်မည်မှာသေချာပါသလား။",
   "conversation.delete": "ဤစကားပြောဆိုမှုကို ဖျက်ပစ်မည်",
   "conversation.mark_as_read": "ဖတ်ပြီးသားအဖြစ်မှတ်ထားပါ",
   "conversation.open": "Conversation ကိုကြည့်မည်",
@@ -271,10 +269,6 @@
   "home.show_announcements": "ကြေညာချက်များကို ပြပါ",
   "interaction_modal.on_another_server": "တခြားဆာဗာပေါ်တွင်",
   "interaction_modal.on_this_server": "ဤဆာဗာတွင်",
-  "interaction_modal.title.favourite": "Favorite {name} ၏ ပို့စ်",
-  "interaction_modal.title.follow": "{name} ကို စောင့်ကြည့်မယ်",
-  "interaction_modal.title.reblog": "{name} ၏ ပို့စ်ကို Boost လုပ်ပါ",
-  "interaction_modal.title.reply": "{name} ၏ ပို့စ်ကို စာပြန်မယ်",
   "intervals.full.days": "{number, plural, one {# day} other {# days}}",
   "intervals.full.hours": "{number, plural, one {# hour} other {# hours}}",
   "intervals.full.minutes": "{number, plural, one {# minute} other {# minutes}}",
@@ -530,7 +524,6 @@
   "status.pin": "ပရိုဖိုင်တွင် ပင်ထားပါ",
   "status.read_more": "ပိုမိုဖတ်ရှုရန်",
   "status.reblog": "Boost",
-  "status.reblog_private": "မူရင်းပုံစံဖြင့် Boost လုပ်ပါ",
   "status.reblogged_by": "{name} က Boost လုပ်ထားသည်",
   "status.reblogs.empty": "ဤပို့စ်ကို မည်သူမှ Boost လုပ်ထားခြင်းမရှိသေးပါ။ တစ်ယောက်ယောက်မှ Boost လုပ်ပါက ဤနေရာတွင်ပေါ်လာပါမည်။",
   "status.redraft": "ဖျက်ပြီး ပြန်ရေးပါ",
diff --git a/app/javascript/mastodon/locales/nan.json b/app/javascript/mastodon/locales/nan.json
index 48e1b75c2b0..5d864eeddf1 100644
--- a/app/javascript/mastodon/locales/nan.json
+++ b/app/javascript/mastodon/locales/nan.json
@@ -1,6 +1,6 @@
 {
   "about.blocks": "Siū 管制 ê 服侍器",
-  "about.contact": "聯絡lâng：",
+  "about.contact": "聯絡方法：",
   "about.default_locale": "預設",
   "about.disclaimer": "Mastodon是自由、開放原始碼ê軟體，mā是Mastodon gGmbH ê商標。",
   "about.domain_blocks.no_reason_available": "原因bē-tàng用",
@@ -28,6 +28,7 @@
   "account.disable_notifications": "停止佇 {name} PO文ê時通知我",
   "account.domain_blocking": "Teh封鎖ê網域",
   "account.edit_profile": "編輯個人資料",
+  "account.edit_profile_short": "編輯",
   "account.enable_notifications": "佇 {name} PO文ê時通知我",
   "account.endorse": "用個人資料推薦對方",
   "account.familiar_followers_many": "Hōo {name1}、{name2}，kap {othersCount, plural, other {其他 lí熟似ê # ê lâng}} 跟tuè",
@@ -40,6 +41,11 @@
   "account.featured_tags.last_status_never": "無PO文",
   "account.follow": "跟tuè",
   "account.follow_back": "Tuè tńg去",
+  "account.follow_back_short": "Tuè tńg去",
+  "account.follow_request": "請求跟tuè lí",
+  "account.follow_request_cancel": "取消跟tuè",
+  "account.follow_request_cancel_short": "取消",
+  "account.follow_request_short": "請求",
   "account.followers": "跟tuè lí ê",
   "account.followers.empty": "Tsit ê用者iáu bô lâng跟tuè。",
   "account.followers_counter": "Hōo {count, plural, other {{count} ê lâng}}跟tuè",
@@ -70,7 +76,6 @@
   "account.posts_with_replies": "PO文kap回應",
   "account.remove_from_followers": "Kā {name} tuì跟tuè lí ê ê內底suá掉",
   "account.report": "檢舉 @{name}",
-  "account.requested": "Teh等待審查。Tshi̍h tsi̍t-ē 通取消跟tuè請求",
   "account.requested_follow": "{name} 請求跟tuè lí",
   "account.requests_to_follow_you": "請求跟tuè lí",
   "account.share": "分享 @{name} ê個人資料",
@@ -239,15 +244,25 @@
   "confirmations.missing_alt_text.secondary": "就按呢PO出去",
   "confirmations.missing_alt_text.title": "Kám beh加添說明文字？",
   "confirmations.mute.confirm": "消音",
+  "confirmations.quiet_post_quote_info.dismiss": "請mài koh提醒我",
+  "confirmations.quiet_post_quote_info.got_it": "知ah",
+  "confirmations.quiet_post_quote_info.message": "Nā是引用無tī公共時間線內底êPO文，lí êPO文bē當tī趨勢ê時間線顯示。",
+  "confirmations.quiet_post_quote_info.title": "引用無tī公開ê時間線內底顯示ê PO文",
   "confirmations.redraft.confirm": "Thâi掉了後重寫",
   "confirmations.redraft.message": "Lí kám確定behthâi掉tsit篇PO文了後koh重寫？收藏kap轉PO ē無去，而且原底ê PO文ê回應ē變孤立。",
   "confirmations.redraft.title": "Kám beh thâi掉koh重寫PO文？",
   "confirmations.remove_from_followers.confirm": "Suá掉跟tuè lí ê",
   "confirmations.remove_from_followers.message": "{name} ē停止跟tuè lí。Lí kám確定beh繼續？",
   "confirmations.remove_from_followers.title": "Kám beh suá掉跟tuè lí ê?",
+  "confirmations.revoke_quote.confirm": "Thâi掉PO文",
+  "confirmations.revoke_quote.message": "Tsit ê動作bē當復原。",
+  "confirmations.revoke_quote.title": "Kám beh thâi掉PO文？",
+  "confirmations.unblock.confirm": "取消封鎖",
+  "confirmations.unblock.title": "取消封鎖 {name}？",
   "confirmations.unfollow.confirm": "取消跟tuè",
-  "confirmations.unfollow.message": "Lí kám確定無愛跟tuè {name}？",
-  "confirmations.unfollow.title": "Kám beh取消跟tuè tsit ê用者？",
+  "confirmations.unfollow.title": "取消跟tuè {name}？",
+  "confirmations.withdraw_request.confirm": "Kā跟tuè請求收tńg去",
+  "confirmations.withdraw_request.title": "Kám beh收tńg去跟tuè {name} ê請求？",
   "content_warning.hide": "Am-khàm PO文",
   "content_warning.show": "Mā tio̍h顯示",
   "content_warning.show_more": "其他內容",
@@ -289,6 +304,7 @@
   "domain_pill.your_handle": "Lí ê口座：",
   "domain_pill.your_server": "Lí數位ê厝，內底有lí所有ê PO文。無kah意？Ē當轉kàu別ê服侍器，koh保有跟tuè lí êl âng。.",
   "domain_pill.your_username": "Lí 佇tsit ê服侍器獨一ê稱呼。佇無kâng ê服侍器有可能tshuē著kāng名ê用者。",
+  "dropdown.empty": "揀選項",
   "embed.instructions": "Khóo-pih 下kha ê程式碼，來kā tsit篇PO文tàu佇lí ê網站。",
   "embed.preview": "伊e án-ne顯示：\n",
   "emoji_button.activity": "活動",
@@ -424,8 +440,6 @@
   "hints.profiles.see_more_followers": "佇 {domain} 看koh khah tsē跟tuè lí ê",
   "hints.profiles.see_more_follows": "佇 {domain} 看koh khah tsē lí跟tuè ê",
   "hints.profiles.see_more_posts": "佇 {domain} 看koh khah tsē ê PO文",
-  "hints.threads.replies_may_be_missing": "Tuì其他ê服侍器來ê回應可能有phah m̄見。",
-  "hints.threads.see_more": "佇 {domain} 看koh khah tsē ê回應",
   "home.column_settings.show_quotes": "顯示引用",
   "home.column_settings.show_reblogs": "顯示轉PO",
   "home.column_settings.show_replies": "顯示回應",
@@ -447,20 +461,12 @@
   "ignore_notifications_modal.private_mentions_title": "忽略ka-kī主動送ê私人提起ê通知？",
   "info_button.label": "幫tsān",
   "info_button.what_is_alt_text": "<h1>Siánn物是替代文字？</h1> <p>替代文字kā視覺有障礙、網路速度khah慢，á是beh tshuē頂下文ê lâng，提供圖ê敘述。</p> <p>Lí ē當通過寫明白、簡單kap客觀ê替代文字，替逐家改善容易使用性kap幫tsān理解。</p> <ul> <li>掌握重要ê因素</li> <li>替圖寫摘要ê文字</li> <li>用規則ê語句結構</li> <li>避免重複ê資訊</li> <li>專注佇趨勢kap佇複雜視覺（比如圖表á是地圖）內底tshuē關鍵</li> </ul>",
-  "interaction_modal.action.favourite": "Nā beh繼續，lí tio̍h用你ê口座收藏。",
-  "interaction_modal.action.follow": "Nā beh繼續，lí tio̍h用你ê口座跟tuè。",
-  "interaction_modal.action.reblog": "Nā beh繼續，lí tio̍h用你ê口座轉送。",
-  "interaction_modal.action.reply": "Nā beh繼續，lí tio̍h用你ê口座回應。",
-  "interaction_modal.action.vote": "Nā beh繼續，lí tio̍h用你ê口座投票。",
+  "interaction_modal.action": "Nā beh hām {name} ê PO文互動，lí愛佇lí所用ê Mastodon服侍器登入口座。",
   "interaction_modal.go": "行",
   "interaction_modal.no_account_yet": "Tsit-má iáu bô口座？",
   "interaction_modal.on_another_server": "佇無kâng ê服侍器",
   "interaction_modal.on_this_server": "Tī tsit ê服侍器",
-  "interaction_modal.title.favourite": "收藏 {name} ê PO文",
-  "interaction_modal.title.follow": "跟tuè {name}",
-  "interaction_modal.title.reblog": "轉送 {name} ê PO文",
-  "interaction_modal.title.reply": "回應 {name} ê PO文",
-  "interaction_modal.title.vote": "參加 {name} ê投票",
+  "interaction_modal.title": "登入koh繼續",
   "interaction_modal.username_prompt": "比如：{example}",
   "intervals.full.days": "{number, plural, other {# kang}}",
   "intervals.full.hours": "{number, plural, other {# 點鐘}}",
@@ -481,6 +487,7 @@
   "keyboard_shortcuts.home": "Phah開tshù ê時間線",
   "keyboard_shortcuts.hotkey": "快速key",
   "keyboard_shortcuts.legend": "顯示tsit篇說明",
+  "keyboard_shortcuts.load_more": "Kā焦點suá kàu「載入其他」ê鈕仔",
   "keyboard_shortcuts.local": "Phah開本站ê時間線",
   "keyboard_shortcuts.mention": "提起作者",
   "keyboard_shortcuts.muted": "Phah開消音ê用者列單",
@@ -489,6 +496,7 @@
   "keyboard_shortcuts.open_media": "Phah開媒體",
   "keyboard_shortcuts.pinned": "Phah開釘起來ê PO文列單",
   "keyboard_shortcuts.profile": "Phah開作者ê個人資料",
+  "keyboard_shortcuts.quote": "引用PO文",
   "keyboard_shortcuts.reply": "回應PO文",
   "keyboard_shortcuts.requests": "Phah開跟tuè請求ê列單",
   "keyboard_shortcuts.search": "揀tshiau-tshuē條á",
@@ -500,6 +508,8 @@
   "keyboard_shortcuts.translate": "kā PO文翻譯",
   "keyboard_shortcuts.unfocus": "離開輸入框仔／tshiau-tshuē格仔",
   "keyboard_shortcuts.up": "佇列單內kā suá khah面頂",
+  "learn_more_link.got_it": "知矣",
+  "learn_more_link.learn_more": "看詳細",
   "lightbox.close": "關",
   "lightbox.next": "下tsi̍t ê",
   "lightbox.previous": "頂tsi̍t ê",
@@ -567,7 +577,7 @@
   "navigation_bar.live_feed_local": "即時ê內容（本地）",
   "navigation_bar.live_feed_public": "即時ê內容（公開）",
   "navigation_bar.logout": "登出",
-  "navigation_bar.moderation": "審核",
+  "navigation_bar.moderation": "管理",
   "navigation_bar.more": "其他",
   "navigation_bar.mutes": "消音ê用者",
   "navigation_bar.opened_in_classic_interface": "PO文、口座kap其他指定ê頁面，預設ē佇經典ê網頁界面內phah開。",
@@ -600,20 +610,22 @@
   "notification.label.mention": "提起",
   "notification.label.private_mention": "私人ê提起",
   "notification.label.private_reply": "私人ê回應",
+  "notification.label.quote": "{name} 引用lí ê PO文",
   "notification.label.reply": "回應",
   "notification.mention": "提起",
   "notification.mentioned_you": "{name}kā lí提起",
   "notification.moderation-warning.learn_more": "看詳細",
-  "notification.moderation_warning": "Lí有收著審核ê警告",
+  "notification.moderation_warning": "Lí有收著管理ê警告",
   "notification.moderation_warning.action_delete_statuses": "Lí ê一寡PO文hōo lâng thâi掉ah。",
   "notification.moderation_warning.action_disable": "Lí ê口座hōo lâng停止使用ah。",
   "notification.moderation_warning.action_mark_statuses_as_sensitive": "Lí ê一寡PO文，hōo lâng標做敏感ê內容。",
-  "notification.moderation_warning.action_none": "Lí ê口座有收著審核ê警告。",
+  "notification.moderation_warning.action_none": "Lí ê口座有收著管理ê警告。",
   "notification.moderation_warning.action_sensitive": "Tuì tsit-má開始，lí êPO文ē標做敏感ê內容。",
   "notification.moderation_warning.action_silence": "Lí ê口座hōo lâng限制ah。",
   "notification.moderation_warning.action_suspend": "Lí ê口座ê權限已經停止ah。",
   "notification.own_poll": "Lí ê投票結束ah",
   "notification.poll": "Lí bat投ê投票結束ah",
+  "notification.quoted_update": "{name} 編輯lí有引用ê PO文",
   "notification.reblog": "{name} 轉送lí ê PO文",
   "notification.reblog.name_and_others_with_link": "{name} kap<a>{count, plural, other {另外 # ê lâng}}</a>轉送lí ê PO文",
   "notification.relationships_severance_event": "Kap {name} ê結連無去",
@@ -657,6 +669,7 @@
   "notifications.column_settings.mention": "提起：",
   "notifications.column_settings.poll": "投票ê結果：",
   "notifications.column_settings.push": "Sak通知",
+  "notifications.column_settings.quote": "引用：",
   "notifications.column_settings.reblog": "轉送：",
   "notifications.column_settings.show": "佇欄內底顯示",
   "notifications.column_settings.sound": "播放聲音",
@@ -732,11 +745,18 @@
   "privacy.private.short": "跟tuè lí ê",
   "privacy.public.long": "逐ê lâng（無論佇Mastodon以內á是以外）",
   "privacy.public.short": "公開ê",
+  "privacy.quote.anyone": "{visibility}，ta̍k ê lâng lóng ē當引用",
+  "privacy.quote.disabled": "{visibility}，停止引用PO文",
+  "privacy.quote.limited": "{visibility}，PO文引用受限",
   "privacy.unlisted.additional": "Tse ê行為kap公開相siâng，m̄-koh 就算lí佇口座設定phah開有關ê公開功能，PO文mā bē顯示佇即時ê動態、hashtag、探索kap Mastodon ê搜尋結果。",
-  "privacy.unlisted.long": "減少演算法ê宣傳",
-  "privacy.unlisted.short": "恬靜ê公開",
+  "privacy.unlisted.long": "Mài顯示tī Mastodon ê tshiau-tshuē結果、趨勢kap公共ê時間線。",
+  "privacy.unlisted.short": "恬靜公開",
   "privacy_policy.last_updated": "上尾更新tī：{date}",
   "privacy_policy.title": "隱私權政策",
+  "quote_error.poll": "有投票ê PO文bē當引用。",
+  "quote_error.quote": "Tsi̍t改kan-ta ē當引用tsi̍t篇PO文。",
+  "quote_error.unauthorized": "Lí bô權利引用tsit篇PO文。",
+  "quote_error.upload": "有媒體附件ê PO文無允准引用。",
   "recommended": "推薦",
   "refresh": "Koh更新",
   "regeneration_indicator.please_stand_by": "請sió等leh。",
@@ -752,6 +772,9 @@
   "relative_time.minutes": "{number} 分進前",
   "relative_time.seconds": "{number} 秒進前",
   "relative_time.today": "今á日",
+  "remove_quote_hint.button_label": "知ah",
+  "remove_quote_hint.message": "Lí ē當tuì {icon} 選項ê目錄完成tsit ê動作",
+  "remove_quote_hint.title": "Kám想beh thâi掉lí受引用ê PO文？",
   "reply_indicator.attachments": "{count, plural, other {# ê附件}}",
   "reply_indicator.cancel": "取消",
   "reply_indicator.poll": "投票",
@@ -843,13 +866,23 @@
   "status.admin_account": "Phah開 @{name} ê管理界面",
   "status.admin_domain": "Phah開 {domain} ê管理界面",
   "status.admin_status": "Tī管理界面內底看tsit篇PO文",
+  "status.all_disabled": "轉送kap引用停止使用",
   "status.block": "封鎖 @{name}",
   "status.bookmark": "冊籤",
   "status.cancel_reblog_private": "取消轉送",
+  "status.cannot_quote": "Lí bô允准引用tsit篇PO文。",
   "status.cannot_reblog": "Tsit篇PO文bē當轉送",
+  "status.contains_quote": "包含引用",
+  "status.context.loading": "載入其他回應",
+  "status.context.loading_error": "Bē當載入新回應",
+  "status.context.loading_success": "回應lóng載入ah",
+  "status.context.more_replies_found": "Tshuē-tio̍h其他回應",
+  "status.context.retry": "Koh試",
+  "status.context.show": "顯示",
   "status.continued_thread": "接續ê討論線",
   "status.copy": "Khóo-pih PO文ê連結",
   "status.delete": "Thâi掉",
+  "status.delete.success": "PO文thâi掉ah",
   "status.detailed_status": "對話ê詳細",
   "status.direct": "私人提起 @{name}",
   "status.direct_indicator": "私人ê提起",
@@ -871,27 +904,43 @@
   "status.mute": "消音 @{name}",
   "status.mute_conversation": "Kā對話消音",
   "status.open": "Kā PO文展開",
+  "status.quote": "引用",
+  "status.quote.cancel": "取消引用",
   "status.quote_error.filtered": "Lí所設定ê過濾器kā tse khàm起來",
-  "status.quote_error.not_found": "Tsit篇PO文bē當顯示。",
-  "status.quote_error.pending_approval": "Tsit篇PO文teh等原作者審查。",
-  "status.quote_error.rejected": "因為原作者無允准引用，tsit篇PO文bē當顯示。",
-  "status.quote_error.removed": "Tsit篇hōo作者thâi掉ah。",
-  "status.quote_error.unauthorized": "因為lí無得著讀tse ê權限，tsit篇PO文bē當顯示。",
-  "status.quote_post_author": "{name} 所PO ê",
+  "status.quote_error.limited_account_hint.action": "Iáu是顯示",
+  "status.quote_error.limited_account_hint.title": "Tsit ê口座予 {domain} ê管理員tshàng起來ah。",
+  "status.quote_error.not_available": "PO文bē當看",
+  "status.quote_error.pending_approval": "PO文當咧送",
+  "status.quote_error.pending_approval_popout.body": "佇Mastodon，lí ē當控制PO文kám beh hōo lâng引用。Tsit篇PO文teh等原文作者允准。",
+  "status.quote_error.revoked": "PO文已經hōo作者thâi掉",
+  "status.quote_followers_only": "Kan-ta tuè我ê ē當引用PO文",
+  "status.quote_manual_review": "作者ē hōo lâng人工審核",
+  "status.quote_noun": "引用",
+  "status.quote_policy_change": "改通引用ê lâng",
+  "status.quote_post_author": "引用 @{name} ê PO文ah",
+  "status.quote_private": "私人PO文bē當引用",
+  "status.quotes": "{count, plural, other {# 篇引用ê PO文}}",
+  "status.quotes.empty": "Iáu無lâng引用tsit篇PO文。Nā是有lâng引用，ē佇tsia顯示。.",
+  "status.quotes.local_other_disclaimer": "Hōo作者拒絕引用ê引文bē當顯示。",
+  "status.quotes.remote_other_disclaimer": "Kan-ta tuì {domain} 來ê引文tsiah保證佇tsia顯示。Hōo作者拒絕ê引文buē顯示。",
   "status.read_more": "讀詳細",
   "status.reblog": "轉送",
-  "status.reblog_private": "照原PO ê通看見ê範圍轉送",
+  "status.reblog_or_quote": "轉送á是引用",
+  "status.reblog_private": "Koh再hām跟tuè ê分享",
   "status.reblogged_by": "{name} kā轉送ah",
   "status.reblogs": "{count, plural, other {# ê 轉送}}",
   "status.reblogs.empty": "Iáu無lâng轉送tsit篇PO文。Nā是有lâng轉送，ē佇tsia顯示。",
   "status.redraft": "Thâi掉了後重寫",
   "status.remove_bookmark": "Thâi掉冊籤",
   "status.remove_favourite": "Tuì收藏內suá掉",
+  "status.remove_quote": "Thâi掉",
   "status.replied_in_thread": "佇討論線內應",
   "status.replied_to": "回應 {name}",
   "status.reply": "回應",
   "status.replyAll": "應討論線",
   "status.report": "檢舉 @{name}",
+  "status.request_quote": "要求引用PO文",
+  "status.revoke_quote": "Kā 我ê PO文tuì @{name} ê thâi掉",
   "status.sensitive_warning": "敏感ê內容",
   "status.share": "分享",
   "status.show_less_all": "Lóng收起來",
@@ -928,6 +977,7 @@
   "upload_button.label": "加圖片、影片á是聲音檔",
   "upload_error.limit": "超過檔案傳起去ê限制",
   "upload_error.poll": "Bô允準佇投票ê時kā檔案傳起去。",
+  "upload_error.quote": "引用PO文bē當kā檔案傳起去。",
   "upload_form.drag_and_drop.instructions": "Nā beh選媒體附件，請tshi̍h空白key á是Enter key。Giú ê時，請用方向key照指定ê方向suá媒體附件。Beh khǹg媒體附件佇伊ê新位置，請koh tshi̍h空白key á是Enter key，或者tshi̍h Esc key來取消。",
   "upload_form.drag_and_drop.on_drag_cancel": "Suá位取消ah，媒體附件 {item} khǹg落來ah。",
   "upload_form.drag_and_drop.on_drag_end": "媒體附件 {item} khǹg落來ah。",
@@ -950,5 +1000,19 @@
   "video.skip_forward": "跳kah頭前",
   "video.unmute": "取消消音",
   "video.volume_down": "變khah細聲",
-  "video.volume_up": "變khah大聲"
+  "video.volume_up": "變khah大聲",
+  "visibility_modal.button_title": "設定通看ê程度",
+  "visibility_modal.header": "通看ê程度kap互動",
+  "visibility_modal.helper.direct_quoting": "Mastodon頂發布ê私人提起bē當hōo別lâng引用。",
+  "visibility_modal.helper.privacy_editing": "Po文發布了後，bē當改通看ê程度。",
+  "visibility_modal.helper.privacy_private_self_quote": "家kī引用ê私人PO文bē當改公開。",
+  "visibility_modal.helper.private_quoting": "Mastodon頂發布ê kan-ta跟tuè ê通看ê PO文，bē當hōo別lâng引用。",
+  "visibility_modal.helper.unlisted_quoting": "若別lâng引用lí，in ê PO文mā ē tuì趨勢時間線隱藏。",
+  "visibility_modal.instructions": "控制ē當hām tsit篇PO文互動ê lâng。Lí mā ē當用 <link>偏愛ê設定 > PO文預設<link>，kā設定作用kàu ta̍k篇未來ê PO文。",
+  "visibility_modal.privacy_label": "通看見ê程度",
+  "visibility_modal.quote_followers": "Kan-ta hōo跟tuè ê lâng",
+  "visibility_modal.quote_label": "Ē當引用ê lâng",
+  "visibility_modal.quote_nobody": "Kan-ta我",
+  "visibility_modal.quote_public": "Ta̍k ê lâng",
+  "visibility_modal.save": "儲存"
 }
diff --git a/app/javascript/mastodon/locales/ne.json b/app/javascript/mastodon/locales/ne.json
index 2d949afa662..c686ccfbb57 100644
--- a/app/javascript/mastodon/locales/ne.json
+++ b/app/javascript/mastodon/locales/ne.json
@@ -1,11 +1,13 @@
 {
   "about.contact": "सम्पर्क:",
+  "about.default_locale": "पूर्वनिर्धारित",
   "about.disclaimer": "Mastodon नि:शुल्क, खुला स्रोत सफ्टवेयर, र Mastodon gGmbH को ट्रेडमार्क हो।",
   "about.domain_blocks.no_reason_available": "कारण उपलब्ध छैन",
   "about.domain_blocks.preamble": "Mastodon ले तपाइँलाई सामान्यतया फेडिभर्समा कुनै पनि अन्य सर्भरका सामग्री हेर्न र प्रयोगकर्ताहरूसँग अन्तरक्रिया गर्न दिन्छ। यी अपवादहरू हुन् जुन यस विशेष सर्भरमा बनाइएका छन्।",
   "about.domain_blocks.silenced.title": "सीमित",
   "about.domain_blocks.suspended.explanation": "यस सर्भरबाट कुनै पनि डेटा प्रशोधन, भण्डारण वा आदानप्रदान गरिने छैन, जसले यस सर्भरका प्रयोगकर्ताहरूसँग कुनै पनि अन्तरक्रिया वा सञ्चारलाई असम्भव बनाउँछ।",
   "about.domain_blocks.suspended.title": "निलम्बित",
+  "about.language_label": "भाषा",
   "about.not_available": "यो जानकारी यस सर्भरमा उपलब्ध गराइएको छैन।",
   "about.powered_by": "{mastodon} द्वारा संचालित विकेन्द्रीकृत सामाजिक मिडिया",
   "about.rules": "सर्भर नियमहरू",
@@ -16,22 +18,28 @@
   "account.block_domain": "{domain} डोमेनलाई ब्लक गर्नुहोस्",
   "account.block_short": "ब्लक",
   "account.blocked": "ब्लक गरिएको",
+  "account.blocking": "ब्लक गरिएको",
   "account.cancel_follow_request": "फलो अनुरोध रद्द गर्नुहोस",
   "account.copy": "प्रोफाइलको लिङ्क प्रतिलिपि गर्नुहोस्",
   "account.direct": "@{name} लाई निजी रूपमा उल्लेख गर्नुहोस्",
   "account.disable_notifications": "@{name} ले पोस्ट गर्दा मलाई सूचित नगर्नुहोस्",
+  "account.domain_blocking": "ब्लक गरिएको डोमेन",
   "account.edit_profile": "प्रोफाइल सम्पादन गर्नुहोस्",
   "account.enable_notifications": "@{name} ले पोस्ट गर्दा मलाई सूचित गर्नुहोस्",
   "account.endorse": "प्रोफाइलमा फिचर गर्नुहोस्",
+  "account.featured": "फिचर गरिएको",
+  "account.featured.accounts": "प्रोफाइलहरू",
+  "account.featured.hashtags": "ह्यासट्यागहरू",
   "account.featured_tags.last_status_never": "कुनै पोस्ट छैन",
   "account.follow": "फलो गर्नुहोस",
   "account.follow_back": "फलो ब्याक गर्नुहोस्",
   "account.followers": "फलोअरहरु",
-  "account.followers.empty": "यस प्रयोगकर्तालाई अहिलेसम्म कसैले फलो गर्दैन।",
+  "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": "सम्झनामा।",
@@ -42,17 +50,20 @@
   "account.mute_notifications_short": "सूचनाहरू म्यूट गर्नुहोस्",
   "account.mute_short": "म्युट",
   "account.muted": "म्युट गरिएको",
+  "account.muting": "म्यूट गरिएको",
+  "account.mutual": "तपाईंहरु एकअर्कालाई फलो गर्नुहुन्छ",
   "account.no_bio": "कुनै विवरण प्रदान गरिएको छैन।",
   "account.posts": "पोस्टहरू",
   "account.posts_with_replies": "पोस्ट र जवाफहरू",
+  "account.remove_from_followers": "{name}लाई फलोअरहरूबाट हटाउनुहोस्",
   "account.report": "@{name}लाई रिपोर्ट गर्नुहोस्",
-  "account.requested": "स्वीकृतिको पर्खाइमा। फलो अनुरोध रद्द गर्न क्लिक गर्नुहोस्",
   "account.requested_follow": "{name} ले तपाईंलाई फलो गर्न अनुरोध गर्नुभएको छ",
   "account.share": "@{name} को प्रोफाइल सेयर गर्नुहोस्",
   "account.show_reblogs": "@{name} को बूस्टहरू देखाउनुहोस्",
   "account.statuses_counter": "{count, plural, one {{counter} पोस्ट} other {{counter} पोस्टहरू}}",
   "account.unblock": "@{name} लाई अनब्लक गर्नुहोस्",
   "account.unblock_domain": "{domain} डोमेनलाई अनब्लक गर्नुहोस्",
+  "account.unblock_domain_short": "अनब्लक गर्नुहोस्",
   "account.unblock_short": "अनब्लक गर्नुहोस्",
   "account.unendorse": "प्रोफाइलमा फिचर नगर्नुहोस्",
   "account.unfollow": "अनफलो गर्नुहोस्",
@@ -64,6 +75,7 @@
   "admin.dashboard.retention.cohort_size": "नयाँ प्रयोगकर्ताहरू",
   "alert.rate_limited.message": "कृपया {retry_time, time, medium} पछि पुन: प्रयास गर्नुहोस्।",
   "alert.unexpected.message": "एउटा अनपेक्षित त्रुटि भयो।",
+  "alt_text_modal.cancel": "रद्द गर्नुहोस्",
   "announcement.announcement": "घोषणा",
   "annual_report.summary.followers.followers": "फलोअरहरु",
   "annual_report.summary.highlighted_post.by_reblogs": "सबैभन्दा बढि बूस्ट गरिएको पोस्ट",
@@ -71,7 +83,10 @@
   "block_modal.remote_users_caveat": "हामी सर्भर {domain} लाई तपाईंको निर्णयको सम्मान गर्न सोध्नेछौं। तर, हामी अनुपालनको ग्यारेन्टी दिन सक्दैनौं किनभने केही सर्भरहरूले ब्लकहरू फरक रूपमा ह्यान्डल गर्न सक्छन्। सार्वजनिक पोस्टहरू लग इन नभएका प्रयोगकर्ताहरूले देख्न सक्छन्।",
   "block_modal.show_less": "कम देखाउनुहोस्",
   "block_modal.show_more": "थप देखाउनुहोस्",
+  "block_modal.they_cant_mention": "तिनीहरूले तपाईंलाई उल्लेख गर्न वा फलो गर्न सक्दैनन्।",
+  "block_modal.they_will_know": "उनीहरूले उनीहरू ब्लक गरिएको देख्न सक्छन्।",
   "block_modal.title": "प्रयोगकर्तालाई ब्लक गर्ने?",
+  "block_modal.you_wont_see_mentions": "तपाईंले तिनीहरूलाई उल्लेख गरिएका पोस्टहरू देख्नुहुने छैन।",
   "boost_modal.reblog": "पोस्ट बुस्ट गर्ने?",
   "boost_modal.undo_reblog": "पोस्ट अनबुस्ट गर्ने?",
   "bundle_column_error.copy_stacktrace": "त्रुटि रिपोर्ट प्रतिलिपि गर्नुहोस्",
@@ -121,15 +136,15 @@
   "confirmations.follow_to_list.confirm": "फलो गर्नुहोस र सूचीमा थप्नुहोस्",
   "confirmations.follow_to_list.message": "सूचीमा {name}लाई थप्नको लागि तपाईंले तिनीहरूलाई फलो गरेको हुनुपर्छ।",
   "confirmations.follow_to_list.title": "प्रयोगकर्तालाई फलो गर्ने?",
+  "confirmations.logout.confirm": "लग आउट",
   "confirmations.logout.message": "के तपाइँ पक्का हुनुहुन्छ कि तपाइँ लाई लग आउट गर्न चाहनुहुन्छ?",
   "confirmations.logout.title": "लग आउट गर्ने?",
   "confirmations.mute.confirm": "म्यूट गर्नुहोस्",
   "confirmations.redraft.confirm": "मेटाएर पुन: ड्राफ्ट गर्नुहोस्",
   "confirmations.redraft.title": "पोस्ट मेटाएर पुन: ड्राफ्ट गर्ने?",
   "confirmations.unfollow.confirm": "अनफलो गर्नुहोस्",
-  "confirmations.unfollow.message": "के तपाइँ पक्का हुनुहुन्छ कि तपाइँ {name}लाई अनफलो गर्न चाहनुहुन्छ?",
-  "confirmations.unfollow.title": "प्रयोगकर्तालाई अनफलो गर्ने?",
   "disabled_account_banner.account_settings": "खाता सेटिङहरू",
+  "empty_column.direct": "तपाईंले अहिलेसम्म कुनै पनि प्राइवेट उल्लेखहरू प्राप्त गर्नुभएको छैन। तपाईंले कुनै प्राप्त गरेपछि त्यो यहाँ देखिनेछ।",
   "empty_column.follow_requests": "तपाईंले अहिलेसम्म कुनै पनि फलो अनुरोधहरू प्राप्त गर्नुभएको छैन। तपाईंले कुनै प्राप्त गरेपछि त्यो यहाँ देखिनेछ।",
   "empty_column.followed_tags": "तपाईंले अहिलेसम्म कुनै पनि ह्यासट्यागहरू फलो गर्नुभएको छैन। तपाईंले ह्यासट्याग फलो गरेपछि तिनीहरू यहाँ देखिनेछन्।",
   "follow_suggestions.dismiss": "फेरि नदेखाउनुहोस्",
@@ -143,21 +158,40 @@
   "hashtag.follow": "ह्यासट्याग फलो गर्नुहोस्",
   "hashtag.unfollow": "ह्यासट्याग अनफलो गर्नुहोस्",
   "home.column_settings.show_reblogs": "बूस्टहरू देखाउनुहोस्",
+  "ignore_notifications_modal.private_mentions_title": "अनावश्यक प्राइवेट उल्लेखहरूबाट आउने सूचनाहरूलाई बेवास्ता गर्न चाहनुहुन्छ?",
   "interaction_modal.no_account_yet": "अहिलेसम्म खाता छैन?",
-  "interaction_modal.title.follow": "{name} लाई फलो गर्नुहोस्",
-  "interaction_modal.title.reblog": "{name} को पोस्ट बुस्ट गर्नुहोस्",
   "keyboard_shortcuts.boost": "पोस्ट बुस्ट गर्नुहोस्",
+  "keyboard_shortcuts.mention": "लेखकलाई उल्लेख गर्नुहोस्",
+  "mute_modal.they_can_mention_and_follow": "\n\nतिनीहरूले तपाईंलाई उल्लेख गर्न र फलो गर्न सक्छन्, तर तपाईंले तिनीहरूलाई देख्नुहुने छैन।",
   "mute_modal.they_wont_know": "उनीहरूलाई म्यूट गरिएको बारे थाहा हुँदैन।",
   "mute_modal.title": "प्रयोगकर्तालाई म्युट गर्ने?",
+  "mute_modal.you_wont_see_mentions": "तपाईंले तिनीहरूलाई उल्लेख गरिएका पोस्टहरू देख्नुहुने छैन।",
   "navigation_bar.blocks": "ब्लक गरिएको प्रयोगकर्ताहरु",
+  "navigation_bar.direct": "प्राइवेट उल्लेखहरू",
   "navigation_bar.follow_requests": "फलो अनुरोधहरू",
   "navigation_bar.followed_tags": "फलो गरिएका ह्यासट्यागहरू",
+  "navigation_bar.logout": "लग आउट",
+  "notification.label.mention": "उल्लेख",
+  "notification.label.private_mention": "प्राइवेट उल्लेख",
+  "notification.mention": "उल्लेख",
+  "notification.mentioned_you": "{name} ले तपाईंलाई उल्लेख गर्नुभयो",
   "notification.reblog": "{name} ले तपाईंको पोस्ट बूस्ट गर्नुभयो",
   "notification_requests.confirm_accept_multiple.title": "सूचना अनुरोधहरू स्वीकार गर्ने?",
   "notification_requests.confirm_dismiss_multiple.title": "सूचना अनुरोधहरू खारेज गर्ने?",
   "notifications.clear_title": "सूचनाहरू खाली गर्ने?",
+  "notifications.column_settings.follow": "नयाँ फलोअरहरु:",
+  "notifications.column_settings.follow_request": "नयाँ फलोअर अनुरोधहरु",
+  "notifications.column_settings.mention": "उल्लेखहरू:",
   "notifications.column_settings.reblog": "बूस्टहरू:",
   "notifications.filter.boosts": "बूस्टहरू",
+  "notifications.filter.mentions": "उल्लेखहरू",
+  "notifications.policy.filter_private_mentions_title": "अनावश्यक प्राइवेट उल्लेखहरू",
+  "onboarding.profile.note_hint": "तपाईं अन्य व्यक्तिहरूलाई @उल्लेख गर्न सक्नुहुन्छ वा #ह्यासट्यागहरू प्रयोग गर्न सक्नुहुन्छ…",
+  "privacy.direct.long": "पोस्टमा उल्लेख गरिएका सबैजना",
+  "privacy.direct.short": "प्राइवेट उल्लेख",
+  "privacy.private.long": "मात्र तपाईंको फलोअरहरु",
+  "privacy.private.short": "फलोअरहरु",
+  "reply_indicator.cancel": "रद्द गर्नुहोस्",
   "report.comment.title": "के हामीले थाहा पाउनुपर्ने अरू केही छ जस्तो लाग्छ?",
   "report.forward_hint": "यो खाता अर्को सर्भरबाट हो। त्यहाँ पनि रिपोर्टको गुमनाम प्रतिलिपि पठाउने हो?",
   "report.rules.title": "कुन नियमहरू उल्लङ्घन भइरहेका छन्?",
@@ -165,12 +199,19 @@
   "report.thanks.title": "यो हेर्न चाहनुहुन्न?",
   "report.unfollow": "@{name} लाई अनफलो गर्नुहोस्",
   "search_results.hashtags": "ह्यासट्यागहरू",
+  "sign_in_banner.sign_in": "लगइन",
+  "sign_in_banner.sso_redirect": "लगइन वा दर्ता गर्नुहोस्",
   "status.cancel_reblog_private": "अनबुस्ट गर्नुहोस्",
   "status.cannot_reblog": "यो पोस्टलाई बुस्ट गर्न सकिँदैन",
+  "status.direct": "@{name} लाई प्राइवेट रूपमा उल्लेख गर्नुहोस्",
+  "status.direct_indicator": "प्राइवेट उल्लेख",
+  "status.mention": "@{name} लाई उल्लेख गर्नुहोस्",
   "status.mute": "@{name}लाई म्यूट गर्नुहोस्",
   "status.mute_conversation": "कुराकानी म्यूट गर्नुहोस्",
   "status.reblog": "बूस्ट गर्नुहोस्",
   "status.reblogged_by": "{name} ले बूस्ट गर्नुभएको",
   "status.reblogs": "{count, plural, one {बूस्ट} other {बूस्टहरू}}",
-  "status.unmute_conversation": "कुराकानी अनम्यूट गर्नुहोस्"
+  "status.reblogs.empty": "यो पोस्टलाई अहिलेसम्म कसैले पनि बूस्ट गरेको छैन। कसैले बूस्ट गरेमा तिनीहरू यहाँ देखिनेछन्।",
+  "status.unmute_conversation": "कुराकानी अनम्यूट गर्नुहोस्",
+  "visibility_modal.quote_followers": "फलोअरहरु मात्र"
 }
diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json
index 90593ac2058..ecf8f46f756 100644
--- a/app/javascript/mastodon/locales/nl.json
+++ b/app/javascript/mastodon/locales/nl.json
@@ -28,6 +28,7 @@
   "account.disable_notifications": "Geen melding meer geven wanneer @{name} een bericht plaatst",
   "account.domain_blocking": "Server geblokkeerd",
   "account.edit_profile": "Profiel bewerken",
+  "account.edit_profile_short": "Bewerken",
   "account.enable_notifications": "Geef een melding wanneer @{name} een bericht plaatst",
   "account.endorse": "Op profiel weergeven",
   "account.familiar_followers_many": "Gevolgd door {name1}, {name2} en {othersCount, plural, one {één ander bekend account} other {# andere bekende accounts}}",
@@ -40,6 +41,11 @@
   "account.featured_tags.last_status_never": "Geen berichten",
   "account.follow": "Volgen",
   "account.follow_back": "Terugvolgen",
+  "account.follow_back_short": "Terugvolgen",
+  "account.follow_request": "Volgverzoek",
+  "account.follow_request_cancel": "Verzoek annuleren",
+  "account.follow_request_cancel_short": "Annuleren",
+  "account.follow_request_short": "Verzoek",
   "account.followers": "Volgers",
   "account.followers.empty": "Deze gebruiker heeft nog geen volgers of heeft deze verborgen.",
   "account.followers_counter": "{count, plural, one {{counter} volger} other {{counter} volgers}}",
@@ -70,7 +76,6 @@
   "account.posts_with_replies": "Reacties",
   "account.remove_from_followers": "{name} als volger verwijderen",
   "account.report": "@{name} rapporteren",
-  "account.requested": "Wachten op goedkeuring. Klik om het volgverzoek te annuleren",
   "account.requested_follow": "{name} wil jou graag volgen",
   "account.requests_to_follow_you": "Wil jou graag volgen",
   "account.share": "Account van @{name} delen",
@@ -239,15 +244,25 @@
   "confirmations.missing_alt_text.secondary": "Toch plaatsen",
   "confirmations.missing_alt_text.title": "Alt-tekst toevoegen?",
   "confirmations.mute.confirm": "Negeren",
+  "confirmations.quiet_post_quote_info.dismiss": "Herinner me er niet nogmaals aan",
+  "confirmations.quiet_post_quote_info.got_it": "Begrepen",
+  "confirmations.quiet_post_quote_info.message": "Wanneer je een minder openbaar bericht citeert, verschijnt jouw bericht niet onder trends.",
+  "confirmations.quiet_post_quote_info.title": "Berichten die minder openbaar zijn citeren",
   "confirmations.redraft.confirm": "Verwijderen en herschrijven",
   "confirmations.redraft.message": "Weet je zeker dat je dit bericht wilt verwijderen en herschrijven? Je verliest wel de boosts en favorieten, en de reacties op het originele bericht raak je kwijt.",
   "confirmations.redraft.title": "Bericht verwijderen en herschrijven?",
   "confirmations.remove_from_followers.confirm": "Volger verwijderen",
   "confirmations.remove_from_followers.message": "{name} zal je niet meer volgen. Weet je zeker dat je wilt doorgaan?",
   "confirmations.remove_from_followers.title": "Volger verwijderen?",
+  "confirmations.revoke_quote.confirm": "Bericht verwijderen",
+  "confirmations.revoke_quote.message": "Deze actie kan niet ongedaan worden gemaakt.",
+  "confirmations.revoke_quote.title": "Bericht verwijderen?",
+  "confirmations.unblock.confirm": "Deblokkeren",
+  "confirmations.unblock.title": "{name} deblokkeren?",
   "confirmations.unfollow.confirm": "Ontvolgen",
-  "confirmations.unfollow.message": "Weet je het zeker dat je {name} wilt ontvolgen?",
-  "confirmations.unfollow.title": "Gebruiker ontvolgen?",
+  "confirmations.unfollow.title": "{name} ontvolgen?",
+  "confirmations.withdraw_request.confirm": "Verzoek intrekken",
+  "confirmations.withdraw_request.title": "Verzoek intrekken om {name} te volgen?",
   "content_warning.hide": "Bericht verbergen",
   "content_warning.show": "Alsnog tonen",
   "content_warning.show_more": "Meer tonen",
@@ -289,6 +304,7 @@
   "domain_pill.your_handle": "Jouw fediverse-adres:",
   "domain_pill.your_server": "Jouw digitale thuis, waar al jouw berichten zich bevinden. Is deze server toch niet naar jouw wens? Dan kun je op elk moment naar een andere server verhuizen en ook jouw volgers overbrengen.",
   "domain_pill.your_username": "Jouw unieke identificatie-adres op deze server. Het is mogelijk dat er gebruikers met dezelfde gebruikersnaam op verschillende servers te vinden zijn.",
+  "dropdown.empty": "Selecteer een optie",
   "embed.instructions": "Embed dit bericht op jouw website door de onderstaande code te kopiëren.",
   "embed.preview": "Zo komt het eruit te zien:",
   "emoji_button.activity": "Activiteiten",
@@ -424,8 +440,6 @@
   "hints.profiles.see_more_followers": "Bekijk meer volgers op {domain}",
   "hints.profiles.see_more_follows": "Bekijk meer gevolgde accounts op {domain}",
   "hints.profiles.see_more_posts": "Bekijk meer berichten op {domain}",
-  "hints.threads.replies_may_be_missing": "Antwoorden van andere servers kunnen ontbreken.",
-  "hints.threads.see_more": "Bekijk meer reacties op {domain}",
   "home.column_settings.show_quotes": "Citaten tonen",
   "home.column_settings.show_reblogs": "Boosts tonen",
   "home.column_settings.show_replies": "Reacties tonen",
@@ -447,20 +461,12 @@
   "ignore_notifications_modal.private_mentions_title": "Meldingen negeren van ongevraagde privéberichten?",
   "info_button.label": "Help",
   "info_button.what_is_alt_text": "<h1>Wat is alt-tekst?</h1> <p>Alt-tekst biedt beschrijvingen van afbeeldingen voor mensen met een visuele beperking, voor verbindingen met lage internetsnelheid of mensen die op zoek zijn naar extra context.</p> <p>Je kunt de toegankelijkheid en de begrijpelijkheid voor iedereen verbeteren door heldere, beknopte en objectieve alt-teksten te schrijven.</p> <ul> <li>Leg belangrijke elementen vast</li> <li>Tekst in afbeeldingen samenvatten</li> <li>Een eenvoudige zinsbouw gebruiken</li> <li>Overbodige informatie vermijden</li> <li>Voor complexe diagrammen of kaarten alleen op trends en belangrijke bevindingen focussen</li> </ul>",
-  "interaction_modal.action.favourite": "Om verder te gaan, moet je vanaf je eigen account als favoriet markeren.",
-  "interaction_modal.action.follow": "Om verder te gaan, moet je vanaf je eigen account volgen.",
-  "interaction_modal.action.reblog": "Om verder te gaan, moet je vanaf je eigen account boosten.",
-  "interaction_modal.action.reply": "Om verder te gaan, moet je vanaf je eigen account reageren.",
-  "interaction_modal.action.vote": "Om verder te gaan, moet je vanaf je eigen account stemmen.",
+  "interaction_modal.action": "Wanneer je met het bericht van {name} interactie wil hebben, moet je met jouw account op jouw eigen Mastodon-server inloggen.",
   "interaction_modal.go": "Ga",
   "interaction_modal.no_account_yet": "Heb je nog geen account?",
   "interaction_modal.on_another_server": "Op een andere server",
   "interaction_modal.on_this_server": "Op deze server",
-  "interaction_modal.title.favourite": "Bericht van {name} als favoriet markeren",
-  "interaction_modal.title.follow": "{name} volgen",
-  "interaction_modal.title.reblog": "Bericht van {name} boosten",
-  "interaction_modal.title.reply": "Op het bericht van {name} reageren",
-  "interaction_modal.title.vote": "Stemmen in {name}'s peiling",
+  "interaction_modal.title": "Inloggen om door te gaan",
   "interaction_modal.username_prompt": "Bijv. {example}",
   "intervals.full.days": "{number, plural, one {# dag} other {# dagen}}",
   "intervals.full.hours": "{number, plural, one {# uur} other {# uur}}",
@@ -481,6 +487,7 @@
   "keyboard_shortcuts.home": "Starttijdlijn tonen",
   "keyboard_shortcuts.hotkey": "Sneltoets",
   "keyboard_shortcuts.legend": "Deze legenda tonen",
+  "keyboard_shortcuts.load_more": "\"Meer laden\"-knop focussen",
   "keyboard_shortcuts.local": "Lokale tijdlijn tonen",
   "keyboard_shortcuts.mention": "Account vermelden",
   "keyboard_shortcuts.muted": "Genegeerde gebruikers tonen",
@@ -489,6 +496,7 @@
   "keyboard_shortcuts.open_media": "Media openen",
   "keyboard_shortcuts.pinned": "Jouw vastgemaakte berichten tonen",
   "keyboard_shortcuts.profile": "Gebruikersprofiel auteur openen",
+  "keyboard_shortcuts.quote": "Bericht citeren",
   "keyboard_shortcuts.reply": "Reageren",
   "keyboard_shortcuts.requests": "Jouw volgverzoeken tonen",
   "keyboard_shortcuts.search": "Zoekveld focussen",
@@ -500,6 +508,8 @@
   "keyboard_shortcuts.translate": "om een bericht te vertalen",
   "keyboard_shortcuts.unfocus": "Tekst- en zoekveld ontfocussen",
   "keyboard_shortcuts.up": "Naar boven in de lijst bewegen",
+  "learn_more_link.got_it": "Begrepen",
+  "learn_more_link.learn_more": "Meer informatie",
   "lightbox.close": "Sluiten",
   "lightbox.next": "Volgende",
   "lightbox.previous": "Vorige",
@@ -600,6 +610,7 @@
   "notification.label.mention": "Vermelding",
   "notification.label.private_mention": "Privébericht",
   "notification.label.private_reply": "Privéreactie",
+  "notification.label.quote": "{name} heeft jouw bericht geciteerd",
   "notification.label.reply": "Reactie",
   "notification.mention": "Vermelding",
   "notification.mentioned_you": "Je bent vermeld door {name}",
@@ -614,6 +625,7 @@
   "notification.moderation_warning.action_suspend": "Jouw account is opgeschort.",
   "notification.own_poll": "Jouw peiling is beëindigd",
   "notification.poll": "Een peiling waaraan jij hebt meegedaan is beëindigd",
+  "notification.quoted_update": "{name} bewerkte een door jou geciteerd bericht",
   "notification.reblog": "{name} boostte jouw bericht",
   "notification.reblog.name_and_others_with_link": "{name} en <a>{count, plural, one {# ander persoon} other {# andere personen}}</a> hebben jouw bericht geboost",
   "notification.relationships_severance_event": "Verloren verbindingen met {name}",
@@ -657,6 +669,7 @@
   "notifications.column_settings.mention": "Vermeldingen:",
   "notifications.column_settings.poll": "Peilingresultaten:",
   "notifications.column_settings.push": "Pushmeldingen",
+  "notifications.column_settings.quote": "Citaten:",
   "notifications.column_settings.reblog": "Boosts:",
   "notifications.column_settings.show": "In kolom tonen",
   "notifications.column_settings.sound": "Geluid afspelen",
@@ -725,18 +738,25 @@
   "poll.votes": "{votes, plural, one {# stem} other {# stemmen}}",
   "poll_button.add_poll": "Peiling toevoegen",
   "poll_button.remove_poll": "Peiling verwijderen",
-  "privacy.change": "Zichtbaarheid van bericht aanpassen",
+  "privacy.change": "Privacy voor een bericht aanpassen",
   "privacy.direct.long": "Alleen voor mensen die specifiek in het bericht worden vermeld",
   "privacy.direct.short": "Privébericht",
   "privacy.private.long": "Alleen jouw volgers",
   "privacy.private.short": "Volgers",
   "privacy.public.long": "Iedereen op Mastodon en daarbuiten",
   "privacy.public.short": "Openbaar",
+  "privacy.quote.anyone": "{visibility}, iedereen mag citeren",
+  "privacy.quote.disabled": "{visibility}, citeren uitgeschakeld",
+  "privacy.quote.limited": "{visibility}, citeren beperkt",
   "privacy.unlisted.additional": "Dit is vergelijkbaar met openbaar, behalve dat het bericht niet op openbare tijdlijnen, onder hashtags, verkennen of zoeken verschijnt, zelfs als je je account daarvoor hebt ingesteld.",
-  "privacy.unlisted.long": "Voor iedereen zichtbaar, maar niet onder trends, hashtags en op openbare tijdlijnen",
+  "privacy.unlisted.long": "Niet zichtbaar in de zoekresultaten van Mastodon, onder trends, hashtags en op openbare tijdlijnen",
   "privacy.unlisted.short": "Minder openbaar",
   "privacy_policy.last_updated": "Laatst bijgewerkt op {date}",
   "privacy_policy.title": "Privacybeleid",
+  "quote_error.poll": "Het is niet mogelijk om polls te citeren.",
+  "quote_error.quote": "Je kunt maar één bericht per keer citeren.",
+  "quote_error.unauthorized": "Je bent niet gemachtigd om dit bericht te citeren.",
+  "quote_error.upload": "Je kunt geen mediabijlage aan een bericht met een citaat toevoegen.",
   "recommended": "Aanbevolen",
   "refresh": "Vernieuwen",
   "regeneration_indicator.please_stand_by": "Even geduld alsjeblieft.",
@@ -752,6 +772,9 @@
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "vandaag",
+  "remove_quote_hint.button_label": "Begrepen",
+  "remove_quote_hint.message": "Je kunt dit doen vanuit het {icon} optiesmenu.",
+  "remove_quote_hint.title": "Wil je jouw geciteerd bericht verwijderen?",
   "reply_indicator.attachments": "{count, plural, one {# bijlage} other {# bijlagen}}",
   "reply_indicator.cancel": "Annuleren",
   "reply_indicator.poll": "Peiling",
@@ -843,13 +866,23 @@
   "status.admin_account": "Moderatie-omgeving van @{name} openen",
   "status.admin_domain": "Moderatie-omgeving van {domain} openen",
   "status.admin_status": "Dit bericht in de moderatie-omgeving tonen",
+  "status.all_disabled": "Boosts en citaten zijn uitgeschakeld",
   "status.block": "@{name} blokkeren",
   "status.bookmark": "Bladwijzer toevoegen",
   "status.cancel_reblog_private": "Niet langer boosten",
+  "status.cannot_quote": "Je bent niet gemachtigd om dit bericht te citeren",
   "status.cannot_reblog": "Dit bericht kan niet geboost worden",
+  "status.contains_quote": "Bevat citaat",
+  "status.context.loading": "Meer reacties laden",
+  "status.context.loading_error": "Kon geen nieuwe reacties laden",
+  "status.context.loading_success": "Alle reacties zijn geladen",
+  "status.context.more_replies_found": "Meer reacties gevonden",
+  "status.context.retry": "Opnieuw proberen",
+  "status.context.show": "Tonen",
   "status.continued_thread": "Vervolg van gesprek",
   "status.copy": "Link naar bericht kopiëren",
   "status.delete": "Verwijderen",
+  "status.delete.success": "Bericht verwijderd",
   "status.detailed_status": "Uitgebreide gespreksweergave",
   "status.direct": "@{name} een privébericht sturen",
   "status.direct_indicator": "Privébericht",
@@ -872,27 +905,43 @@
   "status.mute_conversation": "Gesprek negeren",
   "status.open": "Volledig bericht tonen",
   "status.pin": "Aan profielpagina vastmaken",
+  "status.quote": "Citeren",
+  "status.quote.cancel": "Citeren annuleren",
   "status.quote_error.filtered": "Verborgen door een van je filters",
-  "status.quote_error.not_found": "Dit bericht kan niet worden weergegeven.",
-  "status.quote_error.pending_approval": "Dit bericht is in afwachting van goedkeuring door de oorspronkelijke auteur.",
-  "status.quote_error.rejected": "Dit bericht kan niet worden weergegeven omdat de oorspronkelijke auteur niet toestaat dat het wordt geciteerd.",
-  "status.quote_error.removed": "Dit bericht is verwijderd door de auteur.",
-  "status.quote_error.unauthorized": "Dit bericht kan niet worden weergegeven omdat je niet bevoegd bent om het te bekijken.",
-  "status.quote_post_author": "Bericht van {name}",
+  "status.quote_error.limited_account_hint.action": "Alsnog tonen",
+  "status.quote_error.limited_account_hint.title": "Dit account is door de moderatoren van {domain} verborgen.",
+  "status.quote_error.not_available": "Bericht niet beschikbaar",
+  "status.quote_error.pending_approval": "Bericht in afwachting",
+  "status.quote_error.pending_approval_popout.body": "Op Mastodon kun je bepalen of iemand je mag citeren. Dit bericht is in afwachting van de goedkeuring van de oorspronkelijke auteur.",
+  "status.quote_error.revoked": "Bericht verwijderd door auteur",
+  "status.quote_followers_only": "Alleen volgers mogen dit bericht citeren",
+  "status.quote_manual_review": "De auteur gaat het handmatig beoordelen",
+  "status.quote_noun": "Citaat",
+  "status.quote_policy_change": "Wijzig wie jou mag citeren",
+  "status.quote_post_author": "Citeerde een bericht van @{name}",
+  "status.quote_private": "Citeren van berichten aan alleen volgers is niet mogelijk",
+  "status.quotes": "{count, plural, one {citaat} other {citaten}}",
+  "status.quotes.empty": "Niemand heeft dit bericht nog geciteerd. Wanneer iemand dat doet, wordt dat hier getoond.",
+  "status.quotes.local_other_disclaimer": "Citaten afgewezen door de auteur worden niet getoond.",
+  "status.quotes.remote_other_disclaimer": "Alleen citaten van {domain} worden hier gegarandeerd weergegeven. Citaten afgewezen door de auteur worden niet getoond.",
   "status.read_more": "Meer lezen",
   "status.reblog": "Boosten",
-  "status.reblog_private": "Boost naar oorspronkelijke ontvangers",
+  "status.reblog_or_quote": "Boosten of citeren",
+  "status.reblog_private": "Opnieuw met je volgers delen",
   "status.reblogged_by": "{name} boostte",
   "status.reblogs": "{count, plural, one {boost} other {boosts}}",
   "status.reblogs.empty": "Niemand heeft dit bericht nog geboost. Wanneer iemand dit doet, valt dat hier te zien.",
   "status.redraft": "Verwijderen en herschrijven",
   "status.remove_bookmark": "Bladwijzer verwijderen",
   "status.remove_favourite": "Verwijderen uit favorieten",
+  "status.remove_quote": "Verwijderen",
   "status.replied_in_thread": "Reageerde in gesprek",
   "status.replied_to": "Reageerde op {name}",
   "status.reply": "Reageren",
   "status.replyAll": "Op iedereen reageren",
   "status.report": "@{name} rapporteren",
+  "status.request_quote": "Verzoek om te citeren",
+  "status.revoke_quote": "Mijn bericht uit het bericht van @{name} verwijderen",
   "status.sensitive_warning": "Gevoelige inhoud",
   "status.share": "Delen",
   "status.show_less_all": "Alles minder tonen",
@@ -930,6 +979,7 @@
   "upload_button.label": "Afbeeldingen, een video- of een geluidsbestand toevoegen",
   "upload_error.limit": "Uploadlimiet van bestand overschreden.",
   "upload_error.poll": "Het uploaden van bestanden is bij peilingen niet toegestaan.",
+  "upload_error.quote": "Je kunt geen bestand aan een bericht met een citaat toevoegen.",
   "upload_form.drag_and_drop.instructions": "Druk op spatie of enter om een mediabijlage op te pakken. Gebruik de pijltjestoetsen om de bijlage in een bepaalde richting te verplaatsen. Druk opnieuw op de spatiebalk of enter om de mediabijlage op de nieuwe positie te plaatsen, of druk op escape om te annuleren.",
   "upload_form.drag_and_drop.on_drag_cancel": "Slepen is geannuleerd. Mediabijlage {item} is niet verplaatst.",
   "upload_form.drag_and_drop.on_drag_end": "Mediabijlage {item} is niet verplaatst.",
@@ -952,5 +1002,19 @@
   "video.skip_forward": "Vooruitspoelen",
   "video.unmute": "Dempen opheffen",
   "video.volume_down": "Volume omlaag",
-  "video.volume_up": "Volume omhoog"
+  "video.volume_up": "Volume omhoog",
+  "visibility_modal.button_title": "Privacy instellen",
+  "visibility_modal.header": "Zichtbaarheid en interactie",
+  "visibility_modal.helper.direct_quoting": "Privéberichten afkomstig van Mastodon kunnen niet door anderen worden geciteerd.",
+  "visibility_modal.helper.privacy_editing": "De zichtbaarheid kan niet meer worden gewijzigd nadat een bericht is gepubliceerd.",
+  "visibility_modal.helper.privacy_private_self_quote": "Jouw eigen citaten van berichten aan alleen volgers kunnen niet openbaar worden gemaakt.",
+  "visibility_modal.helper.private_quoting": "Berichten aan alleen volgers afkomstig van Mastodon kunnen niet door anderen worden geciteerd.",
+  "visibility_modal.helper.unlisted_quoting": "Wanneer mensen jou citeren, verschijnt hun bericht ook niet onder trends.",
+  "visibility_modal.instructions": "Bepaal wie wat met dit bericht mag doen. Je kunt ook de instellingen voor alle toekomstige berichten aanpassen door naar <link>Voorkeuren > Standaardinstellingen voor berichten</link> te gaan.",
+  "visibility_modal.privacy_label": "Zichtbaarheid",
+  "visibility_modal.quote_followers": "Alleen volgers",
+  "visibility_modal.quote_label": "Wie mag jou citeren",
+  "visibility_modal.quote_nobody": "Alleen ik",
+  "visibility_modal.quote_public": "Iedereen",
+  "visibility_modal.save": "Opslaan"
 }
diff --git a/app/javascript/mastodon/locales/nn.json b/app/javascript/mastodon/locales/nn.json
index b739208ab37..faa4efe61fb 100644
--- a/app/javascript/mastodon/locales/nn.json
+++ b/app/javascript/mastodon/locales/nn.json
@@ -24,10 +24,11 @@
   "account.blocking": "Blokkerer",
   "account.cancel_follow_request": "Trekk attende fylgeførespurnad",
   "account.copy": "Kopier lenka til profilen",
-  "account.direct": "Nevn @{name} privat",
+  "account.direct": "Nemn @{name} privat",
   "account.disable_notifications": "Slutt å varsle meg når @{name} skriv innlegg",
   "account.domain_blocking": "Blokkerer domenet",
   "account.edit_profile": "Rediger profil",
+  "account.edit_profile_short": "Rediger",
   "account.enable_notifications": "Varsle meg når @{name} skriv innlegg",
   "account.endorse": "Vis på profilen",
   "account.familiar_followers_many": "Fylgt av {name1}, {name2}, og {othersCount, plural, one {ein annan du kjenner} other {# andre du kjenner}}",
@@ -40,6 +41,11 @@
   "account.featured_tags.last_status_never": "Ingen innlegg",
   "account.follow": "Fylg",
   "account.follow_back": "Fylg tilbake",
+  "account.follow_back_short": "Fylg tilbake",
+  "account.follow_request": "Folk som vil fylgja deg",
+  "account.follow_request_cancel": "Avbrit førespurnaden",
+  "account.follow_request_cancel_short": "Avbryt",
+  "account.follow_request_short": "Førespurnad",
   "account.followers": "Fylgjarar",
   "account.followers.empty": "Ingen fylgjer denne brukaren enno.",
   "account.followers_counter": "{count, plural, one {{counter} fylgjar} other {{counter} fylgjarar}}",
@@ -70,7 +76,6 @@
   "account.posts_with_replies": "Tut og svar",
   "account.remove_from_followers": "Fjern {name} frå fylgjarane dine",
   "account.report": "Rapporter @{name}",
-  "account.requested": "Ventar på aksept. Klikk for å avbryta fylgjeførespurnaden",
   "account.requested_follow": "{name} har bedt om å få fylgja deg",
   "account.requests_to_follow_you": "Folk som vil fylgja deg",
   "account.share": "Del @{name} sin profil",
@@ -239,15 +244,25 @@
   "confirmations.missing_alt_text.secondary": "Publiser likevel",
   "confirmations.missing_alt_text.title": "Legg til alternativ tekst?",
   "confirmations.mute.confirm": "Demp",
+  "confirmations.quiet_post_quote_info.dismiss": "Ikkje minn meg på det att",
+  "confirmations.quiet_post_quote_info.got_it": "Greitt",
+  "confirmations.quiet_post_quote_info.message": "Når du siterer eit stille offentleg innlegg, blir innlegget ditt gøymt frå offentlege populære tidsliner.",
+  "confirmations.quiet_post_quote_info.title": "Å sitera stille offentlege innlegg",
   "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.redraft.title": "Slett og skriv på nytt?",
   "confirmations.remove_from_followers.confirm": "Fjern fylgjar",
   "confirmations.remove_from_followers.message": "{name} vil ikkje fylgja deg meir. Vil du halda fram?",
   "confirmations.remove_from_followers.title": "Fjern fylgjar?",
+  "confirmations.revoke_quote.confirm": "Fjern innlegget",
+  "confirmations.revoke_quote.message": "Du kan ikkje angra denne handlinga.",
+  "confirmations.revoke_quote.title": "Fjern innlegget?",
+  "confirmations.unblock.confirm": "Opphev blokkeringa",
+  "confirmations.unblock.title": "Opphev blokkeringa av {name}?",
   "confirmations.unfollow.confirm": "Slutt å fylgja",
-  "confirmations.unfollow.message": "Er du sikker på at du vil slutta å fylgja {name}?",
-  "confirmations.unfollow.title": "Slutt å fylgja brukaren?",
+  "confirmations.unfollow.title": "Slutt å fylgja {name}?",
+  "confirmations.withdraw_request.confirm": "Trekk attende førespurnad",
+  "confirmations.withdraw_request.title": "Trekkja tilbake førespurnaden om å fylgja {name}?",
   "content_warning.hide": "Gøym innlegg",
   "content_warning.show": "Vis likevel",
   "content_warning.show_more": "Vis meir",
@@ -289,6 +304,7 @@
   "domain_pill.your_handle": "Handtaket ditt:",
   "domain_pill.your_server": "Din digitale heim, der alle innlegga dine bur. Liker du ikkje dette? Byt til ein ny tenar når som helst og ta med fylgjarane dine òg.",
   "domain_pill.your_username": "Din unike identifikator på denne tenaren. Det er mogleg å finne brukarar med same brukarnamn på forskjellige tenarar.",
+  "dropdown.empty": "Vel eit alternativ",
   "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",
@@ -422,10 +438,8 @@
   "hints.profiles.follows_may_be_missing": "Kven denne profilen fylgjer manglar kanskje.",
   "hints.profiles.posts_may_be_missing": "Nokre innlegg frå denne profilen manglar kanskje.",
   "hints.profiles.see_more_followers": "Sjå fleire fylgjarar på {domain}",
-  "hints.profiles.see_more_follows": "Sjå fleire fylgjer på {domain}",
+  "hints.profiles.see_more_follows": "Sjå fleire fylgje på {domain}",
   "hints.profiles.see_more_posts": "Sjå fleire innlegg på {domain}",
-  "hints.threads.replies_may_be_missing": "Svar frå andre tenarar manglar kanskje.",
-  "hints.threads.see_more": "Sjå fleire svar på {domain}",
   "home.column_settings.show_quotes": "Vis sitat",
   "home.column_settings.show_reblogs": "Vis framhevingar",
   "home.column_settings.show_replies": "Vis svar",
@@ -447,20 +461,12 @@
   "ignore_notifications_modal.private_mentions_title": "Oversjå varsel frå masseutsende private omtaler?",
   "info_button.label": "Hjelp",
   "info_button.what_is_alt_text": "<h1>Kva er alternativ tekst?</h1> <p>Alternativ eller skildrande tekst gjev ei skildring av biletet for menneske som har synsvanskar, sein nettilkopling eller dei som ser etter ekstra innhald.</p> <p>Du gjer innhaldet ditt meir tilgjengeleg og forståeleg for alle ved å skriva klåre, presise og nøytrale alt-tekstar.</p> <ul> <li>Skriv om viktige element</li> <li>Oppsummer tekst i bilete</li> <li>Skriv vanlege setningar</li> <li>Unngå unyttige opplysingar</li> <li>Legg vekt på hovudpunkta i innhaldsrike visuelle element, som grafar eller kart</li> </ul>",
-  "interaction_modal.action.favourite": "Du må favorittmerka frå kontoen din for å halda fram.",
-  "interaction_modal.action.follow": "Du må fylgja frå kontoen din for å halda fram.",
-  "interaction_modal.action.reblog": "Du må framheva frå kontoen din for å halda fram.",
-  "interaction_modal.action.reply": "Du må svara frå kontoen din for å halda fram.",
-  "interaction_modal.action.vote": "Du må røysta frå kontoen din for å halda fram.",
+  "interaction_modal.action": "For å handla med innlegget til {name}, må du logga inn på den Mastodon-tenaren du bruker.",
   "interaction_modal.go": "Gå",
   "interaction_modal.no_account_yet": "Har du ikkje ein konto enno?",
   "interaction_modal.on_another_server": "På ein annan tenar",
   "interaction_modal.on_this_server": "På denne tenaren",
-  "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}",
-  "interaction_modal.title.vote": "Røyst i {name} si avrøysting",
+  "interaction_modal.title": "Logg inn for å halda fram",
   "interaction_modal.username_prompt": "T.d. {example}",
   "intervals.full.days": "{number, plural, one {# dag} other {# dagar}}",
   "intervals.full.hours": "{number, plural, one {# time} other {# timar}}",
@@ -481,6 +487,7 @@
   "keyboard_shortcuts.home": "Opne heimetidslina",
   "keyboard_shortcuts.hotkey": "Snøggtast",
   "keyboard_shortcuts.legend": "Vis denne forklaringa",
+  "keyboard_shortcuts.load_more": "Fokuser på «Last meir»-knappen",
   "keyboard_shortcuts.local": "Opne lokal tidsline",
   "keyboard_shortcuts.mention": "Nemn forfattaren",
   "keyboard_shortcuts.muted": "Opne liste over målbundne brukarar",
@@ -489,6 +496,7 @@
   "keyboard_shortcuts.open_media": "Opne media",
   "keyboard_shortcuts.pinned": "Opne lista over festa tut",
   "keyboard_shortcuts.profile": "Opne forfattaren sin profil",
+  "keyboard_shortcuts.quote": "Siter innlegget",
   "keyboard_shortcuts.reply": "Svar på innlegg",
   "keyboard_shortcuts.requests": "Opne lista med fylgjeførespurnader",
   "keyboard_shortcuts.search": "for å fokusera søket",
@@ -500,6 +508,8 @@
   "keyboard_shortcuts.translate": "å omsetje eit innlegg",
   "keyboard_shortcuts.unfocus": "for å fokusere vekk skrive-/søkefeltet",
   "keyboard_shortcuts.up": "Flytt opp på lista",
+  "learn_more_link.got_it": "Forstått",
+  "learn_more_link.learn_more": "Lær meir",
   "lightbox.close": "Lukk",
   "lightbox.next": "Neste",
   "lightbox.previous": "Førre",
@@ -591,8 +601,8 @@
   "notification.annual_report.view": "Sjå #Året ditt",
   "notification.favourite": "{name} markerte innlegget ditt som favoritt",
   "notification.favourite.name_and_others_with_link": "{name} og <a>{count, plural, one {# annan} other {# andre}}</a> favorittmerka innlegget ditt",
-  "notification.favourite_pm": "{name} favorittmerka den private nemninga di",
-  "notification.favourite_pm.name_and_others_with_link": "{name} og <a>{count, plural, one {# annan} other {# andre}}</a> favorittmerka den private nemninga di",
+  "notification.favourite_pm": "{name} favorittmerka den private omtalen din",
+  "notification.favourite_pm.name_and_others_with_link": "{name} og <a>{count, plural, one {# annan} other {# andre}}</a> favorittmerka den private omtalen din",
   "notification.follow": "{name} fylgde deg",
   "notification.follow.name_and_others": "{name} og <a>{count, plural, one {# annan} other {# andre}}</a> fylgde deg",
   "notification.follow_request": "{name} har bedt om å fylgja deg",
@@ -600,6 +610,7 @@
   "notification.label.mention": "Omtale",
   "notification.label.private_mention": "Privat omtale",
   "notification.label.private_reply": "Privat svar",
+  "notification.label.quote": "{name} siterte innlegget ditt",
   "notification.label.reply": "Svar",
   "notification.mention": "Omtale",
   "notification.mentioned_you": "{name} nemnde deg",
@@ -614,6 +625,7 @@
   "notification.moderation_warning.action_suspend": "Kontoen din har blitt suspendert.",
   "notification.own_poll": "Rundspørjinga di er ferdig",
   "notification.poll": "Ei rundspørjing du røysta i er ferdig",
+  "notification.quoted_update": "{name} redigerte eit innlegg du har sitert",
   "notification.reblog": "{name} framheva innlegget ditt",
   "notification.reblog.name_and_others_with_link": "{name} og <a>{count, plural, one {# annan} other {# andre}}</a> framheva innlegget ditt",
   "notification.relationships_severance_event": "Tapte samband med {name}",
@@ -654,9 +666,10 @@
   "notifications.column_settings.follow": "Nye fylgjarar:",
   "notifications.column_settings.follow_request": "Ny fylgjarførespurnader:",
   "notifications.column_settings.group": "Gruppe",
-  "notifications.column_settings.mention": "Omtaler:",
+  "notifications.column_settings.mention": "Omtalar:",
   "notifications.column_settings.poll": "Røysteresultat:",
   "notifications.column_settings.push": "Pushvarsel",
+  "notifications.column_settings.quote": "Sitat:",
   "notifications.column_settings.reblog": "Framhevingar:",
   "notifications.column_settings.show": "Vis i kolonne",
   "notifications.column_settings.sound": "Spel av lyd",
@@ -691,8 +704,8 @@
   "notifications.policy.filter_not_followers_title": "Folk som ikkje fylgjer deg",
   "notifications.policy.filter_not_following_hint": "Til du godkjenner dei manuelt",
   "notifications.policy.filter_not_following_title": "Folk du ikkje fylgjer",
-  "notifications.policy.filter_private_mentions_hint": "Filtrert viss det ikkje er eit svar på dine eigne omtaler eller viss du fylgjer avsendaren",
-  "notifications.policy.filter_private_mentions_title": "Masseutsende private omtaler",
+  "notifications.policy.filter_private_mentions_hint": "Filtrert viss det ikkje er eit svar på dine eigne omtalar eller viss du fylgjer avsendaren",
+  "notifications.policy.filter_private_mentions_title": "Masseutsende private omtalar",
   "notifications.policy.title": "Handter varsel frå…",
   "notifications_permission_banner.enable": "Skru på skrivebordsvarsel",
   "notifications_permission_banner.how_to_control": "Aktiver skrivebordsvarsel for å få varsel når Mastodon ikkje er open. Du kan nøye bestemme kva samhandlingar som skal føre til skrivebordsvarsel gjennom {icon}-knappen ovanfor etter at varsel er aktivert.",
@@ -732,11 +745,18 @@
   "privacy.private.short": "Fylgjarar",
   "privacy.public.long": "Kven som helst på og av Mastodon",
   "privacy.public.short": "Offentleg",
+  "privacy.quote.anyone": "{visibility}, alle kan sitera",
+  "privacy.quote.disabled": "{visibility}, ingen kan sitera",
+  "privacy.quote.limited": "{visibility}, avgrensa sitat",
   "privacy.unlisted.additional": "Dette er akkurat som offentleg, bortsett frå at innlegga ikkje dukkar opp i direktestraumar eller merkelappar, i oppdagingar eller Mastodon-søk, sjølv om du har sagt ja til at kontoen skal vera synleg.",
-  "privacy.unlisted.long": "Færre algoritmiske fanfarar",
+  "privacy.unlisted.long": "Gøymt frå søkjeresultata på Mastodon, og frå populære og offentlege tidsliner",
   "privacy.unlisted.short": "Stille offentleg",
   "privacy_policy.last_updated": "Sist oppdatert {date}",
   "privacy_policy.title": "Personvernsreglar",
+  "quote_error.poll": "Du kan ikkje sitera meiningsmålingar.",
+  "quote_error.quote": "Det er berre lov med eitt sitat om gongen.",
+  "quote_error.unauthorized": "Du har ikkje løyve til å sitera dette innlegget.",
+  "quote_error.upload": "Du kan ikkje sitera medievedlegg.",
   "recommended": "Tilrådd",
   "refresh": "Oppdater",
   "regeneration_indicator.please_stand_by": "Vent litt.",
@@ -752,6 +772,9 @@
   "relative_time.minutes": "{number}min",
   "relative_time.seconds": "{number}sek",
   "relative_time.today": "i dag",
+  "remove_quote_hint.button_label": "Greitt",
+  "remove_quote_hint.message": "Du kan gjera det på {icon} valmenyen.",
+  "remove_quote_hint.title": "Vil du fjerna det siterte innlegget?",
   "reply_indicator.attachments": "{count, plural, one {# vedlegg} other {# vedlegg}}",
   "reply_indicator.cancel": "Avbryt",
   "reply_indicator.poll": "Avstemming",
@@ -843,13 +866,23 @@
   "status.admin_account": "Opne moderasjonsgrensesnitt for @{name}",
   "status.admin_domain": "Opna moderatorgrensesnittet for {domain}",
   "status.admin_status": "Opne denne statusen i moderasjonsgrensesnittet",
+  "status.all_disabled": "Framhevingar og sitat er skrudde av",
   "status.block": "Blokker @{name}",
   "status.bookmark": "Set bokmerke",
   "status.cancel_reblog_private": "Opphev framheving",
+  "status.cannot_quote": "Du har ikkje løyve til å sitera dette innlegget",
   "status.cannot_reblog": "Du kan ikkje framheva dette innlegget",
+  "status.contains_quote": "Inneheld eit sitat",
+  "status.context.loading": "Lastar fleire svar",
+  "status.context.loading_error": "Kunne ikkje lasta nye svar",
+  "status.context.loading_success": "Alle svara er lasta",
+  "status.context.more_replies_found": "Fann fleire svar",
+  "status.context.retry": "Prøv om att",
+  "status.context.show": "Vis",
   "status.continued_thread": "Framhald til tråden",
   "status.copy": "Kopier lenke til status",
   "status.delete": "Slett",
+  "status.delete.success": "Innlegget er sletta",
   "status.detailed_status": "Detaljert samtalevisning",
   "status.direct": "Nevn @{name} privat",
   "status.direct_indicator": "Privat omtale",
@@ -872,27 +905,43 @@
   "status.mute_conversation": "Demp samtale",
   "status.open": "Utvid denne statusen",
   "status.pin": "Fest på profil",
+  "status.quote": "Siter",
+  "status.quote.cancel": "Avbryt siteringa",
   "status.quote_error.filtered": "Gøymt på grunn av eitt av filtra dine",
-  "status.quote_error.not_found": "Du kan ikkje visa dette innlegget.",
-  "status.quote_error.pending_approval": "Dette innlegget ventar på at skribenten skal godkjenna det.",
-  "status.quote_error.rejected": "Du kan ikkje visa dette innlegget fordi skribenten ikkje vil at det skal siterast.",
-  "status.quote_error.removed": "Skribenten sletta dette innlegget.",
-  "status.quote_error.unauthorized": "Du kan ikkje visa dette innlegget fordi du ikkje har løyve til det.",
-  "status.quote_post_author": "Innlegg av {name}",
+  "status.quote_error.limited_account_hint.action": "Vis likevel",
+  "status.quote_error.limited_account_hint.title": "Denne kontoen har vorte skjult av moderatorane på {domain}.",
+  "status.quote_error.not_available": "Innlegget er ikkje tilgjengeleg",
+  "status.quote_error.pending_approval": "Innlegget ventar",
+  "status.quote_error.pending_approval_popout.body": "På Mastodon kan du kontrollera om folk får sitera deg. Innlegget ditt ventar medan me ventar på at opphavspersonen godkjenner det.",
+  "status.quote_error.revoked": "Innlegget er sletta av skribenten",
+  "status.quote_followers_only": "Berre fylgjarar kan sitera dette innlegget",
+  "status.quote_manual_review": "Skribenten ser gjennom manuelt",
+  "status.quote_noun": "Sitat",
+  "status.quote_policy_change": "Byt kven som kan sitera",
+  "status.quote_post_author": "Siterte eit innlegg av @{name}",
+  "status.quote_private": "Du kan ikkje sitera private innlegg",
+  "status.quotes": "{count, plural, one {sitat} other {sitat}}",
+  "status.quotes.empty": "Ingen har sitert dette innlegget enno. Når nokon gje det, vil det dukka opp her.",
+  "status.quotes.local_other_disclaimer": "Sitat som skribenten avviser, vil ikkje syna.",
+  "status.quotes.remote_other_disclaimer": "Berre sitat frå {domain} er garanterte å syna her. Sitat som skribenten har avvist, vil ikkje syna.",
   "status.read_more": "Les meir",
   "status.reblog": "Framhev",
-  "status.reblog_private": "Framhev til dei originale mottakarane",
+  "status.reblog_or_quote": "Framhev eller siter",
+  "status.reblog_private": "Del på nytt med fylgjarane dine",
   "status.reblogged_by": "{name} framheva",
   "status.reblogs": "{count, plural, one {framheving} other {framhevingar}}",
   "status.reblogs.empty": "Ingen har framheva dette tutet enno. Om nokon gjer, så dukkar det opp her.",
   "status.redraft": "Slett & skriv på nytt",
   "status.remove_bookmark": "Fjern bokmerke",
   "status.remove_favourite": "Fjern frå favorittar",
+  "status.remove_quote": "Fjern",
   "status.replied_in_thread": "Svara i tråden",
   "status.replied_to": "Svarte {name}",
   "status.reply": "Svar",
   "status.replyAll": "Svar til tråd",
   "status.report": "Rapporter @{name}",
+  "status.request_quote": "Spørsmål om å sitera",
+  "status.revoke_quote": "Fjern innlegget mitt frå @{name} sitt innlegg",
   "status.sensitive_warning": "Ømtolig innhald",
   "status.share": "Del",
   "status.show_less_all": "Vis mindre for alle",
@@ -930,6 +979,7 @@
   "upload_button.label": "Legg til medium",
   "upload_error.limit": "Du har gått over opplastingsgrensa.",
   "upload_error.poll": "Filopplasting er ikkje lov for rundspørjingar.",
+  "upload_error.quote": "Filopplasting er ikkje lov med sitat.",
   "upload_form.drag_and_drop.instructions": "For å plukka opp eit medievedlegg, trykkjer du på mellomrom eller enter. Når du dreg, brukar du piltastane for å flytta vedlegget i den retninga du vil. Deretter trykkjer du mellomrom eller enter att for å sleppa vedlegget på den nye plassen, eller trykk escape for å avbryta.",
   "upload_form.drag_and_drop.on_drag_cancel": "Du avbraut draginga. Medievedlegget {item} vart sleppt.",
   "upload_form.drag_and_drop.on_drag_end": "Medeivedlegget {item} vart sleppt.",
@@ -952,5 +1002,19 @@
   "video.skip_forward": "Hopp framover",
   "video.unmute": "Opphev demping",
   "video.volume_down": "Volum ned",
-  "video.volume_up": "Volum opp"
+  "video.volume_up": "Volum opp",
+  "visibility_modal.button_title": "Vel vising",
+  "visibility_modal.header": "Vising og samhandling",
+  "visibility_modal.helper.direct_quoting": "Private omtalar som er skrivne på Mastodon kan ikkje siterast av andre.",
+  "visibility_modal.helper.privacy_editing": "Du kan ikkje endra korleis eit innlegg viser når du har lagt det ut.",
+  "visibility_modal.helper.privacy_private_self_quote": "Du kan ikkje offentleggjera sjølvsitat av private innlegg.",
+  "visibility_modal.helper.private_quoting": "Innlegg som er skrivne på Mastodon og berre for fylgjarar kan ikkje siterast av andre.",
+  "visibility_modal.helper.unlisted_quoting": "Når folk siterer deg, vil innlegget deira ikkje syna på populære tidsliner.",
+  "visibility_modal.instructions": "Styr kven som kan samhandla med dette innlegget. Du kan òg bruka desse innstillingane på alle framtidige innlegg ved å gå til <link>Innstillingar > Standard for innlegg</link>.",
+  "visibility_modal.privacy_label": "Vising",
+  "visibility_modal.quote_followers": "Berre fylgjarar",
+  "visibility_modal.quote_label": "Kven kan sitera",
+  "visibility_modal.quote_nobody": "Berre eg",
+  "visibility_modal.quote_public": "Allle",
+  "visibility_modal.save": "Lagre"
 }
diff --git a/app/javascript/mastodon/locales/no.json b/app/javascript/mastodon/locales/no.json
index ca7c43e1e92..2ef8a7085a6 100644
--- a/app/javascript/mastodon/locales/no.json
+++ b/app/javascript/mastodon/locales/no.json
@@ -70,7 +70,6 @@
   "account.posts_with_replies": "Innlegg med svar",
   "account.remove_from_followers": "Fjern {name} fra følgere",
   "account.report": "Rapporter @{name}",
-  "account.requested": "Venter på godkjennelse. Klikk for å avbryte forespørselen",
   "account.requested_follow": "{name} har bedt om å få følge deg",
   "account.requests_to_follow_you": "Forespørsler om å følge deg",
   "account.share": "Del @{name} sin profil",
@@ -239,8 +238,6 @@
   "confirmations.remove_from_followers.message": "{name} vil ikke lenger følge deg. Er du sikker på at du vil fortsette?",
   "confirmations.remove_from_followers.title": "Fjern følger?",
   "confirmations.unfollow.confirm": "Slutt å følge",
-  "confirmations.unfollow.message": "Er du sikker på at du vil slutte å følge {name}?",
-  "confirmations.unfollow.title": "Slutt å følge bruker?",
   "content_warning.hide": "Skjul innlegg",
   "content_warning.show": "Vis likevel",
   "content_warning.show_more": "Vis mer",
@@ -417,8 +414,6 @@
   "hints.profiles.see_more_followers": "Se flere følgere på {domain}",
   "hints.profiles.see_more_follows": "Se flere som følger på {domain}",
   "hints.profiles.see_more_posts": "Se flere innlegg på {domain}",
-  "hints.threads.replies_may_be_missing": "Svar fra andre servere mangler kanskje.",
-  "hints.threads.see_more": "Se flere svar på {domain}",
   "home.column_settings.show_quotes": "Vis sitater",
   "home.column_settings.show_reblogs": "Vis fremhevinger",
   "home.column_settings.show_replies": "Vis svar",
@@ -440,20 +435,10 @@
   "ignore_notifications_modal.private_mentions_title": "Overse varsler fra uoppfordrede private omtaler?",
   "info_button.label": "Hjelp",
   "info_button.what_is_alt_text": "<h1>Hva er alternativ tekst?</h1> <p>Alternativ tekst gir en bildebeskrivelse til folk med nedsatt syn, lav båndbredde eller de som vil ha mer kontekst.</p> <p>Du kan forbedre tilgjengeligheten og forståelsen for alle ved å skive en tydelig, konsis og objektiv alternativ tekst.</p> <ul> <li>Få med deg viktige elementer</li> <li>Summér tekst i bilder</li> <li>Bruk vanlige setningsstrukturer</li> <li>Unngå overflødig informasjon</li> <li>Fokuser på trender og viktige funn i komplekse grafiske fremstillinger (som diagram og kart)</li> </ul>",
-  "interaction_modal.action.favourite": "Favoriser fra din konto for å fortsette.",
-  "interaction_modal.action.follow": "Følg fra din konto for å fortsette.",
-  "interaction_modal.action.reblog": "Du må framheve fra kontoen din for å fortsette.",
-  "interaction_modal.action.reply": "Svar fra kontoen din for å fortsette.",
-  "interaction_modal.action.vote": "Stem fra kontoen din for å fortsette.",
   "interaction_modal.go": "Gå",
   "interaction_modal.no_account_yet": "Har du ikke en konto ennå?",
   "interaction_modal.on_another_server": "På en annen server",
   "interaction_modal.on_this_server": "På denne serveren",
-  "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",
-  "interaction_modal.title.vote": "Stem på {name}s avstemning",
   "interaction_modal.username_prompt": "For eksempel {example}",
   "intervals.full.days": "{number, plural,one {# dag} other {# dager}}",
   "intervals.full.hours": "{number, plural, one {# time} other {# timer}}",
@@ -709,7 +694,6 @@
   "privacy.private.short": "Følgere",
   "privacy.public.long": "Alle på og utenfor Mastodon",
   "privacy.public.short": "Offentlig",
-  "privacy.unlisted.long": "Færre algoritmiske fanfarer",
   "privacy.unlisted.short": "Stille offentlig",
   "privacy_policy.last_updated": "Sist oppdatert {date}",
   "privacy_policy.title": "Personvernregler",
@@ -841,12 +825,8 @@
   "status.open": "Utvid dette innlegget",
   "status.pin": "Fest på profilen",
   "status.quote_error.filtered": "Skjult på grunn av et av filterne dine",
-  "status.quote_error.not_found": "Dette innlegget kan ikke vises.",
-  "status.quote_error.pending_approval": "Dette innlegget venter på godkjenning fra den opprinnelige forfatteren.",
-  "status.quote_error.rejected": "Dette innlegget kan ikke vises fordi den opprinnelige forfatteren ikke har tillatt at det blir sitert.",
   "status.read_more": "Les mer",
   "status.reblog": "Fremhev",
-  "status.reblog_private": "Fremhev til det opprinnelige publikummet",
   "status.reblogged_by": "Fremhevet av {name}",
   "status.reblogs.empty": "Ingen har fremhevet dette innlegget enda. Når noen gjør det, vil de dukke opp her.",
   "status.redraft": "Slett og skriv på nytt",
diff --git a/app/javascript/mastodon/locales/oc.json b/app/javascript/mastodon/locales/oc.json
index 9267ca69efc..cdd109a7153 100644
--- a/app/javascript/mastodon/locales/oc.json
+++ b/app/javascript/mastodon/locales/oc.json
@@ -50,7 +50,6 @@
   "account.posts": "Tuts",
   "account.posts_with_replies": "Tuts e responsas",
   "account.report": "Senhalar @{name}",
-  "account.requested": "Invitacion mandada. Clicatz per anullar",
   "account.requested_follow": "{name} a demandat a vos sègre",
   "account.share": "Partejar lo perfil a @{name}",
   "account.show_reblogs": "Mostrar los partatges de @{name}",
@@ -153,7 +152,6 @@
   "confirmations.mute.confirm": "Rescondre",
   "confirmations.redraft.confirm": "Escafar & tornar formular",
   "confirmations.unfollow.confirm": "Quitar de sègre",
-  "confirmations.unfollow.message": "Volètz vertadièrament quitar de sègre {name} ?",
   "conversation.delete": "Suprimir la conversacion",
   "conversation.mark_as_read": "Marcar coma legida",
   "conversation.open": "Veire la conversacion",
@@ -257,9 +255,6 @@
   "home.show_announcements": "Mostrar las anóncias",
   "interaction_modal.on_another_server": "Sus un autre servidor",
   "interaction_modal.on_this_server": "Sus aqueste servidor",
-  "interaction_modal.title.follow": "Sègre {name}",
-  "interaction_modal.title.reblog": "Partejar la publicacion de {name}",
-  "interaction_modal.title.reply": "Respondre a la publicacion de {name}",
   "intervals.full.days": "{number, plural, one {# jorn} other {# jorns}}",
   "intervals.full.hours": "{number, plural, one {# ora} other {# oras}}",
   "intervals.full.minutes": "{number, plural, one {# minuta} other {# minutas}}",
@@ -482,7 +477,6 @@
   "status.pin": "Penjar al perfil",
   "status.read_more": "Ne legir mai",
   "status.reblog": "Partejar",
-  "status.reblog_private": "Partejar a l’audiéncia d’origina",
   "status.reblogged_by": "{name} a partejat",
   "status.reblogs.empty": "Degun a pas encara partejat aqueste tut. Quand qualqu’un o farà, apareisserà aquí.",
   "status.redraft": "Escafar e tornar formular",
diff --git a/app/javascript/mastodon/locales/pa.json b/app/javascript/mastodon/locales/pa.json
index 8ab4eb22527..760dff557fb 100644
--- a/app/javascript/mastodon/locales/pa.json
+++ b/app/javascript/mastodon/locales/pa.json
@@ -1,8 +1,12 @@
 {
   "about.contact": "ਸੰਪਰਕ:",
+  "about.default_locale": "ਮੂਲ",
+  "about.disclaimer": "ਮਸਟੋਡੋਨ ਇੱਕ ਆਜ਼ਾਦ, ਖੁੱਲ੍ਹੇ ਸਰੋਤ ਵਾਲਾ ਸਾਫਟਵੇਅਰ ਹੈ ਅਤੇ Mastodon gGmbH ਦਾ ਮਾਰਕਾ ਹੈ।",
   "about.domain_blocks.no_reason_available": "ਕਾਰਨ ਮੌਜੂਦ ਨਹੀਂ ਹੈ",
   "about.domain_blocks.silenced.title": "ਸੀਮਿਤ",
-  "about.domain_blocks.suspended.title": "ਮੁਅੱਤਲ ਕੀਤੀ",
+  "about.domain_blocks.suspended.title": "ਸਸਪੈਂਡ ਕੀਤਾ",
+  "about.language_label": "ਭਾਸ਼ਾ",
+  "about.not_available": "ਇਹ ਜਾਣਕਾਰੀ ਨੂੰ ਇਸ ਸਰਵਰ ਉੱਤੇ ਉਪਲੱਬਧ ਨਹੀਂ ਕੀਤਾ ਗਿਆ ਹੈ।",
   "about.rules": "ਸਰਵਰ ਨਿਯਮ",
   "account.account_note_header": "ਨਿੱਜੀ ਨੋਟ",
   "account.add_or_remove_from_list": "ਸੂਚੀ ਵਿੱਚ ਜੋੜੋ ਜਾਂ ਹਟਾਓ",
@@ -12,21 +16,33 @@
   "account.block_domain": "{domain} ਡੋਮੇਨ ਉੱਤੇ ਪਾਬੰਦੀ ਲਾਓ",
   "account.block_short": "ਪਾਬੰਦੀ",
   "account.blocked": "ਪਾਬੰਦੀਸ਼ੁਦਾ",
+  "account.blocking": "ਪਾਬੰਦੀ ਲਾਉਣੀ",
   "account.cancel_follow_request": "ਫ਼ਾਲੋ ਕਰਨ ਨੂੰ ਰੱਦ ਕਰੋ",
   "account.copy": "ਪਰੋਫਾਇਲ ਲਈ ਲਿੰਕ ਕਾਪੀ ਕਰੋ",
   "account.direct": "ਨਿੱਜੀ ਜ਼ਿਕਰ @{name}",
+  "account.disable_notifications": "ਜਦੋਂ {name} ਕੋਈ ਪੋਸਟ ਕਰੇ ਤਾਂ ਮੈਨੂੰ ਸੂਚਨਾ ਨਾ ਦਿਓ",
+  "account.domain_blocking": "ਡੋਮੇਨ ਉੱਤੇ ਪਾਬੰਦੀ",
   "account.edit_profile": "ਪਰੋਫਾਈਲ ਨੂੰ ਸੋਧੋ",
   "account.enable_notifications": "ਜਦੋਂ {name} ਪੋਸਟ ਕਰੇ ਤਾਂ ਮੈਨੂੰ ਸੂਚਨਾ ਦਿਓ",
   "account.endorse": "ਪਰੋਫਾਇਲ ਉੱਤੇ ਫ਼ੀਚਰ",
+  "account.familiar_followers_one": "{name1} ਵਲੋਂ ਫ਼ਾਲੋ ਕੀਤਾ",
+  "account.familiar_followers_two": "{name1} ਅਤੇ {name2} ਵਲੋਂ ਫ਼ਾਲੋ ਕੀਤਾ",
+  "account.featured": "ਫ਼ੀਚਰ",
+  "account.featured.accounts": "ਪਰੋਫਾਈਲ",
+  "account.featured.hashtags": "ਹੈਸ਼ਟੈਗ",
   "account.featured_tags.last_status_at": "{date} ਨੂੰ ਆਖਰੀ ਪੋਸਟ",
   "account.featured_tags.last_status_never": "ਕੋਈ ਪੋਸਟ ਨਹੀਂ",
   "account.follow": "ਫ਼ਾਲੋ",
   "account.follow_back": "ਵਾਪਸ ਫਾਲ਼ੋ ਕਰੋ",
   "account.followers": "ਫ਼ਾਲੋਅਰ",
   "account.followers.empty": "ਇਸ ਵਰਤੋਂਕਾਰ ਨੂੰ ਹਾਲੇ ਕੋਈ ਫ਼ਾਲੋ ਨਹੀਂ ਕਰਦਾ ਹੈ।",
+  "account.followers_counter": "{count, plural, one {{counter} ਫ਼ਾਲੋਅਰ} other {{counter} ਫ਼ਾਲੋਅਰ}}",
+  "account.followers_you_know_counter": "{counter} ਤੁਸੀਂ ਜਾਣਦੇ ਹੋ",
   "account.following": "ਫ਼ਾਲੋ ਕੀਤਾ",
   "account.follows.empty": "ਇਹ ਵਰਤੋਂਕਾਰ ਹਾਲੇ ਕਿਸੇ ਨੂੰ ਫ਼ਾਲੋ ਨਹੀਂ ਕਰਦਾ ਹੈ।",
+  "account.follows_you": "ਤੁਹਾਨੂੰ ਫ਼ਾਲੋ ਕਰਦੇ ਹਨ",
   "account.go_to_profile": "ਪਰੋਫਾਇਲ ਉੱਤੇ ਜਾਓ",
+  "account.hide_reblogs": "{name} ਵਲੋਂ ਬੂਸਟ ਨੂੰ ਲੁਕਾਓ",
   "account.joined_short": "ਜੁਆਇਨ ਕੀਤਾ",
   "account.media": "ਮੀਡੀਆ",
   "account.mention": "@{name} ਦਾ ਜ਼ਿਕਰ",
@@ -34,16 +50,18 @@
   "account.mute_notifications_short": "ਨੋਟਫਿਕੇਸ਼ਨਾਂ ਨੂੰ ਮੌਨ ਕਰੋ",
   "account.mute_short": "ਮੌਨ ਕਰੋ",
   "account.muted": "ਮੌਨ ਕੀਤੀਆਂ",
+  "account.mutual": "ਤੁਸੀਂ ਇੱਕ ਦੂਜੇ ਨੂੰ ਫ਼ਾਲੋ ਕਰਦੇ ਹੋ",
   "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.statuses_counter": "{count, plural, one {{counter} ਪੋਸਟ} other {{counter} ਪੋਸਟਾਂ}}",
   "account.unblock": "@{name} ਤੋਂ ਪਾਬੰਦੀ ਹਟਾਓ",
   "account.unblock_domain": "{domain} ਡੋਮੇਨ ਤੋਂ ਪਾਬੰਦੀ ਹਟਾਓ",
+  "account.unblock_domain_short": "ਪਾਬੰਦੀ ਹਟਾਓ",
   "account.unblock_short": "ਪਾਬੰਦੀ ਹਟਾਓ",
   "account.unendorse": "ਪਰੋਫਾਇਲ ਉੱਤੇ ਫ਼ੀਚਰ ਨਾ ਕਰੋ",
   "account.unfollow": "ਅਣ-ਫ਼ਾਲੋ",
@@ -148,9 +166,9 @@
   "confirmations.missing_alt_text.secondary": "ਕਿਵੇਂ ਵੀ ਪੋਸਟ ਕਰੋ",
   "confirmations.mute.confirm": "ਮੌਨ ਕਰੋ",
   "confirmations.redraft.confirm": "ਹਟਾਓ ਤੇ ਮੁੜ-ਡਰਾਫਟ",
+  "confirmations.remove_from_followers.confirm": "ਫ਼ਾਲੋਅਰ ਨੂੰ ਹਟਾਓ",
+  "confirmations.remove_from_followers.title": "ਫ਼ਾਲੋਅਰ ਨੂੰ ਹਟਾਉਣਾ ਹੈ?",
   "confirmations.unfollow.confirm": "ਅਣ-ਫ਼ਾਲੋ",
-  "confirmations.unfollow.message": "ਕੀ ਤੁਸੀਂ {name} ਨੂੰ ਅਣ-ਫ਼ਾਲੋ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?",
-  "confirmations.unfollow.title": "ਵਰਤੋਂਕਾਰ ਨੂੰ ਅਣ-ਫ਼ਾਲੋ ਕਰਨਾ ਹੈ?",
   "content_warning.hide": "ਪੋਸਟ ਨੂੰ ਲੁਕਾਓ",
   "content_warning.show": "ਕਿਵੇਂ ਵੀ ਵੇਖਾਓ",
   "content_warning.show_more": "ਹੋਰ ਵੇਖਾਓ",
@@ -182,7 +200,9 @@
   "emoji_button.custom": "ਕਸਟਮ",
   "emoji_button.flags": "ਝੰਡੀਆਂ",
   "emoji_button.food": "ਖਾਣਾ-ਪੀਣਾ",
+  "emoji_button.label": "ਇਮੋਜੀ ਪਾਓ",
   "emoji_button.nature": "ਕੁਦਰਤ",
+  "emoji_button.not_found": "ਕੋਈ ਮਿਲਦਾ ਇਮੋਜ਼ੀ ਨਹੀਂ ਲੱਭਿਆ",
   "emoji_button.objects": "ਇਕਾਈ",
   "emoji_button.people": "ਲੋਕ",
   "emoji_button.recent": "ਅਕਸਰ ਵਰਤੇ",
@@ -199,9 +219,15 @@
   "empty_column.list": "ਇਸ ਸੂਚੀ ਵਿੱਚ ਹਾਲੇ ਕੁਝ ਵੀ ਨਹੀਂ ਹੈ। ਜਦੋਂ ਇਸ ਸੂਚੀ ਦੇ ਮੈਂਬਰ ਨਵੀਆਂ ਪੋਸਟਾਂ ਪਾਉਂਦੇ ਹਨ ਤਾਂ ਉਹ ਇੱਥੇ ਦਿਖਾਈ ਦੇਣਗੀਆਂ।",
   "errors.unexpected_crash.report_issue": "ਮੁੱਦੇ ਦੀ ਰਿਪੋਰਟ ਕਰੋ",
   "explore.suggested_follows": "ਲੋਕ",
+  "explore.title": "ਰੁਝਾਨ",
   "explore.trending_links": "ਖ਼ਬਰਾਂ",
   "explore.trending_statuses": "ਪੋਸਟਾਂ",
   "explore.trending_tags": "ਹੈਸ਼ਟੈਗ",
+  "featured_carousel.header": "{count, plural, one {ਟੰਗੀ ਹੋਈ ਪੋਸਟ} other {ਟੰਗੀਆਂ ਹੋਈਆਂ ਪੋਸਟਾਂ}}",
+  "featured_carousel.next": "ਅੱਗੇ",
+  "featured_carousel.post": "ਪੋਸਟ",
+  "featured_carousel.previous": "ਪਿੱਛੇ",
+  "featured_carousel.slide": "{total} ਵਿੱਚੋਂ {index}",
   "filter_modal.added.expired_title": "ਫਿਲਟਰ ਦੀ ਮਿਆਦ ਪੁੱਗੀ!",
   "filter_modal.added.review_and_configure_title": "ਫਿਲਟਰ ਸੈਟਿੰਗਾਂ",
   "filter_modal.added.settings_link": "ਸੈਟਿੰਗਾਂ ਸਫ਼ਾ",
@@ -247,22 +273,18 @@
   "hints.profiles.see_more_followers": "{domain} ਉੱਤੇ ਹੋਰ ਫ਼ਾਲੋਅਰ ਵੇਖੋ",
   "hints.profiles.see_more_follows": "{domain} ਉੱਤੇ ਹੋਰ ਫ਼ਾਲੋ ਨੂੰ ਵੇਖੋ",
   "hints.profiles.see_more_posts": "{domain} ਉੱਤੇ ਹੋਰ ਪੋਸਟਾਂ ਨੂੰ ਵੇਖੋ",
-  "hints.threads.see_more": "{domain} ਤੋਂ ਹੋਰ ਜਵਾਬਾਂ ਨੂੰ ਵੇਖੋ",
   "home.column_settings.show_reblogs": "ਬੂਸਟਾਂ ਨੂੰ ਵੇਖੋ",
   "home.column_settings.show_replies": "ਜਵਾਬਾਂ ਨੂੰ ਵੇਖੋ",
   "home.hide_announcements": "ਐਲਾਨਾਂ ਨੂੰ ਓਹਲੇ ਕਰੋ",
   "home.pending_critical_update.link": "ਅੱਪਡੇਟ ਵੇਖੋ",
+  "home.pending_critical_update.title": "ਗੰਭੀਰ ਸੁਰੱਖਿਆ ਅੱਪਡੇਟ ਮੌਜੂਦ ਹੈ!",
+  "home.show_announcements": "ਐਲਾਨਾਂ ਨੂੰ ਵੇਖਾਓ",
   "ignore_notifications_modal.ignore": "ਨੋਟਫਿਕੇਸ਼ਨਾਂ ਨੂੰ ਅਣਡਿੱਠਾ ਕਰੋ",
   "info_button.label": "ਮਦਦ",
   "interaction_modal.go": "ਜਾਓ",
   "interaction_modal.no_account_yet": "ਹਾਲੇ ਖਾਤਾ ਨਹੀਂ ਹੈ?",
   "interaction_modal.on_another_server": "ਵੱਖਰੇ ਸਰਵਰ ਉੱਤੇ",
   "interaction_modal.on_this_server": "ਇਸ ਸਰਵਰ ਉੱਤੇ",
-  "interaction_modal.title.favourite": "{name} ਦੀ ਪੋਸਟ ਨੂੰ ਪਸੰਦ ਕਰੋ",
-  "interaction_modal.title.follow": "{name} ਨੂੰ ਫ਼ਾਲੋ ਕਰੋ",
-  "interaction_modal.title.reblog": "{name} ਦੀ ਪੋਸਟ ਨੂੰ ਬੂਸਟ ਕਰੋ",
-  "interaction_modal.title.reply": "{name} ਦੀ ਪੋਸਟ ਦਾ ਜਵਾਬ ਦਿਓ",
-  "interaction_modal.title.vote": "{name} ਦੀ ਚੋਣ ਵਾਸਤੇ ਵੋਟ ਪਾਓ",
   "interaction_modal.username_prompt": "ਜਿਵੇਂ {example}",
   "intervals.full.days": "{number, plural, one {# ਦਿਨ} other {# ਦਿਨ}}",
   "intervals.full.hours": "{number, plural, one {# ਘੰਟਾ} other {# ਘੰਟੇ}}",
@@ -332,9 +354,12 @@
   "media_gallery.hide": "ਲੁਕਾਓ",
   "mute_modal.hide_from_notifications": "ਨੋਟੀਫਿਕੇਸ਼ਨਾਂ ਵਿੱਚੋਂ ਲੁਕਾਓ",
   "mute_modal.show_options": "ਚੋਣਾਂ ਨੂੰ ਵੇਖਾਓ",
+  "mute_modal.title": "ਵਰਤੋਂਕਾਰ ਨੂੰ ਮੌਨ ਕਰਨਾ ਹੈ?",
   "navigation_bar.about": "ਇਸ ਬਾਰੇ",
+  "navigation_bar.account_settings": "ਪਾਸਵਰਡ ਅਤੇ ਸੁਰੱਖਿਆ",
   "navigation_bar.administration": "ਪਰਸ਼ਾਸ਼ਨ",
   "navigation_bar.advanced_interface": "ਤਕਨੀਕੀ ਵੈੱਬ ਇੰਟਰਫੇਸ ਵਿੱਚ ਖੋਲ੍ਹੋ",
+  "navigation_bar.automated_deletion": "ਆਪਣੇ-ਆਪ ਹਟਾਈ ਪੋਸਟ",
   "navigation_bar.blocks": "ਪਾਬੰਦੀ ਲਾਏ ਵਰਤੋਂਕਾਰ",
   "navigation_bar.bookmarks": "ਬੁੱਕਮਾਰਕ",
   "navigation_bar.direct": "ਨਿੱਜੀ ਜ਼ਿਕਰ",
@@ -346,11 +371,16 @@
   "navigation_bar.follows_and_followers": "ਫ਼ਾਲੋ ਅਤੇ ਫ਼ਾਲੋ ਕਰਨ ਵਾਲੇ",
   "navigation_bar.lists": "ਸੂਚੀਆਂ",
   "navigation_bar.logout": "ਲਾਗ ਆਉਟ",
+  "navigation_bar.more": "ਹੋਰ",
   "navigation_bar.mutes": "ਮੌਨ ਕੀਤੇ ਵਰਤੋਂਕਾਰ",
   "navigation_bar.preferences": "ਪਸੰਦਾਂ",
+  "navigation_bar.privacy_and_reach": "ਪਰਦੇਦਾਰੀ ਅਤੇ ਪਹੁੰਚ",
   "navigation_bar.search": "ਖੋਜੋ",
+  "navigation_bar.search_trends": "ਖੋਜ / ਰੁਝਾਨ",
   "not_signed_in_indicator.not_signed_in": "ਇਹ ਸਰੋਤ ਵਰਤਣ ਲਈ ਤੁਹਾਨੂੰ ਲਾਗਇਨ ਕਰਨ ਦੀ ਲੋੜ ਹੈ।",
   "notification.admin.sign_up": "{name} ਨੇ ਸਾਈਨ ਅੱਪ ਕੀਤਾ",
+  "notification.favourite": "{name} ਨੇ ਤੁਹਾਡੀ ਪੋਸਟ ਨੂੰ ਪਸੰਦ ਕੀਤਾ",
+  "notification.favourite_pm": "{name} ਨੇ ਤੁਹਾਡੇ ਨਿੱਜੀ ਜ਼ਿਕਰ ਨੂੰ ਪਸੰਦ ਕੀਤਾ",
   "notification.follow": "{name} ਨੇ ਤੁਹਾਨੂੰ ਫ਼ਾਲੋ ਕੀਤਾ",
   "notification.follow.name_and_others": "{name} ਅਤੇ <a>{count, plural, one {# ਹੋਰ} other {# ਹੋਰਾਂ}}</a> ਨੇ ਤੁਹਾਨੂੰ ਫ਼ਾਲੋ ਕੀਤਾ",
   "notification.follow_request": "{name} ਨੇ ਤੁਹਾਨੂੰ ਫ਼ਾਲੋ ਕਰਨ ਦੀ ਬੇਨਤੀ ਕੀਤੀ ਹੈ",
@@ -365,6 +395,7 @@
   "notification.moderation_warning.action_silence": "ਤੁਹਾਡੇ ਖਾਤੇ ਨੂੰ ਸੀਮਿਤ ਕੀਤਾ ਗਿਆ ਹੈ।",
   "notification.moderation_warning.action_suspend": "ਤੁਹਾਡੇ ਖਾਤੇ ਨੂੰ ਮੁਅੱਤਲ ਕੀਤਾ ਗਿਆ ਹੈ।",
   "notification.reblog": "{name} boosted your status",
+  "notification.relationships_severance_event": "{name} ਨਾਲ ਕਨੈਕਸ਼ਨ ਗੁਆਚੇ",
   "notification.relationships_severance_event.learn_more": "ਹੋਰ ਜਾਣੋ",
   "notification.status": "{name} ਨੇ ਹੁਣੇ ਪੋਸਟ ਕੀਤਾ",
   "notification.update": "{name} ਨੋ ਪੋਸਟ ਨੂੰ ਸੋਧਿਆ",
@@ -540,7 +571,10 @@
   "status.unpin": "ਪਰੋਫਾਈਲ ਤੋਂ ਲਾਹੋ",
   "subscribed_languages.save": "ਤਬਦੀਲੀਆਂ ਸੰਭਾਲੋ",
   "tabs_bar.home": "ਘਰ",
+  "tabs_bar.menu": "ਮੇਨੂ",
   "tabs_bar.notifications": "ਸੂਚਨਾਵਾਂ",
+  "tabs_bar.publish": "ਨਵੀਂ ਪੋਸਟ",
+  "tabs_bar.search": "ਖੋਜੋ",
   "terms_of_service.title": "ਸੇਵਾ ਦੀਆਂ ਸ਼ਰਤਾਂ",
   "time_remaining.days": "{number, plural, one {# ਦਿਨ} other {# ਦਿਨ}} ਬਾਕੀ",
   "time_remaining.hours": "{number, plural, one {# ਘੰਟਾ} other {# ਘੰਟੇ}} ਬਾਕੀ",
@@ -561,6 +595,9 @@
   "video.expand": "ਵੀਡੀਓ ਨੂੰ ਫੈਲਾਓ",
   "video.fullscreen": "ਪੂਰੀ ਸਕਰੀਨ",
   "video.hide": "ਵੀਡੀਓ ਨੂੰ ਲੁਕਾਓ",
+  "video.mute": "ਮੌਨ",
   "video.pause": "ਠਹਿਰੋ",
-  "video.play": "ਚਲਾਓ"
+  "video.play": "ਚਲਾਓ",
+  "video.volume_down": "ਅਵਾਜ਼ ਘਟਾਓ",
+  "video.volume_up": "ਅਵਾਜ਼ ਵਧਾਓ"
 }
diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json
index 1967a2333c0..d121bea1ae1 100644
--- a/app/javascript/mastodon/locales/pl.json
+++ b/app/javascript/mastodon/locales/pl.json
@@ -1,6 +1,7 @@
 {
   "about.blocks": "Serwery moderowane",
   "about.contact": "Kontakt:",
+  "about.default_locale": "Domyślny",
   "about.disclaimer": "Mastodon jest darmowym, otwartym oprogramowaniem i znakiem towarowym Mastodon gGmbH.",
   "about.domain_blocks.no_reason_available": "Powód niedostępny",
   "about.domain_blocks.preamble": "Domyślnie Mastodon pozwala ci przeglądać i reagować na treści od innych użytkowników z jakiegokolwiek serwera w fediwersum. Poniżej znajduje się lista wyjątków, które zostały stworzone na tym konkretnym serwerze.",
@@ -8,6 +9,7 @@
   "about.domain_blocks.silenced.title": "Ograniczone",
   "about.domain_blocks.suspended.explanation": "Żadne dane z tego serwera nie będą przetwarzane, przechowywane lub wymieniane, co uniemożliwia jakąkolwiek interakcję lub komunikację z użytkownikami z tego serwera.",
   "about.domain_blocks.suspended.title": "Zawieszono",
+  "about.language_label": "Język",
   "about.not_available": "Ta informacja nie została udostępniona na tym serwerze.",
   "about.powered_by": "Zdecentralizowane media społecznościowe napędzane przez {mastodon}",
   "about.rules": "Regulamin serwera",
@@ -19,13 +21,21 @@
   "account.block_domain": "Blokuj wszystko z {domain}",
   "account.block_short": "Zablokuj",
   "account.blocked": "Zablokowany(-a)",
+  "account.blocking": "Blokowanie",
   "account.cancel_follow_request": "Nie obserwuj",
   "account.copy": "Skopiuj link do profilu",
   "account.direct": "Napisz bezpośrednio do @{name}",
   "account.disable_notifications": "Przestań powiadamiać mnie o wpisach @{name}",
+  "account.domain_blocking": "Blokowanie domeny",
   "account.edit_profile": "Edytuj profil",
   "account.enable_notifications": "Powiadamiaj mnie o wpisach @{name}",
   "account.endorse": "Wyróżnij na profilu",
+  "account.familiar_followers_many": "Obserwowane przez: {name1}, {name2} i {othersCount, plural, one {jeszcze jedną osobę, którą znasz} few {# inne osoby, które znasz} many {# innych osób, które znasz} other {# innych osób, które znasz}}",
+  "account.familiar_followers_one": "Obserwowane przez {name1}",
+  "account.familiar_followers_two": "Obserwowane przez {name1} i {name2}",
+  "account.featured": "Wyróżnione",
+  "account.featured.accounts": "Profile",
+  "account.featured.hashtags": "Tagi",
   "account.featured_tags.last_status_at": "Ostatni post {date}",
   "account.featured_tags.last_status_never": "Brak postów",
   "account.follow": "Obserwuj",
@@ -33,9 +43,11 @@
   "account.followers": "Obserwujący",
   "account.followers.empty": "Nikt jeszcze nie obserwuje tego użytkownika.",
   "account.followers_counter": "{count, plural, one {{counter} obserwujący} few {{counter} obserwujących} many {{counter} obserwujących} other {{counter} obserwujących}}",
+  "account.followers_you_know_counter": "{counter} które znasz",
   "account.following": "Obserwowani",
   "account.following_counter": "{count, plural, one {{counter} obserwowany} few {{counter} obserwowanych} many {{counter} obserwowanych} other {{counter} obserwowanych}}",
   "account.follows.empty": "Ten użytkownik nie obserwuje jeszcze nikogo.",
+  "account.follows_you": "Obserwuje cię",
   "account.go_to_profile": "Przejdź do profilu",
   "account.hide_reblogs": "Ukryj podbicia od @{name}",
   "account.in_memoriam": "Ku pamięci.",
@@ -50,18 +62,22 @@
   "account.mute_notifications_short": "Wycisz powiadomienia",
   "account.mute_short": "Wycisz",
   "account.muted": "Wyciszony",
+  "account.muting": "Wyciszenie",
+  "account.mutual": "Obserwujecie siebie nazwajem",
   "account.no_bio": "Brak opisu.",
   "account.open_original_page": "Otwórz stronę oryginalną",
   "account.posts": "Wpisy",
   "account.posts_with_replies": "Wpisy i odpowiedzi",
+  "account.remove_from_followers": "Usuń {name} z obserwujących",
   "account.report": "Zgłoś @{name}",
-  "account.requested": "Oczekująca prośba, kliknij aby anulować",
   "account.requested_follow": "{name} chce cię zaobserwować",
+  "account.requests_to_follow_you": "Prośby o obserwowanie",
   "account.share": "Udostępnij profil @{name}",
   "account.show_reblogs": "Pokazuj podbicia od @{name}",
   "account.statuses_counter": "{count, plural, one {{counter} wpis} few {{counter} wpisy} many {{counter} wpisów} other {{counter} wpisów}}",
   "account.unblock": "Odblokuj @{name}",
   "account.unblock_domain": "Odblokuj domenę {domain}",
+  "account.unblock_domain_short": "Odblokuj",
   "account.unblock_short": "Odblokuj",
   "account.unendorse": "Nie wyświetlaj w profilu",
   "account.unfollow": "Nie obserwuj",
@@ -202,6 +218,13 @@
   "confirmations.delete_list.confirm": "Usuń",
   "confirmations.delete_list.message": "Czy na pewno chcesz trwale usunąć tę listę?",
   "confirmations.delete_list.title": "Usunąć listę?",
+  "confirmations.discard_draft.confirm": "Odrzuć i kontynuuj",
+  "confirmations.discard_draft.edit.cancel": "Wznów edytowanie",
+  "confirmations.discard_draft.edit.message": "Kontynuowanie spowoduje utratę wszystkich zmian wprowadzonych przez Ciebie w aktualnie edytowanym poście.",
+  "confirmations.discard_draft.edit.title": "Odrzucić zmiany w poście?",
+  "confirmations.discard_draft.post.cancel": "Wznów wersję roboczą",
+  "confirmations.discard_draft.post.message": "Kontynuacja odrzuci aktualnie tworzony post.",
+  "confirmations.discard_draft.post.title": "Anulować wersję roboczą?",
   "confirmations.discard_edit_media.confirm": "Odrzuć",
   "confirmations.discard_edit_media.message": "Masz niezapisane zmiany w opisie lub podglądzie, odrzucić je mimo to?",
   "confirmations.follow_to_list.confirm": "Zaobserwuj i dodaj do listy",
@@ -218,9 +241,13 @@
   "confirmations.redraft.confirm": "Usuń i popraw",
   "confirmations.redraft.message": "Czy na pewno chcesz usunąć i poprawić ten wpis? Polubienia, podbicia i komentarze pierwotnego wpisu zostaną utracone.",
   "confirmations.redraft.title": "Usunąć i poprawić wpis?",
+  "confirmations.remove_from_followers.confirm": "Usuń obserwującego",
+  "confirmations.remove_from_followers.message": "{name} przestanie Cię obserwować. Czy na pewno chcesz kontynuować?",
+  "confirmations.remove_from_followers.title": "Usunąć obserwującego?",
+  "confirmations.revoke_quote.confirm": "Usuń post",
+  "confirmations.revoke_quote.message": "Tej akcji nie można cofnąć.",
+  "confirmations.revoke_quote.title": "Usuń post?",
   "confirmations.unfollow.confirm": "Nie obserwuj",
-  "confirmations.unfollow.message": "Czy na pewno nie chcesz obserwować {name}?",
-  "confirmations.unfollow.title": "Cofnąć obserwację?",
   "content_warning.hide": "Ukryj wpis",
   "content_warning.show": "Pokaż mimo to",
   "content_warning.show_more": "Pokaż więcej",
@@ -262,6 +289,7 @@
   "domain_pill.your_handle": "Twoja nazwa:",
   "domain_pill.your_server": "Twój cyfrowy dom wszystkich twoich wpisów. Nie podoba ci się ten serwer? Przenieś się na inny w dowolnym momencie i zabierz ze sobą swoich obserwujących.",
   "domain_pill.your_username": "Twój unikalny identyfikator na tym serwerze. Możliwe jest znalezienie osób z tą samą nazwą na innych serwerach.",
+  "dropdown.empty": "Wybierz opcję",
   "embed.instructions": "Umieść ten wpis na swojej stronie, kopiując poniższy kod.",
   "embed.preview": "Tak to będzie wyglądać:",
   "emoji_button.activity": "Aktywność",
@@ -279,6 +307,9 @@
   "emoji_button.search_results": "Wyniki wyszukiwania",
   "emoji_button.symbols": "Symbole",
   "emoji_button.travel": "Podróże i miejsca",
+  "empty_column.account_featured.me": "Niczego jeszcze nie poleciłeś. Czy wiesz, że możesz wyświetlać swoje hashtagi, z których korzystasz najbardziej, a nawet konta znajomego na swoim profilu?",
+  "empty_column.account_featured.other": "{acct} nie wyróżnił jeszcze nic. Czy wiesz, że możesz wyświetlać swoje hashtagi, z których korzystasz najbardziej, a nawet konta znajomego na swoim profilu?",
+  "empty_column.account_featured_other.unknown": "To konto nie zostało jeszcze wyróżnione.",
   "empty_column.account_hides_collections": "Ta osoba postanowiła nie udostępniać tych informacji",
   "empty_column.account_suspended": "Konto zawieszone",
   "empty_column.account_timeline": "Brak wpisów!",
@@ -307,9 +338,15 @@
   "errors.unexpected_crash.copy_stacktrace": "Skopiuj stacktrace do schowka",
   "errors.unexpected_crash.report_issue": "Zgłoś problem",
   "explore.suggested_follows": "Ludzie",
+  "explore.title": "Na czasie",
   "explore.trending_links": "Aktualności",
   "explore.trending_statuses": "Wpisy",
   "explore.trending_tags": "Hasztagi",
+  "featured_carousel.header": "{count, plural, one {Przypięty post} other {Przypięte posty}}",
+  "featured_carousel.next": "Następny",
+  "featured_carousel.post": "Opublikuj",
+  "featured_carousel.previous": "Poprzedni",
+  "featured_carousel.slide": "{index} z {total}",
   "filter_modal.added.context_mismatch_explanation": "To filtrowanie nie dotyczy kategorii, w której pojawił się ten wpis. Jeśli chcesz, aby wpis był filtrowany również w tym kontekście, musisz edytować ustawienia filtrowania.",
   "filter_modal.added.context_mismatch_title": "Niewłaściwy kontekst!",
   "filter_modal.added.expired_explanation": "Ta kategoria filtrowania wygasła, aby ją zastosować, należy zmienić datę wygaśnięcia.",
@@ -362,6 +399,8 @@
   "generic.saved": "Zapisano",
   "getting_started.heading": "Pierwsze kroki",
   "hashtag.admin_moderation": "Otwórz interfejs moderacji #{name}",
+  "hashtag.browse": "Przeglądaj posty z #{hashtag}",
+  "hashtag.browse_from_account": "Przeglądaj posty od @{name} z #{hashtag}",
   "hashtag.column_header.tag_mode.all": "i {additional}",
   "hashtag.column_header.tag_mode.any": "lub {additional}",
   "hashtag.column_header.tag_mode.none": "bez {additional}",
@@ -374,7 +413,10 @@
   "hashtag.counter_by_accounts": "{count, plural, one {{counter} osoba} few {{counter} osoby} many {{counter} osób} other {{counter} osób}}",
   "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}} dzisiaj",
+  "hashtag.feature": "Wyróżnij w profilu",
   "hashtag.follow": "Obserwuj hasztag",
+  "hashtag.mute": "Wycisz #{hashtag}",
+  "hashtag.unfeature": "Nie wyróżniaj w profilu",
   "hashtag.unfollow": "Przestań obserwować hashtag",
   "hashtags.and_other": "…i {count, plural, other {jeszcze #}}",
   "hints.profiles.followers_may_be_missing": "Niektórzy obserwujący ten profil mogą być niewidoczni.",
@@ -383,8 +425,7 @@
   "hints.profiles.see_more_followers": "Zobacz więcej obserwujących na {domain}",
   "hints.profiles.see_more_follows": "Zobacz więcej obserwowanych na {domain}",
   "hints.profiles.see_more_posts": "Zobacz więcej wpisów na {domain}",
-  "hints.threads.replies_may_be_missing": "Komentarze z innych serwerów mogą być niewidoczne.",
-  "hints.threads.see_more": "Zobacz więcej komentarzy na {domain}",
+  "home.column_settings.show_quotes": "Pokaż cytaty",
   "home.column_settings.show_reblogs": "Pokazuj podbicia",
   "home.column_settings.show_replies": "Pokazuj odpowiedzi",
   "home.hide_announcements": "Ukryj ogłoszenia",
@@ -405,20 +446,10 @@
   "ignore_notifications_modal.private_mentions_title": "Ignorować powiadomienia od niechcianych wzmianek bezpośrednich?",
   "info_button.label": "Pomoc",
   "info_button.what_is_alt_text": "<h1>Czym jest tekst alternatywny?</h1><p>Tekst alternatywny zawiera opisy zdjęć dla osób niedowidzących, korzystających z połączeń o niskiej przepustowości lub szukających dodatkowego kontekstu.</p>\n<p>Możesz poprawić dostępność i czytelność dla wszystkich, pisząc jasny, zwięzły i precyzyjny tekst alternatywny.</p>\n<ul>\n<li>Podkreśl ważne elementy</li>\n<li>Streść tekst widoczny na zdjęciach</li>\n<li>Używaj poprawnej struktury zdań</li>\n<li>Unikaj zbędnych informacji</li>\n<li>Skoncentruj się na kluczowych informacjach zawartych w złożonych wizualizacjach (takich jak diagramy lub mapy)</li>\n</ul>",
-  "interaction_modal.action.favourite": "Aby kontynuować, musisz polubić ze swojego konta.",
-  "interaction_modal.action.follow": "Aby kontynuować, musisz obserwować ze swojego konta.",
-  "interaction_modal.action.reblog": "Aby kontynuować, musisz podbić ze swojego konta.",
-  "interaction_modal.action.reply": "Aby kontynuować, musisz komentować ze swojego konta.",
-  "interaction_modal.action.vote": "Aby kontynuować, musisz zagłosować ze swojego konta.",
   "interaction_modal.go": "Dalej",
   "interaction_modal.no_account_yet": "Nie masz jeszcze konta?",
   "interaction_modal.on_another_server": "Na innym serwerze",
   "interaction_modal.on_this_server": "Na tym serwerze",
-  "interaction_modal.title.favourite": "Polub wpis {name}",
-  "interaction_modal.title.follow": "Obserwuj {name}",
-  "interaction_modal.title.reblog": "Podbij wpis {name}",
-  "interaction_modal.title.reply": "Odpowiedz na post {name}",
-  "interaction_modal.title.vote": "Głosuj w ankiecie {name}",
   "interaction_modal.username_prompt": "Np. {example}",
   "intervals.full.days": "{number, plural, one {# dzień} few {# dni} many {# dni} other {# dni}}",
   "intervals.full.hours": "{number, plural, one {# godzina} few {# godziny} many {# godzin} other {# godzin}}",
@@ -447,6 +478,7 @@
   "keyboard_shortcuts.open_media": "Otwórz multimedia",
   "keyboard_shortcuts.pinned": "Otwórz listę przypiętych wpisów",
   "keyboard_shortcuts.profile": "Otwórz profil",
+  "keyboard_shortcuts.quote": "Cytuj post",
   "keyboard_shortcuts.reply": "Skomentuj",
   "keyboard_shortcuts.requests": "Otwórz listę próśb o obserwowanie",
   "keyboard_shortcuts.search": "Aktywuj pole wyszukiwania",
@@ -458,6 +490,8 @@
   "keyboard_shortcuts.translate": "aby przetłumaczyć wpis",
   "keyboard_shortcuts.unfocus": "Opuść pole tekstowe",
   "keyboard_shortcuts.up": "Przesuń w górę na liście",
+  "learn_more_link.got_it": "Rozumiem",
+  "learn_more_link.learn_more": "Dowiedz się więcej",
   "lightbox.close": "Zamknij",
   "lightbox.next": "Następne",
   "lightbox.previous": "Poprzednie",
@@ -507,8 +541,10 @@
   "mute_modal.you_wont_see_mentions": "Nie zobaczysz wpisów wzmiankujących tę osobę.",
   "mute_modal.you_wont_see_posts": "Nie zobaczysz wpisów tej osoby, ale ona może widzieć twoje.",
   "navigation_bar.about": "O serwerze",
+  "navigation_bar.account_settings": "Hasło i zabezpieczenia",
   "navigation_bar.administration": "Administracja",
   "navigation_bar.advanced_interface": "Otwórz w widoku zaawansowanym",
+  "navigation_bar.automated_deletion": "Automatyczne usuwanie postów",
   "navigation_bar.blocks": "Zablokowani",
   "navigation_bar.bookmarks": "Zakładki",
   "navigation_bar.direct": "Wzmianki bezpośrednie",
@@ -518,13 +554,23 @@
   "navigation_bar.follow_requests": "Prośby o obserwowanie",
   "navigation_bar.followed_tags": "Obserwowane hasztagi",
   "navigation_bar.follows_and_followers": "Obserwowani i obserwujący",
+  "navigation_bar.import_export": "Import i eksport",
   "navigation_bar.lists": "Listy",
+  "navigation_bar.live_feed_local": "Kanał na żywo (lokalny)",
+  "navigation_bar.live_feed_public": "Kanał na żywo (publiczny)",
   "navigation_bar.logout": "Wyloguj",
   "navigation_bar.moderation": "Moderacja",
+  "navigation_bar.more": "Więcej",
   "navigation_bar.mutes": "Wyciszeni",
   "navigation_bar.opened_in_classic_interface": "Wpisy, konta i inne określone strony są domyślnie otwierane w widoku klasycznym.",
   "navigation_bar.preferences": "Ustawienia",
+  "navigation_bar.privacy_and_reach": "Prywatność i zasięg",
   "navigation_bar.search": "Szukaj",
+  "navigation_bar.search_trends": "Szukaj / Na czasie",
+  "navigation_panel.collapse_followed_tags": "Zwiń menu obserwowanych hashtagów",
+  "navigation_panel.collapse_lists": "Zwiń menu listy",
+  "navigation_panel.expand_followed_tags": "Rozwiń menu obserwowanych hashtagów",
+  "navigation_panel.expand_lists": "Rozwiń menu listy",
   "not_signed_in_indicator.not_signed_in": "Zaloguj się, aby uzyskać dostęp.",
   "notification.admin.report": "{name} zgłosił {target}",
   "notification.admin.report_account": "{name} zgłosił(a) {count, plural, one {1 wpis} few {# wpisy} other {# wpisów}} z {target} w kategorii {category}",
@@ -546,6 +592,7 @@
   "notification.label.mention": "Wzmianka",
   "notification.label.private_mention": "Wzmianka bezpośrednia",
   "notification.label.private_reply": "Komentarz bezpośredni",
+  "notification.label.quote": "{name} cytował twój post",
   "notification.label.reply": "Komentarz",
   "notification.mention": "Wzmianka",
   "notification.mentioned_you": "{name} wzmiankuje cię",
@@ -560,6 +607,7 @@
   "notification.moderation_warning.action_suspend": "Twoje konto zostało zawieszone.",
   "notification.own_poll": "Twoja ankieta została zakończona",
   "notification.poll": "Zakończyła się ankieta, w której głosowano",
+  "notification.quoted_update": "{name} edytował post, który cytowałeś",
   "notification.reblog": "Twój post został podbity przez {name}",
   "notification.reblog.name_and_others_with_link": "{name} i <a>{count, plural, one {# inna osoba} few {# inne osoby} other {# innych osób}}</a> podbili twój wpis",
   "notification.relationships_severance_event": "Utracono połączenie z {name}",
@@ -603,6 +651,7 @@
   "notifications.column_settings.mention": "Wzmianki:",
   "notifications.column_settings.poll": "Wyniki ankiety:",
   "notifications.column_settings.push": "Powiadomienia push",
+  "notifications.column_settings.quote": "Cytaty:",
   "notifications.column_settings.reblog": "Podbicia:",
   "notifications.column_settings.show": "Pokaż w kolumnie",
   "notifications.column_settings.sound": "Odtwarzaj dźwięk",
@@ -678,8 +727,10 @@
   "privacy.private.short": "Obserwujący",
   "privacy.public.long": "Każdy na i poza Mastodon",
   "privacy.public.short": "Publiczny",
+  "privacy.quote.anyone": "{visibility}, każdy może cytować",
+  "privacy.quote.disabled": "{visibility}, cytaty wyłączone",
+  "privacy.quote.limited": "{visibility}, cytaty ograniczone",
   "privacy.unlisted.additional": "Dostępny podobnie jak wpis publiczny, ale nie będzie widoczny w aktualnościach, hashtagach ani wyszukiwarce Mastodon, nawet jeśli twoje konto jest widoczne.",
-  "privacy.unlisted.long": "Niewidoczny w aktualnościach",
   "privacy.unlisted.short": "Niewidoczny",
   "privacy_policy.last_updated": "Data ostatniej aktualizacji: {date}",
   "privacy_policy.title": "Polityka prywatności",
@@ -698,6 +749,8 @@
   "relative_time.minutes": "{number} min.",
   "relative_time.seconds": "{number} s.",
   "relative_time.today": "dzisiaj",
+  "remove_quote_hint.button_label": "Rozumiem",
+  "remove_quote_hint.title": "Czy chcesz usunąć swój cytowany post?",
   "reply_indicator.attachments": "{count, plural, one {# załącznik} few {# załączniki} many {# załączników} other {# załączników}}",
   "reply_indicator.cancel": "Anuluj",
   "reply_indicator.poll": "Ankieta",
@@ -751,6 +804,7 @@
   "report_notification.categories.violation": "Naruszenie zasad",
   "report_notification.categories.violation_sentence": "naruszenie zasad",
   "report_notification.open": "Otwórz zgłoszenie",
+  "search.clear": "Wyczyść wyszukiwanie",
   "search.no_recent_searches": "Brak ostatnich wyszukiwań",
   "search.placeholder": "Szukaj",
   "search.quick_action.account_search": "Profile pasujące do {x}",
@@ -795,6 +849,7 @@
   "status.continued_thread": "Ciąg dalszy wątku",
   "status.copy": "Skopiuj odnośnik do wpisu",
   "status.delete": "Usuń",
+  "status.delete.success": "Post usunięty",
   "status.detailed_status": "Szczegółowy widok konwersacji",
   "status.direct": "Prywatna wzmianka @{name}",
   "status.direct_indicator": "Prywatna wzmianka",
@@ -817,9 +872,18 @@
   "status.mute_conversation": "Wycisz konwersację",
   "status.open": "Rozszerz ten wpis",
   "status.pin": "Przypnij do profilu",
+  "status.quote": "Cytuj",
+  "status.quote.cancel": "Anuluj cytat",
+  "status.quote_error.filtered": "Ukryte z powodu jednego z Twoich filtrów",
+  "status.quote_error.not_available": "Post niedostępny",
+  "status.quote_error.pending_approval": "Post oczekujący",
+  "status.quote_followers_only": "Tylko obserwatorzy mogą cytować ten post",
+  "status.quote_policy_change": "Zmień kto może cytować",
+  "status.quote_post_author": "Zacytowano post @{name}",
+  "status.quote_private": "Prywatne posty nie mogą być cytowane",
   "status.read_more": "Czytaj dalej",
   "status.reblog": "Podbij",
-  "status.reblog_private": "Podbij dla odbiorców oryginalnego wpisu",
+  "status.reblog_or_quote": "Podbij lub cytuj",
   "status.reblogged_by": "Podbite przez {name}",
   "status.reblogs": "{count, plural, one {podbicie} few {podbicia} other {podbić}}",
   "status.reblogs.empty": "Nikt nie podbił jeszcze tego wpisu. Gdy ktoś to zrobi, pojawi się tutaj.",
@@ -831,6 +895,7 @@
   "status.reply": "Odpowiedz",
   "status.replyAll": "Odpowiedz na wątek",
   "status.report": "Zgłoś @{name}",
+  "status.revoke_quote": "Usuń mój wpis z postu @{name}",
   "status.sensitive_warning": "Wrażliwa zawartość",
   "status.share": "Udostępnij",
   "status.show_less_all": "Zwiń wszystkie",
@@ -846,8 +911,13 @@
   "subscribed_languages.save": "Zapisz zmiany",
   "subscribed_languages.target": "Zmień subskrybowane języki dla {target}",
   "tabs_bar.home": "Strona główna",
+  "tabs_bar.menu": "Menu",
   "tabs_bar.notifications": "Powiadomienia",
+  "tabs_bar.publish": "Nowy post",
+  "tabs_bar.search": "Szukaj",
+  "terms_of_service.effective_as_of": "Obowiązuje od {date}",
   "terms_of_service.title": "Warunki korzystania z usługi",
+  "terms_of_service.upcoming_changes_on": "Nadchodzące zmiany od {date}",
   "time_remaining.days": "{number, plural, one {Pozostał # dzień} few {Pozostały # dni} many {Pozostało # dni} other {Pozostało # dni}}",
   "time_remaining.hours": "{number, plural, one {Pozostała # godzina} few {Pozostały # godziny} many {Pozostało # godzin} other {Pozostało # godzin}}",
   "time_remaining.minutes": "{number, plural, one {Pozostała # minuta} few {Pozostały # minuty} many {Pozostało # minut} other {Pozostało # minut}}",
@@ -863,6 +933,7 @@
   "upload_button.label": "Dodaj zdjęcia, filmy lub audio",
   "upload_error.limit": "Przekroczono limit plików do wysłania.",
   "upload_error.poll": "Dołączanie plików nie dozwolone z głosowaniami.",
+  "upload_error.quote": "Dołączanie plików nie jest pozwolone z cytatami.",
   "upload_form.drag_and_drop.instructions": "Naciśnij spację lub enter żeby podnieść załącznik. Podczas przeciągania, strzałki przesuwają załącznik. Naciśnięcie spacji lub entera upuści załącznik w nowym miejscu, a escape anuluje przesuwanie.",
   "upload_form.drag_and_drop.on_drag_cancel": "Przesuwanie anulowane. Załącznik {item} upuszczony.",
   "upload_form.drag_and_drop.on_drag_end": "Upuszczono załącznik {item}.",
@@ -878,6 +949,20 @@
   "video.expand": "Rozszerz film",
   "video.fullscreen": "Pełny ekran",
   "video.hide": "Ukryj film",
+  "video.mute": "Wycisz",
   "video.pause": "Pauzuj",
-  "video.play": "Odtwórz"
+  "video.play": "Odtwórz",
+  "video.skip_backward": "Skocz do tyłu",
+  "video.skip_forward": "Skocz do przodu",
+  "video.unmute": "Wyłącz wyciszenie",
+  "video.volume_down": "Zmniejsz głośność",
+  "video.volume_up": "Zwiększ głośność",
+  "visibility_modal.button_title": "Ustaw widoczność",
+  "visibility_modal.header": "Widoczność i interakcja",
+  "visibility_modal.privacy_label": "Widoczność",
+  "visibility_modal.quote_followers": "Tylko dla obserwujących",
+  "visibility_modal.quote_label": "Kto może cytować",
+  "visibility_modal.quote_nobody": "Tylko ja",
+  "visibility_modal.quote_public": "Każdy",
+  "visibility_modal.save": "Zapisz"
 }
diff --git a/app/javascript/mastodon/locales/pt-BR.json b/app/javascript/mastodon/locales/pt-BR.json
index 1a18d4339f1..5457e91dbab 100644
--- a/app/javascript/mastodon/locales/pt-BR.json
+++ b/app/javascript/mastodon/locales/pt-BR.json
@@ -1,6 +1,7 @@
 {
   "about.blocks": "Servidores moderados",
   "about.contact": "Contato:",
+  "about.default_locale": "Padrão",
   "about.disclaimer": "Mastodon é um software de código aberto e livre, e uma marca registrada de Mastodon gGmbH.",
   "about.domain_blocks.no_reason_available": "Razão não disponível",
   "about.domain_blocks.preamble": "O Mastodon geralmente permite que você veja o conteúdo e interaja com usuários de qualquer outro servidor no fediverso. Estas são as exceções deste servidor em específico.",
@@ -8,6 +9,7 @@
   "about.domain_blocks.silenced.title": "Limitado",
   "about.domain_blocks.suspended.explanation": "Nenhum dado desse servidor será processado, armazenado ou trocado, impossibilitando qualquer interação ou comunicação com os usuários deste servidor.",
   "about.domain_blocks.suspended.title": "Suspenso",
+  "about.language_label": "Idioma",
   "about.not_available": "Esta informação não foi disponibilizada neste servidor.",
   "about.powered_by": "Redes sociais descentralizadas alimentadas por {mastodon}",
   "about.rules": "Regras do servidor",
@@ -68,7 +70,6 @@
   "account.posts_with_replies": "Com respostas",
   "account.remove_from_followers": "Remover {name} dos seguidores",
   "account.report": "Denunciar @{name}",
-  "account.requested": "Aguardando aprovação. Clique para cancelar a solicitação",
   "account.requested_follow": "{name} quer te seguir",
   "account.requests_to_follow_you": "Pediu para seguir você",
   "account.share": "Compartilhar perfil de @{name}",
@@ -102,7 +103,7 @@
   "alt_text_modal.add_text_from_image": "Adicione texto da imagem",
   "alt_text_modal.cancel": "Cancelar",
   "alt_text_modal.change_thumbnail": "Alterar miniatura",
-  "alt_text_modal.describe_for_people_with_hearing_impairments": "…Descreva isso para pessoas com deficiências auditivas.…",
+  "alt_text_modal.describe_for_people_with_hearing_impairments": "Descreva isso para pessoas com deficiências auditivas...",
   "alt_text_modal.describe_for_people_with_visual_impairments": "Descreva isso para pessoas com deficiências visuais…",
   "alt_text_modal.done": "Feito",
   "announcement.announcement": "Comunicados",
@@ -203,8 +204,8 @@
   "compose_form.poll.switch_to_multiple": "Permitir múltiplas escolhas",
   "compose_form.poll.switch_to_single": "Opção única",
   "compose_form.poll.type": "Estilo",
-  "compose_form.publish": "Publicação",
-  "compose_form.reply": "Resposta",
+  "compose_form.publish": "Publicar",
+  "compose_form.reply": "Responder",
   "compose_form.save_changes": "Atualização",
   "compose_form.spoiler.marked": "Com Aviso de Conteúdo",
   "compose_form.spoiler.unmarked": "Sem Aviso de Conteúdo",
@@ -217,6 +218,13 @@
   "confirmations.delete_list.confirm": "Excluir",
   "confirmations.delete_list.message": "Você tem certeza de que deseja excluir esta lista?",
   "confirmations.delete_list.title": "Excluir lista?",
+  "confirmations.discard_draft.confirm": "Descartar e continuar",
+  "confirmations.discard_draft.edit.cancel": "Continuar editando",
+  "confirmations.discard_draft.edit.message": "Continuar vai descartar quaisquer mudanças feitas ao post sendo editado.",
+  "confirmations.discard_draft.edit.title": "Descartar mudanças no seu post?",
+  "confirmations.discard_draft.post.cancel": "Continuar rascunho",
+  "confirmations.discard_draft.post.message": "Continuar eliminará a publicação que está sendo elaborada no momento.",
+  "confirmations.discard_draft.post.title": "Eliminar seu esboço de publicação?",
   "confirmations.discard_edit_media.confirm": "Descartar",
   "confirmations.discard_edit_media.message": "Há mudanças não salvas na descrição ou pré-visualização da mídia. Descartar assim mesmo?",
   "confirmations.follow_to_list.confirm": "Seguir e adicionar à lista",
@@ -230,15 +238,18 @@
   "confirmations.missing_alt_text.secondary": "Postar mesmo assim",
   "confirmations.missing_alt_text.title": "Adicionar texto alternativo?",
   "confirmations.mute.confirm": "Silenciar",
+  "confirmations.quiet_post_quote_info.dismiss": "Não me lembrar novamente",
+  "confirmations.quiet_post_quote_info.got_it": "Entendi",
   "confirmations.redraft.confirm": "Excluir e rascunhar",
   "confirmations.redraft.message": "Você tem certeza de que quer apagar essa postagem e rascunhá-la? Favoritos e impulsos serão perdidos, e respostas à postagem original ficarão órfãs.",
   "confirmations.redraft.title": "Excluir e rascunhar publicação?",
   "confirmations.remove_from_followers.confirm": "Remover seguidor",
   "confirmations.remove_from_followers.message": "{name} vai parar de te seguir. Tem certeza de que deseja continuar?",
   "confirmations.remove_from_followers.title": "Remover seguidor?",
+  "confirmations.revoke_quote.confirm": "Remover publicação",
+  "confirmations.revoke_quote.message": "Essa ação não pode ser desfeita.",
+  "confirmations.revoke_quote.title": "Remover publicação?",
   "confirmations.unfollow.confirm": "Deixar de seguir",
-  "confirmations.unfollow.message": "Você tem certeza de que deseja deixar de seguir {name}?",
-  "confirmations.unfollow.title": "Deixar de seguir o usuário?",
   "content_warning.hide": "Ocultar post",
   "content_warning.show": "Mostrar mesmo assim",
   "content_warning.show_more": "Mostrar mais",
@@ -280,6 +291,7 @@
   "domain_pill.your_handle": "Seu identificador:",
   "domain_pill.your_server": "Sua casa digital, onde ficam todas as suas postagens. Não gosta deste? Transfira servidores a qualquer momento e traga seus seguidores também.",
   "domain_pill.your_username": "Seu identificador exclusivo neste servidor. É possível encontrar usuários com o mesmo nome de usuário em servidores diferentes.",
+  "dropdown.empty": "Escolha uma opção",
   "embed.instructions": "Incorpore este toot no seu site ao copiar o código abaixo.",
   "embed.preview": "Aqui está como vai ficar:",
   "emoji_button.activity": "Atividade",
@@ -297,6 +309,8 @@
   "emoji_button.search_results": "Resultado da pesquisa",
   "emoji_button.symbols": "Símbolos",
   "emoji_button.travel": "Viagem e Lugares",
+  "empty_column.account_featured.me": "Você ainda não destacou nada. Você sabia que pode destacar seus posts, hashtags que você mais usa e até mesmo contas de seus amigos no seu perfil?",
+  "empty_column.account_featured.other": "{acct} Ainda não destacou nada. Você sabia que pode destacar suas publicações, hashtags que você mais usa e até mesmo contas de seus amigos no seu perfil?",
   "empty_column.account_featured_other.unknown": "Esta conta ainda não destacou nada.",
   "empty_column.account_hides_collections": "A pessoa optou por não disponibilizar esta informação",
   "empty_column.account_suspended": "Conta suspensa",
@@ -326,9 +340,15 @@
   "errors.unexpected_crash.copy_stacktrace": "Copiar dados do erro para área de transferência",
   "errors.unexpected_crash.report_issue": "Reportar problema",
   "explore.suggested_follows": "Pessoas",
+  "explore.title": "Em alta",
   "explore.trending_links": "Notícias",
   "explore.trending_statuses": "Publicações",
   "explore.trending_tags": "Hashtags",
+  "featured_carousel.header": "{count, plural, one {Postagem fixada} other {Postagens fixadas}}",
+  "featured_carousel.next": "Próximo",
+  "featured_carousel.post": "Publicação",
+  "featured_carousel.previous": "Anterior",
+  "featured_carousel.slide": "{index} de {total}",
   "filter_modal.added.context_mismatch_explanation": "Esta categoria de filtro não se aplica ao contexto no qual você acessou esta publicação. Se quiser que a publicação seja filtrada nesse contexto também, você terá que editar o filtro.",
   "filter_modal.added.context_mismatch_title": "Incompatibilidade de contexto!",
   "filter_modal.added.expired_explanation": "Esta categoria de filtro expirou, você precisará alterar a data de expiração para aplicar.",
@@ -407,8 +427,7 @@
   "hints.profiles.see_more_followers": "Ver mais seguidores no {domain}",
   "hints.profiles.see_more_follows": "Ver mais seguidores no {domain}",
   "hints.profiles.see_more_posts": "Ver mais publicações em {domain}",
-  "hints.threads.replies_may_be_missing": "Respostas de outros servidores podem estar faltando.",
-  "hints.threads.see_more": "Ver mais respostas no {domain}",
+  "home.column_settings.show_quotes": "Mostrar citações",
   "home.column_settings.show_reblogs": "Mostrar boosts",
   "home.column_settings.show_replies": "Mostrar respostas",
   "home.hide_announcements": "Ocultar comunicados",
@@ -429,20 +448,10 @@
   "ignore_notifications_modal.private_mentions_title": "Ignorar notificações de menções privadas não solicitadas?",
   "info_button.label": "Ajuda",
   "info_button.what_is_alt_text": "<h1>O que é texto alternativo?</h1><p>O texto alternativo fornece descrições de imagens para pessoas com deficiências visuais, conexões de internet de baixa largura de banda ou aquelas que buscam mais contexto.</p><p>Você pode melhorar a acessibilidade e a compreensão para todos escrevendo texto alternativo claro, conciso e objetivo.</p> <ul> <li>Capture elementos importantes</li> <li>Resuma textos em imagens</li> <li>Use estrutura de frases regular</li> <li>Evite informações redundantes</li> <li>Foque em tendências e descobertas principais em visuais complexos (como diagramas ou mapas)</li> </ul>",
-  "interaction_modal.action.favourite": "Para continuar, você precisa favoritar na sua conta.",
-  "interaction_modal.action.follow": "Para continuar, você precisa seguir da sua conta.",
-  "interaction_modal.action.reblog": "Para continuar, você precisa impulsionar na sua conta.",
-  "interaction_modal.action.reply": "Para continuar, você precisa responder na sua conta.",
-  "interaction_modal.action.vote": "Para continuar, você precisa votar na sua conta.",
   "interaction_modal.go": "Ir",
   "interaction_modal.no_account_yet": "Não possui uma conta ainda?",
   "interaction_modal.on_another_server": "Em um servidor diferente",
   "interaction_modal.on_this_server": "Neste servidor",
-  "interaction_modal.title.favourite": "Favoritar publicação de {name}",
-  "interaction_modal.title.follow": "Seguir {name}",
-  "interaction_modal.title.reblog": "Impulsionar publicação de {name}",
-  "interaction_modal.title.reply": "Responder à publicação de {name}",
-  "interaction_modal.title.vote": "Votar na enquete de {name}",
   "interaction_modal.username_prompt": "p. e.x.: {example}",
   "intervals.full.days": "{number, plural, one {# dia} other {# dias}}",
   "intervals.full.hours": "{number, plural, one {# hora} other {# horas}}",
@@ -463,6 +472,7 @@
   "keyboard_shortcuts.home": "abrir página inicial",
   "keyboard_shortcuts.hotkey": "Atalho",
   "keyboard_shortcuts.legend": "mostrar estes atalhos",
+  "keyboard_shortcuts.load_more": "Focar \"Carregar mais\" botão",
   "keyboard_shortcuts.local": "abrir linha local",
   "keyboard_shortcuts.mention": "mencionar usuário",
   "keyboard_shortcuts.muted": "abrir usuários silenciados",
@@ -471,6 +481,7 @@
   "keyboard_shortcuts.open_media": "abrir mídia",
   "keyboard_shortcuts.pinned": "abrir toots fixados",
   "keyboard_shortcuts.profile": "abrir perfil do usuário",
+  "keyboard_shortcuts.quote": "Publicação de citação",
   "keyboard_shortcuts.reply": "responder toot",
   "keyboard_shortcuts.requests": "abrir seguidores pendentes",
   "keyboard_shortcuts.search": "focar na pesquisa",
@@ -482,6 +493,8 @@
   "keyboard_shortcuts.translate": "Para traduzir um post",
   "keyboard_shortcuts.unfocus": "desfocar de tudo",
   "keyboard_shortcuts.up": "mover para cima",
+  "learn_more_link.got_it": "Entendido",
+  "learn_more_link.learn_more": "Veja mais",
   "lightbox.close": "Fechar",
   "lightbox.next": "Próximo",
   "lightbox.previous": "Anterior",
@@ -531,8 +544,10 @@
   "mute_modal.you_wont_see_mentions": "Você não verá publicações que os mencionem.",
   "mute_modal.you_wont_see_posts": "Eles ainda poderão ver suas publicações, mas você não verá as deles.",
   "navigation_bar.about": "Sobre",
+  "navigation_bar.account_settings": "Senha e segurança",
   "navigation_bar.administration": "Administração",
   "navigation_bar.advanced_interface": "Ativar na interface web avançada",
+  "navigation_bar.automated_deletion": "Publicação de eliminação automático",
   "navigation_bar.blocks": "Usuários bloqueados",
   "navigation_bar.bookmarks": "Salvos",
   "navigation_bar.direct": "Menções privadas",
@@ -542,13 +557,23 @@
   "navigation_bar.follow_requests": "Seguidores pendentes",
   "navigation_bar.followed_tags": "Hashtags seguidas",
   "navigation_bar.follows_and_followers": "Segue e seguidores",
+  "navigation_bar.import_export": "Importar e exportar",
   "navigation_bar.lists": "Listas",
+  "navigation_bar.live_feed_local": "Feed ao vivo (local)",
+  "navigation_bar.live_feed_public": "Feed ao vivo (público)",
   "navigation_bar.logout": "Sair",
   "navigation_bar.moderation": "Moderação",
+  "navigation_bar.more": "Mais",
   "navigation_bar.mutes": "Usuários silenciados",
   "navigation_bar.opened_in_classic_interface": "Publicações, contas e outras páginas específicas são abertas por padrão na interface 'web' clássica.",
   "navigation_bar.preferences": "Preferências",
+  "navigation_bar.privacy_and_reach": "Privacidade e alcance",
   "navigation_bar.search": "Buscar",
+  "navigation_bar.search_trends": "Pesquisa / Em alta",
+  "navigation_panel.collapse_followed_tags": "Recolher menu de hashtags seguidas",
+  "navigation_panel.collapse_lists": "Fechar lista de menu",
+  "navigation_panel.expand_followed_tags": "Expandir o menu de hashtags seguidas",
+  "navigation_panel.expand_lists": "Expandir lista de menu",
   "not_signed_in_indicator.not_signed_in": "Você precisa se autenticar para acessar este recurso.",
   "notification.admin.report": "{name} denunciou {target}",
   "notification.admin.report_account": "{name} reportou {count, plural, one {Um post} other {# posts}} de {target} para {category}",
@@ -570,6 +595,7 @@
   "notification.label.mention": "Menção",
   "notification.label.private_mention": "Menção privada",
   "notification.label.private_reply": "Resposta privada",
+  "notification.label.quote": "{name} Citou a sua publicação",
   "notification.label.reply": "Resposta",
   "notification.mention": "Menção",
   "notification.mentioned_you": "{name} te mencionou",
@@ -584,6 +610,7 @@
   "notification.moderation_warning.action_suspend": "Sua conta foi suspensa.",
   "notification.own_poll": "Sua enquete terminou",
   "notification.poll": "Uma enquete que você votou terminou",
+  "notification.quoted_update": "{name} Editou um post seu",
   "notification.reblog": "{name} deu boost no teu toot",
   "notification.reblog.name_and_others_with_link": "{name} e <a>{count, plural, one {# outra} other {# outras}}</a> impulsionaram a publicação",
   "notification.relationships_severance_event": "Conexões perdidas com {name}",
@@ -627,6 +654,7 @@
   "notifications.column_settings.mention": "Menções:",
   "notifications.column_settings.poll": "Enquetes:",
   "notifications.column_settings.push": "Notificações push",
+  "notifications.column_settings.quote": "Citações:",
   "notifications.column_settings.reblog": "Boosts:",
   "notifications.column_settings.show": "Mostrar na coluna",
   "notifications.column_settings.sound": "Tocar som",
@@ -702,11 +730,17 @@
   "privacy.private.short": "Seguidores",
   "privacy.public.long": "Qualquer um dentro ou fora do Mastodon",
   "privacy.public.short": "Público",
+  "privacy.quote.anyone": "{visibility} Qualquer pessoa pode citar",
+  "privacy.quote.disabled": "{visibility} Citações desabilitadas",
+  "privacy.quote.limited": "{visibility} Citações limitadas",
   "privacy.unlisted.additional": "Isso se comporta exatamente como público, exceto que a publicação não aparecerá nos _feeds ao vivo_ ou nas _hashtags_, explorar, ou barra de busca, mesmo que você seja escolhido em toda a conta.",
-  "privacy.unlisted.long": "Menos notificações e recomendações do algoritmo",
   "privacy.unlisted.short": "Público (silencioso)",
   "privacy_policy.last_updated": "Atualizado {date}",
   "privacy_policy.title": "Política de privacidade",
+  "quote_error.poll": "Citações não permitidas com enquetes.",
+  "quote_error.quote": "Apenas uma citação por vez é permitido.",
+  "quote_error.unauthorized": "Você não é autorizado a citar essa publicação.",
+  "quote_error.upload": "Citações não são permitidas com mídias anexadas.",
   "recommended": "Recomendado",
   "refresh": "Atualizar",
   "regeneration_indicator.please_stand_by": "Aguarde um momento.",
@@ -775,6 +809,7 @@
   "report_notification.categories.violation": "Violação de regra",
   "report_notification.categories.violation_sentence": "violação de regra",
   "report_notification.open": "Abrir denúncia",
+  "search.clear": "Limpar pesquisas",
   "search.no_recent_searches": "Nenhuma busca recente",
   "search.placeholder": "Pesquisar",
   "search.quick_action.account_search": "Perfis correspondentes a {x}",
@@ -812,6 +847,7 @@
   "status.admin_account": "Abrir interface de moderação para @{name}",
   "status.admin_domain": "Abrir interface de moderação para {domain}",
   "status.admin_status": "Abrir este toot na interface de moderação",
+  "status.all_disabled": "Acelerações e citações estão desabilitados",
   "status.block": "Bloquear @{name}",
   "status.bookmark": "Salvar",
   "status.cancel_reblog_private": "Desfazer boost",
@@ -819,6 +855,7 @@
   "status.continued_thread": "Continuação da conversa",
   "status.copy": "Copiar link",
   "status.delete": "Excluir",
+  "status.delete.success": "Publicação deletada",
   "status.detailed_status": "Visão detalhada da conversa",
   "status.direct": "Mencione em privado @{name}",
   "status.direct_indicator": "Menção privada",
@@ -841,16 +878,21 @@
   "status.mute_conversation": "Silenciar conversa",
   "status.open": "Abrir toot",
   "status.pin": "Fixar",
+  "status.quote": "Citar",
+  "status.quote.cancel": "Cancelar citação",
   "status.quote_error.filtered": "Oculto devido a um dos seus filtros",
-  "status.quote_error.not_found": "Esta postagem não pode ser exibida.",
-  "status.quote_error.pending_approval": "Esta postagem está pendente de aprovação do autor original.",
-  "status.quote_error.rejected": "Esta publicação não pode ser exibida porque o autor original não permite que seja citada.",
-  "status.quote_error.removed": "Esta postagem foi removida pelo autor.",
-  "status.quote_error.unauthorized": "Esta publicação não pode ser exibida, pois, você não está autorizado a vê-la.",
-  "status.quote_post_author": "Publicação por {name}",
+  "status.quote_error.not_available": "Publicação indisponível",
+  "status.quote_error.pending_approval": "Publicação pendente",
+  "status.quote_followers_only": "Apenas seguidores podem citar sua publicação",
+  "status.quote_manual_review": "Autor irá revisar manualmente",
+  "status.quote_policy_change": "Mude quem pode citar",
+  "status.quote_post_author": "Publicação citada por @{name}",
+  "status.quote_private": "Publicações privadas não podem ser citadas",
+  "status.quotes": "{count, plural, one {# voto} other {# votos}}",
+  "status.quotes.empty": "Ninguém citou essa publicação até agora. Quando alguém citar aparecerá aqui.",
   "status.read_more": "Ler mais",
   "status.reblog": "Dar boost",
-  "status.reblog_private": "Dar boost para o mesmo público",
+  "status.reblog_or_quote": "Acelerar ou citar",
   "status.reblogged_by": "{name} deu boost",
   "status.reblogs": "{count, plural, one {boost} other {boosts}}",
   "status.reblogs.empty": "Nada aqui. Quando alguém der boost, o usuário aparecerá aqui.",
@@ -862,6 +904,8 @@
   "status.reply": "Responder",
   "status.replyAll": "Responder a conversa",
   "status.report": "Denunciar @{name}",
+  "status.request_quote": "Solicitar citação",
+  "status.revoke_quote": "Remover minha publicação de@{name} publicação",
   "status.sensitive_warning": "Mídia sensível",
   "status.share": "Compartilhar",
   "status.show_less_all": "Mostrar menos em tudo",
@@ -877,7 +921,10 @@
   "subscribed_languages.save": "Salvar alterações",
   "subscribed_languages.target": "Alterar idiomas inscritos para {target}",
   "tabs_bar.home": "Página inicial",
+  "tabs_bar.menu": "Menu",
   "tabs_bar.notifications": "Notificações",
+  "tabs_bar.publish": "Nova publicação",
+  "tabs_bar.search": "Buscar",
   "terms_of_service.effective_as_of": "Em vigor a partir de {date}",
   "terms_of_service.title": "Termos de serviço",
   "terms_of_service.upcoming_changes_on": "Próximas mudanças em {date}",
@@ -896,6 +943,7 @@
   "upload_button.label": "Adicionar mídia",
   "upload_error.limit": "Limite de anexação alcançado.",
   "upload_error.poll": "Mídias não podem ser anexadas em toots com enquetes.",
+  "upload_error.quote": "Mídias não podem ser anexadas com enquetes.",
   "upload_form.drag_and_drop.instructions": "Para pegar um anexo de mídia, pressione espaço ou enter. Enquanto arrastar, use as setas do teclado para mover o anexo de mídia em qualquer direção. Pressione espaço ou insira novamente para soltar o anexo de mídia em sua nova posição, ou pressione escape para cancelar.",
   "upload_form.drag_and_drop.on_drag_cancel": "O arrastamento foi cancelado. O anexo da mídia {item} foi descartado.",
   "upload_form.drag_and_drop.on_drag_end": "O anexo {item} foi removido.",
@@ -918,5 +966,17 @@
   "video.skip_forward": "Avançar",
   "video.unmute": "Ativar som",
   "video.volume_down": "Diminuir o volume",
-  "video.volume_up": "Aumentar o volume"
+  "video.volume_up": "Aumentar o volume",
+  "visibility_modal.button_title": "Selecionar Visibilidade",
+  "visibility_modal.header": "Visibilidade e interação",
+  "visibility_modal.helper.direct_quoting": "Menções privadas escritas no Mastodon.",
+  "visibility_modal.helper.private_quoting": "Posts somente para seguidores feitos no Mastodon não podem ser citados por outros.",
+  "visibility_modal.helper.unlisted_quoting": "Quando as pessoas citam você, sua publicação também será ocultada das linhas de tempo de tendência.",
+  "visibility_modal.instructions": "Controle quem pode interagir com este post. Você também pode aplicar as configurações para todos os posts futuros navegando para <link>Preferências > Postagem padrão</link>.",
+  "visibility_modal.privacy_label": "Visibilidade",
+  "visibility_modal.quote_followers": "Apenas seguidores",
+  "visibility_modal.quote_label": "Quem pode citar",
+  "visibility_modal.quote_nobody": "Apenas eu",
+  "visibility_modal.quote_public": "Qualquer um",
+  "visibility_modal.save": "Salvar"
 }
diff --git a/app/javascript/mastodon/locales/pt-PT.json b/app/javascript/mastodon/locales/pt-PT.json
index 424e48ef2e3..82fa079e9b2 100644
--- a/app/javascript/mastodon/locales/pt-PT.json
+++ b/app/javascript/mastodon/locales/pt-PT.json
@@ -28,6 +28,7 @@
   "account.disable_notifications": "Parar de me notificar das publicações de @{name}",
   "account.domain_blocking": "A bloquear domínio",
   "account.edit_profile": "Editar perfil",
+  "account.edit_profile_short": "Editar",
   "account.enable_notifications": "Notificar-me das publicações de @{name}",
   "account.endorse": "Destacar no perfil",
   "account.familiar_followers_many": "Seguido por {name1}, {name2} e {othersCount, plural,one {mais uma pessoa que conhece} other {# outras pessoas que conhece}}",
@@ -40,6 +41,11 @@
   "account.featured_tags.last_status_never": "Sem publicações",
   "account.follow": "Seguir",
   "account.follow_back": "Seguir também",
+  "account.follow_back_short": "Seguir de volta",
+  "account.follow_request": "Pedir para seguir",
+  "account.follow_request_cancel": "Cancelar pedido",
+  "account.follow_request_cancel_short": "Cancelar",
+  "account.follow_request_short": "Pedido",
   "account.followers": "Seguidores",
   "account.followers.empty": "Ainda ninguém segue este utilizador.",
   "account.followers_counter": "{count, plural, one {{counter} seguidor} other {{counter} seguidores}}",
@@ -70,7 +76,6 @@
   "account.posts_with_replies": "Publicações e respostas",
   "account.remove_from_followers": "Remover {name} dos seguidores",
   "account.report": "Denunciar @{name}",
-  "account.requested": "A aguardar aprovação. Clica para cancelar o pedido para seguir",
   "account.requested_follow": "{name} pediu para seguir-te",
   "account.requests_to_follow_you": "Pediu para seguir-te",
   "account.share": "Partilhar o perfil @{name}",
@@ -239,15 +244,20 @@
   "confirmations.missing_alt_text.secondary": "Publicar mesmo assim",
   "confirmations.missing_alt_text.title": "Adicionar texto alternativo?",
   "confirmations.mute.confirm": "Ocultar",
+  "confirmations.quiet_post_quote_info.dismiss": "Não me relembre novamente",
+  "confirmations.quiet_post_quote_info.got_it": "Entendido",
+  "confirmations.quiet_post_quote_info.message": "Ao citar uma publicação não listada, a sua publicação não será exibida nos destaques.",
+  "confirmations.quiet_post_quote_info.title": "Citação de publicação não listada",
   "confirmations.redraft.confirm": "Eliminar e reescrever",
   "confirmations.redraft.message": "Tens a certeza de que queres eliminar e tornar a escrever esta publicação? Os favoritos e as publicações impulsionadas perder-se-ão e as respostas à publicação original ficarão órfãs.",
   "confirmations.redraft.title": "Eliminar e reescrever publicação?",
   "confirmations.remove_from_followers.confirm": "Remover seguidor",
   "confirmations.remove_from_followers.message": "{name} vai parar de seguir-te. Tens a certeza que prentedes continuar?",
   "confirmations.remove_from_followers.title": "Remover seguidor?",
+  "confirmations.revoke_quote.confirm": "Remover publicação",
+  "confirmations.revoke_quote.message": "Esta ação é irreversível.",
+  "confirmations.revoke_quote.title": "Remover publicação?",
   "confirmations.unfollow.confirm": "Deixar de seguir",
-  "confirmations.unfollow.message": "De certeza que queres deixar de seguir {name}?",
-  "confirmations.unfollow.title": "Deixar de seguir o utilizador?",
   "content_warning.hide": "Ocultar publicação",
   "content_warning.show": "Mostrar mesmo assim",
   "content_warning.show_more": "Mostrar mais",
@@ -289,6 +299,7 @@
   "domain_pill.your_handle": "O teu identificador:",
   "domain_pill.your_server": "A tua casa digital, onde se encontram todas as tuas publicações. Não gostas deste? Muda de servidor a qualquer momento e leva também os teus seguidores.",
   "domain_pill.your_username": "O teu identificador único neste servidor. É possível encontrares utilizadores com o mesmo nome de utilizador em diferentes servidores.",
+  "dropdown.empty": "Selecione uma opção",
   "embed.instructions": "Incorpora esta publicação no teu site copiando o código abaixo.",
   "embed.preview": "Eis o aspeto que terá:",
   "emoji_button.activity": "Atividade",
@@ -424,8 +435,6 @@
   "hints.profiles.see_more_followers": "Ver mais seguidores em {domain}",
   "hints.profiles.see_more_follows": "Ver mais perfis seguidos em {domain}",
   "hints.profiles.see_more_posts": "Ver mais publicações em {domain}",
-  "hints.threads.replies_may_be_missing": "É possível que não estejam a ser mostradas todas as respostas de outros servidores.",
-  "hints.threads.see_more": "Ver mais respostas em {domain}",
   "home.column_settings.show_quotes": "Mostrar citações",
   "home.column_settings.show_reblogs": "Mostrar impulsos",
   "home.column_settings.show_replies": "Mostrar respostas",
@@ -447,20 +456,12 @@
   "ignore_notifications_modal.private_mentions_title": "Ignorar notificações de menções privadas não solicitadas?",
   "info_button.label": "Ajuda",
   "info_button.what_is_alt_text": "<h1>O que é texto alternativo?</h1> <p>O texto alternativo fornece descrições de imagens para pessoas com deficiências visuais, ligações de baixa largura de banda ou pessoas que procuram um contexto adicional.</p> <p>Pode melhorar a acessibilidade e a compreensão de todos escrevendo um texto alternativo claro, conciso e objetivo.</p> <ul> <li>Capte os elementos importantes</li> <li>Resuma o texto em imagens</li> <li>Use uma estrutura de frase regular</li> <li>Evite informações redundantes</li> <li>Concentre-se nas tendências e principais conclusões em imagens complexas (como diagramas ou mapas)</li> </ul>",
-  "interaction_modal.action.favourite": "Para continuar, tens de adicionar um favorito na tua conta.",
-  "interaction_modal.action.follow": "Para continuar, tens de seguir alguém na tua conta.",
-  "interaction_modal.action.reblog": "Para continuar, tens de impulsionar desde a tua conta.",
-  "interaction_modal.action.reply": "Para continuar, tens de fazer uma resposta na tua conta.",
-  "interaction_modal.action.vote": "Para continuar é necessário votar a partir da tua conta.",
+  "interaction_modal.action": "Para interagir com a publicação de {name}, necessita de iniciar sessão na sua conta em qualquer servidor Mastodon que utilize.",
   "interaction_modal.go": "Ir",
   "interaction_modal.no_account_yet": "Ainda não tens conta?",
   "interaction_modal.on_another_server": "Num servidor diferente",
   "interaction_modal.on_this_server": "Neste servidor",
-  "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}",
-  "interaction_modal.title.reply": "Responder à publicação de {name}",
-  "interaction_modal.title.vote": "Votar na sondagem de {name}",
+  "interaction_modal.title": "Iniciar sessão para continuar",
   "interaction_modal.username_prompt": "Por exemplo: {example}",
   "intervals.full.days": "{number, plural, one {# dia} other {# dias}}",
   "intervals.full.hours": "{number, plural, one {# hora} other {# horas}}",
@@ -481,6 +482,7 @@
   "keyboard_shortcuts.home": "abrir a cronologia na página inicial",
   "keyboard_shortcuts.hotkey": "Atalho",
   "keyboard_shortcuts.legend": "mostrar esta legenda",
+  "keyboard_shortcuts.load_more": "Focar botão \"Carregar mais\"",
   "keyboard_shortcuts.local": "abrir a cronologia local",
   "keyboard_shortcuts.mention": "mencionar o autor",
   "keyboard_shortcuts.muted": "abrir a lista dos utilizadores ocultados",
@@ -489,6 +491,7 @@
   "keyboard_shortcuts.open_media": "abrir multimédia",
   "keyboard_shortcuts.pinned": "abrir lista de publicações fixadas",
   "keyboard_shortcuts.profile": "abrir o perfil do autor",
+  "keyboard_shortcuts.quote": "Citar publicação",
   "keyboard_shortcuts.reply": "responder à publicação",
   "keyboard_shortcuts.requests": "abrir a lista dos pedidos de seguidor",
   "keyboard_shortcuts.search": "focar barra de pesquisa",
@@ -500,6 +503,8 @@
   "keyboard_shortcuts.translate": "traduzir uma publicação",
   "keyboard_shortcuts.unfocus": "remover o foco da área de texto / pesquisa",
   "keyboard_shortcuts.up": "mover para cima na lista",
+  "learn_more_link.got_it": "Entendido",
+  "learn_more_link.learn_more": "Saber mais",
   "lightbox.close": "Fechar",
   "lightbox.next": "Próximo",
   "lightbox.previous": "Anterior",
@@ -600,6 +605,7 @@
   "notification.label.mention": "Menção",
   "notification.label.private_mention": "Menção privada",
   "notification.label.private_reply": "Resposta privada",
+  "notification.label.quote": "{name} citou a sua publicação",
   "notification.label.reply": "Resposta",
   "notification.mention": "Menção",
   "notification.mentioned_you": "{name} mencionou-te",
@@ -614,6 +620,7 @@
   "notification.moderation_warning.action_suspend": "A tua conta foi suspensa.",
   "notification.own_poll": "A tua sondagem terminou",
   "notification.poll": "Terminou uma sondagem em que votaste",
+  "notification.quoted_update": "{name} editou uma publicação que citou",
   "notification.reblog": "{name} impulsionou a tua publicação",
   "notification.reblog.name_and_others_with_link": "{name} e <a>{count, plural, one {# outro} other {# outros}}</a> impulsionaram a tua publicação",
   "notification.relationships_severance_event": "Perdeu as ligações com {name}",
@@ -657,6 +664,7 @@
   "notifications.column_settings.mention": "Menções:",
   "notifications.column_settings.poll": "Resultados da sondagem:",
   "notifications.column_settings.push": "Notificações \"push\"",
+  "notifications.column_settings.quote": "Citações:",
   "notifications.column_settings.reblog": "Impulsos:",
   "notifications.column_settings.show": "Mostrar na coluna",
   "notifications.column_settings.sound": "Reproduzir som",
@@ -732,11 +740,18 @@
   "privacy.private.short": "Seguidores",
   "privacy.public.long": "Qualquer pessoa no Mastodon ou não",
   "privacy.public.short": "Público",
+  "privacy.quote.anyone": "{visibility}, qualquer pessoa pode citar",
+  "privacy.quote.disabled": "{visibility}, citações desativadas",
+  "privacy.quote.limited": "{visibility}, citações limitadas",
   "privacy.unlisted.additional": "Este comportamento é exatamente igual ao do público, exceto que a publicação não aparecerá em cronologias, nas etiquetas, ao explorar ou na pesquisa do Mastodon, mesmo que tenhas optado por participar em toda a tua conta.",
-  "privacy.unlisted.long": "Menos fanfarras algorítmicas",
+  "privacy.unlisted.long": "Oculto dos resultados de pesquisa, destaques e cronologias públicas do Mastodon",
   "privacy.unlisted.short": "Público silencioso",
   "privacy_policy.last_updated": "Última atualização em {date}",
   "privacy_policy.title": "Política de privacidade",
+  "quote_error.poll": "Não é permitido citar sondagens.",
+  "quote_error.quote": "Apenas é permitida uma citação de cada vez.",
+  "quote_error.unauthorized": "Não está autorizado a citar esta publicação.",
+  "quote_error.upload": "Não é permitida a citação com anexos de multimédia.",
   "recommended": "Recomendado",
   "refresh": "Atualizar",
   "regeneration_indicator.please_stand_by": "Aguarda um momento.",
@@ -752,6 +767,9 @@
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "hoje",
+  "remove_quote_hint.button_label": "Entendido",
+  "remove_quote_hint.message": "Pode fazê-lo a partir do {icon} menu de opções.",
+  "remove_quote_hint.title": "Quer remover a sua publicação citada?",
   "reply_indicator.attachments": "{count, plural, one {# anexo} other {# anexos}}",
   "reply_indicator.cancel": "Cancelar",
   "reply_indicator.poll": "Sondagem",
@@ -843,13 +861,23 @@
   "status.admin_account": "Abrir a interface de moderação para @{name}",
   "status.admin_domain": "Abrir interface de moderação para {domain}",
   "status.admin_status": "Abrir esta publicação na interface de moderação",
+  "status.all_disabled": "Impulsos e citações estão desativados",
   "status.block": "Bloquear @{name}",
   "status.bookmark": "Guardar nos marcadores",
   "status.cancel_reblog_private": "Retirar impulso",
+  "status.cannot_quote": "Não lhe é permitido citar esta publicação",
   "status.cannot_reblog": "Esta publicação não pode ser impulsionada",
+  "status.contains_quote": "Contém citação",
+  "status.context.loading": "A carregar mais respostas",
+  "status.context.loading_error": "Não foi possível carregar novas respostas",
+  "status.context.loading_success": "Todas as respostas carregadas",
+  "status.context.more_replies_found": "Foram encontradas mais respostas",
+  "status.context.retry": "Repetir",
+  "status.context.show": "Mostrar",
   "status.continued_thread": "Continuação da conversa",
   "status.copy": "Copiar hiperligação da publicação",
   "status.delete": "Eliminar",
+  "status.delete.success": "Publicação eliminada",
   "status.detailed_status": "Vista pormenorizada da conversa",
   "status.direct": "Mencionar @{name} em privado",
   "status.direct_indicator": "Menção privada",
@@ -872,27 +900,41 @@
   "status.mute_conversation": "Ocultar conversa",
   "status.open": "Expandir esta publicação",
   "status.pin": "Afixar no perfil",
+  "status.quote": "Citação",
+  "status.quote.cancel": "Cancelar citação",
   "status.quote_error.filtered": "Oculto devido a um dos seus filtros",
-  "status.quote_error.not_found": "Esta publicação não pode ser exibida.",
-  "status.quote_error.pending_approval": "Esta publicação está a aguardar a aprovação do autor original.",
-  "status.quote_error.rejected": "Esta publicação não pode ser exibida porque o autor original não permite que seja citada.",
-  "status.quote_error.removed": "Esta publicação foi removida pelo seu autor.",
-  "status.quote_error.unauthorized": "Esta publicação não pode ser exibida porque o utilizador não está autorizado a visualizá-la.",
-  "status.quote_post_author": "Publicação de {name}",
+  "status.quote_error.limited_account_hint.action": "Mostrar na mesma",
+  "status.quote_error.limited_account_hint.title": "Esta conta foi ocultada pelos moderadores de {domain}.",
+  "status.quote_error.not_available": "Publicação indisponível",
+  "status.quote_error.pending_approval": "Publicação pendente",
+  "status.quote_error.pending_approval_popout.body": "No Mastodon, pode controlar se alguém pode citar as suas publicações. Esta publicação está pendente enquanto aguardamos a aprovação do autor original.",
+  "status.quote_error.revoked": "Publicação removida pelo autor",
+  "status.quote_followers_only": "Apenas seguidores podem citar esta publicação",
+  "status.quote_manual_review": "O autor vai proceder a uma revisão manual",
+  "status.quote_noun": "Citação",
+  "status.quote_policy_change": "Alterar quem pode citar",
+  "status.quote_post_author": "Citou uma publicação de @{name}",
+  "status.quote_private": "Publicações privadas não podem ser citadas",
+  "status.quotes": "{count, plural, one {citação} other {citações}}",
+  "status.quotes.empty": "Ainda ninguém citou esta publicação. Quando alguém o fizer, aparecerá aqui.",
   "status.read_more": "Ler mais",
   "status.reblog": "Impulsionar",
-  "status.reblog_private": "Impulsionar com a visibilidade original",
+  "status.reblog_or_quote": "Partilhe ou cite",
+  "status.reblog_private": "Partilhe novamente com os seus seguidores",
   "status.reblogged_by": "{name} impulsionou",
   "status.reblogs": "{count, plural, one {impulso} other {impulsos}}",
   "status.reblogs.empty": "Ainda ninguém impulsionou esta publicação. Quando alguém o fizer, aparecerá aqui.",
   "status.redraft": "Eliminar e reescrever",
   "status.remove_bookmark": "Retirar dos marcadores",
   "status.remove_favourite": "Remover dos favoritos",
+  "status.remove_quote": "Remover",
   "status.replied_in_thread": "Responder na conversa",
   "status.replied_to": "Respondeu a {name}",
   "status.reply": "Responder",
   "status.replyAll": "Responder à conversa",
   "status.report": "Denunciar @{name}",
+  "status.request_quote": "Pedir para citar",
+  "status.revoke_quote": "Remover a minha publicação da publicação de @{name}",
   "status.sensitive_warning": "Conteúdo sensível",
   "status.share": "Partilhar",
   "status.show_less_all": "Ocultar conteúdo sensível em todas",
@@ -930,6 +972,7 @@
   "upload_button.label": "Adicionar imagens, um vídeo ou um ficheiro de som",
   "upload_error.limit": "Limite de envio de ficheiros excedido.",
   "upload_error.poll": "Não é permitido o envio de ficheiros em sondagens.",
+  "upload_error.quote": "Carregamento de ficheiros não é permitido com citações.",
   "upload_form.drag_and_drop.instructions": "Para escolher um anexo multimédia, prima espaço ou enter. Enquanto arrasta, utilize as teclas de setas para mover o anexo multimédia em qualquer direção. Prima espaço ou enter novamente para largar o anexo multimédia na sua nova posição ou prima escape para cancelar.",
   "upload_form.drag_and_drop.on_drag_cancel": "O arrastamento foi cancelado. O anexo multimédia {item} foi descartado.",
   "upload_form.drag_and_drop.on_drag_end": "O anexo multimédia {item} foi descartado.",
@@ -952,5 +995,19 @@
   "video.skip_forward": "Saltar para a frente",
   "video.unmute": "Ativar som",
   "video.volume_down": "Diminuir volume",
-  "video.volume_up": "Aumentar volume"
+  "video.volume_up": "Aumentar volume",
+  "visibility_modal.button_title": "Definir visibilidade",
+  "visibility_modal.header": "Visibilidade e interação",
+  "visibility_modal.helper.direct_quoting": "As menções privadas criadas no Mastodon não podem ser citadas por outras pessoas.",
+  "visibility_modal.helper.privacy_editing": "A visibilidade não pode ser alterada após a publicação ser publicada.",
+  "visibility_modal.helper.privacy_private_self_quote": "As autocitações de publicações privadas não podem ser tornadas públicas.",
+  "visibility_modal.helper.private_quoting": "As publicações apenas para seguidores criadas no Mastodon não podem ser citadas por outras pessoas.",
+  "visibility_modal.helper.unlisted_quoting": "Quando as pessoas o citarem, as publicações delas serão também ocultadas das tendências.",
+  "visibility_modal.instructions": "Controle quem pode interagir com esta publicação. Também pode definir esta configuração para todas as publicações futuras, em <link>Preferências > Padrões de publicação</link>.",
+  "visibility_modal.privacy_label": "Visibilidade",
+  "visibility_modal.quote_followers": "Apenas seguidores",
+  "visibility_modal.quote_label": "Quem pode citar",
+  "visibility_modal.quote_nobody": "Apenas eu",
+  "visibility_modal.quote_public": "Todos",
+  "visibility_modal.save": "Guardar"
 }
diff --git a/app/javascript/mastodon/locales/ro.json b/app/javascript/mastodon/locales/ro.json
index 8128a998a9c..9bf8150ba04 100644
--- a/app/javascript/mastodon/locales/ro.json
+++ b/app/javascript/mastodon/locales/ro.json
@@ -55,7 +55,6 @@
   "account.posts": "Postări",
   "account.posts_with_replies": "Postări și răspunsuri",
   "account.report": "Raportează pe @{name}",
-  "account.requested": "Se așteaptă aprobarea. Apasă pentru a anula cererea de urmărire",
   "account.requested_follow": "{name} A cerut să vă urmărească",
   "account.share": "Distribuie profilul lui @{name}",
   "account.show_reblogs": "Afișează distribuirile de la @{name}",
@@ -178,7 +177,6 @@
   "confirmations.mute.confirm": "Ignoră",
   "confirmations.redraft.confirm": "Șterge și scrie din nou",
   "confirmations.unfollow.confirm": "Dezabonează-te",
-  "confirmations.unfollow.message": "Ești sigur că vrei să te dezabonezi de la {name}?",
   "conversation.delete": "Șterge conversația",
   "conversation.mark_as_read": "Marchează ca citit",
   "conversation.open": "Vizualizează conversația",
@@ -294,9 +292,6 @@
   "home.show_announcements": "Afișează anunțurile",
   "interaction_modal.on_another_server": "Pe un alt server",
   "interaction_modal.on_this_server": "Pe acest server",
-  "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}",
   "intervals.full.days": "{number, plural, one {o zi} few {# zile} other {# de zile}}",
   "intervals.full.hours": "{number, plural, one {o oră} few {# ore} other {# de ore}}",
   "intervals.full.minutes": "{number, plural, one {un minut} few {# minute} other {# de minute}}",
@@ -528,7 +523,6 @@
   "status.pin": "Fixează pe profil",
   "status.read_more": "Citește mai mult",
   "status.reblog": "Impuls",
-  "status.reblog_private": "Impulsionează către audiența originală",
   "status.reblogged_by": "{name} a distribuit",
   "status.reblogs.empty": "Nimeni nu a distribuit această postare până acum. Când cineva o va face, va apărea aici.",
   "status.redraft": "Șterge și adaugă la ciorne",
diff --git a/app/javascript/mastodon/locales/ru.json b/app/javascript/mastodon/locales/ru.json
index c777873db4b..5571a68d760 100644
--- a/app/javascript/mastodon/locales/ru.json
+++ b/app/javascript/mastodon/locales/ru.json
@@ -4,17 +4,17 @@
   "about.default_locale": "по умолчанию",
   "about.disclaimer": "Mastodon — свободное программное обеспечение с открытым исходным кодом и торговая марка Mastodon gGmbH.",
   "about.domain_blocks.no_reason_available": "Причина не указана",
-  "about.domain_blocks.preamble": "Mastodon обычно позволяет просматривать содержимое и взаимодействовать с пользователями любых других серверов в федивёрсе. Вот исключения, сделанные конкретно для этого сервера.",
-  "about.domain_blocks.silenced.explanation": "Как правило, вы не увидите профили и контент с этого сервера, если специально не будете их искать или не подпишетесь на них.",
+  "about.domain_blocks.preamble": "Обычно Mastodon даёт вам возможность просматривать содержимое с любых других серверов в федивёрсе и взаимодействовать с их пользователями. Вот исключения, сделанные конкретно для этого сервера:",
+  "about.domain_blocks.silenced.explanation": "Как правило, вы не увидите профили и содержимое с этого сервера, если только вы не запросите их с помощью поиска или не подпишетесь на пользователя с этого сервера.",
   "about.domain_blocks.silenced.title": "Ограничивается",
-  "about.domain_blocks.suspended.explanation": "Никакие данные с этого сервера не будут обрабатываться, храниться или обмениваться, что делает невозможным любое взаимодействие или связь с пользователями с этого сервера.",
+  "about.domain_blocks.suspended.explanation": "Никакие данные с этого сервера не будут обрабатываться, храниться и обмениваться, что делает невозможным любое взаимодействие и связь с пользователями на этом сервере.",
   "about.domain_blocks.suspended.title": "Заблокирован",
   "about.language_label": "Язык",
-  "about.not_available": "Эта информация не указана на данном сервере.",
+  "about.not_available": "Администраторы сервера предпочли не раскрывать эту информацию.",
   "about.powered_by": "Децентрализованная социальная сеть на базе {mastodon}",
   "about.rules": "Правила сервера",
   "account.account_note_header": "Личная заметка",
-  "account.add_or_remove_from_list": "Управление списками",
+  "account.add_or_remove_from_list": "Добавить в списки",
   "account.badges.bot": "Бот",
   "account.badges.group": "Группа",
   "account.block": "Заблокировать @{name}",
@@ -25,10 +25,10 @@
   "account.cancel_follow_request": "Отозвать запрос на подписку",
   "account.copy": "Копировать ссылку на профиль",
   "account.direct": "Упомянуть @{name} лично",
-  "account.disable_notifications": "Не уведомлять о постах от @{name}",
+  "account.disable_notifications": "Не уведомлять о постах пользователя @{name}",
   "account.domain_blocking": "Домен заблокирован",
   "account.edit_profile": "Редактировать",
-  "account.enable_notifications": "Уведомлять о постах от @{name}",
+  "account.enable_notifications": "Уведомлять о постах пользователя @{name}",
   "account.endorse": "Рекомендовать в профиле",
   "account.familiar_followers_many": "В подписках у {name1}, {name2}, и ещё {othersCount, plural, one {# человека, которого вы знаете} other {# человек, которых вы знаете}}",
   "account.familiar_followers_one": "В подписках у {name1}",
@@ -36,7 +36,7 @@
   "account.featured": "Рекомендации",
   "account.featured.accounts": "Профили",
   "account.featured.hashtags": "Хештеги",
-  "account.featured_tags.last_status_at": "Последний пост {date}",
+  "account.featured_tags.last_status_at": "Последний пост опубликован {date}",
   "account.featured_tags.last_status_never": "Нет постов",
   "account.follow": "Подписаться",
   "account.follow_back": "Подписаться в ответ",
@@ -45,7 +45,7 @@
   "account.followers_counter": "{count, plural, one {{counter} подписчик} few {{counter} подписчика} other {{counter} подписчиков}}",
   "account.followers_you_know_counter": "{count, plural, one {{counter} ваш знакомый} other {{counter} ваших знакомых}}",
   "account.following": "Подписки",
-  "account.following_counter": "{count, plural, one {# подписка} many {# подписок} other {# подписки}}",
+  "account.following_counter": "{count, plural, one {{counter} подписка} few {{counter} подписки} many {{counter} подписок} other {{counter} подписок}}",
   "account.follows.empty": "Этот пользователь пока ни на кого не подписался.",
   "account.follows_you": "Подписан(а) на вас",
   "account.go_to_profile": "Перейти к профилю",
@@ -59,7 +59,7 @@
   "account.mention": "Упомянуть @{name}",
   "account.moved_to": "У {name} теперь новая учётная запись:",
   "account.mute": "Игнорировать @{name}",
-  "account.mute_notifications_short": "Отключить уведомления",
+  "account.mute_notifications_short": "Скрыть уведомления",
   "account.mute_short": "Игнорировать",
   "account.muted": "Игнорируется",
   "account.muting": "Игнорируется",
@@ -70,7 +70,6 @@
   "account.posts_with_replies": "Посты и ответы",
   "account.remove_from_followers": "Убрать {name} из подписчиков",
   "account.report": "Пожаловаться на @{name}",
-  "account.requested": "Ожидает подтверждения. Нажмите для отмены запроса",
   "account.requested_follow": "{name} отправил(а) вам запрос на подписку",
   "account.requests_to_follow_you": "Отправил(а) вам запрос на подписку",
   "account.share": "Поделиться профилем @{name}",
@@ -83,7 +82,7 @@
   "account.unendorse": "Не рекомендовать в профиле",
   "account.unfollow": "Отписаться",
   "account.unmute": "Не игнорировать @{name}",
-  "account.unmute_notifications_short": "Включить уведомления",
+  "account.unmute_notifications_short": "Показать уведомления",
   "account.unmute_short": "Не игнорировать",
   "account_note.placeholder": "Текст заметки",
   "admin.dashboard.daily_retention": "Уровень удержания пользователей после регистрации, в днях",
@@ -129,10 +128,10 @@
   "annual_report.summary.thanks": "Спасибо за то, что были вместе с Mastodon!",
   "attachments_list.unprocessed": "(не обработан)",
   "audio.hide": "Скрыть аудио",
-  "block_modal.remote_users_caveat": "Мы попросим сервер {domain} уважать ваше решение, однако соблюдение им блокировки не гарантировано, поскольку некоторые серверы могут по-разному обрабатывать запросы. Публичные посты по-прежнему могут быть видны неавторизованным пользователям.",
+  "block_modal.remote_users_caveat": "Мы попросим сервер {domain} уважать ваше решение, однако нельзя гарантировать, что он будет соблюдать блокировку, поскольку некоторые серверы могут по-разному обрабатывать запросы. Публичные посты по-прежнему могут быть видны неавторизованным пользователям.",
   "block_modal.show_less": "Показать меньше",
   "block_modal.show_more": "Показать больше",
-  "block_modal.they_cant_mention": "Он не сможет упоминать вас или подписаться на вас.",
+  "block_modal.they_cant_mention": "Он не сможет ни упоминать вас, ни подписаться на вас.",
   "block_modal.they_cant_see_posts": "Он не сможет видеть ваши посты, а вы не будете видеть его посты.",
   "block_modal.they_will_know": "Он будет знать, что вы его блокируете.",
   "block_modal.title": "Заблокировать пользователя?",
@@ -141,21 +140,21 @@
   "boost_modal.reblog": "Продвинуть пост?",
   "boost_modal.undo_reblog": "Отменить продвижение?",
   "bundle_column_error.copy_stacktrace": "Копировать отчёт об ошибке",
-  "bundle_column_error.error.body": "Запрошенная страница не может быть отображена. Это может быть вызвано ошибкой в нашем коде или проблемой совместимости браузера.",
+  "bundle_column_error.error.body": "Запрошенная страница не может быть отображена. Это могло произойти из-за ошибки в нашем коде или из-за проблемы совместимости браузера.",
   "bundle_column_error.error.title": "О нет!",
-  "bundle_column_error.network.body": "При загрузке этой страницы произошла ошибка. Это может быть вызвано временными проблемами с вашим подключением к интернету или ошибкой на сервере.",
+  "bundle_column_error.network.body": "При загрузке этой страницы произошла ошибка. Она могла быть вызвана временными проблемами либо с вашим подключением к интернету, либо с этим сервером.",
   "bundle_column_error.network.title": "Ошибка сети",
   "bundle_column_error.retry": "Попробовать снова",
   "bundle_column_error.return": "Вернуться на главную",
   "bundle_column_error.routing.body": "Запрошенная страница не найдена. Вы уверены, что в адресной строке указан правильный URL?",
   "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "Закрыть",
-  "bundle_modal_error.message": "Что-то пошло не так при загрузке этой страницы.",
+  "bundle_modal_error.message": "Кое-что пошло не так при загрузке этой страницы.",
   "bundle_modal_error.retry": "Попробовать снова",
-  "closed_registrations.other_server_instructions": "Поскольку Mastodon децентрализован, вы можете зарегистрироваться на другом сервере и всё равно взаимодействовать с этим сервером.",
+  "closed_registrations.other_server_instructions": "Благодаря тому что Mastodon децентрализован, вы можете взаимодействовать с этим сервером, даже если зарегистрируетесь на другом сервере.",
   "closed_registrations_modal.description": "Зарегистрироваться на {domain} сейчас не выйдет, но имейте в виду, что вам не нужна учётная запись именно на {domain}, чтобы использовать Mastodon.",
   "closed_registrations_modal.find_another_server": "Найти другой сервер",
-  "closed_registrations_modal.preamble": "Mastodon децентрализован, поэтому независимо от того, где именно вы зарегистрируетесь, вы сможете подписываться и взаимодействовать с кем угодно на этом сервере. Вы даже можете создать свой собственный сервер!",
+  "closed_registrations_modal.preamble": "Mastodon децентрализован, поэтому независимо от того, где именно вы зарегистрируетесь, вы сможете подписываться на кого угодно и взаимодействовать с кем угодно на этом сервере. Вы даже можете создать свой собственный сервер!",
   "closed_registrations_modal.title": "Регистрация в Mastodon",
   "column.about": "О проекте",
   "column.blocks": "Заблокированные пользователи",
@@ -163,14 +162,14 @@
   "column.community": "Локальная лента",
   "column.create_list": "Создать список",
   "column.direct": "Личные упоминания",
-  "column.directory": "Просмотр профилей",
+  "column.directory": "Каталог профилей",
   "column.domain_blocks": "Заблокированные домены",
   "column.edit_list": "Редактировать список",
   "column.favourites": "Избранное",
   "column.firehose": "Живая лента",
   "column.follow_requests": "Запросы на подписку",
   "column.home": "Главная",
-  "column.list_members": "Добавить или удалить из списка",
+  "column.list_members": "Пользователи в списке",
   "column.lists": "Списки",
   "column.mutes": "Игнорируемые пользователи",
   "column.notifications": "Уведомления",
@@ -239,15 +238,20 @@
   "confirmations.missing_alt_text.secondary": "Опубликовать",
   "confirmations.missing_alt_text.title": "Добавить альтернативный текст?",
   "confirmations.mute.confirm": "Игнорировать",
+  "confirmations.quiet_post_quote_info.dismiss": "Больше не показывать",
+  "confirmations.quiet_post_quote_info.got_it": "Понятно",
+  "confirmations.quiet_post_quote_info.message": "Если вы цитируете публикацию, опубликованную в открытом доступе, ваша публикация будет скрыта от новостных лент.",
+  "confirmations.quiet_post_quote_info.title": "Цитирование тихих публичных постов",
   "confirmations.redraft.confirm": "Удалить и исправить",
-  "confirmations.redraft.message": "Вы уверены, что хотите удалить этот пост и создать его заново? Взаимодействия, такие как добавление в избранное или продвижение, будут потеряны, а ответы к оригинальному посту перестанут на него ссылаться.",
+  "confirmations.redraft.message": "Вы уверены, что хотите удалить этот пост и создать его заново? Взаимодействия, такие как добавление в избранное и продвижение, будут потеряны, а ответы к оригинальному посту перестанут на него ссылаться.",
   "confirmations.redraft.title": "Удалить и создать пост заново?",
   "confirmations.remove_from_followers.confirm": "Убрать подписчика",
   "confirmations.remove_from_followers.message": "Пользователь {name} перестанет быть подписан на вас. Продолжить?",
   "confirmations.remove_from_followers.title": "Убрать подписчика?",
+  "confirmations.revoke_quote.confirm": "Удалить публикацию",
+  "confirmations.revoke_quote.message": "Это действие нельзя будет отменить.",
+  "confirmations.revoke_quote.title": "Удалить публикацию?",
   "confirmations.unfollow.confirm": "Отписаться",
-  "confirmations.unfollow.message": "Вы уверены, что хотите отписаться от {name}?",
-  "confirmations.unfollow.title": "Отписаться?",
   "content_warning.hide": "Скрыть пост",
   "content_warning.show": "Всё равно показать",
   "content_warning.show_more": "Развернуть",
@@ -264,7 +268,7 @@
   "directory.recently_active": "Недавно активные",
   "disabled_account_banner.account_settings": "Настройки учётной записи",
   "disabled_account_banner.text": "Ваша учётная запись {disabledAccount} в настоящее время отключена.",
-  "dismissable_banner.community_timeline": "Это самые новые публичные посты от тех пользователей, чьи учётные записи находятся на сервере {domain}.",
+  "dismissable_banner.community_timeline": "Это самые новые публичные посты от тех пользователей, чьи учётные записи размещены на сервере {domain}.",
   "dismissable_banner.dismiss": "Закрыть",
   "dismissable_banner.public_timeline": "Это самые новые публичные посты от всех тех людей в федивёрсе, на которых подписаны пользователи {domain}.",
   "domain_block_modal.block": "Заблокировать сервер",
@@ -273,11 +277,11 @@
   "domain_block_modal.they_cant_follow": "Пользователи с этого сервера не смогут подписаться на вас.",
   "domain_block_modal.they_wont_know": "Пользователи с этого сервера не будут знать, что вы их блокируете.",
   "domain_block_modal.title": "Заблокировать домен?",
-  "domain_block_modal.you_will_lose_num_followers": "Вы потеряете {followersCount, plural, one {{followersCountDisplay} подписчика} few {{followersCountDisplay} подписчика} other {{followersCountDisplay} подписчиков}} и {followingCount, plural, one {{followingCountDisplay} подписку} few {{followingCountDisplay} подписки} other {{followingCountDisplay} подписок}}.",
+  "domain_block_modal.you_will_lose_num_followers": "Вы потеряете {followersCount, plural, one {{followersCountDisplay} подписчика} few {{followersCountDisplay} подписчиков} other {{followersCountDisplay} подписчиков}} и {followingCount, plural, one {{followingCountDisplay} подписку} few {{followingCountDisplay} подписки} other {{followingCountDisplay} подписок}}.",
   "domain_block_modal.you_will_lose_relationships": "Вы потеряете все подписки и всех подписчиков с этого сервера.",
-  "domain_block_modal.you_wont_see_posts": "Вы не будете видеть посты или уведомления от пользователей с этого сервера.",
+  "domain_block_modal.you_wont_see_posts": "Вы не будете видеть посты и уведомления от пользователей с этого сервера.",
   "domain_pill.activitypub_lets_connect": "Благодаря ему вы можете связываться и взаимодействовать не только с пользователями Mastodon, но и с пользователями других платформ.",
-  "domain_pill.activitypub_like_language": "ActivityPub это язык, на котором Mastodon говорит с другими социальными сетями.",
+  "domain_pill.activitypub_like_language": "ActivityPub — это язык, на котором Mastodon говорит с другими социальными сетями.",
   "domain_pill.server": "Сервер",
   "domain_pill.their_handle": "Адрес пользователя:",
   "domain_pill.their_server": "Цифровой дом пользователя, где находятся все его посты.",
@@ -289,6 +293,7 @@
   "domain_pill.your_handle": "Ваш адрес:",
   "domain_pill.your_server": "Ваш цифровой дом, где находятся все ваши посты. Если вам не нравится этот сервер, вы можете в любое время перенести свою учётную запись на другой сервер, не теряя подписчиков.",
   "domain_pill.your_username": "Ваш уникальный идентификатор на этом сервере. На разных серверах могут встречаться люди с тем же именем пользователя.",
+  "dropdown.empty": "Выберите опцию",
   "embed.instructions": "Встройте этот пост на свой сайт, скопировав следующий код:",
   "embed.preview": "Так это будет выглядеть:",
   "emoji_button.activity": "Занятия",
@@ -319,8 +324,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": "С этим хештегом пока ещё никто ничего не опубликовал.",
@@ -346,24 +351,24 @@
   "featured_carousel.post": "Пост",
   "featured_carousel.previous": "Предыдущий",
   "featured_carousel.slide": "{index} из {total}",
-  "filter_modal.added.context_mismatch_explanation": "Этот фильтр не применяется в том контексте, в котором вы видели этот пост. Если вы хотите, чтобы пост был отфильтрован в этом контексте, необходимо редактировать фильтр.",
-  "filter_modal.added.context_mismatch_title": "Несоответствие контекста!",
+  "filter_modal.added.context_mismatch_explanation": "Этот фильтр не применяется в том контексте, в котором вы видели этот пост. Если вы хотите, чтобы пост был отфильтрован в текущем контексте, необходимо редактировать фильтр.",
+  "filter_modal.added.context_mismatch_title": "Несоответствие контекста",
   "filter_modal.added.expired_explanation": "Этот фильтр истёк. Чтобы он был применён, вам нужно изменить срок действия фильтра.",
-  "filter_modal.added.expired_title": "Истёкший фильтр!",
+  "filter_modal.added.expired_title": "Истёкший фильтр",
   "filter_modal.added.review_and_configure": "Для просмотра или редактирования этого фильтра перейдите в {settings_link}.",
   "filter_modal.added.review_and_configure_title": "Настройки фильтра",
   "filter_modal.added.settings_link": "настройки",
   "filter_modal.added.short_explanation": "Этот пост был добавлен к фильтру «{title}».",
-  "filter_modal.added.title": "Фильтр добавлен!",
+  "filter_modal.added.title": "Фильтр добавлен",
   "filter_modal.select_filter.context_mismatch": "не применяется в этом контексте",
   "filter_modal.select_filter.expired": "истёкший",
   "filter_modal.select_filter.prompt_new": "Новый фильтр: {name}",
-  "filter_modal.select_filter.search": "Поиск или название нового фильтра",
+  "filter_modal.select_filter.search": "Поиск (или введите название нового фильтра)",
   "filter_modal.select_filter.subtitle": "Используйте существующий фильтр или создайте новый",
   "filter_modal.select_filter.title": "Фильтровать этот пост",
   "filter_modal.title.status": "Фильтровать пост",
   "filter_warning.matches_filter": "Соответствует фильтру «<span>{title}</span>»",
-  "filtered_notifications_banner.pending_requests": "От {count, plural, =0 {не знакомых вам людей} one {# человека, которого вы можете знать} other {# человек, которых вы можете знать}}",
+  "filtered_notifications_banner.pending_requests": "От {count, plural, =0 {незнакомых вам людей} one {# человека, которого вы можете знать} other {# человек, которых вы можете знать}}",
   "filtered_notifications_banner.title": "Отфильтрованные уведомления",
   "firehose.all": "Всё вместе",
   "firehose.local": "Этот сервер",
@@ -413,26 +418,24 @@
   "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.feature": "Рекомендовать в профиле",
-  "hashtag.follow": "Подписаться на новые посты",
+  "hashtag.follow": "Подписаться на хештег",
   "hashtag.mute": "Игнорировать #{hashtag}",
   "hashtag.unfeature": "Не рекомендовать в профиле",
-  "hashtag.unfollow": "Отписаться от новых постов",
+  "hashtag.unfollow": "Отписаться от хештега",
   "hashtags.and_other": "…и {count, plural, other {ещё #}}",
-  "hints.profiles.followers_may_be_missing": "Некоторые подписчики этого профиля могут отсутствовать.",
-  "hints.profiles.follows_may_be_missing": "Некоторые подписки этого профиля могут отсутствовать.",
-  "hints.profiles.posts_may_be_missing": "Некоторые посты в этом профиле могут отсутствовать.",
+  "hints.profiles.followers_may_be_missing": "Некоторые подписчики этого профиля могут здесь отсутствовать.",
+  "hints.profiles.follows_may_be_missing": "Некоторые подписки этого профиля могут здесь отсутствовать.",
+  "hints.profiles.posts_may_be_missing": "Некоторые посты в этом профиле могут здесь отсутствовать.",
   "hints.profiles.see_more_followers": "Перейдите на {domain}, чтобы увидеть всех подписчиков",
   "hints.profiles.see_more_follows": "Перейдите на {domain}, чтобы увидеть все подписки",
   "hints.profiles.see_more_posts": "Перейдите на {domain}, чтобы увидеть все посты",
-  "hints.threads.replies_may_be_missing": "Некоторые ответы с других серверов могут отсутствовать.",
-  "hints.threads.see_more": "Перейдите на {domain}, чтобы увидеть все ответы",
   "home.column_settings.show_quotes": "Показывать цитирования",
   "home.column_settings.show_reblogs": "Показывать продвижения",
   "home.column_settings.show_replies": "Показывать ответы",
   "home.hide_announcements": "Скрыть объявления",
   "home.pending_critical_update.body": "Пожалуйста, обновите свой сервер Mastodon как можно скорее!",
   "home.pending_critical_update.link": "Посмотреть обновления",
-  "home.pending_critical_update.title": "Доступно критическое обновление безопасности!",
+  "home.pending_critical_update.title": "Доступно критическое обновление безопасности",
   "home.show_announcements": "Показать объявления",
   "ignore_notifications_modal.disclaimer": "Mastodon не может сообщить пользователям, что вы игнорируете их уведомления. Игнорирование уведомлений не остановит отправку самих сообщений.",
   "ignore_notifications_modal.filter_instead": "Фильтровать",
@@ -447,26 +450,18 @@
   "ignore_notifications_modal.private_mentions_title": "Игнорировать уведомления о нежелательных личных упоминаниях?",
   "info_button.label": "Помощь",
   "info_button.what_is_alt_text": "<h1>Что это такое?</h1> <p>Альтернативный текст содержит описание изображения для людей с ограничениями зрения, медленным интернетом и для тех, кому нужен дополнительный контекст.</p> <p>Вы можете улучшить доступность и понимание для всех, написав чёткий, краткий и объективный альтернативный текст.</p> <ul> <li>Уловите важные элементы</li> <li>Перескажите текстовую информацию на изображении</li> <li>Используйте правильную структуру предложений</li> <li>Избегайте избыточной информации</li> <li>Сосредоточьтесь на тенденциях и ключевых выводах при описании сложных визуализаций, таких как диаграммы или карты</li> </ul>",
-  "interaction_modal.action.favourite": "Вы можете добавить этот пост в избранное со своей учётной записью.",
-  "interaction_modal.action.follow": "Вы можете подписаться со своей учётной записью.",
-  "interaction_modal.action.reblog": "Вы можете продвинуть этот пост со своей учётной записью.",
-  "interaction_modal.action.reply": "Вы можете ответить на этот пост со своей учётной записью.",
-  "interaction_modal.action.vote": "Вы можете проголосовать в этом опросе со своей учётной записью.",
+  "interaction_modal.action": "Для взаимодействия с сообщением {name} необходимо войти в свою учетную запись на любом сервере Mastodon.",
   "interaction_modal.go": "Вперёд!",
   "interaction_modal.no_account_yet": "У вас нет никакой учётной записи?",
   "interaction_modal.on_another_server": "На другом сервере",
   "interaction_modal.on_this_server": "На этом сервере",
-  "interaction_modal.title.favourite": "Добавить пост {name} в избранное",
-  "interaction_modal.title.follow": "Подписаться на {name}",
-  "interaction_modal.title.reblog": "Продвинуть пост {name}",
-  "interaction_modal.title.reply": "Ответить на пост {name}",
-  "interaction_modal.title.vote": "Голосовать в опросе {name}",
+  "interaction_modal.title": "Войдите, чтобы продолжить",
   "interaction_modal.username_prompt": "Например, {example}",
   "intervals.full.days": "{number, plural, one {# день} few {# дня} other {# дней}}",
   "intervals.full.hours": "{number, plural, one {# час} few {# часа} other {# часов}}",
   "intervals.full.minutes": "{number, plural, one {# минута} few {# минуты} other {# минут}}",
   "keyboard_shortcuts.back": "перейти назад",
-  "keyboard_shortcuts.blocked": "открыть список заблокированных",
+  "keyboard_shortcuts.blocked": "открыть список заблокированных пользователей",
   "keyboard_shortcuts.boost": "продвинуть пост",
   "keyboard_shortcuts.column": "фокус на одном из столбцов",
   "keyboard_shortcuts.compose": "фокус на поле ввода",
@@ -481,14 +476,16 @@
   "keyboard_shortcuts.home": "перейти к домашней ленте",
   "keyboard_shortcuts.hotkey": "Горячая клавиша",
   "keyboard_shortcuts.legend": "показать эту справку",
+  "keyboard_shortcuts.load_more": "Акцент на кнопке «Загрузить ещё»",
   "keyboard_shortcuts.local": "перейти к локальной ленте",
   "keyboard_shortcuts.mention": "упомянуть автора поста",
-  "keyboard_shortcuts.muted": "открыть список игнорируемых",
+  "keyboard_shortcuts.muted": "открыть список игнорируемых пользователей",
   "keyboard_shortcuts.my_profile": "перейти к своему профилю",
   "keyboard_shortcuts.notifications": "перейти к уведомлениям",
   "keyboard_shortcuts.open_media": "открыть медиа",
   "keyboard_shortcuts.pinned": "перейти к закреплённым постам",
   "keyboard_shortcuts.profile": "перейти к профилю автора",
+  "keyboard_shortcuts.quote": "Цитировать пост",
   "keyboard_shortcuts.reply": "ответить",
   "keyboard_shortcuts.requests": "перейти к запросам на подписку",
   "keyboard_shortcuts.search": "перейти к поиску",
@@ -500,6 +497,8 @@
   "keyboard_shortcuts.translate": "перевести пост",
   "keyboard_shortcuts.unfocus": "убрать фокус с поля ввода/поиска",
   "keyboard_shortcuts.up": "вверх по списку",
+  "learn_more_link.got_it": "Понятно",
+  "learn_more_link.learn_more": "Подробнее",
   "lightbox.close": "Закрыть",
   "lightbox.next": "Далее",
   "lightbox.previous": "Назад",
@@ -546,7 +545,7 @@
   "mute_modal.they_can_mention_and_follow": "Он сможет упоминать вас и подписаться на вас, но вы этого не увидите.",
   "mute_modal.they_wont_know": "Он не будет знать, что вы его игнорируете.",
   "mute_modal.title": "Игнорировать пользователя?",
-  "mute_modal.you_wont_see_mentions": "Вы не увидите посты, которые его упоминают.",
+  "mute_modal.you_wont_see_mentions": "Вы не будете видеть посты, упоминающие его.",
   "mute_modal.you_wont_see_posts": "Он по-прежнему сможет видеть ваши посты, но вы не будете видеть его посты.",
   "navigation_bar.about": "О проекте",
   "navigation_bar.account_settings": "Пароль и безопасность",
@@ -587,7 +586,7 @@
   "notification.admin.report_statuses_other": "{name} пожаловался (-лась) на {target}",
   "notification.admin.sign_up": "{name} зарегистрировался (-лась) на сервере",
   "notification.admin.sign_up.name_and_others": "{name} и ещё {count, plural, one {# пользователь} few {# пользователя} other {# пользователей}} зарегистрировались на сервере",
-  "notification.annual_report.message": "#Wrapstodon за {year} год ждёт вас! Откройте для себя итоги и памятные моменты этого года в Mastodon!",
+  "notification.annual_report.message": "#Wrapstodon за {year} год ждёт вас! Откройте для себя итоги и памятные моменты этого года в Mastodon.",
   "notification.annual_report.view": "Перейти к #Wrapstodon",
   "notification.favourite": "{name} добавил(а) ваш пост в избранное",
   "notification.favourite.name_and_others_with_link": "{name} и ещё <a>{count, plural, one {# пользователь} few {# пользователя} other {# пользователей}}</a> добавили ваш пост в избранное",
@@ -600,6 +599,7 @@
   "notification.label.mention": "Упоминание",
   "notification.label.private_mention": "Личное упоминание",
   "notification.label.private_reply": "Приватный ответ",
+  "notification.label.quote": "{name} процитировал(а) ваш пост",
   "notification.label.reply": "Ответ",
   "notification.mention": "Упоминание",
   "notification.mentioned_you": "{name} упомянул(а) вас",
@@ -607,20 +607,21 @@
   "notification.moderation_warning": "Модераторы вынесли вам предупреждение",
   "notification.moderation_warning.action_delete_statuses": "Некоторые ваши посты были удалены.",
   "notification.moderation_warning.action_disable": "Ваша учётная запись была отключена.",
-  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Некоторые ваши посты были отмечены как контент деликатного характера.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Некоторые ваши посты были отмечены как содержимое деликатного характера.",
   "notification.moderation_warning.action_none": "Модераторы вынесли вам предупреждение.",
-  "notification.moderation_warning.action_sensitive": "С этого момента все ваши новые посты будут отмечены как контент деликатного характера.",
+  "notification.moderation_warning.action_sensitive": "С этого момента все ваши новые посты будут отмечены как содержимое деликатного характера.",
   "notification.moderation_warning.action_silence": "Ваша учётная запись была ограничена.",
   "notification.moderation_warning.action_suspend": "Ваша учётная запись была заблокирована.",
   "notification.own_poll": "Ваш опрос завершился",
   "notification.poll": "Опрос, в котором вы приняли участие, завершился",
+  "notification.quoted_update": "{name} отредактировал процитированное вами сообщение",
   "notification.reblog": "{name} продвинул(а) ваш пост",
   "notification.reblog.name_and_others_with_link": "{name} и ещё <a>{count, plural, one {# пользователь} few {# пользователя} other {# пользователей}}</a> продвинули ваш пост",
   "notification.relationships_severance_event": "Разорвана связь с {name}",
-  "notification.relationships_severance_event.account_suspension": "Администратор сервера {from} заблокировал сервер {target}, поэтому вы больше не сможете получать обновления от людей с этого сервера или взаимодействовать с ними.",
-  "notification.relationships_severance_event.domain_block": "Администратор сервера {from} заблокировал сервер {target}, где размещены учётные записи у {followersCount} ваших подписчиков и {followingCount, plural, one {# пользователя, на которого вы подписаны} other {# пользователей, на которых вы подписаны}}.",
+  "notification.relationships_severance_event.account_suspension": "Администратор сервера {from} заблокировал сервер {target}, поэтому вы больше не сможете получать обновления от людей с этого сервера и взаимодействовать с ними.",
+  "notification.relationships_severance_event.domain_block": "Администратор сервера {from} заблокировал сервер {target}, где размещены учётные записи {followersCount} ваших подписчиков и {followingCount, plural, one {# пользователя, на которого вы подписаны} other {# пользователей, на которых вы подписаны}}.",
   "notification.relationships_severance_event.learn_more": "Узнать больше",
-  "notification.relationships_severance_event.user_domain_block": "Вы заблокировали сервер {target}, где размещены учётные записи у {followersCount} ваших подписчиков и {followingCount, plural, one {# пользователя, на которого вы подписаны} other {# пользователей, на которых вы подписаны}}.",
+  "notification.relationships_severance_event.user_domain_block": "Вы заблокировали сервер {target}, где размещены учётные записи {followersCount} ваших подписчиков и {followingCount, plural, one {# пользователя, на которого вы подписаны} other {# пользователей, на которых вы подписаны}}.",
   "notification.status": "{name} опубликовал(а) новый пост",
   "notification.update": "{name} отредактировал(а) пост",
   "notification_requests.accept": "Принять",
@@ -657,6 +658,7 @@
   "notifications.column_settings.mention": "Вас упомянули в посте:",
   "notifications.column_settings.poll": "Опрос, в котором вы приняли участие, завершился:",
   "notifications.column_settings.push": "Push-уведомления",
+  "notifications.column_settings.quote": "Ваш пост процитировали:",
   "notifications.column_settings.reblog": "Ваш пост продвинули:",
   "notifications.column_settings.show": "Отображать в списке",
   "notifications.column_settings.sound": "Проигрывать звук",
@@ -691,11 +693,11 @@
   "notifications.policy.filter_not_followers_title": "Люди, не подписанные на вас",
   "notifications.policy.filter_not_following_hint": "Пока вы не одобрите их вручную",
   "notifications.policy.filter_not_following_title": "Люди, на которых вы не подписаны",
-  "notifications.policy.filter_private_mentions_hint": "Фильтруются, если только это не ответ на ваше собственное упоминание или если вы подписаны на отправителя",
+  "notifications.policy.filter_private_mentions_hint": "Не фильтруются ответы на ваши собственные упоминания, а также личные упоминания от пользователей, на которых вы подписаны",
   "notifications.policy.filter_private_mentions_title": "Нежелательные личные упоминания",
   "notifications.policy.title": "Управление уведомлениями",
   "notifications_permission_banner.enable": "Включить уведомления",
-  "notifications_permission_banner.how_to_control": "Чтобы получать уведомления, даже когда Mastodon закрыт, включите уведомления на рабочем столе. После того как вы их включите, вы сможете тонко настроить, о каких видах взаимодействий вы будете оповещены через уведомления на рабочем столе, нажав на кнопку {icon} выше.",
+  "notifications_permission_banner.how_to_control": "Чтобы получать уведомления, даже когда Mastodon закрыт, включите уведомления на рабочем столе. После того как вы их включите, вы сможете тонко настроить виды взаимодействий, о которых вы будете оповещены через уведомления на рабочем столе, нажав на кнопку {icon} выше.",
   "notifications_permission_banner.title": "Будьте в курсе происходящего",
   "onboarding.follows.back": "Назад",
   "onboarding.follows.done": "Готово",
@@ -707,7 +709,7 @@
   "onboarding.profile.display_name": "Отображаемое имя",
   "onboarding.profile.display_name_hint": "Ваше полное имя или псевдоним…",
   "onboarding.profile.note": "О себе",
-  "onboarding.profile.note_hint": "Вы можете @упоминать других людей или использовать #хештеги…",
+  "onboarding.profile.note_hint": "Вы можете @упоминать других людей, а также использовать #хештеги…",
   "onboarding.profile.save_and_continue": "Сохранить и продолжить",
   "onboarding.profile.title": "Создайте свой профиль",
   "onboarding.profile.upload_avatar": "Загрузить фото профиля",
@@ -732,31 +734,41 @@
   "privacy.private.short": "Для подписчиков",
   "privacy.public.long": "Для кого угодно в интернете",
   "privacy.public.short": "Публичный",
+  "privacy.quote.anyone": "{visibility}, каждый может процитировать",
+  "privacy.quote.disabled": "{visibility}, цитаты отключены",
+  "privacy.quote.limited": "{visibility}, цитаты ограничены",
   "privacy.unlisted.additional": "Похоже на «Публичный» за исключением того, что пост не появится ни в живых лентах, ни в лентах хештегов, ни в разделе «Актуальное», ни в поиске Mastodon, даже если вы разрешили поиск по своим постам в настройках профиля.",
-  "privacy.unlisted.long": "Меньше алгоритмических фанфар",
+  "privacy.unlisted.long": "Скрыто от результатов поиска Mastodon, трендов и публичных графиков",
   "privacy.unlisted.short": "Тихий публичный",
   "privacy_policy.last_updated": "Последнее обновление: {date}",
   "privacy_policy.title": "Политика конфиденциальности",
+  "quote_error.poll": "Цитирование не допускается при голосовании.",
+  "quote_error.quote": "Одновременно допускается только одна цитата.",
+  "quote_error.unauthorized": "Вы не имеете права цитировать этот пост.",
+  "quote_error.upload": "Цитирование с использованием медиа вложений запрещено.",
   "recommended": "Рекомендуется",
   "refresh": "Обновить",
   "regeneration_indicator.please_stand_by": "Пожалуйста, подождите.",
   "regeneration_indicator.preparing_your_home_feed": "Готовим вашу ленту…",
-  "relative_time.days": "{number} д",
+  "relative_time.days": "{number} д.",
   "relative_time.full.days": "{number, plural, one {# день} many {# дней} other {# дня}} назад",
   "relative_time.full.hours": "{number, plural, one {# час} many {# часов} other {# часа}} назад",
   "relative_time.full.just_now": "только что",
   "relative_time.full.minutes": "{number, plural, one {# минуту} many {# минут} other {# минуты}} назад",
   "relative_time.full.seconds": "{number, plural, one {# секунду} many {# секунд} other {# секунды}} назад",
-  "relative_time.hours": "{number} ч",
+  "relative_time.hours": "{number} ч.",
   "relative_time.just_now": "только что",
-  "relative_time.minutes": "{number} мин",
-  "relative_time.seconds": "{number} с",
+  "relative_time.minutes": "{number} мин.",
+  "relative_time.seconds": "{number} с.",
   "relative_time.today": "сегодня",
+  "remove_quote_hint.button_label": "Понятно",
+  "remove_quote_hint.message": "Вы можете сделать это из меню настроек {icon}.",
+  "remove_quote_hint.title": "Хотите удалить цитируемый вами пост?",
   "reply_indicator.attachments": "{count, plural, one {# вложение} few {# вложения} other {# вложений}}",
   "reply_indicator.cancel": "Отмена",
   "reply_indicator.poll": "Опрос",
   "report.block": "Заблокировать",
-  "report.block_explanation": "Вы не будете видеть посты этого пользователя. Этот пользователь не сможет видеть ваши посты и не сможет подписаться на вас. Пользователь будет знать, что вы его блокируете.",
+  "report.block_explanation": "Вы не будете видеть посты этого пользователя. Этот пользователь не сможет ни видеть ваши посты, ни подписаться на вас. Пользователь будет знать, что вы его блокируете.",
   "report.categories.legal": "Нарушение закона",
   "report.categories.other": "Другое",
   "report.categories.spam": "Спам",
@@ -780,7 +792,7 @@
   "report.reasons.other": "Другое",
   "report.reasons.other_description": "Проблема не соответствует ни одной категории",
   "report.reasons.spam": "Это спам",
-  "report.reasons.spam_description": "Вредоносные ссылки, фальшивая активность (накрутка) или повторяющиеся однообразные ответы",
+  "report.reasons.spam_description": "Вредоносные ссылки, фальшивая активность или повторяющиеся однообразные ответы",
   "report.reasons.violation": "Нарушаются правила сервера",
   "report.reasons.violation_description": "Выберите, если знаете, что подобное нарушает определённые правила",
   "report.rules.subtitle": "Выберите все подходящие варианты",
@@ -826,7 +838,7 @@
   "search_results.all": "Все",
   "search_results.hashtags": "Хештеги",
   "search_results.no_results": "Ничего не найдено.",
-  "search_results.no_search_yet": "Попробуйте поискать посты, профили или хэштеги.",
+  "search_results.no_search_yet": "Попробуйте поискать посты, профили или хештеги.",
   "search_results.see_all": "Показать все",
   "search_results.statuses": "Посты",
   "search_results.title": "Поиск \"{q}\"",
@@ -836,32 +848,34 @@
   "server_banner.is_one_of_many": "{domain} — это один из многих независимых серверов Mastodon, которые вы можете использовать, чтобы присоединиться к сети Fediverse.",
   "server_banner.server_stats": "Статистика сервера:",
   "sign_in_banner.create_account": "Зарегистрироваться",
-  "sign_in_banner.follow_anyone": "Подписывайтесь на кого угодно в федивёрсе и читайте ленту в хронологическом порядке. Никаких алгоритмов, рекламы или кликбейта.",
+  "sign_in_banner.follow_anyone": "Подписывайтесь на кого угодно в федивёрсе и читайте ленту в хронологическом порядке. Никаких алгоритмов, рекламы и кликбейта.",
   "sign_in_banner.mastodon_is": "Mastodon — лучший способ быть в курсе всего происходящего.",
   "sign_in_banner.sign_in": "Войти",
   "sign_in_banner.sso_redirect": "Вход/Регистрация",
   "status.admin_account": "Открыть интерфейс модератора для @{name}",
   "status.admin_domain": "Открыть интерфейс модератора для {domain}",
   "status.admin_status": "Открыть этот пост в интерфейсе модератора",
+  "status.all_disabled": "Бусты и цитаты отключены",
   "status.block": "Заблокировать @{name}",
   "status.bookmark": "Добавить в закладки",
   "status.cancel_reblog_private": "Отменить продвижение",
   "status.cannot_reblog": "Этот пост не может быть продвинут",
-  "status.continued_thread": "Продолжение треда",
+  "status.continued_thread": "Продолжение предыдущего поста",
   "status.copy": "Скопировать ссылку на пост",
   "status.delete": "Удалить",
+  "status.delete.success": "Пост удален",
   "status.detailed_status": "Подробный просмотр обсуждения",
   "status.direct": "Упомянуть @{name} лично",
   "status.direct_indicator": "Личное упоминание",
   "status.edit": "Редактировать",
-  "status.edited": "Дата последнего изменения: {date}",
+  "status.edited": "Последнее изменение: {date}",
   "status.edited_x_times": "{count, plural, one {{count} изменение} many {{count} изменений} other {{count} изменения}}",
   "status.embed": "Встроить на свой сайт",
   "status.favourite": "Добавить в избранное",
   "status.favourites": "{count, plural, one {звёздочка} few {звёздочки} other {звёздочек}}",
   "status.filter": "Фильтровать этот пост",
-  "status.history.created": "{name} создал(а) {date}",
-  "status.history.edited": "{name} отредактировал(а) {date}",
+  "status.history.created": "{name} создал(а) пост {date}",
+  "status.history.edited": "{name} отредактировал(а) пост {date}",
   "status.load_more": "Загрузить ещё",
   "status.media.open": "Нажмите, чтобы открыть.",
   "status.media.show": "Нажмите, чтобы показать",
@@ -872,23 +886,38 @@
   "status.mute_conversation": "Игнорировать обсуждение",
   "status.open": "Открыть пост",
   "status.pin": "Закрепить в профиле",
+  "status.quote": "Цитировать",
+  "status.quote.cancel": "Отменить цитирование",
   "status.quote_error.filtered": "Скрыто одним из ваших фильтров",
-  "status.quote_error.not_found": "Пост не может быть показан.",
-  "status.quote_error.removed": "Пост был удалён его автором.",
+  "status.quote_error.not_available": "Пост недоступен",
+  "status.quote_error.pending_approval": "Пост ожидает подтверждения",
+  "status.quote_error.pending_approval_popout.body": "На Mastodon вы можете контролировать, будет ли кто-то цитировать вас. Этот пост находится на рассмотрении, пока мы не получим одобрение автора.",
+  "status.quote_error.revoked": "Сообщение удалено автором",
+  "status.quote_followers_only": "Только подписчики могут цитировать этот пост",
+  "status.quote_manual_review": "Автор будет проверять вручную",
+  "status.quote_policy_change": "Измените, кто может цитировать",
+  "status.quote_post_author": "Пост цитировал @{name}",
+  "status.quote_private": "Приватные записи не могут быть цитированы",
+  "status.quotes": "{count, plural, one {# голос} few {# голоса} many {# голосов} other {# голосов}}",
+  "status.quotes.empty": "Никто еще не цитировал этот пост. Когда кто-нибудь это сделает, он появится здесь.",
   "status.read_more": "Читать далее",
   "status.reblog": "Продвинуть",
-  "status.reblog_private": "Продвинуть для своей аудитории",
+  "status.reblog_or_quote": "Буст или цитата",
+  "status.reblog_private": "Поделиться снова со своими подписчиками",
   "status.reblogged_by": "{name} продвинул(а)",
   "status.reblogs": "{count, plural, one {продвижение} few {продвижения} other {продвижений}}",
-  "status.reblogs.empty": "Никто ещё не продвинул этот пост. Все пользователи, продвинувшие этот пост, будут показаны здесь.",
+  "status.reblogs.empty": "Никто ещё не продвинул этот пост. Все пользователи, которые продвинут этот пост, будут показаны здесь.",
   "status.redraft": "Удалить и исправить",
   "status.remove_bookmark": "Убрать из закладок",
   "status.remove_favourite": "Убрать из избранного",
+  "status.remove_quote": "Удалить",
   "status.replied_in_thread": "Ответил(а) в обсуждении",
   "status.replied_to": "Ответил(а) {name}",
   "status.reply": "Ответить",
   "status.replyAll": "Ответить в обсуждении",
   "status.report": "Пожаловаться на @{name}",
+  "status.request_quote": "Запрос на цитирование",
+  "status.revoke_quote": "Удалить мой пост из поста @{name}",
   "status.sensitive_warning": "Медиа деликатного характера",
   "status.share": "Поделиться",
   "status.show_less_all": "Свернуть все предупреждения о содержании в ветке",
@@ -900,7 +929,7 @@
   "status.uncached_media_warning": "Предварительный просмотр недоступен",
   "status.unmute_conversation": "Не игнорировать обсуждение",
   "status.unpin": "Открепить от профиля",
-  "subscribed_languages.lead": "Посты лишь на выбранных языках будут появляться в вашей домашней ленте и в списках после изменения. Снимите выбор, чтобы получать посты на всех языках.",
+  "subscribed_languages.lead": "Посты лишь на выбранных языках будут появляться в вашей домашней ленте и списках после изменения. Снимите выбор, чтобы получать посты на всех языках.",
   "subscribed_languages.save": "Сохранить изменения",
   "subscribed_languages.target": "Изменить языки подписки для {target}",
   "tabs_bar.home": "Главная",
@@ -926,6 +955,7 @@
   "upload_button.label": "Прикрепить фото, видео или аудио",
   "upload_error.limit": "Превышено максимальное количество вложений.",
   "upload_error.poll": "К опросам нельзя прикреплять файлы.",
+  "upload_error.quote": "К опросам нельзя прикреплять файлы.",
   "upload_form.drag_and_drop.instructions": "Чтобы выбрать вложение, нажмите \"Пробел\" (Space) или \"Ввод\" (Enter). Используйте клавиши со стрелками, чтобы передвинуть вложение в любом направлении. Нажмите \"Пробел\" (Space) или \"Ввод\" (Enter) ещё раз, чтобы переместить вложение на новое место, либо нажмите кнопку \"Выйти\" (Escape) для отмены перемещения.",
   "upload_form.drag_and_drop.on_drag_cancel": "Перемещение отменено. Вложение {item} было оставлено на прежнем месте.",
   "upload_form.drag_and_drop.on_drag_end": "Вложение {item} было перемещено.",
@@ -948,5 +978,14 @@
   "video.skip_forward": "Перемотка вперёд",
   "video.unmute": "Включить звук",
   "video.volume_down": "Громкость уменьшена",
-  "video.volume_up": "Громкость увеличена"
+  "video.volume_up": "Громкость увеличена",
+  "visibility_modal.button_title": "Настроить видимость",
+  "visibility_modal.header": "Видимость и взаимодействие",
+  "visibility_modal.helper.direct_quoting": "Частные упоминания, созданные на Mastodon не могут быть цитированы другими.",
+  "visibility_modal.helper.privacy_editing": "После публикации поста его видимость нельзя изменить.",
+  "visibility_modal.helper.privacy_private_self_quote": "Цитаты из личных сообщений не могут быть опубликованы публично.",
+  "visibility_modal.helper.private_quoting": "Публикации на Mastodon, доступные исключительно подписчикам, не подлежат цитированию со стороны других пользователей.",
+  "visibility_modal.helper.unlisted_quoting": "Когда люди цитируют вас, их посты также скрываются из ленты трендов.",
+  "visibility_modal.instructions": "Регулируйте, кто сможет взаимодействовать с этим сообщением. Также можно установить параметры для всех будущих публикаций, перейдя в <link>Настройки > Стандартные параметры публикации</link>.",
+  "visibility_modal.privacy_label": "Видимость"
 }
diff --git a/app/javascript/mastodon/locales/ry.json b/app/javascript/mastodon/locales/ry.json
index 20cc8e8e4eb..9426a9c5c07 100644
--- a/app/javascript/mastodon/locales/ry.json
+++ b/app/javascript/mastodon/locales/ry.json
@@ -51,7 +51,6 @@
   "account.posts": "Публикації",
   "account.posts_with_replies": "Публикації тай удповіді",
   "account.report": "Скарговати ся на {name}",
-  "account.requested": "Чекат ся на пудтвердженя. Нажміт убы удмінити запрос на слідованя",
   "account.requested_follow": "Хосновач {name} просит ся пудписати ся на вас",
   "account.share": "Пошырити профіл хосновача {name}",
   "account.show_reblogs": "Указати друленя уд {name}",
diff --git a/app/javascript/mastodon/locales/sa.json b/app/javascript/mastodon/locales/sa.json
index 7daaf7f03d7..e7352f1c807 100644
--- a/app/javascript/mastodon/locales/sa.json
+++ b/app/javascript/mastodon/locales/sa.json
@@ -46,7 +46,6 @@
   "account.posts": "पत्राणि",
   "account.posts_with_replies": "पत्राणि प्रत्युत्तराणि च",
   "account.report": "आविद्यताम् @{name}",
-  "account.requested": "स्वीकृतिः प्रतीक्ष्यते । नश्यतामित्यस्मिन्नुद्यतां निराकर्तुम् ।",
   "account.requested_follow": "{name} त्वामनुसर्तुमयाचीत्",
   "account.share": "@{name} मित्रस्य विवरणं विभाज्यताम्",
   "account.show_reblogs": "@{name} मित्रस्य प्रकाशनानि दृश्यन्ताम्",
@@ -137,7 +136,6 @@
   "confirmations.mute.confirm": "निःशब्दम्",
   "confirmations.redraft.confirm": "मार्जय पुनश्च लिख्यताम्",
   "confirmations.unfollow.confirm": "अनुसरणं नश्यताम्",
-  "confirmations.unfollow.message": "निश्चयेनैवाऽनुसरणं नश्यतां {name} मित्रस्य?",
   "conversation.delete": "वार्तालापं मार्जय",
   "conversation.mark_as_read": "पठितमित्यङ्क्यताम्",
   "conversation.open": "वार्तालापो दृश्यताम्",
@@ -242,9 +240,6 @@
   "home.show_announcements": "विज्ञापनानि दर्शय",
   "interaction_modal.on_another_server": "अन्यस्मिन्सर्वरि",
   "interaction_modal.on_this_server": "अस्मिन्सर्वरि",
-  "interaction_modal.title.follow": "{name} अनुसर",
-  "interaction_modal.title.reblog": "{name} नाम्ना उपभोक्तुः पत्रं बुस्त्कुरु",
-  "interaction_modal.title.reply": "{name} नाम्ना उपभोक्तुःपत्रं प्रतिवादय",
   "intervals.full.days": "{number, plural, one {# दिनम्} other {# दिनानि}}",
   "intervals.full.hours": "{number, plural, one {# होरा} other {# होराः}}",
   "intervals.full.minutes": "{number, plural, one {# क्षणम्} other {# क्षणानि}}",
diff --git a/app/javascript/mastodon/locales/sc.json b/app/javascript/mastodon/locales/sc.json
index d893bc2a0d0..254af6a6019 100644
--- a/app/javascript/mastodon/locales/sc.json
+++ b/app/javascript/mastodon/locales/sc.json
@@ -1,6 +1,7 @@
 {
   "about.blocks": "Serbidores moderados",
   "about.contact": "Cuntatu:",
+  "about.default_locale": "Predefinidu",
   "about.disclaimer": "Mastodon est software de còdighe lìberu e unu màrchiu de Mastodon gGmbH.",
   "about.domain_blocks.no_reason_available": "Peruna resone a disponimentu",
   "about.domain_blocks.preamble": "Mastodon ti permitit de bìdere su cuntenutu de utentes de cale si siat àteru serbidore de su fediversu. Custas sunt etzetziones fatas in custu serbidore ispetzìficu.",
@@ -8,6 +9,7 @@
   "about.domain_blocks.silenced.title": "Limitadu",
   "about.domain_blocks.suspended.explanation": "Perunu datu de custu serbidore at a èssere protzessadu, immagasinadu o cuncambiadu; est impossìbile duncas cale si siat interatzione o comunicatzione cun is utentes de custu serbidore.",
   "about.domain_blocks.suspended.title": "Suspèndidu",
+  "about.language_label": "Idioma",
   "about.not_available": "Custa informatzione no est istada posta a disponimentu in custu serbidore.",
   "about.powered_by": "Rete sotziale detzentralizada impulsada dae {mastodon}",
   "about.rules": "Règulas de su serbidore",
@@ -19,13 +21,21 @@
   "account.block_domain": "Bloca su domìniu {domain}",
   "account.block_short": "Bloca",
   "account.blocked": "Blocadu",
+  "account.blocking": "Blocadu",
   "account.cancel_follow_request": "Annulla sa sighidura",
   "account.copy": "Còpia su ligòngiu a su profilu",
   "account.direct": "Mèntova a @{name} in privadu",
   "account.disable_notifications": "Non mi notìfiches prus cando @{name} pùblichet messàgios",
+  "account.domain_blocking": "Blocamus su domìniu",
   "account.edit_profile": "Modìfica profilu",
   "account.enable_notifications": "Notìfica·mi cando @{name} pùblicat messàgios",
   "account.endorse": "Cussìgia in su profilu tuo",
+  "account.familiar_followers_many": "Sighidu dae {name1}, {name2} e {othersCount, plural,one {un'àtera persone chi connosches} other {àteras # persones chi connosches}}",
+  "account.familiar_followers_one": "Sighidu dae {name1}",
+  "account.familiar_followers_two": "Sighidu dae {name1} e {name2}",
+  "account.featured": "In evidèntzia",
+  "account.featured.accounts": "Profilos",
+  "account.featured.hashtags": "Etichetas",
   "account.featured_tags.last_status_at": "Ùrtima publicatzione in su {date}",
   "account.featured_tags.last_status_never": "Peruna publicatzione",
   "account.follow": "Sighi",
@@ -33,9 +43,11 @@
   "account.followers": "Sighiduras",
   "account.followers.empty": "Nemos sighit ancora custa persone.",
   "account.followers_counter": "{count, plural, one {{counter} sighidura} other {{counter} sighiduras}}",
+  "account.followers_you_know_counter": "{counter} chi connosches",
   "account.following": "Sighende",
   "account.following_counter": "{count, plural, one {sighende a {counter}} other {sighende a {counter}}}",
   "account.follows.empty": "Custa persone non sighit ancora a nemos.",
+  "account.follows_you": "Ti sighit",
   "account.go_to_profile": "Bae a su profilu",
   "account.hide_reblogs": "Cua is cumpartziduras de @{name}",
   "account.in_memoriam": "In memoriam.",
@@ -50,18 +62,21 @@
   "account.mute_notifications_short": "Pone is notìficas a sa muda",
   "account.mute_short": "A sa muda",
   "account.muted": "A sa muda",
+  "account.muting": "A sa muda",
   "account.no_bio": "Peruna descritzione frunida.",
   "account.open_original_page": "Aberi sa pàgina originale",
   "account.posts": "Publicatziones",
   "account.posts_with_replies": "Publicatziones e rispostas",
+  "account.remove_from_followers": "Cantzella a {name} dae is sighiduras",
   "account.report": "Signala @{name}",
-  "account.requested": "Abetende s'aprovatzione. Incarca pro annullare sa rechesta de sighidura",
   "account.requested_follow": "{name} at dimandadu de ti sighire",
+  "account.requests_to_follow_you": "Rechestas de sighidura",
   "account.share": "Cumpartzi su profilu de @{name}",
   "account.show_reblogs": "Ammustra is cumpartziduras de @{name}",
   "account.statuses_counter": "{count, plural, one {{counter} publicatzione} other {{counter} publicatziones}}",
   "account.unblock": "Isbloca a @{name}",
   "account.unblock_domain": "Isbloca su domìniu {domain}",
+  "account.unblock_domain_short": "Isbloca",
   "account.unblock_short": "Isbloca",
   "account.unendorse": "Non cussiges in su profilu",
   "account.unfollow": "Non sigas prus",
@@ -83,7 +98,22 @@
   "alert.unexpected.message": "Ddoe est istada una faddina.",
   "alert.unexpected.title": "Oh!",
   "alt_text_badge.title": "Testu alternativu",
+  "alt_text_modal.add_alt_text": "Agiunghe testu alternativu",
+  "alt_text_modal.add_text_from_image": "Agiunghe testu dae un'immàgine",
+  "alt_text_modal.cancel": "Annulla",
+  "alt_text_modal.change_thumbnail": "Càmbia sa miniadura",
+  "alt_text_modal.done": "Fatu",
   "announcement.announcement": "Annùntziu",
+  "annual_report.summary.archetype.booster": "Semper a s'ùrtima",
+  "annual_report.summary.followers.followers": "sighiduras",
+  "annual_report.summary.followers.total": "{count} totale",
+  "annual_report.summary.highlighted_post.possessive": "de {name}",
+  "annual_report.summary.most_used_app.most_used_app": "aplicatzione prus impreada",
+  "annual_report.summary.most_used_hashtag.most_used_hashtag": "eticheta prus impreada",
+  "annual_report.summary.most_used_hashtag.none": "Peruna",
+  "annual_report.summary.new_posts.new_posts": "publicatziones noas",
+  "annual_report.summary.percentile.we_wont_tell_bernie": "No dd'amus a nàrrere a Bernie.",
+  "annual_report.summary.thanks": "Gràtzias de èssere parte de Mastodon!",
   "attachments_list.unprocessed": "(non protzessadu)",
   "audio.hide": "Cua s'àudio",
   "block_modal.remote_users_caveat": "Amus a pedire a su serbidore {domain} de rispetare sa detzisione tua. Nointames custu, su rispetu no est garantidu ca unos cantos serbidores diant pòdere gestire is blocos de manera diferente. Is publicatzione pùblicas diant pòdere ancora èssere visìbiles a is utentes chi no ant fatu s'atzessu.",
@@ -107,6 +137,7 @@
   "bundle_column_error.routing.body": "Impossìbile agatare sa pàgina rechesta. Seguru chi s'URL in sa barra de indiritzos est curretu?",
   "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "Serra",
+  "bundle_modal_error.message": "Faddina in su carrigamentu de custu ischermu.",
   "bundle_modal_error.retry": "Torra·bi a proare",
   "closed_registrations.other_server_instructions": "Dae chi Mastodon est detzentralizadu, podes creare unu contu in un'àteru serbidore e interagire cun custu.",
   "closed_registrations_modal.description": "Sa creatzione de contos in {domain} no est possìbile in custu momentu, però tene in cunsideru chi non tenes bisòngiu de unu contu ispetzìficu in {domain} pro impreare Mastodon.",
@@ -116,13 +147,16 @@
   "column.blocks": "Persones blocadas",
   "column.bookmarks": "Sinnalibros",
   "column.community": "Lìnia de tempus locale",
+  "column.create_list": "Crea una lista",
   "column.direct": "Mentziones privadas",
   "column.directory": "Nàviga in is profilos",
   "column.domain_blocks": "Domìnios blocados",
+  "column.edit_list": "Modifica sa lista",
   "column.favourites": "Preferidos",
   "column.firehose": "Publicatziones in direta",
   "column.follow_requests": "Rechestas de sighidura",
   "column.home": "Printzipale",
+  "column.list_members": "Gesti is persones de sa lista",
   "column.lists": "Listas",
   "column.mutes": "Persones a sa muda",
   "column.notifications": "Notìficas",
@@ -135,6 +169,7 @@
   "column_header.pin": "Apica",
   "column_header.show_settings": "Ammustra is cunfiguratziones",
   "column_header.unpin": "Boga dae pitzu",
+  "column_search.cancel": "Annulla",
   "community.column_settings.local_only": "Isceti locale",
   "community.column_settings.media_only": "Isceti multimediale",
   "community.column_settings.remote_only": "Isceti remotu",
@@ -152,6 +187,7 @@
   "compose_form.poll.duration": "Longària de su sondàgiu",
   "compose_form.poll.multiple": "Sèberu mùltiplu",
   "compose_form.poll.option_placeholder": "Optzione {number}",
+  "compose_form.poll.single": "Sèberu ùnicu",
   "compose_form.poll.switch_to_multiple": "Muda su sondàgiu pro permìtere multi-optziones",
   "compose_form.poll.switch_to_single": "Muda su sondàgiu pro permìtere un'optzione isceti",
   "compose_form.poll.type": "Istile",
@@ -169,6 +205,8 @@
   "confirmations.delete_list.confirm": "Cantzella",
   "confirmations.delete_list.message": "Seguru chi boles cantzellare custa lista in manera permanente?",
   "confirmations.delete_list.title": "Cantzellare sa lista?",
+  "confirmations.discard_draft.confirm": "Iscarta e sighi",
+  "confirmations.discard_draft.edit.cancel": "Sighi cun s'editzione",
   "confirmations.discard_edit_media.confirm": "Iscarta",
   "confirmations.discard_edit_media.message": "Tenes modìficas non sarvadas a is descritziones o a is anteprimas de is cuntenutos, ddas boles iscartare su matessi?",
   "confirmations.logout.confirm": "Essi·nche",
@@ -179,8 +217,6 @@
   "confirmations.redraft.message": "Seguru chi boles cantzellare e torrare a fàghere custa publicatzione? As a pèrdere is preferidos e is cumpartziduras, e is rispostas a su messàgiu originale ant a abarrare òrfanas.",
   "confirmations.redraft.title": "Boles cantzellare e torrare a iscrìere sa publicatzione?",
   "confirmations.unfollow.confirm": "Non sigas prus",
-  "confirmations.unfollow.message": "Seguru chi non boles sighire prus a {name}?",
-  "confirmations.unfollow.title": "Boles tzessare de sighire s'utente?",
   "content_warning.hide": "Cua sa publicatzione",
   "content_warning.show": "Ammustra·dda su pròpiu",
   "conversation.delete": "Cantzella arresonada",
@@ -256,6 +292,7 @@
   "explore.trending_links": "Noas",
   "explore.trending_statuses": "Publicatziones",
   "explore.trending_tags": "Etichetas",
+  "featured_carousel.slide": "{index} de {total}",
   "filter_modal.added.context_mismatch_title": "Su cuntestu non currispondet.",
   "filter_modal.added.expired_title": "Filtru iscadidu.",
   "filter_modal.added.review_and_configure_title": "Cunfiguratziones de filtru",
@@ -294,8 +331,12 @@
   "footer.privacy_policy": "Polìtica de riservadesa",
   "footer.source_code": "Ammustra su còdighe de orìgine",
   "footer.status": "Istadu",
+  "footer.terms_of_service": "Cunditziones de su servìtziu",
   "generic.saved": "Sarvadu",
   "getting_started.heading": "Comente cumintzare",
+  "hashtag.admin_moderation": "Aberi s'interfache de moderatzione pro #{name}",
+  "hashtag.browse": "Nàviga in is publicatziones de #{hashtag}",
+  "hashtag.browse_from_account": "Nàviga in is publicatziones de @{name} in #{hashtag}",
   "hashtag.column_header.tag_mode.all": "e {additional}",
   "hashtag.column_header.tag_mode.any": "o {additional}",
   "hashtag.column_header.tag_mode.none": "sena {additional}",
@@ -308,13 +349,14 @@
   "hashtag.counter_by_accounts": "{count, plural, one {{counter} partetzipante} other {{counter} partetzipantes}}",
   "hashtag.counter_by_uses": "{count, plural, one {{counter} publicatzione} other {{counter} publicatziones}}",
   "hashtag.counter_by_uses_today": "{count, plural, one {{counter} publicatzione} other {{counter} publicatziones}} oe",
+  "hashtag.feature": "In evidèntzia in su profilu",
   "hashtag.follow": "Sighi su hashtag",
+  "hashtag.mute": "Pone #{hashtag} a sa muda",
+  "hashtag.unfeature": "No ddu pòngias in evidèntzia in su profilu",
   "hashtag.unfollow": "Non sigas prus s'eticheta",
   "hashtags.and_other": "… e {count, plural, one {un'àteru} other {àteros #}}",
   "hints.profiles.posts_may_be_missing": "Podet èssere chi ammanchent tzertas publicatziones de custu profilu.",
   "hints.profiles.see_more_posts": "Bide prus publicatziones a {domain}",
-  "hints.threads.replies_may_be_missing": "Podet èssere chi ammanchent rispostas dae àteros serbidores.",
-  "hints.threads.see_more": "Bide prus rispostas a {domain}",
   "home.column_settings.show_reblogs": "Ammustra is cumpartziduras",
   "home.column_settings.show_replies": "Ammustra rispostas",
   "home.hide_announcements": "Cua annùntzios",
@@ -326,9 +368,12 @@
   "ignore_notifications_modal.filter_instead": "Opuru filtra",
   "ignore_notifications_modal.filter_to_act_users": "As a pòdere ancora atzetare, refudare o sinnalare a utentes",
   "ignore_notifications_modal.filter_to_avoid_confusion": "Filtrare agiudat a evitare possìbiles confusiones",
+  "info_button.label": "Agiudu",
+  "interaction_modal.go": "Sighi",
+  "interaction_modal.no_account_yet": "Non tenes galu perunu contu?",
+  "interaction_modal.on_another_server": "In un'àteru serbidore",
   "interaction_modal.on_this_server": "In custu serbidore",
-  "interaction_modal.title.follow": "Sighi a {name}",
-  "interaction_modal.title.reply": "Risponde a sa publicatzione de {name}",
+  "interaction_modal.username_prompt": "Pro es., {example}",
   "intervals.full.days": "{number, plural, one {# die} other {# dies}}",
   "intervals.full.hours": "{number, plural, one {# ora} other {# oras}}",
   "intervals.full.minutes": "{number, plural, one {# minutu} other {# minutos}}",
@@ -341,6 +386,7 @@
   "keyboard_shortcuts.direct": "pro abèrrere sa colunna de mèntovos privados",
   "keyboard_shortcuts.down": "Move in bàsciu in sa lista",
   "keyboard_shortcuts.enter": "Aberi una publicatzione",
+  "keyboard_shortcuts.favourite": "Publicatzione preferida",
   "keyboard_shortcuts.favourites": "Aberi sa lista de preferidos",
   "keyboard_shortcuts.federated": "Aberi sa lìnia de tempus federada",
   "keyboard_shortcuts.heading": "Incurtzaduras de tecladu",
@@ -363,18 +409,25 @@
   "keyboard_shortcuts.toggle_hidden": "Ammustra o cua su testu de is AC",
   "keyboard_shortcuts.toggle_sensitivity": "Ammustra/cua elementos multimediales",
   "keyboard_shortcuts.toot": "Cumintza a iscrìere una publicatzione noa",
+  "keyboard_shortcuts.translate": "pro tradùere una publicatzione",
   "keyboard_shortcuts.unfocus": "Essi de s'àrea de cumpositzione de testu o de chirca",
   "keyboard_shortcuts.up": "Move in susu in sa lista",
   "lightbox.close": "Serra",
   "lightbox.next": "Imbeniente",
   "lightbox.previous": "Pretzedente",
+  "lightbox.zoom_in": "Ismànnia finas a sa mannària atuale",
   "limited_account_hint.title": "Custu profilu est istadu cuadu dae sa moderatzione de {domain}.",
+  "link_preview.author": "Dae {name}",
   "link_preview.shares": "{count, plural, one {{counter} publicatzione} other {{counter} publicatziones}}",
   "lists.delete": "Cantzella sa lista",
   "lists.edit": "Modìfica sa lista",
+  "lists.remove_member": "Cantzella",
   "lists.replies_policy.followed": "Cale si siat persone chi sighis",
   "lists.replies_policy.list": "Persones de sa lista",
   "lists.replies_policy.none": "Nemos",
+  "lists.save": "Sarva",
+  "lists.search": "Chirca",
+  "lists.show_replies_to": "Include rispostas dae gente de sa lista a",
   "load_pending": "{count, plural, one {# elementu nou} other {# elementos noos}}",
   "loading_indicator.label": "Carrighende…",
   "media_gallery.hide": "Cua",
@@ -389,8 +442,10 @@
   "mute_modal.you_wont_see_mentions": "No as a bìdere is publicatziones chi mèntovent a custa persone.",
   "mute_modal.you_wont_see_posts": "At a pòdere bìdere is publicatziones tuas, però tue no as a bìdere cussas suas.",
   "navigation_bar.about": "Informatziones",
+  "navigation_bar.account_settings": "Crae e seguresa",
   "navigation_bar.administration": "Amministratzione",
   "navigation_bar.advanced_interface": "Aberi s'interfache web avantzada",
+  "navigation_bar.automated_deletion": "Cantzelladura automàtica de publicatziones",
   "navigation_bar.blocks": "Persones blocadas",
   "navigation_bar.bookmarks": "Sinnalibros",
   "navigation_bar.direct": "Mentziones privadas",
@@ -400,13 +455,18 @@
   "navigation_bar.follow_requests": "Rechestas de sighidura",
   "navigation_bar.followed_tags": "Etichetas sighidas",
   "navigation_bar.follows_and_followers": "Gente chi sighis e sighiduras",
+  "navigation_bar.import_export": "Importatzione e esportatzione",
   "navigation_bar.lists": "Listas",
+  "navigation_bar.live_feed_local": "Canale in direta (locale)",
+  "navigation_bar.live_feed_public": "Canale in direta (pùblicu)",
   "navigation_bar.logout": "Essi",
   "navigation_bar.moderation": "Moderatzione",
+  "navigation_bar.more": "Àteru",
   "navigation_bar.mutes": "Persones a sa muda",
   "navigation_bar.opened_in_classic_interface": "Publicatziones, contos e àteras pàginas ispetzìficas sunt abertas in manera predefinida in s'interfache web clàssica.",
   "navigation_bar.preferences": "Preferèntzias",
   "navigation_bar.search": "Chirca",
+  "navigation_bar.search_trends": "Chirca / in tendèntzia",
   "not_signed_in_indicator.not_signed_in": "Ti depes identificare pro atzèdere a custa resursa.",
   "notification.admin.report": "{name} at sinnaladu a {target}",
   "notification.admin.report_account": "{name} at sinnaladu {count, plural, one {una publicatzione} other {# publicatziones}} dae {target} pro {category}",
@@ -463,15 +523,19 @@
   "notification_requests.minimize_banner": "Mìnima su bànner de notìficas filtradas",
   "notification_requests.notifications_from": "Notìficas dae {name}",
   "notification_requests.title": "Notìficas filtradas",
+  "notification_requests.view": "Mustra notìficas",
   "notifications.clear": "Lìmpia notìficas",
   "notifications.clear_confirmation": "Seguru chi boles isboidare in manera permanente totu is notìficas tuas?",
+  "notifications.clear_title": "Boles cantzellare is notìficas?",
   "notifications.column_settings.admin.report": "Informes noos:",
+  "notifications.column_settings.admin.sign_up": "Registros noos:",
   "notifications.column_settings.alert": "Notìficas de iscrivania",
   "notifications.column_settings.favourite": "Preferidos:",
   "notifications.column_settings.filter_bar.advanced": "Ammustra totu is categorias",
   "notifications.column_settings.filter_bar.category": "Barra de filtru lestru",
   "notifications.column_settings.follow": "Sighiduras noas:",
   "notifications.column_settings.follow_request": "Rechestas noas de sighidura:",
+  "notifications.column_settings.group": "Grupu",
   "notifications.column_settings.mention": "Mèntovos:",
   "notifications.column_settings.poll": "Resurtados de su sondàgiu:",
   "notifications.column_settings.push": "Notìficas push",
@@ -495,6 +559,8 @@
   "notifications.permission_denied": "Is notìficas de iscrivania non sunt a disponimentu pro neghe de rechestas de permissu chi sunt istadas dennegadas in antis",
   "notifications.permission_denied_alert": "Is notìficas de iscrivania non podent èssere abilitadas, ca su permissu de su navigadore est istadu dennegadu in antis",
   "notifications.permission_required": "Is notìficas de iscrivania no sunt a disponimentu ca ammancat su permissu rechèdidu.",
+  "notifications.policy.accept": "Atzeta",
+  "notifications.policy.accept_hint": "Mustra in is notìficas",
   "notifications.policy.filter_new_accounts.hint": "Creadu {days, plural, one {erisero} other {in is ùrtimas # dies}}",
   "notifications.policy.filter_new_accounts_title": "Contos noos",
   "notifications.policy.filter_not_followers_title": "Gente chi non ti sighit",
@@ -503,8 +569,15 @@
   "notifications_permission_banner.enable": "Abilita is notìficas de iscrivania",
   "notifications_permission_banner.how_to_control": "Pro retzire notìficas cando Mastodon no est abertu, abilita is notìficas de iscrivania. Podes controllare cun pretzisione is castas de interatziones chi ingendrant notìficas de iscrivania pro mèdiu de su butone {icon} in subra, cando sunt abilitadas.",
   "notifications_permission_banner.title": "Non ti perdas mai nudda",
+  "onboarding.follows.back": "A coa",
+  "onboarding.follows.done": "Fatu",
+  "onboarding.follows.search": "Chirca",
+  "onboarding.follows.title": "Sighi a gente pro cumintzare",
   "onboarding.profile.display_name": "Nòmine visìbile",
   "onboarding.profile.note": "Biografia",
+  "onboarding.profile.save_and_continue": "Sarva e sighi",
+  "onboarding.profile.title": "Cunfiguratzione de profilu",
+  "onboarding.profile.upload_avatar": "Càrriga una fotografia de profilu",
   "picture_in_picture.restore": "Torra·ddu a ue fiat",
   "poll.closed": "Serradu",
   "poll.refresh": "Atualiza",
@@ -599,6 +672,7 @@
   "search_results.hashtags": "Etichetas",
   "search_results.see_all": "Bide totu",
   "search_results.statuses": "Publicatziones",
+  "search_results.title": "Chirca \"{q}\"",
   "server_banner.about_active_users": "Gente chi at impreadu custu serbidore is ùrtimas 30 dies (Utentes cun Atividade a su Mese)",
   "server_banner.active_users": "utentes ativos",
   "server_banner.administered_by": "Amministradu dae:",
@@ -627,7 +701,6 @@
   "status.pin": "Apica in su profilu",
   "status.read_more": "Leghe·nde àteru",
   "status.reblog": "Cumpartzi",
-  "status.reblog_private": "Cumpartzi cun is utentes originales",
   "status.reblogged_by": "{name} at cumpartzidu",
   "status.reblogs.empty": "Nemos at ancora cumpartzidu custa publicatzione. Cando calicunu dd'at a fàghere, at a èssere ammustrada inoghe.",
   "status.redraft": "Cantzella e torra a iscrìere",
diff --git a/app/javascript/mastodon/locales/sco.json b/app/javascript/mastodon/locales/sco.json
index 12647ef8188..354c3393ed7 100644
--- a/app/javascript/mastodon/locales/sco.json
+++ b/app/javascript/mastodon/locales/sco.json
@@ -44,7 +44,6 @@
   "account.posts": "Posts",
   "account.posts_with_replies": "Posts an repones",
   "account.report": "Clype @{name}",
-  "account.requested": "Haudin fir approval. Chap tae cancel follae request",
   "account.share": "Share @{name}'s profile",
   "account.show_reblogs": "Shaw heezes frae @{name}",
   "account.unblock": "Undingie @{name}",
@@ -141,7 +140,6 @@
   "confirmations.mute.confirm": "Wheesht",
   "confirmations.redraft.confirm": "Delete an stert anew",
   "confirmations.unfollow.confirm": "Unfollae",
-  "confirmations.unfollow.message": "Ye shuir thit ye'r wantin tae unfollae {name}?",
   "conversation.delete": "Delete the conversation",
   "conversation.mark_as_read": "Mairk as seen",
   "conversation.open": "Luik at conversation",
@@ -237,9 +235,6 @@
   "home.show_announcements": "Shaw annooncements",
   "interaction_modal.on_another_server": "On a different server",
   "interaction_modal.on_this_server": "On this server",
-  "interaction_modal.title.follow": "Follae {name}",
-  "interaction_modal.title.reblog": "Heeze {name}'s post",
-  "interaction_modal.title.reply": "Reply tae {name}'s post",
   "intervals.full.days": "{number, plural, one {# day} other {# days}}",
   "intervals.full.hours": "{number, plural, one {# oor} other {# oors}}",
   "intervals.full.minutes": "{number, plural, one {# minute} other {# minties}}",
@@ -444,7 +439,6 @@
   "status.pin": "Preen tae profile",
   "status.read_more": "Read mair",
   "status.reblog": "Heeze",
-  "status.reblog_private": "Heeze wi original visibility",
   "status.reblogged_by": "{name} heezed",
   "status.reblogs.empty": "Naebody haes heezed this post yit. Whan somebody dis, they wull shaw up here.",
   "status.redraft": "Delete & re-dae",
diff --git a/app/javascript/mastodon/locales/si.json b/app/javascript/mastodon/locales/si.json
index 9f9bd1590fe..e326d3fa6a7 100644
--- a/app/javascript/mastodon/locales/si.json
+++ b/app/javascript/mastodon/locales/si.json
@@ -1,6 +1,7 @@
 {
   "about.blocks": "මැදිහත්කරණ සේවාදායක",
   "about.contact": "සබඳතාව:",
+  "about.default_locale": "Default",
   "about.disclaimer": "මාස්ටඩන් යනු නිදහස් විවෘත මූලාශ්‍ර මෘදුකාංගයකි. එය මාස්ටඩන් gGmbH හි වෙළඳ නාමයකි.",
   "about.domain_blocks.no_reason_available": "හේතුව ලබා ගත නොහැක.",
   "about.domain_blocks.preamble": "Mastodon සාමාන්‍යයෙන් ඔබට fediverse හි වෙනත් ඕනෑම සේවාදායකයකින් අන්තර්ගතයන් බැලීමට සහ පරිශීලකයින් සමඟ අන්තර් ක්‍රියා කිරීමට ඉඩ සලසයි. මෙම විශේෂිත සේවාදායකයේ සිදු කර ඇති ව්‍යතිරේක මේවාය.",
@@ -67,7 +68,6 @@
   "account.posts_with_replies": "ලිපි සහ පිළිතුරු",
   "account.remove_from_followers": "අනුගාමිකයින්ගෙන් {name} ඉවත් කරන්න",
   "account.report": "@{name} වාර්තා කරන්න",
-  "account.requested": "අනුමැතිය බලාපොරොත්තුවෙන්. අනුගමනය කිරීමේ ඉල්ලීම අවලංගු කිරීමට ක්ලික් කරන්න.",
   "account.requested_follow": "{name} ඔබව අනුගමනය කිරීමට ඉල්ලා ඇත.",
   "account.requests_to_follow_you": "ඔබව අනුගමනය කිරීමට ඉල්ලීම්",
   "account.share": "@{name} ගේ පැතිකඩ බෙදාගන්න",
@@ -236,8 +236,6 @@
   "confirmations.remove_from_followers.message": "{name} ඔබව අනුගමනය කිරීම නවත්වනු ඇත. ඔබට ඉදිරියට යාමට අවශ්‍ය බව විශ්වාසද?",
   "confirmations.remove_from_followers.title": "අනුගාමිකයා ඉවත් කරන්නද?",
   "confirmations.unfollow.confirm": "අනුගමනය නොකරන්න",
-  "confirmations.unfollow.message": "ඔබට {name}අනුගමනය කිරීම නවත්වන්න අවශ්‍ය බව ඔබට විශ්වාසද?",
-  "confirmations.unfollow.title": "පරිශීලකයා අනුගමනය නොකරන්නද?",
   "content_warning.hide": "සටහන සඟවන්න",
   "content_warning.show": "කෙසේ වෙතත් පෙන්වන්න",
   "content_warning.show_more": "තවත් පෙන්වන්න",
@@ -406,8 +404,6 @@
   "hints.profiles.see_more_followers": "{domain}හි තවත් අනුගාමිකයින් බලන්න",
   "hints.profiles.see_more_follows": "{domain}හි තවත් පහත ඒවා බලන්න.",
   "hints.profiles.see_more_posts": "{domain}හි තවත් සටහන් බලන්න",
-  "hints.threads.replies_may_be_missing": "අනෙකුත් සේවාදායකයන්ගෙන් ලැබෙන පිළිතුරු අස්ථානගත වී තිබිය හැක.",
-  "hints.threads.see_more": "{domain}හි තවත් පිළිතුරු බලන්න.",
   "home.column_settings.show_reblogs": "බූස්ට් පෙන්වන්න",
   "home.column_settings.show_replies": "පිළිතුරු පෙන්වන්න",
   "home.hide_announcements": "නිවේදන සඟවන්න",
@@ -428,20 +424,10 @@
   "ignore_notifications_modal.private_mentions_title": "අයාචිත පෞද්ගලික සඳහන් කිරීම් වලින් ලැබෙන දැනුම්දීම් නොසලකා හරින්නද?",
   "info_button.label": "උදව්",
   "info_button.what_is_alt_text": "<h1>alt පෙළ යනු කුමක්ද?</h1> <p>දෘශ්‍යාබාධිත, අඩු කලාප පළල සම්බන්ධතා ඇති පුද්ගලයින් හෝ අමතර සන්දර්භයක් සොයන අය සඳහා Alt පෙළ රූප විස්තර සපයයි.</p> <p>පැහැදිලි, සංක්ෂිප්ත සහ වෛෂයික alt පෙළ ලිවීමෙන් ඔබට සැමට ප්‍රවේශ්‍යතාව සහ අවබෝධය වැඩි දියුණු කළ හැකිය.</p> <ul> <li>වැදගත් අංග ග්‍රහණය කරගන්න</li> <li>රූපවල පෙළ සාරාංශ කරන්න</li> <li>නිත්‍ය වාක්‍ය ව්‍යුහය භාවිතා කරන්න</li> <li>අතිරික්ත තොරතුරු වලින් වළකින්න</li> <li>සංකීර්ණ දෘශ්‍යවල (රූප සටහන් හෝ සිතියම් වැනි) ප්‍රවණතා සහ ප්‍රධාන සොයාගැනීම් කෙරෙහි අවධානය යොමු කරන්න</li> </ul>",
-  "interaction_modal.action.favourite": "ඉදිරියට යාමට, ඔබ ඔබේ ගිණුමෙන් ප්‍රියතම කළ යුතුය.",
-  "interaction_modal.action.follow": "ඉදිරියට යාමට, ඔබ ඔබේ ගිණුමෙන් අනුගමනය කළ යුතුය.",
-  "interaction_modal.action.reblog": "ඉදිරියට යාමට, ඔබ ඔබේ ගිණුමෙන් නැවත බ්ලොග් කළ යුතුය.",
-  "interaction_modal.action.reply": "ඉදිරියට යාමට, ඔබ ඔබේ ගිණුමෙන් පිළිතුරු දිය යුතුය.",
-  "interaction_modal.action.vote": "ඉදිරියට යාමට, ඔබ ඔබේ ගිණුමෙන් ඡන්දය දිය යුතුය.",
   "interaction_modal.go": "යන්න",
   "interaction_modal.no_account_yet": "තවම ගිණුමක් නැද්ද?",
   "interaction_modal.on_another_server": "වෙනත් සේවාදායකයක",
   "interaction_modal.on_this_server": "මෙම සේවාදායකයෙහි",
-  "interaction_modal.title.favourite": "{name}ගේ ලිපිය ප්‍රිය කරන්න",
-  "interaction_modal.title.follow": "{name} අනුගමනය",
-  "interaction_modal.title.reblog": "{name}ගේ සටහන වැඩි කරන්න",
-  "interaction_modal.title.reply": "{name}ගේ ලිපියට පිළිතුරු",
-  "interaction_modal.title.vote": "{name}ගේ මත විමසුමට ඡන්දය දෙන්න",
   "interaction_modal.username_prompt": "උදා {example}",
   "intervals.full.days": "{number, plural, one {දවස් #} other {දවස් #}}",
   "intervals.full.hours": "{number, plural, one {පැය #} other {පැය #}}",
@@ -700,7 +686,6 @@
   "privacy.public.long": "මැස්ටෝඩන් වල සහ ඉන් පිටත ඕනෑම අයෙක්",
   "privacy.public.short": "ප්‍රසිද්ධ",
   "privacy.unlisted.additional": "මෙය හරියටම පොදු ලෙසම ක්‍රියා කරයි, ඔබ ගිණුම පුරා තෝරාගෙන සිටියත්, සජීවී සංග්‍රහ හෝ හැෂ් ටැග්, ගවේෂණය හෝ මැස්ටෝඩන් සෙවුම තුළ පළ කිරීම දිස් නොවේ.",
-  "privacy.unlisted.long": "ඇල්ගොරිතම රසික ගාස්තු අඩුයි",
   "privacy.unlisted.short": "නිහඬ මහජනතාව",
   "privacy_policy.last_updated": "අවසන් වරට යාවත්කාලීන කරන ලද්දේ {date}",
   "privacy_policy.title": "රහස්‍යතා ප්‍රතිපත්තිය",
@@ -840,7 +825,6 @@
   "status.pin": "පැතිකඩට අමුණන්න",
   "status.read_more": "තව කියවන්න",
   "status.reblog": "බූස්ට් කරන්න",
-  "status.reblog_private": "මුල් දෘශ්‍යතාව සමඟ වැඩි කරන්න",
   "status.reblogged_by": "{name} වැඩි කරන ලදී",
   "status.reblogs": "{count, plural, one {බූස්ට්} other {බූස්ට්}}",
   "status.reblogs.empty": "මෙම සටහන තවම කිසිවෙකු බූස්ට් කර නැත. යමෙකු එසේ කළ විට, ඔවුන් මෙහි පෙන්වනු ඇත.",
diff --git a/app/javascript/mastodon/locales/sk.json b/app/javascript/mastodon/locales/sk.json
index d82c4cb94d0..c11df5d0d2e 100644
--- a/app/javascript/mastodon/locales/sk.json
+++ b/app/javascript/mastodon/locales/sk.json
@@ -1,6 +1,7 @@
 {
   "about.blocks": "Moderované servery",
   "about.contact": "Kontakt:",
+  "about.default_locale": "Predvolený",
   "about.disclaimer": "Mastodon je bezplatný open-source softvér s otvoreným zdrojovým kódom a ochranná známka spoločnosti Mastodon gGmbH.",
   "about.domain_blocks.no_reason_available": "Dôvod nebol uvedený",
   "about.domain_blocks.preamble": "Mastodon vo všeobecnosti umožňuje prezerať obsah a komunikovať s používateľmi z akéhokoľvek iného servera vo fediverze. Tu sú uvedené výnimky, ktoré boli urobené na tomto konkrétnom serveri.",
@@ -20,26 +21,39 @@
   "account.block_domain": "Blokovať doménu {domain}",
   "account.block_short": "Blokovať",
   "account.blocked": "Účet blokovaný",
+  "account.blocking": "Blokované",
   "account.cancel_follow_request": "Zrušiť žiadosť o sledovanie",
   "account.copy": "Skopírovať odkaz na profil",
   "account.direct": "Súkromne označiť @{name}",
   "account.disable_notifications": "Zrušiť upozornenia na príspevky od @{name}",
+  "account.domain_blocking": "Blokované domény",
   "account.edit_profile": "Upraviť profil",
+  "account.edit_profile_short": "Upraviť",
   "account.enable_notifications": "Zapnúť upozornenia na príspevky od @{name}",
   "account.endorse": "Zobraziť na vlastnom profile",
+  "account.familiar_followers_many": "Sleduje {name1}, {name2} a {othersCount, plural, one {ďalší účet, ktorý poznáte} few {# ďalšie účty, ktoré poznáte} many {#} other {# ďalších účtov, ktoré poznáte}}",
+  "account.familiar_followers_one": "Nasledovanie od {name1}",
+  "account.familiar_followers_two": "Nasledovanie od {name1} a {name2}",
+  "account.featured": "Zviditeľnené",
   "account.featured.accounts": "Profily",
   "account.featured.hashtags": "Hashtagy",
   "account.featured_tags.last_status_at": "Posledný príspevok dňa {date}",
   "account.featured_tags.last_status_never": "Žiadne príspevky",
   "account.follow": "Sledovať",
   "account.follow_back": "Sledovať späť",
-  "account.followers": "Sledovatelia",
+  "account.follow_back_short": "Sledovať späť",
+  "account.follow_request": "Požiadať o sledovanie",
+  "account.follow_request_cancel": "Zrušiť žiadosť",
+  "account.follow_request_cancel_short": "Zrušiť",
+  "account.follow_request_short": "Požiadať",
+  "account.followers": "Sledujúce účty",
   "account.followers.empty": "Ešte nikto nesleduje tohto užívateľa.",
-  "account.followers_counter": "{count, plural, one {{counter} sledujúci} other {{counter} sledujúci}}",
-  "account.following": "Sledovaný účet",
+  "account.followers_counter": "{count, plural, one {{counter} sledujúci účet} few {{counter} sledujúce účty} many {{counter} followers} other {{counter} sledujúcich účtov}}",
+  "account.followers_you_know_counter": "{count, one {{counter}, ktorý poznáte}, few {{counter}, ktoré poznáte}, many {{counter}, kterých znáte} other {{counter}, ktoré poznáte}}",
+  "account.following": "Sledovaných účtov",
   "account.following_counter": "{count, plural, one {{counter} sledovaných} other {{counter} sledovaných}}",
   "account.follows.empty": "Tento účet ešte nikoho nesleduje.",
-  "account.follows_you": "Nasleduje ťa",
+  "account.follows_you": "Sleduje vás",
   "account.go_to_profile": "Prejsť na profil",
   "account.hide_reblogs": "Skryť zdieľania od @{name}",
   "account.in_memoriam": "In memoriam.",
@@ -55,14 +69,15 @@
   "account.mute_short": "Stíšiť",
   "account.muted": "Účet stíšený",
   "account.muting": "Stíšenie",
-  "account.mutual": "Nasledujete sa navzájom",
+  "account.mutual": "Sledujete sa navzájom",
   "account.no_bio": "Nie je uvedený žiadny popis.",
   "account.open_original_page": "Otvoriť pôvodnú stránku",
   "account.posts": "Príspevky",
   "account.posts_with_replies": "Príspevky a odpovede",
+  "account.remove_from_followers": "Zrušiť sledovanie od {name}",
   "account.report": "Nahlásiť @{name}",
-  "account.requested": "Čaká na schválenie. Žiadosť zrušíte kliknutím sem",
   "account.requested_follow": "{name} vás chce sledovať",
+  "account.requests_to_follow_you": "Žiadosti o sledovanie",
   "account.share": "Zdieľaj profil @{name}",
   "account.show_reblogs": "Zobrazovať zdieľania od @{name}",
   "account.statuses_counter": "{count, plural, one {{counter} príspevok} other {{counter} príspevkov}}",
@@ -89,26 +104,37 @@
   "alert.rate_limited.title": "Priveľa žiadostí",
   "alert.unexpected.message": "Vyskytla sa nečakaná chyba.",
   "alert.unexpected.title": "Ups!",
-  "alt_text_badge.title": "Alternatívny popis",
-  "alt_text_modal.add_text_from_image": "Pridaj text z obrázka",
+  "alt_text_badge.title": "Opis",
+  "alt_text_modal.add_alt_text": "Pridať opis",
+  "alt_text_modal.add_text_from_image": "Pridať text z obrázka",
   "alt_text_modal.cancel": "Zrušiť",
+  "alt_text_modal.change_thumbnail": "Zmeniť náhľad",
+  "alt_text_modal.describe_for_people_with_hearing_impairments": "Opíšte obsah pre ľudí so sluchovým postihnutím…",
+  "alt_text_modal.describe_for_people_with_visual_impairments": "Opíšte obsah pre ľudí so zrakovým postihnutím…",
   "alt_text_modal.done": "Hotovo",
   "announcement.announcement": "Oznámenie",
-  "annual_report.summary.archetype.oracle": "Veštec",
+  "annual_report.summary.archetype.booster": "Zdieľač*ka",
+  "annual_report.summary.archetype.lurker": "Sliedič*ka",
+  "annual_report.summary.archetype.oracle": "Divoká karta",
+  "annual_report.summary.archetype.pollster": "Anketár*ka",
+  "annual_report.summary.archetype.replier": "Hlasná trúba",
   "annual_report.summary.followers.followers": "sledovatelia",
   "annual_report.summary.followers.total": "{count} celkovo",
   "annual_report.summary.here_it_is": "Tu je tvoja {year} v zhrnutí:",
   "annual_report.summary.highlighted_post.by_favourites": "najviac obľúbený príspevok",
-  "annual_report.summary.highlighted_post.by_reblogs": "najviac vyzdvihovaný príspevok",
+  "annual_report.summary.highlighted_post.by_reblogs": "najviac zdieľaný príspevok",
   "annual_report.summary.highlighted_post.by_replies": "príspevok s najviac odpoveďami",
+  "annual_report.summary.highlighted_post.possessive": "{name}",
   "annual_report.summary.most_used_app.most_used_app": "najviac používaná aplikácia",
   "annual_report.summary.most_used_hashtag.most_used_hashtag": "najviac užívaný hashtag",
   "annual_report.summary.most_used_hashtag.none": "Žiaden",
   "annual_report.summary.new_posts.new_posts": "nové príspevky",
+  "annual_report.summary.percentile.text": "<topLabel>Takže patríte do top</topLabel><percentage></percentage><bottomLabel>účtov na {domain}</bottomLabel>",
   "annual_report.summary.percentile.we_wont_tell_bernie": "Nepovieme Berniemu.",
   "annual_report.summary.thanks": "Vďaka, že si súčasťou Mastodonu!",
   "attachments_list.unprocessed": "(nespracované)",
   "audio.hide": "Skryť zvuk",
+  "block_modal.remote_users_caveat": "Požiadame server {domain} o rešpektovanie vášho rozhodnutia. Nevieme to však zaručiť, keďže niektoré servery pristupujú k blokovaniu inak. Verejné príspevky sa stále môžu zobrazovať neprihláseným ľuďom.",
   "block_modal.show_less": "Zobraziť menej",
   "block_modal.show_more": "Zobraziť viac",
   "block_modal.they_cant_mention": "Nemôžu ťa spomenúť, alebo nasledovať.",
@@ -117,7 +143,8 @@
   "block_modal.title": "Blokovať užívateľa?",
   "block_modal.you_wont_see_mentions": "Neuvidíš príspevky, ktoré ich spomínajú.",
   "boost_modal.combo": "Nabudúce môžete preskočiť stlačením {combo}",
-  "boost_modal.reblog": "Vyzdvihnúť príspevok?",
+  "boost_modal.reblog": "Zdieľať príspevok?",
+  "boost_modal.undo_reblog": "Zrušiť zdieľanie?",
   "bundle_column_error.copy_stacktrace": "Kopírovať chybovú hlášku",
   "bundle_column_error.error.body": "Požadovanú stránku nebolo možné vykresliť. Môže to byť spôsobené chybou v našom kóde alebo problémom s kompatibilitou prehliadača.",
   "bundle_column_error.error.title": "Ale nie!",
@@ -128,6 +155,7 @@
   "bundle_column_error.routing.body": "Žiadaná stránka nebola nájdená. Ste si istí, že zadaná adresa URL je správna?",
   "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "Zatvoriť",
+  "bundle_modal_error.message": "Pri načítavaní tejto obrazovky nastala chyba.",
   "bundle_modal_error.retry": "Skúsiť znova",
   "closed_registrations.other_server_instructions": "Keďže Mastodon je decentralizovaný, môžete si vytvoriť účet na inom serveri a stále komunikovať s týmto serverom.",
   "closed_registrations_modal.description": "Vytvorenie účtu na {domain} nie je v súčasnosti možné, ale myslite na to, že na používanie Mastodonu nepotrebujete účet práve na {domain}.",
@@ -143,7 +171,7 @@
   "column.directory": "Prehľadávať profily",
   "column.domain_blocks": "Blokované domény",
   "column.edit_list": "Uprav zoznam",
-  "column.favourites": "Obľúbené",
+  "column.favourites": "Ohviezdičkované",
   "column.firehose": "Živé kanály",
   "column.follow_requests": "Žiadosti o sledovanie",
   "column.home": "Domov",
@@ -172,7 +200,7 @@
   "compose_form.direct_message_warning_learn_more": "Viac informácií",
   "compose_form.encryption_warning": "Príspevky na Mastodone nie sú šifrované end-to-end. Nezdieľajte cez Mastodon žiadne citlivé informácie.",
   "compose_form.hashtag_warning": "Tento príspevok nebude zobrazený pod žiadným hashtagom, lebo nie je verejný. Iba verejné príspevky môžu byť nájdené podľa hashtagu.",
-  "compose_form.lock_disclaimer": "Váš účet nie je {locked}. Ktokoľvek vás môže sledovať a vidieť vaše príspevky pre sledujúcich.",
+  "compose_form.lock_disclaimer": "Váš účet nie je {locked}. Ktokoľvek vás môže sledovať a vidieť vaše príspevky pre sledujúce účty.",
   "compose_form.lock_disclaimer.lock": "zamknutý",
   "compose_form.placeholder": "Na čo práve myslíte?",
   "compose_form.poll.duration": "Trvanie ankety",
@@ -196,6 +224,8 @@
   "confirmations.delete_list.confirm": "Vymazať",
   "confirmations.delete_list.message": "Určite chcete tento zoznam trvalo vymazať?",
   "confirmations.delete_list.title": "Vymazať zoznam?",
+  "confirmations.discard_draft.confirm": "Zahodiť a pokračovať",
+  "confirmations.discard_draft.edit.cancel": "Pokračovať v úpravách",
   "confirmations.discard_edit_media.confirm": "Zahodiť",
   "confirmations.discard_edit_media.message": "Máte neuložené zmeny v popise alebo náhľade média, zahodiť ich aj tak?",
   "confirmations.follow_to_list.confirm": "Nasleduj a pridaj do zoznamu",
@@ -204,15 +234,19 @@
   "confirmations.logout.confirm": "Odhlásiť sa",
   "confirmations.logout.message": "Určite sa chcete odhlásiť?",
   "confirmations.logout.title": "Odhlásiť sa?",
-  "confirmations.missing_alt_text.secondary": "Odošli aj tak",
+  "confirmations.missing_alt_text.confirm": "Pridať opis",
+  "confirmations.missing_alt_text.message": "Váš príspevok obsahuje médiá bez opisu. Pridanie opisu sprístupňuje váš obsah viac ľuďom.",
+  "confirmations.missing_alt_text.secondary": "Aj tak uverejniť",
+  "confirmations.missing_alt_text.title": "Pridať opis?",
   "confirmations.mute.confirm": "Stíšiť",
   "confirmations.redraft.confirm": "Vymazať a prepísať",
   "confirmations.redraft.message": "Určite chcete tento príspevok vymazať a prepísať? Prídete o jeho zdieľania a ohviezdičkovania a odpovede na pôvodný príspevok budú odlúčené.",
   "confirmations.redraft.title": "Vymazať a prepísať príspevok?",
   "confirmations.remove_from_followers.confirm": "Odstrániť nasledovateľa",
-  "confirmations.unfollow.confirm": "Prestať sledovať",
-  "confirmations.unfollow.message": "Určite chcete prestať sledovať {name}?",
-  "confirmations.unfollow.title": "Prestať sledovať užívateľa?",
+  "confirmations.revoke_quote.title": "Vymazať príspevok?",
+  "confirmations.unblock.confirm": "Odblokovať",
+  "confirmations.unblock.title": "Odblokovať {name}?",
+  "confirmations.unfollow.confirm": "Zrušiť sledovanie",
   "content_warning.hide": "Skryť príspevok",
   "content_warning.show": "Aj tak zobraziť",
   "content_warning.show_more": "Ukázať viac",
@@ -265,7 +299,7 @@
   "empty_column.account_timeline": "Nie sú tu žiadne príspevky.",
   "empty_column.account_unavailable": "Profil nedostupný",
   "empty_column.blocks": "Nemáte blokované žiadne účty.",
-  "empty_column.bookmarked_statuses": "Ešte nemáte záložku v žiadnom príspevku. Keď si ju do nejakého príspevkuk pridáte, zobrazí sa tu.",
+  "empty_column.bookmarked_statuses": "Ešte nemáte záložku v žiadnom príspevku. Keď si ju do nejakého príspevku pridáte, zobrazí sa tu.",
   "empty_column.community": "Miesta časová os je prázdna. Napíšte niečo, aby to tu ožilo!",
   "empty_column.direct": "Ešte nemáte žiadne súkromné označenia. Keď nejaké pošlete alebo dostanete, zobrazí sa tu.",
   "empty_column.domain_blocks": "Žiadne domény ešte nie sú blokované.",
@@ -291,6 +325,7 @@
   "explore.trending_links": "Správy",
   "explore.trending_statuses": "Príspevky",
   "explore.trending_tags": "Hashtagy",
+  "featured_carousel.header": "{count, plural, one {Pripnutý príspevok} few {Pripnuté príspevky} many {} other {Pripnutých príspevkov}}",
   "filter_modal.added.context_mismatch_explanation": "Táto kategória filtrov sa nevzťahuje na kontext, v ktorom ste získali prístup k tomuto príspevku. Ak chcete, aby sa príspevok filtroval aj v tomto kontexte, budete musieť filter upraviť.",
   "filter_modal.added.context_mismatch_title": "Nesúlad kontextu!",
   "filter_modal.added.expired_explanation": "Platnosť tejto kategórie filtra vypršala, aby sa použila, je potrebné zmeniť dátum vypršania platnosti.",
@@ -351,12 +386,12 @@
   "hashtag.column_settings.tag_mode.any": "Ľubovoľné z týchto",
   "hashtag.column_settings.tag_mode.none": "Žiaden z týchto",
   "hashtag.column_settings.tag_toggle": "Vložte dodatočné hashtagy pre tento stĺpec",
-  "hashtag.counter_by_accounts": "{count, plural, one {{counter} prispievateľ} few {{counter} prispievatelia} many {{counter} prispievateľov} other {{counter} prispievateľov}}",
+  "hashtag.counter_by_accounts": "{count, plural, one {{counter} prispievajúci účet} few {{counter} prispievajúce účty} many {{counter} participants} other {{counter} prispievajúcich účtov}}",
   "hashtag.counter_by_uses": "{count, plural, one {{counter} príspevok} few {{counter} príspevky} many {{counter} príspevkov} other {{counter} príspevkov}}",
   "hashtag.counter_by_uses_today": "{count, plural, one {{counter} príspevok} few {{counter} príspevky} many {{counter} príspevkov} other {{counter} príspevkov}} dnes",
   "hashtag.follow": "Sledovať hashtag",
   "hashtag.mute": "Utlmiť #{hashtag}",
-  "hashtag.unfollow": "Prestať sledovať hashtag",
+  "hashtag.unfollow": "Zrušiť sledovanie hashtagu",
   "hashtags.and_other": "…a {count, plural, other {# ďalších}}",
   "hints.profiles.followers_may_be_missing": "Nasledovatelia tohto profilu môžu chýbať.",
   "hints.profiles.follows_may_be_missing": "Nasledovatelia tohto profilu môžu chýbať.",
@@ -364,8 +399,6 @@
   "hints.profiles.see_more_followers": "Pozri viac nasledovateľov na {domain}",
   "hints.profiles.see_more_follows": "Pozri viac nasledovateľov na {domain}",
   "hints.profiles.see_more_posts": "Pozri viac príspevkov na {domain}",
-  "hints.threads.replies_may_be_missing": "Odpovede z ostatných serverov môžu chýbať.",
-  "hints.threads.see_more": "Pozri viac odpovedí na {domain}",
   "home.column_settings.show_reblogs": "Zobraziť zdieľania",
   "home.column_settings.show_replies": "Zobraziť odpovede",
   "home.hide_announcements": "Skryť oznámenia",
@@ -375,7 +408,7 @@
   "home.show_announcements": "Zobraziť oznámenia",
   "ignore_notifications_modal.filter_instead": "Radšej triediť",
   "ignore_notifications_modal.filter_to_act_users": "Stále budeš môcť akceptovať, odmietnuť, alebo nahlásiť užívateľov",
-  "ignore_notifications_modal.filter_to_avoid_confusion": "Triedenie pomáha vyvarovať sa možnému zmäteniu",
+  "ignore_notifications_modal.filter_to_avoid_confusion": "Filtrovanie pomáha vyvarovať sa možnému zmäteniu",
   "ignore_notifications_modal.ignore": "Ignoruj upozornenia",
   "ignore_notifications_modal.limited_accounts_title": "Ignorovať oboznámenia z obmedzených účtov?",
   "ignore_notifications_modal.new_accounts_title": "Nevšímať si oznámenia z nových účtov?",
@@ -383,19 +416,11 @@
   "ignore_notifications_modal.not_following_title": "Nevšímať si oznámenia od ľudí, ktorých nenasleduješ?",
   "ignore_notifications_modal.private_mentions_title": "Nevšímať si oznámenia o nevyžiadaných súkromných spomínaniach?",
   "info_button.label": "Pomoc",
-  "interaction_modal.action.favourite": "Pre pokračovanie si musíš obľúbiť zo svojho účtu.",
-  "interaction_modal.action.follow": "Pre pokračovanie musíš nasledovať zo svojho účtu.",
-  "interaction_modal.action.reply": "Pre pokračovanie musíš odpovedať s tvojho účtu.",
-  "interaction_modal.action.vote": "Pre pokračovanie musíš hlasovať s tvojho účtu.",
+  "info_button.what_is_alt_text": "<h1>Čo je to opis?</h1> <p>Opis médií umožňuje ľuďom so zdravotným postihnutím alebo slabým pripojením porozumieť obsahu príspevku.</p> <p>Zrozumiteľné, stručné a objektívne opisy sprístupňujú a vysvetľujú váš obsah väčšiemu počtu ľudí.</p> <ul> <li>Spomeňte dôležité prvky</li> <li>Zhrňte text na obrázkoch a fotkách</li> <li>Píšte bežné vety</li> <li>Vynechajte zbytočné informácie</li> <li>Pri zložitých vizuáloch (napr. nákresoch či mapách) sa sústreďte na kľúčové vzorce a závery</li> </ul>",
   "interaction_modal.go": "Prejdi",
   "interaction_modal.no_account_yet": "Ešte nemáš účet?",
   "interaction_modal.on_another_server": "Na inom serveri",
   "interaction_modal.on_this_server": "Na tomto serveri",
-  "interaction_modal.title.favourite": "Ohviezdičkovať príspevok od {name}",
-  "interaction_modal.title.follow": "Sledovať {name}",
-  "interaction_modal.title.reblog": "Zdieľať príspevok od {name}",
-  "interaction_modal.title.reply": "Odpovedať na príspevok od {name}",
-  "interaction_modal.title.vote": "Hlasuj v ankete od {name}",
   "interaction_modal.username_prompt": "Napr. {example}",
   "intervals.full.days": "{number, plural, one {# deň} few {# dni} many {# dní} other {# dní}}",
   "intervals.full.hours": "{number, plural, one {# hodina} few {# hodiny} many {# hodín} other {# hodín}}",
@@ -432,7 +457,7 @@
   "keyboard_shortcuts.toggle_hidden": "Zobraziť/skryť text za varovaním o obsahu",
   "keyboard_shortcuts.toggle_sensitivity": "Zobraziť/skryť médiá",
   "keyboard_shortcuts.toot": "Vytvoriť nový príspevok",
-  "keyboard_shortcuts.translate": "preložiť príspevok",
+  "keyboard_shortcuts.translate": "Preložiť príspevok",
   "keyboard_shortcuts.unfocus": "Odísť z textového poľa",
   "keyboard_shortcuts.up": "Posunúť sa vyššie v zozname",
   "lightbox.close": "Zatvoriť",
@@ -448,7 +473,7 @@
   "lists.add_to_list": "Pridaj do zoznamu",
   "lists.add_to_lists": "Pridaj {name} do zoznamov",
   "lists.create": "Vytvor",
-  "lists.create_a_list_to_organize": "Vytvor nový zoznam pre spravovanie tvojej domovskej osi",
+  "lists.create_a_list_to_organize": "Vytvorte si nový zoznam na organizáciu svojho domovského kanála",
   "lists.create_list": "Vytvor zoznam",
   "lists.delete": "Vymazať zoznam",
   "lists.done": "Hotovo",
@@ -458,7 +483,7 @@
   "lists.find_users_to_add": "Nájdi užívateľov na pridanie",
   "lists.list_name": "Názov zoznamu",
   "lists.new_list_name": "Názov nového zoznamu",
-  "lists.no_lists_yet": "Ešte žiadne zoznamy.",
+  "lists.no_lists_yet": "Zatiaľ nemáte žiadne zoznamy.",
   "lists.no_members_yet": "Zatiaľ bez členov.",
   "lists.no_results_found": "Žiadne výsledky nenájdené.",
   "lists.remove_member": "Odstráň",
@@ -482,8 +507,10 @@
   "mute_modal.you_wont_see_mentions": "Neuvidíš príspevky, ktoré ho/ju spomínajú.",
   "mute_modal.you_wont_see_posts": "Stále uvidí tvoje príspevky, ale ty neuvidíš jeho/jej.",
   "navigation_bar.about": "O tomto serveri",
+  "navigation_bar.account_settings": "Heslo a zabezpečenie",
   "navigation_bar.administration": "Spravovanie",
   "navigation_bar.advanced_interface": "Otvoriť v pokročilom webovom rozhraní",
+  "navigation_bar.automated_deletion": "Automatické mazanie príspevkov",
   "navigation_bar.blocks": "Blokované účty",
   "navigation_bar.bookmarks": "Záložky",
   "navigation_bar.direct": "Súkromné označenia",
@@ -492,13 +519,16 @@
   "navigation_bar.filters": "Filtrované slová",
   "navigation_bar.follow_requests": "Žiadosti o sledovanie",
   "navigation_bar.followed_tags": "Sledované hashtagy",
-  "navigation_bar.follows_and_followers": "Sledovania a sledovatelia",
+  "navigation_bar.follows_and_followers": "Sledované a sledujúce účty",
+  "navigation_bar.import_export": "Import a export",
   "navigation_bar.lists": "Zoznamy",
   "navigation_bar.logout": "Odhlásiť sa",
   "navigation_bar.moderation": "Moderovanie",
+  "navigation_bar.more": "Viac",
   "navigation_bar.mutes": "Stíšené účty",
   "navigation_bar.opened_in_classic_interface": "Príspevky, účty a iné špeciálne stránky sú predvolene otvárané v klasickom webovom rozhraní.",
   "navigation_bar.preferences": "Nastavenia",
+  "navigation_bar.privacy_and_reach": "Súkromie a dosah",
   "navigation_bar.search": "Hľadať",
   "not_signed_in_indicator.not_signed_in": "Ak chcete získať prístup k tomuto zdroju, prihláste sa.",
   "notification.admin.report": "Účet {name} nahlásil {target}",
@@ -509,24 +539,25 @@
   "notification.favourite_pm": "{name} obľúbil/a tvoje súkromné spomenutie",
   "notification.follow": "{name} vás sleduje",
   "notification.follow_request": "{name} vás žiada sledovať",
-  "notification.label.mention": "Zmienka",
-  "notification.label.private_mention": "Súkromná zmienka",
+  "notification.label.mention": "Označenie",
+  "notification.label.private_mention": "Súkromné označenie",
   "notification.label.private_reply": "Súkromná odpoveď",
   "notification.label.reply": "Odpoveď",
-  "notification.mention": "Zmienka",
+  "notification.mention": "Označenie",
   "notification.mentioned_you": "{name} ťa spomenul/a",
   "notification.moderation-warning.learn_more": "Zisti viac",
   "notification.moderation_warning": "Dostal/a si varovanie od moderátora",
   "notification.moderation_warning.action_delete_statuses": "Niektoré z tvojich príspevkov boli odstránené.",
   "notification.moderation_warning.action_disable": "Tvoj účet bol vypnutý.",
-  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Niektoré tvoje príspevky boli označené za chúlostivé.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Niektoré vaše príspevky boli označené ako citlivé.",
   "notification.moderation_warning.action_none": "Tvoj účet dostal upozornenie od moderátora.",
-  "notification.moderation_warning.action_sensitive": "Tvoje príspevky budú odteraz označované ako chúlostivé.",
+  "notification.moderation_warning.action_sensitive": "Vaše príspevky budú odteraz označované ako citlivé.",
   "notification.moderation_warning.action_silence": "Tvoj účet bol obmedzený.",
   "notification.moderation_warning.action_suspend": "Tvoj účet bol pozastavený.",
   "notification.own_poll": "Vaša anketa sa skončila",
   "notification.poll": "Anketa, v ktorej si hlasoval/a, skončila",
   "notification.reblog": "{name} zdieľa váš príspevok",
+  "notification.reblog.name_and_others_with_link": "{name} a <a>{count, plural, one {# ďalší človek} few {# ďalší ľudia} many {#} other {# ďalších ľudí}}</a> zdieľa váš príspevok",
   "notification.relationships_severance_event": "Stratené prepojenia s {name}",
   "notification.relationships_severance_event.account_suspension": "Správca z {from} pozastavil/a {target}, čo znamená, že od nich viac nemôžeš dostávať aktualizácie, alebo s nimi interaktovať.",
   "notification.relationships_severance_event.learn_more": "Zisti viac",
@@ -603,7 +634,7 @@
   "onboarding.profile.save_and_continue": "Uložiť a pokračovať",
   "onboarding.profile.title": "Nastavenie profilu",
   "onboarding.profile.upload_avatar": "Nahrať profilový obrázok",
-  "onboarding.profile.upload_header": "Nahrať obrázok záhlavia profilu",
+  "onboarding.profile.upload_header": "Nahrať obrázok v záhlaví profilu",
   "password_confirmation.exceeds_maxlength": "Potvrdené heslo presahuje maximálnu dĺžku hesla",
   "password_confirmation.mismatching": "Zadané heslá sa nezhodujú",
   "picture_in_picture.restore": "Vrátiť späť",
@@ -625,7 +656,6 @@
   "privacy.public.long": "Ktokoľvek na Mastodone aj mimo neho",
   "privacy.public.short": "Verejné",
   "privacy.unlisted.additional": "Presne ako verejné, s tým rozdielom, že sa príspevok nezobrazí v živých kanáloch, hashtagoch, objavovaní či vo vyhľadávaní na Mastodone, aj keď máte pre účet objaviteľnosť zapnutú.",
-  "privacy.unlisted.long": "Menej algoritmických výmyslov",
   "privacy.unlisted.short": "Tiché verejné",
   "privacy_policy.last_updated": "Posledná úprava {date}",
   "privacy_policy.title": "Pravidlá ochrany súkromia",
@@ -732,6 +762,7 @@
   "status.admin_account": "Moderovať @{name}",
   "status.admin_domain": "Moderovať {domain}",
   "status.admin_status": "Moderovať príspevok",
+  "status.all_disabled": "Zdieľania a citácie sú vypnuté",
   "status.block": "Blokovať @{name}",
   "status.bookmark": "Pridať záložku",
   "status.cancel_reblog_private": "Zrušiť zdieľanie",
@@ -745,7 +776,7 @@
   "status.edit": "Upraviť",
   "status.edited": "Naposledy upravený {date}",
   "status.edited_x_times": "Upravený {count, plural, other {{count}×}}",
-  "status.favourite": "Ohviezdičkované",
+  "status.favourite": "Ohviezdičkovať",
   "status.filter": "Filtrovanie tohto príspevku",
   "status.history.created": "Vytvorené účtom {name} {date}",
   "status.history.edited": "Upravené účtom {name} {date}",
@@ -759,14 +790,16 @@
   "status.mute_conversation": "Stíšiť konverzáciu",
   "status.open": "Rozbaliť príspevok",
   "status.pin": "Pripnúť na profil",
+  "status.quote_policy_change": "Zmeňte, kto vás môže citovať",
   "status.read_more": "Čítaj ďalej",
   "status.reblog": "Zdieľať",
-  "status.reblog_private": "Zdieľať pôvodnému publiku",
+  "status.reblog_or_quote": "Zdieľať alebo citovať",
   "status.reblogged_by": "{name} zdieľa",
+  "status.reblogs": "{count, plural, one {zdieľanie} few {zdieľania} many {} other {zdieľaní}}",
   "status.reblogs.empty": "Nikto ešte tento príspevok nezdieľal. Keď tak niekto urobí, zobrazí sa to tu.",
   "status.redraft": "Vymazať a prepísať",
   "status.remove_bookmark": "Odstrániť záložku",
-  "status.remove_favourite": "Odstráň z obľúbených",
+  "status.remove_favourite": "Zrušiť ohviezdičkovanie",
   "status.replied_in_thread": "Odpovedal/a vo vlákne",
   "status.replied_to": "Odpoveď na {name}",
   "status.reply": "Odpovedať",
@@ -818,5 +851,10 @@
   "video.pause": "Pozastaviť",
   "video.play": "Prehrať",
   "video.volume_down": "Hlasitosť nadol",
-  "video.volume_up": "Hlasitosť nahor"
+  "video.volume_up": "Hlasitosť nahor",
+  "visibility_modal.header": "Viditeľnosť a interakcia",
+  "visibility_modal.quote_followers": "Iba sledujúce účty",
+  "visibility_modal.quote_label": "Kto vás môže citovať",
+  "visibility_modal.quote_nobody": "Iba ja",
+  "visibility_modal.quote_public": "Ktokoľvek"
 }
diff --git a/app/javascript/mastodon/locales/sl.json b/app/javascript/mastodon/locales/sl.json
index 7213af36662..43f6c511d37 100644
--- a/app/javascript/mastodon/locales/sl.json
+++ b/app/javascript/mastodon/locales/sl.json
@@ -55,7 +55,6 @@
   "account.posts": "Objave",
   "account.posts_with_replies": "Objave in odgovori",
   "account.report": "Prijavi @{name}",
-  "account.requested": "Čakanje na odobritev. Kliknite, da prekličete prošnjo za sledenje",
   "account.requested_follow": "{name} vam želi slediti",
   "account.share": "Deli profil osebe @{name}",
   "account.show_reblogs": "Pokaži izpostavitve osebe @{name}",
@@ -219,8 +218,6 @@
   "confirmations.redraft.message": "Ali ste prepričani, da želite izbrisati to objavo in jo preoblikovati? Izkazi priljubljenosti in izpostavitve bodo izgubljeni, odgovori na izvirno objavo pa bodo osiroteli.",
   "confirmations.redraft.title": "Želite izbrisati in preoblikovati objavo?",
   "confirmations.unfollow.confirm": "Ne sledi več",
-  "confirmations.unfollow.message": "Ali ste prepričani, da ne želite več slediti {name}?",
-  "confirmations.unfollow.title": "Želite nehati spremljati uporabnika?",
   "content_warning.hide": "Skrij objavo",
   "content_warning.show": "Vseeno pokaži",
   "content_warning.show_more": "Pokaži več",
@@ -383,8 +380,6 @@
   "hints.profiles.see_more_followers": "Pokaži več sledilcev na {domain}",
   "hints.profiles.see_more_follows": "Pokaži več sledenih ljudi na zbirališču {domain}",
   "hints.profiles.see_more_posts": "Pokaži več objav na {domain}",
-  "hints.threads.replies_may_be_missing": "Odgovori z drugih strežnikov morda manjkajo.",
-  "hints.threads.see_more": "Pokaži več odgovorov na {domain}",
   "home.column_settings.show_reblogs": "Pokaži izpostavitve",
   "home.column_settings.show_replies": "Pokaži odgovore",
   "home.hide_announcements": "Skrij obvestila",
@@ -405,20 +400,10 @@
   "ignore_notifications_modal.private_mentions_title": "Naj prezrem obvestila od nezaželenih zasebnih omemb?",
   "info_button.label": "Pomoč",
   "info_button.what_is_alt_text": "<h1>Kaj je nadomestno besedilo?</h1> <p>Z nadomestnim besedilom dodatno opišemo sliko in tako pomagamo slabovidnim, ljudem s slabo internetno povezavo in tistim, ki jim manjka kontekst.</p> <p>Vaša objava bo veliko bolj dostopna in razumljiva, če boste napisali jasno, jedrnato in nepristransko nadomestno besedilo.</p> <ul> <li>Izpostavite pomembne elemente.</li> <li>Povzemite besedilo v slikah.</li> <li>Pišite v celih stavkih.</li> <li>Zajemite bistvo, ne dolgovezite.</li> <li>Opišite težnje in ključna odkritja, ki ste jih razbrali iz zapletenih grafik (npr. diagramov ali zemljevidov).</li> </ul>",
-  "interaction_modal.action.favourite": "Med priljubljene lahko dodate, ko se vpišete v svoj račun.",
-  "interaction_modal.action.follow": "Sledite lahko šele, ko se vpišete v svoj račun.",
-  "interaction_modal.action.reblog": "Izpostavite lahko šele, ko se vpišete v svoj račun.",
-  "interaction_modal.action.reply": "Odgovorite lahko šele, ko se vpišete v svoj račun.",
-  "interaction_modal.action.vote": "Glasujete lahko šele, ko se vpišete v svoj račun.",
   "interaction_modal.go": "Naprej",
   "interaction_modal.no_account_yet": "Še nimate računa?",
   "interaction_modal.on_another_server": "Na drugem strežniku",
   "interaction_modal.on_this_server": "Na tem strežniku",
-  "interaction_modal.title.favourite": "Daj objavo {name} med priljubljene",
-  "interaction_modal.title.follow": "Sledi {name}",
-  "interaction_modal.title.reblog": "Izpostavi objavo {name}",
-  "interaction_modal.title.reply": "Odgovori na objavo {name}",
-  "interaction_modal.title.vote": "Izpolni anketo uporabnika/ce {name}",
   "interaction_modal.username_prompt": "Npr. {example}",
   "intervals.full.days": "{number, plural, one {# dan} two {# dni} few {# dni} other {# dni}}",
   "intervals.full.hours": "{number, plural, one {# ura} two {# uri} few {# ure} other {# ur}}",
@@ -679,7 +664,6 @@
   "privacy.public.long": "Vsem, ki so ali niso na Mastodonu",
   "privacy.public.short": "Javno",
   "privacy.unlisted.additional": "Učinek je enak kot pri javni objavi, le da se ta ne bo prikazala v živih virih, med ključniki, raziskovanjem ali iskanjem, četudi ste to vključili na ravni računa.",
-  "privacy.unlisted.long": "Manj vsebine po izboru algoritma",
   "privacy.unlisted.short": "Tiho javno",
   "privacy_policy.last_updated": "Zadnja posodobitev {date}",
   "privacy_policy.title": "Pravilnik o zasebnosti",
@@ -819,7 +803,6 @@
   "status.pin": "Pripni na profil",
   "status.read_more": "Preberi več",
   "status.reblog": "Izpostavi",
-  "status.reblog_private": "Izpostavi z izvirno vidljivostjo",
   "status.reblogged_by": "{name} je izpostavil/a",
   "status.reblogs": "{count, plural, one {izpostavitev} two {izpostavitvi} few {izpostavitve} other {izpostavitev}}",
   "status.reblogs.empty": "Nihče še ni izpostavil te objave. Ko se bo to zgodilo, se bodo pojavile tukaj.",
diff --git a/app/javascript/mastodon/locales/sq.json b/app/javascript/mastodon/locales/sq.json
index b5a7cb0e886..8e76cd8fe05 100644
--- a/app/javascript/mastodon/locales/sq.json
+++ b/app/javascript/mastodon/locales/sq.json
@@ -28,6 +28,7 @@
   "account.disable_notifications": "Resht së njoftuari mua, kur poston @{name}",
   "account.domain_blocking": "Bllokim përkatësie",
   "account.edit_profile": "Përpunoni profilin",
+  "account.edit_profile_short": "Përpunojeni",
   "account.enable_notifications": "Njoftomë, kur poston @{name}",
   "account.endorse": "Pasqyrojeni në profil",
   "account.familiar_followers_many": "Ndjekur nga {name1}, {name2} dhe {othersCount, plural, one {një tjetër që njihni} other {# të tjerë që njihni}}",
@@ -40,6 +41,11 @@
   "account.featured_tags.last_status_never": "Pa postime",
   "account.follow": "Ndiqeni",
   "account.follow_back": "Ndiqe gjithashtu",
+  "account.follow_back_short": "Ndiqe gjithashtu",
+  "account.follow_request": "Kërkoni ta ndiqni",
+  "account.follow_request_cancel": "Anuloje kërkesën",
+  "account.follow_request_cancel_short": "Anuloje",
+  "account.follow_request_short": "Kërkoje",
   "account.followers": "Ndjekës",
   "account.followers.empty": "Këtë përdorues ende s’e ndjek kush.",
   "account.followers_counter": "{count, plural, one {{counter} ndjekës} other {{counter} ndjekës}}",
@@ -70,7 +76,6 @@
   "account.posts_with_replies": "Mesazhe dhe përgjigje",
   "account.remove_from_followers": "Hiqe {name} nga ndjekësit",
   "account.report": "Raportojeni @{name}",
-  "account.requested": "Në pritje të miratimit. Që të anuloni kërkesën për ndjekje, klikojeni",
   "account.requested_follow": "{name} ka kërkuar t’ju ndjekë",
   "account.requests_to_follow_you": "Kërkesa për t’ju ndjekur",
   "account.share": "Ndajeni profilin e @{name} me të tjerët",
@@ -108,6 +113,7 @@
   "alt_text_modal.describe_for_people_with_visual_impairments": "Përshkruajeni këtë për persona me mangësi shikimi…",
   "alt_text_modal.done": "U bë",
   "announcement.announcement": "Lajmërim",
+  "annual_report.summary.archetype.oracle": "Orakulli",
   "annual_report.summary.followers.followers": "ndjekës",
   "annual_report.summary.followers.total": "{count} gjithsej",
   "annual_report.summary.here_it_is": "Ja {year} juaj e shqyrtuar:",
@@ -234,15 +240,25 @@
   "confirmations.missing_alt_text.secondary": "Postoje, sido qoftë",
   "confirmations.missing_alt_text.title": "Të shtohet tekst alternativ?",
   "confirmations.mute.confirm": "Heshtoje",
+  "confirmations.quiet_post_quote_info.dismiss": "Mos ma kujto më",
+  "confirmations.quiet_post_quote_info.got_it": "E mora vesh",
+  "confirmations.quiet_post_quote_info.message": "Kur citoni një postim publik të heshtuar, postimi juaj do të kalohet i fshehur te rrjedha kohore e gjërave në modë.",
+  "confirmations.quiet_post_quote_info.title": "Citim postimesh publikë të heshtuar",
   "confirmations.redraft.confirm": "Fshijeni & rihartojeni",
   "confirmations.redraft.message": "Jeni i sigurt se doni të fshihet kjo gjendje dhe të rihartohet? Të parapëlqyerit dhe përforcimet do të humbin, ndërsa përgjigjet te postimi origjinal do të bëhen jetime.",
   "confirmations.redraft.title": "Të fshihet & riharothet postimi?",
   "confirmations.remove_from_followers.confirm": "Hiqe ndjekësin",
   "confirmations.remove_from_followers.message": "{name} do të reshtë së ndjekuri ju. Jeni i sigurt se doni të vazhdohet?",
   "confirmations.remove_from_followers.title": "Të hiqet ndjekësi?",
+  "confirmations.revoke_quote.confirm": "Hiqe postimin",
+  "confirmations.revoke_quote.message": "Ky veprim s’mund të zhbëhet.",
+  "confirmations.revoke_quote.title": "Të hiqet postimi?",
+  "confirmations.unblock.confirm": "Zhbllokoje",
+  "confirmations.unblock.title": "Të zhbllojohet {name}?",
   "confirmations.unfollow.confirm": "Resht së ndjekuri",
-  "confirmations.unfollow.message": "Jeni i sigurt se doni të mos ndiqet më {name}?",
-  "confirmations.unfollow.title": "Të ndalet ndjekja e përdoruesit?",
+  "confirmations.unfollow.title": "Të ndalet ndjekja për {name}?",
+  "confirmations.withdraw_request.confirm": "Tërhiqeni mbrapsht kërkesën",
+  "confirmations.withdraw_request.title": "Të tërhiqet mbrapsht kërkesa për ndjeken e {name}?",
   "content_warning.hide": "Fshihe postimin",
   "content_warning.show": "Shfaqe, sido qoftë",
   "content_warning.show_more": "Shfaq më tepër",
@@ -284,6 +300,7 @@
   "domain_pill.your_handle": "Targa juaj:",
   "domain_pill.your_server": "Shtëpia juaj dixhitale, kur gjenden krejt postimet tuaja. S’ju pëlqen kjo këtu? Shpërngulni shërbyes kur të doni dhe sillni edhe ndjekësit tuaj.",
   "domain_pill.your_username": "Identifikuesi juja unik në këtë shërbyes. Është e mundur të gjenden përdorues me të njëjtin emër përdoruesi në shërbyes të ndryshëm.",
+  "dropdown.empty": "Përzgjidhni një mundësi",
   "embed.instructions": "Trupëzojeni këtë gjendje në sajtin tuaj duke kopjuar kodin më poshtë.",
   "embed.preview": "Ja si do të duket:",
   "emoji_button.activity": "Veprimtari",
@@ -419,8 +436,6 @@
   "hints.profiles.see_more_followers": "Shihni më tepër ndjekës në {domain}",
   "hints.profiles.see_more_follows": "Shihni më tepër ndjekje në {domain}",
   "hints.profiles.see_more_posts": "Shihni më tepër postime në {domain}",
-  "hints.threads.replies_may_be_missing": "Mund të mungojnë përgjigje nga shërbyes të tjerë.",
-  "hints.threads.see_more": "Shihni më tepër përgjigje në {domain}",
   "home.column_settings.show_quotes": "Shfaq thonjëza",
   "home.column_settings.show_reblogs": "Shfaq përforcime",
   "home.column_settings.show_replies": "Shfaq përgjigje",
@@ -442,20 +457,12 @@
   "ignore_notifications_modal.private_mentions_title": "Të shpërfillen njoftime nga Përmendje Private të pakërkuara?",
   "info_button.label": "Ndihmë",
   "info_button.what_is_alt_text": "<h1>Ç’është teksti alternativ?</h1> <p>Teksti alternativ jep përshkrime figurash për persona me mangësi në të parët, lidhje me gjerësi bande të ulët, ose për ata që duan kontekst shtesë.</p> <p>Mund të përmirësoni përdorimin nga persona me aftësi të kufizuara dhe kuptimin për këto, duke shkruar tekst alternativ të qartë, konciz dhe objektiv.</p> <ul> <li>Rrokni elementët e rëndësishëm</li> <li>Përmblidhni tekst në figura</li> <li>Përdorni strukturë të rregullt fjalish</li> <li>Shmangni përsëritje informacioni</li> <li>Në aspekte pamore të ndërlikuara (fjala vjen, diagrame ose harta) përqendrohuni te prirje dhe gjetje gjërash kyçe</li> </ul>",
-  "interaction_modal.action.favourite": "Që të vazhdoni, lypset t’i vini shenjë si i parapëlqyer që nga llogaria juaj.",
-  "interaction_modal.action.follow": "Që të vazhdoni, lypset ta ndiqni që nga llogaria juaj.",
-  "interaction_modal.action.reblog": "Që të vazhdoni, lypset ta riblogoni që nga llogaria juaj.",
-  "interaction_modal.action.reply": "Që të vazhdoni, lypset të përgjigjeni që nga llogaria juaj.",
-  "interaction_modal.action.vote": "Që të vazhdoni, lypset të votoni që nga llogaria juaj.",
+  "interaction_modal.action": "Që të ndërveproni me postimin nga {name}, lypset të bëni hyrjen në llogarinë tuaj, ose në çfarëdo shërbyesi Mastodon që përdorni.",
   "interaction_modal.go": "Shko",
   "interaction_modal.no_account_yet": "S’keni ende një llogari?",
   "interaction_modal.on_another_server": "Në një tjetër shërbyes",
   "interaction_modal.on_this_server": "Në këtë shërbyes",
-  "interaction_modal.title.favourite": "Bëje të parapëlqyer postimin e {name}",
-  "interaction_modal.title.follow": "Ndiq {name}",
-  "interaction_modal.title.reblog": "Përforconi postimin e {name}",
-  "interaction_modal.title.reply": "Përgjigjuni postimit të {name}",
-  "interaction_modal.title.vote": "Votoni te pyetësori nga {name}",
+  "interaction_modal.title": "Që të vazhdohet, bëni hyrjen",
   "interaction_modal.username_prompt": "P.sh., {example}",
   "intervals.full.days": "{number, plural, one {# ditë} other {# ditë}}",
   "intervals.full.hours": "{number, plural, one {# orë} other {# orë}}",
@@ -476,6 +483,7 @@
   "keyboard_shortcuts.home": "Për hapje rrjedhe kohore vetjake",
   "keyboard_shortcuts.hotkey": "Tast përkatës",
   "keyboard_shortcuts.legend": "Për shfaqje të kësaj legjende",
+  "keyboard_shortcuts.load_more": "Kaloje fokusin te butoni “Ngarko më tepër”",
   "keyboard_shortcuts.local": "Për hapje rrjedhe kohore vendore",
   "keyboard_shortcuts.mention": "Për përmendje të autorit",
   "keyboard_shortcuts.muted": "Për hapje liste përdoruesish të heshtuar",
@@ -484,6 +492,7 @@
   "keyboard_shortcuts.open_media": "Për hapje mediash",
   "keyboard_shortcuts.pinned": "Për hapje liste mesazhesh të fiksuar",
   "keyboard_shortcuts.profile": "Për hapje të profilit të autorit",
+  "keyboard_shortcuts.quote": "Citoni postim",
   "keyboard_shortcuts.reply": "Për t’iu përgjigjur një postimi",
   "keyboard_shortcuts.requests": "Për hapje liste kërkesash për ndjekje",
   "keyboard_shortcuts.search": "Për kalim fokusi te kërkimi",
@@ -495,6 +504,8 @@
   "keyboard_shortcuts.translate": "për të përkthyer një postim",
   "keyboard_shortcuts.unfocus": "Për heqjen e fokusit nga fusha e hartimit të mesazheve apo kërkimeve",
   "keyboard_shortcuts.up": "Për ngjitje sipër nëpër listë",
+  "learn_more_link.got_it": "E mora vesh",
+  "learn_more_link.learn_more": "Mësoni më tepër",
   "lightbox.close": "Mbylle",
   "lightbox.next": "Pasuesja",
   "lightbox.previous": "E mëparshmja",
@@ -559,6 +570,8 @@
   "navigation_bar.follows_and_followers": "Ndjekje dhe ndjekës",
   "navigation_bar.import_export": "Importim dhe eksportim",
   "navigation_bar.lists": "Lista",
+  "navigation_bar.live_feed_local": "Pryrje e atypëratyshme (vendore)",
+  "navigation_bar.live_feed_public": "Prurje e atypëratyshme (publike)",
   "navigation_bar.logout": "Dalje",
   "navigation_bar.moderation": "Moderim",
   "navigation_bar.more": "Më tepër",
@@ -593,6 +606,7 @@
   "notification.label.mention": "Përmendje",
   "notification.label.private_mention": "Përmendje private",
   "notification.label.private_reply": "Përgjigje private",
+  "notification.label.quote": "{name} citoi postimin tuaj",
   "notification.label.reply": "Përgjigje",
   "notification.mention": "Përmendje",
   "notification.mentioned_you": "{name} ju ka përmendur",
@@ -607,6 +621,7 @@
   "notification.moderation_warning.action_suspend": "Llogaria juaj është pezulluar.",
   "notification.own_poll": "Pyetësori juaj ka përfunduar",
   "notification.poll": "Ka përfunduar një pyetësor në të cilin keni marrë pjesë",
+  "notification.quoted_update": "{name} përpunoi një postim që keni cituar",
   "notification.reblog": "{name} përforcoi mesazhin tuaj",
   "notification.reblog.name_and_others_with_link": "Ju ka përforcuar {name} dhe <a>{count, plural, one {# tjetër} other {# të tjerë}}</a>",
   "notification.relationships_severance_event": "Lidhje të humbura me {name}",
@@ -650,6 +665,7 @@
   "notifications.column_settings.mention": "Përmendje:",
   "notifications.column_settings.poll": "Përfundime pyetësori:",
   "notifications.column_settings.push": "Njoftime Push",
+  "notifications.column_settings.quote": "Ctime:",
   "notifications.column_settings.reblog": "Përforcime:",
   "notifications.column_settings.show": "Shfaqi në shtylla",
   "notifications.column_settings.sound": "Luaj një tingull",
@@ -725,11 +741,18 @@
   "privacy.private.short": "Ndjekës",
   "privacy.public.long": "Cilido që hyn e del në Mastodon",
   "privacy.public.short": "Publik",
+  "privacy.quote.anyone": "{visibility}, mund të citojë cilido",
+  "privacy.quote.disabled": "{visibility}, citimet janë çaktivizuar",
+  "privacy.quote.limited": "{visibility}, citime të kufizuara",
   "privacy.unlisted.additional": "Ky sillet saktësisht si publik, vetëm se postimi s’do të shfaqet në prurje të drejtpërdrejta, ose në hashtag-ë, te eksploroni, apo kërkim në Mastodon, edhe kur keni zgjedhur të jetë për tërë llogarinë.",
-  "privacy.unlisted.long": "Më pak fanfara algoritmike",
+  "privacy.unlisted.long": "Fshehur nga përfundime kërkimi në Mastodon, rrjedha kohore gjërash në modë dhe publike",
   "privacy.unlisted.short": "Publik i qetë",
   "privacy_policy.last_updated": "Përditësuar së fundi më {date}",
   "privacy_policy.title": "Rregulla Privatësie",
+  "quote_error.poll": "Me pyetësorët nuk lejohet citim.",
+  "quote_error.quote": "Lejohet vetëm një citim në herë.",
+  "quote_error.unauthorized": "S’jen i autorizuar ta citoni këtë postim.",
+  "quote_error.upload": "Me bashkëngjitjet media nuk lejohet citim.",
   "recommended": "E rekomanduar",
   "refresh": "Rifreskoje",
   "regeneration_indicator.please_stand_by": "Ju lutemi, mos u largoni.",
@@ -745,6 +768,9 @@
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "sot",
+  "remove_quote_hint.button_label": "E mora vesh",
+  "remove_quote_hint.message": "Këtë mund ta bëni një menuja e mundësive {icon}.",
+  "remove_quote_hint.title": "Doni të hiqet postimi juaj i cituar?",
   "reply_indicator.attachments": "{count, plural, one {# bashkëngjitje} other {# bashkëngjitje}}",
   "reply_indicator.cancel": "Anuloje",
   "reply_indicator.poll": "Pyetësor",
@@ -836,13 +862,23 @@
   "status.admin_account": "Hap ndërfaqe moderimi për @{name}",
   "status.admin_domain": "Hap ndërfaqe moderimi për {domain}",
   "status.admin_status": "Hape këtë mesazh te ndërfaqja e moderimit",
+  "status.all_disabled": "Përforcimet dhe citime janë të çaktivizuara",
   "status.block": "Blloko @{name}",
   "status.bookmark": "Faqeruaje",
   "status.cancel_reblog_private": "Shpërforcojeni",
+  "status.cannot_quote": "S’keni leje të citoni këtë postim",
   "status.cannot_reblog": "Ky postim s’mund të përforcohet",
+  "status.contains_quote": "Përmban citim",
+  "status.context.loading": "Po ngarkohen më tepër përgjigje",
+  "status.context.loading_error": "S’u ngarkuan dot përgjigje të reja",
+  "status.context.loading_success": "Janë ngarkuar krejt përgjigjet",
+  "status.context.more_replies_found": "U gjetën më tepër përgjigje",
+  "status.context.retry": "Riprovoni",
+  "status.context.show": "Shfaqe",
   "status.continued_thread": "Vazhdoi rrjedhën",
   "status.copy": "Kopjoje lidhjen për te mesazhi",
   "status.delete": "Fshije",
+  "status.delete.success": "Postimi u fshi",
   "status.detailed_status": "Pamje e hollësishme bisede",
   "status.direct": "Përmendje private për @{name}",
   "status.direct_indicator": "Përmendje private",
@@ -865,27 +901,43 @@
   "status.mute_conversation": "Heshtoje bisedën",
   "status.open": "Zgjeroje këtë mesazh",
   "status.pin": "Fiksoje në profil",
+  "status.quote": "Citojeni",
+  "status.quote.cancel": "Anuloje citimin",
   "status.quote_error.filtered": "Fshehur për shkak të njërit nga filtrat tuaj",
-  "status.quote_error.not_found": "Ky postim s’mund të shfaqet.",
-  "status.quote_error.pending_approval": "Ky postim është në pritje të miratimit nga autori origjinal.",
-  "status.quote_error.rejected": "Ky postim s’mund të shfaqet, ngaqë autori origjinal nuk lejon citim të tij.",
-  "status.quote_error.removed": "Ky postim u hoq nga autori i tij.",
-  "status.quote_error.unauthorized": "Ky postim s’mund të shfaqet, ngaqë s’jeni i autorizuar ta shihni.",
-  "status.quote_post_author": "Postim nga {name}",
+  "status.quote_error.limited_account_hint.action": "Shfaqe, sido qoftë",
+  "status.quote_error.limited_account_hint.title": "Kjo llogari është fshehur nga moderatorët e {domain}.",
+  "status.quote_error.not_available": "Postim që s’mund të kihet",
+  "status.quote_error.pending_approval": "Postim pezull",
+  "status.quote_error.pending_approval_popout.body": "Në Mastodon mundeni të kontrolloni nëse dikush ju citon a jo. Ky postim është pezull, teksa po marrim miratimin e autorit origjinal.",
+  "status.quote_error.revoked": "Postim i hequr nga autori",
+  "status.quote_followers_only": "Këtë postim mund ta citojnë vetëm ndjekës",
+  "status.quote_manual_review": "Autori do ta shqyrtojë dorazi",
+  "status.quote_noun": "Citim",
+  "status.quote_policy_change": "Ndryshoni cilët mund të citojnë",
+  "status.quote_post_author": "U citua një postim nga @{name}",
+  "status.quote_private": "Postimet private s’mund të citohen",
+  "status.quotes": "{count, plural, one {citim} other {citime}}",
+  "status.quotes.empty": "Këtë postim ende s’e ka cituar kush. Kur dikush ta bëjë, do të shfaqet këtu.",
+  "status.quotes.local_other_disclaimer": "Citimet e hedhura poshtë nga autori s’do të shfaqen.",
+  "status.quotes.remote_other_disclaimer": "Këtu garantohet të shfaqen vetëm citime nga {domain}. Citime të hedhura poshtë nga autori s’do të shfaqen.",
   "status.read_more": "Lexoni më tepër",
   "status.reblog": "Përforcojeni",
-  "status.reblog_private": "Përforcim për publikun origjinal",
+  "status.reblog_or_quote": "Përforconi ose citoni",
+  "status.reblog_private": "Rindajeni me ndjekësit tuaj",
   "status.reblogged_by": "{name} përforcoi",
   "status.reblogs": "{count, plural, one {përforcim} other {përforcime}}",
   "status.reblogs.empty": "Këtë mesazh s’e ka përforcuar njeri deri tani. Kur ta bëjë dikush, kjo do të duket këtu.",
   "status.redraft": "Fshijeni & rihartojeni",
   "status.remove_bookmark": "Hiqe faqerojtësin",
   "status.remove_favourite": "Hiqe nga të parapëlqyerat",
+  "status.remove_quote": "Hiqe",
   "status.replied_in_thread": "U përgjigj te rrjedha",
   "status.replied_to": "Iu përgjigj {name}",
   "status.reply": "Përgjigjuni",
   "status.replyAll": "Përgjigjuni rrjedhës",
   "status.report": "Raportojeni @{name}",
+  "status.request_quote": "Kërkoni të citohet",
+  "status.revoke_quote": "Hiqe postimin tim nga postimi i @{name}",
   "status.sensitive_warning": "Lëndë rezervat",
   "status.share": "Ndajeni me të tjerë",
   "status.show_less_all": "Shfaq më pak për të tërë",
@@ -923,6 +975,7 @@
   "upload_button.label": "Shtoni figura, një video ose një kartelë audio",
   "upload_error.limit": "U tejkalua kufi ngarkimi kartelash.",
   "upload_error.poll": "Me pyetësorët s’lejohet ngarkim kartelash.",
+  "upload_error.quote": "Nuk lejohet ngarkim kartelash me citime.",
   "upload_form.drag_and_drop.instructions": "Që të merrni një bashkëngjitje media, shtypni tastin Space ose Enter. Teksa bëhet tërheqje, përdorni tastet shigjetë për ta shpënë bashkëngjitjen media në cilëndo drejtori që doni. Shtypni sërish Space ose Enter që të lihet bashkëngjitja media në pozicionin e vet të ri, ose shtypni Esc, që të anulohet veprimi.",
   "upload_form.drag_and_drop.on_drag_cancel": "Tërheqja u anulua. Bashkëngjitja media {item} u la.",
   "upload_form.drag_and_drop.on_drag_end": "Bashkëngjitja media {item} u la.",
@@ -945,5 +998,19 @@
   "video.skip_forward": "Anashkalo pasardhësen",
   "video.unmute": "Hiqi heshtimin",
   "video.volume_down": "Ulje volumi",
-  "video.volume_up": "Ngritje volumi"
+  "video.volume_up": "Ngritje volumi",
+  "visibility_modal.button_title": "Caktoni dukshmëri",
+  "visibility_modal.header": "Dukshmëri dhe ndërveprim",
+  "visibility_modal.helper.direct_quoting": "Përmendje private të krijuara në Mastodon s’mund të citohen nga të tjerë.",
+  "visibility_modal.helper.privacy_editing": "Dukshmëria s’mund të ndryshohet pasi postimi botohet.",
+  "visibility_modal.helper.privacy_private_self_quote": "Citimet nga ju vetë të postime private s’mund të bëhen publike.",
+  "visibility_modal.helper.private_quoting": "Postime vetëm për ndjekësit, të krijuara në Mastodon s’mund të citohen nga të tjerë.",
+  "visibility_modal.helper.unlisted_quoting": "Kur njerëzit ju citojnë, nga rrjedha kohore e gjërave në modë do të kalohen si të fshehura edhe postimet e tyre.",
+  "visibility_modal.instructions": "Kontrolloni cilët mund të ndërveprojnë me këtë postim. Rregullime mund të aplikooni edhe mbi krejt postimet e ardshme, që nga <link>Parapëlqime > Parazgjedhje postimi</link>.",
+  "visibility_modal.privacy_label": "Dukshmëri",
+  "visibility_modal.quote_followers": "Vetëm ndjekës",
+  "visibility_modal.quote_label": "Cilët mund të citojnë",
+  "visibility_modal.quote_nobody": "Thjesht unë",
+  "visibility_modal.quote_public": "Cilido",
+  "visibility_modal.save": "Ruaje"
 }
diff --git a/app/javascript/mastodon/locales/sr-Latn.json b/app/javascript/mastodon/locales/sr-Latn.json
index c8fa67183e4..f91044899e1 100644
--- a/app/javascript/mastodon/locales/sr-Latn.json
+++ b/app/javascript/mastodon/locales/sr-Latn.json
@@ -54,7 +54,6 @@
   "account.posts": "Objave",
   "account.posts_with_replies": "Objave i odgovori",
   "account.report": "Prijavi @{name}",
-  "account.requested": "Čekanje odobrenja. Kliknite za otkazivanje zahteva za praćenje",
   "account.requested_follow": "{name} je zatražio da vas prati",
   "account.share": "Podeli profil korisnika @{name}",
   "account.show_reblogs": "Prikaži podržavanja od korisnika @{name}",
@@ -172,7 +171,6 @@
   "confirmations.redraft.confirm": "Izbriši i prepravi",
   "confirmations.redraft.message": "Da li ste sigurni da želite da izbrišete ovu objavu i da je prepravite? Podržavanja i oznake kao omiljenih će biti izgubljeni, a odgovori će ostati bez originalne objave.",
   "confirmations.unfollow.confirm": "Otprati",
-  "confirmations.unfollow.message": "Da li ste sigurni da želite da otpratite korisnika {name}?",
   "conversation.delete": "Izbriši razgovor",
   "conversation.mark_as_read": "Označi kao pročitano",
   "conversation.open": "Prikaži razgovor",
@@ -328,10 +326,6 @@
   "home.show_announcements": "Prijaži najave",
   "interaction_modal.on_another_server": "Na drugom serveru",
   "interaction_modal.on_this_server": "Na ovom serveru",
-  "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}",
-  "interaction_modal.title.reply": "Odgovori na objavu korisnika {name}",
   "intervals.full.days": "{number, plural, one {# dan} few {# dana} other {# dana}}",
   "intervals.full.hours": "{number, plural, one {# sat} few {# sata} other {# sati}}",
   "intervals.full.minutes": "{number, plural, one {# minut} few {# minuta} other {# minuta}}",
@@ -514,7 +508,6 @@
   "privacy.public.long": "Bilo ko na Mastodon-u i van njega",
   "privacy.public.short": "Javno",
   "privacy.unlisted.additional": "Ovo se ponaša potpuno kao javno, osim što se objava neće pojavljivati u izvorima uživo ili heš oznakama, istraživanjima ili pretrazi Mastodon-a, čak i ako ste uključeni u celom nalogu.",
-  "privacy.unlisted.long": "Manje algoritamskih fanfara",
   "privacy.unlisted.short": "Tiha javnost",
   "privacy_policy.last_updated": "Poslednje ažuriranje {date}",
   "privacy_policy.title": "Politika privatnosti",
@@ -643,7 +636,6 @@
   "status.pin": "Zakači na profil",
   "status.read_more": "Pročitajte više",
   "status.reblog": "Podrži",
-  "status.reblog_private": "Podrži sa originalnom vidljivošću",
   "status.reblogged_by": "{name} je podržao/la",
   "status.reblogs": "{count, plural, one {# podržavanje} few {# podržavanja} other {# podržavanja}}",
   "status.reblogs.empty": "Još uvek niko nije podržao ovu objavu. Kada bude podržana, pojaviće se ovde.",
diff --git a/app/javascript/mastodon/locales/sr.json b/app/javascript/mastodon/locales/sr.json
index 49261ffd3da..117c25949de 100644
--- a/app/javascript/mastodon/locales/sr.json
+++ b/app/javascript/mastodon/locales/sr.json
@@ -54,7 +54,6 @@
   "account.posts": "Објаве",
   "account.posts_with_replies": "Објаве и одговори",
   "account.report": "Пријави @{name}",
-  "account.requested": "Чекање одобрења. Кликните за отказивање захтева за праћење",
   "account.requested_follow": "{name} је затражио да вас прати",
   "account.share": "Подели профил корисника @{name}",
   "account.show_reblogs": "Прикажи подржавања од корисника @{name}",
@@ -172,7 +171,6 @@
   "confirmations.redraft.confirm": "Избриши и преправи",
   "confirmations.redraft.message": "Да ли сте сигурни да желите да избришете ову објаву и да је преправите? Подржавања и ознаке као омиљених ће бити изгубљени, а одговори ће остати без оригиналне објаве.",
   "confirmations.unfollow.confirm": "Отпрати",
-  "confirmations.unfollow.message": "Да ли сте сигурни да желите да отпратите корисника {name}?",
   "conversation.delete": "Избриши разговор",
   "conversation.mark_as_read": "Означи као прочитано",
   "conversation.open": "Прикажи разговор",
@@ -328,10 +326,6 @@
   "home.show_announcements": "Пријажи најаве",
   "interaction_modal.on_another_server": "На другом серверу",
   "interaction_modal.on_this_server": "На овом серверу",
-  "interaction_modal.title.favourite": "Означи објаву корисника {name} као омиљену",
-  "interaction_modal.title.follow": "Запрати {name}",
-  "interaction_modal.title.reblog": "Подржи објаву корисника {name}",
-  "interaction_modal.title.reply": "Одговори на објаву корисника {name}",
   "intervals.full.days": "{number, plural, one {# дан} few {# дана} other {# дана}}",
   "intervals.full.hours": "{number, plural, one {# сат} few {# сата} other {# сати}}",
   "intervals.full.minutes": "{number, plural, one {# минут} few {# минута} other {# минута}}",
@@ -514,7 +508,6 @@
   "privacy.public.long": "Било ко на Mastodon-у и ван њега",
   "privacy.public.short": "Јавно",
   "privacy.unlisted.additional": "Ово се понаша потпуно као јавно, осим што се објава неће појављивати у изворима уживо или хеш ознакама, истраживањима или претрази Mastodon-а, чак и ако сте укључени у целом налогу.",
-  "privacy.unlisted.long": "Мање алгоритамских фанфара",
   "privacy.unlisted.short": "Тиха јавност",
   "privacy_policy.last_updated": "Последње ажурирање {date}",
   "privacy_policy.title": "Политика приватности",
@@ -643,7 +636,6 @@
   "status.pin": "Закачи на профил",
   "status.read_more": "Прочитајте више",
   "status.reblog": "Подржи",
-  "status.reblog_private": "Подржи са оригиналном видљивошћу",
   "status.reblogged_by": "{name} је подржао/ла",
   "status.reblogs": "{count, plural, one {# подржавање} few {# подржавања} other {# подржавања}}",
   "status.reblogs.empty": "Још увек нико није подржао ову објаву. Када буде подржана, појавиће се овде.",
diff --git a/app/javascript/mastodon/locales/sv.json b/app/javascript/mastodon/locales/sv.json
index 9eee2e750f9..e3418890419 100644
--- a/app/javascript/mastodon/locales/sv.json
+++ b/app/javascript/mastodon/locales/sv.json
@@ -70,7 +70,6 @@
   "account.posts_with_replies": "Inlägg och svar",
   "account.remove_from_followers": "Ta bort {name} från följare",
   "account.report": "Rapportera @{name}",
-  "account.requested": "Inväntar godkännande. Klicka för att ta tillbaka din begäran om att få följa",
   "account.requested_follow": "{name} har begärt att följa dig",
   "account.requests_to_follow_you": "Fråga om att följa dig",
   "account.share": "Dela @{name}s profil",
@@ -220,6 +219,12 @@
   "confirmations.delete_list.message": "Är du säker på att du vill radera denna lista permanent?",
   "confirmations.delete_list.title": "Ta bort listan?",
   "confirmations.discard_draft.confirm": "Släng bort och fortsätt",
+  "confirmations.discard_draft.edit.cancel": "Fortsätt redigera",
+  "confirmations.discard_draft.edit.message": "Fortsätter du, kommer ändringarna till inlägget att förkastas.",
+  "confirmations.discard_draft.edit.title": "Vill du förkasta ändringarna i inlägget?",
+  "confirmations.discard_draft.post.cancel": "Återuppta utkast",
+  "confirmations.discard_draft.post.message": "Fortsätter du, kommer inlägget du skriver att förkastas.",
+  "confirmations.discard_draft.post.title": "Vill du förkasta utkastet?",
   "confirmations.discard_edit_media.confirm": "Kasta",
   "confirmations.discard_edit_media.message": "Du har osparade ändringar till mediabeskrivningen eller förhandsgranskningen, kasta bort dem ändå?",
   "confirmations.follow_to_list.confirm": "Följ och lägg till i listan",
@@ -233,15 +238,17 @@
   "confirmations.missing_alt_text.secondary": "Posta ändå",
   "confirmations.missing_alt_text.title": "Lägg till alt-text?",
   "confirmations.mute.confirm": "Tysta",
+  "confirmations.quiet_post_quote_info.dismiss": "Påminn mig inte igen",
   "confirmations.redraft.confirm": "Radera & gör om",
   "confirmations.redraft.message": "Är du säker på att du vill radera detta inlägg och göra om det? Favoritmarkeringar, boostar och svar till det ursprungliga inlägget kommer förlora sitt sammanhang.",
   "confirmations.redraft.title": "Ta bort & gör om inlägget?",
   "confirmations.remove_from_followers.confirm": "Ta bort följare",
   "confirmations.remove_from_followers.message": "{name} kommer att sluta följa dig. Är du säker på att du vill fortsätta?",
   "confirmations.remove_from_followers.title": "Ta bort följare?",
+  "confirmations.revoke_quote.confirm": "Ta bort inlägg",
+  "confirmations.revoke_quote.message": "Denna åtgärd kan inte ångras.",
+  "confirmations.revoke_quote.title": "Ta bort inlägg?",
   "confirmations.unfollow.confirm": "Avfölj",
-  "confirmations.unfollow.message": "Är du säker på att du vill avfölja {name}?",
-  "confirmations.unfollow.title": "Avfölj användare?",
   "content_warning.hide": "Dölj inlägg",
   "content_warning.show": "Visa ändå",
   "content_warning.show_more": "Visa mer",
@@ -283,6 +290,7 @@
   "domain_pill.your_handle": "Ditt handtag:",
   "domain_pill.your_server": "Ditt digitala hem, där alla dina inlägg bor. Gillar du inte just denna? Byt server när som helst och ta med dina anhängare också.",
   "domain_pill.your_username": "Din unika identifierare på denna server. Det är möjligt att hitta användare med samma användarnamn på olika servrar.",
+  "dropdown.empty": "Välj ett alternativ",
   "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",
@@ -418,8 +426,6 @@
   "hints.profiles.see_more_followers": "Se fler följare på {domain}",
   "hints.profiles.see_more_follows": "Se fler följare på {domain}",
   "hints.profiles.see_more_posts": "Se fler inlägg på {domain}",
-  "hints.threads.replies_may_be_missing": "Det kan saknas svar från andra servrar.",
-  "hints.threads.see_more": "Se fler svar på {domain}",
   "home.column_settings.show_quotes": "Visa citat",
   "home.column_settings.show_reblogs": "Visa boostar",
   "home.column_settings.show_replies": "Visa svar",
@@ -441,20 +447,10 @@
   "ignore_notifications_modal.private_mentions_title": "Vill du ignorera aviseringar från oombedda privata omnämnanden?",
   "info_button.label": "Hjälp",
   "info_button.what_is_alt_text": "<h1>Vad är alt-text?</h1> <p>alt-text ger bildbeskrivningar för personer med synnedsättning, anslutningar med låg bandbredd eller de som söker extra sammanhang.</p> <p>Du kan förbättra tillgängligheten och förståelsen för alla genom att skriva en tydlig, koncis och objektiv alt-text.</p> <ul> <li>Fånga viktiga element</li> <li>Sammanfatta text i bilder</li> <li>Använd vanlig meningsstruktur</li> <li>Undvik överflödig information</li> <li>Fokus på trender och viktiga resultat i komplexa bilder (som diagram eller kartor)</li> </ul>",
-  "interaction_modal.action.favourite": "För att fortsätta, måste du favoritmarkera från ditt konto.",
-  "interaction_modal.action.follow": "För att fortsätta, måste du följa från ditt konto.",
-  "interaction_modal.action.reblog": "För att fortsätta, måste du boosta från ditt konto.",
-  "interaction_modal.action.reply": "För att fortsätta, måste du svara från ditt konto.",
-  "interaction_modal.action.vote": "För att fortsätta, måste du rösta från ditt konto.",
   "interaction_modal.go": "Vidare",
   "interaction_modal.no_account_yet": "Har du inget konto än?",
   "interaction_modal.on_another_server": "På en annan server",
   "interaction_modal.on_this_server": "På denna server",
-  "interaction_modal.title.favourite": "Favoritmarkera {name}s inlägg",
-  "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",
-  "interaction_modal.title.vote": "Rösta i {name}s enkät",
   "interaction_modal.username_prompt": "T.ex. {example}",
   "intervals.full.days": "{number, plural, one {# dag} other {# dagar}}",
   "intervals.full.hours": "{number, plural, one {# timme} other {# timmar}}",
@@ -494,6 +490,8 @@
   "keyboard_shortcuts.translate": "för att översätta ett inlägg",
   "keyboard_shortcuts.unfocus": "Avfokusera skrivfält/sökfält",
   "keyboard_shortcuts.up": "Flytta uppåt i listan",
+  "learn_more_link.got_it": "Jag förstår",
+  "learn_more_link.learn_more": "Läs mer",
   "lightbox.close": "Stäng",
   "lightbox.next": "Nästa",
   "lightbox.previous": "Tidigare",
@@ -558,6 +556,8 @@
   "navigation_bar.follows_and_followers": "Följer och följare",
   "navigation_bar.import_export": "Importera och exportera",
   "navigation_bar.lists": "Listor",
+  "navigation_bar.live_feed_local": "Direkt flöde (lokalt)",
+  "navigation_bar.live_feed_public": "Direkt flöde (publikt)",
   "navigation_bar.logout": "Logga ut",
   "navigation_bar.moderation": "Moderering",
   "navigation_bar.more": "Fler",
@@ -592,6 +592,7 @@
   "notification.label.mention": "Nämn",
   "notification.label.private_mention": "Privat omnämnande",
   "notification.label.private_reply": "Privata svar",
+  "notification.label.quote": "{name} citerade ditt inlägg",
   "notification.label.reply": "Svar",
   "notification.mention": "Nämn",
   "notification.mentioned_you": "{name} nämnde dig",
@@ -649,6 +650,7 @@
   "notifications.column_settings.mention": "Omnämningar:",
   "notifications.column_settings.poll": "Omröstningsresultat:",
   "notifications.column_settings.push": "Push-aviseringar",
+  "notifications.column_settings.quote": "Citerat:",
   "notifications.column_settings.reblog": "Boostar:",
   "notifications.column_settings.show": "Visa i kolumnen",
   "notifications.column_settings.sound": "Spela upp ljud",
@@ -725,7 +727,6 @@
   "privacy.public.long": "Alla på och utanför Mastodon",
   "privacy.public.short": "Offentlig",
   "privacy.unlisted.additional": "Detta fungerar precis som offentlig, förutom att inlägget inte visas i liveflöden eller hashtaggar, utforska eller Mastodon-sökning, även om du har valt detta för hela kontot.",
-  "privacy.unlisted.long": "Mindre beaktat av algoritmen",
   "privacy.unlisted.short": "Offentlig (begränsad)",
   "privacy_policy.last_updated": "Senast uppdaterad {date}",
   "privacy_policy.title": "Integritetspolicy",
@@ -797,6 +798,7 @@
   "report_notification.categories.violation": "Regelöverträdelse",
   "report_notification.categories.violation_sentence": "regelöverträdelse",
   "report_notification.open": "Öppna rapport",
+  "search.clear": "Rensa sökning",
   "search.no_recent_searches": "Inga sökningar nyligen",
   "search.placeholder": "Sök",
   "search.quick_action.account_search": "Profiler som matchar {x}",
@@ -841,6 +843,7 @@
   "status.continued_thread": "Fortsatt tråd",
   "status.copy": "Kopiera inläggslänk",
   "status.delete": "Radera",
+  "status.delete.success": "Inlägg borttaget",
   "status.detailed_status": "Detaljerad samtalsvy",
   "status.direct": "Omnämn @{name} privat",
   "status.direct_indicator": "Privat omnämnande",
@@ -863,16 +866,14 @@
   "status.mute_conversation": "Tysta konversation",
   "status.open": "Utvidga detta inlägg",
   "status.pin": "Fäst i profil",
+  "status.quote.cancel": "Återkalla citering",
   "status.quote_error.filtered": "Dolt på grund av ett av dina filter",
-  "status.quote_error.not_found": "Detta inlägg kan inte boostas.",
-  "status.quote_error.pending_approval": "Det här inlägget väntar på godkännande från originalförfattaren.",
-  "status.quote_error.rejected": "Det här inlägget kan inte visas eftersom originalförfattaren inte tillåter att det citeras.",
-  "status.quote_error.removed": "Detta inlägg har tagits bort av författaren.",
-  "status.quote_error.unauthorized": "Det här inlägget kan inte visas eftersom du inte har behörighet att se det.",
-  "status.quote_post_author": "Inlägg av @{name}",
+  "status.quote_error.not_available": "Inlägg ej tillgängligt",
+  "status.quote_error.pending_approval": "Väntande inlägg",
+  "status.quote_policy_change": "Ändra vem som kan citera",
+  "status.quote_post_author": "Citerade ett inlägg av @{name}",
   "status.read_more": "Läs mer",
   "status.reblog": "Boosta",
-  "status.reblog_private": "Boosta med ursprunglig synlighet",
   "status.reblogged_by": "{name} boostade",
   "status.reblogs": "{count, plural, one {# röst} other {# röster}}",
   "status.reblogs.empty": "Ingen har boostat detta inlägg än. När någon gör det kommer de synas här.",
@@ -884,6 +885,7 @@
   "status.reply": "Svara",
   "status.replyAll": "Svara på tråden",
   "status.report": "Rapportera @{name}",
+  "status.revoke_quote": "Ta bort mitt inlägg från @{name}s inlägg",
   "status.sensitive_warning": "Känsligt innehåll",
   "status.share": "Dela",
   "status.show_less_all": "Visa mindre för alla",
@@ -943,5 +945,11 @@
   "video.skip_forward": "Hoppa framåt",
   "video.unmute": "Avtysta",
   "video.volume_down": "Volym ned",
-  "video.volume_up": "Volym upp"
+  "video.volume_up": "Volym upp",
+  "visibility_modal.button_title": "Ange synlighet",
+  "visibility_modal.header": "Synlighet och interaktion",
+  "visibility_modal.helper.unlisted_quoting": "När folk citerar dig, deras inlägg kommer också att döljas från trendiga tidslinjer.",
+  "visibility_modal.quote_followers": "Endast följare",
+  "visibility_modal.quote_public": "Alla",
+  "visibility_modal.save": "Spara"
 }
diff --git a/app/javascript/mastodon/locales/szl.json b/app/javascript/mastodon/locales/szl.json
index 55913be9246..709b0f9e891 100644
--- a/app/javascript/mastodon/locales/szl.json
+++ b/app/javascript/mastodon/locales/szl.json
@@ -19,7 +19,6 @@
   "account.mute": "Wycisz @{name}",
   "account.posts": "Toots",
   "account.posts_with_replies": "Toots and replies",
-  "account.requested": "Awaiting approval",
   "account_note.placeholder": "Click to add a note",
   "column.pins": "Pinned toot",
   "community.column_settings.media_only": "Media only",
diff --git a/app/javascript/mastodon/locales/ta.json b/app/javascript/mastodon/locales/ta.json
index da41a290f9c..7664174c17a 100644
--- a/app/javascript/mastodon/locales/ta.json
+++ b/app/javascript/mastodon/locales/ta.json
@@ -37,7 +37,6 @@
   "account.posts": "டூட்டுகள்",
   "account.posts_with_replies": "Toots மற்றும் பதில்கள்",
   "account.report": "@{name} -ஐப் புகாரளி",
-  "account.requested": "ஒப்புதலுக்காகக் காத்திருக்கிறது. பின்தொடரும் கோரிக்கையை நீக்க அழுத்தவும்",
   "account.share": "@{name} உடைய விவரத்தை பகிர்",
   "account.show_reblogs": "காட்டு boosts இருந்து @{name}",
   "account.unblock": "@{name} மீது தடை நீக்குக",
@@ -129,7 +128,6 @@
   "confirmations.mute.confirm": "அமைதியாக்கு",
   "confirmations.redraft.confirm": "பதிவை நீக்கி மறுவரைவு செய்",
   "confirmations.unfollow.confirm": "விலகு",
-  "confirmations.unfollow.message": "{name}-ஐப் பின்தொடர்வதை நிச்சயமாக நீங்கள் நிறுத்த விரும்புகிறீர்களா?",
   "conversation.delete": "உரையாடலை அழி",
   "conversation.mark_as_read": "படிக்கபட்டதாகக் குறி",
   "conversation.open": "உரையாடலைக் காட்டு",
@@ -316,7 +314,6 @@
   "status.pin": "சுயவிவரத்தில் முள்",
   "status.read_more": "மேலும் வாசிக்க",
   "status.reblog": "மதிப்பை உயர்த்து",
-  "status.reblog_private": "Boost அசல் பார்வையாளர்களுக்கு",
   "status.reblogged_by": "{name} மதிப்பை உயர்த்து",
   "status.reblogs.empty": "இதுவரை யாரும் இந்த மோதலை அதிகரிக்கவில்லை. யாராவது செய்தால், அவர்கள் இங்கே காண்பார்கள்.",
   "status.redraft": "நீக்கு மற்றும் மீண்டும் வரைவு",
diff --git a/app/javascript/mastodon/locales/tai.json b/app/javascript/mastodon/locales/tai.json
index 37994550508..507894ba142 100644
--- a/app/javascript/mastodon/locales/tai.json
+++ b/app/javascript/mastodon/locales/tai.json
@@ -8,7 +8,6 @@
   "account.mention": "Thê-khí @{name}",
   "account.posts": "Huah-siann",
   "account.posts_with_replies": "Huah-siann kah huê-ìng",
-  "account.requested": "Tán-thāi phue-tsún",
   "account_note.placeholder": "Tiám tsi̍t-ē ka-thiam pī-tsù",
   "column.pins": "Tah thâu-tsîng ê huah-siann",
   "community.column_settings.media_only": "Kan-na muî-thé",
diff --git a/app/javascript/mastodon/locales/te.json b/app/javascript/mastodon/locales/te.json
index 2f58eb9d43a..c4442f74361 100644
--- a/app/javascript/mastodon/locales/te.json
+++ b/app/javascript/mastodon/locales/te.json
@@ -24,7 +24,6 @@
   "account.posts": "టూట్లు",
   "account.posts_with_replies": "టూట్లు మరియు ప్రత్యుత్తరములు",
   "account.report": "@{name}పై ఫిర్యాదుచేయు",
-  "account.requested": "ఆమోదం కోసం వేచి ఉంది. అభ్యర్థనను రద్దు చేయడానికి క్లిక్ చేయండి",
   "account.share": "@{name} యొక్క ప్రొఫైల్ను పంచుకోండి",
   "account.show_reblogs": "@{name}నుంచి బూస్ట్ లను చూపించు",
   "account.unblock": "@{name}పై బ్లాక్ ను తొలగించు",
@@ -75,7 +74,6 @@
   "confirmations.mute.confirm": "మ్యూట్ చేయి",
   "confirmations.redraft.confirm": "తొలగించు & తిరగరాయు",
   "confirmations.unfollow.confirm": "అనుసరించవద్దు",
-  "confirmations.unfollow.message": "{name}ను మీరు ఖచ్చితంగా అనుసరించవద్దనుకుంటున్నారా?",
   "embed.instructions": "దిగువ కోడ్ను కాపీ చేయడం ద్వారా మీ వెబ్సైట్లో ఈ స్టేటస్ ని పొందుపరచండి.",
   "embed.preview": "అది ఈ క్రింది విధంగా కనిపిస్తుంది:",
   "emoji_button.activity": "కార్యకలాపాలు",
@@ -220,7 +218,6 @@
   "status.pin": "ప్రొఫైల్లో అతికించు",
   "status.read_more": "ఇంకా చదవండి",
   "status.reblog": "బూస్ట్",
-  "status.reblog_private": "అసలు ప్రేక్షకులకు బూస్ట్ చేయి",
   "status.reblogged_by": "{name} బూస్ట్ చేసారు",
   "status.reblogs.empty": "ఈ టూట్ను ఇంకా ఎవరూ బూస్ట్ చేయలేదు. ఎవరైనా చేసినప్పుడు, అవి ఇక్కడ కనబడతాయి.",
   "status.redraft": "తొలగించు & తిరగరాయు",
diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json
index a6adca289ac..63df997694b 100644
--- a/app/javascript/mastodon/locales/th.json
+++ b/app/javascript/mastodon/locales/th.json
@@ -1,6 +1,7 @@
 {
   "about.blocks": "เซิร์ฟเวอร์ที่ได้รับการกลั่นกรอง",
   "about.contact": "ติดต่อ:",
+  "about.default_locale": "ค่าเริ่มต้น",
   "about.disclaimer": "Mastodon เป็นซอฟต์แวร์เสรี โอเพนซอร์ส และเครื่องหมายการค้าของ Mastodon gGmbH",
   "about.domain_blocks.no_reason_available": "เหตุผลไม่พร้อมใช้งาน",
   "about.domain_blocks.preamble": "โดยทั่วไป Mastodon อนุญาตให้คุณดูเนื้อหาจากและโต้ตอบกับผู้ใช้จากเซิร์ฟเวอร์อื่นใดในจักรวาลสหพันธ์ นี่คือข้อยกเว้นที่ทำขึ้นในเซิร์ฟเวอร์นี้โดยเฉพาะ",
@@ -8,6 +9,7 @@
   "about.domain_blocks.silenced.title": "จำกัดอยู่",
   "about.domain_blocks.suspended.explanation": "จะไม่ประมวลผล จัดเก็บ หรือแลกเปลี่ยนข้อมูลจากเซิร์ฟเวอร์นี้ ทำให้การโต้ตอบหรือการสื่อสารใด ๆ กับผู้ใช้จากเซิร์ฟเวอร์นี้เป็นไปไม่ได้",
   "about.domain_blocks.suspended.title": "ระงับอยู่",
+  "about.language_label": "ภาษา",
   "about.not_available": "ไม่ได้ทำให้ข้อมูลนี้พร้อมใช้งานในเซิร์ฟเวอร์นี้",
   "about.powered_by": "สื่อสังคมแบบกระจายศูนย์ที่ขับเคลื่อนโดย {mastodon}",
   "about.rules": "กฎของเซิร์ฟเวอร์",
@@ -19,14 +21,18 @@
   "account.block_domain": "ปิดกั้นโดเมน {domain}",
   "account.block_short": "ปิดกั้น",
   "account.blocked": "ปิดกั้นอยู่",
+  "account.blocking": "กำลังปิดกั้น",
   "account.cancel_follow_request": "ยกเลิกการติดตาม",
   "account.copy": "คัดลอกลิงก์ไปยังโปรไฟล์",
   "account.direct": "กล่าวถึง @{name} แบบส่วนตัว",
   "account.disable_notifications": "หยุดแจ้งเตือนฉันเมื่อ @{name} โพสต์",
-  "account.domain_blocking": "โดเมน",
+  "account.domain_blocking": "กำลังปิดกั้นโดเมน",
   "account.edit_profile": "แก้ไขโปรไฟล์",
   "account.enable_notifications": "แจ้งเตือนฉันเมื่อ @{name} โพสต์",
   "account.endorse": "แสดงในโปรไฟล์",
+  "account.featured": "น่าสนใจ",
+  "account.featured.accounts": "โปรไฟล์",
+  "account.featured.hashtags": "แฮชแท็ก",
   "account.featured_tags.last_status_at": "โพสต์ล่าสุดเมื่อ {date}",
   "account.featured_tags.last_status_never": "ไม่มีโพสต์",
   "account.follow": "ติดตาม",
@@ -37,6 +43,7 @@
   "account.following": "กำลังติดตาม",
   "account.following_counter": "{count, plural, other {{counter} กำลังติดตาม}}",
   "account.follows.empty": "ผู้ใช้นี้ยังไม่ได้ติดตามใคร",
+  "account.follows_you": "ติดตามคุณ",
   "account.go_to_profile": "ไปยังโปรไฟล์",
   "account.hide_reblogs": "ซ่อนการดันจาก @{name}",
   "account.in_memoriam": "เพื่อระลึกถึง",
@@ -51,12 +58,12 @@
   "account.mute_notifications_short": "ซ่อนการแจ้งเตือน",
   "account.mute_short": "ซ่อน",
   "account.muted": "ซ่อนอยู่",
+  "account.muting": "กำลังซ่อน",
   "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}",
@@ -218,8 +225,6 @@
   "confirmations.redraft.message": "คุณแน่ใจหรือไม่ว่าต้องการลบโพสต์นี้แล้วร่างโพสต์ใหม่? รายการโปรดและการดันจะสูญหาย และการตอบกลับโพสต์ดั้งเดิมจะไม่มีความเกี่ยวพัน",
   "confirmations.redraft.title": "ลบแล้วร่างโพสต์ใหม่?",
   "confirmations.unfollow.confirm": "เลิกติดตาม",
-  "confirmations.unfollow.message": "คุณแน่ใจหรือไม่ว่าต้องการเลิกติดตาม {name}?",
-  "confirmations.unfollow.title": "เลิกติดตามผู้ใช้?",
   "content_warning.hide": "ซ่อนโพสต์",
   "content_warning.show": "แสดงต่อไป",
   "content_warning.show_more": "แสดงเพิ่มเติม",
@@ -305,9 +310,14 @@
   "errors.unexpected_crash.copy_stacktrace": "คัดลอกการติดตามสแตกไปยังคลิปบอร์ด",
   "errors.unexpected_crash.report_issue": "รายงานปัญหา",
   "explore.suggested_follows": "ผู้คน",
+  "explore.title": "กำลังนิยม",
   "explore.trending_links": "ข่าว",
   "explore.trending_statuses": "โพสต์",
   "explore.trending_tags": "แฮชแท็ก",
+  "featured_carousel.next": "ถัดไป",
+  "featured_carousel.post": "โพสต์",
+  "featured_carousel.previous": "ก่อนหน้า",
+  "featured_carousel.slide": "{index} จาก {total}",
   "filter_modal.added.context_mismatch_explanation": "หมวดหมู่ตัวกรองนี้ไม่นำไปใช้กับบริบทที่คุณได้เข้าถึงโพสต์นี้ หากคุณต้องการกรองโพสต์ในบริบทนี้ด้วย คุณจะต้องแก้ไขตัวกรอง",
   "filter_modal.added.context_mismatch_title": "บริบทไม่ตรงกัน!",
   "filter_modal.added.expired_explanation": "หมวดหมู่ตัวกรองนี้หมดอายุแล้ว คุณจะต้องเปลี่ยนวันหมดอายุสำหรับหมวดหมู่เพื่อนำไปใช้",
@@ -372,7 +382,10 @@
   "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.feature": "แสดงในโปรไฟล์",
   "hashtag.follow": "ติดตามแฮชแท็ก",
+  "hashtag.mute": "ซ่อน #{hashtag}",
+  "hashtag.unfeature": "ไม่แสดงในโปรไฟล์",
   "hashtag.unfollow": "เลิกติดตามแฮชแท็ก",
   "hashtags.and_other": "…และอีก {count, plural, other {# เพิ่มเติม}}",
   "hints.profiles.followers_may_be_missing": "ผู้ติดตามสำหรับโปรไฟล์นี้อาจขาดหายไป",
@@ -381,8 +394,6 @@
   "hints.profiles.see_more_followers": "ดูผู้ติดตามเพิ่มเติมใน {domain}",
   "hints.profiles.see_more_follows": "ดูการติดตามเพิ่มเติมใน {domain}",
   "hints.profiles.see_more_posts": "ดูโพสต์เพิ่มเติมใน {domain}",
-  "hints.threads.replies_may_be_missing": "การตอบกลับจากเซิร์ฟเวอร์อื่น ๆ อาจขาดหายไป",
-  "hints.threads.see_more": "ดูการตอบกลับเพิ่มเติมใน {domain}",
   "home.column_settings.show_reblogs": "แสดงการดัน",
   "home.column_settings.show_replies": "แสดงการตอบกลับ",
   "home.hide_announcements": "ซ่อนประกาศ",
@@ -402,20 +413,11 @@
   "ignore_notifications_modal.not_following_title": "เพิกเฉยการแจ้งเตือนจากผู้คนที่คุณไม่ได้ติดตาม?",
   "ignore_notifications_modal.private_mentions_title": "เพิกเฉยการแจ้งเตือนจากการกล่าวถึงแบบส่วนตัวที่ไม่พึงประสงค์?",
   "info_button.label": "ช่วยเหลือ",
-  "interaction_modal.action.favourite": "เพื่อดำเนินการต่อ คุณจำเป็นต้องชื่นชอบจากบัญชีของคุณ",
-  "interaction_modal.action.follow": "เพื่อดำเนินการต่อ คุณจำเป็นต้องติดตามจากบัญชีของคุณ",
-  "interaction_modal.action.reblog": "เพื่อดำเนินการต่อ คุณจำเป็นต้องดันจากบัญชีของคุณ",
-  "interaction_modal.action.reply": "เพื่อดำเนินการต่อ คุณจำเป็นต้องตอบกลับจากบัญชีของคุณ",
-  "interaction_modal.action.vote": "เพื่อดำเนินการต่อ คุณจำเป็นต้องลงคะแนนจากบัญชีของคุณ",
   "interaction_modal.go": "ไป",
   "interaction_modal.no_account_yet": "ยังไม่มีบัญชี?",
   "interaction_modal.on_another_server": "ในเซิร์ฟเวอร์อื่น",
   "interaction_modal.on_this_server": "ในเซิร์ฟเวอร์นี้",
-  "interaction_modal.title.favourite": "ชื่นชอบโพสต์ของ {name}",
-  "interaction_modal.title.follow": "ติดตาม {name}",
-  "interaction_modal.title.reblog": "ดันโพสต์ของ {name}",
-  "interaction_modal.title.reply": "ตอบกลับโพสต์ของ {name}",
-  "interaction_modal.title.vote": "ลงคะแนนในการสำรวจความคิดเห็นของ {name}",
+  "interaction_modal.title": "ลงชื่อเข้า",
   "interaction_modal.username_prompt": "เช่น {example}",
   "intervals.full.days": "{number, plural, other {# วัน}}",
   "intervals.full.hours": "{number, plural, other {# ชั่วโมง}}",
@@ -504,8 +506,10 @@
   "mute_modal.you_wont_see_mentions": "คุณจะไม่เห็นโพสต์ที่กล่าวถึงเขา",
   "mute_modal.you_wont_see_posts": "เขายังคงสามารถเห็นโพสต์ของคุณ แต่คุณจะไม่เห็นโพสต์ของเขา",
   "navigation_bar.about": "เกี่ยวกับ",
+  "navigation_bar.account_settings": "รหัสผ่านและความปลอดภัย",
   "navigation_bar.administration": "การดูแล",
   "navigation_bar.advanced_interface": "เปิดในส่วนติดต่อเว็บขั้นสูง",
+  "navigation_bar.automated_deletion": "การลบโพสต์แบบอัตโนมัติ",
   "navigation_bar.blocks": "ผู้ใช้ที่ปิดกั้นอยู่",
   "navigation_bar.bookmarks": "ที่คั่นหน้า",
   "navigation_bar.direct": "การกล่าวถึงแบบส่วนตัว",
@@ -515,12 +519,15 @@
   "navigation_bar.follow_requests": "คำขอติดตาม",
   "navigation_bar.followed_tags": "แฮชแท็กที่ติดตาม",
   "navigation_bar.follows_and_followers": "การติดตามและผู้ติดตาม",
+  "navigation_bar.import_export": "การนำเข้าและการส่งออก",
   "navigation_bar.lists": "รายการ",
   "navigation_bar.logout": "ออกจากระบบ",
   "navigation_bar.moderation": "การกลั่นกรอง",
+  "navigation_bar.more": "เพิ่มเติม",
   "navigation_bar.mutes": "ผู้ใช้ที่ซ่อนอยู่",
   "navigation_bar.opened_in_classic_interface": "จะเปิดโพสต์, บัญชี และหน้าที่เฉพาะเจาะจงอื่น ๆ เป็นค่าเริ่มต้นในส่วนติดต่อเว็บแบบคลาสสิก",
   "navigation_bar.preferences": "การกำหนดลักษณะ",
+  "navigation_bar.privacy_and_reach": "ความเป็นส่วนตัวและการเข้าถึง",
   "navigation_bar.search": "ค้นหา",
   "not_signed_in_indicator.not_signed_in": "คุณจำเป็นต้องเข้าสู่ระบบเพื่อเข้าถึงทรัพยากรนี้",
   "notification.admin.report": "{name} ได้รายงาน {target}",
@@ -675,7 +682,6 @@
   "privacy.public.long": "ใครก็ตามที่อยู่ในและนอก Mastodon",
   "privacy.public.short": "สาธารณะ",
   "privacy.unlisted.additional": "สิ่งนี้ทำงานเหมือนกับสาธารณะทุกประการ ยกเว้นโพสต์จะไม่ปรากฏในฟีดสดหรือแฮชแท็ก, การสำรวจ หรือการค้นหา Mastodon แม้ว่าคุณได้เลือกรับทั่วทั้งบัญชีก็ตาม",
-  "privacy.unlisted.long": "การประโคมอัลกอริทึมที่น้อยลง",
   "privacy.unlisted.short": "สาธารณะแบบเงียบ",
   "privacy_policy.last_updated": "อัปเดตล่าสุดเมื่อ {date}",
   "privacy_policy.title": "นโยบายความเป็นส่วนตัว",
@@ -747,6 +753,7 @@
   "report_notification.categories.violation": "การละเมิดกฎ",
   "report_notification.categories.violation_sentence": "การละเมิดกฎ",
   "report_notification.open": "รายงานที่เปิด",
+  "search.clear": "ล้างการค้นหา",
   "search.no_recent_searches": "ไม่มีการค้นหาล่าสุด",
   "search.placeholder": "ค้นหา",
   "search.quick_action.account_search": "โปรไฟล์ที่ตรงกับ {x}",
@@ -814,7 +821,6 @@
   "status.pin": "ปักหมุดในโปรไฟล์",
   "status.read_more": "อ่านเพิ่มเติม",
   "status.reblog": "ดัน",
-  "status.reblog_private": "ดันด้วยการมองเห็นดั้งเดิม",
   "status.reblogged_by": "{name} ได้ดัน",
   "status.reblogs": "{count, plural, other {การดัน}}",
   "status.reblogs.empty": "ยังไม่มีใครดันโพสต์นี้ เมื่อใครสักคนดัน เขาจะปรากฏที่นี่",
@@ -841,7 +847,10 @@
   "subscribed_languages.save": "บันทึกการเปลี่ยนแปลง",
   "subscribed_languages.target": "เปลี่ยนภาษาที่บอกรับสำหรับ {target}",
   "tabs_bar.home": "หน้าแรก",
+  "tabs_bar.menu": "เมนู",
   "tabs_bar.notifications": "การแจ้งเตือน",
+  "tabs_bar.publish": "โพสต์ใหม่",
+  "tabs_bar.search": "ค้นหา",
   "terms_of_service.title": "เงื่อนไขการให้บริการ",
   "time_remaining.days": "เหลืออีก {number, plural, other {# วัน}}",
   "time_remaining.hours": "เหลืออีก {number, plural, other {# ชั่วโมง}}",
diff --git a/app/javascript/mastodon/locales/tok.json b/app/javascript/mastodon/locales/tok.json
index 168c3d8e311..d21058a67b0 100644
--- a/app/javascript/mastodon/locales/tok.json
+++ b/app/javascript/mastodon/locales/tok.json
@@ -70,7 +70,6 @@
   "account.posts_with_replies": "toki ale",
   "account.remove_from_followers": "sijelo kute la o weka e sijelo \"{name}\".",
   "account.report": "jan @{name} la o toki e ike tawa lawa",
-  "account.requested": "jan ni o ken e kute sina",
   "account.requested_follow": "jan {name} li wile kute e sina",
   "account.requests_to_follow_you": "jan ni li wile kute e sina",
   "account.share": "o pana e lipu jan @{name}",
@@ -218,6 +217,13 @@
   "confirmations.delete_list.confirm": "o weka",
   "confirmations.delete_list.message": "sina wile ala wile weka e lipu ni?",
   "confirmations.delete_list.title": "o weka ala weka e kulupu lipu?",
+  "confirmations.discard_draft.confirm": "o weka e toki ni",
+  "confirmations.discard_draft.edit.cancel": "o awen o ante",
+  "confirmations.discard_draft.edit.message": "sina awen e ni la ona li weka e ante sina pi tenpo ni lon toki ni.",
+  "confirmations.discard_draft.edit.title": "sina wile ala wile weka e ante toki?",
+  "confirmations.discard_draft.post.cancel": "awen la o sitelen",
+  "confirmations.discard_draft.post.message": "sina awen e ni la ona li weka e toki ni.",
+  "confirmations.discard_draft.post.title": "sina wile ala wile weka e toki ni?",
   "confirmations.discard_edit_media.confirm": "o weka",
   "confirmations.discard_edit_media.message": "toki sitelen anu lukin lili sitelen la ante pi awen ala li lon. sina wile weka e ante ni?",
   "confirmations.follow_to_list.confirm": "o kute, o pana tawa lipu jan",
@@ -231,15 +237,16 @@
   "confirmations.missing_alt_text.secondary": "o pana a",
   "confirmations.missing_alt_text.title": "o pana ala pana e toki pi sona lukin?",
   "confirmations.mute.confirm": "o len",
+  "confirmations.quiet_post_quote_info.got_it": "sona",
   "confirmations.redraft.confirm": "o weka o pali sin e toki",
   "confirmations.redraft.message": "pali sin e toki ni la sina wile ala wile weka e ona? sina ni la suli pi toki ni en wawa pi toki ni li weka. kin la toki lon toki ni li jo e mama ala.",
   "confirmations.redraft.title": "ni li weka li pali sin e toki ni.",
   "confirmations.remove_from_followers.confirm": "o kama kute ala e jan",
   "confirmations.remove_from_followers.message": "{name} li kama kute ala e sina. sina wile ala wile e ni?",
   "confirmations.remove_from_followers.title": "o kama ala kama kute ala e jan?",
+  "confirmations.revoke_quote.confirm": "o weka e toki tan lipu Mastodon",
+  "confirmations.revoke_quote.title": "sina wile weka ala weka e toki?",
   "confirmations.unfollow.confirm": "o kute ala",
-  "confirmations.unfollow.message": "sina o wile ala wile pini kute e jan {name}?",
-  "confirmations.unfollow.title": "sina wile ala wile pini kute?",
   "content_warning.hide": "o len",
   "content_warning.show": "o lukin a",
   "content_warning.show_more": "o lukin",
@@ -371,8 +378,6 @@
   "hints.profiles.see_more_followers": "o lukin e jan ni lon ma {domain}: ona li kute e jan ni.",
   "hints.profiles.see_more_follows": "o lukin e jan ni lon ma {domain}: jan ni li kute e ona.",
   "hints.profiles.see_more_posts": "o lukin e toki ante lon ma {domain}",
-  "hints.threads.replies_may_be_missing": "toki pi ma ante li weka lon ken.",
-  "hints.threads.see_more": "o lukin e toki ante lon ma {domain}",
   "home.column_settings.show_reblogs": "o lukin e pana toki",
   "home.hide_announcements": "o lukin ala e toki lawa suli",
   "home.pending_critical_update.body": "o sin e ilo Mastodon lon tenpo lili a!",
@@ -382,20 +387,10 @@
   "ignore_notifications_modal.ignore": " o kute ala e mu",
   "info_button.label": "sona",
   "info_button.what_is_alt_text": "<h1>toki pi sona lukin li seme?</h1> <p>toki ni li pana e sona tan sitelen lukin tawa jan mute ni: ona li ken ala lukin. ona li wile e sona namako.</p>  <p>sina ken pana e sona pona kepeken nasin ni:</p> <ul> <li>o toki pona.</li> <li>o toki e ijo suli lon sitelen.</li> <li>o toki lili e nimi lon sitelen.</li> <li>o toki suli ala e ijo lili.</li> </ul>",
-  "interaction_modal.action.favourite": "sina wile pana e pona tawa jan ni la, o kama lon sijelo sina.",
-  "interaction_modal.action.follow": "sina wile kute e jan ni la, o kama lon sijelo sina.",
-  "interaction_modal.action.reblog": "sina wile pana sin e toki ni la, o kama lon sijelo sina.",
-  "interaction_modal.action.reply": "sina wile toki tawa lipu ni la, o kama lon sijelo sina.",
-  "interaction_modal.action.vote": "sina wile pana e wile tawa lipu ni la, o kama lon sijelo sina.",
   "interaction_modal.go": "o tawa",
   "interaction_modal.no_account_yet": "sina jo ala e sijelo anu seme?",
   "interaction_modal.on_another_server": "lon ma ante",
   "interaction_modal.on_this_server": "lon ma ni",
-  "interaction_modal.title.favourite": "o pona tawa {name}",
-  "interaction_modal.title.follow": "o kute e {name}",
-  "interaction_modal.title.reblog": "o pana sin e toki tan {name}",
-  "interaction_modal.title.reply": "o toki lon lipu tawa {name}",
-  "interaction_modal.title.vote": "o pana e sona wile tawa {name}",
   "interaction_modal.username_prompt": "ni li sama ni: {example}",
   "intervals.full.days": "ni li pini lon {number, plural, other {tenpo suno #}}",
   "intervals.full.hours": "ni li pini lon {number, plural, other {tenpo ilo #}}",
@@ -418,6 +413,7 @@
   "keyboard_shortcuts.toot": "o toki sin",
   "keyboard_shortcuts.translate": "o ante e toki lipu",
   "keyboard_shortcuts.up": "o tawa sewi lon lipu",
+  "learn_more_link.got_it": "sona",
   "lightbox.close": "o pini",
   "lightbox.next": "sinpin",
   "lightbox.previous": "monsi",
@@ -458,6 +454,8 @@
   "navigation_bar.favourites": "ijo pona",
   "navigation_bar.filters": "nimi len",
   "navigation_bar.lists": "kulupu lipu",
+  "navigation_bar.logout": "o weka tan sijelo",
+  "navigation_bar.moderation": "nasin lawa",
   "navigation_bar.mutes": "sina wile ala kute e jan ni",
   "navigation_bar.preferences": "wile sina",
   "navigation_bar.search": "o alasa",
@@ -508,6 +506,7 @@
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "tenpo suno ni",
+  "remove_quote_hint.button_label": "sona",
   "reply_indicator.attachments": "{count, plural, other {sitelen #}}",
   "reply_indicator.cancel": "o pana ala",
   "report.block": "o len e jan",
diff --git a/app/javascript/mastodon/locales/tr.json b/app/javascript/mastodon/locales/tr.json
index a45acff11f5..6301c8b7dab 100644
--- a/app/javascript/mastodon/locales/tr.json
+++ b/app/javascript/mastodon/locales/tr.json
@@ -28,6 +28,7 @@
   "account.disable_notifications": "@{name} kişisinin gönderi bildirimlerini kapat",
   "account.domain_blocking": "Alan adını engelleme",
   "account.edit_profile": "Profili düzenle",
+  "account.edit_profile_short": "Düzenle",
   "account.enable_notifications": "@{name} kişisinin gönderi bildirimlerini aç",
   "account.endorse": "Profilimde öne çıkar",
   "account.familiar_followers_many": "{name1}, {name2}, {othersCount, plural, one {# diğer} other {# diğer}} bildiğiniz kişi tarafından takip ediliyor",
@@ -40,6 +41,11 @@
   "account.featured_tags.last_status_never": "Gönderi yok",
   "account.follow": "Takip et",
   "account.follow_back": "Geri takip et",
+  "account.follow_back_short": "Geri takip et",
+  "account.follow_request": "Takip isteği gönder",
+  "account.follow_request_cancel": "İsteği iptal et",
+  "account.follow_request_cancel_short": "İptal",
+  "account.follow_request_short": "İstek",
   "account.followers": "Takipçi",
   "account.followers.empty": "Henüz kimse bu kullanıcıyı takip etmiyor.",
   "account.followers_counter": "{count, plural, one {{counter} takipçi} other {{counter} takipçi}}",
@@ -70,7 +76,6 @@
   "account.posts_with_replies": "Gönderiler ve yanıtlar",
   "account.remove_from_followers": "{name} takipçilerinden kaldır",
   "account.report": "@{name} adlı kişiyi bildir",
-  "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.requests_to_follow_you": "Size takip isteği gönderdi",
   "account.share": "@{name} adlı kişinin profilini paylaş",
@@ -239,15 +244,25 @@
   "confirmations.missing_alt_text.secondary": "Yine de gönder",
   "confirmations.missing_alt_text.title": "Alternatif metin ekle?",
   "confirmations.mute.confirm": "Sessize al",
+  "confirmations.quiet_post_quote_info.dismiss": "Bana bir daha hatırlatma",
+  "confirmations.quiet_post_quote_info.got_it": "Anladım",
+  "confirmations.quiet_post_quote_info.message": "Sessiz bir genel gönderiyi alıntıladığınızda, gönderiniz öne çıkan zaman çizelgelerinden gizlenir.",
+  "confirmations.quiet_post_quote_info.title": "Herkese açık sessiz gönderileri alıntılamak",
   "confirmations.redraft.confirm": "Sil Düzenle ve yeniden paylaş",
   "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.redraft.title": "Gönderiyi sil veya taslağa dönüştür?",
   "confirmations.remove_from_followers.confirm": "Takipçi kaldır",
   "confirmations.remove_from_followers.message": "{name} sizi takip etmeyi bırakacaktır. Devam etmek istediğinize emin misiniz?",
   "confirmations.remove_from_followers.title": "Takipçiyi kaldır?",
+  "confirmations.revoke_quote.confirm": "Gönderiyi kaldır",
+  "confirmations.revoke_quote.message": "Bu işlem geri alınamaz.",
+  "confirmations.revoke_quote.title": "Gönderiyi silmek ister misiniz?",
+  "confirmations.unblock.confirm": "Engeli kaldır",
+  "confirmations.unblock.title": "{name} için engel kaldırılsın mı?",
   "confirmations.unfollow.confirm": "Takibi bırak",
-  "confirmations.unfollow.message": "{name} adlı kullanıcıyı takibi bırakmak istediğinden emin misin?",
-  "confirmations.unfollow.title": "Kullanıcıyı takipten çık?",
+  "confirmations.unfollow.title": "{name} takipten çıkılsın mı?",
+  "confirmations.withdraw_request.confirm": "İsteği geri çek",
+  "confirmations.withdraw_request.title": "{name} takip isteği geri çekilsin mi?",
   "content_warning.hide": "Gönderiyi gizle",
   "content_warning.show": "Yine de göster",
   "content_warning.show_more": "Daha fazla göster",
@@ -289,6 +304,7 @@
   "domain_pill.your_handle": "Tanıtıcınız:",
   "domain_pill.your_server": "Dijital anasayfanız, tüm gönderilerinizin yaşadığı yerdir. Bunu beğenmediniz mi? İstediğiniz zaman sunucularınızı değiştirin ve takipçilerinizi de getirin.",
   "domain_pill.your_username": "Bu sunucudaki tekil tanımlayıcınız. Farklı sunucularda aynı kullanıcı adına sahip kullanıcıları bulmak mümkündür.",
+  "dropdown.empty": "Bir seçenek seçin",
   "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",
@@ -424,8 +440,6 @@
   "hints.profiles.see_more_followers": "{domain} adresinde daha fazla takipçi gör",
   "hints.profiles.see_more_follows": "{domain} adresinde daha fazla takip edilen gör",
   "hints.profiles.see_more_posts": "{domain} adresinde daha fazla gönderi gör",
-  "hints.threads.replies_may_be_missing": "Diğer sunuculardan yanıtlar eksik olabilir.",
-  "hints.threads.see_more": "{domain} adresinde daha fazla yanıt gör",
   "home.column_settings.show_quotes": "Alıntıları göster",
   "home.column_settings.show_reblogs": "Yeniden paylaşımları göster",
   "home.column_settings.show_replies": "Yanıtları göster",
@@ -447,20 +461,12 @@
   "ignore_notifications_modal.private_mentions_title": "İstenmeyen özel bahsetmelerden gelen bildirimleri yoksay?",
   "info_button.label": "Yardım",
   "info_button.what_is_alt_text": "<h1>Alternatif metin nedir?</h1><p>Alternatif metin, görme bozukluğu olan, düşük bant genişliğine sahip bağlantıları olan veya ekstra bağlam arayan kişiler için görsel açıklamaları sağlar.</p><p>Net, sade ve nesnel alternatif metin yazarak herkes için erişilebilirliği ve anlaşılabilirliği iyileştirebilirsiniz.</p><ul><li>Önemlileri yakalayın</li><li>Resimlerdeki metni özetleyin</li><li>Düzenli cümle yapısı kullanın</li><li>Gereksiz bilgilerden kaçının</li><li>Karmaşık görsellerde (şemalar veya haritalar gibi) trendlere ve temel bulgulara odaklanın</li></ul>",
-  "interaction_modal.action.favourite": "Devam etmek için, hesabınızı kullanarak beğenmelisiniz.",
-  "interaction_modal.action.follow": "Devam etmek için, hesabınızı kullanarak takip etmelisiniz.",
-  "interaction_modal.action.reblog": "Devam etmek için, hesabınızı kullanarak tekrar göndermelisiniz.",
-  "interaction_modal.action.reply": "Devam etmek için, hesabınızı kullanarak yanıt vermelisiniz.",
-  "interaction_modal.action.vote": "Devam etmek için, hesabınızı kullanarak oylamalısınız.",
+  "interaction_modal.action": "{name}'nin gönderisiyle etkileşim kurmak için, kullandığınız Mastodon sunucusunda hesabınıza giriş yapmanız gerekir.",
   "interaction_modal.go": "Git",
   "interaction_modal.no_account_yet": "Henüz bir hesabınız yok mu?",
   "interaction_modal.on_another_server": "Farklı bir sunucuda",
   "interaction_modal.on_this_server": "Bu sunucuda",
-  "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 yeniden paylaş",
-  "interaction_modal.title.reply": "{name} kişisinin gönderisine yanıt ver",
-  "interaction_modal.title.vote": "{name} kullanıcısının anketinde oy kullan",
+  "interaction_modal.title": "Devam etmek için oturum açın",
   "interaction_modal.username_prompt": "Örnek: {example}",
   "intervals.full.days": "{number, plural, one {# gün} other {# gün}}",
   "intervals.full.hours": "{number, plural, one {# saat} other {# saat}}",
@@ -481,6 +487,7 @@
   "keyboard_shortcuts.home": "Ana akışı aç",
   "keyboard_shortcuts.hotkey": "Kısayol tuşu",
   "keyboard_shortcuts.legend": "Bu efsaneyi görüntülemek için",
+  "keyboard_shortcuts.load_more": "\"Daha fazlası\" düğmesine odaklan",
   "keyboard_shortcuts.local": "Yerel akışı aç",
   "keyboard_shortcuts.mention": "Yazana değinmek için",
   "keyboard_shortcuts.muted": "Sessize alınmış kullanıcı listesini açmak için",
@@ -489,6 +496,7 @@
   "keyboard_shortcuts.open_media": "Medyayı açmak için",
   "keyboard_shortcuts.pinned": "Sabitlenmiş gönderilerin listesini aç",
   "keyboard_shortcuts.profile": "Yazanın profilini açmak için",
+  "keyboard_shortcuts.quote": "Gönderiyi alıntıla",
   "keyboard_shortcuts.reply": "gönderiyi yanıtla",
   "keyboard_shortcuts.requests": "Takip istekleri listesini açmak için",
   "keyboard_shortcuts.search": "Aramaya odaklanmak için",
@@ -500,6 +508,8 @@
   "keyboard_shortcuts.translate": "bir gönderiyi çevirmek için",
   "keyboard_shortcuts.unfocus": "Aramada bir gönderiye odaklanmamak için",
   "keyboard_shortcuts.up": "Listede yukarıya çıkmak için",
+  "learn_more_link.got_it": "Anladım",
+  "learn_more_link.learn_more": "Daha fazla bilgi edin",
   "lightbox.close": "Kapat",
   "lightbox.next": "Sonraki",
   "lightbox.previous": "Önceki",
@@ -600,6 +610,7 @@
   "notification.label.mention": "Bahsetme",
   "notification.label.private_mention": "Özel bahsetme",
   "notification.label.private_reply": "Özel yanıt",
+  "notification.label.quote": "{name} gönderini yeniden paylaştı",
   "notification.label.reply": "Yanıt",
   "notification.mention": "Bahsetme",
   "notification.mentioned_you": "{name} sizden söz etti",
@@ -614,6 +625,7 @@
   "notification.moderation_warning.action_suspend": "Hesabınız askıya alındı.",
   "notification.own_poll": "Anketiniz sona erdi",
   "notification.poll": "Oy verdiğiniz bir anket sona erdi",
+  "notification.quoted_update": "{name} alıntıladığınız bir gönderiyi düzenledi",
   "notification.reblog": "{name} gönderini yeniden paylaştı",
   "notification.reblog.name_and_others_with_link": "{name} ve <a>{count, plural, one {# diğer kişi} other {# diğer kişi}}</a> gönderinizi yeniden paylaştı",
   "notification.relationships_severance_event": "{name} ile bağlantılar koptu",
@@ -657,6 +669,7 @@
   "notifications.column_settings.mention": "Bahsetmeler:",
   "notifications.column_settings.poll": "Anket sonuçları:",
   "notifications.column_settings.push": "Anlık bildirimler",
+  "notifications.column_settings.quote": "Alıntılar:",
   "notifications.column_settings.reblog": "Yeniden paylaşanlar:",
   "notifications.column_settings.show": "Sütunda göster",
   "notifications.column_settings.sound": "Ses çal",
@@ -732,11 +745,18 @@
   "privacy.private.short": "Takipçiler",
   "privacy.public.long": "Mastodon'da olan olmayan herkes",
   "privacy.public.short": "Herkese açık",
+  "privacy.quote.anyone": "{visibility}, herkes alıntılayabilir",
+  "privacy.quote.disabled": "{visibility}, alıntı yapılamaz",
+  "privacy.quote.limited": "{visibility}, sınırlı alıntı",
   "privacy.unlisted.additional": "Bu neredeyse herkese açık gibi çalışır, tek farkı gönderi canlı akışlarda veya etiketlerde, keşfette, veya Mastodon aramasında gözükmez, hesap çapında öyle seçmiş olsanız bile.",
-  "privacy.unlisted.long": "Daha az algoritmik tantana",
+  "privacy.unlisted.long": "Mastodon arama sonuçlarında, öne çıkanlarda ve herkese açık zaman çizelgesinde gizli",
   "privacy.unlisted.short": "Sessizce herkese açık",
   "privacy_policy.last_updated": "Son güncelleme {date}",
   "privacy_policy.title": "Gizlilik Politikası",
+  "quote_error.poll": "Anketlerde alıntıya izin verilmez.",
+  "quote_error.quote": "Bir seferde tek bir alıntıya izin var.",
+  "quote_error.unauthorized": "Bu gönderiyi alıntılamaya yetkiniz yok.",
+  "quote_error.upload": "Medya eklentilerini alıntılamaya izin yok.",
   "recommended": "Önerilen",
   "refresh": "Yenile",
   "regeneration_indicator.please_stand_by": "Lütfen bekleyin.",
@@ -752,6 +772,9 @@
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}sn",
   "relative_time.today": "bugün",
+  "remove_quote_hint.button_label": "Anladım",
+  "remove_quote_hint.message": "Bunu {icon} seçenekler menüsünden yapabilirsiniz.",
+  "remove_quote_hint.title": "Alıntılanmış gönderinizi kaldırmak mı istiyorsunuz?",
   "reply_indicator.attachments": "{count, plural, one {# ek} other {# ek}}",
   "reply_indicator.cancel": "İptal",
   "reply_indicator.poll": "Anket",
@@ -843,13 +866,23 @@
   "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.all_disabled": "Yükseltmeler ve alıntılar devre dışı bırakıldı",
   "status.block": "@{name} adlı kişiyi engelle",
   "status.bookmark": "Yer işareti ekle",
   "status.cancel_reblog_private": "Yeniden paylaşımı geri al",
+  "status.cannot_quote": "Bu gönderiyi alıntılamaya izniniz yok",
   "status.cannot_reblog": "Bu gönderi yeniden paylaşılamaz",
+  "status.contains_quote": "Alıntı içeriyor",
+  "status.context.loading": "Daha fazla yanıt yükleniyor",
+  "status.context.loading_error": "Yeni yanıtlar yüklenemiyor",
+  "status.context.loading_success": "Tüm yanıtlar yüklendi",
+  "status.context.more_replies_found": "Daha fazla yanıt bulundu",
+  "status.context.retry": "Yeniden dene",
+  "status.context.show": "Göster",
   "status.continued_thread": "Devam eden akış",
   "status.copy": "Gönderi bağlantısını kopyala",
   "status.delete": "Sil",
+  "status.delete.success": "Gönderi silindi",
   "status.detailed_status": "Ayrıntılı sohbet görünümü",
   "status.direct": "@{name} kullanıcısına özelden değin",
   "status.direct_indicator": "Özel değinme",
@@ -872,27 +905,43 @@
   "status.mute_conversation": "Sohbeti sessize al",
   "status.open": "Bu gönderiyi genişlet",
   "status.pin": "Profile sabitle",
+  "status.quote": "Teklif",
+  "status.quote.cancel": "Teklifi iptal et",
   "status.quote_error.filtered": "Bazı filtrelerinizden dolayı gizlenmiştir",
-  "status.quote_error.not_found": "Bu gönderi görüntülenemez.",
-  "status.quote_error.pending_approval": "Bu gönderi özgün yazarın onayını bekliyor.",
-  "status.quote_error.rejected": "Bu gönderi, özgün yazar alıntılanmasına izin vermediği için görüntülenemez.",
-  "status.quote_error.removed": "Bu gönderi yazarı tarafından kaldırıldı.",
-  "status.quote_error.unauthorized": "Bu gönderiyi, yetkiniz olmadığı için görüntüleyemiyorsunuz.",
-  "status.quote_post_author": "{name} gönderisi",
+  "status.quote_error.limited_account_hint.action": "Yine de göster",
+  "status.quote_error.limited_account_hint.title": "Bu hesap {domain} moderatörleri tarafından gizlendi.",
+  "status.quote_error.not_available": "Gönderi kullanılamıyor",
+  "status.quote_error.pending_approval": "Gönderi beklemede",
+  "status.quote_error.pending_approval_popout.body": "Mastodon'da, birinin sizi alıntılayıp alıntılayamayacağını kontrol edebilirsiniz. Bu gönderi, orijinal yazarın onayını alma sürecinde beklemede.",
+  "status.quote_error.revoked": "Gönderi yazarı tarafından kaldırıldı",
+  "status.quote_followers_only": "Sadece takipçiler bu gönderiyi alıntılayabilir",
+  "status.quote_manual_review": "Yazar manuel olarak gözden geçirecek",
+  "status.quote_noun": "Alıntı",
+  "status.quote_policy_change": "Kimin alıntı yapabileceğini değiştirin",
+  "status.quote_post_author": "@{name} adlı kullanıcının bir gönderisini alıntıladı",
+  "status.quote_private": "Özel gönderiler alıntılanamaz",
+  "status.quotes": "{count, plural, one {# alıntı} other {# alıntı}}",
+  "status.quotes.empty": "Henüz hiç kimse bu gönderiyi alıntılamadı. Herhangi bir kullanıcı alıntıladığında burada görüntülenecek.",
+  "status.quotes.local_other_disclaimer": "Yazar tarafından reddedilen alıntılar gösterilmez.",
+  "status.quotes.remote_other_disclaimer": "Yalnızca {domain} adresinden gelen alıntılar burada gösterilir. Yazar tarafından reddedilen alıntılar gösterilmez.",
   "status.read_more": "Devamını okuyun",
   "status.reblog": "Yeniden paylaş",
-  "status.reblog_private": "Özgün görünürlük ile yeniden paylaş",
+  "status.reblog_or_quote": "Yükselt veya alıntıla",
+  "status.reblog_private": "Takipçilerinizle tekrar paylaşın",
   "status.reblogged_by": "{name} yeniden paylaştı",
   "status.reblogs": "{count, plural, one {yeniden paylaşım} other {yeniden paylaşım}}",
   "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.remove_favourite": "Favorilerden kaldır",
+  "status.remove_quote": "Kaldır",
   "status.replied_in_thread": "Akışta yanıtlandı",
   "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",
+  "status.request_quote": "Alıntılamayı iste",
+  "status.revoke_quote": "@{name}'nin gönderisinden benim gönderimi kaldır",
   "status.sensitive_warning": "Hassas içerik",
   "status.share": "Paylaş",
   "status.show_less_all": "Hepsi için daha az göster",
@@ -930,6 +979,7 @@
   "upload_button.label": "Resim, video veya ses dosyası ekleyin",
   "upload_error.limit": "Dosya yükleme sınırı aşıldı.",
   "upload_error.poll": "Anketlerde dosya yüklemesine izin verilmez.",
+  "upload_error.quote": "Anketlerde dosya yüklemesine izin verilmez.",
   "upload_form.drag_and_drop.instructions": "Bir medya eklentisini taşımak için, boşluk veya enter tuşuna basın. Sürükleme sırasında medya eklentisini herhangi bir yöne hareket ettirmek için ok tuşlarını kullanın. Medya eklentisini yeni konumuna bırakmak için tekrar boşluk veya enter tuşuna basın veya işlemi iptal etmek için escape tuşuna basın.",
   "upload_form.drag_and_drop.on_drag_cancel": "Sürükleme iptal edildi. Medya eklentisi {item} bırakıldı.",
   "upload_form.drag_and_drop.on_drag_end": "Medya eklentisi {item} bırakıldı.",
@@ -952,5 +1002,19 @@
   "video.skip_forward": "İleriye atla",
   "video.unmute": "Sesi aç",
   "video.volume_down": "Sesi kıs",
-  "video.volume_up": "Sesi yükselt"
+  "video.volume_up": "Sesi yükselt",
+  "visibility_modal.button_title": "Görünürlüğü ayarla",
+  "visibility_modal.header": "Görünürlük ve etkileşim",
+  "visibility_modal.helper.direct_quoting": "Mastodon'da özel değiniler başkaları tarafından alıntılanamaz.",
+  "visibility_modal.helper.privacy_editing": "Gönderi yayınlandıktan sonra görünürlük değiştirilemez.",
+  "visibility_modal.helper.privacy_private_self_quote": "Özel gönderilerin kendi alıntıları herkese açık hale getirilemez.",
+  "visibility_modal.helper.private_quoting": "Mastodon'da sadece takipçilere yönelik gönderiler başkaları tarafından alıntılanamaz.",
+  "visibility_modal.helper.unlisted_quoting": "İnsanlar sizden alıntı yaptığında, onların gönderileri de trend zaman tünellerinden gizlenecektir.",
+  "visibility_modal.instructions": "Bu gönderiyle kimlerin etkileşime girebileceğini kontrol edin. Ayrıca, <link>Tercihler > Gönderme varsayılanları</link> bölümüne giderek tüm gelecek gönderiler için ayarlayabilirsiniz.",
+  "visibility_modal.privacy_label": "Görünürlük",
+  "visibility_modal.quote_followers": "Sadece takipçiler",
+  "visibility_modal.quote_label": "Kimler alıntılayabilir",
+  "visibility_modal.quote_nobody": "Sadece ben",
+  "visibility_modal.quote_public": "Herkesten",
+  "visibility_modal.save": "Kaydet"
 }
diff --git a/app/javascript/mastodon/locales/tt.json b/app/javascript/mastodon/locales/tt.json
index a56107081e7..6123b199970 100644
--- a/app/javascript/mastodon/locales/tt.json
+++ b/app/javascript/mastodon/locales/tt.json
@@ -49,7 +49,6 @@
   "account.posts": "Язма",
   "account.posts_with_replies": "Язма һәм җавап",
   "account.report": "@{name} кулланучыга шикаять итү",
-  "account.requested": "Awaiting approval",
   "account.requested_follow": "{name} Сезгә язылу соравын җиберде",
   "account.share": "@{name} профиле белән уртаклашу",
   "account.show_reblogs": "Күрсәтергә көчәйтү нче @{name}",
@@ -147,7 +146,6 @@
   "confirmations.mute.confirm": "Тавышсыз",
   "confirmations.redraft.confirm": "Бетерү & эшкәртү",
   "confirmations.unfollow.confirm": "Язылуны туктату",
-  "confirmations.unfollow.message": "Сез язылудан баш тартырга телисез {name}?",
   "conversation.delete": "Сөйләшүне бетерегез",
   "conversation.mark_as_read": "Укылганны Ничек билгеләргә",
   "conversation.open": "Сөйләшүне карау",
@@ -227,9 +225,6 @@
   "home.show_announcements": "Белдерүләр бирегез",
   "interaction_modal.on_another_server": "Башка серверда",
   "interaction_modal.on_this_server": "Бу серверда",
-  "interaction_modal.title.follow": "Иярү {name}",
-  "interaction_modal.title.reblog": "Арттыру {name} сак",
-  "interaction_modal.title.reply": "Җавап {name} сак",
   "intervals.full.days": "{number, plural, one {# көн} other {# көн}}",
   "intervals.full.hours": "{number, plural, one {# сәгать} other {# сәгать}}",
   "intervals.full.minutes": "{number, plural, one {# минут} other {# минут}}",
diff --git a/app/javascript/mastodon/locales/ug.json b/app/javascript/mastodon/locales/ug.json
index 85898d048a7..c87d8ee5dd8 100644
--- a/app/javascript/mastodon/locales/ug.json
+++ b/app/javascript/mastodon/locales/ug.json
@@ -1,14 +1,18 @@
 {
   "about.blocks": "باشقۇرۇلىدىغان مۇلازىمېتىر",
   "about.contact": "ئالاقە:",
+  "about.default_locale": "كۆڭۈلدىكى",
   "about.disclaimer": "Mastodon ھەقسىز، ئوچۇق كودلۇق يۇمشاق دېتال تاۋار ماركىسى Mastodon gGmbH غا تەۋە.",
   "about.domain_blocks.no_reason_available": "سەۋەبىنى ئىشلەتكىلى بولمايدۇ",
+  "about.language_label": "تىل",
   "account.badges.bot": "ماشىنا ئادەم",
+  "account.badges.group": "گۇرۇپپا",
+  "account.block": "@{name} نى توس",
+  "account.block_domain": "{domain} دائىرىنى توس",
   "account.cancel_follow_request": "ئەگىشىش ئىلتىماسىدىن ۋاز كەچ",
   "account.posts": "يازما",
   "account.posts_with_replies": "يازما ۋە ئىنكاس",
   "account.report": "@{name} نى پاش قىل",
-  "account.requested": "Awaiting approval",
   "account_note.placeholder": "چېكىلسە ئىزاھات قوشىدۇ",
   "column.pins": "چوققىلانغان يازما",
   "community.column_settings.media_only": "ۋاسىتەلا",
diff --git a/app/javascript/mastodon/locales/uk.json b/app/javascript/mastodon/locales/uk.json
index 56ff3444f45..45f5b3f4580 100644
--- a/app/javascript/mastodon/locales/uk.json
+++ b/app/javascript/mastodon/locales/uk.json
@@ -61,7 +61,6 @@
   "account.posts": "Дописи",
   "account.posts_with_replies": "Дописи й відповіді",
   "account.report": "Поскаржитися на @{name}",
-  "account.requested": "Очікує підтвердження. Натисніть, щоб скасувати запит на підписку",
   "account.requested_follow": "{name} надсилає запит на стеження",
   "account.share": "Поділитися профілем @{name}",
   "account.show_reblogs": "Показати поширення від @{name}",
@@ -227,9 +226,10 @@
   "confirmations.redraft.confirm": "Видалити та виправити",
   "confirmations.redraft.message": "Ви впевнені, що хочете видалити цей допис та переписати його? Додавання у вибране та поширення буде втрачено, а відповіді на оригінальний допис залишаться без першоджерела.",
   "confirmations.redraft.title": "Видалити та переробити допис?",
+  "confirmations.revoke_quote.confirm": "Видалити публікацію",
+  "confirmations.revoke_quote.message": "Цю дію не можна скасувати.",
+  "confirmations.revoke_quote.title": "Видалити публікацію?",
   "confirmations.unfollow.confirm": "Відписатися",
-  "confirmations.unfollow.message": "Ви впевнені, що хочете відписатися від {name}?",
-  "confirmations.unfollow.title": "Відписатися від користувача?",
   "content_warning.hide": "Сховати допис",
   "content_warning.show": "Усе одно показати",
   "content_warning.show_more": "Показати більше",
@@ -271,6 +271,7 @@
   "domain_pill.your_handle": "Ваша адреса:",
   "domain_pill.your_server": "Ваш цифровий дім, де живуть усі ваші дописи. Не подобається цей? Перенесіть сервери в будь-який час і залучайте своїх підписників.",
   "domain_pill.your_username": "Ваш унікальний ідентифікатор на цьому сервері. Ви можете знайти користувачів з однаковими іменами на різних серверах.",
+  "dropdown.empty": "Оберіть варіант",
   "embed.instructions": "Вбудуйте цей допис до вашого вебсайту, скопіювавши код нижче.",
   "embed.preview": "Ось який вигляд це матиме:",
   "emoji_button.activity": "Діяльність",
@@ -321,6 +322,7 @@
   "explore.trending_links": "Новини",
   "explore.trending_statuses": "Дописи",
   "explore.trending_tags": "Хештеґи",
+  "featured_carousel.next": "Далі",
   "filter_modal.added.context_mismatch_explanation": "Ця категорія фільтра не застосовується до контексту, в якому ви отримали доступ до цього допису. Якщо ви хочете, щоб дописи також фільтрувалися за цим контекстом, вам доведеться редагувати фільтр.",
   "filter_modal.added.context_mismatch_title": "Невідповідність контексту!",
   "filter_modal.added.expired_explanation": "Категорія цього фільтра застаріла, Вам потрібно змінити дату закінчення терміну дії, щоб застосувати її.",
@@ -395,8 +397,6 @@
   "hints.profiles.see_more_followers": "Переглянути більше підписників на {domain}",
   "hints.profiles.see_more_follows": "Переглянути більше підписок на {domain}",
   "hints.profiles.see_more_posts": "Переглянути більше дописів на {domain}",
-  "hints.threads.replies_may_be_missing": "Відповіді з інших серверів можуть бути не показані.",
-  "hints.threads.see_more": "Переглянути більше відповідей на {domain}",
   "home.column_settings.show_reblogs": "Показувати поширення",
   "home.column_settings.show_replies": "Показувати відповіді",
   "home.hide_announcements": "Приховати оголошення",
@@ -417,20 +417,12 @@
   "ignore_notifications_modal.private_mentions_title": "Ігнорувати сповіщення від небажаних приватних згадок?",
   "info_button.label": "Довідка",
   "info_button.what_is_alt_text": "<h1>Що таке альтернативний текст?</h1> <p>Альтернативний текст містить описи зображень для людей з вадами зору, низькошвидкісними з'єднаннями або тих, хто шукає додатковий контекст.</p> <p>Ви можете покращити доступність і розуміння для всіх, написавши чіткий та лаконічний альтернативний текст.</p> <ul> <li>Позначайте важливі елементи</li> <li>Охоплюйте текст у картинках</li> <li>Використовуйте звичайну структуру речень</li> <li>Уникайте надлишкової інформації</li> <li>Зосередьтеся на тенденціях і ключових висновках у складних візуальних формах (наприклад, діаграмах або картах)</li> </ul>",
-  "interaction_modal.action.favourite": "Щоб продовжити, потрібно додати улюблене з вашого облікового запису.",
-  "interaction_modal.action.follow": "Щоб іти далі, потрібно підписатися з вашого облікового запису.",
-  "interaction_modal.action.reblog": "Щоб іти далі, потрібно зробити реблог з вашого облікового запису.",
-  "interaction_modal.action.reply": "Щоб іти далі, потрібно відповісти з вашого облікового запису.",
-  "interaction_modal.action.vote": "Щоб іти далі, потрібно проголосувати з вашим обліковим записом.",
+  "interaction_modal.action": "Щоб взаємодіяти з {name}, вам потрібно увійти в свій обліковий запис на будь-якому сервері Mastodon.",
   "interaction_modal.go": "Вперед",
   "interaction_modal.no_account_yet": "Ще не зареєстровані?",
   "interaction_modal.on_another_server": "На іншому сервері",
   "interaction_modal.on_this_server": "На цьому сервері",
-  "interaction_modal.title.favourite": "Уподобати допис {name}",
-  "interaction_modal.title.follow": "Підписатися на {name}",
-  "interaction_modal.title.reblog": "Поширити допис {name}",
-  "interaction_modal.title.reply": "Відповісти на допис {name}",
-  "interaction_modal.title.vote": "Проголосувати в опитуванні {name}",
+  "interaction_modal.title": "Увійдіть, щоб продовжити",
   "interaction_modal.username_prompt": "Наприклад, %{example}",
   "intervals.full.days": "{number, plural, one {# день} few {# дні} other {# днів}}",
   "intervals.full.hours": "{number, plural, one {# година} few {# години} other {# годин}}",
@@ -459,6 +451,7 @@
   "keyboard_shortcuts.open_media": "Відкрити медіа",
   "keyboard_shortcuts.pinned": "Відкрити список закріплених дописів",
   "keyboard_shortcuts.profile": "Відкрити профіль автора",
+  "keyboard_shortcuts.quote": "Цитувати пост",
   "keyboard_shortcuts.reply": "Відповісти",
   "keyboard_shortcuts.requests": "Відкрити список охочих підписатися",
   "keyboard_shortcuts.search": "Сфокусуватися на пошуку",
@@ -470,6 +463,8 @@
   "keyboard_shortcuts.translate": "перекласти допис",
   "keyboard_shortcuts.unfocus": "Розфокусуватися з нового допису чи пошуку",
   "keyboard_shortcuts.up": "Рухатися вгору списком",
+  "learn_more_link.got_it": "Зрозуміло",
+  "learn_more_link.learn_more": "Докладніше",
   "lightbox.close": "Закрити",
   "lightbox.next": "Далі",
   "lightbox.previous": "Назад",
@@ -703,7 +698,6 @@
   "privacy.public.long": "Усі з Mastodon",
   "privacy.public.short": "Публічно",
   "privacy.unlisted.additional": "Має таку ж поведінку, як у людей, але повідомлення не з'являтимуться у стрічках або хештегах, оглядах, або пошуку Mastodon, навіть якщо ви використовуєте облікові записи.",
-  "privacy.unlisted.long": "Менше взаємодій з алгоритмами",
   "privacy.unlisted.short": "Без додавання до стрічки",
   "privacy_policy.last_updated": "Оновлено {date}",
   "privacy_policy.title": "Політика приватності",
@@ -843,10 +837,10 @@
   "status.open": "Розгорнути допис",
   "status.pin": "Закріпити у профілі",
   "status.quote_error.filtered": "Приховано через один з ваших фільтрів",
-  "status.quote_post_author": "@{name} опублікував допис",
+  "status.quote_error.not_available": "Пост недоступний",
+  "status.quote_post_author": "Цитований допис @{name}",
   "status.read_more": "Дізнатися більше",
   "status.reblog": "Поширити",
-  "status.reblog_private": "Поширити для початкової аудиторії",
   "status.reblogged_by": "{name} поширює",
   "status.reblogs": "{count, plural, one {поширення} few {поширення} many {поширень} other {поширення}}",
   "status.reblogs.empty": "Ніхто ще не поширив цей допис. Коли хтось це зроблять, вони будуть зображені тут.",
@@ -858,6 +852,7 @@
   "status.reply": "Відповісти",
   "status.replyAll": "Відповісти на ланцюжок",
   "status.report": "Поскаржитися на @{name}",
+  "status.revoke_quote": "Видалити мою публікацію з допису @{name}",
   "status.sensitive_warning": "Делікатний вміст",
   "status.share": "Поділитися",
   "status.show_less_all": "Згорнути для всіх",
@@ -911,5 +906,9 @@
   "video.fullscreen": "На весь екран",
   "video.hide": "Приховати відео",
   "video.pause": "Призупинити",
-  "video.play": "Програвати"
+  "video.play": "Програвати",
+  "visibility_modal.helper.privacy_editing": "Видимість не може бути змінена після публікації повідомлення.",
+  "visibility_modal.quote_followers": "Тільки для підписників",
+  "visibility_modal.quote_public": "Будь-хто",
+  "visibility_modal.save": "Зберегти"
 }
diff --git a/app/javascript/mastodon/locales/ur.json b/app/javascript/mastodon/locales/ur.json
index b1db5d819f6..0448f69c63c 100644
--- a/app/javascript/mastodon/locales/ur.json
+++ b/app/javascript/mastodon/locales/ur.json
@@ -46,7 +46,6 @@
   "account.posts": "ٹوٹ",
   "account.posts_with_replies": "ٹوٹ اور جوابات",
   "account.report": "@{name} اطلاع کریں",
-  "account.requested": "منظوری کا منتظر۔ درخواستِ پیروی منسوخ کرنے کیلئے کلک کریں",
   "account.requested_follow": "{name} آپ کو فالو کرنا چھاتا ہے۔",
   "account.share": "@{name} کے مشخص کو بانٹیں",
   "account.show_reblogs": "@{name} کی افزائشات کو دکھائیں",
@@ -123,7 +122,6 @@
   "confirmations.mute.confirm": "خاموش",
   "confirmations.redraft.confirm": "ڈیلیٹ کریں اور دوبارہ ڈرافٹ کریں",
   "confirmations.unfollow.confirm": "پیروی ترک کریں",
-  "confirmations.unfollow.message": "کیا واقعی آپ {name} کی پیروی ترک کرنا چاہتے ہیں؟",
   "conversation.delete": "گفتگو کو ڈیلیٹ کریں",
   "conversation.mark_as_read": "بطور پڑھا ہوا دکھائیں",
   "conversation.open": "گفتگو دیکھیں",
diff --git a/app/javascript/mastodon/locales/uz.json b/app/javascript/mastodon/locales/uz.json
index d651b9501ca..2a8b8175765 100644
--- a/app/javascript/mastodon/locales/uz.json
+++ b/app/javascript/mastodon/locales/uz.json
@@ -44,7 +44,6 @@
   "account.posts": "Postlar",
   "account.posts_with_replies": "Xabarlar va javoblar",
   "account.report": "@{name} xabar berish",
-  "account.requested": "Tasdiqlash kutilmoqda. Kuzatuv soʻrovini bekor qilish uchun bosing",
   "account.requested_follow": "{name} sizni kuzatishni soʻradi",
   "account.share": "@{name} profilini ulashing",
   "account.show_reblogs": "@{name} dan bootlarni ko'rsatish",
@@ -134,7 +133,6 @@
   "confirmations.mute.confirm": "Ovozsiz",
   "confirmations.redraft.confirm": "O'chirish va qayta loyihalash",
   "confirmations.unfollow.confirm": "Kuzatishni To'xtatish",
-  "confirmations.unfollow.message": "Haqiqatan ham {name} obunasini bekor qilmoqchimisiz?",
   "conversation.delete": "Suhbatni o'chirish",
   "conversation.mark_as_read": "O'qilgan deb belgilang",
   "conversation.open": "Suhbatni ko'rish",
@@ -235,9 +233,6 @@
   "home.show_announcements": "E'lonlarni ko'rsatish",
   "interaction_modal.on_another_server": "Boshqa serverda",
   "interaction_modal.on_this_server": "Shu serverda",
-  "interaction_modal.title.follow": "{name} ga ergashing",
-  "interaction_modal.title.reblog": "{name}ning postini boost qilish",
-  "interaction_modal.title.reply": "{name} postiga javob bering",
   "keyboard_shortcuts.back": "Orqaga qaytish",
   "keyboard_shortcuts.blocked": "to open blocked users list",
   "keyboard_shortcuts.boost": "Postni boost qilish",
diff --git a/app/javascript/mastodon/locales/vi.json b/app/javascript/mastodon/locales/vi.json
index 2a843b3dfa2..61de7d3e563 100644
--- a/app/javascript/mastodon/locales/vi.json
+++ b/app/javascript/mastodon/locales/vi.json
@@ -28,6 +28,7 @@
   "account.disable_notifications": "Tắt thông báo khi @{name} đăng tút",
   "account.domain_blocking": "Máy chủ đang chủ",
   "account.edit_profile": "Sửa hồ sơ",
+  "account.edit_profile_short": "Sửa",
   "account.enable_notifications": "Nhận thông báo khi @{name} đăng tút",
   "account.endorse": "Nêu bật người này",
   "account.familiar_followers_many": "Theo dõi bởi {name1}, {name2} và {othersCount, plural, other {# người khác mà bạn biết}}",
@@ -40,6 +41,11 @@
   "account.featured_tags.last_status_never": "Chưa có tút",
   "account.follow": "Theo dõi",
   "account.follow_back": "Theo dõi lại",
+  "account.follow_back_short": "Theo dõi lại",
+  "account.follow_request": "Yêu cầu theo dõi",
+  "account.follow_request_cancel": "Hủy yêu cầu",
+  "account.follow_request_cancel_short": "Hủy bỏ",
+  "account.follow_request_short": "Yêu cầu",
   "account.followers": "Người theo dõi",
   "account.followers.empty": "Chưa có người theo dõi nào.",
   "account.followers_counter": "{count, plural, other {{counter} Người theo dõi}}",
@@ -70,7 +76,6 @@
   "account.posts_with_replies": "Trả lời",
   "account.remove_from_followers": "Xóa người theo dõi {name}",
   "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.requests_to_follow_you": "Yêu cầu theo dõi bạn",
   "account.share": "Chia sẻ @{name}",
@@ -98,7 +103,7 @@
   "alert.rate_limited.message": "Vui lòng thử lại sau {retry_time, time, medium}.",
   "alert.rate_limited.title": "Vượt giới hạn",
   "alert.unexpected.message": "Đã xảy ra lỗi không mong muốn.",
-  "alert.unexpected.title": "Ốiii!",
+  "alert.unexpected.title": "Ốii!",
   "alt_text_badge.title": "Văn bản thay thế",
   "alt_text_modal.add_alt_text": "Thêm văn bản thay thế",
   "alt_text_modal.add_text_from_image": "Thêm văn bản từ ảnh",
@@ -239,15 +244,25 @@
   "confirmations.missing_alt_text.secondary": "Đăng luôn",
   "confirmations.missing_alt_text.title": "Thêm văn bản thay thế?",
   "confirmations.mute.confirm": "Ẩn",
+  "confirmations.quiet_post_quote_info.dismiss": "Không nhắc lại nữa",
+  "confirmations.quiet_post_quote_info.got_it": "Đã hiểu",
+  "confirmations.quiet_post_quote_info.message": "Khi trích dẫn một tút hạn chế, tút của bạn sẽ bị ẩn khỏi dòng thời gian thịnh hành.",
+  "confirmations.quiet_post_quote_info.title": "Trích dẫn những tút hạn chế",
   "confirmations.redraft.confirm": "Xóa & viết lại",
   "confirmations.redraft.message": "Điều này sẽ khiến những lượt thích và đăng lại của tút bị mất, cũng như những trả lời sẽ không còn nội dung gốc.",
   "confirmations.redraft.title": "Xóa & viết lại",
   "confirmations.remove_from_followers.confirm": "Xóa người theo dõi",
   "confirmations.remove_from_followers.message": "{name} sẽ không còn theo dõi bạn.Bạn có chắc tiếp tục?",
   "confirmations.remove_from_followers.title": "Xóa người theo dõi?",
+  "confirmations.revoke_quote.confirm": "Gỡ tút",
+  "confirmations.revoke_quote.message": "Hành động này không thể hoàn tác.",
+  "confirmations.revoke_quote.title": "Gỡ tút?",
+  "confirmations.unblock.confirm": "Bỏ chặn",
+  "confirmations.unblock.title": "Bỏ chặn {name}?",
   "confirmations.unfollow.confirm": "Bỏ theo dõi",
-  "confirmations.unfollow.message": "Bạn có chắc muốn bỏ theo dõi {name}?",
-  "confirmations.unfollow.title": "Bỏ theo dõi",
+  "confirmations.unfollow.title": "Bỏ theo dõi {name}?",
+  "confirmations.withdraw_request.confirm": "Thu hồi yêu cầu",
+  "confirmations.withdraw_request.title": "Thu hồi yêu cầu theo dõi {name}?",
   "content_warning.hide": "Thu gọn",
   "content_warning.show": "Vẫn xem",
   "content_warning.show_more": "Mở rộng",
@@ -276,7 +291,7 @@
   "domain_block_modal.you_will_lose_num_followers": "Bạn sẽ mất {followersCount, plural, other {{followersCountDisplay} người theo dõi}} và {followingCount, plural, other {{followingCountDisplay} người bạn theo dõi}}.",
   "domain_block_modal.you_will_lose_relationships": "Bạn sẽ mất tất cả người theo dõi và những người bạn theo dõi từ máy chủ này.",
   "domain_block_modal.you_wont_see_posts": "Bạn không còn thấy tút hoặc thông báo từ thành viên máy chủ này.",
-  "domain_pill.activitypub_lets_connect": "Nó cho phép bạn kết nối và tương tác với mọi người không chỉ trên Mastodon mà còn trên các ứng dụng xã hội khác.",
+  "domain_pill.activitypub_lets_connect": "Nó cho phép bạn kết nối và tương tác với mọi người, không chỉ trên Mastodon mà còn trên các nền tảng khác.",
   "domain_pill.activitypub_like_language": "ActivityPub giống như ngôn ngữ Mastodon giao tiếp với các mạng xã hội khác.",
   "domain_pill.server": "Máy chủ",
   "domain_pill.their_handle": "Địa chỉ Mastodon:",
@@ -289,6 +304,7 @@
   "domain_pill.your_handle": "Địa chỉ Mastodon của bạn:",
   "domain_pill.your_server": "Nơi lưu trữ tút của bạn. Không thích ở đây? Chuyển sang máy chủ khác và giữ nguyên người theo dõi của bạn.",
   "domain_pill.your_username": "Chỉ riêng bạn trên máy chủ này. Những máy chủ khác có thể cũng có tên người dùng giống vậy.",
+  "dropdown.empty": "Chọn một lựa chọn",
   "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",
@@ -424,8 +440,6 @@
   "hints.profiles.see_more_followers": "Xem thêm người theo dõi ở {domain}",
   "hints.profiles.see_more_follows": "Xem thêm người mà người này theo dõi ở {domain}",
   "hints.profiles.see_more_posts": "Xem thêm tút ở {domain}",
-  "hints.threads.replies_may_be_missing": "Những trả lời từ máy chủ khác có thể không đầy đủ.",
-  "hints.threads.see_more": "Xem thêm ở {domain}",
   "home.column_settings.show_quotes": "Hiện những trích dẫn",
   "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",
@@ -447,20 +461,12 @@
   "ignore_notifications_modal.private_mentions_title": "Bỏ qua thông báo từ những lượt nhắn riêng không mong muốn?",
   "info_button.label": "Trợ giúp",
   "info_button.what_is_alt_text": "<h1>Văn bản thay thế là gì?</h1> <p>Văn bản thay thế giúp mô tả hình ảnh cho những người khiếm thị, kết nối mạng chậm hoặc đơn giản là bổ sung ngữ cảnh.</p> <p>Bạn có thể cải thiện khả năng tiếp cận và giải thích kỹ hơn cho mọi người bằng cách viết văn bản thay thế rõ ràng, ngắn gọn và khách quan.</p> <ul> <li>Nắm bắt thành phần quan trọng</li> <li>Tóm tắt văn bản trong hình</li> <li>Dùng cấu trúc câu đơn</li> <li>Tránh giải thích rối rắm</li> <li>Tập trung vào các xu hướng và kết luận chính trong hình ảnh phức tạp (như biểu đồ hoặc bản đồ)</li> </ul>",
-  "interaction_modal.action.favourite": "Bạn cần dùng tài khoản của mình để thích.",
-  "interaction_modal.action.follow": "Bạn cần dùng tài khoản của mình để theo dõi.",
-  "interaction_modal.action.reblog": "Bạn cần dùng tài khoản của mình để đăng lại.",
-  "interaction_modal.action.reply": "Bạn cần dùng tài khoản của mình để trả lời.",
-  "interaction_modal.action.vote": "Bạn cần dùng tài khoản của mình để vốt.",
+  "interaction_modal.action": "Để tương tác với tút của {name}, bạn cần đăng nhập vào tài khoản trên một máy chủ Mastodon bất kỳ.",
   "interaction_modal.go": "Đi",
   "interaction_modal.no_account_yet": "Chưa có tài khoản?",
   "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.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}",
-  "interaction_modal.title.reply": "Trả lời tút của {name}",
-  "interaction_modal.title.vote": "Vốt cùng {name}",
+  "interaction_modal.title": "Đăng nhập để tiếp tục",
   "interaction_modal.username_prompt": "Ví dụ: {example}",
   "intervals.full.days": "{number, plural, other {# ngày}}",
   "intervals.full.hours": "{number, plural, other {# giờ}}",
@@ -481,6 +487,7 @@
   "keyboard_shortcuts.home": "mở trang chủ",
   "keyboard_shortcuts.hotkey": "Phím tắt",
   "keyboard_shortcuts.legend": "hiện bảng hướng dẫn này",
+  "keyboard_shortcuts.load_more": "Mở nút \"Tải thêm\"",
   "keyboard_shortcuts.local": "mở máy chủ của bạn",
   "keyboard_shortcuts.mention": "nhắc đến ai đó",
   "keyboard_shortcuts.muted": "mở danh sách người đã ẩn",
@@ -489,6 +496,7 @@
   "keyboard_shortcuts.open_media": "mở ảnh hoặc video",
   "keyboard_shortcuts.pinned": "mở những tút đã ghim",
   "keyboard_shortcuts.profile": "mở trang của người đăng tút",
+  "keyboard_shortcuts.quote": "Trích dẫn tút",
   "keyboard_shortcuts.reply": "trả lời",
   "keyboard_shortcuts.requests": "mở danh sách yêu cầu theo dõi",
   "keyboard_shortcuts.search": "mở tìm kiếm",
@@ -500,6 +508,8 @@
   "keyboard_shortcuts.translate": "dịch tút",
   "keyboard_shortcuts.unfocus": "đưa con trỏ ra khỏi ô soạn thảo hoặc ô tìm kiếm",
   "keyboard_shortcuts.up": "di chuyển lên trên danh sách",
+  "learn_more_link.got_it": "Đã hiểu",
+  "learn_more_link.learn_more": "Tìm hiểu thêm",
   "lightbox.close": "Đóng",
   "lightbox.next": "Tiếp",
   "lightbox.previous": "Trước",
@@ -600,6 +610,7 @@
   "notification.label.mention": "Lượt nhắc",
   "notification.label.private_mention": "Nhắn riêng",
   "notification.label.private_reply": "Trả lời riêng",
+  "notification.label.quote": "{name} đã trích dẫn tút của bạn",
   "notification.label.reply": "Trả lời",
   "notification.mention": "Nhắc đến bạn",
   "notification.mentioned_you": "{name} nhắc đến bạn",
@@ -614,6 +625,7 @@
   "notification.moderation_warning.action_suspend": "Tài khoản của bạn đã bị vô hiệu hóa.",
   "notification.own_poll": "Vốt của bạn đã kết thúc",
   "notification.poll": "Vốt mà bạn tham gia đã kết thúc",
+  "notification.quoted_update": "{name} đã chỉnh sửa tút mà bạn trích dẫn",
   "notification.reblog": "{name} đăng lại tút của bạn",
   "notification.reblog.name_and_others_with_link": "{name} và <a>{count, plural, other {# người khác}}</a> đã đăng lại tút của bạn",
   "notification.relationships_severance_event": "Mất kết nối với {name}",
@@ -657,6 +669,7 @@
   "notifications.column_settings.mention": "Lượt nhắc đến:",
   "notifications.column_settings.poll": "Kết quả vốt:",
   "notifications.column_settings.push": "Thông báo đẩy",
+  "notifications.column_settings.quote": "Trích dẫn:",
   "notifications.column_settings.reblog": "Lượt đăng lại:",
   "notifications.column_settings.show": "Báo trên thanh bên",
   "notifications.column_settings.sound": "Kèm âm báo",
@@ -732,11 +745,18 @@
   "privacy.private.short": "Người theo dõi",
   "privacy.public.long": "Bất cứ ai",
   "privacy.public.short": "Công khai",
+  "privacy.quote.anyone": "{visibility}, mọi người có thể trích dẫn",
+  "privacy.quote.disabled": "{visibility}, tắt trích dẫn",
+  "privacy.quote.limited": "{visibility}, hạn chế trích dẫn",
   "privacy.unlisted.additional": "Công khai, nhưng tút sẽ không hiện trong bảng tin, hashtag, khám phá hoặc tìm kiếm Mastodon, kể cả trong cài đặt tài khoản bạn chọn cho phép.",
-  "privacy.unlisted.long": "Ít hướng thuật toán hơn",
+  "privacy.unlisted.long": "Ẩn khỏi kết quả tìm kiếm, xu hướng và dòng thời gian công khai của Mastodon",
   "privacy.unlisted.short": "Hạn chế",
   "privacy_policy.last_updated": "Cập nhật lần cuối {date}",
   "privacy_policy.title": "Chính sách bảo mật",
+  "quote_error.poll": "Không thể trích dẫn vốt.",
+  "quote_error.quote": "Chỉ được trích dẫn một lần.",
+  "quote_error.unauthorized": "Bạn không được cấp quyền trích dẫn tút này.",
+  "quote_error.upload": "Không thể trích dẫn với media đính kèm.",
   "recommended": "Đề xuất",
   "refresh": "Làm mới",
   "regeneration_indicator.please_stand_by": "Hãy chờ đã.",
@@ -752,6 +772,9 @@
   "relative_time.minutes": "{number} phút",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "hôm nay",
+  "remove_quote_hint.button_label": "Đã hiểu",
+  "remove_quote_hint.message": "Bạn cũng có thể làm trong menu tùy chọn {icon}",
+  "remove_quote_hint.title": "Gỡ tút mà bạn đã trích dẫn?",
   "reply_indicator.attachments": "{count, plural, other {# tập tin đính kèm}}",
   "reply_indicator.cancel": "Hủy bỏ",
   "reply_indicator.poll": "Vốt",
@@ -843,13 +866,23 @@
   "status.admin_account": "Mở giao diện quản trị @{name}",
   "status.admin_domain": "Mở giao diện quản trị @{domain}",
   "status.admin_status": "Mở tút này trong giao diện quản trị",
+  "status.all_disabled": "Đăng lại và trích dẫn bị tắt",
   "status.block": "Chặn @{name}",
   "status.bookmark": "Lưu",
   "status.cancel_reblog_private": "Bỏ đăng lại",
+  "status.cannot_quote": "Bạn không được phép trích dẫn tút này",
   "status.cannot_reblog": "Không thể đăng lại tút này",
+  "status.contains_quote": "Chứa trích dẫn",
+  "status.context.loading": "Tải thêm các trả lời",
+  "status.context.loading_error": "Không thể tải những trả lời mới",
+  "status.context.loading_success": "Đã tải toàn bộ trả lời",
+  "status.context.more_replies_found": "Có trả lời mới",
+  "status.context.retry": "Thử lại",
+  "status.context.show": "Hiện",
   "status.continued_thread": "Tiếp tục chủ đề",
   "status.copy": "Sao chép URL",
   "status.delete": "Xóa",
+  "status.delete.success": "Tút đã bị xoá",
   "status.detailed_status": "Xem chi tiết thêm",
   "status.direct": "Nhắn riêng @{name}",
   "status.direct_indicator": "Nhắn riêng",
@@ -872,27 +905,43 @@
   "status.mute_conversation": "Tắt thông báo",
   "status.open": "Mở tút",
   "status.pin": "Ghim lên hồ sơ",
+  "status.quote": "Trích dẫn",
+  "status.quote.cancel": "Bỏ trích dẫn",
   "status.quote_error.filtered": "Bị ẩn vì một bộ lọc của bạn",
-  "status.quote_error.not_found": "Tút này không thể hiển thị.",
-  "status.quote_error.pending_approval": "Tút này cần chờ cho phép từ người đăng.",
-  "status.quote_error.rejected": "Tút này không thể hiển thị vì người đăng không cho phép trích dẫn nó.",
-  "status.quote_error.removed": "Tút này đã bị người đăng xóa.",
-  "status.quote_error.unauthorized": "Tút này không thể hiển thị vì bạn không được cấp quyền truy cập nó.",
-  "status.quote_post_author": "Tút của {name}",
+  "status.quote_error.limited_account_hint.action": "Vẫn xem",
+  "status.quote_error.limited_account_hint.title": "Người này đã bị ẩn bởi quản trị viên {domain}.",
+  "status.quote_error.not_available": "Tút không khả dụng",
+  "status.quote_error.pending_approval": "Tút đang chờ duyệt",
+  "status.quote_error.pending_approval_popout.body": "Trên Mastodon, bạn có thể kiểm soát việc ai đó có thể trích dẫn tút của bạn hay không. Tút này đang chờ phê duyệt từ tác giả gốc.",
+  "status.quote_error.revoked": "Tút gốc đã bị tác giả gỡ",
+  "status.quote_followers_only": "Chỉ người theo dõi tôi có thể trích dẫn tút này",
+  "status.quote_manual_review": "Người đăng sẽ duyệt thủ công",
+  "status.quote_noun": "Trích dẫn",
+  "status.quote_policy_change": "Thay đổi người có thể trích dẫn",
+  "status.quote_post_author": "Trích dẫn từ tút của @{name}",
+  "status.quote_private": "Không thể trích dẫn nhắn riêng",
+  "status.quotes": "{count, plural, other {trích dẫn}}",
+  "status.quotes.empty": "Tút này chưa có ai trích dẫn. Nếu có, nó sẽ hiển thị ở đây.",
+  "status.quotes.local_other_disclaimer": "Những trích dẫn bị tác giả từ chối sẽ không được hiển thị.",
+  "status.quotes.remote_other_disclaimer": "Chỉ những trích dẫn từ {domain} mới được hiển thị ở đây. Những trích dẫn bị tác giả từ chối sẽ không được hiển thị.",
   "status.read_more": "Đọc tiếp",
   "status.reblog": "Đăng lại",
-  "status.reblog_private": "Đăng lại (Riêng tư)",
+  "status.reblog_or_quote": "Đăng lại hoặc trích dẫn",
+  "status.reblog_private": "Chia sẻ lại với người theo dõi của bạn",
   "status.reblogged_by": "{name} đăng lại",
   "status.reblogs": "{count, plural, other {đăng lại}}",
   "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.remove_favourite": "Bỏ thích",
+  "status.remove_quote": "Gỡ",
   "status.replied_in_thread": "Trả lời thảo luận",
   "status.replied_to": "Trả lời {name}",
   "status.reply": "Trả lời",
   "status.replyAll": "Trả lời",
   "status.report": "Báo cáo @{name}",
+  "status.request_quote": "Yêu cầu trích dẫn",
+  "status.revoke_quote": "Gỡ tút của tôi khỏi trích dẫn của @{name}",
   "status.sensitive_warning": "Nhạy cảm",
   "status.share": "Chia sẻ",
   "status.show_less_all": "Thu gọn",
@@ -930,6 +979,7 @@
   "upload_button.label": "Thêm media (JPEG, PNG, GIF, WebM, MP4, MOV)",
   "upload_error.limit": "Tập tin tải lên vượt quá giới hạn cho phép.",
   "upload_error.poll": "Không cho phép đính kèm tập tin.",
+  "upload_error.quote": "Không cho phép đính kèm tập tin với trích dẫn.",
   "upload_form.drag_and_drop.instructions": "Để chọn tập tin đính kèm, hãy nhấn phím cách hoặc phím Enter. Trong khi kéo, sử dụng các phím mũi tên để di chuyển tập tin đính kèm theo bất kỳ hướng nào. Nhấn phím cách hoặc phím Enter một lần nữa để thả tập tin đính kèm vào vị trí mới hoặc nhấn phím thoát để hủy.",
   "upload_form.drag_and_drop.on_drag_cancel": "Kéo thả đã bị hủy bỏ. Tập tin đính kèm {item} bị bỏ qua.",
   "upload_form.drag_and_drop.on_drag_end": "Tập tin đính kèm {item} bị bỏ qua.",
@@ -952,5 +1002,19 @@
   "video.skip_forward": "Tua tới",
   "video.unmute": "Bật tiếng",
   "video.volume_down": "Giảm âm lượng",
-  "video.volume_up": "Tăng âm lượng"
+  "video.volume_up": "Tăng âm lượng",
+  "visibility_modal.button_title": "Thay đổi quyền riêng tư",
+  "visibility_modal.header": "Hiển thị và tương tác",
+  "visibility_modal.helper.direct_quoting": "Nhắn riêng trên Mastodon không thể được người khác trích dẫn.",
+  "visibility_modal.helper.privacy_editing": "Không thể thay đổi chế độ hiển thị sau khi một tút đã đăng.",
+  "visibility_modal.helper.privacy_private_self_quote": "Không thể công khai trích dẫn tút của bản thân hoặc tút riêng tư.",
+  "visibility_modal.helper.private_quoting": "Tút chỉ dành cho người theo dõi trên Mastodon không thể được người khác trích dẫn.",
+  "visibility_modal.helper.unlisted_quoting": "Khi ai đó trích dẫn bạn, tút của họ cũng sẽ bị ẩn khỏi bảng tin công khai.",
+  "visibility_modal.instructions": "Kiểm soát những ai có thể tương tác với tút này. Bạn cũng có thể áp dụng cài đặt cho tất cả các tút trong tương lai bằng cách điều hướng đến <link>Thiết lập > Đăng</link>.",
+  "visibility_modal.privacy_label": "Hiển thị",
+  "visibility_modal.quote_followers": "Chỉ người theo dõi",
+  "visibility_modal.quote_label": "Ai có thể trích dẫn",
+  "visibility_modal.quote_nobody": "Chỉ tôi",
+  "visibility_modal.quote_public": "Bất cứ ai",
+  "visibility_modal.save": "Lưu"
 }
diff --git a/app/javascript/mastodon/locales/zgh.json b/app/javascript/mastodon/locales/zgh.json
index ff37d75a07c..7317cd7282f 100644
--- a/app/javascript/mastodon/locales/zgh.json
+++ b/app/javascript/mastodon/locales/zgh.json
@@ -14,7 +14,6 @@
   "account.muted": "ⵉⵜⵜⵓⵥⵉⵥⵏ",
   "account.posts": "Toots",
   "account.posts_with_replies": "Toots and replies",
-  "account.requested": "Awaiting approval",
   "account.share": "ⴱⴹⵓ ⵉⴼⵔⵙ ⵏ @{name}",
   "account.unfollow": "ⴽⴽⵙ ⴰⴹⴼⴼⵓⵕ",
   "account_note.placeholder": "Click to add a note",
@@ -49,7 +48,6 @@
   "confirmations.logout.message": "ⵉⵙ ⵏⵉⵜ ⵜⵅⵙⴷ ⴰⴷ ⵜⴼⴼⵖⴷ?",
   "confirmations.mute.confirm": "ⵥⵥⵉⵥⵏ",
   "confirmations.unfollow.confirm": "ⴽⴽⵙ ⴰⴹⴼⴼⵓⵕ",
-  "confirmations.unfollow.message": "ⵉⵙ ⵏⵉⵜ ⵜⵅⵙⴷ ⴰⴷ ⵜⴽⴽⵙⴷ ⴰⴹⴼⴼⵓⵕ ⵉ {name}?",
   "conversation.delete": "ⴽⴽⵙ ⴰⵎⵙⴰⵡⴰⵍ",
   "conversation.with": "ⴰⴽⴷ {names}",
   "embed.instructions": "Embed this status on your website by copying the code below.",
diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json
index dc34246fb20..87fe47d7771 100644
--- a/app/javascript/mastodon/locales/zh-CN.json
+++ b/app/javascript/mastodon/locales/zh-CN.json
@@ -28,8 +28,10 @@
   "account.disable_notifications": "当 @{name} 发布嘟文时不要通知我",
   "account.domain_blocking": "正在屏蔽中的域名",
   "account.edit_profile": "修改个人资料",
+  "account.edit_profile_short": "编辑",
   "account.enable_notifications": "当 @{name} 发布嘟文时通知我",
   "account.endorse": "在个人资料中推荐此用户",
+  "account.familiar_followers_many": "被 {name1}、{name2}、及 {othersCount, plural, other {其他你认识的 # 人}} 关注",
   "account.familiar_followers_one": "{name1} 关注了此账号",
   "account.familiar_followers_two": "{name1} 和 {name2} 关注了此账号",
   "account.featured": "精选",
@@ -39,6 +41,11 @@
   "account.featured_tags.last_status_never": "暂无嘟文",
   "account.follow": "关注",
   "account.follow_back": "回关",
+  "account.follow_back_short": "回关",
+  "account.follow_request": "请求关注",
+  "account.follow_request_cancel": "取消请求",
+  "account.follow_request_cancel_short": "取消",
+  "account.follow_request_short": "请求",
   "account.followers": "关注者",
   "account.followers.empty": "目前无人关注此用户。",
   "account.followers_counter": "{count, plural, other {{counter} 关注者}}",
@@ -69,9 +76,8 @@
   "account.posts_with_replies": "嘟文和回复",
   "account.remove_from_followers": "从关注者中移除 {name}",
   "account.report": "举报 @{name}",
-  "account.requested": "正在等待对方同意。点击取消发送关注请求",
   "account.requested_follow": "{name} 向你发送了关注请求",
-  "account.requests_to_follow_you": "请求关注您",
+  "account.requests_to_follow_you": "请求关注你",
   "account.share": "分享 @{name} 的个人资料",
   "account.show_reblogs": "显示来自 @{name} 的转嘟",
   "account.statuses_counter": "{count, plural, other {{counter} 条嘟文}}",
@@ -149,7 +155,7 @@
   "bundle_column_error.routing.body": "找不到请求的页面。你确定地址栏中的网址输入正确吗？",
   "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "关闭",
-  "bundle_modal_error.message": "载入此页面时发生了错误。",
+  "bundle_modal_error.message": "加载此页面时发生了错误。",
   "bundle_modal_error.retry": "重试",
   "closed_registrations.other_server_instructions": "基于 Mastodon 去中心化的特性，你可以其他服务器上创建账号，并继续与此服务器互动。",
   "closed_registrations_modal.description": "你目前无法在 {domain} 上创建账号，但请注意，使用 Mastodon 并非需要专门在 {domain} 上注册账号。",
@@ -218,6 +224,13 @@
   "confirmations.delete_list.confirm": "删除",
   "confirmations.delete_list.message": "确定要永久删除此列表吗？",
   "confirmations.delete_list.title": "确定要删除列表？",
+  "confirmations.discard_draft.confirm": "丢弃并继续",
+  "confirmations.discard_draft.edit.cancel": "恢复编辑",
+  "confirmations.discard_draft.edit.message": "继续将丢弃你对你正在编辑的嘟文所作的任何更改。",
+  "confirmations.discard_draft.edit.title": "是否丢弃你对嘟文的更改？",
+  "confirmations.discard_draft.post.cancel": "恢复草稿",
+  "confirmations.discard_draft.post.message": "继续将丢弃你正在编辑的嘟文。",
+  "confirmations.discard_draft.post.title": "丢弃你的嘟文草稿？",
   "confirmations.discard_edit_media.confirm": "丢弃",
   "confirmations.discard_edit_media.message": "你还有未保存的媒体描述或预览修改，仍要丢弃吗？",
   "confirmations.follow_to_list.confirm": "关注并添加到列表",
@@ -231,15 +244,25 @@
   "confirmations.missing_alt_text.secondary": "就这样发布",
   "confirmations.missing_alt_text.title": "添加替代文本?",
   "confirmations.mute.confirm": "隐藏",
+  "confirmations.quiet_post_quote_info.dismiss": "不再提醒",
+  "confirmations.quiet_post_quote_info.got_it": "明白了",
+  "confirmations.quiet_post_quote_info.message": "当你引用悄悄公开的嘟文时，你的嘟文会从热门时间线上隐藏。",
+  "confirmations.quiet_post_quote_info.title": "引用悄悄公开的嘟文",
   "confirmations.redraft.confirm": "删除并重新编辑",
   "confirmations.redraft.message": "确定删除这条嘟文并重写吗？所有相关的喜欢和转嘟都将丢失，嘟文的回复也会失去关联。",
   "confirmations.redraft.title": "是否删除并重新编辑嘟文？",
   "confirmations.remove_from_followers.confirm": "移除关注者",
-  "confirmations.remove_from_followers.message": "{name} 将停止关注您。您确定要继续吗？",
+  "confirmations.remove_from_followers.message": "{name} 将停止关注你。你确定要继续吗？",
   "confirmations.remove_from_followers.title": "移除关注者？",
+  "confirmations.revoke_quote.confirm": "移除嘟文",
+  "confirmations.revoke_quote.message": "此操作无法撤销。",
+  "confirmations.revoke_quote.title": "移除嘟文？",
+  "confirmations.unblock.confirm": "取消屏蔽",
+  "confirmations.unblock.title": "取消屏蔽 {name} 吗？",
   "confirmations.unfollow.confirm": "取消关注",
-  "confirmations.unfollow.message": "你确定要取消关注 {name} 吗？",
-  "confirmations.unfollow.title": "确定要取消关注用户？",
+  "confirmations.unfollow.title": "取关 {name} 吗？",
+  "confirmations.withdraw_request.confirm": "撤回请求",
+  "confirmations.withdraw_request.title": "撤回关注 {name} 的请求吗？",
   "content_warning.hide": "隐藏嘟文",
   "content_warning.show": "仍要显示",
   "content_warning.show_more": "展开",
@@ -281,6 +304,7 @@
   "domain_pill.your_handle": "你的用户名：",
   "domain_pill.your_server": "你的数字家园，你的所有嘟文都在此存储。不喜欢这里吗？你可以随时迁移到其它服务器，并带上你的关注者。",
   "domain_pill.your_username": "你在此服务器上的唯一标识。不同服务器上可能存在相同用户名的用户。",
+  "dropdown.empty": "选项",
   "embed.instructions": "复制下列代码以在你的网站中嵌入此嘟文。",
   "embed.preview": "这是它的预览效果：",
   "emoji_button.activity": "活动",
@@ -298,6 +322,9 @@
   "emoji_button.search_results": "搜索结果",
   "emoji_button.symbols": "符号",
   "emoji_button.travel": "旅行与地点",
+  "empty_column.account_featured.me": "你尚未设置任何精选。你知道吗？你可以将自己最常使用的话题标签，甚至是好友的账号，在你的个人主页上设为精选。",
+  "empty_column.account_featured.other": "{acct} 尚未设置任何精选。你知道吗？你可以将自己最常使用的话题标签，甚至是好友的账号，在你的个人主页上设为精选。",
+  "empty_column.account_featured_other.unknown": "此账号尚未设置任何精选。",
   "empty_column.account_hides_collections": "该用户选择不公开此信息",
   "empty_column.account_suspended": "账号已被停用",
   "empty_column.account_timeline": "这里没有嘟文！",
@@ -330,6 +357,7 @@
   "explore.trending_links": "新闻",
   "explore.trending_statuses": "嘟文",
   "explore.trending_tags": "话题",
+  "featured_carousel.header": "{count, plural, other {# 条置顶嘟文}}",
   "featured_carousel.next": "下一步",
   "featured_carousel.post": "发嘟",
   "featured_carousel.previous": "上一步",
@@ -387,6 +415,7 @@
   "getting_started.heading": "开始使用",
   "hashtag.admin_moderation": "打开 #{name} 的管理界面",
   "hashtag.browse": "浏览#{hashtag}中的贴子",
+  "hashtag.browse_from_account": "浏览#{hashtag}中来自@{name}的贴子",
   "hashtag.column_header.tag_mode.all": "以及 {additional}",
   "hashtag.column_header.tag_mode.any": "或是 {additional}",
   "hashtag.column_header.tag_mode.none": "而不用 {additional}",
@@ -399,8 +428,10 @@
   "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.feature": "设为精选",
   "hashtag.follow": "关注话题",
   "hashtag.mute": "停止提醒 #{hashtag}",
+  "hashtag.unfeature": "取消精选",
   "hashtag.unfollow": "取消关注话题",
   "hashtags.and_other": "… 和另外 {count, plural, other {# 个话题}}",
   "hints.profiles.followers_may_be_missing": "该账号的关注者列表可能没有完全显示。",
@@ -409,8 +440,6 @@
   "hints.profiles.see_more_followers": "在 {domain} 查看更多关注者",
   "hints.profiles.see_more_follows": "在 {domain} 查看更多关注",
   "hints.profiles.see_more_posts": "在 {domain} 查看更多嘟文",
-  "hints.threads.replies_may_be_missing": "来自其它实例的回复可能没有完全显示。",
-  "hints.threads.see_more": "在 {domain} 查看更多回复",
   "home.column_settings.show_quotes": "显示引用",
   "home.column_settings.show_reblogs": "显示转嘟",
   "home.column_settings.show_replies": "显示回复",
@@ -432,20 +461,12 @@
   "ignore_notifications_modal.private_mentions_title": "是否忽略不请自来的私下提及？",
   "info_button.label": "帮助",
   "info_button.what_is_alt_text": "<h1>什么是替代文本？</h1> <p>替代文本为视力障碍者、低带宽连接用户或需要额外背景信息的用户提供图像描述。</p> <p>通过编写清晰、简洁、客观的替代文本，可以提升所有人的可访问性和理解力。</p> <ul> <li>捕捉重要元素</li> <li>总结图像中的文本</li> <li>使用常规句子结构</li> <li>避免冗余信息</li> <li>关注复杂视觉内容(如图表或地图)中的趋势和关键信息</li> </ul>",
-  "interaction_modal.action.favourite": "你需要切换到自己的账号，再发送喜欢。",
-  "interaction_modal.action.follow": "你需要切换到自己的账号，再进行关注。",
-  "interaction_modal.action.reblog": "你需要切换到自己的账号，再进行转嘟。",
-  "interaction_modal.action.reply": "你需要切换到自己的账号，再发送回复。",
-  "interaction_modal.action.vote": "你需要切换到自己的账号，再发送投票。",
+  "interaction_modal.action": "要和 {name} 的嘟文互动，你需要登录到你在Mastodon服务器上注册的账号。",
   "interaction_modal.go": "跳转",
   "interaction_modal.no_account_yet": "还没有账号？",
   "interaction_modal.on_another_server": "在另一服务器",
   "interaction_modal.on_this_server": "在此服务器",
-  "interaction_modal.title.favourite": "喜欢 {name} 的嘟文",
-  "interaction_modal.title.follow": "关注 {name}",
-  "interaction_modal.title.reblog": "转发 {name} 的嘟文",
-  "interaction_modal.title.reply": "回复 {name} 的嘟文",
-  "interaction_modal.title.vote": "参与 {name} 的投票",
+  "interaction_modal.title": "登录以继续",
   "interaction_modal.username_prompt": "例如: {example}",
   "intervals.full.days": "{number} 天",
   "intervals.full.hours": "{number} 小时",
@@ -466,6 +487,7 @@
   "keyboard_shortcuts.home": "打开主页时间线",
   "keyboard_shortcuts.hotkey": "快捷键",
   "keyboard_shortcuts.legend": "显示此列表",
+  "keyboard_shortcuts.load_more": "将焦点移至“加载更多”按钮",
   "keyboard_shortcuts.local": "打开本站时间线",
   "keyboard_shortcuts.mention": "提及嘟文作者",
   "keyboard_shortcuts.muted": "打开隐藏用户列表",
@@ -474,6 +496,7 @@
   "keyboard_shortcuts.open_media": "打开媒体",
   "keyboard_shortcuts.pinned": "打开置顶嘟文列表",
   "keyboard_shortcuts.profile": "打开作者的个人资料",
+  "keyboard_shortcuts.quote": "引用嘟文",
   "keyboard_shortcuts.reply": "回复嘟文",
   "keyboard_shortcuts.requests": "打开关注请求列表",
   "keyboard_shortcuts.search": "选中搜索框",
@@ -485,6 +508,8 @@
   "keyboard_shortcuts.translate": "翻译嘟文",
   "keyboard_shortcuts.unfocus": "取消输入/搜索",
   "keyboard_shortcuts.up": "在列表中让光标上移",
+  "learn_more_link.got_it": "明白了",
+  "learn_more_link.learn_more": "了解更多",
   "lightbox.close": "关闭",
   "lightbox.next": "下一个",
   "lightbox.previous": "上一个",
@@ -534,8 +559,10 @@
   "mute_modal.you_wont_see_mentions": "你看不到提及对方的嘟文。",
   "mute_modal.you_wont_see_posts": "对方可以看到你的嘟文，但是你看不到对方的。",
   "navigation_bar.about": "关于",
+  "navigation_bar.account_settings": "密码与安全",
   "navigation_bar.administration": "管理",
   "navigation_bar.advanced_interface": "在高级网页界面中打开",
+  "navigation_bar.automated_deletion": "自动删除嘟文",
   "navigation_bar.blocks": "已屏蔽的用户",
   "navigation_bar.bookmarks": "书签",
   "navigation_bar.direct": "私下提及",
@@ -547,6 +574,8 @@
   "navigation_bar.follows_and_followers": "关注与关注者",
   "navigation_bar.import_export": "导入与导出",
   "navigation_bar.lists": "列表",
+  "navigation_bar.live_feed_local": "实时动态（本站）",
+  "navigation_bar.live_feed_public": "实时动态（公开）",
   "navigation_bar.logout": "退出登录",
   "navigation_bar.moderation": "审核",
   "navigation_bar.more": "更多",
@@ -555,7 +584,10 @@
   "navigation_bar.preferences": "偏好设置",
   "navigation_bar.privacy_and_reach": "隐私与可达性",
   "navigation_bar.search": "搜索",
+  "navigation_bar.search_trends": "搜索/热门趋势",
+  "navigation_panel.collapse_followed_tags": "收起已关注话题菜单",
   "navigation_panel.collapse_lists": "收起菜单列表",
+  "navigation_panel.expand_followed_tags": "展开已关注话题菜单",
   "navigation_panel.expand_lists": "展开菜单列表",
   "not_signed_in_indicator.not_signed_in": "你需要登录才能访问此资源。",
   "notification.admin.report": "{name} 举报了 {target}",
@@ -578,6 +610,7 @@
   "notification.label.mention": "提及",
   "notification.label.private_mention": "私下提及",
   "notification.label.private_reply": "私人回复",
+  "notification.label.quote": "{name} 引用了你的嘟文",
   "notification.label.reply": "回复",
   "notification.mention": "提及",
   "notification.mentioned_you": "{name} 提到了你",
@@ -592,6 +625,7 @@
   "notification.moderation_warning.action_suspend": "你的账号已被封禁。",
   "notification.own_poll": "你的投票已经结束",
   "notification.poll": "你参与的一项投票已结束",
+  "notification.quoted_update": "{name} 编辑了一条你之前引用过的嘟文",
   "notification.reblog": "{name} 转发了你的嘟文",
   "notification.reblog.name_and_others_with_link": "{name} 和 <a>{count, plural, other {另外 # 人}}</a> 转嘟了你的嘟文",
   "notification.relationships_severance_event": "与 {name} 的联系已断开",
@@ -635,6 +669,7 @@
   "notifications.column_settings.mention": "提及：",
   "notifications.column_settings.poll": "投票结果：",
   "notifications.column_settings.push": "推送通知",
+  "notifications.column_settings.quote": "引用嘟文：",
   "notifications.column_settings.reblog": "转嘟：",
   "notifications.column_settings.show": "在通知栏显示",
   "notifications.column_settings.sound": "播放音效",
@@ -710,11 +745,18 @@
   "privacy.private.short": "关注者",
   "privacy.public.long": "所有 Mastodon 内外的人",
   "privacy.public.short": "公开",
-  "privacy.unlisted.additional": "此模式的行为与“公开”类似，只是嘟文不会出现在实时动态、话题、探索或 Mastodon 搜索页面中，即使您已全局开启了对应的发现设置。",
-  "privacy.unlisted.long": "减少算法影响",
+  "privacy.quote.anyone": "{visibility}，任何人都能引用",
+  "privacy.quote.disabled": "{visibility}，禁用嘟文引用",
+  "privacy.quote.limited": "{visibility}，嘟文引用受限",
+  "privacy.unlisted.additional": "此模式的行为与“公开”类似，只是嘟文不会出现在实时动态、话题、探索或 Mastodon 搜索页面中，即使你已全局开启了对应的发现设置。",
+  "privacy.unlisted.long": "不显示在Mastodon的搜索结果、热门趋势、公共时间线上",
   "privacy.unlisted.short": "悄悄公开",
   "privacy_policy.last_updated": "最近更新于 {date}",
   "privacy_policy.title": "隐私政策",
+  "quote_error.poll": "不允许引用投票嘟文。",
+  "quote_error.quote": "一次只能引用一条嘟文。",
+  "quote_error.unauthorized": "你没有权限引用此嘟文。",
+  "quote_error.upload": "不允许引用有媒体附件的嘟文。",
   "recommended": "推荐",
   "refresh": "刷新",
   "regeneration_indicator.please_stand_by": "请稍候。",
@@ -730,6 +772,9 @@
   "relative_time.minutes": "{number} 分钟前",
   "relative_time.seconds": "{number} 秒前",
   "relative_time.today": "今天",
+  "remove_quote_hint.button_label": "明白了",
+  "remove_quote_hint.message": "你可以通过 {icon} 选项菜单进行此操作。",
+  "remove_quote_hint.title": "是否想要删除你的引用嘟文？",
   "reply_indicator.attachments": "{count, plural, other {# 个附件}}",
   "reply_indicator.cancel": "取消",
   "reply_indicator.poll": "投票",
@@ -783,6 +828,7 @@
   "report_notification.categories.violation": "违反规则",
   "report_notification.categories.violation_sentence": "违反规则",
   "report_notification.open": "打开举报",
+  "search.clear": "清空搜索内容",
   "search.no_recent_searches": "无最近搜索",
   "search.placeholder": "搜索",
   "search.quick_action.account_search": "包含 {x} 的账号",
@@ -820,13 +866,23 @@
   "status.admin_account": "打开 @{name} 的管理界面",
   "status.admin_domain": "打开 {domain} 的管理界面",
   "status.admin_status": "在管理界面查看此嘟文",
+  "status.all_disabled": "已禁用转嘟与引用",
   "status.block": "屏蔽 @{name}",
   "status.bookmark": "添加到书签",
   "status.cancel_reblog_private": "取消转嘟",
+  "status.cannot_quote": "你无权引用这条嘟文",
   "status.cannot_reblog": "不能转嘟这条嘟文",
+  "status.contains_quote": "包含引用",
+  "status.context.loading": "正在加载更多回复",
+  "status.context.loading_error": "无法加载新回复",
+  "status.context.loading_success": "已加载所有回复",
+  "status.context.more_replies_found": "已找到更多回复",
+  "status.context.retry": "重试",
+  "status.context.show": "显示",
   "status.continued_thread": "上接嘟文串",
   "status.copy": "复制嘟文链接",
   "status.delete": "删除",
+  "status.delete.success": "嘟文已删除",
   "status.detailed_status": "对话详情",
   "status.direct": "私下提及 @{name}",
   "status.direct_indicator": "私下提及",
@@ -849,25 +905,43 @@
   "status.mute_conversation": "关闭此对话的通知",
   "status.open": "展开嘟文",
   "status.pin": "在个人资料页面置顶",
+  "status.quote": "引用",
+  "status.quote.cancel": "取消引用",
   "status.quote_error.filtered": "已根据你的筛选器过滤",
-  "status.quote_error.not_found": "无法显示这篇贴文。",
-  "status.quote_error.rejected": "由于原作者不允许引用转发，无法显示这篇贴文。",
-  "status.quote_error.removed": "该帖子已被作者删除。",
-  "status.quote_post_author": "{name} 的嘟文",
+  "status.quote_error.limited_account_hint.action": "仍然显示",
+  "status.quote_error.limited_account_hint.title": "此账号已被 {domain} 管理员隐藏。",
+  "status.quote_error.not_available": "嘟文不可用",
+  "status.quote_error.pending_approval": "嘟文待发布",
+  "status.quote_error.pending_approval_popout.body": "在Mastodon上，你可以控制其他人引用你嘟文的权限。此嘟文在得到原作者的同意后就会发布。",
+  "status.quote_error.revoked": "嘟文已被作者删除",
+  "status.quote_followers_only": "只有关注者才能引用这篇嘟文",
+  "status.quote_manual_review": "嘟文作者将人工审核",
+  "status.quote_noun": "引用",
+  "status.quote_policy_change": "更改谁可以引用",
+  "status.quote_post_author": "引用了 @{name} 的嘟文",
+  "status.quote_private": "不能引用私人嘟文",
+  "status.quotes": "{count, plural, other {引用嘟文}}",
+  "status.quotes.empty": "还没有人引用过此条嘟文。引用此嘟文的人会显示在这里。",
+  "status.quotes.local_other_disclaimer": "遭作者拒绝的引用将不会显示。",
+  "status.quotes.remote_other_disclaimer": "此处仅保证会显示来自 {domain} 的引用。遭作者拒绝的引用将不会显示。",
   "status.read_more": "查看更多",
   "status.reblog": "转嘟",
-  "status.reblog_private": "以相同可见性转嘟",
+  "status.reblog_or_quote": "转嘟或引用",
+  "status.reblog_private": "向关注者再次分享",
   "status.reblogged_by": "{name} 转嘟了",
   "status.reblogs": "{count, plural, other {次转嘟}}",
   "status.reblogs.empty": "没有人转嘟过此条嘟文。如果有人转嘟了，就会显示在这里。",
   "status.redraft": "删除并重新编辑",
   "status.remove_bookmark": "移除书签",
   "status.remove_favourite": "从喜欢列表中移除",
+  "status.remove_quote": "移除",
   "status.replied_in_thread": "回复嘟文串",
   "status.replied_to": "回复 {name}",
   "status.reply": "回复",
   "status.replyAll": "回复此嘟文串",
   "status.report": "举报 @{name}",
+  "status.request_quote": "请求引用",
+  "status.revoke_quote": "将我的嘟文从 @{name} 的嘟文中删除",
   "status.sensitive_warning": "敏感内容",
   "status.share": "分享",
   "status.show_less_all": "全部折叠",
@@ -889,7 +963,7 @@
   "tabs_bar.search": "搜索",
   "terms_of_service.effective_as_of": "自 {date} 起生效",
   "terms_of_service.title": "服务条款",
-  "terms_of_service.upcoming_changes_on": "将于 {date} 进行变更",
+  "terms_of_service.upcoming_changes_on": "{date} 起即将生效的更改",
   "time_remaining.days": "剩余 {number, plural, other {# 天}}",
   "time_remaining.hours": "剩余 {number, plural, other {# 小时}}",
   "time_remaining.minutes": "剩余 {number, plural, other {# 分钟}}",
@@ -905,6 +979,7 @@
   "upload_button.label": "上传图片、视频或音频",
   "upload_error.limit": "文件大小超过限制。",
   "upload_error.poll": "投票中不允许上传文件。",
+  "upload_error.quote": "引用中不允许上传文件。",
   "upload_form.drag_and_drop.instructions": "要选中某个媒体附件，请按空格键或回车键。在拖拽时，使用方向键将媒体附件移动到任何给定方向。再次按空格键或回车键可将媒体附件放置在新位置，或按 Esc 键取消。",
   "upload_form.drag_and_drop.on_drag_cancel": "拖拽已终止。媒体附件 {item} 已被丢弃。",
   "upload_form.drag_and_drop.on_drag_end": "媒体附件 {item} 已被丢弃。",
@@ -927,5 +1002,19 @@
   "video.skip_forward": "前进",
   "video.unmute": "恢复提醒",
   "video.volume_down": "音量减小",
-  "video.volume_up": "提高音量"
+  "video.volume_up": "提高音量",
+  "visibility_modal.button_title": "设置可见性",
+  "visibility_modal.header": "可见性和互动",
+  "visibility_modal.helper.direct_quoting": "Mastodon上发布的私下提及无法被他人引用。",
+  "visibility_modal.helper.privacy_editing": "嘟文发布后便无法更改可见性。",
+  "visibility_modal.helper.privacy_private_self_quote": "自我引用的私人嘟文无法设置为公开。",
+  "visibility_modal.helper.private_quoting": "Mastodon上发布的仅限关注者可见的嘟文无法被他人引用。",
+  "visibility_modal.helper.unlisted_quoting": "当其他人引用你时，他们的嘟文也会从热门时间线上隐藏。",
+  "visibility_modal.instructions": "控制谁可以和此嘟文互动。你也可以前往<link>偏好设置 > 发布默认值</link>将此设置应用到所有未来发布的嘟文。",
+  "visibility_modal.privacy_label": "可见性",
+  "visibility_modal.quote_followers": "仅关注者",
+  "visibility_modal.quote_label": "谁可以引用",
+  "visibility_modal.quote_nobody": "仅限自己",
+  "visibility_modal.quote_public": "任何人",
+  "visibility_modal.save": "保存"
 }
diff --git a/app/javascript/mastodon/locales/zh-HK.json b/app/javascript/mastodon/locales/zh-HK.json
index 91daf7ba9c2..3626f7da54a 100644
--- a/app/javascript/mastodon/locales/zh-HK.json
+++ b/app/javascript/mastodon/locales/zh-HK.json
@@ -65,7 +65,6 @@
   "account.posts": "帖文",
   "account.posts_with_replies": "帖文與回覆",
   "account.report": "檢舉 @{name}",
-  "account.requested": "正在等待核准。按一下以取消追蹤請求",
   "account.requested_follow": "{name} 要求追蹤你",
   "account.share": "分享 @{name} 的個人檔案",
   "account.show_reblogs": "顯示 @{name} 的轉推",
@@ -192,8 +191,6 @@
   "confirmations.redraft.confirm": "刪除並編輯",
   "confirmations.redraft.message": "你確定要移除並重新起草這篇帖文嗎？你將會失去最愛和轉推，而回覆也會與原始帖文斷開連接。",
   "confirmations.unfollow.confirm": "取消追蹤",
-  "confirmations.unfollow.message": "真的不要繼續追蹤 {name} 了嗎？",
-  "confirmations.unfollow.title": "取消追蹤使用者？",
   "content_warning.hide": "隱藏嘟文",
   "content_warning.show": "仍要顯示",
   "content_warning.show_more": "顯示更多",
@@ -354,10 +351,6 @@
   "info_button.label": "幫助",
   "interaction_modal.on_another_server": "於不同伺服器",
   "interaction_modal.on_this_server": "於此伺服器",
-  "interaction_modal.title.favourite": "把 {name} 的帖文加入最愛",
-  "interaction_modal.title.follow": "追蹤 {name}",
-  "interaction_modal.title.reblog": "轉發 {name} 的帖文",
-  "interaction_modal.title.reply": "回覆 {name} 的帖文",
   "intervals.full.days": "{number, plural, one {# 天} other {# 天}}",
   "intervals.full.hours": "{number, plural, one {# 小時} other {# 小時}}",
   "intervals.full.minutes": "{number, plural, one {# 分鐘} other {# 分鐘}}",
@@ -377,6 +370,7 @@
   "keyboard_shortcuts.home": "開啟個人時間軸",
   "keyboard_shortcuts.hotkey": "快速鍵",
   "keyboard_shortcuts.legend": "顯示這個說明",
+  "keyboard_shortcuts.load_more": "將焦點移至「讀取更多」按鈕",
   "keyboard_shortcuts.local": "開啟本站時間軸",
   "keyboard_shortcuts.mention": "提及作者",
   "keyboard_shortcuts.muted": "開啟靜音名單",
@@ -560,7 +554,6 @@
   "privacy.public.long": "Mastodon 內外的任何人",
   "privacy.public.short": "公共",
   "privacy.unlisted.additional": "這與公開完全相同，但是你的帖文不會顯示在即時動態、標籤、探索和 Mastodon 的搜尋結果中，即使你的帳戶啟用了相關設定也好。",
-  "privacy.unlisted.long": "較少用演算法宣傳",
   "privacy.unlisted.short": "半公開",
   "privacy_policy.last_updated": "最後更新 {date}",
   "privacy_policy.title": "私隱政策",
@@ -687,7 +680,6 @@
   "status.pin": "置頂到資料頁",
   "status.read_more": "閱讀更多",
   "status.reblog": "轉推",
-  "status.reblog_private": "轉推到原讀者",
   "status.reblogged_by": "{name} 轉推",
   "status.reblogs": "{count, plural, one {則轉推} other {則轉推}}",
   "status.reblogs.empty": "還未有人轉推。有的話會顯示在這裡。",
@@ -744,5 +736,6 @@
   "video.pause": "暫停",
   "video.play": "播放",
   "video.volume_down": "調低音量",
-  "video.volume_up": "調高音量"
+  "video.volume_up": "調高音量",
+  "visibility_modal.save": "儲存"
 }
diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json
index 8703026268c..20f94573d7c 100644
--- a/app/javascript/mastodon/locales/zh-TW.json
+++ b/app/javascript/mastodon/locales/zh-TW.json
@@ -28,6 +28,7 @@
   "account.disable_notifications": "取消來自 @{name} 嘟文的通知",
   "account.domain_blocking": "封鎖中網域",
   "account.edit_profile": "編輯個人檔案",
+  "account.edit_profile_short": "編輯",
   "account.enable_notifications": "當 @{name} 嘟文時通知我",
   "account.endorse": "於個人檔案推薦對方",
   "account.familiar_followers_many": "被 {name1}、{name2}、及 {othersCount, plural, other {其他您認識的 # 人}} 跟隨",
@@ -40,6 +41,11 @@
   "account.featured_tags.last_status_never": "沒有嘟文",
   "account.follow": "跟隨",
   "account.follow_back": "跟隨回去",
+  "account.follow_back_short": "跟隨回去",
+  "account.follow_request": "跟隨",
+  "account.follow_request_cancel": "取消跟隨請求",
+  "account.follow_request_cancel_short": "取消",
+  "account.follow_request_short": "跟隨請求",
   "account.followers": "跟隨者",
   "account.followers.empty": "尚未有人跟隨這位使用者。",
   "account.followers_counter": "被 {count, plural, other {{count} 人}}跟隨",
@@ -70,7 +76,6 @@
   "account.posts_with_replies": "嘟文與回覆",
   "account.remove_from_followers": "自跟隨者中移除 {name}",
   "account.report": "檢舉 @{name}",
-  "account.requested": "正在等候審核。按一下以取消跟隨請求",
   "account.requested_follow": "{name} 要求跟隨您",
   "account.requests_to_follow_you": "要求跟隨您",
   "account.share": "分享 @{name} 的個人檔案",
@@ -239,15 +244,25 @@
   "confirmations.missing_alt_text.secondary": "仍要發嘟",
   "confirmations.missing_alt_text.title": "是否新增說明文字？",
   "confirmations.mute.confirm": "靜音",
+  "confirmations.quiet_post_quote_info.dismiss": "不要再提醒我",
+  "confirmations.quiet_post_quote_info.got_it": "了解",
+  "confirmations.quiet_post_quote_info.message": "當引用不於公開時間軸顯示之嘟文時，您的嘟文將自熱門時間軸隱藏。",
+  "confirmations.quiet_post_quote_info.title": "引用不於公開時間軸顯示之嘟文",
   "confirmations.redraft.confirm": "刪除並重新編輯",
   "confirmations.redraft.message": "您確定要刪除這則嘟文並重新編輯嗎？您將失去這則嘟文之轉嘟及最愛，且對此嘟文之回覆會變成獨立的嘟文。",
   "confirmations.redraft.title": "是否刪除並重新編輯該嘟文？",
   "confirmations.remove_from_followers.confirm": "移除跟隨者",
   "confirmations.remove_from_followers.message": "{name} 將會停止跟隨您。您確定要繼續嗎？",
   "confirmations.remove_from_followers.title": "是否移除該跟隨者？",
+  "confirmations.revoke_quote.confirm": "移除嘟文",
+  "confirmations.revoke_quote.message": "此動作無法復原。",
+  "confirmations.revoke_quote.title": "您是否確定移除嘟文？",
+  "confirmations.unblock.confirm": "解除封鎖",
+  "confirmations.unblock.title": "解除封鎖 {name}？",
   "confirmations.unfollow.confirm": "取消跟隨",
-  "confirmations.unfollow.message": "您確定要取消跟隨 {name} 嗎？",
-  "confirmations.unfollow.title": "是否取消跟隨該使用者？",
+  "confirmations.unfollow.title": "取消跟隨 {name}？",
+  "confirmations.withdraw_request.confirm": "收回跟隨請求",
+  "confirmations.withdraw_request.title": "收回對 {name} 之跟隨請求？",
   "content_warning.hide": "隱藏嘟文",
   "content_warning.show": "仍要顯示",
   "content_warning.show_more": "顯示更多",
@@ -289,6 +304,7 @@
   "domain_pill.your_handle": "您的帳號：",
   "domain_pill.your_server": "您數位世界的家，您所有的嘟文都在這裡。不喜歡這台伺服器嗎？您能隨時搬家至其他伺服器並且仍保有您的跟隨者。",
   "domain_pill.your_username": "您於您的伺服器中獨一無二的識別。於不同的伺服器上可能找到具有相同帳號的使用者。",
+  "dropdown.empty": "選項",
   "embed.instructions": "若您欲於您的網站嵌入此嘟文，請複製以下程式碼。",
   "embed.preview": "它將顯示成這樣：",
   "emoji_button.activity": "活動",
@@ -375,7 +391,7 @@
   "follow_suggestions.dismiss": "不再顯示",
   "follow_suggestions.featured_longer": "{domain} 團隊精選",
   "follow_suggestions.friends_of_friends_longer": "受您跟隨之使用者愛戴的風雲人物",
-  "follow_suggestions.hints.featured": "這個個人檔案是 {domain} 管理團隊精心挑選。",
+  "follow_suggestions.hints.featured": "這個個人檔案是 {domain} 管理團隊精心挑選的。",
   "follow_suggestions.hints.friends_of_friends": "這個個人檔案於您跟隨的帳號中很受歡迎。",
   "follow_suggestions.hints.most_followed": "這個個人檔案是 {domain} 中最受歡迎的帳號之一。",
   "follow_suggestions.hints.most_interactions": "這個個人檔案最近於 {domain} 受到非常多關注。",
@@ -424,8 +440,6 @@
   "hints.profiles.see_more_followers": "於 {domain} 檢視更多跟隨者",
   "hints.profiles.see_more_follows": "於 {domain} 檢視更多正在跟隨",
   "hints.profiles.see_more_posts": "於 {domain} 檢視更多嘟文",
-  "hints.threads.replies_may_be_missing": "來自其他站點之回覆或有缺失。",
-  "hints.threads.see_more": "於 {domain} 檢視更多回覆",
   "home.column_settings.show_quotes": "顯示引用嘟文",
   "home.column_settings.show_reblogs": "顯示轉嘟",
   "home.column_settings.show_replies": "顯示回覆",
@@ -447,20 +461,12 @@
   "ignore_notifications_modal.private_mentions_title": "忽略來自不請自來私訊之推播通知？",
   "info_button.label": "幫助",
   "info_button.what_is_alt_text": "<h1>何謂 ALT 說明文字？</h1> <p>ALT 說明文字為視覺障礙者、低網路頻寬或尋求額外上下文語境的人們提供圖片描述。</p> <p>您可以透過撰寫清晰、簡潔及客觀的說明文字以替所有人改善無障礙特性與協助理解。</p> <ul> <li>掌握幾個重要元素</li> <li>替圖片提供文字摘要</li> <li>使用常規行文結構</li> <li>避免冗贅資訊</li> <li>聚焦於趨勢與複雜視覺中之關鍵（如圖表或地圖）</li> </ul>",
-  "interaction_modal.action.favourite": "若欲繼續，您必須自您的帳號加入最愛。",
-  "interaction_modal.action.follow": "若欲繼續，您必須自您的帳號跟隨。",
-  "interaction_modal.action.reblog": "若欲繼續，您必須自您的帳號轉嘟。",
-  "interaction_modal.action.reply": "若欲繼續，您必須自您的帳號回覆。",
-  "interaction_modal.action.vote": "若欲繼續，您必須自您的帳號投票。",
+  "interaction_modal.action": "若欲與 {name} 之嘟文互動，您必須登入您帳號所註冊之 Mastodon 伺服器。",
   "interaction_modal.go": "Go!",
   "interaction_modal.no_account_yet": "仍尚未有帳號嗎？",
   "interaction_modal.on_another_server": "於不同伺服器",
   "interaction_modal.on_this_server": "於此伺服器",
-  "interaction_modal.title.favourite": "將 {name} 之嘟文加入最愛",
-  "interaction_modal.title.follow": "跟隨 {name}",
-  "interaction_modal.title.reblog": "轉嘟 {name} 的嘟文",
-  "interaction_modal.title.reply": "回覆 {name} 的嘟文",
-  "interaction_modal.title.vote": "參與 {name} 之投票",
+  "interaction_modal.title": "請先登入以繼續",
   "interaction_modal.username_prompt": "例如 {example}",
   "intervals.full.days": "{number, plural, other {# 天}}",
   "intervals.full.hours": "{number, plural, other {# 小時}}",
@@ -481,6 +487,7 @@
   "keyboard_shortcuts.home": "開啟首頁時間軸",
   "keyboard_shortcuts.hotkey": "快速鍵",
   "keyboard_shortcuts.legend": "顯示此說明選單",
+  "keyboard_shortcuts.load_more": "將焦點移至「讀取更多」按鈕",
   "keyboard_shortcuts.local": "開啟本站時間軸",
   "keyboard_shortcuts.mention": "提及作者",
   "keyboard_shortcuts.muted": "開啟靜音使用者列表",
@@ -489,6 +496,7 @@
   "keyboard_shortcuts.open_media": "開啟媒體",
   "keyboard_shortcuts.pinned": "開啟釘選的嘟文列表",
   "keyboard_shortcuts.profile": "開啟作者的個人檔案頁面",
+  "keyboard_shortcuts.quote": "引用嘟文",
   "keyboard_shortcuts.reply": "回應嘟文",
   "keyboard_shortcuts.requests": "開啟跟隨請求列表",
   "keyboard_shortcuts.search": "將游標移至搜尋框",
@@ -500,6 +508,8 @@
   "keyboard_shortcuts.translate": "翻譯嘟文",
   "keyboard_shortcuts.unfocus": "跳離文字撰寫區塊或搜尋框",
   "keyboard_shortcuts.up": "向上移動",
+  "learn_more_link.got_it": "了解",
+  "learn_more_link.learn_more": "了解更多",
   "lightbox.close": "關閉",
   "lightbox.next": "下一步",
   "lightbox.previous": "上一步",
@@ -560,7 +570,7 @@
   "navigation_bar.favourites": "最愛",
   "navigation_bar.filters": "已靜音的關鍵字",
   "navigation_bar.follow_requests": "跟隨請求",
-  "navigation_bar.followed_tags": "已跟隨主題標籤",
+  "navigation_bar.followed_tags": "主題標籤",
   "navigation_bar.follows_and_followers": "跟隨中與跟隨者",
   "navigation_bar.import_export": "匯入及匯出",
   "navigation_bar.lists": "列表",
@@ -600,6 +610,7 @@
   "notification.label.mention": "提及",
   "notification.label.private_mention": "私訊",
   "notification.label.private_reply": "私訊回嘟",
+  "notification.label.quote": "{name} 已引用您的嘟文",
   "notification.label.reply": "回嘟",
   "notification.mention": "提及",
   "notification.mentioned_you": "{name} 已提及您",
@@ -614,6 +625,7 @@
   "notification.moderation_warning.action_suspend": "您的帳號已被停權。",
   "notification.own_poll": "您的投票已結束",
   "notification.poll": "您曾投過的投票已經結束",
+  "notification.quoted_update": "{name} 已編輯一則您曾引用之嘟文",
   "notification.reblog": "{name} 已轉嘟您的嘟文",
   "notification.reblog.name_and_others_with_link": "{name} 與<a>{count, plural, other {其他 # 個人}}</a>已轉嘟您的嘟文",
   "notification.relationships_severance_event": "與 {name} 失去連結",
@@ -657,6 +669,7 @@
   "notifications.column_settings.mention": "提及：",
   "notifications.column_settings.poll": "投票結果：",
   "notifications.column_settings.push": "推播通知",
+  "notifications.column_settings.quote": "引用嘟文：",
   "notifications.column_settings.reblog": "轉嘟：",
   "notifications.column_settings.show": "於欄位中顯示",
   "notifications.column_settings.sound": "播放音效",
@@ -732,11 +745,18 @@
   "privacy.private.short": "跟隨者",
   "privacy.public.long": "所有人 (無論在 Mastodon 上與否)",
   "privacy.public.short": "公開",
+  "privacy.quote.anyone": "{visibility}，任何人皆可引用",
+  "privacy.quote.disabled": "{visibility}，停用引用嘟文",
+  "privacy.quote.limited": "{visibility}，受限的引用嘟文",
   "privacy.unlisted.additional": "此與公開嘟文完全相同，但嘟文不會出現於即時內容或主題標籤、探索、及 Mastodon 搜尋中，即使您在帳戶設定中選擇加入。",
-  "privacy.unlisted.long": "悄然無聲",
+  "privacy.unlisted.long": "不顯示於 Mastodon 之搜尋結果、熱門趨勢、及公開時間軸上",
   "privacy.unlisted.short": "不公開",
   "privacy_policy.last_updated": "最後更新：{date}",
   "privacy_policy.title": "隱私權政策",
+  "quote_error.poll": "無法引用投票嘟文。",
+  "quote_error.quote": "一次僅能引用一則嘟文。",
+  "quote_error.unauthorized": "您不被授權允許引用此嘟文。",
+  "quote_error.upload": "無法引用多媒體內容嘟文。",
   "recommended": "推薦設定",
   "refresh": "重新整理",
   "regeneration_indicator.please_stand_by": "請稍候。",
@@ -752,6 +772,9 @@
   "relative_time.minutes": "{number} 分鐘前",
   "relative_time.seconds": "{number} 秒",
   "relative_time.today": "今天",
+  "remove_quote_hint.button_label": "了解",
+  "remove_quote_hint.message": "您能自 {icon} 選單完成此操作。",
+  "remove_quote_hint.title": "是否想要移除您的引用嘟文？",
   "reply_indicator.attachments": "{count, plural, other {# 個附加檔案}}",
   "reply_indicator.cancel": "取消",
   "reply_indicator.poll": "投票",
@@ -843,13 +866,23 @@
   "status.admin_account": "開啟 @{name} 的管理介面",
   "status.admin_domain": "開啟 {domain} 的管理介面",
   "status.admin_status": "於管理介面開啟此嘟文",
+  "status.all_disabled": "已停用轉嘟與引用",
   "status.block": "封鎖 @{name}",
   "status.bookmark": "書籤",
   "status.cancel_reblog_private": "取消轉嘟",
+  "status.cannot_quote": "您不被允許引用此嘟文",
   "status.cannot_reblog": "這則嘟文無法被轉嘟",
+  "status.contains_quote": "包含引用嘟文",
+  "status.context.loading": "讀取更多回嘟",
+  "status.context.loading_error": "無法讀取新回嘟",
+  "status.context.loading_success": "已讀取所有回嘟",
+  "status.context.more_replies_found": "已有更多回嘟",
+  "status.context.retry": "再試一次",
+  "status.context.show": "顯示",
   "status.continued_thread": "接續討論串",
   "status.copy": "複製嘟文連結",
   "status.delete": "刪除",
+  "status.delete.success": "已刪除嘟文",
   "status.detailed_status": "詳細的對話內容",
   "status.direct": "私訊 @{name}",
   "status.direct_indicator": "私訊",
@@ -872,27 +905,43 @@
   "status.mute_conversation": "靜音對話",
   "status.open": "展開此嘟文",
   "status.pin": "釘選至個人檔案頁面",
+  "status.quote": "引用",
+  "status.quote.cancel": "取消引用嘟文",
   "status.quote_error.filtered": "由於您的過濾器，該嘟文被隱藏",
-  "status.quote_error.not_found": "這則嘟文無法被顯示。",
-  "status.quote_error.pending_approval": "此嘟文正在等待原作者審核。",
-  "status.quote_error.rejected": "由於原作者不允許引用，此嘟文無法被顯示。",
-  "status.quote_error.removed": "此嘟文已被其作者移除。",
-  "status.quote_error.unauthorized": "由於您未被授權檢視，此嘟文無法被顯示。",
-  "status.quote_post_author": "由 {name} 發嘟",
+  "status.quote_error.limited_account_hint.action": "仍要顯示",
+  "status.quote_error.limited_account_hint.title": "此個人檔案已被 {domain} 的管理員隱藏。",
+  "status.quote_error.not_available": "無法取得該嘟文",
+  "status.quote_error.pending_approval": "嘟文正在發送中",
+  "status.quote_error.pending_approval_popout.body": "您能於 Mastodon 控制是否允許引用您的嘟文。此嘟文正在等待原始作者核准。",
+  "status.quote_error.revoked": "嘟文已被作者刪除",
+  "status.quote_followers_only": "只有我的跟隨者能引用此嘟文",
+  "status.quote_manual_review": "嘟文作者將人工審閱",
+  "status.quote_noun": "引用嘟文",
+  "status.quote_policy_change": "變更可以引用的人",
+  "status.quote_post_author": "已引用 @{name} 之嘟文",
+  "status.quote_private": "無法引用私人嘟文",
+  "status.quotes": "{count, plural, other {# 則引用嘟文}}",
+  "status.quotes.empty": "目前尚無人引用此嘟文。當有人引用時，它將於此顯示。",
+  "status.quotes.local_other_disclaimer": "被作者拒絕之引用嘟文將不被顯示。",
+  "status.quotes.remote_other_disclaimer": "僅有來自 {domain} 之引用嘟文保證將於此顯示。被作者拒絕之引用嘟文將不被顯示。",
   "status.read_more": "閱讀更多",
   "status.reblog": "轉嘟",
-  "status.reblog_private": "依照原嘟可見性轉嘟",
+  "status.reblog_or_quote": "轉嘟或引用",
+  "status.reblog_private": "再次與跟隨者分享",
   "status.reblogged_by": "{name} 已轉嘟",
   "status.reblogs": "{count, plural, other {則轉嘟}}",
-  "status.reblogs.empty": "還沒有人轉嘟過這則嘟文。當有人轉嘟時，它將於此顯示。",
+  "status.reblogs.empty": "還沒有人轉嘟過這則嘟文。當有人轉嘟時，它們將於此顯示。",
   "status.redraft": "刪除並重新編輯",
   "status.remove_bookmark": "自書籤中移除",
   "status.remove_favourite": "自最愛中移除",
+  "status.remove_quote": "刪除",
   "status.replied_in_thread": "於討論串中回覆",
   "status.replied_to": "回覆 {name}",
   "status.reply": "回覆",
   "status.replyAll": "回覆討論串",
   "status.report": "檢舉 @{name}",
+  "status.request_quote": "要求引用嘟文",
+  "status.revoke_quote": "將我的嘟文自 @{name} 之嘟文中移除",
   "status.sensitive_warning": "敏感內容",
   "status.share": "分享",
   "status.show_less_all": "隱藏所有內容警告與額外標籤",
@@ -930,6 +979,7 @@
   "upload_button.label": "上傳圖片、影片、或者音訊檔案",
   "upload_error.limit": "已達到檔案上傳限制。",
   "upload_error.poll": "不允許於投票時上傳檔案。",
+  "upload_error.quote": "引用嘟文無法上傳檔案。",
   "upload_form.drag_and_drop.instructions": "請按空白鍵或 Enter 鍵取多媒體附加檔案。使用方向鍵移動多媒體附加檔案。按下空白鍵或 Enter 鍵於新位置放置多媒體附加檔案，或按下 ESC 鍵取消。",
   "upload_form.drag_and_drop.on_drag_cancel": "移動已取消。多媒體附加檔案 {item} 已被放置。",
   "upload_form.drag_and_drop.on_drag_end": "多媒體附加檔案 {item} 已被放置。",
@@ -952,5 +1002,19 @@
   "video.skip_forward": "下一部",
   "video.unmute": "取消靜音",
   "video.volume_down": "降低音量",
-  "video.volume_up": "提高音量"
+  "video.volume_up": "提高音量",
+  "visibility_modal.button_title": "設定可見性",
+  "visibility_modal.header": "可見性與互動",
+  "visibility_modal.helper.direct_quoting": "Mastodon 上發佈之私人提及嘟文無法被其他使用者引用。",
+  "visibility_modal.helper.privacy_editing": "嘟文發布後無法變更可見性。",
+  "visibility_modal.helper.privacy_private_self_quote": "自我引用之私嘟無法設為公開可見。",
+  "visibility_modal.helper.private_quoting": "Mastodon 上發佈之僅限跟隨者嘟文無法被其他使用者引用。",
+  "visibility_modal.helper.unlisted_quoting": "當其他人引用您時，他們的嘟文也會自熱門時間軸隱藏。",
+  "visibility_modal.instructions": "控制誰能與此嘟文互動。您亦能藉由<link>偏好設定 > 嘟文預設值</link>此設定套用至所有未來嘟文。",
+  "visibility_modal.privacy_label": "可見性",
+  "visibility_modal.quote_followers": "僅限跟隨者",
+  "visibility_modal.quote_label": "誰能引用此嘟文",
+  "visibility_modal.quote_nobody": "僅有我",
+  "visibility_modal.quote_public": "所有人",
+  "visibility_modal.save": "儲存"
 }
diff --git a/app/javascript/mastodon/main.tsx b/app/javascript/mastodon/main.tsx
index 70e6391beee..456cc21c318 100644
--- a/app/javascript/mastodon/main.tsx
+++ b/app/javascript/mastodon/main.tsx
@@ -2,14 +2,18 @@ import { createRoot } from 'react-dom/client';
 
 import { Globals } from '@react-spring/web';
 
+import * as perf from '@/mastodon/utils/performance';
 import { setupBrowserNotifications } from 'mastodon/actions/notifications';
 import Mastodon from 'mastodon/containers/mastodon';
 import { me, reduceMotion } from 'mastodon/initial_state';
-import * as perf from 'mastodon/performance';
 import ready from 'mastodon/ready';
 import { store } from 'mastodon/store';
 
-import { isProduction, isDevelopment } from './utils/environment';
+import {
+  isProduction,
+  isDevelopment,
+  isModernEmojiEnabled,
+} from './utils/environment';
 
 function main() {
   perf.start('main()');
@@ -29,6 +33,11 @@ function main() {
       });
     }
 
+    if (isModernEmojiEnabled()) {
+      const { initializeEmoji } = await import('@/mastodon/features/emoji');
+      initializeEmoji();
+    }
+
     const root = createRoot(mountNode);
     root.render(<Mastodon {...props} />);
     store.dispatch(setupBrowserNotifications());
diff --git a/app/javascript/mastodon/models/account.ts b/app/javascript/mastodon/models/account.ts
index 2666059b40c..3b0c41be818 100644
--- a/app/javascript/mastodon/models/account.ts
+++ b/app/javascript/mastodon/models/account.ts
@@ -45,7 +45,7 @@ const AccountRoleFactory = ImmutableRecord<AccountRoleShape>({
 // Account
 export interface AccountShape
   extends Required<
-    Omit<ApiAccountJSON, 'emojis' | 'fields' | 'roles' | 'moved'>
+    Omit<ApiAccountJSON, 'emojis' | 'fields' | 'roles' | 'moved' | 'url'>
   > {
   emojis: ImmutableList<CustomEmoji>;
   fields: ImmutableList<AccountField>;
@@ -55,6 +55,7 @@ export interface AccountShape
   note_plain: string | null;
   hidden: boolean;
   moved: string | null;
+  url: string;
 }
 
 export type Account = RecordOf<AccountShape>;
@@ -126,6 +127,9 @@ export function createAccountFromServerJSON(serverJSON: ApiAccountJSON) {
       ? accountJSON.username
       : accountJSON.display_name;
 
+  const accountNote =
+    accountJSON.note && accountJSON.note !== '<p></p>' ? accountJSON.note : '';
+
   return AccountFactory({
     ...accountJSON,
     moved: moved?.id,
@@ -142,11 +146,11 @@ export function createAccountFromServerJSON(serverJSON: ApiAccountJSON) {
       escapeTextContentForBrowser(displayName),
       emojiMap,
     ),
-    note_emojified: emojify(accountJSON.note, emojiMap),
-    note_plain: unescapeHTML(accountJSON.note),
+    note_emojified: emojify(accountNote, emojiMap),
+    note_plain: unescapeHTML(accountNote),
     url:
-      accountJSON.url.startsWith('http://') ||
-      accountJSON.url.startsWith('https://')
+      accountJSON.url?.startsWith('http://') ||
+      accountJSON.url?.startsWith('https://')
         ? accountJSON.url
         : accountJSON.uri,
   });
diff --git a/app/javascript/mastodon/models/dropdown_menu.ts b/app/javascript/mastodon/models/dropdown_menu.ts
index c02f2050238..01da286936a 100644
--- a/app/javascript/mastodon/models/dropdown_menu.ts
+++ b/app/javascript/mastodon/models/dropdown_menu.ts
@@ -1,10 +1,18 @@
+import type { KeyboardEvent, MouseEvent, TouchEvent } from 'react';
+
+import type { IconProp } from '../components/icon';
+
 interface BaseMenuItem {
   text: string;
+  description?: string;
+  icon?: IconProp;
+  highlighted?: boolean;
+  disabled?: boolean;
   dangerous?: boolean;
 }
 
 export interface ActionMenuItem extends BaseMenuItem {
-  action: () => void;
+  action: (event: MouseEvent | KeyboardEvent | TouchEvent) => void;
 }
 
 export interface LinkMenuItem extends BaseMenuItem {
diff --git a/app/javascript/mastodon/models/notification_group.ts b/app/javascript/mastodon/models/notification_group.ts
index d98e755aa2c..7b88f904298 100644
--- a/app/javascript/mastodon/models/notification_group.ts
+++ b/app/javascript/mastodon/models/notification_group.ts
@@ -36,8 +36,11 @@ export type NotificationGroupFavourite =
 export type NotificationGroupReblog = BaseNotificationWithStatus<'reblog'>;
 export type NotificationGroupStatus = BaseNotificationWithStatus<'status'>;
 export type NotificationGroupMention = BaseNotificationWithStatus<'mention'>;
+export type NotificationGroupQuote = BaseNotificationWithStatus<'quote'>;
 export type NotificationGroupPoll = BaseNotificationWithStatus<'poll'>;
 export type NotificationGroupUpdate = BaseNotificationWithStatus<'update'>;
+export type NotificationGroupQuotedUpdate =
+  BaseNotificationWithStatus<'quoted_update'>;
 export type NotificationGroupFollow = BaseNotification<'follow'>;
 export type NotificationGroupFollowRequest = BaseNotification<'follow_request'>;
 export type NotificationGroupAdminSignUp = BaseNotification<'admin.sign_up'>;
@@ -87,8 +90,10 @@ export type NotificationGroup =
   | NotificationGroupReblog
   | NotificationGroupStatus
   | NotificationGroupMention
+  | NotificationGroupQuote
   | NotificationGroupPoll
   | NotificationGroupUpdate
+  | NotificationGroupQuotedUpdate
   | NotificationGroupFollow
   | NotificationGroupFollowRequest
   | NotificationGroupModerationWarning
@@ -137,8 +142,10 @@ export function createNotificationGroupFromJSON(
     case 'reblog':
     case 'status':
     case 'mention':
+    case 'quote':
     case 'poll':
-    case 'update': {
+    case 'update':
+    case 'quoted_update': {
       const { status_id: statusId, ...groupWithoutStatus } = group;
       return {
         statusId: statusId ?? undefined,
@@ -209,8 +216,10 @@ export function createNotificationGroupFromNotificationJSON(
     case 'reblog':
     case 'status':
     case 'mention':
+    case 'quote':
     case 'poll':
     case 'update':
+    case 'quoted_update':
       return {
         ...group,
         type: notification.type,
diff --git a/app/javascript/mastodon/polyfills/index.ts b/app/javascript/mastodon/polyfills/index.ts
index c001421c363..1abfe0a935e 100644
--- a/app/javascript/mastodon/polyfills/index.ts
+++ b/app/javascript/mastodon/polyfills/index.ts
@@ -19,6 +19,17 @@ export function loadPolyfills() {
   return Promise.all([
     loadIntlPolyfills(),
     // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition -- those properties might not exist in old browsers, even if they are always here in types
-    needsExtraPolyfills && importExtraPolyfills(),
+    needsExtraPolyfills ? importExtraPolyfills() : Promise.resolve(),
+    loadEmojiPolyfills(),
   ]);
 }
+
+// In the case of no /v support, rely on the emojibase data.
+async function loadEmojiPolyfills() {
+  if (!('unicodeSets' in RegExp.prototype)) {
+    emojiRegexPolyfill = (await import('emojibase-regex/emoji')).default;
+  }
+}
+
+// Null unless polyfill is needed.
+export let emojiRegexPolyfill: RegExp | null = null;
diff --git a/app/javascript/mastodon/reducers/compose.js b/app/javascript/mastodon/reducers/compose.js
index 6b799a46e80..f27c3bb06bf 100644
--- a/app/javascript/mastodon/reducers/compose.js
+++ b/app/javascript/mastodon/reducers/compose.js
@@ -1,6 +1,11 @@
 import { Map as ImmutableMap, List as ImmutableList, OrderedSet as ImmutableOrderedSet, fromJS } from 'immutable';
 
-import { changeUploadCompose } from 'mastodon/actions/compose_typed';
+import {
+  changeUploadCompose,
+  quoteCompose,
+  quoteComposeCancel,
+  setComposeQuotePolicy,
+} from 'mastodon/actions/compose_typed';
 import { timelineDelete } from 'mastodon/actions/timelines_typed';
 
 import {
@@ -83,6 +88,11 @@ const initialState = ImmutableMap({
   resetFileKey: Math.floor((Math.random() * 0x10000)),
   idempotencyKey: null,
   tagHistory: ImmutableList(),
+
+  // Quotes
+  quoted_status_id: null,
+  quote_policy: 'public',
+  default_quote_policy: 'public', // Set in hydration.
 });
 
 const initialPoll = ImmutableMap({
@@ -117,6 +127,8 @@ function clearAll(state) {
     map.set('progress', 0);
     map.set('poll', null);
     map.set('idempotencyKey', uuid());
+    map.set('quoted_status_id', null);
+    map.set('quote_policy', state.get('default_quote_policy'));
   });
 }
 
@@ -317,6 +329,17 @@ export const composeReducer = (state = initialState, action) => {
     return state.set('is_changing_upload', true);
   } else if (changeUploadCompose.rejected.match(action)) {
     return state.set('is_changing_upload', false);
+  } else if (quoteCompose.match(action)) {
+    const status = action.payload;
+    return state
+      .set('quoted_status_id', status.get('id'))
+      .set('spoiler', status.get('sensitive'))
+      .set('spoiler_text', status.get('spoiler_text'))
+      .update('privacy', (visibility) => ['public', 'unlisted'].includes(visibility) && status.get('visibility') === 'private' ? 'private' : visibility);
+  } else if (quoteComposeCancel.match(action)) {
+    return state.set('quoted_status_id', null);
+  } else if (setComposeQuotePolicy.match(action)) {
+    return state.set('quote_policy', action.payload);
   }
 
   switch(action.type) {
@@ -491,6 +514,9 @@ export const composeReducer = (state = initialState, action) => {
       map.set('sensitive', action.status.get('sensitive'));
       map.set('language', action.status.get('language'));
       map.set('id', null);
+      map.set('quoted_status_id', action.status.getIn(['quote', 'quoted_status']));
+      // Mastodon-authored posts can be expected to have at most one automatic approval policy
+      map.set('quote_policy', action.status.getIn(['quote_approval', 'automatic', 0]) || 'nobody');
 
       if (action.status.get('spoiler_text').length > 0) {
         map.set('spoiler', true);
@@ -501,8 +527,13 @@ export const composeReducer = (state = initialState, action) => {
       }
 
       if (action.status.get('poll')) {
+        let options = ImmutableList(action.status.get('poll').options.map(x => x.title));
+        if (options.size < action.maxOptions) {
+          options = options.push('');
+        }
+
         map.set('poll', ImmutableMap({
-          options: ImmutableList(action.status.get('poll').options.map(x => x.title)),
+          options: options,
           multiple: action.status.get('poll').multiple,
           expires_in: expiresInFromExpiresAt(action.status.get('poll').expires_at),
         }));
@@ -520,6 +551,9 @@ export const composeReducer = (state = initialState, action) => {
       map.set('idempotencyKey', uuid());
       map.set('sensitive', action.status.get('sensitive'));
       map.set('language', action.status.get('language'));
+      map.set('quoted_status_id', action.status.getIn(['quote', 'quoted_status']));
+      // Mastodon-authored posts can be expected to have at most one automatic approval policy
+      map.set('quote_policy', action.status.getIn(['quote_approval', 'automatic', 0]) || 'nobody');
 
       if (action.spoiler_text.length > 0) {
         map.set('spoiler', true);
@@ -530,8 +564,13 @@ export const composeReducer = (state = initialState, action) => {
       }
 
       if (action.status.get('poll')) {
+        let options = ImmutableList(action.status.get('poll').options.map(x => x.title));
+        if (options.size < action.maxOptions) {
+          options = options.push('');
+        }
+
         map.set('poll', ImmutableMap({
-          options: ImmutableList(action.status.get('poll').options.map(x => x.title)),
+          options: options,
           multiple: action.status.get('poll').multiple,
           expires_in: expiresInFromExpiresAt(action.status.get('poll').expires_at),
         }));
diff --git a/app/javascript/mastodon/reducers/contexts.ts b/app/javascript/mastodon/reducers/contexts.ts
index 7ecc6e3b29f..0a31c498284 100644
--- a/app/javascript/mastodon/reducers/contexts.ts
+++ b/app/javascript/mastodon/reducers/contexts.ts
@@ -4,6 +4,7 @@ import type { Draft, UnknownAction } from '@reduxjs/toolkit';
 import type { List as ImmutableList } from 'immutable';
 
 import { timelineDelete } from 'mastodon/actions/timelines_typed';
+import type { AsyncRefreshHeader } from 'mastodon/api';
 import type { ApiRelationshipJSON } from 'mastodon/api_types/relationships';
 import type {
   ApiStatusJSON,
@@ -12,7 +13,12 @@ import type {
 import type { Status } from 'mastodon/models/status';
 
 import { blockAccountSuccess, muteAccountSuccess } from '../actions/accounts';
-import { fetchContext } from '../actions/statuses';
+import {
+  fetchContext,
+  completeContextRefresh,
+  showPendingReplies,
+  clearPendingReplies,
+} from '../actions/statuses';
 import { TIMELINE_UPDATE } from '../actions/timelines';
 import { compareId } from '../compare_id';
 
@@ -25,11 +31,34 @@ interface TimelineUpdateAction extends UnknownAction {
 interface State {
   inReplyTos: Record<string, string>;
   replies: Record<string, string[]>;
+  pendingReplies: Record<
+    string,
+    Pick<ApiStatusJSON, 'id' | 'in_reply_to_id'>[]
+  >;
+  refreshing: Record<string, AsyncRefreshHeader>;
 }
 
 const initialState: State = {
   inReplyTos: {},
   replies: {},
+  pendingReplies: {},
+  refreshing: {},
+};
+
+const addReply = (
+  state: Draft<State>,
+  { id, in_reply_to_id }: Pick<ApiStatusJSON, 'id' | 'in_reply_to_id'>,
+) => {
+  if (!in_reply_to_id) {
+    return;
+  }
+
+  if (!state.inReplyTos[id]) {
+    const siblings = (state.replies[in_reply_to_id] ??= []);
+    const index = siblings.findIndex((sibling) => compareId(sibling, id) < 0);
+    siblings.splice(index + 1, 0, id);
+    state.inReplyTos[id] = in_reply_to_id;
+  }
 };
 
 const normalizeContext = (
@@ -37,38 +66,49 @@ const normalizeContext = (
   id: string,
   { ancestors, descendants }: ApiContextJSON,
 ): void => {
-  const addReply = ({
-    id,
-    in_reply_to_id,
-  }: {
-    id: string;
-    in_reply_to_id?: string;
-  }) => {
-    if (!in_reply_to_id) {
-      return;
-    }
-
-    if (!state.inReplyTos[id]) {
-      const siblings = (state.replies[in_reply_to_id] ??= []);
-      const index = siblings.findIndex((sibling) => compareId(sibling, id) < 0);
-      siblings.splice(index + 1, 0, id);
-      state.inReplyTos[id] = in_reply_to_id;
-    }
-  };
+  ancestors.forEach((item) => {
+    addReply(state, item);
+  });
 
   // We know in_reply_to_id of statuses but `id` itself.
   // So we assume that the status of the id replies to last ancestors.
-
-  ancestors.forEach(addReply);
-
   if (ancestors[0]) {
-    addReply({
+    addReply(state, {
       id,
       in_reply_to_id: ancestors[ancestors.length - 1]?.id,
     });
   }
 
-  descendants.forEach(addReply);
+  descendants.forEach((item) => {
+    addReply(state, item);
+  });
+};
+
+const applyPrefetchedReplies = (state: Draft<State>, statusId: string) => {
+  const pendingReplies = state.pendingReplies[statusId];
+  if (pendingReplies?.length) {
+    pendingReplies.forEach((item) => {
+      addReply(state, item);
+    });
+    delete state.pendingReplies[statusId];
+  }
+};
+
+const storePrefetchedReplies = (
+  state: Draft<State>,
+  statusId: string,
+  { descendants }: ApiContextJSON,
+): void => {
+  descendants.forEach(({ id, in_reply_to_id }) => {
+    if (!in_reply_to_id) {
+      return;
+    }
+    const isNewReply = !state.replies[in_reply_to_id]?.includes(id);
+    if (isNewReply) {
+      const pendingReplies = (state.pendingReplies[statusId] ??= []);
+      pendingReplies.push({ id, in_reply_to_id });
+    }
+  });
 };
 
 const deleteFromContexts = (state: Draft<State>, ids: string[]): void => {
@@ -126,7 +166,32 @@ const updateContext = (state: Draft<State>, status: ApiStatusJSON): void => {
 export const contextsReducer = createReducer(initialState, (builder) => {
   builder
     .addCase(fetchContext.fulfilled, (state, action) => {
-      normalizeContext(state, action.meta.arg.statusId, action.payload.context);
+      if (action.payload.prefetchOnly) {
+        storePrefetchedReplies(
+          state,
+          action.meta.arg.statusId,
+          action.payload.context,
+        );
+      } else {
+        normalizeContext(
+          state,
+          action.meta.arg.statusId,
+          action.payload.context,
+        );
+
+        if (action.payload.refresh) {
+          state.refreshing[action.meta.arg.statusId] = action.payload.refresh;
+        }
+      }
+    })
+    .addCase(showPendingReplies, (state, action) => {
+      applyPrefetchedReplies(state, action.payload.statusId);
+    })
+    .addCase(clearPendingReplies, (state, action) => {
+      delete state.pendingReplies[action.payload.statusId];
+    })
+    .addCase(completeContextRefresh, (state, action) => {
+      delete state.refreshing[action.payload.statusId];
     })
     .addCase(blockAccountSuccess, (state, action) => {
       filterContexts(
diff --git a/app/javascript/mastodon/reducers/index.ts b/app/javascript/mastodon/reducers/index.ts
index cbf22b31184..19ecbbfff40 100644
--- a/app/javascript/mastodon/reducers/index.ts
+++ b/app/javascript/mastodon/reducers/index.ts
@@ -101,9 +101,9 @@ const RootStateRecord = ImmutableRecord(initialRootState, 'RootState');
 export const rootReducer = combineReducers(reducers, RootStateRecord);
 
 export function reducerWithInitialState(
-  stateOverrides: Record<string, unknown> = {},
+  ...stateOverrides: Record<string, unknown>[]
 ) {
-  const initialStateRecord = mergeDeep(initialRootState, stateOverrides);
+  const initialStateRecord = mergeDeep(initialRootState, ...stateOverrides);
   const PatchedRootStateRecord = ImmutableRecord(
     initialStateRecord,
     'RootState',
diff --git a/app/javascript/mastodon/reducers/modal.ts b/app/javascript/mastodon/reducers/modal.ts
index e287626ff2f..dfdff7cf037 100644
--- a/app/javascript/mastodon/reducers/modal.ts
+++ b/app/javascript/mastodon/reducers/modal.ts
@@ -41,7 +41,7 @@ const popModal = (
     modalType === state.get('stack').get(0)?.get('modalType')
   ) {
     return state
-      .set('ignoreFocus', !!ignoreFocus)
+      .set('ignoreFocus', ignoreFocus)
       .update('stack', (stack) => stack.shift());
   } else {
     return state;
diff --git a/app/javascript/mastodon/reducers/search.ts b/app/javascript/mastodon/reducers/search.ts
index 3f6b96fa072..c8229902442 100644
--- a/app/javascript/mastodon/reducers/search.ts
+++ b/app/javascript/mastodon/reducers/search.ts
@@ -62,6 +62,9 @@ export const searchReducer = createReducer(initialState, (builder) => {
     (state, action) => {
       state.type = action.meta.arg.type;
       state.loading = true;
+      if (action.type === submitSearch.pending.type) {
+        state.results = undefined;
+      }
     },
   );
 
diff --git a/app/javascript/mastodon/reducers/settings.js b/app/javascript/mastodon/reducers/settings.js
index 9e2ee5f55ab..775996a48c1 100644
--- a/app/javascript/mastodon/reducers/settings.js
+++ b/app/javascript/mastodon/reducers/settings.js
@@ -36,6 +36,7 @@ const initialState = ImmutableMap({
       follow_request: false,
       favourite: false,
       reblog: false,
+      quote: false,
       mention: false,
       poll: false,
       status: false,
@@ -59,6 +60,7 @@ const initialState = ImmutableMap({
       follow_request: false,
       favourite: true,
       reblog: true,
+      quote: true,
       mention: true,
       poll: true,
       status: true,
@@ -72,6 +74,7 @@ const initialState = ImmutableMap({
       follow_request: false,
       favourite: true,
       reblog: true,
+      quote: true,
       mention: true,
       poll: true,
       status: true,
@@ -114,6 +117,8 @@ const initialState = ImmutableMap({
     'explore/links': false,
     'explore/statuses': false,
     'explore/tags': false,
+    'notifications/remove_quote_hint': false,
+    'quote/quiet_post_hint': false,
   }),
 });
 
diff --git a/app/javascript/mastodon/reducers/status_lists.js b/app/javascript/mastodon/reducers/status_lists.js
index c9d39130ee3..447dde6ecb4 100644
--- a/app/javascript/mastodon/reducers/status_lists.js
+++ b/app/javascript/mastodon/reducers/status_lists.js
@@ -28,6 +28,9 @@ import {
   PIN_SUCCESS,
   UNPIN_SUCCESS,
 } from '../actions/interactions';
+import {
+  fetchQuotes
+} from '../actions/interactions_typed';
 import {
   PINNED_STATUSES_FETCH_SUCCESS,
 } from '../actions/pin_statuses';
@@ -40,8 +43,6 @@ import {
   TRENDS_STATUSES_EXPAND_FAIL,
 } from '../actions/trends';
 
-
-
 const initialState = ImmutableMap({
   favourites: ImmutableMap({
     next: null,
@@ -63,6 +64,12 @@ const initialState = ImmutableMap({
     loaded: false,
     items: ImmutableOrderedSet(),
   }),
+  quotes: ImmutableMap({
+    next: null,
+    loaded: false,
+    items: ImmutableOrderedSet(),
+    statusId: null,
+  }),
 });
 
 const normalizeList = (state, listType, statuses, next) => {
@@ -147,6 +154,13 @@ export default function statusLists(state = initialState, action) {
   case muteAccountSuccess.type:
     return state.updateIn(['trending', 'items'], ImmutableOrderedSet(), list => list.filterNot(statusId => action.payload.statuses.getIn([statusId, 'account']) === action.payload.relationship.id));
   default:
-    return state;
+    if (fetchQuotes.fulfilled.match(action))
+      return normalizeList(state, 'quotes', action.payload.statuses, action.payload.next).set('statusId', action.meta.arg.statusId);
+    else if (fetchQuotes.pending.match(action))
+      return state.setIn(['quotes', 'isLoading'], true).setIn(['quotes', 'statusId'], action.meta.arg.statusId);
+    else if (fetchQuotes.rejected.match(action))
+      return state.setIn(['quotes', 'isLoading', false]).setIn(['quotes', 'statusId'], action.meta.arg.statusId);
+    else
+      return state;
   }
 }
diff --git a/app/javascript/mastodon/reducers/statuses.js b/app/javascript/mastodon/reducers/statuses.js
index 239ab13920e..a334709db0a 100644
--- a/app/javascript/mastodon/reducers/statuses.js
+++ b/app/javascript/mastodon/reducers/statuses.js
@@ -29,6 +29,7 @@ import {
   STATUS_FETCH_REQUEST,
   STATUS_FETCH_FAIL,
 } from '../actions/statuses';
+import { setStatusQuotePolicy } from '../actions/statuses_typed';
 
 const importStatus = (state, status) => state.set(status.id, fromJS(status));
 
@@ -70,11 +71,34 @@ const initialState = ImmutableMap();
 
 /** @type {import('@reduxjs/toolkit').Reducer<typeof initialState>} */
 export default function statuses(state = initialState, action) {
+  if (setStatusQuotePolicy.pending.match(action)) {
+    const status = state.get(action.meta.arg.statusId);
+    if (status) {
+      return state.setIn([action.meta.arg.statusId, 'isSavingQuotePolicy'], true);
+    }
+  } else if (setStatusQuotePolicy.fulfilled.match(action)) {
+    const status = state.get(action.payload.id);
+    if (status) {
+      return state
+        .setIn([action.payload.id, 'quote_approval'], action.payload.quote_approval)
+        .deleteIn([action.payload.id, 'isSavingQuotePolicy']);
+    }
+  } else if (setStatusQuotePolicy.rejected.match(action)) {
+    return state.deleteIn([action.meta.arg.statusId, 'isSavingQuotePolicy']);
+  }
+
   switch(action.type) {
   case STATUS_FETCH_REQUEST:
     return state.setIn([action.id, 'isLoading'], true);
-  case STATUS_FETCH_FAIL:
-    return state.delete(action.id);
+  case STATUS_FETCH_FAIL: {
+    if (action.parentQuotePostId && action.error.status === 404) {
+      return state
+        .delete(action.id)
+        .setIn([action.parentQuotePostId, 'quote', 'state'], 'deleted')
+    } else {
+      return state.delete(action.id);
+    }
+  }
   case STATUS_IMPORT:
     return importStatus(state, action.status);
   case STATUSES_IMPORT:
diff --git a/app/javascript/mastodon/selectors/index.js b/app/javascript/mastodon/selectors/index.js
index 3119b285b22..1e68d49aa69 100644
--- a/app/javascript/mastodon/selectors/index.js
+++ b/app/javascript/mastodon/selectors/index.js
@@ -8,57 +8,98 @@ import { getFilters } from './filters';
 export { makeGetAccount } from "./accounts";
 export { getStatusList } from "./statuses";
 
+const getStatusInputSelectors = [
+  (state, { id }) => state.getIn(['statuses', id]),
+  (state, { id }) => state.getIn(['statuses', state.getIn(['statuses', id, 'reblog'])]),
+  (state, { id }) => state.getIn(['accounts', state.getIn(['statuses', id, 'account'])]),
+  (state, { id }) => state.getIn(['accounts', state.getIn(['statuses', state.getIn(['statuses', id, 'reblog']), 'account'])]),
+  getFilters,
+  (_, { contextType }) => ['detailed', 'bookmarks', 'favourites'].includes(contextType),
+];
+
+function getStatusResultFunction(
+  statusBase,
+  statusReblog,
+  accountBase,
+  accountReblog,
+  filters,
+  warnInsteadOfHide
+) {
+  if (!statusBase) {
+    return {
+      status: null,
+      loadingState: 'not-found',
+    };
+  }
+
+  if (statusBase.get('isLoading')) {
+    return {
+      status: null,
+      loadingState: 'loading',
+    }
+  }
+
+  if (statusReblog) {
+    statusReblog = statusReblog.set('account', accountReblog);
+  } else {
+    statusReblog = null;
+  }
+
+  let filtered = false;
+  let mediaFiltered = false;
+  if ((accountReblog || accountBase).get('id') !== me && filters) {
+    let filterResults = statusReblog?.get('filtered') || statusBase.get('filtered') || ImmutableList();
+    if (!warnInsteadOfHide && filterResults.some((result) => filters.getIn([result.get('filter'), 'filter_action']) === 'hide')) {
+      return {
+        status: null,
+        loadingState: 'filtered',
+      }
+    }
+
+    let mediaFilters = filterResults.filter(result => filters.getIn([result.get('filter'), 'filter_action']) === 'blur');
+    if (!mediaFilters.isEmpty()) {
+      mediaFiltered = mediaFilters.map(result => filters.getIn([result.get('filter'), 'title']));
+    }
+
+    filterResults = filterResults.filter(result => filters.has(result.get('filter')) && filters.getIn([result.get('filter'), 'filter_action']) !== 'blur');
+    if (!filterResults.isEmpty()) {
+      filtered = filterResults.map(result => filters.getIn([result.get('filter'), 'title']));
+    }
+  }
+
+  return {
+    status: statusBase.withMutations(map => {
+      map.set('reblog', statusReblog);
+      map.set('account', accountBase);
+      map.set('matched_filters', filtered);
+      map.set('matched_media_filters', mediaFiltered);
+    }),
+    loadingState: 'complete'
+  };
+}
+
 export const makeGetStatus = () => {
   return createSelector(
-    [
-      (state, { id }) => state.getIn(['statuses', id]),
-      (state, { id }) => state.getIn(['statuses', state.getIn(['statuses', id, 'reblog'])]),
-      (state, { id }) => state.getIn(['accounts', state.getIn(['statuses', id, 'account'])]),
-      (state, { id }) => state.getIn(['accounts', state.getIn(['statuses', state.getIn(['statuses', id, 'reblog']), 'account'])]),
-      getFilters,
-      (_, { contextType }) => ['detailed', 'bookmarks', 'favourites'].includes(contextType),
-    ],
-
-    (statusBase, statusReblog, accountBase, accountReblog, filters, warnInsteadOfHide) => {
-      if (!statusBase || statusBase.get('isLoading')) {
-        return null;
-      }
-
-      if (statusReblog) {
-        statusReblog = statusReblog.set('account', accountReblog);
-      } else {
-        statusReblog = null;
-      }
-
-      let filtered = false;
-      let mediaFiltered = false;
-      if ((accountReblog || accountBase).get('id') !== me && filters) {
-        let filterResults = statusReblog?.get('filtered') || statusBase.get('filtered') || ImmutableList();
-        if (!warnInsteadOfHide && filterResults.some((result) => filters.getIn([result.get('filter'), 'filter_action']) === 'hide')) {
-          return null;
-        }
-
-        let mediaFilters = filterResults.filter(result => filters.getIn([result.get('filter'), 'filter_action']) === 'blur');
-        if (!mediaFilters.isEmpty()) {
-          mediaFiltered = mediaFilters.map(result => filters.getIn([result.get('filter'), 'title']));
-        }
-
-        filterResults = filterResults.filter(result => filters.has(result.get('filter')) && filters.getIn([result.get('filter'), 'filter_action']) !== 'blur');
-        if (!filterResults.isEmpty()) {
-          filtered = filterResults.map(result => filters.getIn([result.get('filter'), 'title']));
-        }
-      }
-
-      return statusBase.withMutations(map => {
-        map.set('reblog', statusReblog);
-        map.set('account', accountBase);
-        map.set('matched_filters', filtered);
-        map.set('matched_media_filters', mediaFiltered);
-      });
+    getStatusInputSelectors,
+    (...args) => {
+      const {status} = getStatusResultFunction(...args);
+      return status
     },
   );
 };
 
+/**
+ * This selector extends the `makeGetStatus` with a more detailed
+ * `loadingState`, which is useful to find out why `null` is returned
+ * for the `status` field
+ */
+export const makeGetStatusWithExtraInfo = () => {
+  return createSelector(
+    getStatusInputSelectors,
+    getStatusResultFunction,
+  );
+};
+
 export const makeGetPictureInPicture = () => {
   return createSelector([
     (state, { id }) => state.picture_in_picture.statusId === id,
diff --git a/app/javascript/mastodon/selectors/notifications.ts b/app/javascript/mastodon/selectors/notifications.ts
index ea640406ea1..8c808a2dffe 100644
--- a/app/javascript/mastodon/selectors/notifications.ts
+++ b/app/javascript/mastodon/selectors/notifications.ts
@@ -26,7 +26,10 @@ const filterNotificationsByAllowedTypes = (
     );
   }
   return notifications.filter(
-    (item) => item.type === 'gap' || allowedType === item.type,
+    (item) =>
+      item.type === 'gap' ||
+      allowedType === item.type ||
+      (allowedType === 'mention' && item.type === 'quote'),
   );
 };
 
diff --git a/app/javascript/mastodon/store/typed_functions.ts b/app/javascript/mastodon/store/typed_functions.ts
index f0a18a0681a..4d7341b0c82 100644
--- a/app/javascript/mastodon/store/typed_functions.ts
+++ b/app/javascript/mastodon/store/typed_functions.ts
@@ -1,5 +1,12 @@
-import type { GetThunkAPI } from '@reduxjs/toolkit';
-import { createAsyncThunk, createSelector } from '@reduxjs/toolkit';
+import type {
+  ActionCreatorWithPreparedPayload,
+  GetThunkAPI,
+} from '@reduxjs/toolkit';
+import {
+  createAsyncThunk as rtkCreateAsyncThunk,
+  createSelector,
+  createAction,
+} from '@reduxjs/toolkit';
 // eslint-disable-next-line @typescript-eslint/no-restricted-imports
 import { useDispatch, useSelector } from 'react-redux';
 
@@ -18,7 +25,7 @@ interface AppMeta {
   useLoadingBar?: boolean;
 }
 
-export const createAppAsyncThunk = createAsyncThunk.withTypes<{
+export const createAppAsyncThunk = rtkCreateAsyncThunk.withTypes<{
   state: RootState;
   dispatch: AppDispatch;
   rejectValue: AsyncThunkRejectValue;
@@ -33,7 +40,10 @@ interface AppThunkConfig {
   fulfilledMeta: AppMeta;
   rejectedMeta: AppMeta;
 }
-type AppThunkApi = Pick<GetThunkAPI<AppThunkConfig>, 'getState' | 'dispatch'>;
+export type AppThunkApi = Pick<
+  GetThunkAPI<AppThunkConfig>,
+  'getState' | 'dispatch'
+>;
 
 interface AppThunkOptions<Arg> {
   useLoadingBar?: boolean;
@@ -43,9 +53,88 @@ interface AppThunkOptions<Arg> {
   ) => boolean;
 }
 
-const createBaseAsyncThunk = createAsyncThunk.withTypes<AppThunkConfig>();
+// Type definitions for the sync thunks.
+type AppThunk<Arg = void, Returned = void> = (
+  arg: Arg,
+) => (dispatch: AppDispatch, getState: () => RootState) => Returned;
 
-export function createThunk<Arg = void, Returned = void>(
+type AppThunkCreator<Arg = void, Returned = void, ExtraArg = unknown> = (
+  arg: Arg,
+  api: AppThunkApi,
+  extra?: ExtraArg,
+) => Returned;
+
+type AppThunkActionCreator<
+  Arg = void,
+  Returned = void,
+> = ActionCreatorWithPreparedPayload<
+  [Returned, Arg],
+  Returned,
+  string,
+  never,
+  { arg: Arg }
+>;
+
+// Version that does not dispatch it's own action.
+export function createAppThunk<Arg = void, Returned = void, ExtraArg = unknown>(
+  creator: AppThunkCreator<Arg, Returned, ExtraArg>,
+  extra?: ExtraArg,
+): AppThunk<Arg, Returned>;
+
+// Version that dispatches an named action with the result of the creator callback.
+export function createAppThunk<Arg = void, Returned = void, ExtraArg = unknown>(
+  name: string,
+  creator: AppThunkCreator<Arg, Returned, ExtraArg>,
+  extra?: ExtraArg,
+): AppThunk<Arg, Returned> & AppThunkActionCreator<Arg, Returned>;
+
+/** Creates a thunk that dispatches an action. */
+export function createAppThunk<Arg = void, Returned = void, ExtraArg = unknown>(
+  nameOrCreator: string | AppThunkCreator<Arg, Returned, ExtraArg>,
+  maybeCreatorOrExtra?: AppThunkCreator<Arg, Returned, ExtraArg> | ExtraArg,
+  maybeExtra?: ExtraArg,
+) {
+  const isDispatcher = typeof nameOrCreator === 'string';
+  const name = isDispatcher ? nameOrCreator : undefined;
+  const creator = isDispatcher
+    ? (maybeCreatorOrExtra as AppThunkCreator<Arg, Returned, ExtraArg>)
+    : nameOrCreator;
+  const extra = isDispatcher ? maybeExtra : (maybeCreatorOrExtra as ExtraArg);
+  let action: null | AppThunkActionCreator<Arg, Returned> = null;
+
+  // Creates a thunk that dispatches the action with the result of the creator.
+  const actionCreator: AppThunk<Arg, Returned> = (arg) => {
+    return (dispatch, getState) => {
+      const result = creator(arg, { dispatch, getState }, extra);
+      if (action) {
+        // Dispatches the action with the result.
+        const actionObj = action(result, arg);
+        dispatch(actionObj);
+      }
+      return result;
+    };
+  };
+
+  // No action name provided, return the thunk directly.
+  if (!name) {
+    return actionCreator;
+  }
+
+  // Create the action and assign the action creator to it in order
+  // to have things like `toString` and `match` available.
+  action = createAction(name, (payload: Returned, arg: Arg) => ({
+    payload,
+    meta: {
+      arg,
+    },
+  }));
+
+  return Object.assign(actionCreator, action);
+}
+
+const createBaseAsyncThunk = rtkCreateAsyncThunk.withTypes<AppThunkConfig>();
+
+export function createAsyncThunk<Arg = void, Returned = void>(
   name: string,
   creator: (arg: Arg, api: AppThunkApi) => Returned | Promise<Returned>,
   options: AppThunkOptions<Arg> = {},
@@ -104,7 +193,7 @@ export function createDataLoadingThunk<LoadDataResult, Args extends ArgsType>(
   name: string,
   loadData: (args: Args) => Promise<LoadDataResult>,
   thunkOptions?: AppThunkOptions<Args>,
-): ReturnType<typeof createThunk<Args, LoadDataResult>>;
+): ReturnType<typeof createAsyncThunk<Args, LoadDataResult>>;
 
 // Overload when the `onData` method returns discardLoadDataInPayload, then the payload is empty
 export function createDataLoadingThunk<LoadDataResult, Args extends ArgsType>(
@@ -114,7 +203,7 @@ export function createDataLoadingThunk<LoadDataResult, Args extends ArgsType>(
     | AppThunkOptions<Args>
     | OnData<Args, LoadDataResult, DiscardLoadData>,
   thunkOptions?: AppThunkOptions<Args>,
-): ReturnType<typeof createThunk<Args, void>>;
+): ReturnType<typeof createAsyncThunk<Args, void>>;
 
 // Overload when the `onData` method returns nothing, then the mayload is the `onData` result
 export function createDataLoadingThunk<LoadDataResult, Args extends ArgsType>(
@@ -124,7 +213,7 @@ export function createDataLoadingThunk<LoadDataResult, Args extends ArgsType>(
     | AppThunkOptions<Args>
     | OnData<Args, LoadDataResult, void>,
   thunkOptions?: AppThunkOptions<Args>,
-): ReturnType<typeof createThunk<Args, LoadDataResult>>;
+): ReturnType<typeof createAsyncThunk<Args, LoadDataResult>>;
 
 // Overload when there is an `onData` method returning something
 export function createDataLoadingThunk<
@@ -138,7 +227,7 @@ export function createDataLoadingThunk<
     | AppThunkOptions<Args>
     | OnData<Args, LoadDataResult, Returned>,
   thunkOptions?: AppThunkOptions<Args>,
-): ReturnType<typeof createThunk<Args, Returned>>;
+): ReturnType<typeof createAsyncThunk<Args, Returned>>;
 
 /**
  * This function creates a Redux Thunk that handles loading data asynchronously (usually from the API), dispatching `pending`, `fullfilled` and `rejected` actions.
@@ -189,7 +278,7 @@ export function createDataLoadingThunk<
     thunkOptions = maybeThunkOptions;
   }
 
-  return createThunk<Args, Returned>(
+  return createAsyncThunk<Args, Returned>(
     name,
     async (arg, { getState, dispatch }) => {
       const data = await loadData(arg, {
diff --git a/app/javascript/mastodon/utils/__tests__/__snapshots__/html-test.ts.snap b/app/javascript/mastodon/utils/__tests__/__snapshots__/html-test.ts.snap
new file mode 100644
index 00000000000..ea4561bc610
--- /dev/null
+++ b/app/javascript/mastodon/utils/__tests__/__snapshots__/html-test.ts.snap
@@ -0,0 +1,72 @@
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
+
+exports[`html > htmlStringToComponents > copies attributes to props 1`] = `
+[
+  <a
+    href="https://example.com"
+    rel="nofollow"
+    target="_blank"
+  >
+    link
+  </a>,
+]
+`;
+
+exports[`html > htmlStringToComponents > handles nested elements 1`] = `
+[
+  <p>
+    lorem 
+    <strong>
+      ipsum
+    </strong>
+  </p>,
+]
+`;
+
+exports[`html > htmlStringToComponents > ignores empty text nodes 1`] = `
+[
+  <p>
+       
+    <span>
+      lorem     ipsum
+    </span>
+       
+  </p>,
+]
+`;
+
+exports[`html > htmlStringToComponents > respects allowedTags option 1`] = `
+[
+  <p>
+    lorem 
+     
+    <em>
+      dolor
+    </em>
+  </p>,
+]
+`;
+
+exports[`html > htmlStringToComponents > respects maxDepth option 1`] = `
+[
+  <p>
+    <span />
+  </p>,
+]
+`;
+
+exports[`html > htmlStringToComponents > returns converted nodes from string 1`] = `
+[
+  <p>
+    lorem ipsum
+  </p>,
+]
+`;
+
+exports[`html > htmlStringToComponents > uses default parsing if onElement returns undefined 1`] = `
+[
+  <p>
+    lorem ipsum
+  </p>,
+]
+`;
diff --git a/app/javascript/mastodon/utils/__tests__/cache.test.ts b/app/javascript/mastodon/utils/__tests__/cache.test.ts
new file mode 100644
index 00000000000..340a51fdb4b
--- /dev/null
+++ b/app/javascript/mastodon/utils/__tests__/cache.test.ts
@@ -0,0 +1,78 @@
+import { createLimitedCache } from '../cache';
+
+describe('createCache', () => {
+  test('returns expected methods', () => {
+    const actual = createLimitedCache();
+    expect(actual).toBeTypeOf('object');
+    expect(actual).toHaveProperty('get');
+    expect(actual).toHaveProperty('has');
+    expect(actual).toHaveProperty('delete');
+    expect(actual).toHaveProperty('set');
+  });
+
+  test('caches values provided to it', () => {
+    const cache = createLimitedCache();
+    cache.set('test', 'result');
+    expect(cache.get('test')).toBe('result');
+  });
+
+  test('has returns expected values', () => {
+    const cache = createLimitedCache();
+    cache.set('test', 'result');
+    expect(cache.has('test')).toBeTruthy();
+    expect(cache.has('not found')).toBeFalsy();
+  });
+
+  test('updates a value if keys are the same', () => {
+    const cache = createLimitedCache();
+    cache.set('test1', 1);
+    cache.set('test1', 2);
+    expect(cache.get('test1')).toBe(2);
+  });
+
+  test('delete removes an item', () => {
+    const cache = createLimitedCache();
+    cache.set('test', 'result');
+    expect(cache.has('test')).toBeTruthy();
+    cache.delete('test');
+    expect(cache.has('test')).toBeFalsy();
+    expect(cache.get('test')).toBeUndefined();
+  });
+
+  test('removes oldest item cached if it exceeds a set size', () => {
+    const cache = createLimitedCache({ maxSize: 1 });
+    cache.set('test1', 1);
+    cache.set('test2', 2);
+    expect(cache.get('test1')).toBeUndefined();
+    expect(cache.get('test2')).toBe(2);
+  });
+
+  test('retrieving a value bumps up last access', () => {
+    const cache = createLimitedCache({ maxSize: 2 });
+    cache.set('test1', 1);
+    cache.set('test2', 2);
+    expect(cache.get('test1')).toBe(1);
+    cache.set('test3', 3);
+    expect(cache.get('test1')).toBe(1);
+    expect(cache.get('test2')).toBeUndefined();
+    expect(cache.get('test3')).toBe(3);
+  });
+
+  test('logs when cache is added to and removed', () => {
+    const log = vi.fn();
+    const cache = createLimitedCache({ maxSize: 1, log });
+    cache.set('test1', 1);
+    expect(log).toHaveBeenLastCalledWith(
+      'Added %s to cache, now size %d',
+      'test1',
+      1,
+    );
+    cache.set('test2', 1);
+    expect(log).toHaveBeenLastCalledWith(
+      'Added %s and deleted %s from cache, now size %d',
+      'test2',
+      'test1',
+      1,
+    );
+  });
+});
diff --git a/app/javascript/mastodon/utils/__tests__/html-test.ts b/app/javascript/mastodon/utils/__tests__/html-test.ts
index 99bfdcb8010..a48a8b572b3 100644
--- a/app/javascript/mastodon/utils/__tests__/html-test.ts
+++ b/app/javascript/mastodon/utils/__tests__/html-test.ts
@@ -1,3 +1,5 @@
+import React from 'react';
+
 import * as html from '../html';
 
 describe('html', () => {
@@ -9,4 +11,115 @@ describe('html', () => {
       expect(output).toEqual('lorem\n\nipsum\n<br>');
     });
   });
+
+  describe('htmlStringToComponents', () => {
+    it('returns converted nodes from string', () => {
+      const input = '<p>lorem ipsum</p>';
+      const output = html.htmlStringToComponents(input);
+      expect(output).toMatchSnapshot();
+    });
+
+    it('handles nested elements', () => {
+      const input = '<p>lorem <strong>ipsum</strong></p>';
+      const output = html.htmlStringToComponents(input);
+      expect(output).toMatchSnapshot();
+    });
+
+    it('ignores empty text nodes', () => {
+      const input = '<p>   <span>lorem     ipsum</span>   </p>';
+      const output = html.htmlStringToComponents(input);
+      expect(output).toMatchSnapshot();
+    });
+
+    it('copies attributes to props', () => {
+      const input =
+        '<a href="https://example.com" target="_blank" rel="nofollow">link</a>';
+      const output = html.htmlStringToComponents(input);
+      expect(output).toMatchSnapshot();
+    });
+
+    it('respects maxDepth option', () => {
+      const input = '<p><span>lorem <strong>ipsum</strong></span></p>';
+      const output = html.htmlStringToComponents(input, { maxDepth: 2 });
+      expect(output).toMatchSnapshot();
+    });
+
+    it('calls onText callback', () => {
+      const input = '<p>lorem ipsum</p>';
+      const onText = vi.fn((text: string) => text);
+      html.htmlStringToComponents(input, { onText });
+      expect(onText).toHaveBeenCalledExactlyOnceWith('lorem ipsum', {});
+    });
+
+    it('calls onElement callback', () => {
+      const input = '<p>lorem ipsum</p>';
+      const onElement = vi.fn<html.OnElementHandler>(
+        (element, props, children) =>
+          React.createElement(
+            element.tagName.toLowerCase(),
+            props,
+            ...children,
+          ),
+      );
+      html.htmlStringToComponents(input, { onElement });
+      expect(onElement).toHaveBeenCalledExactlyOnceWith(
+        expect.objectContaining({ tagName: 'P' }),
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+        expect.objectContaining({ key: expect.any(String) }),
+        expect.arrayContaining(['lorem ipsum']),
+        {},
+      );
+    });
+
+    it('uses default parsing if onElement returns undefined', () => {
+      const input = '<p>lorem ipsum</p>';
+      const onElement = vi.fn(() => undefined);
+      const output = html.htmlStringToComponents(input, { onElement });
+      expect(onElement).toHaveBeenCalledExactlyOnceWith(
+        expect.objectContaining({ tagName: 'P' }),
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+        expect.objectContaining({ key: expect.any(String) }),
+        expect.arrayContaining(['lorem ipsum']),
+        {},
+      );
+      expect(output).toMatchSnapshot();
+    });
+
+    it('calls onAttribute callback', () => {
+      const input =
+        '<a href="https://example.com" target="_blank" rel="nofollow">link</a>';
+      const onAttribute = vi.fn(
+        (name: string, value: string) =>
+          [name, value] satisfies [string, string],
+      );
+      html.htmlStringToComponents(input, { onAttribute });
+      expect(onAttribute).toHaveBeenCalledTimes(3);
+      expect(onAttribute).toHaveBeenCalledWith(
+        'href',
+        'https://example.com',
+        'a',
+        {},
+      );
+      expect(onAttribute).toHaveBeenCalledWith('target', '_blank', 'a', {});
+      expect(onAttribute).toHaveBeenCalledWith('rel', 'nofollow', 'a', {});
+    });
+
+    it('respects allowedTags option', () => {
+      const input = '<p>lorem <strong>ipsum</strong> <em>dolor</em></p>';
+      const output = html.htmlStringToComponents(input, {
+        allowedTags: { p: {}, em: {} },
+      });
+      expect(output).toMatchSnapshot();
+    });
+
+    it('ensure performance is acceptable with large input', () => {
+      const input = '<p>' + '<span>lorem</span>'.repeat(1_000) + '</p>';
+      const start = performance.now();
+      html.htmlStringToComponents(input);
+      const duration = performance.now() - start;
+      // Arbitrary threshold of 200ms for this test.
+      // Normally it's much less (<50ms), but the GH Action environment can be slow.
+      expect(duration).toBeLessThan(200);
+    });
+  });
 });
diff --git a/app/javascript/mastodon/utils/cache.ts b/app/javascript/mastodon/utils/cache.ts
new file mode 100644
index 00000000000..2e3d21bfed4
--- /dev/null
+++ b/app/javascript/mastodon/utils/cache.ts
@@ -0,0 +1,60 @@
+export interface LimitedCache<CacheKey, CacheValue> {
+  has: (key: CacheKey) => boolean;
+  get: (key: CacheKey) => CacheValue | undefined;
+  delete: (key: CacheKey) => void;
+  set: (key: CacheKey, value: CacheValue) => void;
+  clear: () => void;
+}
+
+interface LimitedCacheArguments {
+  maxSize?: number;
+  log?: (...args: unknown[]) => void;
+}
+
+export function createLimitedCache<CacheValue, CacheKey = string>({
+  maxSize = 100,
+  log = () => null,
+}: LimitedCacheArguments = {}): LimitedCache<CacheKey, CacheValue> {
+  const cacheMap = new Map<CacheKey, CacheValue>();
+  const cacheKeys = new Set<CacheKey>();
+
+  function touchKey(key: CacheKey) {
+    if (cacheKeys.has(key)) {
+      cacheKeys.delete(key);
+    }
+    cacheKeys.add(key);
+  }
+
+  return {
+    has: (key) => cacheMap.has(key),
+    get: (key) => {
+      if (cacheMap.has(key)) {
+        touchKey(key);
+      }
+      return cacheMap.get(key);
+    },
+    delete: (key) => cacheMap.delete(key) && cacheKeys.delete(key),
+    set: (key, value) => {
+      cacheMap.set(key, value);
+      touchKey(key);
+
+      const lastKey = cacheKeys.values().toArray().shift();
+      if (cacheMap.size > maxSize && lastKey) {
+        cacheMap.delete(lastKey);
+        cacheKeys.delete(lastKey);
+        log(
+          'Added %s and deleted %s from cache, now size %d',
+          key,
+          lastKey,
+          cacheMap.size,
+        );
+      } else {
+        log('Added %s to cache, now size %d', key, cacheMap.size);
+      }
+    },
+    clear: () => {
+      cacheMap.clear();
+      cacheKeys.clear();
+    },
+  };
+}
diff --git a/app/javascript/mastodon/utils/environment.ts b/app/javascript/mastodon/utils/environment.ts
index 5ccd4d27e3f..c2b6b1cf86a 100644
--- a/app/javascript/mastodon/utils/environment.ts
+++ b/app/javascript/mastodon/utils/environment.ts
@@ -1,3 +1,5 @@
+import { initialState } from '../initial_state';
+
 export function isDevelopment() {
   if (typeof process !== 'undefined')
     return process.env.NODE_ENV === 'development';
@@ -9,3 +11,17 @@ export function isProduction() {
     return process.env.NODE_ENV === 'production';
   else return import.meta.env.PROD;
 }
+
+export type Features = 'modern_emojis' | 'fasp' | 'http_message_signatures';
+
+export function isFeatureEnabled(feature: Features) {
+  return initialState?.features.includes(feature) ?? false;
+}
+
+export function isModernEmojiEnabled() {
+  try {
+    return isFeatureEnabled('modern_emojis');
+  } catch {
+    return false;
+  }
+}
diff --git a/app/javascript/mastodon/utils/html.ts b/app/javascript/mastodon/utils/html.ts
index 0145a045516..c87b5a34cfc 100644
--- a/app/javascript/mastodon/utils/html.ts
+++ b/app/javascript/mastodon/utils/html.ts
@@ -1,3 +1,7 @@
+import React from 'react';
+
+import htmlConfig from '../../config/html-tags.json';
+
 // NB: This function can still return unsafe HTML
 export const unescapeHTML = (html: string) => {
   const wrapper = document.createElement('div');
@@ -7,3 +11,209 @@ export const unescapeHTML = (html: string) => {
     .replace(/<[^>]*>/g, '');
   return wrapper.textContent;
 };
+
+interface AllowedTag {
+  /* True means allow, false disallows global attributes, string renames the attribute name for React. */
+  attributes?: Record<string, boolean | string>;
+  /* If false, the tag cannot have children. Undefined or true means allowed. */
+  children?: boolean;
+}
+
+type AllowedTagsType = {
+  [Tag in keyof React.ReactHTML]?: AllowedTag;
+};
+
+const globalAttributes: Record<string, boolean | string> = htmlConfig.global;
+const defaultAllowedTags: AllowedTagsType = htmlConfig.tags;
+
+interface QueueItem {
+  node: Node;
+  parent: React.ReactNode[];
+  depth: number;
+}
+
+export type OnElementHandler<
+  Arg extends Record<string, unknown> = Record<string, unknown>,
+> = (
+  element: HTMLElement,
+  props: Record<string, unknown>,
+  children: React.ReactNode[],
+  extra: Arg,
+) => React.ReactNode;
+
+export type OnAttributeHandler<
+  Arg extends Record<string, unknown> = Record<string, unknown>,
+> = (
+  name: string,
+  value: string,
+  tagName: string,
+  extra: Arg,
+) => [string, unknown] | undefined | null;
+
+export interface HTMLToStringOptions<
+  Arg extends Record<string, unknown> = Record<string, unknown>,
+> {
+  maxDepth?: number;
+  onText?: (text: string, extra: Arg) => React.ReactNode;
+  onElement?: OnElementHandler<Arg>;
+  onAttribute?: OnAttributeHandler<Arg>;
+  allowedTags?: AllowedTagsType;
+  extraArgs?: Arg;
+}
+
+let uniqueIdCounter = 0;
+
+export function htmlStringToComponents<Arg extends Record<string, unknown>>(
+  htmlString: string,
+  options: HTMLToStringOptions<Arg> = {},
+) {
+  const wrapper = document.createElement('template');
+  wrapper.innerHTML = htmlString;
+
+  const rootChildren: React.ReactNode[] = [];
+  const queue: QueueItem[] = [
+    { node: wrapper.content, parent: rootChildren, depth: 0 },
+  ];
+
+  const {
+    maxDepth = 10,
+    allowedTags = defaultAllowedTags,
+    onAttribute,
+    onElement,
+    onText,
+    extraArgs = {} as Arg,
+  } = options;
+
+  while (queue.length > 0) {
+    const item = queue.shift();
+    if (!item) {
+      break;
+    }
+
+    const { node, parent, depth } = item;
+    // If maxDepth is exceeded, skip processing this node.
+    if (depth > maxDepth) {
+      continue;
+    }
+
+    switch (node.nodeType) {
+      // Just process children for fragments.
+      case Node.DOCUMENT_FRAGMENT_NODE: {
+        for (const child of node.childNodes) {
+          queue.push({ node: child, parent, depth: depth + 1 });
+        }
+        break;
+      }
+
+      // Text can be added directly if it has any non-whitespace content.
+      case Node.TEXT_NODE: {
+        const text = node.textContent;
+        if (text) {
+          if (onText) {
+            parent.push(onText(text, extraArgs));
+          } else {
+            parent.push(text);
+          }
+        }
+        break;
+      }
+
+      // Process elements with attributes and then their children.
+      case Node.ELEMENT_NODE: {
+        if (!(node instanceof HTMLElement)) {
+          console.warn('Expected HTMLElement, got', node);
+          continue;
+        }
+
+        // If the tag is not allowed, skip it and its children.
+        const tagName = node.tagName.toLowerCase();
+        const tagInfo = allowedTags[tagName as keyof typeof allowedTags];
+        if (!tagInfo) {
+          continue;
+        }
+
+        // Create the element and add it to the parent.
+        const children: React.ReactNode[] = [];
+        let element: React.ReactNode = undefined;
+
+        // Generate props from attributes.
+        const key = `html-${uniqueIdCounter++}`; // Get the current key and then increment it.
+        const props: Record<string, unknown> = { key };
+        for (const attr of node.attributes) {
+          let name = attr.name.toLowerCase();
+
+          // Custom attribute handler.
+          if (onAttribute) {
+            const result = onAttribute(name, attr.value, tagName, extraArgs);
+            // Rewrite this attribute.
+            if (result) {
+              const [cbName, value] = result;
+              props[cbName] = value;
+              continue;
+            } else if (result === null) {
+              // Explicitly remove this attribute.
+              continue;
+            }
+          }
+
+          // Check global attributes first, then tag-specific ones.
+          const globalAttr = globalAttributes[name];
+          const tagAttr = tagInfo.attributes?.[name];
+
+          // Exit if neither global nor tag-specific attribute is allowed.
+          if (!globalAttr && !tagAttr) {
+            continue;
+          }
+
+          // Rename if needed.
+          if (typeof tagAttr === 'string') {
+            name = tagAttr;
+          } else if (typeof globalAttr === 'string') {
+            name = globalAttr;
+          }
+
+          let value: string | boolean | number = attr.value;
+
+          // Handle boolean attributes.
+          if (value === 'true') {
+            value = true;
+          } else if (value === 'false') {
+            value = false;
+          }
+
+          props[name] = value;
+        }
+
+        // If onElement is provided, use it to create the element.
+        if (onElement) {
+          const component = onElement(node, props, children, extraArgs);
+
+          // Check for undefined to allow returning null.
+          if (component !== undefined) {
+            element = component;
+          }
+        }
+
+        // If the element wasn't created, use the default conversion.
+        if (element === undefined) {
+          element = React.createElement(
+            tagName,
+            props,
+            tagInfo.children !== false ? children : undefined,
+          );
+        }
+
+        // Push the element to the parent.
+        parent.push(element);
+
+        // Iterate over the node children with the newly created component.
+        for (const child of node.childNodes) {
+          queue.push({ node: child, parent: children, depth: depth + 1 });
+        }
+        break;
+      }
+    }
+  }
+
+  return rootChildren;
+}
diff --git a/app/javascript/mastodon/performance.js b/app/javascript/mastodon/utils/performance.ts
similarity index 70%
rename from app/javascript/mastodon/performance.js
rename to app/javascript/mastodon/utils/performance.ts
index 1b2092cfc4c..e503e1ef587 100644
--- a/app/javascript/mastodon/performance.js
+++ b/app/javascript/mastodon/utils/performance.ts
@@ -4,15 +4,15 @@
 
 import * as marky from 'marky';
 
-import { isDevelopment } from './utils/environment';
+import { isDevelopment } from './environment';
 
-export function start(name) {
+export function start(name: string) {
   if (isDevelopment()) {
     marky.mark(name);
   }
 }
 
-export function stop(name) {
+export function stop(name: string) {
   if (isDevelopment()) {
     marky.stop(name);
   }
diff --git a/app/javascript/mastodon/utils/types.ts b/app/javascript/mastodon/utils/types.ts
new file mode 100644
index 00000000000..24b9ee180f1
--- /dev/null
+++ b/app/javascript/mastodon/utils/types.ts
@@ -0,0 +1,16 @@
+/**
+ * Extend an existing type and make some of its properties required or optional.
+ * @example
+ * interface Person {
+ * 	name: string;
+ * 	age?: number;
+ * 	likesIceCream?: boolean;
+ * }
+ *
+ * type PersonWithSomeRequired = SomeRequired<Person, 'age' | 'likesIceCream' >;
+ * type PersonWithSomeOptional = SomeOptional<Person, 'name' >;
+ */
+
+export type SomeRequired<T, K extends keyof T> = T & Required<Pick<T, K>>;
+export type SomeOptional<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>> &
+  Partial<Pick<T, K>>;
diff --git a/app/javascript/mastodon/utils/workers.ts b/app/javascript/mastodon/utils/workers.ts
new file mode 100644
index 00000000000..02dd66d86e0
--- /dev/null
+++ b/app/javascript/mastodon/utils/workers.ts
@@ -0,0 +1,29 @@
+/**
+ * Loads Web Worker that is compatible with cross-origin scripts for CDNs.
+ *
+ * Returns null if the environment doesn't support web workers.
+ */
+export function loadWorker(url: string | URL, options: WorkerOptions = {}) {
+  if (!('Worker' in window)) {
+    return null;
+  }
+
+  try {
+    // Check if the script origin and the window origin are the same.
+    const scriptUrl = new URL(import.meta.url);
+    if (location.origin === scriptUrl.origin) {
+      // Not cross-origin, can just load normally.
+      return new Worker(url, options);
+    }
+  } catch (err) {
+    // In case the URL parsing fails.
+    console.warn('Error instantiating Worker:', err);
+  }
+
+  // Import the worker script from a same-origin Blob.
+  const contents = `import ${JSON.stringify(url)};`;
+  const blob = URL.createObjectURL(
+    new Blob([contents], { type: 'text/javascript' }),
+  );
+  return new Worker(blob, options);
+}
diff --git a/app/javascript/material-icons/400-24px/format_quote-fill.svg b/app/javascript/material-icons/400-24px/format_quote-fill.svg
new file mode 100644
index 00000000000..f4afa3ed17f
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/format_quote-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="m228-240 92-160q-66 0-113-47t-47-113q0-66 47-113t113-47q66 0 113 47t47 113q0 23-5.5 42.5T458-480L320-240h-92Zm360 0 92-160q-66 0-113-47t-47-113q0-66 47-113t113-47q66 0 113 47t47 113q0 23-5.5 42.5T818-480L680-240h-92Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/format_quote.svg b/app/javascript/material-icons/400-24px/format_quote.svg
new file mode 100644
index 00000000000..c354385ea93
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/format_quote.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="m228-240 92-160q-66 0-113-47t-47-113q0-66 47-113t113-47q66 0 113 47t47 113q0 23-5.5 42.5T458-480L320-240h-92Zm360 0 92-160q-66 0-113-47t-47-113q0-66 47-113t113-47q66 0 113 47t47 113q0 23-5.5 42.5T818-480L680-240h-92ZM320-500q25 0 42.5-17.5T380-560q0-25-17.5-42.5T320-620q-25 0-42.5 17.5T260-560q0 25 17.5 42.5T320-500Zm360 0q25 0 42.5-17.5T740-560q0-25-17.5-42.5T680-620q-25 0-42.5 17.5T620-560q0 25 17.5 42.5T680-500Zm0-60Zm-360 0Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/format_quote_off-fill.svg b/app/javascript/material-icons/400-24px/format_quote_off-fill.svg
new file mode 100644
index 00000000000..cdb50848172
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/format_quote_off-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M791-56 425-422 320-240h-92l92-160q-66 0-113-47t-47-113q0-27 8.5-51t23.5-44L56-791l56-57 736 736-57 56Zm-55-281L520-553v-7q0-66 47-113t113-47q66 0 113 47t47 113q0 23-5.5 42.5T818-480l-82 143Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/format_quote_off.svg b/app/javascript/material-icons/400-24px/format_quote_off.svg
new file mode 100644
index 00000000000..8410c3924bd
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/format_quote_off.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M791-56 425-422 320-240h-92l92-160q-66 0-113-47t-47-113q0-27 8.5-51t23.5-44L56-791l56-57 736 736-57 56Zm-55-281L520-553v-7q0-66 47-113t113-47q66 0 113 47t47 113q0 23-5.5 42.5T818-480l-82 143ZM320-500q6 0 12-1t11-3l-79-79q-2 5-3 11t-1 12q0 25 17.5 42.5T320-500Zm360 0q25 0 42.5-17.5T740-560q0-25-17.5-42.5T680-620q-25 0-42.5 17.5T620-560q0 25 17.5 42.5T680-500Zm-374-41Zm374-19Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/supervised_user_circle_off-fill.svg b/app/javascript/material-icons/400-24px/supervised_user_circle_off-fill.svg
new file mode 100644
index 00000000000..1daf50f858a
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/supervised_user_circle_off-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="m791-55-91-91q-48 32-103.5 49T480-80q-83 0-156-31.5T197-197q-54-54-85.5-127T80-480q0-61 17-116.5T146-700l-91-91 57-57 736 736-57 57ZM477-161q45 0 86-11.5t77-33.5l-91-91q-38 17-74.5 47.5T412-168q16 3 32 5t33 2Zm-124-25q35-72 79.5-107t67.5-47q-29-9-58.5-14.5T380-360q-45 0-89 11t-85 31q26 43 63.5 77.5T353-186Zm461-74L690-384q31-10 50.5-36t19.5-60q0-42-29-71t-71-29q-34 0-60 19.5T564-510l-44-44q2-61-41-104.5T374-700L260-814q48-32 103.5-49T480-880q83 0 156 31.5T763-763q54 54 85.5 127T880-480q0 61-17 116.5T814-260ZM380-420q11 0 20.5-1.5T420-426L246-600q-3 10-4.5 19.5T240-560q0 58 41 99t99 41Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/supervised_user_circle_off.svg b/app/javascript/material-icons/400-24px/supervised_user_circle_off.svg
new file mode 100644
index 00000000000..060c515ae18
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/supervised_user_circle_off.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="m791-55-91-91q-48 32-103.5 49T480-80q-83 0-156-31.5T197-197q-54-54-85.5-127T80-480q0-61 17-116.5T146-700l-91-91 57-57 736 736-57 57ZM412-168q26-51 62-81.5t75-47.5L204-642q-21 36-32.5 76.5T160-480q0 45 11.5 86t34.5 76q41-20 85-31t89-11q32 0 61.5 5.5T500-340q-23 12-43.5 28T418-278q-12-2-20.5-2H380q-32 0-63.5 7T256-252q32 32 71.5 53.5T412-168Zm402-92-58-58q21-35 32.5-76t11.5-86q0-134-93-227t-227-93q-45 0-85.5 11.5T318-756l-58-58q48-32 103.5-49T480-880q83 0 156 31.5T763-763q54 54 85.5 127T880-480q0 61-17 116.5T814-260ZM520-554 374-700q62-2 105 41.5T520-554ZM380-420q-58 0-99-41t-41-99q0-33 14.5-60.5T292-668l196 196q-20 23-47.5 37.5T380-420Zm310 36L564-510q10-31 36-50.5t60-19.5q42 0 71 29t29 71q0 34-19.5 60T690-384ZM537-537ZM423-423Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/styles/entrypoints/mailer.scss b/app/javascript/styles/entrypoints/mailer.scss
index 7d2a54afae0..fcbbd66f4c7 100644
--- a/app/javascript/styles/entrypoints/mailer.scss
+++ b/app/javascript/styles/entrypoints/mailer.scss
@@ -88,6 +88,14 @@ table + p {
   padding: 24px;
 }
 
+.email-inner-nested-card-td {
+  border-radius: 12px;
+  padding: 18px;
+  overflow: hidden;
+  background-color: #fff;
+  border: 1px solid #dfdee3;
+}
+
 // Account
 .email-account-banner-table {
   background-color: #f3f2f5;
@@ -559,12 +567,29 @@ table + p {
   }
 }
 
+.email-quote-header-img {
+  width: 34px;
+
+  img {
+    width: 34px;
+    height: 34px;
+    border-radius: 8px;
+    overflow: hidden;
+  }
+}
+
 .email-status-header-text {
   padding-left: 16px;
   padding-right: 16px;
   vertical-align: middle;
 }
 
+.email-quote-header-text {
+  padding-left: 14px;
+  padding-right: 14px;
+  vertical-align: middle;
+}
+
 .email-status-header-name {
   font-size: 16px;
   font-weight: 600;
@@ -578,6 +603,19 @@ table + p {
   color: #746a89;
 }
 
+.email-quote-header-name {
+  font-size: 14px;
+  font-weight: 600;
+  line-height: 18px;
+  color: #17063b;
+}
+
+.email-quote-header-handle {
+  font-size: 13px;
+  line-height: 18px;
+  color: #746a89;
+}
+
 .email-status-content {
   padding-top: 24px;
 }
@@ -589,6 +627,10 @@ table + p {
 }
 
 .email-status-prose {
+  .quote-inline {
+    display: none;
+  }
+
   p {
     font-size: 14px;
     line-height: 20px;
diff --git a/app/javascript/styles/mastodon-light/css_variables.scss b/app/javascript/styles/mastodon-light/css_variables.scss
index d9311da1b94..d96c368b251 100644
--- a/app/javascript/styles/mastodon-light/css_variables.scss
+++ b/app/javascript/styles/mastodon-light/css_variables.scss
@@ -7,11 +7,13 @@ body {
   --dropdown-border-color: hsl(240deg, 25%, 88%);
   --dropdown-background-color: #fff;
   --modal-border-color: hsl(240deg, 25%, 88%);
-  --modal-background-color: var(--background-color-tint);
+  --modal-background-color: var(--background-color);
   --background-border-color: hsl(240deg, 25%, 88%);
   --background-color: #fff;
   --background-color-tint: rgba(255, 255, 255, 80%);
   --background-filter: blur(10px);
+  --surface-variant-background-color: #f1ebfb;
+  --surface-border-color: #cac4d0;
   --on-surface-color: #{color.adjust($ui-base-color, $alpha: -0.65)};
   --rich-text-container-color: rgba(255, 216, 231, 100%);
   --rich-text-text-color: rgba(114, 47, 83, 100%);
diff --git a/app/javascript/styles/mastodon-light/diff.scss b/app/javascript/styles/mastodon-light/diff.scss
index 7e11af12477..fe3265f357f 100644
--- a/app/javascript/styles/mastodon-light/diff.scss
+++ b/app/javascript/styles/mastodon-light/diff.scss
@@ -16,7 +16,7 @@
 
 .status-card__actions button,
 .status-card__actions a {
-  color: rgba($white, 0.8);
+  color: color.change($white, $alpha: 0.8);
 
   &:hover,
   &:active,
@@ -101,7 +101,7 @@
 }
 
 // Change the background colors of statuses
-.focusable:focus {
+.focusable:focus-visible {
   background: lighten($white, 4%);
 }
 
@@ -298,14 +298,14 @@
 .simple_form {
   .warning {
     box-shadow: none;
-    background: rgba($error-red, 0.5);
+    background: color.change($error-red, $alpha: 0.5);
     text-shadow: none;
   }
 
   .recommended {
     border-color: $ui-highlight-color;
     color: $ui-highlight-color;
-    background-color: rgba($ui-highlight-color, 0.1);
+    background-color: color.change($ui-highlight-color, $alpha: 0.1);
   }
 
   input[type='text'],
@@ -327,7 +327,7 @@
 
 .compose-form .compose-form__warning {
   border-color: $ui-highlight-color;
-  background-color: rgba($ui-highlight-color, 0.1);
+  background-color: color.change($ui-highlight-color, $alpha: 0.1);
 
   &,
   a {
@@ -375,23 +375,17 @@
 }
 
 .status__wrapper-direct {
-  background-color: rgba($ui-highlight-color, 0.1);
+  background-color: color.change($ui-highlight-color, $alpha: 0.1);
 
   &:focus {
-    background-color: rgba($ui-highlight-color, 0.15);
+    background-color: color.change($ui-highlight-color, $alpha: 0.15);
   }
 }
 
 .compose-form__actions .icon-button.active,
 .dropdown-button.active,
-.privacy-dropdown__option.active,
-.privacy-dropdown__option:focus,
 .language-dropdown__dropdown__results__item:focus,
 .language-dropdown__dropdown__results__item.active,
-.privacy-dropdown__option:focus .privacy-dropdown__option__content,
-.privacy-dropdown__option:focus .privacy-dropdown__option__content strong,
-.privacy-dropdown__option.active .privacy-dropdown__option__content,
-.privacy-dropdown__option.active .privacy-dropdown__option__content strong,
 .language-dropdown__dropdown__results__item:focus
   .language-dropdown__dropdown__results__item__common-name,
 .language-dropdown__dropdown__results__item.active
@@ -399,6 +393,14 @@
   color: $white;
 }
 
+.privacy-dropdown__option,
+.visibility-dropdown__option {
+  &:focus,
+  &.active {
+    --dropdown-text-color: #{$white};
+  }
+}
+
 .compose-form .spoiler-input__input {
   color: lighten($ui-highlight-color, 8%);
 }
@@ -433,8 +435,12 @@
 }
 
 .inline-follow-suggestions {
-  background-color: rgba($ui-highlight-color, 0.1);
-  border-bottom-color: rgba($ui-highlight-color, 0.3);
+  background-color: color.change($ui-highlight-color, $alpha: 0.1);
+  border-bottom-color: color.change($ui-highlight-color, $alpha: 0.3);
+
+  &.focusable:focus-visible {
+    background: color.change($ui-highlight-color, $alpha: 0.1);
+  }
 }
 
 .inline-follow-suggestions__body__scrollable__card {
@@ -508,7 +514,7 @@ a.sparkline {
 
 @supports not selector(::-webkit-scrollbar) {
   html {
-    scrollbar-color: rgba($action-button-color, 0.25)
+    scrollbar-color: color.change($action-button-color, $alpha: 0.25)
       var(--background-border-color);
   }
 }
diff --git a/app/javascript/styles/mastodon/_mixins.scss b/app/javascript/styles/mastodon/_mixins.scss
index b7d9203e3f3..d66fa405819 100644
--- a/app/javascript/styles/mastodon/_mixins.scss
+++ b/app/javascript/styles/mastodon/_mixins.scss
@@ -1,3 +1,4 @@
+@use 'sass:color';
 @use 'variables' as *;
 
 @mixin search-input {
@@ -22,7 +23,7 @@
   padding-bottom: 14px;
   margin-top: 10px;
   color: $light-text-color;
-  box-shadow: 2px 4px 15px rgba($base-shadow-color, 0.4);
+  box-shadow: 2px 4px 15px color.change($base-shadow-color, $alpha: 0.4);
 
   h4 {
     text-transform: uppercase;
diff --git a/app/javascript/styles/mastodon/accounts.scss b/app/javascript/styles/mastodon/accounts.scss
index 3854db0c396..da4b9bdaa81 100644
--- a/app/javascript/styles/mastodon/accounts.scss
+++ b/app/javascript/styles/mastodon/accounts.scss
@@ -1,3 +1,4 @@
+@use 'sass:color';
 @use 'variables' as *;
 @use 'functions' as *;
 
@@ -161,7 +162,7 @@
 
 .nothing-here {
   background: $ui-base-color;
-  box-shadow: 0 0 15px rgba($base-shadow-color, 0.2);
+  box-shadow: 0 0 15px color.change($base-shadow-color, $alpha: 0.2);
   color: $darker-text-color;
   font-size: 14px;
   font-weight: 500;
@@ -205,8 +206,8 @@
 .simple_form .overridden,
 .simple_form .recommended,
 .simple_form .not_recommended {
-  background-color: rgba($ui-secondary-color, 0.1);
-  border: 1px solid rgba($ui-secondary-color, 0.5);
+  background-color: color.change($ui-secondary-color, $alpha: 0.1);
+  border: 1px solid color.change($ui-secondary-color, $alpha: 0.5);
 }
 
 .account-role {
@@ -240,8 +241,8 @@
 .information-badge {
   &.superapp {
     color: $success-green;
-    background-color: rgba($success-green, 0.1);
-    border-color: rgba($success-green, 0.5);
+    background-color: color.change($success-green, $alpha: 0.1);
+    border-color: color.change($success-green, $alpha: 0.5);
   }
 }
 
@@ -302,8 +303,8 @@
   }
 
   .verified {
-    border: 1px solid rgba($valid-value-color, 0.5);
-    background: rgba($valid-value-color, 0.25);
+    border: 1px solid color.change($valid-value-color, $alpha: 0.5);
+    background: color.change($valid-value-color, $alpha: 0.25);
 
     a {
       color: $valid-value-color;
diff --git a/app/javascript/styles/mastodon/admin.scss b/app/javascript/styles/mastodon/admin.scss
index 3709a4f504c..2e05284e282 100644
--- a/app/javascript/styles/mastodon/admin.scss
+++ b/app/javascript/styles/mastodon/admin.scss
@@ -1,3 +1,4 @@
+@use 'sass:color';
 @use 'sass:math';
 @use 'functions' as *;
 @use 'variables' as *;
@@ -12,6 +13,7 @@ $content-width: 840px;
   box-sizing: border-box;
   width: 100%;
   min-height: 100vh;
+  min-height: 100dvh;
   padding: env(safe-area-inset-top) env(safe-area-inset-right)
     env(safe-area-inset-bottom) env(safe-area-inset-left);
 
@@ -24,6 +26,7 @@ $content-width: 840px;
 
   .sidebar-wrapper {
     min-height: 100vh;
+    min-height: 100dvh;
     overflow: hidden;
     pointer-events: none;
     flex: 1 1 auto;
@@ -162,7 +165,7 @@ $content-width: 840px;
     flex: 1 1 auto;
   }
 
-  @media screen and (max-width: $content-width + $sidebar-width) {
+  @media screen and (max-width: ($content-width + $sidebar-width)) {
     .sidebar-wrapper--empty {
       display: none;
     }
@@ -1064,6 +1067,17 @@ a.name-tag,
       }
     }
 
+    &__action-bar {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      gap: 8px;
+
+      &:not(.no-wrap) {
+        flex-wrap: wrap;
+      }
+    }
+
     &__meta {
       padding: 0 15px;
       color: $dark-text-color;
@@ -1080,10 +1094,8 @@ a.name-tag,
       }
     }
 
-    &__action-bar {
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
+    &__actions {
+      margin-inline-start: auto;
     }
 
     &__permissions {
@@ -1255,7 +1267,7 @@ a.name-tag,
     }
 
     path:first-child {
-      fill: rgba($highlight-text-color, 0.25) !important;
+      fill: color.change($highlight-text-color, $alpha: 0.25) !important;
       fill-opacity: 1 !important;
     }
 
@@ -1872,7 +1884,7 @@ a.sparkline {
   font-size: 15px;
   line-height: 22px;
 
-  li {
+  > li {
     counter-increment: step 1;
     padding-inline-start: 2.5rem;
     padding-bottom: 8px;
@@ -1934,7 +1946,6 @@ a.sparkline {
 .status__card {
   padding: 15px;
   border-radius: 4px;
-  background: $ui-base-color;
   font-size: 15px;
   line-height: 20px;
   word-wrap: break-word;
@@ -1953,8 +1964,105 @@ a.sparkline {
   .status__content {
     padding-top: 0;
 
-    summary {
-      display: list-item;
+    > details {
+      summary {
+        display: block;
+        box-sizing: border-box;
+        background: var(--nested-card-background);
+        color: var(--nested-card-text);
+        border: var(--nested-card-border);
+        border-radius: 8px;
+        padding: 8px 13px;
+        position: relative;
+        font-size: 15px;
+        line-height: 22px;
+        cursor: pointer;
+
+        &::after {
+          content: attr(data-show, 'Show more');
+          margin-top: 8px;
+          display: block;
+          font-size: 15px;
+          line-height: 20px;
+          color: $highlight-text-color;
+          cursor: pointer;
+          border: 0;
+          background: transparent;
+          padding: 0;
+          text-decoration: none;
+          font-weight: 500;
+        }
+
+        &:hover,
+        &:focus-visible {
+          &::after {
+            text-decoration: underline !important;
+          }
+        }
+      }
+
+      &[open] summary {
+        margin-bottom: 16px;
+
+        &::after {
+          content: attr(data-hide, 'Hide post');
+        }
+      }
+    }
+  }
+
+  .preview-card {
+    position: relative;
+    max-width: 566px;
+
+    .status-card__image {
+      &--video {
+        aspect-ratio: 16 / 9;
+      }
+
+      &--large {
+        aspect-ratio: 1.91 / 1;
+      }
+
+      aspect-ratio: 1;
+    }
+
+    .spoiler-button__overlay__label {
+      outline: 1px solid var(--media-outline-color);
+    }
+
+    .hide-button {
+      // Toggled to appear when the preview-card is unblurred:
+      display: none;
+      position: absolute;
+      top: 5px;
+      right: 5px;
+      color: $white;
+      border: 0;
+      outline: 1px solid var(--media-outline-color);
+      background-color: color.change($black, $alpha: 0.45);
+      backdrop-filter: $backdrop-blur-filter;
+      padding: 3px 12px;
+      border-radius: 99px;
+      font-size: 14px;
+      font-weight: 700;
+      line-height: 20px;
+
+      &:hover,
+      &:focus {
+        background-color: color.change($black, $alpha: 0.9);
+      }
+    }
+
+    &.preview-card--image-visible {
+      .hide-button {
+        display: block;
+      }
+
+      .spoiler-button__overlay,
+      .status-card__image-preview {
+        display: none;
+      }
     }
   }
 }
diff --git a/app/javascript/styles/mastodon/basics.scss b/app/javascript/styles/mastodon/basics.scss
index 0dce0b9b3ea..3d8bba7c00c 100644
--- a/app/javascript/styles/mastodon/basics.scss
+++ b/app/javascript/styles/mastodon/basics.scss
@@ -69,6 +69,7 @@ body {
     &.layout-single-column {
       height: auto;
       min-height: 100vh;
+      min-height: 100dvh;
       overflow-y: scroll;
     }
 
@@ -185,7 +186,8 @@ button {
   }
 
   & > noscript {
-    height: 100vh;
+    min-height: 100vh;
+    min-height: 100dvh;
   }
 }
 
@@ -193,6 +195,7 @@ button {
   &,
   & > div {
     min-height: 100vh;
+    min-height: 100dvh;
   }
 }
 
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 6ab225369d7..ee54cd71ad5 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -201,6 +201,41 @@
     }
   }
 
+  &.button--plain {
+    color: $highlight-text-color;
+    background: transparent;
+    padding: 6px;
+
+    // The button has no outline, so we use negative margin to
+    // visually align its label with its surroundings while maintaining
+    // a generous click target
+    margin-inline: -6px;
+    border: 1px solid transparent;
+
+    &:active,
+    &:focus,
+    &:hover {
+      border-color: transparent;
+      color: lighten($highlight-text-color, 4%);
+      background-color: transparent;
+      text-decoration: none;
+    }
+
+    &:disabled,
+    &.disabled {
+      opacity: 0.7;
+      border-color: transparent;
+      color: $ui-button-disabled-color;
+
+      &:active,
+      &:focus,
+      &:hover {
+        border-color: transparent;
+        color: $ui-button-disabled-color;
+      }
+    }
+  }
+
   &.button-tertiary {
     background: transparent;
     padding: 6px 17px;
@@ -311,7 +346,7 @@
   &:active,
   &:focus-visible {
     color: lighten($action-button-color, 7%);
-    background-color: rgba($action-button-color, 0.15);
+    background-color: color.change($action-button-color, $alpha: 0.15);
   }
 
   &:focus-visible {
@@ -331,7 +366,7 @@
     &:active,
     &:focus-visible {
       color: darken($lighter-text-color, 7%);
-      background-color: rgba($lighter-text-color, 0.15);
+      background-color: color.change($lighter-text-color, $alpha: 0.15);
     }
 
     &:focus-visible {
@@ -361,14 +396,14 @@
 
   &.overlayed {
     box-sizing: content-box;
-    background: rgba($black, 0.65);
+    background: color.change($black, $alpha: 0.65);
     backdrop-filter: $backdrop-blur-filter;
-    color: rgba($white, 0.7);
+    color: color.change($white, $alpha: 0.7);
     border-radius: 4px;
     padding: 2px;
 
     &:hover {
-      background: rgba($black, 0.9);
+      background: color.change($black, $alpha: 0.9);
     }
   }
 
@@ -391,7 +426,7 @@
     border-color: $valid-value-color;
     color: $valid-value-color;
     transition: none;
-    background-color: rgba($valid-value-color, 0.15);
+    background-color: color.change($valid-value-color, $alpha: 0.15);
   }
 }
 
@@ -411,7 +446,7 @@
   &:active,
   &:focus {
     color: darken($lighter-text-color, 7%);
-    background-color: rgba($lighter-text-color, 0.15);
+    background-color: color.change($lighter-text-color, $alpha: 0.15);
   }
 
   &:focus-visible {
@@ -436,8 +471,8 @@
   }
 }
 
-body > [data-popper-placement] {
-  z-index: 3;
+[data-popper-placement] {
+  z-index: 9999;
 }
 
 .invisible {
@@ -602,15 +637,12 @@ body > [data-popper-placement] {
   &__highlightable {
     display: flex;
     flex-direction: column;
-    gap: 16px;
     flex: 0 1 auto;
     border-radius: 4px;
     border: 1px solid var(--background-border-color);
     transition: border-color 300ms linear;
-    min-height: 0;
     position: relative;
     background: var(--input-background-color);
-    overflow-y: auto;
 
     &.active {
       transition: none;
@@ -621,7 +653,7 @@ body > [data-popper-placement] {
   &__warning {
     color: $inverted-text-color;
     background: $ui-primary-color;
-    box-shadow: 0 2px 6px rgba($base-shadow-color, 0.3);
+    box-shadow: 0 2px 6px color.change($base-shadow-color, $alpha: 0.3);
     padding: 8px 10px;
     border-radius: 4px;
     font-size: 13px;
@@ -659,19 +691,12 @@ body > [data-popper-placement] {
       background: url('@/images/warning-stripes.svg') repeat-y;
       width: 5px;
       flex: 0 0 auto;
-
-      &:first-child {
-        border-start-start-radius: 4px;
-      }
-
-      &:last-child {
-        border-start-end-radius: 4px;
-      }
     }
 
     .autosuggest-input {
       flex: 1 1 auto;
-      border-bottom: 1px solid var(--background-border-color);
+      border: 1px solid var(--background-border-color);
+      border-width: 1px 0;
     }
   }
 
@@ -697,7 +722,7 @@ body > [data-popper-placement] {
 
   .spoiler-input__input {
     padding: 12px 12px - 5px;
-    background: rgba($ui-highlight-color, 0.05);
+    background: color.change($ui-highlight-color, $alpha: 0.05);
     color: $highlight-text-color;
   }
 
@@ -705,6 +730,8 @@ body > [data-popper-placement] {
     display: flex;
     align-items: center;
     gap: 8px;
+    margin: 8px;
+    flex-wrap: wrap;
 
     & > div {
       overflow: hidden;
@@ -715,6 +742,7 @@ body > [data-popper-placement] {
   &__uploads {
     padding: 0 12px;
     aspect-ratio: 3/2;
+    flex-shrink: 0;
   }
 
   .media-gallery {
@@ -813,7 +841,6 @@ body > [data-popper-placement] {
     flex-direction: column;
     gap: 12px;
     padding: 12px;
-    padding-top: 0;
   }
 
   &__submit {
@@ -874,6 +901,7 @@ body > [data-popper-placement] {
   }
 
   &__poll {
+    margin-top: 8px;
     display: flex;
     flex-direction: column;
     align-self: stretch;
@@ -939,12 +967,31 @@ body > [data-popper-placement] {
         line-height: 20px;
         letter-spacing: 0.1px;
         color: $highlight-text-color;
+        background-color: var(--input-background-color);
         white-space: nowrap;
         text-overflow: ellipsis;
         overflow: hidden;
       }
     }
   }
+
+  .status__quote {
+    margin: 0 8px;
+    max-height: 220px;
+    overflow: hidden;
+
+    // Override .status__content .status__content__text.status__content__text--visible
+    .status__content__text.status__content__text {
+      display: -webkit-box;
+    }
+
+    .status__content__text {
+      -webkit-line-clamp: 4;
+      line-clamp: 4;
+      -webkit-box-orient: vertical;
+      overflow: hidden;
+    }
+  }
 }
 
 .dropdown-button {
@@ -1372,8 +1419,16 @@ body > [data-popper-placement] {
   border: 0;
   background: transparent;
   padding: 0;
-  padding-top: 16px;
+  margin-top: 16px;
   text-decoration: none;
+  text-wrap: nowrap;
+
+  .status--is-quote & {
+    // Needed to prevent buttons from stretching across whole
+    // status width in Safari due to line-clamp
+    width: min-content;
+    white-space: nowrap;
+  }
 
   &:hover,
   &:active {
@@ -1426,16 +1481,12 @@ body > [data-popper-placement] {
 
 .focusable {
   &:focus-visible {
-    outline: 0;
-    background: rgba($ui-highlight-color, 0.05);
-    box-shadow: inset 0 0 0 2px $ui-button-focus-outline-color;
+    outline: 2px solid $ui-button-focus-outline-color;
+    outline-offset: -2px;
+    background: color.change($ui-highlight-color, $alpha: 0.05);
   }
 }
 
-.status--has-quote .quote-inline {
-  display: none;
-}
-
 .status {
   padding: 16px;
   min-height: 54px;
@@ -1469,27 +1520,24 @@ body > [data-popper-placement] {
     margin-top: 16px;
   }
 
-  &--is-quote {
-    border: none;
-  }
-
   &--in-thread {
     --thread-margin: calc(46px + 8px);
 
     border-bottom: 0;
 
-    .status__content,
-    .status__action-bar,
-    .media-gallery,
-    .video-player,
-    .audio-player,
-    .attachment-list,
-    .picture-in-picture-placeholder,
-    .more-from-author,
-    .status-card,
-    .hashtag-bar,
-    .content-warning,
-    .filter-warning {
+    & > .status__content,
+    & > .status__action-bar,
+    & > .media-gallery,
+    & > div > .video-player,
+    & > .audio-player,
+    & > .attachment-list,
+    & > .picture-in-picture-placeholder,
+    & > .more-from-author,
+    & > .status-card,
+    & > .hashtag-bar,
+    & > .content-warning,
+    & > .filter-warning,
+    & > .status__quote {
       margin-inline-start: var(--thread-margin);
       width: calc(100% - var(--thread-margin));
     }
@@ -1549,6 +1597,16 @@ body > [data-popper-placement] {
       }
     }
   }
+
+  .no-reduce-motion &--highlighted-entry::before {
+    content: '';
+    position: absolute;
+    inset: 0;
+    background: rgb(from $ui-highlight-color r g b / 20%);
+    opacity: 0;
+    animation: fade 0.7s reverse both 0.3s;
+    pointer-events: none;
+  }
 }
 
 .status__relative-time {
@@ -1590,6 +1648,7 @@ body > [data-popper-placement] {
   align-items: center;
   gap: 10px;
   overflow: hidden;
+  margin-inline-end: auto;
 
   .display-name {
     bdi {
@@ -1606,6 +1665,11 @@ body > [data-popper-placement] {
   }
 }
 
+.status__quote-cancel {
+  align-self: self-start;
+  order: 5;
+}
+
 .status__info {
   font-size: 15px;
   padding-bottom: 10px;
@@ -1690,10 +1754,10 @@ body > [data-popper-placement] {
 .notification-ungrouped--direct,
 .notification-group--direct,
 .notification-group--annual-report {
-  background: rgba($ui-highlight-color, 0.05);
+  background: color.change($ui-highlight-color, $alpha: 0.05);
 
   &:focus {
-    background: rgba($ui-highlight-color, 0.1);
+    background: color.change($ui-highlight-color, $alpha: 0.1);
   }
 }
 
@@ -1856,79 +1920,102 @@ body > [data-popper-placement] {
 }
 
 .status__quote {
-  --quote-margin: 36px;
+  // --status-gutter-width is currently only set inside of
+  // .notification-ungrouped, so everywhere else this will fall back
+  // to the pixel values
+  --quote-margin: var(--status-gutter-width);
 
   position: relative;
   margin-block-start: 16px;
   margin-inline-start: calc(var(--quote-margin) + var(--thread-margin, 0px));
-  border-radius: 8px;
+  border-radius: 12px;
   color: var(--nested-card-text);
-  background: var(--nested-card-background);
-  border: var(--nested-card-border);
-
-  @container (width > 460px) {
-    --quote-margin: 56px;
-  }
+  border: 1px solid var(--surface-border-color);
 }
 
 .status__quote--error {
+  box-sizing: border-box;
   display: flex;
   align-items: center;
+  justify-content: space-between;
   gap: 8px;
   padding: 12px;
-  font-size: 15px;
+  font-size: 14px;
+  line-height: 20px;
+  letter-spacing: 0.25px;
+  min-height: 56px;
+
+  .link-button {
+    font-size: inherit;
+    line-height: inherit;
+    letter-spacing: inherit;
+  }
 }
 
 .status__quote-author-button {
   position: relative;
   overflow: hidden;
-  display: inline-flex;
-  width: auto;
-  margin-block-start: 10px;
-  padding: 5px 12px;
+  display: flex;
+  margin-top: 8px;
+  padding: 8px 12px;
   align-items: center;
-  gap: 6px;
   font-family: inherit;
   font-size: 14px;
-  font-weight: 700;
-  line-height: normal;
-  letter-spacing: 0;
-  text-decoration: none;
-  color: $highlight-text-color;
-  background: var(--nested-card-background);
-  border: var(--nested-card-border);
-  border-radius: 4px;
-
-  &:active,
-  &:focus,
-  &:hover {
-    border-color: lighten($highlight-text-color, 4%);
-    color: lighten($highlight-text-color, 4%);
-  }
-
-  &:focus-visible {
-    outline: $ui-button-icon-focus-outline;
-  }
+  font-weight: 400;
+  line-height: 20px;
+  letter-spacing: 0.25px;
+  color: $darker-text-color;
+  background: var(--surface-variant-background-color);
+  border-radius: 8px;
+  cursor: default;
 }
 
-.status__quote-icon {
-  position: absolute;
-  inset-block-start: 18px;
-  inset-inline-start: -40px;
-  display: block;
-  width: 26px;
-  height: 26px;
-  padding: 5px;
-  color: #6a49ba;
-  z-index: 10;
+.status--is-quote {
+  border: none;
+  padding: 12px;
 
-  .status__quote--error & {
-    inset-block-start: 50%;
-    transform: translateY(-50%);
+  .status__info {
+    padding-bottom: 8px;
   }
 
-  @container (width > 460px) {
-    inset-inline-start: -50px;
+  .display-name,
+  .status__relative-time {
+    font-size: 14px;
+    line-height: 20px;
+    letter-spacing: 0.1px;
+  }
+
+  .display-name__account {
+    font-size: 12px;
+    line-height: 16px;
+    letter-spacing: 0.5px;
+  }
+
+  .status__content {
+    display: -webkit-box;
+    font-size: 14px;
+    letter-spacing: 0.25px;
+    line-height: 20px;
+    -webkit-line-clamp: 4;
+    line-clamp: 4;
+    -webkit-box-orient: vertical;
+    overflow: hidden;
+
+    p {
+      margin-bottom: 20px;
+
+      &:last-child {
+        margin-bottom: 0;
+      }
+    }
+  }
+
+  .media-gallery,
+  .video-player,
+  .audio-player,
+  .attachment-list,
+  .poll {
+    margin-top: 8px;
   }
 }
 
@@ -2000,7 +2087,7 @@ body > [data-popper-placement] {
 
   &__domain-pill {
     display: inline-flex;
-    background: rgba($highlight-text-color, 0.2);
+    background: color.change($highlight-text-color, $alpha: 0.2);
     border-radius: 4px;
     border: 0;
     color: $highlight-text-color;
@@ -2061,7 +2148,7 @@ body > [data-popper-placement] {
 
       &__handle {
         border: 2px dashed $highlight-text-color;
-        background: rgba($highlight-text-color, 0.1);
+        background: color.change($highlight-text-color, $alpha: 0.1);
         padding: 12px 8px;
         color: $highlight-text-color;
         border-radius: 4px;
@@ -2148,6 +2235,27 @@ body > [data-popper-placement] {
   }
 }
 
+.learn-more__popout {
+  gap: 8px;
+
+  &__content {
+    display: flex;
+    flex-direction: column;
+    gap: 4px;
+  }
+
+  h6 {
+    font-size: inherit;
+    font-weight: 500;
+    line-height: inherit;
+    letter-spacing: 0.1px;
+  }
+
+  .link-button {
+    font-weight: 500;
+  }
+}
+
 .account__wrapper {
   display: flex;
   gap: 10px;
@@ -2169,6 +2277,7 @@ body > [data-popper-placement] {
   position: relative;
   border-radius: var(--avatar-border-radius);
   background: var(--surface-background-color);
+  flex-shrink: 0;
 
   img {
     width: 100%;
@@ -2329,6 +2438,7 @@ a .account__avatar {
 .detailed-status__display-name,
 .detailed-status__datetime,
 .detailed-status__application,
+.detailed-status__link,
 .account__display-name {
   text-decoration: none;
 }
@@ -2361,7 +2471,8 @@ a.account__display-name {
 }
 
 .detailed-status__application,
-.detailed-status__datetime {
+.detailed-status__datetime,
+.detailed-status__link {
   color: inherit;
 }
 
@@ -2547,8 +2658,9 @@ a.account__display-name {
 }
 
 .status__relative-time,
-.detailed-status__datetime {
-  &:hover {
+.detailed-status__datetime,
+.detailed-status__link {
+  &:is(a):hover {
     text-decoration: underline;
   }
 }
@@ -2781,10 +2893,26 @@ a.account__display-name {
     color: $error-value-color;
   }
 
+  &--highlighted {
+    color: $highlight-text-color;
+  }
+
+  &-content {
+    display: flex;
+    flex-direction: column;
+  }
+
+  &-subtitle {
+    font-weight: 400;
+  }
+
   a,
   button {
     font: inherit;
-    display: block;
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    white-space: inherit;
     width: 100%;
     padding: 10px 14px;
     border: 0;
@@ -2793,21 +2921,36 @@ a.account__display-name {
     box-sizing: border-box;
     text-decoration: none;
     color: inherit;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
     text-align: inherit;
     border-radius: 4px;
 
     &:focus,
     &:hover,
     &:active {
+      &:not(:disabled, [aria-disabled='true']) {
+        background: var(--dropdown-border-color);
+        outline: 0;
+      }
+    }
+  }
+
+  button:disabled,
+  button[aria-disabled='true'] {
+    color: $dark-text-color;
+    cursor: default;
+
+    &:focus {
+      color: rgb(from $dark-text-color r g b / 70%);
       background: var(--dropdown-border-color);
       outline: 0;
     }
   }
 }
 
+.reblog-menu-item {
+  max-width: 360px;
+}
+
 .inline-account {
   display: inline-flex;
   align-items: center;
@@ -2828,11 +2971,14 @@ a.account__display-name {
   flex: 1 1 auto;
   flex-direction: row;
   justify-content: flex-start;
-  overflow-x: auto;
   position: relative;
 
-  &.unscrollable {
-    overflow-x: hidden;
+  .layout-multiple-columns & {
+    overflow-x: auto;
+
+    &.unscrollable {
+      overflow-x: hidden;
+    }
   }
 
   &__panels {
@@ -2843,12 +2989,12 @@ a.account__display-name {
     width: 100%;
     height: 100%;
     min-height: 100vh;
+    min-height: 100dvh;
     padding-bottom: env(safe-area-inset-bottom);
 
     &__pane {
       height: 100%;
       overflow: hidden;
-      pointer-events: none;
       display: flex;
       justify-content: flex-end;
       min-width: 285px;
@@ -2860,12 +3006,13 @@ a.account__display-name {
       &__inner {
         position: fixed;
         width: 285px;
-        pointer-events: auto;
         height: 100%;
       }
     }
 
     &__main {
+      --column-header-height: 62px;
+
       box-sizing: border-box;
       width: 100%;
       flex: 0 1 auto;
@@ -3004,6 +3151,34 @@ a.account__display-name {
   }
 }
 
+.column__alert {
+  position: sticky;
+  bottom: 0;
+  z-index: 10;
+  box-sizing: border-box;
+  display: grid;
+  width: 100%;
+  max-width: 360px;
+  padding: 1rem;
+  margin: auto auto 0;
+  overflow: clip;
+
+  &:empty {
+    padding: 0;
+  }
+
+  @media (max-width: #{$mobile-menu-breakpoint - 1}) {
+    // Compensate for mobile menubar
+    bottom: var(--mobile-bottom-nav-height);
+  }
+
+  & > * {
+    // Make all nested alerts occupy the same space
+    // rather than stack
+    grid-area: 1 / 1;
+  }
+}
+
 .ui {
   --mobile-bottom-nav-height: 55px;
   --last-content-item-border-width: 2px;
@@ -3044,7 +3219,6 @@ a.account__display-name {
 .column,
 .drawer {
   flex: 1 1 100%;
-  overflow: hidden;
 }
 
 @media screen and (width > $mobile-breakpoint) {
@@ -3153,6 +3327,7 @@ a.account__display-name {
 
   .columns-area__panels {
     min-height: 100vh;
+    min-height: 100dvh;
     gap: 0;
   }
 
@@ -3246,7 +3421,7 @@ a.account__display-name {
 
 .columns-area__panels__pane--overlay {
   pointer-events: auto;
-  background: rgba($base-overlay-background, 0.5);
+  background: color.change($base-overlay-background, $alpha: 0.5);
   z-index: 3;
 
   .columns-area__panels__pane__inner {
@@ -3481,11 +3656,10 @@ a.account__display-name {
   display: flex;
   flex-direction: column;
   height: calc(100% - 10px);
-  overflow-y: hidden;
+  overflow-y: auto;
 
   .compose-form {
     flex: 1 1 auto;
-    min-height: 0;
   }
 }
 
@@ -3784,7 +3958,10 @@ a.account__display-name {
   border-radius: 10px;
   padding: 0;
   user-select: none;
-  -webkit-tap-highlight-color: rgba($base-overlay-background, 0);
+  -webkit-tap-highlight-color: color.change(
+    $base-overlay-background,
+    $alpha: 0
+  );
   -webkit-tap-highlight-color: transparent;
 }
 
@@ -3874,16 +4051,18 @@ a.account__display-name {
   display: flex;
   align-items: center;
   gap: 8px;
+  width: 100%;
+  padding: 12px;
   font-size: 16px;
   font-weight: 400;
-  padding: 12px;
   text-decoration: none;
   overflow: hidden;
   white-space: nowrap;
-  border: 0;
-  background: transparent;
   color: $secondary-text-color;
+  background: transparent;
+  border: 0;
   border-left: 4px solid transparent;
+  box-sizing: border-box;
 
   &:hover,
   &:focus,
@@ -4031,7 +4210,7 @@ a.account__display-name {
     cursor: pointer;
 
     & > div {
-      background: rgba($base-shadow-color, 0.6);
+      background: color.change($base-shadow-color, $alpha: 0.6);
       border-radius: 8px;
       padding: 12px 9px;
       backdrop-filter: $backdrop-blur-filter;
@@ -4278,6 +4457,11 @@ a.status-card {
     background: var(--on-surface-color);
   }
 
+  &:focus-visible {
+    outline: 2px solid $ui-button-focus-outline-color;
+    outline-offset: -2px;
+  }
+
   .icon {
     width: 22px;
     height: 22px;
@@ -4361,7 +4545,7 @@ a.status-card {
   z-index: 1;
 
   &.active {
-    box-shadow: 0 1px 0 rgba($highlight-text-color, 0.3);
+    box-shadow: 0 1px 0 color.change($highlight-text-color, $alpha: 0.3);
 
     &::before {
       display: block;
@@ -4377,8 +4561,8 @@ a.status-card {
       z-index: 1;
       background: radial-gradient(
         ellipse,
-        rgba($ui-highlight-color, 0.23) 0%,
-        rgba($ui-highlight-color, 0) 60%
+        color.change($ui-highlight-color, $alpha: 0.23) 0%,
+        color.change($ui-highlight-color, $alpha: 0) 60%
       );
     }
   }
@@ -4472,7 +4656,7 @@ a.status-card {
   &.active {
     .column-header__icon {
       color: $highlight-text-color;
-      text-shadow: 0 0 10px rgba($highlight-text-color, 0.4);
+      text-shadow: 0 0 10px color.change($highlight-text-color, $alpha: 0.4);
     }
   }
 
@@ -4817,7 +5001,7 @@ a.status-card {
     font-size: 14px;
 
     &__label {
-      background-color: rgba($black, 0.45);
+      background-color: color.change($black, $alpha: 0.45);
       backdrop-filter: $backdrop-blur-filter;
       border-radius: 8px;
       padding: 12px 16px;
@@ -4837,7 +5021,7 @@ a.status-card {
     &:hover,
     &:focus {
       .spoiler-button__overlay__label {
-        background-color: rgba($black, 0.9);
+        background-color: color.change($black, $alpha: 0.9);
       }
     }
   }
@@ -5228,7 +5412,7 @@ a.status-card {
 
 .upload-area {
   align-items: center;
-  background: rgba($base-overlay-background, 0.8);
+  background: color.change($base-overlay-background, $alpha: 0.8);
   display: flex;
   height: 100vh;
   justify-content: center;
@@ -5263,7 +5447,7 @@ a.status-card {
   z-index: -1;
   border-radius: 4px;
   background: $ui-base-color;
-  box-shadow: 0 0 5px rgba($base-shadow-color, 0.2);
+  box-shadow: 0 0 5px color.change($base-shadow-color, $alpha: 0.2);
 }
 
 .upload-area__content {
@@ -5364,7 +5548,8 @@ a.status-card {
 }
 
 .privacy-dropdown__dropdown,
-.language-dropdown__dropdown {
+.language-dropdown__dropdown,
+.visibility-dropdown__dropdown {
   box-shadow: var(--dropdown-shadow);
   background: var(--dropdown-background-color);
   backdrop-filter: $backdrop-blur-filter;
@@ -5373,7 +5558,6 @@ a.status-card {
   border-radius: 4px;
   overflow: hidden;
   z-index: 2;
-  width: 300px;
 
   &.top {
     transform-origin: 50% 100%;
@@ -5393,7 +5577,10 @@ a.status-card {
   z-index: 9999;
 }
 
-.privacy-dropdown__option {
+.privacy-dropdown__option,
+.visibility-dropdown__option {
+  --dropdown-text-color: $primary-text-color;
+
   font-size: 14px;
   line-height: 20px;
   letter-spacing: 0.25px;
@@ -5403,7 +5590,22 @@ a.status-card {
   align-items: center;
   gap: 12px;
   border-radius: 4px;
-  color: $primary-text-color;
+  color: var(--dropdown-text-color);
+
+  // Make sure adjacent hover/active states don't have a meeting radius.
+  &:hover + &:is(:focus, .active),
+  &:is(:focus, .active) + &:hover,
+  &:is(:focus, .active) + &:is(:focus, .active) {
+    border-top-left-radius: 0;
+    border-top-right-radius: 0;
+  }
+
+  &:hover:has(+ :focus, .active),
+  &:is(:focus, .active):has(+ :hover),
+  &:is(:focus, .active):has(+ :is(:focus, .active)) {
+    border-bottom-left-radius: 0;
+    border-bottom-right-radius: 0;
+  }
 
   &:hover,
   &:active {
@@ -5413,13 +5615,16 @@ a.status-card {
   &:focus,
   &.active {
     background: $ui-highlight-color;
-    color: $primary-text-color;
+    color: var(--dropdown-text-color);
     outline: 0;
 
     .privacy-dropdown__option__content,
     .privacy-dropdown__option__content strong,
-    .privacy-dropdown__option__additional {
-      color: $primary-text-color;
+    .privacy-dropdown__option__additional,
+    .visibility-dropdown__option__content,
+    .visibility-dropdown__option__content strong,
+    .visibility-dropdown__option__additional {
+      color: var(--dropdown-text-color);
     }
   }
 
@@ -5432,13 +5637,15 @@ a.status-card {
   }
 }
 
-.privacy-dropdown__option__icon {
+.privacy-dropdown__option__icon,
+.visibility-dropdown__option__icon {
   display: flex;
   align-items: center;
   justify-content: center;
 }
 
-.privacy-dropdown__option__content {
+.privacy-dropdown__option__content,
+.visibility-dropdown__option__content {
   flex: 1 1 auto;
   color: $darker-text-color;
 
@@ -5457,6 +5664,7 @@ a.status-card {
 
 .language-dropdown {
   &__dropdown {
+    width: 300px;
     padding: 0;
 
     .emoji-mart-search {
@@ -5539,6 +5747,54 @@ a.status-card {
   }
 }
 
+.visibility-dropdown {
+  &__overlay[data-popper-placement] {
+    z-index: 9999;
+  }
+
+  &.disabled {
+    opacity: 0.6;
+    cursor: default;
+  }
+
+  &__label {
+    display: block;
+    font-weight: 500;
+    margin-bottom: 8px;
+  }
+
+  &__button {
+    display: flex;
+    align-items: center;
+    color: $primary-text-color;
+    background: var(--input-background-color);
+    border: 1px solid var(--background-border-color);
+    padding: 8px 12px;
+    width: 100%;
+    text-align: left;
+    border-radius: 4px;
+    font-size: 14px;
+    height: 40px;
+
+    &:disabled {
+      cursor: default;
+    }
+  }
+
+  &__icon {
+    margin-inline: auto -4px;
+    width: 18px;
+    height: 18px;
+    opacity: 0.5;
+  }
+
+  &__helper {
+    margin-top: 4px;
+    font-size: 0.8em;
+    color: $dark-text-color;
+  }
+}
+
 .search {
   margin-bottom: 32px;
   position: relative;
@@ -5855,7 +6111,7 @@ a.status-card {
     align-items: center;
 
     .icon-button {
-      color: rgba($white, 0.7);
+      color: color.change($white, $alpha: 0.7);
       padding: 8px;
 
       .icon {
@@ -5868,11 +6124,11 @@ a.status-card {
       &:focus,
       &:active {
         color: $white;
-        background-color: rgba($white, 0.15);
+        background-color: color.change($white, $alpha: 0.15);
       }
 
       &:focus {
-        background-color: rgba($white, 0.3);
+        background-color: color.change($white, $alpha: 0.3);
       }
     }
   }
@@ -5913,7 +6169,7 @@ a.status-card {
   background: transparent;
   box-sizing: border-box;
   border: 0;
-  color: rgba($white, 0.7);
+  color: color.change($white, $alpha: 0.7);
   cursor: pointer;
   display: flex;
   align-items: center;
@@ -5967,11 +6223,11 @@ a.status-card {
       &:focus,
       &:active {
         color: $white;
-        background-color: rgba($white, 0.15);
+        background-color: color.change($white, $alpha: 0.15);
       }
 
       &:focus {
-        background-color: rgba($white, 0.3);
+        background-color: color.change($white, $alpha: 0.3);
       }
 
       &.active {
@@ -5980,11 +6236,11 @@ a.status-card {
         &:hover,
         &:focus,
         &:active {
-          background: rgba($highlight-text-color, 0.15);
+          background: color.change($highlight-text-color, $alpha: 0.15);
         }
 
         &:focus {
-          background: rgba($highlight-text-color, 0.3);
+          background: color.change($highlight-text-color, $alpha: 0.3);
         }
       }
 
@@ -5994,11 +6250,11 @@ a.status-card {
         &:hover,
         &:focus,
         &:active {
-          background: rgba($gold-star, 0.15);
+          background: color.change($gold-star, $alpha: 0.15);
         }
 
         &:focus {
-          background: rgba($gold-star, 0.3);
+          background: color.change($gold-star, $alpha: 0.3);
         }
       }
 
@@ -6154,7 +6410,10 @@ a.status-card {
       line-height: 24px;
       color: $primary-text-color;
       font-weight: 500;
-      margin-bottom: 8px;
+
+      &:not(:only-child) {
+        margin-bottom: 8px;
+      }
     }
 
     strong {
@@ -6337,6 +6596,15 @@ a.status-card {
     letter-spacing: 0.25px;
     overflow-y: auto;
 
+    &__description {
+      margin: 24px 24px 0;
+      color: $darker-text-color;
+
+      a {
+        color: inherit;
+      }
+    }
+
     &__form {
       display: flex;
       flex-direction: column;
@@ -6372,6 +6640,14 @@ a.status-card {
         max-height: 45vh;
       }
     }
+
+    &__actions {
+      display: flex;
+      align-items: center;
+      gap: 8px;
+      justify-content: flex-end;
+      padding: 0 24px 24px;
+    }
   }
 
   &__popout {
@@ -6861,7 +7137,7 @@ a.status-card {
     display: block;
     color: $white;
     border: 0;
-    background: rgba($black, 0.65);
+    background: color.change($black, $alpha: 0.65);
     backdrop-filter: $backdrop-blur-filter;
     padding: 3px 12px;
     border-radius: 99px;
@@ -6886,7 +7162,7 @@ a.status-card {
   text-align: center;
   color: $white;
   border: 0;
-  background: rgba($black, 0.65);
+  background: color.change($black, $alpha: 0.65);
   backdrop-filter: $backdrop-blur-filter;
   padding: 3px 8px;
   border-radius: 4px;
@@ -6907,8 +7183,9 @@ a.status-card {
   cursor: default;
 }
 
-.media-gallery__alt__popover {
-  background: rgba($black, 0.65);
+.info-tooltip {
+  color: $white;
+  background: color.change($black, $alpha: 0.65);
   backdrop-filter: $backdrop-blur-filter;
   border-radius: 4px;
   box-shadow: var(--dropdown-shadow);
@@ -6919,20 +7196,36 @@ a.status-card {
   max-height: 30em;
   overflow-y: auto;
 
+  &--solid {
+    color: var(--nested-card-text);
+    background:
+      /* This is a bit of a silly hack for layering two background colours
+       * since --nested-card-background is too transparent for a tooltip */
+      linear-gradient(
+        var(--nested-card-background),
+        var(--nested-card-background)
+      ),
+      linear-gradient(var(--background-color), var(--background-color));
+    border: var(--nested-card-border);
+  }
+
   h4 {
     font-size: 15px;
     line-height: 20px;
     font-weight: 500;
-    color: $white;
     margin-bottom: 8px;
   }
 
   p {
     font-size: 15px;
     line-height: 20px;
-    color: rgba($white, 0.85);
+    opacity: 0.85;
     white-space: pre-line;
   }
+
+  .button {
+    margin-block-start: 8px;
+  }
 }
 
 .attachment-list {
@@ -7374,8 +7667,8 @@ a.status-card {
     box-sizing: border-box;
     background: linear-gradient(
       0deg,
-      rgba($base-shadow-color, 0.85) 0,
-      rgba($base-shadow-color, 0.45) 60%,
+      color.change($base-shadow-color, $alpha: 0.85) 0,
+      color.change($base-shadow-color, $alpha: 0.45) 60%,
       transparent
     );
     padding: 0 15px;
@@ -7471,7 +7764,7 @@ a.status-card {
       flex: 0 0 auto;
       background: transparent;
       border: 0;
-      color: rgba($white, 0.75);
+      color: color.change($white, $alpha: 0.75);
       font-weight: 500;
 
       &:active,
@@ -7535,7 +7828,7 @@ a.status-card {
     &::before {
       content: '';
       width: 50px;
-      background: rgba($white, 0.35);
+      background: color.change($white, $alpha: 0.35);
       border-radius: 4px;
       display: block;
       position: absolute;
@@ -7567,7 +7860,7 @@ a.status-card {
       margin-inline-start: -6px;
       transform: translate(0, -50%);
       background: $white;
-      box-shadow: 1px 2px 6px rgba($base-shadow-color, 0.2);
+      box-shadow: 1px 2px 6px color.change($base-shadow-color, $alpha: 0.2);
       opacity: 0;
 
       .no-reduce-motion & {
@@ -7605,7 +7898,7 @@ a.status-card {
     &::before {
       content: '';
       width: 100%;
-      background: rgba($white, 0.35);
+      background: color.change($white, $alpha: 0.35);
       border-radius: 4px;
       display: block;
       position: absolute;
@@ -7624,7 +7917,7 @@ a.status-card {
     }
 
     &__buffer {
-      background: rgba($white, 0.2);
+      background: color.change($white, $alpha: 0.2);
     }
 
     &__handle {
@@ -7637,7 +7930,7 @@ a.status-card {
       top: 10px;
       margin-inline-start: -6px;
       background: $white;
-      box-shadow: 1px 2px 6px rgba($base-shadow-color, 0.2);
+      box-shadow: 1px 2px 6px color.change($base-shadow-color, $alpha: 0.2);
 
       .no-reduce-motion & {
         transition: opacity 0.1s ease;
@@ -7661,7 +7954,7 @@ a.status-card {
     top: 50%;
     inset-inline-start: 50%;
     transform: translate(-50%, -50%);
-    background: rgba($base-shadow-color, 0.45);
+    background: color.change($base-shadow-color, $alpha: 0.45);
     backdrop-filter: $backdrop-blur-filter;
     color: $white;
     border-radius: 8px;
@@ -7996,7 +8289,7 @@ noscript {
   inset-inline-start: 0;
   width: 100%;
   height: 100%;
-  background: rgba($base-overlay-background, 0.5);
+  background: color.change($base-overlay-background, $alpha: 0.5);
 }
 
 .focal-point {
@@ -8018,7 +8311,7 @@ noscript {
     transform: translate(-50%, -50%);
     border: 2px solid #fff;
     border-radius: 50%;
-    box-shadow: 0 0 0 9999em rgba($base-shadow-color, 0.35);
+    box-shadow: 0 0 0 9999em color.change($base-shadow-color, $alpha: 0.35);
     pointer-events: none;
   }
 }
@@ -8125,47 +8418,6 @@ noscript {
     overflow: hidden;
     margin-inline-start: -2px; // aligns the pfp with content below
 
-    &__buttons {
-      display: flex;
-      align-items: center;
-      gap: 8px;
-      padding-top: 55px;
-      overflow: hidden;
-
-      .button {
-        flex-shrink: 1;
-        white-space: nowrap;
-        min-width: 80px;
-      }
-
-      .icon-button {
-        border: 1px solid var(--background-border-color);
-        border-radius: 4px;
-        box-sizing: content-box;
-        padding: 5px;
-
-        .icon {
-          width: 24px;
-          height: 24px;
-        }
-
-        &.copied {
-          border-color: $valid-value-color;
-        }
-      }
-
-      .optional {
-        @container account-header (max-width: 372px) {
-          display: none;
-        }
-
-        // Fallback for older browsers with no container queries support
-        @media screen and (max-width: (372px + 55px)) {
-          display: none;
-        }
-      }
-    }
-
     &__name {
       margin-top: 16px;
       margin-bottom: 16px;
@@ -8214,6 +8466,69 @@ noscript {
     }
   }
 
+  &__follow-button {
+    flex-grow: 1;
+  }
+
+  &__buttons {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+
+    $button-breakpoint: 420px;
+    $button-fallback-breakpoint: #{$button-breakpoint} + 55px;
+
+    &--desktop {
+      margin-top: 55px;
+
+      @container (width < #{$button-breakpoint}) {
+        display: none;
+      }
+
+      @supports (not (container-type: inline-size)) {
+        @media (max-width: #{$button-fallback-breakpoint}) {
+          display: none;
+        }
+      }
+    }
+
+    &--mobile {
+      margin-block: 16px;
+
+      @container (width >= #{$button-breakpoint}) {
+        display: none;
+      }
+
+      @supports (not (container-type: inline-size)) {
+        @media (min-width: (#{$button-fallback-breakpoint} + 1px)) {
+          display: none;
+        }
+      }
+    }
+
+    .button {
+      flex-shrink: 1;
+      white-space: nowrap;
+      min-width: 80px;
+    }
+
+    .icon-button {
+      border: 1px solid var(--background-border-color);
+      border-radius: 4px;
+      box-sizing: content-box;
+      padding: 5px;
+
+      .icon {
+        width: 24px;
+        height: 24px;
+      }
+
+      &.copied {
+        border-color: $valid-value-color;
+      }
+    }
+  }
+
   &__bio {
     .account__header__content {
       color: $primary-text-color;
@@ -8260,7 +8575,7 @@ noscript {
       }
 
       .verified {
-        border: 1px solid rgba($valid-value-color, 0.5);
+        border: 1px solid color.change($valid-value-color, $alpha: 0.5);
         margin-top: -1px;
         margin-inline: -1px;
 
@@ -8480,7 +8795,7 @@ noscript {
       width: 50px;
 
       path:first-child {
-        fill: rgba($highlight-text-color, 0.25) !important;
+        fill: color.change($highlight-text-color, $alpha: 0.25) !important;
         fill-opacity: 1 !important;
       }
 
@@ -8505,7 +8820,7 @@ noscript {
 
       .trends__item__sparkline {
         path:first-child {
-          fill: rgba($gold-star, 0.25) !important;
+          fill: color.change($gold-star, $alpha: 0.25) !important;
         }
 
         path:last-child {
@@ -8811,6 +9126,10 @@ noscript {
 .conversation {
   position: relative;
 
+  // When scrolling these elements into view, take into account
+  // the column header height
+  scroll-margin-top: var(--column-header-height, 0);
+
   &.unread {
     &::before {
       content: '';
@@ -9290,13 +9609,6 @@ noscript {
     font-size: 14px;
   }
 
-  &__icon {
-    color: $highlight-text-color;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-  }
-
   &__lead {
     margin-bottom: 20px;
 
@@ -9666,7 +9978,7 @@ noscript {
   margin-bottom: 5px;
   border-radius: 8px;
   border: 1px solid $highlight-text-color;
-  background: rgba($highlight-text-color, 0.15);
+  background: color.change($highlight-text-color, $alpha: 0.15);
   overflow: hidden;
   flex-shrink: 0;
 
@@ -9721,7 +10033,7 @@ noscript {
     }
 
     .button-tertiary {
-      background: rgba($ui-base-color, 0.15);
+      background: color.change($ui-base-color, $alpha: 0.15);
       backdrop-filter: blur(8px);
     }
   }
@@ -9738,7 +10050,7 @@ noscript {
 
 .warning-banner {
   border: 1px solid $warning-red;
-  background: rgba($warning-red, 0.15);
+  background: color.change($warning-red, $alpha: 0.15);
 
   &__message {
     h1 {
@@ -10058,7 +10370,7 @@ noscript {
 .notification-list {
   position: fixed;
   bottom: 2rem;
-  inset-inline-start: 0;
+  inset-inline-start: 1rem;
   z-index: 9999;
   display: flex;
   flex-direction: column;
@@ -10066,58 +10378,96 @@ noscript {
 }
 
 .notification-bar {
+  --alert-edge-spacing: 1rem;
+
+  display: flex;
+  gap: 10px;
   flex: 0 0 auto;
-  position: relative;
-  inset-inline-start: -100%;
   width: auto;
   padding: 15px;
   margin: 0;
   color: $white;
-  background: rgba($black, 0.85);
+  background: color.change($black, $alpha: 0.85);
   backdrop-filter: blur(8px);
   border: 1px solid rgba(lighten($classic-base-color, 4%), 0.85);
   border-radius: 8px;
   box-shadow:
-    0 10px 15px -3px rgba($base-shadow-color, 0.25),
-    0 4px 6px -4px rgba($base-shadow-color, 0.25);
+    0 10px 15px -3px color.change($base-shadow-color, $alpha: 0.25),
+    0 4px 6px -4px color.change($base-shadow-color, $alpha: 0.25);
   cursor: default;
   font-size: 15px;
   line-height: 21px;
 
-  &.notification-bar-active {
-    inset-inline-start: 1rem;
+  &.from-side {
+    translate: calc(
+      -1 * (100% + var(--alert-edge-spacing)) * var(--text-x-direction)
+    );
+  }
+
+  &.from-below {
+    translate: 0 calc(100% + var(--alert-edge-spacing));
+  }
+
+  &.notification-bar--active {
+    translate: none;
   }
 
   .no-reduce-motion & {
     transition: 0.5s cubic-bezier(0.89, 0.01, 0.5, 1.1);
-    transform: translateZ(0);
+    will-change: translate;
   }
 }
 
-.notification-bar-title {
-  margin-inline-end: 5px;
+.notification-bar__content {
+  margin-inline-end: auto;
 }
 
-.notification-bar-title,
-.notification-bar-action {
+.notification-bar__title {
+  margin-inline-end: 5px;
   font-weight: 700;
 }
 
-.notification-bar-action {
+.notification-bar__action {
   display: inline-block;
   border: 0;
   background: transparent;
   text-transform: uppercase;
-  margin-inline-start: 10px;
   cursor: pointer;
   color: $blurple-300;
+  font-weight: 700;
   border-radius: 4px;
   padding: 0 4px;
 
   &:hover,
   &:focus,
   &:active {
-    background: rgba($ui-base-color, 0.85);
+    background: color.change($ui-base-color, $alpha: 0.85);
+  }
+}
+
+.notification-bar__dismiss-button {
+  margin-top: -2px;
+  color: rgb(from currentColor r g b / 85%);
+
+  &:hover,
+  &:focus,
+  &:active {
+    color: currentColor;
+  }
+}
+
+.notification-bar__loading-indicator {
+  --spinner-size: 22px;
+
+  position: relative;
+  height: var(--spinner-size);
+  width: var(--spinner-size);
+  margin-inline-start: 2px;
+
+  svg {
+    color: $white;
+    height: var(--spinner-size);
+    width: var(--spinner-size);
   }
 }
 
@@ -10215,7 +10565,11 @@ noscript {
   padding: 16px 0;
   padding-bottom: 0;
   border-bottom: 1px solid var(--background-border-color);
-  background: rgba($ui-highlight-color, 0.05);
+  background: color.change($ui-highlight-color, $alpha: 0.05);
+
+  &.focusable:focus-visible {
+    background: color.change($ui-highlight-color, $alpha: 0.05);
+  }
 
   &__header {
     display: flex;
@@ -10289,8 +10643,10 @@ noscript {
     }
 
     &__scrollable {
+      box-sizing: border-box;
       display: flex;
       flex-wrap: nowrap;
+      min-height: 228px;
       gap: 16px;
       padding: 16px;
       scroll-snap-type: x mandatory;
@@ -10589,6 +10945,7 @@ noscript {
     font-weight: 500;
     color: $primary-text-color;
     text-decoration: none;
+    min-width: 0;
 
     &:hover,
     &:focus,
@@ -10816,21 +11173,23 @@ noscript {
     }
   }
 
-  .status {
+  .status:not(.status--is-quote) {
     border: 0;
     padding: 0;
-
-    &__avatar {
-      width: 40px;
-      height: 40px;
-    }
   }
 
   .status__wrapper-direct {
     background: transparent;
   }
 
-  $icon-margin: 48px; // 40px avatar + 8px gap
+  .status {
+    // 40px avatar + 8px gap
+    --status-gutter-width: 48px;
+  }
+
+  .status--is-quote {
+    --status-gutter-width: 0;
+  }
 
   .status__content,
   .status__action-bar,
@@ -10844,16 +11203,16 @@ noscript {
   .hashtag-bar,
   .content-warning,
   .filter-warning {
-    margin-inline-start: $icon-margin;
-    width: calc(100% - $icon-margin);
+    margin-inline-start: var(--status-gutter-width);
+    width: calc(100% - var(--status-gutter-width));
   }
 
   .more-from-author {
-    width: calc(100% - $icon-margin + 2px);
+    width: calc(100% - var(--status-gutter-width) + 2px);
   }
 
   .status__content__read-more-button {
-    margin-inline-start: $icon-margin;
+    margin-inline-start: var(--status-gutter-width);
   }
 
   .notification__report {
diff --git a/app/javascript/styles/mastodon/css_variables.scss b/app/javascript/styles/mastodon/css_variables.scss
index 431cdd7a8e8..78915ae10ee 100644
--- a/app/javascript/styles/mastodon/css_variables.scss
+++ b/app/javascript/styles/mastodon/css_variables.scss
@@ -5,10 +5,11 @@
 :root {
   --dropdown-border-color: #{lighten($ui-base-color, 4%)};
   --dropdown-background-color: #{rgba(darken($ui-base-color, 8%), 0.9)};
-  --dropdown-shadow: 0 20px 25px -5px #{rgba($base-shadow-color, 0.25)},
-    0 8px 10px -6px #{rgba($base-shadow-color, 0.25)};
+  --dropdown-shadow:
+    0 20px 25px -5px #{color.change($base-shadow-color, $alpha: 0.25)},
+    0 8px 10px -6px #{color.change($base-shadow-color, $alpha: 0.25)};
   --modal-background-color: #{rgba(darken($ui-base-color, 8%), 0.7)};
-  --modal-background-variant-color: #{rgba($ui-base-color, 0.7)};
+  --modal-background-variant-color: #{color.change($ui-base-color, $alpha: 0.7)};
   --modal-border-color: #{lighten($ui-base-color, 4%)};
   --background-border-color: #{lighten($ui-base-color, 4%)};
   --background-color: #{darken($ui-base-color, 8%)};
@@ -16,10 +17,13 @@
   --surface-background-color: #{darken($ui-base-color, 4%)};
   --surface-variant-background-color: #{$ui-base-color};
   --surface-variant-active-background-color: #{lighten($ui-base-color, 4%)};
+  --surface-border-color: #{lighten($ui-base-color, 8%)};
   --on-surface-color: #{color.adjust($ui-base-color, $alpha: -0.5)};
   --avatar-border-radius: 8px;
   --media-outline-color: #{rgba(#fcf8ff, 0.15)};
-  --overlay-icon-shadow: drop-shadow(0 0 8px #{rgba($base-shadow-color, 0.35)});
+  --overlay-icon-shadow: drop-shadow(
+    0 0 8px #{color.change($base-shadow-color, $alpha: 0.35)}
+  );
   --error-background-color: #{darken($error-red, 16%)};
   --error-active-background-color: #{darken($error-red, 12%)};
   --on-error-color: #fff;
diff --git a/app/javascript/styles/mastodon/forms.scss b/app/javascript/styles/mastodon/forms.scss
index 4762168bd89..b3708b722e3 100644
--- a/app/javascript/styles/mastodon/forms.scss
+++ b/app/javascript/styles/mastodon/forms.scss
@@ -1,3 +1,4 @@
+@use 'sass:color';
 @use 'variables' as *;
 @use 'functions' as *;
 
@@ -733,20 +734,20 @@ code {
   text-align: center;
 
   &.notice {
-    border: 1px solid rgba($valid-value-color, 0.5);
-    background: rgba($valid-value-color, 0.25);
+    border: 1px solid color.change($valid-value-color, $alpha: 0.5);
+    background: color.change($valid-value-color, $alpha: 0.25);
     color: $valid-value-color;
   }
 
   &.warning {
-    border: 1px solid rgba($gold-star, 0.5);
-    background: rgba($gold-star, 0.25);
+    border: 1px solid color.change($gold-star, $alpha: 0.5);
+    background: color.change($gold-star, $alpha: 0.25);
     color: $gold-star;
   }
 
   &.alert {
-    border: 1px solid rgba($error-value-color, 0.5);
-    background: rgba($error-value-color, 0.1);
+    border: 1px solid color.change($error-value-color, $alpha: 0.5);
+    background: color.change($error-value-color, $alpha: 0.1);
     color: $error-value-color;
   }
 
@@ -965,7 +966,7 @@ code {
   background: $simple-background-color;
   padding: 4px;
   margin: 0 10px 20px 0;
-  box-shadow: 0 0 15px rgba($base-shadow-color, 0.2);
+  box-shadow: 0 0 15px color.change($base-shadow-color, $alpha: 0.2);
   display: inline-block;
 
   svg {
@@ -988,10 +989,10 @@ code {
 .simple_form {
   .warning {
     box-sizing: border-box;
-    background: rgba($error-value-color, 0.5);
+    background: color.change($error-value-color, $alpha: 0.5);
     color: $primary-text-color;
-    text-shadow: 1px 1px 0 rgba($base-shadow-color, 0.3);
-    box-shadow: 0 2px 6px rgba($base-shadow-color, 0.4);
+    text-shadow: 1px 1px 0 color.change($base-shadow-color, $alpha: 0.3);
+    box-shadow: 0 2px 6px color.change($base-shadow-color, $alpha: 0.4);
     border-radius: 4px;
     padding: 10px;
     margin-bottom: 15px;
@@ -1350,7 +1351,7 @@ code {
       width: 100%;
       height: 100%;
       position: absolute;
-      background: rgba($error-value-color, 0.25);
+      background: color.change($error-value-color, $alpha: 0.25);
       z-index: 2;
       border-radius: 8px;
     }
diff --git a/app/javascript/styles/mastodon/polls.scss b/app/javascript/styles/mastodon/polls.scss
index f49ce3c413b..b13c9d61329 100644
--- a/app/javascript/styles/mastodon/polls.scss
+++ b/app/javascript/styles/mastodon/polls.scss
@@ -1,3 +1,4 @@
+@use 'sass:color';
 @use 'variables' as *;
 @use 'functions' as *;
 
@@ -101,7 +102,8 @@
       cursor: pointer;
     }
 
-    &.editable {
+    &.editable,
+    &.disabled {
       align-items: center;
       overflow: visible;
     }
@@ -159,7 +161,8 @@
     }
   }
 
-  &__option.editable &__input {
+  &__option.editable &__input,
+  &__option.disabled &__input {
     &:active,
     &:focus,
     &:hover {
@@ -206,7 +209,7 @@
 
     &:active,
     &:focus {
-      background-color: rgba($dark-text-color, 0.1);
+      background-color: color.change($dark-text-color, $alpha: 0.1);
     }
   }
 
@@ -225,7 +228,7 @@
     background: rgba(darken($ui-primary-color, 14%), 0.7);
 
     &.leading {
-      background: rgba($ui-highlight-color, 0.5);
+      background: color.change($ui-highlight-color, $alpha: 0.5);
     }
   }
 }
diff --git a/app/javascript/styles/mastodon/tables.scss b/app/javascript/styles/mastodon/tables.scss
index cf06110213f..3489d22e5d7 100644
--- a/app/javascript/styles/mastodon/tables.scss
+++ b/app/javascript/styles/mastodon/tables.scss
@@ -195,7 +195,7 @@ a.table-action-link {
   &__toolbar {
     position: sticky;
     top: 0;
-    z-index: 1;
+    z-index: 200;
     border: 1px solid var(--background-border-color);
     background: var(--background-color);
     border-radius: 4px 4px 0 0;
@@ -205,6 +205,10 @@ a.table-action-link {
     &__actions {
       text-align: end;
       padding-inline-end: 16px - 5px;
+
+      .table-action-link {
+        padding: 0;
+      }
     }
   }
 
diff --git a/app/javascript/styles/mastodon/widgets.scss b/app/javascript/styles/mastodon/widgets.scss
index 8d09c7d5839..266a9ca9307 100644
--- a/app/javascript/styles/mastodon/widgets.scss
+++ b/app/javascript/styles/mastodon/widgets.scss
@@ -1,3 +1,4 @@
+@use 'sass:color';
 @use 'variables' as *;
 @use 'functions' as *;
 
@@ -16,7 +17,7 @@
       padding: 15px;
       text-decoration: none;
       color: inherit;
-      box-shadow: 0 0 15px rgba($base-shadow-color, 0.2);
+      box-shadow: 0 0 15px color.change($base-shadow-color, $alpha: 0.2);
     }
 
     & > a {
diff --git a/app/javascript/testing/api.ts b/app/javascript/testing/api.ts
index 4948d719974..dd45b7e7b6b 100644
--- a/app/javascript/testing/api.ts
+++ b/app/javascript/testing/api.ts
@@ -1,7 +1,10 @@
+import type { CompactEmoji } from 'emojibase';
 import { http, HttpResponse } from 'msw';
 import { action } from 'storybook/actions';
 
-import { relationshipsFactory } from './factories';
+import { toSupportedLocale } from '@/mastodon/features/emoji/locale';
+
+import { customEmojiFactory, relationshipsFactory } from './factories';
 
 export const mockHandlers = {
   mute: http.post<{ id: string }>('/api/v1/accounts/:id/mute', ({ params }) => {
@@ -40,6 +43,24 @@ export const mockHandlers = {
       );
     },
   ),
+  emojiCustomData: http.get('/api/v1/custom_emojis', () => {
+    action('fetching custom emoji data')();
+    return HttpResponse.json([customEmojiFactory()]);
+  }),
+  emojiData: http.get<{ locale: string }>(
+    '/packs-dev/emoji/:locale.json',
+    async ({ params }) => {
+      const locale = toSupportedLocale(params.locale);
+      action('fetching emoji data')(locale);
+      const { default: data } = (await import(
+        `emojibase-data/${locale}/compact.json`
+      )) as {
+        default: CompactEmoji[];
+      };
+
+      return HttpResponse.json([data]);
+    },
+  ),
 };
 
 export const unhandledRequestHandler = ({ url }: Request) => {
diff --git a/app/javascript/testing/factories.ts b/app/javascript/testing/factories.ts
index 5b2fbfe594e..f86aa772dc8 100644
--- a/app/javascript/testing/factories.ts
+++ b/app/javascript/testing/factories.ts
@@ -1,5 +1,13 @@
+import { Map as ImmutableMap } from 'immutable';
+
 import type { ApiRelationshipJSON } from '@/mastodon/api_types/relationships';
+import type { ApiStatusJSON } from '@/mastodon/api_types/statuses';
+import type {
+  CustomEmojiData,
+  UnicodeEmojiData,
+} from '@/mastodon/features/emoji/types';
 import { createAccountFromServerJSON } from '@/mastodon/models/account';
+import type { Status } from '@/mastodon/models/status';
 import type { ApiAccountJSON } from 'mastodon/api_types/accounts';
 
 type FactoryOptions<T> = {
@@ -47,6 +55,37 @@ export const accountFactoryState = (
   options: FactoryOptions<ApiAccountJSON> = {},
 ) => createAccountFromServerJSON(accountFactory(options));
 
+export const statusFactory: FactoryFunction<ApiStatusJSON> = ({
+  id,
+  ...data
+} = {}) => ({
+  id: id ?? '1',
+  created_at: '2023-01-01T00:00:00.000Z',
+  sensitive: false,
+  visibility: 'public',
+  language: 'en',
+  uri: 'https://example.com/status/1',
+  url: 'https://example.com/status/1',
+  replies_count: 0,
+  reblogs_count: 0,
+  quotes_count: 0,
+  favorites_count: 0,
+  account: accountFactory(),
+  media_attachments: [],
+  mentions: [],
+  tags: [],
+  emojis: [],
+  content: '<p>This is a test status.</p>',
+  ...data,
+});
+
+export const statusFactoryState = (
+  options: FactoryOptions<ApiStatusJSON> = {},
+) =>
+  ImmutableMap<string, unknown>(
+    statusFactory(options) as unknown as Record<string, unknown>,
+  ) as unknown as Status;
+
 export const relationshipsFactory: FactoryFunction<ApiRelationshipJSON> = ({
   id,
   ...data
@@ -68,3 +107,26 @@ export const relationshipsFactory: FactoryFunction<ApiRelationshipJSON> = ({
   showing_reblogs: true,
   ...data,
 });
+
+export function unicodeEmojiFactory(
+  data: Partial<UnicodeEmojiData> = {},
+): UnicodeEmojiData {
+  return {
+    hexcode: 'test',
+    label: 'Test',
+    unicode: '🧪',
+    ...data,
+  };
+}
+
+export function customEmojiFactory(
+  data: Partial<CustomEmojiData> = {},
+): CustomEmojiData {
+  return {
+    shortcode: 'custom',
+    static_url: 'emoji/custom/static',
+    url: 'emoji/custom',
+    visible_in_picker: true,
+    ...data,
+  };
+}
diff --git a/app/javascript/types/polymorphic.ts b/app/javascript/types/polymorphic.ts
new file mode 100644
index 00000000000..e58aa7b75ee
--- /dev/null
+++ b/app/javascript/types/polymorphic.ts
@@ -0,0 +1,75 @@
+import { forwardRef } from 'react';
+import type {
+  ElementType,
+  ComponentPropsWithRef,
+  ForwardRefRenderFunction,
+  ReactElement,
+  Ref,
+  ForwardRefExoticComponent,
+} from 'react';
+
+// This complicated type file is based on the following posts:
+// - https://www.tsteele.dev/posts/react-polymorphic-forwardref
+// - https://www.kripod.dev/blog/behind-the-as-prop-polymorphism-done-well/
+// - https://github.com/radix-ui/primitives/blob/7101e7d6efb2bff13cc6761023ab85aeec73539e/packages/react/polymorphic/src/forwardRefWithAs.ts
+// Whenever we upgrade to React 19 or later, we can remove all this because ref is a prop there.
+
+// Utils
+interface AsProp<As extends ElementType> {
+  as?: As;
+}
+type PropsOf<As extends ElementType> = ComponentPropsWithRef<As>;
+
+/**
+ * Extract the element instance type (e.g. HTMLButtonElement) from ComponentPropsWithRef<As>:
+ * - For intrinsic elements, look up in JSX.IntrinsicElements
+ * - For components, infer from `ComponentPropsWithRef`
+ */
+type ElementRef<As extends ElementType> =
+  As extends keyof React.JSX.IntrinsicElements
+    ? React.JSX.IntrinsicElements[As] extends { ref?: Ref<infer Inst> }
+      ? Inst
+      : never
+    : ComponentPropsWithRef<As> extends { ref?: Ref<infer Inst> }
+      ? Inst
+      : never;
+
+/**
+ * Merge additional props with intrinsic/element props for `as`.
+ * Additional props win on conflicts.
+ */
+type PolymorphicProps<
+  As extends ElementType,
+  AdditionalProps extends object = object,
+> = AdditionalProps &
+  AsProp<As> &
+  Omit<PropsOf<As>, keyof AdditionalProps | 'ref'>;
+
+/**
+ * Signature of a component created with `polymorphicForwardRef`.
+ */
+type PolymorphicWithRef<
+  DefaultAs extends ElementType,
+  AdditionalProps extends object = object,
+> = <As extends ElementType = DefaultAs>(
+  props: PolymorphicProps<As, AdditionalProps> & { ref?: Ref<ElementRef<As>> },
+) => ReactElement | null;
+
+/**
+ * The type of `polymorphicForwardRef`.
+ */
+type PolyRefFunction = <
+  DefaultAs extends ElementType,
+  AdditionalProps extends object = object,
+>(
+  render: ForwardRefRenderFunction<
+    ElementRef<DefaultAs>,
+    PolymorphicProps<DefaultAs, AdditionalProps>
+  >,
+) => PolymorphicWithRef<DefaultAs, AdditionalProps> &
+  ForwardRefExoticComponent<PolymorphicProps<DefaultAs, AdditionalProps>>;
+
+/**
+ * Polymorphic `forwardRef` function.
+ */
+export const polymorphicForwardRef = forwardRef as PolyRefFunction;
diff --git a/app/lib/activitypub/activity.rb b/app/lib/activitypub/activity.rb
index 93b45e80188..64ee9acd052 100644
--- a/app/lib/activitypub/activity.rb
+++ b/app/lib/activitypub/activity.rb
@@ -116,6 +116,20 @@ class ActivityPub::Activity
     fetch_remote_original_status
   end
 
+  def quote_from_request_json(json)
+    quoted_status_uri = value_or_id(json['object'])
+    quoting_status_uri = value_or_id(json['instrument'])
+    return if quoting_status_uri.nil? || quoted_status_uri.nil?
+
+    quoting_status = status_from_uri(quoting_status_uri)
+    return unless quoting_status.present? && quoting_status.quote.present?
+
+    quoted_status = status_from_uri(quoted_status_uri)
+    return unless quoted_status.present? && quoted_status.account == @account && quoting_status.quote.quoted_status == quoted_status
+
+    quoting_status.quote
+  end
+
   def dereference_object!
     return unless @object.is_a?(String)
 
@@ -143,6 +157,10 @@ class ActivityPub::Activity
     @follow_request_from_object ||= FollowRequest.find_by(target_account: @account, uri: object_uri) unless object_uri.nil?
   end
 
+  def quote_request_from_object
+    @quote_request_from_object ||= Quote.find_by(quoted_account: @account, activity_uri: object_uri) unless object_uri.nil?
+  end
+
   def follow_from_object
     @follow_from_object ||= ::Follow.find_by(target_account: @account, uri: object_uri) unless object_uri.nil?
   end
diff --git a/app/lib/activitypub/activity/accept.rb b/app/lib/activitypub/activity/accept.rb
index 5126e23c6a9..144ba9645c5 100644
--- a/app/lib/activitypub/activity/accept.rb
+++ b/app/lib/activitypub/activity/accept.rb
@@ -4,10 +4,13 @@ class ActivityPub::Activity::Accept < ActivityPub::Activity
   def perform
     return accept_follow_for_relay if relay_follow?
     return accept_follow!(follow_request_from_object) unless follow_request_from_object.nil?
+    return accept_quote!(quote_request_from_object) unless quote_request_from_object.nil?
 
     case @object['type']
     when 'Follow'
       accept_embedded_follow
+    when 'QuoteRequest'
+      accept_embedded_quote_request
     end
   end
 
@@ -31,6 +34,29 @@ class ActivityPub::Activity::Accept < ActivityPub::Activity
     RemoteAccountRefreshWorker.perform_async(request.target_account_id) if is_first_follow
   end
 
+  def accept_embedded_quote_request
+    approval_uri = value_or_id(first_of_value(@json['result']))
+    return if approval_uri.nil?
+
+    quote = quote_from_request_json(@object)
+    return unless quote.present? && quote.status.local?
+
+    accept_quote!(quote)
+  end
+
+  def accept_quote!(quote)
+    approval_uri = value_or_id(first_of_value(@json['result']))
+    return if unsupported_uri_scheme?(approval_uri) || quote.quoted_account != @account || !quote.status.local?
+
+    # NOTE: we are not going through `ActivityPub::VerifyQuoteService` as the `Accept` is as authoritative
+    # as the stamp, but this means we are not checking the stamp, which may lead to inconsistencies
+    # in case of an implementation bug
+    quote.update!(state: :accepted, approval_uri: approval_uri)
+
+    DistributionWorker.perform_async(quote.status_id, { 'update' => true })
+    ActivityPub::StatusUpdateDistributionWorker.perform_async(quote.status_id, { 'updated_at' => Time.now.utc.iso8601 })
+  end
+
   def accept_follow_for_relay
     relay.update!(state: :accepted)
   end
diff --git a/app/lib/activitypub/activity/create.rb b/app/lib/activitypub/activity/create.rb
index f7c723757ef..3d52c9a56ca 100644
--- a/app/lib/activitypub/activity/create.rb
+++ b/app/lib/activitypub/activity/create.rb
@@ -17,9 +17,11 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
     return reject_payload! if unsupported_object_type? || non_matching_uri_hosts?(@account.uri, object_uri) || tombstone_exists? || !related_to_local_activity?
 
     with_redis_lock("create:#{object_uri}") do
-      return if delete_arrived_first?(object_uri) || poll_vote?
+      Status.uncached do
+        return if delete_arrived_first?(object_uri) || poll_vote?
 
-      @status = find_existing_status
+        @status = find_existing_status
+      end
 
       if @status.nil?
         process_status
@@ -54,16 +56,16 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
     process_audience
 
     ApplicationRecord.transaction do
-      @status = Status.create!(@params)
+      @status = Status.create!(@params.merge(quote: @quote))
       attach_tags(@status)
       attach_mentions(@status)
       attach_counts(@status)
-      attach_quote(@status)
     end
 
     resolve_thread(@status)
     resolve_unresolved_mentions(@status)
     fetch_replies(@status)
+    fetch_and_verify_quote
     distribute
     forward_for_reply
   end
@@ -86,6 +88,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
     @status_parser = ActivityPub::Parser::StatusParser.new(
       @json,
       followers_collection: @account.followers_url,
+      following_collection: @account.following_url,
       actor_uri: ActivityPub::TagManager.instance.uri_for(@account),
       object: @object
     )
@@ -199,18 +202,6 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
     end
   end
 
-  def attach_quote(status)
-    return if @quote.nil?
-
-    @quote.status = status
-    @quote.save
-
-    embedded_quote = safe_prefetched_embed(@account, @status_parser.quoted_object, @json['context'])
-    ActivityPub::VerifyQuoteService.new.call(@quote, fetchable_quoted_uri: @quote_uri, prefetched_quoted_object: embedded_quote, request_id: @options[:request_id])
-  rescue Mastodon::UnexpectedResponseError, *Mastodon::HTTP_CONNECTION_ERRORS
-    ActivityPub::RefetchAndVerifyQuoteWorker.perform_in(rand(30..600).seconds, @quote.id, @quote_uri, { 'request_id' => @options[:request_id] })
-  end
-
   def process_tags
     return if @object['tag'].nil?
 
@@ -227,11 +218,11 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
 
   def process_quote
     @quote_uri = @status_parser.quote_uri
-    return if @quote_uri.blank?
+    return unless @status_parser.quote?
 
     approval_uri = @status_parser.quote_approval_uri
-    approval_uri = nil if unsupported_uri_scheme?(approval_uri)
-    @quote = Quote.new(account: @account, approval_uri: approval_uri, legacy: @status_parser.legacy_quote?)
+    approval_uri = nil if unsupported_uri_scheme?(approval_uri) || TagManager.instance.local_url?(approval_uri)
+    @quote = Quote.new(account: @account, approval_uri: approval_uri, legacy: @status_parser.legacy_quote?, state: @status_parser.deleted_quote? ? :deleted : :pending)
   end
 
   def process_hashtag(tag)
@@ -378,6 +369,15 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
     Rails.logger.warn "Error fetching replies: #{e}"
   end
 
+  def fetch_and_verify_quote
+    return if @quote.nil?
+
+    embedded_quote = safe_prefetched_embed(@account, @status_parser.quoted_object, @json['context'])
+    ActivityPub::VerifyQuoteService.new.call(@quote, fetchable_quoted_uri: @quote_uri, prefetched_quoted_object: embedded_quote, request_id: @options[:request_id], depth: @options[:depth])
+  rescue Mastodon::RecursionLimitExceededError, Mastodon::UnexpectedResponseError, *Mastodon::HTTP_CONNECTION_ERRORS
+    ActivityPub::RefetchAndVerifyQuoteWorker.perform_in(rand(30..600).seconds, @quote.id, @quote_uri, { 'request_id' => @options[:request_id] })
+  end
+
   def conversation_from_uri(uri)
     return nil if uri.nil?
     return Conversation.find_by(id: OStatus::TagManager.instance.unique_tag_to_local_id(uri, 'Conversation')) if OStatus::TagManager.instance.local_id?(uri)
diff --git a/app/lib/activitypub/activity/delete.rb b/app/lib/activitypub/activity/delete.rb
index 69b7bd03546..3e77f9b9556 100644
--- a/app/lib/activitypub/activity/delete.rb
+++ b/app/lib/activitypub/activity/delete.rb
@@ -59,8 +59,11 @@ class ActivityPub::Activity::Delete < ActivityPub::Activity
     @quote = Quote.find_by(approval_uri: object_uri, quoted_account: @account)
     return if @quote.nil?
 
-    ActivityPub::Forwarder.new(@account, @json, @quote.status).forward!
+    ActivityPub::Forwarder.new(@account, @json, @quote.status).forward! if @quote.status.present?
+
     @quote.reject!
+
+    DistributionWorker.perform_async(@quote.status_id, { 'update' => true }) if @quote.status.present?
   end
 
   def forwarder
diff --git a/app/lib/activitypub/activity/quote_request.rb b/app/lib/activitypub/activity/quote_request.rb
index 2de03df1580..27dea05bf64 100644
--- a/app/lib/activitypub/activity/quote_request.rb
+++ b/app/lib/activitypub/activity/quote_request.rb
@@ -9,21 +9,62 @@ class ActivityPub::Activity::QuoteRequest < ActivityPub::Activity
     quoted_status = status_from_uri(object_uri)
     return if quoted_status.nil? || !quoted_status.account.local? || !quoted_status.distributable?
 
-    # For now, we don't support being quoted by external servers
-    reject_quote_request!(quoted_status)
+    if StatusPolicy.new(@account, quoted_status).quote?
+      accept_quote_request!(quoted_status)
+    else
+      reject_quote_request!(quoted_status)
+    end
   end
 
   private
 
+  def accept_quote_request!(quoted_status)
+    status = status_from_uri(instrument_uri)
+    status ||= import_instrument(quoted_status)
+    status ||= ActivityPub::FetchRemoteStatusService.new.call(instrument_uri, on_behalf_of: quoted_status.account, request_id: @options[:request_id])
+    # TODO: raise if status is nil
+
+    # Sanity check
+    return unless status.quote.quoted_status == quoted_status && status.account == @account
+
+    status.quote.ensure_quoted_access
+    status.quote.update!(activity_uri: @json['id'])
+    status.quote.accept!
+
+    json = Oj.dump(serialize_payload(status.quote, ActivityPub::AcceptQuoteRequestSerializer))
+    ActivityPub::DeliveryWorker.perform_async(json, quoted_status.account_id, @account.inbox_url)
+
+    # Ensure the user is notified
+    LocalNotificationWorker.perform_async(quoted_status.account_id, status.quote.id, 'Quote', 'quote')
+
+    # Ensure local followers get to see the post updated with approval
+    DistributionWorker.perform_async(status.id, { 'update' => true, 'skip_notifications' => true })
+  end
+
+  def import_instrument(quoted_status)
+    return unless @json['instrument'].is_a?(Hash)
+
+    # NOTE: Replacing the object's context by that of the parent activity is
+    # not sound, but it's consistent with the rest of the codebase
+    instrument = @json['instrument'].merge({ '@context' => @json['@context'] })
+    return if non_matching_uri_hosts?(instrument['id'], @account.uri)
+
+    ActivityPub::FetchRemoteStatusService.new.call(instrument['id'], prefetched_body: instrument, on_behalf_of: quoted_status.account, request_id: @options[:request_id])
+  end
+
   def reject_quote_request!(quoted_status)
     quote = Quote.new(
       quoted_status: quoted_status,
       quoted_account: quoted_status.account,
-      status: Status.new(account: @account, uri: @json['instrument']),
+      status: Status.new(account: @account, uri: instrument_uri),
       account: @account,
       activity_uri: @json['id']
     )
     json = Oj.dump(serialize_payload(quote, ActivityPub::RejectQuoteRequestSerializer))
     ActivityPub::DeliveryWorker.perform_async(json, quoted_status.account_id, @account.inbox_url)
   end
+
+  def instrument_uri
+    value_or_id(@json['instrument'])
+  end
 end
diff --git a/app/lib/activitypub/activity/reject.rb b/app/lib/activitypub/activity/reject.rb
index 886dddb2355..3dafaba1882 100644
--- a/app/lib/activitypub/activity/reject.rb
+++ b/app/lib/activitypub/activity/reject.rb
@@ -5,10 +5,13 @@ class ActivityPub::Activity::Reject < ActivityPub::Activity
     return reject_follow_for_relay if relay_follow?
     return follow_request_from_object.reject! unless follow_request_from_object.nil?
     return UnfollowService.new.call(follow_from_object.account, @account) unless follow_from_object.nil?
+    return reject_quote!(quote_request_from_object) unless quote_request_from_object.nil?
 
     case @object['type']
     when 'Follow'
       reject_embedded_follow
+    when 'QuoteRequest'
+      reject_embedded_quote_request
     end
   end
 
@@ -29,6 +32,20 @@ class ActivityPub::Activity::Reject < ActivityPub::Activity
     relay.update!(state: :rejected)
   end
 
+  def reject_embedded_quote_request
+    quote = quote_from_request_json(@object)
+    return unless quote.present? && quote.status.local?
+
+    reject_quote!(quoting_status.quote)
+  end
+
+  def reject_quote!(quote)
+    return unless quote.quoted_account == @account && quote.status.local?
+
+    # TODO: broadcast an update?
+    quote.reject!
+  end
+
   def relay
     @relay ||= Relay.find_by(follow_activity_id: object_uri) unless object_uri.nil?
   end
diff --git a/app/lib/activitypub/activity/update.rb b/app/lib/activitypub/activity/update.rb
index 973706f5957..15025ca5e71 100644
--- a/app/lib/activitypub/activity/update.rb
+++ b/app/lib/activitypub/activity/update.rb
@@ -28,6 +28,9 @@ class ActivityPub::Activity::Update < ActivityPub::Activity
 
     @status = Status.find_by(uri: object_uri, account_id: @account.id)
 
+    # We may be getting `Create` and `Update` out of order
+    @status ||= ActivityPub::Activity::Create.new(@json, @account, **@options).perform
+
     return if @status.nil?
 
     ActivityPub::ProcessStatusUpdateService.new.call(@status, @json, @object, request_id: @options[:request_id])
diff --git a/app/lib/activitypub/case_transform.rb b/app/lib/activitypub/case_transform.rb
index bf5de722103..b9e1d3a62b2 100644
--- a/app/lib/activitypub/case_transform.rb
+++ b/app/lib/activitypub/case_transform.rb
@@ -12,9 +12,7 @@ module ActivityPub::CaseTransform
       when Hash then value.deep_transform_keys! { |key| camel_lower(key) }
       when Symbol then camel_lower(value.to_s).to_sym
       when String
-        camel_lower_cache[value] ||= if value.start_with?('_:')
-                                       "_:#{value.delete_prefix('_:').underscore.camelize(:lower)}"
-                                     elsif LanguagesHelper::ISO_639_1_REGIONAL.key?(value.to_sym)
+        camel_lower_cache[value] ||= if value.start_with?('_misskey') || LanguagesHelper::ISO_639_1_REGIONAL.key?(value.to_sym)
                                        value
                                      else
                                        value.underscore.camelize(:lower)
diff --git a/app/lib/activitypub/forwarder.rb b/app/lib/activitypub/forwarder.rb
index 3a94f9669ab..c5ff59fa5ae 100644
--- a/app/lib/activitypub/forwarder.rb
+++ b/app/lib/activitypub/forwarder.rb
@@ -27,17 +27,25 @@ class ActivityPub::Forwarder
     @reblogged_by_account_ids ||= @status.reblogs.includes(:account).references(:account).merge(Account.local).pluck(:account_id)
   end
 
+  def quoted_by_account_ids
+    @quoted_by_account_ids ||= @status.quotes.includes(:account).references(:account).merge(Account.local).pluck(:account_id)
+  end
+
+  def shared_by_account_ids
+    reblogged_by_account_ids.concat(quoted_by_account_ids)
+  end
+
   def signature_account_id
     @signature_account_id ||= if in_reply_to_local?
                                 in_reply_to.account_id
                               else
-                                reblogged_by_account_ids.first
+                                shared_by_account_ids.first
                               end
   end
 
   def inboxes
     @inboxes ||= begin
-      arr  = inboxes_for_followers_of_reblogged_by_accounts
+      arr  = inboxes_for_followers_of_shared_by_accounts
       arr += inboxes_for_followers_of_replied_to_account if in_reply_to_local?
       arr -= [@account.preferred_inbox_url]
       arr.uniq!
@@ -45,8 +53,8 @@ class ActivityPub::Forwarder
     end
   end
 
-  def inboxes_for_followers_of_reblogged_by_accounts
-    Account.where(id: ::Follow.where(target_account_id: reblogged_by_account_ids).select(:account_id)).inboxes
+  def inboxes_for_followers_of_shared_by_accounts
+    Account.where(id: ::Follow.where(target_account_id: shared_by_account_ids).select(:account_id)).inboxes
   end
 
   def inboxes_for_followers_of_replied_to_account
diff --git a/app/lib/activitypub/parser/status_parser.rb b/app/lib/activitypub/parser/status_parser.rb
index ad3ef72be8a..57e6cb926c4 100644
--- a/app/lib/activitypub/parser/status_parser.rb
+++ b/app/lib/activitypub/parser/status_parser.rb
@@ -8,6 +8,7 @@ class ActivityPub::Parser::StatusParser
   # @param [Hash] json
   # @param [Hash] options
   # @option options [String] :followers_collection
+  # @option options [String] :following_collection
   # @option options [String] :actor_uri
   # @option options [Hash]   :object
   def initialize(json, **options)
@@ -117,6 +118,14 @@ class ActivityPub::Parser::StatusParser
     flags
   end
 
+  def quote?
+    %w(quote _misskey_quote quoteUrl quoteUri).any? { |key| @object[key].present? }
+  end
+
+  def deleted_quote?
+    @object['quote'].is_a?(Hash) && @object['quote']['type'] == 'Tombstone'
+  end
+
   def quote_uri
     %w(quote _misskey_quote quoteUrl quoteUri).filter_map do |key|
       value_or_id(as_array(@object[key]).first)
@@ -141,22 +150,18 @@ class ActivityPub::Parser::StatusParser
   def quote_subpolicy(subpolicy)
     flags = 0
 
-    allowed_actors = as_array(subpolicy)
+    allowed_actors = as_array(subpolicy).dup
     allowed_actors.uniq!
 
     flags |= Status::QUOTE_APPROVAL_POLICY_FLAGS[:public] if allowed_actors.delete('as:Public') || allowed_actors.delete('Public') || allowed_actors.delete('https://www.w3.org/ns/activitystreams#Public')
     flags |= Status::QUOTE_APPROVAL_POLICY_FLAGS[:followers] if allowed_actors.delete(@options[:followers_collection])
-    # TODO: we don't actually store that collection URI
-    # flags |= Status::QUOTE_APPROVAL_POLICY_FLAGS[:followed]
+    flags |= Status::QUOTE_APPROVAL_POLICY_FLAGS[:following] if allowed_actors.delete(@options[:following_collection])
 
     # Remove the special-meaning actor URI
     allowed_actors.delete(@options[:actor_uri])
 
-    # Tagged users are always allowed, so remove them
-    allowed_actors -= as_array(@object['tag']).filter_map { |tag| tag['href'] if equals_or_includes?(tag['type'], 'Mention') }
-
-    # Any unrecognized actor is marked as unknown
-    flags |= Status::QUOTE_APPROVAL_POLICY_FLAGS[:unknown] unless allowed_actors.empty?
+    # Any unrecognized actor is marked as unsupported
+    flags |= Status::QUOTE_APPROVAL_POLICY_FLAGS[:unsupported_policy] unless allowed_actors.empty?
 
     flags
   end
diff --git a/app/lib/activitypub/tag_manager.rb b/app/lib/activitypub/tag_manager.rb
index 4d83a9b8238..43574d3657e 100644
--- a/app/lib/activitypub/tag_manager.rb
+++ b/app/lib/activitypub/tag_manager.rb
@@ -39,11 +39,25 @@ class ActivityPub::TagManager
 
     case target.object_type
     when :person
-      target.instance_actor? ? instance_actor_url : account_url(target)
+      if target.instance_actor?
+        instance_actor_url
+      elsif target.numeric_ap_id?
+        ap_account_url(target.id)
+      else
+        account_url(target)
+      end
+    when :conversation
+      context_url(target) unless target.parent_account_id.nil? || target.parent_status_id.nil?
     when :note, :comment, :activity
-      return activity_account_status_url(target.account, target) if target.reblog?
+      if target.account.numeric_ap_id?
+        return activity_ap_account_status_url(target.account, target) if target.reblog?
 
-      account_status_url(target.account, target)
+        ap_account_status_url(target.account.id, target)
+      else
+        return activity_account_status_url(target.account, target) if target.reblog?
+
+        account_status_url(target.account, target)
+      end
     when :emoji
       emoji_url(target)
     when :flag
@@ -51,6 +65,13 @@ class ActivityPub::TagManager
     end
   end
 
+  def approval_uri_for(quote, check_approval: true)
+    return quote.approval_uri unless quote.quoted_account&.local?
+    return if check_approval && !quote.accepted?
+
+    quote.quoted_account.numeric_ap_id? ? ap_account_quote_authorization_url(quote.quoted_account_id, quote) : account_quote_authorization_url(quote.quoted_account, quote)
+  end
+
   def key_uri_for(target)
     [uri_for(target), '#main-key'].join
   end
@@ -59,6 +80,10 @@ class ActivityPub::TagManager
     account_url(username: username)
   end
 
+  def uri_for_account_id(id)
+    ap_account_url(id: id)
+  end
+
   def generate_uri_for(_target)
     URI.join(root_url, 'payloads', SecureRandom.uuid)
   end
@@ -66,55 +91,73 @@ class ActivityPub::TagManager
   def activity_uri_for(target)
     raise ArgumentError, 'target must be a local activity' unless %i(note comment activity).include?(target.object_type) && target.local?
 
-    activity_account_status_url(target.account, target)
+    target.account.numeric_ap_id? ? activity_ap_account_status_url(target.account.id, target) : activity_account_status_url(target.account, target)
+  end
+
+  def context_uri_for(target, page_params = nil)
+    raise ArgumentError, 'target must be a local activity' unless %i(note comment activity).include?(target.object_type) && target.local?
+
+    items_context_url(target.conversation, page_params)
   end
 
   def replies_uri_for(target, page_params = nil)
     raise ArgumentError, 'target must be a local activity' unless %i(note comment activity).include?(target.object_type) && target.local?
 
-    account_status_replies_url(target.account, target, page_params)
+    target.account.numeric_ap_id? ? ap_account_status_replies_url(target.account.id, target, page_params) : account_status_replies_url(target.account, target, page_params)
   end
 
   def likes_uri_for(target)
     raise ArgumentError, 'target must be a local activity' unless %i(note comment activity).include?(target.object_type) && target.local?
 
-    account_status_likes_url(target.account, target)
+    target.account.numeric_ap_id? ? ap_account_status_likes_url(target.account.id, target) : account_status_likes_url(target.account, target)
   end
 
   def shares_uri_for(target)
     raise ArgumentError, 'target must be a local activity' unless %i(note comment activity).include?(target.object_type) && target.local?
 
-    account_status_shares_url(target.account, target)
+    target.account.numeric_ap_id? ? ap_account_status_shares_url(target.account.id, target) : account_status_shares_url(target.account, target)
   end
 
   def following_uri_for(target, ...)
     raise ArgumentError, 'target must be a local account' unless target.local?
 
-    account_following_index_url(target, ...)
+    target.numeric_ap_id? ? ap_account_following_index_url(target.id, ...) : account_following_index_url(target, ...)
   end
 
   def followers_uri_for(target, ...)
     return target.followers_url.presence unless target.local?
 
-    account_followers_url(target, ...)
+    target.numeric_ap_id? ? ap_account_followers_url(target.id, ...) : account_followers_url(target, ...)
   end
 
   def collection_uri_for(target, ...)
-    raise NotImplementedError unless target.local?
+    raise ArgumentError, 'target must be a local account' unless target.local?
 
-    account_collection_url(target, ...)
+    target.numeric_ap_id? ? ap_account_collection_url(target.id, ...) : account_collection_url(target, ...)
   end
 
   def inbox_uri_for(target)
-    raise NotImplementedError unless target.local?
+    raise ArgumentError, 'target must be a local account' unless target.local?
 
-    target.instance_actor? ? instance_actor_inbox_url : account_inbox_url(target)
+    if target.instance_actor?
+      instance_actor_inbox_url
+    elsif target.numeric_ap_id?
+      ap_account_inbox_url(target.id)
+    else
+      account_inbox_url(target)
+    end
   end
 
   def outbox_uri_for(target, ...)
-    raise NotImplementedError unless target.local?
+    raise ArgumentError, 'target must be a local account' unless target.local?
 
-    target.instance_actor? ? instance_actor_outbox_url(...) : account_outbox_url(target, ...)
+    if target.instance_actor?
+      instance_actor_outbox_url(...)
+    elsif target.numeric_ap_id?
+      ap_account_outbox_url(target.id, ...)
+    else
+      account_outbox_url(target, ...)
+    end
   end
 
   # Primary audience of a status
@@ -247,10 +290,9 @@ class ActivityPub::TagManager
 
     path_params = Rails.application.routes.recognize_path(uri)
 
-    # TODO: handle numeric IDs
     case path_params[:controller]
     when 'accounts'
-      [:username, path_params[:username]]
+      path_params.key?(:username) ? [:username, path_params[:username]] : [:id, path_params[:id]]
     when 'instance_actors'
       [:id, -99]
     end
diff --git a/app/lib/admin/metrics/dimension/base_dimension.rb b/app/lib/admin/metrics/dimension/base_dimension.rb
index bd2e4ececbe..0e055e0e75e 100644
--- a/app/lib/admin/metrics/dimension/base_dimension.rb
+++ b/app/lib/admin/metrics/dimension/base_dimension.rb
@@ -65,4 +65,16 @@ class Admin::Metrics::Dimension::BaseDimension
   def canonicalized_params
     params.to_h.to_a.sort_by { |k, _v| k.to_s }.map { |k, v| "#{k}=#{v}" }.join(';')
   end
+
+  def earliest_status_id
+    snowflake_id(@start_at.beginning_of_day)
+  end
+
+  def latest_status_id
+    snowflake_id(@end_at.end_of_day)
+  end
+
+  def snowflake_id(datetime)
+    Mastodon::Snowflake.id_at(datetime, with_random: false)
+  end
 end
diff --git a/app/lib/admin/metrics/dimension/instance_languages_dimension.rb b/app/lib/admin/metrics/dimension/instance_languages_dimension.rb
index 661e6d93b75..5f4bb95cb8f 100644
--- a/app/lib/admin/metrics/dimension/instance_languages_dimension.rb
+++ b/app/lib/admin/metrics/dimension/instance_languages_dimension.rb
@@ -19,7 +19,7 @@ class Admin::Metrics::Dimension::InstanceLanguagesDimension < Admin::Metrics::Di
   end
 
   def sql_array
-    [sql_query_string, { domain: params[:domain], earliest_status_id: earliest_status_id, latest_status_id: latest_status_id, limit: @limit }]
+    [sql_query_string, { domain: params[:domain], earliest_status_id:, latest_status_id:, limit: @limit }]
   end
 
   def sql_query_string
@@ -36,14 +36,6 @@ class Admin::Metrics::Dimension::InstanceLanguagesDimension < Admin::Metrics::Di
     SQL
   end
 
-  def earliest_status_id
-    Mastodon::Snowflake.id_at(@start_at.beginning_of_day, with_random: false)
-  end
-
-  def latest_status_id
-    Mastodon::Snowflake.id_at(@end_at.end_of_day, with_random: false)
-  end
-
   def params
     @params.permit(:domain)
   end
diff --git a/app/lib/admin/metrics/dimension/servers_dimension.rb b/app/lib/admin/metrics/dimension/servers_dimension.rb
index 2c8406d52fd..7e3ab603d03 100644
--- a/app/lib/admin/metrics/dimension/servers_dimension.rb
+++ b/app/lib/admin/metrics/dimension/servers_dimension.rb
@@ -14,7 +14,7 @@ class Admin::Metrics::Dimension::ServersDimension < Admin::Metrics::Dimension::B
   end
 
   def sql_array
-    [sql_query_string, { earliest_status_id: earliest_status_id, latest_status_id: latest_status_id, limit: @limit }]
+    [sql_query_string, { earliest_status_id:, latest_status_id:, limit: @limit }]
   end
 
   def sql_query_string
@@ -28,12 +28,4 @@ class Admin::Metrics::Dimension::ServersDimension < Admin::Metrics::Dimension::B
       LIMIT :limit
     SQL
   end
-
-  def earliest_status_id
-    Mastodon::Snowflake.id_at(@start_at.beginning_of_day, with_random: false)
-  end
-
-  def latest_status_id
-    Mastodon::Snowflake.id_at(@end_at.end_of_day, with_random: false)
-  end
 end
diff --git a/app/lib/admin/metrics/dimension/software_versions_dimension.rb b/app/lib/admin/metrics/dimension/software_versions_dimension.rb
index 91ab4f836d1..e64a6b1180a 100644
--- a/app/lib/admin/metrics/dimension/software_versions_dimension.rb
+++ b/app/lib/admin/metrics/dimension/software_versions_dimension.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class Admin::Metrics::Dimension::SoftwareVersionsDimension < Admin::Metrics::Dimension::BaseDimension
-  include Redisable
+  include Admin::Metrics::Dimension::StoreHelper
 
   def key
     'software_versions'
@@ -45,13 +45,11 @@ class Admin::Metrics::Dimension::SoftwareVersionsDimension < Admin::Metrics::Dim
   end
 
   def redis_version
-    value = redis_info['redis_version']
-
     {
       key: 'redis',
-      human_key: 'Redis',
-      value: value,
-      human_value: value,
+      human_key: store_name,
+      value: store_version,
+      human_value: store_version,
     }
   end
 
@@ -117,8 +115,4 @@ class Admin::Metrics::Dimension::SoftwareVersionsDimension < Admin::Metrics::Dim
   rescue Terrapin::CommandNotFoundError, Terrapin::ExitStatusError, Oj::ParseError
     nil
   end
-
-  def redis_info
-    @redis_info ||= redis.info
-  end
 end
diff --git a/app/lib/admin/metrics/dimension/space_usage_dimension.rb b/app/lib/admin/metrics/dimension/space_usage_dimension.rb
index 3fd8d86856e..1b4d224c770 100644
--- a/app/lib/admin/metrics/dimension/space_usage_dimension.rb
+++ b/app/lib/admin/metrics/dimension/space_usage_dimension.rb
@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 class Admin::Metrics::Dimension::SpaceUsageDimension < Admin::Metrics::Dimension::BaseDimension
-  include Redisable
   include ActionView::Helpers::NumberHelper
+  include Admin::Metrics::Dimension::StoreHelper
 
   def key
     'space_usage'
@@ -27,20 +27,18 @@ class Admin::Metrics::Dimension::SpaceUsageDimension < Admin::Metrics::Dimension
   end
 
   def redis_size
-    value = redis_info['used_memory']
-
     {
       key: 'redis',
-      human_key: 'Redis',
-      value: value.to_s,
+      human_key: store_name,
+      value: store_size.to_s,
       unit: 'bytes',
-      human_value: number_to_human_size(value),
+      human_value: number_to_human_size(store_size),
     }
   end
 
   def media_size
     value = [
-      MediaAttachment.sum(Arel.sql('COALESCE(file_file_size, 0) + COALESCE(thumbnail_file_size, 0)')),
+      MediaAttachment.sum(MediaAttachment.combined_media_file_size),
       CustomEmoji.sum(:image_file_size),
       PreviewCard.sum(:image_file_size),
       Account.sum(Arel.sql('COALESCE(avatar_file_size, 0) + COALESCE(header_file_size, 0)')),
@@ -57,10 +55,6 @@ class Admin::Metrics::Dimension::SpaceUsageDimension < Admin::Metrics::Dimension
     }
   end
 
-  def redis_info
-    @redis_info ||= redis.info
-  end
-
   def search_size
     return unless Chewy.enabled?
 
diff --git a/app/lib/admin/metrics/dimension/store_helper.rb b/app/lib/admin/metrics/dimension/store_helper.rb
new file mode 100644
index 00000000000..6deae62bc1e
--- /dev/null
+++ b/app/lib/admin/metrics/dimension/store_helper.rb
@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Admin::Metrics::Dimension::StoreHelper
+  include Redisable
+
+  private
+
+  def store_name
+    return 'Valkey' if redis_info.key?('valkey_version')
+    return 'Dragonfly' if redis_info.key?('dragonfly_version')
+
+    'Redis'
+  end
+
+  def store_version
+    redis_info['valkey_version'] || redis_info['dragonfly_version'] || redis_info['redis_version']
+  end
+
+  def store_size
+    redis_info['used_memory']
+  end
+
+  def redis_info
+    @redis_info ||= redis.info
+  end
+end
diff --git a/app/lib/admin/metrics/dimension/tag_languages_dimension.rb b/app/lib/admin/metrics/dimension/tag_languages_dimension.rb
index 6e283d2c655..b7b9abc8b6f 100644
--- a/app/lib/admin/metrics/dimension/tag_languages_dimension.rb
+++ b/app/lib/admin/metrics/dimension/tag_languages_dimension.rb
@@ -19,7 +19,7 @@ class Admin::Metrics::Dimension::TagLanguagesDimension < Admin::Metrics::Dimensi
   end
 
   def sql_array
-    [sql_query_string, { tag_id: tag_id, earliest_status_id: earliest_status_id, latest_status_id: latest_status_id, limit: @limit }]
+    [sql_query_string, { tag_id: tag_id, earliest_status_id:, latest_status_id:, limit: @limit }]
   end
 
   def sql_query_string
@@ -39,14 +39,6 @@ class Admin::Metrics::Dimension::TagLanguagesDimension < Admin::Metrics::Dimensi
     params[:id]
   end
 
-  def earliest_status_id
-    Mastodon::Snowflake.id_at(@start_at.beginning_of_day, with_random: false)
-  end
-
-  def latest_status_id
-    Mastodon::Snowflake.id_at(@end_at.end_of_day, with_random: false)
-  end
-
   def params
     @params.permit(:id)
   end
diff --git a/app/lib/admin/metrics/dimension/tag_servers_dimension.rb b/app/lib/admin/metrics/dimension/tag_servers_dimension.rb
index db820e965c5..29145e14871 100644
--- a/app/lib/admin/metrics/dimension/tag_servers_dimension.rb
+++ b/app/lib/admin/metrics/dimension/tag_servers_dimension.rb
@@ -18,7 +18,7 @@ class Admin::Metrics::Dimension::TagServersDimension < Admin::Metrics::Dimension
   end
 
   def sql_array
-    [sql_query_string, { tag_id: tag_id, earliest_status_id: earliest_status_id, latest_status_id: latest_status_id, limit: @limit }]
+    [sql_query_string, { tag_id: tag_id, earliest_status_id:, latest_status_id:, limit: @limit }]
   end
 
   def sql_query_string
@@ -39,14 +39,6 @@ class Admin::Metrics::Dimension::TagServersDimension < Admin::Metrics::Dimension
     params[:id]
   end
 
-  def earliest_status_id
-    Mastodon::Snowflake.id_at(@start_at.beginning_of_day, with_random: false)
-  end
-
-  def latest_status_id
-    Mastodon::Snowflake.id_at(@end_at.end_of_day, with_random: false)
-  end
-
   def params
     @params.permit(:id)
   end
diff --git a/app/lib/admin/metrics/measure/base_measure.rb b/app/lib/admin/metrics/measure/base_measure.rb
index 8b7fe39b55a..eabbe0890b6 100644
--- a/app/lib/admin/metrics/measure/base_measure.rb
+++ b/app/lib/admin/metrics/measure/base_measure.rb
@@ -104,4 +104,16 @@ class Admin::Metrics::Measure::BaseMeasure
   def canonicalized_params
     params.to_h.to_a.sort_by { |k, _v| k.to_s }.map { |k, v| "#{k}=#{v}" }.join(';')
   end
+
+  def earliest_status_id
+    snowflake_id(@start_at.beginning_of_day)
+  end
+
+  def latest_status_id
+    snowflake_id(@end_at.end_of_day)
+  end
+
+  def snowflake_id(datetime)
+    Mastodon::Snowflake.id_at(datetime, with_random: false)
+  end
 end
diff --git a/app/lib/admin/metrics/measure/instance_media_attachments_measure.rb b/app/lib/admin/metrics/measure/instance_media_attachments_measure.rb
index 996ca52e0bb..00836191f1d 100644
--- a/app/lib/admin/metrics/measure/instance_media_attachments_measure.rb
+++ b/app/lib/admin/metrics/measure/instance_media_attachments_measure.rb
@@ -29,7 +29,7 @@ class Admin::Metrics::Measure::InstanceMediaAttachmentsMeasure < Admin::Metrics:
   def perform_total_query
     domain = params[:domain]
     domain = Instance.by_domain_and_subdomains(params[:domain]).select(:domain) if params[:include_subdomains]
-    MediaAttachment.joins(:account).merge(Account.where(domain: domain)).sum('COALESCE(file_file_size, 0) + COALESCE(thumbnail_file_size, 0)')
+    MediaAttachment.joins(:account).merge(Account.where(domain: domain)).sum(MediaAttachment.combined_media_file_size)
   end
 
   def perform_previous_total_query
@@ -44,7 +44,7 @@ class Admin::Metrics::Measure::InstanceMediaAttachmentsMeasure < Admin::Metrics:
     <<~SQL.squish
       SELECT axis.*, (
         WITH new_media_attachments AS (
-          SELECT COALESCE(media_attachments.file_file_size, 0) + COALESCE(media_attachments.thumbnail_file_size, 0) AS size
+          SELECT #{media_size_total} AS size
           FROM media_attachments
           INNER JOIN accounts ON accounts.id = media_attachments.account_id
           WHERE date_trunc('day', media_attachments.created_at)::date = axis.period
@@ -58,6 +58,10 @@ class Admin::Metrics::Measure::InstanceMediaAttachmentsMeasure < Admin::Metrics:
     SQL
   end
 
+  def media_size_total
+    MediaAttachment.combined_media_file_size.to_sql
+  end
+
   def params
     @params.permit(:domain, :include_subdomains)
   end
diff --git a/app/lib/admin/metrics/measure/instance_statuses_measure.rb b/app/lib/admin/metrics/measure/instance_statuses_measure.rb
index 324d427b18b..f0f797876e6 100644
--- a/app/lib/admin/metrics/measure/instance_statuses_measure.rb
+++ b/app/lib/admin/metrics/measure/instance_statuses_measure.rb
@@ -28,7 +28,7 @@ class Admin::Metrics::Measure::InstanceStatusesMeasure < Admin::Metrics::Measure
   end
 
   def sql_array
-    [sql_query_string, { start_at: @start_at, end_at: @end_at, domain: params[:domain], earliest_status_id: earliest_status_id, latest_status_id: latest_status_id }]
+    [sql_query_string, { start_at: @start_at, end_at: @end_at, domain: params[:domain], earliest_status_id:, latest_status_id: }]
   end
 
   def sql_query_string
@@ -50,14 +50,6 @@ class Admin::Metrics::Measure::InstanceStatusesMeasure < Admin::Metrics::Measure
     SQL
   end
 
-  def earliest_status_id
-    Mastodon::Snowflake.id_at(@start_at.beginning_of_day, with_random: false)
-  end
-
-  def latest_status_id
-    Mastodon::Snowflake.id_at(@end_at.end_of_day, with_random: false)
-  end
-
   def params
     @params.permit(:domain, :include_subdomains)
   end
diff --git a/app/lib/admin/metrics/measure/tag_servers_measure.rb b/app/lib/admin/metrics/measure/tag_servers_measure.rb
index 5db1076062b..e8d9cc43b8d 100644
--- a/app/lib/admin/metrics/measure/tag_servers_measure.rb
+++ b/app/lib/admin/metrics/measure/tag_servers_measure.rb
@@ -22,7 +22,7 @@ class Admin::Metrics::Measure::TagServersMeasure < Admin::Metrics::Measure::Base
   end
 
   def sql_array
-    [sql_query_string, { start_at: @start_at, end_at: @end_at, tag_id: tag.id, earliest_status_id: earliest_status_id, latest_status_id: latest_status_id }]
+    [sql_query_string, { start_at: @start_at, end_at: @end_at, tag_id: tag.id, earliest_status_id:, latest_status_id: }]
   end
 
   def sql_query_string
@@ -45,14 +45,6 @@ class Admin::Metrics::Measure::TagServersMeasure < Admin::Metrics::Measure::Base
     SQL
   end
 
-  def earliest_status_id
-    Mastodon::Snowflake.id_at(@start_at.beginning_of_day, with_random: false)
-  end
-
-  def latest_status_id
-    Mastodon::Snowflake.id_at(@end_at.end_of_day, with_random: false)
-  end
-
   def tag
     @tag ||= Tag.find(params[:id])
   end
diff --git a/app/lib/annual_report/archetype.rb b/app/lib/annual_report/archetype.rb
index ff7e14e2a04..41973294a62 100644
--- a/app/lib/annual_report/archetype.rb
+++ b/app/lib/annual_report/archetype.rb
@@ -28,7 +28,7 @@ class AnnualReport::Archetype < AnnualReport::Source
   end
 
   def polls_count
-    @polls_count ||= report_statuses.where.not(poll_id: nil).count
+    @polls_count ||= report_statuses.only_polls.count
   end
 
   def reblogs_count
@@ -36,7 +36,7 @@ class AnnualReport::Archetype < AnnualReport::Source
   end
 
   def replies_count
-    @replies_count ||= report_statuses.where.not(in_reply_to_id: nil).where.not(in_reply_to_account_id: @account.id).count
+    @replies_count ||= report_statuses.where.not(in_reply_to_id: nil).not_replying_to_account(@account).count
   end
 
   def standalone_count
diff --git a/app/lib/annual_report/commonly_interacted_with_accounts.rb b/app/lib/annual_report/commonly_interacted_with_accounts.rb
index c2aee44dea4..219c30063a4 100644
--- a/app/lib/annual_report/commonly_interacted_with_accounts.rb
+++ b/app/lib/annual_report/commonly_interacted_with_accounts.rb
@@ -18,7 +18,7 @@ class AnnualReport::CommonlyInteractedWithAccounts < AnnualReport::Source
   private
 
   def commonly_interacted_with_accounts
-    report_statuses.where.not(in_reply_to_account_id: @account.id).group(:in_reply_to_account_id).having(minimum_interaction_count).order(count_all: :desc).limit(SET_SIZE).count
+    report_statuses.not_replying_to_account(@account).group(:in_reply_to_account_id).having(minimum_interaction_count).order(count_all: :desc).limit(SET_SIZE).count
   end
 
   def minimum_interaction_count
diff --git a/app/lib/annual_report/top_statuses.rb b/app/lib/annual_report/top_statuses.rb
index 74b129595ac..f32bd09a15a 100644
--- a/app/lib/annual_report/top_statuses.rb
+++ b/app/lib/annual_report/top_statuses.rb
@@ -2,20 +2,44 @@
 
 class AnnualReport::TopStatuses < AnnualReport::Source
   def generate
-    top_reblogs = base_scope.order(reblogs_count: :desc).first&.id
-    top_favourites = base_scope.where.not(id: top_reblogs).order(favourites_count: :desc).first&.id
-    top_replies = base_scope.where.not(id: [top_reblogs, top_favourites]).order(replies_count: :desc).first&.id
-
     {
       top_statuses: {
-        by_reblogs: top_reblogs&.to_s,
-        by_favourites: top_favourites&.to_s,
-        by_replies: top_replies&.to_s,
+        by_reblogs: status_identifier(most_reblogged_status),
+        by_favourites: status_identifier(most_favourited_status),
+        by_replies: status_identifier(most_replied_status),
       },
     }
   end
 
+  private
+
+  def status_identifier(status)
+    status.id.to_s if status.present?
+  end
+
+  def most_reblogged_status
+    base_scope
+      .order(reblogs_count: :desc)
+      .first
+  end
+
+  def most_favourited_status
+    base_scope
+      .excluding(most_reblogged_status)
+      .order(favourites_count: :desc)
+      .first
+  end
+
+  def most_replied_status
+    base_scope
+      .excluding(most_reblogged_status, most_favourited_status)
+      .order(replies_count: :desc)
+      .first
+  end
+
   def base_scope
-    report_statuses.public_visibility.joins(:status_stat)
+    report_statuses
+      .public_visibility
+      .joins(:status_stat)
   end
 end
diff --git a/app/lib/annual_report/type_distribution.rb b/app/lib/annual_report/type_distribution.rb
index bdafe34c13d..0534055c28e 100644
--- a/app/lib/annual_report/type_distribution.rb
+++ b/app/lib/annual_report/type_distribution.rb
@@ -6,7 +6,7 @@ class AnnualReport::TypeDistribution < AnnualReport::Source
       type_distribution: {
         total: report_statuses.count,
         reblogs: report_statuses.only_reblogs.count,
-        replies: report_statuses.where.not(in_reply_to_id: nil).where.not(in_reply_to_account_id: @account.id).count,
+        replies: report_statuses.where.not(in_reply_to_id: nil).not_replying_to_account(@account).count,
         standalone: report_statuses.without_replies.without_reblogs.count,
       },
     }
diff --git a/app/lib/antispam.rb b/app/lib/antispam.rb
index 4ebf1924854..77bc8d003fd 100644
--- a/app/lib/antispam.rb
+++ b/app/lib/antispam.rb
@@ -32,33 +32,60 @@ class Antispam
     end
   end
 
-  def local_preflight_check!(status)
-    return unless spammy_texts.any? { |spammy_text| status.text.include?(spammy_text) }
-    return unless suspicious_reply_or_mention?(status)
-    return unless status.account.created_at >= ACCOUNT_AGE_EXEMPTION.ago
+  def initialize(status)
+    @status = status
+  end
 
-    report_if_needed!(status.account)
+  def local_preflight_check!
+    return unless considered_spam?
 
-    raise SilentlyDrop, status
+    report_if_needed!
+
+    raise SilentlyDrop, @status
   end
 
   private
 
+  def considered_spam?
+    (all_time_suspicious? || recent_suspicious?) && suspicious_reply_or_mention?
+  end
+
+  def all_time_suspicious?
+    all_time_spammy_texts.any? { |spammy_text| status_text.include?(spammy_text) }
+  end
+
+  def recent_suspicious?
+    @status.account.created_at >= ACCOUNT_AGE_EXEMPTION.ago && spammy_texts.any? { |spammy_text| status_text.include?(spammy_text) }
+  end
+
   def spammy_texts
     redis.smembers('antispam:spammy_texts')
   end
 
-  def suspicious_reply_or_mention?(status)
-    parent = status.thread
-    return true if parent.present? && !Follow.exists?(account_id: parent.account_id, target_account: status.account_id)
-
-    account_ids = status.mentions.map(&:account_id).uniq
-    !Follow.exists?(account_id: account_ids, target_account_id: status.account.id)
+  def all_time_spammy_texts
+    redis.smembers('antispam:all_time_spammy_texts')
   end
 
-  def report_if_needed!(account)
-    return if Report.unresolved.exists?(account: Account.representative, target_account: account)
+  def suspicious_reply_or_mention?
+    account_ids = ([@status.in_reply_to_account_id] + @status.mentions.map(&:account_id)).uniq
+    !Follow.exists?(account_id: account_ids, target_account_id: @status.account.id)
+  end
 
-    Report.create!(account: Account.representative, target_account: account, category: :spam, comment: 'Account automatically reported for posting a banned URL')
+  def report_if_needed!
+    return if system_reports.unresolved.exists?(target_account: @status.account)
+
+    system_reports.create!(
+      category: :spam,
+      comment: 'Account automatically reported for posting a banned URL',
+      target_account: @status.account
+    )
+  end
+
+  def system_reports
+    Account.representative.reports
+  end
+
+  def status_text
+    @status_text ||= @status.text.unicode_normalize(:nfkc).downcase
   end
 end
diff --git a/app/lib/delivery_failure_tracker.rb b/app/lib/delivery_failure_tracker.rb
index 96292923f42..619340a3d16 100644
--- a/app/lib/delivery_failure_tracker.rb
+++ b/app/lib/delivery_failure_tracker.rb
@@ -3,14 +3,18 @@
 class DeliveryFailureTracker
   include Redisable
 
-  FAILURE_DAYS_THRESHOLD = 7
+  FAILURE_THRESHOLDS = {
+    days: 7,
+    minutes: 5,
+  }.freeze
 
-  def initialize(url_or_host)
+  def initialize(url_or_host, resolution: :days)
     @host = url_or_host.start_with?('https://', 'http://') ? Addressable::URI.parse(url_or_host).normalized_host : url_or_host
+    @resolution = resolution
   end
 
   def track_failure!
-    redis.sadd(exhausted_deliveries_key, today)
+    redis.sadd(exhausted_deliveries_key, failure_time)
     UnavailableDomain.create(domain: @host) if reached_failure_threshold?
   end
 
@@ -24,6 +28,12 @@ class DeliveryFailureTracker
   end
 
   def days
+    raise TypeError, 'resolution is not in days' unless @resolution == :days
+
+    failures
+  end
+
+  def failures
     redis.scard(exhausted_deliveries_key) || 0
   end
 
@@ -32,7 +42,7 @@ class DeliveryFailureTracker
   end
 
   def exhausted_deliveries_days
-    @exhausted_deliveries_days ||= redis.smembers(exhausted_deliveries_key).sort.map { |date| Date.new(date.slice(0, 4).to_i, date.slice(4, 2).to_i, date.slice(6, 2).to_i) }
+    @exhausted_deliveries_days ||= redis.smembers(exhausted_deliveries_key).sort.map { |date| Date.new(date.slice(0, 4).to_i, date.slice(4, 2).to_i, date.slice(6, 2).to_i) }.uniq
   end
 
   alias reset! track_success!
@@ -89,11 +99,16 @@ class DeliveryFailureTracker
     "exhausted_deliveries:#{@host}"
   end
 
-  def today
-    Time.now.utc.strftime('%Y%m%d')
+  def failure_time
+    case @resolution
+    when :days
+      Time.now.utc.strftime('%Y%m%d')
+    when :minutes
+      Time.now.utc.strftime('%Y%m%d%H%M')
+    end
   end
 
   def reached_failure_threshold?
-    days >= FAILURE_DAYS_THRESHOLD
+    failures >= FAILURE_THRESHOLDS[@resolution]
   end
 end
diff --git a/app/lib/fasp/request.rb b/app/lib/fasp/request.rb
index 6ea837b89cc..51950a004a2 100644
--- a/app/lib/fasp/request.rb
+++ b/app/lib/fasp/request.rb
@@ -32,8 +32,12 @@ class Fasp::Request
                .send(verb, url, body:)
 
     validate!(response)
+    @provider.delivery_failure_tracker.track_success!
 
     response.parse if response.body.present?
+  rescue *::Mastodon::HTTP_CONNECTION_ERRORS
+    @provider.delivery_failure_tracker.track_failure!
+    raise
   end
 
   def request_headers(_verb, _url, body = '')
@@ -49,6 +53,8 @@ class Fasp::Request
   end
 
   def validate!(response)
+    raise Mastodon::UnexpectedResponseError, response if response.code >= 400
+
     content_digest_header = response.headers['content-digest']
     raise Mastodon::SignatureVerificationError, 'content-digest missing' if content_digest_header.blank?
     raise Mastodon::SignatureVerificationError, 'content-digest does not match' if content_digest_header != content_digest(response.body)
diff --git a/app/lib/ostatus/tag_manager.rb b/app/lib/ostatus/tag_manager.rb
index 21b3d3aa584..cb0c9f89668 100644
--- a/app/lib/ostatus/tag_manager.rb
+++ b/app/lib/ostatus/tag_manager.rb
@@ -4,43 +4,6 @@ class OStatus::TagManager
   include Singleton
   include RoutingHelper
 
-  VERBS = {
-    post: 'http://activitystrea.ms/schema/1.0/post',
-    share: 'http://activitystrea.ms/schema/1.0/share',
-    favorite: 'http://activitystrea.ms/schema/1.0/favorite',
-    unfavorite: 'http://activitystrea.ms/schema/1.0/unfavorite',
-    delete: 'http://activitystrea.ms/schema/1.0/delete',
-    follow: 'http://activitystrea.ms/schema/1.0/follow',
-    request_friend: 'http://activitystrea.ms/schema/1.0/request-friend',
-    authorize: 'http://activitystrea.ms/schema/1.0/authorize',
-    reject: 'http://activitystrea.ms/schema/1.0/reject',
-    unfollow: 'http://ostatus.org/schema/1.0/unfollow',
-    block: 'http://mastodon.social/schema/1.0/block',
-    unblock: 'http://mastodon.social/schema/1.0/unblock',
-  }.freeze
-
-  TYPES = {
-    activity: 'http://activitystrea.ms/schema/1.0/activity',
-    note: 'http://activitystrea.ms/schema/1.0/note',
-    comment: 'http://activitystrea.ms/schema/1.0/comment',
-    person: 'http://activitystrea.ms/schema/1.0/person',
-    collection: 'http://activitystrea.ms/schema/1.0/collection',
-    group: 'http://activitystrea.ms/schema/1.0/group',
-  }.freeze
-
-  COLLECTIONS = {
-    public: 'http://activityschema.org/collection/public',
-  }.freeze
-
-  XMLNS       = 'http://www.w3.org/2005/Atom'
-  MEDIA_XMLNS = 'http://purl.org/syndication/atommedia'
-  AS_XMLNS    = 'http://activitystrea.ms/spec/1.0/'
-  THR_XMLNS   = 'http://purl.org/syndication/thread/1.0'
-  POCO_XMLNS  = 'http://portablecontacts.net/spec/1.0'
-  DFRN_XMLNS  = 'http://purl.org/macgirvin/dfrn/1.0'
-  OS_XMLNS    = 'http://ostatus.org/schema/1.0'
-  MTDN_XMLNS  = 'http://mastodon.social/schema/1.0'
-
   def unique_tag(date, id, type)
     "tag:#{Rails.configuration.x.local_domain},#{date.strftime('%Y-%m-%d')}:objectId=#{id}:objectType=#{type}"
   end
diff --git a/app/lib/permalink_redirector.rb b/app/lib/permalink_redirector.rb
index 142a05d10d3..19fb3f401c9 100644
--- a/app/lib/permalink_redirector.rb
+++ b/app/lib/permalink_redirector.rb
@@ -12,21 +12,21 @@ class PermalinkRedirector
     @object ||= begin
       if at_username_status_request? || statuses_status_request?
         status = Status.find_by(id: second_segment)
-        status if status&.distributable? && !status&.local?
+        status if status&.distributable? && !status&.local? && !status&.account&.suspended?
       elsif at_username_request?
         username, domain = first_segment.delete_prefix('@').split('@')
         domain = nil if TagManager.instance.local_domain?(domain)
         account = Account.find_remote(username, domain)
-        account unless account&.local?
+        account if !account&.local? && !account&.suspended?
       elsif accounts_request? && record_integer_id_request?
         account = Account.find_by(id: second_segment)
-        account unless account&.local?
+        account if !account&.local? && !account&.suspended?
       end
     end
   end
 
   def redirect_path
-    return ActivityPub::TagManager.instance.url_for(object) if object.present?
+    return ActivityPub::TagManager.instance.url_for(object) || ActivityPub::TagManager.instance.uri_for(object) if object.present?
 
     @path.delete_prefix('/deck') if @path.start_with?('/deck')
   end
diff --git a/app/lib/seo/adapter.rb b/app/lib/seo/adapter.rb
new file mode 100644
index 00000000000..0d95f05807e
--- /dev/null
+++ b/app/lib/seo/adapter.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class SEO::Adapter < ActiveModelSerializers::Adapter::Base
+  def self.default_key_transform
+    :camel_lower
+  end
+
+  def self.transform_key_casing!(value, _options)
+    SEO::CaseTransform.camel_lower(value)
+  end
+
+  def serializable_hash(options = nil)
+    serialized_hash = serializer.serializable_hash(serialization_options(options))
+    self.class.transform_key_casing!(serialized_hash, instance_options)
+  end
+end
diff --git a/app/lib/seo/case_transform.rb b/app/lib/seo/case_transform.rb
new file mode 100644
index 00000000000..6c81fb00199
--- /dev/null
+++ b/app/lib/seo/case_transform.rb
@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module SEO::CaseTransform
+  PREFIX_KEYS = %w(
+    context
+    id
+    type
+  ).freeze
+
+  class << self
+    def camel_lower_cache
+      @camel_lower_cache ||= {}
+    end
+
+    def camel_lower(value)
+      case value
+      when Array
+        value.map { |item| camel_lower(item) }
+      when Hash
+        value.deep_transform_keys! { |key| camel_lower(key) }
+      when Symbol
+        camel_lower(value.to_s).to_sym
+      when String
+        camel_lower_cache[value] ||= begin
+          if PREFIX_KEYS.include?(value.to_s)
+            "@#{value}"
+          else
+            value.underscore.camelize(:lower)
+          end
+        end
+      else
+        value
+      end
+    end
+  end
+end
diff --git a/app/lib/signed_request.rb b/app/lib/signed_request.rb
index 066411c680f..0ee47ddae12 100644
--- a/app/lib/signed_request.rb
+++ b/app/lib/signed_request.rb
@@ -196,6 +196,8 @@ class SignedRequest
       return if body_digest == received_digest
 
       raise Mastodon::SignatureVerificationError, "Invalid Digest value. Computed SHA-256 digest: #{body_digest}; given: #{received_digest}"
+    rescue Starry::ParseError
+      raise Mastodon::MalformedHeaderError, 'Content-Digest could not be parsed. It does not contain a valid RFC8941 dictionary.'
     end
 
     def created_time
diff --git a/app/lib/status_cache_hydrator.rb b/app/lib/status_cache_hydrator.rb
index 674945c4039..5ba706c4c05 100644
--- a/app/lib/status_cache_hydrator.rb
+++ b/app/lib/status_cache_hydrator.rb
@@ -71,7 +71,19 @@ class StatusCacheHydrator
     payload[:bookmarked] = Bookmark.exists?(account_id: account_id, status_id: status.id)
     payload[:pinned]     = StatusPin.exists?(account_id: account_id, status_id: status.id) if status.account_id == account_id
     payload[:filtered]   = mapped_applied_custom_filter(account_id, status)
+    # TODO: performance optimization by not loading `Account` twice
+    payload[:quote_approval][:current_user] = status.quote_policy_for_account(Account.find_by(id: account_id)) if payload[:quote_approval]
     payload[:quote] = hydrate_quote_payload(payload[:quote], status.quote, account_id, nested:) if payload[:quote]
+
+    # Nested statuses are more likely to have a stale cache
+    fill_status_stats(payload, status) if nested
+  end
+
+  def fill_status_stats(payload, status)
+    payload[:replies_count] = status.replies_count
+    payload[:reblogs_count] = status.untrusted_reblogs_count || status.reblogs_count
+    payload[:favourites_count] = status.untrusted_favourites_count || status.favourites_count
+    payload[:quotes_count] = status.quotes_count
   end
 
   def hydrate_quote_payload(empty_payload, quote, account_id, nested: false)
@@ -85,7 +97,7 @@ class StatusCacheHydrator
         if quote.quoted_status.nil?
           payload[nested ? :quoted_status_id : :quoted_status] = nil
           payload[:state] = 'deleted'
-        elsif StatusFilter.new(quote.quoted_status, Account.find_by(id: account_id)).filtered?
+        elsif StatusFilter.new(quote.quoted_status, Account.find_by(id: account_id)).filtered_for_quote?
           payload[nested ? :quoted_status_id : :quoted_status] = nil
           payload[:state] = 'unauthorized'
         else
diff --git a/app/lib/status_filter.rb b/app/lib/status_filter.rb
index eb522e5447a..dbf7d28b69c 100644
--- a/app/lib/status_filter.rb
+++ b/app/lib/status_filter.rb
@@ -15,6 +15,12 @@ class StatusFilter
     blocked_by_policy? || (account_present? && filtered_status?) || silenced_account?
   end
 
+  def filtered_for_quote?
+    return false if !account.nil? && account.id == status.account_id
+
+    blocked_by_policy? || (account_present? && filtered_status?)
+  end
+
   private
 
   def account_present?
diff --git a/app/lib/status_reach_finder.rb b/app/lib/status_reach_finder.rb
index 5fb19643378..3ff04c4b69b 100644
--- a/app/lib/status_reach_finder.rb
+++ b/app/lib/status_reach_finder.rb
@@ -30,8 +30,10 @@ class StatusReachFinder
       [
         replied_to_account_id,
         reblog_of_account_id,
+        quote_of_account_id,
         mentioned_account_ids,
         reblogs_account_ids,
+        quotes_account_ids,
         favourites_account_ids,
         replies_account_ids,
       ].tap do |arr|
@@ -46,6 +48,10 @@ class StatusReachFinder
     @status.in_reply_to_account_id if distributable?
   end
 
+  def quote_of_account_id
+    @status.quote&.quoted_account_id
+  end
+
   def reblog_of_account_id
     @status.reblog.account_id if @status.reblog?
   end
@@ -54,6 +60,11 @@ class StatusReachFinder
     @status.mentions.pluck(:account_id)
   end
 
+  # Beware: Quotes can be created without the author having had access to the status
+  def quotes_account_ids
+    @status.quotes.pluck(:account_id) if distributable? || unsafe?
+  end
+
   # Beware: Reblogs can be created without the author having had access to the status
   def reblogs_account_ids
     @status.reblogs.rewhere(deleted_at: [nil, @status.deleted_at]).pluck(:account_id) if distributable? || unsafe?
diff --git a/app/lib/text_formatter.rb b/app/lib/text_formatter.rb
index 45fb06e705d..963cc0d1c43 100644
--- a/app/lib/text_formatter.rb
+++ b/app/lib/text_formatter.rb
@@ -44,6 +44,7 @@ class TextFormatter
     end
 
     html = simple_format(html, {}, sanitize: false).delete("\n") if multiline?
+    html = add_quote_fallback(html) if options[:quoted_status].present?
 
     html.html_safe # rubocop:disable Rails/OutputSafety
   end
@@ -172,4 +173,15 @@ class TextFormatter
   def preloaded_accounts?
     preloaded_accounts.present?
   end
+
+  def add_quote_fallback(html)
+    return html if options[:quoted_status].nil?
+
+    url = ActivityPub::TagManager.instance.url_for(options[:quoted_status]) || ActivityPub::TagManager.instance.uri_for(options[:quoted_status])
+    return html if url.blank? || html.include?(url)
+
+    <<~HTML.squish
+      <p class="quote-inline">RE: #{TextFormatter.shortened_link(url)}</p>#{html}
+    HTML
+  end
 end
diff --git a/app/lib/webfinger.rb b/app/lib/webfinger.rb
index 83b5415a33f..c39c25e994a 100644
--- a/app/lib/webfinger.rb
+++ b/app/lib/webfinger.rb
@@ -84,22 +84,18 @@ class Webfinger
 
   def body_from_host_meta
     host_meta_request.perform do |res|
-      if res.code == 200
-        body_from_webfinger(url_from_template(res.body_with_limit), use_fallback: false)
-      else
-        raise Webfinger::Error, "Request for #{@uri} returned HTTP #{res.code}"
-      end
+      raise Webfinger::Error, "Request for #{@uri} returned HTTP #{res.code}" unless res.code == 200
+
+      body_from_webfinger(url_from_template(res.body_with_limit), use_fallback: false)
     end
   end
 
   def url_from_template(str)
     link = Nokogiri::XML(str).at_xpath('//xmlns:Link[@rel="lrdd"]')
 
-    if link.present?
-      link['template'].gsub('{uri}', @uri)
-    else
-      raise Webfinger::Error, "Request for #{@uri} returned host-meta without link to Webfinger"
-    end
+    raise Webfinger::Error, "Request for #{@uri} returned host-meta without link to Webfinger" if link.blank?
+
+    link['template'].gsub('{uri}', @uri)
   rescue Nokogiri::XML::XPath::SyntaxError
     raise Webfinger::Error, "Invalid XML encountered in host-meta for #{@uri}"
   end
diff --git a/app/lib/webfinger_resource.rb b/app/lib/webfinger_resource.rb
index e2027e164de..95de496a6d5 100644
--- a/app/lib/webfinger_resource.rb
+++ b/app/lib/webfinger_resource.rb
@@ -54,11 +54,9 @@ class WebfingerResource
   end
 
   def username_from_acct
-    if domain_matches_local?
-      local_username
-    else
-      raise ActiveRecord::RecordNotFound
-    end
+    raise ActiveRecord::RecordNotFound unless domain_matches_local?
+
+    local_username
   end
 
   def split_acct
diff --git a/app/mailers/notification_mailer.rb b/app/mailers/notification_mailer.rb
index a20992dcb56..54dde1bb0dd 100644
--- a/app/mailers/notification_mailer.rb
+++ b/app/mailers/notification_mailer.rb
@@ -6,7 +6,7 @@ class NotificationMailer < ApplicationMailer
          :routing
 
   before_action :process_params
-  with_options only: %i(mention favourite reblog) do
+  with_options only: %i(mention favourite reblog quote) do
     before_action :set_status
     after_action :thread_by_conversation!
   end
@@ -27,6 +27,14 @@ class NotificationMailer < ApplicationMailer
     end
   end
 
+  def quote
+    return if @status.blank?
+
+    locale_for_account(@me) do
+      mail subject: default_i18n_subject(name: @status.account.acct)
+    end
+  end
+
   def follow
     locale_for_account(@me) do
       mail subject: default_i18n_subject(name: @account.acct)
diff --git a/app/models/account.rb b/app/models/account.rb
index c4e54756728..5f4caf9eaa7 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -31,6 +31,7 @@
 #  outbox_url                    :string           default(""), not null
 #  shared_inbox_url              :string           default(""), not null
 #  followers_url                 :string           default(""), not null
+#  following_url                 :string           default(""), not null
 #  protocol                      :integer          default("ostatus"), not null
 #  memorial                      :boolean          default(FALSE), not null
 #  moved_to_account_id           :bigint(8)
@@ -51,6 +52,7 @@
 #  requested_review_at           :datetime
 #  indexable                     :boolean          default(FALSE), not null
 #  attribution_domains           :string           default([]), is an Array
+#  id_scheme                     :integer          default("numeric_ap_id")
 #
 
 class Account < ApplicationRecord
@@ -104,6 +106,7 @@ class Account < ApplicationRecord
 
   enum :protocol, { ostatus: 0, activitypub: 1 }
   enum :suspension_origin, { local: 0, remote: 1 }, prefix: true
+  enum :id_scheme, { username_ap_id: 0, numeric_ap_id: 1 }
 
   validates :username, presence: true
   validates_with UniqueUsernameValidator, if: -> { will_save_change_to_username? }
@@ -116,13 +119,14 @@ class Account < ApplicationRecord
 
   # Local user validations
   validates :username, format: { with: /\A[a-z0-9_]+\z/i }, length: { maximum: USERNAME_LENGTH_LIMIT }, if: -> { local? && will_save_change_to_username? && !actor_type_application? }
-  validates_with UnreservedUsernameValidator, if: -> { local? && will_save_change_to_username? && !actor_type_application? }
+  validates_with UnreservedUsernameValidator, if: -> { local? && will_save_change_to_username? && !actor_type_application? && !user&.bypass_registration_checks }
   validates :display_name, length: { maximum: DISPLAY_NAME_LENGTH_LIMIT }, if: -> { local? && will_save_change_to_display_name? }
   validates :note, note_length: { maximum: NOTE_LENGTH_LIMIT }, if: -> { local? && will_save_change_to_note? }
   validates :fields, length: { maximum: DEFAULT_FIELDS_SIZE }, if: -> { local? && will_save_change_to_fields? }
   validates_with EmptyProfileFieldNamesValidator, if: -> { local? && will_save_change_to_fields? }
   with_options on: :create, if: :local? do
     validates :followers_url, absence: true
+    validates :following_url, absence: true
     validates :inbox_url, absence: true
     validates :shared_inbox_url, absence: true
     validates :uri, absence: true
@@ -138,10 +142,7 @@ class Account < ApplicationRecord
   scope :partitioned, -> { order(Arel.sql('row_number() over (partition by domain)')) }
   scope :without_instance_actor, -> { where.not(id: INSTANCE_ACTOR_ID) }
   scope :recent, -> { reorder(id: :desc) }
-  scope :bots, -> { where(actor_type: AUTOMATED_ACTOR_TYPES) }
   scope :non_automated, -> { where.not(actor_type: AUTOMATED_ACTOR_TYPES) }
-  scope :groups, -> { where(actor_type: 'Group') }
-  scope :alphabetic, -> { order(domain: :asc, username: :asc) }
   scope :matches_uri_prefix, ->(value) { where(arel_table[:uri].matches("#{sanitize_sql_like(value)}/%", false, true)).or(where(uri: value)) }
   scope :matches_username, ->(value) { where('lower((username)::text) LIKE lower(?)', "#{value}%") }
   scope :matches_display_name, ->(value) { where(arel_table[:display_name].matches("#{value}%")) }
diff --git a/app/models/account_migration.rb b/app/models/account_migration.rb
index 7bda388f2a8..6cdc7128ef4 100644
--- a/app/models/account_migration.rb
+++ b/app/models/account_migration.rb
@@ -74,7 +74,7 @@ class AccountMigration < ApplicationRecord
       errors.add(:acct, I18n.t('migrations.errors.not_found'))
     else
       errors.add(:acct, I18n.t('migrations.errors.missing_also_known_as')) unless target_account.also_known_as.include?(ActivityPub::TagManager.instance.uri_for(account))
-      errors.add(:acct, I18n.t('migrations.errors.already_moved')) if account.moved_to_account_id.present? && account.moved_to_account_id == target_account.id
+      errors.add(:acct, I18n.t('migrations.errors.already_moved')) if account.moved? && account.moved_to_account_id == target_account.id
       errors.add(:acct, I18n.t('migrations.errors.move_to_self')) if account.id == target_account.id
     end
   end
diff --git a/app/models/account_statuses_cleanup_policy.rb b/app/models/account_statuses_cleanup_policy.rb
index ef41bb3ee3a..0915003c8b7 100644
--- a/app/models/account_statuses_cleanup_policy.rb
+++ b/app/models/account_statuses_cleanup_policy.rb
@@ -161,7 +161,7 @@ class AccountStatusesCleanupPolicy < ApplicationRecord
   end
 
   def without_poll_scope
-    Status.where(poll_id: nil)
+    Status.without_polls
   end
 
   def without_popular_scope
diff --git a/app/models/account_suggestions/friends_of_friends_source.rb b/app/models/account_suggestions/friends_of_friends_source.rb
index 707c6ccaec2..d4accd2cea6 100644
--- a/app/models/account_suggestions/friends_of_friends_source.rb
+++ b/app/models/account_suggestions/friends_of_friends_source.rb
@@ -26,6 +26,7 @@ class AccountSuggestions::FriendsOfFriendsSource < AccountSuggestions::Source
         AND NOT EXISTS (SELECT 1 FROM mutes m WHERE m.target_account_id = follows.target_account_id AND m.account_id = :id)
         AND (accounts.domain IS NULL OR NOT EXISTS (SELECT 1 FROM account_domain_blocks b WHERE b.account_id = :id AND b.domain = accounts.domain))
         AND NOT EXISTS (SELECT 1 FROM follows f WHERE f.target_account_id = follows.target_account_id AND f.account_id = :id)
+        AND NOT EXISTS (SELECT 1 FROM follow_requests f WHERE f.target_account_id = follows.target_account_id AND f.account_id = :id)
         AND follows.target_account_id <> :id
         AND accounts.discoverable
         AND accounts.suspended_at IS NULL
diff --git a/app/models/admin/account_action.rb b/app/models/admin/account_action.rb
index 7c66b6e6462..3cde3c7f8e4 100644
--- a/app/models/admin/account_action.rb
+++ b/app/models/admin/account_action.rb
@@ -2,6 +2,7 @@
 
 class Admin::AccountAction
   include ActiveModel::Model
+  include ActiveModel::Attributes
   include AccountableConcern
   include Authorization
 
@@ -20,7 +21,10 @@ class Admin::AccountAction
                 :report_id,
                 :warning_preset_id
 
-  attr_reader :warning, :send_email_notification, :include_statuses
+  attr_reader :warning
+
+  attribute :include_statuses, :boolean, default: true
+  attribute :send_email_notification, :boolean, default: true
 
   alias send_email_notification? send_email_notification
   alias include_statuses? include_statuses
@@ -28,23 +32,8 @@ class Admin::AccountAction
   validates :type, :target_account, :current_account, presence: true
   validates :type, inclusion: { in: TYPES }
 
-  def initialize(attributes = {})
-    @send_email_notification = true
-    @include_statuses        = true
-
-    super
-  end
-
-  def send_email_notification=(value)
-    @send_email_notification = ActiveModel::Type::Boolean.new.cast(value)
-  end
-
-  def include_statuses=(value)
-    @include_statuses = ActiveModel::Type::Boolean.new.cast(value)
-  end
-
-  def save!
-    raise ActiveRecord::RecordInvalid, self unless valid?
+  def save
+    return false unless valid?
 
     ApplicationRecord.transaction do
       process_action!
@@ -54,6 +43,12 @@ class Admin::AccountAction
 
     process_notification!
     process_queue!
+
+    true
+  end
+
+  def save!
+    raise ActiveRecord::RecordInvalid, self unless save
   end
 
   def report
@@ -185,7 +180,7 @@ class Admin::AccountAction
     @reports ||= if type == 'none'
                    with_report? ? [report] : []
                  else
-                   Report.where(target_account: target_account).unresolved
+                   target_account.targeted_reports.unresolved
                  end
   end
 
diff --git a/app/models/admin/action_log_filter.rb b/app/models/admin/action_log_filter.rb
index fd6b4289cee..a5bdd97420f 100644
--- a/app/models/admin/action_log_filter.rb
+++ b/app/models/admin/action_log_filter.rb
@@ -77,6 +77,9 @@ class Admin::ActionLogFilter
     update_user_role: { target_type: 'UserRole', action: 'update' }.freeze,
     update_ip_block: { target_type: 'IpBlock', action: 'update' }.freeze,
     unblock_email_account: { target_type: 'Account', action: 'unblock_email' }.freeze,
+    create_username_block: { target_type: 'UsernameBlock', action: 'create' }.freeze,
+    update_username_block: { target_type: 'UsernameBlock', action: 'update' }.freeze,
+    destroy_username_block: { target_type: 'UsernameBlock', action: 'destroy' }.freeze,
   }.freeze
 
   attr_reader :params
diff --git a/app/models/admin/status_batch_action.rb b/app/models/admin/status_batch_action.rb
index 4a100019351..4d0ee130382 100644
--- a/app/models/admin/status_batch_action.rb
+++ b/app/models/admin/status_batch_action.rb
@@ -2,6 +2,7 @@
 
 class Admin::StatusBatchAction
   include ActiveModel::Model
+  include ActiveModel::Attributes
   include AccountableConcern
   include Authorization
 
@@ -9,11 +10,7 @@ class Admin::StatusBatchAction
                 :status_ids, :report_id,
                 :text
 
-  attr_reader :send_email_notification
-
-  def send_email_notification=(value)
-    @send_email_notification = ActiveModel::Type::Boolean.new.cast(value)
-  end
+  attribute :send_email_notification, :boolean
 
   def save!
     process_action!
diff --git a/app/models/announcement_reaction.rb b/app/models/announcement_reaction.rb
index 46d9fc290ff..855dfc9e3a6 100644
--- a/app/models/announcement_reaction.rb
+++ b/app/models/announcement_reaction.rb
@@ -14,7 +14,7 @@
 #
 
 class AnnouncementReaction < ApplicationRecord
-  before_validation :set_custom_emoji
+  before_validation :set_custom_emoji, if: :name?
   after_commit :queue_publish
 
   belongs_to :account
@@ -27,7 +27,7 @@ class AnnouncementReaction < ApplicationRecord
   private
 
   def set_custom_emoji
-    self.custom_emoji = CustomEmoji.local.enabled.find_by(shortcode: name) if name.present?
+    self.custom_emoji = CustomEmoji.local.enabled.find_by(shortcode: name)
   end
 
   def queue_publish
diff --git a/app/models/canonical_email_block.rb b/app/models/canonical_email_block.rb
index d09df6f5e2a..4ed160fc262 100644
--- a/app/models/canonical_email_block.rb
+++ b/app/models/canonical_email_block.rb
@@ -12,24 +12,29 @@
 #
 
 class CanonicalEmailBlock < ApplicationRecord
-  include EmailHelper
+  include CanonicalEmail
   include Paginable
 
   belongs_to :reference_account, class_name: 'Account', optional: true
 
   validates :canonical_email_hash, presence: true, uniqueness: true
 
-  scope :matching_email, ->(email) { where(canonical_email_hash: email_to_canonical_email_hash(email)) }
+  scope :matching_email, ->(email) { where(canonical_email_hash: digest(normalize_value_for(:email, email))) }
+
+  def self.block?(email)
+    matching_email(email).exists?
+  end
+
+  def self.digest(value)
+    Digest::SHA256.hexdigest(value)
+  end
 
   def to_log_human_identifier
     canonical_email_hash
   end
 
   def email=(email)
-    self.canonical_email_hash = email_to_canonical_email_hash(email)
-  end
-
-  def self.block?(email)
-    matching_email(email).exists?
+    super
+    self.canonical_email_hash = self.class.digest(self.email)
   end
 end
diff --git a/app/models/concerns/account/attribution_domains.rb b/app/models/concerns/account/attribution_domains.rb
index 5f4d9afabfc..22bf27cc5dd 100644
--- a/app/models/concerns/account/attribution_domains.rb
+++ b/app/models/concerns/account/attribution_domains.rb
@@ -3,10 +3,12 @@
 module Account::AttributionDomains
   extend ActiveSupport::Concern
 
+  ATTRIBUTION_DOMAINS_LIMIT = 100
+
   included do
     normalizes :attribution_domains, with: ->(arr) { arr.filter_map { |str| str.to_s.strip.delete_prefix('http://').delete_prefix('https://').delete_prefix('*.').presence }.uniq }
 
-    validates :attribution_domains, domain: true, length: { maximum: 100 }, if: -> { local? && will_save_change_to_attribution_domains? }
+    validates :attribution_domains, domain: true, length: { maximum: ATTRIBUTION_DOMAINS_LIMIT }, if: -> { local? && will_save_change_to_attribution_domains? }
   end
 
   def can_be_attributed_from?(domain)
diff --git a/app/models/concerns/account/interactions.rb b/app/models/concerns/account/interactions.rb
index 4eab55ca3e6..7f1d91a1602 100644
--- a/app/models/concerns/account/interactions.rb
+++ b/app/models/concerns/account/interactions.rb
@@ -215,8 +215,9 @@ module Account::Interactions
   def local_followers_hash
     Rails.cache.fetch("followers_hash:#{id}:local") do
       digest = "\x00" * 32
-      followers.where(domain: nil).pluck_each(:username) do |username|
-        Xorcist.xor!(digest, Digest::SHA256.digest(ActivityPub::TagManager.instance.uri_for_username(username)))
+      followers.where(domain: nil).pluck_each(:id_scheme, :id, :username) do |id_scheme, id, username|
+        uri = id_scheme == 'numeric_ap_id' ? ActivityPub::TagManager.instance.uri_for_account_id(id) : ActivityPub::TagManager.instance.uri_for_username(username)
+        Xorcist.xor!(digest, Digest::SHA256.digest(uri))
       end
       digest.unpack1('H*')
     end
diff --git a/app/models/concerns/account/suspensions.rb b/app/models/concerns/account/suspensions.rb
index c981fb5a295..4c9ca593ad0 100644
--- a/app/models/concerns/account/suspensions.rb
+++ b/app/models/concerns/account/suspensions.rb
@@ -32,6 +32,10 @@ module Account::Suspensions
       update!(suspended_at: date, suspension_origin: origin)
       create_canonical_email_block! if block_email
     end
+
+    # This terminates all connections for the given account with the streaming
+    # server:
+    redis.publish("timeline:system:#{id}", Oj.dump(event: :kill)) if local?
   end
 
   def unsuspend!
diff --git a/app/models/concerns/canonical_email.rb b/app/models/concerns/canonical_email.rb
new file mode 100644
index 00000000000..bbc529ff085
--- /dev/null
+++ b/app/models/concerns/canonical_email.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module CanonicalEmail
+  extend ActiveSupport::Concern
+
+  included do
+    normalizes :email, with: ->(value) { canonicalize_email(value) }
+  end
+
+  class_methods do
+    def canonicalize_email(email)
+      email
+        .downcase
+        .split('@', 2)
+        .then { |local, domain| [canonical_username(local), domain] }
+        .join('@')
+    end
+
+    def canonical_username(username)
+      username
+        .to_s
+        .delete('.')
+        .split('+', 2)
+        .first
+    end
+  end
+end
diff --git a/app/models/concerns/database_view_record.rb b/app/models/concerns/database_view_record.rb
index 8b6672e2991..b6709e1e419 100644
--- a/app/models/concerns/database_view_record.rb
+++ b/app/models/concerns/database_view_record.rb
@@ -10,12 +10,6 @@ module DatabaseViewRecord
         concurrently: true,
         cascade: false
       )
-    rescue ActiveRecord::StatementInvalid
-      Scenic.database.refresh_materialized_view(
-        table_name,
-        concurrently: false,
-        cascade: false
-      )
     end
   end
 
diff --git a/app/models/concerns/follow_limitable.rb b/app/models/concerns/follow_limitable.rb
index c64060d6e56..fb8f76e9bfa 100644
--- a/app/models/concerns/follow_limitable.rb
+++ b/app/models/concerns/follow_limitable.rb
@@ -4,14 +4,8 @@ module FollowLimitable
   extend ActiveSupport::Concern
 
   included do
-    validates_with FollowLimitValidator, on: :create, unless: :bypass_follow_limit?
-  end
+    validates_with FollowLimitValidator, on: :create, unless: :bypass_follow_limit
 
-  def bypass_follow_limit=(value)
-    @bypass_follow_limit = value
-  end
-
-  def bypass_follow_limit?
-    @bypass_follow_limit
+    attribute :bypass_follow_limit, :boolean, default: false
   end
 end
diff --git a/app/models/concerns/rate_limitable.rb b/app/models/concerns/rate_limitable.rb
index ad1b5e44e36..c6b5d3e0844 100644
--- a/app/models/concerns/rate_limitable.rb
+++ b/app/models/concerns/rate_limitable.rb
@@ -3,12 +3,8 @@
 module RateLimitable
   extend ActiveSupport::Concern
 
-  def rate_limit=(value)
-    @rate_limit = value
-  end
-
-  def rate_limit?
-    @rate_limit
+  included do
+    attribute :rate_limit, :boolean, default: false
   end
 
   def rate_limiter(by, options = {})
diff --git a/app/models/concerns/status/fetch_replies_concern.rb b/app/models/concerns/status/fetch_replies_concern.rb
index fd9929aba49..7ab46481747 100644
--- a/app/models/concerns/status/fetch_replies_concern.rb
+++ b/app/models/concerns/status/fetch_replies_concern.rb
@@ -3,9 +3,6 @@
 module Status::FetchRepliesConcern
   extend ActiveSupport::Concern
 
-  # enable/disable fetching all replies
-  FETCH_REPLIES_ENABLED = ENV['FETCH_REPLIES_ENABLED'] == 'true'
-
   # debounce fetching all replies to minimize DoS
   FETCH_REPLIES_COOLDOWN_MINUTES = (ENV['FETCH_REPLIES_COOLDOWN_MINUTES'] || 15).to_i.minutes
   FETCH_REPLIES_INITIAL_WAIT_MINUTES = (ENV['FETCH_REPLIES_INITIAL_WAIT_MINUTES'] || 5).to_i.minutes
@@ -36,7 +33,7 @@ module Status::FetchRepliesConcern
 
   def should_fetch_replies?
     # we aren't brand new, and we haven't fetched replies since the debounce window
-    FETCH_REPLIES_ENABLED && !local? && created_at <= FETCH_REPLIES_INITIAL_WAIT_MINUTES.ago && (
+    !local? && distributable? && created_at <= FETCH_REPLIES_INITIAL_WAIT_MINUTES.ago && (
       fetched_replies_at.nil? || fetched_replies_at <= FETCH_REPLIES_COOLDOWN_MINUTES.ago
     )
   end
diff --git a/app/models/concerns/status/interaction_policy_concern.rb b/app/models/concerns/status/interaction_policy_concern.rb
new file mode 100644
index 00000000000..dbac017b33f
--- /dev/null
+++ b/app/models/concerns/status/interaction_policy_concern.rb
@@ -0,0 +1,74 @@
+# frozen_string_literal: true
+
+module Status::InteractionPolicyConcern
+  extend ActiveSupport::Concern
+
+  QUOTE_APPROVAL_POLICY_FLAGS = {
+    unsupported_policy: (1 << 0),
+    public: (1 << 1),
+    followers: (1 << 2),
+    following: (1 << 3),
+  }.freeze
+
+  included do
+    before_validation :downgrade_quote_policy, if: -> { local? && !distributable? }
+  end
+
+  def quote_policy_as_keys(kind)
+    case kind
+    when :automatic
+      policy = quote_approval_policy >> 16
+    when :manual
+      policy = quote_approval_policy & 0xFFFF
+    end
+
+    QUOTE_APPROVAL_POLICY_FLAGS.keys.select { |key| policy.anybits?(QUOTE_APPROVAL_POLICY_FLAGS[key]) }.map(&:to_s)
+  end
+
+  # Returns `:automatic`, `:manual`, `:unknown` or `:denied`
+  def quote_policy_for_account(other_account, preloaded_relations: {})
+    return :denied if other_account.nil? || direct_visibility?
+
+    following_author = nil
+    followed_by_author = nil
+
+    # Post author is always allowed to quote themselves
+    return :automatic if account_id == other_account.id
+
+    automatic_policy = quote_approval_policy >> 16
+    manual_policy = quote_approval_policy & 0xFFFF
+
+    return :automatic if automatic_policy.anybits?(QUOTE_APPROVAL_POLICY_FLAGS[:public])
+
+    if automatic_policy.anybits?(QUOTE_APPROVAL_POLICY_FLAGS[:followers])
+      following_author = preloaded_relations[:following] ? preloaded_relations[:following][account_id] : other_account.following?(account) if following_author.nil?
+      return :automatic if following_author
+    end
+
+    if automatic_policy.anybits?(QUOTE_APPROVAL_POLICY_FLAGS[:following])
+      followed_by_author = account.following?(other_account) if followed_by_author.nil?
+      return :automatic if followed_by_author
+    end
+
+    # We don't know we are allowed by the automatic policy, considering the manual one
+    return :manual if manual_policy.anybits?(QUOTE_APPROVAL_POLICY_FLAGS[:public])
+
+    if manual_policy.anybits?(QUOTE_APPROVAL_POLICY_FLAGS[:followers])
+      following_author = preloaded_relations[:following] ? preloaded_relations[:following][account_id] : other_account.following?(account) if following_author.nil?
+      return :manual if following_author
+    end
+
+    if manual_policy.anybits?(QUOTE_APPROVAL_POLICY_FLAGS[:following])
+      followed_by_author = account.following?(other_account) if followed_by_author.nil?
+      return :manual if followed_by_author
+    end
+
+    return :unknown if (automatic_policy | manual_policy).anybits?(QUOTE_APPROVAL_POLICY_FLAGS[:unsupported_policy])
+
+    :denied
+  end
+
+  def downgrade_quote_policy
+    self.quote_approval_policy = 0
+  end
+end
diff --git a/app/models/concerns/status/search_concern.rb b/app/models/concerns/status/search_concern.rb
index 3f31b3b6750..7f1dbedc451 100644
--- a/app/models/concerns/status/search_concern.rb
+++ b/app/models/concerns/status/search_concern.rb
@@ -43,6 +43,7 @@ module Status::SearchConcern
       properties << 'embed' if preview_card&.video?
       properties << 'sensitive' if sensitive?
       properties << 'reply' if reply?
+      properties << 'quote' if with_quote?
     end
   end
 end
diff --git a/app/models/concerns/user/activity.rb b/app/models/concerns/user/activity.rb
new file mode 100644
index 00000000000..df2713415b3
--- /dev/null
+++ b/app/models/concerns/user/activity.rb
@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module User::Activity
+  extend ActiveSupport::Concern
+
+  # The home and list feeds will be stored for this amount of time, and status
+  # fan-out to followers will include only people active within this time frame.
+  #
+  # Lowering the duration may improve performance if many people sign up, but
+  # most will not check their feed every day. Raising the duration reduces the
+  # amount of background processing that happens when people become active.
+  ACTIVE_DURATION = ENV.fetch('USER_ACTIVE_DAYS', 7).to_i.days
+
+  included do
+    scope :signed_in_recently, -> { where(current_sign_in_at: ACTIVE_DURATION.ago..) }
+    scope :not_signed_in_recently, -> { where(current_sign_in_at: ...ACTIVE_DURATION.ago) }
+  end
+
+  def signed_in_recently?
+    current_sign_in_at.present? && current_sign_in_at >= ACTIVE_DURATION.ago
+  end
+
+  private
+
+  def inactive_since_duration?
+    last_sign_in_at < ACTIVE_DURATION.ago
+  end
+end
diff --git a/app/models/concerns/user/confirmation.rb b/app/models/concerns/user/confirmation.rb
new file mode 100644
index 00000000000..46fdb0210a5
--- /dev/null
+++ b/app/models/concerns/user/confirmation.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module User::Confirmation
+  extend ActiveSupport::Concern
+
+  included do
+    scope :confirmed, -> { where.not(confirmed_at: nil) }
+    scope :unconfirmed, -> { where(confirmed_at: nil) }
+
+    def confirm
+      wrap_email_confirmation { super }
+    end
+  end
+
+  def confirmed?
+    confirmed_at.present?
+  end
+
+  def unconfirmed?
+    !confirmed?
+  end
+end
diff --git a/app/models/concerns/user/has_settings.rb b/app/models/concerns/user/has_settings.rb
index 14d2f22c24e..04ad524c5ac 100644
--- a/app/models/concerns/user/has_settings.rb
+++ b/app/models/concerns/user/has_settings.rb
@@ -107,6 +107,10 @@ module User::HasSettings
     settings['default_privacy'] || (account.locked? ? 'private' : 'public')
   end
 
+  def setting_default_quote_policy
+    settings['default_quote_policy'] || 'public'
+  end
+
   def allows_report_emails?
     settings['notification_emails.report']
   end
diff --git a/app/models/conversation.rb b/app/models/conversation.rb
index a7fe1488407..30d6f13eda7 100644
--- a/app/models/conversation.rb
+++ b/app/models/conversation.rb
@@ -4,10 +4,12 @@
 #
 # Table name: conversations
 #
-#  id         :bigint(8)        not null, primary key
-#  uri        :string
-#  created_at :datetime         not null
-#  updated_at :datetime         not null
+#  id                :bigint(8)        not null, primary key
+#  uri               :string
+#  created_at        :datetime         not null
+#  updated_at        :datetime         not null
+#  parent_account_id :bigint(8)
+#  parent_status_id  :bigint(8)
 #
 
 class Conversation < ApplicationRecord
@@ -15,7 +17,28 @@ class Conversation < ApplicationRecord
 
   has_many :statuses, dependent: nil
 
+  belongs_to :parent_status, class_name: 'Status', optional: true, inverse_of: :conversation
+  belongs_to :parent_account, class_name: 'Account', optional: true
+
+  scope :local, -> { where(uri: nil) }
+
+  before_validation :set_parent_account, on: :create
+
+  def to_param
+    "#{parent_account_id}-#{parent_status_id}" unless parent_account_id.nil? || parent_status_id.nil?
+  end
+
   def local?
     uri.nil?
   end
+
+  def object_type
+    :conversation
+  end
+
+  private
+
+  def set_parent_account
+    self.parent_account = parent_status.account if parent_status.present?
+  end
 end
diff --git a/app/models/custom_emoji.rb b/app/models/custom_emoji.rb
index f1423bc2fac..25ba3d921b4 100644
--- a/app/models/custom_emoji.rb
+++ b/app/models/custom_emoji.rb
@@ -42,7 +42,7 @@ class CustomEmoji < ApplicationRecord
 
   has_attached_file :image, styles: { static: { format: 'png', convert_options: '-coalesce +profile "!icc,*" +set date:modify +set date:create +set date:timestamp', file_geometry_parser: FastGeometryParser } }, validate_media_type: false, processors: [:lazy_thumbnail]
 
-  normalizes :domain, with: ->(domain) { domain.downcase }
+  normalizes :domain, with: ->(domain) { domain.downcase.strip }
 
   validates_attachment :image, content_type: { content_type: IMAGE_MIME_TYPES }, presence: true, size: { less_than: LIMIT }
   validates :shortcode, uniqueness: { scope: :domain }, format: { with: SHORTCODE_ONLY_RE }, length: { minimum: MINIMUM_SHORTCODE_SIZE }
diff --git a/app/models/custom_emoji_filter.rb b/app/models/custom_emoji_filter.rb
index 870cc71974e..070637fea07 100644
--- a/app/models/custom_emoji_filter.rb
+++ b/app/models/custom_emoji_filter.rb
@@ -35,7 +35,7 @@ class CustomEmojiFilter
     when 'remote'
       CustomEmoji.remote
     when 'by_domain'
-      CustomEmoji.where(domain: value.strip.downcase)
+      CustomEmoji.where(domain: value)
     when 'shortcode'
       CustomEmoji.search(value.strip)
     else
diff --git a/app/models/custom_filter_status.rb b/app/models/custom_filter_status.rb
index 58b61cd79d4..c85b811280e 100644
--- a/app/models/custom_filter_status.rb
+++ b/app/models/custom_filter_status.rb
@@ -17,12 +17,14 @@ class CustomFilterStatus < ApplicationRecord
   belongs_to :custom_filter
   belongs_to :status
 
-  validates :status, uniqueness: { scope: :custom_filter }
-  validate :validate_status_access
+  validates :status_id, uniqueness: { scope: :custom_filter_id }
+  validate :validate_status_access, if: [:custom_filter_account, :status]
+
+  delegate :account, to: :custom_filter, prefix: true, allow_nil: true
 
   private
 
   def validate_status_access
-    errors.add(:status_id, :invalid) unless StatusPolicy.new(custom_filter.account, status).show?
+    errors.add(:status_id, :invalid) unless StatusPolicy.new(custom_filter_account, status).show?
   end
 end
diff --git a/app/models/domain_allow.rb b/app/models/domain_allow.rb
index 47ada7ac232..8eab3164e5b 100644
--- a/app/models/domain_allow.rb
+++ b/app/models/domain_allow.rb
@@ -27,7 +27,7 @@ class DomainAllow < ApplicationRecord
     end
 
     def allowed_domains
-      select(:domain)
+      pluck(:domain)
     end
 
     def rule_for(domain)
diff --git a/app/models/fasp/provider.rb b/app/models/fasp/provider.rb
index 37d0b581ca1..9c9b187ccad 100644
--- a/app/models/fasp/provider.rb
+++ b/app/models/fasp/provider.rb
@@ -9,6 +9,7 @@
 #  capabilities            :jsonb            not null
 #  confirmed               :boolean          default(FALSE), not null
 #  contact_email           :string
+#  delivery_last_failed_at :datetime
 #  fediverse_account       :string
 #  name                    :string           not null
 #  privacy_policy          :jsonb
@@ -22,6 +23,8 @@
 class Fasp::Provider < ApplicationRecord
   include DebugConcern
 
+  RETRY_INTERVAL = 1.hour
+
   has_many :fasp_backfill_requests, inverse_of: :fasp_provider, class_name: 'Fasp::BackfillRequest', dependent: :delete_all
   has_many :fasp_debug_callbacks, inverse_of: :fasp_provider, class_name: 'Fasp::DebugCallback', dependent: :delete_all
   has_many :fasp_subscriptions, inverse_of: :fasp_provider, class_name: 'Fasp::Subscription', dependent: :delete_all
@@ -118,6 +121,20 @@ class Fasp::Provider < ApplicationRecord
     save!
   end
 
+  def delivery_failure_tracker
+    @delivery_failure_tracker ||= DeliveryFailureTracker.new(base_url, resolution: :minutes)
+  end
+
+  def available?
+    delivery_failure_tracker.available? || retry_worthwile?
+  end
+
+  def update_availability!
+    self.delivery_last_failed_at = (Time.current unless delivery_failure_tracker.available?)
+
+    save!
+  end
+
   private
 
   def create_keypair
@@ -144,4 +161,8 @@ class Fasp::Provider < ApplicationRecord
       Fasp::Request.new(self).delete(path)
     end
   end
+
+  def retry_worthwile?
+    delivery_last_failed_at && delivery_last_failed_at < RETRY_INTERVAL.ago
+  end
 end
diff --git a/app/models/follow_recommendation_mute.rb b/app/models/follow_recommendation_mute.rb
index d166d0a6206..ef931988e71 100644
--- a/app/models/follow_recommendation_mute.rb
+++ b/app/models/follow_recommendation_mute.rb
@@ -14,7 +14,7 @@ class FollowRecommendationMute < ApplicationRecord
   belongs_to :account
   belongs_to :target_account, class_name: 'Account'
 
-  validates :target_account, uniqueness: { scope: :account_id }
+  validates :target_account_id, uniqueness: { scope: :account_id }
 
   after_commit :invalidate_follow_recommendations_cache
 
diff --git a/app/models/follow_request.rb b/app/models/follow_request.rb
index 964d4e279a1..0b518036b10 100644
--- a/app/models/follow_request.rb
+++ b/app/models/follow_request.rb
@@ -37,7 +37,7 @@ class FollowRequest < ApplicationRecord
     if account.local?
       ListAccount.where(follow_request: self).update_all(follow_request_id: nil, follow_id: follow.id)
       MergeWorker.perform_async(target_account.id, account.id, 'home')
-      MergeWorker.push_bulk(List.where(account: account).joins(:list_accounts).where(list_accounts: { account_id: target_account.id }).pluck(:id)) do |list_id|
+      MergeWorker.push_bulk(account.owned_lists.with_list_account(target_account).pluck(:id)) do |list_id|
         [target_account.id, list_id, 'list']
       end
     end
diff --git a/app/models/form/account_batch.rb b/app/models/form/account_batch.rb
index 4665a586798..f3109ad62a7 100644
--- a/app/models/form/account_batch.rb
+++ b/app/models/form/account_batch.rb
@@ -1,13 +1,11 @@
 # frozen_string_literal: true
 
-class Form::AccountBatch
-  include ActiveModel::Model
-  include Authorization
-  include AccountableConcern
+class Form::AccountBatch < Form::BaseBatch
   include Payloadable
 
-  attr_accessor :account_ids, :action, :current_account,
-                :select_all_matching, :query
+  attr_accessor :account_ids,
+                :query,
+                :select_all_matching
 
   def save
     case action
@@ -128,7 +126,7 @@ class Form::AccountBatch
 
     # Suspending a single account closes their associated reports, so
     # mass-suspending would be consistent.
-    Report.where(target_account: account).unresolved.find_each do |report|
+    account.targeted_reports.unresolved.find_each do |report|
       authorize(report, :update?)
       log_action(:resolve, report)
       report.resolve!(current_account)
diff --git a/app/models/form/admin_settings.rb b/app/models/form/admin_settings.rb
index 5f23e683b99..a0decbea860 100644
--- a/app/models/form/admin_settings.rb
+++ b/app/models/form/admin_settings.rb
@@ -14,7 +14,6 @@ class Form::AdminSettings
     site_terms
     registrations_mode
     closed_registrations_message
-    timeline_preview
     bootstrap_timeline_accounts
     theme
     activity_api_enabled
@@ -41,6 +40,10 @@ class Form::AdminSettings
     app_icon
     favicon
     min_age
+    local_live_feed_access
+    remote_live_feed_access
+    local_topic_feed_access
+    remote_topic_feed_access
   ).freeze
 
   INTEGER_KEYS = %i(
@@ -82,15 +85,22 @@ class Form::AdminSettings
   }.freeze
 
   DESCRIPTION_LIMIT = 200
+  DOMAIN_BLOCK_AUDIENCES = %w(disabled users all).freeze
+  REGISTRATION_MODES = %w(open approved none).freeze
+  FEED_ACCESS_MODES = %w(public authenticated).freeze
 
   attr_accessor(*KEYS)
 
-  validates :registrations_mode, inclusion: { in: %w(open approved none) }, if: -> { defined?(@registrations_mode) }
+  validates :registrations_mode, inclusion: { in: REGISTRATION_MODES }, if: -> { defined?(@registrations_mode) }
   validates :site_contact_email, :site_contact_username, presence: true, if: -> { defined?(@site_contact_username) || defined?(@site_contact_email) }
   validates :site_contact_username, existing_username: true, if: -> { defined?(@site_contact_username) }
   validates :bootstrap_timeline_accounts, existing_username: { multiple: true }, if: -> { defined?(@bootstrap_timeline_accounts) }
-  validates :show_domain_blocks, inclusion: { in: %w(disabled users all) }, if: -> { defined?(@show_domain_blocks) }
-  validates :show_domain_blocks_rationale, inclusion: { in: %w(disabled users all) }, if: -> { defined?(@show_domain_blocks_rationale) }
+  validates :show_domain_blocks, inclusion: { in: DOMAIN_BLOCK_AUDIENCES }, if: -> { defined?(@show_domain_blocks) }
+  validates :show_domain_blocks_rationale, inclusion: { in: DOMAIN_BLOCK_AUDIENCES }, if: -> { defined?(@show_domain_blocks_rationale) }
+  validates :local_live_feed_access, inclusion: { in: FEED_ACCESS_MODES }, if: -> { defined?(@local_live_feed_access) }
+  validates :remote_live_feed_access, inclusion: { in: FEED_ACCESS_MODES }, if: -> { defined?(@remote_live_feed_access) }
+  validates :local_topic_feed_access, inclusion: { in: FEED_ACCESS_MODES }, if: -> { defined?(@local_topic_feed_access) }
+  validates :remote_topic_feed_access, inclusion: { in: FEED_ACCESS_MODES }, if: -> { defined?(@remote_topic_feed_access) }
   validates :media_cache_retention_period, :content_cache_retention_period, :backups_retention_period, numericality: { only_integer: true }, allow_blank: true, if: -> { defined?(@media_cache_retention_period) || defined?(@content_cache_retention_period) || defined?(@backups_retention_period) }
   validates :min_age, numericality: { only_integer: true }, allow_blank: true, if: -> { defined?(@min_age) }
   validates :site_short_description, length: { maximum: DESCRIPTION_LIMIT }, if: -> { defined?(@site_short_description) }
diff --git a/app/models/form/base_batch.rb b/app/models/form/base_batch.rb
new file mode 100644
index 00000000000..d3af923784a
--- /dev/null
+++ b/app/models/form/base_batch.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+class Form::BaseBatch
+  include ActiveModel::Model
+  include Authorization
+  include AccountableConcern
+
+  attr_accessor :action,
+                :current_account
+
+  def save
+    raise 'Override in subclass'
+  end
+end
diff --git a/app/models/form/custom_emoji_batch.rb b/app/models/form/custom_emoji_batch.rb
index c63996e0695..b8cfb363999 100644
--- a/app/models/form/custom_emoji_batch.rb
+++ b/app/models/form/custom_emoji_batch.rb
@@ -1,12 +1,10 @@
 # frozen_string_literal: true
 
-class Form::CustomEmojiBatch
-  include ActiveModel::Model
-  include Authorization
-  include AccountableConcern
-
-  attr_accessor :custom_emoji_ids, :action, :current_account,
-                :category_id, :category_name, :visible_in_picker
+class Form::CustomEmojiBatch < Form::BaseBatch
+  attr_accessor :category_id,
+                :category_name,
+                :visible_in_picker,
+                :custom_emoji_ids
 
   def save
     case action
diff --git a/app/models/form/domain_block_batch.rb b/app/models/form/domain_block_batch.rb
index 39012df5173..af792fd41f6 100644
--- a/app/models/form/domain_block_batch.rb
+++ b/app/models/form/domain_block_batch.rb
@@ -1,11 +1,7 @@
 # frozen_string_literal: true
 
-class Form::DomainBlockBatch
-  include ActiveModel::Model
-  include Authorization
-  include AccountableConcern
-
-  attr_accessor :domain_blocks_attributes, :action, :current_account
+class Form::DomainBlockBatch < Form::BaseBatch
+  attr_accessor :domain_blocks_attributes
 
   def save
     case action
diff --git a/app/models/form/email_domain_block_batch.rb b/app/models/form/email_domain_block_batch.rb
index df120182bc2..6292f2b1e12 100644
--- a/app/models/form/email_domain_block_batch.rb
+++ b/app/models/form/email_domain_block_batch.rb
@@ -1,11 +1,7 @@
 # frozen_string_literal: true
 
-class Form::EmailDomainBlockBatch
-  include ActiveModel::Model
-  include Authorization
-  include AccountableConcern
-
-  attr_accessor :email_domain_block_ids, :action, :current_account
+class Form::EmailDomainBlockBatch < Form::BaseBatch
+  attr_accessor :email_domain_block_ids
 
   def save
     case action
diff --git a/app/models/form/ip_block_batch.rb b/app/models/form/ip_block_batch.rb
index bdfeb91c8a8..b6a189750e9 100644
--- a/app/models/form/ip_block_batch.rb
+++ b/app/models/form/ip_block_batch.rb
@@ -1,11 +1,7 @@
 # frozen_string_literal: true
 
-class Form::IpBlockBatch
-  include ActiveModel::Model
-  include Authorization
-  include AccountableConcern
-
-  attr_accessor :ip_block_ids, :action, :current_account
+class Form::IpBlockBatch < Form::BaseBatch
+  attr_accessor :ip_block_ids
 
   def save
     case action
diff --git a/app/models/form/redirect.rb b/app/models/form/redirect.rb
index c5b3c1f8f39..6ab95f21f1f 100644
--- a/app/models/form/redirect.rb
+++ b/app/models/form/redirect.rb
@@ -40,7 +40,7 @@ class Form::Redirect
     if target_account.nil?
       errors.add(:acct, I18n.t('migrations.errors.not_found'))
     else
-      errors.add(:acct, I18n.t('migrations.errors.already_moved')) if account.moved_to_account_id.present? && account.moved_to_account_id == target_account.id
+      errors.add(:acct, I18n.t('migrations.errors.already_moved')) if account.moved? && account.moved_to_account_id == target_account.id
       errors.add(:acct, I18n.t('migrations.errors.move_to_self')) if account.id == target_account.id
     end
   end
diff --git a/app/models/form/username_block_batch.rb b/app/models/form/username_block_batch.rb
new file mode 100644
index 00000000000..f490391159a
--- /dev/null
+++ b/app/models/form/username_block_batch.rb
@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+class Form::UsernameBlockBatch < Form::BaseBatch
+  attr_accessor :username_block_ids
+
+  def save
+    case action
+    when 'delete'
+      delete!
+    end
+  end
+
+  private
+
+  def username_blocks
+    @username_blocks ||= UsernameBlock.where(id: username_block_ids)
+  end
+
+  def delete!
+    verify_authorization(:destroy?)
+
+    username_blocks.each do |username_block|
+      username_block.destroy
+      log_action :destroy, username_block
+    end
+  end
+
+  def verify_authorization(permission)
+    username_blocks.each { |username_block| authorize(username_block, permission) }
+  end
+end
diff --git a/app/models/generated_annual_report.rb b/app/models/generated_annual_report.rb
index 43c97d7108b..aba0712fe40 100644
--- a/app/models/generated_annual_report.rb
+++ b/app/models/generated_annual_report.rb
@@ -24,7 +24,7 @@ class GeneratedAnnualReport < ApplicationRecord
   end
 
   def view!
-    update!(viewed_at: Time.now.utc)
+    touch(:viewed_at)
   end
 
   def account_ids
diff --git a/app/models/list.rb b/app/models/list.rb
index 76c116ce244..8fd1953ab31 100644
--- a/app/models/list.rb
+++ b/app/models/list.rb
@@ -32,6 +32,8 @@ class List < ApplicationRecord
 
   before_destroy :clean_feed_manager
 
+  scope :with_list_account, ->(account) { joins(:list_accounts).where(list_accounts: { account: }) }
+
   private
 
   def validate_account_lists_limit
diff --git a/app/models/media_attachment.rb b/app/models/media_attachment.rb
index 2e60f732b81..13ca0d7e3ab 100644
--- a/app/models/media_attachment.rb
+++ b/app/models/media_attachment.rb
@@ -298,6 +298,10 @@ class MediaAttachment < ApplicationRecord
       IMAGE_FILE_EXTENSIONS + VIDEO_FILE_EXTENSIONS + AUDIO_FILE_EXTENSIONS
     end
 
+    def combined_media_file_size
+      arel_table.coalesce(arel_table[:file_file_size], 0) + arel_table.coalesce(arel_table[:thumbnail_file_size], 0)
+    end
+
     private
 
     def file_styles(attachment)
diff --git a/app/models/notification.rb b/app/models/notification.rb
index e7ada3399aa..8ee32798ad5 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -30,6 +30,7 @@ class Notification < ApplicationRecord
     'FollowRequest' => :follow_request,
     'Favourite' => :favourite,
     'Poll' => :poll,
+    'Quote' => :quote,
   }.freeze
 
   # Please update app/javascript/api_types/notification.ts if you change this
@@ -73,6 +74,12 @@ class Notification < ApplicationRecord
     'admin.report': {
       filterable: false,
     }.freeze,
+    quote: {
+      filterable: true,
+    }.freeze,
+    quoted_update: {
+      filterable: false,
+    }.freeze,
   }.freeze
 
   TYPES = PROPERTIES.keys.freeze
@@ -81,9 +88,11 @@ class Notification < ApplicationRecord
     status: :status,
     reblog: [status: :reblog],
     mention: [mention: :status],
+    quote: [quote: :status],
     favourite: [favourite: :status],
     poll: [poll: :status],
     update: :status,
+    quoted_update: :status,
     'admin.report': [report: :target_account],
   }.freeze
 
@@ -102,6 +111,7 @@ class Notification < ApplicationRecord
     belongs_to :account_relationship_severance_event, inverse_of: false
     belongs_to :account_warning, inverse_of: false
     belongs_to :generated_annual_report, inverse_of: false
+    belongs_to :quote, inverse_of: :notification
   end
 
   validates :type, inclusion: { in: TYPES }
@@ -114,7 +124,7 @@ class Notification < ApplicationRecord
 
   def target_status
     case type
-    when :status, :update
+    when :status, :update, :quoted_update
       status
     when :reblog
       status&.reblog
@@ -122,6 +132,8 @@ class Notification < ApplicationRecord
       favourite&.status
     when :mention
       mention&.status
+    when :quote
+      quote&.status
     when :poll
       poll&.status
     end
@@ -164,7 +176,7 @@ class Notification < ApplicationRecord
         cached_status = cached_statuses_by_id[notification.target_status.id]
 
         case notification.type
-        when :status, :update
+        when :status, :update, :quoted_update
           notification.status = cached_status
         when :reblog
           notification.status.reblog = cached_status
@@ -174,6 +186,8 @@ class Notification < ApplicationRecord
           notification.mention.status = cached_status
         when :poll
           notification.poll.status = cached_status
+        when :quote
+          notification.quote.status = cached_status
         end
       end
 
@@ -192,7 +206,9 @@ class Notification < ApplicationRecord
     return unless new_record?
 
     case activity_type
-    when 'Status', 'Follow', 'Favourite', 'FollowRequest', 'Poll', 'Report'
+    when 'Status'
+      self.from_account_id = type == :quoted_update ? activity&.quote&.quoted_account_id : activity&.account_id
+    when 'Follow', 'Favourite', 'FollowRequest', 'Poll', 'Report', 'Quote'
       self.from_account_id = activity&.account_id
     when 'Mention'
       self.from_account_id = activity&.status&.account_id
diff --git a/app/models/notification_request.rb b/app/models/notification_request.rb
index eb9ff93ab72..d95fb58b476 100644
--- a/app/models/notification_request.rb
+++ b/app/models/notification_request.rb
@@ -49,6 +49,6 @@ class NotificationRequest < ApplicationRecord
   private
 
   def prepare_notifications_count
-    self.notifications_count = Notification.where(account: account, from_account: from_account, type: :mention, filtered: true).limit(MAX_MEANINGFUL_COUNT).count
+    self.notifications_count = Notification.where(account: account, from_account: from_account, type: [:mention, :quote], filtered: true).limit(MAX_MEANINGFUL_COUNT).count
   end
 end
diff --git a/app/models/preview_card.rb b/app/models/preview_card.rb
index 56fe4836355..8e0e13cdb94 100644
--- a/app/models/preview_card.rb
+++ b/app/models/preview_card.rb
@@ -170,10 +170,9 @@ class PreviewCard < ApplicationRecord
   private
 
   def serialized_authors
-    if author_name? || author_url? || author_account_id?
-      PreviewCard::Author
-        .new(self)
-    end
+    return unless author_name? || author_url? || author_account_id?
+
+    PreviewCard::Author.new(self)
   end
 
   def extract_dimensions
diff --git a/app/models/quote.rb b/app/models/quote.rb
index c981591e17f..0d24cb239a8 100644
--- a/app/models/quote.rb
+++ b/app/models/quote.rb
@@ -17,11 +17,15 @@
 #  status_id         :bigint(8)        not null
 #
 class Quote < ApplicationRecord
+  include Paginable
+
+  has_one :notification, as: :activity, dependent: :destroy
+
   BACKGROUND_REFRESH_INTERVAL = 1.week.freeze
   REFRESH_DEADLINE = 6.hours
 
   enum :state,
-       { pending: 0, accepted: 1, rejected: 2, revoked: 3 },
+       { pending: 0, accepted: 1, rejected: 2, revoked: 3, deleted: 4 },
        validate: true
 
   belongs_to :status
@@ -31,10 +35,15 @@ class Quote < ApplicationRecord
   belongs_to :quoted_account, class_name: 'Account', optional: true
 
   before_validation :set_accounts
-
+  before_validation :set_activity_uri, only: :create, if: -> { account.local? && quoted_account&.remote? }
   validates :activity_uri, presence: true, if: -> { account.local? && quoted_account&.remote? }
+  validates :approval_uri, absence: true, if: -> { quoted_account&.local? }
   validate :validate_visibility
 
+  after_create_commit :increment_counter_caches!
+  after_destroy_commit :decrement_counter_caches!
+  after_update_commit :update_counter_caches!
+
   def accept!
     update!(state: :accepted)
   end
@@ -51,6 +60,12 @@ class Quote < ApplicationRecord
     accepted? || !legacy?
   end
 
+  def ensure_quoted_access
+    status.mentions.create!(account: quoted_account, silent: true)
+  rescue ActiveRecord::RecordInvalid, ActiveRecord::RecordNotUnique
+    nil
+  end
+
   def schedule_refresh_if_stale!
     return unless quoted_status_id.present? && approval_uri.present? && updated_at <= BACKGROUND_REFRESH_INTERVAL.ago
 
@@ -69,4 +84,31 @@ class Quote < ApplicationRecord
 
     errors.add(:quoted_status_id, :visibility_mismatch)
   end
+
+  def set_activity_uri
+    self.activity_uri = [ActivityPub::TagManager.instance.uri_for(account), '/quote_requests/', SecureRandom.uuid].join
+  end
+
+  def increment_counter_caches!
+    return unless accepted?
+
+    quoted_status&.increment_count!(:quotes_count)
+  end
+
+  def decrement_counter_caches!
+    return unless accepted?
+
+    quoted_status&.decrement_count!(:quotes_count)
+  end
+
+  def update_counter_caches!
+    return if legacy? || !state_previously_changed?
+
+    if accepted?
+      quoted_status&.increment_count!(:quotes_count)
+    else
+      # TODO: are there cases where this would not be correct?
+      quoted_status&.decrement_count!(:quotes_count)
+    end
+  end
 end
diff --git a/app/models/relay.rb b/app/models/relay.rb
index 813a861c682..8a9524e9b37 100644
--- a/app/models/relay.rb
+++ b/app/models/relay.rb
@@ -34,7 +34,7 @@ class Relay < ApplicationRecord
     payload     = Oj.dump(follow_activity(activity_id))
 
     update!(state: :pending, follow_activity_id: activity_id)
-    DeliveryFailureTracker.reset!(inbox_url)
+    reset_delivery_tracker
     ActivityPub::DeliveryWorker.perform_async(payload, some_local_account.id, inbox_url)
   end
 
@@ -43,12 +43,16 @@ class Relay < ApplicationRecord
     payload     = Oj.dump(unfollow_activity(activity_id))
 
     update!(state: :idle, follow_activity_id: nil)
-    DeliveryFailureTracker.reset!(inbox_url)
+    reset_delivery_tracker
     ActivityPub::DeliveryWorker.perform_async(payload, some_local_account.id, inbox_url)
   end
 
   private
 
+  def reset_delivery_tracker
+    DeliveryFailureTracker.reset!(inbox_url)
+  end
+
   def follow_activity(activity_id)
     {
       '@context': ActivityPub::TagManager::CONTEXT,
diff --git a/app/models/rule_translation.rb b/app/models/rule_translation.rb
index ccf0d4ba33d..fbcf55627ca 100644
--- a/app/models/rule_translation.rb
+++ b/app/models/rule_translation.rb
@@ -22,6 +22,6 @@ class RuleTranslation < ApplicationRecord
   scope :by_language_length, -> { order(Arel.sql('LENGTH(LANGUAGE)').desc) }
 
   def self.languages
-    RuleTranslation.joins(:rule).merge(Rule.kept).select(:language).distinct.pluck(:language).sort
+    joins(:rule).merge(Rule.kept).distinct.pluck(:language).sort
   end
 end
diff --git a/app/models/status.rb b/app/models/status.rb
index 4aac3b62d7f..0bff4f2825d 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -43,16 +43,10 @@ class Status < ApplicationRecord
   include Status::SnapshotConcern
   include Status::ThreadingConcern
   include Status::Visibility
+  include Status::InteractionPolicyConcern
 
   MEDIA_ATTACHMENTS_LIMIT = 4
 
-  QUOTE_APPROVAL_POLICY_FLAGS = {
-    unknown: (1 << 0),
-    public: (1 << 1),
-    followers: (1 << 2),
-    followed: (1 << 3),
-  }.freeze
-
   rate_limit by: :account, family: :statuses
 
   self.discard_column = :deleted_at
@@ -76,6 +70,8 @@ class Status < ApplicationRecord
     belongs_to :reblog, foreign_key: 'reblog_of_id', inverse_of: :reblogs
   end
 
+  has_one :owned_conversation, class_name: 'Conversation', foreign_key: 'parent_status_id', inverse_of: :parent_status, dependent: nil
+
   has_many :favourites, inverse_of: :status, dependent: :destroy
   has_many :bookmarks, inverse_of: :status, dependent: :destroy
   has_many :reblogs, foreign_key: 'reblog_of_id', class_name: 'Status', inverse_of: :reblog, dependent: :destroy
@@ -84,6 +80,7 @@ class Status < ApplicationRecord
   has_many :mentions, dependent: :destroy, inverse_of: :status
   has_many :mentioned_accounts, through: :mentions, source: :account, class_name: 'Account'
   has_many :media_attachments, dependent: :nullify
+  has_many :quotes, foreign_key: 'quoted_status_id', inverse_of: :quoted_status, dependent: :nullify
 
   # The `dependent` option is enabled by the initial `mentions` association declaration
   has_many :active_mentions, -> { active }, class_name: 'Mention', inverse_of: :status # rubocop:disable Rails/HasManyOrHasOneDependent
@@ -105,7 +102,7 @@ class Status < ApplicationRecord
   has_one :quote, inverse_of: :status, dependent: :destroy
 
   validates :uri, uniqueness: true, presence: true, unless: :local?
-  validates :text, presence: true, unless: -> { with_media? || reblog? }
+  validates :text, presence: true, unless: -> { with_media? || reblog? || with_quote? }
   validates_with StatusLengthValidator
   validates_with DisallowedHashtagsValidator
   validates :reblog, uniqueness: { scope: :account }, if: :reblog?
@@ -121,7 +118,10 @@ class Status < ApplicationRecord
   scope :without_replies, -> { not_reply.or(reply_to_account) }
   scope :not_reply, -> { where(reply: false) }
   scope :only_reblogs, -> { where.not(reblog_of_id: nil) }
+  scope :only_polls, -> { where.not(poll_id: nil) }
+  scope :without_polls, -> { where(poll_id: nil) }
   scope :reply_to_account, -> { where(arel_table[:in_reply_to_account_id].eq arel_table[:account_id]) }
+  scope :not_replying_to_account, ->(account) { where.not(in_reply_to_account: account) }
   scope :without_reblogs, -> { where(statuses: { reblog_of_id: nil }) }
   scope :tagged_with, ->(tag_ids) { joins(:statuses_tags).where(statuses_tags: { tag_id: tag_ids }) }
   scope :not_excluded_by_account, ->(account) { where.not(account_id: account.excluded_from_timeline_account_ids) }
@@ -255,6 +255,10 @@ class Status < ApplicationRecord
     ordered_media_attachments.any?
   end
 
+  def with_quote?
+    quote.present?
+  end
+
   def with_preview_card?
     preview_cards_status.present?
   end
@@ -303,6 +307,10 @@ class Status < ApplicationRecord
     status_stat&.favourites_count || 0
   end
 
+  def quotes_count
+    status_stat&.quotes_count || 0
+  end
+
   # Reblogs count received from an external instance
   def untrusted_reblogs_count
     status_stat&.untrusted_reblogs_count unless local?
@@ -440,7 +448,8 @@ class Status < ApplicationRecord
       self.in_reply_to_account_id = carried_over_reply_to_account_id
       self.conversation_id        = thread.conversation_id if conversation_id.nil?
     elsif conversation_id.nil?
-      self.conversation = Conversation.new
+      conversation = build_owned_conversation
+      self.conversation = conversation
     end
   end
 
diff --git a/app/models/status_edit.rb b/app/models/status_edit.rb
index 25e22288730..060866e50c3 100644
--- a/app/models/status_edit.rb
+++ b/app/models/status_edit.rb
@@ -43,12 +43,47 @@ class StatusEdit < ApplicationRecord
   scope :ordered, -> { order(id: :asc) }
 
   delegate :local?, :application, :edited?, :edited_at,
-           :discarded?, :visibility, :language, to: :status
+           :discarded?, :reply?, :visibility, :language, to: :status
+
+  def quote
+    underlying_quote = status.quote
+    return if underlying_quote.nil? || underlying_quote.id != quote_id
+
+    underlying_quote
+  end
+
+  def with_preview_card?
+    false
+  end
+
+  def with_media?
+    ordered_media_attachments.any?
+  end
+
+  def with_poll?
+    poll_options.present?
+  end
+
+  def poll
+    return @poll if defined?(@poll)
+    return @poll = nil if poll_options.blank?
+
+    @poll = Poll.new({
+      options: poll_options,
+      account_id: account_id,
+      status_id: status_id,
+    })
+  end
+
+  alias preloadable_poll poll
 
   def emojis
     return @emojis if defined?(@emojis)
 
-    @emojis = CustomEmoji.from_text([spoiler_text, text].join(' '), status.account.domain)
+    fields  = [spoiler_text, text]
+    fields += preloadable_poll.options unless preloadable_poll.nil?
+
+    @emojis = CustomEmoji.from_text(fields.join(' '), status.account.domain)
   end
 
   def ordered_media_attachments
diff --git a/app/models/status_stat.rb b/app/models/status_stat.rb
index 14a02071a7b..24129cf311b 100644
--- a/app/models/status_stat.rb
+++ b/app/models/status_stat.rb
@@ -5,14 +5,15 @@
 # Table name: status_stats
 #
 #  id                         :bigint(8)        not null, primary key
-#  status_id                  :bigint(8)        not null
-#  replies_count              :bigint(8)        default(0), not null
-#  reblogs_count              :bigint(8)        default(0), not null
 #  favourites_count           :bigint(8)        default(0), not null
-#  created_at                 :datetime         not null
-#  updated_at                 :datetime         not null
+#  quotes_count               :bigint(8)        default(0), not null
+#  reblogs_count              :bigint(8)        default(0), not null
+#  replies_count              :bigint(8)        default(0), not null
 #  untrusted_favourites_count :bigint(8)
 #  untrusted_reblogs_count    :bigint(8)
+#  created_at                 :datetime         not null
+#  updated_at                 :datetime         not null
+#  status_id                  :bigint(8)        not null
 #
 
 class StatusStat < ApplicationRecord
@@ -34,6 +35,10 @@ class StatusStat < ApplicationRecord
     [attributes['favourites_count'], 0].max
   end
 
+  def quotes_count
+    [attributes['quotes_count'], 0].max
+  end
+
   private
 
   def clamp_untrusted_counts
diff --git a/app/models/tag.rb b/app/models/tag.rb
index a3ccdd8ac6b..dff10111123 100644
--- a/app/models/tag.rb
+++ b/app/models/tag.rb
@@ -49,8 +49,8 @@ class Tag < ApplicationRecord
 
   validates :name, presence: true, format: { with: HASHTAG_NAME_RE }
   validates :display_name, format: { with: HASHTAG_NAME_RE }
-  validate :validate_name_change, if: -> { !new_record? && name_changed? }
-  validate :validate_display_name_change, if: -> { !new_record? && display_name_changed? }
+  validate :validate_name_change, on: :update, if: :name_changed?
+  validate :validate_display_name_change, on: :update, if: :display_name_changed?
 
   scope :pending_review, -> { unreviewed.where.not(requested_review_at: nil) }
   scope :usable, -> { where(usable: [true, nil]) }
@@ -164,9 +164,10 @@ class Tag < ApplicationRecord
   end
 
   def validate_display_name_change
-    unless HashtagNormalizer.new.normalize(display_name).casecmp(name).zero?
-      errors.add(:display_name,
-                 I18n.t('tags.does_not_match_previous_name'))
-    end
+    errors.add(:display_name, I18n.t('tags.does_not_match_previous_name')) unless display_name_matches_name?
+  end
+
+  def display_name_matches_name?
+    HashtagNormalizer.new.normalize(display_name).casecmp(name).zero?
   end
 end
diff --git a/app/models/trends/statuses.rb b/app/models/trends/statuses.rb
index c85b0170fd7..e64369b08be 100644
--- a/app/models/trends/statuses.rb
+++ b/app/models/trends/statuses.rb
@@ -90,14 +90,28 @@ class Trends::Statuses < Trends::Base
 
   def eligible?(status)
     status.created_at.past? &&
-      status.public_visibility? &&
-      status.account.discoverable? &&
-      !status.account.silenced? &&
-      !status.account.sensitized? &&
-      status.spoiler_text.blank? &&
-      !status.sensitive? &&
+      opted_into_trends?(status) &&
+      !sensitive_content?(status) &&
       !status.reply? &&
-      valid_locale?(status.language)
+      valid_locale?(status.language) &&
+      (status.quote.nil? || trendable_quote?(status.quote))
+  end
+
+  def opted_into_trends?(status)
+    status.public_visibility? &&
+      status.account.discoverable? &&
+      !status.account.silenced?
+  end
+
+  def sensitive_content?(status)
+    status.account.sensitized? || status.spoiler_text.present? || status.sensitive?
+  end
+
+  def trendable_quote?(quote)
+    quote.acceptable? &&
+      quote.quoted_status.present? &&
+      opted_into_trends?(quote.quoted_status) &&
+      !sensitive_content?(quote.quoted_status)
   end
 
   def calculate_scores(statuses, at_time)
diff --git a/app/models/user.rb b/app/models/user.rb
index 966ffbe9c37..ccd96bdc92a 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -58,20 +58,13 @@ class User < ApplicationRecord
 
   include LanguagesHelper
   include Redisable
+  include User::Activity
+  include User::Confirmation
   include User::HasSettings
   include User::LdapAuthenticable
   include User::Omniauthable
   include User::PamAuthenticable
 
-  # The home and list feeds will be stored in Redis for this amount
-  # of time, and status fan-out to followers will include only people
-  # within this time frame. Lowering the duration may improve performance
-  # if lots of people sign up, but not a lot of them check their feed
-  # every day. Raising the duration reduces the amount of expensive
-  # RegenerationWorker jobs that need to be run when those people come
-  # to check their feed
-  ACTIVE_DURATION = ENV.fetch('USER_ACTIVE_DAYS', 7).to_i.days.freeze
-
   devise :two_factor_authenticatable,
          otp_secret_length: 32
 
@@ -90,6 +83,7 @@ class User < ApplicationRecord
   has_many :applications, class_name: 'Doorkeeper::Application', as: :owner, dependent: nil
   has_many :backups, inverse_of: :user, dependent: nil
   has_many :invites, inverse_of: :user, dependent: nil
+  has_many :login_activities, inverse_of: :user, dependent: :destroy
   has_many :markers, inverse_of: :user, dependent: :destroy
   has_many :webauthn_credentials, dependent: :destroy
   has_many :ips, class_name: 'UserIp', inverse_of: :user, dependent: nil
@@ -117,13 +111,9 @@ class User < ApplicationRecord
   scope :recent, -> { order(id: :desc) }
   scope :pending, -> { where(approved: false) }
   scope :approved, -> { where(approved: true) }
-  scope :confirmed, -> { where.not(confirmed_at: nil) }
-  scope :unconfirmed, -> { where(confirmed_at: nil) }
   scope :enabled, -> { where(disabled: false) }
   scope :disabled, -> { where(disabled: true) }
   scope :active, -> { confirmed.signed_in_recently.account_not_suspended }
-  scope :signed_in_recently, -> { where(current_sign_in_at: ACTIVE_DURATION.ago..) }
-  scope :not_signed_in_recently, -> { where(current_sign_in_at: ...ACTIVE_DURATION.ago) }
   scope :matches_email, ->(value) { where(arel_table[:email].matches("#{value}%")) }
   scope :matches_ip, ->(value) { left_joins(:ips).merge(IpBlock.contained_by(value)).group(users: [:id]) }
 
@@ -142,7 +132,10 @@ class User < ApplicationRecord
   delegate :can?, to: :role
 
   attr_reader :invite_code, :date_of_birth
-  attr_writer :external, :bypass_registration_checks, :current_account
+  attr_writer :current_account
+
+  attribute :external, :boolean, default: false
+  attribute :bypass_registration_checks, :boolean, default: false
 
   def self.those_who_can(*any_of_privileges)
     matching_role_ids = UserRole.that_can(*any_of_privileges).map(&:id)
@@ -177,14 +170,6 @@ class User < ApplicationRecord
     end
   end
 
-  def signed_in_recently?
-    current_sign_in_at.present? && current_sign_in_at >= ACTIVE_DURATION.ago
-  end
-
-  def confirmed?
-    confirmed_at.present?
-  end
-
   def invited?
     invite_id.present?
   end
@@ -195,6 +180,10 @@ class User < ApplicationRecord
 
   def disable!
     update!(disabled: true)
+
+    # This terminates all connections for the given account with the streaming
+    # server:
+    redis.publish("timeline:system:#{account.id}", Oj.dump(event: :kill))
   end
 
   def enable!
@@ -209,12 +198,6 @@ class User < ApplicationRecord
     account_id
   end
 
-  def confirm
-    wrap_email_confirmation do
-      super
-    end
-  end
-
   # Mark current email as confirmed, bypassing Devise
   def mark_email_as_confirmed!
     wrap_email_confirmation do
@@ -230,16 +213,11 @@ class User < ApplicationRecord
   end
 
   def update_sign_in!(new_sign_in: false)
-    old_current = current_sign_in_at
     new_current = Time.now.utc
-
-    self.last_sign_in_at     = old_current || new_current
+    self.last_sign_in_at     = current_sign_in_at || new_current
     self.current_sign_in_at  = new_current
 
-    if new_sign_in
-      self.sign_in_count ||= 0
-      self.sign_in_count  += 1
-    end
+    increment(:sign_in_count) if new_sign_in
 
     save(validate: false) unless new_record?
     prepare_returning_user!
@@ -261,10 +239,6 @@ class User < ApplicationRecord
     confirmed? && approved? && !disabled? && !account.unavailable? && !account.memorial?
   end
 
-  def unconfirmed?
-    !confirmed?
-  end
-
   def unconfirmed_or_pending?
     unconfirmed? || pending?
   end
@@ -387,17 +361,22 @@ class User < ApplicationRecord
   end
 
   def reset_password!
+    # First, change password to something random, this revokes sessions and on-going access:
+    change_password!(SecureRandom.hex)
+
+    # Finally, send a reset password prompt to the user
+    send_reset_password_instructions
+  end
+
+  def change_password!(new_password)
     # First, change password to something random and deactivate all sessions
     transaction do
-      update(password: SecureRandom.hex)
+      update(password: new_password)
       session_activations.destroy_all
     end
 
     # Then, remove all authorized applications and connected push subscriptions
     revoke_access!
-
-    # Finally, send a reset password prompt to the user
-    send_reset_password_instructions
   end
 
   protected
@@ -442,7 +421,7 @@ class User < ApplicationRecord
 
   def set_approved
     self.approved = begin
-      if sign_up_from_ip_requires_approval? || sign_up_email_requires_approval?
+      if requires_approval?
         false
       else
         open_registrations? || valid_invitation? || external?
@@ -456,7 +435,11 @@ class User < ApplicationRecord
 
   def grant_approval_on_confirmation?
     # Re-check approval on confirmation if the server has switched to open registrations
-    open_registrations? && !sign_up_from_ip_requires_approval? && !sign_up_email_requires_approval?
+    open_registrations? && !requires_approval?
+  end
+
+  def requires_approval?
+    sign_up_from_ip_requires_approval? || sign_up_email_requires_approval? || sign_up_username_requires_approval?
   end
 
   def wrap_email_confirmation
@@ -465,16 +448,17 @@ class User < ApplicationRecord
 
     yield
 
-    if new_user
-      # Avoid extremely unlikely race condition when approving and confirming
-      # the user at the same time
-      reload unless approved?
+    after_confirmation_tasks if new_user
+  end
 
-      if approved?
-        prepare_new_user!
-      else
-        notify_staff_about_pending_account!
-      end
+  def after_confirmation_tasks
+    # Handle condition when approving and confirming a user at the same time
+    reload unless approved?
+
+    if approved?
+      prepare_new_user!
+    else
+      notify_staff_about_pending_account!
     end
   end
 
@@ -497,18 +481,14 @@ class User < ApplicationRecord
     EmailDomainBlock.requires_approval?(records + [domain], attempt_ip: sign_up_ip)
   end
 
+  def sign_up_username_requires_approval?
+    account.username? && UsernameBlock.matches?(account.username, allow_with_approval: true)
+  end
+
   def open_registrations?
     Setting.registrations_mode == 'open'
   end
 
-  def external?
-    !!@external
-  end
-
-  def bypass_registration_checks?
-    @bypass_registration_checks
-  end
-
   def sanitize_role
     self.role = nil if role.present? && role.everyone?
   end
@@ -525,7 +505,7 @@ class User < ApplicationRecord
     return unless confirmed?
 
     ActivityTracker.record('activity:logins', id)
-    regenerate_feed! if needs_feed_update?
+    regenerate_feed! if inactive_since_duration?
   end
 
   def notify_staff_about_pending_account!
@@ -538,14 +518,10 @@ class User < ApplicationRecord
 
   def regenerate_feed!
     home_feed = HomeFeed.new(account)
-    unless home_feed.regenerating?
-      home_feed.regeneration_in_progress!
-      RegenerationWorker.perform_async(account_id)
-    end
-  end
+    return if home_feed.regenerating?
 
-  def needs_feed_update?
-    last_sign_in_at < ACTIVE_DURATION.ago
+    home_feed.regeneration_in_progress!
+    RegenerationWorker.perform_async(account_id)
   end
 
   def validate_email_dns?
diff --git a/app/models/user_settings.rb b/app/models/user_settings.rb
index 590eed713ca..5558ffe04a4 100644
--- a/app/models/user_settings.rb
+++ b/app/models/user_settings.rb
@@ -35,6 +35,7 @@ class UserSettings
     setting :expand_content_warnings, default: false
     setting :display_media, default: 'default', in: %w(default show_all hide_all)
     setting :auto_play, default: false
+    setting :emoji_style, default: 'auto', in: %w(auto native twemoji)
   end
 
   namespace :notification_emails do
@@ -42,6 +43,7 @@ class UserSettings
     setting :reblog, default: false
     setting :favourite, default: false
     setting :mention, default: true
+    setting :quote, default: true
     setting :follow_request, default: true
     setting :report, default: true
     setting :pending_account, default: true
diff --git a/app/models/username_block.rb b/app/models/username_block.rb
new file mode 100644
index 00000000000..33169a47f82
--- /dev/null
+++ b/app/models/username_block.rb
@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+# == Schema Information
+#
+# Table name: username_blocks
+#
+#  id                  :bigint(8)        not null, primary key
+#  allow_with_approval :boolean          default(FALSE), not null
+#  exact               :boolean          default(FALSE), not null
+#  normalized_username :string           not null
+#  username            :string           not null
+#  created_at          :datetime         not null
+#  updated_at          :datetime         not null
+#
+
+class UsernameBlock < ApplicationRecord
+  HOMOGLYPHS = {
+    '1' => 'i',
+    '2' => 'z',
+    '3' => 'e',
+    '4' => 'a',
+    '5' => 's',
+    '7' => 't',
+    '8' => 'b',
+    '9' => 'g',
+    '0' => 'o',
+  }.freeze
+
+  validates :username, presence: true, uniqueness: true
+
+  scope :matches_exactly, ->(str) { where(exact: true).where(normalized_username: str) }
+  scope :matches_partially, ->(str) { where(exact: false).where(Arel::Nodes.build_quoted(normalize_value_for(:normalized_username, str)).matches(Arel::Nodes.build_quoted('%').concat(arel_table[:normalized_username]).concat(Arel::Nodes.build_quoted('%')))) }
+
+  before_save :set_normalized_username
+
+  normalizes :normalized_username, with: ->(value) { value.downcase.gsub(Regexp.union(HOMOGLYPHS.keys), HOMOGLYPHS) }
+
+  def comparison
+    exact? ? 'equals' : 'contains'
+  end
+
+  def comparison=(val)
+    self.exact = val == 'equals'
+  end
+
+  def self.matches?(str, allow_with_approval: false)
+    matches_exactly(str).or(matches_partially(str)).where(allow_with_approval: allow_with_approval).any?
+  end
+
+  def to_log_human_identifier
+    username
+  end
+
+  private
+
+  def set_normalized_username
+    self.normalized_username = username
+  end
+end
diff --git a/app/models/worker_batch.rb b/app/models/worker_batch.rb
new file mode 100644
index 00000000000..ab9d8d457b2
--- /dev/null
+++ b/app/models/worker_batch.rb
@@ -0,0 +1,98 @@
+# frozen_string_literal: true
+
+class WorkerBatch
+  include Redisable
+
+  TTL = 3600
+
+  def initialize(id = nil)
+    @id = id || SecureRandom.hex(12)
+  end
+
+  attr_reader :id
+
+  # Connect the batch with an async refresh. When the number of processed jobs
+  # passes the given threshold, the async refresh will be marked as finished.
+  # @param [String] async_refresh_key
+  # @param [Float] threshold
+  def connect(async_refresh_key, threshold: 1.0)
+    redis.hset(key, { 'async_refresh_key' => async_refresh_key, 'threshold' => threshold })
+  end
+
+  def within
+    raise NoBlockGivenError unless block_given?
+
+    begin
+      Thread.current[:batch] = self
+      yield(self)
+    ensure
+      Thread.current[:batch] = nil
+    end
+  end
+
+  # Add jobs to the batch. Usually when the batch is created.
+  # @param [Array<String>] jids
+  def add_jobs(jids)
+    return if jids.empty?
+
+    redis.multi do |pipeline|
+      pipeline.sadd(key('jobs'), jids)
+      pipeline.expire(key('jobs'), TTL)
+      pipeline.hincrby(key, 'pending', jids.size)
+      pipeline.expire(key, TTL)
+    end
+  end
+
+  # Remove a job from the batch, such as when it's been processed or it has failed.
+  # @param [String] jid
+  def remove_job(jid, increment: false)
+    _, pending, processed, async_refresh_key, threshold = redis.multi do |pipeline|
+      pipeline.srem(key('jobs'), jid)
+      pipeline.hincrby(key, 'pending', -1)
+      pipeline.hincrby(key, 'processed', 1)
+      pipeline.hget(key, 'async_refresh_key')
+      pipeline.hget(key, 'threshold')
+    end
+
+    async_refresh = AsyncRefresh.new(async_refresh_key) if async_refresh_key.present?
+    async_refresh&.increment_result_count(by: 1) if increment
+
+    if pending.zero? || processed >= (threshold || 1.0).to_f * (processed + pending)
+      async_refresh&.finish!
+      cleanup
+    end
+  end
+
+  def finish!
+    async_refresh_key = redis.hget(key, 'async_refresh_key')
+
+    if async_refresh_key.present?
+      async_refresh = AsyncRefresh.new(async_refresh_key)
+      async_refresh.finish!
+    end
+
+    cleanup
+  end
+
+  # Get pending jobs.
+  # @returns [Array<String>]
+  def jobs
+    redis.smembers(key('jobs'))
+  end
+
+  # Inspect the batch.
+  # @returns [Hash]
+  def info
+    redis.hgetall(key)
+  end
+
+  private
+
+  def key(suffix = nil)
+    "worker_batch:#{@id}#{":#{suffix}" if suffix}"
+  end
+
+  def cleanup
+    redis.del(key, key('jobs'))
+  end
+end
diff --git a/app/policies/quote_policy.rb b/app/policies/quote_policy.rb
new file mode 100644
index 00000000000..a8be64a7792
--- /dev/null
+++ b/app/policies/quote_policy.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class QuotePolicy < ApplicationPolicy
+  def revoke?
+    record.quoted_account_id.present? && record.quoted_account_id == current_account&.id
+  end
+end
diff --git a/app/policies/status_policy.rb b/app/policies/status_policy.rb
index 540e266427f..03ceae718e5 100644
--- a/app/policies/status_policy.rb
+++ b/app/policies/status_policy.rb
@@ -19,6 +19,11 @@ class StatusPolicy < ApplicationPolicy
     end
   end
 
+  # This is about requesting a quote post, not validating it
+  def quote?
+    show? && record.quote_policy_for_account(current_account, preloaded_relations: @preloaded_relations) != :denied
+  end
+
   def reblog?
     !requires_mention? && (!private? || owned?) && show? && !blocking_author?
   end
diff --git a/app/policies/username_block_policy.rb b/app/policies/username_block_policy.rb
new file mode 100644
index 00000000000..9f6b8cfc018
--- /dev/null
+++ b/app/policies/username_block_policy.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+class UsernameBlockPolicy < ApplicationPolicy
+  def index?
+    role.can?(:manage_blocks)
+  end
+
+  def create?
+    role.can?(:manage_blocks)
+  end
+
+  def update?
+    role.can?(:manage_blocks)
+  end
+
+  def destroy?
+    role.can?(:manage_blocks)
+  end
+end
diff --git a/app/presenters/activitypub/context_presenter.rb b/app/presenters/activitypub/context_presenter.rb
new file mode 100644
index 00000000000..ba02d172716
--- /dev/null
+++ b/app/presenters/activitypub/context_presenter.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+class ActivityPub::ContextPresenter < ActiveModelSerializers::Model
+  attributes :id, :type, :attributed_to, :first, :object_type
+
+  class << self
+    def from_conversation(conversation)
+      new.tap do |presenter|
+        presenter.id = ActivityPub::TagManager.instance.uri_for(conversation)
+        presenter.attributed_to = ActivityPub::TagManager.instance.uri_for(conversation.parent_account) if conversation.parent_account.present?
+      end
+    end
+  end
+end
diff --git a/app/serializers/activitypub/accept_quote_request_serializer.rb b/app/serializers/activitypub/accept_quote_request_serializer.rb
new file mode 100644
index 00000000000..26ecd099b64
--- /dev/null
+++ b/app/serializers/activitypub/accept_quote_request_serializer.rb
@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+class ActivityPub::AcceptQuoteRequestSerializer < ActivityPub::Serializer
+  attributes :id, :type, :actor, :result
+
+  has_one :object, serializer: ActivityPub::QuoteRequestSerializer
+
+  def id
+    [ActivityPub::TagManager.instance.uri_for(object.quoted_account), '#accepts/quote_requests/', object.id].join
+  end
+
+  def type
+    'Accept'
+  end
+
+  def actor
+    ActivityPub::TagManager.instance.uri_for(object.quoted_account)
+  end
+
+  def result
+    ActivityPub::TagManager.instance.approval_uri_for(object)
+  end
+end
diff --git a/app/serializers/activitypub/context_serializer.rb b/app/serializers/activitypub/context_serializer.rb
new file mode 100644
index 00000000000..33c70d8e9de
--- /dev/null
+++ b/app/serializers/activitypub/context_serializer.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class ActivityPub::ContextSerializer < ActivityPub::Serializer
+  include RoutingHelper
+
+  attributes :id, :type, :attributed_to, :first
+
+  def type
+    'Collection'
+  end
+end
diff --git a/app/serializers/activitypub/delete_quote_authorization_serializer.rb b/app/serializers/activitypub/delete_quote_authorization_serializer.rb
new file mode 100644
index 00000000000..4d09bb4649b
--- /dev/null
+++ b/app/serializers/activitypub/delete_quote_authorization_serializer.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+class ActivityPub::DeleteQuoteAuthorizationSerializer < ActivityPub::Serializer
+  attributes :id, :type, :actor, :to
+
+  has_one :virtual_object, key: :object, serializer: ActivityPub::QuoteAuthorizationSerializer
+
+  def id
+    [ActivityPub::TagManager.instance.approval_uri_for(object, check_approval: false), '#delete'].join
+  end
+
+  def virtual_object
+    object
+  end
+
+  def type
+    'Delete'
+  end
+
+  def actor
+    ActivityPub::TagManager.instance.uri_for(object.quoted_account)
+  end
+
+  def to
+    [ActivityPub::TagManager::COLLECTIONS[:public]]
+  end
+end
diff --git a/app/serializers/activitypub/note_serializer.rb b/app/serializers/activitypub/note_serializer.rb
index 7b29e6d69be..f162f4ee243 100644
--- a/app/serializers/activitypub/note_serializer.rb
+++ b/app/serializers/activitypub/note_serializer.rb
@@ -2,14 +2,15 @@
 
 class ActivityPub::NoteSerializer < ActivityPub::Serializer
   include FormattingHelper
+  include JsonLdHelper
 
-  context_extensions :atom_uri, :conversation, :sensitive, :voters_count
+  context_extensions :atom_uri, :conversation, :sensitive, :voters_count, :quotes, :interaction_policies
 
   attributes :id, :type, :summary,
              :in_reply_to, :published, :url,
              :attributed_to, :to, :cc, :sensitive,
              :atom_uri, :in_reply_to_atom_uri,
-             :conversation
+             :conversation, :context
 
   attribute :content
   attribute :content_map, if: :language?
@@ -30,6 +31,13 @@ class ActivityPub::NoteSerializer < ActivityPub::Serializer
 
   attribute :voters_count, if: :poll_and_voters_count?
 
+  attribute :quote, if: :quote?
+  attribute :quote, key: :_misskey_quote, if: :serializable_quote?
+  attribute :quote, key: :quote_uri, if: :serializable_quote?
+  attribute :quote_authorization, if: :quote_authorization?
+
+  attribute :interaction_policy
+
   def id
     ActivityPub::TagManager.instance.uri_for(object)
   end
@@ -152,10 +160,18 @@ class ActivityPub::NoteSerializer < ActivityPub::Serializer
     if object.conversation.uri?
       object.conversation.uri
     else
-      OStatus::TagManager.instance.unique_tag(object.conversation.created_at, object.conversation.id, 'Conversation')
+      # This means `parent_status_id` and `parent_account_id` must *not* get backfilled
+      ActivityPub::TagManager.instance.uri_for(object.conversation) || OStatus::TagManager.instance.unique_tag(object.conversation.created_at, object.conversation.id, 'Conversation')
     end
   end
 
+  def context
+    return if object.conversation.nil?
+
+    uri = ActivityPub::TagManager.instance.uri_for(object.conversation)
+    uri unless unsupported_uri_scheme?(uri)
+  end
+
   def local?
     object.account.local?
   end
@@ -194,6 +210,44 @@ class ActivityPub::NoteSerializer < ActivityPub::Serializer
     object.preloadable_poll&.voters_count
   end
 
+  def quote?
+    object.quote&.present?
+  end
+
+  def serializable_quote?
+    object.quote&.quoted_status&.present?
+  end
+
+  def quote_authorization?
+    object.quote.present? && ActivityPub::TagManager.instance.approval_uri_for(object.quote).present?
+  end
+
+  def quote
+    # TODO: handle inlining self-quotes
+    object.quote.quoted_status.present? ? ActivityPub::TagManager.instance.uri_for(object.quote.quoted_status) : { type: 'Tombstone' }
+  end
+
+  def quote_authorization
+    ActivityPub::TagManager.instance.approval_uri_for(object.quote)
+  end
+
+  def interaction_policy
+    approved_uris = []
+
+    # On outgoing posts, only automatic approval is supported
+    policy = object.quote_approval_policy >> 16
+    approved_uris << ActivityPub::TagManager::COLLECTIONS[:public] if policy.anybits?(Status::QUOTE_APPROVAL_POLICY_FLAGS[:public])
+    approved_uris << ActivityPub::TagManager.instance.followers_uri_for(object.account) if policy.anybits?(Status::QUOTE_APPROVAL_POLICY_FLAGS[:followers])
+    approved_uris << ActivityPub::TagManager.instance.following_uri_for(object.account) if policy.anybits?(Status::QUOTE_APPROVAL_POLICY_FLAGS[:following])
+    approved_uris << ActivityPub::TagManager.instance.uri_for(object.account) if approved_uris.empty?
+
+    {
+      canQuote: {
+        automaticApproval: approved_uris,
+      },
+    }
+  end
+
   class MediaAttachmentSerializer < ActivityPub::Serializer
     context_extensions :blurhash, :focal_point
 
diff --git a/app/serializers/activitypub/quote_authorization_serializer.rb b/app/serializers/activitypub/quote_authorization_serializer.rb
new file mode 100644
index 00000000000..8b9475ddd63
--- /dev/null
+++ b/app/serializers/activitypub/quote_authorization_serializer.rb
@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+class ActivityPub::QuoteAuthorizationSerializer < ActivityPub::Serializer
+  include RoutingHelper
+
+  context_extensions :quote_authorizations
+
+  attributes :id, :type, :attributed_to, :interacting_object, :interaction_target
+
+  def id
+    ActivityPub::TagManager.instance.approval_uri_for(object, check_approval: !instance_options[:force_approval_id])
+  end
+
+  def type
+    'QuoteAuthorization'
+  end
+
+  def attributed_to
+    ActivityPub::TagManager.instance.uri_for(object.quoted_account)
+  end
+
+  def interaction_target
+    ActivityPub::TagManager.instance.uri_for(object.quoted_status)
+  end
+
+  def interacting_object
+    ActivityPub::TagManager.instance.uri_for(object.status)
+  end
+end
diff --git a/app/serializers/activitypub/quote_request_serializer.rb b/app/serializers/activitypub/quote_request_serializer.rb
index d68b3c2d871..e6e4bb9b036 100644
--- a/app/serializers/activitypub/quote_request_serializer.rb
+++ b/app/serializers/activitypub/quote_request_serializer.rb
@@ -1,13 +1,24 @@
 # frozen_string_literal: true
 
 class ActivityPub::QuoteRequestSerializer < ActivityPub::Serializer
+  def self.serializer_for(model, options)
+    case model.class.name
+    when 'Status'
+      ActivityPub::NoteSerializer
+    else
+      super
+    end
+  end
+
   context_extensions :quote_requests
 
-  attributes :id, :type, :actor, :instrument
+  attributes :id, :type, :actor
   attribute :virtual_object, key: :object
 
+  has_one :instrument
+
   def id
-    object.activity_uri || [ActivityPub::TagManager.instance.uri_for(object.target_account), '#quote_requests/', object.id].join
+    object.activity_uri
   end
 
   def type
@@ -23,6 +34,6 @@ class ActivityPub::QuoteRequestSerializer < ActivityPub::Serializer
   end
 
   def instrument
-    ActivityPub::TagManager.instance.uri_for(object.status)
+    instance_options[:allow_post_inlining] && object.status.local? ? object.status : ActivityPub::TagManager.instance.uri_for(object.status)
   end
 end
diff --git a/app/serializers/initial_state_serializer.rb b/app/serializers/initial_state_serializer.rb
index 1c83eff4b23..93c06b7676a 100644
--- a/app/serializers/initial_state_serializer.rb
+++ b/app/serializers/initial_state_serializer.rb
@@ -5,14 +5,14 @@ class InitialStateSerializer < ActiveModel::Serializer
 
   attributes :meta, :compose, :accounts,
              :media_attachments, :settings,
-             :languages
+             :languages, :features
 
   attribute :critical_updates_pending, if: -> { object&.role&.can?(:view_devops) && SoftwareUpdate.check_enabled? }
 
   has_one :push_subscription, serializer: REST::WebPushSubscriptionSerializer
   has_one :role, serializer: REST::RoleSerializer
 
-  def meta # rubocop:disable Metrics/AbcSize
+  def meta
     store = default_meta_store
 
     if object.current_account
@@ -30,6 +30,7 @@ class InitialStateSerializer < ActiveModel::Serializer
       store[:use_blurhash]      = object_account_user.setting_use_blurhash
       store[:use_pending_items] = object_account_user.setting_use_pending_items
       store[:show_trends]       = Setting.trends && object_account_user.setting_trends
+      store[:emoji_style]       = object_account_user.settings['web.emoji_style'] if Mastodon::Feature.modern_emojis_enabled?
     else
       store[:auto_play_gif] = Setting.auto_play_gif
       store[:display_media] = Setting.display_media
@@ -53,6 +54,7 @@ class InitialStateSerializer < ActiveModel::Serializer
       store[:default_privacy]   = object.visibility || object_account_user.setting_default_privacy
       store[:default_sensitive] = object_account_user.setting_default_sensitive
       store[:default_language]  = object_account_user.preferred_posting_language
+      store[:default_quote_policy] = object_account_user.setting_default_quote_policy
     end
 
     store[:text] = object.text if object.text
@@ -85,6 +87,10 @@ class InitialStateSerializer < ActiveModel::Serializer
     LanguagesHelper::SUPPORTED_LOCALES.map { |(key, value)| [key, value[0], value[1]] }
   end
 
+  def features
+    Mastodon::Feature.enabled_features
+  end
+
   private
 
   def default_meta_store
@@ -105,12 +111,15 @@ class InitialStateSerializer < ActiveModel::Serializer
       sso_redirect: sso_redirect,
       status_page_url: Setting.status_page_url,
       streaming_api_base_url: Rails.configuration.x.streaming_api_base_url,
-      timeline_preview: Setting.timeline_preview,
       title: instance_presenter.title,
       trends_as_landing_page: Setting.trends_as_landing_page,
       trends_enabled: Setting.trends,
       version: instance_presenter.version,
       terms_of_service_enabled: TermsOfService.current.present?,
+      local_live_feed_access: Setting.local_live_feed_access,
+      remote_live_feed_access: Setting.remote_live_feed_access,
+      local_topic_feed_access: Setting.local_topic_feed_access,
+      remote_topic_feed_access: Setting.remote_topic_feed_access,
     }
   end
 
diff --git a/app/serializers/rest/account_serializer.rb b/app/serializers/rest/account_serializer.rb
index 354d384464d..b102f79fdb9 100644
--- a/app/serializers/rest/account_serializer.rb
+++ b/app/serializers/rest/account_serializer.rb
@@ -65,7 +65,7 @@ class REST::AccountSerializer < ActiveModel::Serializer
   end
 
   def url
-    ActivityPub::TagManager.instance.url_for(object)
+    ActivityPub::TagManager.instance.url_for(object) || ActivityPub::TagManager.instance.uri_for(object)
   end
 
   def uri
diff --git a/app/serializers/rest/base_quote_serializer.rb b/app/serializers/rest/base_quote_serializer.rb
index 20a53d1a20e..be9d5cbe6f2 100644
--- a/app/serializers/rest/base_quote_serializer.rb
+++ b/app/serializers/rest/base_quote_serializer.rb
@@ -8,13 +8,13 @@ class REST::BaseQuoteSerializer < ActiveModel::Serializer
 
     # Extra states when a status is unavailable
     return 'deleted' if object.quoted_status.nil?
-    return 'unauthorized' if status_filter.filtered?
+    return 'unauthorized' if status_filter.filtered_for_quote?
 
     object.state
   end
 
   def quoted_status
-    object.quoted_status if object.accepted? && object.quoted_status.present? && !status_filter.filtered?
+    object.quoted_status if object.accepted? && object.quoted_status.present? && !status_filter.filtered_for_quote?
   end
 
   private
diff --git a/app/serializers/rest/credential_account_serializer.rb b/app/serializers/rest/credential_account_serializer.rb
index ff6ef7ac49f..0bbb7792cdd 100644
--- a/app/serializers/rest/credential_account_serializer.rb
+++ b/app/serializers/rest/credential_account_serializer.rb
@@ -19,6 +19,7 @@ class REST::CredentialAccountSerializer < REST::AccountSerializer
       discoverable: object.discoverable,
       indexable: object.indexable,
       attribution_domains: object.attribution_domains,
+      quote_policy: user.setting_default_quote_policy,
     }
   end
 
diff --git a/app/serializers/rest/instance_serializer.rb b/app/serializers/rest/instance_serializer.rb
index 3008df5e81c..36ddfae3286 100644
--- a/app/serializers/rest/instance_serializer.rb
+++ b/app/serializers/rest/instance_serializer.rb
@@ -100,6 +100,21 @@ class REST::InstanceSerializer < ActiveModel::Serializer
         enabled: TranslationService.configured?,
       },
 
+      timelines_access: {
+        live_feeds: {
+          local: Setting.local_live_feed_access,
+          remote: Setting.remote_live_feed_access,
+        },
+        hashtag_feeds: {
+          local: Setting.local_topic_feed_access,
+          remote: Setting.remote_topic_feed_access,
+        },
+        trending_link_feeds: {
+          local: Setting.local_topic_feed_access,
+          remote: Setting.remote_topic_feed_access,
+        },
+      },
+
       limited_federation: limited_federation?,
     }
   end
diff --git a/app/serializers/rest/notification_group_serializer.rb b/app/serializers/rest/notification_group_serializer.rb
index f4af842e38d..40f7f04ede0 100644
--- a/app/serializers/rest/notification_group_serializer.rb
+++ b/app/serializers/rest/notification_group_serializer.rb
@@ -24,7 +24,7 @@ class REST::NotificationGroupSerializer < ActiveModel::Serializer
   end
 
   def status_type?
-    [:favourite, :reblog, :status, :mention, :poll, :update].include?(object.type)
+    [:favourite, :reblog, :status, :mention, :poll, :update, :quote, :quoted_update].include?(object.type)
   end
 
   def report_type?
diff --git a/app/serializers/rest/notification_serializer.rb b/app/serializers/rest/notification_serializer.rb
index 320bc86961d..c4b77709fb3 100644
--- a/app/serializers/rest/notification_serializer.rb
+++ b/app/serializers/rest/notification_serializer.rb
@@ -21,7 +21,7 @@ class REST::NotificationSerializer < ActiveModel::Serializer
   end
 
   def status_type?
-    [:favourite, :reblog, :status, :mention, :poll, :update].include?(object.type)
+    [:favourite, :reblog, :status, :mention, :poll, :update, :quoted_update, :quote].include?(object.type)
   end
 
   def report_type?
diff --git a/app/serializers/rest/preferences_serializer.rb b/app/serializers/rest/preferences_serializer.rb
index e1c6544608c..5c92023ec65 100644
--- a/app/serializers/rest/preferences_serializer.rb
+++ b/app/serializers/rest/preferences_serializer.rb
@@ -4,6 +4,7 @@ class REST::PreferencesSerializer < ActiveModel::Serializer
   attribute :posting_default_privacy, key: 'posting:default:visibility'
   attribute :posting_default_sensitive, key: 'posting:default:sensitive'
   attribute :posting_default_language, key: 'posting:default:language'
+  attribute :posting_default_quote_policy, key: 'posting:default:quote_policy'
 
   attribute :reading_default_sensitive_media, key: 'reading:expand:media'
   attribute :reading_default_sensitive_text, key: 'reading:expand:spoilers'
@@ -13,6 +14,10 @@ class REST::PreferencesSerializer < ActiveModel::Serializer
     object.user.setting_default_privacy
   end
 
+  def posting_default_quote_policy
+    object.user.setting_default_quote_policy
+  end
+
   def posting_default_sensitive
     object.user.setting_default_sensitive
   end
diff --git a/app/serializers/rest/shallow_status_serializer.rb b/app/serializers/rest/shallow_status_serializer.rb
index ca0ac8f4f45..0b951f6caa6 100644
--- a/app/serializers/rest/shallow_status_serializer.rb
+++ b/app/serializers/rest/shallow_status_serializer.rb
@@ -6,4 +6,5 @@ class REST::ShallowStatusSerializer < REST::StatusSerializer
   # It looks like redefining one `has_one` requires redefining all inherited ones
   has_one :preview_card, key: :card, serializer: REST::PreviewCardSerializer
   has_one :preloadable_poll, key: :poll, serializer: REST::PollSerializer
+  has_one :quote_approval
 end
diff --git a/app/serializers/rest/status_serializer.rb b/app/serializers/rest/status_serializer.rb
index 29e77e7d5b1..a06ddc68617 100644
--- a/app/serializers/rest/status_serializer.rb
+++ b/app/serializers/rest/status_serializer.rb
@@ -8,7 +8,7 @@ class REST::StatusSerializer < ActiveModel::Serializer
   attributes :id, :created_at, :in_reply_to_id, :in_reply_to_account_id,
              :sensitive, :spoiler_text, :visibility, :language,
              :uri, :url, :replies_count, :reblogs_count,
-             :favourites_count, :edited_at
+             :favourites_count, :quotes_count, :edited_at
 
   attribute :favourited, if: :current_user?
   attribute :reblogged, if: :current_user?
@@ -29,9 +29,12 @@ class REST::StatusSerializer < ActiveModel::Serializer
   has_many :tags
   has_many :emojis, serializer: REST::CustomEmojiSerializer
 
+  # Due to a ActiveModel::Serializer quirk, if you change any of the following, have a look at
+  # updating `app/serializers/rest/shallow_status_serializer.rb` as well
   has_one :quote, key: :quote, serializer: REST::QuoteSerializer
   has_one :preview_card, key: :card, serializer: REST::PreviewCardSerializer
   has_one :preloadable_poll, key: :poll, serializer: REST::PollSerializer
+  has_one :quote_approval
 
   def quote
     object.quote if object.quote&.acceptable?
@@ -96,6 +99,10 @@ class REST::StatusSerializer < ActiveModel::Serializer
     object.untrusted_favourites_count || relationships&.attributes_map&.dig(object.id, :favourites_count) || object.favourites_count
   end
 
+  def quotes_count
+    relationships&.attributes_map&.dig(object.id, :quotes_count) || object.quotes_count
+  end
+
   def favourited
     if relationships
       relationships.favourites_map[object.id] || false
@@ -148,7 +155,7 @@ class REST::StatusSerializer < ActiveModel::Serializer
     current_user? &&
       current_user.account_id == object.account_id &&
       !object.reblog? &&
-      %w(public unlisted private).include?(object.visibility)
+      StatusRelationshipsPresenter::PINNABLE_VISIBILITIES.include?(object.visibility)
   end
 
   def source_requested?
@@ -159,6 +166,14 @@ class REST::StatusSerializer < ActiveModel::Serializer
     object.active_mentions.to_a.sort_by(&:id)
   end
 
+  def quote_approval
+    {
+      automatic: object.quote_policy_as_keys(:automatic),
+      manual: object.quote_policy_as_keys(:manual),
+      current_user: object.quote_policy_for_account(current_user&.account),
+    }
+  end
+
   private
 
   def relationships
diff --git a/app/serializers/seo/social_media_posting_serializer.rb b/app/serializers/seo/social_media_posting_serializer.rb
new file mode 100644
index 00000000000..72030e4173d
--- /dev/null
+++ b/app/serializers/seo/social_media_posting_serializer.rb
@@ -0,0 +1,127 @@
+# frozen_string_literal: true
+
+class SEO::SocialMediaPostingSerializer < ActiveModel::Serializer
+  include FormattingHelper
+  include RoutingHelper
+
+  attributes :context, :type, :url, :date_published, :date_modified,
+             :author, :text, :interaction_statistic
+
+  attribute :image, if: -> { object.ordered_media_attachments.any?(&:image?) }
+  attribute :video, if: -> { object.ordered_media_attachments.any? { |attachment| attachment.video? || attachment.gifv? } }
+  attribute :audio, if: -> { object.ordered_media_attachments.any?(&:audio?) }
+  attribute :shared_content, if: -> { object.with_preview_card? }
+
+  def context
+    'https://schema.org'
+  end
+
+  def type
+    'SocialMediaPosting'
+  end
+
+  def url
+    ActivityPub::TagManager.instance.url_for(object)
+  end
+
+  def date_published
+    object.created_at.iso8601
+  end
+
+  def date_modified
+    object.edited_at&.iso8601
+  end
+
+  def author
+    {
+      type: 'Person',
+      name: object.account.display_name.presence || object.account.username,
+      alternate_name: object.account.local_username_and_domain,
+      identifier: object.account.local_username_and_domain,
+      url: ActivityPub::TagManager.instance.url_for(object.account),
+      interaction_statistic: [
+        {
+          type: 'InteractionCounter',
+          interaction_type: 'https://schema.org/FollowAction',
+          user_interaction_count: object.account.followers_count,
+        },
+      ],
+    }
+  end
+
+  def text
+    status_content_format(object)
+  end
+
+  def interaction_statistic
+    [
+      {
+        type: 'InteractionCounter',
+        interaction_type: 'https://schema.org/LikeAction',
+        user_interaction_count: object.favourites_count,
+      },
+
+      {
+        type: 'InteractionCounter',
+        interaction_type: 'https://schema.org/ShareAction',
+        user_interaction_count: object.reblogs_count,
+      },
+
+      {
+        type: 'InteractionCounter',
+        interaction_type: 'https://schema.org/ReplyAction',
+        user_interaction_count: object.replies_count,
+      },
+    ]
+  end
+
+  def image
+    object.ordered_media_attachments.filter_map do |attachment|
+      next unless attachment.image?
+
+      {
+        type: 'ImageObject',
+        content_url: full_asset_url(attachment.file.url(:original, false)),
+        thumbnail_url: attachment.thumbnail.present? ? full_asset_url(attachment.thumbnail.url(:original)) : full_asset_url(attachment.file.url(:small)),
+        description: attachment.description,
+      }
+    end
+  end
+
+  def video
+    object.ordered_media_attachments.filter_map do |attachment|
+      next unless attachment.video? || attachment.gifv?
+
+      {
+        type: 'VideoObject',
+        upload_date: attachment.created_at.iso8601,
+        content_url: full_asset_url(attachment.file.url(:original, false)),
+        thumbnail_url: attachment.thumbnail.present? ? full_asset_url(attachment.thumbnail.url(:original)) : full_asset_url(attachment.file.url(:small)),
+        embed_url: medium_player_url(attachment),
+        description: attachment.description,
+      }
+    end
+  end
+
+  def audio
+    object.ordered_media_attachments.filter_map do |attachment|
+      next unless attachment.audio?
+
+      {
+        type: 'AudioObject',
+        upload_date: attachment.created_at.iso8601,
+        content_url: full_asset_url(attachment.file.url(:original, false)),
+        thumbnail_url: attachment.thumbnail.present? ? full_asset_url(attachment.thumbnail.url(:original)) : full_asset_url(attachment.file.url(:small)),
+        embed_url: medium_player_url(attachment),
+        description: attachment.description,
+      }
+    end
+  end
+
+  def shared_content
+    {
+      type: 'WebPage',
+      url: object.preview_card.url,
+    }
+  end
+end
diff --git a/app/services/activitypub/fetch_all_replies_service.rb b/app/services/activitypub/fetch_all_replies_service.rb
index 765e5c8ae82..b771b845265 100644
--- a/app/services/activitypub/fetch_all_replies_service.rb
+++ b/app/services/activitypub/fetch_all_replies_service.rb
@@ -6,7 +6,7 @@ class ActivityPub::FetchAllRepliesService < ActivityPub::FetchRepliesService
   # Limit of replies to fetch per status
   MAX_REPLIES = (ENV['FETCH_REPLIES_MAX_SINGLE'] || 500).to_i
 
-  def call(status_uri, collection_or_uri, max_pages: 1, request_id: nil)
+  def call(status_uri, collection_or_uri, max_pages: 1, batch_id: nil, request_id: nil)
     @status_uri = status_uri
 
     super
diff --git a/app/services/activitypub/fetch_remote_status_service.rb b/app/services/activitypub/fetch_remote_status_service.rb
index 7173746f2de..0473bb5939f 100644
--- a/app/services/activitypub/fetch_remote_status_service.rb
+++ b/app/services/activitypub/fetch_remote_status_service.rb
@@ -8,9 +8,10 @@ class ActivityPub::FetchRemoteStatusService < BaseService
   DISCOVERIES_PER_REQUEST = 1000
 
   # Should be called when uri has already been checked for locality
-  def call(uri, prefetched_body: nil, on_behalf_of: nil, expected_actor_uri: nil, request_id: nil)
+  def call(uri, prefetched_body: nil, on_behalf_of: nil, expected_actor_uri: nil, request_id: nil, depth: nil)
     return if domain_not_allowed?(uri)
 
+    @depth = depth || 0
     @request_id = request_id || "#{Time.now.utc.to_i}-status-#{uri}"
     @json = if prefetched_body.nil?
               fetch_status(uri, true, on_behalf_of)
@@ -52,7 +53,7 @@ class ActivityPub::FetchRemoteStatusService < BaseService
       return nil if discoveries > DISCOVERIES_PER_REQUEST
     end
 
-    ActivityPub::Activity.factory(activity_json, actor, request_id: @request_id).perform
+    ActivityPub::Activity.factory(activity_json, actor, request_id: @request_id, depth: @depth).perform
   end
 
   private
diff --git a/app/services/activitypub/fetch_replies_service.rb b/app/services/activitypub/fetch_replies_service.rb
index 6a6d9e391a4..327c88d846d 100644
--- a/app/services/activitypub/fetch_replies_service.rb
+++ b/app/services/activitypub/fetch_replies_service.rb
@@ -6,7 +6,7 @@ class ActivityPub::FetchRepliesService < BaseService
   # Limit of fetched replies
   MAX_REPLIES = 5
 
-  def call(reference_uri, collection_or_uri, max_pages: 1, allow_synchronous_requests: true, request_id: nil)
+  def call(reference_uri, collection_or_uri, max_pages: 1, allow_synchronous_requests: true, batch_id: nil, request_id: nil)
     @reference_uri = reference_uri
     @allow_synchronous_requests = allow_synchronous_requests
 
@@ -14,7 +14,12 @@ class ActivityPub::FetchRepliesService < BaseService
     return if @items.nil?
 
     @items = filter_replies(@items)
-    FetchReplyWorker.push_bulk(@items) { |reply_uri| [reply_uri, { 'request_id' => request_id }] }
+
+    WorkerBatch.new(batch_id).within do |batch|
+      FetchReplyWorker.push_bulk(@items) do |reply_uri|
+        [reply_uri, { 'request_id' => request_id, 'batch_id' => batch.id }]
+      end
+    end
 
     [@items, n_pages]
   end
diff --git a/app/services/activitypub/prepare_followers_synchronization_service.rb b/app/services/activitypub/prepare_followers_synchronization_service.rb
index 56ec0e44bfd..058089e7f87 100644
--- a/app/services/activitypub/prepare_followers_synchronization_service.rb
+++ b/app/services/activitypub/prepare_followers_synchronization_service.rb
@@ -8,6 +8,6 @@ class ActivityPub::PrepareFollowersSynchronizationService < BaseService
 
     return if params['collectionId'] != @account.followers_url || non_matching_uri_hosts?(@account.uri, params['url']) || @account.local_followers_hash == params['digest']
 
-    ActivityPub::FollowersSynchronizationWorker.perform_async(@account.id, params['url'])
+    ActivityPub::FollowersSynchronizationWorker.perform_async(@account.id, params['url'], params['digest'])
   end
 end
diff --git a/app/services/activitypub/process_account_service.rb b/app/services/activitypub/process_account_service.rb
index 201f7513b9b..eb67daf7e8f 100644
--- a/app/services/activitypub/process_account_service.rb
+++ b/app/services/activitypub/process_account_service.rb
@@ -102,6 +102,7 @@ class ActivityPub::ProcessAccountService < BaseService
     @account.outbox_url              = valid_collection_uri(@json['outbox'])
     @account.shared_inbox_url        = valid_collection_uri(@json['endpoints'].is_a?(Hash) ? @json['endpoints']['sharedInbox'] : @json['sharedInbox'])
     @account.followers_url           = valid_collection_uri(@json['followers'])
+    @account.following_url           = valid_collection_uri(@json['following'])
     @account.url                     = url || @uri
     @account.uri                     = @uri
     @account.actor_type              = actor_type
diff --git a/app/services/activitypub/process_status_update_service.rb b/app/services/activitypub/process_status_update_service.rb
index ccf93f3aa67..7e267342580 100644
--- a/app/services/activitypub/process_status_update_service.rb
+++ b/app/services/activitypub/process_status_update_service.rb
@@ -10,7 +10,7 @@ class ActivityPub::ProcessStatusUpdateService < BaseService
 
     @activity_json             = activity_json
     @json                      = object_json
-    @status_parser             = ActivityPub::Parser::StatusParser.new(@json, followers_collection: status.account.followers_url, actor_uri: ActivityPub::TagManager.instance.uri_for(status.account))
+    @status_parser             = ActivityPub::Parser::StatusParser.new(@json, followers_collection: status.account.followers_url, following_collection: status.account.following_url, actor_uri: ActivityPub::TagManager.instance.uri_for(status.account))
     @uri                       = @status_parser.uri
     @status                    = status
     @account                   = status.account
@@ -18,12 +18,16 @@ class ActivityPub::ProcessStatusUpdateService < BaseService
     @poll_changed              = false
     @quote_changed             = false
     @request_id                = request_id
+    @quote                     = nil
 
     # Only native types can be updated at the moment
     return @status if !expected_type? || already_updated_more_recently?
 
     if @status_parser.edited_at.present? && (@status.edited_at.nil? || @status_parser.edited_at > @status.edited_at)
       handle_explicit_update!
+    elsif @status.edited_at.present? && (@status_parser.edited_at.nil? || @status_parser.edited_at < @status.edited_at)
+      # This is an older update, reject it
+      return @status
     else
       handle_implicit_update!
     end
@@ -49,6 +53,7 @@ class ActivityPub::ProcessStatusUpdateService < BaseService
         create_edits!
       end
 
+      fetch_and_verify_quote!(@quote, @status_parser.quote_uri) if @quote.present?
       download_media_files!
       queue_poll_notifications!
 
@@ -66,12 +71,15 @@ class ActivityPub::ProcessStatusUpdateService < BaseService
       update_interaction_policies!
       update_poll!(allow_significant_changes: false)
       queue_poll_notifications!
+      update_quote_approval!
       update_counts!
     end
+
+    broadcast_updates! if @status.quote&.state_previously_changed?
   end
 
   def update_interaction_policies!
-    @status.quote_approval_policy = @status_parser.quote_policy
+    @status.update(quote_approval_policy: @status_parser.quote_policy)
   end
 
   def update_media_attachments!
@@ -109,6 +117,8 @@ class ActivityPub::ProcessStatusUpdateService < BaseService
     @status.ordered_media_attachment_ids = @next_media_attachments.map(&:id)
 
     @media_attachments_changed = true if @status.ordered_media_attachment_ids != previous_media_attachments_ids
+
+    @status.media_attachments.reload if @media_attachments_changed
   end
 
   def download_media_files!
@@ -270,32 +280,51 @@ class ActivityPub::ProcessStatusUpdateService < BaseService
     end
   end
 
+  # This method is only concerned with approval and skips other meaningful changes,
+  # as it is used instead of `update_quote!` in implicit updates
+  def update_quote_approval!
+    quote_uri = @status_parser.quote_uri
+    return unless quote_uri.present? && @status.quote.present?
+
+    quote = @status.quote
+    return if quote.quoted_status.present? && (ActivityPub::TagManager.instance.uri_for(quote.quoted_status) != quote_uri || quote.quoted_status.local?)
+
+    approval_uri = @status_parser.quote_approval_uri
+    approval_uri = nil if unsupported_uri_scheme?(approval_uri) || TagManager.instance.local_url?(approval_uri)
+
+    quote.update(approval_uri: approval_uri, state: :pending, legacy: @status_parser.legacy_quote?) if quote.approval_uri != @status_parser.quote_approval_uri
+
+    fetch_and_verify_quote!(quote, quote_uri)
+  end
+
   def update_quote!
     quote_uri = @status_parser.quote_uri
 
-    if quote_uri.present?
+    if @status_parser.quote?
       approval_uri = @status_parser.quote_approval_uri
-      approval_uri = nil if unsupported_uri_scheme?(approval_uri)
+      approval_uri = nil if unsupported_uri_scheme?(approval_uri) || TagManager.instance.local_url?(approval_uri)
 
       if @status.quote.present?
         # If the quoted post has changed, discard the old object and create a new one
         if @status.quote.quoted_status.present? && ActivityPub::TagManager.instance.uri_for(@status.quote.quoted_status) != quote_uri
+          # Revoke the quote while we get a chance… maybe this should be a `before_destroy` hook?
+          RevokeQuoteService.new.call(@status.quote) if @status.quote.quoted_account&.local? && @status.quote.accepted?
           @status.quote.destroy
-          quote = Quote.create(status: @status, approval_uri: approval_uri, legacy: @status_parser.legacy_quote?)
+          quote = Quote.create(status: @status, approval_uri: approval_uri, legacy: @status_parser.legacy_quote?, state: @status_parser.deleted_quote? ? :deleted : :pending)
           @quote_changed = true
         else
           quote = @status.quote
-          quote.update(approval_uri: approval_uri, state: :pending, legacy: @status_parser.legacy_quote?) if quote.approval_uri != @status_parser.quote_approval_uri
+          quote.update(approval_uri: approval_uri, state: :pending, legacy: @status_parser.legacy_quote?) if quote.approval_uri != approval_uri
         end
       else
         quote = Quote.create(status: @status, approval_uri: approval_uri, legacy: @status_parser.legacy_quote?)
         @quote_changed = true
       end
 
+      @quote = quote
       quote.save
-
-      fetch_and_verify_quote!(quote, quote_uri)
     elsif @status.quote.present?
+      @quote = nil
       @status.quote.destroy!
       @quote_changed = true
     end
diff --git a/app/services/activitypub/synchronize_followers_service.rb b/app/services/activitypub/synchronize_followers_service.rb
index fd6fd1b8993..837796edba8 100644
--- a/app/services/activitypub/synchronize_followers_service.rb
+++ b/app/services/activitypub/synchronize_followers_service.rb
@@ -6,13 +6,15 @@ class ActivityPub::SynchronizeFollowersService < BaseService
 
   MAX_COLLECTION_PAGES = 10
 
-  def call(account, partial_collection_url)
+  def call(account, partial_collection_url, expected_digest = nil)
     @account = account
     @expected_followers_ids = []
+    @digest = [expected_digest].pack('H*') if expected_digest.present?
 
     return unless process_collection!(partial_collection_url)
 
-    remove_unexpected_local_followers!
+    # Only remove followers if the digests match, as it is a destructive operation
+    remove_unexpected_local_followers! if expected_digest.blank? || @digest == "\x00" * 32
   end
 
   private
@@ -21,6 +23,8 @@ class ActivityPub::SynchronizeFollowersService < BaseService
     page_expected_followers = extract_local_followers(items)
     @expected_followers_ids.concat(page_expected_followers.pluck(:id))
 
+    items.each { |uri| Xorcist.xor!(@digest, Digest::SHA256.digest(uri)) } if @digest.present?
+
     handle_unexpected_outgoing_follows!(page_expected_followers)
   end
 
diff --git a/app/services/activitypub/verify_quote_service.rb b/app/services/activitypub/verify_quote_service.rb
index ad4dfbe310c..2badadd425f 100644
--- a/app/services/activitypub/verify_quote_service.rb
+++ b/app/services/activitypub/verify_quote_service.rb
@@ -3,13 +3,17 @@
 class ActivityPub::VerifyQuoteService < BaseService
   include JsonLdHelper
 
+  MAX_SYNCHRONOUS_DEPTH = 2
+
   # Optionally fetch quoted post, and verify the quote is authorized
-  def call(quote, fetchable_quoted_uri: nil, prefetched_quoted_object: nil, prefetched_approval: nil, request_id: nil)
+  def call(quote, fetchable_quoted_uri: nil, prefetched_quoted_object: nil, prefetched_approval: nil, request_id: nil, depth: nil)
     @request_id = request_id
+    @depth = depth || 0
     @quote = quote
     @fetching_error = nil
 
     fetch_quoted_post_if_needed!(fetchable_quoted_uri, prefetched_body: prefetched_quoted_object)
+    return if quote.quoted_account&.local?
     return if fast_track_approval! || quote.approval_uri.blank?
 
     @json = fetch_approval_object(quote.approval_uri, prefetched_body: prefetched_approval)
@@ -42,14 +46,7 @@ class ActivityPub::VerifyQuoteService < BaseService
       true
     end
 
-    # Always allow someone to quote posts in which they are mentioned
-    if @quote.quoted_status.active_mentions.exists?(mentions: { account_id: @quote.account_id })
-      @quote.accept!
-
-      true
-    else
-      false
-    end
+    false
   end
 
   def fetch_approval_object(uri, prefetched_body: nil)
@@ -72,10 +69,12 @@ class ActivityPub::VerifyQuoteService < BaseService
     return if uri.nil? || @quote.quoted_status.present?
 
     status = ActivityPub::TagManager.instance.uri_to_resource(uri, Status)
-    status ||= ActivityPub::FetchRemoteStatusService.new.call(uri, on_behalf_of: @quote.account.followers.local.first, prefetched_body:, request_id: @request_id)
+    raise Mastodon::RecursionLimitExceededError if @depth > MAX_SYNCHRONOUS_DEPTH && status.nil?
+
+    status ||= ActivityPub::FetchRemoteStatusService.new.call(uri, on_behalf_of: @quote.account.followers.local.first, prefetched_body:, request_id: @request_id, depth: @depth + 1)
 
     @quote.update(quoted_status: status) if status.present?
-  rescue Mastodon::UnexpectedResponseError, *Mastodon::HTTP_CONNECTION_ERRORS => e
+  rescue Mastodon::RecursionLimitExceededError, Mastodon::UnexpectedResponseError, *Mastodon::HTTP_CONNECTION_ERRORS => e
     @fetching_error = e
   end
 
@@ -90,7 +89,7 @@ class ActivityPub::VerifyQuoteService < BaseService
     # It's not safe to fetch if the inlined object is cross-origin or doesn't match expectations
     return if object['id'] != uri || non_matching_uri_hosts?(@quote.approval_uri, object['id'])
 
-    status = ActivityPub::FetchRemoteStatusService.new.call(object['id'], prefetched_body: object, on_behalf_of: @quote.account.followers.local.first, request_id: @request_id)
+    status = ActivityPub::FetchRemoteStatusService.new.call(object['id'], prefetched_body: object, on_behalf_of: @quote.account.followers.local.first, request_id: @request_id, depth: @depth)
 
     if status.present?
       @quote.update(quoted_status: status)
diff --git a/app/services/bulk_import_row_service.rb b/app/services/bulk_import_row_service.rb
index 26909dfe04f..ac5080f0ba4 100644
--- a/app/services/bulk_import_row_service.rb
+++ b/app/services/bulk_import_row_service.rb
@@ -1,6 +1,9 @@
 # frozen_string_literal: true
 
 class BulkImportRowService
+  STOPLIGHT_COOL_OFF_TIME = 5.minutes.seconds
+  STOPLIGHT_THRESHOLD = 1
+
   def call(row)
     @account = row.bulk_import.account
     @data    = row.data
@@ -10,7 +13,7 @@ class BulkImportRowService
     when :following, :blocking, :muting, :lists
       target_acct     = @data['acct']
       target_domain   = domain(target_acct)
-      @target_account = stoplight_wrapper(target_domain).run { ResolveAccountService.new.call(target_acct, { check_delivery_availability: true }) }
+      @target_account = stoplight_wrapper(target_domain).run(stoplight_fallback) { ResolveAccountService.new.call(target_acct, { check_delivery_availability: true }) }
       return false if @target_account.nil?
     when :bookmarks
       target_uri      = @data['uri']
@@ -18,7 +21,7 @@ class BulkImportRowService
       @target_status = ActivityPub::TagManager.instance.uri_to_resource(target_uri, Status)
       return false if @target_status.nil? && ActivityPub::TagManager.instance.local_uri?(target_uri)
 
-      @target_status ||= stoplight_wrapper(target_domain).run { ActivityPub::FetchRemoteStatusService.new.call(target_uri) }
+      @target_status ||= stoplight_wrapper(target_domain).run(stoplight_fallback) { ActivityPub::FetchRemoteStatusService.new.call(target_uri) }
       return false if @target_status.nil?
     end
 
@@ -51,13 +54,18 @@ class BulkImportRowService
     TagManager.instance.local_domain?(domain) ? nil : TagManager.instance.normalize_domain(domain)
   end
 
+  def stoplight_fallback
+    ->(error) {}
+  end
+
   def stoplight_wrapper(domain)
     if domain.present?
-      Stoplight("source:#{domain}")
-        .with_fallback { nil }
-        .with_threshold(1)
-        .with_cool_off_time(5.minutes.seconds)
-        .with_error_handler { |error, handle| error.is_a?(HTTP::Error) || error.is_a?(OpenSSL::SSL::SSLError) ? handle.call(error) : raise(error) }
+      Stoplight(
+        "source:#{domain}",
+        cool_off_time: STOPLIGHT_COOL_OFF_TIME,
+        threshold: STOPLIGHT_THRESHOLD,
+        tracked_errors: [HTTP::Error, OpenSSL::SSL::SSLError]
+      )
     else
       Stoplight('domain-blank')
     end
diff --git a/app/services/delete_account_service.rb b/app/services/delete_account_service.rb
index 20d6ee8d64e..6557dda48fb 100644
--- a/app/services/delete_account_service.rb
+++ b/app/services/delete_account_service.rb
@@ -297,7 +297,7 @@ class DeleteAccountService < BaseService
   end
 
   def reported_status_ids
-    @reported_status_ids ||= Report.where(target_account: @account).unresolved.pluck(:status_ids).flatten.uniq
+    @reported_status_ids ||= @account.targeted_reports.unresolved.pluck(:status_ids).flatten.uniq
   end
 
   def associations_for_destruction
diff --git a/app/services/fan_out_on_write_service.rb b/app/services/fan_out_on_write_service.rb
index f3aa479c153..64769230b7c 100644
--- a/app/services/fan_out_on_write_service.rb
+++ b/app/services/fan_out_on_write_service.rb
@@ -40,6 +40,7 @@ class FanOutOnWriteService < BaseService
     deliver_to_self!
 
     unless @options[:skip_notifications]
+      notify_quoted_account!
       notify_mentioned_accounts!
       notify_about_update! if update?
     end
@@ -69,6 +70,12 @@ class FanOutOnWriteService < BaseService
     FeedManager.instance.push_to_home(@account, @status, update: update?) if @account.local?
   end
 
+  def notify_quoted_account!
+    return unless @status.quote&.quoted_account&.local? && @status.quote&.accepted?
+
+    LocalNotificationWorker.perform_async(@status.quote.quoted_account_id, @status.quote.id, 'Quote', 'quote')
+  end
+
   def notify_mentioned_accounts!
     @status.active_mentions.where.not(id: @options[:silenced_account_ids] || []).joins(:account).merge(Account.local).select(:id, :account_id).reorder(nil).find_in_batches do |mentions|
       LocalNotificationWorker.push_bulk(mentions) do |mention|
@@ -92,6 +99,12 @@ class FanOutOnWriteService < BaseService
         [account.id, @status.id, 'Status', 'update']
       end
     end
+
+    @status.quotes.accepted.find_in_batches do |quotes|
+      LocalNotificationWorker.push_bulk(quotes) do |quote|
+        [quote.account_id, quote.status_id, 'Status', 'quoted_update']
+      end
+    end
   end
 
   def deliver_to_all_followers!
diff --git a/app/services/follow_service.rb b/app/services/follow_service.rb
index 2928c85390a..5ff1b63503c 100644
--- a/app/services/follow_service.rb
+++ b/app/services/follow_service.rb
@@ -82,7 +82,7 @@ class FollowService < BaseService
 
     LocalNotificationWorker.perform_async(@target_account.id, follow.id, follow.class.name, 'follow')
     MergeWorker.perform_async(@target_account.id, @source_account.id, 'home')
-    MergeWorker.push_bulk(List.where(account: @source_account).joins(:list_accounts).where(list_accounts: { account_id: @target_account.id }).pluck(:id)) do |list_id|
+    MergeWorker.push_bulk(@source_account.owned_lists.with_list_account(@target_account).pluck(:id)) do |list_id|
       [@target_account.id, list_id, 'list']
     end
 
diff --git a/app/services/notify_service.rb b/app/services/notify_service.rb
index f820f969a6e..fa2c728e579 100644
--- a/app/services/notify_service.rb
+++ b/app/services/notify_service.rb
@@ -8,6 +8,7 @@ class NotifyService < BaseService
     admin.report
     admin.sign_up
     update
+    quoted_update
     poll
     status
     moderation_warning
@@ -247,7 +248,7 @@ class NotifyService < BaseService
   end
 
   def update_notification_request!
-    return unless @notification.type == :mention
+    return unless %i(mention quote).include?(@notification.type)
 
     notification_request = NotificationRequest.find_or_initialize_by(account_id: @recipient.id, from_account_id: @notification.from_account_id)
     notification_request.last_status_id = @notification.target_status.id
diff --git a/app/services/post_status_service.rb b/app/services/post_status_service.rb
index ac4b535ea9d..c55a54df378 100644
--- a/app/services/post_status_service.rb
+++ b/app/services/post_status_service.rb
@@ -19,6 +19,7 @@ class PostStatusService < BaseService
   # @option [String] :text Message
   # @option [Status] :thread Optional status to reply to
   # @option [Status] :quoted_status Optional status to quote
+  # @option [String] :quote_approval_policy Approval policy for quotes, one of `public`, `followers` or `nobody`
   # @option [Boolean] :sensitive
   # @option [String] :visibility
   # @option [String] :spoiler_text
@@ -38,8 +39,6 @@ class PostStatusService < BaseService
     @in_reply_to = @options[:thread]
     @quoted_status = @options[:quoted_status]
 
-    @antispam = Antispam.new
-
     return idempotency_duplicate if idempotency_given? && idempotency_duplicate?
 
     validate_media!
@@ -67,9 +66,10 @@ class PostStatusService < BaseService
 
   def preprocess_attributes!
     @sensitive    = (@options[:sensitive].nil? ? @account.user&.setting_default_sensitive : @options[:sensitive]) || @options[:spoiler_text].present?
-    @text         = @options.delete(:spoiler_text) if @text.blank? && @options[:spoiler_text].present?
+    @text         = @options.delete(:spoiler_text) if @text.blank? && @options[:spoiler_text].present? && @quoted_status.blank?
     @visibility   = @options[:visibility] || @account.user&.setting_default_privacy
     @visibility   = :unlisted if @visibility&.to_sym == :public && @account.silenced?
+    @visibility   = :private if @quoted_status&.private_visibility? && %i(public unlisted).include?(@visibility&.to_sym)
     @scheduled_at = @options[:scheduled_at]&.to_datetime
     @scheduled_at = nil if scheduled_in_the_past?
   rescue ArgumentError
@@ -81,7 +81,9 @@ class PostStatusService < BaseService
     process_mentions_service.call(@status, save_records: false)
     safeguard_mentions!(@status)
     attach_quote!(@status)
-    @antispam.local_preflight_check!(@status)
+
+    antispam = Antispam.new(@status)
+    antispam.local_preflight_check!
 
     # The following transaction block is needed to wrap the UPDATEs to
     # the media attachments when the status is created
@@ -93,16 +95,10 @@ class PostStatusService < BaseService
   def attach_quote!(status)
     return if @quoted_status.nil?
 
-    # NOTE: for now this is only for convenience in testing, as we don't support the request flow nor serialize quotes in ActivityPub
-    # we only support incoming quotes so far
+    status.quote = Quote.create(quoted_status: @quoted_status, status: status)
+    status.quote.ensure_quoted_access
 
-    status.quote = Quote.new(quoted_status: @quoted_status)
-    status.quote.accept! if @status.account == @quoted_status.account || @quoted_status.active_mentions.exists?(mentions: { account_id: status.account_id })
-
-    # TODO: the following has yet to be implemented:
-    # - handle approval of local users (requires the interactionPolicy PR)
-    # - produce a QuoteAuthorization for quotes of local users
-    # - send a QuoteRequest for quotes of remote users
+    status.quote.accept! if @quoted_status.local? && StatusPolicy.new(@status.account, @quoted_status).quote?
   end
 
   def safeguard_mentions!(status)
@@ -118,7 +114,9 @@ class PostStatusService < BaseService
 
   def schedule_status!
     status_for_validation = @account.statuses.build(status_attributes)
-    @antispam.local_preflight_check!(status_for_validation)
+
+    antispam = Antispam.new(status_for_validation)
+    antispam.local_preflight_check!
 
     if status_for_validation.valid?
       # Marking the status as destroyed is necessary to prevent the status from being
@@ -146,6 +144,7 @@ class PostStatusService < BaseService
     DistributionWorker.perform_async(@status.id)
     ActivityPub::DistributionWorker.perform_async(@status.id)
     PollExpirationNotifyWorker.perform_at(@status.poll.expires_at, @status.poll.id) if @status.poll
+    ActivityPub::QuoteRequestWorker.perform_async(@status.quote.id) if @status.quote&.quoted_status.present? && !@status.quote&.quoted_status&.local?
   end
 
   def validate_media!
@@ -220,6 +219,7 @@ class PostStatusService < BaseService
       language: valid_locale_cascade(@options[:language], @account.user&.preferred_posting_language, I18n.default_locale),
       application: @options[:application],
       rate_limit: @options[:with_rate_limit],
+      quote_approval_policy: @options[:quote_approval_policy],
     }.compact
   end
 
diff --git a/app/services/remove_status_service.rb b/app/services/remove_status_service.rb
index 2adb8c1edbe..f61cb632b23 100644
--- a/app/services/remove_status_service.rb
+++ b/app/services/remove_status_service.rb
@@ -47,6 +47,9 @@ class RemoveStatusService < BaseService
         remove_media
       end
 
+      # Revoke the quote while we get a chance… maybe this should be a `before_destroy` hook?
+      RevokeQuoteService.new.call(@status.quote) if @status.quote&.quoted_account&.local? && @status.quote&.accepted?
+
       @status.destroy! if permanently?
     end
   end
diff --git a/app/services/revoke_quote_service.rb b/app/services/revoke_quote_service.rb
new file mode 100644
index 00000000000..346fba89709
--- /dev/null
+++ b/app/services/revoke_quote_service.rb
@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+class RevokeQuoteService < BaseService
+  include Payloadable
+
+  def call(quote)
+    @quote = quote
+    @account = quote.quoted_account
+
+    @quote.reject!
+    distribute_update!
+    distribute_stamp_deletion!
+  end
+
+  private
+
+  def distribute_update!
+    return if @quote.status_id.nil?
+
+    DistributionWorker.perform_async(@quote.status_id, { 'update' => true })
+  end
+
+  def distribute_stamp_deletion!
+    # It is possible the quoted status has been soft-deleted.
+    # In this case, `signed_activity_json` would fail, but we can just ignore
+    # that, as we have already federated deletion.
+    return if @quote.quoted_status.nil?
+
+    ActivityPub::DeliveryWorker.push_bulk(inboxes, limit: 1_000) do |inbox_url|
+      [signed_activity_json, @account.id, inbox_url]
+    end
+  end
+
+  def inboxes
+    [
+      @quote.status,
+      @quote.quoted_status,
+    ].compact.map { |status| StatusReachFinder.new(status, unsafe: true).inboxes }.flatten.uniq
+  end
+
+  def signed_activity_json
+    @signed_activity_json ||= Oj.dump(serialize_payload(@quote, ActivityPub::DeleteQuoteAuthorizationSerializer, signer: @account, always_sign: true, force_approval_id: true))
+  end
+end
diff --git a/app/services/unfollow_service.rb b/app/services/unfollow_service.rb
index b3f2cd66f67..1ea8af69926 100644
--- a/app/services/unfollow_service.rb
+++ b/app/services/unfollow_service.rb
@@ -34,7 +34,7 @@ class UnfollowService < BaseService
 
     unless @options[:skip_unmerge]
       UnmergeWorker.perform_async(@target_account.id, @source_account.id, 'home')
-      UnmergeWorker.push_bulk(List.where(account: @source_account).joins(:list_accounts).where(list_accounts: { account_id: @target_account.id }).pluck(:list_id)) do |list_id|
+      UnmergeWorker.push_bulk(@source_account.owned_lists.with_list_account(@target_account).pluck(:list_id)) do |list_id|
         [@target_account.id, list_id, 'list']
       end
     end
diff --git a/app/services/unmute_service.rb b/app/services/unmute_service.rb
index 9262961f7d7..0a9604bae2e 100644
--- a/app/services/unmute_service.rb
+++ b/app/services/unmute_service.rb
@@ -9,7 +9,7 @@ class UnmuteService < BaseService
     if account.following?(target_account)
       MergeWorker.perform_async(target_account.id, account.id, 'home')
 
-      MergeWorker.push_bulk(List.where(account: account).joins(:list_accounts).where(list_accounts: { account_id: target_account.id }).pluck(:id)) do |list_id|
+      MergeWorker.push_bulk(account.owned_lists.with_list_account(target_account).pluck(:id)) do |list_id|
         [target_account.id, list_id, 'list']
       end
     end
diff --git a/app/services/update_status_service.rb b/app/services/update_status_service.rb
index 7837d37c959..4b871211a46 100644
--- a/app/services/update_status_service.rb
+++ b/app/services/update_status_service.rb
@@ -115,6 +115,7 @@ class UpdateStatusService < BaseService
     @status.spoiler_text = @options[:spoiler_text] || '' if @options.key?(:spoiler_text)
     @status.sensitive    = @options[:sensitive] || @options[:spoiler_text].present? if @options.key?(:sensitive) || @options.key?(:spoiler_text)
     @status.language     = valid_locale_cascade(@options[:language], @status.language, @status.account.user&.preferred_posting_language, I18n.default_locale)
+    @status.quote_approval_policy = @options[:quote_approval_policy] if @options[:quote_approval_policy].present?
 
     # We raise here to rollback the entire transaction
     raise NoChangesSubmittedError unless significant_changes?
diff --git a/app/validators/unreserved_username_validator.rb b/app/validators/unreserved_username_validator.rb
index 55a8c835fae..f20f4a7494b 100644
--- a/app/validators/unreserved_username_validator.rb
+++ b/app/validators/unreserved_username_validator.rb
@@ -28,14 +28,6 @@ class UnreservedUsernameValidator < ActiveModel::Validator
   end
 
   def settings_username_reserved?
-    settings_has_reserved_usernames? && settings_reserves_username?
-  end
-
-  def settings_has_reserved_usernames?
-    Setting.reserved_usernames.present?
-  end
-
-  def settings_reserves_username?
-    Setting.reserved_usernames.include?(@username.downcase)
+    UsernameBlock.matches?(@username, allow_with_approval: false)
   end
 end
diff --git a/app/views/admin/accounts/_counters.html.haml b/app/views/admin/accounts/_counters.html.haml
index 00ab98d094a..3c99da9f2c8 100644
--- a/app/views/admin/accounts/_counters.html.haml
+++ b/app/views/admin/accounts/_counters.html.haml
@@ -30,9 +30,9 @@
           = t('admin.accounts.suspended')
         - elsif account.silenced?
           = t('admin.accounts.silenced')
-        - elsif account.local? && account.user&.disabled?
+        - elsif account.local? && account.user_disabled?
           = t('admin.accounts.disabled')
-        - elsif account.local? && !account.user&.confirmed?
+        - elsif account.local? && !account.user_confirmed?
           = t('admin.accounts.confirming')
         - elsif account.local? && !account.user_approved?
           = t('admin.accounts.pending')
diff --git a/app/views/admin/accounts/_field.html.haml b/app/views/admin/accounts/_field.html.haml
new file mode 100644
index 00000000000..ce8d80785e6
--- /dev/null
+++ b/app/views/admin/accounts/_field.html.haml
@@ -0,0 +1,9 @@
+-# locals: (field:, account:)
+%dl
+  %dt.emojify{ title: field.name }
+    = prerender_custom_emojis(h(field.name), account.emojis)
+  %dd{ title: field.value, class: field_verified_class(field.verified?) }
+    - if field.verified?
+      %span.verified__mark{ title: t('accounts.link_verified_on', date: l(field.verified_at)) }
+        = material_symbol 'check'
+    = prerender_custom_emojis(account_field_value_format(field, with_rel_me: false), account.emojis)
diff --git a/app/views/admin/accounts/_local_account.html.haml b/app/views/admin/accounts/_local_account.html.haml
index 892afcc5428..bff752332c6 100644
--- a/app/views/admin/accounts/_local_account.html.haml
+++ b/app/views/admin/accounts/_local_account.html.haml
@@ -34,7 +34,7 @@
 %tr
   %th= t('admin.accounts.email_status')
   %td
-    - if account.user&.confirmed?
+    - if account.user_confirmed?
       = t('admin.accounts.confirmed')
     - else
       = t('admin.accounts.confirming')
diff --git a/app/views/admin/accounts/show.html.haml b/app/views/admin/accounts/show.html.haml
index f148b9a0822..977967c58fb 100644
--- a/app/views/admin/accounts/show.html.haml
+++ b/app/views/admin/accounts/show.html.haml
@@ -7,25 +7,17 @@
 
 = render 'application/card', account: @account
 
-- account = @account
-- fields = account.fields
-- unless fields.empty? && account.note.blank?
+- if @account.fields? || @account.note?
   .admin-account-bio
-    - unless fields.empty?
+    - if @account.fields?
       %div
         .account__header__fields
-          - fields.each do |field|
-            %dl
-              %dt.emojify{ title: field.name }= prerender_custom_emojis(h(field.name), account.emojis)
-              %dd{ title: field.value, class: custom_field_classes(field) }
-                - if field.verified?
-                  %span.verified__mark{ title: t('accounts.link_verified_on', date: l(field.verified_at)) }
-                    = material_symbol 'check'
-                = prerender_custom_emojis(account_field_value_format(field, with_rel_me: false), account.emojis)
+          = render partial: 'field', collection: @account.fields, locals: { account: @account }
 
-    - if account.note.present?
+    - if @account.note?
       %div
-        .account__header__content.emojify= prerender_custom_emojis(account_bio_format(account), account.emojis)
+        .account__header__content.emojify
+          = prerender_custom_emojis(account_bio_format(@account), @account.emojis)
 
 = render 'admin/accounts/counters', account: @account
 
diff --git a/app/views/admin/announcements/_announcement.html.haml b/app/views/admin/announcements/_announcement.html.haml
index 87ae97cf484..5944b0b2954 100644
--- a/app/views/admin/announcements/_announcement.html.haml
+++ b/app/views/admin/announcements/_announcement.html.haml
@@ -9,7 +9,7 @@
       - else
         = l(announcement.created_at)
 
-    %div
+    .announcements-list__item__actions
       - if can?(:distribute, announcement)
         = table_link_to 'mail', t('admin.terms_of_service.notify_users'), admin_announcement_preview_path(announcement)
       - if can?(:update, announcement)
diff --git a/app/views/admin/domain_blocks/edit.html.haml b/app/views/admin/domain_blocks/edit.html.haml
index 40c46b8b6b9..cd52953a40c 100644
--- a/app/views/admin/domain_blocks/edit.html.haml
+++ b/app/views/admin/domain_blocks/edit.html.haml
@@ -1,7 +1,7 @@
 - content_for :page_title do
   = t('admin.domain_blocks.edit')
 
-= simple_form_for @domain_block, url: admin_domain_block_path(@domain_block), method: :put do |form|
+= simple_form_for @domain_block, url: admin_domain_block_path(@domain_block) do |form|
   = render 'shared/error_messages', object: @domain_block
 
   = render form
diff --git a/app/views/admin/instances/show.html.haml b/app/views/admin/instances/show.html.haml
index c977011e1ff..d241844ea2f 100644
--- a/app/views/admin/instances/show.html.haml
+++ b/app/views/admin/instances/show.html.haml
@@ -78,7 +78,7 @@
   %h3= t('admin.instances.availability.title')
 
   %p
-    = t('admin.instances.availability.description_html', count: DeliveryFailureTracker::FAILURE_DAYS_THRESHOLD)
+    = t('admin.instances.availability.description_html', count: DeliveryFailureTracker::FAILURE_THRESHOLDS[:days])
 
   .availability-indicator
     %ul.availability-indicator__graphic
diff --git a/app/views/admin/reports/_media_attachments.html.haml b/app/views/admin/reports/_media_attachments.html.haml
deleted file mode 100644
index aa82ec09a89..00000000000
--- a/app/views/admin/reports/_media_attachments.html.haml
+++ /dev/null
@@ -1,6 +0,0 @@
-- if status.ordered_media_attachments.first.video?
-  = render_video_component(status, visible: false)
-- elsif status.ordered_media_attachments.first.audio?
-  = render_audio_component(status)
-- else
-  = render_media_gallery_component(status, visible: false)
diff --git a/app/views/admin/reports/_status.html.haml b/app/views/admin/reports/_status.html.haml
deleted file mode 100644
index c1e47d5b32e..00000000000
--- a/app/views/admin/reports/_status.html.haml
+++ /dev/null
@@ -1,53 +0,0 @@
-.batch-table__row
-  %label.batch-table__row__select.batch-checkbox
-    = f.check_box :status_ids, { multiple: true, include_hidden: false }, status.id
-  .batch-table__row__content
-    .status__card
-      - if status.reblog?
-        .status__prepend
-          = material_symbol('repeat')
-          = t('statuses.boosted_from_html', acct_link: admin_account_inline_link_to(status.proper.account, path: admin_account_status_path(status.proper.account.id, status.proper.id)))
-      - elsif status.reply? && status.in_reply_to_id.present?
-        .status__prepend
-          = material_symbol('reply')
-          = t('admin.statuses.replied_to_html', acct_link: admin_account_inline_link_to(status.in_reply_to_account, path: status.thread.present? ? admin_account_status_path(status.thread.account_id, status.in_reply_to_id) : nil))
-      .status__content><
-        - if status.proper.spoiler_text.blank?
-          = prerender_custom_emojis(status_content_format(status.proper), status.proper.emojis)
-        - else
-          %details<
-            %summary><
-              %strong> Content warning: #{prerender_custom_emojis(h(status.proper.spoiler_text), status.proper.emojis)}
-            = prerender_custom_emojis(status_content_format(status.proper), status.proper.emojis)
-
-      - unless status.proper.ordered_media_attachments.empty?
-        = render partial: 'admin/reports/media_attachments', locals: { status: status.proper }
-
-      .detailed-status__meta
-        - if status.application
-          = status.application.name
-          ·
-
-        = link_to admin_account_status_path(status.account.id, status), class: 'detailed-status__datetime' do
-          %time.formatted{ datetime: status.created_at.iso8601, title: l(status.created_at) }= l(status.created_at)
-        - if status.edited?
-          ·
-          = link_to t('statuses.edited_at_html', date: content_tag(:time, l(status.edited_at), datetime: status.edited_at.iso8601, title: l(status.edited_at), class: 'formatted')),
-                    admin_account_status_path(status.account_id, status),
-                    class: 'detailed-status__datetime'
-        - if status.discarded?
-          ·
-          %span.negative-hint= t('admin.statuses.deleted')
-        ·
-
-        = material_symbol visibility_icon(status)
-        = t("statuses.visibilities.#{status.visibility}")
-        ·
-
-        = link_to ActivityPub::TagManager.instance.url_for(status.proper), class: 'detailed-status__link', rel: 'noopener' do
-          = t('admin.statuses.view_publicly')
-
-        - if status.proper.sensitive?
-          ·
-          = material_symbol('visibility_off')
-          = t('stream_entries.sensitive_content')
diff --git a/app/views/admin/reports/index.html.haml b/app/views/admin/reports/index.html.haml
index 6f762d94ebf..e08218a05d9 100644
--- a/app/views/admin/reports/index.html.haml
+++ b/app/views/admin/reports/index.html.haml
@@ -30,8 +30,7 @@
       %button.button= t('admin.accounts.search')
       = link_to t('admin.accounts.reset'), admin_reports_path, class: 'button button--dangerous'
 
-- @reports.group_by(&:target_account_id).each_value do |reports|
-  - target_account = reports.first.target_account
+- @reports.group_by(&:target_account).each do |target_account, reports|
   .report-card
     .report-card__profile
       = account_link_to target_account, '', path: admin_account_path(target_account.id)
@@ -42,7 +41,7 @@
           %span.red= t('admin.accounts.suspended')
         - elsif target_account.silenced?
           %span.red= t('admin.accounts.silenced')
-        - elsif target_account.user&.disabled?
+        - elsif target_account.user_disabled?
           %span.red= t('admin.accounts.disabled')
         - else
           %span.neutral= t('admin.accounts.no_limits_imposed')
diff --git a/app/views/admin/reports/show.html.haml b/app/views/admin/reports/show.html.haml
index 69e9c02921e..86f87f197eb 100644
--- a/app/views/admin/reports/show.html.haml
+++ b/app/views/admin/reports/show.html.haml
@@ -40,10 +40,6 @@
 
 %p
   = t 'admin.reports.statuses_description_html'
-  —
-  = link_to safe_join([material_symbol('add'), t('admin.reports.add_to_report')]),
-            admin_account_statuses_path(@report.target_account_id, report_id: @report.id),
-            class: 'table-action-link'
 
 = form_with model: @form, url: batch_admin_account_statuses_path(@report.target_account_id, report_id: @report.id) do |f|
   .batch-table
@@ -51,13 +47,16 @@
       %label.batch-table__toolbar__select.batch-checkbox-all
         = check_box_tag :batch_checkbox_all, nil, false
       .batch-table__toolbar__actions
+        = link_to safe_join([material_symbol('add'), t('admin.reports.add_to_report')]),
+                  admin_account_statuses_path(@report.target_account_id, report_id: @report.id),
+                  class: 'table-action-link'
         - if !@statuses.empty? && @report.unresolved?
           = f.button safe_join([material_symbol('close'), t('admin.statuses.batch.remove_from_report')]), name: :remove_from_report, class: 'table-action-link', type: :submit
     .batch-table__body
       - if @statuses.empty?
         = nothing_here 'nothing-here--under-tabs'
       - else
-        = render partial: 'admin/reports/status', collection: @statuses, locals: { f: f }
+        = render partial: 'admin/shared/status_batch_row', collection: @statuses, as: :status, locals: { f: f }
 
 - if @report.unresolved?
   %hr.spacer/
diff --git a/app/views/admin/roles/_role.html.haml b/app/views/admin/roles/_role.html.haml
index 085bdbd1568..ddaca5d8a9f 100644
--- a/app/views/admin/roles/_role.html.haml
+++ b/app/views/admin/roles/_role.html.haml
@@ -26,5 +26,5 @@
         = link_to t('admin.roles.assigned_users', count: role.users.count), admin_accounts_path(role_ids: role.id)
         ·
         %abbr{ title: role.permissions_as_keys.map { |privilege| I18n.t("admin.roles.privileges.#{privilege}") }.join(', ') }= t('admin.roles.permissions_count', count: role.permissions_as_keys.size)
-    %div
+    .announcements-list__item__actions
       = table_link_to 'edit', t('admin.accounts.edit'), edit_admin_role_path(role) if can?(:update, role)
diff --git a/app/views/admin/rules/_rule.html.haml b/app/views/admin/rules/_rule.html.haml
index 7d84534d59b..d79c1dfa6c6 100644
--- a/app/views/admin/rules/_rule.html.haml
+++ b/app/views/admin/rules/_rule.html.haml
@@ -3,7 +3,7 @@
     #{rule_counter + 1}.
     = truncate(rule.text)
 
-  .announcements-list__item__action-bar
+  .announcements-list__item__action-bar.no-wrap
     .announcements-list__item__meta
       = rule.hint
 
diff --git a/app/views/admin/settings/about/show.html.haml b/app/views/admin/settings/about/show.html.haml
index 1eb47a0b54e..adc8f1ff04a 100644
--- a/app/views/admin/settings/about/show.html.haml
+++ b/app/views/admin/settings/about/show.html.haml
@@ -24,7 +24,7 @@
     .fields-row__column.fields-row__column-6.fields-group
       = f.input :show_domain_blocks,
                 collection_wrapper_tag: 'ul',
-                collection: %i(disabled users all),
+                collection: f.object.class::DOMAIN_BLOCK_AUDIENCES,
                 include_blank: false,
                 item_wrapper_tag: 'li',
                 label_method: ->(value) { t("admin.settings.domain_blocks.#{value}") },
@@ -32,7 +32,7 @@
     .fields-row__column.fields-row__column-6.fields-group
       = f.input :show_domain_blocks_rationale,
                 collection_wrapper_tag: 'ul',
-                collection: %i(disabled users all),
+                collection: f.object.class::DOMAIN_BLOCK_AUDIENCES,
                 include_blank: false,
                 item_wrapper_tag: 'li',
                 label_method: ->(value) { t("admin.settings.domain_blocks.#{value}") },
diff --git a/app/views/admin/settings/discovery/show.html.haml b/app/views/admin/settings/discovery/show.html.haml
index 51d482d70a5..2620dd94b1b 100644
--- a/app/views/admin/settings/discovery/show.html.haml
+++ b/app/views/admin/settings/discovery/show.html.haml
@@ -30,10 +30,35 @@
 
   %h4= t('admin.settings.discovery.public_timelines')
 
-  .fields-group
-    = f.input :timeline_preview,
-              as: :boolean,
-              wrapper: :with_label
+  .fields-row
+    .fields-row__column.fields-row__column-6.fields-group
+      = f.input :local_live_feed_access,
+                collection: f.object.class::FEED_ACCESS_MODES,
+                include_blank: false,
+                label_method: ->(mode) { I18n.t("admin.settings.feed_access.modes.#{mode}") },
+                wrapper: :with_label
+
+    .fields-row__column.fields-row__column-6.fields-group
+      = f.input :remote_live_feed_access,
+                collection: f.object.class::FEED_ACCESS_MODES,
+                include_blank: false,
+                label_method: ->(mode) { I18n.t("admin.settings.feed_access.modes.#{mode}") },
+                wrapper: :with_label
+
+  .fields-row
+    .fields-row__column.fields-row__column-6.fields-group
+      = f.input :local_topic_feed_access,
+                collection: f.object.class::FEED_ACCESS_MODES,
+                include_blank: false,
+                label_method: ->(mode) { I18n.t("admin.settings.feed_access.modes.#{mode}") },
+                wrapper: :with_label
+
+    .fields-row__column.fields-row__column-6.fields-group
+      = f.input :remote_topic_feed_access,
+                collection: f.object.class::FEED_ACCESS_MODES,
+                include_blank: false,
+                label_method: ->(mode) { I18n.t("admin.settings.feed_access.modes.#{mode}") },
+                wrapper: :with_label
 
   %h4= t('admin.settings.discovery.privacy')
 
diff --git a/app/views/admin/settings/registrations/show.html.haml b/app/views/admin/settings/registrations/show.html.haml
index cb5a3eb6baf..7303eca662a 100644
--- a/app/views/admin/settings/registrations/show.html.haml
+++ b/app/views/admin/settings/registrations/show.html.haml
@@ -18,7 +18,7 @@
   .fields-row
     .fields-row__column.fields-row__column-6.fields-group
       = f.input :registrations_mode,
-                collection: %w(open approved none),
+                collection: f.object.class::REGISTRATION_MODES,
                 include_blank: false,
                 label_method: ->(mode) { I18n.t("admin.settings.registrations_mode.modes.#{mode}") },
                 warning_hint: I18n.t('admin.settings.registrations_mode.warning_hint'),
diff --git a/app/views/admin/shared/_preview_card.html.haml b/app/views/admin/shared/_preview_card.html.haml
new file mode 100644
index 00000000000..c4796dc59cc
--- /dev/null
+++ b/app/views/admin/shared/_preview_card.html.haml
@@ -0,0 +1,30 @@
+/# locals: (preview_card:)
+
+.preview-card
+  .status-card.expanded
+    .status-card__image{ class: preview_card_aspect_ratio_classname(preview_card) }
+      .spoiler-button
+        %button.hide-button{ type: 'button' }= t('link_preview.potentially_sensitive_content.hide_button')
+        %button.spoiler-button__overlay{ type: 'button' }
+          %span.spoiler-button__overlay__label
+            %span= t('link_preview.potentially_sensitive_content.label')
+            %span.spoiler-button__overlay__action
+              %span= t('link_preview.potentially_sensitive_content.action')
+      %canvas.status-card__image-preview{ 'data-blurhash': preview_card.blurhash, width: 32, height: 32 }
+      = image_tag preview_card.image.url, alt: '', class: 'status-card__image-image'
+    = link_to preview_card.url, target: '_blank', rel: 'noopener', data: { confirm: t('link_preview.potentially_sensitive_content.confirm_visit') } do
+      .status-card__content{ dir: 'auto' }
+        %span.status-card__host
+          %span{ lang: preview_card.language }
+            = preview_card.provider_name
+          - if preview_card.published_at
+            ·
+            %time.relative-formatted{ datetime: preview_card.published_at.iso8601, title: l(preview_card.published_at) }= l(preview_card.published_at)
+        %strong.status-card__title{ title: preview_card.title, lang: preview_card.language }
+          = preview_card.title
+        - if preview_card.author_name.present?
+          %span.status-card__author
+            = t('link_preview.author_html', name: content_tag(:strong, preview_card.author_name))
+        - else
+          %span.status-card__description{ lang: preview_card.language }
+            = preview_card.description
diff --git a/app/views/admin/shared/_status.html.haml b/app/views/admin/shared/_status.html.haml
new file mode 100644
index 00000000000..c042fd7a2cd
--- /dev/null
+++ b/app/views/admin/shared/_status.html.haml
@@ -0,0 +1,40 @@
+-# locals: (status:)
+
+.status__card><
+  - if status.reblog?
+    .status__prepend
+      = material_symbol('repeat')
+      = t('statuses.boosted_from_html', acct_link: admin_account_inline_link_to(status.proper.account, path: admin_account_status_path(status.proper.account.id, status.proper.id)))
+  - elsif status.reply? && status.in_reply_to_id.present?
+    .status__prepend
+      = material_symbol('reply')
+      = t('admin.statuses.replied_to_html', acct_link: admin_account_inline_link_to(status.in_reply_to_account, path: status.thread.present? ? admin_account_status_path(status.thread.account_id, status.in_reply_to_id) : nil))
+
+  = render partial: 'admin/shared/status_content', locals: { status: status.proper }
+
+  .detailed-status__meta
+    - if status.application
+      = status.application.name
+      ·
+    = conditional_link_to can?(:show, status), admin_account_status_path(status.account.id, status), class: 'detailed-status__datetime' do
+      %time.formatted{ datetime: status.created_at.iso8601, title: l(status.created_at) }><= l(status.created_at)
+    - if status.edited?
+      &nbsp;·
+      = conditional_link_to can?(:show, status), admin_account_status_path(status.account.id, status, { anchor: 'history' }), class: 'detailed-status__datetime' do
+        %span><= t('statuses.edited_at_html', date: content_tag(:time, l(status.edited_at), datetime: status.edited_at.iso8601, title: l(status.edited_at), class: 'relative-formatted'))
+    - if status.discarded?
+      &nbsp;·
+      %span.negative-hint= t('admin.statuses.deleted')
+    - unless status.reblog?
+      &nbsp;·
+      %span<
+        = material_symbol(visibility_icon(status))
+        = t("statuses.visibilities.#{status.visibility}")
+    - if status.proper.sensitive?
+      &nbsp;·
+      = material_symbol('visibility_off')
+      = t('stream_entries.sensitive_content')
+    - unless status.direct_visibility?
+      &nbsp;·
+      = link_to ActivityPub::TagManager.instance.url_for(status.proper), class: 'detailed-status__link', target: 'blank', rel: 'noopener' do
+        = t('admin.statuses.view_publicly')
diff --git a/app/views/admin/shared/_status_attachments.html.haml b/app/views/admin/shared/_status_attachments.html.haml
new file mode 100644
index 00000000000..8fca4add52e
--- /dev/null
+++ b/app/views/admin/shared/_status_attachments.html.haml
@@ -0,0 +1,25 @@
+- if status.with_poll?
+  .poll
+    %ul
+      - status.preloadable_poll.options.each do |option|
+        %li
+          %label.poll__option.disabled<>
+            - if status.preloadable_poll.multiple?
+              %span.poll__input.checkbox{ role: 'checkbox', 'aria-label': option }
+            - else
+              %span.poll__input{ role: 'radio', 'aria-label': option }
+            %span.poll__option__text
+              = prerender_custom_emojis(html_aware_format(option, status.local?, multiline: false), status.emojis)
+    %button.button.button-secondary{ disabled: true }
+      = t('polls.vote')
+
+- if status.with_preview_card?
+  = render partial: 'admin/shared/preview_card', locals: { preview_card: status.preview_card }
+
+- if status.with_media?
+  - if status.ordered_media_attachments.first.video?
+    = render_video_component(status, visible: false)
+  - elsif status.ordered_media_attachments.first.audio?
+    = render_audio_component(status)
+  - else
+    = render_media_gallery_component(status, visible: false)
diff --git a/app/views/admin/shared/_status_batch_row.html.haml b/app/views/admin/shared/_status_batch_row.html.haml
new file mode 100644
index 00000000000..53d8a56e607
--- /dev/null
+++ b/app/views/admin/shared/_status_batch_row.html.haml
@@ -0,0 +1,5 @@
+.batch-table__row
+  %label.batch-table__row__select.batch-checkbox
+    = f.check_box :status_ids, { multiple: true, include_hidden: false }, status.id
+  .batch-table__row__content
+    = render partial: 'admin/shared/status', object: status
diff --git a/app/views/admin/shared/_status_content.html.haml b/app/views/admin/shared/_status_content.html.haml
new file mode 100644
index 00000000000..465696fe5e9
--- /dev/null
+++ b/app/views/admin/shared/_status_content.html.haml
@@ -0,0 +1,16 @@
+.status__content><
+  - if status.spoiler_text.present?
+    %details<
+      %summary{
+        data: {
+          show: t('statuses.content_warnings.show'),
+          hide: t('statuses.content_warnings.hide'),
+        }
+      }><
+        %strong>
+          = prerender_custom_emojis(h(status.spoiler_text), status.emojis)
+      = prerender_custom_emojis(status_content_format(status), status.emojis)
+      = render partial: 'admin/shared/status_attachments', locals: { status: status.proper }
+  - else
+    = prerender_custom_emojis(status_content_format(status), status.emojis)
+    = render partial: 'admin/shared/status_attachments', locals: { status: status.proper }
diff --git a/app/views/admin/status_edits/_status_edit.html.haml b/app/views/admin/status_edits/_status_edit.html.haml
index 0bec0159ee4..d4cc4f5ea25 100644
--- a/app/views/admin/status_edits/_status_edit.html.haml
+++ b/app/views/admin/status_edits/_status_edit.html.haml
@@ -9,17 +9,7 @@
       %time.formatted{ datetime: status_edit.created_at.iso8601, title: l(status_edit.created_at) }= l(status_edit.created_at)
 
     .status
-      .status__content><
-        - if status_edit.spoiler_text.blank?
-          = prerender_custom_emojis(status_content_format(status_edit), status_edit.emojis)
-        - else
-          %details<
-            %summary><
-              %strong> Content warning: #{prerender_custom_emojis(h(status_edit.spoiler_text), status_edit.emojis)}
-            = prerender_custom_emojis(status_content_format(status_edit), status_edit.emojis)
-
-      - unless status_edit.ordered_media_attachments.empty?
-        = render partial: 'admin/reports/media_attachments', locals: { status: status_edit }
+      = render partial: 'admin/shared/status_content', locals: { status: status_edit }
 
       .detailed-status__meta
         %time.formatted{ datetime: status_edit.created_at.iso8601, title: l(status_edit.created_at) }= l(status_edit.created_at)
diff --git a/app/views/admin/statuses/index.html.haml b/app/views/admin/statuses/index.html.haml
index 57b9fe0e15c..e914585db61 100644
--- a/app/views/admin/statuses/index.html.haml
+++ b/app/views/admin/statuses/index.html.haml
@@ -47,6 +47,6 @@
       - if @statuses.empty?
         = nothing_here 'nothing-here--under-tabs'
       - else
-        = render partial: 'admin/reports/status', collection: @statuses, locals: { f: f }
+        = render partial: 'admin/shared/status_batch_row', collection: @statuses, as: :status, locals: { f: f }
 
 = paginate @statuses
diff --git a/app/views/admin/statuses/show.html.haml b/app/views/admin/statuses/show.html.haml
index 7328eeb0a74..ba5ba819874 100644
--- a/app/views/admin/statuses/show.html.haml
+++ b/app/views/admin/statuses/show.html.haml
@@ -53,52 +53,11 @@
 
 %h3= t('admin.statuses.contents')
 
-.status__card
-  - if @status.reblog?
-    .status__prepend
-      = material_symbol('repeat')
-      = t('statuses.boosted_from_html', acct_link: admin_account_inline_link_to(@status.proper.account, path: admin_account_status_path(@status.proper.account.id, @status.proper.id)))
-  - elsif @status.reply? && @status.in_reply_to_id.present?
-    .status__prepend
-      = material_symbol('reply')
-      = t('admin.statuses.replied_to_html', acct_link: admin_account_inline_link_to(@status.in_reply_to_account, path: @status.thread.present? ? admin_account_status_path(@status.thread.account_id, @status.in_reply_to_id) : nil))
-  .status__content><
-    - if @status.proper.spoiler_text.blank?
-      = prerender_custom_emojis(status_content_format(@status.proper), @status.proper.emojis)
-    - else
-      %details<
-        %summary><
-          %strong> Content warning: #{prerender_custom_emojis(h(@status.proper.spoiler_text), @status.proper.emojis)}
-        = prerender_custom_emojis(status_content_format(@status.proper), @status.proper.emojis)
-
-    - unless @status.proper.ordered_media_attachments.empty?
-      = render partial: 'admin/reports/media_attachments', locals: { status: @status.proper }
-
-    .detailed-status__meta
-      - if @status.application
-        = @status.application.name
-        ·
-      %span.detailed-status__datetime
-        %time.formatted{ datetime: @status.created_at.iso8601, title: l(@status.created_at) }= l(@status.created_at)
-      - if @status.edited?
-        ·
-        %span.detailed-status__datetime
-          = t('statuses.edited_at_html', date: content_tag(:time, l(@status.edited_at), datetime: @status.edited_at.iso8601, title: l(@status.edited_at), class: 'formatted'))
-      - if @status.discarded?
-        ·
-        %span.negative-hint= t('admin.statuses.deleted')
-      - unless @status.reblog?
-        ·
-        = material_symbol(visibility_icon(@status))
-        = t("statuses.visibilities.#{@status.visibility}")
-      - if @status.proper.sensitive?
-        ·
-        = material_symbol('visibility_off')
-        = t('stream_entries.sensitive_content')
+= render partial: 'admin/shared/status', object: @status
 
 %hr.spacer/
 
-%h3= t('admin.statuses.history')
+%h3#history= t('admin.statuses.history')
 - if @status.edits.empty?
   %p= t('admin.statuses.no_history')
 - else
diff --git a/app/views/admin/username_blocks/_form.html.haml b/app/views/admin/username_blocks/_form.html.haml
new file mode 100644
index 00000000000..bfbbb18e2f9
--- /dev/null
+++ b/app/views/admin/username_blocks/_form.html.haml
@@ -0,0 +1,16 @@
+.fields-group
+  = form.input :username,
+               wrapper: :with_block_label,
+               input_html: { autocomplete: 'new-password', pattern: '[a-zA-Z0-9_]+', maxlength: Account::USERNAME_LENGTH_LIMIT }
+
+.fields-group
+  = form.input :comparison,
+               as: :select,
+               wrapper: :with_block_label,
+               collection: %w(equals contains),
+               include_blank: false,
+               label_method: ->(type) { I18n.t(type, scope: 'admin.username_blocks.comparison') }
+
+.fields-group
+  = form.input :allow_with_approval,
+               wrapper: :with_label
diff --git a/app/views/admin/username_blocks/_username_block.html.haml b/app/views/admin/username_blocks/_username_block.html.haml
new file mode 100644
index 00000000000..617ec65bc6d
--- /dev/null
+++ b/app/views/admin/username_blocks/_username_block.html.haml
@@ -0,0 +1,12 @@
+.batch-table__row
+  %label.batch-table__row__select.batch-table__row__select--aligned.batch-checkbox
+    = f.check_box :username_block_ids, { multiple: true, include_hidden: false }, username_block.id
+    .sr-only= username_block.username
+  .batch-table__row__content.pending-account
+    .pending-account__header
+      = t(username_block.exact? ? 'admin.username_blocks.matches_exactly_html' : 'admin.username_blocks.contains_html', string: content_tag(:samp, link_to(username_block.username, edit_admin_username_block_path(username_block))))
+      %br/
+      - if username_block.allow_with_approval?
+        = t('admin.email_domain_blocks.allow_registrations_with_approval')
+      - else
+        = t('admin.username_blocks.block_registrations')
diff --git a/app/views/admin/username_blocks/edit.html.haml b/app/views/admin/username_blocks/edit.html.haml
new file mode 100644
index 00000000000..eee0fedef07
--- /dev/null
+++ b/app/views/admin/username_blocks/edit.html.haml
@@ -0,0 +1,10 @@
+- content_for :page_title do
+  = t('admin.username_blocks.edit.title')
+
+= simple_form_for @username_block, url: admin_username_block_path(@username_block) do |form|
+  = render 'shared/error_messages', object: @username_block
+
+  = render form
+
+  .actions
+    = form.button :button, t('generic.save_changes'), type: :submit
diff --git a/app/views/admin/username_blocks/index.html.haml b/app/views/admin/username_blocks/index.html.haml
new file mode 100644
index 00000000000..697edfda51a
--- /dev/null
+++ b/app/views/admin/username_blocks/index.html.haml
@@ -0,0 +1,26 @@
+- content_for :page_title do
+  = t('admin.username_blocks.title')
+
+- content_for :heading_actions do
+  = link_to t('admin.username_blocks.add_new'), new_admin_username_block_path, class: 'button'
+
+= form_with model: @form, url: batch_admin_username_blocks_path do |f|
+  = hidden_field_tag :page, params[:page] || 1
+
+  .batch-table
+    .batch-table__toolbar
+      %label.batch-table__toolbar__select.batch-checkbox-all
+        = check_box_tag :batch_checkbox_all, nil, false
+      .batch-table__toolbar__actions
+        = f.button safe_join([material_symbol('close'), t('admin.username_blocks.delete')]),
+                   class: 'table-action-link',
+                   data: { confirm: t('admin.reports.are_you_sure') },
+                   name: :delete,
+                   type: :submit
+    .batch-table__body
+      - if @username_blocks.empty?
+        = nothing_here 'nothing-here--under-tabs'
+      - else
+        = render partial: 'username_block', collection: @username_blocks, locals: { f: f }
+
+= paginate @username_blocks
diff --git a/app/views/admin/username_blocks/new.html.haml b/app/views/admin/username_blocks/new.html.haml
new file mode 100644
index 00000000000..0f5bd27952b
--- /dev/null
+++ b/app/views/admin/username_blocks/new.html.haml
@@ -0,0 +1,10 @@
+- content_for :page_title do
+  = t('admin.username_blocks.new.title')
+
+= simple_form_for @username_block, url: admin_username_blocks_path do |form|
+  = render 'shared/error_messages', object: @username_block
+
+  = render form
+
+  .actions
+    = form.button :button, t('admin.username_blocks.new.create'), type: :submit
diff --git a/app/views/admin/warning_presets/_warning_preset.html.haml b/app/views/admin/warning_presets/_warning_preset.html.haml
index 2cc056420f4..6488c3a554b 100644
--- a/app/views/admin/warning_presets/_warning_preset.html.haml
+++ b/app/views/admin/warning_presets/_warning_preset.html.haml
@@ -6,5 +6,5 @@
     .announcements-list__item__meta
       = truncate(warning_preset.text)
 
-    %div
+    .announcements-list__item__actions
       = table_link_to 'delete', t('admin.warning_presets.delete'), admin_warning_preset_path(warning_preset), method: :delete, data: { confirm: t('admin.accounts.are_you_sure') } if can?(:destroy, warning_preset)
diff --git a/app/views/admin/webhooks/_webhook.html.haml b/app/views/admin/webhooks/_webhook.html.haml
index dca5abeb777..6159d97820a 100644
--- a/app/views/admin/webhooks/_webhook.html.haml
+++ b/app/views/admin/webhooks/_webhook.html.haml
@@ -14,6 +14,6 @@
 
       %abbr{ title: webhook.events.join(', ') }= t('admin.webhooks.enabled_events', count: webhook.events.size)
 
-    %div
+    .announcements-list__item__actions
       = table_link_to 'edit', t('admin.webhooks.edit'), edit_admin_webhook_path(webhook) if can?(:update, webhook)
       = table_link_to 'delete', t('admin.webhooks.delete'), admin_webhook_path(webhook), method: :delete, data: { confirm: t('admin.accounts.are_you_sure') } if can?(:destroy, webhook)
diff --git a/app/views/application/_card.html.haml b/app/views/application/_card.html.haml
index c28e18522c3..6c320e5c1de 100644
--- a/app/views/application/_card.html.haml
+++ b/app/views/application/_card.html.haml
@@ -1,8 +1,7 @@
-- account_url = local_assigns[:admin] ? admin_account_path(account.id) : ActivityPub::TagManager.instance.url_for(account)
-- compact ||= false
+-# locals: (account:, compact: false)
 
 .card.h-card
-  = link_to account_url, target: '_blank', rel: 'noopener' do
+  = link_to ActivityPub::TagManager.instance.url_for(account), target: '_blank', rel: 'noopener' do
     - unless compact
       .card__img
         = image_tag account.header.url, alt: ''
diff --git a/app/views/application/mailer/_hashtag.html.haml b/app/views/application/mailer/_hashtag.html.haml
index 0fe7117bc4d..2aeabc2fce7 100644
--- a/app/views/application/mailer/_hashtag.html.haml
+++ b/app/views/application/mailer/_hashtag.html.haml
@@ -1,5 +1,3 @@
-- accounts = hashtag.statuses.public_visibility.joins(:account).merge(Account.without_suspended.without_silenced).includes(:account).limit(3).map(&:account)
-
 %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
   %tr
     %td.email-mini-wrapper-td
@@ -13,7 +11,7 @@
                   %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
                     %tr
                       %td.email-mini-hashtag-img-td
-                        - accounts.each do |account|
+                        - recent_tag_users(hashtag).each do |account|
                           %span.email-mini-hashtag-img-span
                             = image_tag full_asset_url(account.avatar.url), alt: '', width: 16, height: 16
                       %td
diff --git a/app/views/auth/confirmations/captcha.html.haml b/app/views/auth/confirmations/captcha.html.haml
index 035ac3a86a8..244948771ff 100644
--- a/app/views/auth/confirmations/captcha.html.haml
+++ b/app/views/auth/confirmations/captcha.html.haml
@@ -14,7 +14,7 @@
 
   = render_captcha
 
-  %p.lead= t('auth.captcha_confirmation.help_html', email: mail_to(Setting.site_contact_email, nil))
+  %p.lead= t('auth.captcha_confirmation.help_html', email: mail_to(Setting.site_contact_email))
 
   .actions
     = form.button t('challenge.confirm'),
diff --git a/app/views/auth/registrations/new.html.haml b/app/views/auth/registrations/new.html.haml
index 22f53a4f501..eef4b485f6a 100644
--- a/app/views/auth/registrations/new.html.haml
+++ b/app/views/auth/registrations/new.html.haml
@@ -56,7 +56,7 @@
     .fields-group
       = f.input :date_of_birth,
                 as: :date_of_birth,
-                hint: t('simple_form.hints.user.date_of_birth', count: Setting.min_age.to_i),
+                hint: t('simple_form.hints.user.date_of_birth', count: Setting.min_age.to_i, domain: site_hostname),
                 required: true,
                 wrapper: :with_block_label
 
diff --git a/app/views/auth/sessions/new.html.haml b/app/views/auth/sessions/new.html.haml
index 89903581a2b..67b958d38c1 100644
--- a/app/views/auth/sessions/new.html.haml
+++ b/app/views/auth/sessions/new.html.haml
@@ -41,4 +41,5 @@
       - resource_class.omniauth_providers.each do |provider|
         = provider_sign_in_link(provider)
 
-.form-footer= render 'auth/shared/links'
+- unless within_authorization_flow?
+  .form-footer= render 'auth/shared/links'
diff --git a/app/views/auth/sessions/two_factor/_otp_authentication_form.html.haml b/app/views/auth/sessions/two_factor/_otp_authentication_form.html.haml
index 30e97a68c11..6062d33a1bc 100644
--- a/app/views/auth/sessions/two_factor/_otp_authentication_form.html.haml
+++ b/app/views/auth/sessions/two_factor/_otp_authentication_form.html.haml
@@ -16,7 +16,7 @@
     = f.button :button, t('auth.login'), type: :submit
 
   - if Setting.site_contact_email.present?
-    %p.hint.subtle-hint= t('users.otp_lost_help_html', email: mail_to(Setting.site_contact_email, nil))
+    %p.hint.subtle-hint= t('users.otp_lost_help_html', email: mail_to(Setting.site_contact_email))
 
   - if webauthn_enabled?
     .form-footer
diff --git a/app/views/filters/_filter.html.haml b/app/views/filters/_filter.html.haml
index a544ac3a758..15326f30062 100644
--- a/app/views/filters/_filter.html.haml
+++ b/app/views/filters/_filter.html.haml
@@ -32,10 +32,10 @@
             .permissions-list__item__text__type
               = t('filters.index.statuses_long', count: filter.statuses.size)
 
-  .announcements-list__item__action-bar
-    .announcements-list__item__meta
+  .filters-list__item__action-bar
+    .filters-list__item__meta
       = t('filters.index.contexts', contexts: filter.context.map { |context| I18n.t("filters.contexts.#{context}") }.join(', '))
 
-    %div
+    .filters-list__item__actions
       = table_link_to 'edit', t('filters.edit.title'), edit_filter_path(filter)
       = table_link_to 'close', t('filters.index.delete'), filter_path(filter), method: :delete, data: { confirm: t('admin.accounts.are_you_sure') }
diff --git a/app/views/filters/edit.html.haml b/app/views/filters/edit.html.haml
index 3dc3f07b72c..2042977e699 100644
--- a/app/views/filters/edit.html.haml
+++ b/app/views/filters/edit.html.haml
@@ -1,7 +1,7 @@
 - content_for :page_title do
   = t('filters.edit.title')
 
-= simple_form_for @filter, url: filter_path(@filter), method: :put do |f|
+= simple_form_for @filter, url: filter_path(@filter) do |f|
   = render 'filter_fields', f: f
 
   .actions
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 15d08b3fcbc..3418f6d953d 100755
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -30,12 +30,12 @@
     = vite_react_refresh_tag
     = vite_polyfills_tag
     -# Needed for the wicg-inert polyfill. It needs to be on it's own <style> tag, with this `id`
-    = vite_stylesheet_tag 'styles/entrypoints/inert.scss', media: 'all', id: 'inert-style'
+    = vite_stylesheet_tag 'styles/entrypoints/inert.scss', media: 'all', id: 'inert-style', crossorigin: 'anonymous'
     = vite_typescript_tag 'common.ts', crossorigin: 'anonymous'
 
     = vite_preload_file_tag "mastodon/locales/#{I18n.locale}.json"
     = csrf_meta_tags unless skip_csrf_meta_tags?
-    %meta{ name: 'style-nonce', content: request.content_security_policy_nonce }
+    %meta{ name: 'style-nonce', content: request.content_security_policy_nonce, property: 'csp-nonce', nonce: request.content_security_policy_nonce }
 
     = custom_stylesheet
 
diff --git a/app/views/layouts/auth.html.haml b/app/views/layouts/auth.html.haml
index c351e356318..bdbcc84e1f3 100644
--- a/app/views/layouts/auth.html.haml
+++ b/app/views/layouts/auth.html.haml
@@ -5,8 +5,11 @@
   .container-alt
     .logo-container
       %h1
-        = link_to root_path do
+        - if within_authorization_flow?
           = logo_as_symbol(:wordmark)
+        - else
+          = link_to root_path do
+            = logo_as_symbol(:wordmark)
 
     .form-container
       = render 'flashes'
diff --git a/app/views/notification_mailer/_nested_quote.html.haml b/app/views/notification_mailer/_nested_quote.html.haml
new file mode 100644
index 00000000000..dc0921c2ed5
--- /dev/null
+++ b/app/views/notification_mailer/_nested_quote.html.haml
@@ -0,0 +1,17 @@
+%table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+  %tr
+    %td.email-quote-header-img
+      = image_tag full_asset_url(status.account.avatar.url), alt: '', width: 34, height: 34
+    %td.email-quote-header-text
+      %h2.email-quote-header-name
+        = display_name(status.account)
+      %p.email-quote-header-handle
+        @#{status.account.pretty_acct}
+
+%table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+  %tr
+    %td.email-status-content
+      = render 'notification_mailer/status_content', status: status
+
+      %p.email-status-footer
+        = link_to l(status.created_at.in_time_zone(time_zone.presence), format: :with_time_zone), web_url("@#{status.account.pretty_acct}/#{status.id}")
diff --git a/app/views/notification_mailer/_status.html.haml b/app/views/notification_mailer/_status.html.haml
index bf38dc9aa26..c56c7ec72ca 100644
--- a/app/views/notification_mailer/_status.html.haml
+++ b/app/views/notification_mailer/_status.html.haml
@@ -11,21 +11,12 @@
 %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
   %tr
     %td.email-status-content
-      .auto-dir
-        - if status.spoiler_text?
-          %p.email-status-spoiler
-            = status.spoiler_text
-
-        .email-status-prose
-          = status_content_format(status)
-
-        - if status.ordered_media_attachments.size.positive?
-          %p.email-status-media
-            - status.ordered_media_attachments.each do |a|
-              - if status.local?
-                = link_to full_asset_url(a.file.url(:original)), full_asset_url(a.file.url(:original))
-              - else
-                = link_to a.remote_url, a.remote_url
+      = render 'notification_mailer/status_content', status: status
 
+      - if status.local? && status.quote
+        %table.email-inner-card-table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+          %tr
+            %td.email-inner-nested-card-td
+              = render 'notification_mailer/nested_quote', status: status.quote.quoted_status, time_zone: time_zone
       %p.email-status-footer
         = link_to l(status.created_at.in_time_zone(time_zone.presence), format: :with_time_zone), web_url("@#{status.account.pretty_acct}/#{status.id}")
diff --git a/app/views/notification_mailer/_status.text.erb b/app/views/notification_mailer/_status.text.erb
index e03e8346c16..13711ee74d9 100644
--- a/app/views/notification_mailer/_status.text.erb
+++ b/app/views/notification_mailer/_status.text.erb
@@ -4,5 +4,9 @@
 >
 <% end %>
 > <%= raw word_wrap(extract_status_plain_text(status), break_sequence: "\n> ") %>
+<% if status.local? && status.quote %>
+>
+>> <%= raw word_wrap(extract_status_plain_text(status.quote.quoted_status), break_sequence: "\n>> ") %>
+<% end %>
 
 <%= raw t('application_mailer.view')%> <%= web_url("@#{status.account.pretty_acct}/#{status.id}") %>
diff --git a/app/views/notification_mailer/_status_content.html.haml b/app/views/notification_mailer/_status_content.html.haml
new file mode 100644
index 00000000000..f95ba8ccba8
--- /dev/null
+++ b/app/views/notification_mailer/_status_content.html.haml
@@ -0,0 +1,15 @@
+.auto-dir
+  - if status.spoiler_text?
+    %p.email-status-spoiler
+      = status.spoiler_text
+
+  .email-status-prose
+    = status_content_format(status)
+
+  - if status.ordered_media_attachments.size.positive?
+    %p.email-status-media
+      - status.ordered_media_attachments.each do |a|
+        - if status.local?
+          = link_to full_asset_url(a.file.url(:original)), full_asset_url(a.file.url(:original))
+        - else
+          = link_to a.remote_url, a.remote_url
diff --git a/app/views/notification_mailer/quote.html.haml b/app/views/notification_mailer/quote.html.haml
new file mode 100644
index 00000000000..139f4b2e8de
--- /dev/null
+++ b/app/views/notification_mailer/quote.html.haml
@@ -0,0 +1,16 @@
+= content_for :heading do
+  = render 'application/mailer/heading',
+           image_url: frontend_asset_url('images/mailer-new/heading/quote.png'),
+           subtitle: t('notification_mailer.quote.body', name: @status.account.pretty_acct),
+           title: t('notification_mailer.quote.title')
+%table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+  %tr
+    %td.email-body-padding-td
+      %table.email-inner-card-table{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+        %tr
+          %td.email-inner-card-td
+            = render 'status', status: @status, time_zone: @me.user_time_zone
+            %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
+              %tr
+                %td.email-padding-top-24
+                  = render 'application/mailer/button', text: t('notification_mailer.mention.action'), url: web_url("@#{@status.account.pretty_acct}/#{@status.id}")
diff --git a/app/views/notification_mailer/quote.text.erb b/app/views/notification_mailer/quote.text.erb
new file mode 100644
index 00000000000..6e3c67b7651
--- /dev/null
+++ b/app/views/notification_mailer/quote.text.erb
@@ -0,0 +1,5 @@
+<%= raw t('application_mailer.salutation', name: display_name(@me)) %>
+
+<%= raw t('notification_mailer.quote.body', name: @status.account.pretty_acct) %>
+
+<%= render 'status', status: @status %>
diff --git a/app/views/oauth/authorized_applications/index.html.haml b/app/views/oauth/authorized_applications/index.html.haml
index 3745ed219ff..b28302a93f7 100644
--- a/app/views/oauth/authorized_applications/index.html.haml
+++ b/app/views/oauth/authorized_applications/index.html.haml
@@ -28,7 +28,7 @@
           = t('doorkeeper.authorized_applications.index.authorized_at', date: l(application.created_at.to_date))
 
         - unless application.superapp? || current_account.unavailable?
-          %div
+          .announcements-list__item__actions
             = table_link_to 'close', t('doorkeeper.authorized_applications.buttons.revoke'), oauth_authorized_application_path(application), method: :delete, data: { confirm: t('doorkeeper.authorized_applications.confirmations.revoke') }
 
       .announcements-list__item__permissions
diff --git a/app/views/settings/preferences/appearance/show.html.haml b/app/views/settings/preferences/appearance/show.html.haml
index 8fd7a85defa..72e2575a8ea 100644
--- a/app/views/settings/preferences/appearance/show.html.haml
+++ b/app/views/settings/preferences/appearance/show.html.haml
@@ -31,6 +31,17 @@
                  label: I18n.t('simple_form.labels.defaults.setting_theme'),
                  wrapper: :with_label
 
+  - if Mastodon::Feature.modern_emojis_enabled?
+    .fields-group
+      = f.simple_fields_for :settings, current_user.settings do |ff|
+        = ff.input :'web.emoji_style',
+                   collection: %w(auto twemoji native),
+                   include_blank: false,
+                   hint: I18n.t('simple_form.hints.defaults.setting_emoji_style'),
+                   label: I18n.t('simple_form.labels.defaults.setting_emoji_style'),
+                   label_method: ->(emoji_style) { I18n.t("emoji_styles.#{emoji_style}", default: emoji_style) },
+                   wrapper: :with_label
+
   - unless I18n.locale == :en
     .flash-message.translation-prompt
       #{t 'appearance.localization.body'} #{content_tag(:a, t('appearance.localization.guide_link_text'), href: t('appearance.localization.guide_link'), target: '_blank', rel: 'noopener')}
diff --git a/app/views/settings/preferences/notifications/show.html.haml b/app/views/settings/preferences/notifications/show.html.haml
index a8e179d0191..08bcc32e9b4 100644
--- a/app/views/settings/preferences/notifications/show.html.haml
+++ b/app/views/settings/preferences/notifications/show.html.haml
@@ -18,6 +18,7 @@
       = 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.quote', wrapper: :with_label, label: I18n.t('simple_form.labels.notification_emails.quote')
 
     .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')
diff --git a/app/views/settings/preferences/other/show.html.haml b/app/views/settings/preferences/other/show.html.haml
index dd79695db7f..5008a0bbb7e 100644
--- a/app/views/settings/preferences/other/show.html.haml
+++ b/app/views/settings/preferences/other/show.html.haml
@@ -15,46 +15,6 @@
                  recommended: true,
                  wrapper: :with_label
 
-    %h4= t 'preferences.posting_defaults'
-
-    .fields-row
-      .fields-group.fields-row__column.fields-row__column-6
-        = ff.input :default_privacy,
-                   collection: Status.selectable_visibilities,
-                   hint: false,
-                   include_blank: false,
-                   label_method: ->(visibility) { safe_join([I18n.t("statuses.visibilities.#{visibility}"), I18n.t("statuses.visibilities.#{visibility}_long")], ' - ') },
-                   label: I18n.t('simple_form.labels.defaults.setting_default_privacy'),
-                   required: false,
-                   wrapper: :with_label
-
-      .fields-group.fields-row__column.fields-row__column-6
-        = ff.input :default_language,
-                   collection: [nil] + filterable_languages,
-                   hint: false,
-                   include_blank: false,
-                   label_method: ->(locale) { locale.nil? ? I18n.t('statuses.default_language') : native_locale_name(locale) },
-                   label: I18n.t('simple_form.labels.defaults.setting_default_language'),
-                   required: false,
-                   wrapper: :with_label
-
-    .fields-row
-      .fields-group.fields-row__column.fields-row__column-6
-        = ff.input :default_quote_policy,
-                   collection: %w(public followers nobody),
-                   include_blank: false,
-                   label_method: ->(policy) { I18n.t("statuses.quote_policies.#{policy}") },
-                   label: I18n.t('simple_form.labels.defaults.setting_default_quote_policy'),
-                   hint: I18n.t('simple_form.hints.defaults.setting_default_quote_policy'),
-                   required: false,
-                   wrapper: :with_label
-
-    .fields-group
-      = ff.input :default_sensitive,
-                 hint: I18n.t('simple_form.hints.defaults.setting_default_sensitive'),
-                 label: I18n.t('simple_form.labels.defaults.setting_default_sensitive'),
-                 wrapper: :with_label
-
   %h4= t 'preferences.public_timelines'
 
   .fields-group
diff --git a/app/views/settings/preferences/posting_defaults/show.html.haml b/app/views/settings/preferences/posting_defaults/show.html.haml
new file mode 100644
index 00000000000..30a2f01f88a
--- /dev/null
+++ b/app/views/settings/preferences/posting_defaults/show.html.haml
@@ -0,0 +1,52 @@
+- content_for :page_title do
+  = t('preferences.posting_defaults')
+
+- content_for :heading_actions do
+  = button_tag t('generic.save_changes'), class: 'button', form: 'edit_preferences'
+
+- if ['unlisted', 'private'].include?(current_user.setting_default_privacy)
+  - initial_quote_hint = I18n.t("simple_form.hints.defaults.setting_default_quote_policy_#{current_user.setting_default_privacy}")
+
+= simple_form_for current_user, url: settings_preferences_posting_defaults_path, html: { id: :edit_preferences } do |f|
+  = render 'shared/error_messages', object: current_user
+
+  = f.simple_fields_for :settings, current_user.settings do |ff|
+    .flash-message= t('posting_defaults.explanation')
+
+    .fields-group
+      = ff.input :default_privacy,
+                 collection: Status.selectable_visibilities,
+                 selected: current_user.setting_default_privacy,
+                 hint: false,
+                 include_blank: false,
+                 label_method: ->(visibility) { visibility == 'private' ? I18n.t('statuses.visibilities.private') : safe_join([I18n.t("statuses.visibilities.#{visibility}"), I18n.t("statuses.visibilities.#{visibility}_long")], ' - ') },
+                 label: I18n.t('simple_form.labels.defaults.setting_default_privacy'),
+                 required: false,
+                 wrapper: :with_label
+
+    .fields-group
+      = ff.input :default_quote_policy,
+                 collection: %w(public followers nobody),
+                 include_blank: false,
+                 label_method: ->(policy) { I18n.t("statuses.quote_policies.#{policy}") },
+                 label: I18n.t('simple_form.labels.defaults.setting_default_quote_policy'),
+                 hint: initial_quote_hint,
+                 required: false,
+                 wrapper: :with_label,
+                 wrapper_html: { data: { 'unlisted-hint': I18n.t('simple_form.hints.defaults.setting_default_quote_policy_unlisted'), 'private-hint': I18n.t('simple_form.hints.defaults.setting_default_quote_policy_private') } }
+
+    .fields-group
+      = ff.input :default_language,
+                 collection: [nil] + filterable_languages,
+                 hint: false,
+                 include_blank: false,
+                 label_method: ->(locale) { locale.nil? ? I18n.t('statuses.default_language') : native_locale_name(locale) },
+                 label: I18n.t('simple_form.labels.defaults.setting_default_language'),
+                 required: false,
+                 wrapper: :with_label
+
+    .fields-group
+      = ff.input :default_sensitive,
+                 hint: I18n.t('simple_form.hints.defaults.setting_default_sensitive'),
+                 label: I18n.t('simple_form.labels.defaults.setting_default_sensitive'),
+                 wrapper: :with_label
diff --git a/app/views/severed_relationships/_download.html.haml b/app/views/severed_relationships/_download.html.haml
new file mode 100644
index 00000000000..b1eb76c920c
--- /dev/null
+++ b/app/views/severed_relationships/_download.html.haml
@@ -0,0 +1,6 @@
+-# locals(count:, link:)
+
+- if count.zero?
+  = t('generic.none')
+- else
+  = table_link_to 'download', t('severed_relationships.download', count:), link
diff --git a/app/views/severed_relationships/_event.html.haml b/app/views/severed_relationships/_event.html.haml
new file mode 100644
index 00000000000..adc7752cb96
--- /dev/null
+++ b/app/views/severed_relationships/_event.html.haml
@@ -0,0 +1,14 @@
+-# locals(event:)
+
+%tr
+  %td
+    %time.formatted{ datetime: event.created_at.iso8601, title: l(event.created_at) }
+      = l(event.created_at)
+  %td= t("severed_relationships.event_type.#{event.type}", target_name: event.target_name)
+  - if event.purged?
+    %td{ rowspan: 2 }= t('severed_relationships.purged')
+  - else
+    %td
+      = render 'download', count: event.following_count, link: following_severed_relationship_path(event, format: :csv)
+    %td
+      = render 'download', count: event.followers_count, link: followers_severed_relationship_path(event, format: :csv)
diff --git a/app/views/severed_relationships/index.html.haml b/app/views/severed_relationships/index.html.haml
index cc9439b4681..d4ce658ca3d 100644
--- a/app/views/severed_relationships/index.html.haml
+++ b/app/views/severed_relationships/index.html.haml
@@ -13,24 +13,4 @@
           %th= t('severed_relationships.lost_follows')
           %th= t('severed_relationships.lost_followers')
       %tbody
-        - @events.each do |event|
-          %tr
-            %td
-              %time.formatted{ datetime: event.created_at.iso8601, title: l(event.created_at) }
-                = l(event.created_at)
-            %td= t("severed_relationships.event_type.#{event.type}", target_name: event.target_name)
-            - if event.purged?
-              %td{ rowspan: 2 }= t('severed_relationships.purged')
-            - else
-              %td
-                - count = event.following_count
-                - if count.zero?
-                  = t('generic.none')
-                - else
-                  = table_link_to 'download', t('severed_relationships.download', count: count), following_severed_relationship_path(event, format: :csv)
-              %td
-                - count = event.followers_count
-                - if count.zero?
-                  = t('generic.none')
-                - else
-                  = table_link_to 'download', t('severed_relationships.download', count: count), followers_severed_relationship_path(event, format: :csv)
+        = render partial: 'event', collection: @events
diff --git a/app/views/statuses/show.html.haml b/app/views/statuses/show.html.haml
index cc779f4370e..c530b77c331 100644
--- a/app/views/statuses/show.html.haml
+++ b/app/views/statuses/show.html.haml
@@ -3,6 +3,8 @@
 - content_for :header_tags do
   - if @account.user_prefers_noindex?
     %meta{ name: 'robots', content: 'noindex, noarchive' }/
+  - else
+    = render_seo_schema @status
 
   %link{ rel: 'alternate', type: 'application/json+oembed', href: api_oembed_url(url: short_account_status_url(@account, @status), format: 'json') }/
   %link{ rel: 'alternate', type: 'application/activity+json', href: ActivityPub::TagManager.instance.uri_for(@status) }/
diff --git a/app/views/user_mailer/warning.html.haml b/app/views/user_mailer/warning.html.haml
index fe8db974ee9..1509a55af81 100644
--- a/app/views/user_mailer/warning.html.haml
+++ b/app/views/user_mailer/warning.html.haml
@@ -35,11 +35,11 @@
               %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
                 %tr
                   %td.email-border-top
-                    - @statuses.each_with_index do |status, i|
+                    - @statuses.each do |status|
                       %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
                         %tr
                           %td.email-border-bottom.email-padding-24
-                            = render 'notification_mailer/status', status: status, i: i + 1, highlighted: true, time_zone: @resource.time_zone.presence
+                            = render 'notification_mailer/status', status: status, time_zone: @resource.time_zone.presence
 
             %table.email-w-full{ cellspacing: 0, cellpadding: 0, border: 0, role: 'presentation' }
               %tr
diff --git a/app/workers/activitypub/delivery_worker.rb b/app/workers/activitypub/delivery_worker.rb
index 7a1440ed15f..ade7175c9d5 100644
--- a/app/workers/activitypub/delivery_worker.rb
+++ b/app/workers/activitypub/delivery_worker.rb
@@ -5,8 +5,8 @@ class ActivityPub::DeliveryWorker
   include RoutingHelper
   include JsonLdHelper
 
+  STOPLIGHT_COOL_OFF_TIME = 60
   STOPLIGHT_FAILURE_THRESHOLD = 10
-  STOPLIGHT_COOLDOWN = 60
 
   sidekiq_options queue: 'push', retry: 16, dead: false
 
@@ -55,7 +55,7 @@ class ActivityPub::DeliveryWorker
   end
 
   def synchronization_header
-    "collectionId=\"#{account_followers_url(@source_account)}\", digest=\"#{@source_account.remote_followers_hash(@inbox_url)}\", url=\"#{account_followers_synchronization_url(@source_account)}\""
+    "collectionId=\"#{ActivityPub::TagManager.instance.followers_uri_for(@source_account)}\", digest=\"#{@source_account.remote_followers_hash(@inbox_url)}\", url=\"#{account_followers_synchronization_url(@source_account)}\""
   end
 
   def perform_request
@@ -75,9 +75,11 @@ class ActivityPub::DeliveryWorker
   end
 
   def stoplight_wrapper
-    Stoplight(@inbox_url)
-      .with_threshold(STOPLIGHT_FAILURE_THRESHOLD)
-      .with_cool_off_time(STOPLIGHT_COOLDOWN)
+    Stoplight(
+      @inbox_url,
+      cool_off_time: STOPLIGHT_COOL_OFF_TIME,
+      threshold: STOPLIGHT_FAILURE_THRESHOLD
+    )
   end
 
   def failure_tracker
diff --git a/app/workers/activitypub/fetch_all_replies_worker.rb b/app/workers/activitypub/fetch_all_replies_worker.rb
index 40b251cf148..128bfe7e8af 100644
--- a/app/workers/activitypub/fetch_all_replies_worker.rb
+++ b/app/workers/activitypub/fetch_all_replies_worker.rb
@@ -16,7 +16,9 @@ class ActivityPub::FetchAllRepliesWorker
   MAX_PAGES = (ENV['FETCH_REPLIES_MAX_PAGES'] || 500).to_i
 
   def perform(root_status_id, options = {})
+    @batch = WorkerBatch.new(options['batch_id'])
     @root_status = Status.remote.find_by(id: root_status_id)
+
     return unless @root_status&.should_fetch_replies?
 
     @root_status.touch(:fetched_replies_at)
@@ -45,6 +47,8 @@ class ActivityPub::FetchAllRepliesWorker
 
     # Workers shouldn't be returning anything, but this is used in tests
     fetched_uris
+  ensure
+    @batch.remove_job(jid)
   end
 
   private
@@ -53,6 +57,7 @@ class ActivityPub::FetchAllRepliesWorker
   #   status URI, or the prefetched body of the Note object
   def get_replies(status, max_pages, options = {})
     replies_collection_or_uri = get_replies_uri(status)
+
     return if replies_collection_or_uri.nil?
 
     ActivityPub::FetchAllRepliesService.new.call(value_or_id(status), replies_collection_or_uri, max_pages: max_pages, **options.deep_symbolize_keys)
@@ -78,9 +83,10 @@ class ActivityPub::FetchAllRepliesWorker
   # @param root_status_uri [String]
   def get_root_replies(root_status_uri, options = {})
     root_status_body = fetch_resource(root_status_uri, true)
+
     return if root_status_body.nil?
 
-    FetchReplyWorker.perform_async(root_status_uri, { **options.deep_stringify_keys, 'prefetched_body' => root_status_body })
+    FetchReplyWorker.perform_async(root_status_uri, { **options.deep_stringify_keys.except('batch_id'), 'prefetched_body' => root_status_body })
 
     get_replies(root_status_body, MAX_PAGES, options)
   end
diff --git a/app/workers/activitypub/followers_synchronization_worker.rb b/app/workers/activitypub/followers_synchronization_worker.rb
index 35a3ef0b967..e6c62e0cfb1 100644
--- a/app/workers/activitypub/followers_synchronization_worker.rb
+++ b/app/workers/activitypub/followers_synchronization_worker.rb
@@ -5,10 +5,10 @@ class ActivityPub::FollowersSynchronizationWorker
 
   sidekiq_options queue: 'push', lock: :until_executed
 
-  def perform(account_id, url)
+  def perform(account_id, url, expected_digest = nil)
     @account = Account.find_by(id: account_id)
     return true if @account.nil?
 
-    ActivityPub::SynchronizeFollowersService.new.call(@account, url)
+    ActivityPub::SynchronizeFollowersService.new.call(@account, url, expected_digest)
   end
 end
diff --git a/app/workers/activitypub/quote_request_worker.rb b/app/workers/activitypub/quote_request_worker.rb
new file mode 100644
index 00000000000..0540492f863
--- /dev/null
+++ b/app/workers/activitypub/quote_request_worker.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+class ActivityPub::QuoteRequestWorker < ActivityPub::RawDistributionWorker
+  def perform(quote_id)
+    @quote = Quote.find(quote_id)
+    @account = @quote.account
+
+    distribute!
+  rescue ActiveRecord::RecordNotFound
+    true
+  end
+
+  protected
+
+  def inboxes
+    @inboxes ||= [@quote.quoted_account&.inbox_url].compact
+  end
+
+  def payload
+    @payload ||= Oj.dump(serialize_payload(@quote, ActivityPub::QuoteRequestSerializer, signer: @account, allow_post_inlining: true))
+  end
+end
diff --git a/app/workers/activitypub/refetch_and_verify_quote_worker.rb b/app/workers/activitypub/refetch_and_verify_quote_worker.rb
index 0c7ecd9b2ac..e2df0231030 100644
--- a/app/workers/activitypub/refetch_and_verify_quote_worker.rb
+++ b/app/workers/activitypub/refetch_and_verify_quote_worker.rb
@@ -10,6 +10,7 @@ class ActivityPub::RefetchAndVerifyQuoteWorker
   def perform(quote_id, quoted_uri, options = {})
     quote = Quote.find(quote_id)
     ActivityPub::VerifyQuoteService.new.call(quote, fetchable_quoted_uri: quoted_uri, request_id: options[:request_id])
+    ::DistributionWorker.perform_async(quote.status_id, { 'update' => true }) if quote.state_previously_changed?
   rescue ActiveRecord::RecordNotFound
     # Do nothing
     true
diff --git a/app/workers/activitypub/status_update_distribution_worker.rb b/app/workers/activitypub/status_update_distribution_worker.rb
index a79ede2bf61..7f70fcaecc6 100644
--- a/app/workers/activitypub/status_update_distribution_worker.rb
+++ b/app/workers/activitypub/status_update_distribution_worker.rb
@@ -17,10 +17,10 @@ class ActivityPub::StatusUpdateDistributionWorker < ActivityPub::DistributionWor
 
   def activity
     ActivityPub::ActivityPresenter.new(
-      id: [ActivityPub::TagManager.instance.uri_for(@status), '#updates/', @status.edited_at.to_i].join,
+      id: [ActivityPub::TagManager.instance.uri_for(@status), '#updates/', @options[:updated_at]&.to_datetime&.to_i || @status.edited_at.to_i].join,
       type: 'Update',
       actor: ActivityPub::TagManager.instance.uri_for(@status.account),
-      published: @status.edited_at,
+      published: @options[:updated_at]&.to_datetime || @status.edited_at,
       to: ActivityPub::TagManager.instance.to(@status),
       cc: ActivityPub::TagManager.instance.cc(@status),
       virtual_object: @status
diff --git a/app/workers/concerns/bulk_mailing_concern.rb b/app/workers/concerns/bulk_mailing_concern.rb
index 5f8154d7fa6..98fcc0541df 100644
--- a/app/workers/concerns/bulk_mailing_concern.rb
+++ b/app/workers/concerns/bulk_mailing_concern.rb
@@ -7,7 +7,7 @@ module BulkMailingConcern
     job_class = ActionMailer::MailDeliveryJob
 
     Sidekiq::Client.push_bulk({
-      'class' => ActiveJob::QueueAdapters::SidekiqAdapter::JobWrapper,
+      'class' => Sidekiq::ActiveJob::Wrapper,
       'wrapped' => job_class,
       'queue' => mailer_class.deliver_later_queue_name,
       'args' => args_array.map do |args|
diff --git a/app/workers/fasp/account_search_worker.rb b/app/workers/fasp/account_search_worker.rb
index 745285c44de..12b000fa867 100644
--- a/app/workers/fasp/account_search_worker.rb
+++ b/app/workers/fasp/account_search_worker.rb
@@ -1,9 +1,7 @@
 # frozen_string_literal: true
 
-class Fasp::AccountSearchWorker
-  include Sidekiq::Worker
-
-  sidekiq_options queue: 'fasp', retry: 0
+class Fasp::AccountSearchWorker < Fasp::BaseWorker
+  sidekiq_options retry: 0
 
   def perform(query)
     return unless Mastodon::Feature.fasp_enabled?
@@ -17,11 +15,13 @@ class Fasp::AccountSearchWorker
     fetch_service = ActivityPub::FetchRemoteActorService.new
 
     account_search_providers.each do |provider|
-      Fasp::Request.new(provider).get("/account_search/v0/search?#{params}").each do |uri|
-        next if Account.where(uri:).any?
+      with_provider(provider) do
+        Fasp::Request.new(provider).get("/account_search/v0/search?#{params}").each do |uri|
+          next if Account.where(uri:).any?
 
-        account = fetch_service.call(uri)
-        async_refresh.increment_result_count(by: 1) if account.present?
+          account = fetch_service.call(uri)
+          async_refresh.increment_result_count(by: 1) if account.present?
+        end
       end
     end
   ensure
diff --git a/app/workers/fasp/announce_account_lifecycle_event_worker.rb b/app/workers/fasp/announce_account_lifecycle_event_worker.rb
index ea8544c24da..fc7fb235ea4 100644
--- a/app/workers/fasp/announce_account_lifecycle_event_worker.rb
+++ b/app/workers/fasp/announce_account_lifecycle_event_worker.rb
@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-class Fasp::AnnounceAccountLifecycleEventWorker
-  include Sidekiq::Worker
-
-  sidekiq_options queue: 'fasp', retry: 5
+class Fasp::AnnounceAccountLifecycleEventWorker < Fasp::BaseWorker
+  sidekiq_options retry: 5
 
   def perform(uri, event_type)
     Fasp::Subscription.includes(:fasp_provider).category_account.lifecycle.each do |subscription|
-      announce(subscription, uri, event_type)
+      with_provider(subscription.fasp_provider) do
+        announce(subscription, uri, event_type)
+      end
     end
   end
 
diff --git a/app/workers/fasp/announce_content_lifecycle_event_worker.rb b/app/workers/fasp/announce_content_lifecycle_event_worker.rb
index 744528f2d33..d4450a8aece 100644
--- a/app/workers/fasp/announce_content_lifecycle_event_worker.rb
+++ b/app/workers/fasp/announce_content_lifecycle_event_worker.rb
@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-class Fasp::AnnounceContentLifecycleEventWorker
-  include Sidekiq::Worker
-
-  sidekiq_options queue: 'fasp', retry: 5
+class Fasp::AnnounceContentLifecycleEventWorker < Fasp::BaseWorker
+  sidekiq_options retry: 5
 
   def perform(uri, event_type)
     Fasp::Subscription.includes(:fasp_provider).category_content.lifecycle.each do |subscription|
-      announce(subscription, uri, event_type)
+      with_provider(subscription.fasp_provider) do
+        announce(subscription, uri, event_type)
+      end
     end
   end
 
diff --git a/app/workers/fasp/announce_trend_worker.rb b/app/workers/fasp/announce_trend_worker.rb
index ae93c3d9f60..dc1d94a2712 100644
--- a/app/workers/fasp/announce_trend_worker.rb
+++ b/app/workers/fasp/announce_trend_worker.rb
@@ -1,16 +1,16 @@
 # frozen_string_literal: true
 
-class Fasp::AnnounceTrendWorker
-  include Sidekiq::Worker
-
-  sidekiq_options queue: 'fasp', retry: 5
+class Fasp::AnnounceTrendWorker < Fasp::BaseWorker
+  sidekiq_options retry: 5
 
   def perform(status_id, trend_source)
     status = ::Status.includes(:account).find(status_id)
     return unless status.account.indexable?
 
     Fasp::Subscription.includes(:fasp_provider).category_content.trends.each do |subscription|
-      announce(subscription, status.uri) if trending?(subscription, status, trend_source)
+      with_provider(subscription.fasp_provider) do
+        announce(subscription, status.uri) if trending?(subscription, status, trend_source)
+      end
     end
   rescue ActiveRecord::RecordNotFound
     # status might not exist anymore, in which case there is nothing to do
diff --git a/app/workers/fasp/backfill_worker.rb b/app/workers/fasp/backfill_worker.rb
index 4e30b71a7dd..228dcbc1d22 100644
--- a/app/workers/fasp/backfill_worker.rb
+++ b/app/workers/fasp/backfill_worker.rb
@@ -1,16 +1,16 @@
 # frozen_string_literal: true
 
-class Fasp::BackfillWorker
-  include Sidekiq::Worker
-
-  sidekiq_options queue: 'fasp', retry: 5
+class Fasp::BackfillWorker < Fasp::BaseWorker
+  sidekiq_options retry: 5
 
   def perform(backfill_request_id)
     backfill_request = Fasp::BackfillRequest.find(backfill_request_id)
 
-    announce(backfill_request)
+    with_provider(backfill_request.fasp_provider) do
+      announce(backfill_request)
 
-    backfill_request.advance!
+      backfill_request.advance!
+    end
   rescue ActiveRecord::RecordNotFound
     # ignore missing backfill requests
   end
diff --git a/app/workers/fasp/base_worker.rb b/app/workers/fasp/base_worker.rb
new file mode 100644
index 00000000000..fe7f0b0c00c
--- /dev/null
+++ b/app/workers/fasp/base_worker.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+class Fasp::BaseWorker
+  include Sidekiq::Worker
+
+  sidekiq_options queue: 'fasp'
+
+  private
+
+  def with_provider(provider)
+    return unless provider.available?
+
+    yield
+  rescue *Mastodon::HTTP_CONNECTION_ERRORS
+    raise if provider.available?
+  ensure
+    provider.update_availability!
+  end
+end
diff --git a/app/workers/fasp/follow_recommendation_worker.rb b/app/workers/fasp/follow_recommendation_worker.rb
index 5e760491bff..b0eb4e38bf4 100644
--- a/app/workers/fasp/follow_recommendation_worker.rb
+++ b/app/workers/fasp/follow_recommendation_worker.rb
@@ -1,9 +1,7 @@
 # frozen_string_literal: true
 
-class Fasp::FollowRecommendationWorker
-  include Sidekiq::Worker
-
-  sidekiq_options queue: 'fasp', retry: 0
+class Fasp::FollowRecommendationWorker < Fasp::BaseWorker
+  sidekiq_options retry: 0
 
   def perform(account_id)
     return unless Mastodon::Feature.fasp_enabled?
@@ -20,14 +18,16 @@ class Fasp::FollowRecommendationWorker
     fetch_service = ActivityPub::FetchRemoteActorService.new
 
     follow_recommendation_providers.each do |provider|
-      Fasp::Request.new(provider).get("/follow_recommendation/v0/accounts?#{params}").each do |uri|
-        next if Account.where(uri:).any?
+      with_provider(provider) do
+        Fasp::Request.new(provider).get("/follow_recommendation/v0/accounts?#{params}").each do |uri|
+          next if Account.where(uri:).any?
 
-        new_account = fetch_service.call(uri)
+          new_account = fetch_service.call(uri)
 
-        if new_account.present?
-          Fasp::FollowRecommendation.find_or_create_by(requesting_account: account, recommended_account: new_account)
-          async_refresh.increment_result_count(by: 1)
+          if new_account.present?
+            Fasp::FollowRecommendation.find_or_create_by(requesting_account: account, recommended_account: new_account)
+            async_refresh.increment_result_count(by: 1)
+          end
         end
       end
     end
diff --git a/app/workers/fetch_reply_worker.rb b/app/workers/fetch_reply_worker.rb
index ecb232bbbb0..4f11b75cc51 100644
--- a/app/workers/fetch_reply_worker.rb
+++ b/app/workers/fetch_reply_worker.rb
@@ -7,6 +7,9 @@ class FetchReplyWorker
   sidekiq_options queue: 'pull', retry: 3
 
   def perform(child_url, options = {})
-    FetchRemoteStatusService.new.call(child_url, **options.symbolize_keys)
+    batch  = WorkerBatch.new(options.delete('batch_id')) if options['batch_id']
+    result = FetchRemoteStatusService.new.call(child_url, **options.symbolize_keys)
+  ensure
+    batch&.remove_job(jid, increment: result&.previously_new_record?)
   end
 end
diff --git a/app/workers/local_notification_worker.rb b/app/workers/local_notification_worker.rb
index 749a54b73b0..e76572984df 100644
--- a/app/workers/local_notification_worker.rb
+++ b/app/workers/local_notification_worker.rb
@@ -17,6 +17,8 @@ class LocalNotificationWorker
     # should replace the previous ones.
     if type == 'update'
       Notification.where(account: receiver, activity: activity, type: 'update').in_batches.delete_all
+    elsif type == 'quoted_update'
+      Notification.where(account: receiver, activity: activity, type: 'quoted_update').in_batches.delete_all
     elsif Notification.where(account: receiver, activity: activity, type: type).any?
       return
     end
diff --git a/app/workers/mention_resolve_worker.rb b/app/workers/mention_resolve_worker.rb
index 8c5938aeaf1..d14adb3cf31 100644
--- a/app/workers/mention_resolve_worker.rb
+++ b/app/workers/mention_resolve_worker.rb
@@ -22,11 +22,7 @@ class MentionResolveWorker
   rescue Mastodon::UnexpectedResponseError => e
     response = e.response
 
-    if response_error_unsalvageable?(response)
-      # Give up
-    else
-      raise e
-    end
+    raise(e) unless response_error_unsalvageable?(response)
   end
 
   private
diff --git a/app/workers/move_worker.rb b/app/workers/move_worker.rb
index a18f38556bb..1a5745a86ae 100644
--- a/app/workers/move_worker.rb
+++ b/app/workers/move_worker.rb
@@ -81,7 +81,7 @@ class MoveWorker
 
   def copy_account_notes!
     AccountNote.where(target_account: @source_account).find_each do |note|
-      text = I18n.with_locale(note.account.user&.locale.presence || I18n.default_locale) do
+      text = I18n.with_locale(note.account.user_locale.presence || I18n.default_locale) do
         I18n.t('move_handler.copy_account_note_text', acct: @source_account.acct)
       end
 
@@ -104,7 +104,7 @@ class MoveWorker
 
   def carry_blocks_over!
     @source_account.blocked_by_relationships.where(account: Account.local).find_each do |block|
-      unless block.account.blocking?(@target_account) || block.account.following?(@target_account)
+      unless skip_block_move?(block)
         BlockService.new.call(block.account, @target_account)
         add_account_note_if_needed!(block.account, 'move_handler.carry_blocks_over_text')
       end
@@ -115,19 +115,29 @@ class MoveWorker
 
   def carry_mutes_over!
     @source_account.muted_by_relationships.where(account: Account.local).find_each do |mute|
-      MuteService.new.call(mute.account, @target_account, notifications: mute.hide_notifications) unless mute.account.muting?(@target_account) || mute.account.following?(@target_account)
-      add_account_note_if_needed!(mute.account, 'move_handler.carry_mutes_over_text')
+      unless skip_mute_move?(mute)
+        MuteService.new.call(mute.account, @target_account, notifications: mute.hide_notifications)
+        add_account_note_if_needed!(mute.account, 'move_handler.carry_mutes_over_text')
+      end
     rescue => e
       @deferred_error = e
     end
   end
 
   def add_account_note_if_needed!(account, id)
-    unless AccountNote.exists?(account: account, target_account: @target_account)
-      text = I18n.with_locale(account.user&.locale.presence || I18n.default_locale) do
-        I18n.t(id, acct: @source_account.acct)
-      end
-      AccountNote.create!(account: account, target_account: @target_account, comment: text)
+    return if AccountNote.exists?(account: account, target_account: @target_account)
+
+    text = I18n.with_locale(account.user_locale.presence || I18n.default_locale) do
+      I18n.t(id, acct: @source_account.acct)
     end
+    AccountNote.create!(account: account, target_account: @target_account, comment: text)
+  end
+
+  def skip_mute_move?(mute)
+    mute.account.muting?(@target_account) || mute.account.following?(@target_account)
+  end
+
+  def skip_block_move?(block)
+    block.account.blocking?(@target_account) || block.account.following?(@target_account)
   end
 end
diff --git a/app/workers/publish_scheduled_status_worker.rb b/app/workers/publish_scheduled_status_worker.rb
index 0ec081de917..bcf20b49431 100644
--- a/app/workers/publish_scheduled_status_worker.rb
+++ b/app/workers/publish_scheduled_status_worker.rb
@@ -9,7 +9,7 @@ class PublishScheduledStatusWorker
     scheduled_status = ScheduledStatus.find(scheduled_status_id)
     scheduled_status.destroy!
 
-    return true if scheduled_status.account.user.disabled?
+    return true if scheduled_status.account.user_disabled?
 
     PostStatusService.new.call(
       scheduled_status.account,
diff --git a/app/workers/redownload_avatar_worker.rb b/app/workers/redownload_avatar_worker.rb
index df17b7718dc..c4c659f73e8 100644
--- a/app/workers/redownload_avatar_worker.rb
+++ b/app/workers/redownload_avatar_worker.rb
@@ -20,10 +20,6 @@ class RedownloadAvatarWorker
   rescue Mastodon::UnexpectedResponseError => e
     response = e.response
 
-    if response_error_unsalvageable?(response)
-      # Give up
-    else
-      raise e
-    end
+    raise(e) unless response_error_unsalvageable?(response)
   end
 end
diff --git a/app/workers/redownload_header_worker.rb b/app/workers/redownload_header_worker.rb
index 3b142ec5f98..2d600e29641 100644
--- a/app/workers/redownload_header_worker.rb
+++ b/app/workers/redownload_header_worker.rb
@@ -20,10 +20,6 @@ class RedownloadHeaderWorker
   rescue Mastodon::UnexpectedResponseError => e
     response = e.response
 
-    if response_error_unsalvageable?(response)
-      # Give up
-    else
-      raise e
-    end
+    raise(e) unless response_error_unsalvageable?(response)
   end
 end
diff --git a/app/workers/redownload_media_worker.rb b/app/workers/redownload_media_worker.rb
index 343caa32c23..5342ec0b2d4 100644
--- a/app/workers/redownload_media_worker.rb
+++ b/app/workers/redownload_media_worker.rb
@@ -20,10 +20,6 @@ class RedownloadMediaWorker
   rescue Mastodon::UnexpectedResponseError => e
     response = e.response
 
-    if response_error_unsalvageable?(response)
-      # Give up
-    else
-      raise e
-    end
+    raise(e) unless response_error_unsalvageable?(response)
   end
 end
diff --git a/app/workers/remote_account_refresh_worker.rb b/app/workers/remote_account_refresh_worker.rb
index 9632936b547..5a4cbdf7260 100644
--- a/app/workers/remote_account_refresh_worker.rb
+++ b/app/workers/remote_account_refresh_worker.rb
@@ -15,10 +15,6 @@ class RemoteAccountRefreshWorker
   rescue Mastodon::UnexpectedResponseError => e
     response = e.response
 
-    if response_error_unsalvageable?(response)
-      # Give up
-    else
-      raise e
-    end
+    raise(e) unless response_error_unsalvageable?(response)
   end
 end
diff --git a/app/workers/scheduler/self_destruct_scheduler.rb b/app/workers/scheduler/self_destruct_scheduler.rb
index 645d9573215..d7aaef56e73 100644
--- a/app/workers/scheduler/self_destruct_scheduler.rb
+++ b/app/workers/scheduler/self_destruct_scheduler.rb
@@ -21,8 +21,9 @@ class Scheduler::SelfDestructScheduler
 
   def sidekiq_overwhelmed?
     redis_mem_info = Sidekiq.default_configuration.redis_info
+    maxmemory = [redis_mem_info['maxmemory'].to_f, redis_mem_info['total_system_memory'].to_f].filter(&:positive?).min
 
-    Sidekiq::Stats.new.enqueued > MAX_ENQUEUED || redis_mem_info['used_memory'].to_f > redis_mem_info['total_system_memory'].to_f * MAX_REDIS_MEM_USAGE
+    Sidekiq::Stats.new.enqueued > MAX_ENQUEUED || redis_mem_info['used_memory'].to_f > maxmemory * MAX_REDIS_MEM_USAGE
   end
 
   def delete_accounts!
diff --git a/app/workers/web/push_notification_worker.rb b/app/workers/web/push_notification_worker.rb
index 32279a9e74d..a1f4e46690c 100644
--- a/app/workers/web/push_notification_worker.rb
+++ b/app/workers/web/push_notification_worker.rb
@@ -15,6 +15,15 @@ class Web::PushNotificationWorker
 
     return if @notification.updated_at < TTL.ago
 
+    # Clean up old Web::PushSubscriptions that were added before validation of
+    # the endpoint and keys: #30542, #30540
+    unless @subscription.valid?
+      Rails.logger.debug { "Web::PushSubscription is invalid, removing: #{subscription_id}" }
+      @subscription.destroy!
+
+      return
+    end
+
     # Polymorphically associated activity could have been deleted
     # in the meantime, so we have to double-check before proceeding
     return unless @notification.activity.present? && @subscription.pushable?(@notification)
@@ -87,7 +96,7 @@ class Web::PushNotificationWorker
   end
 
   def web_push_request
-    @web_push_request || WebPushRequest.new(@subscription)
+    @web_push_request ||= WebPushRequest.new(@subscription)
   end
 
   def push_notification_json
diff --git a/config/cache_buster.yml b/config/cache_buster.yml
index 709c0eba887..09d6cfc6eaf 100644
--- a/config/cache_buster.yml
+++ b/config/cache_buster.yml
@@ -1,5 +1,5 @@
 shared:
   enabled: <%= ENV.fetch('CACHE_BUSTER_ENABLED', 'false') == 'true' %>
-  secret_header: <%= ENV.fetch('CACHE_BUSTER_SECRET_HEADER', nil) %>
-  secret: <%= ENV.fetch('CACHE_BUSTER_SECRET', nil) %>
+  secret_header: <%= ENV.fetch('CACHE_BUSTER_SECRET_HEADER', nil)&.to_json %>
+  secret: <%= ENV.fetch('CACHE_BUSTER_SECRET', nil)&.to_json %>
   http_method: <%= ENV.fetch('CACHE_BUSTER_HTTP_METHOD', 'GET') %>
diff --git a/config/email.yml b/config/email.yml
index a6d34c30068..f39aa2545ae 100644
--- a/config/email.yml
+++ b/config/email.yml
@@ -2,14 +2,14 @@
 # keys are added here.
 production:
   delivery_method: <%= ENV.fetch('SMTP_DELIVERY_METHOD', 'smtp') %>
-  from_address: <%= ENV.fetch('SMTP_FROM_ADDRESS', 'notifications@localhost') %>
-  reply_to: <%= ENV.fetch('SMTP_REPLY_TO', nil) %>
-  return_path: <%= ENV.fetch('SMTP_RETURN_PATH', nil) %>
+  from_address: <%= ENV.fetch('SMTP_FROM_ADDRESS', 'notifications@localhost')&.to_json %>
+  reply_to: <%= ENV.fetch('SMTP_REPLY_TO', nil)&.to_json %>
+  return_path: <%= ENV.fetch('SMTP_RETURN_PATH', nil)&.to_json %>
   smtp_settings:
     port: <%= ENV.fetch('SMTP_PORT', nil) %>
-    address: <%= ENV.fetch('SMTP_SERVER', nil) %>
-    user_name: <%= ENV.fetch('SMTP_LOGIN', nil) %>
-    password: <%= ENV.fetch('SMTP_PASSWORD', nil) %>
+    address: <%= ENV.fetch('SMTP_SERVER', nil)&.to_json %>
+    user_name: <%= ENV.fetch('SMTP_LOGIN', nil)&.to_json %>
+    password: <%= ENV.fetch('SMTP_PASSWORD', nil)&.to_json %>
     domain: <%= ENV.fetch('SMTP_DOMAIN', ENV.fetch('LOCAL_DOMAIN', nil)) %>
     authentication: <%= ENV.fetch('SMTP_AUTH_METHOD', 'plain') %>
     ca_file: <%= ENV.fetch('SMTP_CA_FILE', '/etc/ssl/certs/ca-certificates.crt') %>
@@ -22,9 +22,9 @@ production:
   bulk_mail:
     smtp_settings:
       port: <%= ENV.fetch('BULK_SMTP_PORT', nil) %>
-      address: <%= ENV.fetch('BULK_SMTP_SERVER', nil) %>
-      user_name: <%= ENV.fetch('BULK_SMTP_LOGIN', nil) %>
-      password: <%= ENV.fetch('BULK_SMTP_PASSWORD', nil) %>
+      address: <%= ENV.fetch('BULK_SMTP_SERVER', nil)&.to_json %>
+      user_name: <%= ENV.fetch('BULK_SMTP_LOGIN', nil)&.to_json %>
+      password: <%= ENV.fetch('BULK_SMTP_PASSWORD', nil)&.to_json %>
       domain: <%= ENV.fetch('BULK_SMTP_DOMAIN', ENV.fetch('LOCAL_DOMAIN', nil)) %>
       authentication: <%= ENV.fetch('BULK_SMTP_AUTH_METHOD', 'plain') %>
       ca_file: <%= ENV.fetch('BULK_SMTP_CA_FILE', '/etc/ssl/certs/ca-certificates.crt') %>
diff --git a/config/environments/development.rb b/config/environments/development.rb
index ca9e876e26b..79b491869cc 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -19,6 +19,9 @@ Rails.application.configure do
   # Enable server timing.
   config.server_timing = true
 
+  # Enable serving of images, stylesheets, and JavaScripts from an asset server.
+  config.asset_host = ENV['CDN_HOST'] if ENV['CDN_HOST'].present?
+
   # Enable/disable caching. By default caching is disabled.
   # Run rails dev:cache to toggle caching.
   if Rails.root.join('tmp', 'caching-dev.txt').exist?
diff --git a/config/i18n-tasks.yml b/config/i18n-tasks.yml
index 0dbc0873855..b934696bda6 100644
--- a/config/i18n-tasks.yml
+++ b/config/i18n-tasks.yml
@@ -72,6 +72,8 @@ ignore_unused:
   - 'preferences.other' # some locales are missing other keys, therefore leading i18n-tasks to detect `preferences` as plural and not finding use
   - 'edit_profile.other' # some locales are missing other keys, therefore leading i18n-tasks to detect `preferences` as plural and not finding use
   - 'admin.terms_of_service.generate' # temporarily disabled
+  - 'admin.username_blocks.matches_exactly_html'
+  - 'admin.username_blocks.contains_html'
 
 ignore_inconsistent_interpolations:
   - '*.one'
diff --git a/config/initializers/httplog.rb b/config/initializers/httplog.rb
index 7a009e84d1e..ea4e32c7b0f 100644
--- a/config/initializers/httplog.rb
+++ b/config/initializers/httplog.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-# Disable httplog in production unless log_level is `debug`
-if !Rails.env.production? || Rails.configuration.log_level == :debug
+# Disable in production unless log level is `debug`
+if Rails.env.local? || Rails.logger.debug?
   require 'httplog'
 
   HttpLog.configure do |config|
diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb
index d9a8f726639..1befe0a6ffd 100644
--- a/config/initializers/inflections.rb
+++ b/config/initializers/inflections.rb
@@ -27,6 +27,7 @@ ActiveSupport::Inflector.inflections(:en) do |inflect|
   inflect.acronym 'REST'
   inflect.acronym 'RSS'
   inflect.acronym 'StatsD'
+  inflect.acronym 'SEO'
   inflect.acronym 'TOC'
   inflect.acronym 'URL'
 
diff --git a/config/initializers/linzer.rb b/config/initializers/linzer.rb
index 119f65af17b..b21d405cd1b 100644
--- a/config/initializers/linzer.rb
+++ b/config/initializers/linzer.rb
@@ -5,24 +5,14 @@ require 'linzer/message/adapter/http_gem/response'
 
 module Linzer::Message::Adapter
   module ActionDispatch
-    class Response < Linzer::Message::Adapter::Abstract
-      def initialize(operation, **_options) # rubocop:disable Lint/MissingSuper
-        @operation = operation
-      end
-
-      def header(name)
-        @operation.headers[name]
-      end
-
-      def attach!(signature)
-        signature.to_h.each { |h, v| @operation.headers[h] = v }
-      end
+    class Response < Linzer::Message::Adapter::Generic::Response
+      private
 
       # Incomplete, but sufficient for FASP
-      def [](field_name)
-        return @operation.status if field_name == '@status'
-
-        @operation.headers[field_name]
+      def derived(name)
+        case name.value
+        when '@status' then @operation.status
+        end
       end
     end
   end
diff --git a/config/initializers/rack_attack.rb b/config/initializers/rack_attack.rb
index f558ee5fe0e..853b99d32fd 100644
--- a/config/initializers/rack_attack.rb
+++ b/config/initializers/rack_attack.rb
@@ -126,7 +126,7 @@ class Rack::Attack
   end
 
   throttle('throttle_email_confirmations/email', limit: 5, period: 30.minutes) do |req|
-    if req.post? && req.path_matches?('/auth/password')
+    if req.post? && req.path_matches?('/auth/confirmation')
       req.params.dig('user', 'email').presence
     elsif req.post? && req.path == '/api/v1/emails/confirmations'
       req.authenticated_user_id
diff --git a/config/initializers/settings_digests.rb b/config/initializers/settings_digests.rb
index 2a5d925c70d..85599ee1b0b 100644
--- a/config/initializers/settings_digests.rb
+++ b/config/initializers/settings_digests.rb
@@ -3,7 +3,7 @@
 Rails.application.config.to_prepare do
   custom_css = begin
     Setting.custom_css
-  rescue ActiveRecord::AdapterError # Running without a database, not migrated, no connection, etc
+  rescue # Running without a cache, database, not migrated, no connection, etc
     nil
   end
 
diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb
index 3c2f12780c0..7edaf38a60a 100644
--- a/config/initializers/sidekiq.rb
+++ b/config/initializers/sidekiq.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative '../../lib/mastodon/sidekiq_middleware'
+require_relative '../../lib/mastodon/worker_batch_middleware'
 
 Sidekiq.configure_server do |config|
   config.redis = REDIS_CONFIGURATION.sidekiq
@@ -72,14 +73,12 @@ Sidekiq.configure_server do |config|
 
   config.server_middleware do |chain|
     chain.add Mastodon::SidekiqMiddleware
-  end
-
-  config.server_middleware do |chain|
     chain.add SidekiqUniqueJobs::Middleware::Server
   end
 
   config.client_middleware do |chain|
     chain.add SidekiqUniqueJobs::Middleware::Client
+    chain.add Mastodon::WorkerBatchMiddleware
   end
 
   config.on(:startup) do
@@ -105,6 +104,7 @@ Sidekiq.configure_client do |config|
 
   config.client_middleware do |chain|
     chain.add SidekiqUniqueJobs::Middleware::Client
+    chain.add Mastodon::WorkerBatchMiddleware
   end
 
   config.logger.level = Logger.const_get(ENV.fetch('RAILS_LOG_LEVEL', 'info').upcase.to_s)
diff --git a/config/initializers/stoplight.rb b/config/initializers/stoplight.rb
index 0ade504f67b..c92a4693039 100644
--- a/config/initializers/stoplight.rb
+++ b/config/initializers/stoplight.rb
@@ -3,6 +3,8 @@
 require 'stoplight'
 
 Rails.application.reloader.to_prepare do
-  Stoplight.default_data_store = Stoplight::DataStore::Redis.new(RedisConnection.new.connection)
-  Stoplight.default_notifiers  = [Stoplight::Notifier::Logger.new(Rails.logger)]
+  Stoplight.configure do |config|
+    config.data_store = Stoplight::DataStore::Redis.new(RedisConnection.new.connection)
+    config.notifiers = [Stoplight::Notifier::Logger.new(Rails.logger)]
+  end
 end
diff --git a/config/locales/activerecord.az.yml b/config/locales/activerecord.az.yml
index e9ba86bc793..1f7f9375c91 100644
--- a/config/locales/activerecord.az.yml
+++ b/config/locales/activerecord.az.yml
@@ -1 +1,77 @@
+---
 az:
+  activerecord:
+    attributes:
+      poll:
+        expires_at: Son tarix
+        options: Seçimlər
+      user:
+        agreement: Xidmət razılaşması
+        email: E-poçt ünvanı
+        locale: Lokal
+        password: Parol
+      user/account:
+        username: İstifadəçi adı
+      user/invite_request:
+        text: Səbəb
+    errors:
+      attributes:
+        domain:
+          invalid: yararlı bir domen adı deyil
+      messages:
+        invalid_domain_on_line: "%{value} yararlı bir domen adı deyil"
+      models:
+        account:
+          attributes:
+            fields:
+              fields_with_values_missing_labels: əskik etiketli dəyərlər ehtiva edir
+            username:
+              invalid: yalnız hərf, rəqəm və altdan xətt ehtiva etməlidir
+              reserved: rezerv edilib
+        admin/webhook:
+          attributes:
+            url:
+              invalid: yararlı bir URL deyil
+        doorkeeper/application:
+          attributes:
+            website:
+              invalid: yararlı bir URL deyil
+        import:
+          attributes:
+            data:
+              malformed: yanlış formatdadır
+        list_account:
+          attributes:
+            account_id:
+              taken: artıq siyahıdadır
+          must_be_following: izlənilən bir hesab olmalıdır
+        status:
+          attributes:
+            reblog:
+              taken: göndərişi artıq mövcuddur
+        terms_of_service:
+          attributes:
+            effective_date:
+              too_soon: çox tezdir, %{date} tarixindən sonra olmalıdır
+        user:
+          attributes:
+            date_of_birth:
+              below_limit: yaş limitinin altındadır
+            email:
+              blocked: icazə verilməyən bir e-poçt provayderi istifadə edir
+              unreachable: mövcud olaraq görünmür
+            role_id:
+              elevated: hazırkı rolunuzdan yüksək ola bilməz
+        user_role:
+          attributes:
+            permissions_as_keys:
+              dangerous: təməl rol üçün güvənli olmayan icazələri ehtiva edir
+              elevated: hazırkı rolunuzun sahib olmadığı icazələri ehtiva edə bilməz
+              own_role: hazırkı rolunuzla dəyişdirilə bilməz
+            position:
+              elevated: hazırkı rolunuzdan yüksək ola bilməz
+              own_role: hazırkı rolunuzla dəyişdirilə bilməz
+        webhook:
+          attributes:
+            events:
+              invalid_permissions: hüquqlarınız olmayan tədbirləri ehtiva edə bilməz
diff --git a/config/locales/activerecord.be.yml b/config/locales/activerecord.be.yml
index f95fbd77d0e..3ddb3e328ed 100644
--- a/config/locales/activerecord.be.yml
+++ b/config/locales/activerecord.be.yml
@@ -3,7 +3,7 @@ be:
   activerecord:
     attributes:
       poll:
-        expires_at: Дэдлайн
+        expires_at: Скончыцца
         options: Выбар
       user:
         agreement: Пагадненне аб абслугоўванні
@@ -15,9 +15,16 @@ be:
       user/invite_request:
         text: Прычына
     errors:
+      attributes:
+        domain:
+          invalid: не з’яўляецца сапраўдным даменным імем
+      messages:
+        invalid_domain_on_line: "%{value} не пасуе для карэктнай назвы дамена"
       models:
         account:
           attributes:
+            fields:
+              fields_with_values_missing_labels: утрымлівае значэнні без апісанняў
             username:
               invalid: павінна змяшчаць толькі літары, лічбы і ніжнія падкрэсліванні
               reserved: зарэзервавана
@@ -37,18 +44,24 @@ be:
           attributes:
             account_id:
               taken: ужо ў спісе
-          must_be_following: мусіць быць падпісаным уліковым запісам
+          must_be_following: мусіць быць карыстальнікам у Вашых падпісках
         status:
           attributes:
             reblog:
               taken: гэтага допісу ўжо існуе
+        terms_of_service:
+          attributes:
+            effective_date:
+              too_soon: занадта рана, мусіць быць пасля %{date}
         user:
           attributes:
+            date_of_birth:
+              below_limit: ніжэй за дазволены ўзрост
             email:
               blocked: выкарыстоўвае забароненую крыніцу электроннай пошты
               unreachable: не існуе
             role_id:
-              elevated: не можа быць вышэй за вашу бягучую ролю
+              elevated: не можа быць вышэй за Вашу бягучую ролю
         user_role:
           attributes:
             permissions_as_keys:
@@ -56,7 +69,7 @@ be:
               elevated: не можа ўключыць дазволы, якімі не валодае ваша бягучая роля
               own_role: не можа быць зменены з вашай бягучай роляй
             position:
-              elevated: не можа быць вышэй за вашу бягучую ролю
+              elevated: не можа быць вышэй за Вашу бягучую ролю
               own_role: не можа быць зменены з вашай бягучай роляй
         webhook:
           attributes:
diff --git a/config/locales/activerecord.br.yml b/config/locales/activerecord.br.yml
index dc35f326ff0..d277fd41f84 100644
--- a/config/locales/activerecord.br.yml
+++ b/config/locales/activerecord.br.yml
@@ -8,19 +8,41 @@ br:
       user:
         agreement: Emglev gant ar servij
         email: Chomlec'h postel
-        locale: Lec'hel
+        locale: Yezh
         password: Ger-tremen
       user/account:
-        username: Anv
+        username: Anv implijer
       user/invite_request:
         text: Abeg
     errors:
+      attributes:
+        domain:
+          invalid: n'eo ket un anv domani talvoudek
+      messages:
+        invalid_domain_on_line: "%{value} n'eo ket un anv domani talvoudek"
       models:
         account:
           attributes:
             username:
               invalid: nemet lizherennoù, niverennoù hag isbarrennigoù
               reserved: a zo miret
+        admin/webhook:
+          attributes:
+            url:
+              invalid: n'eo ket un URL talvoudek
+        doorkeeper/application:
+          attributes:
+            website:
+              invalid: n'eo ket un URL talvoudek
+        import:
+          attributes:
+            data:
+              malformed: a zo stummet fall
+        list_account:
+          attributes:
+            account_id:
+              taken: a zo er listenn dija
+          must_be_following: a dle bezañ ur gont heuliet
         status:
           attributes:
             reblog:
diff --git a/config/locales/activerecord.en-GB.yml b/config/locales/activerecord.en-GB.yml
index 4e7f7b3e203..fe10c5c8a75 100644
--- a/config/locales/activerecord.en-GB.yml
+++ b/config/locales/activerecord.en-GB.yml
@@ -49,8 +49,14 @@ en-GB:
           attributes:
             reblog:
               taken: of post already exists
+        terms_of_service:
+          attributes:
+            effective_date:
+              too_soon: is too soon, must be later than %{date}
         user:
           attributes:
+            date_of_birth:
+              below_limit: is below the age limit
             email:
               blocked: uses a disallowed e-mail provider
               unreachable: does not seem to exist
diff --git a/config/locales/activerecord.eu.yml b/config/locales/activerecord.eu.yml
index 8b4235eb993..c0ac1bb338b 100644
--- a/config/locales/activerecord.eu.yml
+++ b/config/locales/activerecord.eu.yml
@@ -49,8 +49,14 @@ eu:
           attributes:
             reblog:
               taken: mezu honentzat bazegoen aurretik
+        terms_of_service:
+          attributes:
+            effective_date:
+              too_soon: goizegi da, %{date} baino geroagokoa izan behar da
         user:
           attributes:
+            date_of_birth:
+              below_limit: adinaren mugaren azpitik dago
             email:
               blocked: onartu gabeko e-posta hornitzaile bat erabiltzen du
               unreachable: dirudienez ez da existitzen
diff --git a/config/locales/activerecord.ia.yml b/config/locales/activerecord.ia.yml
index db0eb9c9abc..8d588ceec25 100644
--- a/config/locales/activerecord.ia.yml
+++ b/config/locales/activerecord.ia.yml
@@ -49,6 +49,10 @@ ia:
           attributes:
             reblog:
               taken: del message jam existe
+        terms_of_service:
+          attributes:
+            effective_date:
+              too_soon: es troppo tosto, debe esser plus tarde que %{date}
         user:
           attributes:
             date_of_birth:
diff --git a/config/locales/activerecord.ja.yml b/config/locales/activerecord.ja.yml
index 79a0cb29fea..156e537ddbc 100644
--- a/config/locales/activerecord.ja.yml
+++ b/config/locales/activerecord.ja.yml
@@ -19,7 +19,7 @@ ja:
         domain:
           invalid: 有効なドメイン名ではありません
       messages:
-        invalid_domain_on_line: "%{value} は有効なドメイン名ではありません"
+        invalid_domain_on_line: "%{value}は有効なドメイン名ではありません"
       models:
         account:
           attributes:
diff --git a/config/locales/activerecord.kab.yml b/config/locales/activerecord.kab.yml
index 8cdc6501cbb..8eb8ff24d02 100644
--- a/config/locales/activerecord.kab.yml
+++ b/config/locales/activerecord.kab.yml
@@ -39,6 +39,8 @@ kab:
               taken: n iddaden yellan yakan
         user:
           attributes:
+            date_of_birth:
+              below_limit: ddaw n talast n leɛmeṛ
             email:
               blocked: isseqdac asaǧǧaw n yimayl ur yettusirgen ara
               unreachable: ur d-ttban ara d akken yella
diff --git a/config/locales/activerecord.pl.yml b/config/locales/activerecord.pl.yml
index 62edc03c0ea..29cace6db53 100644
--- a/config/locales/activerecord.pl.yml
+++ b/config/locales/activerecord.pl.yml
@@ -49,8 +49,14 @@ pl:
           attributes:
             reblog:
               taken: status już istnieje
+        terms_of_service:
+          attributes:
+            effective_date:
+              too_soon: jest zbyt wcześnie, musi być później niż %{date}
         user:
           attributes:
+            date_of_birth:
+              below_limit: jest poniżej granicy wiekowej
             email:
               blocked: używa niedozwolonego dostawcy poczty elektronicznej
               unreachable: wydaje się nie istnieć
diff --git a/config/locales/activerecord.sk.yml b/config/locales/activerecord.sk.yml
index 68a9e447b90..1513142bd2f 100644
--- a/config/locales/activerecord.sk.yml
+++ b/config/locales/activerecord.sk.yml
@@ -4,7 +4,7 @@ sk:
     attributes:
       poll:
         expires_at: Trvá do
-        options: Voľby
+        options: Možnosti
       user:
         agreement: Dohoda o poskytovaní služieb
         email: E-mailová adresa
diff --git a/config/locales/activerecord.zh-CN.yml b/config/locales/activerecord.zh-CN.yml
index af19014cfd9..2aadcc8af92 100644
--- a/config/locales/activerecord.zh-CN.yml
+++ b/config/locales/activerecord.zh-CN.yml
@@ -44,7 +44,7 @@ zh-CN:
           attributes:
             account_id:
               taken: 已经被加入到列表了
-          must_be_following: 需要是你关注的账号
+          must_be_following: 必须是已关注的账号
         status:
           attributes:
             reblog:
diff --git a/config/locales/an.yml b/config/locales/an.yml
index 172799aec9e..4b9385d5f8f 100644
--- a/config/locales/an.yml
+++ b/config/locales/an.yml
@@ -1410,13 +1410,7 @@ an:
       reblog: Un boost no puede fixar-se
     title: "%{name}: «%{quote}»"
     visibilities:
-      direct: Directa
-      private: Nomás amostrar a seguidores
-      private_long: Nomás amostrar a las tuyas seguidores
       public: Publico
-      public_long: Totz pueden veyer
-      unlisted: Publico, pero no amostrar en a historia federada
-      unlisted_long: Totz pueden veyer, pero no ye listau en as linias de tiempo publicas
   statuses_cleanup:
     enabled: Borrar automaticament publicacions antigas
     enabled_hint: Elimina automaticament las tuyas publicacions una vegada que aconsigan un branquil de tiempo especificau, de no estar que coincidan con bella d'as excepcions detalladas debaixo
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index 2fe619a60c7..f48e9fc9ef9 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -215,6 +215,7 @@ ar:
         destroy_status: حذف المنشور
         destroy_unavailable_domain: حذف نطاق غير متوفر
         destroy_user_role: حذف الدور
+        destroy_username_block: حذف قاعدة اسم المستخدم
         disable_2fa_user: تعطيل 2FA
         disable_custom_emoji: تعطيل الإيموجي المخصص
         disable_relay: تعطيل خادم الترحيل
@@ -249,6 +250,7 @@ ar:
         update_report: تحديث التقرير
         update_status: تحديث المنشور
         update_user_role: تحديث الدور
+        update_username_block: تحديث قاعدة اسم المستخدم
       actions:
         approve_appeal_html: وافق %{name} على استئناف الطعن بشأن قرار الإشراف من %{target}
         approve_user_html: وافق %{name} على تسجيل %{target}
@@ -1157,6 +1159,24 @@ ar:
           zero: مستخدَم من قِبل %{count} شخص خلال الأسبوع الماضي
       title: التوصيات والرائجة
       trending: المتداولة
+    username_blocks:
+      add_new: إضافة جديد
+      block_registrations: حظر التسجيلات
+      comparison:
+        contains: يحتوي على
+        equals: يساوي
+      contains_html: تحوي %{string}
+      created_msg: تم إنشاء قاعدة اسم المستخدم بنجاح
+      delete: حذف
+      edit:
+        title: تعديل قاعدة اسم المستخدم
+      matches_exactly_html: تحوي %{string}
+      new:
+        create: إنشاء قاعدة
+        title: إنشاء قاعدة اسم مستخدم جديدة
+      not_permitted: غير مسموح به
+      title: قواعد اسم المستخدم
+      updated_msg: تم تحديث قاعدة اسم المستخدم بنجاح
     warning_presets:
       add_new: إضافة واحد جديد
       delete: حذف
@@ -1425,6 +1445,10 @@ ar:
     basic_information: معلومات أساسية
     hint_html: "<strong>قم بتخصيص ما سيراه الناس في ملفك الشخصي العام وبجوار منشوراتك.</strong> من المرجح أن يتابعك أشخاص آخرون ويتفاعلون معك إن كان لديك صفحة شخصية مملوء وصورة."
     other: أخرى
+  emoji_styles:
+    auto: تلقائي
+    native: محلي
+    twemoji: Twemoji
   errors:
     '400': الطلب الذي قدمته غير صالح أو أنّ شكله غير سليم.
     '403': ليس لك الصلاحيات الكافية لعرض هذه الصفحة.
@@ -1814,6 +1838,10 @@ ar:
       title: إشارة جديدة
     poll:
       subject: انتهى استطلاع %{name} للرأي
+    quote:
+      body: 'قام %{name} باقتباس منشورك:'
+      subject: اقتبس %{name} منشورا لك
+      title: اقتباس جديد
     reblog:
       body: 'قام %{name} بترقية منشورك:'
       subject: قام %{name} بإعادة نشر منشورك
@@ -1862,6 +1890,7 @@ ar:
       self_vote: لا يمكنك التصويت في استطلاعاتك الخاصة
       too_few_options: يجب أن يحتوي على أكثر من عنصر واحد
       too_many_options: لا يمكنه أن يحتوي أكثر مِن %{max} عناصر
+    vote: صَوّت
   preferences:
     other: إعدادات أخرى
     posting_defaults: التفضيلات الافتراضية للنشر
@@ -2040,6 +2069,7 @@ ar:
     edited_at_html: عُدّل في %{date}
     errors:
       in_reply_not_found: إنّ المنشور الذي تحاول الرد عليه غير موجود على ما يبدو.
+      quoted_status_not_found: لا يبدو أن المنشور الذي تحاول اقتباسه موجود.
     over_character_limit: تم تجاوز حد الـ %{max} حرف المسموح بها
     pin_errors:
       direct: لا يمكن تثبيت المنشورات التي يراها فقط المتسخدمون المشار إليهم
@@ -2047,18 +2077,16 @@ ar:
       ownership: لا يمكن تثبيت منشور نشره شخص آخر
       reblog: لا يمكن تثبيت إعادة نشر
     quote_policies:
-      followers: المتابعين والمستخدمين المذكورين
-      nobody: المستخدمين المذكورين فقط
-      public: الجميع
+      followers: للمتابِعين فقط
+      nobody: لي فقط
+      public: أيا كان
     title: '%{name}: "%{quote}"'
     visibilities:
-      direct: مباشرة
-      private: لمتابِعيك فقط
-      private_long: اعرضه لمتابعيك فقط
+      direct: إشارة خاصة
+      private: للمتابِعين فقط
       public: للعامة
-      public_long: يمكن للجميع رؤية منشوراتك
-      unlisted: غير مُدرَج
-      unlisted_long: يُمكن لأيٍ كان رُؤيتَه و لكن لن يُعرَض على الخيوط العامة
+      public_long: أي شخص على أو خارج ماستدون
+      unlisted: للعامة دون صخب
   statuses_cleanup:
     enabled: حذف المنشورات القديمة تلقائياً
     enabled_hint: حذف منشوراتك تلقائياً بمجرد أن تصل إلى عتبة عمرية محددة، إلا إذا كانت مطابقة لأحد الاستثناءات أدناه
diff --git a/config/locales/ast.yml b/config/locales/ast.yml
index c0836d33faf..e2bca6e8cb8 100644
--- a/config/locales/ast.yml
+++ b/config/locales/ast.yml
@@ -326,6 +326,9 @@ ast:
         all: A tol mundu
         disabled: A naide
         users: A los perfiles llocales
+      feed_access:
+        modes:
+          public: Tol mundu
       registrations:
         preamble: Controla quién pue crear una cuenta nel sirvidor.
         title: Rexistros
@@ -810,12 +813,6 @@ ast:
       ownership: Nun se pue fixar la publicación d'otru perfil
       reblog: Nun se pue fixar una publicación compartida
     title: "%{name}: «%{quote}»"
-    visibilities:
-      direct: Mensaxe direutu
-      private: Namás siguidores
-      private_long: Namás los ven los perfiles siguidores
-      public_long: Tol mundu pue velos
-      unlisted_long: Tol mundu pue velos, mas nun apaecen nes llinies de tiempu públiques
   statuses_cleanup:
     exceptions: Esceiciones
     interaction_exceptions: Esceiciones basaes nes interaiciones
diff --git a/config/locales/az.yml b/config/locales/az.yml
index e9ba86bc793..0fa11278cee 100644
--- a/config/locales/az.yml
+++ b/config/locales/az.yml
@@ -1 +1,345 @@
+---
 az:
+  about:
+    about_mastodon_html: 'Gələcəyin sosial şəbəkəsi: Reklam yoxdur, korporativ müşahidə yoxdur, etik dizayn və mərkəziyyətsizlik! Mastodon ilə öz verilərinizə sahib çıxın!'
+    contact_missing: Ayarlanmayıb
+    contact_unavailable: Mövcud deyil
+    title: Haqqında
+  admin:
+    account_actions:
+      title: "%{acct} üzərində moderasiya əməliyyatını icra et"
+    account_moderation_notes:
+      created_msg: Moderasiya notu uğurla yaradıldı!
+      destroyed_msg: Moderasiya notu uğurla məhv edildi!
+    accounts:
+      delete: Veriləri sil
+      destroyed_msg: "%{username} - verilərinin tezliklə silinməsi növbədədir"
+      display_name: Ekran adı
+      followers: İzləyicilər
+      follows: İzlənilənlər
+      moderation:
+        title: Moderasiya
+      moderation_notes: Moderasiya notları
+      most_recent_activity: Ən son fəaliyyət
+      most_recent_ip: Ən son IP
+      remote_suspension_irreversible: Bu hesabın veriləri geri qaytarılmayacaq şəkildə silinib.
+      remote_suspension_reversible_hint_html: Hesabın fəaliyyəti öz serverində dayandırılıb və verilər %{date} tarixində tamamilə silinəcək. O vaxta qədər, uzaq server hər hansısa mənfi təsir olmadan bu hesabı bərpa edə bilər. Hesabın bütün verilərini dərhal silmək istəyirsinizsə, bunu aşağıdan edə bilərsiniz.
+      resend_confirmation:
+        send: Təsdiq keçidini təkrar göndər
+      reset_password: Parolu sıfırla
+      security: Təhlükəsizlik
+      security_measures:
+        only_password: Yalnız parol
+        password_and_2fa: Parol və 2FA
+      suspension_irreversible: Bu hesabın veriləri geri qaytarılmayacaq şəkildə silinib. Hesabı istifadəyə yararlı etmək üçün hesab fəaliyyətinin dayandırılma prosesini ləğv edə bilərsiniz, ancaq daha əvvəl sahib olduğunuz heç bir veri geri qaytarılmayacaq.
+    action_logs:
+      action_types:
+        resend_user: Təsdiq poçtunu təkrar göndər
+        reset_password_user: Parolu sıfırla
+      actions:
+        approve_appeal_html: "%{name}, moderasiya qərarına %{target} tərəfindən verilən etirazı təsdiqlədi"
+        reject_appeal_html: "%{name}, moderasiya qərarına %{target} tərəfindən verilən etirazı rədd etdi"
+        reset_password_user_html: "%{name}, %{target} istifadəçisinin parolunu sıfırladı"
+      deleted_account: silinmiş hesab
+    dashboard:
+      media_storage: Media anbarı
+      software: Yazılım
+    domain_allows:
+      export: Xaricə köçür
+    domain_blocks:
+      export: Xaricə köçür
+    export_domain_blocks:
+      import:
+        title: Əngəllənən domenləri daxilə köçür
+      new:
+        title: Əngəllənən domenləri daxilə köçür
+    instances:
+      dashboard:
+        instance_followers_measure: oradakı izləyicilərimiz
+        instance_follows_measure: buradakı izləyiciləri
+      moderation:
+        title: Moderasiya
+      moderation_notes:
+        create: Moderasiya notu əlavə et
+        description_html: Notlara baxın, gələcəkdə özünüz və digər moderatorlar üçün notlar buraxın
+        title: Moderasiya notları
+    reports:
+      actions:
+        suspend_description_html: Hesab və onun bütün məzmunları əlçatmaz olacaq və nəticədə silinəcək və onunla əlaqə qurmaq mümkün olmayacaq. 30 gün ərzində geri qaytarıla bilər. Bu hesaba aid bütün hesabatları bağlayır.
+      assigned: Təyin edilmiş moderator
+      confirm_action: "@%{acct} üzərindəki moderasiya əməliyyatını təsdiqlə"
+      notes_description_html: Notlara baxın, gələcəkdə özünüz və digər moderatorlar üçün notlar buraxın
+      quick_actions_description_html: 'Cəld bir əməliyyat edin və ya bildirilən məzmuna baxmaq üçün aşağı diyirlərin:'
+    roles:
+      categories:
+        moderation: Moderasiya
+      privileges:
+        delete_user_data: İstifadəçi verilərini sil
+        delete_user_data_description: İstifadəçilərin, digər istifadəçilərin verilərini gecikmə olmadan silməsinə icazə verir
+        manage_appeals_description: İstifadəçilərin moderasiya əməliyyatlarına etdiyi etirazları incələməsinə icazə verir
+        manage_reports_description: İstifadəçilərin hesabatları incələməsinə və bunlara qarşı moderasiya əməliyyatlarını icra etməsinə icazə verir
+        manage_settings: Ayarları idarə et
+        manage_settings_description: İstifadəçilərin sayt ayarlarını dəyişdirməsinə icazə verir
+        manage_taxonomies_description: İstifadəçilərin trend məzmunu incələməsinə və mövzu etiketləri ayarlarını güncəlləməsinə icazə verir
+        manage_user_access: İstifadəçi erişimini idarə et
+        manage_user_access_description: İstifadəçilərin, digər istifadəçilərin iki faktorlu kimlik doğrulamasını sıradan çıxartmasına, onların e-poçt ünvanlarını dəyişdirməsinə və onların parolunu sıfırlamasına icazə verir
+        manage_users_description: İstifadəçilərin digər istifadəçilərin detallarını görməsinə və onlara qarşı moderasiya əməliyyatlarını icra etməsinə icazə verir
+        view_dashboard_description: İstifadəçilərin idarəetmə lövhəsinə və müxtəlif metriklərə erişməsinə icazə verir
+        view_devops_description: İstifadəçilərin Sidekiq və pgHero idarəetmə lövhələrinə erişməsinə icazə verir
+    settings:
+      appearance:
+        title: Görünüş
+      discovery:
+        public_timelines: Ümumi zaman xətləri
+        title: Kəşf et
+      registrations:
+        moderation_recommandation: Hər kəs üçün qeydiyyatı açmazdan əvvəl lütfən əmin olun ki, adekvat və reaktiv moderasiya komandanız var!
+      registrations_mode:
+        warning_hint: Moderasiya komandanızın spam və zərərli qeydiyyatları vaxtında idarə edə biləcəyinə əmin deyilsinizsə, “Qeydiyyat üçün təsdiq tələb olunur”dan istifadə etməyi tövsiyə edirik.
+      title: Server ayarları
+    statuses:
+      application: Tətbiq
+      metadata: Meta veri
+    system_checks:
+      elasticsearch_version_check:
+        message_html: 'Uyumlu olmayan Elasticsearch versiyası: %{value}'
+    tags:
+      updated_msg: Mövzu etiketi ayarları uğurla güncəlləndi
+    trends:
+      tags:
+        used_by_over_week:
+          one: Keçən həftə bir nəfər istifadə etdi
+          other: Keçən həftə %{count} nəfər istifadə etdi
+  admin_mailer:
+    auto_close_registrations:
+      body: Son vaxtlarda moderator fəaliyyətinin olmamasına görə, %{instance} üzərindəki qeydiyyatlar avtomatik olaraq manual yoxlanış tələb edəcək şəkildə dəyişdirilib, beləliklə %{instance} potensial zərərli aktyorlar tərəfindən istifadə edilən platforma çevrilməyəcək. İstənilən vaxt açıq qeydiyyat rejiminə qaytara bilərsiniz.
+    new_appeal:
+      body: "%{target}, %{date} tarixində %{action_taken_by} tərəfindən verilmiş %{type} moderasiya qərarına etiraz edir. Yazılanlar:"
+      next_steps: Moderasiya qərarını geri almaq üçün etirazı təsdiqləyə, ya da etirazı yox saya bilərsiniz.
+      subject: "%{username}, %{instance} üzərindəki bir moderasiya qərarına etiraz edir"
+  appearance:
+    advanced_web_interface: Qabaqcıl veb interfeys
+    advanced_web_interface_hint: 'Tam ekran enini istifadə etmək istəyirsinizsə, qabaqcıl veb interfeys, istədiyiniz qədər məlumatı eyni anda görə bilməyiniz üçün bir çox fərqli sütunu konfiqurasiya etməyinizə imkan verir: Əsas ekran, bildirişlər, birləşmiş zaman xətti, istənilən sayda siyahı və mövzu etiketləri.'
+    animations_and_accessibility: Animasiyalar və erişiləbilənlik
+    confirmation_dialogs: Təsdiq dialoq pəncərələri
+    discovery: Kəşf et
+    localization:
+      guide_link_text: Hər kəs töhfə verə bilər.
+    sensitive_content: Həssas məzmun
+  applications:
+    created: Tətbiq uğurla yaradıldı
+    destroyed: Tətbiq uğurla silindi
+    regenerate_token: Erişim tokenini təkrar yarat
+    token_regenerated: Erişim tokeni uğurla yaradıldı
+    your_token: Erişim tokeniniz
+  auth:
+    captcha_confirmation:
+      help_html: CAPTCHA-nı həll etməklə bağlı probleminiz varsa, %{email} üzərindən əlaqə saxlaya bilərsiniz, sizə kömək edə bilərik.
+      hint_html: Sadəcə bir şey qaldı! Sizin insan olduğunuzu təsdiqləməyimiz lazımdır (bunu spam-ları əngəlləmək üçün edirik). Aşağıdakı CAPTCHA-nı həll edib "Davam et"ə klikləyin.
+      title: Təhlükəsizlik yoxlanışı
+    confirmations:
+      wrong_email_hint: Əgər bu e-poçt ünvanı doğru deyilsə, hesab ayarlarında onu dəyişdirə bilərsiniz.
+    delete_account: Hesabı sil
+    delete_account_html: Hesabınızı silmək istəyirsinizsə, <a href="%{path}">buradan davam edə</a> bilərsiniz. Sizdən təsdiq etməyiniz soruşulacaq.
+    forgot_password: Parolunuzu unutmusunuz?
+    invalid_reset_password_token: Parol sıfırlama tokeni yararsızdır və ya vaxtı bitib. Lütfən yenisini tələb edin.
+    link_to_otp: Telefonunuzdan iki faktorlu kodu və ya bir geri qaytarma kodunu daxil edin
+    migrate_account: Fərqli bir hesaba daşı
+    migrate_account_html: Bu hesabı başqa bir hesaba yönləndirmək istəyirsinizsə, <a href="%{path}">burada konfiqurasiya edə</a> bilərsiniz.
+    resend_confirmation: Təsdiq keçidini təkrar göndər
+    reset_password: Parolu sıfırla
+    rules:
+      preamble: Bunlar, %{domain} moderatorları tərəfindən təyin edilib və tətbiq edilib.
+      preamble_invited: Davam etməzdən əvvəl, lütfən %{domain} moderatorları tərəfindən təyin edilmiş qaydaları nəzərdən keçirin.
+      title: Bəzi təməl qaydalar.
+    set_new_password: Yeni parol təyin et
+    setup:
+      email_below_hint_html: Spam qovluğunuzu yoxlayın, ya da başqasını tələb edin. Əgər yanlışdırsa, e-poçt ünvanınızı düzəldə bilərsiniz.
+      email_settings_hint_html: Mastodon istifadə etməyə başlamaq üçün %{email} ünvanına göndərdiyimiz keçidə klikləyin. Biz burada gözləyirik.
+      link_not_received: Keçidi almamısınız?
+      title: Gələn qutunuzu yoxlayın
+    sign_up:
+      preamble: Bu Mastodon serveri üzərindəki hesabla, hesabın yarada yerləşməsindən asılı olmayaraq fediverse-dəki istənilən şəxsi izləyə biləcəksiniz.
+      title: "%{domain} üzərində qeydiyyatınızı başladaq."
+    status:
+      account_status: Hesab statusu
+      functional: Hesabınız tamamilə işləkdir.
+      self_destruct: "%{domain} bağlandığı üçün, hesabınıza yalnız məhdud erişiminiz olacaq."
+  challenge:
+    hint_html: "<strong>İpucu:</strong> Sonrakı bir saat ərzində sizdən parolu soruşmayacağıq."
+    invalid_password: Yararsız parol
+    prompt: Davam etmək üçün parolu təsdiqlə
+  deletes:
+    confirm_password: Kimliyinizi doğrulamaq üçün hazırkı parolunuzu daxil edin
+    proceed: Hesabı sil
+    success_msg: Hesabınız uğurla silindi
+  edit_profile:
+    basic_information: Təməl məlumatlar
+    hint_html: "<strong>İnsanların hər kəsə açıq profilinizdə və göndərişlərinizin yanında nə göstərmək istədiyinizi özəlləşdirin.</strong> Doldurulmuş bir profilə və bir profil şəklinə sahib olduğunuz zaman digər şəxslərin sizi izləmə və sizinlə əlaqə qurma ehtimalı yüksəkdir."
+  exports:
+    archive_takeout:
+      hint_html: "<strong>Göndərişlərinizin və yüklədiyiniz medianın</strong> bir arxivini tələb edə bilərsiniz. Xaricə köçürülmüş verilər, istənilən uyumlu yazılım tərəfindən oxuna bilən ActivityPub formatında olacaq. Hər 7 gündə bir dəfə arxiv tələb edə bilərsiniz."
+    domain_blocks: Domen əngəlləmələri
+    storage: Media anbarı
+  filters:
+    contexts:
+      public: Ümumi zaman xətləri
+    edit:
+      statuses_hint_html: Bu filtr, aşağıdakı açar sözləri ilə uyuşmasından asılı olmayaraq fərdi göndərişləri seçmək üçün tətbiq olunur. <a href="%{path}">Göndərişləri incələyin və ya filtrdən silin</a>.
+    index:
+      contexts: "%{contexts} üzrə filtrlər"
+      empty: Filtriniz yoxdur.
+      title: Filtrlər
+  generic:
+    all_matching_items_selected_html:
+      one: Axtarışınızla uyuşan <strong>%{count}</strong> element seçilib.
+      other: Axtarışınızla uyuşan <strong>%{count}</strong> element seçilib.
+    order_by: Sırala
+    select_all_matching_items:
+      one: Axtarışınızla uyuşan <0>%{count}</0> elementi seçin.
+      other: Axtarışınızla uyuşan <0>%{count}</0> elementi seçin.
+  imports:
+    errors:
+      incompatible_type: Seçilmiş daxilə köçürmə növü ilə uyumlu deyil
+    preface: Başqa serverdən xaricə köçürdüyünüz veriləri (məsələn, izlədiyiniz və ya əngəllədiyiniz insanların siyahısını) daxilə köçürə bilərsiniz.
+    type_groups:
+      constructive: İzlənilənlər və Əlfəcinlər
+  invites:
+    max_uses_prompt: Limitsiz
+    prompt: Bu serverə erişim icazəsi vermək üçün keçid yaradın və başqaları ilə paylaşın
+    table:
+      uses: İstifadə
+  login_activities:
+    authentication_methods:
+      otp: iki faktorlu kimlik doğrulama tətbiqi
+      password: parol
+    description_html: Əgər tanımadığınız bir fəaliyyəti görsəniz, parolunuzu dəyişdirməyi və iki faktorlu kimlik doğrulamanı fəallaşdırmağı düşünə bilərsiniz
+  mail_subscriptions:
+    unsubscribe:
+      emails:
+        notification_emails:
+          reblog: təkrar paylaşma bildirişi e-poçtları
+  migrations:
+    incoming_migrations: Fərqli bir hesabdan daşı
+    incoming_migrations_html: Başqa bir hesabdan bu hesaba daşımaq üçün əvvəlcə <a href="%{path}">bir hesab alias-ı yaratmalısınız</a>.
+    proceed_with_move: İzləyiciləri daşı
+    warning:
+      disabled_account: Hazırkı hesabınız daha sonra istifadəyə yararsız olacaq. Ancaq, verilərin xaricə köçürülməsinə, həmçinin təkrar aktivləşdirmə prosesinə erişə biləcəksiniz.
+  moderation:
+    title: Moderasiya
+  notification_mailer:
+    reblog:
+      body: "%{name} göndərişinizi təkrar paylaşdı:"
+      subject: "%{name} göndərişinizi təkrar paylaşdı"
+      title: Yeni təkrar paylaşma
+  notifications:
+    administration_emails: Admin e-poçt bildirişləri
+    email_events: Fəaliyyətlər üçün e-poçt bildirişləri
+    email_events_hint: 'Bildiriş almaq istədiyiniz fəaliyyətləri seçin:'
+  otp_authentication:
+    description_html: Bir kimlik doğrulayıcı tətbiq istifadə edərək <strong>iki addımlı kimlik doğrulamanı</strong> fəallaşdırsanız, giriş etmək üçün telefonunuzun yanınızda olması tələb olunacaq, çünki daxil olmağınız üçün kodlar yaradılacaq.
+  preferences:
+    posting_defaults: Göndəriş ilkin ayarları
+    public_timelines: Ümumi zaman xətləri
+  relationships:
+    activity: Hesab fəaliyyəti
+    confirm_follow_selected_followers: Seçilmiş izləyicləri izləmək istədiyinizə əminsiniz?
+    confirm_remove_selected_followers: Seçilmiş izləyiciləri çıxartmaq istədiyinizə əminsiniz?
+    confirm_remove_selected_follows: Seçilmiş izləmələri çıxartmaq istədiyinizə əminsiniz?
+    dormant: Fəaliyyətsiz
+    follow_failure: Seçilmiş hesablardan bəziləri izlənilə bilmədi.
+    follow_selected_followers: Seçilmiş izləyiciləri izlə
+    followers: İzləyicilər
+    most_recent: Ən son
+    mutual: Ortaq
+    relationship: Münasibət
+    remove_selected_domains: Seçilmiş domenlərin bütün izləyicilərini çıxart
+    remove_selected_followers: Seçilmiş izləyiciləri çıxart
+    remove_selected_follows: Seçilmiş istifadəçiləri izləmədən çıxart
+    status: Hesab statusu
+  sessions:
+    browsers:
+      edge: Microsoft Edge
+    explanation: Bunlar, hazırda Mastodon hesabınıza giriş etmiş veb brauzerlərdir.
+    title: Seanslar
+    view_authentication_history: Hesabınızın kimlik doğrulama tarixçəsinə baxın
+  settings:
+    account_settings: Hesab ayarları
+    appearance: Görünüş
+    development: Gəlişdirmə
+    export: Xaricə köçür
+    import_and_export: Daxilə və xaricə köçürmə
+    notifications: E-poçt bildirişləri
+    relationships: İzlənilənlər və izləyicilər
+    severed_relationships: Kəsilmiş münasibətlər
+    statuses_cleanup: Göndərişin avtomatik silinməsi
+    strikes: Moderasiya pozuntuları
+    two_factor_authentication: İki faktorlu kimlik doğrulama
+  severed_relationships:
+    lost_followers: İtirilən izləyicilər
+    preamble: Bir domeni əngəllədiyiniz zaman və ya moderatorlarınız uzaq bir serverin fəaliyyətini dayandırmağa qərar verdiyi zaman izlədiklərinizi və izləyicilərinizi itirə bilərsiniz. Bu baş verdiyi zaman, kəsilmiş münasibətlərin bir siyahısını endirə, nəzərdən keçirə və bəlkə də başqa bir serverə köçürə biləcəksiniz.
+  statuses:
+    boosted_from_html: "%{acct_link} üzərindən təkrar paylaşdı"
+    default_language: İnterfeys dili ilə eyni
+    pin_errors:
+      reblog: Təkrar paylaşım, sancıla bilməz
+  statuses_cleanup:
+    enabled: Köhnə göndərişləri avtomatik sil
+    enabled_hint: Aşağıdakı istisnalardan heç birinə uyuşmadığı müddətcə, göndərişləriniz qeyd edilmiş yaş həddinə çatdıqda avtomatik silinir
+    exceptions: İstisnalar
+    explanation: Göndərişlərin silinməsi bahalı əməliyyat olduğu üçün, server çox məşğul olmadığı zaman bu proses yavaş-yavaş icra edilir. Bu səbəbdən, bəzi göndərişləriniz yaş həddinə çatdıqdan bir müddət sonra silinə bilər.
+    ignore_reblogs: Təkrar paylaşımları yox say
+    interaction_exceptions: Qarşılıqlı əlaqələrə əsaslanan istisnalar
+    interaction_exceptions_explanation: Nəzərə alın ki, bir göndəriş sevimlilərə əlavə edilmə və ya təkrar paylaşma həddini keçdikdən sonra həmin həddin altına düşsə belə, onun silinəcəyinə zəmanət verilmir.
+    keep_direct: Birbaşa mesajları saxla
+    keep_direct_hint: Birbaşa yazdığınız mesajların heç biri silinməyəcək
+    keep_media: Media qoşmaları olan göndərişləri saxla
+    keep_media_hint: Media qoşması olan göndərişlərinizdən heç biri silinməyəcək
+    keep_pinned: Sancaqlanmış göndərişləri saxla
+    keep_pinned_hint: Sancaqlanmış göndərişlərinizdən heç biri silinməyəcək
+    keep_polls: Anketləri saxla
+    keep_polls_hint: Anketlərinizdən heç biri silinməyəcək
+    keep_self_bookmark: Əlfəcinlərə əlavə etdiyiniz göndərişləri saxla
+    keep_self_bookmark_hint: Öz göndərişlərinizi əlfəcinlərə əlavə etmisinizsə silinməyəcək
+    keep_self_fav: Sevimlilərə əlavə etdiyiniz göndərişləri saxla
+    keep_self_fav_hint: Öz göndərişlərinizi sevimlilərə əlavə etmisinizsə silinməyəcək
+    min_age_label: Yaş həddi
+    min_reblogs: Bu həddən çox təkrar paylaşılan göndərişləri saxla
+    min_reblogs_hint: Bu sayda və ya daha çox təkrar paylaşma alan göndərişləriniz silinməyəcək. Təkrar paylaşılma sayından asılı olmayaraq göndərişlərin silinməsi üçün boş buraxın.
+  stream_entries:
+    sensitive_content: Həssas məzmun
+  tags:
+    does_not_match_previous_name: əvvəlki adla uyuşmur
+  two_factor_authentication:
+    disabled_success: İki faktorlu kimlik doğrulama uğurla sıradan çıxarıldı
+    enabled: İki faktorlu kimlik doğrulama fəallaşdırıldı
+    enabled_success: İki faktorlu kimlik doğrulama uğurla fəallaşdırıldı
+    generate_recovery_codes: Geri qaytarma kodlarını yarat
+    lost_recovery_codes: Geri qaytarma kodları, telefonunuzu itirdiyiniz halda hesabınıza yenidən erişməyinizə imkan verir. Geri qaytarma kodlarınızı itirsəniz, onları təkrar yarada bilərsiniz. Köhnə geri qaytarma kodlarınız yararsız sayılacaq.
+    recovery_codes: Geri qaytarma kodlarını nüsxələ
+    recovery_codes_regenerated: Geri qaytarma kodları uğurla yaradıldı
+    recovery_instructions_html: Telefonunuza erişə bilmirsinizsə, hesabınıza təkrar erişə bilmək üçün aşağıdakı geri qaytarma kodlarından birini istifadə edə bilərsiniz. <strong>Geri qaytarma kodlarını etibarlı yerdə saxlayın</strong>. Misal üçün, bunları çap edib digər vacib sənədlərin yanında saxlaya bilərsiniz.
+  user_mailer:
+    appeal_approved:
+      action: Hesab ayarları
+      explanation: "%{strike_date} tarixində hesabınıza qarşı tətbiq edilən cəza ilə bağlı %{appeal_date} tarixində göndərdiyiniz etirazınız təsdiqlənib. Hesabınız yenidən normal vəziyyətdədir."
+      subject: "%{date} tarixli etirazınız təsdiqlənib"
+      subtitle: Hesabınız yenidən normal vəziyyətdədir.
+      title: Etiraz təsdiqlənib
+    suspicious_sign_in:
+      change_password: parolu dəyişdir
+      subject: Hesabınıza yeni bir IP ünvanından erişildi
+    terms_of_service_changed:
+      title: Vacib güncəlləmə
+    warning:
+      explanation:
+        disable: Artıq hesabınızı istifadə edə bilməzsiniz, ancaq profiliniz və digər veriləriniz olduğu kimi qalacaq. Verilərinizin bir nüsxəsini tələb edə, hesab ayarlarınızı dəyişdirə və ya hesabınızı silə bilərsiniz.
+        suspend: Hesabınızı artıq istifadə edə bilməzsiniz, profiliniz və digər veriləriniz artıq əlçatmazdır. Təxminən 30 gün ərzində verilər tamamilə silinənə qədər verilərinizin bir nüsxəsini tələb etmək üçün hələ də hesabınıza giriş edə bilərsiniz, ancaq hesab fəaliyyətinin dayandırılması prosesini ləğv etməyinizi önləmək üçün bəzi təməl veriləri saxlayacağıq.
+    welcome:
+      edit_profile_step: Profilinizi tam dolduraraq qarşılıqlı əlaqələrinizi artırın.
+      feature_creativity: Mastodon özünüzü onlayn mühitdə ifadə etməyinizə kömək edəcək səs, video və şəkil göndərişləri, erişiləbilənlik açıqlamaları, anketlər, məzmun xəbərdarlıqları, animasiyalı avatarlar, özəl emojilər, kiçik şəkli kəsmə nəzarəti və daha çoxunu dəstəkləyir. Öz sənətinizi, musiqinizi və ya podkastınızı dərc edirsinizsə, Mastodon sizin üçün buradadır.
+      feature_moderation_title: Olmalı olduğu şəkildə moderasiya
+  users:
+    go_to_sso_account_settings: Kimlik provayderinizin hesab ayarlarına gedin
+    otp_lost_help_html: Hər ikisinə də erişə bilmirsinizsə, %{email} ilə əlaqə saxlayın
+    seamless_external_login: Xarici bir server üzərindən giriş etdiyiniz üçün parol və e-poçt ayarları mövcud deyil.
diff --git a/config/locales/be.yml b/config/locales/be.yml
index 978328ffd6c..ebbfb8bf6d7 100644
--- a/config/locales/be.yml
+++ b/config/locales/be.yml
@@ -12,22 +12,25 @@ be:
       many: Падпісчыкаў
       one: Падпісчык
       other: Падпісчыкі
-    following: Падпісаны
+    following: Падпіскі
     instance_actor_flash: Гэты ўліковы запіс - лічбавы аватар, неабходны для рэпрэзентацыі самога сервера, а не якой-небудзь асобы. Ён выкарыстоўваецца для федэралізацыі і не можа быць замарожаны.
     last_active: апошняя актыўнасць
     link_verified_on: Права ўласнасці на гэтую спасылку праверана %{date}
     nothing_here: Тут нічога няма!
     pin_errors:
-      following: Вы павінны быць падпісаны на чалавека, якога жадаеце рэкамендаваць
+      following: Трэба падпісацца на чалавека, якога вы хочаце рэкамендаваць
     posts:
       few: Допісы
       many: Допісаў
       one: Допіс
       other: Допісы
     posts_tab_heading: Допісы
+    self_follow_error: Нельга падпісацца на свой уліковы запіс
   admin:
     account_actions:
       action: Выканаць дзеянне
+      already_silenced: Гэты ўліковы запіс ужо абмежаваны.
+      already_suspended: Гэты ўліковы запіс ужо прыпыніў працу.
       title: Мадэраваць %{acct}
     account_moderation_notes:
       create: Пакінуць нататку
@@ -49,6 +52,7 @@ be:
         title: Змяніць адрас эл. пошты для %{username}
       change_role:
         changed_msg: Роля паспяхова зменена!
+        edit_roles: Наладзіць ролі карыстальнікаў
         label: Змяніць ролю
         no_role: Няма ролі
         title: Змяніць ролю для %{username}
@@ -87,9 +91,9 @@ be:
         remote: Адлеглы
         title: Месцазнаходжанне
       login_status: Стан уваходу
-      media_attachments: Медыя далучэнні
+      media_attachments: Медыя ўлажэнні
       memorialize: Даданае да памяці
-      memorialized: Запомненае
+      memorialized: Увекавечаны
       memorialized_msg: Уліковы запіс %{username} ператвораны ў мемарыяльны
       moderation:
         active: Актыўны
@@ -107,7 +111,7 @@ be:
       no_role_assigned: Роля не прызначана
       not_subscribed: Не падпісаны
       pending: Чакае праверкі
-      perform_full_suspension: Выключыць
+      perform_full_suspension: Прыпыніць
       previous_strikes: Ранейшыя скаргі
       previous_strikes_description_html:
         few: Гэты ўліковы запіс мае <strong>%{count}</strong> скаргі.
@@ -164,7 +168,7 @@ be:
       unconfirmed_email: Непацверджаны адрас эл. пошты
       undo_sensitized: Прыбраць прымусовую пазнаку далікатнасці
       undo_silenced: Адмяніць ліміт
-      undo_suspension: Разблакаваць карыстальніка
+      undo_suspension: Разблакіраваць карыстальніка
       unsilenced_msg: З уліковага запісу %{username} зняты абмежаванні
       unsubscribe: Адпісацца
       unsuspended_msg: Уліковы запіс %{username} адноўлены
@@ -189,9 +193,10 @@ be:
         create_domain_block: Стварыць даменны блок
         create_email_domain_block: Стварыць даменны блок электроннай пошты
         create_ip_block: Стварыць IP правіла
-        create_relay: Стварыць паўтор
+        create_relay: Стварыць рэтранслятар
         create_unavailable_domain: Стварыць недаступны Дамен
         create_user_role: Стварыць ролю
+        create_username_block: Стварыць правіла імя карыстальніка
         demote_user: Панізіць карыстальніка
         destroy_announcement: Выдаліць аб'яву
         destroy_canonical_email_block: Выдаліць блакіроўку электроннай пошты
@@ -201,22 +206,23 @@ be:
         destroy_email_domain_block: Выдаліць даменны блок электроннай пошты
         destroy_instance: Вычысціць дамен
         destroy_ip_block: Выдаліць IP правіла
-        destroy_relay: Выдаліць паўтор
+        destroy_relay: Выдаліць рэтранслятар
         destroy_status: Выдаліць допіс
         destroy_unavailable_domain: Выдаліць недаступны дамен
         destroy_user_role: Выдаліць ролю
+        destroy_username_block: Выдаліць правіла імя карыстальніка
         disable_2fa_user: Адключыць двухэтапнае спраўджанне
         disable_custom_emoji: Адключыць адвольныя эмодзі
-        disable_relay: Выключыць паўтор
+        disable_relay: Выключыць рэтранслятар
         disable_sign_in_token_auth_user: Адключыць аўтарызацыю праз электронную пошту для карыстальніка
         disable_user: Адключыць карыстальніка
         enable_custom_emoji: Уключыць адвольныя эмодзі
-        enable_relay: Уключыць паўтор
+        enable_relay: Уключыць рэтранслятар
         enable_sign_in_token_auth_user: Уключыць аўтарызацыю праз электронную пошту для карыстальніка
         enable_user: Уключыць карыстальніка
         memorialize_account: Запомніць уліковы запіс
         promote_user: Павысіць правы Карыстальніка
-        publish_terms_of_service: Апублікаваць Умовы выкарыстаньня
+        publish_terms_of_service: Апублікаваць умовы выкарыстання
         reject_appeal: Адхіліць абскарджанне
         reject_user: Адмовіць карыстальніку
         remove_avatar_user: Выдаліць аватар
@@ -226,19 +232,20 @@ be:
         resolve_report: Вырашыць скаргу
         sensitive_account: Уліковы запіс прымусова пазначаны як далікатны
         silence_account: Абмежаваць уліковы запіс
-        suspend_account: Выключыць уліковы запіс
+        suspend_account: Прыпыніць уліковы запіс
         unassigned_report: Прыбраць прызначэнне скаргі
         unblock_email_account: Разблакіраваць электронны адрас
         unsensitive_account: Прымусовая пазнака далікатнасці прыбраная
         unsilence_account: Уліковы запіс больш не абмежаваны
         unsuspend_account: Аднавіць уліковы запіс
-        update_announcement: Абнавіць аб'яву
+        update_announcement: Абнавіць аб’яву
         update_custom_emoji: Абнавіць адвольныя эмодзі
         update_domain_block: Актуалізаваць блакіроўку дамена
         update_ip_block: Абнавіць IP правіла
         update_report: Абнавіць скаргу
         update_status: Абнавіць допіс
         update_user_role: Абнавіць ролю
+        update_username_block: Абнавіць правіла імя карыстальніка
       actions:
         approve_appeal_html: Карыстальнік %{name} ухваліў запыт на мадэрацыю %{target}
         approve_user_html: "%{name} пацвердзіў рэгістрацыю ад %{target}"
@@ -254,34 +261,36 @@ be:
         create_domain_block_html: "%{name} заблакіраваў дамен %{target}"
         create_email_domain_block_html: "%{name} заблакіраваў дамен эл. пошты %{target}"
         create_ip_block_html: "%{name} стварыў правіла для IP %{target}"
-        create_relay_html: "%{name} стварыў(-а) паўтор %{target}"
+        create_relay_html: "%{name} стварыў(-ла) рэтранслятар %{target}"
         create_unavailable_domain_html: "%{name} прыпыніў дастаўку да дамена %{target}"
         create_user_role_html: "%{name} зрабіў ролю %{target}"
+        create_username_block_html: Адміністратар %{name} дадаў правіла для імён карыстальнікаў, у якіх %{target}
         demote_user_html: "%{name} прыбраў карыстальніка %{target}"
         destroy_announcement_html: "%{name} выдаліў аб'яву %{target}"
         destroy_canonical_email_block_html: "%{name} разблакіраваў эл. пошту з хэшам %{target}"
-        destroy_custom_emoji_html: "%{name} выдаліў(а) эмоджі %{target}"
-        destroy_domain_allow_html: "%{name} зняў дазвол на аб'яднанне з даменам %{target}\n"
+        destroy_custom_emoji_html: "%{name} выдаліў(-ла) эмодзі %{target}"
+        destroy_domain_allow_html: "%{name} зняў(-ла) дазвол на аб’яднанне з даменам %{target}"
         destroy_domain_block_html: "%{name} разблакаваў дамен %{target}"
         destroy_email_domain_block_html: "%{name} разблакіраваў дамен эл. пошты %{target}"
         destroy_instance_html: "%{name} цалкам прыбраў дамен %{target}"
         destroy_ip_block_html: "%{name} выдаліў правіла для IP %{target}"
-        destroy_relay_html: "%{name} выдаліў(-ла) паўтор %{target}"
+        destroy_relay_html: "%{name} выдаліў(-ла) рэтранслятар %{target}"
         destroy_status_html: "%{name} выдаліў допіс %{target}"
         destroy_unavailable_domain_html: "%{name} дазволіў працягнуць адпраўку на дамен %{target}"
         destroy_user_role_html: "%{name} выдаліў ролю %{target}"
+        destroy_username_block_html: Адміністратар %{name} прыбраў правіла для імён карыстальнікаў, у якіх %{target}
         disable_2fa_user_html: "%{name} амяніў абавязковую двухфактарную верыфікацыю для карыстальніка %{target}"
         disable_custom_emoji_html: "%{name} заблакіраваў эмодзі %{target}"
-        disable_relay_html: "%{name} выключыў(-ла) паўтор %{target}"
+        disable_relay_html: "%{name} выключыў(-ла) рэтранслятар %{target}"
         disable_sign_in_token_auth_user_html: "%{name} адключыў уваход праз эл. пошту для %{target}"
         disable_user_html: "%{name} адключыў уваход для карыстальніка %{target}"
         enable_custom_emoji_html: "%{name} уключыў эмодзі %{target}"
-        enable_relay_html: "%{name} уключыў(-ла) паўтор %{target}"
+        enable_relay_html: "%{name} уключыў(-ла) рэтранслятар %{target}"
         enable_sign_in_token_auth_user_html: "%{name} уключыў уваход праз эл. пошту для %{target}"
         enable_user_html: "%{name} уключыў уваход для карыстальніка %{target}"
         memorialize_account_html: Карыстальнік %{name} пераключыў уліковы запіс %{target} у старонку памяці
         promote_user_html: "%{name} павысіў карыстальніка %{target}"
-        publish_terms_of_service_html: "%{name} апублікаваў абнаўленьне ўмоваў абслугоўваньня"
+        publish_terms_of_service_html: "%{name} апублікаваў(-ла) абнаўленні ва ўмовах выкарыстання"
         reject_appeal_html: "%{name} адхіліў запыт на абскарджанне %{target}"
         reject_user_html: "%{name} адхіліў рэгістрацыю з %{target}"
         remove_avatar_user_html: "%{name} выдаліў аватар %{target}"
@@ -291,19 +300,20 @@ be:
         resolve_report_html: "%{name} вырашыў скаргу %{target}"
         sensitive_account_html: "%{name} адзначыў медыя %{target} як далікатнае"
         silence_account_html: "%{name} абмежаваў уліковы запіс %{target}"
-        suspend_account_html: Уліковы запіс %{target} выключаны %{name}
+        suspend_account_html: Уліковы запіс %{target} прыпынены %{name}
         unassigned_report_html: "%{name} знял(а) прызначэнне скаргі %{target}"
         unblock_email_account_html: "%{name} разблакіраваў эл. пошту %{target}"
         unsensitive_account_html: "%{name} зняў адзнаку далікатнае з медыя %{target}"
         unsilence_account_html: "%{name} зняў ліміт з уліковага запісу %{target}"
         unsuspend_account_html: Уліковы запіс %{target} адноўлены %{name}
-        update_announcement_html: "%{name} абнавіў аб'яву %{target}"
+        update_announcement_html: "%{name} абнавіў(-ла) аб’яву %{target}"
         update_custom_emoji_html: "%{name} абнавіў эмодзі %{target}"
         update_domain_block_html: "%{name} абнавіў блакіроўку дамена для %{target}"
         update_ip_block_html: "%{name} змяніў правіла для IP %{target}"
         update_report_html: "%{name} абнавіў скаргу %{target}"
         update_status_html: "%{name} абнавіў допіс %{target}"
         update_user_role_html: "%{name} змяніў ролю %{target}"
+        update_username_block_html: Адміністратар %{name} змяніў правіла для імён карыстальнікаў, у якіх %{target}
       deleted_account: выдалены ўліковы запіс
       empty: Логі не знойдзены.
       filter_by_action: Фільтраваць па дзеянню
@@ -311,7 +321,8 @@ be:
       title: Аўдыт
       unavailable_instance: "(імя дамена недаступнае)"
     announcements:
-      destroyed_msg: Аб'ява паспяхова выдалена!
+      back: Вярнуцца да аб'яў
+      destroyed_msg: Аб’ява выдалена!
       edit:
         title: Рэдагаваць абвестку
       empty: Не знайдзена ніводнай абвесткі
@@ -319,32 +330,36 @@ be:
       new:
         create: Стварыць аб'яву
         title: Новая аб'ява
+      preview:
+        disclaimer: Паколькі карыстальнікі не могуць адмовіцца ад іх, апавяшчэнні па электроннай пошце мусяць выкарыстоўвацца толькі для важных аб'яў, накшталт уцечкі асабістых дадзеных ці зачынення сервера.
+        explanation_html: 'Ліст будзе дасланы на электронную пошту <strong>%{display_count} карыстальнікам</strong>. У ім будзе наступнае:'
+        title: Перадпрагляд аб'явы апавяшчэння
       publish: Апублікаваць
       published_msg: Аб'ява паспяхова апублікавана!
       scheduled_for: Запланавана на %{time}
       scheduled_msg: Аб'ява запланавана да публікацыі!
       title: Аб'явы
       unpublish: Зняць з публікацыі
-      unpublished_msg: Аб'ява паспяхова схована!
-      updated_msg: Аб'ява паспяхова адноўлена!
+      unpublished_msg: Аб’ява схавана!
+      updated_msg: Аб’ява абноўлена!
     critical_update_pending: Чакаецца абнаўленне
     custom_emojis:
       assign_category: Прызначыць катэгорыю
       by_domain: Дамен
-      copied_msg: Лакальная копія эмодзі паспяхова створана
+      copied_msg: Створана лакальная копія эмодзі
       copy: Скапіраваць
       copy_failed_msg: Немагчыма зрабіць лакальную копію гэтага эмодзі
       create_new_category: Стварыць новую катэгорыю
       created_msg: Эмодзі паспяхова створана!
       delete: Выдаліць
-      destroyed_msg: Смайлік паспяхова прыбраны!
+      destroyed_msg: Уласнае эмодзі знішчана!
       disable: Адключыць
       disabled: Адключана
       disabled_msg: Смайлік паспяхова адключаны
       emoji: Эмодзі
       enable: Уключыць
       enabled: Уключана
-      enabled_msg: Смайлік паспяхова ўключаны
+      enabled_msg: Эмодзі паспяхова ўключана
       image_hint: PNG або GIF да %{size}
       list: Паказваць
       listed: Паказваецца
@@ -423,17 +438,17 @@ be:
       domain: Дамен
       edit: Рэдагаваць блакіраванне дамену
       existing_domain_block: Вы ўжо налажылі стражэйшыя абмежаванні на %{name}.
-      existing_domain_block_html: Вы ўжо налажылі стражэйшыя абмежаванні на %{name}, спачатку вам неабходна <a href="%{unblock_url}">разблакаваць гэты акаўнт</a>.
+      existing_domain_block_html: Вы ўжо наклалі больш строгія абмежаванні на %{name}, спачатку вам трэба <a href="%{unblock_url}">разблакіраваць гэты ўліковы запіс</a>.
       export: Экспарт
       import: Імпарт
       new:
         create: Стварыць блакіроўку
         hint: Блакіроўка дамена не будзе перашкаджаць стварэнню запісаў уліковых запісаў у базе даных, але будзе заднім лікам і аўтаматычна прымяняць да гэтых уліковых запісаў пэўныя метады мадэрацыі.
         severity:
-          desc_html: "<strong>Абмежаванне</strong> зробіць допісы людзей з гэтага дамену нябачнымі для тых, хто на іх не падпісаны. <strong>Выключэнне</strong> выдаліць усё змесціва, медыя і даныя профіляў дамену з вашага серверу. <strong>«Нічога»</strong> проста адхіліць медыя файлы."
+          desc_html: "<strong>Абмежаванне</strong> зробіць допісы людзей з гэтага дамену нябачнымі для тых, хто на іх не падпісаны. <strong>Выключэнне</strong> выдаліць усё змесціва, медыя і даныя ўліковых запісаў дамену з вашага серверу. <strong>«Нічога»</strong> проста адхіліць медыя файлы."
           noop: Пуста
           silence: Абмежаваць
-          suspend: Выключыць
+          suspend: Прыпыніць
         title: Новы блок дамену
       no_domain_block_selected: Блакіроўкі даменаў не былі змененыя, таму што ні адзін з іх не быў выбраны
       not_permitted: Вам забаронена выконваць гэта дзеянне
@@ -478,7 +493,7 @@ be:
       no_file: Файл не выбраны
     export_domain_blocks:
       import:
-        description_html: Вы збіраецеся імпартаваць спіс даменных блокаў. Калі ласка, праглядзіце гэты спіс вельмі ўважліва, асабліва калі вы асабіста не з'яўляецеся аўтарам гэтага спісу.
+        description_html: Вы збіраецеся імпартаваць спіс даменных блокаў. Праглядзіце гэты спіс вельмі ўважліва, асабліва калі вы асабіста не з’яўляецеся аўтарам гэтага спіса.
         existing_relationships_warning: Наяўныя зносіны
         private_comment_description_html: 'Каб дапамагчы вам адсочваць, адкуль паходзяць імпартаваныя блокі, імпартаваныя блокі будуць створаны з наступным прыватным каментарыем: <q>%{comment}</q>'
         private_comment_template: Імпартавана з %{source} %{date}
@@ -487,6 +502,36 @@ be:
       new:
         title: Імпарт блакіровак дамену
       no_file: Файл не выбраны
+    fasp:
+      debug:
+        callbacks:
+          created_at: Створана
+          delete: Выдаліць
+          ip: IP-адрас
+          request_body: Запытаць цела
+          title: Зрабіць дэбаг зваротных выклікаў
+      providers:
+        active: Актыўны
+        base_url: Базавы URL-адрас
+        callback: Зваротны выклік
+        delete: Выдаліць
+        edit: Рэдагаваць пастаўшчыка
+        finish_registration: Завяршыць рэгістрацыю
+        name: Назва
+        providers: Пастаўшчыкі
+        public_key_fingerprint: Лічбавы адбітак публічнага ключа
+        registration_requested: Патрабуюцца рэгістрацыя
+        registrations:
+          confirm: Пацвердзіць
+          description: Вы запыталі рэгістрацыю ад FASP. Адмоўцеся, калі Вы не рабілі гэтага. Калі ж Вы гэта зрабілі, то ўважліва параўнайце імя і ключ перад пацвярджэннем рэгістрацыі.
+          reject: Адхіліць
+          title: Пацвердзіць рэгістрацыю ў FASP
+        save: Захаваць
+        select_capabilities: Выбраць здольнасці
+        sign_in: Увайсці
+        status: Допіс
+        title: Дапаможныя серверы федэральнага сусвету
+      title: FASP
     follow_recommendations:
       description_html: "<strong>Рэкамендацыі падпісак, дапамогаюць новым карыстальнікам хутка знайсці цікавы кантэнт</strong>. Калі карыстальнік недастаткова ўзаемадзейнічаў з іншымі, каб сфарміраваць персанальныя рэкамендацыі прытрымлівацца, замест гэтага рэкамендуюцца гэтыя ўліковыя запісы. Яны штодзённа пераразлічваюцца з сумесі ўліковых запісаў з самымі апошнімі ўзаемадзеяннямі і найбольшай колькасцю мясцовых падпісчыкаў для дадзенай мовы."
       language: Для мовы
@@ -524,10 +569,10 @@ be:
         description_html: Вы можаце вызначыць палітыку кантэнту, якая будзе прымяняцца да ўсіх уліковых запісаў гэтага дамена і любога з яго субдаменаў.
         limited_federation_mode_description_html: Вы можаце выбраць ці дазволіць уваходзіць у федэрацыю з гэтым даменам.
         policies:
-          reject_media: Адхіліць мультымедыя
+          reject_media: Адхіліць медыя
           reject_reports: Адхіліць справаздачы
           silence: Ліміт
-          suspend: Выключыць
+          suspend: Прыпыніць
         policy: Палітыка
         reason: Публічная прычына
         title: Палітыкі кантэнту
@@ -537,7 +582,7 @@ be:
         instance_followers_measure: нашых падпісчыкаў там
         instance_follows_measure: іх падпісчыкаў тут
         instance_languages_dimension: Папулярныя мовы
-        instance_media_attachments_measure: захаваныя медыя-далучэнні
+        instance_media_attachments_measure: захаваныя медыя ўлажэнні
         instance_reports_measure: справаздач пра іх
         instance_statuses_measure: захаваных паведамленняў
       delivery:
@@ -561,6 +606,13 @@ be:
         all: Усе
         limited: Абмежаваныя
         title: Мадэрацыя
+      moderation_notes:
+        create: Дадаць нататку мадэратара
+        created_msg: Нататка мадэратара для экзэмпляра сервера створана!
+        description_html: Паглядзіце і пакіньце нататкі іншым мадэратарам або сабе ў будучыні
+        destroyed_msg: Нататка мадэратара экзэмпляра сервера выдалена!
+        placeholder: Інфармацыя пра гэты выпадак, прынятыя меры ці нешта яшчэ, што дапаможа Вам разабрацца з гэтым у будучыні.
+        title: Нататкі мадэратараў
       private_comment: Прыватны каментарый
       public_comment: Публічны каментарый
       purge: Ачысціць
@@ -570,7 +622,7 @@ be:
       total_followed_by_them: Іхнія падпіскі
       total_followed_by_us: Нашыя падпіскі
       total_reported: Скаргі на іх
-      total_storage: Медыя далучэнні
+      total_storage: Медыя ўлажэнні
       totals_time_period_hint_html: Паказаныя агульныя значэнні ніжэй уключаюць даныя за ўвесь час.
       unknown_instance: На дадзены момант няма запісаў аб гэтым дамене на гэтым серверы.
     invites:
@@ -601,7 +653,7 @@ be:
     relays:
       add_new: Дадаць новы рэтранслятар
       delete: Выдаліць
-      description_html: "<strong>Федэрацыйны рэтранслятар</strong> - гэта прамежкавы сервер, які абменьваецца вялікімі аб'ёмамі публічных паведамленняў паміж серверамі, якія падпісваюцца і публікуюць на ім. <strong>Гэта можа дапамагчы малым і сярэднім серверам выяўляць кантэнт з fediverse</strong>, для чаго лакальным карыстальнікам у адваротным выпадку трэба было б уручную сачыць за іншымі людзьмі на аддаленых серверах."
+      description_html: "<strong>Федэрацыйны рэтранслятар</strong> - гэта прамежкавы сервер, які абменьваецца вялікімі аб’ёмамі публічных паведамленняў паміж серверамі, якія падпісваюцца і робяць публікацыі на ім. <strong>Гэта можа дапамагчы малым і сярэднім серверам выяўляць змесціва з федэральнага сусвету</strong>, бо ў іншым выпадку лакальным карыстальнікам трэба было б уручную сачыць за іншымі людзьмі на аддаленых серверах."
       disable: Адключыць
       disabled: Адключана
       enable: Уключыць
@@ -635,11 +687,11 @@ be:
         suspend_description_html: Уліковы запіс і ўсё яго змесціва будзе недаступна і ў далейшым выдалены, узаемадзеянне з ім будзе немагчыма. Магчыма адмяніць на працягу 30 дзён. Закрывае ўсе скаргі на гэты ўліковы запіс.
       actions_description_html: Вырашыце, якія дзеянні распачаць, каб вырашыць гэтую скаргу. Калі вы прымеце меры пакарання ў дачыненні да ўліковага запісу, пра які паведамляецца, ім будзе адпраўлена апавяшчэнне па электроннай пошце, за выключэннем выпадкаў, калі выбрана катэгорыя <strong>Спам</strong>.
       actions_description_remote_html: Вырашыце як паступіць з гэтай скаргай. Гэта паўплывае толькі на тое як <strong>ваш</strong> сервер звязваецца з аддалёным уліковым запісам і апрацоўвае яго кантэнт.
-      actions_no_posts: У гэтай скаргі няма зьвязаных паведамленьняў для выдаленьня
+      actions_no_posts: Да гэтай скаргі не прывязаны допісы да выдалення
       add_to_report: Дадаць яшчэ дэталяў да скаргі
       already_suspended_badges:
-        local: Ужо прыпынена на гэтым сэрвэры
-        remote: Ужо прыпынена на іх сэрвэры
+        local: Ужо прыпынена на гэтым серверы
+        remote: Ужо прыпынена на іх серверы
       are_you_sure: Вы ўпэўнены?
       assign_to_self: Прызначыць мне
       assigned: Прызначаны мадэратар
@@ -655,7 +707,7 @@ be:
       created_at: Створана
       delete_and_resolve: Выдаліць допісы
       forwarded: Пераслана
-      forwarded_replies_explanation: Гэтае паведамленне паступіла ад выдаленага карыстальніка і дакранаецца выдаленага змесціва. Яно было накіраванае вам, бо змесціва паведамлення з'яўляецца адказам аднаму з вашых карыстальнікаў.
+      forwarded_replies_explanation: Гэтае паведамленне паступіла ад карыстальніка з іншага сервера і дакранаецца змесціва адтуль. Яно было накіраванае вам, бо змесціва паведамлення з'яўляецца адказам аднаму з вашых карыстальнікаў.
       forwarded_to: Пераслана на %{domain}
       mark_as_resolved: Пазначыць як вырашаную
       mark_as_sensitive: Пазначыць як далікатны
@@ -668,7 +720,7 @@ be:
         delete: Выдаліць
         placeholder: Апішыце, якія дзеянні былі зроблены, або любыя іншыя звязаныя абнаўленні...
         title: Нататкі
-      notes_description_html: Праглядвайце і пакідайце нататкі іншым мадэратарам і сабе ў будучыні
+      notes_description_html: Праглядайце і пакідайце нататкі для іншых мадэратараў і сябе ў будучыні
       processed_msg: 'Скарга #%{id} паспяхова апрацавана'
       quick_actions_description_html: 'Выканайце хуткае дзеянне або пракруціце ўніз, каб убачыць змесціва, на якое пададзена скарга:'
       remote_user_placeholder: аддалены карыстальнік з %{instance}
@@ -738,12 +790,12 @@ be:
         delete_user_data_description: Дазваляе карыстальнікам без затрымкі выдаляць даныя іншых карыстальнікаў
         invite_users: Запрашэнне карыстальнікаў
         invite_users_description: Дазваляе запрашаць новых людзей на сервер
-        manage_announcements: Кіраванне аб'явамі
-        manage_announcements_description: Дазваляе кіраваць аб'явамі на серверы
+        manage_announcements: Кіраванне аб’явамі
+        manage_announcements_description: Дазваляе кіраваць аб’явамі на серверы
         manage_appeals: Кіраванне апеляцыямі
         manage_appeals_description: Дазваляе карыстальнікам разглядаць апеляцыі на дзеянні мадэратара
         manage_blocks: Кіраванне блакіроўкамі
-        manage_blocks_description: Дазваляе блакаваць пэўныя паштовыя правайдэры і IP адрасы
+        manage_blocks_description: Дазваляе блакіраваць пэўных пастаўшчыкоў паслуг электроннай пошты і IP адрасы
         manage_custom_emojis: Кіраванне адвольнымі эмодзі
         manage_custom_emojis_description: Дазваляе кіраваць адвольнымі эмодзі на серверы
         manage_federation: Кіраваць федэрацыяй
@@ -775,17 +827,26 @@ be:
       title: Ролі
     rules:
       add_new: Дадаць правіла
+      add_translation: Дадаць пераклад
       delete: Выдаліць
       description_html: Большасць сцвярджаюць, што прачыталі ўмовы абслугоўвання і згаджаюцца з імі, але звычайна людзі не чытаюць іх да канца, пакуль не ўзнікне праблема. <strong>Таму зрабіце правілы вашага сервера простымі з першага погляду, прадставіўшы іх у выглядзе маркіраванага спісу.</strong> Старайцеся рабіць правілы кароткімі і простымі, але не разбіваць іх на шмат асобных пунктаў.
       edit: Рэдагаваць правіла
       empty: Правілы сервера яшчэ не вызначаны.
+      move_down: Перасунуць уніз
+      move_up: Перасунуць уверх
       title: Правілы сервера
+      translation: Пераклад
+      translations: Пераклады
+      translations_explanation: Вы можаце па жаданні дадаваць пераклады Вашых правіл. Калі перакладу няма, то пакажацца арыгінальная версія. Калі ласка, заўсёды правярайце, каб пераклад быў такім жа актуальным, як і арыгінал.
     settings:
       about:
         manage_rules: Кіраваць правіламі сервера
         preamble: Дайце падрабязную інфармацыю аб тым, як сервер працуе, мадэруецца, фінансуецца.
         rules_hint: Існуе спецыяльная вобласць для правілаў, якіх вашы карыстальнікі павінны прытрымлівацца.
         title: Пра нас
+      allow_referrer_origin:
+        desc: Калі Вашыя карыстальнікі націскаюць спасылкі на знешнія сайты, іх браўзер можа дасылаць адрас Вашага сервера Mastodon як крыніцу спасылкі. Адключыце гэту функцыю, калі яна ўнікальна ідэнтыфікуе Вашых карыстальнікаў (напрыклад, калі гэта персанальны сервер Mastodon).
+        title: Дазволіць знешнім сайтам бачыць Ваш сервер Mastodon як крыніцу трафіка
       appearance:
         preamble: Наладзьце вэб-інтэрфейс Mastodon.
         title: Выгляд
@@ -793,7 +854,7 @@ be:
         preamble: Брэндынг вашага сервера адрознівае яго ад іншых сервераў у сетцы. Гэтая інфармацыя можа адлюстроўвацца ў розных асяроддзях, напрыклад, у вэб-інтэрфейсе Mastodon, уласных праграмах, у папярэднім праглядзе спасылак на іншых вэб-сайтах і ў праграмах абмену паведамленнямі і гэтак далей. Па гэтай прычыне лепш трымаць гэтую інфармацыю яснай, кароткай і сціслай.
         title: Брэндынг
       captcha_enabled:
-        desc_html: Гэта функцыянальнасць залежыць ад знешніх скрыптоў hCaptcha, што можа быць праблемай бяспекі і прыватнасці. Акрамя таго, <strong>гэта можа зрабіць працэс рэгістрацыі значна менш даступным для некаторых людзей, асабліва інвалідаў</strong>. Па гэтых прычынах, калі ласка, разгледзьце альтэрнатыўныя меры, такія як рэгістрацыя на аснове зацвярджэння або запрашэння.
+        desc_html: Гэта функцыянальнасць залежыць ад знешніх скрыптоў hCaptcha, што можа быць праблемай бяспекі і прыватнасці. Акрамя таго, <strong>гэта можыць зменшыць даступнасць працэсу рэгістрацыі для некаторых людзей (асабліва інвалідаў)</strong>. Па гэтых прычынах, разгледзьце альтэрнатыўныя меры, такія як рэгістрацыя на аснове зацвярджэння або запрашэння.
         title: Патрабаваць ад новых карыстальнікаў рашэння CAPTCHA для пацверджання іх уліковага запісу
       content_retention:
         danger_zone: Небяспечная зона
@@ -805,15 +866,20 @@ be:
       discovery:
         follow_recommendations: Выконвайце рэкамендацыі
         preamble: Прадстаўленне цікавага кантэнту дапамагае прыцягнуць новых карыстальнікаў, якія могуць не ведаць нікога на Mastodon. Кантралюйце працу розных функцый выяўлення на вашым серверы.
+        privacy: Прыватнасць
         profile_directory: Дырэкторыя профіляў
         public_timelines: Публічная паслядоўнасць публікацый
         publish_statistics: Апублікаваць статыстыку
         title: Выяўленне
-        trends: Актуальныя
+        trends: Трэнды
       domain_blocks:
         all: Для ўсіх
         disabled: Нікому
         users: Лакальным карыстальнікам, якія ўвайшлі
+      feed_access:
+        modes:
+          authenticated: Толькі аўтэнтыфікаваныя карыстальнікі
+          public: Усе
       registrations:
         moderation_recommandation: Пераканайцеся, што ў вас ёсць адэкватная і аператыўная каманда мадэратараў, перш чым адчыняць рэгістрацыю для ўсіх жадаючых!
         preamble: Кантралюйце, хто можа ствараць уліковы запіс на вашым серверы.
@@ -854,7 +920,7 @@ be:
         add_to_report: 'Дадаць да скаргі #%{id}'
         remove_from_report: Выдаліць са справаздачы
         report: Справаздача
-      contents: Зьмест
+      contents: Змест
       deleted: Выдалены
       favourites: Упадабаныя
       history: Гісторыя версій
@@ -863,7 +929,7 @@ be:
       media:
         title: Медыя
       metadata: Метаданыя
-      no_history: Гэты пост не рэдагаваўся
+      no_history: Гэты допіс не рэдагаваўся
       no_status_selected: Ніводная публікацыя не была зменена, бо ніводная не была выбрана
       open: Адкрыць допіс
       original_status: Зыходны допіс
@@ -872,7 +938,7 @@ be:
       status_changed: Допіс зменены
       status_title: Допіс карыстальніка @%{name}
       title: Допісы карыстальніка - @%{name}
-      trending: Папулярныя
+      trending: Трэндавае
       view_publicly: Глядзець публічна
       visibility: Бачнасць
       with_media: З медыя
@@ -890,13 +956,15 @@ be:
       appeal_rejected: Абскарджанне адхілена
     system_checks:
       database_schema_check:
-        message_html: Ёсць незавершаныя міграцыі базы дадзеных. Калі ласка, запусціце іх, каб пераканацца, што дадатак паводзіць сябе належным чынам
+        message_html: Ёсць незавершаныя міграцыі базы даных. Запусціце іх, каб пераканацца, што праграма паводзіць сябе належным чынам
+      elasticsearch_analysis_index_mismatch:
+        message_html: Налады аналізатара індэксаў Elasticsearch пратэрмінаваныя. Калі ласка, запусціце <code>tootctl search deploy --only-mapping --only=%{value}</code>
       elasticsearch_health_red:
         message_html: Кластар Elasticsearch нездаровы (чырвоны статус), функцыі пошуку недаступныя
       elasticsearch_health_yellow:
         message_html: Кластар Elasticsearch нездаровы (жоўты статус), магчыма, неабходна высветліць прычыну
       elasticsearch_index_mismatch:
-        message_html: Супастаўленне індэксаў Elasticsearch састарэла. Калі ласка, выканайце каманду <code>tootctl search deploy --only=%{value}</code>
+        message_html: Супастаўленне індэксаў Elasticsearch састарэла. Выканайце каманду <code>tootctl search deploy --only=%{value}</code>
       elasticsearch_preset:
         action: Падрабязней у дакументацыі
         message_html: Ваш кластар Elasticsearch мае больш за адзін вузел, але Mastodon не наладжаны на іх выкарыстанне.
@@ -906,7 +974,7 @@ be:
       elasticsearch_reset_chewy:
         message_html: Ваш сістэмны індэкс Elasticsearch састарэлы з-за змены налад. Для яго абнаўлення выканайце каманду <code>tootctl search deploy --reset-chewy</code>.
       elasticsearch_running_check:
-        message_html: Немагчыма падключыцца да Elasticsearch. Калі ласка, праверце, што ён запушчаны, або адключыце паўнатэкставы пошук
+        message_html: Немагчыма падключыцца да Elasticsearch. Праверце, што ён запушчаны, або адключыце пошук па ўсім тэксце
       elasticsearch_version_check:
         message_html: 'Несумяшчальная версія Elasticsearch: %{value}'
         version_comparison: Elasticsearch %{running_version} выяўлены, але патрабуецца %{required_version}
@@ -916,11 +984,11 @@ be:
       sidekiq_process_check:
         message_html: Не працуе працэс Sidekiq для %{value} чаргі. Калі ласка праверце вашу канфігурацыю Sidekiq
       software_version_check:
-        action: Праверыць наяўнасьць абнаўленьняў
-        message_html: Даступна абнаўленьне Mastodon.
+        action: Праверыць наяўнасць абнаўленняў
+        message_html: Даступна абнаўленне Mastodon.
       software_version_critical_check:
         action: Прагледзець даступныя абнаўленні
-        message_html: Даступна крытычнае абнаўленне Mastodon, калі ласка, зрабіце абнаўленне як мага хутчэй.
+        message_html: Даступна крытычнае абнаўленне Mastodon, абнавіцеся як мага хутчэй.
       software_version_patch_check:
         action: Прагледзець даступныя абнаўленні
         message_html: Даступна абнаўленне Mastodon з выпраўленнем памылак.
@@ -932,13 +1000,13 @@ be:
         message_html: "<strong>Ваша сховішча не наладжана. Прыватнасць карыстальнікаў пад пагрозай.</strong>"
     tags:
       moderation:
-        not_trendable: Не ў трэндзе
+        not_trendable: Не можа трапіць у трэнды
         not_usable: Непрыгодныя
         pending_review: Чакае праверкі
         review_requested: Патрабуюць прагледжвання
         reviewed: Прагледжаныя
         title: Стан
-        trendable: У трэндзе
+        trendable: Можа трапіць у трэнды
         unreviewed: Непрагледжаныя
         usable: Прыгодныя
       name: Назва
@@ -951,22 +1019,51 @@ be:
       title: Хэштэгі
       updated_msg: Налады хэштэгаў паспяхова змененыя
     terms_of_service:
-      back: Вернуцца да ўмоваў абслугоўваньня
-      changelog: Што зьмянілася
-      create: Выкарыстоўвайце свой уласны
-      current: Цякучы
+      back: Вернуцца да ўмоў выкарыстання
+      changelog: Што змянілася
+      create: Выкарыстоўвайце свой тэкст
+      current: Бягучыя
       draft: Чарнавік
       generate: Выкарыстаць шаблон
       generates:
-        action: Зґенераваць
+        action: Згенерыраваць
+        chance_to_review_html: "<strong>Аўтаматычна згенераваныя ўмовы карыстання не будуць аўтаматычна апублікаваныя.</strong> У Вас будзе магчымасць паглядзець на вынікі. Калі ласка, дайце неабходныя дэталі, каб працягнуць."
+        explanation_html: Узор умоў карыстання прадстаўлены выключна з інфармацыйнай мэтай і не павінен успрымацца як юрыдычная кансультацыя ні ў якім пытанні. Калі ласка, правядзіце размову з Вашым уласным юрыдычным кансультантам па Вашай сітуацыі і Вашых канкрэтных юрыдычных пытаннях.
+        title: Стварэнне ўмоў карыстання
+      going_live_on_html: Уступяць у сілу %{date}
+      history: Гісторыя
+      live: Дзейнічае
+      no_history: Пакуль не заўважана ніякіх змен ва ўмовах пагаднення.
+      no_terms_of_service_html: У Вас пакуль няма ніякіх умоў карыстання. Умовы карыстання ствараюцца для яснасці і абароны ад патэнцыяльных абавязкаў у спрэчках з Вашымі карыстальнікамі.
+      notified_on_html: Карыстальнікам паведамяць %{date}
+      notify_users: Апавясціць карыстальнікаў
+      preview:
+        explanation_html: 'Электронны ліст будзе дасланы <strong>%{display_count} карыстальнікам</strong>, якія зарэгістраваліся да %{date}. У лісце будзе наступны тэкст:'
+        send_preview: Адправіць на %{email} для перадпрагляду
+        send_to_all:
+          few: Адправіць %{display_count} электронныя лісты
+          many: Адправіць %{display_count} электронных лістоў
+          one: Адправіць %{display_count} электронны ліст
+          other: Адправіць %{display_count} электронных лістоў
+        title: Перадпрагляд апавяшчэння пра ўмовы карыстання
+      publish: Апублікаваць
+      published_on_html: Апублікавана %{date}
+      save_draft: Захаваць чарнавік
+      title: Умовы выкарыстання
     title: Адміністрацыя
     trends:
       allow: Дазволіць
       approved: Пацверджаны
+      confirm_allow: Вы ўпэўнены, што хочаце дазволіць выбраныя тэгі?
+      confirm_disallow: Вы ўпэўненыя, што хочаце забараніць абраныя хэштэгі?
       disallow: Забараніць
       links:
         allow: Дазволіць спасылка
         allow_provider: Дазволіць выдаўца
+        confirm_allow: Вы ўпэўненыя, што хочаце дазволіць абраныя спасылкі?
+        confirm_allow_provider: Вы ўпэўненыя, што хочаце дазволіць абраныя спасылкі?
+        confirm_disallow: Вы ўпэўненыя, што хочаце забараніць абраныя спасылкі?
+        confirm_disallow_provider: Вы ўпэўненыя, што хочаце забараніць абраныя серверы?
         description_html: Гэта спасылкі, якія зараз часта распаўсюджваюцца ўліковымі запісамі, з якіх ваш сервер бачыць паведамленні. Гэта можа дапамагчы вашым карыстальнікам даведацца, што адбываецца ў свеце. Ніякія спасылкі не будуць паказвацца публічна, пакуль вы не зацвердзіце аўтара. Вы таксама можаце дазволіць або адхіліць асобныя спасылкі.
         disallow: Забараніць спасылку
         disallow_provider: Дазволіць выдаўца
@@ -978,20 +1075,24 @@ be:
           many: Абагулілі %{count} чалавек за апошні тыдзень
           one: Абагуліў адзін чалавек за апошні тыдзень
           other: Абагулілі %{count} чалавек за апошні тыдзень
-        title: Актуальныя спасылкі
+        title: Трэндавыя спасылкі
         usage_comparison: Выкарыстоўвалася %{today} разоў сёння, у параўнанні з %{yesterday} учора
-      not_allowed_to_trend: Забаронена выходзіць у актуальныя
+      not_allowed_to_trend: Забаронена выходзіць у трэнды
       only_allowed: Толькі дазволенае
       pending_review: Чакае праверкі
       preview_card_providers:
         allowed: Спасылкі ад гэтага выдаўца не будуць у трэндзе
         description_html: Спасылкі з гэтых даменаў часта абагульняюцца на вашым серверы. Спасылкі не трапяць у публічныя трэнды, калі дамен спасылкі не ўхвалены. Вашае ўхваленне (ці адхіленне) распаўсюдзіцца на субдамены.
-        rejected: Спасылкі ад гэтага выдаўца не будуць у трэнде
+        rejected: Спасылкі ад гэтага выдаўца не будуць у трэндзе
         title: Выдаўцы
       rejected: Адхілена
       statuses:
         allow: Дазволіць допіс
         allow_account: Дазволіць аўтара
+        confirm_allow: Вы ўпэўненыя, што хочаце дазволіць абраныя допісы?
+        confirm_allow_account: Вы ўпэўненыя, што хочаце дазволіць абраныя ўліковыя запісы?
+        confirm_disallow: Вы ўпэўненыя, што хочаце забараніць абраныя допісы?
+        confirm_disallow_account: Вы ўпэўненыя, што хочаце забараніць абраныя ўліковыя запісы?
         description_html: Гэта допісы, пра якія ведае ваш сервер, што на дадзены момант часта абагульваюцца і падабаюцца людзям. Гэта можа дапамагчы вашым новым і пастаянным карыстальнікам знайсці больш людзей, на якіх можна падпісацца. Ніякія допісы не будуць паказвацца публічна, пакуль вы не зацвердзіце аўтара, а аўтар не дазволіць прапанаваць свой уліковы запіс іншым. Вы таксама можаце дазволіць або адхіліць асобныя допісы.
         disallow: Забараніць допіс
         disallow_account: Забараніць аўтара
@@ -1002,7 +1103,7 @@ be:
           many: Пашыраны або ўпадабаны %{friendly_count} разоў
           one: Пашыраны або ўпадабаны %{friendly_count} раз
           other: Пашыраны або ўпадабаны %{friendly_count} разоў
-        title: Актуальныя допісы
+        title: Трэндавыя допісы
       tags:
         current_score: Бягучы рэзультат %{score}
         dashboard:
@@ -1015,11 +1116,11 @@ be:
         listable: Можа быць прапанавана
         no_tag_selected: Ніводны тэг не быў зменены, бо ніводны не быў выбраны
         not_listable: Не будзе прапанавана
-        not_trendable: Не з'явіцца ў трэндах
+        not_trendable: Не з’явіцца сярод трэндаў
         not_usable: Немагчыма выкарыстаць
         peaked_on_and_decaying: На піку %{date}, зараз спадае
         title: Актуальныя хэштэгі
-        trendable: Можа з'явіцца сярод трэндаў
+        trendable: Можа з’явіцца сярод трэндаў
         trending_rank: 'Папулярнае #%{rank}'
         usable: Магчыма выкарыстаць
         usage_comparison: Выкарыстоўвалася %{today} разоў сёння, у параўнанні з %{yesterday} учора
@@ -1029,7 +1130,26 @@ be:
           one: Выкарыстаў адзін чалавек за апошні тыдзень
           other: Выкарысталі %{count} чалавек за апошні тыдзень
       title: Рэкамендацыі і трэнды
-      trending: Папулярныя
+      trending: Трэндавае
+    username_blocks:
+      add_new: Дадаць новае
+      block_registrations: Заблакіраваць рэгістрацыю
+      comparison:
+        contains: Мае
+        equals: Такое ж, як
+      contains_html: Мае %{string}
+      created_msg: Правіла імя карыстальніка паспяхова створанае
+      delete: Выдаліць
+      edit:
+        title: Змяніць правіла імя карыстальніка
+      matches_exactly_html: Такое ж, як %{string}
+      new:
+        create: Стварыць правіла
+        title: Стварыць новае правіла імя карыстальніка
+      no_username_block_selected: Аніводнае з правіл імён карыстальніка не было змененае, бо аніводнае не было абранае
+      not_permitted: Забаронена
+      title: Правілы імені карыстальніка
+      updated_msg: Правіла імя карыстальніка паспяхова абноўленае
     warning_presets:
       add_new: Дадаць новы
       delete: Выдаліць
@@ -1070,7 +1190,7 @@ be:
         none: папярэджанне
         sensitive: пазначыць уліковы запіс як далікатны
         silence: абмежаваць уліковы запіс
-        suspend: выключыць уліковы запіс
+        suspend: каб прыпыніць гэты ўліковы запіс
       body: "%{target} абскарджвае рашэнне мадэратара %{action_taken_by} ад %{date}, якая была %{type}. Яны напісалі:"
       next_steps: Вы можаце ўхваліць апеляцыю каб адмяніць рашэнне мадэратараў ці ігнараваць яе.
       subject: "%{username} абскарджвае рашэнне мадэратараў на %{instance}"
@@ -1090,12 +1210,12 @@ be:
     new_trends:
       body: 'Гэтыя элементы трэба праверыць, перш чым публікаваць:'
       new_trending_links:
-        title: Папулярныя спасылкі
+        title: Трэндавыя спасылкі
       new_trending_statuses:
-        title: Папулярныя допісы
+        title: Трэндавыя допісы
       new_trending_tags:
-        title: Папулярныя хэштэгі
-      subject: Новае ў папулярным для разгляду %{instance}
+        title: Трэндавыя хэштэгі
+      subject: Новыя трэнды да прагляду %{instance}
   aliases:
     add_new: Стварыць псеўданім
     created_msg: Створаны новы псеўданім. Цяпер вы можаце пачаць пераход са старога ўліковага запісу.
@@ -1147,7 +1267,7 @@ be:
       welcome_title: Вітаем, %{name}!
       wrong_email_hint: Калі гэты адрас электроннай пошты памылковы, вы можаце змяніць яго ў наладах уліковага запісу.
     delete_account: Выдаліць уліковы запіс
-    delete_account_html: Калі вы жадаеце выдаліць ваш уліковы запіс, можаце <a href="%{path}">працягнуць тут</a>. Ад вас будзе запатрабавана пацвярджэнне.
+    delete_account_html: Калі вы жадаеце выдаліць свой уліковы запіс, вы можаце <a href="%{path}">працягнуць тут</a>. Ад вас спатрэбіцца пацвярджэнне.
     description:
       prefix_invited_by_user: "@%{name} запрашае вас далучыцца да гэтага сервера ў Mastodon!"
       prefix_sign_up: Зарэгістравацца ў Mastodon сёння!
@@ -1166,7 +1286,7 @@ be:
     or_log_in_with: Або ўвайсці з дапамогай
     progress:
       confirm: Пацвердзіць email
-      details: Вашы дадзеныя
+      details: Вашы даныя
       review: Наш водгук
       rules: Прыняць правілы
     providers:
@@ -1188,6 +1308,7 @@ be:
     set_new_password: Прызначыць новы пароль
     setup:
       email_below_hint_html: Праверце папку са спамам або зрабіце новы запыт. Вы можаце выправіць свой email, калі ён няправільны.
+      email_settings_hint_html: Націсніце на спасылку, якую мы адправілі на %{email}, каб пачаць карыстацца Mastodon. Мы пакуль пачакаем тут.
       link_not_received: Не атрымалі спасылку?
       new_confirmation_instructions_sent: Праз некалькі хвілін вы атрымаеце новы ліст на email са спасылкай для пацверджання!
       title: Праверце вашу пошту
@@ -1196,6 +1317,7 @@ be:
       title: Уваход у %{domain}
     sign_up:
       manual_review: Рэгістрацыі на %{domain} праходзяць ручную праверку нашымі мадэратарамі. Каб дапамагчы нам апрацаваць вашу рэгістрацыю, напішыце крыху пра сябе і чаму вы хочаце мець уліковы запіс на %{domain}.
+      preamble: З уліковым запісам на гэтым серверы Mastodon Вы зможаце падпісацца на любога чалавека ў федэральным сусвеце, незалежна ад таго, на якім серверы знаходзіцца яго ўліковы запіс.
       title: Наладзьма вас на %{domain}.
     status:
       account_status: Стан уліковага запісу
@@ -1207,6 +1329,16 @@ be:
       view_strikes: Праглядзець мінулыя папярэджанні для вашага ўліковага запісу
     too_fast: Форма адпраўлена занадта хутка, паспрабуйце яшчэ раз.
     use_security_key: Выкарыстаеце ключ бяспекі
+    user_agreement_html: Я прачытаў і згаджаюся з <a href="%{terms_of_service_path}" target="_blank">умовамі карыстання</a> і <a href="%{privacy_policy_path}" target="_blank">палітыкай прыватнасці</a>
+    user_privacy_agreement_html: Я прачытаў і згаджаюся з <a href="%{privacy_policy_path}" target="_blank">палітыкай прыватнасці</a>
+  author_attribution:
+    example_title: Прыклад тэксту
+    hint_html: Вы пішаце навіны ці артыкулы ў блогу па-за Mastodon? Кантралюйце, як пазначаецца Вашае аўтарства, калі імі дзеляцца ў Mastodon.
+    instructions: 'Упэўніцеся, што гэты код прысутнічае ў HTML-кодзе Вашага артыкула:'
+    more_from_html: Больш ад %{name}
+    s_blog: Блог %{name}
+    then_instructions: Пасля, дадайце назву сайта публікацыі ў полі знізу.
+    title: Пазначэнне аўтарства
   challenge:
     confirm: Працягнуць
     hint_html: "<strong>Парада:</strong> Мы не будзем запытваць ваш пароль зноўку на працягу наступнай гадзіны."
@@ -1276,7 +1408,7 @@ be:
         none: Папярэджанне
         sensitive: Пазначэнне ўліковага запісу як далікатнага
         silence: Абмежаванне ўліковага запісу
-        suspend: Выключэнне ўліковага запісу
+        suspend: Прыпыненне ўліковага запісу
       your_appeal_approved: Ваша абскарджанне было ўхвалена
       your_appeal_pending: Вы адправілі апеляцыю
       your_appeal_rejected: Ваша абскарджанне было адхілена
@@ -1284,6 +1416,10 @@ be:
     basic_information: Асноўная інфармацыя
     hint_html: "<strong>Наладзьце тое, што людзі будуць бачыць у вашым профілі і побач з вашымі паведамленнямі.</strong> Іншыя людзі з большай верагоднасцю будуць сачыць і ўзаемадзейнічаць з вамі, калі ў вас ёсць запоўнены профіль і фота профілю."
     other: Іншае
+  emoji_styles:
+    auto: Аўтаматычны
+    native: Мясцовы
+    twemoji: Twemoji
   errors:
     '400': Запыт, які вы адправілі, памылковы або няправільны.
     '403': У вас няма дазволу на прагляд гэтай старонкі.
@@ -1398,10 +1534,10 @@ be:
       other: Выберыце %{count} элементаў, якія адпавядаюць вашаму пошуку.
     today: сёння
     validation_errors:
-      few: Штосьці пакуль не зусім правільна! Калі ласка, праглядзіце %{count} памылкі ніжэй
-      many: Штосьці пакуль не зусім правільна! Калі ласка, праглядзіце %{count} памылак ніжэй
-      one: Штосьці пакуль не зусім правільна! Калі ласка, праглядзіце памылку ніжэй
-      other: Штосьці пакуль не зусім правільна! Калі ласка, праглядзіце %{count} памылак ніжэй
+      few: Штосьці тут пакуль не сыходзіцца! Праглядзіце %{count} памылкі ніжэй
+      many: Штосьці тут пакуль не сыходзіцца! Праглядзіце %{count} памылак ніжэй
+      one: Штосьці тут пакуль не сыходзіцца! Праглядзіце памылку ніжэй
+      other: Штосьці тут пакуль не сыходзіцца! Праглядзіце %{count} памылак ніжэй
   imports:
     errors:
       empty: Пусты CSV файл
@@ -1413,10 +1549,72 @@ be:
     imported: Імпартавана
     mismatched_types_warning: Здаецца, вы выбралі няправільны тып для гэтага імпарту, праверце яшчэ раз.
     modes:
-      merge: Аб'яднаць
+      merge: Аб’яднаць
       merge_long: Захаваць існуючыя запісы і дадаць новыя
       overwrite: Перазапісаць
       overwrite_long: Замяніць бягучыя запісы на новыя
+    overwrite_preambles:
+      blocking_html:
+        few: Вы збіраецеся <strong>замяніць свой спіс заблакіраваных карыстальнікаў</strong> <strong>%{count} карыстальнікамі</strong> з <strong>%{filename}</strong>.
+        many: Вы збіраецеся <strong>замяніць свой спіс заблакіраваных карыстальнікаў</strong> <strong>%{count} карыстальнікамі</strong> з <strong>%{filename}</strong>.
+        one: Вы збіраецеся <strong>замяніць свой спіс заблакіраваных карыстальнікаў</strong> <strong>%{count} карыстальнікам</strong> з <strong>%{filename}</strong>.
+        other: Вы збіраецеся <strong>замяніць свой спіс заблакіраваных карыстальнікаў</strong> <strong>%{count} карыстальнікамі</strong> з <strong>%{filename}</strong>.
+      bookmarks_html:
+        few: Вы збіраецеся <strong>замяніць свае закладкі</strong> <strong>%{count} допісамі</strong> з <strong>%{filename}</strong>.
+        many: Вы збіраецеся <strong>замяніць свае закладкі</strong> <strong>%{count} допісамі</strong> з <strong>%{filename}</strong>.
+        one: Вы збіраецеся <strong>замяніць свае закладкі</strong> <strong>%{count} допісам</strong> з <strong>%{filename}</strong>.
+        other: Вы збіраецеся <strong>замяніць свае закладкі</strong> <strong>%{count} допісамі</strong> з <strong>%{filename}</strong>.
+      domain_blocking_html:
+        few: Вы збіраецеся <strong>замяніць свой спіс заблакіраваных даменаў</strong> <strong>%{count} даменамі</strong> з <strong>%{filename}</strong>.
+        many: Вы збіраецеся <strong>замяніць свой спіс заблакіраваных даменаў</strong> <strong>%{count} даменамі</strong> з <strong>%{filename}</strong>.
+        one: Вы збіраецеся <strong>замяніць свой спіс заблакіраваных даменаў</strong> <strong>%{count} даменам</strong> з <strong>%{filename}</strong>.
+        other: Вы збіраецеся <strong>замяніць свой спіс заблакіраваных даменаў</strong> <strong>%{count} дамены</strong> з <strong>%{filename}</strong>.
+      following_html:
+        few: Вы збіраецеся <strong>падпісацца</strong> на <strong>%{count} уліковыя запісы</strong> з <strong>%{filename}</strong> і <strong>адпішацеся ад усіх астатніх</strong>.
+        many: Вы збіраецеся <strong>падпісацца</strong> на <strong>%{count} уліковых запісаў</strong> з <strong>%{filename}</strong> і <strong>адпішацеся ад усіх астатніх</strong>.
+        one: Вы збіраецеся <strong>падпісацца</strong> на <strong>%{count} уліковы запіс</strong> з <strong>%{filename}</strong> і <strong>адпішацеся ад усіх астатніх</strong>.
+        other: Вы збіраецеся <strong>падпісацца</strong> на <strong>%{count} уліковыя запісы</strong> з <strong>%{filename}</strong> і <strong>адпішацеся ад усіх астатніх</strong>.
+      lists_html:
+        few: Вы збіраецеся <strong>замяніць свае спісы</strong> змесцівам з <strong>%{filename}</strong>. <strong>%{count} уліковыя запісы</strong> будуць дададзеныя ў новыя спісы.
+        many: Вы збіраецеся <strong>замяніць свае спісы</strong> змесцівам з <strong>%{filename}</strong>. <strong>%{count} уліковых запісаў</strong> будуць дададзеныя ў новыя спісы.
+        one: Вы збіраецеся <strong>замяніць свае спісы</strong> змесцівам з <strong>%{filename}</strong>. <strong>%{count} уліковы запіс</strong> будзе дададзены ў новыя спісы.
+        other: Вы збіраецеся <strong>замяніць свае спісы</strong> змесцівам з <strong>%{filename}</strong>. <strong>%{count} уліковыя запісы</strong> будуць дададзеныя ў новыя спісы.
+      muting_html:
+        few: Вы збіраецеся <strong>замяніць свой спіс уліковых запісаў, якія Вы ігнаруеце,</strong> <strong>%{count} уліковымі запісамі</strong> з <strong>%{filename}</strong>.
+        many: Вы збіраецеся <strong>замяніць свой спіс уліковых запісаў, якія Вы ігнаруеце,</strong> <strong>%{count} уліковымі запісамі</strong> з <strong>%{filename}</strong>.
+        one: Вы збіраецеся <strong>замяніць свой спіс уліковых запісаў, якія Вы ігнаруеце,</strong> <strong>%{count} уліковым запісам</strong> з <strong>%{filename}</strong>.
+        other: Вы збіраецеся <strong>замяніць свой спіс уліковых запісаў, якія Вы ігнаруеце,</strong> <strong>%{count} уліковыя запісы</strong> з <strong>%{filename}</strong>.
+    preambles:
+      blocking_html:
+        few: Вы збіраецеся <strong>заблакіраваць</strong> <strong>%{count} уліковыя запісы</strong> з <strong>%{filename}</strong>.
+        many: Вы збіраецеся <strong>заблакіраваць</strong> <strong>%{count} уліковых запісаў</strong> з <strong>%{filename}</strong>.
+        one: Вы збіраецеся <strong>заблакіраваць</strong> <strong>%{count} уліковы запіс</strong> з <strong>%{filename}</strong>.
+        other: Вы збіраецеся <strong>заблакіраваць</strong> <strong>%{count} уліковыя запісы</strong> з <strong>%{filename}</strong>.
+      bookmarks_html:
+        few: Вы збіраецеся дадаць <strong>%{count} допісы</strong> з <strong>%{filename}</strong> у Вашыя <strong>закладкі</strong>.
+        many: Вы збіраецеся дадаць <strong>%{count} допісаў</strong> з <strong>%{filename}</strong> у Вашыя <strong>закладкі</strong>.
+        one: Вы збіраецеся дадаць <strong>%{count} допіс</strong> з <strong>%{filename}</strong> у Вашыя <strong>закладкі</strong>.
+        other: Вы збіраецеся дадаць <strong>%{count} допісаў</strong> з <strong>%{filename}</strong> у Вашыя <strong>закладкі</strong>.
+      domain_blocking_html:
+        few: Вы збіраецеся <strong>заблакіраваць</strong> <strong>%{count} дамены</strong> з <strong>%{filename}</strong>.
+        many: Вы збіраецеся <strong>заблакіраваць</strong> <strong>%{count} даменаў</strong> з <strong>%{filename}</strong>.
+        one: Вы збіраецеся <strong>заблакіраваць</strong> <strong>%{count} дамен</strong> з <strong>%{filename}</strong>.
+        other: Вы збіраецеся <strong>заблакіраваць</strong> <strong>%{count} дамены</strong> з <strong>%{filename}</strong>.
+      following_html:
+        few: Вы збіраецеся <strong>падпісацца</strong> на <strong>%{count} уліковыя запісы</strong> з <strong>%{filename}</strong>.
+        many: Вы збіраецеся <strong>падпісацца</strong> на <strong>%{count} уліковых запісаў</strong> з <strong>%{filename}</strong>.
+        one: Вы збіраецеся <strong>падпісацца</strong> на <strong>%{count} уліковы запіс</strong> з <strong>%{filename}</strong>.
+        other: Вы збіраецеся <strong>падпісацца</strong> на <strong>%{count} уліковыя запісы</strong> з <strong>%{filename}</strong>.
+      lists_html:
+        few: Вы збіраецеся дадаць <strong>%{count} уліковыя запісы</strong> з <strong>%{filename}</strong> у Вашыя <strong>спісы</strong>. Калі спісаў няма, то будуць створаны новыя.
+        many: Вы збіраецеся дадаць <strong>%{count} уліковых запісаў</strong> з <strong>%{filename}</strong> у Вашыя <strong>спісы</strong>. Калі спісаў няма, то будуць створаны новыя.
+        one: Вы збіраецеся дадаць <strong>%{count} уліковы запіс</strong> з <strong>%{filename}</strong> у Вашыя <strong>спісы</strong>. Калі спісаў няма, то будуць створаны новыя.
+        other: Вы збіраецеся дадаць <strong>%{count} уліковыя запісы</strong> з <strong>%{filename}</strong> у Вашыя <strong>спісы</strong>. Калі спісаў няма, то будуць створаны новыя.
+      muting_html:
+        few: Вы збіраецеся пачаць <strong>ігнараваць</strong> <strong>%{count} уліковыя запісы</strong> з <strong>%{filename}</strong>.
+        many: Вы збіраецеся пачаць <strong>ігнараваць</strong> <strong>%{count} уліковых запісаў</strong> з <strong>%{filename}</strong>.
+        one: Вы збіраецеся пачаць <strong>ігнараваць</strong> <strong>%{count} уліковы запіс</strong> з <strong>%{filename}</strong>.
+        other: Вы збіраецеся пачаць <strong>ігнараваць</strong> <strong>%{count} уліковыя запісы</strong> з <strong>%{filename}</strong>.
     preface: Вы можаце імпартаваць даныя, экспартаваныя вамі з іншага сервера, напрыклад, спіс людзей, на якіх вы падпісаны або якіх блакуеце.
     recent_imports: Нядаўнія імпарты
     states:
@@ -1471,6 +1669,13 @@ be:
       expires_at: Дзее да
       uses: Выкарыстанні
     title: Запрасіць людзей
+  link_preview:
+    author_html: Ад %{name}
+    potentially_sensitive_content:
+      action: Націсніце, каб паказаць
+      confirm_visit: Вы ўпэўненыя, што хочаце адкрыць гэту спасылку?
+      hide_button: Схаваць
+      label: Патэнцыйна далікатны кантэнт
   lists:
     errors:
       limit: Вы дасягнулі макс. колькасці спісаў
@@ -1489,7 +1694,7 @@ be:
     unsubscribe:
       action: Так, адпісацца
       complete: Адпісаны
-      confirmation_html: Вы ўпэўнены, што жадаеце адмовіцца ад %{type} з Mastodon на дамене %{domain} на вашу электронную пошту %{email}? Вы заўсёды можаце паўторна падпісацца у <a href="%{settings_path}">наладах апавяшчэнняў па электроннай пошце</a>.
+      confirmation_html: Вы ўпэўнены, што жадаеце адмовіцца ад атрымання %{type} з Mastodon на дамене %{domain} на сваю электронную пошту %{email}? Вы заўсёды можаце паўторна падпісацца ў <a href="%{settings_path}">наладах апавяшчэнняў па электроннай пошце</a>.
       emails:
         notification_emails:
           favourite: апавяшчэнні на пошту пра упадабанае
@@ -1503,7 +1708,8 @@ be:
   media_attachments:
     validations:
       images_and_video: Немагчыма далучыць відэа да допісу, які ўжо змяшчае выявы
-      not_ready: Няможна далучыць файлы, апрацоўка якіх яшчэ не скончылася. Паспрабуйце яшчэ раз праз хвілінку!
+      not_found: Файл %{ids} не знойдзены або ўжо далучаны да іншага допісу
+      not_ready: Немагчыма далучыць файлы, апрацоўка якіх яшчэ не скончылася. Паспрабуйце яшчэ раз праз хвілінку!
       too_many: Немагчыма далучыць больш за 4 файлы
   migrations:
     acct: Перамешчана ў
@@ -1529,7 +1735,7 @@ be:
     set_redirect: Задаць перанакіраванне
     warning:
       backreference_required: Спачатку трэба наладзіць зваротнае спасыланне новага ўліковага запісу на бягучы
-      before: 'Перш чым працягнуць, калі ласка, уважліва прачытайце гэтыя заўвагі:'
+      before: 'Перш чым працягнуць, уважліва прачытайце гэтыя заўвагі:'
       cooldown: Пасля «пераезду» будзе перыяд чакання, на працягу якога вы не зможаце зноў «пераехаць»
       disabled_account: Пасля гэтага ваш бягучы ўліковы запіс не будзе цалкам даступны. Аднак у вас будзе доступ да экспарту даных, а таксама да паўторнай актывацыі.
       followers: Гэтае дзеянне будзе «пераносіць» усіх падпісчыкаў з бягучага ўліковага запісу на новы
@@ -1551,8 +1757,8 @@ be:
       sign_up:
         subject: "%{name} зарэгістраваўся"
     favourite:
-      body: "%{name} упадабаў ваш пост:"
-      subject: "%{name} упадабаў ваш допіс"
+      body: "%{name} упадабаў(-ла) Ваш допіс:"
+      subject: "%{name} упадабаў(-ла) Ваш допіс"
       title: Новае ўпадабанае
     follow:
       body: "%{name} цяпер падпісаны на вас!"
@@ -1570,8 +1776,12 @@ be:
       title: Новае згадванне
     poll:
       subject: Апытанне ад %{name} скончылася
+    quote:
+      body: 'Ваш допіс працытаваў карыстальнік %{name}:'
+      subject: Карыстальнік %{name} працытаваў Ваш допіс
+      title: Цытаваць
     reblog:
-      body: "%{name} пашырыў ваш пост:"
+      body: "%{name} пашырыў(-ла) Ваш допіс:"
       subject: "%{name} пашырыў ваш допіс"
       title: Новае пашырэнне
     status:
@@ -1618,6 +1828,9 @@ be:
       self_vote: Вы не можаце галасаваць ва ўласных апытаннях
       too_few_options: павінна быць болей за адзін варыянт
       too_many_options: колькасць варыянтаў не можа перавышаць %{max}
+    vote: Прагаласаваць
+  posting_defaults:
+    explanation: Гэтыя налады будуць ужывацца па змаўчанні, калі Вы будзеце ствараць новыя допісы, але Вы зможаце змяняць іх для кожнага допісу ў акне для напісання.
   preferences:
     other: Іншае
     posting_defaults: Публікаваць па змаўчанні
@@ -1642,14 +1855,14 @@ be:
     title: Вы пакідаеце %{instance}.
   relationships:
     activity: Актыўнасць ул. запісу
-    confirm_follow_selected_followers: Вы ўпэўнены, што жадаеце падпісацца на выбраных падпісчыкаў?
-    confirm_remove_selected_followers: Вы ўпэўнены, што жадаеце выдаліць выбраных падпісчыкаў?
-    confirm_remove_selected_follows: Вы ўпэўнены, што жадаеце выдаліць выбраныя падпіскі?
+    confirm_follow_selected_followers: Вы ўпэўнены, што хочаце падпісацца на выбраных падпісчыкаў?
+    confirm_remove_selected_followers: Вы ўпэўнены, што хочаце выдаліць выбраных падпісчыкаў?
+    confirm_remove_selected_follows: Вы ўпэўнены, што хочаце выдаліць выбраныя падпіскі?
     dormant: Занядбаны
     follow_failure: Вы не можаце падпісацца на некаторыя акаўнты.
     follow_selected_followers: Падпісацца на выбраных падпісчыкаў
     followers: Падпісчыкі
-    following: Падпісаны
+    following: Падпіскі
     invited: Запрошаны
     last_active: Апошняя актыўнасць
     most_recent: Даўнасць
@@ -1674,6 +1887,7 @@ be:
   scheduled_statuses:
     over_daily_limit: Вы перавысілі ліміт ў %{limit} запланаваных на сёння допісаў
     over_total_limit: Вы перавысілі ліміт ў %{limit} запланаваных допісаў
+    too_soon: дата публікацыі мусіць быць у будучыні
   self_destruct:
     lead_html: На жаль, дамен <strong>%{domain}</strong> зачыняецца назаўсёды. Калі ў вас быў уліковы запіс, вы не зможаце працягваць выкарыстоўваць яго, але вы ўсё яшчэ можаце запытаць рэзервовае капіраванне вашых даных.
     title: Гэты сервер зачыняецца
@@ -1778,6 +1992,9 @@ be:
         other: "%{count} відэафайла"
     boosted_from_html: Пашырыў уліковы запіс %{acct_link}
     content_warning: 'Папярэджанне аб змесціве: %{warning}'
+    content_warnings:
+      hide: Схаваць допіс
+      show: Паказаць усё роўна
     default_language: Такая, што і мова інтэрфэйсу
     disallowed_hashtags:
       few: 'змяшчае недазволеныя хэштэгі: %{tags}'
@@ -1787,21 +2004,25 @@ be:
     edited_at_html: Адрэдагавана %{date}
     errors:
       in_reply_not_found: Здаецца, допіс, на які вы спрабуеце адказаць, не існуе.
+      quoted_status_not_found: Выглядае, што допісу, які Вы спрабуеце цытаваць, не існуе.
     over_character_limit: перавышаная колькасць сімвалаў у %{max}
     pin_errors:
-      direct: Допісы, бачныя толькі згаданым карыстальнікам, не могуць быць замацаваныя
+      direct: Допісы, бачныя толькі згаданым карыстальнікам, нельга замацаваць
       limit: Вы ўжо замацавалі максімальную колькасць допісаў
       ownership: Немагчыма замацаваць чужы допіс
       reblog: Немагчыма замацаваць пашырэнне
+    quote_policies:
+      followers: Толькі падпісчыкі
+      nobody: Толькі я
+      public: Усе
     title: '%{name}: "%{quote}"'
     visibilities:
-      direct: Асабіста
-      private: Для падпісчыкаў
-      private_long: Паказваць толькі падпісчыкам
+      direct: Прыватнае згадванне
+      private: Толькі для падпісчыкаў
       public: Публічны
-      public_long: Усе могуць бачыць
-      unlisted: Не ў спісе
-      unlisted_long: Усе могуць пабачыць гэты допіс, але ён не паказваецца ў публічных стужках
+      public_long: Усе ў Mastodon і па-за ім
+      unlisted: Ціхі публічны
+      unlisted_long: Схавана ў выніках пошуку Mastodon, трэндах і публічных стужках
   statuses_cleanup:
     enabled: Аўтаматычна выдаляць старыя допісы
     enabled_hint: Аўтаматычна выдаляць вашыя допісы, калі яны дасягаюць вызначанага тэрміну, акрамя наступных выпадкаў
@@ -1812,9 +2033,9 @@ be:
     interaction_exceptions: Выключэнні, заснаваныя на ўзаемадзеянні
     interaction_exceptions_explanation: Звярніце ўвагу, што няма гарантыі выдалення пастоў, калі колькасць іх упадабанняў ці пашырэннняў упадзе ніжэй за ліміт, хаця некалі гэтая колькасць перавышала яго.
     keep_direct: Захаваць асабістыя паведамленні
-    keep_direct_hint: Не выдаляць асабістыя паведамленні
-    keep_media: Захоўваць допісы з далучаным медыя
-    keep_media_hint: Не выдаляць вашыя допісы, якія ўтрымліваюць медыя
+    keep_direct_hint: Не выдаляе асабістыя паведамленні
+    keep_media: Захоўваць допісы з медыя ўлажэннямі
+    keep_media_hint: Не выдаляць вашыя допісы, якія ўтрымліваюць медыя ўлажэнні
     keep_pinned: Захаваць замацаваныя допісы
     keep_pinned_hint: Не выдаляць вашыя замацаваныя допісы
     keep_polls: Працягнуць апытанне
@@ -1845,7 +2066,12 @@ be:
   tags:
     does_not_match_previous_name: не супадае з папярэднім імям
   terms_of_service:
-    title: Умовы абслугоўваньня
+    title: Умовы выкарыстання
+  terms_of_service_interstitial:
+    future_preamble_html: Мы ўносім праўкі ў нашыя ўмовы карыстання, якія пачнуць дзейнічаць <strong>%{date}</strong>. Мы раім Вам азнаёміцца з абноўленымі ўмовамі.
+    past_preamble_html: Пасля Вашага апошняга наведвання мы ўнеслі праўкі ў нашыя ўмовы карыстання. Мы раім Вам азнаёміцца з абноўленымі ўмовамі.
+    review_link: Прачытаць умовы карыстання
+    title: На %{domain} змяняюцца ўмовы карыстання
   themes:
     contrast: Mastodon (высокі кантраст)
     default: Mastodon (цёмная)
@@ -1874,9 +2100,13 @@ be:
     otp: Праграма аўтэнтыфікацыі
     recovery_codes: Абнавіць коды аднаўлення
     recovery_codes_regenerated: Новыя коды аднаўлення паспяхова створаныя
-    recovery_instructions_html: Калі раптам вы страціце доступ да вашага тэлефона, вы можаце скарыстацца адным з кодаў аднаўлення ніжэй каб аднавіць доступ да вашага ўліковага запісу. <strong>Захоўвайце іх у бяспечным месцы</strong>. Напрыклад, вы можаце раздрукаваць іх і захоўваць разам з іншымі важнымі дакументамі.
+    recovery_instructions_html: Калі раптам вы страціце доступ да свайго тэлефона, вы можаце скарыстаць адзін з кодаў аднаўлення ніжэй каб аднавіць доступ да свайго ўліковага запісу. <strong>Захоўвайце іх у бяспечным месцы</strong>. Напрыклад, вы можаце раздрукаваць іх і захоўваць разам з іншымі важнымі дакументамі.
     webauthn: Ключы бяспекі
   user_mailer:
+    announcement_published:
+      description: 'Аб''ява ад адміністратараў %{domain}:'
+      subject: Аб'ява сэрвісу
+      title: Аб'ява сэрвісу %{domain}
     appeal_approved:
       action: Налады ўліковага запісу
       explanation: Апеляцыя на папярэджанне супраць вашага ўліковага запісу ад %{strike_date}, якую вы падалі %{appeal_date}, была ўхвалена. Ваш уліковы запіс зноў на добрым рахунку.
@@ -1895,10 +2125,10 @@ be:
       title: Ваш архіў можна спампаваць
     failed_2fa:
       details: 'Вось падрабязнасці ўваходу:'
-      explanation: Хтосьці спрабаваў увайсці ў ваш уліковы запіс, але ўвёў няправільны другі фактар аўтэнтыфікацыі.
+      explanation: Хтосьці спрабаваў увайсці ў ваш уліковы запіс, але ўвёў няправільны часовы пароль.
       further_actions_html: Калі гэта не вы, мы рэкамендуем неадкладна %{action}, бо ён можа быць скампраметаваны.
-      subject: Збой аўтэнтыфікацыі па другім фактары
-      title: Няўдалая аўтэнтыфікацыя па другім фактары
+      subject: Збой двухфактарнай аўтэнтыфікацыі
+      title: Двухфактарная аўтэнтыфікацыя не ўдалася
     suspicious_sign_in:
       change_password: змяніць свой пароль
       details: 'Вось падрабязнасці ўваходу:'
@@ -1906,6 +2136,15 @@ be:
       further_actions_html: Калі гэта былі не вы, раім вам неадкладна %{action}, а таксама ўключыць двухфактарную аўтэнтыфікацыю, каб захаваць бяспеку вашага ўліковага запісу.
       subject: У вас уліковы запіс зайшлі з новага IP-адрасу
       title: Новы ўваход
+    terms_of_service_changed:
+      agreement: Працягваючы карыстацца %{domain}, Вы пагаджаецеся з гэтымі ўмовамі. Калі Вы не згодныя з абноўленымі ўмовамі, то можаце ў любы момант адмовіцца ад пагаднення з %{domain}, выдаліўшы свой профіль.
+      changelog: 'Коратка пра тое, што значыць гэтае абнаўленне:'
+      description: 'Вы атрымалі дадзены ліст, бо мы ўносім праўкі ў нашыя ўмовы карыстання на %{domain}. Гэтыя абнаўленні ўступяць у сілу %{date}. Мы раім Вам цалкам азнаёміцца з абноўленымі ўмовамі тут:'
+      description_html: Вы атрымалі дадзены ліст, бо мы ўносім праўкі ў нашыя ўмовы карыстання на %{domain}. Гэтыя абнаўленні ўступяць у сілу <strong>%{date}</strong>. Мы раім Вам цалкам азнаёміцца з <a href="%{path}" target="_blank">абноўленымі ўмовамі тут</a>.
+      sign_off: Каманда %{domain}
+      subject: Абнаўленні ў нашых умовах карыстання
+      subtitle: Змяняюцца ўмовы карыстання на %{domain}
+      title: Важнае абнаўленне
     warning:
       appeal: Падаць апеляцыю
       appeal_description: "Калі вы лічыце гэта памылкай, вы можаце падаць апеляцыю \nсупрацоўнікам %{instance}."
@@ -1928,7 +2167,7 @@ be:
         none: Папярэджанне для %{acct}
         sensitive: З гэтага моманту вашыя допісы на %{acct} будуць пазначаныя як далікатныя
         silence: Ваш уліковы запіс %{acct} быў абмежаваны
-        suspend: Ваш уліковы запіс %{acct} быў выключаны
+        suspend: Ваш уліковы запіс %{acct} быў прыпынены
       title:
         delete_statuses: Выдаленыя допісы
         disable: Уліковы запіс замарожаны
@@ -1936,7 +2175,7 @@ be:
         none: Папярэджанне
         sensitive: Уліковыя запісы, пазначаныя як далікатныя
         silence: Уліковы запіс абмежаваны
-        suspend: Уліковы запіс выключаны
+        suspend: Уліковы запіс прыпынены
     welcome:
       apps_android_action: Спампаваць з Google Play
       apps_ios_action: Спампваваць з App Store
@@ -1968,9 +2207,9 @@ be:
         many: "%{people} чалавек за апошнія 2 дні"
         one: "%{people} чалавек за апошнія 2 дні"
         other: "%{people} чалавека за апошнія 2 дні"
-      hashtags_subtitle: Даведайцеся што было папулярна ў апошнія 2 дні
+      hashtags_subtitle: Даведайцеся што было ў трэндзе за апошнія 2 дні
       hashtags_title: Папулярныя хэштэгі
-      hashtags_view_more: Прагледзець іншыя папулярныя хэштэгі
+      hashtags_view_more: Прагледзець іншыя трэндавыя хэштэгі
       post_action: Стварыць
       post_step: Скажыце ўсім прывітанне з дапамогай тэксту, фатаграфій, відэа і апытанняў.
       post_title: Стварыце свой першы допіс
@@ -1983,7 +2222,7 @@ be:
     follow_limit_reached: Вы не можаце падпісацца на большую колькасць людзей чым %{limit}
     go_to_sso_account_settings: Перайдзіце ў налады ідэнтыфікацыі вашага ўліковага запісу
     invalid_otp_token: Няправільны код двухфактарнай аўтэнтыфікацыі
-    otp_lost_help_html: Калі вы страцілі доступ да абодвух, вы можаце скарыстацца %{email}
+    otp_lost_help_html: Калі вы страцілі доступ да абодвух, вы можаце звязацца з намі праз %{email}
     rate_limited: Занадта шмат спробаў аўтэнтыфікацыі, паспрабуйце пазней.
     seamless_external_login: Вы ўвайшлі праз знешні сэрвіс, таму налады пароля і эл. пошты недаступныя.
     signed_in_as: 'Увайшлі як:'
@@ -1994,6 +2233,7 @@ be:
     instructions_html: Скапіруйце прыведзены ніжэй код і ўстаўце ў HTML вашага сайта. Затым дадайце адрас вашага сайта ў адно з дадатковых палёў вашага профілю на ўкладцы «рэдагаваць профіль» і захавайце змены.
     verification: Верыфікацыя
     verified_links: Вашыя правераныя спасылкі
+    website_verification: Пацвярджэнне сайта
   webauthn_credentials:
     add: Дадаць новы ключ бяспекі
     create:
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index 5a41164c065..309d634914e 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -190,6 +190,7 @@ bg:
         create_relay: Създаване на пренасочване
         create_unavailable_domain: Създаване на недостъпен домейн
         create_user_role: Създаване на роля
+        create_username_block: Създаване на правило за потебителско име
         demote_user: Понижаване на потребител
         destroy_announcement: Изтриване на оповестяване
         destroy_canonical_email_block: Изтриване на блокиране за е-поща
@@ -202,6 +203,7 @@ bg:
         destroy_status: Изтриване на публикация
         destroy_unavailable_domain: Изтриване на недостъпен домейн
         destroy_user_role: Унищожаване на роля
+        destroy_username_block: Изтриване на правило за потебителско име
         disable_2fa_user: Изкл. на 2факт.удостов.
         disable_custom_emoji: Деактивиране на персонализирано емоджи
         disable_sign_in_token_auth_user: Изключване на удостоверяването с код по имейл за потребител
@@ -234,6 +236,7 @@ bg:
         update_report: Обновяване на доклада
         update_status: Обновяване на публикация
         update_user_role: Обновяване на ролята
+        update_username_block: Обновяване на правило за потеб. име
       actions:
         approve_appeal_html: "%{name} одобри обжалването на решение за модериране от %{target}"
         approve_user_html: "%{name} одобри регистрирането от %{target}"
@@ -251,6 +254,7 @@ bg:
         create_ip_block_html: "%{name} създаде правило за IP %{target}"
         create_unavailable_domain_html: "%{name} спря доставянето до домейн %{target}"
         create_user_role_html: "%{name} създаде роля %{target}"
+        create_username_block_html: "%{name} добави правило за потребителско име, съдържащо %{target}"
         demote_user_html: "%{name} понижи потребителя %{target}"
         destroy_announcement_html: "%{name} изтри оповестяване %{target}"
         destroy_canonical_email_block_html: "%{name} отблокира имейла с хеш %{target}"
@@ -263,6 +267,7 @@ bg:
         destroy_status_html: "%{name} премахна публикация от %{target}"
         destroy_unavailable_domain_html: "%{name} възобнови доставката до домейн %{target}"
         destroy_user_role_html: "%{name} изтри роля %{target}"
+        destroy_username_block_html: "%{name} премахна правило за потребителско име, съдържащо %{target}"
         disable_2fa_user_html: "%{name} изключи двуфакторното изискване за потребител %{target}"
         disable_custom_emoji_html: "%{name} изключи емоджито %{target}"
         disable_sign_in_token_auth_user_html: "%{name} изключва удостоверението с код по е-поща за %{target}"
@@ -295,6 +300,7 @@ bg:
         update_report_html: "%{name} осъвремени доклад %{target}"
         update_status_html: "%{name} обнови публикация от %{target}"
         update_user_role_html: "%{name} промени ролята %{target}"
+        update_username_block_html: "%{name} обнови правило за потребителско име, съдържащо %{target}"
       deleted_account: изтрит акаунт
       empty: Няма намерени дневници.
       filter_by_action: Филтриране по действие
@@ -566,6 +572,13 @@ bg:
         all: Всичко
         limited: Ограничено
         title: Mодериране
+      moderation_notes:
+        create: Добавяне на бележка за модериране
+        created_msg: Успешно създадена бележка за модериране на екземпляр!
+        description_html: Прегледайте и оставете бележки за други модератори и за вас в бъдеще
+        destroyed_msg: Успешно изтрита бележка за модериране на екземпляр!
+        placeholder: Сведенията за този екземпляр, предприети действия, или всичко друго, което ще ви помогне да модерирате този екземпляр в бъдеще.
+        title: Бележки за модериране
       private_comment: Личен коментар
       public_comment: Публичен коментар
       purge: Чистка
@@ -774,17 +787,26 @@ bg:
       title: Роли
     rules:
       add_new: Добавяне на правило
+      add_translation: Добавяне на превод
       delete: Изтриване
       description_html: Дори повечето хора да отбелязват, че са прочели и са съгласни с условията на услугата, обикновено хората не ги четат, докато не се сблъскат с проблем. <strong>Улеснете четенето на правилата за сървъра си, представяйки ги като списък с точки.</strong> Опитайте да се придържате към кратки и прости правила, но не ги разпилявайте в премного точки.
       edit: Промяна на правило
       empty: Още няма определени правила на сървъра.
+      move_down: Преместване надолу
+      move_up: Преместване нагоре
       title: Сървърни правила
+      translation: Превод
+      translations: Преводи
+      translations_explanation: Може по избор да добавите преводи за правилата. Стандартната стойност ще се показва, ако няма налична преведена версия. Винаги се уверявайте, че всеки предоставен превод е синхронизиран със стандартната стойност.
     settings:
       about:
         manage_rules: Управление на правилата на сървъра
         preamble: Предложете задълбочена информация за това как вашият сървър се управлява, модерира и финансира.
         rules_hint: Съществува специална част за правилата, които се очаква вашите потребители да спазват.
         title: Относно
+      allow_referrer_origin:
+        desc: Когато потребителите ви щракнат върху връзки към външни сайтове, то браузърите им може да изпращат адреса на сървъра ви в Mastodon както референтът. Изключете това, ако то неповторимо би установило самоличността на потребителя ви, например ако това е личен сървър в Mastodon.
+        title: Позволяване на външни сайтове да виждат сървъра ви в Mastodon като източник на трафик
       appearance:
         preamble: Настройване на мрежовия интерфейс на Mastodon.
         title: Външен вид
@@ -804,6 +826,7 @@ bg:
       discovery:
         follow_recommendations: Препоръки за следване
         preamble: За потребители, които са нови и не познават никого в Mastodon, показването на интересно съдържание е ключово. Настройте начина, по който различни функции по откриване на съдържание работят на вашия сървър.
+        privacy: Поверителност
         profile_directory: Указател на профила
         public_timelines: Публични хронологии
         publish_statistics: Публикуване на статистиката
@@ -890,6 +913,8 @@ bg:
     system_checks:
       database_schema_check:
         message_html: Има миграции на базата данни, които чакат да бъдат изпълнени. Моля, изпълнете ги, за да осигурите изправността на приложението
+      elasticsearch_analysis_index_mismatch:
+        message_html: Настройките за анализиращия индекс Elasticsearch са остарели. Пуснете <code>tootctl search deploy --only-mapping --only=%{value}</code>
       elasticsearch_health_red:
         message_html: Клъстерът Elasticsearch е нездрав (червено състояние), функциите за търсене не са налични
       elasticsearch_health_yellow:
@@ -1052,6 +1077,23 @@ bg:
           other: Използвано от %{count} души през последната седмица
       title: Препоръки и насоки на развитие
       trending: Изгряващи
+    username_blocks:
+      add_new: Добавяне на ново
+      block_registrations: Блокиране на регистрациите
+      comparison:
+        contains: Съдържа
+      contains_html: Съдържа %{string}
+      created_msg: Успешно създадено правило за потребителско име
+      delete: Изтриване
+      edit:
+        title: Промяна на правило за потреб. име
+      new:
+        create: Създаване на правило
+        title: Създаване на ново правило за потреб. име
+      no_username_block_selected: Няма променени правила за потребителско име, тъй като нищо не бе избрано
+      not_permitted: Няма позволение
+      title: Правила за потребителско име
+      updated_msg: Успешно обновено правило за потребителско име
     warning_presets:
       add_new: Добавяне на ново
       delete: Изтриване
@@ -1316,6 +1358,10 @@ bg:
     basic_information: Основна информация
     hint_html: "<strong>Персонализирайте какво хората виждат в обществения ви профил и до публикациите ви.</strong> Другите хора са по-склонни да ви последват и да взаимодействат с вас, когато имате попълнен профил и снимка на профила."
     other: Друго
+  emoji_styles:
+    auto: Автоматично
+    native: Естествено системно
+    twemoji: Twemoji
   errors:
     '400': Подадохте невалидна или деформирана заявка.
     '403': Нямате позволение да разгледате тази страница.
@@ -1625,6 +1671,10 @@ bg:
       title: Ново споменаване
     poll:
       subject: Анкетата от %{name} приключи
+    quote:
+      body: 'Ваша публикация беше цитирана от %{name}:'
+      subject: "%{name} цитира ваша публикация"
+      title: Нов цитат
     reblog:
       body: 'Ваша публикация беше раздута от %{name}:'
       subject: "%{name} разду ваша публикация"
@@ -1835,6 +1885,7 @@ bg:
     edited_at_html: Редактирано на %{date}
     errors:
       in_reply_not_found: Изглежда, че публикацията, на която се опитвате да отговорите, не съществува.
+      quoted_status_not_found: Публикацията, която се опитвате да цитирате, не съществува.
     over_character_limit: прехвърлен лимит от %{max} символа
     pin_errors:
       direct: Публикациите, които са видими само за потребители споменати в тях, не могат да бъдат закачани
@@ -1843,13 +1894,7 @@ bg:
       reblog: Раздуване не може да бъде закачано
     title: "%{name}: „%{quote}“"
     visibilities:
-      direct: Директно
-      private: Покажи само на последователите си
-      private_long: Видими само за последователи
       public: Публично
-      public_long: Всеки ги вижда
-      unlisted: Публично, но не показвай в публичния канал
-      unlisted_long: Всеки ги вижда, но са скрити от публичните хронологии
   statuses_cleanup:
     enabled: Автоматично изтриване на стари публикации
     enabled_hint: От само себе си трие публикациите ви, щом достигнат указания възрастов праг, освен ако не съвпаднат с някое от изключенията долу
@@ -1894,6 +1939,11 @@ bg:
     does_not_match_previous_name: не съвпада с предишното име
   terms_of_service:
     title: Условия на услугата
+  terms_of_service_interstitial:
+    future_preamble_html: Правим някои промени в условията на услугата ни, което ще влезе в сила на <strong>%{date}</strong>. Насърчаваме ви да разгледате обновените условия.
+    past_preamble_html: Променихме условията на услугата ни от последното ви посещение. Насърчаваме ви да разгледате обновените условия.
+    review_link: Разглеждане на условията на услугата
+    title: Условията на услугата на %{domain} се променят
   themes:
     contrast: Mastodon (висок контраст)
     default: Mastodon (тъмно)
diff --git a/config/locales/br.yml b/config/locales/br.yml
index 9f0cf07ab95..30f4a50fbce 100644
--- a/config/locales/br.yml
+++ b/config/locales/br.yml
@@ -23,9 +23,13 @@ br:
       two: Toudoù
     posts_tab_heading: Toudoù
   admin:
+    account_actions:
+      action: Arloañ
+      already_suspended: Astalet eo bet ar gont-mañ endeo.
     account_moderation_notes:
       create: Leuskel un notenn
     accounts:
+      add_email_domain_block: Stankañ an domani postel
       approve: Aprouiñ
       are_you_sure: Ha sur oc'h?
       avatar: Avatar
@@ -37,7 +41,10 @@ br:
         new_email: Postel nevez
         submit: Kemmañ ar postel
       change_role:
+        edit_roles: Merañ perzhioù an implijerien·ezed
+        label: Cheñch perzh
         no_role: Roll ebet
+        title: Cheñch perzh %{username}
       confirm: Kadarnaat
       confirmed: Kadarnaet
       confirming: O kadarnaat
@@ -51,8 +58,10 @@ br:
       domain: Domani
       edit: Kemmañ
       email: Postel
-      enable: Gweredekaat
+      email_status: Statud ar postel
+      enable: Diskornañ
       enabled: Gweredekaet
+      enabled_msg: Diskornet eo bet kont %{username} gant berzh
       followers: Heulier·ezed·ien
       follows: Koumanantoù
       header: Talbenn
@@ -63,6 +72,7 @@ br:
         all: Pep tra
         local: Lec'hel
         remote: A-bell
+        title: Lec'hiadur
       media_attachments: Restroù media stag
       moderation:
         active: Oberiant
@@ -87,6 +97,8 @@ br:
       role: Roll
       search: Klask
       security: Surentez
+      security_measures:
+        only_password: Ger-tremen hepken
       silence: Bevenniñ
       silenced: Bevennet
       statuses: Toudoù
@@ -94,25 +106,56 @@ br:
       suspend: Astalañ
       suspended: Astalet
       title: Kontoù
+      unblock_email: Distankañ ar chomlec'h postel
+      unblocked_email_msg: Distanket eo bet chomlec'h postel %{username} gant berzh
+      unconfirmed_email: Postel digadarn
       undo_silenced: Dizober ar bevennañ
       unsubscribe: Digoumanantiñ
-      username: Anv
+      unsuspended_msg: Diastalet eo bet kont %{username} gant berzh
+      username: Anv implijer
       warn: Diwall
       web: Web
     action_logs:
       action_types:
-        approve_user: Aprouiñ an implijer
-        change_role_user: Kemmañ perzh an implijer
-        confirm_user: Aprouiñ an implijer
+        approve_user: Aprouiñ an implijer·ez
+        change_email_user: Cheñch postel an implijer·ez
+        change_role_user: Kemmañ perzh an implijer·ez
+        confirm_user: Aprouiñ an implijer·ez
+        create_custom_emoji: Krouiñ ur fromlun personelaet
         create_ip_block: Krouiñ ur reolenn IP
         create_user_role: Krouiñ ur perzh
+        destroy_custom_emoji: Dilemel ar fromlun personelaet
         destroy_ip_block: Dilemel ar reolenn IP
         destroy_status: Dilemel ar c'hannad
+        destroy_user_role: Dilemel ar perzh
+        disable_custom_emoji: Diweredekaat ar fromlun personelaet
+        disable_user: Diaotren an implijer·ez
+        enable_custom_emoji: Gweredekaat ar fromlun personelaet
         reset_password_user: Adderaouekaat ar ger-tremen
+        suspend_account: Astaliñ ar gont
+        unblock_email_account: Distankañ ar chomlec'h postel
+        unsuspend_account: Diastaliñ ar gont
+        update_custom_emoji: Hizivaat ar fromlun personelaet
         update_status: Hizivaat ar c'hannad
       actions:
+        change_email_user_html: Cheñchet eo bet chomlec'h postel an implijer·ez %{target} gant %{name}
+        confirm_user_html: Cheñchet eo bet chomlec'h postel an implijer·ez %{target} gant %{name}
+        create_custom_emoji_html: Pellgaset eo bet ar fromlun nevez %{target} gant %{name}
+        create_email_domain_block_html: Stanket eo bet an domani postel %{target} gant %{name}
+        destroy_custom_emoji_html: Dilamet eo bet ar fromlun %{target} gant %{name}
+        destroy_email_domain_block_html: Distanket eo bet an domani postel %{target} gant %{name}
         destroy_status_html: Dilamet eo bet toud %{target} gant %{name}
+        destroy_user_role_html: Dilamet eo bet ar perzh %{target} gant %{name}
+        disable_custom_emoji_html: Diweredekaet eo bet ar fromlun %{target} gant %{name}
+        enable_custom_emoji_html: Gweredekaet eo bet ar fromlun %{target} gant %{name}
+        resend_user_html: Adkaset eo bet ar postel kadarnaat evit %{target} gant %{name}
+        suspend_account_html: Astalet eo bet kont %{target} gant %{name}
+        unblock_email_account_html: Distanket eo bet chomlec'h postel %{target} gant %{name}
+        unsuspend_account_html: Diastelet eo bet kont %{target} gant %{name}
+        update_custom_emoji_html: Hizivaet eo bet ar fromlun %{target} gant %{name}
         update_status_html: Hizivaet eo bet toud %{target} gant %{name}
+      deleted_account: kont dilamet
+      filter_by_user: Silañ dre implijer·ez
       title: Renabl aodit
     announcements:
       live: War-eeun
@@ -120,6 +163,7 @@ br:
         create: Sevel ur gemenn
         title: Kemenn nevez
       publish: Embann
+      scheduled_for: Rakluniet da %{time}
       title: Kemennoù
       unpublish: Diembann
     custom_emojis:
@@ -128,16 +172,25 @@ br:
       delete: Dilemel
       disable: Diweredekaat
       disabled: Diweredekaet
+      disabled_msg: Diweredekaet eo bet ar fromlun-se gant berzh
       emoji: Fromlun
       enable: Gweredekaat
       enabled: Gweredekaet
+      image_hint: PNG pe GIF betek %{size}
       list: Listenn
       listed: Listennet
+      new:
+        title: Ouzhpennañ ur fromlun personelaet nevez
       overwrite: Flastrañ
       shortcode: Berradenn
+      title: Fromlunioù personelaet
       unlist: Dilistennañ
+      unlisted: Anlistennet
+      update_failed_msg: N'haller ket hizivaat ar fromlun-mañ
+      updated_msg: Fromlun hizivaet gant berzh!
       upload: Ezkargañ
     dashboard:
+      active_users: implijerien·ezed oberiant
       new_users: implijerien·ezed nevez
       software: Meziant
       title: Taolenn labour
@@ -151,24 +204,31 @@ br:
     domain_blocks:
       confirm_suspension:
         cancel: Nullañ
+        confirm: Astaliñ
       domain: Domani
+      export: Ezporzhiañ
+      import: Enporzhiañ
       new:
         create: Sevel ur stanker
         severity:
           noop: Hini ebet
           suspend: Astalañ
+      private_comment: Evezhiadenn brevez
       public_comment: Evezhiadenn foran
     email_domain_blocks:
-      add_new: Ouzhpenniñ unan nevez
+      add_new: Ouzhpennañ unan nevez
       delete: Dilemel
       dns:
         types:
           mx: Enrolladenn MX
       domain: Domani
       new:
-        create: Ouzhpenniñ un domani
+        create: Ouzhpennañ un domani
+      title: Domanioù postel stanket
     export_domain_allows:
       no_file: Restr ebet diuzet
+    export_domain_blocks:
+      no_file: Restr ebet diuzet
     fasp:
       debug:
         callbacks:
@@ -177,11 +237,14 @@ br:
       providers:
         active: Oberiant
         delete: Dilemel
+        edit: Kemmañ ar pourvezer
         name: Anv
         registrations:
           confirm: Kadarnaat
+        save: Enrollañ
         status: Statud
     follow_recommendations:
+      language: Evit ar yezh
       status: Statud
       suppressed: Dilamet
     instances:
@@ -204,6 +267,8 @@ br:
         all: Pep tra
         limited: Bevennet
         title: Habaskadur
+      private_comment: Evezhiadenn brevez
+      public_comment: Evezhiadenn foran
       purge: Spurjañ
       title: Kevread
       total_blocked_by_us: Stanket ganeomp
@@ -211,6 +276,7 @@ br:
       total_followed_by_us: Heuliet ganeomp
       total_storage: Restroù media stag
     invites:
+      deactivate_all: Diweredekaat pep tra
       filter:
         all: Pep tra
         available: Hegerzh
@@ -222,6 +288,7 @@ br:
       delete: Dilemel
       expires_in:
         '1209600': 2 sizhunvezh
+        '15778476': 6 mizvezh
         '2629746': 1 mizvezh
         '31556952': 1 bloavezh
         '86400': 1 devezh
@@ -246,6 +313,8 @@ br:
           other: "%{count} a notennoù"
           two: "%{count} a notennoù"
       action_log: Renabl aodit
+      already_suspended_badges:
+        local: Astalet endeo war ar servijer-mañ
       are_you_sure: Ha sur oc'h?
       comment:
         none: Hini ebet
@@ -260,14 +329,34 @@ br:
       title: Disklêriadennoù
       unresolved: Andiskoulmet
       updated_at: Nevesaet
+      view_profile: Gwelet ar profil
     roles:
+      add_new: Ouzhpennañ ur perzh
+      assigned_users:
+        few: "%{count} implijer·ez"
+        many: "%{count} implijer·ez"
+        one: "%{count} implijer·ez"
+        other: "%{count} implijer·ez"
+        two: "%{count} implijer·ez"
       categories:
+        administration: Merañ
         devops: DevOps
         invites: Pedadennoù
         moderation: Habaskadur
         special: Ispisial
       delete: Dilemel
+      edit: Kemmañ ar perzh '%{name}'
       privileges:
+        administrator: Merour
+        invite_users: Pediñ implijerien·ezed
+        invite_users_description: Aotren an implijerien·ezed da bediñ tud all d'ar servijer
+        manage_custom_emojis: Merañ ar fromlunioù personelaet
+        manage_invites: Merañ ar pedadennoù
+        manage_roles: Merañ ar perzhioù
+        manage_rules: Merañ ar reolennoù
+        manage_settings: Merañ an arventennoù
+        manage_settings_description: Aotren an implijerien·ezed da cheñch arventennoù al lec'hienn
+        manage_users: Merañ an implijerien·ezed
         view_devops: DevOps
       title: Rolloù
     rules:
@@ -276,40 +365,91 @@ br:
       edit: Kemmañ ar reolenn
       move_down: D'an traoñ
       move_up: D'ar c'hrec'h
+      title: Reolennoù ar servijer
       translation: Troidigezh
       translations: Troidigezhioù
     settings:
       about:
+        manage_rules: Merañ reolennoù ar servijer
         title: Diwar-benn
       appearance:
+        preamble: Personelaat etrefas web Mastodon.
         title: Neuz
       content_retention:
         danger_zone: Takad dañjer
       discovery:
         privacy: Buhez prevez
+        profile_directory: Kavlec'h ar profiloù
+        publish_statistics: Embann ar stadegoù
         title: Dizoloadur
         trends: Luskadoù
       domain_blocks:
         all: D'an holl dud
         disabled: Da zen ebet
+        users: D'an implijerien·ezed lec'hel kevreet
+      title: Arventennoù ar servijer
+    site_uploads:
+      delete: Dilemel ar restr pellgaset
+      destroyed_msg: Pellgasadenn zilamet gant berzh!
+    software_updates:
+      documentation_link: Gouzout hiroc'h
+      title: Hivizadennoù hegerz
+      type: Rizh
+      version: Handelv
     statuses:
       account: Aozer·ez
       batch:
         report: Disklêriañ
       deleted: Dilamet
       favourites: Re vuiañ-karet
+      language: Yezh
       media:
         title: Media
+      metadata: Metaroadennoù
+      no_history: An toud-mañ n'eo ket bet kemmet
       open: Digeriñ ar c'hannad
       original_status: Toud orin
       reblogs: Skignadennoù
       status_changed: Toud kemmet
       status_title: Embannadenn gant @%{name}
+      trending: Diouzh ar c'hiz
       visibility: Gwelusted
       with_media: Gant mediaoù
     strikes:
       actions:
         delete_statuses: Dilamet eo bet toudoù %{target} gant %{name}
+        disable: Skornet eo bet kont %{target} gant %{name}
+        suspend: Astalet eo bet kont %{target} gant %{name}
+    system_checks:
+      elasticsearch_preset:
+        action: Gwelet an teuliadur
+      elasticsearch_preset_single_node:
+        action: Gwelet an teuliadur
+      rules_check:
+        action: Merañ reolennoù ar servijer
+      software_version_check:
+        action: Gwelet an hizivadennoù hegerz
+        message_html: Un hizivadenn eus Mastodon a zo hegerz.
+      software_version_critical_check:
+        action: Gwelet an hizivadennoù hegerz
+      software_version_patch_check:
+        action: Gwelet an hizivadennoù hegerz
+      upload_check_privacy_error:
+        action: Gwelet amañ evit kaout muioc'h a ditouroù
+      upload_check_privacy_error_object_storage:
+        action: Gwelet amañ evit kaout muioc'h a ditouroù
+    tags:
+      search: Klask
+      title: Gerioù-klik
+    terms_of_service:
+      history: Roll-istor
+      preview:
+        send_preview: Kas ur rakwel da %{email}
+      publish: Embann
+      published_on_html: Embannet d'an %{date}
+      save_draft: Enrollañ ar brouilhed
+      title: Divizoù implijout
+    title: Merañ
     trends:
       allow: Aotren
       approved: Aprouet
@@ -320,17 +460,23 @@ br:
       rejected: Nac'het
       statuses:
         allow: Aotren ar c'hannad
+        title: Embannadurioù diouzh ar c'hiz
       tags:
         dashboard:
           tag_uses_measure: implijoù hollek
         not_usable: N'haller ket en implijout
-        title: Hashtagoù diouzh ar c'hiz
+        title: Gerioù-klik diouzh ar c'hiz
+      trending: Diouzh ar c'hiz
+    username_blocks:
+      add_new: Ouzhpennañ unan nevez
+      delete: Dilemel
     warning_presets:
-      add_new: Ouzhpenniñ unan nevez
+      add_new: Ouzhpennañ unan nevez
       delete: Dilemel
     webhooks:
       delete: Dilemel
       disable: Diweredekaat
+      disabled: Diweredekaet
       enable: Bevaat
       enabled: Bev
       events: Darvoudoù
@@ -339,37 +485,63 @@ br:
   admin_mailer:
     new_appeal:
       actions:
+        delete_statuses: dilemel h·e·c'h embannadurioù
+        disable: skorañ h·e kont
         none: ur c'hemenn diwall
+        suspend: astaliñ h·e kont
     new_trends:
+      new_trending_statuses:
+        title: Embannadurioù diouzh ar c'hiz
       new_trending_tags:
-        title: Hashtagoù diouzh ar c'hiz
+        title: Gerioù-klik diouzh ar c'hiz
+  aliases:
+    add_new: Krouiñ un alias
+    empty: N'ho peus alias ebet.
+    remove: Dilemel an alias
   appearance:
     discovery: Dizoloadur
     localization:
       body: Gant tud a-youl vat eo troet Mastodon.
       guide_link: https://crowdin.com/project/mastodon
   application_mailer:
+    salutation: "%{name},"
     view: 'Sellet :'
+    view_profile: Gwelet ar profil
     view_status: Gwelet ar c'hannad
+  applications:
+    logout: Digevreañ
   auth:
+    confirmations:
+      clicking_this_link: klaskit klikañ amañ
+      login_link: kevreañ
+      welcome_title: Degemer mat e bourzh, %{name}!
     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.
     description:
       prefix_invited_by_user: Pedet oc'h gant @%{name} da zont e-barzh ar servijer Mastodon-mañ!
+    didnt_get_confirmation: N'ho peus ket degemeret ul liamm kadarnaat?
+    dont_have_your_security_key: N'emañ ket hoc'h alc'hwez surentez ganeoc'h?
+    forgot_password: Ankouaet ho ker-tremen ganeoc'h?
     login: Mont tre
-    logout: Digennaskañ
+    logout: Digevreañ
     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>.
+    progress:
+      confirm: Kadarnaat ho postel
     providers:
       cas: CAS
       saml: SAML
     register: Lakaat ho anv
+    resend_confirmation: Adkas al liamm kadarnaat
     reset_password: Adderaouekaat ar ger-tremen
+    rules:
+      title_invited: Pedet oc'h bet.
     security: Diogelroez
     status:
       account_status: Statud ar gont
   challenge:
     confirm: Kenderc' hel
     invalid_password: Ger-tremen diwiriek
+    prompt: Kadarnait ho ker-tremen evit kenderc'hel
   date:
     formats:
       default: "%d a viz %b %Y"
@@ -394,22 +566,35 @@ br:
     strikes:
       appeal: Ober engalv
       created_at: Deiziad
+      status: 'Embannadur #%{id}'
       title_actions:
+        disable: Skornañ ar gont
         none: Diwall
+        suspend: Astaliñ ar gont
+  edit_profile:
+    basic_information: Titouroù diavaez
+    other: All
+  emoji_styles:
+    auto: Emgefreek
+    twemoji: Twemoji
   exports:
     archive_takeout:
       date: Deiziad
+      download: Pellgargañ ho tielloù
       size: Ment
     blocks: Stankañ a rit
     bookmarks: Sinedoù
     csv: CSV
     lists: Listennoù
   featured_tags:
-    add_new: Ouzhpenniñ unan nevez
+    add_new: Ouzhpennañ unan nevez
   filters:
     contexts:
       account: Profiloù
       notifications: Kemennoù
+    edit:
+      statuses: Embannadurioù hiniennel
+      title: Kemmañ ar sil
     index:
       delete: Dilemel
       statuses:
@@ -419,12 +604,15 @@ br:
         other: "%{count} a gannadoù"
         two: "%{count} gannad"
       title: Siloù
+    new:
+      save: Enrollañ ar sil nevez
     statuses:
       index:
         title: Toudoù silet
   generic:
     all: Pep tra
     changes_saved_msg: Enrollet eo bet ar cheñchamantoù gant berzh!
+    confirm: Kadarnaat
     copy: Eilañ
     delete: Dilemel
     none: Hini ebet
@@ -432,11 +620,26 @@ br:
     save_changes: Enrollañ ar cheñchamantoù
     today: hiziv
   imports:
+    errors:
+      empty: Restr CSV goullo
+      invalid_csv_file: 'Restr CSV didalvoudek. Fazi: %{error}'
+      too_large: Re vras eo ar restr
     modes:
       merge: Teuziñ
       overwrite: Flastrañ
+    states:
+      finished: Echu
+      scheduled: Rakluniet
+      unconfirmed: Digadarn
+    status: Statud
+    titles:
+      blocking: Enporzhiañ kontoù stanket
+      bookmarks: Enporzhiañ sinedoù
+      domain_blocking: Enporzhiañ domanioù stanket
+      lists: Enporzhiañ listennoù
     types:
       bookmarks: Sinedoù
+      lists: Listennoù
     upload: Ezkargañ
   invites:
     delete: Diweredekaat
@@ -449,9 +652,23 @@ br:
       '604800': 1 sizhun
       '86400': 1 deiz
     expires_in_prompt: Birviken
+    invited_by: 'Pedet oc''h bet gant:'
+    max_uses:
+      few: "%{count} implij"
+      many: "%{count} implij"
+      one: 1 implij
+      other: "%{count} implij"
+      two: "%{count} implij"
     table:
       uses: Implijoù
     title: Pediñ tud
+  login_activities:
+    authentication_methods:
+      password: ger-tremen
+      webauthn: alc’hwezioù surentez
+  mail_subscriptions:
+    unsubscribe:
+      action: Ya, digoumanantiñ
   media_attachments:
     validations:
       images_and_video: N'haller stagañ ur video ouzh un embannadur a zo fotoioù gantañ dija
@@ -461,12 +678,21 @@ br:
   moderation:
     title: Habaskadur
   notification_mailer:
+    favourite:
+      body: 'Ouzhpennet eo bet hoc''h embannadur gant %{name} d''h·e re vuiañ-karet:'
+      subject: Gant %{name} eo bet ouzhpennet hoc'h embannadur d'h·e re vuiañ-karet
+      title: Embannadur muiañ-karet nevez
     follow:
       title: Heulier nevez
     mention:
       action: Respont
+    quote:
+      body: 'Meneget eo bet hoc''h embannadur gant %{name}:'
+      subject: Gant %{name} eo bet meneget hoc'h embannadur
+      title: Meneg nevez
     reblog:
-      subject: 'Gant %{name} eo bet skignet ho toud '
+      body: 'Skignet eo bet hoc''h embannadur gant %{name}:'
+      subject: 'Gant %{name} eo bet skignet hoc''h embannadur '
       title: Skignadenn nevez
     status:
       subject: Embannet ez eus bet traoù gant %{name}
@@ -490,12 +716,18 @@ br:
     next: Da-heul
     older: Koshoc'h
     prev: A-raok
+    truncate: "&hellip;"
   polls:
     errors:
       self_vote: N'hallit ket votiñ en ho sontadegoù deoc'h-c'hwi
   preferences:
     other: All
     posting_defaults: Arventennoù embann dre ziouer
+  privacy:
+    privacy: Prevezded
+    search: Klask
+  privacy_policy:
+    title: Reolennoù prevezded
   redirects:
     prompt: M'ho peus fiziañs el liamm-mañ, klikit warnañ evit kenderc'hel.
     title: O kuitaat %{instance} emaoc'h.
@@ -507,6 +739,7 @@ br:
     moved: Dilojet
     mutual: Kenetre
     primary: Kentañ
+    status: Statud ar gont
   sessions:
     browser: Merdeer
     browsers:
@@ -517,6 +750,7 @@ br:
       electron: Electron
       firefox: Firefox
       generic: Merdeer dianav
+      huawei_browser: Merdeer Huawei
       ie: Internet Explorer
       micro_messenger: MicroMessenger
       nokia: Merdeer Nokia S40 Ovi
@@ -526,9 +760,11 @@ br:
       qq: QQ Browser
       safari: Safari
       uc_browser: UC Browser
+      unknown_browser: Merdeer dianav
       weibo: Weibo
     date: Deiziad
     description: "%{browser} war %{platform}"
+    explanation: Sed amañ ar merdeerioù kevreet gant ho kont Mastodon bremañ.
     ip: IP
     platforms:
       adobe_air: Adobe Air
@@ -541,14 +777,27 @@ br:
   settings:
     account: Kont
     account_settings: Arventennoù ar gont
+    aliases: Aliasoù ar gont
+    appearance: Neuz
     back: Distreiñ da vMastodon
+    delete: Dilemel ar gont
     development: Diorren
     edit_profile: Kemmañ ar profil
-    featured_tags: Hashtagoù pennañ
+    export: Ezporzhiañ
+    featured_tags: Penngerioù-klik
     import: Enporzhiañ
     import_and_export: Enporzhiañ hag ezporzhiañ
+    notifications: Kemennoù dre bostel
     preferences: Gwellvezioù
     profile: Profil
+    relationships: Heulierien·ezed ha tud heuliet
+  severed_relationships:
+    download: Pellgargañ (%{count})
+    event_type:
+      user_domain_block: Stanket ho peus %{target_name}
+    lost_followers: Heulierien·ezed kollet
+    lost_follows: Tud heuliet kollet
+    type: Darvoud
   statuses:
     attached:
       image:
@@ -557,25 +806,45 @@ br:
         one: "%{count} skeudenn"
         other: "%{count} skeudenn"
         two: "%{count} skeudenn"
+    edited_at_html: Kemmet d'an %{date}
+    errors:
+      quoted_status_not_found: War a seblant, n'eus ket eus an embannadenn emaoc'h o klask menegiñ.
     pin_errors:
       ownership: N'hallit ket spilhennañ embannadurioù ar re all
+      reblog: N'haller ket spilhennañ ur skignadenn
     quote_policies:
-      public: Pep den
+      followers: Heulierien·ezed hepken
+      nobody: Me hepken
+      public: Pep hini
+    title: '%{name}: "%{quote}"'
     visibilities:
-      direct: War-eeun
+      direct: Meneg prevez
       public: Publik
   statuses_cleanup:
     keep_direct: Mirout ar c'hannadoù eeun
     keep_media: Derc'hel an embannadurioù gant restroù stag
+    keep_pinned: Mirout an embannadurioù spilhennet
+    keep_pinned_hint: Chom hep dilemel hoc'h embannadurioù spilhennet
+    keep_self_bookmark: Mirout an embannadurioù enrollet evel sinedoù
+    keep_self_bookmark_hint: Chom hep dilemel hoc'h embannadurioù m'ho peus lakaet anezho er sinedoù
+    keep_self_fav: Mirout an embannadurioù muiañ-karet
+    keep_self_fav_hint: Chom hep dilemel hoc'h embannadurioù m'ho peus lakaet anezho en ho re vuiañ-karet
     min_age:
       '1209600': 2 sizhunvezh
+      '15778476': 6 mizvezh
       '2629746': 1 mizvezh
       '31556952': 1 bloavezh
+      '5259492': 2 mizvezh
       '604800': 1 sizhunvezh
       '63113904': 2 vloavezh
+      '7889238': 3 mizvezh
+  terms_of_service:
+    title: Divizoù implijout
   themes:
+    contrast: Mastodon (Dargemm kreñv)
     default: Mastodon (Teñval)
     mastodon-light: Mastodon (Sklaer)
+    system: Emgefreek (implijout neuz ar reizhiad)
   time:
     formats:
       default: "%d a viz %b %Y, %H:%M"
@@ -586,18 +855,33 @@ br:
     add: Ouzhpennañ
     disable: Diweredekaat
     edit: Kemmañ
+    webauthn: Alc’hwezioù surentez
   user_mailer:
     appeal_approved:
       action: Arventennoù ar gont
     backup_ready:
       extra: Prest eo da vezañ pellgarget!
+      subject: Prest eo ho tielloù da vezañ pellgarget
+    suspicious_sign_in:
+      change_password: kemmañ ho ker-tremen
+    terms_of_service_changed:
+      sign_off: Skipailh %{domain}
+      subject: Kemmoù en hon divizoù implijout
+      subtitle: Cheñchet o deus divizoù implijout %{domain}
     warning:
       categories:
         spam: Spam
-      reason: 'Abeg :'
-      statuses: 'Toudoù meneget :'
+      reason: 'Abeg:'
+      statuses: 'Embannadurioù meneget:'
+      subject:
+        disable: Skornet eo bet ho kont %{acct}
+        suspend: Astalet eo bet ho kont %{acct}
       title:
+        delete_statuses: Embannadurioù dilamet
+        disable: Kont skornet
         none: Diwall
+        silence: Kont vevennet
+        suspend: Kont astalet
     welcome:
       apps_android_action: Tapit anezhañ war Google Play
       apps_ios_action: Pellgargañ war an App Store
@@ -607,6 +891,13 @@ br:
       edit_profile_title: Personelaat ho profil
       feature_action: Gouzout hiroc'h
       follow_action: Heuliañ
+      follow_title: Personelait ho red degemer
+      follows_subtitle: Heuilhit kontoù brudet-mat
+      follows_title: Piv heuliañ
+      hashtags_title: Gerioù-klik diouzh ar c'hiz
+      hashtags_view_more: Gwelet muioc'h a c'herioù-klik diouzh ar c'hiz
+      post_title: Grit hoc'h embannadur kentañ
+      share_title: Rannit ho kont Mastodon
       sign_in_action: Kevreañ
       subject: Donemat e Mastodon
       title: Degemer mat e bourzh, %{name}!
@@ -614,6 +905,7 @@ br:
     follow_limit_reached: N'hallit ket heulian muioc'h eget %{limit} a zen
     signed_in_as: 'Aet-tre evel:'
   verification:
+    here_is_how: Setu penaos
     verification: Amprouadur
   webauthn_credentials:
     add: Ouzphennañ un alc'hwez surentez nevez
@@ -622,7 +914,7 @@ br:
       success: Hoc'h alc'hwez surentez a zo bet ouzphennet gant berzh.
     delete: Dilemel
     delete_confirmation: Sur oc'h e fell deoc'h dilemel an alc'hwez surentez-se ?
-    description_html: Ma'z eo aotreet <strong>dilesadur dre alc'hwez surentez</strong>, ret e vo deoc'h implijout unan eus hoc'h alc'hwezioù surentez evit mont-tre.
+    description_html: M'eo aotreet an <strong>dilesa dre alc'hwez surentez</strong> e vo ret deoc'h implijout unan eus hoc'h alc'hwezioù surentez evit mont-tre.
     destroy:
       error: Ur gudenn a oa en ur zilemel hoc'h alc'hwez surentez. Mar plij, klaskit c'hoazh.
       success: Hoc'h alc'hwez surentez a zo bet dilamet gant berzh.
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 0d0d60cf520..1c69c680928 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -190,6 +190,7 @@ ca:
         create_relay: Crea un repetidor
         create_unavailable_domain: Crea un domini no disponible
         create_user_role: Crea Rol
+        create_username_block: Crear regla de nom d'usuari
         demote_user: Degrada l'usuari
         destroy_announcement: Esborra l'anunci
         destroy_canonical_email_block: Elimina el blocatge del correu electrònic
@@ -203,6 +204,7 @@ ca:
         destroy_status: Elimina la publicació
         destroy_unavailable_domain: Esborra domini no disponible
         destroy_user_role: Destrueix Rol
+        destroy_username_block: Eliminar regla de nom d'usuari
         disable_2fa_user: Desactiva 2FA
         disable_custom_emoji: Desactiva l'emoji personalitzat
         disable_relay: Desactiva el repetidor
@@ -237,6 +239,7 @@ ca:
         update_report: Actualitza l'informe
         update_status: Actualitza l'estat
         update_user_role: Actualitza Rol
+        update_username_block: Actualitzar regla de nom d'usuari
       actions:
         approve_appeal_html: "%{name} ha aprovat l'apel·lació a la decisió de moderació de %{target}"
         approve_user_html: "%{name} ha aprovat el registre de %{target}"
@@ -578,6 +581,12 @@ ca:
         all: Totes
         limited: Limitades
         title: Moderació
+      moderation_notes:
+        create: Afegeix una nota de moderació
+        created_msg: S'ha creat la nota de moderació d'instància.
+        description_html: Mireu i deixeu notes per als altres moderadors i per a un mateix
+        destroyed_msg: S'ha esborrat la nota de moderació d'instància.
+        title: Notes de moderació
       private_comment: Comentari privat
       public_comment: Comentari públic
       purge: Purga
@@ -803,6 +812,8 @@ ca:
         preamble: Proporciona informació detallada sobre com funciona, com es modera i com es financia el servidor.
         rules_hint: Hi ha un àrea dedicada a les normes a les que s'espera que els teus usuaris s'hi adhereixin.
         title: Quant a
+      allow_referrer_origin:
+        title: Permeteu que llocs externs vegin el vostre servidor de Mastodon com a font de trànsit
       appearance:
         preamble: Personalitza l'interfície web de Mastodon.
         title: Aparença
@@ -1075,6 +1086,24 @@ ca:
           other: Emprat per %{count} persones en la darrera setmana
       title: Recomanacions i tendències
       trending: Tendència
+    username_blocks:
+      add_new: Afegeix-ne una de nova
+      comparison:
+        contains: Conté
+        equals: És igual a
+      contains_html: Conté %{string}
+      created_msg: Creada una regla de nom d'usuari
+      delete: Elimina
+      edit:
+        title: Editar regla de nom d'usuari
+      matches_exactly_html: És igual a %{string}
+      new:
+        create: Crea una regla
+        title: Crear nova regla de nom d'usuari
+      no_username_block_selected: No s'ha canviat cap regla de nom d'usuari perquè no se n'havia seleccionat cap
+      not_permitted: No permés
+      title: Regles de nom d'usuari
+      updated_msg: Actualitzada una regla de nom d'usuari
     warning_presets:
       add_new: Afegir-ne un de nou
       delete: Elimina
@@ -1339,6 +1368,10 @@ 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
+  emoji_styles:
+    auto: Automàtic
+    native: Nadiu
+    twemoji: Twemoji
   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.
@@ -1474,6 +1507,28 @@ ca:
       lists_html:
         one: Esteu a punt de <strong>reemplaçar les vostres llistes</strong> amb contactes de <strong>%{filename}</strong>. S'afegirà <strong>%{count} compte</strong> a les noves llistes.
         other: Esteu a punt de <strong>reemplaçar les vostres llistes</strong> amb contactes de <strong>%{filename}</strong>. S'afegiran fins a <strong>%{count} comptes</strong> a les noves llistes.
+      muting_html:
+        one: Esteu a punt de <strong>reemplaçar la vostra llista de comptes silenciats</strong> amb fins a <strong>%{count} compte</strong> de <strong>%{filename}</strong>.
+        other: Esteu a punt de <strong>reemplaçar la vostra llista de comptes silenciats</strong> amb fins a <strong>%{count} comptes</strong> de <strong>%{filename}</strong>.
+    preambles:
+      blocking_html:
+        one: Esteu a punt de <strong>blocar</strong> fins a <strong>%{count} compte</strong> de <strong>%{filename}</strong>.
+        other: Esteu a punt de <strong>blocar</strong> fins a <strong>%{count} comptes</strong> de <strong>%{filename}</strong>.
+      bookmarks_html:
+        one: Esteu a punt d'afegir fins a <strong>%{count} publicació</strong> de <strong>%{filename}</strong> als vostres <strong>marcadors</strong>.
+        other: Esteu a punt d'afegir fins a <strong>%{count} publicacions</strong> de <strong>%{filename}</strong> als vostres <strong>marcadors</strong>.
+      domain_blocking_html:
+        one: Esteu a punt de <strong>blocar</strong> fins a <strong>%{count} domini</strong> de <strong>%{filename}</strong>.
+        other: Esteu a punt de <strong>blocar</strong> fins a <strong>%{count} dominis</strong> de <strong>%{filename}</strong>.
+      following_html:
+        one: Esteu a punt de <strong>seguir</strong> fins a <strong>%{count} compte</strong> de <strong>%{filename}</strong>.
+        other: Esteu a punt de <strong>seguir</strong> fins a <strong>%{count} comptes</strong> de <strong>%{filename}</strong>.
+      lists_html:
+        one: Esteu a punt d'afegir <strong>%{count} compte</strong> de <strong>%{filename}</strong> a les vostres <strong>llistes</strong>. Es crearan noves llistes si no n'hi ha cap on afegir-lo.
+        other: Esteu a punt d'afegir <strong>%{count} comptes</strong> de <strong>%{filename}</strong> a les vostres <strong>llistes</strong>. Es crearan noves llistes si no n'hi ha cap on afegir-los.
+      muting_html:
+        one: Esteu a punt de <strong>silenciar</strong> fins a <strong>%{count} compte</strong> de <strong>%{filename}</strong>.
+        other: Esteu a punt de <strong>silenciar</strong> fins a <strong>%{count} comptes</strong> de <strong>%{filename}</strong>.
     preface: Pots importar algunes les dades que has exportat des d'un altre servidor, com ara el llistat de les persones que estàs seguint o bloquejant.
     recent_imports: Importacions recents
     states:
@@ -1626,6 +1681,10 @@ ca:
       title: Nova menció
     poll:
       subject: Ha finalitzat l'enquesta de %{name}
+    quote:
+      body: 'La vostra publicació ha estat citada per %{name}:'
+      subject: "%{name} ha citat la vostra publicació"
+      title: Nova citació
     reblog:
       body: "%{name} ha impulsat el teu estat:"
       subject: "%{name} ha impulsat el teu estat"
@@ -1674,8 +1733,9 @@ ca:
       self_vote: No pots votar en les teves propies enquestes
       too_few_options: ha de tenir més d'una opció
       too_many_options: no pot contenir més de %{max} opcions
+    vote: Voteu
   preferences:
-    other: Altre
+    other: Altres
     posting_defaults: Valors per defecte de publicació
     public_timelines: Línies de temps públiques
   privacy:
@@ -1836,6 +1896,7 @@ ca:
     edited_at_html: Editat %{date}
     errors:
       in_reply_not_found: El tut al qual intentes respondre sembla que no existeix.
+      quoted_status_not_found: Sembla que la publicació que vols citar no existeix.
     over_character_limit: Límit de caràcters de %{max} superat
     pin_errors:
       direct: Els tuts que només són visibles per als usuaris mencionats no poden ser fixats
@@ -1843,18 +1904,16 @@ ca:
       ownership: No es pot fixar el tut d'algú altre
       reblog: No es pot fixar un impuls
     quote_policies:
-      followers: Seguidors i usuaris mencionats
-      nobody: Només usuaris mencionats
-      public: Tothom
+      followers: Només seguidors
+      nobody: Només jo
+      public: Qualsevol
     title: '%{name}: "%{quote}"'
     visibilities:
-      direct: Directe
+      direct: Menció privada
       private: Només seguidors
-      private_long: Mostra només als seguidors
       public: Públic
-      public_long: Tothom pot veure-ho
-      unlisted: No llistat
-      unlisted_long: Tothom ho pot veure, però no es mostra en les línies de temps públiques
+      public_long: Tothom dins o fora Mastodon
+      unlisted_long: Amagat dels resultats de cerca de Mastodon, de les tendències i de les línies temporals
   statuses_cleanup:
     enabled: Esborra automàticament tuts antics
     enabled_hint: Suprimeix automàticament els teus tuts quan arribin a un llindar d’edat especificat, tret que coincideixin amb una de les excepcions següents
diff --git a/config/locales/ckb.yml b/config/locales/ckb.yml
index 0f2a5ed3647..891453a7cef 100644
--- a/config/locales/ckb.yml
+++ b/config/locales/ckb.yml
@@ -939,12 +939,7 @@ ckb:
       ownership: نووسراوەکانی تر ناتوانرێ بسەلمێت
       reblog: بەهێزکردن ناتوانرێت بچەسپێ
     visibilities:
-      private: شوێنکەوتوانی تەنها
-      private_long: تەنها بۆ شوێنکەوتوانی پیشان بدە
       public: گشتی
-      public_long: هەموو کەس دەتوانێت ببینێت
-      unlisted: پێرست نەبووە
-      unlisted_long: هەموو کەس دەتوانێت بیبینێت، بەڵام لە هێڵی کاتی گشتی دا نەریزراوە
   stream_entries:
     sensitive_content: ناوەڕۆکی هەستیار
   tags:
diff --git a/config/locales/co.yml b/config/locales/co.yml
index 2e45ab92632..01dcc19ba3a 100644
--- a/config/locales/co.yml
+++ b/config/locales/co.yml
@@ -924,13 +924,7 @@ co:
       reblog: Ùn pudete micca puntarulà una spartera
     title: '%{name}: "%{quote}"'
     visibilities:
-      direct: Direttu
-      private: Solu per l’abbunati
-      private_long: Mustrà solu à l’abbunati
       public: Pubblicu
-      public_long: Tuttu u mondu pò vede
-      unlisted: Micca listatu
-      unlisted_long: Tuttu u mondu pò vede, mà micca indè e linee pubbliche
   statuses_cleanup:
     exceptions: Eccezzione
     keep_direct: Cunservà i missaghji diretti
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index e4c083bf707..8b21cfb2ebe 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -196,6 +196,7 @@ cs:
         create_relay: Vytvořit relay
         create_unavailable_domain: Vytvořit nedostupnou doménu
         create_user_role: Vytvořit roli
+        create_username_block: Vytvořit pravidlo pro uživatelská jména
         demote_user: Snížit roli uživatele
         destroy_announcement: Odstranit oznámení
         destroy_canonical_email_block: Odblokovat email
@@ -209,6 +210,7 @@ cs:
         destroy_status: Odstranit Příspěvek
         destroy_unavailable_domain: Smazat nedostupnou doménu
         destroy_user_role: Zničit roli
+        destroy_username_block: Odstranit pravidlo pro uživatelská jména
         disable_2fa_user: Vypnout 2FA
         disable_custom_emoji: Zakázat vlastní emoji
         disable_relay: Deaktivovat relay
@@ -243,6 +245,7 @@ cs:
         update_report: Upravit hlášení
         update_status: Aktualizovat Příspěvek
         update_user_role: Aktualizovat roli
+        update_username_block: Aktualizovat pravidlo pro uživatelská jména
       actions:
         approve_appeal_html: Uživatel %{name} schválil odvolání proti rozhodnutí moderátora %{target}
         approve_user_html: "%{name} schválil registraci od %{target}"
@@ -261,6 +264,7 @@ cs:
         create_relay_html: "%{name} vytvořil*a relay %{target}"
         create_unavailable_domain_html: "%{name} zastavil doručování na doménu %{target}"
         create_user_role_html: "%{name} vytvořil %{target} roli"
+        create_username_block_html: "%{name} přidali pravidlo pro uživatelská jména obsahující %{target}"
         demote_user_html: Uživatel %{name} degradoval uživatele %{target}
         destroy_announcement_html: Uživatel %{name} odstranil oznámení %{target}
         destroy_canonical_email_block_html: "%{name} odblokoval*a e-mail s hashem %{target}"
@@ -274,6 +278,7 @@ cs:
         destroy_status_html: Uživatel %{name} odstranil příspěvek uživatele %{target}
         destroy_unavailable_domain_html: "%{name} obnovil doručování na doménu %{target}"
         destroy_user_role_html: "%{name} odstranil %{target} roli"
+        destroy_username_block_html: "%{name} odstranili pravidlo pro uživatelská jména obsahující %{target}"
         disable_2fa_user_html: Uživatel %{name} vypnul dvoufázové ověřování pro uživatele %{target}
         disable_custom_emoji_html: Uživatel %{name} zakázal emoji %{target}
         disable_relay_html: "%{name} deaktivoval*a relay %{target}"
@@ -308,6 +313,7 @@ cs:
         update_report_html: "%{name} aktualizoval hlášení %{target}"
         update_status_html: Uživatel %{name} aktualizoval příspěvek uživatele %{target}
         update_user_role_html: "%{name} změnil %{target} roli"
+        update_username_block_html: "%{name} aktualizovali pravidlo pro uživatelská jména obsahující %{target}"
       deleted_account: smazaný účet
       empty: Nebyly nalezeny žádné záznamy.
       filter_by_action: Filtrovat podle akce
@@ -870,6 +876,10 @@ cs:
         all: Všem
         disabled: Nikomu
         users: Přihlášeným místním uživatelům
+      feed_access:
+        modes:
+          authenticated: Pouze autentifikovaní uživatelé
+          public: Všichni
       registrations:
         moderation_recommandation: Před otevřením registrací všem se ujistěte, že máte vhodný a reaktivní moderační tým!
         preamble: Mějte pod kontrolou, kdo může vytvořit účet na vašem serveru.
@@ -1121,6 +1131,25 @@ cs:
           other: Použit %{count} lidmi za poslední týden
       title: Doporučení & Trendy
       trending: Populární
+    username_blocks:
+      add_new: Přidat
+      block_registrations: Blokovat registrace
+      comparison:
+        contains: Obsahuje
+        equals: Rovná se
+      contains_html: Obsahuje %{string}
+      created_msg: Vytvořeno pravidlo pro uživatelská jména
+      delete: Smazat
+      edit:
+        title: Upravit pravidlo pro uživatelská jména
+      matches_exactly_html: Rovná se %{string}
+      new:
+        create: Vytvořit pravidlo
+        title: Vytvořit nové pravidlo pro uživatelská jména
+      no_username_block_selected: Nebyla změněna žádná pravidla pro uživatelská jména, protože žádná nebyla vybrána
+      not_permitted: Není povoleno
+      title: Pravidla uživatelských jmen
+      updated_msg: Pravidlo pro jména uživatelů bylo úspěšně aktualizováno
     warning_presets:
       add_new: Přidat nové
       delete: Smazat
@@ -1387,6 +1416,10 @@ cs:
     basic_information: Základní informace
     hint_html: "<strong>Nastavte si, co lidé uvidí na vašem veřejném profilu a vedle vašich příspěvků.</strong> Ostatní lidé vás budou spíše sledovat a komunikovat s vámi, když budete mít vyplněný profil a profilový obrázek."
     other: Další
+  emoji_styles:
+    auto: Auto
+    native: Výchozí
+    twemoji: Twemoji
   errors:
     '400': Žádost, kterou jste odeslali, byla neplatná nebo poškozená.
     '403': Nejste oprávněni tuto stránku zobrazit.
@@ -1736,6 +1769,10 @@ cs:
       title: Nová zmínka
     poll:
       subject: Anketa od %{name} skončila
+    quote:
+      body: 'Váš příspěvek citoval účet %{name}:'
+      subject: "%{name} citovali váš příspěvek"
+      title: Nová citace
     reblog:
       body: 'Uživatel %{name} boostnul váš příspěvek:'
       subject: Uživatel %{name} boostnul váš příspěvek
@@ -1784,9 +1821,12 @@ cs:
       self_vote: Nemůžete hlasovat ve svých vlastních anketách
       too_few_options: musí mít více než jednu položku
       too_many_options: nesmí obsahovat více než %{max} položek
+    vote: Hlasovat
+  posting_defaults:
+    explanation: Tato nastavení budou použita jako výchozí při vytváření nových příspěvků, ale v editoru je můžete upravit pro každý příspěvek zvlášť.
   preferences:
     other: Ostatní
-    posting_defaults: Výchozí možnosti psaní
+    posting_defaults: Výchozí nastavení příspěvků
     public_timelines: Veřejné časové osy
   privacy:
     hint_html: "<strong>Nastavte si, jak chcete, aby šlo váš profil a vaše příspěvky nalézt.</strong> Řada funkcí v Mastodonu vám může po zapnutí pomoci získat širší publikum. Věnujte chvíli kontrole těchto nastavení, aby vyhovovala vašim potřebám."
@@ -1954,6 +1994,7 @@ cs:
     edited_at_html: Upraven %{date}
     errors:
       in_reply_not_found: Příspěvek, na který se pokoušíte odpovědět, neexistuje.
+      quoted_status_not_found: Zdá se, že příspěvek, který se pokoušíte citovat neexistuje.
     over_character_limit: byl překročen limit %{max} znaků
     pin_errors:
       direct: Příspěvky viditelné pouze zmíněným uživatelům nelze připnout
@@ -1961,18 +2002,17 @@ cs:
       ownership: Nelze připnout příspěvek někoho jiného
       reblog: Boosty nelze připnout
     quote_policies:
-      followers: Sledující a zmínění uživatelé
-      nobody: Pouze zmínění uživatelé
-      public: Všichni
+      followers: Pouze sledující
+      nobody: Jen já
+      public: Kdokoliv
     title: "%{name}: „%{quote}“"
     visibilities:
-      direct: Přímé
-      private: Pouze pro sledující
-      private_long: Zobrazit pouze sledujícím
+      direct: Soukromá zmínka
+      private: Pouze sledující
       public: Veřejné
-      public_long: Uvidí kdokoliv
-      unlisted: Neuvedené
-      unlisted_long: Uvidí kdokoliv, ale nebude zahrnut ve veřejných časových osách
+      public_long: Kdokoliv na Mastodonu i mimo něj
+      unlisted: Ztišené veřejné
+      unlisted_long: Skryté z výsledků vyhledávání na Mastodonu, trendů a veřejných časových os
   statuses_cleanup:
     enabled: Automaticky mazat staré příspěvky
     enabled_hint: Automaticky maže vaše příspěvky poté, co dosáhnou stanoveného stáří, nesplňují-li některou z výjimek níže
diff --git a/config/locales/cy.yml b/config/locales/cy.yml
index 6e1826510c2..e6dfd21b15c 100644
--- a/config/locales/cy.yml
+++ b/config/locales/cy.yml
@@ -202,6 +202,7 @@ cy:
         create_relay: Creu Cyfnewidiad
         create_unavailable_domain: Creu Parth Ddim ar Gael
         create_user_role: Creu Rôl
+        create_username_block: Creu Rheol Enw Defnyddiwr
         demote_user: Diraddio Defnyddiwr
         destroy_announcement: Dileu Cyhoeddiad
         destroy_canonical_email_block: Dileu Rhwystr E-bost
@@ -215,6 +216,7 @@ cy:
         destroy_status: Dileu Postiad
         destroy_unavailable_domain: Dileu Parth Ddim ar Gael
         destroy_user_role: Dileu Rôl
+        destroy_username_block: Dileu Rheol Enw Defnyddiwr
         disable_2fa_user: Diffodd 2FA
         disable_custom_emoji: Analluogi Emoji Addasedig
         disable_relay: Analluogi Cyfnewidiad
@@ -249,6 +251,7 @@ cy:
         update_report: Diweddaru Adroddiad
         update_status: Diweddaru Postiad
         update_user_role: Diweddaru Rôl
+        update_username_block: Diweddaru Rheol Enw Defnyddiwr
       actions:
         approve_appeal_html: Mae %{name} wedi cymeradwyo penderfyniad cymedroli gan %{target}
         approve_user_html: Mae %{name} wedi cymeradwyo cofrestru gan %{target}
@@ -267,6 +270,7 @@ cy:
         create_relay_html: Creodd %{name} gyfnewidiad %{target}
         create_unavailable_domain_html: Mae %{name} wedi stopio danfon i barth %{target}
         create_user_role_html: Mae %{name} wedi creu rôl %{target}
+        create_username_block_html: Mae %{name} wedi ychwanegu rheol ar gyfer enwau defnyddwyr sy'n cynnwys %{target}
         demote_user_html: Mae %{name} wedi israddio defnyddiwr %{target}
         destroy_announcement_html: Mae %{name} wedi dileu cyhoeddiad %{target}
         destroy_canonical_email_block_html: Mae %{name} wedi dad-rwystro parth e-bost %{target}
@@ -280,6 +284,7 @@ cy:
         destroy_status_html: Mae %{name} wedi tynnu postiad gan %{target}
         destroy_unavailable_domain_html: Mae %{name} wedi ailddechrau anfon i barth %{target}
         destroy_user_role_html: Mae %{name} wedi dileu rôl %{target}
+        destroy_username_block_html: Mae %{name} wedi dileu rheol ar gyfer enwau defnyddwyr sy'n cynnwys %{target}
         disable_2fa_user_html: Mae %{name} wedi analluogi gofyniad dau ffactor ar gyfer defnyddiwr %{target}
         disable_custom_emoji_html: Mae %{name} wedi analluogi emoji %{target}
         disable_relay_html: Analluogodd %{name} y cyfnewidiad %{target}
@@ -314,6 +319,7 @@ cy:
         update_report_html: Mae %{name} wedi diweddaru adroddiad %{target}
         update_status_html: Mae %{name} wedi diweddaru postiad gan %{target}
         update_user_role_html: Mae %{name} wedi newid rôl %{target}
+        update_username_block_html: Mae %{name} wedi diweddaru rheol ar gyfer enwau defnyddwyr sy'n cynnwys %{target}
       deleted_account: cyfrif wedi'i ddileu
       empty: Dim logiau ar gael.
       filter_by_action: Hidlo yn ôl gweithred
@@ -898,6 +904,10 @@ cy:
         all: I bawb
         disabled: I neb
         users: I ddefnyddwyr lleol wedi'u mewngofnodi
+      feed_access:
+        modes:
+          authenticated: Defnyddwyr dilys yn unig
+          public: Pawb
       registrations:
         moderation_recommandation: Gwnewch yn siŵr bod gennych chi dîm cymedroli digonol ac adweithiol cyn i chi agor cofrestriadau i bawb!
         preamble: Rheoli pwy all greu cyfrif ar eich gweinydd.
@@ -1157,6 +1167,25 @@ cy:
           zero: Wedi'i ddefnyddio gan %{count} o bobl dros yr wythnos ddiwethaf
       title: Argymhellion a Threndiau
       trending: Trendio
+    username_blocks:
+      add_new: Ychwanegu newydd
+      block_registrations: Rhwystro cofrestriadau
+      comparison:
+        contains: Yn cynnwys
+        equals: Yn hafal i
+      contains_html: Yn cynnwys %{string}
+      created_msg: Rheol enw defnyddiwr wedi'i chreu'n llwyddiannus
+      delete: Dileu
+      edit:
+        title: Golygu rheol enw defnyddiwr
+      matches_exactly_html: Yn hafal i %{string}
+      new:
+        create: Creu rheol
+        title: Creu rheol enw defnyddiwr newydd
+      no_username_block_selected: Heb newid unrhyw reolau enw defnyddiwr gan nad oes un ohonyn nhw wedi'u dewis
+      not_permitted: Dim caniatâd
+      title: Rheolau enw defnyddiwr
+      updated_msg: Rheol enw defnyddiwr wedi'i diweddaru'n llwyddiannus
     warning_presets:
       add_new: Ychwanegu newydd
       delete: Dileu
@@ -1425,6 +1454,10 @@ 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
+  emoji_styles:
+    auto: Awto
+    native: Cynhenid
+    twemoji: Twemoji
   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.
@@ -1590,7 +1623,7 @@ cy:
       domain_blocking_html:
         few: Rydych ar fin <strong>amnewid eich rhestr rhwystro parthau </strong> gyda hyd at <strong>%{count} parth</strong> o <strong>%{filename}</strong>.
         many: Rydych ar fin <strong>amnewid eich rhestr rhwystro parthau </strong> gyda hyd at <strong>%{count} parth</strong> o <strong>%{filename}</strong>.
-        one: Rydych ar fin <strong>disodli eich rhestr blociau parth</strong> gyda hyd at <strong>%{count} parth</strong> o <strong>%{filename}</strong>.
+        one: Rydych ar fin <strong>amnewid eich rhestr blociau parth</strong> gyda hyd at <strong>%{count} parth</strong> o <strong>%{filename}</strong>.
         other: Rydych ar fin <strong>amnewid eich rhestr rhwystro parthau </strong> gyda hyd at <strong>%{count} parth</strong> o <strong>%{filename}</strong>.
         two: Rydych ar fin <strong>amnewid eich rhestr rhwystro parthau </strong> gyda hyd at <strong>%{count} parth</strong> o <strong>%{filename}</strong.
         zero: Rydych ar fin <strong>amnewid eich rhestr rhwystro parthau </strong> gyda hyd at <strong>%{count} parth</strong> o <strong>%{filename}</strong>.
@@ -1714,6 +1747,13 @@ cy:
       expires_at: Yn dod i ben ar
       uses: Defnyddiau
     title: Gwahodd pobl
+  link_preview:
+    author_html: Yn ôl %{name}
+    potentially_sensitive_content:
+      action: Cliciwch i ddangos
+      confirm_visit: Ydych chi'n siŵr eich bod chi eisiau agor y ddolen hon?
+      hide_button: Cuddio
+      label: Cynnwys a allai fod yn sensitif
   lists:
     errors:
       limit: Rydych chi wedi cyrraedd y nifer mwyaf o restrau
@@ -1814,6 +1854,10 @@ cy:
       title: Crywbylliad newydd
     poll:
       subject: Mae arolwg gan %{name} wedi dod i ben
+    quote:
+      body: 'Mae %{name} wedi dyfynnu eich postiad :'
+      subject: Mae %{name} wedi dyfynnu eich postiad
+      title: Dyfyniad newydd
     reblog:
       body: 'Cafodd eich postiad ei hybu gan %{name}:'
       subject: Rhoddodd %{name} hwb i'ch postiad
@@ -1862,6 +1906,9 @@ cy:
       self_vote: Nid oes modd i chi bleidleisio yn eich polau eich hun
       too_few_options: rhaid cael mwy nag un eitem
       too_many_options: ni all gynnwys mwy na %{max} eitem
+    vote: Pleidleisio
+  posting_defaults:
+    explanation: Bydd y gosodiadau hyn yn cael eu defnyddio fel rhagosodiadau pan fyddwch chi'n creu postiadau newydd, ond gallwch chi eu golygu fesul postiad o fewn y cyfansoddwr.
   preferences:
     other: Arall
     posting_defaults: Rhagosodiadau postio
@@ -1898,7 +1945,7 @@ cy:
     last_active: Yn weithgar ddiwethaf
     most_recent: Y diweddaraf
     moved: Wedi symud
-    mutual: Cydfudd
+    mutual: Yn Gyffredin
     primary: Cynradd
     relationship: Perthynas
     remove_selected_domains: Tynnu'r holl ddilynwyr o'r parthau a ddewiswyd
@@ -2029,6 +2076,9 @@ cy:
         zero: "%{count} fideo"
     boosted_from_html: Wedi'i hybu o %{acct_link}
     content_warning: 'Rhybudd cynnwys: %{warning}'
+    content_warnings:
+      hide: Cuddio'r postiad
+      show: Dangos rhagor
     default_language: Yr un fath a'r iaith rhyngwyneb
     disallowed_hashtags:
       few: 'yn cynnwys yr hashnod gwaharddedig: %{tags}'
@@ -2040,6 +2090,7 @@ cy:
     edited_at_html: Wedi'i olygu %{date}
     errors:
       in_reply_not_found: Nid yw'n ymddangos bod y postiad rydych chi'n ceisio ei ateb yn bodoli.
+      quoted_status_not_found: Nid yw'n ymddangos bod y postiad rydych chi'n ceisio'i ddyfynnu yn bodoli.
     over_character_limit: wedi mynd y tu hwnt i'r terfyn nodau o %{max}
     pin_errors:
       direct: Nid oes modd pinio postiadau sy'n weladwy i ddefnyddwyr a grybwyllwyd yn unig
@@ -2047,18 +2098,17 @@ cy:
       ownership: Nid oes modd pinio postiad rhywun arall
       reblog: Nid oes modd pinio hwb
     quote_policies:
-      followers: Dilynwyr a defnyddwyr wedi'u crybwyll
-      nobody: Dim ond defnyddwyr wedi'u crybwyll
+      followers: Dilynwyr yn unig
+      nobody: Dim ond fi
       public: Pawb
     title: '%{name}: "%{quote}"'
     visibilities:
-      direct: Uniongyrchol
-      private: Dilynwyr yn unig
-      private_long: Dangos i ddilynwyr yn unig
+      direct: Crybwylliad preifat
+      private: Dim ond dilynwyr
       public: Cyhoeddus
-      public_long: Gall pawb weld
-      unlisted: Heb ei restru
-      unlisted_long: Gall pawb weld, ond heb eu rhestru ar ffrydiau cyhoeddus
+      public_long: Unrhyw un ar ac oddi ar Mastodon
+      unlisted: Tawel cyhoeddus
+      unlisted_long: Wedi'i guddio o ganlyniadau chwilio Mastodon, trendio, a llinellau amser cyhoeddus
   statuses_cleanup:
     enabled: Dileu hen bostiadau'n awtomatig
     enabled_hint: Yn dileu eich postiadau yn awtomatig ar ôl iddyn nhw gyrraedd trothwy oed penodedig, oni bai eu bod yn cyfateb i un o'r eithriadau isod
diff --git a/config/locales/da.yml b/config/locales/da.yml
index 189ddea40d4..0f8bb88cd3f 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -190,6 +190,7 @@ da:
         create_relay: Opret Videresendelse
         create_unavailable_domain: Opret Utilgængeligt Domæne
         create_user_role: Opret rolle
+        create_username_block: Opret brugernavn-regel
         demote_user: Degradér bruger
         destroy_announcement: Slet bekendtgørelse
         destroy_canonical_email_block: Slet e-mailblokering
@@ -203,6 +204,7 @@ da:
         destroy_status: Slet indlæg
         destroy_unavailable_domain: Slet Utilgængeligt Domæne
         destroy_user_role: Ødelæg rolle
+        destroy_username_block: Slet brugernavn-regel
         disable_2fa_user: Deaktivér 2FA
         disable_custom_emoji: Deaktivér tilpasset emoji
         disable_relay: Deaktivér Videresendelse
@@ -237,6 +239,7 @@ da:
         update_report: Opdatér anmeldelse
         update_status: Opdatér indlæg
         update_user_role: Opdatér rolle
+        update_username_block: Opdatér brugernavn-regel
       actions:
         approve_appeal_html: "%{name} godkendte moderationsafgørelsesappellen fra %{target}"
         approve_user_html: "%{name} godkendte tilmeldingen fra %{target}"
@@ -255,6 +258,7 @@ da:
         create_relay_html: "%{name} oprettede videresendelsen %{target}"
         create_unavailable_domain_html: "%{name} stoppede levering til domænet %{target}"
         create_user_role_html: "%{name} oprettede %{target}-rolle"
+        create_username_block_html: "%{name} tilføjede regel for brugernavne indeholdende %{target}"
         demote_user_html: "%{name} degraderede brugeren %{target}"
         destroy_announcement_html: "%{name} slettede bekendtgørelsen %{target}"
         destroy_canonical_email_block_html: "%{name} afblokerede e-mailen med hash'et %{target}"
@@ -268,6 +272,7 @@ da:
         destroy_status_html: "%{name} fjernede indlægget fra %{target}"
         destroy_unavailable_domain_html: "%{name} genoptog levering til domænet %{target}"
         destroy_user_role_html: "%{name} slettede %{target}-rolle"
+        destroy_username_block_html: "%{name} fjernede regel for brugernavne indeholdende %{target}"
         disable_2fa_user_html: "%{name} deaktiverede tofaktorkravet for brugeren %{target}"
         disable_custom_emoji_html: "%{name} deaktiverede emojien %{target}"
         disable_relay_html: "%{name} deaktiverede videresendelsen %{target}"
@@ -302,6 +307,7 @@ da:
         update_report_html: "%{name} opdaterede rapporten %{target}"
         update_status_html: "%{name} opdaterede indlægget fra %{target}"
         update_user_role_html: "%{name} ændrede %{target}-rolle"
+        update_username_block_html: "%{name} opdaterede regel for brugernavne indeholdende %{target}"
       deleted_account: slettet konto
       empty: Ingen logger fundet.
       filter_by_action: Filtrér efter handling
@@ -360,7 +366,7 @@ da:
       shortcode_hint: Mindst 2 tegn, kun alfanumeriske og understregstegn
       title: Tilpassede emojier
       uncategorized: Ukategoriseret
-      unlist: Fjern fra oplistning
+      unlist: Fjern fra liste
       unlisted: Ikke oplistet
       update_failed_msg: Kunne ikke opdatere denne emoji
       updated_msg: Emoji er opdateret!
@@ -412,7 +418,7 @@ da:
         remove_all_data: Dette vil fjerne alt indhold, medier og profildata for dette domænes konti fra din server.
         stop_communication: Din server vil stoppe kommunikationen med disse servere.
         title: Bekræft blokering af domænet %{domain}
-        undo_relationships: Dette vil fortryde ethvert følgeforhold mellem konti for disse servere og din.
+        undo_relationships: Dette vil ophæve ethvert følgeforhold mellem konti på disse servere og dine.
       created_msg: Domæneblokering under behandling
       destroyed_msg: Domæneblokering er blevet fjernet
       domain: Domæne
@@ -653,7 +659,7 @@ da:
         mark_as_sensitive_description_html: Medierne i det anmeldte indlæg markeres som sensitive, og en advarsel (strike) registreres mhp. eskalering ved evt. fremtidige overtrædelser fra samme konto.
         other_description_html: Se flere muligheder for at kontrollere kontoens adfærd og tilpasse kommunikationen til den anmeldte konto.
         resolve_description_html: Ingen foranstaltninger træffes mod den anmeldte konto, ingen advarsel (strike) registreres og anmeldelsen lukkes.
-        silence_description_html: Kontoen vil kun være synlig for følgerene eller dem, som manuelt slå den op, hvilket markant begrænser dens udbredelse. Kan altid omgøres. Lukker alle indrapporteringer af kontoen.
+        silence_description_html: Kontoen vil kun være synlig for dem, der allerede følger den eller manuelt slår den op, hvilket alvorligt begrænser dens rækkevidde. Kan altid omgøres. Lukker alle indrapporteringer af denne konto.
         suspend_description_html: Kontoen inkl. alt indhold utilgængeliggøres og interaktion umuliggøres, og den slettes på et tidspunkt. Kan omgøres inden for 30 dage. Lukker alle indrapporteringer af kontoen.
       actions_description_html: Afgør, hvilke foranstaltning, der skal træffes for at løse denne anmeldelse. Ved en straffende foranstaltning mod den anmeldte konto, fremsendes en e-mailnotifikation, undtagen når kategorien <strong>Spam</strong> er valgt.
       actions_description_remote_html: Fastslå en nødvendig handling mhp. at løse denne anmeldelse. Dette vil kun påvirke <strong>din</strong> servers kommunikation med, og indholdshåndtering for, fjernkontoen.
@@ -842,6 +848,10 @@ da:
         all: Til alle
         disabled: Til ingen
         users: Til indloggede lokale brugere
+      feed_access:
+        modes:
+          authenticated: Kun godkendte brugere
+          public: Alle
       registrations:
         moderation_recommandation: Sørg for, at der er et tilstrækkeligt og reaktivt moderationsteam, før registrering åbnes for alle!
         preamble: Styr, hvem der kan oprette en konto på serveren.
@@ -1006,7 +1016,7 @@ da:
           one: Send %{display_count} e-mail
           other: Send %{display_count} e-mails
         title: Forhåndsvis Tjenestevilkår-underretning
-      publish: Udgiv
+      publish: Publicér
       published_on_html: Udgivet pr. %{date}
       save_draft: Gem udkast
       title: Tjenestevilkår
@@ -1085,6 +1095,25 @@ da:
           other: Brugt af %{count} personer den seneste uge
       title: Anbefalinger og trends
       trending: Trender
+    username_blocks:
+      add_new: Tilføj ny
+      block_registrations: Blokér registreringer
+      comparison:
+        contains: Indeholder
+        equals: Er lig
+      contains_html: Indeholder %{string}
+      created_msg: Brugernavn-regel er hermed oprettet
+      delete: Slet
+      edit:
+        title: Redigér brugernavn-regel
+      matches_exactly_html: Er lig med %{string}
+      new:
+        create: Opret regel
+        title: Opret ny brugernavn-regel
+      no_username_block_selected: Ingen brugernavn-regler ændret (ingen var valgt)
+      not_permitted: Ikke tilladt
+      title: Brugernavn-regler
+      updated_msg: Brugernavn-regel opdateret
     warning_presets:
       add_new: Tilføj ny
       delete: Slet
@@ -1205,7 +1234,7 @@ da:
       prefix_invited_by_user: "@%{name} inviterer dig ind på denne Mastodon-server!"
       prefix_sign_up: Tilmeld dig Mastodon i dag!
       suffix: Du vil med en konto kunne følge personer, indsende opdateringer og udveksle beskeder med brugere fra enhver Mastodon-server, og meget mere!
-    didnt_get_confirmation: Intet bekræftelseslink modtaget?
+    didnt_get_confirmation: Ikke modtaget bekræftelseslink?
     dont_have_your_security_key: Har ikke din sikkerhedsnøgle?
     forgot_password: Glemt din adgangskode?
     invalid_reset_password_token: Adgangskodenulstillingstoken ugyldigt eller udløbet. Anmod om et nyt.
@@ -1256,7 +1285,7 @@ da:
       account_status: Kontostatus
       confirming: Afventer færdiggørelse af e-mailbekræftelse.
       functional: Din konto er fuldt funktionel.
-      pending: Ansøgningen afventer gennemgang af vores personale. Dette kan tage noget tid. Man bør modtage en e-mail, såfremt ansøgningen godkendes.
+      pending: Ansøgningen afventer gennemgang af vores personale. Dette kan tage noget tid. Du modtager en e-mail, hvis din ansøgning bliver godkendt.
       redirecting_to: Din konto er inaktiv, da den pt. er omdirigerer til %{acct}.
       self_destruct: Da %{domain} er under nedlukning, vil kontoadgangen være begrænset.
       view_strikes: Se tidligere anmeldelser af din konto
@@ -1266,8 +1295,8 @@ da:
     user_privacy_agreement_html: Jeg accepterer <a href="%{privacy_policy_path}" target="_blank">fortrolighedspolitikken</a>
   author_attribution:
     example_title: Eksempeltekst
-    hint_html: Skriver du nyheder eller blogartikler uden for Mastodon? Styr, hvordan man bliver krediteret, når disse deles på Mastodon.
-    instructions: 'Sørg for, at denne kode er i artikelens HTML:'
+    hint_html: Skriver du nyheder eller blogartikler uden for Mastodon? Styr, hvordan du bliver krediteret, når de bliver delt på Mastodon.
+    instructions: 'Sørg for, at denne kode er i din artikels HTML:'
     more_from_html: Flere fra %{name}
     s_blog: "%{name}s blog"
     then_instructions: Tilføj dernæst publikationsdomænenavnet i feltet nedenfor.
@@ -1347,8 +1376,12 @@ da:
       your_appeal_rejected: Din appel er afvist
   edit_profile:
     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."
+    hint_html: "<strong>Tilpas, hvad folk ser på din offentlige profil og ved siden af dine indlæg.</strong> Andre personer er mere tilbøjelige til at følge dig tilbage og interagere med dig, når du har en udfyldt profil og et profilbillede."
     other: Andre
+  emoji_styles:
+    auto: Auto
+    native: Indbygget
+    twemoji: Twemoji
   errors:
     '400': Din indsendte anmodning er ugyldig eller fejlbehæftet.
     '403': Du har ikke tilladelse til at se denne side.
@@ -1390,7 +1423,7 @@ da:
   filters:
     contexts:
       account: Profiler
-      home: Hjemmetidslinje
+      home: Hjem og lister
       notifications: Notifikationer
       public: Offentlig tidslinje
       thread: Samtaler
@@ -1399,7 +1432,7 @@ da:
       keywords: Nøgleord
       statuses: Individuelle indlæg
       statuses_hint_html: Dette filter gælder for udvalgte, individuelle indlæg, uanset om de matcher nøgleordene nedenfor. <a href="%{path}">Gennemgå eller fjern indlæg fra filteret</a>.
-      title: Redigere filter
+      title: Rediger filter
     errors:
       deprecated_api_multiple_keywords: Disse parametre kan ikke ændres fra denne applikation, da de gælder for flere end ét filternøgleord. Brug en nyere applikation eller webgrænsefladen.
       invalid_context: Ingen eller ugyldig kontekst angivet
@@ -1470,42 +1503,42 @@ da:
       overwrite_long: Erstat aktuelle poster med de nye
     overwrite_preambles:
       blocking_html:
-        one: Man er ved at <strong>erstatte sin sortliste</strong> med <strong>%{count} konto</strong> fra <strong>%{filename}</strong>.
-        other: Man er ved at <strong>erstatte sin sortliste</strong> med optil <strong>%{count} konti</strong> fra <strong>%{filename}</strong>.
+        one: Du er ved at <strong>erstatte din sortliste</strong> med <strong>%{count} konto</strong> fra <strong>%{filename}</strong>.
+        other: Du er ved at <strong>erstatte din sortliste</strong> med op til <strong>%{count} konti</strong> fra <strong>%{filename}</strong>.
       bookmarks_html:
         one: Du er ved at <strong>erstatte dine bogmærker</strong> med <strong>%{count} indlæg</strong> fra <strong>%{filename}</strong>.
         other: Du er ved at <strong>erstatte dine bogmærker</strong> med op til <strong>%{count} indlæg</strong> fra <strong>%{filename}</strong>.
       domain_blocking_html:
-        one: Man er ved at <strong>erstatte sin domænesortliste</strong> med <strong>%{count} domæne</strong> fra <strong>%{filename}</strong>.
-        other: Man er ved at <strong>erstatte sin domænesortliste</strong> med op til <strong>%{count} domæner</strong> fra <strong>%{filename}</strong>.
+        one: Du er ved at <strong>erstatte din domænesortliste</strong> med <strong>%{count} domæne</strong> fra <strong>%{filename}</strong>.
+        other: Du er ved at <strong>erstatte din domænesortliste</strong> med op til <strong>%{count} domæner</strong> fra <strong>%{filename}</strong>.
       following_html:
         one: Du er ved at <strong>følge</strong> <strong>%{count} konto</strong> fra <strong>%{filename}</strong> og <strong>stoppe med at følge andre</strong>.
         other: Du er ved at <strong>følge</strong> <strong>%{count} konti</strong> fra <strong>%{filename}</strong> og <strong>stoppe med at følge andre</strong>.
       lists_html:
-        one: Man er ved at <strong>erstatte sine lister</strong> med indhold fra <strong>%{filename}</strong>. <strong>%{count} konto</strong> føjes til nye lister.
-        other: Man er ved at <strong>erstatte sine lister</strong> med indhold fra <strong>%{filename}</strong>. Op til <strong>%{count} konti</strong> føjes til nye lister.
+        one: Du er ved at <strong>erstatte dine lister</strong> med indhold fra <strong>%{filename}</strong>. <strong>%{count} konto</strong> føjes til nye lister.
+        other: Du er ved at <strong>erstatte dine lister</strong> med indhold fra <strong>%{filename}</strong>. Op til <strong>%{count} konti</strong> føjes til nye lister.
       muting_html:
-        one: Man er ved at <strong>sin liste over en tavsgjort konto</strong> med <strong>%{count} konto</strong> fra <strong>%{filename}</strong>.
-        other: Du er ved at <strong>erstatte din liste over skjulte kontoer</strong> med op til <strong>%{count} kontoer</strong> fra <strong>%{filename}</strong>.
+        one: Du er ved at <strong>erstatte din liste over en skjult konto</strong> med op til <strong>%{count} konto</strong> fra <strong>%{filename}</strong>.
+        other: Du er ved at <strong>erstatte din liste over skjulte konti</strong> med op til <strong>%{count} konti</strong> fra <strong>%{filename}</strong>.
     preambles:
       blocking_html:
-        one: Man er ved at <strong>blokere</strong> <strong>%{count} konto</strong> fra <strong>%{filename}</strong>.
-        other: Man er ved at <strong>blokere</strong> op til <strong>%{count} konti</strong> fra <strong>%{filename}</strong>.
+        one: Du er ved at <strong>blokere</strong> <strong>%{count} konto</strong> fra <strong>%{filename}</strong>.
+        other: Du er ved at <strong>blokere</strong> op til <strong>%{count} konti</strong> fra <strong>%{filename}</strong>.
       bookmarks_html:
         one: Du er ved at tilføje <strong>%{count} indlæg</strong> fra <strong>%{filename}</strong> til dine <strong>bogmærker</strong>.
         other: Du er ved at tilføje <strong>%{count} indlæg</strong> fra <strong>%{filename}</strong> til dine <strong>bogmærker</strong>.
       domain_blocking_html:
-        one: Man er ved at <strong>blokere</strong> <strong>%{count} domæne</strong> fra <strong>%{filename}</strong>.
+        one: Du er ved at <strong>blokere</strong> <strong>%{count} domæne</strong> fra <strong>%{filename}</strong>.
         other: Man er ved at <strong>blokere</strong> op til <strong>%{count} domæner</strong> fra <strong>%{filename}</strong>.
       following_html:
-        one: Man er ved at <strong>følge</strong> <strong>%{count} konto</strong> fra <strong>%{filename}</strong>.
+        one: Du er ved at <strong>følge</strong> <strong>%{count} konto</strong> fra <strong>%{filename}</strong>.
         other: Man er ved at <strong>følge</strong> op til<strong>%{count} konti</strong> fra <strong>%{filename}</strong>.
       lists_html:
-        one: Man er ved at tilføje <strong>%{count} konto</strong> fra <strong>%{filename}</strong> til sine <strong>lister</strong>. Nye lister oprettes, hvis der ikke findes nogen liste at tilføje til.
-        other: Man er ved at tilføje <strong>%{count} konti</strong> fra <strong>%{filename}</strong> til sine <strong>lister</strong>. Nye lister oprettes, hvis der ikke findes nogen liste at tilføje til.
+        one: Du er ved at tilføje <strong>%{count} konto</strong> fra <strong>%{filename}</strong> til dine <strong>lister</strong>. Nye lister oprettes, hvis der ikke findes nogen liste at tilføje til.
+        other: Du er ved at tilføje <strong>%{count} konti</strong> fra <strong>%{filename}</strong> til dine <strong>lister</strong>. Nye lister oprettes, hvis der ikke findes nogen liste at tilføje til.
       muting_html:
-        one: Man er ved at <strong>tavsgøre</strong> <strong>%{count} konto</strong> fra <strong>%{filename}</strong>.
-        other: Du er ved at <strong>skjule</strong> op til <strong>%{count} kontoer</strong> fra <strong>%{filename}</strong>.
+        one: Du er ved at <strong>skjule</strong> op til <strong>%{count} konto</strong> fra <strong>%{filename}</strong>.
+        other: Du er ved at <strong>skjule</strong> op til <strong>%{count} konti</strong> fra <strong>%{filename}</strong>.
     preface: Du kan importere data, du har eksporteret fra en anden server, såsom en liste over folk du følger eller blokerer.
     recent_imports: Seneste importer
     states:
@@ -1522,18 +1555,18 @@ da:
       domain_blocking: Importerer blokerede konti
       following: Importerer fulgte konti
       lists: Import af lister
-      muting: Importerer skjulte kontoer
+      muting: Importerer skjulte konti
     type: Importtype
     type_groups:
       constructive: Følger og Bogmærker
-      destructive: Blokerede og skjulte kontoer
+      destructive: Blokerede og skjulte konti
     types:
       blocking: Blokeringsliste
       bookmarks: Bogmærker
       domain_blocking: Domæneblokeringsliste
       following: Liste over fulgte
       lists: Lister
-      muting: Tavsgørelsesliste
+      muting: Liste over skjulte
     upload: Upload
   invites:
     delete: Deaktivér
@@ -1558,6 +1591,13 @@ da:
       expires_at: Udløber
       uses: Benyttelser
     title: Invitér personer
+  link_preview:
+    author_html: Af %{name}
+    potentially_sensitive_content:
+      action: Klik for at vise
+      confirm_visit: Er du sikker på, at du vil åbne dette link?
+      hide_button: Skjul
+      label: Potentielt følsomt indhold
   lists:
     errors:
       limit: Maks. listeantal nået
@@ -1605,7 +1645,7 @@ da:
       not_found: kunne ikke findes
       on_cooldown: Du er på nedkøling
     followers_count: Følgere på flytningstidspunktet
-    incoming_migrations: Flytter fra en anden konto
+    incoming_migrations: Flytning fra en anden konto
     incoming_migrations_html: For at flytte fra en anden konto til denne skal der først <a href="%{path}">oprettes et kontoalias</a>.
     moved_msg: Din konto omdirigeres nu til %{acct} og dine følgere overflyttes.
     not_redirecting: Din konto omdirigerer pt. ikke til nogen anden konto.
@@ -1628,7 +1668,7 @@ da:
     title: Moderation
   move_handler:
     carry_blocks_over_text: Denne bruger er flyttet fra %{acct}, som du har haft blokeret.
-    carry_mutes_over_text: Denne bruger er flyttet fra %{acct}, som du har haft skjult.
+    carry_mutes_over_text: Denne bruger flyttede fra %{acct}, som du havde skjult.
     copy_account_note_text: 'Denne bruger er flyttet fra %{acct}, hvor dine tidligere noter om dem var:'
   navigation:
     toggle_menu: Åbn/luk menu
@@ -1658,6 +1698,10 @@ da:
       title: Ny omtale
     poll:
       subject: En afstemning fra %{name} er afsluttet
+    quote:
+      body: 'Dit indlæg blev citeret af %{name}:'
+      subject: "%{name} citerede dit indlæg"
+      title: Nyt citat
     reblog:
       body: 'Dit indlæg blev fremhævet af %{name}:'
       subject: "%{name} fremhævede dit indlæg"
@@ -1706,6 +1750,9 @@ da:
       self_vote: Du kan ikke stemme i dine egne afstemninger
       too_few_options: skal have flere end ét valg
       too_many_options: må maks. indeholde %{max} valg
+    vote: Stem
+  posting_defaults:
+    explanation: Disse indstillinger vil blive brugt som standard, når du opretter nye indlæg, men du kan redigere dem for hvert enkelt indlæg i redigeringsværktøjet.
   preferences:
     other: Andet
     posting_defaults: Standarder for indlæg
@@ -1713,12 +1760,12 @@ da:
   privacy:
     hint_html: "<strong>Tilpas hvordan din profil og dine indlæg kan findes.</strong> En række funktioner i Mastodon kan hjælpe dig med at nå ud til et bredere publikum, hvis du aktiverer dem. Tjek indstillingerne herunder for at sikre, at de passer til dit brugsscenarie."
     privacy: Privatliv
-    privacy_hint_html: Styr, hvor meget der ønskes synliggjort til gavn for andre. Folk finder interessante profiler og apps ved at tjekke andres følgere ud, samt se hvilke apps de sender fra, men dine præferencer ønskes muligvis ikke synliggjort.
-    reach: Udbredelse
-    reach_hint_html: Indstil om du vil blive opdaget og fulgt af nye mennesker. Ønsker du, at dine indlæg skal vises på Udforsk-siden? Ønsker du, at andre skal se dig i deres følg-anbefalinger? Ønsker du at acceptere alle nye følgere automatisk, eller vil du have detaljeret kontrol over hver og en?
-    search: Søg
+    privacy_hint_html: Styr, hvor meget du vil afsløre til gavn for andre. Folk opdager interessante profiler og apps ved at gennemse andres følgere og se, hvilke apps de sender fra, men du foretrækker måske at holde det skjult.
+    reach: Rækkevidde
+    reach_hint_html: Indstil, om du vil opdages og følges af nye personer. Vil du have, at dine indlæg skal vises på Udforsk-siden? Vil du have, at andre skal kunne se dig i deres følg-anbefalinger? Vil du acceptere alle nye følgere automatisk eller have detaljeret kontrol over hver enkelt?
+    search: Søgning
     search_hint_html: Indstil hvordan du vil findes. Ønsker du, at folk skal finde dig gennem hvad du har skrevet offentligt? Vil du have folk udenfor Mastodon til at finde din profil, når de søger på nettet? Vær opmærksom på, at det ikke kan garanteres at dine offentlige indlæg er udelukket fra alle søgemaskiner.
-    title: Fortrolighed og udbredelse
+    title: Fortrolighed og rækkevidde
   privacy_policy:
     title: Privatlivspolitik
   reactions:
@@ -1832,7 +1879,7 @@ da:
     profile: Offentlig profil
     relationships: Følger og følgere
     severed_relationships: Afbrudte forhold
-    statuses_cleanup: Auto-indlægssletning
+    statuses_cleanup: Automatiseret sletning af indlæg
     strikes: Moderationsadvarsler
     two_factor_authentication: Tofaktorgodkendelse
     webauthn_authentication: Sikkerhedsnøgler
@@ -1861,6 +1908,9 @@ da:
         other: "%{count} videoer"
     boosted_from_html: Fremhævet fra %{acct_link}
     content_warning: 'Indholdsadvarsel: %{warning}'
+    content_warnings:
+      hide: Skjul indlæg
+      show: Vis mere
     default_language: Samme som UI-sproget
     disallowed_hashtags:
       one: 'indeholdte et ikke tilladt hashtag: %{tags}'
@@ -1868,6 +1918,7 @@ da:
     edited_at_html: Redigeret %{date}
     errors:
       in_reply_not_found: Indlægget, der forsøges besvaret, ser ikke ud til at eksistere.
+      quoted_status_not_found: Indlægget, du forsøger at citere, ser ikke ud til at eksistere.
     over_character_limit: grænsen på %{max} tegn overskredet
     pin_errors:
       direct: Indlæg, som kun kan ses af omtalte brugere, kan ikke fastgøres
@@ -1875,18 +1926,17 @@ da:
       ownership: Andres indlæg kan ikke fastgøres
       reblog: En fremhævelse kan ikke fastgøres
     quote_policies:
-      followers: Følgere og nævnte brugere
-      nobody: Kun nævnte brugere
+      followers: Kun følgere
+      nobody: Kun mig
       public: Alle
     title: '%{name}: "%{quote}"'
     visibilities:
-      direct: Direkte
+      direct: Privat omtale
       private: Kun følgere
-      private_long: Vis kun til følgere
       public: Offentlig
-      public_long: Kan ses af alle
-      unlisted: Ulistet
-      unlisted_long: Kan ses af alle, men listes på offentlige tidslinjer
+      public_long: Alle på og udenfor Mastodon
+      unlisted: Offentlig (stille)
+      unlisted_long: Skjult fra Mastodons søgeresultater, tendenser og offentlige tidslinjer
   statuses_cleanup:
     enabled: Slet automatisk gamle indlæg
     enabled_hint: Sletter automatisk dine indlæg, når disse når en bestemt alder, medmindre de matcher en af undtagelserne nedenfor
@@ -1905,9 +1955,9 @@ da:
     keep_polls: Behold afstemninger
     keep_polls_hint: Sletter ingen af dine afstemninger
     keep_self_bookmark: Behold bogmærkede indlæg
-    keep_self_bookmark_hint: Sletter ikke egne indlæg, såfremt de er bogmærket
+    keep_self_bookmark_hint: Sletter ikke dine egne indlæg, hvis du har bogmærket dem
     keep_self_fav: Behold favoritmarkerede indlæg
-    keep_self_fav_hint: Sletter ikke egne indlæg, såfremt de er favoritmarkeret
+    keep_self_fav_hint: Sletter ikke dine egne indlæg, hvis du har favoritmarkeret dem
     min_age:
       '1209600': 2 uger
       '15778476': 6 måneder
@@ -1919,9 +1969,9 @@ da:
       '7889238': 3 måneder
     min_age_label: Alderstærskel
     min_favs: Behold indlæg favoritmarkeret mindst
-    min_favs_hint: Sletter ingen egne indlæg, som har modtaget minimum dette antal favoritmarkeringer. Lad stå tomt for at slette indlæg uanset favoritmarkeringer
+    min_favs_hint: Sletter ingen af dine egne indlæg, som har modtaget minimum dette antal favoritmarkeringer. Lad stå tom for at slette indlæg uanset antal favoritmarkeringer
     min_reblogs: Behold indlæg fremhævet mindst
-    min_reblogs_hint: Sletter ingen af egne indlæg, som er fremhævet flere end dette antal gange. Lad stå tomt for at ignorere denne tærskel under sletning
+    min_reblogs_hint: Sletter ingen af dine egne indlæg, som er fremhævet flere end dette antal gange. Lad stå tom for at slette indlæg uanset antallet af fremhævelser
   stream_entries:
     sensitive_content: Sensitivt indhold
   strikes:
@@ -1986,7 +2036,7 @@ da:
       explanation: Der er anmodet om en fuld sikkerhedskopi af din Mastodon-konto.
       extra: Sikkerhedskopien kan nu downloades!
       subject: Dit arkiv er klar til download
-      title: Arkiv download
+      title: Arkiv-download
     failed_2fa:
       details: 'Her er detaljerne om login-forsøget:'
       explanation: Nogen har forsøgt at logge ind på kontoen, men har angivet en ugyldig anden godkendelsesfaktor.
@@ -2091,7 +2141,7 @@ da:
   verification:
     extra_instructions_html: <strong>Tip:</strong> Linket på din hjemmeside kan være usynligt. Den vigtige del er <code>rel="me"</code> , som forhindrer impersonation på websteder med brugergenereret indhold. Du kan endda bruge et <code>link</code> tag i overskriften på siden i stedet for <code>a</code>, men HTML skal være tilgængelig uden at udføre JavaScript.
     here_is_how: Sådan gør du
-    hint_html: "<strong>Bekræftelse af din identitet på Mastodon er for alle.</strong> Baseret på åbne webstandarder, nu og for evigt gratis. Alt du behøver er en personlig hjemmeside, som folk genkende dig ved. Når du linker til denne hjemmeside fra din profil, vi vil kontrollere, at hjemmesiden linker tilbage til din profil og vise en visuel indikator på det."
+    hint_html: "<strong>Verificering af din identitet på Mastodon er for alle.</strong> Baseret på åbne webstandarder, nu og for altid gratis. Alt, hvad du behøver, er en personlig hjemmeside, som folk kender dig fra. Når du linker til denne hjemmeside fra din profil, kontrollerer vi, at hjemmesiden linker tilbage til din profil, og viser en visuel indikator på den."
     instructions_html: Kopier og indsæt koden nedenfor i HTML på din hjemmeside. Tilføj derefter adressen på din hjemmeside i et af de ekstra felter på din profil på fanen "Redigér profil" og gem ændringer.
     verification: Bekræftelse
     verified_links: Dine bekræftede links
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 39530f6ee30..3f16ac94d9b 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -187,9 +187,10 @@ de:
         create_domain_block: Domain sperren
         create_email_domain_block: E-Mail-Domain-Sperre erstellen
         create_ip_block: IP-Regel erstellen
-        create_relay: Relay erstellen
+        create_relay: Relais erstellen
         create_unavailable_domain: Nicht verfügbare Domain erstellen
         create_user_role: Rolle erstellen
+        create_username_block: Regel für Profilnamen erstellen
         demote_user: Benutzer*in herabstufen
         destroy_announcement: Ankündigung löschen
         destroy_canonical_email_block: E-Mail-Sperre entfernen
@@ -199,17 +200,18 @@ de:
         destroy_email_domain_block: E-Mail-Domain-Sperre entfernen
         destroy_instance: Domain-Daten entfernen
         destroy_ip_block: IP-Regel löschen
-        destroy_relay: Relay löschen
+        destroy_relay: Relais löschen
         destroy_status: Beitrag entfernen
         destroy_unavailable_domain: Nicht-verfügbare Domain entfernen
         destroy_user_role: Rolle entfernen
+        destroy_username_block: Regel für Profilnamen löschen
         disable_2fa_user: 2FA deaktivieren
         disable_custom_emoji: Eigenes Emoji deaktivieren
-        disable_relay: Relay deaktivieren
+        disable_relay: Relais 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_relay: Relay aktivieren
+        enable_relay: Relais aktivieren
         enable_sign_in_token_auth_user: E-Mail-Token-Authentisierung für dieses Konto aktivieren
         enable_user: Benutzer*in aktivieren
         memorialize_account: Gedenkkonto
@@ -237,6 +239,7 @@ de:
         update_report: Meldung aktualisieren
         update_status: Beitrag aktualisieren
         update_user_role: Rolle bearbeiten
+        update_username_block: Regel für Profilnamen aktualisieren
       actions:
         approve_appeal_html: "%{name} hat den Einspruch gegen eine Moderationsentscheidung von %{target} genehmigt"
         approve_user_html: "%{name} genehmigte die Registrierung von %{target}"
@@ -255,6 +258,7 @@ de:
         create_relay_html: "%{name} erstellte ein Relay %{target}"
         create_unavailable_domain_html: "%{name} beendete die Zustellung an die Domain %{target}"
         create_user_role_html: "%{name} erstellte die Rolle %{target}"
+        create_username_block_html: "%{name} erstellte eine Regel für Profilnamen mit %{target}"
         demote_user_html: "%{name} stufte %{target} herunter"
         destroy_announcement_html: "%{name} löschte die Ankündigung %{target}"
         destroy_canonical_email_block_html: "%{name} entsperrte die E-Mail mit dem Hash %{target}"
@@ -264,17 +268,18 @@ de:
         destroy_email_domain_block_html: "%{name} entsperrte die E-Mail-Domain %{target}"
         destroy_instance_html: "%{name} entfernte die Daten der Domain %{target} von diesem Server"
         destroy_ip_block_html: "%{name} entfernte eine IP-Regel für %{target}"
-        destroy_relay_html: "%{name} löschte das Relay %{target}"
+        destroy_relay_html: "%{name} löschte das Relais %{target}"
         destroy_status_html: "%{name} entfernte einen Beitrag von %{target}"
         destroy_unavailable_domain_html: "%{name} nahm die Zustellung an die Domain %{target} wieder auf"
         destroy_user_role_html: "%{name} löschte die Rolle %{target}"
+        destroy_username_block_html: "%{name} entfernte eine Regel für Profilnamen mit %{target}"
         disable_2fa_user_html: "%{name} deaktivierte die Zwei-Faktor-Authentisierung für %{target}"
         disable_custom_emoji_html: "%{name} deaktivierte das Emoji %{target}"
-        disable_relay_html: "%{name} deaktivierte das Relay %{target}"
+        disable_relay_html: "%{name} deaktivierte das Relais %{target}"
         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_relay_html: "%{name} aktivierte das Relay %{target}"
+        enable_relay_html: "%{name} aktivierte das Relais %{target}"
         enable_sign_in_token_auth_user_html: "%{name} aktivierte die E-Mail-Token-Authentisierung für %{target}"
         enable_user_html: "%{name} aktivierte den Zugang für %{target}"
         memorialize_account_html: "%{name} wandelte das Konto von %{target} in eine Gedenkseite um"
@@ -302,6 +307,7 @@ de:
         update_report_html: "%{name} überarbeitete die Meldung %{target}"
         update_status_html: "%{name} überarbeitete einen Beitrag von %{target}"
         update_user_role_html: "%{name} änderte die Rolle von %{target}"
+        update_username_block_html: "%{name} aktualisierte eine Regel für Profilnamen mit %{target}"
       deleted_account: gelöschtes Konto
       empty: Protokolle nicht gefunden.
       filter_by_action: Nach Aktion filtern
@@ -623,21 +629,21 @@ de:
     relationships:
       title: Beziehungen von %{acct}
     relays:
-      add_new: Neues Relay hinzufügen
+      add_new: Neues Relais hinzufügen
       delete: Entfernen
-      description_html: Ein <strong>Föderierungsrelay</strong> ist ein vermittelnder Server, der eine große Anzahl öffentlicher Beiträge zwischen Servern, die das Relay abonnieren und zu ihm veröffentlichen, austauscht.<strong> Es kann kleinen und mittleren Servern dabei helfen, Inhalte des Fediverse zu entdecken</strong>, was andernfalls das manuelle Folgen anderer Leute auf externen Servern durch lokale Nutzer*innen erfordern würde.
+      description_html: Ein <strong>Föderierungsrelay</strong> ist ein vermittelnder Server, der eine große Anzahl öffentlicher Beiträge zwischen Servern, die das Relais abonnieren und zu ihm veröffentlichen, austauscht.<strong> Es kann kleinen und mittleren Servern dabei helfen, Inhalte des Fediverse zu entdecken</strong>, was andernfalls das manuelle Folgen anderer Leute auf externen Servern durch lokale Nutzer*innen erfordern würde.
       disable: Ausschalten
       disabled: Ausgeschaltet
       enable: Einschalten
-      enable_hint: Sobald aktiviert, wird dein Server alle öffentlichen Beiträge dieses Relays abonnieren und alle öffentlichen Beiträge dieses Servers an dieses senden.
+      enable_hint: Sobald aktiviert, wird dein Server alle öffentlichen Beiträge dieses Relais abonnieren und alle öffentlichen Beiträge dieses Servers an dieses senden.
       enabled: Eingeschaltet
       inbox_url: Relay-URL
       pending: Warte auf Zustimmung des Relays
       save_and_enable: Speichern und aktivieren
-      setup: Neues Relay verbinden
-      signatures_not_enabled: Die Relays funktionieren nicht korrekt, wenn der abgesicherte Modus aktiviert oder die Föderation eingeschränkt ist
+      setup: Neues Relais verbinden
+      signatures_not_enabled: Die Relais funktionieren nicht korrekt, wenn der abgesicherte Modus aktiviert oder die Föderation eingeschränkt ist
       status: Status
-      title: Relays
+      title: Relais
     report_notes:
       created_msg: Notiz zur Meldung erfolgreich erstellt!
       destroyed_msg: Notiz zur Meldung erfolgreich entfernt!
@@ -842,6 +848,10 @@ de:
         all: Allen
         disabled: Niemandem
         users: Für angemeldete lokale Benutzer*innen
+      feed_access:
+        modes:
+          authenticated: Nur authentifizierte Nutzer*innen
+          public: Alle
       registrations:
         moderation_recommandation: Bitte vergewissere dich, dass du ein geeignetes und reaktionsschnelles Moderationsteam hast, bevor du die Registrierungen uneingeschränkt zulässt!
         preamble: Lege fest, wer auf deinem Server ein Konto erstellen darf.
@@ -1085,6 +1095,25 @@ de:
           other: In den vergangenen 7 Tagen von %{count} Profilen verwendet
       title: Empfehlungen & Trends
       trending: Angesagt
+    username_blocks:
+      add_new: Neue Regel
+      block_registrations: Registrierungen sperren
+      comparison:
+        contains: Enthält
+        equals: Entspricht
+      contains_html: Enthält %{string}
+      created_msg: Regel für Profilnamen erfolgreich erstellt
+      delete: Löschen
+      edit:
+        title: Regel für Profilnamen bearbeiten
+      matches_exactly_html: Entspricht %{string}
+      new:
+        create: Regel erstellen
+        title: Neue Regel für Profilnamen erstellen
+      no_username_block_selected: Keine Regeln für Profilnamen wurden geändert, weil keine ausgewählt wurde(n)
+      not_permitted: Nicht gestattet
+      title: Regeln für Profilnamen
+      updated_msg: Regel für Profilnamen erfolgreich aktualisiert
     warning_presets:
       add_new: Neu hinzufügen
       delete: Löschen
@@ -1265,7 +1294,7 @@ de:
     user_agreement_html: Ich stimme den <a href="%{terms_of_service_path}" target="_blank">Nutzungsbedingungen</a> sowie der <a href="%{privacy_policy_path}" target="_blank">Datenschutzerklärung</a> zu
     user_privacy_agreement_html: Ich stimme der <a href="%{privacy_policy_path}" target="_blank">Datenschutzerklärung</a> zu
   author_attribution:
-    example_title: Beispieltext
+    example_title: Beispieltitel
     hint_html: Schreibst du außerhalb von Mastodon journalistische Artikel oder andere Texte, beispielsweise in einem Blog? Lege hier fest, wann auf dein Profil verwiesen werden soll, wenn Links zu deinen Werken auf Mastodon geteilt werden.
     instructions: 'Der nachfolgende Code muss im HTML-Header deines zu verlinkenden Textes stehen:'
     more_from_html: Mehr von %{name}
@@ -1349,6 +1378,10 @@ 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
+  emoji_styles:
+    auto: Automatisch
+    native: Nativ
+    twemoji: Twemoji
   errors:
     '400': Die Anfrage, die du gestellt hast, war ungültig oder fehlerhaft.
     '403': Dir fehlt die Berechtigung, diese Seite aufzurufen.
@@ -1558,6 +1591,13 @@ de:
       expires_at: Läuft ab
       uses: Verwendungen
     title: Einladungen
+  link_preview:
+    author_html: Von %{name}
+    potentially_sensitive_content:
+      action: Zum Anzeigen anklicken
+      confirm_visit: Möchtest du diesen Link wirklich öffnen?
+      hide_button: Ausblenden
+      label: Inhaltswarnung
   lists:
     errors:
       limit: Du hast die maximale Anzahl an Listen erreicht
@@ -1658,6 +1698,10 @@ de:
       title: Neue Erwähnung
     poll:
       subject: Eine Umfrage von %{name} ist beendet
+    quote:
+      body: 'Dein Beitrag wurde von %{name} zitiert:'
+      subject: "%{name} zitierte deinen Beitrag"
+      title: Neuer zitierter Beitrag
     reblog:
       body: 'Dein Beitrag wurde von %{name} geteilt:'
       subject: "%{name} teilte deinen Beitrag"
@@ -1706,6 +1750,9 @@ de:
       self_vote: Du kannst an deinen eigenen Umfragen nicht selbst teilnehmen
       too_few_options: muss mehr als ein Auswahlfeld enthalten
       too_many_options: darf nicht mehr als %{max} Auswahlfelder enthalten
+    vote: Abstimmen
+  posting_defaults:
+    explanation: Diese Einstellungen werden standardmäßig für neue Beiträge verwendet. Du kannst sie auch beim Verfassen eines Beitrags individuell anpassen.
   preferences:
     other: Erweitert
     posting_defaults: Standardeinstellungen für Beiträge
@@ -1861,6 +1908,9 @@ de:
         other: "%{count} Videos"
     boosted_from_html: Geteilt von %{acct_link}
     content_warning: 'Inhaltswarnung: %{warning}'
+    content_warnings:
+      hide: Beitrag ausblenden
+      show: Beitrag anzeigen
     default_language: Wie die Sprache des Webinterface
     disallowed_hashtags:
       one: 'enthält einen nicht-erlaubten Hashtag: %{tags}'
@@ -1868,6 +1918,7 @@ de:
     edited_at_html: 'Bearbeitet: %{date}'
     errors:
       in_reply_not_found: Der Beitrag, auf den du antworten möchtest, scheint nicht zu existieren.
+      quoted_status_not_found: Der Beitrag, den du zitieren möchtest, scheint nicht zu existieren.
     over_character_limit: Begrenzung von %{max} Zeichen überschritten
     pin_errors:
       direct: Beiträge, die nur für erwähnte Profile sichtbar sind, können nicht angeheftet werden
@@ -1875,18 +1926,17 @@ de:
       ownership: Du kannst nur eigene Beiträge anheften
       reblog: Du kannst keine geteilten Beiträge anheften
     quote_policies:
-      followers: Follower und erwähnte Profile
-      nobody: Nur erwähnte Profile
+      followers: Nur Follower
+      nobody: Nur ich
       public: Alle
     title: "%{name}: „%{quote}“"
     visibilities:
-      direct: Direktnachricht
+      direct: Private Erwähnung
       private: Nur Follower
-      private_long: Nur für deine Follower sichtbar
       public: Öffentlich
-      public_long: Für alle sichtbar
-      unlisted: Nicht gelistet
-      unlisted_long: Für alle sichtbar (mit Ausnahme von öffentlichen Timelines)
+      public_long: Alle innerhalb und außerhalb von Mastodon
+      unlisted: Öffentlich (still)
+      unlisted_long: Wird nicht in den Suchergebnissen, Trends oder öffentlichen Timelines von Mastodon angezeigt
   statuses_cleanup:
     enabled: Alte Beiträge automatisch entfernen
     enabled_hint: Löscht automatisch deine Beiträge, sobald sie die angegebene Altersgrenze erreicht haben, es sei denn, sie entsprechen einer der unten angegebenen Ausnahmen
@@ -1940,7 +1990,7 @@ de:
     contrast: Mastodon (Hoher Kontrast)
     default: Mastodon (Dunkel)
     mastodon-light: Mastodon (Hell)
-    system: Automatisch (mit System synchronisieren)
+    system: Automatisch (wie Betriebssystem)
   time:
     formats:
       default: "%d. %b %Y, %H:%M Uhr"
diff --git a/config/locales/devise.az.yml b/config/locales/devise.az.yml
index 6a02cd7e497..108f6bc685a 100644
--- a/config/locales/devise.az.yml
+++ b/config/locales/devise.az.yml
@@ -4,43 +4,113 @@ az:
     confirmations:
       confirmed: E-poçt ünvanınız uğurla təsdiqləndi.
       send_instructions: Bir neçə dəqiqə ərzində e-poçt ünvanınızı necə təsdiqləyəcəyinizə dair təlimatları olan bir e-məktub alacaqsınız. Bu e-məktubu almamısınızsa, spam qovluğunuzu yoxlayın.
-      send_paranoid_instructions: E-poçt ünvanınız verilənlər bazamızda varsa, bir neçə dəqiqədən sonra e-poçt ünvanınızı necə təsdiqləyəcəyinizə dair təlimatları olan bir e-məktub alacaqsınız. Bu e-məktubu almamısınızsa, spam qovluğunuzu yoxlayın.
+      send_paranoid_instructions: E-poçt ünvanınız veri bazamızda varsa, bir neçə dəqiqə sonra e-poçt ünvanınızı necə təsdiqləyəcəyinizə dair təlimatları olan bir e-poçt alacaqsınız. Bu e-poçtu almamısınızsa, spam qovluğunuzu yoxlayın.
     failure:
       already_authenticated: Siz artıq daxil olmusunuz.
       inactive: Hesabınız hələ aktivləşdirilməyib.
-      invalid: Səhv %{authentication_keys} və ya parol.
+      invalid: Yararsız %{authentication_keys} və ya parol.
       last_attempt: Hesabınız blok olmamışdan əvvəl bir dəfə də cəhdiniz var.
-      locked: Hesabınız bloklandı.
-      not_found_in_database: Səhv %{authentication_keys} və ya parol.
+      locked: Hesabınız kilidlənib.
+      not_found_in_database: Yararsız %{authentication_keys} və ya parol.
       omniauth_user_creation_failure: Bu kimlik üçün hesab yaradarkən xəta.
-      pending: Hesabınız hələ yoxlanışdadır.
+      pending: Hesabınız hələ incələnir.
       timeout: Sessiyanın vaxtı bitdi. Xahiş edirik davam etmək üçün yenidən daxil olun.
       unauthenticated: Davam etmək üçün daxil olmaq və ya qeydiyyatdan keçmək lazımdır.
       unconfirmed: Davam etmək üçün e-poçt ünvanınızı təsdiqləməlisiniz.
     mailer:
       confirmation_instructions:
-        action: E-poçt ünvanını təsdiqlə
+        action: E-poçt ünvanını doğrula
         action_with_app: Təsdiqlə və %{app}-a geri qayıt
-        explanation: Siz %{host} saytında bu e-poçt ilə hesab yaratmısınız. Onu aktivləşdirməkdən bir klik uzaqlıqdasınız. Əgər bu siz olmamısınızsa, zəhmət olmasa, bu e-məktuba məhəl qoymayın.
-        explanation_when_pending: Bu e-poçt ünvanı ilə %{host} saytına dəvət üçün müraciət etmisiniz. Siz e-poçt ünvanınızı təsdiqlədikdən sonra müraciətinizi nəzərdən keçirəcəyik. Siz məlumatlarınızı dəyişdirmək və ya hesabınızı silmək üçün daxil ola bilərsiniz, lakin hesabınız təsdiqlənənə qədər əksər funksiyaları istifadə edə bilməzsiniz. Müraciətiniz rədd edilərsə, məlumatlarınız silinəcək, buna görə də sizdən heç bir tədbir tələb olunmayacaq. Əgər bu siz deyildinizsə, zəhmət, bu e-məktuba məhəl qoymayın.
+        explanation: Bu e-poçt ünvanı ilə %{host} üzərində bir hesab yaratmısınız. Onu aktivləşdirməkdən bir klik uzaqlıqdasınız. Əgər bunu siz etməmisinizsə, lütfən e-poçtu yox sayın.
+        explanation_when_pending: Bu e-poçt ünvanı ilə %{host} ünvanına dəvət üçün müraciət etmisiniz. E-poçt ünvanınızı təsdiqlədikdən sonra müraciətinizi nəzərdən keçirəcəyik. Hesab məlumatlarını dəyişdirmək və ya hesabınızı silmək üçün giriş edə bilərsiniz, ancaq hesabınız təsdiqlənənə qədər əksər funksiyalara erişə bilməyəcəksiniz. Müraciətinizə rədd cavabı gəlsə, veriləriniz silinəcək, sizdən heç bir əməliyyat etməyiniz istənilməyəcək. Əgər bu siz deyilsinizsə, lütfən bu e-poçtu yox sayın.
         extra_html: Həmçinin zəhmət olmasa, <a href="%{terms_path}">serverin qaydalarını</a> və <a href="%{policy_path}">istifadə şərtlərini</a> oxuyun.
         subject: 'Mastodon: %{instance} üçün təsdiqlənmə təlimatları'
-        title: E-poçt ünvanını təsdiqlə
+        title: E-poçt ünvanını doğrula
       email_changed:
         explanation: 'Hesabınız üçün e-poçt ünvanı buna dəyişdirilir:'
-        extra: E-poçtunuzu dəyişməmisinizsə, çox güman ki, kimsə hesabınıza giriş əldə edib. Zəhmət olmasa, parolunuzu dərhal dəyişdirin və ya hesabınıza daxil ola bilməyəcəksinizsə, server admini ilə əlaqə saxlayın.
+        extra: E-poçtunuzu dəyişməmisinizsə, çox güman ki, kimsə hesabınıza erişib. Hesabınıza giriş edə bilmirsinizsə, lütfən parolunuzu dərhal dəyişdirin və ya server admini ilə əlaqə saxlayın.
         subject: 'Mastodon: E-poçt dəyişdirildi'
         title: Yeni e-poçt ünvanı
       password_change:
         explanation: Hesabınızın parolu dəyişdirilib.
-        extra: Parolunuzu dəyişməmisinizsə, çox güman ki, kimsə hesabınıza giriş əldə edib. Zəhmət olmasa, parolunuzu dərhal dəyişdirin və ya hesabınıza daxil ola bilməyəcəksinizsə, server admini ilə əlaqə saxlayın.
+        extra: Parolunuzu dəyişməmisinizsə, çox güman ki, kimsə hesabınıza erişib. Hesabınıza giriş edə bilmirsinizsə, lütfən parolunuzu dərhal dəyişdirin və ya server admini ilə əlaqə saxlayın.
         subject: 'Mastodon: Parol dəyişdirildi'
         title: Parol dəyişdirildi
       reconfirmation_instructions:
         explanation: E-poçtunuzu dəyişdirmək üçün yeni ünvanı təsdiqləyin.
-        extra: Əgər bu dəyişiklik sizin tərəfinizdən deyilsə, zəhmət olmasa, bu e-məktuba məhəl qoymayın. Siz yuxarıdakı linkə daxil olana qədər Mastodon hesabının e-poçt ünvanı dəyişməyəcək.
+        extra: Bu dəyişikliyi siz etməmisinizsə, lütfən bu e-poçtu yox sayın. Yuxarıdakı keçidə erişənə qədər Mastodon hesabının e-poçt ünvanı dəyişməyəcək.
         subject: 'Mastodon: %{instance} üçün e-poçtu təsdiqlə'
-        title: E-poçt ünvanını təsdiqlə
+        title: E-poçt ünvanını doğrula
       reset_password_instructions:
         action: Parolu dəyiş
         explanation: Siz hesabınız üçün yeni parol tələb etmisiniz.
+        extra: Bunu siz tələb etməmisinizsə, lütfən bu e-poçtu yox sayın. Parolunuz, yuxarıdakı keçidə erişənə və siz yeni birini yaradana qədər dəyişməyəcək.
+        subject: 'Mastodon: Parol sıfırlama təlimatları'
+        title: Parolu sıfırla
+      two_factor_disabled:
+        explanation: Giriş etmək, indi yalnız e-poçt ünvanı və parol ilə mümkündür.
+        subject: 'Mastodon: İki faktorlu kimlik doğrulama sıradan çıxarılıb'
+        subtitle: İki faktorlu kimlik doğrulama hesabınız üçün sıradan çıxarılıb.
+        title: 2FA sıradan çıxarılıb
+      two_factor_enabled:
+        explanation: Giriş etmək üçün cütləşdirilmiş TOTP tətbiqi tərəfindən yaradılmış bir token tələb olunur.
+        subject: 'Mastodon: İki faktorlu kimlik doğrulama fəaldır'
+        subtitle: İki faktorlu kimlik doğrulama hesabınız üçün fəallaşdırılıb.
+        title: 2FA fəaldır
+      two_factor_recovery_codes_changed:
+        explanation: Əvvəlki geri qaytarma kodları yararsız sayıldı və yeniləri yaradıldı.
+        subject: 'Mastodon: İki faktorlu geri qaytarma kodları təkrar yaradılıb'
+        subtitle: Əvvəlki geri qaytarma kodları yararsız sayıldı və yeniləri yaradıldı.
+        title: 2FA geri qaytarma kodları dəyişdirilib
+      unlock_instructions:
+        subject: 'Mastodon: Kilid açma təlimatları'
+      webauthn_credential:
+        added:
+          explanation: Aşağıdakı güvənlik açarı, hesabınıza əlavə edilib
+          subject: 'Mastodon: Yeni güvənlik açarı'
+          title: Yeni bir güvənlik açarı əlavə edilib
+        deleted:
+          explanation: Aşağıdakı güvənlik açarı, hesabınızdan silinib
+          subject: 'Mastodon: Güvənlik açarı silindi'
+          title: Güvənlik açarlarınızdan biri silinib
+      webauthn_disabled:
+        explanation: Güvənlik açarı ilə kimlik doğrulama hesabınız üçün sıradan çıxarılıb.
+        extra: Giriş, artıq yalnız cütləşdirilmiş TOTP tətbiqi tərəfindən yaradılmış token ilə mümkündür.
+        subject: 'Mastodon: Güvənlik açarları ilə kimlik doğrulama sıradan çıxarılıb'
+        title: Güvənlik açarları sıradan çıxarılıb
+      webauthn_enabled:
+        explanation: Güvənlik açarı ilə kimlik doğrulama hesabınız üçün fəallaşdırılıb.
+        extra: Güvənlik açarınız artıq giriş üçün istifadə edilə bilər
+        subject: 'Mastodon: Güvənlik açarı ilə kimlik doğrulama fəaldır'
+        title: Güvənlik açarları fəaldır
+    omniauth_callbacks:
+      failure: '%{kind} üzərindən kimliyiniz doğrulana bilmədi, çünki "%{reason}".'
+      success: "%{kind} hesabından kimliyiniz uğurla doğrulandı."
+    passwords:
+      no_token: Parol sıfırlama e-poçtunu istifadə etmədən bu səhifəyə erişə bilməzsiniz. Əgər parol sıfırlama e-poçtu ilə bura gəlmisinizsə, lütfən verilmiş tam URL-ni istifadə etdiyinizə əmin olun.
+      send_instructions: E-poçt ünvanınız veri bazamızda varsa, bir neçə dəqiqə sonra e-poçt ünvanınızda parolu geri qaytarma keçidini alacaqsınız. Bu e-poçtu almamısınızsa, spam qovluğunuzu yoxlayın.
+      send_paranoid_instructions: E-poçt ünvanınız veri bazamızda varsa, bir neçə dəqiqə sonra e-poçt ünvanınızda parolu geri qaytarma keçidini alacaqsınız. Bu e-poçtu almamısınızsa, spam qovluğunuzu yoxlayın.
+      updated: Parolunuz uğurla dəyişdirildi. Artıq hesabınıza daxil olmusunuz.
+      updated_not_active: Parolunuz uğurla dəyişdirildi.
+    registrations:
+      destroyed: Xudahafiz! Hesabınız uğurla ləğv edilib. Sizi tezliklə yenidən görməyi ümid edirik.
+      update_needs_confirmation: Hesabınızı uğurla güncəllədiniz, ancaq yeni e-poçt ünvanını doğrulamağımız lazımdır. Lütfən e-poçtunuzu yoxlayın, yeni e-poçt ünvanınızı təsdiqləmək üçün təsdiq keçidini izləyin. Əgər bu e-poçtu almamısınızsa spam qovluğunu yoxlayın.
+      updated: Hesabınız uğurla güncəllənib.
+    sessions:
+      already_signed_out: Uğurla hesabdan çıxış edildi.
+      signed_in: Uğurla hesaba daxil olundu.
+      signed_out: Uğurla hesabdan çıxış edildi.
+    unlocks:
+      send_instructions: Bir neçə dəqiqə ərzində e-poçt ünvanınızın kilidini necə açmaqla bağlı təlimatlar olan bir e-poçt alacaqsınız. Bu e-poçtu almamısınızsa, lütfən spam qovluğunuzu yoxlayın.
+      send_paranoid_instructions: Əgər hesabınız mövcuddursa, bir neçə dəqiqə ərzində e-poçt ünvanınızın kilidini necə açmaqla bağlı təlimatlar olan bir e-poçt alacaqsınız. Bu e-poçtu almamısınızsa, lütfən spam qovluğunuzu yoxlayın.
+      unlocked: Hesabınızın kilidi uğurla açıldı. Davam etmək üçün lütfən giriş edin.
+  errors:
+    messages:
+      already_confirmed: artıq təsdiqlənib, lütfən hesabınıza daxil olmağa çalışın
+      confirmation_period_expired: "%{period} ərzində təsdiqlənməsi lazımdır, lütfən yenisini tələb edin"
+      expired: müddəti bitib, lütfən yenisini tələb edin
+      not_found: tapılmadı
+      not_locked: kilidlənməyib
+      not_saved:
+        one: '1 xəta, bu %{resource} resursunu saxlamağı qadağan etdi:'
+        other: "%{count} xəta, bu %{resource} resursunu saxlamağı qadağan etdi:"
diff --git a/config/locales/devise.be.yml b/config/locales/devise.be.yml
index 5f03bf06b88..21dd93e31ab 100644
--- a/config/locales/devise.be.yml
+++ b/config/locales/devise.be.yml
@@ -3,48 +3,48 @@ be:
   devise:
     confirmations:
       confirmed: Адрас вашай электроннай пошты паспяхова пацверджаны.
-      send_instructions: Цягам некалькіх хвілін вы атрымаеце ліст з інструкцыямі, каб пацвердзіць вашую электронную пошту. Калі ласка, зазірніце ў папку са спамам, калі не знойдзеце ліст.
-      send_paranoid_instructions: Калі адрас вашай электроннай пошты існуе ў нашай базе дадзеных, цягам некалькіх хвілін вы атрымаеце ліст з інструкцыямі, каб пацвердзіць вашую электронную пошту. Калі ласка, зазірніце ў папку са спамам, калі не знойдзеце ліст.
+      send_instructions: Цягам некалькіх хвілін Вы атрымаеце ліст з інструкцыямі, каб пацвердзіць вашую электронную пошту. Калі ласка, зазірніце ў папку са спамам, калі не знойдзеце ліст.
+      send_paranoid_instructions: Калі адрас Вашай электроннай пошты існуе ў нашай базе даных, на працягу некалькіх хвілін Вы атрымаеце ліст з інструкцыямі, каб пацвердзіць Вашу электронную пошту. Калі Вы не знойдзеце ліст, праверце папку са спамам.
     failure:
       already_authenticated: Вы ўжо ўвайшлі.
       inactive: Ваш уліковы запіс яшчэ не актываваны.
       invalid: Няправільны %{authentication_keys} або пароль.
-      last_attempt: У вас ёсць яшчэ адна спроба, перш чым ваш рахунак будзе заблакаваны
+      last_attempt: У вас ёсць яшчэ адна спроба, перш чым Ваш уліковы запіс будзе заблакіраваны.
       locked: Ваш уліковы запіс заблакіраваны.
       not_found_in_database: Няправільны %{authentication_keys} або пароль.
       omniauth_user_creation_failure: Памылка пры стварэнні ўліковага запісу для гэтай асобы.
       pending: Ваш уліковы запіс яшчэ разглядаецца.
       timeout: Ваш сеанс скончыўся. Каб працягнуць, увайдзіце яшчэ раз.
-      unauthenticated: Вам патрэбна зайсьці альбо зарэгістравацца, каб працягнуць
-      unconfirmed: Вы павінны пацвердзіць свой адрас электроннай пошты, перш чым працягнуць
+      unauthenticated: Каб працягнуць, вам трэба ўвайсці або зарэгістравацца.
+      unconfirmed: Вы мусіце пацвердзіць свой адрас электроннай пошты, перш чым працягнуць.
     mailer:
       confirmation_instructions:
         action: Пацвердзіць адрас электроннай пошты
         action_with_app: Пацвердзіць і вярнуцца да %{app}
         explanation: Вы стварылі ўліковы запіс на %{host} з гэтым адрасам электроннай пошты. Вам спатрэбіцца ўсяго адзін клік, каб пацвердзіць яго. Калі гэта былі не вы, то проста праігнаруйце гэты ліст.
-        explanation_when_pending: Вы падалі заяўку на запрашэнне на %{host} з гэтым адрасам электроннай пошты. Як толькі вы пацвердзіце свой адрас электроннай пошты, мы разгледзім вашу заяўку. Вы можаце ўвайсці, каб змяніць свае дадзеныя або выдаліць свой уліковы запіс, але вы не можаце атрымаць доступ да большасці функцый, пакуль ваш уліковы запіс не будзе зацверджаны. Калі ваша заяўка будзе адхілена, вашы даныя будуць выдалены, таму ад вас не спатрэбіцца ніякіх дадатковых дзеянняў. Калі гэта былі не вы, ігнаруйце гэты ліст
+        explanation_when_pending: Вы падалі заяўку на запрашэнне ў %{host} з гэтага адрасу электроннай пошты. Як толькі вы пацвердзіце свой адрас электроннай пошты, мы разгледзім вашу заяўку. Вы можаце ўвайсці, каб змяніць свае даныя або выдаліць свой уліковы запіс, але вы не атрымаеце доступ да большасці функцый, пакуль ваш уліковы запіс не будзе зацверджаны. Калі ваша заяўка будзе адхілена, вашы даныя будуць выдалены, таму ад вас не спатрэбіцца ніякіх дадатковых дзеянняў. Калі гэта былі не вы, ігнаруйце гэты ліст.
         extra_html: Таксама азнаёмцеся з <a href="%{terms_path}">правіламі сервера</a> і <a href="%{policy_path}">нашымі ўмовамі абслугоўвання</a>.
         subject: 'Mastodon: Інструкцыі па пацвярджэнні для %{instance}'
         title: Праверце адрас электроннай пошты
       email_changed:
-        explanation: Адрас электроннай пошты для вашага ўліковага запісу будзе зменены на
-        extra: Калі вы не змянялі сваю электронную пошту, хутчэй за ўсё, нехта атрымаў доступ да вашага ўліковага запісу. Калі ласка, неадкладна змяніце свой пароль або звярніцеся да адміністратара сервера, калі вы заблакаваны з вашага ўліковага запісу
+        explanation: 'Адрас электроннай пошты для вашага ўліковага запісу будзе зменены на:'
+        extra: Калі Вы не змянялі сваю электронную пошту, хутчэй за ўсё, нехта атрымаў доступ да вашага ўліковага запісу. Неадкладна змяніце свой пароль або звярніцеся да адміністратара сервера, калі Вы заблакіраваны са свайго ўліковага запісу.
         subject: 'Mastodon: адрас электроннай пошты зменены'
         title: Новы адрас электроннай пошты
       password_change:
-        explanation: Пароль для вашага ўліковага запісу быў зменены
-        extra: Калі вы не змянялі свой пароль, верагодна, нехта атрымаў доступ да вашага ўліковага запісу. Калі ласка, неадкладна змяніце свой пароль або звярніцеся да адміністратара сервера, калі вы заблакаваны з вашага ўліковага запісу
+        explanation: Пароль для вашага ўліковага запісу быў зменены.
+        extra: Калі Вы не змянялі свой пароль, імаверна, нехта атрымаў доступ да вашага ўліковага запісу. Неадкладна змяніце свой пароль або звярніцеся да адміністратара сервера, калі Вы заблакіраваны са свайго ўліковага запісу.
         subject: 'Mastodon: пароль зменены'
         title: Пароль зменены
       reconfirmation_instructions:
         explanation: Пацвердзіце, каб змяніць адрас вашай электроннай пошты.
-        extra: Калі гэтыя змены не былі зроблены вамі, ігнаруйце гэты ліст. Адрас электроннай пошты для акаўнту Mastodon не будзе зменены, пакуль вы не пяройдзеце па спасылцы вышэй.
+        extra: Калі гэтыя змены не былі зроблены Вамі, праігнаруйце гэты ліст. Адрас электроннай пошты для ўліковага запісу Mastodon не будзе зменены, пакуль вы не пяройдзеце па спасылцы вышэй.
         subject: 'Mastodon: пацвердзіце электронную пошту для %{instance}'
         title: Пацвердзіце адрас электроннай пошты
       reset_password_instructions:
         action: Змяніць пароль
         explanation: Вы запыталі новы пароль для свайго ўліковага запісу.
-        extra: Калі вы не рабілі такога запыту, калі ласка, ігнаруйце гэты ліст. Ваш пароль не будзе зменены, пакуль вы не пяройдзеце па спасылцы вышэй і не створыце новы.
+        extra: Калі Вы не рабілі такога запыту, калі ласка, праігнаруйце гэты ліст. Ваш пароль не будзе зменены, пакуль Вы не пяройдзеце па спасылцы вышэй і не створыце новы.
         subject: 'Mastodon: Інструкцыі па скіданню пароля'
         title: Скіданне пароля
       two_factor_disabled:
@@ -59,20 +59,20 @@ be:
         title: двухэтапнае спраўджанне уключана
       two_factor_recovery_codes_changed:
         explanation: Папярэднія коды аднаўлення былі ануляваны і створаны новыя.
-        subject: 'Mastodon: створаны новыя коды аднаўлення'
-        subtitle: Папярэднія коды аднаўлення былі ануляваны і замест іх створаны новыя.
+        subject: 'Mastodon: створаныя новыя коды аднаўлення'
+        subtitle: Папярэднія коды аднаўлення былі ануляваны і замест іх былі створаныя новыя.
         title: 2FA коды аднаўлення былі зменены
       unlock_instructions:
         subject: 'Mastodon: інструкцыя па разблакаванні'
       webauthn_credential:
         added:
-          explanation: Наступны ключ бяспекі быў дададзены ў ваш уліковы запіс
+          explanation: Наступны ключ бяспекі быў дададзены ў Ваш уліковы запіс
           subject: 'Mastodon: новы ключ бяспекі'
           title: Быў дададзены новы ключ бяспекі
         deleted:
-          explanation: Наступны ключ бяспекі быў выдалены з вашага ўліковага запісу
+          explanation: Наступны ключ бяспекі быў выдалены з Вашага ўліковага запісу
           subject: 'Mastodon: ключ бяспекі выдалены'
-          title: Адзін з вашых ключоў бяспекі быў выдалены
+          title: Адзін з Вашых ключоў бяспекі быў выдалены
       webauthn_disabled:
         explanation: Аўтэнтыфікацыя з дапамогай ключоў бяспекі была адключаная для вашага ўліковага запісу.
         extra: Зараз уваход у сістэму магчымы толькі з выкарыстаннем токена, згенераванага спалучанай праграмай TOTP.
@@ -80,30 +80,30 @@ be:
         title: Ключы бяспекі адключаны
       webauthn_enabled:
         explanation: Для вашага ўліковага запісу ўключана аўтэнтыфікацыя па ключу бяспекі.
-        extra: Цяпер ваш ключ бяспекі можна выкарыстоўваць для ўваходу ў сістэму.
+        extra: Цяпер Ваш ключ бяспекі можна выкарыстоўваць для ўваходу ў сістэму.
         subject: 'Mastodon: Аўтэнтыфікацыя праз ключ бяспекі была ўключана'
         title: Ключы бяспекі ўключаны
     omniauth_callbacks:
       failure: Немагчыма аўтэнтыфікаваць вас з %{kind}, таму што “%{reason}”.
       success: Паспяховая аўтэнтыфікацыя з %{kind} уліковага запісу.
     passwords:
-      no_token: Вы не можаце атрымаць доступ да гэтай старонкі не з ліста аднаўлення пароля. Калі вы ўсе ж такі перайшлі па спасылцы ў лісце аднаўлення пароля, упэўніцеся, што яна поўная.
-      send_instructions: Калі ваш электроны адрас існуе ў нашай базе дадзеных, вы атрымаеце спасылку для аднаўлення пароля на свой электроны адрас праз пару хвілін. Калі ласка, праверце вашу тэчку са спамам, калі вы не атрымалі такі ліст.
-      send_paranoid_instructions: Калі ваш электроны адрас існуе ў нашай базе дадзеных, вы атрымаеце спасылку для аднаўлення пароля на свой электроны адрас праз пару хвілін. Калі ласка, праверце вашу тэчку са спамам, калі вы не атрымалі такі ліст.
+      no_token: Вы не можаце атрымаць доступ да гэтай старонкі не з ліста аднаўлення пароля. Калі Вы ўсе ж такі перайшлі па спасылцы ў лісце аднаўлення пароля, упэўніцеся, што яна поўная.
+      send_instructions: Калі Ваш электроны адрас існуе ў нашай базе даных, Вы атрымаеце спасылку для аднаўлення пароля на сваю электронную пошту праз пару хвілін. Калі Вы не атрымалі гэты ліст, праверце папку са спамам.
+      send_paranoid_instructions: Калі Ваш электроны адрас існуе ў нашай базе даных, Вы атрымаеце спасылку для аднаўлення пароля на сваю электронную пошту праз пару хвілін. Калі Вы не атрымалі гэты ліст, праверце папку са спамам.
       updated: Ваш пароль быў паспяхова зменены. Вы ўвайшлі ў сістэму.
       updated_not_active: Ваш пароль быў паспяхова зменены.
     registrations:
       destroyed: Пакуль! Ваш уліковы запіс быў паспяхова выдалены. Мы спадзяваемся хутка ўбачыць вас зноў.
-      update_needs_confirmation: Вы паспяхова абнавілі свой уліковы запіс, аднак, нам неабходна пацвердзіць ваш новы адрас электроннай пошты. Калі ласка, праверце вашу пошту і перайдзіце па спасылцы для пацверджання вашага новага адраса электроннай пошты. Праверце тэчку са спамам, калі вы не атрымалі такі ліст.
+      update_needs_confirmation: Вы паспяхова абнавілі свой уліковы запіс, аднак, нам неабходна пацвердзіць Ваш новы адрас электроннай пошты. Праверце Вашу пошту і перайдзіце па спасылцы для пацвярджэння свайго новага адраса электроннай пошты. Калі Вы не атрымалі гэты ліст, праверце папку са спамам.
       updated: Ваш уліковы запіс быў паспяхова абноўлены.
     sessions:
       already_signed_out: Выхад паспяховы.
       signed_in: Уваход паспяховы.
       signed_out: Выхад паспяховы.
     unlocks:
-      send_instructions: Вы атрымаеце ліст з інструкцыямі па разблакаванні вашага ўліковага запісу цягам некалькіх хвілін. Праверце тэчку са спамам, калі вы не атрымалі такі ліст.
-      send_paranoid_instructions: Калі ваш уліковы запіс існуе, вы атрымаеце ліст з інструкцыямі па яго разблакаванні цягам некалькіх хвілін. Праверце тэчку са спамам, калі вы не атрымалі такі ліст.
-      unlocked: Ваш уліковы запіс быў паспяхова разблакаваны. Калі ласка, увайдзіце, каб працягнуць
+      send_instructions: Вы атрымаеце ліст з інструкцыямі па разблакіроўцы вашага ўліковага запісу цягам некалькіх хвілін. Праверце тэчку са спамам, калі Вы не атрымалі такі ліст.
+      send_paranoid_instructions: Калі Ваш уліковы запіс існуе, вы атрымаеце ліст з інструкцыямі па яго разблакіроўцы цягам некалькіх хвілін. Праверце тэчку са спамам, калі Вы не атрымалі такі ліст.
+      unlocked: Ваш уліковы запіс быў разблакіраваны. Увайдзіце, каб працягнуць.
   errors:
     messages:
       already_confirmed: ужо пацверджана, паспрабуйце ўвайсці
diff --git a/config/locales/devise.br.yml b/config/locales/devise.br.yml
index a936bcc05fa..ffd64e642d7 100644
--- a/config/locales/devise.br.yml
+++ b/config/locales/devise.br.yml
@@ -13,7 +13,7 @@ br:
       locked: Prennet eo ho kont.
       not_found_in_database: "%{authentication_keys} pe ger-tremen diwiriek."
       pending: O vezañ asantet eo ho kont.
-      timeout: Ho talc'h a zo aet da dermen. Mar plij, kit-tre c'hoazh evit kenderc'hel.
+      timeout: Ho talc'h a zo aet da dermen. Mar plij, kevreit c'hoazh evit kenderc'hel.
       unauthenticated: Ret eo deoc'h mont-tre pe e em enskrivañ araok kenderc'hel.
       unconfirmed: Ret eo deoc'h kadarnaat ho chomlec'h-postel araok kenderc'hel.
     mailer:
@@ -84,7 +84,7 @@ br:
       updated_not_active: Kemmet eo bet ho ker-tremen ent reizh.
     registrations:
       destroyed: Kenavo! Ho kont a zo bet nullet gant berzh. Emichañs e viot adwelet tuchant.
-      update_needs_confirmation: Ho kont a zo bet hizivaet da benn, met ret eo deomp gwiriañ ho chomlec'h-postel nevez. Mar plij, gwiriit ho postelioù ha heuliit al lec'hienn evit kadarnaat ho chomlec'h-postel nevez. Gwiriit ho restr strobel ma ne oa ket resevet ar postel-mañ ganeoc'h.
+      update_needs_confirmation: Ho kont a zo bet hizivaet da benn, met ret eo deomp gwiriañ ho chomlec'h-postel nevez. Mar plij, gwiriit ho postelioù ha heuilhit al lec'hienn evit kadarnaat ho chomlec'h-postel nevez. Gwiriit ho restr strobel ma ne oa ket resevet ar postel-mañ ganeoc'h.
       updated: Ho kont a zo bet hizivaet da benn.
     sessions:
       already_signed_out: Digennasket gant berzh.
diff --git a/config/locales/devise.el.yml b/config/locales/devise.el.yml
index 3d3d4f87d94..106a48a49e6 100644
--- a/config/locales/devise.el.yml
+++ b/config/locales/devise.el.yml
@@ -29,7 +29,7 @@ el:
       email_changed:
         explanation: 'Αλλάζεις τη διεύθυνση email για τον λογαριασμό σου στην:'
         extra: Αν δεν άλλαξες εσύ το email σου, ίσως κάποιος να έχει αποκτήσει πρόσβαση στο λογαριασμό σου. Παρακαλούμε άλλαξε το συνθηματικό σου άμεσα ή επικοινώνησε με τον διαχειριστή του κόμβου σου αν έχεις κλειδωθεί απ' έξω.
-        subject: 'Mastodon: Αλλαγή διεύθυνσης email'
+        subject: 'Mastodon: Το email άλλαξε'
         title: Νέα διεύθυνση email
       password_change:
         explanation: Το συνθηματικό του λογαριασμού σου άλλαξε.
diff --git a/config/locales/devise.ru.yml b/config/locales/devise.ru.yml
index 8c0546e36db..cc95f730615 100644
--- a/config/locales/devise.ru.yml
+++ b/config/locales/devise.ru.yml
@@ -4,14 +4,14 @@ ru:
     confirmations:
       confirmed: Ваш адрес электронной почты успешно подтверждён.
       send_instructions: В течение нескольких минут вы получите письмо с инструкциями по подтверждению адреса электронной почты. Если письмо не приходит, проверьте папку «Спам».
-      send_paranoid_instructions: Если на ваш адрес электронной почты зарегистрирована учётная запись, то в течение нескольких минут вы получите письмо с инструкциями по его подтверждению. Если письмо не приходит, проверьте папку «Спам».
+      send_paranoid_instructions: В течение нескольких минут вы получите письмо с инструкциями по его подтверждению, при условии что на ваш адрес электронной почты зарегистрирована учётная запись. Если письмо не приходит, проверьте папку «Спам».
     failure:
       already_authenticated: Вы уже авторизованы.
       inactive: Ваша учётная запись ещё не активирована.
-      invalid: "%{authentication_keys} или пароль введены неверно."
+      invalid: "%{authentication_keys} или пароль введён неверно."
       last_attempt: У вас осталась последняя попытка ввода пароля до блокировки учётной записи.
       locked: Ваша учётная запись заблокирована.
-      not_found_in_database: "%{authentication_keys} или пароль введены неверно."
+      not_found_in_database: "%{authentication_keys} или пароль введён неверно."
       omniauth_user_creation_failure: Не удалось создать учётную запись с помощью выбранного способа идентификации.
       pending: Ваша заявка на регистрацию всё ещё рассматривается.
       timeout: Ваш сеанс закончился. Пожалуйста, войдите снова.
@@ -22,29 +22,29 @@ ru:
         action: Подтвердить
         action_with_app: Подтвердить и вернуться в %{app}
         explanation: Вы создали учётную запись на сайте %{host}, используя этот адрес электронной почты. Остался лишь один шаг для её активации. Если это сделали не вы, просто проигнорируйте это письмо.
-        explanation_when_pending: Вы подали заявку, чтобы создать учётную запись на сайте %{host}, используя этот адрес электронной почты. После того как вы его подтвердите, мы начнём рассматривать вашу заявку. До тех пор вы сможете войти на сайт только для того, чтобы редактировать данные своей учётной записи или удалить её. Если ваша заявка будет отклонена, все данные будут автоматически удалены, от вас не потребуется никаких дополнительных действий. Если заявку подали не вы, пожалуйста, проигнорируйте это письмо.
+        explanation_when_pending: Вы подали заявку, чтобы создать учётную запись на сайте %{host}, используя этот адрес электронной почты. После того как вы его подтвердите, мы начнём рассматривать вашу заявку. До тех пор вы сможете войти на сайт только для того, чтобы редактировать данные своей учётной записи или удалить её. При условии что ваша заявка будет отклонена, все данные будут автоматически удалены, от вас не потребуется никаких дополнительных действий. Если заявку подали не вы, просто проигнорируйте это письмо.
         extra_html: Пожалуйста, также ознакомьтесь с <a href="%{terms_path}">правилами сервера</a> и <a href="%{policy_path}">политикой конфиденциальности</a>.
         subject: 'Mastodon: Инструкции по подтверждению учётной записи на %{instance}'
         title: Подтверждение адреса электронной почты
       email_changed:
         explanation: 'Ваш адрес электронной почты будет изменён на:'
-        extra: Если вы не меняли адрес электронной почты, возможно, кто-то получил доступ к вашей учётной записи. Пожалуйста, немедленно смените пароль или свяжитесь с администратором сервера, если вы уже потеряли к ней доступ.
+        extra: Если вы не меняли адрес электронной почты, возможно кто-то получил доступ к вашей учётной записи. Если вы уже потеряли к ней доступ, пожалуйста немедленно смените пароль или свяжитесь с администратором сервера.
         subject: 'Mastodon: Адрес электронной почты изменён'
         title: Адрес электронной почты изменён
       password_change:
         explanation: Ваш пароль был изменён.
-        extra: Если вы не меняли пароль, возможно, кто-то получил доступ к вашей учётной записи. Пожалуйста, немедленно смените пароль или свяжитесь с администратором сервера, если вы уже потеряли к ней доступ.
+        extra: Если вы не меняли пароль, возможно кто-то получил доступ к вашей учётной записи. Если вы уже потеряли к ней доступ, пожалуйста немедленно смените пароль или свяжитесь с администратором сервера.
         subject: 'Mastodon: Пароль изменён'
         title: Пароль изменён
       reconfirmation_instructions:
         explanation: Чтобы завершить изменение адреса электронной почты, подтвердите новый адрес.
-        extra: Если запрос инициировали не вы, пожалуйста, проигнорируйте это письмо. Новый адрес не будет привязан к учётной записи, пока вы не перейдёте по ссылке выше.
+        extra: Если запрос инициировали не вы, пожалуйста проигнорируйте это письмо. Новый адрес не будет привязан к учётной записи, пока вы не перейдёте по ссылке выше.
         subject: 'Mastodon: Подтвердите новый адрес электронной почты на %{instance}'
         title: Подтверждение адреса электронной почты
       reset_password_instructions:
         action: Сменить пароль
         explanation: Вы запросили новый пароль для вашей учётной записи.
-        extra: Если вы не запрашивали изменение пароля, проигнорируйте это письмо. Ваш пароль не будет изменён, пока вы не перейдёте по ссылке и не введёте новый пароль.
+        extra: Если вы не запрашивали изменение пароля, пожалуйста проигнорируйте это письмо. Ваш пароль не будет изменён, пока вы не перейдёте по ссылке и не введёте новый пароль.
         subject: 'Mastodon: Инструкции по восстановлению пароля'
         title: Восстановление пароля
       two_factor_disabled:
@@ -53,7 +53,7 @@ ru:
         subtitle: Двухфакторная аутентификация отключена для вашей учетной записи.
         title: 2FA отключена
       two_factor_enabled:
-        explanation: Для входа потребуется одноразовый код, сгенерированный сопряжённым приложением TOTP.
+        explanation: Для входа потребуется одноразовый код, сгенерированный сопряжённым приложением-аутентификатором.
         subject: 'Mastodon: Двухфакторная аутентификация включена'
         subtitle: Двухфакторная аутентификация включена для вашей учётной записи.
         title: 2FA включена
@@ -75,7 +75,7 @@ ru:
           title: Один из ваших электронных ключей удалён
       webauthn_disabled:
         explanation: Аутентификация по электронным ключам деактивирована для вашей учетной записи.
-        extra: Теперь вход возможен с использованием только лишь одноразового кода, сгенерированного сопряжённым приложением TOTP.
+        extra: Теперь вход возможен с использованием только с помощью одноразового кода, сгенерированного сопряжённым приложением-аутентификатором.
         subject: 'Mastodon: Аутентификация по электронным ключам деактивирована'
         title: Вход по электронным ключам деактивирован
       webauthn_enabled:
@@ -87,9 +87,9 @@ ru:
       failure: Вы не можете войти под учётной записью %{kind}, так как «%{reason}».
       success: Вход выполнен под учётной записью %{kind}.
     passwords:
-      no_token: Доступ к этой странице возможен только по ссылке из письма о восстановлении пароля. Если вы перешли по такой ссылке, пожалуйста, убедитесь, что вы скопировали всю ссылку целиком.
+      no_token: Доступ к этой странице возможен только по ссылке из письма о восстановлении пароля. Если вы перешли по такой ссылке, пожалуйста убедитесь, что вы скопировали всю ссылку целиком.
       send_instructions: Если на ваш адрес электронной почты зарегистрирована учётная запись, то в течение нескольких минут вы получите письмо с инструкциями по восстановлению пароля. Если письмо не приходит, проверьте папку «Спам».
-      send_paranoid_instructions: Если на ваш адрес электронной почты зарегистрирована учётная запись, то в течение нескольких минут вы получите письмо с инструкциями по восстановлению пароля. Если письмо не приходит, проверьте папку «Спам».
+      send_paranoid_instructions: В течение нескольких минут вы получите письмо с инструкциями по восстановлению пароля, при условии что на ваш адрес электронной почты зарегистрирована учётная запись. Если письмо не приходит, проверьте папку «Спам».
       updated: Ваш пароль изменён. Теперь вы авторизованы.
       updated_not_active: Ваш пароль изменён.
     registrations:
@@ -102,7 +102,7 @@ ru:
       signed_out: Выход выполнен.
     unlocks:
       send_instructions: В течение нескольких минут вы получите письмо с инструкциями по разблокировке учётной записи. Если письмо не приходит, проверьте папку «Спам».
-      send_paranoid_instructions: Если ваша учётная запись существует, то в течение нескольких минут вы получите письмо с инструкциями по её разблокировке. Если письмо не приходит, проверьте папку «Спам».
+      send_paranoid_instructions: В течение нескольких минут вы получите письмо с инструкциями по разблокировке вашей учётной записи, при условии что она существует. Если письмо не приходит, проверьте папку «Спам».
       unlocked: Ваша учётная запись разблокирована. Теперь вы можете войти.
   errors:
     messages:
diff --git a/config/locales/devise.sk.yml b/config/locales/devise.sk.yml
index 08e93456b03..9d852913d2d 100644
--- a/config/locales/devise.sk.yml
+++ b/config/locales/devise.sk.yml
@@ -4,7 +4,7 @@ sk:
     confirmations:
       confirmed: Vaša e-mailová adresa bola úspešne potvrdená.
       send_instructions: O niekoľko minút obdržíte e-mail s pokynmi na potvrdenie svojho účtu. Prosíme, skontrolujte si aj zložku spam, ak ste tento e-mail nedostali.
-      send_paranoid_instructions: Ak sa vaša e-mailová adresa nachádza v našej databáze, o niekoľko minút obdržíte e-mail s pokynmi na potvrdenie svojho účtu. Prosíme, skontrolujte aj zložku spam, ste tento e-mail nedostali.
+      send_paranoid_instructions: Ak sa vaša e-mailová adresa nachádza v našej databáze, o niekoľko minút obdržíte e-mail s pokynmi na potvrdenie svojho účtu. Prosíme, skontrolujte aj zložku spam, ak ste tento e-mail nedostali.
     failure:
       already_authenticated: Už ste sa prihlásili.
       inactive: Váš účet ešte nie je aktivovaný.
@@ -88,8 +88,8 @@ sk:
       success: Úspešné overenie z účtu %{kind}.
     passwords:
       no_token: Túto stránku nemôžete navštíviť, ak vás sem nepresmeroval e-mail s pokynmi na obnovu hesla. Pokiaľ prichádzate z tohto e-mailu, uistite sa, že ste použili celú adresu URL z e-mailu.
-      send_instructions: Ak sa vaša emailová adresa nachádza v databáze, o niekoľko minút dostanete e-mail s pokynmi na nastavenie nového hesla. Ak ste ho nedostali, skontrolujte aj priečinok pre spam.
-      send_paranoid_instructions: Ak sa vaša emailová adresa nachádza v databáze, o niekoľko minút dostanete e-mail s pokynmi na nastavenie nového hesla. Ak ste ho nedostali, skontrolujte aj priečinok pre spam.
+      send_instructions: Ak sa vaša e-mailová adresa nachádza v databáze, o niekoľko minút dostanete e-mail s pokynmi na nastavenie nového hesla. Ak ste ho nedostali, skontrolujte aj priečinok pre spam.
+      send_paranoid_instructions: Ak sa vaša e-mailová adresa nachádza v databáze, o niekoľko minút dostanete e-mail s pokynmi na nastavenie nového hesla. Ak ste ho nedostali, skontrolujte aj priečinok pre spam.
       updated: Vaše heslo bolo úspešne zmenené. Teraz ste sa prihlásili.
       updated_not_active: Vaše heslo bolo úspešne zmenené.
     registrations:
@@ -97,9 +97,9 @@ sk:
       update_needs_confirmation: Váš účet bol úspešne zmenený, ale ešte potrebujeme overiť vašu novú e-mailovú adresu. Overíte ju kliknutím na potvrdzovací odkaz zaslaný na váš e-mail. Ak ste e-mail nedostali, skontrolujte svoj priečinok pre spam.
       updated: Váš účet bol úspešne aktualizovaný.
     sessions:
-      already_signed_out: Úspešne ste sa odhlásili.
+      already_signed_out: Odhlásenie prebehlo úspešne.
       signed_in: Úspešne ste sa prihlásili.
-      signed_out: Úspešne ste sa odhlásili.
+      signed_out: Odhlásenie prebehlo úspešne.
     unlocks:
       send_instructions: O niekoľko minút obdržíte e-mail s pokynmi na odomknutie svojho účtu. Prosíme, skontrolujte si aj zložku spam, ak ste tento e-mail nedostali.
       send_paranoid_instructions: Ak váš účet existuje, o niekoľko minút obdržíte e-mail s pokynmi na jeho odomknutie. Prosíme, skontrolujte si aj zložku spam, ak ste tento e-mail nedostali.
diff --git a/config/locales/devise.vi.yml b/config/locales/devise.vi.yml
index 04107b28972..2b4dc44db98 100644
--- a/config/locales/devise.vi.yml
+++ b/config/locales/devise.vi.yml
@@ -49,14 +49,14 @@ vi:
         title: Đổi lại mật khẩu
       two_factor_disabled:
         explanation: Đăng nhập bây giờ chỉ có thể sử dụng địa chỉ email và mật khẩu.
-        subject: 'Mastodon: Xác minh 2 bước đã bị vô hiệu hóa'
-        subtitle: Xác minh hai bước cho tài khoản của bạn đã bị vô hiệu hóa.
-        title: Vô hiệu hóa xác minh 2 bước
+        subject: 'Mastodon: Xác thực 2 bước đã bị vô hiệu hóa'
+        subtitle: Xác thực 2 bước cho tài khoản của bạn đã bị vô hiệu hóa.
+        title: Vô hiệu hóa xác thực 2 bước
       two_factor_enabled:
         explanation: Cần có mã token được tạo bởi ứng dụng TOTP được ghép nối để đăng nhập.
-        subject: 'Mastodon: Kích hoạt xác minh 2 bước'
-        subtitle: Xác minh hai bước đã được bật cho tài khoản của bạn.
-        title: Kích hoạt xác minh 2 bước
+        subject: 'Mastodon: Kích hoạt xác thực 2 bước'
+        subtitle: Xác thực 2 bước đã được bật cho tài khoản của bạn.
+        title: Kích hoạt xác thực 2 bước
       two_factor_recovery_codes_changed:
         explanation: Các mã khôi phục trước đó đã bị vô hiệu hóa và thay bằng mã mới.
         subject: 'Mastodon: Mã khôi phục xác thực hai yếu tố đã được tạo lại'
@@ -74,18 +74,18 @@ vi:
           subject: 'Mastodon: Xóa khóa bảo mật'
           title: Một trong những khóa bảo mật của bạn vừa bị xóa
       webauthn_disabled:
-        explanation: Xác minh bằng khóa bảo mật đã bị vô hiệu hóa đối với tài khoản của bạn.
+        explanation: Xác thực bằng khóa bảo mật đã bị vô hiệu hóa đối với tài khoản của bạn.
         extra: Hiện tại, bạn chỉ có thể đăng nhập bằng cách sử dụng mã token được tạo bởi ứng dụng TOTP được ghép nối.
         subject: 'Mastodon: Vô hiệu hóa xác thực bằng khóa bảo mật'
         title: Đã vô hiệu hóa khóa bảo mật
       webauthn_enabled:
         explanation: Khóa bảo mật đã được bật cho tài khoản của bạn.
         extra: Hiện bạn đã có thể dùng khóa bảo mật để đăng nhập.
-        subject: 'Mastodon: Kích hoạt xác minh bằng khóa bảo mật'
+        subject: 'Mastodon: Kích hoạt xác thực bằng khóa bảo mật'
         title: Đã kích hoạt khóa bảo mật
     omniauth_callbacks:
-      failure: Không thể xác minh bạn từ %{kind} bởi vì "%{reason}".
-      success: Xác minh tài khoản %{kind} thành công.
+      failure: Không thể xác thực bạn từ %{kind} bởi vì "%{reason}".
+      success: Xác thực tài khoản %{kind} thành công.
     passwords:
       no_token: Bạn chỉ có thể truy cập trang này khi nhận được email khôi phục mật khẩu. Nếu vẫn không được, vui lòng chắc chắn rằng bạn đã dùng chính xác URL được cung cấp.
       send_instructions: Nếu địa chỉ email của bạn tồn tại trong cơ sở dữ liệu của chúng tôi, bạn sẽ nhận được liên kết khôi phục mật khẩu sau vài phút. Xin kiểm tra thư rác nếu như bạn không thấy email này.
diff --git a/config/locales/doorkeeper.az.yml b/config/locales/doorkeeper.az.yml
index e9ba86bc793..7cf62a7af9d 100644
--- a/config/locales/doorkeeper.az.yml
+++ b/config/locales/doorkeeper.az.yml
@@ -1 +1,175 @@
+---
 az:
+  activerecord:
+    attributes:
+      doorkeeper/application:
+        name: Tətbiq adı
+        redirect_uri: Yönləndirmə URL-si
+        website: Tətbiq veb saytı
+    errors:
+      models:
+        doorkeeper/application:
+          attributes:
+            redirect_uri:
+              fragment_present: fraqment ehtiva edə bilməz.
+              invalid_uri: yararlı bir URL olmalıdır.
+              relative_uri: mütləq bir URL olmalıdır.
+              secured_uri: HTTPS/SSL URL olmalıdır.
+  doorkeeper:
+    applications:
+      buttons:
+        authorize: Səlahiyyət ver
+        cancel: İmtina
+        destroy: Məhv et
+        edit: Düzəliş et
+        submit: Təqdim et
+      confirmations:
+        destroy: Əminsiniz?
+      edit:
+        title: Tətbiqə düzəliş et
+      form:
+        error: Ups! Mümkün xətalar üçün formunuzu yoxlayın
+      help:
+        native_redirect_uri: Lokal testlər üçün %{native_redirect_uri} istifadə edin
+        redirect_uri: Hər URL üçün bir sətir istifadə edin
+      index:
+        application: Tətbiq
+        delete: Sil
+        empty: Heç bir tətbiqiniz yoxdur.
+        name: Ad
+        new: Yeni tətbiq
+        show: Göstər
+        title: Tətbiqləriniz
+      new:
+        title: Yeni tətbiq
+      show:
+        actions: Əməliyyatlar
+        application_id: Client açarı
+        secret: Client sirri
+        title: 'Tətbiq: %{name}'
+    authorizations:
+      buttons:
+        authorize: Səlahiyyət ver
+        deny: Rədd et
+      error:
+        title: Bir xəta baş verdi
+      new:
+        prompt_html: "%{client_name} hesabınıza erişmək üçün icazə istəyir. <strong>Yalnız bu mənbəni tanıyırsınızsa və ona güvənirsinizsə bu istəyi təsdiqləyin.</strong>"
+        review_permissions: İcazələri incələ
+        title: Səlahiyyət tələb olunur
+      show:
+        title: Bu səlahiyyət kodunu kopyalayın və tətbiqə yapışdırın.
+    authorized_applications:
+      buttons:
+        revoke: Ləğv et
+      confirmations:
+        revoke: Əminsiniz?
+      index:
+        authorized_at: "%{date} tarixində səlahiyyət verilib"
+        description_html: Bunlar, API istifadə edərək hesabınıza erişəbilən tətbiqlərdir. Əgər burada tanımadığınız tətbiqlər və ya yanlış davranan bir tətbiq varsa, erişimini ləğv edə bilərsiniz.
+        last_used_at: Ən son %{date} istifadə edilib
+        never_used: Heç vaxt istifadə edilməyib
+        scopes: İcazələr
+        superapp: Daxili
+        title: Səlahiyyətli tətbiqləriniz
+    errors:
+      messages:
+        access_denied: Resurs sahibi və ya avtorizasiya serveri istəyə rədd cavabı verdi.
+        invalid_token:
+          expired: Erişim tokeninin vaxtı bitib
+          revoked: Erişim tokeni ləğv edilib
+          unknown: Erişim tokeni yararsızdır
+    flash:
+      applications:
+        create:
+          notice: Tətbiq yaradıldı.
+        destroy:
+          notice: Tətbiq silindi.
+        update:
+          notice: Tətbiq güncəlləndi.
+      authorized_applications:
+        destroy:
+          notice: Tətbiq ləğv edildi.
+    grouped_scopes:
+      access:
+        read: Yalnız oxuma erişimi
+        read/write: Oxuma və yazma erişimi
+        write: Yalnız yazma erişimi
+      title:
+        accounts: Hesablar
+        admin/accounts: Hesabların administrasiyası
+        admin/all: Bütün administrativ funksiyalar
+        admin/reports: Şikayətlərin administrasiyası
+        all: Mastodon hesabınıza tam erişim
+        blocks: Əngəlləmələr
+        bookmarks: Əlfəcinlər
+        conversations: Danışıqlar
+        crypto: Ucdan-uca şifrələmə
+        favourites: Sevimlilər
+        filters: Filtrlər
+        follow: İzləmələr, səsi kəsmələr və əngəlləmələr
+        follows: İzlənilənlər
+        lists: Siyahılar
+        media: Media qoşmaları
+        mutes: Səssizdəkilər
+        notifications: Bildirişlər
+        profile: Mastodon profiliniz
+        push: Ani bildirişlər
+        reports: Şikayətlər
+        search: Axtar
+        statuses: Göndərişlər
+    layouts:
+      admin:
+        nav:
+          applications: Tətbiqlər
+          oauth2_provider: OAuth2 Provayderi
+      application:
+        title: OAuth səlahiyyəti tələb olunur
+    scopes:
+      admin:read: serverdəki bütün veriləri oxuyur
+      admin:read:accounts: bütün hesabların həssas məlumatlarını oxuyur
+      admin:read:canonical_email_blocks: bütün kanonik e-poçt əngəlləmələrinin həssas məlumatlarını oxuyur
+      admin:read:domain_allows: bütün domen icazələrinin həssas məlumatlarını oxuyur
+      admin:read:domain_blocks: bütün əngəllənən domenlərin həssas məlumatlarını oxuyur
+      admin:read:email_domain_blocks: bütün əngəllənən e-poçt domenlərinin həssas məlumatlarını oxuyur
+      admin:read:ip_blocks: bütün IP əngəlləmələrinin həssas məlumatlarını oxuyur
+      admin:read:reports: bütün şikayətlərin və şikayət edilən hesabların həssas məlumatlarını oxuyur
+      admin:write: serverdəki bütün veriləri dəyişdirir
+      admin:write:accounts: hesablarda moderasiya əməliyyatlarını icra edir
+      admin:write:canonical_email_blocks: əngəllənən kanonik e-poçtlar üzərində moderasiya əməliyyatlarını icra edir
+      admin:write:domain_allows: icazə verilən domenlər üzərində moderasiya əməliyyatlarını icra edir
+      admin:write:domain_blocks: əngəllənən domenlər üzərində moderasiya əməliyyatlarını icra edir
+      admin:write:email_domain_blocks: əngəllənən e-poçt domenləri üzərində moderasiya əməliyyatlarını icra edir
+      admin:write:ip_blocks: əngəllənən IP-lər üzərində moderasiya əməliyyatlarını icra edir
+      admin:write:reports: hesabatlarda moderasiya əməliyyatlarını icra edir
+      crypto: ucdan-uca şifrələməni istifadə edir
+      follow: hesab münasibətlərini dəyişdirir
+      profile: hesabınızın yalnız profil məlumatlarını oxuyur
+      push: ani bildirişlərinizi alır
+      read: hesabınızın bütün verilərini oxuyur
+      read:accounts: hesab məlumatlarını görür
+      read:blocks: əngəllədiklərinizi görür
+      read:bookmarks: əlfəcinlərinizi görür
+      read:favourites: sevimlilərinizi görür
+      read:filters: filtrlərinizi görür
+      read:follows: izlədiklərinizi görür
+      read:lists: siyahılarınızı görür
+      read:mutes: səssizə aldıqlarınızı görür
+      read:notifications: bildirişlərinizi görür
+      read:reports: hesabatlarınızı görür
+      read:search: sizin adınıza axtarış edir
+      read:statuses: bütün göndərişləri görür
+      write: hesabınızın bütün verilərini dəyişdirir
+      write:accounts: profilinizi dəyişdirir
+      write:blocks: hesabları və domenləri əngəlləyir
+      write:bookmarks: göndərişləri əlfəcinlərə əlavə edir
+      write:conversations: danışıqları səssizə alır və silir
+      write:favourites: göndərişləri sevimlilərə əlavə edir
+      write:filters: filtrlər yaradır
+      write:follows: insanları izləyir
+      write:lists: siyahılar yaradır
+      write:media: media faylları yükləyir
+      write:mutes: insanları və danışıqları səssizə alır
+      write:notifications: bildirişlərinizi təmizləyir
+      write:reports: digər insanları şikayət edir
+      write:statuses: göndərişləri dərc edir
diff --git a/config/locales/doorkeeper.be.yml b/config/locales/doorkeeper.be.yml
index defe0ddf0db..45fa4ba1beb 100644
--- a/config/locales/doorkeeper.be.yml
+++ b/config/locales/doorkeeper.be.yml
@@ -4,7 +4,7 @@ be:
     attributes:
       doorkeeper/application:
         name: Назва праграмы
-        redirect_uri: перанакіравць URI
+        redirect_uri: Перанакіравць URI
         scopes: Дазволы
         website: Вэб-сайт праграмы
     errors:
@@ -12,8 +12,8 @@ be:
         doorkeeper/application:
           attributes:
             redirect_uri:
-              fragment_present: не можа ўтрымліваць фрагмент
-              invalid_uri: URI павінен быць сапраўдным
+              fragment_present: не можа ўтрымліваць фрагмент.
+              invalid_uri: URI павінен быць сапраўдным.
               relative_uri: павінен быць абсалютным URI.
               secured_uri: павінен быць HTTPS/SSL URI.
   doorkeeper:
@@ -60,6 +60,7 @@ be:
       error:
         title: Узнікла памылка
       new:
+        prompt_html: "%{client_name} хоча атрымаць дазвол на доступ да Вашага ўліковага запісу. <strong>Ухваляйце гэты запыт толькі калі Вы ведаеце гэту крыніцу і давяраеце ёй.</strong>"
         review_permissions: Прагледзець дазволы
         title: Патрабуецца аўтарызацыя
       show:
@@ -71,7 +72,7 @@ be:
         revoke: Вы ўпэўнены?
       index:
         authorized_at: Аўтарызавана %{date}
-        description_html: Гэта прыкладанні якія могуць мець доступ да вашага акаунта з дапамогай API. Калі вы бачыце тут прыкладанні, якія вы не пазнаеце, або прыкладанне блага сябе паводзіць вы можаце прыбраць ягонны доступ.
+        description_html: Гэта прыкладанні якія могуць мець доступ да вашага ўліковага запісу з дапамогай API. Калі вы бачыце тут прыкладанні, якія вы не пазнаеце, або прыкладанне блага сябе паводзіць вы можаце прыбраць ягоны доступ.
         last_used_at: Апошні раз скарыстана %{date}
         never_used: Не выкарыстоўвалася
         scopes: Дазволы
@@ -89,7 +90,7 @@ be:
           missing_param: 'Адсутнічае абавязковы параметр: %{value}.'
           request_not_authorized: Запыт павінен быць аўтарызаваны. Абавязковы параметр для запыту аўтарызацыі адсутнічае або несапраўдны.
           unknown: У запыце адсутнічае абавязковы параметр, уключае значэнне параметра, якое не падтрымліваецца, альбо ён сфарміраваны іншым няправільным чынам.
-        invalid_resource_owner: Прадстаўленыя ўліковыя дадзеныя ўладальніка рэсурсу несапраўдныя або немагчыма знайсці ўладальніка рэсурсу
+        invalid_resource_owner: Пададзеныя ўліковыя даныя ўладальніка рэсурсу несапраўдныя або ўладальніка рэсурсу немагчыма знайсці
         invalid_scope: Запытаная вобласць абмежаванняў несапраўдная, невядомая альбо няправільная.
         invalid_token:
           expired: Тэрмін дзеяння токена доступу скончыўся
@@ -119,10 +120,10 @@ be:
         write: Доступ толькі для запісу
       title:
         accounts: Уліковыя запісы
-        admin/accounts: Кіраванне акаўнтамі
+        admin/accounts: Кіраванне ўліковымі запісамі
         admin/all: Усе кіравальныя функцыі
         admin/reports: Кіраванне скардамі
-        all: Поўны доступ да акаўнта Mastodon
+        all: Поўны доступ да ўліковага запісу Mastodon
         blocks: Блакаванні
         bookmarks: Закладкі
         conversations: Размовы
@@ -148,16 +149,16 @@ be:
       application:
         title: Патрабуецца аўтарызацыя OAuth
     scopes:
-      admin:read: чытаць усе дадзеныя на серверы
-      admin:read:accounts: чытаць канфідэнцыйную інфармацыю ўсіх акаўнтаў
+      admin:read: чытаць усе даныя на серверы
+      admin:read:accounts: чытаць канфідэнцыяльную інфармацыю ўсіх уліковых запісаў
       admin:read:canonical_email_blocks: чытаць канфідэнцыйную інфармацыю ўсіх кананічных блокаў электроннай пошты
       admin:read:domain_allows: чытаць канфідэнцыйную інфармацыю ўсіх дазволеных даменаў
       admin:read:domain_blocks: чытаць канфідэнцыйную інфармацыю ўсіх блакіраваных даменаў
       admin:read:email_domain_blocks: чытаць канфідэнцыйную інфармацыю ўсіх блакіраваных даменаў эл. пошты
       admin:read:ip_blocks: чытаць канфідэнцыяльную інфармацыю ўсіх блакіраваных IP
-      admin:read:reports: чытаць канфідэнцыйную інфармацыю ўсіх справаздач і справаздачных уліковых запісаў
+      admin:read:reports: чытаць канфідэнцыяльную інфармацыю ўсіх скаргаў і абскарджаных уліковых запісаў
       admin:write: змяняць усе даныя на серверы
-      admin:write:accounts: выконваць дзеянні па мадэрацыі акаўнтаў
+      admin:write:accounts: выконваць дзеянні па мадэрацыі ўліковых запісаў
       admin:write:canonical_email_blocks: выконваць дзеянні па мадэрацыі кананічных блокаў электроннай пошты
       admin:write:domain_allows: дазваляе праводзіць мадэрацыю ў дамене
       admin:write:domain_blocks: мадэраваць блакіраваныя дамены
@@ -188,7 +189,7 @@ be:
       write:conversations: ігнараваць і выдаляць размовы
       write:favourites: упадабаныя допісы
       write:filters: ствараць фільтры
-      write:follows: Сачыць за людзьмі
+      write:follows: сачыць за людзьмі
       write:lists: ствараць спiсы
       write:media: запампоўваць медыяфайлы
       write:mutes: ігнараваць людзей і размовы
diff --git a/config/locales/doorkeeper.br.yml b/config/locales/doorkeeper.br.yml
index 119d8681f0a..e08bc948b47 100644
--- a/config/locales/doorkeeper.br.yml
+++ b/config/locales/doorkeeper.br.yml
@@ -98,22 +98,32 @@ br:
           notice: Skarzhet eo bet an arload.
     grouped_scopes:
       title:
+        accounts: Kontoù
+        admin/accounts: Merañ ar c'hontoù
+        admin/all: An holl berzhioù merañ
         blocks: Re stanket
         bookmarks: Sinedoù
+        conversations: Kaozeadennoù
+        crypto: Enrinegañ a-benn-da-benn
+        favourites: Embannadurioù muiañ-karet
         filters: Siloù
+        follows: Tud heuliet
         lists: Listennoù
         media: Restroù media stag
         mutes: Kuzhet
+        notifications: Kemennoù
         profile: Ho profil Mastodon
+        push: Kemennoù push
+        reports: Disklêriadennoù
         search: Klask
-        statuses: Toudoù
+        statuses: Embannadurioù
     layouts:
       admin:
         nav:
           applications: Arloadoù
           oauth2_provider: OAuth2 Pourvezer
       application:
-        title: OAuth aotre rekis
+        title: Aotre OAuth rekis
     scopes:
       admin:read: lenn holl titouroù ar servijer
       admin:read:accounts: lenn titouroù kizidik an holl kontoù
@@ -121,23 +131,26 @@ br:
       admin:write: kemmañ holl titouroù ar servijer
       admin:write:accounts: ober evezherezh war ar c'hontoù
       admin:write:reports: ober evezherezh war an danevelloù
+      crypto: implijout an enrinegañ a-benn-da-benn
       follow: kemmañ darempredoù ho kont
       push: resev ho kemennoù push
       read: lenn holl titouroù ho kont
-      read:accounts: gwelout titouroù ar c'hontoù
-      read:blocks: gwelout ar pezh a zo stanket ganeoc'h
-      read:bookmarks: gwelout ho sinedoù
-      read:filters: gwelout ho siloù
-      read:follows: gwelout ar pezh a zo heuliet ganeoc'h
-      read:lists: gwelout ho listennoù
-      read:mutes: gwelout traoù pe kontoù kuzhet ganeoc'h
+      read:accounts: gwelet titouroù ar c'hontoù
+      read:blocks: gwelet ar pezh a zo stanket ganeoc'h
+      read:bookmarks: gwelet ho sinedoù
+      read:favourites: gwelet hoc'h embannadurioù muiañ-karet
+      read:filters: gwelet ho siloù
+      read:follows: gwelet ar pezh a zo heuliet ganeoc'h
+      read:lists: gwelet ho listennoù
+      read:mutes: gwelet traoù pe kontoù kuzhet ganeoc'h
       read:notifications: gwellout ho kemennoù
-      read:reports: gwelout ho tanevelloù
-      read:statuses: gwelout an holl toudoù
+      read:reports: gwelet ho tanevelloù
+      read:statuses: gwelet an holl embannadurioù
       write: kemmañ holl titouroù ho kont
       write:accounts: kemmañ ho profil
-      write:blocks: berzañ kontoù ha domanioù
-      write:bookmarks: toudoù enrollet evel sinedoù
+      write:blocks: stankañ kontoù ha domanioù
+      write:bookmarks: enrollañ embannadurioù evel sinedoù
+      write:favourites: merkañ embannadurioù evel muiañ-karet
       write:filters: krouiñ siloù
       write:follows: heuliañ an dud
       write:lists: krouiñ listennoù
@@ -145,4 +158,4 @@ br:
       write:mutes: kuzhat tud ha kaozeadennoù
       write:notifications: skarzhañ ho kemennoù
       write:reports: danevellañ tud all
-      write:statuses: embann toudoù
+      write:statuses: embann
diff --git a/config/locales/doorkeeper.cs.yml b/config/locales/doorkeeper.cs.yml
index 1ee73c2cb95..b435624334f 100644
--- a/config/locales/doorkeeper.cs.yml
+++ b/config/locales/doorkeeper.cs.yml
@@ -29,7 +29,7 @@ cs:
       edit:
         title: Upravit aplikaci
       form:
-        error: A jéje! Zkontrolujte ve formuláři případné chyby
+        error: A jéje! Zkontrolujte formulář pro případné chyby
       help:
         native_redirect_uri: Pro místní testy použijte %{native_redirect_uri}
         redirect_uri: Jedno URI na každý řádek
diff --git a/config/locales/doorkeeper.da.yml b/config/locales/doorkeeper.da.yml
index 5be66d6c2a2..49917c8ebc5 100644
--- a/config/locales/doorkeeper.da.yml
+++ b/config/locales/doorkeeper.da.yml
@@ -130,11 +130,11 @@ da:
         crypto: Ende-til-ende kryptering
         favourites: Favoritter
         filters: Filtre
-        follow: Fulgte, skjjulte og blokerede kontoer
+        follow: Fulgte, skjulte og blokerede konti
         follows: Følger
         lists: Lister
         media: Medievedhæftninger
-        mutes: Skjulte kontoer
+        mutes: Skjulte
         notifications: Notifikationer
         profile: Din Mastodon-profil
         push: Push-notifikationer
@@ -177,7 +177,7 @@ da:
       read:filters: se dine filtre
       read:follows: se dine følger
       read:lists: se dine lister
-      read:mutes: se dine skjulte kontoer
+      read:mutes: se dine skjulte konti
       read:notifications: se dine notifikationer
       read:reports: se dine anmeldelser
       read:search: søg på dine vegne
diff --git a/config/locales/doorkeeper.eu.yml b/config/locales/doorkeeper.eu.yml
index 7b25004385c..0dd4fe4194e 100644
--- a/config/locales/doorkeeper.eu.yml
+++ b/config/locales/doorkeeper.eu.yml
@@ -83,6 +83,7 @@ eu:
         access_denied: Baliabidearen jabeak edo baimenaren zerbitzariak eskaera ukatu du.
         credential_flow_not_configured: Baliabidearen jabearen pasahitza kredentzialen fluxuak huts egin du Doorkeeper.configure.resource_owner_from_credentials konfiguratu gabe dagoelako.
         invalid_client: Bezeroaren autentifikazioak huts egin du bezero ezezaguna delako, ez delako bezero autentifikazioa txertatu, edo autentifikazio metodoa ez delako onartzen.
+        invalid_code_challenge_method: Kodearen erronka metodoa S256 izan behar da, arrunta ez da onartzen.
         invalid_grant: Emandako baimena baliogabea da, iraungi edo indargabetu da, ez dator bat baimen-eskaeran erabilitako birbideratze URI-arekin edo beste bezero batek sortu du.
         invalid_redirect_uri: Sartutako birbideratze URI-a baliogabea da.
         invalid_request:
diff --git a/config/locales/doorkeeper.fa.yml b/config/locales/doorkeeper.fa.yml
index e36694dbbbd..be748880d92 100644
--- a/config/locales/doorkeeper.fa.yml
+++ b/config/locales/doorkeeper.fa.yml
@@ -72,7 +72,7 @@ fa:
         revoke: آیا مطمئن هستید؟
       index:
         authorized_at: تایید شده در %{date}
-        description_html: اینها نرم‌افزار هایی هستند که می‌توانند به حساب کاربری شما با استفاده از رابط نرم‌افزاری دسترسی پیدا کنند. اگر نرم‌افزار های در اینجا هستند که نمی‌شناسید، یا نرم‌افزاری که رفتار مشکوک دارد، می‌توانید دسترسی اش را باطل کنید.
+        description_html: این‌ها برنامه‌هاییند که می‌توانند با استفاده از میانای برنامه‌نویسی به حسابتان دسترسی پیدا کنند. اگر برنامه‌ای هست که نمی‌شناسیدش یا رفتار بدی دارد می‌توانید دسترسیش را باطل کنید.
         last_used_at: آخرین استفاده در %{date}
         never_used: هرگز استفاده نشده
         scopes: اجازه‌ها
diff --git a/config/locales/doorkeeper.fi.yml b/config/locales/doorkeeper.fi.yml
index ddaff5b93ab..7b80882af01 100644
--- a/config/locales/doorkeeper.fi.yml
+++ b/config/locales/doorkeeper.fi.yml
@@ -56,7 +56,7 @@ fi:
     authorizations:
       buttons:
         authorize: Valtuuta
-        deny: Estä
+        deny: Epää
       error:
         title: Tapahtui virhe
       new:
diff --git a/config/locales/doorkeeper.ja.yml b/config/locales/doorkeeper.ja.yml
index d44451c7463..1f94b9ede83 100644
--- a/config/locales/doorkeeper.ja.yml
+++ b/config/locales/doorkeeper.ja.yml
@@ -60,7 +60,7 @@ ja:
       error:
         title: エラーが発生しました
       new:
-        prompt_html: "%{client_name} があなたのアカウントにアクセスするための許可を求めています。<strong>このリクエストを承認するのは、信頼できる相手であると認識している場合のみです。</strong>"
+        prompt_html: "%{client_name}があなたのアカウントにアクセスするための許可を求めています。<strong>このリクエストを承認するのは、信頼できる相手であると認識している場合のみです。</strong>"
         review_permissions: アクセス許可を確認
         title: 認証が必要です
       show:
diff --git a/config/locales/doorkeeper.kab.yml b/config/locales/doorkeeper.kab.yml
index c65bada409b..4bb70fa002f 100644
--- a/config/locales/doorkeeper.kab.yml
+++ b/config/locales/doorkeeper.kab.yml
@@ -121,6 +121,7 @@ kab:
       admin:
         nav:
           applications: Isnasen
+          oauth2_provider: Asaǧǧaw OAuth2
       application:
         title: Tlaq tsiregt n OAuth
     scopes:
diff --git a/config/locales/doorkeeper.nn.yml b/config/locales/doorkeeper.nn.yml
index 9b9ddba08d6..934bb870be7 100644
--- a/config/locales/doorkeeper.nn.yml
+++ b/config/locales/doorkeeper.nn.yml
@@ -131,7 +131,7 @@ nn:
         favourites: Favorittar
         filters: Filter
         follow: Dei du fylgjer, dempar og blokkerer
-        follows: Fylgjer
+        follows: Fylgje
         lists: Lister
         media: Mediavedlegg
         mutes: Dempingar
@@ -175,7 +175,7 @@ nn:
       read:bookmarks: sjå bokmerka dine
       read:favourites: sjå favorittane dine
       read:filters: sjå filtera dine
-      read:follows: sjå fylgjarane dine
+      read:follows: sjå kven du fylgjer
       read:lists: sjå listene dine
       read:mutes: sjå kven du har målbunde
       read:notifications: sjå varsla dine
diff --git a/config/locales/doorkeeper.ru.yml b/config/locales/doorkeeper.ru.yml
index 822aa334bd8..30fbfabaf6d 100644
--- a/config/locales/doorkeeper.ru.yml
+++ b/config/locales/doorkeeper.ru.yml
@@ -82,7 +82,7 @@ ru:
       messages:
         access_denied: Владелец ресурса или сервер авторизации ответил отказом на ваш запрос.
         credential_flow_not_configured: Процесс Resource Owner Password Credentials завершился неудачей, поскольку параметр конфигурации Doorkeeper.configure.resource_owner_from_credentials не был задан.
-        invalid_client: 'Не удалось аутентифицировать клиент по одной из следующих причин: неизвестный клиент; отсутствует аутентификация клиента; неподдерживаемый метод аутентификации.'
+        invalid_client: 'Не удалось аутентифицировать клиент по одной из следующих причин: неизвестный клиент, отсутствует аутентификация клиента, неподдерживаемый метод аутентификации.'
         invalid_code_challenge_method: Функция хеширования для механизма PKCE должна быть установлена в значение S256, метод PLAIN не поддерживается.
         invalid_grant: Предоставленное разрешение на авторизацию либо недействительно, либо истекло, либо отозвано, либо не соответствует использованному в запросе на авторизацию URI перенаправления, либо было выдано для другого клиента.
         invalid_redirect_uri: Предоставленный URI перенаправления недействителен.
@@ -97,7 +97,7 @@ ru:
           revoked: Токен доступа был отозван
           unknown: Токен доступа недействителен
         resource_owner_authenticator_not_configured: Поиск владельца ресурса завершился неудачей, поскольку параметр конфигурации Doorkeeper.configure.resource_owner_authenticator не был задан.
-        server_error: На сервере авторизации произошла непредвиденная ошибка, не позволившая ему выполнить запрос.
+        server_error: На сервере авторизации произошла непредвиденная ошибка, которая не позволила ему выполнить запрос.
         temporarily_unavailable: Сервер авторизации в данный момент не может выполнить запрос по причине временной перегрузки или технического обслуживания.
         unauthorized_client: Клиент не авторизован для выполнения этого запроса с использованием этого метода.
         unsupported_grant_type: Тип разрешения на авторизацию не поддерживается сервером авторизации.
@@ -167,23 +167,23 @@ ru:
       admin:write:reports: осуществлять модерацию применительно к жалобам
       crypto: использовать сквозное шифрование
       follow: вносить изменения в отношения с другими пользователями
-      profile: читать исключительно сведения о вашем профиле
+      profile: иметь доступ исключительно к данным профиля пользователя
       push: получать push-уведомления
-      read: читать данные вашей учётной записи
+      read: иметь доступ ко всем данным учётной записи
       read:accounts: иметь доступ к информации об учётных записях
-      read:blocks: иметь доступ к вашим блокировкам
-      read:bookmarks: иметь доступ к вашим закладкам
-      read:favourites: иметь доступ к списку постов, которые вы добавили в избранное
-      read:filters: иметь доступ к вашим фильтрам
-      read:follows: иметь доступ к вашим подпискам
-      read:lists: иметь доступ к вашим спискам
-      read:mutes: иметь доступ к списку пользователей, которых вы игнорируете
-      read:notifications: иметь доступ к вашим уведомлениям
-      read:reports: иметь доступ к вашим жалобам
+      read:blocks: иметь доступ к блокировкам
+      read:bookmarks: иметь доступ к закладкам
+      read:favourites: иметь доступ к списку избранных постов
+      read:filters: иметь доступ к фильтрам
+      read:follows: иметь доступ к подпискам
+      read:lists: иметь доступ к спискам
+      read:mutes: иметь доступ к списку игнорируемых пользователей
+      read:notifications: иметь доступ к уведомлениям
+      read:reports: иметь доступ к жалобам
       read:search: использовать поиск
       read:statuses: иметь доступ ко всем постам
-      write: вносить изменения во все данные вашей учётной записи
-      write:accounts: вносить изменения в ваш профиль
+      write: вносить изменения во все данные учётной записи
+      write:accounts: редактировать профиль
       write:blocks: блокировать учётные записи и домены
       write:bookmarks: добавлять посты в закладки
       write:conversations: игнорировать и удалять беседы
diff --git a/config/locales/el.yml b/config/locales/el.yml
index 0b1ee7b772b..f5a72625f72 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -114,7 +114,7 @@ el:
         other: Αυτός ο λογαριασμός έχει <strong>%{count}</strong> παραπτώματα.
       promote: Προαγωγή
       protocol: Πρωτόκολλο
-      public: Δημόσιο
+      public: Δημόσιος
       push_subscription_expires: Η εγγραφή PuSH λήγει
       redownload: Ανανέωση άβαταρ
       redownloaded_msg: Επιτυχής ανανέωση προφίλ του/της %{username} από την πηγή
@@ -190,6 +190,7 @@ el:
         create_relay: Δημιουργία Relay
         create_unavailable_domain: Δημιουργία Μη Διαθέσιμου Τομέα
         create_user_role: Δημιουργία Ρόλου
+        create_username_block: Δημιουργία Κανόνα Ονόματος Χρήστη
         demote_user: Υποβιβασμός Χρήστη
         destroy_announcement: Διαγραφή Ανακοίνωσης
         destroy_canonical_email_block: Διαγραφή Αποκλεισμού Email
@@ -203,6 +204,7 @@ el:
         destroy_status: Διαγραφή Ανάρτησης
         destroy_unavailable_domain: Διαγραφή Μη Διαθέσιμου Τομέα
         destroy_user_role: Καταστροφή Ρόλου
+        destroy_username_block: Διαγραφή Κανόνα Ονόματος Χρήστη
         disable_2fa_user: Απενεργοποίηση 2FA
         disable_custom_emoji: Απενεργοποίηση Προσαρμοσμένων Emoji
         disable_relay: Απενεργοποίηση Relay
@@ -218,7 +220,7 @@ el:
         reject_appeal: Απόρριψη Έφεσης
         reject_user: Απόρριψη Χρήστη
         remove_avatar_user: Αφαίρεση Άβαταρ
-        reopen_report: Ξανάνοιγμα Ανααφοράς
+        reopen_report: Ξανάνοιγμα Αναφοράς
         resend_user: Επαναποστολή του email επιβεβαίωσης
         reset_password_user: Επαναφορά Συνθηματικού
         resolve_report: Επίλυση Αναφοράς
@@ -237,9 +239,10 @@ el:
         update_report: Ενημέρωση Αναφοράς
         update_status: Ενημέρωση Ανάρτησης
         update_user_role: Ενημέρωση ρόλου
+        update_username_block: Ενημέρωση Κανόνα Ονόματος Χρήστη
       actions:
         approve_appeal_html: Ο/Η %{name} ενέκρινε την ένσταση της απόφασης των συντονιστών από %{target}
-        approve_user_html: ο/η %{name} ενέκρινε την εγγραφή του %{target}
+        approve_user_html: Ο/Η %{name} ενέκρινε την εγγραφή του χρήστη %{target}
         assigned_to_self_report_html: Ο/Η %{name} ανάθεσε την αναφορά %{target} στον εαυτό του/της
         change_email_user_html: Ο χρήστης %{name} άλλαξε τη διεύθυνση email του χρήστη %{target}
         change_role_user_html: Ο/Η %{name} άλλαξε ρόλο του/της %{target}
@@ -255,6 +258,7 @@ el:
         create_relay_html: Ο χρήστης %{name} δημιούργησε ένα relay %{target}
         create_unavailable_domain_html: Ο/Η %{name} σταμάτησε να τροφοδοτεί τον τομέα %{target}
         create_user_role_html: Ο/Η %{name} δημιούργησε ρόλο %{target}
+        create_username_block_html: "%{name} πρόσθεσε κανόνα για ονόματα χρηστών που περιέχουν %{target}"
         demote_user_html: Ο/Η %{name} υποβίβασε τον χρήστη %{target}
         destroy_announcement_html: Ο/Η %{name} διέγραψε την ανακοίνωση %{target}
         destroy_canonical_email_block_html: Ο χρήστης %{name} έκανε άρση αποκλεισμού email με το hash %{target}
@@ -268,6 +272,7 @@ el:
         destroy_status_html: Ο/Η %{name} αφαίρεσε την ανάρτηση του/της %{target}
         destroy_unavailable_domain_html: Ο/Η %{name} ξανάρχισε να τροφοδοτεί το domain %{target}
         destroy_user_role_html: Ο/Η %{name} διέγραψε τον ρόλο του %{target}
+        destroy_username_block_html: "%{name} αφαίρεσε κανόνα για ονόματα χρηστών που περιέχουν %{target}"
         disable_2fa_user_html: Ο/Η %{name} απενεργοποίησε την απαίτηση για ταυτοποίηση δύο παραγόντων για τον χρήστη %{target}
         disable_custom_emoji_html: Ο/Η %{name} απενεργοποίησε το emoji %{target}
         disable_relay_html: Ο χρήστης %{name} απενεργοποίησε το relay %{target}
@@ -281,8 +286,8 @@ el:
         promote_user_html: Ο/Η %{name} προβίβασε το χρήστη %{target}
         publish_terms_of_service_html: Ο χρήστης %{name} δημοσίευσε ενημερώσεις για τους όρους της υπηρεσίας
         reject_appeal_html: Ο/Η %{name} απέρριψε την ένσταση της απόφασης των συντονιστών από %{target}
-        reject_user_html: ο/η %{name} απέρριψε την εγγραφή από %{target}
-        remove_avatar_user_html: ο/η %{name} αφαίρεσε το άβαταρ του/της %{target}
+        reject_user_html: Ο/Η %{name} απέρριψε την εγγραφή του χρήστη %{target}
+        remove_avatar_user_html: Ο/Η %{name} αφαίρεσε το άβαταρ του/της %{target}
         reopen_report_html: Ο/Η %{name} ξανάνοιξε την αναφορά %{target}
         resend_user_html: Ο χρήστης %{name} έστειλε ξανά email επιβεβαίωσης για τον χρήστη %{target}
         reset_password_user_html: Ο/Η %{name} επανέφερε το συνθηματικό του χρήστη %{target}
@@ -302,6 +307,7 @@ el:
         update_report_html: Ο χρήστης %{name} ενημέρωσε την αναφορά %{target}
         update_status_html: Ο/Η %{name} ενημέρωσε την ανάρτηση του/της %{target}
         update_user_role_html: Ο/Η %{name} άλλαξε τον ρόλο %{target}
+        update_username_block_html: "%{name} ενημέρωσε κανόνα για ονόματα χρηστών που περιέχουν %{target}"
       deleted_account: διαγεγραμμένος λογαριασμός
       empty: Δεν βρέθηκαν αρχεία καταγραφής.
       filter_by_action: Φιλτράρισμα ανά ενέργεια
@@ -553,8 +559,8 @@ el:
       dashboard:
         instance_accounts_dimension: Λογαριασμοί με τους περισσότερους ακόλουθους
         instance_accounts_measure: αποθηκευμένοι λογαριασμοί
-        instance_followers_measure: οι ακόλουθοί μας εκεί
-        instance_follows_measure: οι ακόλουθοί τους εδώ
+        instance_followers_measure: οι ακόλουθοι μας εκεί
+        instance_follows_measure: οι ακόλουθοι τους εδώ
         instance_languages_dimension: Κορυφαίες γλώσσες
         instance_media_attachments_measure: αποθηκευμένα συνημμένα πολυμέσων
         instance_reports_measure: αναφορές γι' αυτές
@@ -578,6 +584,13 @@ el:
         all: Όλα
         limited: Περιορισμένα
         title: Συντονισμός
+      moderation_notes:
+        create: Προσθήκη Σημείωσης Συντονισμού
+        created_msg: Επιτυχής δημιουργία σημείωσης συντονισμού οντότητας!
+        description_html: Δες και άφησε σημειώσεις για άλλους συντονιστές και τον μελλοντικό εαυτό σου
+        destroyed_msg: Η σημείωση συντονισμού οντότητας διαγράφτηκε επιτυχώς!
+        placeholder: Πληροφορίες σχετικά μ' αυτή την οντότητα, ενέργειες που έχουν ληφθεί ή οτιδήποτε άλλο θα σε βοηθήσει να συντονίσεις αυτή την οντότητα στο μέλλον.
+        title: Σημειώσεις Συντονισμού
       private_comment: Ιδιωτικό σχόλιο
       public_comment: Δημόσιο σχόλιο
       purge: Εκκαθάριση
@@ -835,6 +848,10 @@ el:
         all: Για όλους
         disabled: Για κανέναν
         users: Προς συνδεδεμένους τοπικούς χρήστες
+      feed_access:
+        modes:
+          authenticated: Πιστοποιημένοι χρήστες μόνο
+          public: Όλοι
       registrations:
         moderation_recommandation: Παρακαλώ βεβαιώσου ότι έχεις μια επαρκής και ενεργή ομάδα συντονισμού πριν ανοίξεις τις εγγραφές για όλους!
         preamble: Έλεγξε ποιος μπορεί να δημιουργήσει ένα λογαριασμό στον διακομιστή σας.
@@ -885,7 +902,7 @@ el:
         title: Πολυμέσα
       metadata: Μεταδεδομένα
       no_history: Αυτή η ανάρτηση δεν έχει επεξεργαστεί
-      no_status_selected: Καμία δημοσίευση δεν άλλαξε αφού καμία δεν ήταν επιλεγμένη
+      no_status_selected: Καμία ανάρτηση δεν άλλαξε αφού καμία δεν ήταν επιλεγμένη
       open: Άνοιγμα ανάρτησης
       original_status: Αρχική ανάρτηση
       reblogs: Αναδημοσιεύσεις
@@ -905,7 +922,7 @@ el:
         none: Ο/Η %{name} έστειλε προειδοποίηση προς τον/την %{target}
         sensitive: Ο/Η %{name} επισήμανε τα πολυμέσα του λογαριασμού %{target} ως ευαίσθητα
         silence: Ο/Η %{name} περιόρισε τον λογαριασμό %{target}
-        suspend: ο/η %{name} ανέστειλε τον λογαριασμό %{target}
+        suspend: Ο/Η %{name} ανέστειλε τον λογαριασμό %{target}
       appeal_approved: Έγινε έφεση
       appeal_pending: Έφεση σε εκκρεμότητα
       appeal_rejected: Η έφεση απορρίφθηκε
@@ -1039,13 +1056,13 @@ el:
       rejected: Απορρίφθηκε
       statuses:
         allow: Να επιτρέπεται η ανάρτηση
-        allow_account: Να επιτρέπεται ο συγγραφέας
+        allow_account: Να επιτρέπεται ο συντάκτης
         confirm_allow: Σίγουρα θες να επιτρέψεις τις επιλεγμένες καταστάσεις;
         confirm_allow_account: Σίγουρα θες να επιτρέψεις τους επιλεγμένους λογαριασμούς;
         confirm_disallow: Σίγουρα θες να απορρίψεις τις επιλεγμένες καταστάσεις;
         confirm_disallow_account: Σίγουρα θες να απορρίψεις τους επιλεγμένους λογαριασμούς;
         description_html: Αυτές είναι αναρτήσεις για τις οποίες ο διακομιστής σας γνωρίζει ότι κοινοποιούνται και αρέσουν πολύ αυτή τη περίοδο. Μπορεί να βοηθήσει νέους και χρήστες που επιστρέφουν, να βρουν περισσότερα άτομα να ακολουθήσουν. Καμία ανάρτηση δεν εμφανίζεται δημόσια μέχρι να εγκρίνεις τον συντάκτη και ο συντάκτης να επιτρέπει ο λογαριασμός του να προτείνεται και σε άλλους. Μπορείς επίσης να επιτρέψεις ή να απορρίψεις μεμονωμένες δημοσιεύσεις.
-        disallow: Να μην επιτρέπεται η δημοσίευση
+        disallow: Να μην επιτρέπεται η ανάρτηση
         disallow_account: Να μην επιτρέπεται ο συντάκτης
         no_status_selected: Καμία δημοφιλής ανάρτηση δεν άλλαξε αφού καμία δεν επιλέχθηκε
         not_discoverable: Ο συντάκτης δεν έχει επιλέξει να είναι ανακαλύψιμος
@@ -1078,6 +1095,25 @@ el:
           other: Χρησιμοποιήθηκε από %{count} άτομα την τελευταία εβδομάδα
       title: Προτάσεις και τάσεις
       trending: Τάσεις
+    username_blocks:
+      add_new: Προσθήκη νέου
+      block_registrations: Φραγή εγγραφών
+      comparison:
+        contains: Περιέχει
+        equals: Ισούται
+      contains_html: Περιέχει %{string}
+      created_msg: Ο κανόνας ονόματος χρήστη δημιουργήθηκε με επιτυχία
+      delete: Διαγραφή
+      edit:
+        title: Επεξεργασία κανόνα ονόματος χρήστη
+      matches_exactly_html: Ισούται με %{string}
+      new:
+        create: Δημιουργία κανόνα
+        title: Δημιουργία νέου κανόνα ονόματος χρήστη
+      no_username_block_selected: Δεν άλλαξαν οι κανόνες ονόματος χρήστη καθώς κανένας δεν επιλέχθηκε
+      not_permitted: Δεν επιτρέπεται
+      title: Κανόνες ονόματος χρήστη
+      updated_msg: Ο κανόνας ονόματος χρήστη ενημερώθηκε με επιτυχία
     warning_presets:
       add_new: Πρόσθεση νέου
       delete: Διαγραφή
@@ -1087,7 +1123,7 @@ el:
     webhooks:
       add_new: Προσθήκη σημείου τερματισμού
       delete: Διαγραφή
-      description_html: Ένα <strong>webhook</strong> επιτρέπει στο Mastodon να στείλει <strong>ειδοποιήσεις πραγματικού χρόνου</strong> σχετικά με επιλεγμένα γεγονότα στη δική σου εφαρμογή, ώστε η εφαρμογή σας να μπορεί <strong>να προκαλέσει αντιδράσεις αυτόματα</strong>.
+      description_html: Ένα <strong>webhook</strong> επιτρέπει στο Mastodon να στείλει <strong>ειδοποιήσεις πραγματικού χρόνου</strong> σχετικά με επιλεγμένα γεγονότα στη δική σου εφαρμογή, ώστε η εφαρμογή σου να μπορεί <strong>να προκαλέσει αντιδράσεις αυτόματα</strong>.
       disable: Απενεργοποίηση
       disabled: Απενεργοποιημένα
       edit: Επεξεργασία σημείου τερματισμού
@@ -1151,7 +1187,7 @@ el:
     remove: Αποσύνδεση ψευδώνυμου
   appearance:
     advanced_web_interface: Προηγμένη διεπαφή ιστού
-    advanced_web_interface_hint: 'Αν θέλεις να χρησιμοποιήσεις ολόκληρο το πλάτος της οθόνης σου, η προηγμένη λειτουργία χρήσης σου επιτρέπει να ορίσεις πολλαπλές στύλες ώστε να βλέπεις ταυτόχρονα όση πληροφορία θέλεις: Την αρχική ροή, τις ειδοποιήσεις, την ροή συναλλαγών και όσες λίστες και ετικέτες θέλεις.'
+    advanced_web_interface_hint: 'Αν θέλεις να χρησιμοποιήσεις ολόκληρο το πλάτος της οθόνης σου, η προηγμένη λειτουργία χρήσης σου επιτρέπει να ορίσεις πολλαπλές στήλες ώστε να βλέπεις ταυτόχρονα όση πληροφορία θέλεις: Την αρχική ροή, τις ειδοποιήσεις, τις ομοσπονδιακές ροές και όσες λίστες και ετικέτες θέλεις.'
     animations_and_accessibility: Εφέ κινήσεων και προσβασιμότητα
     confirmation_dialogs: Ερωτήσεις επιβεβαίωσης
     discovery: Ανακάλυψη
@@ -1264,7 +1300,7 @@ el:
     more_from_html: Περισσότερα από %{name}
     s_blog: Ιστολόγιο του/της %{name}
     then_instructions: Στη συνέχεια, πρόσθεσε το όνομα τομέα της δημοσίευσης στο παρακάτω πεδίο.
-    title: Αναφορά συγγραφέα
+    title: Αναφορά συντάκτη
   challenge:
     confirm: Συνέχεια
     hint_html: "<strong>Συμβουλή:</strong> Δεν θα σου ζητήσουμε τον κωδικό ασφαλείας σου ξανά για την επόμενη ώρα."
@@ -1342,6 +1378,10 @@ el:
     basic_information: Βασικές πληροφορίες
     hint_html: "<strong>Τροποποίησε τί βλέπουν άτομα στο δημόσιο προφίλ σου και δίπλα στις αναρτήσεις σου.</strong> Είναι πιο πιθανό κάποιος να σε ακολουθήσει πίσω και να αλληλεπιδράσουν μαζί σου αν έχεις ολοκληρωμένο προφίλ και εικόνα προφίλ."
     other: Άλλο
+  emoji_styles:
+    auto: Αυτόματο
+    native: Εγγενές
+    twemoji: Twemoji
   errors:
     '400': Το αίτημα ήταν άκυρο ή με λάθος μορφή.
     '403': Δεν έχεις δικαίωμα πρόσβασης σε αυτή τη σελίδα.
@@ -1551,6 +1591,13 @@ el:
       expires_at: Λήγει
       uses: Χρήσεις
     title: Προσκάλεσε κόσμο
+  link_preview:
+    author_html: Από %{name}
+    potentially_sensitive_content:
+      action: Κάνε κλικ για εμφάνιση
+      confirm_visit: Σίγουρα θες να ανοίξεις αυτόν τον σύνδεσμο;
+      hide_button: Απόκρυψη
+      label: Δυνητικά ευαίσθητο περιεχόμενο
   lists:
     errors:
       limit: Έχεις φτάσει το μέγιστο αριθμό λιστών
@@ -1651,6 +1698,10 @@ el:
       title: Νέα επισήμανση
     poll:
       subject: Μια δημοσκόπηση του %{name} έληξε
+    quote:
+      body: 'Η ανάρτησή σου παρατέθηκε από %{name}:'
+      subject: Ο/Η %{name} έκανε παράθεση της ανάρτησής σου
+      title: Νέα παράθεση
     reblog:
       body: 'Η ανάρτησή σου ενισχύθηκε από τον/την %{name}:'
       subject: Ο/Η %{name} ενίσχυσε την ανάρτηση σου
@@ -1675,7 +1726,7 @@ el:
           trillion: Τρις
   otp_authentication:
     code_hint: Για να συνεχίσεις, γράψε τον κωδικό που δημιούργησε η εφαρμογή πιστοποίησης
-    description_html: Αν ενεργοποιήσεις την <strong>ταυτοποίηση δύο παραγόντων</strong> χρησιμοποιώντας εφαρμογή ταυτοποίησης, για να συνδεθείς θα πρέπει να έχεις το τηλέφωνό σου, που θα σού δημιουργήσει κλειδιά εισόδου.
+    description_html: Αν ενεργοποιήσεις την <strong>ταυτοποίηση δύο παραγόντων</strong> χρησιμοποιώντας εφαρμογή ταυτοποίησης, για να συνδεθείς θα πρέπει να έχεις το τηλέφωνό σου, που θα σου δημιουργήσει κλειδιά εισόδου για να τα εισάγεις.
     enable: Ενεργοποίηση
     instructions_html: "<strong>Σάρωσε αυτόν τον κωδικό QR με την εφαρμογή Google Authenticator ή κάποια άλλη αντίστοιχη στο τηλέφωνό σου</strong>. Από εδώ και στο εξής, η εφαρμογή θα δημιουργεί κλειδιά που θα πρέπει να εισάγεις όταν συνδέεσαι."
     manual_instructions: 'Αν δεν μπορείς να σαρώσεις τον κωδικό QR και χρειάζεσαι να τον εισάγεις χειροκίνητα, ορίστε η μυστική φράση σε μορφή κειμένου:'
@@ -1699,6 +1750,9 @@ el:
       self_vote: Δεν μπορείς να ψηφίσεις στις δικές σου δημοσκοπήσεις
       too_few_options: πρέπει να έχει περισσότερες από μια επιλογές
       too_many_options: δεν μπορεί να έχει περισσότερες από %{max} επιλογές
+    vote: Ψήφισε
+  posting_defaults:
+    explanation: Αυτές οι ρυθμίσεις θα χρησιμοποιηθούν ως προεπιλογές όταν δημιουργείτε νέες αναρτήσεις, αλλά μπορείτε να τις επεξεργαστείτε ανά ανάρτηση εντός του συνθέτη.
   preferences:
     other: Άλλες
     posting_defaults: Προεπιλογές ανάρτησης
@@ -1854,6 +1908,9 @@ el:
         other: "%{count} βίντεο"
     boosted_from_html: Ενισχύθηκε από %{acct_link}
     content_warning: 'Προειδοποίηση περιεχομένου: %{warning}'
+    content_warnings:
+      hide: Απόκρυψη ανάρτησης
+      show: Εμφάνιση περισσότερων
     default_language: Ίδια με γλώσσα διεπαφής
     disallowed_hashtags:
       one: 'περιέχει μη επιτρεπτή ετικέτα: %{tags}'
@@ -1861,6 +1918,7 @@ el:
     edited_at_html: Επεξεργάστηκε στις %{date}
     errors:
       in_reply_not_found: Η ανάρτηση στην οποία προσπαθείς να απαντήσεις δεν φαίνεται να υπάρχει.
+      quoted_status_not_found: Η ανάρτηση την οποία προσπαθείς να παραθέσεις δεν φαίνεται να υπάρχει.
     over_character_limit: υπέρβαση μέγιστου ορίου %{max} χαρακτήρων
     pin_errors:
       direct: Αναρτήσεις που είναι ορατές μόνο στους αναφερόμενους χρήστες δεν μπορούν να καρφιτσωθούν
@@ -1868,18 +1926,17 @@ el:
       ownership: Δεν μπορείς να καρφιτσώσεις ανάρτηση κάποιου άλλου
       reblog: Οι ενισχύσεις δεν καρφιτσώνονται
     quote_policies:
-      followers: Ακόλουθοι και αναφερόμενοι χρήστες
-      nobody: Μόνο αναφερόμενοι χρήστες
+      followers: Μόνο ακόλουθοι
+      nobody: Μόνο εγώ
       public: Όλοι
     title: '%{name}: "%{quote}"'
     visibilities:
-      direct: Άμεση
+      direct: Ιδιωτική επισήμανση
       private: Μόνο ακόλουθοι
-      private_long: Εμφάνιση μόνο σε ακόλουθους
-      public: Δημόσιο
-      public_long: Βλέπει ο οποιοσδήποτε
-      unlisted: Μη καταχωρημένο
-      unlisted_long: Βλέπει ο οποιοσδήποτε, αλλά δεν καταχωρείται στις δημόσιες ροές
+      public: Δημόσια
+      public_long: Όλοι εντός και εκτός του Mastodon
+      unlisted: Ήσυχα δημόσια
+      unlisted_long: Κρυμμένη από τα αποτελέσματα αναζήτησης Mastodon, τις τάσεις και τις δημόσιες ροές
   statuses_cleanup:
     enabled: Αυτόματη διαγραφή παλιών αναρτήσεων
     enabled_hint: Διαγράφει αυτόματα τις αναρτήσεις σου μόλις φτάσουν σε ένα καθορισμένο όριο ηλικίας, εκτός αν ταιριάζουν με μία από τις παρακάτω εξαιρέσεις
@@ -2012,7 +2069,7 @@ el:
         delete_statuses: Μερικές από τις αναρτήσεις σου έχουν βρεθεί να παραβιάζουν μία ή περισσότερες οδηγίες κοινότητας και έχουν συνεπώς αφαιρεθεί από τους συντονιστές του %{instance}.
         disable: Δεν μπορείς πλέον να χρησιμοποιήσεις τον λογαριασμό σου, αλλά το προφίλ σου και άλλα δεδομένα παραμένουν άθικτα. Μπορείς να ζητήσεις ένα αντίγραφο ασφαλείας των δεδομένων σου, να αλλάξεις τις ρυθμίσεις του λογαριασμού σου ή να διαγράψεις τον λογαριασμό σου.
         mark_statuses_as_sensitive: Μερικές από τις αναρτήσεις σου έχουν επισημανθεί ως ευαίσθητες από τους συντονιστές του %{instance}. Αυτό σημαίνει ότι οι άνθρωποι θα πρέπει να πατήσουν τα πολυμέσα στις αναρτήσεις πριν εμφανιστεί μια προεπισκόπηση. Μπορείς να επισημάνεις τα πολυμέσα ως ευαίσθητα όταν δημοσιεύεις στο μέλλον.
-        sensitive: Από δω και στο εξής, όλα τα μεταφορτωμένα αρχεία πολυμέσων σου θα επισημανθούν ως ευαίσθητα και κρυμμένα πίσω από μια προειδοποίηση -πατήστε για εμφάνιση.
+        sensitive: Από δω και στο εξής, όλα τα μεταφορτωμένα αρχεία πολυμέσων σου θα επισημανθούν ως ευαίσθητα και κρυμμένα πίσω από μια προειδοποίηση που πρέπει να πατηθεί.
         silence: Μπορείς ακόμα να χρησιμοποιείς τον λογαριασμό σου, αλλά μόνο άτομα που σε ακολουθούν ήδη θα δουν τις αναρτήσεις σου σε αυτόν τον διακομιστή και μπορεί να αποκλειστείς από διάφορες δυνατότητες ανακάλυψης. Ωστόσο, οι άλλοι μπορούν ακόμα να σε ακολουθήσουν με μη αυτόματο τρόπο.
         suspend: Δε μπορείς πλέον να χρησιμοποιήσεις τον λογαριασμό σου και το προφίλ σου και άλλα δεδομένα δεν είναι πλέον προσβάσιμα. Μπορείς ακόμα να συνδεθείς για να αιτηθείς αντίγραφο των δεδομένων σου μέχρι να αφαιρεθούν πλήρως σε περίπου 30 μέρες αλλά, θα διατηρήσουμε κάποια βασικά δεδομένα για να σε αποτρέψουμε να παρακάμψεις την αναστολή.
       reason: 'Αιτιολογία:'
@@ -2045,7 +2102,7 @@ el:
       edit_profile_title: Εξατομίκευση του προφίλ σου
       explanation: Μερικές συμβουλές για να ξεκινήσεις
       feature_action: Μάθε περισσότερα
-      feature_audience: Το Mastodon σού παρέχει μια μοναδική δυνατότητα διαχείρισης του κοινού σου χωρίς μεσάζοντες. Το Mastodon όταν αναπτύσσεται στη δική σου υποδομή σού επιτρέπει να ακολουθείς και να ακολουθείσαι από οποιονδήποτε άλλο συνδεδεμένο διακομιστή Mastodon και κανείς δεν τον ελέγχει, εκτός από σένα.
+      feature_audience: Το Mastodon σου παρέχει μια μοναδική δυνατότητα διαχείρισης του κοινού σου χωρίς μεσάζοντες. Το Mastodon όταν αναπτύσσεται στη δική σου υποδομή σου επιτρέπει να ακολουθείς και να ακολουθείσαι από οποιονδήποτε άλλο συνδεδεμένο διακομιστή Mastodon και κανείς δεν τον ελέγχει, εκτός από σένα.
       feature_audience_title: Χτίσε το κοινό σου με σιγουριά
       feature_control: Εσύ ξέρεις καλύτερα τι θες να βλέπεις στην αρχική σου ροή. Δεν υπάρχουν αλγόριθμοι ή διαφημίσεις για να σπαταλάς το χρόνο σου. Ακολούθησε οποιονδήποτε σε οποιονδήποτε διακομιστή Mastodon από έναν λογαριασμό και δες τις αναρτήσεις τους με χρονολογική σειρά και κάνε τη δική σου γωνιά του ίντερνετ, λίγο πιο προσωπική.
       feature_control_title: Διατήρησε τον έλεγχο της ροής σου
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index f44404502e2..621a3a4e4fd 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -309,6 +309,7 @@ en-GB:
       title: Audit log
       unavailable_instance: "(domain name unavailable)"
     announcements:
+      back: Back to announcements
       destroyed_msg: Announcement successfully deleted!
       edit:
         title: Edit announcement
@@ -317,6 +318,10 @@ en-GB:
       new:
         create: Create announcement
         title: New announcement
+      preview:
+        disclaimer: As users cannot opt out of them, email notifications should be limited to important announcements such as personal data breach or server closure notifications.
+        explanation_html: 'The email will be sent to <strong>%{display_count} users</strong>. The following text will be included in the e-mail:'
+        title: Preview announcement notification
       publish: Publish
       published_msg: Announcement successfully published!
       scheduled_for: Scheduled for %{time}
@@ -475,6 +480,36 @@ en-GB:
       new:
         title: Import domain blocks
       no_file: No file selected
+    fasp:
+      debug:
+        callbacks:
+          created_at: Created at
+          delete: Delete
+          ip: IP address
+          request_body: Request body
+          title: Debug Callbacks
+      providers:
+        active: Active
+        base_url: Base URL
+        callback: Callback
+        delete: Delete
+        edit: Edit Provider
+        finish_registration: Finish registration
+        name: Name
+        providers: Providers
+        public_key_fingerprint: Public key fingerprint
+        registration_requested: Registration requested
+        registrations:
+          confirm: Confirm
+          description: You received a registration from a FASP. Reject it if you did not initiate this. If you initiated this, carefully compare name and key fingerprint before confirming the registration.
+          reject: Reject
+          title: Confirm FASP Registration
+        save: Save
+        select_capabilities: Select Capabilities
+        sign_in: Sign In
+        status: Status
+        title: Fediverse Auxiliary Service Providers
+      title: FASP
     follow_recommendations:
       description_html: "<strong>Follow recommendations help new users quickly find interesting content</strong>. When a user has not interacted with others enough to form personalised follow recommendations, these accounts are recommended instead. They are re-calculated on a daily basis from a mix of accounts with the highest recent engagements and highest local follower counts for a given language."
       language: For language
@@ -543,6 +578,13 @@ en-GB:
         all: All
         limited: Limited
         title: Moderation
+      moderation_notes:
+        create: Add Moderation Note
+        created_msg: Instance moderation note successfully created!
+        description_html: View and leave notes for other moderators and your future self
+        destroyed_msg: Instance moderation note successfully deleted!
+        placeholder: Information about this instance, actions taken, or anything else that will help you moderate this instance in the future.
+        title: Moderation Notes
       private_comment: Private comment
       public_comment: Public comment
       purge: Purge
@@ -751,17 +793,26 @@ en-GB:
       title: Roles
     rules:
       add_new: Add rule
+      add_translation: Add translation
       delete: Delete
       description_html: While most claim to have read and agree to the terms of service, usually people do not read through until after a problem arises. <strong>Make it easier to see your server's rules at a glance by providing them in a flat bullet point list.</strong> Try to keep individual rules short and simple, but try not to split them up into many separate items either.
       edit: Edit rule
       empty: No server rules have been defined yet.
+      move_down: Move down
+      move_up: Move up
       title: Server rules
+      translation: Translation
+      translations: Translations
+      translations_explanation: You can optionally add translations for the rules. The default value will be shown if no translated version is available. Please always ensure any provided translation is in sync with the default value.
     settings:
       about:
         manage_rules: Manage server rules
         preamble: Provide in-depth information about how the server is operated, moderated, funded.
         rules_hint: There is a dedicated area for rules that your users are expected to adhere to.
         title: About
+      allow_referrer_origin:
+        desc: When your users click links to external sites, their browser may send the address of your Mastodon server as the referrer. Disable this if this would uniquely identify your users, e.g. if this is a personal Mastodon server.
+        title: Allow external sites to see your Mastodon server as a traffic source
       appearance:
         preamble: Customise Mastodon's web interface.
         title: Appearance
@@ -781,6 +832,7 @@ en-GB:
       discovery:
         follow_recommendations: Follow recommendations
         preamble: Surfacing interesting content is instrumental in onboarding new users who may not know anyone Mastodon. Control how various discovery features work on your server.
+        privacy: Privacy
         profile_directory: Profile directory
         public_timelines: Public timelines
         publish_statistics: Publish statistics
@@ -867,6 +919,8 @@ en-GB:
     system_checks:
       database_schema_check:
         message_html: There are pending database migrations. Please run them to ensure the application behaves as expected
+      elasticsearch_analysis_index_mismatch:
+        message_html: Elasticsearch index analyser settings are outdated. Please run <code>tootctl search deploy --only-mapping --only=%{value}</code>
       elasticsearch_health_red:
         message_html: Elasticsearch cluster is unhealthy (red status), search features are unavailable
       elasticsearch_health_yellow:
@@ -938,6 +992,7 @@ en-GB:
         chance_to_review_html: "<strong>The generated terms of service will not be published automatically.</strong> You will have a chance to review the results. Please fill in the necessary details to proceed."
         explanation_html: The terms of service template provided is for informational purposes only, and should not be construed as legal advice on any subject matter. Please consult with your own legal counsel on your situation and specific legal questions you have.
         title: Terms of Service Setup
+      going_live_on_html: Live, effective %{date}
       history: History
       live: Live
       no_history: There are no recorded changes of the terms of service yet.
@@ -1294,6 +1349,10 @@ 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
+  emoji_styles:
+    auto: Auto
+    native: Native
+    twemoji: Twemoji
   errors:
     '400': The request you submitted was invalid or malformed.
     '403': You don't have permission to view this page.
@@ -1821,13 +1880,7 @@ en-GB:
       reblog: A boost cannot be pinned
     title: '%{name}: "%{quote}"'
     visibilities:
-      direct: Direct
-      private: Followers-only
-      private_long: Only show to followers
       public: Public
-      public_long: Everyone can see
-      unlisted: Unlisted
-      unlisted_long: Everyone can see, but not listed on public timelines
   statuses_cleanup:
     enabled: Automatically delete old posts
     enabled_hint: Automatically deletes your posts once they reach a specified age threshold, unless they match one of the exceptions below
@@ -1872,6 +1925,11 @@ en-GB:
     does_not_match_previous_name: does not match the previous name
   terms_of_service:
     title: Terms of Service
+  terms_of_service_interstitial:
+    future_preamble_html: We're making some changes to our terms of service, which will be effective on <strong>%{date}</strong>. We encourage you to review the updated terms.
+    past_preamble_html: We have changed our terms of service since your last visit. We encourage you to review the updated terms.
+    review_link: Review terms of service
+    title: The terms of service of %{domain} are changing
   themes:
     contrast: Mastodon (High contrast)
     default: Mastodon (Dark)
@@ -1903,6 +1961,10 @@ en-GB:
     recovery_instructions_html: If you ever lose access to your phone, you can use one of the recovery codes below to regain access to your account. <strong>Keep the recovery codes safe</strong>. For example, you may print them and store them with other important documents.
     webauthn: Security keys
   user_mailer:
+    announcement_published:
+      description: 'The administrators of %{domain} are making an announcement:'
+      subject: Service announcement
+      title: "%{domain} service announcement"
     appeal_approved:
       action: Account Settings
       explanation: The appeal of the strike against your account on %{strike_date} that you submitted on %{appeal_date} has been approved. Your account is once again in good standing.
@@ -1935,6 +1997,8 @@ en-GB:
     terms_of_service_changed:
       agreement: By continuing to use %{domain}, you are agreeing to these terms. If you disagree with the updated terms, you may terminate your agreement with %{domain} at any time by deleting your account.
       changelog: 'At a glance, here is what this update means for you:'
+      description: 'You are receiving this e-mail because we''re making some changes to our terms of service at %{domain}. These updates will take effect on %{date}. We encourage you to review the updated terms in full here:'
+      description_html: You are receiving this e-mail because we're making some changes to our terms of service at %{domain}. These updates will take effect on <strong>%{date}</strong>. We encourage you to review the <a href="%{path}" target="_blank">updated terms in full here</a>.
       sign_off: The %{domain} team
       subject: Updates to our terms of service
       subtitle: The terms of service of %{domain} are changing
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 6633ffa4a95..e6604e9284a 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -190,6 +190,7 @@ en:
         create_relay: Create Relay
         create_unavailable_domain: Create Unavailable Domain
         create_user_role: Create Role
+        create_username_block: Create Username Rule
         demote_user: Demote User
         destroy_announcement: Delete Announcement
         destroy_canonical_email_block: Delete Email Block
@@ -203,6 +204,7 @@ en:
         destroy_status: Delete Post
         destroy_unavailable_domain: Delete Unavailable Domain
         destroy_user_role: Destroy Role
+        destroy_username_block: Delete Username Rule
         disable_2fa_user: Disable 2FA
         disable_custom_emoji: Disable Custom Emoji
         disable_relay: Disable Relay
@@ -237,6 +239,7 @@ en:
         update_report: Update Report
         update_status: Update Post
         update_user_role: Update Role
+        update_username_block: Update Username Rule
       actions:
         approve_appeal_html: "%{name} approved moderation decision appeal from %{target}"
         approve_user_html: "%{name} approved sign-up from %{target}"
@@ -255,6 +258,7 @@ en:
         create_relay_html: "%{name} created a relay %{target}"
         create_unavailable_domain_html: "%{name} stopped delivery to domain %{target}"
         create_user_role_html: "%{name} created %{target} role"
+        create_username_block_html: "%{name} added rule for usernames containing %{target}"
         demote_user_html: "%{name} demoted user %{target}"
         destroy_announcement_html: "%{name} deleted announcement %{target}"
         destroy_canonical_email_block_html: "%{name} unblocked email with the hash %{target}"
@@ -268,6 +272,7 @@ en:
         destroy_status_html: "%{name} removed post by %{target}"
         destroy_unavailable_domain_html: "%{name} resumed delivery to domain %{target}"
         destroy_user_role_html: "%{name} deleted %{target} role"
+        destroy_username_block_html: "%{name} removed rule for usernames containing %{target}"
         disable_2fa_user_html: "%{name} disabled two factor requirement for user %{target}"
         disable_custom_emoji_html: "%{name} disabled emoji %{target}"
         disable_relay_html: "%{name} disabled the relay %{target}"
@@ -302,6 +307,7 @@ en:
         update_report_html: "%{name} updated report %{target}"
         update_status_html: "%{name} updated post by %{target}"
         update_user_role_html: "%{name} changed %{target} role"
+        update_username_block_html: "%{name} updated rule for usernames containing %{target}"
       deleted_account: deleted account
       empty: No logs found.
       filter_by_action: Filter by action
@@ -842,6 +848,10 @@ en:
         all: To everyone
         disabled: To no one
         users: To logged-in local users
+      feed_access:
+        modes:
+          authenticated: Authenticated users only
+          public: Everyone
       registrations:
         moderation_recommandation: Please make sure you have an adequate and reactive moderation team before you open registrations to everyone!
         preamble: Control who can create an account on your server.
@@ -1085,6 +1095,25 @@ en:
           other: Used by %{count} people over the last week
       title: Recommendations & Trends
       trending: Trending
+    username_blocks:
+      add_new: Add new
+      block_registrations: Block registrations
+      comparison:
+        contains: Contains
+        equals: Equals
+      contains_html: Contains %{string}
+      created_msg: Successfully created username rule
+      delete: Delete
+      edit:
+        title: Edit username rule
+      matches_exactly_html: Equals %{string}
+      new:
+        create: Create rule
+        title: Create new username rule
+      no_username_block_selected: No username rules were changed as none were selected
+      not_permitted: Not permitted
+      title: Username rules
+      updated_msg: Successfully updated username rule
     warning_presets:
       add_new: Add new
       delete: Delete
@@ -1349,6 +1378,10 @@ 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
+  emoji_styles:
+    auto: Auto
+    native: Native
+    twemoji: Twemoji
   errors:
     '400': The request you submitted was invalid or malformed.
     '403': You don't have permission to view this page.
@@ -1558,6 +1591,13 @@ en:
       expires_at: Expires
       uses: Uses
     title: Invite people
+  link_preview:
+    author_html: By %{name}
+    potentially_sensitive_content:
+      action: Click to show
+      confirm_visit: Are you sure you wish to open this link?
+      hide_button: Hide
+      label: Potentially sensitive content
   lists:
     errors:
       limit: You have reached the maximum number of lists
@@ -1658,6 +1698,10 @@ en:
       title: New mention
     poll:
       subject: A poll by %{name} has ended
+    quote:
+      body: 'Your post was quoted by %{name}:'
+      subject: "%{name} quoted your post"
+      title: New quote
     reblog:
       body: 'Your post was boosted by %{name}:'
       subject: "%{name} boosted your post"
@@ -1707,6 +1751,9 @@ en:
       self_vote: You cannot vote in your own polls
       too_few_options: must have more than one item
       too_many_options: can't contain more than %{max} items
+    vote: Vote
+  posting_defaults:
+    explanation: These settings will be used as defaults when you create new posts, but you can edit them per post within the composer.
   preferences:
     other: Other
     posting_defaults: Posting defaults
@@ -1862,6 +1909,9 @@ en:
         other: "%{count} videos"
     boosted_from_html: Boosted from %{acct_link}
     content_warning: 'Content warning: %{warning}'
+    content_warnings:
+      hide: Hide post
+      show: Show more
     default_language: Same as interface language
     disallowed_hashtags:
       one: 'contained a disallowed hashtag: %{tags}'
@@ -1869,6 +1919,7 @@ en:
     edited_at_html: Edited %{date}
     errors:
       in_reply_not_found: The post you are trying to reply to does not appear to exist.
+      quoted_status_not_found: The post you are trying to quote does not appear to exist.
     over_character_limit: character limit of %{max} exceeded
     pin_errors:
       direct: Posts that are only visible to mentioned users cannot be pinned
@@ -1876,18 +1927,17 @@ en:
       ownership: Someone else's post cannot be pinned
       reblog: A boost cannot be pinned
     quote_policies:
-      followers: Followers and mentioned users
-      nobody: Only mentioned users
-      public: Everyone
+      followers: Followers only
+      nobody: Just me
+      public: Anyone
     title: '%{name}: "%{quote}"'
     visibilities:
-      direct: Direct
-      private: Followers-only
-      private_long: Only show to followers
+      direct: Private mention
+      private: Followers only
       public: Public
-      public_long: Everyone can see
-      unlisted: Unlisted
-      unlisted_long: Everyone can see, but not listed on public timelines
+      public_long: Anyone on and off Mastodon
+      unlisted: Quiet public
+      unlisted_long: Hidden from Mastodon search results, trending, and public timelines
   statuses_cleanup:
     enabled: Automatically delete old posts
     enabled_hint: Automatically deletes your posts once they reach a specified age threshold, unless they match one of the exceptions below
diff --git a/config/locales/eo.yml b/config/locales/eo.yml
index 69c6c361bf2..812053fa390 100644
--- a/config/locales/eo.yml
+++ b/config/locales/eo.yml
@@ -190,6 +190,7 @@ eo:
         create_relay: Krei Relajson
         create_unavailable_domain: Krei Nehaveblan Domajnon
         create_user_role: Krei Rolon
+        create_username_block: Krei uzantnoman regulon
         demote_user: Malpromocii Uzanton
         destroy_announcement: Forigi Anoncon
         destroy_canonical_email_block: Forigi retpoŝtan blokon
@@ -203,6 +204,7 @@ eo:
         destroy_status: Forigi Afiŝon
         destroy_unavailable_domain: Forigi Nehaveblan Domajnon
         destroy_user_role: Detrui Rolon
+        destroy_username_block: Forigi uzantnoman regulon
         disable_2fa_user: Malebligi 2FA
         disable_custom_emoji: Malŝalti Proprajn Bildosignojn
         disable_relay: Malebligi Relajson
@@ -237,6 +239,7 @@ eo:
         update_report: Ĝisdatigo de Raporto
         update_status: Ĝisdatigi Afiŝon
         update_user_role: Ĝisdatigi rolon
+        update_username_block: Ĝisdatigi uzantnoman regulon
       actions:
         approve_appeal_html: "%{name} aprobis apelacion kontraŭ reguliga decido de %{target}"
         approve_user_html: "%{name} aprobis la registriĝon de %{target}"
@@ -578,6 +581,12 @@ eo:
         all: Ĉiuj
         limited: Limigita
         title: Moderigado
+      moderation_notes:
+        create: Aldoni moderigan noton
+        created_msg: Noto pri moderigo de instanco sukcese kreita!
+        description_html: Vidu kaj lasu notojn por aliaj moderigantoj kaj via estonta memo
+        destroyed_msg: Noto pri moderigo de instanco sukcese forigita!
+        title: Notoj de moderigado
       private_comment: Privata komento
       public_comment: Publika komento
       purge: Purigu
@@ -786,17 +795,24 @@ eo:
       title: Roloj
     rules:
       add_new: Aldoni regulon
+      add_translation: Aldoni tradukon
       delete: Forigi
       description_html: Kvankam plej da personoj pretendas legi kaj asenti servkondiĉoj, personoj kutime ne komplete legi. <strong>Uzu mallonga kaj simpla listo.</strong>.
       edit: Redakti la regulon
       empty: Neniuj servilregulojn definitas ĝis nun.
+      move_down: Movi malsupren
+      move_up: Movi supren
       title: Reguloj de la servilo
+      translation: Traduko
+      translations: Tradukoj
     settings:
       about:
         manage_rules: Administri servilregulojn
         preamble: Donu specifan informon pri kiel la servilo operaciitas, administras kaj financitas.
         rules_hint: Havas apartan areon por regulojn kiujn via uzantoj devus sekvi.
         title: Pri
+      allow_referrer_origin:
+        title: Permesi al eksteraj retejoj vidi vian Mastodon-servilon kiel trafikfonton
       appearance:
         preamble: Personecigi retinterfaco de Mastodon.
         title: Aspekto
@@ -816,6 +832,7 @@ eo:
       discovery:
         follow_recommendations: Sekvorekomendoj
         preamble: Interesa enhavo estas grava por novaj uzantoj kiuj eble ne konas ajn iun.
+        privacy: Privateco
         profile_directory: Profilujo
         public_timelines: Publikaj templinioj
         publish_statistics: Publikigi statistikojn
@@ -1068,6 +1085,24 @@ eo:
           other: Uzita de %{count} personoj ekde lasta semajno
       title: Rekomendoj kaj Tendencoj
       trending: Popularaĵoj
+    username_blocks:
+      add_new: Aldoni novan
+      comparison:
+        contains: Enhavas
+        equals: Egalas
+      contains_html: Enhavas %{string}
+      created_msg: Sukcese kreita uzantnomo-regulo
+      delete: Forigi
+      edit:
+        title: Redakti uzantnoman regulon
+      matches_exactly_html: Egalas %{string}
+      new:
+        create: Krei regulon
+        title: Krei novan uzantnoman regulon
+      no_username_block_selected: Neniuj uzantnomaj reguloj estis ŝanĝitaj ĉar neniuj estis elektitaj
+      not_permitted: Ne permesita
+      title: Uzantnomaj reguloj
+      updated_msg: Sukcese ĝisdatigita uzantnoma regulo
     warning_presets:
       add_new: Aldoni novan
       delete: Forigi
@@ -1332,6 +1367,10 @@ eo:
     basic_information: Baza informo
     hint_html: "<strong>Personigi, kion homoj vidi en via publika profilo kaj apud viaj afiŝoj. </strong> Aliaj homoj estas pli probable resekvi vin kaj interagi kun vi se vi havus finigitan profilon kaj profilan foton."
     other: Alia
+  emoji_styles:
+    auto: Aŭtomata
+    native: Denaska
+    twemoji: Twemoji
   errors:
     '400': La peto kiun vi sendis estas nevalida au malformas.
     '403': Vi ne havas la rajton por vidi ĉi tiun paĝon.
@@ -1643,6 +1682,10 @@ eo:
       title: Nova mencio
     poll:
       subject: Enketo de %{name} finitas
+    quote:
+      body: 'Via afiŝo estis citita de %{name}:'
+      subject: "%{name} citis vian afiŝon"
+      title: Nova citaĵo
     reblog:
       body: 'Via mesaĝo estis diskonigita de %{name}:'
       subject: "%{name} diskonigis vian afiŝon"
@@ -1691,6 +1734,9 @@ eo:
       self_vote: Vi ne povas voĉdoni en viaj propraj balotenketoj
       too_few_options: devas enhavi pli da unu propono
       too_many_options: ne povas enhavi pli da %{max} proponoj
+    vote: Voĉdoni
+  posting_defaults:
+    explanation: Ĉi tiuj agordoj estos uzataj kiel defaŭltaj kiam vi kreas novajn afiŝojn, sed vi povas redakti ilin per afiŝo en la redaktilo.
   preferences:
     other: Aliaj aferoj
     posting_defaults: Afiŝaj defaŭltoj
@@ -1853,6 +1899,7 @@ eo:
     edited_at_html: Redaktis je %{date}
     errors:
       in_reply_not_found: Mesaĝo kiun vi provas respondi ŝajnas ne ekzisti.
+      quoted_status_not_found: La afiŝo, kiun vi provas citi, ŝajne ne ekzistas.
     over_character_limit: limo de %{max} signoj transpasita
     pin_errors:
       direct: Mesaĝoj kiu videbla nun al la uzantoj ne povas alpinglitis
@@ -1860,18 +1907,17 @@ eo:
       ownership: Mesaĝo de iu alia ne povas esti alpinglita
       reblog: Diskonigo ne povas esti alpinglita
     quote_policies:
-      followers: Sekvantoj kaj menciitaj uzantoj
-      nobody: Nur menciitaj uzantoj
-      public: Ĉiuj
+      followers: Nur sekvantoj
+      nobody: Nur mi
+      public: Iu ajn
     title: "%{name}: “%{quote}”"
     visibilities:
-      direct: Rekta
-      private: Montri nur al sekvantoj
-      private_long: Montri nur al sekvantoj
+      direct: Privada mencio
+      private: Nur sekvantoj
       public: Publika
-      public_long: Ĉiuj povas vidi
-      unlisted: Ne enlistigita
-      unlisted_long: Ĉiuj povas vidi, sed nelistigita en publikaj templinioj
+      public_long: Ĉiujn ajn ĉe kaj ekster Mastodon
+      unlisted: Diskrete publika
+      unlisted_long: Kaŝita de serĉrezultoj, tendencoj kaj publikaj templinioj de Mastodon
   statuses_cleanup:
     enabled: Aŭtomate forigi malnovajn postojn
     enabled_hint: Automate forigi viajn mesaĝojn kiam ili atingas la aĝlimon kaj havas escepton
@@ -1916,6 +1962,9 @@ eo:
     does_not_match_previous_name: ne kongruas kun la antaŭa nomo
   terms_of_service:
     title: Kondiĉoj de uzado
+  terms_of_service_interstitial:
+    past_preamble_html: Ni ŝanĝis niajn servkondiĉojn ekde via lasta vizito. Ni instigas vin revizii la ĝisdatigitajn kondiĉojn.
+    title: La servkondiĉoj de %{domain} ŝanĝiĝas
   themes:
     contrast: Mastodon (Forta kontrasto)
     default: Mastodon (Malhela)
@@ -2092,4 +2141,4 @@ eo:
     not_enabled: Vi ankoraŭ ne ŝaltis WebAuth
     not_supported: Ĉi tiu legilo ne povas uzi sekurecŝlosilojn
     otp_required: Por uzi sekurecŝlosilojn, ebligu 2-faktoran autentigon unue.
-    registered_on: Registrigita je %{date}
+    registered_on: Registrita je %{date}
diff --git a/config/locales/es-AR.yml b/config/locales/es-AR.yml
index 9ed16616162..feded782ba2 100644
--- a/config/locales/es-AR.yml
+++ b/config/locales/es-AR.yml
@@ -190,6 +190,7 @@ es-AR:
         create_relay: Crear relé
         create_unavailable_domain: Crear dominio no disponible
         create_user_role: Crear rol
+        create_username_block: Crear regla de nombre de usuario
         demote_user: Descender usuario
         destroy_announcement: Eliminar anuncio
         destroy_canonical_email_block: Eliminar bloqueo de correo electrónico
@@ -203,6 +204,7 @@ es-AR:
         destroy_status: Eliminar mensaje
         destroy_unavailable_domain: Eliminar dominio no disponible
         destroy_user_role: Destruir rol
+        destroy_username_block: Eliminar regla de nombre de usuario
         disable_2fa_user: Deshabilitar 2FA
         disable_custom_emoji: Deshabilitar emoji personalizado
         disable_relay: Deshabilitar relé
@@ -237,6 +239,7 @@ es-AR:
         update_report: Actualizar denuncia
         update_status: Actualizar mensaje
         update_user_role: Actualizar rol
+        update_username_block: Actualizar regla de nombre de usuario
       actions:
         approve_appeal_html: "%{name} aprobó la solicitud de moderación de %{target}"
         approve_user_html: "%{name} aprobó el registro de %{target}"
@@ -255,6 +258,7 @@ es-AR:
         create_relay_html: "%{name} creó el relé %{target}"
         create_unavailable_domain_html: "%{name} detuvo la entrega al dominio %{target}"
         create_user_role_html: "%{name} creó el rol %{target}"
+        create_username_block_html: "%{name} agregó una regla para los nombres de usuario que contienen %{target}"
         demote_user_html: "%{name} bajó de nivel al usuario %{target}"
         destroy_announcement_html: "%{name} eliminó el anuncio %{target}"
         destroy_canonical_email_block_html: "%{name} desbloqueó el correo electrónico con el hash %{target}"
@@ -268,6 +272,7 @@ es-AR:
         destroy_status_html: "%{name} eliminó el mensaje de %{target}"
         destroy_unavailable_domain_html: "%{name} reanudó la entrega al dominio %{target}"
         destroy_user_role_html: "%{name} eliminó el rol %{target}"
+        destroy_username_block_html: "%{name} eliminó una regla para los nombres de usuario que contienen %{target}"
         disable_2fa_user_html: "%{name} deshabilitó el requerimiento de dos factores para el usuario %{target}"
         disable_custom_emoji_html: "%{name} deshabilitó el emoji %{target}"
         disable_relay_html: "%{name} deshabilitó el relé %{target}"
@@ -302,6 +307,7 @@ es-AR:
         update_report_html: "%{name} actualizó la denuncia %{target}"
         update_status_html: "%{name} actualizó el mensaje de %{target}"
         update_user_role_html: "%{name} cambió el rol %{target}"
+        update_username_block_html: "%{name} actualizó una regla para los nombres de usuario que contienen %{target}"
       deleted_account: cuenta eliminada
       empty: No se encontraron registros.
       filter_by_action: Filtrar por acción
@@ -580,10 +586,10 @@ es-AR:
         title: Moderación
       moderation_notes:
         create: Agregar nota de moderación
-        created_msg: "¡Nota de moderación de instancia creada!"
-        description_html: Ver y dejar notas para otros moderadores y a tu yo futuro
-        destroyed_msg: "¡Nota de moderación de instancia eliminada con éxito!"
-        placeholder: Información sobre esta instancia, acciones tomadas o cualquier otra cosa que te ayude a moderar esta instancia en el futuro.
+        created_msg: "¡Nota de moderación de servidor creada exitosamente!"
+        description_html: Ver y dejar notas para otros moderadores y como referencia futura
+        destroyed_msg: "¡Nota de moderación de servidor eliminada exitosamente!"
+        placeholder: Información sobre este servidor, acciones tomadas, o cualquier otra cosa que te ayude a moderar al mismo en el futuro.
         title: Notas de moderación
       private_comment: Comentario privado
       public_comment: Comentario público
@@ -842,6 +848,10 @@ es-AR:
         all: A todos
         disabled: A nadie
         users: A usuarios locales con sesiones abiertas
+      feed_access:
+        modes:
+          authenticated: Solo usuarios autenticados
+          public: Todos
       registrations:
         moderation_recommandation: Por favor, ¡asegurate de tener un equipo de moderación adecuado y reactivo antes de abrir los registros a todos!
         preamble: Controlá quién puede crear una cuenta en tu servidor.
@@ -1085,6 +1095,25 @@ es-AR:
           other: Usada por %{count} personas durante la última semana
       title: Recomendaciones y tendencias
       trending: En tendencia
+    username_blocks:
+      add_new: Agregar nueva
+      block_registrations: Bloquear registros
+      comparison:
+        contains: Contiene
+        equals: Es igual a
+      contains_html: Contiene %{string}
+      created_msg: Regla de nombre de usuario creada exitosamente
+      delete: Eliminar
+      edit:
+        title: Editar regla de nombre de usuario
+      matches_exactly_html: Es igual a %{string}
+      new:
+        create: Crear regla
+        title: Crear nueva regla de nombre de usuario
+      no_username_block_selected: No se cambiaron las reglas de nombre de usuario, ya que no se seleccionó ninguna
+      not_permitted: No permitido
+      title: Reglas de nombre de usuario
+      updated_msg: Regla de nombre de usuario actualizada exitosamente
     warning_presets:
       add_new: Agregar nuevo
       delete: Eliminar
@@ -1349,6 +1378,10 @@ 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
+  emoji_styles:
+    auto: Automático
+    native: Nativo
+    twemoji: Twemoji
   errors:
     '400': La solicitud que enviaste no era válida o estaba corrompida.
     '403': No tenés permiso para ver esta página.
@@ -1558,6 +1591,13 @@ es-AR:
       expires_at: Vence
       uses: Usos
     title: Invitar a gente
+  link_preview:
+    author_html: Por %{name}
+    potentially_sensitive_content:
+      action: Clic para mostrar
+      confirm_visit: "¿Está seguro de que querés abrir este enlace?"
+      hide_button: Ocultar
+      label: Contenido potencialmente sensible
   lists:
     errors:
       limit: Alcanzaste el número máximo de listas
@@ -1658,6 +1698,10 @@ es-AR:
       title: Nueva mención
     poll:
       subject: Terminó una encuesta de %{name}
+    quote:
+      body: 'Tu mensaje fue citado por %{name}:'
+      subject: "%{name} citó tu mensaje"
+      title: Nueva cita
     reblog:
       body: "%{name} adhirió a tu mensaje:"
       subject: "%{name} adhirió a tu mensaje"
@@ -1706,6 +1750,9 @@ es-AR:
       self_vote: No podés votar en tus propias encuestas
       too_few_options: debe tener más de un elemento
       too_many_options: no puede contener más de %{max} elementos
+    vote: Votar
+  posting_defaults:
+    explanation: Esta configuración se usará como predeterminada cuando crees nuevos mensajes, pero podés modificarla en cada mensaje dentro de la sección de redacción.
   preferences:
     other: Otras opciones
     posting_defaults: Configuración predeterminada de mensajes
@@ -1861,6 +1908,9 @@ es-AR:
         other: "%{count} videos"
     boosted_from_html: Adherido desde %{acct_link}
     content_warning: 'Advertencia de contenido: %{warning}'
+    content_warnings:
+      hide: Ocultar mensaje
+      show: Mostrar más
     default_language: Igual que el idioma de la interface
     disallowed_hashtags:
       one: 'contenía una etiqueta no permitida: %{tags}'
@@ -1868,6 +1918,7 @@ es-AR:
     edited_at_html: Editado el %{date}
     errors:
       in_reply_not_found: El mensaje al que intentás responder no existe.
+      quoted_status_not_found: El mensaje al que intentás citar parece que no existe.
     over_character_limit: se excedió el límite de %{max} caracteres
     pin_errors:
       direct: Los mensajes que sólo son visibles para los usuarios mencionados no pueden ser fijados
@@ -1875,18 +1926,17 @@ es-AR:
       ownership: No se puede fijar el mensaje de otra cuenta
       reblog: No se puede fijar una adhesión
     quote_policies:
-      followers: Seguidores y usuarios mencionados
-      nobody: Solo usuarios mencionados
-      public: Todos
+      followers: Solo seguidores
+      nobody: Solo yo
+      public: Cualquier cuenta
     title: '%{name}: "%{quote}"'
     visibilities:
-      direct: Directo
-      private: Sólo a seguidores
-      private_long: Sólo mostrar a seguidores
+      direct: Mención privada
+      private: Solo seguidores
       public: Público
-      public_long: Todos pueden ver
-      unlisted: No listado
-      unlisted_long: Todos pueden ver, pero no está listado en las líneas temporales públicas
+      public_long: Todo el mundo, dentro y fuera de Mastodon
+      unlisted: Público pero silencioso
+      unlisted_long: Oculto de los resultados de búsqueda, tendencias y líneas temporales públicas de Mastodon
   statuses_cleanup:
     enabled: Eliminar automáticamente mensajes antiguos
     enabled_hint: Elimina automáticamente tus mensajes una vez que alcancen un umbral de edad especificado, a menos que coincidan con una de las excepciones a continuación
diff --git a/config/locales/es-MX.yml b/config/locales/es-MX.yml
index e50f2a7f007..0672b21bc47 100644
--- a/config/locales/es-MX.yml
+++ b/config/locales/es-MX.yml
@@ -190,6 +190,7 @@ es-MX:
         create_relay: Crear Relé
         create_unavailable_domain: Crear Dominio No Disponible
         create_user_role: Crear rol
+        create_username_block: Crear regla de nombre de usuario
         demote_user: Degradar Usuario
         destroy_announcement: Eliminar Anuncio
         destroy_canonical_email_block: Eliminar bloqueo de correo electrónico
@@ -203,6 +204,7 @@ es-MX:
         destroy_status: Eliminar Publicación
         destroy_unavailable_domain: Eliminar Dominio No Disponible
         destroy_user_role: Destruir Rol
+        destroy_username_block: Eliminar regla de nombre de usuario
         disable_2fa_user: Deshabilitar 2FA
         disable_custom_emoji: Deshabilitar Emoji Personalizado
         disable_relay: Desactivar Relé
@@ -237,6 +239,7 @@ es-MX:
         update_report: Actualizar informe
         update_status: Actualizar Publicación
         update_user_role: Actualizar Rol
+        update_username_block: Actualizar regla de nombre de usuario
       actions:
         approve_appeal_html: "%{name} aprobó la solicitud de moderación de %{target}"
         approve_user_html: "%{name} aprobó el registro de %{target}"
@@ -255,6 +258,7 @@ es-MX:
         create_relay_html: "%{name} creó un relé %{target}"
         create_unavailable_domain_html: "%{name} detuvo las entregas al dominio %{target}"
         create_user_role_html: "%{name} creó el rol %{target}"
+        create_username_block_html: "%{name} añadió regla para nombres de usuario que contienen %{target}"
         demote_user_html: "%{name} degradó al usuario %{target}"
         destroy_announcement_html: "%{name} eliminó el anuncio %{target}"
         destroy_canonical_email_block_html: "%{name} ha desbloqueado el correo electrónico con el hash %{target}"
@@ -268,6 +272,7 @@ es-MX:
         destroy_status_html: "%{name} eliminó la publicación por %{target}"
         destroy_unavailable_domain_html: "%{name} reanudó las entregas al dominio %{target}"
         destroy_user_role_html: "%{name} eliminó el rol %{target}"
+        destroy_username_block_html: "%{name} eliminó la regla para los nombres de usuario que contienen %{target}"
         disable_2fa_user_html: "%{name} desactivó el requisito de dos factores para el usuario %{target}"
         disable_custom_emoji_html: "%{name} desactivó el emoji %{target}"
         disable_relay_html: "%{name} desactivó el relé %{target}"
@@ -302,6 +307,7 @@ es-MX:
         update_report_html: "%{name} actualizó el informe %{target}"
         update_status_html: "%{name} actualizó la publicación de %{target}"
         update_user_role_html: "%{name} cambió el rol %{target}"
+        update_username_block_html: "%{name} actualizó una regla para los nombres de usuario que contienen %{target}"
       deleted_account: cuenta eliminada
       empty: No se encontraron registros.
       filter_by_action: Filtrar por acción
@@ -842,6 +848,10 @@ es-MX:
         all: A todos
         disabled: A nadie
         users: Para los usuarios locales que han iniciado sesión
+      feed_access:
+        modes:
+          authenticated: Solo usuarios autenticados
+          public: Todos
       registrations:
         moderation_recommandation: "¡Por favor, asegúrate de contar con un equipo de moderación adecuado y activo antes de abrir el registro al público!"
         preamble: Controla quién puede crear una cuenta en tu servidor.
@@ -1085,6 +1095,25 @@ es-MX:
           other: Usada por %{count} personas durante la última semana
       title: Recomendaciones y Tendencias
       trending: En tendencia
+    username_blocks:
+      add_new: Añadir nuevo
+      block_registrations: Bloquear registros
+      comparison:
+        contains: Contiene
+        equals: Igual
+      contains_html: Contiene %{string}
+      created_msg: Regla de nombre de usuario creada correctamente
+      delete: Eliminar
+      edit:
+        title: Editar regla de nombre de usuario
+      matches_exactly_html: Es igual a %{string}
+      new:
+        create: Crear regla
+        title: Crear nueva regla de nombre de usuario
+      no_username_block_selected: No se modificaron las reglas de nombre de usuario, ya que no se seleccionó ninguna
+      not_permitted: No permitido
+      title: Reglas para el nombre de usuario
+      updated_msg: Regla de nombre de usuario actualizada correctamente
     warning_presets:
       add_new: Añadir nuevo
       delete: Borrar
@@ -1349,6 +1378,10 @@ 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
+  emoji_styles:
+    auto: Automático
+    native: Nativo
+    twemoji: Twemoji
   errors:
     '400': La solicitud que has enviado no es valida o estaba malformada.
     '403': No tienes permiso para acceder a esta página.
@@ -1558,6 +1591,13 @@ es-MX:
       expires_at: Expira
       uses: Usos
     title: Invitar a gente
+  link_preview:
+    author_html: Por %{name}
+    potentially_sensitive_content:
+      action: Pulsa para mostrar
+      confirm_visit: "¿Seguro que quieres abrir este enlace?"
+      hide_button: Ocultar
+      label: Contenido potencialmente sensible
   lists:
     errors:
       limit: Has alcanzado la cantidad máxima de listas
@@ -1658,6 +1698,10 @@ es-MX:
       title: Nueva mención
     poll:
       subject: Una encuesta de %{name} ha terminado
+    quote:
+      body: 'Tu publicación fue citada por %{name}:'
+      subject: "%{name} citó tu publicación"
+      title: Nueva cita
     reblog:
       body: 'Tu publicación fue impulsada por %{name}:'
       subject: "%{name} ha impulsado tu publicación"
@@ -1706,6 +1750,9 @@ es-MX:
       self_vote: No puedes votar en tus propias encuestas
       too_few_options: debe tener más de un elemento
       too_many_options: no puede contener más de %{max} elementos
+    vote: Votar
+  posting_defaults:
+    explanation: Esta configuración se utilizará como predeterminada cuando crees nuevas publicaciones, pero puedes editarla para cada publicación dentro del editor.
   preferences:
     other: Otros
     posting_defaults: Configuración por defecto de publicaciones
@@ -1861,6 +1908,9 @@ es-MX:
         other: "%{count} vídeos"
     boosted_from_html: Impulsado desde %{acct_link}
     content_warning: 'Alerta de contenido: %{warning}'
+    content_warnings:
+      hide: Ocultar publicación
+      show: Mostrar más
     default_language: Igual que el idioma de la interfaz
     disallowed_hashtags:
       one: 'contenía una etiqueta no permitida: %{tags}'
@@ -1868,6 +1918,7 @@ es-MX:
     edited_at_html: Editado %{date}
     errors:
       in_reply_not_found: La publicación a la que estás intentando responder no existe.
+      quoted_status_not_found: La publicación que intentas citar no parece existir.
     over_character_limit: Límite de caracteres de %{max} superado
     pin_errors:
       direct: Las publicaciones que son visibles solo para los usuarios mencionados no pueden fijarse
@@ -1875,18 +1926,17 @@ es-MX:
       ownership: La publicación de alguien más no puede fijarse
       reblog: No se puede fijar una publicación impulsada
     quote_policies:
-      followers: Seguidores y usuarios mencionados
-      nobody: Solo usuarios mencionados
+      followers: Solo seguidores
+      nobody: Solo yo
       public: Cualquiera
     title: "%{name}: «%{quote}»"
     visibilities:
-      direct: Directa
-      private: Sólo mostrar a seguidores
-      private_long: Solo mostrar a tus seguidores
+      direct: Mención privada
+      private: Solo seguidores
       public: Público
-      public_long: Todos pueden ver
-      unlisted: Público, pero no mostrar en la historia federada
-      unlisted_long: Todos pueden ver, pero no está listado en las líneas de tiempo públicas
+      public_long: Cualquiera que esté dentro y fuera de Mastodon
+      unlisted: Pública, pero silenciosa
+      unlisted_long: Ocultado de los resultados de búsqueda, tendencias y cronologías públicas de Mastodon
   statuses_cleanup:
     enabled: Borrar automáticamente publicaciones antiguas
     enabled_hint: Elimina automáticamente tus publicaciones una vez que alcancen un umbral de tiempo especificado, a menos que coincidan con alguna de las excepciones detalladas debajo
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 19f340cec21..15fd191ea41 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -190,6 +190,7 @@ es:
         create_relay: Crear Relé
         create_unavailable_domain: Crear Dominio No Disponible
         create_user_role: Crear Rol
+        create_username_block: Crear regla de nombre de usuario
         demote_user: Degradar Usuario
         destroy_announcement: Eliminar Anuncio
         destroy_canonical_email_block: Eliminar Bloqueo de Correo Electrónico
@@ -203,6 +204,7 @@ es:
         destroy_status: Eliminar Publicación
         destroy_unavailable_domain: Eliminar Dominio No Disponible
         destroy_user_role: Destruir Rol
+        destroy_username_block: Eliminar regla de nombre de usuario
         disable_2fa_user: Deshabilitar 2FA
         disable_custom_emoji: Deshabilitar Emoji Personalizado
         disable_relay: Desactivar Relé
@@ -237,6 +239,7 @@ es:
         update_report: Actualizar informe
         update_status: Actualizar Publicación
         update_user_role: Actualizar Rol
+        update_username_block: Actualizar regla de nombre de usuario
       actions:
         approve_appeal_html: "%{name} aprobó la solicitud de moderación de %{target}"
         approve_user_html: "%{name} aprobó el registro de %{target}"
@@ -255,6 +258,7 @@ es:
         create_relay_html: "%{name} creó un relé %{target}"
         create_unavailable_domain_html: "%{name} detuvo las entregas al dominio %{target}"
         create_user_role_html: "%{name} creó el rol %{target}"
+        create_username_block_html: "%{name} agregó una regla para los nombres de usuario que contienen %{target}"
         demote_user_html: "%{name} degradó al usuario %{target}"
         destroy_announcement_html: "%{name} eliminó el anuncio %{target}"
         destroy_canonical_email_block_html: "%{name} desbloqueó el correo electrónico con el hash %{target}"
@@ -268,6 +272,7 @@ es:
         destroy_status_html: "%{name} eliminó la publicación de %{target}"
         destroy_unavailable_domain_html: "%{name} reanudó las entregas al dominio %{target}"
         destroy_user_role_html: "%{name} eliminó el rol %{target}"
+        destroy_username_block_html: "%{name} eliminó una regla para los nombres de usuario que contienen %{target}"
         disable_2fa_user_html: "%{name} desactivó el requisito de dos factores para el usuario %{target}"
         disable_custom_emoji_html: "%{name} desactivó el emoji %{target}"
         disable_relay_html: "%{name} desactivó el relé %{target}"
@@ -302,6 +307,7 @@ es:
         update_report_html: "%{name} actualizó el informe %{target}"
         update_status_html: "%{name} actualizó la publicación de %{target}"
         update_user_role_html: "%{name} cambió el rol %{target}"
+        update_username_block_html: "%{name} actualizó una regla para los nombres de usuario que contienen %{target}"
       deleted_account: cuenta eliminada
       empty: No se encontraron registros.
       filter_by_action: Filtrar por acción
@@ -842,6 +848,10 @@ es:
         all: A todos
         disabled: A nadie
         users: Para los usuarios locales que han iniciado sesión
+      feed_access:
+        modes:
+          authenticated: Solo usuarios autenticados
+          public: Todos
       registrations:
         moderation_recommandation: Por favor, ¡asegúrate de tener un equipo de moderación adecuado y reactivo antes de abrir los registros a todo el mundo!
         preamble: Controla quién puede crear una cuenta en tu servidor.
@@ -1085,6 +1095,25 @@ es:
           other: Usada por %{count} personas durante la última semana
       title: Recomendaciones y Tendencias
       trending: En tendencia
+    username_blocks:
+      add_new: Añadir nueva
+      block_registrations: Bloquear registros
+      comparison:
+        contains: Contiene
+        equals: Es igual a
+      contains_html: Contiene %{string}
+      created_msg: Regla de nombre de usuario creada correctamente
+      delete: Eliminar
+      edit:
+        title: Editar regla de nombre de usuario
+      matches_exactly_html: Es igual a %{string}
+      new:
+        create: Crear regla
+        title: Crear nueva regla de nombre de usuario
+      no_username_block_selected: No se cambiaron las reglas de nombre de usuario, ya que no se seleccionó ninguno
+      not_permitted: No permitido
+      title: Reglas de nombre de usuario
+      updated_msg: Regla de nombre de usuario actualizada correctamente
     warning_presets:
       add_new: Añadir nuevo
       delete: Borrar
@@ -1349,6 +1378,10 @@ 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
+  emoji_styles:
+    auto: Automático
+    native: Nativo
+    twemoji: Twemoji
   errors:
     '400': La solicitud que has enviado no es valida o estaba malformada.
     '403': No tienes permiso para acceder a esta página.
@@ -1558,6 +1591,13 @@ es:
       expires_at: Expira
       uses: Usos
     title: Invitar a gente
+  link_preview:
+    author_html: Por %{name}
+    potentially_sensitive_content:
+      action: Pulsa para mostrar
+      confirm_visit: "¿Seguro que quieres abrir este enlace?"
+      hide_button: Ocultar
+      label: Contenido potencialmente sensible
   lists:
     errors:
       limit: Has alcanzado la cantidad máxima de listas
@@ -1658,6 +1698,10 @@ es:
       title: Nueva mención
     poll:
       subject: Una encuesta de %{name} ha terminado
+    quote:
+      body: 'Tu publicación ha sido citada por %{name}:'
+      subject: "%{name} citó tu publicación"
+      title: Nueva cita
     reblog:
       body: 'Tu publicación fue impulsada por %{name}:'
       subject: "%{name} impulsó tu publicación"
@@ -1706,6 +1750,9 @@ es:
       self_vote: No puedes votar en tus propias encuestas
       too_few_options: debe tener más de un elemento
       too_many_options: no puede contener más de %{max} elementos
+    vote: Votar
+  posting_defaults:
+    explanation: Esta configuración se usará como predeterminada cuando crees nuevas publicaciones, pero puedes modificarla al escribir una publicación.
   preferences:
     other: Otros
     posting_defaults: Configuración por defecto de publicaciones
@@ -1861,6 +1908,9 @@ es:
         other: "%{count} vídeos"
     boosted_from_html: Impulsado desde %{acct_link}
     content_warning: 'Alerta de contenido: %{warning}'
+    content_warnings:
+      hide: Ocultar publicación
+      show: Mostrar más
     default_language: Igual que el idioma de la interfaz
     disallowed_hashtags:
       one: 'contenía una etiqueta no permitida: %{tags}'
@@ -1868,6 +1918,7 @@ es:
     edited_at_html: Editado %{date}
     errors:
       in_reply_not_found: La publicación a la que intentas responder no existe.
+      quoted_status_not_found: La publicación que estás intentando citar no parece existir.
     over_character_limit: Límite de caracteres de %{max} superado
     pin_errors:
       direct: Las publicaciones que son visibles solo para los usuarios mencionados no pueden fijarse
@@ -1875,18 +1926,17 @@ es:
       ownership: La publicación de otra persona no puede fijarse
       reblog: Una publicación impulsada no puede fijarse
     quote_policies:
-      followers: Seguidores y usuarios mencionados
-      nobody: Solo usuarios mencionados
+      followers: Solo seguidores
+      nobody: Solo yo
       public: Cualquiera
     title: "%{name}: «%{quote}»"
     visibilities:
-      direct: Directa
+      direct: Mención privada
       private: Solo seguidores
-      private_long: Solo mostrar a tus seguidores
       public: Pública
-      public_long: Todos pueden ver
-      unlisted: Pública, pero no mostrar en la historia federada
-      unlisted_long: Todos pueden ver, pero no está listado en las líneas de tiempo públicas
+      public_long: Cualquiera dentro y fuera de Mastodon
+      unlisted: Pública silenciosa
+      unlisted_long: Ocultado de los resultados de búsqueda de Mastodon, tendencias y cronologías públicas
   statuses_cleanup:
     enabled: Borrar automáticamente publicaciones antiguas
     enabled_hint: Elimina automáticamente tus publicaciones una vez que alcancen un umbral de tiempo especificado, a menos que coincidan con alguna de las excepciones detalladas debajo
diff --git a/config/locales/et.yml b/config/locales/et.yml
index 9cf46415af8..9607d7661d1 100644
--- a/config/locales/et.yml
+++ b/config/locales/et.yml
@@ -1,11 +1,11 @@
 ---
 et:
   about:
-    about_mastodon_html: 'Tuleviku sotsiaalvõrgustik: Reklaamivaba, korporatiivse järelvalveta, eetiline kujundus ning detsentraliseeritus! Oma enda andmeid Mastodonis!'
+    about_mastodon_html: 'Tuleviku sotsiaalvõrgustik: Reklaamivaba, korporatiivse järelvalveta, eetiline kujundus ning detsentraliseeritus! Mastodonis omad sa enda andmeid ka päriselt!'
     contact_missing: Määramata
     contact_unavailable: Pole saadaval
-    hosted_on: Mastodon majutatud %{domain}-is
-    title: Teave
+    hosted_on: Mastodoni teenus serveris %{domain}
+    title: Veebirakenduse teave
   accounts:
     followers:
       one: Jälgija
@@ -40,7 +40,7 @@ et:
       avatar: Profiilipilt
       by_domain: Domeen
       change_email:
-        changed_msg: E-postiaadress vahetatud!
+        changed_msg: E-posti aadress vahetatud!
         current_email: Praegune e-postiaadress
         label: Muuda e-posti aadressi
         new_email: Uus е-posti aadress
@@ -157,8 +157,8 @@ et:
       suspension_irreversible: Selle konto andmed on taastamatult kustutatud. Konto taastamisel on see taas kasutatav, aga eelmisi andmeid pole võimalik taastada.
       suspension_reversible_hint_html: Konto on lukustatud ja andmed kustutatakse täielikult %{date}. Seni on võimalik kontot täielikult taastada. Soovi korral on võimalik allpool kõik konto andmed kustutada koheselt.
       title: Kontod
-      unblock_email: Luba e-postiaadress
-      unblocked_email_msg: Kasutaja %{username} e-postiaadress lubatud
+      unblock_email: Lõpeta e-posti aadressi blokeerimine
+      unblocked_email_msg: Kasutaja %{username} e-posti aadressi blokeerimine on lõpetatud
       unconfirmed_email: Kinnitamata e-post
       undo_sensitized: Eemalda tundliku sisu märge
       undo_silenced: Võta vaigistus tagasi
@@ -187,8 +187,10 @@ et:
         create_domain_block: Domeeni blokeerimine
         create_email_domain_block: Loo e-posti domeeni blokeering
         create_ip_block: IP-reegli lisamine
+        create_relay: Loo sõnumivahendusserver
         create_unavailable_domain: Kättesaamatu domeeni lisamine
         create_user_role: Loo roll
+        create_username_block: Lisa kasutajanime reegel
         demote_user: Alandas kasutaja
         destroy_announcement: Eemaldas teadaande
         destroy_canonical_email_block: Kustuta e-posti blokeering
@@ -198,14 +200,18 @@ et:
         destroy_email_domain_block: Kustuta e-posti domeeni blokeering
         destroy_instance: Domeeni kustutamine
         destroy_ip_block: IP-reegli kustutamine
+        destroy_relay: Kustuta sõnumivahendusserver
         destroy_status: Kustuta postitus
         destroy_unavailable_domain: Kättesaamatu domeeni kustutamine
         destroy_user_role: Rolli kustutamine
+        destroy_username_block: Kustuta kasutajanime reegel
         disable_2fa_user: Keela 2FA
         disable_custom_emoji: Keelas kohandatud emotikoni
+        disable_relay: Lülita sõnumivahendusserver välja
         disable_sign_in_token_auth_user: Keela e-posti võtme abil autentimine kasutajale
         disable_user: Keelas kasutaja
         enable_custom_emoji: Lubas kohandatud emotikoni
+        enable_relay: Lülita sõnumivahendusserver sisse
         enable_sign_in_token_auth_user: Luba e-posti võtme abil autentimine kasutajale
         enable_user: Lubas kasutaja
         memorialize_account: Igaveselt lahkunuks märkimine
@@ -222,7 +228,7 @@ et:
         silence_account: Vaigistas konto
         suspend_account: Konto kustutamine
         unassigned_report: Määras teavituse maha
-        unblock_email_account: Luba e-postiaadress
+        unblock_email_account: Lõpeta e-posti aadressi blokeerimine
         unsensitive_account: Pole tundliku sisuga konto
         unsilence_account: Konto vaigistus eemaldati
         unsuspend_account: Konto taastamine
@@ -233,13 +239,14 @@ et:
         update_report: Uuendamise raport
         update_status: Uuenda postitust
         update_user_role: Uuenda rolli
+        update_username_block: Uuenda kasutajanime reeglit
       actions:
         approve_appeal_html: "%{name} kiitis heaks modereerimise otsuse vaidlustuse %{target} poolt"
         approve_user_html: "%{name} kiitis heaks registreerimise %{target} poolt"
         assigned_to_self_report_html: "%{name} määras raporti %{target} endale"
-        change_email_user_html: "%{name} muutis kasutaja %{target} e-postiaadressi"
+        change_email_user_html: "%{name} muutis kasutaja %{target} e-posti aadressi"
         change_role_user_html: "%{name} muutis %{target} rolli"
-        confirm_user_html: "%{name} kinnitas kasutaja %{target} e-postiaadressi"
+        confirm_user_html: "%{name} kinnitas kasutaja %{target} e-posti aadressi"
         create_account_warning_html: "%{name} saatis %{target} hoiatuse"
         create_announcement_html: "%{name} lõi uue teate %{target}"
         create_canonical_email_block_html: "%{name} blokeeris e-posti räsiga %{target}"
@@ -248,8 +255,10 @@ et:
         create_domain_block_html: "%{name} keelas domeeni %{target}"
         create_email_domain_block_html: "%{name} blokeeris e-posti domeeni %{target}"
         create_ip_block_html: "%{name} lõi IP-aadressile %{target} reegli"
+        create_relay_html: "%{name} lõi sõnumivahendusserveri: %{target}"
         create_unavailable_domain_html: "%{name} lõpetas edastamise domeeni %{target}"
         create_user_role_html: "%{name} lõi rolli %{target}"
+        create_username_block_html: "%{name} lisas kasutajanime reegli, milles sisaldub %{target}"
         demote_user_html: "%{name} alandas kasutajat %{target}"
         destroy_announcement_html: "%{name} kustutas teadaande %{target}"
         destroy_canonical_email_block_html: "%{name} eemaldas blokeeringu e-postilt räsiga %{target}"
@@ -259,14 +268,18 @@ et:
         destroy_email_domain_block_html: "%{name} eemaldas blokeeringu e-posti domeenilt %{target}"
         destroy_instance_html: "%{name} kustutas domeeni %{target}"
         destroy_ip_block_html: "%{name} kustutas IP-aadressi %{target} reegli"
+        destroy_relay_html: "%{name} kustutas sõnumivahendusserveri: %{target}"
         destroy_status_html: "%{name} kustutas %{target} postituse"
         destroy_unavailable_domain_html: "%{name} taastas edastamise domeeni %{target}"
         destroy_user_role_html: "%{name} kustutas %{target} rolli"
+        destroy_username_block_html: "%{name} eemaldas kasutajanime reegli, milles sisaldub %{target}"
         disable_2fa_user_html: "%{name} eemaldas kasutaja %{target} kahe etapise nõude"
         disable_custom_emoji_html: "%{name} keelas emotikooni %{target}"
+        disable_relay_html: "%{name} eemaldas sõnumivahendusserveri kasutuselt: %{target}"
         disable_sign_in_token_auth_user_html: "%{name} keelas e-posti võtme abil autentimise %{target} jaoks"
         disable_user_html: "%{name} keelas %{target} sisenemise"
         enable_custom_emoji_html: "%{name} lubas emotikooni %{target}"
+        enable_relay_html: "%{name} võttis sõnumivahendusserveri kasutusele: %{target}"
         enable_sign_in_token_auth_user_html: "%{name} lubas e-posti võtme abil autentimise %{target} jaoks"
         enable_user_html: "%{name} lubas %{target} sisenemise"
         memorialize_account_html: "%{name} märkis %{target} igaveselt lahkunuks"
@@ -283,7 +296,7 @@ et:
         silence_account_html: "%{name} piiras %{target} konto"
         suspend_account_html: "%{name} kustutas %{target} konto"
         unassigned_report_html: "%{name} tühistas raporti %{target} määrangu"
-        unblock_email_account_html: "%{name} lubas %{target} e-postiaadressi"
+        unblock_email_account_html: "%{name} lõpetas kasutaja %{target} e-posti aadressi blokeerimise"
         unsensitive_account_html: "%{name} eemaldas %{target} meedia tundliku sisu märke"
         unsilence_account_html: "%{name} eemaldas %{target} konto piirangu"
         unsuspend_account_html: "%{name} taastas %{target} konto"
@@ -294,6 +307,7 @@ et:
         update_report_html: "%{name} uuendas raportit %{target}"
         update_status_html: "%{name} muutis %{target} postitust"
         update_user_role_html: "%{name} muutis %{target} rolli"
+        update_username_block_html: "%{name} uuendas kasutajanime reeglit, milles sisaldub %{target}"
       deleted_account: kustutatud konto
       empty: Logisi ei leitud.
       filter_by_action: Filtreeri tegevuse järgi
@@ -310,6 +324,10 @@ et:
       new:
         create: Loo teadaanne
         title: Uus teadaanne
+      preview:
+        disclaimer: Kuna kasutajd ei saa neist postiitustest keelduda, siis peaksid teavituskirjad keskenduma vaid olulistele teemadele nagi võimalik isiklike andmete leke või serveri tegevuse lõpetamine.
+        explanation_html: 'See e-kiri saadetakse <strong>%{display_count}-le kasutajale</strong>. E-kirjas sisaldub järgnev tekst:'
+        title: Info teavituse üle vaatamine
       publish: Postita
       published_msg: Teadaande avaldamine õnnestus!
       scheduled_for: Kavandatud ajaks %{time}
@@ -354,7 +372,7 @@ et:
       updated_msg: Emotikoni uuendamine õnnestus!
       upload: Lae üles
     dashboard:
-      active_users: aktiivsed kasutajad
+      active_users: aktiivseid kasutajaid
       interactions: interaktsioonid
       media_storage: Meedia hoidla
       new_users: uued kasutajad
@@ -469,9 +487,35 @@ et:
         title: Domeenikeeldude import
       no_file: Faili pole valitud
     fasp:
+      debug:
+        callbacks:
+          created_at: 'Loodud:'
+          delete: Kustuta
+          ip: IP-aadress
+          request_body: Päringu sisu
+          title: Veaotsingu tagasikutsepäringud
       providers:
+        active: Aktiivne
+        base_url: Baas-URL
+        callback: Pöördliiklus
+        delete: Kustuta
+        edit: Muuda teenusepakkujat
+        finish_registration: Lõpeta registreerimine
+        name: Nimi
+        providers: Teenusepakkujad
+        public_key_fingerprint: Avaliku võtme sõrmejälg
+        registration_requested: Registreerimispäring
+        registrations:
+          confirm: Kinnita
+          description: Sa oled saanud FASP-i registreerimispäringu. Kui sa seda ise ei algatanud, siis keeldu. Kui algatasid, siis enne kinnitamist kontrolli nime ja võtme sõrmejälge.
+          reject: Keeldu
+          title: Kinnita FASP-i registreerimine
+        save: Salvesta
+        select_capabilities: Vali oskused
         sign_in: Logi sisse
         status: Olek
+        title: Täiendavad teenusepakkujad Födiversumis (FASP - Fediverse Auxiliary Service Providers)
+      title: FASP
     follow_recommendations:
       description_html: "<strong>Jälgimissoovitused aitavad uutel kasutajatel kiirelt leida huvipakkuvat sisu</strong>. Kui kasutaja pole teistega piisavalt läbi käinud, et saaks luua personaalseid soovitusi, soovitatakse neid kontosid. Need arvutatakse ümber igapäevaselt konkreetse keele populaarseimate postituste ja enim jälgitavate kontode seast."
       language: Keel
@@ -540,6 +584,13 @@ et:
         all: Kõik
         limited: Piiratud
         title: Modereerimine
+      moderation_notes:
+        create: Lisa modereerimisteade
+        created_msg: Serveri modereerimisteate koostamine õnnestus!
+        description_html: Vaata ja lisa teade teistele moderaatoritele ning endalegi tulevikus
+        destroyed_msg: Serveri modereerimisteate kustutamine õnnestus!
+        placeholder: Teave selle koduserveri kohta, tehtud toimingud või mis iganes muu oluline, mis võimaldab sul või teistel serverit tulevikus modereerida.
+        title: Modereerimisteated
       private_comment: Privaatne kommentaar
       public_comment: Avalik kommentaar
       purge: Kustuta
@@ -578,7 +629,7 @@ et:
     relationships:
       title: "%{acct}-i suhted"
     relays:
-      add_new: Lisa uus vahendaja
+      add_new: Lisa uus sõnumivahendusserver
       delete: Kustuta
       description_html: "<strong>Födereerumisvahendaja</strong> on vahendav server, mis kannab üle suures koguses avalikke postitusi nende serverite vahel, mis on sellega liitunud ja edastavad sellele oma postitusi. <strong>See aitab väikestel ja keskmistel serveritel avastada födiversumi sellist sisu</strong>, mis muidu eeldaks kohalikelt kasutajatelt nende serverite kasutajate jälgitavaks märkimist."
       disable: Keela
@@ -586,13 +637,13 @@ et:
       enable: Luba
       enable_hint: Kui lubatud, siis server tellib sellelt vahendajalt kõik avalikud postitused ning hakkab ka enda avalikke postitusi sellele saatma.
       enabled: Lubatud
-      inbox_url: Vahendaja URL
-      pending: Ootab vahendaja nõusolekut
+      inbox_url: Sõnumivahendusserveri võrguaadress
+      pending: Ootan sõnumivahendusserveri kinnitust
       save_and_enable: Salvesta ja luba
       setup: Sea üles vahendav ühendus
-      signatures_not_enabled: Vahendamine ei tööta korrektselt kuniks turvarežiim või lubatud nimekirja režiim on sisse lülitatud
+      signatures_not_enabled: Vahendamine ei tööta korrektselt kui turvarežiim või lubatud nimekirja režiim on sisse lülitatud
       status: Olek
-      title: Vahendajad
+      title: Sõnumivahendusserverid
     report_notes:
       created_msg: Teade edukalt koostatud!
       destroyed_msg: Teade edukalt kustutatud!
@@ -758,12 +809,16 @@ et:
       title: Serveri reeglid
       translation: Tõlge
       translations: Tõlked
+      translations_explanation: Soovi korral võid lisada reeglitele tõlkeid. Kui tõlget pole, siis kuvatakse vaikimisi väärtust. Palun taga alati, et tõlke sisu oleks sünkroonis vaikimisi reegli sisuga.
     settings:
       about:
         manage_rules: Halda serveri reegleid
         preamble: Täpsem kirjeldus, kuidas serverit käitatakse, modereeritakse ja rahastatakse.
         rules_hint: Reeglitele, millega kasutajad peavad nõustuma, on vastav piirkond.
         title: Teave
+      allow_referrer_origin:
+        desc: Kui selle serveri kasutajad klõpsivad väliste saitide linke, siis brauser võib selle Mastodoni serveri lisada päringu päisesse viitajana. Kui see tuvastaks sinu kasutajaid liiga täpselt (näiteks isikliku Mastodoni serveri puhul), siis lülita see eelistus välja.
+        title: Luba välistel serveritel näha Mastodoni teenust linkide viitajana
       appearance:
         preamble: Kohanda Mastodoni veebiliidest.
         title: Välimus
@@ -830,6 +885,7 @@ et:
       back_to_account: Tagasi konto lehele
       back_to_report: Tagasi raporti lehele
       batch:
+        add_to_report: 'Lisa teatisele #%{id}'
         remove_from_report: Eemalda raportist
         report: Raport
       contents: Sisu
@@ -869,6 +925,8 @@ et:
     system_checks:
       database_schema_check:
         message_html: On ootel andmebaasi migreerimisi. Rakenduse ootuspäraseks toimimiseks palun käivita need
+      elasticsearch_analysis_index_mismatch:
+        message_html: Elasticsearchi indeksite analüüsija seadistused on vananenud. Palun käivita <code>tootctl search deploy --only-mapping=%{value}</code>
       elasticsearch_health_red:
         message_html: Elasticsearch klaster on ebaterve (punane staatus), otsingufunktsioonid ei ole saadaval
       elasticsearch_health_yellow:
@@ -940,9 +998,23 @@ et:
         chance_to_review_html: "<strong>Loodud teenusetingimusi ei avaldata automaatselt.</strong> Sul on võimalus tulemused üle vaadata. Palun täida vajalikud andmed, et jätkata."
         explanation_html: Esitatud teenusetingimuste näidis on mõeldud ainult teavitamise eesmärgil ja seda ei tohiks tõlgendada kui juriidilist nõuannet mis tahes küsimuses. Palun konsulteeri olukorra ja konkreetsete juriidiliste küsimuste osas oma õigusnõustajaga.
         title: Teenuse tingimuste seadistamine
+      going_live_on_html: Avaldatud ja kehtib alates %{date}
       history: Ajalugu
+      live: Avaldatud
+      no_history: Teenuse tingimustesl pole veel salvestatud muudatusi.
+      no_terms_of_service_html: Hetkel pole sa selle serveri kasutustingimusi kirjeldanud. Kasutustingimused tagavad kõikidele osapooltele selguse ja kautsevad sind kasutajatega seotud võimalike vaidluste korral.
+      notified_on_html: 'Kasutajad on teavitatud: %{date}'
+      notify_users: Teata kasutajatele
+      preview:
+        explanation_html: 'See e-kiri saadetakse <strong>%{display_count}-le kasutajale</strong>, kes olid liitunud enne %{date}. E-kirjas sisaldub järgnev tekst:'
+        send_preview: Saada eelvaade %{email} e-posti aadressile
+        send_to_all:
+          one: Saada %{display_count} e-kiri
+          other: Saada %{display_count} e-kirja
+        title: Teenuse teadaande eelvaade
       publish: Postita
       published_on_html: Postitatud %{date}
+      save_draft: Salvesta kavandina
       title: Kasutustingimused
     title: Administreerimine
     trends:
@@ -1019,6 +1091,25 @@ et:
           other: Kasutatud %{count} kasutaja poolt viimase nädala jooksul
       title: Soovitused ja trendid
       trending: Trendid
+    username_blocks:
+      add_new: Lisa uus
+      block_registrations: Blokeeri registreerimisi
+      comparison:
+        contains: Sisaldab
+        equals: Võrdub
+      contains_html: 'Sisaldab: %{string}'
+      created_msg: Kasutajanime reegli lisamine õnnestus
+      delete: Kustuta
+      edit:
+        title: Muuda kasutajanime reeglit
+      matches_exactly_html: 'Võrdub: %{string}'
+      new:
+        create: Lisa reegel
+        title: Lisa uus kasutajanime reegel
+      no_username_block_selected: Ühtegi kasutajanimereeglit ei muudetud, kuna midagi polnud valitud
+      not_permitted: Ei ole lubatud
+      title: Kasutajanime reeglid
+      updated_msg: Kasutajanime reegli uuendamine õnnestus
     warning_presets:
       add_new: Lisa uus
       delete: Kustuta
@@ -1174,13 +1265,13 @@ et:
     security: Turvalisus
     set_new_password: Uue salasõna määramine
     setup:
-      email_below_hint_html: Kontrolli rämpsposti kausta või taotle uut. Saad oma e-posti aadressi parandada, kui see on vale.
+      email_below_hint_html: Kontrolli rämpsposti kausta või palu uue kirja saatmist. Kui sinu e-posti aadress on vale, siis saad seda parandada.
       email_settings_hint_html: Klõpsa aadressile %{email} saadetud linki, et alustada Mastodoni kasutamist. Me oleme ootel.
       link_not_received: Kas ei saanud linki?
       new_confirmation_instructions_sent: Saad mõne minuti pärast uue kinnituslingiga e-kirja!
       title: Kontrolli sisendkasti
     sign_in:
-      preamble_html: Logi sisse oma kasutajakontoga serveris <strong>%{domain}</strong>. Kui konto asub teises serveris, siis sa ei saa siin sisse logida.
+      preamble_html: Logi sisse oma kasutajakontoga serverisse <strong>%{domain}</strong>. Kui konto asub teises serveris, siis sa ei saa siin sisse logida.
       title: Logi sisse serverisse %{domain}
     sign_up:
       manual_review: Liitumised kohas %{domain} vaadatakse meie moderaatorite poolt käsitsi läbi. Aitamaks meil sinu taotlust läbi vaadata, kirjuta palun natuke endast ja miks soovid kontot kohas %{domain}.
@@ -1196,6 +1287,8 @@ et:
       view_strikes: Vaata enda eelnevaid juhtumeid
     too_fast: Vorm esitatud liiga kiirelt, proovi uuesti.
     use_security_key: Kasuta turvavõtit
+    user_agreement_html: Olen tutvunud <a href="%{terms_of_service_path}" target="_blank">kasutustingimustega</a> ja <a href="%{privacy_policy_path}" target="_blank">isikuandmete kaitse põhimõtetega</a> ning nõustun nendega
+    user_privacy_agreement_html: Olen tutvunud <a href="%{privacy_policy_path}" target="_blank">isikuandmete kaitse põhimõtetega</a> ja nõustun nendega
   author_attribution:
     example_title: Näidistekst
     hint_html: Kirjutad uudiseid või blogisid Mastodonist väljapool? Määra, kuidas sinule viidatakse, kui neid lehti jagatakse Mastodonis.
@@ -1240,7 +1333,7 @@ et:
       before: 'Veendu, et saad aru, mida toob plaanitav muudatus kaasa:'
       caches: Teiste serverite poolt talletatud sisu võib jääda kättesaadavaks
       data_removal: Sinu postitused ning kontoandmed kustutatakse jäädavalt
-      email_change_html: Saad <a href="%{path}">muuta oma e-postiaadressi</a> ilma oma kontot kustutamata
+      email_change_html: Saad <a href="%{path}">muuta oma e-posti aadressi</a> ilma oma kontot kustutamata
       email_contact_html: Kui see ikkagi ei saabu, võid abi saamiseks kirjutada <a href="mailto:%{email}">%{email}</a>
       email_reconfirmation_html: Kui sa ei saa kinnituskirja, saad <a href="%{path}">taotleda seda uuesti</a>
       irreversible: Kustutatud kontot ei saa taastada ega uuesti aktiveerida
@@ -1281,6 +1374,10 @@ 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
+  emoji_styles:
+    auto: Automaatne
+    native: Rakenduseomane
+    twemoji: Twemoji
   errors:
     '400': Esitatud päring oli vigane või valesti vormindatud.
     '403': Sul puudub õigus seda lehte vaadata.
@@ -1302,7 +1399,7 @@ et:
   exports:
     archive_takeout:
       date: Kuupäev
-      download: Lae alla oma arhiiv
+      download: Laadi alla oma arhiiv
       hint_html: "<strong>Postitustest ja üleslaetud meediast</strong> on võimalik saada koopia. Eksporditud andmed on ActivityPub-formaadis, loetav vastava tarkvara poolt. Koopia saamine on võimalik iga 7 päeva järel."
       in_progress: Loome arhiivi...
       request: Taotle oma arhiivi
@@ -1590,6 +1687,10 @@ et:
       title: Uus mainimine
     poll:
       subject: "%{name} küsitlus lõppes"
+    quote:
+      body: "%{name} tsiteeris sinu postitust:"
+      subject: "%{name} tsiteeris sinu postitust"
+      title: Uus tsitaat
     reblog:
       body: "%{name} jagas edasi postitust:"
       subject: "%{name} jagas postitust"
@@ -1638,6 +1739,9 @@ et:
       self_vote: Sa ei saa enda hääletustel hääletada
       too_few_options: peab olema rohkem kui üks vastus
       too_many_options: ei saa sisaldada rohkem kui %{max} vastust
+    vote: Hääleta
+  posting_defaults:
+    explanation: Järgnevad seadistused on uute küsitluste loomisel kasutusel vaikimisi valikutena, kuid neid saad küsitluse koostamisel ka muuta.
   preferences:
     other: Muu
     posting_defaults: Postitamise vaikesätted
@@ -1800,6 +1904,7 @@ et:
     edited_at_html: Muudetud %{date}
     errors:
       in_reply_not_found: Postitus, millele üritad vastata, ei näi enam eksisteerivat.
+      quoted_status_not_found: Postitus, mida üritad tsiteerida, ei näi enam eksisteerivat.
     over_character_limit: tähtmärkide limiit %{max} ületatud
     pin_errors:
       direct: Ei saa kinnitada postitusi, mis on nähtavad vaid mainitud kasutajatele
@@ -1807,16 +1912,17 @@ et:
       ownership: Kellegi teise postitust ei saa kinnitada
       reblog: Jagamist ei saa kinnitada
     quote_policies:
-      followers: Jälgijad ja mainitud kasutajad
+      followers: Ainult jälgijad
+      nobody: Ainult mina
+      public: Kõik
     title: '%{name}: "%{quote}"'
     visibilities:
-      direct: Otsene
-      private: Ainult jälgijatele
-      private_long: Näevad ainult jälgijad
+      direct: Privaatne mainimine
+      private: Ainult jälgijad
       public: Avalik
-      public_long: Postitused on kõigile näha
-      unlisted: Ajajooneväline
-      unlisted_long: Kõigile näha, kuid ei näidata avalikel ajajoontel
+      public_long: Nii kasutajad kui mittekasutajad
+      unlisted: Vaikselt avalik
+      unlisted_long: Peidetud Mastodoni otsingutulemustest, pupulaarsust koguva sisu voost ja avalikult ajajoonelt
   statuses_cleanup:
     enabled: Vanade postituste automaatne kustutamine
     enabled_hint: Kustutab automaatselt postitused, mis ületavad määratud ajalimiiti, välja arvatud allpool toodud erandite puhul
@@ -1863,6 +1969,11 @@ et:
     does_not_match_previous_name: ei ühti eelmise nimega
   terms_of_service:
     title: Kasutustingimused
+  terms_of_service_interstitial:
+    future_preamble_html: Alates <strong>%{date}</strong> muudame me oma kasutustingimusi. Palun vaata muutunud tingimused üle.
+    past_preamble_html: Peale sinu viimast külastust oleme muutnud oma kasutustingimusi. Palun vaata muutunud tingimused üle.
+    review_link: Vaata üle kasutustingimused
+    title: "%{domain} saidi kasutustingimused muutuvad"
   themes:
     contrast: Mastodon (Kõrge kontrast)
     default: Mastodon (Tume)
@@ -1895,6 +2006,7 @@ et:
     webauthn: Turvavõtmed
   user_mailer:
     announcement_published:
+      description: "%{domain} saidi peakasutajate teadaanne:"
       subject: Saidi teadaanne teenuste kohta
       title: "%{domain} saidi teadaanne teenuste kohta"
     appeal_approved:
@@ -1927,6 +2039,10 @@ et:
       subject: Kontole sisenemine uuelt IP-aadressilt
       title: Uus sisenemine
     terms_of_service_changed:
+      agreement: Jätkates %{domain} teenuse kasutamisega nõustud sa kasutustingimustega. Kui sa pole tingimustega nõus, siis võid oma kasutajakonto kustutamisega lepingu %{domain} saidiga alati lõpetada.
+      changelog: 'Selle uuenduse ülevaade sinu jaoks:'
+      description: 'Sa oled saanud selle teavituskirja, kuna oleme muutnud %{domain} teenuse kasutustingimusi. Muudatused jõustuvad %{date}. Me soovitame, et vaatad muutunud tingimuste täisteksti üle siin:'
+      description_html: Sa oled saanud selle teavituskirja, kuna oleme muutnud %{domain} teenuse kasutustingimusi. Muudatused jõustuvad <strong>%{date}</strong>. Me soovitame, et vaatad <a href="%{path}" target="_blank">muutunud tingimuste täisteksti üle siin</a>.
       sign_off: "%{domain} saidi tiim"
       subject: Meie kasutustingimuste uuendused
       subtitle: "%{domain} saidi kasutustingimused muutuvad"
@@ -2014,7 +2130,7 @@ et:
     extra_instructions_html: <strong>Soovitus:</strong> Sinu kodulehel olev link võib olla nähtamatu. Oluline osa on <code>rel="me"</code>, mis väldib kasutaja loodud sisuga lehtedel libaisikustamist. Sa saad isegi kasutada lehe HEADER osas silti <code>link</code> sildi <code>a</code> asemel, kuid HTML peab olema kättesaadav ilma JavaScripti käivitamata.
     here_is_how: Siin on, kuidas
     hint_html: "<strong>Oma isiku tuvastamine on Mastodonis kõigi jaoks.</strong> Toetub avatud veebistandarditele, nüüd ja igavesti tasuta. Kõik, mida vajad, on isiklik veebileht, mille järgi inimesed sind tunnevad. Kui lingid oma profiililt sellele veebilehele, kontrollime me, et see veebileht lingib tagasi sinu profiilile ning näitame profiilil visuaalset tähist."
-    instructions_html: Kopeeri ja kleebi allpool olev kood oma lehe HTML lähtekoodi. Seejärel lisa oma kodulehe aadress profiili "Muuda profiili" taabi ühte lisavälja ning salvesta muudatused.
+    instructions_html: Kopeeri ja kleebi allpool olev kood oma lehe HTML lähtekoodi. Seejärel lisa oma kodulehe aadress profiili "Muuda profiili" vahekaardi ühte lisavälja ning salvesta muudatused.
     verification: Kinnitamine
     verified_links: Sinu kontrollitud lingid
     website_verification: Veebilehe kontrollimine
diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index 79080c7bfbf..fb11192599b 100644
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -187,6 +187,7 @@ eu:
         create_domain_block: Sortu domeinu blokeoa
         create_email_domain_block: Sortu email domeinu blokeoa
         create_ip_block: Sortu IP araua
+        create_relay: Erreleboa sortu
         create_unavailable_domain: Sortu eskuragarri ez dagoen domeinua
         create_user_role: Sortu rola
         demote_user: Jaitsi erabiltzailearen maila
@@ -198,11 +199,13 @@ eu:
         destroy_email_domain_block: Ezabatu email domeinu blokeoa
         destroy_instance: Ezabatu betiko domeinua
         destroy_ip_block: Ezabatu IP araua
+        destroy_relay: Erreleboa ezabatu
         destroy_status: Ezabatu bidalketa
         destroy_unavailable_domain: Ezabatu eskuragarri ez dagoen domeinua
         destroy_user_role: Ezabatu rola
         disable_2fa_user: Desgaitu 2FA
         disable_custom_emoji: Desgaitu emoji pertsonalizatua
+        disable_relay: Erreleboa desaktibatu
         disable_sign_in_token_auth_user: Desgaitu email token autentifikazioa erabiltzailearentzat
         disable_user: Desgaitu erabiltzailea
         enable_custom_emoji: Gaitu emoji pertsonalizatua
@@ -210,6 +213,7 @@ eu:
         enable_user: Gaitu erabiltzailea
         memorialize_account: Bihurtu kontua oroigarri
         promote_user: Igo erabiltzailea mailaz
+        publish_terms_of_service: Zerbitzu-baldintzak argitaratu
         reject_appeal: Baztertu apelazioa
         reject_user: Baztertu erabiltzailea
         remove_avatar_user: Kendu abatarra
@@ -229,26 +233,33 @@ eu:
         update_custom_emoji: Eguneratu emoji pertsonalizatua
         update_domain_block: Eguneratu domeinu-blokeoa
         update_ip_block: Eguneratu IP araua
+        update_report: Txostena eguneratu
         update_status: Eguneratu bidalketa
         update_user_role: Eguneratu rola
       actions:
         approve_appeal_html: "%{name} erabiltzaileak %{target} erabiltzailearen moderazio erabakiaren apelazioa onartu du"
         approve_user_html: "%{name} erabiltzaileak %{target} erabiltzailearen izen-ematea onartu du"
         assigned_to_self_report_html: "%{name} erabiltzaileak %{target} salaketa bere buruari esleitu dio"
+        change_email_user_html: "%{name}(e)k %{target} erabiltzailearen e-posta helbidea aldatu du"
         change_role_user_html: "%{name} erabiltzaileak %{target} kontuaren rola aldatu du"
+        confirm_user_html: "%{name}(e)k %{target} erabiltzailearen e-posta helbidea berretsi du"
         create_account_warning_html: "%{name} erabiltzaileak abisua bidali dio %{target} erabiltzaileari"
         create_announcement_html: "%{name} erabiltzaileak %{target} iragarpen berria sortu du"
+        create_canonical_email_block_html: "%{name}(e)k %{target} hash-a duen helbide elektronikoa blokeatu du"
         create_custom_emoji_html: "%{name} erabiltzaileak %{target} emoji berria kargatu du"
         create_domain_allow_html: "%{name} erabiltzaileak %{target} domeinuarekin federazioa onartu du"
         create_domain_block_html: "%{name} erabiltzaileak %{target} domeinua blokeatu du"
+        create_email_domain_block_html: "%{name}(e)k %{target} e-posta helbideen domeinua blokeatu du"
         create_ip_block_html: "%{name} kontuak %{target} IParen araua sortu du"
         create_unavailable_domain_html: "%{name}(e)k %{target} domeinurako banaketa gelditu du"
         create_user_role_html: "%{name} erabiltzaileak %{target} rola sortu du"
         demote_user_html: "%{name} erabiltzaileak %{target} erabiltzailea mailaz jaitsi du"
         destroy_announcement_html: "%{name} erabiltzaileak %{target} iragarpena ezabatu du"
+        destroy_canonical_email_block_html: "%{name}(e)k %{target} hash-a duen helbide elektronikoa desblokeatu du"
         destroy_custom_emoji_html: "%{name} erabiltzaileak %{target} emoji-a ezabatu du"
         destroy_domain_allow_html: "%{name} erabiltzaileak %{target} domeinuarekin federatzea debekatu du"
         destroy_domain_block_html: "%{name} erabiltzaileak %{target} domeinua desblokeatu du"
+        destroy_email_domain_block_html: "%{name}-k %{target} posta elektroniko domeinua desblokeatu du"
         destroy_instance_html: "%{name} erabiltzaileak %{target} domeinua betiko ezabatu du"
         destroy_ip_block_html: "%{name} erabiltzaileak %{target} IParen araua ezabatu du"
         destroy_status_html: "%{name} erabiltzaileak %{target} erabiltzailearen bidalketa kendu du"
@@ -279,6 +290,7 @@ eu:
         update_custom_emoji_html: "%{name} erabiltzaileak %{target} emoji-a eguneratu du"
         update_domain_block_html: "%{name} erabiltzaileak %{target} domeinu-blokeoa eguneratu du"
         update_ip_block_html: "%{name} erabiltzaileak %{target} IParen araua aldatu du"
+        update_report_html: "%{name}-k %{target} txostena eguneratu du"
         update_status_html: "%{name} erabiltzaileak %{target} erabiltzailearen bidalketa eguneratu du"
         update_user_role_html: "%{name} erabiltzaileak %{target} rola aldatu du"
       deleted_account: ezabatu kontua
@@ -286,7 +298,9 @@ eu:
       filter_by_action: Iragazi ekintzen arabera
       filter_by_user: Iragazi erabiltzaileen arabera
       title: Auditoria-egunkaria
+      unavailable_instance: "(domeinu izena ez dago erabilgarri)"
     announcements:
+      back: Oharretara bueltatu
       destroyed_msg: Iragarpena ongi ezabatu da!
       edit:
         title: Editatu iragarpena
@@ -295,6 +309,8 @@ eu:
       new:
         create: Sortu iragarpena
         title: Iragarpen berria
+      preview:
+        explanation_html: 'Mezu elektronikoa <strong>%{display_count} erabiltzaileei</strong> bidaliko zaie. Testu hau gehituko zaio mezu elektronikoari:'
       publish: Argitaratu
       published_msg: Iragarpena ongi argitaratu da!
       scheduled_for: "%{time}-rako programatuta"
@@ -433,8 +449,10 @@ eu:
       new:
         create: Gehitu domeinua
         resolve: Ebatzi domeinua
+        title: Posta domeinu berria blokeatu
       not_permitted: Baimendu gabea
       resolved_through_html: "%{domain} domeinuaren bidez ebatzia"
+      title: Email domeinua blokeatuta
     export_domain_allows:
       new:
         title: Baimendutako domeinuak inportatu
@@ -450,6 +468,32 @@ eu:
       new:
         title: Domeinu-blokeoak inportatu
       no_file: Ez da fitxategirik hautatu
+    fasp:
+      debug:
+        callbacks:
+          created_at: Sortua hemen
+          delete: Ezabatu
+          ip: IP helbidea
+          request_body: Eskaeraren edukia
+          title: Atzera-deiak araztu
+      providers:
+        active: Aktibo
+        base_url: Oinarrizko URL-a
+        delete: Ezabatu
+        edit: Editatu hornitzailea
+        finish_registration: Izen-ematea bukatu
+        name: Izena
+        providers: Hornitzaileak
+        public_key_fingerprint: Gako publikoaren hatz-marka
+        registration_requested: Izen-ematea eskatuta
+        registrations:
+          confirm: Berretsi
+          reject: Ukatu
+        save: Gorde
+        sign_in: Hasi saioa
+        status: Egoera
+        title: Fedibertsoko zerbitzu osagarrien hornitzaileak
+      title: FZOH
     follow_recommendations:
       description_html: "<strong>Jarraitzeko gomendioek erabiltzaile berriei eduki interesgarria azkar aurkitzen laguntzen diete</strong>. Erabiltzaile batek jarraitzeko gomendio pertsonalizatuak jasotzeko adina interakzio izan ez duenean, kontu hauek gomendatzen zaizkio. Egunero birkalkulatzen dira hizkuntza bakoitzerako, azken aldian parte-hartze handiena izan duten eta jarraitzaile lokal gehien dituzten kontuak nahasiz."
       language: Hizkuntza
@@ -515,6 +559,10 @@ eu:
         all: Denak
         limited: Mugatua
         title: Moderazioa
+      moderation_notes:
+        create: Gehitu Moderazio Oharra
+        created_msg: Instantziako moderazio oharra ongi sortu da!
+        description_html: Ikusi eta idatzi oharrak beste moderatzaileentzat eta zuretzat etorkizunerako
       private_comment: Iruzkin pribatua
       public_comment: Iruzkin publikoa
       purge: Ezabatu betiko
@@ -648,6 +696,7 @@ eu:
         delete_data_html: "<strong>@%{acct}</strong> kontuaren profila eta edukia, gaurtik hasita, 30 egunez ezabatu, ez bada bitartean kontua berraktibatzen"
         preview_preamble_html: "<strong>@%{acct}</strong> kontuak ondorengo edukia duen abisu bat jasoko du:"
         record_strike_html: "<strong>@%{acct}</strong> kontuak eginiko eraso bat erregistratu, kontu honek etorkizunean egin ditzakeen erasoen aurrean erabakiak hartzen laguntzeko"
+        send_email_html: Bidali abisu-mezu elektroniko bat <strong>@%{acct}</strong>-ri
         warning_placeholder: Moderazio-ekintzarako aukerazkoak diren arrazoiketa gehigarriak.
       target_origin: Salatutako kontuaren jatorria
       title: Salaketak
@@ -717,11 +766,14 @@ eu:
       title: Rolak
     rules:
       add_new: Gehitu araua
+      add_translation: Gehitu itzulpena
       delete: Ezabatu
       description_html: Gehienek erabilera baldintzak irakurri eta onartu dituztela baieztatzen badute ere, orokorrean arazoren bat dagoen arte ez dituzte irakurtzen. <strong>Zerbitzariaren arauak begirada batean ikustea errazteko buletadun zerrenda batean bildu.</strong> Saiatu arauak labur eta sinple idazten, baina elementu askotan banatu gabe.
       edit: Editatu araua
       empty: Ez da zerbitzariko araurik definitu oraindik.
       title: Zerbitzariaren arauak
+      translation: Itzulpena
+      translations: Itzulpenak
     settings:
       about:
         manage_rules: Kudeatu zerbitzariaren arauak
@@ -747,6 +799,7 @@ eu:
       discovery:
         follow_recommendations: Jarraitzeko gomendioak
         preamble: Eduki interesgarria aurkitzea garrantzitsua da Mastodoneko erabiltzaile berrientzat, behar bada inor ez dutelako ezagutuko. Kontrolatu zure zerbitzariko aurkikuntza-ezaugarriek nola funtzionatzen duten.
+        privacy: Pribatutasuna
         profile_directory: Profil-direktorioa
         public_timelines: Denbora-lerro publikoak
         publish_statistics: Argitaratu estatistikak
@@ -777,6 +830,7 @@ eu:
       destroyed_msg: Guneko igoera ongi ezabatu da!
     software_updates:
       critical_update: Kritikoa — mesedez, eguneratu azkar
+      description: Gomendagarria da Mastodon instalazioa eguneratuta mantentzea azken konponketa eta funtzioez baliatzeko. Gainera, batzuetan ezinbestekoa da Mastodon garaiz eguneratzea segurtasun arazoak saihesteko. Arrazoi hauengatik, Mastodonek 30 minuturo eguneratzeak egiaztatzen ditu, eta zure posta elektroniko bidezko jakinarazpenen lehentasunen arabera jakinaraziko dizu.
       documentation_link: Informazio gehiago
       release_notes: Bertsio oharrak
       title: Eguneraketak eskuragarri
@@ -794,6 +848,7 @@ eu:
       batch:
         remove_from_report: Kendu txostenetik
         report: Salatu
+      contents: Edukiak
       deleted: Ezabatuta
       favourites: Gogokoak
       history: Bertsio-historia
@@ -802,6 +857,7 @@ eu:
       media:
         title: Multimedia
       metadata: Metadatuak
+      no_history: Bidalketa hau ez da editatu
       no_status_selected: Ez da bidalketarik aldatu ez delako bat ere hautatu
       open: Ireki bidalketa
       original_status: Jatorrizko bidalketa
@@ -825,6 +881,8 @@ eu:
     system_checks:
       database_schema_check:
         message_html: Aplikatu gabeko datu-basearen migrazioak daude. Exekutatu aplikazioak esperotako portaera izan dezan
+      elasticsearch_analysis_index_mismatch:
+        message_html: Elasticsearch indize-analizatzailearen ezarpenak zaharkituta daude. Mesedez, exekutatu <code>tootctl search deploy --only-mapping --only=%{value}</code>
       elasticsearch_health_red:
         message_html: Elasticsearch-en klusterra ez dago osasuntsu (egoera gorria), bilaketa-eginbideak ez daude erabilgarri
       elasticsearch_health_yellow:
@@ -849,6 +907,8 @@ eu:
         message_html: Ez duzu zerbitzariaren araurik definitu.
       sidekiq_process_check:
         message_html: Ez da ari Sidekiq prozesurik exekutatzen %{value} ilad(et)an. Egiaztatu Sidekiq konfigurazioa
+      software_version_check:
+        message_html: Mastodon eguneratze bat eskuragarri dago.
       software_version_critical_check:
         action: Ikusi eguneraketa eskuragarriak
         message_html: Mastodon eguneraketa kritikoa eskuragarri, mesedez eguneratu ahal bezain azkar.
@@ -862,12 +922,46 @@ eu:
         action: Ikus hemen informazio gehiagorako
         message_html: "<strong>Zure objektuen biltegiratzea ez dago ongi konfiguratua. Zure erabiltzaileen pribatutasuna arriskuan dago.</strong>"
     tags:
+      moderation:
+        not_trendable: Ez dago modan
+        not_usable: Ez erabilgarri
+        pending_review: Berrikusketaren zain
+        reviewed: Berrikusita
+        title: Egoera
+        unreviewed: Berrikusi gabe
+        usable: Erabilgarri
+      name: Izena
+      newest: Berriena
+      oldest: Zaharrena
+      open: Publikoki ikusi
+      reset: Berrezarri
       review: Berrikusketaren egoera
+      search: Bilatu
+      title: Traolak
       updated_msg: Traola-ezarpenak ongi eguneratu dira
+    terms_of_service:
+      back: Zerbitzuaren baldintzetara itzuli
+      changelog: Zer aldatu da
+      create: Erabili zeurea
+      current: Oraingoa
+      draft: Zirriborroa
+      generate: Txantiloila erabili
+      generates:
+        action: Sortu
+        chance_to_review_html: "<strong>Sortutako zerbitzu-baldintzak ez dira automatikoki argitaratuko.</strong> Emaitzak berrikusteko aukera izango duzu. Mesedez, bete beharrezko xehetasunak aurrera egiteko."
+        explanation_html: Zerbitzu-baldintzen txantiloia informazio-helburuetarako soilik da, eta ez da gai bati buruzko aholku juridikotzat hartu behar. Mesedez, kontsultatu zure aholkulari juridikoa zure egoerari eta galdera juridiko zehatzei buruz.
+      going_live_on_html: Argitaratua, indarrean %{date}
+      history: Historia
+      live: Zuzenean
+      publish: Argitaratu
+      published_on_html: "%{date}(e)an argitaratua"
+      save_draft: Gorde zirriborroa
+      title: Zerbitzuaren baldintzak
     title: Administrazioa
     trends:
       allow: Onartu
       approved: Onartua
+      confirm_disallow: Ziur zaude hautatutako etiketak desgaitu nahi dituzula?
       disallow: Ukatu
       links:
         allow: Onartu esteka
@@ -1011,6 +1105,7 @@ eu:
     sensitive_content: Eduki hunkigarria
   application_mailer:
     salutation: "%{name},"
+    settings: 'Posta elektronikoaren lehentasunak aldatu: %{link}'
     unsubscribe: Kendu harpidetza
     view: 'Ikusi:'
     view_profile: Ikusi profila
@@ -1056,6 +1151,7 @@ eu:
     migrate_account_html: Kontu hau beste batera birbideratu nahi baduzu, <a href="%{path}">hemen konfiguratu</a> dezakezu.
     or_log_in_with: Edo hasi saioa honekin
     progress:
+      confirm: Berretsi e-mail helbidea
       details: Zure xehetasunak
       review: Gure berrikuspena
       rules: Onartu arauak
@@ -1077,7 +1173,9 @@ eu:
     security: Segurtasuna
     set_new_password: Ezarri pasahitza berria
     setup:
+      email_below_hint_html: Begiratu zure spameko karpetan, edo eskatu beste bat. Zure helbide elektronikoa zuzen dezakezu oker badago.
       link_not_received: Ez duzu estekarik jaso?
+      new_confirmation_instructions_sent: Minutu gutxiren buruan baieztapen-esteka duen mezu elektroniko bat jasoko duzu!
       title: Begiratu zure sarrera-ontzia
     sign_in:
       preamble_html: Zure <strong>%{domain}-(e)ko</strong> egiaztagiriekin saioa hasi. Zure kontua beste zerbitzari batean badago, ezin izango duzu hemen saioa hasi.
@@ -1088,6 +1186,7 @@ eu:
     status:
       account_status: Kontuaren egoera
       functional: Zure kontua guztiz erabilgarri dago.
+      pending: Gure taldea zure eskaera berrikusten ari da. Honek denbora pixka bat beharko du. Mezu elektroniko bat jasoko duzu zure eskaera onartzen bada.
       redirecting_to: Zure kontua ez dago aktibo orain %{acct} kontura birbideratzen duelako.
       self_destruct: "%{domain} domeinua itxiko denez, konturako sarbide mugatua soilik izango duzu."
       view_strikes: Ikusi zure kontuaren aurkako neurriak
@@ -1355,6 +1454,9 @@ eu:
     unsubscribe:
       action: Bai, kendu harpidetza
       complete: Harpidetza kenduta
+      emails:
+        notification_emails:
+          follow: jarraitu jakinarazpen-mezu elektronikoak
       title: Kendu harpidetza
   media_attachments:
     validations:
@@ -1587,10 +1689,12 @@ eu:
     delete: Kontuaren ezabaketa
     development: Garapena
     edit_profile: Editatu profila
+    export: Esportatu
     featured_tags: Nabarmendutako traolak
     import: Inportazioa
     import_and_export: Inportatu eta esportatu
     migrate: Kontuaren migrazioa
+    notifications: Posta bidezko jakinarazpenak
     preferences: Hobespenak
     profile: Profila
     relationships: Jarraitutakoak eta jarraitzaileak
@@ -1639,13 +1743,7 @@ eu:
       reblog: Bultzada bat ezin da finkatu
     title: '%{name}: "%{quote}"'
     visibilities:
-      direct: Zuzena
-      private: Jarraitzaileak soilik
-      private_long: Erakutsi jarraitzaileei soilik
       public: Publikoa
-      public_long: Edonork ikusi dezake
-      unlisted: Zerrendatu gabea
-      unlisted_long: Edonork ikusi dezake, baina ez da denbora-lerro publikoetan agertzen
   statuses_cleanup:
     enabled: Ezabatu bidalketa zaharrak automatikoki
     enabled_hint: Zure bidalketa zaharrak automatikoki ezabatzen ditu zehazturiko denbora mugara iristean, beheko baldintza bat betetzen ez bada
@@ -1688,6 +1786,10 @@ eu:
       too_late: Beranduegi da neurri hau apelatzeko
   tags:
     does_not_match_previous_name: ez dator aurreko izenarekin bat
+  terms_of_service:
+    title: Erabilera baldintzak
+  terms_of_service_interstitial:
+    future_preamble_html: Gure zerbitzu-baldintzetan aldaketa batzuk egiten ari gara, eta <strong>%{date}</strong>-tik aurrera jarriko dira indarrean. Eguneratutako baldintzak berrikustea gomendatzen dizugu.
   themes:
     contrast: Mastodon (Kontraste altua)
     default: Mastodon (Iluna)
@@ -1719,6 +1821,8 @@ eu:
     recovery_instructions_html: Zure telefonora sarbidea galtzen baduzu, beheko berreskuratze kode bat erabili dezakezu kontura berriro sartu ahal izateko. <strong>Gore barreskuratze kodeak toki seguruan</strong>. Adibidez inprimatu eta dokumentu garrantzitsuekin batera gorde.
     webauthn: Segurtasun gakoak
   user_mailer:
+    announcement_published:
+      title: "%{domain} zerbitzuaren iragarpena"
     appeal_approved:
       action: Kontuaren ezarpenak
       explanation: "%{strike_date}(e)an zure kontuari ezarritako neurriaren aurka %{appeal_date}(e)an jarri zenuen apelazioa onartu da. Zure kontua egoera onean dago berriro."
@@ -1833,6 +1937,7 @@ eu:
     instructions_html: Kopiatu eta itsatsi ondoko kodea zure webguneko HTMLan. Ondoren, gehitu zure webgunearen helbidea zure profileko eremu gehigarrietako batean, "Editatu profila" fitxatik eta gorde aldaketak.
     verification: Egiaztaketa
     verified_links: Zure lotura egiaztatuak
+    website_verification: Web orriaren egiaztapena
   webauthn_credentials:
     add: Gehitu segurtasun gako berria
     create:
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index 41f8b7febf0..9c24be80351 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -182,7 +182,7 @@ fa:
         create_account_warning: ایجاد هشدار
         create_announcement: ایجاد اعلامیه
         create_canonical_email_block: ایجاد انسداد رایانامه
-        create_custom_emoji: ایجاد اموجی سفارشی
+        create_custom_emoji: ایجاد شکلک سفارشی
         create_domain_allow: ایجاد اجازهٔ دامنه
         create_domain_block: ایجاد انسداد دامنه
         create_email_domain_block: ایجاد انسداد دامنهٔ رایانامه
@@ -190,10 +190,11 @@ fa:
         create_relay: ایجاد رله
         create_unavailable_domain: ایجاد دامنهٔ ناموجود
         create_user_role: ایجاد نقش
+        create_username_block: ایجاد قانون نام‌کاربری
         demote_user: تنزل کاربر
         destroy_announcement: حذف اعلامیه
         destroy_canonical_email_block: حذف انسداد رایانامه
-        destroy_custom_emoji: حذف اموجی سفارشی
+        destroy_custom_emoji: حذف شکلک سفارشی
         destroy_domain_allow: حذف اجازهٔ دامنه
         destroy_domain_block: حذف انسداد دامنه
         destroy_email_domain_block: حذف انسداد دامنهٔ رایانامه
@@ -203,12 +204,13 @@ fa:
         destroy_status: حذف وضعیت
         destroy_unavailable_domain: حذف دامنهٔ ناموجود
         destroy_user_role: نابودی نقش
+        destroy_username_block: حذف قانون نام‌کاربری
         disable_2fa_user: از کار انداختن ورود دومرحله‌ای
-        disable_custom_emoji: از کار انداختن اموجی سفارشی
+        disable_custom_emoji: از کار انداختن شکلک سفارشی
         disable_relay: غیرفعال‌سازی رله
         disable_sign_in_token_auth_user: از کار انداختن تأیید هویت ژتون رایانامه‌ای برای کاربر
         disable_user: از کار انداختن کاربر
-        enable_custom_emoji: به کار انداختن اموجی سفارشی
+        enable_custom_emoji: به کار انداختن شکلک سفارشی
         enable_relay: فعال‌سازی رله
         enable_sign_in_token_auth_user: به کار انداختن تأیید هویت ژتون رایانامه‌ای برای کاربر
         enable_user: به کار انداختن کاربر
@@ -231,12 +233,13 @@ fa:
         unsilence_account: رفع خموشی حساب
         unsuspend_account: رفع تعلیق حساب
         update_announcement: به‌روز رسانی اعلامیه
-        update_custom_emoji: به‌روز رسانی اموجی سفارشی
+        update_custom_emoji: به‌روز رسانی شکلک سفارشی
         update_domain_block: به‌روزرسانی مسدودسازی دامنه
         update_ip_block: بروزرسانی قاعدهٔ آی‌پی
         update_report: به‌روز رسانی گزارش
         update_status: به‌روز رسانی وضعیت
         update_user_role: به روزرسانی نقش
+        update_username_block: به‌روزرسانی قانون نام‌کاربری
       actions:
         approve_appeal_html: "%{name} درخواست تجدیدنظر تصمیم مدیر را از %{target} پذیرفت"
         approve_user_html: "%{name} ثبت نام %{target} را تایید کرد"
@@ -247,7 +250,7 @@ fa:
         create_account_warning_html: "%{name} هشداری برای %{target} فرستاد"
         create_announcement_html: "%{name} اعلامیه‌ای جدید ایجاد کرد %{target}"
         create_canonical_email_block_html: "%{name} رایانامه با درهم‌ریزی %{target} را مسدود کرد"
-        create_custom_emoji_html: "%{name} اموجی تازهٔ %{target} را بارگذاشت"
+        create_custom_emoji_html: "%{name} شکلک تازهٔ %{target} را بارگذاشت"
         create_domain_allow_html: "%{name} دامنهٔ %{target} را مجاز کرد"
         create_domain_block_html: "%{name} دامنهٔ %{target} را مسدود کرد"
         create_email_domain_block_html: "%{name} دامنهٔ رایانامهٔ %{target} را مسدود کرد"
@@ -255,6 +258,7 @@ fa:
         create_relay_html: "%{name} یک رله %{target} ایجاد کرد"
         create_unavailable_domain_html: "%{name} تحویل محتوا به دامنه %{target} را متوقف کرد"
         create_user_role_html: "%{name} نقش %{target} را ایجاد کرد"
+        create_username_block_html: "‫‏%{name} قانونی برای نام‌های کاربری دارای %{target} افزود"
         demote_user_html: "%{name} کاربر %{target} را تنزل داد"
         destroy_announcement_html: "%{name} اعلامیهٔ %{target} را حذف کرد"
         destroy_canonical_email_block_html: "%{name} رایانامه با درهم‌ریزی %{target} را نامسدود کرد"
@@ -268,6 +272,7 @@ fa:
         destroy_status_html: "%{name} وضعیت %{target} را برداشت"
         destroy_unavailable_domain_html: "%{name} تحویل محتوا به دامنه %{target} را از سر گرفت"
         destroy_user_role_html: "%{name} نقش %{target} را حذف کرد"
+        destroy_username_block_html: "‫‏%{name} قانون نام‌های کاربری دارای %{target} را برداشت"
         disable_2fa_user_html: "%{name} ضرورت ورود دو مرحله‌ای را برای کاربر %{target} غیر فعال کرد"
         disable_custom_emoji_html: "%{name} شکلک %{target} را غیرفعال کرد"
         disable_relay_html: "%{name} رله %{target} را غیرفعال کرد"
@@ -302,6 +307,7 @@ fa:
         update_report_html: "%{name} گزارش %{target} را به‌روز کرد"
         update_status_html: "%{name} نوشتهٔ %{target} را به‌روز کرد"
         update_user_role_html: "%{name} نقش %{target} را تغییر داد"
+        update_username_block_html: "‫‏%{name} قانونی برای نام‌های کاربری دارای %{target} را به‌روز کرد"
       deleted_account: حساب حذف شد
       empty: هیچ گزارشی پیدا نشد.
       filter_by_action: پالایش بر اساس کنش
@@ -578,6 +584,13 @@ fa:
         all: همه
         limited: محدود
         title: مدیریت
+      moderation_notes:
+        create: افزودن یادداشت نظارتی
+        created_msg: یادداشت نظارتی با موفقیت ساخته شد!
+        description_html: دیدن و گذاشتن یادداشت‌هایی برای دیگر ناظران و خود آینده‌تان
+        destroyed_msg: یادداشت نظارتی با موفقیت حذف شد!
+        placeholder: اطلاعاتی دربارهٔ این نمونه، کنش‌های انجام شده یا هرچیز دیگری که در نظارت این نمونه در آینده کمک خواهد کرد.
+        title: یادداشت‌های نظارتی
       private_comment: یادداشت خصوصی
       public_comment: یادداشت عمومی
       purge: پاکسازی
@@ -646,8 +659,8 @@ fa:
         mark_as_sensitive_description_html: رسانهٔ درون فرستهٔ گزارش شده به عنوان حسّاس علامت خورده و شکایتی ضبط خواهد شد تا بتوانید خلاف‌های آینده از همین حساب را بهتر مدیریت کنید.
         other_description_html: دیدن انتخاب های بیشتر برای کنترل رفتار حساب و سفارشی سازی ارتباط با حساب گزارش شده.
         resolve_description_html: هیچ کنشی علیه حساب گزارش شده انجام نخواهد شد. هیچ شکایتی ضبط نشده و گزارش بسته خواهد شد.
-        silence_description_html: این حساب فقط برای کسانی قابل مشاهده خواهد بود که قبلاً آن را دنبال می کنند یا به صورت دستی آن را جستجو می کنند و دسترسی آن را به شدت محدود می کند. همیشه می توان برگرداند. همه گزارش‌های مربوط به این حساب را می‌بندد.
-        suspend_description_html: اکانت و تمامی محتویات آن غیرقابل دسترسی و در نهایت حذف خواهد شد و تعامل با آن غیر ممکن خواهد بود. قابل برگشت در عرض 30 روز همه گزارش‌های مربوط به این حساب را می‌بندد.
+        silence_description_html: حساب فقط برای کسانی که از پیش پی می‌گرفتندش یا به صورت دستی به دنیالش گشته‌اند نمایان خواهد بود که رسشش را شدیداً محدود می‌کند. همواره برگشت‌پذیر است. همهٔ گزارش‌ها علیه این حساب را خواهد بست.
+        suspend_description_html: حساب و همهٔ محتوایش غیرقابل دسترس شده و در نهایت حذف خواهند شد. تعامل با آن ممکن نخواهد بود. بازگشت‌پذیر تا ۳۰ روز. همهٔ گزارش‌ها علیه این حساب را خواهد بست.
       actions_description_html: تصمیم گیری کنش اقدامی برای حل این گزارش. در صورت انجام کنش تنبیهی روی حساب گزارش شده، غیر از زمان یکه دستهٔ <strong>هرزنامه</strong> گزیده باشد، برایش آگاهی رایانامه‌ای فرستاده خواهد شد.
       actions_description_remote_html: تصمیم بگیرید که چه اقدامی برای حل این گزارش انجام دهید. این فقط بر نحوه ارتباط سرور <strong>شما</strong> با این حساب راه دور و مدیریت محتوای آن تأثیر می گذارد.
       actions_no_posts: این گزارش هیچ پست مرتبطی برای حذف ندارد
@@ -707,7 +720,7 @@ fa:
         actions:
           delete_html: پست های توهین آمیز را حذف کنید
           mark_as_sensitive_html: رسانه پست های توهین آمیز را به عنوان حساس علامت گذاری کنید
-          silence_html: دسترسی <strong>@%{acct}</strong> را به شدت محدود کنید و نمایه و محتویات آنها را فقط برای افرادی که قبلاً آنها را دنبال می‌کنند قابل مشاهده کنید یا به صورت دستی نمایه آن را جستجو کنید
+          silence_html: محدودیت شدید رسش <strong>‪@%{acct}‬</strong> با نمایان کردن نماگر و محتوایش فقط به افرادی که از پیش پی می‌گرفتندش و به صورت دستی به دنبالش گشته‌اند
           suspend_html: تعلیق <strong>@%{acct}</strong>، غیرقابل دسترس کردن نمایه و محتوای آنها و تعامل با آنها غیر ممکن
         close_report: 'علامت گذاری گزارش #%{id} به عنوان حل شده است'
         close_reports_html: "<strong>همه</strong> گزارش‌ها در برابر <strong>@%{acct}</strong> را به‌عنوان حل‌وفصل علامت‌گذاری کنید"
@@ -791,13 +804,21 @@ fa:
       description_html: در حالی که اکثر افراد ادعا می‌کنند که شرایط استفاده را خوانده و پذیرفته‌اند، افراد معمولا تا پیش از بروز مشکل این متن را مطالعه نمی‌کنند. <strong>پیدا کردن قوانین کارساز‌تان را با تبدیل‌شان به صورت فهرست برای کاربران تسهیل کنید.</strong> سعی کنید هر قانون را کوتاه و ساده نگاه دارید اما از آن طرف هم تلاش نکنید که آن‌ها به تعداد زیادی مورد جدا از هم تقسیم کنید.
       edit: ویرایش قانون
       empty: هنوز هیچ قانونی برای کارساز تعریف نشده.
+      move_down: پایین بردن
+      move_up: بالا بردن
       title: قوانین کارساز
+      translation: ترجمه
+      translations: ترجمه‌ها
+      translations_explanation: می‌توانید به صورت اختیاری نقش‌ها را ترجمه کنید. در صورت موجود نبودن نگارش ترجمه شده مقدار پیش‌گزیده نشان داده خواهد شد. لطفاً همواره مطمئن شوید که ترجمه‌ها با مقدار پیش‌گزیده هماهنگند.
     settings:
       about:
         manage_rules: مدیریت قانون‌های کارساز
         preamble: اطلاعات عمیقی در مورد نحوه کارکرد، تعدیل و تأمین مالی سرور ارائه دهید.
         rules_hint: یک منطقه اختصاصی برای قوانینی وجود دارد که انتظار می رود کاربران شما به آن پایبند باشند.
         title: درباره
+      allow_referrer_origin:
+        desc: ممکن است هنگام زدن کاربرانتان روی پیوند پایگاه‌های خارجی مرورگرشان نشانی کارساز ماستودونتان را به عنوان هدایتگر بفرستد. اگر این کار موجب شناسایی یکتای کاربرانتان می‌شود، برای نمونه در صورت خصوصی بودن کارسازتان از کار بیندازدش.
+        title: اجازه به پایگاه‌های خارجی برای دیدن کارساز‌ ماستودونتان به عنوان منبع شدآمد
       appearance:
         preamble: سفارشی‌سازی رابطس وب ماستودون.
         title: ظاهر
@@ -1070,6 +1091,25 @@ fa:
           other: در هفته گذشته توسط %{count} نفر استفاده شده است
       title: توصیه ها و روندها
       trending: پرطرفدار
+    username_blocks:
+      add_new: افزودن جدید
+      block_registrations: انسداد ثبت‌نام‌ها
+      comparison:
+        contains: دارای
+        equals: برابر
+      contains_html: دارای %{string}
+      created_msg: قانون نام کاربری با موفّقیت ایجاد شد
+      delete: حذف
+      edit:
+        title: ویرایش قانون نام‌کاربری
+      matches_exactly_html: برابر %{string}
+      new:
+        create: ایجاد قانون
+        title: ایجاد قانون نام‌کاربری جدید
+      no_username_block_selected: هیچ قاعدهٔ نام کاربری‌ای تغییری نکرد زیرا هیچ‌کدام گزیده نشده بودند
+      not_permitted: مجاز نیست
+      title: قانون نام کاربری
+      updated_msg: قانون نام کاربری با موفّقیت به‌روز شد
     warning_presets:
       add_new: افزودن تازه
       delete: زدودن
@@ -1334,6 +1374,10 @@ fa:
     basic_information: اطلاعات پایه
     hint_html: "<strong>شخصی‌سازی آن چه مردم روی نمایهٔ عمومیتان و کنار فرسته‌هایتان می‌بینند.</strong> هنگامی که نمایه‌ای کامل و یک تصویر نمایه داشته باشید،‌ احتمال پی‌گیری متقابل و تعامل با شما بیش‌تر است."
     other: سایر
+  emoji_styles:
+    auto: خودکار
+    native: بومی
+    twemoji: توییموجی
   errors:
     '400': درخواستی که فرستادید نامعتبر یا اشتباه بود.
     '403': شما اجازهٔ دیدن این صفحه را ندارید.
@@ -1643,6 +1687,10 @@ fa:
       title: اشارهٔ جدید
     poll:
       subject: نظرسنجی‌ای از %{name} پایان یافت
+    quote:
+      body: 'فرسته‌تان توسط %{name} نقل شد:'
+      subject: "%{name} فرسته‌تان را نقل کرد"
+      title: نقل‌قول جدید
     reblog:
       body: "%{name} فرستهٔ شما را تقویت کرد:"
       subject: "%{name} فرستهٔ شما را تقویت کرد"
@@ -1853,25 +1901,17 @@ fa:
     edited_at_html: ویراسته در %{date}
     errors:
       in_reply_not_found: به نظر نمی‌رسد وضعیتی که می‌خواهید به آن پاسخ دهید، وجود داشته باشد.
+      quoted_status_not_found: به نظر نمی‌رسد فرسته‌ای که می‌خواهید نقلش کنید وجود داشته باشد.
     over_character_limit: از حد مجاز %{max} حرف فراتر رفتید
     pin_errors:
       direct: فرسته‌هایی که فقط برای کاربران اشاره شده نمایانند نمی‌توانند سنجاق شوند
       limit: از این بیشتر نمی‌شود نوشته‌های ثابت داشت
       ownership: نوشته‌های دیگران را نمی‌توان ثابت کرد
       reblog: تقویت نمی‌تواند سنجاق شود
-    quote_policies:
-      followers: پی‌گیران و کاربران اشاره شده
-      nobody: فقط کاربران اشاره شده
-      public: هرکسی
     title: "%{name}: «%{quote}»"
     visibilities:
-      direct: مستقیم
-      private: خصوصی
-      private_long: تنها پیگیران شما می‌بینند
+      direct: اشاره خصوصی
       public: عمومی
-      public_long: همه می‌توانند ببینند
-      unlisted: فهرست نشده
-      unlisted_long: عمومی، ولی در فهرست نوشته‌ها نمایش نمی‌یابد
   statuses_cleanup:
     enabled: حذف خودکار فرسته‌های قدیمی
     enabled_hint: فرسته‌هایتان را هنگام رسیدن به کرانهٔ سن خاصی به صورت خودکار حذف می‌کند، مگر این که با یکی از استثناهای زیر مطابق باشند
@@ -1983,7 +2023,7 @@ fa:
       details: 'جزییات ورود:'
       explanation: ما ورود به حساب شما را از یک آدرس آی پی جدید شناسایی کرده ایم.
       further_actions_html: اگر این شما نبودید، توصیه می کنیم فورا %{action} را فعال کنید و برای ایمن نگه داشتن حساب خود، احراز هویت دو مرحله ای را فعال کنید.
-      subject: حساب شما از یک آدرس آی پی جدید قابل دسترسی است
+      subject: نشانی آی‌پی جدیدی به حسابتان دسترسی پیدا کرده
       title: یک ورود جدید
     terms_of_service_changed:
       agreement: با ادامه استفاده از %{domain}، با این شرایط موافقت می کنید. اگر با شرایط به‌روزرسانی شده مخالف هستید، می‌توانید در هر زمان با حذف حساب خود، قرارداد خود را با %{domain} فسخ کنید.
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 4de6815a00e..7b19a0d820d 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -18,8 +18,8 @@ fi:
     pin_errors:
       following: Sinun täytyy seurata käyttäjää, jota haluat tukea
     posts:
-      one: Julkaisu
-      other: viestiä
+      one: julkaisu
+      other: julkaisua
     posts_tab_heading: Julkaisut
     self_follow_error: Oman tilisi seuraaminen ei ole sallittua
   admin:
@@ -190,6 +190,7 @@ fi:
         create_relay: Luo välittäjä
         create_unavailable_domain: Luo ei-saatavilla oleva verkkotunnus
         create_user_role: Luo rooli
+        create_username_block: Luo käyttäjänimisääntö
         demote_user: Alenna käyttäjä
         destroy_announcement: Poista tiedote
         destroy_canonical_email_block: Poista sähköpostiosoitteen esto
@@ -203,6 +204,7 @@ fi:
         destroy_status: Poista julkaisu
         destroy_unavailable_domain: Poista ei-saatavilla oleva verkkotunnus
         destroy_user_role: Hävitä rooli
+        destroy_username_block: Poista käyttäjänimisääntö
         disable_2fa_user: Poista kaksivaiheinen todennus käytöstä
         disable_custom_emoji: Poista mukautettu emoji käytöstä
         disable_relay: Poista välittäjä käytöstä
@@ -237,6 +239,7 @@ fi:
         update_report: Päivitä raportti
         update_status: Päivitä julkaisu
         update_user_role: Päivitä rooli
+        update_username_block: Päivitä käyttäjänimisääntö
       actions:
         approve_appeal_html: "%{name} hyväksyi käyttäjän %{target} valituksen moderointipäätöksestä"
         approve_user_html: "%{name} hyväksyi käyttäjän %{target} rekisteröitymisen"
@@ -255,6 +258,7 @@ fi:
         create_relay_html: "%{name} loi välittäjän %{target}"
         create_unavailable_domain_html: "%{name} pysäytti toimituksen verkkotunnukseen %{target}"
         create_user_role_html: "%{name} loi roolin %{target}"
+        create_username_block_html: "%{name} lisäsi säännön käyttäjänimille, joihin sisältyy %{target}"
         demote_user_html: "%{name} alensi käyttäjän %{target}"
         destroy_announcement_html: "%{name} poisti tiedotteen %{target}"
         destroy_canonical_email_block_html: "%{name} kumosi eston tiivistettä %{target} vastaavalta sähköpostiosoitteelta"
@@ -268,6 +272,7 @@ fi:
         destroy_status_html: "%{name} poisti käyttäjän %{target} julkaisun"
         destroy_unavailable_domain_html: "%{name} jatkoi toimitusta verkkotunnukseen %{target}"
         destroy_user_role_html: "%{name} poisti roolin %{target}"
+        destroy_username_block_html: "%{name} poisti säännön käyttäjänimiltä, joihin sisältyy %{target}"
         disable_2fa_user_html: "%{name} poisti käyttäjältä %{target} vaatimuksen kaksivaiheiseen todentamiseen"
         disable_custom_emoji_html: "%{name} poisti emojin %{target} käytöstä"
         disable_relay_html: "%{name} poisti välittäjän %{target} käytöstä"
@@ -302,6 +307,7 @@ fi:
         update_report_html: "%{name} päivitti raportin %{target}"
         update_status_html: "%{name} päivitti käyttäjän %{target} julkaisun"
         update_user_role_html: "%{name} muutti roolia %{target}"
+        update_username_block_html: "%{name} päivitti säännön käyttäjänimille, joihin sisältyy %{target}"
       deleted_account: poisti tilin
       empty: Lokeja ei löytynyt.
       filter_by_action: Suodata toimen mukaan
@@ -501,12 +507,14 @@ fi:
         registration_requested: Rekisteröintiä pyydetty
         registrations:
           confirm: Vahvista
+          description: Vastaanotit rekisteröintymisen FASP-palvelusta. Hylkää rekisteröintyminen, jos et aloittanut sitä. Jos aloitit sen, vertaile huolellisesti nimeä ja avaimen sormenjälkeä ennen kuin hyväksyt rekisteröintymisen.
           reject: Hylkää
           title: Vahvista FASP-rekisteröinti
         save: Tallenna
         select_capabilities: Valitse kyvykkyydet
         sign_in: Kirjaudu sisään
         status: Tila
+        title: Fediversumin tukitoimintojen tarjoajat
       title: FASP
     follow_recommendations:
       description_html: "<strong>Seurantasuositukset auttavat uusia käyttäjiä löytämään nopeasti kiinnostavaa sisältöä</strong>. Kun käyttäjä ei ole ollut tarpeeksi vuorovaikutuksessa muiden kanssa, jotta hänelle olisi muodostunut henkilökohtaisia seuraamissuosituksia, suositellaan niiden sijaan näitä tilejä. Ne lasketaan päivittäin uudelleen yhdistelmästä tilejä, jotka ovat viime aikoina olleet aktiivisimmin sitoutuneita ja joilla on suurimmat paikalliset seuraajamäärät tietyllä kielellä."
@@ -840,6 +848,10 @@ fi:
         all: Kaikille
         disabled: Ei kenellekään
         users: Kirjautuneille paikallisille käyttäjille
+      feed_access:
+        modes:
+          authenticated: Vain todennetut käyttäjät
+          public: Kaikki
       registrations:
         moderation_recommandation: Varmista, että sinulla on riittävä ja toimintavalmis joukko moderaattoreita, ennen kuin avaat rekisteröitymisen kaikille!
         preamble: Määritä, kuka voi luoda tilin palvelimellesi.
@@ -1083,6 +1095,25 @@ fi:
           other: Käyttänyt %{count} käyttäjää viimeisen viikon aikana
       title: Suositukset ja trendit
       trending: Trendaus
+    username_blocks:
+      add_new: Lisää uusi
+      block_registrations: Estä rekisteröitymiset
+      comparison:
+        contains: Sisältää
+        equals: Vastaa
+      contains_html: Sisältää merkkijonon %{string}
+      created_msg: Käyttäjänimisääntö luotiin onnistuneesti
+      delete: Poista
+      edit:
+        title: Muokkaa käyttäjänimisääntöä
+      matches_exactly_html: Vastaa merkkijonoa %{string}
+      new:
+        create: Luo sääntö
+        title: Luo uusi käyttäjänimisääntö
+      no_username_block_selected: Käyttäjänimisääntöjä ei muutettu, koska yhtään ei ollut valittuna
+      not_permitted: Ei sallittu
+      title: Käyttäjänimisäännöt
+      updated_msg: Käyttäjänimisääntö päivitettiin onnistuneesti
     warning_presets:
       add_new: Lisää uusi
       delete: Poista
@@ -1347,6 +1378,10 @@ fi:
     basic_information: Perustiedot
     hint_html: "<strong>Mukauta, mitä ihmiset näkevät julkisessa profiilissasi ja julkaisujesi vieressä.</strong> Sinua seurataan takaisin ja kanssasi ollaan vuorovaikutuksessa todennäköisemmin, kun sinulla on täytetty profiili ja profiilikuva."
     other: Muut
+  emoji_styles:
+    auto: Automaattinen
+    native: Natiivi
+    twemoji: Twemoji
   errors:
     '400': Lähettämäsi pyyntö oli virheellinen tai muotoiltu virheellisesti.
     '403': Sinulla ei ole oikeutta nähdä tätä sivua.
@@ -1556,6 +1591,13 @@ fi:
       expires_at: Vanhenee
       uses: Käyttökertoja
     title: Kutsu käyttäjiä
+  link_preview:
+    author_html: Tehnyt %{name}
+    potentially_sensitive_content:
+      action: Näytä napsauttamalla
+      confirm_visit: Haluatko varmasti avata tämän linkin?
+      hide_button: Piilota
+      label: Mahdollisesti arkaluonteista sisältöä
   lists:
     errors:
       limit: Sinulla on enimmäismäärä listoja
@@ -1656,6 +1698,10 @@ fi:
       title: Uusi maininta
     poll:
       subject: Äänestys käyttäjältä %{name} on päättynyt
+    quote:
+      body: "%{name} lainasi julkaisuasi:"
+      subject: "%{name} lainasi julkaisuasi"
+      title: Uusi lainaus
     reblog:
       body: "%{name} tehosti julkaisuasi:"
       subject: "%{name} tehosti julkaisuasi"
@@ -1704,9 +1750,12 @@ fi:
       self_vote: Et voi äänestää omissa äänestyksissäsi
       too_few_options: on oltava useampi kuin yksi
       too_many_options: ei voi sisältää enempää kuin %{max} kohdetta
+    vote: Äänestä
+  posting_defaults:
+    explanation: Näitä asetuksia käytetään oletuksina, kun luot uusia julkaisuja, mutta voit muokata niitä julkaisukohtaisesti luontikentässä.
   preferences:
     other: Muut
-    posting_defaults: Julkaisun oletusasetukset
+    posting_defaults: Julkaisun oletukset
     public_timelines: Julkiset aikajanat
   privacy:
     hint_html: "<strong>Määritä, kuinka haluat profiilisi ja julkaisujesi löytyvän.</strong> Mastodonissa on monia ominaisuuksia, joiden käyttöönotto voi auttaa sinua tavoittamaan laajemman yleisön. Käytä hetki tarkistaaksesi, sopivatko nämä asetukset käyttöösi."
@@ -1859,6 +1908,9 @@ fi:
         other: "%{count} videota"
     boosted_from_html: Tehosti lähteestä %{acct_link}
     content_warning: 'Sisältövaroitus: %{warning}'
+    content_warnings:
+      hide: Piilota julkaisu
+      show: Näytä lisää
     default_language: Sama kuin käyttöliittymän kieli
     disallowed_hashtags:
       one: 'sisälsi kielletyn aihetunnisteen: %{tags}'
@@ -1866,6 +1918,7 @@ fi:
     edited_at_html: Muokattu %{date}
     errors:
       in_reply_not_found: Julkaisua, johon yrität vastata, ei näytä olevan olemassa.
+      quoted_status_not_found: Julkaisua, jota yrität lainata, ei näytä olevan olemassa.
     over_character_limit: merkkimäärän rajoitus %{max} ylitetty
     pin_errors:
       direct: Vain mainituille käyttäjille näkyviä julkaisuja ei voi kiinnittää
@@ -1873,18 +1926,17 @@ fi:
       ownership: Muiden julkaisuja ei voi kiinnittää
       reblog: Tehostusta ei voi kiinnittää
     quote_policies:
-      followers: Seuraajat ja mainitut käyttäjät
-      nobody: Vain mainitut käyttäjät
-      public: Kaikki
+      followers: Vain seuraajat
+      nobody: Vain minä
+      public: Kuka tahansa
     title: "%{name}: ”%{quote}”"
     visibilities:
-      direct: Suoraan
+      direct: Yksityismaininta
       private: Vain seuraajat
-      private_long: Näytä vain seuraajille
       public: Julkinen
-      public_long: Kaikki voivat nähdä
-      unlisted: Listaamaton
-      unlisted_long: Kaikki voivat nähdä, mutta ei näytetä julkisilla aikajanoilla
+      public_long: Kuka tahansa Mastodonissa ja sen ulkopuolella
+      unlisted: Vaivihkaa julkinen
+      unlisted_long: Piilotettu Mastodonin hakutuloksista, trendeistä ja julkisilta aikajanoilta
   statuses_cleanup:
     enabled: Poista vanhat julkaisut automaattisesti
     enabled_hint: Poistaa julkaisusi automaattisesti, kun ne saavuttavat valitun ikäkynnyksen, ellei jokin alla olevista poikkeuksista tule kyseeseen
diff --git a/config/locales/fo.yml b/config/locales/fo.yml
index 05427192526..22ec7bbf25d 100644
--- a/config/locales/fo.yml
+++ b/config/locales/fo.yml
@@ -190,6 +190,7 @@ fo:
         create_relay: Stovna reiðlag
         create_unavailable_domain: Stovna navnaøki, sum ikki er tøkt
         create_user_role: Stovna leiklut
+        create_username_block: Stovna brúkaranavnsreglu
         demote_user: Lækka brúkara í tign
         destroy_announcement: Strika kunngerð
         destroy_canonical_email_block: Strika t-postablokk
@@ -203,6 +204,7 @@ fo:
         destroy_status: Strika post
         destroy_unavailable_domain: Strika navnaøki, sum ikki er tøkt
         destroy_user_role: Bein burtur leiklut
+        destroy_username_block: Strika brúkaranavnsreglu
         disable_2fa_user: Ger 2FA óvirkið
         disable_custom_emoji: Ger serligt kenslutekn óvirkið
         disable_relay: Ger reiðlag óvirkið
@@ -237,6 +239,7 @@ fo:
         update_report: Dagfør frágreiðing
         update_status: Dagfør Uppslag
         update_user_role: Dagfør Leiklut
+        update_username_block: Dagfør brúkaranavnsreglu
       actions:
         approve_appeal_html: "%{name} góðkendi umsjónaráheitan frá %{target}"
         approve_user_html: "%{name} góðtók umsókn frá %{target}"
@@ -255,6 +258,7 @@ fo:
         create_relay_html: "%{name} gjørdi eitt reiðlag %{target}"
         create_unavailable_domain_html: "%{name} steðgaði veiting til navnaøkið %{target}"
         create_user_role_html: "%{name} stovnaði %{target} leiklutin"
+        create_username_block_html: "%{name} legði reglu afturat fyri brúkaranøvn, sum innihalda %{target}"
         demote_user_html: "%{name} lækkaði tignina hjá brúkaranum %{target}"
         destroy_announcement_html: "%{name} strikaðar fráboðanir %{target}"
         destroy_canonical_email_block_html: "%{name} strikaði blokeringina av teldupostin við hashkodu %{target}"
@@ -268,6 +272,7 @@ fo:
         destroy_status_html: "%{name} slettaði upplegg hjá %{target}"
         destroy_unavailable_domain_html: "%{name} tók upp aftir veiting til navnaøkið %{target}"
         destroy_user_role_html: "%{name} slettaði leiklutin hjá %{target}"
+        destroy_username_block_html: "%{name} strikaði reglu fyri brúkaranøvn, sum innihalda %{target}"
         disable_2fa_user_html: "%{name} slepti kravið um váttan í tveimum stigum fyri brúkaran %{target}"
         disable_custom_emoji_html: "%{name} gjørdi kensluteknið %{target} óvirkið"
         disable_relay_html: "%{name} gjørdi reiðlagið %{target} óvirkið"
@@ -302,6 +307,7 @@ fo:
         update_report_html: "%{name} dagførdi meldingina %{target}"
         update_status_html: "%{name} dagførdi postin hjá %{target}"
         update_user_role_html: "%{name} broyttir %{target} leiklutir"
+        update_username_block_html: "%{name} dagførdi reglu fyri brúkaranøvn, sum innihalda %{target}"
       deleted_account: strikað konta
       empty: Eingir loggar funnir.
       filter_by_action: Filtrera eftir atgerð
@@ -842,6 +848,10 @@ fo:
         all: Til øll
         disabled: Til ongan
         users: Fyri lokalum brúkarum, sum eru ritaðir inn
+      feed_access:
+        modes:
+          authenticated: Einans váttaðir brúkarar
+          public: Øll
       registrations:
         moderation_recommandation: Vinarliga tryggja tær, at tú hevur eitt nøktandi og klárt umsjónartoymi, áðreen tú letur upp fyri skrásetingum frá øllum!
         preamble: Stýr, hvør kann stovna eina kontu á tínum ambætara.
@@ -1085,6 +1095,25 @@ fo:
           other: Brúkt av %{count} brúkarum seinastu vikuna
       title: Tilmæli & rák
       trending: Vælumtókt
+    username_blocks:
+      add_new: Legg afturat
+      block_registrations: Blokera skrásetingar
+      comparison:
+        contains: Inniheldur
+        equals: Er tað sama sum
+      contains_html: Inniheldur %{string}
+      created_msg: Eydnaðist at leggja brúkaranavnsreglu afturat
+      delete: Strika
+      edit:
+        title: Broyt brúkaranavnsreglu
+      matches_exactly_html: Tað sama sum %{string}
+      new:
+        create: Stovna reglu
+        title: Stovna brúkaranavnsreglu
+      no_username_block_selected: Ongar brúkaranavnsreglur vóru broyttar, tí ongar vóru valdar
+      not_permitted: Ikki loyvt
+      title: Brúkaranavnsreglur
+      updated_msg: Eydnaðist at dagføra brúkaranavnsreglu
     warning_presets:
       add_new: Legg afturat
       delete: Strika
@@ -1349,6 +1378,10 @@ 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
+  emoji_styles:
+    auto: Sjálvvirkandi
+    native: Upprunalig
+    twemoji: Twitter kenslutekn
   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.
@@ -1558,6 +1591,13 @@ fo:
       expires_at: Rennir út
       uses: Brúk
     title: Bjóða fólki
+  link_preview:
+    author_html: Av %{name}
+    potentially_sensitive_content:
+      action: Klikka fyri at vísa
+      confirm_visit: Er tú vís/ur í, at tú vil lata hetta leinkið upp?
+      hide_button: Fjal
+      label: Tilfar, sum møguliga er viðkvæmt
   lists:
     errors:
       limit: Tú hevur rokkið mesta talið av listum
@@ -1658,6 +1698,10 @@ fo:
       title: Nýggj umrøða
     poll:
       subject: Ein spurnarkanning hjá %{name} er endað
+    quote:
+      body: 'Postur tín var siteraður av %{name}:'
+      subject: "%{name} siteraði postin hjá tær"
+      title: Nýggj sitering
     reblog:
       body: 'Postur tín var stimbraður av %{name}:'
       subject: "%{name} stimbraði tín post"
@@ -1706,6 +1750,9 @@ fo:
       self_vote: Tú kanst ikki atkvøða í tínum egnum atkvøðugreiðslum
       too_few_options: má hava meiri enn ein valmøguleika
       too_many_options: kann ikki innihalda fleiri enn %{max} valmøguleikar
+    vote: Atkvøð
+  posting_defaults:
+    explanation: Hesar stillingar verða brúktar sum sjálvval tá stovnar nýggjar postar, men tú kanst rætta tær fyri hvønn post í rættiøkinum.
   preferences:
     other: Annað
     posting_defaults: Postingarstillingar
@@ -1868,6 +1915,7 @@ fo:
     edited_at_html: Rættað %{date}
     errors:
       in_reply_not_found: Posturin, sum tú roynir at svara, sýnist ikki at finnast.
+      quoted_status_not_found: Posturin, sum tú roynir at sitera, sýnist ikki at finnast.
     over_character_limit: mesta tal av teknum, %{max}, rokkið
     pin_errors:
       direct: Postar, sum einans eru sjónligir hjá nevndum brúkarum, kunnu ikki festast
@@ -1875,18 +1923,17 @@ fo:
       ownership: Postar hjá øðrum kunnu ikki festast
       reblog: Ein stimbran kann ikki festast
     quote_policies:
-      followers: Fylgjarar og nevndir brúkarar
-      nobody: Bara nevndir brúkarar
-      public: Øll
+      followers: Einans fylgjarar
+      nobody: Bara eg
+      public: Ein og hvør
     title: '%{name}: "%{quote}"'
     visibilities:
-      direct: Beinleiðis
+      direct: Privat umrøða
       private: Einans fylgjarar
-      private_long: Vís einans fyri fylgjarum
       public: Alment
-      public_long: Øll kunnu síggja
-      unlisted: Ólistað
-      unlisted_long: Øll kunnu síggja, men ikki listað á almennum tíðarlinjum
+      public_long: Øll í og uttanfyri Mastodon
+      unlisted: Stillur almenningur
+      unlisted_long: Fjalt frá leitiúrslitum, rákum og almennum tíðarlinjum í Mastodon
   statuses_cleanup:
     enabled: Strika gamlar postar sjálvvirkandi
     enabled_hint: Strikar postar tínar sjálvvirkandi, tá teir verða eldri enn eitt vist, uttan so at teir samsvara við eitt av undantøkunum niðanfyri
@@ -1931,6 +1978,11 @@ fo:
     does_not_match_previous_name: samsvarar ikki við undanfarna navnið
   terms_of_service:
     title: Tænastutreytir
+  terms_of_service_interstitial:
+    future_preamble_html: Vit gera broytingar í tænastutreytunum, sum fáa virknað frá <strong>%{date}</strong>. Vit eggja tær til at eftirkanna dagførdu treytirnar.
+    past_preamble_html: Vit hava broytt tænastutreytirnar síðani tú seinast vitjaði. Vit eggja tær til at eftirkanna dagførdu treytirnar.
+    review_link: Eftirkanna tænastutreytir
+    title: Tænastutreytirnar á %{domain} verða broyttar
   themes:
     contrast: Mastodon (høgur kontrastur)
     default: Mastodon (myrkt)
diff --git a/config/locales/fr-CA.yml b/config/locales/fr-CA.yml
index 35f74331467..21bc5589837 100644
--- a/config/locales/fr-CA.yml
+++ b/config/locales/fr-CA.yml
@@ -319,6 +319,7 @@ fr-CA:
         create: Créer une annonce
         title: Nouvelle annonce
       preview:
+        disclaimer: Étant donné que les utilisateurs ne peuvent pas s'en retirer, les notifications par courriel devraient être limitées à des annonces importantes telles que des violations de données personnelles ou des notifications de fermeture de serveur.
         explanation_html: 'L''e-mail sera envoyé à <strong>%{display_count} utilisateurs</strong>. Le texte suivant sera inclus :'
         title: Aperçu de la notification d'annonce
       publish: Publier
@@ -493,11 +494,14 @@ fr-CA:
         providers: Fournisseur
         registrations:
           confirm: Confirmer
+          description: Vous avez reçu une souscription d'un FSAF. Rejetez-la si vous ne l'avez pas initiée. Si c'est bien votre intention, comparez le nom et l'empreinte de la clé avant de confirmer la souscription.
           reject: Rejeter
+          title: Confirmer la souscription au FSAF
         save: Enregistrer
         select_capabilities: Sélectionnez les Capacités
         sign_in: Se connecter
         status: État
+        title: Fournisseurs de Services Auxiliaire du Fedivers
     follow_recommendations:
       description_html: "<strong>Les recommandations d'abonnement aident les nouvelles personnes à trouver rapidement du contenu intéressant</strong>. Si un·e utilisateur·rice n'a pas assez interagi avec les autres pour avoir des recommandations personnalisées, ces comptes sont alors recommandés. La sélection est mise à jour quotidiennement depuis un mélange de comptes ayant le plus d'interactions récentes et le plus grand nombre d'abonné·e·s locaux pour une langue donnée."
       language: Pour la langue
@@ -567,7 +571,7 @@ fr-CA:
         limited: Limité
         title: Modération
       moderation_notes:
-        title: Notes d'arbitrage
+        title: Notes de modération
       private_comment: Commentaire privé
       public_comment: Commentaire public
       purge: Purge
@@ -1850,13 +1854,7 @@ fr-CA:
       reblog: Un partage ne peut pas être épinglé
     title: "%{name} : « %{quote} »"
     visibilities:
-      direct: Direct
-      private: Abonné⋅e⋅s uniquement
-      private_long: Afficher seulement à vos vos abonné·e·s
       public: Publique
-      public_long: Tout le monde peut voir vos messages
-      unlisted: Public sans être affiché sur le fil public
-      unlisted_long: Tout le monde peut voir vos messages mais ils ne seront pas listés sur les fils publics
   statuses_cleanup:
     enabled: Supprimer automatiquement vos anciens messages
     enabled_hint: Supprime automatiquement vos messages une fois qu'ils ont atteint un seuil d'ancienneté défini, à moins qu'ils ne correspondent à l'une des exceptions ci-dessous
@@ -1901,6 +1899,8 @@ fr-CA:
     does_not_match_previous_name: ne correspond pas au nom précédent
   terms_of_service:
     title: Conditions d'utilisation
+  terms_of_service_interstitial:
+    title: Les conditions d'utilisation de %{domain} ont changées
   themes:
     contrast: Mastodon (Contraste élevé)
     default: Mastodon (Sombre)
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index c3af77f1ea3..36244422330 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -319,6 +319,7 @@ fr:
         create: Créer une annonce
         title: Nouvelle annonce
       preview:
+        disclaimer: Étant donné que les utilisateurs ne peuvent pas s'en retirer, les notifications par courriel devraient être limitées à des annonces importantes telles que des violations de données personnelles ou des notifications de fermeture de serveur.
         explanation_html: 'L''e-mail sera envoyé à <strong>%{display_count} utilisateurs</strong>. Le texte suivant sera inclus :'
         title: Aperçu de la notification d'annonce
       publish: Publier
@@ -493,11 +494,14 @@ fr:
         providers: Fournisseur
         registrations:
           confirm: Confirmer
+          description: Vous avez reçu une souscription d'un FSAF. Rejetez-la si vous ne l'avez pas initiée. Si c'est bien votre intention, comparez le nom et l'empreinte de la clé avant de confirmer la souscription.
           reject: Rejeter
+          title: Confirmer la souscription au FSAF
         save: Enregistrer
         select_capabilities: Sélectionnez les Capacités
         sign_in: Se connecter
         status: État
+        title: Fournisseurs de Services Auxiliaire du Fedivers
     follow_recommendations:
       description_html: "<strong>Les recommandations d'abonnement aident les nouvelles personnes à trouver rapidement du contenu intéressant</strong>. Si un·e utilisateur·rice n'a pas assez interagi avec les autres pour avoir des recommandations personnalisées, ces comptes sont alors recommandés. La sélection est mise à jour quotidiennement depuis un mélange de comptes ayant le plus d'interactions récentes et le plus grand nombre d'abonné·e·s locaux pour une langue donnée."
       language: Pour la langue
@@ -567,7 +571,7 @@ fr:
         limited: Limité
         title: Modération
       moderation_notes:
-        title: Notes d'arbitrage
+        title: Notes de modération
       private_comment: Commentaire privé
       public_comment: Commentaire public
       purge: Purge
@@ -1850,13 +1854,7 @@ fr:
       reblog: Un partage ne peut pas être épinglé
     title: "%{name} : « %{quote} »"
     visibilities:
-      direct: Direct
-      private: Abonné⋅e⋅s uniquement
-      private_long: Afficher seulement à vos vos abonné·e·s
       public: Publique
-      public_long: Tout le monde peut voir vos messages
-      unlisted: Public sans être affiché sur le fil public
-      unlisted_long: Tout le monde peut voir vos messages mais ils ne seront pas listés sur les fils publics
   statuses_cleanup:
     enabled: Supprimer automatiquement vos anciens messages
     enabled_hint: Supprime automatiquement vos messages une fois qu'ils ont atteint un seuil d'ancienneté défini, à moins qu'ils ne correspondent à l'une des exceptions ci-dessous
@@ -1901,6 +1899,8 @@ fr:
     does_not_match_previous_name: ne correspond pas au nom précédent
   terms_of_service:
     title: Conditions d'utilisation
+  terms_of_service_interstitial:
+    title: Les conditions d'utilisation de %{domain} ont changées
   themes:
     contrast: Mastodon (Contraste élevé)
     default: Mastodon (Sombre)
diff --git a/config/locales/fy.yml b/config/locales/fy.yml
index 561b50079bc..c631241a319 100644
--- a/config/locales/fy.yml
+++ b/config/locales/fy.yml
@@ -190,6 +190,7 @@ fy:
         create_relay: Relay oanmeitsje
         create_unavailable_domain: Net beskikber domein oanmeitsje
         create_user_role: Rol oanmeitsje
+        create_username_block: Brûkersnammeregel oanmeitsje
         demote_user: Brûker degradearje
         destroy_announcement: Meidieling fuortsmite
         destroy_canonical_email_block: E-mailblokkade fuortsmite
@@ -203,6 +204,7 @@ fy:
         destroy_status: Toot fuortsmite
         destroy_unavailable_domain: Net beskikber domein fuortsmite
         destroy_user_role: Rol permanint fuortsmite
+        destroy_username_block: Brûkersnammeregel fuortsmite
         disable_2fa_user: Twa-stapsferifikaasje útskeakelje
         disable_custom_emoji: Lokale emoji útskeakelje
         disable_relay: Relay útskeakelje
@@ -237,6 +239,7 @@ fy:
         update_report: Rapportaazje bywurkje
         update_status: Berjocht bywurkje
         update_user_role: Rol bywurkje
+        update_username_block: Brûkersnammeregel bywurkje
       actions:
         approve_appeal_html: "%{name} hat it beswier tsjin de moderaasjemaatregel fan %{target} goedkard"
         approve_user_html: "%{name} hat de registraasje fan %{target} goedkard"
@@ -255,6 +258,7 @@ fy:
         create_relay_html: "%{name} hat in relay oanmakke %{target}"
         create_unavailable_domain_html: "%{name} hat de besoarging foar domein %{target} beëinige"
         create_user_role_html: "%{name} hat de rol %{target} oanmakke"
+        create_username_block_html: "%{name} hat in brûkersnammeregel mei %{target} tafoege"
         demote_user_html: Brûker %{target} is troch %{name} degradearre
         destroy_announcement_html: "%{name} hat de meidieling %{target} fuortsmiten"
         destroy_canonical_email_block_html: "%{name} hat it e-mailberjocht mei de hash %{target} deblokkearre"
@@ -268,6 +272,7 @@ fy:
         destroy_status_html: Berjocht fan %{target} is troch %{name} fuortsmiten
         destroy_unavailable_domain_html: "%{name} hat de besoarging foar domein %{target} opnij starte"
         destroy_user_role_html: "%{name} hat de rol %{target} fuortsmiten"
+        destroy_username_block_html: "%{name} hat in brûkersnammeregel mei %{target} fuortsmiten"
         disable_2fa_user_html: De fereaske twa-stapsferifikaasje foar %{target} is troch %{name} útskeakele
         disable_custom_emoji_html: Emoji %{target} is troch %{name} útskeakele
         disable_relay_html: "%{name} hat de relay %{target} útskeakele"
@@ -302,6 +307,7 @@ fy:
         update_report_html: Rapportaazje %{target} is troch %{name} bywurke
         update_status_html: "%{name} hat de berjochten %{target} bywurke"
         update_user_role_html: "%{name} hat de rol %{target} wizige"
+        update_username_block_html: "%{name} hat in brûkersnammeregel mei %{target} bywurke"
       deleted_account: fuortsmiten account
       empty: Gjin lochboeken fûn.
       filter_by_action: Op aksje filterje
@@ -578,6 +584,13 @@ fy:
         all: Alle
         limited: Beheind
         title: Moderaasje
+      moderation_notes:
+        create: Moderaasje-opmerking oanmeitsje
+        created_msg: Oanmeitsjen fan servermoderaasje-opmerking slagge!
+        description_html: Opmerkingen besjen en foar josele en oare moderatoaren efterlitte
+        destroyed_msg: Fuortsmiten fan servermoderaasje-opmerking slagge!
+        placeholder: Ynformaasje oer dizze server, nommen aksjes of wat oars dy’t jo helpe kinne om dizze server yn de takomst te moderearjen.
+        title: Moderaasje-opmerkingen
       private_comment: Priveeopmerking
       public_comment: Iepenbiere opmerking
       purge: Folslein fuortsmite
@@ -1078,6 +1091,25 @@ fy:
           other: Dizze wike troch %{count} persoanen brûkt
       title: Oanrekommandaasjes & trends
       trending: Trending
+    username_blocks:
+      add_new: Nije tafoegje
+      block_registrations: Registraasjes blokkearje
+      comparison:
+        contains: Befettet
+        equals: Is lyk oan
+      contains_html: Befettet %{string}
+      created_msg: Brûkersnammeregel mei sukses oanmakke
+      delete: Fuortsmite
+      edit:
+        title: Brûkersnammeregel bywurkje
+      matches_exactly_html: Is lyk oan %{string}
+      new:
+        create: Regel oanmeitsje
+        title: Brûkersnammeregel oanmeitsje
+      no_username_block_selected: Der binne gjin brûkersnammeregels wizige, omdat der gjin ien selektearre waard
+      not_permitted: Net tastien
+      title: Brûkersnammeregels
+      updated_msg: Brûkersnammeregel mei sukses bywurke
     warning_presets:
       add_new: Nije tafoegje
       delete: Fuortsmite
@@ -1342,6 +1374,10 @@ 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
+  emoji_styles:
+    auto: Automatysk
+    native: Systeemeigen
+    twemoji: Twemoji
   errors:
     '400': De oanfraach dy’t jo yntsjinne hawwe wie ûnjildich of fout.
     '403': Jo hawwe gjin tastimming om dizze side te besjen.
@@ -1861,25 +1897,16 @@ fy:
     edited_at_html: Bewurke op %{date}
     errors:
       in_reply_not_found: It berjocht wêrop jo probearje te reagearjen liket net te bestean.
+      quoted_status_not_found: It berjocht dy’t jo probearje te sitearjen liket net te bestean.
     over_character_limit: Oer de limyt fan %{max} tekens
     pin_errors:
       direct: Berjochten dy’t allinnich sichtber binne foar fermelde brûkers kinne net fêstset wurde
       limit: Jo hawwe it maksimaal tal berjochten al fêstmakke
       ownership: In berjocht fan in oar kin net fêstmakke wurde
       reblog: In boost kin net fêstset wurde
-    quote_policies:
-      followers: Folgers en fermelde brûkers
-      nobody: Allinnich fermelde brûkers
-      public: Elkenien
     title: '%{name}: "%{quote}"'
     visibilities:
-      direct: Direkt
-      private: Allinnich folgers
-      private_long: Allinnich oan jo folgers toane
       public: Iepenbier
-      public_long: Elkenien kin it sjen
-      unlisted: Minder iepenbier
-      unlisted_long: Elkenien kin it sjen, mar net op iepenbiere tiidlinen
   statuses_cleanup:
     enabled: Automatysk âlde berjochten fuortsmite
     enabled_hint: Smyt jo berjochten automatysk fuort sa gau as se in bepaalde leeftiidsgrins berikke, útsein se oerienkomme mei ien fan de ûndersteande útsûnderingen
diff --git a/config/locales/ga.yml b/config/locales/ga.yml
index a38a3cfc7a2..901a3a3940a 100644
--- a/config/locales/ga.yml
+++ b/config/locales/ga.yml
@@ -199,6 +199,7 @@ ga:
         create_relay: Cruthaigh Leaschraolacháin
         create_unavailable_domain: Cruthaigh Fearann ​​Gan Fáil
         create_user_role: Cruthaigh Ról
+        create_username_block: Cruthaigh Riail Ainm Úsáideora
         demote_user: Ísligh úsáideoir
         destroy_announcement: Scrios Fógra
         destroy_canonical_email_block: Scrios Bloc Ríomhphoist
@@ -212,6 +213,7 @@ ga:
         destroy_status: Scrios Postáil
         destroy_unavailable_domain: Scrios Fearann ​​Gan Fáil
         destroy_user_role: Scrios ról
+        destroy_username_block: Scrios an Riail Ainm Úsáideora
         disable_2fa_user: Díchumasaigh 2FA
         disable_custom_emoji: Díchumasaigh Emoji Saincheaptha
         disable_relay: Díchumasaigh Leaschraolacháin
@@ -246,6 +248,7 @@ ga:
         update_report: Tuairisc Nuashonraithe
         update_status: Nuashonraigh Postáil
         update_user_role: Nuashonraigh Ról
+        update_username_block: Nuashonraigh an Riail Ainm Úsáideora
       actions:
         approve_appeal_html: Cheadaigh %{name} achomharc ar chinneadh modhnóireachta ó %{target}
         approve_user_html: Cheadaigh %{name} clárú ó %{target}
@@ -264,6 +267,7 @@ ga:
         create_relay_html: Chruthaigh %{name} athsheoladh %{target}
         create_unavailable_domain_html: Chuir %{name} deireadh leis an seachadadh chuig fearann ​​%{target}
         create_user_role_html: Chruthaigh %{name} %{target} ról
+        create_username_block_html: Chuir %{name} riail leis d'ainmneacha úsáideora ina bhfuil %{target}
         demote_user_html: "%{name} úsáideoir scriosta %{target}"
         destroy_announcement_html: "%{name} fógra scriosta %{target}"
         destroy_canonical_email_block_html: "%{name} ríomhphost díchoiscthe leis an hash %{target}"
@@ -277,6 +281,7 @@ ga:
         destroy_status_html: Bhain %{name} postáil le %{target}
         destroy_unavailable_domain_html: D'athchrom %{name} ar an seachadadh chuig fearann ​​%{target}
         destroy_user_role_html: Scrios %{name} ról %{target}
+        destroy_username_block_html: Bhain %{name} riail as ainmneacha úsáideora ina bhfuil %{target}
         disable_2fa_user_html: Dhíchumasaigh %{name} riachtanas dhá fhachtóir don úsáideoir %{target}
         disable_custom_emoji_html: Dhíchumasaigh %{name} emoji %{target}
         disable_relay_html: Dhíchumasaigh %{name} an athsheoladh %{target}
@@ -311,6 +316,7 @@ ga:
         update_report_html: "%{name} tuairisc nuashonraithe %{target}"
         update_status_html: "%{name} postáil nuashonraithe faoi %{target}"
         update_user_role_html: D'athraigh %{name} ról %{target}
+        update_username_block_html: Nuashonraíodh riail %{name} le haghaidh ainmneacha úsáideora ina bhfuil %{target}
       deleted_account: cuntas scriosta
       empty: Níor aimsíodh aon logaí.
       filter_by_action: Scag de réir gnímh
@@ -884,6 +890,10 @@ ga:
         all: Do chách
         disabled: Do dhuine ar bith
         users: Chun úsáideoirí áitiúla logáilte isteach
+      feed_access:
+        modes:
+          authenticated: Úsáideoirí fíordheimhnithe amháin
+          public: Gach duine
       registrations:
         moderation_recommandation: Cinntigh le do thoil go bhfuil foireann mhodhnóireachta imoibríoch leordhóthanach agat sula n-osclaíonn tú clárúcháin do gach duine!
         preamble: Rialú cé atá in ann cuntas a chruthú ar do fhreastalaí.
@@ -1139,6 +1149,25 @@ ga:
           two: Úsáidte ag %{count} duine le seachtain anuas
       title: Moltaí & Treochtaí
       trending: Treocht
+    username_blocks:
+      add_new: Cuir nua leis
+      block_registrations: Clárúcháin blocála
+      comparison:
+        contains: Ina bhfuil
+        equals: Cothrom le
+      contains_html: Tá %{string} ann
+      created_msg: Cruthaíodh riail ainm úsáideora go rathúil
+      delete: Scrios
+      edit:
+        title: Cuir riail ainm úsáideora in eagar
+      matches_exactly_html: Cothrom le %{string}
+      new:
+        create: Cruthaigh riail
+        title: Cruthaigh riail ainm úsáideora nua
+      no_username_block_selected: Níor athraíodh aon rialacha ainm úsáideora mar nár roghnaíodh aon cheann acu
+      not_permitted: Ní cheadaítear
+      title: Rialacha ainm úsáideora
+      updated_msg: Nuashonraíodh an riail ainm úsáideora go rathúil
     warning_presets:
       add_new: Cuir nua leis
       delete: Scrios
@@ -1220,9 +1249,9 @@ ga:
     confirmation_dialogs: Dialóga deimhnithe
     discovery: Fionnachtain
     localization:
-      body: Aistríonn oibrithe deonacha Mastodon.
+      body: Oibrithe deonacha a dhéanann aistriúchán Mastodon.
       guide_link: https://crowdin.com/project/mastodon
-      guide_link_text: Is féidir le gach duine rannchuidiú.
+      guide_link_text: Is féidir le gach duine cur leis.
     sensitive_content: Ábhar íogair
   application_mailer:
     notification_preferences: Athraigh roghanna ríomhphoist
@@ -1406,6 +1435,10 @@ ga:
     basic_information: Eolas bunúsach
     hint_html: "<strong>Saincheap a bhfeiceann daoine ar do phróifíl phoiblí agus in aice le do phostálacha.</strong> Is dóichí go leanfaidh daoine eile ar ais tú agus go n-idirghníomhóidh siad leat nuair a bhíonn próifíl líonta agus pictiúr próifíle agat."
     other: Eile
+  emoji_styles:
+    auto: Uath
+    native: Dúchasach
+    twemoji: Twemoji
   errors:
     '400': Bhí an t-iarratas a chuir tú isteach neamhbhailí nó míchumtha.
     '403': Níl cead agat an leathanach seo a fheiceáil.
@@ -1675,6 +1708,13 @@ ga:
       expires_at: In éag
       uses: Úsáidí
     title: Tabhair cuireadh do dhaoine
+  link_preview:
+    author_html: Le %{name}
+    potentially_sensitive_content:
+      action: Cliceáil chun a thaispeáint
+      confirm_visit: An bhfuil tú cinnte gur mian leat an nasc seo a oscailt?
+      hide_button: Folaigh
+      label: Ábhar a d'fhéadfadh a bheith íogair
   lists:
     errors:
       limit: Tá uaslíon na liostaí sroichte agat
@@ -1775,6 +1815,10 @@ ga:
       title: Lua nua
     poll:
       subject: Tháinig deireadh le vótaíocht le %{name}
+    quote:
+      body: 'Luaigh %{name} do phost:'
+      subject: Luaigh %{name} do phost
+      title: Luachan nua
     reblog:
       body: 'Treisíodh do phostáil le %{name}:'
       subject: Mhol %{name} do phostáil
@@ -1823,6 +1867,9 @@ ga:
       self_vote: Ní féidir leat vótáil i do phobalbhreith féin
       too_few_options: caithfidh níos mó ná mír amháin a bheith ann
       too_many_options: ní féidir níos mó ná %{max} mír a bheith ann
+    vote: Vótaigh
+  posting_defaults:
+    explanation: Úsáidfear na socruithe seo mar réamhshocruithe nuair a chruthaíonn tú poist nua, ach is féidir leat iad a chur in eagar in aghaidh an phoist laistigh den chumadóir.
   preferences:
     other: Eile
     posting_defaults: Réamhshocruithe á bpostáil
@@ -1987,6 +2034,9 @@ ga:
         two: "%{count} físeáin"
     boosted_from_html: Molta ó %{acct_link}
     content_warning: 'Rabhadh ábhair: %{warning}'
+    content_warnings:
+      hide: Folaigh an post
+      show: Taispeáin níos mó
     default_language: Mar an gcéanna le teanga an chomhéadain
     disallowed_hashtags:
       few: 'bhí na Haischlib dícheadaithe: %{tags}'
@@ -1997,6 +2047,7 @@ ga:
     edited_at_html: "%{date} curtha in eagar"
     errors:
       in_reply_not_found: Is cosúil nach ann don phostáil a bhfuil tú ag iarraidh freagra a thabhairt air.
+      quoted_status_not_found: Is cosúil nach bhfuil an post atá tú ag iarraidh a lua ann.
     over_character_limit: teorainn carachtar %{max} sáraithe
     pin_errors:
       direct: Ní féidir postálacha nach bhfuil le feiceáil ach ag úsáideoirí luaite a phinnáil
@@ -2004,18 +2055,17 @@ ga:
       ownership: Ní féidir postáil duine éigin eile a phionnáil
       reblog: Ní féidir treisiú a phinnáil
     quote_policies:
-      followers: Leantóirí agus úsáideoirí luaite
-      nobody: Úsáideoirí luaite amháin
-      public: Gach duine
+      followers: Leantóirí amháin
+      nobody: Mise amháin
+      public: Aon duine
     title: '%{name}: "%{quote}"'
     visibilities:
-      direct: Díreach
+      direct: Lua príobháideach
       private: Leantóirí amháin
-      private_long: Taispeáin do leantóirí amháin
       public: Poiblí
-      public_long: Is féidir le gach duine a fheiceáil
-      unlisted: Neamhliostaithe
-      unlisted_long: Is féidir le gach duine a fheiceáil, ach nach bhfuil liostaithe ar amlínte poiblí
+      public_long: Aon duine ar Mastodon agus lasmuigh de
+      unlisted: Pobal ciúin
+      unlisted_long: I bhfolach ó thorthaí cuardaigh Mastodon, treochtaí, agus amlínte poiblí
   statuses_cleanup:
     enabled: Scrios seanphostálacha go huathoibríoch
     enabled_hint: Scriostar do phostálacha go huathoibríoch nuair a shroicheann siad tairseach aoise sonraithe, ach amháin má thagann siad le ceann de na heisceachtaí thíos
diff --git a/config/locales/gd.yml b/config/locales/gd.yml
index f7791fe3544..0720cf964a2 100644
--- a/config/locales/gd.yml
+++ b/config/locales/gd.yml
@@ -196,6 +196,7 @@ gd:
         create_relay: Cruthaich ath-sheachadan
         create_unavailable_domain: Cruthaich àrainn nach eil ri fhaighinn
         create_user_role: Cruthaich dreuchd
+        create_username_block: Cruthaich riaghailt ainm-cleachdaiche
         demote_user: Ìslich an cleachdaiche
         destroy_announcement: Sguab às am brath-fios
         destroy_canonical_email_block: Sguab às bacadh a’ phuist-d
@@ -209,6 +210,7 @@ gd:
         destroy_status: Sguab às am post
         destroy_unavailable_domain: Sguab às àrainn nach eil ri fhaighinn
         destroy_user_role: Mill an dreuchd
+        destroy_username_block: Sguab às riaghailt ainm-cleachdaiche
         disable_2fa_user: Cuir an dearbhadh dà-cheumnach à comas
         disable_custom_emoji: Cuir an t-Emoji gnàthaichte à comas
         disable_relay: Cuir an t-ath-sheachadan à comas
@@ -243,6 +245,7 @@ gd:
         update_report: Ùraich an gearan
         update_status: Ùraich am post
         update_user_role: Ùraich an dreuchd
+        update_username_block: Ùraich riaghailt ainm-cleachdaiche
       actions:
         approve_appeal_html: Dh’aontaich %{name} ri ath-thagradh air co-dhùnadh na maorsainneachd o %{target}
         approve_user_html: Dh’aontaich %{name} ri clàradh o %{target}
@@ -261,6 +264,7 @@ gd:
         create_relay_html: Chruthaich %{name} an t-ath-sheachadan %{target}
         create_unavailable_domain_html: Sguir %{name} ris an lìbhrigeadh dhan àrainn %{target}
         create_user_role_html: Chruthaich %{name} an dreuchd %{target}
+        create_username_block_html: Chuir %{name} riaghailt ris airson ainmean-cleachdaidh sa bheil %{target}
         demote_user_html: Dh’ìslich %{name} an cleachdaiche %{target}
         destroy_announcement_html: Sguab %{name} às am brath-fios %{target}
         destroy_canonical_email_block_html: Dhì-bhac %{name} am post-d air a bheil an hais %{target}
@@ -274,6 +278,7 @@ gd:
         destroy_status_html: Thug %{name} post aig %{target} air falbh
         destroy_unavailable_domain_html: Lean %{name} air adhart leis an lìbhrigeadh dhan àrainn %{target}
         destroy_user_role_html: Sguab %{name} às an dreuchd %{target}
+        destroy_username_block_html: Thug %{name} an riaghailt airson ainmean-cleachdaidh sa bheil %{target} air falbh
         disable_2fa_user_html: Chuir %{name} riatanas an dearbhaidh dà-cheumnaich à comas dhan chleachdaiche %{target}
         disable_custom_emoji_html: Chuir %{name} an Emoji %{target} à comas
         disable_relay_html: Chuir %{name} an t-ath-sheachadan %{target} à comas
@@ -308,6 +313,7 @@ gd:
         update_report_html: Dh’ùraich %{name} an gearan %{target}
         update_status_html: Dh’ùraich %{name} post le %{target}
         update_user_role_html: Dh’atharraich %{name} an dreuchd %{target}
+        update_username_block_html: Dh’ùraich %{name} an riaghailt airson ainmean-cleachdaidh sa bheil %{target}
       deleted_account: chaidh an cunntas a sguabadh às
       empty: Cha deach loga a lorg.
       filter_by_action: Criathraich a-rèir gnìomha
@@ -1121,6 +1127,25 @@ gd:
           two: Chaidh a chleachdadh le %{count} rè na seachdain seo chaidh
       title: Molaidhean ⁊ treandaichean
       trending: A’ treandadh
+    username_blocks:
+      add_new: Cuir tè ùr ris
+      block_registrations: Bac clàradh
+      comparison:
+        contains: Anns a bheil
+        equals: Co-ionnan ri
+      contains_html: Anns a bheil %{string}
+      created_msg: Chaidh riaghailt ainm-cleachdaiche a chruthachadh
+      delete: Sguab às
+      edit:
+        title: Deasaich riaghailt ainm-cleachdaiche
+      matches_exactly_html: Co-ionnan ri %{string}
+      new:
+        create: Cruthaich riaghailt
+        title: Cruthaich riaghailt ainm-cleachdaiche ùr
+      no_username_block_selected: Cha deach riaghailt ainm-cleachdaiche sam bith atharrachadh o nach deach gin dhiubh a thaghadh
+      not_permitted: Chan eil seo ceadaichte
+      title: Riaghailtean ainm-chleachdaiche
+      updated_msg: Chaidh riaghailt ainm-cleachdaiche ùrachadh
     warning_presets:
       add_new: Cuir fear ùr ris
       delete: Sguab às
@@ -1387,6 +1412,10 @@ 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
+  emoji_styles:
+    auto: Fèin-obrachail
+    native: Tùsail
+    twemoji: Twemoji
   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.
@@ -1736,6 +1765,10 @@ gd:
       title: Iomradh ùr
     poll:
       subject: Thàinig cunntas-bheachd le %{name} gu crìoch
+    quote:
+      body: 'Chaidh post a luaidh le %{name}:'
+      subject: Luaidh %{name} am post agad
+      title: Luaidh ùr
     reblog:
       body: 'Chaidh am post agad a bhrosnachadh le %{name}:'
       subject: Bhrosnaich %{name} am post agad
@@ -1784,6 +1817,9 @@ gd:
       self_vote: Chan urrainn dhut bhòtadh sna chunntasan-bheachd agad fhèin
       too_few_options: "– feumaidh iomadh nì a bhith aige"
       too_many_options: "– chan fhaod còrr is %{max} nì a bhith ’na bhroinn"
+    vote: Bhòt
+  posting_defaults:
+    explanation: Thèid na roghainnean seo a chleachdadh nam bun-roghainnean nuair a chruthaicheas tu post ùr ach ’s urrainn dhut an deasachadh fhathast do gach post fa leth fhad ’s a bhios tu ri sgrìobhadh.
   preferences:
     other: Eile
     posting_defaults: Bun-roghainnean a’ phostaidh
@@ -1954,6 +1990,7 @@ gd:
     edited_at_html: Air a dheasachadh %{date}
     errors:
       in_reply_not_found: Tha coltas nach eil am post dhan a tha thu airson freagairt ann.
+      quoted_status_not_found: Tha coltas nach eil am post dhan a tha thu airson luaidh ann.
     over_character_limit: chaidh thu thar crìoch charactaran de %{max}
     pin_errors:
       direct: Chan urrainn dhut post a phrìneachadh nach fhaic ach na cleachdaichean le iomradh orra
@@ -1961,18 +1998,17 @@ gd:
       ownership: Chan urrainn dhut post càich a phrìneachadh
       reblog: Chan urrainn dhut brosnachadh a phrìneachadh
     quote_policies:
-      followers: Luchd-leantainn ’s cleachdaichean le iomradh orra
-      nobody: Cleachdaichean le iomradh orra a-mhàin
-      public: A h-uile duine
+      followers: Luchd-leantainn a-mhàin
+      nobody: Mi fhìn a-mhàin
+      public: Duine sam bith
     title: "%{name}: “%{quote}”"
     visibilities:
-      direct: Dìreach
+      direct: Iomradh prìobhaideach
       private: Luchd-leantainn a-mhàin
-      private_long: Na seall ach dhan luchd-leantainn
       public: Poblach
-      public_long: Chì a h-uile duine seo
-      unlisted: Falaichte o liostaichean
-      unlisted_long: Chì a h-uile duine seo ach cha nochd e air loidhnichean-ama poblach
+      public_long: Duine sam bith taobh a-staigh no a-muigh Mhastodon
+      unlisted: Poblach ach sàmhach
+      unlisted_long: Falaichte o na toraidhean-luirg, na treandaichean ’s na loichnichean-ama poblach
   statuses_cleanup:
     enabled: Sguab às seann-phostaichean gu fèin-obrachail
     enabled_hint: Sguabaidh seo às na seann-phostaichean agad gu fèin-obrachail nuair a ruigeas iad stairsneach aoise sònraichte ach ma fhreagras iad ri gin dhe na h-eisgeachdan gu h-ìosal
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index cfc72681a92..c6a852fd8ea 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -190,6 +190,7 @@ gl:
         create_relay: Crear Repetidor
         create_unavailable_domain: Crear dominio Non dispoñible
         create_user_role: Crear Rol
+        create_username_block: Crear regra para Identificadores
         demote_user: Degradar usuaria
         destroy_announcement: Eliminar anuncio
         destroy_canonical_email_block: Eliminar bloqueo do correo
@@ -203,6 +204,7 @@ gl:
         destroy_status: Eliminar publicación
         destroy_unavailable_domain: Eliminar dominio Non dispoñible
         destroy_user_role: Eliminar Rol
+        destroy_username_block: Eliminar regra para Identificadores
         disable_2fa_user: Desactivar 2FA
         disable_custom_emoji: Desactivar emoticona personalizada
         disable_relay: Desactivar Repetidor
@@ -237,6 +239,7 @@ gl:
         update_report: Actualización da denuncia
         update_status: Actualizar publicación
         update_user_role: Actualizar Rol
+        update_username_block: Actualizar regra para Identificadores
       actions:
         approve_appeal_html: "%{name} aprobou a apelación da decisión da moderación de %{target}"
         approve_user_html: "%{name} aprobou o rexistro de %{target}"
@@ -255,6 +258,7 @@ gl:
         create_relay_html: "%{name} creou un repetidor en %{target}"
         create_unavailable_domain_html: "%{name} deixou de interactuar co dominio %{target}"
         create_user_role_html: "%{name} creou o rol %{target}"
+        create_username_block_html: "%{name} engadiu unha regra para identificadores que contén %{target}"
         demote_user_html: "%{name} degradou a usuaria %{target}"
         destroy_announcement_html: "%{name} eliminou o anuncio %{target}"
         destroy_canonical_email_block_html: "%{name} desbloqueou o correo con suma de comprobación %{target}"
@@ -268,6 +272,7 @@ gl:
         destroy_status_html: "%{name} eliminou a publicación de %{target}"
         destroy_unavailable_domain_html: "%{name} retomou a interacción co dominio %{target}"
         destroy_user_role_html: "%{name} eliminou o rol %{target}"
+        destroy_username_block_html: "%{name} retirou unha regra para identificadores que contén %{target}"
         disable_2fa_user_html: "%{name} desactivou o requerimento do segundo factor para a usuaria %{target}"
         disable_custom_emoji_html: "%{name} desactivou o emoji %{target}"
         disable_relay_html: "%{name} desactivou o repetidor %{target}"
@@ -302,6 +307,7 @@ gl:
         update_report_html: "%{name} actualizou a denuncia %{target}"
         update_status_html: "%{name} actualizou a publicación de %{target}"
         update_user_role_html: "%{name} cambiou o rol %{target}"
+        update_username_block_html: "%{name} actualizou a regra para identificadores que contén %{target}"
       deleted_account: conta eliminada
       empty: Non se atoparon rexistros.
       filter_by_action: Filtrar por acción
@@ -842,6 +848,10 @@ gl:
         all: Para todos
         disabled: Para ninguén
         users: Para usuarias locais conectadas
+      feed_access:
+        modes:
+          authenticated: Só para usuarias con sesión iniciada
+          public: Para calquera
       registrations:
         moderation_recommandation: Por favor, pon interese en crear un equipo de moderación competente e reactivo antes de permitir que calquera poida crear unha conta!
         preamble: Xestiona quen pode crear unha conta no teu servidor.
@@ -1085,6 +1095,25 @@ gl:
           other: Utilizado por %{count} persoas na última semana
       title: Recomendacións e Suxestións
       trending: Popularidade
+    username_blocks:
+      add_new: Engadir nova
+      block_registrations: Bloqueo dos rexistros
+      comparison:
+        contains: Contén
+        equals: É igual a
+      contains_html: Contén %{string}
+      created_msg: Creouse correctamente a regra para identificadores
+      delete: Eliminar
+      edit:
+        title: Editar regra para identificadores
+      matches_exactly_html: É igual a %{string}
+      new:
+        create: Crear regra
+        title: Crear nova regra para identificadores
+      no_username_block_selected: Non se cambiou ningunha regra porque non se seleccionou ningunha
+      not_permitted: Non permitido
+      title: Regras para identificadores
+      updated_msg: Actualizouse correctamente a regra
     warning_presets:
       add_new: Engadir novo
       delete: Eliminar
@@ -1349,6 +1378,10 @@ 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
+  emoji_styles:
+    auto: Auto
+    native: Nativo
+    twemoji: Twemoji
   errors:
     '400': A solicitude que enviou non é válida ou ten formato incorrecto.
     '403': Non ten permiso para ver esta páxina.
@@ -1658,6 +1691,10 @@ gl:
       title: Nova mención
     poll:
       subject: A enquisa de %{name} rematou
+    quote:
+      body: 'A túa publicación foi citada por %{name}:'
+      subject: "%{name} citou a túa publicación"
+      title: Nova cita
     reblog:
       body: 'A túa publicación promovida por %{name}:'
       subject: "%{name} promoveu a túa publicación"
@@ -1706,6 +1743,9 @@ gl:
       self_vote: Non podes votar nas túas enquisas
       too_few_options: debe ter máis de unha opción
       too_many_options: non pode haber máis de %{max} opcións
+    vote: Votar
+  posting_defaults:
+    explanation: Estes axustes vanse usar como valores por defecto para as novas publicacións, pero podes axustalas de xeito individual na caixa de edición.
   preferences:
     other: Outro
     posting_defaults: Valores por defecto
@@ -1868,6 +1908,7 @@ gl:
     edited_at_html: Editado %{date}
     errors:
       in_reply_not_found: A publicación á que tentas responder semella que non existe.
+      quoted_status_not_found: Parece que a publicación que intentas citar non existe.
     over_character_limit: Excedeu o límite de caracteres %{max}
     pin_errors:
       direct: As publicacións que só son visibles para as usuarias mencionadas non se poden fixar
@@ -1875,18 +1916,17 @@ gl:
       ownership: Non podes fixar a publicación doutra usuaria
       reblog: Non se poden fixar as mensaxes promovidas
     quote_policies:
-      followers: Seguidoras e usuarias mencionadas
-      nobody: Só usuarias mencionadas
+      followers: Só para seguidoras
+      nobody: Só para min
       public: Calquera
     title: '%{name}: "%{quote}"'
     visibilities:
-      direct: Directa
-      private: Só seguidoras
-      private_long: Mostrar só as seguidoras
+      direct: Mención privada
+      private: Só para seguidoras
       public: Público
-      public_long: Visible para calquera
-      unlisted: Fóra das listas
-      unlisted_long: Visible para calquera, pero non en cronoloxías públicas
+      public_long: Para calquera dentro e fóra de Mastodon
+      unlisted: Pública limitada
+      unlisted_long: Non aparece nos resultados de buscas en Mastodon, nas tendencias e cronoloxías públicas
   statuses_cleanup:
     enabled: Borrar automáticamente publicacións antigas
     enabled_hint: Borra automáticamente as túas publicacións unha vez acadan certa lonxevidade, a menos que cumpran algunha destas excepcións
diff --git a/config/locales/he.yml b/config/locales/he.yml
index 5a562f81167..3ea929f76c9 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -196,6 +196,7 @@ he:
         create_relay: יצירת ממסר
         create_unavailable_domain: יצירת דומיין בלתי זמין
         create_user_role: יצירת תפקיד
+        create_username_block: יצירת חוק שמות משתמש
         demote_user: הורדת משתמש בדרגה
         destroy_announcement: מחיקת הכרזה
         destroy_canonical_email_block: מחיקת חסימת דואל
@@ -209,6 +210,7 @@ he:
         destroy_status: מחיקת הודעה
         destroy_unavailable_domain: מחיקת דומיין בלתי זמין
         destroy_user_role: מחיקת תפקיד
+        destroy_username_block: מחיקת חוק שמות משתמש
         disable_2fa_user: השעיית זיהוי דו-גורמי
         disable_custom_emoji: השעיית אמוג'י מיוחד
         disable_relay: השבתת ממסר
@@ -243,6 +245,7 @@ he:
         update_report: עדכון דו"ח עבירה
         update_status: סטטוס עדכון
         update_user_role: עדכון תפקיד
+        update_username_block: עדכון חוק שמות משתמש
       actions:
         approve_appeal_html: "%{name} אישר/ה ערעור על החלטת מנהלי הקהילה מ-%{target}"
         approve_user_html: "%{name} אישר/ה הרשמה מ-%{target}"
@@ -261,6 +264,7 @@ he:
         create_relay_html: "%{name} יצרו את הממסר %{target}"
         create_unavailable_domain_html: "%{name} הפסיק/ה משלוח לדומיין %{target}"
         create_user_role_html: "%{name} יצר את התפקיד של %{target}"
+        create_username_block_html: "%{name} הוסיפו חוק לשמות משתמש המכילים %{target}"
         demote_user_html: "%{name} הוריד/ה בדרגה את המשתמש %{target}"
         destroy_announcement_html: "%{name} מחק/ה את ההכרזה %{target}"
         destroy_canonical_email_block_html: "%{name} הסירו חסימה מדואל %{target}"
@@ -274,6 +278,7 @@ he:
         destroy_status_html: ההודעה של %{target} הוסרה ע"י %{name}
         destroy_unavailable_domain_html: "%{name} התחיל/ה מחדש משלוח לדומיין %{target}"
         destroy_user_role_html: "%{name} ביטל את התפקיד של %{target}"
+        destroy_username_block_html: "%{name} הסירו חוק לשמות משתמש המכילים %{target}"
         disable_2fa_user_html: "%{name} ביטל/ה את הדרישה לאימות דו-גורמי למשתמש %{target}"
         disable_custom_emoji_html: "%{name} השבית/ה את האמוג'י %{target}"
         disable_relay_html: "%{name} השביתו את הממסר %{target}"
@@ -308,6 +313,7 @@ he:
         update_report_html: '%{name} עדכן/ה דו"ח %{target}'
         update_status_html: "%{name} עדכן/ה הודעה של %{target}"
         update_user_role_html: "%{name} שינה את התפקיד של %{target}"
+        update_username_block_html: "%{name} עידכנו חוק לשמות משתמש המכילים %{target}"
       deleted_account: חשבון מחוק
       empty: לא נמצאו יומנים.
       filter_by_action: סינון לפי פעולה
@@ -870,6 +876,10 @@ he:
         all: לכולם
         disabled: לאף אחד
         users: למשתמשים מקומיים מחוברים
+      feed_access:
+        modes:
+          authenticated: משתמשים מאומתים בלבד
+          public: כולם
       registrations:
         moderation_recommandation: יש לוודא שלאתר יש צוות מנחות ומנחי שיחה מספק ושירותי בטרם תבחרו לפתוח הרשמה לכולם!
         preamble: שליטה בהרשאות יצירת חשבון בשרת שלך.
@@ -930,7 +940,7 @@ he:
       title: פרסומי החשבון - @%{name}
       trending: נושאים חמים
       view_publicly: צפיה בפומבי
-      visibility: נראות
+      visibility: חשיפה
       with_media: עם מדיה
     strikes:
       actions:
@@ -1121,6 +1131,25 @@ he:
           two: הוצגה על ידי %{count} משתמשים במשך השבוע שעבר
       title: המלצות ונושאים חמים
       trending: נושאים חמים
+    username_blocks:
+      add_new: הוספת חדש
+      block_registrations: חסימת הרשמות
+      comparison:
+        contains: מכיל
+        equals: שווה
+      contains_html: מכיל %{string}
+      created_msg: חוק שמות משתמשים נוצר בהצלחה
+      delete: מחיקה
+      edit:
+        title: עריכת חוק שמות משתמש
+      matches_exactly_html: מתאים ל־%{string}
+      new:
+        create: יצירת כלל
+        title: יצירת חוק חדש לשמות משתמש
+      no_username_block_selected: לא בוצעו שינויים בחוקי בחירת שמות שכן לא נבחרו כאלו
+      not_permitted: שמות אסורים
+      title: חוקי שמות
+      updated_msg: חוק שמות משתמשים עודכן בהצלחה
     warning_presets:
       add_new: הוספת חדש
       delete: למחוק
@@ -1387,6 +1416,10 @@ he:
     basic_information: מידע בסיסי
     hint_html: "<strong>התאמה אישית של מה שיראו אחרים בפרופיל הציבורי שלך וליד הודעותיך.</strong> אחרים עשויים יותר להחזיר עוקב וליצור אתך שיחה אם הפרופיל והתמונה יהיו מלאים."
     other: אחר
+  emoji_styles:
+    auto: אוטומטי
+    native: מקומי
+    twemoji: Twemoji
   errors:
     '400': הבקשה שהגשת לא תקינה.
     '403': חסרות לך הרשאות לצפיה בעמוד זה.
@@ -1636,6 +1669,13 @@ he:
       expires_at: פג תוקף ב-
       uses: שימושים
     title: הזמנת אנשים
+  link_preview:
+    author_html: מאת %{name}
+    potentially_sensitive_content:
+      action: לחץ להצגה
+      confirm_visit: האם להמשיך ליעד הקישור?
+      hide_button: להסתיר
+      label: תוכן שעלול להיות רגיש
   lists:
     errors:
       limit: הגעת למספר הרשימות המירבי
@@ -1736,6 +1776,10 @@ he:
       title: אזכור חדש
     poll:
       subject: סקר מאת %{name} הסתיים
+    quote:
+      body: 'הודעתך צוטטה על ידי %{name}:'
+      subject: "%{name} ציטט.ה את הודעתך"
+      title: ציטוט חדש
     reblog:
       body: 'הודעתך הודהדה על ידי %{name}:'
       subject: הודעתך הודהדה על ידי%{name}
@@ -1784,9 +1828,12 @@ he:
       self_vote: אין אפשרות להצביע במשאל שפרסמת בעצמך
       too_few_options: חייב להכיל יותר מפריט אחד
       too_many_options: לא יכול להכיל יותר מ-%{max} פריטים
+    vote: הצבעה
+  posting_defaults:
+    explanation: העדפות אלו ישמשו כברירות המחדל כשתצרו הודעה חדשה, ברם תוכלו לבחור אחרת בכל חיבור הודעה בעתיד.
   preferences:
     other: שונות
-    posting_defaults: ברירות מחדל להודעות
+    posting_defaults: ברירות מחדל בפרסום
     public_timelines: פידים פומביים
   privacy:
     hint_html: "<strong>ניתן להתאים את הצורה שבה תירצו שיראו את פרופיל המשתמש וההודעות שלכם.</strong> מגוון אפשרויות במסטודון יכולות לעזור לכם להיחשף לקהל רחב יותר כאשר תפעילו אותן. הקדישו רגע לבדוק את ההגדרות הללו כדי לוודא שהן מתאימות לכם."
@@ -1945,6 +1992,9 @@ he:
         two: "%{count} סרטונים"
     boosted_from_html: הודהד מ-%{acct_link}
     content_warning: 'אזהרת תוכן: %{warning}'
+    content_warnings:
+      hide: להסתיר הודעה
+      show: הצג עוד
     default_language: זהה לשפת ממשק
     disallowed_hashtags:
       many: 'מכיל את התגיות האסורות: %{tags}'
@@ -1953,7 +2003,8 @@ he:
       two: 'מכיל את התגיות האסורות: %{tags}'
     edited_at_html: נערך ב-%{date}
     errors:
-      in_reply_not_found: נראה שההודעה שאת/ה מנסה להגיב לה לא קיימת.
+      in_reply_not_found: נראה שההודעה שנסית להגיב לה לא קיימת.
+      quoted_status_not_found: נראה שההודעה שנסית לצטט לא קיימת.
     over_character_limit: חריגה מגבול התווים של %{max}
     pin_errors:
       direct: לא ניתן לקבע הודעות שנראותן מוגבלת למכותבים בלבד
@@ -1961,18 +2012,17 @@ he:
       ownership: הודעות של אחרים לא יכולות להיות מוצמדות
       reblog: אין אפשרות להצמיד הדהודים
     quote_policies:
-      followers: עוקבים ומאוזכרים
-      nobody: רק מאוזכרים ומאוזכרות
+      followers: לעוקבים בלבד
+      nobody: רק אני
       public: כולם
     title: '%{name}: "%{quote}"'
     visibilities:
-      direct: ישיר
+      direct: אזכור פרטי
       private: לעוקבים בלבד
-      private_long: להצגה לעוקבים בלבד
       public: פומבי
-      public_long: כולם יוכלו לקרוא
-      unlisted: מוסתר
-      unlisted_long: פומבי, אבל לא להצגה בפיד הציבורי
+      public_long: כל הגולשים, מחוברים למסטודון או לא
+      unlisted: ציבורי שקט
+      unlisted_long: מוסתרת מתוצאות חיפוש במסטודון, נושאים חמים וציר הזמן הציבורי
   statuses_cleanup:
     enabled: מחק הודעות ישנות אוטומטית
     enabled_hint: מוחק אוטומטית את הודעותיך לכשהגיעו לסף גיל שנקבע מראש, אלא אם הן תואמות את אחת ההחרגות למטה
diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index 908cbf51c43..7d04d7278c8 100644
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -215,11 +215,7 @@ hr:
   statuses:
     over_character_limit: prijeđeno je ograničenje od %{max} znakova
     visibilities:
-      private: Samo pratitelji
       public: Javno
-      public_long: Svi mogu vidjeti
-      unlisted: Neprikazano
-      unlisted_long: Svi mogu vidjeti, ali nije izlistano u javnim timelineovima
   statuses_cleanup:
     enabled: Automatski obriši strare postove
   stream_entries:
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 1bf0194043e..2b57ef55161 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -190,6 +190,7 @@ hu:
         create_relay: Továbbító létrehozása
         create_unavailable_domain: Elérhetetlen domain létrehozása
         create_user_role: Szerepkör létrehozása
+        create_username_block: Felhasználónév-szabály létrehozása
         demote_user: Felhasználó lefokozása
         destroy_announcement: Közlemény törlése
         destroy_canonical_email_block: E-mail-tiltás törlése
@@ -203,6 +204,7 @@ hu:
         destroy_status: Bejegyzés törlése
         destroy_unavailable_domain: Elérhetetlen domain törlése
         destroy_user_role: Szerepkör eltávolítása
+        destroy_username_block: Felhasználónév-szabály törlése
         disable_2fa_user: Kétlépcsős hitelesítés letiltása
         disable_custom_emoji: Egyéni emodzsi letiltása
         disable_relay: Továbbító letiltása
@@ -237,6 +239,7 @@ hu:
         update_report: Bejelentés frissítése
         update_status: Bejegyzés frissítése
         update_user_role: Szerepkör frissítése
+        update_username_block: Felhasználónév-szabály frissítése
       actions:
         approve_appeal_html: "%{name} jóváhagyott egy fellebbezést %{target} moderátori döntéséről"
         approve_user_html: "%{name} jóváhagyta %{target} regisztrációját"
@@ -255,6 +258,7 @@ hu:
         create_relay_html: "%{name} létrehozta az átirányítót: %{target}"
         create_unavailable_domain_html: "%{name} leállította a kézbesítést a %{target} domainbe"
         create_user_role_html: "%{name} létrehozta a(z) %{target} szerepkört"
+        create_username_block_html: "%{name} az ezt tartalmazó felhasználónevekre vonatkozó szabályt hozott létre: %{target}"
         demote_user_html: "%{name} lefokozta %{target} felhasználót"
         destroy_announcement_html: "%{name} törölte a %{target} közleményt"
         destroy_canonical_email_block_html: "%{name} engedélyezte a(z) %{target} hashű e-mailt"
@@ -268,6 +272,7 @@ hu:
         destroy_status_html: "%{name} eltávolította %{target} felhasználó bejegyzését"
         destroy_unavailable_domain_html: "%{name} újraindította a kézbesítést a %{target} domainbe"
         destroy_user_role_html: "%{name} törölte a(z) %{target} szerepkört"
+        destroy_username_block_html: "%{name} az ezt tartalmazó felhasználónevekre vonatkozó szabályt törölt: %{target}"
         disable_2fa_user_html: "%{name} kikapcsolta a kétlépcsős hitelesítést %{target} felhasználó fiókján"
         disable_custom_emoji_html: "%{name} letiltotta az emodzsit: %{target}"
         disable_relay_html: "%{name} letiltotta az átirányítót: %{target}"
@@ -302,6 +307,7 @@ hu:
         update_report_html: "%{name} frissítette a %{target} bejelentést"
         update_status_html: "%{name} frissítette %{target} felhasználó bejegyzését"
         update_user_role_html: "%{name} módosította a(z) %{target} szerepkört"
+        update_username_block_html: "%{name} az ezt tartalmazó felhasználónevekre vonatkozó szabályt frissített: %{target}"
       deleted_account: törölt fiók
       empty: Nem található napló.
       filter_by_action: Szűrés művelet alapján
@@ -842,6 +848,10 @@ hu:
         all: Mindenkinek
         disabled: Senkinek
         users: Bejelentkezett helyi felhasználóknak
+      feed_access:
+        modes:
+          authenticated: Csak hitelesített felhasználók
+          public: Mindenki
       registrations:
         moderation_recommandation: Győződj meg arról, hogy megfelelő és gyors reagálású moderátor csapatod van, mielőtt mindenki számára megnyitod a regisztrációt!
         preamble: Szabályozd, hogy ki hozhat létre fiókot a kiszolgálón.
@@ -1085,6 +1095,25 @@ hu:
           other: "%{count} ember használta a múlt héten"
       title: Ajánlások és trendek
       trending: Felkapott
+    username_blocks:
+      add_new: Új hozzáadása
+      block_registrations: Regisztrációk blokkolása
+      comparison:
+        contains: Tartalmazza
+        equals: Megegyezik vele
+      contains_html: 'Tartalmazza ezt: %{string}'
+      created_msg: Felhasználónév-szabály sikeresen létrehozva
+      delete: Törlés
+      edit:
+        title: Felhasználónév-szabály szerkesztése
+      matches_exactly_html: 'Megegyezik ezzel: %{string}'
+      new:
+        create: Szabály létrehozása
+        title: Új felhasználónév-szabály létrehozása
+      no_username_block_selected: Nem változott meg egy felhasználónév-szabály sem, mert semmi sem volt kiválasztva
+      not_permitted: Nem engedélyezett
+      title: Felhasználónév-szabályok
+      updated_msg: Felhasználónév-szabály sikeresen frissítve
     warning_presets:
       add_new: Új hozzáadása
       delete: Törlés
@@ -1349,6 +1378,10 @@ 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
+  emoji_styles:
+    auto: Automatikus
+    native: Natív
+    twemoji: Twemoji
   errors:
     '400': A küldött kérés érvénytelen vagy hibás volt.
     '403': Nincs jogosultságod az oldal megtekintéséhez.
@@ -1658,6 +1691,10 @@ hu:
       title: Új említés
     poll:
       subject: "%{name} szavazása véget ért"
+    quote:
+      body: 'A bejegyzésedet %{name} idézte:'
+      subject: "%{name} idézte a bejegyzésedet"
+      title: Új idézet
     reblog:
       body: 'A bejegyzésedet %{name} megtolta:'
       subject: "%{name} megtolta a bejegyzésedet"
@@ -1706,6 +1743,9 @@ hu:
       self_vote: Nem szavazhatsz a saját szavazásodon
       too_few_options: több, mint egy opciónak kell lennie
       too_many_options: nem lehet több, mint %{max} opció
+    vote: Szavazás
+  posting_defaults:
+    explanation: Ezek a beállítások lesznek alapértelmezésként használva, amikor új bejegyzéseket hoz létre, de a szerkesztő segítségével bejegyzésenként szerkeszthetők.
   preferences:
     other: Egyéb
     posting_defaults: Bejegyzések alapértelmezései
@@ -1868,6 +1908,7 @@ hu:
     edited_at_html: 'Szerkesztve: %{date}'
     errors:
       in_reply_not_found: Már nem létezik az a bejegyzés, melyre válaszolni szeretnél.
+      quoted_status_not_found: Már nem létezik az a bejegyzés, amelyből idézni szeretnél.
     over_character_limit: túllépted a maximális %{max} karakteres keretet
     pin_errors:
       direct: A csak a megemlített felhasználók számára látható bejegyzések nem tűzhetők ki
@@ -1875,18 +1916,17 @@ hu:
       ownership: Nem tűzheted ki valaki más bejegyzését
       reblog: Megtolt bejegyzést nem tudsz kitűzni
     quote_policies:
-      followers: Követők és említett felhasználók
-      nobody: Csak említett felhasználók
-      public: Mindenki
+      followers: Csak követőknek
+      nobody: Csak én
+      public: Bárki
     title: "%{name}: „%{quote}”"
     visibilities:
-      direct: Közvetlen
+      direct: Privát említés
       private: Csak követőknek
-      private_long: Csak a követőidnek jelenik meg
       public: Nyilvános
-      public_long: Bárki láthatja
-      unlisted: Listázatlan
-      unlisted_long: Mindenki látja, de a nyilvános idővonalakon nem jelenik meg
+      public_long: Bárki a Mastodonon és azon kívül
+      unlisted: Csendes nyilvános
+      unlisted_long: Elrejtve a Mastodon keresési találataiban, a felkapottak között és a nyilvános idővonalakon
   statuses_cleanup:
     enabled: Régi bejegyzések automatikus törlése
     enabled_hint: Automatikusan törli a bejegyzéseidet, ahogy azok elérik a megadott korhatárt, kivéve azokat, melyek illeszkednek valamely alábbi kivételre
diff --git a/config/locales/hy.yml b/config/locales/hy.yml
index dfbbe73e2a1..933f8a4fa75 100644
--- a/config/locales/hy.yml
+++ b/config/locales/hy.yml
@@ -777,13 +777,7 @@ hy:
     over_character_limit: "%{max} նիշի սահմանը գերազանցուած է"
     title: '%{name}: "%{quote}"'
     visibilities:
-      direct: Հասցէագրուած
-      private: Միայն հետեւողներին
-      private_long: Հասանելի միայն հետեւորդներին
       public: Հրապարակային
-      public_long: Տեսանելի բոլորին
-      unlisted: Ծածուկ
-      unlisted_long: Տեսանելի է բոլորին, բայց չի յայտնւում հանրային հոսքերում
   statuses_cleanup:
     exceptions: Բացառություններ
     min_age:
diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index 35dd56aad1d..019e3f8438d 100644
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -190,6 +190,7 @@ ia:
         create_relay: Crear repetitor
         create_unavailable_domain: Crear dominio indisponibile
         create_user_role: Crear un rolo
+        create_username_block: Crear regula de nomine de usator
         demote_user: Degradar usator
         destroy_announcement: Deler annuncio
         destroy_canonical_email_block: Deler blocada de e-mail
@@ -203,6 +204,7 @@ ia:
         destroy_status: Deler message
         destroy_unavailable_domain: Deler dominio indisponibile
         destroy_user_role: Destruer rolo
+        destroy_username_block: Deler regula de nomine de usator
         disable_2fa_user: Disactivar A2F
         disable_custom_emoji: Disactivar emoji personalisate
         disable_relay: Disactivar repetitor
@@ -237,6 +239,7 @@ ia:
         update_report: Actualisar le reporto
         update_status: Actualisar le message
         update_user_role: Actualisar rolo
+        update_username_block: Actualisar regula de nomine de usator
       actions:
         approve_appeal_html: "%{name} approbava appello del decision de moderation de %{target}"
         approve_user_html: "%{name} approbava inscription de %{target}"
@@ -255,6 +258,7 @@ ia:
         create_relay_html: "%{name} ha create un repetitor %{target}"
         create_unavailable_domain_html: "%{name} stoppava livration al dominio %{target}"
         create_user_role_html: "%{name} creava rolo de %{target}"
+        create_username_block_html: "%{name} ha addite un regula pro nomines de usator que contine %{target}"
         demote_user_html: "%{name} degradava usator %{target}"
         destroy_announcement_html: "%{name} deleva annuncio %{target}"
         destroy_canonical_email_block_html: "%{name} disblocava le e-mail con le hash %{target}"
@@ -268,6 +272,7 @@ ia:
         destroy_status_html: "%{name} removeva un message de %{target}"
         destroy_unavailable_domain_html: "%{name} reprendeva le livration al dominio %{target}"
         destroy_user_role_html: "%{name} deleva le rolo %{target}"
+        destroy_username_block_html: "%{name} ha removite un regula pro nomines de usator que contine %{target}"
         disable_2fa_user_html: "%{name} disactivava le authentication a duo factores pro le usator %{target}"
         disable_custom_emoji_html: "%{name} disactivava le emoji %{target}"
         disable_relay_html: "%{name} ha disactivate le repetitor %{target}"
@@ -302,6 +307,7 @@ ia:
         update_report_html: "%{name} actualisava reporto %{target}"
         update_status_html: "%{name} actualisava message de %{target}"
         update_user_role_html: "%{name} cambiava rolo de %{target}"
+        update_username_block_html: "%{name} ha actualisate un regula pro nomines de usator que contine %{target}"
       deleted_account: conto delite
       empty: Nulle registros trovate.
       filter_by_action: Filtrar per action
@@ -321,7 +327,7 @@ ia:
       preview:
         disclaimer: Proque le usatores non pote optar pro non reciper los, le notificationes per e-mail debe limitar se a annuncios importante tal como le notificationes de violation de datos personal o de clausura de servitores.
         explanation_html: 'Le e-mail essera inviate a <strong>%{display_count} usatores</strong>. Le sequente texto essera includite in le e-mail:'
-        title: Previder le notification de annuncio
+        title: Previsualisar le notification de annuncio
       publish: Publicar
       published_msg: Annuncio publicate con successo!
       scheduled_for: Programmate pro %{time}
@@ -480,6 +486,36 @@ ia:
       new:
         title: Importar blocadas de dominio
       no_file: Necun file seligite
+    fasp:
+      debug:
+        callbacks:
+          created_at: Data de creation
+          delete: Deler
+          ip: Adresse IP
+          request_body: Corpore del requesta
+          title: Depurar le appellos de retorno
+      providers:
+        active: Active
+        base_url: URL de base
+        callback: Appello de retorno
+        delete: Deler
+        edit: Modificar fornitor
+        finish_registration: Terminar registration
+        name: Nomine
+        providers: Fornitores
+        public_key_fingerprint: Dactylogramma del clave public
+        registration_requested: Registration requestate
+        registrations:
+          confirm: Confirmar
+          description: Tu ha recipite un registration de un FSAF. Rejecta lo si tu non lo ha initiate. Si tu lo ha initiate, compara attentemente le nomine e le dactylogramma del clave ante de confirmar le registration.
+          reject: Rejectar
+          title: Confirmar registration FSAF
+        save: Salvar
+        select_capabilities: Selige capacitates
+        sign_in: Aperir session
+        status: Stato
+        title: Fornitores de Servicios Auxiliar del Fediverso
+      title: FSAF
     follow_recommendations:
       description_html: "<strong>Le recommendationes de sequimento adjuta le nove usatores a trovar rapidemente contento interessante.</strong> Quando un usator non ha un historia sufficiente de interactiones con alteres pro formar recommendationes personalisate de sequimento, iste contos es recommendate. Illos se recalcula cata die a partir de un mixtura de contos con le plus grande numero de ingagiamentos recente e le numero de sequitores local le plus alte pro un lingua date."
       language: Pro le lingua
@@ -548,6 +584,13 @@ ia:
         all: Toto
         limited: Limitate
         title: Moderation
+      moderation_notes:
+        create: Adder nota de moderation
+        created_msg: Le nota de moderation del servitor ha essite create.
+        description_html: Vider e lassar notas pro altere moderatores e pro referentia futur
+        destroyed_msg: Le nota de moderation del servitor ha essite delite.
+        placeholder: Informationes sur iste servitor, actiones prendite o altere cosas que pote adjutar te a moderar iste servitor in le futuro.
+        title: Notas de moderation
       private_comment: Commento private
       public_comment: Commento public
       purge: Purgar
@@ -756,11 +799,17 @@ ia:
       title: Rolos
     rules:
       add_new: Adder regula
+      add_translation: Adder traduction
       delete: Deler
       description_html: Ben que multes affirma de haber legite e acceptate le conditiones de servicio, generalmente le gente non los lege completemente usque un problema surge. <strong>Facilita le visibilitate del regulas de tu servitor in un colpo de oculo forniente los in un lista a punctos.</strong> Tenta mantener le regulas individual curte e simple, ma sin divider los in multe punctos separate.
       edit: Modificar regula
       empty: Necun regula del servitor ha essite definite ancora.
+      move_down: Displaciar a basso
+      move_up: Displaciar in alto
       title: Regulas del servitor
+      translation: Traduction
+      translations: Traductiones
+      translations_explanation: Tu ha le option de adder traductiones al regulas. Le valor predefinite apparera si necun version traducite es disponibile. Per favor sempre assecura te que omne traduction fornite es ben synchronisate con le valor predefinite.
     settings:
       about:
         manage_rules: Gerer le regulas del servitor
@@ -853,7 +902,7 @@ ia:
       open: Aperir message
       original_status: Message original
       reblogs: Republicationes
-      replied_to_html: Respondite a %{acct_link}
+      replied_to_html: Responsa a %{acct_link}
       status_changed: Message cambiate
       status_title: Message de @%{name}
       title: Messages del conto – @%{name}
@@ -877,7 +926,7 @@ ia:
       database_schema_check:
         message_html: Il ha migrationes de base de datos pendente. Per favor exeque los pro assecurar que le application se comporta como expectate
       elasticsearch_analysis_index_mismatch:
-        message_html: Le parametros del analisator del indice de Elasticsearch es obsolete. Executa <code>tootctl search deploy --only-mapping --only=%{value}</code>
+        message_html: Le parametros del analysator del indice de Elasticsearch es obsolete. Executa <code>tootctl search deploy --only-mapping --only=%{value}</code>
       elasticsearch_health_red:
         message_html: Le aggregation Elasticsearch es malsan (stato rubie), le functiones de recerca es indisponibile
       elasticsearch_health_yellow:
@@ -942,7 +991,7 @@ ia:
       changelog: Lo que ha cambiate
       create: Usar tu proprie
       current: Actual
-      draft: Provisori
+      draft: Esbosso
       generate: Usar modello
       generates:
         action: Generar
@@ -965,7 +1014,7 @@ ia:
         title: Previsualisar le notification sur le conditiones de servicio
       publish: Publicar
       published_on_html: Publicate le %{date}
-      save_draft: Salvar version provisori
+      save_draft: Salvar esbosso
       title: Conditiones de servicio
     title: Administration
     trends:
@@ -1042,6 +1091,25 @@ ia:
           other: Usate per %{count} personas in le ultime septimana
       title: Recommendationes e tendentias
       trending: In tendentia
+    username_blocks:
+      add_new: Adder nove
+      block_registrations: Blocar registrationes
+      comparison:
+        contains: Contine
+        equals: Es equal a
+      contains_html: Contine %{string}
+      created_msg: Regula de nomine de usator create con successo
+      delete: Deler
+      edit:
+        title: Modificar regula de nomine de usator
+      matches_exactly_html: Es equal a %{string}
+      new:
+        create: Crear regula
+        title: Crear nove regula de nomine de usator
+      no_username_block_selected: Necun regula de usator ha essite cambiate perque necun ha essite seligite
+      not_permitted: Non permittite
+      title: Regulas de nomine de usator
+      updated_msg: Regula de nomine de usator actualisate con successo
     warning_presets:
       add_new: Adder nove
       delete: Deler
@@ -1306,6 +1374,10 @@ ia:
     basic_information: Information basic
     hint_html: "<strong>Personalisa lo que le personas vide sur tu profilo public e presso tu messages.</strong> Il es plus probabile que altere personas te seque e interage con te quando tu ha un profilo complete e un photo."
     other: Alteres
+  emoji_styles:
+    auto: Automatic
+    native: Native
+    twemoji: Twemoji
   errors:
     '400': Le requesta que tu ha inviate non es valide o es mal formate.
     '403': Tu non ha le permission de acceder a iste pagina.
@@ -1615,6 +1687,10 @@ ia:
       title: Nove mention
     poll:
       subject: Un sondage de %{name} ha finite
+    quote:
+      body: 'Tu message ha essite citate per %{name}:'
+      subject: "%{name} ha citate tu message"
+      title: Nove citation
     reblog:
       body: "%{name} ha impulsate tu message:"
       subject: "%{name} ha impulsate tu message"
@@ -1663,6 +1739,9 @@ ia:
       self_vote: Tu non pote votar in tu proprie sondages
       too_few_options: debe haber plus de un elemento
       too_many_options: non pote continer plus de %{max} elementos
+    vote: Votar
+  posting_defaults:
+    explanation: Iste parametros essera usate como predefinite quando tu crea nove messages, ma tu pote modificar los pro cata message in le compositor.
   preferences:
     other: Alteres
     posting_defaults: Parametros de publication predefinite
@@ -1825,6 +1904,7 @@ ia:
     edited_at_html: Modificate le %{date}
     errors:
       in_reply_not_found: Le message a que tu tenta responder non pare exister.
+      quoted_status_not_found: Le message que tu tenta citar non pare exister.
     over_character_limit: limite de characteres de %{max} excedite
     pin_errors:
       direct: Messages que es solo visibile a usatores mentionate non pote esser appunctate
@@ -1832,18 +1912,17 @@ ia:
       ownership: Le message de alcuno altere non pote esser appunctate
       reblog: Un impulso non pote esser affixate
     quote_policies:
-      followers: Sequitores e usatores mentionate
-      nobody: Solmente usatores mentionate
+      followers: Solmente sequitores
+      nobody: Solo io
       public: Omnes
     title: "%{name}: “%{quote}”"
     visibilities:
-      direct: Directe
+      direct: Mention private
       private: Solmente sequitores
-      private_long: Solmente monstrar a sequitores
       public: Public
-      public_long: Omnes pote vider
-      unlisted: Non listate
-      unlisted_long: Omnes pote vider, ma non es listate in le chronologias public
+      public_long: Quicunque, sur Mastodon o non
+      unlisted: Public ma quiete
+      unlisted_long: Celate in resultatos de recerca, tendentias e chronologias public de Mastodon
   statuses_cleanup:
     enabled: Deler automaticamente le messages ancian
     enabled_hint: Dele automaticamente tu messages un vice que illos attinge un limine de etate specificate, salvo que illes concorda un del exceptiones infra
@@ -1889,7 +1968,7 @@ ia:
   terms_of_service:
     title: Conditiones de servicio
   terms_of_service_interstitial:
-    future_preamble_html: Nos face alcun cambios a nostre conditiones de servicio, que entrara in vigor in <strong>%{date}</strong>. Nos te invita a revider le conditiones actualisate.
+    future_preamble_html: Nos apporta alcun modificationes a nostre conditiones de servicio, le quales entrara in vigor le <strong>%{date}</strong>. Nos te invita a revider le conditiones actualisate.
     past_preamble_html: Nos ha cambiate nostre conditiones de servicio desde tu ultime visita. Nos te invita a revider le conditiones actualisate.
     review_link: Revider le conditiones de servicio
     title: Le conditiones de servicio de %{domain} cambia
@@ -1961,7 +2040,7 @@ ia:
       agreement: Si tu continua a usar %{domain}, tu accepta iste conditiones. Si tu non es de accordo con le conditiones actualisate, tu pote sempre eliminar tu conto pro terminar tu accordo con %{domain}.
       changelog: 'In summario, ecce lo que iste actualisation significa pro te:'
       description: 'Tu recipe iste e-mail proque nos face alcun cambios al nostre conditiones de servicio a %{domain}. Iste actualisationes entrara in vigor in %{date}. Nos te invita a revider integralmente le conditiones actualisate hic:'
-      description_html: Tu recipe iste e-mail proque nos face alcun cambios al nostre conditiones de servicio a %{domain}. Iste actualisationes entrara in vigor in <strong>%{date}</strong>. Nos te invita a revider <a href="%{path}" target="_blank">integralmente le conditiones actualisate hic</a>.
+      description_html: Tu recipe iste message perque nos apporta alcun modificationes a nostre conditiones de servicio sur %{domain}. Iste actualisationes entrara in vigor le <strong>%{date}</strong>. Nos te invita a <a href="%{path}" target="_blank">leger integralmente le conditiones actualisate</a>.
       sign_off: Le equipa de %{domain}
       subject: Actualisationes de nostre conditiones de servicio
       subtitle: Le conditiones de servicio de %{domain} ha cambiate
diff --git a/config/locales/id.yml b/config/locales/id.yml
index 03d25a6e537..3489519f847 100644
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -1379,13 +1379,7 @@ id:
       reblog: Boost tidak bisa disematkan
     title: '%{name}: "%{quote}"'
     visibilities:
-      direct: Langsung
-      private: Khusus pengikut
-      private_long: Hanya tampilkan ke pengikut
       public: Publik
-      public_long: Bisa dilihat semua orang
-      unlisted: Bisa dilihat semua orang, tapi tidak ditampilkan di linimasa publik
-      unlisted_long: Tidak terdaftar di linimasa publik tetapi siapapun dapat melihat
   statuses_cleanup:
     enabled: Otomatis hapus kiriman lama
     enabled_hint: "Otomatis menghapus kiriman Anda saat sudah mencapai batasan usia, kecuali yang cocok \nsesuai di bawah ini"
diff --git a/config/locales/ie.yml b/config/locales/ie.yml
index 2ca8e9ed0ac..d202e96d491 100644
--- a/config/locales/ie.yml
+++ b/config/locales/ie.yml
@@ -1622,13 +1622,7 @@ ie:
       reblog: On ne posse pinglar un boost
     title: "%{name}: «%{quote}»"
     visibilities:
-      direct: Direct
-      private: Solmen por sequitores
-      private_long: Monstrar solmen a sequitores
       public: Public
-      public_long: Omnes posse vider
-      unlisted: Delistat
-      unlisted_long: Omnes posse vider, ma ne listat sur public témpor-lineas
   statuses_cleanup:
     enabled: Automaticmen deleter old postas
     enabled_hint: Deleter automaticmen tui postas quande ili atinge un cert etá, except si ili concorda con un del exceptiones ci infra
diff --git a/config/locales/io.yml b/config/locales/io.yml
index 59c02fc875f..36d4ce251fd 100644
--- a/config/locales/io.yml
+++ b/config/locales/io.yml
@@ -1743,13 +1743,7 @@ io:
       reblog: Repeto ne povas pinglizesar
     title: '%{name}: "%{quote}"'
     visibilities:
-      direct: Direta
-      private: Montrar nur a sequanti
-      private_long: Nur montrez a sequanti
       public: Publika
-      public_long: Omnu povas vidar
-      unlisted: Publika, ma ne aperos en publika tempolinei
-      unlisted_long: Omnu povas vidar ma ne listigesas che publika tempolinei
   statuses_cleanup:
     enabled: Automata efacez olda posti
     enabled_hint: Automata efacez vua posti pos oli atingar fixita oldeslimito, se oli ne parigesas a 1 de suba ecepti
diff --git a/config/locales/is.yml b/config/locales/is.yml
index e997be21b2a..39a2150fb5a 100644
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -190,6 +190,7 @@ is:
         create_relay: Búa til endurvarpa
         create_unavailable_domain: Útbúa lén sem ekki er tiltækt
         create_user_role: Útbúa hlutverk
+        create_username_block: Búa til notandanafnsreglu
         demote_user: Lækka notanda í tign
         destroy_announcement: Eyða tilkynningu
         destroy_canonical_email_block: Eyða útilokunarblokk tölvupósts
@@ -203,6 +204,7 @@ is:
         destroy_status: Eyða færslu
         destroy_unavailable_domain: Eyða léni sem ekki er tiltækt
         destroy_user_role: Eyða hlutverki
+        destroy_username_block: Eyða notandanafnsreglu
         disable_2fa_user: Gera tveggja-þátta auðkenningu óvirka
         disable_custom_emoji: Gera sérsniðið tjáningartákn óvirkt
         disable_relay: Gera endurvarpa óvirkan
@@ -237,6 +239,7 @@ is:
         update_report: Uppfæra kæru
         update_status: Uppfæra færslu
         update_user_role: Uppfæra hlutverk
+        update_username_block: Uppfæra notandanafnsreglu
       actions:
         approve_appeal_html: "%{name} samþykkti áfrýjun á ákvörðun umsjónarmanns frá %{target}"
         approve_user_html: "%{name} samþykkti nýskráningu frá %{target}"
@@ -255,6 +258,7 @@ is:
         create_relay_html: "%{name} bjó til endurvarpa %{target}"
         create_unavailable_domain_html: "%{name} stöðvaði afhendingu til lénsins %{target}"
         create_user_role_html: "%{name} útbjó %{target} hlutverk"
+        create_username_block_html: "%{name} bætti við reglu varðandi notendanöfn sem innihalda %{target}"
         demote_user_html: "%{name} lækkaði notandann %{target} í tign"
         destroy_announcement_html: "%{name} eyddi tilkynninguni %{target}"
         destroy_canonical_email_block_html: "%{name} tók af útilokun á tölvupósti með tætigildið %{target}"
@@ -268,6 +272,7 @@ is:
         destroy_status_html: "%{name} fjarlægði færslu frá %{target}"
         destroy_unavailable_domain_html: "%{name} hóf aftur afhendingu til lénsins %{target}"
         destroy_user_role_html: "%{name} eyddi hlutverki %{target}"
+        destroy_username_block_html: "%{name} fjarlægði reglu varðandi notendanöfn sem innihalda %{target}"
         disable_2fa_user_html: "%{name} gerði kröfu um tveggja-þátta innskráningu óvirka fyrir notandann %{target}"
         disable_custom_emoji_html: "%{name} gerði tjáningartáknið %{target} óvirkt"
         disable_relay_html: "%{name} gerði endurvarpann %{target} óvirkan"
@@ -302,6 +307,7 @@ is:
         update_report_html: "%{name} uppfærði kæru %{target}"
         update_status_html: "%{name} uppfærði færslu frá %{target}"
         update_user_role_html: "%{name} breytti hlutverki %{target}"
+        update_username_block_html: "%{name} uppfærði reglu varðandi notendanöfn sem innihalda %{target}"
       deleted_account: eyddur notandaaðgangur
       empty: Engar atvikaskrár fundust.
       filter_by_action: Sía eftir aðgerð
@@ -844,6 +850,10 @@ is:
         all: Til allra
         disabled: Til engra
         users: Til innskráðra staðværra notenda
+      feed_access:
+        modes:
+          authenticated: Einungis auðkenndir notendur
+          public: Allir
       registrations:
         moderation_recommandation: Tryggðu að þú hafir hæft og aðgengilegt umsjónarteymi til taks áður en þú opnar á skráningar fyrir alla!
         preamble: Stýrðu því hverjir geta útbúið notandaaðgang á netþjóninum þínum.
@@ -1087,6 +1097,25 @@ is:
           other: Notað af %{count} aðilum síðustu vikuna
       title: Meðmæli og vinsælt
       trending: Vinsælt
+    username_blocks:
+      add_new: Bæta við nýju
+      block_registrations: Loka á nýskráningar
+      comparison:
+        contains: Inniheldur
+        equals: Er jafnt og
+      contains_html: Inniheldur %{string}
+      created_msg: Tókst að útbúa notandanafnsreglu
+      delete: Eyða
+      edit:
+        title: Breyta notandanafnsreglu
+      matches_exactly_html: Er jafnt og %{string}
+      new:
+        create: Búa til reglu
+        title: Búa til nýja notandanafnsreglu
+      no_username_block_selected: Engum notandanafnsreglum var breytt þar sem engar voru valdar
+      not_permitted: Ekki leyft
+      title: Notendanafnareglur
+      updated_msg: Tókst að uppfæra notandanafnsreglu
     warning_presets:
       add_new: Bæta við nýju
       delete: Eyða
@@ -1353,6 +1382,10 @@ 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ð
+  emoji_styles:
+    auto: Sjálfvirkt
+    native: Innbyggt
+    twemoji: Twemoji
   errors:
     '400': Beiðnin sem þú sendir er ógild eða rangt uppsett.
     '403': Þú hefur ekki heimildir til að skoða þessari síðu.
@@ -1562,6 +1595,13 @@ is:
       expires_at: Rennur út
       uses: Afnot
     title: Bjóða fólki
+  link_preview:
+    author_html: Frá %{name}
+    potentially_sensitive_content:
+      action: Smelltu til að birta
+      confirm_visit: Ertu viss um að þú viljir opna þennan tengil?
+      hide_button: Fela
+      label: Mögulega viðkvæmt efni
   lists:
     errors:
       limit: Þú hefur náð hámarksfjölda lista
@@ -1662,6 +1702,10 @@ is:
       title: Ný tilvísun
     poll:
       subject: Könnun frá %{name} er lokið
+    quote:
+      body: "%{name} vitnaði í færsluna þína:"
+      subject: "%{name} vitnaði í færsluna þína"
+      title: Ný tilvitnun
     reblog:
       body: "%{name} endurbirti færsluna þína:"
       subject: "%{name} endurbirti færsluna þína"
@@ -1710,6 +1754,9 @@ is:
       self_vote: Þú getur ekki greitt atkvæði í þínum eigin könnunum
       too_few_options: verður að vera með fleiri en eitt atriði
       too_many_options: getur ekki innihaldið meira en %{max} atriði
+    vote: Greiða atkvæði
+  posting_defaults:
+    explanation: Þessar stillingar verða notaðar sjálfgefið þegar útbúnar eru nýjar færslur, en hægt er að breyta þeim í ritlinum fyrir hverja og eina færslu.
   preferences:
     other: Annað
     posting_defaults: Sjálfgefin gildi við gerð færslna
@@ -1865,6 +1912,9 @@ is:
         other: "%{count} myndskeið"
     boosted_from_html: Endurbirt frá %{acct_link}
     content_warning: 'Aðvörun vegna efnis (CW): %{warning}'
+    content_warnings:
+      hide: Fela færslu
+      show: Sýna meira
     default_language: Sama og tungumál viðmóts
     disallowed_hashtags:
       one: 'innihélt óleyfilegt myllumerki: %{tags}'
@@ -1872,6 +1922,7 @@ is:
     edited_at_html: Breytt %{date}
     errors:
       in_reply_not_found: Færslan sem þú ert að reyna að svara að er líklega ekki til.
+      quoted_status_not_found: Færslan sem þú ert að reyna að vitna í virðist ekki vera til.
     over_character_limit: hámarksfjölda stafa (%{max}) náð
     pin_errors:
       direct: Ekki er hægt að festa færslur sem einungis eru sýnilegar þeim notendum sem minnst er á
@@ -1879,18 +1930,17 @@ is:
       ownership: Færslur frá einhverjum öðrum er ekki hægt að festa
       reblog: Ekki er hægt að festa endurbirtingu
     quote_policies:
-      followers: Fylgjendur og notendur sem minnst er á
-      nobody: Einungis notendur sem minnst er á
-      public: Allir
+      followers: Einungis fylgjendur
+      nobody: Bara ég
+      public: Hver sem er
     title: "%{name}: „%{quote}‟"
     visibilities:
-      direct: Beint
+      direct: Einkaspjall
       private: Einungis fylgjendur
-      private_long: Aðeins birt fylgjendum
       public: Opinber
-      public_long: Allir geta séð
-      unlisted: Óskráð
-      unlisted_long: Allir geta skoðað, en er ekki talið upp á opinberum tímalínum
+      public_long: Hver sem er, á og utan Mastodon
+      unlisted: Hljóðlátt opinbert
+      unlisted_long: Falið frá leitarniðurstöðum Mastodon, vinsældalistum og opinberum tímalínum
   statuses_cleanup:
     enabled: Sjálfkrafa eyða eldri færslum
     enabled_hint: Eyðir sjálfkrafa færslum þínum um leið og þær ná tilteknum aldursmörkum, nema ef þær samsvara einni af undantekningunum hér fyrir neðan
diff --git a/config/locales/it.yml b/config/locales/it.yml
index 595c2fddb2e..264119d7e37 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -190,6 +190,7 @@ it:
         create_relay: Crea Relay
         create_unavailable_domain: Crea Dominio Non Disponibile
         create_user_role: Crea Ruolo
+        create_username_block: Crea regola del nome utente
         demote_user: Retrocedi Utente
         destroy_announcement: Elimina Annuncio
         destroy_canonical_email_block: Elimina il blocco dell'e-mail
@@ -203,6 +204,7 @@ it:
         destroy_status: Elimina Toot
         destroy_unavailable_domain: Elimina Dominio Non Disponibile
         destroy_user_role: Distruggi Ruolo
+        destroy_username_block: Cancella regola del nome utente
         disable_2fa_user: Disabilita A2F
         disable_custom_emoji: Disabilita Emoji Personalizzata
         disable_relay: Disabilita Relay
@@ -237,6 +239,7 @@ it:
         update_report: Aggiorna segnalazione
         update_status: Aggiorna Toot
         update_user_role: Aggiorna Ruolo
+        update_username_block: Aggiorna regola del nome utente
       actions:
         approve_appeal_html: "%{name} ha approvato il ricorso sulla decisione di moderazione da %{target}"
         approve_user_html: "%{name} ha approvato l'iscrizione da %{target}"
@@ -255,6 +258,7 @@ it:
         create_relay_html: "%{name} ha creato un relay %{target}"
         create_unavailable_domain_html: "%{name} ha interrotto la consegna al dominio %{target}"
         create_user_role_html: "%{name} ha creato il ruolo %{target}"
+        create_username_block_html: "%{name} ha aggiunto la regola per i nomi utente contenenti %{target}"
         demote_user_html: "%{name} ha retrocesso l'utente %{target}"
         destroy_announcement_html: "%{name} ha eliminato l'annuncio %{target}"
         destroy_canonical_email_block_html: "%{name} ha sbloccato l'e-mail con l'hash %{target}"
@@ -268,6 +272,7 @@ it:
         destroy_status_html: "%{name} ha rimosso il toot di %{target}"
         destroy_unavailable_domain_html: "%{name} ha ripreso la consegna al dominio %{target}"
         destroy_user_role_html: "%{name} ha eliminato il ruolo %{target}"
+        destroy_username_block_html: "%{name} ha rimosso la regola per i nomi utente contenenti %{target}"
         disable_2fa_user_html: "%{name} ha disabilitato l'autenticazione a due fattori per l'utente %{target}"
         disable_custom_emoji_html: "%{name} ha disabilitato emoji %{target}"
         disable_relay_html: "%{name} ha disabilitato il relay %{target}"
@@ -302,6 +307,7 @@ it:
         update_report_html: "%{name} ha aggiornato la segnalazione %{target}"
         update_status_html: "%{name} ha aggiornato lo status di %{target}"
         update_user_role_html: "%{name} ha modificato il ruolo %{target}"
+        update_username_block_html: "%{name} ha aggiornato la regola per i nomi utente contenenti %{target}"
       deleted_account: account eliminato
       empty: Nessun log trovato.
       filter_by_action: Filtra per azione
@@ -1085,6 +1091,25 @@ it:
           other: Usato da %{count} persone nell'ultima settimana
       title: Raccomandazioni & Tendenze
       trending: Di tendenza
+    username_blocks:
+      add_new: Aggiungi una nuova
+      block_registrations: Blocco delle registrazioni
+      comparison:
+        contains: Contiene
+        equals: Uguale a
+      contains_html: Contiene %{string}
+      created_msg: Regola del nome utente creata con successo
+      delete: Elimina
+      edit:
+        title: Modifica regola del nome utente
+      matches_exactly_html: Uguale a %{string}
+      new:
+        create: Crea regola
+        title: Crea una nuova regola del nome utente
+      no_username_block_selected: Non sono state modificate le regole del nome utente in quanto non sono state selezionate
+      not_permitted: Non consentito
+      title: Regole del nome utente
+      updated_msg: Regola del nome utente aggiornata con successo
     warning_presets:
       add_new: Aggiungi nuovo
       delete: Cancella
@@ -1351,6 +1376,10 @@ 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
+  emoji_styles:
+    auto: Automatico
+    native: Nativo
+    twemoji: Twemoji
   errors:
     '400': La richiesta che hai inviato non è valida o non è corretta.
     '403': Non sei autorizzato a visualizzare questa pagina.
@@ -1660,6 +1689,10 @@ it:
       title: Nuova menzione
     poll:
       subject: Un sondaggio da %{name} è terminato
+    quote:
+      body: 'Il tuo post è stato citato da %{name}:'
+      subject: "%{name} ha citato il tuo post"
+      title: Nuova citazione
     reblog:
       body: 'Il tuo status è stato condiviso da %{name}:'
       subject: "%{name} ha condiviso il tuo status"
@@ -1708,6 +1741,9 @@ it:
       self_vote: Non puoi votare nei tuoi sondaggi
       too_few_options: deve avere più di un elemento
       too_many_options: non può contenere più di %{max} elementi
+    vote: Vota
+  posting_defaults:
+    explanation: Queste impostazioni verranno utilizzate come predefinite quando crei nuovi post, ma puoi modificarle per ogni post all'interno della casella di testo.
   preferences:
     other: Altro
     posting_defaults: Predefinite di pubblicazione
@@ -1870,6 +1906,7 @@ it:
     edited_at_html: Modificato il %{date}
     errors:
       in_reply_not_found: Il post a cui stai tentando di rispondere non sembra esistere.
+      quoted_status_not_found: Il post che stai cercando di citare non sembra esistere.
     over_character_limit: Limite caratteri superato di %{max}
     pin_errors:
       direct: I messaggi visibili solo agli utenti citati non possono essere fissati in cima
@@ -1877,18 +1914,17 @@ it:
       ownership: Non puoi fissare in cima un post di qualcun altro
       reblog: Un toot condiviso non può essere fissato in cima
     quote_policies:
-      followers: Seguaci e utenti menzionati
-      nobody: Solo gli utenti menzionati
-      public: Tutti
+      followers: Solo i seguaci
+      nobody: Solo io
+      public: Chiunque
     title: '%{name}: "%{quote}"'
     visibilities:
-      direct: Diretto
-      private: Mostra solo ai tuoi seguaci
-      private_long: Mostra solo ai seguaci
+      direct: Menzione privata
+      private: Solo i seguaci
       public: Pubblico
-      public_long: Tutti lo possono vedere
-      unlisted: Pubblico, ma non visibile sulla timeline pubblica
-      unlisted_long: Tutti lo possono vedere, ma non compare nelle timeline pubbliche
+      public_long: Chiunque dentro e fuori Mastodon
+      unlisted: Pubblico silenzioso
+      unlisted_long: Nascosto dai risultati di ricerca di Mastodon, dalle tendenze e dalle timeline pubbliche
   statuses_cleanup:
     enabled: Cancella automaticamente i vecchi post
     enabled_hint: Cancella automaticamente i tuoi post quando diventano più vecchi di una soglia di età specificata, a meno che non corrispondano a una delle eccezioni sotto
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index f3c4d3089ac..184ab506d64 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -170,7 +170,7 @@ ja:
       whitelisted: 連合許可済み
     action_logs:
       action_types:
-        approve_appeal: 抗議を承認
+        approve_appeal: 異議申立を承認
         approve_user: ユーザーの承認
         assigned_to_self_report: 通報の担当者に設定
         change_email_user: ユーザーのメールアドレスの変更
@@ -187,6 +187,7 @@ ja:
         create_relay: リレーの追加
         create_unavailable_domain: 配送できないドメインを作成
         create_user_role: ロールを作成
+        create_username_block: ユーザー名ルールを作成
         demote_user: ユーザーを降格
         destroy_announcement: お知らせを削除
         destroy_canonical_email_block: メールアドレスブロックの削除
@@ -200,6 +201,7 @@ ja:
         destroy_status: 投稿を削除
         destroy_unavailable_domain: 配送できないドメインを削除
         destroy_user_role: ロールを削除
+        destroy_username_block: ユーザー名ルールを削除
         disable_2fa_user: 二要素認証を無効化
         disable_custom_emoji: カスタム絵文字を無効化
         disable_relay: リレーの無効化
@@ -212,7 +214,7 @@ ja:
         memorialize_account: 追悼アカウント化
         promote_user: ユーザーを昇格
         publish_terms_of_service: サービス利用規約を公開
-        reject_appeal: 抗議を却下
+        reject_appeal: 異議申立を却下
         reject_user: ユーザーを拒否
         remove_avatar_user: アイコンを削除
         reopen_report: 未解決に戻す
@@ -234,8 +236,9 @@ ja:
         update_report: 通報の更新
         update_status: 投稿を更新
         update_user_role: ロールを更新
+        update_username_block: ユーザー名ルールを更新
       actions:
-        approve_appeal_html: "%{name}さんが%{target}さんからの抗議を承認しました"
+        approve_appeal_html: "%{name}さんが%{target}さんからの異議申立を承認しました"
         approve_user_html: "%{name}さんが%{target}さんからの登録を承認しました"
         assigned_to_self_report_html: "%{name}さんが通報 %{target}を自身の担当に割り当てました"
         change_email_user_html: "%{name} さんが %{target} さんのメールアドレスを変更しました"
@@ -277,7 +280,7 @@ ja:
         memorialize_account_html: "%{name}さんが%{target}さんを追悼アカウントページに登録しました"
         promote_user_html: "%{name}さんが%{target}さんを昇格しました"
         publish_terms_of_service_html: "%{name} がサービス利用規約の更新を公開しました"
-        reject_appeal_html: "%{name}さんが%{target}からの抗議を却下しました"
+        reject_appeal_html: "%{name}さんが%{target}からの異議申立を却下しました"
         reject_user_html: "%{name}さんが%{target}さんからの登録を拒否しました"
         remove_avatar_user_html: "%{name}さんが%{target}さんのアイコンを削除しました"
         reopen_report_html: "%{name}さんが通報 %{target}を未解決に戻しました"
@@ -369,7 +372,7 @@ ja:
       new_users: 新規ユーザー
       opened_reports: 新規通報
       pending_appeals_html:
-        other: 保留中の抗議 <strong>%{count}</strong>件
+        other: "<strong>%{count}</strong>件の保留中の異議申立"
       pending_reports_html:
         other: 保留中の通報 <strong>%{count}</strong>件
       pending_tags_html:
@@ -386,8 +389,8 @@ ja:
       website: ウェブサイト
     disputes:
       appeals:
-        empty: 抗議はありません。
-        title: 抗議
+        empty: 異議申立はありません。
+        title: 異議申立
     domain_allows:
       add_new: 連合を許可
       created_msg: 連合を許可しました
@@ -567,6 +570,9 @@ ja:
         all: すべて
         limited: 制限あり
         title: モデレーション
+      moderation_notes:
+        create: モデレーションノートを追加
+        title: モデレーションメモ
       private_comment: コメント (非公開)
       public_comment: コメント (公開)
       purge: パージ
@@ -737,8 +743,8 @@ ja:
         invite_users_description: ユーザーが新しい人を招待できるようにします
         manage_announcements: お知らせの管理
         manage_announcements_description: ユーザーがアナウンスを管理できるようにします
-        manage_appeals: 抗議の管理
-        manage_appeals_description: ユーザーはモデレーションアクションに対する抗議を確認できます
+        manage_appeals: 異議申立の管理
+        manage_appeals_description: ユーザーはモデレーションアクションに対する異議申立を確認できます
         manage_blocks: ブロックの管理
         manage_blocks_description: メールプロバイダとIPアドレスのブロックを許可
         manage_custom_emojis: カスタム絵文字を管理
@@ -892,9 +898,9 @@ ja:
         sensitive: "%{name}さんが%{target}さんのアカウントを閲覧注意としてマークしました"
         silence: "%{name}さんが%{target}さんを制限しました"
         suspend: "%{name}さんが%{target}さんのアカウントを停止しました"
-      appeal_approved: 抗議済み
-      appeal_pending: 保留中の抗議
-      appeal_rejected: 却下済みの抗議
+      appeal_approved: 異議申立済み
+      appeal_pending: 保留中の異議申立
+      appeal_rejected: 却下済みの異議申立
     system_checks:
       database_schema_check:
         message_html: 未実行のデータベースマイグレーションがあります。実行して正常に動作するようにしてください。
@@ -1060,6 +1066,20 @@ ja:
           other: 週間%{count}人に使用されました
       title: おすすめとトレンド
       trending: トレンド
+    username_blocks:
+      add_new: ルールを作成
+      block_registrations: 登録拒否
+      comparison:
+        contains: 含む
+        equals: 一致
+      contains_html: "%{string}を含む"
+      delete: 削除
+      edit:
+        title: ユーザー名ルールの編集
+      matches_exactly_html: "%{string}に一致"
+      new:
+        create: ルールを作成
+      title: ユーザー名ルール
     warning_presets:
       add_new: 追加
       delete: 削除
@@ -1292,19 +1312,19 @@ ja:
   disputes:
     strikes:
       action_taken: 取られた措置
-      appeal: 抗議
+      appeal: 異議申立
       appeal_approved: このストライクは申し立てが承認され、有効ではありません。
       appeal_rejected: 申し立ては拒否されました
-      appeal_submitted_at: 抗議が送信されました
+      appeal_submitted_at: 異議申立の送信日時
       appealed_msg: 申し立てが送信されました。承認されると通知されます。
       appeals:
-        submit: 抗議を送信
-      approve_appeal: 抗議を承認
+        submit: 異議申立を送信
+      approve_appeal: 異議申立を承認
       associated_report: 関連する通報
       created_at: 日時
       description_html: これらは、%{instance}のスタッフがあなたのアカウントに対して行った措置や、あなたに送られた警告です。
       recipient: 送信元
-      reject_appeal: 抗議を却下
+      reject_appeal: 異議申立を却下
       status: '投稿 #%{id}'
       status_removed: 既に削除されています
       title: "%{date}に%{action}"
@@ -1323,6 +1343,10 @@ ja:
     basic_information: 基本情報
     hint_html: "<strong>アカウントのトップページや投稿の隣に表示される公開情報です。</strong>プロフィールとアイコンを設定することで、ほかのユーザーは親しみやすく、またフォローしやすくなります。"
     other: その他
+  emoji_styles:
+    auto: オート
+    native: ネイティブ
+    twemoji: Twemoji
   errors:
     '400': 送信されたリクエストは無効であるか、または不正なフォーマットです。
     '403': このページを表示する権限がありません。
@@ -1660,6 +1684,7 @@ ja:
       self_vote: 自分のアンケートには解答できません
       too_few_options: は複数必要です
       too_many_options: は%{max}個までです
+    vote: 投票
   preferences:
     other: その他
     posting_defaults: デフォルトの投稿設定
@@ -1825,18 +1850,13 @@ ja:
       ownership: 他人の投稿を固定することはできません
       reblog: ブーストを固定することはできません
     quote_policies:
-      followers: フォロワーとメンションされたユーザー
-      nobody: メンションされたユーザーのみ
-      public: 全員
+      followers: フォロワーのみ
+      nobody: 自分のみ
+      public: 誰でも
     title: '%{name}: "%{quote}"'
     visibilities:
-      direct: ダイレクト
-      private: フォロワー限定
-      private_long: フォロワーにのみ表示されます
+      private: フォロワーのみ
       public: 公開
-      public_long: 誰でも見ることができ、かつ公開タイムラインに表示されます
-      unlisted: 非収載
-      unlisted_long: 誰でも見ることができますが、公開タイムラインには表示されません
   statuses_cleanup:
     enabled: 古い投稿を自動的に削除する
     enabled_hint: 設定した期間を過ぎた投稿は、以下の例外に該当しない限り、自動的に削除されます
@@ -1876,7 +1896,7 @@ ja:
     sensitive_content: 閲覧注意
   strikes:
     errors:
-      too_late: このストライクに抗議するには遅すぎます
+      too_late: 異議申立をするには遅すぎます
   tags:
     does_not_match_previous_name: 以前の名前と一致しません
   terms_of_service:
@@ -1931,7 +1951,7 @@ ja:
       explanation: "%{strike_date}のストライクに対して、あなたが%{appeal_date}に行った申し立ては却下されました。"
       subject: "%{date}の申し立てが拒否されました"
       subtitle: 申し立ては拒否されました。
-      title: 却下された抗議
+      title: 却下された異議申立
     backup_ready:
       explanation: Mastodonアカウントの完全バックアップをリクエストしました。
       extra: ダウンロードの準備ができました！
@@ -1960,7 +1980,7 @@ ja:
       subtitle: "%{domain} の利用規約が変更されています"
       title: 重要な更新
     warning:
-      appeal: 抗議を送信
+      appeal: 異議申立を送信
       appeal_description: これが間違いだと思われる場合は、%{instance}のスタッフに申し立てすることができます。
       categories:
         spam: スパム
diff --git a/config/locales/ka.yml b/config/locales/ka.yml
index f3178be8d38..200dac18808 100644
--- a/config/locales/ka.yml
+++ b/config/locales/ka.yml
@@ -433,12 +433,7 @@ ka:
       ownership: სხვისი ტუტი ვერ აიპინება
       reblog: ბუსტი ვერ აიპინება
     visibilities:
-      private: მხოლოდ-მიმდევრები
-      private_long: აჩვენე მხოლოდ მიმდევრებს
       public: საჯარო
-      public_long: ხედავს ყველა
-      unlisted: ჩამოუთვლელი
-      unlisted_long: ხედავს ყველა, მაგრამ არ ჩანს საჯარო თაიმლაინებში
   stream_entries:
     sensitive_content: მგრძნობიარე კონტენტი
   themes:
diff --git a/config/locales/kab.yml b/config/locales/kab.yml
index a7ad9b356f6..61fb800301d 100644
--- a/config/locales/kab.yml
+++ b/config/locales/kab.yml
@@ -33,6 +33,11 @@ kab:
         new_email: Imayl amaynut
         submit: Beddel imayl
         title: Beddel imayl-ik s %{username}
+      change_role:
+        edit_roles: Sefrek timlilin n usqdac
+        label: Snifel tamlilt
+        no_role: War tamlilt
+        title: Snifel tamlilt n %{username}
       confirm: Sentem
       confirmed: Yettwasentem
       confirming: Asentem
@@ -95,6 +100,7 @@ kab:
       reset: Wennez
       reset_password: Beddel awal uffir
       resubscribe: Ales ajerred
+      role: Tamlilt
       search: Nadi
       search_same_ip: Imseqdacen-nniḍen s tansa IP am tinn-ik
       security: Taɣellist
@@ -121,6 +127,7 @@ kab:
       whitelisted: Deg tebdert tamellalt
     action_logs:
       action_types:
+        change_role_user: Snifel tamlilt n useqdac
         confirm_user: Sentem aseqdac
         create_announcement: Rnu-d ulɣu
         create_custom_emoji: Rnu imujit udmawan
@@ -128,6 +135,7 @@ kab:
         create_domain_block: Rnu-d asewḥel n taɣult
         create_ip_block: Rnu alugen n IP
         create_unavailable_domain: Rnu-d taɣult ur nelli ara
+        create_user_role: Snulfu-d tamlilt
         destroy_announcement: Kkes ulɣu
         destroy_custom_emoji: Kkes imujit udmawan
         destroy_domain_allow: Kkes taɣult yettusirgen
@@ -135,6 +143,7 @@ kab:
         destroy_ip_block: Kkes alugen n IP
         destroy_status: Kkes tasufeɣt
         destroy_unavailable_domain: Kkes taɣult ur nelli ara
+        destroy_user_role: Senger tamlilt
         disable_2fa_user: Gdel 2FA
         disable_custom_emoji: Sens imujit udmawan
         disable_user: Sens aseqdac
@@ -150,6 +159,7 @@ kab:
         update_custom_emoji: Leqqem imuji udmawan
         update_domain_block: Leqqem iḥder n taɣult
         update_status: Leqqem tasufeɣt
+        update_user_role: Leqqem tamlilt
       actions:
         assigned_to_self_report_html: "%{name} imudd aneqqis %{target} i yiman-nsen"
         create_account_warning_html: "%{name} yuzen alɣu i %{target}"
@@ -274,12 +284,16 @@ kab:
           delete: Kkes
           ip: Tansa IP
       providers:
+        active: D urmid
         delete: Kkes
+        edit: Ẓreg asaǧǧaw
+        finish_registration: Fakk ajerred
         name: Isem
         providers: Asaǧǧaw
         registrations:
           confirm: Sentem
         save: Sekles
+        sign_in: Qqen
       title: FASP
     follow_recommendations:
       language: I tutlayt
@@ -383,6 +397,10 @@ kab:
       updated_at: Yettwaleqqem
       view_profile: Wali amaɣnu
     roles:
+      add_new: Rnu tawuri
+      assigned_users:
+        one: "%{count} n useqdac"
+        other: "%{count} n iseqdacen"
       categories:
         administration: Tadbelt
         invites: Iɛeṛṛuḍen
@@ -391,20 +409,28 @@ kab:
       everyone: Tisirag timezwura
       privileges:
         administrator: Anedbal
+        manage_federation: Sefrek Tafidiralit
+        manage_roles: Sefrek ilugan
+        manage_rules: Sefrek ilugan
         manage_settings: Asefrek n iɣewwaṛen
+        manage_users: Sefrek iqeddacen
         view_dashboard: Timẓriwt n tfelwit
     rules:
       add_new: Rnu alugen
+      add_translation: Ad yernu tasuqilt
       delete: Kkes
       edit: Ẓreg alugen
       empty: Mazal ur ttwasbadun ara yilugan n uqeddac.
       title: Ilugan n uqeddac
+      translation: Tasuqilt
+      translations: Tisuqilin
     settings:
       about:
         title: Ɣef
       appearance:
         title: Udem
       discovery:
+        privacy: Tabaḍnit
         profile_directory: Akaram n imaɣnuten
         title: Asnirem
         trends: Ayen mucaɛen
@@ -432,16 +458,24 @@ kab:
       contents: Agbur
       deleted: Yettwakkes
       favourites: Imenyafen
+      in_reply_to: Tiririt i
       language: Tutlayt
       media:
         title: Amidya
       open: Ldi tasuffeɣt
-      trending: Ayen mucaɛen
+      status_title: Tasuffeɣt sɣur @%{name}
+      trending: Inezzaɣ
       visibility: Abani
       with_media: S umidya
     system_checks:
+      elasticsearch_preset:
+        action: Wali tasemlit
+      elasticsearch_preset_single_node:
+        action: Wali tasemlit
       rules_check:
         action: Sefrek ilugan n uqeddac
+      software_version_check:
+        message_html: Yella lqem n Mastodon.
       software_version_critical_check:
         action: Wali ileqqman yellan
       software_version_patch_check:
@@ -454,7 +488,10 @@ kab:
       title: Ihacṭagen
     terms_of_service:
       changelog: Amaynut
+      create: Sqedcet ayla-nwen
       draft: Arewway
+      generates:
+        action: Sirew
       history: Amazray
       live: Srid
       publish: Asuffeɣ
@@ -463,25 +500,43 @@ kab:
     title: Tadbelt
     trends:
       allow: Sireg
+      links:
+        allow: Sireg aseɣwen
+        title: Iseɣwan inezzaɣ
       statuses:
-        title: Tisuffaɣ mucaɛen
+        title: Tisuffaɣ tinezzaɣ
       tags:
         dashboard:
           tag_languages_dimension: Tutlayin ifazen
-      trending: Ayen mucaɛen
+        title: Ihacṭagen inezzaɣ
+        trending_rank: 'Anezzuɣ #%{rank}'
+      trending: Inezzaɣ
+    username_blocks:
+      add_new: Rnu amaynut
+      comparison:
+        contains: Igber
+      delete: Kkes
+      new:
+        create: Rnu alugen
+        title: Rnu alugen n useqdac amaynut
     warning_presets:
       add_new: Rnu amaynut
       delete: Kkes
     webhooks:
       delete: Kkes
       enable: Rmed
+      enabled: D urmid
   admin_mailer:
     new_report:
       body: "%{reporter} yettwazen ɣef %{target}"
       subject: Aneqqis amaynut i %{instance} (#%{id})
     new_trends:
+      new_trending_links:
+        title: Iseɣwan inezzaɣ
       new_trending_statuses:
-        title: Tisuffaɣ mucaɛen
+        title: Tisuffaɣ tinezzaɣ
+      new_trending_tags:
+        title: Ihacṭagen inezzaɣ
   appearance:
     advanced_web_interface: Agrudem n web leqqayen
     discovery: Asnirem
@@ -524,10 +579,10 @@ kab:
     migrate_account: Gujj ɣer umiḍan nniḍen
     or_log_in_with: Neɣ eqqen s
     progress:
-      confirm: Sentem imayl
-      details: Isalli-inek
+      confirm: Asentem n imayl
+      details: Isalli-inek·inem
       review: Tamuɣli-nneɣ
-      rules: Qbel ilugan
+      rules: Abal n ilugan
     providers:
       cas: CAS
       saml: SAML
@@ -539,6 +594,7 @@ kab:
       accept: Qbel
       back: Tuɣalin
       invited_by: 'Tzemreḍ ad tkecmeḍ ɣer %{domain} s tanemmirt i tinnubga i d-teṭṭfeḍ sɣur :'
+      preamble: Tiyi ttwasemmant-d yerna ttwaḍemnent sɣur imḍebbren n %{domain}.
       preamble_invited: Uqbel ad tkemmleḍ, ttxil-k·m ẓer ilugan i d-sbedden yimkariyen n %{domain}.
       title: Kra n yilugan igejdanen.
       title_invited: Tettwaɛerḍeḍ.
@@ -550,11 +606,14 @@ kab:
       preamble_html: Kcem ar <strong>%{domain}</strong> s inekcam-inek n tuqqna. Ma yella yezga-d umiḍan-ik deg uqeddac-nniḍen, ur tezmireḍ ara ad tkecmeḍ sya.
       title: Akeččum ɣer %{domain}
     sign_up:
+      preamble: S umiḍan yellan deg uqeddac-a n Mastodon, ad tizimreḍ ad t-ḍefreḍ yal yiwen nniḍen i yellan deg fediverse, akken yebɣu yili wanda i yella umiḍan-nsen.
       title: Iyya ad d-nessewjed tiɣawsiwin i %{domain}.
     status:
       account_status: Addad n umiḍan
       functional: Amiḍan-inek·inem yetteddu s lekmal-is.
     use_security_key: Seqdec tasarut n teɣlist
+    user_agreement_html: Ɣriɣ yerna qebleɣ <a href="<a href="%{terms_of_service_path}" target="_blank">" target="_blank">tiwtilin ne useqdec</a> akked <a href="%{privacy_policy_path}" target="_blank">tsertit n tbaḍnit</a>
+    user_privacy_agreement_html: Ɣriɣ yerna qebleɣ <a href="%{privacy_policy_path}" target="_blank">tasertit n tbaḍnit</a>
   author_attribution:
     example_title: Amedya n weḍris
     more_from_html: Ugar s ɣur %{name}
@@ -601,6 +660,9 @@ kab:
     basic_information: Talɣut tamatut
     hint_html: "<strong>Mudd udem i wayen ttwalin medden deg umaɣnu-inek azayez ɣer yidis n yiznan-ik.</strong> Imdanen niḍen zemren ad k-ḍefren yernu ad gen assaɣ yid-k mi ara tesɛuḍ amaɣnu yeccuṛen ed tugna n umaɣnu."
     other: Ayen nniḍen
+  emoji_styles:
+    auto: Awurman
+    twemoji: Twemoji
   errors:
     '404': Asebter i tettnadiḍ ulac-it da.
     '500':
@@ -612,6 +674,7 @@ kab:
       date: Azemz
       download: Sider-d aḥraz-ik·im
       size: Teɣzi
+    blocks: Tregleḍ
     bookmarks: Ticraḍ
     csv: CSV
     lists: Tibdarin
@@ -713,6 +776,8 @@ kab:
       action: Err
       body: 'Yuder-ik·ikem-id %{name} deg:'
       subject: Yuder-ik·ikem-id %{name}
+    quote:
+      title: Tabdert tamaynut
     reblog:
       subject: "%{name} yesselha addad-ik·im"
       title: Azuzer amaynut
@@ -823,6 +888,8 @@ kab:
     statuses_cleanup: Tukksa tawurmant n tsuffaɣ
     two_factor_authentication: Asesteb s snat n tarrayin
     webauthn_authentication: Tisura n teɣlist
+  severed_relationships:
+    download: Azdam (%{count})
   statuses:
     attached:
       audio:
@@ -835,16 +902,22 @@ kab:
         one: "%{count} n tbidyutt"
         other: "%{count} n tbidyutin"
     edited_at_html: Tettwaẓreg ass n %{date}
+    pin_errors:
+      reblog: Azuzer ur yezmir ara ad yili d unṭiḍ
+    quote_policies:
+      followers: Imeḍfaṛen kan
+      nobody: Nekki kan
+      public: Yal yiwen
     title: '%{name} : "%{quote}"'
     visibilities:
-      direct: Usrid
+      direct: Abdar uslig
       private: Imeḍfaṛen kan
-      private_long: Ssken i ymeḍfaṛen kan
       public: Azayez
-      public_long: Yal yiwen·t yezmer at iwali
-      unlisted: War tabdert
+      public_long: Kra n win yellan deg Masṭudun neɣ berra-s
+      unlisted: Azayez asusam
   statuses_cleanup:
     enabled: Tukksa n tsuffaɣ tiqburin s wudem awurman
+    keep_pinned: Eǧǧ tisuffaɣ tunṭiḍin
     min_age:
       '1209600': 2 n yimalasen
       '15778476': 6 n wayyuren
@@ -880,6 +953,8 @@ kab:
   user_mailer:
     appeal_approved:
       action: Iɣewwaṛen n umiḍan
+    suspicious_sign_in:
+      change_password: snifel awal-ik·im n uɛeddi
     terms_of_service_changed:
       sign_off: Agraw n %{domain}
     warning:
@@ -900,12 +975,14 @@ kab:
       edit_profile_title: Sagen amaɣnu-inek·inem
       feature_action: Issin ugar
       follow_action: Ḍfeṛ
+      follow_title: Sagen isuddam n yisallen n wejgu-k·m agejdan
       follows_subtitle: Ḍfer imiḍanen yettwassnen mliḥ
       follows_title: Anwa ara ḍefṛeḍ
       follows_view_more: Ssken-d ugar n medden ay tzemred ad tḍefred
-      hashtags_subtitle: Wali ayen ileḥḥun seg sin wussan-a iεeddan
-      hashtags_title: Ihacṭagen mucaɛen
-      hashtags_view_more: Sken-d ugar n yihacṭagen mucaɛen
+      hashtags_subtitle: Snirem ayen yellan d anezzuɣ deg 2 n wussan-a iεeddan
+      hashtags_title: Ihacṭagen inezzaɣ
+      hashtags_view_more: Sken-d ugar n yihacṭagen inezzaɣ
+      post_action: Aru
       post_step: Ini-as azul i umaḍal s uḍris, s tiwlafin, s tividyutin neɣ s tefranin.
       post_title: Aru tasuffeɣt-inek·inem tamezwarut
       share_step: Init-asen i yimeddukal-nwen amek ara ken-id-afen deg Mastodon.
@@ -918,6 +995,9 @@ kab:
   verification:
     here_is_how: Ha-t-a amek
     verification: Asenqed
+    website_verification: Asenqed n usmel web
   webauthn_credentials:
     add: Rnu tasarut n teɣlist tamaynut
+    create:
+      success: Tasarut-ik·im n tɣellist tettwarna akken iwata.
     delete: Kkes
diff --git a/config/locales/kk.yml b/config/locales/kk.yml
index a2123107ed0..b877cb09c79 100644
--- a/config/locales/kk.yml
+++ b/config/locales/kk.yml
@@ -649,12 +649,7 @@ kk:
       ownership: Біреудің жазбасы жабыстырылмайды
       reblog: Бөлісілген жазба жабыстырылмайды
     visibilities:
-      private: Тек оқырмандарға
-      private_long: Тек оқырмандарға ғана көрінеді
       public: Ашық
-      public_long: Бәрі көре алады
-      unlisted: Тізімге енбеген
-      unlisted_long: Бәрі көре алады, бірақ ашық тізімдерге ене алмайды
   stream_entries:
     sensitive_content: Нәзік мазмұн
   tags:
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index cc6665c1cb7..5c158223c13 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -181,12 +181,13 @@ ko:
         create_canonical_email_block: 이메일 차단 생성
         create_custom_emoji: 커스텀 에모지 생성
         create_domain_allow: 도메인 허용 생성
-        create_domain_block: 도메인 차단 추가
+        create_domain_block: 도메인 차단 만들기
         create_email_domain_block: 이메일 도메인 차단 생성
         create_ip_block: IP 규칙 만들기
         create_relay: 릴레이 생성
         create_unavailable_domain: 사용 불가능한 도메인 생성
         create_user_role: 역할 생성
+        create_username_block: 새 사용자명 규칙 만들기
         demote_user: 사용자 강등
         destroy_announcement: 공지사항 삭제
         destroy_canonical_email_block: 이메일 차단 삭제
@@ -200,6 +201,7 @@ ko:
         destroy_status: 게시물 삭제
         destroy_unavailable_domain: 사용 불가능한 도메인 제거
         destroy_user_role: 역할 삭제
+        destroy_username_block: 사용자명 규칙 삭제
         disable_2fa_user: 2단계 인증 비활성화
         disable_custom_emoji: 커스텀 에모지 비활성화
         disable_relay: 릴레이 비활성화
@@ -234,6 +236,7 @@ ko:
         update_report: 신고 업데이트
         update_status: 게시물 수정
         update_user_role: 역할 수정
+        update_username_block: 사용자명 규칙 업데이트
       actions:
         approve_appeal_html: "%{name} 님이 %{target}의 중재 결정에 대한 이의 제기를 승인했습니다"
         approve_user_html: "%{name} 님이 %{target} 님의 가입을 승인했습니다"
@@ -252,6 +255,7 @@ ko:
         create_relay_html: "%{name} 님이 릴레이 %{target}를 생성했습니다"
         create_unavailable_domain_html: "%{name} 님이 도메인 %{target}에 대한 전달을 중지했습니다"
         create_user_role_html: "%{name} 님이 %{target} 역할을 생성했습니다"
+        create_username_block_html: "%{name} 님이 %{target}를 포함하는 사용자명에 대한 규칙을 생성했습니다"
         demote_user_html: "%{name} 님이 사용자 %{target} 님을 강등했습니다"
         destroy_announcement_html: "%{name} 님이 공지 %{target}을 삭제했습니다"
         destroy_canonical_email_block_html: "%{name} 님이 %{target} 해시를 가진 이메일을 차단 해제했습니다"
@@ -265,6 +269,7 @@ ko:
         destroy_status_html: "%{name} 님이 %{target} 님의 게시물을 삭제했습니다"
         destroy_unavailable_domain_html: "%{name} 님이 도메인 %{target}에 대한 전달을 재개"
         destroy_user_role_html: "%{name} 님이 %{target} 역할을 삭제했습니다"
+        destroy_username_block_html: "%{name} 님이 %{target}를 포함하는 사용자명에 대한 규칙을 삭제했습니다"
         disable_2fa_user_html: "%{name} 님이 사용자 %{target} 님의 2단계 인증을 비활성화 했습니다"
         disable_custom_emoji_html: "%{name} 님이 에모지 %{target}를 비활성화했습니다"
         disable_relay_html: "%{name} 님이 릴레이 %{target}를 비활성화했습니다"
@@ -299,6 +304,7 @@ ko:
         update_report_html: "%{name} 님이 신고 %{target}를 업데이트 했습니다"
         update_status_html: "%{name} 님이 %{target}의 게시물을 업데이트했습니다"
         update_user_role_html: "%{name} 님이 %{target} 역할을 수정했습니다"
+        update_username_block_html: "%{name} 님이 %{target}를 포함하는 사용자명에 대한 규칙을 수정했습니다"
       deleted_account: 계정을 삭제했습니다
       empty: 로그를 찾을 수 없습니다
       filter_by_action: 동작 별 필터
@@ -1069,6 +1075,25 @@ ko:
           other: 지난 주 동안 %{count} 명의 사람들이 사용했습니다
       title: 추천과 유행
       trending: 유행 중
+    username_blocks:
+      add_new: 새로 추가
+      block_registrations: 가입 차단
+      comparison:
+        contains: 포함
+        equals: 일치
+      contains_html: "%{string} 포함"
+      created_msg: 사용자명 규칙을 생성했습니다
+      delete: 삭제
+      edit:
+        title: 사용자명 규칙 편집
+      matches_exactly_html: "%{string}과 일치"
+      new:
+        create: 규칙 만들기
+        title: 새 유저네임 규칙 만들기
+      no_username_block_selected: 아무 것도 선택 되지 않아 어떤 사용자명 규칙도 변경 되지 않았습니다
+      not_permitted: 허용하지 않음
+      title: 사용자명 규칙
+      updated_msg: 사용자명 규칙을 변경했습니다
     warning_presets:
       add_new: 새로 추가
       delete: 삭제
@@ -1332,6 +1357,10 @@ ko:
     basic_information: 기본 정보
     hint_html: "<strong>사람들이 공개 프로필을 보고서 게시물을 볼 때를 위한 프로필을 꾸밉니다.</strong> 프로필과 프로필 사진을 채우면 다른 사람들이 나를 팔로우하고 나와 교류할 기회가 더 많아집니다."
     other: 기타
+  emoji_styles:
+    auto: 자동
+    native: 시스템 기본
+    twemoji: 트웨모지
   errors:
     '400': 제출한 요청이 올바르지 않습니다.
     '403': 이 페이지를 표시할 권한이 없습니다.
@@ -1621,6 +1650,10 @@ ko:
       title: 새 답글
     poll:
       subject: "%{name}의 설문이 종료됨"
+    quote:
+      body: '당신의 게시물을 %{name} 님이 인용했습니다:'
+      subject: "%{name} 님이 내 게시물을 인용했습니다"
+      title: 새 인용
     reblog:
       body: '당신의 게시물을 %{name} 님이 부스트 했습니다:'
       subject: "%{name} 님이 내 게시물을 부스트 했습니다"
@@ -1669,6 +1702,7 @@ ko:
       self_vote: 자신이 만든 설문에는 투표할 수 없음
       too_few_options: 둘 이상의 항목이 있어야 함
       too_many_options: 항목은 %{max}개를 넘을 수 없습니다
+    vote: 투표
   preferences:
     other: 기타
     posting_defaults: 게시물 기본설정
@@ -1827,6 +1861,7 @@ ko:
     edited_at_html: "%{date}에 편집됨"
     errors:
       in_reply_not_found: 답장하려는 게시물이 존재하지 않습니다.
+      quoted_status_not_found: 인용하려는 게시물이 존재하지 않습니다.
     over_character_limit: 최대 %{max}자까지 입력할 수 있습니다
     pin_errors:
       direct: 멘션된 사용자들에게만 보이는 게시물은 고정될 수 없습니다
@@ -1834,18 +1869,16 @@ ko:
       ownership: 다른 사람의 게시물은 고정될 수 없습니다
       reblog: 부스트는 고정될 수 없습니다
     quote_policies:
-      followers: 팔로워와 멘션된 사람들만
-      nobody: 멘션된 사람들만
-      public: 모두
+      followers: 팔로워만
+      nobody: 나만
+      public: 누구나
     title: '%{name}: "%{quote}"'
     visibilities:
-      direct: 다이렉트
-      private: 비공개
-      private_long: 팔로워에게만 공개됩니다
+      direct: 개인 멘션
       public: 공개
-      public_long: 누구나 볼 수 있으며, 공개 타임라인에 표시됩니다
-      unlisted: 미등재
-      unlisted_long: 누구나 볼 수 있지만, 공개 타임라인에는 표시되지 않습니다
+      public_long: 마스토돈 내외 모두
+      unlisted: 조용한 공개
+      unlisted_long: 마스토돈 검색결과, 유행, 공개 타임라인에서 숨기기
   statuses_cleanup:
     enabled: 오래된 게시물 자동 삭제
     enabled_hint: 아래의 예외 목록에 해당하지 않는다면, 명시된 기한 이후 당신의 게시물을 자동으로 삭제합니다
diff --git a/config/locales/ku.yml b/config/locales/ku.yml
index 06f3e32f20e..b05f49cd471 100644
--- a/config/locales/ku.yml
+++ b/config/locales/ku.yml
@@ -1405,13 +1405,7 @@ ku:
       reblog: Ev şandî nayê derzî kirin
     title: "%{name}%{quote}"
     visibilities:
-      direct: Rasterast
-      private: Tenê şopîneran
-      private_long: Tenê bo şopîneran nîşan bide
       public: Gelemperî
-      public_long: Herkes dikare bibîne
-      unlisted: Nerêzokkirî
-      unlisted_long: Herkes dikare bibîne, lê di demnameya gelemperî de nayê rêz kirin
   statuses_cleanup:
     enabled: Şandiyên berê bi xweberî va jê bibe
     enabled_hint: Gava ku ew gihîştibe sînorê temenê diyarkirî, şandiyên te bi xweberî jê dibe, ji bilî van awareteyên jêrîn
diff --git a/config/locales/lad.yml b/config/locales/lad.yml
index e3c14367b78..06bc932ea4d 100644
--- a/config/locales/lad.yml
+++ b/config/locales/lad.yml
@@ -186,6 +186,7 @@ lad:
         create_domain_block: Kriya bloko de domeno
         create_email_domain_block: Kriya bloko de domeno de posta
         create_ip_block: Kriya regla de IP
+        create_relay: Kriya relevo
         create_unavailable_domain: Kriya domeno no desponivle
         create_user_role: Kriya rolo
         demote_user: Degrada utilizador
@@ -197,14 +198,17 @@ lad:
         destroy_email_domain_block: Efasa bloko de domeno de posta
         destroy_instance: Efasa domeno
         destroy_ip_block: Efasa regla de IP
+        destroy_relay: Efasa relevo
         destroy_status: Efasa publikasyon
         destroy_unavailable_domain: Efasa domeno no desponivle
         destroy_user_role: Efasa rolo
         disable_2fa_user: Inkapasita autentifikasyon en dos pasos
         disable_custom_emoji: Inkapasita emoji personalizados
+        disable_relay: Dezaktiva relevo
         disable_sign_in_token_auth_user: Inkapasita la autentifikasyon por token de posta elektronika para el utilizador
         disable_user: Inkapasita utilizador
         enable_custom_emoji: Kapasita emoji personalizados
+        enable_relay: Aktiva relevo
         enable_sign_in_token_auth_user: Kapasita la autentifikasyon por token de posta para el utilizador
         enable_user: Kapasita utilizador
         memorialize_account: Transforma en kuento komemorativo
@@ -229,6 +233,7 @@ lad:
         update_custom_emoji: Aktualiza emoji personalizado
         update_domain_block: Aktualiza bloko de domeno
         update_ip_block: Aktualiza regla de IP
+        update_report: Aktualiza raporto
         update_status: Aktualiza publikasyon
         update_user_role: Aktualiza rolo
       actions:
@@ -466,10 +471,13 @@ lad:
     fasp:
       debug:
         callbacks:
+          created_at: Kriyado en
           delete: Efasa
+          ip: Adreso IP
       providers:
         active: Aktivo
         delete: Efasa
+        finish_registration: Finaliza enrejistrasyon
         name: Nombre
         registrations:
           confirm: Konfirma
@@ -477,6 +485,7 @@ lad:
         save: Guadra
         sign_in: Konektate
         status: Estado
+      title: FASP
     follow_recommendations:
       description_html: "<strong>Las rekomendasyones de kuentos ayudan a los muevos utilizadores a topar presto kontenido enteresante</strong>. Kuando un utilizador no tiene enteraktuado kon otros lo sufisiente komo para djenerar rekomendasyones personalizadas de kuentos a las ke segir, en sus lugar se le rekomiendan estes kuentos. Se rekalkulan diariamente a partir de una mikstura de kuentos kon el mayor numero de enteraksyones rezientes i kon el mayor numero de suivantes lokales kon una lingua determinada."
       language: Para la lingua
@@ -542,6 +551,12 @@ lad:
         all: Todos
         limited: Limitado
         title: Moderasyon
+      moderation_notes:
+        create: Adjusta nota de moderasyon
+        created_msg: Nota de moderasyon de sirvidor kriyada kon sukseso!
+        description_html: Ve i desha notas a otros moderadores i a tu yo futuro
+        destroyed_msg: Nota de moderasyon de sirvidor efasada kon sukseso!
+        title: Notas de moderasyon
       private_comment: Komento privado
       public_comment: Komento publiko
       purge: Purga
@@ -748,6 +763,7 @@ lad:
       title: Rolos
     rules:
       add_new: Adjusta regla
+      add_translation: Adjusta traduksyon
       delete: Efasa
       description_html: Aunke la majorita afirma aver meldado i estar de akodro kon los terminos de servisyo, la djente normalmente no los melda asta dempues de ke surja algun problema. <strong>Az ke sea mas kolay ver las normas de tu sirvidor de un vistazo estipulándolas en una lista de puntos.</strong> Aprova ke kada norma sea corta i kolay, ama sin estar divididas en munchos puntos.
       edit: Edita regla
@@ -780,6 +796,7 @@ lad:
       discovery:
         follow_recommendations: Rekomendasyones de kuentos
         preamble: Ekspone kontenido enteresante a la superfisie es fundamental para inkorporar muevos utilizadores ke pueden no koneser a dinguno Mastodon. Kontrola komo fonksionan varias opsiones de diskuvrimiento en tu sirvidor.
+        privacy: Privasita
         profile_directory: Katalogo de profiles
         public_timelines: Linyas de tiempo publikas
         publish_statistics: Publika estatistikas
@@ -920,6 +937,9 @@ lad:
       updated_msg: Konfigurasyon de etiketas aktualizada kon sukseso
     terms_of_service:
       changelog: Ke troko
+      current: Aktual
+      generates:
+        action: Djenera
       history: Istorya
       live: En bivo
       publish: Publika
@@ -989,6 +1009,11 @@ lad:
           other: Uzada por %{count} personas durante la ultima semana
       title: Rekomendasyones i trendes
       trending: En trend
+    username_blocks:
+      add_new: Adjusta muevo
+      delete: Efasa
+      new:
+        create: Kriya regla
     warning_presets:
       add_new: Adjusta muevo
       delete: Efasa
@@ -1245,6 +1270,10 @@ lad:
     basic_information: Enformasyon bazika
     hint_html: "<strong>Personaliza lo ke la djente ve en tu profil publiko i kon tus publikasyones.</strong> Es mas probavle ke otras personas te sigan i enteraktuen kontigo kuando kompletas tu profil i foto."
     other: Otros
+  emoji_styles:
+    auto: Otomatiko
+    native: Nativo
+    twemoji: Twemoji
   errors:
     '400': La solisitasyon ke enviates no fue valida o fue malformada.
     '403': No tienes permiso para ver esta pajina.
@@ -1563,6 +1592,7 @@ lad:
       self_vote: No puedes votar en tus propias anketas
       too_few_options: deve tener mas de un elemento
       too_many_options: no puede kontener mas de %{max} elementos
+    vote: Vota
   preferences:
     other: Otros
     posting_defaults: Konfigurasyon predeterminada de publikasyones
@@ -1726,16 +1756,14 @@ lad:
       ownership: La publikasyon de otra persona no puede fiksarse
       reblog: No se puede fixar una repartajasyon
     quote_policies:
-      public: Todos
+      nobody: Solo yo
     title: '%{name}: "%{quote}"'
     visibilities:
-      direct: Direkto
+      direct: Enmentadura privada
       private: Solo suivantes
-      private_long: Solo amostra a tus segidores
       public: Publiko
-      public_long: Todos pueden ver
-      unlisted: No listado
-      unlisted_long: Todos pueden ver, ama no esta listado en las linyas de tiempo publikas
+      public_long: Todos en i afuera de Mastodon
+      unlisted: Publiko i silensyozo
   statuses_cleanup:
     enabled: Otomatikamente efasa publikasyones viejas
     enabled_hint: Supreme otomatikamente tus publikasyones kuando alkansen un limito de tiempo espesifikado, a manko ke koensiden kon alguna de las eksepsiones detalyadas debasho
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index 41cf7cae96f..eb69f2b06d5 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -188,6 +188,7 @@ lt:
         create_relay: Kurti perdavimą
         create_unavailable_domain: Kurti nepasiekiamą domeną
         create_user_role: Kurti vaidmenį
+        create_username_block: Kurti naudotojo vardo taisyklę
         demote_user: Pažeminti naudotoją
         destroy_announcement: Ištrinti skelbimą
         destroy_custom_emoji: Ištrinti pasirinktinį jaustuką
@@ -199,6 +200,7 @@ lt:
         destroy_status: Ištrinti įrašą
         destroy_unavailable_domain: Ištrinti nepasiekiamą domeną
         destroy_user_role: Sunaikinti vaidmenį
+        destroy_username_block: Ištrinti naudotojo vardo taisyklę
         disable_2fa_user: Išjungti 2FA
         disable_custom_emoji: Išjungti pasirinktinį jaustuką
         disable_relay: Išjungti perdavimą
@@ -231,6 +233,7 @@ lt:
         update_report: Atnaujinti ataskaitą
         update_status: Atnaujinti įrašą
         update_user_role: Atnaujinti vaidmenį
+        update_username_block: Atnaujinti naudotojo vardo taisyklę
       actions:
         approve_appeal_html: "%{name} patvirtino prižiūjimo veiksmo apeliaciją iš %{target}"
         approve_user_html: "%{name} patvirtino registraciją iš %{target}"
@@ -245,6 +248,7 @@ lt:
         create_relay_html: "%{name} sukūrė perdavimą %{target}"
         create_unavailable_domain_html: "%{name} sustabdė tiekimą į domeną %{target}"
         create_user_role_html: "%{name} sukūrė %{target} vaidmenį"
+        create_username_block_html: "%{name} pridėjo taisyklę naudotojo vardams, turintiems %{target}"
         demote_user_html: "%{name} pažemino naudotoją %{target}"
         destroy_announcement_html: "%{name} ištrynė skelbimą %{target}"
         destroy_custom_emoji_html: "%{name} ištrynė jaustuką %{target}"
@@ -256,6 +260,7 @@ lt:
         destroy_status_html: "%{name} pašalino įrašą %{target}"
         destroy_unavailable_domain_html: "%{name} pratęsė tiekimą į domeną %{target}"
         destroy_user_role_html: "%{name} ištrynė %{target} vaidmenį"
+        destroy_username_block_html: "%{name} pašalino taisyklę naudotojo vardams, turintiems %{target}"
         disable_2fa_user_html: "%{name} išjungė dviejų veiksnių reikalavimą naudotojui %{target}"
         disable_custom_emoji_html: "%{name} išjungė jaustuką %{target}"
         disable_relay_html: "%{name} išjungė perdavimą %{target}"
@@ -287,6 +292,7 @@ lt:
         update_report_html: "%{name} atnaujino ataskaitą %{target}"
         update_status_html: "%{name} atnaujino įrašą %{target}"
         update_user_role_html: "%{name} pakeitė %{target} vaidmenį"
+        update_username_block_html: "%{name} atnaujino taisyklę naudotojo vardams, turintiems %{target}"
       deleted_account: ištrinta paskyra
       empty: Žurnalų nerasta.
       filter_by_action: Filtruoti pagal veiksmą
@@ -746,6 +752,22 @@ lt:
         trending_rank: 'Tendencinga #%{rank}'
       title: Rekomendacijos ir tendencijos
       trending: Tendencinga
+    username_blocks:
+      add_new: Pridėti naują
+      block_registrations: Blokuoti registracijas
+      comparison:
+        contains: Yra
+        equals: Lygus
+      contains_html: Yra %{string}
+      created_msg: Sėkmingai sukurta naudotojo vardo taisyklė.
+      delete: Ištrinti
+      edit:
+        title: Redaguoti naudotojo vardo taisyklę
+      matches_exactly_html: Lygus %{string}
+      new:
+        create: Kurti taisyklę
+        title: Kurti naują naudotojo vardo taisyklę
+      no_username_block_selected: Jokios naudotojo vardo taisyklės nebuvo pakeistos, nes nė viena buvo pasirinkta.
     warning_presets:
       add_new: Pridėti naują
       delete: Ištrinti
@@ -912,6 +934,10 @@ lt:
       your_appeal_rejected: Tavo apeliacija buvo atmesta
   edit_profile:
     hint_html: "<strong>Tinkink tai, ką žmonės mato tavo viešame profilyje ir šalia įrašų.</strong> Kiti žmonės labiau linkę sekti atgal ir bendrauti su tavimi, jei tavo profilis yra užpildytas ir turi profilio nuotrauką."
+  emoji_styles:
+    auto: Automatinis
+    native: Vietiniai
+    twemoji: Tvejaustukai
   errors:
     '403': Jūs neturie prieigos matyti šiam puslapiui.
     '404': Puslapis nerastas.
@@ -1183,18 +1209,15 @@ lt:
         other: "%{count} vaizdų"
     boosted_from_html: Pakelta iš %{acct_link}
     content_warning: 'Turinio įspėjimas: %{warning}'
+    errors:
+      quoted_status_not_found: Įrašas, kurį bandote cituoti, atrodo, neegzistuoja.
     over_character_limit: pasiektas %{max} simbolių limitas
     pin_errors:
       limit: Jūs jau prisegėte maksimalų toot'ų skaičų
       ownership: Kitų vartotojų toot'ai negali būti prisegti
       reblog: Pakeltos žinutės negali būti prisegtos
     visibilities:
-      private: Tik sekėjams
-      private_long: rodyti tik sekėjams
       public: Vieša
-      public_long: visi gali matyti
-      unlisted: Neįtrauktas į sąrašą
-      unlisted_long: matyti gali visi, bet nėra išvardyti į viešąsias laiko skales
   statuses_cleanup:
     enabled_hint: Automatiškai ištrina įrašus, kai jie pasiekia nustatytą amžiaus ribą, nebent jie atitinka vieną iš toliau nurodytų išimčių
     interaction_exceptions_explanation: Atkreipk dėmesį, kad negarantuojama, jog įrašai nebus ištrinti, jei jų mėgstamumo ar pasidalinimo riba bus žemesnė, nors vieną kartą ji jau buvo viršyta.
diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index f7db52a40f0..979933b196b 100644
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -365,7 +365,7 @@ lv:
     dashboard:
       active_users: aktīvie lietotāji
       interactions: mijiedarbības
-      media_storage: Multividesu krātuve
+      media_storage: Multivides uzglabāšana
       new_users: jauni lietotāji
       opened_reports: atvērtie ziņojumi
       pending_appeals_html:
@@ -1164,7 +1164,7 @@ lv:
     remove: Atsaistīt aizstājvārdu
   appearance:
     advanced_web_interface: Paplašinātā tīmekļa saskarne
-    advanced_web_interface_hint: 'Ja vēlies izmantot visu ekrāna platumu, uzlabotā tīmekļa saskarne ļauj konfigurēt daudzas dažādas kolonnas, lai vienlaikus redzētu tik daudz informācijas, cik vēlies: Sākums, paziņojumi, apvienotā ziņu lenta, neierobežots skaits sarakstu un tēmturu.'
+    advanced_web_interface_hint: 'Ja vēlies izmantot visu ekrāna platumu, paplašinātā tīmekļa saskarne ļauj konfigurēt daudzas dažādas kolonnas, lai vienlaikus redzētu tik daudz informācijas, cik vēlies: Sākums, paziņojumi, apvienotā ziņu lenta, neierobežots skaits sarakstu un tēmturu.'
     animations_and_accessibility: Animācijas un pieejamība
     confirmation_dialogs: Apstiprināšanas dialogi
     discovery: Atklāšana
@@ -1550,8 +1550,8 @@ lv:
       muting: Importē noklusinātos kontus
     type: Importa veids
     type_groups:
-      constructive: Seko un Grāmatzīmes
-      destructive: Bloķētie un noklusinātie
+      constructive: Seko un grāmatzīmes
+      destructive: Liegtie un noklusinātie
     types:
       blocking: Bloķēšanas saraksts
       bookmarks: Grāmatzīmes
@@ -1728,7 +1728,7 @@ lv:
       duration_too_short: ir par agru
       expired: Aptauja jau ir beigusies
       invalid_choice: Izvēlētā balsošanas iespēja nepastāv
-      over_character_limit: katrs nedrīkst būt garāks par %{max} rakstzīmēm
+      over_character_limit: nedrīkst būt garākas par %{max} rakstzīmēm
       self_vote: Tu nevari balsot pats savā aptaujā
       too_few_options: jābūt vairāk nekā vienam vienumam
       too_many_options: nevar saturēt vairāk par %{max} vienumiem
@@ -1905,18 +1905,12 @@ lv:
       ownership: Kāda cita ierakstu nevar piespraust
       reblog: Pastiprinātu ierakstu nevar piespraust
     quote_policies:
-      followers: Sekotāji un pieminētie lietotāji
-      nobody: Tikai pieminētie lietotāji
-      public: Visi
+      followers: Tikai sekotāji
+      nobody: Tikai es
+      public: Jebkurš
     title: "%{name}: “%{quote}”"
     visibilities:
-      direct: Tiešs
-      private: Tikai sekotājiem
-      private_long: Rādīt tikai sekotājiem
       public: Publisks
-      public_long: Visi var redzēt
-      unlisted: Nerindota
-      unlisted_long: Redzams visiem, bet nav uzskaitīts visiem pieejamās laika joslās
   statuses_cleanup:
     enabled: Automātiski dzēst vecās ziņas
     enabled_hint: Automātiski izdzēš Tavus ierakstus, tiklīdz tie sasniedz noteiktu vecuma slieksni, ja vien tie neatbilst kādam no zemāk norādītajiem izņēmumiem
diff --git a/config/locales/ms.yml b/config/locales/ms.yml
index dc522f0af11..2df1e0c2b8f 100644
--- a/config/locales/ms.yml
+++ b/config/locales/ms.yml
@@ -1554,13 +1554,7 @@ ms:
       reblog: Rangsangan tidak boleh disematkan
     title: '%{name}: "%{quote}"'
     visibilities:
-      direct: Terus
-      private: Pengikut sahaja
-      private_long: Hanya tunjukkan kepada pengikut
       public: Awam
-      public_long: Semua orang boleh melihat
-      unlisted: Tidak tersenarai
-      unlisted_long: Semua orang boleh melihat, tetapi tidak disenaraikan pada garis masa awam
   statuses_cleanup:
     enabled: Padam hantaran lama secara automatik
     enabled_hint: Memadamkan pos anda secara automatik setelah mereka mencapai ambang umur yang ditentukan, melainkan ia sepadan dengan salah satu pengecualian di bawah
diff --git a/config/locales/my.yml b/config/locales/my.yml
index f46035833e3..644e648ac54 100644
--- a/config/locales/my.yml
+++ b/config/locales/my.yml
@@ -1545,13 +1545,7 @@ my:
       reblog: Boost လုပ်ထားသောပို့စ်ကို ပင်ထား၍မရပါ
     title: '%{name}: "%{quote}"'
     visibilities:
-      direct: တိုက်ရိုက်
-      private: စောင့်ကြည့်သူများသာ
-      private_long: စောင့်ကြည့်သူများကိုသာ ပြရန်
       public: အများမြင်
-      public_long: လူတိုင်းမြင်နိုင်ပါသည်
-      unlisted: စာရင်းမသွင်းထားပါ
-      unlisted_long: လူတိုင်းမြင်နိုင်သော်လည်း အများမြင်မည့်စာမျက်နှာများတွင် စာရင်းမသွင်းထားပါ။
   statuses_cleanup:
     enabled: ပို့စ်အဟောင်းများကို အလိုအလျောက် ဖျက်ပါ
     enabled_hint: အောက်ပါခြွင်းချက်များထဲမှ တစ်ခုနှင့် မကိုက်ညီပါက သတ်မှတ်ထားသည့်ကာလအပိုင်းအခြားသို့ ရောက်သည်နှင့် သင့်ပို့စ်များကို အလိုအလျောက် ဖျက်ပါမည်
diff --git a/config/locales/nan.yml b/config/locales/nan.yml
index 810a6f69578..74d4fd813fe 100644
--- a/config/locales/nan.yml
+++ b/config/locales/nan.yml
@@ -25,7 +25,7 @@ nan:
       action: 執行動作
       already_silenced: Tsit ê口座有受著限制。
       already_suspended: Tsit ê口座ê權限已經hōo lâng停止。
-      title: Kā %{acct} 做審核ê動作
+      title: Kā %{acct} 做管理ê動作
     account_moderation_notes:
       create: 留記錄
       created_msg: 管理記錄成功建立！
@@ -97,7 +97,7 @@ nan:
         silenced: 受限制
         suspended: 權限中止ah
         title: 管理
-      moderation_notes: 管理ê註釋
+      moderation_notes: 管理ê筆記
       most_recent_activity: 最近ê活動時間
       most_recent_ip: 最近ê IP
       no_account_selected: 因為無揀任何口座，所以lóng無改變
@@ -187,6 +187,7 @@ nan:
         create_relay: 建立中繼
         create_unavailable_domain: 建立bē當用ê域名
         create_user_role: 建立角色
+        create_username_block: 新造使用者號名規則
         demote_user: Kā用者降級
         destroy_announcement: Thâi掉公告
         destroy_canonical_email_block: Thâi掉電子phue ê封鎖
@@ -200,6 +201,7 @@ nan:
         destroy_status: Thâi掉PO文
         destroy_unavailable_domain: Thâi掉bē當用ê域名
         destroy_user_role: Thâi掉角色
+        destroy_username_block: 共使用者號名規則刣掉
         disable_2fa_user: 停止用雙因素認證
         disable_custom_emoji: 停止用自訂ê Emoji
         disable_relay: 停止用中繼
@@ -211,7 +213,7 @@ nan:
         enable_user: 啟用口座
         memorialize_account: 設做故人ê口座
         promote_user: Kā用者升級
-        publish_terms_of_service: 公佈服務ê使用規則
+        publish_terms_of_service: 公佈服務規定
         reject_appeal: 拒絕申訴
         reject_user: 拒絕用者
         remove_avatar_user: Thâi掉標頭
@@ -234,8 +236,9 @@ nan:
         update_report: 更新檢舉
         update_status: 更新PO文
         update_user_role: 更新角色
+        update_username_block: 更新使用者號名規則
       actions:
-        approve_appeal_html: "%{name} 允准 %{target} 所寫ê tuì審核決定ê投訴"
+        approve_appeal_html: "%{name} 允准 %{target} 所寫ê tuì管理決定ê投訴"
         approve_user_html: "%{name} 允准 %{target} ê 註冊"
         assigned_to_self_report_html: "%{name} kā報告 %{target} 分配hōo家tī"
         change_email_user_html: "%{name} 改變 %{target} ê電子phue地址"
@@ -245,18 +248,19 @@ nan:
         create_announcement_html: "%{name} kā公告 %{target} 建立ah"
         create_canonical_email_block_html: "%{name} kā hash是 %{target} ê電子phue封鎖ah"
         create_custom_emoji_html: "%{name} kā 新ê emoji %{target} 傳上去ah"
-        create_domain_allow_html: "%{name} 允准 %{target} 域名加入聯邦宇宙"
+        create_domain_allow_html: "%{name} 允准 %{target} 域名加入聯邦"
         create_domain_block_html: "%{name} 封鎖域名 %{target}"
         create_email_domain_block_html: "%{name} kā 電子phue域名 %{target} 封鎖ah"
         create_ip_block_html: "%{name} 建立 IP %{target} ê規則"
         create_relay_html: "%{name} 建立中繼 %{target}"
         create_unavailable_domain_html: "%{name} 停止送kàu域名 %{target}"
         create_user_role_html: "%{name} 建立 %{target} 角色"
+        create_username_block_html: "%{name} 加添用者ê名包含 %{target} ê規則ah"
         demote_user_html: "%{name} kā用者 %{target} 降級"
         destroy_announcement_html: "%{name} kā公告 %{target} thâi掉ah"
         destroy_canonical_email_block_html: "%{name} kā hash是 %{target} ê電子phue取消封鎖ah"
         destroy_custom_emoji_html: "%{name} kā 新ê emoji %{target} thâi掉ah"
-        destroy_domain_allow_html: "%{name} 無允准 %{target} 域名加入聯邦宇宙"
+        destroy_domain_allow_html: "%{name} 無允准 %{target} 域名加入聯邦"
         destroy_domain_block_html: "%{name} 取消封鎖域名 %{target}"
         destroy_email_domain_block_html: "%{name} kā 電子phue域名 %{target} 取消封鎖ah"
         destroy_instance_html: "%{name} 清除域名 %{target}"
@@ -265,6 +269,7 @@ nan:
         destroy_status_html: "%{name} kā %{target} ê PO文thâi掉"
         destroy_unavailable_domain_html: "%{name} 恢復送kàu域名 %{target}"
         destroy_user_role_html: "%{name} thâi掉 %{target} 角色"
+        destroy_username_block_html: "%{name} thâi掉用者ê名包含 %{target} ê規則ah"
         disable_2fa_user_html: "%{name} 停止使用者 %{target} 用雙因素驗證"
         disable_custom_emoji_html: "%{name} kā 新ê emoji %{target} 停止使用ah"
         disable_relay_html: "%{name} 停止使用中繼 %{target}"
@@ -276,8 +281,8 @@ nan:
         enable_user_html: "%{name} kā 用者 %{target} 設做允准登入"
         memorialize_account_html: "%{name} kā %{target} 設做故人口座"
         promote_user_html: "%{name} kā 用者 %{target} 升級"
-        publish_terms_of_service_html: "%{name} 公佈服務規則ê更新"
-        reject_appeal_html: "%{name} 拒絕 %{target} 所寫ê tuì審核決定ê投訴"
+        publish_terms_of_service_html: "%{name} 公佈服務規定ê更新"
+        reject_appeal_html: "%{name} 拒絕 %{target} 所寫ê tuì管理決定ê投訴"
         reject_user_html: "%{name} 拒絕 %{target} ê 註冊"
         remove_avatar_user_html: "%{name} thâi掉 %{target} ê標頭"
         reopen_report_html: "%{name} 重開 %{target} ê檢舉"
@@ -299,6 +304,7 @@ nan:
         update_report_html: "%{name} 更新 %{target} ê檢舉"
         update_status_html: "%{name} kā %{target} ê PO文更新"
         update_user_role_html: "%{name} 更改 %{target} 角色"
+        update_username_block_html: "%{name} 更新用者ê名包含 %{target} ê規則ah"
       deleted_account: thâi掉ê口座
       empty: Tshuē無log。
       filter_by_action: 照動作過濾
@@ -346,15 +352,748 @@ nan:
       enabled: 啟用ê
       enabled_msg: Hit ê emoji成功啟用ah
       image_hint: Sài-suh無超過 %{size} ê PNG á是 GIF
+      list: 列單
+      listed: 加入列單ah
+      new:
+        title: 加添新ê自訂emoji
+      no_emoji_selected: 因為無揀任何emoji，所以lóng無改變
+      not_permitted: Lí無允准行tsit ê動作
+      overwrite: Khàm掉
+      shortcode: 短碼
+      shortcode_hint: 字元上少2 ê，kan-ta接受字母、數字kap底線(_)
+      title: 自訂emoji
+      uncategorized: Iáu無分類
+      unlist: Tuì列單the̍h掉
+      unlisted: The̍h掉ah
+      update_failed_msg: Bē當更新hit ê emoji
+      updated_msg: Emoji成功更新ah！
+      upload: 傳上去
+    dashboard:
+      active_users: 活動ê用者
+      interactions: 互動
+      media_storage: 媒體儲存
+      new_users: 新用者
+      opened_reports: 拍開ê報告
+      pending_appeals_html:
+        other: "<strong>%{count}</strong> ê投訴愛處理"
+      pending_reports_html:
+        other: "<strong>%{count}</strong> ê檢舉愛處理"
+      pending_tags_html:
+        other: "<strong>%{count}</strong> ê hashtag愛處理"
+      pending_users_html:
+        other: "<strong>%{count}</strong> ê用者愛處理"
+      resolved_reports: 解決ê報告
+      software: 軟體
+      sources: 註冊ê源頭
+      space: 空間ê使用
+      title: La-jí-báng (dashboard)
+      top_languages: 上tsia̍p出現ê語言
+      top_servers: 上tsia̍p活動ê服侍器
+      website: 網站
+    disputes:
+      appeals:
+        empty: Tshuē無投訴。
+        title: 投訴
+    domain_allows:
+      add_new: 允准kap tsit ê域名相連
+      created_msg: 域名已經成功允准相連
+      destroyed_msg: 域名已經成功取消相連
+      export: 輸出
+      import: 輸入
+      undo: 禁止kap tsit ê域名相連
+    domain_blocks:
+      add_new: 加添新ê封鎖域名
+      confirm_suspension:
+        cancel: 取消
+        confirm: 中止權限
+        permanent_action: 取消中止權限，bē當復原任何資料á是關係。
+        preamble_html: Lí teh beh停止 <strong>%{domain}</strong> kap伊ê kiánn域名ê權限。
+        remove_all_data: Tse ē tī lí ê服侍器內底，kā tuì tsit ê域名ê口座來ê所有內容、媒體kap個人資料lóng thâi掉。
+        stop_communication: Lí ê服侍器ē停止kap hia ê服侍器聯絡。
+        title: 確認封鎖域名 %{domain}
+        undo_relationships: Tse ē取消任何ê佇in ê服侍器ê口座kap lí ê之間ê跟tuè關係。
+      created_msg: 當leh封鎖網域
+      destroyed_msg: 已經取消封鎖域名
+      domain: 域名
+      edit: 編輯域名封鎖
+      existing_domain_block: Lí已經kā %{name} 下koh khah嚴ê限制。
+      existing_domain_block_html: Lí已經kā %{name} 下koh khah嚴ê限制，lí著先<a href="%{unblock_url}">解除封鎖</a>。
+      export: 輸出
+      import: 輸入
+      new:
+        create: 加添封鎖
+        hint: 封鎖域名bē當擋口座記錄受加添佇資料庫，m̄-kú ē 自動自尾kàu頭，kā hia ê口座使用指定ê管理方式。
+        severity:
+          desc_html: "<strong>限制</strong>ē kā hit ê域名ê口座所送ê PO文，設做kan-ta跟tuè伊ê tsiah通看見。<strong>中止權限</strong>ē thâi掉tī lí ê 服侍器內底，所有tuì hit ê域名ê口座來ê內容、媒體kap個人資料。Nā kan-ta beh拒絕媒體檔案，請用<strong>無</strong>。"
+          noop: 無
+          silence: 限制
+          suspend: 中止權限
+        title: 新ê域名封鎖
+      no_domain_block_selected: 因為無揀任何域名封鎖，所以lóng無改變
+      not_permitted: Lí無允准行tsit ê動作
+      obfuscate: Kā域名舞bē清
+      obfuscate_hint: Nā beh啟用廣告域名列單ê限制，tiō tī列單kā域名ê部份舞buē清。
+      private_comment: 私人評論
+      private_comment_hint: 請評論關係tsit ê域名ê制限，hōo管理員做內部ê路用。
+      public_comment: 公開ê評論
+      public_comment_hint: 請為一般大眾評論關係tsit ê域名ê制限，若beh啟用廣告域名列單ê限制。
+      reject_media: 拒絕媒體檔案
+      reject_media_hint: Thâi掉本地tiông ê媒體檔案，mā bē koh kā任何tuì hia來ê載落去。Hām中止權限無tī-tāi
+      reject_reports: 拒絕檢舉
+      reject_reports_hint: 忽略ta̍k ê tuì tsit ê域名來ê檢舉，hām中止權限無tī-tāi。
+      undo: 取消域名封鎖
+      view: 檢視域名封鎖
+    email_domain_blocks:
+      add_new: 加新ê
+      allow_registrations_with_approval: 許可了後允准註冊
+      attempts_over_week:
+        other: 頂禮拜lóng總有 %{count} pái試註冊
+      created_msg: 成功封鎖電子phue域名
+      delete: Thâi掉
+      dns:
+        types:
+          mx: MX記錄
+      domain: 域名
+      new:
+        create: 加添域名
+        resolve: 解析域名
+        title: 封鎖新ê電子phue網域
+      no_email_domain_block_selected: 因為無揀任何電子phue域名封鎖，所以lóng無改變
+      not_permitted: 無允准
+      resolved_dns_records_hint_html: 域名解析做下kha ê MX域名，tsiah ê域名上後負責收電子phue。封鎖MX域名ē封任何有siâng款MX域名ê電子郵件ê註冊，就算通看見ê域名無kâng，mā án-ne。<strong>Tio̍h細膩，m̄通封鎖主要ê電子phue提供者。</strong>
+      resolved_through_html: 通過 %{domain} 解析
+      title: 封鎖ê電子phue網域
+    export_domain_allows:
+      new:
+        title: 輸入允准ê域名
+      no_file: Iáu bē揀檔案
+    export_domain_blocks:
+      import:
+        description_html: Lí teh-beh輸入封鎖域名ê列單。請koh kā tsit ê列單斟酌檢查，特別是lí無家tī編tsit ê列單ê時。
+        existing_relationships_warning: 有ê跟tuè關係
+        private_comment_description_html: 為著幫tsān lí追蹤輸入ê封鎖tuì toh來，輸入ê封鎖ē kap下kha ê私人評論sann-kap加添：<q>%{comment}</q>
+        private_comment_template: 佇 %{date} tuì %{source} 輸入
+        title: 輸入域名封鎖
+      invalid_domain_block: 因為下kha ê錯誤，làng過tsi̍t ê以上ê域名封鎖：%{error}
+      new:
+        title: 輸入域名封鎖
+      no_file: Iáu bē揀檔案
+    fasp:
+      debug:
+        callbacks:
+          created_at: 建立佇
+          delete: Thâi掉
+          ip: IP地址
+          request_body: 請求主文
+          title: 除蟲callback
+      providers:
+        active: 有效
+        base_url: 基本URL
+        callback: Callback
+        delete: Thâi掉
+        edit: 編輯提供者
+        finish_registration: 完成註冊
+        name: 名
+        providers: 提供者
+        public_key_fingerprint: 公開鎖匙ê指頭仔螺(public key fingerprint)
+        registration_requested: 註冊請求ah
+        registrations:
+          confirm: 確認
+          description: Lí收著FASP ê註冊ah。nā準lí bô啟動，請拒絕。若有啟動，請佇確認註冊以前，細膩比較名kap鎖匙ê指頭仔螺。
+          reject: 拒絕
+          title: 確認FASP註冊
+        save: 儲存
+        select_capabilities: 揀功能
+        sign_in: 登入
+        status: 狀態
+        title: 聯邦宇宙輔助服務提供者 (FASP)
+      title: FASP
+    follow_recommendations:
+      description_html: "<strong>跟tuè建議幫tsān新用者緊tshuē著心適ê內容</strong>。Nā使用者無hām別lâng有夠額ê互動，來形成個人化ê跟tuè建議，就ē推薦tsiah ê口座。In是佇指定語言內底，由最近上tsia̍p參與ê，kap上tsē lâng跟tuè ê口座，用ta̍k kang做基礎，相濫koh計算出來ê。"
+      language: 揀語言
+      status: 狀態
+      suppress: Khàm掉跟tuè建議
+      suppressed: Khàm掉ê
+      title: 跟tuè建議
+      unsuppress: 恢復跟tuè建議
     instances:
+      audit_log:
+        title: 最近ê審核日誌
+        view_all: 看完整ê審核日誌
+      availability:
+        description_html:
+          other: Nā佇 <strong>%{count} kang</strong>內，寄送kàu hit ê域名lóng失敗，除非收著hit ê域名<em>來ê</em>寄送，a̍h無buē koh試寄送。
+        failure_threshold_reached: 佇 %{date} kàu失敗ê底限。
+        failures_recorded:
+          other: 連suà %{count} kang lóng寄失敗。
+        no_failures_recorded: 報告內底無失敗。
+        title: 可用性
+        warning: 頂kái試連接tsit臺服侍器是無成功
+      back_to_all: 全部
+      back_to_limited: 受限制
+      back_to_warning: 警告
+      by_domain: 域名
+      confirm_purge: Lí kám確定beh永永thâi掉tsit ê域名來ê資料？
+      content_policies:
+        comment: 內部ê筆記
+        description_html: Lí ē當定義用tī所有tuì tsit ê域名kap伊ê子域名來ê口座ê內容政策。
+        limited_federation_mode_description_html: Lí通選擇kám beh允准tsit ê域名加入聯邦。
+        policies:
+          reject_media: 拒絕媒體
+          reject_reports: 拒絕檢舉
+          silence: 限制
+          suspend: 中止權限
+        policy: 政策
+        reason: 公開ê理由
+        title: 內容政策
       dashboard:
+        instance_accounts_dimension: 上tsē lâng跟tuè ê口座
+        instance_accounts_measure: 儲存ê口座
+        instance_followers_measure: lán tī hia ê跟tuè者
+        instance_follows_measure: in tī tsia ê跟tuè者
         instance_languages_dimension: Tsia̍p用ê語言
+        instance_media_attachments_measure: 儲存ê媒體附件
+        instance_reports_measure: 關係in ê檢舉
+        instance_statuses_measure: 儲存ê PO文
+      delivery:
+        all: 全部
+        clear: 清寄送ê錯誤
+        failing: 失敗
+        restart: 重頭啟動寄送
+        stop: 停止寄送
+        unavailable: Bē當用
+      delivery_available: 通寄送
+      delivery_error_days: 寄送錯誤ê日數
+      delivery_error_hint: Nā連續 %{count} kang bē當寄送，就ē自動標做bē當寄送。
+      destroyed_msg: Tuì %{domain} 來ê資料，teh排隊beh thâi掉。
+      empty: Tshuē無域名。
+      known_accounts:
+        other: "%{count} ê知影ê口座"
+      moderation:
+        all: 全部
+        limited: 受限制
+        title: 管理
+      moderation_notes:
+        create: 加添管理筆記
+        created_msg: 站臺ê管理記錄成功建立！
+        description_html: 檢視á是替別ê管理者kap未來ê家己留筆記
+        destroyed_msg: 站臺ê管理記錄成功thâi掉！
+        placeholder: 關係本站、行ê行動，á是其他通幫tsān lí未來管本站ê資訊。
+        title: 管理ê筆記
+      private_comment: 私人評論
+      public_comment: 公開ê評論
+      purge: 清除
+      purge_description_html: Nā lí想講tsit ê域名ē永永斷線，ē當tuì儲存內底thâi掉uì tsit ê域名來ê所有口座記錄kap相關資料。Huân-sè ē開點á時間。
+      title: 聯邦
+      total_blocked_by_us: Hōo lán封鎖
+      total_followed_by_them: Hōo in跟tuè
+      total_followed_by_us: Hōo lán跟tuè
+      total_reported: 關係in ê檢舉
+      total_storage: 媒體ê附件
+      totals_time_period_hint_html: 下kha顯示ê總計包含ta̍k時ê資料。
+      unknown_instance: 佇本服務器，現tsú時iáu無tsit ê域名ê記錄。
+    invites:
+      deactivate_all: Lóng停用
+      filter:
+        all: 全部
+        available: 通用ê
+        expired: 過期ê
+        title: 過濾器
+      title: 邀請
+    ip_blocks:
+      add_new: 建立規則
+      created_msg: 成功加添新ê IP規則
+      delete: Thâi掉
+      expires_in:
+        '1209600': 2 禮拜
+        '15778476': 6個月
+        '2629746': 1 個月
+        '31556952': 1 年
+        '86400': 1 kang
+        '94670856': 3 年
+      new:
+        title: 建立新ê IP規則
+      no_ip_block_selected: 因為無揀任何IP規則，所以lóng無改變
+      title: IP規則
+    relationships:
+      title: "%{acct} ê關係"
+    relays:
+      add_new: 加添新ê中繼
+      delete: Thâi掉
+      description_html: "<strong>聯邦ê中繼站</strong> 是中lâng ê服侍器，ē tī訂koh公開kàu hit ê中繼站ê服侍器之間，交換tsē-tsē ê 公開PO文。<strong>中繼站通幫tsān小型kap中型服侍器tuì聯邦宇宙發現內容</strong>，本地ê用者免手動跟tuè遠距離ê服侍器ê別lâng。"
+      disable: 停止使用
+      disabled: 停止使用ê
+      enable: 啟用
+      enable_hint: Lí ê服侍器tsi̍t-ē啟動，ē訂tuì tsit ê中繼逐ê公開PO文，mā ē開始送tsit ê服侍器ê公開PO文kàu hia。
+      enabled: 啟用ê
+      inbox_url: 中繼 URL
+      pending: Teh等中繼站允准
+      save_and_enable: 儲存koh啟用
+      setup: 設定中繼ê連結
+      signatures_not_enabled: Nā啟用安全模式á是受限ê聯邦模式，中繼可能buē-tàng正常運作
+      status: 狀態
+      title: 中繼
+    report_notes:
+      created_msg: 檢舉記錄成功建立！
+      destroyed_msg: 檢舉記錄成功thâi掉！
+    reports:
+      account:
+        notes:
+          other: "%{count} 篇筆記"
+      action_log: 審查日誌
+      action_taken_by: 操作由
+      actions:
+        delete_description_html: 受檢舉ê PO文ē thâi掉，而且ē用tsi̍t ue̍h橫tsuā記錄，幫tsān lí提升kâng tsi̍t ê用戶未來ê違規。
+        mark_as_sensitive_description_html: 受檢舉ê PO文內ê媒體ē標做敏感，而且ē用tsi̍t ue̍h橫tsuā記錄，幫tsān lí提升kâng tsi̍t ê用戶未來ê違規。
+        other_description_html: 看其他控制tsit ê口座ê所行，kap自訂聯絡受檢舉ê口座ê選項。
+        resolve_description_html: Buē用行動控制受檢舉ê口座，mā無用橫tsuā記錄，而且tsit ê報告ē關掉。
+        silence_description_html: 本口座kan-ta ē hōo早前跟tuè ê á是手動tshiau ê看見，大大限制看見ê範圍。設定隨時ē當回復。請關所有tuì tsit ê口座ê檢舉。
+        suspend_description_html: Tsit ê口座kap伊ê內容ē bē當用，落尾ē thâi掉，mā bē當hām伊互動。30 kang以內通回復。請關所有tuì tsit ê口座ê檢舉。
+      actions_description_html: 決定行siánn物行動來解決tsit ê檢舉。Nā lí tuì受檢舉ê口座採用處罰，電子phue通知ē送予in，除非選擇 <strong>Pùn-sò phue</strong> 類別。
+      actions_description_remote_html: 決定行siánn物行動來解決tsit ê檢舉。Tse kan-ta ē影響 <strong>lí ê</strong> 服侍器hām tsit ê遠距離服侍器聯絡kap處理伊ê內容ê方法。
+      actions_no_posts: Tsit份檢舉無beh thâi掉ê相關PO文
+      add_to_report: 加添其他ê內容kàu檢舉
+      already_suspended_badges:
+        local: 已經佇tsit ê服侍器停止權限ah
+        remote: 已經佇in ê服侍器停止權限ah
+      are_you_sure: Lí kám確定？
+      assign_to_self: 分配hōo家kī
+      assigned: 分配管理者
+      by_target_domain: 受檢舉ê口座ê網域
+      cancel: 取消
+      category: 類別
+      category_description_html: Tsit ê 受檢舉ê口座kap/á是內容，ē佇kap tsit ê口座ê聯絡內底引用。
+      comment:
+        none: 無
+      comment_description_html: 為著提供其他資訊，%{name} 寫：
+      confirm: 確認
+      confirm_action: 確認kā %{acct} 管理ê動作
+      created_at: 檢舉tī
+      delete_and_resolve: Thâi掉PO文
+      forwarded: 轉送ah
+      forwarded_replies_explanation: 本報告是tuì別站ê用者送ê，關係別站ê內容。本報告轉hōo lí，因為受檢舉ê內容是回應lí ê服侍器ê用者。
+      forwarded_to: 有轉送kàu %{domain}
+      mark_as_resolved: 標做「解決ah」
+      mark_as_sensitive: 標做敏感
+      mark_as_unresolved: 標做「無解決」
+      no_one_assigned: 無lâng
+      notes:
+        create: 加添筆記
+        create_and_resolve: 標「處理ah」，留筆記
+        create_and_unresolve: 留筆記，koh重開
+        delete: Thâi掉
+        placeholder: 描述有行siánn物行動，á是其他關聯ê更新……
+        title: 筆記
+      notes_description_html: 檢視á是留筆記hōo別ê管理者kap未來ê家己
+      processed_msg: '檢舉 #%{id} 處理成功ah'
+      quick_actions_description_html: 緊行行動，á是giú kàu下kha，看檢舉ê內容：
+      remote_user_placeholder: tuì %{instance} 來ê遠距離用者
+      reopen: 重頭phah開檢舉
+      report: '檢舉 #%{id}'
+      reported_account: 受檢舉ê口座
+      reported_by: 檢舉人
+      reported_with_application: 用應用程式檢舉
+      resolved: 解決ah
+      resolved_msg: 檢舉成功解決ah！
+      skip_to_actions: 跳kàu行動
+      status: 狀態
+      statuses: 受檢舉ê內容
+      statuses_description_html: 冒犯ê內容ē引用tī kap受檢舉口座ê聯絡
+      summary:
+        action_preambles:
+          delete_html: Lí teh-beh <strong>thâi掉</strong> <strong>@%{acct}</strong> ê tsi̍t-kuá PO文。Tse ē：
+          mark_as_sensitive_html: Lí teh-beh <strong>kā</strong> <strong>@%{acct}</strong> ê tsi̍t-kuá PO文<strong>標做敏感</strong>。Tse ē：
+          silence_html: Lí teh-beh <strong>限制</strong> <strong>@%{acct}</strong> ê口座。Tse ē：
+          suspend_html: Lí teh-beh <strong>停止</strong> <strong>@%{acct}</strong> ê口座權限。Tse ē：
+        actions:
+          delete_html: Thâi掉冒犯ê PO文
+          mark_as_sensitive_html: Kā冒犯êPO文ê媒體標做敏感
+          silence_html: Kā in ê個人資料kap內容標做kan-ta有跟tuè ê，á是手動tshiau伊ê個人檔案ê，通看見，來嚴嚴限制 <strong>@%{acct}</strong> ê傳播範圍
+          suspend_html: Kā <strong>@%{acct}</strong> 停止權限，koh kā in ê 個人資料kap內容標做bē當用，kap bē當hām in互動
+        close_report: 'Kā 檢舉報告 #%{id} 標做解決ah'
+        close_reports_html: Kā <strong>ta̍k ê</strong>tuì <strong>@%{acct}</strong> ê檢舉標做解決ah
+        delete_data_html: Tuì tann起30kang以後，thâi掉 <strong>@%{acct}</strong> ê個人資料kap內容，除非佇tsit ê期限進前，取消停止in ê權限
+        preview_preamble_html: "<strong>@%{acct}</strong> ē收著警告，包含下kha ê內容："
+        record_strike_html: 記錄tuì <strong>@%{acct}</strong>ê警告，來幫tsān lí提升佇tsit ê口座ê未來違規
+        send_email_html: Kā警告電子phue寄hōo <strong>@%{acct}</strong>
+        warning_placeholder: 通選ê，管理行動ê補充理由
+      target_origin: 受檢舉ê口座ê來源
+      title: 檢舉
+      unassign: 取消分配
+      unknown_action_msg: M̄知影ê動作：%{action}
+      unresolved: 無解決
+      updated_at: 更新
+      view_profile: 看個人資料
+    roles:
+      add_new: 加添角色
+      assigned_users:
+        other: "%{count} ê用者"
+      categories:
+        administration: 管理員
+        devops: DevOps
+        invites: 邀請
+        moderation: 管理
+        special: 特別
+      delete: Thâi掉
+      description_html: 用<strong>用者角色</strong>，lí通自訂lí ê用者ē當接近使用Mastodon ê siánn物功能kap區域。
+      edit: 編「%{name}」ê角色
+      everyone: 預設ê權限
+      everyone_full_description_html: Tse是ē影響<strong>所有用者</strong>ê<strong>基本角色</strong>，就算是無分配tio̍h角色ê mā kâng款。所有其他ê角色繼承伊ê權限。
+      permissions_count:
+        other: "%{count} ê權限"
+      privileges:
+        administrator: 管理員
+        administrator_description: 有tsit ê權限ê用者ē忽略所有ê權限。
+        delete_user_data: Thâi掉用者ê資料
+        delete_user_data_description: 允准用者liâm-mi thâi掉其他用者ê資料
+        invite_users: 邀請用者
+        invite_users_description: 允准用者邀請新lâng來tsit ê服侍器
+        manage_announcements: 管理公告
+        manage_announcements_description: 允准用者管理佇tsit ê服侍器ê公告
+        manage_appeals: 管理投訴
+        manage_appeals_description: 允准用者審查tuì管理動作ê投訴
+        manage_blocks: 管理封鎖
+        manage_blocks_description: 允准用者封鎖電子phue ê 提供者kap IP地址
+        manage_custom_emojis: 管理自訂ê Emoji
+        manage_custom_emojis_description: 允准用者管理佇tsit ê服侍器ê自訂Emoji
+        manage_federation: 管理聯邦
+        manage_federation_description: 允准用者封鎖á是允准kap其他域名相連，mā控制寄送ê能力
+        manage_invites: 管理邀請
+        manage_invites_description: 允准用者瀏覽kap停止使用邀請連結
+        manage_reports: 管理檢舉
+        manage_reports_description: 允准用者審查檢舉kap執行對in ê管理ê動作。
+        manage_roles: 管理角色
+        manage_roles_description: 允准用者管理kap分配比in khah kē ê角色
+        manage_rules: 管理規則
+        manage_rules_description: 允准用者改服侍器ê規則
+        manage_settings: 管理設定
+        manage_settings_description: 允准用者改站ê設定
+        manage_taxonomies: 管理分類
+        manage_taxonomies_description: 允准用者審核趨勢內容，kap更新hashtag ê設定
+        manage_user_access: 管理用者ê接近使用
+        manage_user_access_description: 允准用者停止其他用者ê兩階段驗證，改in ê電子phue地址，kap重頭設定in ê密碼
+        manage_users: 管理用者
+        manage_users_description: 允准用者看其他ê用者ê詳細，kap執行tuì in ê管理行動
+        manage_webhooks: 管理 Webhooks
+        manage_webhooks_description: 允許用者kā管理ê事件設定 webhooks
+        view_audit_log: 看審核ê日誌
+        view_audit_log_description: 允准用者看tsit ê服侍器ê管理行動ê歷史
+        view_dashboard: 看La-jí-báng (Dashboard)
+        view_dashboard_description: 允准用者接近使用tsit ê la-jí-báng kap tsē-tsē指標
+        view_devops: DevOps
+        view_devops_description: 允准用者接近使用Sidekiq kap pgHero ê la-jí-báng
+      title: 角色
+    rules:
+      add_new: 加添規則
+      add_translation: 加添翻譯
+      delete: Thâi掉
+      description_html: 雖bóng大部份ê lóng講有讀kap同意服務規定，m̄-koh攏無讀了，直到發生問題ê時。<strong>提供in列單ē當hōo tsi̍t kái看服侍器ê規則khah快。</strong>請試kā個別ê規則寫kah短koh簡單，m̄-kú m̄通kā in拆做tsē-tsē分開ê項目。
+      edit: 編輯規則
+      empty: Iáu bē定義服侍器ê規則。
+      move_down: Suá khah落來
+      move_up: Suá khah起去
+      title: 服侍器規則
+      translation: 翻譯
+      translations: 翻譯
+      translations_explanation: Lí ē當（但是無必要）加添tsiah-ê規則ê翻譯。若無翻譯版，預設ê值ē顯示。請一直確認任何提供ê翻譯kap預設ê同步。
+    settings:
+      about:
+        manage_rules: 管理服侍器ê規則
+        preamble: 提供關係服侍器án-nuá運作kap管理，以及資金源頭ê詳細資訊。
+        rules_hint: Tse是關係lí ê用者應該遵守ê規則ê專區。
+        title: 關係本站
+      allow_referrer_origin:
+        desc: Nā是lí ê用者點連結kàu外部網站，in ê瀏覽器可能ē kā lí ê Mastodon服侍器ê地址當做流量ê來源送出。如果tse ē唯一區別lí ê用者，比如tse是個人ê Mastodon服侍器，請kā停止使用。
+        title: 允准外部網站kā lí ê Mastodon服侍器當做流量ê來源
+      appearance:
+        preamble: 自訂Mastodon網頁ê界面。
+        title: 外觀
+      branding:
+        preamble: Lí ê服侍器品牌hōo伊kap別ê服侍器區別。Tsit ê資訊可能展示佇無kâng ê環境，比如Mastodon ê網頁界面、原底ê app、佇別站ê sing看連結ê所在kap佇通信app內底等。因為tsit ê緣故，上好kā資訊保持kah清楚、短koh簡要。
+        title: 品牌
+      captcha_enabled:
+        desc_html: Tsit ê功能需要tuì hCaptcha來ê外部kha本，可能有安全kap隱私ê顧慮。另外，<strong>tse ē明顯降kē tsi̍t寡lâng（特別是障礙者）註冊ê容易程度</strong>。因為tsiah ê緣故，請考慮別ê替代方案，比如審核制á是邀請制ê註冊。
+        title: 要求新ê用者解決CAPTCHA問題，來確認in ê口座
+      content_retention:
+        danger_zone: 危險ê所在
+        preamble: 控制使用者產生ê內容tiông佇Mastodon ê方法。
+        title: 內容保存期間
+      default_noindex:
+        desc_html: 影響逐ê iáu buē改變tsit ê設定ê用者
+        title: 預設kā用者tuì tshiau-tshuē ia̋n-jín ê索引排除
+      discovery:
+        follow_recommendations: 跟tuè建議
+        preamble: Kā心適ê內容浮現出來，ē當幫tsān tī Mastodon頂siáng lóng可能m̄知ê新手。控制tsē-tsē發現lí ê服侍器ê特色作品ê功能án-nuá運作。
+        privacy: 隱私權
+        profile_directory: 個人資料ê目錄
+        public_timelines: 公共ê時間線
+        publish_statistics: 發布統計
+        title: 發現
+        trends: 趨勢
+      domain_blocks:
+        all: Kàu ta̍k ê lâng
+        disabled: 無kàu tó tsi̍t ê
+        users: Kàu ta̍k位登入ê用者
+      feed_access:
+        modes:
+          authenticated: Kan-ta hōo登入ê用者
+          public: Ta̍k lâng
+      registrations:
+        moderation_recommandation: 佇開放hōo ta̍k ê lâng註冊進前，請確認lí有夠額koh主動反應ê管理團隊！
+        preamble: 控制ē當佇lí ê服侍器註冊ê人。
+        title: 註冊
+      registrations_mode:
+        modes:
+          approved: 註冊tio̍h愛核准
+          none: 無lâng通註冊
+          open: Ta̍k ê lâng lóng ē當註冊
+        warning_hint: Guán建議用「註冊tio̍h愛核准」，除非lí tuì lí ê管理團隊ē當不管時處理pùn-sò訊息kap惡意註冊有信心。
+      security:
+        authorized_fetch: 要求tuì聯邦ê服侍器ê認證
+        authorized_fetch_hint: 要求tuì聯邦ê服侍器ê驗證ē當koh khah嚴格執行用者級kap服侍器級ê封鎖。M̄-kú ē致kàu性能處罰ê損失，減少lí ê回應ê擴散程度，mā有可能引入kap tsi̍t-kuá聯邦服務ê相容性問題。另外，tse bē當防止別lâng專工掠lí ê公開PO文kap口座。
+        authorized_fetch_overridden_hint: 因為hōo環境變數khàm掉，lí tsit-má bē當改tsit ê設定。
+        federation_authentication: 聯邦驗證ê執行
+      title: 服侍器ê設定
+    site_uploads:
+      delete: Thâi掉傳上去ê檔案
+      destroyed_msg: 成功thâi掉傳上去kàu本站ê內容ah！
+    software_updates:
+      critical_update: 重要—請緊升級
+      description: 建議kā lí ê Mastodon安裝維持上新ê狀態，the̍h著上新ê修正kap功能。另外，隨時更新Mastodon有時陣真重要，ē當避免安全問題。因為tsiah-ê原因，Mastodon每30分鐘檢查更新，mā ē根據lí ê電子phue通知ê偏愛設定kā lí通知。
+      documentation_link: 看詳細
+      release_notes: 版本ê資訊
+      title: Ē當the̍h ê更新
+      type: 類型
+      types:
+        major: 大ê版本更新
+        minor: 細ê版本更新
+        patch: 碎布(patch)公開—修正錯誤kap容易作用ê改變
+      version: 版本
     statuses:
+      account: 作者
+      application: 應用程式
+      back_to_account: Tńg去口座ê頁
+      back_to_report: Tńg去檢舉ê頁
+      batch:
+        add_to_report: '加kàu檢舉 #%{id}'
+        remove_from_report: Tuì檢舉suá掉
+        report: 檢舉
+      contents: 內容
+      deleted: Thâi掉ah
+      favourites: 收藏
+      history: 版本ê歷史
+      in_reply_to: 回應
       language: 語言
+      media:
+        title: 媒體
+      metadata: Meta資料
+      no_history: Tsit篇PO文iáu無hōo lâng編輯
+      no_status_selected: 因為無揀任何PO文，所以lóng無改變
+      open: 公開PO文
+      original_status: 原底ê PO文
+      reblogs: 轉送
+      replied_to_html: 回應 %{acct_link}
+      status_changed: PO文有改ah
+      status_title: 由 @%{name} 所PO
+      title: Tsit ê口座ê PO文 - @%{name}
+      trending: 趨勢
+      view_publicly: 公開看
+      visibility: 通看ê程度
+      with_media: 有媒體
+    strikes:
+      actions:
+        delete_statuses: "%{name} kā %{target} ê PO文thâi掉ah"
+        disable: "%{name} kā %{target} ê口座冷凍ah"
+        mark_statuses_as_sensitive: "%{name} kā %{target} êPO文標做敏感ê內容"
+        none: "%{name} 送警告hōo %{target} ah"
+        sensitive: "%{name} kā %{target} ê口座標做敏感"
+        silence: "%{name} 限制 %{target} ê口座"
+        suspend: "%{name} kā %{target} ê口座停止權限ah"
+      appeal_approved: 投訴ah
+      appeal_pending: 投訴teh等審核
+      appeal_rejected: 投訴hōo lâng拒絕
+    system_checks:
+      database_schema_check:
+        message_html: 有leh等待處理ê資料庫遷suá。請執行tsiah-ê，來保證應用程式照期望pháng
+      elasticsearch_analysis_index_mismatch:
+        message_html: Elasticsearch ê索引分析器過期ah。請執行 <code>tootctl search deploy --only-mapping --only=%{value}</code>
+      elasticsearch_health_red:
+        message_html: Elasticsearch ê cluster無健康（紅色ê狀態），bē當用tshiau-tshuē功能
+      elasticsearch_health_yellow:
+        message_html: Elasticsearch ê cluster無健康（黃色ê狀態），lí可能想beh調查原因。
+      elasticsearch_index_mismatch:
+        message_html: Elasticsearch索引對應過期ah。請執行 <code>tootctl search deploy --only=%{value}</code>
+      elasticsearch_preset:
+        action: 看文件
+        message_html: Lí ê Elasticsearch ê cluster有超過tsi̍t ê節點，m̄-kú Mastodon iáu無設定用in。
+      elasticsearch_preset_single_node:
+        action: 看文件
+        message_html: Lí ê Elasticsearch 叢集kan-ta有tsi̍t ê節點，<code>ES_PRESET</code> 應該設定做 <code>single_node_cluster</code>。
+      elasticsearch_reset_chewy:
+        message_html: Lí ê Elasticsearch系統索引因為設定改變，過期ah。請執行 <code>tootctl search deploy --reset-chewy</code> 來更新。
+      elasticsearch_running_check:
+        message_html: Bē當連接 Elasticsearch。請確認kám有teh pháng，á是停用全文tshiau-tshuē
+      elasticsearch_version_check:
+        message_html: Bē當相容ê Elasticsearch版本：%{value}
+        version_comparison: Elasticsearch %{running_version} 版teh pháng，m̄-kú 愛 %{required_version} 版。
+      rules_check:
+        action: 管理服侍器ê規則
+        message_html: Lí iáu bē定義任何服侍器ê規則。
+      sidekiq_process_check:
+        message_html: 排列 %{value} 無leh pháng Sidekiq ê程序。請檢視lí ê Sidekiq 設定
+      software_version_check:
+        action: 看ē當the̍h ê更新
+        message_html: 有Mastodon ê更新ē當載落去。
+      software_version_critical_check:
+        action: 看ē當the̍h ê更新
+        message_html: 有重大ê Mastodon更新ē當載落去，請趕緊更新。
+      software_version_patch_check:
+        action: 看ē當the̍h ê更新
+        message_html: 有修正錯誤ê Mastodon ê更新，ē當載落去。
+      upload_check_privacy_error:
+        action: 檢查tse，the̍h著其他資訊
+        message_html: "<strong>Lí ê網頁服侍器設定錯誤。Lí ê服侍器ê隱私權有風險。</strong>"
+      upload_check_privacy_error_object_storage:
+        action: 檢查tse，the̍h著其他資訊
+        message_html: "<strong>Lí ê物件儲存空間設定錯誤。Lí ê服侍器ê隱私權有風險。</strong>"
+    tags:
+      moderation:
+        not_trendable: Bē當做趨勢
+        not_usable: Bē當用
+        pending_review: Teh等審核
+        review_requested: 審核請求ah
+        reviewed: 審核ah
+        title: 狀態
+        trendable: 通列做趨勢
+        unreviewed: Iáu bē審核
+        usable: 通用
+      name: 名
+      newest: 上新ê
+      oldest: 上舊ê
+      open: 公開看
+      reset: 重頭設
+      review: 審核狀態
+      search: Tshiau-tshuē
+      title: Hashtag
+      updated_msg: Hashtag設定更新成功ah
+    terms_of_service:
+      back: 轉去服務規定
+      changelog: Siánn物有改
+      create: 用lí家tī ê
+      current: 目前ê
+      draft: 草稿
+      generate: 用枋模
+      generates:
+        action: 生成
+        chance_to_review_html: "<strong>所生成ê服務規定bē自動發布。</strong>Lí ē有機會來看結果。請添必要ê詳細來繼續。"
+        explanation_html: 提供ê服務規定kan-ta做參考用，bē當成做任何法律建議。請照lí ê情形kap有ê特別ê法律問題諮詢lí ê法律顧問。
+        title: 設定服務規定
+      going_live_on_html: 目前規定，tuì %{date} 施行
+      history: 歷史
+      live: 目前ê
+      no_history: Iáu無半項服務規定ê改變記錄。
+      no_terms_of_service_html: Lí目前iáu無設定任何服務規定。服務規定是beh提供明確性，兼保護lí佇kap用者ê爭議中毋免承受可能ê責任。
+      notified_on_html: 佇 %{date} 通知ê用者
+      notify_users: 通知用者
+      preview:
+        explanation_html: Tsit封email ē送hōo tī %{date} 進前註冊 ê <strong>%{display_count} ê用者</strong>。Email ē包括下跤ê文字：
+        send_preview: Kā tāi先看ê內容寄kàu %{email}
+        send_to_all:
+          other: 寄出 %{display_count} 張電子phue
+        title: 先kā服務規定ê通知看māi
+      publish: 公開
+      published_on_html: 公開tī %{date}
+      save_draft: 儲存草稿
+      title: 服務規定
+    title: 管理
     trends:
+      allow: 允准
+      approved: 允准ah
+      confirm_allow: Lí kám確定beh允准所揀ê標簽？
+      confirm_disallow: Lí kám確定無愛允准所揀ê標簽？
+      disallow: 無愛允准
+      links:
+        allow: 允准連結
+        allow_provider: 允准提供者
+        confirm_allow: Lí kám確定beh允准所揀ê連結？
+        confirm_allow_provider: Lí kám確定beh允准所揀ê提供者？
+        confirm_disallow: Lí kám確定無愛允准所揀ê連結？
+        confirm_disallow_provider: Lí kám確定無愛允准所揀ê提供者？
+        description_html: Tsia是連結，現tsú時lí ê服侍器hōo通見ê用者大量分享ê。tse通幫tsān lí ê用者tshuē著tsit-má世間有siánn tāi誌。直kàu lí允准公開者，連結bē公開展示。lí通允准á是拒絕單ê連結。
+        disallow: 無愛允准連結
+        disallow_provider: 無愛允准提供者
+        no_link_selected: 因為無揀任何連結，所以lóng無改變
+        publishers:
+          no_publisher_selected: 因為無揀任何提供者，所以lóng無改變
+        shared_by_over_week:
+          other: 頂禮拜hōo %{count} 位用者分享
+        title: 趨勢ê連結
+        usage_comparison: Tī kin-á日hōo %{today} ê lâng分享，比較tsa-hng有 %{yesterday} ê
+      not_allowed_to_trend: 無允准刊tī趨勢
+      only_allowed: Kan-ta允准
+      pending_review: Teh等審核
+      preview_card_providers:
+        allowed: Tsit ê提供者ê連結通刊tī趨勢
+        description_html: Tsiah ê域名來自定定受lí ê服侍器分享ê連結。連結bē變做公開趨勢，除非連結ê域名受允准。Lí ê允准（á是拒絕）擴展kàu kiánn域名。
+        rejected: Tsit ê提供者ê連結bē刊tī趨勢
+        title: 發布者
+      rejected: 拒絕ê
+      statuses:
+        allow: 允准PO文
+        allow_account: 允准作者
+        confirm_allow: Lí kám確定beh允准所揀ê狀態？
+        confirm_allow_account: Lí kám確定beh允准所揀ê口座？
+        confirm_disallow: Lí kám確定無愛允准所揀ê狀態？
+        confirm_disallow_account: Lí kám確定無愛允准所揀ê口座？
+        description_html: Tsiah ê是lí ê服侍器所知ê，tsit-má teh受tsē-tsē分享kap收藏ê PO文。PO文bē公開顯示，除非lí允准作者，而且作者允准in ê口座hőng推薦hōo別lâng。Lí通允准á是拒絕個別PO文。
+        disallow: 無允准PO文
+        disallow_account: 無允准作者
+        no_status_selected: 因為無揀任何趨勢PO文，所以lóng無改變
+        not_discoverable: 作者iáu bē揀通hōo lâng發現
+        shared_by:
+          other: Hōo lâng分享á是收藏 %{friendly_count} kái
+        title: 趨勢ê PO文
       tags:
+        current_score: 目前ê分數：%{score}
         dashboard:
+          tag_accounts_measure: 無重複用
           tag_languages_dimension: Tsia̍p用ê語言
+          tag_servers_dimension: 人氣服侍器
+          tag_servers_measure: 無kâng ê服侍器
+          tag_uses_measure: Lóng總使用
+        description_html: Tsiah ê是hashtag，tsit-má佇lí ê服侍器看見ê tsē-tsē PO文中出現。Tse通tsān lí ê用者tshuē著ta̍k家上tsē討論ê內容。除非lí核准，hashtag bē公開顯示。
+        listable: 通受建議
+        no_tag_selected: 因為無揀任何標簽，所以lóng無改變
+        not_listable: Bē當受建議
+        not_trendable: Bē刊tī趨勢
+        not_usable: Bē當用
+        peaked_on_and_decaying: 佇 %{date} 日上烘，tsit-má teh退火
+        title: 趨勢ê hashtag
+        trendable: 通刊tī趨勢
+        trending_rank: '趨勢 #%{rank}'
+        usable: Ē當用
+        usage_comparison: Tī kin-á日hōo %{today} ê lâng用，比較tsa-hng有 %{yesterday} ê
+        used_by_over_week:
+          other: 頂禮拜hōo %{count} 位用者用
+      title: 推薦kap趨勢
+      trending: 趨勢
+    username_blocks:
+      add_new: 加新ê
+      block_registrations: 封鎖註冊
+      comparison:
+        contains: 包含
+        equals: 等於
+      contains_html: 包含 %{string}
+      created_msg: 成功加添用者名規則
+      delete: Thâi掉
+      edit:
+        title: 編輯使用者號名規則
+      matches_exactly_html: 等於 %{string}
+      new:
+        create: 建立規則
+        title: 創造使用者號名規則
+      no_username_block_selected: 因為無揀任何使用者號名規則，所以lóng無改變
+      not_permitted: 無允准
   scheduled_statuses:
     too_soon: Tio̍h用未來ê日期。
   statuses:
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 92f2f4ab345..2a814367cf0 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -190,6 +190,7 @@ nl:
         create_relay: Relay aanmaken
         create_unavailable_domain: Niet beschikbaar domein aanmaken
         create_user_role: Rol aanmaken
+        create_username_block: Gebruikersnaam-regel aanmaken
         demote_user: Gebruiker degraderen
         destroy_announcement: Mededeling verwijderen
         destroy_canonical_email_block: E-mailblokkade verwijderen
@@ -203,6 +204,7 @@ nl:
         destroy_status: Toot verwijderen
         destroy_unavailable_domain: Niet beschikbaar domein verwijderen
         destroy_user_role: Rol permanent verwijderen
+        destroy_username_block: Gebruikersnaam-regel verwijderen
         disable_2fa_user: Tweestapsverificatie uitschakelen
         disable_custom_emoji: Lokale emojij uitschakelen
         disable_relay: Relay uitschakelen
@@ -237,6 +239,7 @@ nl:
         update_report: Rapportage bijwerken
         update_status: Bericht bijwerken
         update_user_role: Rol bijwerken
+        update_username_block: Gebruikersnaam-regel bijwerken
       actions:
         approve_appeal_html: "%{name} heeft het bezwaar tegen de moderatiemaatregel van %{target} goedgekeurd"
         approve_user_html: "%{name} heeft de registratie van %{target} goedgekeurd"
@@ -255,6 +258,7 @@ nl:
         create_relay_html: "%{name} heeft een relay aangemaakt %{target}"
         create_unavailable_domain_html: "%{name} heeft de bezorging voor domein %{target} beëindigd"
         create_user_role_html: "%{name} maakte de rol %{target} aan"
+        create_username_block_html: "%{name} heeft regel toegevoegd voor gebruikersnamen die %{target} bevatten"
         demote_user_html: Gebruiker %{target} is door %{name} gedegradeerd
         destroy_announcement_html: "%{name} heeft de mededeling %{target} verwijderd"
         destroy_canonical_email_block_html: "%{name} deblokkeerde e-mail met de hash %{target}"
@@ -268,6 +272,7 @@ nl:
         destroy_status_html: Bericht van %{target} is door %{name} verwijderd
         destroy_unavailable_domain_html: "%{name} heeft de bezorging voor domein %{target} hervat"
         destroy_user_role_html: "%{name} verwijderde de rol %{target}"
+        destroy_username_block_html: "%{name} heeft regel verwijderd voor gebruikersnamen die %{target} bevatten"
         disable_2fa_user_html: De vereiste tweestapsverificatie voor %{target} is door %{name} uitgeschakeld
         disable_custom_emoji_html: Emoji %{target} is door %{name} uitgeschakeld
         disable_relay_html: "%{name} heeft de relay %{target} uitgeschakeld"
@@ -302,6 +307,7 @@ nl:
         update_report_html: Rapportage %{target} is door %{name} bijgewerkt
         update_status_html: "%{name} heeft de berichten van %{target} bijgewerkt"
         update_user_role_html: "%{name} wijzigde de rol %{target}"
+        update_username_block_html: "%{name} heeft regel bijgewerkt voor gebruikersnamen die %{target} bevatten"
       deleted_account: verwijderd account
       empty: Geen logs gevonden.
       filter_by_action: Op actie filteren
@@ -583,7 +589,7 @@ nl:
         created_msg: Aanmaken van servermoderatie-opmerking geslaagd!
         description_html: Opmerkingen bekijken, en voor jezelf en andere moderatoren achterlaten
         destroyed_msg: Verwijderen van servermoderatie-opmerking geslaagd!
-        placeholder: Informatie over deze server, genomen acties of iets anders die jou kunnen helpen om deze server in de toekomst te moderen.
+        placeholder: Informatie over deze server, ondernomen acties of iets anders dat jou kan helpen om deze server in de toekomst te modereren.
         title: Moderatie-opmerkingen
       private_comment: Privé-opmerking
       public_comment: Openbare opmerking
@@ -842,6 +848,10 @@ nl:
         all: Aan iedereen
         disabled: Aan niemand
         users: Aan ingelogde lokale gebruikers
+      feed_access:
+        modes:
+          authenticated: Alleen ingelogde gebruikers
+          public: Iedereen
       registrations:
         moderation_recommandation: Zorg ervoor dat je een adequaat en responsief moderatieteam hebt voordat je registraties voor iedereen openstelt!
         preamble: Toezicht houden op wie een account op deze server kan registreren.
@@ -901,7 +911,7 @@ nl:
       status_title: Bericht van @%{name}
       title: Accountberichten - @%{name}
       trending: Trending
-      view_publicly: In het openbaar bekijken
+      view_publicly: Openbaar bericht bekijken
       visibility: Zichtbaarheid
       with_media: Met media
     strikes:
@@ -974,7 +984,7 @@ nl:
       name: Naam
       newest: Nieuwste
       oldest: Oudste
-      open: In het openbaar bekijken
+      open: Oorspronkelijk bericht bekijken
       reset: Opnieuw
       review: Status beoordelen
       search: Zoeken
@@ -1085,6 +1095,25 @@ nl:
           other: Door %{count} mensen tijdens de afgelopen week gebruikt
       title: Aanbevelingen & trends
       trending: Trending
+    username_blocks:
+      add_new: Nieuwe toevoegen
+      block_registrations: Registraties blokkeren
+      comparison:
+        contains: Bevat
+        equals: Is gelijk aan
+      contains_html: Bevat %{string}
+      created_msg: Gebruikersnaam-regel succesvol aangemaakt
+      delete: Verwijderen
+      edit:
+        title: Gebruikersnaam-regel bewerken
+      matches_exactly_html: Is gelijk aan %{string}
+      new:
+        create: Regel aanmaken
+        title: Nieuwe gebruikersnaam-regel aanmaken
+      no_username_block_selected: Er zijn geen gebruikersnaam-regels gewijzigd omdat er geen zijn geselecteerd
+      not_permitted: Niet toegestaan
+      title: Gebruikersnaam-regels
+      updated_msg: Gebruikersnaam-regel succesvol bijgewerkt
     warning_presets:
       add_new: Nieuwe toevoegen
       delete: Verwijderen
@@ -1349,6 +1378,10 @@ nl:
     basic_information: Algemene informatie
     hint_html: "<strong>Wat mensen op jouw openbare profiel en naast je berichten zien aanpassen.</strong> Andere mensen gaan je waarschijnlijk eerder volgen en hebben vaker interactie met je, wanneer je profiel is ingevuld en je een profielfoto hebt."
     other: Overige
+  emoji_styles:
+    auto: Auto
+    native: Systeemeigen
+    twemoji: Twemoji
   errors:
     '400': De aanvraag die je hebt ingediend was ongeldig of foutief.
     '403': Jij hebt geen toestemming om deze pagina te bekijken.
@@ -1558,6 +1591,13 @@ nl:
       expires_at: Verloopt op
       uses: Aantal keer te gebruiken
     title: Mensen uitnodigen
+  link_preview:
+    author_html: Door %{name}
+    potentially_sensitive_content:
+      action: Klik om te tonen
+      confirm_visit: Ben je zeker dat je deze link wilt openen?
+      hide_button: Verberg
+      label: Mogelijk gevoelige inhoud
   lists:
     errors:
       limit: Je hebt het maximum aantal lijsten bereikt
@@ -1658,6 +1698,10 @@ nl:
       title: Nieuwe vermelding
     poll:
       subject: Een peiling van %{name} is beëindigd
+    quote:
+      body: 'Jouw bericht werd door %{name} geciteerd:'
+      subject: "%{name} heeft jouw bericht geciteerd"
+      title: Nieuw citaat
     reblog:
       body: 'Jouw bericht werd door %{name} geboost:'
       subject: "%{name} boostte jouw bericht"
@@ -1706,9 +1750,12 @@ nl:
       self_vote: Je kunt niet op eigen peilingen stemmen
       too_few_options: moet meer dan één item bevatten
       too_many_options: kan niet meer dan %{max} items bevatten
+    vote: Stemmen
+  posting_defaults:
+    explanation: Deze instellingen worden als standaard gebruikt wanneer je nieuwe berichten aanmaakt, maar je kunt ze per bericht aanpassen.
   preferences:
     other: Overig
-    posting_defaults: Standaardinstellingen voor berichten
+    posting_defaults: Instellingen voor berichten
     public_timelines: Openbare tijdlijnen
   privacy:
     hint_html: "<strong>Hoe wil je dat jouw profiel en berichten kunnen worden gevonden?</strong> Een verscheidenheid aan functies in Mastodon kunnen je helpen om een groter publiek te bereiken als ze zijn ingeschakeld. Neem rustig de tijd om deze instellingen te bekijken, om er zo zeker van te zijn dat ze aan jouw wensen voldoen."
@@ -1861,6 +1908,9 @@ nl:
         other: "%{count} video's"
     boosted_from_html: Geboost van %{acct_link}
     content_warning: 'Inhoudswaarschuwing: %{warning}'
+    content_warnings:
+      hide: Bericht verbergen
+      show: Meer tonen
     default_language: Hetzelfde als de taal van de gebruikersomgeving
     disallowed_hashtags:
       one: 'bevatte een niet toegestane hashtag: %{tags}'
@@ -1868,6 +1918,7 @@ nl:
     edited_at_html: Bewerkt op %{date}
     errors:
       in_reply_not_found: Het bericht waarop je probeert te reageren lijkt niet te bestaan.
+      quoted_status_not_found: Het bericht die je probeert te citeren lijkt niet te bestaan.
     over_character_limit: Limiet van %{max} tekens overschreden
     pin_errors:
       direct: Berichten die alleen zichtbaar zijn voor vermelde gebruikers, kunnen niet worden vastgezet
@@ -1875,18 +1926,17 @@ nl:
       ownership: Een bericht van iemand anders kan niet worden vastgemaakt
       reblog: Een boost kan niet worden vastgezet
     quote_policies:
-      followers: Volgers en vermelde gebruikers
-      nobody: Alleen vermelde gebruikers
+      followers: Alleen volgers
+      nobody: Alleen ik
       public: Iedereen
     title: '%{name}: "%{quote}"'
     visibilities:
       direct: Privébericht
       private: Alleen volgers
-      private_long: Alleen aan jouw volgers tonen
       public: Openbaar
-      public_long: Aan iedereen tonen, ook op openbare tijdlijnen
+      public_long: Iedereen op en buiten Mastodon
       unlisted: Minder openbaar
-      unlisted_long: Aan iedereen tonen, maar niet op openbare tijdlijnen
+      unlisted_long: Niet zichtbaar in de zoekresultaten van Mastodon, onder trends, hashtags en op openbare tijdlijnen
   statuses_cleanup:
     enabled: Automatisch oude berichten verwijderen
     enabled_hint: Verwijder uw berichten automatisch zodra ze een bepaalde leeftijdsgrens bereiken, tenzij ze overeenkomen met een van de onderstaande uitzonderingen
diff --git a/config/locales/nn.yml b/config/locales/nn.yml
index 7e3b453371f..bd59f5a1a67 100644
--- a/config/locales/nn.yml
+++ b/config/locales/nn.yml
@@ -190,6 +190,7 @@ nn:
         create_relay: Opprett eit relé
         create_unavailable_domain: Opprett utilgjengeleg domene
         create_user_role: Opprett rolle
+        create_username_block: Lag regel for brukarnamn
         demote_user: Degrader brukar
         destroy_announcement: Slett lysinga
         destroy_canonical_email_block: Fjern e-postblokkering
@@ -203,6 +204,7 @@ nn:
         destroy_status: Slett status
         destroy_unavailable_domain: Slett utilgjengeleg domene
         destroy_user_role: Øydelegg rolle
+        destroy_username_block: Slett regel for brukarnamn
         disable_2fa_user: Skruv av 2FA
         disable_custom_emoji: Skruv av tilpassa emoji
         disable_relay: Skru av reléet
@@ -230,13 +232,14 @@ nn:
         unsensitive_account: Angr tving ømtolig konto
         unsilence_account: Angre avgrensing av konto
         unsuspend_account: Opphev utestenginga av kontoen
-        update_announcement: Oppdater kunngjøringen
+        update_announcement: Oppdater kunngjeringa
         update_custom_emoji: Oppdater tilpassa emoji
         update_domain_block: Oppdater domene-sperring
         update_ip_block: Oppdater IP-regel
         update_report: Oppdater rapport
         update_status: Oppdater tut
         update_user_role: Oppdater rolla
+        update_username_block: Oppdater regel for brukarnamn
       actions:
         approve_appeal_html: "%{name} godkjende klagen frå %{target} på modereringa"
         approve_user_html: "%{name} godkjende registreringa til %{target}"
@@ -255,6 +258,7 @@ nn:
         create_relay_html: "%{name} laga reléet %{target}"
         create_unavailable_domain_html: "%{name} stogga levering til domenet %{target}"
         create_user_role_html: "%{name} oppretta rolla %{target}"
+        create_username_block_html: "%{name} laga ein regel for brukarnamn som inneheld %{target}"
         demote_user_html: "%{name} degraderte brukaren %{target}"
         destroy_announcement_html: "%{name} sletta kunngjeringa %{target}"
         destroy_canonical_email_block_html: "%{name} avblokkerte e-post med hash %{target}"
@@ -268,6 +272,7 @@ nn:
         destroy_status_html: "%{name} fjerna innlegget frå %{target}"
         destroy_unavailable_domain_html: "%{name} tok opp att levering til domenet %{target}"
         destroy_user_role_html: "%{name} sletta rolla %{target}"
+        destroy_username_block_html: "%{name} fjerna regelen for brukarnamn som inneheld %{target}"
         disable_2fa_user_html: "%{name} tok vekk krav om tofaktorautentisering for brukaren %{target}"
         disable_custom_emoji_html: "%{name} deaktiverte emojien %{target}"
         disable_relay_html: "%{name} skrudde av reléet %{target}"
@@ -302,6 +307,7 @@ nn:
         update_report_html: "%{name} oppdaterte rapporten %{target}"
         update_status_html: "%{name} oppdaterte innlegg av %{target}"
         update_user_role_html: "%{name} endret %{target} -rolle"
+        update_username_block_html: "%{name} oppdaterte regelen for brukarnamn som inneheld %{target}"
       deleted_account: sletta konto
       empty: Ingen loggar funne.
       filter_by_action: Sorter etter handling
@@ -310,26 +316,26 @@ nn:
       unavailable_instance: "(domenenamn er utilgjengeleg)"
     announcements:
       back: Tilbake til kunngjeringane
-      destroyed_msg: Kunngjøringen er slettet!
+      destroyed_msg: Kunngjeringa er sletta
       edit:
-        title: Rediger kunngjøring
-      empty: Ingen kunngjøringer funnet.
+        title: Rediger kunngjeringa
+      empty: Fann ingen kunngjeringar.
       live: Direkte
       new:
-        create: Lag kunngjøring
-        title: Ny kunngjøring
+        create: Skriv ei kunngjering
+        title: Ny kunngjering
       preview:
         disclaimer: Av di folk ikkje kan velja bort epostvarsel, bør du avgrensa dei til viktige kunngjeringar som datainnbrot eller varsel om at tenaren skal stengja.
         explanation_html: 'Denne eposten blir send til <strong>%{display_count} folk</strong>. Denne teksten vil stå i eposten:'
         title: Førehandsvis kunngjeringa
       publish: Publiser
-      published_msg: Kunngjøring publisert!
+      published_msg: Kunngjeringa er offentleggjord!
       scheduled_for: Planlagt for %{time}
-      scheduled_msg: Kunngjøring planlagt for publisering!
-      title: Kunngjøringer
+      scheduled_msg: Du har planlagt kunngjeringa.
+      title: Kunngjeringar
       unpublish: Avpubliser
-      unpublished_msg: Kunngjøring upublisert!
-      updated_msg: Kunngjøringen er oppdatert!
+      unpublished_msg: Du avpubliserte kunngjeringa.
+      updated_msg: Du oppdaterte kunngjeringa.
     critical_update_pending: Kritisk oppdatering ventar
     custom_emojis:
       assign_category: Vel kategori
@@ -625,7 +631,7 @@ nn:
     relays:
       add_new: Legg til ny overgang
       delete: Slett
-      description_html: En <strong>federert overgang</strong> er en mellomleddsserver som utveksler store mengder av offentlige tuter mellom servere som abonnerer og publiserer til den. <strong>Det kan hjelpe små og mellomstore servere til å oppdage innhold fra strømiverset</strong>, noe som ellers ville ha krevd at lokale brukere manuelt fulgte andre personer på fjerne servere.
+      description_html: Eit <strong>føderert rele</strong> er ein tenar som er mellomledd og handterer store mengder offentlege innlegg mellom tenarar som abonnerer på og sender innlegg til han. <strong>Det kan hjelpa små og mellomstore tenarar å oppdaga innhald frå allheimen</strong>, noko som elles ville krevja at lokale brukarar manuelt fylgde andre folk på andre tenarar.
       disable: Slå av
       disabled: Slege av
       enable: Slå på
@@ -782,8 +788,8 @@ nn:
         manage_user_access_description: Let brukarar deaktivere 2-trinnsautentisering, endre e-postadressa og tilbakestille passordet til andre brukarar
         manage_users: Handtere brukarar
         manage_users_description: Let brukarar sjå detaljar om andre brukarar og utføre moderasjonshandlingar mot dei
-        manage_webhooks: Handtere webhooks
-        manage_webhooks_description: Let brukarar setje opp webhooks for administrative hendingar
+        manage_webhooks: Handter vevkoplingar
+        manage_webhooks_description: Lèt brukarar setja opp vevkoplingar for administrative hendingar
         view_audit_log: Sjå revisjonslogg
         view_audit_log_description: Let brukarar sjå historikk over administrative handlingar på tenaren
         view_dashboard: Vis dashbord
@@ -800,7 +806,7 @@ nn:
       empty: Ingen serverregler har blitt definert ennå.
       move_down: Flytt ned
       move_up: Flytt opp
-      title: Server regler
+      title: Tenarreglar
       translation: Omsetjing
       translations: Omsetjingar
       translations_explanation: Du kan leggja til omsetjingar av retningslinene for denne tenaren. Standardverdien vil syna dersom det ikkje finst noka omsetjing. Ver god å passa på at alle omsetjingar er i samsvar med standardverdien.
@@ -863,7 +869,7 @@ nn:
       destroyed_msg: Vellukka sletting av sideopplasting!
     software_updates:
       critical_update: Kritisk – gjer vel og oppdater snart
-      description: Det er anbefalt å halda Mastodon-installasjonen oppdatert for å dra nytte av nye feilrettingar og funksjonar. Dessutan er det av og til kritisk å oppdatera Mastodon til rett tid for å ungå sikkerheitsproblem. På grunn av dette vil Mastodon sjå etter oppdateringar kvart 30. minutt og halda deg orientert etter innstillingane du har sett for e-postvarsling.
+      description: Me rår til å halda Mastodon-installasjonen oppdatert for å dra nytte av nye feilrettingar og funksjonar. Dessutan er det av og til kritisk å oppdatera Mastodon til rett tid for å ungå sikkerheitsproblem. På grunn av dette vil Mastodon sjå etter oppdateringar kvart 30. minutt og halda deg orientert etter innstillingane du har sett for e-postvarsling.
       documentation_link: Lær meir
       release_notes: Oppdateringsnotat
       title: Tilgjengelege oppdateringar
@@ -941,8 +947,8 @@ nn:
         message_html: 'Inkompatibel Elasticsearch-versjon: %{value}'
         version_comparison: Elasticsearch %{running_version} kjører mens %{required_version} er påkrevd
       rules_check:
-        action: Behandle serverregler
-        message_html: Du har ikke definert noen serverregler.
+        action: Handter tenarreglar
+        message_html: Du har ikkje laga reglar for denne tenaren.
       sidekiq_process_check:
         message_html: Ingen Sidekiq-prosess kjører for %{value} køen(e). Vennligst se gjennom Sidekiq-konfigurasjonen din
       software_version_check:
@@ -1083,8 +1089,27 @@ nn:
         used_by_over_week:
           one: Brukt av én person i løpet av den seneste uken
           other: Brukt av %{count} personer i løpet av den seneste uken
-      title: Anbefalingar og trendar
+      title: Tilrådingar og trendar
       trending: Trender
+    username_blocks:
+      add_new: Lag ny
+      block_registrations: Blokker registreringar
+      comparison:
+        contains: Inneheld
+        equals: Er lik
+      contains_html: Inneheld %{string}
+      created_msg: Laga regelen for brukarnamn
+      delete: Slett
+      edit:
+        title: Rediger regelen for brukarnamn
+      matches_exactly_html: Er lik %{string}
+      new:
+        create: Lag regel
+        title: Lag ein ny regel for brukarnamn
+      no_username_block_selected: Ingen brukarnamnreglar vart endra fordi du ikkje valde nokon
+      not_permitted: Ikkje tillate
+      title: Reglar for brukarnamn
+      updated_msg: Oppdaterte regelen for brukarnamn
     warning_presets:
       add_new: Legg til ny
       delete: Slett
@@ -1094,23 +1119,23 @@ nn:
     webhooks:
       add_new: Legg til endepunkt
       delete: Slett
-      description_html: En <strong>webhook</strong> gjør det mulig for Mastodon å sende <strong>varsler i sanntid</strong> om utvalgte hendelser til din egen applikasjon, sånn at applikasjonen din kan <strong>reagere automatisk</strong>.
-      disable: Deaktiver
-      disabled: Deaktivert
+      description_html: Ei <strong>vevkopling</strong> gjer det mogleg for Mastodon å senda <strong>varsel i sanntid</strong> om utvalde hendingar til ditt eige program, slik at programmet ditt kan <strong>reagera automatisk</strong>.
+      disable: Skru av
+      disabled: Skrudd av
       edit: Rediger endepunkt
-      empty: Du har ingen webhook-endepunkter konfigurert ennå.
-      enable: Aktiver
+      empty: Du har ikkje laga nokon vevkoplingsendepunkt enno.
+      enable: Skru på
       enabled: Aktiv
       enabled_events:
         one: 1 aktivert hendelse
-        other: "%{count} aktiverte hendelser"
-      events: Hendelser
-      new: Ny webhook
-      rotate_secret: Roter hemmelighet
-      secret: Hemmelighet for signering
+        other: "%{count} aktiverte hendingar"
+      events: Hendingar
+      new: Ny vevkopling
+      rotate_secret: Roter løyndomen
+      secret: Signeringsrløyndom
       status: Status
-      title: Webhooker
-      webhook: Webhook
+      title: Vevkoplingar
+      webhook: Vevkopling
   admin_mailer:
     auto_close_registrations:
       body: På grunn av mangel på nyleg moderatoraktivitet, er registreringar på %{instance} automatisk bytt til å krevje manuell gjennomgang, for å hindre at %{instance} vert brukt som ein plattform for potensielle dårlege aktørar. Du kan byte tilbake for å opne registreringar når som helst.
@@ -1235,7 +1260,7 @@ nn:
       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 held fram, ver snill og sjå gjennom reglane bestemt av moderatorane av %{domain}.
-      title: Noen grunnregler.
+      title: Nokre grunnreglar.
       title_invited: Du har blitt invitert.
     security: Tryggleik
     set_new_password: Lag nytt passord
@@ -1349,6 +1374,10 @@ nn:
     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
+  emoji_styles:
+    auto: Auto
+    native: Innebygd
+    twemoji: Twemoji
   errors:
     '400': Søknaden du sende var ugyldig eller sett opp feil.
     '403': Du har ikkje løyve til å sjå denne sida.
@@ -1525,7 +1554,7 @@ nn:
       muting: Importerer dempa brukarkontoar
     type: Type import
     type_groups:
-      constructive: Fylgjer og bokmerke
+      constructive: Fylgje og bokmerke
       destructive: Blokkeringar og dempingar
     types:
       blocking: Blokkeringsliste
@@ -1658,6 +1687,10 @@ nn:
       title: Ny omtale
     poll:
       subject: Meiningsmålinga frå %{name} er avslutta
+    quote:
+      body: 'Innlegget ditt vart sitert av %{name}:'
+      subject: "%{name} siterte innlegget ditt"
+      title: Nytt sitat
     reblog:
       body: 'Statusen din vart framheva av %{name}:'
       subject: "%{name} framheva statusen din"
@@ -1706,6 +1739,9 @@ nn:
       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
+    vote: Røyst
+  posting_defaults:
+    explanation: Desse innstillingane vil bli brukte som standardval når du skriv nye innlegg, men du kan redigera dei for kvart innlegg når du skriv.
   preferences:
     other: Anna
     posting_defaults: Innleggsstandarder
@@ -1753,7 +1789,7 @@ nn:
     missing_resource: Kunne ikke finne URLen for din konto
   reports:
     errors:
-      invalid_rules: refererer ikke til gyldige regler
+      invalid_rules: viser ikkje til gyldige reglar
   rss:
     content_warning: 'Innhaldsvarsel:'
     descriptions:
@@ -1830,7 +1866,7 @@ nn:
     notifications: Epostvarsel
     preferences: Innstillingar
     profile: Profil
-    relationships: Fylgjar og fylgjarar
+    relationships: Fylgje og fylgjarar
     severed_relationships: Brotne forhold
     statuses_cleanup: Automatisert sletting av innlegg
     strikes: Modereringsadvarsler
@@ -1868,6 +1904,7 @@ nn:
     edited_at_html: Redigert %{date}
     errors:
       in_reply_not_found: Det ser ut til at tutet du freistar å svara ikkje finst.
+      quoted_status_not_found: Innlegget du prøver å sitera ser ikkje ut til å finnast.
     over_character_limit: øvregrensa for teikn, %{max}, er nådd
     pin_errors:
       direct: Innlegg som bare er synlige for nevnte brukere kan ikke festes
@@ -1875,18 +1912,17 @@ nn:
       ownership: Du kan ikkje festa andre sine tut
       reblog: Ei framheving kan ikkje festast
     quote_policies:
-      followers: Tilhengjarar og nemnde folk
-      nobody: Berre nemnde folk
-      public: Alle
+      followers: Berre fylgjarar
+      nobody: Berre eg
+      public: Allle
     title: "%{name}: «%{quote}»"
     visibilities:
-      direct: Direkte
+      direct: Privat omtale
       private: Berre fylgjarar
-      private_long: Vis berre til fylgjarar
       public: Offentleg
-      public_long: Alle kan sjå
-      unlisted: Ikkje oppført
-      unlisted_long: Alle kan sjå, men ikkje oppført på offentlege tidsliner
+      public_long: Alle på og utanfor Mastodon
+      unlisted: Stille offentleg
+      unlisted_long: Gøymt frå søkjeresultat, populært og offentleg på Mastodon
   statuses_cleanup:
     enabled: Slett gamle innlegg automatisk
     enabled_hint: Sletter innleggene dine automatisk når de oppnår en angitt alder, med mindre de samsvarer med ett av unntakene nedenfor
diff --git a/config/locales/no.yml b/config/locales/no.yml
index 3ab662ddb64..a10f4c6a6aa 100644
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -1629,13 +1629,7 @@
       reblog: En fremheving kan ikke festes
     title: "%{name}: «%{quote}»"
     visibilities:
-      direct: Direkte
-      private: Privat
-      private_long: Synlig kun for følgere
       public: Offentlig
-      public_long: Synlig for alle
-      unlisted: Uoppført
-      unlisted_long: Synlig for alle, men ikke på offentlige tidslinjer
   statuses_cleanup:
     enabled: Slett gamle innlegg automatisk
     enabled_hint: Sletter innleggene dine automatisk når de oppnår en angitt alder, med mindre de samsvarer med ett av unntakene nedenfor
diff --git a/config/locales/oc.yml b/config/locales/oc.yml
index 258348d41cb..51f8d8c7b4d 100644
--- a/config/locales/oc.yml
+++ b/config/locales/oc.yml
@@ -848,13 +848,7 @@ oc:
       reblog: Se pòt pas penjar un tut partejat
     title: '%{name} : "%{quote}"'
     visibilities:
-      direct: Dirècte
-      private: Seguidors solament
-      private_long: Mostrar pas qu’als seguidors
       public: Public
-      public_long: Tot lo monde pòt veire
-      unlisted: Pas listat
-      unlisted_long: Tot lo monde pòt veire mai serà pas visible sul flux public
   statuses_cleanup:
     enabled: Supression automatica de publicacions ancianas
     enabled_hint: Suprimís automaticament vòstras publicacions quand correspondon al critèri d’atge causit, levat se correspondon tanben a las excepcions çai-jos
diff --git a/config/locales/pa.yml b/config/locales/pa.yml
index 1899d71008a..f9508f9b9a4 100644
--- a/config/locales/pa.yml
+++ b/config/locales/pa.yml
@@ -7,7 +7,13 @@ pa:
     hosted_on: "%{domain} ਉੱਤੇ ਹੋਸਟ ਕੀਤਾ ਮਸਟਾਡੋਨ"
     title: ਇਸ ਬਾਰੇ
   accounts:
+    followers:
+      one: ਫ਼ਾਲੋਅਰ
+      other: ਫ਼ਾਲੋਅਰ
     following: ਫ਼ਾਲੋ ਕੀਤੇ ਜਾ ਰਹੇ
+    posts:
+      one: ਪੋਸਟ
+      other: ਪੋਸਟਾਂ
     posts_tab_heading: ਪੋਸਟਾਂ
   admin:
     account_moderation_notes:
@@ -126,6 +132,9 @@ pa:
       thread: ਗੱਲਾਂਬਾਤਾਂ
     index:
       delete: ਹਟਾਓ
+      statuses:
+        one: "%{count} ਪੋਸਟ"
+        other: "%{count} ਪੋਸਟ"
   generic:
     all: ਸਭ
     copy: ਕਾਪੀ ਕਰੋ
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 36897280f5d..20b391c8675 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -196,6 +196,7 @@ pl:
         create_relay: Utwórz przekaźnik
         create_unavailable_domain: Utwórz niedostępną domenę
         create_user_role: Utwórz rolę
+        create_username_block: Utwórz zasadę nazwy użytkownika
         demote_user: Zdegraduj użytkownika
         destroy_announcement: Usuń ogłoszenie
         destroy_canonical_email_block: Usuń blokadę e-mail
@@ -209,6 +210,7 @@ pl:
         destroy_status: Usuń wpis
         destroy_unavailable_domain: Usuń niedostępną domenę
         destroy_user_role: Zlikwiduj rolę
+        destroy_username_block: Usuń zasadę nazwy użytkownika
         disable_2fa_user: Wyłącz 2FA
         disable_custom_emoji: Wyłącz niestandardowe emoji
         disable_relay: Wyłącz przekaźnik
@@ -243,6 +245,7 @@ pl:
         update_report: Wiadomości or raporcie
         update_status: Aktualizuj wpis
         update_user_role: Aktualizuj rolę
+        update_username_block: Zaktualizuj zasadę nazwy użytkownika
       actions:
         approve_appeal_html: "%{name} zatwierdził(-a) odwołanie decyzji moderacyjnej od %{target}"
         approve_user_html: "%{name} zatwierdził rejestrację od %{target}"
@@ -261,6 +264,7 @@ pl:
         create_relay_html: "%{name} utworzył przekaźnik %{target}"
         create_unavailable_domain_html: "%{name} przestał(a) doręczać na domenę %{target}"
         create_user_role_html: "%{name} utworzył rolę %{target}"
+        create_username_block_html: Użytkownik %{name} dodał zasadę dla nazw użytkowników zawierających %{target}
         demote_user_html: "%{name} zdegradował(a) użytkownika %{target}"
         destroy_announcement_html: "%{name} usunął(-ęła) ogłoszenie %{target}"
         destroy_canonical_email_block_html: "%{name} odblokował(a) e-mail z hashem %{target}"
@@ -274,6 +278,7 @@ pl:
         destroy_status_html: "%{name} usunął(-ęła) wpis użytkownika %{target}"
         destroy_unavailable_domain_html: "%{name} wznowił(a) doręczanie do domeny %{target}"
         destroy_user_role_html: "%{name} usunął rolę %{target}"
+        destroy_username_block_html: Użytkownik %{name} usunął zasadę dla nazw użytkowników zawierających %{target}
         disable_2fa_user_html: "%{name} wyłączył(a) uwierzytelnianie dwuskładnikowe użytkownikowi %{target}"
         disable_custom_emoji_html: "%{name} wyłączył(a) emoji %{target}"
         disable_relay_html: "%{name} wyłączył przekaźnik %{target}"
@@ -308,6 +313,7 @@ pl:
         update_report_html: "%{target} zaktualizowany przez %{name}"
         update_status_html: "%{name} zaktualizował(a) wpis użytkownika %{target}"
         update_user_role_html: "%{name} zmienił rolę %{target}"
+        update_username_block_html: Użytkownik %{name} zaktualizował zasadę dla nazw użytkowników zawierających %{target}
       deleted_account: usunięte konto
       empty: Nie znaleziono aktywności w dzienniku.
       filter_by_action: Filtruj według działania
@@ -315,6 +321,7 @@ pl:
       title: Dziennik działań administracyjnych
       unavailable_instance: "(domena niedostępna)"
     announcements:
+      back: Powrót do ogłoszeń
       destroyed_msg: Pomyślnie usunięto ogłoszenie!
       edit:
         title: Edytuj ogłoszenie
@@ -323,6 +330,9 @@ pl:
       new:
         create: Utwórz ogłoszenie
         title: Nowe ogłoszenie
+      preview:
+        explanation_html: 'Wiadomość e-mail zostanie wysłana do <strong>%{display_count} użytkowników</strong>. Otrzymają oni wiadomość o następującej treści:'
+        title: Podgląd powiadomienia
       publish: Opublikuj
       published_msg: Pomyślnie opublikowano ogłoszenie!
       scheduled_for: Zaplanowano na %{time}
@@ -491,6 +501,29 @@ pl:
       new:
         title: Importuj zablokowane domeny
       no_file: Nie wybrano pliku
+    fasp:
+      debug:
+        callbacks:
+          created_at: 'Utworzono:'
+          delete: Usuń
+          ip: Adres IP
+      providers:
+        active: Aktywne
+        base_url: Podstawowy adres URL
+        delete: Usuń
+        edit: Edytuj dostawców
+        finish_registration: Zakończ rejestrację
+        name: Nazwa
+        providers: Dostawca
+        registration_requested: Wymagana rejestracja
+        registrations:
+          confirm: Zatwierdź
+          reject: Odrzuć
+        save: Zapisz
+        sign_in: Zaloguj się
+        status: Status
+        title: Dostawcy usług pomocniczych Fediverse (Fediverse Auxiliary Service Providers)
+      title: FASP
     follow_recommendations:
       description_html: "<strong>Polecane obserwacje pomagają nowym użytkownikom szybko odnaleźć interesujące treści</strong>. Jeżeli użytkownik nie wchodził w interakcje z innymi wystarczająco często, aby powstały spersonalizowane rekomendacje, polecane są te konta. Są one obliczane każdego dnia na podstawie kombinacji kont o największej liczbie niedawnej aktywności i największej liczbie lokalnych obserwatorów dla danego języka."
       language: Dla języka
@@ -565,6 +598,9 @@ pl:
         all: Wszystkie
         limited: Ograniczone
         title: Moderacja
+      moderation_notes:
+        create: Dodaj notatkę moderacyjną
+        title: Notatki moderacyjne
       private_comment: Prywatny komentarz
       public_comment: Publiczny komentarz
       purge: Wyczyść
@@ -779,11 +815,16 @@ pl:
       title: Role
     rules:
       add_new: Dodaj zasadę
+      add_translation: Dodaj tłumaczenie
       delete: Usuń
       description_html: Chociaż większość twierdzi, że przeczytała i zgadza się z warunkami korzystania z usługi, zwykle ludzie nie czytają ich, dopóki nie pojawi się problem. <strong>Ułatw użytkownikom szybkie przejrzenie zasad serwera, umieszczając je na prostej liście punktowanej.</strong> Postaraj się, aby poszczególne zasady były krótkie i proste, ale staraj się też nie dzielić ich na wiele oddzielnych elementów.
       edit: Edytuj zasadę
       empty: Jeszcze nie zdefiniowano zasad serwera.
+      move_down: Przenieś w dół
+      move_up: Przenieś w górę
       title: Regulamin serwera
+      translation: Tłumaczenie
+      translations: Tłumaczenia
     settings:
       about:
         manage_rules: Zarządzaj regułami serwera
@@ -809,6 +850,7 @@ pl:
       discovery:
         follow_recommendations: Polecane konta
         preamble: Prezentowanie interesujących treści ma kluczowe znaczenie dla nowych użytkowników, którzy mogą nie znać nikogo z Mastodona. Kontroluj, jak różne funkcje odkrywania działają na Twoim serwerze.
+        privacy: Prywatność
         profile_directory: Katalog profilów
         public_timelines: Publiczne osie czasu
         publish_statistics: Publikuj statystyki
@@ -1066,6 +1108,23 @@ pl:
           other: Użyte przez %{count} osób w ciągu ostatniego tygodnia
       title: Rekomendacje i Trendy
       trending: Popularne
+    username_blocks:
+      add_new: Dodaj nową
+      block_registrations: Zablokuj rejestracje
+      comparison:
+        contains: Zawiera
+        equals: Równa się
+      contains_html: Zawiera %{string}
+      delete: Usuń
+      edit:
+        title: Edytuj zasadę nazwy użytkownika
+      matches_exactly_html: Równa się %{string}
+      new:
+        create: Dodaj zasadę
+        title: Utwórz zasadę nazwy użytkownika
+      not_permitted: Brak uprawnień
+      title: Zasady nazwy użytkownika
+      updated_msg: Pomyślnie zaktualizowano zasadę nazwy użytkownika
     warning_presets:
       add_new: Dodaj nowy
       delete: Usuń
@@ -1332,6 +1391,10 @@ 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
+  emoji_styles:
+    auto: Automatycznie
+    native: Natywny
+    twemoji: Twemoji
   errors:
     '400': Wysłane zgłoszenie jest nieprawidłowe lub uszkodzone.
     '403': Nie masz uprawnień, aby wyświetlić tę stronę.
@@ -1681,6 +1744,9 @@ pl:
       title: Nowe wspomnienie o Tobie
     poll:
       subject: Ankieta %{name} zakończyła się
+    quote:
+      subject: "%{name} cytował twój post"
+      title: Nowy cytat
     reblog:
       body: 'Twój wpis został podbity przez %{name}:'
       subject: Twój wpis został podbity przez %{name}
@@ -1729,6 +1795,7 @@ pl:
       self_vote: Nie możesz głosować we własnych ankietach
       too_few_options: musi zawierać przynajmniej dwie opcje
       too_many_options: nie może zawierać więcej niż %{max} opcji
+    vote: Głosuj
   preferences:
     other: Pozostałe
     posting_defaults: Domyślne ustawienia wpisów
@@ -1899,21 +1966,20 @@ pl:
     edited_at_html: Edytowane %{date}
     errors:
       in_reply_not_found: Post, na który próbujesz odpowiedzieć, nie istnieje.
+      quoted_status_not_found: Wpis, który próbujesz zacytować, nie istnieje.
     over_character_limit: limit %{max} znaków przekroczony
     pin_errors:
       direct: Nie możesz przypiąć wpisu, który jest widoczny tylko dla wspomnianych użytkowników
       limit: Przekroczyłeś maksymalną liczbę przypiętych wpisów
       ownership: Nie możesz przypiąć cudzego wpisu
       reblog: Nie możesz przypiąć podbicia wpisu
+    quote_policies:
+      followers: Tylko obserwujący
+      nobody: Tylko ja
+      public: Każdy
     title: '%{name}: "%{quote}"'
     visibilities:
-      direct: Bezpośredni
-      private: Tylko dla obserwujących
-      private_long: Widoczne tylko dla osób, które Cię obserwują
       public: Publiczne
-      public_long: Widoczne dla wszystkich użytkowników
-      unlisted: Niewypisane
-      unlisted_long: Widoczne dla wszystkich, ale nie wyświetlane na publicznych osiach czasu
   statuses_cleanup:
     enabled: Automatycznie usuwaj stare wiadomości
     enabled_hint: Automatycznie usuwa Twoje posty, gdy osiągną określony próg wiekowy, chyba że spełniają jeden z poniższych wyjątków
@@ -1958,6 +2024,9 @@ pl:
     does_not_match_previous_name: nie pasuje do poprzedniej nazwy
   terms_of_service:
     title: Regulamin
+  terms_of_service_interstitial:
+    review_link: Przeglądnij Warunki Korzystania
+    title: Warunki korzystania z %{domain} zmieniają się
   themes:
     contrast: Mastodon (Wysoki kontrast)
     default: Mastodon (Ciemny)
@@ -1989,6 +2058,9 @@ pl:
     recovery_instructions_html: Jeżeli kiedykolwiek utracisz dostęp do telefonu, możesz wykorzystać jeden z kodów zapasowych, aby odzyskać dostęp do konta. <strong>Trzymaj je w bezpiecznym miejscu</strong>. Na przykład, wydrukuj je i przechowuj z ważnymi dokumentami.
     webauthn: Klucze bezpieczeństwa
   user_mailer:
+    announcement_published:
+      subject: Ogłoszenie serwisu
+      title: Ogłoszenie serwisu %{domain}
     appeal_approved:
       action: Ustawienia Konta
       explanation: Twoje odwołanie dotyczące ostrzeżenia nałożonego na twoje konto dnia %{strike_date}, które zostało wysłane dnia %{appeal_date} zostało zatwierdzone. Twoje konto jest ponownie w dobrej kondycji.
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index 27d2c860e18..4686305e647 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -190,6 +190,7 @@ pt-BR:
         create_relay: Criar Retransmissão
         create_unavailable_domain: Criar domínio indisponível
         create_user_role: Criar cargo
+        create_username_block: Criar regra de usuário
         demote_user: Rebaixar usuário
         destroy_announcement: Excluir anúncio
         destroy_canonical_email_block: Deletar bloqueio de Email
@@ -203,6 +204,7 @@ pt-BR:
         destroy_status: Excluir publicação
         destroy_unavailable_domain: Excluir domínio indisponível
         destroy_user_role: Destruir cargo
+        destroy_username_block: Excluir regra de usuário
         disable_2fa_user: Desativar autenticação de dois fatores
         disable_custom_emoji: Desativar emoji personalizado
         disable_relay: Desativar Retransmissão
@@ -237,6 +239,7 @@ pt-BR:
         update_report: Atualizar Relatório
         update_status: Editar Status
         update_user_role: Atualizar cargo
+        update_username_block: Atualizar regra de usuário
       actions:
         approve_appeal_html: "%{name} aprovou a revisão da decisão da moderação em %{target}"
         approve_user_html: "%{name} aprovado inscrição de %{target}"
@@ -255,6 +258,7 @@ pt-BR:
         create_relay_html: "%{name} criou uma retransmissão %{target}"
         create_unavailable_domain_html: "%{name} parou a entrega ao domínio %{target}"
         create_user_role_html: "%{name} criou o cargo %{target}"
+        create_username_block_html: Regra %{name} adicionada para nomes de usuário contendo %{target}
         demote_user_html: "%{name} rebaixou o usuário %{target}"
         destroy_announcement_html: "%{name} excluiu o anúncio %{target}"
         destroy_canonical_email_block_html: "%{name} desbloqueou o endereço e-mail com o hash %{target}"
@@ -268,6 +272,7 @@ pt-BR:
         destroy_status_html: "%{name} removeu a publicação de %{target}"
         destroy_unavailable_domain_html: "%{name} retomou a entrega ao domínio %{target}"
         destroy_user_role_html: "%{name} excluiu o cargo %{target}"
+        destroy_username_block_html: Regra %{name} removida por usuário contendo %{target}
         disable_2fa_user_html: "%{name} desativou a exigência da autenticação de dois fatores para o usuário %{target}"
         disable_custom_emoji_html: "%{name} desativou o emoji %{target}"
         disable_relay_html: "%{name} desativou uma retransmissão %{target}"
@@ -302,6 +307,7 @@ pt-BR:
         update_report_html: "%{name} atualizou o relatório %{target}"
         update_status_html: "%{name} atualizou a publicação de %{target}"
         update_user_role_html: "%{name} alterou o cargo %{target}"
+        update_username_block_html: Regra %{name} atualizada para nomes de usuários contendo %{target}
       deleted_account: conta excluída
       empty: Nenhum registro encontrado.
       filter_by_action: Filtrar por ação
@@ -578,6 +584,13 @@ pt-BR:
         all: Todos
         limited: Limitados
         title: Moderação
+      moderation_notes:
+        create: Adicionar Nota de Moderação
+        created_msg: Nota de moderação da instância criada com sucesso!
+        description_html: Visualize e deixe anotações para outros moderadores e seu próprio futuro
+        destroyed_msg: Nota de moderação da instância excluída com sucesso!
+        placeholder: Informações sobre esta instância, ações tomadas, ou qualquer outra coisa que ajudará você a moderar esta instância no futuro.
+        title: Notas de Moderação
       private_comment: Comentário privado
       public_comment: Comentário público
       purge: Limpar
@@ -1078,6 +1091,25 @@ pt-BR:
           other: Usado por %{count} pessoas na última semana
       title: Recomendações e tendências
       trending: Em alta
+    username_blocks:
+      add_new: Adicionar novo
+      block_registrations: Bloquear inscrições
+      comparison:
+        contains: Conteúdo
+        equals: Igual
+      contains_html: Contém %{string}
+      created_msg: Regra de nome de usuário criada com sucesso
+      delete: Excluir
+      edit:
+        title: Editar nome de usuário
+      matches_exactly_html: "%{string} É igual"
+      new:
+        create: Criar regra
+        title: Criar regra de usuário
+      no_username_block_selected: Nenhuma regra de usuário foi trocada nenhuma foi selecionada
+      not_permitted: Não permitido
+      title: Regras de usuário
+      updated_msg: Regra de usuário atualizada com sucesso
     warning_presets:
       add_new: Adicionar novo
       delete: Excluir
@@ -1342,6 +1374,10 @@ 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
+  emoji_styles:
+    auto: Automático
+    native: Nativo
+    twemoji: Twemoji
   errors:
     '400': A solicitação enviada é inválida ou incorreta.
     '403': Você não tem permissão para ver esta página.
@@ -1651,6 +1687,10 @@ pt-BR:
       title: Nova menção
     poll:
       subject: Uma enquete por %{name} terminou
+    quote:
+      body: 'Sua publicação foi Citada por %{name}:'
+      subject: "%{name} citou sua publicação"
+      title: Nova citação
     reblog:
       body: "%{name} impulsionou a sua publicação:"
       subject: "%{name} impulsionou a sua publicação"
@@ -1699,6 +1739,9 @@ pt-BR:
       self_vote: Você não pode votar nas suas próprias enquetes
       too_few_options: deve ter mais que um item
       too_many_options: não pode ter mais que %{max} itens
+    vote: Votar
+  posting_defaults:
+    explanation: Estas configurações serão usadas como padrão quando você criar publicações, mas você pode editá-las por postagem no compositor.
   preferences:
     other: Outro
     posting_defaults: Padrões de publicação
@@ -1861,6 +1904,7 @@ pt-BR:
     edited_at_html: Editado em %{date}
     errors:
       in_reply_not_found: A publicação que você quer responder parece não existir.
+      quoted_status_not_found: A publicação que você quer responder parece não existir.
     over_character_limit: limite de caracteres de %{max} excedido
     pin_errors:
       direct: Publicações visíveis apenas para usuários mencionados não podem ser fixadas
@@ -1868,18 +1912,15 @@ pt-BR:
       ownership: As publicações dos outros não podem ser fixadas
       reblog: Um impulso não pode ser fixado
     quote_policies:
-      followers: Seguidores e usuários mencionados
-      nobody: Apenas usuários mencionados
-      public: Todos
+      followers: Apenas seguidores
+      nobody: Apenas eu
+      public: Qualquer um
     title: '%{name}: "%{quote}"'
     visibilities:
-      direct: Direto
-      private: Apenas seguidores
-      private_long: Exibir apenas para seguidores
+      direct: Citação privada
       public: Público
-      public_long: Todos podem ver
-      unlisted: Não listado
-      unlisted_long: Todos podem ver, mas não é listado em linhas do tempo públicas
+      public_long: Qualquer um dentro ou fora do Mástodon
+      unlisted_long: Oculto aos resultados de pesquisa em Mástodon
   statuses_cleanup:
     enabled: Excluir publicações antigas automaticamente
     enabled_hint: Exclui suas publicações automaticamente assim que elas alcançam sua validade, a não ser que se enquadrem em alguma das exceções abaixo
diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml
index b74119f4e33..3ee79756485 100644
--- a/config/locales/pt-PT.yml
+++ b/config/locales/pt-PT.yml
@@ -190,6 +190,7 @@ pt-PT:
         create_relay: Criar retransmissor
         create_unavailable_domain: Criar domínio indisponível
         create_user_role: Criar função
+        create_username_block: Criar Regra de Nome de Utilizador
         demote_user: Despromover utilizador
         destroy_announcement: Eliminar mensagem de manutenção
         destroy_canonical_email_block: Eliminar bloqueio de e-mail
@@ -203,6 +204,7 @@ pt-PT:
         destroy_status: Eliminar publicação
         destroy_unavailable_domain: Eliminar domínio indisponível
         destroy_user_role: Eliminar função
+        destroy_username_block: Eliminar Regra de Nome de Utilizador
         disable_2fa_user: Desativar 2FA
         disable_custom_emoji: Desativar emoji personalizado
         disable_relay: Desativar retransmissor
@@ -237,6 +239,7 @@ pt-PT:
         update_report: Atualizar denúncia
         update_status: Atualizar publicação
         update_user_role: Atualizar função
+        update_username_block: Atualizar Regra de Nome de Utilizador
       actions:
         approve_appeal_html: "%{name} aprovou a contestação da decisão de moderação de %{target}"
         approve_user_html: "%{name} aprovou a inscrição de %{target}"
@@ -255,6 +258,7 @@ pt-PT:
         create_relay_html: "%{name} criou o retransmissor %{target}"
         create_unavailable_domain_html: "%{name} parou as entregas ao domínio %{target}"
         create_user_role_html: "%{name} criou a função %{target}"
+        create_username_block_html: "%{name} adicionou regra para nomes de utilizadores que contêm %{target}"
         demote_user_html: "%{name} despromoveu o utilizador %{target}"
         destroy_announcement_html: "%{name} eliminou a mensagem de manutenção %{target}"
         destroy_canonical_email_block_html: "%{name} desbloqueou o e-mail com a hash %{target}"
@@ -268,6 +272,7 @@ pt-PT:
         destroy_status_html: "%{name} removeu a publicação de %{target}"
         destroy_unavailable_domain_html: "%{name} retomou as entregas ao domínio %{target}"
         destroy_user_role_html: "%{name} eliminou a função %{target}"
+        destroy_username_block_html: "%{name} removeu regra para nomes de utilizadores que contêm %{target}"
         disable_2fa_user_html: "%{name} desativou o requerimento de autenticação em dois passos para o utilizador %{target}"
         disable_custom_emoji_html: "%{name} desativou o emoji %{target}"
         disable_relay_html: "%{name} desativou o retransmissor %{target}"
@@ -302,6 +307,7 @@ pt-PT:
         update_report_html: "%{name} atualizou a denúncia %{target}"
         update_status_html: "%{name} atualizou a publicação de %{target}"
         update_user_role_html: "%{name} alterou a função %{target}"
+        update_username_block_html: "%{name} atualizou regra para nomes de utilizadores que contêm %{target}"
       deleted_account: conta eliminada
       empty: Não foram encontrados registos.
       filter_by_action: Filtrar por ação
@@ -1085,6 +1091,25 @@ pt-PT:
           other: Utilizada por %{count} pessoas na última semana
       title: Recomendações e destaques
       trending: Em destaque
+    username_blocks:
+      add_new: Adicionar novo
+      block_registrations: Bloquear inscrições
+      comparison:
+        contains: Contém
+        equals: Igual a
+      contains_html: Contém %{string}
+      created_msg: Regra de nome de utilizador criada com sucesso
+      delete: Eliminar
+      edit:
+        title: Editar regra de nome de utilizador
+      matches_exactly_html: Igual a %{string}
+      new:
+        create: Criar regra
+        title: Criar nova regra de utilizador
+      no_username_block_selected: Não foi alterada nenhuma regra de nome de utilizador, pois nenhuma foi selecionada
+      not_permitted: Não permitido
+      title: Regras de nome de utilizador
+      updated_msg: Regra de nome de utilizador atualizada com sucesso
     warning_presets:
       add_new: Adicionar novo
       delete: Eliminar
@@ -1349,6 +1374,10 @@ pt-PT:
     basic_information: Informação básica
     hint_html: "<strong>Personalizq o que as pessoas veem no teu perfil público e junto das tuas publicações.</strong> É mais provável que as outras pessoas te sigam de volta ou interajam contigo se tiveres um perfil preenchido e uma imagem de perfil."
     other: Outro
+  emoji_styles:
+    auto: Auto
+    native: Nativo
+    twemoji: Twemoji
   errors:
     '400': O pedido que submeteste foi inválido ou mal formulado.
     '403': Não tens a permissão necessária para ver esta página.
@@ -1658,6 +1687,10 @@ pt-PT:
       title: Nova menção
     poll:
       subject: A sondagem de %{name} terminou
+    quote:
+      body: 'A sua publicação foi citada por %{name}:'
+      subject: "%{name} citou a sua publicação"
+      title: Nova citação
     reblog:
       body: 'A tua publicação foi impulsionada por %{name}:'
       subject: "%{name} impulsionou a tua publicação"
@@ -1706,6 +1739,9 @@ pt-PT:
       self_vote: Não podes votar numa sondagem criada por ti
       too_few_options: tem de ter mais do que um item
       too_many_options: não pode conter mais do que %{max} itens
+    vote: Votar
+  posting_defaults:
+    explanation: Essas configurações serão utilizadas como padrão quando criar novas publicações, mas poderá alterá-las individualmente no editor.
   preferences:
     other: Outro
     posting_defaults: Padrões de publicação
@@ -1868,6 +1904,7 @@ pt-PT:
     edited_at_html: Editado em %{date}
     errors:
       in_reply_not_found: A publicação a que estás a tentar responder parece não existir.
+      quoted_status_not_found: A publicação que está a tentar citar parece não existir.
     over_character_limit: limite de caracteres %{max} excedido
     pin_errors:
       direct: As publicações que só são visíveis para os utilizadores mencionados não podem ser fixadas
@@ -1875,18 +1912,17 @@ pt-PT:
       ownership: Não podem ser fixadas publicações de outras pessoas
       reblog: Não é possível fixar um impulso
     quote_policies:
-      followers: Seguidores e utilizadores mencionados
-      nobody: Apenas utilizadores mencionados
+      followers: Apenas para seguidores
+      nobody: Apenas eu
       public: Todos
     title: '%{name}: "%{quote}"'
     visibilities:
-      direct: Direto
-      private: Só para seguidores
-      private_long: Mostrar só aos seguidores
+      direct: Menção privada
+      private: Apenas seguidores
       public: Público
-      public_long: Todos podem ver
+      public_long: Qualquer pessoa dentro e fora do Mastodon
       unlisted: Não listado
-      unlisted_long: Todos podem ver, mas não aparecerá nas cronologias públicas
+      unlisted_long: Oculto dos resultados de pesquisa, tendências e linhas do tempo públicas do Mastodon
   statuses_cleanup:
     enabled: Eliminar publicações antigas automaticamente
     enabled_hint: Elimina automaticamente as tuas publicações assim que atingirem um certo limite de tempo, a não ser que correspondam a uma das seguintes exceções
diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index aeaa1e283c6..57b82a35d45 100644
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -685,12 +685,6 @@ ro:
       limit: Deja ai fixat numărul maxim de postări
       ownership: Postarea altcuiva nu poate fi fixată
       reblog: Un impuls nu poate fi fixat
-    visibilities:
-      private: Doar urmăritorii
-      private_long: Arată doar urmăritorilor
-      public_long: Toată lumea poate vedea
-      unlisted: Nelistat
-      unlisted_long: Toată lumea poate vedea, dar nu este listată pe fluxurile publice
   stream_entries:
     sensitive_content: Conținut sensibil
   tags:
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index ac4f3542b14..cdccbb65e11 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -1,10 +1,10 @@
 ---
 ru:
   about:
-    about_mastodon_html: 'Социальная сеть будущего: никакой рекламы или слежки со стороны корпораций, этичный дизайн и децентрализация! С Mastodon ваши данные находятся только под вашим контролем!'
+    about_mastodon_html: 'Социальная сеть будущего: никакой рекламы или слежки со стороны корпораций, этичный дизайн и децентрализация. С Mastodon ваши данные находятся только под вашим контролем!'
     contact_missing: Не указано
     contact_unavailable: N/A
-    hosted_on: Сервер Mastodon на домене %{domain}
+    hosted_on: Сервер Mastodon на сайте %{domain}
     title: О проекте
   accounts:
     followers:
@@ -196,6 +196,7 @@ ru:
         create_relay: Создание ретранслятора
         create_unavailable_domain: Добавление домена в список недоступных
         create_user_role: Создание ролей
+        create_username_block: Создать правило имени пользователя
         demote_user: Разжалование пользователей
         destroy_announcement: Удаление объявлений
         destroy_canonical_email_block: Удаление блокировок e-mail
@@ -209,6 +210,7 @@ ru:
         destroy_status: Удаление постов
         destroy_unavailable_domain: Исключение доменов из списка недоступных
         destroy_user_role: Удаление ролей
+        destroy_username_block: Удалить правило имени пользователя
         disable_2fa_user: Отключение 2FA
         disable_custom_emoji: Отключение эмодзи
         disable_relay: Отключение ретранслятора
@@ -243,6 +245,7 @@ ru:
         update_report: Изменение жалоб
         update_status: Изменение постов
         update_user_role: Изменение ролей
+        update_username_block: Обновить правило имени пользователя
       actions:
         approve_appeal_html: "%{name} одобрил(а) обжалование действий модерации от %{target}"
         approve_user_html: "%{name} утвердил(а) регистрацию %{target}"
@@ -261,6 +264,7 @@ ru:
         create_relay_html: "%{name} создал(а) ретранслятор %{target}"
         create_unavailable_domain_html: "%{name} приостановил доставку на узел %{target}"
         create_user_role_html: "%{name} создал(а) роль %{target}"
+        create_username_block_html: "%{name} создал(а) правило для имён пользователей, содержащих %{target}"
         demote_user_html: "%{name} разжаловал(а) пользователя %{target}"
         destroy_announcement_html: "%{name} удалил(а) объявление %{target}"
         destroy_canonical_email_block_html: "%{name} снял(а) блокировку e-mail с хэшем %{target}"
@@ -274,6 +278,7 @@ ru:
         destroy_status_html: "%{name} удалил(а) пост пользователя %{target}"
         destroy_unavailable_domain_html: "%{name} возобновил доставку на узел %{target}"
         destroy_user_role_html: "%{name} удалил(а) роль %{target}"
+        destroy_username_block_html: "%{name} удалил(а) правило для имён пользователей, содержащих %{target}"
         disable_2fa_user_html: "%{name} отключил(а) требование двухэтапной авторизации для пользователя %{target}"
         disable_custom_emoji_html: "%{name} отключил(а) эмодзи %{target}"
         disable_relay_html: "%{name} отключил(а) ретранслятор %{target}"
@@ -308,6 +313,7 @@ ru:
         update_report_html: "%{name} изменил(а) жалобу %{target}"
         update_status_html: "%{name} изменил(а) пост пользователя %{target}"
         update_user_role_html: "%{name} изменил(а) роль %{target}"
+        update_username_block_html: "%{name} обновил(а) правило для имён пользователей, содержащих %{target}"
       deleted_account: удалённая учётная запись
       empty: Журнал пуст.
       filter_by_action: Фильтр по действию
@@ -344,9 +350,9 @@ ru:
       copy: Копировать
       copy_failed_msg: Не удалось создать локальную копию эмодзи
       create_new_category: Создать новую категорию
-      created_msg: Эмодзи добавлен!
+      created_msg: Эмодзи добавлен
       delete: Удалить
-      destroyed_msg: Эмодзи удалён!
+      destroyed_msg: Эмодзи удалён
       disable: Отключить
       disabled: Отключён
       disabled_msg: Эмодзи отключён
@@ -354,12 +360,12 @@ ru:
       enable: Включить
       enabled: Включён
       enabled_msg: Эмодзи включён
-      image_hint: Поддерживаются файлы PNG или GIF размером не более %{size}
+      image_hint: Поддерживаются файлы PNG и GIF размером не более %{size}
       list: В список
       listed: В списке
       new:
         title: Добавить новый эмодзи
-      no_emoji_selected: Ни один эмодзи не был изменён, поскольку не было отмечено ни одного эмодзи
+      no_emoji_selected: Не было изменено ни одного эмодзи
       not_permitted: У вас недостаточно прав для выполнения этого действия
       overwrite: Заменить
       shortcode: Краткий код
@@ -369,7 +375,7 @@ ru:
       unlist: Из списка
       unlisted: Не в списке
       update_failed_msg: Не удалось обновить эмодзи
-      updated_msg: Эмодзи обновлён!
+      updated_msg: Эмодзи обновлён
       upload: Загрузить
     dashboard:
       active_users: активные пользователи
@@ -401,7 +407,7 @@ ru:
       software: Программное обеспечение
       sources: Источники регистрации
       space: Используемое пространство
-      title: Дашборд
+      title: Обзор
       top_languages: Рейтинг языков по активности
       top_servers: Рейтинг серверов по активности
       website: Веб-сайт
@@ -499,15 +505,24 @@ ru:
     fasp:
       debug:
         callbacks:
+          created_at: Создано в
           delete: Удалить
           ip: IP-адрес
+          request_body: Тело запроса
       providers:
+        active: Активен
         base_url: Основной URL
         delete: Удалить
+        edit: Редактировать поставщика
+        finish_registration: Завершить регистрацию
+        name: Имя
+        providers: Поставщики
+        registration_requested: Требуется регистрация
         registrations:
           confirm: Подтвердить
           reject: Отклонить
         save: Сохранить
+        select_capabilities: Выберите возможности
         sign_in:
         status: Пост
       title: FASP
@@ -585,6 +600,9 @@ ru:
         all: Все
         limited: Ограниченные
         title: Модерация
+      moderation_notes:
+        create: Добавить заметку модератора
+        title: Заметки модератора
       private_comment: Приватный комментарий
       public_comment: Публичный комментарий
       purge: Удалить данные
@@ -799,11 +817,16 @@ ru:
       title: Роли
     rules:
       add_new: Добавить правило
+      add_translation: Добавить перевод
       delete: Удалить
       description_html: Хотя большинство утверждает, что прочитали и согласны с условиями обслуживания, обычно люди не читают их до тех пор, пока не возникнет проблема. <strong>Упростите просмотр правил вашего сервера с первого взгляда, предоставив их в виде простого маркированного списка.</strong> Старайтесь, чтобы отдельные правила были краткими и простыми, но старайтесь не разбивать их на множество отдельных элементов.
       edit: Редактировать правило
       empty: Правила сервера еще не определены.
+      move_down: Переместить вниз
+      move_up: Переместить вверх
       title: Правила сервера
+      translation: Перевод
+      translations: Переводы
     settings:
       about:
         manage_rules: Управление правилами на сервере
@@ -829,6 +852,7 @@ ru:
       discovery:
         follow_recommendations: Рекомендации подписок
         preamble: Наблюдение интересного контента играет важную роль при открытии новых пользователей, которые могут не знать ни одного Mastodon. Контролируйте как работают различные функции обнаружения на вашем сервере.
+        privacy: Конфиденциальность
         profile_directory: Каталог профилей
         public_timelines: Публичные ленты
         publish_statistics: Опубликовать стаитстику
@@ -1087,6 +1111,23 @@ ru:
           other: За последнюю неделю использовал %{count} человек
       title: Рекомендации и тренды
       trending: Популярное
+    username_blocks:
+      add_new: Добавить новое
+      block_registrations: Блокировать регистрации
+      comparison:
+        contains: Содержит
+        equals: Равен
+      contains_html: Содержит %{string}
+      created_msg: Успешно создано правило имени пользователя
+      delete: Удалить
+      edit:
+        title: Редактировать правило имени пользователя
+      matches_exactly_html: Равен %{string}
+      new:
+        create: Создать правило
+        title: Создать новое правило имени пользователя
+      not_permitted: Не разрешено
+      title: Правила имени пользователя
     warning_presets:
       add_new: Добавить
       delete: Удалить
@@ -1206,15 +1247,15 @@ ru:
     delete_account: Удалить учётную запись
     delete_account_html: Вы можете <a href="%{path}">удалить свою учётную запись</a>. Перед удалением у вас будет запрошено подтверждение.
     description:
-      prefix_invited_by_user: Вы получили приглашение на сервер Mastodon от @%{name}!
+      prefix_invited_by_user: Вы получили приглашение на сервер Mastodon от @%{name}.
       prefix_sign_up: Зарегистрируйтесь в Mastodon прямо сейчас!
       suffix: С учётной записью вы сможете подписываться на людей, публиковать посты и обмениваться сообщениями с пользователями любого сервера Mastodon — и не только!
     didnt_get_confirmation: Не получили письмо со ссылкой для подтверждения?
-    dont_have_your_security_key: У вас нет ключа безопасности?
+    dont_have_your_security_key: Нет электронного ключа?
     forgot_password: Забыли пароль?
     invalid_reset_password_token: Токен сброса пароля недействителен либо устарел. Пожалуйста, повторите запрос на восстановление пароля.
-    link_to_otp: Введите двухфакторный код с телефона или код восстановления
-    link_to_webauth: Используйте устройство с ключом безопасности
+    link_to_otp: Введите одноразовый код из приложения на смартфоне или один из ваших резервных кодов
+    link_to_webauth: Использовать электронный ключ
     log_in_with: Войдите с помощью
     login: Войти
     logout: Выйти
@@ -1236,89 +1277,89 @@ ru:
     rules:
       accept: Принять
       back: Назад
-      invited_by: 'Вы можете присоединиться к %{domain} благодаря приглашению полученному от:'
-      preamble: Они устанавливаются и применяются модераторами %{domain}.
+      invited_by: Вы можете зарегистрироваться на сервере %{domain}, потому что вы получили приглашение от
+      preamble: Модераторы сервера %{domain} установили эти правила и следят за их исполнением.
       preamble_invited: Прежде чем продолжить, ознакомьтесь с основными правилами, установленными модераторами сервера %{domain}.
       title: Несколько основных правил.
-      title_invited: Вы были приглашены.
+      title_invited: Вы получили приглашение.
     security: Безопасность
-    set_new_password: Задать новый пароль
+    set_new_password: Сменить пароль
     setup:
-      email_below_hint_html: Проверьте папку "Спам" или запросите другую. Вы можете исправить свой адрес электронной почты, если он неправильный.
-      email_settings_hint_html: Чтобы начать пользоваться Mastodon, пройдите по ссылке, которую мы отправили на %{email}. А мы пока подождём тут.
-      link_not_received: Не получили ссылку?
-      new_confirmation_instructions_sent: Через несколько минут вы получите новое письмо со ссылкой для подтверждения!
-      title: Проверьте свой почтовый ящик
+      email_below_hint_html: Проверьте папку «Спам» или нажмите на кнопку ниже, чтобы выслать письмо повторно. Вы можете исправить свой адрес электронной почты, если вы ввели его неверно.
+      email_settings_hint_html: Чтобы начать пользоваться Mastodon, перейдите по ссылке, которую мы отправили на адрес %{email}.
+      link_not_received: Не приходит письмо?
+      new_confirmation_instructions_sent: В течение нескольких минут вы получите новое письмо со ссылкой для подтверждения!
+      title: Проверьте свою почту
     sign_in:
-      preamble_html: Войдите, используя ваши учётные данные <strong>%{domain}</strong>. Если ваша учётная запись размещена на другом сервере, вы не сможете здесь войти.
-      title: Войти в %{domain}
+      preamble_html: Введите здесь данные своей учётной записи на сервере <strong>%{domain}</strong>, чтобы войти. Вы не сможете войти, если ваша учётная запись размещена на другом сервере.
+      title: Авторизация на %{domain}
     sign_up:
-      manual_review: Регистрация на %{domain} проходит через ручную проверку нашими модераторами. Чтобы помочь нам обработать вашу регистрацию, напишите немного о себе и о том, почему вы хотите получить аккаунт на %{domain}.
-      preamble: С учётной записью на этом сервере Mastodon вы сможете подписываться на всех других людей в федиверсе вне зависимости от того, где находятся их учётные записи.
-      title: Зарегистрируйтесь в %{domain}.
+      manual_review: На сервере %{domain} все заявки на регистрацию проверяются модераторами вручную. Чтобы помочь нам принять решение в отношении вашей заявки, напишите немного о себе и о том, почему вы хотите создать учётную запись на сервере %{domain}.
+      preamble: С учётной записью на этом сервере Mastodon вы сможете подписываться на всех других людей в федивёрсе вне зависимости от того, где размещены их учётные записи.
+      title: Создайте учётную запись на сервере %{domain}.
     status:
-      account_status: Статус учётной записи
-      confirming: Жду подтверждения по электронной почте.
+      account_status: Состояние учётной записи
+      confirming: Ожидание подтверждения e-mail.
       functional: Ваша учётная запись в полном порядке.
-      pending: Ваша заявка находится на рассмотрении у наших сотрудников. Это может занять некоторое время. Вы получите электронное письмо, если ваша заявка будет одобрена.
+      pending: Ваша заявка ожидает одобрения администраторами, это может занять немного времени. Вы получите письмо, как только заявку одобрят.
       redirecting_to: Ваша учётная запись деактивированна, потому что вы настроили перенаправление на %{acct}.
       self_destruct: Поскольку %{domain} закрывается, вы получите ограниченный доступ к вашей учетной записи.
-      view_strikes: Просмотр предыдущих замечаний в адрес вашей учетной записи
+      view_strikes: Просмотр предупреждений, которые модераторы выносили вам ранее
     too_fast: Форма отправлена слишком быстро, попробуйте еще раз.
-    use_security_key: Использовать ключ безопасности
-    user_agreement_html: Мной прочитаны и приняты<a href="%{terms_of_service_path}" target="_blank">пользовательское соглашение</a> и <a href="%{privacy_policy_path}" target="_blank">политика конфиденциальности</a>
+    use_security_key: Использовать электронный ключ
+    user_agreement_html: Мной прочитаны и приняты <a href="%{terms_of_service_path}" target="_blank">пользовательское соглашение</a> и <a href="%{privacy_policy_path}" target="_blank">политика конфиденциальности</a>
     user_privacy_agreement_html: Мной прочитана и принята <a href="%{privacy_policy_path}" target="_blank">политика конфиденциальности</a>
   author_attribution:
-    example_title: Образец текста
-    hint_html: Публикуете ли вы свои статьи где-либо ещё кроме Mastodon? Если да, то ваше авторство может быть упомянуто, когда ими делятся в Mastodon.
-    instructions: 'Добавьте код ниже в HTML ваших статей:'
-    more_from_html: Больше от %{name}
-    s_blog: "%{name}'S Блог"
-    then_instructions: Затем добавьте доменное имя сайта, где вы публикуетесь, в поле ниже.
-    title: Авторская атрибуция
+    example_title: Пример текста
+    hint_html: Вы пишете статьи для новостных сайтов или ведёте блог где-либо ещё помимо Mastodon? Ваше авторство может быть упомянуто всякий раз, когда вашими статьями делятся в Mastodon.
+    instructions: 'Добавьте следующий код в HTML-разметку ваших статей:'
+    more_from_html: 'Автор: %{name}'
+    s_blog: "%{name} ведёт блог"
+    then_instructions: Затем впишите доменное имя сайта, на котором вы публикуетесь, в поле ниже.
+    title: Упоминание авторства
   challenge:
     confirm: Продолжить
-    hint_html: "<strong>Подсказка</strong>: мы не будем спрашивать пароль повторно в течение часа."
+    hint_html: "<strong>Подсказка:</strong> В течение часа вам не придётся снова вводить свой пароль."
     invalid_password: Неверный пароль
-    prompt: Введите пароль для продолжения
+    prompt: Введите пароль, чтобы продолжить
   crypto:
     errors:
-      invalid_key: не является допустимым Ed25519 или Curve25519 ключом
+      invalid_key: должен быть действительным Ed25519- или Curve25519-ключом
   date:
     formats:
       default: "%d %b %Y"
       with_month_name: "%d %B %Y"
   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: Введите свой пароль, чтобы подтвердить, что вы — это вы, и никто другой
+    challenge_not_passed: Данные введены неверно
+    confirm_password: Введите свой пароль, чтобы подтвердить, что это ваша учётная запись
     confirm_username: Введите своё имя пользователя для подтверждения
     proceed: Удалить учётную запись
-    success_msg: Ваша учётная запись была успешно удалена
+    success_msg: Ваша учётная запись удалена
     warning:
-      before: 'Внимательно прочитайте следующую информацию перед началом:'
-      caches: Некоторые данные, обработанные другими узлами, однако, могут храниться ещё какое-то время
-      data_removal: Все ваши золотые посты, шикарный профиль и прочие данные будут безвозвратно уничтожены
+      before: 'Внимательно ознакомьтесь со следующими замечаниями перед тем как продолжить:'
+      caches: На других серверах могут остаться сохранённые в кэше данные
+      data_removal: Все ваши посты и другие ваши данные будут безвозвратно уничтожены
       email_change_html: Вы можете <a href="%{path}">изменить свой адрес электронной почты</a>, не удаляя свою учетную запись
       email_contact_html: Если оно все еще не пришло, вы можете обратиться за помощью по электронной почте <a href="mailto:%{email}">%{email}</a>
       email_reconfirmation_html: Если вы не получили подтверждение по электронной почте, вы можете <a href="%{path}">запросить его снова</a>
-      irreversible: После удаления восстановить или повторно активировать учётную запись не получится
-      more_details_html: За всеми подробностями, изучите <a href="%{terms_path}">политику конфиденциальности</a>.
+      irreversible: После удаления вы больше не сможете ни восстановить, ни повторно активировать свою учётную запись
+      more_details_html: За более подробной информацией вы можете обратиться к <a href="%{terms_path}">политике конфиденциальности</a>.
       username_available: Ваше имя пользователя снова станет доступным
-      username_unavailable: Ваше имя пользователя останется недоступным для использования
+      username_unavailable: Зарегистрироваться с вашим именем пользователя будет невозможно
   disputes:
     strikes:
       action_taken: Предпринятые меры
@@ -1350,65 +1391,69 @@ ru:
       your_appeal_pending: Вы подали апелляцию
       your_appeal_rejected: Ваша апелляция отклонена
   edit_profile:
-    basic_information: Основная информация
-    hint_html: "<strong>Настройте то, что люди видят в вашем публичном профиле и рядом с вашими сообщениями.</strong> Другие люди с большей вероятностью подпишутся на Вас и будут взаимодействовать с вами, если у Вас заполнен профиль и добавлено изображение."
-    other: Прочее
+    basic_information: Основные данные
+    hint_html: "<strong>Здесь вы можете изменить всё то, что будет отображаться в вашем публичном профиле и рядом с вашими постами.</strong> На вас будут чаще подписываться и с вами будут чаще взаимодействовать, если у вас будет заполнен профиль и добавлено фото профиля."
+    other: Разное
+  emoji_styles:
+    auto: Автоматически
+    native: Как в системе
+    twemoji: Twemoji
   errors:
-    '400': Ваш запрос был недействительным или неправильным.
-    '403': У Вас нет доступа к просмотру этой страницы.
-    '404': Страница, которую Вы искали, не существует.
+    '400': Ваш запрос повреждён или содержит ошибки.
+    '403': У вас нет доступа для просмотра этой страницы.
+    '404': Запрошенной вами страницы не существует.
     '406': Эта страница недоступна в запрошенном формате.
-    '410': Страница, которую Вы искали, больше не существует.
+    '410': Запрошенной вами страницы больше не существует.
     '422':
-      content: Проверка безопасности не удалась. Возможно, Вы блокируете cookies?
+      content: Проверка безопасности не удалась. Может быть, вы блокируете файлы cookie?
       title: Проверка безопасности не удалась
     '429': Слишком много запросов
     '500':
-      content: Приносим извинения, но на нашей стороне что-то пошло не так.
-      title: Страница неверна
-    '503': Страница не может быть отображена из-за временного сбоя на сервере.
-    noscript_html: Для работы с Mastodon, пожалуйста, включите JavaScript. Кроме того, вы можете использовать одно из <a href="%{apps_path}">приложений</a> Mastodon для Вашей платформы.
+      content: К сожалению, на нашей стороне что-то пошло не так.
+      title: Ошибка при загрузке страницы
+    '503': Страница не может быть загружена из-за временного сбоя на сервере.
+    noscript_html: Включите JavaScript, чтобы использовать веб-интерфейс Mastodon. Также вы можете установить любое из <a href="%{apps_path}">приложений</a> Mastodon для вашей системы.
   existing_username_validator:
     not_found: не удалось найти локального пользователя с таким именем
     not_found_multiple: не удалось найти %{usernames}
   exports:
     archive_takeout:
       date: Дата
-      download: Скачать ваш архив
-      hint_html: Вы можете запросить архив своих <strong>постов и загруженных медиа-файлов</strong>. Экспортированные данные будут в формате ActivityPub, который можно прочесть любой соответствующей программой. Запрашивать архив можно каждые 7 дней.
-      in_progress: Мы собираем этот архив...
-      request: Запросить ваш архив
+      download: Скачать архив
+      hint_html: Вы можете запросить архив своих <strong>постов и загруженных медиа</strong>. Данные будут экспортированы в формате ActivityPub, доступном для чтения и обработки любыми совместимыми программами и сервисами. Запрашивать архив можно каждые 7 дней.
+      in_progress: Собираем ваш архив...
+      request: Запросить архив
       size: Размер
-    blocks: Список блокировки
+    blocks: Заблокированные пользователи
     bookmarks: Закладки
     csv: CSV
-    domain_blocks: Доменные блокировки
+    domain_blocks: Заблокированные домены
     lists: Списки
-    mutes: Ваши игнорируемые
-    storage: Ваши файлы
+    mutes: Игнорируемые пользователи
+    storage: Хранилище медиа
   featured_tags:
     add_new: Добавить
     errors:
-      limit: Вы уже добавили максимальное число хэштегов
-    hint_html: "<strong>Избранные хэштеги</strong> отображаются в вашем профиле и позволяют людям быстро найти посты, отмеченные ими. Это отличный инструмент для отслеживания долгосрочных проектов и творческих работ."
+      limit: Вы достигли максимального количества хештегов, которые можно рекомендовать в профиле
+    hint_html: "<strong>Рекомендуйте самые важные для вас хештеги в своём профиле.</strong> Это отличный инструмент для того, чтобы держать подписчиков в курсе ваших долгосрочных проектов и творческих работ. Рекомендации хештегов заметны в вашем профиле и предоставляют быстрый доступ к вашим постам."
   filters:
     contexts:
-      account: Посты в профилях
-      home: Домашняя лента
+      account: Профили
+      home: Домашняя лента и списки
       notifications: Уведомления
       public: Публичные ленты
-      thread: Диалоги
+      thread: Беседы
     edit:
       add_keyword: Добавить ключевое слово
       keywords: Ключевые слова
       statuses: Отдельные посты
-      statuses_hint_html: Этот фильтр применяется для выбора отдельных постов, независимо от того, соответствуют ли они ключевым словам ниже. <a href="%{path}">Просмотрите или удалите посты из фильтра</a>.
-      title: Изменить фильтр
+      statuses_hint_html: Этот фильтр применяется к отдельным постам, которые могут и не соответствовать указанным ниже ключевым словам. Вы можете <a href="%{path}">просмотреть отфильтрованные посты и удалить их из фильтра</a>.
+      title: Редактировать фильтр
     errors:
-      deprecated_api_multiple_keywords: Эти параметры нельзя изменить из этого приложения, так как применяются к более чем одному ключевому слову фильтра. Используйте более последнее приложение или веб-интерфейс.
-      invalid_context: Некорректный контекст или ничего
+      deprecated_api_multiple_keywords: С помощью этого приложения невозможно изменить те параметры фильтра, которые относятся к нескольким ключевым словам. Воспользуйтесь другим, более современным приложением или веб-интерфейсом.
+      invalid_context: отсутствует или имеет недопустимое значение
     index:
-      contexts: Фильтры по %{contexts}
+      contexts: 'Область действия: %{contexts}'
       delete: Удалить
       empty: У вас пока нет фильтров.
       expires_in: Истекает через %{distance}
@@ -1422,25 +1467,25 @@ ru:
         few: "%{count} поста"
         many: "%{count} постов"
         one: "%{count} пост"
-        other: 'Постов: %{count}'
+        other: "%{count} постов"
       statuses_long:
         few: Скрыто %{count} отдельных поста
         many: Скрыто %{count} отдельных постов
         one: Скрыт %{count} отдельный пост
-        other: 'Скрыто отдельных постов: %{count}'
+        other: Скрыто %{count} отдельных постов
       title: Фильтры
     new:
-      save: Сохранить новый фильтр
+      save: Сохранить фильтр
       title: Добавить фильтр
     statuses:
       back_to_filter: Вернуться к фильтру
       batch:
         remove: Удалить из фильтра
       index:
-        hint: Этот фильтр применяется для выбора отдельных постов, независимо от других критериев. Вы можете добавить больше записей в этот фильтр из веб-интерфейса.
+        hint: Этот фильтр применяется к отдельным постам без учёта прочих условий. Чтобы добавить пост к этому фильтру, воспользуйтесь веб-интерфейсом.
         title: Отфильтрованные посты
   generic:
-    all: Любой
+    all: Все
     all_items_on_page_selected_html:
       few: "<strong>%{count}</strong> элемента выбрано на странице."
       many: "<strong>%{count}</strong> элементов выбрано на странице."
@@ -1452,12 +1497,12 @@ ru:
       one: Выбран <strong>%{count}</strong> элемент, соответствующий вашему запросу.
       other: Выбраны все <strong>%{count}</strong> элементов, соответствующих вашему запросу.
     cancel: Отмена
-    changes_saved_msg: Изменения успешно сохранены!
+    changes_saved_msg: Изменения сохранены
     confirm: Подтвердить
     copy: Копировать
     delete: Удалить
     deselect: Снять выделение
-    none: Ничего
+    none: Нет
     order_by: Сортировка
     save_changes: Сохранить изменения
     select_all_matching_items:
@@ -1467,62 +1512,62 @@ ru:
       other: Выберите все %{count} предмет(-ов), совпадающий(-их) вашему поисковому запросу.
     today: сегодня
     validation_errors:
-      few: Что-то здесь не так! Пожалуйста, прочитайте о %{count} ошибках ниже
-      many: Что-то здесь не так! Пожалуйста, прочитайте о %{count} ошибках ниже
-      one: Что-то здесь не так! Пожалуйста, прочитайте об ошибке ниже
-      other: Что-то здесь не так! Пожалуйста, прочитайте о %{count} ошибках ниже
+      few: Проверьте введённые вами данные! Далее по странице вы можете увидеть %{count} сообщения об ошибке
+      many: Проверьте введённые вами данные! Далее по странице вы можете увидеть %{count} сообщений об ошибке
+      one: Проверьте введённые вами данные! Далее по странице вы можете увидеть %{count} сообщение об ошибке
+      other: Проверьте введённые вами данные! Далее по странице вы можете увидеть %{count} сообщений об ошибке
   imports:
     errors:
-      empty: Пустой CSV-файл
-      incompatible_type: Несовместимость с выбранным типом импорта
-      invalid_csv_file: 'Неверный файл CSV. Ошибка: %{error}'
+      empty: Файл CSV пуст
+      incompatible_type: Несовместим с выбранным типом данных для импорта
+      invalid_csv_file: 'Ошибка при чтении файла CSV: %{error}'
       over_rows_processing_limit: содержит более %{count} строк
       too_large: Файл слишком большой
     failures: Ошибки
-    imported: Импортирован
-    mismatched_types_warning: Возможно, вы выбрали неверный тип для этого импорта, пожалуйста, перепроверьте.
+    imported: Импортировано
+    mismatched_types_warning: По-видимому, вы выбрали неверный тип данных для импорта. Проверьте всё внимательно!
     modes:
       merge: Объединить
-      merge_long: Сохранить имеющиеся данные и добавить новые.
-      overwrite: Перезаписать
-      overwrite_long: Перезаписать имеющиеся данные новыми.
+      merge_long: Добавить новые данные к уже имеющимся
+      overwrite: Заменить
+      overwrite_long: Заменить имеющиеся данные новыми
     overwrite_preambles:
       blocking_html:
-        few: Вы собираетесь <strong>заменить свой список блокировки</strong>, в котором сейчас <strong>%{count} аккаунта</strong>, из файла <strong>%{filename}</strong>.
-        many: Вы собираетесь <strong>заменить свой список блокировки</strong>, в котором сейчас <strong>%{count} аккаунов</strong>, из файла <strong>%{filename}</strong>.
-        one: Вы собираетесь <strong>заменить свой список блокировки</strong>, в котором сейчас <strong>%{count} аккаунт</strong>, из файла <strong>%{filename}</strong>.
-        other: Вы собираетесь <strong>заменить свой список блокировки</strong>, в котором сейчас <strong>%{count} аккаунтов</strong>, из файла <strong>%{filename}</strong>.
+        few: Вы собираетесь <strong>заменить свой список заблокированных пользователей</strong> данными из файла <strong>%{filename}</strong>, после чего вы будете блокировать <strong>%{count} пользователей</strong>.
+        many: Вы собираетесь <strong>заменить свой список заблокированных пользователей</strong> данными из файла <strong>%{filename}</strong>, после чего вы будете блокировать <strong>%{count} пользователей</strong>.
+        one: Вы собираетесь <strong>заменить свой список заблокированных пользователей</strong> данными из файла <strong>%{filename}</strong>, после чего вы будете блокировать <strong>%{count} пользователя</strong>.
+        other: Вы собираетесь <strong>заменить свой список заблокированных пользователей</strong> данными из файла <strong>%{filename}</strong>, после чего вы будете блокировать <strong>%{count} пользователей</strong>.
       bookmarks_html:
-        few: Вы собираетесь <strong>заменить свои закладки</strong>, в которых сейчас <strong>%{count} поста</strong>, из файла <strong>%{filename}</strong>.
-        many: Вы собираетесь <strong>заменить свои закладки</strong>, в которых сейчас <strong>%{count} постов</strong>, из файла <strong>%{filename}</strong>.
-        one: Вы собираетесь <strong>заменить свои закладки</strong>, в которых сейчас <strong>%{count} пост</strong>, из файла <strong>%{filename}</strong>.
-        other: Вы собираетесь <strong>заменить свои закладки</strong>, в которых сейчас <strong>%{count} постов</strong>, из файла <strong>%{filename}</strong>.
+        few: Вы собираетесь <strong>заменить свои закладки</strong> данными из файла <strong>%{filename}</strong>, после чего у вас в закладках будет <strong>%{count} поста</strong>.
+        many: Вы собираетесь <strong>заменить свои закладки</strong> данными из файла <strong>%{filename}</strong>, после чего у вас в закладках будет <strong>%{count} постов</strong>.
+        one: Вы собираетесь <strong>заменить свои закладки</strong> данными из файла <strong>%{filename}</strong>, после чего у вас в закладках будет <strong>%{count} пост</strong>.
+        other: Вы собираетесь <strong>заменить свои закладки</strong> данными из файла <strong>%{filename}</strong>, после чего у вас в закладках будет <strong>%{count} постов</strong>.
       domain_blocking_html:
-        few: Вы собираетесь <strong>заменить свой список доменных блокировок</strong>, в котором сейчас <strong>%{count} домена</strong>, из файла <strong>%{filename}</strong>.
-        many: Вы собираетесь <strong>заменить свой список доменных блокировок</strong>, в котором сейчас <strong>%{count} доменов</strong>, из файла <strong>%{filename}</strong>.
-        one: Вы собираетесь <strong>заменить свой список доменных блокировок</strong>, в котором сейчас <strong>%{count} домен</strong>, из файла <strong>%{filename}</strong>.
-        other: Вы собираетесь <strong>заменить свой список доменных блокировок</strong>, в котором сейчас <strong>%{count} доменов</strong>, из файла <strong>%{filename}</strong>.
+        few: Вы собираетесь <strong>заменить свой список заблокированных доменов</strong> данными из файла <strong>%{filename}</strong>, после чего вы будете блокировать <strong>%{count} домена</strong>.
+        many: Вы собираетесь <strong>заменить свой список заблокированных доменов</strong> данными из файла <strong>%{filename}</strong>, после чего вы будете блокировать <strong>%{count} доменов</strong>.
+        one: Вы собираетесь <strong>заменить свой список заблокированных доменов</strong> данными из файла <strong>%{filename}</strong>, после чего вы будете блокировать <strong>%{count} домен</strong>.
+        other: Вы собираетесь <strong>заменить свой список заблокированных доменов</strong> данными из файла <strong>%{filename}</strong>, после чего вы будете блокировать <strong>%{count} доменов</strong>.
       following_html:
-        few: Вы собираетесь <strong>подписаться</strong> на <strong>%{count} аккаунта</strong> из файла <strong>%{filename}</strong> и <strong>отписаться от всех прочих</strong>.
-        many: Вы собираетесь <strong>подписаться</strong> на <strong>%{count} аккаунтов</strong> из файла <strong>%{filename}</strong> и <strong>отписаться от всех прочих</strong>.
-        one: Вы собираетесь <strong>подписаться</strong> на <strong>%{count} аккаунт</strong> из файла <strong>%{filename}</strong> и <strong>отписаться от всех прочих</strong>.
-        other: Вы собираетесь <strong>подписаться</strong> на <strong>%{count} аккаунтов</strong> из файла <strong>%{filename}</strong> и <strong>отписаться от всех прочих</strong>.
+        few: Вы собираетесь <strong>подписаться</strong> на <strong>%{count} пользователей</strong> из файла <strong>%{filename}</strong> и <strong>отписаться от всех прочих</strong>.
+        many: Вы собираетесь <strong>подписаться</strong> на <strong>%{count} пользователей</strong> из файла <strong>%{filename}</strong> и <strong>отписаться от всех прочих</strong>.
+        one: Вы собираетесь <strong>подписаться</strong> на <strong>%{count} пользователя</strong> из файла <strong>%{filename}</strong> и <strong>отписаться от всех прочих</strong>.
+        other: Вы собираетесь <strong>подписаться</strong> на <strong>%{count} пользователей</strong> из файла <strong>%{filename}</strong> и <strong>отписаться от всех прочих</strong>.
       lists_html:
-        few: Вы собираетесь <strong>заменить свои списки</strong> содержимым файла <strong>%{filename}</strong>. В новые списки будут добавлены <strong>%{count} аккаунта</strong>.
-        many: Вы собираетесь <strong>заменить свои списки</strong> содержимым файла <strong>%{filename}</strong>. В новые списки будут добавлены <strong>%{count} аккаунтов</strong>.
-        one: Вы собираетесь <strong>заменить свои списки</strong> содержимым файла <strong>%{filename}</strong>. В новые списки будет добавлен <strong>%{count} аккаунт</strong>.
-        other: Вы собираетесь <strong>заменить свои списки</strong> содержимым файла <strong>%{filename}</strong>. В новые списки будут добавлены <strong>%{count} аккаунтов</strong>.
+        few: Вы собираетесь <strong>заменить свои списки</strong> содержимым файла <strong>%{filename}</strong>. В новые списки будут добавлены <strong>%{count} пользователя</strong>.
+        many: Вы собираетесь <strong>заменить свои списки</strong> содержимым файла <strong>%{filename}</strong>. В новые списки будут добавлены <strong>%{count} пользователей</strong>.
+        one: Вы собираетесь <strong>заменить свои списки</strong> содержимым файла <strong>%{filename}</strong>. В новые списки будет добавлен <strong>%{count} пользователь</strong>.
+        other: Вы собираетесь <strong>заменить свои списки</strong> содержимым файла <strong>%{filename}</strong>. В новые списки будут добавлены <strong>%{count} пользователей</strong>.
       muting_html:
-        few: Вы собираетесь <strong>заменить свой список игнорируемых пользователей</strong> списком из <strong>%{count} аккаунтов</strong> из файла <strong>%{filename}</strong>.
-        many: Вы собираетесь <strong>заменить свой список игнорируемых пользователей</strong> списком из <strong>%{count} аккаунтов</strong> из файла <strong>%{filename}</strong>.
-        one: Вы собираетесь <strong>заменить свой список игнорируемых пользователей</strong> списком из <strong>%{count} аккаунта</strong> из файла <strong>%{filename}</strong>.
-        other: Вы собираетесь <strong>заменить свой список игнорируемых пользователей</strong> списком из <strong>%{count} аккаунтов</strong> из файла <strong>%{filename}</strong>.
+        few: Вы собираетесь <strong>заменить свой список игнорируемых пользователей</strong> данными из файла <strong>%{filename}</strong>, после чего вы будете игнорировать <strong>%{count} пользователей</strong>.
+        many: Вы собираетесь <strong>заменить свой список игнорируемых пользователей</strong> данными из файла <strong>%{filename}</strong>, после чего вы будете игнорировать <strong>%{count} пользователей</strong>.
+        one: Вы собираетесь <strong>заменить свой список игнорируемых пользователей</strong> данными из файла <strong>%{filename}</strong>, после чего вы будете игнорировать <strong>%{count} пользователя</strong>.
+        other: Вы собираетесь <strong>заменить свой список игнорируемых пользователей</strong> данными из файла <strong>%{filename}</strong>, после чего вы будете игнорировать <strong>%{count} пользователей</strong>.
     preambles:
       blocking_html:
-        few: Вы собираетесь <strong>заблокировать</strong> <strong>%{count} аккаунта</strong> из файла <strong>%{filename}</strong>.
-        many: Вы собираетесь <strong>заблокировать</strong> <strong>%{count} аккаунтов</strong> из файла <strong>%{filename}</strong>.
-        one: Вы собираетесь <strong>заблокировать</strong> <strong>%{count} аккаунт</strong> из файла <strong>%{filename}</strong>.
-        other: Вы собираетесь <strong>заблокировать</strong> <strong>%{count} аккаунтов</strong> из файла <strong>%{filename}</strong>.
+        few: Вы собираетесь <strong>заблокировать</strong> <strong>%{count} пользователей</strong> из файла <strong>%{filename}</strong>.
+        many: Вы собираетесь <strong>заблокировать</strong> <strong>%{count} пользователей</strong> из файла <strong>%{filename}</strong>.
+        one: Вы собираетесь <strong>заблокировать</strong> <strong>%{count} пользователя</strong> из файла <strong>%{filename}</strong>.
+        other: Вы собираетесь <strong>заблокировать</strong> <strong>%{count} пользователей</strong> из файла <strong>%{filename}</strong>.
       bookmarks_html:
         few: Вы собираетесь добавить <strong>%{count} поста</strong> из файла <strong>%{filename}</strong> в свои <strong>закладки</strong>.
         many: Вы собираетесь добавить <strong>%{count} постов</strong> из файла <strong>%{filename}</strong> в свои <strong>закладки</strong>.
@@ -1534,52 +1579,52 @@ ru:
         one: Вы собираетесь <strong>заблокировать</strong> <strong>%{count} домен</strong> из файла <strong>%{filename}</strong>.
         other: Вы собираетесь <strong>заблокировать</strong> <strong>%{count} доменов</strong> из файла <strong>%{filename}</strong>.
       following_html:
-        few: Вы собираетесь <strong>подписаться</strong> на <strong>%{count} аккаунта</strong> из файла <strong>%{filename}</strong>.
-        many: Вы собираетесь <strong>подписаться</strong> на <strong>%{count} аккаунтов</strong> из файла <strong>%{filename}</strong>.
-        one: Вы собираетесь <strong>подписаться</strong> на <strong>%{count} аккаунт</strong> из файла <strong>%{filename}</strong>.
-        other: Вы собираетесь <strong>подписаться</strong> на <strong>%{count} аккаунтов</strong> из файла <strong>%{filename}</strong>.
+        few: Вы собираетесь <strong>подписаться</strong> на <strong>%{count} пользователей</strong> из файла <strong>%{filename}</strong>.
+        many: Вы собираетесь <strong>подписаться</strong> на <strong>%{count} пользователей</strong> из файла <strong>%{filename}</strong>.
+        one: Вы собираетесь <strong>подписаться</strong> на <strong>%{count} пользователя</strong> из файла <strong>%{filename}</strong>.
+        other: Вы собираетесь <strong>подписаться</strong> на <strong>%{count} пользователей</strong> из файла <strong>%{filename}</strong>.
       lists_html:
-        few: Вы собираетесь добавить <strong>%{count} аккаунта</strong> из файла <strong>%{filename}</strong> в свои <strong>списки</strong>. Если соответствующих списков нет, они будут созданы.
-        many: Вы собираетесь добавить <strong>%{count} аккаунтов</strong> из файла <strong>%{filename}</strong> в свои <strong>списки</strong>. Если соответствующих списков нет, они будут созданы.
-        one: Вы собираетесь добавить <strong>%{count} аккаунт</strong> из файла <strong>%{filename}</strong> в свои <strong>списки</strong>. Если соответствующих списков нет, они будут созданы.
-        other: Вы собираетесь добавить <strong>%{count} аккаунтов</strong> из файла <strong>%{filename}</strong> в свои <strong>списки</strong>. Если соответствующих списков нет, они будут созданы.
+        few: Вы собираетесь добавить <strong>%{count} пользователей</strong> из файла <strong>%{filename}</strong> в свои <strong>списки</strong>. Если соответствующих списков нет, они будут созданы.
+        many: Вы собираетесь добавить <strong>%{count} пользователей</strong> из файла <strong>%{filename}</strong> в свои <strong>списки</strong>. Если соответствующих списков нет, они будут созданы.
+        one: Вы собираетесь добавить <strong>%{count} пользователя</strong> из файла <strong>%{filename}</strong> в свои <strong>списки</strong>. Если соответствующих списков нет, они будут созданы.
+        other: Вы собираетесь добавить <strong>%{count} пользователей</strong> из файла <strong>%{filename}</strong> в свои <strong>списки</strong>. Если соответствующих списков нет, они будут созданы.
       muting_html:
-        few: Вы собираетесь <strong>начать игнорировать</strong> <strong>%{count} аккаунта</strong> из файла <strong>%{filename}</strong>.
-        many: Вы собираетесь <strong>начать игнорировать</strong> <strong>%{count} аккаунтов</strong> из файла <strong>%{filename}</strong>.
-        one: Вы собираетесь <strong>начать игнорировать</strong> <strong>%{count} аккаунт</strong> из файла <strong>%{filename}</strong>.
-        other: Вы собираетесь <strong>начать игнорировать</strong> <strong>%{count} аккаунтов</strong> из файла <strong>%{filename}</strong>.
-    preface: Вы можете загрузить некоторые данные, например, списки людей, на которых Вы подписаны или которых блокируете, в Вашу учётную запись на этом узле из файлов, экспортированных с другого узла.
-    recent_imports: Недавно импортированное
+        few: Вы собираетесь <strong>игнорировать</strong> <strong>%{count} пользователей</strong> из файла <strong>%{filename}</strong>.
+        many: Вы собираетесь <strong>игнорировать</strong> <strong>%{count} пользователей</strong> из файла <strong>%{filename}</strong>.
+        one: Вы собираетесь <strong>игнорировать</strong> <strong>%{count} пользователя</strong> из файла <strong>%{filename}</strong>.
+        other: Вы собираетесь <strong>игнорировать</strong> <strong>%{count} пользователей</strong> из файла <strong>%{filename}</strong>.
+    preface: Вы можете перенести прежде экспортированные с другого сервера данные, такие как блокируемые вами пользователи и ваши подписки.
+    recent_imports: История импорта
     states:
-      finished: Готово
-      in_progress: В процессе
-      scheduled: Запланировано
-      unconfirmed: Неподтвержденный
-    status: Статус
-    success: Ваши данные были успешно загружены и будут обработаны с должной скоростью
-    time_started: Началось в
+      finished: Завершён
+      in_progress: Выполняется
+      scheduled: Запланирован
+      unconfirmed: Не подтверждён
+    status: Состояние
+    success: Ваши данные были загружены и в скором времени будут обработаны
+    time_started: Начат
     titles:
-      blocking: Импорт заблокированных аккаунтов
+      blocking: Импорт списка заблокированных пользователей
       bookmarks: Импорт закладок
-      domain_blocking: Импорт заблокированных доменов
-      following: Импорт последующих аккаунтов
-      lists: Импортировать список
-      muting: Импорт отключенных аккаунтов
+      domain_blocking: Импорт списка заблокированных доменов
+      following: Импорт подписок
+      lists: Импорт списков
+      muting: Импорт списка игнорируемых пользователей
     type: Тип импорта
     type_groups:
       constructive: Подписки и закладки
-      destructive: Блокировки и игнорируемые
+      destructive: Чёрный список
     types:
-      blocking: Список блокировки
+      blocking: Заблокированные пользователи
       bookmarks: Закладки
-      domain_blocking: Список доменных блокировок
+      domain_blocking: Заблокированные домены
       following: Подписки
       lists: Списки
-      muting: Список глушения
+      muting: Игнорируемые пользователи
     upload: Загрузить
   invites:
     delete: Удалить
-    expired: Истекло
+    expired: Срок действия истёк
     expires_in:
       '1800': 30 минут
       '21600': 6 часов
@@ -1588,121 +1633,131 @@ ru:
       '604800': 1 неделя
       '86400': 1 день
     expires_in_prompt: Бессрочно
-    generate: Сгенерировать
+    generate: Создать ссылку
     invalid: Это приглашение недействительно
-    invited_by: 'Вас пригласил(а):'
+    invited_by: 'Вы были приглашены этим пользователем:'
     max_uses:
       few: "%{count} раза"
       many: "%{count} раз"
       one: "%{count} раз"
-      other: "%{count} раза"
+      other: "%{count} раз"
     max_uses_prompt: Без ограничения
-    prompt: Создавайте и делитесь ссылками с другими, чтобы предоставить им доступом к этому узлу.
+    prompt: Создавайте приглашения и делитесь ими с другими людьми, чтобы они могли зарегистрироваться на этом сервере
     table:
       expires_at: Истекает
-      uses: Исп.
-    title: Пригласить людей
+      uses: Регистрации
+    title: Приглашения
   lists:
     errors:
-      limit: Вы достигли максимального количества пользователей
+      limit: Вы достигли максимального количества списков
   login_activities:
     authentication_methods:
-      otp: приложение двухфакторной аутентификации
-      password: пароль
-      sign_in_token: код безопасности электронной почты
-      webauthn: ключи безопасности
-    description_html: Если вы видите неопознанное действие, смените пароль и/или включите двухфакторную авторизацию.
-    empty: Нет доступной истории входов
-    failed_sign_in_html: Неудачная попытка входа используя %{method} через %{browser} (%{ip})
-    successful_sign_in_html: Успешный вход используя %{method} через %{browser} (%{ip})
+      otp: приложения для генерации кодов
+      password: пароля
+      webauthn: электронного ключа
+    description_html: Если вы заметили действия, которых не совершали, вам следует сменить пароль и включить двухфакторную аутентификацию.
+    empty: История входов отсутствует
+    failed_sign_in_html: Неудачная попытка входа при помощи %{method} с IP-адреса %{ip} (%{browser})
+    successful_sign_in_html: Вход при помощи %{method} с IP-адреса %{ip} (%{browser})
     title: История входов
   mail_subscriptions:
     unsubscribe:
-      action: Да, отписаться
+      action: Да, я хочу отписаться
       complete: Подписка отменена
-      confirmation_html: Вы точно желаете отписаться от всех уведомления типа «%{type}», доставляемых из сервера Mastodon %{domain} на ваш адрес электронной почты %{email}? Вы всегда сможете подписаться снова в <a href="%{settings_path}">настройках e-mail уведомлений</a>.
-      resubscribe_html: Если вы отписались от рассылки по ошибке, вы можете повторно подписаться на рассылку в настройках <a href="%{settings_path}">настроек почтовых уведомлений</a>.
-      success_html: Вы больше не будете получать %{type} для Mastodon на %{domain} на вашу электронную почту %{email}.
+      confirmation_html: Вы уверены в том, что хотите отписаться от всех %{type}, которые вы получаете на адрес %{email} для учётной записи на сервере Mastodon %{domain}? Вы всегда сможете подписаться снова в <a href="%{settings_path}">настройках уведомлений по электронной почте</a>.
+      emails:
+        notification_emails:
+          favourite: уведомлений о добавлении ваших постов в избранное
+          follow: уведомлений о новых подписчиках
+          follow_request: уведомлений о новых запросах на подписку
+          mention: уведомлений о новых упоминаниях
+          reblog: уведомлений о продвижении ваших постов
+      resubscribe_html: Если вы отписались по ошибке и хотите подписаться снова, перейдите на страницу <a href="%{settings_path}">настройки уведомлений по электронной почте</a>.
+      success_html: Вы отказались от %{type}, которые вы получали на адрес %{email} для вашей учётной записи на сервере Mastodon %{domain}.
       title: Отписаться
   media_attachments:
     validations:
       images_and_video: Нельзя добавить видео к посту с изображениями
-      not_found: Медиа %{ids} не найдено или уже прикреплено к другому сообщению
-      not_ready: Не удаётся прикрепить файлы, обработка которых не завершена. Повторите попытку чуть позже!
-      too_many: Нельзя добавить более 4 файлов
+      not_found: Медиа %{ids} не найдены или уже прикреплены к другому посту
+      not_ready: Обработка некоторых прикреплённых файлов ещё не окончена. Подождите немного и попробуйте снова!
+      too_many: Можно прикрепить не более 4 файлов
   migrations:
-    acct: имя@домен новой учётной записи
+    acct: Куда
     cancel: Отменить переезд
-    cancel_explanation: Отмена перенаправления повторно активирует текущую учётную запись, но не вернёт обратно подписчиков, которые были перемещены на другую.
-    cancelled_msg: Переезд был успешно отменён.
+    cancel_explanation: После отмены перенаправления ваша текущая учётная запись снова станет активна, но ранее перенесённые подписчики не будут возвращены.
+    cancelled_msg: Переезд отменён.
     errors:
-      already_moved: это та же учётная запись, на которую вы мигрировали
-      missing_also_known_as: не ссылается на эту учетную запись
+      already_moved: не может быть той учётной записью, куда уже настроен переезд
+      missing_also_known_as: должна быть связанной учётной записью
       move_to_self: не может быть текущей учётной записью
-      not_found: не удалось найти
+      not_found: не найдена
       on_cooldown: Вы пока не можете переезжать
     followers_count: Подписчиков на момент переезда
     incoming_migrations: Переезд со старой учётной записи
-    incoming_migrations_html: Переезжаете с другой учётной записи? <a href="%{path}">Настройте псевдоним</a> для переноса подписчиков.
+    incoming_migrations_html: Вы можете <a href="%{path}">добавить связанную учётную запись</a>, если собираетесь перенести оттуда подписчиков.
     moved_msg: Теперь ваша учётная запись перенаправляет к %{acct}, туда же перемещаются подписчики.
-    not_redirecting: Для вашей учётной записи пока не настроено перенаправление.
+    not_redirecting: Прямо сейчас ваша учётная запись никуда не перенаправлена.
     on_cooldown: Вы уже недавно переносили свою учётную запись. Эта возможность будет снова доступна через %{count} дн.
-    past_migrations: Прошлые переезды
+    past_migrations: История переездов
     proceed_with_move: Перенести подписчиков
     redirected_msg: Ваша учётная запись теперь перенаправляется на %{acct}.
     redirecting_to: Ваша учётная запись перенаправляет к %{acct}.
     set_redirect: Настроить перенаправление
     warning:
-      backreference_required: Новая учётная запись должна быть сначала настроена так, чтоб ссылаться на текущую
-      before: 'Прежде чем продолжить, внимательно прочитайте следующую информацию:'
-      cooldown: После переезда наступает период, в течение которого вы не сможете ещё раз переехать
-      disabled_account: Вашу текущую учётная запись впоследствии нельзя будет больше использовать. При этом, у вас будет доступ к экспорту данных, а также к повторной активации учётной записи.
-      followers: Это действие перенесёт всех ваших подписчиков с текущей учётной записи на новую
-      only_redirect_html: Или же вы можете <a href="%{path}">просто настроить перенаправление в ваш профиль</a>.
+      backreference_required: Текущая учётная запись сначала должна быть добавлена как связанная в настройках новой учётной записи
+      before: 'Внимательно ознакомьтесь со следующими замечаниями перед тем как продолжить:'
+      cooldown: После переезда наступит период ожидания, в течение которого переезд будет невозможен
+      disabled_account: Переезд приведёт к тому, что вашу текущую учётную запись нельзя будет полноценно использовать. Тем не менее у вас останется доступ к экспорту данных и повторной активации учётной записи.
+      followers: В результате переезда все ваши подписчики будут перенесены с текущей учётной записи на новую
+      only_redirect_html: Также вы можете <a href="%{path}">настроить перенаправление без переноса подписчиков</a>.
       other_data: Никакие другие данные не будут автоматически перенесены
-      redirect: Профиль этой учётной записи будет обновлён с заметкой о перенаправлении, а также исключён из поиска
+      redirect: Профиль текущей учётной записи будет исключён из поиска, а в нём появится объявление о переезде
   moderation:
     title: Модерация
   move_handler:
     carry_blocks_over_text: Этот пользователь переехал с учётной записи %{acct}, которую вы заблокировали.
-    carry_mutes_over_text: Этот пользователь перешёл с учётной записи %{acct}, которую вы игнорируете.
+    carry_mutes_over_text: Этот пользователь переехал с учётной записи %{acct}, которую вы игнорируете.
     copy_account_note_text: 'Этот пользователь переехал с %{acct}, вот ваша предыдущая заметка о нём:'
   navigation:
     toggle_menu: Переключить меню
   notification_mailer:
     admin:
       report:
-        subject: "%{name} отправил жалобу"
+        subject: Поступила жалоба от %{name}
       sign_up:
-        subject: "%{name} зарегистрирован"
+        subject: "%{name} зарегистрировался (-лась) на сервере"
     favourite:
       body: "%{name} добавил(а) ваш пост в избранное:"
       subject: "%{name} добавил(а) ваш пост в избранное"
-      title: Понравившийся статус
+      title: Ваш пост добавили в избранное
     follow:
-      body: "%{name} теперь подписан(а) на вас!"
+      body: "%{name} теперь подписан(а) на вас"
       subject: "%{name} теперь подписан(а) на вас"
       title: Новый подписчик
     follow_request:
-      action: Управление запросами на подписку
+      action: Перейти к запросам на подписку
       body: "%{name} отправил(а) вам запрос на подписку"
       subject: "%{name} хочет подписаться на вас"
       title: Новый запрос на подписку
     mention:
       action: Ответить
-      body: 'Вас упомянул(а) %{name} в:'
+      body: "%{name} упомянул(а) вас:"
       subject: "%{name} упомянул(а) вас"
       title: Новое упоминание
     poll:
       subject: Опрос %{name} завершился
+    quote:
+      body: 'Ваш пост был процитирован %{name}:'
+      subject: "%{name} процитировал(а) ваш пост"
+      title: Новая цитата
     reblog:
-      body: 'Ваш пост был продвинут %{name}:'
+      body: "%{name} продвинул(а) ваш пост:"
       subject: "%{name} продвинул(а) ваш пост"
-      title: Новое продвижение
+      title: Ваш пост продвинули
     status:
-      subject: "%{name} только что запостил(а)"
+      subject: "%{name} опубликовал(а) новый пост"
     update:
-      subject: "%{name} изменил(а) пост"
+      subject: "%{name} отредактировал(а) пост"
   notifications:
     email_events: События для уведомлений по электронной почте
     email_events_hint: 'Выберите события, для которых вы хотели бы получать уведомления:'
@@ -1714,91 +1769,92 @@ ru:
           billion: млрд
           million: млн
           quadrillion: квадрлн
-          thousand: тыс
+          thousand: тыс.
           trillion: трлн
+          unit: ''
   otp_authentication:
-    code_hint: Для подтверждения введите код, сгенерированный приложением-аутентификатором
-    description_html: Подключив <strong>двуфакторную авторизацию</strong>, для входа в свою учётную запись вам будет необходим смартфон и приложение-аутентификатор на нём, которое будет генерировать специальные временные коды. Без этих кодов войти в учётную запись не получиться, даже если все данные верны, что существенно увеличивает безопасность вашей учётной записи.
+    code_hint: Для подтверждения введите код из приложения-аутентификатора
+    description_html: Подключите <strong>двухфакторную аутентификацию</strong> с использованием специального приложения-аутентификатора, и тогда для входа в вашу учётную запись необходимо будет иметь при себе смартфон, который будет генерировать одноразовые коды.
     enable: Включить
-    instructions_html: "<strong>Отсканируйте этот QR-код с помощью приложения-аутентификатора</strong>, такого как Google Authenticator, Яндекс.Ключ или andOTP. После сканирования и добавления, приложение начнёт генерировать коды, которые потребуется вводить для завершения входа в учётную запись."
-    manual_instructions: 'Если отсканировать QR-код не получается или не представляется возможным, вы можете ввести ключ настройки вручную:'
-    setup: Настроить
-    wrong_code: Введенный код недействителен! Время сервера и время устройства правильно?
+    instructions_html: "<strong>Откройте Google Authenticator или другое приложение-аутентификатор на вашем смартфоне и отсканируйте этот QR-код</strong>. В дальнейшем это приложение будет генерировать одноразовые коды, которые потребуется вводить для подтверждения входа в вашу учётную запись."
+    manual_instructions: 'Если отсканировать QR-код не получается, введите секретный ключ вручную:'
+    setup: Подключить
+    wrong_code: Одноразовый код, который вы ввели, не подходит! Совпадает ли время на устройстве с временем на сервере?
   pagination:
-    newer: Новее
-    next: След
-    older: Старше
-    prev: Пред
+    newer: Позже
+    next: Вперёд
+    older: Раньше
+    prev: Назад
     truncate: "&hellip;"
   polls:
     errors:
-      already_voted: Вы уже голосовали в этом опросе
+      already_voted: Вы уже проголосовали в этом опросе
       duplicate_options: не должны повторяться
       duration_too_long: слишком велика
       duration_too_short: слишком мала
-      expired: Опрос уже завершился
-      invalid_choice: Выбранного варианта голосования не существует
+      expired: Этот опрос уже завершился
+      invalid_choice: Выбранного вами варианта ответа не существует
       over_character_limit: не должны превышать %{max} символов
       self_vote: Вы не можете голосовать в своих опросах
       too_few_options: должны содержать не меньше двух опций
       too_many_options: должны ограничиваться максимум %{max} опциями
   preferences:
-    other: Остальное
-    posting_defaults: Настройки отправки по умолчанию
+    other: Разное
+    posting_defaults: Предустановки для новых постов
     public_timelines: Публичные ленты
   privacy:
-    hint_html: "<strong>Настройте, как вы хотите, чтобы ваш профиль и ваши сообщения были найдены.</strong> Различные функции в Mastodon могут помочь вам охватить более широкую аудиторию, если они включены. Уделите время изучению этих настроек, чтобы убедиться, что они подходят для вашего случая использования."
-    privacy: Конфиденциальность
-    privacy_hint_html: Определите, какую информацию вы хотите раскрыть в интересах других. Люди находят интересные профили и приложения, просматривая список подписчиков других людей и узнавая, из каких приложений они публикуют свои сообщения, но вы можете предпочесть скрыть это.
-    reach: Охват
-    reach_hint_html: Укажите, хотите ли вы, чтобы новые люди обнаруживали вас и могли следить за вами. Хотите ли вы, чтобы ваши сообщения появлялись на экране Обзора? Хотите ли вы, чтобы другие люди видели вас в своих рекомендациях? Хотите ли вы автоматически принимать всех новых подписчиков или иметь возможность детально контролировать каждого из них?
+    hint_html: "<strong>Здесь вы можете определить то, как другие смогут обнаружить ваши посты и ваш профиль.</strong> Множество разных функций в Mastodon существуют для того, чтобы помочь вам выйти на более широкую аудиторию, если вы того захотите. Ознакомьтесь с этими настройками и в случае необходимости измените их согласно вашим желаниям."
+    privacy: Приватность
+    privacy_hint_html: Решите, сколько данных о себе вы готовы раскрыть ради того, чтобы они пошли на пользу другим. Просматривая ваши подписки, кто-то может обнаружить профили интересных людей, а ещё кто-нибудь может найти своё любимое приложение, увидев его название рядом с вашими постами. Тем не менее вы можете предпочесть не раскрывать эту информацию.
+    reach: Видимость
+    reach_hint_html: Решите, нужна ли вам новая аудитория и новые подписчики. Настройте по своему желанию, показывать ли ваши посты в разделе «Актуальное», рекомендовать ли ваш профиль другим людям, принимать ли всех новых подписчиков автоматически или рассматривать каждый запрос на подписку в отдельности.
     search: Поиск
-    search_hint_html: Определите, как вас могут найти. Хотите ли вы, чтобы люди находили вас по тому, о чём вы публично писали? Хотите ли вы, чтобы люди за пределами Mastodon находили ваш профиль при поиске в Интернете? Следует помнить, что полное исключение из всех поисковых систем не может быть гарантировано для публичной информации.
-    title: Приватность и доступ
+    search_hint_html: Решите, нужно ли вам скрыть себя из поиска. Настройте по своему желанию то, можно ли будет найти вас по публичным постам, а также то, можно ли будет кому угодно в интернете найти ваш профиль с помощью поисковых сайтов. Имейте в виду, что невозможно гарантировать полное исключение общедоступной информации из всех поисковых систем.
+    title: Приватность и видимость
   privacy_policy:
     title: Политика конфиденциальности
   reactions:
     errors:
-      limit_reached: Достигнут лимит разных реакций
-      unrecognized_emoji: не является распознанным эмодзи
+      limit_reached: К этому объявлению уже добавлено максимальное количество уникальных реакций
+      unrecognized_emoji: не соответствует ни одному известному названию эмодзи
   redirects:
-    prompt: Если вы доверяете этой ссылке, нажмите на нее, чтобы продолжить.
+    prompt: Переходите по ссылке только в том случае, если доверяете сайту, на который она ведёт.
     title: Вы покидаете %{instance}.
   relationships:
-    activity: Активность учётной записи
-    confirm_follow_selected_followers: Вы уверены, что хотите подписаться на выбранных подписчиков?
-    confirm_remove_selected_followers: Вы уверены, что хотите удалить выбранных подписчиков?
-    confirm_remove_selected_follows: Вы уверены, что хотите удалить выбранные подписки?
-    dormant: Заброшенная
+    activity: Фильтр по активности
+    confirm_follow_selected_followers: Вы уверены, что хотите взаимно подписаться на выбранных пользователей?
+    confirm_remove_selected_followers: Вы уверены, что хотите убрать выбранных пользователей из подписчиков?
+    confirm_remove_selected_follows: Вы уверены, что хотите отписаться от выбранных пользователей?
+    dormant: Неактивные
     follow_failure: Не удалось подписаться за некоторыми из выбранных аккаунтов.
-    follow_selected_followers: Подписаться на выбранных подписчиков
+    follow_selected_followers: Подписаться в ответ
     followers: Подписчики
     following: Подписки
     invited: Приглашённые
-    last_active: По последней активности
-    most_recent: По недавности
-    moved: Мигрировавшая
+    last_active: Сначала активные
+    most_recent: Сначала новые
+    moved: Перенаправленные
     mutual: Взаимные подписки
-    primary: Основная
-    relationship: Связь
-    remove_selected_domains: Удалить всех подписчиков для выбранных доменов
-    remove_selected_followers: Удалить выбранных подписчиков
+    primary: Действующие
+    relationship: Вид отношений
+    remove_selected_domains: Убрать всех подписчиков с того же сервера
+    remove_selected_followers: Убрать из подписчиков
     remove_selected_follows: Отписаться от выбранных пользователей
-    status: Статус учётной записи
+    status: Фильтр по состоянию учётной записи
   remote_follow:
     missing_resource: Поиск требуемого перенаправления URL для Вашей учётной записи завершился неудачей
   reports:
     errors:
-      invalid_rules: не ссылается на действительные правила
+      invalid_rules: должны соответствовать правилам сервера
   rss:
     content_warning: 'Предупреждение о содержании:'
     descriptions:
       account: Публичные посты @%{acct}
-      tag: 'Публичные посты отмеченные хэштегом #%{hashtag}'
+      tag: 'Публичные посты с хештегом #%{hashtag}'
   scheduled_statuses:
-    over_daily_limit: Вы превысили лимит в %{limit} запланированных постов на указанный день
-    over_total_limit: Вы превысили лимит на %{limit} запланированных постов
-    too_soon: дата публикации должна быть в будущем
+    over_daily_limit: За сутки можно создать не более %{limit} отложенных постов
+    over_total_limit: Всего можно создать не более %{limit} отложенных постов
+    too_soon: задано слишком рано
   self_destruct:
     lead_html: К сожалению, <strong>%{domain}</strong> закрывается навсегда. Если вас учётная запись находиться здесь вы не сможете продолжить использовать его, но вы можете запросить резервную копию ваших данных.
     title: Этот сервер закрывается
@@ -1807,13 +1863,13 @@ ru:
     browser: Браузер
     browsers:
       alipay: Alipay
-      blackberry: Blackberry
+      blackberry: BlackBerry
       chrome: Chrome
       edge: Microsoft Edge
       electron: Electron
       firefox: Firefox
       generic: Неизвестный браузер
-      huawei_browser: Huawei Browser
+      huawei_browser: Браузер Huawei
       ie: Internet Explorer
       micro_messenger: MicroMessenger
       nokia: Nokia S40 Ovi Browser
@@ -1825,10 +1881,10 @@ ru:
       uc_browser: UC Browser
       unknown_browser: Неизвестный браузер
       weibo: Weibo
-    current_session: Текущая сессия
+    current_session: Текущий сеанс
     date: Дата
-    description: "%{browser} на %{platform}"
-    explanation: Здесь отображаются все браузеры, с которых выполнен вход в вашу учётную запись. Авторизованные приложения находятся в секции «Приложения».
+    description: "%{platform}, %{browser}"
+    explanation: Здесь перечислены все устройства, на которых вы используете свою учётную запись Mastodon. Также вы можете
     ip: IP
     platforms:
       adobe_air: Adobe Air
@@ -1837,60 +1893,60 @@ ru:
       chrome_os: ChromeOS
       firefox_os: Firefox OS
       ios: iOS
-      kai_os: OS Кай
+      kai_os: KaiOS
       linux: Linux
-      mac: Mac
+      mac: macOS
       unknown_platform: Неизвестная платформа
       windows: Windows
       windows_mobile: Windows Mobile
       windows_phone: Windows Phone
     revoke: Завершить
-    revoke_success: Сессия завершена
-    title: Сессии
-    view_authentication_history: Посмотреть историю входов с учётной записью
+    revoke_success: Сеанс завершён
+    title: Сеансы
+    view_authentication_history: просмотреть историю входов в вашу учётную запись
   settings:
     account: Учётная запись
-    account_settings: Управление учётной записью
-    aliases: Псевдонимы учётной записи
+    account_settings: Настройки учётной записи
+    aliases: Связанные учётные записи
     appearance: Внешний вид
     authorized_apps: Приложения
     back: Назад в Mastodon
     delete: Удаление учётной записи
     development: Разработчикам
-    edit_profile: Изменить профиль
+    edit_profile: " Данные профиля"
     export: Экспорт
-    featured_tags: Избранные хэштеги
+    featured_tags: Рекомендации хештегов
     import: Импорт
     import_and_export: Импорт и экспорт
-    migrate: Миграция учётной записи
-    notifications: E-mail уведомление
+    migrate: Настройка перенаправления
+    notifications: Уведомления по эл. почте
     preferences: Настройки
     profile: Профиль
     relationships: Подписки и подписчики
     severed_relationships: Разорванные отношения
-    statuses_cleanup: Авто-удаление постов
+    statuses_cleanup: Автоудаление постов
     strikes: Замечания модерации
     two_factor_authentication: Подтверждение входа
-    webauthn_authentication: Ключи безопасности
+    webauthn_authentication: Электронные ключи
   severed_relationships:
     download: Скачать (%{count})
     event_type:
-      account_suspension: Приостановка аккаунта (%{target_name})
-      domain_block: Приостановка сервера (%{target_name})
+      account_suspension: Пользователь был заблокирован модераторами (%{target_name})
+      domain_block: Сервер %{target_name} был заблокирован модераторами
       user_domain_block: Вы заблокировали %{target_name}
     lost_followers: Потерянные подписчики
     lost_follows: Потерянные подписки
-    preamble: Вы можете потерять подписчиков и последователей, если заблокируете домен или, если ваши модераторы решат приостановить работу удаленного сервера. Когда это произойдет, вы сможете загрузить списки разорванных отношений, чтобы проверить их и, возможно, импортировать на другой сервер.
+    preamble: Когда вы блокируете сервер или это делают модераторы вашего сервера, вы теряете подписчиков и перестаёте быть подписаны на пользователей с заблокированного сервера. После блокировки вы сможете скачать списки пользователей, отношения с которыми были разорваны, чтобы рассмотреть их или чтобы импортировать их на другом сервере.
     purged: Информация об этом сервере была удалена администраторами вашего сервера.
     type: Событие
   statuses:
     attached:
       audio:
-        few: "%{count} аудиозаписи"
-        many: "%{count} аудиозаписей"
-        one: "%{count} аудиозапись"
-        other: "%{count} аудиозаписи"
-      description: 'Вложение: %{attached}'
+        few: "%{count} аудиофайла"
+        many: "%{count} аудиофайлов"
+        one: "%{count} аудиофайл"
+        other: "%{count} аудиофайлов"
+      description: Прикреплено %{attached}
       image:
         few: "%{count} изображения"
         many: "%{count} изображений"
@@ -1902,52 +1958,47 @@ ru:
         one: "%{count} видео"
         other: "%{count} видео"
     boosted_from_html: Продвижение польз. %{acct_link}
-    content_warning: 'Спойлер: %{warning}'
+    content_warning: 'Предупреждение о содержании: %{warning}'
     default_language: Тот же, что язык интерфейса
     disallowed_hashtags:
       few: 'содержались запрещённые хэштеги: %{tags}'
       many: 'содержались запрещённые хэштеги: %{tags}'
       one: 'содержался запрещённый хэштег: %{tags}'
       other: 'содержались запрещённые хэштеги: %{tags}'
-    edited_at_html: Редактировано %{date}
+    edited_at_html: 'Последнее изменение: %{date}'
     errors:
-      in_reply_not_found: Пост, на который вы пытаетесь ответить, не существует или удалён.
-    over_character_limit: превышен лимит символов (%{max})
+      in_reply_not_found: Пост, на который вы собирались ответить, был удалён или не существует.
+      quoted_status_not_found: Пост, который вы собирались процитировать, был удалён или не существует.
+    over_character_limit: превышает максимально допустимую длину (%{max} символов)
     pin_errors:
-      direct: Сообщения, видимые только упомянутым пользователям, не могут быть закреплены
-      limit: Вы закрепили максимально возможное число постов
+      direct: Нельзя закрепить пост, который доступен только тем, кто был упомянут в нём
+      limit: Вы достигли максимального количества постов, которые можно закрепить в профиле
       ownership: Нельзя закрепить чужой пост
-      reblog: Нельзя закрепить продвинутый пост
-    title: '%{name}: "%{quote}"'
+      reblog: Нельзя закрепить продвижение
+    title: "%{name}: «%{quote}»"
     visibilities:
-      direct: Адресованный
-      private: Для подписчиков
-      private_long: Показывать только подписчикам
-      public: Для всех
-      public_long: Показывать всем
-      unlisted: Скрывать из лент
-      unlisted_long: Показывать всем, но не отображать в публичных лентах
+      public: Публичный
   statuses_cleanup:
-    enabled: Автоматически удалять устаревшие посты
-    enabled_hint: Автоматически удаляет ваши посты после того, как они достигли определённого возрастного порога, за некоторыми исключениями ниже.
+    enabled: Автоматически удалять старые посты
+    enabled_hint: По истечении определённого срока с момента публикации ваши посты, кроме соответствующих отмеченным ниже исключениям, будут автоматически удалены
     exceptions: Исключения
-    explanation: Из-за того, что удаление постов — это ресурсоёмкий процесс, оно производится медленно со временем, когда сервер менее всего загружен. По этой причине, посты могут удаляться не сразу, а спустя определённое время, по достижению возрастного порога.
-    ignore_favs: Игнорировать избранное
-    ignore_reblogs: Игнорировать продвижения
+    explanation: Удаление постов — это ресурсоёмкий процесс, поэтому оно производится постепенно, с течением времени, когда сервер менее всего загружен. По этой причине посты могут удаляться не сразу по прошествии установленного срока, а спустя некоторое время.
+    ignore_favs: Не учитывать добавление в избранное
+    ignore_reblogs: Не учитывать продвижения
     interaction_exceptions: Исключения на основе взаимодействий
-    interaction_exceptions_explanation: 'Обратите внимание: нет никаких гарантий, что посты будут удалены, после того, как они единожды перешли порог по отметкам «избранного» или продвижений.'
-    keep_direct: Не удалять адресованные посты
-    keep_direct_hint: Не удалять ваши посты с «адресованной» видимостью.
+    interaction_exceptions_explanation: 'Обратите внимание: даже если количество взаимодействий опустится ниже установленного значения после того, как оно однажды превысило его, то всё равно может случиться так, что пост не будет удалён.'
+    keep_direct: Не удалять личные сообщения
+    keep_direct_hint: Те ваши посты, которые видны только упомянутым в них людям, не будут удалены
     keep_media: Не удалять посты с вложениями
-    keep_media_hint: Не удалять ваши посты, содержащие любые медийные вложения.
+    keep_media_hint: Те ваши посты, которые содержат медиавложения, не будут удалены
     keep_pinned: Не удалять закреплённые посты
-    keep_pinned_hint: Не удалять ваши посты, которые закреплены в профиле.
+    keep_pinned_hint: Те ваши посты, которые вы закрепили в своём профиле, не будут удалены
     keep_polls: Не удалять опросы
-    keep_polls_hint: Не удалять ваши посты с опросами.
-    keep_self_bookmark: Не удалять закладки
-    keep_self_bookmark_hint: Не удалять ваши посты с закладками.
-    keep_self_fav: Оставить посты, отмеченные «избранными»
-    keep_self_fav_hint: Не удалять ваши посты, если вы отметили их как «избранные».
+    keep_polls_hint: Те ваши посты, которые содержат опросы, не будут удалены
+    keep_self_bookmark: Не удалять посты, добавленные в закладки
+    keep_self_bookmark_hint: Те ваши посты, которые вы добавили в закладки, не будут удалены
+    keep_self_fav: Не удалять посты, добавленные в избранное
+    keep_self_fav_hint: Те ваши посты, которые вы добавили в избранное, не будут удалены
     min_age:
       '1209600': 2 недели
       '15778476': 6 месяцев
@@ -1957,11 +2008,11 @@ ru:
       '604800': 1 неделя
       '63113904': 2 года
       '7889238': 3 месяца
-    min_age_label: Возрастной порог
-    min_favs: Порог отметок «избранного»
-    min_favs_hint: Не удалять ваши посты, у которых количество отметок «избранного» достигло указанного выше значения. Оставьте поле пустым, чтобы удалять посты независимо от количества отметок
-    min_reblogs: Порог продвижений
-    min_reblogs_hint: Не удаляет ваши посты, количество продвижений которых достигло указанного выше значения. Оставьте поле пустым, чтобы удалять посты независимо от количества продвижений.
+    min_age_label: Интервал между публикацией и удалением поста
+    min_favs: Количество звёздочек, при котором пост не будет удалён
+    min_favs_hint: Те ваши посты, которые были добавлены в избранное столько раз, сколько вы укажете выше, не будут удалены. Оставьте поле пустым, чтобы удалять посты без учёта количества звёздочек
+    min_reblogs: Количество продвижений, при котором пост не будет удалён
+    min_reblogs_hint: Те ваши посты, которые были продвинуты столько раз, сколько вы укажете выше, не будут удалены. Оставьте поле пустым, чтобы удалять посты без учёта количества продвижений
   stream_entries:
     sensitive_content: Содержимое деликатного характера
   strikes:
@@ -1971,36 +2022,40 @@ ru:
     does_not_match_previous_name: не совпадает с предыдущим именем
   terms_of_service:
     title: Пользовательское соглашение
+  terms_of_service_interstitial:
+    past_preamble_html: Мы изменили наше пользовательское соглашение с момента вашего последнего посещения. Мы рекомендуем вам ознакомиться с обновленным соглашением.
+    review_link: Посмотреть пользовательское соглашение
+    title: Изменяется пользовательское соглашение %{domain}
   themes:
     contrast: Mastodon (высококонтрастная)
     default: Mastodon (тёмная)
     mastodon-light: Mastodon (светлая)
-    system: Автоматически (используйте системную тему)
+    system: Автоматически (как в системе)
   time:
     formats:
       default: "%d %b %Y, %H:%M"
       month: "%m.%Y"
       time: "%H:%M"
-      with_time_zone: "%b %d, %Y, %H:%M %Z"
+      with_time_zone: "%d %b %Y, %H:%M %Z"
   translation:
     errors:
       quota_exceeded: Превышена квота использования службы перевода в масштабах всего сервера.
       too_many_requests: В последнее время в службу переводов поступает слишком много запросов.
   two_factor_authentication:
     add: Добавить
-    disable: Отключить
-    disabled_success: Двухфакторная аутентификация успешно отключена
+    disable: Отключить 2FA
+    disabled_success: Двухфакторная аутентификация отключена
     edit: Изменить
-    enabled: Двухфакторная аутентификация настроена
-    enabled_success: Двухфакторная авторизация успешно настроена
-    generate_recovery_codes: Сгенерировать коды восстановления
-    lost_recovery_codes: Коды восстановления позволяются войти в учётную запись в случае утери смартфона. Если вы потеряли свои коды восстановления, вы можете создать новые здесь. Прошлые коды работать перестанут.
-    methods: Методы двухфакторной аутентификации
-    otp: Приложение для проверки подлинности
-    recovery_codes: Коды восстановления
-    recovery_codes_regenerated: Коды восстановления успешно сгенерированы
-    recovery_instructions_html: 'Пожалуйста, сохраните коды ниже в надёжном месте: они понадобятся, чтобы войти в учётную запись, если вы потеряете доступ к своему смартфону. Вы можете вручную переписать их, распечатать и спрятать среди важных документов или, например, в любимой книжке. <strong>Каждый код действителен только один раз</strong>.'
-    webauthn: Ключи безопасности
+    enabled: Двухфакторная аутентификация включена
+    enabled_success: Двухфакторная аутентификация настроена
+    generate_recovery_codes: Сгенерировать резервные коды
+    lost_recovery_codes: Резервные коды позволят вам восстановить доступ к своей учётной записи в случае потери смартфона. Если вы потеряли свои резервные коды, просто создайте новые. Ваши старые коды будут аннулированы.
+    methods: Способы подтверждения входа
+    otp: Приложение-аутентификатор
+    recovery_codes: Резервные коды
+    recovery_codes_regenerated: Новые резервные коды сгенерированы
+    recovery_instructions_html: Если случится так, что у вас не будет доступа к смартфону, резервные коды позволят вам восстановить доступ к своей учётной записи. <strong>Храните резервные коды в надёжном месте.</strong> К примеру, вы можете распечатать их и убрать туда, где лежат другие важные документы.
+    webauthn: Электронные ключи
   user_mailer:
     announcement_published:
       description: 'Администраторы %{domain} опубликовали новое объявление:'
@@ -2018,16 +2073,16 @@ ru:
       subtitle: Ваша апелляция отклонена.
       title: Обжалование отклонено
     backup_ready:
-      explanation: Вы запросили полное резервное копирование вашей учетной записи Mastodon.
-      extra: Теперь он готов к загрузке!
+      explanation: Вы запросили экспорт данных своей учётной записи Mastodon.
+      extra: Теперь ваш архив готов и доступен для скачивания!
       subject: Ваш архив готов к загрузке
-      title: Архив ваших данных готов
+      title: Экспорт данных
     failed_2fa:
-      details: 'Вот подробности попытки регистрации:'
-      explanation: Кто-то пытался войти в вашу учетную запись, но указал неверный второй фактор аутентификации.
-      further_actions_html: Если это не вы, мы рекомендуем %{action} немедленно принять меры, так как он может быть скомпрометирован.
-      subject: Сбой двухфакторной аутентификации
-      title: Сбой двухфакторной аутентификации
+      details: 'Вот подробности попытки входа:'
+      explanation: Кто-то пытался войти в вашу учётную запись, но не смог подтвердить вход при помощи второго фактора.
+      further_actions_html: Если это были не вы, рекомендуем немедленно %{action}, так как он мог быть скомпрометирован.
+      subject: Неудачная попытка подтверждения входа
+      title: Неудачная попытка подтверждения входа
     suspicious_sign_in:
       change_password: сменить пароль
       details: 'Подробности о новом входе:'
@@ -2081,72 +2136,59 @@ ru:
       apps_step: Загрузите наши официальные приложения.
       apps_title: Приложения Mastodon
       checklist_subtitle: 'Давайте начнем знакомство с этим новым социальным рубежом:'
-      checklist_title: Приветственный контрольный список
       edit_profile_action: Персонализация
-      edit_profile_step: Усильте взаимодействие, заполнив полный профиль.
       edit_profile_title: Персонализируйте свой профиль
       explanation: Вот несколько советов для новичков
       feature_action: Подробнее
-      feature_audience: Mastodon предоставляет вам уникальную возможность управлять своей аудиторией без посредников. Mastodon, развернутый на вашей собственной инфраструктуре, позволяет вам следить и быть преследуемым с любого другого сервера Mastodon в Интернете и не контролируется никем, кроме вас.
-      feature_audience_title: Создайте уверенную аудиторию
       feature_control: Вы сами знаете, что хотите видеть в своей ленте. Никаких алгоритмов или рекламы, чтобы тратить ваше время. Следите за любым человеком на любом сервере Mastodon с одного аккаунта и получайте его сообщения в хронологическом порядке, а также сделайте свой уголок интернета немного больше похожим на себя.
-      feature_control_title: Контролируйте свой график
       feature_creativity: Mastodon поддерживает аудио-, видео- и фотопосты, описания доступности, опросы, предупреждения о содержании, анимированные аватары, пользовательские emojis, управление обрезкой миниатюр и многое другое, чтобы помочь вам выразить себя в Интернете. Публикуете ли вы свои работы, музыку или подкаст, Mastodon всегда готов помочь вам.
       feature_creativity_title: Непревзойденная креативность
       feature_moderation: Mastodon возвращает принятие решений в ваши руки. Каждый сервер создает свои собственные правила и нормы, которые соблюдаются локально, а не сверху вниз, как в корпоративных социальных сетях, что позволяет наиболее гибко реагировать на потребности различных групп людей. Присоединяйтесь к серверу с правилами, с которыми вы согласны, или создайте свой собственный.
       feature_moderation_title: Модерирование, каким оно должно быть
-      follow_action: Следуйте за
-      follow_step: Следить за интересными людьми - вот что такое Mastodon.
       follow_title: Персонализируйте свою домашнюю ленту
-      follows_subtitle: Следите за известными аккаунтами
-      follows_title: За кем следить
-      follows_view_more: Посмотреть больше людей, за которыми стоит следить
       hashtags_recent_count:
         few: "%{people} человека за последние 2 дня"
         many: "%{people} человек за последние 2 дня"
         one: "%{people} человек за последние 2 дня"
         other: "%{people} человек за последние 2 дня"
       hashtags_subtitle: Изучите, что было в тренде за последние 2 дня
-      hashtags_title: Модные хэштеги
       hashtags_view_more: Посмотреть другие трендовые хэштеги
       post_action: Составить
       post_step: Поприветствуйте мир с помощью текста, фотографий, видео или опросов.
       post_title: Сделайте свой первый пост
       share_step: Пусть ваши друзья знают, как найти вас на Mastodon.
-      share_title: Поделитесь информацией о компании Mastodon
-      sign_in_action: Зарегистрироваться
       subject: Добро пожаловать в Mastodon
       title: Добро пожаловать на борт, %{name}!
   users:
-    follow_limit_reached: Вы не можете подписаться больше, чем на %{limit} человек
+    follow_limit_reached: Вы можете подписаться не больше чем на %{limit} человек
     go_to_sso_account_settings: Перейти к настройкам сторонних аккаунтов учетной записи
-    invalid_otp_token: Введен неверный код двухфакторной аутентификации
-    otp_lost_help_html: Если Вы потеряли доступ к обоим, свяжитесь с %{email}
-    rate_limited: Слишком много попыток аутентификации, повторите попытку позже.
+    invalid_otp_token: Введён неверный код двухфакторной аутентификации
+    otp_lost_help_html: Если вы утратили доступ и к приложению-аутентификатору, и к резервным кодам, свяжитесь с %{email}
+    rate_limited: Слишком много попыток аутентификации, попробуйте позже.
     seamless_external_login: Вы вошли в систему через внешнюю службу, поэтому настройки пароля и электронной почты недоступны.
-    signed_in_as: 'Выполнен вход под именем:'
+    signed_in_as: Выполнен вход в учётную запись
   verification:
-    extra_instructions_html: <strong>Подсказка:</strong> Ссылка на вашем сайте может быть невидимой. Важной частью является <code>rel="me"</code>, который предотвращает выдачу себя за другое лицо на сайтах с пользовательским контентом. Вы даже можете использовать тег <code>link</code> в заголовке страницы вместо <code>a</code>, но HTML должен быть доступен без выполнения JavaScript.
-    here_is_how: Вот как
-    hint_html: "<strong>Подтверждение личности на Mastodon доступно каждому.</strong> Основано на открытых веб-стандартах, отныне и навсегда бесплатно. Всё, что вам нужно, - это персональный сайт, по которому вас узнают. Когда вы ссылаетесь на этот сайт из своего профиля, мы проверим, что сайт ссылается на ваш профиль, и отобразим на нём визуальный индикатор."
-    instructions_html: Скопируйте и вставьте код ниже в HTML вашего сайта. Затем, добавьте адрес вашего  веб сайта в одно из дополнительных полей на вкладке "Редактировать профиль" и сохраните изменения.
-    verification: Верификация ссылок
-    verified_links: Ваши ссылки подтверждения
-    website_verification: Проверка веб-сайта
+    extra_instructions_html: <strong>Подсказка:</strong> Ссылка на вашем сайте может быть невидимой. Ключевое значение имеет атрибут <code>rel="me"</code>, который не даёт выдать себя за другое лицо на сайтах, где контент создают сами пользователи. Вместо тега <code>a</code> можно использовать тег <code>link</code> в <code>head</code>-секции страницы, но необходимо, чтобы HTML-код был доступен без выполнения JavaScript.
+    here_is_how: Как это делается?
+    hint_html: "<strong>Подтверждение личности в Mastodon доступно каждому.</strong> Оно предоставляется на основе открытых веб-стандартов, бесплатно навсегда. Всё, что вам нужно, — это личный веб-сайт, по которому другие люди смогут вас узнать. После того как вы разместите ссылку на этот сайт в своём профиле, мы убедимся, что сайт в свою очередь ссылается на ваш профиль, и затем напротив ссылки появится визуальный индикатор."
+    instructions_html: Скопируйте и вставьте следующий код в HTML-разметку вашего сайта. Затем добавьте адрес вашего веб-сайта в одно из дополнительных полей на вкладке «Данные профиля» и сохраните изменения.
+    verification: Верификация
+    verified_links: Верифицированные ссылки
+    website_verification: Верификация по веб-сайту
   webauthn_credentials:
-    add: Добавить новый ключ безопасности
+    add: Добавить новый электронный ключ
     create:
-      error: Возникла проблема с добавлением ключа безопасности. Пожалуйста, попробуйте еще раз.
-      success: Ваш ключ безопасности был успешно добавлен.
+      error: При добавлении электронного ключа произошла ошибка. Попробуйте ещё раз.
+      success: Ваш электронный ключ добавлен.
     delete: Удалить
-    delete_confirmation: Вы действительно хотите удалить этот ключ безопасности?
-    description_html: Если вы включите <strong>аутентификацию по секретным ключам</strong>, вход потребует использования одного из ваших ключей.
+    delete_confirmation: Вы действительно хотите удалить этот электронный ключ?
+    description_html: Если вы включите <strong>аутентификацию по электронным ключам</strong>, для входа в учётную запись вам будет предложено использовать один из ваших ключей.
     destroy:
-      error: Произошла ошибка при удалении ключа безопасности. Пожалуйста, попробуйте еще раз.
-      success: Ваш ключ безопасности был успешно удален.
-    invalid_credential: Неверный ключ безопасности
-    nickname_hint: Введите имя вашего нового ключа безопасности
+      error: При удалении электронного ключа произошла ошибка. Попробуйте ещё раз.
+      success: Ваш электронный ключ удалён.
+    invalid_credential: Неверный электронный ключ
+    nickname_hint: Введите название для нового электронного ключа
     not_enabled: Вы еще не включили WebAuthn
-    not_supported: Этот браузер не поддерживает ключи безопасности
-    otp_required: Чтобы использовать ключи безопасности, сначала включите двухфакторную аутентификацию.
+    not_supported: В этом браузере отсутствует поддержка электронных ключей
+    otp_required: Чтобы использовать электронные ключи, сначала включите двухфакторную аутентификацию.
     registered_on: Зарегистрирован %{date}
diff --git a/config/locales/sc.yml b/config/locales/sc.yml
index c6b80847a4a..606b47cc40d 100644
--- a/config/locales/sc.yml
+++ b/config/locales/sc.yml
@@ -1156,13 +1156,7 @@ sc:
       reblog: Is cumpartziduras non podent èssere apicadas
     title: '%{name}: "%{quote}"'
     visibilities:
-      direct: Deretu
-      private: Isceti pro chie ti sighit
-      private_long: Ammustra isceti a chie ti sighit
       public: Pùblicu
-      public_long: Podet èssere bidu dae chie si siat
-      unlisted: Esclùidu de sa lista
-      unlisted_long: Podet èssere bidu dae chie si siat, però non podet èssere ammustradu in lìnias de tempus pùblicas
   statuses_cleanup:
     exceptions: Etzetziones
     min_age:
diff --git a/config/locales/sco.yml b/config/locales/sco.yml
index 209b761851c..5c1e451446b 100644
--- a/config/locales/sco.yml
+++ b/config/locales/sco.yml
@@ -1395,13 +1395,7 @@ sco:
       reblog: A heeze cannae be preent
     title: '%{name}: "%{quote}"'
     visibilities:
-      direct: Direck
-      private: Follaers-ainly
-      private_long: Ainly shaw tae follaers
       public: Public
-      public_long: Awbody kin see
-      unlisted: No listit
-      unlisted_long: Awbody kin see, but no listit on public timelines
   statuses_cleanup:
     enabled: Automatically delete auld posts
     enabled_hint: Automatically deletes yer posts ance they reach a specified age threshold, unless they match ane o the exceptions ablow
diff --git a/config/locales/si.yml b/config/locales/si.yml
index 5c31bc7e124..e6b561b2ba1 100644
--- a/config/locales/si.yml
+++ b/config/locales/si.yml
@@ -1268,13 +1268,7 @@ si:
       ownership: වෙනත් අයගේ ලිපි ඇමිණීමට නොහැකිය
     title: '%{name}: "%{quote}"'
     visibilities:
-      direct: සෘජු
-      private: අනුගාමිකයින් පමණි
-      private_long: අනුගාමිකයින්ට පමණක් පෙන්වන්න
       public: ප්‍රසිද්ධ
-      public_long: හැමෝටම පේනවා
-      unlisted: ලැයිස්තුගත නොකළ
-      unlisted_long: සෑම කෙනෙකුටම දැකිය හැක, නමුත් පොදු කාලරාමුවෙහි ලැයිස්තුගත කර නොමැත
   statuses_cleanup:
     enabled: පරණ ලිපි ස්වයංක්‍රීයව මකන්න
     exceptions: හැර දැමීම්
diff --git a/config/locales/simple_form.an.yml b/config/locales/simple_form.an.yml
index c59391f5521..d21689f6ed1 100644
--- a/config/locales/simple_form.an.yml
+++ b/config/locales/simple_form.an.yml
@@ -81,7 +81,6 @@ an:
         site_title: Cómo puede referir-se la chent a lo tuyo servidor amás de per lo nombre de dominio.
         theme: Lo tema que los visitantes no rechistraus y los nuevos usuarios veyen.
         thumbnail: Una imachen d'aproximadament 2:1 s'amuestra chunto a la información d'o tuyo servidor.
-        timeline_preview: Los visitantes no rechistraus podrán navegar per los mensaches publicos mas recients disponibles en o servidor.
         trendable_by_default: Omitir la revisión manual d'o conteniu en tendencia. Los elementos individuals encara podrán eliminar-se d'as tendencias.
         trends: Las tendencias amuestran qué mensaches, etiquetas y noticias son ganando tracción en o tuyo servidor.
       form_challenge:
@@ -180,7 +179,6 @@ an:
         setting_auto_play_gif: Reproducir automaticament los GIFs animaus
         setting_boost_modal: Amostrar finestra de confirmación antes de retutar
         setting_default_language: Idioma de publicación
-        setting_default_privacy: Privacidat de publicacions
         setting_default_sensitive: Marcar siempre imachens como sensibles
         setting_delete_modal: Amostrar dialogo de confirmación antes de borrar una publicación
         setting_disable_swiping: Deshabilitar movimientos d'eslizamiento
@@ -234,7 +232,6 @@ an:
         site_title: Nombre d'o servidor
         theme: Tema per defecto
         thumbnail: Miniatura d'o servidor
-        timeline_preview: Permitir l'acceso no autenticau a las linias de tiempo publicas
         trendable_by_default: Permitir tendencias sin revisión previa
         trends: Habilitar tendencias
       interactions:
diff --git a/config/locales/simple_form.ar.yml b/config/locales/simple_form.ar.yml
index 8c2430a7efb..767cd030bbd 100644
--- a/config/locales/simple_form.ar.yml
+++ b/config/locales/simple_form.ar.yml
@@ -56,7 +56,6 @@ ar:
         scopes: ما هي المجالات المسموح بها في التطبيق ؟ إن قمت باختيار أعلى المجالات فيمكنك الاستغناء عن الخَيار اليدوي.
         setting_aggregate_reblogs: لا تقم بعرض المشارَكات الجديدة لمنشورات قد قُمتَ بمشاركتها سابقا (هذا الإجراء يعني المشاركات الجديدة فقط التي تلقيتَها)
         setting_always_send_emails: عادة لن تُرسَل إليك إشعارات البريد الإلكتروني عندما تكون نشطًا على ماستدون
-        setting_default_quote_policy: يسمح بالاقتباس دائما للمستخدمين المذكورين. هذا الإعداد سوف يكون نافذ المفعول فقط للمشاركات التي تم إنشاؤها مع إصدار ماستدون القادم، ولكن يمكنك تحديد تفضيلاتك للإعداد لذلك
         setting_default_sensitive: تُخفى الوسائط الحساسة تلقائيا ويمكن اظهارها عن طريق النقر عليها
         setting_display_media_default: إخفاء الوسائط المُعيَّنة كحساسة
         setting_display_media_hide_all: إخفاء كافة الوسائط دائمًا
@@ -103,7 +102,6 @@ ar:
         status_page_url: العنوان التشعبي حيث يمكن للناس رؤية صفحة حالة هذا الخادم عند حدوث عطب ما
         theme: الشكل الذي يشاهده الزوار الجدد و الغير مسجلين الدخول.
         thumbnail: عرض حوالي 2:1 صورة إلى جانب معلومات الخادم الخاص بك.
-        timeline_preview: الزوار الذين سجلوا خروجهم سيكونون قادرين على تصفح أحدث المشاركات العامة المتاحة على الخادم.
         trendable_by_default: تخطي مراجعة المحتوى التريند اليدوي. لا يزال من الممكن الإزالة اللاحقة للعناصر الفردية من التريندات.
         trends: تُظهِر المتداولة أي من المنشورات والوسوم وقصص الأخبار التي تجذب الانتباه على خادمك.
         trends_as_landing_page: إظهار المحتوى المتداوَل للمستخدمين والزوار غير المسجلين بدلاً من وصف هذا الخادم. يتطلب هذا تفعيل المتداولة.
@@ -149,13 +147,6 @@ ar:
         min_age: لا يجوز أن يكون دون السن الأدنى الذي تقتضيه قوانين الدولة.
       user:
         chosen_languages: إن تم اختيارها، فلن تظهر على الخيوط العامة إلّا الرسائل المنشورة في تلك اللغات
-        date_of_birth:
-          few: عليك أن تكون أكبر من %{count} سنة لاستخدام ماستادون. لن نحفظ هذه المعلومة.
-          many: عليك أن تكون أكبر من %{count} سنة لاستخدام ماستادون. لن نحفظ هذه المعلومة.
-          one: عليك أن تكون أكبر من %{count} سنة لاستخدام ماستادون. لن نحفظ هذه المعلومة.
-          other: عليك أن تكون أكبر من %{count} سنة لاستخدام ماستادون. لن نحفظ هذه المعلومة.
-          two: عليك أن تكون أكبر من %{count} سنة لاستخدام ماستادون. لن نحفظ هذه المعلومة.
-          zero: عليك أن تكون أكبر من %{count} سنة لاستخدام ماستادون. لن نحفظ هذه المعلومة.
         role: الدور يتحكم في أذونات المستخدم.
       user_role:
         color: اللون الذي سيتم استخدامه للوظيفه في جميع وحدات واجهة المستخدم، كـ RGB بتنسيق hex
@@ -235,7 +226,7 @@ ar:
         setting_auto_play_gif: تشغيل تلقائي لِوَسائط جيف المتحركة
         setting_boost_modal: إظهار مربع حوار التأكيد قبل إعادة نشر أي منشور
         setting_default_language: لغة النشر
-        setting_default_privacy: خصوصية المنشور
+        setting_default_privacy: مدى ظهور المنشور
         setting_default_quote_policy: من يستطيع الاقتباس
         setting_default_sensitive: اعتبر الوسائط دائما كمحتوى حساس
         setting_delete_modal: إظهار مربع حوار التأكيد قبل حذف أي منشور
@@ -245,6 +236,7 @@ ar:
         setting_display_media_default: افتراضي
         setting_display_media_hide_all: إخفاء الكل
         setting_display_media_show_all: عرض الكل
+        setting_emoji_style: نمط الوجوه التعبيرية
         setting_expand_spoilers: توسيع المنشورات التي تحتوي على تحذيرات عن المحتوى دائما
         setting_hide_network: إخفِ شبكتك
         setting_missing_alt_text_modal: إظهار حوار التأكيد قبل نشر وسائط دون نص بديل
@@ -299,7 +291,6 @@ ar:
         status_page_url: الرابط التشعبي لصفحة حالة الخادم
         theme: الحُلَّة الإفتراضية
         thumbnail: الصورة المصغرة للخادم
-        timeline_preview: السماح بالوصول غير الموثق إلى الخيوط الزمنية العامة
         trendable_by_default: السماح للوسوم بالظهور على المتداوَلة دون مراجعة مسبقة
         trends: تمكين المتداوَلة
         trends_as_landing_page: استخدام المُتداوَلة كصفحة ترحيب
@@ -327,6 +318,7 @@ ar:
         follow_request: ابعث بريدا إلكترونيا عندما يقوم أحدهم بإرسال طلب بالمتابعة
         mention: ابعث بريداً إلكترونيًا عندما يُشير إليك أو يذكُرك أحدهم
         pending_account: ابعث رسالة إلكترونية إن كان هناك حساب جديد بحاجة إلى مراجعة
+        quote: شخص ما اقتبس منك
         reblog: عندما يقوم أحدهم بإعادة نشر منشورك
         report: هناك إبلاغ جديد تم إرساله
         software_updates:
@@ -373,6 +365,9 @@ ar:
         name: التسمية
         permissions_as_keys: الصلاحيات
         position: الأولوية
+      username_block:
+        allow_with_approval: السماح بالتسجيلات بعد الموافقة
+        comparison: طريقة المقارنة
       webhook:
         events: الأحداث المفعلة
         template: قالب الحمولة
diff --git a/config/locales/simple_form.ast.yml b/config/locales/simple_form.ast.yml
index 9e5db2ba30c..977f89027a8 100644
--- a/config/locales/simple_form.ast.yml
+++ b/config/locales/simple_form.ast.yml
@@ -106,7 +106,6 @@ ast:
         setting_auto_play_gif: Reproducir automáticamente los GIFs
         setting_boost_modal: Amosar el diálogu de confirmación enantes de compartir una publicación
         setting_default_language: Llingua de los artículos
-        setting_default_privacy: Privacidá de los artículos
         setting_default_sensitive: Marcar siempre tol conteníu como sensible
         setting_delete_modal: Amosar el diálogu de confirmación enantes de desaniciar una publicación
         setting_disable_hover_cards: Desactivar la previsualización de perfiles al pasar el mur penriba
@@ -143,7 +142,6 @@ ast:
         site_title: Nome del sirvidor
         theme: Estilu predetermináu
         thumbnail: Miniatura del sirvidor
-        timeline_preview: Permitir l'accesu ensin autenticar a les llinies de tiempu públiques
         trendable_by_default: Permitir tendencies ensin revisión previa
         trends: Activar les tendencies
       interactions:
diff --git a/config/locales/simple_form.az.yml b/config/locales/simple_form.az.yml
index e9ba86bc793..cb15c716222 100644
--- a/config/locales/simple_form.az.yml
+++ b/config/locales/simple_form.az.yml
@@ -1 +1,81 @@
+---
 az:
+  simple_form:
+    hints:
+      admin_account_action:
+        include_statuses: İstifadəçi, hansı göndərişlərin moderasiya əməliyyatına və ya xəbərdarlığına səbəb olduğunu görəcək
+      defaults:
+        current_password: Təhlükəsizlik səbəblərinə görə lütfən hazırkı hesabın parolunu daxil edin
+        phrase: Mətndəki böyük-kiçik hərfdən və ya göndərişin məzmun xəbərdarlığından asılı olmayaraq uyuşdurulacaq
+        setting_aggregate_reblogs: Təzəlikcə təkrar paylaşılmış göndərişlər üçün yeni təkrar paylaşımlar göstərilməsin (yalnız yeni alınan təkrar paylaşımlara təsir edir).
+        setting_always_send_emails: Normalda, Mastodon-u aktiv olaraq istifadə etdiyiniz zaman e-poçt bildirişləri göndərilməyəcək
+        setting_default_sensitive: Həssas media, ilkin olaraq gizlədilir və bir kliklə göstərilə bilər
+        setting_display_media_default: Həssas olaraq işarələnmiş medianı gizlət
+        setting_display_media_hide_all: Medianı həmişə gizlət
+        setting_display_media_show_all: Medianı həmişə göstər
+        setting_system_scrollbars_ui: Yalnız Safari və Chrome əaslı masaüstü brauzerlərinə tətbiq olunur
+        setting_use_blurhash: Meyillər, gizli vizualların rənglərinə əsaslanır, ancaq detalları gizlədir
+        setting_use_pending_items: Lenti avtomatik diyirləmək əvəzinə, zaman xətti güncəlləmələrini tək bir kliklə gizlət
+      featured_tag:
+        name: 'Budur, təzəlikcə istifadə etdiyiniz mövzu etiketlərindən bəziləri:'
+      form_admin_settings:
+        content_cache_retention_period: Digər serverlərdən olan bütün göndərişlər (təkrar paylaşımlar və cavablar daxil olmaqla) göstərilən gün sayından sonra, lokal istifadəçilərin həmin göndərişlərlə qarşılıqlı əlaqəsinə baxılmadan silinəcək. Buna, lokal istifadəçinin həmin göndərişi əlfəcinlərə və ya sevimlilərə əlavə etdiyi hallar da daxildir. Fərqli instansiyalardakı istifadəçilər arasında olan şəxsi adçəkmələr də itəcək və bərpası mümkün olmayacaq. Bu ayarın istifadəsi xüsusi məqsədli instansiyalar üçün nəzərdə tutulub və ümumi məqsədli istifadəyə tətbiq edildikdə bir çox istifadəçi gözləntilərini qarşılamaya bilər.
+      imports:
+        data: Digər Mastodon serverindən xaricə köçürdüyünüz CSV faylı
+      ip_block:
+        severities:
+          no_access: Bütün resurslara erişimi əngəllə
+      sessions:
+        otp: 'Telefon tətbiqiniz tərəfindən yaradılmış iki faktorlu kodu daxil edin və ya geri qaytarma kodlarınızdan birini istifadə edin:'
+      user:
+        chosen_languages: İşarələnsə, yalnız seçilmiş dillərdəki göndərişlər ümumi zaman xətlərində nümayiş etdiriləcək
+      user_role:
+        permissions_as_keys: Bu rola sahib istifadəçilər bunlara erişə biləcək...
+    labels:
+      account:
+        show_collections: Profildə izlənilənləri və izləyiciləri göstər
+      defaults:
+        autofollow: Hesabınızı izləməyə dəvət edin
+        confirm_new_password: Yeni parolu təsdiqlə
+        confirm_password: Parolu təsdiqlə
+        current_password: Hazırkı parol
+        data: Veri
+        display_name: Ekran adı
+        header: Örtük şəkli
+        locale: İnterfeys dili
+        max_uses: Maksimum istifadə sayı
+        new_password: Yeni parol
+        password: Parol
+        setting_advanced_layout: Qabaqcıl veb interfeysini fəallaşdır
+        setting_aggregate_reblogs: Zaman xəttindəki TP-ları qruplaşdır
+        setting_always_send_emails: E-poçt göndərişlərini həmişə göndər
+        setting_auto_play_gif: Animasiyalı GIF-ləri avto-oxut
+        setting_boost_modal: Bir təkrar paylaşımı silməzdən əvvəl təsdiq dialoq pəncərəsini göstər
+        setting_default_sensitive: Medianı həmişə həssas olaraq işarələ
+        setting_delete_modal: Bir göndərişi silməzdən əvvəl təsdiq dialoq pəncərəsini göstər
+        setting_disable_hover_cards: Üzərinə gəldikdə profil önizləməsini sıradan çıxart
+        setting_disable_swiping: Sürüşdürmə hərəkətlərini sıradan çıxart
+        setting_display_media: Medianın nümayişi
+        setting_expand_spoilers: Məzmun xəbərdarlığı ilə işarələnmiş göndərişləri həmişə genişləndir
+        setting_missing_alt_text_modal: Alternativ mətni olmayan medianı göndərməzdən əvvəl təsdiq dialoq pəncərəsini göstər
+        setting_reduce_motion: Animasiyalarda hərəkəti azalt
+        setting_system_font_ui: Sistemin ilkin şriftini istifadə et
+        setting_system_scrollbars_ui: Sistemin ilkin sürüşdürmə çubuğunu istifadə et
+        setting_trends: Bugünün trendlərini göstər
+        setting_use_blurhash: Gizli media üçün rəngli meyilləri göstər
+        setting_use_pending_items: Yavaş rejim
+      form_admin_settings:
+        show_domain_blocks: Əngəllənən domenləri göstər
+      ip_block:
+        severities:
+          no_access: Erişimi əngəllə
+      notification_emails:
+        appeal: Kimsə, bir moderasiya qərarına etiraz edir
+        favourite: Kimsə göndərişinizi sevimlilərinə əlavə etdi
+        follow: Kimsə sizi izləyir
+        follow_request: Kimsə sizi izləmək üçün sorğu göndərdi
+        mention: Kimsə adınızı çəkdi
+        quote: Kimsə sizdən sitat gətirdi
+        reblog: Kimsə göndərişinizi təkrar paylaşdı
+      username_block:
+        username: Uyuşacaq söz
diff --git a/config/locales/simple_form.be.yml b/config/locales/simple_form.be.yml
index b68e03b0575..eaa6d52708b 100644
--- a/config/locales/simple_form.be.yml
+++ b/config/locales/simple_form.be.yml
@@ -3,12 +3,14 @@ be:
   simple_form:
     hints:
       account:
+        attribution_domains: Адзін на радок. Абараняе ад ілжывых значанняў аўтарства.
         discoverable: Вашы публічныя паведамленні і профіль могуць быць паказаны або рэкамендаваны ў розных раздзелах Mastodon, і ваш профіль можа быць прапанаваны іншым карыстальнікам.
         display_name: Ваша поўнае імя або ваш псеўданім.
         fields: Ваша хатняя старонка, займеннікі, узрост, усё, што заўгодна.
         indexable: Вашыя публічныя допісы могуць з'яўляцца ў рэзультатах пошуку Mastodon. Людзі, якія ўзаемадзейнічалі з вашымі допісамі, усё роўна маюць магчымасць іх знаходзіць.
-        note: 'Вы можаце @згадаць іншых людзей або выкарыстоўваць #хэштэгі.'
+        note: 'Вы можаце @згадваць іншых людзей або выкарыстоўваць #хэштэгі.'
         show_collections: Людзі змогуць праглядаць спіс вашых падпісак і падпісчыкаў. Людзі, на якіх вы падпісаны ў любым выпадку будуць бачыць, што вы іх чытаеце.
+        unlocked: Людзі змогуць падпісвацца на Вас без запыту на ўхваленне. Зніміце птушку, калі хочаце разглядаць запыты на падпіску і выбіраць, ці хочаце Вы прымаць або адмаўляць новым падпісчыкам.
       account_alias:
         acct: Прызначце карыстальнік@дамен уліковага запісу з якога вы хочаце пераехаць
       account_migration:
@@ -30,10 +32,10 @@ be:
         warning_preset_id: Неабавязкова. Вы можаце дадаць уласны тэкст напрыканцы шаблону
       announcement:
         all_day: Калі пазначана, будуць паказаны толькі даты з пазначанага прамежку часу
-        ends_at: Неабавязкова. Аб'ява будзе аўтаматычна знята ў пэўны час
-        scheduled_at: Пакіньце пустым, каб апублікаваць аб'яву імаверна
-        starts_at: Неабавязкова. На выпадак, калі ваша аб'ява прывязана да пэўнага перыяду часу
-        text: Вы можаце карыстацца сінтаксісам допісаў. Калі ласка, улічвайце месца, якое аб'ява зойме на экране карыстальніка
+        ends_at: Неабавязкова. Аб’ява будзе аўтаматычна знята ў пэўны час
+        scheduled_at: Пакіньце пустым, каб апублікаваць аб’яву адразу
+        starts_at: Неабавязкова. На выпадак, калі ваша аб’ява прывязана да пэўнага перыяду часу
+        text: Вы можаце карыстацца сінтаксісам допісаў. Улічвайце месца, якое аб’ява зойме на экране карыстальніка
       appeal:
         text: Вы можаце абскардзіць рашэнне толькі адзін раз
       defaults:
@@ -41,9 +43,9 @@ be:
         avatar: WEBP, PNG, GIF ці JPG. Не больш за %{size}. Будзе сціснуты да памеру %{dimensions}} пікселяў
         bot: Паведаміць іншым, што гэты ўліковы запіс у асноўным выконвае аўтаматычныя дзеянні і можа не кантралявацца
         context: Адзін ці некалькі кантэкстаў, да якіх трэба прымяніць фільтр
-        current_password: У мэтах бяспекі, калі ласка, увядзіце пароль бягучага ўліковага запісу
+        current_password: У мэтах бяспекі, увядзіце пароль бягучага ўліковага запісу
         current_username: Каб пацвердзіць, увядзіце, калі ласка імя карыстальніка бягучага ўліковага запісу
-        digest: Будзе даслана толькі пасля доўгага перыяду неактыўнасці і толькі калі вы атрымалі асабістыя паведамленні падчас вашай адсутнасці
+        digest: Будзе даслана толькі пасля доўгага перыяду неактыўнасці і толькі, калі Вы атрымалі асабістыя паведамленні падчас Вашай адсутнасці
         email: Пацвярджэнне будзе выслана па электроннай пошце
         header: WEBP, PNG, GIF ці JPG. Не больш за %{size}. Будзе сціснуты да памеру %{dimensions}} пікселяў
         inbox_url: Капіраваць URL са старонкі рэтранслятара, якім вы хочаце карыстацца
@@ -51,13 +53,17 @@ be:
         locale: Мова карыстальніцкага інтэрфейсу, электронных паведамленняў і апавяшчэнняў
         password: Не менш за 8 сімвалаў
         phrase: Параўнанне адбудзецца нягледзячы на рэгістр тэксту і папярэджанні аб змесціве допісу
-        scopes: Якімі API праграм будзе дазволена карыстацца. Калі вы абярэце найвышэйшы ўзровень, не трэба абіраць асобныя.
+        scopes: Абярыце, якімі API праграма зможа карыстацца. Выбар дазволу найвышэйшага ўзроўню ўключае ў сябе дазволу астатніх узроўняў.
         setting_aggregate_reblogs: Не паказваць новыя пашырэнні для допісаў, якія пашырылі нядаўна (закранае толькі нядаўнія пашырэнні)
         setting_always_send_emails: Звычайна лісты з апавяшчэннямі не будуць дасылацца, калі вы актыўна карыстаецеся Mastodon
+        setting_default_quote_policy_private: Допісы для падпісчыкаў, створаныя на Mastodon, нельга цытаваць іншым людзям.
+        setting_default_quote_policy_unlisted: Калі людзі працытуюць Вас, іх допіс таксама будзе схаваны ад стужкі трэндаў.
         setting_default_sensitive: Далікатныя медыя прадвызначана схаваныя. Іх можна адкрыць адзіным клікам
         setting_display_media_default: Хаваць медыя пазначаныя як далікатныя
         setting_display_media_hide_all: Заўсёды хаваць медыя
         setting_display_media_show_all: Заўсёды паказваць медыя
+        setting_emoji_style: Як паказваць эмодзі. "Аўтаматычны" будзе намагацца выкарыстоўваць мясцовыя эмодзі, але для састарэлых браўзераў — Twemoji.
+        setting_system_scrollbars_ui: Працуе толькі ў камп'ютарных браўзерах на аснове Safari і Chrome
         setting_use_blurhash: Градыенты заснаваны на колерах схаваных выяў, але размываюць дэталі
         setting_use_pending_items: Схаваць абнаўленні стужкі за клікам замест аўтаматычнага пракручвання стужкі
         username: Вы можаце выкарыстоўваць літары, лічбы і падкрэсліванне
@@ -70,8 +76,9 @@ be:
       featured_tag:
         name: 'Вось некаторыя з хэштэгаў, якімі вы нядаўна карысталіся:'
       filters:
-        action: Абярыце, што зрабіць, калі пост падпадае пад умовы фільтру
+        action: Абярыце, што зрабіць, калі допіс падпадае пад умовы фільтру
         actions:
+          blur: Схавайце медыя за знакам папярэджання, не хаваючы пры гэтым тэкст
           hide: Поўнасцю схаваць адфільтраванае змесціва, дзейнічаць, нібы яго не існуе
           warn: Схаваць адфільтраваны кантэнт за папярэджаннем з назвай фільтру
       form_admin_settings:
@@ -80,24 +87,24 @@ be:
         backups_retention_period: Карыстальнікі могуць ствараць архівы сваіх допісаў для наступнай запампоўкі. Пры станоўчай колькасці дзён гэтыя архівы будуць аўтаматычна выдаляцца са сховішча пасля заканчэння названай колькасці дзён.
         bootstrap_timeline_accounts: Гэтыя ўліковыя запісы будуць замацаваны ў топе рэкамендацый для новых карыстальнікаў.
         closed_registrations_message: Паказваецца, калі рэгістрацыя закрытая
-        content_cache_retention_period: Усе допісы з іншых сервераў (уключаючы пашырэнні і адказы) будуць выдаленыя праз паказаную колькасць дзён, незалежна ад таго, як лакальны карыстальнік узаемадзейнічаў з гэтымі допісамі. Гэта датычыцца і тых допісаў, якія лакальны карыстальнік пазначыў у закладкі або ўпадабанае. Прыватныя згадкі паміж карыстальнікамі з розных інстанс таксама будуць страчаныя і не змогуць быць адноўлены. Выкарыстанне гэтай налады прызначана для асобнікаў спецыяльнага прызначэння і парушае многія чаканні карыстальнікаў пры выкарыстанні ў агульных мэтах.
+        content_cache_retention_period: Усе допісы з іншых сервераў (разам з пашырэннямі і адказамі) будуць выдалены праз паказаную колькасць дзён, незалежна ад таго, як лакальны карыстальнік узаемадзейнічаў з гэтымі допісамі. Гэта датычыцца і тых допісаў, якія лакальны карыстальнік пазначыў у закладкі або ўпадабанае. Прыватныя згадванні паміж карыстальнікамі з розных экзэмпляраў сервераў таксама будуць страчаны і іх нельга будзе аднавіць. Выкарыстанне гэтай налады прызначана для экзэмпляраў сервераў спецыяльнага прызначэння і парушае многія чаканні карыстальнікаў пры выкарыстанні ў агульных мэтах.
         custom_css: Вы можаце прымяняць карыстальніцкія стылі ў вэб-версіі Mastodon.
         favicon: WEBP, PNG, GIF ці JPG. Замяняе прадвызначаны favicon Mastodon на ўласны значок.
         mascot: Замяняе ілюстрацыю ў пашыраным вэб-інтэрфейсе.
-        media_cache_retention_period: Медыяфайлы з допісаў, зробленых выдаленымі карыстальнікамі, кэшыруюцца на вашым серверы. Пры станоўчым значэнні медыяфайлы будуць выдалены праз пазначаную колькасць дзён. Калі медыядадзеныя будуць запытаны пасля выдалення, яны будуць загружаны паўторна, калі зыходны кантэнт усё яшчэ даступны. У сувязі з абмежаваннямі на частату абнаўлення відарысаў іншых сайтаў, рэкамендуецца ўсталяваць значэнне не менш за 14 дзён, інакш відарысы не будуць загружацца па запыце раней за гэты тэрмін.
-        peers_api_enabled: Спіс даменных імён, з якімі сутыкнуўся гэты сервер у федэсвеце. Дадзеныя аб тым, ці знаходзіцеся вы з пэўным серверам у федэрацыі, не ўключаныя, ёсць толькі тое, што ваш сервер ведае пра гэта. Гэта выкарыстоўваецца сэрвісамі, якія збіраюць статыстыку па федэрацыі ў агульным сэнсе.
+        media_cache_retention_period: Медыяфайлы з допісаў, зробленых карыстальнікамі з іншых сервераў, кэшыруюцца на вашым серверы. Пры станоўчым значэнні медыяфайлы будуць выдалены праз пазначаную колькасць дзён. Калі медыяданыя будуць запытаныя пасля выдалення, яны будуць спампаваныя зноў, калі зыходнае змесціва усё яшчэ даступнае. У сувязі з абмежаваннямі на частату абнаўлення картак перадпрагляду іншых сайтаў, рэкамендуецца ўсталяваць значэнне не менш за 14 дзён, інакш гэтыя карткі не будуць абнаўляцца па запыце раней за гэты тэрмін.
+        min_age: Карыстальнікі будуць атрымліваць запыт на пацвярджэнне даты нараджэння падчас рэгістрацыі
+        peers_api_enabled: Спіс даменных імён, з якімі сутыкнуўся гэты сервер у федэральным сусвеце. Даныя пра тое, ці знаходзіцеся вы з дадзеным серверам у федэрацыі, не ўключаны. Уключаны толькі даныя пра тое, што ваш сервер ведае пра іншыя серверы. Гэта выкарыстоўваецца сэрвісамі, якія збіраюць статыстыку па федэрацыі ў агульным сэнсе.
         profile_directory: Дырэкторыя профіляў змяшчае спіс усіх карыстальнікаў, якія вырашылі быць бачнымі.
         require_invite_text: Калі рэгістрацыя патрабуе ручнога пацвержання, зрабіце поле "Чаму вы хочаце далучыцца?" абавязковым
         site_contact_email: Як людзі могуць звязацца з вамі па юрыдычных запытах або пытаннях падтрымкі.
         site_contact_username: Як людзі могуць звязацца з вамі на Mastodon.
         site_extended_description: Любая дадатковая інфармацыя, якая можа быць карыснай наведвальнікам ды вашым карыстальнікам. Можна карыстацца сінтаксісам Markdown каб структураваць тэкст.
         site_short_description: Кароткае апісанне, каб дапамагчы адназначна ідэнтыфікаваць ваш сервер. Хто яго падтрымлівае, для каго ён?
-        site_terms: Апішыце ўласную палітыку прыватнасці альбо пакіньце поле пустым, калі хочаце скарыстацца прадвызначанай. Можна карыстацца сінтаксісам Markdown каб структураваць тэкст.
+        site_terms: Апішыце ўласную палітыку прыватнасці альбо пакіньце поле пустым, калі хочаце выкарыстоўваць прадвызначаную. Можна карыстацца сінтаксісам Markdown для структуравання тэксту.
         site_title: Як людзі могуць звяртацца да вашага серверу акрамя яго даменнага імя.
         status_page_url: URL старонкі, дзе людзі могуць бачыць стан гэтага сервера падчас збою
         theme: Тэма, што бачаць новыя карыстальнікі ды наведвальнікі, якія выйшлі.
         thumbnail: Выява памерамі прыкладна 2:1, якая паказваецца побач з інфармацыяй пра ваш сервер.
-        timeline_preview: Наведвальнікі, якія выйшлі, змогуць праглядаць апошнія публічныя допісы на серверы.
         trendable_by_default: Прапусціць ручны агляд трэндавага змесціва. Асобныя элементы ўсё яшчэ можна будзе выдаліць з трэндаў пастфактум.
         trends: Трэнды паказваюць, якія допісы, хэштэгі і навіны набываюць папулярнасць на вашым серверы.
         trends_as_landing_page: Паказваць папулярнае змесціва карыстальнікам, якія выйшлі з сістэмы, і наведвальнікам, замест апісання гэтага сервера. Патрабуецца ўключэнне трэндаў.
@@ -127,20 +134,45 @@ be:
         show_application: Вы ў любым выпадку зможаце ўбачыць, якая праграма апублікавала ваш допіс.
       tag:
         name: Вы можаце змяняць толькі рэгістр літар, напрыклад для таго, каб падвысіць чытабельнасць
+      terms_of_service:
+        changelog: Можна карыстацца сінтаксісам Markdown, каб структураваць тэкст.
+        effective_date: Дапушчальны перыяд часу можа вар'іравацца ад 10 да 30 дзён з моманту, як Вы апавясціце сваіх карыстальнікаў.
+        text: Тэкст можна структураваць з дапамогай сінтаксісу Markdown.
+      terms_of_service_generator:
+        admin_email: Юрыдычныя абвесткі ўключаюць сустрэчныя абвесткі, судзейскія пастановы, запыты на выдаленне і запыты праваахоўных органаў.
+        arbitration_address: Можа быць такім жа, што і фізічны адрас вышэй, або “N/A”, калі карыстаецеся электроннай поштай.
+        arbitration_website: Можа быць у выглядзе электроннай формы або “N/A”, калі карыстаецеся электроннай поштай.
+        choice_of_law: шашашаГорад, вобласць, тэрыторыя штата (Зша), унутраныя законы якой рэгулююць усе прэтэнзіі.
+        dmca_address: 'Для ўладальнікаў з ЗША: выкарыстоўвайце адрас, які зарэгістраваны ў даведніку ўпаўнаважаных агентаў DMCA. Спіс паштовых адрасоў даступны па прамым запыце, выкарыстоўвайце запыт на адмову ад правоў на пошту ўпаўнаважаных агентаў DMCA, каб адправіць электронны ліст у Офіс па Аўтарскіх Правах і апішыце, што Вы мадэратар, які працуе з уласнага дому, які баіцца помсты ці пакарання за свае дзеянні і якому патрэбны выкарыстаць паштовы адрас, каб прыбраць дамашні адрас з публічнага доступу.'
+        dmca_email: Можа быць такім жа, што і "Электронны адрас для юрыдычных абвестак" вышэй.
+        domain: Унікальны ідэнтыфікатар анлайн сэрвісу, які Вы прадстаўляеце.
+        jurisdiction: Дадайце краіну, дзе жыве той, хто плаціць за рахункі. Калі гэта кампанія ці іншая інстанцыя, дадайце краіну, дзе яна знаходзіцца, а таксама (па меры неабходнасці) горад, вобласць, тэрыторыю штата (ЗША).
+        min_age: Не павінен быць ніжэй за мінімальны ўзрост, які патрабуюць законы Вашай юрысдыкцыі.
       user:
         chosen_languages: У публічных стужках будуць паказвацца допісы толькі на тых мовах, якія вы пазначыце
+        date_of_birth:
+          few: Нам трэба ўпэўніцца, што Вы як мінімум %{count} чалавекі з тых, хто карыстаецца %{domain}. Мы не будзем захоўваць гэту інфармацыю.
+          many: Нам трэба ўпэўніцца, што Вы як мінімум %{count} людзей з тых, хто карыстаецца %{domain}. Мы не будзем захоўваць гэту інфармацыю.
+          one: Нам трэба ўпэўніцца, што Вы як мінімум %{count} чалавек з тых, хто карыстаецца %{domain}. Мы не будзем захоўваць гэту інфармацыю.
+          other: Нам трэба ўпэўніцца, што Вы як мінімум %{count} чалавекі з тых, хто карыстаецца %{domain}. Мы не будзем захоўваць гэту інфармацыю.
+        role: Роля кантралюе тое, якія дазволы мае карыстальнік.
       user_role:
         color: Колер, які будзе выкарыстоўвацца для гэтай ролі па ўсім UI, у фармаце RGB ці hex
         highlighted: Гэта робіць ролю публічна бачнай
         name: Публічная назва ролі, калі роля дэманструецца як значок у профілю
         permissions_as_keys: Карыстальнікі з гэтай роляй будуць мець доступ да...
         position: Ролі вышэйшага рангу займаюцца вырашэннем канфліктаў у пэўных сітуацыях. Некаторыя дзеянні можна выкананаць толькі над ролямі з ніжэйшым рангам
+      username_block:
+        allow_with_approval: Рэгістрацыя не будзе цалкам забараняцца. Замест гэтага на адпаведныя рэгістрацыі спатрэбіцца Ваша ўхваленне
+        comparison: Калі ласка, бярыце пад увагу Сканторпскую Праблему, калі блакіруеце частковыя супадзенні
+        username: Супадзе пры любым рэгістры літар і часта ўжывальных амогліфах, накшталт "4" у якасці "а" ці "3" у якасці "е"
       webhook:
         events: Выберыце падзеі для адпраўкі
         template: Стварыце сваю ўласную карысную нагрузку JSON з дапамогай інтэрпаляцыі зменных. Пакіньце пустым для стандартнага змесціва JSON.
         url: Куды падзеі будуць адпраўляцца
     labels:
       account:
+        attribution_domains: Сайтам дазволена пазначаць ваша аўтарства
         discoverable: Уключыць профіль і допісы ў алгарытмы рэкамендацый
         fields:
           name: Пазнака
@@ -206,7 +238,8 @@ be:
         setting_auto_play_gif: Аўтапрайграванне анімаваных GIF
         setting_boost_modal: Паказваць акно пацвярджэння перад пашырэннем
         setting_default_language: Мова допісаў
-        setting_default_privacy: Прыватнасць допісаў
+        setting_default_privacy: Бачнасць допісаў
+        setting_default_quote_policy: Хто можа цытаваць
         setting_default_sensitive: Заўсёды пазначаць кантэнт як далікатны
         setting_delete_modal: Паказваць акно пацвярджэння перад выдаленнем допісу
         setting_disable_hover_cards: Адключыць перадпрагляд профілю пры навядзенні
@@ -215,13 +248,16 @@ be:
         setting_display_media_default: Перадвызначана
         setting_display_media_hide_all: Схаваць усё
         setting_display_media_show_all: Паказаць усё
+        setting_emoji_style: Стыль эмодзі
         setting_expand_spoilers: Заўжды разгортваць допісы з папярэджаннем аб змесціве
         setting_hide_network: Схаваць вашы сувязі
+        setting_missing_alt_text_modal: Паказваць акно пацвярджэння перад публікацыяй медыя без альтэрнатыўнага тэксту
         setting_reduce_motion: Памяншэнне руху ў анімацыях
         setting_system_font_ui: Выкарыстоўваць прадвызначаны сістэмны шрыфт
+        setting_system_scrollbars_ui: Паказваць паласу пракручвання па змаўчанні
         setting_theme: Тэма сайта
         setting_trends: Паказваць трэнды дня
-        setting_unfollow_modal: Паказваць акно пацвярджэння перад адпіскай
+        setting_unfollow_modal: Паказваць акно пацвярджэння перад адпісваннем
         setting_use_blurhash: Паказваць каляровыя градыенты замест схаваных медыя
         setting_use_pending_items: Павольны рэжым
         severity: Узровень
@@ -237,6 +273,7 @@ be:
         name: Хэштэг
       filters:
         actions:
+          blur: Хаваць медыя з папярэджаннем
           hide: Схаваць цалкам
           warn: Схаваць з папярэджаннем
       form_admin_settings:
@@ -245,14 +282,19 @@ be:
         backups_retention_period: Працягласць захавання архіву карыстальніка
         bootstrap_timeline_accounts: Заўсёды раіць гэтыя ўліковыя запісы новым карыстальнікам
         closed_registrations_message: Уласнае паведамленне, калі рэгістрацыя немагчымая
-        content_cache_retention_period: Перыяд захоўвання выдаленага змесціва
+        content_cache_retention_period: Перыяд захоўвання змесціва з іншых сервераў
         custom_css: CSS карыстальніка
         favicon: Значок сайта
+        local_live_feed_access: Доступ да жывых стужак з лакальнымі допісамі
+        local_topic_feed_access: Доступ да хэштэгавых і спасылачных стужак з лакальнымі допісамі
         mascot: Уласны маскот(спадчына)
         media_cache_retention_period: Працягласць захавання кэшу для медыя
+        min_age: Патрабаванне мінімальнага ўзросту
         peers_api_enabled: Апублікаваць спіс знойдзеных сервераў у API
         profile_directory: Уключыць каталог профіляў
         registrations_mode: Хто можа зарэгістравацца
+        remote_live_feed_access: Доступ да жывых стужак з допісамі з іншых сервераў
+        remote_topic_feed_access: Доступ да хэштэгавых і спасылачных стужак з допісамі з іншых сервераў
         require_invite_text: Каб далучыцца, патрэбна прычына
         show_domain_blocks: Паказаць заблакіраваныя дамены
         show_domain_blocks_rationale: Паказваць прычыну блакавання даменаў
@@ -265,18 +307,17 @@ be:
         status_page_url: URL старонкі статусу
         theme: Тэма па змаўчанні
         thumbnail: Мініяцюра сервера
-        timeline_preview: Дазволіць неаўтэнтыфікаваны доступ да публічных стужак
         trendable_by_default: Дазваляць трэнды без папярэдняй праверкі
         trends: Уключыць трэнды
         trends_as_landing_page: Выкарыстоўваць трэнды ў якасці лэндзінга
       interactions:
         must_be_follower: Заблакіраваць апавяшчэнні ад непадпісаных людзей
         must_be_following: Заблакіраваць апавяшчэнні ад людзей на якіх вы не падпісаны
-        must_be_following_dm: Заблакіраваць асабістыя паведамленні ад людзей на якіх вы не падпісаны
+        must_be_following_dm: Заблакіраваць асабістыя паведамленні ад людзей, на якіх Вы не падпісаныя
       invite:
         comment: Каментар
       invite_request:
-        text: Чаму вы жадаеце далучыцца?
+        text: Чаму вы хочаце далучыцца?
       ip_block:
         comment: Каментар
         ip: IP
@@ -293,6 +334,7 @@ be:
         follow_request: Нехта даслаў вам запыт на падпіску
         mention: Нехта згадаў вас
         pending_account: Новы акаўнт патрабуе разгляду
+        quote: Хтосьці цытаваў Вас
         reblog: Нехта пашырыў ваш допіс
         report: Новая скарга даслана
         software_updates:
@@ -313,10 +355,24 @@ be:
         name: Хэштэг
         trendable: Дазволіць паказ гэтага хэштэга ў трэндах
         usable: Дазволіць допісам выкарыстоўваць гэты хэштэг лакальна
+      terms_of_service:
+        changelog: Што змянілася?
+        effective_date: Дата пачатку дзеяння
+        text: Умовы выкарыстання
       terms_of_service_generator:
-        domain: Дамэн
+        admin_email: Адрас электроннай пошты для юрыдычных абвестак
+        arbitration_address: Фізічны адрас для арбітражных абвестак
+        arbitration_website: Сайт для дасылання арбітражных абвестак
+        choice_of_law: Выбар заканадаўства
+        dmca_address: Фізічны адрас для абвестак DMCA/аўтарскага права
+        dmca_email: Адрас электроннай пошты для абвестак DMCA/аўтарскага права
+        domain: Дамен
         jurisdiction: Юрысдыкцыя
+        min_age: Мінімальны ўзрост
       user:
+        date_of_birth_1i: Дзень
+        date_of_birth_2i: Месяц
+        date_of_birth_3i: Год
         role: Роля
         time_zone: Часавы пояс
       user_role:
@@ -325,6 +381,10 @@ be:
         name: Назва
         permissions_as_keys: Дазволы
         position: Прыярытэт
+      username_block:
+        allow_with_approval: Дазваляць рэгістрацыі з ухваленнем
+        comparison: Метад параўнання
+        username: Словы, з якімі трэба параўноўваць
       webhook:
         events: Актыўныя падзеі
         template: Шаблон карыснай нагрузкі
diff --git a/config/locales/simple_form.bg.yml b/config/locales/simple_form.bg.yml
index 06f5440ee94..38e3c2a538f 100644
--- a/config/locales/simple_form.bg.yml
+++ b/config/locales/simple_form.bg.yml
@@ -56,11 +56,11 @@ bg:
         scopes: Указва до кои API има достъп приложението. Ако изберете диапазон от най-високо ниво, няма нужда да избирате индивидуални.
         setting_aggregate_reblogs: Без показване на нови подсилвания за публикации, които са неотдавна подсилени (засяга само новополучени подсилвания)
         setting_always_send_emails: Обикновено известията по имейл няма да са изпратени при дейна употреба на Mastodon
-        setting_default_quote_policy: Споменатите потребители винаги им е позволено да цитират. Тази настройка ще се отрази за публикациите, създадени със следващата версия на Mastodon, но може да изберете предпочитанията си в подготовката
         setting_default_sensitive: Деликатната мултимедия е скрита по подразбиране и може да се разкрие с едно щракване
         setting_display_media_default: Скриване на мултимедия отбелязана като деликатна
         setting_display_media_hide_all: Винаги скриване на мултимедията
         setting_display_media_show_all: Винаги показване на мултимедията
+        setting_emoji_style: Как се показват емоджита. "Автоматично" ще опита да използва естествените за системата емоджита, но се връща към Twemoji за остарели браузъри.
         setting_system_scrollbars_ui: Прилага се само към настолни браузъри, основаващи се на Safari и Chrome
         setting_use_blurhash: Преливането е въз основа на цветовете на скритите визуализации, но се замъгляват подробностите
         setting_use_pending_items: Да се показват обновявания на часовата ос само след щракване вместо автоматично превъртане на инфоканала
@@ -103,7 +103,6 @@ bg:
         status_page_url: Адресът на страницата, където хората могат да видят състоянието на този сървър по време на прекъсване
         theme: Темата, която излизащи от системата посетители и нови потребители виждат.
         thumbnail: Образ в съотношение около 2:1, показвано до информацията за сървъра ви.
-        timeline_preview: Излизащите от системата посетители ще може да разглеждат най-новите публични публикации, налични на сървъра.
         trendable_by_default: Прескачане на ръчния преглед на изгряващо съдържание. Отделни елементи още могат да се премахват от изгряващи постфактум.
         trends: В раздел „Налагащо се“ се показват публикации, хаштагове и новини, набрали популярност на сървъра ви.
         trends_as_landing_page: Показване на налагащото се съдържание за излизащите потребители и посетители вместо на описа на този сървър. Изисква налагащото се да бъде включено.
@@ -149,8 +148,8 @@ bg:
       user:
         chosen_languages: Само публикации на отметнатите езици ще се показват в публичните часови оси
         date_of_birth:
-          one: Трябва да се уверим, че сте поне на %{count}, за да употребявате Mastodon. Няма да съхраняваме това.
-          other: Трябва да се уверим, че сте поне на %{count}, за да употребявате Mastodon. Няма да съхраняваме това.
+          one: Трябва да се уверим, че сте поне на %{count}, за да употребявате %{domain}. Няма да съхраняваме това.
+          other: Трябва да се уверим, че сте поне на %{count}, за да употребявате %{domain}. Няма да съхраняваме това.
         role: Ролята управлява какви позволения има потребителят.
       user_role:
         color: Цветът, използван за ролите в потребителския интерфейс, като RGB в шестнадесетичен формат
@@ -158,6 +157,10 @@ bg:
         name: Публично име на ролята, ако ролята е зададена да се показва като значка
         permissions_as_keys: Потребители с тази роля ще имат достъп до...
         position: По-висшата роля може да разреши конфликти в някои ситуации. Някои действия могат да бъдат извършени само за роли с по-нисък приоритет
+      username_block:
+        allow_with_approval: Вместо напълно да се предотвратява регистрирането, съвпадащите регистрирания ще изискват одобрението ви
+        comparison: Имайте предвид проблема със Scunthorpe, блокирайки частично съвпаденията
+        username: Ще се намира съвпадение независимо от главните и малките букви и често срещаните приличащи си знаци като "4" за "a" или "3" за "e"
       webhook:
         events: Изберете събития за изпращане
         template: Съставете свой полезен товар на JSON посредством променлива интерполация. Оставете празно за подразбиращ се JSON.
@@ -230,7 +233,6 @@ bg:
         setting_auto_play_gif: Самопускащи се анимирани гифчета
         setting_boost_modal: Показване на прозорец за потвърждение преди подсилване
         setting_default_language: Език на публикуване
-        setting_default_privacy: Поверителност на публикуване
         setting_default_quote_policy: Кой може да цитира
         setting_default_sensitive: Все да се бележи мултимедията като деликатна
         setting_delete_modal: Показване на прозорче за потвърждение преди изтриване на публикация
@@ -240,6 +242,7 @@ bg:
         setting_display_media_default: Стандартно
         setting_display_media_hide_all: Скриване на всичко
         setting_display_media_show_all: Показване на всичко
+        setting_emoji_style: Стил на емоджито
         setting_expand_spoilers: Винаги разширяване на публикации, отбелязани с предупреждения за съдържание
         setting_hide_network: Скриване на социалния ви свързан граф
         setting_missing_alt_text_modal: Показване на диалогов прозорец потвърждение преди публикуване на мултимедия без алт. текст
@@ -294,7 +297,6 @@ bg:
         status_page_url: URL адрес на страница със състоянието
         theme: Стандартна тема
         thumbnail: Образче на сървъра
-        timeline_preview: Позволяване на неудостоверен достъп до публични инфопотоци
         trendable_by_default: Без преглед на налагащото се
         trends: Включване на налагащи се
         trends_as_landing_page: Употреба на налагащото се като целева страница
@@ -322,6 +324,7 @@ bg:
         follow_request: Някой пожела да ви последва
         mention: Някой ви спомена
         pending_account: Новите акаунти се нуждаят от преглед
+        quote: Някой ви цитира
         reblog: Някой подсили ваша публикация
         report: Новият доклад е подаден
         software_updates:
@@ -368,6 +371,10 @@ bg:
         name: Име
         permissions_as_keys: Разрешения
         position: Приоритет
+      username_block:
+        allow_with_approval: Позволяване на регистрации с одобрение
+        comparison: Начин на сравнение
+        username: Думи, които трябва да пасват
       webhook:
         events: Включване на събития
         template: Шаблон за полезен товар
diff --git a/config/locales/simple_form.br.yml b/config/locales/simple_form.br.yml
index f4d442cfdab..87065f9a0b6 100644
--- a/config/locales/simple_form.br.yml
+++ b/config/locales/simple_form.br.yml
@@ -2,12 +2,17 @@
 br:
   simple_form:
     hints:
+      account:
+        note: 'Gallout a rit @menegiñ tud all pe #gerioù-klik.'
       defaults:
         avatar: WEBP, PNG, GIF pe JPG. Bihanoc'h eget %{size}. A vo izelaet betek %{dimensions}px
+        email: Kaset e vo deoc'h ur postel kadarnaat
         header: WEBP, PNG, GIF pe JPG. Bihanoc'h eget %{size}. A vo izelaet betek %{dimensions}px
         password: Implijit 8 lizherennoù d'an neubeutañ
         setting_default_sensitive: Ar mediaoù kizidik a zo kuzhet dre ziouer ha gallout a reont bezañ diguzhet dre ur c'hlik
         setting_display_media_default: Kuzhat mediaoù aroueziet evel kizidik
+      form_admin_settings:
+        theme: Neuz a vez gwelet gant an implijerien·ezed nevez pe digevreet.
       form_challenge:
         current_password: Emaoc'h o tont-tre ul lec'h diogel
     labels:
@@ -15,6 +20,11 @@ br:
         fields:
           name: Label
           value: Endalc'h
+        show_collections: Diskwel an dud heuliet hag an heulierien·ezed war ar profil
+      account_alias:
+        acct: Anaouder ar gont gozh
+      account_migration:
+        acct: Anaouder ar gont nevez
       account_warning_preset:
         title: Titl
       admin_account_action:
@@ -27,6 +37,7 @@ br:
       announcement:
         all_day: Darvoud a-hed an devezh
         ends_at: Diwezh an darvoud
+        scheduled_at: Rakluniañ an embann
         starts_at: Deroù an darvoud
         text: Kemenn
       defaults:
@@ -46,16 +57,32 @@ br:
         note: Kinnig
         password: Ger-tremen
         phrase: Ger-alc'hwez pe frazenn
+        setting_default_language: Yezh an embann
+        setting_default_quote_policy: Piv a c'hall menegiñ
         setting_display_media_default: Dre ziouer
         setting_display_media_hide_all: Kuzhat pep tra
         setting_display_media_show_all: Diskouez pep tra
+        setting_emoji_style: Stil an emojioù
+        setting_system_font_ui: Implijout nodrezh dre ziouer ar reizhiad
+        setting_system_scrollbars_ui: Implijout barrenn dibunañ dre ziouer ar reizhiad
         setting_theme: Neuz al lec'hienn
         setting_use_pending_items: Mod gorrek
         title: Titl
+        type: Rizh an enporzhiañ
         username: Anv
+        username_or_email: Anv implijer pe postel
         whole_word: Ger a-bezh
       featured_tag:
-        name: Hashtag
+        name: Ger-klik
+      form_admin_settings:
+        app_icon: Arlun an arload
+        custom_css: CSS personelaet
+        favicon: Favicon
+        profile_directory: Gweredekaat roll ar profiloù
+        site_short_description: Deskrivadur ar servijer
+        site_terms: Reolennoù prevezded
+        site_title: Anv ar servijer
+        theme: Neuz dre ziouer
       invite:
         comment: Evezhiadenn
       invite_request:
@@ -65,21 +92,40 @@ br:
         ip: IP
         severity: Reolenn
       notification_emails:
+        favourite: Gant unan bennak eo bet ouzhpennet hoc'h embannadur d'h·e re vuiañ-karet
         follow: Heuliañ a ra {name} ac'hanoc'h
+        quote: Meneget oc'h bet gant unan bennak
+        reblog: Gant unan bennak eo bet skignet hoc'h embannadur
+        software_updates:
+          label: Un handelv nevez eus Mastodon a zo deuet er-maez
       rule:
         hint: Titouroù ouzhpenn
         text: Reolenn
       tag:
-        name: Hashtag
-        trendable: Aotren an hashtag-mañ da zont war wel dindan tuadurioù
+        name: Ger-klik
+        trendable: Aotren ar ger-klik-mañ da zont war wel dindan tuadurioù
+        usable: Aotren an embannadurioù da implijout ar ger-klik-mañ ent-lec'hel
+      terms_of_service_generator:
+        domain: Domani
+        jurisdiction: Barnadurezh
       user:
+        date_of_birth_1i: Devezh
+        date_of_birth_2i: Mizvezh
+        date_of_birth_3i: Bloavezh
         role: Roll
         time_zone: Gwerzhid eur
       user_role:
         name: Anv
+        permissions_as_keys: Aotreoù
+      webhook:
+        events: Darvoudoù gweredekaet
     'no': Ket
+    not_recommended: Ket erbedet
     recommended: Erbedet
     required:
       mark: "*"
       text: rekis
+    title:
+      sessions:
+        webauthn: Implijout unan eus hoc'h alc'hwezioù surentez da gevreañ
     'yes': Ya
diff --git a/config/locales/simple_form.ca.yml b/config/locales/simple_form.ca.yml
index 26205e3826c..a8cbf6bb90b 100644
--- a/config/locales/simple_form.ca.yml
+++ b/config/locales/simple_form.ca.yml
@@ -56,11 +56,13 @@ ca:
         scopes: API permeses per a accedir a l'aplicació. Si selecciones un àmbit de nivell superior, no cal que en seleccionis un d'individual.
         setting_aggregate_reblogs: No mostra els nous impulsos dels tuts que ja s'han impulsat recentment (només afecta als impulsos nous rebuts)
         setting_always_send_emails: Normalment, no s'enviarà cap notificació per correu electrònic mentre facis servir Mastodon
-        setting_default_quote_policy: Els usuaris mencionats sempre poden citar. Aquesta configuració només tindrà efecte en les publicacions creades amb la següent versió de Mastodon, però podeu seleccionar-ho en preparació
+        setting_default_quote_policy_private: Altres no poden citar publicacions fetes a Mastodon només per a seguidors.
+        setting_default_quote_policy_unlisted: Quan la gent et citi la seva publicació estarà amagada de les línies de temps de tendències.
         setting_default_sensitive: El contingut sensible està ocult per defecte i es pot mostrar fent-hi clic
         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_emoji_style: Com mostrar els emojis. "Automàtic" provarà de fer servir els emojis nadius, però revertirà a twemojis en els navegadors antics.
         setting_system_scrollbars_ui: S'aplica només als navegadors d'escriptori basats en Safari i Chrome
         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
@@ -103,7 +105,6 @@ ca:
         status_page_url: Enllaç de la pàgina on els usuaris poden veure l'estat d'aquest servidor durant una interrupció del servei
         theme: El tema que els visitants i els nous usuaris veuen.
         thumbnail: Una imatge d'aproximadament 2:1 que es mostra al costat la informació del teu servidor.
-        timeline_preview: Els visitants amb sessió no iniciada seran capaços de navegar per els tuts més recents en el teu servidor.
         trendable_by_default: Omet la revisió manual del contingut en tendència. Els articles individuals poden encara ser eliminats després del fet.
         trends: Les tendències mostren quins tuts, etiquetes i notícies estan guanyant força en el teu servidor.
         trends_as_landing_page: Mostra el contingut en tendència als usuaris i visitants no autenticats enlloc de la descripció d'aquest servidor. Requereix que les tendències estiguin activades.
@@ -149,8 +150,8 @@ ca:
       user:
         chosen_languages: Quan estigui marcat, només es mostraran els tuts de les llengües seleccionades en les línies de temps públiques
         date_of_birth:
-          one: Ens hem d'assegurar que teniu com a mínim %{count} any per a fer servir Mastodon. No ho desarem.
-          other: Ens hem d'assegurar que teniu com a mínim %{count} anys per a fer servir Mastodon. No ho desarem.
+          one: Ens hem d'assegurar que teniu com a mínim %{count} any per a fer servir %{domain}. No ho desarem.
+          other: Ens hem d'assegurar que teniu com a mínim %{count} anys per a fer servir %{domain}. No ho desarem.
         role: El rol controla quins permisos té l'usuari.
       user_role:
         color: Color que s'usarà per al rol a tota la interfície d'usuari, com a RGB en format hexadecimal
@@ -230,7 +231,7 @@ ca:
         setting_auto_play_gif: Reprodueix automàticament els GIF animats
         setting_boost_modal: Mostra la finestra de confirmació abans d'impulsar
         setting_default_language: Llengua dels tuts
-        setting_default_privacy: Privacitat dels tuts
+        setting_default_privacy: Visibilitat de la publicació
         setting_default_quote_policy: Qui pot citar
         setting_default_sensitive: Marcar sempre el contingut gràfic com a sensible
         setting_delete_modal: Mostra la finestra de confirmació abans d'esborrar un tut
@@ -240,6 +241,7 @@ ca:
         setting_display_media_default: Per defecte
         setting_display_media_hide_all: Amaga-ho tot
         setting_display_media_show_all: Mostra-ho tot
+        setting_emoji_style: Estil d'emojis
         setting_expand_spoilers: Desplega sempre els tuts marcats amb advertències de contingut
         setting_hide_network: Amaga la teva xarxa
         setting_missing_alt_text_modal: Mostra un diàleg de confirmació abans de publicar contingut sense text alternatiu
@@ -294,7 +296,6 @@ ca:
         status_page_url: Enllaç de la pàgina d'estat
         theme: Tema per defecte
         thumbnail: Miniatura del servidor
-        timeline_preview: Permet l'accés no autenticat a les línies de temps públiques
         trendable_by_default: Permet tendències sense revisió prèvia
         trends: Activa les tendències
         trends_as_landing_page: Fer servir les tendències com a pàgina inicial
@@ -322,6 +323,7 @@ ca:
         follow_request: Algú sol·licita seguir-te
         mention: Algú et menciona
         pending_account: Un nou compte necessita revisió
+        quote: Algú us ha citat
         reblog: Algú comparteix el teu estat
         report: S'ha enviat l'informe nou
         software_updates:
@@ -368,6 +370,8 @@ ca:
         name: Nom
         permissions_as_keys: Permisos
         position: Prioritat
+      username_block:
+        comparison: Mètode de comparació
       webhook:
         events: Esdeveniments activats
         template: Plantilla de càrrega
diff --git a/config/locales/simple_form.ckb.yml b/config/locales/simple_form.ckb.yml
index cfadea034da..0956460a6b1 100644
--- a/config/locales/simple_form.ckb.yml
+++ b/config/locales/simple_form.ckb.yml
@@ -129,7 +129,6 @@ ckb:
         setting_auto_play_gif: خۆکاربەخشکردنی GIFــەکان
         setting_boost_modal: پیشاندانی دیالۆگی دووپاتکردنەوە پێش دوبارە توتاندن
         setting_default_language: زمانی نووسراوەکانتان
-        setting_default_privacy: چوارچێوەی تایبەتێتی ئێوە
         setting_default_sensitive: هەمیشە نیشانکردنی میدیا وەک هەستیار
         setting_delete_modal: نیساندانی پەیامی پەسەند کردن پاش سڕینەوە
         setting_disable_swiping: جوڵەی سڕینەوە لە کاربخە
diff --git a/config/locales/simple_form.co.yml b/config/locales/simple_form.co.yml
index 06c993f406a..b4d15c8a1ab 100644
--- a/config/locales/simple_form.co.yml
+++ b/config/locales/simple_form.co.yml
@@ -130,7 +130,6 @@ co:
         setting_auto_play_gif: Lettura autumatica di i GIF animati
         setting_boost_modal: Mustrà una cunfirmazione per sparte un statutu
         setting_default_language: Lingua di pubblicazione
-        setting_default_privacy: Cunfidenzialità di i statuti
         setting_default_sensitive: Sempre cunsiderà media cum’è sensibili
         setting_delete_modal: Mustrà une cunfirmazione per toglie un statutu
         setting_disable_swiping: Disattivà e sculiscere
diff --git a/config/locales/simple_form.cs.yml b/config/locales/simple_form.cs.yml
index 7af8c1ce7cb..93d6b202d8e 100644
--- a/config/locales/simple_form.cs.yml
+++ b/config/locales/simple_form.cs.yml
@@ -56,11 +56,13 @@ cs:
         scopes: Která API bude aplikace moct používat. Pokud vyberete rozsah nejvyššího stupně, nebudete je muset vybírat jednotlivě.
         setting_aggregate_reblogs: Nezobrazovat nové boosty pro příspěvky, které byly nedávno boostnuty (ovlivňuje pouze nově přijaté boosty)
         setting_always_send_emails: Jinak nebudou e-mailové notifikace posílány, když Mastodon aktivně používáte
-        setting_default_quote_policy: Zmínení uživatelé mají vždy povoleno citovat. Toto nastavení se projeví pouze u příspěvků vytvořených s další verzí Mastodonu, ale můžete si vybrat vaše předvolby v předstihu
+        setting_default_quote_policy_private: Příspěvky pouze pro sledující, které jsou vytvořeny na Mastodonu, nemohou být citovány ostatními.
+        setting_default_quote_policy_unlisted: Když vás lidé citují, jejich příspěvek bude v časové ose populárních příspěvků také skryt.
         setting_default_sensitive: Citlivá média jsou ve výchozím stavu skryta a mohou být zobrazena kliknutím
         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_emoji_style: Jak se budou zobrazovat emoji. "Auto" zkusí použít výchozí emoji, ale pro starší prohlížeče použije Twemoji.
         setting_system_scrollbars_ui: Platí pouze pro desktopové prohlížeče založené na Safari nebo Chrome
         setting_use_blurhash: Gradienty jsou vytvořeny na základě barvev skrytých médií, ale zakrývají veškeré detaily
         setting_use_pending_items: Aktualizovat časovou osu až po kliknutí namísto automatického rolování kanálu
@@ -103,7 +105,6 @@ cs:
         status_page_url: URL stránky, kde mohou lidé vidět stav tohoto serveru během výpadku
         theme: Vzhled stránky, který vidí noví a odhlášení uživatelé.
         thumbnail: Přibližně 2:1 obrázek zobrazený vedle informací o vašem serveru.
-        timeline_preview: Odhlášení uživatelé budou moci procházet nejnovější veřejné příspěvky na serveru.
         trendable_by_default: Přeskočit manuální kontrolu populárního obsahu. Jednotlivé položky mohou být odstraněny z trendů později.
         trends: Trendy zobrazují, které příspěvky, hashtagy a zprávy získávají na serveru pozornost.
         trends_as_landing_page: Zobrazit populární obsah odhlášeným uživatelům a návštěvníkům místo popisu tohoto serveru. Vyžaduje povolení trendů.
@@ -150,10 +151,10 @@ cs:
       user:
         chosen_languages: Po zaškrtnutí budou ve veřejných časových osách zobrazeny pouze příspěvky ve zvolených jazycích
         date_of_birth:
-          few: Musíme se ujistit, že je Vám alespoň %{count}, abyste mohli používat Mastodon. Nebudeme to ukládat.
-          many: Musíme se ujistit, že je Vám alespoň %{count} let, abyste mohli používat Mastodon. Nebudeme to ukládat.
-          one: Musíme se ujistit, že je Vám alespoň %{count} rok, abyste mohli používat Mastodon. Nebudeme to ukládat.
-          other: Musíme se ujistit, že je Vám alespoň %{count} let, abyste mohli používat Mastodon. Nebudeme to ukládat.
+          few: Musíme se ujistit, že je Vám alespoň %{count}, abyste mohli používat %{domain}. Nebudeme to ukládat.
+          many: Musíme se ujistit, že je Vám alespoň %{count} let, abyste mohli používat %{domain}. Nebudeme to ukládat.
+          one: Musíme se ujistit, že je Vám alespoň %{count} rok, abyste mohli používat %{domain}. Nebudeme to ukládat.
+          other: Musíme se ujistit, že je Vám alespoň %{count}, abyste mohli používat %{domain}. Nebudeme to ukládat.
         role: Role určuje, která oprávnění uživatel má.
       user_role:
         color: Barva, která má být použita pro roli v celém UI, jako RGB v hex formátu
@@ -161,6 +162,10 @@ cs:
         name: Veřejný název role, pokud má být role zobrazena jako odznak
         permissions_as_keys: Uživatelé s touto rolí budou moci...
         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
+      username_block:
+        allow_with_approval: Namísto toho, aby se zabránilo registraci, bude vyžadováno vaše schválení
+        comparison: Mějte prosím na paměti 'Scunthorpe problém' při blokování částečných shod
+        username: Bude součástí shod bez ohledu na kapitalizace a běžné homoglyfy jako "4" pro "a" nebo "3" pro "e"
       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é.
@@ -233,7 +238,7 @@ cs:
         setting_auto_play_gif: Automaticky přehrávat animace GIF
         setting_boost_modal: Před boostnutím zobrazovat potvrzovací okno
         setting_default_language: Jazyk příspěvků
-        setting_default_privacy: Soukromí příspěvků
+        setting_default_privacy: Viditelnost příspěvků
         setting_default_quote_policy: Kdo může citovat
         setting_default_sensitive: Vždy označovat média jako citlivá
         setting_delete_modal: Před smazáním příspěvku zobrazovat potvrzovací dialog
@@ -243,6 +248,7 @@ cs:
         setting_display_media_default: Výchozí
         setting_display_media_hide_all: Skrýt vše
         setting_display_media_show_all: Zobrazit vše
+        setting_emoji_style: Styl emoji
         setting_expand_spoilers: Vždy rozbalit příspěvky označené varováními o obsahu
         setting_hide_network: Skrýt mou síť
         setting_missing_alt_text_modal: Zobrazit potvrzovací dialog před odesláním médií bez alt textu
@@ -279,12 +285,16 @@ cs:
         content_cache_retention_period: Doba uchovávání vzdáleného obsahu
         custom_css: Vlastní CSS
         favicon: Favicon
+        local_live_feed_access: Přístup k live kanálům s lokálními příspěvky
+        local_topic_feed_access: Přístup ke kanálům s hashtagy a odkazy s lokálními příspěvky
         mascot: Vlastní maskot (zastaralé)
         media_cache_retention_period: Doba uchovávání mezipaměti médií
         min_age: Minimální věková hranice
         peers_api_enabled: Zveřejnit seznam nalezených serverů v API
         profile_directory: Povolit adresář profilů
         registrations_mode: Kdo se může přihlásit
+        remote_live_feed_access: Přístup k live kanálům s vzdálenými příspěvky
+        remote_topic_feed_access: Přístup ke kanálům s hashtagy a odkazy se vzdálenými příspěvky
         require_invite_text: Požadovat důvod pro připojení
         show_domain_blocks: Zobrazit blokace domén
         show_domain_blocks_rationale: Zobrazit proč byly blokovány domény
@@ -297,7 +307,6 @@ cs:
         status_page_url: URL stránky se stavem
         theme: Výchozí motiv
         thumbnail: Miniatura serveru
-        timeline_preview: Povolit neověřený přístup k veřejným časovým osám
         trendable_by_default: Povolit trendy bez předchozí revize
         trends: Povolit trendy
         trends_as_landing_page: Použít trendy jako vstupní stránku
@@ -325,6 +334,7 @@ cs:
         follow_request: Někdo požádal o možnost vás sledovat
         mention: Někdo vás zmínil
         pending_account: Je třeba posoudit nový účet
+        quote: Někdo vás citoval
         reblog: Někdo boostnul váš příspěvek
         report: Je odesláno nové hlášení
         software_updates:
@@ -371,6 +381,10 @@ cs:
         name: Název
         permissions_as_keys: Oprávnění
         position: Priorita
+      username_block:
+        allow_with_approval: Povolit registrace se schválením
+        comparison: Srovnávací metoda
+        username: Na základě slov
       webhook:
         events: Zapnuté události
         template: Šablona payloadu
diff --git a/config/locales/simple_form.cy.yml b/config/locales/simple_form.cy.yml
index f935ac99f74..1c37bcbedbe 100644
--- a/config/locales/simple_form.cy.yml
+++ b/config/locales/simple_form.cy.yml
@@ -56,11 +56,13 @@ cy:
         scopes: Pa APIs y bydd y rhaglen yn cael mynediad iddynt. Os dewiswch gwmpas lefel uchaf, nid oes angen i chi ddewis rhai unigol.
         setting_aggregate_reblogs: Peidiwch â dangos hybiau newydd ar bostiadau sydd wedi cael eu hybu'n ddiweddar (dim ond yn effeithio ar hybiau newydd ei dderbyn)
         setting_always_send_emails: Fel arfer ni fydd hysbysiadau e-bost yn cael eu hanfon pan fyddwch chi wrthi'n defnyddio Mastodon
-        setting_default_quote_policy: Mae defnyddwyr sy'n cael eu crybwyll yn cael dyfynnu bob amser. Dim ond ar gyfer postiadau a grëwyd gyda'r fersiwn nesaf o Mastodon y bydd y gosodiad hwn yn dod i rym, ond gallwch ddewis eich dewis wrth baratoi
+        setting_default_quote_policy_private: Does dim modd dyfynnu postiadau sydd wedi'u hysgrifennu ar Mastodon ar gyfer dim ond dilynwyr.
+        setting_default_quote_policy_unlisted: Pan fydd pobl yn eich dyfynnu, bydd eu postiad hefyd yn cael ei guddio rhag llinellau amser sy'n trendio.
         setting_default_sensitive: Mae cyfryngau sensitif wedi'u cuddio yn rhagosodedig a gellir eu datgelu trwy glicio
         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_emoji_style: Sut i arddangos emojis. Bydd "Awto" yn ceisio defnyddio emoji cynhenid, ond mae'n disgyn yn ôl i Twemoji ar gyfer porwyr traddodiadol.
         setting_system_scrollbars_ui: Yn berthnasol i borwyr bwrdd gwaith yn seiliedig ar Safari a Chrome yn unig
         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
@@ -103,7 +105,6 @@ cy:
         status_page_url: URL tudalen lle gall pobl weld statws y gweinydd hwn yn ystod cyfnod o doriad gwasanaeth
         theme: Thema sy'n allgofnodi ymwelwyr a defnyddwyr newydd yn gweld.
         thumbnail: Delwedd tua 2:1 yn cael ei dangos ochr yn ochr â manylion eich gweinydd.
-        timeline_preview: Bydd ymwelwyr sydd wedi allgofnodi yn gallu pori drwy'r postiadau cyhoeddus diweddaraf sydd ar gael ar y gweinydd.
         trendable_by_default: Hepgor adolygiad llaw o gynnwys sy'n tueddu. Gall eitemau unigol gael eu tynnu o dueddiadau o hyd ar ôl y ffaith.
         trends: Mae pynciau llosg yn dangos y postiadau, hashnodau, a newyddion sy'n denu sylw ar eich gweinydd.
         trends_as_landing_page: Dangos cynnwys tueddiadol i ddefnyddwyr ac ymwelwyr sydd wedi allgofnodi yn lle disgrifiad o'r gweinydd hwn. Mae angen galluogi tueddiadau.
@@ -150,12 +151,12 @@ cy:
       user:
         chosen_languages: Wedi eu dewis, dim ond tŵtiau yn yr ieithoedd hyn bydd yn cael eu harddangos mewn ffrydiau cyhoeddus
         date_of_birth:
-          few: Mae'n rhai i ni wneud yn siŵr eich bod o leiaf yn %{count} i ddefnyddio Mastodon. Fyddwn ni ddim yn cadw hwn.
-          many: Mae'n rhai i ni wneud yn siŵr eich bod o leiaf yn %{count} i ddefnyddio Mastodon. Fyddwn ni ddim yn cadw hwn.
-          one: Mae'n rhai i ni wneud yn siŵr eich bod o leiaf yn %{count} i ddefnyddio Mastodon. Fyddwn ni ddim yn cadw hwn.
-          other: Mae'n rhai i ni wneud yn siŵr eich bod o leiaf yn %{count} i ddefnyddio Mastodon. Fyddwn ni ddim yn cadw hwn.
-          two: Mae'n rhai i ni wneud yn siŵr eich bod o leiaf yn %{count} i ddefnyddio Mastodon. Fyddwn ni ddim yn cadw hwn.
-          zero: Gwnewch yn siŵr eich bod o leiaf yn %{count} i ddefnyddio Mastodon. Fyddwn ni ddim yn cadw hwn.
+          few: Mae'n rhaid i ni sicrhau eich bod chi yn o leiaf %{count} oed i ddefnyddio %{domain}. Fyddwn ni ddim yn cadw hyn.
+          many: Mae'n rhaid i ni sicrhau eich bod chi yn o leiaf %{count} oed i ddefnyddio %{domain}. Fyddwn ni ddim yn cadw hyn.
+          one: Mae'n rhaid i ni sicrhau eich bod chi yn o leiaf %{count} oed i ddefnyddio %{domain}. Fyddwn ni ddim yn cadw hyn.
+          other: Mae'n rhaid i ni sicrhau eich bod chi yn o leiaf %{count} oed i ddefnyddio %{domain}. Fyddwn ni ddim yn cadw hyn.
+          two: Mae'n rhaid i ni sicrhau eich bod chi yn o leiaf %{count} oed i ddefnyddio %{domain}. Fyddwn ni ddim yn cadw hyn.
+          zero: Mae'n rhaid i ni sicrhau eich bod chi yn o leiaf %{count} oed i ddefnyddio %{domain}. Fyddwn ni ddim yn cadw hyn.
         role: Mae'r rôl yn rheoli pa ganiatâd sydd gan y defnyddiwr.
       user_role:
         color: Lliw i'w ddefnyddio ar gyfer y rôl drwy'r UI, fel RGB mewn fformat hecs
@@ -163,6 +164,10 @@ cy:
         name: Enw cyhoeddus y rôl, os yw'r rôl wedi'i gosod i'w dangos fel bathodyn
         permissions_as_keys: Bydd defnyddwyr sydd â'r rôl hon yn cael mynediad at...
         position: Mae rôl uwch yn penderfynu ar ddatrys gwrthdrawiadau mewn rhai sefyllfaoedd. Dim ond ar rolau â blaenoriaeth is y gellir cyflawni rhai gweithredoedd
+      username_block:
+        allow_with_approval: Yn lle atal cofrestru’n llwyr, bydd angen eich cymeradwyaeth rhag cofrestru cyfatebol
+        comparison: Byddwch yn ymwybodol o Broblem Scunthorpe wrth rwystro cyfatebion rhannol
+        username: Bydd yn cael ei gyfatebu waeth beth fo'r nodau bach a mawr a homoglyffau cyffredin fel "4" ar gyfer "a" neu "3" ar gyfer "e"
       webhook:
         events: Dewiswch ddigwyddiadau i'w hanfon
         template: Cyfansoddwch eich llwyth tâl JSON eich hun gan ddefnyddio rhyngosod newidiol. Gadewch yn wag ar gyfer JSON rhagosodedig.
@@ -235,7 +240,7 @@ cy:
         setting_auto_play_gif: Chwarae GIFs wedi'u hanimeiddio yn awtomatig
         setting_boost_modal: Dangos deialog cadarnhau cyn rhoi hwb
         setting_default_language: Iaith postio
-        setting_default_privacy: Preifatrwydd cyhoeddi
+        setting_default_privacy: Gwelededd postio
         setting_default_quote_policy: Pwy sy'n gallu dyfynnu
         setting_default_sensitive: Marcio cyfryngau fel eu bod yn sensitif bob tro
         setting_delete_modal: Dangos deialog cadarnhau cyn dileu postiad
@@ -245,6 +250,7 @@ cy:
         setting_display_media_default: Rhagosodiad
         setting_display_media_hide_all: Cuddio popeth
         setting_display_media_show_all: Dangos popeth
+        setting_emoji_style: Arddull Emojis
         setting_expand_spoilers: Dangos postiadau wedi'u marcio â rhybudd cynnwys bob tro
         setting_hide_network: Cuddio eich graff cymdeithasol
         setting_missing_alt_text_modal: Dangos deialog cadarnhau cyn postio cyfrwng heb destun amgen
@@ -276,17 +282,21 @@ cy:
         activity_api_enabled: Cyhoeddi ystadegau cyfanredol am weithgarwch defnyddwyr yn yr API
         app_icon: Eicon ap
         backups_retention_period: Cyfnod cadw archif defnyddwyr
-        bootstrap_timeline_accounts: Argymhellwch y cyfrifon hyn i ddefnyddwyr newydd bob amser
+        bootstrap_timeline_accounts: Argymhellwch y cyfrifon hyn i ddefnyddwyr newydd bob tro
         closed_registrations_message: Neges bersonol pan nad yw cofrestriadau ar gael
         content_cache_retention_period: Cyfnod cadw cynnwys o bell
         custom_css: CSS cyfaddas
         favicon: Favicon
+        local_live_feed_access: Mynediad i ffrydiau byw sy'n cynnwys postiadau lleol
+        local_topic_feed_access: Mynediad i ffrydiau hashnod a dolenni sy'n cynnwys postiadau lleol
         mascot: Mascot cyfaddas (hen)
         media_cache_retention_period: Cyfnod cadw storfa cyfryngau
         min_age: Gofyniad oed ieuengaf
         peers_api_enabled: Cyhoeddi rhestr o weinyddion a ddarganfuwyd yn yr API
         profile_directory: Galluogi cyfeiriadur proffil
         registrations_mode: Pwy all gofrestru
+        remote_live_feed_access: Mynediad i ffrydiau byw sy'n cynnwys postiadau pell
+        remote_topic_feed_access: Mynediad i ffrydiau hashnod a dolenni sy'n cynnwys postiadau o bell
         require_invite_text: Gofyn am reswm i ymuno
         show_domain_blocks: Dangos blociau parth
         show_domain_blocks_rationale: Dangos pam y cafodd parthau eu rhwystro
@@ -299,7 +309,6 @@ cy:
         status_page_url: URL tudalen statws
         theme: Thema ragosodedig
         thumbnail: Bawdlun y gweinydd
-        timeline_preview: Caniatáu mynediad heb ei ddilysu i linellau amser cyhoeddus
         trendable_by_default: Caniatáu pynciau llosg heb adolygiad
         trends: Galluogi pynciau llosg
         trends_as_landing_page: Defnyddio tueddiadau fel y dudalen gartref
@@ -327,6 +336,7 @@ cy:
         follow_request: Mae rhywun yn ceisio eich dilyn chi
         mention: Mae rhywun yn sôn amdanoch chi
         pending_account: Mae cyfrif newydd angen adolygiad
+        quote: Dyfynnodd rhywun chi
         reblog: Mae rhywun wedi hybu eich postiad
         report: Cyflwynwyd adroddiad newydd
         software_updates:
@@ -373,6 +383,10 @@ cy:
         name: Enw
         permissions_as_keys: Caniatâd
         position: Blaenoriaeth
+      username_block:
+        allow_with_approval: Caniatáu cofrestru gyda chymeradwyaeth
+        comparison: Dull cymharu
+        username: Gair i gyfatebu
       webhook:
         events: Digwyddiadau wedi'u galluogi
         template: Templed prif lwyth
diff --git a/config/locales/simple_form.da.yml b/config/locales/simple_form.da.yml
index 7ac8816d914..7b15510e03c 100644
--- a/config/locales/simple_form.da.yml
+++ b/config/locales/simple_form.da.yml
@@ -9,8 +9,8 @@ da:
         fields: Din hjemmeside, dine pronominer, din alder, eller hvad du har lyst til.
         indexable: Dine offentlige indlæg vil kunne vises i Mastodon-søgeresultater. Folk, som har interageret med dem, vil kunne finde dem uanset.
         note: 'Du kan @omtale andre personer eller #hashtags.'
-        show_collections: Folk vil ikke kunne tjekke dine Følger og Følgere. Folk, du selv følger, vil stadig kunne se dette.
-        unlocked: Man vil kunne følges af folk uden først at godkende dem. Ønsker man at gennemgå Følg-anmodninger og individuelt acceptere/afvise nye følgere, så fjern markeringen.
+        show_collections: Folk vil kunne se, hvem du følger, og hvem der følger dig. Personer, som du følger, vil kunne se, at du følger dem.
+        unlocked: Folk vil kunne følge dig uden at anmode om godkendelse. Fjern markeringen, hvis du vil gennemgå anmodninger om at følge, og vælge, om du vil acceptere eller afvise nye følgere.
       account_alias:
         acct: Angiv brugernavn@domain for den konto, hvorfra du vil flytte
       account_migration:
@@ -56,12 +56,14 @@ da:
         scopes: De API'er, som applikationen vil kunne tilgå. Vælges en topniveaudstrækning, vil detailvalg være unødvendige.
         setting_aggregate_reblogs: Vis ikke nye fremhævelser for nyligt fremhævede indlæg (påvirker kun nyligt modtagne fremhævelser)
         setting_always_send_emails: Normalt sendes ingen e-mailnotifikationer under aktivt brug af Mastodon
-        setting_default_quote_policy: Nævnte brugere har altid lov til at citere. Denne indstilling vil kun træde i kraft for indlæg oprettet med den næste Mastodon-version, men man kan som forberedelse vælge sin præference
+        setting_default_quote_policy_private: Kun-følgere indlæg forfattet på Mastodon kan ikke citeres af andre.
+        setting_default_quote_policy_unlisted: Når folk citerer dig, vil deres indlæg også blive skjult fra trendtidslinjer.
         setting_default_sensitive: Sensitive medier er som standard skjult og kan vises med et klik
         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_system_scrollbars_ui: Gælder kun for computerwebbrowsere baseret på Safari og Chrome
+        setting_emoji_style: Hvordan emojis skal vises. "Auto" vil forsøge at bruge indbyggede emojis, men skifter tilbage til Twemoji i ældre webbrowsere.
+        setting_system_scrollbars_ui: Gælder kun for desktop-browsere baseret på Safari og Chrome
         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
@@ -74,7 +76,7 @@ da:
       featured_tag:
         name: 'Her er nogle af dine hyppigst brugte hashtags:'
       filters:
-        action: Vælg handlingen til eksekvering, når et indlæg matcher filteret
+        action: Vælg, hvilken handling, der skal udføres, når et indlæg matcher filteret
         actions:
           blur: Skjul medier bag en advarsel, uden at skjule selve teksten
           hide: Skjul det filtrerede indhold fuldstændigt og gør, som om det ikke eksisterer
@@ -103,7 +105,6 @@ da:
         status_page_url: URL'en til en side, hvor status for denne server kan ses under en afbrydelse
         theme: Tema, som udloggede besøgende og nye brugere ser.
         thumbnail: Et ca. 2:1 billede vist sammen med serveroplysningerne.
-        timeline_preview: Udloggede besøgende kan gennemse serverens seneste offentlige indlæg.
         trendable_by_default: Spring manuel gennemgang af trendindhold over. Individuelle elementer kan stadig fjernes fra trends efter kendsgerningen.
         trends: Tendenser viser, hvilke indlæg, hashtags og nyheder opnår momentum på serveren.
         trends_as_landing_page: Vis tendensindhold til udloggede brugere og besøgende i stedet for en beskrivelse af denne server. Kræver, at tendenser er aktiveret.
@@ -150,8 +151,8 @@ da:
       user:
         chosen_languages: Når markeret, vil kun indlæg på de valgte sprog fremgå på offentlige tidslinjer
         date_of_birth:
-          one: Vi er nødt til at sikre, at man er fyldt %{count} for at bruge Mastodon. Denne information gemmes ikke.
-          other: Vi er nødt til at sikre, at man er fyldt %{count} for at bruge Mastodon. Denne information gemmes ikke.
+          one: Vi skal sikre os, at du er mindst %{count} for at kunne bruge %{domain}. Informationen gemmes ikke.
+          other: Vi skal sikre os, at du er mindst %{count} for at kunne bruge %{domain}. Informationen gemmes ikke.
         role: Rollen styrer, hvilke tilladelser brugeren er tildelt.
       user_role:
         color: Farven, i RGB hex-format, der skal bruges til rollen i hele UI'en
@@ -159,6 +160,10 @@ da:
         name: Offentligt rollennavn, hvis rollen er opsat til fremstå som et badge
         permissions_as_keys: Brugere med denne rolle vil kunne tilgå...
         position: Højere rolle bestemmer konfliktløsning i visse situationer. Visse handlinger kan kun udføres på roller med lavere prioritet
+      username_block:
+        allow_with_approval: I stedet for at forhindre tilmelding helt, vil matchende tilmeldinger kræve din godkendelse
+        comparison: Vær opmærksom på Scunthorpe-problemet ved blokering af delvise match
+        username: Matches uanset minuskel/majuskel-brug og alm. homoglyffer, såsom "4" for "a" eller "3" for "e"
       webhook:
         events: Vælg begivenheder at sende
         template: Skriv din egen JSON nyttelast ved hjælp af variabel interpolation. Lad feltet stå tomt for standard JSON.
@@ -231,8 +236,8 @@ da:
         setting_auto_play_gif: Autoafspil animerede GIF'er
         setting_boost_modal: Vis bekræftelsesdialog inden fremhævelse
         setting_default_language: Sprog for indlæg
-        setting_default_privacy: Fortrolighed for indlæg
-        setting_default_quote_policy: Hvem, som kan citere
+        setting_default_privacy: Indlægssynlighed
+        setting_default_quote_policy: Hvem kan citere
         setting_default_sensitive: Markér altid medier som sensitive
         setting_delete_modal: Vis bekræftelsesdialog før et indlæg slettes
         setting_disable_hover_cards: Deaktivér profilforhåndsvisning ved svæv (hover)
@@ -241,6 +246,7 @@ da:
         setting_display_media_default: Standard
         setting_display_media_hide_all: Skjul alle
         setting_display_media_show_all: Vis alle
+        setting_emoji_style: Emoji-stil
         setting_expand_spoilers: Udvid altid indlæg markeret med indholdsadvarsler
         setting_hide_network: Skjul din sociale graf
         setting_missing_alt_text_modal: Vis bekræftelsesdialog inden medier uden alt-tekst lægges op
@@ -277,12 +283,16 @@ da:
         content_cache_retention_period: Opbevaringsperiode for eksternt indhold
         custom_css: Tilpasset CSS
         favicon: Favikon
+        local_live_feed_access: Adgang til live feeds med lokale indlæg
+        local_topic_feed_access: Adgang til hashtag- og link-feeds med lokale indlæg
         mascot: Tilpasset maskot (ældre funktion)
         media_cache_retention_period: Media-cache opbevaringsperiode
         min_age: Minimums alderskrav
         peers_api_enabled: Udgiv liste over fundne server i API'en
         profile_directory: Aktivér profiloversigt
         registrations_mode: Hvem, der kan tilmelde sig
+        remote_live_feed_access: Adgang til live feeds med eksterne indlæg
+        remote_topic_feed_access: Adgang til hashtag- og link-feeds med eksterne indlæg
         require_invite_text: Kræv tilmeldingsbegrundelse
         show_domain_blocks: Vis domæneblokeringer
         show_domain_blocks_rationale: Vis, hvorfor domæner blev blokeret
@@ -295,7 +305,6 @@ da:
         status_page_url: Statusside-URL
         theme: Standardtema
         thumbnail: Serverminiaturebillede
-        timeline_preview: Tillad ikke-godkendt adgang til offentlige tidslinjer
         trendable_by_default: Tillad ikke-reviderede trends
         trends: Aktivér trends
         trends_as_landing_page: Brug tendenser som destinationssiden
@@ -323,6 +332,7 @@ da:
         follow_request: Nogen anmodede om at følge dig
         mention: Nogen omtalte dig
         pending_account: Ny konto kræver gennemgang
+        quote: Nogen citerede dig
         reblog: Nogen fremhævede dit indlæg
         report: Ny anmeldelse indsendt
         software_updates:
@@ -369,6 +379,10 @@ da:
         name: Navn
         permissions_as_keys: Tilladelser
         position: Prioritet
+      username_block:
+        allow_with_approval: Tillad registreringer med godkendelse
+        comparison: Sammenligningsmetode
+        username: Ord, som skal matches
       webhook:
         events: Aktive begivenheder
         template: Payload skabelon
diff --git a/config/locales/simple_form.de.yml b/config/locales/simple_form.de.yml
index 9f65a474b04..fac3892a902 100644
--- a/config/locales/simple_form.de.yml
+++ b/config/locales/simple_form.de.yml
@@ -48,7 +48,7 @@ de:
         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: WEBP, 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
+        inbox_url: Kopiere die URL von der Startseite des gewünschten Relais
         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
         password: Verwende mindestens 8 Zeichen
@@ -56,11 +56,13 @@ de:
         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: Beiträge, die erst kürzlich geteilt wurden, werden nicht noch einmal angezeigt (betrifft nur zukünftig geteilte Beiträge)
         setting_always_send_emails: Normalerweise werden Benachrichtigungen nicht per E-Mail versendet, wenn du gerade auf Mastodon aktiv bist
-        setting_default_quote_policy: Erwähnte Profile dürfen immer zitieren. Diese Einstellung gilt nur für Beiträge, die mit der zukünftigen Mastodon-Version erstellt wurden. Als Vorbereitung darauf kannst du bereits jetzt die Einstellung vornehmen
+        setting_default_quote_policy_private: Beiträge, die nur für deine Follower bestimmt sind und auf Mastodon verfasst wurden, können nicht von anderen zitiert werden.
+        setting_default_quote_policy_unlisted: Sollten dich andere zitieren, werden ihre zitierten Beiträge ebenfalls nicht in den Trends und öffentlichen Timelines angezeigt.
         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_emoji_style: 'Wie Emojis dargestellt werden: „Automatisch“ verwendet native Emojis, für veraltete Browser wird jedoch Twemoji verwendet.'
         setting_system_scrollbars_ui: Betrifft nur Desktop-Browser, die auf Chrome oder Safari basieren
         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
@@ -103,7 +105,6 @@ de:
         status_page_url: Link zu einer Internetseite, auf der der Serverstatus während eines Ausfalls angezeigt wird
         theme: Das Design, das abgemeldete Besucher und neue Benutzer sehen.
         thumbnail: Ein Bild ungefähr im 2:1-Format, das neben den Server-Informationen angezeigt wird.
-        timeline_preview: Nicht angemeldete Personen können die neuesten öffentlichen Beiträge dieses Servers aufrufen.
         trendable_by_default: Manuelles Überprüfen angesagter Inhalte überspringen. Einzelne Elemente können später noch aus den Trends entfernt werden.
         trends: Trends zeigen, welche Beiträge, Hashtags und Nachrichten auf deinem Server immer beliebter werden.
         trends_as_landing_page: Dies zeigt nicht angemeldeten Personen Trendinhalte anstelle einer Beschreibung des Servers an. Erfordert, dass Trends aktiviert sind.
@@ -150,8 +151,8 @@ de:
       user:
         chosen_languages: Wenn du hier eine oder mehrere Sprachen auswählst, werden ausschließlich Beiträge in diesen Sprachen in deinen öffentlichen Timelines angezeigt
         date_of_birth:
-          one: Wir müssen sicherstellen, dass du mindestens %{count} Jahre alt bist, um Mastodon nutzen zu können. Wir werden diese Information nicht aufbewahren.
-          other: Wir müssen sicherstellen, dass du mindestens %{count} Jahre alt bist, um Mastodon nutzen zu können. Wir werden diese Information nicht aufbewahren.
+          one: Wir müssen sicherstellen, dass du mindestens %{count} Jahr alt bist, um %{domain} verwenden zu können. Wir werden diese Information nicht aufbewahren.
+          other: Wir müssen sicherstellen, dass du mindestens %{count} Jahre alt bist, um %{domain} verwenden zu können. Wir werden diese Information nicht aufbewahren.
         role: Die Rolle bestimmt, welche Berechtigungen das Konto hat.
       user_role:
         color: Farbe, die für diese Rolle in der gesamten Benutzerschnittstelle verwendet wird, als RGB im Hexadezimalsystem
@@ -159,6 +160,10 @@ de:
         name: Name der Rolle, der auch öffentlich als Badge angezeigt wird, sofern dies unten aktiviert ist
         permissions_as_keys: Benutzer*innen mit dieser Rolle haben Zugriff auf...
         position: Höhere Rollen entscheiden über Konfliktlösungen zu gewissen Situationen. Bestimmte Aktionen können nur mit geringfügigeren Rollen durchgeführt werden
+      username_block:
+        allow_with_approval: Anstatt Registrierungen komplett zu verhindern, benötigen übereinstimmende Treffer eine Genehmigung
+        comparison: Bitte beachte das Scunthorpe-Problem, wenn teilweise übereinstimmende Treffer gesperrt werden
+        username: Abgleich erfolgt unabhängig der Groß- und Kleinschreibung sowie gängiger Homoglyphen („4“ für „a“ oder „3“ für „e“)
       webhook:
         events: Zu sendende Ereignisse auswählen
         template: Erstelle deine eigenen JSON-Nutzdaten mit Hilfe von Variablen-Interpolation. Leer lassen für Standard-JSON.
@@ -216,7 +221,7 @@ de:
         fields: Zusatzfelder
         header: Titelbild
         honeypot: "%{label} (nicht ausfüllen)"
-        inbox_url: URL des Relay-Posteingangs
+        inbox_url: URL des Relais-Posteingangs
         irreversible: Endgültig, nicht nur temporär ausblenden
         locale: Sprache des Webinterface
         max_uses: Maximale Anzahl von Verwendungen
@@ -232,7 +237,7 @@ de:
         setting_boost_modal: Bestätigungsdialog beim Teilen eines Beitrags anzeigen
         setting_default_language: Beitragssprache
         setting_default_privacy: Beitragssichtbarkeit
-        setting_default_quote_policy: Wer darf zitieren
+        setting_default_quote_policy: Wer zitieren darf
         setting_default_sensitive: Medien immer mit einer Inhaltswarnung versehen
         setting_delete_modal: Bestätigungsdialog beim Löschen eines Beitrags anzeigen
         setting_disable_hover_cards: Profilvorschau deaktivieren, wenn die Maus über das Profil bewegt wird
@@ -241,12 +246,13 @@ de:
         setting_display_media_default: Standard
         setting_display_media_hide_all: Alle Medien ausblenden
         setting_display_media_show_all: Alle Medien anzeigen
+        setting_emoji_style: Emoji-Stil
         setting_expand_spoilers: Beiträge mit Inhaltswarnung immer ausklappen
         setting_hide_network: Follower und „Folge ich“ nicht anzeigen
         setting_missing_alt_text_modal: Bestätigungsdialog anzeigen, bevor Medien ohne Bildbeschreibung veröffentlicht werden
         setting_reduce_motion: Bewegung in Animationen verringern
         setting_system_font_ui: Standardschriftart des Browsers verwenden
-        setting_system_scrollbars_ui: Bildlaufleiste des Systems verwenden
+        setting_system_scrollbars_ui: Bildlaufleiste des Betriebssystems verwenden
         setting_theme: Design
         setting_trends: Heutige Trends anzeigen
         setting_unfollow_modal: Bestätigungsdialog beim Entfolgen eines Profils anzeigen
@@ -277,12 +283,16 @@ de:
         content_cache_retention_period: Aufbewahrungsfrist für externe Inhalte
         custom_css: Eigenes CSS
         favicon: Favicon
+        local_live_feed_access: Zugriff auf Live-Feeds, die lokale Beiträge beinhalten
+        local_topic_feed_access: Zugriff auf Hashtags und Links, die lokale Beiträge beinhalten
         mascot: Benutzerdefiniertes Maskottchen (Legacy)
         media_cache_retention_period: Aufbewahrungsfrist für Medien im Cache
         min_age: Erforderliches Mindestalter
         peers_api_enabled: Die entdeckten Server im Fediverse über die API veröffentlichen
         profile_directory: Profilverzeichnis aktivieren
         registrations_mode: Wer darf ein neues Konto registrieren?
+        remote_live_feed_access: Zugriff auf Live-Feeds, die Beiträge externer Server beinhalten
+        remote_topic_feed_access: Zugriff auf Hashtags und Links, die Beiträge externer Server beinhalten
         require_invite_text: Begründung für Beitritt verlangen
         show_domain_blocks: Anzeigen, welche Domains gesperrt wurden
         show_domain_blocks_rationale: Anzeigen, weshalb Domains gesperrt wurden
@@ -295,7 +305,6 @@ de:
         status_page_url: Statusseite (URL)
         theme: Standard-Design
         thumbnail: Vorschaubild des Servers
-        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
@@ -323,6 +332,7 @@ de:
         follow_request: Jemand möchte mir folgen
         mention: Ich wurde erwähnt
         pending_account: Ein neues Konto muss überprüft werden
+        quote: Jemand zitierte dich
         reblog: Mein Beitrag wurde geteilt
         report: Eine neue Meldung wurde eingereicht
         software_updates:
@@ -369,6 +379,10 @@ de:
         name: Name
         permissions_as_keys: Berechtigungen
         position: Priorität
+      username_block:
+        allow_with_approval: Registrierungen mit Genehmigung zulassen
+        comparison: Vergleichsmethode
+        username: Übereinstimmendes Wort
       webhook:
         events: Aktivierte Ereignisse
         template: Nutzdaten-Vorlage
diff --git a/config/locales/simple_form.el.yml b/config/locales/simple_form.el.yml
index cfc9c218ce1..f65ad49793b 100644
--- a/config/locales/simple_form.el.yml
+++ b/config/locales/simple_form.el.yml
@@ -56,11 +56,13 @@ el:
         scopes: Ποια API θα επιτρέπεται στην εφαρμογή να χρησιμοποιήσεις. Αν επιλέξεις κάποιο υψηλό εύρος εφαρμογής, δε χρειάζεται να επιλέξεις και το καθένα ξεχωριστά.
         setting_aggregate_reblogs: Απόκρυψη των νέων αναρτήσεων για τις αναρτήσεις που έχουν ενισχυθεί πρόσφατα (επηρεάζει μόνο τις νέες ενισχύσεις)
         setting_always_send_emails: Κανονικά οι ειδοποιήσεις μέσω ηλεκτρονικού ταχυδρομείου δεν θα αποστέλλονται όταν χρησιμοποιείτε ενεργά το Mastodon
-        setting_default_quote_policy: Οι αναφερόμενοι χρήστες επιτρέπεται πάντα να παραθέτουν. Αυτή η ρύθμιση θα τεθεί σε ισχύ μόνο για αναρτήσεις που δημιουργήθηκαν με την επόμενη έκδοση Mastodon, αλλά μπορείς να επιλέξετε την προτίμησή σου κατά την προετοιμασία
+        setting_default_quote_policy_private: Αναρτήσεις για ακολούθους μόνο που έχουν συνταχθεί στο Mastodon, δεν μπορούν να γίνουν παράθεση από άλλους.
+        setting_default_quote_policy_unlisted: Όταν οι άνθρωποι σας παραθέτουν, η ανάρτησή τους θα είναι επίσης κρυμμένη από τις δημοφιλείς ροές.
         setting_default_sensitive: Τα ευαίσθητα πολυμέσα είναι κρυμμένα και εμφανίζονται με ένα κλικ
         setting_display_media_default: Απόκρυψη ευαίσθητων πολυμέσων
         setting_display_media_hide_all: Μόνιμη απόκρυψη όλων των πολυμέσων
         setting_display_media_show_all: Πάντα εμφάνιση πολυμέσων
+        setting_emoji_style: Πώς να εμφανίσετε emojis. Το "Αυτόματο" θα προσπαθήσει να χρησιμοποιήσει εγγενή emoji, αλλά πέφτει πίσω στο Twemoji για προγράμματα περιήγησης παλαιού τύπου.
         setting_system_scrollbars_ui: Ισχύει μόνο για προγράμματα περιήγησης υπολογιστή με βάση το Safari και το Chrome
         setting_use_blurhash: Οι χρωματισμοί βασίζονται στα χρώματα του κρυμμένου πολυμέσου αλλά θολώνουν τις λεπτομέρειες
         setting_use_pending_items: Εμφάνιση ενημερώσεων ροής μετά από κλικ αντί για αυτόματη κύλισή τους
@@ -74,7 +76,7 @@ el:
       featured_tag:
         name: 'Εδώ είναι μερικά από τα hashtags που χρησιμοποιήσατε περισσότερο πρόσφατα:'
       filters:
-        action: Επιλέξτε ποια ενέργεια θα εκτελεστεί όταν μια δημοσίευση ταιριάζει με το φίλτρο
+        action: Επιλέξτε ποια ενέργεια θα εκτελεστεί όταν μια ανάρτηση ταιριάζει με το φίλτρο
         actions:
           blur: Απόκρυψη πολυμέσων πίσω από μια προειδοποίηση, χωρίς να κρύβεται το ίδιο το κείμενο
           hide: Πλήρης αποκρυψη του φιλτραρισμένου περιεχομένου, συμπεριφέρεται σαν να μην υπήρχε
@@ -103,7 +105,6 @@ el:
         status_page_url: Το URL μιας σελίδας όπου κάποιος μπορεί να δει την κατάσταση αυτού του διακομιστή κατά τη διάρκεια μιας διακοπής λειτουργίας
         theme: Θέμα που βλέπουν αποσυνδεδεμένοι επισκέπτες ή νέοι χρήστες.
         thumbnail: Μια εικόνα περίπου 2:1 που εμφανίζεται παράλληλα με τις πληροφορίες του διακομιστή σου.
-        timeline_preview: Αποσυνδεδεμένοι επισκέπτες θα μπορούν να περιηγηθούν στις πιο πρόσφατες δημόσιες δημοσιεύσεις που είναι διαθέσιμες στο διακομιστή.
         trendable_by_default: Παράλειψη χειροκίνητης αξιολόγησης του περιεχομένου σε τάση. Μεμονωμένα στοιχεία μπορούν ακόμα να αφαιρεθούν από τις τάσεις μετέπειτα.
         trends: Τάσεις δείχνουν ποιες δημοσιεύσεις, ετικέτες και ειδήσεις προκαλούν έλξη στο διακομιστή σας.
         trends_as_landing_page: Εμφάνιση περιεχομένου σε τάση σε αποσυνδεδεμένους χρήστες και επισκέπτες αντί για μια περιγραφή αυτού του διακομιστή. Απαιτεί οι τάσεις να έχουν ενεργοποιηθεί.
@@ -150,8 +151,8 @@ el:
       user:
         chosen_languages: Όταν ενεργοποιηθεί, στη δημόσια ροή θα εμφανίζονται τουτ μόνο από τις επιλεγμένες γλώσσες
         date_of_birth:
-          one: Πρέπει να βεβαιωθούμε ότι είσαι τουλάχιστον %{count} για να χρησιμοποιήσεις το Mastodon. Δε θα το αποθηκεύσουμε.
-          other: Πρέπει να βεβαιωθούμε ότι είσαι τουλάχιστον %{count} για να χρησιμοποιήσεις το Mastodon. Δε θα το αποθηκεύσουμε.
+          one: Πρέπει να βεβαιωθούμε ότι είσαι τουλάχιστον %{count} για να χρησιμοποιήσεις το %{domain}. Δε θα το αποθηκεύσουμε.
+          other: Πρέπει να βεβαιωθούμε ότι είσαι τουλάχιστον %{count} για να χρησιμοποιήσεις τα %{domain}. Δε θα το αποθηκεύσουμε.
         role: Ο ρόλος ελέγχει ποια δικαιώματα έχει ο χρήστης.
       user_role:
         color: Το χρώμα που θα χρησιμοποιηθεί για το ρόλο σε ολόκληρη τη διεπαφή, ως RGB σε δεκαεξαδική μορφή
@@ -159,6 +160,10 @@ el:
         name: Δημόσιο όνομα του ρόλου, εάν ο ρόλος έχει οριστεί να εμφανίζεται ως σήμα
         permissions_as_keys: Οι χρήστες με αυτόν τον ρόλο θα έχουν πρόσβαση σε...
         position: Ανώτεροι ρόλοι αποφασίζει την επίλυση συγκρούσεων σε ορισμένες περιπτώσεις. Ορισμένες ενέργειες μπορούν να εκτελεστούν μόνο σε ρόλους με χαμηλότερη προτεραιότητα
+      username_block:
+        allow_with_approval: Αντί να αποτρέψετε την οριστική εγγραφή, η αντιστοίχιση εγγραφών θα απαιτήσει την έγκρισή σας
+        comparison: Παρακαλώ να λάβετε υπόψη το Πρόβλημα Scunthorpe κατά τη φραγή μερικών αντιστοιχίσεων
+        username: Θα αντιστοιχηθεί ανεξάρτητα από τα κεφαλαία/πεζά και τα κοινά ομόγλυφα όπως "4" για "α" ή "3" για "e"
       webhook:
         events: Επιλέξτε συμβάντα για αποστολή
         template: Σύνθεσε το δικό σου JSON payload χρησιμοποιώντας μεταβλητή παρεμβολή. Άφησε κενό για προεπιλογή JSON.
@@ -230,8 +235,8 @@ el:
         setting_always_send_emails: Πάντα να αποστέλλονται ειδοποίησεις μέσω email
         setting_auto_play_gif: Αυτόματη αναπαραγωγή των GIF
         setting_boost_modal: Επιβεβαίωση πριν την προώθηση
-        setting_default_language: Γλώσσα δημοσιεύσεων
-        setting_default_privacy: Ιδιωτικότητα δημοσιεύσεων
+        setting_default_language: Γλώσσα κατά την ανάρτηση
+        setting_default_privacy: Ορατότητα αναρτήσεων
         setting_default_quote_policy: Ποιος μπορεί να παραθέσει
         setting_default_sensitive: Σημείωση όλων των πολυμέσων ως ευαίσθητου περιεχομένου
         setting_delete_modal: Επιβεβαίωση πριν τη διαγραφή ενός τουτ
@@ -241,9 +246,10 @@ el:
         setting_display_media_default: Προκαθορισμένο
         setting_display_media_hide_all: Απόκρυψη όλων
         setting_display_media_show_all: Εμφάνιση όλων
+        setting_emoji_style: Στυλ Emoji
         setting_expand_spoilers: Μόνιμη ανάπτυξη των τουτ με προειδοποίηση περιεχομένου
         setting_hide_network: Κρύψε τις διασυνδέσεις σου
-        setting_missing_alt_text_modal: Εμφάνιση διαλόγου επιβεβαίωσης πριν από την δημοσίευση πολυμέσων χωρίς alt κείμενο
+        setting_missing_alt_text_modal: Εμφάνιση διαλόγου επιβεβαίωσης πριν από τη δημοσίευση πολυμέσων χωρίς εναλλακτικό κείμενο
         setting_reduce_motion: Μείωση κίνησης κινουμένων στοιχείων
         setting_system_font_ui: Χρήση της προεπιλεγμένης γραμματοσειράς του συστήματος
         setting_system_scrollbars_ui: Χρήση προκαθορισμένης γραμμής κύλισης του συστήματος
@@ -277,12 +283,16 @@ el:
         content_cache_retention_period: Περίοδος διατήρησης απομακρυσμένου περιεχομένου
         custom_css: Προσαρμοσμένο CSS
         favicon: Favicon
+        local_live_feed_access: Πρόσβαση σε ζωντανές ροές με τοπικές αναρτήσεις
+        local_topic_feed_access: Πρόσβαση σε ροές ετικετών και συνδέσμων με τοπικές αναρτήσεις
         mascot: Προσαρμοσμένη μασκότ (απαρχαιωμένο)
         media_cache_retention_period: Περίοδος διατήρησης προσωρινής μνήμης πολυμέσων
         min_age: Ελάχιστη απαιτούμενη ηλικία
         peers_api_enabled: Δημοσίευση λίστας των εντοπισμένων διακομιστών στο API
         profile_directory: Ενεργοποίηση καταλόγου προφίλ
         registrations_mode: Ποιος μπορεί να εγγραφεί
+        remote_live_feed_access: Πρόσβαση σε ζωντανές ροές με απομακρυσμένες αναρτήσεις
+        remote_topic_feed_access: Πρόσβαση σε ροές ετικετών και συνδέσμων με απομακρυσμένες αναρτήσεις
         require_invite_text: Απαίτησε έναν λόγο για να γίνει κάποιος μέλος
         show_domain_blocks: Εμφάνιση αποκλεισμένων τομέων
         show_domain_blocks_rationale: Εμφάνιση γιατί αποκλείστηκαν οι τομείς
@@ -295,7 +305,6 @@ el:
         status_page_url: URL σελίδας κατάστασης
         theme: Προεπιλεγμένο θέμα
         thumbnail: Μικρογραφία διακομιστή
-        timeline_preview: Να επιτρέπεται μη πιστοποιημένη πρόσβαση σε δημόσια χρονολόγια
         trendable_by_default: Επίτρεψε τις τάσεις χωρίς προηγούμενη αξιολόγηση
         trends: Ενεργοποίηση τάσεων
         trends_as_landing_page: Χρήση των τάσεων ως σελίδα προορισμού
@@ -318,12 +327,13 @@ el:
       notification_emails:
         appeal: Κάποιος κάνει έφεση σε απόφαση συντονιστή
         digest: Αποστολή συνοπτικών email
-        favourite: Αποστολή email όταν κάποιος σημειώνει ως αγαπημένη τη δημοσίευσή σου
-        follow: Αποστολή email όταν κάποιος σε ακολουθεί
-        follow_request: Αποστολή email όταν κάποιος ζητάει να σε ακολουθήσει
-        mention: Αποστολή email όταν κάποιος σε αναφέρει
-        pending_account: Αποστολή email όταν υπάρχει νέος λογαριασμός για επιθεώρηση
-        reblog: Αποστολή email όταν κάποιος προωθεί τη δημοσίευση σου
+        favourite: Κάποιος αγάπησε την ανάρτηση σου
+        follow: Κάποιος σε ακολούθησε
+        follow_request: Κάποιος ζήτησε να σε ακολουθήσει
+        mention: Κάποιος σε επισήμανε
+        pending_account: Νέος λογαριασμός χρειάζεται αναθεώρηση
+        quote: Κάποιος σε παρέθεσε
+        reblog: Κάποιος ενίσχυσε την ανάρτηση σου
         report: Υποβλήθηκε νέα αναφορά
         software_updates:
           all: Ειδοποίηση για όλες τις ενημερώσεις
@@ -369,6 +379,10 @@ el:
         name: Όνομα
         permissions_as_keys: Δικαιώματα
         position: Προτεραιότητα
+      username_block:
+        allow_with_approval: Να επιτρέπονται εγγραφές με έγκριση
+        comparison: Μέθοδος σύγκρισης
+        username: Λέξη για αντιστοίχιση
       webhook:
         events: Ενεργοποιημένα συμβάντα
         template: Πρότυπο payload
diff --git a/config/locales/simple_form.en-GB.yml b/config/locales/simple_form.en-GB.yml
index 5f5453edc35..1e534d1d216 100644
--- a/config/locales/simple_form.en-GB.yml
+++ b/config/locales/simple_form.en-GB.yml
@@ -60,6 +60,7 @@ 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_emoji_style: How to display emojis. "Auto" will try using native emoji, but falls back to Twemoji for legacy browsers.
         setting_system_scrollbars_ui: Applies only to desktop browsers based on Safari and Chrome
         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
@@ -75,6 +76,7 @@ en-GB:
       filters:
         action: Chose which action to perform when a post matches the filter
         actions:
+          blur: Hide media behind a warning, without hiding the text itself
           hide: Completely hide the filtered content, behaving as if it did not exist
           warn: Hide the filtered content behind a warning mentioning the filter's title
       form_admin_settings:
@@ -88,6 +90,7 @@ en-GB:
         favicon: WEBP, PNG, GIF or JPG. Overrides the default Mastodon favicon with a custom icon.
         mascot: Overrides the illustration in the advanced web interface.
         media_cache_retention_period: Media files from posts made by remote users are cached on your server. When set to a positive value, media will be deleted after the specified number of days. If the media data is requested after it is deleted, it will be re-downloaded, if the source content is still available. Due to restrictions on how often link preview cards poll third-party sites, it is recommended to set this value to at least 14 days, or link preview cards will not be updated on demand before that time.
+        min_age: Users will be asked to confirm their date of birth during sign-up
         peers_api_enabled: A list of domain names this server has encountered in the fediverse. No data is included here about whether you federate with a given server, just that your server knows about it. This is used by services that collect statistics on federation in a general sense.
         profile_directory: The profile directory lists all users who have opted-in to be discoverable.
         require_invite_text: When sign-ups require manual approval, make the “Why do you want to join?” text input mandatory rather than optional
@@ -100,7 +103,6 @@ en-GB:
         status_page_url: URL of a page where people can see the status of this server during an outage
         theme: Theme that logged out visitors and new users see.
         thumbnail: A roughly 2:1 image displayed alongside your server information.
-        timeline_preview: Logged out visitors will be able to browse the most recent public posts available on the server.
         trendable_by_default: Skip manual review of trending content. Individual items can still be removed from trends after the fact.
         trends: Trends show which posts, hashtags and news stories are gaining traction on your server.
         trends_as_landing_page: Show trending content to logged-out users and visitors instead of a description of this server. Requires trends to be enabled.
@@ -132,12 +134,18 @@ en-GB:
         name: You can only change the casing of the letters, for example, to make it more readable
       terms_of_service:
         changelog: Can be structured with Markdown syntax.
+        effective_date: A reasonable timeframe can range anywhere from 10 to 30 days from the date you notify your users.
         text: Can be structured with Markdown syntax.
       terms_of_service_generator:
         admin_email: Legal notices include counternotices, court orders, takedown requests, and law enforcement requests.
+        arbitration_address: Can be the same as Physical address above, or “N/A” if using email.
+        arbitration_website: Can be a web form, or “N/A” if using email.
+        choice_of_law: City, region, territory or state the internal substantive laws of which shall govern any and all claims.
         dmca_address: For US operators, use the address registered in the DMCA Designated Agent Directory. A P.O. Box listing is available upon direct request, use the DMCA Designated Agent Post Office Box Waiver Request to email the Copyright Office and describe that you are a home-based content moderator who fears revenge or retribution for your actions and need to use a P.O. Box to remove your home address from public view.
+        dmca_email: Can be the same email used for “Email address for legal notices” above.
         domain: Unique identification of the online service you are providing.
         jurisdiction: List the country where whoever pays the bills lives. If it’s a company or other entity, list the country where it’s incorporated, and the city, region, territory or state as appropriate.
+        min_age: Should not be below the minimum age required by the laws of your jurisdiction.
       user:
         chosen_languages: When checked, only posts in selected languages will be displayed in public timelines
         role: The role controls which permissions the user has.
@@ -219,7 +227,7 @@ en-GB:
         setting_auto_play_gif: Auto-play animated GIFs
         setting_boost_modal: Show confirmation dialogue before boosting
         setting_default_language: Posting language
-        setting_default_privacy: Posting privacy
+        setting_default_quote_policy: Who can quote
         setting_default_sensitive: Always mark media as sensitive
         setting_delete_modal: Show confirmation dialogue before deleting a post
         setting_disable_hover_cards: Disable profile preview on hover
@@ -228,6 +236,7 @@ en-GB:
         setting_display_media_default: Default
         setting_display_media_hide_all: Hide all
         setting_display_media_show_all: Show all
+        setting_emoji_style: Emoji style
         setting_expand_spoilers: Always expand posts marked with content warnings
         setting_hide_network: Hide your social graph
         setting_missing_alt_text_modal: Show confirmation dialogue before posting media without alt text
@@ -252,6 +261,7 @@ en-GB:
         name: Hashtag
       filters:
         actions:
+          blur: Hide media with a warning
           hide: Hide completely
           warn: Hide with a warning
       form_admin_settings:
@@ -265,6 +275,7 @@ en-GB:
         favicon: Favicon
         mascot: Custom mascot (legacy)
         media_cache_retention_period: Media cache retention period
+        min_age: Minimum age requirement
         peers_api_enabled: Publish list of discovered servers in the API
         profile_directory: Enable profile directory
         registrations_mode: Who can sign-up
@@ -280,7 +291,6 @@ en-GB:
         status_page_url: Status page URL
         theme: Default theme
         thumbnail: Server thumbnail
-        timeline_preview: Allow unauthenticated access to public timelines
         trendable_by_default: Allow trends without prior review
         trends: Enable trends
         trends_as_landing_page: Use trends as the landing page
@@ -330,16 +340,22 @@ en-GB:
         usable: Allow posts to use this hashtag locally
       terms_of_service:
         changelog: What's changed?
+        effective_date: Effective date
         text: Terms of Service
       terms_of_service_generator:
         admin_email: Email address for legal notices
         arbitration_address: Physical address for arbitration notices
         arbitration_website: Website for submitting arbitration notices
+        choice_of_law: Choice of Law
         dmca_address: Physical address for DMCA/copyright notices
         dmca_email: Email address for DMCA/copyright notices
         domain: Domain
         jurisdiction: Legal jurisdiction
+        min_age: Minimum age
       user:
+        date_of_birth_1i: Day
+        date_of_birth_2i: Month
+        date_of_birth_3i: Year
         role: Role
         time_zone: Time Zone
       user_role:
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml
index bb48cddff54..bbc1086072c 100644
--- a/config/locales/simple_form.en.yml
+++ b/config/locales/simple_form.en.yml
@@ -56,11 +56,13 @@ en:
         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.
         setting_aggregate_reblogs: Do not show new boosts for posts that have been recently boosted (only affects newly-received boosts)
         setting_always_send_emails: Normally e-mail notifications won't be sent when you are actively using Mastodon
-        setting_default_quote_policy: Mentioned users are always allowed to quote. This setting will only take effect for posts created with the next Mastodon version, but you can select your preference in preparation
+        setting_default_quote_policy_private: Followers-only posts authored on Mastodon can't be quoted by others.
+        setting_default_quote_policy_unlisted: When people quote you, their post will also be hidden from trending timelines.
         setting_default_sensitive: Sensitive media is hidden by default and can be revealed with a click
         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_emoji_style: How to display emojis. "Auto" will try using native emoji, but falls back to Twemoji for legacy browsers.
         setting_system_scrollbars_ui: Applies only to desktop browsers based on Safari and Chrome
         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
@@ -103,7 +105,6 @@ en:
         status_page_url: URL of a page where people can see the status of this server during an outage
         theme: Theme that logged out visitors and new users see.
         thumbnail: A roughly 2:1 image displayed alongside your server information.
-        timeline_preview: Logged out visitors will be able to browse the most recent public posts available on the server.
         trendable_by_default: Skip manual review of trending content. Individual items can still be removed from trends after the fact.
         trends: Trends show which posts, hashtags and news stories are gaining traction on your server.
         trends_as_landing_page: Show trending content to logged-out users and visitors instead of a description of this server. Requires trends to be enabled.
@@ -150,8 +151,8 @@ en:
       user:
         chosen_languages: When checked, only posts in selected languages will be displayed in public timelines
         date_of_birth:
-          one: We have to make sure you're at least %{count} to use Mastodon. We won't store this.
-          other: We have to make sure you're at least %{count} to use Mastodon. We won't store this.
+          one: We have to make sure you're at least %{count} to use %{domain}. We won't store this.
+          other: We have to make sure you're at least %{count} to use %{domain}. We won't store this.
         role: The role controls which permissions the user has.
       user_role:
         color: Color to be used for the role throughout the UI, as RGB in hex format
@@ -159,6 +160,10 @@ en:
         name: Public name of the role, if role is set to be displayed as a badge
         permissions_as_keys: Users with this role will have access to...
         position: Higher role decides conflict resolution in certain situations. Certain actions can only be performed on roles with a lower priority
+      username_block:
+        allow_with_approval: Instead of preventing sign-up outright, matching sign-ups will require your approval
+        comparison: Please be mindful of the Scunthorpe Problem when blocking partial matches
+        username: Will be matched regardless of casing and common homoglyphs like "4" for "a" or "3" for "e"
       webhook:
         events: Select events to send
         template: Compose your own JSON payload using variable interpolation. Leave blank for default JSON.
@@ -231,7 +236,7 @@ en:
         setting_auto_play_gif: Auto-play animated GIFs
         setting_boost_modal: Show confirmation dialog before boosting
         setting_default_language: Posting language
-        setting_default_privacy: Posting privacy
+        setting_default_privacy: Posting visibility
         setting_default_quote_policy: Who can quote
         setting_default_sensitive: Always mark media as sensitive
         setting_delete_modal: Show confirmation dialog before deleting a post
@@ -241,6 +246,7 @@ en:
         setting_display_media_default: Default
         setting_display_media_hide_all: Hide all
         setting_display_media_show_all: Show all
+        setting_emoji_style: Emoji style
         setting_expand_spoilers: Always expand posts marked with content warnings
         setting_hide_network: Hide your social graph
         setting_missing_alt_text_modal: Show confirmation dialog before posting media without alt text
@@ -277,12 +283,16 @@ en:
         content_cache_retention_period: Remote content retention period
         custom_css: Custom CSS
         favicon: Favicon
+        local_live_feed_access: Access to live feeds featuring local posts
+        local_topic_feed_access: Access to hashtag and link feeds featuring local posts
         mascot: Custom mascot (legacy)
         media_cache_retention_period: Media cache retention period
         min_age: Minimum age requirement
         peers_api_enabled: Publish list of discovered servers in the API
         profile_directory: Enable profile directory
         registrations_mode: Who can sign-up
+        remote_live_feed_access: Access to live feeds featuring remote posts
+        remote_topic_feed_access: Access to hashtag and link feeds featuring remote posts
         require_invite_text: Require a reason to join
         show_domain_blocks: Show domain blocks
         show_domain_blocks_rationale: Show why domains were blocked
@@ -295,7 +305,6 @@ en:
         status_page_url: Status page URL
         theme: Default theme
         thumbnail: Server thumbnail
-        timeline_preview: Allow unauthenticated access to public timelines
         trendable_by_default: Allow trends without prior review
         trends: Enable trends
         trends_as_landing_page: Use trends as the landing page
@@ -323,6 +332,7 @@ en:
         follow_request: Someone requested to follow you
         mention: Someone mentioned you
         pending_account: New account needs review
+        quote: Someone quoted you
         reblog: Someone boosted your post
         report: New report is submitted
         software_updates:
@@ -369,6 +379,10 @@ en:
         name: Name
         permissions_as_keys: Permissions
         position: Priority
+      username_block:
+        allow_with_approval: Allow registrations with approval
+        comparison: Method of comparison
+        username: Word to match
       webhook:
         events: Enabled events
         template: Payload template
diff --git a/config/locales/simple_form.eo.yml b/config/locales/simple_form.eo.yml
index 2687f782290..c8bf3ec0bd7 100644
--- a/config/locales/simple_form.eo.yml
+++ b/config/locales/simple_form.eo.yml
@@ -56,10 +56,13 @@ eo:
         scopes: Kiujn API-ojn la aplikaĵo permesiĝos atingi. Se vi elektas supran amplekson, vi ne bezonas elekti la individuajn.
         setting_aggregate_reblogs: Ne montri novajn plusendojn de mesaĝoj lastatempe plusenditaj (nur efikas al nove ricevitaj plusendoj)
         setting_always_send_emails: Normale, la sciigoj per retpoŝto ne estos senditaj kiam vi uzas Mastodon aktive
+        setting_default_quote_policy_private: Afiŝoj nur por sekvantoj verkitaj ĉe Mastodon ne povas esti cititaj de aliaj.
+        setting_default_quote_policy_unlisted: Kiam homoj citas vin, ilia afiŝo ankaŭ estos kaŝita de tendencaj templinioj.
         setting_default_sensitive: La tiklaj vidaŭdaĵoj estas implicite kaŝitaj kaj povas esti malkaŝitaj per alklako
         setting_display_media_default: Kaŝi plurmediojn markitajn kiel tiklaj
         setting_display_media_hide_all: Ĉiam kaŝi la vidaŭdaĵojn
         setting_display_media_show_all: Ĉiam montri la vidaŭdaĵojn
+        setting_emoji_style: Kiel montri emoĝiojn. "Aŭtomata" provos uzi denaskajn emoĝiojn, sed uzas Twemoji por malnovaj retumiloj.
         setting_system_scrollbars_ui: Aplikas nur por surtablaj retumiloj baziĝas de Safari kaj Chrome
         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
@@ -102,7 +105,6 @@ eo:
         status_page_url: URL de paĝo kie homoj povas vidi la staton de ĉi tiu servilo dum malfunkcio
         theme: Etoso kiun elsalutitaj vizitantoj kaj novaj uzantoj vidas.
         thumbnail: Ĉirkaua 2:1 bildo montritas kun via servilinformo.
-        timeline_preview: Elsalutitaj vizitantoj povos vidi la plej lastajn publikajn mesaĝojn disponeblaj en la servilo.
         trendable_by_default: Ignori permanan kontrolon de tendenca enhavo.
         trends: Tendencoj montras kiu mesaĝoj, kradvortoj kaj novaĵoj populariĝas en via servilo.
         trends_as_landing_page: Montru tendencan enhavon al elsalutitaj uzantoj kaj vizitantoj anstataŭ priskribo de ĉi tiu servilo. Necesas ke tendencoj estu ebligitaj.
@@ -148,6 +150,9 @@ eo:
         min_age: Ne devus esti malsupre la minimuma aĝo postulita de la leĝoj de via jurisdikcio.
       user:
         chosen_languages: Kun tio markita nur mesaĝoj en elektitaj lingvoj aperos en publikaj tempolinioj
+        date_of_birth:
+          one: Ni devas certigi, ke vi estas almenaŭ %{count}-jaraĝa por uzi %{domain}. Ni ne konservos ĉi tion.
+          other: Ni devas certigi, ke vi estas almenaŭ %{count}-jaraĝaj por uzi %{domain}. Ni ne konservos ĉi tion.
         role: La rolo kontrolas kiujn permesojn la uzanto havas.
       user_role:
         color: Koloro uzita por la rolo sur la UI, kun RGB-formato
@@ -227,7 +232,8 @@ eo:
         setting_auto_play_gif: Aŭtomate ekigi GIF-ojn
         setting_boost_modal: Montri konfirman fenestron antaŭ ol diskonigi mesaĝon
         setting_default_language: Publikada lingvo
-        setting_default_privacy: Privateco de afiŝado
+        setting_default_privacy: Afiŝa videblo
+        setting_default_quote_policy: Kiu povas citi
         setting_default_sensitive: Ĉiam marki la vidaŭdaĵojn kiel tiklaj
         setting_delete_modal: Montri konfirman fenestron antaŭ ol forigi mesaĝon
         setting_disable_hover_cards: Malebligi profilan antaŭmontron kiam oni musumas
@@ -236,6 +242,7 @@ eo:
         setting_display_media_default: Implicita
         setting_display_media_hide_all: Kaŝi ĉiujn
         setting_display_media_show_all: Montri ĉiujn
+        setting_emoji_style: Emoĝio-stilo
         setting_expand_spoilers: Ĉiam malfoldas mesaĝojn markitajn per averto pri enhavo
         setting_hide_network: Kaŝi viajn sekvantojn kaj sekvatojn
         setting_missing_alt_text_modal: Montru konfirman dialogon antaŭ afiŝado de aŭdvidaĵoj sen altteksto
@@ -290,7 +297,6 @@ eo:
         status_page_url: URL de la paĝo de stato
         theme: Implicita etoso
         thumbnail: Bildeto de servilo
-        timeline_preview: Permesi la neaŭtentigitan aliron al la publikaj templinioj
         trendable_by_default: Permesi tendencojn sen deviga kontrolo
         trends: Ŝalti furorojn
         trends_as_landing_page: Uzu tendencojn kiel la landpaĝon
@@ -318,6 +324,7 @@ eo:
         follow_request: Sendi retmesaĝon kiam iu petas sekvi vin
         mention: Sendi retmesaĝon kiam iu mencias vin
         pending_account: Sendi retmesaĝon kiam nova konto bezonas kontrolon
+        quote: Iu citis vin
         reblog: Sendi retmesaĝon kiam iu diskonigas vian mesaĝon
         report: Nova raporto estas proponita
         software_updates:
@@ -364,6 +371,8 @@ eo:
         name: Nomo
         permissions_as_keys: Permesoj
         position: Prioritato
+      username_block:
+        allow_with_approval: Permesi aliĝojn kun aprobo
       webhook:
         events: Ŝaltitaj eventoj
         template: Utilŝarĝa ŝablono
diff --git a/config/locales/simple_form.es-AR.yml b/config/locales/simple_form.es-AR.yml
index 3b68cf009f3..d65a3ef1fd7 100644
--- a/config/locales/simple_form.es-AR.yml
+++ b/config/locales/simple_form.es-AR.yml
@@ -56,11 +56,13 @@ es-AR:
         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.
         setting_aggregate_reblogs: No mostrar nuevas adhesiones de los mensajes que fueron recientemente adheridos (sólo afecta a las adhesiones recibidas recientemente)
         setting_always_send_emails: Normalmente las notificaciones por correo electrónico no se enviarán cuando estés usando Mastodon activamente
-        setting_default_quote_policy: Los usuarios mencionados siempre pueden citar. Este ajuste solo afecta a las publicaciones creadas con la próxima versión de Mastodon, pero podés seleccionar tus preferencias con antelación.
+        setting_default_quote_policy_private: Los mensajes solo para seguidores redactados en Mastodon no pueden ser citados por otras cuentas.
+        setting_default_quote_policy_unlisted: Cuando otras cuentas te citen, sus publicaciones también se ocultarán de las líneas temporales de tendencias.
         setting_default_sensitive: El contenido de medios sensibles está oculto predeterminadamente y puede ser mostrado con un clic
         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_emoji_style: Cómo se mostrarán los emojis. "Automático" intentará usar emojis nativos, cambiando a Twemoji en navegadores antiguos.
         setting_system_scrollbars_ui: Solo aplica para navegadores web de escritorio basados en Safari y Chrome
         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
@@ -103,7 +105,6 @@ es-AR:
         status_page_url: Dirección web de una página donde la gente puede ver el estado de este servidor durante un apagón
         theme: El tema que los visitantes no registrados y los nuevos usuarios ven.
         thumbnail: Una imagen de aproximadamente 2:1 se muestra junto a la información de tu servidor.
-        timeline_preview: Los visitantes no registrados podrán navegar por los mensajes públicos más recientes disponibles en el servidor.
         trendable_by_default: Omití la revisión manual del contenido en tendencia. Los elementos individuales aún podrán eliminarse de las tendencias.
         trends: Las tendencias muestran qué mensajes, etiquetas y noticias están ganando tracción en tu servidor.
         trends_as_landing_page: Mostrar contenido en tendencia para usuarios que no iniciaron sesión y visitantes, en lugar de una descripción de este servidor. Requiere que las tendencias estén habilitadas.
@@ -150,8 +151,8 @@ es-AR:
       user:
         chosen_languages: Cuando estén marcados, sólo se mostrarán los mensajes en los idiomas seleccionados en las líneas temporales públicas
         date_of_birth:
-          one: Tenemos que asegurarnos de que al menos tenés %{count} años de edad para usar Mastodon. No almacenaremos esta información.
-          other: Tenemos que asegurarnos de que al menos tenés %{count} años de edad para usar Mastodon. No almacenaremos esta información.
+          one: Tenemos que asegurarnos de que al menos tenés %{count} años de edad para usar %{domain}. No almacenaremos esta información.
+          other: Tenemos que asegurarnos de que al menos tenés %{count} años de edad para usar %{domain}. No almacenaremos esta información.
         role: El rol controla qué permisos tiene el usuario.
       user_role:
         color: Color que se utilizará para el rol a lo largo de la interface de usuario, como RGB en formato hexadecimal
@@ -159,6 +160,10 @@ es-AR:
         name: Nombre público del rol, si el rol se establece para que se muestre como una insignia
         permissions_as_keys: Los usuarios con este rol tendrán acceso a…
         position: Un rol más alto decide la resolución de conflictos en ciertas situaciones. Ciertas acciones sólo pueden llevarse a cabo en roles con prioridad inferior
+      username_block:
+        allow_with_approval: En lugar de impedir el registro total, los registros coincidentes requerirán tu aprobación
+        comparison: Por favor, tené en cuenta el Problema de Scunthorpe al bloquear coincidencias parciales
+        username: Coincidirá sin importar la capitalización de letras y los homoglifos comunes como «4» para «a», o «3» para «e»
       webhook:
         events: Seleccionar eventos para enviar
         template: Creá tu propio archivo JSON usando interpolación variable. Dejalo en blanco para usar el archivo JSON predeterminado.
@@ -231,7 +236,7 @@ es-AR:
         setting_auto_play_gif: Reproducir automáticamente los GIFs animados
         setting_boost_modal: Mostrar diálogo de confirmación antes de adherir
         setting_default_language: Idioma de tus mensajes
-        setting_default_privacy: Privacidad de mensajes
+        setting_default_privacy: Visibilidad del mensaje
         setting_default_quote_policy: Quién puede citar
         setting_default_sensitive: Siempre marcar medios como sensibles
         setting_delete_modal: Mostrar diálogo de confirmación antes de eliminar un mensaje
@@ -241,6 +246,7 @@ es-AR:
         setting_display_media_default: Predeterminada
         setting_display_media_hide_all: Ocultar todo
         setting_display_media_show_all: Mostrar todo
+        setting_emoji_style: Estilo de emoji
         setting_expand_spoilers: Siempre expandir los mensajes marcados con advertencias de contenido
         setting_hide_network: Ocultá tu gráfica social
         setting_missing_alt_text_modal: Mostrar diálogo de confirmación antes de enviar medios sin texto alternativo
@@ -277,12 +283,16 @@ es-AR:
         content_cache_retention_period: Período de retención de contenido remoto
         custom_css: CSS personalizado
         favicon: Favicón
+        local_live_feed_access: Acceso a líneas temporales en vivo, destacando mensajes locales
+        local_topic_feed_access: Acceso a líneas temporales de etiquetas y enlaces, destacando mensajes locales
         mascot: Mascota personalizada (legado)
         media_cache_retention_period: Período de retención de la caché de medios
         min_age: Edad mínima requerida
         peers_api_enabled: Publicar lista de servidores descubiertos en la API
         profile_directory: Habilitar directorio de perfiles
         registrations_mode: Quién puede registrarse
+        remote_live_feed_access: Acceso a líneas temporales en vivo, destacando mensajes remotos
+        remote_topic_feed_access: Acceso a líneas temporales de etiquetas y enlaces, destacando mensajes remotos
         require_invite_text: Requerir un motivo para unirse
         show_domain_blocks: Mostrar dominios bloqueados
         show_domain_blocks_rationale: Mostrar por qué se bloquearon los dominios
@@ -295,7 +305,6 @@ es-AR:
         status_page_url: Dirección web de la página de estado
         theme: Tema predeterminado
         thumbnail: Miniatura del servidor
-        timeline_preview: Permitir el acceso no autenticado a las líneas temporales públicas
         trendable_by_default: Permitir tendencias sin revisión previa
         trends: Habilitar tendencias
         trends_as_landing_page: Usar las tendencias como la página de destino
@@ -323,6 +332,7 @@ es-AR:
         follow_request: Una cuenta solicita seguirte
         mention: Una cuenta te menciona
         pending_account: Una nueva cuenta necesita revisión
+        quote: Alguien te citó
         reblog: Una cuenta adhiere a tu mensaje
         report: Se envió una nueva denuncia
         software_updates:
@@ -369,6 +379,10 @@ es-AR:
         name: Nombre
         permissions_as_keys: Permisos
         position: Prioridad
+      username_block:
+        allow_with_approval: Permitir registros con aprobación
+        comparison: Método de comparación
+        username: Palabra a coincidir
       webhook:
         events: Eventos habilitados
         template: Plantilla de carga
diff --git a/config/locales/simple_form.es-MX.yml b/config/locales/simple_form.es-MX.yml
index 30614992fce..088423f2759 100644
--- a/config/locales/simple_form.es-MX.yml
+++ b/config/locales/simple_form.es-MX.yml
@@ -56,11 +56,13 @@ es-MX:
         scopes: Qué APIs de la aplicación tendrán acceso. Si seleccionas el alcance de nivel mas alto, no necesitas seleccionar las individuales.
         setting_aggregate_reblogs: No mostrar nuevos impulsos para las publicaciones que han sido recientemente impulsadas (sólo afecta a las publicaciones recibidas recientemente)
         setting_always_send_emails: Normalmente las notificaciones por correo electrónico no se enviarán cuando estés usando Mastodon activamente
-        setting_default_quote_policy: Los usuarios mencionados siempre pueden citar. Esta configuración solo se aplicará a las publicaciones creadas con la próxima versión de Mastodon, pero puedes seleccionar tus preferencias anticipadamente
+        setting_default_quote_policy_private: Las publicaciones solo para seguidores hechas en Mastodon no pueden ser citadas por otros usuarios.
+        setting_default_quote_policy_unlisted: Cuando las personas te citen, su publicación también se ocultará en las cronologías públicas.
         setting_default_sensitive: El contenido multimedia sensible está oculto por defecto y puede ser mostrado con un clic
         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_emoji_style: Cómo se muestran los emojis. «Automático» intentará usar emojis nativos, pero vuelve a Twemoji para los navegadores antiguos.
         setting_system_scrollbars_ui: Solo se aplica a los navegadores de escritorio basados en Safari y Chrome
         setting_use_blurhash: Los degradados se basan en los colores de los elementos visuales ocultos, pero ocultan cualquier detalle
         setting_use_pending_items: Ocultar las publicaciones de la línea de tiempo tras un clic en lugar de desplazar automáticamente el feed
@@ -103,7 +105,6 @@ es-MX:
         status_page_url: URL de una página donde las personas pueden ver el estado de este servidor durante una interrupción
         theme: El tema que los visitantes no registrados y los nuevos usuarios ven.
         thumbnail: Una imagen de aproximadamente 2:1 se muestra junto a la información de tu servidor.
-        timeline_preview: Los visitantes no registrados podrán navegar por los mensajes públicos más recientes disponibles en el servidor.
         trendable_by_default: Omitir la revisión manual del contenido en tendencia. Los elementos individuales aún podrán eliminarse de las tendencias.
         trends: Las tendencias muestran qué mensajes, etiquetas y noticias están ganando tracción en tu servidor.
         trends_as_landing_page: Mostrar contenido en tendencia para usuarios y visitantes desconectados en lugar de una descripción de este servidor. Requiere tendencias para ser habilitado.
@@ -150,8 +151,8 @@ es-MX:
       user:
         chosen_languages: Cuando se marca, solo se mostrarán las publicaciones en los idiomas seleccionados en las líneas de tiempo públicas
         date_of_birth:
-          one: Necesitamos asegurarnos de que tengas al menos %{count} para usar Mastodon. No guardaremos esta información.
-          other: Necesitamos asegurarnos de que tengas al menos %{count} para usar Mastodon. No guardaremos esta información.
+          one: Tenemos que asegurarnos de que tienes al menos %{count} para usar %{domain}. No almacenaremos esta información.
+          other: Tenemos que asegurarnos de que tienes al menos %{count} para usar %{domain}. No almacenaremos esta información.
         role: El rol controla qué permisos tiene el usuario.
       user_role:
         color: Color que se usará para el rol en toda la interfaz de usuario, como RGB en formato hexadecimal
@@ -159,6 +160,10 @@ es-MX:
         name: Nombre público del rol, si el rol se establece para que se muestre como una insignia
         permissions_as_keys: Los usuarios con este rol tendrán acceso a...
         position: Un rol superior decide la resolución de conflictos en ciertas situaciones. Ciertas acciones sólo pueden llevarse a cabo en roles con menor prioridad
+      username_block:
+        allow_with_approval: En lugar de impedir directamente el registro, los registros coincidentes requerirán tu aprobación
+        comparison: Por favor ten en cuenta el problema de Scunthorpe al bloquear coincidencias parciales
+        username: Se emparejará independientemente de las mayúsculas y minúsculas y de los homógrafos comunes como «4» por «a» o «3» por «e»
       webhook:
         events: Seleccionar eventos para enviar
         template: Crea tu propio JSON usando interpolación variable. Déjalo en blanco para el JSON predeterminado.
@@ -231,7 +236,7 @@ es-MX:
         setting_auto_play_gif: Reproducir automáticamente los GIFs animados
         setting_boost_modal: Mostrar ventana de confirmación antes de impulsar
         setting_default_language: Idioma de publicación
-        setting_default_privacy: Privacidad de publicaciones
+        setting_default_privacy: Visibilidad de publicación
         setting_default_quote_policy: Quién puede citar
         setting_default_sensitive: Marcar siempre imágenes como sensibles
         setting_delete_modal: Mostrar diálogo de confirmación antes de borrar una publicación
@@ -241,6 +246,7 @@ es-MX:
         setting_display_media_default: Por defecto
         setting_display_media_hide_all: Ocultar todo
         setting_display_media_show_all: Mostrar todo
+        setting_emoji_style: Estilo de emoji
         setting_expand_spoilers: Siempre expandir las publicaciones marcadas con advertencias de contenido
         setting_hide_network: Ocultar tu red
         setting_missing_alt_text_modal: Mostrar cuadro de diálogo de confirmación antes de publicar contenido multimedia sin texto alternativo
@@ -277,12 +283,16 @@ es-MX:
         content_cache_retention_period: Periodo de conservación de contenidos remotos
         custom_css: CSS personalizado
         favicon: Favicon
+        local_live_feed_access: Acceso a las cronologías que destacan publicaciones locales
+        local_topic_feed_access: Acceso a las etiquetas y enlaces en tendencia que destacan publicaciones locales
         mascot: Mascota personalizada (legado)
         media_cache_retention_period: Período de retención de caché multimedia
         min_age: Edad mínima requerida
         peers_api_enabled: Publicar lista de servidores descubiertos en la API
         profile_directory: Habilitar directorio de perfiles
         registrations_mode: Quién puede registrarse
+        remote_live_feed_access: Acceso a las cronologías que destacan publicaciones remotas
+        remote_topic_feed_access: Acceso a las etiquetas y enlaces en tendencia que destacan publicaciones remotas
         require_invite_text: Requerir una razón para unirse
         show_domain_blocks: Mostrar dominios bloqueados
         show_domain_blocks_rationale: Mostrar por qué se bloquearon los dominios
@@ -295,7 +305,6 @@ es-MX:
         status_page_url: URL de página de estado
         theme: Tema por defecto
         thumbnail: Miniatura del servidor
-        timeline_preview: Permitir el acceso no autenticado a las líneas de tiempo públicas
         trendable_by_default: Permitir tendencias sin revisión previa
         trends: Habilitar tendencias
         trends_as_landing_page: Usar tendencias como página de destino
@@ -323,6 +332,7 @@ es-MX:
         follow_request: Enviar correo electrónico cuando alguien solicita seguirte
         mention: Enviar correo electrónico cuando alguien te mencione
         pending_account: Enviar correo electrónico cuando una nueva cuenta necesita revisión
+        quote: Alguien te citó
         reblog: Enviar correo electrónico cuando alguien comparta su publicación
         report: Nuevo reporte enviado
         software_updates:
@@ -369,6 +379,10 @@ es-MX:
         name: Nombre
         permissions_as_keys: Permisos
         position: Prioridad
+      username_block:
+        allow_with_approval: Permitir registros con aprobación previa
+        comparison: Método de comparación
+        username: Palabra a coincidir
       webhook:
         events: Eventos habilitados
         template: Plantilla de carga
diff --git a/config/locales/simple_form.es.yml b/config/locales/simple_form.es.yml
index 56eea49d25e..d6f1c5d8657 100644
--- a/config/locales/simple_form.es.yml
+++ b/config/locales/simple_form.es.yml
@@ -56,11 +56,13 @@ es:
         scopes: Qué APIs de la aplicación tendrán acceso. Si seleccionas el alcance de nivel mas alto, no necesitas seleccionar las individuales.
         setting_aggregate_reblogs: No mostrar nuevos impulsos para las publicaciones que han sido recientemente impulsadas (sólo afecta a los impulsos recibidos recientemente)
         setting_always_send_emails: Normalmente las notificaciones por correo electrónico no se enviarán cuando estés usando Mastodon activamente
-        setting_default_quote_policy: Los usuarios mencionados siempre pueden citar. Este ajuste solo afecta a las publicaciones creadas con la próxima versión de Mastodon, pero puedes seleccionar tus preferencias anticipadamente
+        setting_default_quote_policy_private: Las publicaciones solo para seguidores hechas en Mastodon no pueden ser citadas por otros usuarios.
+        setting_default_quote_policy_unlisted: Cuando las personas te citen, su publicación también se ocultará en las cronologías públicas.
         setting_default_sensitive: El contenido multimedia sensible está oculto por defecto y puede ser mostrado con un click
         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_emoji_style: Cómo se mostrarán los emojis. "Auto" intentará usar emojis nativos, cambiando a Twemoji en navegadores antiguos.
         setting_system_scrollbars_ui: Solo aplica para navegadores de escritorio basados en Safari y Chrome
         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
@@ -103,7 +105,6 @@ es:
         status_page_url: URL de una página donde se pueda ver el estado de este servidor durante una incidencia
         theme: El tema que los visitantes no registrados y los nuevos usuarios ven.
         thumbnail: Una imagen de aproximadamente 2:1 se muestra junto a la información de tu servidor.
-        timeline_preview: Los visitantes no registrados podrán navegar por los mensajes públicos más recientes disponibles en el servidor.
         trendable_by_default: Omitir la revisión manual del contenido en tendencia. Los elementos individuales aún podrán eliminarse de las tendencias.
         trends: Las tendencias muestran qué publicaciones, etiquetas y noticias están ganando tracción en tu servidor.
         trends_as_landing_page: Mostrar contenido en tendencia para usuarios y visitantes en lugar de una descripción de este servidor. Requiere que las tendencias estén habilitadas.
@@ -150,8 +151,8 @@ es:
       user:
         chosen_languages: Cuando se marca, solo se mostrarán las publicaciones en los idiomas seleccionados en las líneas de tiempo públicas
         date_of_birth:
-          one: Tenemos que asegurarnos de que tienes al menos %{count} años para usar Mastodon. No guardaremos este dato.
-          other: Tenemos que asegurarnos de que tienes al menos %{count} años para usar Mastodon. No guardaremos este dato.
+          one: Tenemos que asegurarnos de que tienes al menos %{count} para usar %{domain}. No guardaremos esta información.
+          other: Tenemos que asegurarnos de que tienes al menos %{count} para usar %{domain}. No guardaremos esta información.
         role: El rol controla qué permisos tiene el usuario.
       user_role:
         color: Color que se utilizará para el rol a lo largo de la interfaz de usuario, como RGB en formato hexadecimal
@@ -159,6 +160,10 @@ es:
         name: Nombre público del rol, si el rol se establece para que se muestre como una insignia
         permissions_as_keys: Los usuarios con este rol tendrán acceso a...
         position: Un rol superior decide la resolución de conflictos en ciertas situaciones. Ciertas acciones sólo pueden llevarse a cabo en roles con menor prioridad
+      username_block:
+        allow_with_approval: En lugar de impedir directamente el registro, los registros coincidentes requerirán tu aprobación
+        comparison: Por favor, ten en cuenta el problema de Scunthorpe al bloquear coincidencias parciales
+        username: Se emparejará independientemente de la mayúscula o minúscula y de homógrafos comunes como «4» por «a» o «3» por «e»
       webhook:
         events: Seleccionar eventos para enviar
         template: Crea tu propio JSON usando interpolación variable. Déjalo en blanco para el JSON predeterminado.
@@ -231,7 +236,7 @@ es:
         setting_auto_play_gif: Reproducir automáticamente los GIFs animados
         setting_boost_modal: Mostrar diálogo de confirmación antes de impulsar una publicación
         setting_default_language: Idioma de publicación
-        setting_default_privacy: Privacidad de publicaciones
+        setting_default_privacy: Visibilidad de publicación
         setting_default_quote_policy: Quién puede citar
         setting_default_sensitive: Marcar siempre imágenes como sensibles
         setting_delete_modal: Mostrar diálogo de confirmación antes de borrar una publicación
@@ -241,6 +246,7 @@ es:
         setting_display_media_default: Por defecto
         setting_display_media_hide_all: Ocultar todo
         setting_display_media_show_all: Mostrar todo
+        setting_emoji_style: Estilo de emoji
         setting_expand_spoilers: Siempre expandir las publicaciones marcadas con advertencias de contenido
         setting_hide_network: Ocultar tu red
         setting_missing_alt_text_modal: Mostrar diálogo de confirmación antes de publicar medios sin texto alternativo
@@ -277,12 +283,16 @@ es:
         content_cache_retention_period: Período de retención de contenido remoto
         custom_css: CSS personalizado
         favicon: Favicon
+        local_live_feed_access: Acceso a las cronologías que destacan publicaciones locales
+        local_topic_feed_access: Acceso a las etiquetas y enlaces en tendencia que destacan publicaciones locales
         mascot: Mascota personalizada (legado)
         media_cache_retention_period: Período de retención de caché multimedia
         min_age: Edad mínima requerida
         peers_api_enabled: Publicar lista de servidores descubiertos en la API
         profile_directory: Habilitar directorio de perfiles
         registrations_mode: Quién puede registrarse
+        remote_live_feed_access: Acceso a las cronologías que destacan publicaciones remotas
+        remote_topic_feed_access: Acceso a las etiquetas y enlaces en tendencia que destacan publicaciones remotas
         require_invite_text: Requerir una razón para unirse
         show_domain_blocks: Mostrar dominios bloqueados
         show_domain_blocks_rationale: Mostrar por qué se bloquearon los dominios
@@ -295,7 +305,6 @@ es:
         status_page_url: URL de página de estado
         theme: Tema por defecto
         thumbnail: Miniatura del servidor
-        timeline_preview: Permitir el acceso no autenticado a las líneas de tiempo públicas
         trendable_by_default: Permitir tendencias sin revisión previa
         trends: Habilitar tendencias
         trends_as_landing_page: Usar tendencias como la página de inicio
@@ -323,6 +332,7 @@ es:
         follow_request: Enviar correo electrónico cuando alguien solicita seguirte
         mention: Enviar correo electrónico cuando alguien te mencione
         pending_account: Enviar correo electrónico cuando una nueva cuenta necesita revisión
+        quote: Alguien te ha citado
         reblog: Enviar correo electrónico cuando alguien comparta su publicación
         report: Nuevo informe enviado
         software_updates:
@@ -369,6 +379,10 @@ es:
         name: Nombre
         permissions_as_keys: Permisos
         position: Prioridad
+      username_block:
+        allow_with_approval: Permitir registros con aprobación
+        comparison: Método de comparación
+        username: Palabra a coincidir
       webhook:
         events: Eventos habilitados
         template: Plantilla de carga
diff --git a/config/locales/simple_form.et.yml b/config/locales/simple_form.et.yml
index f1a0b40bdd1..603d00f26d0 100644
--- a/config/locales/simple_form.et.yml
+++ b/config/locales/simple_form.et.yml
@@ -10,6 +10,7 @@ et:
         indexable: Sinu avalikud postitused võivad ilmuda Mastodoni otsingutulemustes. Inimesed, kes on sinu postitustele reageerinud, saavad neid otsida nii või naa.
         note: 'Saad @mainida teisi inimesi või #silte.'
         show_collections: Inimesed saavad sirvida su jälgijaid ja jälgitavaid. Inimesed, keda sa jälgid, näevad seda sõltumata häälestuse valikust.
+        unlocked: Teised kasutajad saavad sind jälgima hakata nõusolekut küsimata. Eemalda märge, kui soovid jälgimistaotlusi üle vaadata ja valida, kas nõustuda või keelduda uute jälgijatega.
       account_alias:
         acct: Sisesta konto kasutajanimi@domeen, mille soovid siia ümber kolida
       account_migration:
@@ -19,7 +20,7 @@ et:
         title: Valikuline. Ei ole nähtav saajale
       admin_account_action:
         include_statuses: Kasutaja näeb, millised postitused on põhjustanud moderaatori otsuse või hoiatuse
-        send_email_notification: Konto omanik saab selgituse selle kohta, mis juhtus nende kontoga
+        send_email_notification: Kasutajakonto omanik saab selgituse selle kohta, mis juhtus tema kontoga
         text_html: Valikuline. On võimalik kasutada postituse süntaksi. On võimalik <a href="%{path}">lisada hoiatuste eelseadistusi</a> säästmaks aega
         type_html: Vali, mida teha kasutajaga <strong>%{acct}</strong>
         types:
@@ -47,7 +48,7 @@ et:
         digest: Saadetakse ainult pärast pikka tegevusetuse perioodi ja ainult siis, kui on saadetud otsesõnumeid
         email: Sulle saadetakse e-posti teel kinnituskiri
         header: WEBP, PNG, GIF või JPG. Kõige rohkem %{size}. Vähendatakse %{dimensions} pikslini
-        inbox_url: Kopeeri soovitud vahendaja avalehe URL
+        inbox_url: Kopeeri soovitud sõnumivahendusserveri avalehe võrguaadress
         irreversible: Filtreeritud postitused kaovad taastamatult, isegi kui filter on hiljem eemaldatud
         locale: Kasutajaliidese, e-kirjade ja tõuketeadete keel
         password: Vajalik on vähemalt 8 märki
@@ -55,10 +56,14 @@ et:
         scopes: Milliseid API-sid see rakendus tohib kasutada. Kui valid kõrgeima taseme, ei pea üksikuid eraldi valima.
         setting_aggregate_reblogs: Ära kuva uusi postituste jagamisi, mis on hiljuti jagatud (kehtib vaid uutele jagamistele)
         setting_always_send_emails: Mastodoni aktiivsel kasutamisel sulle tavaliselt meilile teavitusi ei saadeta
+        setting_default_quote_policy_private: Ainult jälgijatele mõeldud Mastodoni postitusi ei saa teiste poolt tsiteerida.
+        setting_default_quote_policy_unlisted: Kui teised kasutajad sind tsiteerivad, siis nende postitused peidetakse ajajoonelt, mis näitavad populaarsust koguvaid postitusi.
         setting_default_sensitive: Tundlik meedia on vaikimisi peidetud ning seda saab avada sellele klikkides
         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_emoji_style: See määrab emojide kuvamise viisi. Automaatse valiku puhul üritatakse kasutada platvormi või klientrakenduse oma emojisid, kuid varuvariandina jääb toimima Twemoji (näiteks vanade veebibrauserite puhul).
+        setting_system_scrollbars_ui: Kehtib vaid Safaril ja Chrome'il põhinevatel tavaarvuti veebibrauserite puhul
         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
@@ -73,19 +78,21 @@ et:
       filters:
         action: Tegevuse valik, kui postitus vastab filtrile
         actions:
+          blur: Peida meediumifailid hoiatusega, kuid jäta tekst peitmata
           hide: Filtreeritud sisu täielik peitmine, nagu seda polekski üldse olemas
           warn: Varja filtreeritud sisu hoiatusega, nimetades filtri pealkirja
       form_admin_settings:
         activity_api_enabled: Kohalike postituste, aktiivsete kasutajate ja uute registreerumistr arv nädala kaupa grupeeritult
         app_icon: WEBP, PNG, GIF või JPG. Asendab mobiilsel seadmel äpi vaikeikooni kohandatud ikooniga.
-        backups_retention_period: Kasutajatel on võimalus genereerida oma postitustest hiljem allalaaditav arhiiv. Kui määrata positiivne arv, kustutatakse serveri talletusruumist need arhiivid määratud arvu päevade järel automaatselt.
+        backups_retention_period: Kasutajatel on võimalus genereerida oma postitustest hiljem allalaaditav arhiiv. Kui määrad positiivse arvu, siis kustutatakse need arhiivid serveri andmeruumist määratud arvu päevade järel automaatselt.
         bootstrap_timeline_accounts: Need kasutajad kinnitatakse uute kasutajate jälgimissoovituste esiritta.
         closed_registrations_message: Kuvatakse, kui liitumised pole võimalikud
         content_cache_retention_period: Kõik teiste serverite postitused (sealhulgas jagamised ja vastused) kustutatakse pärast määratud arvu päevade möödumist, sõltumata, kuidas kohalik kasutaja on nende postitustega interakteerunud. Hõlmatud on ka postitused, mille kohalik kasutaja on märkinud järjehoidjaks või lemmikuks. Ka eri instantside kasutajate vahelised privaatsed mainimised kaovad ja neid on võimatu taastada. See seadistus on mõeldud eriotstarbeliste instantside jaoks ja rikub paljude kasutajate ootusi, kui seda rakendatakse üldotstarbelise kasutuse puhul.
         custom_css: Mastodoni veebiliideses on võimalik kasutada kohandatud stiile.
         favicon: WEBP, PNG, GIF või JPG. Asendab Mastodoni vaike- favicon ikooni kohandatud ikooniga.
         mascot: Asendab kohandatud veebiliidese illustratsiooni.
-        media_cache_retention_period: Kaugkasutajate tehtud postituste meediafailid salvestatakse teie serveri vahemällu. Kui see seadistus on seatud positiivsele väärtusele, kustutatakse meediumifailid määratud päevade möödumisel. Kui meediaandmeid küsitakse pärast nende kustutamist, laaditakse need uuesti alla, kui lähtesisu on veel saadaval. Kuna on olemas piirangud, kui tihti tohivad lingikaardid kolmandatelt saitidelt andmeid pärida, on soovitatav määrata väärtuseks vähemalt 14. Vastasel juhul ei uuendata linkide eelvaatekaarte nõudmise korral enne seda aega.
+        media_cache_retention_period: Kaugkasutajate tehtud postituste meediafailid salvestatakse sinu koduserveri vahemällu. Kui see seadistus on seatud positiivsele väärtusele, kustutatakse meediumifailid määratud päevade möödumisel. Kui meediaandmeid küsitakse pärast nende kustutamist, laaditakse need uuesti alla, kui lähtesisu on veel saadaval. Kuna on olemas piirangud, kui tihti tohivad lingikaardid kolmandatelt saitidelt andmeid pärida, on soovitatav määrata väärtuseks vähemalt 14. Vastasel juhul ei uuendata linkide eelvaatekaarte nõudmise korral enne seda aega.
+        min_age: Kasutajad peavad liitumisel kinnitama oma sünnikuupäeva
         peers_api_enabled: Domeeninimede loetelu, mida see server on Fediversumis kohanud. Mitte mingeid andmeid selle serveri födereerumise kohta antud serverite pole, vaid üksnes info, et sellest serverist ollakse teadlik. Seda kasutavad teenused, mis koguvad üldist födereerumise statistikat.
         profile_directory: Kasutajate kataloog kuvab nimekirja kasutajatest, kes on seda lubanud.
         require_invite_text: Kui liitumisi on tarvis kinnitada, oleks "Miks soovid liituda?" vastus vajalik
@@ -98,7 +105,6 @@ et:
         status_page_url: Lehe URL, kus saab serveri maas oleku ajal näha serveri olekut
         theme: Teema, mida näevad sisenemata ning uued kasutajad.
         thumbnail: Umbes 2:1 mõõdus pilt serveri informatsiooni kõrval.
-        timeline_preview: Sisenemata külastajatel on võimalik sirvida viimaseid avalikke postitusi serveril.
         trendable_by_default: Populaarse sisu ülevaatuse vahele jätmine. Pärast seda on siiski võimalik üksikuid üksusi trendidest eemaldada.
         trends: Trendid näitavad, millised postitused, sildid ja uudislood koguvad sinu serveris tähelepanu.
         trends_as_landing_page: Näitab välja logitud kasutajatele ja külalistele serveri kirjelduse asemel populaarset sisu. Populaarne sisu (trendid) peab selleks olema sisse lülitatud.
@@ -128,11 +134,25 @@ et:
         show_application: Sa saad sõltumata sellest vaadata, milline äpp su postituse postitas.
       tag:
         name: Saad muuta ainult tähtede suurtähelisust, näiteks selleks, et muuta seda loetavamaks
+      terms_of_service:
+        changelog: Sisu struktureerimiseks võid kasutada Markdown-keelt.
+        effective_date: Mõsitlik ajavahemik on 10 kuni 30 päeva kasutajate teavitamisest.
+        text: Sisu struktureerimiseks võid kasutada Markdown-keelt.
       terms_of_service_generator:
+        admin_email: Juriidiliste teadete hulka kuuluvad näiteks vastuväited, kohtumäärused, eemaldamisnõuded ja õiguskaitseasutuste päringud.
+        arbitration_address: See võib olla sama, kui ülaltoodud tänavaaadress või „N/A“, kui kasutusel on suhtlus e-kirja teel.
+        arbitration_website: See võib olla veebivorm või „N/A“, kui kasutusel on suhtlus e-kirja teel.
+        choice_of_law: Linn, piirkond, territoorium või riik, mille sisemised materiaalõigusnormid reguleerivad kõiki nõudeid.
         dmca_address: USA operaatorite puhul kasuta DMCA määratud esindajate kataloogis registreeritud aadressi. Postkastide loetelu on saadaval otsese taotluse korral. Kasuta DMCA määratud esindaja postkastist loobumise taotlust, et saata e-kiri autoriõiguse ametile ja kirjeldada, et oled kodus asuv sisu moderaator, kes kardab kättemaksu või kättemaksu oma tegevuse eest ja vajab postkasti, et eemaldada oma kodune aadress avalikust nähtavusest.
+        dmca_email: Võib olla sama e-posti aadress, kui ülaltoodud „E-posti aadress juriidiliste teadete jaoks“.
+        domain: Sinu poolt pakutava võrguteenuse unikaalne tunnus.
         jurisdiction: Nimeta riik, kus elab see, kes arveid maksab. Kui tegemist on äriühingu või muu üksusega, märgi riik, kus see on asutatud, ning vajaduse korral linn, piirkond, territoorium või osariik.
+        min_age: Vanus ei tohiks olla väiksem, kui sinu õigusruumis nõutav alampiir.
       user:
         chosen_languages: Keelte valimisel näidatakse avalikel ajajoontel ainult neis keeltes postitusi
+        date_of_birth:
+          one: "%{domain} saidi teenuste kasutamiseks pead olema vähemalt %{count} aastat vana. Me ei salvesta neid andmeid."
+          other: "%{domain} saidi teenuste kasutamiseks pead olema vähemalt %{count} aastat vana. Me ei salvesta neid andmeid."
         role: Rollid määravad, millised õigused kasutajal on.
       user_role:
         color: Rolli tähistamise värvus üle kasutajaliidese, RGB 16nd-formaadis
@@ -140,12 +160,17 @@ et:
         name: Rolli avalik nimi, kui roll on märgitud avalikuks kuvamiseks märgina
         permissions_as_keys: Selle rolliga kasutajatel on ligipääs...
         position: Kõrgem roll otsustab teatud olukordades konfliktide lahendamise. Teatud toiminguid saab teha ainult madalama prioriteediga rollidega
+      username_block:
+        allow_with_approval: Kohese liitumise asemel peavad vastavusekohased liitumised saama eeleeva heakskiidu
+        comparison: Kui lubad blokeerimise osalise vastavuse alusel, siis palun arvesta Scunthorpe'i probleemi tekkimise võimalusega
+        username: Vastavust kontrollitakse sõltumata tähesuurusele või levinumate sarnaste tähtemärkide olemasolule, näiteks „4“ → „a“ või „3“ → „e“
       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:
+        attribution_domains: Veebisaidid, mis võivad sind algallikana mainida
         discoverable: Tõsta postitused ja profiil avastamise algoritmides esile
         fields:
           name: Nimetus
@@ -196,7 +221,7 @@ et:
         fields: Veebiviited
         header: Päis
         honeypot: "%{label} (ära sisesta)"
-        inbox_url: Vahendaja sisendkausta URL
+        inbox_url: Sõnumivahendusserveri sisendkausta võrguaadress
         irreversible: Kustuta selle asemel, et peita
         locale: Kasutajaliidese keel
         max_uses: Maksimum kasutajate arv
@@ -212,6 +237,7 @@ et:
         setting_boost_modal: Näita enne jagamist kinnitusdialoogi
         setting_default_language: Postituse keel
         setting_default_privacy: Postituse nähtavus
+        setting_default_quote_policy: Kes võivad tsiteerida
         setting_default_sensitive: Alati märgista meedia tundlikuks
         setting_delete_modal: Näita kinnitusdialoogi enne postituse kustutamist
         setting_disable_hover_cards: Keela profiili eelvaade kui hõljutada
@@ -220,10 +246,13 @@ et:
         setting_display_media_default: Vaikimisi
         setting_display_media_hide_all: Peida kõik
         setting_display_media_show_all: Kuva kõik
+        setting_emoji_style: Emojide stiil
         setting_expand_spoilers: Alati näita tundlikuks märgitud postituste sisu
         setting_hide_network: Peida oma võrk
+        setting_missing_alt_text_modal: Näita kinnitusvaadet enne ilma selgitustekstita meediumit sisaldava postutuse avaldamist
         setting_reduce_motion: Vähenda animatsioonides liikumist
         setting_system_font_ui: Kasuta süsteemi vaikefonti
+        setting_system_scrollbars_ui: Kasuta süsteemi vaikimisi kerimisriba
         setting_theme: Saidi teema
         setting_trends: Näita tänaseid trende
         setting_unfollow_modal: Näita kinnitusdialoogi enne jälgimise eemaldamist
@@ -242,6 +271,7 @@ et:
         name: Silt
       filters:
         actions:
+          blur: Peida hoiatusega meedia
           hide: Peida täielikult
           warn: Peida hoiatusega
       form_admin_settings:
@@ -271,7 +301,6 @@ et:
         status_page_url: Oleku lehe URL
         theme: Vaikmisi teema
         thumbnail: Serveri pisipilt
-        timeline_preview: Luba autentimata ligipääs avalikele ajajoontele
         trendable_by_default: Luba trendid eelneva ülevaatuseta
         trends: Luba trendid
         trends_as_landing_page: Kasuta maabumislehena lehte Populaarne
@@ -299,6 +328,7 @@ et:
         follow_request: Saada e-kiri, kui keegi soovib sind jälgida
         mention: Saada e-kiri, kui keegi mainib sind
         pending_account: Saada e-kiri, kui uus konto vajab ülevaatlust
+        quote: Keegi tsiteeris sind
         reblog: Keegi jagas postitust
         report: Esitatud on uus raport
         software_updates:
@@ -325,6 +355,11 @@ et:
         text: Kasutustingimused
       terms_of_service_generator:
         admin_email: E-posti aadress juriidiliste teadete jaoks
+        arbitration_address: Tänava-aadress kohtuteadete saatmiseks
+        arbitration_website: Veebisait kohtuteadete saatmiseks
+        choice_of_law: Kasutatav õigusruum
+        dmca_address: Tänava-aadress DCMA või autoriõigustega seotud teadete jaoks
+        dmca_email: E-posti aadress DCMA või autoriõigustega seotud teadete jaoks
         domain: Domeen
         jurisdiction: Jurisdiktsioon
         min_age: Vanuse alampiir
@@ -340,6 +375,10 @@ et:
         name: Nimi
         permissions_as_keys: Load
         position: Positsioon
+      username_block:
+        allow_with_approval: Luba kinnitamisega registreerimine
+        comparison: Võrdlemise meetod
+        username: Sõna, millele otsime vastet
       webhook:
         events: Lubatud sündmused
         template: Manuse mall
diff --git a/config/locales/simple_form.eu.yml b/config/locales/simple_form.eu.yml
index dfe6c0b6d77..ff4c4ed30a7 100644
--- a/config/locales/simple_form.eu.yml
+++ b/config/locales/simple_form.eu.yml
@@ -60,6 +60,7 @@ 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_emoji_style: Nola bistaratu emojiak. "Automatikoki" aukeran emoji natiboak erabiltzen saiatuko dira, baina Twemojira itzuliko dira arakatzaile zaharretarako.
         setting_system_scrollbars_ui: Safari eta Chrome-n oinarritutako mahaigaineko nabigatzaileei bakarrik aplikatzen zaie
         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
@@ -75,6 +76,7 @@ eu:
       filters:
         action: Aukeratu ze ekintza burutu behar den bidalketa bat iragazkiarekin bat datorrenean
         actions:
+          blur: Ezkutatu edukia ohar baten atzean, testua bera ezkutatu gabe
           hide: Ezkutatu erabat iragazitako edukia, existituko ez balitz bezala
           warn: Ezkutatu iragazitako edukia iragazkiaren izenburua duen abisu batekin
       form_admin_settings:
@@ -88,6 +90,7 @@ eu:
         favicon: WEBP, PNG, GIF or JPG. Mastodon-en favicon-a gainidazten du ikono pertsonalizatu batekin.
         mascot: Web interfaze aurreratuko ilustrazioa gainidazten du.
         media_cache_retention_period: Multimedia-fitxategiak dituzten urruneko erabiltzaileen argitalpenak zure zerbitzarian gordetzen dira cachean. Balio positiboa ezartzean, multimedia zehazturiko egunen buruan ezabatuko da. Multimedia-datuak eskatzen badira ezabatu ostean, berriro deskargatuko dira, iturburuko edukia oraindik erabilgarri badago. Estekaren aurrebistako txartelek hirugarrenen guneei zenbatetan dei diezaieketen mugatzen dieten murrizketak direla eta, balio honi, gutxienez, 14 egunen balioa ezartzea gomendatzen da, bestela, esteken aurrebistako txartelak ez dira eguneratuko eskatu ahala denbora horren aurretik.
+        min_age: Erabiltzaileei jaiotze-data berresteko eskatuko zaie izen-ematean
         peers_api_enabled: Zerbitzari honek fedibertsoan ikusi dituen zerbitzarien domeinu-izenen zerrenda. Ez da daturik ematen zerbitzari jakin batekin federatzearen ala ez federatzearen inguruan, zerbitzariak haien berri duela soilik. Federazioari buruzko estatistika orokorrak biltzen dituzten zerbitzuek erabiltzen dute hau.
         profile_directory: Profilen direktorioan ikusgai egotea aukeratu duten erabiltzaile guztiak zerrendatzen dira.
         require_invite_text: Izen emateak eskuz onartu behar direnean, "Zergatik elkartu nahi duzu?" testu sarrera derrigorrezko bezala ezarri, ez hautazko
@@ -100,7 +103,6 @@ eu:
         status_page_url: Kanporatua dagoen jendeak zerbitzari honen egoera ikus dezaten gune baten URL
         theme: Saioa hasi gabeko erabiltzaileek eta berriek ikusiko duten gaia.
         thumbnail: Zerbitzariaren informazioaren ondoan erakusten den 2:1 inguruko irudia.
-        timeline_preview: Saioa hasi gabeko erabiltzaileek ezingo dituzte arakatu zerbitzariko bidalketa publiko berrienak.
         trendable_by_default: Saltatu joeretako edukiaren eskuzko berrikuspena. Ondoren elementuak banan-bana kendu daitezke joeretatik.
         trends: Joeretan zure zerbitzarian bogan dauden bidalketa, traola eta albisteak erakusten dira.
         trends_as_landing_page: Erakutsi pil-pilean dagoen edukia saioa hasita ez duten erabiltzaileei eta bisitariei, zerbitzari honen deskribapena erakutsi ordez. Joerak aktibatuak edukitzea beharrezkoa da.
@@ -132,9 +134,12 @@ eu:
         name: Letrak maiuskula/minuskulara aldatu ditzakezu besterik ez, adibidez irakurterrazago egiteko
       terms_of_service:
         changelog: Markdown-en sintaxiarekin egitura daiteke.
+        effective_date: Zentzuzko epe bat 10 eta 30 egun bitartekoa izan daiteke, erabiltzaileei jakinarazten diezun egunetik kontatzen hasita.
         text: Markdown-en sintaxiarekin egitura daiteke.
       terms_of_service_generator:
         admin_email: Legezko abisuak, kontraindikazioak, agindu judizialak, erretiratzeko eskaerak eta legea betetzeko eskaerak barne.
+        arbitration_address: Goiko helbide fisikoa edo "N/A" bera izan daiteke posta elektronikoa erabiliz gero.
+        arbitration_website: Web formularioa izan daiteke, edo "N/A" posta elektronikoa erabiliz gero.
       user:
         chosen_languages: Markatzean, hautatutako hizkuntzetan dauden tutak besterik ez dira erakutsiko.
       user_role:
@@ -215,7 +220,6 @@ eu:
         setting_auto_play_gif: Erreproduzitu GIF animatuak automatikoki
         setting_boost_modal: Erakutsi baieztapen elkarrizketa-koadroa bultzada eman aurretik
         setting_default_language: Argitalpenen hizkuntza
-        setting_default_privacy: Mezuen pribatutasuna
         setting_default_sensitive: Beti markatu edukiak hunkigarri gisa
         setting_delete_modal: Erakutsi baieztapen elkarrizketa-koadroa toot bat ezabatu aurretik
         setting_disable_swiping: Desgaitu hatza pasatzeko mugimenduak
@@ -223,7 +227,7 @@ eu:
         setting_display_media_default: Lehenetsia
         setting_display_media_hide_all: Ezkutatu guztia
         setting_display_media_show_all: Erakutsi guztia
-        setting_expand_spoilers: Hedatu beti edukia abisua (CW) duten  tootak
+        setting_expand_spoilers: Zabaldu beti edukiaren abisuak dituzten argitalpenak
         setting_hide_network: Ezkutatu zure sarea
         setting_reduce_motion: Murriztu animazioen mugimenduak
         setting_system_font_ui: Erabili sistemako tipografia lehenetsia
@@ -258,6 +262,7 @@ eu:
         favicon: Gune-ikurra
         mascot: Maskota pertsonalizatua (zaharkitua)
         media_cache_retention_period: Multimediaren cachea atxikitzeko epea
+        min_age: Gutxieneko adin-eskakizuna
         peers_api_enabled: Argitaratu aurkitutako zerbitzarien zerrenda APIan
         profile_directory: Gaitu profil-direktorioa
         registrations_mode: Nork eman dezake izena
@@ -273,7 +278,6 @@ eu:
         status_page_url: Egoera-orriaren URLa
         theme: Lehenetsitako gaia
         thumbnail: Zerbitzariaren koadro txikia
-        timeline_preview: Onartu autentifikatu gabeko sarbidea denbora lerro publikoetara
         trendable_by_default: Onartu joerak aurrez berrikusi gabe
         trends: Gaitu joerak
         trends_as_landing_page: Erabili joerak hasierako orri gisa
@@ -327,6 +331,9 @@ eu:
       terms_of_service_generator:
         domain: Domeinua
       user:
+        date_of_birth_1i: Eguna
+        date_of_birth_2i: Hilabetea
+        date_of_birth_3i: Urtea
         role: Rola
         time_zone: Ordu zona
       user_role:
diff --git a/config/locales/simple_form.fa.yml b/config/locales/simple_form.fa.yml
index 1e5a388d67c..dac3c88bf9d 100644
--- a/config/locales/simple_form.fa.yml
+++ b/config/locales/simple_form.fa.yml
@@ -56,11 +56,11 @@ fa:
         scopes: واسط‌های برنامه‌نویسی که این برنامه به آن دسترسی دارد. اگر بالاترین سطح دسترسی را انتخاب کنید، دیگر نیازی به انتخاب سطح‌های پایینی ندارید.
         setting_aggregate_reblogs: برای تقویت‌هایی که به تازگی برایتان نمایش داده شده‌اند، تقویت‌های بیشتر را نمایش نده (فقط روی تقویت‌های اخیر تأثیر می‌گذارد)
         setting_always_send_emails: در حالت عادی آگاهی‌های رایانامه‌ای هنگامی که فعّالانه از ماستودون استفاده می‌کنید فرستاده نمی‌شوند
-        setting_default_quote_policy: کاربران اشاره شده همواره مجاز به نقل قولند. این تنظیمات تنها روی فرسته‌های ایجاد شده با نگارش بعدی ماستودون موثّر است، ولی می‌توانید ترجیحاتتان را پیشاپیش بگزینید
         setting_default_sensitive: تصاویر حساس به طور پیش‌فرض پنهان هستند و می‌توانند با یک کلیک آشکار شوند
         setting_display_media_default: تصویرهایی را که به عنوان حساس علامت زده شده‌اند پنهان کن
         setting_display_media_hide_all: همیشه همهٔ عکس‌ها و ویدیوها را پنهان کن
         setting_display_media_show_all: همیشه تصویرهایی را که به عنوان حساس علامت زده شده‌اند را نشان بده
+        setting_emoji_style: چگونگی نمایش شکلک‌ها. «خودکار» تلاش خواهد کرد از شکلک‌های بومی استفاده کند؛ ولی برای مرورگرهای قدیمی به توییموجی برخواهد گشت.
         setting_system_scrollbars_ui: فقط برای مرورگرهای دسکتاپ مبتنی بر سافاری و کروم اعمال می شود
         setting_use_blurhash: سایه‌ها بر اساس رنگ‌های به‌کاررفته در تصویر پنهان‌شده ساخته می‌شوند ولی جزئیات تصویر در آن‌ها آشکار نیست
         setting_use_pending_items: به جای پیش‌رفتن خودکار در فهرست، به‌روزرسانی فهرست نوشته‌ها را پشت یک کلیک پنهان کن
@@ -103,7 +103,6 @@ fa:
         status_page_url: نشانی وب صفحه‌ای که در آن افراد می‌توانند وضعیت این سرور را در هنگام قطع شدن ببینند
         theme: زمینه‌ای که بینندگان خارج شده و کاربران جدید می‌بینند.
         thumbnail: یک تصویر تقریباً 2:1 در کنار اطلاعات سرور شما نمایش داده می شود.
-        timeline_preview: بازدیدکنندگانی که از سیستم خارج شده اند می توانند جدیدترین پست های عمومی موجود در سرور را مرور کنند.
         trendable_by_default: از بررسی دستی محتوای پرطرفدار صرف نظر کنید. آیتم های فردی هنوز هم می توانند پس از واقعیت از روند حذف شوند.
         trends: روندها نشان می‌دهند که کدام پست‌ها، هشتگ‌ها و داستان‌های خبری در سرور شما مورد توجه قرار گرفته‌اند.
         trends_as_landing_page: به جای توضیح این سرور، محتوای پرطرفدار را به کاربران و بازدیدکنندگان از سیستم خارج شده نشان دهید. نیاز به فعال شدن روندها دارد.
@@ -150,8 +149,8 @@ fa:
       user:
         chosen_languages: اگر انتخاب کنید، تنها نوشته‌هایی که به زبان‌های برگزیدهٔ شما نوشته شده‌اند در فهرست نوشته‌های عمومی نشان داده می‌شوند
         date_of_birth:
-          one: برای استفاده از ماستودون باید مطمئن شویم کمینه %{count} سال را دارید. این مورد را ذخیره نخواهیم کرد.
-          other: برای استفاده از ماستودون باید مطمئن شویم کمینه %{count} سال را دارید. این مورد را ذخیره نخواهیم کرد.
+          one: برای استفاده از %{domain} باید مطمئن شویم کمینه %{count} سال را دارید. این مورد را ذخیره نخواهیم کرد.
+          other: برای استفاده از %{domain} باید مطمئن شویم کمینه %{count} سال را دارید. این مورد را ذخیره نخواهیم کرد.
         role: نقش کنترل می کند که کاربر چه مجوزهایی دارد.
       user_role:
         color: رنگی که برای نقش در سرتاسر UI استفاده می شود، به عنوان RGB در قالب هگز
@@ -159,6 +158,10 @@ fa:
         name: نام عمومی نقش، اگر قرار است نقش به عنوان یک نشان نمایش داده شود
         permissions_as_keys: کاربرانی که این نقش را دارند به...
         position: نقش بالاتر در موقعیت‌های خاص حل تعارض را تعیین می‌کند. برخی اقدامات را فقط می توان روی نقش هایی با اولویت کمتر انجام داد
+      username_block:
+        allow_with_approval: به جای جلوگیری از ثبت‌نام، ثبت‌نام‌های مطابق نیازمند تأییدتان خواهند بود
+        comparison: لطفاً هنگام مسدود کردن تطابق‌های جزیی به مشکل اسکان‌ثورپ توجّه داشته باشید
+        username: تطبیق بدون توجه به بزرگی و کوچکی یا استفاده از نویسه‌های مشابه مثل 4 به جای a یا 3 به جای e
       webhook:
         events: گزینش رویدادها برای فرستادن
         template: بار JSON خود را با استفاده از درون یابی متغیر بنویسید. JSON پیش فرض را خالی بگذارید.
@@ -231,8 +234,7 @@ fa:
         setting_auto_play_gif: پخش خودکار تصویرهای متحرک
         setting_boost_modal: نمایش پیغام تأیید پیش از تقویت کردن
         setting_default_language: زبان نوشته‌های شما
-        setting_default_privacy: حریم خصوصی نوشته‌ها
-        setting_default_quote_policy: افراد مجاز به نقل قول
+        setting_default_quote_policy: افراد مجاز به نقل
         setting_default_sensitive: همیشه تصاویر را به عنوان حساس علامت بزن
         setting_delete_modal: نمایش پیغام تأیید پیش از پاک کردن یک نوشته
         setting_disable_hover_cards: از کار انداختن پیش‌نمایش نمایه هنگام رفتن رویش
@@ -241,6 +243,7 @@ fa:
         setting_display_media_default: پیش‌فرض
         setting_display_media_hide_all: نهفتن همه
         setting_display_media_show_all: نمایش همه
+        setting_emoji_style: سبک شکلک
         setting_expand_spoilers: همیشه فرسته‌هایی را که هشدار محتوا دارند کامل نشان بده
         setting_hide_network: نهفتن شبکهٔ ارتباطی
         setting_missing_alt_text_modal: نمایش گفتگوی تایید قبل از ارسال رسانه بدون متن جایگزین
@@ -295,7 +298,6 @@ fa:
         status_page_url: نشانی صفحهٔ وضعیت
         theme: زمینهٔ پیش‌گزیده
         thumbnail: بندانگشتی کارساز
-        timeline_preview: اجازهٔ دسترسی بدون تأیید هویت به خط‌زمانی‌های عمومی
         trendable_by_default: اجازهٔ پرطرفدار شدن بدون بازبینی پیشین
         trends: به کار انداختن پرطرفدارها
         trends_as_landing_page: استفاده از داغ‌ها به عنوان صفحهٔ فرود
@@ -323,6 +325,7 @@ fa:
         follow_request: شخصی خواست پیتان بگیرد
         mention: شخصی از شما نام برد
         pending_account: حساب تازهٔ نیازمند بررسی
+        quote: شخصی شما را نقل کرد
         reblog: شخصی فرسته‌تان را تقویت کرد
         report: گزارش جدیدی فرستاده شد
         software_updates:
@@ -369,6 +372,10 @@ fa:
         name: نام
         permissions_as_keys: اجازه‌ها
         position: اولویت
+      username_block:
+        allow_with_approval: اجازهٔ ثبت‌نام با تأیید
+        comparison: روش مقایسه
+        username: واژه برای تطبیق
       webhook:
         events: رویدادهای به کار افتاده
         template: قالب بار
diff --git a/config/locales/simple_form.fi.yml b/config/locales/simple_form.fi.yml
index 82f47cd6f32..d99e86feeeb 100644
--- a/config/locales/simple_form.fi.yml
+++ b/config/locales/simple_form.fi.yml
@@ -56,11 +56,13 @@ fi:
         scopes: Mihin ohjelmointirajapintoihin sovelluksella on pääsy. Jos valitset ylätason käyttöoikeuden, sinun ei tarvitse valita yksittäisiä.
         setting_aggregate_reblogs: Älä näytä uusia tehostuksia julkaisuille, joita on äskettäin tehostettu (koskee vain juuri vastaanotettuja tehostuksia)
         setting_always_send_emails: Yleensä sähköposti-ilmoituksia ei lähetetä, kun käytät Mastodonia aktiivisesti
-        setting_default_quote_policy: Mainitut käyttäjät saavat aina lainata. Tämä asetus koskee vain julkaisuja, jotka on luotu seuraavalla Mastodon-versiolla, mutta voit valita asetuksesi valmistautuaksesi
+        setting_default_quote_policy_private: Muut eivät voi lainata vain seuraajille tarkoitettuja, Mastodonissa kirjoitettuja julkaisuja.
+        setting_default_quote_policy_unlisted: Kun ihmiset lainaavat sinua, heidän julkaisunsa piilotetaan suosittujen julkaisujen aikajanoilta.
         setting_default_sensitive: Arkaluonteinen media piilotetaan oletusarvoisesti, ja se voidaan näyttää yhdellä napsautuksella
         setting_display_media_default: Piilota arkaluonteiseksi merkitty mediasisältö
         setting_display_media_hide_all: Piilota mediasisältö aina
         setting_display_media_show_all: Näytä mediasisältö aina
+        setting_emoji_style: Miten emojit näkyvät. ”Automaattinen” pyrkii käyttämään natiiveja emojeita, mutta Twemoji-emojeita käytetään varavaihtoehtoina vanhoissa selaimissa.
         setting_system_scrollbars_ui: Koskee vain Safari- ja Chrome-pohjaisia työpöytäselaimia
         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
@@ -103,7 +105,6 @@ fi:
         status_page_url: URL-osoite sivulle, josta tämän palvelimen tilan voi ongelmatilanteissa tarkistaa
         theme: Teema, jonka uloskirjautuneet vierailijat ja uudet käyttäjät näkevät.
         thumbnail: Noin 2:1 kuva näkyy palvelimen tietojen ohessa.
-        timeline_preview: Uloskirjautuneet vierailijat voivat selata uusimpia julkisia julkaisuja, jotka ovat saatavilla palvelimella.
         trendable_by_default: Ohita suositun sisällön manuaalinen tarkastus. Yksittäisiä kohteita voidaan edelleen poistaa jälkikäteen.
         trends: Trendit osoittavat, mitkä julkaisut, aihetunnisteet ja uutiset keräävät huomiota palvelimellasi.
         trends_as_landing_page: Näytä vierailijoille ja uloskirjautuneille käyttäjille suosittua sisältöä palvelimen kuvauksen sijaan. Edellyttää, että trendit on otettu käyttöön.
@@ -149,8 +150,8 @@ fi:
       user:
         chosen_languages: Jos valitset kieliä oheisesta luettelosta, vain niidenkieliset julkaisut näkyvät sinulle julkisilla aikajanoilla
         date_of_birth:
-          one: Meidän on varmistettava, että olet vähintään %{count}, jotta voi käyttää Mastodonia. Emme tallenna tätä.
-          other: Meidän on varmistettava, että olet vähintään %{count}, jotta voi käyttää Mastodonia. Emme tallenna tätä.
+          one: Meidän tulee varmistaa, että olet vähintään %{count}, jotta voit käyttää %{domain}. Emme tallenna tätä.
+          other: Meidän tulee varmistaa, että olet vähintään %{count}, jotta voit käyttää %{domain}. Emme tallenna tätä.
         role: Rooli määrää, millaiset käyttöoikeudet käyttäjällä on.
       user_role:
         color: Väri, jota käytetään roolille kaikkialla käyttöliittymässä, RGB-heksadesimaalimuodossa
@@ -158,6 +159,10 @@ fi:
         name: Roolin julkinen nimi, jos rooli on asetettu näytettäväksi merkkinä
         permissions_as_keys: Käyttäjillä, joilla on tämä rooli, on käyttöoikeus…
         position: Korkeampi rooli ratkaisee konfliktit tietyissä tilanteissa. Tiettyjä toimia voidaan suorittaa vain rooleilla, joiden prioriteetti on pienempi
+      username_block:
+        allow_with_approval: Sen sijaan, että rekisteröityminen estetään kokonaan, sääntöä vastaavat rekisteröitymiset edellyttävät hyväksyntääsi
+        comparison: Ota Scunthorpe-ongelma huomioon, kun estät osittaisia osumia
+        username: Vastaa riippumatta aakkoskoosta ja yleisistä homoglyyfeistä kuten ”4” merkille ”a” ja ”3” merkille ”e”
       webhook:
         events: Valitse lähetettävät tapahtumat
         template: Luo oma JSON-hyötykuorma käyttäen muuttujien interpolointia. Jätä kenttä tyhjäksi käyttääksesi vakio-JSON-kuormaa.
@@ -240,6 +245,7 @@ fi:
         setting_display_media_default: Oletus
         setting_display_media_hide_all: Piilota kaikki
         setting_display_media_show_all: Näytä kaikki
+        setting_emoji_style: Emojityyli
         setting_expand_spoilers: Laajenna aina sisältövaroituksilla merkityt julkaisut
         setting_hide_network: Piilota verkostotietosi
         setting_missing_alt_text_modal: Näytä vahvistusikkuna ennen kuin julkaistaan mediaa ilman vaihtoehtoista tekstiä
@@ -276,12 +282,16 @@ fi:
         content_cache_retention_period: Etäsisällön säilytysaika
         custom_css: Mukautettu CSS
         favicon: Sivustokuvake
+        local_live_feed_access: Pääsy paikallisia julkaisuja esitteleviin livesyötteisiin
+        local_topic_feed_access: Pääsy paikallisia julkaisuja esitteleviin aihetunniste- ja linkkisyötteisiin
         mascot: Mukautettu maskotti (vanhentunut)
         media_cache_retention_period: Mediasisällön välimuistin säilytysaika
         min_age: Vähimmäisikävaatimus
         peers_api_enabled: Julkaise löydettyjen palvelinten luettelo ohjelmointirajapinnassa
         profile_directory: Ota profiilihakemisto käyttöön
         registrations_mode: Kuka voi rekisteröityä
+        remote_live_feed_access: Pääsy etäjulkaisuja esitteleviin livesyötteisiin
+        remote_topic_feed_access: Pääsy etäjulkaisuja esitteleviin aihetunniste- ja linkkisyötteisiin
         require_invite_text: Vaadi liittymissyy
         show_domain_blocks: Näytä verkkotunnusten estot
         show_domain_blocks_rationale: Näytä, miksi verkkotunnukset on estetty
@@ -294,7 +304,6 @@ fi:
         status_page_url: Tilasivun URL-osoite
         theme: Oletusteema
         thumbnail: Palvelimen pienoiskuva
-        timeline_preview: Salli todentamaton pääsy julkisille aikajanoille
         trendable_by_default: Salli trendit ilman ennakkotarkastusta
         trends: Ota trendit käyttöön
         trends_as_landing_page: Käytä trendejä aloitussivuna
@@ -322,6 +331,7 @@ fi:
         follow_request: Joku pyysi lupaa seurata sinua
         mention: Joku mainitsi sinut
         pending_account: Uusi tili tarvitsee tarkastuksen
+        quote: Joku lainasi sinua
         reblog: Joku tehosti julkaisuasi
         report: Uusi raportti lähetettiin
         software_updates:
@@ -350,6 +360,7 @@ fi:
         admin_email: Sähköpostiosoite oikeudellisille ilmoituksille
         arbitration_address: Fyysinen osoite välimiesmenettelyn ilmoituksille
         arbitration_website: Sähköpostiosoite välimiesmenettelyn ilmoituksille
+        choice_of_law: Sovellettava lainsäädäntö
         dmca_address: Fyysinen osoite DMCA-/tekijänoikeusilmoituksille
         dmca_email: Sähköpostiosoite DMCA-/tekijänoikeusilmoituksille
         domain: Verkkotunnus
@@ -367,6 +378,10 @@ fi:
         name: Nimi
         permissions_as_keys: Käyttöoikeudet
         position: Prioriteetti
+      username_block:
+        allow_with_approval: Salli rekisteröitymiset hyväksynnällä
+        comparison: Vertailumenetelmä
+        username: Vastattava sana
       webhook:
         events: Käytössä olevat tapahtumat
         template: Hyötykuormapohja
diff --git a/config/locales/simple_form.fo.yml b/config/locales/simple_form.fo.yml
index c3f1dad678a..605b32fd80e 100644
--- a/config/locales/simple_form.fo.yml
+++ b/config/locales/simple_form.fo.yml
@@ -56,11 +56,13 @@ fo:
         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.
         setting_aggregate_reblogs: Vís ikki nýggjar stimbranir fyri postar, sum nýliga eru stimbraðir (ávirkar einans stimbranir, ið eru móttiknar fyri kortum)
         setting_always_send_emails: Vanliga vera teldupostfráboðanir ikki sendar, tá tú virkin brúkar Mastodon
-        setting_default_quote_policy: Nevndir brúkarar hava altíð loyvi at sitera. Hendan stillingin verður bara virkin fyri postar, sum verða stovnaðir í næstu Mastodon útgávuni, men sum fyrireiking til tað, kanst tú velja tína stilling longu nú
+        setting_default_quote_policy_private: Postar, sum einans eru fyri fylgjarar á Mastodon, kunnu ikki siterast av øðrum.
+        setting_default_quote_policy_unlisted: Tá fólk sitera teg, so vera teirra postar eisini fjaldir frá tíðarlinjum við ráki.
         setting_default_sensitive: Viðkvæmar miðlafílur eru fjaldar og kunnu avdúkast við einum klikki
         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_emoji_style: Hvussu kenslutekn vera víst. "Sjálvvirkandi" roynir at brúka upprunalig kenslutekn, men fellir aftur á Twitter kenslutekn í eldri kagum.
         setting_system_scrollbars_ui: Er einans viðkomandi fyri skriviborðskagar grundaðir á Safari og Chrome
         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
@@ -103,7 +105,6 @@ fo:
         status_page_url: Slóð til eina síðu, har ið fólk kunnu síggja støðuna á hesum ambætaranum í sambandi við streymslit
         theme: Uppsetingareyðkenni, sum vitjandi, ið ikki eru ritaði inn, og nýggir brúkarar síggja.
         thumbnail: Ein mynd í lutfallinum 2:1, sum verður víst saman við ambætaraupplýsingunum hjá tær.
-        timeline_preview: Vitjandi, sum eru ritaði út, fara at kunna blaða ígjøgnum nýggjastu almennu postarnar, sum eru tøkir á ambætaranum.
         trendable_by_default: Loyp uppum serskilda eftirkannan av tilfari, sum er vælumtókt. Einstakir lutir kunnu framvegis strikast frá listum við vælumtóktum tilfari seinni.
         trends: Listar við vælumtóktum tilfari vísa, hvørjir postar, frámerki og tíðindasøgur hava framburð á tínum ambætara.
         trends_as_landing_page: Vís vitjandi og brúkarum, sum ikki eru innritaðir, rák í staðin fyri eina lýsing av ambætaranum. Krevur at rák eru virkin.
@@ -150,8 +151,8 @@ fo:
       user:
         chosen_languages: Tá hetta er valt, verða einans postar í valdum málum vístir á almennum tíðarlinjum
         date_of_birth:
-          one: Vit mugu tryggja okkum, at tú er í minsta lagi %{count} fyri at brúka Mastodon. Vit goyma ikki hesar upplýsingar.
-          other: Vit mugu tryggja okkum, at tú er í minsta lagi %{count} fyri at brúka Mastodon. Vit goyma ikki hesar upplýsingar.
+          one: Vit mugu tryggja okkum, at tú er í minsta lagi %{count} fyri at brúka %{domain}. Vit goyma ikki hesar upplýsingar.
+          other: Vit mugu tryggja okkum, at tú er í minsta lagi %{count} ár fyri at brúka %{domain}. Vit goyma ikki hesar upplýsingar.
         role: Leikluturin stýrir hvørji rættindi, brúkarin hevur.
       user_role:
         color: Litur, sum leikluturin hevur í øllum brúkaramarkamótinum, sum RGB og upplýst sum sekstandatal
@@ -159,6 +160,10 @@ fo:
         name: Almenna navnið á leiklutinum, um leikluturin er settur at verða vístur sum eitt tignarmerki
         permissions_as_keys: Brúkarar við hesum leiklutinum fara at fáa atgongd til...
         position: Hægri leiklutur er avgerandi fyri loysn av ósemjum í ávísum støðum. Ávísar atgerðir kunnu einans verða gjørdar móti leiklutum, sum hava eina lægri raðfesting
+      username_block:
+        allow_with_approval: Í staðin fyri at forða heilt fyri skráseting, fara samsvarandi skrásetingar at krevja, at tú góðkennir tær
+        comparison: Vinarliga gev Scunthorpe-trupulleikanum gætur, tá tú blokerar lutvís samsvar
+        username: Samsvar vera funnin óansæð stórar og smáar bókstavir og vanligar homoglyffir, sosum "4" fyri "a" og "3" fyri "e"
       webhook:
         events: Vel hendingar at senda
         template: Samanset títt egna JSON farm við at brúka variabul-interpolasjón. Lat vera blankt fyri sjálvgaldandi JSON.
@@ -231,7 +236,7 @@ fo:
         setting_auto_play_gif: Spæl teknimyndagjørdar GIFar sjálvvirkandi
         setting_boost_modal: Vís váttanarmynd, áðrenn tú stimbrar postar
         setting_default_language: Mál, sum verður brúkt til postar
-        setting_default_privacy: Hvussu privatir eru postar?
+        setting_default_privacy: Postar sýni
         setting_default_quote_policy: Hvør kann sitera
         setting_default_sensitive: Merk altíð miðlafílur sum viðkvæmar
         setting_delete_modal: Vís váttanarmynd, áðrenn postar verða strikaðir
@@ -241,6 +246,7 @@ fo:
         setting_display_media_default: Sjálvvirði
         setting_display_media_hide_all: Fjal alt
         setting_display_media_show_all: Vís alt
+        setting_emoji_style: Kensluteknsstílur
         setting_expand_spoilers: Víðka altíð postar, sum eru merktir við innihaldsávaringum
         setting_hide_network: Fjal sosiala grafin hjá tær
         setting_missing_alt_text_modal: Spyr um góðkenning áðrenn miðlar uttan alternativan tekst verða postaðir
@@ -277,12 +283,16 @@ fo:
         content_cache_retention_period: Tíðarskeið fyri varðveiðslu av fjartilfari
         custom_css: Serskilt CSS
         favicon: Favikon
+        local_live_feed_access: Atgongd til beinleiðis rásir við lokalum postum
+        local_topic_feed_access: Atgongd til frámerki og rásir við leinkjum við lokalum postum
         mascot: Serskildur maskottur (arvur)
         media_cache_retention_period: Tíðarskeið, har miðlagoymslur verða varðveittar
         min_age: Aldursmark
         peers_api_enabled: Kunnger lista við uppdagaðum ambætarum í API'num
         profile_directory: Ger vangaskrá virkna
         registrations_mode: Hvør kann tilmelda seg
+        remote_live_feed_access: Atgongd til beinleiðis rásir við fjarum postum
+        remote_topic_feed_access: Atgongd til frámerki og rásir við leinkjum við fjarum postum
         require_invite_text: Krev eina orsøk at luttaka
         show_domain_blocks: Vís navnaøkisblokeringar
         show_domain_blocks_rationale: Vís hví navnaøki vóru blokeraði
@@ -295,7 +305,6 @@ fo:
         status_page_url: Slóð til støðusíðu
         theme: Sjálvvalt uppsetingareyðkenni
         thumbnail: Ambætarasmámynd
-        timeline_preview: Loyv teimum, sum ikki eru ritaði inn, atgongd til almennar tíðarlinjur
         trendable_by_default: Loyv vælumtóktum tilfari uttan at viðgera tað fyrst
         trends: Loyv ráki
         trends_as_landing_page: Brúka rák sum lendingarsíðu
@@ -323,6 +332,7 @@ fo:
         follow_request: Onkur biður um at fylgja tær
         mention: Onkur nevndi teg
         pending_account: Nýggj konta krevur viðgerð
+        quote: Onkur siteraði teg
         reblog: Onkur stimbraði postin hjá tær
         report: Nýggj melding er send inn
         software_updates:
@@ -369,6 +379,10 @@ fo:
         name: Navn
         permissions_as_keys: Loyvi
         position: Raðfesting
+      username_block:
+        allow_with_approval: Loyv skrásetingum við góðkenning
+        comparison: Samanberingarmetoda
+        username: Orð, sum skal samsvara
       webhook:
         events: Virknar hendingar
         template: Farmaformur
diff --git a/config/locales/simple_form.fr-CA.yml b/config/locales/simple_form.fr-CA.yml
index 8856c8906c1..83c32efaff6 100644
--- a/config/locales/simple_form.fr-CA.yml
+++ b/config/locales/simple_form.fr-CA.yml
@@ -102,7 +102,6 @@ fr-CA:
         status_page_url: URL d'une page où les gens peuvent voir l'état de ce serveur en cas de panne
         theme: Thème que verront les utilisateur·rice·s déconnecté·e·s ainsi que les nouveaux·elles utilisateur·rice·s.
         thumbnail: Une image d'environ 2:1 affichée à côté des informations de votre serveur.
-        timeline_preview: Les visiteurs déconnectés pourront parcourir les derniers messages publics disponibles sur le serveur.
         trendable_by_default: Ignorer l'examen manuel du contenu tendance. Des éléments individuels peuvent toujours être supprimés des tendances après coup.
         trends: Les tendances montrent quelles publications, hashtags et actualités sont en train de gagner en traction sur votre serveur.
         trends_as_landing_page: Afficher le contenu tendance au lieu d'une description de ce serveur pour les comptes déconnectés et les non-inscrit⋅e⋅s. Nécessite que les tendances soient activées.
@@ -227,7 +226,7 @@ fr-CA:
         setting_auto_play_gif: Lire automatiquement les GIFs animés
         setting_boost_modal: Demander confirmation avant de partager un message
         setting_default_language: Langue de publication
-        setting_default_privacy: Confidentialité des messages
+        setting_default_quote_policy: Autoriser les citations pour
         setting_default_sensitive: Toujours marquer les médias comme sensibles
         setting_delete_modal: Demander confirmation avant de supprimer un message
         setting_disable_hover_cards: Désactiver l'aperçu du profil au survol
@@ -290,7 +289,6 @@ fr-CA:
         status_page_url: URL de la page de l'état du serveur
         theme: Thème par défaut
         thumbnail: Miniature du serveur
-        timeline_preview: Autoriser l’accès non authentifié aux fils publics
         trendable_by_default: Autoriser les tendances sans révision préalable
         trends: Activer les tendances
         trends_as_landing_page: Utiliser les tendances comme page d'accueil
diff --git a/config/locales/simple_form.fr.yml b/config/locales/simple_form.fr.yml
index 53c4fbfba72..249a08c3266 100644
--- a/config/locales/simple_form.fr.yml
+++ b/config/locales/simple_form.fr.yml
@@ -102,7 +102,6 @@ fr:
         status_page_url: URL d'une page où les gens peuvent voir l'état de ce serveur en cas de panne
         theme: Thème que verront les utilisateur·rice·s déconnecté·e·s ainsi que les nouveaux·elles utilisateur·rice·s.
         thumbnail: Une image d'environ 2:1 affichée à côté des informations de votre serveur.
-        timeline_preview: Les utilisateur⋅rice⋅s déconnecté⋅e⋅s pourront parcourir les derniers messages publics disponibles sur le serveur.
         trendable_by_default: Ignorer l'examen manuel du contenu tendance. Des éléments individuels peuvent toujours être supprimés des tendances après coup.
         trends: Les tendances montrent quels messages, hashtags et actualités gagnent en popularité sur votre serveur.
         trends_as_landing_page: Afficher le contenu tendance au lieu d'une description de ce serveur pour les comptes déconnectés et les non-inscrit⋅e⋅s. Nécessite que les tendances soient activées.
@@ -227,7 +226,7 @@ fr:
         setting_auto_play_gif: Lire automatiquement les GIFs animés
         setting_boost_modal: Demander confirmation avant de partager un message
         setting_default_language: Langue de publication
-        setting_default_privacy: Confidentialité des messages
+        setting_default_quote_policy: Autoriser les citations pour
         setting_default_sensitive: Toujours marquer les médias comme sensibles
         setting_delete_modal: Demander confirmation avant de supprimer un message
         setting_disable_hover_cards: Désactiver l'aperçu du profil au survol
@@ -290,7 +289,6 @@ fr:
         status_page_url: URL de la page de l'état du serveur
         theme: Thème par défaut
         thumbnail: Miniature du serveur
-        timeline_preview: Autoriser l’accès non authentifié aux fils publics
         trendable_by_default: Autoriser les tendances sans révision préalable
         trends: Activer les tendances
         trends_as_landing_page: Utiliser les tendances comme page d'accueil
diff --git a/config/locales/simple_form.fy.yml b/config/locales/simple_form.fy.yml
index eea259ef757..31c6943c408 100644
--- a/config/locales/simple_form.fy.yml
+++ b/config/locales/simple_form.fy.yml
@@ -56,11 +56,11 @@ fy:
         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.
         setting_aggregate_reblogs: Gjin nije boosts toane foar berjochten dy’t resintlik noch boost binne (hat allinnich effekt op nij ûntfongen boosts)
         setting_always_send_emails: Normaliter wurde der gjin e-mailmeldingen ferstjoerd wannear’t jo aktyf Mastodon brûke
-        setting_default_quote_policy: It is foar brûkers dy’t fermeld wurde altyd tastien om te sitearjen. Dizze ynstelling is allinnich fan tapassing foar berjochten dy’t makke binne mei de folgjende Mastodon-ferzje, mar jo kinne jo foarkar no al ynstelle
         setting_default_sensitive: Gefoelige media wurdt standert ferstoppe en kin mei ien klik toand wurde
         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_emoji_style: Wêrmei moatte emojis werjûn wurde. ‘Automatysk’ probearret de systeemeigen emojis te brûken, mar falt werom op Twemoji foar âldere browsers.
         setting_system_scrollbars_ui: Allinnich fan tapassing op desktopbrowsers basearre op Safari en Chromium
         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
@@ -103,7 +103,6 @@ fy:
         status_page_url: URL fan in side dêr’t minsken de steat fan dizze server sjen kinne wylst in steuring
         theme: Tema dy’t ôfmelde besikers en nije brûkers sjen.
         thumbnail: In ôfbylding fan ûngefear in ferhâlding fan 2:1 dy’t njonken jo serverynformaasje toand wurdt.
-        timeline_preview: Net oanmelde besikers kinne de meast resinte, op de server oanwêzige iepenbiere berjochten besjen.
         trendable_by_default: Hânmjittige beoardieling fan trends oerslaan. Yndividuele items kinne letter dochs noch ôfkard wurde.
         trends: Trends toane hokker berjochten, hashtags en nijsberjochten op jo server oan populariteit winne.
         trends_as_landing_page: Toan trending ynhâld oan ôfmelde brûkers en besikers yn stee fan in beskriuwing fan dizze server. Fereasket dat trends ynskeakele binne.
@@ -150,8 +149,8 @@ fy:
       user:
         chosen_languages: Allinnich berjochten yn de selektearre talen wurde op de iepenbiere tiidline toand
         date_of_birth:
-          one: Wy moatte derfoar soargje dat jo op syn minst %{count} binne om Mastodon te brûken. Dit wurdt net bewarre.
-          other: Wy moatte derfoar soargje dat jo op syn minst %{count} binne om Mastodon te brûken. Dit wurdt net bewarre.
+          one: Wy moatte derfoar soargje dat jo op syn minst %{count} binne om %{domain} brûke te meien. Dit wurdt net bewarre.
+          other: Wy moatte derfoar soargje dat jo op syn minst %{count} binne om %{domain} brûke te meien. Dit wurdt net bewarre.
         role: De rol bepaalt hokker rjochten in brûker hat.
       user_role:
         color: Kleur dy’t brûkt wurdt foar de rol yn de UI, as RGB yn heksadesimaal formaat
@@ -231,7 +230,6 @@ fy:
         setting_auto_play_gif: Spylje animearre GIF’s automatysk ôf
         setting_boost_modal: Freegje foar it boosten fan in berjocht in befêstiging
         setting_default_language: Taal fan jo berjochten
-        setting_default_privacy: Sichtberheid fan nije berjochten
         setting_default_quote_policy: Wa kin sitearje
         setting_default_sensitive: Media altyd as gefoelich markearje
         setting_delete_modal: Freegje foar it fuortsmiten fan in berjocht in befêstiging
@@ -241,6 +239,7 @@ fy:
         setting_display_media_default: Standert
         setting_display_media_hide_all: Alles ferstopje
         setting_display_media_show_all: Alles toane
+        setting_emoji_style: Emojistyl
         setting_expand_spoilers: Berjochten mei ynhâldswarskôgingen altyd útklappe
         setting_hide_network: Jo folgers en wa’t jo folget ferstopje
         setting_missing_alt_text_modal: Befêstigingsfinster toane foar it pleatsen fan media sûnder alt-tekst
@@ -295,7 +294,6 @@ fy:
         status_page_url: URL fan steatside
         theme: Standerttema
         thumbnail: Serverthumbnail
-        timeline_preview: Tagong ta de iepenbiere tiidlinen sûnder oan te melden tastean
         trendable_by_default: Trends goedkarre sûnder yn it foar geande beoardieling
         trends: Trends ynskeakelje
         trends_as_landing_page: Lit trends op de startside sjen
diff --git a/config/locales/simple_form.ga.yml b/config/locales/simple_form.ga.yml
index b26cd854fc5..f9c06764511 100644
--- a/config/locales/simple_form.ga.yml
+++ b/config/locales/simple_form.ga.yml
@@ -56,11 +56,13 @@ ga:
         scopes: Cé na APIanna a mbeidh cead ag an bhfeidhmchlár rochtain a fháil orthu. Má roghnaíonn tú raon feidhme barrleibhéil, ní gá duit cinn aonair a roghnú.
         setting_aggregate_reblogs: Ná taispeáin treisithe nua do phoist a treisíodh le déanaí (ní dhéanann difear ach do threisithe nuafhaighte)
         setting_always_send_emails: Go hiondúil ní sheolfar fógraí ríomhphoist agus tú ag úsáid Mastodon go gníomhach
-        setting_default_quote_policy: Ceadaítear d’úsáideoirí luaite lua a dhéanamh i gcónaí. Ní bheidh an socrú seo i bhfeidhm ach amháin maidir le poist a cruthaíodh leis an gcéad leagan eile de Mastodon, ach is féidir leat do rogha féin a roghnú agus tú ag ullmhú
+        setting_default_quote_policy_private: Ní féidir le daoine eile poist atá scríofa ar Mastodon agus atá dírithe ar leanúna amháin a lua.
+        setting_default_quote_policy_unlisted: Nuair a luann daoine thú, beidh a bpost i bhfolach ó amlínte treochta freisin.
         setting_default_sensitive: Tá meáin íogair i bhfolach de réir réamhshocraithe agus is féidir iad a nochtadh le cliceáil
         setting_display_media_default: Folaigh meáin atá marcáilte mar íogair
         setting_display_media_hide_all: Folaigh meáin i gcónaí
         setting_display_media_show_all: Taispeáin meáin i gcónaí
+        setting_emoji_style: Conas emojis a thaispeáint. Déanfaidh "Auto" iarracht emoji dúchasacha a úsáid, ach titeann sé ar ais go Twemoji le haghaidh seanbhrabhsálaithe.
         setting_system_scrollbars_ui: Ní bhaineann sé ach le brabhsálaithe deisce bunaithe ar Safari agus Chrome
         setting_use_blurhash: Tá grádáin bunaithe ar dhathanna na n-amharcanna ceilte ach cuireann siad salach ar aon mhionsonraí
         setting_use_pending_items: Folaigh nuashonruithe amlíne taobh thiar de chlic seachas an fotha a scrollú go huathoibríoch
@@ -103,7 +105,6 @@ ga:
         status_page_url: URL leathanach inar féidir le daoine stádas an fhreastalaí seo a fheiceáil le linn briseadh amach
         theme: Téama a fheiceann cuairteoirí logáilte amach agus úsáideoirí nua.
         thumbnail: Íomhá thart ar 2:1 ar taispeáint taobh le faisnéis do fhreastalaí.
-        timeline_preview: Beidh cuairteoirí logáilte amach in ann na postálacha poiblí is déanaí atá ar fáil ar an bhfreastalaí a bhrabhsáil.
         trendable_by_default: Léim ar athbhreithniú láimhe ar ábhar treochta. Is féidir míreanna aonair a bhaint as treochtaí fós tar éis an fhíric.
         trends: Léiríonn treochtaí cé na postálacha, hashtags agus scéalta nuachta atá ag tarraingt ar do fhreastalaí.
         trends_as_landing_page: Taispeáin inneachar treochta d'úsáideoirí agus do chuairteoirí atá logáilte amach in ionad cur síos ar an bhfreastalaí seo. Éilíonn treochtaí a chumasú.
@@ -150,11 +151,11 @@ ga:
       user:
         chosen_languages: Nuair a dhéantar iad a sheiceáil, ní thaispeánfar ach postálacha i dteangacha roghnaithe in amlínte poiblí
         date_of_birth:
-          few: Caithfimid a chinntiú go bhfuil tú %{count} ar a laghad chun Mastodon a úsáid. Ní stórálfaimid é seo.
-          many: Caithfimid a chinntiú go bhfuil tú %{count} ar a laghad chun Mastodon a úsáid. Ní stórálfaimid é seo.
-          one: Caithfimid a chinntiú go bhfuil tú %{count} ar a laghad chun Mastodon a úsáid. Ní stórálfaimid é seo.
-          other: Caithfimid a chinntiú go bhfuil tú %{count} ar a laghad chun Mastodon a úsáid. Ní stórálfaimid é seo.
-          two: Caithfimid a chinntiú go bhfuil tú %{count} ar a laghad chun Mastodon a úsáid. Ní stórálfaimid é seo.
+          few: Caithfimid a chinntiú go bhfuil tú %{count} ar a laghad chun %{domain} a úsáid. Ní stórálfaimid é seo.
+          many: Caithfimid a chinntiú go bhfuil tú %{count} ar a laghad chun %{domain} a úsáid. Ní stórálfaimid é seo.
+          one: Caithfimid a chinntiú go bhfuil tú %{count} ar a laghad chun %{domain} a úsáid. Ní stórálfaimid é seo.
+          other: Caithfimid a chinntiú go bhfuil tú %{count} ar a laghad chun %{domain} a úsáid. Ní stórálfaimid é seo.
+          two: Caithfimid a chinntiú go bhfuil tú %{count} ar a laghad chun %{domain} a úsáid. Ní stórálfaimid é seo.
         role: Rialaíonn an ról na ceadanna atá ag an úsáideoir.
       user_role:
         color: Dath le húsáid don ról ar fud an Chomhéadain, mar RGB i bhformáid heicsidheachúlach
@@ -162,6 +163,10 @@ ga:
         name: Ainm poiblí an róil, má tá an ról socraithe le taispeáint mar shuaitheantas
         permissions_as_keys: Beidh rochtain ag úsáideoirí a bhfuil an ról seo acu ar...
         position: Cinneann ról níos airde réiteach coinbhleachta i gcásanna áirithe. Ní féidir gníomhartha áirithe a dhéanamh ach amháin ar róil a bhfuil tosaíocht níos ísle acu
+      username_block:
+        allow_with_approval: In ionad cosc iomlán a chur ar chlárú, beidh ort do cheadú a fháil chun clárúcháin a mheaitseáil
+        comparison: Tabhair aird ar Fhadhb Scunthorpe agus tú ag blocáil cluichí páirteacha
+        username: Déanfar é a mheaitseáil beag beann ar an gcásáil agus homaiglifí coitianta cosúil le "4" in ionad "a" nó "3" in ionad "e"
       webhook:
         events: Roghnaigh imeachtaí le seoladh
         template: Cum do phálasta JSON féin ag baint úsáide as idirshuíomh athróg. Fág bán le haghaidh JSON réamhshocraithe.
@@ -234,7 +239,7 @@ ga:
         setting_auto_play_gif: Gifs beoite go huathoibríoch a imirt
         setting_boost_modal: Taispeáin dialóg deimhnithe roimh threisiú
         setting_default_language: Teanga postála
-        setting_default_privacy: Postáil príobháideachta
+        setting_default_privacy: Infheictheacht postála
         setting_default_quote_policy: Cé a fhéadfaidh lua
         setting_default_sensitive: Marcáil na meáin mar íogair i gcónaí
         setting_delete_modal: Taispeáin dialóg deimhnithe sula scriostar postáil
@@ -244,6 +249,7 @@ ga:
         setting_display_media_default: Réamhshocrú
         setting_display_media_hide_all: Cuir uile i bhfolach
         setting_display_media_show_all: Taispeáin uile
+        setting_emoji_style: Stíl Emoji
         setting_expand_spoilers: Méadaigh postálacha atá marcáilte le rabhaidh inneachair i gcónaí
         setting_hide_network: Folaigh do ghraf sóisialta
         setting_missing_alt_text_modal: Taispeáin dialóg deimhnithe sula bpostálann tú meán gan alt téacs
@@ -280,12 +286,16 @@ ga:
         content_cache_retention_period: Tréimhse choinneála inneachair cianda
         custom_css: CSS saincheaptha
         favicon: Favicon
+        local_live_feed_access: Rochtain ar bheatha bheo ina bhfuil poist áitiúla
+        local_topic_feed_access: Rochtain ar fhothaí hashtag agus nasc ina bhfuil poist áitiúla
         mascot: Mascóg saincheaptha (oidhreacht)
         media_cache_retention_period: Tréimhse choinneála taisce meán
         min_age: Riachtanas aoise íosta
         peers_api_enabled: Foilsigh liosta de na freastalaithe aimsithe san API
         profile_directory: Cumasaigh eolaire próifíle
         registrations_mode: Cé atá in ann clárú
+        remote_live_feed_access: Rochtain ar bheatha bheo ina bhfuil poist iargúlta
+        remote_topic_feed_access: Rochtain ar fhothaí hashtag agus nasc ina bhfuil poist iargúlta
         require_invite_text: A cheangal ar chúis a bheith páirteach
         show_domain_blocks: Taispeáin bloic fearainn
         show_domain_blocks_rationale: Taispeáin cén fáth ar cuireadh bac ar fhearann
@@ -298,7 +308,6 @@ ga:
         status_page_url: URL an leathanaigh stádais
         theme: Téama réamhshocraithe
         thumbnail: Mionsamhail freastalaí
-        timeline_preview: Ceadaigh rochtain neamhdheimhnithe ar amlínte poiblí
         trendable_by_default: Ceadaigh treochtaí gan athbhreithniú roimh ré
         trends: Cumasaigh treochtaí
         trends_as_landing_page: Úsáid treochtaí mar an leathanach tuirlingthe
@@ -326,6 +335,7 @@ ga:
         follow_request: D'iarr duine éigin tú a leanúint
         mention: Luaigh duine éigin tú
         pending_account: Ní mór athbhreithniú a dhéanamh ar chuntas nua
+        quote: Luaigh duine éigin thú
         reblog: Mhol duine éigin do phostáil
         report: Tá tuairisc nua curtha isteach
         software_updates:
@@ -372,6 +382,10 @@ ga:
         name: Ainm
         permissions_as_keys: Ceadanna
         position: Tosaíocht
+      username_block:
+        allow_with_approval: Ceadaigh clárúcháin le ceadú
+        comparison: Modh comparáide
+        username: Focal le meaitseáil
       webhook:
         events: Imeachtaí cumasaithe
         template: Teimpléad pá-ualach
diff --git a/config/locales/simple_form.gd.yml b/config/locales/simple_form.gd.yml
index 19ca3cbaffd..19a0a2a5586 100644
--- a/config/locales/simple_form.gd.yml
+++ b/config/locales/simple_form.gd.yml
@@ -56,11 +56,13 @@ gd:
         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.
         setting_aggregate_reblogs: Na seall brosnachaidhean ùra do phostaichean a chaidh a bhrosnachadh o chionn goirid (cha doir seo buaidh ach air brosnachaidhean ùra o seo a-mach)
         setting_always_send_emails: Mar as àbhaist, cha dèid brathan puist-d a chur nuair a a bhios tu ri Mastodon gu cunbhalach
-        setting_default_quote_policy: Faodaidh luchd-cleachdaidh le iomradh orra luaidh an-còmhnaidh. Cha bhi an roghainn seo ann sàs ach air postaichean a thèid a chruthachadh leis an ath-thionndadh de Mhastodon ach ’s urrainn dhut do roghainn a thaghadh airson ullachadh dha.
+        setting_default_quote_policy_private: Chan urrainn do chàch postaichean dhan luchd-leantainn a-mhàin a chaidh a sgrìobhadh le Mastodon a luaidh.
+        setting_default_quote_policy_unlisted: Nuair a luaidheas daoine thu, thèid am post aca-san fhalach o loidhnichean-ama nan treandaichean.
         setting_default_sensitive: Thèid meadhanan frionasach fhalach a ghnàth is gabhaidh an nochdadh le briogadh orra
         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_emoji_style: An dòigh air an dèid emojis a shealltainn. Feuchaidh “Fèin-obrachail” ris na h-emojis tùsail a chleachdadh ach thèid Twemoji a chleachdadh ’nan àite air seann-bhrabhsairean.
         setting_system_scrollbars_ui: Chan obraich seo ach air brabhsairean desktop stèidhichte air Safari ’s Chrome
         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
@@ -103,7 +105,6 @@ gd:
         status_page_url: URL duilleige far am faicear staid an fhrithealaiche seo nuair a bhios e sìos
         theme: An t-ùrlar a chì na h-aoighean gun chlàradh a-staigh agus an luchd-cleachdaidh ùr.
         thumbnail: Dealbh mu 2:1 a thèid a shealltainn ri taobh fiosrachadh an fhrithealaiche agad.
-        timeline_preview: "’S urrainn dha na h-aoighean gun chlàradh a-staigh na postaichean poblach as ùire a tha ri fhaighinn air an fhrithealaiche a bhrabhsadh."
         trendable_by_default: Geàrr leum thar lèirmheas a làimh na susbainte a’ treandadh. Gabhaidh nithean fa leth a thoirt far nan treandaichean fhathast an uairsin.
         trends: Seallaidh na treandaichean na postaichean, tagaichean hais is naidheachdan a tha fèill mhòr orra air an fhrithealaiche agad.
         trends_as_landing_page: Seall susbaint a’ treandadh dhan fheadhainn nach do chlàraich a-steach is do dh’aoighean seach tuairisgeul an fhrithealaiche seo. Feumaidh treandaichean a bhith an comas airson sin.
@@ -150,10 +151,10 @@ gd:
       user:
         chosen_languages: Nuair a bhios cromag ris, cha nochd ach postaichean sna cànain a thagh thu air loidhnichean-ama poblach
         date_of_birth:
-          few: Feumaidh sinn dèanamh cinnteach gu bheil thu %{count} bliadhnaichean a dh’aois air a char as lugha mus cleachd thu Mastodon. Cha chlàraich sinn seo.
-          one: Feumaidh sinn dèanamh cinnteach gu bheil thu %{count} bhliadhna a dh’aois air a char as lugha mus cleachd thu Mastodon. Cha chlàraich sinn seo.
-          other: Feumaidh sinn dèanamh cinnteach gu bheil thu %{count} bliadhna a dh’aois air a char as lugha mus cleachd thu Mastodon. Cha chlàraich sinn seo.
-          two: Feumaidh sinn dèanamh cinnteach gu bheil thu %{count} bhliadhna a dh’aois air a char as lugha mus cleachd thu Mastodon. Cha chlàraich sinn seo.
+          few: Feumaidh sinn dèanamh cinnteach gu bheil thu %{count} bliadhnaichean a dh’aois air a char as lugha mus cleachd thu %{domain}. Cha chlàraich sinn seo.
+          one: Feumaidh sinn dèanamh cinnteach gu bheil thu %{count} bhliadhna a dh’aois air a char as lugha mus cleachd thu %{domain}. Cha chlàraich sinn seo.
+          other: Feumaidh sinn dèanamh cinnteach gu bheil thu %{count} bliadhna a dh’aois air a char as lugha mus cleachd thu %{domain}. Cha chlàraich sinn seo.
+          two: Feumaidh sinn dèanamh cinnteach gu bheil thu %{count} bhliadhna a dh’aois air a char as lugha mus cleachd thu %{domain}. Cha chlàraich sinn seo.
         role: Stiùiridh an dreuchd dè na ceadan a bhios aig cleachdaiche.
       user_role:
         color: An datha a bhios air an dreuchd air feadh na h-eadar-aghaidh, ’na RGB san fhòrmat sia-dheicheach
@@ -161,6 +162,9 @@ gd:
         name: Ainm poblach na dreuchd ma chaidh a suidheachadh gun nochd i na baidse
         permissions_as_keys: Gheibh na cleachdaichean aig a bheil an dreuchd seo inntrigeadh dha…
         position: Ma tha còmhstri ann, buannaichidh an dreuchd as àirde ann an cuid a shuidheachaidhean. Tha gnìomhan sònraichte ann nach urrainn ach dreuchdan le prìomhachas ìosail a ghabhail
+      username_block:
+        allow_with_approval: An àite bacadh clàraidh gu tur, bidh clàraidhean a mhaidsicheas feumach air d’ aonta
+        comparison: Thoir an aire air an Scunthorpe Problem nuair a bhacas tu maidsichean pàirteach
       webhook:
         events: Tagh na tachartasan a thèid a chur
         template: Cruthaich an JSON payload agad fhèin le eadar-phòlachadh chaochladairean. Fàg seo bàn airson JSON bunaiteach fhaighinn.
@@ -233,7 +237,7 @@ gd:
         setting_auto_play_gif: Cluich GIFs beòthaichte gu fèin-obrachail
         setting_boost_modal: Seall còmhradh dearbhaidh mus dèan thu brosnachadh
         setting_default_language: Cànan postaidh
-        setting_default_privacy: Prìobhaideachd postaidh
+        setting_default_privacy: Faicsinneachd nam post
         setting_default_quote_policy: Cò dh’fhaodas luaidh
         setting_default_sensitive: Cuir comharra ri meadhanan an-còmhnaidh gu bheil iad frionasach
         setting_delete_modal: Seall còmhradh dearbhaidh mus sguab thu às post
@@ -243,6 +247,7 @@ gd:
         setting_display_media_default: Bun-roghainn
         setting_display_media_hide_all: Falaich na h-uile
         setting_display_media_show_all: Seall na h-uile
+        setting_emoji_style: Stoidhle nan Emojis
         setting_expand_spoilers: Leudaich postaichean ris a bheil rabhadh susbainte an-còmhnaidh
         setting_hide_network: Falaich an graf sòisealta agad
         setting_missing_alt_text_modal: Faic còmhradh dearbhaidh mus postaich thu meadhan às aonais roghainn teacsa
@@ -297,7 +302,6 @@ gd:
         status_page_url: URL duilleag na staide
         theme: An t-ùrlar bunaiteach
         thumbnail: Dealbhag an fhrithealaiche
-        timeline_preview: Ceadaich inntrigeadh gun ùghdarrachadh air na loidhnichean-ama phoblach
         trendable_by_default: Ceadaich treandaichean gun lèirmheas ro làimh
         trends: Cuir na treandaichean an comas
         trends_as_landing_page: Cleachd na treandaichean ’nan duilleag-laighe
@@ -325,6 +329,7 @@ gd:
         follow_request: Dh’iarr cuideigin ’gad leantainn
         mention: Thug cuideigin iomradh ort
         pending_account: Tha cunntas ùr feumach air lèirmheas
+        quote: Luaidh cuideigin thu
         reblog: Bhrosnaich cuideigin am post agad
         report: Chaidh gearan ùr a chur a-null
         software_updates:
@@ -371,6 +376,10 @@ gd:
         name: Ainm
         permissions_as_keys: Ceadan
         position: Prìomhachas
+      username_block:
+        allow_with_approval: Ceadaich clàradh le aontachadh
+        comparison: Dòigh a’ choimheis
+        username: Am facal ri mhaidseadh
       webhook:
         events: Na tachartas an comas
         template: Teamplaid payload
diff --git a/config/locales/simple_form.gl.yml b/config/locales/simple_form.gl.yml
index a425a103847..7c77d4aec97 100644
--- a/config/locales/simple_form.gl.yml
+++ b/config/locales/simple_form.gl.yml
@@ -56,11 +56,13 @@ gl:
         scopes: A que APIs terá acceso a aplicación. Se escolles un ámbito de alto nivel, non precisas seleccionar elementos individuais.
         setting_aggregate_reblogs: Non mostrar novas promocións de publicacións que foron promovidas recentemente (só afecta a promocións recén recibidas)
         setting_always_send_emails: Como norma xeral non che enviamos correos electrónicos se usas activamente Mastodon
-        setting_default_quote_policy: As usuarias mencionadas sempre teñen permiso para citar. Este axuste só ten efecto para publicacións creadas coa próxima versión de Mastodon, pero xa podes ir preparando o axuste.
+        setting_default_quote_policy_private: As publicacións só para seguidoras creadas con Mastodon non poden ser citadas.
+        setting_default_quote_policy_unlisted: Cando alguén te cite, a súa publicación non aparecerá nas cronoloxías de popularidade.
         setting_default_sensitive: Medios sensibles marcados como ocultos por defecto e móstranse cun click
         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_emoji_style: Forma de mostrar emojis. «Auto» intentará usar os emojis nativos, e se falla recurrirase a Twemoji en navegadores antigos.
         setting_system_scrollbars_ui: Aplícase só en navegadores de escritorio baseados en Safari e Chrome
         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
@@ -103,7 +105,6 @@ gl:
         status_page_url: URL dunha páxina onde se pode ver o estado deste servidor cando non está a funcionar
         theme: Decorado que verán visitantes e novas usuarias.
         thumbnail: Imaxe con proporcións 2:1 mostrada xunto á información sobre o servidor.
-        timeline_preview: Visitantes e usuarias non conectadas poderán ver as publicacións públicas máis recentes do servidor.
         trendable_by_default: Omitir a revisión manual dos contidos populares. Poderás igualmente eliminar manualmente os elementos que vaian aparecendo.
         trends: As tendencias mostran publicacións, cancelos e novas historias que teñen popularidade no teu servidor.
         trends_as_landing_page: Mostrar contidos en voga para as persoas sen sesión iniciada e visitantes no lugar dunha descrición deste servidor. Require ter activado Popularidade.
@@ -150,8 +151,8 @@ gl:
       user:
         chosen_languages: Se ten marca, só as publicacións nos idiomas seleccionados serán mostrados en cronoloxías públicas
         date_of_birth:
-          one: Temos que confirmar que tes %{count} anos polo menos para usar Mastodon. Non gardamos este dato.
-          other: Temos que confirmar que tes %{count} anos polo menos para usar Mastodon. Non gardamos este dato.
+          one: Temos que confirmar que tes %{count} anos polo menos para usar %{domain}. Non gardamos este dato.
+          other: Temos que confirmar que tes %{count} anos polo menos para usar %{domain}. Non gardamos este dato.
         role: Os roles establecen os permisos que ten a usuaria.
       user_role:
         color: Cor que se usará para o rol a través da IU, como RGB en formato hex
@@ -159,6 +160,10 @@ gl:
         name: Nome público do rol, se o rol se mostra como unha insignia
         permissions_as_keys: As usuarias con este rol terán acceso a...
         position: O rol superior decide nos conflitos en certas situacións. Algunhas accións só poden aplicarse sobre roles cunha prioridade menor
+      username_block:
+        allow_with_approval: No lugar de evitar a cración directa de contas, as contas mediante regras van precisar a túa aprobación
+        comparison: Ten en conta o Sunthorpe Problem cando se bloquean coincidencias parciais
+        username: Vai crear unha coincidencia sen importar se son maiúsculas ou minúsculas e homoglifos como «4» por «a» ou «3» por «e».
       webhook:
         events: Escoller eventos a enviar
         template: Crea o teu propio JSON interpolando variables. Déixao en branco para usar o JSON predeterminado.
@@ -231,7 +236,7 @@ gl:
         setting_auto_play_gif: Reprodución automática de GIFs animados
         setting_boost_modal: Solicitar confirmación antes de promover
         setting_default_language: Idioma de publicación
-        setting_default_privacy: Privacidade da publicación
+        setting_default_privacy: Visibilidade da publicación
         setting_default_quote_policy: Quen pode citar
         setting_default_sensitive: Marcar sempre multimedia como sensible
         setting_delete_modal: Solicitar confirmación antes de eliminar unha publicación
@@ -241,6 +246,7 @@ gl:
         setting_display_media_default: Por defecto
         setting_display_media_hide_all: Ocultar todo
         setting_display_media_show_all: Mostrar todo
+        setting_emoji_style: Estilo dos emojis
         setting_expand_spoilers: Despregar sempre as publicacións marcadas con avisos de contido
         setting_hide_network: Non mostrar contactos
         setting_missing_alt_text_modal: Mostrar mensaxe de confirmación antes de publicar multimedia sen texto descritivo
@@ -277,12 +283,16 @@ gl:
         content_cache_retention_period: Período de retención de contido remoto
         custom_css: CSS personalizado
         favicon: Favicon
+        local_live_feed_access: Acceso a cronoloxías ao vivo que mostran publicacións locais
+        local_topic_feed_access: Acceso a cronoloxías de ligazóns e cancelos que mostran publicacións locais
         mascot: Mascota propia (herdado)
         media_cache_retention_period: Período de retención da caché multimedia
         min_age: Idade mínima requerida
         peers_api_enabled: Publicar na API unha lista dos servidores descubertos
         profile_directory: Activar o directorio de perfís
         registrations_mode: Quen se pode rexistrar
+        remote_live_feed_access: Acceso a cronoloxías ao vivo que mostran publicacións remotas
+        remote_topic_feed_access: Acceso a cronoloxías de ligazóns e cancelos que mostran publicacións remotas
         require_invite_text: Pedir unha razón para unirse
         show_domain_blocks: Amosar dominios bloqueados
         show_domain_blocks_rationale: Explicar porque están bloqueados os dominios
@@ -295,7 +305,6 @@ gl:
         status_page_url: URL da páxina do estado
         theme: Decorado predeterminado
         thumbnail: Icona do servidor
-        timeline_preview: Permitir acceso á cronoloxía pública sen autenticación
         trendable_by_default: Permitir tendencias sen aprobación previa
         trends: Activar tendencias
         trends_as_landing_page: Usar as tendencias como páxina de benvida
@@ -323,6 +332,7 @@ gl:
         follow_request: Enviar un correo cando alguén solicita seguirte
         mention: Enviar un correo cando alguén te menciona
         pending_account: Enviar un correo cando unha nova conta precisa revisión
+        quote: Citoute alguén
         reblog: Enviar un correo cando alguén promociona a tua mensaxe
         report: Enviouse unha nova denuncia
         software_updates:
@@ -369,6 +379,10 @@ gl:
         name: Nome
         permissions_as_keys: Permisos
         position: Prioridade
+      username_block:
+        allow_with_approval: Permitir crear contas con aprobación
+        comparison: Método de comparación
+        username: Palabra a comparar
       webhook:
         events: Eventos activados
         template: Modelo de carga
diff --git a/config/locales/simple_form.he.yml b/config/locales/simple_form.he.yml
index 4bceaa7e8f4..53ba7c1e5e9 100644
--- a/config/locales/simple_form.he.yml
+++ b/config/locales/simple_form.he.yml
@@ -27,7 +27,7 @@ he:
           disable: מנעי מהמשתמש להשתמש בחשבונם, מבלי למחוק או להסתיר את תוכנו.
           none: השתמשי בזה כדי לשלוח למשתמש אזהרה, מבלי לגרור פעולות נוספות.
           sensitive: אלצי את כל קבצי המדיה המצורפים על ידי המשתמש להיות מסומנים כרגישים.
-          silence: מנעי מהמשתמש להיות מסוגל לחצרץ בנראות פומבית, החביאי את חצרוציהם והתראותיהם מאנשים שלא עוקבים אחריהם. פעולה זו תסגור את הטיפול בדיווחים נגד החשבון.
+          silence: מנעי מהמשתמש להיות מסוגל לחצרץ בחשיפה פומבית, החביאי את חצרוציהם והתראותיהם מאנשים שלא עוקבים אחריהם. פעולה זו תסגור את הטיפול בדיווחים נגד החשבון.
           suspend: מנעי כל התקשרות עם חשבון זה ומחקי את תוכנו. ניתן לשחזור תוך 30 יום. פעולה זו תסגור את הטיפול בדיווחים נגד החשבון.
         warning_preset_id: אופציונלי. ניתן עדיין להוסיף טקסט ייחודי לסוף ההגדרה
       announcement:
@@ -56,11 +56,13 @@ he:
         scopes: לאיזה ממשק יורשה היישום לגשת. בבחירת תחום כללי, אין צורך לבחור ממשקים ספציפיים.
         setting_aggregate_reblogs: לא להראות הדהודים של הודעות שהודהדו לאחרונה (משפיע רק על הדהודים שהתקבלו לא מזמן)
         setting_always_send_emails: בדרך כלל התראות דוא"ל לא יישלחו בזמן שימוש פעיל במסטודון
-        setting_default_quote_policy: משתמשיםות מאוזכריםות תמיד חופשיים לצטט. הכיוונון הזה משפיע רק על פרסומים שישלחו בגרסאות מסטודון עתידיות, ניתן לבחור את העדפתך כהכנה לגרסא שתבוא
+        setting_default_quote_policy_private: הודעות לעוקבים־בלבד שנוצרו במסטודון חסומות מציטוט על ידי אחרים.
+        setting_default_quote_policy_unlisted: כאשר אחרים מצטטים אותך, ההודעות שלהם יוסתרו גם מ"נושאים חמים".
         setting_default_sensitive: מדיה רגישה מוסתרת כברירת מחדל וניתן להציגה בקליק
         setting_display_media_default: הסתרת מדיה המסומנת כרגישה
         setting_display_media_hide_all: הסתר מדיה תמיד
         setting_display_media_show_all: גלה מדיה תמיד
+        setting_emoji_style: כיצד להציג רגישונים. "אוטומטי" ינסה להציג מסט האימוג'י המקומי, אבל נופל לערכת Twemoji כברירת מחדל עבור דפדפנים ישנים.
         setting_system_scrollbars_ui: נוגע רק לגבי דפדפני דסקטופ מבוססים ספארי וכרום
         setting_use_blurhash: הגראדיינטים מבוססים על תוכן התמונה המוסתרת, אבל מסתירים את כל הפרטים
         setting_use_pending_items: הסתר עדכוני פיד מאחורי קליק במקום לגלול את הפיד אוטומטית
@@ -103,7 +105,6 @@ he:
         status_page_url: כתובת לבדיקת מצב שרת זה בעת תקלה
         theme: ערכת המראה שיראו משתמשים חדשים ומשתמשים שאינם מחוברים.
         thumbnail: תמונה ביחס 2:1 בערך שתוצג ליד המידע על השרת שלך.
-        timeline_preview: משתמשים מנותקים יוכלו לדפדף בהודעות ציר הזמן הציבורי שעל השרת.
         trendable_by_default: לדלג על בדיקה ידנית של התכנים החמים. פריטים ספציפיים עדיין ניתנים להסרה לאחר מעשה.
         trends: נושאים חמים יציגו אילו הודעות, תגיות וידיעות חדשות צוברות חשיפה על השרת שלך.
         trends_as_landing_page: הצג למבקרים ולמשתמשים שאינם מחוברים את הנושאים החמים במקום את תיאור השרת. מחייב הפעלה של אפשרות הנושאים החמים.
@@ -150,10 +151,10 @@ he:
       user:
         chosen_languages: אם פעיל, רק הודעות בשפות הנבחרות יוצגו לפידים הפומביים
         date_of_birth:
-          many: עלינו לוודא שגילך לפחות %{count} כדי להשתמש במסטודון. המידע לא ישמר אצלנו.
-          one: עלינו לוודא שגילך לפחות %{count} כדי להשתמש במסטודון. המידע לא ישמר אצלנו.
-          other: עלינו לוודא שגילך לפחות %{count} כדי להשתמש במסטודון. המידע לא ישמר אצלנו.
-          two: עלינו לוודא שגילך לפחות %{count} כדי להשתמש במסטודון. המידע לא ישמר אצלנו.
+          many: עלינו לוודא שגילך לפחות %{count} כדי להשתמש בשרת %{domain}. המידע לא ישמר אצלנו.
+          one: עלינו לוודא שגילך לפחות %{count} כדי להשתמש בשרת %{domain}. המידע לא ישמר אצלנו.
+          other: עלינו לוודא שגילך לפחות %{count} כדי להשתמש בשרת %{domain}. המידע לא ישמר אצלנו.
+          two: עלינו לוודא שגילך לפחות %{count} כדי להשתמש בשרת %{domain}. המידע לא ישמר אצלנו.
         role: התפקיד שולט על אילו הרשאות יש למשתמש.
       user_role:
         color: צבע לתפקיד בממשק המשתמש, כ RGB בפורמט הקסדצימלי
@@ -161,6 +162,10 @@ he:
         name: שם ציבורי של התפקיד, במידה והתפקיד מוגדר ככזה שמופיע כתג
         permissions_as_keys: למשתמשים בתפקיד זה תהיה גישה ל...
         position: תפקיד גבוה יותר מכריע בחילוקי דעות במצבים מסוימים. פעולות מסוימות יכולות להתבצע רק על תפקידים בדרגה נמוכה יותר
+      username_block:
+        allow_with_approval: במקום למנוע הרשמה לחלוטין, הרשמות חדשות יצטרכו לחכות לאישורך
+        comparison: יש להזהר מחסימת חלקי שמות קצרים מדי כדי להמנע מהתופעה הידועה בשם Scunthorpe problem
+        username: ההתאמה תתבצע ללא קשר לגודל אותיות או להומוגליפים נפוצים כגון "4" במקום "a" או "3" במקום "e"
       webhook:
         events: בחר אירועים לשליחה
         template: ניתן להרכיב מטען JSON משלך בשימוש בשילוב משתנים. יש להשאיר ריק בשביל JSON ברירת המחדל.
@@ -233,7 +238,7 @@ he:
         setting_auto_play_gif: ניגון אוטומטי של גיפים
         setting_boost_modal: הצגת דיאלוג אישור לפני הדהוד
         setting_default_language: שפת ברירת מחדל להודעה
-        setting_default_privacy: פרטיות ההודעות
+        setting_default_privacy: חשיפת ההודעה
         setting_default_quote_policy: למי מותר לצטט
         setting_default_sensitive: תמיד לתת סימון "רגיש" למדיה
         setting_delete_modal: להראות תיבת אישור לפני מחיקת חיצרוץ
@@ -243,6 +248,7 @@ he:
         setting_display_media_default: ברירת מחדל
         setting_display_media_hide_all: להסתיר הכל
         setting_display_media_show_all: להציג הכול
+        setting_emoji_style: סגנון רגישונים (אמוג'י)
         setting_expand_spoilers: להרחיב תמיד הודעות מסומנות באזהרת תוכן
         setting_hide_network: להחביא את הגרף החברתי שלך
         setting_missing_alt_text_modal: הצג כרטיס אישור לפני פרסום קובץ גרפי ללא תיאור מילולי
@@ -279,12 +285,16 @@ he:
         content_cache_retention_period: תקופת השמירה על תוכן חיצוני
         custom_css: CSS בהתאמה אישית
         favicon: סמל מועדפים (Favicon)
+        local_live_feed_access: גישה לפידים חיים המציגים הודעות מקומיות
+        local_topic_feed_access: גישה לפידים של תגיות וקישורים המציגים הודעות מקומיות
         mascot: סמל השרת (ישן)
         media_cache_retention_period: תקופת שמירת מטמון מדיה
         min_age: דרישת גיל מינימלי
         peers_api_enabled: פרסם רשימה של שרתים שנתגלו באמצעות ה-API
         profile_directory: הפעלת ספריית פרופילים
         registrations_mode: מי יכולים לפתוח חשבון
+        remote_live_feed_access: גישה לפידים חיים המציגים הודעות מהעולם
+        remote_topic_feed_access: גישה לפידים של תגיות וקישורים המציגים הודעות מהעולם
         require_invite_text: לדרוש סיבה להצטרפות
         show_domain_blocks: הצגת חסימת דומיינים
         show_domain_blocks_rationale: הצגת סיבות חסימה למתחמים
@@ -297,7 +307,6 @@ he:
         status_page_url: URL של עמוד סטטוס חיצוני
         theme: ערכת נושא ברירת מחדל
         thumbnail: תמונה ממוזערת מהשרת
-        timeline_preview: הרשאת גישה בלתי מאומתת לפיד הפומבי
         trendable_by_default: הרשאה לפריטים להופיע בנושאים החמים ללא אישור מוקדם
         trends: אפשר פריטים חמים (טרנדים)
         trends_as_landing_page: דף הנחיתה יהיה "נושאים חמים"
@@ -325,6 +334,7 @@ he:
         follow_request: מישהו.י ביקש.ה לעקוב אחריך
         mention: שליחת דוא"ל כשפונים אלייך
         pending_account: נדרשת סקירה של חשבון חדש
+        quote: שליחת דוא"ל כשמצטטים הודעה שלך
         reblog: שליחת דוא"ל כשמהדהדים הודעה שלך
         report: דו"ח חדש הוגש
         software_updates:
@@ -371,6 +381,10 @@ he:
         name: שם
         permissions_as_keys: הרשאות
         position: עדיפות
+      username_block:
+        allow_with_approval: הרשאת הרשמה לאחר אישור
+        comparison: שיטת השוואה
+        username: מילה להתאמה
       webhook:
         events: אירועים מאופשרים
         template: תבנית מטען
diff --git a/config/locales/simple_form.hr.yml b/config/locales/simple_form.hr.yml
index ea40543c515..0236c8c00ca 100644
--- a/config/locales/simple_form.hr.yml
+++ b/config/locales/simple_form.hr.yml
@@ -34,7 +34,6 @@ hr:
         otp_attempt: Dvofaktorski kôd
         password: Lozinka
         setting_auto_play_gif: Automatski pokreni animirane GIF-ove
-        setting_default_privacy: Privatnost objavljivanja
         setting_display_media_default: Zadano
         setting_display_media_hide_all: Sakrij sve
         setting_display_media_show_all: Prikaži sve
diff --git a/config/locales/simple_form.hu.yml b/config/locales/simple_form.hu.yml
index e54adb8ca28..622fb0bbe9b 100644
--- a/config/locales/simple_form.hu.yml
+++ b/config/locales/simple_form.hu.yml
@@ -56,11 +56,13 @@ hu:
         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.
         setting_aggregate_reblogs: Ne mutassunk megtolásokat olyan bejegyzésekhez, melyeket nemrég toltak meg (csak új megtolásokra lép életbe)
         setting_always_send_emails: Alapesetben nem küldünk e-mail-értesítéseket, ha aktívan használod a Mastodont
-        setting_default_quote_policy: A megemlített felhasználók mindig idézhetnek. A beállítás csak a Mastodon következő verziójával készült bejegyzésekre lesz hatással, de előre kiválaszthatod az előnyben részesített beállítást.
+        setting_default_quote_policy_private: A Mastodonon írt, csak követőknek szóló bejegyzéseket mások nem idézhetik.
+        setting_default_quote_policy_unlisted: Amikor idéznek tőled, a bejegyzésük rejtve lesz a felkapott bejegyzések hírfolyamain is.
         setting_default_sensitive: A kényes médiatartalmat alapesetben elrejtjük, de egyetlen kattintással előhozható
         setting_display_media_default: Kényes tartalomnak jelölt média elrejtése
         setting_display_media_hide_all: Média elrejtése mindig
         setting_display_media_show_all: Média megjelenítése mindig
+        setting_emoji_style: Az emodzsik megjelenítési módja. Az „Automatikus” megpróbálja a natív emodzsikat használni, de az örökölt böngészők esetén a Twemojira vált vissza.
         setting_system_scrollbars_ui: Csak Chrome és Safari alapú asztali böngészőkre vonatkozik
         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
@@ -103,7 +105,6 @@ hu:
         status_page_url: Annak az oldalnak az URL-je, melyen ennek a kiszolgálónak az állapotát látják az emberek egy leállás során
         theme: A téma, melyet a kijelentkezett látogatók és az új felhasználók látnak.
         thumbnail: Egy durván 2:1 arányú kép, amely a kiszolgálóinformációk mellett jelenik meg.
-        timeline_preview: A kijelentkezett látogatók továbbra is böngészhetik a kiszolgáló legfrissebb nyilvános bejegyzéseit.
         trendable_by_default: Kézi felülvizsgálat kihagyása a felkapott tartalmaknál. Az egyes elemek utólag távolíthatók el a trendek közül.
         trends: A trendek azt mondják meg, hogy mely bejegyzések, hashtagek és hírbejegyzések felkapottak a kiszolgálódon.
         trends_as_landing_page: Felkapott tartalmak mutatása a kijelentkezett felhasználók és látogatók számára ennek a kiszolgálónak a leírása helyett. Szükséges hozzá a trendek engedélyezése.
@@ -150,8 +151,8 @@ hu:
       user:
         chosen_languages: Ha aktív, csak a kiválasztott nyelvű bejegyzések jelennek majd meg a nyilvános idővonalon
         date_of_birth:
-          one: Ahhoz, hogy a Mastodont használd, meg kell győződnünk arról, hogy legalább %{count} éves vagy. Ezt nem tároljuk.
-          other: Ahhoz, hogy a Mastodont használd, meg kell győződnünk arról, hogy legalább %{count} éves vagy. Ezt nem tároljuk.
+          one: Ahhoz, hogy a(z) %{domain} weboldalt használd, meg kell győződnünk arról, hogy legalább %{count} éves vagy. Ezt nem tároljuk.
+          other: Ahhoz, hogy a(z) %{domain} weboldalt használd, meg kell győződnünk arról, hogy legalább %{count} éves vagy. Ezt nem tároljuk.
         role: A szerep szabályozza, hogy a felhasználó milyen jogosultságokkal rendelkezik.
       user_role:
         color: A szerephez használandó szín mindenhol a felhasználói felületen, hexa RGB formátumban
@@ -159,6 +160,10 @@ hu:
         name: A szerep nyilvános neve, ha a szerepet úgy állították be, hogy jelvényként látható legyen
         permissions_as_keys: A felhasználók ezzel a szereppel elérhetik a...
         position: A magasabb szerepkör oldja fel az ütközéseket bizonyos helyzetekben. Bizonyos műveleteket csak alacsonyabb prioritású szerepkörrel lehet elvégezni.
+      username_block:
+        allow_with_approval: A regisztráció azonnali megakadályozása helyett az illeszkedő regisztrációkhoz jóváhagyás szükséges
+        comparison: Vegye figyelembe a Scunthorpe-problémát, amikor részleges egyezéseket blokkol
+        username: Az illeszkedés egyezőnek tekinti a kis- és nagybetűket, valamint a gyakori homoglifákat, mint a „4” és az „a” vagy a „3” és az „e”
       webhook:
         events: Válaszd ki a küldendő eseményeket
         template: Saját JSON adatcsomagot állíthatsz össze változó-behelyettesítés használatával. Hagyd üresen az alapértelmezett JSON adatcsomaghoz.
@@ -231,7 +236,7 @@ hu:
         setting_auto_play_gif: GIF-ek automatikus lejátszása
         setting_boost_modal: Megerősítés kérése megtolás előtt
         setting_default_language: Bejegyzések nyelve
-        setting_default_privacy: Bejegyzések láthatósága
+        setting_default_privacy: Közzététel láthatósága
         setting_default_quote_policy: Ki idézhet
         setting_default_sensitive: Minden médiafájl megjelölése kényesként
         setting_delete_modal: Megerősítés kérése bejegyzés törlése előtt
@@ -241,6 +246,7 @@ hu:
         setting_display_media_default: Alapértelmezés
         setting_display_media_hide_all: Mindent elrejt
         setting_display_media_show_all: Mindent mutat
+        setting_emoji_style: Emodzsistílus
         setting_expand_spoilers: Tartalmi figyelmeztetéssel ellátott bejegyzések automatikus kinyitása
         setting_hide_network: Hálózatod elrejtése
         setting_missing_alt_text_modal: Megerősítési párbeszédablak megjelenítése a helyettesítő szöveg nélküli média közzététele előtt
@@ -277,12 +283,16 @@ hu:
         content_cache_retention_period: Távoli tartalmak megtartási időszaka
         custom_css: Egyéni CSS
         favicon: Könyvjelzőikon
+        local_live_feed_access: Helyi bejegyzéseket bemutató élő hírfolyamok elérése
+        local_topic_feed_access: Helyi bejegyzéseket bemutató hashtagek és hivatkozásfolyamok elérése
         mascot: Egyéni kabala (örökölt)
         media_cache_retention_period: Média-gyorsítótár megtartási időszaka
         min_age: Minimális korhatár
         peers_api_enabled: Felfedezett kiszolgálók listájának közzététele az API-ban
         profile_directory: Profiladatbázis engedélyezése
         registrations_mode: Ki regisztrálhat
+        remote_live_feed_access: Távoli bejegyzéseket bemutató élő hírfolyamok elérése
+        remote_topic_feed_access: Távoli bejegyzéseket bemutató hashtagek és hivatkozásfolyamok elérése
         require_invite_text: Indok megkövetelése a csatlakozáshoz
         show_domain_blocks: Domain tiltások megjelenitése
         show_domain_blocks_rationale: A domainek letiltási okainak megjelenítése
@@ -295,7 +305,6 @@ hu:
         status_page_url: Állapotoldal URL-je
         theme: Alapértelmezett téma
         thumbnail: Kiszolgáló bélyegképe
-        timeline_preview: A nyilvános idővonalak hitelesítés nélküli elérésének engedélyezése
         trendable_by_default: Trendek engedélyezése előzetes ellenőrzés nélkül
         trends: Trendek engedélyezése
         trends_as_landing_page: Trendek használata nyitóoldalként
@@ -323,6 +332,7 @@ hu:
         follow_request: E-mail küldése, amikor valaki követni szeretne téged
         mention: E-mail küldése, amikor valaki megemlít téged
         pending_account: E-mail küldése, ha új fiókot kell engedélyezni
+        quote: E-mail küldése, amikor valaki idéz téged
         reblog: Valaki megtolta a bejegyzésedet
         report: Új bejelentést küldtek be
         software_updates:
@@ -369,6 +379,10 @@ hu:
         name: Név
         permissions_as_keys: Engedélyek
         position: Prioritás
+      username_block:
+        allow_with_approval: Regisztráció engedélyezése jóváhagyással
+        comparison: Összehasonlítás módja
+        username: Ellenőrzendő szó
       webhook:
         events: Engedélyezett események
         template: Adatcsomag sablon
diff --git a/config/locales/simple_form.hy.yml b/config/locales/simple_form.hy.yml
index 36185f73e42..a9c770e5cb2 100644
--- a/config/locales/simple_form.hy.yml
+++ b/config/locales/simple_form.hy.yml
@@ -129,7 +129,6 @@ hy:
         setting_auto_play_gif: Աւտոմատ մեկնարկել GIFs անիմացիաները
         setting_boost_modal: Ցուցադրել հաստատման պատուհանը տարածելուց առաջ
         setting_default_language: Հրապարակման լեզու
-        setting_default_privacy: Հրապարակման գաղտնիութիւն
         setting_default_sensitive: Միշտ նշել մեդիան որպէս դիւրազգաց
         setting_delete_modal: Ցուցադրել հաստատման պատուհանը ջնջելուց առաջ
         setting_disable_swiping: Կասեցնել սահող շարժումները
diff --git a/config/locales/simple_form.ia.yml b/config/locales/simple_form.ia.yml
index 71de8193424..57b382fe065 100644
--- a/config/locales/simple_form.ia.yml
+++ b/config/locales/simple_form.ia.yml
@@ -56,11 +56,13 @@ ia:
         scopes: Le APIs al quales le application habera accesso. Si tu selige un ambito de nivello superior, non es necessari seliger ambitos individual.
         setting_aggregate_reblogs: Non monstrar nove impulsos pro messages que ha essite recentemente impulsate (affecta solmente le impulsos novemente recipite)
         setting_always_send_emails: Normalmente, le notificationes de e-mail non es inviate quando tu activemente usa Mastodon
-        setting_default_quote_policy: Le usatores mentionate sempre ha permission pro citar. Iste parametro solo habera effecto pro messages create con le proxime version de Mastodon, ma tu pote seliger tu preferentia anticipatemente
+        setting_default_quote_policy_private: Le messages limitate al sequitores scribite sur Mastodon non pote esser citate per alteres.
+        setting_default_quote_policy_unlisted: Quando le gente te cita, lor message equalmente non apparera in le chronologias de tendentias.
         setting_default_sensitive: Le medios sensibile es celate de ordinario e pote esser revelate con un clic
         setting_display_media_default: Celar le medios marcate como sensibile
         setting_display_media_hide_all: Sempre celar contento multimedial
         setting_display_media_show_all: Sempre monstrar contento multimedial
+        setting_emoji_style: Como monstrar emojis. “Automatic” tentara usar emojis native, ma recurre al Twemojis pro navigatores ancian.
         setting_system_scrollbars_ui: Se applica solmente al navigatores de scriptorio basate sur Safari e Chrome
         setting_use_blurhash: Le imagines degradate se basa sur le colores del visuales celate, ma illos offusca tote le detalios
         setting_use_pending_items: Requirer un clic pro monstrar nove messages in vice de rolar automaticamente le fluxo
@@ -103,7 +105,6 @@ ia:
         status_page_url: URL de un pagina ubi le personas pote vider le stato de iste servitor durante un interruption
         theme: Thema que le visitatores disconnexe e le nove usatores vide.
         thumbnail: Un imagine de circa 2:1 monstrate al latere del informationes de tu servitor.
-        timeline_preview: Le visitatores foras de session potera percurrer le messages public le plus recente disponibile sur le servitor.
         trendable_by_default: Saltar le revision manual del contento de tendentia. Elementos singule pote ancora esser removite de tendentias post le facto.
         trends: Tendentias monstra que messages, hashtags e novas gania traction sur tu servitor.
         trends_as_landing_page: Monstrar contento de tendentia a usatores disconnexe e visitatores in vice que un description de iste servitor. Require tendentias esser activate.
@@ -135,19 +136,23 @@ ia:
         name: Tu pote solmente cambiar le litteras inter majusculas e minusculas, per exemplo, pro render lo plus legibile
       terms_of_service:
         changelog: Pote esser structurate con le syntaxe Markdown.
+        effective_date: Un periodo rationabile pote variar inter 10 e 30 dies post le data al qual tu notifica tu usatores.
         text: Pote esser structurate con le syntaxe Markdown.
       terms_of_service_generator:
         admin_email: Le avisos juridic include le contra-avisos, ordinantias judiciari, demandas de retiro e demandas de application del lege.
+        arbitration_address: Pote esser le mesme que le adresse physic supra, o “N/A” si se usa e-mail.
+        arbitration_website: Pote esser un formulario web, o “N/A” si se usa e-mail.
         choice_of_law: Citate, region, territorio o stato cuje leges substantive interne governa omne disputa juridic.
         dmca_address: Pro operatores in le SUA, usa le adresse registrate in le Directorio de Agentes Designate pro le DMCA (DMCA Designated Agent Directory). Un adresse de cassa postal es disponibile per requesta directe; usa le Requesta de Exemption de Cassa Postal pro Agentes Designate del DMCA (DMCA Designated Agent Post Office Box Waiver Request) pro inviar un message electronic al Officio del Derecto de Autor (Copyright Office) e describer que tu es un moderator de contento que travalia de casa e qui time vengiantias o represalias pro tu actiones, necessitante le uso un cassa postal pro remover tu adresse personal del vista public.
+        dmca_email: Pote esser le mesme adresse de e-mail usate pro “Adresse de e-mail pro avisos juridic” supra.
         domain: Identification unic del servicio in linea que tu forni.
         jurisdiction: Indica le pais ubi vive le persona qui paga le facturas. Si se tracta de un interprisa o altere organisation, indica le pais ubi illo es incorporate, e le citate, region, territorio o stato del maniera appropriate pro le pais.
         min_age: Non deberea esser infra le etate minime requirite per le leges de tu jurisdiction.
       user:
         chosen_languages: Si marcate, solmente le messages in le linguas seligite apparera in chronologias public
         date_of_birth:
-          one: Nos debe assecurar que tu ha al minus %{count} anno pro usar Mastodon. Nos non va immagazinar isto.
-          other: Nos debe assecurar que tu ha al minus %{count} annos pro usar Mastodon. Nos non va immagazinar isto.
+          one: Nos debe assecurar que tu ha al minus %{count} anno pro usar %{domain}. Nos non va immagazinar isto.
+          other: Nos debe assecurar que tu ha al minus %{count} annos pro usar %{domain}. Nos non va immagazinar isto.
         role: Le rolo controla qual permissos le usator ha.
       user_role:
         color: Color a esser usate pro le rolo in omne parte del UI, como RGB in formato hexadecimal
@@ -155,6 +160,10 @@ ia:
         name: Nomine public del rolo, si rolo es definite a esser monstrate como insignia
         permissions_as_keys: Usatores con iste rolo habera accesso a...
         position: Rolo superior decide resolution de conflicto in certe situationes. Certe actiones pote solo esser exequite sur rolos con un prioritate inferior
+      username_block:
+        allow_with_approval: In loco de impedir totalmente le inscription, le inscriptiones correspondente requirera tu approbation
+        comparison: Tene in conto le “problema Scunthorpe” si tu bloca correspondentias partial
+        username: Correspondera independentemente de majusculas e minusculas e de homoglyphos commun como "4" pro "a" or "3" pro "e"
       webhook:
         events: Selige le eventos a inviar
         template: Compone tu proprie carga utile JSON per interpolation de variabile. Lassar blanc pro JSON predefinite.
@@ -227,7 +236,7 @@ ia:
         setting_auto_play_gif: Auto-reproduce GIFs animate
         setting_boost_modal: Monstrar dialogo de confirmation ante de impulsar
         setting_default_language: Lingua de publication
-        setting_default_privacy: Confidentialitate del messages
+        setting_default_privacy: Visibilitate de publication
         setting_default_quote_policy: Qui pote citar
         setting_default_sensitive: Sempre marcar le medios cmo sensbile
         setting_delete_modal: Monstrar le dialogo de confirmation ante deler un message
@@ -237,6 +246,7 @@ ia:
         setting_display_media_default: Predefinite
         setting_display_media_hide_all: Celar toto
         setting_display_media_show_all: Monstrar toto
+        setting_emoji_style: Stilo de emojis
         setting_expand_spoilers: Sempre expander messages marcate con avisos de contento
         setting_hide_network: Cela tu rete social
         setting_missing_alt_text_modal: Monstrar un dialogo de confirmation ante de publicar multimedia sin texto alternative
@@ -275,6 +285,7 @@ ia:
         favicon: Favicon
         mascot: Personalisar le mascotte (hereditage)
         media_cache_retention_period: Periodo de retention del cache multimedial
+        min_age: Etate minime requirite
         peers_api_enabled: Publicar le lista de servitores discoperite in le API
         profile_directory: Activar directorio de profilos
         registrations_mode: Qui pote inscriber se
@@ -290,7 +301,6 @@ ia:
         status_page_url: URL del pagina de stato
         theme: Thema predefinite
         thumbnail: Miniatura de servitor
-        timeline_preview: Permitter accesso non authenticate a chronologias public
         trendable_by_default: Permitter tendentias sin revision previe
         trends: Activar tendentias
         trends_as_landing_page: Usar tendentias como pagina de destination
@@ -318,6 +328,7 @@ ia:
         follow_request: Alcuno ha demandate de sequer te
         mention: Alcuno te ha mentionate
         pending_account: Nove conto besonia de revision
+        quote: Alcuno te ha citate
         reblog: Alcuno ha impulsate tu message
         report: Un nove reporto es inviate
         software_updates:
@@ -364,6 +375,10 @@ ia:
         name: Nomine
         permissions_as_keys: Permissiones
         position: Prioritate
+      username_block:
+        allow_with_approval: Permitter registrationes con approbation
+        comparison: Methodo de comparation
+        username: Parola a comparar
       webhook:
         events: Eventos activate
         template: Modello de carga utile
diff --git a/config/locales/simple_form.id.yml b/config/locales/simple_form.id.yml
index 0bc98874eb7..d89c610ddb5 100644
--- a/config/locales/simple_form.id.yml
+++ b/config/locales/simple_form.id.yml
@@ -80,7 +80,6 @@ id:
         site_title: Bagaimana orang dapat memberitahu tentang server selain nama domain.
         theme: Tema yang dilihat oleh pengunjung yang keluar dan pengguna baru.
         thumbnail: Gambar sekitar 2:1 yang ditampilkan di samping informasi server Anda.
-        timeline_preview: Pengunjung yang keluar akan dapat menjelajahi kiriman publik terkini yang tersedia di server.
         trendable_by_default: Lewati tinjauan manual dari konten tren. Item individu masih dapat dihapus dari tren setelah faktanya.
         trends: Tren yang menampilkan kiriman, tagar, dan cerita berita apa yang sedang tren di server Anda.
       form_challenge:
@@ -179,7 +178,6 @@ id:
         setting_auto_play_gif: Mainkan otomatis animasi GIF
         setting_boost_modal: Tampilkan dialog konfirmasi dialog sebelum boost
         setting_default_language: Bahasa posting
-        setting_default_privacy: Privasi postingan
         setting_default_sensitive: Selalu tandai media sebagai sensitif
         setting_delete_modal: Tampilkan dialog konfirmasi sebelum hapus toot
         setting_disable_swiping: Nonaktifkan gerak usap
@@ -231,7 +229,6 @@ id:
         site_title: Nama server
         theme: Tema bawaan
         thumbnail: Gambar kecil server
-        timeline_preview: Perbolehkan akses tidak terotentikasi ke linimasa publik
         trendable_by_default: Perbolehkan tren tanpa tinjauan
         trends: Aktifkan tren
       interactions:
diff --git a/config/locales/simple_form.ie.yml b/config/locales/simple_form.ie.yml
index 56e737172dc..ccb54501933 100644
--- a/config/locales/simple_form.ie.yml
+++ b/config/locales/simple_form.ie.yml
@@ -97,7 +97,6 @@ ie:
         status_page_url: URL de un págine monstrant li statu de ti-ci servitor durant un ruptura de servicie
         theme: Li dessine quel ínregistrat visitantes e nov usatores vide.
         thumbnail: Un image de dimensiones circa 2:1 monstrat along tui servitor-information.
-        timeline_preview: Ínregistrat visitantes va posser vider li max recent public postas disponibil che li servitor.
         trendable_by_default: Pretersaltar un manual revision de contenete in tendentie. Mem pos to on posse remover índividual pezzes de tendentie.
         trends: Tendenties monstra quel postas, hashtags e novas es ganiant atention sur tui servitor.
         trends_as_landing_page: Monstrar populari contenete a ínregistrat visitantes vice un description del servitor. Besona que tendenties es activisat.
@@ -206,7 +205,6 @@ ie:
         setting_auto_play_gif: Reproducter automaticmen animat GIFs
         setting_boost_modal: Monstrar dialog de confirmation ante boostar
         setting_default_language: Lingue in quel postar
-        setting_default_privacy: Privatie de postada
         setting_default_sensitive: Sempre marcar medie quam sensitiv
         setting_delete_modal: Monstrar dialog de confirmation ante deleter un posta
         setting_disable_swiping: Desactivar motiones de glissar
@@ -262,7 +260,6 @@ ie:
         status_page_url: URL de statu-págine
         theme: Predefenit tema
         thumbnail: Miniatura del servitor
-        timeline_preview: Permisser accesse ínautenticat al public témpor-lineas
         trendable_by_default: Possibilisar tendenties sin priori inspection
         trends: Possibilisar tendenties
         trends_as_landing_page: Usar tendenties quam frontispicie
diff --git a/config/locales/simple_form.io.yml b/config/locales/simple_form.io.yml
index 7da9441ba67..c3d4d1a0f58 100644
--- a/config/locales/simple_form.io.yml
+++ b/config/locales/simple_form.io.yml
@@ -100,7 +100,6 @@ io:
         status_page_url: URL di pagino ube personi povas vidar la stando di ca servilo kande la servilo ne funcionas
         theme: Temo quo videsas da ekirita vizitanti e nova uzanti.
         thumbnail: Cirkum 2:1 imajo montresar kun informo di ca servilo.
-        timeline_preview: Ekirita vizitanti videsos maxim recenta publika posti quo esas displonebla en la servilo.
         trendable_by_default: Ignorez manuala kontrolar di populara enhavajo.
         trends: Populari montras quala afishi, gretvorti e novaji populareskas en vua servilo.
         trends_as_landing_page: Montrez populara posti a uzanti neeniriti e vizitanti vice deskriptajo pri ca servilo. Bezonas ke populari es aktivita.
@@ -220,7 +219,6 @@ io:
         setting_auto_play_gif: Autoplear anima GIFi
         setting_boost_modal: Montrez konfirmdialogo ante repetar
         setting_default_language: Postolinguo
-        setting_default_privacy: Videbleso di la mesaji
         setting_default_sensitive: Omnatempe markas audvidaji quale trublema
         setting_delete_modal: Montrez konfirmdialogo ante efacar posto
         setting_disable_hover_cards: Desebligar profilprevido dum paso
@@ -281,7 +279,6 @@ io:
         status_page_url: URL dil stando-pagino
         theme: Originala temo
         thumbnail: Servilimajeto
-        timeline_preview: Permisez neyurizita aceso a publika tempolineo
         trendable_by_default: Permisez populari sen kontrolo
         trends: Ebligar populari
         trends_as_landing_page: Uzar populari quale la iniciala pagino
diff --git a/config/locales/simple_form.is.yml b/config/locales/simple_form.is.yml
index 778d2d8f64f..03d093fc6bf 100644
--- a/config/locales/simple_form.is.yml
+++ b/config/locales/simple_form.is.yml
@@ -56,11 +56,13 @@ is:
         scopes: Að hvaða API-kerfisviðmótum forritið fær aðgang. Ef þú velur efsta-stigs svið, þarftu ekki að gefa einstakar heimildir.
         setting_aggregate_reblogs: Ekki sýna nýjar endurbirtingar á færslum sem hafa nýlega verið endurbirtar (hefur bara áhrif á ný-mótteknar endurbirtingar)
         setting_always_send_emails: Venjulega eru tilkynningar í tölvupósti ekki sendar þegar þú ert virk/ur í að nota Mastodon
-        setting_default_quote_policy: Notendur sem minnst er á geta alltaf gert tilvitnanir. Þessi stilling virkar einungis á færslur sem gerðar hafa verið í næstu útgáfu Mastodon, en þú getur samt valið þetta til að undirbúa þig
+        setting_default_quote_policy_private: Aðrir geta ekki vitnað í færslur einungis til fylgjenda sem skrifaðar eru á Mastodon.
+        setting_default_quote_policy_unlisted: Þegar fólk vitnar í þig verða færslurnar þeirr einnig faldar á vinsældatímalínum.
         setting_default_sensitive: Viðkvæmt myndefni er sjálfgefið falið og er hægt að birta með smelli
         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_emoji_style: Hvernig birta skal tjáningartákn (emoji). "Sjálfvirkt" mun reyna að nota innbyggð tjáningartákn, en til vara verða notuð Twemoji-tákn fyrir eldri vafra.
         setting_system_scrollbars_ui: Á einungis við um vafra fyrir vinnutölvur sem byggjast á Safari og Chrome
         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
@@ -103,7 +105,6 @@ is:
         status_page_url: Slóð á síðu þar sem fólk getur séð ástand netþjónsins þegar vandræði koma upp
         theme: Þema sem útskráðir gestir og nýjir notendur sjá.
         thumbnail: Mynd um það bil 2:1 sem birtist samhliða upplýsingum um netþjóninn þinn.
-        timeline_preview: Gestir sem ekki eru skráðir inn munu geta skoðað nýjustu opinberu færslurnar sem tiltækar eru á þjóninum.
         trendable_by_default: Sleppa handvirkri yfirferð á vinsælu efni. Áfram verður hægt að fjarlægja stök atriði úr vinsældarlistum.
         trends: Vinsældir sýna hvaða færslur, myllumerki og fréttasögur séu í umræðunni á netþjóninum þínum.
         trends_as_landing_page: Sýna vinsælt efni til ekki-innskráðra notenda í stað lýsingar á þessum netþjóni. Krefst þess að vinsældir efnis sé virkjað.
@@ -150,8 +151,8 @@ is:
       user:
         chosen_languages: Þegar merkt er við þetta, birtast einungis færslur á völdum tungumálum á opinberum tímalínum
         date_of_birth:
-          one: Við verðum að ganga úr skugga um að þú hafir náð %{count} aldri til að nota Mastodon. Við munum ekki geyma þessar upplýsingar.
-          other: Við verðum að ganga úr skugga um að þú hafir náð %{count} aldri til að nota Mastodon. Við munum ekki geyma þessar upplýsingar.
+          one: Við verðum að ganga úr skugga um að þú hafir náð %{count} aldri til að nota %{domain}. Við munum ekki geyma þessar upplýsingar.
+          other: Við verðum að ganga úr skugga um að þú hafir náð %{count} aldri til að nota %{domain}. Við munum ekki geyma þessar upplýsingar.
         role: Hlutverk stýrir hvaða heimildir notandinn hefur.
       user_role:
         color: Litur sem notaður er fyrir hlutverkið allsstaðar í viðmótinu, sem RGB-gildi á hex-sniði
@@ -159,6 +160,10 @@ is:
         name: Opinbert heiti hlutverks, ef birta á hlutverk sem merki
         permissions_as_keys: Notendur með þetta hlutverk munu hafa aðgang að...
         position: Rétthærra hlutverk ákvarðar lausn árekstra í ákveðnum tilfellum. Sumar aðgerðir er aðeins hægt að framkvæma á hlutverk með lægri forgangi
+      username_block:
+        allow_with_approval: Í stað þess að loka alfarið á nýskráningar, munu samsvarandi nýskráningar þurfa samþykki þitt
+        comparison: Hafðu í huga Scunthorpe-vandamálið (Scunthorpe inniheldur orð sem ýmsar síur reyna að banna) þegar þú útilokar samsvarandi orðhluta
+        username: Mun samsvara án tillits til stafstöðu eða algengra táknlíkinga á borð við "4" í stað "a" eða "3" í stað "e"
       webhook:
         events: Veldu atburði sem á að senda
         template: Sníddu eigin JSON með breytilegri brúun. Skiljið eftir autt fyrir sjálfgefið JSON.
@@ -231,7 +236,7 @@ is:
         setting_auto_play_gif: Spila sjálfkrafa GIF-hreyfimyndir
         setting_boost_modal: Sýna staðfestingarglugga fyrir endurbirtingu
         setting_default_language: Tungumál sem skrifað er á
-        setting_default_privacy: Gagnaleynd færslna
+        setting_default_privacy: Sýnileiki færslna
         setting_default_quote_policy: Hverjir geta gert tilvitnanir
         setting_default_sensitive: Alltaf merkja myndefni sem viðkvæmt
         setting_delete_modal: Birta staðfestingarglugga áður en færslu er eytt
@@ -241,6 +246,7 @@ is:
         setting_display_media_default: Sjálfgefið
         setting_display_media_hide_all: Fela allt
         setting_display_media_show_all: Birta allt
+        setting_emoji_style: Stíll tjáningartákna
         setting_expand_spoilers: Alltaf útfella færslur sem eru með aðvörun vegna efnisins
         setting_hide_network: Fela félagsnetið þitt
         setting_missing_alt_text_modal: Birta staðfestingarglugga áður en myndefni án ALT-hjálpartexta er birt
@@ -277,12 +283,16 @@ is:
         content_cache_retention_period: Tímabil sem á að geyma fjartengt efni
         custom_css: Sérsniðið CSS
         favicon: Auðkennismynd
+        local_live_feed_access: Aðgangur að beinum streymum, þar með töldum staðværum færslum
+        local_topic_feed_access: Aðgangur að myllumerkjum og tengdum streymum, þar með töldum staðværum færslum
         mascot: Sérsniðið gæludýr (eldra)
         media_cache_retention_period: Tímalengd sem myndefni haldið
         min_age: Kröfur um lágmarksaldur
         peers_api_enabled: Birta lista yfir uppgötvaða netþjóna í API-kerfisviðmótinu
         profile_directory: Virkja notendamöppu
         registrations_mode: Hverjir geta nýskráð sig
+        remote_live_feed_access: Aðgangur að beinum streymum, þar með töldum fjartengdum færslum
+        remote_topic_feed_access: Aðgangur að myllumerkjum og tengdum streymum, þar með töldum fjartengdum færslum
         require_invite_text: Krefjast ástæðu fyrir þátttöku
         show_domain_blocks: Sýna útilokanir léna
         show_domain_blocks_rationale: Sýna af hverju lokað var á lén
@@ -295,7 +305,6 @@ is:
         status_page_url: Slóð á ástandssíðu
         theme: Sjálfgefið þema
         thumbnail: Smámynd vefþjóns
-        timeline_preview: Leyfa óauðkenndan aðgang að opinberum tímalínum
         trendable_by_default: Leyfa vinsælt efni án undanfarandi yfirferðar
         trends: Virkja vinsælt
         trends_as_landing_page: Nota vinsælasta sem upphafssíðu
@@ -323,6 +332,7 @@ is:
         follow_request: Einhver hefur beðið um að fylgjast með þér
         mention: Einhver minntist á þig
         pending_account: Nýr notandaaðgangur þarfnast yfirferðar
+        quote: Einhver vitnaði í þig
         reblog: Einhver endurbirti færsluna þína
         report: Ný kæra hefur verið send inn
         software_updates:
@@ -369,6 +379,10 @@ is:
         name: Nafn
         permissions_as_keys: Heimildir
         position: Forgangur
+      username_block:
+        allow_with_approval: Leyfa skráningar með samþykki
+        comparison: Aðferð við samanburð
+        username: Orð sem samsvara
       webhook:
         events: Virkjaðir atburðir
         template: Sniðmát gagna
diff --git a/config/locales/simple_form.it.yml b/config/locales/simple_form.it.yml
index 93c0858ed68..59d7924820f 100644
--- a/config/locales/simple_form.it.yml
+++ b/config/locales/simple_form.it.yml
@@ -56,11 +56,13 @@ it:
         scopes: A quali API l'applicazione potrà avere accesso. Se selezionate un ambito di alto livello, non c'è bisogno di selezionare quelle singole.
         setting_aggregate_reblogs: Non mostrare nuove condivisioni per toot che sono stati condivisi di recente (ha effetto solo sulle nuove condivisioni)
         setting_always_send_emails: Normalmente le notifiche e-mail non vengono inviate quando si utilizza attivamente Mastodon
-        setting_default_quote_policy: Gli utenti menzionati sono sempre in grado di citare. Questa impostazione avrà effetto solo per i post che verranno creati con la prossima versione di Mastodon, ma puoi selezionare le tue preferenze in preparazione del rilascio della prossima versione
+        setting_default_quote_policy_private: I post scritti e riservati ai seguaci su Mastodon non possono essere citati da altri.
+        setting_default_quote_policy_unlisted: Quando le persone ti citano, il loro post verrà nascosto anche dalle timeline di tendenza.
         setting_default_sensitive: Media con contenuti sensibili sono nascosti in modo predefinito e possono essere rivelati con un click
         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_emoji_style: Come visualizzare gli emoji. "Automatico" proverà a usare gli emoji nativi, ma per i browser più vecchi ricorrerà a Twemoji.
         setting_system_scrollbars_ui: Si applica solo ai browser desktop basati su Safari e Chrome
         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
@@ -103,7 +105,6 @@ it:
         status_page_url: URL di una pagina in cui le persone possono visualizzare lo stato di questo server durante un disservizio
         theme: Tema visualizzato dai visitatori e dai nuovi utenti disconnessi.
         thumbnail: Un'immagine approssimativamente 2:1 visualizzata insieme alle informazioni del tuo server.
-        timeline_preview: I visitatori disconnessi potranno sfogliare i post pubblici più recenti disponibili sul server.
         trendable_by_default: Salta la revisione manuale dei contenuti di tendenza. I singoli elementi possono ancora essere rimossi dalle tendenze dopo il fatto.
         trends: Le tendenze mostrano quali post, hashtag e notizie stanno guadagnando popolarità sul tuo server.
         trends_as_landing_page: Mostra i contenuti di tendenza agli utenti disconnessi e ai visitatori, invece di una descrizione di questo server. Richiede l'abilitazione delle tendenze.
@@ -150,8 +151,8 @@ it:
       user:
         chosen_languages: Quando una o più lingue sono contrassegnate, nelle timeline pubbliche vengono mostrati solo i toot nelle lingue selezionate
         date_of_birth:
-          one: Dobbiamo verificare che tu abbia almeno %{count} anno per usare Mastodon. Non archivieremo questa informazione.
-          other: Dobbiamo verificare che tu abbia almeno %{count} anni per usare Mastodon. Non archivieremo questa informazione.
+          one: Dobbiamo assicurarci che tu abbia almeno %{count} anni per utilizzare %{domain}. Non memorizzeremo questo dato.
+          other: Dobbiamo assicurarci che tu abbia almeno %{count} anni per utilizzare %{domain}. Non memorizzeremo questo dato.
         role: Il ruolo controlla quali permessi ha l'utente.
       user_role:
         color: Colore da usare per il ruolo in tutta l'UI, come RGB in formato esadecimale
@@ -159,6 +160,10 @@ it:
         name: Nome pubblico del ruolo, se il ruolo è impostato per essere visualizzato come distintivo
         permissions_as_keys: Gli utenti con questo ruolo avranno accesso a...
         position: Un ruolo più alto decide la risoluzione dei conflitti in determinate situazioni. Alcune azioni possono essere eseguite solo su ruoli con priorità più bassa
+      username_block:
+        allow_with_approval: Invece di impedire del tutto l'iscrizione, le iscrizioni corrispondenti richiederanno la tua approvazione
+        comparison: Si prega di tenere presente il problema di Scunthorpe quando si bloccano corrispondenze parziali
+        username: Coinciderà indipendentemente da lettere e omoglifi comuni come "4" per "a" o "3" per "e"
       webhook:
         events: Seleziona eventi da inviare
         template: Componi il tuo carico utile JSON utilizzando l'interpolazione variabile. Lascia vuoto per il JSON predefinito.
@@ -231,7 +236,7 @@ it:
         setting_auto_play_gif: Riproduci automaticamente le GIF animate
         setting_boost_modal: Mostra dialogo di conferma prima del boost
         setting_default_language: Lingua dei post
-        setting_default_privacy: Privacy dei post
+        setting_default_privacy: Visibilità dei post
         setting_default_quote_policy: Chi può citare
         setting_default_sensitive: Segna sempre i media come sensibili
         setting_delete_modal: Mostra dialogo di conferma prima di eliminare un post
@@ -241,6 +246,7 @@ it:
         setting_display_media_default: Predefinita
         setting_display_media_hide_all: Nascondi tutti
         setting_display_media_show_all: Mostra tutti
+        setting_emoji_style: Stile emoji
         setting_expand_spoilers: Espandi sempre post con content warning
         setting_hide_network: Nascondi la tua rete
         setting_missing_alt_text_modal: Chiedi di confermare prima di pubblicare media senza testo alternativo
@@ -295,7 +301,6 @@ it:
         status_page_url: URL della pagina di stato
         theme: Tema predefinito
         thumbnail: Miniatura del server
-        timeline_preview: Consenti l'accesso non autenticato alle timeline pubbliche
         trendable_by_default: Consenti le tendenze senza revisione preventiva
         trends: Abilita le tendenze
         trends_as_landing_page: Usa le tendenze come pagina di destinazione
@@ -323,6 +328,7 @@ it:
         follow_request: Invia email quando qualcuno chiede di seguirti
         mention: Invia email quando qualcuno ti menziona
         pending_account: Invia e-mail quando un nuovo account richiede l'approvazione
+        quote: Qualcuno ti ha citato
         reblog: Qualcuno ha condiviso il tuo post
         report: Una nuova segnalazione è stata inviata
         software_updates:
@@ -369,6 +375,10 @@ it:
         name: Nome
         permissions_as_keys: Permessi
         position: Priorità
+      username_block:
+        allow_with_approval: Consenti le registrazioni con approvazione
+        comparison: Metodo di confronto
+        username: Parola da abbinare
       webhook:
         events: Eventi abilitati
         template: Modello di carico utile
diff --git a/config/locales/simple_form.ja.yml b/config/locales/simple_form.ja.yml
index 2a044143ade..7ff3f36a657 100644
--- a/config/locales/simple_form.ja.yml
+++ b/config/locales/simple_form.ja.yml
@@ -56,7 +56,6 @@ ja:
         scopes: アプリの API に許可するアクセス権を選択してください。最上位のスコープを選択する場合、個々のスコープを選択する必要はありません。
         setting_aggregate_reblogs: 最近ブーストされた投稿が新たにブーストされても表示しません (設定後受信したものにのみ影響)
         setting_always_send_emails: 通常、Mastodon からメール通知は行われません。
-        setting_default_quote_policy: メンションされたユーザーが常にその投稿を引用できるようになる。 この設定はMastodonの次のバージョンからしか効力を発揮しませんが、現時点で設定を選択しておくことができます
         setting_default_sensitive: 閲覧注意状態のメディアはデフォルトでは内容が伏せられ、クリックして初めて閲覧できるようになります
         setting_display_media_default: 閲覧注意としてマークされたメディアは隠す
         setting_display_media_hide_all: メディアを常に隠す
@@ -103,7 +102,6 @@ ja:
         status_page_url: 障害発生時などにユーザーがサーバーの状態を確認できるページのURL
         theme: ログインしていない人と新規ユーザーに表示されるテーマ。
         thumbnail: サーバー情報と共に表示される、アスペクト比が約 2:1 の画像。
-        timeline_preview: ログインしていないユーザーがサーバー上の最新の公開投稿を閲覧できるようにします。
         trendable_by_default: トレンドの審査を省略します。トレンドは掲載後でも個別に除外できます。
         trends: トレンドは、サーバー上で人気を集めている投稿、ハッシュタグ、ニュース記事などが表示されます。
         trends_as_landing_page: ログインしていないユーザーに対して、サーバーの説明の代わりにトレンドコンテンツを表示します。トレンドを有効にする必要があります。
@@ -149,8 +147,6 @@ ja:
         min_age: お住まいの国や地域の法律によって定められている最低年齢を下回ってはなりません。
       user:
         chosen_languages: 選択すると、選択した言語の投稿のみが公開タイムラインに表示されるようになります
-        date_of_birth:
-          other: Mastodonを利用するには少なくとも%{count}歳以上であることを確認する必要があります。この情報は保存されません。
         role: そのロールは、ユーザーが持つ権限を制御します。
       user_role:
         color: UI 全体でロールの表示に使用される色（16進数RGB形式）
@@ -240,6 +236,7 @@ ja:
         setting_display_media_default: 標準
         setting_display_media_hide_all: 非表示
         setting_display_media_show_all: 表示
+        setting_emoji_style: 絵文字スタイル
         setting_expand_spoilers: 閲覧注意としてマークされた投稿を常に展開する
         setting_hide_network: 繋がりを隠す
         setting_missing_alt_text_modal: 代替テキストなしでメディアを投稿する前に確認ダイアログを表示する
@@ -294,7 +291,6 @@ ja:
         status_page_url: サーバーの状態ページのURL
         theme: デフォルトテーマ
         thumbnail: サーバーのサムネイル
-        timeline_preview: 公開タイムラインへの未認証のアクセスを許可する
         trendable_by_default: 審査前のトレンドの掲載を許可する
         trends: トレンドを有効にする
         trends_as_landing_page: 新規登録画面にトレンドを表示する
@@ -322,6 +318,7 @@ ja:
         follow_request: フォローリクエストを受けた時
         mention: 返信が来た時
         pending_account: 新しいアカウントの承認が必要な時
+        quote: 投稿が引用された時
         reblog: 投稿がブーストされた時
         report: 新しい通報が送信された時
         software_updates:
@@ -368,6 +365,9 @@ ja:
         name: 名前
         permissions_as_keys: 権限
         position: 優先度
+      username_block:
+        allow_with_approval: 承認制での新規登録を可能にする
+        comparison: 比較方法
       webhook:
         events: 有効なイベント
         template: ペイロードテンプレート
diff --git a/config/locales/simple_form.ka.yml b/config/locales/simple_form.ka.yml
index 48f028c575d..e9a07fd97a6 100644
--- a/config/locales/simple_form.ka.yml
+++ b/config/locales/simple_form.ka.yml
@@ -51,7 +51,6 @@ ka:
         setting_auto_play_gif: ანიმაციური გიფების ავტო-დაკვრა
         setting_boost_modal: ბუსტამე მოხდეს დამოწმება
         setting_default_language: პოსტინგის ენა
-        setting_default_privacy: პოსტის კონფიდენციალურობა
         setting_default_sensitive: ყოველთვის მოინიშნოს მედია მგრძნობიარედ
         setting_delete_modal: ტუტის გაუქმებამდე გამოჩნდეს დადასტურების ფანჯარა
         setting_hide_network: თქვენი ქსელის დამალვა
diff --git a/config/locales/simple_form.kab.yml b/config/locales/simple_form.kab.yml
index c0ff7e598e9..4e06281ece2 100644
--- a/config/locales/simple_form.kab.yml
+++ b/config/locales/simple_form.kab.yml
@@ -27,6 +27,10 @@ kab:
         username: Tzemreḍ ad tesqedceḍ isekkilen, uṭṭunen akked yijerriden n wadda
       featured_tag:
         name: 'Ha-t-an kra seg ihacṭagen i tesseqdaceḍ ussan-a ineggura maḍi :'
+      form_admin_settings:
+        min_age: Ad ttwasutren yiseqdacen ad sentemen azemz-nsen n tlalit deg ujerred
+      form_challenge:
+        current_password: Tkecmeḍ ɣer temnaḍt taɣellsant
       imports:
         data: Afaylu CSV id yusan seg uqeddac-nniḍen n Maṣṭudun
       invite_request:
@@ -35,15 +39,19 @@ kab:
         comment: D afrayan. Cfu ɣef wayɣer i terniḍ alugen-a.
         severities:
           no_access: Sewḥel anekcu ɣer akk tiɣbula
+      user:
+        date_of_birth:
+          one: Ilaq ad neḍmen belli tesɛiḍ ma ulac %{count} akken ad tesqedceḍ %{domain}. Ur neḥrez ara aya.
+          other: Ilaq ad neḍmen belli tesɛiḍ ma ulac %{count} akken ad tesqedceḍ %{domain}. Ur neḥrez ara aya.
     labels:
       account:
         fields:
           name: Tabzimt
           value: Agbur
       account_alias:
-        acct: Tansa n umiḍan aqbur
+        acct: Asulay n umiḍan aqbur
       account_migration:
-        acct: Tansa n umiḍan amaynut
+        acct: Asulay n umiḍan amaynut
       account_warning_preset:
         title: Azwel
       admin_account_action:
@@ -87,13 +95,14 @@ kab:
         setting_advanced_layout: Rmed agrudem n web leqqayen
         setting_always_send_emails: Dima ttazen-d ilɣa s yimayl
         setting_default_language: Tutlayt n usuffeɣ
-        setting_default_privacy: Tabaḍnit n usuffeɣ
+        setting_default_quote_policy: Anwa i izemren ad d-yebder
         setting_display_media: Askanay n imidyaten
         setting_display_media_default: Akk-a kan
         setting_display_media_hide_all: Ffer-iten akk
         setting_display_media_show_all: Sken-iten-id akk
         setting_hide_network: Ffer azetta-k·m inmetti
         setting_theme: Asental n wesmel
+        setting_trends: Sken-d inezzaɣ n wass-a
         setting_use_pending_items: Askar aleɣwayan
         sign_in_token_attempt: Tangalt n tɣellist
         title: Azwel
@@ -114,6 +123,7 @@ kab:
         status_page_url: URL n uusebter n waddaden
         theme: Asentel amezwer
         thumbnail: Tanfult n uqeddac
+        trends: Rmed inezzaɣ
       interactions:
         must_be_follower: Ssewḥel ilɣa sɣur wid akk d tid ur yellin ara d imeḍfaren-ik·im
         must_be_following: Ssewḥel ilɣa sɣur wid akked tid ur tettḍafareḍ ara
@@ -143,7 +153,12 @@ kab:
         name: Ahacṭag
       terms_of_service:
         text: Tiwtilin n useqdec
+      terms_of_service_generator:
+        domain: Taɣult
       user:
+        date_of_birth_1i: Ass
+        date_of_birth_2i: Ayyur
+        date_of_birth_3i: Aseggas
         role: Tamlilt
         time_zone: Tamnaḍt tasragant
       user_role:
diff --git a/config/locales/simple_form.kk.yml b/config/locales/simple_form.kk.yml
index e6ba46fdf87..97cfcbd23ba 100644
--- a/config/locales/simple_form.kk.yml
+++ b/config/locales/simple_form.kk.yml
@@ -45,7 +45,6 @@ kk:
         setting_auto_play_gif: GIF анимацияларды бірден қосу
         setting_boost_modal: Бөлісу алдында растау диалогын көрсету
         setting_default_language: Жазба тілі
-        setting_default_privacy: Жазба құпиялылығы
         setting_default_sensitive: Медиаларды әрдайым нәзік ретінде белгілеу
         setting_delete_modal: Жазбаны өшірместен бұрын растау диалогын көрсету
         setting_display_media: Медианы көрсету
diff --git a/config/locales/simple_form.ko.yml b/config/locales/simple_form.ko.yml
index b198ddd0d95..4b04631cb48 100644
--- a/config/locales/simple_form.ko.yml
+++ b/config/locales/simple_form.ko.yml
@@ -56,11 +56,11 @@ ko:
         scopes: 애플리케이션에 허용할 API들입니다. 최상위 스코프를 선택하면 개별적인 것은 선택하지 않아도 됩니다.
         setting_aggregate_reblogs: 최근에 부스트 됐던 게시물은 새로 부스트 되어도 보여주지 않기 (새로 받은 부스트에만 적용됩니다)
         setting_always_send_emails: 기본적으로 마스토돈을 활동적으로 사용하고 있을 때에는 이메일 알림이 보내지지 않습니다
-        setting_default_quote_policy: 멘션된 사용자는 항상 인용할 수 있도록 허용됩니다. 이 설정은 다음 마스토돈 버전부터 효과가 적용되지만 미리 준비할 수 있도록 설정을 제공합니다
         setting_default_sensitive: 민감한 미디어는 기본적으로 가려져 있으며 클릭해서 볼 수 있습니다
         setting_display_media_default: 민감함으로 표시된 미디어 가리기
         setting_display_media_hide_all: 모든 미디어를 가리기
         setting_display_media_show_all: 모든 미디어를 보이기
+        setting_emoji_style: 에모지 표현 방식. "자동"은 시스템 기본 에모지를 적용하고 그렇지 못하는 오래된 브라우저의 경우 트웨모지를 사용합니다.
         setting_system_scrollbars_ui: 사파리와 크롬 기반의 데스크탑 브라우저만 적용됩니다
         setting_use_blurhash: 그라디언트는 숨겨진 내용의 색상을 기반으로 하지만 상세 내용은 보이지 않게 합니다
         setting_use_pending_items: 타임라인의 새 게시물을 자동으로 보여 주는 대신, 클릭해서 나타내도록 합니다
@@ -103,7 +103,6 @@ ko:
         status_page_url: 이 서버가 중단된 동안 사람들이 서버의 상태를 볼 수 있는 페이지 URL
         theme: 로그인 하지 않은 사용자나 새로운 사용자가 보게 될 테마.
         thumbnail: 대략 2:1 비율의 이미지가 서버 정보 옆에 표시됩니다.
-        timeline_preview: 로그아웃 한 사용자들이 이 서버에 있는 최신 공개글들을 볼 수 있게 합니다.
         trendable_by_default: 유행하는 콘텐츠에 대한 수동 승인을 건너뜁니다. 이 설정이 적용된 이후에도 각각의 항목들을 삭제할 수 있습니다.
         trends: 트렌드는 어떤 게시물, 해시태그 그리고 뉴스 기사가 이 서버에서 인기를 끌고 있는지 보여줍니다.
         trends_as_landing_page: 로그아웃한 사용자와 방문자에게 서버 설명 대신 유행하는 내용을 보여줍니다. 유행 기능을 활성화해야 합니다.
@@ -150,7 +149,7 @@ ko:
       user:
         chosen_languages: 체크하면, 선택 된 언어로 작성된 게시물들만 공개 타임라인에 보여집니다
         date_of_birth:
-          other: 마스토돈을 사용하려면 %{count}세 이상임을 확인해야 합니다. 이 정보는 저장되지 않습니다.
+          other: "%{domain}을 이용하려면 %{count}세 이상임을 확인해야 합니다. 이 정보는 저장되지 않습니다."
         role: 역할은 사용자가 어떤 권한을 가지게 될 지 결정합니다.
       user_role:
         color: 색상은 사용자 인터페이스에서 역할을 나타내기 위해 사용되며, RGB 16진수 형식입니다
@@ -158,6 +157,9 @@ ko:
         name: 역할이 배지로 표시될 경우, 그 역할에 대한 공개적인 이름입니다
         permissions_as_keys: 이 역할을 가진 사용자는 다음에 접근할 수 있게 됩니다...
         position: 특정 상황에서 충돌이 발생할 경우 더 높은 역할이 충돌을 해결합니다. 특정 작업은 우선순위가 낮은 역할에 대해서만 수행될 수 있습니다
+      username_block:
+        allow_with_approval: 바로 가입을 막는 대신, 일치하는 가입에 승인을 요구합니다
+        username: 대소문자와 관계 없고 "4"를 "a"로, "3"을 "e"로 사용하는 등의 보편적으로 사용되는 비슷한 문자까지 매치됩니다
       webhook:
         events: 전송할 이벤트를 선택하세요
         template: 원하는 JSON 페이로드를 변수와 함께 작성하거나, 그대로 두어 기본 JSON을 사용할 수 있습니다.
@@ -230,7 +232,7 @@ ko:
         setting_auto_play_gif: 애니메이션 GIF를 자동 재생
         setting_boost_modal: 부스트 전 확인창을 띄웁니다
         setting_default_language: 게시물 언어
-        setting_default_privacy: 게시물 프라이버시
+        setting_default_privacy: 게시물 공개 범위
         setting_default_quote_policy: 인용할 수 있는 사람
         setting_default_sensitive: 미디어를 언제나 민감한 콘텐츠로 설정
         setting_delete_modal: 게시물 삭제 전 확인창을 띄웁니다
@@ -240,6 +242,7 @@ ko:
         setting_display_media_default: 기본
         setting_display_media_hide_all: 모두 가리기
         setting_display_media_show_all: 모두 보이기
+        setting_emoji_style: 에모지 스타일
         setting_expand_spoilers: 내용 경고로 표시된 게시물을 항상 펼치기
         setting_hide_network: 내 인맥 숨기기
         setting_missing_alt_text_modal: 대체 텍스트 없이 미디어를 게시하려고 할 때 확인창을 띄웁니다
@@ -294,7 +297,6 @@ ko:
         status_page_url: 상태 페이지 URL
         theme: 기본 테마
         thumbnail: 서버 썸네일
-        timeline_preview: 로그인 하지 않고 공개 타임라인에 접근하는 것을 허용
         trendable_by_default: 사전 리뷰 없이 트렌드에 오르는 것을 허용
         trends: 유행 활성화
         trends_as_landing_page: 유행을 방문 페이지로 쓰기
@@ -322,6 +324,7 @@ ko:
         follow_request: 누군가 나를 팔로우 하길 요청할 때
         mention: 누군가 나를 언급했을 때
         pending_account: 새 계정이 심사가 필요할 때
+        quote: 누군가 나를 인용했을 때
         reblog: 누군가 내 게시물을 부스트 했을 때
         report: 새 신고가 접수되었을 때
         software_updates:
@@ -368,6 +371,10 @@ ko:
         name: 이름
         permissions_as_keys: 권한
         position: 우선순위
+      username_block:
+        allow_with_approval: 승인을 통한 가입 허용
+        comparison: 비교 방식
+        username: 일치할 단어
       webhook:
         events: 활성화된 이벤트
         template: 페이로드 템플릿
diff --git a/config/locales/simple_form.ku.yml b/config/locales/simple_form.ku.yml
index db50384c7e5..1bd566d22dc 100644
--- a/config/locales/simple_form.ku.yml
+++ b/config/locales/simple_form.ku.yml
@@ -79,7 +79,6 @@ ku:
         site_title: Tu çawa dixwazî mirov qale rajekarê te bikin ji bilî navê navperê wî.
         theme: Rûkara ku mêvanên têneketî û bikarhênerên nû dibînin.
         thumbnail: Li kêleka zanyariyên rajekarê xwe wêneyeke 2:1 nîşan bide.
-        timeline_preview: Mêvanên têneketî wê karibin li şandiyên gelemperî yên herî dawî yên ku li ser rajekarê peyda dibin bigerin.
         trendable_by_default: Nirxandina destan a naveroka rojevê derbas bike. Tiştên kesane dîsa jî dikarin piştî rastiyê ji rojevê werin derxistin.
         trends: Rojev nîşan dide ka kîjan şandî, hashtag û çîrokê nûçeyan balê dikişîne li ser rajekarê te.
       form_challenge:
@@ -178,7 +177,6 @@ ku:
         setting_auto_play_gif: GIF ên livok bi xweber bilîzine
         setting_boost_modal: Gotûbêja pejirandinê nîşan bide berî ku şandî werê bilindkirin
         setting_default_language: Zimanê weşanê
-        setting_default_privacy: Ewlehiya weşanê
         setting_default_sensitive: Her dem medya wek hestyar bide nîşan
         setting_delete_modal: Berî ku peyamek were jêbirin, gotûbêja pejirandinê nîşan bide
         setting_disable_swiping: Tevgerên dişiqite ne çalak bike
@@ -230,7 +228,6 @@ ku:
         site_title: Navê rajekar
         theme: Rûkara berdest
         thumbnail: Wêneya piçûk a rajekar
-        timeline_preview: Mafê bide gihîştina ne naskirî bo demnameya gelemperî
         trendable_by_default: Mafê bide rojevê bêyî ku were nirxandin
         trends: Rojevê çalak bike
       interactions:
diff --git a/config/locales/simple_form.lad.yml b/config/locales/simple_form.lad.yml
index aef35365691..f11eb946e52 100644
--- a/config/locales/simple_form.lad.yml
+++ b/config/locales/simple_form.lad.yml
@@ -93,7 +93,6 @@ lad:
         status_page_url: Adreso URL de la pajina ande la djente puede ver el estado de este sirvidor durante una insidensya
         theme: El tema ke los vizitantes no enrejistrados i los muevos utilizadores ven.
         thumbnail: Una imaje de aproksimadamente 2:1 se amostra djunto a la enformasyon de tu sirvidor.
-        timeline_preview: Los vizitantes no konektados podran navigar por los mesajes publikos mas resientes desponivles en el sirvidor.
         trendable_by_default: Omite la revizyon manuala del kontenido en trend. Los elementos individuales ainda podran supremirse de los trendes.
         trends: Los trendes amostran ke mesajes, etiketas i haberes estan ganando traksyon en tu sirvidor.
         trends_as_landing_page: Amostra kontenido en trend para utilizadores i vizitantes en lugar de una deskripsyon de este sirvidor. Rekiere ke los trendes esten kapasitados.
@@ -203,7 +202,6 @@ lad:
         setting_auto_play_gif: Siempre reproduse los GIFs animados
         setting_boost_modal: Amostra ventana de konfirmasyon antes de repartajar
         setting_default_language: Lingua de publikasyones
-        setting_default_privacy: Privasita de publikasyones
         setting_default_sensitive: Syempre marka multimedia komo sensivles
         setting_delete_modal: Mostra dialogo de konfirmasyon antes de efasar una publikasyon
         setting_disable_swiping: Inkapasita movimyentos de arresvalamiento
@@ -260,7 +258,6 @@ lad:
         status_page_url: URL de pajina de estado
         theme: Tema predeterminado
         thumbnail: Minyatura del sirvidor
-        timeline_preview: Permite el akseso no autentifikado a las linyas de tiempo publikas
         trendable_by_default: Permite trendes sin revizyon previa
         trends: Kapasita trendes
         trends_as_landing_page: Kulanea trendes komo la pajina prinsipala
diff --git a/config/locales/simple_form.lt.yml b/config/locales/simple_form.lt.yml
index 4aa89ed9ecb..8eacc9685f2 100644
--- a/config/locales/simple_form.lt.yml
+++ b/config/locales/simple_form.lt.yml
@@ -60,6 +60,7 @@ lt:
         setting_display_media_default: Slėpti mediją, pažymėtą kaip jautrią
         setting_display_media_hide_all: Visada slėpti mediją
         setting_display_media_show_all: Visada rodyti mediją
+        setting_emoji_style: Kaip rodyti emodžius. „Auto“ bandys naudoti vietinius jaustukus, bet senesnėse naršyklėse grįš prie Tvejaustukų.
         setting_system_scrollbars_ui: Taikoma tik darbalaukio naršyklėms, karkasiniais „Safari“ ir „Chrome“.
         setting_use_blurhash: Gradientai pagrįsti paslėptų vizualizacijų spalvomis, bet užgožia bet kokias detales.
         setting_use_pending_items: Slėpti laiko skalės naujienas po paspaudimo, vietoj automatinio srauto slinkimo.
@@ -90,7 +91,6 @@ lt:
         site_contact_username: Kaip žmonės gali tave pasiekti Mastodon.
         site_extended_description: Bet kokia papildoma informacija, kuri gali būti naudinga lankytojams ir naudotojams. Gali būti struktūrizuota naudojant Markdown sintaksę.
         thumbnail: Maždaug 2:1 dydžio vaizdas, rodomas šalia tavo serverio informacijos.
-        timeline_preview: Atsijungę lankytojai galės naršyti naujausius viešus įrašus, esančius serveryje.
         trends: Trendai rodo, kurios įrašai, saitažodžiai ir naujienų istorijos tavo serveryje sulaukia didžiausio susidomėjimo.
         trends_as_landing_page: Rodyti tendencingą turinį atsijungusiems naudotojams ir lankytojams vietoj šio serverio aprašymo. Reikia, kad tendencijos būtų įjungtos.
       imports:
@@ -120,6 +120,11 @@ lt:
         min_age: Neturėtų būti žemiau mažiausio amžiaus, reikalaujamo pagal jūsų jurisdikcijos įstatymus.
       user:
         chosen_languages: Kai pažymėta, viešose laiko skalėse bus rodomi tik įrašai pasirinktomis kalbomis.
+        date_of_birth:
+          few: Turime įsitikinti, kad esate bent %{count} norint naudotis %{domain}. Mes to neišsaugosime.
+          many: Turime įsitikinti, kad esate bent %{count} norint naudotis %{domain}. Mes to neišsaugosime.
+          one: Turime įsitikinti, kad esate bent %{count} norint naudotis %{domain}. Mes to neišsaugosime.
+          other: Turime įsitikinti, kad esate bent %{count} norint naudotis %{domain}. Mes to neišsaugosime.
         role: Vaidmuo valdo, kokius leidimus naudotojas turi.
     labels:
       account:
@@ -154,7 +159,6 @@ lt:
         setting_auto_play_gif: Automatiškai leisti animuotų GIF
         setting_boost_modal: Rodyti patvirtinimo dialogą prieš pakėliant įrašą
         setting_default_language: Skelbimo kalba
-        setting_default_privacy: Skelbimo privatumas
         setting_default_sensitive: Visada žymėti mediją kaip jautrią
         setting_delete_modal: Rodyti patvirtinimo dialogą prieš ištrinant įrašą
         setting_disable_hover_cards: Išjungti profilio peržiūrą užvedus
@@ -162,6 +166,7 @@ lt:
         setting_display_media: Medijos rodymas
         setting_display_media_hide_all: Slėpti viską
         setting_display_media_show_all: Rodyti viską
+        setting_emoji_style: Jaustuko stilius
         setting_expand_spoilers: Visada išplėsti įrašus, pažymėtus turinio įspėjimais
         setting_hide_network: Slėpti savo socialinę diagramą
         setting_missing_alt_text_modal: Rodyti patvirtinimo dialogo langą prieš skelbiant mediją be alternatyvaus teksto.
diff --git a/config/locales/simple_form.lv.yml b/config/locales/simple_form.lv.yml
index 17357ace33b..49ff578c31f 100644
--- a/config/locales/simple_form.lv.yml
+++ b/config/locales/simple_form.lv.yml
@@ -56,11 +56,10 @@ lv:
         scopes: Kuriem API lietotnei būs ļauts piekļūt. Ja atlasa augstākā līmeņa tvērumu, nav nepieciešamas atlasīt atsevišķus.
         setting_aggregate_reblogs: Nerādīt jaunus izcēlumus ziņām, kas nesen tika palielinātas (ietekmē tikai nesen saņemtos palielinājumus)
         setting_always_send_emails: Parasti e-pasta paziņojumi netiek sūtīti, kad aktīvi izmantojat Mastodon
-        setting_default_quote_policy: Pieminētajiem lietotājiem vienmēr ir atļauts citēt. Šis iestatījums stāsies spēkā tikai nākamo Mastodon versiju ierakstiem. Bet jūs tik un tā variet iestatīt savu izvēli, kamēr notiek ieviešana
         setting_default_sensitive: Pēc noklusējuma jūtīgi informācijas nesēji ir paslēpti, un tos var atklāt ar klikšķi
-        setting_display_media_default: Paslēpt informācijas nesējus, kas atzīmēti kā jūtīgi
-        setting_display_media_hide_all: Vienmēr slēpt multividi
-        setting_display_media_show_all: Vienmēr rādīt multividi
+        setting_display_media_default: Paslēpt attēlus un video, kas atzīmēti kā jūtīgi
+        setting_display_media_hide_all: Vienmēr slēpt attēlus un video
+        setting_display_media_show_all: Vienmēr rādīt attēlus un video
         setting_system_scrollbars_ui: Attiecas tikai uz darbvirsmas pārlūkiem, kuru pamatā ir Safari vai Chrome
         setting_use_blurhash: Pāreju pamatā ir paslēpto uzskatāmo līdzekļu krāsas, bet saturs tiek padarīts neskaidrs
         setting_use_pending_items: Paslēpt laika skalas atjauninājumus aiz klikšķa, nevis ar automātisku plūsmas ritināšanu
@@ -103,7 +102,6 @@ lv:
         status_page_url: Tās lapas URL, kurā lietotāji var redzēt šī servera statusu pārtraukuma laikā
         theme: Tēma, kuru redz apmeklētāji, kuri ir atteikušies, un jaunie lietotāji.
         thumbnail: Aptuveni 2:1 attēls, kas tiek parādīts kopā ar tava servera informāciju.
-        timeline_preview: Atteikušies apmeklētāji varēs pārlūkot jaunākos serverī pieejamos publiskos ierakstus.
         trendable_by_default: Izlaist aktuālā satura manuālu pārskatīšanu. Atsevišķas preces joprojām var noņemt no tendencēm pēc fakta.
         trends: Tendences parāda, kuras ziņas, atsauces un ziņu stāsti gūst panākumus tavā serverī.
         trends_as_landing_page: Šī servera apraksta vietā rādīt aktuālo saturu lietotājiem un apmeklētājiem, kuri ir atteikušies. Nepieciešams iespējot tendences.
@@ -143,10 +141,6 @@ lv:
         domain: Sniegtā tiešsaistas pakalpojuma neatkārtojama identifikācija.
       user:
         chosen_languages: Ja ieķeksēts, publiskos laika grafikos tiks parādītas tikai ziņas noteiktajās valodās
-        date_of_birth:
-          one: Mums jāpārliecinās, ka jums ir vismaz %{count} gads, lai varētu izmantot Mastodonu. Mēs neuzglabāsim šo informāciju.
-          other: Mums jāpārliecinās, ka jums ir vismaz %{count} gadi, lai varētu izmantot Mastodonu. Mēs neuzglabāsim šo informāciju.
-          zero: Mums jāpārliecinās, ka jums ir vismaz %{count} gadi, lai varētu izmantot Mastodonu. Mēs neuzglabāsim šo informāciju.
         role: Loma nosaka, kādas lietotājam ir atļaujas.
       user_role:
         color: Krāsa, kas jāizmanto lomai visā lietotāja saskarnē, kā RGB hex formātā
@@ -226,10 +220,9 @@ lv:
         setting_auto_play_gif: Automātiski atskaņot animētos GIF
         setting_boost_modal: Rādīt apstiprinājuma dialogu pirms izcelšanas
         setting_default_language: Publicēšanas valoda
-        setting_default_privacy: Publicēšanas privātums
         setting_default_quote_policy: Kas var citēt
         setting_default_sensitive: Vienmēr atzīmēt informācijas nesējus kā jūtīgus
-        setting_delete_modal: Parādīt apstiprinājuma dialogu pirms ziņas dzēšanas
+        setting_delete_modal: Rādīt apstiprinājuma dialogu pirms ziņas dzēšanas
         setting_disable_hover_cards: Atspējot profila priekšskatījumu pēc kursora novietošanas
         setting_disable_swiping: Atspējot vilkšanas kustības
         setting_display_media: Multivides rādīšana
@@ -238,13 +231,13 @@ 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_missing_alt_text_modal: Rādīt apstiprināšanas lodziņu pirms informācijas nesēju bez aprakstošā teksta iesūtīšanas
+        setting_missing_alt_text_modal: Rādīt apstiprināšanas lodziņu pirms iesūtīt attēlus vai video bez aprakstošā teksta
         setting_reduce_motion: Ierobežot kustību animācijās
         setting_system_font_ui: Lietot sistēmas noklusējuma fontu
         setting_system_scrollbars_ui: Lietot sistēmas noklusējuma ritjoslu
         setting_theme: Vietnes motīvs
         setting_trends: Parādīt šodienas tendences
-        setting_unfollow_modal: Parādīt apstiprinājuma dialogu pirms pārtraukt kādam sekot
+        setting_unfollow_modal: Rādīt apstiprinājuma dialogu pirms pārtraukt kādam sekot
         setting_use_blurhash: Rādīt krāsainas pārejas paslēptajiem informācijas nesējiem
         setting_use_pending_items: Lēnais režīms
         severity: Smagums
@@ -260,7 +253,7 @@ lv:
         name: Tēmturis
       filters:
         actions:
-          blur: Paslēpt informācijas nesējus ar brīdinājumu
+          blur: Paslēpt attēlus un video ar brīdinājumu
           hide: Paslēpt pilnībā
           warn: Paslēpt ar brīdinājumu
       form_admin_settings:
@@ -290,7 +283,6 @@ lv:
         status_page_url: Statusa lapas URL
         theme: Noklusētā tēma
         thumbnail: Servera sīkbilde
-        timeline_preview: Atļaut neautentificētu piekļuvi publiskajām ziņu lentām
         trendable_by_default: Atļaut tendences bez iepriekšējas pārskatīšanas
         trends: Iespējot tendences
         trends_as_landing_page: Izmantojiet tendences kā galveno lapu
diff --git a/config/locales/simple_form.ms.yml b/config/locales/simple_form.ms.yml
index d3670a1c866..478d10a5b94 100644
--- a/config/locales/simple_form.ms.yml
+++ b/config/locales/simple_form.ms.yml
@@ -91,7 +91,6 @@ ms:
         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.
         trends: Aliran menunjukkan pos, hashtag dan cerita berita yang mendapat tarikan pada server anda.
         trends_as_landing_page: Tunjukkan kandungan trend kepada pengguna dan pelawat yang log keluar dan bukannya penerangan tentang server ini. Memerlukan trend untuk didayakan.
@@ -201,7 +200,6 @@ ms:
         setting_auto_play_gif: Automain GIF animasi
         setting_boost_modal: Tunjukkan dialog pengesahan sebelum meningkatkan
         setting_default_language: Bahasa hantaran
-        setting_default_privacy: Privasi hantaran
         setting_default_sensitive: Selalu tandakan media sebagai sensitif
         setting_delete_modal: Tunjukkan dialog pengesahan sebelum memadamkan pos
         setting_disable_swiping: Lumpuhkan gerakan meleret
@@ -257,7 +255,6 @@ ms:
         status_page_url: URL halaman status
         theme: Tema asal
         thumbnail: Server thumbnail
-        timeline_preview: Benarkan akses tidak disahkan kepada garis masa awam
         trendable_by_default: Benarkan aliran tanpa semakan terlebih dahulu
         trends: Dayakan trend
         trends_as_landing_page: Gunakan trend sebagai halaman pendaratan
diff --git a/config/locales/simple_form.my.yml b/config/locales/simple_form.my.yml
index 474b0f6cb41..fe8c476ea09 100644
--- a/config/locales/simple_form.my.yml
+++ b/config/locales/simple_form.my.yml
@@ -90,7 +90,6 @@ my:
         status_page_url: ပြတ်တောက်နေစဉ်အတွင်း လူများက ဤဆာဗာအခြေအနေကို မြင်နိုင်မည့် စာမျက်နှာ URL
         theme: အကောင့်မှထွက်ပြီး အသုံးပြုသူအသစ်များနှင့် ဝင်ကြည့်မည့်သူများအတွက် မြင်ရမည့်ပုံစံ။
         thumbnail: သင့်ဆာဗာအချက်အလက်နှင့်အတူ အကြမ်းဖျင်းအားဖြင့် ၂:၁ ဖြင့် ပြသထားသောပုံတစ်ပုံ။
-        timeline_preview: အကောင့်မှထွက်ထားသူများသည် ဆာဗာပေါ်ရှိ လတ်တလော အများမြင်ပို့စ်များကို ရှာဖွေကြည့်ရှုနိုင်မည်ဖြစ်သည်။
         trendable_by_default: ခေတ်စားနေသော အကြောင်းအရာများ၏ ကိုယ်တိုင်သုံးသပ်ချက်ကို ကျော်ပါ။ နောက်ပိုင်းတွင် အချက်အလက်တစ်ခုချင်းစီကို ခေတ်စားနေသောအကြောင်းအရာများကဏ္ဍမှ ဖယ်ရှားနိုင်ပါသေးသည်။
         trends: လက်ရှိခေတ်စားနေသာပို့စ်များ၊ hashtag များနှင့် သတင်းဇာတ်လမ်းများကို သင့်ဆာဗာပေါ်တွင် တွေ့မြင်နိုင်ပါမည်။
         trends_as_landing_page: ဤဆာဗာဖော်ပြချက်အစား အကောင့်မှ ထွက်ထားသူများနှင့် ဝင်ရောက်ကြည့်ရှုသူများအတွက် ခေတ်စားနေသော အကြောင်းအရာများကို ပြသပါ။ ခေတ်စားနေသောပို့စ်များကို ဖွင့်ထားရန် လိုအပ်သည်။
@@ -198,7 +197,6 @@ my:
         setting_auto_play_gif: ကာတွန်း GIF များကို အလိုအလျောက်ဖွင့်ပါ
         setting_boost_modal: Boost မလုပ်မီ အတည်ပြုချက်ပြပါ
         setting_default_language: ပို့စ်တင်မည့်ဘာသာစကား
-        setting_default_privacy: ပို့စ်ကို ဘယ်သူမြင်နိုင်မလဲ
         setting_default_sensitive: သတိထားရသောမီဒီယာအဖြစ် အမြဲအမှတ်အသားပြုပါ
         setting_delete_modal: ပို့စ်တစ်ခုမဖျက်မီ အတည်ပြုချက်ပြပါ။
         setting_disable_swiping: ပွတ်ဆွဲခြင်းများကို ပိတ်ပါ
@@ -253,7 +251,6 @@ my:
         status_page_url: အခြေအနေပြစာမျက်နှာ URL
         theme: မူလသတ်မှတ်ထားသည့် အပြင်အဆင်
         thumbnail: ဆာဗာ ပုံသေး
-        timeline_preview: အများမြင်စာမျက်နှာများသို့ အထောက်အထားမရှိဘဲ ဝင်ရောက်ခွင့်ပြုပါ
         trendable_by_default: ကြိုမသုံးသပ်ဘဲ ခေတ်စားနေသောအကြောင်းအရာများကို ခွင့်ပြုပါ
         trends: လက်ရှိခေတ်စားနေမှုများကိုပြပါ
         trends_as_landing_page: ခေတ်စားနေသောပို့စ်များကို landing စာမျက်နှာအဖြစ် အသုံးပြုပါ
diff --git a/config/locales/simple_form.nl.yml b/config/locales/simple_form.nl.yml
index dd9e2f78ca7..22e0f3fa70f 100644
--- a/config/locales/simple_form.nl.yml
+++ b/config/locales/simple_form.nl.yml
@@ -56,11 +56,13 @@ nl:
         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.
         setting_aggregate_reblogs: Geen nieuwe boosts tonen voor berichten die recentelijk nog zijn geboost (heeft alleen effect op nieuw ontvangen boosts)
         setting_always_send_emails: Normaliter worden er geen e-mailmeldingen verstuurd wanneer je actief Mastodon gebruikt
-        setting_default_quote_policy: Het is voor gebruikers die vermeld worden altijd toegestaan om te citeren. Deze instelling is alleen van kracht voor berichten die gemaakt zijn met de volgende Mastodon-versie, maar je kunt je voorkeur nu alvast instellen
+        setting_default_quote_policy_private: Berichten aan alleen volgers afkomstig van Mastodon kunnen niet door anderen worden geciteerd.
+        setting_default_quote_policy_unlisted: Wanneer mensen jou citeren, verschijnt hun bericht ook niet onder trends.
         setting_default_sensitive: Gevoelige media wordt standaard verborgen en kan met één klik worden getoond
         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_emoji_style: Waarmee moeten emojis worden weergegeven. ‘Auto’ probeert de systeemeigen emojis te gebruiken, maar valt terug op Twemoji voor oudere webbrowsers.
         setting_system_scrollbars_ui: Alleen van toepassing op desktopbrowsers gebaseerd op Safari en Chrome
         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
@@ -103,7 +105,6 @@ nl:
         status_page_url: URL van een pagina waar mensen de status van deze server kunnen zien tijdens een storing
         theme: Thema die (niet ingelogde) bezoekers en nieuwe gebruikers zien.
         thumbnail: Een afbeelding van ongeveer een verhouding van 2:1 die naast jouw serverinformatie wordt getoond.
-        timeline_preview: Bezoekers (die niet zijn ingelogd) kunnen de meest recente, op de server aanwezige openbare berichten bekijken.
         trendable_by_default: Handmatige beoordeling van trends overslaan. Individuele items kunnen later alsnog worden afgekeurd.
         trends: Trends laten zien welke berichten, hashtags en nieuwsberichten op jouw server aan populariteit winnen.
         trends_as_landing_page: Toon trending inhoud aan uitgelogde gebruikers en bezoekers in plaats van een beschrijving van deze server. Vereist dat trends zijn ingeschakeld.
@@ -150,8 +151,8 @@ nl:
       user:
         chosen_languages: Alleen berichten in de aangevinkte talen worden op de openbare tijdlijnen getoond
         date_of_birth:
-          one: We moeten er zeker van zijn dat je tenminste %{count} bent om Mastodon te mogen gebruiken. Deze informatie wordt niet door ons opgeslagen.
-          other: We moeten er zeker van zijn dat je tenminste %{count} bent om Mastodon te mogen gebruiken. Deze informatie wordt niet door ons opgeslagen.
+          one: We moeten er zeker van zijn dat je tenminste %{count} bent om %{domain} te mogen gebruiken. Deze informatie wordt niet door ons opgeslagen.
+          other: We moeten er zeker van zijn dat je tenminste %{count} bent om %{domain} te mogen gebruiken. Deze informatie wordt niet door ons opgeslagen.
         role: De rol bepaalt welke rechten de gebruiker heeft.
       user_role:
         color: Kleur die gebruikt wordt voor de rol in de UI, als RGB in hexadecimale formaat
@@ -159,6 +160,10 @@ nl:
         name: Openbare naam van de rol, wanneer de rol als badge op profielpagina's wordt getoond
         permissions_as_keys: Gebruikers met deze rol hebben toegang tot...
         position: Een hogere rol beslist in bepaalde situaties over het oplossen van conflicten. Bepaalde acties kunnen alleen worden uitgevoerd op rollen met een lagere prioriteit
+      username_block:
+        allow_with_approval: In plaats van dat het registreren helemaal wordt voorkomen, zullen overeenkomstige registraties jouw goedkeuring vereisen
+        comparison: Houd rekening met het Scunthorpe-probleem wanneer je gedeeltelijke overeenkomsten blokkeert
+        username: Wordt gezien als overeenkomst ongeacht de lettergrootte en gangbare lettervervangingen zoals "4" voor "a" of "3" voor "e"
       webhook:
         events: Selecteer de te verzenden gebeurtenissen
         template: Maak een eigen JSON payload aan met variabele interpolatie. Laat leeg voor standaard JSON.
@@ -230,9 +235,9 @@ nl:
         setting_always_send_emails: Altijd e-mailmeldingen verzenden
         setting_auto_play_gif: Geanimeerde GIF's automatisch afspelen
         setting_boost_modal: Vraag voor het boosten van een bericht een bevestiging
-        setting_default_language: Taal van jouw berichten
+        setting_default_language: Taal van berichten
         setting_default_privacy: Zichtbaarheid van nieuwe berichten
-        setting_default_quote_policy: Wie kan citeren
+        setting_default_quote_policy: Wie mag jou citeren
         setting_default_sensitive: Media altijd als gevoelig markeren
         setting_delete_modal: Vraag voor het verwijderen van een bericht een bevestiging
         setting_disable_hover_cards: Hover-kaarten met profielvoorbeelden uitschakelen
@@ -241,6 +246,7 @@ nl:
         setting_display_media_default: Standaard
         setting_display_media_hide_all: Alles verbergen
         setting_display_media_show_all: Alles tonen
+        setting_emoji_style: Emoji-stijl
         setting_expand_spoilers: Berichten met inhoudswaarschuwingen altijd uitklappen
         setting_hide_network: Jouw volgers en wie je volgt verbergen
         setting_missing_alt_text_modal: Bevestigingsvenster tonen voor het plaatsen van media zonder alt-tekst
@@ -277,12 +283,16 @@ nl:
         content_cache_retention_period: Bewaartermijn voor externe inhoud
         custom_css: Aangepaste CSS
         favicon: Favicon
+        local_live_feed_access: Toegang tot openbare lokale berichten
+        local_topic_feed_access: Toegang tot overzicht met lokale hashtags en links
         mascot: Aangepaste mascotte (legacy)
         media_cache_retention_period: Bewaartermijn mediacache
         min_age: Vereiste minimumleeftijd
         peers_api_enabled: Lijst van bekende servers via de API publiceren
         profile_directory: Gebruikersgids inschakelen
         registrations_mode: Wie kan zich registreren
+        remote_live_feed_access: Toegang tot openbare berichten van andere servers
+        remote_topic_feed_access: Toegang tot overzicht met hashtags en links van andere servers
         require_invite_text: Opgeven van een reden is verplicht
         show_domain_blocks: Domeinblokkades tonen
         show_domain_blocks_rationale: Redenen voor domeinblokkades tonen
@@ -295,7 +305,6 @@ nl:
         status_page_url: URL van statuspagina
         theme: Standaardthema
         thumbnail: Server-miniatuur
-        timeline_preview: Toegang tot de openbare tijdlijnen zonder in te loggen toestaan
         trendable_by_default: Trends goedkeuren zonder voorafgaande beoordeling
         trends: Trends inschakelen
         trends_as_landing_page: Laat trends op de startpagina zien
@@ -323,6 +332,7 @@ nl:
         follow_request: Wanneer iemand jou wil volgen
         mention: Je bent door iemand vermeld
         pending_account: Wanneer een nieuw account moet worden beoordeeld
+        quote: Iemand heeft jou geciteerd
         reblog: Wanneer iemand jouw bericht heeft geboost
         report: Nieuwe rapportage is ingediend
         software_updates:
@@ -369,6 +379,10 @@ nl:
         name: Naam
         permissions_as_keys: Rechten
         position: Prioriteit
+      username_block:
+        allow_with_approval: Registraties met goedkeuring toestaan
+        comparison: Methode van vergelijking
+        username: Overeen te komen woord
       webhook:
         events: Ingeschakelde gebeurtenissen
         template: Sjabloon Payload
diff --git a/config/locales/simple_form.nn.yml b/config/locales/simple_form.nn.yml
index 4404f4945b7..b80f90adb46 100644
--- a/config/locales/simple_form.nn.yml
+++ b/config/locales/simple_form.nn.yml
@@ -16,7 +16,7 @@ nn:
       account_migration:
         acct: Angi brukarnamn@domene til brukaren du ynskjer å flytta til
       account_warning_preset:
-        text: Du kan bruka tut-syntaks, som t. d. URL-ar, emneknaggar og omtaler
+        text: Du kan bruka tut-syntaks, som t. d. URL-ar, emneknaggar og omtalar
         title: Valfritt. Ikkje synleg for mottakar
       admin_account_action:
         include_statuses: Brukaren får sjå kva tut som førte til moderatorhandlinga eller -åtvaringa
@@ -56,11 +56,13 @@ nn:
         scopes: API-ane som programmet vil få tilgjenge til. Ettersom du vel eit toppnivåomfang tarv du ikkje velja einskilde API-ar.
         setting_aggregate_reblogs: Ikkje vis nye framhevingar for tut som nyleg har vorte heva fram (Påverkar berre nylege framhevingar)
         setting_always_send_emails: Vanlegvis vil ikkje e-postvarsel bli sendt når du brukar Mastodon aktivt
-        setting_default_quote_policy: Dei nemnde folka får alltid lov å sitera. Denne innstillinga har berre verknad for innlegg som er laga med den neste utgåva av Mastodon, men du kan velja kva du vil ha i førebuingane
+        setting_default_quote_policy_private: Innlegg som er skrivne på Mastodon og berre for fylgjarar kan ikkje siterast av andre.
+        setting_default_quote_policy_unlisted: Når folk siterer deg, vil innlegget deira ikkje syna på populære tidsliner.
         setting_default_sensitive: Sensitive media vert gøymde som standard, og du syner dei ved å klikka på dei
         setting_display_media_default: Gøym media som er merka som sensitive
         setting_display_media_hide_all: Alltid skjul alt media
         setting_display_media_show_all: Vis alltid media
+        setting_emoji_style: Korleis du skal visa smilefjes. «Auto» prøver å visa innebygde smilefjes, men bruker Twemoji som reserveløysing for eldre nettlesarar.
         setting_system_scrollbars_ui: Gjeld berre skrivebordsnettlesarar som er bygde på Safari og Chrome
         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
@@ -85,7 +87,7 @@ nn:
         backups_retention_period: Brukarar har moglegheit til å generere arkiv av sine innlegg for å laste ned seinare. Når sett til ein positiv verdi, blir desse arkiva automatisk sletta frå lagringa etter eit gitt antal dagar.
         bootstrap_timeline_accounts: Desse kontoane vil bli festa øverst på fylgjaranbefalingane til nye brukarar.
         closed_registrations_message: Vist når det er stengt for registrering
-        content_cache_retention_period: Alle innlegg frå andre tenarar (inkludert framhevingar og svar) vil bli sletta etter talet på dagar du skriv inn, uansett om nokon har samhandla med desse innlegga. Dette inkluderer innlegg der ein lokal brukar har merka det som bokmerke eller som favoritt. Private omtaler mellom brukarar frå ulike nettstader vil gå tapt og vera umogleg å gjenskapa. Bruk av denne innstillinga er meint for spesielle nettstader og bryt med det mange forventar av ein vanleg nettstad.
+        content_cache_retention_period: Alle innlegg frå andre tenarar (inkludert framhevingar og svar) vil bli sletta etter talet på dagar du skriv inn, uansett om nokon har samhandla med desse innlegga. Dette inkluderer innlegg der ein lokal brukar har merka det som bokmerke eller som favoritt. Private omtalar mellom brukarar frå ulike nettstader vil gå tapt og vera umogleg å gjenskapa. Bruk av denne innstillinga er meint for spesielle nettstader og bryt med det mange forventar av ein vanleg nettstad.
         custom_css: Du kan bruka eigendefinerte stilar på nettversjonen av Mastodon.
         favicon: WEBP, PNG, GIF eller JPG. Overstyrer det standarde Mastodon-favikonet med eit eigendefinert ikon.
         mascot: Overstyrer illustrasjonen i det avanserte webgrensesnittet.
@@ -103,7 +105,6 @@ nn:
         status_page_url: Adressa til ei side der folk kan sjå statusen til denne tenaren ved feil og utkoplingar
         theme: Tema som er synleg for nye brukarar og besøkjande som ikkje er logga inn.
         thumbnail: Eit omlag 2:1 bilete vist saman med informasjon om tenaren.
-        timeline_preview: Besøkjande som ikkje er logga inn vil kunne bla gjennom dei siste offentlege innlegga på tenaren.
         trendable_by_default: Hopp over manuell gjennomgang av populært innhald. Enkeltståande innlegg kan fjernast frå trendar i etterkant.
         trends: Trendar viser kva for nokre innlegg, emneknaggar og nyheiter som er populære på tenaren.
         trends_as_landing_page: Vis populært innhald til utlogga brukarar og folk som kjem innom sida i staden for ei skildring av tenaren. Du må ha skrudd på trendar for å kunna bruka dette.
@@ -150,8 +151,8 @@ nn:
       user:
         chosen_languages: Når merka vil berre tuta på dei valde språka synast på offentlege tidsliner
         date_of_birth:
-          one: Me må syta for at du er minst %{count} for å bruka Masodon. Me lagrar ikkje dette.
-          other: Me må syta for at du er minst %{count} for å bruka Masodon. Me lagrar ikkje dette.
+          one: Me må sikra oss at du er minst %{count} for å bruka %{domain}. Me lagrar ikkje dette.
+          other: Me må sikra oss at du er minst %{count} for å bruka %{domain}. Me lagrar ikkje dette.
         role: Rolla kontrollerer kva løyve brukaren har.
       user_role:
         color: Fargen som skal nyttast for denne rolla i heile brukargrensesnittet, som RGB i hex-format
@@ -159,6 +160,10 @@ nn:
         name: Offentleg namn på rolla, dersom rolla skal visast som eit emblem
         permissions_as_keys: Brukarar med denne rolla vil ha tilgang til...
         position: Høgare rolle avgjer konfliktløysing i visse situasjonar. Visse handlingar kan berre utførast på roller med lågare prioritet
+      username_block:
+        allow_with_approval: I staden for å hindra registreringar i det heile, må du godkjenna registreringar som passar
+        comparison: Ver merksam på Scunthorpe-problemet når du blokkerer delvise treff
+        username: Vil passa uansett store og små bokstavar og vanlege homoglyfar som «4» for «a» eller «3» for «e»
       webhook:
         events: Vel hendingar å senda
         template: Skriv di eiga JSON nyttelast ved å bruka variabel interpolering. La stå tom for standard JSON.
@@ -231,16 +236,17 @@ nn:
         setting_auto_play_gif: Spel av animerte GIF-ar automatisk
         setting_boost_modal: Vis stadfesting før framheving
         setting_default_language: Språk på innlegg
-        setting_default_privacy: Privatliv
+        setting_default_privacy: Innleggsvising
         setting_default_quote_policy: Kven kan sitera
         setting_default_sensitive: Merk alltid media som nærtakande
         setting_delete_modal: Vis stadfesting før du slettar eit tut
         setting_disable_hover_cards: Skru av profilvising når peikaren er over
-        setting_disable_swiping: Skru av sveipebevegelser
+        setting_disable_swiping: Skru av sveiperørsler
         setting_display_media: Medievisning
         setting_display_media_default: Standard
         setting_display_media_hide_all: Gøym alle
         setting_display_media_show_all: Vis alle
+        setting_emoji_style: Stil for smilefjes
         setting_expand_spoilers: Vid alltid ut tut som er merka med innhaldsåtvaringar
         setting_hide_network: Gøym nettverket ditt
         setting_missing_alt_text_modal: Vis stadfestingsdialog før du legg ut media utan alt-tekst
@@ -295,7 +301,6 @@ nn:
         status_page_url: Adresse til statussida
         theme: Standardtema
         thumbnail: Miniatyrbilete for tenaren
-        timeline_preview: Tillat uautentisert tilgang til offentleg tidsline
         trendable_by_default: Tillat trendar utan gjennomgang på førehand
         trends: Aktiver trendar
         trends_as_landing_page: Bruk trendar som startside
@@ -323,18 +328,19 @@ nn:
         follow_request: Send e-post når nokon spør om å fylgja deg
         mention: Send e-post når nokon nemner deg
         pending_account: Send e-post når ein ny konto treng gjennomgang
+        quote: Nokon siterte deg
         reblog: Send e-post når nokon framhevar statusen din
         report: Ny rapport er sendt
         software_updates:
           all: Varsle om alle oppdateringar
           critical: Varsle kun om kristiske oppdateringar
           label: Ein ny versjon av Mastodon er tilgjengeleg
-          none: Aldri varsle om oppdateringar (ikkje anbefalt)
+          none: Aldri varsle om oppdateringar (ikkje tilrådd)
           patch: Varsle om feilrettingsoppdateringar
         trending_tag: Ny trend krev gjennomgang
       rule:
         hint: Meir informasjon
-        text: Regler
+        text: Regel
       settings:
         indexable: Ta med profilsida i søkjemotorar
         show_application: Vis kva app du brukte når du skreiv innlegg
@@ -369,12 +375,16 @@ nn:
         name: Namn
         permissions_as_keys: Løyve
         position: Prioritet
+      username_block:
+        allow_with_approval: Tillat registreringar med godkjenning
+        comparison: Samanlikningsmetode
+        username: Ord som skal passa
       webhook:
         events: Aktiverte hendingar
         template: Nyttelastmal
         url: Endepunkts-URL
     'no': Nei
-    not_recommended: Ikkje anbefalt
+    not_recommended: Ikkje tilrådd
     overridden: Overstyrt
     recommended: Tilrådt
     required:
diff --git a/config/locales/simple_form.no.yml b/config/locales/simple_form.no.yml
index f9b60ed7962..747cf2f3b85 100644
--- a/config/locales/simple_form.no.yml
+++ b/config/locales/simple_form.no.yml
@@ -92,7 +92,6 @@
         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.
@@ -200,7 +199,6 @@
         setting_auto_play_gif: Autoavspill animert GIF-filer
         setting_boost_modal: Vis bekreftelse før fremheving
         setting_default_language: Innleggsspråk
-        setting_default_privacy: Postintegritet
         setting_default_sensitive: Merk alltid media som følsomt
         setting_delete_modal: Vis bekreftelse før du sletter et innlegg
         setting_disable_swiping: Skru av sveipebevegelser
@@ -256,7 +254,6 @@
         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
diff --git a/config/locales/simple_form.oc.yml b/config/locales/simple_form.oc.yml
index 05b0508a515..26c310068e9 100644
--- a/config/locales/simple_form.oc.yml
+++ b/config/locales/simple_form.oc.yml
@@ -132,7 +132,6 @@ oc:
         setting_auto_play_gif: Lectura automatica dels GIFS animats
         setting_boost_modal: Mostrar una fenèstra de confirmacion abans de partejar un estatut
         setting_default_language: Lenga de publicacion
-        setting_default_privacy: Confidencialitat dels tuts
         setting_default_sensitive: Totjorn marcar los mèdias coma sensibles
         setting_delete_modal: Mostrar una fenèstra de confirmacion abans de suprimir un estatut
         setting_disable_swiping: Desactivar las accions en lisant
@@ -181,7 +180,6 @@ oc:
         site_title: Nom del servidor
         theme: Tèma per defaut
         thumbnail: Miniatura del servidor
-        timeline_preview: Permtre l’accès a l’apercebut del flux public sens autentificacion
         trendable_by_default: Activar las tendéncias sens revision prealabla
         trends: Activar las tendéncias
       interactions:
diff --git a/config/locales/simple_form.pl.yml b/config/locales/simple_form.pl.yml
index c049822b817..07196019bd5 100644
--- a/config/locales/simple_form.pl.yml
+++ b/config/locales/simple_form.pl.yml
@@ -60,6 +60,7 @@ 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_emoji_style: Jak wyświetlić emotikony. "Auto" spróbuje użyć natywnych emoji, ale wróci do Twemoji dla starszych przeglądarek.
         setting_system_scrollbars_ui: Stosuje się tylko do przeglądarek komputerowych opartych na Safari i Chrome
         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
@@ -75,6 +76,7 @@ pl:
       filters:
         action: Wybierz akcję do wykonania, gdy post pasuje do filtra
         actions:
+          blur: Ukryj media za ostrzeżeniem, bez ukrywania samego tekstu
           hide: Całkowicie ukryj przefiltrowaną zawartość, jakby nie istniała
           warn: Ukryj filtrowaną zawartość za ostrzeżeniem wskazującym tytuł filtra
       form_admin_settings:
@@ -88,6 +90,7 @@ pl:
         favicon: WEBP, PNG, GIF, albo JPEG. Nadpisuje domyślną faviconę Mastodona.
         mascot: Nadpisuje ilustrację w zaawansowanym interfejsie internetowym.
         media_cache_retention_period: Media z wpisów od obcych użytkowników są cache'owane na twoim serwerze. Kiedy dana wartość jest dodatnia, media te będą usunięte po tylu dniach. Jeżeli usunięte media zostaną potem zażądane, oryginał zostanie ponownie pobrany (o ile jest dalej dostępny). Z powodu ograniczeń dot. częstotliwości z jaką karty podglądu linków dopytują się o dane od stron trzecich, zalecana wartość to min. 14 dni, bo karty podglądu linków nie będą wcześniej odświeżane na żądane.
+        min_age: Użytkownicy zostaną poproszeni o potwierdzenie daty urodzenia podczas rejestracji
         peers_api_enabled: Lista nazw domen, z którymi ten serwer spotkał się w fediverse. Nie są tu zawarte żadne dane o tym, czy użytkownik dokonuje federacji z danym serwerem, a jedynie, że jego serwer o tym wie. Jest to wykorzystywane przez serwisy, które zbierają statystyki dotyczące federacji w ogólnym sensie.
         profile_directory: Katalog profili zawiera listę wszystkich użytkowników, którzy zgodzili się na bycie znalezionymi.
         require_invite_text: Kiedy rejestracje wymagają ręcznego zatwierdzenia, ustaw pole "Dlaczego chcesz dołączyć?" jako obowiązkowe, a nie opcjonalne
@@ -100,7 +103,6 @@ pl:
         status_page_url: Adres URL strony, na której odwiedzający mogą zobaczyć status tego serwera w trakcie awarii
         theme: Motyw, który widzą wylogowani i nowi użytkownicy.
         thumbnail: Obraz o proporcjach mniej więcej 2:1 wyświetlany obok informacji o serwerze.
-        timeline_preview: Wylogowani użytkownicy będą mogli przeglądać najnowsze publiczne wpisy dostępne na serwerze.
         trendable_by_default: Pomiń ręczny przegląd treści trendów. Pojedyncze elementy nadal mogą być usuwane z trendów po fakcie.
         trends: Tendencje pokazują, które posty, hasztagi i newsy zyskują popularność na Twoim serwerze.
         trends_as_landing_page: Pokaż najpopularniejsze treści niezalogowanym użytkownikom i odwiedzającym zamiast opisu tego serwera. Wymaga włączenia trendów.
@@ -132,15 +134,25 @@ pl:
         name: Możesz zmieniać tylko wielkość liter, np. aby były bardziej widoczne
       terms_of_service:
         changelog: Może być stworzony przy pomocy składni Markdown.
+        effective_date: Uzasadnione ramy czasowe mogą być różne w dowolnym miejscu od 10 do 30 dni od daty powiadomienia użytkowników.
         text: Może być stworzony przy pomocy składni Markdown.
       terms_of_service_generator:
         admin_email: Zawiadomienia prawne obejmują środki zapobiegawcze, nakazy sądowe, wnioski o popełnienie sprawy oraz wnioski organów ścigania.
+        arbitration_address: Czy może być taki sam jak adres fizyczny powyżej lub „N/A” jeśli używasz adresu e-mail.
+        arbitration_website: Może być formularzem internetowym lub „N/A”, jeśli używasz adresu e-mail.
         choice_of_law: Miasto, region, terytorium lub stan, którego wewnętrzne prawo będzie regulowało wszelkie roszczenia.
         dmca_address: W przypadku operatorów z USA należy użyć adresu zarejestrowanego w DMCA Designated Agent Directory. Lista skrytek pocztowych dostępna jest na bezpośrednią prośbę użytkownika. Użyj DMCA Agent Post Office Box Waiver Request, aby wysłać email do Copyright Office z informacją, że jesteś domowym administratorm treści i z powodu obawy o zemstę lub odwetu za swoje działania, musisz użyć skrytki pocztowej, żeby usunąć swój adres domowy z dostępu publicznego.
+        dmca_email: Czy może ten sam adres e-mail używany dla powyższego "Adres e-mail dla prawnych zawiadomień"?
         domain: Unikalny numer identyfikacji świadczonej przez Ciebie usługi online.
         jurisdiction: Wymień państwo, w którym mieszkają osoby płacące rachunki. Jeżeli jest to spółka lub inny zarejestrowany podmiot, w zależności od przypadku podaj państwo, w którym jest zarejestrowany, a także miasto, region czy województwo.
+        min_age: Nie powinien być niższy niż minimalny wiek wymagany przez prawo twojego państwa.
       user:
         chosen_languages: Jeżeli zaznaczone, tylko wpisy w wybranych językach będą wyświetlane na publicznych osiach czasu
+        date_of_birth:
+          few: Musimy upewnić się, że jesteś co najmniej %{count} aby użyć %{domain}. Nie będziemy tego przechowywać.
+          many: Musimy upewnić się, że jesteś co najmniej %{count} aby użyć %{domain}. Nie będziemy tego przechowywać.
+          one: Musimy upewnić się, że jesteś co najmniej %{count} aby użyć %{domain}. Nie będziemy tego przechowywać.
+          other: Musimy upewnić się, że jesteś co najmniej %{count} aby użyć %{domain}. Nie będziemy tego przechowywać.
         role: Rola kontroluje uprawnienia użytkownika.
       user_role:
         color: Kolor używany dla roli w całym interfejsie użytkownika, wyrażony jako RGB w formacie szesnastkowym
@@ -148,6 +160,10 @@ pl:
         name: Publiczna nazwa roli, jeśli włączone jest wyświetlanie odznaki
         permissions_as_keys: Użytkownicy z tą rolą będą mieli dostęp do...
         position: Wyższa rola decyduje o rozwiązywaniu konfliktów w pewnych sytuacjach. Niektóre działania mogą być wykonywane tylko na rolach z niższym priorytetem
+      username_block:
+        allow_with_approval: Zamiast bezwzględnie uniemożliwiać rejestrację, pasujące rejestracje będą wymagały Twojej zgody
+        comparison: Proszę pamiętać o problemie Scunthorpe podczas blokowania częściowych dopasowań
+        username: Będą dopasowane niezależnie od otoczki i zwykłych homoglików, takich jak "4" dla "a" lub "3" dla "e"
       webhook:
         events: Wybierz zdarzenia do wysłania
         template: Poskładaj zawartość JSON, podstawiając zmienne. Użyjemy domyślnej wartości, jeżeli pole zostawisz pustym.
@@ -220,7 +236,7 @@ pl:
         setting_auto_play_gif: Automatycznie odtwarzaj animowane GIFy
         setting_boost_modal: Pytaj o potwierdzenie przed podbiciem
         setting_default_language: Język wpisów
-        setting_default_privacy: Widoczność wpisów
+        setting_default_quote_policy: Kto może cytować
         setting_default_sensitive: Zawsze oznaczaj zawartość multimedialną jako wrażliwą
         setting_delete_modal: Pytaj o potwierdzenie przed usunięciem wpisu
         setting_disable_hover_cards: Wyłącz podgląd profilu po najechaniu
@@ -229,6 +245,7 @@ pl:
         setting_display_media_default: Domyślne
         setting_display_media_hide_all: Ukryj wszystko
         setting_display_media_show_all: Pokaż wszystko
+        setting_emoji_style: Styl emoji
         setting_expand_spoilers: Zawsze rozwijaj wpisy oznaczone ostrzeżeniem o zawartości
         setting_hide_network: Ukryj swoją sieć
         setting_missing_alt_text_modal: Pokaż okno potwierdzenia przed opublikowaniem materiałów bez pomocniczego opisu obrazów
@@ -253,6 +270,7 @@ pl:
         name: Hasztag
       filters:
         actions:
+          blur: Ukryj media z ostrzeżeniem
           hide: Ukryj całkowicie
           warn: Ukryj z ostrzeżeniem
       form_admin_settings:
@@ -266,6 +284,7 @@ pl:
         favicon: Favicon
         mascot: Własna ikona
         media_cache_retention_period: Okres przechowywania pamięci podręcznej
+        min_age: Wymagany minimalny wiek
         peers_api_enabled: Opublikuj listę odkrytych serwerów w API
         profile_directory: Włącz katalog profilów
         registrations_mode: Kto może się zarejestrować
@@ -281,7 +300,6 @@ pl:
         status_page_url: Adres URL strony statusu
         theme: Domyślny motyw
         thumbnail: Miniaturka serwera
-        timeline_preview: Zezwalaj na nieuwierzytelniony dostęp do publicznych osi czasu
         trendable_by_default: Zezwalaj na trendy bez wcześniejszego przeglądu
         trends: Włącz trendy
         trends_as_landing_page: Użyj trendów jako strony początkowej
@@ -309,6 +327,7 @@ pl:
         follow_request: Powiadamiaj mnie e-mailem, gdy ktoś poprosi o pozwolenie na obserwowanie mnie
         mention: Powiadamiaj mnie e-mailem, gdy ktoś o mnie wspomni
         pending_account: Wyślij e-mail kiedy nowe konto potrzebuje recenzji
+        quote: Ktoś Cię cytował
         reblog: Powiadamiaj mnie e-mailem, gdy ktoś podbije mój wpis
         report: Nowe zgłoszenie zostało wysłane
         software_updates:
@@ -331,6 +350,7 @@ pl:
         usable: Pozwól na umieszczanie tego hashtagu w lokalnych wpisach
       terms_of_service:
         changelog: Co się zmieniło?
+        effective_date: Data wejścia w życie
         text: Warunki korzystania z usługi
       terms_of_service_generator:
         admin_email: Adres e-mail przeznaczony do celów prawnych
@@ -341,7 +361,11 @@ pl:
         dmca_email: Adres e-mail dla zgłoszeń naruszenia DMCA/praw autorskich
         domain: Domena
         jurisdiction: Jurysdykcja
+        min_age: Wiek minimalny
       user:
+        date_of_birth_1i: Dzień
+        date_of_birth_2i: Miesiąc
+        date_of_birth_3i: Rok
         role: Rola
         time_zone: Strefa czasowa
       user_role:
@@ -350,6 +374,10 @@ pl:
         name: Nazwa
         permissions_as_keys: Uprawnienia
         position: Priorytet
+      username_block:
+        allow_with_approval: Zezwól na rejestracje po zatwierdzeniu
+        comparison: Metoda porównania
+        username: Słowo do dopasowania
       webhook:
         events: Włączone zdarzenia
         template: Szablon zawartości
diff --git a/config/locales/simple_form.pt-BR.yml b/config/locales/simple_form.pt-BR.yml
index 0dd04802526..2aa15652d34 100644
--- a/config/locales/simple_form.pt-BR.yml
+++ b/config/locales/simple_form.pt-BR.yml
@@ -56,11 +56,11 @@ pt-BR:
         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.
         setting_aggregate_reblogs: Não mostrar novos impulsos para publicações que já foram impulsionadas recentemente (afeta somente os impulsos mais recentes)
         setting_always_send_emails: Normalmente, as notificações por e-mail não serão enviadas enquanto você estiver usando ativamente o Mastodon
-        setting_default_quote_policy: Usuários mencionados sempre têm permissão para citar. Esta configuração só terá efeito para postagens criadas com a próxima versão do Mastodon, mas você pode selecionar sua preferência em preparação
         setting_default_sensitive: Mídia sensível está oculta por padrão e pode ser revelada com um clique
         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_emoji_style: Como exibir emojis. "Automáticos" tentará usar emojis nativos, mas voltará para o Twemoji para navegadores legados.
         setting_system_scrollbars_ui: Se aplica apenas para navegadores de computador baseado no Safari e Chrome
         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
@@ -103,7 +103,6 @@ pt-BR:
         status_page_url: URL de uma página onde as pessoas podem ver o status deste servidor durante uma interrupção
         theme: Tema que visitantes e novos usuários veem.
         thumbnail: Uma imagem de aproximadamente 2:1 exibida ao lado da informação de sua instância.
-        timeline_preview: Visitantes conseguirão navegar pelas postagens públicas mais recentes disponíveis na instância.
         trendable_by_default: Pular a revisão manual do conteúdo em tendência. Itens individuais ainda poderão ser removidos das tendências após a sua exibição.
         trends: Tendências mostram quais publicações, hashtags e notícias estão ganhando destaque na sua instância.
         trends_as_landing_page: Mostrar conteúdo de tendências para usuários deslogados e visitantes em vez de uma descrição deste servidor. Requer que as tendências sejam ativadas.
@@ -150,8 +149,8 @@ pt-BR:
       user:
         chosen_languages: Apenas as publicações dos idiomas selecionados serão exibidas nas linhas públicas
         date_of_birth:
-          one: Temos que ter certeza de que você é pelo menos %{count} para usar o Mastodon. Não vamos armazenar isso.
-          other: Precisamos ter certeza de que você tem, no mínimo, %{count} anos para usar o Mastodon. Não armazenaremos essa informação.
+          one: Precisamos ter certeza de que você tem, no mínimo, %{count} anos para usar o %{domain} Não armazenaremos essa informação.
+          other: Temos que ter certeza de que você é pelo menos %{count} para usar o %{domain} Não vamos armazenar isso.
         role: A função controla quais permissões o usuário tem.
       user_role:
         color: Cor a ser usada para o cargo em toda a interface do usuário, como RGB no formato hexadecimal
@@ -159,6 +158,10 @@ pt-BR:
         name: Nome público do cargo, se ele for definido para ser exibido como um distintivo
         permissions_as_keys: Usuários com esse cargo terão acesso a...
         position: Um cargo superior decide a resolução de conflitos em certas situações. Certas ações só podem ser executadas com cargos de menor prioridade
+      username_block:
+        allow_with_approval: Em vez de impedir a inscrição completa, a correspondência de cadastros exigirá sua aprovação
+        comparison: Por favor, esteja atento ao problema de Scunthorpe ao bloquear correspondências parciais
+        username: Serão correspondidos independentemente de casar e homólogos comuns como "4" para "a" ou "3" para "e"
       webhook:
         events: Selecione eventos para enviar
         template: Elabore seu próprio conteúdo JSON usando interpolação de variáveis. Deixe em branco para utilizar o JSON padrão.
@@ -231,7 +234,7 @@ pt-BR:
         setting_auto_play_gif: Reproduzir GIFs automaticamente
         setting_boost_modal: Solicitar confirmação antes de dar boost
         setting_default_language: Idioma dos toots
-        setting_default_privacy: Privacidade dos toots
+        setting_default_privacy: Visibilidade da publicação
         setting_default_quote_policy: Quem pode citar
         setting_default_sensitive: Sempre marcar mídia como sensível
         setting_delete_modal: Solicitar confirmação antes de excluir toot
@@ -241,6 +244,7 @@ pt-BR:
         setting_display_media_default: Padrão
         setting_display_media_hide_all: Ocultar tudo
         setting_display_media_show_all: Mostrar tudo
+        setting_emoji_style: Estilo de emoji
         setting_expand_spoilers: Sempre expandir toots com Aviso de Conteúdo
         setting_hide_network: Ocultar suas relações
         setting_missing_alt_text_modal: Mostrar caixa de diálogo de confirmação antes de postar mídia sem texto alternativo.
@@ -295,7 +299,6 @@ pt-BR:
         status_page_url: Endereço da página de status
         theme: Tema padrão
         thumbnail: Miniatura do servidor
-        timeline_preview: Permitir acesso não autenticado às linhas do tempo públicas
         trendable_by_default: Permitir tendências sem revisão prévia
         trends: Habilitar tendências
         trends_as_landing_page: Usar tendências como página inicial
@@ -323,6 +326,7 @@ pt-BR:
         follow_request: Enviar e-mail quando alguém quiser te seguir
         mention: Enviar e-mail quando alguém te mencionar
         pending_account: Enviar e-mail quando uma nova conta precisa ser revisada
+        quote: Alguém citou você
         reblog: Enviar e-mail quando alguém der boost nos teus toots
         report: Nova denúncia foi enviada
         software_updates:
@@ -369,6 +373,10 @@ pt-BR:
         name: Nome
         permissions_as_keys: Permissões
         position: Prioridade
+      username_block:
+        allow_with_approval: Permitir inscrições com aprovação
+        comparison: Método de comparação
+        username: Palavra para corresponder
       webhook:
         events: Eventos habilitados
         template: Conteúdo JSON
diff --git a/config/locales/simple_form.pt-PT.yml b/config/locales/simple_form.pt-PT.yml
index 4b50aaf30ba..3214690dcd6 100644
--- a/config/locales/simple_form.pt-PT.yml
+++ b/config/locales/simple_form.pt-PT.yml
@@ -56,11 +56,13 @@ pt-PT:
         scopes: Quais as API a que a aplicação terá permissão para aceder. Se selecionar um âmbito de nível superior, não precisa de selecionar âmbitos individuais.
         setting_aggregate_reblogs: Não mostrar os novos impulsos para publicações que tenham sido recentemente impulsionadas (apenas afeta os impulsos recentemente recebidos)
         setting_always_send_emails: Normalmente as notificações por e-mail não serão enviadas quando estiver a utilizar ativamente o Mastodon
-        setting_default_quote_policy: Os utilizadores mencionados têm sempre permissão para citar. Esta definição só terá efeito para publicações criadas com a próxima versão do Mastodon, mas pode selecionar a sua preferência em antecipação
+        setting_default_quote_policy_private: As publicações exclusivas para seguidores criadas no Mastodon não podem ser citadas por outras pessoas.
+        setting_default_quote_policy_unlisted: Quando as pessoas o citarem, as respetivas publicações também serão ocultadas dos destaques.
         setting_default_sensitive: Os multimédia sensíveis são ocultados por predefinição e podem ser revelados com um clique/toque
         setting_display_media_default: Esconder multimédia marcada como sensível
         setting_display_media_hide_all: Esconder sempre toda a multimédia
         setting_display_media_show_all: Mostrar sempre a multimédia
+        setting_emoji_style: Como apresentar emojis. "Auto" tenta usar emojis nativos, mas reverte para Twemoji em navegadores mais antigos.
         setting_system_scrollbars_ui: Aplica-se apenas a navegadores de desktop baseados no Safari e Chrome
         setting_use_blurhash: Os gradientes são baseados nas cores das imagens escondidas, mas ofuscam quaisquer pormenores
         setting_use_pending_items: Ocultar as atualizações da cronologia após um clique em vez de percorrer automaticamente a cronologia
@@ -103,7 +105,6 @@ pt-PT:
         status_page_url: URL de uma página onde as pessoas podem ver o estado deste servidor durante uma interrupção
         theme: Tema que os visitantes e os novos utilizadores veem.
         thumbnail: Uma imagem de cerca de 2:1, apresentada ao lado da informação do seu servidor.
-        timeline_preview: Os visitantes sem sessão iniciada poderão consultar as publicações públicas mais recentes disponíveis no servidor.
         trendable_by_default: Ignorar a revisão manual do conteúdo em destaque. Os itens individuais poderão ainda assim ser posteriormente removidos das tendências.
         trends: As tendências mostram quais as publicações, etiquetas e notícias que estão a ganhar destaque no seu servidor.
         trends_as_landing_page: Mostrar conteúdo em destaque a utilizadores sem sessão iniciada e visitantes, ao invés de uma descrição deste servidor. Requer que os destaques estejam ativados.
@@ -150,8 +151,8 @@ pt-PT:
       user:
         chosen_languages: Quando selecionado, só serão mostradas nas cronologias públicas as publicações nos idiomas escolhidos
         date_of_birth:
-          one: Temos de nos certificar que tem pelo menos %{count} para utilizar o Mastodon. Não vamos guardar esta informação.
-          other: Temos de nos certificar que tem pelo menos %{count} para utilizar o Mastodon. Não vamos guardar esta informação.
+          one: Temos de nos certificar que tem pelo menos %{count} para utilizar %{domain}. Não vamos guardar esta informação.
+          other: Temos de nos certificar que tem pelo menos %{count} para utilizar %{domain}. Não vamos guardar esta informação.
         role: A função controla as permissões que o utilizador tem.
       user_role:
         color: Cor a ser utilizada para a função em toda a interface de utilizador, como RGB no formato hexadecimal
@@ -159,6 +160,10 @@ pt-PT:
         name: Nome público da função, se esta estiver definida para ser apresentada com um emblema
         permissions_as_keys: Utilizadores com esta função terão acesso a...
         position: Funções mais altas decidem a resolução de conflitos em certas situações. Certas ações só podem ser executadas com certas funções com uma menor prioridade
+      username_block:
+        allow_with_approval: Em vez de impedir totalmente a inscrição, as inscrições correspondentes exigirão a sua aprovação
+        comparison: Tenha em atenção o Problema de Scunthorpe ao bloquear correspondências parciais
+        username: Terá correspondência independentemente das maiúsculas e minúsculas e de homógrafos comuns, como "4" para "a" ou "3" para "e"
       webhook:
         events: Selecione os eventos a enviar
         template: Componha o seu próprio conteúdo JSON utilizando a interpolação de variáveis. Deixar em branco para o JSON predefinido.
@@ -231,7 +236,7 @@ pt-PT:
         setting_auto_play_gif: Reproduzir GIF automaticamente
         setting_boost_modal: Mostrar caixa de diálogo de confirmação antes de impulsionar
         setting_default_language: Idioma de publicação
-        setting_default_privacy: Privacidade da publicação
+        setting_default_privacy: Visibilidade da publicação
         setting_default_quote_policy: Quem pode citar
         setting_default_sensitive: Marcar sempre os multimédia como sensíveis
         setting_delete_modal: Solicitar confirmação antes de eliminar uma publicação
@@ -241,6 +246,7 @@ pt-PT:
         setting_display_media_default: Pré-definição
         setting_display_media_hide_all: Esconder todos
         setting_display_media_show_all: Mostrar todos
+        setting_emoji_style: Estilo de emojis
         setting_expand_spoilers: Expandir sempre as publicações marcadas com avisos de conteúdo
         setting_hide_network: Esconder a tua rede
         setting_missing_alt_text_modal: Mostrar janela de confirmação antes de publicar multimédia sem texto alternativo
@@ -295,7 +301,6 @@ pt-PT:
         status_page_url: URL da página de estado
         theme: Tema predefinido
         thumbnail: Miniatura do servidor
-        timeline_preview: Permitir acesso não autenticado às cronologias públicas
         trendable_by_default: Permitir tendências sem revisão prévia
         trends: Ativar destaques
         trends_as_landing_page: Usar destaques como página de apresentação
@@ -323,6 +328,7 @@ pt-PT:
         follow_request: Alguém pediu para ser seu seguidor
         mention: Alguém o mencionou
         pending_account: Uma nova conta aguarda aprovação
+        quote: Alguém o citou
         reblog: Alguém impulsionou uma publicação sua
         report: Uma nova denúncia foi submetida
         software_updates:
@@ -369,6 +375,10 @@ pt-PT:
         name: Nome
         permissions_as_keys: Permissões
         position: Prioridade
+      username_block:
+        allow_with_approval: Permitir inscrições com aprovação
+        comparison: Método de comparação
+        username: Palavra a corresponder
       webhook:
         events: Eventos ativados
         template: Modelo de conteúdo
diff --git a/config/locales/simple_form.ro.yml b/config/locales/simple_form.ro.yml
index 5cb4e116a2e..3dc6380b6bf 100644
--- a/config/locales/simple_form.ro.yml
+++ b/config/locales/simple_form.ro.yml
@@ -98,7 +98,6 @@ ro:
         status_page_url: URL-ul unei pagini unde oamenii pot vedea starea acestui server în timpul unei întreruperi
         theme: Tema pe care vizitatorii deconectați și utilizatorii noi o văd.
         thumbnail: O imagine de aproximativ 2:1 afișată alături de informațiile serverului dvs.
-        timeline_preview: Vizitatorii deconectați vor putea să răsfoiască cele mai recente postări publice disponibile pe server.
         trendable_by_default: Omiteți revizuirea manuală a conținutului în tendințe. Elementele individuale pot fi în continuare eliminate din tendințe după fapt.
         trends: Tendințele arată ce postări, hashtag-uri și știri câștigă teren pe serverul dvs.
         trends_as_landing_page: Afișați conținut în tendințe utilizatorilor deconectați și vizitatorilor în loc de o descriere a acestui server. Necesită ca tendințele să fie activate.
@@ -191,7 +190,6 @@ ro:
         setting_auto_play_gif: Redă automat animațiile GIF
         setting_boost_modal: Arată dialogul de confirmare înainte de a impulsiona
         setting_default_language: În ce limbă postezi
-        setting_default_privacy: Cine vede postările tale
         setting_default_sensitive: Întotdeauna marchează conținutul media ca fiind sensibil
         setting_delete_modal: Arată dialogul de confirmare înainte de a șterge o postare
         setting_display_media: Afișare media
diff --git a/config/locales/simple_form.ru.yml b/config/locales/simple_form.ru.yml
index 41770f6efe1..c38b545af0b 100644
--- a/config/locales/simple_form.ru.yml
+++ b/config/locales/simple_form.ru.yml
@@ -4,19 +4,19 @@ ru:
     hints:
       account:
         attribution_domains: По одному на строку. Защищает от ложных атрибуций.
-        discoverable: Отметьте флажок, чтобы ваши публичные посты и ваш профиль могли быть показаны или рекомендованы в различных разделах Mastodon, а ваш профиль мог быть предложен другим пользователям.
+        discoverable: Отметьте флажок, чтобы ваши публичные посты и ваш профиль могли быть показаны и рекомендованы в различных разделах Mastodon, а ваш профиль мог быть предложен другим пользователям.
         display_name: Ваше полное имя или псевдоним.
         fields: Домашняя страница, местоимения, возраст — всё что угодно.
         indexable: Отметьте флажок, чтобы ваши публичные посты могли быть найдены при помощи поиска в Mastodon. Люди, которые взаимодействовали с вашими постами, смогут их найти вне зависимости от этой настройки.
-        note: 'Вы можете @упоминать других людей или использовать #хештеги.'
-        show_collections: Отметьте флажок, чтобы кто угодно мог просматривать список ваших подписок и подписчиков. Люди, на которых вы подписаны, будут знать о том, что вы на них подписаны, вне зависимости от этой настройки.
+        note: 'Вы можете @упоминать других людей, а также использовать #хештеги.'
+        show_collections: Отметьте флажок, чтобы кто угодно мог просматривать списки ваших подписок и подписчиков. Люди, на которых вы подписаны, будут знать о том, что вы на них подписаны, вне зависимости от этой настройки.
         unlocked: 'Отметьте флажок, чтобы на вас можно было подписаться, не запрашивая подтверждения. Снимите флажок, чтобы вы могли просматривать запросы на подписку и выбирать: принять или отклонить новых подписчиков.'
       account_alias:
         acct: Укажите имя_пользователя@домен учётной записи, с которой вы собираетесь переехать
       account_migration:
         acct: Укажите имя_пользователя@домен учётной записи, на которую вы собираетесь переехать
       account_warning_preset:
-        text: Вы можете использовать всё то же самое, что и в обычных постах — ссылки, хештеги и упоминания
+        text: Вы можете использовать всё то же самое, что и в обычных постах, — ссылки, хештеги и упоминания
         title: Необязательно. Не видно получателю
       admin_account_action:
         include_statuses: Пользователь будет видеть к каким постами применялись модераторские действия и выносились предупреждения
@@ -39,9 +39,9 @@ ru:
       appeal:
         text: Вы можете обжаловать замечание только один раз
       defaults:
-        autofollow: Отметьте флажок, чтобы люди, присоединившиеся по этому приглашению, были автоматически подписаны на вас
+        autofollow: Отметьте флажок, чтобы люди, которые зарегистрируются по этому приглашению, были автоматически подписаны на вас
         avatar: Поддерживаются WEBP, PNG, GIF и JPG. Максимальный размер — %{size}. Файл будет уменьшен до %{dimensions} пикселей
-        bot: Отметьте флажок, если с этой учётной записи выполняются автоматизированные действия, и она не всегда может находиться под наблюдением владельца
+        bot: Отметьте флажок, если с этой учётной записи выполняются автоматизированные действия и она не всегда может находиться под наблюдением владельца
         context: Один или несколько контекстов, в которых должен применяться фильтр
         current_password: В целях безопасности введите пароль текущей учётной записи
         current_username: Для подтверждения, пожалуйста, введите имя пользователя текущей учётной записи
@@ -52,17 +52,16 @@ ru:
         irreversible: Отфильтрованные посты будут утрачены навсегда, даже если в будущем фильтр будет удалён
         locale: Язык интерфейса, электронных писем и push-уведомлений
         password: Пароль должен состоять минимум из 8 символов
-        phrase: Поиск соответствия будет выполнен без учёта регистра в тексте поста и в тексте предупреждения о содержании
+        phrase: Поиск соответствия будет выполнен без учёта регистра в тексте поста и предупреждения о содержании
         scopes: Выберите, какие API приложение сможет использовать. Разрешения верхнего уровня имплицитно включают в себя все разрешения более низких уровней.
         setting_aggregate_reblogs: Не показывать новые продвижения постов, которые уже были недавно продвинуты (применяется только к будущим продвижениям)
         setting_always_send_emails: По умолчанию уведомления не доставляются по электронной почте, пока вы активно используете Mastodon
-        setting_default_quote_policy: Упомянутые пользователи всегда смогут вас цитировать. Эта настройка будет применена только к постам, созданным в следующей версии Mastodon, но вы можете заранее определить свои предпочтения
         setting_default_sensitive: Медиа деликатного характера скрыты по умолчанию и могут быть показаны по нажатию на них
         setting_display_media_default: Скрывать медиа деликатного характера
         setting_display_media_hide_all: Скрывать все медиа
         setting_display_media_show_all: Показывать все медиа
         setting_system_scrollbars_ui: Работает только в браузерах для ПК на основе Safari или Chrome
-        setting_use_blurhash: Градиенты основаны на цветах скрытых медиа, но скрывают любые детали
+        setting_use_blurhash: Градиенты основаны на цветах скрытых медиа, но размывают любые детали
         setting_use_pending_items: Отметьте флажок, чтобы выключить автоматическую прокрутку, и тогда обновления в лентах будут вам показаны только по нажатию
         username: Вы можете использовать буквы, цифры и символы подчёркивания
         whole_word: Если ключевое слово или фраза состоит только из букв и цифр, фильтр будет применён только в случае соответствия всему слову или фразе целиком
@@ -103,7 +102,6 @@ ru:
         status_page_url: URL страницы, на которой люди могут видеть статус этого сервера во время отключения
         theme: Тема, которую видят вышедшие из системы посетители и новые пользователи.
         thumbnail: Изображение примерно 2:1, отображаемое рядом с информацией о вашем сервере.
-        timeline_preview: Посетители, вышедшие из системы, смогут просматривать последние публичные сообщения, имеющиеся на сервере.
         trendable_by_default: Пропустить ручной просмотр трендового контента. Отдельные элементы могут быть удалены из трендов уже постфактум.
         trends: Тренды показывают, какие посты, хэштеги и новостные истории набирают обороты на вашем сервере.
         trends_as_landing_page: Показывать популярный контент для выходов пользователей и посетителей, а не для описания этого сервера. Требует включения тенденций.
@@ -126,8 +124,8 @@ ru:
         hint: Необязательно. Предоставьте дополнительные сведения о правиле
         text: Опишите правило или требование для пользователей на этом сервере. Постарайтесь сделать его коротким и простым
       sessions:
-        otp: 'Создайте код двухфакторной аутентификации в приложении на вашем смартфоне и введите его здесь, или же вы можете использовать один из ваших резервных кодов:'
-        webauthn: Если это ключ USB, не забудьте его вставить и, при необходимости, нажмите на него.
+        otp: Создайте код двухфакторной аутентификации в приложении на вашем смартфоне и введите его здесь, или же вы можете использовать один из ваших резервных кодов.
+        webauthn: Если вы используете USB-ключ, не забудьте вставить и активировать его.
       settings:
         indexable: Отметьте флажок, чтобы ваш профиль мог быть найден с помощью Google, Bing, Яндекса и других поисковых систем.
         show_application: Вы сами в любом случае будете видеть, в каком приложении был опубликован пост.
@@ -150,10 +148,10 @@ ru:
       user:
         chosen_languages: Отметьте языки, на которых вы желаете видеть посты в публичных лентах. Оставьте выбор пустым, чтобы не фильтровать посты по языку
         date_of_birth:
-          few: Нужно убедиться, что вам не меньше %{count} лет. Мы не храним введённые здесь данные.
-          many: Нужно убедиться, что вам не меньше %{count} лет. Мы не храним введённые здесь данные.
-          one: Нужно убедиться, что вам не меньше %{count} года. Мы не храним введённые здесь данные.
-          other: Нужно убедиться, что вам не меньше %{count} лет. Мы не храним введённые здесь данные.
+          few: Для регистрации на %{domain} нужно убедиться, что вам не меньше %{count} лет. Мы не храним введённые здесь данные.
+          many: Для регистрации на %{domain} нужно убедиться, что вам не меньше %{count} лет. Мы не храним введённые здесь данные.
+          one: Для регистрации на %{domain} нужно убедиться, что вам не меньше %{count} года. Мы не храним введённые здесь данные.
+          other: Для регистрации на %{domain} нужно убедиться, что вам не меньше %{count} лет. Мы не храним введённые здесь данные.
         role: Роль определяет, какими правами обладает пользователь.
       user_role:
         color: Цвет, который будет использоваться для роли в интерфейсе (UI), как RGB в формате HEX
@@ -233,9 +231,8 @@ ru:
         setting_auto_play_gif: Включить автовоспроизведение анимированных GIF-файлов
         setting_boost_modal: Запрашивать подтверждение при продвижении поста
         setting_default_language: Язык публикуемых постов
-        setting_default_privacy: Видимость постов
         setting_default_quote_policy: Кто может цитировать вас
-        setting_default_sensitive: Отмечать все мои медиа как контент деликатного характера
+        setting_default_sensitive: Отмечать все мои медиа как содержимое деликатного характера
         setting_delete_modal: Запрашивать подтверждение при удалении поста
         setting_disable_hover_cards: Отключить предпросмотр профиля при наведении курсора
         setting_disable_swiping: Отключить анимацию перелистывания
@@ -243,6 +240,7 @@ ru:
         setting_display_media_default: По умолчанию
         setting_display_media_hide_all: Скрывать все
         setting_display_media_show_all: Показывать все
+        setting_emoji_style: Стиль эмодзи
         setting_expand_spoilers: Разворачивать все посты с предупреждением о содержании
         setting_hide_network: Скрыть мои связи
         setting_missing_alt_text_modal: Запрашивать подтверждение при публикации медиа без альтернативного текста
@@ -297,7 +295,6 @@ ru:
         status_page_url: Страница уведомлений
         theme: Тема по умолчанию
         thumbnail: Изображение сервера
-        timeline_preview: Разрешить доступ к публичным лентам без авторизации
         trendable_by_default: Разрешить треды без предварительной проверки
         trends: Включить тренды
         trends_as_landing_page: Использовать тенденции в качестве целевой страницы
@@ -325,7 +322,8 @@ ru:
         follow_request: Мне пришёл запрос на подписку
         mention: Меня упомянули в посте
         pending_account: Новая заявка на создание аккаунта
-        reblog: Ваш пост продвинули
+        quote: Кто-то процитировал вас
+        reblog: Мой пост продвинули
         report: Новое обращение отправлено
         software_updates:
           all: Уведомлять о всех обновлениях
@@ -371,6 +369,9 @@ ru:
         name: Название
         permissions_as_keys: Разрешения
         position: Приоритет
+      username_block:
+        allow_with_approval: Разрешить регистрацию с одобрением
+        comparison: Метод сравнения
       webhook:
         events: Включенные события
         template: Шаблон полезной нагрузки
@@ -384,5 +385,5 @@ ru:
       text: обязательно
     title:
       sessions:
-        webauthn: Используйте один из ваших ключей безопасности для входа в систему
+        webauthn: Используйте ваш электронный ключ, чтобы войти
     'yes': Да
diff --git a/config/locales/simple_form.sc.yml b/config/locales/simple_form.sc.yml
index fc531039507..757bdd28d85 100644
--- a/config/locales/simple_form.sc.yml
+++ b/config/locales/simple_form.sc.yml
@@ -136,7 +136,6 @@ sc:
         setting_auto_play_gif: Riprodui is GIF animadas in automàticu
         setting_boost_modal: Ammustra unu diàlogu de cunfirma in antis de cumpartzire
         setting_default_language: Idioma de publicatzione
-        setting_default_privacy: Riservadesa de is publicatziones
         setting_default_sensitive: Marca semper is elementos multimediales comente sensìbiles
         setting_delete_modal: Ammustra unu diàlogu de cunfirma in antis de cantzellare unu tut
         setting_disable_swiping: Disativa animatziones
diff --git a/config/locales/simple_form.sco.yml b/config/locales/simple_form.sco.yml
index 2bc4f6a4564..6a22045fbd6 100644
--- a/config/locales/simple_form.sco.yml
+++ b/config/locales/simple_form.sco.yml
@@ -77,7 +77,6 @@ sco:
         site_title: Hou fowk kin refer tae yer server asides its domain nemm.
         theme: Theme thit logged oot visitors an new uisers see.
         thumbnail: A rochly 2:1 image displayit alangsides yer server information.
-        timeline_preview: Logged oot visitors wull be able tae broose the maist recent public posts available on the server.
         trendable_by_default: Jouk the review bi haun o trendin content. Individual items kin stull get taen aff trends efter the fact.
         trends: Trends shaw whit posts, hashtags an news stories is gettin traction on yer server.
       form_challenge:
@@ -176,7 +175,6 @@ sco:
         setting_auto_play_gif: Auto-pley animatit GIFs
         setting_boost_modal: Shaw confirmation dialog afore heezin
         setting_default_language: Postin leid
-        setting_default_privacy: Postin privacy
         setting_default_sensitive: Aye mairk media as sensitive
         setting_delete_modal: Shaw confirmation dialog afore deletin a post
         setting_disable_swiping: Turn aff swipin motions
@@ -228,7 +226,6 @@ sco:
         site_title: Server nemm
         theme: Defaut theme
         thumbnail: Server thoomnail
-        timeline_preview: Alloo unauthenticated access tae public timelines
         trendable_by_default: Alloo trends athoot prior review
         trends: Turn on trends
       interactions:
diff --git a/config/locales/simple_form.si.yml b/config/locales/simple_form.si.yml
index 3f60b299714..6c47c4005e9 100644
--- a/config/locales/simple_form.si.yml
+++ b/config/locales/simple_form.si.yml
@@ -56,7 +56,6 @@ si:
         scopes: යෙදුමට ප්‍රවේශ වීමට ඉඩ දෙන්නේ කුමන API වලටද. ඔබ ඉහළ මට්ටමේ විෂය පථයක් තෝරා ගන්නේ නම්, ඔබට තනි ඒවා තෝරා ගැනීමට අවශ්‍ය නොවේ.
         setting_aggregate_reblogs: මෑතකදී වැඩි කරන ලද පළ කිරීම් සඳහා නව වැඩි කිරීම් නොපෙන්වන්න (අලුතින් ලැබුණු වැඩි කිරීම් වලට පමණක් බලපායි)
         setting_always_send_emails: ඔබ නිතර මාස්ටඩන් භාවිතා කරන විට වි-තැපැල් දැනුම්දීම් නොලැබෙයි
-        setting_default_quote_policy: සඳහන් කළ පරිශීලකයින්ට සැමවිටම උපුටා දැක්වීමට අවසර ඇත. මෙම සැකසුම ඊළඟ Mastodon අනුවාදය සමඟ නිර්මාණය කරන ලද පළ කිරීම් සඳහා පමණක් ක්‍රියාත්මක වනු ඇත, නමුත් ඔබට සූදානම් වීමේදී ඔබේ මනාපය තෝරා ගත හැකිය.
         setting_default_sensitive: සංවේදී මාධ්‍ය පෙරනිමියෙන් සඟවා ඇති අතර ක්ලික් කිරීමකින් හෙළිදරව් කළ හැක
         setting_display_media_default: සංවේදී බව සලකුණු කළ මාධ්‍ය සඟවන්න
         setting_display_media_hide_all: සැමවිට මාධ්‍ය සඟවන්න
@@ -103,7 +102,6 @@ si:
         status_page_url: ඇනහිටීමක් අතරතුර මෙම සේවාදායකයේ තත්ත්වය මිනිසුන්ට දැකිය හැකි පිටුවක URL එක
         theme: අමුත්තන් ලොග් අවුට් කළ සහ නව පරිශීලකයින් දකින තේමාව.
         thumbnail: ඔබගේ සේවාදායක තොරතුරු සමඟ ආසන්න වශයෙන් 2:1 රූපයක් දර්ශනය වේ.
-        timeline_preview: ලොග් අවුට් වූ අමුත්තන්ට සේවාදායකයේ ඇති නවතම පොදු සටහන් බ්‍රවුස් කිරීමට හැකි වනු ඇත.
         trendable_by_default: ප්‍රවණතා අන්තර්ගතයන් අතින් සමාලෝචනය කිරීම මඟ හරින්න. කාරණයෙන් පසුවත් තනි අයිතම ප්‍රවණතා වලින් ඉවත් කළ හැකිය.
         trends: ප්‍රවණතා මඟින් ඔබේ සේවාදායකයේ ආකර්ෂණය ලබා ගන්නා පළ කිරීම්, හැෂ් ටැග් සහ ප්‍රවෘත්ති කථා පෙන්වයි.
         trends_as_landing_page: මෙම සේවාදායකයේ විස්තරයක් වෙනුවට පිටව ගිය පරිශීලකයින්ට සහ අමුත්තන්ට ප්‍රවණතා අන්තර්ගතය පෙන්වන්න. ප්‍රවණතා සක්‍රීය කිරීම අවශ්‍ය වේ.
@@ -149,9 +147,6 @@ si:
         min_age: ඔබගේ අධිකරණ බල ප්‍රදේශයේ නීති මගින් අවශ්‍ය අවම වයසට වඩා අඩු නොවිය යුතුය.
       user:
         chosen_languages: සබල නම්, තෝරාගත් භාෂාවල ලිපි පමණක් ප්‍රසිද්ධ කාල රේඛාවේ දිස්වේ
-        date_of_birth:
-          one: Mastodon භාවිතා කිරීමට ඔබ අවම වශයෙන් %{count} ක් වත් ඇති බවට අපි සහතික විය යුතුයි. අපි මෙය ගබඩා නොකරමු.
-          other: Mastodon භාවිතා කිරීමට ඔබ අවම වශයෙන් %{count} ක් වත් ඇති බවට අපි සහතික විය යුතුයි. අපි මෙය ගබඩා නොකරමු.
         role: පරිශීලකයාට ඇති අවසරයන් භූමිකාව පාලනය කරයි.
       user_role:
         color: UI පුරා භූමිකාව සඳහා භාවිතා කළ යුතු වර්ණය, හෙක්ස් ආකෘතියෙන් RGB ලෙස
@@ -231,7 +226,6 @@ si:
         setting_auto_play_gif: සජීවිකරණ GIF ස්වයංක්‍රීයව ධාවනය කරන්න
         setting_boost_modal: වැඩි කිරීමට පෙර තහවුරු කිරීමේ සංවාදය පෙන්වන්න
         setting_default_language: ලිපිවල භාෂාව
-        setting_default_privacy: ලිපියේ රහස්‍යතාව
         setting_default_quote_policy: උපුටා දැක්විය හැක්කේ කාටද?
         setting_default_sensitive: සෑමවිට මාධ්‍ය සංවේදී බව සලකුණු කරන්න
         setting_delete_modal: ලිපියක් මැකීමට පෙර ඒ ගැන විමසන්න
@@ -295,7 +289,6 @@ si:
         status_page_url: තත්ව පිටු URL එක
         theme: පෙරනිමි තේමාව
         thumbnail: සේවාදායක සිඟිති රුව
-        timeline_preview: පොදු කාලරේඛා වෙත සත්‍යාපනය නොකළ ප්‍රවේශයට ඉඩ දෙන්න.
         trendable_by_default: පූර්ව සමාලෝචනයකින් තොරව ප්‍රවණතා වලට ඉඩ දෙන්න.
         trends: ප්‍රවණතා සක්‍රීය කරන්න
         trends_as_landing_page: ගොඩබෑමේ පිටුව ලෙස ප්‍රවණතා භාවිතා කරන්න
diff --git a/config/locales/simple_form.sk.yml b/config/locales/simple_form.sk.yml
index aa8dbe76936..7db8fa67e24 100644
--- a/config/locales/simple_form.sk.yml
+++ b/config/locales/simple_form.sk.yml
@@ -2,12 +2,21 @@
 sk:
   simple_form:
     hints:
+      account:
+        attribution_domains: Jeden na riadok. Chráni vás pred falošným pripisovaním autorstva.
+        discoverable: Vaše verejné príspevky a profil môžu byť zobrazované a odporúčané v rôznych častiach Mastodonu a váš profil môže byť navrhovaný ostatným.
+        display_name: Vaše meno a priezvisko alebo prezývka.
+        fields: Váš web, zámená, vek, čokoľvek, čo chcete o sebe uviesť.
+        indexable: Vaše verejné príspevky sa môžu zobrazovať vo výsledkoch vyhľadávania na Mastodone. Ľudia, ktorí s nimi interagovali, ich môžu nájsť vždy.
+        note: 'Môžete @označiť iných ľudí alebo #hashtagy.'
+        show_collections: Ľudia si budú môcť prezrieť, ktoré účty sledujete a ktoré účty sledujú vás. Ľudia, ktorých sledujete, o tom budú vždy vedieť.
+        unlocked: Ľudia vás budú môcť sledovať bez vášho schválenia. Zrušenie vám dá možnosť kontrolovať žiadosti o sledovanie a rozhodovať sa o prijímaní alebo zamietaní nových sledujúcich.
       account_alias:
         acct: Urči prezyvku@domenu účtu, s ktorého sa chceš presunúť
       account_migration:
         acct: Urči prezyvku@domenu účtu, na ktorý sa chceš presunúť
       account_warning_preset:
-        text: Môžeš používať rovnakú syntaxiu ako v rámci príspevkov, čiže URL, haštagy, a spomenutia
+        text: Môžete používať syntax príspevk, ako sú adresy URL, hashtagy a označenia
       admin_account_action:
         include_statuses: Užívateľ uvidí, ktoré príspevky majú za následok moderačný zásah, alebo upozornenie
         send_email_notification: Užívateľ dostane vysvetlenie ohľadom toho, čo sa stalo s ich účtom
@@ -17,29 +26,37 @@ sk:
       defaults:
         autofollow: Ľudia ktorí sa zaregistrujú prostredníctvom pozvánky, ťa budú inheď nasledovať
         avatar: WEBP, PNG, GIF, alebo JPG. Najviac %{size}. Bude zmenšený na %{dimensions}px
-        bot: Tento účet vykonáva hlavne automatizované akcie, a je pravdepodobne nespravovaný
+        bot: Tento účet vykonáva hlavne automatizované akcie a je pravdepodobne nespravovaný
         context: Jedno, alebo viac kritérií, v ktorých má byť filtrovanie uplatnené
         current_password: Z bezpečtnostných dôvodov prosím zadaj heslo súčasného účtu
         current_username: Pre potvrdenie prosím zadaj prezývku súčasného účtu
         digest: Odoslané iba v prípade dlhodobej neprítomnosti, a len ak si obdržal/a nejaké osobné správy kým si bol/a preč
-        email: Bude ti odoslaný potvrdzujúci email
+        email: Odošleme vám potvrdzujúci e-mail
         header: WEBP, PNG, GIF, alebo JPG. Najviac %{size}. Bude zmenšený na %{dimensions}px
         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í
-        password: Zadaj aspoň osem znakov
+        irreversible: Filtrované príspevky nenávratne zmiznú, aj keď filter neskôr zrušíte
+        locale: Jazyk používateľského rozhrania, e-mailových a push upozornení
+        password: Heslo musí obsahovať aspoň 8 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.
-        setting_aggregate_reblogs: Nezobrazuj nové vyzdvihnutia pre príspevky, ktoré už boli len nedávno povýšené (týka sa iba nanovo získaných povýšení)
-        setting_default_sensitive: Chúlostivé médiá sú štandardne ukryté, a môžu byť zobrazené kliknutím
-        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_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
+        setting_aggregate_reblogs: Nezobrazovať nové zdieľania pre nedávno zdieľané príspevky (týka sa iba nových zdieľaní)
+        setting_always_send_emails: Pri bežnom používaní Mastodonu nebudete dostávať e-mailové upozornenia
+        setting_default_sensitive: Citlivé médiá sú predvolene ukryté a môžu byť zobrazené kliknutím
+        setting_display_media_default: Skrývať médiá označené ako citlivé
+        setting_display_media_hide_all: Vždy skrývať médiá
+        setting_display_media_show_all: Vždy zobrazovať médiá
+        setting_system_scrollbars_ui: Platí len pre počítačové prehliadače využívajúce technológiu Chrome alebo Safari
+        setting_use_blurhash: Prechody sú založené na farbách skrytých vizuálov, ale skrývajú akékoľvek podrobnosti
+        setting_use_pending_items: Časová os bude aktualizovaná až po kliknutí, feed sa nebúde posúvať automaticky
         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
       domain_allow:
         domain: Táto doména bude schopná získavať dáta z tohto servera, a prichádzajúce dáta ním budú spracovávané a uložené
+      featured_tag:
+        name: 'Nedávno ste použili napríklad tieto hashtagy:'
+      form_admin_settings:
+        site_contact_email: Spôsob, ako vás môžu ľudia kontaktovať pre právne účely alebo podporu.
+        site_contact_username: Ako vás môžu ľudia na Mastodone nájsť.
+        thumbnail: 'Obrázok v pomere približne 2 : 1, ktorý sa zobrazí pri informáciách o serveri.'
       form_challenge:
         current_password: Vstupuješ do zabezpečenej časti
       imports:
@@ -51,16 +68,23 @@ sk:
           sign_up_block: Nové registrácie nebudú možné
       sessions:
         otp: 'Napíš sem dvoj-faktorový kód z telefónu, alebo použi jeden z tvojích obnovovacích kódov:'
+      settings:
+        indexable: Váš profil sa môže zobraziť vo výsledkoch vyhľadávania cez Google, Bing a ďalšie.
+        show_application: Tebe sa táto informácia zobrazí vždy.
       tag:
         name: Zmeniť môžeš iba veľkosť písmen, napríklad aby boli ľahšie čítateľné
       user:
-        chosen_languages: Keď je zaškrtnuté, vo verejnej osi budú zobrazené iba príspevky vo vybraných jazykoch
+        chosen_languages: Po zaškrtnutí budú na verejných časových osiach zobrazované iba príspevky vo vybraných jazykoch
     labels:
       account:
+        attribution_domains: Weby, ktoré vám môžu pripisovať autorstvo
+        discoverable: Zobrazovať profil a príspevky v objavovacích algoritmoch
         fields:
-          name: Označenie
-          value: Obsah
-        unlocked: Automaticky prijímaj nových nasledovateľov
+          name: Definícia
+          value: Hodnota
+        indexable: Zobrazovať verejné príspevky vo vyhľadávaní
+        show_collections: Zobrazovať v profile sledované a sledujúce účty
+        unlocked: Automaticky schvaľovať nové sledovania
       account_alias:
         acct: Adresa starého účtu
       account_migration:
@@ -77,7 +101,7 @@ sk:
           disable: Deaktivuj
           none: Neurob nič
           silence: Utíš
-          suspend: Vylúč a nenávratne vymaž dáta na účte
+          suspend: Vylúčiť
         warning_preset_id: Použi varovnú predlohu
       announcement:
         all_day: Celodenná udalosť
@@ -86,19 +110,19 @@ sk:
         text: Oboznámenie
       defaults:
         autofollow: Pozvi k následovaniu tvojho profilu
-        avatar: Maskot
+        avatar: Profilová fotka
         bot: Toto je automatizovaný bot účet
-        chosen_languages: Filtruj jazyky
-        confirm_new_password: Znovu tvoje nové heslo, pre potvrdenie
+        chosen_languages: Filtrovanie jazykov
+        confirm_new_password: Overenie nového hesla
         confirm_password: Over heslo
-        context: Triedenie kontextov
+        context: Kontexty filtra
         current_password: Súčasné heslo
         data: Dáta
         display_name: Zobrazované meno
-        email: Emailová adresa
+        email: E-mailová adresa
         expires_in: Expiruj po
         fields: Metadáta profilu
-        header: Obrázok v hlavičke
+        header: Obrázok v záhlaví
         inbox_url: URL adresa prechodnej schránky
         irreversible: Zahoď, namiesto ukrytia
         locale: Jazyk rozhrania
@@ -108,26 +132,31 @@ sk:
         otp_attempt: Dvoj-faktorový overovací kód
         password: Heslo
         phrase: Kľúčové slovo, alebo fráza
-        setting_advanced_layout: Zapni pokročilé užívateľské rozhranie
-        setting_aggregate_reblogs: Zoskupuj vyzdvihnutia v časovej osi
-        setting_auto_play_gif: Automaticky prehrávaj animované GIFy
-        setting_boost_modal: Zobrazuj potvrdzovacie okno pred povýšením
-        setting_default_language: Píšeš v jazyku
-        setting_default_privacy: Súkromie príspevkov
-        setting_default_sensitive: Označ všetky mediálne súbory ako chúlostivé
-        setting_delete_modal: Zobrazuj potvrdzovacie okno pred vymazaním toot-u
+        setting_advanced_layout: Zapnúť pokročilé používateľské rozhranie
+        setting_aggregate_reblogs: Zoskupovať zdieľania na časových osiach
+        setting_always_send_emails: Vždy posielať e-mailové upozornenia
+        setting_auto_play_gif: Automaticky prehrávať animácie GIF
+        setting_boost_modal: Zobrazovať potvrdzovacie okno pred zdieľaním
+        setting_default_language: Jazyk príspevkov
+        setting_default_quote_policy: Kto vás môže citovať
+        setting_default_sensitive: Vždy označovať médiá ako citlivé
+        setting_delete_modal: Zobrazovať potvrdzovacie okno pred vymazaním príspevku
+        setting_disable_hover_cards: Vypnúť náhľady profilov pri ukázaní kurzorom
+        setting_disable_swiping: Vypnúť gestá posúvaním
         setting_display_media: Zobrazovanie médií
         setting_display_media_default: Štandard
         setting_display_media_hide_all: Ukry všetky
         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_expand_spoilers: Stále rozbaľovať príspevky označené varovaním o obsahu
         setting_hide_network: Ukry svoju sieť kontaktov
-        setting_reduce_motion: Mierni pohyb pri animáciách
-        setting_system_font_ui: Použi základné systémové písmo
+        setting_missing_alt_text_modal: Zobrazovať potvrdzovacie okno pred uverejnením média bez opisu
+        setting_reduce_motion: Stlmiť animácie
+        setting_system_font_ui: Používať predvolené písmo systému
+        setting_system_scrollbars_ui: Používať predvolený posuvník systému
         setting_theme: Vzhľad webu
-        setting_trends: Ukáž dnešné trendy
+        setting_trends: Zobrazovať dnešné trendy
         setting_unfollow_modal: Vyžaduj potvrdenie pred tým, než niekoho prestaneš sledovať
-        setting_use_blurhash: Ukáž farebné prechody pre skryté médiá
+        setting_use_blurhash: Zobrazovať farebné prechody skrytých médií
         setting_use_pending_items: Pomalý režim
         severity: Závažnosť
         sign_in_token_attempt: Bezpečnostný kód
@@ -136,10 +165,11 @@ sk:
         username_or_email: Prezývka, alebo email
         whole_word: Celé slovo
       featured_tag:
-        name: Haštag
+        name: Hashtag
       form_admin_settings:
         peers_api_enabled: Zverejni zoznam objavených serverov v API
         status_page_url: URL adresa stránky stavu
+        thumbnail: Náhľad servera
       interactions:
         must_be_follower: Blokuj oboznámenia od užívateľov, ktorí ma nenasledujú
         must_be_following: Blokuj oboznámenia od ľudí, ktorých nesledujem
@@ -154,17 +184,32 @@ sk:
           sign_up_requires_approval: Obmedz registrácie
         severity: Pravidlo
       notification_emails:
+        appeal: Niekto sa odvoláva voči moderátorskému rozhodnutiu
         digest: Zasielať súhrnné emaily
-        favourite: Zaslať email, ak si niekto obľúbi tvoj príspevok
-        follow: Niekto ťa začal nasledovať
-        follow_request: Zaslať email, ak ti niekto pošle žiadosť o sledovanie
-        mention: Zaslať email, ak ťa niekto spomenie vo svojom príspevku
-        pending_account: Zaslať email, ak treba prehodnotiť nový účet
-        reblog: Zaslať email, ak niekto re-tootne tvoj príspevok
+        favourite: Niekto ohviezdičkuje váš príspevok
+        follow: Niekto vás začal sledovať
+        follow_request: Niekto vám posiela žiadosť o sledovanie
+        mention: Niekto vás označí
+        pending_account: Je potrebná kontrola nového účtu
+        quote: Niekto vás cituje
+        reblog: Niekto zdieľa váš príspevok
+        report: Niekto niečo nahlásil
+        software_updates:
+          all: Upozorňovať na všetky novinky
+          critical: Upozorňovať iba na kritické novinky
+          label: Je dostupná nová verzia Mastodonu
+          none: Nikdy neupozorňovať na novinky (neodporúčané)
+          patch: Upozorňovať na novinky s riešením chýb
+        trending_tag: Je potrebné skontrolovať nový trend
+      settings:
+        indexable: Zobrazovať profil v internetových vyhľadávačoch
+        show_application: Zobrazovať apku, z ktorej sú uverejňované príspevky
       tag:
-        listable: Povoľ zobrazovanie tohto haštagu v návrhoch vyhľadávaní
-        name: Haštag
-        trendable: Povoľ zobrazovanie tohto haštagu medzi trendujúcimi
+        listable: Povoliť zobrazovanie tohto hashtagu v návrhoch vyhľadávaní
+        name: Hashtag
+        trendable: Povoliť zobrazovanie tohto hashtagu medzi trendujúcimi
+      user:
+        time_zone: Časové pásmo
     'no': Nie
     recommended: Odporúčané
     required:
diff --git a/config/locales/simple_form.sl.yml b/config/locales/simple_form.sl.yml
index d59fc2c844e..2894a2665e2 100644
--- a/config/locales/simple_form.sl.yml
+++ b/config/locales/simple_form.sl.yml
@@ -101,7 +101,6 @@ sl:
         status_page_url: URL strani, kjer je moč videti stanje tega strežnika med prekinjenim delovanjem
         theme: Tema, ki jo vidijo odjavljeni obiskovalci in novi uporabniki.
         thumbnail: Slika v razmerju stranic približno 2:1, prikazana vzdolž podatkov o vašem strežniku.
-        timeline_preview: Odjavljeni obiskovalci bodo lahko brskali po najnovejših javnih objavah, ki so na voljo na strežniku.
         trendable_by_default: Preskočite ročni pregled vsebine v trendu. Posamezne elemente še vedno lahko odstranite iz trenda post festum.
         trends: Trendi prikažejo, katere objave, ključniki in novice privlačijo zanimanje na vašem strežniku.
         trends_as_landing_page: Odjavljenim uporabnikom in obiskovalcem namesto opisa tega strežnika pokažite vsebine v trendu. Trendi morajo biti omogočeni.
@@ -225,7 +224,6 @@ sl:
         setting_auto_play_gif: Samodejno predvajanje animiranih GIF-ov
         setting_boost_modal: Pred izpostavljanjem pokaži potrditveno okno
         setting_default_language: Jezik objavljanja
-        setting_default_privacy: Zasebnost objave
         setting_default_sensitive: Vedno označi medije kot občutljive
         setting_delete_modal: Pred brisanjem objave prikaži okno za pritrditev
         setting_disable_hover_cards: Onemogoči predogled profila pod kazalcem
@@ -287,7 +285,6 @@ sl:
         status_page_url: URL strani stanja
         theme: Privzeta tema
         thumbnail: Sličica strežnika
-        timeline_preview: Omogoči neoverjen dostop do javnih časovnic
         trendable_by_default: Dovoli trende brez predhodnega pregleda
         trends: Omogoči trende
         trends_as_landing_page: Uporabi trende za pristopno stran
diff --git a/config/locales/simple_form.sq.yml b/config/locales/simple_form.sq.yml
index 5059fbd1e97..dee0d44a636 100644
--- a/config/locales/simple_form.sq.yml
+++ b/config/locales/simple_form.sq.yml
@@ -56,7 +56,8 @@ sq:
         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ë.
         setting_aggregate_reblogs: Mos shfaq përforcime të reja për mesazhe që janë përforcuar tani së fundi (prek vetëm përforcime të marra rishtas)
         setting_always_send_emails: Normalisht s’do të dërgohen njoftime, kur përdorni aktivisht Mastodon-in
-        setting_default_quote_policy: Përdoruesit e përmendur lejohen përherë të citojnë. Ky rregullim do të ketë efekt vetëm për postime të krijuar me versionin pasues të Mastodon-it, por mund të përzgjidhni paraprakisht parapëlqimin tuaj
+        setting_default_quote_policy_private: Në Mastodon s’mund të citohen nga të tjerë postim Vetëm-për-ndjekësit.
+        setting_default_quote_policy_unlisted: Kur njerëzit ju citojnë, nga rrjedha kohore e gjërave në modë do të kalohen si të fshehura edhe postimet e tyre.
         setting_default_sensitive: Media rezervat fshihet, si parazgjedhje, dhe mund të shfaqet me një klikim
         setting_display_media_default: Fshih media me shenjën rezervat
         setting_display_media_hide_all: Fshih përherë mediat
@@ -103,7 +104,6 @@ sq:
         status_page_url: URL e faqe ku njerëzit mund të shohin gjendjen e këtij shërbyesi, gjatë një ndërprerje të funksionimit
         theme: Temë që shohin vizitorët që kanë bërë daljen dhe përdorues të rinj.
         thumbnail: Një figurë afërsisht 2:1 e shfaqur tok me hollësi mbi shërbyesin tuaj.
-        timeline_preview: Vizitorët që kanë bërë daljen do të jenë në gjendje të shfletojnë postimet më të freskëta publike të passhme në shërbyes.
         trendable_by_default: Anashkalo shqyrtim dorazi lënde në modë. Gjëra individuale prapë mund të hiqen nga lëndë në modë pas publikimi.
         trends: Gjërat në modë shfaqin cilat postime, hashtagë dhe histori të reja po tërheqin vëmendjen në shërbyesin tuaj.
         trends_as_landing_page: Shfaq lëndë në modë për përdorues jo të futur në llogari dhe për vizitorë, në vend se të një përshkrimi të këtij shërbyesi. Lyp që të jenë të aktivizuara gjërat në modë.
@@ -142,12 +142,16 @@ sq:
         arbitration_address: Mund të jetë e njëjtë me adresën Fizike më sipër, ose “N/A”, nëse përdoret email.
         arbitration_website: Mund të jetë një formular web, ose “N/A”, nëse përdoret email.
         choice_of_law: Qytet, rajon, territor ose shtet, ligjet e brendshme të të cilit do të administrojnë çfarëdo dhe tërë pretendimet.
+        dmca_address: Për operatorë në ShBA, përdorni adresën e regjistruar te DMCA Designated Agent Directory. Regjistrimi me A P.O. Box bëhet me kërkesë të drejtpërdrejtë, përdorni DMCA Designated Agent Post Office Box Waiver Request që t’i dërgoni email Copyright Office-it dhe t’i përshkruani se jeni një moderator shtëpiak lënde që ka frikë nga hakmarrje apo ndëshkim për veprimet tuaja dhe që ka nevojë të përdor një P.O. Box për heqjen e adresës së shtëpisë tuaj nga sytë e publikut.
         dmca_email: Mund të jetë i njëjti email i përdorur për “Adresë email për njoftime ligjore” më sipër.
         domain: Identifikues unik për shërbimin internetor që po ofroni.
         jurisdiction: Vendosni vendin ku jeton cilido që paguan faturat. Nëse është një shoqëri apo tjetër njësi, vendosni vendin ku është regjistruar, si dhe qytetin, rajonin, territorin apo shtetin përkatës.
         min_age: S’duhet të jetë nën moshën minimum të domosdoshme nga ligjet në juridiksionin tuaj.
       user:
         chosen_languages: Në iu vëntë shenjë, te rrjedha kohore publike do të shfaqen vetëm mesazhe në gjuhët e përzgjedhura
+        date_of_birth:
+          one: Na duhet të sigurohemi se jeni të paktën %{count} që të përdorni %{domain}. S’do ta depozitojmë këtë.
+          other: Na duhet të sigurohemi se jeni të paktën %{count} që të përdorni %{domain}. S’do ta depozitojmë këtë.
         role: Roli kontrollon cilat leje ka përdoruesi.
       user_role:
         color: Ngjyrë për t’u përdorur për rolin nëpër UI, si RGB në format gjashtëmbëdhjetësh
@@ -155,6 +159,10 @@ sq:
         name: Emër publik për rolin, nëse roli është ujdisur të shfaqet si një stemë
         permissions_as_keys: Përdoruesit me këtë rol do të mund të…
         position: Role më të lartë vendosin zgjidhje përplasje në disa raste. Disa veprime mund të kryhen vetëm mbi role të një shkalle më të ulët
+      username_block:
+        allow_with_approval: Në vend të pengimit aty për aty të regjistrimit, regjistrime me përkim do të duan miratimin tuaj
+        comparison: Ju lutemi, mbani parasysh Problemin Scunthorpe, kur bllokohen përkime të pjesshme
+        username: Do të merret si përkim, pavarësisht shkrimit me të mëdha apo të vogla dhe pavarësisht homoglifesh të tilla si "4" për "a", ose "3" për "e"
       webhook:
         events: Përzgjidhni akte për dërgim
         template: Hartoni ngarkesë tuajën JSON, duke përdorur ndërkëmbim ndryshoresh. Lëreni të zbrazët, për JSON-in parazgjedhje.
@@ -227,7 +235,7 @@ sq:
         setting_auto_play_gif: Vetëluaji GIF-et e animuar
         setting_boost_modal: Shfaq dialog ripohimi përpara përforcimi
         setting_default_language: Gjuhë postimi
-        setting_default_privacy: Privatësi postimi
+        setting_default_privacy: Dukshmëri postimi
         setting_default_quote_policy: Cilët mund të citojnë
         setting_default_sensitive: Mediave vëru përherë shenjë si rezervat
         setting_delete_modal: Shfaq dialog ripohimi përpara fshirjes së një mesazhi
@@ -237,6 +245,7 @@ sq:
         setting_display_media_default: Parazgjedhje
         setting_display_media_hide_all: Fshihi krejt
         setting_display_media_show_all: Shfaqi krejt
+        setting_emoji_style: Stil emoji-sh
         setting_expand_spoilers: Mesazhet me sinjalizime mbi lëndën, zgjeroji përherë
         setting_hide_network: Fshiheni rrjetin tuaj
         setting_missing_alt_text_modal: Shfaq dialog ripohimi, para postimi mediash pa tekst alternativ
@@ -273,12 +282,16 @@ sq:
         content_cache_retention_period: Periudhë mbajtjeje lënde të largët
         custom_css: CSS Vetjake
         favicon: Favikonë
+        local_live_feed_access: Hyrje te prurje të atypëratyshme që përmbajnë postime vendore
+        local_topic_feed_access: Hyrje te prurje hashtag-ësh dhe lidhjesh që përmbajnë postime vendore
         mascot: Simbol vetjak (e dikurshme)
         media_cache_retention_period: Periudhë mbajtjeje lënde media
         min_age: Domosdosmëri moshe minimum
         peers_api_enabled: Publiko te API listë shërbyesish të zbuluar
         profile_directory: Aktivizo drejtori profilesh
         registrations_mode: Kush mund të regjistrohet
+        remote_live_feed_access: Hyrje te prurje të atypëratyshme që përmbajnë postime nga larg
+        remote_topic_feed_access: Hyrje te prurje hashtag-ësh dhe lidhjesh që përmbajnë postime nga larg
         require_invite_text: Kërko një arsye për pjesëmarrje
         show_domain_blocks: Shfaq bllokime përkatësish
         show_domain_blocks_rationale: Shfaq pse janë bllokuar përkatësitë
@@ -291,7 +304,6 @@ sq:
         status_page_url: URL faqeje gjendjesh
         theme: Temë parazgjedhje
         thumbnail: Miniaturë shërbyesi
-        timeline_preview: Lejo hyrje pa mirëfilltësim te rrjedha kohore publike
         trendable_by_default: Lejoni gjëra në modë pa shqyrtim paraprak
         trends: Aktivizo gjëra në modë
         trends_as_landing_page: Përdor gjërat në modë si faqe hyrëse
@@ -319,6 +331,7 @@ sq:
         follow_request: Dikush kërkoi t’ju ndjekë
         mention: Dikush ju përmendi
         pending_account: Llogaria e re lyp shqyrtim
+        quote: Dikush ju citoi
         reblog: Dikush përforcoi gjendjen tuaj
         report: Parashtrohet raportim i ri
         software_updates:
@@ -365,6 +378,10 @@ sq:
         name: Emër
         permissions_as_keys: Leje
         position: Përparësi
+      username_block:
+        allow_with_approval: Lejo regjistrim me miratim
+        comparison: Metodë krahasimi
+        username: Fjalë për t’u vëzhguar
       webhook:
         events: Akte të aktivizuar
         template: Gjedhe ngarkese
diff --git a/config/locales/simple_form.sr-Latn.yml b/config/locales/simple_form.sr-Latn.yml
index fee7600074b..1a8f2b13ed2 100644
--- a/config/locales/simple_form.sr-Latn.yml
+++ b/config/locales/simple_form.sr-Latn.yml
@@ -97,7 +97,6 @@ sr-Latn:
         status_page_url: URL stranice gde ljudi mogu da vide status servera dok je server oboren
         theme: Tema koju vide posetioci koji nisu prijavljeni i novi korisnici.
         thumbnail: Slika u razmeri od približno 2:1 koja se prikazuje pored informacija o Vašem serveru.
-        timeline_preview: Posetioci koji nisu prijavljeni će moći da pregledaju najnovije javne objave dostupne na serveru.
         trendable_by_default: Preskoči ručni pregled sadržaja koji je u trendu. Pojedinačne stavke se nakon toga i dalje mogu ukloniti iz trendova.
         trends: Trendovi pokazuju koje objave, heš oznake i vesti postaju sve popularnije na Vašem serveru.
         trends_as_landing_page: Prikaži sadržaj u trendu odjavljenim korisnicima i posetiocima umesto opisa ovog servera. Zahteva da trendovi budu omogućeni.
@@ -206,7 +205,6 @@ sr-Latn:
         setting_auto_play_gif: Automatski reprodukuj animirane GIF-ove
         setting_boost_modal: Prikaži dijalog za potvrdu pre davanja podrške
         setting_default_language: Jezik objavljivanja
-        setting_default_privacy: Privatnost objava
         setting_default_sensitive: Uvek označi multimediju kao osetljivu
         setting_delete_modal: Prikaži dijalog za potvrdu pre brisanja objave
         setting_disable_hover_cards: Onemogući pregled profila prelaskom kursora
@@ -265,7 +263,6 @@ sr-Latn:
         status_page_url: URL statusne stranice
         theme: Podrazumevana tema
         thumbnail: Sličica servera
-        timeline_preview: Dozvoli neautorizovan pristup javnim vremenskim osama
         trendable_by_default: Dozvoli trendove bez prethodnog pregleda
         trends: Omogući trendove
         trends_as_landing_page: Koristite trendove kao stranicu dočeka
diff --git a/config/locales/simple_form.sr.yml b/config/locales/simple_form.sr.yml
index 7161627e287..ad3b0f60b5a 100644
--- a/config/locales/simple_form.sr.yml
+++ b/config/locales/simple_form.sr.yml
@@ -97,7 +97,6 @@ sr:
         status_page_url: URL странице где људи могу да виде статус сервера док је сервер оборен
         theme: Тема коју виде посетиоци који нису пријављени и нови корисници.
         thumbnail: Слика у размери од приближно 2:1 која се приказује поред информација о Вашем серверу.
-        timeline_preview: Посетиоци који нису пријављени ће моћи да прегледају најновије јавне објаве доступне на серверу.
         trendable_by_default: Прескочи ручни преглед садржаја који је у тренду. Појединачне ставке се након тога и даље могу уклонити из трендова.
         trends: Трендови показују које објаве, хеш ознаке и вести постају све популарније на Вашем серверу.
         trends_as_landing_page: Прикажи садржај у тренду одјављеним корисницима и посетиоцима уместо описа овог сервера. Захтева да трендови буду омогућени.
@@ -206,7 +205,6 @@ sr:
         setting_auto_play_gif: Аутоматски репродукуј анимиране GIF-ове
         setting_boost_modal: Прикажи дијалог за потврду пре давања подршке
         setting_default_language: Језик објављивања
-        setting_default_privacy: Приватност објава
         setting_default_sensitive: Увек означи мултимедију као осетљиву
         setting_delete_modal: Прикажи дијалог за потврду пре брисања објаве
         setting_disable_hover_cards: Онемогући преглед профила преласком курсора
@@ -265,7 +263,6 @@ sr:
         status_page_url: URL статусне странице
         theme: Подразумевана тема
         thumbnail: Сличица сервера
-        timeline_preview: Дозволи неауторизован приступ јавним временским осама
         trendable_by_default: Дозволи трендове без претходног прегледа
         trends: Омогући трендове
         trends_as_landing_page: Користите трендове као страницу дочека
diff --git a/config/locales/simple_form.sv.yml b/config/locales/simple_form.sv.yml
index ab2a193558e..4eba2503572 100644
--- a/config/locales/simple_form.sv.yml
+++ b/config/locales/simple_form.sv.yml
@@ -56,11 +56,11 @@ sv:
         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.'
         setting_aggregate_reblogs: Visa inte nya boostar för inlägg som nyligen blivit boostade (påverkar endast nymottagna boostar)
         setting_always_send_emails: E-postnotiser kommer vanligtvis inte skickas när du aktivt använder Mastodon
-        setting_default_quote_policy: Nämnda användare får alltid citeras. Denna inställning kommer att träda i kraft för inlägg som skapats med nästa Mastodon-version, men förbereda dina inställningar för det redan nu
         setting_default_sensitive: Känslig media döljs som standard och kan visas med ett klick
         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_emoji_style: Hur emojier visas. "Automatiskt" kommer att försöka använda webbläsarens emojier, men faller tillbaka till Twemoji för äldre webbläsare.
         setting_system_scrollbars_ui: Gäller endast för webbläsare som är baserade på Safari och Chrome
         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
@@ -103,7 +103,6 @@ sv:
         status_page_url: URL till en sida där personer kan se serverns status under ett driftavbrott
         theme: Tema som utloggade besökare och nya användare ser.
         thumbnail: En bild i cirka 2:1-proportioner som visas tillsammans med din serverinformation.
-        timeline_preview: Utloggade besökare kommer kunna bläddra bland de senaste offentliga inläggen som finns på servern.
         trendable_by_default: Hoppa över manuell granskning av trendande innehåll. Enskilda objekt kan ändå raderas från trender retroaktivt.
         trends: Trender visar vilka inlägg, hashtaggar och nyheter det pratas om på din server.
         trends_as_landing_page: Visa trendande innehåll för utloggade användare och besökare istället för en beskrivning om servern. Kräver att trender är aktiverat.
@@ -150,8 +149,8 @@ sv:
       user:
         chosen_languages: Vid aktivering visas bara inlägg på dina valda språk i offentliga tidslinjer
         date_of_birth:
-          one: Vi måste se till att du är minst %{count} för att använda Mastodon. Vi lagrar inte denna information.
-          other: Vi måste se till att du är minst %{count} för att använda Mastodon. Vi lagrar inte denna information.
+          one: Vi måste se till att du är minst %{count} för att använda %{domain}. Vi sparar inte denna information.
+          other: Vi måste se till att du är minst %{count} för att använda %{domain}. Vi lagrar inte denna information.
         role: Rollen styr vilka behörigheter användaren har.
       user_role:
         color: Färgen som ska användas för rollen i användargränssnittet, som RGB i hex-format
@@ -159,6 +158,10 @@ sv:
         name: Offentligt namn på rollen, om rollen är inställd på att visas som ett emblem
         permissions_as_keys: Användare med denna roll kommer ha tillgång till...
         position: Högre roll avgör konfliktlösning i vissa situationer. Vissa åtgärder kan endast utföras på roller med lägre prioritet
+      username_block:
+        allow_with_approval: I stället för att förhindra direkt registrering kräver matchning av registreringar ditt godkännande
+        comparison: Var uppmärksam på Scunthorpe Problem vid blockering av partiella matcher
+        username: Matchas oavsett versaler och gemena bokstäver som ”4” för ”a” eller ’3’ för ”e”
       webhook:
         events: Välj händelser att skicka
         template: Skriv din egen JSON-nyttolast med variabel interpolation. Lämna tomt för förvald JSON.
@@ -231,7 +234,6 @@ sv:
         setting_auto_play_gif: Spela upp GIF:ar automatiskt
         setting_boost_modal: Visa bekräftelsedialog innan boostning
         setting_default_language: Inläggsspråk
-        setting_default_privacy: Inläggsintegritet
         setting_default_quote_policy: Vem kan citera
         setting_default_sensitive: Markera alltid media som känsligt
         setting_delete_modal: Visa bekräftelsedialog innan radering av inlägg
@@ -241,6 +243,7 @@ sv:
         setting_display_media_default: Standard
         setting_display_media_hide_all: Dölj alla
         setting_display_media_show_all: Visa alla
+        setting_emoji_style: Emoji-stil
         setting_expand_spoilers: Utöka alltid tutningar markerade med innehållsvarningar
         setting_hide_network: Göm ditt nätverk
         setting_missing_alt_text_modal: Visa bekräftelsedialog innan du skickar media utan alt-text
@@ -295,7 +298,6 @@ sv:
         status_page_url: URL för statussida
         theme: Standardtema
         thumbnail: Serverns tumnagelbild
-        timeline_preview: Tillåt oautentiserad åtkomst till offentliga tidslinjer
         trendable_by_default: Tillåt trender utan föregående granskning
         trends: Aktivera trender
         trends_as_landing_page: Använd trender som landningssida
@@ -323,6 +325,7 @@ sv:
         follow_request: Någon begärt att följa dig
         mention: Någon nämnt dig
         pending_account: Ett nytt konto behöver granskas
+        quote: Någon citerade dig
         reblog: Någon boostade ditt inlägg
         report: En ny rapport har skickats
         software_updates:
@@ -369,6 +372,10 @@ sv:
         name: Namn
         permissions_as_keys: Behörigheter
         position: Prioritet
+      username_block:
+        allow_with_approval: Tillåt registreringar med godkännande
+        comparison: Jämförelsesätt
+        username: Ord att matcha
       webhook:
         events: Aktiverade händelser
         template: Lastmall
diff --git a/config/locales/simple_form.th.yml b/config/locales/simple_form.th.yml
index 530bd60ad1f..5246e8baf54 100644
--- a/config/locales/simple_form.th.yml
+++ b/config/locales/simple_form.th.yml
@@ -99,7 +99,6 @@ th:
         status_page_url: URL ของหน้าที่ผู้คนสามารถเห็นสถานะของเซิร์ฟเวอร์นี้ในระหว่างการหยุดทำงาน
         theme: ชุดรูปแบบที่ผู้เยี่ยมชมที่ออกจากระบบและผู้ใช้ใหม่เห็น
         thumbnail: แสดงภาพ 2:1 โดยประมาณควบคู่ไปกับข้อมูลเซิร์ฟเวอร์ของคุณ
-        timeline_preview: ผู้เยี่ยมชมที่ออกจากระบบจะสามารถเรียกดูโพสต์สาธารณะล่าสุดที่มีในเซิร์ฟเวอร์
         trendable_by_default: ข้ามการตรวจทานเนื้อหาที่กำลังนิยมด้วยตนเอง ยังคงสามารถเอารายการแต่ละรายการออกจากแนวโน้มได้หลังจากเกิดเหตุ
         trends: แนวโน้มแสดงว่าโพสต์, แฮชแท็ก และเรื่องข่าวใดกำลังได้รับความสนใจในเซิร์ฟเวอร์ของคุณ
         trends_as_landing_page: แสดงเนื้อหาที่กำลังนิยมแก่ผู้ใช้และผู้เยี่ยมชมที่ออกจากระบบแทนที่จะเป็นคำอธิบายของเซิร์ฟเวอร์นี้ ต้องมีการเปิดใช้งานแนวโน้ม
@@ -210,7 +209,6 @@ th:
         setting_auto_play_gif: เล่น GIF แบบเคลื่อนไหวโดยอัตโนมัติ
         setting_boost_modal: แสดงกล่องโต้ตอบการยืนยันก่อนดัน
         setting_default_language: ภาษาของการโพสต์
-        setting_default_privacy: ความเป็นส่วนตัวของการโพสต์
         setting_default_sensitive: ทำเครื่องหมายสื่อว่าละเอียดอ่อนเสมอ
         setting_delete_modal: แสดงกล่องโต้ตอบการยืนยันก่อนลบโพสต์
         setting_disable_hover_cards: ปิดใช้งานตัวอย่างโปรไฟล์เมื่อวางเมาส์เหนือ
@@ -271,7 +269,6 @@ th:
         status_page_url: URL ของหน้าสถานะ
         theme: ชุดรูปแบบเริ่มต้น
         thumbnail: ภาพขนาดย่อเซิร์ฟเวอร์
-        timeline_preview: อนุญาตการเข้าถึงเส้นเวลาสาธารณะที่ไม่ได้รับรองความถูกต้อง
         trendable_by_default: อนุญาตแนวโน้มโดยไม่มีการตรวจทานล่วงหน้า
         trends: เปิดใช้งานแนวโน้ม
         trends_as_landing_page: ใช้แนวโน้มเป็นหน้าเริ่มต้น
diff --git a/config/locales/simple_form.tr.yml b/config/locales/simple_form.tr.yml
index 80bc56d033e..eed2a95ef69 100644
--- a/config/locales/simple_form.tr.yml
+++ b/config/locales/simple_form.tr.yml
@@ -56,11 +56,13 @@ tr:
         scopes: Uygulamanın erişmesine izin verilen API'ler. Üst seviye bir kapsam seçtiyseniz, bireysel kapsam seçmenize gerek yoktur.
         setting_aggregate_reblogs: Yakın zamanda teşvik edilmiş gönderiler için yeni teşvikleri göstermeyin (yalnızca yeni alınan teşvikleri etkiler)
         setting_always_send_emails: Normalde, Mastodon'u aktif olarak kullanırken e-posta bildirimleri gönderilmeyecektir
-        setting_default_quote_policy: Bahsedilen kullanıcıların her zaman alıntı yapmasına izin verilir. Bu ayar yalnızca bir sonraki Mastodon sürümü ile oluşturulan gönderiler için geçerli olacaktır, ancak tercihinizi hazırlık aşamasında seçebilirsiniz
+        setting_default_quote_policy_private: Mastodon'da sadece takipçilere yönelik gönderiler başkaları tarafından alıntılanamaz.
+        setting_default_quote_policy_unlisted: İnsanlar sizden alıntı yaptığında, onların gönderileri de trend zaman tünellerinden gizlenecektir.
         setting_default_sensitive: Hassas medya varsayılan olarak gizlidir ve bir tıklama ile gösterilebilir
         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_emoji_style: Emojiler nasıl görüntülensin. "Otomatik" seçeneği yerel emojileri kullanmaya çalışır, ancak eski tarayıcılar için Twemoji'yi kullanır.
         setting_system_scrollbars_ui: Yalnızca Safari ve Chrome tabanlı masaüstü tarayıcılar için geçerlidir
         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
@@ -103,7 +105,6 @@ tr:
         status_page_url: İnsanların bir kesinti halinde sunucunun durumunu görebilecekleri bir sayfanın URL'si
         theme: Giriş yapmamış ziyaretçilerin ve yeni kullanıcıların gördüğü tema.
         thumbnail: Sunucu bilginizin yanında gösterilen yaklaşık 2:1'lik görüntü.
-        timeline_preview: Giriş yapmamış ziyaretçiler, sunucuda mevcut olan en son genel gönderileri tarayabilecekler.
         trendable_by_default: Öne çıkan içeriğin elle incelenmesini atla. Tekil öğeler sonrada öne çıkanlardan kaldırılabilir.
         trends: Öne çıkanlar, sunucunuzda ilgi toplayan gönderileri, etiketleri ve haber yazılarını gösterir.
         trends_as_landing_page: Giriş yapmış kullanıcılar ve ziyaretçilere sunucunun açıklması yerine öne çıkan içeriği göster. Öne çıkanların etkin olması gerekir.
@@ -150,8 +151,8 @@ tr:
       user:
         chosen_languages: İşaretlendiğinde, yalnızca seçilen dillerdeki gönderiler genel zaman çizelgelerinde görüntülenir
         date_of_birth:
-          one: Mastodon kullanmak için en az %{count} yaşında olduğunuzdan emin olmalıyız. Bu bilgiyi saklamıyoruz.
-          other: Mastodon kullanmak için en az %{count} yaşında olduğunuzdan emin olmalıyız. Bu bilgiyi saklamıyoruz.
+          one: "%{domain} kullanmak için en az %{count} yaşında olduğunuzdan emin olmalıyız. Bu bilgiyi saklamıyoruz."
+          other: "%{domain} kullanmak için en az %{count} yaşında olduğunuzdan emin olmalıyız. Bu bilgiyi saklamıyoruz."
         role: Rol, kullanıcıların sahip olduğu izinleri denetler.
       user_role:
         color: Arayüz boyunca rol için kullanılacak olan renk, hex biçiminde RGB
@@ -159,6 +160,10 @@ tr:
         name: Rolün, eğer rozet olarak görüntülenmesi ayarlandıysa kullanılacak herkese açık ismi
         permissions_as_keys: Bu role sahip kullanıcıların şunlara erişimi var...
         position: Belirli durumlarda çatışmayı çözmek için daha yüksek rol belirleyicidir. Bazı eylemler ancak daha düşük öncelikteki rollere uygulanabilir
+      username_block:
+        allow_with_approval: Kayıt işlemini tamamen engellemek yerine, eşleşen kayıtlar onayınızı gerektirecektir
+        comparison: Kısmi eşleşmeleri engellerken lütfen Scunthorpe Problemini aklınızda bulundurun
+        username: '"a" için "4" veya "e" için "3" gibi büyük/küçük harfe ve yaygın homogliflere bakılmaksızın eşleştirilecektir'
       webhook:
         events: Gönderilecek etkinlikleri seçin
         template: Değişken değerleme kullanarak kendi JSON yükünüzü oluşturun. Varsayılan JSON için boş bırakın.
@@ -231,7 +236,7 @@ tr:
         setting_auto_play_gif: Hareketli GIF'leri otomatik oynat
         setting_boost_modal: Paylaşmadan önce onay iletişim kutusu göster
         setting_default_language: Gönderi dili
-        setting_default_privacy: Gönderi gizliliği
+        setting_default_privacy: Gönderi görünürlüğü
         setting_default_quote_policy: Kimler alıntılayabilir
         setting_default_sensitive: Medyayı her zaman hassas olarak işaretle
         setting_delete_modal: Bir gönderiyi silmeden önce onay iletişim kutusu göster
@@ -241,6 +246,7 @@ tr:
         setting_display_media_default: Varsayılan
         setting_display_media_hide_all: Tümünü gizle
         setting_display_media_show_all: Tümünü göster
+        setting_emoji_style: Emoji stili
         setting_expand_spoilers: İçerik uyarılarıyla işaretli gönderileri her zaman genişlet
         setting_hide_network: Sosyal grafiğini gizle
         setting_missing_alt_text_modal: Alternatif metni olmayan medya göndermeden önce onay sorusu göster
@@ -277,12 +283,16 @@ tr:
         content_cache_retention_period: Uzak içerik saklama süresi
         custom_css: Özel CSS
         favicon: Yer imi simgesi
+        local_live_feed_access: Yerel gönderileri ön plana çıkaran canlı akışlara erişim
+        local_topic_feed_access: Yerel gönderileri ön plana çıkaran etiket ve bağlantı akışlarına erişim
         mascot: Özel maskot (eski)
         media_cache_retention_period: Medya önbelleği saklama süresi
         min_age: Azami yaş gereksinimi
         peers_api_enabled: API'de keşfedilen sunucuların listesini yayınla
         profile_directory: Profil dizinini etkinleştir
         registrations_mode: Kim kaydolabilir
+        remote_live_feed_access: Uzaktan gönderileri ön plana çıkaran canlı akışlara erişim
+        remote_topic_feed_access: Uzaktan gönderileri ön plana çıkaran etiket ve bağlantı akışlarına erişim
         require_invite_text: Katılmak için bir gerekçe iste
         show_domain_blocks: Engellenen alan adlarını göster
         show_domain_blocks_rationale: Alan adlarının neden engellendiğini göster
@@ -295,7 +305,6 @@ tr:
         status_page_url: Durum sayfası URL'si
         theme: Öntanımlı tema
         thumbnail: Sunucu küçük resmi
-        timeline_preview: Genel zaman çizelgelerine yetkisiz erişime izin ver
         trendable_by_default: Ön incelemesiz öne çıkanlara izin ver
         trends: Öne çıkanları etkinleştir
         trends_as_landing_page: Giriş sayfası olarak öne çıkanları kullan
@@ -323,6 +332,7 @@ tr:
         follow_request: Biri seni takip etmek istedi
         mention: Birisi senden bahsetti
         pending_account: Yeni hesabın incelenmesi gerekiyor
+        quote: Birisi senden alıntı yaptı
         reblog: Birisi gönderini boostladı
         report: Yeni rapor gönderildi
         software_updates:
@@ -369,6 +379,10 @@ tr:
         name: Ad
         permissions_as_keys: İzinler
         position: Öncelik
+      username_block:
+        allow_with_approval: Onay ile kayıtlara izin ver
+        comparison: Karşılaştırma yöntemi
+        username: Eşleşecek kelime
       webhook:
         events: Etkin olaylar
         template: Yük şablonu
diff --git a/config/locales/simple_form.uk.yml b/config/locales/simple_form.uk.yml
index 2561eeb2ca9..abcf8e18d4e 100644
--- a/config/locales/simple_form.uk.yml
+++ b/config/locales/simple_form.uk.yml
@@ -102,7 +102,6 @@ uk:
         status_page_url: URL сторінки, на якій люди можуть бачити статус цього сервера під час його збою в роботі
         theme: Тема, яку бачать відвідувачі, що вийшли з системи, та нові користувачі.
         thumbnail: Зображення приблизно 2:1, що показується поряд з відомостями про ваш сервер.
-        timeline_preview: Зареєстровані відвідувачі зможуть переглядати останні публічні дописи, доступні на сервері.
         trendable_by_default: Пропустити ручний огляд популярних матеріалів. Індивідуальні елементи все ще можна вилучити з популярних постфактум.
         trends: Популярні показують, які дописи, хештеґи та новини набувають популярності на вашому сервері.
         trends_as_landing_page: Показувати популярні матеріали для зареєстрованих користувачів і відвідувачів замість опису цього сервера. Для активації потрібні тренди.
@@ -225,7 +224,6 @@ uk:
         setting_auto_play_gif: Автоматично відтворювати анімовані GIF
         setting_boost_modal: Показувати діалог підтвердження під час поширення
         setting_default_language: Мова дописів
-        setting_default_privacy: Видимість дописів
         setting_default_sensitive: Позначати медіа делікатними
         setting_delete_modal: Показувати діалог підтвердження під час видалення допису
         setting_disable_hover_cards: Вимкнути попередній перегляд профілю під час наведення мишки
@@ -234,6 +232,7 @@ uk:
         setting_display_media_default: За промовчанням
         setting_display_media_hide_all: Сховати всі
         setting_display_media_show_all: Показати всі
+        setting_emoji_style: Стиль емодзі
         setting_expand_spoilers: Завжди розгортати дописи з попередженнями про вміст
         setting_hide_network: Сховати вашу мережу
         setting_missing_alt_text_modal: Запитувати перед розміщенням медіа без альтернативного тексту
@@ -288,7 +287,6 @@ uk:
         status_page_url: URL сторінки статусу
         theme: Стандартна тема
         thumbnail: Мініатюра сервера
-        timeline_preview: Дозволити неавтентифікований доступ до публічних стрічок
         trendable_by_default: Дозволити популярне без попереднього огляду
         trends: Увімкнути популярні
         trends_as_landing_page: Використовуйте тенденції як цільову сторінку
@@ -316,6 +314,7 @@ uk:
         follow_request: Коли хтось запитує дозвіл підписатися
         mention: Коли хтось згадує вас
         pending_account: Надсилати електронного листа, коли новий обліковий запис потребує розгляду
+        quote: Хтось процитував вас
         reblog: Коли хтось поширює ваш допис
         report: Нову скаргу надіслано
         software_updates:
diff --git a/config/locales/simple_form.vi.yml b/config/locales/simple_form.vi.yml
index b9f8d5d9c37..0711711e5d7 100644
--- a/config/locales/simple_form.vi.yml
+++ b/config/locales/simple_form.vi.yml
@@ -56,11 +56,13 @@ vi:
         scopes: Ứng dụng sẽ được phép truy cập những API nào. Nếu bạn chọn quyền cấp cao nhất, không cần chọn quyền nhỏ.
         setting_aggregate_reblogs: Nếu một tút đã được đăng lại thì sẽ không hiện những lượt đăng lại khác trên bảng tin
         setting_always_send_emails: Bình thường thì sẽ không gửi khi bạn đang dùng Mastodon
-        setting_default_quote_policy: Thiết lập này chỉ hiệu lực đối với các tút được tạo bằng phiên bản Mastodon tiếp theo, nhưng bạn có thể chọn trước sẵn
+        setting_default_quote_policy_private: Tút chỉ dành cho người theo dõi trên Mastodon không thể được người khác trích dẫn.
+        setting_default_quote_policy_unlisted: Khi ai đó trích dẫn bạn, tút của họ cũng sẽ bị ẩn khỏi bảng tin công khai.
         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_emoji_style: Cách hiển thị Emoji. "Tự động" sẽ dùng biểu tượng cảm xúc nguyên bản, nhưng đối với các trình duyệt cũ sẽ chuyển thành Twemoji.
         setting_system_scrollbars_ui: Chỉ áp dụng trình duyệt Chrome và Safari bản desktop
         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
@@ -103,7 +105,6 @@ vi:
         status_page_url: URL của trang nơi mọi người có thể xem trạng thái của máy chủ này khi ngừng hoạt động
         theme: Chủ đề mà khách truy cập đăng xuất và người mới nhìn thấy.
         thumbnail: 'Một hình ảnh tỉ lệ 2: 1 được hiển thị cùng với thông tin máy chủ của bạn.'
-        timeline_preview: Khách truy cập đã đăng xuất sẽ có thể xem các tút công khai gần đây nhất trên máy chủ.
         trendable_by_default: Bỏ qua việc duyệt thủ công nội dung xu hướng. Các mục riêng lẻ vẫn có thể bị xóa khỏi xu hướng sau này.
         trends: Hiển thị những tút, hashtag và tin tức đang được thảo luận nhiều trên máy chủ của bạn.
         trends_as_landing_page: Hiển thị nội dung xu hướng cho người dùng chưa đăng nhập thay vì mô tả về máy chủ này. Yêu cầu xu hướng được kích hoạt.
@@ -126,7 +127,7 @@ vi:
         hint: Tùy chọn. Cung cấp chi tiết hơn về nội quy
         text: Mô tả một nội quy bắt buộc trên máy chủ này. Nên để ngắn và đơn giản
       sessions:
-        otp: 'Nhập mã xác minh 2 bước được tạo bởi ứng dụng điện thoại của bạn hoặc dùng một trong các mã khôi phục của bạn:'
+        otp: 'Nhập mã xác thực 2 bước được tạo bởi ứng dụng điện thoại của bạn hoặc dùng một trong các mã khôi phục của bạn:'
         webauthn: Nếu đây là USB key, hãy cắm vào và thử xoay chiều.
       settings:
         indexable: Trang của bạn có thể xuất hiện trong kết quả tìm kiếm trên Google, Bing và các nơi khác.
@@ -150,7 +151,7 @@ vi:
       user:
         chosen_languages: Chỉ hiển thị những ngôn ngữ tút sau
         date_of_birth:
-          other: Chúng tôi cần đảm bảo rằng bạn lớn hơn %{count} tuổi để sử dụng Mastodon. Chúng tôi không lưu trữ thông tin này.
+          other: Chúng tôi phải đảm bảo rằng bạn ít nhất %{count} tuổi để tham gia %{domain}. Thông tin này không lưu trữ sau khi đăng ký.
         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
@@ -158,6 +159,10 @@ vi:
         name: Tên công khai của vai trò, nếu vai trò được đặt để hiển thị dưới dạng huy hiệu
         permissions_as_keys: Người có vai trò này sẽ có quyền truy cập vào...
         position: Vai trò cao hơn sẽ có quyền quyết định xung đột trong các tình huống. Các vai trò có mức độ ưu tiên thấp hơn chỉ có thể thực hiện một số hành động nhất định
+      username_block:
+        allow_with_approval: Thay vì cấm đăng ký ngay lập tức, bạn sẽ duyệt phù hợp trước khi đăng ký
+        comparison: Xin hãy lưu ý đến Vấn đề Scunthorpe khi chặn các từ trùng khớp một phần
+        username: Sẽ được khớp bất kể chữ hoa và chữ tượng hình phổ biến như "4" cho "a" hoặc "3" cho "e"
       webhook:
         events: Chọn sự kiện để gửi
         template: Soạn JSON payload của riêng bạn bằng phép nội suy biến. Để trống để dùng JSON mặc định.
@@ -221,7 +226,7 @@ vi:
         max_uses: Lượt dùng tối đa
         new_password: Mật khẩu mới
         note: Giới thiệu
-        otp_attempt: Mã xác minh 2 bước
+        otp_attempt: Mã xác thực 2 bước
         password: Mật khẩu
         phrase: Từ khóa hoặc cụm từ
         setting_advanced_layout: Bố cục nhiều cột
@@ -240,6 +245,7 @@ vi:
         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_emoji_style: Phong cách Emoji
         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_missing_alt_text_modal: Hỏi trước khi đăng media không có văn bản thay thế
@@ -276,12 +282,16 @@ vi:
         content_cache_retention_period: Khoảng thời gian lưu giữ nội dung máy chủ khác
         custom_css: Tùy chỉnh CSS
         favicon: Favicon
+        local_live_feed_access: Truy cập bảng tin gồm những tút của máy chủ
+        local_topic_feed_access: Truy cập hashtag và bảng tin liên kết gồm những tút của máy chủ
         mascot: Tùy chỉnh linh vật (kế thừa)
         media_cache_retention_period: Thời hạn lưu trữ cache media
         min_age: Độ tuổi tối thiểu
         peers_api_enabled: Công khai danh sách các máy chủ được phát hiện trong API
         profile_directory: Cho phép hiện danh bạ thành viên
         registrations_mode: Ai có thể đăng ký
+        remote_live_feed_access: Truy cập bảng tin gồm những tút từ máy chủ khác
+        remote_topic_feed_access: Truy cập hashtag và bảng tin liên kết gồm những tút từ máy chủ khác
         require_invite_text: Yêu cầu lí do đăng ký
         show_domain_blocks: Xem máy chủ chặn
         show_domain_blocks_rationale: Hiện lý do máy chủ bị chặn
@@ -294,7 +304,6 @@ vi:
         status_page_url: URL trang trạng thái
         theme: Chủ đề mặc định
         thumbnail: Hình thu nhỏ của máy chủ
-        timeline_preview: Cho phép truy cập vào dòng thời gian công khai
         trendable_by_default: Cho phép lên xu hướng mà không cần duyệt trước
         trends: Bật xu hướng
         trends_as_landing_page: Dùng trang xu hướng làm trang chào mừng
@@ -322,6 +331,7 @@ vi:
         follow_request: Ai đó yêu cầu theo dõi bạn
         mention: Ai đó nhắc đến bạn
         pending_account: Phê duyệt tài khoản mới
+        quote: Ai đó trích dẫn bạn
         reblog: Ai đó đăng lại tút của bạn
         report: Ai đó gửi báo cáo
         software_updates:
@@ -368,6 +378,10 @@ vi:
         name: Tên
         permissions_as_keys: Quyền
         position: Mức độ ưu tiên
+      username_block:
+        allow_with_approval: Cho đăng ký nhưng duyệt thủ công
+        comparison: Phương pháp so sánh
+        username: Khớp từ
       webhook:
         events: Những sự kiện đã bật
         template: Mẫu payload
diff --git a/config/locales/simple_form.zh-CN.yml b/config/locales/simple_form.zh-CN.yml
index 7716c2232f1..dbe628205f2 100644
--- a/config/locales/simple_form.zh-CN.yml
+++ b/config/locales/simple_form.zh-CN.yml
@@ -56,11 +56,13 @@ zh-CN:
         scopes: 哪些 API 被允许使用。如果你勾选了更高一级的范围，就不用单独选中子项目了。
         setting_aggregate_reblogs: 不显示最近已经被转嘟过的嘟文(只会影响新收到的转嘟)
         setting_always_send_emails: 一般情况下，如果你活跃使用 Mastodon，我们不会向你发送电子邮件通知
-        setting_default_quote_policy: 总是允许引用被提及的用户。此设置将仅对下个Mastodon版本创建的帖子生效，但您可以在准备中选择您的偏好
+        setting_default_quote_policy_private: Mastodon上发布的仅限关注者可见的嘟文无法被他人引用。
+        setting_default_quote_policy_unlisted: 当其他人引用你时，他们的嘟文也会从热门时间线上隐藏。
         setting_default_sensitive: 敏感内容默认隐藏，并在点击后显示
         setting_display_media_default: 隐藏被标记为敏感内容的媒体
         setting_display_media_hide_all: 始终隐藏媒体
         setting_display_media_show_all: 始终显示媒体
+        setting_emoji_style: 如何显示Emoji表情符号。选择“自动”将尝试使用原生Emoji，但在旧浏览器中会备选使用Twemoji。
         setting_system_scrollbars_ui: 仅对基于 Safari 或 Chromium 内核的桌面端浏览器有效
         setting_use_blurhash: 渐变是基于模糊后的隐藏内容生成的
         setting_use_pending_items: 点击查看时间线更新，而非自动滚动更新动态。
@@ -103,7 +105,6 @@ zh-CN:
         status_page_url: 配置一个网址，当服务中断时，人们可以通过该网址查看服务器的状态。
         theme: 给未登录访客和新用户使用的主题。
         thumbnail: 与服务器信息一并展示的约 2:1 比例的图像。
-        timeline_preview: 未登录访客将能够浏览服务器上的最新公开嘟文。
         trendable_by_default: 跳过对热门内容的手工审核。个别项目仍可在之后从趋势中删除。
         trends: 热门页中会显示正在你服务器上受到关注的嘟文、标签和新闻故事。
         trends_as_landing_page: 向注销的用户和访问者显示热门内容，而不是对该服务器的描述，需要启用热门。
@@ -150,7 +151,7 @@ zh-CN:
       user:
         chosen_languages: 仅选中语言的嘟文会出现在公共时间线上（全不选则显示所有语言的嘟文）
         date_of_birth:
-          other: 我们必须确认%{count}岁以上的用户才能使用Mastodon。我们不会存储该信息。
+          other: 我们必须确保您至少年满 %{count} 岁才能使用 %{domain}。我们不会存储此信息。
         role: 角色用于控制用户拥有的权限。
       user_role:
         color: 在界面各处用于标记该角色的颜色，以十六进制 RGB 格式表示
@@ -158,6 +159,10 @@ zh-CN:
         name: 角色的公开名称，将在外显为徽章时使用
         permissions_as_keys: 具有此角色的用户将有权访问...
         position: 用于在特定情况下处理决策冲突。一些特定操作只能对优先级更低的角色执行
+      username_block:
+        allow_with_approval: 不直接禁止注册，而是使匹配的新注册需要你的批准
+        comparison: 屏蔽部分匹配时请注意潜在的Scunthrope问题（正常单词内部包含被屏蔽的部分）
+        username: 匹配将不限大小写及常见同形异义字符，如“4”和“A”及“3”和“E”等
       webhook:
         events: 选择要发送的事件
         template: 使用变量插值来构建自己的JSON负载。如果要使用默认的JSON，请留空。
@@ -230,7 +235,7 @@ zh-CN:
         setting_auto_play_gif: 自动播放 GIF 动画
         setting_boost_modal: 在转嘟前询问我
         setting_default_language: 发布语言
-        setting_default_privacy: 嘟文默认可见范围
+        setting_default_privacy: 嘟文可见性
         setting_default_quote_policy: 谁可以引用
         setting_default_sensitive: 始终标记媒体为敏感内容
         setting_delete_modal: 在删除嘟文前询问我
@@ -240,6 +245,7 @@ zh-CN:
         setting_display_media_default: 默认
         setting_display_media_hide_all: 隐藏全部
         setting_display_media_show_all: 显示全部
+        setting_emoji_style: 表情符号样式
         setting_expand_spoilers: 一律展开具有内容警告的嘟文
         setting_hide_network: 隐藏你的社交网络
         setting_missing_alt_text_modal: 发布媒体时若未为其设置替代文本，则显示确认对话框
@@ -276,12 +282,16 @@ zh-CN:
         content_cache_retention_period: 外站内容保留期
         custom_css: 自定义 CSS
         favicon: Favicon
+        local_live_feed_access: 展示本站嘟文的实时动态访问权限
+        local_topic_feed_access: 展示本站嘟文的话题标签及实时动态访问权限
         mascot: 自定义吉祥物（旧）
         media_cache_retention_period: 媒体缓存保留期
         min_age: 最低年龄要求
         peers_api_enabled: 在API中公开的已知实例的服务器的列表
         profile_directory: 启用用户目录
         registrations_mode: 谁可以注册
+        remote_live_feed_access: 展示外站嘟文的实时动态访问权限
+        remote_topic_feed_access: 展示外站嘟文的话题标签及实时动态访问权限
         require_invite_text: 注册时需要提供理由
         show_domain_blocks: 显示站点屏蔽列表
         show_domain_blocks_rationale: 显示站点屏蔽原因
@@ -294,7 +304,6 @@ zh-CN:
         status_page_url: 状态页网址
         theme: 默认主题
         thumbnail: 本站缩略图
-        timeline_preview: 允许未登录用户访问公共时间线
         trendable_by_default: 允许在未审核的情况下将话题置为热门
         trends: 启用热门
         trends_as_landing_page: 使用热门页作为登陆页面
@@ -322,6 +331,7 @@ zh-CN:
         follow_request: 有人向我发送了关注请求
         mention: 有人提到了我
         pending_account: 有账号需要审核
+        quote: 有人引用了我的嘟文
         reblog: 有人转嘟了我的嘟文
         report: 有人提交了新举报
         software_updates:
@@ -368,6 +378,10 @@ zh-CN:
         name: 名称
         permissions_as_keys: 权限
         position: 优先级
+      username_block:
+        allow_with_approval: 注册时需要批准
+        comparison: 比较方法
+        username: 字词匹配
       webhook:
         events: 已启用事件
         template: Payload 模板
diff --git a/config/locales/simple_form.zh-HK.yml b/config/locales/simple_form.zh-HK.yml
index 9b935b991a3..6e79264e98f 100644
--- a/config/locales/simple_form.zh-HK.yml
+++ b/config/locales/simple_form.zh-HK.yml
@@ -95,7 +95,6 @@ zh-HK:
         status_page_url: 可在服務中斷期間，查看此伺服器狀態的網頁網址
         theme: 未登入訪客和新使用者看到的主題。
         thumbnail: 一幅約 2:1 的圖片顯示在你的伺服器資訊的旁邊。
-        timeline_preview: 未登入的訪客能夠瀏覽伺服器上最新的公開帖文。
         trendable_by_default: 跳過對趨勢內容的手動審查，事後仍可從趨勢中刪除個別項目。
         trends: 趨勢顯示哪些帖文、標籤和新聞故事在你的伺服器上較有吸引力。
         trends_as_landing_page: 向未登入的使用者及訪客展示趨勢內容，而非只有此伺服器的描述。需要啟用趨勢。
@@ -204,7 +203,6 @@ zh-HK:
         setting_auto_play_gif: 自動播放 GIF
         setting_boost_modal: 在轉推前詢問我
         setting_default_language: 文章語言
-        setting_default_privacy: 文章預設為
         setting_default_sensitive: 預設我的內容為敏感內容
         setting_delete_modal: 刪除文章前，請要求我確認
         setting_disable_swiping: 停用滑動手勢
@@ -262,7 +260,6 @@ zh-HK:
         status_page_url: 狀態頁網址
         theme: 預設主題
         thumbnail: 伺服器縮圖
-        timeline_preview: 允許未經認證的人存取公共時間軸
         trendable_by_default: 允許未經審核的趨勢
         trends: 啟用趨勢
         trends_as_landing_page: 使用趨勢作為登陸頁面
diff --git a/config/locales/simple_form.zh-TW.yml b/config/locales/simple_form.zh-TW.yml
index fb51f2ed3e9..00684c32715 100644
--- a/config/locales/simple_form.zh-TW.yml
+++ b/config/locales/simple_form.zh-TW.yml
@@ -56,11 +56,13 @@ zh-TW:
         scopes: 允許使應用程式存取的 API。 若您選擇最高階範圍，則無須選擇個別項目。
         setting_aggregate_reblogs: 不顯示最近已被轉嘟之嘟文的最新轉嘟（只影響最新收到的嘟文）
         setting_always_send_emails: 一般情況下若您活躍使用 Mastodon ，我們不會寄送電子郵件通知
-        setting_default_quote_policy: 已提及使用者總是能引用嘟文。此設定將僅生效於下一版本 Mastodon 建立之嘟文，但您可以預先選好您的偏好設定
+        setting_default_quote_policy_private: Mastodon 上發佈之僅限跟隨者嘟文無法被其他使用者引用。
+        setting_default_quote_policy_unlisted: 當其他人引用您時，他們的嘟文也會自熱門時間軸隱藏。
         setting_default_sensitive: 敏感內容媒體預設隱藏，且按一下即可重新顯示
         setting_display_media_default: 隱藏標為敏感內容的媒體
         setting_display_media_hide_all: 總是隱藏所有媒體
         setting_display_media_show_all: 總是顯示標為敏感內容的媒體
+        setting_emoji_style: 如何顯示 emoji 表情符號。「自動」將嘗試使用原生 emoji ，但於老式瀏覽器使用 Twemoji。
         setting_system_scrollbars_ui: 僅套用至基於 Safari 或 Chrome 之桌面瀏覽器
         setting_use_blurhash: 彩色漸層圖樣是基於隱藏媒體內容顏色產生，所有細節將變得模糊
         setting_use_pending_items: 關閉自動捲動更新，時間軸僅於點擊後更新
@@ -103,7 +105,6 @@ zh-TW:
         status_page_url: 當服務中斷時，可以提供使用者了解伺服器資訊頁面之 URL
         theme: 未登入之訪客或新使用者所見之佈景主題。
         thumbnail: 大約 2:1 圖片會顯示於您伺服器資訊之旁。
-        timeline_preview: 未登入之訪客能夠瀏覽此伺服器上最新的公開嘟文。
         trendable_by_default: 跳過手動審核熱門內容。仍能於登上熱門趨勢後移除個別內容。
         trends: 熱門趨勢將顯示於您伺服器上正在吸引大量注意力的嘟文、主題標籤、或者新聞。
         trends_as_landing_page: 顯示熱門趨勢內容至未登入使用者及訪客而不是關於此伺服器之描述。需要啟用熱門趨勢。
@@ -150,7 +151,7 @@ zh-TW:
       user:
         chosen_languages: 當選取時，只有選取語言之嘟文會於公開時間軸中顯示
         date_of_birth:
-          other: 我們必須確認您至少年滿 %{count} 以使用 Mastodon。我們不會儲存此資料。
+          other: 我們必須確認您至少年滿 %{count} 以使用 %{domain}。我們不會儲存此資料。
         role: 角色控制使用者有哪些權限。
       user_role:
         color: 於整個使用者介面中用於角色的顏色，十六進位格式的 RGB
@@ -158,6 +159,10 @@ zh-TW:
         name: 角色的公開名稱，如果角色設定為顯示為徽章
         permissions_as_keys: 有此角色的使用者將有權存取...
         position: 某些情況下，衝突的解決方式由更高階的角色決定。某些動作只能由優先程度較低的角色執行
+      username_block:
+        allow_with_approval: 不直接禁止註冊，符合規則之註冊將需要您的審核
+        comparison: 當您封鎖部分匹配時，請留心 Scunthorpe 問題
+        username: 將匹配不限大小寫與常見同形異義字，如以「4」代替「A」或以「3」代替「E」
       webhook:
         events: 請選擇要傳送的事件
         template: 使用變數代換組合您自己的 JSON payload。留白以使用預設 JSON 。
@@ -230,7 +235,7 @@ zh-TW:
         setting_auto_play_gif: 自動播放 GIF 動畫
         setting_boost_modal: 轉嘟前先詢問我
         setting_default_language: 嘟文語言
-        setting_default_privacy: 嘟文隱私設定
+        setting_default_privacy: 嘟文可見性
         setting_default_quote_policy: 誰能引用此嘟文
         setting_default_sensitive: 總是將媒體標記為敏感內容
         setting_delete_modal: 刪除嘟文前先詢問我
@@ -240,6 +245,7 @@ zh-TW:
         setting_display_media_default: 預設
         setting_display_media_hide_all: 全部隱藏
         setting_display_media_show_all: 全部顯示
+        setting_emoji_style: emoji 風格
         setting_expand_spoilers: 永遠展開標有內容警告的嘟文
         setting_hide_network: 隱藏您的社交網路
         setting_missing_alt_text_modal: 發表未包含說明文字之多媒體嘟文前先詢問我
@@ -276,12 +282,16 @@ zh-TW:
         content_cache_retention_period: 遠端內容保留期限
         custom_css: 自訂 CSS
         favicon: 網站圖示 (Favicon)
+        local_live_feed_access: 允許瀏覽本站嘟文之即時內容
+        local_topic_feed_access: 允許瀏覽本站嘟文之主題標籤與連結
         mascot: 自訂吉祥物 (legacy)
         media_cache_retention_period: 多媒體快取資料保留期間
         min_age: 最低年齡要求
         peers_api_enabled: 於 API 中公開已知伺服器的列表
         profile_directory: 啟用個人檔案目錄
         registrations_mode: 誰能註冊
+        remote_live_feed_access: 允許瀏覽聯邦宇宙嘟文之即時內容
+        remote_topic_feed_access: 允許瀏覽聯邦宇宙嘟文之主題標籤與連結
         require_invite_text: 要求「加入原因」
         show_domain_blocks: 顯示封鎖的網域
         show_domain_blocks_rationale: 顯示網域被封鎖之原因
@@ -294,7 +304,6 @@ zh-TW:
         status_page_url: 狀態頁面 URL
         theme: 預設佈景主題
         thumbnail: 伺服器縮圖
-        timeline_preview: 允許未登入使用者瀏覽公開時間軸
         trendable_by_default: 允許熱門趨勢直接顯示，不需經過審核
         trends: 啟用熱門趨勢
         trends_as_landing_page: 以熱門趨勢作為登陸頁面
@@ -322,6 +331,7 @@ zh-TW:
         follow_request: 當有使用者請求跟隨您時，傳送電子郵件通知
         mention: 當有使用者於嘟文提及您時，傳送電子郵件通知
         pending_account: 有新的帳號需要審核
+        quote: 當有使用者引用您的嘟文時
         reblog: 當有使用者轉嘟您的嘟文時，傳送電子郵件通知
         report: 新回報已遞交
         software_updates:
@@ -368,6 +378,10 @@ zh-TW:
         name: 名稱
         permissions_as_keys: 權限
         position: 優先權
+      username_block:
+        allow_with_approval: 經審核後可註冊
+        comparison: 比較方式
+        username: 字詞匹配
       webhook:
         events: 已啟用的事件
         template: Payload 樣板
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index c3c091dd397..e6db6013abf 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -14,7 +14,7 @@ sk:
       other: Sledujúci
     following: Nasledujem
     instance_actor_flash: Toto konto je virtuálny aktér, ktorý predstavuje samotný server, a nie konkrétneho používateľa. Používa sa na účely federácie a nemal by byť pozastavený.
-    last_active: naposledy aktívny
+    last_active: posledná aktivita
     link_verified_on: Vlastníctvo tohto odkazu bolo skontrolované %{date}
     nothing_here: Nič tu nie je!
     pin_errors:
@@ -41,7 +41,7 @@ sk:
       approve: Schváľ
       approved_msg: Úspešne schválená prihláška %{username}
       are_you_sure: Si si istý/á?
-      avatar: Maskot
+      avatar: Profilová fotka
       by_domain: Doména
       change_email:
         changed_msg: E-mail úspešne zmenený!
@@ -60,13 +60,13 @@ sk:
       confirmed: Potvrdený
       confirming: Potvrdzujúci
       custom: Vlastné
-      delete: Vymaž dáta
+      delete: Vymazať dáta
       deleted: Vymazané
       demote: Degraduj
       destroyed_msg: "%{username} je teraz zaradený do fronty na okamžité vymazanie"
       disable: Zablokuj
       disable_sign_in_token_auth: Vypni overovanie e-mailovým tokenom
-      disable_two_factor_authentication: Vypni dvoj-faktorové overovanie
+      disable_two_factor_authentication: Vypnúť dvojstupňové overenie
       disabled: Blokovaný
       display_name: Ukáž meno
       domain: Doména
@@ -119,14 +119,14 @@ sk:
       push_subscription_expires: PuSH odoberanie expiruje
       redownload: Obnov profil
       redownloaded_msg: Úspešne obnovený profil %{username} z pôvodného
-      reject: Zamietni
+      reject: Zamietnuť
       rejected_msg: Úspešne zamietnutá prihláška %{username}
       remote_suspension_irreversible: Údaje tohto účtu boli nenávratne zmazané.
       remote_suspension_reversible_hint_html: Účet bol pozastavený na ich serveri a údaje budú úplne odstránené dňa %{date}. Dovtedy môže vzdialený server účet obnoviť bez akýchkoľvek nepriaznivých účinkov. Ak chceš odstrániť všetky údaje účtu ihneď, môžeš tak urobiť nižšie.
-      remove_avatar: Vymaž avatar
-      remove_header: Vymaž záhlavie
+      remove_avatar: Vymazať profilovú fotku
+      remove_header: Vymazať záhlavie
       removed_avatar_msg: Úspešne odstránený obrázok avatara %{username}
-      removed_header_msg: Úspešne odstránený obrázok hlavičky %{username}
+      removed_header_msg: Obrázok v záhlaví profilu %{username} bol úspešne odstránený
       resend_confirmation:
         already_confirmed: Tento užívateľ je už potvrdený
         send: Odošli potvrdzovací odkaz znovu
@@ -142,7 +142,7 @@ sk:
         only_password: Iba heslo
         password_and_2fa: Heslo a dvoj-faktorové overovanie
       sensitive: Citlivé na silu
-      sensitized: Označený ako chúlostivý
+      sensitized: Označený ako citlivý
       shared_inbox_url: URL zdieľanej schránky
       show:
         created_reports: Vytvorené hlásenia
@@ -190,15 +190,15 @@ sk:
         create_unavailable_domain: Vytvor nedostupnú doménu
         create_user_role: Vytvoriť rolu
         demote_user: Zniž užívateľskú rolu
-        destroy_announcement: Vymaž oboznámenie
+        destroy_announcement: Vymazať oznámenie
         destroy_canonical_email_block: Zruš blokovanie emailu
-        destroy_custom_emoji: Vymaž vlastné emotikony
+        destroy_custom_emoji: Vymazať vlastné emotikony
         destroy_domain_allow: Zmaž povolenie pre doménu
         destroy_domain_block: Zruš blokovanie domény
         destroy_instance: Vyčistiť doménu
-        destroy_ip_block: Vymaž IP pravidlo
-        destroy_status: Vymaž príspevok
-        destroy_unavailable_domain: Vymaž nedostupnú doménu
+        destroy_ip_block: Vymazať IP pravidlo
+        destroy_status: Vymazať príspevok
+        destroy_unavailable_domain: Vymazať nedostupnú doménu
         destroy_user_role: Zničiť rolu
         disable_2fa_user: Vypni dvoj-faktorové overovanie
         disable_custom_emoji: Vypni vlastné emotikony
@@ -208,14 +208,14 @@ sk:
         memorialize_account: Zmena na „in memoriam“
         promote_user: Povýš užívateľskú rolu
         publish_terms_of_service: Zverejni podmienky prevozu
-        reject_appeal: Zamietni námietku
-        reject_user: Zamietni užívateľa
-        remove_avatar_user: Vymaž avatar
+        reject_appeal: Zamietnuť odvolanie
+        reject_user: Zamietnuť používateľa
+        remove_avatar_user: Vymazať profilovú fotku
         reopen_report: Znovu otvor hlásenie
         resend_user: Preposlať overovací email
         reset_password_user: Obnov heslo
         resolve_report: Vyrieš nahlásený problém
-        sensitive_account: Vynúť všetky médiá na účte ako chúlostivé
+        sensitive_account: Označiť všetky médiá na účte ako citlivé
         silence_account: Utíš účet
         suspend_account: Pozastav účet
         unassigned_report: Odober priradenie nahlásenia
@@ -263,12 +263,12 @@ sk:
         reopen_report_html: "%{name} znovu otvoril/a nahlásenie %{target}"
         reset_password_user_html: "%{name} resetoval/a heslo používateľa %{target}"
         resolve_report_html: "%{name} vyriešil/a nahlásenie %{target}"
-        sensitive_account_html: "%{name} označil/a médium od %{target} za chúlostivé"
+        sensitive_account_html: "%{name} uvádza médiá od %{target} ako citlivé"
         silence_account_html: "%{name} obmedzil/a účet %{target}"
         suspend_account_html: "%{name} zablokoval/a účet používateľa %{target}"
         unassigned_report_html: "%{name} odobral/a report od %{target}"
         unblock_email_account_html: "%{name} odblokoval/a %{target}ovu/inu emailovú adresu"
-        unsensitive_account_html: "%{name} odznačil/a médium od %{target} ako chúlostivé"
+        unsensitive_account_html: "%{name} ruší uvádzanie médií od %{target} ako citlivé"
         unsilence_account_html: "%{name} zrušil/a obmedzenie %{target}ovho/inho účtu"
         unsuspend_account_html: "%{name} spojazdnil/a účet %{target}"
         update_announcement_html: "%{name} aktualizoval/a oboznámenie %{target}"
@@ -291,6 +291,8 @@ sk:
       new:
         create: Vytvor oznam
         title: Nové oznámenie
+      preview:
+        disclaimer: Keďže si používatelia nemôžu e-mailové upozornenia vypnúť, mali by byť využívané iba na dôležité oznamy, napríklad upozornenia o úniku osobných údajov alebo rušení servera.
       publish: Zverejni
       published_msg: Oboznámenie úspešne zverejnené!
       scheduled_for: Načasované na %{time}
@@ -307,7 +309,7 @@ sk:
       copy_failed_msg: Nebolo možné vytvoriť miestnu kópiu tohto emoji
       create_new_category: Vytvor novú kategóriu
       created_msg: Emoji úspešne vytvorené!
-      delete: Vymaž
+      delete: Vymazať
       destroyed_msg: Emoji úspešne zničené!
       disable: Zakáž
       disabled: Vypnuté
@@ -354,7 +356,7 @@ sk:
       add_new: Povolená doména
       created_msg: Doména bola úspešne povolená
       destroyed_msg: Doména bola odstránená zo zoznamu povolených
-      export: Exportuj
+      export: Export
       import: Nahraj
       undo: Odober zo zoznamu povolených
     domain_blocks:
@@ -370,7 +372,7 @@ sk:
       domain: Doména
       edit: Uprav blokovanie domény
       existing_domain_block_html: Pre účet %{name} si už nahodil/a přísnejšie obmedzenie, najskôr ho teda musíš <a href="%{unblock_url}">odblokovať</a>.
-      export: Exportuj
+      export: Export
       import: Nahraj
       new:
         create: Vytvor blokovanie domény
@@ -393,10 +395,10 @@ sk:
       undo: Odvolaj blokovanie domény
       view: Ukáž blokovanie domén
     email_domain_blocks:
-      add_new: Pridaj nový
+      add_new: Pridať nový
       allow_registrations_with_approval: Povoľ registrovanie so schválením
       created_msg: Úspešne zablokovaná emailová doména
-      delete: Vymaž
+      delete: Vymazať
       dns:
         types:
           mx: MX záznam
@@ -411,7 +413,7 @@ sk:
     export_domain_allows:
       new:
         title: Nahraj povolené domény
-      no_file: Nevybraný žiaden súbor
+      no_file: Nebol vybraný žiadny súbor
     export_domain_blocks:
       import:
         existing_relationships_warning: Existujúce vzťahy nasledovania
@@ -419,7 +421,7 @@ sk:
         title: Nahraj zákazy domén
       new:
         title: Nahraj zákazy domén
-      no_file: Nevybraný žiaden súbor
+      no_file: Nebol vybraný žiadny súbor
     follow_recommendations:
       description_html: "<strong>Odporúčania na sledovanie pomáhaju novým užívateľom rýchlo nájsť zaujímavý obsah</strong>. Ak užívateľ zatiaľ nedostatočne interagoval s ostatnými aby si vyformoval personalizované odporúčania na sledovanie, tak mu budú odporúčané tieto účty. Sú prepočítavané na dennej báze z mixu účtov s nedávnym najvyšším záujmom a najvyšším počtom lokálnych sledujúcich pre daný jazyk."
       language: Pre jazyk
@@ -430,6 +432,7 @@ sk:
       unsuppress: Obnoviť odporúčanie na sledovanie
     instances:
       availability:
+        failure_threshold_reached: Limit neúspešných pokusov bol dosiahnutý %{date}.
         no_failures_recorded: Žiadne zlyhania nezaznamenané.
         title: Dostupnosť
       back_to_all: Všetko
@@ -489,7 +492,7 @@ sk:
     ip_blocks:
       add_new: Vytvor pravidlo
       created_msg: Nové IP pravidlo úspešne pridané
-      delete: Vymaž
+      delete: Vymazať
       expires_in:
         '1209600': 2 týždne
         '15778476': 6 mesiacov
@@ -504,8 +507,8 @@ sk:
     relationships:
       title: Vzťahy užívateľa %{acct}
     relays:
-      add_new: Pridaj nový federovací mostík
-      delete: Vymaž
+      add_new: Pridať nový federovací mostík
+      delete: Vymazať
       description_html: "<strong>Federovací mostík</strong> je prechodný server, ktorý obmieňa veľké množstvá verejných príspevkov medzi tými servermi ktoré na od neho odoberajú, aj doňho prispievajú. <strong>Môže to pomôcť malým a stredným instanciám objavovať federovaný obsah</strong>, čo inak vyžaduje aby miestni užívatelia ručne následovali iných ľudí zo vzdialených instancií."
       disable: Vypni
       disabled: Vypnutý
@@ -532,6 +535,7 @@ sk:
       action_log: Denník auditu
       action_taken_by: Zákrok vykonal/a
       actions:
+        silence_description_html: Účet bude viditeľný iba pre účty, ktoré ho už sledujú alebo si ho vyhľadali ručne, čo výrazne zredukuje jeho dosah. Toto nastavenie je kedykoľvek možné zmeniť. Ukončí všetky hlásenia voči tomuto účtu.
         suspend_description_html: Tento účet a všetok jeho obsah bude nedostupný a nakoniec zmazaný, interaktovať s ním bude nemožné. Zvrátiteľné v rámci 30 dní. Uzatvára všetky hlásenia voči tomuto účtu.
       add_to_report: Pridaj viac do hlásenia
       already_suspended_badges:
@@ -548,18 +552,18 @@ sk:
       confirm: Potvrď
       confirm_action: Potvrď moderovací úkon proti @%{acct}
       created_at: Nahlásené
-      delete_and_resolve: Vymaž príspevky
+      delete_and_resolve: Vymazať príspevky
       forwarded: Preposlané
       forwarded_to: Preposlané na %{domain}
       mark_as_resolved: Označiť ako vyriešené
-      mark_as_sensitive: Označ ako chúlostivé
+      mark_as_sensitive: Označiť ako citlivý obsah
       mark_as_unresolved: Označ ako nevyriešené
       no_one_assigned: Nikoho
       notes:
         create: Pridaj poznámku
         create_and_resolve: Vyrieš s poznámkou
         create_and_unresolve: Otvor znovu, s poznámkou
-        delete: Vymaž
+        delete: Vymazať
         placeholder: Opíš aké opatrenia boli urobené, alebo akékoľvek iné súvisiace aktualizácie…
         title: Poznámky
       remote_user_placeholder: vzdialený užívateľ z %{instance}
@@ -576,8 +580,9 @@ sk:
         action_preambles:
           suspend_html: 'Chystáš sa <strong>pozastaviť</strong> účet <strong>@%{acct}</strong>. To urobí:'
         actions:
-          delete_html: Vymaž pohoršujúce príspevky
-          mark_as_sensitive_html: Označ médiá pohoršujúcich príspevkov za chúlostivé
+          delete_html: Vymazať príspevky porušujúce pravidlá
+          mark_as_sensitive_html: Označiť médiá v príspevkoch porušujúcich pravidlá ako citlivé
+          silence_html: Zásadne obmedzí dosah profilu <strong>@%{acct}</strong> zmenou jeho viditeľnosti spolu s jeho obsahom iba pre ľudí, ktorí ho už sledujú alebo si ho ručne vyhľadali
         close_report: 'Označ hlásenie #%{id} za vyriešené'
       target_origin: Pôvod nahláseného účtu
       title: Hlásenia
@@ -598,7 +603,7 @@ sk:
         invites: Pozvánky
         moderation: Moderácia
         special: Špeciálne
-      delete: Vymaž
+      delete: Vymazať
       edit: Uprav postavenie %{name}
       everyone: Východzie oprávnenia
       permissions_count:
@@ -609,7 +614,7 @@ sk:
       privileges:
         administrator: Správca
         administrator_description: Užívatelia s týmto povolením, obídu všetky povolenia
-        delete_user_data: Vymaž užívateľské dáta
+        delete_user_data: Vymazať používateľské dáta
         invite_users: Pozvi užívateľov
         manage_announcements: Spravuj oboznámenia
         manage_appeals: Spravuj námietky
@@ -626,7 +631,7 @@ sk:
       title: Postavenia
     rules:
       add_new: Pridaj pravidlo
-      delete: Vymaž
+      delete: Vymazať
       edit: Uprav pravidlo
       empty: Žiadne pravidlá servera ešte neboli určené.
       title: Serverové pravidlá
@@ -660,9 +665,11 @@ sk:
           none: Nikto sa nemôže registrovať
           open: Ktokoľvek sa môže zaregistrovať
         warning_hint: Odporúčame používať "Pre registráciu je potrebné schválenie", pokiaľ si niesi istý/á, že tvoj moderovací tím vie zvládnuť spam a záškodné registrácie včas.
+      security:
+        authorized_fetch_hint: Vyžadovanie overenia od federovaných serverov umožňuje dôkladnejšie vykonávania blokov na úrovni používateľa aj severa. Prináša to so sebou však aj zhoršenie výkonu a dosahu vašich odpovedí a môže spôsobiť problémy s kompatibilitou s niektorými federovanými službami. Okrem toho to nezabráni prístupu k vašim verejným príspevkom a účtom.
       title: Nastavenia servera
     site_uploads:
-      delete: Vymaž nahratý súbor
+      delete: Vymazať nahratý súbor
       destroyed_msg: Nahratie bolo zo stránky úspešne vymazané!
     software_updates:
       critical_update: Kritické — prosím aktualizuj rýchlo
@@ -680,10 +687,10 @@ sk:
       back_to_account: Späť na účet
       back_to_report: Späť na stránku hlásenia
       batch:
-        remove_from_report: Vymaž z hlásenia
+        remove_from_report: Vymazať z hlásenia
         report: Hlásenie
       deleted: Vymazané
-      favourites: Obľúbené
+      favourites: Ohviezdičkovania
       history: História verzií
       in_reply_to: Odpoveď na
       language: Jazyk
@@ -717,7 +724,7 @@ sk:
         action: Pozri tu pre viac informácií
     tags:
       review: Prehodnoť stav
-      updated_msg: Nastavenia haštagov boli úspešne aktualizované
+      updated_msg: Nastavenia hashtagov boli úspešne aktualizované
     title: Spravovanie
     trends:
       allow: Povoľ
@@ -758,10 +765,10 @@ sk:
       trending: Populárne
     warning_presets:
       add_new: Pridaj nové
-      delete: Vymaž
+      delete: Vymazať
       edit_preset: Uprav varovnú predlohu
     webhooks:
-      delete: Vymaž
+      delete: Vymazať
       disable: Vypni
       disabled: Vypnuté
       enable: Povoľ
@@ -789,7 +796,7 @@ sk:
       new_trending_statuses:
         title: Populárne príspevky
       new_trending_tags:
-        title: Populárne haštagy
+        title: Populárne hashtagy
   aliases:
     add_new: Vytvor alias
     created_msg: Nový alias úspešne vytvorený. Teraz môžeš začať presun zo starého účtu.
@@ -797,14 +804,14 @@ sk:
     remove: Odpoj alias
   appearance:
     advanced_web_interface: Pokročilé webové rozhranie
-    advanced_web_interface_hint: 'Ak chceš využiť celkovú šírku tvojej obrazovky, pokročilé webové rozhranie ti umožňuje nastaviť mnoho rôznych stĺpcov, aby si videl/a toľko informácií naraz, koľko chceš: Domov, oboznámenia, federovanú časovú os, a ľubovolný počet zoznamov, či haštagov.'
+    advanced_web_interface_hint: 'Ak chcete využiť celkú šírku svojej obrazovky, pokročilé webové rozhranie vám umožňuje nastaviť mnoho rôznych stĺpcov, aby ste videli naraz toľko informácií, koľko chcete: Domov, upozornenia, federovanú časovú os a ľubovolný počet zoznamov či hashtagov.'
     animations_and_accessibility: Animácie a prístupnosť
     confirmation_dialogs: Potvrdzovacie dialógy
-    discovery: Nájdenie
+    discovery: Objavovanie
     localization:
       body: Mastodon je prekladaný dobrovoľníkmi.
       guide_link_text: Prispievať môže každý.
-    sensitive_content: Chúlostivý obsah
+    sensitive_content: Citlivý obsah
   application_mailer:
     unsubscribe: Prestaň odoberať
     view: 'Zobraziť:'
@@ -813,7 +820,7 @@ sk:
   applications:
     created: Aplikácia bola vytvorená úspešne
     destroyed: Aplikáciu sa podarilo odstrániť
-    logout: Odhlás sa
+    logout: Odhlásiť sa
     regenerate_token: Znovu vygeneruj prístupový token
     token_regenerated: Prístupový token bol úspešne vygenerovaný znova
     warning: Na tieto údaje dávaj ohromný pozor. Nikdy ich s nikým nezďieľaj!
@@ -827,8 +834,8 @@ sk:
       login_link: prihlás sa
       proceed_to_login_html: Teraz môžeš pokračovať na %{login_link}.
       welcome_title: Vitaj, %{name}!
-    delete_account: Vymaž účet
-    delete_account_html: Pokiaľ chceš svoj účet odtiaľto vymazať, môžeš tak <a href="%{path}">urobiť tu</a>. Budeš požiadaný/á o potvrdenie tohto kroku.
+    delete_account: Odstránenie účtu
+    delete_account_html: Pokiaľ chcete odstrániť svoj účet, môžete to <a href="%{path}">urobiť tu</a>. Toto rozhodnutie ešte budete musieť potvrdiť.
     description:
       prefix_invited_by_user: "@%{name} ťa pozýva na tento Mastodon server!"
       prefix_sign_up: Zaregistruj sa na Mastodone už dnes!
@@ -839,9 +846,9 @@ sk:
     invalid_reset_password_token: Token na obnovu hesla vypršal. Prosím vypítaj si nový.
     log_in_with: Prihlás sa s
     login: Prihlás sa
-    logout: Odhlás sa
-    migrate_account: Presúvam sa na iný účet
-    migrate_account_html: Ak si želáš presmerovať tento účet na nejaký iný, môžeš si to <a href="%{path}">nastaviť tu</a>.
+    logout: Odhlásiť sa
+    migrate_account: Presun na iný účet
+    migrate_account_html: Ak chcete presmerovať tento účet na nejaký iný, môžete to <a href="%{path}">nastaviť tu</a>.
     or_log_in_with: Alebo prihlás s
     progress:
       confirm: Potvrď email
@@ -865,8 +872,21 @@ sk:
       title: Prihlás sa na %{domain}
     status:
       account_status: Stav účtu
-      redirecting_to: Tvoj účet je neaktívny, lebo v súčasnosti presmerováva na %{acct}.
+      confirming: Čaká sa na dokončenie overenia e-mailu.
+      functional: Váš účet je funkčný.
+      pending: Vaša žiadosť je na kontrole naším tímom. Môže to trvať. Po jej prípadnom schválení dostanete e-mail.
+      redirecting_to: Váš účet je neaktívny, pretože v súčasnosti presmerúva na %{acct}.
+      self_destruct: Keďže %{domain} končí, budete mať k účtu iba obmedzený prístup.
+      view_strikes: Zobraziť predošlé sankcie vášho účtu
     use_security_key: Použi bezpečnostný kľúč
+  author_attribution:
+    example_title: Názorný text
+    hint_html: Píšete novinové alebo blogové články mimo Mastodonu? Rozhodujte o tom, ako sú vám pripisované, keď ich niekto zdieľa na Mastodone.
+    instructions: 'Vložte tento kód do kódu HTML vo vašom článku:'
+    more_from_html: Viac od %{name}
+    s_blog: Blog %{name}
+    then_instructions: Potom do poľa nižšie zadajte názov domény média.
+    title: Uvádzanie autorstva
   challenge:
     confirm: Pokračuj
     hint_html: "<strong>Tip:</strong> Hodinu nebudeme znovu vyžadovať tvoje heslo."
@@ -890,7 +910,7 @@ sk:
     challenge_not_passed: Údaje, ktoré si zadal/a, sú nesprávne
     confirm_password: Napíš svoje terajšie heslo pre overenie tvojej identity
     confirm_username: Zadaj svoju prezývku, na potvrdenie úkonu
-    proceed: Vymaž účet
+    proceed: Odstrániť účet
     success_msg: Tvoj účet bol úspešne vymazaný
     warning:
       before: 'Než budeš pokračovať, prosím pozorne si prečítaj tieto poznámky:'
@@ -913,14 +933,15 @@ sk:
       reject_appeal: Zamietni námietku
       title_actions:
         disable: Zmrazenie účtu
-        mark_statuses_as_sensitive: Označenie príspevkov za chúlostivé
+        mark_statuses_as_sensitive: Označenie príspevkov ako citlivé
         none: Varovanie
-        sensitive: Označenie účtu ako chúlostivý
+        sensitive: Označenie účtu ako citlivého
         silence: Obmedzenie účtu
       your_appeal_approved: Tvoja námietka bola schválená
       your_appeal_pending: Odoslal si námietku
   edit_profile:
     basic_information: Základné informácie
+    hint_html: "<strong>Upravte, čo ľudia vidia vo vašom verejom profile a pri vašich príspevkoch.</strong> S vyplneným profilom a nahratou profilovou fotkou sa zvýšia šance, že vás iní ľudia budú sledovať a budú s vami komunikovať."
     other: Ostatné
   errors:
     '400': Požiadavka, ktorú si odoslal/a, bola buď nesprávna, alebo znehodnotená.
@@ -944,9 +965,9 @@ sk:
     archive_takeout:
       date: Dátum
       download: Stiahni si svoj archív
-      hint_html: Môžeš si vyžiadať <strong>archív svojích príspevkov a nahratých médií</strong>. Exportované dáta budú v ActivityPub formáte, čítateľné hociakým kompatibilným softvérom. Archív si je možné vyžiadať každých sedem dní.
-      in_progress: Balím tvoj archív...
-      request: Vyžiadaj si tvoj archív
+      hint_html: Môžete si vyžiadať <strong>archív svojich príspevkov a nahratých médií</strong>. Dáta budú exportované vo formáte ActivityPub, ktorý prečíta ľubovoľný kompatibilný softvér. Archív si je možné vyžiadať každých sedem dní.
+      in_progress: Prebieha kompilácia archívu…
+      request: Požiadať o archív
       size: Veľkosť
     blocks: Blokujete
     bookmarks: Záložky
@@ -955,9 +976,10 @@ sk:
     mutes: Stíšil/a si
     storage: Úložisko médií
   featured_tags:
-    add_new: Pridaj nový
+    add_new: Pridať nový
     errors:
-      limit: Už si si predvolil/a najvyšší možný počet haštagov
+      limit: Už ste si predvolili najvyšší možný počet hashtagov
+    hint_html: "<strong>Zobrazte vo svojom profile vaše najvýznamnejšie hashtagy.</strong> Zvýraznené hashtagy majú viditeľné miesto vo vašom profile a umožňujú vám rýchly prístup k vašim príspevkom, aby ste mali svoje diela a dlhodobé projekty vždy poruke."
   filters:
     contexts:
       account: Profily
@@ -968,29 +990,29 @@ sk:
     edit:
       add_keyword: Pridaj kľúčové slovo
       keywords: Kľúčové slová
-      title: Uprav triedenie
+      title: Upraviť filter
     errors:
       invalid_context: Nebola poskytnutá žiadna, alebo ide o neplatnú súvislosť
     index:
-      delete: Vymaž
+      delete: Vymazať
       empty: Nemáš žiadné filtrovanie.
       expires_on: Expiruje dňa %{date}
-      title: Triedenia
+      title: Filtre
     new:
       save: Uložiť nový filter
-      title: Pridaj nové triedenie
+      title: Pridať nový filter
     statuses:
       batch:
         remove: Odstrániť z filtrovania
   generic:
     all: Všetko
     cancel: Zruš
-    changes_saved_msg: Zmeny boli úspešne uložené!
+    changes_saved_msg: Zmeny boli úspešne uložené.
     confirm: Potvrď
     copy: Kopíruj
-    delete: Vymaž
-    order_by: Zoraď podľa
-    save_changes: Ulož zmeny
+    delete: Vymazať
+    order_by: Zoradiť podľa
+    save_changes: Uložiť zmeny
     today: dnes
     validation_errors:
       few: Niečo ešte nieje celkom v poriadku! Prosím skontroluj %{count} chýb uvedených nižšie
@@ -1004,11 +1026,11 @@ sk:
     failures: Zlyhaní(a)
     imported: Nahrané
     modes:
-      merge: Spoj dohromady
-      merge_long: Ponechaj existujúce záznamy a pridaj k nim nové
-      overwrite: Prepíš
-      overwrite_long: Nahraď súčasné záznamy novými
-    preface: Môžeš nahrať dáta ktoré si exportoval/a z iného Mastodon serveru, ako sú napríklad zoznamy ľudí ktorých sleduješ, alebo blokuješ.
+      merge: Pridať
+      merge_long: Ponechať existujúce záznamy a pridať k nim nové
+      overwrite: Prepísať
+      overwrite_long: Nahradiť súčasné záznamy novými
+    preface: Môžete importovať dáta exportované z iného serveru na Mastodone, napríklad zoznam sledovaných alebo blokovaných účtov.
     recent_imports: Nedávne nahrania
     states:
       finished: Dokončené
@@ -1021,7 +1043,7 @@ sk:
       lists: Nahrávanie zoznamov
     type_groups:
       constructive: Sledovania a záložky
-      destructive: Blokovania a utíšenia
+      destructive: Blokovania a stíšenia
     types:
       blocking: Zoznam blokovaných
       bookmarks: Záložky
@@ -1057,7 +1079,7 @@ sk:
     title: Pozvi ľudí
   lists:
     errors:
-      limit: Dosiahli ste maximálny počet zoznamov
+      limit: Bol dosiahnutý maximálny počet zoznamov
   login_activities:
     authentication_methods:
       password: heslom
@@ -1065,6 +1087,9 @@ sk:
     title: História overení
   mail_subscriptions:
     unsubscribe:
+      emails:
+        notification_emails:
+          reblog: e-mailové upozornenia na zdieľania
       title: Ukonči odber
   media_attachments:
     validations:
@@ -1082,8 +1107,8 @@ sk:
       not_found: nebolo možné nájsť
       on_cooldown: Si v spánkovom stave
     followers_count: Následovatelia v čase presunu
-    incoming_migrations: Presúvam sa z iného účtu
-    incoming_migrations_html: K presunutiu z iného účtu na tento, si najskôr potrebuješ <a href="%{path}">vytvoriť alias pre účet</a>.
+    incoming_migrations: Presun z iného účtu
+    incoming_migrations_html: Ak sa chcete na tento účet presunúť z iného účtu, najprv si <a href="%{path}">vytvorte nový alias</a>.
     moved_msg: Tvoj účet teraz presmerováva na %{acct} a tvoji sledovatelia sú presúvaní tam.
     not_redirecting: Tvoj účet v súčasnosti nepresmerováva na žiaden iný účet.
     on_cooldown: Účet si si presunul/a len nedávno. Táto vymoženosť bude znovu sprístupnená za %{count} dní.
@@ -1108,12 +1133,12 @@ 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 obľúbený užívateľom %{name}:'
+      body: "%{name} hviezdičkuje váš príspevok:"
       subject: "%{name} si obľúbil/a tvoj príspevok"
-      title: Novo obľúbené
+      title: Nové ohviezdičkovanie
     follow:
-      body: "%{name} ťa teraz nasleduje!"
-      subject: "%{name} ťa teraz nasleduje"
+      body: "%{name} vás teraz sleduje."
+      subject: "%{name} vás teraz sleduje"
       title: Nový sledovateľ
     follow_request:
       action: Spravuj žiadosti o sledovanie
@@ -1128,15 +1153,17 @@ sk:
     poll:
       subject: Anketa od %{name} skončila
     reblog:
-      body: 'Tvoj príspevok bol vyzdvihnutý užívateľom %{name}:'
-      subject: "%{name} vyzdvihli tvoj príspevok"
-      title: Novo vyzdvyhnuté
+      body: "%{name} zdieľa váš príspevok:"
+      subject: "%{name} zdieľa váš príspevok"
+      title: Nové zdieľanie
     status:
       subject: "%{name} práve prispel/a"
     update:
       subject: "%{name} upravil/a príspevok"
   notifications:
-    email_events_hint: 'Vyber si udalosti, pre ktoré chceš dostávať oboznámenia:'
+    administration_emails: Administrátorské e-mailové upozornenia
+    email_events: Udalosti pre e-mailové upozornenia
+    email_events_hint: 'Vyberte udalosti, pre ktoré chcete dostávať upozornenia:'
   otp_authentication:
     enable: Povoľ
   pagination:
@@ -1157,11 +1184,16 @@ sk:
       too_many_options: nemôže zahŕňať viac ako %{max} položiek
   preferences:
     other: Ostatné
-    posting_defaults: Východiskové nastavenia príspevkov
+    posting_defaults: Predvolené nastavenia príspevkov
     public_timelines: Verejné časové osi
   privacy:
+    hint_html: "<strong>Upravte si spôsob nachádzania vášho profilu a príspevkov.</strong> Tieto funkcie vám môžu pomôcť osloviť väčšie publikum na Mastodone. Skontrolujte tieto nastavenia, aby bolo všetko tak, ako to chcete."
     privacy: Súkromie
+    privacy_hint_html: Rozhodujte o tom, koľko svojej aktivity chcete ukázať ostatným. Ľudia nachádzajú zaujímavé profily a aplikácie aj v profiloch iných, v zoznamoch sledovateľov a sledovaných. Máte možnosť ich skryť.
+    reach: Dosah
+    reach_hint_html: Rozhodnite o tom, či chcete aby vás iní ľudia nachádzali a sledovali. Chcete, aby sa vaše príspevky zobrazovali vo feede Objavovanie? Chcete, aby bol váš účet zobrazovaný ostatným v návrhoch na sledovanie? Chcete automatický schváliť všetky sledovania vás alebo o nich chcete jednotlivo rozhodovať?
     search: Vyhľadávanie
+    search_hint_html: Rozhodujte o tom, ako je možné vás nájsť. Chcete, aby vás ľudia mohli nájsť cez vaše verejné príspevky? Chcete, aby ľudia mimo Mastodonu mohli nachádzať váš profil pri prehľadávaní internetu? Upozorňujeme, že verejné informácie nie je možné úplne odizolovať od vyhľadávačov.
     title: Súkromie a dosah
   privacy_policy:
     title: Pravidlá ochrany súkromia
@@ -1177,21 +1209,21 @@ sk:
     confirm_follow_selected_followers: Si si istý/á, že chceš nasledovať vybraných sledujúcich?
     confirm_remove_selected_followers: Si si istý/á, že chceš odstrániť vybraných sledovateľov?
     confirm_remove_selected_follows: Si si istý/á, že chceš odstrániť vybraných sledovaných?
-    dormant: Spiace
+    dormant: Neaktívne
     follow_failure: Nemožno nasledovať niektoré z vybraných účtov.
     follow_selected_followers: Následuj označených sledovatelov
-    followers: Sledovatelia
-    following: Nasledovaní
+    followers: Sledujú vás
+    following: Sledované vami
     invited: Pozvaný/á
-    last_active: Naposledy aktívny
+    last_active: Naposledy aktívne
     most_recent: Najnovšie
-    moved: Presunuli sa
-    mutual: Spoločné
+    moved: Presunuté
+    mutual: Vzájomné
     primary: Hlavné
     relationship: Vzťah
-    remove_selected_domains: Vymaž všetkých následovateľov z vybraných domén
+    remove_selected_domains: Vymazať všetky sledujúce účty z vybraných domén
     remove_selected_followers: Odstráň vybraných následovatrľov
-    remove_selected_follows: Prestaň sledovať vybraných užívateľov
+    remove_selected_follows: Zrušiť sledovanie vybraných účtov
     status: Stav účtu
   remote_follow:
     missing_resource: Nemožno nájsť potrebnú presmerovaciu adresu k tvojmu účtu
@@ -1204,7 +1236,7 @@ sk:
     over_daily_limit: Prekročil/a si denný limit %{limit} predplánovaných príspevkov
     over_total_limit: Prekročil/a si limit %{limit} predplánovaných príspevkov
   sessions:
-    activity: Najnovšia aktivita
+    activity: Posledná aktivita
     browser: Prehliadač
     browsers:
       chrome: Google Chrome
@@ -1216,10 +1248,10 @@ sk:
       safari: Apple Safari
       unknown_browser: Neznámy prehliadač
       weibo: Sina/Tencent Weibo
-    current_session: Aktuálna sezóna
+    current_session: Vaše aktuálne prihlásenie
     date: Dátum
     description: "%{browser} na %{platform}"
-    explanation: Tieto sú prehliadače ktoré sú teraz prihlásené na tvoj Mastodon účet.
+    explanation: Tieto prehliadače sú práve prihlásené do vášho účtu na Mastodone.
     ip: IP adresa
     platforms:
       ios: Apple iOS
@@ -1227,9 +1259,10 @@ sk:
       mac: MacOSX
       unknown_platform: Neznáma platforma
       windows: Microsoft Windows
-    revoke: Zamietni
-    revoke_success: Sezóna úspešne zamietnutá
-    title: Sezóny
+    revoke: Zrušiť
+    revoke_success: Prihlásenie bolo zrušené
+    title: Aktívne prihlásenia
+    view_authentication_history: Zobraziť históriu prihlásení účtu
   settings:
     account: Účet
     account_settings: Nastavenia účtu
@@ -1239,19 +1272,30 @@ sk:
     back: Späť na Mastodon
     delete: Vymazanie účtu
     development: Vývoj
-    edit_profile: Uprav profil
-    featured_tags: Zvýraznené haštagy
-    import: Importuj
+    edit_profile: Úprava profilu
+    featured_tags: Zvýraznené hashtagy
+    import: Import
     import_and_export: Import a export
     migrate: Presuň účet
-    preferences: Voľby
+    notifications: E-mailové upozornenia
+    preferences: Predvoľby
     profile: Profil
-    relationships: Sledovania a následovatelia
-    two_factor_authentication: Dvojfázové overenie
+    relationships: Sledované a sledujúce účty
+    severed_relationships: Prerušené vzťahy
+    statuses_cleanup: Automatické mazanie príspevkov
+    two_factor_authentication: Dvojstupňové overenie
     webauthn_authentication: Bezpečnostné kľúče
   severed_relationships:
-    lost_followers: Stratení nasledovatelia
-    lost_follows: Stratené sledovania
+    download: Stiahnuť (%{count})
+    event_type:
+      account_suspension: Pozastavenie účtu (%{target_name})
+      domain_block: Pozastavenie servera (%{target_name})
+      user_domain_block: Zablokovali ste %{target_name}
+    lost_followers: Zrušenie sledovania účtami
+    lost_follows: Zrušenie sledovania účtov
+    preamble: Pri blokovaní domény alebo pri pozastavení pripojenia s iným serverom moderátorským tímom vášho servera môžete prísť o sledované a sledujúce účty. Keď sa to stane, tu si môžete stiahnuť zoznam prerušených vzťahov, ktorý môžete skontrolovať a prípadne importovať na inom serveri.
+    purged: Informácie o tomto serveri boli odstránené administrátorským tímom vášho servera.
+    type: Udalosť
   statuses:
     attached:
       description: 'Priložené: %{attached}'
@@ -1260,14 +1304,14 @@ sk:
         many: "%{count} obrázkov"
         one: "%{count} obrázok"
         other: "%{count} obrázky"
-    boosted_from_html: Vyzdvihnuté od %{acct_link}
+    boosted_from_html: Zdieľané od %{acct_link}
     content_warning: 'Varovanie o obsahu: %{warning}'
     default_language: Rovnaký ako jazyk rozhrania
     disallowed_hashtags:
-      few: 'obsah nepovolených haštagov: %{tags}'
-      many: 'obsah nepovolených haštagov: %{tags}'
-      one: 'obsahoval nepovolený haštag: %{tags}'
-      other: 'obsahoval nepovolené haštagy: %{tags}'
+      few: 'obsahoval nepovolené hashtagy: %{tags}'
+      many: 'obsahoval nepovolené hashtagy: %{tags}'
+      one: 'obsahoval nepovolený hashtag: %{tags}'
+      other: 'obsahoval nepovolené hashtagy: %{tags}'
     edited_at_html: Upravené %{date}
     errors:
       in_reply_not_found: Príspevok, na ktorý sa snažíš odpovedať, pravdepodobne neexistuje.
@@ -1275,35 +1319,50 @@ sk:
     pin_errors:
       limit: Už si si pripol ten najvyšší možný počet hlášok
       ownership: Nieje možné pripnúť hlášku od niekoho iného
-      reblog: Vyzdvihnutie sa nedá pripnúť
+      reblog: Zdieľanie nie je možné pripnúť
     title: '%{name}: „%{quote}"'
     visibilities:
-      direct: Súkromne
-      private: Iba pre sledovateľov
-      private_long: Ukáž iba následovateľom
+      direct: Súkromné označenie
+      private: Iba pre sledujúce účty
       public: Verejné
-      public_long: Všetci môžu vidieť
-      unlisted: Nezaradené
-      unlisted_long: Všetci môžu vidieť, ale nieje zaradené do verejnej osi
+      public_long: Ktokoľvek na Mastodone aj mimo neho
+      unlisted: Tiché verejné
+      unlisted_long: Skryté z výsledkov vyhľadávania, populárnych tém a verejných časových osí na Mastodone
   statuses_cleanup:
+    enabled: Automaticky mazať staré príspevky
+    enabled_hint: Automaticky vymaže vaše príspevky po dosiahnutí stanoveného veku, pokiaľ nespadajú do niektorej z výnimiek nižšie
     exceptions: Výnimky
-    ignore_favs: Ignoruj obľúbené
-    ignore_reblogs: Ignoruj vyzdvihnutia
-    keep_direct: Ponechaj súkromné správy
-    keep_pinned: Ponechaj pripnuté príspevky
-    keep_pinned_hint: Nevymaže žiadne s tvojich pripnutých príspevkov
-    keep_polls: Ponechaj ankety
-    keep_self_bookmark: Ponechaj príspevky, ktoré sú záložkami
-    keep_self_fav: Ponechať príspevky, ktoré si si obľúbil/a
+    explanation: Keďže je mazanie príspevkov drahým procesom, bude sa to diať pomaly a postupne v časoch, keď server nie je inak vyťažovaný. Preto môže príspevkom po dosiahnutí stanoveného veku ešte chvíľu trvať, než budú vymazané.
+    ignore_favs: Ignorovať hviezdičky
+    ignore_reblogs: Ignorovať zdieľania
+    interaction_exceptions: Výnimky podľa interakcií
+    interaction_exceptions_explanation: Vymazanie príspevkov nie je zaručené, pokiaľ klesnú pod limit hviezdičkovaní alebo zdieľaní až po kontrole.
+    keep_direct: Ponechať súkromné správy
+    keep_direct_hint: Vaše súkromné správy nebudú vymazané
+    keep_media: Ponechať príspevky s médiami
+    keep_media_hint: Vaše príspevky s mediálnymi prílohami nebudú vymazané
+    keep_pinned: Ponechať pripnuté príspevky
+    keep_pinned_hint: Vaše pripnuté príspevky nebudú vymazané
+    keep_polls: Ponechať ankety
+    keep_polls_hint: Vaše ankety nebudú vymazané
+    keep_self_bookmark: Ponechať príspevky označené záložkou
+    keep_self_bookmark_hint: Vaše príspevky označené záložkou nebudú vymazané
+    keep_self_fav: Ponechať ohviezdičkované príspevky
+    keep_self_fav_hint: Vaše ohviezdičkované príspevky nebudú vymazané
     min_age:
       '1209600': 2 týždne
-      '15778476': 6 mesačné
-      '2629746': 1 mesačné
-      '31556952': 1 ročné
-      '5259492': 2 mesačné
+      '15778476': 6 mesiacov
+      '2629746': 1 mesiac
+      '31556952': 1 rok
+      '5259492': 2 mesiace
       '604800': 1 týždeň
-      '63113904': 2 ročné
-      '7889238': 3 mesačné
+      '63113904': 2 roky
+      '7889238': 3 mesiace
+    min_age_label: Časová hranica
+    min_favs: Ponechať príspevky s aspoň týmto počtom hviezdičiek
+    min_favs_hint: Vaše príspevky, ktoré majú aspoň tento počet hviezdičiek, nebudú vymazané. Nevypĺňajte, pokiaľ chcete mazať príspevky bez ohľadu na ich počet hviezdičiek
+    min_reblogs: Ponechať príspevky s aspoň týmto počtom zdieľaní
+    min_reblogs_hint: Vaše príspevky, ktoré majú aspoň tento počet zdieľaní, nebudú vymazané. Nevypĺňajte, pokiaľ chcete mazať príspevky bez ohľadu na ich počet zdieľaní
   stream_entries:
     sensitive_content: Senzitívny obsah
   tags:
@@ -1315,18 +1374,25 @@ sk:
   time:
     formats:
       default: "%b %d, %R, %H:%M"
+      with_time_zone: "%b %d, %Y, %H:%M %Z"
   translation:
     errors:
       too_many_requests: V poslednej dobe bolo na prekladateľskú službu vykonaných priveľa požiadaviek.
   two_factor_authentication:
-    disable: Zakáž
-    enabled: Dvojfázové overovanie je povolené
-    enabled_success: Dvojfázové overovanie úspešne povolené
-    generate_recovery_codes: Vygeneruj zálohové kódy
-    lost_recovery_codes: Zálohové kódy ti umožnia dostať sa k svojmu účtu ak stratíš telefón. Pokiaľ si stratila svoje zálohové kódy, môžeš si ich tu znovu vygenerovať. Tvoje staré zálohové kódy budú zneplatnené.
-    recovery_codes: Zálohuj kódy pre obnovu
-    recovery_codes_regenerated: Zálohové kódy boli úspešne zvova vygenerované
-    recovery_instructions_html: Keď hocikedy stratíš prístup k svojmu telefónu, môžeš použiť jeden z prístupových kódov nižšie pre obnovenie prístupu k svojmu účtu. <strong>Skladuj tieto prístupové kódy na bezpečnom mieste</strong>. Napríklad ich môžeš vytlačiť a uložiť ich spolu s inými dôležitými dokumentami.
+    add: Pridať
+    disable: Vypnúť dvojstupňové overenie
+    disabled_success: Dvojstupňové overenie bolo úspešne vypnuté
+    edit: Upraviť
+    enabled: Dvojstupňové overovanie je zapnuté
+    enabled_success: Dvojstupňové overovanie bolo úspešne zapnuté
+    generate_recovery_codes: Vygenerovať záložné kódy
+    lost_recovery_codes: Záložné kódy vás umožnia prístup k účtu v prípade straty mobilného telefónu. Pokiaľ ste svoje zálohové kódy stratili, môžete si tu vygenerovať nové. Staré zálohové kódy budú deaktivované.
+    methods: Metódy dvojstupňového overenia
+    otp: Overovacia apka
+    recovery_codes: Zálohovať záložné kódy
+    recovery_codes_regenerated: Záložné kódy boli úspešne znova vygenerované
+    recovery_instructions_html: Ak niekedy prídete o prístup k svojmu mobilnému telefónu, prístup k účtu môžete obnoviť použitím jedného zo záložných kódov nižšie. <strong>Záložné kódy si bezpečne uložte.</strong> Môžete si ich napríklad vytlačiť a založiť k iným dôležitým dokumentom.
+    webauthn: Bezpečnostné kľúče
   user_mailer:
     appeal_approved:
       action: Nastavenia účtu
@@ -1337,7 +1403,7 @@ sk:
     backup_ready:
       explanation: Vyžiadal/a si si úplnú zálohu svojho Mastodon účtu.
       extra: Teraz je pripravená na stiahnutie!
-      subject: Tvoj archív je pripravený na stiahnutie
+      subject: Váš archív je pripravený na stiahnutie
       title: Odber archívu
     failed_2fa:
       details: 'Tu sú podrobnosti o pokuse o prihlásenie:'
@@ -1355,9 +1421,9 @@ sk:
       title:
         delete_statuses: Príspevky vymazané
         disable: Účet bol zamrazený
-        mark_statuses_as_sensitive: Príspevky označené za chúlostivé
+        mark_statuses_as_sensitive: Príspevky označené ako citlivé
         none: Varovanie
-        sensitive: Účet označený za chúlostivý
+        sensitive: Účty označené ako citlivé
         silence: Účet bol obmedzený
         suspend: Tvoj účet bol vylúčený
     welcome:
@@ -1366,9 +1432,11 @@ sk:
       apps_step: Stiahni naše oficiálne aplikácie.
       apps_title: Mastodon aplikácie
       edit_profile_action: Prispôsob
+      edit_profile_step: Naštartuje svoje interakcie vyplnením svojho profilu.
       edit_profile_title: Prispôsob si svoj profil
       explanation: Tu nájdeš nejaké tipy do začiatku
       feature_action: Zisti viac
+      feature_creativity: Mastodon vám pri tvorbe obsahu a vyjadrovaní sa online umožňuje používať audio, video, obrázky a fotky, opisy pre zleplšenie prístupnosti, ankety, varovania o obsahu, animované profilové fotky, vlastné emoji, upravené náhľady a ďalšie. Nech už chcete zverejňovať svoje vizuálne diela, hudbu či podcasty, Mastodon je tu pre vás.
       follow_action: Nasleduj
       follow_title: Prispôsob svoj domáci kanál
       follows_title: Koho nasledovať
@@ -1377,10 +1445,15 @@ sk:
       subject: Vitaj na Mastodone
       title: Vitaj na palube, %{name}!
   users:
-    follow_limit_reached: Nemôžeš nasledovať viac ako %{limit} ľudí
+    follow_limit_reached: Nemôžete sledovať viac ako %{limit} ľudí
     invalid_otp_token: Neplatný kód pre dvojfaktorovú autentikáciu
     otp_lost_help_html: Pokiaľ si stratil/a prístup k obom, môžeš dať vedieť %{email}
     rate_limited: Príliš veľa pokusov o overenie, skús to znova neskôr.
     signed_in_as: 'Prihlásená/ý ako:'
   verification:
+    extra_instructions_html: <strong>Tip:</strong> Odkaz na vašom webe môže byť neviditeľný. Najdôležitejšia časť je <code>rel="me"</code>, zabraňuje tomu, že sa za vás bude niekto vydávať na weboch s obsahom generovaným používateľmi. V záhlaví stránky môžete dokonca namiesto tagu <code>a</code> použiť tag <code>link</code>, ale kód HTML musí byť prístupný bez potreby spustenia JavaScriptu.
+    here_is_how: Ako na to
+    hint_html: "<strong>Každý na Mastodone môže overiť svoju totožnosť.</strong> Okamžite, zadarmo a navždy s využitím otvorených webových štandardov. Potrebujete len svoju vlastnú webovú stránku. Keď odkaz na ňu uvediete vo svojom profile, skontrolujeme, či je prepojená s vaším profilom a úspešné overenie zvýrazníme vizuálnym indikátorom."
+    instructions_html: Skopírujte kód nižšie a vložte ho do kódu HTML svojho webu. Potom pridajte svoju webovú stránku do jedného z extra polí v karte Úprava profilu a uložte zmeny.
     verification: Overenie
+    website_verification: Overenie webu
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index e6339e22495..123e8c47c07 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -1912,13 +1912,7 @@ sl:
       reblog: Izpostavitev ne more biti pripeta
     title: "%{name}: »%{quote}«"
     visibilities:
-      direct: Neposredno
-      private: Samo sledilci
-      private_long: Prikaži samo sledilcem
       public: Javno
-      public_long: Vsi lahko vidijo
-      unlisted: Ni prikazano
-      unlisted_long: Vsi lahko vidijo, vendar ni objavljeno na javnih časovnicah
   statuses_cleanup:
     enabled: Samodejno izbriši stare objave
     enabled_hint: Samodejno izbriše vaše objave, ko dosežejo določen starostni prag, razen če ne ustrezajo eni od spodnjih izjem
diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index a29344ac80f..5a978ed6668 100644
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -190,6 +190,7 @@ sq:
         create_relay: Krijoni Rele
         create_unavailable_domain: Krijo Përkatësi të Papërdorshme
         create_user_role: Krijoni Rol
+        create_username_block: Krijoni Rregull Emrash Përdoruesish
         demote_user: Zhgradoje Përdoruesin
         destroy_announcement: Fshije Lajmërimin
         destroy_canonical_email_block: Fshini Bllokim Email-esh
@@ -203,6 +204,7 @@ sq:
         destroy_status: Fshi Gjendje
         destroy_unavailable_domain: Fshi Përkatësi të Papërdorshme
         destroy_user_role: Asgjësoje Rolin
+        destroy_username_block: Fshini Rregull Emrash Përdoruesish
         disable_2fa_user: Çaktivizo 2FA-në
         disable_custom_emoji: Çaktivizo Emotikon Vetjak
         disable_relay: Çaktivizoje Relenë
@@ -237,6 +239,7 @@ sq:
         update_report: Përditësoni Raportimin
         update_status: Përditëso Gjendjen
         update_user_role: Përditësoni Rol
+        update_username_block: Përditësoni Rregull Emrash Përdoruesish
       actions:
         approve_appeal_html: "%{name} miratoi apelim vendimi moderimi nga %{target}"
         approve_user_html: "%{name} miratoi regjistrim nga %{target}"
@@ -255,6 +258,7 @@ sq:
         create_relay_html: "%{name} krijoi një rele %{target}"
         create_unavailable_domain_html: "%{name} ndali dërgimin drejt përkatësisë %{target}"
         create_user_role_html: "%{name} krijoi rolin %{target}"
+        create_username_block_html: "%{name} shtoi rregull për emra përdoruesish që përmbajnë %{target}"
         demote_user_html: "%{name} zhgradoi përdoruesin %{target}"
         destroy_announcement_html: "%{name} fshiu lajmërimin për %{target}"
         destroy_canonical_email_block_html: "%{name} zhbllokoi email me hashin %{target}"
@@ -268,6 +272,7 @@ sq:
         destroy_status_html: "%{name} hoqi gjendje nga %{target}"
         destroy_unavailable_domain_html: "%{name} rinisi dërgimin drejt përkatësisë %{target}"
         destroy_user_role_html: "%{name} fshiu rolin %{target}"
+        destroy_username_block_html: "%{name} hoqi rregull për emra përdoruesish që përmbajnë %{target}"
         disable_2fa_user_html: "%{name} çaktivizoi domosdoshmërinë për dyfaktorësh për përdoruesin %{target}"
         disable_custom_emoji_html: "%{name} çaktivizoi emoxhin %{target}"
         disable_relay_html: "%{name} çaktivizoi relenë %{target}"
@@ -302,6 +307,7 @@ sq:
         update_report_html: "%{name} përditësoi raportimin %{target}"
         update_status_html: "%{name} përditësoi gjendjen me %{target}"
         update_user_role_html: "%{name} ndryshoi rolin për %{target}"
+        update_username_block_html: "%{name} përditësoi rregull për emra përdoruesish që përmbajnë %{target}"
       deleted_account: fshiu llogarinë
       empty: S’u gjetën regjistra.
       filter_by_action: Filtroji sipas veprimit
@@ -505,6 +511,7 @@ sq:
         select_capabilities: Përzgjidhni Aftësi
         sign_in: Hyni
         status: Gjendje
+        title: Shërbyes Shërbimesh Ndihmëse Fediversi
       title: FASP
     follow_recommendations:
       description_html: "<strong>Rekomandimet për ndjekje ndihmojnë përdoruesit e rinj të gjejnë shpejt lëndë me interes</strong>. Kur një përdorues nuk ka ndërvepruar mjaftueshëm me të tjerët, që të formohen rekomandime të personalizuara ndjekjeje, rekomandohen këto llogari. Ato përzgjidhen çdo ditë, prej një përzierje llogarish me shkallën më të lartë të angazhimit dhe numrin më të lartë të ndjekësve vendorë për një gjuhë të dhënë."
@@ -835,6 +842,10 @@ sq:
         all: Për këdo
         disabled: Për askënd
         users: Për përdorues vendorë që kanë bërë hyrjen
+      feed_access:
+        modes:
+          authenticated: Vetëm përdorues të mirëfilltësuar
+          public: Kushdo
       registrations:
         moderation_recommandation: Ju lutemi, sigurohuni si keni një ekip adekuat dhe reagues moderimi, përpara se të hapni regjistrimet për këdo!
         preamble: Kontrolloni cilët mund të krijojnë llogari në shërbyesin tuaj.
@@ -1075,6 +1086,25 @@ sq:
           other: Përdorur nga %{count} vetë gjatë javës së kaluar
       title: Rekomandime & Prirje
       trending: Në modë
+    username_blocks:
+      add_new: Shtoni të ri
+      block_registrations: Blloko regjistrimet
+      comparison:
+        contains: Përmban
+        equals: Është baras me
+      contains_html: Përmban %{string}
+      created_msg: U krijua me sukses rregull emrash përdoruesish
+      delete: Fshije
+      edit:
+        title: Përpunoni rregull emrash përdoruesi
+      matches_exactly_html: Baras me %{string}
+      new:
+        create: Krijoni rregull
+        title: Krijoni rregull të ri emrash përdoruesish
+      no_username_block_selected: S’u ndryshua ndonjë rregull emrash përdoruesishm ngaqë s’u përzgjodh ndonjë
+      not_permitted: Jo i lejuar
+      title: Rregulla emrash përdoruesish
+      updated_msg: Rregulli i emrave të përdoruesve u përditësua me sukses
     warning_presets:
       add_new: Shtoni të ri
       delete: Fshije
@@ -1548,6 +1578,13 @@ sq:
       expires_at: Skadon më
       uses: Përdorime
     title: Ftoni njerëz
+  link_preview:
+    author_html: Nga %{name}
+    potentially_sensitive_content:
+      action: Klikoni për shfaqje
+      confirm_visit: Jeni i sigurt se doni të hapet kjo lidhje?
+      hide_button: Fshihe
+      label: Lëndë potencalisht me spec
   lists:
     errors:
       limit: Keni mbërritur në numrin maksimum të listave
@@ -1648,6 +1685,10 @@ sq:
       title: Përmendje e re
     poll:
       subject: Përfundoi një pyetësor nga %{name}
+    quote:
+      body: 'Postimi juaj u citua nga %{name}:'
+      subject: "%{name} citoi postimin tuaj"
+      title: Citim i ri
     reblog:
       body: 'Gjendja juaj u përforcua nga %{name}:'
       subject: "%{name} përforcoi gjendjen tuaj"
@@ -1696,6 +1737,9 @@ sq:
       self_vote: S’mund të votoni në pyetësorët tuaj
       too_few_options: duhet të ketë më tepër se një element
       too_many_options: s’mund të përmbajë më tepër se %{max} elementë
+    vote: Votoni
+  posting_defaults:
+    explanation: Këto rregullime do të përdoren si parazgjedhje, kur krijoni postime të reja, por mund t’i përpunoni për postim, brenda hartuesit.
   preferences:
     other: Tjetër
     posting_defaults: Parazgjedhje postimesh
@@ -1851,6 +1895,9 @@ sq:
         other: "%{count} video"
     boosted_from_html: Përforcuar nga %{acct_link}
     content_warning: 'Sinjalizim lënde: %{warning}'
+    content_warnings:
+      hide: Fshihe postimin
+      show: Shfaq më tepër
     default_language: Njësoj me gjuhën e ndërfaqes
     disallowed_hashtags:
       one: 'përmbante një hashtag të palejuar: %{tags}'
@@ -1858,6 +1905,7 @@ sq:
     edited_at_html: Përpunuar më %{date}
     errors:
       in_reply_not_found: Gjendja të cilës po provoni t’i përgjigjeni s’duket se ekziston.
+      quoted_status_not_found: Postimi që po rrekeni të citoni nuk duket se ekziston.
     over_character_limit: u tejkalua kufi shenjash prej %{max}
     pin_errors:
       direct: Postimet që janë të dukshme vetëm për përdoruesit e përmendur s’mund të fiksohen
@@ -1865,18 +1913,16 @@ sq:
       ownership: S’mund të fiksohen mesazhet e të tjerëve
       reblog: S’mund të fiksohet një përforcim
     quote_policies:
-      followers: Ndjekës dhe përdorues të përmendur
-      nobody: Vetëm përdorues të përmendur
-      public: Këdo
+      followers: Vetëm ndjekës
+      nobody: Thjesht unë
+      public: Cilido
     title: '%{name}: "%{quote}"'
     visibilities:
-      direct: I drejtpërdrejtë
-      private: Vetëm ndjekësve
-      private_long: Shfaqua vetëm ndjekësve
+      direct: Përmendje private
+      private: Vetëm ndjekës
       public: Publike
-      public_long: Mund ta shohë kushdo
-      unlisted: Jo në listë
-      unlisted_long: Mund ta shohë gjithkush, por s’gjendet në rrjedha publike kohore
+      public_long: Cilido që hyn e del në Mastodon
+      unlisted_long: Fshehur nga përfundime kërkimi në Mastodon, rrjedha kohore gjërash në modë dhe publike
   statuses_cleanup:
     enabled: Fshi automatikisht postime të vjetra
     enabled_hint: Fshin automatikisht postimet tuaja, pasi mbërrijnë një prag të caktuar moshe, hiq rastin kur ka përputhje me një nga përjashtimet më poshtë
diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml
index 79d823ebb8a..3173aa34384 100644
--- a/config/locales/sr-Latn.yml
+++ b/config/locales/sr-Latn.yml
@@ -1655,13 +1655,7 @@ sr-Latn:
       reblog: Podrška ne može da se prikači
     title: "%{name}: „%{quote}”"
     visibilities:
-      direct: Direktno
-      private: Samo pratioci
-      private_long: Prikaži samo pratiocima
       public: Javno
-      public_long: Svako može da vidi
-      unlisted: Neizlistano
-      unlisted_long: Svako može da vidi, ali nije izlistano na javnim vremenskim linijama
   statuses_cleanup:
     enabled: Automatski izbriši stare objave
     enabled_hint: Automatski briše vaše objave kada dostignu određeni starosni prag, osim ako se ne podudaraju sa jednim od izuzetaka u nastavku
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index 2e8a3364bee..9fc9ed255f7 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -1685,13 +1685,7 @@ sr:
       reblog: Подршка не може да се прикачи
     title: "%{name}: „%{quote}”"
     visibilities:
-      direct: Директно
-      private: Само пратиоци
-      private_long: Прикажи само пратиоцима
       public: Јавно
-      public_long: Свако може да види
-      unlisted: Неизлистано
-      unlisted_long: Свако може да види, али није излистано на јавним временским линијама
   statuses_cleanup:
     enabled: Аутоматски избриши старе објаве
     enabled_hint: Аутоматски брише ваше објаве када достигну одређени старосни праг, осим ако се не подударају са једним од изузетака у наставку
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 4f011da36ba..4a844f8a941 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -190,6 +190,7 @@ sv:
         create_relay: Skapa ombud
         create_unavailable_domain: Skapa otillgänglig domän
         create_user_role: Skapa roll
+        create_username_block: Skapa användarnamnsregel
         demote_user: Degradera användare
         destroy_announcement: Radera notis
         destroy_canonical_email_block: Ta bort e-post block
@@ -203,6 +204,7 @@ sv:
         destroy_status: Radera inlägg
         destroy_unavailable_domain: Ta bort otillgänglig domän
         destroy_user_role: Förstör roll
+        destroy_username_block: Ta bort användarnamnsregel
         disable_2fa_user: Inaktivera 2FA
         disable_custom_emoji: Inaktivera egna emojis
         disable_relay: Inaktivera ombud
@@ -237,6 +239,7 @@ sv:
         update_report: Uppdatera rapport
         update_status: Uppdatera inlägg
         update_user_role: Uppdatera roll
+        update_username_block: Uppdatera användarnamnsregel
       actions:
         approve_appeal_html: "%{name} godkände överklagande av modereringsbeslut från %{target}"
         approve_user_html: "%{name} godkände registrering från %{target}"
@@ -255,6 +258,7 @@ sv:
         create_relay_html: "%{name} skapade ombudet %{target}"
         create_unavailable_domain_html: "%{name} stoppade leverans till domänen %{target}"
         create_user_role_html: "%{name} skapade rollen %{target}"
+        create_username_block_html: "%{name} lade till regel för användarnamn som innehåller %{target}"
         demote_user_html: "%{name} nedgraderade användare %{target}"
         destroy_announcement_html: "%{name} raderade kungörelsen %{target}"
         destroy_canonical_email_block_html: "%{name} avblockerade e-post med hash%{target}"
@@ -268,6 +272,7 @@ sv:
         destroy_status_html: "%{name} tog bort inlägget av %{target}"
         destroy_unavailable_domain_html: "%{name} återupptog leverans till domänen %{target}"
         destroy_user_role_html: "%{name} raderade rollen %{target}"
+        destroy_username_block_html: "%{name} borttagna regler för användarnamn som innehåller %{target}"
         disable_2fa_user_html: "%{name} inaktiverade tvåfaktorsautentiseringskrav för användaren %{target}"
         disable_custom_emoji_html: "%{name} inaktiverade emoji %{target}"
         disable_relay_html: "%{name} inaktiverade ombudet %{target}"
@@ -302,6 +307,7 @@ sv:
         update_report_html: "%{name} uppdaterade rapporten %{target}"
         update_status_html: "%{name} uppdaterade inlägget av %{target}"
         update_user_role_html: "%{name} ändrade rollen %{target}"
+        update_username_block_html: "%{name} uppdaterade regel för användarnamn som innehåller %{target}"
       deleted_account: raderat konto
       empty: Inga loggar hittades.
       filter_by_action: Filtrera efter åtgärd
@@ -1085,6 +1091,25 @@ sv:
           other: Använd av %{count} personer under den senaste veckan
       title: Rekommendationer & Trender
       trending: Trendande
+    username_blocks:
+      add_new: Lägg till ny
+      block_registrations: Registrerade blockeringar
+      comparison:
+        contains: Innehåller
+        equals: Lika
+      contains_html: Innehåller %{string}
+      created_msg: Användarnamnsregel har skapats
+      delete: Ta bort
+      edit:
+        title: Redigera användarnamnsregel
+      matches_exactly_html: Lika med %{string}
+      new:
+        create: Skapa regel
+        title: Skapa ny användarnamnsregel
+      no_username_block_selected: Inga användarnamn regler ändrades eftersom ingen valdes
+      not_permitted: Ej tillåtet
+      title: Regler för användarnamn
+      updated_msg: Uppdaterade användarnamnsregel
     warning_presets:
       add_new: Lägg till ny
       delete: Radera
@@ -1349,6 +1374,10 @@ sv:
     basic_information: Allmän information
     hint_html: "<strong>Anpassa vad folk ser på din offentliga profil och bredvid dina inlägg.</strong> Andra personer är mer benägna att följa dig och interagera med dig när du har en ifylld profil och en profilbild."
     other: Övrigt
+  emoji_styles:
+    auto: Automatiskt
+    native: Ursprunglig
+    twemoji: Twemoji
   errors:
     '400': Förfrågningen som du skickade in var ogiltig eller felaktigt utformad.
     '403': Du har inte behörighet att visa den här sidan.
@@ -1658,6 +1687,10 @@ sv:
       title: Ny omnämning
     poll:
       subject: En undersökning av %{name} har avslutats
+    quote:
+      body: 'Ditt inlägg citerades av %{name}:'
+      subject: "%{name} citerade ditt inlägg"
+      title: Nytt citat
     reblog:
       body: 'Ditt inlägg boostades av %{name}:'
       subject: "%{name} boostade ditt inlägg"
@@ -1706,6 +1739,7 @@ sv:
       self_vote: Du kan inte rösta i dina egna omröstningar
       too_few_options: måste ha mer än ett objekt
       too_many_options: kan inte innehålla mer än %{max} objekt
+    vote: Rösta
   preferences:
     other: Annat
     posting_defaults: Standardinställningar för inlägg
@@ -1868,25 +1902,16 @@ sv:
     edited_at_html: 'Ändrad: %{date}'
     errors:
       in_reply_not_found: Inlägget du försöker svara på verkar inte existera.
+      quoted_status_not_found: Inlägget du försöker svara på verkar inte existera.
     over_character_limit: teckengräns på %{max} har överskridits
     pin_errors:
       direct: Inlägg som endast är synliga för nämnda användare kan inte fästas
       limit: Du har redan fäst det maximala antalet inlägg
       ownership: Någon annans inlägg kan inte fästas
       reblog: En boost kan inte fästas
-    quote_policies:
-      followers: Följare och omnämnda användare
-      nobody: Endast nämnda användare
-      public: Alla
     title: '%{name}: "%{quote}"'
     visibilities:
-      direct: Direkt
-      private: Endast följare
-      private_long: Visa endast till följare
       public: Offentlig
-      public_long: Alla kan se
-      unlisted: Olistade
-      unlisted_long: Alla kan se, men listas inte på offentliga tidslinjer
   statuses_cleanup:
     enabled: Ta automatiskt bort gamla inlägg
     enabled_hint: Raderar dina inlägg automatiskt när de når en specifik ålder, såvida de inte matchar något av undantagen nedan
diff --git a/config/locales/th.yml b/config/locales/th.yml
index 558e95249b7..9f4aeab65ff 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -472,6 +472,15 @@ th:
           created_at: สร้างเมื่อ
           delete: ลบ
           ip: ที่อยู่ IP
+      providers:
+        delete: ลบ
+        name: ชื่อ
+        registrations:
+          confirm: ยืนยัน
+          reject: ปฏิเสธ
+        save: บันทึก
+        sign_in: ลงชื่อเข้า
+        status: สถานะ
     follow_recommendations:
       description_html: "<strong>คำแนะนำการติดตามช่วยให้ผู้ใช้ใหม่ค้นหาเนื้อหาที่น่าสนใจได้อย่างรวดเร็ว</strong> เมื่อผู้ใช้ไม่ได้โต้ตอบกับผู้อื่นมากพอที่จะสร้างคำแนะนำการติดตามเฉพาะบุคคล จะแนะนำบัญชีเหล่านี้แทน จะคำนวณคำแนะนำใหม่เป็นประจำทุกวันจากบัญชีต่าง ๆ ที่มีการมีส่วนร่วมล่าสุดสูงสุดและจำนวนผู้ติดตามในเซิร์ฟเวอร์สูงสุดสำหรับภาษาที่กำหนด"
       language: สำหรับภาษา
@@ -746,6 +755,8 @@ th:
       description_html: ขณะที่ส่วนใหญ่อ้างว่าได้อ่านและยอมรับเงื่อนไขการให้บริการ ผู้คนมักจะไม่อ่านจนกว่าหลังจากปัญหาเกิดขึ้น <strong>ทำให้การดูกฎของเซิร์ฟเวอร์ของคุณอย่างรวดเร็วง่ายขึ้นโดยการระบุกฎเหล่านั้นในรายการสัญลักษณ์แสดงหัวข้อย่อยแบบแบน</strong> พยายามทำให้กฎแต่ละข้อสั้นและเรียบง่าย แต่พยายามอย่าแบ่งกฎเหล่านั้นเป็นหลายรายการแยกเช่นกัน
       edit: แก้ไขกฎ
       empty: ยังไม่ได้กำหนดกฎของเซิร์ฟเวอร์
+      move_down: ย้ายลง
+      move_up: ย้ายขึ้น
       title: กฎของเซิร์ฟเวอร์
     settings:
       about:
@@ -772,6 +783,7 @@ th:
       discovery:
         follow_recommendations: คำแนะนำการติดตาม
         preamble: การแสดงเนื้อหาที่น่าสนใจเป็นเครื่องมือในการเตรียมความพร้อมให้ผู้ใช้ใหม่ที่อาจไม่รู้จักใครก็ตามใน Mastodon ควบคุมวิธีที่คุณลักษณะการค้นพบต่าง ๆ ทำงานในเซิร์ฟเวอร์ของคุณ
+        privacy: ความเป็นส่วนตัว
         profile_directory: ไดเรกทอรีโปรไฟล์
         public_timelines: เส้นเวลาสาธารณะ
         publish_statistics: เผยแพร่สถิติ
@@ -1771,13 +1783,7 @@ th:
       reblog: ไม่สามารถปักหมุดการดัน
     title: '%{name}: "%{quote}"'
     visibilities:
-      direct: โดยตรง
-      private: ผู้ติดตามเท่านั้น
-      private_long: แสดงแก่ผู้ติดตามเท่านั้น
       public: สาธารณะ
-      public_long: ทุกคนสามารถเห็น
-      unlisted: ไม่อยู่ในรายการ
-      unlisted_long: ทุกคนสามารถเห็น แต่ไม่แสดงรายการในเส้นเวลาสาธารณะ
   statuses_cleanup:
     enabled: ลบโพสต์เก่าโดยอัตโนมัติ
     enabled_hint: ลบโพสต์ของคุณโดยอัตโนมัติเมื่อโพสต์ถึงค่าเกณฑ์อายุที่ระบุ เว้นแต่โพสต์ตรงกับหนึ่งในข้อยกเว้นด้านล่าง
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 7e681c90318..f07a66d327e 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -1,7 +1,7 @@
 ---
 tr:
   about:
-    about_mastodon_html: Jetub Max<em>ücretsiz ve açık kaynaklı</em> bir sosyal ağdır. <em>Merkezi olmayan</em> yapısı sayesinde diğer ticari sosyal platformların aksine iletişimininizin tek bir firmada tutulmasının/yönetilmesinin önüne geçer. Güvendiğiniz bir sunucuyu seçerek oradaki kişilerle etkileşimde bulunabilirsiniz. Herkes kendi Jetub Max sunucusunu kurabilir ve sorunsuz bir şekilde Jetub Max<em>sosyal ağına</em> dahil edebilir!
+    about_mastodon_html: 'Geleceğin sosyal ağı: Reklam yok, kurumsal gözetim yok, etik tasarım ve merkeziyetsizlik! Mastodon ile verilerinizin sahibi olun!'
     contact_missing: Ayarlanmadı
     contact_unavailable: Bulunamadı
     hosted_on: Mastodon %{domain} üzerinde barındırılıyor
@@ -190,6 +190,7 @@ tr:
         create_relay: Aktarıcı Oluştur
         create_unavailable_domain: Mevcut Olmayan Alan Adı Oluştur
         create_user_role: Rol Oluştur
+        create_username_block: Kullanıcı Adı Kuralı Oluştur
         demote_user: Kullanıcıyı Düşür
         destroy_announcement: Duyuru Sil
         destroy_canonical_email_block: E-Posta Engelini Sil
@@ -203,6 +204,7 @@ tr:
         destroy_status: Durumu Sil
         destroy_unavailable_domain: Mevcut Olmayan Alan Adı Sil
         destroy_user_role: Rolü Kaldır
+        destroy_username_block: Kullanıcı Adı Kuralını Sil
         disable_2fa_user: 2AD Kapat
         disable_custom_emoji: Özel İfadeyi Devre Dışı Bırak
         disable_relay: Aktarıcıyı Devre Dışı Bırak
@@ -237,6 +239,7 @@ tr:
         update_report: Raporu Güncelle
         update_status: Durumu Güncelle
         update_user_role: Rolü Güncelle
+        update_username_block: Kullanıcı Adı Kuralını Güncelle
       actions:
         approve_appeal_html: "%{name}, %{target} kullanıcısının yönetim kararına itirazını kabul etti"
         approve_user_html: "%{name}, %{target} konumundan kaydı onayladı"
@@ -255,6 +258,7 @@ tr:
         create_relay_html: "%{name}, %{target} aktarıcısını oluşturdu"
         create_unavailable_domain_html: "%{name}, %{target} alan adına teslimatı durdurdu"
         create_user_role_html: "%{name}, %{target} rolünü oluşturdu"
+        create_username_block_html: "%{name}, %{target} içeren kullanıcı adları için kural ekledi"
         demote_user_html: "%{name}, %{target} kullanıcısını düşürdü"
         destroy_announcement_html: "%{name}, %{target} duyurusunu sildi"
         destroy_canonical_email_block_html: "%{name}, %{target} karmasıyla e-posta engelini kaldırdı"
@@ -268,6 +272,7 @@ tr:
         destroy_status_html: "%{name}, %{target} kullanıcısının gönderisini kaldırdı"
         destroy_unavailable_domain_html: "%{name}, %{target} alan adına teslimatı sürdürdü"
         destroy_user_role_html: "%{name}, %{target} rolünü sildi"
+        destroy_username_block_html: "%{name}, %{target} içeren kullanıcı adları için kural silindi"
         disable_2fa_user_html: "%{name}, %{target} kullanıcısının iki aşamalı doğrulama gereksinimini kapattı"
         disable_custom_emoji_html: "%{name}, %{target} emojisini devre dışı bıraktı"
         disable_relay_html: "%{name}, %{target} aktarıcısını devre dışı bıraktı"
@@ -302,6 +307,7 @@ tr:
         update_report_html: "%{name}, %{target} raporunu güncelledi"
         update_status_html: "%{name}, %{target} kullanıcısının gönderisini güncelledi"
         update_user_role_html: "%{name}, %{target} rolünü değiştirdi"
+        update_username_block_html: "%{name}, %{target} içeren kullanıcı adları için kural güncellendi"
       deleted_account: hesap silindi
       empty: Kayıt bulunamadı.
       filter_by_action: Eyleme göre filtre
@@ -842,6 +848,10 @@ tr:
         all: Herkes için
         disabled: Hiç kimseye
         users: Oturum açan yerel kullanıcılara
+      feed_access:
+        modes:
+          authenticated: Sadece yetkilendirilmiş kullanıcılar
+          public: Herkes
       registrations:
         moderation_recommandation: Lütfen kayıtları herkese açmadan önce yeterli ve duyarlı bir denetleyici ekibine sahip olduğunuzdan emin olun!
         preamble: Sunucunuzda kimin hesap oluşturabileceğini denetleyin.
@@ -1085,6 +1095,25 @@ tr:
           other: Geçen hafta %{count} kişi tarafından kullanıldı
       title: Öneriler ve Öne Çıkanlar
       trending: Öne çıkanlar
+    username_blocks:
+      add_new: Yeni ekle
+      block_registrations: Kayıtları engelle
+      comparison:
+        contains: İçerir
+        equals: Eşit
+      contains_html: "%{string} içerir"
+      created_msg: Kullanıcı adı kuralı başarıyla oluşturuldu
+      delete: Sil
+      edit:
+        title: Kullanıcı adı kuralını düzenle
+      matches_exactly_html: "%{string} değerine eşittir"
+      new:
+        create: Kural oluştur
+        title: Yeni kullanıcı adı kuralı oluştur
+      no_username_block_selected: Hiçbir kullanıcı adı kuralı değiştirilmedi çünkü hiçbiri seçilmedi
+      not_permitted: İzin verilmiyor
+      title: Kullanıcı adı kuralları
+      updated_msg: Kullanıcı adı kuralı başarıyla güncellendi
     warning_presets:
       add_new: Yeni ekle
       delete: Sil
@@ -1349,6 +1378,10 @@ 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
+  emoji_styles:
+    auto: Otomatik
+    native: Yerel
+    twemoji: Twemoji
   errors:
     '400': Gönderdiğiniz istek geçersiz veya hatalı biçimlendirilmiş.
     '403': Bu sayfayı görmek için izniniz yok.
@@ -1567,7 +1600,7 @@ tr:
       password: parola
       sign_in_token: e-posta güvenlik kodu
       webauthn: güvenlik anahtarları
-    description_html: Eğer tanımadığınız bir faaliyet görüyorsanız, parolanızı değiştirmeyi ve iki aşamalı kimlik doğrulamayı etkinleştirmeyi düşünün.
+    description_html: Eğer tanımadığınız bir faaliyet görürseniz, parolanızı değiştirmeyi ve iki aşamalı kimlik doğrulamayı etkinleştirmeyi değerlendirin.
     empty: Kimlik doğrulama geçmişi yok
     failed_sign_in_html: "%{method} yöntemiyle %{ip} (%{browser}) adresinden başarısız oturum açma girişimi"
     successful_sign_in_html: "%{method} yöntemiyle %{ip} (%{browser}) adresinden başarılı oturum açma"
@@ -1658,6 +1691,10 @@ tr:
       title: Yeni bahsetme
     poll:
       subject: Anket %{name} tarafından sonlandırıldı
+    quote:
+      body: "%{name} durumunuzu yeniden paylaştı:"
+      subject: "%{name} gönderini yeniden paylaştı"
+      title: Yeni alıntı
     reblog:
       body: "%{name} durumunuzu yeniden paylaştı:"
       subject: "%{name} durumunuzu yeniden paylaştı"
@@ -1706,6 +1743,9 @@ tr:
       self_vote: Kendi anketlerinizde oy kullanamazsınız
       too_few_options: birden fazla öğeye sahip olmalı
       too_many_options: "%{max} öğeden fazla öğe içeremez"
+    vote: Oyla
+  posting_defaults:
+    explanation: Bu ayarlar, yeni gönderiler oluştururken varsayılan olarak kullanılacaktır, ancak bunları oluşturucu içinde her gönderi için ayrı ayrı düzenleyebilirsiniz.
   preferences:
     other: Diğer
     posting_defaults: Gönderi varsayılanları
@@ -1861,6 +1901,9 @@ tr:
         other: "%{count} videolar"
     boosted_from_html: "%{acct_link} kişisinden yeniden paylaştı"
     content_warning: 'İçerik uyarısı: %{warning}'
+    content_warnings:
+      hide: Gönderiyi gizle
+      show: Daha fazlasını göster
     default_language: Arayüz diliyle aynı
     disallowed_hashtags:
       one: 'izin verilmeyen bir etiket içeriyordu: %{tags}'
@@ -1868,6 +1911,7 @@ tr:
     edited_at_html: "%{date} tarihinde düzenlendi"
     errors:
       in_reply_not_found: Yanıtlamaya çalıştığınız durum yok gibi görünüyor.
+      quoted_status_not_found: Alıntılamaya çalıştığınız gönderi mevcut görünmüyor.
     over_character_limit: "%{max} karakter limiti aşıldı"
     pin_errors:
       direct: Sadece değinilen kullanıcıların görebileceği gönderiler üstte tutulamaz
@@ -1875,18 +1919,17 @@ tr:
       ownership: Başkasının gönderisi sabitlenemez
       reblog: Bir gönderi sabitlenemez
     quote_policies:
-      followers: Takipçiler ve bahsedilen kullanıcılar
-      nobody: Sadece bahsedilen kullanıcılar
+      followers: Sadece takipçiler
+      nobody: Sadece ben
       public: Herkes
     title: '%{name}: "%{quote}"'
     visibilities:
-      direct: Doğrudan
+      direct: Özel değini
       private: Sadece takipçiler
-      private_long: Sadece takipçilerime gönder
       public: Herkese açık
-      public_long: Herkese açık zaman tüneline gönder
-      unlisted: Listelenmemiş
-      unlisted_long: Herkes görebilir fakat herkese açık zaman tünellerinde listelenmez
+      public_long: Mastodon'da olan olmayan herkes
+      unlisted: Sessizce herkese açık
+      unlisted_long: Mastodon arama sonuçlarında, öne çıkanlarda ve herkese açık zaman çizelgesinde gizli
   statuses_cleanup:
     enabled: Eski gönderileri otomatik olarak sil
     enabled_hint: Belirli bir zaman eşiğine ulaşan eski gönderilerinizi, aşağıdaki istisnalara uymadıkları sürece otomatik olarak siler
diff --git a/config/locales/tt.yml b/config/locales/tt.yml
index 7847d636eb5..c929313476d 100644
--- a/config/locales/tt.yml
+++ b/config/locales/tt.yml
@@ -520,7 +520,6 @@ tt:
     edited_at_html: "%{date} көнне төзәтте"
     title: '%{name}: "%{quote}"'
     visibilities:
-      private: Ияртүчеләр генә
       public: Һәркемгә ачык
   statuses_cleanup:
     min_age:
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index dd9e8e826ec..7afa383dc06 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -496,6 +496,15 @@ uk:
       new:
         title: Імпорт блокувань домену
       no_file: Файл не вибрано
+    fasp:
+      debug:
+        callbacks:
+          delete: Видалити
+      providers:
+        delete: Видалити
+        registrations:
+          confirm: Підтвердити
+        save: Зберегти
     follow_recommendations:
       description_html: "<strong>Слідувати рекомендаціям та допомогти новим користувачам швидко знайти цікавий вміст</strong>. Коли користувачі не взаємодіяли з іншими людьми достатньо, щоб сформувати персоналізовані рекомендації, радимо замість цього вказувати ці облікові записи. Вони щоденно переобчислюються з масиву облікових записів з найбільшою кількістю недавніх взаємодій і найбільшою кількістю місцевих підписників розраховується для цієї мови."
       language: Для мови
@@ -1072,6 +1081,11 @@ uk:
           other: Використали %{count} людей за минулий тиждень
       title: Рекомендації та тренди
       trending: Популярне
+    username_blocks:
+      comparison:
+        contains: Містить
+        equals: Дорівнює
+      delete: Видалити
     warning_presets:
       add_new: Додати новий
       delete: Видалити
@@ -1338,6 +1352,9 @@ uk:
     basic_information: Основна інформація
     hint_html: "<strong>Налаштуйте те, що люди бачитимуть у вашому загальнодоступному профілі та поруч із вашими дописами.</strong> Інші люди з більшою ймовірністю підпишуться на вас та взаємодіятимуть з вами, якщо у вас є заповнений профіль та зображення профілю."
     other: Інше
+  emoji_styles:
+    auto: Авто
+    native: Рідний
   errors:
     '400': Ваш запит був недійсним або неправильним.
     '403': У Вас немає доступу до перегляду даної сторінки.
@@ -1625,6 +1642,8 @@ uk:
       title: Нова згадка
     poll:
       subject: Опитування від %{name} завершено
+    quote:
+      body: 'Ваш пост був процитований %{name}:'
     reblog:
       body: "%{name} поширює ваш допис:"
       subject: "%{name} поширив ваш статус"
@@ -1673,6 +1692,9 @@ uk:
       self_vote: Ви не можете голосувати у власному опитуванні
       too_few_options: має містити більше ніж один варіант
       too_many_options: не може мати більше ніж %{max} варіантів
+    vote: Голосувати
+  posting_defaults:
+    explanation: Ці налаштування будуть використовуватися як стандартні при створенні нових записів, але ви можете редагувати їх на кожен пост у цьому редакторі.
   preferences:
     other: Інше
     posting_defaults: Усталені налаштування дописів
@@ -1843,6 +1865,7 @@ uk:
     edited_at_html: Відредаговано %{date}
     errors:
       in_reply_not_found: Допису, на який ви намагаєтеся відповісти, не існує.
+      quoted_status_not_found: Повідомлення, яке ви намагаєтеся цитувати, не існує.
     over_character_limit: перевищено ліміт символів %{max}
     pin_errors:
       direct: Не можливо прикріпити дописи, які видимі лише згаданим користувачам
@@ -1851,13 +1874,7 @@ uk:
       reblog: Не можна закріпити просунутий допис
     title: '%{name}: "%{quote}"'
     visibilities:
-      direct: Особисто
-      private: Для підписників
-      private_long: Показувати тільки підписникам
       public: Для всіх
-      public_long: Показувати всім
-      unlisted: Приховувати зі стрічок
-      unlisted_long: Показувати всім, але не відображати в публічних стрічках
   statuses_cleanup:
     enabled: Автовидалення давніх дописів
     enabled_hint: Автоматично видаляє ваші дописи після досягнення вказаного вікового порогу, якщо вони не є одним з наведених винятків
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index 271683c2389..b38035ab071 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -60,7 +60,7 @@ vi:
       destroyed_msg: Dữ liệu %{username} sẽ được lên lịch xóa ngay bây giờ
       disable: Khóa
       disable_sign_in_token_auth: Tắt xác minh bằng email
-      disable_two_factor_authentication: Vô hiệu hóa xác minh 2 bước
+      disable_two_factor_authentication: Vô hiệu hóa xác thực 2 bước
       disabled: Tạm khóa
       display_name: Biệt danh
       domain: Máy chủ
@@ -187,6 +187,7 @@ vi:
         create_relay: Tạo relay
         create_unavailable_domain: Bỏ liên hợp
         create_user_role: Tạo vai trò
+        create_username_block: Tạo quy tắc tên người dùng
         demote_user: Hạ vai trò
         destroy_announcement: Xóa thông báo
         destroy_canonical_email_block: Bỏ chặn địa chỉ email biến thể
@@ -200,6 +201,7 @@ vi:
         destroy_status: Xóa tút
         destroy_unavailable_domain: Cho phép liên hợp
         destroy_user_role: Xóa vai trò
+        destroy_username_block: Xóa quy tắc tên người dùng
         disable_2fa_user: Vô hiệu hóa 2FA
         disable_custom_emoji: Vô hiệu hóa emoji
         disable_relay: Tắt relay
@@ -234,6 +236,7 @@ vi:
         update_report: Cập nhật báo cáo
         update_status: Cập nhật tút
         update_user_role: Cập nhật vai trò
+        update_username_block: Cập nhật quy tắc tên người dùng
       actions:
         approve_appeal_html: "%{name} đã chấp nhận khiếu nại từ %{target}"
         approve_user_html: "%{name} đã chấp nhận đăng ký từ %{target}"
@@ -252,6 +255,7 @@ vi:
         create_relay_html: "%{name} đã tạo relay %{target}"
         create_unavailable_domain_html: "%{name} đã bỏ liên hợp với máy chủ %{target}"
         create_user_role_html: "%{name} đã tạo vai trò %{target}"
+        create_username_block_html: "%{name} thêm quy tắc cho tên người dùng chứa %{target}"
         demote_user_html: "%{name} đã hạ vai trò của %{target}"
         destroy_announcement_html: "%{name} đã xóa thông báo %{target}"
         destroy_canonical_email_block_html: "%{name} đã bỏ chặn địa chỉ email biến thể %{target}"
@@ -265,7 +269,8 @@ vi:
         destroy_status_html: "%{name} đã xóa tút của %{target}"
         destroy_unavailable_domain_html: "%{name} tiếp tục liên hợp với máy chủ %{target}"
         destroy_user_role_html: "%{name} đã xóa vai trò %{target}"
-        disable_2fa_user_html: "%{name} đã vô hiệu hóa xác minh hai bước của %{target}"
+        destroy_username_block_html: "%{name} xóa quy tắc cho tên người dùng chứa %{target}"
+        disable_2fa_user_html: "%{name} đã vô hiệu hóa xác thực 2 bước của %{target}"
         disable_custom_emoji_html: "%{name} đã ẩn emoji %{target}"
         disable_relay_html: "%{name} đã tắt relay %{target}"
         disable_sign_in_token_auth_user_html: "%{name} đã tắt xác minh email của %{target}"
@@ -299,6 +304,7 @@ vi:
         update_report_html: "%{name} đã cập nhật báo cáo %{target}"
         update_status_html: "%{name} đã cập nhật tút của %{target}"
         update_user_role_html: "%{name} đã cập nhật vai trò %{target}"
+        update_username_block_html: "%{name} đã cập nhật quy tắc cho tên người dùng chứa %{target}"
       deleted_account: tài khoản đã xóa
       empty: Không tìm thấy bản ghi.
       filter_by_action: Theo hành động
@@ -765,7 +771,7 @@ vi:
         manage_taxonomies: Quản lý phân loại
         manage_taxonomies_description: Cho phép đánh giá nội dung xu hướng và cập nhật cài đặt hashtag
         manage_user_access: Quản lý người truy cập
-        manage_user_access_description: Cho phép người dùng tắt xác minh hai bước của người khác, đổi địa chỉ email và đặt lại mật khẩu của họ
+        manage_user_access_description: Cho phép người dùng tắt xác thực 2 bước của người khác, đổi địa chỉ email và đặt lại mật khẩu của họ
         manage_users: Quản lý người
         manage_users_description: Cho phép xem thông tin chi tiết của người khác và thực hiện các hành động kiểm duyệt
         manage_webhooks: Quản lý Webhook
@@ -828,6 +834,10 @@ vi:
         all: Tới mọi người
         disabled: Không ai
         users: Để đăng nhập người cục bộ
+      feed_access:
+        modes:
+          authenticated: Chỉ những người dùng đã xác minh
+          public: Mọi người
       registrations:
         moderation_recommandation: Vui lòng đảm bảo rằng bạn có một đội ngũ kiểm duyệt và phản ứng nhanh trước khi mở đăng ký cho mọi người!
         preamble: Kiểm soát những ai có thể tạo tài khoản trên máy chủ của bạn.
@@ -1067,6 +1077,25 @@ vi:
           other: "%{count} người dùng tuần rồi"
       title: Đề xuất & Xu hướng
       trending: Xu hướng
+    username_blocks:
+      add_new: Thêm mới
+      block_registrations: Cấm đăng ký
+      comparison:
+        contains: Có chứa
+        equals: Tương tự
+      contains_html: Có chứa %{string}
+      created_msg: Đã tạo quy tắc tên người dùng thành công
+      delete: Xóa
+      edit:
+        title: Sửa quy tắc tên người dùng
+      matches_exactly_html: Có chứa %{string}
+      new:
+        create: Tạo quy tắc
+        title: Tạo quy tắc tên người dùng mới
+      no_username_block_selected: Chưa chọn quy tắc tên người dùng nào
+      not_permitted: Cấm
+      title: Quy tắc tên người dùng
+      updated_msg: Đã cập nhật quy tắc tên người dùng thành công
     warning_presets:
       add_new: Thêm mới
       delete: Xóa bỏ
@@ -1330,6 +1359,10 @@ vi:
     basic_information: Thông tin cơ bản
     hint_html: 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à hồ sơ hoàn chỉnh.
     other: Khác
+  emoji_styles:
+    auto: Tự động
+    native: Nguyên bản
+    twemoji: Twemoji
   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.
@@ -1519,16 +1552,23 @@ vi:
       expires_at: Hết hạn
       uses: Sử dụng
     title: Mời bạn bè
+  link_preview:
+    author_html: Bởi %{name}
+    potentially_sensitive_content:
+      action: Nhấn để xem
+      confirm_visit: Bạn có chắc muốn mở liên kết này?
+      hide_button: Ẩn
+      label: Có khả năng là nội dung nhạy cảm
   lists:
     errors:
       limit: Bạn đã đạt đến số lượng danh sách tối đa
   login_activities:
     authentication_methods:
-      otp: xác minh 2 bước
+      otp: xác thực 2 bước
       password: mật khẩu
       sign_in_token: mã an toàn email
       webauthn: khóa bảo mật
-    description_html: Nếu có lần đăng nhập đáng ngờ, hãy đổi ngay mật khẩu và bật xác minh 2 bước.
+    description_html: Nếu có lần đăng nhập đáng ngờ, hãy đổi ngay mật khẩu và bật xác thực 2 bước.
     empty: Không có lịch sử đăng nhập
     failed_sign_in_html: Đăng nhập thất bại bằng %{method} từ %{ip} (%{browser})
     successful_sign_in_html: Đăng nhập bằng %{method} từ %{ip} (%{browser})
@@ -1619,6 +1659,10 @@ vi:
       title: Lượt nhắc mới
     poll:
       subject: Vốt của %{name} đã kết thúc
+    quote:
+      body: 'Tút của bạn được trích dẫn bởi %{name}:'
+      subject: "%{name} vừa trích dẫn tút của bạn"
+      title: Trích dẫn mới
     reblog:
       body: Tút của bạn vừa được %{name} đăng lại
       subject: "%{name} vừa đăng lại tút của bạn"
@@ -1642,7 +1686,7 @@ vi:
           thousand: K
           trillion: T
   otp_authentication:
-    code_hint: Nhập mã được tạo bởi ứng dụng xác minh của bạn để xác nhận
+    code_hint: Nhập mã được tạo bởi ứng dụng xác thực của bạn để xác nhận
     description_html: Bạn sẽ đăng nhập bằng mã token được tạo ra bởi điện thoại của bạn.
     enable: Kích hoạt
     instructions_html: "<strong>Quét mã QR bằng Google Authenticator hoặc một ứng dụng TOTP tương tự trên điện thoại của bạn</strong>. Kể từ bây giờ, ứng dụng đó sẽ tạo những token để bạn đăng nhập."
@@ -1667,6 +1711,9 @@ vi:
       self_vote: Bạn không thể tự vốt cho tút của mình
       too_few_options: phải có nhiều hơn một mục
       too_many_options: tối đa %{max} lựa chọn
+    vote: Vốt
+  posting_defaults:
+    explanation: Các thiết lập này sẽ được sử dụng làm mặc định khi bạn tạo tút mới, nhưng bạn có thể chỉnh sửa cho từng tút khi soạn thảo.
   preferences:
     other: Khác
     posting_defaults: Mặc định cho tút
@@ -1795,7 +1842,7 @@ vi:
     severed_relationships: Quan hệ đứt gãy
     statuses_cleanup: Tự động xóa tút cũ
     strikes: Lần cảnh cáo
-    two_factor_authentication: Xác minh 2 bước
+    two_factor_authentication: Xác thực 2 bước
     webauthn_authentication: Khóa bảo mật
   severed_relationships:
     download: Tải xuống (%{count})
@@ -1819,12 +1866,16 @@ vi:
         other: "%{count} video"
     boosted_from_html: Đã đăng lại từ %{acct_link}
     content_warning: 'Cảnh báo nội dung: %{warning}'
+    content_warnings:
+      hide: Ẩn tút
+      show: Mở rộng
     default_language: Giống giao diện
     disallowed_hashtags:
       other: 'chứa các hashtag bị cấm: %{tags}'
     edited_at_html: Sửa %{date}
     errors:
       in_reply_not_found: Bạn đang trả lời một tút không còn tồn tại.
+      quoted_status_not_found: Bạn đang trích dẫn một tút không còn tồn tại.
     over_character_limit: vượt quá giới hạn %{max} ký tự
     pin_errors:
       direct: Không thể ghim những tút nhắn riêng
@@ -1832,18 +1883,17 @@ vi:
       ownership: Không thể ghim tút của người khác
       reblog: Không thể ghim tút đăng lại
     quote_policies:
-      followers: Người được nhắc đến và người theo dõi
-      nobody: Người được nhắc đến
-      public: Mọi người
+      followers: Chỉ người theo dõi
+      nobody: Chỉ tôi
+      public: Bất cứ ai
     title: '%{name}: "%{quote}"'
     visibilities:
       direct: Nhắn riêng
-      private: Riêng tư
-      private_long: Chỉ người theo dõi mới được xem
+      private: Chỉ người theo dõi
       public: Công khai
-      public_long: Ai cũng có thể thấy
+      public_long: Bất kỳ ai trong và ngoài Mastodon
       unlisted: Hạn chế
-      unlisted_long: Không hiện trên bảng tin máy chủ
+      unlisted_long: Ẩn khỏi kết quả tìm kiếm, xu hướng và dòng thời gian công khai của Mastodon
   statuses_cleanup:
     enabled: Tự động xóa những tút cũ
     enabled_hint: Trừ những ngoại lệ bên dưới
@@ -1911,14 +1961,14 @@ vi:
   two_factor_authentication:
     add: Thêm
     disable: Vô hiệu hóa
-    disabled_success: Đã vô hiệu hóa xác minh 2 bước
+    disabled_success: Đã vô hiệu hóa xác thực 2 bước
     edit: Sửa
-    enabled: Đã kích hoạt xác minh 2 bước
-    enabled_success: Xác minh 2 bước được kích hoạt thành công
+    enabled: Đã kích hoạt xác thực 2 bước
+    enabled_success: Xác thực 2 bước được kích hoạt thành công
     generate_recovery_codes: Tạo mã khôi phục
     lost_recovery_codes: Mã khôi phục cho phép bạn lấy lại quyền truy cập vào tài khoản của mình nếu bạn mất điện thoại. Nếu bạn bị mất mã khôi phục, bạn có thể tạo lại chúng ở đây. Mã khôi phục cũ của bạn sẽ bị vô hiệu.
-    methods: Phương pháp xác minh
-    otp: Ứng dụng xác minh
+    methods: Phương thức xác thực
+    otp: Ứng dụng xác thực
     recovery_codes: Mã khôi phục dự phòng
     recovery_codes_regenerated: Mã khôi phục được phục hồi thành công
     recovery_instructions_html: Nếu bạn bị mất điện thoại, hãy dùng một trong các mã khôi phục bên dưới để lấy lại quyền truy cập vào tài khoản của mình. <strong>Giữ mã khôi phục an toàn</strong>. Ví dụ, bạn có thể in chúng ra giấy.
@@ -1948,13 +1998,13 @@ vi:
       details: 'Chi tiết thông tin đăng nhập:'
       explanation: Ai đó đã cố đăng nhập vào tài khoản của bạn nhưng cung cấp yếu tố xác thực thứ hai không hợp lệ.
       further_actions_html: Nếu không phải bạn, hãy lập tức %{action} vì có thể có rủi ro.
-      subject: Xác minh hai bước thất bại
-      title: Xác minh hai bước thất bại
+      subject: Xác thực 2 bước thất bại
+      title: Xác thực 2 bước thất bại
     suspicious_sign_in:
       change_password: đổi mật khẩu của bạn
       details: 'Chi tiết thông tin đăng nhập:'
       explanation: Chúng tôi phát hiện tài khoản của bạn đăng nhập bất thường từ một địa chỉ IP mới.
-      further_actions_html: Nếu đây không phải là bạn, hãy %{action} lập tức và bật xác minh hai bước để giữ tài khoản được an toàn.
+      further_actions_html: Nếu đây không phải là bạn, hãy %{action} lập tức và bật xác thực 2 bước để giữ tài khoản được an toàn.
       subject: Đăng nhập tài khoản từ địa chỉ IP mới
       title: Lần đăng nhập mới
     terms_of_service_changed:
@@ -2039,7 +2089,7 @@ vi:
   users:
     follow_limit_reached: Bạn chỉ có thể theo dõi tối đa %{limit} người
     go_to_sso_account_settings: Thiết lập tài khoản nhà cung cấp danh tính
-    invalid_otp_token: Mã xác minh 2 bước không hợp lệ
+    invalid_otp_token: Mã xác thực 2 bước không hợp lệ
     otp_lost_help_html: Nếu bạn mất quyền truy cập vào cả hai, bạn có thể đăng nhập bằng %{email}
     rate_limited: Quá nhiều lần thử, vui lòng thử lại sau.
     seamless_external_login: Bạn đã đăng nhập thông qua một dịch vụ bên ngoài, vì vậy mật khẩu và email không khả dụng.
@@ -2067,5 +2117,5 @@ vi:
     nickname_hint: Nhập tên mới cho khóa bảo mật của bạn
     not_enabled: Bạn chưa kích hoạt WebAuthn
     not_supported: Trình duyệt của bạn không hỗ trợ khóa bảo mật
-    otp_required: Để dùng khóa bảo mật, trước tiên hãy kích hoạt xác minh 2 bước.
+    otp_required: Để dùng khóa bảo mật, trước tiên hãy kích hoạt xác thực 2 bước.
     registered_on: Đăng ký vào %{date}
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index ddd2c68113b..60ab656e7dd 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -187,6 +187,7 @@ zh-CN:
         create_relay: 创建中继站
         create_unavailable_domain: 创建不可用域名
         create_user_role: 创建角色
+        create_username_block: 新建用户名规则
         demote_user: 取消管理员
         destroy_announcement: 删除公告
         destroy_canonical_email_block: 解除邮箱封禁
@@ -200,6 +201,7 @@ zh-CN:
         destroy_status: 删除嘟文
         destroy_unavailable_domain: 删除不可用域名
         destroy_user_role: 删除角色
+        destroy_username_block: 删除用户名规则
         disable_2fa_user: 停用双因素认证
         disable_custom_emoji: 禁用自定义表情符号
         disable_relay: 禁用中继站
@@ -234,6 +236,7 @@ zh-CN:
         update_report: 更新举报
         update_status: 更新嘟文
         update_user_role: 更新角色
+        update_username_block: 更新用户名规则
       actions:
         approve_appeal_html: "%{name} 批准了 %{target} 对审核结果的申诉"
         approve_user_html: "%{name} 批准了用户 %{target} 的注册"
@@ -252,6 +255,7 @@ zh-CN:
         create_relay_html: "%{name} 添加了中继站 %{target}"
         create_unavailable_domain_html: "%{name} 停止了向域名 %{target} 的投递"
         create_user_role_html: "%{name} 创建了角色 %{target}"
+        create_username_block_html: "%{name} 新增了有关包含 %{target} 的用户名的规则"
         demote_user_html: "%{name} 撤销了用户 %{target} 的管理权限"
         destroy_announcement_html: "%{name} 删除了公告 %{target}"
         destroy_canonical_email_block_html: "%{name} 解封了 hash 为 %{target} 的邮箱地址"
@@ -265,6 +269,7 @@ zh-CN:
         destroy_status_html: "%{name} 删除了 %{target} 的嘟文"
         destroy_unavailable_domain_html: "%{name} 恢复了向域名 %{target} 的投递"
         destroy_user_role_html: "%{name} 删除了角色 %{target}"
+        destroy_username_block_html: "%{name} 移除了有关包含 %{target} 的用户名的规则"
         disable_2fa_user_html: "%{name} 停用了用户 %{target} 的双因素认证"
         disable_custom_emoji_html: "%{name} 停用了自定义表情 %{target}"
         disable_relay_html: "%{name} 停用了中继站 %{target}"
@@ -299,6 +304,7 @@ zh-CN:
         update_report_html: "%{name} 更新了举报 %{target}"
         update_status_html: "%{name} 刷新了 %{target} 的嘟文"
         update_user_role_html: "%{name} 更改了角色 %{target}"
+        update_username_block_html: "%{name} 更新了有关包含 %{target} 的用户名的规则"
       deleted_account: 账号已注销
       empty: 没有找到日志
       filter_by_action: 根据操作筛选
@@ -317,7 +323,7 @@ zh-CN:
         title: 新公告
       preview:
         disclaimer: 由于用户无法选择退出，电子邮件通知应仅限于重要公告，例如个人数据泄露或服务器关闭通知。
-        explanation_html: 此电子邮件将发送给 <strong>%{display_count} 用户</strong>。电子邮件将包含以下文本：
+        explanation_html: 此电子邮件将发送给 <strong>%{display_count} 名用户</strong>。电子邮件将包含以下文本：
         title: 预览公告通知
       publish: 发布
       published_msg: 公告已发布！
@@ -493,12 +499,14 @@ zh-CN:
         registration_requested: 已申请注册
         registrations:
           confirm: 确认
+          description: 你收到了来自FASP的注册。若你没有发起这个请求，请拒绝。若你发起了这个请求，请仔细比对名称和密钥指纹后再确认注册。
           reject: 拒绝
           title: 确认FASP注册
         save: 保存
         select_capabilities: 选择能力
         sign_in: 登录
         status: 状态
+        title: 联邦宇宙辅助服务提供商（Fediverse Auxiliary Service Providers）
       title: FASP
     follow_recommendations:
       description_html: "<strong>“关注推荐”可帮助新用户快速找到有趣的内容</strong>。 当用户与他人的互动不足以形成个性化的建议时，就会推荐关注这些账号。推荐会每日更新，基于选定语言的近期最高互动数和最多本站关注者数综合评估得出。"
@@ -566,7 +574,11 @@ zh-CN:
         limited: 受限的
         title: 审核
       moderation_notes:
+        create: 新建管理员备注
+        created_msg: 实例管理员备注创建成功！
         description_html: 查看备注或向其他管理员留言
+        destroyed_msg: 实例管理员备注删除成功！
+        placeholder: 有关此实例的信息、已采取的行动，或任何能帮助您将来管理此实例的事项。
         title: 审核注意事项
       private_comment: 私密评论
       public_comment: 公开评论
@@ -783,6 +795,7 @@ zh-CN:
       title: 实例规则
       translation: 翻译
       translations: 翻译
+      translations_explanation: 你可以选择性地为规则添加翻译。没有翻译版本则将显示默认值。 请确保任何提供的翻译都与默认值内容同步。
     settings:
       about:
         manage_rules: 管理服务器规则
@@ -821,6 +834,10 @@ zh-CN:
         all: 对所有人
         disabled: 不对任何人
         users: 对已登录的本站用户
+      feed_access:
+        modes:
+          authenticated: 仅已登录用户
+          public: 所有人
       registrations:
         moderation_recommandation: 在向所有人开放注册之前，请确保你拥有一个人手足够且反应迅速的管理团队！
         preamble: 控制谁可以在你的服务器上创建账号。
@@ -898,6 +915,8 @@ zh-CN:
     system_checks:
       database_schema_check:
         message_html: 有待处理的数据库迁移。请运行它们以确保应用程序正常运行。
+      elasticsearch_analysis_index_mismatch:
+        message_html: Elasticsearch索引分析器设置已过期。请运行<code>tootctl search deploy --only=%{value}</code>。
       elasticsearch_health_red:
         message_html: Elasticsearch 集群状态不健康（红色），搜索功能不可用
       elasticsearch_health_yellow:
@@ -1058,6 +1077,25 @@ zh-CN:
           other: 过去一周内被 %{count} 个人使用过
       title: 推荐与热门
       trending: 当前热门
+    username_blocks:
+      add_new: 新建
+      block_registrations: 禁止注册
+      comparison:
+        contains: 包含
+        equals: 等于
+      contains_html: 包含%{string}
+      created_msg: 成功创建用户名规则
+      delete: 删除
+      edit:
+        title: 编辑用户名规则
+      matches_exactly_html: 等于%{string}
+      new:
+        create: 新建规则
+        title: 新建用户名规则
+      no_username_block_selected: 因为没有选择任何用户名规则，没有任何更改发生
+      not_permitted: 不允许
+      title: 用户名规则
+      updated_msg: 成功更新用户名规则
     warning_presets:
       add_new: 添加新条目
       delete: 删除
@@ -1321,6 +1359,10 @@ zh-CN:
     basic_information: 基本信息
     hint_html: "<strong>自定义公开资料和嘟文旁边显示的内容。</strong>当你填写完整的个人资料并设置了头像时，其他人更有可能关注你并与你互动。"
     other: 其他
+  emoji_styles:
+    auto: 自动
+    native: 原生
+    twemoji: Twemoji
   errors:
     '400': 你提交的请求无效或格式不正确。
     '403': 你没有访问此页面的权限。
@@ -1510,6 +1552,13 @@ zh-CN:
       expires_at: 失效时间
       uses: 已使用次数
     title: 邀请用户
+  link_preview:
+    author_html: 来自 %{name}
+    potentially_sensitive_content:
+      action: 点击查看
+      confirm_visit: 您确定要打开此链接吗？
+      hide_button: 隐藏
+      label: 可能为敏感内容
   lists:
     errors:
       limit: 你已达到列表数量的上限
@@ -1610,6 +1659,10 @@ zh-CN:
       title: 新的提及
     poll:
       subject: "%{name} 创建的一个投票已经结束"
+    quote:
+      body: 你的嘟文被 %{name} 引用了：
+      subject: "%{name} 引用了你的嘟文"
+      title: 新引用
     reblog:
       body: 你的嘟文被 %{name} 转嘟了：
       subject: "%{name} 转嘟了你的嘟文"
@@ -1658,6 +1711,9 @@ zh-CN:
       self_vote: 你不能参与自己发起的投票
       too_few_options: 至少需要两个选项
       too_many_options: 不能超过 %{max} 项
+    vote: 投票
+  posting_defaults:
+    explanation: 这些设置会在您撰写新嘟文时作为默认值应用，但每篇嘟文的设置也可以在编辑器处单独修改。
   preferences:
     other: 其他
     posting_defaults: 发布默认值
@@ -1810,12 +1866,16 @@ zh-CN:
         other: "%{count} 段视频"
     boosted_from_html: 转嘟自 %{acct_link}
     content_warning: 内容警告：%{warning}
+    content_warnings:
+      hide: 隐藏嘟文
+      show: 显示更多
     default_language: 与界面显示语言相同
     disallowed_hashtags:
       other: 包含以下被禁止的话题：%{tags}
     edited_at_html: 编辑于 %{date}
     errors:
       in_reply_not_found: 你回复的嘟文似乎不存在
+      quoted_status_not_found: 您尝试引用的嘟文似乎不存在。
     over_character_limit: 超过了 %{max} 字的限制
     pin_errors:
       direct: 仅对被提及的用户可见的帖子不能被置顶
@@ -1823,18 +1883,17 @@ zh-CN:
       ownership: 不能置顶别人的嘟文
       reblog: 不能置顶转嘟
     quote_policies:
-      followers: 关注者和提及的用户
-      nobody: 仅提及的用户
-      public: 所有人
+      followers: 仅关注者
+      nobody: 仅限自己
+      public: 任何人
     title: "%{name}：“%{quote}”"
     visibilities:
-      direct: 私信
+      direct: 私下提及
       private: 仅关注者
-      private_long: 只有关注你的用户能看到
       public: 公开
-      public_long: 主页与列表
+      public_long: 任何人（无论是否注册了 Mastodon）
       unlisted: 悄悄公开
-      unlisted_long: 对所有人可见，但不出现在公共时间线上
+      unlisted_long: 不显示在Mastodon的搜索结果、热门趋势、公共时间线上
   statuses_cleanup:
     enabled: 自动删除旧嘟文
     enabled_hint: 自动删除你发布的超过指定期限的嘟文，除非满足下列条件之一
@@ -1880,8 +1939,8 @@ zh-CN:
   terms_of_service:
     title: 服务条款
   terms_of_service_interstitial:
-    future_preamble_html: 我们正修改服务条款，将在<strong>%{date}</strong>生效。我们建议您查看更新后的条款。
-    past_preamble_html: 自你上次访问起，我们改变了我们的服务条款。我们鼓励你查看更新后的条款。
+    future_preamble_html: 我们将更改部分服务条款，这些更改将在<strong>%{date}</strong>生效。我们建议您查看更新后的条款。
+    past_preamble_html: 自你上次访问起，我们更改了一些服务条款。我们建议你查看更新后的条款。
     review_link: 查看服务条款
     title: "%{domain} 更新了服务条款"
   themes:
diff --git a/config/locales/zh-HK.yml b/config/locales/zh-HK.yml
index 1a41ac7e6cd..c0e6029819f 100644
--- a/config/locales/zh-HK.yml
+++ b/config/locales/zh-HK.yml
@@ -1633,13 +1633,8 @@ zh-HK:
       reblog: 不能置頂轉推
     title: "%{name}：「%{quote}」"
     visibilities:
-      direct: 私人訊息
-      private: 關注者觀看
-      private_long: 只有關注你的人能看到
+      direct: 私訊
       public: 公開
-      public_long: 所有人都能看到
-      unlisted: 公開，但不在公共時間軸顯示
-      unlisted_long: 所有人都能看到，但不在公共時間軸（本站時間軸、跨站時間軸）顯示
   statuses_cleanup:
     enabled: 自動刪除舊嘟文
     enabled_hint: 當您的嘟文達到指定的時間門檻後，自動刪除嘟文，除非他們符合其中以下例外條件之一
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 7c895d6794d..0a0c3a1ee56 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -187,6 +187,7 @@ zh-TW:
         create_relay: 新增中繼
         create_unavailable_domain: 新增無法存取的網域
         create_user_role: 新增角色
+        create_username_block: 新增使用者名稱規則
         demote_user: 將用戶降級
         destroy_announcement: 刪除公告
         destroy_canonical_email_block: 刪除電子郵件封鎖
@@ -200,6 +201,7 @@ zh-TW:
         destroy_status: 刪除狀態
         destroy_unavailable_domain: 刪除無法存取的網域
         destroy_user_role: 移除角色
+        destroy_username_block: 刪除使用者名稱規則
         disable_2fa_user: 停用兩階段驗證
         disable_custom_emoji: 停用自訂 emoji 表情符號
         disable_relay: 停用中繼
@@ -234,6 +236,7 @@ zh-TW:
         update_report: 更新檢舉報告
         update_status: 更新狀態
         update_user_role: 更新角色
+        update_username_block: 變更使用者名稱規則
       actions:
         approve_appeal_html: "%{name} 已批准來自 %{target} 的審核決定申訴"
         approve_user_html: "%{name} 已批准自 %{target} 而來的註冊"
@@ -252,6 +255,7 @@ zh-TW:
         create_relay_html: "%{name} 已新增中繼 %{target}"
         create_unavailable_domain_html: "%{name} 停止發送至網域 %{target}"
         create_user_role_html: "%{name} 已新增 %{target} 角色"
+        create_username_block_html: "%{name} 已新增使用者名稱包含 %{target} 之規則"
         demote_user_html: "%{name} 將使用者 %{target} 降級"
         destroy_announcement_html: "%{name} 已刪除公告 %{target}"
         destroy_canonical_email_block_html: "%{name} 已解除封鎖 hash 為 %{target} 之電子郵件"
@@ -265,6 +269,7 @@ zh-TW:
         destroy_status_html: "%{name} 已刪除 %{target} 的嘟文"
         destroy_unavailable_domain_html: "%{name} 已恢復對網域 %{target} 的發送"
         destroy_user_role_html: "%{name} 已刪除 %{target} 角色"
+        destroy_username_block_html: "%{name} 已移除使用者名稱包含 %{target} 之規則"
         disable_2fa_user_html: "%{name} 已停用使用者 %{target} 的兩階段驗證 (2FA) "
         disable_custom_emoji_html: "%{name} 已停用自訂 emoji 表情符號 %{target}"
         disable_relay_html: "%{name} 已停用中繼 %{target}"
@@ -299,6 +304,7 @@ zh-TW:
         update_report_html: "%{name} 已更新 %{target} 的檢舉"
         update_status_html: "%{name} 已更新 %{target} 的嘟文"
         update_user_role_html: "%{name} 已變更 %{target} 角色"
+        update_username_block_html: "%{name} 已變更使用者名稱包含 %{target} 之規則"
       deleted_account: 已刪除帳號
       empty: 找不到 log
       filter_by_action: 按動作過濾
@@ -830,6 +836,10 @@ zh-TW:
         all: 至任何人
         disabled: 至沒有人
         users: 套用至所有登入的本站使用者
+      feed_access:
+        modes:
+          authenticated: 僅限已登入之使用者
+          public: 任何人
       registrations:
         moderation_recommandation: 對所有人開放註冊之前，請確保您有人手充足且反應靈敏的管理員團隊！
         preamble: 控制誰能於您伺服器上建立帳號。
@@ -1069,6 +1079,25 @@ zh-TW:
           other: 上週被 %{count} 個人使用
       title: 推薦內容與熱門趨勢
       trending: 熱門
+    username_blocks:
+      add_new: 新增
+      block_registrations: 禁止註冊
+      comparison:
+        contains: 包含
+        equals: 等於
+      contains_html: 包含 %{string}
+      created_msg: 已成功新增使用者名稱規則
+      delete: 刪除
+      edit:
+        title: 編輯使用者名稱規則
+      matches_exactly_html: 等於 %{string}
+      new:
+        create: 新增規則
+        title: 新增使用者名稱規則
+      no_username_block_selected: 因未選取任何使用者名稱規則，所以什麼事都沒發生
+      not_permitted: 不允許
+      title: 使用者名稱規則
+      updated_msg: 已成功變更使用者名稱規則
     warning_presets:
       add_new: 新增
       delete: 刪除
@@ -1332,6 +1361,10 @@ zh-TW:
     basic_information: 基本資訊
     hint_html: "<strong>自訂人們能於您個人檔案及嘟文旁所見之內容。</strong>當您完成填寫個人檔案及設定大頭貼後，其他人們比較願意跟隨您並與您互動。"
     other: 其他
+  emoji_styles:
+    auto: 自動
+    native: 原生風格
+    twemoji: Twemoji
   errors:
     '400': 您所送出的請求無效或格式不正確。
     '403': 您沒有檢視這個頁面的權限。
@@ -1521,6 +1554,13 @@ zh-TW:
       expires_at: 失效時間
       uses: 已使用次數
     title: 邀請使用者
+  link_preview:
+    author_html: 來自 %{name}
+    potentially_sensitive_content:
+      action: 點擊以顯示
+      confirm_visit: 您確定要開啟此連結嗎？
+      hide_button: 隱藏
+      label: 可能為敏感內容
   lists:
     errors:
       limit: 您所建立之列表數量已達上限
@@ -1621,6 +1661,10 @@ zh-TW:
       title: 新的提及
     poll:
       subject: 由 %{name} 發起的投票已結束
+    quote:
+      body: 您的嘟文被 %{name} 引用：
+      subject: "%{name} 已引用您的嘟文"
+      title: 新引用
     reblog:
       body: 您的嘟文被 %{name} 轉嘟：
       subject: "%{name} 已轉嘟您的嘟文"
@@ -1669,6 +1713,9 @@ zh-TW:
       self_vote: 您無法於您的嘟文投票
       too_few_options: 必須包含至少一個項目
       too_many_options: 不能包含多於 %{max} 個項目
+    vote: 投票
+  posting_defaults:
+    explanation: 這些設定將作為您建立新嘟文時之預設值，但您能於編輯器中編輯個別嘟文之設定。
   preferences:
     other: 其他
     posting_defaults: 嘟文預設值
@@ -1821,12 +1868,16 @@ zh-TW:
         other: "%{count} 段影片"
     boosted_from_html: 轉嘟自 %{acct_link}
     content_warning: 內容警告： %{warning}
+    content_warnings:
+      hide: 隱藏嘟文
+      show: 顯示更多
     default_language: 與介面語言相同
     disallowed_hashtags:
       other: 含有不得使用的標籤： %{tags}
     edited_at_html: 編輯於 %{date}
     errors:
-      in_reply_not_found: 您嘗試回覆的嘟文看起來不存在。
+      in_reply_not_found: 您嘗試回覆之嘟文似乎不存在。
+      quoted_status_not_found: 您嘗試引用之嘟文似乎不存在。
     over_character_limit: 已超過 %{max} 字的限制
     pin_errors:
       direct: 無法釘選只有僅提及使用者可見之嘟文
@@ -1834,18 +1885,17 @@ zh-TW:
       ownership: 不能釘選他人的嘟文
       reblog: 不能釘選轉嘟
     quote_policies:
-      followers: 跟隨者與已提及使用者
-      nobody: 僅限已提及使用者
-      public: 任何人
+      followers: 僅限跟隨者
+      nobody: 僅有我
+      public: 所有人
     title: "%{name}：「%{quote}」"
     visibilities:
       direct: 私訊
       private: 僅限跟隨者
-      private_long: 只有跟隨您的人能看到
       public: 公開
-      public_long: 所有人都能看到
+      public_long: 所有人 (無論在 Mastodon 上與否)
       unlisted: 不於公開時間軸顯示
-      unlisted_long: 所有人都能看到，但不會出現在公開時間軸上
+      unlisted_long: 不顯示於 Mastodon 之搜尋結果、熱門趨勢、及公開時間軸上
   statuses_cleanup:
     enabled: 自動刪除舊嘟文
     enabled_hint: 一旦達到指定的保存期限，就會自動刪除您的嘟文，除非該嘟文符合下列例外
diff --git a/config/mastodon.yml b/config/mastodon.yml
index 31c2b2b7854..4585e1f2aee 100644
--- a/config/mastodon.yml
+++ b/config/mastodon.yml
@@ -2,14 +2,14 @@
 shared:
   experimental_features: <%= ENV.fetch('EXPERIMENTAL_FEATURES', nil) %>
   limited_federation_mode: <%= (ENV.fetch('LIMITED_FEDERATION_MODE', nil) || ENV.fetch('WHITELIST_MODE', nil)) == 'true' %>
-  self_destruct_value: <%= ENV.fetch('SELF_DESTRUCT', nil) %>
-  software_update_url: <%= ENV.fetch('UPDATE_CHECK_URL', 'https://api.joinmastodon.org/update-check') %>
+  self_destruct_value: <%= ENV.fetch('SELF_DESTRUCT', nil)&.to_json %>
+  software_update_url: <%= ENV.fetch('UPDATE_CHECK_URL', 'https://api.joinmastodon.org/update-check')&.to_json %>
   source:
-    base_url: <%= ENV.fetch('SOURCE_BASE_URL', nil) %>
+    base_url: <%= ENV.fetch('SOURCE_BASE_URL', nil)&.to_json %>
     repository: <%= ENV.fetch('GITHUB_REPOSITORY', 'mastodon/mastodon') %>
     tag: <%= ENV.fetch('SOURCE_TAG', nil) %>
   version:
-    metadata: <%= ENV.fetch('MASTODON_VERSION_METADATA', nil) %>
-    prerelease: <%= ENV.fetch('MASTODON_VERSION_PRERELEASE', nil) %>
+    metadata: <%= ENV.fetch('MASTODON_VERSION_METADATA', nil)&.to_json %>
+    prerelease: <%= ENV.fetch('MASTODON_VERSION_PRERELEASE', nil)&.to_json %>
 test:
   experimental_features: <%= [ENV.fetch('EXPERIMENTAL_FEATURES', nil), 'testing_only'].compact.join(',') %>
diff --git a/config/navigation.rb b/config/navigation.rb
index d60f8cbc5b3..4829f9efd2d 100644
--- a/config/navigation.rb
+++ b/config/navigation.rb
@@ -16,6 +16,7 @@ SimpleNavigation::Configuration.run do |navigation|
 
     n.item :preferences, safe_join([material_symbol('settings'), t('settings.preferences')]), settings_preferences_path, if: -> { current_user.functional? && !self_destruct } do |s|
       s.item :appearance, safe_join([material_symbol('computer'), t('settings.appearance')]), settings_preferences_appearance_path
+      s.item :posting_defaults, safe_join([material_symbol('edit_square'), t('preferences.posting_defaults')]), settings_preferences_posting_defaults_path
       s.item :notifications, safe_join([material_symbol('mail'), t('settings.notifications')]), settings_preferences_notifications_path
       s.item :other, safe_join([material_symbol('tune'), t('preferences.other')]), settings_preferences_other_path
     end
@@ -59,6 +60,7 @@ SimpleNavigation::Configuration.run do |navigation|
         current_user.can?(:manage_federation)
       }
       s.item :email_domain_blocks, safe_join([material_symbol('mail'), t('admin.email_domain_blocks.title')]), admin_email_domain_blocks_path, highlights_on: %r{/admin/email_domain_blocks}, if: -> { current_user.can?(:manage_blocks) }
+      s.item :username_blocks, safe_join([material_symbol('supervised_user_circle_off'), t('admin.username_blocks.title')]), admin_username_blocks_path, highlights_on: %r{/admin/username_blocks}, if: -> { current_user.can?(:manage_blocks) }
       s.item :ip_blocks, safe_join([material_symbol('hide_source'), t('admin.ip_blocks.title')]), admin_ip_blocks_path, highlights_on: %r{/admin/ip_blocks}, if: -> { current_user.can?(:manage_blocks) }
       s.item :action_logs, safe_join([material_symbol('list'), t('admin.action_logs.title')]), admin_action_logs_path, if: -> { current_user.can?(:view_audit_log) }
     end
diff --git a/config/puma.rb b/config/puma.rb
index 16c481a2aee..d34c14b425d 100644
--- a/config/puma.rb
+++ b/config/puma.rb
@@ -27,7 +27,7 @@ if ENV['MASTODON_PROMETHEUS_EXPORTER_ENABLED'] == 'true'
     end
   end
 
-  on_worker_boot do
+  before_worker_boot do
     # Ruby process metrics (memory, GC, etc)
     PrometheusExporter::Instrumentation::Process.start(type: 'puma')
 
@@ -44,7 +44,7 @@ if ENV['MASTODON_PROMETHEUS_EXPORTER_ENABLED'] == 'true'
   end
 end
 
-on_worker_boot do
+before_worker_boot do
   ActiveSupport.on_load(:active_record) do
     ActiveRecord::Base.establish_connection
   end
diff --git a/config/routes.rb b/config/routes.rb
index 2fff44851e0..412372600ef 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -95,7 +95,20 @@ Rails.application.routes.draw do
 
   get '/authorize_follow', to: redirect { |_, request| "/authorize_interaction?#{request.params.to_query}" }
 
-  resources :accounts, path: 'users', only: [:show], param: :username do
+  concern :account_resources do
+    resources :followers, only: [:index], controller: :follower_accounts
+    resources :following, only: [:index], controller: :following_accounts
+
+    scope module: :activitypub do
+      resource :outbox, only: [:show]
+      resource :inbox, only: [:create]
+      resources :collections, only: [:show]
+      resource :followers_synchronization, only: [:show]
+      resources :quote_authorizations, only: [:show]
+    end
+  end
+
+  resources :accounts, path: 'users', only: [:show], param: :username, concerns: :account_resources do
     resources :statuses, only: [:show] do
       member do
         get :activity
@@ -106,19 +119,28 @@ Rails.application.routes.draw do
       resources :likes, only: [:index], module: :activitypub
       resources :shares, only: [:index], module: :activitypub
     end
+  end
 
-    resources :followers, only: [:index], controller: :follower_accounts
-    resources :following, only: [:index], controller: :following_accounts
+  scope path: 'ap', as: 'ap' do
+    resources :accounts, path: 'users', only: [:show], param: :id, concerns: :account_resources do
+      resources :statuses, only: [:show] do
+        member do
+          get :activity
+        end
 
-    scope module: :activitypub do
-      resource :outbox, only: [:show]
-      resource :inbox, only: [:create]
-      resources :collections, only: [:show]
-      resource :followers_synchronization, only: [:show]
+        resources :replies, only: [:index], module: :activitypub
+        resources :likes, only: [:index], module: :activitypub
+        resources :shares, only: [:index], module: :activitypub
+      end
     end
   end
 
   resource :inbox, only: [:create], module: :activitypub
+  resources :contexts, only: [:show], module: :activitypub, constraints: { id: /[0-9]+-[0-9]+/ } do
+    member do
+      get :items
+    end
+  end
 
   constraints(encoded_path: /%40.*/) do
     get '/:encoded_path', to: redirect { |params|
diff --git a/config/routes/admin.rb b/config/routes/admin.rb
index 3d9f24ae838..97f84da44e7 100644
--- a/config/routes/admin.rb
+++ b/config/routes/admin.rb
@@ -230,4 +230,10 @@ namespace :admin do
   end
 
   resources :software_updates, only: [:index]
+
+  resources :username_blocks, except: [:show, :destroy] do
+    collection do
+      post :batch
+    end
+  end
 end
diff --git a/config/routes/api.rb b/config/routes/api.rb
index 4040a4350fa..34b2e255da6 100644
--- a/config/routes/api.rb
+++ b/config/routes/api.rb
@@ -18,6 +18,12 @@ namespace :api, format: false do
         resource :reblog, only: :create
         post :unreblog, to: 'reblogs#destroy'
 
+        resources :quotes, only: :index do
+          member do
+            post :revoke
+          end
+        end
+
         resource :favourite, only: :create
         post :unfavourite, to: 'favourites#destroy'
 
@@ -33,6 +39,8 @@ namespace :api, format: false do
         resource :history, only: :show
         resource :source, only: :show
 
+        resource :interaction_policy, only: :update
+
         post :translate, to: 'translations#create'
       end
 
@@ -361,10 +369,6 @@ namespace :api, format: false do
   namespace :web do
     resource :settings, only: [:update]
     resources :embeds, only: [:show]
-    resources :push_subscriptions, only: [:create, :destroy] do
-      member do
-        put :update
-      end
-    end
+    resources :push_subscriptions, only: [:create, :destroy, :update]
   end
 end
diff --git a/config/routes/settings.rb b/config/routes/settings.rb
index cefa24316db..f5869a767c2 100644
--- a/config/routes/settings.rb
+++ b/config/routes/settings.rb
@@ -9,6 +9,7 @@ namespace :settings do
 
   namespace :preferences do
     resource :appearance, only: [:show, :update], controller: :appearance
+    resource :posting_defaults, only: [:show, :update], controller: :posting_defaults
     resource :notifications, only: [:show, :update]
     resource :other, only: [:show, :update], controller: :other
   end
diff --git a/config/settings.yml b/config/settings.yml
index ba81fcb8c6a..c6478e57d46 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -12,7 +12,10 @@ defaults: &defaults
   registrations_mode: 'none'
   profile_directory: true
   closed_registrations_message: ''
-  timeline_preview: true
+  local_live_feed_access: 'public'
+  remote_live_feed_access: 'public'
+  local_topic_feed_access: 'public'
+  remote_topic_feed_access: 'public'
   show_staff_badge: true
   preview_sensitive_media: false
   noindex: false
@@ -20,28 +23,6 @@ defaults: &defaults
   trends: true
   trends_as_landing_page: true
   trendable_by_default: false
-  reserved_usernames:
-    - abuse
-    - account
-    - accounts
-    - admin
-    - administration
-    - administrator
-    - admins
-    - help
-    - helpdesk
-    - instance
-    - mod
-    - moderator
-    - moderators
-    - mods
-    - owner
-    - root
-    - security
-    - server
-    - staff
-    - support
-    - webmaster
   disallowed_hashtags: # space separated string or list of hashtags without the hash
   bootstrap_timeline_accounts: ''
   activity_api_enabled: true
@@ -51,7 +32,7 @@ defaults: &defaults
   require_invite_text: false
   backups_retention_period: 7
   captcha_enabled: false
-  allow_referer_origin: false
+  allow_referrer_origin: false
 
 development:
   <<: *defaults
diff --git a/config/sidekiq.yml b/config/sidekiq.yml
index 97eaa55ce3b..fb85343d942 100644
--- a/config/sidekiq.yml
+++ b/config/sidekiq.yml
@@ -70,5 +70,5 @@
       queue: scheduler
     fasp_follow_recommendation_cleanup_scheduler:
       interval: 1 day
-      class: Scheduler::Fasp::FollowRecommendationsScheduler
+      class: Scheduler::Fasp::FollowRecommendationCleanupScheduler
       queue: scheduler
diff --git a/config/translation.yml b/config/translation.yml
index e074c5d0f22..75754928ee8 100644
--- a/config/translation.yml
+++ b/config/translation.yml
@@ -1,7 +1,7 @@
 shared:
   deepl:
-    api_key: <%= ENV.fetch('DEEPL_API_KEY', nil) %>
+    api_key: <%= ENV.fetch('DEEPL_API_KEY', nil)&.to_json %>
     plan: <%= ENV.fetch('DEEPL_PLAN', 'free') %>
   libre_translate:
-    api_key: <%= ENV.fetch('LIBRE_TRANSLATE_API_KEY', nil) %>
-    endpoint: <%= ENV.fetch('LIBRE_TRANSLATE_ENDPOINT', nil) %>
+    api_key: <%= ENV.fetch('LIBRE_TRANSLATE_API_KEY', nil)&.to_json %>
+    endpoint: <%= ENV.fetch('LIBRE_TRANSLATE_ENDPOINT', nil)&.to_json %>
diff --git a/config/vapid.yml b/config/vapid.yml
index c3ee806fd6a..49d8cd0de80 100644
--- a/config/vapid.yml
+++ b/config/vapid.yml
@@ -13,5 +13,5 @@
 # https://rossta.net/blog/using-the-web-push-api-with-vapid.html
 #
 shared:
-  private_key: <%= ENV.fetch('VAPID_PRIVATE_KEY', nil) %>
-  public_key: <%= ENV.fetch('VAPID_PUBLIC_KEY', nil) %>
+  private_key: <%= ENV.fetch('VAPID_PRIVATE_KEY', nil)&.to_json %>
+  public_key: <%= ENV.fetch('VAPID_PUBLIC_KEY', nil)&.to_json %>
diff --git a/config/vite/plugin-assets-manifest.ts b/config/vite/plugin-assets-manifest.ts
new file mode 100644
index 00000000000..3d465549cea
--- /dev/null
+++ b/config/vite/plugin-assets-manifest.ts
@@ -0,0 +1,84 @@
+// Heavily inspired by https://github.com/ElMassimo/vite_ruby
+
+import { createHash } from 'node:crypto';
+import fs from 'node:fs/promises';
+import path from 'node:path';
+
+import glob from 'fast-glob';
+import type { Plugin } from 'vite';
+
+interface AssetManifestChunk {
+  file: string;
+  integrity: string;
+}
+
+const ALGORITHM = 'sha384';
+
+export function MastodonAssetsManifest(): Plugin {
+  let manifest: string | boolean = true;
+  let jsRoot = '';
+
+  return {
+    name: 'mastodon-assets-manifest',
+    applyToEnvironment(environment) {
+      return !!environment.config.build.manifest;
+    },
+    configResolved(resolvedConfig) {
+      manifest = resolvedConfig.build.manifest;
+      jsRoot = resolvedConfig.root;
+    },
+    async generateBundle() {
+      // Glob all assets and return an array of absolute paths.
+      const assetPaths = await glob('{fonts,icons,images}/**/*', {
+        cwd: jsRoot,
+        absolute: true,
+      });
+
+      const assetManifest: Record<string, AssetManifestChunk> = {};
+      const excludeExts = ['', '.md'];
+      for (const file of assetPaths) {
+        // Exclude files like markdown or README files with no extension.
+        const ext = path.extname(file);
+        if (excludeExts.includes(ext)) {
+          continue;
+        }
+
+        // Read the file and emit it as an asset.
+        const contents = await fs.readFile(file);
+        const ref = this.emitFile({
+          name: path.basename(file),
+          type: 'asset',
+          source: contents,
+        });
+        const hashedFilename = this.getFileName(ref);
+
+        // With the emitted file information, hash the contents and store in manifest.
+        const name = path.relative(jsRoot, file);
+        const hash = createHash(ALGORITHM)
+          .update(contents)
+          .digest()
+          .toString('base64');
+        assetManifest[name] = {
+          file: hashedFilename,
+          integrity: `${ALGORITHM}-${hash}`,
+        };
+      }
+
+      if (Object.keys(assetManifest).length === 0) {
+        console.warn('Asset manifest is empty');
+        return;
+      }
+
+      // Get manifest location and emit the manifest.
+      const manifestDir =
+        typeof manifest === 'string' ? path.dirname(manifest) : '.vite';
+      const fileName = `${manifestDir}/manifest-assets.json`;
+
+      this.emitFile({
+        fileName,
+        type: 'asset',
+        source: JSON.stringify(assetManifest, null, 2),
+      });
+    },
+  };
+}
diff --git a/config/vite/plugin-mastodon-themes.ts b/config/vite/plugin-mastodon-themes.ts
index 53281e29f41..251d2d8e724 100644
--- a/config/vite/plugin-mastodon-themes.ts
+++ b/config/vite/plugin-mastodon-themes.ts
@@ -22,7 +22,21 @@ export function MastodonThemes(): Plugin {
       projectRoot = userConfig.envDir;
       jsRoot = userConfig.root;
 
-      const entrypoints: Record<string, string> = {};
+      let entrypoints: Record<string, string> = {};
+
+      const existingInputs = userConfig.build?.rollupOptions?.input;
+
+      if (typeof existingInputs === 'string') {
+        entrypoints[path.basename(existingInputs)] = existingInputs;
+      } else if (Array.isArray(existingInputs)) {
+        for (const input of existingInputs) {
+          if (typeof input === 'string') {
+            entrypoints[path.basename(input)] = input;
+          }
+        }
+      } else if (typeof existingInputs === 'object') {
+        entrypoints = existingInputs;
+      }
 
       // Get all files mentioned in the themes.yml file.
       const themes = await loadThemesFromConfig(projectRoot);
diff --git a/db/migrate/20241014010506_remove_duplicate_indexes.rb b/db/migrate/20241014010506_remove_duplicate_indexes.rb
index 50e0e6ffcfc..0c71936c431 100644
--- a/db/migrate/20241014010506_remove_duplicate_indexes.rb
+++ b/db/migrate/20241014010506_remove_duplicate_indexes.rb
@@ -2,9 +2,11 @@
 
 class RemoveDuplicateIndexes < ActiveRecord::Migration[7.1]
   def change
-    remove_index :account_aliases, :account_id
-    remove_index :account_relationship_severance_events, :account_id
-    remove_index :custom_filter_statuses, :status_id
-    remove_index :webauthn_credentials, :user_id
+    with_options if_exists: true do
+      remove_index :account_aliases, :account_id
+      remove_index :account_relationship_severance_events, :account_id
+      remove_index :custom_filter_statuses, :status_id
+      remove_index :webauthn_credentials, :user_id
+    end
   end
 end
diff --git a/db/migrate/20250717003848_create_username_blocks.rb b/db/migrate/20250717003848_create_username_blocks.rb
new file mode 100644
index 00000000000..01649d06574
--- /dev/null
+++ b/db/migrate/20250717003848_create_username_blocks.rb
@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+class CreateUsernameBlocks < ActiveRecord::Migration[8.0]
+  def change
+    create_table :username_blocks do |t|
+      t.string :username, null: false
+      t.string :normalized_username, null: false
+      t.boolean :exact, null: false, default: false
+      t.boolean :allow_with_approval, null: false, default: false
+
+      t.timestamps
+    end
+
+    add_index :username_blocks, 'lower(username)', unique: true, name: 'index_username_blocks_on_username_lower_btree'
+    add_index :username_blocks, :normalized_username
+
+    reversible do |dir|
+      dir.up do
+        load Rails.root.join('db', 'seeds', '05_blocked_usernames.rb')
+      end
+    end
+  end
+end
diff --git a/db/migrate/20250805075010_add_delivery_last_failed_at_to_fasp_providers.rb b/db/migrate/20250805075010_add_delivery_last_failed_at_to_fasp_providers.rb
new file mode 100644
index 00000000000..f8af1f33377
--- /dev/null
+++ b/db/migrate/20250805075010_add_delivery_last_failed_at_to_fasp_providers.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddDeliveryLastFailedAtToFaspProviders < ActiveRecord::Migration[8.0]
+  def change
+    add_column :fasp_providers, :delivery_last_failed_at, :datetime
+  end
+end
diff --git a/db/migrate/20250819100545_update_quote_index.rb b/db/migrate/20250819100545_update_quote_index.rb
new file mode 100644
index 00000000000..db4f5efc9f1
--- /dev/null
+++ b/db/migrate/20250819100545_update_quote_index.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class UpdateQuoteIndex < ActiveRecord::Migration[8.0]
+  disable_ddl_transaction!
+
+  def change
+    add_index :quotes, [:account_id, :quoted_account_id, :id], algorithm: :concurrently
+    remove_index :quotes, [:account_id, :quoted_account_id]
+
+    add_index :quotes, [:quoted_status_id, :id], algorithm: :concurrently
+    remove_index :quotes, [:quoted_status_id]
+  end
+end
diff --git a/db/migrate/20250820084312_add_quotes_count_to_status_stat.rb b/db/migrate/20250820084312_add_quotes_count_to_status_stat.rb
new file mode 100644
index 00000000000..b72274b9ebf
--- /dev/null
+++ b/db/migrate/20250820084312_add_quotes_count_to_status_stat.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddQuotesCountToStatusStat < ActiveRecord::Migration[8.0]
+  def change
+    add_column :status_stats, :quotes_count, :bigint, null: false, default: 0
+  end
+end
diff --git a/db/migrate/20250828222741_add_parent_status_and_parent_account_to_conversations.rb b/db/migrate/20250828222741_add_parent_status_and_parent_account_to_conversations.rb
new file mode 100644
index 00000000000..e9e6a84b725
--- /dev/null
+++ b/db/migrate/20250828222741_add_parent_status_and_parent_account_to_conversations.rb
@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+class AddParentStatusAndParentAccountToConversations < ActiveRecord::Migration[8.0]
+  def change
+    add_column :conversations, :parent_status_id, :bigint, null: true, default: nil
+    add_column :conversations, :parent_account_id, :bigint, null: true, default: nil
+  end
+end
diff --git a/db/migrate/20250902221600_add_index_on_conversation_to_statuses.rb b/db/migrate/20250902221600_add_index_on_conversation_to_statuses.rb
new file mode 100644
index 00000000000..9be338e8f67
--- /dev/null
+++ b/db/migrate/20250902221600_add_index_on_conversation_to_statuses.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class AddIndexOnConversationToStatuses < ActiveRecord::Migration[8.0]
+  disable_ddl_transaction!
+
+  def change
+    add_index :statuses, :conversation_id, algorithm: :concurrently
+  end
+end
diff --git a/db/migrate/20250909100506_add_index_on_parent_status_id_to_conversations.rb b/db/migrate/20250909100506_add_index_on_parent_status_id_to_conversations.rb
new file mode 100644
index 00000000000..a254d2c5710
--- /dev/null
+++ b/db/migrate/20250909100506_add_index_on_parent_status_id_to_conversations.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class AddIndexOnParentStatusIdToConversations < ActiveRecord::Migration[8.0]
+  disable_ddl_transaction!
+
+  def change
+    add_index :conversations, :parent_status_id, algorithm: :concurrently, unique: true, where: 'parent_status_id IS NOT NULL'
+  end
+end
diff --git a/db/migrate/20250911163952_fill_default_quote_policy_setting.rb b/db/migrate/20250911163952_fill_default_quote_policy_setting.rb
new file mode 100644
index 00000000000..c3d08e68c9e
--- /dev/null
+++ b/db/migrate/20250911163952_fill_default_quote_policy_setting.rb
@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+class FillDefaultQuotePolicySetting < ActiveRecord::Migration[8.0]
+  disable_ddl_transaction!
+
+  # Dummy classes, to make migration possible across version changes
+  class User < ApplicationRecord; end
+
+  def up
+    User.where.not(settings: nil).find_each do |user|
+      settings = Oj.load(user.attributes_before_type_cast['settings'])
+      next if settings.nil?
+
+      should_update_settings = false
+
+      if settings['notification_emails.quote'].blank? && settings['notification_emails.reblog'] == false && settings['notification_emails.mention'] == false
+        settings['notification_emails.quote'] = false
+        should_update_settings = true
+      end
+
+      if settings['default_privacy'] == 'private' && settings['default_quote_policy'] != 'nobody'
+        settings['default_quote_policy'] = 'nobody'
+        should_update_settings = true
+      elsif settings['default_quote_policy'].nil? && settings['default_privacy'] == 'unlisted'
+        settings['default_quote_policy'] = 'followers'
+        should_update_settings = true
+      end
+
+      user.update_column('settings', Oj.dump(settings)) if should_update_settings
+    end
+  end
+end
diff --git a/db/migrate/20250912082651_add_following_url_to_accounts.rb b/db/migrate/20250912082651_add_following_url_to_accounts.rb
new file mode 100644
index 00000000000..8f9f3c63d63
--- /dev/null
+++ b/db/migrate/20250912082651_add_following_url_to_accounts.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddFollowingURLToAccounts < ActiveRecord::Migration[8.0]
+  def change
+    add_column :accounts, :following_url, :string, default: '', null: false
+  end
+end
diff --git a/db/migrate/20250924170259_add_id_scheme_to_accounts.rb b/db/migrate/20250924170259_add_id_scheme_to_accounts.rb
new file mode 100644
index 00000000000..7dd987dcc0e
--- /dev/null
+++ b/db/migrate/20250924170259_add_id_scheme_to_accounts.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddIdSchemeToAccounts < ActiveRecord::Migration[8.0]
+  def change
+    add_column :accounts, :id_scheme, :integer, default: 0
+  end
+end
diff --git a/db/migrate/20251002140103_migrate_timeline_preview_setting.rb b/db/migrate/20251002140103_migrate_timeline_preview_setting.rb
new file mode 100644
index 00000000000..4d180bd8f39
--- /dev/null
+++ b/db/migrate/20251002140103_migrate_timeline_preview_setting.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+class MigrateTimelinePreviewSetting < ActiveRecord::Migration[8.0]
+  class Setting < ApplicationRecord; end
+
+  def up
+    setting = Setting.find_by(var: 'timeline_preview')
+    return unless setting.present? && setting.attributes['value'].present?
+
+    value = YAML.safe_load(setting.attributes['value'], permitted_classes: [ActiveSupport::HashWithIndifferentAccess, Symbol])
+
+    Setting.upsert_all(
+      %w(local_live_feed_access remote_live_feed_access local_topic_feed_access remote_topic_feed_access).map do |var|
+        { var: var, value: value ? "--- public\n" : "--- authenticated\n" }
+      end,
+      unique_by: :var
+    )
+  end
+
+  def down; end
+end
diff --git a/db/migrate/20251007100627_add_index_follows_on_target_account_id_and_account_id.rb b/db/migrate/20251007100627_add_index_follows_on_target_account_id_and_account_id.rb
new file mode 100644
index 00000000000..23c08d2d061
--- /dev/null
+++ b/db/migrate/20251007100627_add_index_follows_on_target_account_id_and_account_id.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class AddIndexFollowsOnTargetAccountIdAndAccountId < ActiveRecord::Migration[8.0]
+  disable_ddl_transaction!
+
+  def change
+    add_index :follows, [:target_account_id, :account_id], algorithm: :concurrently
+  end
+end
diff --git a/db/migrate/20251007100813_remove_index_follows_on_target_account_id.rb b/db/migrate/20251007100813_remove_index_follows_on_target_account_id.rb
new file mode 100644
index 00000000000..142086f3582
--- /dev/null
+++ b/db/migrate/20251007100813_remove_index_follows_on_target_account_id.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class RemoveIndexFollowsOnTargetAccountId < ActiveRecord::Migration[8.0]
+  disable_ddl_transaction!
+
+  def change
+    remove_index :follows, [:target_account_id], algorithm: :concurrently
+  end
+end
diff --git a/db/migrate/20251007142305_change_defaults_for_account_id_scheme.rb b/db/migrate/20251007142305_change_defaults_for_account_id_scheme.rb
new file mode 100644
index 00000000000..6c07236968a
--- /dev/null
+++ b/db/migrate/20251007142305_change_defaults_for_account_id_scheme.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class ChangeDefaultsForAccountIdScheme < ActiveRecord::Migration[8.0]
+  def change
+    change_column_default :accounts, :id_scheme, from: 0, to: 1
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 0237b476445..8910bac36a8 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[8.0].define(version: 2025_06_27_132728) do
+ActiveRecord::Schema[8.0].define(version: 2025_10_07_142305) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "pg_catalog.plpgsql"
 
@@ -198,6 +198,8 @@ ActiveRecord::Schema[8.0].define(version: 2025_06_27_132728) do
     t.datetime "requested_review_at", precision: nil
     t.boolean "indexable", default: false, null: false
     t.string "attribution_domains", default: [], array: true
+    t.string "following_url", default: "", null: false
+    t.integer "id_scheme", default: 1
     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"
@@ -359,6 +361,9 @@ ActiveRecord::Schema[8.0].define(version: 2025_06_27_132728) do
     t.string "uri"
     t.datetime "created_at", precision: nil, null: false
     t.datetime "updated_at", precision: nil, null: false
+    t.bigint "parent_status_id"
+    t.bigint "parent_account_id"
+    t.index ["parent_status_id"], name: "index_conversations_on_parent_status_id", unique: true, where: "(parent_status_id IS NOT NULL)"
     t.index ["uri"], name: "index_conversations_on_uri", unique: true, opclass: :text_pattern_ops, where: "(uri IS NOT NULL)"
   end
 
@@ -488,6 +493,7 @@ ActiveRecord::Schema[8.0].define(version: 2025_06_27_132728) do
     t.string "fediverse_account"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.datetime "delivery_last_failed_at"
     t.index ["base_url"], name: "index_fasp_providers_on_base_url", unique: true
   end
 
@@ -565,7 +571,7 @@ ActiveRecord::Schema[8.0].define(version: 2025_06_27_132728) do
     t.boolean "notify", default: false, null: false
     t.string "languages", array: true
     t.index ["account_id", "target_account_id"], name: "index_follows_on_account_id_and_target_account_id", unique: true
-    t.index ["target_account_id"], name: "index_follows_on_target_account_id"
+    t.index ["target_account_id", "account_id"], name: "index_follows_on_target_account_id_and_account_id"
   end
 
   create_table "generated_annual_reports", force: :cascade do |t|
@@ -925,11 +931,11 @@ ActiveRecord::Schema[8.0].define(version: 2025_06_27_132728) do
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.boolean "legacy", default: false, null: false
-    t.index ["account_id", "quoted_account_id"], name: "index_quotes_on_account_id_and_quoted_account_id"
+    t.index ["account_id", "quoted_account_id", "id"], name: "index_quotes_on_account_id_and_quoted_account_id_and_id"
     t.index ["activity_uri"], name: "index_quotes_on_activity_uri", unique: true, where: "(activity_uri IS NOT NULL)"
     t.index ["approval_uri"], name: "index_quotes_on_approval_uri", where: "(approval_uri IS NOT NULL)"
     t.index ["quoted_account_id"], name: "index_quotes_on_quoted_account_id"
-    t.index ["quoted_status_id"], name: "index_quotes_on_quoted_status_id"
+    t.index ["quoted_status_id", "id"], name: "index_quotes_on_quoted_status_id_and_id"
     t.index ["status_id"], name: "index_quotes_on_status_id", unique: true
   end
 
@@ -1102,6 +1108,7 @@ ActiveRecord::Schema[8.0].define(version: 2025_06_27_132728) do
     t.datetime "updated_at", precision: nil, null: false
     t.bigint "untrusted_favourites_count"
     t.bigint "untrusted_reblogs_count"
+    t.bigint "quotes_count", default: 0, null: false
     t.index ["status_id"], name: "index_status_stats_on_status_id", unique: true
   end
 
@@ -1143,6 +1150,7 @@ ActiveRecord::Schema[8.0].define(version: 2025_06_27_132728) do
     t.integer "quote_approval_policy", default: 0, null: false
     t.index ["account_id", "id", "visibility", "updated_at"], name: "index_statuses_20190820", order: { id: :desc }, where: "(deleted_at IS NULL)"
     t.index ["account_id"], name: "index_statuses_on_account_id"
+    t.index ["conversation_id"], name: "index_statuses_on_conversation_id"
     t.index ["deleted_at"], name: "index_statuses_on_deleted_at", where: "(deleted_at IS NOT NULL)"
     t.index ["id", "account_id"], name: "index_statuses_local_20190824", order: { id: :desc }, where: "((local OR (uri IS NULL)) AND (deleted_at IS NULL) AND (visibility = 0) AND (reblog_of_id IS NULL) AND ((NOT reply) OR (in_reply_to_account_id = account_id)))"
     t.index ["id", "language", "account_id"], name: "index_statuses_public_20250129", order: { id: :desc }, where: "((deleted_at IS NULL) AND (visibility = 0) AND (reblog_of_id IS NULL) AND ((NOT reply) OR (in_reply_to_account_id = account_id)))"
@@ -1238,6 +1246,17 @@ ActiveRecord::Schema[8.0].define(version: 2025_06_27_132728) do
     t.datetime "updated_at", null: false
   end
 
+  create_table "username_blocks", force: :cascade do |t|
+    t.string "username", null: false
+    t.string "normalized_username", null: false
+    t.boolean "exact", default: false, null: false
+    t.boolean "allow_with_approval", default: false, null: false
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index "lower((username)::text)", name: "index_username_blocks_on_username_lower_btree", unique: true
+    t.index ["normalized_username"], name: "index_username_blocks_on_normalized_username"
+  end
+
   create_table "users", force: :cascade do |t|
     t.string "email", default: "", null: false
     t.datetime "created_at", precision: nil, null: false
@@ -1472,53 +1491,6 @@ ActiveRecord::Schema[8.0].define(version: 2025_06_27_132728) do
   add_foreign_key "web_settings", "users", name: "fk_11910667b2", on_delete: :cascade
   add_foreign_key "webauthn_credentials", "users", on_delete: :cascade
 
-  create_view "instances", materialized: true, sql_definition: <<-SQL
-      WITH domain_counts(domain, accounts_count) AS (
-           SELECT accounts.domain,
-              count(*) AS accounts_count
-             FROM accounts
-            WHERE (accounts.domain IS NOT NULL)
-            GROUP BY accounts.domain
-          )
-   SELECT domain_counts.domain,
-      domain_counts.accounts_count
-     FROM domain_counts
-  UNION
-   SELECT domain_blocks.domain,
-      COALESCE(domain_counts.accounts_count, (0)::bigint) AS accounts_count
-     FROM (domain_blocks
-       LEFT JOIN domain_counts ON (((domain_counts.domain)::text = (domain_blocks.domain)::text)))
-  UNION
-   SELECT domain_allows.domain,
-      COALESCE(domain_counts.accounts_count, (0)::bigint) AS accounts_count
-     FROM (domain_allows
-       LEFT JOIN domain_counts ON (((domain_counts.domain)::text = (domain_allows.domain)::text)));
-  SQL
-  add_index "instances", "reverse(('.'::text || (domain)::text)), domain", name: "index_instances_on_reverse_domain"
-  add_index "instances", ["domain"], name: "index_instances_on_domain", unique: true
-
-  create_view "user_ips", sql_definition: <<-SQL
-      SELECT user_id,
-      ip,
-      max(used_at) AS used_at
-     FROM ( SELECT users.id AS user_id,
-              users.sign_up_ip AS ip,
-              users.created_at AS used_at
-             FROM users
-            WHERE (users.sign_up_ip IS NOT NULL)
-          UNION ALL
-           SELECT session_activations.user_id,
-              session_activations.ip,
-              session_activations.updated_at
-             FROM session_activations
-          UNION ALL
-           SELECT login_activities.user_id,
-              login_activities.ip,
-              login_activities.created_at
-             FROM login_activities
-            WHERE (login_activities.success = true)) t0
-    GROUP BY user_id, ip;
-  SQL
   create_view "account_summaries", materialized: true, sql_definition: <<-SQL
       SELECT accounts.id AS account_id,
       mode() WITHIN GROUP (ORDER BY t0.language) AS language,
@@ -1569,4 +1541,51 @@ ActiveRecord::Schema[8.0].define(version: 2025_06_27_132728) do
   SQL
   add_index "global_follow_recommendations", ["account_id"], name: "index_global_follow_recommendations_on_account_id", unique: true
 
+  create_view "instances", materialized: true, sql_definition: <<-SQL
+      WITH domain_counts(domain, accounts_count) AS (
+           SELECT accounts.domain,
+              count(*) AS accounts_count
+             FROM accounts
+            WHERE (accounts.domain IS NOT NULL)
+            GROUP BY accounts.domain
+          )
+   SELECT domain_counts.domain,
+      domain_counts.accounts_count
+     FROM domain_counts
+  UNION
+   SELECT domain_blocks.domain,
+      COALESCE(domain_counts.accounts_count, (0)::bigint) AS accounts_count
+     FROM (domain_blocks
+       LEFT JOIN domain_counts ON (((domain_counts.domain)::text = (domain_blocks.domain)::text)))
+  UNION
+   SELECT domain_allows.domain,
+      COALESCE(domain_counts.accounts_count, (0)::bigint) AS accounts_count
+     FROM (domain_allows
+       LEFT JOIN domain_counts ON (((domain_counts.domain)::text = (domain_allows.domain)::text)));
+  SQL
+  add_index "instances", "reverse(('.'::text || (domain)::text)), domain", name: "index_instances_on_reverse_domain"
+  add_index "instances", ["domain"], name: "index_instances_on_domain", unique: true
+
+  create_view "user_ips", sql_definition: <<-SQL
+      SELECT user_id,
+      ip,
+      max(used_at) AS used_at
+     FROM ( SELECT users.id AS user_id,
+              users.sign_up_ip AS ip,
+              users.created_at AS used_at
+             FROM users
+            WHERE (users.sign_up_ip IS NOT NULL)
+          UNION ALL
+           SELECT session_activations.user_id,
+              session_activations.ip,
+              session_activations.updated_at
+             FROM session_activations
+          UNION ALL
+           SELECT login_activities.user_id,
+              login_activities.ip,
+              login_activities.created_at
+             FROM login_activities
+            WHERE (login_activities.success = true)) t0
+    GROUP BY user_id, ip;
+  SQL
 end
diff --git a/db/seeds/04_admin.rb b/db/seeds/04_admin.rb
index 887b4a22130..43290c47a46 100644
--- a/db/seeds/04_admin.rb
+++ b/db/seeds/04_admin.rb
@@ -7,7 +7,17 @@ if Rails.env.development?
   admin = Account.where(username: 'admin').first_or_initialize(username: 'admin')
   admin.save(validate: false)
 
-  user = User.where(email: "admin@#{domain}").first_or_initialize(email: "admin@#{domain}", password: 'mastodonadmin', password_confirmation: 'mastodonadmin', confirmed_at: Time.now.utc, role: UserRole.find_by(name: 'Owner'), account: admin, agreement: true, approved: true)
+  user = User.where(email: "admin@#{domain}").first_or_initialize(
+    email: "admin@#{domain}",
+    password: 'mastodonadmin',
+    password_confirmation: 'mastodonadmin',
+    confirmed_at: Time.now.utc,
+    role: UserRole.find_by(name: 'Owner'),
+    account: admin,
+    agreement: true,
+    approved: true,
+    bypass_registration_checks: true
+  )
   user.save!
   user.approve!
 end
diff --git a/db/seeds/05_blocked_usernames.rb b/db/seeds/05_blocked_usernames.rb
new file mode 100644
index 00000000000..8bfe536c898
--- /dev/null
+++ b/db/seeds/05_blocked_usernames.rb
@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+%w(
+  abuse
+  account
+  accounts
+  admin
+  administration
+  administrator
+  admins
+  help
+  helpdesk
+  instance
+  mod
+  moderator
+  moderators
+  mods
+  owner
+  root
+  security
+  server
+  staff
+  support
+  webmaster
+).each do |str|
+  UsernameBlock.create_with(username: str, exact: true).find_or_create_by(username: str)
+end
+
+%w(
+  mastodon
+  mastadon
+).each do |str|
+  UsernameBlock.create_with(username: str, exact: false).find_or_create_by(username: str)
+end
diff --git a/dist/nginx.conf b/dist/nginx.conf
index 3ab9bb66a2d..8b7c68d2872 100644
--- a/dist/nginx.conf
+++ b/dist/nginx.conf
@@ -62,7 +62,7 @@ server {
   gzip_comp_level 6;
   gzip_buffers 16 8k;
   gzip_http_version 1.1;
-  gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript image/svg+xml image/x-icon;
+  gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/rss+xml text/javascript image/svg+xml image/x-icon;
   gzip_static on;
 
   location / {
diff --git a/docker-compose.yml b/docker-compose.yml
index 454ef91f9fb..38c7fd83609 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -59,7 +59,7 @@ services:
   web:
     # You can uncomment the following line if you want to not use the prebuilt image, for example if you have local code changes
     # build: .
-    image: ghcr.io/mastodon/mastodon:v4.3.8
+    image: ghcr.io/mastodon/mastodon:v4.4.6
     restart: always
     env_file: .env.production
     command: bundle exec puma -C config/puma.rb
@@ -83,7 +83,7 @@ services:
     # build:
     #   dockerfile: ./streaming/Dockerfile
     #   context: .
-    image: ghcr.io/mastodon/mastodon-streaming:v4.3.8
+    image: ghcr.io/mastodon/mastodon-streaming:v4.4.6
     restart: always
     env_file: .env.production
     command: node ./streaming/index.js
@@ -102,7 +102,7 @@ services:
   sidekiq:
     # You can uncomment the following line if you want to not use the prebuilt image, for example if you have local code changes
     # build: .
-    image: ghcr.io/mastodon/mastodon:v4.3.8
+    image: ghcr.io/mastodon/mastodon:v4.4.6
     restart: always
     env_file: .env.production
     command: bundle exec sidekiq
diff --git a/docs/DEVELOPMENT.md b/docs/DEVELOPMENT.md
index 79153a20213..0425f8892b6 100644
--- a/docs/DEVELOPMENT.md
+++ b/docs/DEVELOPMENT.md
@@ -91,7 +91,7 @@ development environment configured with the software needed for this project.
 ## Next steps
 
 - Once you have successfully set up a development environment, it will be available on http://localhost:3000
-- Log in as the default admin user with the username `admin@mastodon.local` and the password `mastodonadmin`.
+- Log in as the default admin user with the username `admin@mastodon.local` or `admin@localhost` (depending on your setup) and the password `mastodonadmin`.
 - Check out the [Mastodon docs] for tips on working with emails in development (you'll need this when creating new user accounts) as well as a list of useful commands for testing and updating your dev instance.
 - You can optionally populate your database with sample data by running `bin/rails dev:populate_sample_data`. This will create a `@showcase_account` account with various types of contents.
 
diff --git a/eslint.config.mjs b/eslint.config.mjs
index 21545a1e3d7..5942219cedc 100644
--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@@ -5,7 +5,6 @@ import path from 'node:path';
 import js from '@eslint/js';
 import { globalIgnores } from 'eslint/config';
 import formatjs from 'eslint-plugin-formatjs';
-// @ts-expect-error -- No typings
 import importPlugin from 'eslint-plugin-import';
 import jsdoc from 'eslint-plugin-jsdoc';
 import jsxA11Y from 'eslint-plugin-jsx-a11y';
@@ -180,6 +179,7 @@ export default tseslint.config([
     'tmp/**/*',
     'vendor/**/*',
     'streaming/**/*',
+    '.bundle/**/*',
   ]),
   react.configs.flat.recommended,
   react.configs.flat['jsx-runtime'],
@@ -350,6 +350,8 @@ export default tseslint.config([
       'import/no-default-export': 'warn',
 
       'jsdoc/require-jsdoc': 'off',
+      'jsdoc/require-param': 'off',
+      'jsdoc/require-returns': 'off',
 
       'react/prefer-stateless-function': 'warn',
       'react/function-component-definition': [
@@ -404,6 +406,12 @@ export default tseslint.config([
       globals: globals.vitest,
     },
   },
+  {
+    files: ['**/*.test.*'],
+    rules: {
+      'no-global-assign': 'off',
+    },
+  },
   {
     files: ['**/*.stories.ts', '**/*.stories.tsx', '.storybook/*'],
     rules: {
diff --git a/lib/exceptions.rb b/lib/exceptions.rb
index 93fcc38dce8..18a99ace2a4 100644
--- a/lib/exceptions.rb
+++ b/lib/exceptions.rb
@@ -13,6 +13,8 @@ module Mastodon
   class SyntaxError < Error; end
   class InvalidParameterError < Error; end
   class SignatureVerificationError < Error; end
+  class MalformedHeaderError < Error; end
+  class RecursionLimitExceededError < Error; end
 
   class UnexpectedResponseError < Error
     attr_reader :response
diff --git a/lib/mastodon/cli/accounts.rb b/lib/mastodon/cli/accounts.rb
index 1b33f56055a..25e966bd8ea 100644
--- a/lib/mastodon/cli/accounts.rb
+++ b/lib/mastodon/cli/accounts.rb
@@ -165,14 +165,17 @@ module Mastodon::CLI
         user.role_id = nil
       end
 
-      password = SecureRandom.hex if options[:reset_password]
-      user.password = password if options[:reset_password]
       user.email = options[:email] if options[:email]
       user.disabled = false if options[:enable]
       user.disabled = true if options[:disable]
       user.approved = true if options[:approve]
       user.disable_two_factor! if options[:disable_2fa]
 
+      # Password changes are a little different, as we also need to ensure
+      # sessions, subscriptions, and access tokens are revoked after changing:
+      password = SecureRandom.hex if options[:reset_password]
+      user.change_password!(password) if options[:reset_password]
+
       if user.save
         user.confirm if options[:confirm]
 
diff --git a/lib/mastodon/cli/cache.rb b/lib/mastodon/cli/cache.rb
index cfb6cba1ff2..9f66cd49378 100644
--- a/lib/mastodon/cli/cache.rb
+++ b/lib/mastodon/cli/cache.rb
@@ -63,6 +63,7 @@ module Mastodon::CLI
         status_stat.replies_count    = status.replies.not_direct_visibility.count
         status_stat.reblogs_count    = status.reblogs.count
         status_stat.favourites_count = status.favourites.count
+        status_stat.quotes_count     = status.quotes.accepted.count
 
         status_stat.save if status_stat.changed?
       end
diff --git a/lib/mastodon/cli/ip_blocks.rb b/lib/mastodon/cli/ip_blocks.rb
index f1f40c99ce3..ea6b508c6fe 100644
--- a/lib/mastodon/cli/ip_blocks.rb
+++ b/lib/mastodon/cli/ip_blocks.rb
@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'rubygems/package'
 require_relative 'base'
 
 module Mastodon::CLI
diff --git a/lib/mastodon/cli/media.rb b/lib/mastodon/cli/media.rb
index 1059eb60660..02c9894c36d 100644
--- a/lib/mastodon/cli/media.rb
+++ b/lib/mastodon/cli/media.rb
@@ -313,9 +313,7 @@ module Mastodon::CLI
     end
 
     def combined_media_sum
-      Arel.sql(<<~SQL.squish)
-        COALESCE(file_file_size, 0) + COALESCE(thumbnail_file_size, 0)
-      SQL
+      MediaAttachment.combined_media_file_size
     end
 
     def preload_records_from_mixed_objects(objects)
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index 7cb5dec6772..7fca8e8c821 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -17,7 +17,7 @@ module Mastodon
     end
 
     def default_prerelease
-      'alpha.1'
+      'alpha.3'
     end
 
     def prerelease
@@ -45,7 +45,7 @@ module Mastodon
 
     def api_versions
       {
-        mastodon: 6,
+        mastodon: 7,
       }
     end
 
diff --git a/lib/mastodon/worker_batch_middleware.rb b/lib/mastodon/worker_batch_middleware.rb
new file mode 100644
index 00000000000..c4623013327
--- /dev/null
+++ b/lib/mastodon/worker_batch_middleware.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class Mastodon::WorkerBatchMiddleware
+  def call(_worker, msg, _queue, _redis_pool = nil)
+    if (batch = Thread.current[:batch])
+      batch.add_jobs([msg['jid']])
+    end
+
+    yield
+  end
+end
diff --git a/lib/paperclip/attachment_extensions.rb b/lib/paperclip/attachment_extensions.rb
index 401da112908..011e165ed74 100644
--- a/lib/paperclip/attachment_extensions.rb
+++ b/lib/paperclip/attachment_extensions.rb
@@ -73,8 +73,8 @@ module Paperclip
       @url_generator.for_as_default(style_name)
     end
 
+    STOPLIGHT_COOL_OFF_TIME = 30
     STOPLIGHT_THRESHOLD = 10
-    STOPLIGHT_COOLDOWN  = 30
 
     # We overwrite this method to put a circuit breaker around
     # calls to object storage, to stop hitting APIs that are slow
@@ -84,11 +84,12 @@ module Paperclip
       # Don't go through Stoplight if we don't have anything object-storage-oriented to do
       return super if @queued_for_delete.empty? && @queued_for_write.empty? && !dirty?
 
-      Stoplight('object-storage')
-        .with_threshold(STOPLIGHT_THRESHOLD)
-        .with_cool_off_time(STOPLIGHT_COOLDOWN)
-        .with_error_handler { |error, handle| error.is_a?(Seahorse::Client::NetworkingError) ? handle.call(error) : raise(error) }
-        .run { super }
+      Stoplight(
+        'object-storage',
+        cool_off_time: STOPLIGHT_COOL_OFF_TIME,
+        threshold: STOPLIGHT_THRESHOLD,
+        tracked_errors: [Seahorse::Client::NetworkingError]
+      ).run { super }
     end
   end
 end
diff --git a/lib/paperclip/color_extractor.rb b/lib/paperclip/color_extractor.rb
index e0cdfdb5235..62daa077952 100644
--- a/lib/paperclip/color_extractor.rb
+++ b/lib/paperclip/color_extractor.rb
@@ -182,9 +182,9 @@ module Paperclip
       t += 1 if t.negative?
       t -= 1 if t > 1
 
-      return (p + ((q - p) * 6 * t)) if t < 1 / 6.0
+      return p + ((q - p) * 6 * t) if t < 1 / 6.0
       return q if t < 1 / 2.0
-      return (p + ((q - p) * ((2 / 3.0) - t) * 6)) if t < 2 / 3.0
+      return p + ((q - p) * ((2 / 3.0) - t) * 6) if t < 2 / 3.0
 
       p
     end
diff --git a/lib/tasks/dev.rake b/lib/tasks/dev.rake
index f76d1891611..b1a144f64cd 100644
--- a/lib/tasks/dev.rake
+++ b/lib/tasks/dev.rake
@@ -3,420 +3,446 @@
 namespace :dev do
   desc 'Populate database with test data. Can be run multiple times. Should not be run in production environments'
   task populate_sample_data: :environment do
-    # Create a valid account to showcase multiple post types
-    showcase_account = Account.create_with(username: 'showcase_account').find_or_create_by!(id: 10_000_000)
-    showcase_user = User.create_with(
-      account_id: showcase_account.id,
-      agreement: true,
-      password: SecureRandom.hex,
-      email: ENV.fetch('TEST_DATA_SHOWCASE_EMAIL', 'showcase_account@joinmastodon.org'),
-      confirmed_at: Time.now.utc,
-      approved: true,
-      bypass_registration_checks: true
-    ).find_or_create_by!(id: 10_000_000)
-    showcase_user.mark_email_as_confirmed!
-    showcase_user.approve!
+    Chewy.strategy(:mastodon) do
+      # Create a valid account to showcase multiple post types
+      showcase_account = Account.create_with(username: 'showcase_account').find_or_create_by!(id: 10_000_000)
+      showcase_user = User.create_with(
+        account_id: showcase_account.id,
+        agreement: true,
+        password: SecureRandom.hex,
+        email: ENV.fetch('TEST_DATA_SHOWCASE_EMAIL', 'showcase_account@joinmastodon.org'),
+        confirmed_at: Time.now.utc,
+        approved: true,
+        bypass_registration_checks: true
+      ).find_or_create_by!(id: 10_000_000)
+      showcase_user.mark_email_as_confirmed!
+      showcase_user.approve!
 
-    french_post = Status.create_with(
-      text: 'Ceci est un sondage public écrit en Français',
-      language: 'fr',
-      account: showcase_account,
-      visibility: :public,
-      poll_attributes: {
-        voters_count: 0,
+      french_post = Status.create_with(
+        text: 'Ceci est un sondage public écrit en Français',
+        language: 'fr',
         account: showcase_account,
-        expires_at: 1.day.from_now,
-        options: ['ceci est un choix', 'ceci est un autre choix'],
-        multiple: false,
-      }
-    ).find_or_create_by!(id: 10_000_000)
+        visibility: :public,
+        poll_attributes: {
+          voters_count: 0,
+          account: showcase_account,
+          expires_at: 1.day.from_now,
+          options: ['ceci est un choix', 'ceci est un autre choix'],
+          multiple: false,
+        }
+      ).find_or_create_by!(id: 10_000_000)
 
-    private_mentionless = Status.create_with(
-      text: 'This is a private message written in English',
-      language: 'en',
-      account: showcase_account,
-      visibility: :private
-    ).find_or_create_by!(id: 10_000_001)
-
-    public_self_reply_with_cw = Status.create_with(
-      text: 'This is a public self-reply written in English; it has a CW and a multi-choice poll',
-      spoiler_text: 'poll (CW example)',
-      language: 'en',
-      account: showcase_account,
-      visibility: :public,
-      thread: french_post,
-      poll_attributes: {
-        voters_count: 0,
+      private_mentionless = Status.create_with(
+        text: 'This is a private message written in English',
+        language: 'en',
         account: showcase_account,
-        expires_at: 1.day.from_now,
-        options: ['this is a choice', 'this is another choice', 'you can chose any number of them'],
-        multiple: true,
-      }
-    ).find_or_create_by!(id: 10_000_002)
-    ProcessHashtagsService.new.call(public_self_reply_with_cw)
+        visibility: :private
+      ).find_or_create_by!(id: 10_000_001)
 
-    unlisted_self_reply_with_cw_tag_mention = Status.create_with(
-      text: 'This is an unlisted (Quiet Public) self-reply written in #English; it has a CW, mentions @showcase_account, and uses an emoji 🦣',
-      spoiler_text: 'CW example',
-      language: 'en',
-      account: showcase_account,
-      visibility: :unlisted,
-      thread: public_self_reply_with_cw
-    ).find_or_create_by!(id: 10_000_003)
-    Mention.find_or_create_by!(status: unlisted_self_reply_with_cw_tag_mention, account: showcase_account)
-    ProcessHashtagsService.new.call(unlisted_self_reply_with_cw_tag_mention)
+      public_self_reply_with_cw = Status.create_with(
+        text: 'This is a public self-reply written in English; it has a CW and a multi-choice poll',
+        spoiler_text: 'poll (CW example)',
+        language: 'en',
+        account: showcase_account,
+        visibility: :public,
+        thread: french_post,
+        poll_attributes: {
+          voters_count: 0,
+          account: showcase_account,
+          expires_at: 1.day.from_now,
+          options: ['this is a choice', 'this is another choice', 'you can chose any number of them'],
+          multiple: true,
+        }
+      ).find_or_create_by!(id: 10_000_002)
+      ProcessHashtagsService.new.call(public_self_reply_with_cw)
 
-    media_attachment = MediaAttachment.create_with(
-      account: showcase_account,
-      file: File.open('spec/fixtures/files/600x400.png'),
-      description: 'Mastodon logo'
-    ).find_or_create_by!(id: 10_000_000)
-    status_with_media = Status.create_with(
-      text: "This is a public status with a picture and tags. The attached picture has an alt text\n\n#Mastodon #Logo #English #Test",
-      ordered_media_attachment_ids: [media_attachment.id],
-      account: showcase_account,
-      visibility: :public
-    ).find_or_create_by!(id: 10_000_004)
-    media_attachment.update(status_id: status_with_media.id)
-    ProcessHashtagsService.new.call(status_with_media)
+      unlisted_self_reply_with_cw_tag_mention = Status.create_with(
+        text: 'This is an unlisted (Quiet Public) self-reply written in #English; it has a CW, mentions @showcase_account, and uses an emoji 🦣',
+        spoiler_text: 'CW example',
+        language: 'en',
+        account: showcase_account,
+        visibility: :unlisted,
+        thread: public_self_reply_with_cw
+      ).find_or_create_by!(id: 10_000_003)
+      Mention.find_or_create_by!(status: unlisted_self_reply_with_cw_tag_mention, account: showcase_account)
+      ProcessHashtagsService.new.call(unlisted_self_reply_with_cw_tag_mention)
 
-    media_attachment = MediaAttachment.create_with(
-      account: showcase_account,
-      file: File.open('spec/fixtures/files/600x400.png'),
-      description: 'Mastodon logo'
-    ).find_or_create_by!(id: 10_000_001)
-    status_with_sensitive_media = Status.create_with(
-      text: "This is the same public status with a picture and tags, but it is marked as sensitive. The attached picture has an alt text\n\n#Mastodon #Logo #English #Test",
-      ordered_media_attachment_ids: [media_attachment.id],
-      account: showcase_account,
-      visibility: :public,
-      sensitive: true,
-      thread: status_with_media
-    ).find_or_create_by!(id: 10_000_005)
-    media_attachment.update(status_id: status_with_sensitive_media.id)
-    ProcessHashtagsService.new.call(status_with_sensitive_media)
-
-    media_attachment = MediaAttachment.create_with(
-      account: showcase_account,
-      file: File.open('spec/fixtures/files/600x400.png'),
-      description: 'Mastodon logo'
-    ).find_or_create_by!(id: 10_000_002)
-    status_with_cw_media = Status.create_with(
-      text: "This is the same public status with a picture and tags, but it is behind a CW. The attached picture has an alt text\n\n#Mastodon #Logo #English #Test",
-      spoiler_text: 'Mastodon logo',
-      ordered_media_attachment_ids: [media_attachment.id],
-      account: showcase_account,
-      visibility: :public,
-      sensitive: true,
-      thread: status_with_sensitive_media
-    ).find_or_create_by!(id: 10_000_006)
-    media_attachment.update(status_id: status_with_cw_media.id)
-    ProcessHashtagsService.new.call(status_with_cw_media)
-
-    media_attachment = MediaAttachment.create_with(
-      account: showcase_account,
-      file: File.open('spec/fixtures/files/boop.ogg'),
-      description: 'Mastodon boop'
-    ).find_or_create_by!(id: 10_000_003)
-    status_with_audio = Status.create_with(
-      text: "This is the same public status with an audio file and tags. The attached picture has an alt text\n\n#Mastodon #English #Test",
-      ordered_media_attachment_ids: [media_attachment.id],
-      account: showcase_account,
-      visibility: :public,
-      thread: status_with_cw_media
-    ).find_or_create_by!(id: 10_000_007)
-    media_attachment.update(status_id: status_with_audio.id)
-    ProcessHashtagsService.new.call(status_with_audio)
-
-    media_attachment = MediaAttachment.create_with(
-      account: showcase_account,
-      file: File.open('spec/fixtures/files/boop.ogg'),
-      description: 'Mastodon boop'
-    ).find_or_create_by!(id: 10_000_004)
-    status_with_sensitive_audio = Status.create_with(
-      text: "This is the same public status with an audio file and tags, but it is marked as sensitive. The attached picture has an alt text\n\n#Mastodon #English #Test",
-      ordered_media_attachment_ids: [media_attachment.id],
-      account: showcase_account,
-      visibility: :public,
-      sensitive: true,
-      thread: status_with_audio
-    ).find_or_create_by!(id: 10_000_008)
-    media_attachment.update(status_id: status_with_sensitive_audio.id)
-    ProcessHashtagsService.new.call(status_with_sensitive_audio)
-
-    media_attachment = MediaAttachment.create_with(
-      account: showcase_account,
-      file: File.open('spec/fixtures/files/boop.ogg'),
-      description: 'Mastodon boop'
-    ).find_or_create_by!(id: 10_000_005)
-    status_with_cw_audio = Status.create_with(
-      text: "This is the same public status with an audio file and tags, but it is behind a CW. The attached picture has an alt text\n\n#Mastodon #English #Test",
-      spoiler_text: 'Mastodon boop',
-      ordered_media_attachment_ids: [media_attachment.id],
-      account: showcase_account,
-      visibility: :public,
-      sensitive: true,
-      thread: status_with_sensitive_audio
-    ).find_or_create_by!(id: 10_000_009)
-    media_attachment.update(status_id: status_with_cw_audio.id)
-    ProcessHashtagsService.new.call(status_with_cw_audio)
-
-    media_attachments = [
-      MediaAttachment.create_with(
+      media_attachment = MediaAttachment.create_with(
         account: showcase_account,
         file: File.open('spec/fixtures/files/600x400.png'),
         description: 'Mastodon logo'
-      ).find_or_create_by!(id: 10_000_006),
-      MediaAttachment.create_with(
+      ).find_or_create_by!(id: 10_000_000)
+      status_with_media = Status.create_with(
+        text: "This is a public status with a picture and tags. The attached picture has an alt text\n\n#Mastodon #Logo #English #Test",
+        ordered_media_attachment_ids: [media_attachment.id],
+        account: showcase_account,
+        visibility: :public
+      ).find_or_create_by!(id: 10_000_004)
+      media_attachment.update(status_id: status_with_media.id)
+      ProcessHashtagsService.new.call(status_with_media)
+
+      media_attachment = MediaAttachment.create_with(
+        account: showcase_account,
+        file: File.open('spec/fixtures/files/600x400.png'),
+        description: 'Mastodon logo'
+      ).find_or_create_by!(id: 10_000_001)
+      status_with_sensitive_media = Status.create_with(
+        text: "This is the same public status with a picture and tags, but it is marked as sensitive. The attached picture has an alt text\n\n#Mastodon #Logo #English #Test",
+        ordered_media_attachment_ids: [media_attachment.id],
+        account: showcase_account,
+        visibility: :public,
+        sensitive: true,
+        thread: status_with_media
+      ).find_or_create_by!(id: 10_000_005)
+      media_attachment.update(status_id: status_with_sensitive_media.id)
+      ProcessHashtagsService.new.call(status_with_sensitive_media)
+
+      media_attachment = MediaAttachment.create_with(
+        account: showcase_account,
+        file: File.open('spec/fixtures/files/600x400.png'),
+        description: 'Mastodon logo'
+      ).find_or_create_by!(id: 10_000_002)
+      status_with_cw_media = Status.create_with(
+        text: "This is the same public status with a picture and tags, but it is behind a CW. The attached picture has an alt text\n\n#Mastodon #Logo #English #Test",
+        spoiler_text: 'Mastodon logo',
+        ordered_media_attachment_ids: [media_attachment.id],
+        account: showcase_account,
+        visibility: :public,
+        sensitive: true,
+        thread: status_with_sensitive_media
+      ).find_or_create_by!(id: 10_000_006)
+      media_attachment.update(status_id: status_with_cw_media.id)
+      ProcessHashtagsService.new.call(status_with_cw_media)
+
+      media_attachment = MediaAttachment.create_with(
+        account: showcase_account,
+        file: File.open('spec/fixtures/files/boop.ogg'),
+        description: 'Mastodon boop'
+      ).find_or_create_by!(id: 10_000_003)
+      status_with_audio = Status.create_with(
+        text: "This is the same public status with an audio file and tags. The attached picture has an alt text\n\n#Mastodon #English #Test",
+        ordered_media_attachment_ids: [media_attachment.id],
+        account: showcase_account,
+        visibility: :public,
+        thread: status_with_cw_media
+      ).find_or_create_by!(id: 10_000_007)
+      media_attachment.update(status_id: status_with_audio.id)
+      ProcessHashtagsService.new.call(status_with_audio)
+
+      media_attachment = MediaAttachment.create_with(
+        account: showcase_account,
+        file: File.open('spec/fixtures/files/boop.ogg'),
+        description: 'Mastodon boop'
+      ).find_or_create_by!(id: 10_000_004)
+      status_with_sensitive_audio = Status.create_with(
+        text: "This is the same public status with an audio file and tags, but it is marked as sensitive. The attached picture has an alt text\n\n#Mastodon #English #Test",
+        ordered_media_attachment_ids: [media_attachment.id],
+        account: showcase_account,
+        visibility: :public,
+        sensitive: true,
+        thread: status_with_audio
+      ).find_or_create_by!(id: 10_000_008)
+      media_attachment.update(status_id: status_with_sensitive_audio.id)
+      ProcessHashtagsService.new.call(status_with_sensitive_audio)
+
+      media_attachment = MediaAttachment.create_with(
+        account: showcase_account,
+        file: File.open('spec/fixtures/files/boop.ogg'),
+        description: 'Mastodon boop'
+      ).find_or_create_by!(id: 10_000_005)
+      status_with_cw_audio = Status.create_with(
+        text: "This is the same public status with an audio file and tags, but it is behind a CW. The attached picture has an alt text\n\n#Mastodon #English #Test",
+        spoiler_text: 'Mastodon boop',
+        ordered_media_attachment_ids: [media_attachment.id],
+        account: showcase_account,
+        visibility: :public,
+        sensitive: true,
+        thread: status_with_sensitive_audio
+      ).find_or_create_by!(id: 10_000_009)
+      media_attachment.update(status_id: status_with_cw_audio.id)
+      ProcessHashtagsService.new.call(status_with_cw_audio)
+
+      media_attachments = [
+        MediaAttachment.create_with(
+          account: showcase_account,
+          file: File.open('spec/fixtures/files/600x400.png'),
+          description: 'Mastodon logo'
+        ).find_or_create_by!(id: 10_000_006),
+        MediaAttachment.create_with(
+          account: showcase_account,
+          file: File.open('spec/fixtures/files/attachment.jpg')
+        ).find_or_create_by!(id: 10_000_007),
+        MediaAttachment.create_with(
+          account: showcase_account,
+          file: File.open('spec/fixtures/files/avatar-high.gif'),
+          description: 'Walking cartoon cat'
+        ).find_or_create_by!(id: 10_000_008),
+        MediaAttachment.create_with(
+          account: showcase_account,
+          file: File.open('spec/fixtures/files/text.png'),
+          description: 'Text saying “Hello Mastodon”'
+        ).find_or_create_by!(id: 10_000_009),
+      ]
+      status_with_multiple_attachments = Status.create_with(
+        text: "This is a post with multiple attachments, not all of which have a description\n\n#Mastodon #English #Test",
+        spoiler_text: 'multiple attachments',
+        ordered_media_attachment_ids: media_attachments.pluck(:id),
+        account: showcase_account,
+        visibility: :public,
+        sensitive: true,
+        thread: status_with_cw_audio
+      ).find_or_create_by!(id: 10_000_010)
+      media_attachments.each { |attachment| attachment.update!(status_id: status_with_multiple_attachments.id) }
+      ProcessHashtagsService.new.call(status_with_multiple_attachments)
+
+      remote_account = Account.create_with(
+        username: 'fake.example',
+        domain: 'example.org',
+        uri: 'https://example.org/foo/bar',
+        url: 'https://example.org/foo/bar',
+        locked: true
+      ).find_or_create_by!(id: 10_000_001)
+
+      remote_formatted_post = Status.create_with(
+        text: <<~HTML,
+          <p>This is a post with a variety of HTML in it</p>
+          <p>For instance, <strong>this text is bold</strong> and <b>this one as well</b>, while <del>this text is stricken through</del> and <s>this one as well</s>.</p>
+          <blockquote>
+            <p>This thing, here, is a block quote<br/>with some <strong>bold</strong> as well</p>
+            <ul>
+              <li>a list item</li>
+              <li>
+                and another with
+                <ul>
+                  <li>nested</li>
+                  <li>items!</li>
+                </ul>
+              </li>
+            </ul>
+          </blockquote>
+          <pre><code>// And this is some code
+          // with two lines of comments
+          </code></pre>
+          <p>And this is <code>inline</code> code</p>
+          <p>Finally, please observe this Ruby element: <ruby> 明日 <rp>(</rp><rt>Ashita</rt><rp>)</rp> </ruby></p>
+        HTML
+        account: remote_account,
+        uri: 'https://example.org/foo/bar/baz',
+        url: 'https://example.org/foo/bar/baz'
+      ).find_or_create_by!(id: 10_000_011)
+      Status.create_with(account: showcase_account, reblog: remote_formatted_post).find_or_create_by!(id: 10_000_012)
+
+      unattached_quote_post = Status.create_with(
+        text: 'This is a quote of a post that does not exist',
+        account: showcase_account,
+        visibility: :public
+      ).find_or_create_by!(id: 10_000_013)
+      Quote.create_with(
+        status: unattached_quote_post,
+        quoted_status: nil
+      ).find_or_create_by!(id: 10_000_000)
+
+      self_quote = Status.create_with(
+        text: 'This is a quote of a public self-post',
+        account: showcase_account,
+        visibility: :public
+      ).find_or_create_by!(id: 10_000_014)
+      Quote.create_with(
+        status: self_quote,
+        quoted_status: status_with_media,
+        state: :accepted
+      ).find_or_create_by!(id: 10_000_001)
+
+      nested_self_quote = Status.create_with(
+        text: 'This is a quote of a public self-post which itself is a self-quote',
+        account: showcase_account,
+        visibility: :public
+      ).find_or_create_by!(id: 10_000_015)
+      Quote.create_with(
+        status: nested_self_quote,
+        quoted_status: self_quote,
+        state: :accepted
+      ).find_or_create_by!(id: 10_000_002)
+
+      recursive_self_quote = Status.create_with(
+        text: 'This is a recursive self-quote; no real reason for it to exist, but just to make sure we handle them gracefuly',
+        account: showcase_account,
+        visibility: :public
+      ).find_or_create_by!(id: 10_000_016)
+      Quote.create_with(
+        status: recursive_self_quote,
+        quoted_status: recursive_self_quote,
+        state: :accepted
+      ).find_or_create_by!(id: 10_000_003)
+
+      self_private_quote = Status.create_with(
+        text: 'This is a public post of a private self-post: the quoted post should not be visible to non-followers',
+        account: showcase_account,
+        visibility: :public
+      ).find_or_create_by!(id: 10_000_017)
+      Quote.create_with(
+        status: self_private_quote,
+        quoted_status: private_mentionless,
+        state: :accepted
+      ).find_or_create_by!(id: 10_000_004)
+
+      uncwed_quote_cwed = Status.create_with(
+        text: 'This is a quote without CW of a quoted post that has a CW',
+        account: showcase_account,
+        visibility: :public
+      ).find_or_create_by!(id: 10_000_018)
+      Quote.create_with(
+        status: uncwed_quote_cwed,
+        quoted_status: public_self_reply_with_cw,
+        state: :accepted
+      ).find_or_create_by!(id: 10_000_005)
+
+      cwed_quote_cwed = Status.create_with(
+        text: 'This is a quote with a CW of a quoted post that itself has a CW',
+        spoiler_text: 'Quote post with a CW',
+        account: showcase_account,
+        visibility: :public
+      ).find_or_create_by!(id: 10_000_019)
+      Quote.create_with(
+        status: cwed_quote_cwed,
+        quoted_status: public_self_reply_with_cw,
+        state: :accepted
+      ).find_or_create_by!(id: 10_000_006)
+
+      pending_quote_post = Status.create_with(
+        text: 'This quote post is pending',
+        account: showcase_account,
+        visibility: :public
+      ).find_or_create_by!(id: 10_000_020)
+      Quote.create_with(
+        status: pending_quote_post,
+        quoted_status: remote_formatted_post,
+        activity_uri: 'https://foo/bar',
+        state: :pending
+      ).find_or_create_by!(id: 10_000_007)
+
+      rejected_quote_post = Status.create_with(
+        text: 'This quote post is rejected',
+        account: showcase_account,
+        visibility: :public
+      ).find_or_create_by!(id: 10_000_021)
+      Quote.create_with(
+        status: rejected_quote_post,
+        quoted_status: remote_formatted_post,
+        activity_uri: 'https://foo/foo',
+        state: :rejected
+      ).find_or_create_by!(id: 10_000_008)
+
+      revoked_quote_post = Status.create_with(
+        text: 'This quote post is revoked',
+        account: showcase_account,
+        visibility: :public
+      ).find_or_create_by!(id: 10_000_022)
+      Quote.create_with(
+        status: revoked_quote_post,
+        quoted_status: remote_formatted_post,
+        activity_uri: 'https://foo/baz',
+        state: :revoked
+      ).find_or_create_by!(id: 10_000_009)
+
+      StatusPin.create_with(account: showcase_account, status: public_self_reply_with_cw).find_or_create_by!(id: 10_000_000)
+      StatusPin.create_with(account: showcase_account, status: private_mentionless).find_or_create_by!(id: 10_000_001)
+
+      showcase_account.update!(
+        display_name: 'Mastodon test/showcase account',
+        note: 'Test account to showcase many Mastodon features. Most of its posts are public, but some are private!'
+      )
+
+      remote_quote = Status.create_with(
+        text: <<~HTML,
+          <p>This is a self-quote of a remote formatted post</p>
+          <p class="quote-inline">RE: <a href="https://example.org/foo/bar/baz">https://example.org/foo/bar/baz</a></p>
+        HTML
+        account: remote_account,
+        uri: 'https://example.org/foo/bar/quote',
+        url: 'https://example.org/foo/bar/quote'
+      ).find_or_create_by!(id: 10_000_023)
+      Quote.create_with(
+        status: remote_quote,
+        quoted_status: remote_formatted_post,
+        state: :accepted
+      ).find_or_create_by!(id: 10_000_010)
+      Status.create_with(
+        account: showcase_account,
+        reblog: remote_quote
+      ).find_or_create_by!(id: 10_000_024)
+
+      media_attachment = MediaAttachment.create_with(
         account: showcase_account,
         file: File.open('spec/fixtures/files/attachment.jpg')
-      ).find_or_create_by!(id: 10_000_007),
-      MediaAttachment.create_with(
+      ).find_or_create_by!(id: 10_000_010)
+      quote_post_with_media = Status.create_with(
+        text: "This is a status with a picture and tags which also quotes a status with a picture.\n\n#Mastodon #Test",
+        ordered_media_attachment_ids: [media_attachment.id],
         account: showcase_account,
-        file: File.open('spec/fixtures/files/avatar-high.gif'),
-        description: 'Walking cartoon cat'
-      ).find_or_create_by!(id: 10_000_008),
-      MediaAttachment.create_with(
+        visibility: :public
+      ).find_or_create_by!(id: 10_000_025)
+      media_attachment.update(status_id: quote_post_with_media.id)
+      ProcessHashtagsService.new.call(quote_post_with_media)
+      Quote.create_with(
+        status: quote_post_with_media,
+        quoted_status: status_with_media,
+        state: :accepted
+      ).find_or_create_by!(id: 10_000_011)
+
+      showcase_sidekick_account = Account.create_with(username: 'showcase_sidekick').find_or_create_by!(id: 10_000_002)
+      sidekick_user = User.create_with(
+        account_id: showcase_sidekick_account.id,
+        agreement: true,
+        password: SecureRandom.hex,
+        email: ENV.fetch('TEST_DATA_SHOWCASE_SIDEKICK_EMAIL', 'showcase_sidekick@joinmastodon.org'),
+        confirmed_at: Time.now.utc,
+        approved: true,
+        bypass_registration_checks: true
+      ).find_or_create_by!(id: 10_000_001)
+      sidekick_user.mark_email_as_confirmed!
+      sidekick_user.approve!
+
+      sidekick_post = Status.create_with(
+        text: 'This post only exists to be quoted.',
+        account: showcase_sidekick_account,
+        visibility: :public
+      ).find_or_create_by!(id: 10_000_026)
+      sidekick_quote_post = Status.create_with(
+        text: 'This is a quote of a different user.',
         account: showcase_account,
-        file: File.open('spec/fixtures/files/text.png'),
-        description: 'Text saying “Hello Mastodon”'
-      ).find_or_create_by!(id: 10_000_009),
-    ]
-    status_with_multiple_attachments = Status.create_with(
-      text: "This is a post with multiple attachments, not all of which have a description\n\n#Mastodon #English #Test",
-      spoiler_text: 'multiple attachments',
-      ordered_media_attachment_ids: media_attachments.pluck(:id),
-      account: showcase_account,
-      visibility: :public,
-      sensitive: true,
-      thread: status_with_cw_audio
-    ).find_or_create_by!(id: 10_000_010)
-    media_attachments.each { |attachment| attachment.update!(status_id: status_with_multiple_attachments.id) }
-    ProcessHashtagsService.new.call(status_with_multiple_attachments)
+        visibility: :public
+      ).find_or_create_by!(id: 10_000_027)
+      Quote.create_with(
+        status: sidekick_quote_post,
+        quoted_status: sidekick_post,
+        activity_uri: 'https://foo/cross-account-quote',
+        state: :accepted
+      ).find_or_create_by!(id: 10_000_012)
 
-    remote_account = Account.create_with(
-      username: 'fake.example',
-      domain: 'example.org',
-      uri: 'https://example.org/foo/bar',
-      url: 'https://example.org/foo/bar',
-      locked: true
-    ).find_or_create_by!(id: 10_000_001)
+      quoted = Status.create_with(
+        text: 'This should have a preview card: https://joinmastodon.org',
+        account: showcase_account,
+        visibility: :public
+      ).find_or_create_by!(id: 10_000_028)
+      LinkCrawlWorker.perform_async(10_000_028)
+      quoting = Status.create_with(
+        text: 'This should quote a post with a preview card',
+        account: showcase_account,
+        visibility: :public
+      ).find_or_create_by!(id: 10_000_029)
+      Quote.create_with(
+        status: quoting,
+        quoted_status: quoted,
+        state: :accepted
+      ).find_or_create_by!(id: 10_000_013)
 
-    remote_formatted_post = Status.create_with(
-      text: <<~HTML,
-        <p>This is a post with a variety of HTML in it</p>
-        <p>For instance, <strong>this text is bold</strong> and <b>this one as well</b>, while <del>this text is stricken through</del> and <s>this one as well</s>.</p>
-        <blockquote>
-          <p>This thing, here, is a block quote<br/>with some <strong>bold</strong> as well</p>
-          <ul>
-            <li>a list item</li>
-            <li>
-              and another with
-              <ul>
-                <li>nested</li>
-                <li>items!</li>
-              </ul>
-            </li>
-          </ul>
-        </blockquote>
-        <pre><code>// And this is some code
-        // with two lines of comments
-        </code></pre>
-        <p>And this is <code>inline</code> code</p>
-        <p>Finally, please observe this Ruby element: <ruby> 明日 <rp>(</rp><rt>Ashita</rt><rp>)</rp> </ruby></p>
-      HTML
-      account: remote_account,
-      uri: 'https://example.org/foo/bar/baz',
-      url: 'https://example.org/foo/bar/baz'
-    ).find_or_create_by!(id: 10_000_011)
-    Status.create_with(account: showcase_account, reblog: remote_formatted_post).find_or_create_by!(id: 10_000_012)
-
-    unattached_quote_post = Status.create_with(
-      text: 'This is a quote of a post that does not exist',
-      account: showcase_account,
-      visibility: :public
-    ).find_or_create_by!(id: 10_000_013)
-    Quote.create_with(
-      status: unattached_quote_post,
-      quoted_status: nil
-    ).find_or_create_by!(id: 10_000_000)
-
-    self_quote = Status.create_with(
-      text: 'This is a quote of a public self-post',
-      account: showcase_account,
-      visibility: :public
-    ).find_or_create_by!(id: 10_000_014)
-    Quote.create_with(
-      status: self_quote,
-      quoted_status: status_with_media,
-      state: :accepted
-    ).find_or_create_by!(id: 10_000_001)
-
-    nested_self_quote = Status.create_with(
-      text: 'This is a quote of a public self-post which itself is a self-quote',
-      account: showcase_account,
-      visibility: :public
-    ).find_or_create_by!(id: 10_000_015)
-    Quote.create_with(
-      status: nested_self_quote,
-      quoted_status: self_quote,
-      state: :accepted
-    ).find_or_create_by!(id: 10_000_002)
-
-    recursive_self_quote = Status.create_with(
-      text: 'This is a recursive self-quote; no real reason for it to exist, but just to make sure we handle them gracefuly',
-      account: showcase_account,
-      visibility: :public
-    ).find_or_create_by!(id: 10_000_016)
-    Quote.create_with(
-      status: recursive_self_quote,
-      quoted_status: recursive_self_quote,
-      state: :accepted
-    ).find_or_create_by!(id: 10_000_003)
-
-    self_private_quote = Status.create_with(
-      text: 'This is a public post of a private self-post: the quoted post should not be visible to non-followers',
-      account: showcase_account,
-      visibility: :public
-    ).find_or_create_by!(id: 10_000_017)
-    Quote.create_with(
-      status: self_private_quote,
-      quoted_status: private_mentionless,
-      state: :accepted
-    ).find_or_create_by!(id: 10_000_004)
-
-    uncwed_quote_cwed = Status.create_with(
-      text: 'This is a quote without CW of a quoted post that has a CW',
-      account: showcase_account,
-      visibility: :public
-    ).find_or_create_by!(id: 10_000_018)
-    Quote.create_with(
-      status: uncwed_quote_cwed,
-      quoted_status: public_self_reply_with_cw,
-      state: :accepted
-    ).find_or_create_by!(id: 10_000_005)
-
-    cwed_quote_cwed = Status.create_with(
-      text: 'This is a quote with a CW of a quoted post that itself has a CW',
-      spoiler_text: 'Quote post with a CW',
-      account: showcase_account,
-      visibility: :public
-    ).find_or_create_by!(id: 10_000_019)
-    Quote.create_with(
-      status: cwed_quote_cwed,
-      quoted_status: public_self_reply_with_cw,
-      state: :accepted
-    ).find_or_create_by!(id: 10_000_006)
-
-    pending_quote_post = Status.create_with(
-      text: 'This quote post is pending',
-      account: showcase_account,
-      visibility: :public
-    ).find_or_create_by!(id: 10_000_020)
-    Quote.create_with(
-      status: pending_quote_post,
-      quoted_status: remote_formatted_post,
-      activity_uri: 'https://foo/bar',
-      state: :pending
-    ).find_or_create_by!(id: 10_000_007)
-
-    rejected_quote_post = Status.create_with(
-      text: 'This quote post is rejected',
-      account: showcase_account,
-      visibility: :public
-    ).find_or_create_by!(id: 10_000_021)
-    Quote.create_with(
-      status: rejected_quote_post,
-      quoted_status: remote_formatted_post,
-      activity_uri: 'https://foo/foo',
-      state: :rejected
-    ).find_or_create_by!(id: 10_000_008)
-
-    revoked_quote_post = Status.create_with(
-      text: 'This quote post is revoked',
-      account: showcase_account,
-      visibility: :public
-    ).find_or_create_by!(id: 10_000_022)
-    Quote.create_with(
-      status: revoked_quote_post,
-      quoted_status: remote_formatted_post,
-      activity_uri: 'https://foo/baz',
-      state: :revoked
-    ).find_or_create_by!(id: 10_000_009)
-
-    StatusPin.create_with(account: showcase_account, status: public_self_reply_with_cw).find_or_create_by!(id: 10_000_000)
-    StatusPin.create_with(account: showcase_account, status: private_mentionless).find_or_create_by!(id: 10_000_001)
-
-    showcase_account.update!(
-      display_name: 'Mastodon test/showcase account',
-      note: 'Test account to showcase many Mastodon features. Most of its posts are public, but some are private!'
-    )
-
-    remote_quote = Status.create_with(
-      text: <<~HTML,
-        <p>This is a self-quote of a remote formatted post</p>
-        <p class="quote-inline">RE: <a href="https://example.org/foo/bar/baz">https://example.org/foo/bar/baz</a></p>
-      HTML
-      account: remote_account,
-      uri: 'https://example.org/foo/bar/quote',
-      url: 'https://example.org/foo/bar/quote'
-    ).find_or_create_by!(id: 10_000_023)
-    Quote.create_with(
-      status: remote_quote,
-      quoted_status: remote_formatted_post,
-      state: :accepted
-    ).find_or_create_by!(id: 10_000_010)
-    Status.create_with(
-      account: showcase_account,
-      reblog: remote_quote
-    ).find_or_create_by!(id: 10_000_024)
-
-    media_attachment = MediaAttachment.create_with(
-      account: showcase_account,
-      file: File.open('spec/fixtures/files/attachment.jpg')
-    ).find_or_create_by!(id: 10_000_010)
-    quote_post_with_media = Status.create_with(
-      text: "This is a status with a picture and tags which also quotes a status with a picture.\n\n#Mastodon #Test",
-      ordered_media_attachment_ids: [media_attachment.id],
-      account: showcase_account,
-      visibility: :public
-    ).find_or_create_by!(id: 10_000_025)
-    media_attachment.update(status_id: quote_post_with_media.id)
-    ProcessHashtagsService.new.call(quote_post_with_media)
-    Quote.create_with(
-      status: quote_post_with_media,
-      quoted_status: status_with_media,
-      state: :accepted
-    ).find_or_create_by!(id: 10_000_011)
-
-    showcase_sidekick_account = Account.create_with(username: 'showcase_sidekick').find_or_create_by!(id: 10_000_002)
-    sidekick_user = User.create_with(
-      account_id: showcase_sidekick_account.id,
-      agreement: true,
-      password: SecureRandom.hex,
-      email: ENV.fetch('TEST_DATA_SHOWCASE_SIDEKICK_EMAIL', 'showcase_sidekick@joinmastodon.org'),
-      confirmed_at: Time.now.utc,
-      approved: true,
-      bypass_registration_checks: true
-    ).find_or_create_by!(id: 10_000_001)
-    sidekick_user.mark_email_as_confirmed!
-    sidekick_user.approve!
-
-    sidekick_post = Status.create_with(
-      text: 'This post only exists to be quoted.',
-      account: showcase_sidekick_account,
-      visibility: :public
-    ).find_or_create_by!(id: 10_000_026)
-    sidekick_quote_post = Status.create_with(
-      text: 'This is a quote of a different user.',
-      account: showcase_account,
-      visibility: :public
-    ).find_or_create_by!(id: 10_000_027)
-    Quote.create_with(
-      status: sidekick_quote_post,
-      quoted_status: sidekick_post,
-      activity_uri: 'https://foo/cross-account-quote',
-      state: :accepted
-    ).find_or_create_by!(id: 10_000_012)
+      Status.create_with(
+        text: 'This post has a manual quote policy',
+        account: remote_account,
+        visibility: :public,
+        quote_approval_policy: Status::QUOTE_APPROVAL_POLICY_FLAGS[:public]
+      ).find_or_create_by!(id: 10_000_030)
+    end
   end
 end
diff --git a/package.json b/package.json
index 26704223340..4596fc421af 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@mastodon/mastodon",
   "license": "AGPL-3.0-or-later",
-  "packageManager": "yarn@4.9.2",
+  "packageManager": "yarn@4.10.3",
   "engines": {
     "node": ">=20"
   },
@@ -30,8 +30,9 @@
     "test:storybook": "vitest --project=storybook",
     "typecheck": "tsc --noEmit",
     "storybook": "storybook dev -p 6006",
-    "build-storybook": "VITE_RUBY_PUBLIC_OUTPUT_DIR='.' VITE_RUBY_PUBLIC_DIR='./storybook-static' storybook build",
-    "chromatic": "npx chromatic -d storybook-static"
+    "build-storybook": "storybook build",
+    "chromatic": "npx chromatic -d storybook-static",
+    "msw:updateWorker": "msw init"
   },
   "repository": {
     "type": "git",
@@ -47,12 +48,12 @@
     "@gamestdio/websocket": "^0.3.2",
     "@github/webauthn-json": "^2.1.1",
     "@optimize-lodash/rollup-plugin": "^5.0.2",
-    "@rails/ujs": "7.1.501",
+    "@rails/ujs": "7.1.502",
     "@react-spring/web": "^9.7.5",
     "@reduxjs/toolkit": "^2.0.1",
     "@use-gesture/react": "^10.3.1",
-    "@vitejs/plugin-legacy": "^6.1.1",
-    "@vitejs/plugin-react": "^4.2.1",
+    "@vitejs/plugin-legacy": "^7.2.1",
+    "@vitejs/plugin-react": "^5.0.0",
     "arrow-key-navigation": "^1.2.0",
     "async-mutex": "^0.5.0",
     "axios": "^1.4.0",
@@ -63,16 +64,20 @@
     "cocoon-js-vanilla": "^1.5.1",
     "color-blend": "^4.0.0",
     "core-js": "^3.30.2",
-    "cross-env": "^7.0.3",
+    "cross-env": "^10.0.0",
+    "debug": "^4.4.1",
     "detect-passive-events": "^2.0.3",
     "emoji-mart": "npm:emoji-mart-lazyload@latest",
     "emojibase": "^16.0.0",
     "emojibase-data": "^16.0.3",
+    "emojibase-regex": "^16.0.0",
     "escape-html": "^1.0.3",
+    "fast-glob": "^3.3.3",
     "fuzzysort": "^3.0.0",
     "history": "^4.10.1",
     "hoist-non-react-statics": "^3.3.2",
     "http-link-header": "^1.1.1",
+    "idb": "^8.0.3",
     "immutable": "^4.3.0",
     "intl-messageformat": "^10.7.16",
     "js-yaml": "^4.1.0",
@@ -86,7 +91,6 @@
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-helmet": "^6.1.0",
-    "react-hotkeys": "^1.1.4",
     "react-immutable-proptypes": "^2.2.0",
     "react-immutable-pure-component": "^2.2.2",
     "react-intl": "^7.1.10",
@@ -95,7 +99,6 @@
     "react-redux-loading-bar": "^5.0.8",
     "react-router": "^5.3.4",
     "react-router-dom": "^5.3.4",
-    "react-router-scroll-4": "^1.0.0-beta.1",
     "react-select": "^5.7.3",
     "react-sparklines": "^1.7.0",
     "react-swipeable-views": "^0.14.0",
@@ -104,8 +107,10 @@
     "redux-immutable": "^4.0.0",
     "regenerator-runtime": "^0.14.0",
     "requestidlecallback": "^0.3.0",
-    "rollup-plugin-visualizer": "^6.0.0",
+    "rollup-plugin-gzip": "^4.1.1",
+    "rollup-plugin-visualizer": "^6.0.3",
     "sass": "^1.62.1",
+    "scroll-behavior": "^0.11.0",
     "stacktrace-js": "^2.0.2",
     "stringz": "^2.1.0",
     "substring-trie": "^1.0.2",
@@ -113,27 +118,28 @@
     "tiny-queue": "^0.2.1",
     "twitter-text": "3.1.0",
     "use-debounce": "^10.0.0",
-    "vite": "^6.3.5",
-    "vite-plugin-pwa": "^1.0.0",
-    "vite-plugin-rails": "^0.5.0",
-    "vite-plugin-ruby": "^5.1.1",
+    "vite": "^7.1.1",
+    "vite-plugin-manifest-sri": "^0.2.0",
+    "vite-plugin-pwa": "^1.0.2",
+    "vite-plugin-static-copy": "^3.1.1",
     "vite-plugin-svgr": "^4.3.0",
     "vite-tsconfig-paths": "^5.1.4",
     "wicg-inert": "^3.1.2",
-    "workbox-expiration": "^7.0.0",
-    "workbox-routing": "^7.0.0",
-    "workbox-strategies": "^7.0.0",
-    "workbox-window": "^7.0.0"
+    "workbox-expiration": "^7.3.0",
+    "workbox-routing": "^7.3.0",
+    "workbox-strategies": "^7.3.0",
+    "workbox-window": "^7.3.0"
   },
   "devDependencies": {
     "@eslint/js": "^9.23.0",
     "@formatjs/cli": "^6.1.1",
-    "@storybook/addon-a11y": "^9.0.4",
-    "@storybook/addon-docs": "^9.0.4",
-    "@storybook/addon-vitest": "^9.0.4",
-    "@storybook/react-vite": "^9.0.4",
-    "@testing-library/dom": "^10.2.0",
-    "@testing-library/react": "^16.0.0",
+    "@storybook/addon-a11y": "^9.1.1",
+    "@storybook/addon-docs": "^9.1.1",
+    "@storybook/addon-vitest": "^9.1.1",
+    "@storybook/react-vite": "^9.1.1",
+    "@testing-library/dom": "^10.4.1",
+    "@testing-library/react": "^16.3.0",
+    "@types/debug": "^4",
     "@types/emoji-mart": "3.0.14",
     "@types/escape-html": "^1.0.2",
     "@types/hoist-non-react-statics": "^3.3.1",
@@ -157,44 +163,41 @@
     "@types/react-toggle": "^4.0.3",
     "@types/redux-immutable": "^4.0.3",
     "@types/requestidlecallback": "^0.3.5",
-    "@vitest/browser": "^3.2.1",
-    "@vitest/coverage-v8": "^3.2.0",
-    "@vitest/ui": "^3.2.1",
-    "chromatic": "^12.1.0",
+    "@vitest/browser": "^3.2.4",
+    "@vitest/coverage-v8": "^3.2.4",
+    "@vitest/ui": "^3.2.4",
+    "chromatic": "^13.1.3",
     "eslint": "^9.23.0",
     "eslint-import-resolver-typescript": "^4.2.5",
     "eslint-plugin-formatjs": "^5.3.1",
-    "eslint-plugin-import": "~2.31.0",
-    "eslint-plugin-jsdoc": "^50.6.9",
+    "eslint-plugin-import": "~2.32.0",
+    "eslint-plugin-jsdoc": "^54.0.0",
     "eslint-plugin-jsx-a11y": "~6.10.2",
     "eslint-plugin-promise": "~7.2.1",
     "eslint-plugin-react": "^7.37.4",
     "eslint-plugin-react-hooks": "^5.2.0",
     "eslint-plugin-storybook": "^9.0.4",
+    "fake-indexeddb": "^6.0.1",
     "globals": "^16.0.0",
     "husky": "^9.0.11",
     "lint-staged": "^16.0.0",
     "msw": "^2.10.2",
     "msw-storybook-addon": "^2.0.5",
-    "playwright": "^1.52.0",
+    "playwright": "^1.54.1",
     "prettier": "^3.3.3",
     "react-test-renderer": "^18.2.0",
-    "storybook": "^9.0.4",
+    "storybook": "^9.1.1",
     "stylelint": "^16.19.1",
     "stylelint-config-prettier-scss": "^1.0.0",
     "stylelint-config-standard-scss": "^15.0.1",
-    "typescript": "~5.7.3",
-    "typescript-eslint": "^8.29.1",
-    "vite-plugin-rails": "^0.5.0",
-    "vite-plugin-svgr": "^4.2.0",
-    "vitest": "^3.2.1"
+    "typescript": "~5.9.0",
+    "typescript-eslint": "^8.45.0",
+    "vitest": "^3.2.4"
   },
   "resolutions": {
     "@types/react": "^18.2.7",
     "@types/react-dom": "^18.2.4",
-    "kind-of": "^6.0.3",
-    "vite-plugin-ruby": "^5.1.0",
-    "vite": "^6.3.5"
+    "kind-of": "^6.0.3"
   },
   "peerDependenciesMeta": {
     "react": {
diff --git a/spec/configuration/email_spec.rb b/spec/configuration/email_spec.rb
new file mode 100644
index 00000000000..2838beb6450
--- /dev/null
+++ b/spec/configuration/email_spec.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Configuration for email', type: :feature do
+  context 'with special characters in SMTP_PASSWORD env variable' do
+    let(:password) { ']]123456789[["!:@<>/\\=' }
+
+    around do |example|
+      ClimateControl.modify SMTP_PASSWORD: password do
+        example.run
+      end
+    end
+
+    it 'parses value correctly' do
+      expect(Rails.application.config_for(:email, env: :production))
+        .to include(
+          smtp_settings: include(password: password)
+        )
+    end
+  end
+end
diff --git a/spec/controllers/admin/export_domain_allows_controller_spec.rb b/spec/controllers/admin/export_domain_allows_controller_spec.rb
index dcb1f55a99e..7879a5e1816 100644
--- a/spec/controllers/admin/export_domain_allows_controller_spec.rb
+++ b/spec/controllers/admin/export_domain_allows_controller_spec.rb
@@ -17,17 +17,6 @@ RSpec.describe Admin::ExportDomainAllowsController do
     end
   end
 
-  describe 'GET #export' do
-    it 'renders instances' do
-      Fabricate(:domain_allow, domain: 'good.domain')
-      Fabricate(:domain_allow, domain: 'better.domain')
-
-      get :export, params: { format: :csv }
-      expect(response).to have_http_status(200)
-      expect(response.body).to eq(domain_allows_csv_file)
-    end
-  end
-
   describe 'POST #import' do
     it 'allows imported domains' do
       post :import, params: { admin_import: { data: fixture_file_upload('domain_allows.csv') } }
@@ -50,10 +39,4 @@ RSpec.describe Admin::ExportDomainAllowsController do
       expect(flash[:error]).to eq(I18n.t('admin.export_domain_allows.no_file'))
     end
   end
-
-  private
-
-  def domain_allows_csv_file
-    File.read(File.join(file_fixture_path, 'domain_allows.csv'))
-  end
 end
diff --git a/spec/controllers/admin/reports/actions_controller_spec.rb b/spec/controllers/admin/reports/actions_controller_spec.rb
index 87a48a7a3a0..4f82e69a760 100644
--- a/spec/controllers/admin/reports/actions_controller_spec.rb
+++ b/spec/controllers/admin/reports/actions_controller_spec.rb
@@ -144,6 +144,12 @@ RSpec.describe Admin::Reports::ActionsController do
           expect(media_attached_status.reload.sensitive).to be true
         end
       end
+
+      context 'when the action is "invalid_action"' do
+        let(:action) { 'invalid_action' }
+
+        it { is_expected.to redirect_to(admin_report_path(report)) }
+      end
     end
 
     context 'with action as submit button' do
diff --git a/spec/controllers/api/web/push_subscriptions_controller_spec.rb b/spec/controllers/api/web/push_subscriptions_controller_spec.rb
deleted file mode 100644
index 1e01709262b..00000000000
--- a/spec/controllers/api/web/push_subscriptions_controller_spec.rb
+++ /dev/null
@@ -1,124 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-RSpec.describe Api::Web::PushSubscriptionsController do
-  render_views
-
-  let(:user) { Fabricate(:user) }
-
-  let(:create_payload) do
-    {
-      subscription: {
-        endpoint: 'https://fcm.googleapis.com/fcm/send/fiuH06a27qE:APA91bHnSiGcLwdaxdyqVXNDR9w1NlztsHb6lyt5WDKOC_Z_Q8BlFxQoR8tWFSXUIDdkyw0EdvxTu63iqamSaqVSevW5LfoFwojws8XYDXv_NRRLH6vo2CdgiN4jgHv5VLt2A8ah6lUX',
-        keys: {
-          p256dh: 'BEm_a0bdPDhf0SOsrnB2-ategf1hHoCnpXgQsFj5JCkcoMrMt2WHoPfEYOYPzOIs9mZE8ZUaD7VA5vouy0kEkr8=',
-          auth: 'eH_C8rq2raXqlcBVDa1gLg==',
-        },
-        standard: standard,
-      },
-    }
-  end
-
-  let(:alerts_payload) do
-    {
-      data: {
-        policy: 'all',
-
-        alerts: {
-          follow: true,
-          follow_request: false,
-          favourite: false,
-          reblog: true,
-          mention: false,
-          poll: true,
-          status: false,
-        },
-      },
-    }
-  end
-  let(:standard) { '1' }
-
-  before do
-    sign_in(user)
-
-    stub_request(:post, create_payload[:subscription][:endpoint]).to_return(status: 200)
-  end
-
-  describe 'POST #create' do
-    it 'saves push subscriptions' do
-      post :create, format: :json, params: create_payload
-
-      expect(response).to have_http_status(200)
-
-      user.reload
-
-      expect(created_push_subscription)
-        .to have_attributes(
-          endpoint: eq(create_payload[:subscription][:endpoint]),
-          key_p256dh: eq(create_payload[:subscription][:keys][:p256dh]),
-          key_auth: eq(create_payload[:subscription][:keys][:auth])
-        )
-        .and be_standard
-      expect(user.session_activations.first.web_push_subscription).to eq(created_push_subscription)
-    end
-
-    context 'when standard is provided as false value' do
-      let(:standard) { '0' }
-
-      it 'saves push subscription with standard as false' do
-        post :create, format: :json, params: create_payload
-
-        expect(created_push_subscription)
-          .to_not be_standard
-      end
-    end
-
-    context 'with a user who has a session with a prior subscription' do
-      let!(:prior_subscription) { Fabricate(:web_push_subscription, session_activation: user.session_activations.last) }
-
-      it 'destroys prior subscription when creating new one' do
-        post :create, format: :json, params: create_payload
-
-        expect(response).to have_http_status(200)
-        expect { prior_subscription.reload }.to raise_error(ActiveRecord::RecordNotFound)
-      end
-    end
-
-    context 'with initial data' do
-      it 'saves alert settings' do
-        post :create, format: :json, params: create_payload.merge(alerts_payload)
-
-        expect(response).to have_http_status(200)
-
-        expect(created_push_subscription.data['policy']).to eq 'all'
-
-        %w(follow follow_request favourite reblog mention poll status).each do |type|
-          expect(created_push_subscription.data['alerts'][type]).to eq(alerts_payload[:data][:alerts][type.to_sym].to_s)
-        end
-      end
-    end
-  end
-
-  describe 'PUT #update' do
-    it 'changes alert settings' do
-      post :create, format: :json, params: create_payload
-
-      expect(response).to have_http_status(200)
-
-      alerts_payload[:id] = created_push_subscription.id
-
-      put :update, format: :json, params: alerts_payload
-
-      expect(created_push_subscription.data['policy']).to eq 'all'
-
-      %w(follow follow_request favourite reblog mention poll status).each do |type|
-        expect(created_push_subscription.data['alerts'][type]).to eq(alerts_payload[:data][:alerts][type.to_sym].to_s)
-      end
-    end
-  end
-
-  def created_push_subscription
-    Web::PushSubscription.find_by(endpoint: create_payload[:subscription][:endpoint])
-  end
-end
diff --git a/spec/controllers/application_controller_spec.rb b/spec/controllers/application_controller_spec.rb
index cd4181a00da..ea182a047f1 100644
--- a/spec/controllers/application_controller_spec.rb
+++ b/spec/controllers/application_controller_spec.rb
@@ -219,16 +219,16 @@ RSpec.describe ApplicationController do
     it_behaves_like 'error response', 410
   end
 
-  describe 'unprocessable_entity' do
+  describe 'unprocessable_content' do
     controller do
-      def route_unprocessable_entity
-        unprocessable_entity
+      def route_unprocessable_content
+        unprocessable_content
       end
     end
 
     subject do
-      routes.draw { get 'route_unprocessable_entity' => 'anonymous#route_unprocessable_entity' }
-      get 'route_unprocessable_entity'
+      routes.draw { get 'route_unprocessable_content' => 'anonymous#route_unprocessable_content' }
+      get 'route_unprocessable_content'
     end
 
     it_behaves_like 'error response', 422
diff --git a/spec/controllers/auth/registrations_controller_spec.rb b/spec/controllers/auth/registrations_controller_spec.rb
index a110717166d..04c2d5dbbbb 100644
--- a/spec/controllers/auth/registrations_controller_spec.rb
+++ b/spec/controllers/auth/registrations_controller_spec.rb
@@ -342,42 +342,6 @@ RSpec.describe Auth::RegistrationsController do
       end
     end
 
-    context 'when age verification is enabled' do
-      subject { post :create, params: { user: { account_attributes: { username: 'test' }, email: 'test@example.com', password: '12345678', password_confirmation: '12345678', agreement: 'true' }.merge(date_of_birth) } }
-
-      before do
-        Setting.min_age = 16
-      end
-
-      let(:date_of_birth) { {} }
-
-      context 'when date of birth is below age limit' do
-        let(:date_of_birth) { 13.years.ago.then { |date| { 'date_of_birth(1i)': date.day.to_s, 'date_of_birth(2i)': date.month.to_s, 'date_of_birth(3i)': date.year.to_s } } }
-
-        it 'does not create user' do
-          subject
-          user = User.find_by(email: 'test@example.com')
-          expect(user).to be_nil
-        end
-      end
-
-      context 'when date of birth is above age limit' do
-        let(:date_of_birth) { 17.years.ago.then { |date| { 'date_of_birth(1i)': date.day.to_s, 'date_of_birth(2i)': date.month.to_s, 'date_of_birth(3i)': date.year.to_s } } }
-
-        it 'redirects to setup and creates user' do
-          subject
-
-          expect(response).to redirect_to auth_setup_path
-
-          expect(User.find_by(email: 'test@example.com'))
-            .to be_present
-            .and have_attributes(
-              age_verified_at: not_eq(nil)
-            )
-        end
-      end
-    end
-
     it_behaves_like 'registration mode based responses', :create
   end
 
diff --git a/spec/controllers/auth/sessions_controller_spec.rb b/spec/controllers/auth/sessions_controller_spec.rb
index c852b16a69c..949af2a4259 100644
--- a/spec/controllers/auth/sessions_controller_spec.rb
+++ b/spec/controllers/auth/sessions_controller_spec.rb
@@ -100,11 +100,14 @@ RSpec.describe Auth::SessionsController do
       let(:user) { Fabricate(:user, email: 'foo@bar.com', password: 'abcdefgh') }
 
       context 'when using a valid password' do
-        before do
+        subject do
           post :create, params: { user: { email: user.email, password: user.password } }
         end
 
         it 'redirects to home and logs the user in' do
+          expect { subject }
+            .to change(user.login_activities.where(success: true), :count).by(1)
+
           expect(response).to redirect_to(root_path)
 
           expect(controller.current_user).to eq user
@@ -265,10 +268,9 @@ RSpec.describe Auth::SessionsController do
 
           it 'does not log the user in, sets a flash message, and sends a suspicious sign in email', :inline_jobs do
             emails = capture_emails do
-              Auth::SessionsController::MAX_2FA_ATTEMPTS_PER_HOUR.times do
-                post :create, params: { user: { otp_attempt: '1234' } }, session: { attempt_user_id: user.id, attempt_user_updated_at: user.updated_at.to_s }
-                expect(controller.current_user).to be_nil
-              end
+              expect { process_maximum_two_factor_attempts }
+                .to change(user.login_activities.where(success: false), :count).by(1)
+
               post :create, params: { user: { otp_attempt: user.current_otp } }, session: { attempt_user_id: user.id, attempt_user_updated_at: user.updated_at.to_s }
             end
 
@@ -286,6 +288,13 @@ RSpec.describe Auth::SessionsController do
                 subject: eq(I18n.t('user_mailer.failed_2fa.subject'))
               )
           end
+
+          def process_maximum_two_factor_attempts
+            Auth::SessionsController::MAX_2FA_ATTEMPTS_PER_HOUR.times do
+              post :create, params: { user: { otp_attempt: '1234' } }, session: { attempt_user_id: user.id, attempt_user_updated_at: user.updated_at.to_s }
+              expect(controller.current_user).to be_nil
+            end
+          end
         end
 
         context 'when using a valid OTP' do
diff --git a/spec/controllers/concerns/account_controller_concern_spec.rb b/spec/controllers/concerns/account_controller_concern_spec.rb
index df6278a6e98..b5c8c166433 100644
--- a/spec/controllers/concerns/account_controller_concern_spec.rb
+++ b/spec/controllers/concerns/account_controller_concern_spec.rb
@@ -58,7 +58,7 @@ RSpec.describe AccountControllerConcern do
       expect(response)
         .to have_http_status(200)
         .and have_http_link_header(webfinger_url(resource: account.to_webfinger_s)).for(rel: 'lrdd', type: 'application/jrd+json')
-        .and have_http_link_header(account_url(account, protocol: :https)).for(rel: 'alternate', type: 'application/activity+json')
+        .and have_http_link_header(ActivityPub::TagManager.instance.uri_for(account)).for(rel: 'alternate', type: 'application/activity+json')
       expect(response.body)
         .to include(account.username)
     end
diff --git a/spec/controllers/concerns/accountable_concern_spec.rb b/spec/controllers/concerns/accountable_concern_spec.rb
index cd06d872bb5..e68090fdc2f 100644
--- a/spec/controllers/concerns/accountable_concern_spec.rb
+++ b/spec/controllers/concerns/accountable_concern_spec.rb
@@ -6,6 +6,7 @@ RSpec.describe AccountableConcern do
   let(:hoge_class) do
     Class.new do
       include AccountableConcern
+
       attr_reader :current_account
 
       def initialize(current_account)
diff --git a/spec/controllers/follower_accounts_controller_spec.rb b/spec/controllers/follower_accounts_controller_spec.rb
index e14ed00e609..dab6aadbaab 100644
--- a/spec/controllers/follower_accounts_controller_spec.rb
+++ b/spec/controllers/follower_accounts_controller_spec.rb
@@ -49,8 +49,8 @@ RSpec.describe FollowerAccountsController do
           expect(response.parsed_body)
             .to include(
               orderedItems: contain_exactly(
-                include(follow_from_bob.account.username),
-                include(follow_from_chris.account.username)
+                ActivityPub::TagManager.instance.uri_for(follow_from_bob.account),
+                ActivityPub::TagManager.instance.uri_for(follow_from_chris.account)
               ),
               totalItems: eq(2),
               partOf: be_present
diff --git a/spec/controllers/following_accounts_controller_spec.rb b/spec/controllers/following_accounts_controller_spec.rb
index fea4d4845c8..666c655d743 100644
--- a/spec/controllers/following_accounts_controller_spec.rb
+++ b/spec/controllers/following_accounts_controller_spec.rb
@@ -49,8 +49,8 @@ RSpec.describe FollowingAccountsController do
           expect(response.parsed_body)
             .to include(
               orderedItems: contain_exactly(
-                include(follow_of_bob.target_account.username),
-                include(follow_of_chris.target_account.username)
+                ActivityPub::TagManager.instance.uri_for(follow_of_bob.target_account),
+                ActivityPub::TagManager.instance.uri_for(follow_of_chris.target_account)
               ),
               totalItems: eq(2),
               partOf: be_present
diff --git a/spec/fabricators/conversation_fabricator.rb b/spec/fabricators/conversation_fabricator.rb
index 5440e4380c7..2d3f98c037b 100644
--- a/spec/fabricators/conversation_fabricator.rb
+++ b/spec/fabricators/conversation_fabricator.rb
@@ -1,3 +1,5 @@
 # frozen_string_literal: true
 
-Fabricator(:conversation)
+Fabricator(:conversation) do
+  parent_account { Fabricate(:account) }
+end
diff --git a/spec/fabricators/username_block_fabricator.rb b/spec/fabricators/username_block_fabricator.rb
new file mode 100644
index 00000000000..edca5419aba
--- /dev/null
+++ b/spec/fabricators/username_block_fabricator.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+Fabricator(:username_block) do
+  username { sequence(:email) { |i| "#{i}#{Faker::Internet.username}" } }
+  exact false
+  allow_with_approval false
+end
diff --git a/spec/fabricators/webauthn_credential_fabricator.rb b/spec/fabricators/webauthn_credential_fabricator.rb
index b578d55f00d..3e6f3b11d5e 100644
--- a/spec/fabricators/webauthn_credential_fabricator.rb
+++ b/spec/fabricators/webauthn_credential_fabricator.rb
@@ -4,6 +4,6 @@ Fabricator(:webauthn_credential) do
   user_id { Fabricate(:user).id }
   external_id { Base64.urlsafe_encode64(SecureRandom.random_bytes(16)) }
   public_key { OpenSSL::PKey::EC.generate('prime256v1').public_key }
-  nickname 'USB key'
+  nickname { sequence(:nickname) { |i| "USB Key number #{i}" } }
   sign_count 0
 end
diff --git a/spec/helpers/home_helper_spec.rb b/spec/helpers/home_helper_spec.rb
index c3fbff4e8bb..a056eae364d 100644
--- a/spec/helpers/home_helper_spec.rb
+++ b/spec/helpers/home_helper_spec.rb
@@ -41,57 +41,19 @@ RSpec.describe HomeHelper do
     end
   end
 
-  describe 'obscured_counter' do
-    context 'with a value of less than zero' do
-      let(:count) { -10 }
+  describe 'field_verified_class' do
+    subject { helper.field_verified_class(verified) }
 
-      it 'returns the correct string' do
-        expect(helper.obscured_counter(count)).to eq '0'
-      end
-    end
-
-    context 'with a value of zero' do
-      let(:count) { 0 }
-
-      it 'returns the correct string' do
-        expect(helper.obscured_counter(count)).to eq '0'
-      end
-    end
-
-    context 'with a value of one' do
-      let(:count) { 1 }
-
-      it 'returns the correct string' do
-        expect(helper.obscured_counter(count)).to eq '1'
-      end
-    end
-
-    context 'with a value of more than one' do
-      let(:count) { 10 }
-
-      it 'returns the correct string' do
-        expect(helper.obscured_counter(count)).to eq '1+'
-      end
-    end
-  end
-
-  describe 'custom_field_classes' do
     context 'with a verified field' do
-      let(:field) { instance_double(Account::Field, verified?: true) }
+      let(:verified) { true }
 
-      it 'returns verified string' do
-        result = helper.custom_field_classes(field)
-        expect(result).to eq 'verified'
-      end
+      it { is_expected.to eq('verified') }
     end
 
     context 'with a non-verified field' do
-      let(:field) { instance_double(Account::Field, verified?: false) }
+      let(:verified) { false }
 
-      it 'returns verified string' do
-        result = helper.custom_field_classes(field)
-        expect(result).to eq 'emojify'
-      end
+      it { is_expected.to eq('emojify') }
     end
   end
 
diff --git a/spec/helpers/json_ld_helper_spec.rb b/spec/helpers/json_ld_helper_spec.rb
index d76c5167a7d..f216588d978 100644
--- a/spec/helpers/json_ld_helper_spec.rb
+++ b/spec/helpers/json_ld_helper_spec.rb
@@ -180,6 +180,14 @@ RSpec.describe JsonLdHelper do
         expect(compacted.dig('object', 'tag', 0, 'href')).to eq ['foo']
         expect(safe_for_forwarding?(json, compacted)).to be true
       end
+
+      context 'when array size mismatch exists' do
+        subject { helper.patch_for_forwarding!(json, alternate) }
+
+        let(:alternate) { json.merge('to' => %w(one two three)) }
+
+        it { is_expected.to be_nil }
+      end
     end
 
     describe 'safe_for_forwarding?' do
diff --git a/spec/lib/activitypub/activity/accept_spec.rb b/spec/lib/activitypub/activity/accept_spec.rb
index d6b60712794..615287389c3 100644
--- a/spec/lib/activitypub/activity/accept_spec.rb
+++ b/spec/lib/activitypub/activity/accept_spec.rb
@@ -3,69 +3,173 @@
 require 'rails_helper'
 
 RSpec.describe ActivityPub::Activity::Accept do
-  let(:sender)    { Fabricate(:account) }
+  let(:sender)    { Fabricate(:account, domain: 'example.com') }
   let(:recipient) { Fabricate(:account) }
 
-  let(:json) do
-    {
-      '@context': 'https://www.w3.org/ns/activitystreams',
-      id: 'foo',
-      type: 'Accept',
-      actor: ActivityPub::TagManager.instance.uri_for(sender),
-      object: {
-        id: 'bar',
-        type: 'Follow',
-        actor: ActivityPub::TagManager.instance.uri_for(recipient),
-        object: ActivityPub::TagManager.instance.uri_for(sender),
-      },
-    }.with_indifferent_access
-  end
-
   describe '#perform' do
     subject { described_class.new(json, sender) }
 
-    before do
-      allow(RemoteAccountRefreshWorker).to receive(:perform_async)
-      Fabricate(:follow_request, account: recipient, target_account: sender)
-      subject.perform
+    context 'with a Follow request' do
+      let(:json) do
+        {
+          '@context': 'https://www.w3.org/ns/activitystreams',
+          id: 'foo',
+          type: 'Accept',
+          actor: ActivityPub::TagManager.instance.uri_for(sender),
+          object: {
+            id: 'https://abc-123/456',
+            type: 'Follow',
+            actor: ActivityPub::TagManager.instance.uri_for(recipient),
+            object: ActivityPub::TagManager.instance.uri_for(sender),
+          },
+        }.deep_stringify_keys
+      end
+
+      context 'with a regular Follow' do
+        before do
+          Fabricate(:follow_request, account: recipient, target_account: sender)
+        end
+
+        it 'creates a follow relationship, removes the follow request, and queues a refresh' do
+          expect { subject.perform }
+            .to change { recipient.following?(sender) }.from(false).to(true)
+            .and change { recipient.requested?(sender) }.from(true).to(false)
+
+          expect(RemoteAccountRefreshWorker).to have_enqueued_sidekiq_job(sender.id)
+        end
+      end
+
+      context 'when given a relay' do
+        let!(:relay) { Fabricate(:relay, state: :pending, follow_activity_id: 'https://abc-123/456') }
+
+        it 'marks the relay as accepted' do
+          expect { subject.perform }
+            .to change { relay.reload.accepted? }.from(false).to(true)
+        end
+      end
     end
 
-    it 'creates a follow relationship' do
-      expect(recipient.following?(sender)).to be true
-    end
+    context 'with a QuoteRequest' do
+      let(:status) { Fabricate(:status, account: recipient) }
+      let(:quoted_status) { Fabricate(:status, account: sender) }
+      let(:quote) { Fabricate(:quote, status: status, quoted_status: quoted_status) }
+      let(:approval_uri) { "https://#{sender.domain}/approvals/1" }
 
-    it 'removes the follow request' do
-      expect(recipient.requested?(sender)).to be false
-    end
+      let(:json) do
+        {
+          '@context': [
+            'https://www.w3.org/ns/activitystreams',
+            {
+              QuoteRequest: 'https://w3id.org/fep/044f#QuoteRequest',
+            },
+          ],
+          id: 'foo',
+          type: 'Accept',
+          actor: ActivityPub::TagManager.instance.uri_for(sender),
+          object: {
+            id: quote.activity_uri,
+            type: 'QuoteRequest',
+            actor: ActivityPub::TagManager.instance.uri_for(recipient),
+            object: ActivityPub::TagManager.instance.uri_for(quoted_status),
+            instrument: ActivityPub::TagManager.instance.uri_for(status),
+          },
+          result: approval_uri,
+        }.with_indifferent_access
+      end
 
-    it 'queues a refresh' do
-      expect(RemoteAccountRefreshWorker).to have_received(:perform_async).with(sender.id)
-    end
-  end
+      it 'marks the quote as approved and distribute an update' do
+        expect { subject.perform }
+          .to change { quote.reload.accepted? }.from(false).to(true)
+          .and change { quote.reload.approval_uri }.to(approval_uri)
+        expect(DistributionWorker)
+          .to have_enqueued_sidekiq_job(status.id, { 'update' => true })
+        expect(ActivityPub::StatusUpdateDistributionWorker)
+          .to have_enqueued_sidekiq_job(status.id, { 'updated_at' => be_a(String) })
+      end
 
-  context 'when given a relay' do
-    subject { described_class.new(json, sender) }
+      context 'when the quoted status is not from the sender of the Accept' do
+        let(:quoted_status) { Fabricate(:status, account: Fabricate(:account, domain: 'example.com')) }
 
-    let!(:relay) { Fabricate(:relay, state: :pending, follow_activity_id: 'https://abc-123/456') }
+        it 'does not mark the quote as approved and does not distribute an update' do
+          expect { subject.perform }
+            .to not_change { quote.reload.accepted? }.from(false)
+            .and not_change { quote.reload.approval_uri }.from(nil)
+          expect(DistributionWorker)
+            .to_not have_enqueued_sidekiq_job(status.id, { 'update' => true })
+          expect(ActivityPub::StatusUpdateDistributionWorker)
+            .to_not have_enqueued_sidekiq_job(status.id, anything)
+        end
+      end
 
-    let(:json) do
-      {
-        '@context': 'https://www.w3.org/ns/activitystreams',
-        id: 'foo',
-        type: 'Accept',
-        actor: ActivityPub::TagManager.instance.uri_for(sender),
-        object: {
-          id: 'https://abc-123/456',
-          type: 'Follow',
-          actor: ActivityPub::TagManager.instance.uri_for(recipient),
-          object: ActivityPub::TagManager.instance.uri_for(sender),
-        },
-      }.with_indifferent_access
-    end
+      context 'when the quoting status is from an unrelated user' do
+        let(:status) { Fabricate(:status, account: Fabricate(:account, domain: 'foobar.com')) }
 
-    it 'marks the relay as accepted' do
-      subject.perform
-      expect(relay.reload.accepted?).to be true
+        it 'does not mark the quote as approved and does not distribute an update' do
+          expect { subject.perform }
+            .to not_change { quote.reload.accepted? }.from(false)
+            .and not_change { quote.reload.approval_uri }.from(nil)
+          expect(DistributionWorker)
+            .to_not have_enqueued_sidekiq_job(status.id, { 'update' => true })
+          expect(ActivityPub::StatusUpdateDistributionWorker)
+            .to_not have_enqueued_sidekiq_job(status.id, anything)
+        end
+      end
+
+      context 'when approval_uri is missing' do
+        let(:approval_uri) { nil }
+
+        it 'does not mark the quote as approved and does not distribute an update' do
+          expect { subject.perform }
+            .to not_change { quote.reload.accepted? }.from(false)
+            .and not_change { quote.reload.approval_uri }.from(nil)
+          expect(DistributionWorker)
+            .to_not have_enqueued_sidekiq_job(status.id, { 'update' => true })
+          expect(ActivityPub::StatusUpdateDistributionWorker)
+            .to_not have_enqueued_sidekiq_job(status.id, anything)
+        end
+      end
+
+      context 'when the QuoteRequest is referenced by its identifier' do
+        let(:json) do
+          {
+            '@context': [
+              'https://www.w3.org/ns/activitystreams',
+              {
+                QuoteRequest: 'https://w3id.org/fep/044f#QuoteRequest',
+              },
+            ],
+            id: 'foo',
+            type: 'Accept',
+            actor: ActivityPub::TagManager.instance.uri_for(sender),
+            object: quote.activity_uri,
+            result: approval_uri,
+          }.with_indifferent_access
+        end
+
+        it 'marks the quote as approved and distribute an update' do
+          expect { subject.perform }
+            .to change { quote.reload.accepted? }.from(false).to(true)
+            .and change { quote.reload.approval_uri }.to(approval_uri)
+          expect(DistributionWorker)
+            .to have_enqueued_sidekiq_job(status.id, { 'update' => true })
+          expect(ActivityPub::StatusUpdateDistributionWorker)
+            .to have_enqueued_sidekiq_job(status.id, { 'updated_at' => be_a(String) })
+        end
+
+        context 'when approval_uri is missing' do
+          let(:approval_uri) { nil }
+
+          it 'does not mark the quote as approved and does not distribute an update' do
+            expect { subject.perform }
+              .to not_change { quote.reload.accepted? }.from(false)
+              .and not_change { quote.reload.approval_uri }.from(nil)
+            expect(DistributionWorker)
+              .to_not have_enqueued_sidekiq_job(status.id, { 'update' => true })
+            expect(ActivityPub::StatusUpdateDistributionWorker)
+              .to_not have_enqueued_sidekiq_job(status.id, anything)
+          end
+        end
+      end
     end
   end
 end
diff --git a/spec/lib/activitypub/activity/create_spec.rb b/spec/lib/activitypub/activity/create_spec.rb
index 74c9f107187..2f2f91e369e 100644
--- a/spec/lib/activitypub/activity/create_spec.rb
+++ b/spec/lib/activitypub/activity/create_spec.rb
@@ -887,8 +887,35 @@ RSpec.describe ActivityPub::Activity::Create do
         end
       end
 
+      context 'with an unverifiable quote of a known post, with summary (CW) but no text' do
+        let(:quoted_status) { Fabricate(:status, account: Fabricate(:account, domain: 'example.com')) }
+
+        let(:object_json) do
+          build_object(
+            type: 'Note',
+            summary: 'beware of what she said',
+            content: nil,
+            quote: ActivityPub::TagManager.instance.uri_for(quoted_status)
+          )
+        end
+
+        it 'creates a status with an unverified quote' do
+          expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
+          status = sender.statuses.first
+          expect(status).to_not be_nil
+          expect(status.spoiler_text).to eq 'beware of what she said'
+          expect(status.content).to eq ''
+          expect(status.quote).to_not be_nil
+          expect(status.quote).to have_attributes(
+            state: 'pending',
+            approval_uri: nil
+          )
+        end
+      end
+
       context 'with an unverifiable quote of a known post' do
-        let(:quoted_status) { Fabricate(:status) }
+        let(:quoted_status) { Fabricate(:status, account: Fabricate(:account, domain: 'example.com')) }
 
         let(:object_json) do
           build_object(
@@ -911,6 +938,30 @@ RSpec.describe ActivityPub::Activity::Create do
         end
       end
 
+      context 'with an unverifiable quote of a dead post' do
+        let(:quoted_status) { Fabricate(:status) }
+
+        let(:object_json) do
+          build_object(
+            type: 'Note',
+            content: 'woah what she said is amazing',
+            quote: { type: 'Tombstone' }
+          )
+        end
+
+        it 'creates a status with an unverified quote' do
+          expect { subject.perform }.to change(sender.statuses, :count).by(1)
+
+          status = sender.statuses.first
+          expect(status).to_not be_nil
+          expect(status.quote).to_not be_nil
+          expect(status.quote).to have_attributes(
+            state: 'deleted',
+            approval_uri: nil
+          )
+        end
+      end
+
       context 'with an unverifiable unknown post' do
         let(:unknown_post_uri) { 'https://unavailable.example.com/unavailable-post' }
 
diff --git a/spec/lib/activitypub/activity/delete_spec.rb b/spec/lib/activitypub/activity/delete_spec.rb
index 849c7ada908..48d2946b941 100644
--- a/spec/lib/activitypub/activity/delete_spec.rb
+++ b/spec/lib/activitypub/activity/delete_spec.rb
@@ -12,27 +12,22 @@ RSpec.describe ActivityPub::Activity::Delete do
       id: 'foo',
       type: 'Delete',
       actor: ActivityPub::TagManager.instance.uri_for(sender),
-      object: ActivityPub::TagManager.instance.uri_for(status),
+      object: object_json,
       signature: 'foo',
-    }.with_indifferent_access
+    }.deep_stringify_keys
   end
 
+  let(:object_json) { ActivityPub::TagManager.instance.uri_for(status) }
+
   describe '#perform' do
     subject { described_class.new(json, sender) }
 
-    before do
-      subject.perform
-    end
-
     it 'deletes sender\'s status' do
+      subject.perform
       expect(Status.find_by(id: status.id)).to be_nil
     end
-  end
-
-  context 'when the status has been reblogged' do
-    describe '#perform' do
-      subject { described_class.new(json, sender) }
 
+    context 'when the status has been reblogged' do
       let!(:reblogger) { Fabricate(:account) }
       let!(:follower)  { Fabricate(:account, username: 'follower', protocol: :activitypub, domain: 'example.com', inbox_url: 'http://example.com/inbox') }
       let!(:reblog)    { Fabricate(:status, account: reblogger, reblog: status) }
@@ -55,12 +50,8 @@ RSpec.describe ActivityPub::Activity::Delete do
         expect { reblog.reload }.to raise_error(ActiveRecord::RecordNotFound)
       end
     end
-  end
-
-  context 'when the status has been reported' do
-    describe '#perform' do
-      subject { described_class.new(json, sender) }
 
+    context 'when the status has been reported' do
       let!(:reporter) { Fabricate(:account) }
 
       before do
@@ -76,23 +67,9 @@ RSpec.describe ActivityPub::Activity::Delete do
         expect(Status.with_discarded.find_by(id: status.id)).to_not be_nil
       end
     end
-  end
-
-  context 'when the deleted object is an account' do
-    let(:json) do
-      {
-        '@context': 'https://www.w3.org/ns/activitystreams',
-        id: 'foo',
-        type: 'Delete',
-        actor: ActivityPub::TagManager.instance.uri_for(sender),
-        object: ActivityPub::TagManager.instance.uri_for(sender),
-        signature: 'foo',
-      }.with_indifferent_access
-    end
-
-    describe '#perform' do
-      subject { described_class.new(json, sender) }
 
+    context 'when the deleted object is an account' do
+      let(:object_json) { ActivityPub::TagManager.instance.uri_for(sender) }
       let(:service) { instance_double(DeleteAccountService, call: true) }
 
       before do
@@ -106,27 +83,36 @@ RSpec.describe ActivityPub::Activity::Delete do
           .to have_received(:call).with(sender, { reserve_username: false, skip_activitypub: true })
       end
     end
-  end
 
-  context 'when the deleted object is a quote authorization' do
-    let(:quoter) { Fabricate(:account, domain: 'b.example.com') }
-    let(:status) { Fabricate(:status, account: quoter) }
-    let(:quoted_status) { Fabricate(:status, account: sender, uri: 'https://example.com/statuses/1234') }
-    let!(:quote) { Fabricate(:quote, approval_uri: 'https://example.com/approvals/1234', state: :accepted, status: status, quoted_status: quoted_status) }
+    context 'when the deleted object is a quote authorization' do
+      let(:quoter) { Fabricate(:account, domain: 'b.example.com') }
+      let(:status) { Fabricate(:status, account: quoter) }
+      let(:quoted_status) { Fabricate(:status, account: sender, uri: 'https://example.com/statuses/1234') }
+      let!(:quote) { Fabricate(:quote, approval_uri: 'https://example.com/approvals/1234', state: :accepted, status: status, quoted_status: quoted_status) }
 
-    let(:json) do
-      {
-        '@context': 'https://www.w3.org/ns/activitystreams',
-        id: 'foo',
-        type: 'Delete',
-        actor: ActivityPub::TagManager.instance.uri_for(sender),
-        object: quote.approval_uri,
-        signature: 'foo',
-      }.with_indifferent_access
+      let(:object_json) { quote.approval_uri }
+
+      it 'revokes the authorization' do
+        expect { subject.perform }
+          .to change { quote.reload.state }.to('revoked')
+      end
     end
 
-    describe '#perform' do
-      subject { described_class.new(json, sender) }
+    context 'when the deleted object is an inlined quote authorization' do
+      let(:quoter) { Fabricate(:account, domain: 'b.example.com') }
+      let(:status) { Fabricate(:status, account: quoter) }
+      let(:quoted_status) { Fabricate(:status, account: sender, uri: 'https://example.com/statuses/1234') }
+      let!(:quote) { Fabricate(:quote, approval_uri: 'https://example.com/approvals/1234', state: :accepted, status: status, quoted_status: quoted_status) }
+
+      let(:object_json) do
+        {
+          type: 'QuoteAuthorization',
+          id: quote.approval_uri,
+          attributedTo: ActivityPub::TagManager.instance.uri_for(quoted_status.account),
+          interactionTarget: ActivityPub::TagManager.instance.uri_for(quoted_status),
+          interactingObject: ActivityPub::TagManager.instance.uri_for(status),
+        }.deep_stringify_keys
+      end
 
       it 'revokes the authorization' do
         expect { subject.perform }
diff --git a/spec/lib/activitypub/activity/quote_request_spec.rb b/spec/lib/activitypub/activity/quote_request_spec.rb
index dac0b438cbd..aae4ce03383 100644
--- a/spec/lib/activitypub/activity/quote_request_spec.rb
+++ b/spec/lib/activitypub/activity/quote_request_spec.rb
@@ -8,6 +8,7 @@ RSpec.describe ActivityPub::Activity::QuoteRequest do
   let(:quoted_post) { Fabricate(:status, account: recipient) }
   let(:request_uri) { 'https://example.com/missing-ui' }
   let(:quoted_uri) { ActivityPub::TagManager.instance.uri_for(quoted_post) }
+  let(:instrument) { 'https://example.com/unknown-status' }
 
   let(:json) do
     {
@@ -21,8 +22,30 @@ RSpec.describe ActivityPub::Activity::QuoteRequest do
       type: 'QuoteRequest',
       actor: ActivityPub::TagManager.instance.uri_for(sender),
       object: quoted_uri,
-      instrument: 'https://example.com/unknown-status',
-    }.with_indifferent_access
+      instrument: instrument,
+    }.deep_stringify_keys
+  end
+
+  let(:status_json) do
+    {
+      '@context': [
+        'https://www.w3.org/ns/activitystreams',
+        {
+          '@id': 'https://w3id.org/fep/044f#quote',
+          '@type': '@id',
+        },
+        {
+          '@id': 'https://w3id.org/fep/044f#quoteAuthorization',
+          '@type': '@id',
+        },
+      ],
+      id: 'https://example.com/unknown-status',
+      type: 'Note',
+      summary: 'Show more',
+      content: 'Hello universe',
+      quote: ActivityPub::TagManager.instance.uri_for(quoted_post),
+      attributedTo: ActivityPub::TagManager.instance.uri_for(sender),
+    }.deep_stringify_keys
   end
 
   describe '#perform' do
@@ -47,5 +70,53 @@ RSpec.describe ActivityPub::Activity::QuoteRequest do
           end, recipient.id, sender.inbox_url)
       end
     end
+
+    context 'when trying to quote an unquotable local status with an inlined instrument' do
+      let(:instrument) { status_json.without('@context') }
+
+      it 'sends a Reject activity' do
+        expect { subject.perform }
+          .to enqueue_sidekiq_job(ActivityPub::DeliveryWorker)
+          .with(satisfying do |body|
+            outgoing_json = Oj.load(body)
+            outgoing_json['type'] == 'Reject' && json['instrument']['id'] == outgoing_json['object']['instrument'] && %w(type id actor object).all? { |key| json[key] == outgoing_json['object'][key] }
+          end, recipient.id, sender.inbox_url)
+      end
+    end
+
+    context 'when trying to quote a quotable local status' do
+      before do
+        stub_request(:get, 'https://example.com/unknown-status').to_return(status: 200, body: Oj.dump(status_json), headers: { 'Content-Type': 'application/activity+json' })
+        quoted_post.update(quote_approval_policy: Status::QUOTE_APPROVAL_POLICY_FLAGS[:public] << 16)
+      end
+
+      it 'accepts the quote and sends an Accept activity' do
+        expect { subject.perform }
+          .to change { quoted_post.reload.quotes.accepted.count }.by(1)
+          .and enqueue_sidekiq_job(ActivityPub::DeliveryWorker)
+          .with(satisfying do |body|
+            outgoing_json = Oj.load(body)
+            outgoing_json['type'] == 'Accept' && %w(type id actor object instrument).all? { |key| json[key] == outgoing_json['object'][key] }
+          end, recipient.id, sender.inbox_url)
+      end
+    end
+
+    context 'when trying to quote a quotable local status with an inlined instrument' do
+      let(:instrument) { status_json.without('@context') }
+
+      before do
+        quoted_post.update(quote_approval_policy: Status::QUOTE_APPROVAL_POLICY_FLAGS[:public] << 16)
+      end
+
+      it 'accepts the quote and sends an Accept activity' do
+        expect { subject.perform }
+          .to change { quoted_post.reload.quotes.accepted.count }.by(1)
+          .and enqueue_sidekiq_job(ActivityPub::DeliveryWorker)
+          .with(satisfying do |body|
+            outgoing_json = Oj.load(body)
+            outgoing_json['type'] == 'Accept' && json['instrument']['id'] == outgoing_json['object']['instrument'] && %w(type id actor object).all? { |key| json[key] == outgoing_json['object'][key] }
+          end, recipient.id, sender.inbox_url)
+      end
+    end
   end
 end
diff --git a/spec/lib/activitypub/activity/reject_spec.rb b/spec/lib/activitypub/activity/reject_spec.rb
index 0a4243cd16a..ee8557f1239 100644
--- a/spec/lib/activitypub/activity/reject_spec.rb
+++ b/spec/lib/activitypub/activity/reject_spec.rb
@@ -5,14 +5,6 @@ require 'rails_helper'
 RSpec.describe ActivityPub::Activity::Reject do
   let(:sender)    { Fabricate(:account) }
   let(:recipient) { Fabricate(:account) }
-  let(:object_json) do
-    {
-      id: 'bar',
-      type: 'Follow',
-      actor: ActivityPub::TagManager.instance.uri_for(recipient),
-      object: ActivityPub::TagManager.instance.uri_for(sender),
-    }
-  end
 
   let(:json) do
     {
@@ -21,130 +13,139 @@ RSpec.describe ActivityPub::Activity::Reject do
       type: 'Reject',
       actor: ActivityPub::TagManager.instance.uri_for(sender),
       object: object_json,
-    }.with_indifferent_access
+    }.deep_stringify_keys
   end
 
   describe '#perform' do
     subject { described_class.new(json, sender) }
 
-    context 'when rejecting a pending follow request by target' do
-      before do
-        Fabricate(:follow_request, account: recipient, target_account: sender)
-        subject.perform
+    context 'when rejecting a Follow' do
+      let(:object_json) do
+        {
+          id: 'bar',
+          type: 'Follow',
+          actor: ActivityPub::TagManager.instance.uri_for(recipient),
+          object: ActivityPub::TagManager.instance.uri_for(sender),
+        }
       end
 
-      it 'does not create a follow relationship' do
-        expect(recipient.following?(sender)).to be false
+      context 'when rejecting a pending follow request by target' do
+        before do
+          Fabricate(:follow_request, account: recipient, target_account: sender)
+        end
+
+        it 'removes the follow request without creating a follow relationship' do
+          expect { subject.perform }
+            .to change { recipient.requested?(sender) }.from(true).to(false)
+            .and not_change { recipient.following?(sender) }.from(false)
+        end
       end
 
-      it 'removes the follow request' do
-        expect(recipient.requested?(sender)).to be false
+      context 'when rejecting a pending follow request by uri' do
+        before do
+          Fabricate(:follow_request, account: recipient, target_account: sender, uri: 'bar')
+        end
+
+        it 'removes the follow request without creating a follow relationship' do
+          expect { subject.perform }
+            .to change { recipient.requested?(sender) }.from(true).to(false)
+            .and not_change { recipient.following?(sender) }.from(false)
+        end
+      end
+
+      context 'when rejecting a pending follow request by uri only' do
+        let(:object_json) { 'bar' }
+
+        before do
+          Fabricate(:follow_request, account: recipient, target_account: sender, uri: 'bar')
+        end
+
+        it 'removes the follow request without creating a follow relationship' do
+          expect { subject.perform }
+            .to change { recipient.requested?(sender) }.from(true).to(false)
+            .and not_change { recipient.following?(sender) }.from(false)
+        end
+      end
+
+      context 'when rejecting an existing follow relationship by target' do
+        before do
+          Fabricate(:follow, account: recipient, target_account: sender)
+        end
+
+        it 'removes the follow relationship without creating a request' do
+          expect { subject.perform }
+            .to change { recipient.following?(sender) }.from(true).to(false)
+            .and not_change { recipient.requested?(sender) }.from(false)
+        end
+      end
+
+      context 'when rejecting an existing follow relationship by uri' do
+        before do
+          Fabricate(:follow, account: recipient, target_account: sender, uri: 'bar')
+        end
+
+        it 'removes the follow relationship without creating a request' do
+          expect { subject.perform }
+            .to change { recipient.following?(sender) }.from(true).to(false)
+            .and not_change { recipient.requested?(sender) }.from(false)
+        end
+      end
+
+      context 'when rejecting an existing follow relationship by uri only' do
+        let(:object_json) { 'bar' }
+
+        before do
+          Fabricate(:follow, account: recipient, target_account: sender, uri: 'bar')
+        end
+
+        it 'removes the follow relationship without creating a request' do
+          expect { subject.perform }
+            .to change { recipient.following?(sender) }.from(true).to(false)
+            .and not_change { recipient.requested?(sender) }.from(false)
+        end
       end
     end
 
-    context 'when rejecting a pending follow request by uri' do
-      before do
-        Fabricate(:follow_request, account: recipient, target_account: sender, uri: 'bar')
-        subject.perform
-      end
+    context 'when given a relay' do
+      subject { described_class.new(json, sender) }
 
-      it 'does not create a follow relationship' do
-        expect(recipient.following?(sender)).to be false
-      end
+      let!(:relay) { Fabricate(:relay, state: :pending, follow_activity_id: 'https://abc-123/456') }
 
-      it 'removes the follow request' do
-        expect(recipient.requested?(sender)).to be false
-      end
-    end
-
-    context 'when rejecting a pending follow request by uri only' do
-      let(:object_json) { 'bar' }
-
-      before do
-        Fabricate(:follow_request, account: recipient, target_account: sender, uri: 'bar')
-        subject.perform
-      end
-
-      it 'does not create a follow relationship' do
-        expect(recipient.following?(sender)).to be false
-      end
-
-      it 'removes the follow request' do
-        expect(recipient.requested?(sender)).to be false
-      end
-    end
-
-    context 'when rejecting an existing follow relationship by target' do
-      before do
-        Fabricate(:follow, account: recipient, target_account: sender)
-        subject.perform
-      end
-
-      it 'removes the follow relationship' do
-        expect(recipient.following?(sender)).to be false
-      end
-
-      it 'does not create a follow request' do
-        expect(recipient.requested?(sender)).to be false
-      end
-    end
-
-    context 'when rejecting an existing follow relationship by uri' do
-      before do
-        Fabricate(:follow, account: recipient, target_account: sender, uri: 'bar')
-        subject.perform
-      end
-
-      it 'removes the follow relationship' do
-        expect(recipient.following?(sender)).to be false
-      end
-
-      it 'does not create a follow request' do
-        expect(recipient.requested?(sender)).to be false
-      end
-    end
-
-    context 'when rejecting an existing follow relationship by uri only' do
-      let(:object_json) { 'bar' }
-
-      before do
-        Fabricate(:follow, account: recipient, target_account: sender, uri: 'bar')
-        subject.perform
-      end
-
-      it 'removes the follow relationship' do
-        expect(recipient.following?(sender)).to be false
-      end
-
-      it 'does not create a follow request' do
-        expect(recipient.requested?(sender)).to be false
-      end
-    end
-  end
-
-  context 'when given a relay' do
-    subject { described_class.new(json, sender) }
-
-    let!(:relay) { Fabricate(:relay, state: :pending, follow_activity_id: 'https://abc-123/456') }
-
-    let(:json) do
-      {
-        '@context': 'https://www.w3.org/ns/activitystreams',
-        id: 'foo',
-        type: 'Reject',
-        actor: ActivityPub::TagManager.instance.uri_for(sender),
-        object: {
+      let(:object_json) do
+        {
           id: 'https://abc-123/456',
           type: 'Follow',
           actor: ActivityPub::TagManager.instance.uri_for(recipient),
           object: ActivityPub::TagManager.instance.uri_for(sender),
-        },
-      }.with_indifferent_access
+        }.with_indifferent_access
+      end
+
+      it 'marks the relay as rejected' do
+        subject.perform
+        expect(relay.reload.rejected?).to be true
+      end
     end
 
-    it 'marks the relay as rejected' do
-      subject.perform
-      expect(relay.reload.rejected?).to be true
+    context 'with a QuoteRequest' do
+      let(:status) { Fabricate(:status, account: recipient) }
+      let(:quoted_status) { Fabricate(:status, account: sender) }
+      let(:quote) { Fabricate(:quote, status: status, quoted_status: quoted_status, activity_uri: 'https://abc-123/456') }
+      let(:approval_uri) { "https://#{sender.domain}/approvals/1" }
+
+      let(:object_json) do
+        {
+          id: 'https://abc-123/456',
+          type: 'QuoteRequest',
+          actor: ActivityPub::TagManager.instance.uri_for(recipient),
+          object: ActivityPub::TagManager.instance.uri_for(quoted_status),
+          instrument: ActivityPub::TagManager.instance.uri_for(status),
+        }.with_indifferent_access
+      end
+
+      it 'marks the quote as rejected' do
+        expect { subject.perform }
+          .to change { quote.reload.rejected? }.from(false).to(true)
+      end
     end
   end
 end
diff --git a/spec/lib/activitypub/activity_spec.rb b/spec/lib/activitypub/activity_spec.rb
new file mode 100644
index 00000000000..218da04d9b5
--- /dev/null
+++ b/spec/lib/activitypub/activity_spec.rb
@@ -0,0 +1,111 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe ActivityPub::Activity do
+  describe 'processing a Create and an Update' do
+    let(:sender) { Fabricate(:account, followers_url: 'http://example.com/followers', domain: 'example.com', uri: 'https://example.com/actor') }
+    let(:quoted_account) { Fabricate(:account, domain: 'quoted.example.com') }
+    let(:quoted_status) { Fabricate(:status, account: quoted_account) }
+    let(:approval_uri) { 'https://quoted.example.com/approvals/1' }
+
+    let(:approval_payload) do
+      {
+        '@context': [
+          'https://www.w3.org/ns/activitystreams',
+          {
+            QuoteAuthorization: 'https://w3id.org/fep/044f#QuoteAuthorization',
+            gts: 'https://gotosocial.org/ns#',
+            interactingObject: {
+              '@id': 'gts:interactingObject',
+              '@type': '@id',
+            },
+            interactionTarget: {
+              '@id': 'gts:interactionTarget',
+              '@type': '@id',
+            },
+          },
+        ],
+        type: 'QuoteAuthorization',
+        id: approval_uri,
+        attributedTo: ActivityPub::TagManager.instance.uri_for(quoted_status.account),
+        interactingObject: [ActivityPub::TagManager.instance.uri_for(sender), 'post1'].join('/'),
+        interactionTarget: ActivityPub::TagManager.instance.uri_for(quoted_status),
+      }
+    end
+
+    let(:create_json) do
+      {
+        '@context': [
+          'https://www.w3.org/ns/activitystreams',
+          {
+            quote: 'https://w3id.org/fep/044f#quote',
+          },
+        ],
+        id: [ActivityPub::TagManager.instance.uri_for(sender), '#create'].join,
+        type: 'Create',
+        actor: ActivityPub::TagManager.instance.uri_for(sender),
+        object: {
+          id: [ActivityPub::TagManager.instance.uri_for(sender), 'post1'].join('/'),
+          type: 'Note',
+          to: [
+            'https://www.w3.org/ns/activitystreams#Public',
+          ],
+          content: 'foo',
+          published: '2025-05-24T11:03:10Z',
+          quote: ActivityPub::TagManager.instance.uri_for(quoted_status),
+        },
+      }.deep_stringify_keys
+    end
+
+    let(:update_json) do
+      {
+        '@context': [
+          'https://www.w3.org/ns/activitystreams',
+          {
+            quote: 'https://w3id.org/fep/044f#quote',
+            quoteAuthorization: { '@id': 'https://w3id.org/fep/044f#quoteAuthorization', '@type': '@id' },
+          },
+        ],
+        id: [ActivityPub::TagManager.instance.uri_for(sender), '#update'].join,
+        type: 'Update',
+        actor: ActivityPub::TagManager.instance.uri_for(sender),
+        object: {
+          id: [ActivityPub::TagManager.instance.uri_for(sender), 'post1'].join('/'),
+          type: 'Note',
+          to: [
+            'https://www.w3.org/ns/activitystreams#Public',
+          ],
+          content: 'foo',
+          published: '2025-05-24T11:03:10Z',
+          quote: ActivityPub::TagManager.instance.uri_for(quoted_status),
+          quoteAuthorization: approval_uri,
+        },
+      }.deep_stringify_keys
+    end
+
+    before do
+      sender.update(uri: ActivityPub::TagManager.instance.uri_for(sender))
+
+      stub_request(:get, approval_uri).to_return(headers: { 'Content-Type': 'application/activity+json' }, body: Oj.dump(approval_payload))
+    end
+
+    context 'when getting them in order' do
+      it 'creates a status and approves the quote' do
+        described_class.factory(create_json, sender).perform
+        status = described_class.factory(update_json, sender).perform
+
+        expect(status.quote.state).to eq 'accepted'
+      end
+    end
+
+    context 'when getting them out of order' do
+      it 'creates a status and approves the quote' do
+        described_class.factory(update_json, sender).perform
+        status = described_class.factory(create_json, sender).perform
+
+        expect(status.quote.state).to eq 'accepted'
+      end
+    end
+  end
+end
diff --git a/spec/lib/activitypub/forwarder_spec.rb b/spec/lib/activitypub/forwarder_spec.rb
new file mode 100644
index 00000000000..f72e3342183
--- /dev/null
+++ b/spec/lib/activitypub/forwarder_spec.rb
@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe ActivityPub::Forwarder do
+  subject { described_class.new(account, payload, status) }
+
+  let(:account) { Fabricate(:account) }
+  let(:remote_account) { Fabricate(:account, domain: 'example.com') }
+  let(:status) { Fabricate(:status, account: remote_account) }
+
+  let(:signature) { { type: 'RsaSignature2017', signatureValue: 'foo' } }
+  let(:payload) do
+    {
+      '@context': [
+        'https://www.w3.org/ns/activitystreams',
+        'https://w3id.org/security/v1',
+      ],
+      signature: signature,
+      type: 'Delete',
+      object: ActivityPub::TagManager.instance.uri_for(status),
+    }.deep_stringify_keys
+  end
+
+  describe '#forwardable?' do
+    context 'when payload has an inlined signature' do
+      it 'returns true' do
+        expect(subject.forwardable?).to be true
+      end
+    end
+
+    context 'when payload has an no inlined signature' do
+      let(:signature) { nil }
+
+      it 'returns true' do
+        expect(subject.forwardable?).to be false
+      end
+    end
+  end
+
+  describe '#forward!' do
+    let(:alice) { Fabricate(:account) }
+    let(:bob) { Fabricate(:account) }
+    let(:eve) { Fabricate(:account, domain: 'remote1.example.com', inbox_url: 'https://remote1.example.com/users/eve/inbox', protocol: :activitypub) }
+    let(:mallory) { Fabricate(:account, domain: 'remote2.example.com', inbox_url: 'https://remote2.example.com/users/mallory/inbox', protocol: :activitypub) }
+
+    before do
+      alice.statuses.create!(reblog: status)
+      Fabricate(:quote, status: Fabricate(:status, account: bob), quoted_status: status, state: :accepted)
+
+      eve.follow!(alice)
+      mallory.follow!(bob)
+    end
+
+    it 'correctly forwards to expected remote followers' do
+      expect { subject.forward! }
+        .to enqueue_sidekiq_job(ActivityPub::LowPriorityDeliveryWorker).with(Oj.dump(payload), anything, eve.preferred_inbox_url)
+        .and enqueue_sidekiq_job(ActivityPub::LowPriorityDeliveryWorker).with(Oj.dump(payload), anything, mallory.preferred_inbox_url)
+    end
+  end
+end
diff --git a/spec/lib/activitypub/tag_manager_spec.rb b/spec/lib/activitypub/tag_manager_spec.rb
index 7a4cf3c1b86..cad46ad9032 100644
--- a/spec/lib/activitypub/tag_manager_spec.rb
+++ b/spec/lib/activitypub/tag_manager_spec.rb
@@ -7,7 +7,7 @@ RSpec.describe ActivityPub::TagManager do
 
   subject { described_class.instance }
 
-  let(:domain) { "#{Rails.configuration.x.use_https ? 'https' : 'http'}://#{Rails.configuration.x.web_domain}" }
+  let(:host_prefix) { "#{Rails.configuration.x.use_https ? 'https' : 'http'}://#{Rails.configuration.x.web_domain}" }
 
   describe '#public_collection?' do
     it 'returns true for the special public collection and common shorthands' do
@@ -22,18 +22,180 @@ RSpec.describe ActivityPub::TagManager do
   end
 
   describe '#url_for' do
-    it 'returns a string starting with web domain' do
-      account = Fabricate(:account)
-      expect(subject.url_for(account)).to be_a(String)
-        .and start_with(domain)
+    context 'with a local account' do
+      let(:account) { Fabricate(:account, id_scheme: :username_ap_id) }
+
+      it 'returns a string starting with web domain and with the expected path' do
+        expect(subject.url_for(account))
+          .to eq("#{host_prefix}/@#{account.username}")
+      end
+
+      context 'when using a numeric ID based scheme' do
+        let(:account) { Fabricate(:account, id_scheme: :numeric_ap_id) }
+
+        it 'returns a string starting with web domain and with the expected path' do
+          expect(subject.url_for(account))
+            .to eq("#{host_prefix}/@#{account.username}")
+        end
+      end
+    end
+
+    context 'with a remote account' do
+      let(:account) { Fabricate(:account, domain: 'example.com', url: 'https://example.com/profiles/dskjfsdf') }
+
+      it 'returns the expected URL' do
+        expect(subject.url_for(account)).to eq account.url
+      end
+    end
+
+    context 'with a local status' do
+      let(:account) { Fabricate(:account, id_scheme: :username_ap_id) }
+      let(:status) { Fabricate(:status, account: account) }
+
+      it 'returns a string starting with web domain and with the expected path' do
+        expect(subject.url_for(status))
+          .to eq("#{host_prefix}/@#{status.account.username}/#{status.id}")
+      end
+
+      context 'when using a numeric ID based scheme' do
+        let(:account) { Fabricate(:account, id_scheme: :numeric_ap_id) }
+
+        it 'returns a string starting with web domain and with the expected path' do
+          expect(subject.url_for(status))
+            .to eq("#{host_prefix}/@#{status.account.username}/#{status.id}")
+        end
+      end
+    end
+
+    context 'with a remote status' do
+      let(:account) { Fabricate(:account, domain: 'example.com', url: 'https://example.com/profiles/dskjfsdf') }
+      let(:status) { Fabricate(:status, account: account, url: 'https://example.com/posts/1234') }
+
+      it 'returns the expected URL' do
+        expect(subject.url_for(status)).to eq status.url
+      end
     end
   end
 
   describe '#uri_for' do
-    it 'returns a string starting with web domain' do
-      account = Fabricate(:account)
-      expect(subject.uri_for(account)).to be_a(String)
-        .and start_with(domain)
+    context 'with the instance actor' do
+      it 'returns a string starting with web domain and with the expected path' do
+        expect(subject.uri_for(Account.representative))
+          .to eq("#{host_prefix}/actor")
+      end
+    end
+
+    context 'with a local account' do
+      let(:account) { Fabricate(:account, id_scheme: :username_ap_id) }
+
+      it 'returns a string starting with web domain and with the expected path' do
+        expect(subject.uri_for(account))
+          .to eq("#{host_prefix}/users/#{account.username}")
+      end
+
+      context 'when using a numeric ID based scheme' do
+        let(:account) { Fabricate(:account, id_scheme: :numeric_ap_id) }
+
+        it 'returns a string starting with web domain and with the expected path' do
+          expect(subject.uri_for(account))
+            .to eq("#{host_prefix}/ap/users/#{account.id}")
+        end
+      end
+    end
+
+    context 'with a remote account' do
+      let(:account) { Fabricate(:account, domain: 'example.com', uri: 'https://example.com/profiles/dskjfsdf') }
+
+      it 'returns the expected URL' do
+        expect(subject.uri_for(account)).to eq account.uri
+      end
+    end
+
+    context 'with a local status' do
+      let(:account) { Fabricate(:account, id_scheme: :username_ap_id) }
+      let(:status) { Fabricate(:status, account: account) }
+
+      it 'returns a string starting with web domain and with the expected path' do
+        expect(subject.uri_for(status))
+          .to eq("#{host_prefix}/users/#{status.account.username}/statuses/#{status.id}")
+      end
+
+      context 'when using a numeric ID based scheme' do
+        let(:account) { Fabricate(:account, id_scheme: :numeric_ap_id) }
+
+        it 'returns a string starting with web domain and with the expected path' do
+          expect(subject.uri_for(status))
+            .to eq("#{host_prefix}/ap/users/#{status.account.id}/statuses/#{status.id}")
+        end
+      end
+    end
+
+    context 'with a remote status' do
+      let(:account) { Fabricate(:account, domain: 'example.com', uri: 'https://example.com/profiles/dskjfsdf') }
+      let(:status) { Fabricate(:status, account: account, uri: 'https://example.com/posts/1234') }
+
+      it 'returns the expected URL' do
+        expect(subject.uri_for(status)).to eq status.uri
+      end
+    end
+
+    context 'with a local conversation' do
+      let(:account) { Fabricate(:account, id_scheme: :username_ap_id) }
+      let(:status) { Fabricate(:status, account: account) }
+
+      it 'returns a string starting with web domain and with the expected path' do
+        expect(subject.uri_for(status.conversation))
+          .to eq("#{host_prefix}/contexts/#{status.account.id}-#{status.id}")
+      end
+
+      context 'when using a numeric ID based scheme' do
+        let(:account) { Fabricate(:account, id_scheme: :numeric_ap_id) }
+
+        it 'returns a string starting with web domain and with the expected path' do
+          expect(subject.uri_for(status.conversation))
+            .to eq("#{host_prefix}/contexts/#{status.account.id}-#{status.id}")
+        end
+      end
+    end
+
+    context 'with a remote conversation' do
+      let(:account) { Fabricate(:account, domain: 'example.com', uri: 'https://example.com/profiles/dskjfsdf') }
+      let(:status) { Fabricate(:status, account: account, uri: 'https://example.com/posts/1234') }
+
+      before do
+        status.conversation.update!(uri: 'https://example.com/conversations/1234')
+      end
+
+      it 'returns the expected URL' do
+        expect(subject.uri_for(status.conversation)).to eq status.conversation.uri
+      end
+    end
+  end
+
+  describe '#key_uri_for' do
+    context 'with the instance actor' do
+      it 'returns a string starting with web domain and with the expected path' do
+        expect(subject.key_uri_for(Account.representative))
+          .to eq("#{host_prefix}/actor#main-key")
+      end
+    end
+
+    context 'with a local account' do
+      let(:account) { Fabricate(:account, id_scheme: :username_ap_id) }
+
+      it 'returns a string starting with web domain and with the expected path' do
+        expect(subject.key_uri_for(account))
+          .to eq("#{host_prefix}/users/#{account.username}#main-key")
+      end
+
+      context 'when using a numeric ID based scheme' do
+        let(:account) { Fabricate(:account, id_scheme: :numeric_ap_id) }
+
+        it 'returns a string starting with web domain and with the expected path' do
+          expect(subject.key_uri_for(account))
+            .to eq("#{host_prefix}/ap/users/#{account.id}#main-key")
+        end
+      end
     end
   end
 
@@ -49,7 +211,236 @@ RSpec.describe ActivityPub::TagManager do
       it 'returns a string starting with web domain' do
         status = Fabricate(:status)
         expect(subject.uri_for(status)).to be_a(String)
-          .and start_with(domain)
+          .and start_with(host_prefix)
+      end
+    end
+  end
+
+  describe '#approval_uri_for' do
+    context 'with a valid local approval' do
+      let(:quoted_account) { Fabricate(:account, id_scheme: :username_ap_id) }
+      let(:quoted_status) { Fabricate(:status, account: quoted_account) }
+      let(:quote) { Fabricate(:quote, state: :accepted, quoted_status: quoted_status) }
+
+      it 'returns a string with the web domain and expected path' do
+        expect(subject.approval_uri_for(quote))
+          .to eq("#{host_prefix}/users/#{quote.quoted_account.username}/quote_authorizations/#{quote.id}")
+      end
+
+      context 'when using a numeric ID based scheme' do
+        let(:quoted_account) { Fabricate(:account, id_scheme: :numeric_ap_id) }
+
+        it 'returns a string with the web domain and expected path' do
+          expect(subject.approval_uri_for(quote))
+            .to eq("#{host_prefix}/ap/users/#{quote.quoted_account_id}/quote_authorizations/#{quote.id}")
+        end
+      end
+    end
+
+    context 'with an unapproved local quote' do
+      let(:quoted_account) { Fabricate(:account, id_scheme: :username_ap_id) }
+      let(:quoted_status) { Fabricate(:status, account: quoted_account) }
+      let(:quote) { Fabricate(:quote, state: :rejected, quoted_status: quoted_status) }
+
+      it 'returns nil' do
+        expect(subject.approval_uri_for(quote))
+          .to be_nil
+      end
+
+      context 'when using a numeric ID based scheme' do
+        let(:quoted_account) { Fabricate(:account, id_scheme: :numeric_ap_id) }
+
+        it 'returns nil' do
+          expect(subject.approval_uri_for(quote))
+            .to be_nil
+        end
+      end
+    end
+
+    context 'with a valid remote approval' do
+      let(:quoted_account) { Fabricate(:account, domain: 'example.com') }
+      let(:quoted_status) { Fabricate(:status, account: quoted_account) }
+      let(:quote) { Fabricate(:quote, status: Fabricate(:status), state: :accepted, quoted_status: quoted_status, approval_uri: 'https://example.com/approvals/1') }
+
+      it 'returns the expected URI' do
+        expect(subject.approval_uri_for(quote)).to eq quote.approval_uri
+      end
+    end
+
+    context 'with an unapproved local quote but check_approval override' do
+      let(:quoted_account) { Fabricate(:account, id_scheme: :username_ap_id) }
+      let(:quoted_status) { Fabricate(:status, account: quoted_account) }
+      let(:quote) { Fabricate(:quote, state: :rejected, quoted_status: quoted_status) }
+
+      it 'returns a string with the web domain and expected path' do
+        expect(subject.approval_uri_for(quote, check_approval: false))
+          .to eq("#{host_prefix}/users/#{quote.quoted_account.username}/quote_authorizations/#{quote.id}")
+      end
+
+      context 'when using a numeric ID based scheme' do
+        let(:quoted_account) { Fabricate(:account, id_scheme: :numeric_ap_id) }
+
+        it 'returns a string with the web domain and expected path' do
+          expect(subject.approval_uri_for(quote, check_approval: false))
+            .to eq("#{host_prefix}/ap/users/#{quote.quoted_account_id}/quote_authorizations/#{quote.id}")
+        end
+      end
+    end
+  end
+
+  describe '#replies_uri_for' do
+    context 'with a local status' do
+      let(:account) { Fabricate(:account, id_scheme: :username_ap_id) }
+      let(:status) { Fabricate(:status, account: account) }
+
+      it 'returns a string starting with web domain and with the expected path' do
+        expect(subject.replies_uri_for(status))
+          .to eq("#{host_prefix}/users/#{status.account.username}/statuses/#{status.id}/replies")
+      end
+
+      context 'when using a numeric ID based scheme' do
+        let(:account) { Fabricate(:account, id_scheme: :numeric_ap_id) }
+
+        it 'returns a string starting with web domain and with the expected path' do
+          expect(subject.replies_uri_for(status))
+            .to eq("#{host_prefix}/ap/users/#{status.account.id}/statuses/#{status.id}/replies")
+        end
+      end
+    end
+  end
+
+  describe '#likes_uri_for' do
+    context 'with a local status' do
+      let(:account) { Fabricate(:account, id_scheme: :username_ap_id) }
+      let(:status) { Fabricate(:status, account: account) }
+
+      it 'returns a string starting with web domain and with the expected path' do
+        expect(subject.likes_uri_for(status))
+          .to eq("#{host_prefix}/users/#{status.account.username}/statuses/#{status.id}/likes")
+      end
+
+      context 'when using a numeric ID based scheme' do
+        let(:account) { Fabricate(:account, id_scheme: :numeric_ap_id) }
+
+        it 'returns a string starting with web domain and with the expected path' do
+          expect(subject.likes_uri_for(status))
+            .to eq("#{host_prefix}/ap/users/#{status.account.id}/statuses/#{status.id}/likes")
+        end
+      end
+    end
+  end
+
+  describe '#shares_uri_for' do
+    context 'with a local status' do
+      let(:account) { Fabricate(:account, id_scheme: :username_ap_id) }
+      let(:status) { Fabricate(:status, account: account) }
+
+      it 'returns a string starting with web domain and with the expected path' do
+        expect(subject.shares_uri_for(status))
+          .to eq("#{host_prefix}/users/#{status.account.username}/statuses/#{status.id}/shares")
+      end
+
+      context 'when using a numeric ID based scheme' do
+        let(:account) { Fabricate(:account, id_scheme: :numeric_ap_id) }
+
+        it 'returns a string starting with web domain and with the expected path' do
+          expect(subject.shares_uri_for(status))
+            .to eq("#{host_prefix}/ap/users/#{status.account.id}/statuses/#{status.id}/shares")
+        end
+      end
+    end
+  end
+
+  describe '#following_uri_for' do
+    context 'with a local account' do
+      let(:account) { Fabricate(:account, id_scheme: :username_ap_id) }
+
+      it 'returns a string starting with web domain and with the expected path' do
+        expect(subject.following_uri_for(account))
+          .to eq("#{host_prefix}/users/#{account.username}/following")
+      end
+
+      context 'when using a numeric ID based scheme' do
+        let(:account) { Fabricate(:account, id_scheme: :numeric_ap_id) }
+
+        it 'returns a string starting with web domain and with the expected path' do
+          expect(subject.following_uri_for(account))
+            .to eq("#{host_prefix}/ap/users/#{account.id}/following")
+        end
+      end
+    end
+  end
+
+  describe '#followers_uri_for' do
+    context 'with a local account' do
+      let(:account) { Fabricate(:account, id_scheme: :username_ap_id) }
+
+      it 'returns a string starting with web domain and with the expected path' do
+        expect(subject.followers_uri_for(account))
+          .to eq("#{host_prefix}/users/#{account.username}/followers")
+      end
+
+      context 'when using a numeric ID based scheme' do
+        let(:account) { Fabricate(:account, id_scheme: :numeric_ap_id) }
+
+        it 'returns a string starting with web domain and with the expected path' do
+          expect(subject.followers_uri_for(account))
+            .to eq("#{host_prefix}/ap/users/#{account.id}/followers")
+        end
+      end
+    end
+  end
+
+  describe '#inbox_uri_for' do
+    context 'with the instance actor' do
+      it 'returns a string starting with web domain and with the expected path' do
+        expect(subject.inbox_uri_for(Account.representative))
+          .to eq("#{host_prefix}/actor/inbox")
+      end
+    end
+
+    context 'with a local account' do
+      let(:account) { Fabricate(:account, id_scheme: :username_ap_id) }
+
+      it 'returns a string starting with web domain and with the expected path' do
+        expect(subject.inbox_uri_for(account))
+          .to eq("#{host_prefix}/users/#{account.username}/inbox")
+      end
+
+      context 'when using a numeric ID based scheme' do
+        let(:account) { Fabricate(:account, id_scheme: :numeric_ap_id) }
+
+        it 'returns a string starting with web domain and with the expected path' do
+          expect(subject.inbox_uri_for(account))
+            .to eq("#{host_prefix}/ap/users/#{account.id}/inbox")
+        end
+      end
+    end
+  end
+
+  describe '#outbox_uri_for' do
+    context 'with the instance actor' do
+      it 'returns a string starting with web domain and with the expected path' do
+        expect(subject.outbox_uri_for(Account.representative))
+          .to eq("#{host_prefix}/actor/outbox")
+      end
+    end
+
+    context 'with a local account' do
+      let(:account) { Fabricate(:account, id_scheme: :username_ap_id) }
+
+      it 'returns a string starting with web domain and with the expected path' do
+        expect(subject.outbox_uri_for(account))
+          .to eq("#{host_prefix}/users/#{account.username}/outbox")
+      end
+
+      context 'when using a numeric ID based scheme' do
+        let(:account) { Fabricate(:account, id_scheme: :numeric_ap_id) }
+
+        it 'returns a string starting with web domain and with the expected path' do
+          expect(subject.outbox_uri_for(account))
+            .to eq("#{host_prefix}/ap/users/#{account.id}/outbox")
+        end
       end
     end
   end
@@ -61,20 +452,32 @@ RSpec.describe ActivityPub::TagManager do
     end
 
     it 'returns followers collection for unlisted status' do
-      status = Fabricate(:status, visibility: :unlisted)
+      status = Fabricate(:status, visibility: :unlisted, account: Fabricate(:account, id_scheme: :username_ap_id))
       expect(subject.to(status)).to eq [account_followers_url(status.account)]
     end
 
+    it 'returns followers collection for unlisted status when using a numeric ID based scheme' do
+      status = Fabricate(:status, visibility: :unlisted, account: Fabricate(:account, id_scheme: :numeric_ap_id))
+      expect(subject.to(status)).to eq [ap_account_followers_url(status.account_id)]
+    end
+
     it 'returns followers collection for private status' do
-      status = Fabricate(:status, visibility: :private)
+      status = Fabricate(:status, visibility: :private, account: Fabricate(:account, id_scheme: :username_ap_id))
       expect(subject.to(status)).to eq [account_followers_url(status.account)]
     end
 
+    it 'returns followers collection for private status when using a numeric ID based scheme' do
+      status = Fabricate(:status, visibility: :private, account: Fabricate(:account, id_scheme: :numeric_ap_id))
+      expect(subject.to(status)).to eq [ap_account_followers_url(status.account_id)]
+    end
+
     it 'returns URIs of mentions for direct status' do
       status    = Fabricate(:status, visibility: :direct)
       mentioned = Fabricate(:account)
+      mentioned_numeric = Fabricate(:account, id_scheme: :numeric_ap_id)
       status.mentions.create(account: mentioned)
-      expect(subject.to(status)).to eq [subject.uri_for(mentioned)]
+      status.mentions.create(account: mentioned_numeric)
+      expect(subject.to(status)).to eq [subject.uri_for(mentioned), subject.uri_for(mentioned_numeric)]
     end
 
     it "returns URIs of mentioned group's followers for direct statuses to groups" do
@@ -111,10 +514,15 @@ RSpec.describe ActivityPub::TagManager do
 
   describe '#cc' do
     it 'returns followers collection for public status' do
-      status = Fabricate(:status, visibility: :public)
+      status = Fabricate(:status, visibility: :public, account: Fabricate(:account, id_scheme: :username_ap_id))
       expect(subject.cc(status)).to eq [account_followers_url(status.account)]
     end
 
+    it 'returns followers collection for public status when using a numeric ID based scheme' do
+      status = Fabricate(:status, visibility: :public, account: Fabricate(:account, id_scheme: :numeric_ap_id))
+      expect(subject.cc(status)).to eq [ap_account_followers_url(status.account_id)]
+    end
+
     it 'returns public collection for unlisted status' do
       status = Fabricate(:status, visibility: :unlisted)
       expect(subject.cc(status)).to eq ['https://www.w3.org/ns/activitystreams#Public']
@@ -133,8 +541,10 @@ RSpec.describe ActivityPub::TagManager do
     it 'returns URIs of mentions for non-direct status' do
       status    = Fabricate(:status, visibility: :public)
       mentioned = Fabricate(:account)
+      mentioned_numeric = Fabricate(:account, id_scheme: :numeric_ap_id)
       status.mentions.create(account: mentioned)
-      expect(subject.cc(status)).to include(subject.uri_for(mentioned))
+      status.mentions.create(account: mentioned_numeric)
+      expect(subject.cc(status)).to include(subject.uri_for(mentioned), subject.uri_for(mentioned_numeric))
     end
 
     context 'with followers and requested followers' do
@@ -181,8 +591,9 @@ RSpec.describe ActivityPub::TagManager do
   end
 
   describe '#uri_to_local_id' do
+    let(:account) { Fabricate(:account, id_scheme: :username_ap_id) }
+
     it 'returns the local ID' do
-      account = Fabricate(:account)
       expect(subject.uri_to_local_id(subject.uri_for(account), :username)).to eq account.username
     end
   end
diff --git a/spec/lib/admin/metrics/dimension/software_versions_dimension_spec.rb b/spec/lib/admin/metrics/dimension/software_versions_dimension_spec.rb
index 5b0fb902e01..d76fad62544 100644
--- a/spec/lib/admin/metrics/dimension/software_versions_dimension_spec.rb
+++ b/spec/lib/admin/metrics/dimension/software_versions_dimension_spec.rb
@@ -9,14 +9,44 @@ RSpec.describe Admin::Metrics::Dimension::SoftwareVersionsDimension do
   let(:end_at) { Time.now.utc }
   let(:limit) { 10 }
   let(:params) { ActionController::Parameters.new }
+  let(:redis_human_key) { 'Redis' }
+  let(:redis_version) { '7.4.5' }
+  let(:redis_info) { { 'redis_version' => redis_version } }
 
   describe '#data' do
-    it 'reports on the running software' do
-      expect(subject.data.map(&:symbolize_keys))
-        .to include(
-          include(key: 'mastodon', value: Mastodon::Version.to_s),
-          include(key: 'ruby', value: include(RUBY_VERSION))
-        )
+    shared_examples 'shared behavior' do
+      before do
+        allow(subject).to receive(:redis_info).and_return(redis_info) # rubocop:disable RSpec/SubjectStub
+      end
+
+      it 'reports on the running software' do
+        expect(subject.data.map(&:symbolize_keys))
+          .to include(
+            include(key: 'mastodon', value: Mastodon::Version.to_s),
+            include(key: 'ruby', value: include(RUBY_VERSION)),
+            include(key: 'redis', human_key: redis_human_key, value: redis_version)
+          )
+      end
+    end
+
+    context 'when using redis' do
+      it_behaves_like 'shared behavior'
+    end
+
+    context 'when using valkey' do
+      let(:redis_human_key) { 'Valkey' }
+      let(:redis_version) { '8.1.3' }
+      let(:redis_info) { { 'valkey_version' => redis_version } }
+
+      it_behaves_like 'shared behavior'
+    end
+
+    context 'when using dragonfly' do
+      let(:redis_human_key) { 'Dragonfly' }
+      let(:redis_version) { 'df-v1.32.0' }
+      let(:redis_info) { { 'dragonfly_version' => redis_version } }
+
+      it_behaves_like 'shared behavior'
     end
   end
 end
diff --git a/spec/lib/admin/metrics/dimension/space_usage_dimension_spec.rb b/spec/lib/admin/metrics/dimension/space_usage_dimension_spec.rb
index 4be5ed30ee1..c71c788eaa5 100644
--- a/spec/lib/admin/metrics/dimension/space_usage_dimension_spec.rb
+++ b/spec/lib/admin/metrics/dimension/space_usage_dimension_spec.rb
@@ -10,14 +10,41 @@ RSpec.describe Admin::Metrics::Dimension::SpaceUsageDimension do
   let(:limit) { 10 }
   let(:params) { ActionController::Parameters.new }
 
+  let(:redis_human_key) { 'Redis' }
+  let(:redis_info) { { 'redis_version' => '7.4.5', 'used_memory' => 1_024 } }
+
   describe '#data' do
-    it 'reports on used storage space' do
-      expect(subject.data.map(&:symbolize_keys))
-        .to include(
-          include(key: 'media', value: /\d/),
-          include(key: 'postgresql', value: /\d/),
-          include(key: 'redis', value: /\d/)
-        )
+    shared_examples 'shared behavior' do
+      before do
+        allow(subject).to receive(:redis_info).and_return(redis_info) # rubocop:disable RSpec/SubjectStub
+      end
+
+      it 'reports on used storage space' do
+        expect(subject.data.map(&:symbolize_keys))
+          .to include(
+            include(key: 'media', value: /\d/),
+            include(key: 'postgresql', value: /\d/),
+            include(key: 'redis', human_key: redis_human_key, value: /\d/)
+          )
+      end
+    end
+
+    context 'when using redis' do
+      it_behaves_like 'shared behavior'
+    end
+
+    context 'when using valkey' do
+      let(:redis_human_key) { 'Valkey' }
+      let(:redis_info) { { 'valkey_version' => '8.1.3', 'used_memory' => 1_024 } }
+
+      it_behaves_like 'shared behavior'
+    end
+
+    context 'when using dragonfly' do
+      let(:redis_human_key) { 'Dragonfly' }
+      let(:redis_info) { { 'dragonfly_version' => 'df-v1.32.0', 'used_memory' => 1_024 } }
+
+      it_behaves_like 'shared behavior'
     end
   end
 end
diff --git a/spec/lib/antispam_spec.rb b/spec/lib/antispam_spec.rb
new file mode 100644
index 00000000000..18a12e447f7
--- /dev/null
+++ b/spec/lib/antispam_spec.rb
@@ -0,0 +1,71 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe Antispam do
+  describe '#local_preflight_check!' do
+    subject { described_class.new(status).local_preflight_check! }
+
+    let(:status) { Fabricate :status }
+
+    context 'when there is no spammy text registered' do
+      it { is_expected.to be_nil }
+    end
+
+    context 'with spammy text' do
+      before { redis.sadd 'antispam:spammy_texts', 'https://banned.example' }
+
+      context 'when status matches' do
+        let(:status) { Fabricate :status, text: 'I use https://banned.example urls in my text' }
+
+        it 'raises error and reports' do
+          expect { subject }
+            .to raise_error(described_class::SilentlyDrop)
+            .and change(spam_reports, :count).by(1)
+        end
+
+        context 'when report already exists' do
+          before { Fabricate :report, account: Account.representative, target_account: status.account }
+
+          it 'raises error and does not report' do
+            expect { subject }
+              .to raise_error(described_class::SilentlyDrop)
+              .and not_change(spam_reports, :count)
+          end
+        end
+
+        def spam_reports
+          Account.representative.reports.where(target_account: status.account).spam
+        end
+      end
+
+      context 'when status matches unicode variants' do
+        let(:status) { Fabricate :status, text: 'I use https://𝐛𝐚𝐧𝐧𝐞𝐝.𝐞𝐱𝐚𝐦𝐩𝐥𝐞 urls in my text' }
+
+        it 'raises error and reports' do
+          expect { subject }
+            .to raise_error(described_class::SilentlyDrop)
+            .and change(spam_reports, :count).by(1)
+        end
+
+        context 'when report already exists' do
+          before { Fabricate :report, account: Account.representative, target_account: status.account }
+
+          it 'raises error and does not report' do
+            expect { subject }
+              .to raise_error(described_class::SilentlyDrop)
+              .and not_change(spam_reports, :count)
+          end
+        end
+
+        def spam_reports
+          Account.representative.reports.where(target_account: status.account).spam
+        end
+      end
+
+      context 'when status does not match' do
+        it { is_expected.to be_nil }
+      end
+    end
+  end
+end
diff --git a/spec/lib/delivery_failure_tracker_spec.rb b/spec/lib/delivery_failure_tracker_spec.rb
index 34912c8133e..6935dbccb43 100644
--- a/spec/lib/delivery_failure_tracker_spec.rb
+++ b/spec/lib/delivery_failure_tracker_spec.rb
@@ -3,37 +3,101 @@
 require 'rails_helper'
 
 RSpec.describe DeliveryFailureTracker do
-  subject { described_class.new('http://example.com/inbox') }
+  context 'with the default resolution of :days' do
+    subject { described_class.new('http://example.com/inbox') }
 
-  describe '#track_success!' do
-    before do
-      subject.track_failure!
-      subject.track_success!
+    describe '#track_success!' do
+      before do
+        track_failure(7, :days)
+        subject.track_success!
+      end
+
+      it 'marks URL as available again' do
+        expect(described_class.available?('http://example.com/inbox')).to be true
+      end
+
+      it 'resets days to 0' do
+        expect(subject.days).to be_zero
+      end
     end
 
-    it 'marks URL as available again' do
-      expect(described_class.available?('http://example.com/inbox')).to be true
+    describe '#track_failure!' do
+      it 'marks URL as unavailable after 7 days of being called' do
+        track_failure(7, :days)
+
+        expect(subject.days).to eq 7
+        expect(described_class.available?('http://example.com/inbox')).to be false
+      end
+
+      it 'repeated calls on the same day do not count' do
+        subject.track_failure!
+        subject.track_failure!
+
+        expect(subject.days).to eq 1
+      end
     end
 
-    it 'resets days to 0' do
-      expect(subject.days).to be_zero
+    describe '#exhausted_deliveries_days' do
+      it 'returns the days on which failures were recorded' do
+        track_failure(3, :days)
+
+        expect(subject.exhausted_deliveries_days).to contain_exactly(3.days.ago.to_date, 2.days.ago.to_date, Date.yesterday)
+      end
     end
   end
 
-  describe '#track_failure!' do
-    it 'marks URL as unavailable after 7 days of being called' do
-      6.times { |i| redis.sadd('exhausted_deliveries:example.com', i) }
-      subject.track_failure!
+  context 'with a resolution of :minutes' do
+    subject { described_class.new('http://example.com/inbox', resolution: :minutes) }
 
-      expect(subject.days).to eq 7
-      expect(described_class.available?('http://example.com/inbox')).to be false
+    describe '#track_success!' do
+      before do
+        track_failure(5, :minutes)
+        subject.track_success!
+      end
+
+      it 'marks URL as available again' do
+        expect(described_class.available?('http://example.com/inbox')).to be true
+      end
+
+      it 'resets failures to 0' do
+        expect(subject.failures).to be_zero
+      end
     end
 
-    it 'repeated calls on the same day do not count' do
-      subject.track_failure!
-      subject.track_failure!
+    describe '#track_failure!' do
+      it 'marks URL as unavailable after 5 minutes of being called' do
+        track_failure(5, :minutes)
 
-      expect(subject.days).to eq 1
+        expect(subject.failures).to eq 5
+        expect(described_class.available?('http://example.com/inbox')).to be false
+      end
+
+      it 'repeated calls within the same minute do not count' do
+        freeze_time
+        subject.track_failure!
+        subject.track_failure!
+
+        expect(subject.failures).to eq 1
+      end
+    end
+
+    describe '#exhausted_deliveries_days' do
+      it 'returns the days on which failures were recorded' do
+        # Make sure this does not accidentally span two days when run
+        # around midnight
+        travel_to Time.zone.now.change(hour: 10)
+        track_failure(3, :minutes)
+
+        expect(subject.exhausted_deliveries_days).to contain_exactly(Time.zone.today)
+      end
+    end
+
+    describe '#days' do
+      it 'raises due to wrong resolution' do
+        assert_raises TypeError do
+          subject.days
+        end
+      end
     end
   end
 
@@ -60,4 +124,12 @@ RSpec.describe DeliveryFailureTracker do
       expect(described_class.available?('http://foo.bar/inbox')).to be true
     end
   end
+
+  def track_failure(times, unit)
+    times.times do
+      travel_to 1.send(unit).ago
+      subject.track_failure!
+    end
+    travel_back
+  end
 end
diff --git a/spec/lib/fasp/request_spec.rb b/spec/lib/fasp/request_spec.rb
index 80d061dc61f..380b7951242 100644
--- a/spec/lib/fasp/request_spec.rb
+++ b/spec/lib/fasp/request_spec.rb
@@ -27,18 +27,55 @@ RSpec.describe Fasp::Request do
             'Signature-Input' => /.+/,
           })
       end
+
+      it 'tracks that a successful connection was made' do
+        provider.delivery_failure_tracker.track_failure!
+
+        expect do
+          subject.send(method, '/test_path')
+        end.to change(provider.delivery_failure_tracker, :failures).from(1).to(0)
+      end
     end
 
     context 'when the response is not signed' do
       before do
         stub_request(method, 'https://reqprov.example.com/fasp/test_path')
-          .to_return(status: 200)
+          .to_return(status:)
       end
 
-      it 'raises an error' do
+      context 'when the request was successful' do
+        let(:status) { 200 }
+
+        it 'raises a signature verification error' do
+          expect do
+            subject.send(method, '/test_path')
+          end.to raise_error(Mastodon::SignatureVerificationError)
+        end
+      end
+
+      context 'when an error response is received' do
+        let(:status) { 401 }
+
+        it 'raises an unexpected response error' do
+          expect do
+            subject.send(method, '/test_path')
+          end.to raise_error(Mastodon::UnexpectedResponseError)
+        end
+      end
+    end
+
+    context 'when the request raises an error' do
+      before do
+        stub_request(method, 'https://reqprov.example.com/fasp/test_path')
+          .to_raise(HTTP::ConnectionError)
+      end
+
+      it "records the failure using the provider's delivery failure tracker" do
         expect do
           subject.send(method, '/test_path')
-        end.to raise_error(Mastodon::SignatureVerificationError)
+        end.to raise_error(HTTP::ConnectionError)
+
+        expect(provider.delivery_failure_tracker.failures).to eq 1
       end
     end
   end
diff --git a/spec/lib/mastodon/cli/accounts_spec.rb b/spec/lib/mastodon/cli/accounts_spec.rb
index 238f72f834f..927c6ca8deb 100644
--- a/spec/lib/mastodon/cli/accounts_spec.rb
+++ b/spec/lib/mastodon/cli/accounts_spec.rb
@@ -32,6 +32,7 @@ RSpec.describe Mastodon::CLI::Accounts do
 
   describe '#create' do
     let(:action) { :create }
+    let(:username) { 'tootctl_username' }
 
     shared_examples 'a new user with given email address and username' do
       it 'creates user and accounts from options and displays success message' do
@@ -48,18 +49,24 @@ RSpec.describe Mastodon::CLI::Accounts do
       end
 
       def account_from_options
-        Account.find_local('tootctl_username')
+        Account.find_local(username)
       end
     end
 
     context 'when required USERNAME and --email are provided' do
-      let(:arguments) { ['tootctl_username'] }
+      let(:arguments) { [username] }
 
       context 'with USERNAME and --email only' do
         let(:options) { { email: 'tootctl@example.com' } }
 
         it_behaves_like 'a new user with given email address and username'
 
+        context 'with a reserved username' do
+          let(:username) { 'security' }
+
+          it_behaves_like 'a new user with given email address and username'
+        end
+
         context 'with invalid --email value' do
           let(:options) { { email: 'invalid' } }
 
@@ -354,11 +361,20 @@ RSpec.describe Mastodon::CLI::Accounts do
       context 'with --reset-password option' do
         let(:options) { { reset_password: true } }
 
+        let(:user) { Fabricate(:user, password: original_password) }
+        let(:original_password) { 'foobar12345' }
+        let(:new_password) { 'new_password12345' }
+
         it 'returns a new password for the user' do
-          allow(SecureRandom).to receive(:hex).and_return('new_password')
+          allow(SecureRandom).to receive(:hex).and_return(new_password)
+          allow(Account).to receive(:find_local).and_return(user.account)
+          allow(user).to receive(:change_password!).and_call_original
 
           expect { subject }
-            .to output_results('new_password')
+            .to output_results(new_password)
+
+          expect(user).to have_received(:change_password!).with(new_password)
+          expect(user.reload).to_not be_external_or_valid_password(original_password)
         end
       end
 
@@ -1288,49 +1304,64 @@ RSpec.describe Mastodon::CLI::Accounts do
 
   describe '#prune' do
     let(:action) { :prune }
-    let!(:local_account)     { Fabricate(:account) }
-    let!(:bot_account)       { Fabricate(:account, bot: true, domain: 'example.com') }
-    let!(:group_account)     { Fabricate(:account, actor_type: 'Group', domain: 'example.com') }
-    let!(:mentioned_account) { Fabricate(:account, domain: 'example.com') }
-    let!(:prunable_accounts) do
-      Fabricate.times(2, :account, domain: 'example.com', bot: false, suspended_at: nil, silenced_at: nil)
-    end
+    let(:viable_attrs) { { domain: 'example.com', bot: false, suspended: false, silenced: false } }
+    let!(:local_account) { Fabricate(:account) }
+    let!(:bot_account) { Fabricate(:account, bot: true, domain: 'example.com') }
+    let!(:group_account) { Fabricate(:account, actor_type: 'Group', domain: 'example.com') }
+    let!(:account_mentioned) { Fabricate(:account, viable_attrs) }
+    let!(:account_with_favourite) { Fabricate(:account, viable_attrs) }
+    let!(:account_with_status) { Fabricate(:account, viable_attrs) }
+    let!(:account_with_follow) { Fabricate(:account, viable_attrs) }
+    let!(:account_targeted_follow) { Fabricate(:account, viable_attrs) }
+    let!(:account_with_block) { Fabricate(:account, viable_attrs) }
+    let!(:account_targeted_block) { Fabricate(:account, viable_attrs) }
+    let!(:account_targeted_mute) { Fabricate(:account, viable_attrs) }
+    let!(:account_targeted_report) { Fabricate(:account, viable_attrs) }
+    let!(:account_with_follow_request) { Fabricate(:account, viable_attrs) }
+    let!(:account_targeted_follow_request) { Fabricate(:account, viable_attrs) }
+    let!(:prunable_accounts) { Fabricate.times(2, :account, viable_attrs) }
 
     before do
-      Fabricate(:mention, account: mentioned_account, status: Fabricate(:status, account: Fabricate(:account)))
+      Fabricate :mention, account: account_mentioned, status: Fabricate(:status, account: Fabricate(:account))
+      Fabricate :favourite, account: account_with_favourite
+      Fabricate :status, account: account_with_status
+      Fabricate :follow, account: account_with_follow
+      Fabricate :follow, target_account: account_targeted_follow
+      Fabricate :block, account: account_with_block
+      Fabricate :block, target_account: account_targeted_block
+      Fabricate :mute, target_account: account_targeted_mute
+      Fabricate :report, target_account: account_targeted_report
+      Fabricate :follow_request, account: account_with_follow_request
+      Fabricate :follow_request, target_account: account_targeted_follow_request
       stub_parallelize_with_progress!
     end
 
-    def expect_prune_remote_accounts_without_interaction
-      prunable_account_ids = prunable_accounts.pluck(:id)
-
-      expect(Account.where(id: prunable_account_ids).count).to eq(0)
-    end
-
     it 'displays a successful message and handles accounts correctly' do
       expect { subject }
         .to output_results("OK, pruned #{prunable_accounts.size} accounts")
-      expect_prune_remote_accounts_without_interaction
-      expect_not_prune_local_accounts
-      expect_not_prune_bot_accounts
-      expect_not_prune_group_accounts
-      expect_not_prune_mentioned_accounts
+      expect(prunable_account_records)
+        .to have_attributes(count: eq(0))
+      expect(Account.all)
+        .to include(local_account)
+        .and include(bot_account)
+        .and include(group_account)
+        .and include(account_mentioned)
+        .and include(account_with_favourite)
+        .and include(account_with_status)
+        .and include(account_with_follow)
+        .and include(account_targeted_follow)
+        .and include(account_with_block)
+        .and include(account_targeted_block)
+        .and include(account_targeted_mute)
+        .and include(account_targeted_report)
+        .and include(account_with_follow_request)
+        .and include(account_targeted_follow_request)
+        .and not_include(prunable_accounts.first)
+        .and not_include(prunable_accounts.last)
     end
 
-    def expect_not_prune_local_accounts
-      expect(Account.exists?(id: local_account.id)).to be(true)
-    end
-
-    def expect_not_prune_bot_accounts
-      expect(Account.exists?(id: bot_account.id)).to be(true)
-    end
-
-    def expect_not_prune_group_accounts
-      expect(Account.exists?(id: group_account.id)).to be(true)
-    end
-
-    def expect_not_prune_mentioned_accounts
-      expect(Account.exists?(id: mentioned_account.id)).to be true
+    def prunable_account_records
+      Account.where(id: prunable_accounts.pluck(:id))
     end
 
     context 'with --dry-run option' do
diff --git a/spec/lib/permalink_redirector_spec.rb b/spec/lib/permalink_redirector_spec.rb
index 5a544c3d38e..81fa05449e9 100644
--- a/spec/lib/permalink_redirector_spec.rb
+++ b/spec/lib/permalink_redirector_spec.rb
@@ -10,39 +10,77 @@ RSpec.describe PermalinkRedirector do
       Fabricate(:status, account: remote_account, id: 123, url: 'https://example.com/status-123')
     end
 
-    it 'returns path for legacy account links' do
-      redirector = described_class.new('accounts/2')
-      expect(redirector.redirect_path).to eq 'https://example.com/@alice'
-    end
-
-    it 'returns path for legacy status links' do
-      redirector = described_class.new('statuses/123')
-      expect(redirector.redirect_path).to eq 'https://example.com/status-123'
-    end
-
-    it 'returns path for pretty account links' do
-      redirector = described_class.new('@alice@example.com')
-      expect(redirector.redirect_path).to eq 'https://example.com/@alice'
-    end
-
-    it 'returns path for pretty status links' do
-      redirector = described_class.new('@alice/123')
-      expect(redirector.redirect_path).to eq 'https://example.com/status-123'
-    end
-
-    it 'returns path for legacy status links with a query param' do
-      redirector = described_class.new('statuses/123?foo=bar')
-      expect(redirector.redirect_path).to eq 'https://example.com/status-123'
-    end
-
-    it 'returns path for pretty status links with a query param' do
-      redirector = described_class.new('@alice/123?foo=bar')
-      expect(redirector.redirect_path).to eq 'https://example.com/status-123'
-    end
-
     it 'returns path for deck URLs with query params' do
       redirector = described_class.new('/deck/directory?local=true')
       expect(redirector.redirect_path).to eq '/directory?local=true'
     end
+
+    context 'when account is not suspended' do
+      it 'returns path for legacy account links' do
+        redirector = described_class.new('accounts/2')
+        expect(redirector.redirect_path).to eq 'https://example.com/@alice'
+      end
+
+      it 'returns path for legacy status links' do
+        redirector = described_class.new('statuses/123')
+        expect(redirector.redirect_path).to eq 'https://example.com/status-123'
+      end
+
+      it 'returns path for pretty account links' do
+        redirector = described_class.new('@alice@example.com')
+        expect(redirector.redirect_path).to eq 'https://example.com/@alice'
+      end
+
+      it 'returns path for pretty status links' do
+        redirector = described_class.new('@alice/123')
+        expect(redirector.redirect_path).to eq 'https://example.com/status-123'
+      end
+
+      it 'returns path for legacy status links with a query param' do
+        redirector = described_class.new('statuses/123?foo=bar')
+        expect(redirector.redirect_path).to eq 'https://example.com/status-123'
+      end
+
+      it 'returns path for pretty status links with a query param' do
+        redirector = described_class.new('@alice/123?foo=bar')
+        expect(redirector.redirect_path).to eq 'https://example.com/status-123'
+      end
+    end
+
+    context 'when account is suspended' do
+      before do
+        remote_account.suspend!
+      end
+
+      it 'returns nil for legacy account links' do
+        redirector = described_class.new('accounts/2')
+        expect(redirector.redirect_path).to be_nil
+      end
+
+      it 'returns nil for legacy status links' do
+        redirector = described_class.new('statuses/123')
+        expect(redirector.redirect_path).to be_nil
+      end
+
+      it 'returns nil for pretty account links' do
+        redirector = described_class.new('@alice@example.com')
+        expect(redirector.redirect_path).to be_nil
+      end
+
+      it 'returns nil for pretty status links' do
+        redirector = described_class.new('@alice/123')
+        expect(redirector.redirect_path).to be_nil
+      end
+
+      it 'returns nil for legacy status links with a query param' do
+        redirector = described_class.new('statuses/123?foo=bar')
+        expect(redirector.redirect_path).to be_nil
+      end
+
+      it 'returns nil for pretty status links with a query param' do
+        redirector = described_class.new('@alice/123?foo=bar')
+        expect(redirector.redirect_path).to be_nil
+      end
+    end
   end
 end
diff --git a/spec/lib/request_spec.rb b/spec/lib/request_spec.rb
index 79c400e098e..da618234550 100644
--- a/spec/lib/request_spec.rb
+++ b/spec/lib/request_spec.rb
@@ -40,6 +40,23 @@ RSpec.describe Request do
     end
   end
 
+  describe '#initialize' do
+    subject { described_class.new(:get, url) }
+
+    context 'when URL has new lines' do
+      let(:url) { "https://host.example/image\nhttps://badhost.example/page.jpg" }
+
+      it 'encodes new lines in url value after normalization' do
+        expect(initialized_url_value)
+          .to eq('https://host.example/image%0Ahttps://badhost.example/page.jpg')
+      end
+    end
+
+    def initialized_url_value
+      subject.instance_variable_get(:@url).to_s
+    end
+  end
+
   describe '#perform' do
     context 'with valid host and non-persistent connection' do
       before { stub_request(:get, 'http://example.com').to_return(body: 'lorem ipsum') }
diff --git a/spec/lib/status_cache_hydrator_spec.rb b/spec/lib/status_cache_hydrator_spec.rb
index e56393da1dd..085866ef1d3 100644
--- a/spec/lib/status_cache_hydrator_spec.rb
+++ b/spec/lib/status_cache_hydrator_spec.rb
@@ -28,6 +28,18 @@ RSpec.describe StatusCacheHydrator do
         end
       end
 
+      context 'when handling a status with a quote policy' do
+        let(:status) { Fabricate(:status, quote_approval_policy: Status::QUOTE_APPROVAL_POLICY_FLAGS[:followers] << 16) }
+
+        before do
+          account.follow!(status.account)
+        end
+
+        it 'renders the same attributes as a full render' do
+          expect(subject).to eql(compare_to_hash)
+        end
+      end
+
       context 'when handling a filtered status' do
         let(:status) { Fabricate(:status, text: 'this toot is about that banned word') }
 
diff --git a/spec/lib/webfinger_spec.rb b/spec/lib/webfinger_spec.rb
index 5015deac7ff..e214a03536b 100644
--- a/spec/lib/webfinger_spec.rb
+++ b/spec/lib/webfinger_spec.rb
@@ -4,15 +4,15 @@ require 'rails_helper'
 
 RSpec.describe Webfinger do
   describe 'self link' do
+    subject { described_class.new('acct:alice@example.com').perform }
+
     context 'when self link is specified with type application/activity+json' do
       let!(:webfinger) { { subject: 'acct:alice@example.com', links: [{ rel: 'self', href: 'https://example.com/alice', type: 'application/activity+json' }] } }
 
       it 'correctly parses the response' do
         stub_request(:get, 'https://example.com/.well-known/webfinger?resource=acct:alice@example.com').to_return(body: Oj.dump(webfinger), headers: { 'Content-Type': 'application/jrd+json' })
 
-        response = described_class.new('acct:alice@example.com').perform
-
-        expect(response.self_link_href).to eq 'https://example.com/alice'
+        expect(subject.self_link_href).to eq 'https://example.com/alice'
       end
     end
 
@@ -22,9 +22,7 @@ RSpec.describe Webfinger do
       it 'correctly parses the response' do
         stub_request(:get, 'https://example.com/.well-known/webfinger?resource=acct:alice@example.com').to_return(body: Oj.dump(webfinger), headers: { 'Content-Type': 'application/jrd+json' })
 
-        response = described_class.new('acct:alice@example.com').perform
-
-        expect(response.self_link_href).to eq 'https://example.com/alice'
+        expect(subject.self_link_href).to eq 'https://example.com/alice'
       end
     end
 
@@ -34,7 +32,45 @@ RSpec.describe Webfinger do
       it 'raises an error' do
         stub_request(:get, 'https://example.com/.well-known/webfinger?resource=acct:alice@example.com').to_return(body: Oj.dump(webfinger), headers: { 'Content-Type': 'application/jrd+json' })
 
-        expect { described_class.new('acct:alice@example.com').perform }.to raise_error(Webfinger::Error)
+        expect { subject }
+          .to raise_error(Webfinger::Error)
+      end
+    end
+
+    context 'when webfinger fails and host meta is used' do
+      before { stub_request(:get, 'https://example.com/.well-known/webfinger?resource=acct:alice@example.com').to_return(status: 404) }
+
+      context 'when host meta succeeds' do
+        let(:host_meta) do
+          <<~XML
+            <?xml version="1.0"?>
+            <XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0">
+              <Link rel="lrdd" type="application/xrd+xml" template="https://example.com/.well-known/nonStandardWebfinger?resource={uri}"/>
+            </XRD>
+          XML
+        end
+        let(:webfinger) { { subject: 'acct:alice@example.com', links: [{ rel: 'self', href: 'https://example.com/alice-from-NS', type: 'application/activity+json' }] } }
+
+        before do
+          stub_request(:get, 'https://example.com/.well-known/host-meta').to_return(body: host_meta, headers: { 'Content-Type': 'application/jrd+json' })
+          stub_request(:get, 'https://example.com/.well-known/nonStandardWebfinger?resource=acct:alice@example.com').to_return(body: Oj.dump(webfinger), headers: { 'Content-Type': 'application/jrd+json' })
+        end
+
+        it 'uses host meta details' do
+          expect(subject.self_link_href)
+            .to eq 'https://example.com/alice-from-NS'
+        end
+      end
+
+      context 'when host meta fails' do
+        before do
+          stub_request(:get, 'https://example.com/.well-known/host-meta').to_return(status: 500)
+        end
+
+        it 'raises error' do
+          expect { subject }
+            .to raise_error(Webfinger::Error)
+        end
       end
     end
   end
diff --git a/spec/mailers/notification_mailer_spec.rb b/spec/mailers/notification_mailer_spec.rb
index 25eb4ada263..b88277367dd 100644
--- a/spec/mailers/notification_mailer_spec.rb
+++ b/spec/mailers/notification_mailer_spec.rb
@@ -51,6 +51,27 @@ RSpec.describe NotificationMailer do
     it_behaves_like 'delivery without status'
   end
 
+  describe 'quote' do
+    let(:quote) { Fabricate(:quote, state: :accepted, status: foreign_status, quoted_status: own_status) }
+    let(:notification) { Notification.create!(account: receiver.account, activity: quote) }
+    let(:mail) { prepared_mailer_for(own_status.account).quote }
+
+    it_behaves_like 'localized subject', 'notification_mailer.quote.subject', name: 'bob'
+
+    it 'renders the email' do
+      expect(mail)
+        .to be_present
+        .and(have_subject('bob quoted your post'))
+        .and(have_body_text('Your post was quoted by bob'))
+        .and(have_body_text('The body of the foreign status'))
+        .and have_thread_headers
+        .and have_standard_headers('quote').for(receiver)
+    end
+
+    it_behaves_like 'delivery to non functional user'
+    it_behaves_like 'delivery without status'
+  end
+
   describe 'follow' do
     let(:follow) { sender.follow!(receiver.account) }
     let(:notification) { Notification.create!(account: receiver.account, activity: follow) }
diff --git a/spec/mailers/previews/notification_mailer_preview.rb b/spec/mailers/previews/notification_mailer_preview.rb
index a63c20c27c5..29ab047dfb1 100644
--- a/spec/mailers/previews/notification_mailer_preview.rb
+++ b/spec/mailers/previews/notification_mailer_preview.rb
@@ -33,6 +33,14 @@ class NotificationMailerPreview < ActionMailer::Preview
     mailer_for(activity.reblog.account, activity).reblog
   end
 
+  # Preview this email at http://localhost:3000/rails/mailers/notification_mailer/quote
+  def quote
+    notification = Notification.where(type: 'quote').order(:created_at).last
+    activity = notification.activity
+
+    mailer_for(activity.quoted_account, activity).quote
+  end
+
   private
 
   def mailer_for(account, activity)
diff --git a/spec/mailers/user_mailer_spec.rb b/spec/mailers/user_mailer_spec.rb
index 88f9d12cac8..82021cd3d02 100644
--- a/spec/mailers/user_mailer_spec.rb
+++ b/spec/mailers/user_mailer_spec.rb
@@ -141,7 +141,9 @@ RSpec.describe UserMailer do
   end
 
   describe '#warning' do
-    let(:strike) { Fabricate(:account_warning, target_account: receiver.account, text: 'dont worry its just the testsuite', action: 'suspend') }
+    let(:status) { Fabricate(:status, account: receiver.account) }
+    let(:quote) { Fabricate(:quote, state: :accepted, status: status) }
+    let(:strike) { Fabricate(:account_warning, target_account: receiver.account, text: 'dont worry its just the testsuite', action: 'suspend', status_ids: [quote.status_id]) }
     let(:mail)   { described_class.warning(receiver, strike) }
 
     it 'renders warning notification' do
diff --git a/spec/models/account_conversation_spec.rb b/spec/models/account_conversation_spec.rb
index 4e8727ca395..4ccbed05165 100644
--- a/spec/models/account_conversation_spec.rb
+++ b/spec/models/account_conversation_spec.rb
@@ -21,7 +21,7 @@ RSpec.describe AccountConversation do
 
     it 'appends to old record when there is a match' do
       last_status  = Fabricate(:status, account: alice, visibility: :direct)
-      conversation = described_class.create!(account: alice, conversation: last_status.conversation, participant_account_ids: [bob.id], status_ids: [last_status.id])
+      conversation = described_class.create!(account: alice, conversation_id: last_status.conversation_id, participant_account_ids: [bob.id], status_ids: [last_status.id])
 
       status = Fabricate(:status, account: bob, visibility: :direct, thread: last_status)
       status.mentions.create(account: alice)
@@ -36,7 +36,7 @@ RSpec.describe AccountConversation do
 
     it 'creates new record when new participants are added' do
       last_status  = Fabricate(:status, account: alice, visibility: :direct)
-      conversation = described_class.create!(account: alice, conversation: last_status.conversation, participant_account_ids: [bob.id], status_ids: [last_status.id])
+      conversation = described_class.create!(account: alice, conversation_id: last_status.conversation_id, participant_account_ids: [bob.id], status_ids: [last_status.id])
 
       status = Fabricate(:status, account: bob, visibility: :direct, thread: last_status)
       status.mentions.create(account: alice)
@@ -55,7 +55,7 @@ RSpec.describe AccountConversation do
     it 'updates last status to a previous value' do
       last_status  = Fabricate(:status, account: alice, visibility: :direct)
       status       = Fabricate(:status, account: alice, visibility: :direct)
-      conversation = described_class.create!(account: alice, conversation: last_status.conversation, participant_account_ids: [bob.id], status_ids: [status.id, last_status.id])
+      conversation = described_class.create!(account: alice, conversation_id: last_status.conversation_id, participant_account_ids: [bob.id], status_ids: [status.id, last_status.id])
       last_status.mentions.create(account: bob)
       last_status.destroy!
       conversation.reload
@@ -65,7 +65,7 @@ RSpec.describe AccountConversation do
 
     it 'removes the record if no other statuses are referenced' do
       last_status  = Fabricate(:status, account: alice, visibility: :direct)
-      conversation = described_class.create!(account: alice, conversation: last_status.conversation, participant_account_ids: [bob.id], status_ids: [last_status.id])
+      conversation = described_class.create!(account: alice, conversation_id: last_status.conversation_id, participant_account_ids: [bob.id], status_ids: [last_status.id])
       last_status.mentions.create(account: bob)
       last_status.destroy!
       expect(described_class.where(id: conversation.id).count).to eq 0
diff --git a/spec/models/account_spec.rb b/spec/models/account_spec.rb
index 994a475dd9d..be400fecd4a 100644
--- a/spec/models/account_spec.rb
+++ b/spec/models/account_spec.rb
@@ -506,6 +506,8 @@ RSpec.describe Account do
     context 'when account is local' do
       subject { Fabricate.build :account, domain: nil }
 
+      let(:domains_limit) { described_class::ATTRIBUTION_DOMAINS_LIMIT }
+
       context 'with an existing differently-cased username account' do
         before { Fabricate :account, username: 'the_doctor' }
 
@@ -547,8 +549,8 @@ RSpec.describe Account do
       it { is_expected.to validate_absence_of(:shared_inbox_url).on(:create) }
       it { is_expected.to validate_absence_of(:uri).on(:create) }
 
-      it { is_expected.to allow_values([], ['example.com'], (1..100).to_a).for(:attribution_domains) }
-      it { is_expected.to_not allow_values(['example com'], ['@'], (1..101).to_a).for(:attribution_domains) }
+      it { is_expected.to allow_values([], ['example.com'], (1..domains_limit).to_a).for(:attribution_domains) }
+      it { is_expected.to_not allow_values(['example com'], ['@'], (1..(domains_limit + 1)).to_a).for(:attribution_domains) }
     end
 
     context 'when account is remote' do
@@ -640,19 +642,6 @@ RSpec.describe Account do
       end
     end
 
-    describe 'alphabetic' do
-      it 'sorts by alphabetic order of domain and username' do
-        matches = [
-          { username: 'a', domain: 'a' },
-          { username: 'b', domain: 'a' },
-          { username: 'a', domain: 'b' },
-          { username: 'b', domain: 'b' },
-        ].map(&method(:Fabricate).curry(2).call(:account))
-
-        expect(described_class.without_internal.alphabetic).to eq matches
-      end
-    end
-
     describe 'matches_display_name' do
       it 'matches display name which starts with the given string' do
         match = Fabricate(:account, display_name: 'pattern and suffix')
diff --git a/spec/models/account_suggestions/friends_of_friends_source_spec.rb b/spec/models/account_suggestions/friends_of_friends_source_spec.rb
index 9daaa233bfd..af1e6e98896 100644
--- a/spec/models/account_suggestions/friends_of_friends_source_spec.rb
+++ b/spec/models/account_suggestions/friends_of_friends_source_spec.rb
@@ -16,10 +16,12 @@ RSpec.describe AccountSuggestions::FriendsOfFriendsSource do
     let!(:jerk) { Fabricate(:account, discoverable: true, hide_collections: false) }
     let!(:larry) { Fabricate(:account, discoverable: true, hide_collections: false) }
     let!(:morty) { Fabricate(:account, discoverable: true, hide_collections: false, memorial: true) }
+    let!(:joyce) { Fabricate(:account, discoverable: true, hide_collections: false) }
 
     context 'with follows and blocks' do
       before do
         bob.block!(jerk)
+        bob.request_follow!(joyce)
         FollowRecommendationMute.create!(account: bob, target_account: neil)
 
         # bob follows eugen, alice and larry
@@ -28,8 +30,8 @@ RSpec.describe AccountSuggestions::FriendsOfFriendsSource do
         # alice follows eve and mallory
         [john, mallory].each { |account| alice.follow!(account) }
 
-        # eugen follows eve, john, jerk, larry, neil and morty
-        [eve, mallory, jerk, larry, neil, morty].each { |account| eugen.follow!(account) }
+        # eugen follows eve, john, jerk, larry, neil, morty and joyce
+        [eve, mallory, jerk, larry, neil, morty, joyce].each { |account| eugen.follow!(account) }
       end
 
       it 'returns eligible accounts', :aggregate_failures do
@@ -55,6 +57,9 @@ RSpec.describe AccountSuggestions::FriendsOfFriendsSource do
 
         # morty is not included because his account is in memoriam
         expect(results).to_not include([morty.id, :friends_of_friends])
+
+        # joyce is not included because there is already a pending follow request
+        expect(results).to_not include([joyce.id, :friends_of_friends])
       end
     end
 
diff --git a/spec/models/announcement_reaction_spec.rb b/spec/models/announcement_reaction_spec.rb
new file mode 100644
index 00000000000..e02a8dcd069
--- /dev/null
+++ b/spec/models/announcement_reaction_spec.rb
@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe AnnouncementReaction do
+  describe 'Associations' do
+    it { is_expected.to belong_to(:account) }
+    it { is_expected.to belong_to(:announcement).inverse_of(:announcement_reactions) }
+    it { is_expected.to belong_to(:custom_emoji).optional }
+  end
+
+  describe 'Validations' do
+    subject { Fabricate.build :announcement_reaction }
+
+    it { is_expected.to validate_presence_of(:name) }
+    it { is_expected.to allow_values('😀').for(:name) }
+    it { is_expected.to_not allow_values('INVALID').for(:name) }
+
+    context 'when reaction limit is reached' do
+      subject { Fabricate.build :announcement_reaction, announcement: announcement_reaction.announcement }
+
+      let(:announcement_reaction) { Fabricate :announcement_reaction, name: '😊' }
+
+      before { stub_const 'ReactionValidator::LIMIT', 1 }
+
+      it { is_expected.to_not allow_values('😀').for(:name).against(:base) }
+    end
+  end
+
+  describe 'Callbacks' do
+    describe 'Setting custom emoji association' do
+      subject { Fabricate.build :announcement_reaction, name: }
+
+      context 'when name is missing' do
+        let(:name) { '' }
+
+        it 'does not set association' do
+          expect { subject.valid? }
+            .to not_change(subject, :custom_emoji).from(be_blank)
+        end
+      end
+
+      context 'when name matches a custom emoji shortcode' do
+        let(:name) { 'custom' }
+        let!(:custom_emoji) { Fabricate :custom_emoji, shortcode: 'custom' }
+
+        it 'sets association' do
+          expect { subject.valid? }
+            .to change(subject, :custom_emoji).from(be_blank).to(custom_emoji)
+        end
+      end
+
+      context 'when name does not match a custom emoji' do
+        let(:name) { 'custom' }
+
+        it 'does not set association' do
+          expect { subject.valid? }
+            .to not_change(subject, :custom_emoji).from(be_blank)
+        end
+      end
+    end
+  end
+end
diff --git a/spec/models/canonical_email_block_spec.rb b/spec/models/canonical_email_block_spec.rb
index c63483f968f..f531fd214e0 100644
--- a/spec/models/canonical_email_block_spec.rb
+++ b/spec/models/canonical_email_block_spec.rb
@@ -3,6 +3,44 @@
 require 'rails_helper'
 
 RSpec.describe CanonicalEmailBlock do
+  describe 'Associations' do
+    it { is_expected.to belong_to(:reference_account).class_name('Account').optional }
+  end
+
+  describe 'Normalizations' do
+    describe 'email' do
+      it { is_expected.to normalize(:email).from('TEST@HOST.EXAMPLE').to('test@host.example') }
+      it { is_expected.to normalize(:email).from('test+more@host.example').to('test@host.example') }
+      it { is_expected.to normalize(:email).from('test.user@host.example').to('testuser@host.example') }
+    end
+  end
+
+  describe 'Scopes' do
+    describe '.matching_email' do
+      subject { described_class.matching_email(email) }
+
+      let!(:block) { Fabricate :canonical_email_block, email: 'test@example.com' }
+
+      context 'when email is exact match' do
+        let(:email) { 'test@example.com' }
+
+        it { is_expected.to contain_exactly(block) }
+      end
+
+      context 'when email does not match' do
+        let(:email) { 'test@example.ORG' }
+
+        it { is_expected.to be_empty }
+      end
+
+      context 'when email is different but normalizes to same hash' do
+        let(:email) { 'te.st+more@EXAMPLE.com' }
+
+        it { is_expected.to contain_exactly(block) }
+      end
+    end
+  end
+
   describe '#email=' do
     let(:target_hash) { '973dfe463ec85785f5f95af5ba3906eedb2d931c24e69824a89ea65dba4e813b' }
 
diff --git a/spec/models/concerns/account/interactions_spec.rb b/spec/models/concerns/account/interactions_spec.rb
index e6e9076edb6..b683259c8c8 100644
--- a/spec/models/concerns/account/interactions_spec.rb
+++ b/spec/models/concerns/account/interactions_spec.rb
@@ -563,6 +563,22 @@ RSpec.describe Account::Interactions do
       me.follow!(remote_alice)
       expect(remote_alice.local_followers_hash).to eq Digest::SHA256.hexdigest(ActivityPub::TagManager.instance.uri_for(me))
     end
+
+    context 'when using numeric ID based scheme' do
+      let(:me) { Fabricate(:account, username: 'Me', id_scheme: :numeric_ap_id) }
+
+      it 'returns correct hash for local users' do
+        expect(remote_alice.local_followers_hash).to eq Digest::SHA256.hexdigest(ActivityPub::TagManager.instance.uri_for(me))
+      end
+
+      it 'invalidates cache as needed when removing or adding followers' do
+        expect(remote_alice.local_followers_hash).to eq Digest::SHA256.hexdigest(ActivityPub::TagManager.instance.uri_for(me))
+        me.unfollow!(remote_alice)
+        expect(remote_alice.local_followers_hash).to eq '0000000000000000000000000000000000000000000000000000000000000000'
+        me.follow!(remote_alice)
+        expect(remote_alice.local_followers_hash).to eq Digest::SHA256.hexdigest(ActivityPub::TagManager.instance.uri_for(me))
+      end
+    end
   end
 
   describe 'muting an account' do
diff --git a/spec/models/concerns/status/interaction_policy_concern_spec.rb b/spec/models/concerns/status/interaction_policy_concern_spec.rb
new file mode 100644
index 00000000000..b59a1186d9b
--- /dev/null
+++ b/spec/models/concerns/status/interaction_policy_concern_spec.rb
@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe Status::InteractionPolicyConcern do
+  let(:status) { Fabricate(:status, quote_approval_policy: (0b0101 << 16) | 0b0010) }
+
+  describe '#quote_policy_as_keys' do
+    it 'returns the expected values' do
+      expect(status.quote_policy_as_keys(:automatic)).to eq ['unsupported_policy', 'followers']
+      expect(status.quote_policy_as_keys(:manual)).to eq ['public']
+    end
+  end
+
+  describe '#quote_policy_for_account' do
+    let(:account) { Fabricate(:account) }
+
+    context 'when the account is not following the user' do
+      it 'returns :manual because of the public entry in the manual policy' do
+        expect(status.quote_policy_for_account(account)).to eq :manual
+      end
+    end
+
+    context 'when the account is following the user' do
+      before do
+        account.follow!(status.account)
+      end
+
+      it 'returns :automatic because of the followers entry in the automatic policy' do
+        expect(status.quote_policy_for_account(account)).to eq :automatic
+      end
+    end
+
+    context 'when the account falls into the unknown bucket' do
+      let(:status) { Fabricate(:status, quote_approval_policy: (0b0001 << 16) | 0b0100) }
+
+      it 'returns :automatic because of the followers entry in the automatic policy' do
+        expect(status.quote_policy_for_account(account)).to eq :unknown
+      end
+    end
+  end
+end
diff --git a/spec/models/custom_emoji_spec.rb b/spec/models/custom_emoji_spec.rb
index f812cf75847..244d0d126f1 100644
--- a/spec/models/custom_emoji_spec.rb
+++ b/spec/models/custom_emoji_spec.rb
@@ -80,6 +80,7 @@ RSpec.describe CustomEmoji, :attachment_processing do
 
   describe 'Normalizations' do
     describe 'domain' do
+      it { is_expected.to normalize(:domain).from('  www.mastodon.host   ').to('www.mastodon.host') }
       it { is_expected.to normalize(:domain).from('wWw.MaStOdOn.CoM').to('www.mastodon.com') }
       it { is_expected.to normalize(:domain).from(nil).to(nil) }
     end
diff --git a/spec/models/custom_filter_status_spec.rb b/spec/models/custom_filter_status_spec.rb
new file mode 100644
index 00000000000..3f161c00bd8
--- /dev/null
+++ b/spec/models/custom_filter_status_spec.rb
@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe CustomFilterStatus do
+  describe 'Associations' do
+    it { is_expected.to belong_to(:custom_filter) }
+    it { is_expected.to belong_to(:status) }
+  end
+
+  describe 'Validations' do
+    subject { Fabricate.build :custom_filter_status }
+
+    it { is_expected.to validate_uniqueness_of(:status_id).scoped_to(:custom_filter_id) }
+
+    describe 'Status access' do
+      subject { Fabricate.build :custom_filter_status, custom_filter:, status: }
+
+      let(:custom_filter) { Fabricate :custom_filter }
+      let(:status) { Fabricate :status }
+
+      context 'when policy allows filter account to access status' do
+        it { is_expected.to allow_value(status.id).for(:status_id) }
+      end
+
+      context 'when policy does not allow filter account to access status' do
+        before { status.account.touch(:suspended_at) }
+
+        it { is_expected.to_not allow_value(status.id).for(:status_id) }
+      end
+    end
+  end
+end
diff --git a/spec/models/domain_allow_spec.rb b/spec/models/domain_allow_spec.rb
index fbb324657e2..0c69aaff8dc 100644
--- a/spec/models/domain_allow_spec.rb
+++ b/spec/models/domain_allow_spec.rb
@@ -12,4 +12,19 @@ RSpec.describe DomainAllow do
       it { is_expected.to_not allow_value('xn--r9j5b5b').for(:domain) }
     end
   end
+
+  describe '.allowed_domains' do
+    subject { described_class.allowed_domains }
+
+    context 'without domain allows' do
+      it { is_expected.to be_an(Array).and(be_empty) }
+    end
+
+    context 'with domain allows' do
+      let!(:allowed_domain) { Fabricate :domain_allow }
+      let!(:other_allowed_domain) { Fabricate :domain_allow }
+
+      it { is_expected.to contain_exactly(allowed_domain.domain, other_allowed_domain.domain) }
+    end
+  end
 end
diff --git a/spec/models/fasp/provider_spec.rb b/spec/models/fasp/provider_spec.rb
index 52df4638fdc..c0e6ae255af 100644
--- a/spec/models/fasp/provider_spec.rb
+++ b/spec/models/fasp/provider_spec.rb
@@ -206,4 +206,110 @@ RSpec.describe Fasp::Provider do
       end
     end
   end
+
+  describe '#delivery_failure_tracker' do
+    subject { Fabricate(:fasp_provider) }
+
+    it 'returns a `DeliverFailureTracker` instance' do
+      expect(subject.delivery_failure_tracker).to be_a(DeliveryFailureTracker)
+    end
+  end
+
+  describe '#available?' do
+    subject { Fabricate(:fasp_provider, delivery_last_failed_at:) }
+
+    let(:delivery_last_failed_at) { nil }
+
+    before do
+      allow(subject.delivery_failure_tracker).to receive(:available?).and_return(available)
+    end
+
+    context 'when the delivery failure tracker reports it is available' do
+      let(:available) { true }
+
+      it 'returns true' do
+        expect(subject.available?).to be true
+      end
+    end
+
+    context 'when the delivery failure tracker reports it is unavailable' do
+      let(:available) { false }
+
+      context 'when the last failure was more than one hour ago' do
+        let(:delivery_last_failed_at) { 61.minutes.ago }
+
+        it 'returns true' do
+          expect(subject.available?).to be true
+        end
+      end
+
+      context 'when the last failure is very recent' do
+        let(:delivery_last_failed_at) { 5.minutes.ago }
+
+        it 'returns false' do
+          expect(subject.available?).to be false
+        end
+      end
+    end
+  end
+
+  describe '#update_availability!' do
+    subject { Fabricate(:fasp_provider, delivery_last_failed_at:) }
+
+    before do
+      allow(subject.delivery_failure_tracker).to receive(:available?).and_return(available)
+    end
+
+    context 'when `delivery_last_failed_at` is `nil`' do
+      let(:delivery_last_failed_at) { nil }
+
+      context 'when the delivery failure tracker reports it is available' do
+        let(:available) { true }
+
+        it 'does not update the provider' do
+          subject.update_availability!
+
+          expect(subject.saved_changes?).to be false
+        end
+      end
+
+      context 'when the delivery failure tracker reports it is unavailable' do
+        let(:available) { false }
+
+        it 'sets `delivery_last_failed_at` to the current time' do
+          freeze_time
+
+          subject.update_availability!
+
+          expect(subject.delivery_last_failed_at).to eq Time.zone.now
+        end
+      end
+    end
+
+    context 'when `delivery_last_failed_at` is present' do
+      context 'when the delivery failure tracker reports it is available' do
+        let(:available) { true }
+        let(:delivery_last_failed_at) { 5.minutes.ago }
+
+        it 'sets `delivery_last_failed_at` to `nil`' do
+          subject.update_availability!
+
+          expect(subject.delivery_last_failed_at).to be_nil
+        end
+      end
+
+      context 'when the delivery failure tracker reports it is unavailable' do
+        let(:available) { false }
+        let(:delivery_last_failed_at) { 5.minutes.ago }
+
+        it 'updates `delivery_last_failed_at` to the current time' do
+          freeze_time
+
+          subject.update_availability!
+
+          expect(subject.delivery_last_failed_at).to eq Time.zone.now
+        end
+      end
+    end
+  end
 end
diff --git a/spec/models/follow_recommendation_mute_spec.rb b/spec/models/follow_recommendation_mute_spec.rb
new file mode 100644
index 00000000000..0141d9042a1
--- /dev/null
+++ b/spec/models/follow_recommendation_mute_spec.rb
@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe FollowRecommendationMute do
+  describe 'Associations' do
+    it { is_expected.to belong_to(:account) }
+    it { is_expected.to belong_to(:target_account).class_name('Account') }
+  end
+
+  describe 'Validations' do
+    subject { Fabricate.build :follow_recommendation_mute }
+
+    it { is_expected.to validate_uniqueness_of(:target_account_id).scoped_to(:account_id) }
+  end
+
+  describe 'Callbacks' do
+    describe 'Maintaining the recommendation cache' do
+      let(:account) { Fabricate :account }
+      let(:cache_key) { "follow_recommendations/#{account.id}" }
+
+      before { Rails.cache.write(cache_key, 123) }
+
+      it 'purges on save' do
+        expect { Fabricate :follow_recommendation_mute, account: account }
+          .to(change { Rails.cache.exist?(cache_key) }.from(true).to(false))
+      end
+    end
+  end
+end
diff --git a/spec/models/form/import_spec.rb b/spec/models/form/import_spec.rb
index dd8fd35a05f..d682e13ecb9 100644
--- a/spec/models/form/import_spec.rb
+++ b/spec/models/form/import_spec.rb
@@ -258,13 +258,13 @@ RSpec.describe Form::Import do
       end
     end
 
-    it_behaves_like 'on successful import', 'following', 'merge', 'imports.txt', (%w(user@example.com user@test.com).map { |acct| { 'acct' => acct } })
-    it_behaves_like 'on successful import', 'following', 'overwrite', 'imports.txt', (%w(user@example.com user@test.com).map { |acct| { 'acct' => acct } })
-    it_behaves_like 'on successful import', 'blocking', 'merge', 'imports.txt', (%w(user@example.com user@test.com).map { |acct| { 'acct' => acct } })
-    it_behaves_like 'on successful import', 'blocking', 'overwrite', 'imports.txt', (%w(user@example.com user@test.com).map { |acct| { 'acct' => acct } })
-    it_behaves_like 'on successful import', 'muting', 'merge', 'imports.txt', (%w(user@example.com user@test.com).map { |acct| { 'acct' => acct } })
-    it_behaves_like 'on successful import', 'domain_blocking', 'merge', 'domain_blocks.csv', (%w(bad.domain worse.domain reject.media).map { |domain| { 'domain' => domain } })
-    it_behaves_like 'on successful import', 'bookmarks', 'merge', 'bookmark-imports.txt', (%w(https://example.com/statuses/1312 https://local.com/users/foo/statuses/42 https://unknown-remote.com/users/bar/statuses/1 https://example.com/statuses/direct).map { |uri| { 'uri' => uri } })
+    it_behaves_like('on successful import', 'following', 'merge', 'imports.txt', %w(user@example.com user@test.com).map { |acct| { 'acct' => acct } })
+    it_behaves_like('on successful import', 'following', 'overwrite', 'imports.txt', %w(user@example.com user@test.com).map { |acct| { 'acct' => acct } })
+    it_behaves_like('on successful import', 'blocking', 'merge', 'imports.txt', %w(user@example.com user@test.com).map { |acct| { 'acct' => acct } })
+    it_behaves_like('on successful import', 'blocking', 'overwrite', 'imports.txt', %w(user@example.com user@test.com).map { |acct| { 'acct' => acct } })
+    it_behaves_like('on successful import', 'muting', 'merge', 'imports.txt', %w(user@example.com user@test.com).map { |acct| { 'acct' => acct } })
+    it_behaves_like('on successful import', 'domain_blocking', 'merge', 'domain_blocks.csv', %w(bad.domain worse.domain reject.media).map { |domain| { 'domain' => domain } })
+    it_behaves_like('on successful import', 'bookmarks', 'merge', 'bookmark-imports.txt', %w(https://example.com/statuses/1312 https://local.com/users/foo/statuses/42 https://unknown-remote.com/users/bar/statuses/1 https://example.com/statuses/direct).map { |uri| { 'uri' => uri } })
 
     it_behaves_like 'on successful import', 'following', 'merge', 'following_accounts.csv', [
       { 'acct' => 'user@example.com', 'show_reblogs' => true, 'notify' => false, 'languages' => nil },
diff --git a/spec/models/list_spec.rb b/spec/models/list_spec.rb
index 48c273d3ecb..e2d91835ec7 100644
--- a/spec/models/list_spec.rb
+++ b/spec/models/list_spec.rb
@@ -28,4 +28,26 @@ RSpec.describe List do
       end
     end
   end
+
+  describe 'Scopes' do
+    describe '.with_list_account' do
+      let(:alice) { Fabricate :account }
+      let(:bob) { Fabricate :account }
+      let(:list) { Fabricate :list }
+      let(:other_list) { Fabricate :list }
+
+      before do
+        Fabricate :follow, account: list.account, target_account: alice
+        Fabricate :follow, account: other_list.account, target_account: bob
+        Fabricate :list_account, list: list, account: alice
+        Fabricate :list_account, list: other_list, account: bob
+      end
+
+      it 'returns lists connected to the account' do
+        expect(described_class.with_list_account(alice))
+          .to include(list)
+          .and not_include(other_list)
+      end
+    end
+  end
 end
diff --git a/spec/models/media_attachment_spec.rb b/spec/models/media_attachment_spec.rb
index 910eac4e9a4..a712cdde1dc 100644
--- a/spec/models/media_attachment_spec.rb
+++ b/spec/models/media_attachment_spec.rb
@@ -313,6 +313,12 @@ RSpec.describe MediaAttachment, :attachment_processing do
     end
   end
 
+  describe '.combined_media_file_size' do
+    subject { described_class.combined_media_file_size }
+
+    it { is_expected.to be_an(Arel::Nodes::Grouping) }
+  end
+
   private
 
   def media_metadata
diff --git a/spec/models/notification_spec.rb b/spec/models/notification_spec.rb
index 67c85b40f37..08427a521ab 100644
--- a/spec/models/notification_spec.rb
+++ b/spec/models/notification_spec.rb
@@ -69,6 +69,17 @@ RSpec.describe Notification do
       end
     end
 
+    context 'when the notification is a quoted post update notification' do
+      it 'sets the notification from_account correctly' do
+        status = Fabricate(:status)
+        quote = Fabricate(:quote, quoted_status: status)
+
+        notification = Fabricate.build(:notification, activity_type: 'Status', type: 'quoted_update', activity: quote.status)
+
+        expect(notification.from_account).to eq(status.account)
+      end
+    end
+
     context 'when activity_type is a Follow' do
       it 'sets the notification from_account correctly' do
         follow = Fabricate(:follow)
diff --git a/spec/models/relay_spec.rb b/spec/models/relay_spec.rb
index 4b95c596e45..03758ca6a8f 100644
--- a/spec/models/relay_spec.rb
+++ b/spec/models/relay_spec.rb
@@ -8,4 +8,100 @@ RSpec.describe Relay do
       it { is_expected.to normalize(:inbox_url).from('  http://host.example  ').to('http://host.example') }
     end
   end
+
+  describe 'Validations' do
+    it { is_expected.to validate_presence_of(:inbox_url) }
+    it { is_expected.to validate_uniqueness_of(:inbox_url) }
+  end
+
+  describe 'Enumerations' do
+    it { is_expected.to define_enum_for(:state) }
+  end
+
+  describe 'Scopes' do
+    describe 'enabled' do
+      let!(:accepted_relay) { Fabricate :relay, state: :accepted }
+      let!(:pending_relay) { Fabricate :relay, state: :pending }
+
+      it 'returns records in accepted state' do
+        expect(described_class.enabled)
+          .to include(accepted_relay)
+          .and not_include(pending_relay)
+      end
+    end
+  end
+
+  describe 'Callbacks' do
+    describe 'Ensure disabled on destroy' do
+      before { stub_services }
+
+      context 'when relay is enabled' do
+        let(:relay) { Fabricate :relay, state: :accepted }
+
+        it 'sends undo when destroying the record' do
+          relay.destroy!
+
+          expect(ActivityPub::DeliveryWorker)
+            .to have_received(:perform_async).with(match('Undo'), Account.representative.id, relay.inbox_url)
+        end
+      end
+
+      context 'when relay is not enabled' do
+        let(:relay) { Fabricate :relay, state: :pending }
+
+        it 'sends undo when destroying the record' do
+          relay.destroy!
+
+          expect(ActivityPub::DeliveryWorker)
+            .to_not have_received(:perform_async)
+        end
+      end
+    end
+  end
+
+  describe '#to_log_human_identifier' do
+    subject { relay.to_log_human_identifier }
+
+    let(:relay) { Fabricate.build :relay, inbox_url: }
+    let(:inbox_url) { 'https://host.example' }
+
+    it { is_expected.to eq(inbox_url) }
+  end
+
+  describe '#disable' do
+    let(:relay) { Fabricate :relay, state: :accepted, follow_activity_id: 'https://host.example/123' }
+
+    before { stub_services }
+
+    it 'changes state to idle and removes the activity id' do
+      expect { relay.disable! }
+        .to change { relay.reload.state }.to('idle')
+        .and change { relay.reload.follow_activity_id }.to(be_nil)
+      expect(ActivityPub::DeliveryWorker)
+        .to have_received(:perform_async).with(match('Undo'), Account.representative.id, relay.inbox_url)
+      expect(DeliveryFailureTracker)
+        .to have_received(:reset!).with(relay.inbox_url)
+    end
+  end
+
+  describe '#enable' do
+    let(:relay) { Fabricate :relay, state: :idle, follow_activity_id: '' }
+
+    before { stub_services }
+
+    it 'changes state to pending and populates the activity id' do
+      expect { relay.enable! }
+        .to change { relay.reload.state }.to('pending')
+        .and change { relay.reload.follow_activity_id }.to(be_present)
+      expect(ActivityPub::DeliveryWorker)
+        .to have_received(:perform_async).with(match('Follow'), Account.representative.id, relay.inbox_url)
+      expect(DeliveryFailureTracker)
+        .to have_received(:reset!).with(relay.inbox_url)
+    end
+  end
+
+  def stub_services
+    allow(ActivityPub::DeliveryWorker).to receive(:perform_async)
+    allow(DeliveryFailureTracker).to receive(:reset!)
+  end
 end
diff --git a/spec/models/remote_follow_spec.rb b/spec/models/remote_follow_spec.rb
index b3ec7b737e2..aad32825625 100644
--- a/spec/models/remote_follow_spec.rb
+++ b/spec/models/remote_follow_spec.rb
@@ -68,7 +68,7 @@ RSpec.describe RemoteFollow do
       Addressable::URI.new(
         host: 'quitter.no',
         path: '/main/ostatussub',
-        query_values: { profile: "https://#{Rails.configuration.x.local_domain}/users/alice" },
+        query_values: { profile: ActivityPub::TagManager.instance.uri_for(account) },
         scheme: 'https'
       ).to_s
     end
diff --git a/spec/models/rule_translation_spec.rb b/spec/models/rule_translation_spec.rb
index 649bd5c0e49..1a0a7375042 100644
--- a/spec/models/rule_translation_spec.rb
+++ b/spec/models/rule_translation_spec.rb
@@ -52,4 +52,22 @@ RSpec.describe RuleTranslation do
       end
     end
   end
+
+  describe '.languages' do
+    let(:discarded_rule) { Fabricate :rule, deleted_at: 5.days.ago }
+    let(:kept_rule) { Fabricate :rule }
+
+    before do
+      Fabricate :rule_translation, rule: discarded_rule, language: 'en'
+      Fabricate :rule_translation, rule: kept_rule, language: 'es'
+      Fabricate :rule_translation, language: 'fr'
+      Fabricate :rule_translation, language: 'es'
+    end
+
+    it 'returns ordered distinct languages connected to non-discarded rules' do
+      expect(described_class.languages)
+        .to be_an(Array)
+        .and eq(%w(es fr))
+    end
+  end
 end
diff --git a/spec/models/status_spec.rb b/spec/models/status_spec.rb
index e6c49f1013d..e0a2c391046 100644
--- a/spec/models/status_spec.rb
+++ b/spec/models/status_spec.rb
@@ -191,6 +191,19 @@ RSpec.describe Status do
     end
   end
 
+  describe '.not_replying_to_account' do
+    let(:account) { Fabricate :account }
+    let!(:status_from_account) { Fabricate :status, account: account }
+    let!(:reply_to_account_status) { Fabricate :status, thread: status_from_account }
+    let!(:reply_to_other) { Fabricate :status, thread: Fabricate(:status) }
+
+    it 'returns records not in reply to provided account' do
+      expect(described_class.not_replying_to_account(account))
+        .to not_include(reply_to_account_status)
+        .and include(reply_to_other)
+    end
+  end
+
   describe '#untrusted_favourites_count' do
     before do
       alice.update(domain: 'example.com')
@@ -363,6 +376,28 @@ RSpec.describe Status do
     end
   end
 
+  describe '.only_polls' do
+    let!(:poll_status) { Fabricate :status, poll: Fabricate(:poll) }
+    let!(:no_poll_status) { Fabricate :status }
+
+    it 'returns the expected statuses' do
+      expect(described_class.only_polls)
+        .to include(poll_status)
+        .and not_include(no_poll_status)
+    end
+  end
+
+  describe '.without_polls' do
+    let!(:poll_status) { Fabricate :status, poll: Fabricate(:poll) }
+    let!(:no_poll_status) { Fabricate :status }
+
+    it 'returns the expected statuses' do
+      expect(described_class.without_polls)
+        .to not_include(poll_status)
+        .and include(no_poll_status)
+    end
+  end
+
   describe '.tagged_with' do
     let(:tag_cats) { Fabricate(:tag, name: 'cats') }
     let(:tag_dogs) { Fabricate(:tag, name: 'dogs') }
diff --git a/spec/models/tag_spec.rb b/spec/models/tag_spec.rb
index 0831ac34b8b..18378c000d2 100644
--- a/spec/models/tag_spec.rb
+++ b/spec/models/tag_spec.rb
@@ -17,6 +17,7 @@ RSpec.describe Tag do
         subject { Fabricate :tag, name: 'original' }
 
         it { is_expected.to_not allow_value('changed').for(:name).with_message(previous_name_error_message) }
+        it { is_expected.to allow_value('ORIGINAL').for(:name) }
       end
     end
 
@@ -31,6 +32,7 @@ RSpec.describe Tag do
         subject { Fabricate :tag, name: 'original', display_name: 'OriginalDisplayName' }
 
         it { is_expected.to_not allow_value('ChangedDisplayName').for(:display_name).with_message(previous_name_error_message) }
+        it { is_expected.to allow_value('ORIGINAL').for(:display_name) }
       end
     end
 
diff --git a/spec/models/terms_of_service_spec.rb b/spec/models/terms_of_service_spec.rb
index 7e68c4eac7c..16cd5dd2ebf 100644
--- a/spec/models/terms_of_service_spec.rb
+++ b/spec/models/terms_of_service_spec.rb
@@ -44,22 +44,24 @@ RSpec.describe TermsOfService do
     end
 
     describe '.live' do
-      let!(:not_effective) { Fabricate :terms_of_service }
+      # The `pre_effective_date` record captures a period before the value was tracked
+      # The update in the `before` block creates an invalid (but historically plausible) record
+      let!(:pre_effective_date) { travel_to(10.days.ago) { Fabricate :terms_of_service, effective_date: Time.zone.today } }
       let!(:effective_past) { travel_to(3.days.ago) { Fabricate :terms_of_service, effective_date: Time.zone.today } }
       let!(:effective_future) { Fabricate :terms_of_service, effective_date: 3.days.from_now }
 
-      before { not_effective.update_attribute(:effective_date, nil) }
+      before { pre_effective_date.update_attribute(:effective_date, nil) }
 
       it 'returns records without effective or with past effective' do
         expect(described_class.live)
-          .to include(not_effective)
+          .to include(pre_effective_date)
           .and include(effective_past)
           .and not_include(effective_future)
       end
     end
 
     describe '.upcoming' do
-      let!(:unpublished) { Fabricate :terms_of_service, published_at: nil }
+      let!(:unpublished) { Fabricate :terms_of_service, published_at: nil, effective_date: 10.days.from_now }
       let!(:effective_past) { travel_to(3.days.ago) { Fabricate :terms_of_service, effective_date: Time.zone.today } }
       let!(:effective_future_near) { Fabricate :terms_of_service, effective_date: 3.days.from_now }
       let!(:effective_future_far) { Fabricate :terms_of_service, effective_date: 5.days.from_now }
diff --git a/spec/models/trends/statuses_spec.rb b/spec/models/trends/statuses_spec.rb
index 39839010427..54b227dad0c 100644
--- a/spec/models/trends/statuses_spec.rb
+++ b/spec/models/trends/statuses_spec.rb
@@ -111,12 +111,16 @@ RSpec.describe Trends::Statuses do
     let!(:yesterday) { today - 1.day }
 
     let!(:status_foo) { Fabricate(:status, text: 'Foo', language: 'en', trendable: true, created_at: yesterday) }
-    let!(:status_bar) { Fabricate(:status, text: 'Bar', language: 'en', trendable: true, created_at: today) }
+    let!(:status_bar) { Fabricate(:status, text: 'Bar', language: 'en', trendable: true, created_at: today, quote: Quote.new(state: :accepted, quoted_status: status_foo)) }
     let!(:status_baz) { Fabricate(:status, text: 'Baz', language: 'en', trendable: true, created_at: today) }
+    let!(:untrendable) { Fabricate(:status, text: 'Untrendable', language: 'en', trendable: true, visibility: :unlisted) }
+    let!(:untrendable_quote) { Fabricate(:status, text: 'Untrendable quote!', language: 'en', trendable: true, created_at: today, quote: Quote.new(state: :accepted, quoted_status: untrendable)) }
 
     before do
       default_threshold_value.times { reblog(status_foo, today) }
       default_threshold_value.times { reblog(status_bar, today) }
+      default_threshold_value.times { reblog(untrendable, today) }
+      default_threshold_value.times { reblog(untrendable_quote, today) }
       (default_threshold_value - 1).times { reblog(status_baz, today) }
     end
 
@@ -129,7 +133,7 @@ RSpec.describe Trends::Statuses do
         results = subject.query.limit(10).to_a
 
         expect(results).to eq [status_bar, status_foo]
-        expect(results).to_not include(status_baz)
+        expect(results).to_not include(status_baz, untrendable, untrendable_quote)
       end
     end
 
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index b732b2d84d0..7088266b34e 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -10,6 +10,8 @@ RSpec.describe User do
   let(:account) { Fabricate(:account, username: 'alice') }
 
   it_behaves_like 'two_factor_backupable'
+  it_behaves_like 'User::Activity'
+  it_behaves_like 'User::Confirmation'
 
   describe 'otp_secret' do
     it 'encrypts the saved value' do
@@ -24,6 +26,7 @@ RSpec.describe User do
 
   describe 'Associations' do
     it { is_expected.to belong_to(:account).required }
+    it { is_expected.to have_many(:login_activities) }
   end
 
   describe 'Validations' do
@@ -64,34 +67,6 @@ RSpec.describe User do
       end
     end
 
-    describe 'confirmed' do
-      it 'returns an array of users who are confirmed' do
-        Fabricate(:user, confirmed_at: nil)
-        confirmed_user = Fabricate(:user, confirmed_at: Time.zone.now)
-        expect(described_class.confirmed).to contain_exactly(confirmed_user)
-      end
-    end
-
-    describe 'signed_in_recently' do
-      it 'returns a relation of users who have signed in during the recent period' do
-        recent_sign_in_user = Fabricate(:user, current_sign_in_at: within_duration_window_days.ago)
-        Fabricate(:user, current_sign_in_at: exceed_duration_window_days.ago)
-
-        expect(described_class.signed_in_recently)
-          .to contain_exactly(recent_sign_in_user)
-      end
-    end
-
-    describe 'not_signed_in_recently' do
-      it 'returns a relation of users who have not signed in during the recent period' do
-        no_recent_sign_in_user = Fabricate(:user, current_sign_in_at: exceed_duration_window_days.ago)
-        Fabricate(:user, current_sign_in_at: within_duration_window_days.ago)
-
-        expect(described_class.not_signed_in_recently)
-          .to contain_exactly(no_recent_sign_in_user)
-      end
-    end
-
     describe 'account_not_suspended' do
       it 'returns with linked accounts that are not suspended' do
         suspended_account = Fabricate(:account, suspended_at: 10.days.ago)
@@ -126,14 +101,6 @@ RSpec.describe User do
         expect(described_class.matches_ip('2160:2160::/32')).to contain_exactly(user1)
       end
     end
-
-    def exceed_duration_window_days
-      described_class::ACTIVE_DURATION + 2.days
-    end
-
-    def within_duration_window_days
-      described_class::ACTIVE_DURATION - 2.days
-    end
   end
 
   describe 'email domains denylist integration' do
@@ -196,12 +163,13 @@ RSpec.describe User do
 
   describe '#update_sign_in!' do
     context 'with an existing user' do
-      let!(:user) { Fabricate :user, last_sign_in_at: 10.days.ago, current_sign_in_at: 1.hour.ago, sign_in_count: 123 }
+      let!(:user) { Fabricate :user, last_sign_in_at: 10.days.ago, current_sign_in_at:, sign_in_count: 123 }
+      let(:current_sign_in_at) { 1.hour.ago }
 
       context 'with new sign in false' do
         it 'updates timestamps but not counts' do
           expect { user.update_sign_in!(new_sign_in: false) }
-            .to change(user, :last_sign_in_at)
+            .to change(user, :last_sign_in_at).to(current_sign_in_at)
             .and change(user, :current_sign_in_at)
             .and not_change(user, :sign_in_count)
         end
@@ -210,11 +178,22 @@ RSpec.describe User do
       context 'with new sign in true' do
         it 'updates timestamps and counts' do
           expect { user.update_sign_in!(new_sign_in: true) }
-            .to change(user, :last_sign_in_at)
+            .to change(user, :last_sign_in_at).to(current_sign_in_at)
             .and change(user, :current_sign_in_at)
             .and change(user, :sign_in_count).by(1)
         end
       end
+
+      context 'when the user does not have a current_sign_in_at value' do
+        let(:current_sign_in_at) { nil }
+
+        before { travel_to(1.minute.ago) }
+
+        it 'updates last sign in to now' do
+          expect { user.update_sign_in! }
+            .to change(user, :last_sign_in_at).to(Time.now.utc)
+        end
+      end
     end
 
     context 'with a new user' do
@@ -227,79 +206,6 @@ RSpec.describe User do
     end
   end
 
-  describe '#confirmed?' do
-    it 'returns true when a confirmed_at is set' do
-      user = Fabricate.build(:user, confirmed_at: Time.now.utc)
-      expect(user.confirmed?).to be true
-    end
-
-    it 'returns false if a confirmed_at is nil' do
-      user = Fabricate.build(:user, confirmed_at: nil)
-      expect(user.confirmed?).to be false
-    end
-  end
-
-  describe '#confirm' do
-    subject { user.confirm }
-
-    let(:new_email) { 'new-email@example.com' }
-
-    before do
-      allow(TriggerWebhookWorker).to receive(:perform_async)
-    end
-
-    context 'when the user is already confirmed' do
-      let!(:user) { Fabricate(:user, confirmed_at: Time.now.utc, approved: true, unconfirmed_email: new_email) }
-
-      it 'sets email to unconfirmed_email and does not trigger web hook' do
-        expect { subject }.to change { user.reload.email }.to(new_email)
-
-        expect(TriggerWebhookWorker).to_not have_received(:perform_async).with('account.approved', 'Account', user.account_id)
-      end
-    end
-
-    context 'when the user is a new user' do
-      let(:user) { Fabricate(:user, confirmed_at: nil, unconfirmed_email: new_email) }
-
-      context 'when the user is already approved' do
-        before do
-          Setting.registrations_mode = 'approved'
-          user.approve!
-        end
-
-        it 'sets email to unconfirmed_email and triggers `account.approved` web hook' do
-          expect { subject }.to change { user.reload.email }.to(new_email)
-
-          expect(TriggerWebhookWorker).to have_received(:perform_async).with('account.approved', 'Account', user.account_id).once
-        end
-      end
-
-      context 'when the user does not require explicit approval' do
-        before do
-          Setting.registrations_mode = 'open'
-        end
-
-        it 'sets email to unconfirmed_email and triggers `account.approved` web hook' do
-          expect { subject }.to change { user.reload.email }.to(new_email)
-
-          expect(TriggerWebhookWorker).to have_received(:perform_async).with('account.approved', 'Account', user.account_id).once
-        end
-      end
-
-      context 'when the user requires explicit approval but is not approved' do
-        before do
-          Setting.registrations_mode = 'approved'
-        end
-
-        it 'sets email to unconfirmed_email and does not trigger web hook' do
-          expect { subject }.to change { user.reload.email }.to(new_email)
-
-          expect(TriggerWebhookWorker).to_not have_received(:perform_async).with('account.approved', 'Account', user.account_id)
-        end
-      end
-    end
-  end
-
   describe '#approve!' do
     subject { user.approve! }
 
@@ -476,12 +382,15 @@ RSpec.describe User do
 
     let(:current_sign_in_at) { Time.zone.now }
 
-    before do
-      user.disable!
-    end
-
     it 'disables user' do
+      allow(redis).to receive(:publish)
+
+      user.disable!
+
       expect(user).to have_attributes(disabled: true)
+
+      expect(redis)
+        .to have_received(:publish).with("timeline:system:#{user.account.id}", Oj.dump(event: :kill)).once
     end
   end
 
diff --git a/spec/models/username_block_spec.rb b/spec/models/username_block_spec.rb
new file mode 100644
index 00000000000..72dbe028bdf
--- /dev/null
+++ b/spec/models/username_block_spec.rb
@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe UsernameBlock do
+  describe '.matches?' do
+    context 'when there is an exact block' do
+      before do
+        Fabricate(:username_block, username: 'carriage', exact: true)
+      end
+
+      it 'returns true on exact match' do
+        expect(described_class.matches?('carriage')).to be true
+      end
+
+      it 'returns true on case insensitive match' do
+        expect(described_class.matches?('CaRRiagE')).to be true
+      end
+
+      it 'returns true on homoglyph match' do
+        expect(described_class.matches?('c4rr14g3')).to be true
+      end
+
+      it 'returns false on partial match' do
+        expect(described_class.matches?('foo_carriage')).to be false
+      end
+
+      it 'returns false on no match' do
+        expect(described_class.matches?('foo')).to be false
+      end
+    end
+
+    context 'when there is a partial block' do
+      before do
+        Fabricate(:username_block, username: 'carriage', exact: false)
+      end
+
+      it 'returns true on exact match' do
+        expect(described_class.matches?('carriage')).to be true
+      end
+
+      it 'returns true on case insensitive match' do
+        expect(described_class.matches?('CaRRiagE')).to be true
+      end
+
+      it 'returns true on homoglyph match' do
+        expect(described_class.matches?('c4rr14g3')).to be true
+      end
+
+      it 'returns true on suffix match' do
+        expect(described_class.matches?('foo_carriage')).to be true
+      end
+
+      it 'returns true on prefix match' do
+        expect(described_class.matches?('carriage_foo')).to be true
+      end
+
+      it 'returns false on no match' do
+        expect(described_class.matches?('foo')).to be false
+      end
+    end
+  end
+end
diff --git a/spec/models/worker_batch_spec.rb b/spec/models/worker_batch_spec.rb
new file mode 100644
index 00000000000..b204decb89e
--- /dev/null
+++ b/spec/models/worker_batch_spec.rb
@@ -0,0 +1,96 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe WorkerBatch do
+  subject { described_class.new }
+
+  let(:async_refresh_key) { 'test_refresh' }
+  let(:async_refresh) { nil }
+
+  describe '#id' do
+    it 'returns a string' do
+      expect(subject.id).to be_a String
+    end
+  end
+
+  describe '#connect' do
+    before do
+      subject.connect(async_refresh_key, threshold: 0.75)
+    end
+
+    it 'persists the async refresh key' do
+      expect(subject.info['async_refresh_key']).to eq async_refresh_key
+    end
+
+    it 'persists the threshold' do
+      expect(subject.info['threshold']).to eq '0.75'
+    end
+  end
+
+  describe '#add_jobs' do
+    before do
+      subject.connect(async_refresh_key, threshold: 0.5) if async_refresh.present?
+      subject.add_jobs([])
+    end
+
+    context 'when called with empty array' do
+      it 'does not persist the number of pending jobs' do
+        expect(subject.info).to be_empty
+      end
+
+      it 'does not persist the job IDs' do
+        expect(subject.jobs).to eq []
+      end
+    end
+
+    context 'when called with an array of job IDs' do
+      before do
+        subject.add_jobs(%w(foo bar))
+      end
+
+      it 'persists the number of pending jobs' do
+        expect(subject.info['pending']).to eq '2'
+      end
+
+      it 'persists the job IDs' do
+        expect(subject.jobs).to contain_exactly('foo', 'bar')
+      end
+    end
+  end
+
+  describe '#remove_job' do
+    before do
+      subject.connect(async_refresh_key, threshold: 0.5) if async_refresh.present?
+      subject.add_jobs(%w(foo bar baz))
+      subject.remove_job('foo', increment: true)
+    end
+
+    it 'removes the job from pending jobs' do
+      expect(subject.jobs).to contain_exactly('bar', 'baz')
+    end
+
+    it 'decrements the number of pending jobs' do
+      expect(subject.info['pending']).to eq '2'
+    end
+
+    context 'when async refresh is connected' do
+      let(:async_refresh) { AsyncRefresh.new(async_refresh_key) }
+
+      it 'increments async refresh progress' do
+        expect(async_refresh.reload.result_count).to eq 1
+      end
+
+      it 'marks the async refresh as finished when the threshold is reached' do
+        subject.remove_job('bar')
+        expect(async_refresh.reload.finished?).to be true
+      end
+    end
+  end
+
+  describe '#info' do
+    it 'returns a hash' do
+      expect(subject.info).to be_a Hash
+    end
+  end
+end
diff --git a/spec/policies/status_policy_spec.rb b/spec/policies/status_policy_spec.rb
index 69c0bad026b..eb79aa6fcd1 100644
--- a/spec/policies/status_policy_spec.rb
+++ b/spec/policies/status_policy_spec.rb
@@ -86,6 +86,92 @@ RSpec.describe StatusPolicy, type: :model do
     end
   end
 
+  context 'with the permission of quote?' do
+    permissions :quote? do
+      it 'does not grant access when direct and account is viewer' do
+        status.visibility = :direct
+
+        expect(subject).to_not permit(status.account, status)
+      end
+
+      it 'does not grant access access when direct and viewer is mentioned but not explicitly allowed' do
+        status.visibility = :direct
+        status.mentions = [Fabricate(:mention, account: bob)]
+
+        expect(subject).to_not permit(bob, status)
+      end
+
+      it 'does not grant access access when direct and viewer is mentioned but not explicitly allowed and mentions are loaded' do
+        status.visibility = :direct
+        status.mentions = [Fabricate(:mention, account: bob)]
+        status.active_mentions.load
+
+        expect(subject).to_not permit(bob, status)
+      end
+
+      it 'denies access when direct and viewer is not mentioned' do
+        viewer = Fabricate(:account)
+        status.visibility = :direct
+
+        expect(subject).to_not permit(viewer, status)
+      end
+
+      it 'denies access when private and viewer is not mentioned' do
+        viewer = Fabricate(:account)
+        status.visibility = :private
+
+        expect(subject).to_not permit(viewer, status)
+      end
+
+      it 'grants access when private and viewer is mentioned but not otherwise allowed' do
+        status.visibility = :private
+        status.mentions = [Fabricate(:mention, account: bob)]
+
+        expect(subject).to_not permit(bob, status)
+      end
+
+      it 'denies access when private and non-viewer is mentioned' do
+        viewer = Fabricate(:account)
+        status.visibility = :private
+        status.mentions = [Fabricate(:mention, account: bob)]
+
+        expect(subject).to_not permit(viewer, status)
+      end
+
+      it 'denies access when private and account is following viewer' do
+        follow = Fabricate(:follow)
+        status.visibility = :private
+        status.account = follow.target_account
+
+        expect(subject).to_not permit(follow.account, status)
+      end
+
+      it 'denies access when public but policy does not allow anyone' do
+        viewer = Fabricate(:account)
+        expect(subject).to_not permit(viewer, status)
+      end
+
+      it 'grants access when public and policy allows everyone' do
+        status.quote_approval_policy = Status::QUOTE_APPROVAL_POLICY_FLAGS[:public]
+        viewer = Fabricate(:account)
+        expect(subject).to permit(viewer, status)
+      end
+
+      it 'denies access when public and policy allows followers but viewer is not one' do
+        status.quote_approval_policy = Status::QUOTE_APPROVAL_POLICY_FLAGS[:followers]
+        viewer = Fabricate(:account)
+        expect(subject).to_not permit(viewer, status)
+      end
+
+      it 'grants access when public and policy allows followers and viewer is one' do
+        status.quote_approval_policy = Status::QUOTE_APPROVAL_POLICY_FLAGS[:followers]
+        viewer = Fabricate(:account)
+        viewer.follow!(status.account)
+        expect(subject).to permit(viewer, status)
+      end
+    end
+  end
+
   context 'with the permission of reblog?' do
     permissions :reblog? do
       it 'denies access when private' do
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index 3d3e556f353..6be93ecb70e 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -30,7 +30,8 @@ end
 
 # This needs to be defined before Rails is initialized
 STREAMING_PORT = ENV.fetch('TEST_STREAMING_PORT', '4020')
-ENV['STREAMING_API_BASE_URL'] = "http://localhost:#{STREAMING_PORT}"
+STREAMING_HOST = ENV.fetch('TEST_STREAMING_HOST', 'localhost')
+ENV['STREAMING_API_BASE_URL'] = "http://#{STREAMING_HOST}:#{STREAMING_PORT}"
 
 require_relative '../config/environment'
 
diff --git a/spec/requests/accounts_spec.rb b/spec/requests/accounts_spec.rb
index 72913ebf22d..cc2a5be7c5f 100644
--- a/spec/requests/accounts_spec.rb
+++ b/spec/requests/accounts_spec.rb
@@ -5,6 +5,14 @@ require 'rails_helper'
 RSpec.describe 'Accounts show response' do
   let(:account) { Fabricate(:account) }
 
+  context 'with numeric-based identifiers' do
+    it 'returns http success' do
+      get "/ap/users/#{account.id}"
+
+      expect(response).to have_http_status(200)
+    end
+  end
+
   context 'with an unapproved account' do
     before { account.user.update(approved: false) }
 
diff --git a/spec/requests/activitypub/contexts_spec.rb b/spec/requests/activitypub/contexts_spec.rb
new file mode 100644
index 00000000000..c69443d7b96
--- /dev/null
+++ b/spec/requests/activitypub/contexts_spec.rb
@@ -0,0 +1,145 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'ActivityPub Contexts' do
+  let(:conversation) { Fabricate(:status).owned_conversation }
+
+  describe 'GET #show' do
+    subject { get context_path(conversation), headers: nil }
+
+    let!(:status) { Fabricate(:status, conversation: conversation) }
+    let!(:unrelated_status) { Fabricate(:status) }
+
+    it 'returns http success and correct media type and correct items' do
+      subject
+
+      expect(response)
+        .to have_http_status(200)
+        .and have_cacheable_headers
+
+      expect(response.media_type)
+        .to eq 'application/activity+json'
+
+      expect(response.parsed_body[:type])
+        .to eq 'Collection'
+
+      expect(response.parsed_body[:first][:items])
+        .to be_an(Array)
+        .and have_attributes(size: 2)
+        .and include(ActivityPub::TagManager.instance.uri_for(status))
+        .and not_include(ActivityPub::TagManager.instance.uri_for(unrelated_status))
+    end
+
+    context 'when the initial account is deleted' do
+      before { conversation.parent_account.delete }
+
+      it 'returns http success and correct media type and correct items' do
+        subject
+
+        expect(response)
+          .to have_http_status(200)
+          .and have_cacheable_headers
+
+        expect(response.media_type)
+          .to eq 'application/activity+json'
+
+        expect(response.parsed_body[:type])
+          .to eq 'Collection'
+
+        expect(response.parsed_body[:first][:items])
+          .to be_an(Array)
+          .and have_attributes(size: 1)
+          .and include(ActivityPub::TagManager.instance.uri_for(status))
+          .and not_include(ActivityPub::TagManager.instance.uri_for(unrelated_status))
+      end
+    end
+
+    context 'with pagination' do
+      context 'with few statuses' do
+        before do
+          Fabricate.times(3, :status, conversation: conversation)
+        end
+
+        it 'does not include a next page link' do
+          subject
+
+          expect(response.parsed_body[:first][:next]).to be_nil
+        end
+      end
+
+      context 'with many statuses' do
+        before do
+          ActivityPub::ContextsController::DESCENDANTS_LIMIT.times do
+            Fabricate(:status, conversation: conversation)
+          end
+        end
+
+        it 'includes a next page link' do
+          subject
+
+          expect(response.parsed_body['first']['next']).to_not be_nil
+        end
+      end
+    end
+  end
+
+  describe 'GET #items' do
+    subject { get items_context_path(conversation, page: 0, min_id: nil), headers: nil }
+
+    context 'with few statuses' do
+      before do
+        Fabricate.times(2, :status, conversation: conversation)
+      end
+
+      it 'returns http success and correct media type and correct items' do
+        subject
+
+        expect(response)
+          .to have_http_status(200)
+
+        expect(response.media_type)
+          .to eq 'application/activity+json'
+
+        expect(response.parsed_body[:type])
+          .to eq 'Collection'
+
+        expect(response.parsed_body[:first][:items])
+          .to be_an(Array)
+          .and have_attributes(size: 3)
+
+        expect(response.parsed_body[:first][:next]).to be_nil
+      end
+    end
+
+    context 'with many statuses' do
+      before do
+        stub_const 'ActivityPub::ContextsController::DESCENDANTS_LIMIT', 2
+        Fabricate.times(ActivityPub::ContextsController::DESCENDANTS_LIMIT, :status, conversation: conversation)
+      end
+
+      it 'includes a next page link' do
+        subject
+
+        expect(response.parsed_body['first']['next']).to_not be_nil
+      end
+    end
+
+    context 'with page requested' do
+      before do
+        stub_const 'ActivityPub::ContextsController::DESCENDANTS_LIMIT', 2
+        Fabricate.times(ActivityPub::ContextsController::DESCENDANTS_LIMIT, :status, conversation: conversation)
+      end
+
+      it 'returns the correct items' do
+        get items_context_path(conversation, page: 0, min_id: nil), headers: nil
+        next_page = response.parsed_body['first']['next']
+        get next_page, headers: nil
+
+        expect(response.parsed_body['items'])
+          .to be_an(Array)
+          .and have_attributes(size: 1)
+      end
+    end
+  end
+end
diff --git a/spec/requests/activitypub/outboxes_spec.rb b/spec/requests/activitypub/outboxes_spec.rb
index 22b2f97c071..c109214635b 100644
--- a/spec/requests/activitypub/outboxes_spec.rb
+++ b/spec/requests/activitypub/outboxes_spec.rb
@@ -215,7 +215,7 @@ RSpec.describe 'ActivityPub Outboxes' do
 
   def targets_followers_collection?(item, account)
     item[:to].include?(
-      account_followers_url(account, ActionMailer::Base.default_url_options)
+      ActivityPub::TagManager.instance.followers_uri_for(account)
     )
   end
 end
diff --git a/spec/requests/activitypub/quote_authorizations_spec.rb b/spec/requests/activitypub/quote_authorizations_spec.rb
new file mode 100644
index 00000000000..98daa3a79b7
--- /dev/null
+++ b/spec/requests/activitypub/quote_authorizations_spec.rb
@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'ActivityPub QuoteAuthorization endpoint' do
+  let(:account) { Fabricate(:account, domain: nil) }
+  let(:status) { Fabricate :status, account: account }
+  let(:quote) { Fabricate(:quote, quoted_status: status, state: :accepted) }
+
+  before { Fabricate :favourite, status: status }
+
+  describe 'GET /accounts/:account_username/quote_authorizations/:quote_id' do
+    context 'with an accepted quote' do
+      it 'returns http success and activity json' do
+        get account_quote_authorization_url(quote.quoted_account, quote)
+
+        expect(response)
+          .to have_http_status(200)
+        expect(response.media_type)
+          .to eq 'application/activity+json'
+
+        expect(response.parsed_body)
+          .to include(type: 'QuoteAuthorization')
+      end
+    end
+
+    context 'with an incorrect quote authorization URL' do
+      it 'returns http not found' do
+        get account_quote_authorization_url(quote.account, quote)
+
+        expect(response)
+          .to have_http_status(404)
+      end
+    end
+
+    context 'with a rejected quote' do
+      before do
+        quote.reject!
+      end
+
+      it 'returns http not found' do
+        get account_quote_authorization_url(quote.quoted_account, quote)
+
+        expect(response)
+          .to have_http_status(404)
+      end
+    end
+  end
+end
diff --git a/spec/requests/activitypub/replies_spec.rb b/spec/requests/activitypub/replies_spec.rb
index 313cab2a448..4cd02b187d9 100644
--- a/spec/requests/activitypub/replies_spec.rb
+++ b/spec/requests/activitypub/replies_spec.rb
@@ -220,6 +220,12 @@ RSpec.describe 'ActivityPub Replies' do
       it_behaves_like 'allowed access'
     end
 
+    context 'with no signature and requesting the numeric AP path' do
+      subject { get ap_account_status_replies_path(account_id: status.account_id, status_id: status.id, only_other_accounts: only_other_accounts) }
+
+      it_behaves_like 'allowed access'
+    end
+
     context 'with signature' do
       subject { get account_status_replies_path(account_username: status.account.username, status_id: status.id, only_other_accounts: only_other_accounts), headers: nil, sign_with: remote_querier }
 
diff --git a/spec/requests/admin/export_domain_allows_spec.rb b/spec/requests/admin/export_domain_allows_spec.rb
index 761c39984ec..dd1a55a0224 100644
--- a/spec/requests/admin/export_domain_allows_spec.rb
+++ b/spec/requests/admin/export_domain_allows_spec.rb
@@ -3,9 +3,9 @@
 require 'rails_helper'
 
 RSpec.describe 'Admin Export Domain Allows' do
-  describe 'POST /admin/export_domain_allows/import' do
-    before { sign_in Fabricate(:admin_user) }
+  before { sign_in Fabricate(:admin_user) }
 
+  describe 'POST /admin/export_domain_allows/import' do
     it 'gracefully handles invalid nested params' do
       post import_admin_export_domain_allows_path(admin_import: 'invalid')
 
@@ -13,4 +13,28 @@ RSpec.describe 'Admin Export Domain Allows' do
         .to redirect_to(admin_instances_path)
     end
   end
+
+  describe 'GET /admin/export_domain_allows/export.csv' do
+    before do
+      Fabricate(:domain_allow, domain: 'good.domain')
+      Fabricate(:domain_allow, domain: 'better.domain')
+    end
+
+    it 'returns CSV response with instance domain values' do
+      get export_admin_export_domain_allows_path(format: :csv)
+
+      expect(response)
+        .to have_http_status(200)
+      expect(response.body)
+        .to eq(domain_allows_csv_file)
+      expect(response.media_type)
+        .to eq('text/csv')
+    end
+  end
+
+  private
+
+  def domain_allows_csv_file
+    File.read(File.join(file_fixture_path, 'domain_allows.csv'))
+  end
 end
diff --git a/spec/requests/admin/username_blocks_spec.rb b/spec/requests/admin/username_blocks_spec.rb
new file mode 100644
index 00000000000..6e17ca2d470
--- /dev/null
+++ b/spec/requests/admin/username_blocks_spec.rb
@@ -0,0 +1,97 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Admin Username Blocks' do
+  describe 'GET /admin/username_blocks' do
+    before { sign_in Fabricate(:admin_user) }
+
+    it 'returns http success' do
+      get admin_username_blocks_path
+
+      expect(response)
+        .to have_http_status(200)
+    end
+  end
+
+  describe 'POST /admin/username_blocks' do
+    before { sign_in Fabricate(:admin_user) }
+
+    it 'gracefully handles invalid nested params' do
+      post admin_username_blocks_path(username_block: 'invalid')
+
+      expect(response)
+        .to have_http_status(400)
+    end
+
+    it 'creates a username block' do
+      post admin_username_blocks_path(username_block: { username: 'banana', comparison: 'contains', allow_with_approval: '0' })
+
+      expect(response)
+        .to redirect_to(admin_username_blocks_path)
+      expect(UsernameBlock.find_by(username: 'banana'))
+        .to_not be_nil
+    end
+  end
+
+  describe 'POST /admin/username_blocks/batch' do
+    before { sign_in Fabricate(:admin_user) }
+
+    let(:username_blocks) { Fabricate.times(2, :username_block) }
+
+    it 'gracefully handles invalid nested params' do
+      post batch_admin_username_blocks_path(form_username_block_batch: 'invalid')
+
+      expect(response)
+        .to redirect_to(admin_username_blocks_path)
+    end
+
+    it 'deletes selected username blocks' do
+      post batch_admin_username_blocks_path(form_username_block_batch: { username_block_ids: username_blocks.map(&:id) }, delete: '1')
+
+      expect(response)
+        .to redirect_to(admin_username_blocks_path)
+      expect(UsernameBlock.where(id: username_blocks.map(&:id)))
+        .to be_empty
+    end
+  end
+
+  describe 'GET /admin/username_blocks/new' do
+    before { sign_in Fabricate(:admin_user) }
+
+    it 'returns http success' do
+      get new_admin_username_block_path
+
+      expect(response)
+        .to have_http_status(200)
+    end
+  end
+
+  describe 'GET /admin/username_blocks/:id/edit' do
+    before { sign_in Fabricate(:admin_user) }
+
+    let(:username_block) { Fabricate(:username_block) }
+
+    it 'returns http success' do
+      get edit_admin_username_block_path(username_block)
+
+      expect(response)
+        .to have_http_status(200)
+    end
+  end
+
+  describe 'PUT /admin/username_blocks/:id' do
+    before { sign_in Fabricate(:admin_user) }
+
+    let(:username_block) { Fabricate(:username_block, username: 'banana') }
+
+    it 'updates username block' do
+      put admin_username_block_path(username_block, username_block: { username: 'bebebe' })
+
+      expect(response)
+        .to redirect_to(admin_username_blocks_path)
+      expect(username_block.reload.username)
+        .to eq 'bebebe'
+    end
+  end
+end
diff --git a/spec/requests/api/v1/accounts/credentials_spec.rb b/spec/requests/api/v1/accounts/credentials_spec.rb
index 68ea2594812..84bea97e800 100644
--- a/spec/requests/api/v1/accounts/credentials_spec.rb
+++ b/spec/requests/api/v1/accounts/credentials_spec.rb
@@ -101,20 +101,14 @@ RSpec.describe 'credentials API' do
         .to have_http_status(200)
       expect(response.content_type)
         .to start_with('application/json')
-
-      expect(response.parsed_body).to include({
-        source: hash_including({
-          discoverable: true,
-          indexable: true,
-        }),
-        locked: false,
-      })
-
-      expect(ActivityPub::UpdateDistributionWorker)
-        .to have_enqueued_sidekiq_job(user.account_id)
-    end
-
-    def expect_account_updates
+      expect(response.parsed_body)
+        .to include({
+          source: hash_including({
+            discoverable: true,
+            indexable: true,
+          }),
+          locked: false,
+        })
       expect(user.account.reload)
         .to have_attributes(
           display_name: eq("Alice Isn't Dead"),
@@ -123,14 +117,13 @@ RSpec.describe 'credentials API' do
           header: exist,
           attribution_domains: ['example.com']
         )
-    end
-
-    def expect_user_updates
       expect(user.reload)
         .to have_attributes(
           setting_default_privacy: eq('unlisted'),
           setting_default_sensitive: be(true)
         )
+      expect(ActivityPub::UpdateDistributionWorker)
+        .to have_enqueued_sidekiq_job(user.account_id)
     end
   end
 end
diff --git a/spec/requests/api/v1/accounts_spec.rb b/spec/requests/api/v1/accounts_spec.rb
index a040174d385..0e64915baf3 100644
--- a/spec/requests/api/v1/accounts_spec.rb
+++ b/spec/requests/api/v1/accounts_spec.rb
@@ -110,9 +110,12 @@ RSpec.describe '/api/v1/accounts' do
         let(:date_of_birth) { 13.years.ago.strftime('%d.%m.%Y') }
 
         it 'returns http unprocessable entity' do
-          subject
+          expect { subject }
+            .to not_change(User, :count)
+            .and not_change(Account, :count)
 
-          expect(response).to have_http_status(422)
+          expect(response)
+            .to have_http_status(422)
           expect(response.content_type)
             .to start_with('application/json')
         end
@@ -122,9 +125,27 @@ RSpec.describe '/api/v1/accounts' do
         let(:date_of_birth) { 17.years.ago.strftime('%d.%m.%Y') }
 
         it 'creates a user', :aggregate_failures do
-          subject
+          expect { subject }
+            .to change(User, :count).by(1)
+            .and change(Account, :count).by(1)
 
-          expect(response).to have_http_status(200)
+          expect(response)
+            .to have_http_status(200)
+          expect(response.content_type)
+            .to start_with('application/json')
+        end
+      end
+
+      context 'when date of birth is over age limit in ISO-8601 format' do
+        let(:date_of_birth) { 17.years.ago.to_date.iso8601 }
+
+        it 'creates a user', :aggregate_failures do
+          expect { subject }
+            .to change(User, :count).by(1)
+            .and change(Account, :count).by(1)
+
+          expect(response)
+            .to have_http_status(200)
           expect(response.content_type)
             .to start_with('application/json')
         end
diff --git a/spec/requests/api/v1/push/subscriptions_spec.rb b/spec/requests/api/v1/push/subscriptions_spec.rb
index 359de9d95c0..bccbda6fa23 100644
--- a/spec/requests/api/v1/push/subscriptions_spec.rb
+++ b/spec/requests/api/v1/push/subscriptions_spec.rb
@@ -166,17 +166,30 @@ RSpec.describe 'API V1 Push Subscriptions' do
   describe 'GET /api/v1/push/subscription' do
     subject { get '/api/v1/push/subscription', headers: headers }
 
-    before { create_subscription_with_token }
+    context 'with a subscription' do
+      before { create_subscription_with_token }
 
-    it 'shows subscription details' do
-      subject
+      it 'shows subscription details' do
+        subject
 
-      expect(response)
-        .to have_http_status(200)
-      expect(response.content_type)
-        .to start_with('application/json')
-      expect(response.parsed_body)
-        .to include(endpoint: endpoint)
+        expect(response)
+          .to have_http_status(200)
+        expect(response.content_type)
+          .to start_with('application/json')
+        expect(response.parsed_body)
+          .to include(endpoint: endpoint)
+      end
+    end
+
+    context 'without a subscription' do
+      it 'returns not found' do
+        subject
+
+        expect(response)
+          .to have_http_status(404)
+        expect(response.content_type)
+          .to start_with('application/json')
+      end
     end
   end
 
diff --git a/spec/requests/api/v1/statuses/interaction_policies_spec.rb b/spec/requests/api/v1/statuses/interaction_policies_spec.rb
new file mode 100644
index 00000000000..321a68cd251
--- /dev/null
+++ b/spec/requests/api/v1/statuses/interaction_policies_spec.rb
@@ -0,0 +1,120 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Interaction policies' do
+  let(:user)    { Fabricate(:user) }
+  let(:scopes)  { 'write:statuses' }
+  let(:token)   { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
+  let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
+  let(:status) { Fabricate(:status, account: user.account) }
+  let(:params) { { quote_approval_policy: 'followers' } }
+
+  describe 'PUT /api/v1/statuses/:status_id/interaction_policy' do
+    subject do
+      put "/api/v1/statuses/#{status.id}/interaction_policy", headers: headers, params: params
+    end
+
+    it_behaves_like 'forbidden for wrong scope', 'read read:statuses'
+
+    context 'without an authorization header' do
+      let(:headers) { {} }
+
+      it 'returns http unauthorized' do
+        expect { subject }
+          .to_not(change { status.reload.quote_approval_policy })
+
+        expect(response).to have_http_status(401)
+        expect(response.content_type)
+          .to start_with('application/json')
+      end
+    end
+
+    context 'with a status from a different user' do
+      let(:status) { Fabricate(:status) }
+
+      it 'returns http unauthorized' do
+        expect { subject }
+          .to_not(change { status.reload.quote_approval_policy })
+
+        expect(response).to have_http_status(403)
+        expect(response.content_type)
+          .to start_with('application/json')
+      end
+    end
+
+    context 'when changing the interaction policy' do
+      it 'changes the interaction policy, returns the updated status, and schedules distribution jobs' do
+        expect { subject }
+          .to change { status.reload.quote_approval_policy }.to(Status::QUOTE_APPROVAL_POLICY_FLAGS[:followers] << 16)
+
+        expect(response).to have_http_status(200)
+        expect(response.content_type)
+          .to start_with('application/json')
+        expect(response.parsed_body).to include(
+          'quote_approval' => match(
+            'automatic' => ['followers'],
+            'manual' => [],
+            'current_user' => 'automatic'
+          )
+        )
+
+        expect(DistributionWorker)
+          .to have_enqueued_sidekiq_job(status.id, { 'update' => true, 'skip_notifications' => true })
+        expect(ActivityPub::StatusUpdateDistributionWorker)
+          .to have_enqueued_sidekiq_job(status.id, { 'updated_at' => anything })
+      end
+    end
+
+    context 'when not changing the interaction policy' do
+      let(:params) { { quote_approval_policy: 'nobody' } }
+
+      it 'keeps the interaction policy, returns the status, and does not schedule distribution jobs' do
+        expect { subject }
+          .to_not(change { status.reload.quote_approval_policy }.from(0))
+
+        expect(response).to have_http_status(200)
+        expect(response.content_type)
+          .to start_with('application/json')
+        expect(response.parsed_body).to include(
+          'quote_approval' => match(
+            'automatic' => [],
+            'manual' => [],
+            'current_user' => 'automatic'
+          )
+        )
+
+        expect(DistributionWorker)
+          .to_not have_enqueued_sidekiq_job
+        expect(ActivityPub::StatusUpdateDistributionWorker)
+          .to_not have_enqueued_sidekiq_job
+      end
+    end
+
+    context 'when trying to change the interaction policy of a private post' do
+      let(:status) { Fabricate(:status, account: user.account, visibility: :private) }
+      let(:params) { { quote_approval_policy: 'public' } }
+
+      it 'keeps the interaction policy, returns the status, and does not schedule distribution jobs' do
+        expect { subject }
+          .to_not(change { status.reload.quote_approval_policy }.from(0))
+
+        expect(response).to have_http_status(200)
+        expect(response.content_type)
+          .to start_with('application/json')
+        expect(response.parsed_body).to include(
+          'quote_approval' => match(
+            'automatic' => [],
+            'manual' => [],
+            'current_user' => 'automatic'
+          )
+        )
+
+        expect(DistributionWorker)
+          .to_not have_enqueued_sidekiq_job
+        expect(ActivityPub::StatusUpdateDistributionWorker)
+          .to_not have_enqueued_sidekiq_job
+      end
+    end
+  end
+end
diff --git a/spec/requests/api/v1/statuses/quotes_spec.rb b/spec/requests/api/v1/statuses/quotes_spec.rb
new file mode 100644
index 00000000000..01e9e17b077
--- /dev/null
+++ b/spec/requests/api/v1/statuses/quotes_spec.rb
@@ -0,0 +1,149 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'API V1 Statuses Quotes' do
+  let(:user) { Fabricate(:user) }
+  let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
+
+  describe 'GET /api/v1/statuses/:status_id/quotes' do
+    subject do
+      get "/api/v1/statuses/#{status.id}/quotes", headers: headers, params: { limit: 2 }
+    end
+
+    let(:scopes) { 'read:statuses' }
+
+    let(:status) { Fabricate(:status, account: user.account) }
+    let!(:accepted_quote) { Fabricate(:quote, quoted_status: status, state: :accepted) }
+    let!(:rejected_quote) { Fabricate(:quote, quoted_status: status, state: :rejected) }
+    let!(:pending_quote) { Fabricate(:quote, quoted_status: status, state: :pending) }
+    let!(:accepted_private_quote) { Fabricate(:quote, status: Fabricate(:status, visibility: :private), quoted_status: status, state: :accepted) }
+
+    context 'with an OAuth token' do
+      let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
+
+      it_behaves_like 'forbidden for wrong scope', 'write write:statuses'
+
+      it 'returns http success and statuses quoting this post' do
+        subject
+
+        expect(response)
+          .to have_http_status(200)
+          .and include_pagination_headers(
+            prev: api_v1_status_quotes_url(limit: 2, since_id: accepted_private_quote.id),
+            next: api_v1_status_quotes_url(limit: 2, max_id: accepted_quote.id)
+          )
+        expect(response.content_type)
+          .to start_with('application/json')
+
+        expect(response.parsed_body)
+          .to contain_exactly(
+            include(id: accepted_quote.status.id.to_s),
+            include(id: accepted_private_quote.status.id.to_s)
+          )
+
+        expect(response.parsed_body)
+          .to_not include(
+            include(id: rejected_quote.status.id.to_s),
+            include(id: pending_quote.status.id.to_s)
+          )
+      end
+
+      context 'with a different user than the post owner' do
+        let(:status) { Fabricate(:status) }
+
+        it 'returns http success and statuses but not private ones' do
+          subject
+
+          expect(response)
+            .to have_http_status(200)
+            .and include_pagination_headers(
+              prev: api_v1_status_quotes_url(limit: 2, since_id: accepted_private_quote.id),
+              next: api_v1_status_quotes_url(limit: 2, max_id: accepted_quote.id)
+            )
+          expect(response.content_type)
+            .to start_with('application/json')
+
+          expect(response.parsed_body)
+            .to contain_exactly(
+              include(id: accepted_quote.status.id.to_s)
+            )
+
+          expect(response.parsed_body)
+            .to_not include(
+              include(id: rejected_quote.status.id.to_s),
+              include(id: pending_quote.status.id.to_s),
+              include(id: accepted_private_quote.id.to_s)
+            )
+        end
+      end
+    end
+
+    context 'without an OAuth token' do
+      let(:headers) { {} }
+
+      it 'returns http unauthorized' do
+        subject
+
+        expect(response).to have_http_status(401)
+        expect(response.content_type)
+          .to start_with('application/json')
+      end
+    end
+  end
+
+  describe 'POST /api/v1/statuses/:status_id/quotes/:id/revoke' do
+    subject do
+      post "/api/v1/statuses/#{status.id}/quotes/#{quote.status.id}/revoke", headers: headers
+    end
+
+    let(:scopes) { 'write:statuses' }
+
+    let(:status) { Fabricate(:status, account: user.account) }
+    let!(:quote) { Fabricate(:quote, quoted_status: status, state: :accepted) }
+
+    context 'with an OAuth token' do
+      let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
+
+      it_behaves_like 'forbidden for wrong scope', 'read read:statuses'
+
+      context 'with a different user than the post owner' do
+        let(:status) { Fabricate(:status) }
+
+        it 'returns http forbidden' do
+          subject
+
+          expect(response).to have_http_status(403)
+          expect(response.content_type)
+            .to start_with('application/json')
+        end
+      end
+
+      it 'revokes the quote and returns HTTP success' do
+        expect { subject }
+          .to change { quote.reload.state }.from('accepted').to('revoked')
+
+        expect(response)
+          .to have_http_status(200)
+        expect(response.content_type)
+          .to start_with('application/json')
+        expect(response.parsed_body)
+          .to match(
+            a_hash_including(id: quote.status.id.to_s, quote: a_hash_including(state: 'revoked'))
+          )
+      end
+    end
+
+    context 'without an OAuth token' do
+      let(:headers) { {} }
+
+      it 'returns http unauthorized' do
+        subject
+
+        expect(response).to have_http_status(401)
+        expect(response.content_type)
+          .to start_with('application/json')
+      end
+    end
+  end
+end
diff --git a/spec/requests/api/v1/statuses_spec.rb b/spec/requests/api/v1/statuses_spec.rb
index 285fa936552..249abc24402 100644
--- a/spec/requests/api/v1/statuses_spec.rb
+++ b/spec/requests/api/v1/statuses_spec.rb
@@ -158,6 +158,119 @@ RSpec.describe '/api/v1/statuses' do
         end
       end
 
+      context 'without a quote policy' do
+        let(:user) do
+          Fabricate(:user, settings: { default_quote_policy: 'followers' })
+        end
+
+        it 'returns post with user default quote policy, as well as rate limit headers', :aggregate_failures do
+          subject
+          expect(user.setting_default_quote_policy).to eq 'followers'
+
+          expect(response).to have_http_status(200)
+          expect(response.content_type)
+            .to start_with('application/json')
+          expect(response.parsed_body[:quote_approval]).to include({
+            automatic: ['followers'],
+            manual: [],
+            current_user: 'automatic',
+          })
+          expect(response.headers['X-RateLimit-Limit']).to eq RateLimiter::FAMILIES[:statuses][:limit].to_s
+          expect(response.headers['X-RateLimit-Remaining']).to eq (RateLimiter::FAMILIES[:statuses][:limit] - 1).to_s
+        end
+      end
+
+      context 'without a quote policy and the user defaults to nobody' do
+        let(:user) do
+          Fabricate(:user, settings: { default_quote_policy: 'nobody' })
+        end
+
+        it 'returns post with user default quote policy, as well as rate limit headers', :aggregate_failures do
+          subject
+          expect(user.setting_default_quote_policy).to eq 'nobody'
+
+          expect(response).to have_http_status(200)
+          expect(response.content_type)
+            .to start_with('application/json')
+          expect(response.parsed_body[:quote_approval]).to include({
+            automatic: [],
+            manual: [],
+            current_user: 'automatic',
+          })
+          expect(response.headers['X-RateLimit-Limit']).to eq RateLimiter::FAMILIES[:statuses][:limit].to_s
+          expect(response.headers['X-RateLimit-Remaining']).to eq (RateLimiter::FAMILIES[:statuses][:limit] - 1).to_s
+        end
+      end
+
+      context 'with a quote policy' do
+        let(:quoted_status) { Fabricate(:status, account: user.account) }
+        let(:params) do
+          {
+            status: 'Hello world, this is a self-quote',
+            quote_approval_policy: 'followers',
+          }
+        end
+
+        it 'returns post with appropriate quote policy, as well as rate limit headers', :aggregate_failures do
+          subject
+
+          expect(response).to have_http_status(200)
+          expect(response.content_type)
+            .to start_with('application/json')
+          expect(response.parsed_body[:quote_approval]).to include({
+            automatic: ['followers'],
+            manual: [],
+            current_user: 'automatic',
+          })
+          expect(response.headers['X-RateLimit-Limit']).to eq RateLimiter::FAMILIES[:statuses][:limit].to_s
+          expect(response.headers['X-RateLimit-Remaining']).to eq (RateLimiter::FAMILIES[:statuses][:limit] - 1).to_s
+        end
+      end
+
+      context 'with a self-quote post' do
+        let(:quoted_status) { Fabricate(:status, account: user.account) }
+        let(:params) do
+          {
+            status: 'Hello world, this is a self-quote',
+            quoted_status_id: quoted_status.id,
+          }
+        end
+
+        it 'returns a quote post, as well as rate limit headers', :aggregate_failures do
+          subject
+
+          expect(response).to have_http_status(200)
+          expect(response.content_type)
+            .to start_with('application/json')
+          expect(response.parsed_body[:quote]).to be_present
+          expect(response.headers['X-RateLimit-Limit']).to eq RateLimiter::FAMILIES[:statuses][:limit].to_s
+          expect(response.headers['X-RateLimit-Remaining']).to eq (RateLimiter::FAMILIES[:statuses][:limit] - 1).to_s
+        end
+      end
+
+      context 'with a self-quote post and a CW but no text' do
+        let(:quoted_status) { Fabricate(:status, account: user.account) }
+        let(:params) do
+          {
+            spoiler_text: 'this is a CW',
+            quoted_status_id: quoted_status.id,
+          }
+        end
+
+        it 'returns a quote post, as well as rate limit headers', :aggregate_failures do
+          subject
+
+          expect(response).to have_http_status(200)
+          expect(response.content_type)
+            .to start_with('application/json')
+          expect(response.parsed_body[:quote]).to be_present
+          expect(response.parsed_body[:spoiler_text]).to eq 'this is a CW'
+          expect(response.parsed_body[:content]).to eq ''
+          expect(response.headers['X-RateLimit-Limit']).to eq RateLimiter::FAMILIES[:statuses][:limit].to_s
+          expect(response.headers['X-RateLimit-Remaining']).to eq (RateLimiter::FAMILIES[:statuses][:limit] - 1).to_s
+        end
+      end
+
       context 'with a safeguard' do
         let!(:alice) { Fabricate(:account, username: 'alice') }
         let!(:bob)   { Fabricate(:account, username: 'bob') }
@@ -286,9 +399,10 @@ RSpec.describe '/api/v1/statuses' do
 
     describe 'PUT /api/v1/statuses/:id' do
       subject do
-        put "/api/v1/statuses/#{status.id}", headers: headers, params: { status: 'I am updated' }
+        put "/api/v1/statuses/#{status.id}", headers: headers, params: params
       end
 
+      let(:params) { { status: 'I am updated' } }
       let(:scopes) { 'write:statuses' }
       let(:status) { Fabricate(:status, account: user.account) }
 
@@ -302,6 +416,19 @@ RSpec.describe '/api/v1/statuses' do
           .to start_with('application/json')
         expect(status.reload.text).to eq 'I am updated'
       end
+
+      context 'when updating only the quote policy' do
+        let(:params) { { status: status.text, quote_approval_policy: 'public' } }
+
+        it 'updates the status', :aggregate_failures do
+          expect { subject }
+            .to change { status.reload.quote_approval_policy }.to(Status::QUOTE_APPROVAL_POLICY_FLAGS[:public] << 16)
+
+          expect(response).to have_http_status(200)
+          expect(response.content_type)
+            .to start_with('application/json')
+        end
+      end
     end
   end
 
diff --git a/spec/requests/api/v1/timelines/link_spec.rb b/spec/requests/api/v1/timelines/link_spec.rb
index 37a3b36872f..fa911345d69 100644
--- a/spec/requests/api/v1/timelines/link_spec.rb
+++ b/spec/requests/api/v1/timelines/link_spec.rb
@@ -87,7 +87,7 @@ RSpec.describe 'Link' do
 
     context 'when the instance does not allow public preview' do
       before do
-        Form::AdminSettings.new(timeline_preview: false).save
+        Form::AdminSettings.new(local_topic_feed_access: 'authenticated', remote_topic_feed_access: 'authenticated').save
       end
 
       it_behaves_like 'forbidden for wrong scope', 'profile'
diff --git a/spec/requests/api/v1/timelines/public_spec.rb b/spec/requests/api/v1/timelines/public_spec.rb
index 1e459bf3ec1..5ae9f76c4f8 100644
--- a/spec/requests/api/v1/timelines/public_spec.rb
+++ b/spec/requests/api/v1/timelines/public_spec.rb
@@ -98,7 +98,7 @@ RSpec.describe 'Public' do
 
     context 'when the instance does not allow public preview' do
       before do
-        Form::AdminSettings.new(timeline_preview: false).save
+        Form::AdminSettings.new(local_live_feed_access: 'authenticated', remote_live_feed_access: 'authenticated').save
       end
 
       it_behaves_like 'forbidden for wrong scope', 'profile'
diff --git a/spec/requests/api/v1/timelines/tag_spec.rb b/spec/requests/api/v1/timelines/tag_spec.rb
index 75348fe1b4e..5a723b11e42 100644
--- a/spec/requests/api/v1/timelines/tag_spec.rb
+++ b/spec/requests/api/v1/timelines/tag_spec.rb
@@ -99,7 +99,7 @@ RSpec.describe 'Tag' do
 
     context 'when the instance does not allow public preview' do
       before do
-        Form::AdminSettings.new(timeline_preview: false).save
+        Form::AdminSettings.new(local_topic_feed_access: 'authenticated', remote_topic_feed_access: 'authenticated').save
       end
 
       it_behaves_like 'forbidden for wrong scope', 'profile'
diff --git a/spec/requests/api/v2/search_spec.rb b/spec/requests/api/v2/search_spec.rb
index 9c9f37e0988..6beab4c8c7d 100644
--- a/spec/requests/api/v2/search_spec.rb
+++ b/spec/requests/api/v2/search_spec.rb
@@ -98,7 +98,7 @@ RSpec.describe 'Search API' do
       context 'when search raises syntax error' do
         before { allow(Search).to receive(:new).and_raise(Mastodon::SyntaxError) }
 
-        it 'returns http unprocessable_entity' do
+        it 'returns http unprocessable_content' do
           get '/api/v2/search', headers: headers, params: params
 
           expect(response).to have_http_status(422)
diff --git a/spec/requests/api/web/push_subscriptions_spec.rb b/spec/requests/api/web/push_subscriptions_spec.rb
index 42545b3d6e2..21830d1b1c1 100644
--- a/spec/requests/api/web/push_subscriptions_spec.rb
+++ b/spec/requests/api/web/push_subscriptions_spec.rb
@@ -3,6 +3,39 @@
 require 'rails_helper'
 
 RSpec.describe 'API Web Push Subscriptions' do
+  let(:create_payload) do
+    {
+      subscription: {
+        endpoint: 'https://fcm.googleapis.com/fcm/send/fiuH06a27qE:APA91bHnSiGcLwdaxdyqVXNDR9w1NlztsHb6lyt5WDKOC_Z_Q8BlFxQoR8tWFSXUIDdkyw0EdvxTu63iqamSaqVSevW5LfoFwojws8XYDXv_NRRLH6vo2CdgiN4jgHv5VLt2A8ah6lUX',
+        keys: {
+          p256dh: 'BEm_a0bdPDhf0SOsrnB2-ategf1hHoCnpXgQsFj5JCkcoMrMt2WHoPfEYOYPzOIs9mZE8ZUaD7VA5vouy0kEkr8=',
+          auth: 'eH_C8rq2raXqlcBVDa1gLg==',
+        },
+        standard: standard,
+      },
+    }
+  end
+
+  let(:alerts_payload) do
+    {
+      data: {
+        policy: 'all',
+
+        alerts: {
+          follow: true,
+          follow_request: false,
+          favourite: false,
+          reblog: true,
+          mention: false,
+          poll: true,
+          status: false,
+          quote: true,
+        },
+      },
+    }
+  end
+  let(:standard) { '1' }
+
   describe 'DELETE /api/web/push_subscriptions/:id' do
     subject { delete api_web_push_subscription_path(token) }
 
@@ -54,7 +87,9 @@ RSpec.describe 'API Web Push Subscriptions' do
   end
 
   describe 'POST /api/web/push_subscriptions' do
-    before { sign_in Fabricate :user }
+    before { sign_in(user) }
+
+    let(:user) { Fabricate :user }
 
     it 'gracefully handles invalid nested params' do
       post api_web_push_subscriptions_path, params: { subscription: 'invalid' }
@@ -62,9 +97,72 @@ RSpec.describe 'API Web Push Subscriptions' do
       expect(response)
         .to have_http_status(400)
     end
+
+    it 'saves push subscriptions with valid params' do
+      post api_web_push_subscriptions_path, params: create_payload
+      expect(response)
+        .to have_http_status(200)
+
+      expect(created_push_subscription)
+        .to have_attributes(
+          endpoint: eq(create_payload[:subscription][:endpoint]),
+          key_p256dh: eq(create_payload[:subscription][:keys][:p256dh]),
+          key_auth: eq(create_payload[:subscription][:keys][:auth])
+        )
+        .and be_standard
+      expect(user.session_activations.first.web_push_subscription)
+        .to eq(created_push_subscription)
+    end
+
+    context 'when standard is provided as false value' do
+      let(:standard) { '0' }
+
+      it 'saves push subscription with standard as false' do
+        post api_web_push_subscriptions_path, params: create_payload
+
+        expect(created_push_subscription)
+          .to_not be_standard
+      end
+    end
+
+    context 'with a user who has a session with a prior subscription' do
+      before do
+        # Trigger creation of a `SessionActivation` for the user so that the
+        # prior_subscription setup and verification works as expected
+        get about_path
+      end
+
+      let!(:prior_subscription) { Fabricate(:web_push_subscription, user:, session_activation: user.session_activations.last) }
+
+      it 'destroys prior subscription when creating new one' do
+        post api_web_push_subscriptions_path, params: create_payload
+
+        expect(response)
+          .to have_http_status(200)
+        expect { prior_subscription.reload }
+          .to raise_error(ActiveRecord::RecordNotFound)
+      end
+    end
+
+    context 'with initial data' do
+      it 'saves alert settings' do
+        post api_web_push_subscriptions_path, params: create_payload.merge(alerts_payload)
+
+        expect(response)
+          .to have_http_status(200)
+
+        expect(created_push_subscription.data['policy'])
+          .to eq 'all'
+
+        alert_types.each do |type|
+          expect(created_push_subscription.data['alerts'][type])
+            .to eq(alerts_payload[:data][:alerts][type.to_sym].to_s)
+        end
+      end
+    end
   end
 
-  describe 'PUT /api/web/push_subscriptions' do
+  describe 'PUT /api/web/push_subscriptions/:id' do
     before { sign_in Fabricate :user }
 
     let(:subscription) { Fabricate :web_push_subscription }
@@ -75,5 +173,30 @@ RSpec.describe 'API Web Push Subscriptions' do
       expect(response)
         .to have_http_status(400)
     end
+
+    it 'changes existing alert settings' do
+      # Create record this way to correctly associate a `SessionActivation`
+      # during full POST->create cycle
+      post api_web_push_subscriptions_path params: create_payload
+      expect(response)
+        .to have_http_status(200)
+
+      put api_web_push_subscription_path(created_push_subscription), params: alerts_payload
+      expect(created_push_subscription.data['policy'])
+        .to eq 'all'
+      alert_types.each do |type|
+        expect(created_push_subscription.data['alerts'][type])
+          .to eq(alerts_payload[:data][:alerts][type.to_sym].to_s)
+      end
+    end
+  end
+
+  def created_push_subscription
+    Web::PushSubscription
+      .find_by(endpoint: create_payload[:subscription][:endpoint])
+  end
+
+  def alert_types
+    Notification::LEGACY_TYPE_CLASS_MAP.values.map(&:to_s)
   end
 end
diff --git a/spec/requests/invite_spec.rb b/spec/requests/invite_spec.rb
index ba046453890..027b0fc738d 100644
--- a/spec/requests/invite_spec.rb
+++ b/spec/requests/invite_spec.rb
@@ -6,13 +6,49 @@ RSpec.describe 'invites' do
   let(:invite) { Fabricate(:invite) }
 
   context 'when requesting a JSON document' do
-    it 'returns a JSON document with expected attributes' do
-      get "/invite/#{invite.code}", headers: { 'Accept' => 'application/activity+json' }
+    subject { get "/invite/#{invite.code}", headers: { 'Accept' => 'application/activity+json' } }
 
-      expect(response).to have_http_status(200)
-      expect(response.media_type).to eq 'application/json'
+    context 'when invite is valid' do
+      it 'returns a JSON document with expected attributes' do
+        subject
 
-      expect(response.parsed_body[:invite_code]).to eq invite.code
+        expect(response)
+          .to have_http_status(200)
+        expect(response.media_type)
+          .to eq 'application/json'
+        expect(response.parsed_body)
+          .to include(invite_code: invite.code)
+      end
+    end
+
+    context 'when invite is expired' do
+      before { invite.update(expires_at: 3.days.ago) }
+
+      it 'returns a JSON document with error details' do
+        subject
+
+        expect(response)
+          .to have_http_status(401)
+        expect(response.media_type)
+          .to eq 'application/json'
+        expect(response.parsed_body)
+          .to include(error: I18n.t('invites.invalid'))
+      end
+    end
+
+    context 'when user IP is blocked' do
+      before { Fabricate :ip_block, severity: :sign_up_block, ip: '127.0.0.1' }
+
+      it 'returns a JSON document with error details' do
+        subject
+
+        expect(response)
+          .to have_http_status(403)
+        expect(response.media_type)
+          .to eq 'application/json'
+        expect(response.parsed_body)
+          .to include(error: /This action is not allowed/)
+      end
     end
   end
 
diff --git a/spec/requests/link_headers_spec.rb b/spec/requests/link_headers_spec.rb
index 5010f7f221f..c782744f016 100644
--- a/spec/requests/link_headers_spec.rb
+++ b/spec/requests/link_headers_spec.rb
@@ -11,7 +11,7 @@ RSpec.describe 'Link headers' do
 
       expect(response)
         .to have_http_link_header(webfinger_url(resource: account.to_webfinger_s)).for(rel: 'lrdd', type: 'application/jrd+json')
-        .and have_http_link_header(account_url(account)).for(rel: 'alternate', type: 'application/activity+json')
+        .and have_http_link_header(ActivityPub::TagManager.instance.uri_for(account)).for(rel: 'alternate', type: 'application/activity+json')
     end
   end
 end
diff --git a/spec/requests/oauth/userinfo_spec.rb b/spec/requests/oauth/userinfo_spec.rb
index 0aa5a211200..280a3a35418 100644
--- a/spec/requests/oauth/userinfo_spec.rb
+++ b/spec/requests/oauth/userinfo_spec.rb
@@ -19,7 +19,7 @@ RSpec.describe 'OAuth Userinfo Endpoint' do
       expect(response.content_type).to start_with('application/json')
       expect(response.parsed_body).to include({
         iss: root_url,
-        sub: account_url(account),
+        sub: ActivityPub::TagManager.instance.uri_for(account),
         name: account.display_name,
         preferred_username: account.username,
         profile: short_account_url(account),
diff --git a/spec/requests/signature_verification_spec.rb b/spec/requests/signature_verification_spec.rb
index edcc2b673df..eccb2babc98 100644
--- a/spec/requests/signature_verification_spec.rb
+++ b/spec/requests/signature_verification_spec.rb
@@ -621,6 +621,30 @@ RSpec.describe 'signature verification concern' do
           )
         end
       end
+
+      context 'with a malformed `Content-Digest` header' do
+        let(:digest_header) { 'SHA-256=:ZOyIygCyaOW6GjVnihtTFtIS9PNmskdyMlNKiuyjfzw=:' }
+        let(:signature_input) do
+          'sig1=("@method" "@target-uri" "content-digest");created=1703066400;keyid="https://remote.domain/users/bob#main-key"'
+        end
+        let(:signature_header) do
+          'sig1=:aXua24cIlBi8akNXg/Vc5pU8fNGXo0f4U2qQk42iWoIaCcH3G+z2edPMQTNM/aZmD0bULqvb/yi6ZXgRls1ereq3OqnvA4JBLKx15O/jLayS/FhR4d/2vaeXuBOYXM7EGXItKkFxEXn3J+FCQPb5wY31GlbljrESjsiZ6gtrSmwryBluQCwMJ59LACzocxbWo42Kv3cpSig2aCu9CYXKC4sCH3eSKjwPtjdlpmX1VkYX5ge+JaZMn7A218ZgZOc9xpPawESOuIF9axcKW5PDEhOwmswFd2G65c8H9kJY6zEnqbArP9lRQMmjuAb011NILClaaRZOOupz2HZUdm+91Q==:' # rubocop:disable Layout/LineLength
+        end
+
+        it 'returns `400` (Bad Request)', :aggregate_failures do
+          post '/activitypub/signature_required', params: 'Hello world', headers: {
+            'Host' => 'www.example.com',
+            'Content-Digest' => digest_header,
+            'Signature-Input' => signature_input,
+            'Signature' => signature_header,
+          }
+
+          expect(response).to have_http_status(400)
+          expect(response.parsed_body).to match(
+            error: 'Content-Digest could not be parsed. It does not contain a valid RFC8941 dictionary.'
+          )
+        end
+      end
     end
 
     context 'with an inaccessible key' do
diff --git a/spec/requests/statuses_spec.rb b/spec/requests/statuses_spec.rb
index a5e4482dfa6..d12f4f28cf3 100644
--- a/spec/requests/statuses_spec.rb
+++ b/spec/requests/statuses_spec.rb
@@ -360,6 +360,30 @@ RSpec.describe 'Statuses' do
               .to include(content: include(status.text))
           end
         end
+
+        context 'with JSON and querying the new paths' do
+          subject do
+            get ap_account_status_path(account_id: status.account_id, id: status.id),
+                headers: { 'Accept' => 'application/activity+json' },
+                sign_with: remote_account
+          end
+
+          let(:format) { 'json' }
+
+          it 'renders ActivityPub Note object successfully', :aggregate_failures do
+            subject
+
+            expect(response)
+              .to have_http_status(200)
+              .and have_cacheable_headers.with_vary('Accept, Accept-Language, Cookie')
+            expect(response.headers).to include(
+              'Content-Type' => include('application/activity+json'),
+              'Link' => include('activity+json')
+            )
+            expect(response.parsed_body)
+              .to include(content: include(status.text))
+          end
+        end
       end
 
       context 'when status has private visibility' do
diff --git a/spec/requests/well_known/webfinger_spec.rb b/spec/requests/well_known/webfinger_spec.rb
index 0c4a3c03474..593cecbb896 100644
--- a/spec/requests/well_known/webfinger_spec.rb
+++ b/spec/requests/well_known/webfinger_spec.rb
@@ -27,7 +27,7 @@ RSpec.describe 'The /.well-known/webfinger endpoint' do
       expect(response.parsed_body)
         .to include(
           subject: eq(alice.to_webfinger_s),
-          aliases: include("https://#{Rails.configuration.x.local_domain}/@alice", "https://#{Rails.configuration.x.local_domain}/users/alice")
+          aliases: include("https://#{Rails.configuration.x.local_domain}/@alice", ActivityPub::TagManager.instance.uri_for(alice))
         )
     end
   end
diff --git a/spec/routing/accounts_routing_spec.rb b/spec/routing/accounts_routing_spec.rb
index 8ff711a681e..bb0bf082bde 100644
--- a/spec/routing/accounts_routing_spec.rb
+++ b/spec/routing/accounts_routing_spec.rb
@@ -49,6 +49,7 @@ RSpec.describe 'Routes under accounts/' do
 
   context 'with local username encoded at' do
     include RSpec::Rails::RequestExampleGroup
+
     let(:username) { 'alice' }
 
     it 'routes /%40:username' do
@@ -140,6 +141,7 @@ RSpec.describe 'Routes under accounts/' do
 
   context 'with remote username encoded at' do
     include RSpec::Rails::RequestExampleGroup
+
     let(:username) { 'alice%40example.com' }
     let(:username_decoded) { 'alice@example.com' }
 
diff --git a/spec/serializers/activitypub/accept_quote_request_serializer_spec.rb b/spec/serializers/activitypub/accept_quote_request_serializer_spec.rb
new file mode 100644
index 00000000000..986d9112b79
--- /dev/null
+++ b/spec/serializers/activitypub/accept_quote_request_serializer_spec.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe ActivityPub::AcceptQuoteRequestSerializer do
+  subject { serialized_record_json(record, described_class, adapter: ActivityPub::Adapter) }
+
+  describe 'serializing an object' do
+    let(:record) { Fabricate(:quote, state: :accepted) }
+
+    it 'returns expected attributes' do
+      expect(subject.deep_symbolize_keys)
+        .to include(
+          actor: eq(ActivityPub::TagManager.instance.uri_for(record.quoted_account)),
+          id: match("#accepts/quote_requests/#{record.id}"),
+          object: include(
+            type: 'QuoteRequest',
+            instrument: ActivityPub::TagManager.instance.uri_for(record.status),
+            object: ActivityPub::TagManager.instance.uri_for(record.quoted_status)
+          ),
+          type: 'Accept'
+        )
+    end
+  end
+end
diff --git a/spec/serializers/activitypub/delete_quote_authorization_serializer_spec.rb b/spec/serializers/activitypub/delete_quote_authorization_serializer_spec.rb
new file mode 100644
index 00000000000..9fef61e9d72
--- /dev/null
+++ b/spec/serializers/activitypub/delete_quote_authorization_serializer_spec.rb
@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe ActivityPub::DeleteQuoteAuthorizationSerializer do
+  subject { serialized_record_json(quote, described_class, adapter: ActivityPub::Adapter) }
+
+  describe 'serializing an object' do
+    let(:status) { Fabricate(:status) }
+    let(:quote) { Fabricate(:quote, quoted_status: status, state: :accepted) }
+
+    it 'returns expected attributes' do
+      expect(subject.deep_symbolize_keys)
+        .to include(
+          actor: eq(ActivityPub::TagManager.instance.uri_for(status.account)),
+          object: a_hash_including(
+            type: 'QuoteAuthorization',
+            id: ActivityPub::TagManager.instance.approval_uri_for(quote, check_approval: false)
+          ),
+          type: 'Delete'
+        )
+    end
+  end
+end
diff --git a/spec/serializers/activitypub/note_serializer_spec.rb b/spec/serializers/activitypub/note_serializer_spec.rb
index a6976193b20..0d11386d57b 100644
--- a/spec/serializers/activitypub/note_serializer_spec.rb
+++ b/spec/serializers/activitypub/note_serializer_spec.rb
@@ -23,6 +23,7 @@ RSpec.describe ActivityPub::NoteSerializer do
         'zh-TW' => a_kind_of(String),
       }),
       'replies' => replies_collection_values,
+      'context' => ActivityPub::TagManager.instance.uri_for(parent.conversation),
     })
   end
 
@@ -41,4 +42,49 @@ RSpec.describe ActivityPub::NoteSerializer do
       .and(not_include(reply_by_other_first.uri)) # Replies from others
       .and(not_include(reply_by_account_visibility_direct.uri)) # Replies with direct visibility
   end
+
+  context 'with a quote' do
+    let(:quoted_status) { Fabricate(:status) }
+    let!(:quote) { Fabricate(:quote, status: parent, quoted_status: quoted_status, state: :accepted) }
+
+    it 'has the expected shape' do
+      expect(subject).to include({
+        'type' => 'Note',
+        'quote' => ActivityPub::TagManager.instance.uri_for(quote.quoted_status),
+        'quoteUri' => ActivityPub::TagManager.instance.uri_for(quote.quoted_status),
+        '_misskey_quote' => ActivityPub::TagManager.instance.uri_for(quote.quoted_status),
+        'quoteAuthorization' => ActivityPub::TagManager.instance.approval_uri_for(quote),
+      })
+    end
+  end
+
+  context 'with a deleted quote' do
+    let(:quoted_status) { Fabricate(:status) }
+
+    before do
+      Fabricate(:quote, status: parent, quoted_status: nil, state: :accepted)
+    end
+
+    it 'has the expected shape' do
+      expect(subject).to include({
+        'type' => 'Note',
+        'quote' => { 'type' => 'Tombstone' },
+      })
+    end
+  end
+
+  context 'with a quote policy' do
+    let(:parent) { Fabricate(:status, quote_approval_policy: Status::QUOTE_APPROVAL_POLICY_FLAGS[:followers] << 16) }
+
+    it 'has the expected shape' do
+      expect(subject).to include({
+        'type' => 'Note',
+        'interactionPolicy' => a_hash_including(
+          'canQuote' => a_hash_including(
+            'automaticApproval' => [ActivityPub::TagManager.instance.followers_uri_for(parent.account)]
+          )
+        ),
+      })
+    end
+  end
 end
diff --git a/spec/serializers/activitypub/quote_authorization_serializer_spec.rb b/spec/serializers/activitypub/quote_authorization_serializer_spec.rb
new file mode 100644
index 00000000000..6a157756934
--- /dev/null
+++ b/spec/serializers/activitypub/quote_authorization_serializer_spec.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe ActivityPub::QuoteAuthorizationSerializer do
+  subject { serialized_record_json(quote, described_class, adapter: ActivityPub::Adapter) }
+
+  describe 'serializing an object' do
+    let(:status) { Fabricate(:status) }
+    let(:quote) { Fabricate(:quote, quoted_status: status, state: :accepted) }
+
+    it 'returns expected attributes' do
+      expect(subject.deep_symbolize_keys)
+        .to include(
+          attributedTo: eq(ActivityPub::TagManager.instance.uri_for(status.account)),
+          interactionTarget: ActivityPub::TagManager.instance.uri_for(status),
+          interactingObject: ActivityPub::TagManager.instance.uri_for(quote.status),
+          type: 'QuoteAuthorization'
+        )
+    end
+  end
+end
diff --git a/spec/serializers/rest/status_serializer_spec.rb b/spec/serializers/rest/status_serializer_spec.rb
index b6908aa414a..be1b4bcae4d 100644
--- a/spec/serializers/rest/status_serializer_spec.rb
+++ b/spec/serializers/rest/status_serializer_spec.rb
@@ -26,6 +26,7 @@ RSpec.describe REST::StatusSerializer do
       status.status_stat.tap do |status_stat|
         status_stat.reblogs_count = 10
         status_stat.favourites_count = 20
+        status_stat.quotes_count = 15
         status_stat.save
       end
     end
@@ -34,6 +35,7 @@ RSpec.describe REST::StatusSerializer do
       it 'shows the trusted counts' do
         expect(subject['reblogs_count']).to eq(10)
         expect(subject['favourites_count']).to eq(20)
+        expect(subject['quotes_count']).to eq(15)
       end
     end
 
diff --git a/spec/services/activitypub/fetch_remote_status_service_spec.rb b/spec/services/activitypub/fetch_remote_status_service_spec.rb
index 2503a58ac20..07d05d762f1 100644
--- a/spec/services/activitypub/fetch_remote_status_service_spec.rb
+++ b/spec/services/activitypub/fetch_remote_status_service_spec.rb
@@ -316,6 +316,23 @@ RSpec.describe ActivityPub::FetchRemoteStatusService do
           expect(existing_status.edits).to_not be_empty
         end
       end
+
+      context 'with an implicit update to quoting policy' do
+        let(:object) do
+          note.merge({
+            'content' => existing_status.text,
+            'interactionPolicy' => {
+              'canQuote' => {
+                'automaticApproval' => ['https://www.w3.org/ns/activitystreams#Public'],
+              },
+            },
+          })
+        end
+
+        it 'updates status' do
+          expect(existing_status.reload.quote_approval_policy).to eq(Status::QUOTE_APPROVAL_POLICY_FLAGS[:public] << 16)
+        end
+      end
     end
   end
 
diff --git a/spec/services/activitypub/process_status_update_service_spec.rb b/spec/services/activitypub/process_status_update_service_spec.rb
index 6ffaeb09b51..56a8c71cbe8 100644
--- a/spec/services/activitypub/process_status_update_service_spec.rb
+++ b/spec/services/activitypub/process_status_update_service_spec.rb
@@ -343,6 +343,42 @@ RSpec.describe ActivityPub::ProcessStatusUpdateService do
       end
     end
 
+    context 'when originally without media attachments and text is removed' do
+      before do
+        stub_request(:get, 'https://example.com/foo.png').to_return(body: attachment_fixture('emojo.png'))
+      end
+
+      let(:payload) do
+        {
+          '@context': 'https://www.w3.org/ns/activitystreams',
+          id: 'foo',
+          type: 'Note',
+          content: '',
+          updated: '2021-09-08T22:39:25Z',
+          attachment: [
+            { type: 'Image', mediaType: 'image/png', url: 'https://example.com/foo.png' },
+          ],
+        }
+      end
+
+      it 'updates media attachments, fetches attachment, records media and text removal in edit' do
+        subject.call(status, json, json)
+
+        expect(status.reload.ordered_media_attachments.first)
+          .to be_present
+          .and(have_attributes(remote_url: 'https://example.com/foo.png'))
+
+        expect(a_request(:get, 'https://example.com/foo.png'))
+          .to have_been_made
+
+        expect(status.edits.reload.last.ordered_media_attachment_ids)
+          .to_not be_empty
+
+        expect(status.edits.reload.last.text)
+          .to_not be_present
+      end
+    end
+
     context 'when originally with media attachments' do
       let(:media_attachments) { [Fabricate(:media_attachment, remote_url: 'https://example.com/foo.png'), Fabricate(:media_attachment, remote_url: 'https://example.com/unused.png')] }
 
@@ -435,7 +471,71 @@ RSpec.describe ActivityPub::ProcessStatusUpdateService do
     end
   end
 
-  context 'when the status has an existing unverified quote and adds an approval link' do
+  context 'when the status has an existing unverified quote and adds an approval link through an implicit update' do
+    let(:quoted_account) { Fabricate(:account, domain: 'quoted.example.com') }
+    let(:quoted_status) { Fabricate(:status, account: quoted_account) }
+    let!(:quote) { Fabricate(:quote, status: status, quoted_status: quoted_status, approval_uri: nil) }
+    let(:approval_uri) { 'https://quoted.example.com/approvals/1' }
+
+    let(:payload) do
+      {
+        '@context': [
+          'https://www.w3.org/ns/activitystreams',
+          {
+            '@id': 'https://w3id.org/fep/044f#quote',
+            '@type': '@id',
+          },
+          {
+            '@id': 'https://w3id.org/fep/044f#quoteAuthorization',
+            '@type': '@id',
+          },
+        ],
+        id: 'foo',
+        type: 'Note',
+        summary: 'Show more',
+        content: 'Hello universe',
+        quote: ActivityPub::TagManager.instance.uri_for(quoted_status),
+        quoteAuthorization: approval_uri,
+      }
+    end
+
+    before do
+      stub_request(:get, approval_uri).to_return(headers: { 'Content-Type': 'application/activity+json' }, body: Oj.dump({
+        '@context': [
+          'https://www.w3.org/ns/activitystreams',
+          {
+            QuoteAuthorization: 'https://w3id.org/fep/044f#QuoteAuthorization',
+            gts: 'https://gotosocial.org/ns#',
+            interactionPolicy: {
+              '@id': 'gts:interactionPolicy',
+              '@type': '@id',
+            },
+            interactingObject: {
+              '@id': 'gts:interactingObject',
+              '@type': '@id',
+            },
+            interactionTarget: {
+              '@id': 'gts:interactionTarget',
+              '@type': '@id',
+            },
+          },
+        ],
+        type: 'QuoteAuthorization',
+        id: approval_uri,
+        attributedTo: ActivityPub::TagManager.instance.uri_for(quoted_status.account),
+        interactingObject: ActivityPub::TagManager.instance.uri_for(status),
+        interactionTarget: ActivityPub::TagManager.instance.uri_for(quoted_status),
+      }))
+    end
+
+    it 'updates the approval URI and verifies the quote' do
+      expect { subject.call(status, json, json) }
+        .to change(quote, :approval_uri).to(approval_uri)
+        .and change(quote, :state).to('accepted')
+    end
+  end
+
+  context 'when the status has an existing unverified quote and adds an approval link through an explicit update' do
     let(:quoted_account) { Fabricate(:account, domain: 'quoted.example.com') }
     let(:quoted_status) { Fabricate(:status, account: quoted_account) }
     let!(:quote) { Fabricate(:quote, status: status, quoted_status: quoted_status, approval_uri: nil) }
@@ -500,7 +600,117 @@ RSpec.describe ActivityPub::ProcessStatusUpdateService do
     end
   end
 
-  context 'when the status has an existing verified quote and removes an approval link' do
+  context 'when an approved quote of a local post gets updated through an explicit update, removing text' do
+    let(:quoted_account) { Fabricate(:account) }
+    let(:quoted_status) { Fabricate(:status, account: quoted_account, quote_approval_policy: Status::QUOTE_APPROVAL_POLICY_FLAGS[:public] << 16) }
+    let!(:quote) { Fabricate(:quote, status: status, quoted_status: quoted_status, state: :accepted) }
+    let(:approval_uri) { ActivityPub::TagManager.instance.approval_uri_for(quote) }
+
+    let(:payload) do
+      {
+        '@context': [
+          'https://www.w3.org/ns/activitystreams',
+          {
+            '@id': 'https://w3id.org/fep/044f#quote',
+            '@type': '@id',
+          },
+          {
+            '@id': 'https://w3id.org/fep/044f#quoteAuthorization',
+            '@type': '@id',
+          },
+        ],
+        id: 'foo',
+        type: 'Note',
+        summary: 'Show more',
+        updated: '2021-09-08T22:39:25Z',
+        quote: ActivityPub::TagManager.instance.uri_for(quoted_status),
+        quoteAuthorization: approval_uri,
+      }
+    end
+
+    it 'updates the quote post without changing the quote status' do
+      expect { subject.call(status, json, json) }
+        .to not_change(quote, :approval_uri)
+        .and not_change(quote, :state).from('accepted')
+        .and change(status, :text).from('Hello world').to('')
+    end
+  end
+
+  context 'when an approved quote of a local post gets updated through an explicit update' do
+    let(:quoted_account) { Fabricate(:account) }
+    let(:quoted_status) { Fabricate(:status, account: quoted_account, quote_approval_policy: Status::QUOTE_APPROVAL_POLICY_FLAGS[:public] << 16) }
+    let!(:quote) { Fabricate(:quote, status: status, quoted_status: quoted_status, state: :accepted) }
+    let(:approval_uri) { ActivityPub::TagManager.instance.approval_uri_for(quote) }
+
+    let(:payload) do
+      {
+        '@context': [
+          'https://www.w3.org/ns/activitystreams',
+          {
+            '@id': 'https://w3id.org/fep/044f#quote',
+            '@type': '@id',
+          },
+          {
+            '@id': 'https://w3id.org/fep/044f#quoteAuthorization',
+            '@type': '@id',
+          },
+        ],
+        id: 'foo',
+        type: 'Note',
+        summary: 'Show more',
+        content: 'Hello universe',
+        updated: '2021-09-08T22:39:25Z',
+        quote: ActivityPub::TagManager.instance.uri_for(quoted_status),
+        quoteAuthorization: approval_uri,
+      }
+    end
+
+    it 'updates the quote post without changing the quote status' do
+      expect { subject.call(status, json, json) }
+        .to not_change(quote, :approval_uri)
+        .and not_change(quote, :state).from('accepted')
+        .and change(status, :text).from('Hello world').to('Hello universe')
+    end
+  end
+
+  context 'when an unapproved quote of a local post gets updated through an explicit update and claims approval' do
+    let(:quoted_account) { Fabricate(:account) }
+    let(:quoted_status) { Fabricate(:status, account: quoted_account, quote_approval_policy: 0) }
+    let!(:quote) { Fabricate(:quote, status: status, quoted_status: quoted_status, state: :rejected) }
+    let(:approval_uri) { ActivityPub::TagManager.instance.approval_uri_for(quote) }
+
+    let(:payload) do
+      {
+        '@context': [
+          'https://www.w3.org/ns/activitystreams',
+          {
+            '@id': 'https://w3id.org/fep/044f#quote',
+            '@type': '@id',
+          },
+          {
+            '@id': 'https://w3id.org/fep/044f#quoteAuthorization',
+            '@type': '@id',
+          },
+        ],
+        id: 'foo',
+        type: 'Note',
+        summary: 'Show more',
+        content: 'Hello universe',
+        updated: '2021-09-08T22:39:25Z',
+        quote: ActivityPub::TagManager.instance.uri_for(quoted_status),
+        quoteAuthorization: approval_uri,
+      }
+    end
+
+    it 'updates the quote post without changing the quote status' do
+      expect { subject.call(status, json, json) }
+        .to not_change(quote, :approval_uri)
+        .and not_change(quote, :state).from('rejected')
+        .and change(status, :text).from('Hello world').to('Hello universe')
+    end
+  end
+
+  context 'when the status has an existing verified quote and removes an approval link through an explicit update' do
     let(:quoted_account) { Fabricate(:account, domain: 'quoted.example.com') }
     let(:quoted_status) { Fabricate(:status, account: quoted_account) }
     let!(:quote) { Fabricate(:quote, status: status, quoted_status: quoted_status, approval_uri: approval_uri, state: :accepted) }
@@ -535,7 +745,7 @@ RSpec.describe ActivityPub::ProcessStatusUpdateService do
     end
   end
 
-  context 'when the status adds a verifiable quote' do
+  context 'when the status adds a verifiable quote through an explicit update' do
     let(:quoted_account) { Fabricate(:account, domain: 'quoted.example.com') }
     let(:quoted_status) { Fabricate(:status, account: quoted_account) }
     let(:approval_uri) { 'https://quoted.example.com/approvals/1' }
@@ -600,7 +810,39 @@ RSpec.describe ActivityPub::ProcessStatusUpdateService do
     end
   end
 
-  context 'when the status adds a unverifiable quote' do
+  context 'when the status adds a unverifiable quote through an implicit update' do
+    let(:quoted_account) { Fabricate(:account, domain: 'quoted.example.com') }
+    let(:quoted_status) { Fabricate(:status, account: quoted_account) }
+    let(:approval_uri) { 'https://quoted.example.com/approvals/1' }
+
+    let(:payload) do
+      {
+        '@context': [
+          'https://www.w3.org/ns/activitystreams',
+          {
+            '@id': 'https://w3id.org/fep/044f#quote',
+            '@type': '@id',
+          },
+          {
+            '@id': 'https://w3id.org/fep/044f#quoteAuthorization',
+            '@type': '@id',
+          },
+        ],
+        id: 'foo',
+        type: 'Note',
+        summary: 'Show more',
+        content: 'Hello universe',
+        quote: ActivityPub::TagManager.instance.uri_for(quoted_status),
+      }
+    end
+
+    it 'does not add the quote' do
+      expect { subject.call(status, json, json) }
+        .to not_change(status, :quote).from(nil)
+    end
+  end
+
+  context 'when the status adds a unverifiable quote through an explicit update' do
     let(:quoted_account) { Fabricate(:account, domain: 'quoted.example.com') }
     let(:quoted_status) { Fabricate(:status, account: quoted_account) }
     let(:approval_uri) { 'https://quoted.example.com/approvals/1' }
@@ -635,7 +877,29 @@ RSpec.describe ActivityPub::ProcessStatusUpdateService do
     end
   end
 
-  context 'when the status removes a verified quote' do
+  context 'when the status removes a verified quote through an implicit update' do
+    let(:quoted_account) { Fabricate(:account, domain: 'quoted.example.com') }
+    let(:quoted_status) { Fabricate(:status, account: quoted_account) }
+    let!(:quote) { Fabricate(:quote, status: status, quoted_status: quoted_status, approval_uri: approval_uri, state: :accepted) }
+    let(:approval_uri) { 'https://quoted.example.com/approvals/1' }
+
+    let(:payload) do
+      {
+        '@context': 'https://www.w3.org/ns/activitystreams',
+        id: 'foo',
+        type: 'Note',
+        summary: 'Show more',
+        content: 'Hello universe',
+      }
+    end
+
+    it 'does not remove the quote' do
+      expect { subject.call(status, json, json) }
+        .to not_change { status.reload.quote }.from(quote)
+    end
+  end
+
+  context 'when the status removes a verified quote through an explicit update' do
     let(:quoted_account) { Fabricate(:account, domain: 'quoted.example.com') }
     let(:quoted_status) { Fabricate(:status, account: quoted_account) }
     let!(:quote) { Fabricate(:quote, status: status, quoted_status: quoted_status, approval_uri: approval_uri, state: :accepted) }
@@ -660,7 +924,7 @@ RSpec.describe ActivityPub::ProcessStatusUpdateService do
     end
   end
 
-  context 'when the status removes an unverified quote' do
+  context 'when the status removes an unverified quote through an explicit update' do
     let(:quoted_account) { Fabricate(:account, domain: 'quoted.example.com') }
     let(:quoted_status) { Fabricate(:status, account: quoted_account) }
     let!(:quote) { Fabricate(:quote, status: status, quoted_status: quoted_status, approval_uri: nil, state: :pending) }
@@ -684,7 +948,44 @@ RSpec.describe ActivityPub::ProcessStatusUpdateService do
     end
   end
 
-  context 'when the status swaps a verified quote with an unverifiable quote' do
+  context 'when the status swaps a verified quote with an unverifiable quote through an implicit update' do
+    let(:quoted_account) { Fabricate(:account, domain: 'quoted.example.com') }
+    let(:quoted_status) { Fabricate(:status, account: quoted_account) }
+    let(:second_quoted_status) { Fabricate(:status, account: quoted_account) }
+    let!(:quote) { Fabricate(:quote, status: status, quoted_status: quoted_status, approval_uri: approval_uri, state: :accepted) }
+    let(:approval_uri) { 'https://quoted.example.com/approvals/1' }
+
+    let(:payload) do
+      {
+        '@context': [
+          'https://www.w3.org/ns/activitystreams',
+          {
+            '@id': 'https://w3id.org/fep/044f#quote',
+            '@type': '@id',
+          },
+          {
+            '@id': 'https://w3id.org/fep/044f#quoteAuthorization',
+            '@type': '@id',
+          },
+        ],
+        id: 'foo',
+        type: 'Note',
+        summary: 'Show more',
+        content: 'Hello universe',
+        quote: ActivityPub::TagManager.instance.uri_for(second_quoted_status),
+        quoteAuthorization: approval_uri,
+      }
+    end
+
+    it 'does not update the URI or the quote verification status' do
+      expect { subject.call(status, json, json) }
+        .to not_change { status.reload.quote }.from(quote)
+        .and not_change { status.quote.quoted_status }.from(quoted_status)
+        .and not_change { status.quote.state }.from('accepted')
+    end
+  end
+
+  context 'when the status swaps a verified quote with an unverifiable quote through an explicit update' do
     let(:quoted_account) { Fabricate(:account, domain: 'quoted.example.com') }
     let(:quoted_status) { Fabricate(:status, account: quoted_account) }
     let(:second_quoted_status) { Fabricate(:status, account: quoted_account) }
@@ -752,7 +1053,45 @@ RSpec.describe ActivityPub::ProcessStatusUpdateService do
     end
   end
 
-  context 'when the status swaps a verified quote with another verifiable quote' do
+  context 'when the status swaps a verified quote with an ID-less Tombstone through an explicit update' do
+    let(:quoted_account) { Fabricate(:account, domain: 'quoted.example.com') }
+    let(:quoted_status) { Fabricate(:status, account: quoted_account) }
+    let(:second_quoted_status) { Fabricate(:status, account: quoted_account) }
+    let!(:quote) { Fabricate(:quote, status: status, quoted_status: quoted_status, approval_uri: approval_uri, state: :accepted) }
+    let(:approval_uri) { 'https://quoted.example.com/approvals/1' }
+
+    let(:payload) do
+      {
+        '@context': [
+          'https://www.w3.org/ns/activitystreams',
+          {
+            '@id': 'https://w3id.org/fep/044f#quote',
+            '@type': '@id',
+          },
+          {
+            '@id': 'https://w3id.org/fep/044f#quoteAuthorization',
+            '@type': '@id',
+          },
+        ],
+        id: 'foo',
+        type: 'Note',
+        summary: 'Show more',
+        content: 'Hello universe',
+        updated: '2021-09-08T22:39:25Z',
+        quote: { type: 'Tombstone' },
+      }
+    end
+
+    it 'updates the URI and unverifies the quote' do
+      expect { subject.call(status, json, json) }
+        .to change { status.quote.quoted_status }.from(quoted_status).to(nil)
+        .and change { status.quote.state }.from('accepted').to('deleted')
+
+      expect { quote.reload }.to raise_error(ActiveRecord::RecordNotFound)
+    end
+  end
+
+  context 'when the status swaps a verified quote with another verifiable quote through an explicit update' do
     let(:quoted_account) { Fabricate(:account, domain: 'quoted.example.com') }
     let(:second_quoted_account) { Fabricate(:account, domain: 'second-quoted.example.com') }
     let(:quoted_status) { Fabricate(:status, account: quoted_account) }
diff --git a/spec/services/activitypub/synchronize_followers_service_spec.rb b/spec/services/activitypub/synchronize_followers_service_spec.rb
index 70f27627e1f..813658d149b 100644
--- a/spec/services/activitypub/synchronize_followers_service_spec.rb
+++ b/spec/services/activitypub/synchronize_followers_service_spec.rb
@@ -6,7 +6,7 @@ RSpec.describe ActivityPub::SynchronizeFollowersService do
   subject { described_class.new }
 
   let(:actor)          { Fabricate(:account, domain: 'example.com', uri: 'http://example.com/account', inbox_url: 'http://example.com/inbox') }
-  let(:alice)          { Fabricate(:account, username: 'alice') }
+  let(:alice)          { Fabricate(:account, username: 'alice', id_scheme: :numeric_ap_id) }
   let(:bob)            { Fabricate(:account, username: 'bob') }
   let(:eve)            { Fabricate(:account, username: 'eve') }
   let(:mallory)        { Fabricate(:account, username: 'mallory') }
@@ -35,7 +35,7 @@ RSpec.describe ActivityPub::SynchronizeFollowersService do
 
   shared_examples 'synchronizes followers' do
     before do
-      subject.call(actor, collection_uri)
+      subject.call(actor, collection_uri, expected_digest)
     end
 
     it 'maintains following records and sends Undo Follow to actor' do
@@ -51,6 +51,8 @@ RSpec.describe ActivityPub::SynchronizeFollowersService do
   end
 
   describe '#call' do
+    let(:expected_digest) { nil }
+
     context 'when the endpoint is a Collection of actor URIs' do
       before do
         stub_request(:get, collection_uri).to_return(status: 200, body: Oj.dump(payload), headers: { 'Content-Type': 'application/activity+json' })
@@ -197,5 +199,131 @@ RSpec.describe ActivityPub::SynchronizeFollowersService do
           .to be_following(actor)
       end
     end
+
+    context 'when passing a matching expected_digest' do
+      let(:expected_digest) do
+        digest = "\x00" * 32
+
+        items.each do |uri|
+          Xorcist.xor!(digest, Digest::SHA256.digest(uri))
+        end
+
+        digest.unpack1('H*')
+      end
+
+      context 'when the endpoint is a Collection of actor URIs' do
+        before do
+          stub_request(:get, collection_uri).to_return(status: 200, body: Oj.dump(payload), headers: { 'Content-Type': 'application/activity+json' })
+        end
+
+        it_behaves_like 'synchronizes followers'
+      end
+
+      context 'when the endpoint is an OrderedCollection of actor URIs' do
+        let(:payload) do
+          {
+            '@context': 'https://www.w3.org/ns/activitystreams',
+            type: 'OrderedCollection',
+            id: collection_uri,
+            orderedItems: items,
+          }.with_indifferent_access
+        end
+
+        before do
+          stub_request(:get, collection_uri).to_return(status: 200, body: Oj.dump(payload), headers: { 'Content-Type': 'application/activity+json' })
+        end
+
+        it_behaves_like 'synchronizes followers'
+      end
+
+      context 'when the endpoint is a single-page paginated Collection of actor URIs' do
+        let(:payload) do
+          {
+            '@context': 'https://www.w3.org/ns/activitystreams',
+            type: 'Collection',
+            id: collection_uri,
+            first: {
+              type: 'CollectionPage',
+              partOf: collection_uri,
+              items: items,
+            },
+          }.with_indifferent_access
+        end
+
+        before do
+          stub_request(:get, collection_uri).to_return(status: 200, body: Oj.dump(payload), headers: { 'Content-Type': 'application/activity+json' })
+        end
+
+        it_behaves_like 'synchronizes followers'
+      end
+    end
+
+    context 'when passing a non-matching expected_digest' do
+      let(:expected_digest) { '123456789' }
+
+      context 'when the endpoint is a Collection of actor URIs' do
+        before do
+          stub_request(:get, collection_uri).to_return(status: 200, body: Oj.dump(payload), headers: { 'Content-Type': 'application/activity+json' })
+        end
+
+        it 'does not remove followers' do
+          follower_ids = actor.followers.reload.pluck(:id)
+
+          subject.call(actor, collection_uri, expected_digest)
+
+          expect(follower_ids - actor.followers.reload.pluck(:id)).to be_empty
+        end
+      end
+
+      context 'when the endpoint is an OrderedCollection of actor URIs' do
+        let(:payload) do
+          {
+            '@context': 'https://www.w3.org/ns/activitystreams',
+            type: 'OrderedCollection',
+            id: collection_uri,
+            orderedItems: items,
+          }.with_indifferent_access
+        end
+
+        before do
+          stub_request(:get, collection_uri).to_return(status: 200, body: Oj.dump(payload), headers: { 'Content-Type': 'application/activity+json' })
+        end
+
+        it 'does not remove followers' do
+          follower_ids = actor.followers.reload.pluck(:id)
+
+          subject.call(actor, collection_uri, expected_digest)
+
+          expect(follower_ids - actor.followers.reload.pluck(:id)).to be_empty
+        end
+      end
+
+      context 'when the endpoint is a single-page paginated Collection of actor URIs' do
+        let(:payload) do
+          {
+            '@context': 'https://www.w3.org/ns/activitystreams',
+            type: 'Collection',
+            id: collection_uri,
+            first: {
+              type: 'CollectionPage',
+              partOf: collection_uri,
+              items: items,
+            },
+          }.with_indifferent_access
+        end
+
+        before do
+          stub_request(:get, collection_uri).to_return(status: 200, body: Oj.dump(payload), headers: { 'Content-Type': 'application/activity+json' })
+        end
+
+        it 'does not remove followers' do
+          follower_ids = actor.followers.reload.pluck(:id)
+
+          subject.call(actor, collection_uri, expected_digest)
+
+          expect(follower_ids - actor.followers.reload.pluck(:id)).to be_empty
+        end
+      end
+    end
   end
 end
diff --git a/spec/services/activitypub/verify_quote_service_spec.rb b/spec/services/activitypub/verify_quote_service_spec.rb
index ae4ffae9bb2..94b9e33ed3b 100644
--- a/spec/services/activitypub/verify_quote_service_spec.rb
+++ b/spec/services/activitypub/verify_quote_service_spec.rb
@@ -267,9 +267,9 @@ RSpec.describe ActivityPub::VerifyQuoteService do
         quoted_status.mentions << Mention.new(account: account)
       end
 
-      it 'updates the status' do
+      it 'does not the status' do
         expect { subject.call(quote) }
-          .to change(quote, :state).to('accepted')
+          .to_not change(quote, :state).from('pending')
       end
     end
   end
diff --git a/spec/services/post_status_service_spec.rb b/spec/services/post_status_service_spec.rb
index 8836b9e0a63..96289cdeee1 100644
--- a/spec/services/post_status_service_spec.rb
+++ b/spec/services/post_status_service_spec.rb
@@ -160,6 +160,12 @@ RSpec.describe PostStatusService do
     expect(status.language).to eq 'en'
   end
 
+  it 'creates a status with the quote approval policy set' do
+    status = create_status_with_options(quote_approval_policy: Status::QUOTE_APPROVAL_POLICY_FLAGS[:followers] << 16)
+
+    expect(status.quote_approval_policy).to eq(Status::QUOTE_APPROVAL_POLICY_FLAGS[:followers] << 16)
+  end
+
   it 'processes mentions' do
     mention_service = instance_double(ProcessMentionsService)
     allow(mention_service).to receive(:call)
@@ -291,6 +297,38 @@ RSpec.describe PostStatusService do
     )
   end
 
+  it 'correctly requests a quote for remote posts' do
+    account = Fabricate(:account)
+    quoted_status = Fabricate(:status, account: Fabricate(:account, domain: 'example.com'))
+
+    expect { subject.call(account, text: 'test', quoted_status: quoted_status) }
+      .to enqueue_sidekiq_job(ActivityPub::QuoteRequestWorker)
+  end
+
+  it 'allows quotes with spoilers and no text' do
+    account = Fabricate(:account)
+    quoted_status = Fabricate(:status, account: Fabricate(:account, domain: 'example.com'))
+
+    expect { subject.call(account, spoiler_text: 'test', quoted_status: quoted_status) }
+      .to enqueue_sidekiq_job(ActivityPub::QuoteRequestWorker)
+  end
+
+  it 'correctly downgrades visibility for private self-quotes' do
+    account = Fabricate(:account)
+    quoted_status = Fabricate(:status, account: account, visibility: :private)
+
+    status = subject.call(account, text: 'test', quoted_status: quoted_status)
+    expect(status).to be_private_visibility
+  end
+
+  it 'correctly preserves visibility for private mentions self-quoting private posts' do
+    account = Fabricate(:account)
+    quoted_status = Fabricate(:status, account: account, visibility: :private)
+
+    status = subject.call(account, text: 'test', quoted_status: quoted_status, visibility: 'direct')
+    expect(status).to be_direct_visibility
+  end
+
   it 'returns existing status when used twice with idempotency key' do
     account = Fabricate(:account)
     status1 = subject.call(account, text: 'test', idempotency: 'meepmeep')
diff --git a/spec/services/remove_status_service_spec.rb b/spec/services/remove_status_service_spec.rb
index f2b46f05b00..3cb2eceec59 100644
--- a/spec/services/remove_status_service_spec.rb
+++ b/spec/services/remove_status_service_spec.rb
@@ -129,4 +129,20 @@ RSpec.describe RemoveStatusService, :inline_jobs do
       )
     )
   end
+
+  context 'when removed status is a quote of a local user', inline_jobs: false do
+    let(:original_status) { Fabricate(:status, account: alice) }
+    let(:status) { Fabricate(:status, account: jeff) }
+
+    before do
+      bill.follow!(jeff)
+      Fabricate(:quote, status: status, quoted_status: original_status, state: :accepted)
+      original_status.discard
+    end
+
+    it 'sends deletion without crashing' do
+      expect { subject.call(status.reload) }
+        .to enqueue_sidekiq_job(ActivityPub::DeliveryWorker).with(/Delete/, jeff.id, bill.inbox_url)
+    end
+  end
 end
diff --git a/spec/services/revoke_quote_service_spec.rb b/spec/services/revoke_quote_service_spec.rb
new file mode 100644
index 00000000000..c36f222cbbd
--- /dev/null
+++ b/spec/services/revoke_quote_service_spec.rb
@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe RevokeQuoteService do
+  subject { described_class.new }
+
+  let!(:alice) { Fabricate(:account) }
+  let!(:hank) { Fabricate(:account, username: 'hank', protocol: :activitypub, domain: 'example.com', inbox_url: 'http://example.com/inbox') }
+
+  let(:status) { Fabricate(:status, account: alice) }
+
+  let(:quote) { Fabricate(:quote, quoted_status: status, state: :accepted) }
+
+  before do
+    hank.follow!(alice)
+  end
+
+  context 'with an accepted quote' do
+    it 'revokes the quote and sends a Delete activity' do
+      expect { described_class.new.call(quote) }
+        .to change { quote.reload.state }.from('accepted').to('revoked')
+        .and enqueue_sidekiq_job(ActivityPub::DeliveryWorker).with(
+          match_json_values(
+            type: 'Delete',
+            id: %r{https://.*},
+            object: include(
+              type: 'QuoteAuthorization',
+              id: %r{https://.*},
+              attributedTo: ActivityPub::TagManager.instance.uri_for(alice),
+              interactionTarget: ActivityPub::TagManager.instance.uri_for(status),
+              interactingObject: ActivityPub::TagManager.instance.uri_for(quote.status)
+            ),
+            actor: ActivityPub::TagManager.instance.uri_for(alice)
+          ),
+          alice.id,
+          hank.inbox_url
+        )
+    end
+  end
+end
diff --git a/spec/support/examples/models/concerns/user/activity.rb b/spec/support/examples/models/concerns/user/activity.rb
new file mode 100644
index 00000000000..7e647b694a9
--- /dev/null
+++ b/spec/support/examples/models/concerns/user/activity.rb
@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.shared_examples 'User::Activity' do
+  before { stub_const 'User::ACTIVE_DURATION', 7.days }
+
+  describe 'Scopes' do
+    let!(:recent_sign_in_user) { Fabricate(:user, current_sign_in_at: 2.days.ago) }
+    let!(:no_recent_sign_in_user) { Fabricate(:user, current_sign_in_at: 10.days.ago) }
+
+    describe '.signed_in_recently' do
+      it 'returns users who have signed in during the recent period' do
+        expect(described_class.signed_in_recently)
+          .to contain_exactly(recent_sign_in_user)
+      end
+    end
+
+    describe '.not_signed_in_recently' do
+      it 'returns users who have not signed in during the recent period' do
+        expect(described_class.not_signed_in_recently)
+          .to contain_exactly(no_recent_sign_in_user)
+      end
+    end
+  end
+
+  describe '#signed_in_recently?' do
+    subject { Fabricate.build :user, current_sign_in_at: }
+
+    context 'when current_sign_in_at is nil' do
+      let(:current_sign_in_at) { nil }
+
+      it { is_expected.to_not be_signed_in_recently }
+    end
+
+    context 'when current_sign_in_at is before the threshold' do
+      let(:current_sign_in_at) { 10.days.ago }
+
+      it { is_expected.to_not be_signed_in_recently }
+    end
+
+    context 'when current_sign_in_at is after the threshold' do
+      let(:current_sign_in_at) { 2.days.ago }
+
+      it { is_expected.to be_signed_in_recently }
+    end
+  end
+end
diff --git a/spec/support/examples/models/concerns/user/confirmation.rb b/spec/support/examples/models/concerns/user/confirmation.rb
new file mode 100644
index 00000000000..bb4d1b52b9c
--- /dev/null
+++ b/spec/support/examples/models/concerns/user/confirmation.rb
@@ -0,0 +1,150 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.shared_examples 'User::Confirmation' do
+  describe 'Scopes' do
+    let!(:unconfirmed_user) { Fabricate :user, confirmed_at: nil }
+    let!(:confirmed_user) { Fabricate :user, confirmed_at: Time.now.utc }
+
+    describe '.confirmed' do
+      it 'returns users who are confirmed' do
+        expect(described_class.confirmed)
+          .to contain_exactly(confirmed_user)
+      end
+    end
+
+    describe '.unconfirmed' do
+      it 'returns users who are not confirmed' do
+        expect(described_class.unconfirmed)
+          .to contain_exactly(unconfirmed_user)
+      end
+    end
+  end
+
+  describe '#confirmed?' do
+    subject { Fabricate.build(:user, confirmed_at:) }
+
+    context 'when confirmed_at is set' do
+      let(:confirmed_at) { Time.now.utc }
+
+      it { is_expected.to be_confirmed }
+    end
+
+    context 'when confirmed_at is not set' do
+      let(:confirmed_at) { nil }
+
+      it { is_expected.to_not be_confirmed }
+    end
+  end
+
+  describe '#unconfirmed?' do
+    subject { Fabricate.build(:user, confirmed_at:) }
+
+    context 'when confirmed_at is set' do
+      let(:confirmed_at) { Time.now.utc }
+
+      it { is_expected.to_not be_unconfirmed }
+    end
+
+    context 'when confirmed_at is not set' do
+      let(:confirmed_at) { nil }
+
+      it { is_expected.to be_unconfirmed }
+    end
+  end
+
+  describe '#confirm' do
+    subject { user.confirm }
+
+    let(:new_email) { 'new-email@host.example' }
+
+    before { allow(TriggerWebhookWorker).to receive(:perform_async) }
+
+    context 'when the user is already confirmed' do
+      let!(:user) { Fabricate(:user, confirmed_at: Time.now.utc, approved: true, unconfirmed_email: new_email) }
+
+      it 'sets email to unconfirmed_email and does not trigger web hook' do
+        expect { subject }
+          .to change { user.reload.email }.to(new_email)
+        expect(TriggerWebhookWorker)
+          .to_not have_received(:perform_async).with('account.approved', 'Account', user.account_id)
+      end
+    end
+
+    context 'when the user is a new user' do
+      let(:user) { Fabricate(:user, confirmed_at: nil, unconfirmed_email: new_email) }
+
+      context 'when the user does not require explicit approval' do
+        before { Setting.registrations_mode = 'open' }
+
+        it 'sets email to unconfirmed_email and triggers `account.approved` web hook' do
+          expect { subject }
+            .to change { user.reload.email }.to(new_email)
+          expect(TriggerWebhookWorker)
+            .to have_received(:perform_async).with('account.approved', 'Account', user.account_id).once
+        end
+      end
+
+      context 'when the user requires explicit approval because of signup IP address' do
+        let(:user) { Fabricate(:user, confirmed_at: nil, unconfirmed_email: new_email, approved: false, sign_up_ip: '192.0.2.5') }
+
+        before do
+          Setting.registrations_mode = 'open'
+          Fabricate(:ip_block, ip: '192.0.2.5', severity: :sign_up_requires_approval)
+        end
+
+        it 'sets email to new_email and marks user as confirmed, but not as approved and does not trigger `account.approved` web hook' do
+          expect { subject }
+            .to change { user.reload.email }.to(new_email)
+            .and change { user.reload.confirmed_at }.from(nil)
+            .and not_change { user.reload.approved }.from(false)
+          expect(TriggerWebhookWorker)
+            .to_not have_received(:perform_async).with('account.approved', 'Account', user.account_id)
+        end
+      end
+
+      context 'when the user requires explicit approval because of username' do
+        let(:user) { Fabricate(:user, confirmed_at: nil, unconfirmed_email: new_email, approved: false, account_attributes: { username: 'VeryStrangeUsername' }) }
+
+        before do
+          Setting.registrations_mode = 'open'
+          Fabricate(:username_block, username: 'StrangeUser', exact: false, allow_with_approval: true)
+        end
+
+        it 'sets email to new_email and marks user as confirmed, but not as approved and does not trigger `account.approved` web hook' do
+          expect { subject }
+            .to change { user.reload.email }.to(new_email)
+            .and change { user.reload.confirmed_at }.from(nil)
+            .and not_change { user.reload.approved }.from(false)
+          expect(TriggerWebhookWorker)
+            .to_not have_received(:perform_async).with('account.approved', 'Account', user.account_id)
+        end
+      end
+
+      context 'when registrations mode is approved' do
+        before { Setting.registrations_mode = 'approved' }
+
+        context 'when the user is already approved' do
+          before { user.approve! }
+
+          it 'sets email to unconfirmed_email and triggers `account.approved` web hook' do
+            expect { subject }
+              .to change { user.reload.email }.to(new_email)
+            expect(TriggerWebhookWorker)
+              .to have_received(:perform_async).with('account.approved', 'Account', user.account_id).once
+          end
+        end
+
+        context 'when the user is not approved' do
+          it 'sets email to unconfirmed_email and does not trigger web hook' do
+            expect { subject }
+              .to change { user.reload.email }.to(new_email)
+            expect(TriggerWebhookWorker)
+              .to_not have_received(:perform_async).with('account.approved', 'Account', user.account_id)
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/spec/support/examples/workers/fasp/delivery_failure.rb b/spec/support/examples/workers/fasp/delivery_failure.rb
new file mode 100644
index 00000000000..006d93e80d8
--- /dev/null
+++ b/spec/support/examples/workers/fasp/delivery_failure.rb
@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+RSpec.shared_examples 'worker handling fasp delivery failures' do
+  context 'when provider is not available' do
+    before do
+      provider.update(delivery_last_failed_at: 1.minute.ago)
+      domain = Addressable::URI.parse(provider.base_url).normalized_host
+      UnavailableDomain.create!(domain:)
+    end
+
+    it 'does not attempt connecting and does not fail the job' do
+      expect { subject }.to_not raise_error
+      expect(stubbed_request).to_not have_been_made
+    end
+  end
+
+  context 'when connection to provider fails' do
+    before do
+      base_stubbed_request
+        .to_raise(HTTP::ConnectionError)
+    end
+
+    context 'when provider becomes unavailable' do
+      before do
+        travel_to 5.minutes.ago
+        4.times do
+          provider.delivery_failure_tracker.track_failure!
+          travel_to 1.minute.since
+        end
+      end
+
+      it 'updates the provider and does not fail the job, so it will not be retried' do
+        expect { subject }.to_not raise_error
+        expect(provider.reload.delivery_last_failed_at).to eq Time.current
+      end
+    end
+
+    context 'when provider is still marked as available' do
+      it 'fails the job so it can be retried' do
+        expect { subject }.to raise_error(HTTP::ConnectionError)
+      end
+    end
+  end
+
+  context 'when connection to a previously unavailable provider succeeds' do
+    before do
+      provider.update(delivery_last_failed_at: 2.hours.ago)
+      domain = Addressable::URI.parse(provider.base_url).normalized_host
+      UnavailableDomain.create!(domain:)
+    end
+
+    it 'marks the provider as being available again' do
+      expect { subject }.to_not raise_error
+      expect(provider).to be_available
+    end
+  end
+end
diff --git a/spec/support/streaming_client.rb b/spec/support/streaming_client.rb
new file mode 100644
index 00000000000..02186e781c7
--- /dev/null
+++ b/spec/support/streaming_client.rb
@@ -0,0 +1,205 @@
+# frozen_string_literal: true
+
+require 'websocket/driver'
+
+class StreamingClient
+  module AUTHENTICATION
+    SUBPROTOCOL = 1
+    AUTHORIZATION_HEADER = 2
+    QUERY_PARAMETER = 3
+  end
+
+  class Connection
+    attr_reader :url, :messages, :last_error
+    attr_accessor :logger, :protocols
+
+    def initialize(url)
+      @uri = URI.parse(url)
+      @query_params = @uri.query.present? ? URI.decode_www_form(@uri.query).to_h : {}
+      @protocols = nil
+      @headers = {}
+
+      @dead = false
+
+      @events_queue = Thread::Queue.new
+      @messages = []
+      @last_error = nil
+    end
+
+    def set_header(key, value)
+      @headers[key] = value
+    end
+
+    def set_query_param(key, value)
+      @query_params[key] = value
+    end
+
+    def driver
+      return @driver if defined?(@driver)
+
+      @uri.query = URI.encode_www_form(@query_params)
+      @url = @uri.to_s
+      @tcp = TCPSocket.new(@uri.host, @uri.port)
+
+      @driver = WebSocket::Driver.client(self, {
+        protocols: @protocols,
+      })
+
+      @headers.each_pair do |key, value|
+        @driver.set_header(key, value)
+      end
+
+      at_exit do
+        @driver.close
+      end
+
+      @driver.on(:open) do
+        @events_queue.enq({ event: :opened })
+      end
+
+      @driver.on(:message) do |event|
+        @events_queue.enq({ event: :message, payload: event.data })
+        @messages << event.data
+      end
+
+      @driver.on(:error) do |event|
+        logger&.debug(event.message)
+        @events_queue.enq({ event: :error, payload: event })
+        @last_error = event
+      end
+
+      @driver.on(:close) do |event|
+        @events_queue.enq({ event: :closing, payload: event })
+        finalize(event)
+      end
+
+      @thread = Thread.new do
+        @driver.parse(@tcp.read(1)) until @dead || @tcp.closed?
+      rescue Errno::ECONNRESET
+        # Create a synthetic close event:
+        close_event = WebSocket::Driver::CloseEvent.new(
+          WebSocket::Driver::Hybi::ERRORS[:unexpected_condition],
+          'Connection reset'
+        )
+
+        finalize(close_event)
+      end
+
+      @driver
+    end
+
+    def wait_for_event(expected_event, timeout: 10)
+      Timeout.timeout(timeout) do
+        loop do
+          event = dequeue_event
+
+          return nil if event.nil? && @events_queue.closed?
+          return event[:payload] unless event.nil? || event[:event] != expected_event
+        end
+      end
+    end
+
+    def write(data)
+      @tcp.write(data)
+    rescue Errno::EPIPE => e
+      logger&.debug("EPIPE: #{e}")
+    end
+
+    def finalize(event)
+      @dead = true
+      @events_queue.enq({ event: :closed, payload: event })
+      @events_queue.close
+      @thread.kill
+    end
+
+    def dequeue_event
+      event = @events_queue.pop
+      logger&.debug(event) unless event.nil?
+      event
+    end
+  end
+
+  def initialize
+    @logger = Logger.new($stdout)
+    @logger.level = 'info'
+
+    @connection = Connection.new("ws://#{STREAMING_HOST}:#{STREAMING_PORT}/api/v1/streaming")
+    @connection.logger = @logger
+  end
+
+  def debug!
+    @logger.debug!
+  end
+
+  def authenticate(access_token, authentication_method = StreamingClient::AUTHENTICATION::SUBPROTOCOL)
+    raise 'Invalid access_token passed to StreamingClient, expected a string' unless access_token.is_a?(String)
+
+    case authentication_method
+    when AUTHENTICATION::QUERY_PARAMETER
+      @connection.set_query_param('access_token', access_token)
+    when AUTHENTICATION::SUBPROTOCOL
+      @connection.protocols = access_token
+    when AUTHENTICATION::AUTHORIZATION_HEADER
+      @connection.set_header('Authorization', "Bearer #{access_token}")
+    else
+      raise 'Invalid authentication method'
+    end
+  end
+
+  def connect
+    @connection.driver.start
+    @connection.wait_for_event(:opened)
+  end
+
+  def subscribe(channel, **params)
+    send(Oj.dump({ type: 'subscribe', stream: channel }.merge(params)))
+  end
+
+  def wait_for(event = nil)
+    @connection.wait_for_event(event)
+  end
+
+  def wait_for_message
+    message = @connection.wait_for_event(:message)
+    event = Oj.load(message)
+    event['payload'] = Oj.load(event['payload']) if event['payload']
+
+    event.deep_symbolize_keys
+  end
+
+  delegate :status, :state, to: :'@connection.driver'
+  delegate :messages, to: :@connection
+
+  def open?
+    state == :open
+  end
+
+  def closing?
+    state == :closing
+  end
+
+  def closed?
+    state == :closed
+  end
+
+  def send(message)
+    @connection.driver.text(message) if open?
+  end
+
+  def close
+    return if closed?
+
+    @connection.driver.close unless closing?
+    @connection.wait_for_event(:closed)
+  end
+end
+
+module StreamingClientHelper
+  def streaming_client
+    @streaming_client ||= StreamingClient.new
+  end
+end
+
+RSpec.configure do |config|
+  config.include StreamingClientHelper, :streaming
+end
diff --git a/spec/support/streaming_server_manager.rb b/spec/support/streaming_server_manager.rb
index d98f7dd9607..b565ed79a88 100644
--- a/spec/support/streaming_server_manager.rb
+++ b/spec/support/streaming_server_manager.rb
@@ -12,6 +12,11 @@ class StreamingServerManager
 
     queue = Queue.new
 
+    if ENV['DEBUG_STREAMING_SERVER'].present?
+      logger = Logger.new($stdout)
+      logger.level = 'debug'
+    end
+
     @queue = queue
 
     @running_thread = Thread.new do
@@ -31,7 +36,7 @@ class StreamingServerManager
         # Spawn a thread to listen on streaming server output
         output_thread = Thread.new do
           stdout_err.each_line do |line|
-            Rails.logger.info "Streaming server: #{line}"
+            logger&.info "Streaming server: #{line}"
 
             if status == :starting && line.match('Streaming API now listening on')
               status = :started
@@ -115,12 +120,12 @@ RSpec.configure do |config|
     self.use_transactional_tests = true
   end
 
-  private
-
   def streaming_server_manager
     @streaming_server_manager ||= StreamingServerManager.new
   end
 
+  private
+
   def streaming_examples_present?
     RSpec.world.filtered_examples.values.flatten.any? { |example| example.metadata[:streaming] == true }
   end
diff --git a/spec/system/admin/account_actions_spec.rb b/spec/system/admin/account_actions_spec.rb
index 787b988a0dc..abfd33dc272 100644
--- a/spec/system/admin/account_actions_spec.rb
+++ b/spec/system/admin/account_actions_spec.rb
@@ -15,6 +15,13 @@ RSpec.describe 'Admin Account Actions' do
       expect(page)
         .to have_title(I18n.t('admin.account_actions.title', acct: account.pretty_acct))
 
+      # Invalid submission
+      expect { submit_form }
+        .to_not(change { account.strikes.count })
+      expect(page)
+        .to have_content(/can't be blank/)
+
+      # Valid submission
       choose(option: 'silence')
       expect { submit_form }
         .to change { account.strikes.count }.by(1)
diff --git a/spec/system/admin/dashboard_spec.rb b/spec/system/admin/dashboard_spec.rb
index 06d31cde44e..d0cedd2ed19 100644
--- a/spec/system/admin/dashboard_spec.rb
+++ b/spec/system/admin/dashboard_spec.rb
@@ -9,6 +9,7 @@ RSpec.describe 'Admin Dashboard' do
     before do
       stub_system_checks
       Fabricate :software_update
+      Fabricate :tag, requested_review_at: 5.minutes.ago
       sign_in(user)
     end
 
@@ -18,6 +19,7 @@ RSpec.describe 'Admin Dashboard' do
       expect(page)
         .to have_title(I18n.t('admin.dashboard.title'))
         .and have_content(I18n.t('admin.system_checks.software_version_patch_check.message_html'))
+        .and have_content('0 pending hashtags')
     end
 
     private
diff --git a/spec/system/admin/domain_blocks_spec.rb b/spec/system/admin/domain_blocks_spec.rb
index 56a5d119844..c309e39a4fb 100644
--- a/spec/system/admin/domain_blocks_spec.rb
+++ b/spec/system/admin/domain_blocks_spec.rb
@@ -57,6 +57,30 @@ RSpec.describe 'blocking domains through the moderation interface' do
     end
   end
 
+  context 'when suspending an already suspended domain and using a lower severity' do
+    before { Fabricate :domain_block, domain: 'example.com', severity: 'silence' }
+
+    it 'warns about downgrade and does not update' do
+      visit new_admin_domain_block_path
+
+      submit_domain_block('example.com', 'noop')
+
+      expect(page)
+        .to have_content(/You have already imposed stricter limits on example.com/)
+    end
+  end
+
+  context 'when failing to provide a domain value' do
+    it 'provides an error about the missing value' do
+      visit new_admin_domain_block_path
+
+      submit_domain_block('', 'noop')
+
+      expect(page)
+        .to have_content(/review the error below/)
+    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')
diff --git a/spec/system/admin/terms_of_service/drafts_spec.rb b/spec/system/admin/terms_of_service/drafts_spec.rb
index cf4c10ce00f..d8c4a3d7f4d 100644
--- a/spec/system/admin/terms_of_service/drafts_spec.rb
+++ b/spec/system/admin/terms_of_service/drafts_spec.rb
@@ -8,34 +8,75 @@ RSpec.describe 'Admin TermsOfService Drafts' do
   before { sign_in(admin_user) }
 
   describe 'Managing TOS drafts' do
-    let!(:terms) { Fabricate :terms_of_service, published_at: nil }
+    context 'when a draft TOS record exists' do
+      let!(:terms) { Fabricate :terms_of_service, published_at: nil }
 
-    it 'saves and publishes TOS drafts' do
-      visit admin_terms_of_service_draft_path
-      expect(page)
-        .to have_title(I18n.t('admin.terms_of_service.title'))
+      it 'saves and publishes TOS drafts' do
+        visit admin_terms_of_service_draft_path
+        expect(page)
+          .to have_title(I18n.t('admin.terms_of_service.title'))
 
-      # Invalid submission
-      expect { click_on I18n.t('admin.terms_of_service.save_draft') }
-        .to_not(change { terms.reload.published_at })
-      expect(page)
-        .to have_title(I18n.t('admin.terms_of_service.title'))
+        # Invalid submission
+        expect { click_on I18n.t('admin.terms_of_service.save_draft') }
+          .to_not(change { terms.reload.published_at })
+        expect(page)
+          .to have_title(I18n.t('admin.terms_of_service.title'))
 
-      # Valid submission with draft button
-      fill_in 'terms_of_service_text', with: 'new'
-      expect { click_on I18n.t('admin.terms_of_service.save_draft') }
-        .to not_change { terms.reload.published_at }.from(nil)
-        .and not_change(Admin::ActionLog, :count)
-      expect(page)
-        .to have_title(I18n.t('admin.terms_of_service.title'))
+        # Valid submission with draft button
+        fill_in 'terms_of_service_text', with: 'new'
+        expect { click_on I18n.t('admin.terms_of_service.save_draft') }
+          .to not_change { terms.reload.published_at }.from(nil)
+          .and not_change(Admin::ActionLog, :count)
+        expect(page)
+          .to have_title(I18n.t('admin.terms_of_service.title'))
 
-      # Valid with publish button
-      fill_in 'terms_of_service_text', with: 'newer'
-      expect { click_on I18n.t('admin.terms_of_service.publish') }
-        .to change { terms.reload.published_at }.from(nil)
-        .and change(Admin::ActionLog, :count)
-      expect(page)
-        .to have_title(I18n.t('admin.terms_of_service.title'))
+        # Valid with publish button
+        fill_in 'terms_of_service_text', with: 'newer'
+        expect { click_on I18n.t('admin.terms_of_service.publish') }
+          .to change { terms.reload.published_at }.from(nil)
+          .and change(Admin::ActionLog, :count)
+        expect(page)
+          .to have_title(I18n.t('admin.terms_of_service.title'))
+      end
+    end
+
+    context 'when a live TOS record exists' do
+      before do
+        travel_to 5.days.ago do
+          Fabricate :terms_of_service, published_at: 2.days.ago, effective_date: 1.day.from_now
+        end
+      end
+
+      it 'populates an unsaved record with prior text' do
+        visit admin_terms_of_service_draft_path
+        expect(page)
+          .to have_title(I18n.t('admin.terms_of_service.title'))
+
+        # Valid submission with draft button
+        expect { click_on I18n.t('admin.terms_of_service.save_draft') }
+          .to change(TermsOfService, :count).by(1)
+          .and not_change(Admin::ActionLog, :count)
+        expect(TermsOfService.current.text)
+          .to eq(TermsOfService.draft.last.text)
+        expect(page)
+          .to have_title(I18n.t('admin.terms_of_service.title'))
+      end
+    end
+
+    context 'when there are no TOS records' do
+      it 'builds an unsaved record for editing' do
+        visit admin_terms_of_service_draft_path
+        expect(page)
+          .to have_title(I18n.t('admin.terms_of_service.title'))
+
+        # Valid submission with draft button
+        fill_in 'terms_of_service_text', with: 'new'
+        expect { click_on I18n.t('admin.terms_of_service.save_draft') }
+          .to change(TermsOfService, :count).by(1)
+          .and not_change(Admin::ActionLog, :count)
+        expect(page)
+          .to have_title(I18n.t('admin.terms_of_service.title'))
+      end
     end
   end
 end
diff --git a/spec/system/auth/registrations_spec.rb b/spec/system/auth/registrations_spec.rb
new file mode 100644
index 00000000000..4c08bf47eea
--- /dev/null
+++ b/spec/system/auth/registrations_spec.rb
@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Auth Registration' do
+  context 'when age verification is enabled' do
+    before { Setting.min_age = 16 }
+
+    context 'when date of birth is below age limit' do
+      let(:date_of_birth) { 13.years.ago }
+
+      it 'does not create user record and displays errors' do
+        visit new_user_registration_path
+        expect(page)
+          .to have_title(I18n.t('auth.register'))
+
+        expect { fill_in_and_submit_form }
+          .to not_change(User, :count)
+        expect(page)
+          .to have_content(/error below/)
+      end
+    end
+
+    context 'when date of birth is above age limit' do
+      let(:date_of_birth) { 17.years.ago }
+
+      it 'creates user and marks as verified' do
+        visit new_user_registration_path
+        expect(page)
+          .to have_title(I18n.t('auth.register'))
+
+        expect { fill_in_and_submit_form }
+          .to change(User, :count).by(1)
+        expect(User.last)
+          .to have_attributes(email: 'test@example.com', age_verified_at: be_present)
+        expect(page)
+          .to have_content(I18n.t('auth.setup.title'))
+      end
+    end
+
+    def fill_in_and_submit_form
+      # Avoid the registration spam check
+      travel_to 10.seconds.from_now
+
+      fill_in 'user_account_attributes_username', with: 'test'
+      fill_in 'user_email', with: 'test@example.com'
+      fill_in 'user_password', with: 'Test.123.Pass'
+      fill_in 'user_password_confirmation', with: 'Test.123.Pass'
+      check 'user_agreement'
+
+      find('input[aria-label="Day"]').fill_in with: date_of_birth.day
+      find('input[autocomplete="bday-month"]').fill_in with: date_of_birth.month
+      find('input[autocomplete="bday-year"]').fill_in with: date_of_birth.year
+
+      click_on I18n.t('auth.register')
+    end
+  end
+end
diff --git a/spec/system/filters_spec.rb b/spec/system/filters_spec.rb
index dac04d5b6c0..652a1a3f234 100644
--- a/spec/system/filters_spec.rb
+++ b/spec/system/filters_spec.rb
@@ -53,8 +53,8 @@ RSpec.describe 'Filters' do
       click_on filter_title
 
       fill_in filter_title_field, with: new_title
-      fill_in 'custom_filter_keywords_attributes_0_keyword', with: 'New value'
-      fill_in 'custom_filter_keywords_attributes_1_keyword', with: 'Wilderness'
+      custom_filter_keywords_fields.first.fill_in with: 'New value'
+      custom_filter_keywords_fields.last.fill_in with: 'Wilderness'
 
       expect { click_on submit_button }
         .to change { keyword_one.reload.keyword }.to(/New value/)
@@ -107,6 +107,10 @@ RSpec.describe 'Filters' do
     click_on I18n.t('filters.new.save')
   end
 
+  def custom_filter_keywords_fields
+    page.all('.keywords-table .custom_filter_keywords_keyword')
+  end
+
   def filter_title_field
     form_label('defaults.title')
   end
diff --git a/spec/system/profile_spec.rb b/spec/system/profile_spec.rb
index 21bdb712edb..eb0aed15935 100644
--- a/spec/system/profile_spec.rb
+++ b/spec/system/profile_spec.rb
@@ -23,11 +23,11 @@ RSpec.describe 'Profile' do
     fill_in 'Display name', with: 'Bob'
     fill_in 'Bio', with: 'Bob is silent'
 
-    fill_in 'account_fields_attributes_0_name', with: 'Personal Website'
-    fill_in 'account_fields_attributes_0_value', with: 'https://host.example/personal'
+    account_fields_labels.first.fill_in with: 'Personal Website'
+    account_fields_values.first.fill_in with: 'https://host.example/personal'
 
-    fill_in 'account_fields_attributes_1_name', with: 'Professional Biography'
-    fill_in 'account_fields_attributes_1_value', with: 'https://host.example/pro'
+    account_fields_labels.last.fill_in with: 'Professional Biography'
+    account_fields_values.last.fill_in with: 'https://host.example/pro'
 
     expect { submit_form }
       .to change { bob.account.reload.display_name }.to('Bob')
@@ -40,6 +40,14 @@ RSpec.describe 'Profile' do
     first('button[type=submit]').click
   end
 
+  def account_fields_labels
+    page.all('.account_fields_name input')
+  end
+
+  def account_fields_values
+    page.all('.account_fields_value input')
+  end
+
   def change_account_fields
     change { bob.account.reload.fields }
       .from([])
diff --git a/spec/system/settings/applications_spec.rb b/spec/system/settings/applications_spec.rb
index a97d5d8aab9..62656c2b8e0 100644
--- a/spec/system/settings/applications_spec.rb
+++ b/spec/system/settings/applications_spec.rb
@@ -130,14 +130,19 @@ RSpec.describe 'Settings applications page' do
 
   describe 'Regenerating an app token' do
     it 'updates the app token' do
-      visit settings_application_path(application)
+      expect { visit settings_application_path(application) }
+        .to change(user_application_token, :first).from(be_nil).to(be_present)
 
       expect { regenerate_token }
-        .to(change { user.token_for_app(application) })
+        .to(change { user_application_token.first.token })
       expect(page)
         .to have_content(I18n.t('applications.token_regenerated'))
     end
 
+    def user_application_token
+      Doorkeeper::AccessToken.where(application:).where(resource_owner_id: user)
+    end
+
     def regenerate_token
       click_on I18n.t('applications.regenerate_token')
     end
diff --git a/spec/system/settings/preferences/other_spec.rb b/spec/system/settings/preferences/other_spec.rb
index d741ec1ad2d..762233b9e5a 100644
--- a/spec/system/settings/preferences/other_spec.rb
+++ b/spec/system/settings/preferences/other_spec.rb
@@ -15,11 +15,9 @@ RSpec.describe 'Settings preferences other page' do
 
     check language_field(:es)
     check language_field(:fr)
-    check mark_sensitive_field
 
     expect { save_changes }
       .to change { user.reload.chosen_languages }.to(%w(es fr))
-      .and(change { user.reload.settings.default_sensitive }.to(true))
     expect(page)
       .to have_title(I18n.t('settings.preferences'))
   end
@@ -28,10 +26,6 @@ RSpec.describe 'Settings preferences other page' do
     within('form') { click_on submit_button }
   end
 
-  def mark_sensitive_field
-    form_label('defaults.setting_default_sensitive')
-  end
-
   def language_field(key)
     LanguagesHelper::SUPPORTED_LOCALES[key].last
   end
diff --git a/spec/system/settings/preferences/posting_defaults_spec.rb b/spec/system/settings/preferences/posting_defaults_spec.rb
new file mode 100644
index 00000000000..583958f96b3
--- /dev/null
+++ b/spec/system/settings/preferences/posting_defaults_spec.rb
@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Settings preferences posting defaults page' do
+  let(:user) { Fabricate :user }
+
+  before { sign_in user }
+
+  it 'Views and updates user prefs' do
+    visit settings_preferences_posting_defaults_path
+
+    expect(page)
+      .to have_private_cache_control
+
+    check mark_sensitive_field
+
+    expect { save_changes }
+      .to change { user.reload.settings.default_sensitive }.to(true)
+    expect(page)
+      .to have_title(I18n.t('preferences.posting_defaults'))
+  end
+
+  def save_changes
+    click_on submit_button
+  end
+
+  def mark_sensitive_field
+    form_label('defaults.setting_default_sensitive')
+  end
+end
diff --git a/spec/system/share_entrypoint_spec.rb b/spec/system/share_entrypoint_spec.rb
index b55ea316575..0f07d96efeb 100644
--- a/spec/system/share_entrypoint_spec.rb
+++ b/spec/system/share_entrypoint_spec.rb
@@ -23,7 +23,7 @@ RSpec.describe 'Share page', :js, :streaming do
     fill_in_form
 
     expect(page)
-      .to have_css('.notification-bar-message', text: frontend_translations('compose.published.body'))
+      .to have_current_path(%r{/@bob/[0-9]+})
   end
 
   def fill_in_form
diff --git a/spec/system/streaming/channel_subscriptions_spec.rb b/spec/system/streaming/channel_subscriptions_spec.rb
new file mode 100644
index 00000000000..447ea64f22f
--- /dev/null
+++ b/spec/system/streaming/channel_subscriptions_spec.rb
@@ -0,0 +1,144 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Channel Subscriptions', :inline_jobs, :streaming do
+  let(:application) { Fabricate(:application, confidential: false) }
+  let(:scopes) { nil }
+  let(:access_token) { Fabricate(:accessible_access_token, resource_owner_id: user_account.user.id, application: application, scopes: scopes) }
+
+  let(:user_account) { Fabricate(:account, username: 'alice', domain: nil) }
+  let(:bob_account) { Fabricate(:account, username: 'bob') }
+
+  after do
+    streaming_client.close
+  end
+
+  context 'when the access token has insufficient scope to read statuses' do
+    let(:scopes) { 'profile' }
+
+    it 'cannot subscribe to the public:local channel' do
+      streaming_client.authenticate(access_token.token)
+
+      streaming_client.connect
+      streaming_client.subscribe('public:local')
+
+      # Receive the error back from the subscription attempt:
+      message = streaming_client.wait_for_message
+
+      expect(message).to include(
+        error: 'Access token does not have the required scopes',
+        status: 401
+      )
+    end
+  end
+
+  context 'when the access token has read scope' do
+    let(:scopes) { 'read' }
+
+    it 'can subscribing to the public:local channel' do
+      streaming_client.authenticate(access_token.token)
+
+      streaming_client.connect
+      streaming_client.subscribe('public:local')
+
+      # We need to publish a status as there is no positive acknowledgement of
+      # subscriptions:
+      status = PostStatusService.new.call(bob_account, text: 'Hello @alice')
+
+      # And then we want to receive that status:
+      message = streaming_client.wait_for_message
+
+      expect(message).to include(
+        stream: be_an(Array).and(contain_exactly('public:local')),
+        event: 'update',
+        payload: include(
+          id: status.id.to_s
+        )
+      )
+    end
+
+    it 'can subscribing to the user:notifications channel' do
+      streaming_client.authenticate(access_token.token)
+
+      streaming_client.connect
+      streaming_client.subscribe('user:notification')
+
+      # We need to perform an action that triggers a notification as there is
+      # no positive acknowledgement of subscriptions:
+      first_status = PostStatusService.new.call(user_account, text: 'Test')
+      ReblogService.new.call(bob_account, first_status)
+
+      message = streaming_client.wait_for_message
+
+      expect(message).to include(
+        event: 'notification',
+        stream: ['user:notification']
+      )
+    end
+  end
+
+  context 'when the access token has read:statuses scope' do
+    let(:scopes) { 'read:statuses' }
+
+    it 'can subscribing to the public:local channel' do
+      streaming_client.authenticate(access_token.token)
+
+      streaming_client.connect
+      streaming_client.subscribe('public:local')
+
+      # We need to publish a status as there is no positive acknowledgement of
+      # subscriptions:
+      status = PostStatusService.new.call(bob_account, text: 'Hello @alice')
+
+      # And then we want to receive that status:
+      message = streaming_client.wait_for_message
+
+      expect(message).to include(
+        stream: be_an(Array).and(contain_exactly('public:local')),
+        event: 'update',
+        payload: include(
+          id: status.id.to_s
+        )
+      )
+    end
+
+    it 'cannot subscribing to the user:notifications channel' do
+      streaming_client.authenticate(access_token.token)
+
+      streaming_client.connect
+      streaming_client.subscribe('user:notification')
+
+      # We should receive an error back immediately:
+      message = streaming_client.wait_for_message
+
+      expect(message).to include(
+        error: 'Access token does not have the required scopes',
+        status: 401
+      )
+    end
+  end
+
+  context 'when the access token has read:notifications scope' do
+    let(:scopes) { 'read:notifications' }
+
+    it 'can subscribing to the user:notifications channel' do
+      streaming_client.authenticate(access_token.token)
+
+      streaming_client.connect
+      streaming_client.subscribe('user:notification')
+
+      # We need to perform an action that triggers a notification as there is
+      # no positive acknowledgement of subscriptions:
+      first_status = PostStatusService.new.call(user_account, text: 'Test')
+      ReblogService.new.call(bob_account, first_status)
+
+      message = streaming_client.wait_for_message
+
+      expect(message).to include(
+        event: 'notification',
+        stream: ['user:notification']
+      )
+    end
+  end
+end
diff --git a/spec/system/streaming/streaming_spec.rb b/spec/system/streaming/streaming_spec.rb
new file mode 100644
index 00000000000..f5d3ba11426
--- /dev/null
+++ b/spec/system/streaming/streaming_spec.rb
@@ -0,0 +1,125 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+RSpec.describe 'Streaming', :inline_jobs, :streaming do
+  let(:authentication_method) { StreamingClient::AUTHENTICATION::SUBPROTOCOL }
+  let(:user) { Fabricate(:user) }
+  let(:scopes) { '' }
+  let(:application) { Fabricate(:application, confidential: false) }
+  let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, application: application, scopes: scopes) }
+  let(:access_token) { token.token }
+
+  before do
+    streaming_client.authenticate(access_token, authentication_method)
+  end
+
+  after do
+    streaming_client.close
+  end
+
+  context 'when authenticating via subprotocol' do
+    it 'is able to connect' do
+      streaming_client.connect
+
+      expect(streaming_client.status).to eq(101)
+      expect(streaming_client.open?).to be(true)
+    end
+  end
+
+  context 'when authenticating via authorization header' do
+    let(:authentication_method) { StreamingClient::AUTHENTICATION::AUTHORIZATION_HEADER }
+
+    it 'is able to connect successfully' do
+      streaming_client.connect
+
+      expect(streaming_client.status).to eq(101)
+      expect(streaming_client.open?).to be(true)
+    end
+  end
+
+  context 'when authenticating via query parameter' do
+    let(:authentication_method) { StreamingClient::AUTHENTICATION::QUERY_PARAMETER }
+
+    it 'is able to connect successfully' do
+      streaming_client.connect
+
+      expect(streaming_client.status).to eq(101)
+      expect(streaming_client.open?).to be(true)
+    end
+  end
+
+  context 'with a revoked access token' do
+    before do
+      token.revoke
+    end
+
+    it 'receives an 401 unauthorized error' do
+      streaming_client.connect
+
+      expect(streaming_client.status).to eq(401)
+      expect(streaming_client.open?).to be(false)
+    end
+  end
+
+  context 'when revoking an access token after connection' do
+    it 'disconnects the client' do
+      streaming_client.connect
+
+      expect(streaming_client.status).to eq(101)
+      expect(streaming_client.open?).to be(true)
+
+      token.revoke
+
+      expect(streaming_client.wait_for(:closed).code).to be(1000)
+      expect(streaming_client.open?).to be(false)
+    end
+  end
+
+  context 'with a disabled user account' do
+    before do
+      user.disable!
+    end
+
+    it 'receives an 401 unauthorized error when trying to connect' do
+      streaming_client.connect
+
+      expect(streaming_client.status).to eq(401)
+      expect(streaming_client.open?).to be(false)
+    end
+  end
+
+  context 'when the user account is disabled whilst connected' do
+    it 'terminates the connection for the user' do
+      streaming_client.connect
+
+      user.disable!
+
+      expect(streaming_client.wait_for(:closed).code).to be(1000)
+      expect(streaming_client.open?).to be(false)
+    end
+  end
+
+  context 'with a suspended user account' do
+    before do
+      user.account.suspend!
+    end
+
+    it 'receives an 401 unauthorized error when trying to connect' do
+      streaming_client.connect
+
+      expect(streaming_client.status).to eq(401)
+      expect(streaming_client.open?).to be(false)
+    end
+  end
+
+  context 'when the user account is suspended whilst connected' do
+    it 'terminates the connection for the user' do
+      streaming_client.connect
+
+      user.account.suspend!
+
+      expect(streaming_client.wait_for(:closed).code).to be(1000)
+      expect(streaming_client.open?).to be(false)
+    end
+  end
+end
diff --git a/spec/validators/existing_username_validator_spec.rb b/spec/validators/existing_username_validator_spec.rb
index 25ecb1fbcde..ab5be524534 100644
--- a/spec/validators/existing_username_validator_spec.rb
+++ b/spec/validators/existing_username_validator_spec.rb
@@ -6,6 +6,7 @@ RSpec.describe ExistingUsernameValidator do
   let(:record_class) do
     Class.new do
       include ActiveModel::Validations
+
       attr_accessor :contact, :friends
 
       def self.name
diff --git a/spec/validators/language_validator_spec.rb b/spec/validators/language_validator_spec.rb
index 19e55f34672..d19b33f27f8 100644
--- a/spec/validators/language_validator_spec.rb
+++ b/spec/validators/language_validator_spec.rb
@@ -6,6 +6,7 @@ RSpec.describe LanguageValidator do
   let(:record_class) do
     Class.new do
       include ActiveModel::Validations
+
       attr_accessor :locale
 
       validates :locale, language: true
diff --git a/spec/validators/unreserved_username_validator_spec.rb b/spec/validators/unreserved_username_validator_spec.rb
index ad1092109db..55dca7db844 100644
--- a/spec/validators/unreserved_username_validator_spec.rb
+++ b/spec/validators/unreserved_username_validator_spec.rb
@@ -6,11 +6,17 @@ RSpec.describe UnreservedUsernameValidator do
   let(:record_class) do
     Class.new do
       include ActiveModel::Validations
+
       attr_accessor :username
 
       validates_with UnreservedUsernameValidator
+
+      def self.name
+        'Foo'
+      end
     end
   end
+
   let(:record) { record_class.new }
 
   describe '#validate' do
@@ -113,7 +119,7 @@ RSpec.describe UnreservedUsernameValidator do
         end
 
         def stub_reserved_usernames(value)
-          allow(Setting).to receive(:[]).with('reserved_usernames').and_return(value)
+          value&.each { |str| Fabricate(:username_block, username: str, exact: true) }
         end
       end
     end
diff --git a/spec/validators/url_validator_spec.rb b/spec/validators/url_validator_spec.rb
index 2297dddaa01..55c0347d18e 100644
--- a/spec/validators/url_validator_spec.rb
+++ b/spec/validators/url_validator_spec.rb
@@ -6,6 +6,7 @@ RSpec.describe URLValidator do
   let(:record_class) do
     Class.new do
       include ActiveModel::Validations
+
       attr_accessor :profile
 
       validates :profile, url: true
diff --git a/spec/workers/activitypub/delivery_worker_spec.rb b/spec/workers/activitypub/delivery_worker_spec.rb
index 9e6805c68b4..a1eb7ebfa99 100644
--- a/spec/workers/activitypub/delivery_worker_spec.rb
+++ b/spec/workers/activitypub/delivery_worker_spec.rb
@@ -25,12 +25,23 @@ RSpec.describe ActivityPub::DeliveryWorker do
           .to have_been_made.once
       end
 
+      context 'when using a numeric ID based scheme' do
+        let(:sender) { Fabricate(:account, id_scheme: :numeric_ap_id) }
+
+        it 'performs a request to synchronize collection' do
+          subject.perform(payload, sender.id, url, { synchronize_followers: true })
+
+          expect(request_to_url)
+            .to have_been_made.once
+        end
+      end
+
       def request_to_url
         a_request(:post, url)
           .with(
             headers: {
               'Collection-Synchronization' => <<~VALUES.squish,
-                collectionId="#{account_followers_url(sender)}", digest="somehash", url="#{account_followers_synchronization_url(sender)}"
+                collectionId="#{ActivityPub::TagManager.instance.followers_uri_for(sender)}", digest="somehash", url="#{account_followers_synchronization_url(sender)}"
               VALUES
             }
           )
diff --git a/spec/workers/activitypub/fetch_all_replies_worker_spec.rb b/spec/workers/activitypub/fetch_all_replies_worker_spec.rb
index 9a8bdac0307..9795c4619a1 100644
--- a/spec/workers/activitypub/fetch_all_replies_worker_spec.rb
+++ b/spec/workers/activitypub/fetch_all_replies_worker_spec.rb
@@ -123,7 +123,6 @@ RSpec.describe ActivityPub::FetchAllRepliesWorker do
   end
 
   before do
-    stub_const('Status::FetchRepliesConcern::FETCH_REPLIES_ENABLED', true)
     all_items.each do |item|
       next if [top_note_uri, reply_note_uri].include? item
 
diff --git a/spec/workers/activitypub/followers_synchronization_worker_spec.rb b/spec/workers/activitypub/followers_synchronization_worker_spec.rb
index 0847b247e37..046a3e87abe 100644
--- a/spec/workers/activitypub/followers_synchronization_worker_spec.rb
+++ b/spec/workers/activitypub/followers_synchronization_worker_spec.rb
@@ -15,7 +15,13 @@ RSpec.describe ActivityPub::FollowersSynchronizationWorker do
     it 'sends the status to the service' do
       worker.perform(account.id, url)
 
-      expect(service).to have_received(:call).with(account, url)
+      expect(service).to have_received(:call).with(account, url, nil)
+    end
+
+    it 'sends the status to the service with the passed digest' do
+      worker.perform(account.id, url, 'digest-123')
+
+      expect(service).to have_received(:call).with(account, url, 'digest-123')
     end
 
     it 'returns nil for non-existent record' do
diff --git a/spec/workers/activitypub/quote_request_worker_spec.rb b/spec/workers/activitypub/quote_request_worker_spec.rb
new file mode 100644
index 00000000000..b0e10aeffc3
--- /dev/null
+++ b/spec/workers/activitypub/quote_request_worker_spec.rb
@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe ActivityPub::QuoteRequestWorker do
+  subject { described_class.new }
+
+  let(:quoted_account) { Fabricate(:account, inbox_url: 'http://example.com', domain: 'example.com') }
+  let(:quoted_status) { Fabricate(:status, account: quoted_account) }
+  let(:status) { Fabricate(:status, text: 'foo') }
+  let(:quote) { Fabricate(:quote, status: status, quoted_status: quoted_status, activity_uri: 'TODO') } # TODO: activity URI
+
+  describe '#perform' do
+    it 'sends the expected QuoteRequest activity' do
+      subject.perform(quote.id)
+
+      expect(ActivityPub::DeliveryWorker)
+        .to have_enqueued_sidekiq_job(match_object_shape, quote.account_id, 'http://example.com', {})
+    end
+
+    def match_object_shape
+      match_json_values(
+        type: 'QuoteRequest',
+        actor: ActivityPub::TagManager.instance.uri_for(quote.account),
+        object: ActivityPub::TagManager.instance.uri_for(quoted_status),
+        instrument: a_hash_including(
+          id: ActivityPub::TagManager.instance.uri_for(status)
+        )
+      )
+    end
+  end
+end
diff --git a/spec/workers/activitypub/status_update_distribution_worker_spec.rb b/spec/workers/activitypub/status_update_distribution_worker_spec.rb
index e9a70d11d19..58d11db41cb 100644
--- a/spec/workers/activitypub/status_update_distribution_worker_spec.rb
+++ b/spec/workers/activitypub/status_update_distribution_worker_spec.rb
@@ -9,36 +9,64 @@ RSpec.describe ActivityPub::StatusUpdateDistributionWorker do
   let(:follower) { Fabricate(:account, protocol: :activitypub, inbox_url: 'http://example.com', domain: 'example.com') }
 
   describe '#perform' do
-    before do
-      follower.follow!(status.account)
-
-      status.snapshot!
-      status.text = 'bar'
-      status.edited_at = Time.now.utc
-      status.snapshot!
-      status.save!
-    end
-
-    context 'with public status' do
+    context 'with an explicitly edited status' do
       before do
-        status.update(visibility: :public)
+        follower.follow!(status.account)
+
+        status.snapshot!
+        status.text = 'bar'
+        status.edited_at = Time.now.utc
+        status.snapshot!
+        status.save!
       end
 
-      it 'delivers to followers' do
-        expect_push_bulk_to_match(ActivityPub::DeliveryWorker, [[match_json_values(type: 'Update'), status.account.id, 'http://example.com', anything]]) do
-          subject.perform(status.id)
+      context 'with public status' do
+        before do
+          status.update(visibility: :public)
+        end
+
+        it 'delivers to followers' do
+          expect { subject.perform(status.id) }
+            .to enqueue_sidekiq_job(ActivityPub::DeliveryWorker).with(match_json_values(type: 'Update'), status.account_id, 'http://example.com', anything)
+        end
+      end
+
+      context 'with private status' do
+        before do
+          status.update(visibility: :private)
+        end
+
+        it 'delivers to followers' do
+          expect { subject.perform(status.id) }
+            .to enqueue_sidekiq_job(ActivityPub::DeliveryWorker).with(match_json_values(type: 'Update'), status.account_id, 'http://example.com', anything)
         end
       end
     end
 
-    context 'with private status' do
+    context 'with an implicitly edited status' do
       before do
-        status.update(visibility: :private)
+        follower.follow!(status.account)
       end
 
-      it 'delivers to followers' do
-        expect_push_bulk_to_match(ActivityPub::DeliveryWorker, [[match_json_values(type: 'Update'), status.account.id, 'http://example.com', anything]]) do
-          subject.perform(status.id)
+      context 'with public status' do
+        before do
+          status.update(visibility: :public)
+        end
+
+        it 'delivers to followers' do
+          expect { subject.perform(status.id, { 'updated_at' => Time.now.utc.iso8601 }) }
+            .to enqueue_sidekiq_job(ActivityPub::DeliveryWorker).with(match_json_values(type: 'Update'), status.account_id, 'http://example.com', anything)
+        end
+      end
+
+      context 'with private status' do
+        before do
+          status.update(visibility: :private)
+        end
+
+        it 'delivers to followers' do
+          expect { subject.perform(status.id, { 'updated_at' => Time.now.utc.iso8601 }) }
+            .to enqueue_sidekiq_job(ActivityPub::DeliveryWorker).with(match_json_values(type: 'Update'), status.account_id, 'http://example.com', anything)
         end
       end
     end
diff --git a/spec/workers/fasp/account_search_worker_spec.rb b/spec/workers/fasp/account_search_worker_spec.rb
index a96ba0c23b3..1c543b62ae0 100644
--- a/spec/workers/fasp/account_search_worker_spec.rb
+++ b/spec/workers/fasp/account_search_worker_spec.rb
@@ -5,12 +5,14 @@ require 'rails_helper'
 RSpec.describe Fasp::AccountSearchWorker, feature: :fasp do
   include ProviderRequestHelper
 
+  subject { described_class.new.perform('cats') }
+
   let(:provider) { Fabricate(:account_search_fasp) }
   let(:account) { Fabricate(:account) }
   let(:fetch_service) { instance_double(ActivityPub::FetchRemoteActorService, call: true) }
+  let(:path) { '/account_search/v0/search?term=cats&limit=10' }
 
   let!(:stubbed_request) do
-    path = '/account_search/v0/search?term=cats&limit=10'
     stub_provider_request(provider,
                           method: :get,
                           path:,
@@ -25,7 +27,7 @@ RSpec.describe Fasp::AccountSearchWorker, feature: :fasp do
   end
 
   it 'requests search results and fetches received account uris' do
-    described_class.new.perform('cats')
+    subject
 
     expect(stubbed_request).to have_been_made
     expect(fetch_service).to have_received(:call).with('https://fedi.example.com/accounts/2')
@@ -35,7 +37,7 @@ RSpec.describe Fasp::AccountSearchWorker, feature: :fasp do
   it 'marks a running async refresh as finished' do
     async_refresh = AsyncRefresh.create("fasp:account_search:#{Digest::MD5.base64digest('cats')}", count_results: true)
 
-    described_class.new.perform('cats')
+    subject
 
     expect(async_refresh.reload).to be_finished
   end
@@ -43,8 +45,16 @@ RSpec.describe Fasp::AccountSearchWorker, feature: :fasp do
   it 'tracks the number of fetched accounts in the async refresh' do
     async_refresh = AsyncRefresh.create("fasp:account_search:#{Digest::MD5.base64digest('cats')}", count_results: true)
 
-    described_class.new.perform('cats')
+    subject
 
     expect(async_refresh.reload.result_count).to eq 2
   end
+
+  describe 'provider delivery failure handling' do
+    let(:base_stubbed_request) do
+      stub_request(:get, provider.url(path))
+    end
+
+    it_behaves_like('worker handling fasp delivery failures')
+  end
 end
diff --git a/spec/workers/fasp/announce_account_lifecycle_event_worker_spec.rb b/spec/workers/fasp/announce_account_lifecycle_event_worker_spec.rb
index 0d4a8708757..b89d4fe6587 100644
--- a/spec/workers/fasp/announce_account_lifecycle_event_worker_spec.rb
+++ b/spec/workers/fasp/announce_account_lifecycle_event_worker_spec.rb
@@ -5,15 +5,19 @@ require 'rails_helper'
 RSpec.describe Fasp::AnnounceAccountLifecycleEventWorker do
   include ProviderRequestHelper
 
+  subject { described_class.new.perform(account_uri, 'new') }
+
   let(:account_uri) { 'https://masto.example.com/accounts/1' }
   let(:subscription) do
     Fabricate(:fasp_subscription, category: 'account')
   end
   let(:provider) { subscription.fasp_provider }
+  let(:path) { '/data_sharing/v0/announcements' }
+
   let!(:stubbed_request) do
     stub_provider_request(provider,
                           method: :post,
-                          path: '/data_sharing/v0/announcements',
+                          path:,
                           response_body: {
                             source: {
                               subscription: {
@@ -27,8 +31,16 @@ RSpec.describe Fasp::AnnounceAccountLifecycleEventWorker do
   end
 
   it 'sends the account uri to subscribed providers' do
-    described_class.new.perform(account_uri, 'new')
+    subject
 
     expect(stubbed_request).to have_been_made
   end
+
+  describe 'provider delivery failure handling' do
+    let(:base_stubbed_request) do
+      stub_request(:post, provider.url(path))
+    end
+
+    it_behaves_like('worker handling fasp delivery failures')
+  end
 end
diff --git a/spec/workers/fasp/announce_content_lifecycle_event_worker_spec.rb b/spec/workers/fasp/announce_content_lifecycle_event_worker_spec.rb
index 60618607c95..6ff5a9f7712 100644
--- a/spec/workers/fasp/announce_content_lifecycle_event_worker_spec.rb
+++ b/spec/workers/fasp/announce_content_lifecycle_event_worker_spec.rb
@@ -5,15 +5,19 @@ require 'rails_helper'
 RSpec.describe Fasp::AnnounceContentLifecycleEventWorker do
   include ProviderRequestHelper
 
+  subject { described_class.new.perform(status_uri, 'new') }
+
   let(:status_uri) { 'https://masto.example.com/status/1' }
   let(:subscription) do
     Fabricate(:fasp_subscription)
   end
   let(:provider) { subscription.fasp_provider }
+  let(:path) { '/data_sharing/v0/announcements' }
+
   let!(:stubbed_request) do
     stub_provider_request(provider,
                           method: :post,
-                          path: '/data_sharing/v0/announcements',
+                          path:,
                           response_body: {
                             source: {
                               subscription: {
@@ -27,8 +31,16 @@ RSpec.describe Fasp::AnnounceContentLifecycleEventWorker do
   end
 
   it 'sends the status uri to subscribed providers' do
-    described_class.new.perform(status_uri, 'new')
+    subject
 
     expect(stubbed_request).to have_been_made
   end
+
+  describe 'provider delivery failure handling' do
+    let(:base_stubbed_request) do
+      stub_request(:post, provider.url(path))
+    end
+
+    it_behaves_like('worker handling fasp delivery failures')
+  end
 end
diff --git a/spec/workers/fasp/announce_trend_worker_spec.rb b/spec/workers/fasp/announce_trend_worker_spec.rb
index 799d8a8f48a..369c2f12679 100644
--- a/spec/workers/fasp/announce_trend_worker_spec.rb
+++ b/spec/workers/fasp/announce_trend_worker_spec.rb
@@ -5,6 +5,8 @@ require 'rails_helper'
 RSpec.describe Fasp::AnnounceTrendWorker do
   include ProviderRequestHelper
 
+  subject { described_class.new.perform(status.id, 'favourite') }
+
   let(:status) { Fabricate(:status) }
   let(:subscription) do
     Fabricate(:fasp_subscription,
@@ -14,10 +16,12 @@ RSpec.describe Fasp::AnnounceTrendWorker do
               threshold_likes: 2)
   end
   let(:provider) { subscription.fasp_provider }
+  let(:path) { '/data_sharing/v0/announcements' }
+
   let!(:stubbed_request) do
     stub_provider_request(provider,
                           method: :post,
-                          path: '/data_sharing/v0/announcements',
+                          path:,
                           response_body: {
                             source: {
                               subscription: {
@@ -36,15 +40,23 @@ RSpec.describe Fasp::AnnounceTrendWorker do
     end
 
     it 'sends the account uri to subscribed providers' do
-      described_class.new.perform(status.id, 'favourite')
+      subject
 
       expect(stubbed_request).to have_been_made
     end
+
+    describe 'provider delivery failure handling' do
+      let(:base_stubbed_request) do
+        stub_request(:post, provider.url(path))
+      end
+
+      it_behaves_like('worker handling fasp delivery failures')
+    end
   end
 
   context 'when the configured threshold is not met' do
     it 'does not notify any provider' do
-      described_class.new.perform(status.id, 'favourite')
+      subject
 
       expect(stubbed_request).to_not have_been_made
     end
diff --git a/spec/workers/fasp/backfill_worker_spec.rb b/spec/workers/fasp/backfill_worker_spec.rb
index 43734e02bac..e15493ea5d0 100644
--- a/spec/workers/fasp/backfill_worker_spec.rb
+++ b/spec/workers/fasp/backfill_worker_spec.rb
@@ -5,13 +5,17 @@ require 'rails_helper'
 RSpec.describe Fasp::BackfillWorker do
   include ProviderRequestHelper
 
+  subject { described_class.new.perform(backfill_request.id) }
+
   let(:backfill_request) { Fabricate(:fasp_backfill_request) }
   let(:provider) { backfill_request.fasp_provider }
   let(:status) { Fabricate(:status) }
+  let(:path) { '/data_sharing/v0/announcements' }
+
   let!(:stubbed_request) do
     stub_provider_request(provider,
                           method: :post,
-                          path: '/data_sharing/v0/announcements',
+                          path:,
                           response_body: {
                             source: {
                               backfillRequest: {
@@ -25,8 +29,16 @@ RSpec.describe Fasp::BackfillWorker do
   end
 
   it 'sends status uri to provider that requested backfill' do
-    described_class.new.perform(backfill_request.id)
+    subject
 
     expect(stubbed_request).to have_been_made
   end
+
+  describe 'provider delivery failure handling' do
+    let(:base_stubbed_request) do
+      stub_request(:post, provider.url(path))
+    end
+
+    it_behaves_like('worker handling fasp delivery failures')
+  end
 end
diff --git a/spec/workers/fasp/follow_recommendation_worker_spec.rb b/spec/workers/fasp/follow_recommendation_worker_spec.rb
index baa647aa06f..895175f3f3e 100644
--- a/spec/workers/fasp/follow_recommendation_worker_spec.rb
+++ b/spec/workers/fasp/follow_recommendation_worker_spec.rb
@@ -5,13 +5,15 @@ require 'rails_helper'
 RSpec.describe Fasp::FollowRecommendationWorker, feature: :fasp do
   include ProviderRequestHelper
 
+  subject { described_class.new.perform(account.id) }
+
   let(:provider) { Fabricate(:follow_recommendation_fasp) }
   let(:account) { Fabricate(:account) }
+  let(:account_uri) { ActivityPub::TagManager.instance.uri_for(account) }
   let(:fetch_service) { instance_double(ActivityPub::FetchRemoteActorService) }
+  let(:path) { "/follow_recommendation/v0/accounts?accountUri=#{URI.encode_uri_component(account_uri)}" }
 
   let!(:stubbed_request) do
-    account_uri = ActivityPub::TagManager.instance.uri_for(account)
-    path = "/follow_recommendation/v0/accounts?accountUri=#{URI.encode_uri_component(account_uri)}"
     stub_provider_request(provider,
                           method: :get,
                           path:,
@@ -28,7 +30,7 @@ RSpec.describe Fasp::FollowRecommendationWorker, feature: :fasp do
   end
 
   it "sends the requesting account's uri to provider and fetches received account uris" do
-    described_class.new.perform(account.id)
+    subject
 
     expect(stubbed_request).to have_been_made
     expect(fetch_service).to have_received(:call).with('https://fedi.example.com/accounts/1')
@@ -38,7 +40,7 @@ RSpec.describe Fasp::FollowRecommendationWorker, feature: :fasp do
   it 'marks a running async refresh as finished' do
     async_refresh = AsyncRefresh.create("fasp:follow_recommendation:#{account.id}", count_results: true)
 
-    described_class.new.perform(account.id)
+    subject
 
     expect(async_refresh.reload).to be_finished
   end
@@ -46,14 +48,22 @@ RSpec.describe Fasp::FollowRecommendationWorker, feature: :fasp do
   it 'tracks the number of fetched accounts in the async refresh' do
     async_refresh = AsyncRefresh.create("fasp:follow_recommendation:#{account.id}", count_results: true)
 
-    described_class.new.perform(account.id)
+    subject
 
     expect(async_refresh.reload.result_count).to eq 2
   end
 
   it 'persists the results' do
     expect do
-      described_class.new.perform(account.id)
+      subject
     end.to change(Fasp::FollowRecommendation, :count).by(2)
   end
+
+  describe 'provider delivery failure handling' do
+    let(:base_stubbed_request) do
+      stub_request(:get, provider.url(path))
+    end
+
+    it_behaves_like('worker handling fasp delivery failures')
+  end
 end
diff --git a/spec/workers/scheduler/accounts_statuses_cleanup_scheduler_spec.rb b/spec/workers/scheduler/accounts_statuses_cleanup_scheduler_spec.rb
index 55b66629e06..1cd01eb3b90 100644
--- a/spec/workers/scheduler/accounts_statuses_cleanup_scheduler_spec.rb
+++ b/spec/workers/scheduler/accounts_statuses_cleanup_scheduler_spec.rb
@@ -112,7 +112,7 @@ RSpec.describe Scheduler::AccountsStatusesCleanupScheduler do
 
         expect { subject.perform }
           .to change(Status, :count).by(-subject.compute_budget) # Cleanable statuses
-          .and (not_change { account_bob.statuses.count }) # No cleanup policy for account
+          .and not_change { account_bob.statuses.count } # No cleanup policy for account
           .and(not_change { account_dave.statuses.count }) # Disabled cleanup policy
       end
 
diff --git a/spec/workers/web/push_notification_worker_spec.rb b/spec/workers/web/push_notification_worker_spec.rb
index d18d6c4d682..7ef4cd4fe51 100644
--- a/spec/workers/web/push_notification_worker_spec.rb
+++ b/spec/workers/web/push_notification_worker_spec.rb
@@ -36,6 +36,9 @@ RSpec.describe Web::PushNotificationWorker do
   let(:std_input) { 'When I grow up, I want to be a watermelon' }
   let(:std_ciphertext) { 'DGv6ra1nlYgDCS1FRnbzlwAAEABBBP4z9KsN6nGRTbVYI_c7VJSPQTBtkgcy27mlmlMoZIIgDll6e3vCYLocInmYWAmS6TlzAC8wEqKK6PBru3jl7A_yl95bQpu6cVPTpK4Mqgkf1CXztLVBSt2Ks3oZwbuwXPXLWyouBWLVWGNWQexSgSxsj_Qulcy4a-fN' }
 
+  # Invalid subscription:
+  let(:invalid_subscription) { Fabricate.build(:web_push_subscription, user_id: user.id, key_p256dh: 'invalid', key_auth: 'invalid', endpoint: endpoint, standard: true, data: { alerts: { notification.type => true } }) }
+
   describe 'perform' do
     around do |example|
       original_private = Rails.configuration.x.vapid.private_key
@@ -83,6 +86,25 @@ RSpec.describe Web::PushNotificationWorker do
     end
     # rubocop:enable RSpec/SubjectStub
 
+    context 'with invalid record that will fail' do
+      before do
+        # Fabricator always runs validation, here we deliberately want to bypass
+        # the validation, simulating an invalid Web::PushSubscription that was
+        # created before PRs #30542, #30540 added validation.
+        invalid_subscription.save(validate: false)
+      end
+
+      it 'removes the record and does not process the request' do
+        expect { subject.perform(invalid_subscription.id, notification.id) }
+          .to_not raise_error
+
+        expect { invalid_subscription.reload }
+          .to raise_error ActiveRecord::RecordNotFound
+
+        expect(a_request(:post, endpoint)).to_not have_been_made
+      end
+    end
+
     def legacy_web_push_endpoint_request
       a_request(
         :post,
diff --git a/streaming/Dockerfile b/streaming/Dockerfile
index 14f2d3c7e71..679425dfcc2 100644
--- a/streaming/Dockerfile
+++ b/streaming/Dockerfile
@@ -1,4 +1,4 @@
-# syntax=docker/dockerfile:1.12
+# syntax=docker/dockerfile:1.18
 
 # Please see https://docs.docker.com/engine/reference/builder for information about
 # the extended buildx capabilities used in this file.
@@ -11,9 +11,9 @@ ARG BASE_REGISTRY="docker.io"
 # Node version to use in base image, change with [--build-arg NODE_MAJOR_VERSION="20"]
 # renovate: datasource=node-version depName=node
 ARG NODE_MAJOR_VERSION="22"
-# Debian image to use for base image, change with [--build-arg DEBIAN_VERSION="bookworm"]
-ARG DEBIAN_VERSION="bookworm"
-# Node image to use for base image based on combined variables (ex: 20-bookworm-slim)
+# Debian image to use for base image, change with [--build-arg DEBIAN_VERSION="trixie"]
+ARG DEBIAN_VERSION="trixie"
+# Node image to use for base image based on combined variables (ex: 20-trixie-slim)
 FROM ${BASE_REGISTRY}/node:${NODE_MAJOR_VERSION}-${DEBIAN_VERSION}-slim AS streaming
 
 # Resulting version string is vX.X.X-MASTODON_VERSION_PRERELEASE+MASTODON_VERSION_METADATA
diff --git a/streaming/index.js b/streaming/index.js
index da8aa657e81..952b4584ab9 100644
--- a/streaming/index.js
+++ b/streaming/index.js
@@ -78,17 +78,6 @@ const parseJSON = (json, req) => {
   }
 };
 
-const PUBLIC_CHANNELS = [
-  'public',
-  'public:media',
-  'public:local',
-  'public:local:media',
-  'public:remote',
-  'public:remote:media',
-  'hashtag',
-  'hashtag:local',
-];
-
 // Used for priming the counters/gauges for the various metrics that are
 // per-channel
 const CHANNEL_NAMES = [
@@ -97,7 +86,14 @@ const CHANNEL_NAMES = [
   'user:notification',
   'list',
   'direct',
-  ...PUBLIC_CHANNELS
+  'public',
+  'public:media',
+  'public:local',
+  'public:local:media',
+  'public:remote',
+  'public:remote:media',
+  'hashtag',
+  'hashtag:local',
 ];
 
 const startServer = async () => {
@@ -355,7 +351,7 @@ const startServer = async () => {
    * @returns {Promise<ResolvedAccount>}
    */
   const accountFromToken = async (token, req) => {
-    const result = await pgPool.query('SELECT oauth_access_tokens.id, oauth_access_tokens.resource_owner_id, users.account_id, users.chosen_languages, oauth_access_tokens.scopes FROM oauth_access_tokens INNER JOIN users ON oauth_access_tokens.resource_owner_id = users.id WHERE oauth_access_tokens.token = $1 AND oauth_access_tokens.revoked_at IS NULL LIMIT 1', [token]);
+    const result = await pgPool.query('SELECT oauth_access_tokens.id, oauth_access_tokens.resource_owner_id, users.account_id, users.chosen_languages, oauth_access_tokens.scopes FROM oauth_access_tokens INNER JOIN users ON oauth_access_tokens.resource_owner_id = users.id INNER JOIN accounts ON accounts.id = users.account_id WHERE oauth_access_tokens.token = $1 AND oauth_access_tokens.revoked_at IS NULL AND users.disabled IS FALSE AND accounts.suspended_at IS NULL LIMIT 1', [token]);
 
     if (result.rows.length === 0) {
       throw new AuthenticationError('Invalid access token');
@@ -434,12 +430,6 @@ const startServer = async () => {
   const checkScopes = (req, logger, channelName) => new Promise((resolve, reject) => {
     logger.debug(`Checking OAuth scopes for ${channelName}`);
 
-    // When accessing public channels, no scopes are needed
-    if (channelName && PUBLIC_CHANNELS.includes(channelName)) {
-      resolve();
-      return;
-    }
-
     // The `read` scope has the highest priority, if the token has it
     // then it can access all streams
     const requiredScopes = ['read'];
diff --git a/streaming/lint-staged.config.mjs b/streaming/lint-staged.config.mjs
index 430a999b9ab..5f9230acbd5 100644
--- a/streaming/lint-staged.config.mjs
+++ b/streaming/lint-staged.config.mjs
@@ -1,5 +1,4 @@
 const config = {
-  '*': 'prettier --ignore-unknown --write',
   '*.{js,ts}': 'eslint --fix',
   '**/*.ts': () => 'tsc -p tsconfig.json --noEmit',
 };
diff --git a/streaming/package.json b/streaming/package.json
index dd332230ef8..7df035d6e7e 100644
--- a/streaming/package.json
+++ b/streaming/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@mastodon/streaming",
   "license": "AGPL-3.0-or-later",
-  "packageManager": "yarn@4.9.2",
+  "packageManager": "yarn@4.10.3",
   "engines": {
     "node": ">=20"
   },
@@ -21,13 +21,13 @@
     "dotenv": "^16.0.3",
     "express": "^4.18.2",
     "ioredis": "^5.3.2",
-    "jsdom": "^26.0.0",
+    "jsdom": "^27.0.0",
     "pg": "^8.5.0",
     "pg-connection-string": "^2.6.0",
     "pino": "^9.0.0",
     "pino-http": "^10.0.0",
     "prom-client": "^15.0.0",
-    "uuid": "^11.0.0",
+    "uuid": "^13.0.0",
     "ws": "^8.12.1"
   },
   "devDependencies": {
@@ -35,11 +35,10 @@
     "@types/cors": "^2.8.16",
     "@types/express": "^4.17.17",
     "@types/pg": "^8.6.6",
-    "@types/uuid": "^10.0.0",
     "@types/ws": "^8.5.9",
     "globals": "^16.0.0",
     "pino-pretty": "^13.0.0",
-    "typescript": "~5.7.3",
+    "typescript": "~5.9.0",
     "typescript-eslint": "^8.28.0"
   },
   "optionalDependencies": {
diff --git a/vite.config.mts b/vite.config.mts
index 484211eaa0c..6876302dd90 100644
--- a/vite.config.mts
+++ b/vite.config.mts
@@ -1,28 +1,53 @@
 import path from 'node:path';
+import { readdir } from 'node:fs/promises';
 
 import { optimizeLodashImports } from '@optimize-lodash/rollup-plugin';
-import react from '@vitejs/plugin-react';
-import { PluginOption } from 'vite';
-import svgr from 'vite-plugin-svgr';
-import { visualizer } from 'rollup-plugin-visualizer';
-import RailsPlugin from 'vite-plugin-rails';
-import { VitePWA } from 'vite-plugin-pwa';
-import tsconfigPaths from 'vite-tsconfig-paths';
 import legacy from '@vitejs/plugin-legacy';
-
-import { defineConfig, UserConfigFnPromise, UserConfig } from 'vite';
+import react from '@vitejs/plugin-react';
 import postcssPresetEnv from 'postcss-preset-env';
+import Compress from 'rollup-plugin-gzip';
+import { visualizer } from 'rollup-plugin-visualizer';
+import {
+  PluginOption,
+  defineConfig,
+  UserConfigFnPromise,
+  UserConfig,
+} from 'vite';
+import manifestSRI from 'vite-plugin-manifest-sri';
+import { VitePWA } from 'vite-plugin-pwa';
+import { viteStaticCopy } from 'vite-plugin-static-copy';
+import svgr from 'vite-plugin-svgr';
+import tsconfigPaths from 'vite-tsconfig-paths';
 
 import { MastodonServiceWorkerLocales } from './config/vite/plugin-sw-locales';
 import { MastodonEmojiCompressed } from './config/vite/plugin-emoji-compressed';
 import { MastodonThemes } from './config/vite/plugin-mastodon-themes';
 import { MastodonNameLookup } from './config/vite/plugin-name-lookup';
+import { MastodonAssetsManifest } from './config/vite/plugin-assets-manifest';
 
 const jsRoot = path.resolve(__dirname, 'app/javascript');
 
 export const config: UserConfigFnPromise = async ({ mode, command }) => {
+  const isProdBuild = mode === 'production' && command === 'build';
+
+  let outDirName = 'packs-dev';
+  if (mode === 'test') {
+    outDirName = 'packs-test';
+  } else if (mode === 'production') {
+    outDirName = 'packs';
+  }
+  const outDir = path.resolve('public', outDirName);
+
   return {
     root: jsRoot,
+    base: `/${outDirName}/`,
+    envDir: __dirname,
+    resolve: {
+      alias: {
+        '~/': `${jsRoot}/`,
+        '@/': `${jsRoot}/`,
+      },
+    },
     css: {
       postcss: {
         plugins: [
@@ -40,12 +65,24 @@ export const config: UserConfigFnPromise = async ({ mode, command }) => {
         // but it needs to be scoped to the whole domain
         'Service-Worker-Allowed': '/',
       },
+      hmr: {
+        // Forcing the protocol to be insecure helps if you are proxying your dev server with SSL,
+        // because Vite still tries to connect to localhost.
+        protocol: 'ws',
+      },
+      port: 3036,
     },
     build: {
+      target: 'modules',
       commonjsOptions: { transformMixedEsModules: true },
       chunkSizeWarningLimit: 1 * 1024 * 1024, // 1MB
       sourcemap: true,
+      emptyOutDir: mode !== 'production',
+      manifest: true,
+      outDir,
+      assetsDir: 'assets',
       rollupOptions: {
+        input: await findEntrypoints(),
         output: {
           chunkFileNames({ facadeModuleId, name }) {
             if (!facadeModuleId) {
@@ -78,28 +115,46 @@ export const config: UserConfigFnPromise = async ({ mode, command }) => {
         },
       },
     },
+    worker: {
+      format: 'es',
+    },
     plugins: [
-      tsconfigPaths(),
-      RailsPlugin({
-        compress: mode === 'production' && command === 'build',
-        sri: {
-          manifestPaths: ['.vite/manifest.json', '.vite/manifest-assets.json'],
-        },
-      }),
-      MastodonThemes(),
+      tsconfigPaths({ projects: [path.resolve(__dirname, 'tsconfig.json')] }),
       react({
         babel: {
           plugins: ['formatjs', 'transform-react-remove-prop-types'],
         },
       }),
+      MastodonThemes(),
+      MastodonAssetsManifest(),
+      viteStaticCopy({
+        targets: [
+          {
+            src: path.resolve(
+              __dirname,
+              'node_modules/emojibase-data/**/compact.json',
+            ),
+            dest: 'emoji',
+            rename(_name, ext, dir) {
+              const locale = path.basename(path.dirname(dir));
+              return `${locale}.${ext}`;
+            },
+          },
+        ],
+      }),
       MastodonServiceWorkerLocales(),
       MastodonEmojiCompressed(),
       legacy({
         renderLegacyChunks: false,
         modernPolyfills: true,
       }),
+      isProdBuild && (Compress() as PluginOption),
+      command === 'build' &&
+        manifestSRI({
+          manifestPaths: ['.vite/manifest.json'],
+        }),
       VitePWA({
-        srcDir: 'mastodon/service_worker',
+        srcDir: path.resolve(jsRoot, 'mastodon/service_worker'),
         // We need to use injectManifest because we use our own service worker
         strategies: 'injectManifest',
         manifest: false,
@@ -131,4 +186,40 @@ export const config: UserConfigFnPromise = async ({ mode, command }) => {
   } satisfies UserConfig;
 };
 
+async function findEntrypoints() {
+  const entrypoints: Record<string, string> = {};
+
+  // First, JS entrypoints
+  const jsEntrypointsDir = path.resolve(jsRoot, 'entrypoints');
+  const jsEntrypoints = await readdir(jsEntrypointsDir, {
+    withFileTypes: true,
+  });
+  const jsExtTest = /\.[jt]sx?$/;
+  for (const file of jsEntrypoints) {
+    if (file.isFile() && jsExtTest.test(file.name)) {
+      entrypoints[file.name.replace(jsExtTest, '')] = path.resolve(
+        jsEntrypointsDir,
+        file.name,
+      );
+    }
+  }
+
+  // Next, SCSS entrypoints
+  const scssEntrypointsDir = path.resolve(jsRoot, 'styles/entrypoints');
+  const scssEntrypoints = await readdir(scssEntrypointsDir, {
+    withFileTypes: true,
+  });
+  const scssExtTest = /\.s?css$/;
+  for (const file of scssEntrypoints) {
+    if (file.isFile() && scssExtTest.test(file.name)) {
+      entrypoints[file.name.replace(scssExtTest, '')] = path.resolve(
+        scssEntrypointsDir,
+        file.name,
+      );
+    }
+  }
+
+  return entrypoints;
+}
+
 export default defineConfig(config);
diff --git a/vitest.config.mts b/vitest.config.mts
index 14aa54778b8..b129c293f4c 100644
--- a/vitest.config.mts
+++ b/vitest.config.mts
@@ -1,9 +1,6 @@
 import { resolve } from 'node:path';
 
 import { storybookTest } from '@storybook/addon-vitest/vitest-plugin';
-import react from '@vitejs/plugin-react';
-import svgr from 'vite-plugin-svgr';
-import tsconfigPaths from 'vite-tsconfig-paths';
 import {
   configDefaults,
   defineConfig,
@@ -13,15 +10,13 @@ import {
 import { config as viteConfig } from './vite.config.mjs';
 
 const storybookTests: TestProjectInlineConfiguration = {
+  extends: true,
   plugins: [
     // See options at: https://storybook.js.org/docs/next/writing-tests/integrations/vitest-addon#storybooktest
     storybookTest({
       configDir: '.storybook',
       storybookScript: 'yarn run storybook',
     }),
-    react(),
-    svgr(),
-    tsconfigPaths(),
   ],
   test: {
     name: 'storybook',
@@ -54,6 +49,7 @@ const legacyTests: TestProjectInlineConfiguration = {
       'tmp/**',
     ],
     globals: true,
+    setupFiles: ['fake-indexeddb/auto'],
   },
 };
 
diff --git a/yarn.lock b/yarn.lock
index 46fb5b98d2f..20d256424aa 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -19,7 +19,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@ampproject/remapping@npm:^2.2.0, @ampproject/remapping@npm:^2.3.0":
+"@ampproject/remapping@npm:^2.3.0":
   version: 2.3.0
   resolution: "@ampproject/remapping@npm:2.3.0"
   dependencies:
@@ -42,16 +42,35 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@asamuzakjp/css-color@npm:^2.8.2":
-  version: 2.8.2
-  resolution: "@asamuzakjp/css-color@npm:2.8.2"
+"@asamuzakjp/css-color@npm:^4.0.3":
+  version: 4.0.4
+  resolution: "@asamuzakjp/css-color@npm:4.0.4"
   dependencies:
-    "@csstools/css-calc": "npm:^2.1.1"
-    "@csstools/css-color-parser": "npm:^3.0.7"
-    "@csstools/css-parser-algorithms": "npm:^3.0.4"
-    "@csstools/css-tokenizer": "npm:^3.0.3"
-    lru-cache: "npm:^11.0.2"
-  checksum: 10c0/352b91ca7741876e459cd3cb350a969e842da1e532577157d38365a6da89b7d6e6944249489366ee61b8a225ede1b521e7ab305b70ad4c688b01404061eecca8
+    "@csstools/css-calc": "npm:^2.1.4"
+    "@csstools/css-color-parser": "npm:^3.0.10"
+    "@csstools/css-parser-algorithms": "npm:^3.0.5"
+    "@csstools/css-tokenizer": "npm:^3.0.4"
+    lru-cache: "npm:^11.1.0"
+  checksum: 10c0/5a4eb3c8594f58f3df06c867a6cda4a33f702f5cd682d6afa5074813f16fd05e732653ac79bd6fc66390554e158ac478103ad5e885fd9cf154b69bb67639e82f
+  languageName: node
+  linkType: hard
+
+"@asamuzakjp/dom-selector@npm:^6.5.4":
+  version: 6.5.4
+  resolution: "@asamuzakjp/dom-selector@npm:6.5.4"
+  dependencies:
+    "@asamuzakjp/nwsapi": "npm:^2.3.9"
+    bidi-js: "npm:^1.0.3"
+    css-tree: "npm:^3.1.0"
+    is-potential-custom-element-name: "npm:^1.0.1"
+  checksum: 10c0/aeb032b0f7832c891d5f9900b381fe0c7187343eb46a353f07ffbaac2d222bb80ac7504006e7e1b4c45af9e640fd093e14f951870a146d3ad80fd67670c9a115
+  languageName: node
+  linkType: hard
+
+"@asamuzakjp/nwsapi@npm:^2.3.9":
+  version: 2.3.9
+  resolution: "@asamuzakjp/nwsapi@npm:2.3.9"
+  checksum: 10c0/869b81382e775499c96c45c6dbe0d0766a6da04bcf0abb79f5333535c4e19946851acaa43398f896e2ecc5a1de9cf3db7cf8c4b1afac1ee3d15e21584546d74d
   languageName: node
   linkType: hard
 
@@ -66,59 +85,59 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/compat-data@npm:^7.22.6, @babel/compat-data@npm:^7.27.2":
-  version: 7.27.2
-  resolution: "@babel/compat-data@npm:7.27.2"
-  checksum: 10c0/077c9e01af3b90decee384a6a44dcf353898e980cee22ec7941f9074655dbbe97ec317345536cdc7ef7391521e1497930c522a3816af473076dd524be7fccd32
+"@babel/compat-data@npm:^7.27.2, @babel/compat-data@npm:^7.27.7, @babel/compat-data@npm:^7.28.0":
+  version: 7.28.0
+  resolution: "@babel/compat-data@npm:7.28.0"
+  checksum: 10c0/c4e527302bcd61052423f757355a71c3bc62362bac13f7f130de16e439716f66091ff5bdecda418e8fa0271d4c725f860f0ee23ab7bf6e769f7a8bb16dfcb531
   languageName: node
   linkType: hard
 
-"@babel/core@npm:^7.18.9, @babel/core@npm:^7.21.3, @babel/core@npm:^7.24.4, @babel/core@npm:^7.26.10, @babel/core@npm:^7.27.4":
-  version: 7.27.4
-  resolution: "@babel/core@npm:7.27.4"
+"@babel/core@npm:^7.18.9, @babel/core@npm:^7.21.3, @babel/core@npm:^7.24.4, @babel/core@npm:^7.26.10, @babel/core@npm:^7.28.0, @babel/core@npm:^7.28.4":
+  version: 7.28.4
+  resolution: "@babel/core@npm:7.28.4"
   dependencies:
-    "@ampproject/remapping": "npm:^2.2.0"
     "@babel/code-frame": "npm:^7.27.1"
-    "@babel/generator": "npm:^7.27.3"
+    "@babel/generator": "npm:^7.28.3"
     "@babel/helper-compilation-targets": "npm:^7.27.2"
-    "@babel/helper-module-transforms": "npm:^7.27.3"
-    "@babel/helpers": "npm:^7.27.4"
-    "@babel/parser": "npm:^7.27.4"
+    "@babel/helper-module-transforms": "npm:^7.28.3"
+    "@babel/helpers": "npm:^7.28.4"
+    "@babel/parser": "npm:^7.28.4"
     "@babel/template": "npm:^7.27.2"
-    "@babel/traverse": "npm:^7.27.4"
-    "@babel/types": "npm:^7.27.3"
+    "@babel/traverse": "npm:^7.28.4"
+    "@babel/types": "npm:^7.28.4"
+    "@jridgewell/remapping": "npm:^2.3.5"
     convert-source-map: "npm:^2.0.0"
     debug: "npm:^4.1.0"
     gensync: "npm:^1.0.0-beta.2"
     json5: "npm:^2.2.3"
     semver: "npm:^6.3.1"
-  checksum: 10c0/d2d17b106a8d91d3eda754bb3f26b53a12eb7646df73c2b2d2e9b08d90529186bc69e3823f70a96ec6e5719dc2372fb54e14ad499da47ceeb172d2f7008787b5
+  checksum: 10c0/ef5a6c3c6bf40d3589b5593f8118cfe2602ce737412629fb6e26d595be2fcbaae0807b43027a5c42ec4fba5b895ff65891f2503b5918c8a3ea3542ab44d4c278
   languageName: node
   linkType: hard
 
-"@babel/generator@npm:^7.27.3":
-  version: 7.27.3
-  resolution: "@babel/generator@npm:7.27.3"
+"@babel/generator@npm:^7.28.3":
+  version: 7.28.3
+  resolution: "@babel/generator@npm:7.28.3"
   dependencies:
-    "@babel/parser": "npm:^7.27.3"
-    "@babel/types": "npm:^7.27.3"
-    "@jridgewell/gen-mapping": "npm:^0.3.5"
-    "@jridgewell/trace-mapping": "npm:^0.3.25"
+    "@babel/parser": "npm:^7.28.3"
+    "@babel/types": "npm:^7.28.2"
+    "@jridgewell/gen-mapping": "npm:^0.3.12"
+    "@jridgewell/trace-mapping": "npm:^0.3.28"
     jsesc: "npm:^3.0.2"
-  checksum: 10c0/341622e17c61d008fc746b655ab95ef7febb543df8efb4148f57cf06e60ade1abe091ed7d6811df17b064d04d64f69bb7f35ab0654137116d55c54a73145a61a
+  checksum: 10c0/0ff58bcf04f8803dcc29479b547b43b9b0b828ec1ee0668e92d79f9e90f388c28589056637c5ff2fd7bcf8d153c990d29c448d449d852bf9d1bc64753ca462bc
   languageName: node
   linkType: hard
 
-"@babel/helper-annotate-as-pure@npm:^7.27.1":
-  version: 7.27.1
-  resolution: "@babel/helper-annotate-as-pure@npm:7.27.1"
+"@babel/helper-annotate-as-pure@npm:^7.27.1, @babel/helper-annotate-as-pure@npm:^7.27.3":
+  version: 7.27.3
+  resolution: "@babel/helper-annotate-as-pure@npm:7.27.3"
   dependencies:
-    "@babel/types": "npm:^7.27.1"
-  checksum: 10c0/fc4751b59c8f5417e1acb0455d6ffce53fa5e79b3aca690299fbbf73b1b65bfaef3d4a18abceb190024c5836bb6cfbc3711e83888648df93df54e18152a1196c
+    "@babel/types": "npm:^7.27.3"
+  checksum: 10c0/94996ce0a05b7229f956033e6dcd69393db2b0886d0db6aff41e704390402b8cdcca11f61449cb4f86cfd9e61b5ad3a73e4fa661eeed7846b125bd1c33dbc633
   languageName: node
   linkType: hard
 
-"@babel/helper-compilation-targets@npm:^7.22.6, @babel/helper-compilation-targets@npm:^7.27.1, @babel/helper-compilation-targets@npm:^7.27.2":
+"@babel/helper-compilation-targets@npm:^7.27.1, @babel/helper-compilation-targets@npm:^7.27.2":
   version: 7.27.2
   resolution: "@babel/helper-compilation-targets@npm:7.27.2"
   dependencies:
@@ -161,18 +180,25 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-define-polyfill-provider@npm:^0.6.3, @babel/helper-define-polyfill-provider@npm:^0.6.4":
-  version: 0.6.4
-  resolution: "@babel/helper-define-polyfill-provider@npm:0.6.4"
+"@babel/helper-define-polyfill-provider@npm:^0.6.5":
+  version: 0.6.5
+  resolution: "@babel/helper-define-polyfill-provider@npm:0.6.5"
   dependencies:
-    "@babel/helper-compilation-targets": "npm:^7.22.6"
-    "@babel/helper-plugin-utils": "npm:^7.22.5"
-    debug: "npm:^4.1.1"
+    "@babel/helper-compilation-targets": "npm:^7.27.2"
+    "@babel/helper-plugin-utils": "npm:^7.27.1"
+    debug: "npm:^4.4.1"
     lodash.debounce: "npm:^4.0.8"
-    resolve: "npm:^1.14.2"
+    resolve: "npm:^1.22.10"
   peerDependencies:
     "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0
-  checksum: 10c0/b74f2b46e233a178618d19432bdae16e0137d0a603497ee901155e083c4a61f26fe01d79fb95d5f4c22131ade9d958d8f587088d412cca1302633587f070919d
+  checksum: 10c0/4886a068d9ca1e70af395340656a9dda33c50502c67eed39ff6451785f370bdfc6e57095b90cb92678adcd4a111ca60909af53d3a741120719c5604346ae409e
+  languageName: node
+  linkType: hard
+
+"@babel/helper-globals@npm:^7.28.0":
+  version: 7.28.0
+  resolution: "@babel/helper-globals@npm:7.28.0"
+  checksum: 10c0/5a0cd0c0e8c764b5f27f2095e4243e8af6fa145daea2b41b53c0c1414fe6ff139e3640f4e2207ae2b3d2153a1abd346f901c26c290ee7cb3881dd922d4ee9232
   languageName: node
   linkType: hard
 
@@ -196,16 +222,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-module-transforms@npm:^7.27.1, @babel/helper-module-transforms@npm:^7.27.3":
-  version: 7.27.3
-  resolution: "@babel/helper-module-transforms@npm:7.27.3"
+"@babel/helper-module-transforms@npm:^7.27.1, @babel/helper-module-transforms@npm:^7.28.3":
+  version: 7.28.3
+  resolution: "@babel/helper-module-transforms@npm:7.28.3"
   dependencies:
     "@babel/helper-module-imports": "npm:^7.27.1"
     "@babel/helper-validator-identifier": "npm:^7.27.1"
-    "@babel/traverse": "npm:^7.27.3"
+    "@babel/traverse": "npm:^7.28.3"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 10c0/fccb4f512a13b4c069af51e1b56b20f54024bcf1591e31e978a30f3502567f34f90a80da6a19a6148c249216292a8074a0121f9e52602510ef0f32dbce95ca01
+  checksum: 10c0/549be62515a6d50cd4cfefcab1b005c47f89bd9135a22d602ee6a5e3a01f27571868ada10b75b033569f24dc4a2bb8d04bfa05ee75c16da7ade2d0db1437fcdb
   languageName: node
   linkType: hard
 
@@ -218,7 +244,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-plugin-utils@npm:^7.0.0, @babel/helper-plugin-utils@npm:^7.18.6, @babel/helper-plugin-utils@npm:^7.22.5, @babel/helper-plugin-utils@npm:^7.26.5, @babel/helper-plugin-utils@npm:^7.27.1":
+"@babel/helper-plugin-utils@npm:^7.0.0, @babel/helper-plugin-utils@npm:^7.18.6, @babel/helper-plugin-utils@npm:^7.26.5, @babel/helper-plugin-utils@npm:^7.27.1":
   version: 7.27.1
   resolution: "@babel/helper-plugin-utils@npm:7.27.1"
   checksum: 10c0/94cf22c81a0c11a09b197b41ab488d416ff62254ce13c57e62912c85700dc2e99e555225787a4099ff6bae7a1812d622c80fbaeda824b79baa10a6c5ac4cf69b
@@ -293,24 +319,24 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helpers@npm:^7.27.4":
-  version: 7.27.4
-  resolution: "@babel/helpers@npm:7.27.4"
+"@babel/helpers@npm:^7.28.4":
+  version: 7.28.4
+  resolution: "@babel/helpers@npm:7.28.4"
   dependencies:
     "@babel/template": "npm:^7.27.2"
-    "@babel/types": "npm:^7.27.3"
-  checksum: 10c0/3463551420926b3f403c1a30d66ac67bba5c4f73539a8ccb71544da129c4709ac37c57fac740ed8a261b3e6bbbf353b05e03b36ea1a6bf1081604b2a94ca43c1
+    "@babel/types": "npm:^7.28.4"
+  checksum: 10c0/aaa5fb8098926dfed5f223adf2c5e4c7fbba4b911b73dfec2d7d3083f8ba694d201a206db673da2d9b3ae8c01793e795767654558c450c8c14b4c2175b4fcb44
   languageName: node
   linkType: hard
 
-"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.20.7, @babel/parser@npm:^7.25.4, @babel/parser@npm:^7.27.2, @babel/parser@npm:^7.27.3, @babel/parser@npm:^7.27.4":
-  version: 7.27.4
-  resolution: "@babel/parser@npm:7.27.4"
+"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.20.7, @babel/parser@npm:^7.25.4, @babel/parser@npm:^7.27.2, @babel/parser@npm:^7.28.3, @babel/parser@npm:^7.28.4":
+  version: 7.28.4
+  resolution: "@babel/parser@npm:7.28.4"
   dependencies:
-    "@babel/types": "npm:^7.27.3"
+    "@babel/types": "npm:^7.28.4"
   bin:
     parser: ./bin/babel-parser.js
-  checksum: 10c0/d1bf17e7508585235e2a76594ba81828e48851877112bb8abbecd7161a31fb66654e993e458ddaedb18a3d5fa31970e5f3feca5ae2900f51e6d8d3d35da70dbf
+  checksum: 10c0/58b239a5b1477ac7ed7e29d86d675cc81075ca055424eba6485872626db2dc556ce63c45043e5a679cd925e999471dba8a3ed4864e7ab1dbf64306ab72c52707
   languageName: node
   linkType: hard
 
@@ -438,16 +464,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-async-generator-functions@npm:^7.27.1":
-  version: 7.27.1
-  resolution: "@babel/plugin-transform-async-generator-functions@npm:7.27.1"
+"@babel/plugin-transform-async-generator-functions@npm:^7.28.0":
+  version: 7.28.0
+  resolution: "@babel/plugin-transform-async-generator-functions@npm:7.28.0"
   dependencies:
     "@babel/helper-plugin-utils": "npm:^7.27.1"
     "@babel/helper-remap-async-to-generator": "npm:^7.27.1"
-    "@babel/traverse": "npm:^7.27.1"
+    "@babel/traverse": "npm:^7.28.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/772e449c69ee42a466443acefb07083bd89efb1a1d95679a4dc99ea3be9d8a3c43a2b74d2da95d7c818e9dd9e0b72bfa7c03217a1feaf108f21b7e542f0943c0
+  checksum: 10c0/739d577e649d7d7b9845dc309e132964327ab3eaea43ad04d04a7dcb977c63f9aa9a423d1ca39baf10939128d02f52e6fda39c834fb9f1753785b1497e72c4dc
   languageName: node
   linkType: hard
 
@@ -475,14 +501,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-block-scoping@npm:^7.27.1":
-  version: 7.27.1
-  resolution: "@babel/plugin-transform-block-scoping@npm:7.27.1"
+"@babel/plugin-transform-block-scoping@npm:^7.28.0":
+  version: 7.28.0
+  resolution: "@babel/plugin-transform-block-scoping@npm:7.28.0"
   dependencies:
     "@babel/helper-plugin-utils": "npm:^7.27.1"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/d3f357beeb92fbdf3045aea2ba286a60dafc9c2d2a9f89065bb3c4bea9cc48934ee6689df3db0439d9ec518eda5e684f3156cab792b7c38c33ece2f8204ddee8
+  checksum: 10c0/787d85e72a92917e735aa54e23062fa777031f8a07046e67f5026eff3d91e64eb535575dd1df917b0011bee014ae51287478af14c1d4ba60bc81e326bc044cfc
   languageName: node
   linkType: hard
 
@@ -510,19 +536,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-classes@npm:^7.27.1":
-  version: 7.27.1
-  resolution: "@babel/plugin-transform-classes@npm:7.27.1"
+"@babel/plugin-transform-classes@npm:^7.28.0":
+  version: 7.28.0
+  resolution: "@babel/plugin-transform-classes@npm:7.28.0"
   dependencies:
-    "@babel/helper-annotate-as-pure": "npm:^7.27.1"
-    "@babel/helper-compilation-targets": "npm:^7.27.1"
+    "@babel/helper-annotate-as-pure": "npm:^7.27.3"
+    "@babel/helper-compilation-targets": "npm:^7.27.2"
+    "@babel/helper-globals": "npm:^7.28.0"
     "@babel/helper-plugin-utils": "npm:^7.27.1"
     "@babel/helper-replace-supers": "npm:^7.27.1"
-    "@babel/traverse": "npm:^7.27.1"
-    globals: "npm:^11.1.0"
+    "@babel/traverse": "npm:^7.28.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/1071f4cb1ed5deb5e6f8d0442f2293a540cac5caa5ab3c25ad0571aadcbf961f61e26d367a67894976165a543e02f3a19e40b63b909afbed6e710801a590635c
+  checksum: 10c0/3b213b43104fe99dd7e79401a86d09e545836e057a70ffe77e8196a87bf67ae167e502ae90afdf0d1a2be683be5652514aaeda743bd984e583523dd8ecfef887
   languageName: node
   linkType: hard
 
@@ -538,14 +564,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-destructuring@npm:^7.27.1":
-  version: 7.27.1
-  resolution: "@babel/plugin-transform-destructuring@npm:7.27.1"
+"@babel/plugin-transform-destructuring@npm:^7.28.0":
+  version: 7.28.0
+  resolution: "@babel/plugin-transform-destructuring@npm:7.28.0"
   dependencies:
     "@babel/helper-plugin-utils": "npm:^7.27.1"
+    "@babel/traverse": "npm:^7.28.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/56afda7a0b205f8d1af727daef4c529fc2e756887408affd39033ae4476e54d586d3d9dc1e72cfb15c74a2a5ca0653ab13dbaa8cbf79fbb2a3a746d0f107cb86
+  checksum: 10c0/cc7ccafa952b3ff7888544d5688cfafaba78c69ce1e2f04f3233f4f78c9de5e46e9695f5ea42c085b0c0cfa39b10f366d362a2be245b6d35b66d3eb1d427ccb2
   languageName: node
   linkType: hard
 
@@ -595,6 +622,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-transform-explicit-resource-management@npm:^7.28.0":
+  version: 7.28.0
+  resolution: "@babel/plugin-transform-explicit-resource-management@npm:7.28.0"
+  dependencies:
+    "@babel/helper-plugin-utils": "npm:^7.27.1"
+    "@babel/plugin-transform-destructuring": "npm:^7.28.0"
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 10c0/3baa706af3112adf2ae0c7ec0dc61b63dd02695eb5582f3c3a2b2d05399c6aa7756f55e7bbbd5412e613a6ba1dd6b6736904074b4d7ebd6b45a1e3f9145e4094
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-transform-exponentiation-operator@npm:^7.27.1":
   version: 7.27.1
   resolution: "@babel/plugin-transform-exponentiation-operator@npm:7.27.1"
@@ -781,17 +820,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-object-rest-spread@npm:^7.27.2":
-  version: 7.27.2
-  resolution: "@babel/plugin-transform-object-rest-spread@npm:7.27.2"
+"@babel/plugin-transform-object-rest-spread@npm:^7.28.0":
+  version: 7.28.0
+  resolution: "@babel/plugin-transform-object-rest-spread@npm:7.28.0"
   dependencies:
     "@babel/helper-compilation-targets": "npm:^7.27.2"
     "@babel/helper-plugin-utils": "npm:^7.27.1"
-    "@babel/plugin-transform-destructuring": "npm:^7.27.1"
-    "@babel/plugin-transform-parameters": "npm:^7.27.1"
+    "@babel/plugin-transform-destructuring": "npm:^7.28.0"
+    "@babel/plugin-transform-parameters": "npm:^7.27.7"
+    "@babel/traverse": "npm:^7.28.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/5e255b262dd65c8700078d9f6ed87bd45f951a905dda6b3414be28d7b2781b18e6b812e9d71421e61360c9cf51e1e619c1d48348593bb7399496f61f5f221446
+  checksum: 10c0/360dc6fd5285ee5e1d3be8a1fb0decd120b2a1726800317b4ab48b7c91616247030239b7fa06ceaa1a8a586fde1e143c24d45f8d41956876099d97d664f8ef1e
   languageName: node
   linkType: hard
 
@@ -830,14 +870,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-parameters@npm:^7.27.1":
-  version: 7.27.1
-  resolution: "@babel/plugin-transform-parameters@npm:7.27.1"
+"@babel/plugin-transform-parameters@npm:^7.27.7":
+  version: 7.27.7
+  resolution: "@babel/plugin-transform-parameters@npm:7.27.7"
   dependencies:
     "@babel/helper-plugin-utils": "npm:^7.27.1"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/453a9618735eeff5551d4c7f02c250606586fe1dd210ec9f69a4f15629ace180cd944339ebff2b0f11e1a40567d83a229ba1c567620e70b2ebedea576e12196a
+  checksum: 10c0/f2da3804e047d9f1cfb27be6c014e2c7f6cf5e1e38290d1cb3cb2607859e3d6facb4ee8c8c1e336e9fbb440091a174ce95ce156582d7e8bf9c0e735d11681f0f
   languageName: node
   linkType: hard
 
@@ -899,14 +939,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-regenerator@npm:^7.27.1":
-  version: 7.27.1
-  resolution: "@babel/plugin-transform-regenerator@npm:7.27.1"
+"@babel/plugin-transform-regenerator@npm:^7.28.0":
+  version: 7.28.1
+  resolution: "@babel/plugin-transform-regenerator@npm:7.28.1"
   dependencies:
     "@babel/helper-plugin-utils": "npm:^7.27.1"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/42395908899310bb107d9ca31ebd4c302e14c582e3ad3ebfe1498fabafc43155c8f10850265c1e686a2afcf50d1f402cc5c5218fba72e167852607a4d8d6492e
+  checksum: 10c0/6c9e6eb80ce9c0bde0876c80979e078fbc85dc802272cba4ee72b5b1c858472e38167c418917e4f0d4384ce888706d95544a8d266880c0e199e167e078168b67
   languageName: node
   linkType: hard
 
@@ -1036,11 +1076,11 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/preset-env@npm:^7.11.0, @babel/preset-env@npm:^7.26.9":
-  version: 7.27.2
-  resolution: "@babel/preset-env@npm:7.27.2"
+"@babel/preset-env@npm:^7.11.0, @babel/preset-env@npm:^7.28.0":
+  version: 7.28.0
+  resolution: "@babel/preset-env@npm:7.28.0"
   dependencies:
-    "@babel/compat-data": "npm:^7.27.2"
+    "@babel/compat-data": "npm:^7.28.0"
     "@babel/helper-compilation-targets": "npm:^7.27.2"
     "@babel/helper-plugin-utils": "npm:^7.27.1"
     "@babel/helper-validator-option": "npm:^7.27.1"
@@ -1054,19 +1094,20 @@ __metadata:
     "@babel/plugin-syntax-import-attributes": "npm:^7.27.1"
     "@babel/plugin-syntax-unicode-sets-regex": "npm:^7.18.6"
     "@babel/plugin-transform-arrow-functions": "npm:^7.27.1"
-    "@babel/plugin-transform-async-generator-functions": "npm:^7.27.1"
+    "@babel/plugin-transform-async-generator-functions": "npm:^7.28.0"
     "@babel/plugin-transform-async-to-generator": "npm:^7.27.1"
     "@babel/plugin-transform-block-scoped-functions": "npm:^7.27.1"
-    "@babel/plugin-transform-block-scoping": "npm:^7.27.1"
+    "@babel/plugin-transform-block-scoping": "npm:^7.28.0"
     "@babel/plugin-transform-class-properties": "npm:^7.27.1"
     "@babel/plugin-transform-class-static-block": "npm:^7.27.1"
-    "@babel/plugin-transform-classes": "npm:^7.27.1"
+    "@babel/plugin-transform-classes": "npm:^7.28.0"
     "@babel/plugin-transform-computed-properties": "npm:^7.27.1"
-    "@babel/plugin-transform-destructuring": "npm:^7.27.1"
+    "@babel/plugin-transform-destructuring": "npm:^7.28.0"
     "@babel/plugin-transform-dotall-regex": "npm:^7.27.1"
     "@babel/plugin-transform-duplicate-keys": "npm:^7.27.1"
     "@babel/plugin-transform-duplicate-named-capturing-groups-regex": "npm:^7.27.1"
     "@babel/plugin-transform-dynamic-import": "npm:^7.27.1"
+    "@babel/plugin-transform-explicit-resource-management": "npm:^7.28.0"
     "@babel/plugin-transform-exponentiation-operator": "npm:^7.27.1"
     "@babel/plugin-transform-export-namespace-from": "npm:^7.27.1"
     "@babel/plugin-transform-for-of": "npm:^7.27.1"
@@ -1083,15 +1124,15 @@ __metadata:
     "@babel/plugin-transform-new-target": "npm:^7.27.1"
     "@babel/plugin-transform-nullish-coalescing-operator": "npm:^7.27.1"
     "@babel/plugin-transform-numeric-separator": "npm:^7.27.1"
-    "@babel/plugin-transform-object-rest-spread": "npm:^7.27.2"
+    "@babel/plugin-transform-object-rest-spread": "npm:^7.28.0"
     "@babel/plugin-transform-object-super": "npm:^7.27.1"
     "@babel/plugin-transform-optional-catch-binding": "npm:^7.27.1"
     "@babel/plugin-transform-optional-chaining": "npm:^7.27.1"
-    "@babel/plugin-transform-parameters": "npm:^7.27.1"
+    "@babel/plugin-transform-parameters": "npm:^7.27.7"
     "@babel/plugin-transform-private-methods": "npm:^7.27.1"
     "@babel/plugin-transform-private-property-in-object": "npm:^7.27.1"
     "@babel/plugin-transform-property-literals": "npm:^7.27.1"
-    "@babel/plugin-transform-regenerator": "npm:^7.27.1"
+    "@babel/plugin-transform-regenerator": "npm:^7.28.0"
     "@babel/plugin-transform-regexp-modifiers": "npm:^7.27.1"
     "@babel/plugin-transform-reserved-words": "npm:^7.27.1"
     "@babel/plugin-transform-shorthand-properties": "npm:^7.27.1"
@@ -1104,14 +1145,14 @@ __metadata:
     "@babel/plugin-transform-unicode-regex": "npm:^7.27.1"
     "@babel/plugin-transform-unicode-sets-regex": "npm:^7.27.1"
     "@babel/preset-modules": "npm:0.1.6-no-external-plugins"
-    babel-plugin-polyfill-corejs2: "npm:^0.4.10"
-    babel-plugin-polyfill-corejs3: "npm:^0.11.0"
-    babel-plugin-polyfill-regenerator: "npm:^0.6.1"
-    core-js-compat: "npm:^3.40.0"
+    babel-plugin-polyfill-corejs2: "npm:^0.4.14"
+    babel-plugin-polyfill-corejs3: "npm:^0.13.0"
+    babel-plugin-polyfill-regenerator: "npm:^0.6.5"
+    core-js-compat: "npm:^3.43.0"
     semver: "npm:^6.3.1"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10c0/fd7ec310832a9ff26ed8d56bc0832cdbdb3a188e022050b74790796650649fb8373568af05b320b58b3ff922507979bad50ff95a4d504ab0081134480103504e
+  checksum: 10c0/f343103b8f0e8da5be4ae031aff8bf35da4764997af4af78ae9506f421b785dd45da1bc09f845b1fc308c8b7d134aead4a1f89e7fb6e213cd2f9fe1d2aa78bc9
   languageName: node
   linkType: hard
 
@@ -1157,28 +1198,28 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/traverse@npm:^7.18.9, @babel/traverse@npm:^7.26.10, @babel/traverse@npm:^7.27.1, @babel/traverse@npm:^7.27.3, @babel/traverse@npm:^7.27.4":
-  version: 7.27.4
-  resolution: "@babel/traverse@npm:7.27.4"
+"@babel/traverse@npm:^7.18.9, @babel/traverse@npm:^7.26.10, @babel/traverse@npm:^7.27.1, @babel/traverse@npm:^7.28.0, @babel/traverse@npm:^7.28.3, @babel/traverse@npm:^7.28.4":
+  version: 7.28.4
+  resolution: "@babel/traverse@npm:7.28.4"
   dependencies:
     "@babel/code-frame": "npm:^7.27.1"
-    "@babel/generator": "npm:^7.27.3"
-    "@babel/parser": "npm:^7.27.4"
+    "@babel/generator": "npm:^7.28.3"
+    "@babel/helper-globals": "npm:^7.28.0"
+    "@babel/parser": "npm:^7.28.4"
     "@babel/template": "npm:^7.27.2"
-    "@babel/types": "npm:^7.27.3"
+    "@babel/types": "npm:^7.28.4"
     debug: "npm:^4.3.1"
-    globals: "npm:^11.1.0"
-  checksum: 10c0/6de8aa2a0637a6ee6d205bf48b9e923928a02415771fdec60085ed754dcdf605e450bb3315c2552fa51c31a4662275b45d5ae4ad527ce55a7db9acebdbbbb8ed
+  checksum: 10c0/ee678fdd49c9f54a32e07e8455242390d43ce44887cea6567b233fe13907b89240c377e7633478a32c6cf1be0e17c2f7f3b0c59f0666e39c5074cc47b968489c
   languageName: node
   linkType: hard
 
-"@babel/types@npm:^7.0.0, @babel/types@npm:^7.18.9, @babel/types@npm:^7.20.7, @babel/types@npm:^7.21.3, @babel/types@npm:^7.25.4, @babel/types@npm:^7.26.10, @babel/types@npm:^7.27.1, @babel/types@npm:^7.27.3, @babel/types@npm:^7.4.4":
-  version: 7.27.3
-  resolution: "@babel/types@npm:7.27.3"
+"@babel/types@npm:^7.0.0, @babel/types@npm:^7.18.9, @babel/types@npm:^7.20.7, @babel/types@npm:^7.21.3, @babel/types@npm:^7.25.4, @babel/types@npm:^7.26.10, @babel/types@npm:^7.27.1, @babel/types@npm:^7.27.3, @babel/types@npm:^7.28.2, @babel/types@npm:^7.28.4, @babel/types@npm:^7.4.4":
+  version: 7.28.4
+  resolution: "@babel/types@npm:7.28.4"
   dependencies:
     "@babel/helper-string-parser": "npm:^7.27.1"
     "@babel/helper-validator-identifier": "npm:^7.27.1"
-  checksum: 10c0/bafdfc98e722a6b91a783b6f24388f478fd775f0c0652e92220e08be2cc33e02d42088542f1953ac5e5ece2ac052172b3dadedf12bec9aae57899e92fb9a9757
+  checksum: 10c0/ac6f909d6191319e08c80efbfac7bd9a25f80cc83b43cd6d82e7233f7a6b9d6e7b90236f3af7400a3f83b576895bcab9188a22b584eb0f224e80e6d4e95f4517
   languageName: node
   linkType: hard
 
@@ -1207,13 +1248,32 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@bundled-es-modules/tough-cookie@npm:^0.1.6":
-  version: 0.1.6
-  resolution: "@bundled-es-modules/tough-cookie@npm:0.1.6"
+"@cacheable/memoize@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "@cacheable/memoize@npm:2.0.1"
   dependencies:
-    "@types/tough-cookie": "npm:^4.0.5"
-    tough-cookie: "npm:^4.1.4"
-  checksum: 10c0/28bcac878bff6b34719ba3aa8341e9924772ee55de5487680ebe784981ec9fccb70ed5d46f563e2404855a04de606f9e56aa4202842d4f5835bc04a4fe820571
+    "@cacheable/utils": "npm:^2.0.1"
+  checksum: 10c0/40ab683429132654b95edc1229c175c45045c239d647bffa75165ae572cd8da0ee9852dfb7c6baca4e8ecc0e3005c2555222ae02add8206d4a227106b1c5fc8d
+  languageName: node
+  linkType: hard
+
+"@cacheable/memory@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "@cacheable/memory@npm:2.0.1"
+  dependencies:
+    "@cacheable/memoize": "npm:^2.0.1"
+    "@cacheable/utils": "npm:^2.0.1"
+    "@keyv/bigmap": "npm:^1.0.0"
+    hookified: "npm:^1.12.0"
+    keyv: "npm:^5.5.1"
+  checksum: 10c0/dde1caf7fe66febe8dc9d32ac4eaee48b6b1e690881adfaf3c41188a00892a20514cd7847e33a64bad09c4c5d6e1377eb8e373b02b4b9fb5fa27e6a67297c625
+  languageName: node
+  linkType: hard
+
+"@cacheable/utils@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "@cacheable/utils@npm:2.0.1"
+  checksum: 10c0/63806cca7f60add1f7bd4acee279c723760322316661a9fc6deab9ba7c03569e6cbe744d88159d4e72c1f6d296bba53b53c396d01d52294d45c9fed04c416ca4
   languageName: node
   linkType: hard
 
@@ -1227,14 +1287,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/color-helpers@npm:^5.0.2":
-  version: 5.0.2
-  resolution: "@csstools/color-helpers@npm:5.0.2"
-  checksum: 10c0/bebaddb28b9eb58b0449edd5d0c0318fa88f3cb079602ee27e88c9118070d666dcc4e09a5aa936aba2fde6ba419922ade07b7b506af97dd7051abd08dfb2959b
+"@csstools/color-helpers@npm:^5.1.0":
+  version: 5.1.0
+  resolution: "@csstools/color-helpers@npm:5.1.0"
+  checksum: 10c0/b7f99d2e455cf1c9b41a67a5327d5d02888cd5c8802a68b1887dffef537d9d4bc66b3c10c1e62b40bbed638b6c1d60b85a232f904ed7b39809c4029cb36567db
   languageName: node
   linkType: hard
 
-"@csstools/css-calc@npm:^2.1.1, @csstools/css-calc@npm:^2.1.4":
+"@csstools/css-calc@npm:^2.1.4":
   version: 2.1.4
   resolution: "@csstools/css-calc@npm:2.1.4"
   peerDependencies:
@@ -1244,20 +1304,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/css-color-parser@npm:^3.0.10, @csstools/css-color-parser@npm:^3.0.7":
-  version: 3.0.10
-  resolution: "@csstools/css-color-parser@npm:3.0.10"
+"@csstools/css-color-parser@npm:^3.0.10, @csstools/css-color-parser@npm:^3.1.0":
+  version: 3.1.0
+  resolution: "@csstools/css-color-parser@npm:3.1.0"
   dependencies:
-    "@csstools/color-helpers": "npm:^5.0.2"
+    "@csstools/color-helpers": "npm:^5.1.0"
     "@csstools/css-calc": "npm:^2.1.4"
   peerDependencies:
     "@csstools/css-parser-algorithms": ^3.0.5
     "@csstools/css-tokenizer": ^3.0.4
-  checksum: 10c0/8f8a2395b117c2f09366b5c9bf49bc740c92a65b6330fe3cc1e76abafd0d1000e42a657d7b0a3814846a66f1d69896142f7e36d7a4aca77de977e5cc5f944747
+  checksum: 10c0/0e0c670ad54ec8ec4d9b07568b80defd83b9482191f5e8ca84ab546b7be6db5d7cc2ba7ac9fae54488b129a4be235d6183d3aab4416fec5e89351f73af4222c5
   languageName: node
   linkType: hard
 
-"@csstools/css-parser-algorithms@npm:^3.0.4, @csstools/css-parser-algorithms@npm:^3.0.5":
+"@csstools/css-parser-algorithms@npm:^3.0.5":
   version: 3.0.5
   resolution: "@csstools/css-parser-algorithms@npm:3.0.5"
   peerDependencies:
@@ -1266,14 +1326,23 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/css-tokenizer@npm:^3.0.3, @csstools/css-tokenizer@npm:^3.0.4":
+"@csstools/css-syntax-patches-for-csstree@npm:^1.0.14":
+  version: 1.0.14
+  resolution: "@csstools/css-syntax-patches-for-csstree@npm:1.0.14"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/e431cf5aa4ccd6a40f4a417663ac7178c822c5427b9c8473e466257dc46dd9698e3852d5517ec220b7d1d1ea911e9007ecb429464329ae169a0aa68b56f1c3ac
+  languageName: node
+  linkType: hard
+
+"@csstools/css-tokenizer@npm:^3.0.4":
   version: 3.0.4
   resolution: "@csstools/css-tokenizer@npm:3.0.4"
   checksum: 10c0/3b589f8e9942075a642213b389bab75a2d50d05d203727fcdac6827648a5572674caff07907eff3f9a2389d86a4ee47308fafe4f8588f4a77b7167c588d2559f
   languageName: node
   linkType: hard
 
-"@csstools/media-query-list-parser@npm:^4.0.2, @csstools/media-query-list-parser@npm:^4.0.3":
+"@csstools/media-query-list-parser@npm:^4.0.3":
   version: 4.0.3
   resolution: "@csstools/media-query-list-parser@npm:4.0.3"
   peerDependencies:
@@ -1283,6 +1352,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@csstools/postcss-alpha-function@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "@csstools/postcss-alpha-function@npm:1.0.1"
+  dependencies:
+    "@csstools/css-color-parser": "npm:^3.1.0"
+    "@csstools/css-parser-algorithms": "npm:^3.0.5"
+    "@csstools/css-tokenizer": "npm:^3.0.4"
+    "@csstools/postcss-progressive-custom-properties": "npm:^4.2.1"
+    "@csstools/utilities": "npm:^2.0.0"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/35ca209e572534ade21ac5c18aad702aa492eb39e2d0e475f441371063418fe9650554e6a59b1318d3a615da83ef54d9a588faa27063ecc0a568ef7290a6b488
+  languageName: node
+  linkType: hard
+
 "@csstools/postcss-cascade-layers@npm:^5.0.2":
   version: 5.0.2
   resolution: "@csstools/postcss-cascade-layers@npm:5.0.2"
@@ -1295,62 +1379,92 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/postcss-color-function@npm:^4.0.10":
-  version: 4.0.10
-  resolution: "@csstools/postcss-color-function@npm:4.0.10"
+"@csstools/postcss-color-function-display-p3-linear@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "@csstools/postcss-color-function-display-p3-linear@npm:1.0.1"
   dependencies:
-    "@csstools/css-color-parser": "npm:^3.0.10"
+    "@csstools/css-color-parser": "npm:^3.1.0"
     "@csstools/css-parser-algorithms": "npm:^3.0.5"
     "@csstools/css-tokenizer": "npm:^3.0.4"
-    "@csstools/postcss-progressive-custom-properties": "npm:^4.1.0"
+    "@csstools/postcss-progressive-custom-properties": "npm:^4.2.1"
     "@csstools/utilities": "npm:^2.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/a6e65d37a114f95634a07660daa1aa52f4abfb6ddd740cc9267967a5948f5c72469a6ba2432ab1f31616d6f1a4ab963b69f778497496986535831b0b2b399f75
+  checksum: 10c0/d02d45410c9257f5620c766f861f8fa3762b74ef01fdba8060b33a4c98f929e2219cd476b25bd4181ac186158a4d99a0da555c0b6ba45a7ac4a3a5885baad1f5
   languageName: node
   linkType: hard
 
-"@csstools/postcss-color-mix-function@npm:^3.0.10":
-  version: 3.0.10
-  resolution: "@csstools/postcss-color-mix-function@npm:3.0.10"
+"@csstools/postcss-color-function@npm:^4.0.12":
+  version: 4.0.12
+  resolution: "@csstools/postcss-color-function@npm:4.0.12"
   dependencies:
-    "@csstools/css-color-parser": "npm:^3.0.10"
+    "@csstools/css-color-parser": "npm:^3.1.0"
     "@csstools/css-parser-algorithms": "npm:^3.0.5"
     "@csstools/css-tokenizer": "npm:^3.0.4"
-    "@csstools/postcss-progressive-custom-properties": "npm:^4.1.0"
+    "@csstools/postcss-progressive-custom-properties": "npm:^4.2.1"
     "@csstools/utilities": "npm:^2.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/9505a09a805f52555bd06c8f54d537a99578efe5c7e643c9fdaca8cbb7d74d4d3e07b829c6aed315c75ec5ce113261fb402e01b67e4a423ed39ea8991a6dded0
+  checksum: 10c0/a355b04d90f89c8e37a4a23543151558060acc68fb2e7d1c3549bebeeae2b147eec26af1fbc6ee690f0ba4830263f2d181f5331d16d3483b5542be46996fa755
   languageName: node
   linkType: hard
 
-"@csstools/postcss-color-mix-variadic-function-arguments@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "@csstools/postcss-color-mix-variadic-function-arguments@npm:1.0.0"
+"@csstools/postcss-color-mix-function@npm:^3.0.12":
+  version: 3.0.12
+  resolution: "@csstools/postcss-color-mix-function@npm:3.0.12"
   dependencies:
-    "@csstools/css-color-parser": "npm:^3.0.10"
+    "@csstools/css-color-parser": "npm:^3.1.0"
     "@csstools/css-parser-algorithms": "npm:^3.0.5"
     "@csstools/css-tokenizer": "npm:^3.0.4"
-    "@csstools/postcss-progressive-custom-properties": "npm:^4.1.0"
+    "@csstools/postcss-progressive-custom-properties": "npm:^4.2.1"
     "@csstools/utilities": "npm:^2.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/dd45bd19931cc4780247173b793e5f1e6409b76f92b04fe26e07b0fa048aedc7bcbd92356a558581f695654c2f2d189e1b40b14a9c3f246e86e83b0edf646066
+  checksum: 10c0/3e98a5118852083d1f87a3f842f78088192b1f9f08fdf1f3b3ef1e8969e18fdadc1e3bcac3d113a07c8917a7e8fa65fdec55a31df9a1b726c8d7ae89db86e8e5
   languageName: node
   linkType: hard
 
-"@csstools/postcss-content-alt-text@npm:^2.0.6":
-  version: 2.0.6
-  resolution: "@csstools/postcss-content-alt-text@npm:2.0.6"
+"@csstools/postcss-color-mix-variadic-function-arguments@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "@csstools/postcss-color-mix-variadic-function-arguments@npm:1.0.2"
   dependencies:
+    "@csstools/css-color-parser": "npm:^3.1.0"
     "@csstools/css-parser-algorithms": "npm:^3.0.5"
     "@csstools/css-tokenizer": "npm:^3.0.4"
-    "@csstools/postcss-progressive-custom-properties": "npm:^4.1.0"
+    "@csstools/postcss-progressive-custom-properties": "npm:^4.2.1"
     "@csstools/utilities": "npm:^2.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/e7d21002a84d0fba4fe815fb7d3d19b81fb1719a7b6fdd240eb6639d58937b64d6f5c9aa11ffe8a64891a2ed181818cd56d346f58949c2eaa9df7c82ee95ef8e
+  checksum: 10c0/34073f0f0d33e4958f90763e692955a8e8c678b74284234497c4aa0d2143756e1b3616e0c09832caad498870e227ca0a681316afe3a71224fc40ade0ead1bdd9
+  languageName: node
+  linkType: hard
+
+"@csstools/postcss-content-alt-text@npm:^2.0.8":
+  version: 2.0.8
+  resolution: "@csstools/postcss-content-alt-text@npm:2.0.8"
+  dependencies:
+    "@csstools/css-parser-algorithms": "npm:^3.0.5"
+    "@csstools/css-tokenizer": "npm:^3.0.4"
+    "@csstools/postcss-progressive-custom-properties": "npm:^4.2.1"
+    "@csstools/utilities": "npm:^2.0.0"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/4c330cc2a1e434688a62613ecceb1434cd725ce024c1ad8d4a4c76b9839d1f3ea8566a8c6494921e2b46ec7feef6af8ed6548c216dcb8f0feab4b1d52c96228e
+  languageName: node
+  linkType: hard
+
+"@csstools/postcss-contrast-color-function@npm:^2.0.12":
+  version: 2.0.12
+  resolution: "@csstools/postcss-contrast-color-function@npm:2.0.12"
+  dependencies:
+    "@csstools/css-color-parser": "npm:^3.1.0"
+    "@csstools/css-parser-algorithms": "npm:^3.0.5"
+    "@csstools/css-tokenizer": "npm:^3.0.4"
+    "@csstools/postcss-progressive-custom-properties": "npm:^4.2.1"
+    "@csstools/utilities": "npm:^2.0.0"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10c0/b783ce948cdf1513ee238e9115b42881a8d3e5d13c16038601b1c470d661cfaeeece4eea29904fb9fcae878bad86f766810fa798a703ab9ad4b0cf276b173f8f
   languageName: node
   linkType: hard
 
@@ -1379,59 +1493,59 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/postcss-gamut-mapping@npm:^2.0.10":
-  version: 2.0.10
-  resolution: "@csstools/postcss-gamut-mapping@npm:2.0.10"
+"@csstools/postcss-gamut-mapping@npm:^2.0.11":
+  version: 2.0.11
+  resolution: "@csstools/postcss-gamut-mapping@npm:2.0.11"
   dependencies:
-    "@csstools/css-color-parser": "npm:^3.0.10"
+    "@csstools/css-color-parser": "npm:^3.1.0"
     "@csstools/css-parser-algorithms": "npm:^3.0.5"
     "@csstools/css-tokenizer": "npm:^3.0.4"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/87cd8289478bf88195469fcf4f80c8fed9e0e5ef76a335a10c4c21582542acb16cced1e00e7da90deaf2e62e383a5c6fe402f429f227c87a2c20e2545a69c537
+  checksum: 10c0/490b8ccf10e30879a4415afbdd3646e1cdac3671586b7916855cf47a536f3be75eed014396056bde6528e0cb76d904e79bad78afc0b499e837264cf22519d145
   languageName: node
   linkType: hard
 
-"@csstools/postcss-gradients-interpolation-method@npm:^5.0.10":
-  version: 5.0.10
-  resolution: "@csstools/postcss-gradients-interpolation-method@npm:5.0.10"
+"@csstools/postcss-gradients-interpolation-method@npm:^5.0.12":
+  version: 5.0.12
+  resolution: "@csstools/postcss-gradients-interpolation-method@npm:5.0.12"
   dependencies:
-    "@csstools/css-color-parser": "npm:^3.0.10"
+    "@csstools/css-color-parser": "npm:^3.1.0"
     "@csstools/css-parser-algorithms": "npm:^3.0.5"
     "@csstools/css-tokenizer": "npm:^3.0.4"
-    "@csstools/postcss-progressive-custom-properties": "npm:^4.1.0"
+    "@csstools/postcss-progressive-custom-properties": "npm:^4.2.1"
     "@csstools/utilities": "npm:^2.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/206d079d7679a9609a4fb227ddaf3443d04cff88b55bcfec1cf63c9de372b8720edde8614fc51d2237e4edbff8ce34697f912bc25c2ae41390353fce88455515
+  checksum: 10c0/70b3d6c7050ce882ed2281e71eb4493531ae8d55d21899920eeeb6c205d90aaf430419a66235484ccce3a1a1891367dfc0ef772f3866ae3a9d8ec5ddd0cfe894
   languageName: node
   linkType: hard
 
-"@csstools/postcss-hwb-function@npm:^4.0.10":
-  version: 4.0.10
-  resolution: "@csstools/postcss-hwb-function@npm:4.0.10"
+"@csstools/postcss-hwb-function@npm:^4.0.12":
+  version: 4.0.12
+  resolution: "@csstools/postcss-hwb-function@npm:4.0.12"
   dependencies:
-    "@csstools/css-color-parser": "npm:^3.0.10"
+    "@csstools/css-color-parser": "npm:^3.1.0"
     "@csstools/css-parser-algorithms": "npm:^3.0.5"
     "@csstools/css-tokenizer": "npm:^3.0.4"
-    "@csstools/postcss-progressive-custom-properties": "npm:^4.1.0"
+    "@csstools/postcss-progressive-custom-properties": "npm:^4.2.1"
     "@csstools/utilities": "npm:^2.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/defb9b319b14228307196b9a88e3cbf0acd1d3768b936716dca846875068ad4453e7a2a3d75d1fab5534c8655e9c555e1fa70d30e2c85d68ed2117a7cfe7837c
+  checksum: 10c0/d0dac34da9d7ac654060b6b27690a419718e990b21ff3e63266ea59934a865bc6aeae8eb8e1ca3e227a8b2a208657e3ab70ccdf0437f1f09d21ab848bbffcaa2
   languageName: node
   linkType: hard
 
-"@csstools/postcss-ic-unit@npm:^4.0.2":
-  version: 4.0.2
-  resolution: "@csstools/postcss-ic-unit@npm:4.0.2"
+"@csstools/postcss-ic-unit@npm:^4.0.4":
+  version: 4.0.4
+  resolution: "@csstools/postcss-ic-unit@npm:4.0.4"
   dependencies:
-    "@csstools/postcss-progressive-custom-properties": "npm:^4.1.0"
+    "@csstools/postcss-progressive-custom-properties": "npm:^4.2.1"
     "@csstools/utilities": "npm:^2.0.0"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/26adb8351143e591080f542d87b223ee5ebc5f33f6d03b217505b249ceb19c46a06732a88000e3a1857ae712a6ea0ffa089a24ad8b8042421490539de5c3d0e8
+  checksum: 10c0/20168e70ecb4abf7a69e407d653b6c7c9c82f2c7b1da0920e1d035f62b5ef8552cc7f1b62e0dca318df13c348e79fba862e1a4bb0e9432119a82b10aeb511752
   languageName: node
   linkType: hard
 
@@ -1456,17 +1570,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/postcss-light-dark-function@npm:^2.0.9":
-  version: 2.0.9
-  resolution: "@csstools/postcss-light-dark-function@npm:2.0.9"
+"@csstools/postcss-light-dark-function@npm:^2.0.11":
+  version: 2.0.11
+  resolution: "@csstools/postcss-light-dark-function@npm:2.0.11"
   dependencies:
     "@csstools/css-parser-algorithms": "npm:^3.0.5"
     "@csstools/css-tokenizer": "npm:^3.0.4"
-    "@csstools/postcss-progressive-custom-properties": "npm:^4.1.0"
+    "@csstools/postcss-progressive-custom-properties": "npm:^4.2.1"
     "@csstools/utilities": "npm:^2.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/ee2937f0e5dcaafd10349f0914596e8e1ef6f9d46939c6a6b0e2e63cab0552594e5140bf56e485048c3bca6634dd9673a176c57b9e77001332787f4263835c0f
+  checksum: 10c0/0175be41bb0044a48bc98d5c55cce41ed6b9ada88253c5f20d0ca17287cba4b429742b458ac5744675b9a286109e13ac51d64e226ab16040d7b051ba64c0c77b
   languageName: node
   linkType: hard
 
@@ -1570,29 +1684,29 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/postcss-oklab-function@npm:^4.0.10":
-  version: 4.0.10
-  resolution: "@csstools/postcss-oklab-function@npm:4.0.10"
+"@csstools/postcss-oklab-function@npm:^4.0.12":
+  version: 4.0.12
+  resolution: "@csstools/postcss-oklab-function@npm:4.0.12"
   dependencies:
-    "@csstools/css-color-parser": "npm:^3.0.10"
+    "@csstools/css-color-parser": "npm:^3.1.0"
     "@csstools/css-parser-algorithms": "npm:^3.0.5"
     "@csstools/css-tokenizer": "npm:^3.0.4"
-    "@csstools/postcss-progressive-custom-properties": "npm:^4.1.0"
+    "@csstools/postcss-progressive-custom-properties": "npm:^4.2.1"
     "@csstools/utilities": "npm:^2.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/421d1f2574941c3caecd608588533581fc0766998cc85474008a49b5f1011249cb2be7ef9f21a346fd3895598da18e58860fde06d34b1b833918fa880c41c18f
+  checksum: 10c0/40d4f51b568c8299c054f8971d0e85fa7da609ba23ce6c84dc17e16bc3838640ed6da75c3886dc9a96a11005773c6e23cba13a5510c781b2d633d07ad7bda6b7
   languageName: node
   linkType: hard
 
-"@csstools/postcss-progressive-custom-properties@npm:^4.1.0":
-  version: 4.1.0
-  resolution: "@csstools/postcss-progressive-custom-properties@npm:4.1.0"
+"@csstools/postcss-progressive-custom-properties@npm:^4.2.1":
+  version: 4.2.1
+  resolution: "@csstools/postcss-progressive-custom-properties@npm:4.2.1"
   dependencies:
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/175081a5c53e37a282f596e01359d4411800e4017c2d389caaa2b7c9b7507a50c5f1ac3d937f27f000be3ac2ac788cad9c1490ec6bc1d4de51331f3cc8ccda8e
+  checksum: 10c0/56e9a147799719fd5c550c035437693dd50cdfef46d66a4f2ce8f196e1006a096aa47d412710a89c3dc9808068a0a101c7f607a507ed68e925580c6f921e84d5
   languageName: node
   linkType: hard
 
@@ -1609,18 +1723,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/postcss-relative-color-syntax@npm:^3.0.10":
-  version: 3.0.10
-  resolution: "@csstools/postcss-relative-color-syntax@npm:3.0.10"
+"@csstools/postcss-relative-color-syntax@npm:^3.0.12":
+  version: 3.0.12
+  resolution: "@csstools/postcss-relative-color-syntax@npm:3.0.12"
   dependencies:
-    "@csstools/css-color-parser": "npm:^3.0.10"
+    "@csstools/css-color-parser": "npm:^3.1.0"
     "@csstools/css-parser-algorithms": "npm:^3.0.5"
     "@csstools/css-tokenizer": "npm:^3.0.4"
-    "@csstools/postcss-progressive-custom-properties": "npm:^4.1.0"
+    "@csstools/postcss-progressive-custom-properties": "npm:^4.2.1"
     "@csstools/utilities": "npm:^2.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/de9c41a936a77dab68cdb2dd23a26ba1b92d90bf2a7cf463fada2f2daf6ad0d7394fa2b1ed444f509006992961d993383a34a9afd3a48a9dc67a3793afcd9bb8
+  checksum: 10c0/11af386c8193e22c148ac034eee94c56da3060bdbde3196d2d641b088e12de35bef187bcd7d421f9e4d49c4f1cfc28b24e136e62107e02ed7007a3a28f635d06
   languageName: node
   linkType: hard
 
@@ -1661,15 +1775,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/postcss-text-decoration-shorthand@npm:^4.0.2":
-  version: 4.0.2
-  resolution: "@csstools/postcss-text-decoration-shorthand@npm:4.0.2"
+"@csstools/postcss-text-decoration-shorthand@npm:^4.0.3":
+  version: 4.0.3
+  resolution: "@csstools/postcss-text-decoration-shorthand@npm:4.0.3"
   dependencies:
-    "@csstools/color-helpers": "npm:^5.0.2"
+    "@csstools/color-helpers": "npm:^5.1.0"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/01e2f3717e7a42224dc1a746491c55a381cf208cb7588f0308eeefe730675be4c7bb56c0cc557e75999c981e67da7d0b0bb68610635752c89ef251ee435b9cac
+  checksum: 10c0/f6af7d5dcf599edcf76c5e396ef2d372bbe1c1f3fbaaccd91e91049e64b6ff68b44f459277aef0a8110baca3eaa21275012adc52ccb8c0fc526a4c35577f8fce
   languageName: node
   linkType: hard
 
@@ -1787,31 +1901,31 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@emnapi/core@npm:^1.3.1":
-  version: 1.3.1
-  resolution: "@emnapi/core@npm:1.3.1"
+"@emnapi/core@npm:^1.4.3":
+  version: 1.4.5
+  resolution: "@emnapi/core@npm:1.4.5"
   dependencies:
-    "@emnapi/wasi-threads": "npm:1.0.1"
+    "@emnapi/wasi-threads": "npm:1.0.4"
     tslib: "npm:^2.4.0"
-  checksum: 10c0/d3be1044ad704e2c486641bc18908523490f28c7d38bd12d9c1d4ce37d39dae6c4aecd2f2eaf44c6e3bd90eaf04e0591acc440b1b038cdf43cce078a355a0ea0
+  checksum: 10c0/da4a57f65f325d720d0e0d1a9c6618b90c4c43a5027834a110476984e1d47c95ebaed4d316b5dddb9c0ed9a493ffeb97d1934f9677035f336d8a36c1f3b2818f
   languageName: node
   linkType: hard
 
-"@emnapi/runtime@npm:^1.3.1":
-  version: 1.3.1
-  resolution: "@emnapi/runtime@npm:1.3.1"
+"@emnapi/runtime@npm:^1.4.3":
+  version: 1.4.5
+  resolution: "@emnapi/runtime@npm:1.4.5"
   dependencies:
     tslib: "npm:^2.4.0"
-  checksum: 10c0/060ffede50f1b619c15083312b80a9e62a5b0c87aa8c1b54854c49766c9d69f8d1d3d87bd963a647071263a320db41b25eaa50b74d6a80dcc763c23dbeaafd6c
+  checksum: 10c0/37a0278be5ac81e918efe36f1449875cbafba947039c53c65a1f8fc238001b866446fc66041513b286baaff5d6f9bec667f5164b3ca481373a8d9cb65bfc984b
   languageName: node
   linkType: hard
 
-"@emnapi/wasi-threads@npm:1.0.1":
-  version: 1.0.1
-  resolution: "@emnapi/wasi-threads@npm:1.0.1"
+"@emnapi/wasi-threads@npm:1.0.4":
+  version: 1.0.4
+  resolution: "@emnapi/wasi-threads@npm:1.0.4"
   dependencies:
     tslib: "npm:^2.4.0"
-  checksum: 10c0/1e0c8036b8d53e9b07cc9acf021705ef6c86ab6b13e1acda7fffaf541a2d3565072afb92597419173ced9ea14f6bf32fce149106e669b5902b825e8b499e5c6c
+  checksum: 10c0/2c91a53e62f875800baf035c4d42c9c0d18e5afd9a31ca2aac8b435aeaeaeaac386b5b3d0d0e70aa7a5a9852bbe05106b1f680cd82cce03145c703b423d41313
   languageName: node
   linkType: hard
 
@@ -1932,14 +2046,23 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@es-joy/jsdoccomment@npm:~0.49.0":
-  version: 0.49.0
-  resolution: "@es-joy/jsdoccomment@npm:0.49.0"
+"@epic-web/invariant@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "@epic-web/invariant@npm:1.0.0"
+  checksum: 10c0/72dbeb026e4e4eb3bc9c65739b91408ca77ab7d603a2494fa2eff3790ec22892c4caba751cffdf30f5ccf0e7ba79c1e9c96cf0a357404b9432bf1365baac23ca
+  languageName: node
+  linkType: hard
+
+"@es-joy/jsdoccomment@npm:~0.52.0":
+  version: 0.52.0
+  resolution: "@es-joy/jsdoccomment@npm:0.52.0"
   dependencies:
+    "@types/estree": "npm:^1.0.8"
+    "@typescript-eslint/types": "npm:^8.34.1"
     comment-parser: "npm:1.4.1"
     esquery: "npm:^1.6.0"
     jsdoc-type-pratt-parser: "npm:~4.1.0"
-  checksum: 10c0/16717507d557d37e7b59456fedeefbe0a3bc93aa2d9c043d5db91e24e076509b6fcb10ee6fd1dafcb0c5bbe50ae329b45de5b83541cb5994a98c9e862a45641e
+  checksum: 10c0/4def78060ef58859f31757b9d30c4939fc33e7d9ee85637a7f568c1d209c33aa0abd2cf5a3a4f3662ec5b12b85ecff2f2035d809dc93b9382a31a6dfb200d83c
   languageName: node
   linkType: hard
 
@@ -2136,30 +2259,30 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@eslint/config-array@npm:^0.19.2":
-  version: 0.19.2
-  resolution: "@eslint/config-array@npm:0.19.2"
+"@eslint/config-array@npm:^0.21.0":
+  version: 0.21.0
+  resolution: "@eslint/config-array@npm:0.21.0"
   dependencies:
     "@eslint/object-schema": "npm:^2.1.6"
     debug: "npm:^4.3.1"
     minimatch: "npm:^3.1.2"
-  checksum: 10c0/dd68da9abb32d336233ac4fe0db1e15a0a8d794b6e69abb9e57545d746a97f6f542496ff9db0d7e27fab1438546250d810d90b1904ac67677215b8d8e7573f3d
+  checksum: 10c0/0ea801139166c4aa56465b309af512ef9b2d3c68f9198751bbc3e21894fe70f25fbf26e1b0e9fffff41857bc21bfddeee58649ae6d79aadcd747db0c5dca771f
   languageName: node
   linkType: hard
 
-"@eslint/config-helpers@npm:^0.2.0":
-  version: 0.2.0
-  resolution: "@eslint/config-helpers@npm:0.2.0"
-  checksum: 10c0/743a64653e13177029108f57ab47460ded08e3412c86216a14b7e8ab2dc79c2b64be45bf55c5ef29f83692a707dc34cf1e9217e4b8b4b272a0d9b691fdaf6a2a
+"@eslint/config-helpers@npm:^0.3.0":
+  version: 0.3.0
+  resolution: "@eslint/config-helpers@npm:0.3.0"
+  checksum: 10c0/013ae7b189eeae8b30cc2ee87bc5c9c091a9cd615579003290eb28bebad5d78806a478e74ba10b3fe08ed66975b52af7d2cd4b4b43990376412b14e5664878c8
   languageName: node
   linkType: hard
 
-"@eslint/core@npm:^0.12.0":
-  version: 0.12.0
-  resolution: "@eslint/core@npm:0.12.0"
+"@eslint/core@npm:^0.15.0, @eslint/core@npm:^0.15.1":
+  version: 0.15.1
+  resolution: "@eslint/core@npm:0.15.1"
   dependencies:
     "@types/json-schema": "npm:^7.0.15"
-  checksum: 10c0/d032af81195bb28dd800c2b9617548c6c2a09b9490da3c5537fd2a1201501666d06492278bb92cfccac1f7ac249e58601dd87f813ec0d6a423ef0880434fa0c3
+  checksum: 10c0/abaf641940776638b8c15a38d99ce0dac551a8939310ec81b9acd15836a574cf362588eaab03ab11919bc2a0f9648b19ea8dee33bf12675eb5b6fd38bda6f25e
   languageName: node
   linkType: hard
 
@@ -2180,10 +2303,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@eslint/js@npm:9.23.0, @eslint/js@npm:^9.23.0":
-  version: 9.23.0
-  resolution: "@eslint/js@npm:9.23.0"
-  checksum: 10c0/4e70869372b6325389e0ab51cac6d3062689807d1cef2c3434857571422ce11dde3c62777af85c382b9f94d937127598d605d2086787f08611351bf99faded81
+"@eslint/js@npm:9.32.0, @eslint/js@npm:^9.23.0":
+  version: 9.32.0
+  resolution: "@eslint/js@npm:9.32.0"
+  checksum: 10c0/f71e8f9146638d11fb15238279feff98801120a4d4130f1c587c4f09b024ff5ec01af1ba88e97ba6b7013488868898a668f77091300cc3d4394c7a8ed32d2667
   languageName: node
   linkType: hard
 
@@ -2194,13 +2317,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@eslint/plugin-kit@npm:^0.2.7":
-  version: 0.2.7
-  resolution: "@eslint/plugin-kit@npm:0.2.7"
+"@eslint/plugin-kit@npm:^0.3.4":
+  version: 0.3.4
+  resolution: "@eslint/plugin-kit@npm:0.3.4"
   dependencies:
-    "@eslint/core": "npm:^0.12.0"
+    "@eslint/core": "npm:^0.15.1"
     levn: "npm:^0.4.1"
-  checksum: 10c0/0a1aff1ad63e72aca923217e556c6dfd67d7cd121870eb7686355d7d1475d569773528a8b2111b9176f3d91d2ea81f7413c34600e8e5b73d59e005d70780b633
+  checksum: 10c0/64331ca100f62a0115d10419a28059d0f377e390192163b867b9019517433d5073d10b4ec21f754fa01faf832aceb34178745924baab2957486f8bf95fd628d2
   languageName: node
   linkType: hard
 
@@ -2231,17 +2354,14 @@ __metadata:
   linkType: hard
 
 "@formatjs/cli@npm:^6.1.1":
-  version: 6.3.14
-  resolution: "@formatjs/cli@npm:6.3.14"
+  version: 6.7.2
+  resolution: "@formatjs/cli@npm:6.7.2"
   peerDependencies:
-    "@glimmer/env": ^0.1.7
-    "@glimmer/reference": ^0.91.1 || ^0.92.0 || ^0.93.0
-    "@glimmer/syntax": ^0.92.0 || ^0.93.0
-    "@glimmer/validator": ^0.92.0 || ^0.93.0
-    "@vue/compiler-core": ^3.4.0
-    content-tag: ^2.0.1 || ^3.0.0
-    ember-template-recast: ^6.1.4
-    vue: ^3.4.0
+    "@glimmer/syntax": ^0.94.9
+    "@vue/compiler-core": ^3.5.12
+    content-tag: ^3.0.0
+    ember-template-recast: ^6.1.5
+    vue: ^3.5.12
   peerDependenciesMeta:
     "@glimmer/env":
       optional: true
@@ -2261,7 +2381,7 @@ __metadata:
       optional: true
   bin:
     formatjs: bin/formatjs
-  checksum: 10c0/b4c83ed7fdc8dcd48b2f48fa9cca65b52472fb096eb028517a872f8a71ed3964f4b0a6bbc607f821a9504f396fe7341ef4d9ad44a381a37f280ed7547de66f41
+  checksum: 10c0/fbcb1d35915a5b1542e4fa3f3f79e23fa5988681e6c238d7e8a3d4d32e18df3e5c36cebe01b04e011bb5c91f96f4d08d36af750259aa799d3e81943084e2f0c2
   languageName: node
   linkType: hard
 
@@ -2277,6 +2397,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@formatjs/ecma402-abstract@npm:2.3.5":
+  version: 2.3.5
+  resolution: "@formatjs/ecma402-abstract@npm:2.3.5"
+  dependencies:
+    "@formatjs/fast-memoize": "npm:2.2.7"
+    "@formatjs/intl-localematcher": "npm:0.6.2"
+    decimal.js: "npm:^10.4.3"
+    tslib: "npm:^2.8.0"
+  checksum: 10c0/c6cac6312a1228347adf3a6a5fd09c0593e7d199e7a56484ece7cb8121c4138ba5c2777b70f82e88d8fbe3199ef5f48b2b1444f0348ee315b930e9db33c67d84
+  languageName: node
+  linkType: hard
+
 "@formatjs/fast-memoize@npm:2.2.7":
   version: 2.2.7
   resolution: "@formatjs/fast-memoize@npm:2.2.7"
@@ -2297,6 +2429,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@formatjs/icu-messageformat-parser@npm:2.11.3":
+  version: 2.11.3
+  resolution: "@formatjs/icu-messageformat-parser@npm:2.11.3"
+  dependencies:
+    "@formatjs/ecma402-abstract": "npm:2.3.5"
+    "@formatjs/icu-skeleton-parser": "npm:1.8.15"
+    tslib: "npm:^2.8.0"
+  checksum: 10c0/dfa08a671318bc9425f9b8e77ba0fb11856c9e1bb366b2a9c820212711d3483d9337fba50ef0a65c259c5564a6306355b065d739feae56e03b3046edba739460
+  languageName: node
+  linkType: hard
+
 "@formatjs/icu-skeleton-parser@npm:1.8.14":
   version: 1.8.14
   resolution: "@formatjs/icu-skeleton-parser@npm:1.8.14"
@@ -2307,6 +2450,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@formatjs/icu-skeleton-parser@npm:1.8.15":
+  version: 1.8.15
+  resolution: "@formatjs/icu-skeleton-parser@npm:1.8.15"
+  dependencies:
+    "@formatjs/ecma402-abstract": "npm:2.3.5"
+    tslib: "npm:^2.8.0"
+  checksum: 10c0/e33478f3cdb6d49f8531f35fb80db98d49533add42cd4ab8d3f3cef72c3496ae3042dfe24f252e6afffd3e4f6c9f1dec88367973c14e779dc07947c75641cede
+  languageName: node
+  linkType: hard
+
 "@formatjs/intl-localematcher@npm:0.6.1":
   version: 0.6.1
   resolution: "@formatjs/intl-localematcher@npm:0.6.1"
@@ -2316,53 +2469,42 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@formatjs/intl-pluralrules@npm:^5.4.4":
-  version: 5.4.4
-  resolution: "@formatjs/intl-pluralrules@npm:5.4.4"
+"@formatjs/intl-localematcher@npm:0.6.2":
+  version: 0.6.2
+  resolution: "@formatjs/intl-localematcher@npm:0.6.2"
   dependencies:
-    "@formatjs/ecma402-abstract": "npm:2.3.4"
-    "@formatjs/intl-localematcher": "npm:0.6.1"
-    decimal.js: "npm:^10.4.3"
     tslib: "npm:^2.8.0"
-  checksum: 10c0/8a8ec9f2fad40d9fa654a68de06fb18aaa6f0eafa908f41397f057366740625c12da627c6de68e0396fcd67ceaaa2c5c20a4b102f71ac8694abd9e76cceca949
+  checksum: 10c0/22a17a4c67160b6c9f52667914acfb7b79cd6d80630d4ac6d4599ce447cb89d2a64f7d58fa35c3145ddb37fef893f0a45b9a55e663a4eb1f2ae8b10a89fac235
   languageName: node
   linkType: hard
 
-"@formatjs/intl@npm:3.1.6":
-  version: 3.1.6
-  resolution: "@formatjs/intl@npm:3.1.6"
+"@formatjs/intl-pluralrules@npm:^5.4.4":
+  version: 5.4.5
+  resolution: "@formatjs/intl-pluralrules@npm:5.4.5"
   dependencies:
-    "@formatjs/ecma402-abstract": "npm:2.3.4"
+    "@formatjs/ecma402-abstract": "npm:2.3.5"
+    "@formatjs/intl-localematcher": "npm:0.6.2"
+    decimal.js: "npm:^10.4.3"
+    tslib: "npm:^2.8.0"
+  checksum: 10c0/2405fd2a4c8ce7a5c25ae824daa1408b07664a4f5ca573683fedad78a487a118b50391b0a2234db921c615e1ed4f53e860a55cd9892708ae49f5766980495b6e
+  languageName: node
+  linkType: hard
+
+"@formatjs/intl@npm:3.1.7":
+  version: 3.1.7
+  resolution: "@formatjs/intl@npm:3.1.7"
+  dependencies:
+    "@formatjs/ecma402-abstract": "npm:2.3.5"
     "@formatjs/fast-memoize": "npm:2.2.7"
-    "@formatjs/icu-messageformat-parser": "npm:2.11.2"
-    intl-messageformat: "npm:10.7.16"
+    "@formatjs/icu-messageformat-parser": "npm:2.11.3"
+    intl-messageformat: "npm:10.7.17"
     tslib: "npm:^2.8.0"
   peerDependencies:
-    typescript: ^5.6.0
+    typescript: 5.8.3
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 10c0/a31f8d2569c9f2384f67a76f1cc2c8bfc2721c97a7dee0e971b6cfc0f223449bab0cfdc29140e3b71d74b04573c20ee8600909d256293e296a809da69a141530
-  languageName: node
-  linkType: hard
-
-"@formatjs/ts-transformer@npm:3.13.34":
-  version: 3.13.34
-  resolution: "@formatjs/ts-transformer@npm:3.13.34"
-  dependencies:
-    "@formatjs/icu-messageformat-parser": "npm:2.11.2"
-    "@types/json-stable-stringify": "npm:^1.1.0"
-    "@types/node": "npm:^22.0.0"
-    chalk: "npm:^4.1.2"
-    json-stable-stringify: "npm:^1.1.1"
-    tslib: "npm:^2.8.0"
-    typescript: "npm:^5.6.0"
-  peerDependencies:
-    ts-jest: ^29
-  peerDependenciesMeta:
-    ts-jest:
-      optional: true
-  checksum: 10c0/2e53af5a53cab71be0ba2fc16ba856c95bf336c063cc835486cd3a68d01013c5c08026b34667f4bdf99422e74faa8eb1f26d5fe8006f3a1ae9c77e065599362e
+  checksum: 10c0/52d800f587ed11407879f44b971a498844f116d966f9348ef1b597b7a4ee91f8023e0270797961be8126989512859f5944c4115e39675f4959a22b7837b62e77
   languageName: node
   linkType: hard
 
@@ -2386,6 +2528,25 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@formatjs/ts-transformer@npm:3.14.1":
+  version: 3.14.1
+  resolution: "@formatjs/ts-transformer@npm:3.14.1"
+  dependencies:
+    "@formatjs/icu-messageformat-parser": "npm:2.11.3"
+    "@types/node": "npm:^22.0.0"
+    chalk: "npm:^4.1.2"
+    json-stable-stringify: "npm:^1.3.0"
+    tslib: "npm:^2.8.0"
+    typescript: "npm:5.8.3"
+  peerDependencies:
+    ts-jest: ^29
+  peerDependenciesMeta:
+    ts-jest:
+      optional: true
+  checksum: 10c0/ed412d70fb0b8a57b74f1453e2605481295fda71ba462f4c65fab3d1a7f5a0c51c70fa78b9e9e2b291917eb63bbc5cffc7df27f04645832ae64e881e1327a11c
+  languageName: node
+  linkType: hard
+
 "@gamestdio/websocket@npm:^0.3.2":
   version: 0.3.2
   resolution: "@gamestdio/websocket@npm:0.3.2"
@@ -2495,10 +2656,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@ioredis/commands@npm:^1.1.1":
-  version: 1.2.0
-  resolution: "@ioredis/commands@npm:1.2.0"
-  checksum: 10c0/a5d3c29dd84d8a28b7c67a441ac1715cbd7337a7b88649c0f17c345d89aa218578d2b360760017c48149ef8a70f44b051af9ac0921a0622c2b479614c4f65b36
+"@ioredis/commands@npm:1.4.0":
+  version: 1.4.0
+  resolution: "@ioredis/commands@npm:1.4.0"
+  checksum: 10c0/99afe21fba794f84a2b84cceabcc370a7622e7b8b97a6589456c07c9fa62a15d54c5546f6f7214fb9a2458b1fa87579d5c531aaf48e06cc9be156d5923892c8d
   languageName: node
   linkType: hard
 
@@ -2516,6 +2677,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@isaacs/fs-minipass@npm:^4.0.0":
+  version: 4.0.1
+  resolution: "@isaacs/fs-minipass@npm:4.0.1"
+  dependencies:
+    minipass: "npm:^7.0.4"
+  checksum: 10c0/c25b6dc1598790d5b55c0947a9b7d111cfa92594db5296c3b907e2f533c033666f692a3939eadac17b1c7c40d362d0b0635dc874cbfe3e70db7c2b07cc97a5d2
+  languageName: node
+  linkType: hard
+
 "@istanbuljs/schema@npm:^0.1.2":
   version: 0.1.3
   resolution: "@istanbuljs/schema@npm:0.1.3"
@@ -2523,31 +2693,40 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@joshwooding/vite-plugin-react-docgen-typescript@npm:0.6.0":
-  version: 0.6.0
-  resolution: "@joshwooding/vite-plugin-react-docgen-typescript@npm:0.6.0"
+"@joshwooding/vite-plugin-react-docgen-typescript@npm:0.6.1":
+  version: 0.6.1
+  resolution: "@joshwooding/vite-plugin-react-docgen-typescript@npm:0.6.1"
   dependencies:
     glob: "npm:^10.0.0"
     magic-string: "npm:^0.30.0"
     react-docgen-typescript: "npm:^2.2.2"
   peerDependencies:
     typescript: ">= 4.3.x"
-    vite: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0
+    vite: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 10c0/cbb76545214929e628de661985f69f9b79f324ad8db0aa19b2937c52730be57eb37848a7b7d5986ccc00f09d8bc0623ec16f83c9c13aaca3ef5afd0bc322da2e
+  checksum: 10c0/0bcc2adbb49158018102bd9d84cd8572c770daee3d46733157933ef0330953bd5b9e102c26f2338ee7dfb8f21a7bb937134d23f8a7935d5dc88525a253557467
   languageName: node
   linkType: hard
 
-"@jridgewell/gen-mapping@npm:^0.3.5":
-  version: 0.3.5
-  resolution: "@jridgewell/gen-mapping@npm:0.3.5"
+"@jridgewell/gen-mapping@npm:^0.3.12, @jridgewell/gen-mapping@npm:^0.3.5":
+  version: 0.3.12
+  resolution: "@jridgewell/gen-mapping@npm:0.3.12"
   dependencies:
-    "@jridgewell/set-array": "npm:^1.2.1"
-    "@jridgewell/sourcemap-codec": "npm:^1.4.10"
+    "@jridgewell/sourcemap-codec": "npm:^1.5.0"
     "@jridgewell/trace-mapping": "npm:^0.3.24"
-  checksum: 10c0/1be4fd4a6b0f41337c4f5fdf4afc3bd19e39c3691924817108b82ffcb9c9e609c273f936932b9fba4b3a298ce2eb06d9bff4eb1cc3bd81c4f4ee1b4917e25feb
+  checksum: 10c0/32f771ae2467e4d440be609581f7338d786d3d621bac3469e943b9d6d116c23c4becb36f84898a92bbf2f3c0511365c54a945a3b86a83141547a2a360a5ec0c7
+  languageName: node
+  linkType: hard
+
+"@jridgewell/remapping@npm:^2.3.5":
+  version: 2.3.5
+  resolution: "@jridgewell/remapping@npm:2.3.5"
+  dependencies:
+    "@jridgewell/gen-mapping": "npm:^0.3.5"
+    "@jridgewell/trace-mapping": "npm:^0.3.24"
+  checksum: 10c0/3de494219ffeb2c5c38711d0d7bb128097edf91893090a2dbc8ee0b55d092bb7347b1fd0f478486c5eab010e855c73927b1666f2107516d472d24a73017d1194
   languageName: node
   linkType: hard
 
@@ -2558,13 +2737,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@jridgewell/set-array@npm:^1.2.1":
-  version: 1.2.1
-  resolution: "@jridgewell/set-array@npm:1.2.1"
-  checksum: 10c0/2a5aa7b4b5c3464c895c802d8ae3f3d2b92fcbe84ad12f8d0bfbb1f5ad006717e7577ee1fd2eac00c088abe486c7adb27976f45d2941ff6b0b92b2c3302c60f4
-  languageName: node
-  linkType: hard
-
 "@jridgewell/source-map@npm:^0.3.3":
   version: 0.3.6
   resolution: "@jridgewell/source-map@npm:0.3.6"
@@ -2575,29 +2747,36 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@jridgewell/sourcemap-codec@npm:^1.4.10, @jridgewell/sourcemap-codec@npm:^1.4.14, @jridgewell/sourcemap-codec@npm:^1.5.0":
+"@jridgewell/sourcemap-codec@npm:^1.4.14, @jridgewell/sourcemap-codec@npm:^1.5.0":
   version: 1.5.0
   resolution: "@jridgewell/sourcemap-codec@npm:1.5.0"
   checksum: 10c0/2eb864f276eb1096c3c11da3e9bb518f6d9fc0023c78344cdc037abadc725172c70314bdb360f2d4b7bffec7f5d657ce006816bc5d4ecb35e61b66132db00c18
   languageName: node
   linkType: hard
 
-"@jridgewell/trace-mapping@npm:^0.3.23, @jridgewell/trace-mapping@npm:^0.3.24, @jridgewell/trace-mapping@npm:^0.3.25":
-  version: 0.3.25
-  resolution: "@jridgewell/trace-mapping@npm:0.3.25"
+"@jridgewell/trace-mapping@npm:^0.3.23, @jridgewell/trace-mapping@npm:^0.3.24, @jridgewell/trace-mapping@npm:^0.3.25, @jridgewell/trace-mapping@npm:^0.3.28":
+  version: 0.3.29
+  resolution: "@jridgewell/trace-mapping@npm:0.3.29"
   dependencies:
     "@jridgewell/resolve-uri": "npm:^3.1.0"
     "@jridgewell/sourcemap-codec": "npm:^1.4.14"
-  checksum: 10c0/3d1ce6ebc69df9682a5a8896b414c6537e428a1d68b02fcc8363b04284a8ca0df04d0ee3013132252ab14f2527bc13bea6526a912ecb5658f0e39fd2860b4df4
+  checksum: 10c0/fb547ba31658c4d74eb17e7389f4908bf7c44cef47acb4c5baa57289daf68e6fe53c639f41f751b3923aca67010501264f70e7b49978ad1f040294b22c37b333
   languageName: node
   linkType: hard
 
-"@keyv/serialize@npm:^1.0.3":
-  version: 1.0.3
-  resolution: "@keyv/serialize@npm:1.0.3"
+"@keyv/bigmap@npm:^1.0.0":
+  version: 1.0.2
+  resolution: "@keyv/bigmap@npm:1.0.2"
   dependencies:
-    buffer: "npm:^6.0.3"
-  checksum: 10c0/24a257870b0548cfe430680c2ae1641751e6a6ec90c573eaf51bfe956839b6cfa462b4d2827157363b6d620872d32d69fa2f37210a864ba488f8ec7158436398
+    hookified: "npm:^1.12.1"
+  checksum: 10c0/1fe415265241b015c19891dc6c1909b41a5a033e57339b40f85af27355d2f52b52df01795a3f7ba37d3ec2b67e147c05914965775254ff8dbd1701adab45208a
+  languageName: node
+  linkType: hard
+
+"@keyv/serialize@npm:^1.1.1":
+  version: 1.1.1
+  resolution: "@keyv/serialize@npm:1.1.1"
+  checksum: 10c0/b0008cae4a54400c3abf587b8cc2474c6f528ee58969ce6cf9cb07a04006f80c73c85971d6be6544408318a2bc40108236a19a82aea0a6de95aae49533317374
   languageName: node
   linkType: hard
 
@@ -2615,15 +2794,16 @@ __metadata:
     "@gamestdio/websocket": "npm:^0.3.2"
     "@github/webauthn-json": "npm:^2.1.1"
     "@optimize-lodash/rollup-plugin": "npm:^5.0.2"
-    "@rails/ujs": "npm:7.1.501"
+    "@rails/ujs": "npm:7.1.502"
     "@react-spring/web": "npm:^9.7.5"
     "@reduxjs/toolkit": "npm:^2.0.1"
-    "@storybook/addon-a11y": "npm:^9.0.4"
-    "@storybook/addon-docs": "npm:^9.0.4"
-    "@storybook/addon-vitest": "npm:^9.0.4"
-    "@storybook/react-vite": "npm:^9.0.4"
-    "@testing-library/dom": "npm:^10.2.0"
-    "@testing-library/react": "npm:^16.0.0"
+    "@storybook/addon-a11y": "npm:^9.1.1"
+    "@storybook/addon-docs": "npm:^9.1.1"
+    "@storybook/addon-vitest": "npm:^9.1.1"
+    "@storybook/react-vite": "npm:^9.1.1"
+    "@testing-library/dom": "npm:^10.4.1"
+    "@testing-library/react": "npm:^16.3.0"
+    "@types/debug": "npm:^4"
     "@types/emoji-mart": "npm:3.0.14"
     "@types/escape-html": "npm:^1.0.2"
     "@types/hoist-non-react-statics": "npm:^3.3.1"
@@ -2648,44 +2828,49 @@ __metadata:
     "@types/redux-immutable": "npm:^4.0.3"
     "@types/requestidlecallback": "npm:^0.3.5"
     "@use-gesture/react": "npm:^10.3.1"
-    "@vitejs/plugin-legacy": "npm:^6.1.1"
-    "@vitejs/plugin-react": "npm:^4.2.1"
-    "@vitest/browser": "npm:^3.2.1"
-    "@vitest/coverage-v8": "npm:^3.2.0"
-    "@vitest/ui": "npm:^3.2.1"
+    "@vitejs/plugin-legacy": "npm:^7.2.1"
+    "@vitejs/plugin-react": "npm:^5.0.0"
+    "@vitest/browser": "npm:^3.2.4"
+    "@vitest/coverage-v8": "npm:^3.2.4"
+    "@vitest/ui": "npm:^3.2.4"
     arrow-key-navigation: "npm:^1.2.0"
     async-mutex: "npm:^0.5.0"
     axios: "npm:^1.4.0"
     babel-plugin-formatjs: "npm:^10.5.37"
     babel-plugin-transform-react-remove-prop-types: "npm:^0.4.24"
     blurhash: "npm:^2.0.5"
-    chromatic: "npm:^12.1.0"
+    chromatic: "npm:^13.1.3"
     classnames: "npm:^2.3.2"
     cocoon-js-vanilla: "npm:^1.5.1"
     color-blend: "npm:^4.0.0"
     core-js: "npm:^3.30.2"
-    cross-env: "npm:^7.0.3"
+    cross-env: "npm:^10.0.0"
+    debug: "npm:^4.4.1"
     detect-passive-events: "npm:^2.0.3"
     emoji-mart: "npm:emoji-mart-lazyload@latest"
     emojibase: "npm:^16.0.0"
     emojibase-data: "npm:^16.0.3"
+    emojibase-regex: "npm:^16.0.0"
     escape-html: "npm:^1.0.3"
     eslint: "npm:^9.23.0"
     eslint-import-resolver-typescript: "npm:^4.2.5"
     eslint-plugin-formatjs: "npm:^5.3.1"
-    eslint-plugin-import: "npm:~2.31.0"
-    eslint-plugin-jsdoc: "npm:^50.6.9"
+    eslint-plugin-import: "npm:~2.32.0"
+    eslint-plugin-jsdoc: "npm:^54.0.0"
     eslint-plugin-jsx-a11y: "npm:~6.10.2"
     eslint-plugin-promise: "npm:~7.2.1"
     eslint-plugin-react: "npm:^7.37.4"
     eslint-plugin-react-hooks: "npm:^5.2.0"
     eslint-plugin-storybook: "npm:^9.0.4"
+    fake-indexeddb: "npm:^6.0.1"
+    fast-glob: "npm:^3.3.3"
     fuzzysort: "npm:^3.0.0"
     globals: "npm:^16.0.0"
     history: "npm:^4.10.1"
     hoist-non-react-statics: "npm:^3.3.2"
     http-link-header: "npm:^1.1.1"
     husky: "npm:^9.0.11"
+    idb: "npm:^8.0.3"
     immutable: "npm:^4.3.0"
     intl-messageformat: "npm:^10.7.16"
     js-yaml: "npm:^4.1.0"
@@ -2696,7 +2881,7 @@ __metadata:
     msw: "npm:^2.10.2"
     msw-storybook-addon: "npm:^2.0.5"
     path-complete-extname: "npm:^1.0.0"
-    playwright: "npm:^1.52.0"
+    playwright: "npm:^1.54.1"
     postcss-preset-env: "npm:^10.1.5"
     prettier: "npm:^3.3.3"
     prop-types: "npm:^15.8.1"
@@ -2704,7 +2889,6 @@ __metadata:
     react: "npm:^18.2.0"
     react-dom: "npm:^18.2.0"
     react-helmet: "npm:^6.1.0"
-    react-hotkeys: "npm:^1.1.4"
     react-immutable-proptypes: "npm:^2.2.0"
     react-immutable-pure-component: "npm:^2.2.2"
     react-intl: "npm:^7.1.10"
@@ -2713,7 +2897,6 @@ __metadata:
     react-redux-loading-bar: "npm:^5.0.8"
     react-router: "npm:^5.3.4"
     react-router-dom: "npm:^5.3.4"
-    react-router-scroll-4: "npm:^1.0.0-beta.1"
     react-select: "npm:^5.7.3"
     react-sparklines: "npm:^1.7.0"
     react-swipeable-views: "npm:^0.14.0"
@@ -2723,10 +2906,12 @@ __metadata:
     redux-immutable: "npm:^4.0.0"
     regenerator-runtime: "npm:^0.14.0"
     requestidlecallback: "npm:^0.3.0"
-    rollup-plugin-visualizer: "npm:^6.0.0"
+    rollup-plugin-gzip: "npm:^4.1.1"
+    rollup-plugin-visualizer: "npm:^6.0.3"
     sass: "npm:^1.62.1"
+    scroll-behavior: "npm:^0.11.0"
     stacktrace-js: "npm:^2.0.2"
-    storybook: "npm:^9.0.4"
+    storybook: "npm:^9.1.1"
     stringz: "npm:^2.1.0"
     stylelint: "npm:^16.19.1"
     stylelint-config-prettier-scss: "npm:^1.0.0"
@@ -2735,21 +2920,21 @@ __metadata:
     tesseract.js: "npm:^6.0.0"
     tiny-queue: "npm:^0.2.1"
     twitter-text: "npm:3.1.0"
-    typescript: "npm:~5.7.3"
-    typescript-eslint: "npm:^8.29.1"
+    typescript: "npm:~5.9.0"
+    typescript-eslint: "npm:^8.45.0"
     use-debounce: "npm:^10.0.0"
-    vite: "npm:^6.3.5"
-    vite-plugin-pwa: "npm:^1.0.0"
-    vite-plugin-rails: "npm:^0.5.0"
-    vite-plugin-ruby: "npm:^5.1.1"
-    vite-plugin-svgr: "npm:^4.2.0"
+    vite: "npm:^7.1.1"
+    vite-plugin-manifest-sri: "npm:^0.2.0"
+    vite-plugin-pwa: "npm:^1.0.2"
+    vite-plugin-static-copy: "npm:^3.1.1"
+    vite-plugin-svgr: "npm:^4.3.0"
     vite-tsconfig-paths: "npm:^5.1.4"
-    vitest: "npm:^3.2.1"
+    vitest: "npm:^3.2.4"
     wicg-inert: "npm:^3.1.2"
-    workbox-expiration: "npm:^7.0.0"
-    workbox-routing: "npm:^7.0.0"
-    workbox-strategies: "npm:^7.0.0"
-    workbox-window: "npm:^7.0.0"
+    workbox-expiration: "npm:^7.3.0"
+    workbox-routing: "npm:^7.3.0"
+    workbox-strategies: "npm:^7.3.0"
+    workbox-window: "npm:^7.3.0"
   peerDependenciesMeta:
     react:
       optional: true
@@ -2768,7 +2953,6 @@ __metadata:
     "@types/cors": "npm:^2.8.16"
     "@types/express": "npm:^4.17.17"
     "@types/pg": "npm:^8.6.6"
-    "@types/uuid": "npm:^10.0.0"
     "@types/ws": "npm:^8.5.9"
     bufferutil: "npm:^4.0.7"
     cors: "npm:^2.8.5"
@@ -2776,17 +2960,17 @@ __metadata:
     express: "npm:^4.18.2"
     globals: "npm:^16.0.0"
     ioredis: "npm:^5.3.2"
-    jsdom: "npm:^26.0.0"
+    jsdom: "npm:^27.0.0"
     pg: "npm:^8.5.0"
     pg-connection-string: "npm:^2.6.0"
     pino: "npm:^9.0.0"
     pino-http: "npm:^10.0.0"
     pino-pretty: "npm:^13.0.0"
     prom-client: "npm:^15.0.0"
-    typescript: "npm:~5.7.3"
+    typescript: "npm:~5.9.0"
     typescript-eslint: "npm:^8.28.0"
     utf-8-validate: "npm:^6.0.3"
-    uuid: "npm:^11.0.0"
+    uuid: "npm:^13.0.0"
     ws: "npm:^8.12.1"
   dependenciesMeta:
     bufferutil:
@@ -2822,14 +3006,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@napi-rs/wasm-runtime@npm:^0.2.7":
-  version: 0.2.7
-  resolution: "@napi-rs/wasm-runtime@npm:0.2.7"
+"@napi-rs/wasm-runtime@npm:^0.2.11":
+  version: 0.2.12
+  resolution: "@napi-rs/wasm-runtime@npm:0.2.12"
   dependencies:
-    "@emnapi/core": "npm:^1.3.1"
-    "@emnapi/runtime": "npm:^1.3.1"
-    "@tybys/wasm-util": "npm:^0.9.0"
-  checksum: 10c0/04a5edd79144bfa4e821a373fb6d4939f10c578c5f3633b5e67a57d0f5e36a593f595834d26654ea757bba7cd80b6c42d0d1405d6a8460c5d774e8cd5c9548a4
+    "@emnapi/core": "npm:^1.4.3"
+    "@emnapi/runtime": "npm:^1.4.3"
+    "@tybys/wasm-util": "npm:^0.10.0"
+  checksum: 10c0/6d07922c0613aab30c6a497f4df297ca7c54e5b480e00035e0209b872d5c6aab7162fc49477267556109c2c7ed1eb9c65a174e27e9b87568106a87b0a6e3ca7d
   languageName: node
   linkType: hard
 
@@ -2860,25 +3044,25 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@npmcli/agent@npm:^2.0.0":
-  version: 2.2.0
-  resolution: "@npmcli/agent@npm:2.2.0"
+"@npmcli/agent@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "@npmcli/agent@npm:3.0.0"
   dependencies:
     agent-base: "npm:^7.1.0"
     http-proxy-agent: "npm:^7.0.0"
     https-proxy-agent: "npm:^7.0.1"
     lru-cache: "npm:^10.0.1"
-    socks-proxy-agent: "npm:^8.0.1"
-  checksum: 10c0/7b89590598476dda88e79c473766b67c682aae6e0ab0213491daa6083dcc0c171f86b3868f5506f22c09aa5ea69ad7dfb78f4bf39a8dca375d89a42f408645b3
+    socks-proxy-agent: "npm:^8.0.3"
+  checksum: 10c0/efe37b982f30740ee77696a80c196912c274ecd2cb243bc6ae7053a50c733ce0f6c09fda085145f33ecf453be19654acca74b69e81eaad4c90f00ccffe2f9271
   languageName: node
   linkType: hard
 
-"@npmcli/fs@npm:^3.1.0":
-  version: 3.1.0
-  resolution: "@npmcli/fs@npm:3.1.0"
+"@npmcli/fs@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "@npmcli/fs@npm:4.0.0"
   dependencies:
     semver: "npm:^7.3.5"
-  checksum: 10c0/162b4a0b8705cd6f5c2470b851d1dc6cd228c86d2170e1769d738c1fbb69a87160901411c3c035331e9e99db72f1f1099a8b734bf1637cc32b9a5be1660e4e1e
+  checksum: 10c0/c90935d5ce670c87b6b14fab04a965a3b8137e585f8b2a6257263bd7f97756dd736cb165bb470e5156a9e718ecd99413dccc54b1138c1a46d6ec7cf325982fe5
   languageName: node
   linkType: hard
 
@@ -2899,7 +3083,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@open-draft/until@npm:^2.0.0, @open-draft/until@npm:^2.1.0":
+"@open-draft/until@npm:^2.0.0":
   version: 2.1.0
   resolution: "@open-draft/until@npm:2.1.0"
   checksum: 10c0/61d3f99718dd86bb393fee2d7a785f961dcaf12f2055f0c693b27f4d0cd5f7a03d498a6d9289773b117590d794a43cd129366fd8e99222e4832f67b1653d54cf
@@ -3086,13 +3270,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@pkgr/core@npm:^0.1.0":
-  version: 0.1.1
-  resolution: "@pkgr/core@npm:0.1.1"
-  checksum: 10c0/3f7536bc7f57320ab2cf96f8973664bef624710c403357429fbf680a5c3b4843c1dbd389bb43daa6b1f6f1f007bb082f5abcb76bb2b5dc9f421647743b71d3d8
-  languageName: node
-  linkType: hard
-
 "@polka/url@npm:^1.0.0-next.24":
   version: 1.0.0-next.29
   resolution: "@polka/url@npm:1.0.0-next.29"
@@ -3107,10 +3284,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rails/ujs@npm:7.1.501":
-  version: 7.1.501
-  resolution: "@rails/ujs@npm:7.1.501"
-  checksum: 10c0/b75a30f36ff219264e0926da1ffcd14c2a5d6aee5be29da4dc81f9a45843875da79ac19cf7ed9a3f11a39084398d0ae4a75a8edb28ba94907db3081572af62b0
+"@rails/ujs@npm:7.1.502":
+  version: 7.1.502
+  resolution: "@rails/ujs@npm:7.1.502"
+  checksum: 10c0/79b46e8abd03e3fc633d93cc4e4c23838c628b775802fb38c2ce68b0e609ce287a67b81db112a93cc78c07ec82ca3b4cf87e74eb556d35148ce5f64c8be9201f
   languageName: node
   linkType: hard
 
@@ -3181,8 +3358,8 @@ __metadata:
   linkType: hard
 
 "@reduxjs/toolkit@npm:^2.0.1":
-  version: 2.8.2
-  resolution: "@reduxjs/toolkit@npm:2.8.2"
+  version: 2.9.0
+  resolution: "@reduxjs/toolkit@npm:2.9.0"
   dependencies:
     "@standard-schema/spec": "npm:^1.0.0"
     "@standard-schema/utils": "npm:^0.3.0"
@@ -3198,7 +3375,7 @@ __metadata:
       optional: true
     react-redux:
       optional: true
-  checksum: 10c0/6a7a33bad5f1100340757151ff86ca0c4c248f030ae56ce0e6f1d98b39fa87c8f193e9faa2ebd6d5a4c0416921e9f9f7a2bbdd81156c39f08f6bf5ce70c2b927
+  checksum: 10c0/eef65436b3cd96a264de09e94b8a9d585773578442ef3c1c5f2b3bb261a727405e89b004965198f95c5391645b7dbc6576dc07b46de1bede1d6c62c13c17c7d0
   languageName: node
   linkType: hard
 
@@ -3213,10 +3390,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rolldown/pluginutils@npm:1.0.0-beta.19":
-  version: 1.0.0-beta.19
-  resolution: "@rolldown/pluginutils@npm:1.0.0-beta.19"
-  checksum: 10c0/e4205df56e6231a347ac601d044af365639741d51b5bea4e91ecc37e19e9777cb79d1daa924b8709ddf1f743ed6922e4e68e2445126434c4d420d9f4416f4feb
+"@rolldown/pluginutils@npm:1.0.0-beta.38":
+  version: 1.0.0-beta.38
+  resolution: "@rolldown/pluginutils@npm:1.0.0-beta.38"
+  checksum: 10c0/8353ec2528349f79e27d1a3193806725b85830da334e935cbb606d88c1177c58ea6519c578e4e93e5f677f5b22aecb8738894dbed14603e14b6bffe3facf1002
   languageName: node
   linkType: hard
 
@@ -3296,9 +3473,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rollup/pluginutils@npm:^5.0.1, @rollup/pluginutils@npm:^5.0.2, @rollup/pluginutils@npm:^5.0.5, @rollup/pluginutils@npm:^5.1.0":
-  version: 5.1.4
-  resolution: "@rollup/pluginutils@npm:5.1.4"
+"@rollup/pluginutils@npm:^5.0.1, @rollup/pluginutils@npm:^5.0.2, @rollup/pluginutils@npm:^5.1.0, @rollup/pluginutils@npm:^5.2.0":
+  version: 5.2.0
+  resolution: "@rollup/pluginutils@npm:5.2.0"
   dependencies:
     "@types/estree": "npm:^1.0.0"
     estree-walker: "npm:^2.0.2"
@@ -3308,146 +3485,146 @@ __metadata:
   peerDependenciesMeta:
     rollup:
       optional: true
-  checksum: 10c0/6d58fbc6f1024eb4b087bc9bf59a1d655a8056a60c0b4021d3beaeec3f0743503f52467fd89d2cf0e7eccf2831feb40a05ad541a17637ea21ba10b21c2004deb
+  checksum: 10c0/794890d512751451bcc06aa112366ef47ea8f9125dac49b1abf72ff8b079518b09359de9c60a013b33266541634e765ae61839c749fae0edb59a463418665c55
   languageName: node
   linkType: hard
 
-"@rollup/rollup-android-arm-eabi@npm:4.40.2":
-  version: 4.40.2
-  resolution: "@rollup/rollup-android-arm-eabi@npm:4.40.2"
+"@rollup/rollup-android-arm-eabi@npm:4.46.2":
+  version: 4.46.2
+  resolution: "@rollup/rollup-android-arm-eabi@npm:4.46.2"
   conditions: os=android & cpu=arm
   languageName: node
   linkType: hard
 
-"@rollup/rollup-android-arm64@npm:4.40.2":
-  version: 4.40.2
-  resolution: "@rollup/rollup-android-arm64@npm:4.40.2"
+"@rollup/rollup-android-arm64@npm:4.46.2":
+  version: 4.46.2
+  resolution: "@rollup/rollup-android-arm64@npm:4.46.2"
   conditions: os=android & cpu=arm64
   languageName: node
   linkType: hard
 
-"@rollup/rollup-darwin-arm64@npm:4.40.2":
-  version: 4.40.2
-  resolution: "@rollup/rollup-darwin-arm64@npm:4.40.2"
+"@rollup/rollup-darwin-arm64@npm:4.46.2":
+  version: 4.46.2
+  resolution: "@rollup/rollup-darwin-arm64@npm:4.46.2"
   conditions: os=darwin & cpu=arm64
   languageName: node
   linkType: hard
 
-"@rollup/rollup-darwin-x64@npm:4.40.2":
-  version: 4.40.2
-  resolution: "@rollup/rollup-darwin-x64@npm:4.40.2"
+"@rollup/rollup-darwin-x64@npm:4.46.2":
+  version: 4.46.2
+  resolution: "@rollup/rollup-darwin-x64@npm:4.46.2"
   conditions: os=darwin & cpu=x64
   languageName: node
   linkType: hard
 
-"@rollup/rollup-freebsd-arm64@npm:4.40.2":
-  version: 4.40.2
-  resolution: "@rollup/rollup-freebsd-arm64@npm:4.40.2"
+"@rollup/rollup-freebsd-arm64@npm:4.46.2":
+  version: 4.46.2
+  resolution: "@rollup/rollup-freebsd-arm64@npm:4.46.2"
   conditions: os=freebsd & cpu=arm64
   languageName: node
   linkType: hard
 
-"@rollup/rollup-freebsd-x64@npm:4.40.2":
-  version: 4.40.2
-  resolution: "@rollup/rollup-freebsd-x64@npm:4.40.2"
+"@rollup/rollup-freebsd-x64@npm:4.46.2":
+  version: 4.46.2
+  resolution: "@rollup/rollup-freebsd-x64@npm:4.46.2"
   conditions: os=freebsd & cpu=x64
   languageName: node
   linkType: hard
 
-"@rollup/rollup-linux-arm-gnueabihf@npm:4.40.2":
-  version: 4.40.2
-  resolution: "@rollup/rollup-linux-arm-gnueabihf@npm:4.40.2"
+"@rollup/rollup-linux-arm-gnueabihf@npm:4.46.2":
+  version: 4.46.2
+  resolution: "@rollup/rollup-linux-arm-gnueabihf@npm:4.46.2"
   conditions: os=linux & cpu=arm & libc=glibc
   languageName: node
   linkType: hard
 
-"@rollup/rollup-linux-arm-musleabihf@npm:4.40.2":
-  version: 4.40.2
-  resolution: "@rollup/rollup-linux-arm-musleabihf@npm:4.40.2"
+"@rollup/rollup-linux-arm-musleabihf@npm:4.46.2":
+  version: 4.46.2
+  resolution: "@rollup/rollup-linux-arm-musleabihf@npm:4.46.2"
   conditions: os=linux & cpu=arm & libc=musl
   languageName: node
   linkType: hard
 
-"@rollup/rollup-linux-arm64-gnu@npm:4.40.2":
-  version: 4.40.2
-  resolution: "@rollup/rollup-linux-arm64-gnu@npm:4.40.2"
+"@rollup/rollup-linux-arm64-gnu@npm:4.46.2":
+  version: 4.46.2
+  resolution: "@rollup/rollup-linux-arm64-gnu@npm:4.46.2"
   conditions: os=linux & cpu=arm64 & libc=glibc
   languageName: node
   linkType: hard
 
-"@rollup/rollup-linux-arm64-musl@npm:4.40.2":
-  version: 4.40.2
-  resolution: "@rollup/rollup-linux-arm64-musl@npm:4.40.2"
+"@rollup/rollup-linux-arm64-musl@npm:4.46.2":
+  version: 4.46.2
+  resolution: "@rollup/rollup-linux-arm64-musl@npm:4.46.2"
   conditions: os=linux & cpu=arm64 & libc=musl
   languageName: node
   linkType: hard
 
-"@rollup/rollup-linux-loongarch64-gnu@npm:4.40.2":
-  version: 4.40.2
-  resolution: "@rollup/rollup-linux-loongarch64-gnu@npm:4.40.2"
+"@rollup/rollup-linux-loongarch64-gnu@npm:4.46.2":
+  version: 4.46.2
+  resolution: "@rollup/rollup-linux-loongarch64-gnu@npm:4.46.2"
   conditions: os=linux & cpu=loong64 & libc=glibc
   languageName: node
   linkType: hard
 
-"@rollup/rollup-linux-powerpc64le-gnu@npm:4.40.2":
-  version: 4.40.2
-  resolution: "@rollup/rollup-linux-powerpc64le-gnu@npm:4.40.2"
+"@rollup/rollup-linux-ppc64-gnu@npm:4.46.2":
+  version: 4.46.2
+  resolution: "@rollup/rollup-linux-ppc64-gnu@npm:4.46.2"
   conditions: os=linux & cpu=ppc64 & libc=glibc
   languageName: node
   linkType: hard
 
-"@rollup/rollup-linux-riscv64-gnu@npm:4.40.2":
-  version: 4.40.2
-  resolution: "@rollup/rollup-linux-riscv64-gnu@npm:4.40.2"
+"@rollup/rollup-linux-riscv64-gnu@npm:4.46.2":
+  version: 4.46.2
+  resolution: "@rollup/rollup-linux-riscv64-gnu@npm:4.46.2"
   conditions: os=linux & cpu=riscv64 & libc=glibc
   languageName: node
   linkType: hard
 
-"@rollup/rollup-linux-riscv64-musl@npm:4.40.2":
-  version: 4.40.2
-  resolution: "@rollup/rollup-linux-riscv64-musl@npm:4.40.2"
+"@rollup/rollup-linux-riscv64-musl@npm:4.46.2":
+  version: 4.46.2
+  resolution: "@rollup/rollup-linux-riscv64-musl@npm:4.46.2"
   conditions: os=linux & cpu=riscv64 & libc=musl
   languageName: node
   linkType: hard
 
-"@rollup/rollup-linux-s390x-gnu@npm:4.40.2":
-  version: 4.40.2
-  resolution: "@rollup/rollup-linux-s390x-gnu@npm:4.40.2"
+"@rollup/rollup-linux-s390x-gnu@npm:4.46.2":
+  version: 4.46.2
+  resolution: "@rollup/rollup-linux-s390x-gnu@npm:4.46.2"
   conditions: os=linux & cpu=s390x & libc=glibc
   languageName: node
   linkType: hard
 
-"@rollup/rollup-linux-x64-gnu@npm:4.40.2":
-  version: 4.40.2
-  resolution: "@rollup/rollup-linux-x64-gnu@npm:4.40.2"
+"@rollup/rollup-linux-x64-gnu@npm:4.46.2":
+  version: 4.46.2
+  resolution: "@rollup/rollup-linux-x64-gnu@npm:4.46.2"
   conditions: os=linux & cpu=x64 & libc=glibc
   languageName: node
   linkType: hard
 
-"@rollup/rollup-linux-x64-musl@npm:4.40.2":
-  version: 4.40.2
-  resolution: "@rollup/rollup-linux-x64-musl@npm:4.40.2"
+"@rollup/rollup-linux-x64-musl@npm:4.46.2":
+  version: 4.46.2
+  resolution: "@rollup/rollup-linux-x64-musl@npm:4.46.2"
   conditions: os=linux & cpu=x64 & libc=musl
   languageName: node
   linkType: hard
 
-"@rollup/rollup-win32-arm64-msvc@npm:4.40.2":
-  version: 4.40.2
-  resolution: "@rollup/rollup-win32-arm64-msvc@npm:4.40.2"
+"@rollup/rollup-win32-arm64-msvc@npm:4.46.2":
+  version: 4.46.2
+  resolution: "@rollup/rollup-win32-arm64-msvc@npm:4.46.2"
   conditions: os=win32 & cpu=arm64
   languageName: node
   linkType: hard
 
-"@rollup/rollup-win32-ia32-msvc@npm:4.40.2":
-  version: 4.40.2
-  resolution: "@rollup/rollup-win32-ia32-msvc@npm:4.40.2"
+"@rollup/rollup-win32-ia32-msvc@npm:4.46.2":
+  version: 4.46.2
+  resolution: "@rollup/rollup-win32-ia32-msvc@npm:4.46.2"
   conditions: os=win32 & cpu=ia32
   languageName: node
   linkType: hard
 
-"@rollup/rollup-win32-x64-msvc@npm:4.40.2":
-  version: 4.40.2
-  resolution: "@rollup/rollup-win32-x64-msvc@npm:4.40.2"
+"@rollup/rollup-win32-x64-msvc@npm:4.46.2":
+  version: 4.46.2
+  resolution: "@rollup/rollup-win32-x64-msvc@npm:4.46.2"
   conditions: os=win32 & cpu=x64
   languageName: node
   linkType: hard
@@ -3473,38 +3650,38 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@storybook/addon-a11y@npm:^9.0.4":
-  version: 9.0.4
-  resolution: "@storybook/addon-a11y@npm:9.0.4"
+"@storybook/addon-a11y@npm:^9.1.1":
+  version: 9.1.7
+  resolution: "@storybook/addon-a11y@npm:9.1.7"
   dependencies:
     "@storybook/global": "npm:^5.0.0"
     axe-core: "npm:^4.2.0"
   peerDependencies:
-    storybook: ^9.0.4
-  checksum: 10c0/558a71244ce6eb18eb08e95c47d94fa81d29f70226f37b92d1cc52a86fe6389ce978f0ad3a2e90d90dfedb6476d5c7bc7218b66201d3f94627b789783d53e808
+    storybook: ^9.1.7
+  checksum: 10c0/c34f057acec41d6116669663e2a18b230c8905c409de6ef7fcff2cfe00741b8c435165c43301565e99ff275e541180de866c48c26d2676313334e2dd4696f5a3
   languageName: node
   linkType: hard
 
-"@storybook/addon-docs@npm:^9.0.4":
-  version: 9.0.4
-  resolution: "@storybook/addon-docs@npm:9.0.4"
+"@storybook/addon-docs@npm:^9.1.1":
+  version: 9.1.7
+  resolution: "@storybook/addon-docs@npm:9.1.7"
   dependencies:
     "@mdx-js/react": "npm:^3.0.0"
-    "@storybook/csf-plugin": "npm:9.0.4"
-    "@storybook/icons": "npm:^1.2.12"
-    "@storybook/react-dom-shim": "npm:9.0.4"
+    "@storybook/csf-plugin": "npm:9.1.7"
+    "@storybook/icons": "npm:^1.4.0"
+    "@storybook/react-dom-shim": "npm:9.1.7"
     react: "npm:^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
     react-dom: "npm:^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
     ts-dedent: "npm:^2.0.0"
   peerDependencies:
-    storybook: ^9.0.4
-  checksum: 10c0/c70937abe73ec77e80017f14f459224fcefae457999be7be25cd198d49bdff31d181a99d3ec7b72fa494063e4f229c7c4e324173b416a2710208c8a12882e2bd
+    storybook: ^9.1.7
+  checksum: 10c0/81f530b1230c60d344662aedb4839baa099da287c0188e8d5e10ab8cac0b02bb747e7d6475dbb1a85cba0cb5c475b8d48936355dd359020652ccbaba7d664aa0
   languageName: node
   linkType: hard
 
-"@storybook/addon-vitest@npm:^9.0.4":
-  version: 9.0.4
-  resolution: "@storybook/addon-vitest@npm:9.0.4"
+"@storybook/addon-vitest@npm:^9.1.1":
+  version: 9.1.7
+  resolution: "@storybook/addon-vitest@npm:9.1.7"
   dependencies:
     "@storybook/global": "npm:^5.0.0"
     "@storybook/icons": "npm:^1.4.0"
@@ -3513,7 +3690,7 @@ __metadata:
   peerDependencies:
     "@vitest/browser": ^3.0.0
     "@vitest/runner": ^3.0.0
-    storybook: ^9.0.4
+    storybook: ^9.1.7
     vitest: ^3.0.0
   peerDependenciesMeta:
     "@vitest/browser":
@@ -3522,31 +3699,31 @@ __metadata:
       optional: true
     vitest:
       optional: true
-  checksum: 10c0/7379826120c7d2aa4161abd978038161d0ffe2670d40315144ef8b8b1efa9afc793457fe9439928fc039565de2d4da4a109936bd7275518ee7f2fccfce66df21
+  checksum: 10c0/744358491481d21e7728d07bd244038d378b5883257c3a2291b2fa5abef917493c1421921bc020fecfb15740a1b6331fdf598b15c91961ffc7ea924f8d945957
   languageName: node
   linkType: hard
 
-"@storybook/builder-vite@npm:9.0.4":
-  version: 9.0.4
-  resolution: "@storybook/builder-vite@npm:9.0.4"
+"@storybook/builder-vite@npm:9.1.7":
+  version: 9.1.7
+  resolution: "@storybook/builder-vite@npm:9.1.7"
   dependencies:
-    "@storybook/csf-plugin": "npm:9.0.4"
+    "@storybook/csf-plugin": "npm:9.1.7"
     ts-dedent: "npm:^2.0.0"
   peerDependencies:
-    storybook: ^9.0.4
-    vite: ^5.0.0 || ^6.0.0
-  checksum: 10c0/137c1b114d96f1e12f0d76b38d7d4ec10842b8d8284ead906e56d91d61dfbd9a82b84e7643be7cb226040d5829a72d580b441cb26cfa8d6634a7ebe4eff14071
+    storybook: ^9.1.7
+    vite: ^5.0.0 || ^6.0.0 || ^7.0.0
+  checksum: 10c0/39306d65373a934c4274196d5451467acb4128252c61b7abb801153fdf9b8278ca4ee8c9911def229f9c6045f24d39610fb5f0e553892478e9f541cdb9287859
   languageName: node
   linkType: hard
 
-"@storybook/csf-plugin@npm:9.0.4":
-  version: 9.0.4
-  resolution: "@storybook/csf-plugin@npm:9.0.4"
+"@storybook/csf-plugin@npm:9.1.7":
+  version: 9.1.7
+  resolution: "@storybook/csf-plugin@npm:9.1.7"
   dependencies:
     unplugin: "npm:^1.3.1"
   peerDependencies:
-    storybook: ^9.0.4
-  checksum: 10c0/3988920c425b5ea8c2fd6d7148ae8d009ec4556fab2e14b6223ea6ae7422a0242a16c2e333f28218f85b7c0781c3540ecefbeaa94a492aaf9132e98a5785b254
+    storybook: ^9.1.7
+  checksum: 10c0/059fa960174a3f421eb09b41d0da43c43a46548a2535acc17a0e7989bb78f954180212a43b58392dfec6e92a3482621a13ec1b6ff00d1157a2355d369129842a
   languageName: node
   linkType: hard
 
@@ -3557,7 +3734,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@storybook/icons@npm:^1.2.12, @storybook/icons@npm:^1.4.0":
+"@storybook/icons@npm:^1.4.0":
   version: 1.4.0
   resolution: "@storybook/icons@npm:1.4.0"
   peerDependencies:
@@ -3567,26 +3744,26 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@storybook/react-dom-shim@npm:9.0.4":
-  version: 9.0.4
-  resolution: "@storybook/react-dom-shim@npm:9.0.4"
+"@storybook/react-dom-shim@npm:9.1.7":
+  version: 9.1.7
+  resolution: "@storybook/react-dom-shim@npm:9.1.7"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta
     react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta
-    storybook: ^9.0.4
-  checksum: 10c0/abee05aa500c90b15a850163965f6631c1cd95f688eb12f5c629de0b2ce47f340b540e1f76b15bb84219a8961c0389316f39f5cc10cf807f76ae7e8d0c33a1c7
+    storybook: ^9.1.7
+  checksum: 10c0/bed0ebf47f2d2027a28d82be1af5c2413297bfae928b0c6d6a0752f3e30819821660c6abdcc75fa97e15593dc1c181dc36b36f488c8710db3adcabaf70695964
   languageName: node
   linkType: hard
 
-"@storybook/react-vite@npm:^9.0.4":
-  version: 9.0.4
-  resolution: "@storybook/react-vite@npm:9.0.4"
+"@storybook/react-vite@npm:^9.1.1":
+  version: 9.1.7
+  resolution: "@storybook/react-vite@npm:9.1.7"
   dependencies:
-    "@joshwooding/vite-plugin-react-docgen-typescript": "npm:0.6.0"
+    "@joshwooding/vite-plugin-react-docgen-typescript": "npm:0.6.1"
     "@rollup/pluginutils": "npm:^5.0.2"
-    "@storybook/builder-vite": "npm:9.0.4"
-    "@storybook/react": "npm:9.0.4"
-    find-up: "npm:^5.0.0"
+    "@storybook/builder-vite": "npm:9.1.7"
+    "@storybook/react": "npm:9.1.7"
+    find-up: "npm:^7.0.0"
     magic-string: "npm:^0.30.0"
     react-docgen: "npm:^8.0.0"
     resolve: "npm:^1.22.8"
@@ -3594,27 +3771,27 @@ __metadata:
   peerDependencies:
     react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta
     react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta
-    storybook: ^9.0.4
-    vite: ^5.0.0 || ^6.0.0
-  checksum: 10c0/79031f1d6f07c5830fbc3d21e6483f090b75b20cbfe9ee4d26efa3c6346c70c1c462751ce1d110b100ace383a0adc0e159535d5de0d399980c07be95c21d170a
+    storybook: ^9.1.7
+    vite: ^5.0.0 || ^6.0.0 || ^7.0.0
+  checksum: 10c0/be74d1cacafc83f0c9dc22019aeb1e62a3c6faa2bcf98c1cd109ba3219fb61387d1be9875ffa5a59e824e7b7182c3491de47b2dcb4136368ee6c2189cff74e20
   languageName: node
   linkType: hard
 
-"@storybook/react@npm:9.0.4":
-  version: 9.0.4
-  resolution: "@storybook/react@npm:9.0.4"
+"@storybook/react@npm:9.1.7":
+  version: 9.1.7
+  resolution: "@storybook/react@npm:9.1.7"
   dependencies:
     "@storybook/global": "npm:^5.0.0"
-    "@storybook/react-dom-shim": "npm:9.0.4"
+    "@storybook/react-dom-shim": "npm:9.1.7"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta
     react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta
-    storybook: ^9.0.4
+    storybook: ^9.1.7
     typescript: ">= 4.9.x"
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 10c0/d1b7f3c2ccd9d8eeb7fd029a74a0011fb4ddaf7b46ea8d6bbd51a4dedecf9959aed5db44725169e134fb931a3c2d7edfc29d3c6e63a0d1f1535317609bed1a97
+  checksum: 10c0/6ba0d3877075c380d8ab47423cc8e93ff297018fadbbe2ecd224e3d60e6a0fdba561ea84c1ffb39228cb2efd1d8d432710c6ec0337b30f74a62dc2384df96c91
   languageName: node
   linkType: hard
 
@@ -3757,19 +3934,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@testing-library/dom@npm:^10.2.0, @testing-library/dom@npm:^10.4.0":
-  version: 10.4.0
-  resolution: "@testing-library/dom@npm:10.4.0"
+"@testing-library/dom@npm:^10.4.0, @testing-library/dom@npm:^10.4.1":
+  version: 10.4.1
+  resolution: "@testing-library/dom@npm:10.4.1"
   dependencies:
     "@babel/code-frame": "npm:^7.10.4"
     "@babel/runtime": "npm:^7.12.5"
     "@types/aria-query": "npm:^5.0.1"
     aria-query: "npm:5.3.0"
-    chalk: "npm:^4.1.0"
     dom-accessibility-api: "npm:^0.5.9"
     lz-string: "npm:^1.5.0"
+    picocolors: "npm:1.1.1"
     pretty-format: "npm:^27.0.2"
-  checksum: 10c0/0352487720ecd433400671e773df0b84b8268fb3fe8e527cdfd7c11b1365b398b4e0eddba6e7e0c85e8d615f48257753283fccec41f6b986fd6c85f15eb5f84f
+  checksum: 10c0/19ce048012d395ad0468b0dbcc4d0911f6f9e39464d7a8464a587b29707eed5482000dad728f5acc4ed314d2f4d54f34982999a114d2404f36d048278db815b1
   languageName: node
   linkType: hard
 
@@ -3788,9 +3965,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@testing-library/react@npm:^16.0.0":
-  version: 16.1.0
-  resolution: "@testing-library/react@npm:16.1.0"
+"@testing-library/react@npm:^16.3.0":
+  version: 16.3.0
+  resolution: "@testing-library/react@npm:16.3.0"
   dependencies:
     "@babel/runtime": "npm:^7.12.5"
   peerDependencies:
@@ -3804,7 +3981,7 @@ __metadata:
       optional: true
     "@types/react-dom":
       optional: true
-  checksum: 10c0/8451dcc76ba0d4f3504af78f2a4aacc13117691f4b7a3c279f3e047d5ea817ff686496ad53e7f65f6183112aef2be3f318af609b1f5d666eed42b1014d1c68d5
+  checksum: 10c0/3a2cb1f87c9a67e1ebbbcfd99b94b01e496fc35147be8bc5d8bf07a699c7d523a09d57ef2f7b1d91afccd1a28e21eda3b00d80187fbb51b1de01e422592d845e
   languageName: node
   linkType: hard
 
@@ -3817,12 +3994,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@tybys/wasm-util@npm:^0.9.0":
-  version: 0.9.0
-  resolution: "@tybys/wasm-util@npm:0.9.0"
+"@tybys/wasm-util@npm:^0.10.0":
+  version: 0.10.0
+  resolution: "@tybys/wasm-util@npm:0.10.0"
   dependencies:
     tslib: "npm:^2.4.0"
-  checksum: 10c0/f9fde5c554455019f33af6c8215f1a1435028803dc2a2825b077d812bed4209a1a64444a4ca0ce2ea7e1175c8d88e2f9173a36a33c199e8a5c671aa31de8242d
+  checksum: 10c0/044feba55c1e2af703aa4946139969badb183ce1a659a75ed60bc195a90e73a3f3fc53bcd643497c9954597763ddb051fec62f80962b2ca6fc716ba897dc696e
   languageName: node
   linkType: hard
 
@@ -3919,11 +4096,20 @@ __metadata:
   linkType: hard
 
 "@types/cors@npm:^2.8.16":
-  version: 2.8.18
-  resolution: "@types/cors@npm:2.8.18"
+  version: 2.8.19
+  resolution: "@types/cors@npm:2.8.19"
   dependencies:
     "@types/node": "npm:*"
-  checksum: 10c0/9dd1075de0e3a40c304826668960c797e67e597a734fb8e8ab404561f31ef2bd553ef5500eb86da7e91a344bee038a59931d2fbf182fbce09f13816f51fdd80e
+  checksum: 10c0/b5dd407040db7d8aa1bd36e79e5f3f32292f6b075abc287529e9f48df1a25fda3e3799ba30b4656667ffb931d3b75690c1d6ca71e39f7337ea6dfda8581916d0
+  languageName: node
+  linkType: hard
+
+"@types/debug@npm:^4":
+  version: 4.1.12
+  resolution: "@types/debug@npm:4.1.12"
+  dependencies:
+    "@types/ms": "npm:*"
+  checksum: 10c0/5dcd465edbb5a7f226e9a5efd1f399c6172407ef5840686b73e3608ce135eeca54ae8037dcd9f16bdb2768ac74925b820a8b9ecc588a58ca09eca6acabe33e2f
   languageName: node
   linkType: hard
 
@@ -3967,10 +4153,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/estree@npm:*, @types/estree@npm:1.0.7, @types/estree@npm:^1.0.0, @types/estree@npm:^1.0.6":
-  version: 1.0.7
-  resolution: "@types/estree@npm:1.0.7"
-  checksum: 10c0/be815254316882f7c40847336cd484c3bc1c3e34f710d197160d455dc9d6d050ffbf4c3bc76585dba86f737f020ab20bdb137ebe0e9116b0c86c7c0342221b8c
+"@types/estree@npm:*, @types/estree@npm:1.0.8, @types/estree@npm:^1.0.0, @types/estree@npm:^1.0.6, @types/estree@npm:^1.0.8":
+  version: 1.0.8
+  resolution: "@types/estree@npm:1.0.8"
+  checksum: 10c0/39d34d1afaa338ab9763f37ad6066e3f349444f9052b9676a7cc0252ef9485a41c6d81c9c4e0d26e9077993354edf25efc853f3224dd4b447175ef62bdcc86a5
   languageName: node
   linkType: hard
 
@@ -3994,14 +4180,14 @@ __metadata:
   linkType: hard
 
 "@types/express@npm:^4.17.17":
-  version: 4.17.22
-  resolution: "@types/express@npm:4.17.22"
+  version: 4.17.23
+  resolution: "@types/express@npm:4.17.23"
   dependencies:
     "@types/body-parser": "npm:*"
     "@types/express-serve-static-core": "npm:^4.17.33"
     "@types/qs": "npm:*"
     "@types/serve-static": "npm:*"
-  checksum: 10c0/15c10a5ebb40a0356baa95ed374a2150d862786c9fccbdd724df12acc9c8cb08fbe1d34b446b1bcef2dbe5305cb3013fb39fba791baa54ef6df8056482776abb
+  checksum: 10c0/60490cd4f73085007247e7d4fafad0a7abdafa34fa3caba2757512564ca5e094ece7459f0f324030a63d513f967bb86579a8682af76ae2fd718e889b0a2a4fe8
   languageName: node
   linkType: hard
 
@@ -4013,12 +4199,13 @@ __metadata:
   linkType: hard
 
 "@types/hoist-non-react-statics@npm:^3.3.1":
-  version: 3.3.6
-  resolution: "@types/hoist-non-react-statics@npm:3.3.6"
+  version: 3.3.7
+  resolution: "@types/hoist-non-react-statics@npm:3.3.7"
   dependencies:
-    "@types/react": "npm:*"
     hoist-non-react-statics: "npm:^3.3.0"
-  checksum: 10c0/149a4c217d81f21f8a1e152160a59d5b99b6a9aa6d354385d5f5bc02760cbf1e170a8442ba92eb653befff44b0c5bc2234bb77ce33e0d11a65f779e8bab5c321
+  peerDependencies:
+    "@types/react": "*"
+  checksum: 10c0/ed8f4e88338f7d021d0f956adf6089d2a12b2e254a03c05292324f2e986d2376eb9efdb8a4f04596823e8fca88c9d06361d20dab4a2a00dc935fb36ac911de55
   languageName: node
   linkType: hard
 
@@ -4074,9 +4261,9 @@ __metadata:
   linkType: hard
 
 "@types/lodash@npm:^4.14.195":
-  version: 4.17.17
-  resolution: "@types/lodash@npm:4.17.17"
-  checksum: 10c0/8e75df02a15f04d4322c5a503e4efd0e7a92470570ce80f17e9f11ce2b1f1a7c994009c9bcff39f07e0f9ffd8ccaff09b3598997c404b801abd5a7eee5a639dc
+  version: 4.17.20
+  resolution: "@types/lodash@npm:4.17.20"
+  checksum: 10c0/98cdd0faae22cbb8079a01a3bb65aa8f8c41143367486c1cbf5adc83f16c9272a2a5d2c1f541f61d0d73da543c16ee1d21cf2ef86cb93cd0cc0ac3bced6dd88f
   languageName: node
   linkType: hard
 
@@ -4101,6 +4288,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/ms@npm:*":
+  version: 2.1.0
+  resolution: "@types/ms@npm:2.1.0"
+  checksum: 10c0/5ce692ffe1549e1b827d99ef8ff71187457e0eb44adbae38fdf7b9a74bae8d20642ee963c14516db1d35fa2652e65f47680fdf679dcbde52bbfadd021f497225
+  languageName: node
+  linkType: hard
+
 "@types/node@npm:*, @types/node@npm:^22.0.0":
   version: 22.13.14
   resolution: "@types/node@npm:22.13.14"
@@ -4125,13 +4319,13 @@ __metadata:
   linkType: hard
 
 "@types/pg@npm:^8.6.6":
-  version: 8.15.4
-  resolution: "@types/pg@npm:8.15.4"
+  version: 8.15.5
+  resolution: "@types/pg@npm:8.15.5"
   dependencies:
     "@types/node": "npm:*"
     pg-protocol: "npm:*"
     pg-types: "npm:^2.2.0"
-  checksum: 10c0/7f9295cb2d934681bba84f7caad529c3b100d87e83ad0732c7fe496f4f79e42a795097321db54e010fcff22cb5e410cf683b4c9941907ee4564c822242816e91
+  checksum: 10c0/19a3cc1811918753f8c827733648c3a85c7b0355bf207c44eb1a3b79b2e6a0d85cb5457ec550d860fc9be7e88c7587a3600958ec8c61fa1ad573061c63af93f0
   languageName: node
   linkType: hard
 
@@ -4143,9 +4337,9 @@ __metadata:
   linkType: hard
 
 "@types/prop-types@npm:*, @types/prop-types@npm:^15.7.5":
-  version: 15.7.14
-  resolution: "@types/prop-types@npm:15.7.14"
-  checksum: 10c0/1ec775160bfab90b67a782d735952158c7e702ca4502968aa82565bd8e452c2de8601c8dfe349733073c31179116cf7340710160d3836aa8a1ef76d1532893b1
+  version: 15.7.15
+  resolution: "@types/prop-types@npm:15.7.15"
+  checksum: 10c0/b59aad1ad19bf1733cf524fd4e618196c6c7690f48ee70a327eb450a42aab8e8a063fbe59ca0a5701aebe2d92d582292c0fb845ea57474f6a15f6994b0e260b2
   languageName: node
   linkType: hard
 
@@ -4272,12 +4466,12 @@ __metadata:
   linkType: hard
 
 "@types/react@npm:^18.2.7":
-  version: 18.3.23
-  resolution: "@types/react@npm:18.3.23"
+  version: 18.3.24
+  resolution: "@types/react@npm:18.3.24"
   dependencies:
     "@types/prop-types": "npm:*"
     csstype: "npm:^3.0.2"
-  checksum: 10c0/49331800b76572eb2992a5c44801dbf8c612a5f99c8f4e4200f06c7de6f3a6e9455c661784a6c5469df96fa45622cb4a9d0982c44e6a0d5719be5f2ef1f545ed
+  checksum: 10c0/9e188fa8e50f172cf647fc48fea2e04d88602afff47190b697de281a8ac88df9ee059864757a2a438ff599eaf9276d9a9e0e60585e88f7d57f01a2e4877d37ec
   languageName: node
   linkType: hard
 
@@ -4340,13 +4534,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/tough-cookie@npm:^4.0.5":
-  version: 4.0.5
-  resolution: "@types/tough-cookie@npm:4.0.5"
-  checksum: 10c0/68c6921721a3dcb40451543db2174a145ef915bc8bcbe7ad4e59194a0238e776e782b896c7a59f4b93ac6acefca9161fccb31d1ce3b3445cb6faa467297fb473
-  languageName: node
-  linkType: hard
-
 "@types/trusted-types@npm:^2.0.2":
   version: 2.0.3
   resolution: "@types/trusted-types@npm:2.0.3"
@@ -4361,13 +4548,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/uuid@npm:^10.0.0":
-  version: 10.0.0
-  resolution: "@types/uuid@npm:10.0.0"
-  checksum: 10c0/9a1404bf287164481cb9b97f6bb638f78f955be57c40c6513b7655160beb29df6f84c915aaf4089a1559c216557dc4d2f79b48d978742d3ae10b937420ddac60
-  languageName: node
-  linkType: hard
-
 "@types/warning@npm:^3.0.0":
   version: 3.0.2
   resolution: "@types/warning@npm:3.0.2"
@@ -4384,138 +4564,106 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/eslint-plugin@npm:8.29.1":
-  version: 8.29.1
-  resolution: "@typescript-eslint/eslint-plugin@npm:8.29.1"
+"@typescript-eslint/eslint-plugin@npm:8.45.0":
+  version: 8.45.0
+  resolution: "@typescript-eslint/eslint-plugin@npm:8.45.0"
   dependencies:
     "@eslint-community/regexpp": "npm:^4.10.0"
-    "@typescript-eslint/scope-manager": "npm:8.29.1"
-    "@typescript-eslint/type-utils": "npm:8.29.1"
-    "@typescript-eslint/utils": "npm:8.29.1"
-    "@typescript-eslint/visitor-keys": "npm:8.29.1"
+    "@typescript-eslint/scope-manager": "npm:8.45.0"
+    "@typescript-eslint/type-utils": "npm:8.45.0"
+    "@typescript-eslint/utils": "npm:8.45.0"
+    "@typescript-eslint/visitor-keys": "npm:8.45.0"
     graphemer: "npm:^1.4.0"
-    ignore: "npm:^5.3.1"
+    ignore: "npm:^7.0.0"
     natural-compare: "npm:^1.4.0"
-    ts-api-utils: "npm:^2.0.1"
+    ts-api-utils: "npm:^2.1.0"
   peerDependencies:
-    "@typescript-eslint/parser": ^8.0.0 || ^8.0.0-alpha.0
+    "@typescript-eslint/parser": ^8.45.0
     eslint: ^8.57.0 || ^9.0.0
-    typescript: ">=4.8.4 <5.9.0"
-  checksum: 10c0/a3ed7556edcac374cab622862f2f9adedc91ca305d6937db6869a0253d675858c296cb5413980e8404fc39737117faaf35b00c6804664b3c542bdc417502532f
+    typescript: ">=4.8.4 <6.0.0"
+  checksum: 10c0/0c60a0e5d07fa8618348db38b5a81e66143d528e1b3cdb5678bbc6c60590cd559b27c98c36f5663230fc4cf6920dff2cd604de30b58df26a37fcfcc5dc1dbd45
   languageName: node
   linkType: hard
 
-"@typescript-eslint/parser@npm:8.29.1":
-  version: 8.29.1
-  resolution: "@typescript-eslint/parser@npm:8.29.1"
+"@typescript-eslint/parser@npm:8.45.0":
+  version: 8.45.0
+  resolution: "@typescript-eslint/parser@npm:8.45.0"
   dependencies:
-    "@typescript-eslint/scope-manager": "npm:8.29.1"
-    "@typescript-eslint/types": "npm:8.29.1"
-    "@typescript-eslint/typescript-estree": "npm:8.29.1"
-    "@typescript-eslint/visitor-keys": "npm:8.29.1"
+    "@typescript-eslint/scope-manager": "npm:8.45.0"
+    "@typescript-eslint/types": "npm:8.45.0"
+    "@typescript-eslint/typescript-estree": "npm:8.45.0"
+    "@typescript-eslint/visitor-keys": "npm:8.45.0"
     debug: "npm:^4.3.4"
   peerDependencies:
     eslint: ^8.57.0 || ^9.0.0
-    typescript: ">=4.8.4 <5.9.0"
-  checksum: 10c0/af3570ff58c42c2014e5c117bebf91120737fb139d94415ca2711844990e95252c3006ccc699871fe3f592cc1a3f4ebfdc9dd5f6cb29b6b128c2524fcf311b75
+    typescript: ">=4.8.4 <6.0.0"
+  checksum: 10c0/8b419bcf795b112a39fcac05dcf147835059345b6399035ffa3f76a9d8e320f3fac79cae2fe4320dcda83fa059b017ca7626a7b4e3da08a614415c8867d169b8
   languageName: node
   linkType: hard
 
-"@typescript-eslint/project-service@npm:8.33.0":
-  version: 8.33.0
-  resolution: "@typescript-eslint/project-service@npm:8.33.0"
+"@typescript-eslint/project-service@npm:8.45.0":
+  version: 8.45.0
+  resolution: "@typescript-eslint/project-service@npm:8.45.0"
   dependencies:
-    "@typescript-eslint/tsconfig-utils": "npm:^8.33.0"
-    "@typescript-eslint/types": "npm:^8.33.0"
+    "@typescript-eslint/tsconfig-utils": "npm:^8.45.0"
+    "@typescript-eslint/types": "npm:^8.45.0"
     debug: "npm:^4.3.4"
-  checksum: 10c0/a863d9e3be5ffb53c9d57b25b7a35149dae01afd942dd7fc36bd72a4230676ae12d0f37a789cddaf1baf71e3b35f09436bebbd081336e667b4181b48d0afe8f5
-  languageName: node
-  linkType: hard
-
-"@typescript-eslint/scope-manager@npm:8.29.1":
-  version: 8.29.1
-  resolution: "@typescript-eslint/scope-manager@npm:8.29.1"
-  dependencies:
-    "@typescript-eslint/types": "npm:8.29.1"
-    "@typescript-eslint/visitor-keys": "npm:8.29.1"
-  checksum: 10c0/8b87a04f01ebc13075e352509bca8f31c757c3220857fa473ac155f6bdf7f30fe82765d0c3d8e790f7fad394a32765bd9f716b97c08e17581d358c76086d51af
-  languageName: node
-  linkType: hard
-
-"@typescript-eslint/scope-manager@npm:8.33.0":
-  version: 8.33.0
-  resolution: "@typescript-eslint/scope-manager@npm:8.33.0"
-  dependencies:
-    "@typescript-eslint/types": "npm:8.33.0"
-    "@typescript-eslint/visitor-keys": "npm:8.33.0"
-  checksum: 10c0/eb259add242ce40642e7272b414c92ae9407d97cb304981f17f0de0846d5c4ab47d41816ef13da3d3976fe0b7a74df291525be27e4fe4f0ab5d35e86d340faa0
-  languageName: node
-  linkType: hard
-
-"@typescript-eslint/tsconfig-utils@npm:8.33.0, @typescript-eslint/tsconfig-utils@npm:^8.33.0":
-  version: 8.33.0
-  resolution: "@typescript-eslint/tsconfig-utils@npm:8.33.0"
   peerDependencies:
-    typescript: ">=4.8.4 <5.9.0"
-  checksum: 10c0/6e9a8e73e65b925f908f31e00be4f1b8d7e89f45d97fa703f468115943c297fc2cc6f9daa0c12b9607f39186f033ac244515f11710df7e1df8302c815ed57389
+    typescript: ">=4.8.4 <6.0.0"
+  checksum: 10c0/98af065a1a3ed9d3d1eb265e09d3e9c2ae676d500a8c1d764f5609fe2c1b86749516b709804eb814fae688be7809d11748b9ae691d43c28da51dac390ca81fa9
   languageName: node
   linkType: hard
 
-"@typescript-eslint/type-utils@npm:8.29.1":
-  version: 8.29.1
-  resolution: "@typescript-eslint/type-utils@npm:8.29.1"
+"@typescript-eslint/scope-manager@npm:8.45.0":
+  version: 8.45.0
+  resolution: "@typescript-eslint/scope-manager@npm:8.45.0"
   dependencies:
-    "@typescript-eslint/typescript-estree": "npm:8.29.1"
-    "@typescript-eslint/utils": "npm:8.29.1"
+    "@typescript-eslint/types": "npm:8.45.0"
+    "@typescript-eslint/visitor-keys": "npm:8.45.0"
+  checksum: 10c0/54cd36206f6b4fc8e1e48576ed01e0d6ab20c2a9c4c7d90d5cc3a2d317dd8a13abe148ffecf471b16f1224aba5749e0905472745626bef9ae5bed771776f4abe
+  languageName: node
+  linkType: hard
+
+"@typescript-eslint/tsconfig-utils@npm:8.45.0, @typescript-eslint/tsconfig-utils@npm:^8.45.0":
+  version: 8.45.0
+  resolution: "@typescript-eslint/tsconfig-utils@npm:8.45.0"
+  peerDependencies:
+    typescript: ">=4.8.4 <6.0.0"
+  checksum: 10c0/227a9b7a5baaf35466fd369992cb933192515df1156ddf22f438deb344c2523695208e1036f5590b20603f31724de75a47fe0ee84e2fd4c8e9f3606f23f68112
+  languageName: node
+  linkType: hard
+
+"@typescript-eslint/type-utils@npm:8.45.0":
+  version: 8.45.0
+  resolution: "@typescript-eslint/type-utils@npm:8.45.0"
+  dependencies:
+    "@typescript-eslint/types": "npm:8.45.0"
+    "@typescript-eslint/typescript-estree": "npm:8.45.0"
+    "@typescript-eslint/utils": "npm:8.45.0"
     debug: "npm:^4.3.4"
-    ts-api-utils: "npm:^2.0.1"
+    ts-api-utils: "npm:^2.1.0"
   peerDependencies:
     eslint: ^8.57.0 || ^9.0.0
-    typescript: ">=4.8.4 <5.9.0"
-  checksum: 10c0/72cc01dbac866b0a7c7b1f637ad03ffd22f6d3617f70f06f485cf3096fddfc821fdc56de1a072cc6af70250c63698a3e5a910f67fe46eea941955b6e0da1b2bd
+    typescript: ">=4.8.4 <6.0.0"
+  checksum: 10c0/ce0f4c209c2418ebeb65e7de053499fb68bf6000bdd71068594fdb8c8ac3dbbd62935a3cea233989491f7da3ef5db87e7efd2910133c6abf6d0cbf57248f6442
   languageName: node
   linkType: hard
 
-"@typescript-eslint/types@npm:8.29.1":
-  version: 8.29.1
-  resolution: "@typescript-eslint/types@npm:8.29.1"
-  checksum: 10c0/bbcb9e4f38df4485092b51ac6bb62d65f321d914ab58dc0ff1eaa7787dc0b4a39e237c2617b9f2c2bcb91a343f30de523e3544f69affa1ee4287a3ef2fc10ce7
+"@typescript-eslint/types@npm:8.45.0, @typescript-eslint/types@npm:^8.34.1, @typescript-eslint/types@npm:^8.45.0":
+  version: 8.45.0
+  resolution: "@typescript-eslint/types@npm:8.45.0"
+  checksum: 10c0/0213a0573c671d13bc91961a2b2e814ec7f6381ff093bce6704017bd96b2fc7fee25906c815cedb32a0601cf5071ca6c7c5f940d087c3b0d3dd7d4bc03478278
   languageName: node
   linkType: hard
 
-"@typescript-eslint/types@npm:8.33.0, @typescript-eslint/types@npm:^8.33.0":
-  version: 8.33.0
-  resolution: "@typescript-eslint/types@npm:8.33.0"
-  checksum: 10c0/348b64eb408719d7711a433fc9716e0c2aab8b3f3676f5a1cc2e00269044132282cf655deb6d0dd9817544116909513de3b709005352d186949d1014fad1a3cb
-  languageName: node
-  linkType: hard
-
-"@typescript-eslint/typescript-estree@npm:8.29.1":
-  version: 8.29.1
-  resolution: "@typescript-eslint/typescript-estree@npm:8.29.1"
+"@typescript-eslint/typescript-estree@npm:8.45.0":
+  version: 8.45.0
+  resolution: "@typescript-eslint/typescript-estree@npm:8.45.0"
   dependencies:
-    "@typescript-eslint/types": "npm:8.29.1"
-    "@typescript-eslint/visitor-keys": "npm:8.29.1"
-    debug: "npm:^4.3.4"
-    fast-glob: "npm:^3.3.2"
-    is-glob: "npm:^4.0.3"
-    minimatch: "npm:^9.0.4"
-    semver: "npm:^7.6.0"
-    ts-api-utils: "npm:^2.0.1"
-  peerDependencies:
-    typescript: ">=4.8.4 <5.9.0"
-  checksum: 10c0/33c46c667d9262e5625d5d0064338711b342e62c5675ded6811a2cb13ee5de2f71b90e9d0be5cb338b11b1a329c376a6bbf6c3d24fa8fb457b2eefc9f3298513
-  languageName: node
-  linkType: hard
-
-"@typescript-eslint/typescript-estree@npm:8.33.0":
-  version: 8.33.0
-  resolution: "@typescript-eslint/typescript-estree@npm:8.33.0"
-  dependencies:
-    "@typescript-eslint/project-service": "npm:8.33.0"
-    "@typescript-eslint/tsconfig-utils": "npm:8.33.0"
-    "@typescript-eslint/types": "npm:8.33.0"
-    "@typescript-eslint/visitor-keys": "npm:8.33.0"
+    "@typescript-eslint/project-service": "npm:8.45.0"
+    "@typescript-eslint/tsconfig-utils": "npm:8.45.0"
+    "@typescript-eslint/types": "npm:8.45.0"
+    "@typescript-eslint/visitor-keys": "npm:8.45.0"
     debug: "npm:^4.3.4"
     fast-glob: "npm:^3.3.2"
     is-glob: "npm:^4.0.3"
@@ -4523,164 +4671,167 @@ __metadata:
     semver: "npm:^7.6.0"
     ts-api-utils: "npm:^2.1.0"
   peerDependencies:
-    typescript: ">=4.8.4 <5.9.0"
-  checksum: 10c0/677b12b2e5780ffaef508bddbf8712fe2c3413f3d14fd8fd0cfbe22952a81c6642b3cc26984cf27fdfc3dd2457ae5f8aa04437d3b0ae32987a1895f9648ca7b2
+    typescript: ">=4.8.4 <6.0.0"
+  checksum: 10c0/8c2f44a00fe859a6cd4b50157c484c5b6a1c7af5d48e89ae79c5f4924947964962fc8f478ad4c2ade788907fceee9b72d4e376508ea79b51392f91082a37d239
   languageName: node
   linkType: hard
 
-"@typescript-eslint/utils@npm:8.29.1":
-  version: 8.29.1
-  resolution: "@typescript-eslint/utils@npm:8.29.1"
-  dependencies:
-    "@eslint-community/eslint-utils": "npm:^4.4.0"
-    "@typescript-eslint/scope-manager": "npm:8.29.1"
-    "@typescript-eslint/types": "npm:8.29.1"
-    "@typescript-eslint/typescript-estree": "npm:8.29.1"
-  peerDependencies:
-    eslint: ^8.57.0 || ^9.0.0
-    typescript: ">=4.8.4 <5.9.0"
-  checksum: 10c0/1b2704b769b0c9353cf26a320ecf9775ba51c94c7c30e2af80ca31f4cb230f319762ab06535fcb26b6963144bbeaa53233b34965907c506283861b013f5b95fc
-  languageName: node
-  linkType: hard
-
-"@typescript-eslint/utils@npm:^8.27.0, @typescript-eslint/utils@npm:^8.8.1":
-  version: 8.33.0
-  resolution: "@typescript-eslint/utils@npm:8.33.0"
+"@typescript-eslint/utils@npm:8.45.0, @typescript-eslint/utils@npm:^8.27.0, @typescript-eslint/utils@npm:^8.8.1":
+  version: 8.45.0
+  resolution: "@typescript-eslint/utils@npm:8.45.0"
   dependencies:
     "@eslint-community/eslint-utils": "npm:^4.7.0"
-    "@typescript-eslint/scope-manager": "npm:8.33.0"
-    "@typescript-eslint/types": "npm:8.33.0"
-    "@typescript-eslint/typescript-estree": "npm:8.33.0"
+    "@typescript-eslint/scope-manager": "npm:8.45.0"
+    "@typescript-eslint/types": "npm:8.45.0"
+    "@typescript-eslint/typescript-estree": "npm:8.45.0"
   peerDependencies:
     eslint: ^8.57.0 || ^9.0.0
-    typescript: ">=4.8.4 <5.9.0"
-  checksum: 10c0/a0adb9e13d8f8d8f86ae2e905f3305ad60732e760364b291de66a857a551485d37c23e923299078a47f75d3cca643e1f2aefa010a0beb4cb0d08d0507c1038e1
+    typescript: ">=4.8.4 <6.0.0"
+  checksum: 10c0/b3c83a23813b15e20e303d7153789508c01e06dec355b1a80547c59aa36998d498102f45fcd13f111031fac57270608abb04d20560248d4448fd00b1cf4dc4ab
   languageName: node
   linkType: hard
 
-"@typescript-eslint/visitor-keys@npm:8.29.1":
-  version: 8.29.1
-  resolution: "@typescript-eslint/visitor-keys@npm:8.29.1"
+"@typescript-eslint/visitor-keys@npm:8.45.0":
+  version: 8.45.0
+  resolution: "@typescript-eslint/visitor-keys@npm:8.45.0"
   dependencies:
-    "@typescript-eslint/types": "npm:8.29.1"
-    eslint-visitor-keys: "npm:^4.2.0"
-  checksum: 10c0/0c12e83c84a754161c89e594a96454799669979c7021a8936515ec574a1fa1d6e3119e0eacf502e07a0fa7254974558ea7a48901c8bfed3c46579a61b655e4f5
+    "@typescript-eslint/types": "npm:8.45.0"
+    eslint-visitor-keys: "npm:^4.2.1"
+  checksum: 10c0/119adcf50c902dad7f7757bcdd88fad0a23a171d309d9b7cefe78af12e451cf84c04ae611f4c31f7e23f16c2b47665ad92e6e5648fc77d542ef306f465bf1f29
   languageName: node
   linkType: hard
 
-"@typescript-eslint/visitor-keys@npm:8.33.0":
-  version: 8.33.0
-  resolution: "@typescript-eslint/visitor-keys@npm:8.33.0"
-  dependencies:
-    "@typescript-eslint/types": "npm:8.33.0"
-    eslint-visitor-keys: "npm:^4.2.0"
-  checksum: 10c0/41660f241e78314f69d251792f369ef1eeeab3b40fe4ab11b794d402c95bcb82b61d3e91763e7ab9b0f22011a7ac9c8f9dfd91734d61c9f4eaf4f7660555b53b
+"@unrs/resolver-binding-android-arm-eabi@npm:1.11.1":
+  version: 1.11.1
+  resolution: "@unrs/resolver-binding-android-arm-eabi@npm:1.11.1"
+  conditions: os=android & cpu=arm
   languageName: node
   linkType: hard
 
-"@unrs/resolver-binding-darwin-arm64@npm:1.3.2":
-  version: 1.3.2
-  resolution: "@unrs/resolver-binding-darwin-arm64@npm:1.3.2"
+"@unrs/resolver-binding-android-arm64@npm:1.11.1":
+  version: 1.11.1
+  resolution: "@unrs/resolver-binding-android-arm64@npm:1.11.1"
+  conditions: os=android & cpu=arm64
+  languageName: node
+  linkType: hard
+
+"@unrs/resolver-binding-darwin-arm64@npm:1.11.1":
+  version: 1.11.1
+  resolution: "@unrs/resolver-binding-darwin-arm64@npm:1.11.1"
   conditions: os=darwin & cpu=arm64
   languageName: node
   linkType: hard
 
-"@unrs/resolver-binding-darwin-x64@npm:1.3.2":
-  version: 1.3.2
-  resolution: "@unrs/resolver-binding-darwin-x64@npm:1.3.2"
+"@unrs/resolver-binding-darwin-x64@npm:1.11.1":
+  version: 1.11.1
+  resolution: "@unrs/resolver-binding-darwin-x64@npm:1.11.1"
   conditions: os=darwin & cpu=x64
   languageName: node
   linkType: hard
 
-"@unrs/resolver-binding-freebsd-x64@npm:1.3.2":
-  version: 1.3.2
-  resolution: "@unrs/resolver-binding-freebsd-x64@npm:1.3.2"
+"@unrs/resolver-binding-freebsd-x64@npm:1.11.1":
+  version: 1.11.1
+  resolution: "@unrs/resolver-binding-freebsd-x64@npm:1.11.1"
   conditions: os=freebsd & cpu=x64
   languageName: node
   linkType: hard
 
-"@unrs/resolver-binding-linux-arm-gnueabihf@npm:1.3.2":
-  version: 1.3.2
-  resolution: "@unrs/resolver-binding-linux-arm-gnueabihf@npm:1.3.2"
+"@unrs/resolver-binding-linux-arm-gnueabihf@npm:1.11.1":
+  version: 1.11.1
+  resolution: "@unrs/resolver-binding-linux-arm-gnueabihf@npm:1.11.1"
   conditions: os=linux & cpu=arm
   languageName: node
   linkType: hard
 
-"@unrs/resolver-binding-linux-arm-musleabihf@npm:1.3.2":
-  version: 1.3.2
-  resolution: "@unrs/resolver-binding-linux-arm-musleabihf@npm:1.3.2"
+"@unrs/resolver-binding-linux-arm-musleabihf@npm:1.11.1":
+  version: 1.11.1
+  resolution: "@unrs/resolver-binding-linux-arm-musleabihf@npm:1.11.1"
   conditions: os=linux & cpu=arm
   languageName: node
   linkType: hard
 
-"@unrs/resolver-binding-linux-arm64-gnu@npm:1.3.2":
-  version: 1.3.2
-  resolution: "@unrs/resolver-binding-linux-arm64-gnu@npm:1.3.2"
+"@unrs/resolver-binding-linux-arm64-gnu@npm:1.11.1":
+  version: 1.11.1
+  resolution: "@unrs/resolver-binding-linux-arm64-gnu@npm:1.11.1"
   conditions: os=linux & cpu=arm64 & libc=glibc
   languageName: node
   linkType: hard
 
-"@unrs/resolver-binding-linux-arm64-musl@npm:1.3.2":
-  version: 1.3.2
-  resolution: "@unrs/resolver-binding-linux-arm64-musl@npm:1.3.2"
+"@unrs/resolver-binding-linux-arm64-musl@npm:1.11.1":
+  version: 1.11.1
+  resolution: "@unrs/resolver-binding-linux-arm64-musl@npm:1.11.1"
   conditions: os=linux & cpu=arm64 & libc=musl
   languageName: node
   linkType: hard
 
-"@unrs/resolver-binding-linux-ppc64-gnu@npm:1.3.2":
-  version: 1.3.2
-  resolution: "@unrs/resolver-binding-linux-ppc64-gnu@npm:1.3.2"
+"@unrs/resolver-binding-linux-ppc64-gnu@npm:1.11.1":
+  version: 1.11.1
+  resolution: "@unrs/resolver-binding-linux-ppc64-gnu@npm:1.11.1"
   conditions: os=linux & cpu=ppc64 & libc=glibc
   languageName: node
   linkType: hard
 
-"@unrs/resolver-binding-linux-s390x-gnu@npm:1.3.2":
-  version: 1.3.2
-  resolution: "@unrs/resolver-binding-linux-s390x-gnu@npm:1.3.2"
+"@unrs/resolver-binding-linux-riscv64-gnu@npm:1.11.1":
+  version: 1.11.1
+  resolution: "@unrs/resolver-binding-linux-riscv64-gnu@npm:1.11.1"
+  conditions: os=linux & cpu=riscv64 & libc=glibc
+  languageName: node
+  linkType: hard
+
+"@unrs/resolver-binding-linux-riscv64-musl@npm:1.11.1":
+  version: 1.11.1
+  resolution: "@unrs/resolver-binding-linux-riscv64-musl@npm:1.11.1"
+  conditions: os=linux & cpu=riscv64 & libc=musl
+  languageName: node
+  linkType: hard
+
+"@unrs/resolver-binding-linux-s390x-gnu@npm:1.11.1":
+  version: 1.11.1
+  resolution: "@unrs/resolver-binding-linux-s390x-gnu@npm:1.11.1"
   conditions: os=linux & cpu=s390x & libc=glibc
   languageName: node
   linkType: hard
 
-"@unrs/resolver-binding-linux-x64-gnu@npm:1.3.2":
-  version: 1.3.2
-  resolution: "@unrs/resolver-binding-linux-x64-gnu@npm:1.3.2"
+"@unrs/resolver-binding-linux-x64-gnu@npm:1.11.1":
+  version: 1.11.1
+  resolution: "@unrs/resolver-binding-linux-x64-gnu@npm:1.11.1"
   conditions: os=linux & cpu=x64 & libc=glibc
   languageName: node
   linkType: hard
 
-"@unrs/resolver-binding-linux-x64-musl@npm:1.3.2":
-  version: 1.3.2
-  resolution: "@unrs/resolver-binding-linux-x64-musl@npm:1.3.2"
+"@unrs/resolver-binding-linux-x64-musl@npm:1.11.1":
+  version: 1.11.1
+  resolution: "@unrs/resolver-binding-linux-x64-musl@npm:1.11.1"
   conditions: os=linux & cpu=x64 & libc=musl
   languageName: node
   linkType: hard
 
-"@unrs/resolver-binding-wasm32-wasi@npm:1.3.2":
-  version: 1.3.2
-  resolution: "@unrs/resolver-binding-wasm32-wasi@npm:1.3.2"
+"@unrs/resolver-binding-wasm32-wasi@npm:1.11.1":
+  version: 1.11.1
+  resolution: "@unrs/resolver-binding-wasm32-wasi@npm:1.11.1"
   dependencies:
-    "@napi-rs/wasm-runtime": "npm:^0.2.7"
+    "@napi-rs/wasm-runtime": "npm:^0.2.11"
   conditions: cpu=wasm32
   languageName: node
   linkType: hard
 
-"@unrs/resolver-binding-win32-arm64-msvc@npm:1.3.2":
-  version: 1.3.2
-  resolution: "@unrs/resolver-binding-win32-arm64-msvc@npm:1.3.2"
+"@unrs/resolver-binding-win32-arm64-msvc@npm:1.11.1":
+  version: 1.11.1
+  resolution: "@unrs/resolver-binding-win32-arm64-msvc@npm:1.11.1"
   conditions: os=win32 & cpu=arm64
   languageName: node
   linkType: hard
 
-"@unrs/resolver-binding-win32-ia32-msvc@npm:1.3.2":
-  version: 1.3.2
-  resolution: "@unrs/resolver-binding-win32-ia32-msvc@npm:1.3.2"
+"@unrs/resolver-binding-win32-ia32-msvc@npm:1.11.1":
+  version: 1.11.1
+  resolution: "@unrs/resolver-binding-win32-ia32-msvc@npm:1.11.1"
   conditions: os=win32 & cpu=ia32
   languageName: node
   linkType: hard
 
-"@unrs/resolver-binding-win32-x64-msvc@npm:1.3.2":
-  version: 1.3.2
-  resolution: "@unrs/resolver-binding-win32-x64-msvc@npm:1.3.2"
+"@unrs/resolver-binding-win32-x64-msvc@npm:1.11.1":
+  version: 1.11.1
+  resolution: "@unrs/resolver-binding-win32-x64-msvc@npm:1.11.1"
   conditions: os=win32 & cpu=x64
   languageName: node
   linkType: hard
@@ -4703,56 +4854,60 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@vitejs/plugin-legacy@npm:^6.1.1":
-  version: 6.1.1
-  resolution: "@vitejs/plugin-legacy@npm:6.1.1"
+"@vitejs/plugin-legacy@npm:^7.2.1":
+  version: 7.2.1
+  resolution: "@vitejs/plugin-legacy@npm:7.2.1"
   dependencies:
-    "@babel/core": "npm:^7.26.10"
-    "@babel/preset-env": "npm:^7.26.9"
-    browserslist: "npm:^4.24.4"
+    "@babel/core": "npm:^7.28.0"
+    "@babel/plugin-transform-dynamic-import": "npm:^7.27.1"
+    "@babel/plugin-transform-modules-systemjs": "npm:^7.27.1"
+    "@babel/preset-env": "npm:^7.28.0"
+    babel-plugin-polyfill-corejs3: "npm:^0.13.0"
+    babel-plugin-polyfill-regenerator: "npm:^0.6.5"
+    browserslist: "npm:^4.25.1"
     browserslist-to-esbuild: "npm:^2.1.1"
-    core-js: "npm:^3.41.0"
+    core-js: "npm:^3.45.0"
     magic-string: "npm:^0.30.17"
     regenerator-runtime: "npm:^0.14.1"
     systemjs: "npm:^6.15.1"
   peerDependencies:
     terser: ^5.16.0
-    vite: ^6.0.0
-  checksum: 10c0/3a41098e422246d7ddbb6add678c1317474679a5e82e011947898cea5336fa8da9bb8fa625ab1284265f6ba123278fc2bf7c5b0b9b87febaaf865f14ac8e6ece
+    vite: ^7.0.0
+  checksum: 10c0/bb9c14793c304ab84202a27218df4a71472ef8998c984121dcbc268b7dad8141d3c153f899794d5d62fed0e422ca756d24780e7da3f053e0ff87a37429808737
   languageName: node
   linkType: hard
 
-"@vitejs/plugin-react@npm:^4.2.1":
-  version: 4.6.0
-  resolution: "@vitejs/plugin-react@npm:4.6.0"
+"@vitejs/plugin-react@npm:^5.0.0":
+  version: 5.0.4
+  resolution: "@vitejs/plugin-react@npm:5.0.4"
   dependencies:
-    "@babel/core": "npm:^7.27.4"
+    "@babel/core": "npm:^7.28.4"
     "@babel/plugin-transform-react-jsx-self": "npm:^7.27.1"
     "@babel/plugin-transform-react-jsx-source": "npm:^7.27.1"
-    "@rolldown/pluginutils": "npm:1.0.0-beta.19"
+    "@rolldown/pluginutils": "npm:1.0.0-beta.38"
     "@types/babel__core": "npm:^7.20.5"
     react-refresh: "npm:^0.17.0"
   peerDependencies:
-    vite: ^4.2.0 || ^5.0.0 || ^6.0.0 || ^7.0.0-beta.0
-  checksum: 10c0/73b8f271978a0337debb255afd1667f49c2018c118962a8613120383375c4038255a5315cee2ef210dc7fd07cd30d5b12271077ad47db29980f8156b8a49be2c
+    vite: ^4.2.0 || ^5.0.0 || ^6.0.0 || ^7.0.0
+  checksum: 10c0/bb9360a4b4c0abf064d22211756b999faf23889ac150de490590ca7bd029b0ef7f4cd8ba3a32b86682a62d46fb7bebd75b3fa9835c57c78123f4a646de2e0136
   languageName: node
   linkType: hard
 
-"@vitest/browser@npm:^3.2.1":
-  version: 3.2.1
-  resolution: "@vitest/browser@npm:3.2.1"
+"@vitest/browser@npm:^3.2.4":
+  version: 3.2.4
+  resolution: "@vitest/browser@npm:3.2.4"
   dependencies:
     "@testing-library/dom": "npm:^10.4.0"
     "@testing-library/user-event": "npm:^14.6.1"
-    "@vitest/mocker": "npm:3.2.1"
-    "@vitest/utils": "npm:3.2.1"
+    "@vitest/mocker": "npm:3.2.4"
+    "@vitest/utils": "npm:3.2.4"
     magic-string: "npm:^0.30.17"
     sirv: "npm:^3.0.1"
     tinyrainbow: "npm:^2.0.0"
     ws: "npm:^8.18.2"
   peerDependencies:
     playwright: "*"
-    vitest: 3.2.1
+    vitest: 3.2.4
     webdriverio: ^7.0.0 || ^8.0.0 || ^9.0.0
   peerDependenciesMeta:
     playwright:
@@ -4761,13 +4916,13 @@ __metadata:
       optional: true
     webdriverio:
       optional: true
-  checksum: 10c0/304ae5107113230cc80b0b4eedcb3167ae776036797c77d97315ce4022e6c94553c557a0db6aff6de596fe77a0808b1e79b2576bd8e01386c010ea1c4a97a52b
+  checksum: 10c0/0db39daad675aad187eff27d5a7f17a9f533d7abc7476ee1a0b83a9c62a7227b24395f4814e034ecb2ebe39f1a2dec0a8c6a7f79b8d5680c3ac79e408727d742
   languageName: node
   linkType: hard
 
-"@vitest/coverage-v8@npm:^3.2.0":
-  version: 3.2.2
-  resolution: "@vitest/coverage-v8@npm:3.2.2"
+"@vitest/coverage-v8@npm:^3.2.4":
+  version: 3.2.4
+  resolution: "@vitest/coverage-v8@npm:3.2.4"
   dependencies:
     "@ampproject/remapping": "npm:^2.3.0"
     "@bcoe/v8-coverage": "npm:^1.0.2"
@@ -4783,45 +4938,33 @@ __metadata:
     test-exclude: "npm:^7.0.1"
     tinyrainbow: "npm:^2.0.0"
   peerDependencies:
-    "@vitest/browser": 3.2.2
-    vitest: 3.2.2
+    "@vitest/browser": 3.2.4
+    vitest: 3.2.4
   peerDependenciesMeta:
     "@vitest/browser":
       optional: true
-  checksum: 10c0/d807f006ab9d4d3fb78c34586ab057a8e588746430b2d3ab07cfb972b5fabe65fde7033a9718ee598d0e3001085fa83edee76ff3f03a05e50a8879beee3ae37a
+  checksum: 10c0/cae3e58d81d56e7e1cdecd7b5baab7edd0ad9dee8dec9353c52796e390e452377d3f04174d40b6986b17c73241a5e773e422931eaa8102dcba0605ff24b25193
   languageName: node
   linkType: hard
 
-"@vitest/expect@npm:3.0.9":
-  version: 3.0.9
-  resolution: "@vitest/expect@npm:3.0.9"
-  dependencies:
-    "@vitest/spy": "npm:3.0.9"
-    "@vitest/utils": "npm:3.0.9"
-    chai: "npm:^5.2.0"
-    tinyrainbow: "npm:^2.0.0"
-  checksum: 10c0/4e5eef8fbc9c3e47f3fb69dbbd5b51aabdf1b6de2f781556d37d79731678fc83cf4a01d146226b12a27df051a4110153a6172506c9c74ae08e5b924a9c947f08
-  languageName: node
-  linkType: hard
-
-"@vitest/expect@npm:3.2.1":
-  version: 3.2.1
-  resolution: "@vitest/expect@npm:3.2.1"
+"@vitest/expect@npm:3.2.4":
+  version: 3.2.4
+  resolution: "@vitest/expect@npm:3.2.4"
   dependencies:
     "@types/chai": "npm:^5.2.2"
-    "@vitest/spy": "npm:3.2.1"
-    "@vitest/utils": "npm:3.2.1"
+    "@vitest/spy": "npm:3.2.4"
+    "@vitest/utils": "npm:3.2.4"
     chai: "npm:^5.2.0"
     tinyrainbow: "npm:^2.0.0"
-  checksum: 10c0/ea02306fff2e657412ac36169621d742898d95cb2a4922f0a81e1fcfc81d755f337f176ddc2a2ed9281e0f2c1648bb6b08b09d4fd523d203d1238e62344c0385
+  checksum: 10c0/7586104e3fd31dbe1e6ecaafb9a70131e4197dce2940f727b6a84131eee3decac7b10f9c7c72fa5edbdb68b6f854353bd4c0fa84779e274207fb7379563b10db
   languageName: node
   linkType: hard
 
-"@vitest/mocker@npm:3.2.1":
-  version: 3.2.1
-  resolution: "@vitest/mocker@npm:3.2.1"
+"@vitest/mocker@npm:3.2.4":
+  version: 3.2.4
+  resolution: "@vitest/mocker@npm:3.2.4"
   dependencies:
-    "@vitest/spy": "npm:3.2.1"
+    "@vitest/spy": "npm:3.2.4"
     estree-walker: "npm:^3.0.3"
     magic-string: "npm:^0.30.17"
   peerDependencies:
@@ -4832,81 +4975,55 @@ __metadata:
       optional: true
     vite:
       optional: true
-  checksum: 10c0/bcd8865e8e8f45fdf59bb817b788bebe13c509e0220eee723bc6b8ee139352b30e074e674e8f9092ae75db0a66c1ca3887ee078df27ea2d5d7889c9d45cfb675
+  checksum: 10c0/f7a4aea19bbbf8f15905847ee9143b6298b2c110f8b64789224cb0ffdc2e96f9802876aa2ca83f1ec1b6e1ff45e822abb34f0054c24d57b29ab18add06536ccd
   languageName: node
   linkType: hard
 
-"@vitest/pretty-format@npm:3.0.9":
-  version: 3.0.9
-  resolution: "@vitest/pretty-format@npm:3.0.9"
+"@vitest/pretty-format@npm:3.2.4, @vitest/pretty-format@npm:^3.2.4":
+  version: 3.2.4
+  resolution: "@vitest/pretty-format@npm:3.2.4"
   dependencies:
     tinyrainbow: "npm:^2.0.0"
-  checksum: 10c0/56ae7b1f14df2905b3205d4e121727631c4938ec44f76c1e9fa49923919010378f0dad70b1d277672f3ef45ddf6372140c8d1da95e45df8282f70b74328fce47
+  checksum: 10c0/5ad7d4278e067390d7d633e307fee8103958806a419ca380aec0e33fae71b44a64415f7a9b4bc11635d3c13d4a9186111c581d3cef9c65cc317e68f077456887
   languageName: node
   linkType: hard
 
-"@vitest/pretty-format@npm:3.2.1":
-  version: 3.2.1
-  resolution: "@vitest/pretty-format@npm:3.2.1"
+"@vitest/runner@npm:3.2.4":
+  version: 3.2.4
+  resolution: "@vitest/runner@npm:3.2.4"
   dependencies:
-    tinyrainbow: "npm:^2.0.0"
-  checksum: 10c0/24c9d380900d0e2c2296f7a0a86b9efdd02034f1b84a93c0fc01a17ff6aa3b7e80d6bc4fe07e8e78404e6b66d1b8dc5a7d4199e7ed4f89f1874c3f74b731e48c
-  languageName: node
-  linkType: hard
-
-"@vitest/pretty-format@npm:3.2.2, @vitest/pretty-format@npm:^3.2.1":
-  version: 3.2.2
-  resolution: "@vitest/pretty-format@npm:3.2.2"
-  dependencies:
-    tinyrainbow: "npm:^2.0.0"
-  checksum: 10c0/bc74488e6d56b1f86a0066cc7ea53bdd9c062886bb060c37cd4c312d674c1bc3ba9d1350b748a07d2ae9558223f817735edf920496cafadf98a214b683ea0d0e
-  languageName: node
-  linkType: hard
-
-"@vitest/runner@npm:3.2.1":
-  version: 3.2.1
-  resolution: "@vitest/runner@npm:3.2.1"
-  dependencies:
-    "@vitest/utils": "npm:3.2.1"
+    "@vitest/utils": "npm:3.2.4"
     pathe: "npm:^2.0.3"
-  checksum: 10c0/b0c4b75627852c56a67aef10176880def0e6e785e96f6e7a1ad632d799e202528de62cab6c8c0c8e1d2afc8255c40225f2cb8ab6fa99925db8c8aca28b6bba3c
+    strip-literal: "npm:^3.0.0"
+  checksum: 10c0/e8be51666c72b3668ae3ea348b0196656a4a5adb836cb5e270720885d9517421815b0d6c98bfdf1795ed02b994b7bfb2b21566ee356a40021f5bf4f6ed4e418a
   languageName: node
   linkType: hard
 
-"@vitest/snapshot@npm:3.2.1":
-  version: 3.2.1
-  resolution: "@vitest/snapshot@npm:3.2.1"
+"@vitest/snapshot@npm:3.2.4":
+  version: 3.2.4
+  resolution: "@vitest/snapshot@npm:3.2.4"
   dependencies:
-    "@vitest/pretty-format": "npm:3.2.1"
+    "@vitest/pretty-format": "npm:3.2.4"
     magic-string: "npm:^0.30.17"
     pathe: "npm:^2.0.3"
-  checksum: 10c0/7428cfe239c40a146a5e6c73fdefa9167496524aeefd01db28f55dea945ec14f00c982ff4ccf47208e870b020e0edd0f17416cd8db9ae80d2332fb925d4bac94
+  checksum: 10c0/f8301a3d7d1559fd3d59ed51176dd52e1ed5c2d23aa6d8d6aa18787ef46e295056bc726a021698d8454c16ed825ecba163362f42fa90258bb4a98cfd2c9424fc
   languageName: node
   linkType: hard
 
-"@vitest/spy@npm:3.0.9":
-  version: 3.0.9
-  resolution: "@vitest/spy@npm:3.0.9"
-  dependencies:
-    tinyspy: "npm:^3.0.2"
-  checksum: 10c0/993085dbaf9e651ca9516f88e440424d29279def998186628a1ebcab5558a3045fee8562630608f58303507135f6f3bf9970f65639f3b9baa8bf86cab3eb4742
-  languageName: node
-  linkType: hard
-
-"@vitest/spy@npm:3.2.1":
-  version: 3.2.1
-  resolution: "@vitest/spy@npm:3.2.1"
+"@vitest/spy@npm:3.2.4":
+  version: 3.2.4
+  resolution: "@vitest/spy@npm:3.2.4"
   dependencies:
     tinyspy: "npm:^4.0.3"
-  checksum: 10c0/5b6e36c5e21cb8ed4b5f8e95c24379846168a719125cc189e53ccd9717bae8a6a63e16a04a57fb8736b6523b1b870df691a27a04e86c487f388d66af669672ca
+  checksum: 10c0/6ebf0b4697dc238476d6b6a60c76ba9eb1dd8167a307e30f08f64149612fd50227682b876420e4c2e09a76334e73f72e3ebf0e350714dc22474258292e202024
   languageName: node
   linkType: hard
 
-"@vitest/ui@npm:^3.2.1":
-  version: 3.2.2
-  resolution: "@vitest/ui@npm:3.2.2"
+"@vitest/ui@npm:^3.2.4":
+  version: 3.2.4
+  resolution: "@vitest/ui@npm:3.2.4"
   dependencies:
-    "@vitest/utils": "npm:3.2.2"
+    "@vitest/utils": "npm:3.2.4"
     fflate: "npm:^0.8.2"
     flatted: "npm:^3.3.3"
     pathe: "npm:^2.0.3"
@@ -4914,48 +5031,26 @@ __metadata:
     tinyglobby: "npm:^0.2.14"
     tinyrainbow: "npm:^2.0.0"
   peerDependencies:
-    vitest: 3.2.2
-  checksum: 10c0/343ccf49f4ef449d7bde80eb2f815e6548e5fab25bba1923d9fc8483fae9469b477782fe1eaee61d613aca2eef2718ca880d8e6d2135c6f4b09fe653921bf119
+    vitest: 3.2.4
+  checksum: 10c0/c3de1b757905d050706c7ab0199185dd8c7e115f2f348b8d5a7468528c6bf90c2c46096e8901602349ac04f5ba83ac23cd98c38827b104d5151cf8ba21739a0c
   languageName: node
   linkType: hard
 
-"@vitest/utils@npm:3.0.9":
-  version: 3.0.9
-  resolution: "@vitest/utils@npm:3.0.9"
+"@vitest/utils@npm:3.2.4":
+  version: 3.2.4
+  resolution: "@vitest/utils@npm:3.2.4"
   dependencies:
-    "@vitest/pretty-format": "npm:3.0.9"
-    loupe: "npm:^3.1.3"
+    "@vitest/pretty-format": "npm:3.2.4"
+    loupe: "npm:^3.1.4"
     tinyrainbow: "npm:^2.0.0"
-  checksum: 10c0/b966dfb3b926ee9bea59c1fb297abc67adaa23a8a582453ee81167b238446394693617a5e0523eb2791d6983173ef1c07bf28a76bd5a63b49a100610ed6b6a6c
+  checksum: 10c0/024a9b8c8bcc12cf40183c246c244b52ecff861c6deb3477cbf487ac8781ad44c68a9c5fd69f8c1361878e55b97c10d99d511f2597f1f7244b5e5101d028ba64
   languageName: node
   linkType: hard
 
-"@vitest/utils@npm:3.2.1":
-  version: 3.2.1
-  resolution: "@vitest/utils@npm:3.2.1"
-  dependencies:
-    "@vitest/pretty-format": "npm:3.2.1"
-    loupe: "npm:^3.1.3"
-    tinyrainbow: "npm:^2.0.0"
-  checksum: 10c0/a1fbdf1f16f7df2aabda9a96516481f5ef52eff38b69cbf3d11725fb30351dd1c3d480678c040cf25d4a01238f8f8d5650b554c5790078f8770f54acbc54411a
-  languageName: node
-  linkType: hard
-
-"@vitest/utils@npm:3.2.2":
-  version: 3.2.2
-  resolution: "@vitest/utils@npm:3.2.2"
-  dependencies:
-    "@vitest/pretty-format": "npm:3.2.2"
-    loupe: "npm:^3.1.3"
-    tinyrainbow: "npm:^2.0.0"
-  checksum: 10c0/0274a1f060006616a8dad7ef11fb13d81ca00df8104eb015d4832cc6fc2217c37d0eec083afa2eb5118a8879942c6e055aec7f23325ce8f791b3b4b2c7fa16c3
-  languageName: node
-  linkType: hard
-
-"abbrev@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "abbrev@npm:2.0.0"
-  checksum: 10c0/f742a5a107473946f426c691c08daba61a1d15942616f300b5d32fd735be88fef5cba24201757b6c407fd564555fb48c751cfa33519b2605c8a7aadd22baf372
+"abbrev@npm:^3.0.0":
+  version: 3.0.1
+  resolution: "abbrev@npm:3.0.1"
+  checksum: 10c0/21ba8f574ea57a3106d6d35623f2c4a9111d9ee3e9a5be47baed46ec2457d2eac46e07a5c4a60186f88cb98abbe3e24f2d4cca70bc2b12f1692523e2209a9ccf
   languageName: node
   linkType: hard
 
@@ -4978,32 +5073,22 @@ __metadata:
   languageName: node
   linkType: hard
 
-"acorn@npm:^8.14.0, acorn@npm:^8.8.2":
-  version: 8.14.1
-  resolution: "acorn@npm:8.14.1"
+"acorn@npm:^8.14.0, acorn@npm:^8.15.0, acorn@npm:^8.8.2":
+  version: 8.15.0
+  resolution: "acorn@npm:8.15.0"
   bin:
     acorn: bin/acorn
-  checksum: 10c0/dbd36c1ed1d2fa3550140000371fcf721578095b18777b85a79df231ca093b08edc6858d75d6e48c73e431c174dcf9214edbd7e6fa5911b93bd8abfa54e47123
+  checksum: 10c0/dec73ff59b7d6628a01eebaece7f2bdb8bb62b9b5926dcad0f8931f2b8b79c2be21f6c68ac095592adb5adb15831a3635d9343e6a91d028bbe85d564875ec3ec
   languageName: node
   linkType: hard
 
-"agent-base@npm:^7.0.2, agent-base@npm:^7.1.0, agent-base@npm:^7.1.2":
+"agent-base@npm:^7.1.0, agent-base@npm:^7.1.2":
   version: 7.1.3
   resolution: "agent-base@npm:7.1.3"
   checksum: 10c0/6192b580c5b1d8fb399b9c62bf8343d76654c2dd62afcb9a52b2cf44a8b6ace1e3b704d3fe3547d91555c857d3df02603341ff2cb961b9cfe2b12f9f3c38ee11
   languageName: node
   linkType: hard
 
-"aggregate-error@npm:^3.0.0":
-  version: 3.1.0
-  resolution: "aggregate-error@npm:3.1.0"
-  dependencies:
-    clean-stack: "npm:^2.0.0"
-    indent-string: "npm:^4.0.0"
-  checksum: 10c0/a42f67faa79e3e6687a4923050e7c9807db3848a037076f791d10e092677d65c1d2d863b7848560699f40fc0502c19f40963fb1cd1fb3d338a7423df8e45e039
-  languageName: node
-  linkType: hard
-
 "ajv@npm:^6.12.4":
   version: 6.12.6
   resolution: "ajv@npm:6.12.6"
@@ -5076,13 +5161,23 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ansi-styles@npm:^6.0.0, ansi-styles@npm:^6.1.0, ansi-styles@npm:^6.2.1":
+"ansi-styles@npm:^6.1.0, ansi-styles@npm:^6.2.1":
   version: 6.2.1
   resolution: "ansi-styles@npm:6.2.1"
   checksum: 10c0/5d1ec38c123984bcedd996eac680d548f31828bd679a66db2bdf11844634dde55fec3efa9c6bb1d89056a5e79c1ac540c4c784d592ea1d25028a92227d2f2d5c
   languageName: node
   linkType: hard
 
+"anymatch@npm:~3.1.2":
+  version: 3.1.3
+  resolution: "anymatch@npm:3.1.3"
+  dependencies:
+    normalize-path: "npm:^3.0.0"
+    picomatch: "npm:^2.0.4"
+  checksum: 10c0/57b06ae984bc32a0d22592c87384cd88fe4511b1dd7581497831c56d41939c8a001b28e7b853e1450f2bf61992dfcaa8ae2d0d161a0a90c4fb631ef07098fbac
+  languageName: node
+  linkType: hard
+
 "are-docs-informative@npm:^0.0.2":
   version: 0.0.2
   resolution: "are-docs-informative@npm:0.0.2"
@@ -5130,17 +5225,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"array-includes@npm:^3.1.6, array-includes@npm:^3.1.8":
-  version: 3.1.8
-  resolution: "array-includes@npm:3.1.8"
+"array-includes@npm:^3.1.6, array-includes@npm:^3.1.8, array-includes@npm:^3.1.9":
+  version: 3.1.9
+  resolution: "array-includes@npm:3.1.9"
   dependencies:
-    call-bind: "npm:^1.0.7"
+    call-bind: "npm:^1.0.8"
+    call-bound: "npm:^1.0.4"
     define-properties: "npm:^1.2.1"
-    es-abstract: "npm:^1.23.2"
-    es-object-atoms: "npm:^1.0.0"
-    get-intrinsic: "npm:^1.2.4"
-    is-string: "npm:^1.0.7"
-  checksum: 10c0/5b1004d203e85873b96ddc493f090c9672fd6c80d7a60b798da8a14bff8a670ff95db5aafc9abc14a211943f05220dacf8ea17638ae0af1a6a47b8c0b48ce370
+    es-abstract: "npm:^1.24.0"
+    es-object-atoms: "npm:^1.1.1"
+    get-intrinsic: "npm:^1.3.0"
+    is-string: "npm:^1.1.1"
+    math-intrinsics: "npm:^1.1.0"
+  checksum: 10c0/0235fa69078abeac05ac4250699c44996bc6f774a9cbe45db48674ce6bd142f09b327d31482ff75cf03344db4ea03eae23edb862d59378b484b47ed842574856
   languageName: node
   linkType: hard
 
@@ -5165,29 +5262,30 @@ __metadata:
   languageName: node
   linkType: hard
 
-"array.prototype.findlastindex@npm:^1.2.5":
-  version: 1.2.5
-  resolution: "array.prototype.findlastindex@npm:1.2.5"
+"array.prototype.findlastindex@npm:^1.2.6":
+  version: 1.2.6
+  resolution: "array.prototype.findlastindex@npm:1.2.6"
   dependencies:
-    call-bind: "npm:^1.0.7"
+    call-bind: "npm:^1.0.8"
+    call-bound: "npm:^1.0.4"
     define-properties: "npm:^1.2.1"
-    es-abstract: "npm:^1.23.2"
+    es-abstract: "npm:^1.23.9"
     es-errors: "npm:^1.3.0"
-    es-object-atoms: "npm:^1.0.0"
-    es-shim-unscopables: "npm:^1.0.2"
-  checksum: 10c0/962189487728b034f3134802b421b5f39e42ee2356d13b42d2ddb0e52057ffdcc170b9524867f4f0611a6f638f4c19b31e14606e8bcbda67799e26685b195aa3
+    es-object-atoms: "npm:^1.1.1"
+    es-shim-unscopables: "npm:^1.1.0"
+  checksum: 10c0/82559310d2e57ec5f8fc53d7df420e3abf0ba497935de0a5570586035478ba7d07618cb18e2d4ada2da514c8fb98a034aaf5c06caa0a57e2f7f4c4adedef5956
   languageName: node
   linkType: hard
 
-"array.prototype.flat@npm:^1.3.1, array.prototype.flat@npm:^1.3.2":
-  version: 1.3.2
-  resolution: "array.prototype.flat@npm:1.3.2"
+"array.prototype.flat@npm:^1.3.1, array.prototype.flat@npm:^1.3.3":
+  version: 1.3.3
+  resolution: "array.prototype.flat@npm:1.3.3"
   dependencies:
-    call-bind: "npm:^1.0.2"
-    define-properties: "npm:^1.2.0"
-    es-abstract: "npm:^1.22.1"
-    es-shim-unscopables: "npm:^1.0.0"
-  checksum: 10c0/a578ed836a786efbb6c2db0899ae80781b476200617f65a44846cb1ed8bd8b24c8821b83703375d8af639c689497b7b07277060024b9919db94ac3e10dc8a49b
+    call-bind: "npm:^1.0.8"
+    define-properties: "npm:^1.2.1"
+    es-abstract: "npm:^1.23.5"
+    es-shim-unscopables: "npm:^1.0.2"
+  checksum: 10c0/d90e04dfbc43bb96b3d2248576753d1fb2298d2d972e29ca7ad5ec621f0d9e16ff8074dae647eac4f31f4fb7d3f561a7ac005fb01a71f51705a13b5af06a7d8a
   languageName: node
   linkType: hard
 
@@ -5351,13 +5449,13 @@ __metadata:
   linkType: hard
 
 "axios@npm:^1.4.0":
-  version: 1.9.0
-  resolution: "axios@npm:1.9.0"
+  version: 1.12.2
+  resolution: "axios@npm:1.12.2"
   dependencies:
     follow-redirects: "npm:^1.15.6"
-    form-data: "npm:^4.0.0"
+    form-data: "npm:^4.0.4"
     proxy-from-env: "npm:^1.1.0"
-  checksum: 10c0/9371a56886c2e43e4ff5647b5c2c3c046ed0a3d13482ef1d0135b994a628c41fbad459796f101c655e62f0c161d03883454474d2e435b2e021b1924d9f24994c
+  checksum: 10c0/80b063e318cf05cd33a4d991cea0162f3573481946f9129efb7766f38fde4c061c34f41a93a9f9521f02b7c9565ccbc197c099b0186543ac84a24580017adfed
   languageName: node
   linkType: hard
 
@@ -5369,21 +5467,21 @@ __metadata:
   linkType: hard
 
 "babel-plugin-formatjs@npm:^10.5.37":
-  version: 10.5.39
-  resolution: "babel-plugin-formatjs@npm:10.5.39"
+  version: 10.5.40
+  resolution: "babel-plugin-formatjs@npm:10.5.40"
   dependencies:
     "@babel/core": "npm:^7.26.10"
     "@babel/helper-plugin-utils": "npm:^7.26.5"
     "@babel/plugin-syntax-jsx": "npm:^7.25.9"
     "@babel/traverse": "npm:^7.26.10"
     "@babel/types": "npm:^7.26.10"
-    "@formatjs/icu-messageformat-parser": "npm:2.11.2"
-    "@formatjs/ts-transformer": "npm:3.14.0"
+    "@formatjs/icu-messageformat-parser": "npm:2.11.3"
+    "@formatjs/ts-transformer": "npm:3.14.1"
     "@types/babel__core": "npm:^7.20.5"
     "@types/babel__helper-plugin-utils": "npm:^7.10.3"
     "@types/babel__traverse": "npm:^7.20.6"
     tslib: "npm:^2.8.0"
-  checksum: 10c0/08ddc1516e6504bc794257cc7a5b788068afce5f0bdb1c98458d6e7eb9e5b96385f5f4912f92909aad72b4e20083c1472e16d7c05d008bd84a5f3a6d38bb1e95
+  checksum: 10c0/b065cc92ae70dd237bc2aa151f52f91f06337b2ad268d9332cf257414da528f8376aabe7019f9ff630abf55c1b409ecbac720a6ea163397179133b244982320e
   languageName: node
   linkType: hard
 
@@ -5398,39 +5496,39 @@ __metadata:
   languageName: node
   linkType: hard
 
-"babel-plugin-polyfill-corejs2@npm:^0.4.10":
-  version: 0.4.13
-  resolution: "babel-plugin-polyfill-corejs2@npm:0.4.13"
+"babel-plugin-polyfill-corejs2@npm:^0.4.14":
+  version: 0.4.14
+  resolution: "babel-plugin-polyfill-corejs2@npm:0.4.14"
   dependencies:
-    "@babel/compat-data": "npm:^7.22.6"
-    "@babel/helper-define-polyfill-provider": "npm:^0.6.4"
+    "@babel/compat-data": "npm:^7.27.7"
+    "@babel/helper-define-polyfill-provider": "npm:^0.6.5"
     semver: "npm:^6.3.1"
   peerDependencies:
     "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0
-  checksum: 10c0/b4a54561606d388e6f9499f39f03171af4be7f9ce2355e737135e40afa7086cf6790fdd706c2e59f488c8fa1f76123d28783708e07ddc84647dca8ed8fb98e06
+  checksum: 10c0/d74cba0600a6508e86d220bde7164eb528755d91be58020e5ea92ea7fbb12c9d8d2c29246525485adfe7f68ae02618ec428f9a589cac6cbedf53cc3972ad7fbe
   languageName: node
   linkType: hard
 
-"babel-plugin-polyfill-corejs3@npm:^0.11.0":
-  version: 0.11.1
-  resolution: "babel-plugin-polyfill-corejs3@npm:0.11.1"
+"babel-plugin-polyfill-corejs3@npm:^0.13.0":
+  version: 0.13.0
+  resolution: "babel-plugin-polyfill-corejs3@npm:0.13.0"
   dependencies:
-    "@babel/helper-define-polyfill-provider": "npm:^0.6.3"
-    core-js-compat: "npm:^3.40.0"
+    "@babel/helper-define-polyfill-provider": "npm:^0.6.5"
+    core-js-compat: "npm:^3.43.0"
   peerDependencies:
     "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0
-  checksum: 10c0/025f754b6296d84b20200aff63a3c1acdd85e8c621781f2bd27fe2512d0060526192d02329326947c6b29c27cf475fbcfaaff8c51eab1d2bfc7b79086bb64229
+  checksum: 10c0/5d8e228da425edc040d8c868486fd01ba10b0440f841156a30d9f8986f330f723e2ee61553c180929519563ef5b64acce2caac36a5a847f095d708dda5d8206d
   languageName: node
   linkType: hard
 
-"babel-plugin-polyfill-regenerator@npm:^0.6.1":
-  version: 0.6.4
-  resolution: "babel-plugin-polyfill-regenerator@npm:0.6.4"
+"babel-plugin-polyfill-regenerator@npm:^0.6.5":
+  version: 0.6.5
+  resolution: "babel-plugin-polyfill-regenerator@npm:0.6.5"
   dependencies:
-    "@babel/helper-define-polyfill-provider": "npm:^0.6.4"
+    "@babel/helper-define-polyfill-provider": "npm:^0.6.5"
   peerDependencies:
     "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0
-  checksum: 10c0/ebaaf9e4e53201c02f496d3f686d815e94177b3e55b35f11223b99c60d197a29f907a2e87bbcccced8b7aff22a807fccc1adaf04722864a8e1862c8845ab830a
+  checksum: 10c0/63aa8ed716df6a9277c6ab42b887858fa9f57a70cc1d0ae2b91bdf081e45d4502848cba306fb60b02f59f99b32fd02ff4753b373cac48ccdac9b7d19dd56f06d
   languageName: node
   linkType: hard
 
@@ -5455,10 +5553,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"base64-js@npm:^1.3.1":
-  version: 1.5.1
-  resolution: "base64-js@npm:1.5.1"
-  checksum: 10c0/f23823513b63173a001030fae4f2dabe283b99a9d324ade3ad3d148e218134676f1ee8568c877cd79ec1c53158dcf2d2ba527a97c606618928ba99dd930102bf
+"baseline-browser-mapping@npm:^2.8.3":
+  version: 2.8.6
+  resolution: "baseline-browser-mapping@npm:2.8.6"
+  bin:
+    baseline-browser-mapping: dist/cli.js
+  checksum: 10c0/ea628db5048d1e5c0251d4783e0496f5ce8de7a0e20ea29c8876611cb0acf58ffc76bf6561786c6388db22f130646e3ecb91eebc1c03954552a21d38fa38320f
   languageName: node
   linkType: hard
 
@@ -5471,6 +5571,22 @@ __metadata:
   languageName: node
   linkType: hard
 
+"bidi-js@npm:^1.0.3":
+  version: 1.0.3
+  resolution: "bidi-js@npm:1.0.3"
+  dependencies:
+    require-from-string: "npm:^2.0.2"
+  checksum: 10c0/fdddea4aa4120a34285486f2267526cd9298b6e8b773ad25e765d4f104b6d7437ab4ba542e6939e3ac834a7570bcf121ee2cf6d3ae7cd7082c4b5bedc8f271e1
+  languageName: node
+  linkType: hard
+
+"binary-extensions@npm:^2.0.0":
+  version: 2.3.0
+  resolution: "binary-extensions@npm:2.3.0"
+  checksum: 10c0/75a59cafc10fb12a11d510e77110c6c7ae3f4ca22463d52487709ca7f18f69d886aa387557cc9864fbdb10153d0bdb4caacabf11541f55e89ed6e18d12ece2b5
+  languageName: node
+  linkType: hard
+
 "bintrees@npm:1.0.2":
   version: 1.0.2
   resolution: "bintrees@npm:1.0.2"
@@ -5513,25 +5629,25 @@ __metadata:
   linkType: hard
 
 "brace-expansion@npm:^1.1.7":
-  version: 1.1.11
-  resolution: "brace-expansion@npm:1.1.11"
+  version: 1.1.12
+  resolution: "brace-expansion@npm:1.1.12"
   dependencies:
     balanced-match: "npm:^1.0.0"
     concat-map: "npm:0.0.1"
-  checksum: 10c0/695a56cd058096a7cb71fb09d9d6a7070113c7be516699ed361317aca2ec169f618e28b8af352e02ab4233fb54eb0168460a40dc320bab0034b36ab59aaad668
+  checksum: 10c0/975fecac2bb7758c062c20d0b3b6288c7cc895219ee25f0a64a9de662dbac981ff0b6e89909c3897c1f84fa353113a721923afdec5f8b2350255b097f12b1f73
   languageName: node
   linkType: hard
 
 "brace-expansion@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "brace-expansion@npm:2.0.1"
+  version: 2.0.2
+  resolution: "brace-expansion@npm:2.0.2"
   dependencies:
     balanced-match: "npm:^1.0.0"
-  checksum: 10c0/b358f2fe060e2d7a87aa015979ecea07f3c37d4018f8d6deb5bd4c229ad3a0384fe6029bb76cd8be63c81e516ee52d1a0673edbe2023d53a5191732ae3c3e49f
+  checksum: 10c0/6d117a4c793488af86b83172deb6af143e94c17bc53b0b3cec259733923b4ca84679d506ac261f4ba3c7ed37c46018e2ff442f9ce453af8643ecd64f4a54e6cf
   languageName: node
   linkType: hard
 
-"braces@npm:^3.0.3":
+"braces@npm:^3.0.3, braces@npm:~3.0.2":
   version: 3.0.3
   resolution: "braces@npm:3.0.3"
   dependencies:
@@ -5553,17 +5669,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"browserslist@npm:^4.24.0, browserslist@npm:^4.24.4, browserslist@npm:^4.25.0":
-  version: 4.25.0
-  resolution: "browserslist@npm:4.25.0"
+"browserslist@npm:^4.24.0, browserslist@npm:^4.24.4, browserslist@npm:^4.25.1, browserslist@npm:^4.26.0":
+  version: 4.26.2
+  resolution: "browserslist@npm:4.26.2"
   dependencies:
-    caniuse-lite: "npm:^1.0.30001718"
-    electron-to-chromium: "npm:^1.5.160"
-    node-releases: "npm:^2.0.19"
+    baseline-browser-mapping: "npm:^2.8.3"
+    caniuse-lite: "npm:^1.0.30001741"
+    electron-to-chromium: "npm:^1.5.218"
+    node-releases: "npm:^2.0.21"
     update-browserslist-db: "npm:^1.1.3"
   bin:
     browserslist: cli.js
-  checksum: 10c0/cc16c55b4468b18684a0e1ca303592b38635b1155d6724f172407192737a2f405b8030d87a05813729592793445b3d15e737b0055f901cdecccb29b1e580a1c5
+  checksum: 10c0/1146339dad33fda77786b11ea07f1c40c48899edd897d73a9114ee0dbb1ee6475bb4abda263a678c104508bdca8e66760ff8e10be1947d3e20d34bae01d8b89b
   languageName: node
   linkType: hard
 
@@ -5574,16 +5691,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"buffer@npm:^6.0.3":
-  version: 6.0.3
-  resolution: "buffer@npm:6.0.3"
-  dependencies:
-    base64-js: "npm:^1.3.1"
-    ieee754: "npm:^1.2.1"
-  checksum: 10c0/2a905fbbcde73cc5d8bd18d1caa23715d5f83a5935867c2329f0ac06104204ba7947be098fe1317fbd8830e26090ff8e764f08cd14fefc977bb248c3487bcbd0
-  languageName: node
-  linkType: hard
-
 "bufferutil@npm:^4.0.7":
   version: 4.0.9
   resolution: "bufferutil@npm:4.0.9"
@@ -5608,33 +5715,36 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cacache@npm:^18.0.0":
-  version: 18.0.0
-  resolution: "cacache@npm:18.0.0"
+"cacache@npm:^19.0.1":
+  version: 19.0.1
+  resolution: "cacache@npm:19.0.1"
   dependencies:
-    "@npmcli/fs": "npm:^3.1.0"
+    "@npmcli/fs": "npm:^4.0.0"
     fs-minipass: "npm:^3.0.0"
     glob: "npm:^10.2.2"
     lru-cache: "npm:^10.0.1"
     minipass: "npm:^7.0.3"
-    minipass-collect: "npm:^1.0.2"
+    minipass-collect: "npm:^2.0.1"
     minipass-flush: "npm:^1.0.5"
     minipass-pipeline: "npm:^1.2.4"
-    p-map: "npm:^4.0.0"
-    ssri: "npm:^10.0.0"
-    tar: "npm:^6.1.11"
-    unique-filename: "npm:^3.0.0"
-  checksum: 10c0/e359823778d712ad365740cef3f488d4f74c62cc79be5935896d9597a7d81033e50c54c15898fa9cc018620879307ab30d1dddc476ae705bfd5b29c145ae6938
+    p-map: "npm:^7.0.2"
+    ssri: "npm:^12.0.0"
+    tar: "npm:^7.4.3"
+    unique-filename: "npm:^4.0.0"
+  checksum: 10c0/01f2134e1bd7d3ab68be851df96c8d63b492b1853b67f2eecb2c37bb682d37cb70bb858a16f2f0554d3c0071be6dfe21456a1ff6fa4b7eed996570d6a25ffe9c
   languageName: node
   linkType: hard
 
-"cacheable@npm:^1.9.0":
-  version: 1.9.0
-  resolution: "cacheable@npm:1.9.0"
+"cacheable@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "cacheable@npm:2.0.1"
   dependencies:
-    hookified: "npm:^1.8.2"
-    keyv: "npm:^5.3.3"
-  checksum: 10c0/1ca171dd2f7c3a929d84b3f94e712cb8fbbfb7c636f19ba01657cf89c6ea4316f21f2beb6c696fa5c87d42f52620f4a7c2dfecb41bf71ee3b249d539895256c4
+    "@cacheable/memoize": "npm:^2.0.1"
+    "@cacheable/memory": "npm:^2.0.1"
+    "@cacheable/utils": "npm:^2.0.1"
+    hookified: "npm:^1.12.0"
+    keyv: "npm:^5.5.1"
+  checksum: 10c0/c4c16af5997850531a02b0efa150d3a06fff9560eca15a16e4042038a63487e967f00f5f1b63310523877b2ac4038e732faf0e707a5ff5d10cb861c01ed67ca8
   languageName: node
   linkType: hard
 
@@ -5648,7 +5758,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"call-bind@npm:^1.0.2, call-bind@npm:^1.0.7, call-bind@npm:^1.0.8":
+"call-bind@npm:^1.0.7, call-bind@npm:^1.0.8":
   version: 1.0.8
   resolution: "call-bind@npm:1.0.8"
   dependencies:
@@ -5660,7 +5770,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"call-bound@npm:^1.0.2, call-bound@npm:^1.0.3":
+"call-bound@npm:^1.0.2, call-bound@npm:^1.0.3, call-bound@npm:^1.0.4":
   version: 1.0.4
   resolution: "call-bound@npm:1.0.4"
   dependencies:
@@ -5684,10 +5794,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"caniuse-lite@npm:^1.0.30001702, caniuse-lite@npm:^1.0.30001718":
-  version: 1.0.30001721
-  resolution: "caniuse-lite@npm:1.0.30001721"
-  checksum: 10c0/fa3a8926899824b385279f1f886fe34c5efb1321c9ece1b9df25c8d567a2706db8450cc5b4d969e769e641593e08ea644909324aba93636a43e4949a75f81c4c
+"caniuse-lite@npm:^1.0.30001702, caniuse-lite@npm:^1.0.30001741":
+  version: 1.0.30001743
+  resolution: "caniuse-lite@npm:1.0.30001743"
+  checksum: 10c0/1bd730ca10d881a1ca9f55ce864d34c3b18501718c03976e0d3419f4694b715159e13fdef6d58ad47b6d2445d315940f3a01266658876828c820a3331aac021d
   languageName: node
   linkType: hard
 
@@ -5714,7 +5824,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"chalk@npm:^4.0.0, chalk@npm:^4.0.2, chalk@npm:^4.1.0, chalk@npm:^4.1.2":
+"chalk@npm:^4.0.0, chalk@npm:^4.0.2, chalk@npm:^4.1.2":
   version: 4.1.2
   resolution: "chalk@npm:4.1.2"
   dependencies:
@@ -5724,13 +5834,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"chalk@npm:^5.4.1":
-  version: 5.4.1
-  resolution: "chalk@npm:5.4.1"
-  checksum: 10c0/b23e88132c702f4855ca6d25cb5538b1114343e41472d5263ee8a37cccfccd9c4216d111e1097c6a27830407a1dc81fecdf2a56f2c63033d4dbbd88c10b0dcef
-  languageName: node
-  linkType: hard
-
 "char-regex@npm:^1.0.2":
   version: 1.0.2
   resolution: "char-regex@npm:1.0.2"
@@ -5745,6 +5848,25 @@ __metadata:
   languageName: node
   linkType: hard
 
+"chokidar@npm:^3.6.0":
+  version: 3.6.0
+  resolution: "chokidar@npm:3.6.0"
+  dependencies:
+    anymatch: "npm:~3.1.2"
+    braces: "npm:~3.0.2"
+    fsevents: "npm:~2.3.2"
+    glob-parent: "npm:~5.1.2"
+    is-binary-path: "npm:~2.1.0"
+    is-glob: "npm:~4.0.1"
+    normalize-path: "npm:~3.0.0"
+    readdirp: "npm:~3.6.0"
+  dependenciesMeta:
+    fsevents:
+      optional: true
+  checksum: 10c0/8361dcd013f2ddbe260eacb1f3cb2f2c6f2b0ad118708a343a5ed8158941a39cb8fb1d272e0f389712e74ee90ce8ba864eece9e0e62b9705cb468a2f6d917462
+  languageName: node
+  linkType: hard
+
 "chokidar@npm:^4.0.0":
   version: 4.0.0
   resolution: "chokidar@npm:4.0.0"
@@ -5754,16 +5876,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"chownr@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "chownr@npm:2.0.0"
-  checksum: 10c0/594754e1303672171cc04e50f6c398ae16128eb134a88f801bf5354fd96f205320f23536a045d9abd8b51024a149696e51231565891d4efdab8846021ecf88e6
+"chownr@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "chownr@npm:3.0.0"
+  checksum: 10c0/43925b87700f7e3893296c8e9c56cc58f926411cce3a6e5898136daaf08f08b9a8eb76d37d3267e707d0dcc17aed2e2ebdf5848c0c3ce95cf910a919935c1b10
   languageName: node
   linkType: hard
 
-"chromatic@npm:^12.1.0":
-  version: 12.1.0
-  resolution: "chromatic@npm:12.1.0"
+"chromatic@npm:^13.1.3":
+  version: 13.2.0
+  resolution: "chromatic@npm:13.2.0"
   peerDependencies:
     "@chromatic-com/cypress": ^0.*.* || ^1.0.0
     "@chromatic-com/playwright": ^0.*.* || ^1.0.0
@@ -5776,7 +5898,7 @@ __metadata:
     chroma: dist/bin.js
     chromatic: dist/bin.js
     chromatic-cli: dist/bin.js
-  checksum: 10c0/4acb70a4a84605f1963a823beed4f3062ec91e373104500f4295af2298b8d0b49f864d06ca81bc9389e44cae3a284332aac07c6cbfc123aa6457f3b52a4c4b78
+  checksum: 10c0/0f3419b45c648746ce4bb332a8c00548a41d0981a83c44f259fccced83245109448f1f713dd0379af4f386f0e614b11a52be5c0693ec71a99edc8aaed477c5bc
   languageName: node
   linkType: hard
 
@@ -5787,13 +5909,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"clean-stack@npm:^2.0.0":
-  version: 2.2.0
-  resolution: "clean-stack@npm:2.2.0"
-  checksum: 10c0/1f90262d5f6230a17e27d0c190b09d47ebe7efdd76a03b5a1127863f7b3c9aec4c3e6c8bb3a7bbf81d553d56a1fd35728f5a8ef4c63f867ac8d690109742a8c1
-  languageName: node
-  linkType: hard
-
 "cli-cursor@npm:^5.0.0":
   version: 5.0.0
   resolution: "cli-cursor@npm:5.0.0"
@@ -5803,13 +5918,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cli-truncate@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "cli-truncate@npm:4.0.0"
+"cli-truncate@npm:^5.0.0":
+  version: 5.1.0
+  resolution: "cli-truncate@npm:5.1.0"
   dependencies:
-    slice-ansi: "npm:^5.0.0"
-    string-width: "npm:^7.0.0"
-  checksum: 10c0/d7f0b73e3d9b88cb496e6c086df7410b541b56a43d18ade6a573c9c18bd001b1c3fba1ad578f741a4218fdc794d042385f8ac02c25e1c295a2d8b9f3cb86eb4c
+    slice-ansi: "npm:^7.1.0"
+    string-width: "npm:^8.0.0"
+  checksum: 10c0/388a4c9813372fb82ef3958af9bcf233419e80f4f435386cc83666ba85c9ccfdaa4dd6e47a9fde8f70b1e2b485cfc5da97bc899ce4f3b24ed04933a2f878f7d6
   languageName: node
   linkType: hard
 
@@ -5891,10 +6006,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"commander@npm:^13.1.0":
-  version: 13.1.0
-  resolution: "commander@npm:13.1.0"
-  checksum: 10c0/7b8c5544bba704fbe84b7cab2e043df8586d5c114a4c5b607f83ae5060708940ed0b5bd5838cf8ce27539cde265c1cbd59ce3c8c6b017ed3eec8943e3a415164
+"commander@npm:14.0.1":
+  version: 14.0.1
+  resolution: "commander@npm:14.0.1"
+  checksum: 10c0/64439c0651ddd01c1d0f48c8f08e97c18a0a1fa693879451f1203ad01132af2c2aa85da24cf0d8e098ab9e6dc385a756be670d2999a3c628ec745c3ec124587b
   languageName: node
   linkType: hard
 
@@ -5977,12 +6092,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"core-js-compat@npm:^3.40.0":
-  version: 3.41.0
-  resolution: "core-js-compat@npm:3.41.0"
+"core-js-compat@npm:^3.43.0":
+  version: 3.44.0
+  resolution: "core-js-compat@npm:3.44.0"
   dependencies:
-    browserslist: "npm:^4.24.4"
-  checksum: 10c0/92d2c748d3dd1c4e3b6cee6b6683b9212db9bc0a6574d933781210daf3baaeb76334ed4636eb8935b45802aa8d9235ab604c9a262694e02a2fa17ad0f6976829
+    browserslist: "npm:^4.25.1"
+  checksum: 10c0/5de4b042b8bb232b8390be3079030de5c7354610f136ed3eb91310a44455a78df02cfcf49b2fd05d5a5aa2695460620abf1b400784715f7482ed4770d40a68b2
   languageName: node
   linkType: hard
 
@@ -5993,10 +6108,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"core-js@npm:^3.30.2, core-js@npm:^3.41.0":
-  version: 3.43.0
-  resolution: "core-js@npm:3.43.0"
-  checksum: 10c0/9d4ad66296e60380777de51d019b5c3e6cce023b7999750a5094f9a4b0ea53bf3600beb4ef11c56548f2c8791d43d4056e270d1cf55ba87273011aa7d4597871
+"core-js@npm:^3.30.2, core-js@npm:^3.45.0":
+  version: 3.45.1
+  resolution: "core-js@npm:3.45.1"
+  checksum: 10c0/c38e5fae5a05ee3a129c45e10056aafe61dbb15fd35d27e0c289f5490387541c89741185e0aeb61acb558559c6697e016c245cca738fa169a73f2b06cd30e6b6
   languageName: node
   linkType: hard
 
@@ -6057,19 +6172,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cross-env@npm:^7.0.3":
-  version: 7.0.3
-  resolution: "cross-env@npm:7.0.3"
+"cross-env@npm:^10.0.0":
+  version: 10.1.0
+  resolution: "cross-env@npm:10.1.0"
   dependencies:
-    cross-spawn: "npm:^7.0.1"
+    "@epic-web/invariant": "npm:^1.0.0"
+    cross-spawn: "npm:^7.0.6"
   bin:
-    cross-env: src/bin/cross-env.js
-    cross-env-shell: src/bin/cross-env-shell.js
-  checksum: 10c0/f3765c25746c69fcca369655c442c6c886e54ccf3ab8c16847d5ad0e91e2f337d36eedc6599c1227904bf2a228d721e690324446876115bc8e7b32a866735ecf
+    cross-env: dist/bin/cross-env.js
+    cross-env-shell: dist/bin/cross-env-shell.js
+  checksum: 10c0/834a862db456ba1fedf6c6da43436b123ae38f514fa286d6f0937c14fa83f13469f77f70f2812db041ae2d84f82bac627040b8686030aca27fbdf113dfa38b63
   languageName: node
   linkType: hard
 
-"cross-spawn@npm:^7.0.0, cross-spawn@npm:^7.0.1, cross-spawn@npm:^7.0.6":
+"cross-spawn@npm:^7.0.0, cross-spawn@npm:^7.0.6":
   version: 7.0.6
   resolution: "cross-spawn@npm:7.0.6"
   dependencies:
@@ -6105,16 +6221,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"css-has-pseudo@npm:^7.0.2":
-  version: 7.0.2
-  resolution: "css-has-pseudo@npm:7.0.2"
+"css-has-pseudo@npm:^7.0.3":
+  version: 7.0.3
+  resolution: "css-has-pseudo@npm:7.0.3"
   dependencies:
     "@csstools/selector-specificity": "npm:^5.0.0"
     postcss-selector-parser: "npm:^7.0.0"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/456e9ce1eec8a535683c329956acfe53ce5a208345d7f2fcbe662626be8b3c98681e9041d7f4980316714397b0c1c3defde25653d629c396df17803d599c4edf
+  checksum: 10c0/c89f68e17bed229e9a3e98da5032e1360c83d45d974bc3fb8d6b5358399bca80cce7929e4a621a516a75536edb78678dc486eb41841eeed28cca79e3be4bdc27
   languageName: node
   linkType: hard
 
@@ -6144,10 +6260,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cssdb@npm:^8.3.0":
-  version: 8.3.0
-  resolution: "cssdb@npm:8.3.0"
-  checksum: 10c0/56d13cbddd90e63f45f24f71f35314f9718b72760acdf15367e33014eb45df775ae97ec05c08afaa6b4b147c757e9554c1bf39ddcdaeeb26b6c2adfeee503ae7
+"cssdb@npm:^8.4.2":
+  version: 8.4.2
+  resolution: "cssdb@npm:8.4.2"
+  checksum: 10c0/3c88610ba9e3f87f9ecf068b72261e90de8bb1f5d1dceefc79ff42b2e19f5814135937ad057b7f8c4bf58212f911e5f9d2f6f0910af3da127170009f1f75689c
   languageName: node
   linkType: hard
 
@@ -6160,13 +6276,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cssstyle@npm:^4.2.1":
-  version: 4.2.1
-  resolution: "cssstyle@npm:4.2.1"
+"cssstyle@npm:^5.3.0":
+  version: 5.3.0
+  resolution: "cssstyle@npm:5.3.0"
   dependencies:
-    "@asamuzakjp/css-color": "npm:^2.8.2"
-    rrweb-cssom: "npm:^0.8.0"
-  checksum: 10c0/02ba8c47c0caaab57acadacb3eb6c0f5f009000f55d61f6563670e07d389b26edefeed497e6c1847fcd2e6bbe0b6974c2d4291f97fa0c6ec6add13a7fa926d84
+    "@asamuzakjp/css-color": "npm:^4.0.3"
+    "@csstools/css-syntax-patches-for-csstree": "npm:^1.0.14"
+    css-tree: "npm:^3.1.0"
+  checksum: 10c0/6ceddc5b696d1220b9a3e41775860f58d29046cdbabc1e6b9c19bc48a6bfdcde749c45023417abf7ca3319429566c079a3e6f6e191ceab159dbced6187cb8b7c
   languageName: node
   linkType: hard
 
@@ -6184,13 +6301,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"data-urls@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "data-urls@npm:5.0.0"
+"data-urls@npm:^6.0.0":
+  version: 6.0.0
+  resolution: "data-urls@npm:6.0.0"
   dependencies:
     whatwg-mimetype: "npm:^4.0.0"
-    whatwg-url: "npm:^14.0.0"
-  checksum: 10c0/1b894d7d41c861f3a4ed2ae9b1c3f0909d4575ada02e36d3d3bc584bdd84278e20709070c79c3b3bff7ac98598cb191eb3e86a89a79ea4ee1ef360e1694f92ad
+    whatwg-url: "npm:^15.0.0"
+  checksum: 10c0/952102a8e6282fea112f7120d79fac482a2f99e20c67f9cb069d661c00627305b042e1f7e3cef8e4bbc795b42c5d481bbc9c6effeff5bb1427f9acaf1722bd35
   languageName: node
   linkType: hard
 
@@ -6243,15 +6360,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"debug@npm:4, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3, debug@npm:^4.3.1, debug@npm:^4.3.2, debug@npm:^4.3.4, debug@npm:^4.3.6, debug@npm:^4.3.7, debug@npm:^4.4.0, debug@npm:^4.4.1":
-  version: 4.4.1
-  resolution: "debug@npm:4.4.1"
+"debug@npm:4, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.1, debug@npm:^4.3.2, debug@npm:^4.3.4, debug@npm:^4.3.6, debug@npm:^4.4.1":
+  version: 4.4.3
+  resolution: "debug@npm:4.4.3"
   dependencies:
     ms: "npm:^2.1.3"
   peerDependenciesMeta:
     supports-color:
       optional: true
-  checksum: 10c0/d2b44bc1afd912b49bb7ebb0d50a860dc93a4dd7d946e8de94abc957bb63726b7dd5aa48c18c2386c379ec024c46692e15ed3ed97d481729f929201e671fcd55
+  checksum: 10c0/d79136ec6c83ecbefd0f6a5593da6a9c91ec4d7ddc4b54c883d6e71ec9accb5f67a1a5e96d00a328196b5b5c86d365e98d8a3a70856aaf16b4e7b1985e67f5a6
   languageName: node
   linkType: hard
 
@@ -6310,7 +6427,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"define-properties@npm:^1.1.3, define-properties@npm:^1.2.0, define-properties@npm:^1.2.1":
+"define-properties@npm:^1.1.3, define-properties@npm:^1.2.1":
   version: 1.2.1
   resolution: "define-properties@npm:1.2.1"
   dependencies:
@@ -6422,16 +6539,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"dom-helpers@npm:^3.4.0":
-  version: 3.4.0
-  resolution: "dom-helpers@npm:3.4.0"
-  dependencies:
-    "@babel/runtime": "npm:^7.1.2"
-  checksum: 10c0/1d2d3e4eadac2c4f4c8c7470a737ab32b7ec28237c4d094ea967ec3184168fd12452196fcc424a5d7860b6176117301aeaecba39467bf1a6e8492a8e5c9639d1
-  languageName: node
-  linkType: hard
-
-"dom-helpers@npm:^5.0.1, dom-helpers@npm:^5.2.0":
+"dom-helpers@npm:^5.0.1, dom-helpers@npm:^5.1.4, dom-helpers@npm:^5.2.0":
   version: 5.2.1
   resolution: "dom-helpers@npm:5.2.1"
   dependencies:
@@ -6494,10 +6602,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"electron-to-chromium@npm:^1.5.160":
-  version: 1.5.165
-  resolution: "electron-to-chromium@npm:1.5.165"
-  checksum: 10c0/20b91e67e7a8829a358c4a488e9b59b0e5f8d4cb075a70b9757bb21acf0fc751ca58ca7d9c6018bec74ac4bd42f7859e4ef37421c252a2275f642e12a32271d6
+"electron-to-chromium@npm:^1.5.218":
+  version: 1.5.222
+  resolution: "electron-to-chromium@npm:1.5.222"
+  checksum: 10c0/a81eb8d2b171236884faf9b5dd382c66d9250283032cb89a3e555d788bf3956f7f4f6bf7bf30b3daf9e5c945ef837bfcd1be21b3f41cfe186ed2f25da13c9af3
   languageName: node
   linkType: hard
 
@@ -6544,6 +6652,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"emojibase-regex@npm:^16.0.0":
+  version: 16.0.0
+  resolution: "emojibase-regex@npm:16.0.0"
+  checksum: 10c0/8ee5ff798e51caa581434b1cb2f9737e50195093c4efa1739df21a50a5496f80517924787d865e8cf7d6a0b4c90dbedc04bdc506dcbcc582e14cdf0bb47af0f0
+  languageName: node
+  linkType: hard
+
 "emojibase@npm:^16.0.0":
   version: 16.0.0
   resolution: "emojibase@npm:16.0.0"
@@ -6583,13 +6698,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"entities@npm:^4.4.0, entities@npm:^4.5.0":
+"entities@npm:^4.4.0":
   version: 4.5.0
   resolution: "entities@npm:4.5.0"
   checksum: 10c0/5b039739f7621f5d1ad996715e53d964035f75ad3b9a4d38c6b3804bb226e282ffeae2443624d8fdd9c47d8e926ae9ac009c54671243f0c3294c26af7cc85250
   languageName: node
   linkType: hard
 
+"entities@npm:^6.0.0":
+  version: 6.0.1
+  resolution: "entities@npm:6.0.1"
+  checksum: 10c0/ed836ddac5acb34341094eb495185d527bd70e8632b6c0d59548cbfa23defdbae70b96f9a405c82904efa421230b5b3fd2283752447d737beffd3f3e6ee74414
+  languageName: node
+  linkType: hard
+
 "env-paths@npm:^2.2.0, env-paths@npm:^2.2.1":
   version: 2.2.1
   resolution: "env-paths@npm:2.2.1"
@@ -6629,26 +6751,26 @@ __metadata:
   languageName: node
   linkType: hard
 
-"es-abstract@npm:^1.17.5, es-abstract@npm:^1.22.1, es-abstract@npm:^1.23.2, es-abstract@npm:^1.23.3, es-abstract@npm:^1.23.5, es-abstract@npm:^1.23.6, es-abstract@npm:^1.23.9":
-  version: 1.23.9
-  resolution: "es-abstract@npm:1.23.9"
+"es-abstract@npm:^1.17.5, es-abstract@npm:^1.23.2, es-abstract@npm:^1.23.3, es-abstract@npm:^1.23.5, es-abstract@npm:^1.23.6, es-abstract@npm:^1.23.9, es-abstract@npm:^1.24.0":
+  version: 1.24.0
+  resolution: "es-abstract@npm:1.24.0"
   dependencies:
     array-buffer-byte-length: "npm:^1.0.2"
     arraybuffer.prototype.slice: "npm:^1.0.4"
     available-typed-arrays: "npm:^1.0.7"
     call-bind: "npm:^1.0.8"
-    call-bound: "npm:^1.0.3"
+    call-bound: "npm:^1.0.4"
     data-view-buffer: "npm:^1.0.2"
     data-view-byte-length: "npm:^1.0.2"
     data-view-byte-offset: "npm:^1.0.1"
     es-define-property: "npm:^1.0.1"
     es-errors: "npm:^1.3.0"
-    es-object-atoms: "npm:^1.0.0"
+    es-object-atoms: "npm:^1.1.1"
     es-set-tostringtag: "npm:^2.1.0"
     es-to-primitive: "npm:^1.3.0"
     function.prototype.name: "npm:^1.1.8"
-    get-intrinsic: "npm:^1.2.7"
-    get-proto: "npm:^1.0.0"
+    get-intrinsic: "npm:^1.3.0"
+    get-proto: "npm:^1.0.1"
     get-symbol-description: "npm:^1.1.0"
     globalthis: "npm:^1.0.4"
     gopd: "npm:^1.2.0"
@@ -6660,21 +6782,24 @@ __metadata:
     is-array-buffer: "npm:^3.0.5"
     is-callable: "npm:^1.2.7"
     is-data-view: "npm:^1.0.2"
+    is-negative-zero: "npm:^2.0.3"
     is-regex: "npm:^1.2.1"
+    is-set: "npm:^2.0.3"
     is-shared-array-buffer: "npm:^1.0.4"
     is-string: "npm:^1.1.1"
     is-typed-array: "npm:^1.1.15"
-    is-weakref: "npm:^1.1.0"
+    is-weakref: "npm:^1.1.1"
     math-intrinsics: "npm:^1.1.0"
-    object-inspect: "npm:^1.13.3"
+    object-inspect: "npm:^1.13.4"
     object-keys: "npm:^1.1.1"
     object.assign: "npm:^4.1.7"
     own-keys: "npm:^1.0.1"
-    regexp.prototype.flags: "npm:^1.5.3"
+    regexp.prototype.flags: "npm:^1.5.4"
     safe-array-concat: "npm:^1.1.3"
     safe-push-apply: "npm:^1.0.0"
     safe-regex-test: "npm:^1.1.0"
     set-proto: "npm:^1.0.0"
+    stop-iteration-iterator: "npm:^1.1.0"
     string.prototype.trim: "npm:^1.2.10"
     string.prototype.trimend: "npm:^1.0.9"
     string.prototype.trimstart: "npm:^1.0.8"
@@ -6683,8 +6808,8 @@ __metadata:
     typed-array-byte-offset: "npm:^1.0.4"
     typed-array-length: "npm:^1.0.7"
     unbox-primitive: "npm:^1.1.0"
-    which-typed-array: "npm:^1.1.18"
-  checksum: 10c0/1de229c9e08fe13c17fe5abaec8221545dfcd57e51f64909599a6ae896df84b8fd2f7d16c60cb00d7bf495b9298ca3581aded19939d4b7276854a4b066f8422b
+    which-typed-array: "npm:^1.1.19"
+  checksum: 10c0/b256e897be32df5d382786ce8cce29a1dd8c97efbab77a26609bd70f2ed29fbcfc7a31758cb07488d532e7ccccdfca76c1118f2afe5a424cdc05ca007867c318
   languageName: node
   linkType: hard
 
@@ -6726,7 +6851,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"es-module-lexer@npm:^1.5.3, es-module-lexer@npm:^1.7.0":
+"es-module-lexer@npm:^1.7.0":
   version: 1.7.0
   resolution: "es-module-lexer@npm:1.7.0"
   checksum: 10c0/4c935affcbfeba7fb4533e1da10fa8568043df1e3574b869385980de9e2d475ddc36769891936dbb07036edb3c3786a8b78ccf44964cd130dedc1f2c984b6c7b
@@ -6754,12 +6879,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"es-shim-unscopables@npm:^1.0.0, es-shim-unscopables@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "es-shim-unscopables@npm:1.0.2"
+"es-shim-unscopables@npm:^1.0.2, es-shim-unscopables@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "es-shim-unscopables@npm:1.1.0"
   dependencies:
-    hasown: "npm:^2.0.0"
-  checksum: 10c0/f495af7b4b7601a4c0cfb893581c352636e5c08654d129590386a33a0432cf13a7bdc7b6493801cadd990d838e2839b9013d1de3b880440cb537825e834fe783
+    hasown: "npm:^2.0.2"
+  checksum: 10c0/1b9702c8a1823fc3ef39035a4e958802cf294dd21e917397c561d0b3e195f383b978359816b1732d02b255ccf63e1e4815da0065b95db8d7c992037be3bbbcdb
   languageName: node
   linkType: hard
 
@@ -6892,6 +7017,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"eslint-import-context@npm:^0.1.8":
+  version: 0.1.9
+  resolution: "eslint-import-context@npm:0.1.9"
+  dependencies:
+    get-tsconfig: "npm:^4.10.1"
+    stable-hash-x: "npm:^0.2.0"
+  peerDependencies:
+    unrs-resolver: ^1.0.0
+  peerDependenciesMeta:
+    unrs-resolver:
+      optional: true
+  checksum: 10c0/07851103443b70af681c5988e2702e681ff9b956e055e11d4bd9b2322847fa0d9e8da50c18fc7cb1165106b043f34fbd0384d7011c239465c4645c52132e56f3
+  languageName: node
+  linkType: hard
+
 "eslint-import-resolver-node@npm:^0.3.9":
   version: 0.3.9
   resolution: "eslint-import-resolver-node@npm:0.3.9"
@@ -6904,15 +7044,16 @@ __metadata:
   linkType: hard
 
 "eslint-import-resolver-typescript@npm:^4.2.5":
-  version: 4.2.5
-  resolution: "eslint-import-resolver-typescript@npm:4.2.5"
+  version: 4.4.4
+  resolution: "eslint-import-resolver-typescript@npm:4.4.4"
   dependencies:
-    debug: "npm:^4.4.0"
-    get-tsconfig: "npm:^4.10.0"
+    debug: "npm:^4.4.1"
+    eslint-import-context: "npm:^0.1.8"
+    get-tsconfig: "npm:^4.10.1"
     is-bun-module: "npm:^2.0.0"
-    stable-hash: "npm:^0.0.5"
-    tinyglobby: "npm:^0.2.12"
-    unrs-resolver: "npm:^1.3.2"
+    stable-hash-x: "npm:^0.2.0"
+    tinyglobby: "npm:^0.2.14"
+    unrs-resolver: "npm:^1.7.11"
   peerDependencies:
     eslint: "*"
     eslint-plugin-import: "*"
@@ -6922,28 +7063,28 @@ __metadata:
       optional: true
     eslint-plugin-import-x:
       optional: true
-  checksum: 10c0/9134c4dd6e8b3cf1356d6bff68939153c81255c0ac7f694e829c3c7f5e785936591cfe43209d866c8a3b379d3a8dcd203651ec49bd99361fcb54dc0c2b9ce8fc
+  checksum: 10c0/3bf8ad77c21660f77a0e455555ab179420f68ae7a132906c85a217ccce51cb6680cf70027cab32a358d193e5b9e476f6ba2e595585242aa97d4f6435ca22104e
   languageName: node
   linkType: hard
 
-"eslint-module-utils@npm:^2.12.0":
-  version: 2.12.0
-  resolution: "eslint-module-utils@npm:2.12.0"
+"eslint-module-utils@npm:^2.12.1":
+  version: 2.12.1
+  resolution: "eslint-module-utils@npm:2.12.1"
   dependencies:
     debug: "npm:^3.2.7"
   peerDependenciesMeta:
     eslint:
       optional: true
-  checksum: 10c0/4d8b46dcd525d71276f9be9ffac1d2be61c9d54cc53c992e6333cf957840dee09381842b1acbbb15fc6b255ebab99cd481c5007ab438e5455a14abe1a0468558
+  checksum: 10c0/6f4efbe7a91ae49bf67b4ab3644cb60bc5bd7db4cb5521de1b65be0847ffd3fb6bce0dd68f0995e1b312d137f768e2a1f842ee26fe73621afa05f850628fdc40
   languageName: node
   linkType: hard
 
 "eslint-plugin-formatjs@npm:^5.3.1":
-  version: 5.3.1
-  resolution: "eslint-plugin-formatjs@npm:5.3.1"
+  version: 5.4.0
+  resolution: "eslint-plugin-formatjs@npm:5.4.0"
   dependencies:
     "@formatjs/icu-messageformat-parser": "npm:2.11.2"
-    "@formatjs/ts-transformer": "npm:3.13.34"
+    "@formatjs/ts-transformer": "npm:3.14.0"
     "@types/eslint": "npm:^9.6.1"
     "@types/picomatch": "npm:^3"
     "@typescript-eslint/utils": "npm:^8.27.0"
@@ -6953,57 +7094,56 @@ __metadata:
     unicode-emoji-utils: "npm:^1.2.0"
   peerDependencies:
     eslint: ^9.23.0
-  checksum: 10c0/fb8ba06e0718cd098f2393aea04eb4a6037ca3ead1c9450bd38926d0adecba4cefdebfb661c56c36685e0f003331520c3330544c45803f397b827713ab5e1d7d
+  checksum: 10c0/5c74a53988df68ffed4e68bb58a4ee75cdcd92b7d94f699e2edbcdd8c2c45930f500c7211da0a4616714d7d83bbbdc105328e5aacf0c9c7582a78fdfc9fa2b55
   languageName: node
   linkType: hard
 
-"eslint-plugin-import@npm:~2.31.0":
-  version: 2.31.0
-  resolution: "eslint-plugin-import@npm:2.31.0"
+"eslint-plugin-import@npm:~2.32.0":
+  version: 2.32.0
+  resolution: "eslint-plugin-import@npm:2.32.0"
   dependencies:
     "@rtsao/scc": "npm:^1.1.0"
-    array-includes: "npm:^3.1.8"
-    array.prototype.findlastindex: "npm:^1.2.5"
-    array.prototype.flat: "npm:^1.3.2"
-    array.prototype.flatmap: "npm:^1.3.2"
+    array-includes: "npm:^3.1.9"
+    array.prototype.findlastindex: "npm:^1.2.6"
+    array.prototype.flat: "npm:^1.3.3"
+    array.prototype.flatmap: "npm:^1.3.3"
     debug: "npm:^3.2.7"
     doctrine: "npm:^2.1.0"
     eslint-import-resolver-node: "npm:^0.3.9"
-    eslint-module-utils: "npm:^2.12.0"
+    eslint-module-utils: "npm:^2.12.1"
     hasown: "npm:^2.0.2"
-    is-core-module: "npm:^2.15.1"
+    is-core-module: "npm:^2.16.1"
     is-glob: "npm:^4.0.3"
     minimatch: "npm:^3.1.2"
     object.fromentries: "npm:^2.0.8"
     object.groupby: "npm:^1.0.3"
-    object.values: "npm:^1.2.0"
+    object.values: "npm:^1.2.1"
     semver: "npm:^6.3.1"
-    string.prototype.trimend: "npm:^1.0.8"
+    string.prototype.trimend: "npm:^1.0.9"
     tsconfig-paths: "npm:^3.15.0"
   peerDependencies:
     eslint: ^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8 || ^9
-  checksum: 10c0/e21d116ddd1900e091ad120b3eb68c5dd5437fe2c930f1211781cd38b246f090a6b74d5f3800b8255a0ed29782591521ad44eb21c5534960a8f1fb4040fd913a
+  checksum: 10c0/bfb1b8fc8800398e62ddfefbf3638d185286edfed26dfe00875cc2846d954491b4f5112457831588b757fa789384e1ae585f812614c4797f0499fa234fd4a48b
   languageName: node
   linkType: hard
 
-"eslint-plugin-jsdoc@npm:^50.6.9":
-  version: 50.6.9
-  resolution: "eslint-plugin-jsdoc@npm:50.6.9"
+"eslint-plugin-jsdoc@npm:^54.0.0":
+  version: 54.0.0
+  resolution: "eslint-plugin-jsdoc@npm:54.0.0"
   dependencies:
-    "@es-joy/jsdoccomment": "npm:~0.49.0"
+    "@es-joy/jsdoccomment": "npm:~0.52.0"
     are-docs-informative: "npm:^0.0.2"
     comment-parser: "npm:1.4.1"
-    debug: "npm:^4.3.6"
+    debug: "npm:^4.4.1"
     escape-string-regexp: "npm:^4.0.0"
-    espree: "npm:^10.1.0"
+    espree: "npm:^10.4.0"
     esquery: "npm:^1.6.0"
-    parse-imports: "npm:^2.1.1"
-    semver: "npm:^7.6.3"
+    parse-imports-exports: "npm:^0.2.4"
+    semver: "npm:^7.7.2"
     spdx-expression-parse: "npm:^4.0.0"
-    synckit: "npm:^0.9.1"
   peerDependencies:
     eslint: ^7.0.0 || ^8.0.0 || ^9.0.0
-  checksum: 10c0/cad199d262c2e889a3af4e402f6adc624e4273b3d5ca1940e7227b37d87af8090ca3444f7fff57f58dab9a827faed8722fc2f5d4daf31ec085eb00e9f5a338a7
+  checksum: 10c0/cf0a388fc670ababe26f9584c467bc8c1592aa83affcf16118d8181c186a6d8f02a8ea65250766b45168fca5cb879a6af66e8457cdb98f0f923bd927572e2de5
   languageName: node
   linkType: hard
 
@@ -7053,8 +7193,8 @@ __metadata:
   linkType: hard
 
 "eslint-plugin-react@npm:^7.37.4":
-  version: 7.37.4
-  resolution: "eslint-plugin-react@npm:7.37.4"
+  version: 7.37.5
+  resolution: "eslint-plugin-react@npm:7.37.5"
   dependencies:
     array-includes: "npm:^3.1.8"
     array.prototype.findlast: "npm:^1.2.5"
@@ -7066,7 +7206,7 @@ __metadata:
     hasown: "npm:^2.0.2"
     jsx-ast-utils: "npm:^2.4.1 || ^3.0.0"
     minimatch: "npm:^3.1.2"
-    object.entries: "npm:^1.1.8"
+    object.entries: "npm:^1.1.9"
     object.fromentries: "npm:^2.0.8"
     object.values: "npm:^1.2.1"
     prop-types: "npm:^15.8.1"
@@ -7076,29 +7216,29 @@ __metadata:
     string.prototype.repeat: "npm:^1.0.0"
   peerDependencies:
     eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8 || ^9.7
-  checksum: 10c0/4acbbdb19669dfa9a162ed8847c3ad1918f6aea1ceb675ee320b5d903b4e463fdef25e15233295b6d0a726fef2ea8b015c527da769c7690932ddc52d5b82ba12
+  checksum: 10c0/c850bfd556291d4d9234f5ca38db1436924a1013627c8ab1853f77cac73ec19b020e861e6c7b783436a48b6ffcdfba4547598235a37ad4611b6739f65fd8ad57
   languageName: node
   linkType: hard
 
 "eslint-plugin-storybook@npm:^9.0.4":
-  version: 9.0.4
-  resolution: "eslint-plugin-storybook@npm:9.0.4"
+  version: 9.1.1
+  resolution: "eslint-plugin-storybook@npm:9.1.1"
   dependencies:
     "@typescript-eslint/utils": "npm:^8.8.1"
   peerDependencies:
     eslint: ">=8"
-    storybook: ^9.0.4
-  checksum: 10c0/b5dbcd15feab63d71f4bd5da26306043339620ddf64bb623de3a7542ee81828b4137af93e199c3e49fb0e5a76d582a21fb580626011ae2340dd6fc684f438358
+    storybook: ^9.1.1
+  checksum: 10c0/4cf80aa078633021b153a3a5b790a39c9919b5fa7203727c15d8ae066e75d6e134d7d718e66a6a5db9815275f32942a2deae1979aeb36be2543572507faced2c
   languageName: node
   linkType: hard
 
-"eslint-scope@npm:^8.3.0":
-  version: 8.3.0
-  resolution: "eslint-scope@npm:8.3.0"
+"eslint-scope@npm:^8.4.0":
+  version: 8.4.0
+  resolution: "eslint-scope@npm:8.4.0"
   dependencies:
     esrecurse: "npm:^4.3.0"
     estraverse: "npm:^5.2.0"
-  checksum: 10c0/23bf54345573201fdf06d29efa345ab508b355492f6c6cc9e2b9f6d02b896f369b6dd5315205be94b8853809776c4d13353b85c6b531997b164ff6c3328ecf5b
+  checksum: 10c0/407f6c600204d0f3705bd557f81bd0189e69cd7996f408f8971ab5779c0af733d1af2f1412066b40ee1588b085874fc37a2333986c6521669cdbdd36ca5058e0
   languageName: node
   linkType: hard
 
@@ -7109,25 +7249,25 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint-visitor-keys@npm:^4.2.0":
-  version: 4.2.0
-  resolution: "eslint-visitor-keys@npm:4.2.0"
-  checksum: 10c0/2ed81c663b147ca6f578312919483eb040295bbab759e5a371953456c636c5b49a559883e2677112453728d66293c0a4c90ab11cab3428cf02a0236d2e738269
+"eslint-visitor-keys@npm:^4.2.1":
+  version: 4.2.1
+  resolution: "eslint-visitor-keys@npm:4.2.1"
+  checksum: 10c0/fcd43999199d6740db26c58dbe0c2594623e31ca307e616ac05153c9272f12f1364f5a0b1917a8e962268fdecc6f3622c1c2908b4fcc2e047a106fe6de69dc43
   languageName: node
   linkType: hard
 
 "eslint@npm:^9.23.0":
-  version: 9.23.0
-  resolution: "eslint@npm:9.23.0"
+  version: 9.32.0
+  resolution: "eslint@npm:9.32.0"
   dependencies:
     "@eslint-community/eslint-utils": "npm:^4.2.0"
     "@eslint-community/regexpp": "npm:^4.12.1"
-    "@eslint/config-array": "npm:^0.19.2"
-    "@eslint/config-helpers": "npm:^0.2.0"
-    "@eslint/core": "npm:^0.12.0"
+    "@eslint/config-array": "npm:^0.21.0"
+    "@eslint/config-helpers": "npm:^0.3.0"
+    "@eslint/core": "npm:^0.15.0"
     "@eslint/eslintrc": "npm:^3.3.1"
-    "@eslint/js": "npm:9.23.0"
-    "@eslint/plugin-kit": "npm:^0.2.7"
+    "@eslint/js": "npm:9.32.0"
+    "@eslint/plugin-kit": "npm:^0.3.4"
     "@humanfs/node": "npm:^0.16.6"
     "@humanwhocodes/module-importer": "npm:^1.0.1"
     "@humanwhocodes/retry": "npm:^0.4.2"
@@ -7138,9 +7278,9 @@ __metadata:
     cross-spawn: "npm:^7.0.6"
     debug: "npm:^4.3.2"
     escape-string-regexp: "npm:^4.0.0"
-    eslint-scope: "npm:^8.3.0"
-    eslint-visitor-keys: "npm:^4.2.0"
-    espree: "npm:^10.3.0"
+    eslint-scope: "npm:^8.4.0"
+    eslint-visitor-keys: "npm:^4.2.1"
+    espree: "npm:^10.4.0"
     esquery: "npm:^1.5.0"
     esutils: "npm:^2.0.2"
     fast-deep-equal: "npm:^3.1.3"
@@ -7162,18 +7302,18 @@ __metadata:
       optional: true
   bin:
     eslint: bin/eslint.js
-  checksum: 10c0/9616c308dfa8d09db8ae51019c87d5d05933742214531b077bd6ab618baab3bec7938256c14dcad4dc47f5ba93feb0bc5e089f68799f076374ddea21b6a9be45
+  checksum: 10c0/e8a23924ec5f8b62e95483002ca25db74e25c23bd9c6d98a9f656ee32f820169bee3bfdf548ec728b16694f198b3db857d85a49210ee4a035242711d08fdc602
   languageName: node
   linkType: hard
 
-"espree@npm:^10.0.1, espree@npm:^10.1.0, espree@npm:^10.3.0":
-  version: 10.3.0
-  resolution: "espree@npm:10.3.0"
+"espree@npm:^10.0.1, espree@npm:^10.4.0":
+  version: 10.4.0
+  resolution: "espree@npm:10.4.0"
   dependencies:
-    acorn: "npm:^8.14.0"
+    acorn: "npm:^8.15.0"
     acorn-jsx: "npm:^5.3.2"
-    eslint-visitor-keys: "npm:^4.2.0"
-  checksum: 10c0/272beeaca70d0a1a047d61baff64db04664a33d7cfb5d144f84bc8a5c6194c6c8ebe9cc594093ca53add88baa23e59b01e69e8a0160ab32eac570482e165c462
+    eslint-visitor-keys: "npm:^4.2.1"
+  checksum: 10c0/c63fe06131c26c8157b4083313cb02a9a54720a08e21543300e55288c40e06c3fc284bdecf108d3a1372c5934a0a88644c98714f38b6ae8ed272b40d9ea08d6b
   languageName: node
   linkType: hard
 
@@ -7309,6 +7449,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"fake-indexeddb@npm:^6.0.1":
+  version: 6.2.2
+  resolution: "fake-indexeddb@npm:6.2.2"
+  checksum: 10c0/5ad98f05beb22d8591af1bcf8500d1a92d9a17b3e2c380dfa669770b4fecdbadc1ccd9c8ba5429a92a30fd2562f6ab24238992522a8574ffd365d7b809677f0a
+  languageName: node
+  linkType: hard
+
 "fast-copy@npm:^3.0.2":
   version: 3.0.2
   resolution: "fast-copy@npm:3.0.2"
@@ -7350,13 +7497,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"fast-redact@npm:^3.1.1":
-  version: 3.3.0
-  resolution: "fast-redact@npm:3.3.0"
-  checksum: 10c0/d81562510681e9ba6404ee5d3838ff5257a44d2f80937f5024c099049ff805437d0fae0124458a7e87535cc9dcf4de305bb075cab8f08d6c720bbc3447861b4e
-  languageName: node
-  linkType: hard
-
 "fast-safe-stringify@npm:^2.1.1":
   version: 2.1.1
   resolution: "fast-safe-stringify@npm:2.1.1"
@@ -7387,15 +7527,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"fdir@npm:^6.4.4":
-  version: 6.4.4
-  resolution: "fdir@npm:6.4.4"
+"fdir@npm:^6.5.0":
+  version: 6.5.0
+  resolution: "fdir@npm:6.5.0"
   peerDependencies:
     picomatch: ^3 || ^4
   peerDependenciesMeta:
     picomatch:
       optional: true
-  checksum: 10c0/6ccc33be16945ee7bc841e1b4178c0b4cf18d3804894cb482aa514651c962a162f96da7ffc6ebfaf0df311689fb70091b04dd6caffe28d56b9ebdc0e7ccadfdd
+  checksum: 10c0/e345083c4306b3aed6cb8ec551e26c36bab5c511e99ea4576a16750ddc8d3240e63826cc624f5ae17ad4dc82e68a253213b60d556c11bfad064b7607847ed07f
   languageName: node
   linkType: hard
 
@@ -7406,12 +7546,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"file-entry-cache@npm:^10.0.8":
-  version: 10.1.0
-  resolution: "file-entry-cache@npm:10.1.0"
+"file-entry-cache@npm:^10.1.4":
+  version: 10.1.4
+  resolution: "file-entry-cache@npm:10.1.4"
   dependencies:
-    flat-cache: "npm:^6.1.9"
-  checksum: 10c0/9464848577f68809237ffdf11c09a285d930ed4cda8cf392ee44ac8fa70658e41bbe60d08d883285d6af798a26f008dd8dfa94a31d42ecf1ba5a7bcd6dd8b07d
+    flat-cache: "npm:^6.1.13"
+  checksum: 10c0/78a7d6b257c620374a8fc5280f14acffc7bd5cb5d39a5bd3509c640f17209f5194eff6e3b476d19db7cfbe9f97abe85ec8d33260f7ed94225efb2a95a68841a6
   languageName: node
   linkType: hard
 
@@ -7474,6 +7614,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"find-up@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "find-up@npm:7.0.0"
+  dependencies:
+    locate-path: "npm:^7.2.0"
+    path-exists: "npm:^5.0.0"
+    unicorn-magic: "npm:^0.1.0"
+  checksum: 10c0/e6ee3e6154560bc0ab3bc3b7d1348b31513f9bdf49a5dd2e952495427d559fa48cdf33953e85a309a323898b43fa1bfbc8b80c880dfc16068384783034030008
+  languageName: node
+  linkType: hard
+
 "flat-cache@npm:^4.0.0":
   version: 4.0.1
   resolution: "flat-cache@npm:4.0.1"
@@ -7484,14 +7635,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"flat-cache@npm:^6.1.9":
-  version: 6.1.9
-  resolution: "flat-cache@npm:6.1.9"
+"flat-cache@npm:^6.1.13":
+  version: 6.1.14
+  resolution: "flat-cache@npm:6.1.14"
   dependencies:
-    cacheable: "npm:^1.9.0"
+    cacheable: "npm:^2.0.1"
     flatted: "npm:^3.3.3"
-    hookified: "npm:^1.8.2"
-  checksum: 10c0/ca9241fab68154e9a4efe8875beff43cb7b2de65628d15dcf8488dc69bca3f8e98085a707c3395d03b1022f586364b0f37aa5dd5cc085a8cf7481516757ac864
+    hookified: "npm:^1.12.0"
+  checksum: 10c0/e17eda47414b4742bc557650788f18255068621afb66b23dfc6a47b3ef3e6c366ede7329e71406bf331ef6f4a3b243040803eb175560b4ceb204779066ba6e92
   languageName: node
   linkType: hard
 
@@ -7512,12 +7663,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"for-each@npm:^0.3.3":
-  version: 0.3.3
-  resolution: "for-each@npm:0.3.3"
+"for-each@npm:^0.3.3, for-each@npm:^0.3.5":
+  version: 0.3.5
+  resolution: "for-each@npm:0.3.5"
   dependencies:
-    is-callable: "npm:^1.1.3"
-  checksum: 10c0/22330d8a2db728dbf003ec9182c2d421fbcd2969b02b4f97ec288721cda63eb28f2c08585ddccd0f77cb2930af8d958005c9e72f47141dc51816127a118f39aa
+    is-callable: "npm:^1.2.7"
+  checksum: 10c0/0e0b50f6a843a282637d43674d1fb278dda1dd85f4f99b640024cfb10b85058aac0cc781bf689d5fe50b4b7f638e91e548560723a4e76e04fe96ae35ef039cee
   languageName: node
   linkType: hard
 
@@ -7531,14 +7682,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"form-data@npm:^4.0.0":
-  version: 4.0.1
-  resolution: "form-data@npm:4.0.1"
+"form-data@npm:^4.0.4":
+  version: 4.0.4
+  resolution: "form-data@npm:4.0.4"
   dependencies:
     asynckit: "npm:^0.4.0"
     combined-stream: "npm:^1.0.8"
+    es-set-tostringtag: "npm:^2.1.0"
+    hasown: "npm:^2.0.2"
     mime-types: "npm:^2.1.12"
-  checksum: 10c0/bb102d570be8592c23f4ea72d7df9daa50c7792eb0cf1c5d7e506c1706e7426a4e4ae48a35b109e91c85f1c0ec63774a21ae252b66f4eb981cb8efef7d0463c8
+  checksum: 10c0/373525a9a034b9d57073e55eab79e501a714ffac02e7a9b01be1c820780652b16e4101819785e1e18f8d98f0aee866cc654d660a435c378e16a72f2e7cac9695
   languageName: node
   linkType: hard
 
@@ -7563,6 +7716,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"fs-extra@npm:^11.3.2":
+  version: 11.3.2
+  resolution: "fs-extra@npm:11.3.2"
+  dependencies:
+    graceful-fs: "npm:^4.2.0"
+    jsonfile: "npm:^6.0.1"
+    universalify: "npm:^2.0.0"
+  checksum: 10c0/f5d629e1bb646d5dedb4d8b24c5aad3deb8cc1d5438979d6f237146cd10e113b49a949ae1b54212c2fbc98e2d0995f38009a9a1d0520f0287943335e65fe919b
+  languageName: node
+  linkType: hard
+
 "fs-extra@npm:^9.0.1":
   version: 9.1.0
   resolution: "fs-extra@npm:9.1.0"
@@ -7575,15 +7739,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"fs-minipass@npm:^2.0.0":
-  version: 2.1.0
-  resolution: "fs-minipass@npm:2.1.0"
-  dependencies:
-    minipass: "npm:^3.0.0"
-  checksum: 10c0/703d16522b8282d7299337539c3ed6edddd1afe82435e4f5b76e34a79cd74e488a8a0e26a636afc2440e1a23b03878e2122e3a2cfe375a5cf63c37d92b86a004
-  languageName: node
-  linkType: hard
-
 "fs-minipass@npm:^3.0.0":
   version: 3.0.3
   resolution: "fs-minipass@npm:3.0.3"
@@ -7687,10 +7842,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"get-east-asian-width@npm:^1.0.0":
-  version: 1.2.0
-  resolution: "get-east-asian-width@npm:1.2.0"
-  checksum: 10c0/914b1e217cf38436c24b4c60b4c45289e39a45bf9e65ef9fd343c2815a1a02b8a0215aeec8bf9c07c516089004b6e3826332481f40a09529fcadbf6e579f286b
+"get-east-asian-width@npm:^1.0.0, get-east-asian-width@npm:^1.3.0":
+  version: 1.4.0
+  resolution: "get-east-asian-width@npm:1.4.0"
+  checksum: 10c0/4e481d418e5a32061c36fbb90d1b225a254cc5b2df5f0b25da215dcd335a3c111f0c2023ffda43140727a9cafb62dac41d022da82c08f31083ee89f714ee3b83
   languageName: node
   linkType: hard
 
@@ -7740,16 +7895,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"get-tsconfig@npm:^4.10.0":
-  version: 4.10.0
-  resolution: "get-tsconfig@npm:4.10.0"
+"get-tsconfig@npm:^4.10.1":
+  version: 4.10.1
+  resolution: "get-tsconfig@npm:4.10.1"
   dependencies:
     resolve-pkg-maps: "npm:^1.0.0"
-  checksum: 10c0/c9b5572c5118923c491c04285c73bd55b19e214992af957c502a3be0fc0043bb421386ffd45ca3433c0a7fba81221ca300479e8393960acf15d0ed4563f38a86
+  checksum: 10c0/7f8e3dabc6a49b747920a800fb88e1952fef871cdf51b79e98db48275a5de6cdaf499c55ee67df5fa6fe7ce65f0063e26de0f2e53049b408c585aa74d39ffa21
   languageName: node
   linkType: hard
 
-"glob-parent@npm:^5.1.2":
+"glob-parent@npm:^5.1.2, glob-parent@npm:~5.1.2":
   version: 5.1.2
   resolution: "glob-parent@npm:5.1.2"
   dependencies:
@@ -7767,7 +7922,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"glob@npm:^10.0.0, glob@npm:^10.2.2, glob@npm:^10.3.10, glob@npm:^10.4.1":
+"glob@npm:^10.0.0, glob@npm:^10.2.2, glob@npm:^10.4.1":
   version: 10.4.5
   resolution: "glob@npm:10.4.5"
   dependencies:
@@ -7817,13 +7972,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"globals@npm:^11.1.0":
-  version: 11.12.0
-  resolution: "globals@npm:11.12.0"
-  checksum: 10c0/758f9f258e7b19226bd8d4af5d3b0dcf7038780fb23d82e6f98932c44e239f884847f1766e8fa9cc5635ccb3204f7fa7314d4408dd4002a5e8ea827b4018f0a1
-  languageName: node
-  linkType: hard
-
 "globals@npm:^14.0.0":
   version: 14.0.0
   resolution: "globals@npm:14.0.0"
@@ -7832,9 +7980,9 @@ __metadata:
   linkType: hard
 
 "globals@npm:^16.0.0":
-  version: 16.0.0
-  resolution: "globals@npm:16.0.0"
-  checksum: 10c0/8906d5f01838df64a81d6c2a7b7214312e2216cf65c5ed1546dc9a7d0febddf55ffa906cf04efd5b01eec2534d6f14859a89535d1a68241832810e41ef3fd5bb
+  version: 16.3.0
+  resolution: "globals@npm:16.3.0"
+  checksum: 10c0/c62dc20357d1c0bf2be4545d6c4141265d1a229bf1c3294955efb5b5ef611145391895e3f2729f8603809e81b30b516c33e6c2597573844449978606aad6eb38
   languageName: node
   linkType: hard
 
@@ -7952,7 +8100,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"hasown@npm:^2.0.0, hasown@npm:^2.0.2":
+"hasown@npm:^2.0.2":
   version: 2.0.2
   resolution: "hasown@npm:2.0.2"
   dependencies:
@@ -7998,10 +8146,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"hookified@npm:^1.8.2":
-  version: 1.9.0
-  resolution: "hookified@npm:1.9.0"
-  checksum: 10c0/28145882504e40ef58f328554966520c56dc2aaca92457996a5cd68fda6f92e38d3ca283e7ebbf3d71f36cda887234ce580abfa6532ade906be7810a812f15fa
+"hookified@npm:^1.12.0, hookified@npm:^1.12.1":
+  version: 1.12.1
+  resolution: "hookified@npm:1.12.1"
+  checksum: 10c0/fe8d74ee49d1f79677dcdff7606eeb731f7a7dc59f61ec2141a11e3bb94ff6532f870649b900fa9f68568f410c504a338d8732e4d1abe61b426e645c37862e50
   languageName: node
   linkType: hard
 
@@ -8116,24 +8264,24 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ieee754@npm:^1.2.1":
-  version: 1.2.1
-  resolution: "ieee754@npm:1.2.1"
-  checksum: 10c0/b0782ef5e0935b9f12883a2e2aa37baa75da6e66ce6515c168697b42160807d9330de9a32ec1ed73149aea02e0d822e572bca6f1e22bdcbd2149e13b050b17bb
+"idb@npm:^8.0.3":
+  version: 8.0.3
+  resolution: "idb@npm:8.0.3"
+  checksum: 10c0/421cd9a3281b7564528857031cc33fd9e95753f8191e483054cb25d1ceea7303a0d1462f4f69f5b41606f0f066156999e067478abf2460dfcf9cab80dae2a2b2
   languageName: node
   linkType: hard
 
-"ignore@npm:^5.2.0, ignore@npm:^5.3.1":
+"ignore@npm:^5.2.0":
   version: 5.3.2
   resolution: "ignore@npm:5.3.2"
   checksum: 10c0/f9f652c957983634ded1e7f02da3b559a0d4cc210fca3792cb67f1b153623c9c42efdc1c4121af171e295444459fc4a9201101fb041b1104a3c000bccb188337
   languageName: node
   linkType: hard
 
-"ignore@npm:^7.0.3":
-  version: 7.0.4
-  resolution: "ignore@npm:7.0.4"
-  checksum: 10c0/90e1f69ce352b9555caecd9cbfd07abe7626d312a6f90efbbb52c7edca6ea8df065d66303863b30154ab1502afb2da8bc59d5b04e1719a52ef75bbf675c488eb
+"ignore@npm:^7.0.0, ignore@npm:^7.0.5":
+  version: 7.0.5
+  resolution: "ignore@npm:7.0.5"
+  checksum: 10c0/ae00db89fe873064a093b8999fe4cc284b13ef2a178636211842cceb650b9c3e390d3339191acb145d81ed5379d2074840cf0c33a20bdbd6f32821f79eb4ad5d
   languageName: node
   linkType: hard
 
@@ -8231,15 +8379,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"intl-messageformat@npm:10.7.16, intl-messageformat@npm:^10.7.16":
-  version: 10.7.16
-  resolution: "intl-messageformat@npm:10.7.16"
+"intl-messageformat@npm:10.7.17, intl-messageformat@npm:^10.7.16":
+  version: 10.7.17
+  resolution: "intl-messageformat@npm:10.7.17"
   dependencies:
-    "@formatjs/ecma402-abstract": "npm:2.3.4"
+    "@formatjs/ecma402-abstract": "npm:2.3.5"
     "@formatjs/fast-memoize": "npm:2.2.7"
-    "@formatjs/icu-messageformat-parser": "npm:2.11.2"
+    "@formatjs/icu-messageformat-parser": "npm:2.11.3"
     tslib: "npm:^2.8.0"
-  checksum: 10c0/537735bf6439f0560f132895d117df6839957ac04cdd58d861f6da86803d40bfc19059e3d341ddb8de87214b73a6329b57f9acdb512bb0f745dcf08729507b9b
+  checksum: 10c0/74445987da233cd5a6df0e4d35813ff11483b0788ff5cbbcf9e2a07c276cdd18001a3ba68583bf8d28920494b68a2be91a9c9f796062973dec3c95a4e88ffa81
   languageName: node
   linkType: hard
 
@@ -8253,10 +8401,10 @@ __metadata:
   linkType: hard
 
 "ioredis@npm:^5.3.2":
-  version: 5.6.1
-  resolution: "ioredis@npm:5.6.1"
+  version: 5.8.1
+  resolution: "ioredis@npm:5.8.1"
   dependencies:
-    "@ioredis/commands": "npm:^1.1.1"
+    "@ioredis/commands": "npm:1.4.0"
     cluster-key-slot: "npm:^1.1.0"
     debug: "npm:^4.3.4"
     denque: "npm:^2.1.0"
@@ -8265,14 +8413,14 @@ __metadata:
     redis-errors: "npm:^1.2.0"
     redis-parser: "npm:^3.0.0"
     standard-as-callback: "npm:^2.1.0"
-  checksum: 10c0/26ae49cf448e807e454a9bdea5a9dfdcf669e2fdbf2df341900a0fb693c5662fea7e39db3227ce8972d1bda0ba7da9b7410e5163b12d8878a579548d847220ac
+  checksum: 10c0/4ed66444017150da027bce940a24bf726994691e2a7b3aa11d52f8aeb37f258068cc171af4d9c61247acafc28eb086fa8a7c79420b8e8d2907d2f74f39584465
   languageName: node
   linkType: hard
 
-"ip@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "ip@npm:2.0.0"
-  checksum: 10c0/8d186cc5585f57372847ae29b6eba258c68862055e18a75cc4933327232cb5c107f89800ce29715d542eef2c254fbb68b382e780a7414f9ee7caf60b7a473958
+"ip-address@npm:^10.0.1":
+  version: 10.0.1
+  resolution: "ip-address@npm:10.0.1"
+  checksum: 10c0/1634d79dae18394004775cb6d699dc46b7c23df6d2083164025a2b15240c1164fccde53d0e08bd5ee4fc53913d033ab6b5e395a809ad4b956a940c446e948843
   languageName: node
   linkType: hard
 
@@ -8319,6 +8467,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"is-binary-path@npm:~2.1.0":
+  version: 2.1.0
+  resolution: "is-binary-path@npm:2.1.0"
+  dependencies:
+    binary-extensions: "npm:^2.0.0"
+  checksum: 10c0/a16eaee59ae2b315ba36fad5c5dcaf8e49c3e27318f8ab8fa3cdb8772bf559c8d1ba750a589c2ccb096113bb64497084361a25960899cb6172a6925ab6123d38
+  languageName: node
+  linkType: hard
+
 "is-boolean-object@npm:^1.2.1":
   version: 1.2.2
   resolution: "is-boolean-object@npm:1.2.2"
@@ -8338,14 +8495,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-callable@npm:^1.1.3, is-callable@npm:^1.2.7":
+"is-callable@npm:^1.2.7":
   version: 1.2.7
   resolution: "is-callable@npm:1.2.7"
   checksum: 10c0/ceebaeb9d92e8adee604076971dd6000d38d6afc40bb843ea8e45c5579b57671c3f3b50d7f04869618242c6cee08d1b67806a8cb8edaaaf7c0748b3720d6066f
   languageName: node
   linkType: hard
 
-"is-core-module@npm:^2.13.0, is-core-module@npm:^2.15.1, is-core-module@npm:^2.16.0":
+"is-core-module@npm:^2.13.0, is-core-module@npm:^2.16.0, is-core-module@npm:^2.16.1":
   version: 2.16.1
   resolution: "is-core-module@npm:2.16.1"
   dependencies:
@@ -8407,13 +8564,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-fullwidth-code-point@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "is-fullwidth-code-point@npm:4.0.0"
-  checksum: 10c0/df2a717e813567db0f659c306d61f2f804d480752526886954a2a3e2246c7745fd07a52b5fecf2b68caf0a6c79dcdace6166fdf29cc76ed9975cc334f0a018b8
-  languageName: node
-  linkType: hard
-
 "is-fullwidth-code-point@npm:^5.0.0":
   version: 5.0.0
   resolution: "is-fullwidth-code-point@npm:5.0.0"
@@ -8432,7 +8582,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-glob@npm:^4.0.0, is-glob@npm:^4.0.1, is-glob@npm:^4.0.3":
+"is-glob@npm:^4.0.0, is-glob@npm:^4.0.1, is-glob@npm:^4.0.3, is-glob@npm:~4.0.1":
   version: 4.0.3
   resolution: "is-glob@npm:4.0.3"
   dependencies:
@@ -8441,13 +8591,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-lambda@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "is-lambda@npm:1.0.1"
-  checksum: 10c0/85fee098ae62ba6f1e24cf22678805473c7afd0fb3978a3aa260e354cb7bcb3a5806cf0a98403188465efedec41ab4348e8e4e79305d409601323855b3839d4d
-  languageName: node
-  linkType: hard
-
 "is-map@npm:^2.0.3":
   version: 2.0.3
   resolution: "is-map@npm:2.0.3"
@@ -8462,6 +8605,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"is-negative-zero@npm:^2.0.3":
+  version: 2.0.3
+  resolution: "is-negative-zero@npm:2.0.3"
+  checksum: 10c0/bcdcf6b8b9714063ffcfa9929c575ac69bfdabb8f4574ff557dfc086df2836cf07e3906f5bbc4f2a5c12f8f3ba56af640c843cdfc74da8caed86c7c7d66fd08e
+  languageName: node
+  linkType: hard
+
 "is-node-process@npm:^1.0.1, is-node-process@npm:^1.2.0":
   version: 1.2.0
   resolution: "is-node-process@npm:1.2.0"
@@ -8549,7 +8699,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-string@npm:^1.0.7, is-string@npm:^1.1.1":
+"is-string@npm:^1.1.1":
   version: 1.1.1
   resolution: "is-string@npm:1.1.1"
   dependencies:
@@ -8593,7 +8743,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-weakref@npm:^1.0.2, is-weakref@npm:^1.1.0":
+"is-weakref@npm:^1.0.2, is-weakref@npm:^1.1.1":
   version: 1.1.1
   resolution: "is-weakref@npm:1.1.1"
   dependencies:
@@ -8768,36 +8918,36 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jsdom@npm:^26.0.0":
-  version: 26.1.0
-  resolution: "jsdom@npm:26.1.0"
+"jsdom@npm:^27.0.0":
+  version: 27.0.0
+  resolution: "jsdom@npm:27.0.0"
   dependencies:
-    cssstyle: "npm:^4.2.1"
-    data-urls: "npm:^5.0.0"
+    "@asamuzakjp/dom-selector": "npm:^6.5.4"
+    cssstyle: "npm:^5.3.0"
+    data-urls: "npm:^6.0.0"
     decimal.js: "npm:^10.5.0"
     html-encoding-sniffer: "npm:^4.0.0"
     http-proxy-agent: "npm:^7.0.2"
     https-proxy-agent: "npm:^7.0.6"
     is-potential-custom-element-name: "npm:^1.0.1"
-    nwsapi: "npm:^2.2.16"
-    parse5: "npm:^7.2.1"
+    parse5: "npm:^7.3.0"
     rrweb-cssom: "npm:^0.8.0"
     saxes: "npm:^6.0.0"
     symbol-tree: "npm:^3.2.4"
-    tough-cookie: "npm:^5.1.1"
+    tough-cookie: "npm:^6.0.0"
     w3c-xmlserializer: "npm:^5.0.0"
-    webidl-conversions: "npm:^7.0.0"
+    webidl-conversions: "npm:^8.0.0"
     whatwg-encoding: "npm:^3.1.1"
     whatwg-mimetype: "npm:^4.0.0"
-    whatwg-url: "npm:^14.1.1"
-    ws: "npm:^8.18.0"
+    whatwg-url: "npm:^15.0.0"
+    ws: "npm:^8.18.2"
     xml-name-validator: "npm:^5.0.0"
   peerDependencies:
     canvas: ^3.0.0
   peerDependenciesMeta:
     canvas:
       optional: true
-  checksum: 10c0/5b14a5bc32ce077a06fb42d1ab95b1191afa5cbbce8859e3b96831c5143becbbcbf0511d4d4934e922d2901443ced2cdc3b734c1cf30b5f73b3e067ce457d0f4
+  checksum: 10c0/cc977bd0f48f92b275166b3e64622d83c2073dc309b790ed806246365985743295a7735bc8519a186ccffd42d1f2c16a0fa52a4ea79d2b329a948756db64ade1
   languageName: node
   linkType: hard
 
@@ -8852,16 +9002,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"json-stable-stringify@npm:^1.1.1":
-  version: 1.2.1
-  resolution: "json-stable-stringify@npm:1.2.1"
+"json-stable-stringify@npm:^1.1.1, json-stable-stringify@npm:^1.3.0":
+  version: 1.3.0
+  resolution: "json-stable-stringify@npm:1.3.0"
   dependencies:
     call-bind: "npm:^1.0.8"
-    call-bound: "npm:^1.0.3"
+    call-bound: "npm:^1.0.4"
     isarray: "npm:^2.0.5"
     jsonify: "npm:^0.0.1"
     object-keys: "npm:^1.1.1"
-  checksum: 10c0/e623e7ce89282f089d56454087edb717357e8572089b552fbc6980fb7814dc3943f7d0e4f1a19429a36ce9f4428b6c8ee6883357974457aaaa98daba5adebeea
+  checksum: 10c0/8b3ff19e4c23c0ad591a49bc3a015d89a538db787d12fe9c4072e1d64d8cfa481f8c37719c629c3d84e848847617bf49f5fee894cf1d25959ab5b67e1c517f31
   languageName: node
   linkType: hard
 
@@ -8940,12 +9090,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"keyv@npm:^5.3.3":
-  version: 5.3.3
-  resolution: "keyv@npm:5.3.3"
+"keyv@npm:^5.5.1":
+  version: 5.5.2
+  resolution: "keyv@npm:5.5.2"
   dependencies:
-    "@keyv/serialize": "npm:^1.0.3"
-  checksum: 10c0/6b9064d061784e80a5dc500453b03cacb099f06fddd0346063519371d563a66771237e04467f3387b60d8a33a3c99864288991274921fb1338c6adf638574924
+    "@keyv/serialize": "npm:^1.1.1"
+  checksum: 10c0/b0a224210e8bbc4a5913535aa7cc8552809dc81ad67311cc78a2ccfe5485b82b23b8e28ea3a1202e8352c18dd2a0b12b49cda5bb933958d2dcf88042db54c9d0
   languageName: node
   linkType: hard
 
@@ -8970,6 +9120,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"known-css-properties@npm:^0.37.0":
+  version: 0.37.0
+  resolution: "known-css-properties@npm:0.37.0"
+  checksum: 10c0/e0ec08cae580e8833254b690971f73ec6f78ac461820a3c755b4a0b62c5b871501753b4aa60b30576a0f621ba44b231235cf9f35ab89e2e7de5448dfe0600241
+  languageName: node
+  linkType: hard
+
 "lande@npm:^1.0.10":
   version: 1.0.10
   resolution: "lande@npm:1.0.10"
@@ -9012,13 +9169,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lilconfig@npm:^3.1.3":
-  version: 3.1.3
-  resolution: "lilconfig@npm:3.1.3"
-  checksum: 10c0/f5604e7240c5c275743561442fbc5abf2a84ad94da0f5adc71d25e31fa8483048de3dcedcb7a44112a942fed305fd75841cdf6c9681c7f640c63f1049e9a5dcc
-  languageName: node
-  linkType: hard
-
 "lines-and-columns@npm:^1.1.6":
   version: 1.2.4
   resolution: "lines-and-columns@npm:1.2.4"
@@ -9027,36 +9177,33 @@ __metadata:
   linkType: hard
 
 "lint-staged@npm:^16.0.0":
-  version: 16.0.0
-  resolution: "lint-staged@npm:16.0.0"
+  version: 16.2.0
+  resolution: "lint-staged@npm:16.2.0"
   dependencies:
-    chalk: "npm:^5.4.1"
-    commander: "npm:^13.1.0"
-    debug: "npm:^4.4.0"
-    lilconfig: "npm:^3.1.3"
-    listr2: "npm:^8.3.3"
-    micromatch: "npm:^4.0.8"
-    nano-spawn: "npm:^1.0.0"
-    pidtree: "npm:^0.6.0"
-    string-argv: "npm:^0.3.2"
-    yaml: "npm:^2.7.1"
+    commander: "npm:14.0.1"
+    listr2: "npm:9.0.4"
+    micromatch: "npm:4.0.8"
+    nano-spawn: "npm:1.0.3"
+    pidtree: "npm:0.6.0"
+    string-argv: "npm:0.3.2"
+    yaml: "npm:2.8.1"
   bin:
     lint-staged: bin/lint-staged.js
-  checksum: 10c0/8778dbe7892bbf14e378d612d1649c1e3df38a8ddf14cf35962b6e8a962be72efb1ebb48a697e38366be97d25b8d2599cad3c26ac5afc0d0460452484e27924d
+  checksum: 10c0/0903eea526d390fd04ec10c2b6c3c3accdff53647d1918d3c30236d46fa7714a4a109d1aeda7364ecc689728c7b188bc430911b170834228fe0010d938c9a631
   languageName: node
   linkType: hard
 
-"listr2@npm:^8.3.3":
-  version: 8.3.3
-  resolution: "listr2@npm:8.3.3"
+"listr2@npm:9.0.4":
+  version: 9.0.4
+  resolution: "listr2@npm:9.0.4"
   dependencies:
-    cli-truncate: "npm:^4.0.0"
+    cli-truncate: "npm:^5.0.0"
     colorette: "npm:^2.0.20"
     eventemitter3: "npm:^5.0.1"
     log-update: "npm:^6.1.0"
     rfdc: "npm:^1.4.1"
     wrap-ansi: "npm:^9.0.0"
-  checksum: 10c0/0792f8a7fd482fa516e21689e012e07081cab3653172ca606090622cfa0024c784a1eba8095a17948a0e9a4aa98a80f7c9c90f78a0dd35173d6802f9cc123a82
+  checksum: 10c0/69feca532f5b3317112a74bc7589ad29f98ccfbe1a582bdab556d536978b094e5841b94069e01cf59ea919684dfb68218754526ddd317b1dc829ab57f7450e45
   languageName: node
   linkType: hard
 
@@ -9069,6 +9216,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"locate-path@npm:^7.2.0":
+  version: 7.2.0
+  resolution: "locate-path@npm:7.2.0"
+  dependencies:
+    p-locate: "npm:^6.0.0"
+  checksum: 10c0/139e8a7fe11cfbd7f20db03923cacfa5db9e14fa14887ea121345597472b4a63c1a42a8a5187defeeff6acf98fd568da7382aa39682d38f0af27433953a97751
+  languageName: node
+  linkType: hard
+
 "lodash.debounce@npm:^4.0.8":
   version: 4.0.8
   resolution: "lodash.debounce@npm:4.0.8"
@@ -9090,27 +9246,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lodash.isboolean@npm:^3.0.3":
-  version: 3.0.3
-  resolution: "lodash.isboolean@npm:3.0.3"
-  checksum: 10c0/0aac604c1ef7e72f9a6b798e5b676606042401dd58e49f051df3cc1e3adb497b3d7695635a5cbec4ae5f66456b951fdabe7d6b387055f13267cde521f10ec7f7
-  languageName: node
-  linkType: hard
-
-"lodash.isequal@npm:^4.5.0":
-  version: 4.5.0
-  resolution: "lodash.isequal@npm:4.5.0"
-  checksum: 10c0/dfdb2356db19631a4b445d5f37868a095e2402292d59539a987f134a8778c62a2810c2452d11ae9e6dcac71fc9de40a6fedcb20e2952a15b431ad8b29e50e28f
-  languageName: node
-  linkType: hard
-
-"lodash.isobject@npm:^3.0.2":
-  version: 3.0.2
-  resolution: "lodash.isobject@npm:3.0.2"
-  checksum: 10c0/da4c8480d98b16835b59380b2fbd43c54081acd9466febb788ba77c434384349e0bec162d1c4e89f613f21687b2b6d8384d8a112b80da00c78d28d9915a5cdde
-  languageName: node
-  linkType: hard
-
 "lodash.merge@npm:^4.6.2":
   version: 4.6.2
   resolution: "lodash.merge@npm:4.6.2"
@@ -9163,10 +9298,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"loupe@npm:^3.1.0, loupe@npm:^3.1.3":
-  version: 3.1.3
-  resolution: "loupe@npm:3.1.3"
-  checksum: 10c0/f5dab4144254677de83a35285be1b8aba58b3861439ce4ba65875d0d5f3445a4a496daef63100ccf02b2dbc25bf58c6db84c9cb0b96d6435331e9d0a33b48541
+"loupe@npm:^3.1.0, loupe@npm:^3.1.4":
+  version: 3.2.0
+  resolution: "loupe@npm:3.2.0"
+  checksum: 10c0/f572fd9e38db8d36ae9eede305480686e310d69bc40394b6842838ebc6c3860a0e35ab30182f33606ab2d8a685d9ff6436649269f8218a1c3385ca329973cb2c
   languageName: node
   linkType: hard
 
@@ -9186,10 +9321,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lru-cache@npm:^11.0.2":
-  version: 11.0.2
-  resolution: "lru-cache@npm:11.0.2"
-  checksum: 10c0/c993b8e06ead0b24b969c1dbb5b301716aed66e320e9014a80012f5febe280b438f28ff50046b2c55ff404e889351ccb332ff91f8dd175a21f5eae80e3fb155f
+"lru-cache@npm:^11.1.0":
+  version: 11.2.1
+  resolution: "lru-cache@npm:11.2.1"
+  checksum: 10c0/6f0e6b27f368d5e464e7813bd5b0af8f9a81a3a7ce2f40509841fdef07998b2588869f3e70edfbdb3bf705857f7bb21cca58fb01e1a1dc2440a83fcedcb7e8d8
   languageName: node
   linkType: hard
 
@@ -9249,22 +9384,22 @@ __metadata:
   languageName: node
   linkType: hard
 
-"make-fetch-happen@npm:^13.0.0":
-  version: 13.0.0
-  resolution: "make-fetch-happen@npm:13.0.0"
+"make-fetch-happen@npm:^14.0.3":
+  version: 14.0.3
+  resolution: "make-fetch-happen@npm:14.0.3"
   dependencies:
-    "@npmcli/agent": "npm:^2.0.0"
-    cacache: "npm:^18.0.0"
+    "@npmcli/agent": "npm:^3.0.0"
+    cacache: "npm:^19.0.1"
     http-cache-semantics: "npm:^4.1.1"
-    is-lambda: "npm:^1.0.1"
     minipass: "npm:^7.0.2"
-    minipass-fetch: "npm:^3.0.0"
+    minipass-fetch: "npm:^4.0.0"
     minipass-flush: "npm:^1.0.5"
     minipass-pipeline: "npm:^1.2.4"
-    negotiator: "npm:^0.6.3"
+    negotiator: "npm:^1.0.0"
+    proc-log: "npm:^5.0.0"
     promise-retry: "npm:^2.0.1"
-    ssri: "npm:^10.0.0"
-  checksum: 10c0/43b9f6dcbc6fe8b8604cb6396957c3698857a15ba4dbc38284f7f0e61f248300585ef1eb8cc62df54e9c724af977e45b5cdfd88320ef7f53e45070ed3488da55
+    ssri: "npm:^12.0.0"
+  checksum: 10c0/c40efb5e5296e7feb8e37155bde8eb70bc57d731b1f7d90e35a092fde403d7697c56fb49334d92d330d6f1ca29a98142036d6480a12681133a0a1453164cb2f0
   languageName: node
   linkType: hard
 
@@ -9345,7 +9480,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"micromatch@npm:^4.0.5, micromatch@npm:^4.0.8":
+"micromatch@npm:4.0.8, micromatch@npm:^4.0.5, micromatch@npm:^4.0.8":
   version: 4.0.8
   resolution: "micromatch@npm:4.0.8"
   dependencies:
@@ -9413,11 +9548,11 @@ __metadata:
   linkType: hard
 
 "minimatch@npm:^9.0.4":
-  version: 9.0.4
-  resolution: "minimatch@npm:9.0.4"
+  version: 9.0.5
+  resolution: "minimatch@npm:9.0.5"
   dependencies:
     brace-expansion: "npm:^2.0.1"
-  checksum: 10c0/2c16f21f50e64922864e560ff97c587d15fd491f65d92a677a344e970fe62aafdbeafe648965fa96d33c061b4d0eabfe0213466203dd793367e7f28658cf6414
+  checksum: 10c0/de96cf5e35bdf0eab3e2c853522f98ffbe9a36c37797778d2665231ec1f20a9447a7e567cb640901f89e4daaa95ae5d70c65a9e8aa2bb0019b6facbc3c0575ed
   languageName: node
   linkType: hard
 
@@ -9428,27 +9563,27 @@ __metadata:
   languageName: node
   linkType: hard
 
-"minipass-collect@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "minipass-collect@npm:1.0.2"
+"minipass-collect@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "minipass-collect@npm:2.0.1"
   dependencies:
-    minipass: "npm:^3.0.0"
-  checksum: 10c0/8f82bd1f3095b24f53a991b04b67f4c710c894e518b813f0864a31de5570441a509be1ca17e0bb92b047591a8fdbeb886f502764fefb00d2f144f4011791e898
+    minipass: "npm:^7.0.3"
+  checksum: 10c0/5167e73f62bb74cc5019594709c77e6a742051a647fe9499abf03c71dca75515b7959d67a764bdc4f8b361cf897fbf25e2d9869ee039203ed45240f48b9aa06e
   languageName: node
   linkType: hard
 
-"minipass-fetch@npm:^3.0.0":
-  version: 3.0.4
-  resolution: "minipass-fetch@npm:3.0.4"
+"minipass-fetch@npm:^4.0.0":
+  version: 4.0.1
+  resolution: "minipass-fetch@npm:4.0.1"
   dependencies:
     encoding: "npm:^0.1.13"
     minipass: "npm:^7.0.3"
     minipass-sized: "npm:^1.0.3"
-    minizlib: "npm:^2.1.2"
+    minizlib: "npm:^3.0.1"
   dependenciesMeta:
     encoding:
       optional: true
-  checksum: 10c0/1b63c1f3313e88eeac4689f1b71c9f086598db9a189400e3ee960c32ed89e06737fa23976c9305c2d57464fb3fcdc12749d3378805c9d6176f5569b0d0ee8a75
+  checksum: 10c0/a3147b2efe8e078c9bf9d024a0059339c5a09c5b1dded6900a219c218cc8b1b78510b62dae556b507304af226b18c3f1aeb1d48660283602d5b6586c399eed5c
   languageName: node
   linkType: hard
 
@@ -9488,43 +9623,28 @@ __metadata:
   languageName: node
   linkType: hard
 
-"minipass@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "minipass@npm:5.0.0"
-  checksum: 10c0/a91d8043f691796a8ac88df039da19933ef0f633e3d7f0d35dcd5373af49131cf2399bfc355f41515dc495e3990369c3858cd319e5c2722b4753c90bf3152462
-  languageName: node
-  linkType: hard
-
-"minipass@npm:^5.0.0 || ^6.0.2 || ^7.0.0, minipass@npm:^7.0.2, minipass@npm:^7.0.3, minipass@npm:^7.1.2":
+"minipass@npm:^5.0.0 || ^6.0.2 || ^7.0.0, minipass@npm:^7.0.2, minipass@npm:^7.0.3, minipass@npm:^7.0.4, minipass@npm:^7.1.2":
   version: 7.1.2
   resolution: "minipass@npm:7.1.2"
   checksum: 10c0/b0fd20bb9fb56e5fa9a8bfac539e8915ae07430a619e4b86ff71f5fc757ef3924b23b2c4230393af1eda647ed3d75739e4e0acb250a6b1eb277cf7f8fe449557
   languageName: node
   linkType: hard
 
-"minizlib@npm:^2.1.1, minizlib@npm:^2.1.2":
-  version: 2.1.2
-  resolution: "minizlib@npm:2.1.2"
+"minizlib@npm:^3.0.1":
+  version: 3.0.2
+  resolution: "minizlib@npm:3.0.2"
   dependencies:
-    minipass: "npm:^3.0.0"
-    yallist: "npm:^4.0.0"
-  checksum: 10c0/64fae024e1a7d0346a1102bb670085b17b7f95bf6cfdf5b128772ec8faf9ea211464ea4add406a3a6384a7d87a0cd1a96263692134323477b4fb43659a6cab78
+    minipass: "npm:^7.1.2"
+  checksum: 10c0/9f3bd35e41d40d02469cb30470c55ccc21cae0db40e08d1d0b1dff01cc8cc89a6f78e9c5d2b7c844e485ec0a8abc2238111213fdc5b2038e6d1012eacf316f78
   languageName: node
   linkType: hard
 
-"mkdirp@npm:^1.0.3":
-  version: 1.0.4
-  resolution: "mkdirp@npm:1.0.4"
+"mkdirp@npm:^3.0.1":
+  version: 3.0.1
+  resolution: "mkdirp@npm:3.0.1"
   bin:
-    mkdirp: bin/cmd.js
-  checksum: 10c0/46ea0f3ffa8bc6a5bc0c7081ffc3907777f0ed6516888d40a518c5111f8366d97d2678911ad1a6882bf592fa9de6c784fea32e1687bb94e1f4944170af48a5cf
-  languageName: node
-  linkType: hard
-
-"mousetrap@npm:^1.5.2":
-  version: 1.6.5
-  resolution: "mousetrap@npm:1.6.5"
-  checksum: 10c0/5c361bdbbff3966fd58d70f39b9fe1f8e32c78f3ce65989d83af7aad32a3a95313ce835a8dd8a55cb5de9eeb7c1f0c2b9048631a3073b5606241589e8fc0ba53
+    mkdirp: dist/cjs/src/bin.js
+  checksum: 10c0/9f2b975e9246351f5e3a40dcfac99fcd0baa31fbfab615fe059fb11e51f10e4803c63de1f384c54d656e4db31d000e4767e9ef076a22e12a641357602e31d57d
   languageName: node
   linkType: hard
 
@@ -9561,16 +9681,14 @@ __metadata:
   linkType: hard
 
 "msw@npm:^2.10.2":
-  version: 2.10.2
-  resolution: "msw@npm:2.10.2"
+  version: 2.11.3
+  resolution: "msw@npm:2.11.3"
   dependencies:
     "@bundled-es-modules/cookie": "npm:^2.0.1"
     "@bundled-es-modules/statuses": "npm:^1.0.1"
-    "@bundled-es-modules/tough-cookie": "npm:^0.1.6"
     "@inquirer/confirm": "npm:^5.0.0"
     "@mswjs/interceptors": "npm:^0.39.1"
     "@open-draft/deferred-promise": "npm:^2.2.0"
-    "@open-draft/until": "npm:^2.1.0"
     "@types/cookie": "npm:^0.6.0"
     "@types/statuses": "npm:^2.0.4"
     graphql: "npm:^16.8.1"
@@ -9579,8 +9697,11 @@ __metadata:
     outvariant: "npm:^1.4.3"
     path-to-regexp: "npm:^6.3.0"
     picocolors: "npm:^1.1.1"
+    rettime: "npm:^0.7.0"
     strict-event-emitter: "npm:^0.5.1"
+    tough-cookie: "npm:^6.0.0"
     type-fest: "npm:^4.26.1"
+    until-async: "npm:^3.0.2"
     yargs: "npm:^17.7.2"
   peerDependencies:
     typescript: ">= 4.8.x"
@@ -9589,7 +9710,7 @@ __metadata:
       optional: true
   bin:
     msw: cli/index.js
-  checksum: 10c0/fb44961e17e12864b4764b4c015f6ce7c907081f8dcd237ecd635eab00b787847406fbd36a2bcf2ef4c21114a3610ac03c7f93f3080f509a69b0c1c5285fd683
+  checksum: 10c0/847cb0e66152328d898474cd12e2ea0b9c11ed997b3a1129018a99afd7ff1134e45aed7158d0a57a1052b7a80b241e91952285f915142bd70c905316dbe9a49d
   languageName: node
   linkType: hard
 
@@ -9600,19 +9721,28 @@ __metadata:
   languageName: node
   linkType: hard
 
-"nano-spawn@npm:^1.0.0":
-  version: 1.0.1
-  resolution: "nano-spawn@npm:1.0.1"
-  checksum: 10c0/e03edc6971f653bc4651f2413b2011772a7c18797c0a4e986ff8eaea3adf4f017697d4d494ffb4ba6bce907b42abbeb0f7f681dbf336c84a324c940fb64c1dec
+"nano-spawn@npm:1.0.3":
+  version: 1.0.3
+  resolution: "nano-spawn@npm:1.0.3"
+  checksum: 10c0/ea18857e493710a50ded333dd71677953bd9bd9e6a17ade74af957763c50a9a02205ef31bc0d6784f5b3ad82db3d9f47531e9baac2acf01118f9b7c35bd9d5de
   languageName: node
   linkType: hard
 
-"nanoid@npm:^3.3.8":
-  version: 3.3.8
-  resolution: "nanoid@npm:3.3.8"
+"nanoid@npm:^3.3.11":
+  version: 3.3.11
+  resolution: "nanoid@npm:3.3.11"
   bin:
     nanoid: bin/nanoid.cjs
-  checksum: 10c0/4b1bb29f6cfebf3be3bc4ad1f1296fb0a10a3043a79f34fbffe75d1621b4318319211cd420549459018ea3592f0d2f159247a6f874911d6d26eaaadda2478120
+  checksum: 10c0/40e7f70b3d15f725ca072dfc4f74e81fcf1fbb02e491cf58ac0c79093adc9b0a73b152bcde57df4b79cd097e13023d7504acb38404a4da7bc1cd8e887b82fe0b
+  languageName: node
+  linkType: hard
+
+"napi-postinstall@npm:^0.3.0":
+  version: 0.3.2
+  resolution: "napi-postinstall@npm:0.3.2"
+  bin:
+    napi-postinstall: lib/cli.js
+  checksum: 10c0/77c67eb9871d24afe7bad30e6115c441d099d6a0e42dc1c49c4a722ff682425e08dc6dd2b03eca10db9b547e724c38fb51325c35039e7ac10dcb714bb88d7326
   languageName: node
   linkType: hard
 
@@ -9623,13 +9753,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"negotiator@npm:0.6.3, negotiator@npm:^0.6.3":
+"negotiator@npm:0.6.3":
   version: 0.6.3
   resolution: "negotiator@npm:0.6.3"
   checksum: 10c0/3ec9fd413e7bf071c937ae60d572bc67155262068ed522cf4b3be5edbe6ddf67d095ec03a3a14ebf8fc8e95f8e1d61be4869db0dbb0de696f6b837358bd43fc2
   languageName: node
   linkType: hard
 
+"negotiator@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "negotiator@npm:1.0.0"
+  checksum: 10c0/4c559dd52669ea48e1914f9d634227c561221dd54734070791f999c52ed0ff36e437b2e07d5c1f6e32909fc625fe46491c16e4a8f0572567d4dd15c3a4fda04b
+  languageName: node
+  linkType: hard
+
 "no-case@npm:^3.0.4":
   version: 3.0.4
   resolution: "no-case@npm:3.0.4"
@@ -9675,44 +9812,44 @@ __metadata:
   linkType: hard
 
 "node-gyp@npm:latest":
-  version: 10.0.1
-  resolution: "node-gyp@npm:10.0.1"
+  version: 11.4.2
+  resolution: "node-gyp@npm:11.4.2"
   dependencies:
     env-paths: "npm:^2.2.0"
     exponential-backoff: "npm:^3.1.1"
-    glob: "npm:^10.3.10"
     graceful-fs: "npm:^4.2.6"
-    make-fetch-happen: "npm:^13.0.0"
-    nopt: "npm:^7.0.0"
-    proc-log: "npm:^3.0.0"
+    make-fetch-happen: "npm:^14.0.3"
+    nopt: "npm:^8.0.0"
+    proc-log: "npm:^5.0.0"
     semver: "npm:^7.3.5"
-    tar: "npm:^6.1.2"
-    which: "npm:^4.0.0"
+    tar: "npm:^7.4.3"
+    tinyglobby: "npm:^0.2.12"
+    which: "npm:^5.0.0"
   bin:
     node-gyp: bin/node-gyp.js
-  checksum: 10c0/abddfff7d873312e4ed4a5fb75ce893a5c4fb69e7fcb1dfa71c28a6b92a7f1ef6b62790dffb39181b5a82728ba8f2f32d229cf8cbe66769fe02cea7db4a555aa
+  checksum: 10c0/0bfd3e96770ed70f07798d881dd37b4267708966d868a0e585986baac487d9cf5831285579fd629a83dc4e434f53e6416ce301097f2ee464cb74d377e4d8bdbe
   languageName: node
   linkType: hard
 
-"node-releases@npm:^2.0.19":
-  version: 2.0.19
-  resolution: "node-releases@npm:2.0.19"
-  checksum: 10c0/52a0dbd25ccf545892670d1551690fe0facb6a471e15f2cfa1b20142a5b255b3aa254af5f59d6ecb69c2bec7390bc643c43aa63b13bf5e64b6075952e716b1aa
+"node-releases@npm:^2.0.21":
+  version: 2.0.21
+  resolution: "node-releases@npm:2.0.21"
+  checksum: 10c0/0eb94916eeebbda9d51da6a9ea47428a12b2bb0dd94930c949632b0c859356abf53b2e5a2792021f96c5fda4f791a8e195f2375b78ae7dba8d8bc3141baa1469
   languageName: node
   linkType: hard
 
-"nopt@npm:^7.0.0":
-  version: 7.2.0
-  resolution: "nopt@npm:7.2.0"
+"nopt@npm:^8.0.0":
+  version: 8.1.0
+  resolution: "nopt@npm:8.1.0"
   dependencies:
-    abbrev: "npm:^2.0.0"
+    abbrev: "npm:^3.0.0"
   bin:
     nopt: bin/nopt.js
-  checksum: 10c0/9bd7198df6f16eb29ff16892c77bcf7f0cc41f9fb5c26280ac0def2cf8cf319f3b821b3af83eba0e74c85807cc430a16efe0db58fe6ae1f41e69519f585b6aff
+  checksum: 10c0/62e9ea70c7a3eb91d162d2c706b6606c041e4e7b547cbbb48f8b3695af457dd6479904d7ace600856bf923dd8d1ed0696f06195c8c20f02ac87c1da0e1d315ef
   languageName: node
   linkType: hard
 
-"normalize-path@npm:^3.0.0":
+"normalize-path@npm:^3.0.0, normalize-path@npm:~3.0.0":
   version: 3.0.0
   resolution: "normalize-path@npm:3.0.0"
   checksum: 10c0/e008c8142bcc335b5e38cf0d63cfd39d6cf2d97480af9abdbe9a439221fd4d749763bab492a8ee708ce7a194bb00c9da6d0a115018672310850489137b3da046
@@ -9726,13 +9863,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"nwsapi@npm:^2.2.16":
-  version: 2.2.16
-  resolution: "nwsapi@npm:2.2.16"
-  checksum: 10c0/0aa0637f4d51043d0183d994e08336bae996b03b42984381bf09ebdf3ff4909c018eda6b2a8aba0a08f3ea8303db8a0dad0608b38dc0bff15fd87017286ae21a
-  languageName: node
-  linkType: hard
-
 "object-assign@npm:^4, object-assign@npm:^4.1.1":
   version: 4.1.1
   resolution: "object-assign@npm:4.1.1"
@@ -9740,7 +9870,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"object-inspect@npm:^1.13.3":
+"object-inspect@npm:^1.13.3, object-inspect@npm:^1.13.4":
   version: 1.13.4
   resolution: "object-inspect@npm:1.13.4"
   checksum: 10c0/d7f8711e803b96ea3191c745d6f8056ce1f2496e530e6a19a0e92d89b0fa3c76d910c31f0aa270432db6bd3b2f85500a376a83aaba849a8d518c8845b3211692
@@ -9768,14 +9898,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"object.entries@npm:^1.1.8":
-  version: 1.1.8
-  resolution: "object.entries@npm:1.1.8"
+"object.entries@npm:^1.1.9":
+  version: 1.1.9
+  resolution: "object.entries@npm:1.1.9"
   dependencies:
-    call-bind: "npm:^1.0.7"
+    call-bind: "npm:^1.0.8"
+    call-bound: "npm:^1.0.4"
     define-properties: "npm:^1.2.1"
-    es-object-atoms: "npm:^1.0.0"
-  checksum: 10c0/db9ea979d2956a3bc26c262da4a4d212d36f374652cc4c13efdd069c1a519c16571c137e2893d1c46e1cb0e15c88fd6419eaf410c945f329f09835487d7e65d3
+    es-object-atoms: "npm:^1.1.1"
+  checksum: 10c0/d4b8c1e586650407da03370845f029aa14076caca4e4d4afadbc69cfb5b78035fd3ee7be417141abdb0258fa142e59b11923b4c44d8b1255b28f5ffcc50da7db
   languageName: node
   linkType: hard
 
@@ -9802,7 +9933,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"object.values@npm:^1.1.6, object.values@npm:^1.2.0, object.values@npm:^1.2.1":
+"object.values@npm:^1.1.6, object.values@npm:^1.2.1":
   version: 1.2.1
   resolution: "object.values@npm:1.2.1"
   dependencies:
@@ -9909,6 +10040,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"p-limit@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "p-limit@npm:4.0.0"
+  dependencies:
+    yocto-queue: "npm:^1.0.0"
+  checksum: 10c0/a56af34a77f8df2ff61ddfb29431044557fcbcb7642d5a3233143ebba805fc7306ac1d448de724352861cb99de934bc9ab74f0d16fe6a5460bdbdf938de875ad
+  languageName: node
+  linkType: hard
+
 "p-locate@npm:^5.0.0":
   version: 5.0.0
   resolution: "p-locate@npm:5.0.0"
@@ -9918,12 +10058,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"p-map@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "p-map@npm:4.0.0"
+"p-locate@npm:^6.0.0":
+  version: 6.0.0
+  resolution: "p-locate@npm:6.0.0"
   dependencies:
-    aggregate-error: "npm:^3.0.0"
-  checksum: 10c0/592c05bd6262c466ce269ff172bb8de7c6975afca9b50c975135b974e9bdaafbfe80e61aaaf5be6d1200ba08b30ead04b88cfa7e25ff1e3b93ab28c9f62a2c75
+    p-limit: "npm:^4.0.0"
+  checksum: 10c0/d72fa2f41adce59c198270aa4d3c832536c87a1806e0f69dffb7c1a7ca998fb053915ca833d90f166a8c082d3859eabfed95f01698a3214c20df6bb8de046312
+  languageName: node
+  linkType: hard
+
+"p-map@npm:^7.0.2, p-map@npm:^7.0.3":
+  version: 7.0.3
+  resolution: "p-map@npm:7.0.3"
+  checksum: 10c0/46091610da2b38ce47bcd1d8b4835a6fa4e832848a6682cf1652bc93915770f4617afc844c10a77d1b3e56d2472bb2d5622353fa3ead01a7f42b04fc8e744a5c
   languageName: node
   linkType: hard
 
@@ -9934,6 +10081,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"page-lifecycle@npm:^0.1.2":
+  version: 0.1.2
+  resolution: "page-lifecycle@npm:0.1.2"
+  checksum: 10c0/509dbbc2ad2000dffcf591f66ab13d80fb1dba9337d85c76269173f7a5c3959b5a876e3bfb1e4494f6b932c1dc02a0b5824ebd452ab1a7204d4abdf498cb27c5
+  languageName: node
+  linkType: hard
+
 "parent-module@npm:^1.0.0":
   version: 1.0.1
   resolution: "parent-module@npm:1.0.1"
@@ -9943,13 +10097,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"parse-imports@npm:^2.1.1":
-  version: 2.1.1
-  resolution: "parse-imports@npm:2.1.1"
+"parse-imports-exports@npm:^0.2.4":
+  version: 0.2.4
+  resolution: "parse-imports-exports@npm:0.2.4"
   dependencies:
-    es-module-lexer: "npm:^1.5.3"
-    slashes: "npm:^3.0.12"
-  checksum: 10c0/c9bb0b4e1823f84f034d2d7bd2b37415b1715a5c963fda14968c706186b48b02c10e97d04bce042b9dcd679b42f29c391ea120799ddf581c7f54786edd99e3a9
+    parse-statements: "npm:1.0.11"
+  checksum: 10c0/51b729037208abdf65c4a1f8e9ed06f4e7ccd907c17c668a64db54b37d95bb9e92081f8b16e4133e14102af3cb4e89870975b6ad661b4d654e9ec8f4fb5c77d6
   languageName: node
   linkType: hard
 
@@ -9965,12 +10118,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"parse5@npm:^7.2.1":
-  version: 7.2.1
-  resolution: "parse5@npm:7.2.1"
+"parse-statements@npm:1.0.11":
+  version: 1.0.11
+  resolution: "parse-statements@npm:1.0.11"
+  checksum: 10c0/48960e085019068a5f5242e875fd9d21ec87df2e291acf5ad4e4887b40eab6929a8c8d59542acb85a6497e870c5c6a24f5ab7f980ef5f907c14cc5f7984a93f3
+  languageName: node
+  linkType: hard
+
+"parse5@npm:^7.3.0":
+  version: 7.3.0
+  resolution: "parse5@npm:7.3.0"
   dependencies:
-    entities: "npm:^4.5.0"
-  checksum: 10c0/829d37a0c709215a887e410a7118d754f8e1afd7edb529db95bc7bbf8045fb0266a7b67801331d8e8d9d073ea75793624ec27ce9ff3b96862c3b9008f4d68e80
+    entities: "npm:^6.0.0"
+  checksum: 10c0/7fd2e4e247e85241d6f2a464d0085eed599a26d7b0a5233790c49f53473232eb85350e8133344d9b3fd58b89339e7ad7270fe1f89d28abe50674ec97b87f80b5
   languageName: node
   linkType: hard
 
@@ -9995,6 +10155,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"path-exists@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "path-exists@npm:5.0.0"
+  checksum: 10c0/b170f3060b31604cde93eefdb7392b89d832dfbc1bed717c9718cbe0f230c1669b7e75f87e19901da2250b84d092989a0f9e44d2ef41deb09aa3ad28e691a40a
+  languageName: node
+  linkType: hard
+
 "path-is-absolute@npm:^1.0.0":
   version: 1.0.1
   resolution: "path-is-absolute@npm:1.0.1"
@@ -10034,11 +10201,11 @@ __metadata:
   linkType: hard
 
 "path-to-regexp@npm:^1.7.0":
-  version: 1.8.0
-  resolution: "path-to-regexp@npm:1.8.0"
+  version: 1.9.0
+  resolution: "path-to-regexp@npm:1.9.0"
   dependencies:
     isarray: "npm:0.0.1"
-  checksum: 10c0/7b25d6f27a8de03f49406d16195450f5ced694398adea1510b0f949d9660600d1769c5c6c83668583b7e6b503f3caf1ede8ffc08135dbe3e982f034f356fbb5c
+  checksum: 10c0/de9ddb01b84d9c2c8e2bed18630d8d039e2d6f60a6538595750fa08c7a6482512257464c8da50616f266ab2cdd2428387e85f3b089e4c3f25d0c537e898a0751
   languageName: node
   linkType: hard
 
@@ -10151,28 +10318,28 @@ __metadata:
   languageName: node
   linkType: hard
 
-"picocolors@npm:^1.0.0, picocolors@npm:^1.1.1":
+"picocolors@npm:1.1.1, picocolors@npm:^1.1.1":
   version: 1.1.1
   resolution: "picocolors@npm:1.1.1"
   checksum: 10c0/e2e3e8170ab9d7c7421969adaa7e1b31434f789afb9b3f115f6b96d91945041ac3ceb02e9ec6fe6510ff036bcc0bf91e69a1772edc0b707e12b19c0f2d6bcf58
   languageName: node
   linkType: hard
 
-"picomatch@npm:2 || 3 || 4, picomatch@npm:^4.0.2":
-  version: 4.0.2
-  resolution: "picomatch@npm:4.0.2"
-  checksum: 10c0/7c51f3ad2bb42c776f49ebf964c644958158be30d0a510efd5a395e8d49cb5acfed5b82c0c5b365523ce18e6ab85013c9ebe574f60305892ec3fa8eee8304ccc
+"picomatch@npm:2 || 3 || 4, picomatch@npm:^4.0.2, picomatch@npm:^4.0.3":
+  version: 4.0.3
+  resolution: "picomatch@npm:4.0.3"
+  checksum: 10c0/9582c951e95eebee5434f59e426cddd228a7b97a0161a375aed4be244bd3fe8e3a31b846808ea14ef2c8a2527a6eeab7b3946a67d5979e81694654f939473ae2
   languageName: node
   linkType: hard
 
-"picomatch@npm:^2.2.2, picomatch@npm:^2.3.1":
+"picomatch@npm:^2.0.4, picomatch@npm:^2.2.1, picomatch@npm:^2.2.2, picomatch@npm:^2.3.1":
   version: 2.3.1
   resolution: "picomatch@npm:2.3.1"
   checksum: 10c0/26c02b8d06f03206fc2ab8d16f19960f2ff9e81a658f831ecb656d8f17d9edc799e8364b1f4a7873e89d9702dff96204be0fa26fe4181f6843f040f819dac4be
   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:
@@ -10203,8 +10370,8 @@ __metadata:
   linkType: hard
 
 "pino-pretty@npm:^13.0.0":
-  version: 13.0.0
-  resolution: "pino-pretty@npm:13.0.0"
+  version: 13.1.1
+  resolution: "pino-pretty@npm:13.1.1"
   dependencies:
     colorette: "npm:^2.0.7"
     dateformat: "npm:^4.6.3"
@@ -10216,12 +10383,12 @@ __metadata:
     on-exit-leak-free: "npm:^2.1.0"
     pino-abstract-transport: "npm:^2.0.0"
     pump: "npm:^3.0.0"
-    secure-json-parse: "npm:^2.4.0"
+    secure-json-parse: "npm:^4.0.0"
     sonic-boom: "npm:^4.0.1"
-    strip-json-comments: "npm:^3.1.1"
+    strip-json-comments: "npm:^5.0.2"
   bin:
     pino-pretty: bin.js
-  checksum: 10c0/015dac25006c1b9820b9e01fccb8a392a019e12b30e6bfc3f3f61ecca8dbabcd000a8f3f64410b620b7f5d08579ba85e6ef137f7fbeaad70d46397a97a5f75ea
+  checksum: 10c0/845c07afd3d73cb96ad2049cfa7fca12b8280a51e30d6db8b490857690637556bb8e7f05b2fa640b3e4a7edd9b1369110042d670fda743ef98fe3be29876c8c7
   languageName: node
   linkType: hard
 
@@ -10233,11 +10400,10 @@ __metadata:
   linkType: hard
 
 "pino@npm:^9.0.0":
-  version: 9.7.0
-  resolution: "pino@npm:9.7.0"
+  version: 9.13.1
+  resolution: "pino@npm:9.13.1"
   dependencies:
     atomic-sleep: "npm:^1.0.0"
-    fast-redact: "npm:^3.1.1"
     on-exit-leak-free: "npm:^2.1.0"
     pino-abstract-transport: "npm:^2.0.0"
     pino-std-serializers: "npm:^7.0.0"
@@ -10245,35 +10411,36 @@ __metadata:
     quick-format-unescaped: "npm:^4.0.3"
     real-require: "npm:^0.2.0"
     safe-stable-stringify: "npm:^2.3.1"
+    slow-redact: "npm:^0.3.0"
     sonic-boom: "npm:^4.0.1"
     thread-stream: "npm:^3.0.0"
   bin:
     pino: bin.js
-  checksum: 10c0/c7f8a83a9a9d728b4eff6d0f4b9367f031c91bcaa5806fbf0eedcc8e77faba593d59baf11a8fba0dd1c778bb17ca7ed01418ac1df4ec129faeedd4f3ecaff66f
+  checksum: 10c0/c99e879f9538f7255488ad276a46a857cf9114217b754b850b7f1441e31b724a6d6f0697228ead954d3d9601522704e03cad5d441c228108073eed2f37ea0e41
   languageName: node
   linkType: hard
 
-"playwright-core@npm:1.52.0":
-  version: 1.52.0
-  resolution: "playwright-core@npm:1.52.0"
+"playwright-core@npm:1.55.0":
+  version: 1.55.0
+  resolution: "playwright-core@npm:1.55.0"
   bin:
     playwright-core: cli.js
-  checksum: 10c0/640945507e6ca2144e9f596b2a6ecac042c2fd3683ff99e6271e9a7b38f3602d415f282609d569456f66680aab8b3c5bb1b257d8fb63a7fc0ed648261110421f
+  checksum: 10c0/c39d6aa30e7a4e73965942ca5e13405ae05c9cb49f755a35f04248c864c0b24cf662d9767f1797b3ec48d1cf4e54774dce4a19c16534bd5cfd2aa3da81c9dc3a
   languageName: node
   linkType: hard
 
-"playwright@npm:^1.52.0":
-  version: 1.52.0
-  resolution: "playwright@npm:1.52.0"
+"playwright@npm:^1.54.1":
+  version: 1.55.0
+  resolution: "playwright@npm:1.55.0"
   dependencies:
     fsevents: "npm:2.3.2"
-    playwright-core: "npm:1.52.0"
+    playwright-core: "npm:1.55.0"
   dependenciesMeta:
     fsevents:
       optional: true
   bin:
     playwright: cli.js
-  checksum: 10c0/2c6edf1e15e59bbaf77f3fa0fe0ac975793c17cff835d9c8b8bc6395a3b6f1c01898b3058ab37891b2e4d424bcc8f1b4844fe70d943e0143d239d7451408c579
+  checksum: 10c0/51605b7e57a5650e57972c5fdfc09d7a9934cca1cbee5beacca716fa801e25cb5bb7c1663de90c22b300fde884e5545a2b13a0505a93270b660687791c478304
   languageName: node
   linkType: hard
 
@@ -10306,18 +10473,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-color-functional-notation@npm:^7.0.10":
-  version: 7.0.10
-  resolution: "postcss-color-functional-notation@npm:7.0.10"
+"postcss-color-functional-notation@npm:^7.0.12":
+  version: 7.0.12
+  resolution: "postcss-color-functional-notation@npm:7.0.12"
   dependencies:
-    "@csstools/css-color-parser": "npm:^3.0.10"
+    "@csstools/css-color-parser": "npm:^3.1.0"
     "@csstools/css-parser-algorithms": "npm:^3.0.5"
     "@csstools/css-tokenizer": "npm:^3.0.4"
-    "@csstools/postcss-progressive-custom-properties": "npm:^4.1.0"
+    "@csstools/postcss-progressive-custom-properties": "npm:^4.2.1"
     "@csstools/utilities": "npm:^2.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/62ee77ef220488cfb4a1c5af4f5203a0c2951c8a0613088ffc946130d48b63ca28ab67b18ed380a288a7ce51c2360a75d8d08d2db389e48f4ebb78a3e52d15b6
+  checksum: 10c0/dc80ba1a956ae9b396596bda72d9bdb92de96874378a38ba4e2177ffa35339dc76d894920bb013b6f10c9b75cfb41778e09956a438c2e9ea41b684f766c55f4a
   languageName: node
   linkType: hard
 
@@ -10399,16 +10566,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-double-position-gradients@npm:^6.0.2":
-  version: 6.0.2
-  resolution: "postcss-double-position-gradients@npm:6.0.2"
+"postcss-double-position-gradients@npm:^6.0.4":
+  version: 6.0.4
+  resolution: "postcss-double-position-gradients@npm:6.0.4"
   dependencies:
-    "@csstools/postcss-progressive-custom-properties": "npm:^4.1.0"
+    "@csstools/postcss-progressive-custom-properties": "npm:^4.2.1"
     "@csstools/utilities": "npm:^2.0.0"
     postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/7b4759813f99039c6a7c8e70b46ff4c34c27e723a9ff7f0e1044e293d568357e1d39233f94b1bf3b2768b1207348138faea0781086a66b7b8e39e780657da523
+  checksum: 10c0/6dbbe7a3855e84a9319df434e210225f6dfa7262e5959611355f1769c2c9d30d37a19737712f20eac6354876fff4ba556d8d0b12a90c78d8ab97c9a8da534a7c
   languageName: node
   linkType: hard
 
@@ -10464,18 +10631,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-lab-function@npm:^7.0.10":
-  version: 7.0.10
-  resolution: "postcss-lab-function@npm:7.0.10"
+"postcss-lab-function@npm:^7.0.12":
+  version: 7.0.12
+  resolution: "postcss-lab-function@npm:7.0.12"
   dependencies:
-    "@csstools/css-color-parser": "npm:^3.0.10"
+    "@csstools/css-color-parser": "npm:^3.1.0"
     "@csstools/css-parser-algorithms": "npm:^3.0.5"
     "@csstools/css-tokenizer": "npm:^3.0.4"
-    "@csstools/postcss-progressive-custom-properties": "npm:^4.1.0"
+    "@csstools/postcss-progressive-custom-properties": "npm:^4.2.1"
     "@csstools/utilities": "npm:^2.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/3e235b52f6c119937a0b41aa351f5f9ef6e17bf1b868e7068c9a04f3d31c247d0296c862388febb7fec5102d81413ccade8a4788904289afd34aa072de71390b
+  checksum: 10c0/de39b59da3b97c18d055d81fba68993e93253184ed76f103c888273584f868c551d047814dd54445980a1bdc5987e8f8af141383d84ecc641e5a6ee7bd901095
   languageName: node
   linkType: hard
 
@@ -10551,23 +10718,26 @@ __metadata:
   linkType: hard
 
 "postcss-preset-env@npm:^10.1.5":
-  version: 10.2.4
-  resolution: "postcss-preset-env@npm:10.2.4"
+  version: 10.4.0
+  resolution: "postcss-preset-env@npm:10.4.0"
   dependencies:
+    "@csstools/postcss-alpha-function": "npm:^1.0.1"
     "@csstools/postcss-cascade-layers": "npm:^5.0.2"
-    "@csstools/postcss-color-function": "npm:^4.0.10"
-    "@csstools/postcss-color-mix-function": "npm:^3.0.10"
-    "@csstools/postcss-color-mix-variadic-function-arguments": "npm:^1.0.0"
-    "@csstools/postcss-content-alt-text": "npm:^2.0.6"
+    "@csstools/postcss-color-function": "npm:^4.0.12"
+    "@csstools/postcss-color-function-display-p3-linear": "npm:^1.0.1"
+    "@csstools/postcss-color-mix-function": "npm:^3.0.12"
+    "@csstools/postcss-color-mix-variadic-function-arguments": "npm:^1.0.2"
+    "@csstools/postcss-content-alt-text": "npm:^2.0.8"
+    "@csstools/postcss-contrast-color-function": "npm:^2.0.12"
     "@csstools/postcss-exponential-functions": "npm:^2.0.9"
     "@csstools/postcss-font-format-keywords": "npm:^4.0.0"
-    "@csstools/postcss-gamut-mapping": "npm:^2.0.10"
-    "@csstools/postcss-gradients-interpolation-method": "npm:^5.0.10"
-    "@csstools/postcss-hwb-function": "npm:^4.0.10"
-    "@csstools/postcss-ic-unit": "npm:^4.0.2"
+    "@csstools/postcss-gamut-mapping": "npm:^2.0.11"
+    "@csstools/postcss-gradients-interpolation-method": "npm:^5.0.12"
+    "@csstools/postcss-hwb-function": "npm:^4.0.12"
+    "@csstools/postcss-ic-unit": "npm:^4.0.4"
     "@csstools/postcss-initial": "npm:^2.0.1"
     "@csstools/postcss-is-pseudo-class": "npm:^5.0.3"
-    "@csstools/postcss-light-dark-function": "npm:^2.0.9"
+    "@csstools/postcss-light-dark-function": "npm:^2.0.11"
     "@csstools/postcss-logical-float-and-clear": "npm:^3.0.0"
     "@csstools/postcss-logical-overflow": "npm:^2.0.0"
     "@csstools/postcss-logical-overscroll-behavior": "npm:^2.0.0"
@@ -10577,38 +10747,38 @@ __metadata:
     "@csstools/postcss-media-queries-aspect-ratio-number-values": "npm:^3.0.5"
     "@csstools/postcss-nested-calc": "npm:^4.0.0"
     "@csstools/postcss-normalize-display-values": "npm:^4.0.0"
-    "@csstools/postcss-oklab-function": "npm:^4.0.10"
-    "@csstools/postcss-progressive-custom-properties": "npm:^4.1.0"
+    "@csstools/postcss-oklab-function": "npm:^4.0.12"
+    "@csstools/postcss-progressive-custom-properties": "npm:^4.2.1"
     "@csstools/postcss-random-function": "npm:^2.0.1"
-    "@csstools/postcss-relative-color-syntax": "npm:^3.0.10"
+    "@csstools/postcss-relative-color-syntax": "npm:^3.0.12"
     "@csstools/postcss-scope-pseudo-class": "npm:^4.0.1"
     "@csstools/postcss-sign-functions": "npm:^1.1.4"
     "@csstools/postcss-stepped-value-functions": "npm:^4.0.9"
-    "@csstools/postcss-text-decoration-shorthand": "npm:^4.0.2"
+    "@csstools/postcss-text-decoration-shorthand": "npm:^4.0.3"
     "@csstools/postcss-trigonometric-functions": "npm:^4.0.9"
     "@csstools/postcss-unset-value": "npm:^4.0.0"
     autoprefixer: "npm:^10.4.21"
-    browserslist: "npm:^4.25.0"
+    browserslist: "npm:^4.26.0"
     css-blank-pseudo: "npm:^7.0.1"
-    css-has-pseudo: "npm:^7.0.2"
+    css-has-pseudo: "npm:^7.0.3"
     css-prefers-color-scheme: "npm:^10.0.0"
-    cssdb: "npm:^8.3.0"
+    cssdb: "npm:^8.4.2"
     postcss-attribute-case-insensitive: "npm:^7.0.1"
     postcss-clamp: "npm:^4.1.0"
-    postcss-color-functional-notation: "npm:^7.0.10"
+    postcss-color-functional-notation: "npm:^7.0.12"
     postcss-color-hex-alpha: "npm:^10.0.0"
     postcss-color-rebeccapurple: "npm:^10.0.0"
     postcss-custom-media: "npm:^11.0.6"
     postcss-custom-properties: "npm:^14.0.6"
     postcss-custom-selectors: "npm:^8.0.5"
     postcss-dir-pseudo-class: "npm:^9.0.1"
-    postcss-double-position-gradients: "npm:^6.0.2"
+    postcss-double-position-gradients: "npm:^6.0.4"
     postcss-focus-visible: "npm:^10.0.1"
     postcss-focus-within: "npm:^9.0.1"
     postcss-font-variant: "npm:^5.0.0"
     postcss-gap-properties: "npm:^6.0.0"
     postcss-image-set-function: "npm:^7.0.0"
-    postcss-lab-function: "npm:^7.0.10"
+    postcss-lab-function: "npm:^7.0.12"
     postcss-logical: "npm:^8.1.0"
     postcss-nesting: "npm:^13.0.2"
     postcss-opacity-percentage: "npm:^3.0.0"
@@ -10620,7 +10790,7 @@ __metadata:
     postcss-selector-not: "npm:^8.0.1"
   peerDependencies:
     postcss: ^8.4
-  checksum: 10c0/d7f8494d355567dc4ea66fe765c86ba9b1e9ce5061ada5c80c51fdf6c98b004b0b7ef17b5f64d197e1bec2e22ef4b6c613b998e1c1bcad0b53f0a3e303ded2fe
+  checksum: 10c0/3c081a66ebde19ae2f915f4eb103b85097085799b43103e5dd1699ed807bd54c80d633c7d4b525badaf21e9d0b217e6ca169ee306e2b720bb70b7414ad375387
   languageName: node
   linkType: hard
 
@@ -10697,14 +10867,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss@npm:^8.5.3":
-  version: 8.5.3
-  resolution: "postcss@npm:8.5.3"
+"postcss@npm:^8.5.6":
+  version: 8.5.6
+  resolution: "postcss@npm:8.5.6"
   dependencies:
-    nanoid: "npm:^3.3.8"
+    nanoid: "npm:^3.3.11"
     picocolors: "npm:^1.1.1"
     source-map-js: "npm:^1.2.1"
-  checksum: 10c0/b75510d7b28c3ab728c8733dd01538314a18c52af426f199a3c9177e63eb08602a3938bfb66b62dc01350b9aed62087eabbf229af97a1659eb8d3513cec823b3
+  checksum: 10c0/5127cc7c91ed7a133a1b7318012d8bfa112da9ef092dddf369ae699a1f10ebbd89b1b9f25f3228795b84585c72aabd5ced5fc11f2ba467eedf7b081a66fad024
   languageName: node
   linkType: hard
 
@@ -10746,11 +10916,11 @@ __metadata:
   linkType: hard
 
 "prettier@npm:^3.3.3":
-  version: 3.4.2
-  resolution: "prettier@npm:3.4.2"
+  version: 3.6.2
+  resolution: "prettier@npm:3.6.2"
   bin:
     prettier: bin/prettier.cjs
-  checksum: 10c0/99e076a26ed0aba4ebc043880d0f08bbb8c59a4c6641cdee6cdadf2205bdd87aa1d7823f50c3aea41e015e99878d37c58d7b5f0e663bba0ef047f94e36b96446
+  checksum: 10c0/488cb2f2b99ec13da1e50074912870217c11edaddedeadc649b1244c749d15ba94e846423d062e2c4c9ae683e2d65f754de28889ba06e697ac4f988d44f45812
   languageName: node
   linkType: hard
 
@@ -10779,10 +10949,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"proc-log@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "proc-log@npm:3.0.0"
-  checksum: 10c0/f66430e4ff947dbb996058f6fd22de2c66612ae1a89b097744e17fb18a4e8e7a86db99eda52ccf15e53f00b63f4ec0b0911581ff2aac0355b625c8eac509b0dc
+"proc-log@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "proc-log@npm:5.0.0"
+  checksum: 10c0/bbe5edb944b0ad63387a1d5b1911ae93e05ce8d0f60de1035b218cdcceedfe39dbd2c697853355b70f1a090f8f58fe90da487c85216bf9671f9499d1a897e9e3
   languageName: node
   linkType: hard
 
@@ -10851,15 +11021,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"psl@npm:^1.1.33":
-  version: 1.15.0
-  resolution: "psl@npm:1.15.0"
-  dependencies:
-    punycode: "npm:^2.3.1"
-  checksum: 10c0/d8d45a99e4ca62ca12ac3c373e63d80d2368d38892daa40cfddaa1eb908be98cd549ac059783ef3a56cfd96d57ae8e2fd9ae53d1378d90d42bc661ff924e102a
-  languageName: node
-  linkType: hard
-
 "pump@npm:^3.0.0":
   version: 3.0.0
   resolution: "pump@npm:3.0.0"
@@ -10877,7 +11038,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"punycode@npm:^2.1.0, punycode@npm:^2.1.1, punycode@npm:^2.3.0, punycode@npm:^2.3.1":
+"punycode@npm:^2.1.0, punycode@npm:^2.3.0, punycode@npm:^2.3.1":
   version: 2.3.1
   resolution: "punycode@npm:2.3.1"
   checksum: 10c0/14f76a8206bc3464f794fb2e3d3cc665ae416c01893ad7a02b23766eb07159144ee612ad67af5e84fa4479ccfe67678c4feb126b0485651b302babf66f04f9e9
@@ -10893,13 +11054,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"querystringify@npm:^2.1.1":
-  version: 2.2.0
-  resolution: "querystringify@npm:2.2.0"
-  checksum: 10c0/3258bc3dbdf322ff2663619afe5947c7926a6ef5fb78ad7d384602974c467fadfc8272af44f5eb8cddd0d011aae8fabf3a929a8eee4b86edcc0a21e6bd10f9aa
-  languageName: node
-  linkType: hard
-
 "queue-microtask@npm:^1.2.2":
   version: 1.2.3
   resolution: "queue-microtask@npm:1.2.3"
@@ -11026,22 +11180,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-hotkeys@npm:^1.1.4":
-  version: 1.1.4
-  resolution: "react-hotkeys@npm:1.1.4"
-  dependencies:
-    lodash.isboolean: "npm:^3.0.3"
-    lodash.isequal: "npm:^4.5.0"
-    lodash.isobject: "npm:^3.0.2"
-    mousetrap: "npm:^1.5.2"
-    prop-types: "npm:^15.6.0"
-  peerDependencies:
-    react: ">= 0.14.0"
-    react-dom: ">= 0.14.0"
-  checksum: 10c0/6bd566ea97e00058749d43d768ee843e5132f988571536e090b564d5dbaa71093695255514fc5b9fcf9fbd03fcb0603f6e135dcab6dcaaffe43dedbfe742a163
-  languageName: node
-  linkType: hard
-
 "react-immutable-proptypes@npm:^2.2.0":
   version: 2.2.0
   resolution: "react-immutable-proptypes@npm:2.2.0"
@@ -11065,16 +11203,16 @@ __metadata:
   linkType: hard
 
 "react-intl@npm:^7.1.10":
-  version: 7.1.11
-  resolution: "react-intl@npm:7.1.11"
+  version: 7.1.13
+  resolution: "react-intl@npm:7.1.13"
   dependencies:
-    "@formatjs/ecma402-abstract": "npm:2.3.4"
-    "@formatjs/icu-messageformat-parser": "npm:2.11.2"
-    "@formatjs/intl": "npm:3.1.6"
+    "@formatjs/ecma402-abstract": "npm:2.3.5"
+    "@formatjs/icu-messageformat-parser": "npm:2.11.3"
+    "@formatjs/intl": "npm:3.1.7"
     "@types/hoist-non-react-statics": "npm:^3.3.1"
     "@types/react": "npm:16 || 17 || 18 || 19"
     hoist-non-react-statics: "npm:^3.3.2"
-    intl-messageformat: "npm:10.7.16"
+    intl-messageformat: "npm:10.7.17"
     tslib: "npm:^2.8.0"
   peerDependencies:
     react: 16 || 17 || 18 || 19
@@ -11082,7 +11220,7 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 10c0/f20770fb7bcce7a67acec70b9183f5320b7f3f9bbcb263ca8f4787817297674d1be158687f94d1e2803a9c8696d4f93dd86a28898aba8bc5197e858313e3dd06
+  checksum: 10c0/2288c63c3eb2b3fdb79af5fa7b0d297469cc2530143fec798d4603d713c2caf28c9cc1e3a0a53c7b0f90331a3b672ae18e0edefd2fe816de90f90daa7612fb41
   languageName: node
   linkType: hard
 
@@ -11191,21 +11329,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-router-scroll-4@npm:^1.0.0-beta.1":
-  version: 1.0.0-beta.2
-  resolution: "react-router-scroll-4@npm:1.0.0-beta.2"
-  dependencies:
-    scroll-behavior: "npm:^0.9.1"
-    warning: "npm:^3.0.0"
-  peerDependencies:
-    prop-types: ^15.6.0
-    react: ^15.0.0 || ^16.0.0
-    react-dom: ^15.0.0 || ^16.0.0
-    react-router-dom: ^4.0
-  checksum: 10c0/ad195b7359fd3146530cf299ec437f0a619c577b2cacfb2c76a156d3cd9d5d3e97af56e17c300c37ca8c485041e93124fe63f0c86db6aea468caf838281e62cb
-  languageName: node
-  linkType: hard
-
 "react-router@npm:5.3.4, react-router@npm:^5.3.4":
   version: 5.3.4
   resolution: "react-router@npm:5.3.4"
@@ -11226,8 +11349,8 @@ __metadata:
   linkType: hard
 
 "react-select@npm:^5.7.3":
-  version: 5.10.1
-  resolution: "react-select@npm:5.10.1"
+  version: 5.10.2
+  resolution: "react-select@npm:5.10.2"
   dependencies:
     "@babel/runtime": "npm:^7.12.0"
     "@emotion/cache": "npm:^11.4.0"
@@ -11241,7 +11364,7 @@ __metadata:
   peerDependencies:
     react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
     react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
-  checksum: 10c0/0d10a249b96150bd648f2575d59c848b8fac7f4d368a97ae84e4aaba5bbc1035deba4cdc82e49a43904b79ec50494505809618b0e98022b2d51e7629551912ed
+  checksum: 10c0/2027ef57b0a375d1accdad60550329dc0911b31d429ec6eb9ae391ae9baf9f26991b0ff8615eb99de319a55ce6e9382107783e615cb2116522ed0275b214b7f7
   languageName: node
   linkType: hard
 
@@ -11278,42 +11401,46 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-swipeable-views-core@npm:^0.14.0":
-  version: 0.14.0
-  resolution: "react-swipeable-views-core@npm:0.14.0"
+"react-swipeable-views-core@npm:^0.14.1":
+  version: 0.14.1
+  resolution: "react-swipeable-views-core@npm:0.14.1"
   dependencies:
     "@babel/runtime": "npm:7.0.0"
     warning: "npm:^4.0.1"
-  checksum: 10c0/ca015701587ca9cf5329088809ad5897b0344c1cd377f8f0d21277128c95019dd67aefa64d19b40bc1c171a375c003dbe3343111d9ce12b7327d72e9e98dce7e
+  peerDependencies:
+    react: ^15.3.0 || ^16.0.0 || ^17.0.0
+  checksum: 10c0/4da08493dad34f8498b66c596c1f40cd9a62e4968e71d00c79a26bf45e25ba3a3323e690641121cc8e7fd9c695e7da37fe781fa3f69e7d2b60fff3bfe4621426
   languageName: node
   linkType: hard
 
-"react-swipeable-views-utils@npm:^0.14.0":
-  version: 0.14.0
-  resolution: "react-swipeable-views-utils@npm:0.14.0"
+"react-swipeable-views-utils@npm:^0.14.1":
+  version: 0.14.1
+  resolution: "react-swipeable-views-utils@npm:0.14.1"
   dependencies:
     "@babel/runtime": "npm:7.0.0"
     keycode: "npm:^2.1.7"
     prop-types: "npm:^15.6.0"
     react-event-listener: "npm:^0.6.0"
-    react-swipeable-views-core: "npm:^0.14.0"
+    react-swipeable-views-core: "npm:^0.14.1"
     shallow-equal: "npm:^1.2.1"
-  checksum: 10c0/acc1b1d7f0bc81485e44aa2a465adc13cd89865add87bf32b88dc0986f1556c8b227b79763a7c0b197bf6eeacc333451c7b8ab5c40517809d1a913f7b9742588
+  peerDependencies:
+    react: ^15.3.0 || ^16.0.0 || ^17.0.0
+  checksum: 10c0/f9a9930e7df9dab9cd0f5344c7cf0423cc8aff4728436eb7dc13588186fbd1a557c8250b6329ec09242f3f6d2700d33e1155ab191ce8de48aa860fad6fb1814b
   languageName: node
   linkType: hard
 
 "react-swipeable-views@npm:^0.14.0":
-  version: 0.14.0
-  resolution: "react-swipeable-views@npm:0.14.0"
+  version: 0.14.1
+  resolution: "react-swipeable-views@npm:0.14.1"
   dependencies:
     "@babel/runtime": "npm:7.0.0"
     prop-types: "npm:^15.5.4"
-    react-swipeable-views-core: "npm:^0.14.0"
-    react-swipeable-views-utils: "npm:^0.14.0"
+    react-swipeable-views-core: "npm:^0.14.1"
+    react-swipeable-views-utils: "npm:^0.14.1"
     warning: "npm:^4.0.1"
   peerDependencies:
     react: ^15.3.0 || ^16.0.0 || ^17.0.0
-  checksum: 10c0/032e7a1ff49e6e57eb755e133968eb207a4acc67c68ed8d0b09b4fe0826b290344454da5d420f17d8f4c049d900f3c12594ba5b97a79f20ef3b30bc62e866aa1
+  checksum: 10c0/7ee6d19cc33172e0846835eafd4b24ece0f26aed5cc9bbe80d3ec7c8d22f327443df8b2d50ddb4b837e1d6fbb40744abc41f62cdcab8e941e0663a952d627a15
   languageName: node
   linkType: hard
 
@@ -11394,6 +11521,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"readdirp@npm:~3.6.0":
+  version: 3.6.0
+  resolution: "readdirp@npm:3.6.0"
+  dependencies:
+    picomatch: "npm:^2.2.1"
+  checksum: 10c0/6fa848cf63d1b82ab4e985f4cf72bd55b7dcfd8e0a376905804e48c3634b7e749170940ba77b32804d5fe93b3cc521aa95a8d7e7d725f830da6d93f3669ce66b
+  languageName: node
+  linkType: hard
+
 "real-require@npm:^0.2.0":
   version: 0.2.0
   resolution: "real-require@npm:0.2.0"
@@ -11527,7 +11663,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"regexp.prototype.flags@npm:^1.5.3":
+"regexp.prototype.flags@npm:^1.5.3, regexp.prototype.flags@npm:^1.5.4":
   version: 1.5.4
   resolution: "regexp.prototype.flags@npm:1.5.4"
   dependencies:
@@ -11594,13 +11730,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"requires-port@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "requires-port@npm:1.0.0"
-  checksum: 10c0/b2bfdd09db16c082c4326e573a82c0771daaf7b53b9ce8ad60ea46aa6e30aaf475fe9b164800b89f93b748d2c234d8abff945d2551ba47bf5698e04cd7713267
-  languageName: node
-  linkType: hard
-
 "reselect@npm:^5.1.0":
   version: 5.1.0
   resolution: "reselect@npm:5.1.0"
@@ -11636,7 +11765,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"resolve@npm:^1.14.2, resolve@npm:^1.19.0, resolve@npm:^1.22.1, resolve@npm:^1.22.4, resolve@npm:^1.22.8":
+"resolve@npm:^1.19.0, resolve@npm:^1.22.1, resolve@npm:^1.22.10, resolve@npm:^1.22.4, resolve@npm:^1.22.8":
   version: 1.22.10
   resolution: "resolve@npm:1.22.10"
   dependencies:
@@ -11662,7 +11791,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"resolve@patch:resolve@npm%3A^1.14.2#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.19.0#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.22.1#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.22.4#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.22.8#optional!builtin<compat/resolve>":
+"resolve@patch:resolve@npm%3A^1.19.0#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.22.1#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.22.10#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.22.4#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.22.8#optional!builtin<compat/resolve>":
   version: 1.22.10
   resolution: "resolve@patch:resolve@npm%3A1.22.10#optional!builtin<compat/resolve>::version=1.22.10&hash=c3c19d"
   dependencies:
@@ -11705,6 +11834,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"rettime@npm:^0.7.0":
+  version: 0.7.0
+  resolution: "rettime@npm:0.7.0"
+  checksum: 10c0/1460539d49415c37e46884bf1db7a5da974b239c1bd6976e1cf076fad169067dc8f55cd2572aec504433162f3627b6d8123eea977d110476258045d620bd051b
+  languageName: node
+  linkType: hard
+
 "reusify@npm:^1.0.4":
   version: 1.0.4
   resolution: "reusify@npm:1.0.4"
@@ -11719,18 +11855,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rollup-plugin-gzip@npm:^3.1.0":
-  version: 3.1.2
-  resolution: "rollup-plugin-gzip@npm:3.1.2"
+"rollup-plugin-gzip@npm:^4.1.1":
+  version: 4.1.1
+  resolution: "rollup-plugin-gzip@npm:4.1.1"
   peerDependencies:
     rollup: ">=2.0.0"
-  checksum: 10c0/5129d3970cca37bfb5a2fdeddb863bc76be12489ec0a6fcb2be2764902aa2f8548eb8e6532c4e15912d95e8baaa7391a5ed6b58790ed2529c86a98fa75467edc
+  checksum: 10c0/0ad79a6eb84bb8d88db15a184ca661f44aa6fb3412c98d6a97f1dec365db37945a84c3a2d0bf709ae605ae305a40a0021b2e6d5494c537b029759f3695d9ac96
   languageName: node
   linkType: hard
 
-"rollup-plugin-visualizer@npm:^6.0.0":
-  version: 6.0.3
-  resolution: "rollup-plugin-visualizer@npm:6.0.3"
+"rollup-plugin-visualizer@npm:^6.0.3":
+  version: 6.0.4
+  resolution: "rollup-plugin-visualizer@npm:6.0.4"
   dependencies:
     open: "npm:^8.0.0"
     picomatch: "npm:^4.0.2"
@@ -11746,7 +11882,7 @@ __metadata:
       optional: true
   bin:
     rollup-plugin-visualizer: dist/bin/cli.js
-  checksum: 10c0/595d68936a6338744e8facd165fceedf7f2ebedc44863e640e725198001ed62948cc4a5d8403aa74e679de92957e4def3b1dffc4a9f8de71e4245929566553a3
+  checksum: 10c0/e5d472bec0c863c9c3c46f55b303a9457e854bf1b654215e727a586da12897e2cfc30029f029c6c44dd8e9e61ce0d22f113a68ed8e5fe2256abeb58f265c0a89
   languageName: node
   linkType: hard
 
@@ -11764,31 +11900,31 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rollup@npm:^4.34.9":
-  version: 4.40.2
-  resolution: "rollup@npm:4.40.2"
+"rollup@npm:^4.43.0":
+  version: 4.46.2
+  resolution: "rollup@npm:4.46.2"
   dependencies:
-    "@rollup/rollup-android-arm-eabi": "npm:4.40.2"
-    "@rollup/rollup-android-arm64": "npm:4.40.2"
-    "@rollup/rollup-darwin-arm64": "npm:4.40.2"
-    "@rollup/rollup-darwin-x64": "npm:4.40.2"
-    "@rollup/rollup-freebsd-arm64": "npm:4.40.2"
-    "@rollup/rollup-freebsd-x64": "npm:4.40.2"
-    "@rollup/rollup-linux-arm-gnueabihf": "npm:4.40.2"
-    "@rollup/rollup-linux-arm-musleabihf": "npm:4.40.2"
-    "@rollup/rollup-linux-arm64-gnu": "npm:4.40.2"
-    "@rollup/rollup-linux-arm64-musl": "npm:4.40.2"
-    "@rollup/rollup-linux-loongarch64-gnu": "npm:4.40.2"
-    "@rollup/rollup-linux-powerpc64le-gnu": "npm:4.40.2"
-    "@rollup/rollup-linux-riscv64-gnu": "npm:4.40.2"
-    "@rollup/rollup-linux-riscv64-musl": "npm:4.40.2"
-    "@rollup/rollup-linux-s390x-gnu": "npm:4.40.2"
-    "@rollup/rollup-linux-x64-gnu": "npm:4.40.2"
-    "@rollup/rollup-linux-x64-musl": "npm:4.40.2"
-    "@rollup/rollup-win32-arm64-msvc": "npm:4.40.2"
-    "@rollup/rollup-win32-ia32-msvc": "npm:4.40.2"
-    "@rollup/rollup-win32-x64-msvc": "npm:4.40.2"
-    "@types/estree": "npm:1.0.7"
+    "@rollup/rollup-android-arm-eabi": "npm:4.46.2"
+    "@rollup/rollup-android-arm64": "npm:4.46.2"
+    "@rollup/rollup-darwin-arm64": "npm:4.46.2"
+    "@rollup/rollup-darwin-x64": "npm:4.46.2"
+    "@rollup/rollup-freebsd-arm64": "npm:4.46.2"
+    "@rollup/rollup-freebsd-x64": "npm:4.46.2"
+    "@rollup/rollup-linux-arm-gnueabihf": "npm:4.46.2"
+    "@rollup/rollup-linux-arm-musleabihf": "npm:4.46.2"
+    "@rollup/rollup-linux-arm64-gnu": "npm:4.46.2"
+    "@rollup/rollup-linux-arm64-musl": "npm:4.46.2"
+    "@rollup/rollup-linux-loongarch64-gnu": "npm:4.46.2"
+    "@rollup/rollup-linux-ppc64-gnu": "npm:4.46.2"
+    "@rollup/rollup-linux-riscv64-gnu": "npm:4.46.2"
+    "@rollup/rollup-linux-riscv64-musl": "npm:4.46.2"
+    "@rollup/rollup-linux-s390x-gnu": "npm:4.46.2"
+    "@rollup/rollup-linux-x64-gnu": "npm:4.46.2"
+    "@rollup/rollup-linux-x64-musl": "npm:4.46.2"
+    "@rollup/rollup-win32-arm64-msvc": "npm:4.46.2"
+    "@rollup/rollup-win32-ia32-msvc": "npm:4.46.2"
+    "@rollup/rollup-win32-x64-msvc": "npm:4.46.2"
+    "@types/estree": "npm:1.0.8"
     fsevents: "npm:~2.3.2"
   dependenciesMeta:
     "@rollup/rollup-android-arm-eabi":
@@ -11813,7 +11949,7 @@ __metadata:
       optional: true
     "@rollup/rollup-linux-loongarch64-gnu":
       optional: true
-    "@rollup/rollup-linux-powerpc64le-gnu":
+    "@rollup/rollup-linux-ppc64-gnu":
       optional: true
     "@rollup/rollup-linux-riscv64-gnu":
       optional: true
@@ -11835,7 +11971,7 @@ __metadata:
       optional: true
   bin:
     rollup: dist/bin/rollup
-  checksum: 10c0/cbe9b766891da74fbf7c3b50420bb75102e5c59afc0ea45751f7e43a581d2cd93367763f521f820b72e341cf1f6b9951fbdcd3be67a1b0aa774b754525a8b9c7
+  checksum: 10c0/f428497fe119fe7c4e34f1020d45ba13e99b94c9aa36958d88823d932b155c9df3d84f53166f3ee913ff68ea6c7599a9ab34861d88562ad9d8420f64ca5dad4c
   languageName: node
   linkType: hard
 
@@ -11911,8 +12047,8 @@ __metadata:
   linkType: hard
 
 "sass@npm:^1.62.1":
-  version: 1.89.2
-  resolution: "sass@npm:1.89.2"
+  version: 1.93.2
+  resolution: "sass@npm:1.93.2"
   dependencies:
     "@parcel/watcher": "npm:^2.4.1"
     chokidar: "npm:^4.0.0"
@@ -11923,7 +12059,7 @@ __metadata:
       optional: true
   bin:
     sass: sass.js
-  checksum: 10c0/752ccc7581b0c6395f63918116c20924e99943a86d79e94f5c4a0d41b1e981fe1f0ecd1ee82fff21496f81dbc91f68fb35a498166562ec8ec53e7aad7c3dbd9d
+  checksum: 10c0/5a19f12dbe8c142e40c1e0473d1e624898242b1c21010301e169b528be8c580df6356329c798522b525eb11eda4b04b9b77422badc55c47889600f8477201d2b
   languageName: node
   linkType: hard
 
@@ -11952,20 +12088,21 @@ __metadata:
   languageName: node
   linkType: hard
 
-"scroll-behavior@npm:^0.9.1":
-  version: 0.9.12
-  resolution: "scroll-behavior@npm:0.9.12"
+"scroll-behavior@npm:^0.11.0":
+  version: 0.11.0
+  resolution: "scroll-behavior@npm:0.11.0"
   dependencies:
-    dom-helpers: "npm:^3.4.0"
+    dom-helpers: "npm:^5.1.4"
     invariant: "npm:^2.2.4"
-  checksum: 10c0/4f438c48b93a1dcc2ab51a18670fac6f5ce41885291d8aa13251b4a187be9d0c6dd518ee974eb52ac9bbe227b9811c2615ecca73192a1a190b78dfdadb9c2cf2
+    page-lifecycle: "npm:^0.1.2"
+  checksum: 10c0/c54010c9fdd9fc360fd7887ecf64f16972f9557ac679723709612cd54fc4778c7433ab46a9637933179ef31471f78e2591fb35351dc0e15537fecf1c8c89d32c
   languageName: node
   linkType: hard
 
-"secure-json-parse@npm:^2.4.0":
-  version: 2.7.0
-  resolution: "secure-json-parse@npm:2.7.0"
-  checksum: 10c0/f57eb6a44a38a3eeaf3548228585d769d788f59007454214fab9ed7f01fbf2e0f1929111da6db28cf0bcc1a2e89db5219a59e83eeaec3a54e413a0197ce879e4
+"secure-json-parse@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "secure-json-parse@npm:4.0.0"
+  checksum: 10c0/1a298cf00e1de91e833cee5eb406d6e77fb2f7eca9bef3902047d49e7f5d3e6c21b5de61ff73466c831e716430bfe87d732a6e645a7dabb5f1e8a8e4d3e15eb4
   languageName: node
   linkType: hard
 
@@ -11978,7 +12115,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"semver@npm:^7.3.5, semver@npm:^7.5.3, semver@npm:^7.6.0, semver@npm:^7.6.2, semver@npm:^7.6.3, semver@npm:^7.7.1":
+"semver@npm:^7.3.5, semver@npm:^7.5.3, semver@npm:^7.6.0, semver@npm:^7.6.2, semver@npm:^7.7.1, semver@npm:^7.7.2":
   version: 7.7.2
   resolution: "semver@npm:7.7.2"
   bin:
@@ -12183,13 +12320,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"slashes@npm:^3.0.12":
-  version: 3.0.12
-  resolution: "slashes@npm:3.0.12"
-  checksum: 10c0/71ca2a1fcd1ab6814b0fdb8cf9c33a3d54321deec2aa8d173510f0086880201446021a9b9e6a18561f7c472b69a2145977c6a8fb9c53a8ff7be31778f203d175
-  languageName: node
-  linkType: hard
-
 "slice-ansi@npm:^4.0.0":
   version: 4.0.0
   resolution: "slice-ansi@npm:4.0.0"
@@ -12201,16 +12331,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"slice-ansi@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "slice-ansi@npm:5.0.0"
-  dependencies:
-    ansi-styles: "npm:^6.0.0"
-    is-fullwidth-code-point: "npm:^4.0.0"
-  checksum: 10c0/2d4d40b2a9d5cf4e8caae3f698fe24ae31a4d778701724f578e984dcb485ec8c49f0c04dab59c401821e80fcdfe89cace9c66693b0244e40ec485d72e543914f
-  languageName: node
-  linkType: hard
-
 "slice-ansi@npm:^7.1.0":
   version: 7.1.0
   resolution: "slice-ansi@npm:7.1.0"
@@ -12221,6 +12341,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"slow-redact@npm:^0.3.0":
+  version: 0.3.0
+  resolution: "slow-redact@npm:0.3.0"
+  checksum: 10c0/bb2f77830f64fb01079849e0c6433c15e782b88cccb82d4b0d62ce216307cf514ea3f92e9b2c6ae1b1d613ac7743305d5f0324e94c9dc8e41908939456248f9a
+  languageName: node
+  linkType: hard
+
 "smart-buffer@npm:^4.2.0":
   version: 4.2.0
   resolution: "smart-buffer@npm:4.2.0"
@@ -12245,24 +12372,24 @@ __metadata:
   languageName: node
   linkType: hard
 
-"socks-proxy-agent@npm:^8.0.1":
-  version: 8.0.2
-  resolution: "socks-proxy-agent@npm:8.0.2"
+"socks-proxy-agent@npm:^8.0.3":
+  version: 8.0.5
+  resolution: "socks-proxy-agent@npm:8.0.5"
   dependencies:
-    agent-base: "npm:^7.0.2"
+    agent-base: "npm:^7.1.2"
     debug: "npm:^4.3.4"
-    socks: "npm:^2.7.1"
-  checksum: 10c0/a842402fc9b8848a31367f2811ca3cd14c4106588b39a0901cd7a69029998adfc6456b0203617c18ed090542ad0c24ee4e9d4c75a0c4b75071e214227c177eb7
+    socks: "npm:^2.8.3"
+  checksum: 10c0/5d2c6cecba6821389aabf18728325730504bf9bb1d9e342e7987a5d13badd7a98838cc9a55b8ed3cb866ad37cc23e1086f09c4d72d93105ce9dfe76330e9d2a6
   languageName: node
   linkType: hard
 
-"socks@npm:^2.7.1":
-  version: 2.7.1
-  resolution: "socks@npm:2.7.1"
+"socks@npm:^2.8.3":
+  version: 2.8.7
+  resolution: "socks@npm:2.8.7"
   dependencies:
-    ip: "npm:^2.0.0"
+    ip-address: "npm:^10.0.1"
     smart-buffer: "npm:^4.2.0"
-  checksum: 10c0/43f69dbc9f34fc8220bc51c6eea1c39715ab3cfdb115d6e3285f6c7d1a603c5c75655668a5bbc11e3c7e2c99d60321fb8d7ab6f38cda6a215fadd0d6d0b52130
+  checksum: 10c0/2805a43a1c4bcf9ebf6e018268d87b32b32b06fbbc1f9282573583acc155860dc361500f89c73bfbb157caa1b4ac78059eac0ef15d1811eb0ca75e0bdadbc9d2
   languageName: node
   linkType: hard
 
@@ -12367,19 +12494,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ssri@npm:^10.0.0":
-  version: 10.0.5
-  resolution: "ssri@npm:10.0.5"
+"ssri@npm:^12.0.0":
+  version: 12.0.0
+  resolution: "ssri@npm:12.0.0"
   dependencies:
     minipass: "npm:^7.0.3"
-  checksum: 10c0/b091f2ae92474183c7ac5ed3f9811457e1df23df7a7e70c9476eaa9a0c4a0c8fc190fb45acefbf023ca9ee864dd6754237a697dc52a0fb182afe65d8e77443d8
+  checksum: 10c0/caddd5f544b2006e88fa6b0124d8d7b28208b83c72d7672d5ade44d794525d23b540f3396108c4eb9280dcb7c01f0bef50682f5b4b2c34291f7c5e211fd1417d
   languageName: node
   linkType: hard
 
-"stable-hash@npm:^0.0.5":
-  version: 0.0.5
-  resolution: "stable-hash@npm:0.0.5"
-  checksum: 10c0/ca670cb6d172f1c834950e4ec661e2055885df32fee3ebf3647c5df94993b7c2666a5dbc1c9a62ee11fc5c24928579ec5e81bb5ad31971d355d5a341aab493b3
+"stable-hash-x@npm:^0.2.0":
+  version: 0.2.0
+  resolution: "stable-hash-x@npm:0.2.0"
+  checksum: 10c0/c757df58366ee4bb266a9486b8932eab7c1ba730469eaf4b68d2dee404814e9f84089c44c9b5205f8c7d99a0ab036cce2af69139ce5ed44b635923c011a8aea8
   languageName: node
   linkType: hard
 
@@ -12455,22 +12582,26 @@ __metadata:
   languageName: node
   linkType: hard
 
-"stimulus-vite-helpers@npm:^3.0.0":
-  version: 3.1.0
-  resolution: "stimulus-vite-helpers@npm:3.1.0"
-  checksum: 10c0/828252f43b238191d71b7b4d2048b7df9845c789963a0a23ea0979941e55ad0e14d2b98646eba328e9f4432cf0c0c8340830c5cde1fc9046077c6f1109b4a671
+"stop-iteration-iterator@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "stop-iteration-iterator@npm:1.1.0"
+  dependencies:
+    es-errors: "npm:^1.3.0"
+    internal-slot: "npm:^1.1.0"
+  checksum: 10c0/de4e45706bb4c0354a4b1122a2b8cc45a639e86206807ce0baf390ee9218d3ef181923fa4d2b67443367c491aa255c5fbaa64bb74648e3c5b48299928af86c09
   languageName: node
   linkType: hard
 
-"storybook@npm:^9.0.4":
-  version: 9.0.4
-  resolution: "storybook@npm:9.0.4"
+"storybook@npm:^9.1.1":
+  version: 9.1.7
+  resolution: "storybook@npm:9.1.7"
   dependencies:
     "@storybook/global": "npm:^5.0.0"
     "@testing-library/jest-dom": "npm:^6.6.3"
     "@testing-library/user-event": "npm:^14.6.1"
-    "@vitest/expect": "npm:3.0.9"
-    "@vitest/spy": "npm:3.0.9"
+    "@vitest/expect": "npm:3.2.4"
+    "@vitest/mocker": "npm:3.2.4"
+    "@vitest/spy": "npm:3.2.4"
     better-opn: "npm:^3.0.2"
     esbuild: "npm:^0.18.0 || ^0.19.0 || ^0.20.0 || ^0.21.0 || ^0.22.0 || ^0.23.0 || ^0.24.0 || ^0.25.0"
     esbuild-register: "npm:^3.5.0"
@@ -12484,7 +12615,7 @@ __metadata:
       optional: true
   bin:
     storybook: ./bin/index.cjs
-  checksum: 10c0/52aa44ac9ba73bf3ab2718669faa02c515ef91243f7d39bcac815efc1b72ac2f2c3b1ea4586ec37beb8f6044c8c5b1c9e2d46405a8832974f3cee37f4b3c3821
+  checksum: 10c0/daf3fb47ada1368604db7a1bc53775a5ceb485cd103351670e74d3378cb7bc1e396f72530a4821f3919207fb55ce7904ce894f55566844f9a14279553a8bd534
   languageName: node
   linkType: hard
 
@@ -12495,7 +12626,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"string-argv@npm:^0.3.2":
+"string-argv@npm:0.3.2":
   version: 0.3.2
   resolution: "string-argv@npm:0.3.2"
   checksum: 10c0/75c02a83759ad1722e040b86823909d9a2fc75d15dd71ec4b537c3560746e33b5f5a07f7332d1e3f88319909f82190843aa2f0a0d8c8d591ec08e93d5b8dec82
@@ -12535,6 +12666,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"string-width@npm:^8.0.0":
+  version: 8.1.0
+  resolution: "string-width@npm:8.1.0"
+  dependencies:
+    get-east-asian-width: "npm:^1.3.0"
+    strip-ansi: "npm:^7.1.0"
+  checksum: 10c0/749b5d0dab2532b4b6b801064230f4da850f57b3891287023117ab63a464ad79dd208f42f793458f48f3ad121fe2e1f01dd525ff27ead957ed9f205e27406593
+  languageName: node
+  linkType: hard
+
 "string.prototype.includes@npm:^2.0.1":
   version: 2.0.1
   resolution: "string.prototype.includes@npm:2.0.1"
@@ -12592,7 +12733,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"string.prototype.trimend@npm:^1.0.8, string.prototype.trimend@npm:^1.0.9":
+"string.prototype.trimend@npm:^1.0.9":
   version: 1.0.9
   resolution: "string.prototype.trimend@npm:1.0.9"
   dependencies:
@@ -12692,6 +12833,22 @@ __metadata:
   languageName: node
   linkType: hard
 
+"strip-json-comments@npm:^5.0.2":
+  version: 5.0.3
+  resolution: "strip-json-comments@npm:5.0.3"
+  checksum: 10c0/daaf20b29f69fb51112698f4a9a662490dbb78d5baf6127c75a0a83c2ac6c078a8c0f74b389ad5e0519d6fc359c4a57cb9971b1ae201aef62ce45a13247791e0
+  languageName: node
+  linkType: hard
+
+"strip-literal@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "strip-literal@npm:3.0.0"
+  dependencies:
+    js-tokens: "npm:^9.0.1"
+  checksum: 10c0/d81657f84aba42d4bbaf2a677f7e7f34c1f3de5a6726db8bc1797f9c0b303ba54d4660383a74bde43df401cf37cce1dff2c842c55b077a4ceee11f9e31fba828
+  languageName: node
+  linkType: hard
+
 "stylelint-config-prettier-scss@npm:^1.0.0":
   version: 1.0.0
   resolution: "stylelint-config-prettier-scss@npm:1.0.0"
@@ -12776,12 +12933,12 @@ __metadata:
   linkType: hard
 
 "stylelint@npm:^16.19.1":
-  version: 16.19.1
-  resolution: "stylelint@npm:16.19.1"
+  version: 16.24.0
+  resolution: "stylelint@npm:16.24.0"
   dependencies:
-    "@csstools/css-parser-algorithms": "npm:^3.0.4"
-    "@csstools/css-tokenizer": "npm:^3.0.3"
-    "@csstools/media-query-list-parser": "npm:^4.0.2"
+    "@csstools/css-parser-algorithms": "npm:^3.0.5"
+    "@csstools/css-tokenizer": "npm:^3.0.4"
+    "@csstools/media-query-list-parser": "npm:^4.0.3"
     "@csstools/selector-specificity": "npm:^5.0.0"
     "@dual-bundle/import-meta-resolve": "npm:^4.1.0"
     balanced-match: "npm:^2.0.0"
@@ -12789,24 +12946,24 @@ __metadata:
     cosmiconfig: "npm:^9.0.0"
     css-functions-list: "npm:^3.2.3"
     css-tree: "npm:^3.1.0"
-    debug: "npm:^4.3.7"
+    debug: "npm:^4.4.1"
     fast-glob: "npm:^3.3.3"
     fastest-levenshtein: "npm:^1.0.16"
-    file-entry-cache: "npm:^10.0.8"
+    file-entry-cache: "npm:^10.1.4"
     global-modules: "npm:^2.0.0"
     globby: "npm:^11.1.0"
     globjoin: "npm:^0.1.4"
     html-tags: "npm:^3.3.1"
-    ignore: "npm:^7.0.3"
+    ignore: "npm:^7.0.5"
     imurmurhash: "npm:^0.1.4"
     is-plain-object: "npm:^5.0.0"
-    known-css-properties: "npm:^0.36.0"
+    known-css-properties: "npm:^0.37.0"
     mathml-tag-names: "npm:^2.1.3"
     meow: "npm:^13.2.0"
     micromatch: "npm:^4.0.8"
     normalize-path: "npm:^3.0.0"
     picocolors: "npm:^1.1.1"
-    postcss: "npm:^8.5.3"
+    postcss: "npm:^8.5.6"
     postcss-resolve-nested-selector: "npm:^0.1.6"
     postcss-safe-parser: "npm:^7.0.1"
     postcss-selector-parser: "npm:^7.1.0"
@@ -12819,7 +12976,7 @@ __metadata:
     write-file-atomic: "npm:^5.0.1"
   bin:
     stylelint: bin/stylelint.mjs
-  checksum: 10c0/e633f323ff730e8f2ac982067e4caa9a6c98b81a519e7adff96fa7a7d047f68a24c0dd2d81f3511b0943d99c915f20f19da911d16d47336705ea70d46e960c89
+  checksum: 10c0/f694bfa86b8030d71e0ebd7eb815e927869481325af9a096d574d60d459944d3f11c295a5ed8885ae3d090aa1ab9431698fba1b7b99cea9884f7c762433a2891
   languageName: node
   linkType: hard
 
@@ -12884,16 +13041,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"synckit@npm:^0.9.1":
-  version: 0.9.1
-  resolution: "synckit@npm:0.9.1"
-  dependencies:
-    "@pkgr/core": "npm:^0.1.0"
-    tslib: "npm:^2.6.2"
-  checksum: 10c0/d8b89e1bf30ba3ffb469d8418c836ad9c0c062bf47028406b4d06548bc66af97155ea2303b96c93bf5c7c0f0d66153a6fbd6924c76521b434e6a9898982abc2e
-  languageName: node
-  linkType: hard
-
 "systemjs@npm:^6.15.1":
   version: 6.15.1
   resolution: "systemjs@npm:6.15.1"
@@ -12914,17 +13061,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tar@npm:^6.1.11, tar@npm:^6.1.2":
-  version: 6.2.0
-  resolution: "tar@npm:6.2.0"
+"tar@npm:^7.4.3":
+  version: 7.4.3
+  resolution: "tar@npm:7.4.3"
   dependencies:
-    chownr: "npm:^2.0.0"
-    fs-minipass: "npm:^2.0.0"
-    minipass: "npm:^5.0.0"
-    minizlib: "npm:^2.1.1"
-    mkdirp: "npm:^1.0.3"
-    yallist: "npm:^4.0.0"
-  checksum: 10c0/02ca064a1a6b4521fef88c07d389ac0936730091f8c02d30ea60d472e0378768e870769ab9e986d87807bfee5654359cf29ff4372746cc65e30cbddc352660d8
+    "@isaacs/fs-minipass": "npm:^4.0.0"
+    chownr: "npm:^3.0.0"
+    minipass: "npm:^7.1.2"
+    minizlib: "npm:^3.0.1"
+    mkdirp: "npm:^3.0.1"
+    yallist: "npm:^5.0.0"
+  checksum: 10c0/d4679609bb2a9b48eeaf84632b6d844128d2412b95b6de07d53d8ee8baf4ca0857c9331dfa510390a0727b550fd543d4d1a10995ad86cdf078423fbb8d99831d
   languageName: node
   linkType: hard
 
@@ -13049,20 +13196,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tinyglobby@npm:^0.2.10, tinyglobby@npm:^0.2.12, tinyglobby@npm:^0.2.13, tinyglobby@npm:^0.2.14":
-  version: 0.2.14
-  resolution: "tinyglobby@npm:0.2.14"
+"tinyglobby@npm:^0.2.10, tinyglobby@npm:^0.2.12, tinyglobby@npm:^0.2.14, tinyglobby@npm:^0.2.15":
+  version: 0.2.15
+  resolution: "tinyglobby@npm:0.2.15"
   dependencies:
-    fdir: "npm:^6.4.4"
-    picomatch: "npm:^4.0.2"
-  checksum: 10c0/f789ed6c924287a9b7d3612056ed0cda67306cd2c80c249fd280cf1504742b12583a2089b61f4abbd24605f390809017240e250241f09938054c9b363e51c0a6
+    fdir: "npm:^6.5.0"
+    picomatch: "npm:^4.0.3"
+  checksum: 10c0/869c31490d0d88eedb8305d178d4c75e7463e820df5a9b9d388291daf93e8b1eb5de1dad1c1e139767e4269fe75f3b10d5009b2cc14db96ff98986920a186844
   languageName: node
   linkType: hard
 
-"tinypool@npm:^1.1.0":
-  version: 1.1.0
-  resolution: "tinypool@npm:1.1.0"
-  checksum: 10c0/deb6bde5e3d85d4ba043806c66f43fb5b649716312a47b52761a83668ffc71cd0ea4e24254c1b02a3702e5c27e02605f0189a1460f6284a5930a08bd0c06435c
+"tinypool@npm:^1.1.1":
+  version: 1.1.1
+  resolution: "tinypool@npm:1.1.1"
+  checksum: 10c0/bf26727d01443061b04fa863f571016950888ea994ba0cd8cba3a1c51e2458d84574341ab8dbc3664f1c3ab20885c8cf9ff1cc4b18201f04c2cde7d317fff69b
   languageName: node
   linkType: hard
 
@@ -13073,13 +13220,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tinyspy@npm:^3.0.2":
-  version: 3.0.2
-  resolution: "tinyspy@npm:3.0.2"
-  checksum: 10c0/55ffad24e346622b59292e097c2ee30a63919d5acb7ceca87fc0d1c223090089890587b426e20054733f97a58f20af2c349fb7cc193697203868ab7ba00bcea0
-  languageName: node
-  linkType: hard
-
 "tinyspy@npm:^4.0.3":
   version: 4.0.3
   resolution: "tinyspy@npm:4.0.3"
@@ -13087,21 +13227,21 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tldts-core@npm:^6.1.47":
-  version: 6.1.47
-  resolution: "tldts-core@npm:6.1.47"
-  checksum: 10c0/538372072aea7153e842646a9e22d0d9335acf7fd877d10ee374cf78dceff79a2ccebadf7d25e0dbddd7b7b60bafe1c885aac3e3b1d5bec7806963c89b163ee7
+"tldts-core@npm:^7.0.14":
+  version: 7.0.14
+  resolution: "tldts-core@npm:7.0.14"
+  checksum: 10c0/e35f006e3376c70ea2cde436fc808b3017322de62246e7e4a733cc09a60959711cd9dbfd91b67ffe52fbee215d9e41911a39b6c20e8f45544b09f7662355753f
   languageName: node
   linkType: hard
 
-"tldts@npm:^6.1.32":
-  version: 6.1.47
-  resolution: "tldts@npm:6.1.47"
+"tldts@npm:^7.0.5":
+  version: 7.0.14
+  resolution: "tldts@npm:7.0.14"
   dependencies:
-    tldts-core: "npm:^6.1.47"
+    tldts-core: "npm:^7.0.14"
   bin:
     tldts: bin/cli.js
-  checksum: 10c0/42c999ab24ce3ab221cfefe77488d145d16d9523524913badaa4af4f1f0d65e0a92a678659b22b7d26d1c62796540c95158049220c9ff243090b93470f236302
+  checksum: 10c0/87dd69b68e07c0cb3913c4b7fb4a57a3b4826a664637725ab9226aa01a4786d003c181b0525d09bfb1bb0c16802b4350620443da64d9e947a7ff4c19f2f4acbf
   languageName: node
   linkType: hard
 
@@ -13128,24 +13268,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tough-cookie@npm:^4.1.4":
-  version: 4.1.4
-  resolution: "tough-cookie@npm:4.1.4"
+"tough-cookie@npm:^6.0.0":
+  version: 6.0.0
+  resolution: "tough-cookie@npm:6.0.0"
   dependencies:
-    psl: "npm:^1.1.33"
-    punycode: "npm:^2.1.1"
-    universalify: "npm:^0.2.0"
-    url-parse: "npm:^1.5.3"
-  checksum: 10c0/aca7ff96054f367d53d1e813e62ceb7dd2eda25d7752058a74d64b7266fd07be75908f3753a32ccf866a2f997604b414cfb1916d6e7f69bc64d9d9939b0d6c45
-  languageName: node
-  linkType: hard
-
-"tough-cookie@npm:^5.1.1":
-  version: 5.1.2
-  resolution: "tough-cookie@npm:5.1.2"
-  dependencies:
-    tldts: "npm:^6.1.32"
-  checksum: 10c0/5f95023a47de0f30a902bba951664b359725597d8adeabc66a0b93a931c3af801e1e697dae4b8c21a012056c0ea88bd2bf4dfe66b2adcf8e2f42cd9796fe0626
+    tldts: "npm:^7.0.5"
+  checksum: 10c0/7b17a461e9c2ac0d0bea13ab57b93b4346d0b8c00db174c963af1e46e4ea8d04148d2a55f2358fc857db0c0c65208a98e319d0c60693e32e0c559a9d9cf20cb5
   languageName: node
   linkType: hard
 
@@ -13165,12 +13293,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tr46@npm:^5.1.0":
-  version: 5.1.0
-  resolution: "tr46@npm:5.1.0"
+"tr46@npm:^5.1.1":
+  version: 5.1.1
+  resolution: "tr46@npm:5.1.1"
   dependencies:
     punycode: "npm:^2.3.1"
-  checksum: 10c0/d761f7144e0cb296187674ef245c74f761e334d7cf25ca73ef60e4c72c097c75051031c093fa1a2fee04b904977b316716a7915854bcae8fb1a371746513cbe8
+  checksum: 10c0/ae270e194d52ec67ebd695c1a42876e0f19b96e4aca2ab464ab1d9d17dc3acd3e18764f5034c93897db73421563be27c70c98359c4501136a497e46deda5d5ec
   languageName: node
   linkType: hard
 
@@ -13181,7 +13309,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ts-api-utils@npm:^2.0.1, ts-api-utils@npm:^2.1.0":
+"ts-api-utils@npm:^2.1.0":
   version: 2.1.0
   resolution: "ts-api-utils@npm:2.1.0"
   peerDependencies:
@@ -13234,7 +13362,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tslib@npm:^2.0.0, tslib@npm:^2.0.1, tslib@npm:^2.0.3, tslib@npm:^2.4.0, tslib@npm:^2.6.2, tslib@npm:^2.8.0":
+"tslib@npm:^2.0.0, tslib@npm:^2.0.1, tslib@npm:^2.0.3, tslib@npm:^2.4.0, tslib@npm:^2.8.0":
   version: 2.8.1
   resolution: "tslib@npm:2.8.1"
   checksum: 10c0/9c4759110a19c53f992d9aae23aac5ced636e99887b51b9e61def52611732872ff7668757d4e4c61f19691e36f4da981cd9485e869b4a7408d689f6bf1f14e62
@@ -13353,57 +13481,58 @@ __metadata:
   languageName: node
   linkType: hard
 
-"typescript-eslint@npm:^8.28.0, typescript-eslint@npm:^8.29.1":
-  version: 8.29.1
-  resolution: "typescript-eslint@npm:8.29.1"
+"typescript-eslint@npm:^8.28.0, typescript-eslint@npm:^8.45.0":
+  version: 8.45.0
+  resolution: "typescript-eslint@npm:8.45.0"
   dependencies:
-    "@typescript-eslint/eslint-plugin": "npm:8.29.1"
-    "@typescript-eslint/parser": "npm:8.29.1"
-    "@typescript-eslint/utils": "npm:8.29.1"
+    "@typescript-eslint/eslint-plugin": "npm:8.45.0"
+    "@typescript-eslint/parser": "npm:8.45.0"
+    "@typescript-eslint/typescript-estree": "npm:8.45.0"
+    "@typescript-eslint/utils": "npm:8.45.0"
   peerDependencies:
     eslint: ^8.57.0 || ^9.0.0
-    typescript: ">=4.8.4 <5.9.0"
-  checksum: 10c0/31319c891d224ec8d7cf96ad7e6c84480b3d17d4c46c5beccca06fc7891f41eabd5593e44867e69dbfb79459f5545c2cc2e985c950bdd7b4e7c3bb1ec8941030
+    typescript: ">=4.8.4 <6.0.0"
+  checksum: 10c0/2342b0bffe6f719711adbb42116f90cb1fe1670e2e74dde2739482c9d61c2a975ee16e2d560684613050544b543342ec1b11b46e158a48ecc605f5882d2d5da7
   languageName: node
   linkType: hard
 
-"typescript@npm:^5.6.0":
-  version: 5.8.2
-  resolution: "typescript@npm:5.8.2"
+"typescript@npm:5.8.3":
+  version: 5.8.3
+  resolution: "typescript@npm:5.8.3"
   bin:
     tsc: bin/tsc
     tsserver: bin/tsserver
-  checksum: 10c0/5c4f6fbf1c6389b6928fe7b8fcd5dc73bb2d58cd4e3883f1d774ed5bd83b151cbac6b7ecf11723de56d4676daeba8713894b1e9af56174f2f9780ae7848ec3c6
+  checksum: 10c0/5f8bb01196e542e64d44db3d16ee0e4063ce4f3e3966df6005f2588e86d91c03e1fb131c2581baf0fb65ee79669eea6e161cd448178986587e9f6844446dbb48
   languageName: node
   linkType: hard
 
-"typescript@npm:~5.7.3":
-  version: 5.7.3
-  resolution: "typescript@npm:5.7.3"
+"typescript@npm:^5.6.0, typescript@npm:~5.9.0":
+  version: 5.9.2
+  resolution: "typescript@npm:5.9.2"
   bin:
     tsc: bin/tsc
     tsserver: bin/tsserver
-  checksum: 10c0/b7580d716cf1824736cc6e628ab4cd8b51877408ba2be0869d2866da35ef8366dd6ae9eb9d0851470a39be17cbd61df1126f9e211d8799d764ea7431d5435afa
+  checksum: 10c0/cd635d50f02d6cf98ed42de2f76289701c1ec587a363369255f01ed15aaf22be0813226bff3c53e99d971f9b540e0b3cc7583dbe05faded49b1b0bed2f638a18
   languageName: node
   linkType: hard
 
-"typescript@patch:typescript@npm%3A^5.6.0#optional!builtin<compat/typescript>":
-  version: 5.8.2
-  resolution: "typescript@patch:typescript@npm%3A5.8.2#optional!builtin<compat/typescript>::version=5.8.2&hash=5786d5"
+"typescript@patch:typescript@npm%3A5.8.3#optional!builtin<compat/typescript>":
+  version: 5.8.3
+  resolution: "typescript@patch:typescript@npm%3A5.8.3#optional!builtin<compat/typescript>::version=5.8.3&hash=5786d5"
   bin:
     tsc: bin/tsc
     tsserver: bin/tsserver
-  checksum: 10c0/5448a08e595cc558ab321e49d4cac64fb43d1fa106584f6ff9a8d8e592111b373a995a1d5c7f3046211c8a37201eb6d0f1566f15cdb7a62a5e3be01d087848e2
+  checksum: 10c0/39117e346ff8ebd87ae1510b3a77d5d92dae5a89bde588c747d25da5c146603a99c8ee588c7ef80faaf123d89ed46f6dbd918d534d641083177d5fac38b8a1cb
   languageName: node
   linkType: hard
 
-"typescript@patch:typescript@npm%3A~5.7.3#optional!builtin<compat/typescript>":
-  version: 5.7.3
-  resolution: "typescript@patch:typescript@npm%3A5.7.3#optional!builtin<compat/typescript>::version=5.7.3&hash=5786d5"
+"typescript@patch:typescript@npm%3A^5.6.0#optional!builtin<compat/typescript>, typescript@patch:typescript@npm%3A~5.9.0#optional!builtin<compat/typescript>":
+  version: 5.9.2
+  resolution: "typescript@patch:typescript@npm%3A5.9.2#optional!builtin<compat/typescript>::version=5.9.2&hash=5786d5"
   bin:
     tsc: bin/tsc
     tsserver: bin/tsserver
-  checksum: 10c0/6fd7e0ed3bf23a81246878c613423730c40e8bdbfec4c6e4d7bf1b847cbb39076e56ad5f50aa9d7ebd89877999abaee216002d3f2818885e41c907caaa192cc4
+  checksum: 10c0/34d2a8e23eb8e0d1875072064d5e1d9c102e0bdce56a10a25c0b917b8aa9001a9cf5c225df12497e99da107dc379360bc138163c66b55b95f5b105b50578067e
   languageName: node
   linkType: hard
 
@@ -13480,21 +13609,28 @@ __metadata:
   languageName: node
   linkType: hard
 
-"unique-filename@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "unique-filename@npm:3.0.0"
-  dependencies:
-    unique-slug: "npm:^4.0.0"
-  checksum: 10c0/6363e40b2fa758eb5ec5e21b3c7fb83e5da8dcfbd866cc0c199d5534c42f03b9ea9ab069769cc388e1d7ab93b4eeef28ef506ab5f18d910ef29617715101884f
+"unicorn-magic@npm:^0.1.0":
+  version: 0.1.0
+  resolution: "unicorn-magic@npm:0.1.0"
+  checksum: 10c0/e4ed0de05b0a05e735c7d8a2930881e5efcfc3ec897204d5d33e7e6247f4c31eac92e383a15d9a6bccb7319b4271ee4bea946e211bf14951fec6ff2cbbb66a92
   languageName: node
   linkType: hard
 
-"unique-slug@npm:^4.0.0":
+"unique-filename@npm:^4.0.0":
   version: 4.0.0
-  resolution: "unique-slug@npm:4.0.0"
+  resolution: "unique-filename@npm:4.0.0"
+  dependencies:
+    unique-slug: "npm:^5.0.0"
+  checksum: 10c0/38ae681cceb1408ea0587b6b01e29b00eee3c84baee1e41fd5c16b9ed443b80fba90c40e0ba69627e30855570a34ba8b06702d4a35035d4b5e198bf5a64c9ddc
+  languageName: node
+  linkType: hard
+
+"unique-slug@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "unique-slug@npm:5.0.0"
   dependencies:
     imurmurhash: "npm:^0.1.4"
-  checksum: 10c0/cb811d9d54eb5821b81b18205750be84cb015c20a4a44280794e915f5a0a70223ce39066781a354e872df3572e8155c228f43ff0cce94c7cbf4da2cc7cbdd635
+  checksum: 10c0/d324c5a44887bd7e105ce800fcf7533d43f29c48757ac410afd42975de82cc38ea2035c0483f4de82d186691bf3208ef35c644f73aa2b1b20b8e651be5afd293
   languageName: node
   linkType: hard
 
@@ -13507,13 +13643,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"universalify@npm:^0.2.0":
-  version: 0.2.0
-  resolution: "universalify@npm:0.2.0"
-  checksum: 10c0/cedbe4d4ca3967edf24c0800cfc161c5a15e240dac28e3ce575c689abc11f2c81ccc6532c8752af3b40f9120fb5e454abecd359e164f4f6aa44c29cd37e194fe
-  languageName: node
-  linkType: hard
-
 "universalify@npm:^2.0.0":
   version: 2.0.1
   resolution: "universalify@npm:2.0.1"
@@ -13538,26 +13667,35 @@ __metadata:
   languageName: node
   linkType: hard
 
-"unrs-resolver@npm:^1.3.2":
-  version: 1.3.2
-  resolution: "unrs-resolver@npm:1.3.2"
+"unrs-resolver@npm:^1.7.11":
+  version: 1.11.1
+  resolution: "unrs-resolver@npm:1.11.1"
   dependencies:
-    "@unrs/resolver-binding-darwin-arm64": "npm:1.3.2"
-    "@unrs/resolver-binding-darwin-x64": "npm:1.3.2"
-    "@unrs/resolver-binding-freebsd-x64": "npm:1.3.2"
-    "@unrs/resolver-binding-linux-arm-gnueabihf": "npm:1.3.2"
-    "@unrs/resolver-binding-linux-arm-musleabihf": "npm:1.3.2"
-    "@unrs/resolver-binding-linux-arm64-gnu": "npm:1.3.2"
-    "@unrs/resolver-binding-linux-arm64-musl": "npm:1.3.2"
-    "@unrs/resolver-binding-linux-ppc64-gnu": "npm:1.3.2"
-    "@unrs/resolver-binding-linux-s390x-gnu": "npm:1.3.2"
-    "@unrs/resolver-binding-linux-x64-gnu": "npm:1.3.2"
-    "@unrs/resolver-binding-linux-x64-musl": "npm:1.3.2"
-    "@unrs/resolver-binding-wasm32-wasi": "npm:1.3.2"
-    "@unrs/resolver-binding-win32-arm64-msvc": "npm:1.3.2"
-    "@unrs/resolver-binding-win32-ia32-msvc": "npm:1.3.2"
-    "@unrs/resolver-binding-win32-x64-msvc": "npm:1.3.2"
+    "@unrs/resolver-binding-android-arm-eabi": "npm:1.11.1"
+    "@unrs/resolver-binding-android-arm64": "npm:1.11.1"
+    "@unrs/resolver-binding-darwin-arm64": "npm:1.11.1"
+    "@unrs/resolver-binding-darwin-x64": "npm:1.11.1"
+    "@unrs/resolver-binding-freebsd-x64": "npm:1.11.1"
+    "@unrs/resolver-binding-linux-arm-gnueabihf": "npm:1.11.1"
+    "@unrs/resolver-binding-linux-arm-musleabihf": "npm:1.11.1"
+    "@unrs/resolver-binding-linux-arm64-gnu": "npm:1.11.1"
+    "@unrs/resolver-binding-linux-arm64-musl": "npm:1.11.1"
+    "@unrs/resolver-binding-linux-ppc64-gnu": "npm:1.11.1"
+    "@unrs/resolver-binding-linux-riscv64-gnu": "npm:1.11.1"
+    "@unrs/resolver-binding-linux-riscv64-musl": "npm:1.11.1"
+    "@unrs/resolver-binding-linux-s390x-gnu": "npm:1.11.1"
+    "@unrs/resolver-binding-linux-x64-gnu": "npm:1.11.1"
+    "@unrs/resolver-binding-linux-x64-musl": "npm:1.11.1"
+    "@unrs/resolver-binding-wasm32-wasi": "npm:1.11.1"
+    "@unrs/resolver-binding-win32-arm64-msvc": "npm:1.11.1"
+    "@unrs/resolver-binding-win32-ia32-msvc": "npm:1.11.1"
+    "@unrs/resolver-binding-win32-x64-msvc": "npm:1.11.1"
+    napi-postinstall: "npm:^0.3.0"
   dependenciesMeta:
+    "@unrs/resolver-binding-android-arm-eabi":
+      optional: true
+    "@unrs/resolver-binding-android-arm64":
+      optional: true
     "@unrs/resolver-binding-darwin-arm64":
       optional: true
     "@unrs/resolver-binding-darwin-x64":
@@ -13574,6 +13712,10 @@ __metadata:
       optional: true
     "@unrs/resolver-binding-linux-ppc64-gnu":
       optional: true
+    "@unrs/resolver-binding-linux-riscv64-gnu":
+      optional: true
+    "@unrs/resolver-binding-linux-riscv64-musl":
+      optional: true
     "@unrs/resolver-binding-linux-s390x-gnu":
       optional: true
     "@unrs/resolver-binding-linux-x64-gnu":
@@ -13588,7 +13730,14 @@ __metadata:
       optional: true
     "@unrs/resolver-binding-win32-x64-msvc":
       optional: true
-  checksum: 10c0/f9b6d18193bcaae7ef9e284a74c85d4cb3d8c833851f1b23254a947297e672826223d82798dbff818455fefeda02084340aca904300fd5060468c2f243767cc1
+  checksum: 10c0/c91b112c71a33d6b24e5c708dab43ab80911f2df8ee65b87cd7a18fb5af446708e98c4b415ca262026ad8df326debcc7ca6a801b2935504d87fd6f0b9d70dce1
+  languageName: node
+  linkType: hard
+
+"until-async@npm:^3.0.2":
+  version: 3.0.2
+  resolution: "until-async@npm:3.0.2"
+  checksum: 10c0/61c8b03895dbe18fe3d90316d0a1894e0c131ea4b1673f6ce78eed993d0bb81bbf4b7adf8477e9ff7725782a76767eed9d077561cfc9f89b4a1ebe61f7c9828e
   languageName: node
   linkType: hard
 
@@ -13622,16 +13771,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"url-parse@npm:^1.5.3":
-  version: 1.5.10
-  resolution: "url-parse@npm:1.5.10"
-  dependencies:
-    querystringify: "npm:^2.1.1"
-    requires-port: "npm:^1.0.0"
-  checksum: 10c0/bd5aa9389f896974beb851c112f63b466505a04b4807cea2e5a3b7092f6fbb75316f0491ea84e44f66fed55f1b440df5195d7e3a8203f64fcefa19d182f5be87
-  languageName: node
-  linkType: hard
-
 "use-composed-ref@npm:^1.3.0":
   version: 1.3.0
   resolution: "use-composed-ref@npm:1.3.0"
@@ -13642,11 +13781,11 @@ __metadata:
   linkType: hard
 
 "use-debounce@npm:^10.0.0":
-  version: 10.0.5
-  resolution: "use-debounce@npm:10.0.5"
+  version: 10.0.6
+  resolution: "use-debounce@npm:10.0.6"
   peerDependencies:
     react: "*"
-  checksum: 10c0/8232538aa2e2b1252716ef2918204709f16bd53661b56a3a29ad790bf61bc7cbf3bb1126d888408db276a2b05fa6a941e9452149be14bfe438aa22054ccf4e4a
+  checksum: 10c0/f0745de48fc344e6f90ea24384f3c79bf0733d06649827241135847abd67ee8db32f523d490c3276bce9f5a6867194ab1c0187bf6b84cabe1dd679037f4a527e
   languageName: node
   linkType: hard
 
@@ -13709,12 +13848,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"uuid@npm:^11.0.0":
-  version: 11.1.0
-  resolution: "uuid@npm:11.1.0"
+"uuid@npm:^13.0.0":
+  version: 13.0.0
+  resolution: "uuid@npm:13.0.0"
   bin:
-    uuid: dist/esm/bin/uuid
-  checksum: 10c0/34aa51b9874ae398c2b799c88a127701408cd581ee89ec3baa53509dd8728cbb25826f2a038f9465f8b7be446f0fbf11558862965b18d21c993684297628d4d3
+    uuid: dist-node/bin/uuid
+  checksum: 10c0/950e4c18d57fef6c69675344f5700a08af21e26b9eff2bf2180427564297368c538ea11ac9fb2e6528b17fc3966a9fd2c5049361b0b63c7d654f3c550c9b3d67
   languageName: node
   linkType: hard
 
@@ -13732,9 +13871,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"vite-node@npm:3.2.1":
-  version: 3.2.1
-  resolution: "vite-node@npm:3.2.1"
+"vite-node@npm:3.2.4":
+  version: 3.2.4
+  resolution: "vite-node@npm:3.2.4"
   dependencies:
     cac: "npm:^6.7.14"
     debug: "npm:^4.4.1"
@@ -13743,26 +13882,7 @@ __metadata:
     vite: "npm:^5.0.0 || ^6.0.0 || ^7.0.0-0"
   bin:
     vite-node: vite-node.mjs
-  checksum: 10c0/e196bc4660baed4f18530b43ce896017adbe480c329f03ac72d2237788ddeaca50904e9e9a4fb8e65300d088ff2737227a00c0e3bae697067acebcd8f08f7faa
-  languageName: node
-  linkType: hard
-
-"vite-plugin-environment@npm:^1.1.3":
-  version: 1.1.3
-  resolution: "vite-plugin-environment@npm:1.1.3"
-  peerDependencies:
-    vite: ">= 2.7"
-  checksum: 10c0/225986450220bdc6b109be4d05deeb94013d41cc235fe3064bd6c5a1b33c047ba59cac3a34aa240ae735fee6a77ab9ce033053c5ab7c152497bd7136bd3f3a6d
-  languageName: node
-  linkType: hard
-
-"vite-plugin-full-reload@npm:^1.1.0":
-  version: 1.1.0
-  resolution: "vite-plugin-full-reload@npm:1.1.0"
-  dependencies:
-    picocolors: "npm:^1.0.0"
-    picomatch: "npm:^2.3.1"
-  checksum: 10c0/f33ccb4c58051e43b7d261d60f0078c0e28c49631dd86218cfa1902e0a61f038d1f6839f64a4fb95da0445720612d75656eb9b3d13c8b50d336e2548251c54b8
+  checksum: 10c0/6ceca67c002f8ef6397d58b9539f80f2b5d79e103a18367288b3f00a8ab55affa3d711d86d9112fce5a7fa658a212a087a005a045eb8f4758947dd99af2a6c6b
   languageName: node
   linkType: hard
 
@@ -13773,9 +13893,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"vite-plugin-pwa@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "vite-plugin-pwa@npm:1.0.0"
+"vite-plugin-pwa@npm:^1.0.2":
+  version: 1.0.3
+  resolution: "vite-plugin-pwa@npm:1.0.3"
   dependencies:
     debug: "npm:^4.3.6"
     pretty-bytes: "npm:^6.1.1"
@@ -13784,64 +13904,41 @@ __metadata:
     workbox-window: "npm:^7.3.0"
   peerDependencies:
     "@vite-pwa/assets-generator": ^1.0.0
-    vite: ^3.1.0 || ^4.0.0 || ^5.0.0 || ^6.0.0
+    vite: ^3.1.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0
     workbox-build: ^7.3.0
     workbox-window: ^7.3.0
   peerDependenciesMeta:
     "@vite-pwa/assets-generator":
       optional: true
-  checksum: 10c0/284a7a0be50c6ffb742363767951efe76d751183c6b273b576d3d9ffa070e6d48d292f0a564e58dc6fc73cc1bdcdca6f076b7cd47e2e34ddfc28625eb937f3c7
+  checksum: 10c0/03fc24bd12ae4a4130979da4877e3dabddf13d7d6ff2bd68e5e8497a2643b8874a78e6c2502874277ddf2f28593d0a3b025d78af2335bdcc5d2966295784fd46
   languageName: node
   linkType: hard
 
-"vite-plugin-rails@npm:^0.5.0":
-  version: 0.5.0
-  resolution: "vite-plugin-rails@npm:0.5.0"
+"vite-plugin-static-copy@npm:^3.1.1":
+  version: 3.1.3
+  resolution: "vite-plugin-static-copy@npm:3.1.3"
   dependencies:
-    rollup-plugin-gzip: "npm:^3.1.0"
-    vite-plugin-environment: "npm:^1.1.3"
-    vite-plugin-full-reload: "npm:^1.1.0"
-    vite-plugin-manifest-sri: "npm:^0.2.0"
-    vite-plugin-ruby: "npm:^5.0.0"
-    vite-plugin-stimulus-hmr: "npm:^3.0.0"
+    chokidar: "npm:^3.6.0"
+    fs-extra: "npm:^11.3.2"
+    p-map: "npm:^7.0.3"
+    picocolors: "npm:^1.1.1"
+    tinyglobby: "npm:^0.2.15"
   peerDependencies:
-    vite: ">=5.0.0"
-  checksum: 10c0/c1648e87326527ed92339d10f46b7745849a4b1374ed3581410cbd43d9f3ab7aaf4a9285644d2c70a206d8b8330b5949ad69fbe2a2f616b8d8dbec447d75c366
+    vite: ^5.0.0 || ^6.0.0 || ^7.0.0
+  checksum: 10c0/f58bf609246c440b4e3c0db10abf5965658c34ee03e72b94d4fc6ff35fa4568b5baa0fe36057234a4b1e84a9b4b3c2cdbff9f943b9e69d883d3a05353cbf9090
   languageName: node
   linkType: hard
 
-"vite-plugin-ruby@npm:^5.1.0":
-  version: 5.1.1
-  resolution: "vite-plugin-ruby@npm:5.1.1"
+"vite-plugin-svgr@npm:^4.3.0":
+  version: 4.5.0
+  resolution: "vite-plugin-svgr@npm:4.5.0"
   dependencies:
-    debug: "npm:^4.3.4"
-    fast-glob: "npm:^3.3.2"
-  peerDependencies:
-    vite: ">=5.0.0"
-  checksum: 10c0/c14230fef77eb8890897ac71dc56637d49dae8fe5bdb16dcb8fb0d7b7ca068ed30f61940b4ebb0906d03068555156237a84550ec227acde133573078114067ee
-  languageName: node
-  linkType: hard
-
-"vite-plugin-stimulus-hmr@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "vite-plugin-stimulus-hmr@npm:3.0.0"
-  dependencies:
-    debug: "npm:^4.3"
-    stimulus-vite-helpers: "npm:^3.0.0"
-  checksum: 10c0/964e9713a7402cac0b8a868d7075a35a4a5502ffd11d227aa869da85ab07345af6fc725316bcaf241108076acc0151532f8b3fad6a32225bb279a99e383a2a0c
-  languageName: node
-  linkType: hard
-
-"vite-plugin-svgr@npm:^4.2.0":
-  version: 4.2.0
-  resolution: "vite-plugin-svgr@npm:4.2.0"
-  dependencies:
-    "@rollup/pluginutils": "npm:^5.0.5"
+    "@rollup/pluginutils": "npm:^5.2.0"
     "@svgr/core": "npm:^8.1.0"
     "@svgr/plugin-jsx": "npm:^8.1.0"
   peerDependencies:
-    vite: ^2.6.0 || 3 || 4 || 5
-  checksum: 10c0/0a6400f20905f53d08f1ce7d1f22d9a57db403e110e790f80c2e0411a0064a071a36b781f56f6823654f98052219171003f9ea023d4a31d930b4a4fc01776d1f
+    vite: ">=2.6.0"
+  checksum: 10c0/3e1959fec626bb4f5a8ec13ff15bc40ffbc1c0ff38149bebe3f37dc2d67ed1f276f129ff7983e06946cf712e19996affd9d6868aa7d20d8921d1fe4449109b55
   languageName: node
   linkType: hard
 
@@ -13861,26 +13958,26 @@ __metadata:
   languageName: node
   linkType: hard
 
-"vite@npm:^6.3.5":
-  version: 6.3.5
-  resolution: "vite@npm:6.3.5"
+"vite@npm:^5.0.0 || ^6.0.0 || ^7.0.0-0, vite@npm:^7.1.1":
+  version: 7.1.9
+  resolution: "vite@npm:7.1.9"
   dependencies:
     esbuild: "npm:^0.25.0"
-    fdir: "npm:^6.4.4"
+    fdir: "npm:^6.5.0"
     fsevents: "npm:~2.3.3"
-    picomatch: "npm:^4.0.2"
-    postcss: "npm:^8.5.3"
-    rollup: "npm:^4.34.9"
-    tinyglobby: "npm:^0.2.13"
+    picomatch: "npm:^4.0.3"
+    postcss: "npm:^8.5.6"
+    rollup: "npm:^4.43.0"
+    tinyglobby: "npm:^0.2.15"
   peerDependencies:
-    "@types/node": ^18.0.0 || ^20.0.0 || >=22.0.0
+    "@types/node": ^20.19.0 || >=22.12.0
     jiti: ">=1.21.0"
-    less: "*"
+    less: ^4.0.0
     lightningcss: ^1.21.0
-    sass: "*"
-    sass-embedded: "*"
-    stylus: "*"
-    sugarss: "*"
+    sass: ^1.70.0
+    sass-embedded: ^1.70.0
+    stylus: ">=0.54.8"
+    sugarss: ^5.0.0
     terser: ^5.16.0
     tsx: ^4.8.1
     yaml: ^2.4.2
@@ -13912,22 +14009,22 @@ __metadata:
       optional: true
   bin:
     vite: bin/vite.js
-  checksum: 10c0/df70201659085133abffc6b88dcdb8a57ef35f742a01311fc56a4cfcda6a404202860729cc65a2c401a724f6e25f9ab40ce4339ed4946f550541531ced6fe41c
+  checksum: 10c0/f628f903a137c1410232558bde99c223ea00a090bda6af77752c61f912955f0050aac12d3cfe024d08a0f150ff6fab61b3d0be75d634a59b94d49f525392e1f7
   languageName: node
   linkType: hard
 
-"vitest@npm:^3.2.1":
-  version: 3.2.1
-  resolution: "vitest@npm:3.2.1"
+"vitest@npm:^3.2.4":
+  version: 3.2.4
+  resolution: "vitest@npm:3.2.4"
   dependencies:
     "@types/chai": "npm:^5.2.2"
-    "@vitest/expect": "npm:3.2.1"
-    "@vitest/mocker": "npm:3.2.1"
-    "@vitest/pretty-format": "npm:^3.2.1"
-    "@vitest/runner": "npm:3.2.1"
-    "@vitest/snapshot": "npm:3.2.1"
-    "@vitest/spy": "npm:3.2.1"
-    "@vitest/utils": "npm:3.2.1"
+    "@vitest/expect": "npm:3.2.4"
+    "@vitest/mocker": "npm:3.2.4"
+    "@vitest/pretty-format": "npm:^3.2.4"
+    "@vitest/runner": "npm:3.2.4"
+    "@vitest/snapshot": "npm:3.2.4"
+    "@vitest/spy": "npm:3.2.4"
+    "@vitest/utils": "npm:3.2.4"
     chai: "npm:^5.2.0"
     debug: "npm:^4.4.1"
     expect-type: "npm:^1.2.1"
@@ -13938,17 +14035,17 @@ __metadata:
     tinybench: "npm:^2.9.0"
     tinyexec: "npm:^0.3.2"
     tinyglobby: "npm:^0.2.14"
-    tinypool: "npm:^1.1.0"
+    tinypool: "npm:^1.1.1"
     tinyrainbow: "npm:^2.0.0"
     vite: "npm:^5.0.0 || ^6.0.0 || ^7.0.0-0"
-    vite-node: "npm:3.2.1"
+    vite-node: "npm:3.2.4"
     why-is-node-running: "npm:^2.3.0"
   peerDependencies:
     "@edge-runtime/vm": "*"
     "@types/debug": ^4.1.12
     "@types/node": ^18.0.0 || ^20.0.0 || >=22.0.0
-    "@vitest/browser": 3.2.1
-    "@vitest/ui": 3.2.1
+    "@vitest/browser": 3.2.4
+    "@vitest/ui": 3.2.4
     happy-dom: "*"
     jsdom: "*"
   peerDependenciesMeta:
@@ -13968,7 +14065,7 @@ __metadata:
       optional: true
   bin:
     vitest: vitest.mjs
-  checksum: 10c0/1f4128f93fff708fa5bd7d1547a0877c4266466f0f91f5e1dd5d7f09267a0c171cf87c83acd86ebd53e561aa2bcef1311e984b8205370c7f596e6ff5a9c8cd6b
+  checksum: 10c0/5bf53ede3ae6a0e08956d72dab279ae90503f6b5a05298a6a5e6ef47d2fd1ab386aaf48fafa61ed07a0ebfe9e371772f1ccbe5c258dd765206a8218bf2eb79eb
   languageName: node
   linkType: hard
 
@@ -13981,15 +14078,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"warning@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "warning@npm:3.0.0"
-  dependencies:
-    loose-envify: "npm:^1.0.0"
-  checksum: 10c0/6a2a56ab3139d3927193d926a027e74e1449fa47cc692feea95f8a81a4bb5b7f10c312def94cce03f3b58cb26ba3247858e75d17d596451d2c483a62e8204705
-  languageName: node
-  linkType: hard
-
 "warning@npm:^4.0.1, warning@npm:^4.0.3":
   version: 4.0.3
   resolution: "warning@npm:4.0.3"
@@ -14020,10 +14108,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"webidl-conversions@npm:^7.0.0":
-  version: 7.0.0
-  resolution: "webidl-conversions@npm:7.0.0"
-  checksum: 10c0/228d8cb6d270c23b0720cb2d95c579202db3aaf8f633b4e9dd94ec2000a04e7e6e43b76a94509cdb30479bd00ae253ab2371a2da9f81446cc313f89a4213a2c4
+"webidl-conversions@npm:^8.0.0":
+  version: 8.0.0
+  resolution: "webidl-conversions@npm:8.0.0"
+  checksum: 10c0/3244e8a6534163bc3ee5f5f48b507b4bb74e34e7cc7c86a50cd02734753042b88343dae48321f34ad61ddc6b5c90cb1a5b2ee757b8be8e6fadc587a9f3db76cd
   languageName: node
   linkType: hard
 
@@ -14050,13 +14138,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"whatwg-url@npm:^14.0.0, whatwg-url@npm:^14.1.1":
-  version: 14.2.0
-  resolution: "whatwg-url@npm:14.2.0"
+"whatwg-url@npm:^15.0.0":
+  version: 15.0.0
+  resolution: "whatwg-url@npm:15.0.0"
   dependencies:
-    tr46: "npm:^5.1.0"
-    webidl-conversions: "npm:^7.0.0"
-  checksum: 10c0/f746fc2f4c906607d09537de1227b13f9494c171141e5427ed7d2c0dd0b6a48b43d8e71abaae57d368d0c06b673fd8ec63550b32ad5ed64990c7b0266c2b4272
+    tr46: "npm:^5.1.1"
+    webidl-conversions: "npm:^8.0.0"
+  checksum: 10c0/7b4f633fcd8fea6d588fb5694a9c4631382b41d31270e1fb3b755923f2c267d456ea1c7122124689e430b6a4e73c7e43e0731f833b33bfedcfffa2a7b4efbfc0
   languageName: node
   linkType: hard
 
@@ -14127,17 +14215,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"which-typed-array@npm:^1.1.16, which-typed-array@npm:^1.1.18":
-  version: 1.1.18
-  resolution: "which-typed-array@npm:1.1.18"
+"which-typed-array@npm:^1.1.16, which-typed-array@npm:^1.1.19":
+  version: 1.1.19
+  resolution: "which-typed-array@npm:1.1.19"
   dependencies:
     available-typed-arrays: "npm:^1.0.7"
     call-bind: "npm:^1.0.8"
-    call-bound: "npm:^1.0.3"
-    for-each: "npm:^0.3.3"
+    call-bound: "npm:^1.0.4"
+    for-each: "npm:^0.3.5"
+    get-proto: "npm:^1.0.1"
     gopd: "npm:^1.2.0"
     has-tostringtag: "npm:^1.0.2"
-  checksum: 10c0/0412f4a91880ca1a2a63056187c2e3de6b129b2b5b6c17bc3729f0f7041047ae48fb7424813e51506addb2c97320003ee18b8c57469d2cde37983ef62126143c
+  checksum: 10c0/702b5dc878addafe6c6300c3d0af5983b175c75fcb4f2a72dfc3dd38d93cf9e89581e4b29c854b16ea37e50a7d7fca5ae42ece5c273d8060dcd603b2404bbb3f
   languageName: node
   linkType: hard
 
@@ -14163,14 +14252,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"which@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "which@npm:4.0.0"
+"which@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "which@npm:5.0.0"
   dependencies:
     isexe: "npm:^3.1.1"
   bin:
     node-which: bin/which.js
-  checksum: 10c0/449fa5c44ed120ccecfe18c433296a4978a7583bf2391c50abce13f76878d2476defde04d0f79db8165bdf432853c1f8389d0485ca6e8ebce3bbcded513d5e6a
+  checksum: 10c0/e556e4cd8b7dbf5df52408c9a9dd5ac6518c8c5267c8953f5b0564073c66ed5bf9503b14d876d0e9c7844d4db9725fb0dcf45d6e911e17e26ab363dc3965ae7b
   languageName: node
   linkType: hard
 
@@ -14273,7 +14362,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"workbox-expiration@npm:7.3.0, workbox-expiration@npm:^7.0.0":
+"workbox-expiration@npm:7.3.0, workbox-expiration@npm:^7.3.0":
   version: 7.3.0
   resolution: "workbox-expiration@npm:7.3.0"
   dependencies:
@@ -14338,7 +14427,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"workbox-routing@npm:7.3.0, workbox-routing@npm:^7.0.0":
+"workbox-routing@npm:7.3.0, workbox-routing@npm:^7.3.0":
   version: 7.3.0
   resolution: "workbox-routing@npm:7.3.0"
   dependencies:
@@ -14347,7 +14436,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"workbox-strategies@npm:7.3.0, workbox-strategies@npm:^7.0.0":
+"workbox-strategies@npm:7.3.0, workbox-strategies@npm:^7.3.0":
   version: 7.3.0
   resolution: "workbox-strategies@npm:7.3.0"
   dependencies:
@@ -14373,7 +14462,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"workbox-window@npm:7.3.0, workbox-window@npm:^7.0.0, workbox-window@npm:^7.3.0":
+"workbox-window@npm:7.3.0, workbox-window@npm:^7.3.0":
   version: 7.3.0
   resolution: "workbox-window@npm:7.3.0"
   dependencies:
@@ -14501,6 +14590,22 @@ __metadata:
   languageName: node
   linkType: hard
 
+"yallist@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "yallist@npm:5.0.0"
+  checksum: 10c0/a499c81ce6d4a1d260d4ea0f6d49ab4da09681e32c3f0472dee16667ed69d01dae63a3b81745a24bd78476ec4fcf856114cb4896ace738e01da34b2c42235416
+  languageName: node
+  linkType: hard
+
+"yaml@npm:2.8.1":
+  version: 2.8.1
+  resolution: "yaml@npm:2.8.1"
+  bin:
+    yaml: bin.mjs
+  checksum: 10c0/7c587be00d9303d2ae1566e03bc5bc7fe978ba0d9bf39cc418c3139d37929dfcb93a230d9749f2cb578b6aa5d9ebebc322415e4b653cb83acd8bc0bc321707f3
+  languageName: node
+  linkType: hard
+
 "yaml@npm:^1.10.0":
   version: 1.10.2
   resolution: "yaml@npm:1.10.2"
@@ -14508,15 +14613,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"yaml@npm:^2.7.1":
-  version: 2.8.0
-  resolution: "yaml@npm:2.8.0"
-  bin:
-    yaml: bin.mjs
-  checksum: 10c0/f6f7310cf7264a8107e72c1376f4de37389945d2fb4656f8060eca83f01d2d703f9d1b925dd8f39852a57034fafefde6225409ddd9f22aebfda16c6141b71858
-  languageName: node
-  linkType: hard
-
 "yargs-parser@npm:^21.1.1":
   version: 21.1.1
   resolution: "yargs-parser@npm:21.1.1"
@@ -14546,6 +14642,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"yocto-queue@npm:^1.0.0":
+  version: 1.2.1
+  resolution: "yocto-queue@npm:1.2.1"
+  checksum: 10c0/5762caa3d0b421f4bdb7a1926b2ae2189fc6e4a14469258f183600028eb16db3e9e0306f46e8ebf5a52ff4b81a881f22637afefbef5399d6ad440824e9b27f9f
+  languageName: node
+  linkType: hard
+
 "yoctocolors-cjs@npm:^2.1.2":
   version: 2.1.2
   resolution: "yoctocolors-cjs@npm:2.1.2"