Merge branch 'main' into improve-devcontainer-config

.devcontainer/devcontainer-lock.json

@@ -0,0 +1,9 @@
+{
+  "features": {
+    "ghcr.io/devcontainers/features/sshd:1": {
+      "version": "1.1.0",
+      "resolved": "ghcr.io/devcontainers/features/sshd@sha256:f5251b8e4325f68f7280973c6cd65daff414449c66f240621502d4e8e74eb7ee",
+      "integrity": "sha256:f5251b8e4325f68f7280973c6cd65daff414449c66f240621502d4e8e74eb7ee"
+    }
+  }
+}

.github/renovate.json5

@@ -37,6 +37,13 @@
       versioningTemplate: 'semver',
     },
   ],
+  devcontainer: {
+    managerFilePatterns: [
+      '/^\.devcontainer\/devcontainer\.json$/',
+      '/^\.devcontainer\.json$/',
+      '/^\.devcontainer\/devcontainer-lock\.json$/',
+    ],
+  },
   // The types are now included in recent versions,we ignore them here until we upgrade and remove the dependency
   ignoreDeps: ['@types/emoji-mart'],
   packageRules: [

.github/workflows/codeql.yml

@@ -36,7 +36,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@7211b7c8077ea37d8641b6271f6a365a22a5fbfa # v4
+        uses: github/codeql-action/init@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -49,7 +49,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, Go, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@7211b7c8077ea37d8641b6271f6a365a22a5fbfa # v4
+        uses: github/codeql-action/autobuild@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -62,6 +62,6 @@ jobs:
       #   ./location_of_script_within_repo/buildscript.sh
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@7211b7c8077ea37d8641b6271f6a365a22a5fbfa # v4
+        uses: github/codeql-action/analyze@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4
         with:
           category: '/language:${{matrix.language}}'

.github/workflows/crowdin-download-stable.yml

@@ -24,7 +24,7 @@ jobs:
 
       # Download the translation files from Crowdin
       - name: crowdin action
-        uses: crowdin/github-action@8868a33591d21088edfc398968173a3b98d51706 # v2
+        uses: crowdin/github-action@52aa776766211d83d975df51f3b9c53c2f8ba35f # v2
         with:
           upload_sources: false
           upload_translations: false

.github/workflows/crowdin-download.yml

@@ -26,7 +26,7 @@ jobs:
 
       # Download the translation files from Crowdin
       - name: crowdin action
-        uses: crowdin/github-action@8868a33591d21088edfc398968173a3b98d51706 # v2
+        uses: crowdin/github-action@52aa776766211d83d975df51f3b9c53c2f8ba35f # v2
         with:
           upload_sources: false
           upload_translations: false

.github/workflows/crowdin-upload.yml

@@ -26,7 +26,7 @@ jobs:
         uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
 
       - name: crowdin action
-        uses: crowdin/github-action@8868a33591d21088edfc398968173a3b98d51706 # v2
+        uses: crowdin/github-action@52aa776766211d83d975df51f3b9c53c2f8ba35f # v2
         with:
           upload_sources: true
           upload_translations: false

CHANGELOG.md

@@ -2,11 +2,11 @@
 
 All notable changes to this project will be documented in this file.
 
-## [4.6.0] - UNRELEASED
+## [4.6.0] - 2026-06-17
 
 ### Added
 
-- **Add collections** (#37992, #37005, #37049, #37020, #37053, #37110, #37117, #37122, #37154, #37157, #37176, #37192, #37222, #37225, #37254, #37277, #37298, #37322, #37434, #37468, #37514, #37512, #37549, #37556, #37560, #37580, #37591, #37552, #37618, #37643, #37658, #37731, #37678, #37741, #37762, #37790, #37805, #37823, #37837, #37842, #37850, #37848, #37812, #37950, #37898, #37916, #37920, #37927, #37928, #37961, #37967, #37974, #37989, #37986, #38004, #38026, #38027, #38030, #38038, #38065, #38081, #38082, #38096, #38106, #38113, #38124, #38133, #38144, #38153, #38166, #38167, #38169, #38170, #38177, #38193, #38213, #38251, #38255, #38256, #38282, #38298, #38292, #38307, #38306, #38316, #38115, #38329, #38334, #38337, #38351, #38368, #38370, #38356, #38383, #38386, #38385, #38394, #38393, #38399, #38402, #38409, #38414, #38413, #38424, #38425, #38450, #38508, #38528, #38534, #38536, #38540, #38543, #38491, #38586, #38611, #38588, #38612, #38628, #38626, #38630, #38633, #38629, #38638, #38645, #38644, #38636, #38660, #38657, #38688, #38690, #38672, #38698, #38697, #38708, #38712, #38713, #38709, #38719, #38728, #38730, #38732, #38739, #38749, #38751, #38750, #38767, #38769, #38783, #38785, #38959, #38786, #38794, #38776, #38817, #38792, #38822, #38827, #38831, #38830, #38844, #38843, #38852, #38850, #38847, #38865, #38897, #38900, #38919, #38933, #38934, #38935, #38942, #38941, #38954, #38961, #38957, #38962, #38991, #39009, #39062, #39029, #39069, #39020, #39073, #39082, #39096, #39080, #39182, #39143, #39127, #37929, #38029, #39194, #39198, #39210, #39211, #39202, #39214, #39215, #39220, #39234, #39260, #39251, #39361, #39357, #39349, #39287, #39376, #39289, #39342, #38711, #39379, #39282, #39286, #39296, #39047, #39346, #39373, #39372 by @ChaosExAnima, @ClearlyClaire, @Gargron, @arte7, @diondiondion, @mjankowski, @oneiros, and @shleeable)
+- **Add collections** (#37992, #37005, #37049, #37020, #37053, #37110, #37117, #37122, #37154, #37157, #37176, #37192, #37222, #37225, #37254, #37277, #37298, #37322, #37434, #37468, #37514, #37512, #37549, #37556, #37560, #37580, #37591, #37552, #37618, #37643, #37658, #37731, #37678, #37741, #37762, #37790, #37805, #37823, #37837, #37842, #37850, #37848, #37812, #37950, #37898, #37916, #37920, #37927, #37928, #37961, #37967, #37974, #37989, #37986, #38004, #38026, #38027, #38030, #38038, #38065, #38081, #38082, #38096, #38106, #38113, #38124, #38133, #38144, #38153, #38166, #38167, #38169, #38170, #38177, #38193, #38213, #38251, #38255, #38256, #38282, #38298, #38292, #38307, #38306, #38316, #38115, #38329, #38334, #38337, #38351, #38368, #38370, #38356, #38383, #38386, #38385, #38394, #38393, #38399, #38402, #38409, #38414, #38413, #38424, #38425, #38450, #38508, #38528, #38534, #38536, #38540, #38543, #38491, #38586, #38611, #38588, #38612, #38628, #38626, #38630, #38633, #38629, #38638, #38645, #38644, #38636, #38660, #38657, #38688, #38690, #38672, #38698, #38697, #38708, #38712, #38713, #38709, #38719, #38728, #38730, #38732, #38739, #38749, #38751, #38750, #38767, #38769, #38783, #38785, #38959, #38786, #38794, #38776, #38817, #38792, #38822, #38827, #38831, #38830, #38844, #38843, #38852, #38850, #38847, #38865, #38897, #38900, #38919, #38933, #38934, #38935, #38942, #38941, #38954, #38961, #38957, #38962, #38991, #39009, #39062, #39029, #39069, #39020, #39073, #39082, #39096, #39080, #39182, #39143, #39127, #37929, #38029, #39194, #39198, #39210, #39211, #39202, #39214, #39215, #39220, #39234, #39260, #39251, #39361, #39357, #39349, #39287, #39376, #39289, #39342, #38711, #39379, #39282, #39286, #39296, #39047, #39346, #39373, #39372, #39429, and #39457 by @ChaosExAnima, @ClearlyClaire, @Gargron, @arte7, @diondiondion, @mjankowski, @oneiros, and @shleeable)
   - Create collections with up to 25 accounts each, then share them with others. You can read more about this feature [on our blog](https://blog.joinmastodon.org/2026/04/designing-collections/). This is based on FEP-7aa9 (Featured Collections) to be interoperable with the wider Fediverse. All the new API methods [are documented here](https://docs.joinmastodon.org/client/collections/).
 - **Add email subscriptions** (#38163, #38507, #38502, #38487, #38527, #38582, #38741, #38907, #39162, #39271 by @ClearlyClaire and @Gargron)
   - Admins can allow specific roles to enable email subscriptions on their profile, allowing anonymous visitors to subscribe to their posts via email.
@@ -27,7 +27,7 @@ All notable changes to this project will be documented in this file.
 - Add fallback attributes to notifications for new and infrequent notifications in REST API (#38832 and #38860 by @ClearlyClaire)
   - This adds a [`supported_types`](https://docs.joinmastodon.org/methods/notifications/#query-parameters-1) parameter to `GET /api/v1/notifications`, `GET /api/v1/notifications/:id`, `GET /api/v2/notifications`, and `GET /api/v2/notifications/:group_key` along with a new `fallback` attribute for notifications and notification groups.
 - Add support for posts in vertical languages in web UI (#37204, #38205, and #38797 by @shimon1024)
-- Add `PageUp` and `PageDown` hotkeys for list navigation (#39252 by @diondiondion)
+- Add `Alt` + `PageUp` and `Alt` + `PageDown` hotkeys for list navigation (#39252 and #39427 by @diondiondion)
 - Add `g`+`e` keyboard shortcut to access the trending page in web UI (#38014 by @antoinecellerier)
 - Add `Cmd`/`Ctrl`+`Enter` for form submissions in more text areas in web UI (#37821 by @diondiondion)
 - Add support for quoting by dragging a link into the compose form in web UI (#36859 and #36896 by @ClearlyClaire and @tribela)
@@ -47,7 +47,7 @@ All notable changes to this project will be documented in this file.
 
 ### Changed
 
-- **Change design of profiles in web UI** (#37472, #37490, #37479, #37513, #37527, #37550, #37538, #37632, #37627, #37593, #37638, #37626, #37645, #37653, #37683, #37707, #37682, #37742, #37747, #37760, #37761, #37831, #37766, #37811, #37813, #37825, #37854, #37851, #37876, #37885, #37892, #37890, #37907, #37922, #37952, #37958, #37996, #37990, #37994, #38005, #38012, #38040, #38052, #38066, #38083, #38147, #38148, #38152, #38168, #38156, #38175, #38191, #38189, #38235, #38283, #38310, #38309, #38315, #38314, #38365, #38366, #38363, #38346, #38382, #38384, #38400, #38404, #38417, #38426, #38440, #38442, #38443, #38445, #38446, #38451, #38456, #38509, #38510, #38512, #38513, #38517, #38529, #38531, #38535, #38532, #38544, #38549, #38575, #38579, #38580, #38581, #38585, #38584, #38604, #38605, #38606, #38607, #38622, #38616, #38625, #38632, #38640, #38663, #38667, #38646, #38691, #38692, #38766, #38791, #38687, #38826, #38828, #38863, #38845, #38870, #38872, #38932, #38945, #38963, #38964, #39055, #39042, #38893, #39079, #39084, #39160, #39070, #39217, #39309, #39354, #39324, #39387 by @ChaosExAnima, @ClearlyClaire, @Coro365, @diondiondion, and @shleeable)
+- **Change design of profiles in web UI** (#37472, #37490, #37479, #37513, #37527, #37550, #37538, #37632, #37627, #37593, #37638, #37626, #37645, #37653, #37683, #37707, #37682, #37742, #37747, #37760, #37761, #37831, #37766, #37811, #37813, #37825, #37854, #37851, #37876, #37885, #37892, #37890, #37907, #37922, #37952, #37958, #37996, #37990, #37994, #38005, #38012, #38040, #38052, #38066, #38083, #38147, #38148, #38152, #38168, #38156, #38175, #38191, #38189, #38235, #38283, #38310, #38309, #38315, #38314, #38365, #38366, #38363, #38346, #38382, #38384, #38400, #38404, #38417, #38426, #38440, #38442, #38443, #38445, #38446, #38451, #38456, #38509, #38510, #38512, #38513, #38517, #38529, #38531, #38535, #38532, #38544, #38549, #38575, #38579, #38580, #38581, #38585, #38584, #38604, #38605, #38606, #38607, #38622, #38616, #38625, #38632, #38640, #38663, #38667, #38646, #38691, #38692, #38766, #38791, #38687, #38826, #38828, #38863, #38845, #38870, #38872, #38932, #38945, #38963, #38964, #39055, #39042, #38893, #39079, #39084, #39160, #39070, #39217, #39309, #39354, #39324, #39387, #39452, #39467 by @ChaosExAnima, @ClearlyClaire, @Coro365, @diondiondion, and @shleeable)
   - The profile screen has been entirely redesigned, has new features, and allows you to update your own profile directly without going into the preferences panel. You can read more about it [on our blog](https://blog.joinmastodon.org/2026/03/a-redesign-for-profiles/).
 - **Change how #Wrapstodon reports are generated and displayed** (#37033, #37045, #37093, #37055, #37096, #37047, #37103, #37104, #37106, #37109, #37121, #37138, #37134, #37177, #37182, #37169, #37186, #37187, #37188, #37189, #37190, #37193, #37198, #37201, #37203, #37205, #37206, #37207, #37209, #37202, #37216, #37219, #37224, #37226, #37229, #37249, #37251, #37256, #37261, #37269, #37270, #37273, and #37289 by @ChaosExAnima, @ClearlyClaire, @channyeintun, and @diondiondion)
   - This finishes up work started in 2024 by completely revamping how Wrapstodon reports are generated and displayed, reducing the amount of data collected and generating reports when active users ask for them.
@@ -55,9 +55,10 @@ All notable changes to this project will be documented in this file.
   - The design of the Wrapstodon report has also been fully reworked to be more delightful and easier to share!
   - The relevant API endpoints are documented at https://docs.joinmastodon.org/methods/annual_reports/
 - Change limitation to allow posts with both media and a poll to be created (#39203, #39368, #39388 by @ClearlyClaire and @Gargron)
+- Change account display name length limit from 30 to 40 characters (#39458 by @mjankowski)
 - Change alt text limit for media attachments to 10,000 characters (#39306 by @ClearlyClaire)
 - Change pending user notification email to link directly to the pending account (#39206 by @vmstan)
-- Changed emoji processing in web UI to make it less resource intensive and more robust (#39077, #39008, #39088, #38892, #38885, #38965, #38854, #38825, #38784, #38541, #37442, #37300, #37306, #37271, #37255, #37284, #37272, #37178, #37084, #37080, #37418, #39167, #39126, #39353, #39378, #39382 by @ChaosExAnima, @ClearlyClaire, @diondiondion, and @gomasy)
+- Changed emoji processing in web UI to make it less resource intensive and more robust (#39077, #39008, #39088, #38892, #38885, #38965, #38854, #38825, #38784, #38541, #37442, #37300, #37306, #37271, #37255, #37284, #37272, #37178, #37084, #37080, #37418, #39167, #39126, #39353, #39378, #39382, #39402, and #39421 by @ChaosExAnima, @ClearlyClaire, @diondiondion, @gomasy, and @Hanage999)
 - Change composer textarea to have a limited height to prevent column scrolling (#39268 by @diondiondion)
 - Change mentions of “Mastodon gGmbH” to “Mastodon GmbH” (#39261 by @renchap)
 - Change the limited profile message to be less misleading (#39231 by @mortie)
@@ -102,7 +103,10 @@ All notable changes to this project will be documented in this file.
 
 ### Fixed
 
-- Fix accessibility issues in web UI (#37250, #38006, #38033, #38188, #38230, #38252, #38257, #38285, #38293, #38362, #38387, #38459, #38796, #38801, #39098, #39111, #39120, #39129, #39133, #39134, #39144, #39145, #39149, #39164, #39165, #39169, #39181, #39335, #39305, #39331, #39356, #39350, #39358, #39360, #39325, #39270 by @ChaosExAnima and @diondiondion)
+- Fix accessibility issues in web UI (#37250, #38006, #38033, #38188, #38230, #38252, #38257, #38285, #38293, #38362, #38387, #38459, #38796, #38801, #39098, #39111, #39120, #39129, #39133, #39134, #39144, #39145, #39149, #39164, #39165, #39169, #39181, #39335, #39305, #39331, #39356, #39350, #39358, #39360, #39325, #39270, #39439, #39400, and #39408 by @ChaosExAnima and @diondiondion)
+- Fix report modal heading being impossible to translate properly in some languages (#39457 by @diondiondion)
+- Fix being unable to edit an attachment twice without submitting (#39453 by @ClearlyClaire)
+- Fix error with audio player in Safari Lockdown Mode (#39397 by @Federicorao)
 - Fix tiny checkboxes and radio buttons in Safari (#39332 by @diondiondion)
 - Fix handling of offset in timezone list in settings (#39334 by @mjankowski)
 - Fix being unable to unmark media as sensitive when "always mark media as sensitive" is enabled in web UI (#39339 by @matrix07012)
@@ -110,6 +114,7 @@ All notable changes to this project will be documented in this file.
 - Fix some inputs incorrectly having resize handles in Firefox (#39274 by @diondiondion)
 - Fix processing some link previews where text is language-tagged (#39190 by @zunda)
 - Fix error when “New trends” email is sent at the same time trends are recomputed (#39122 by @arte7)
+- Fix hovercard not showing in compose column (#39430 by @diondiondion)
 - Fix hover card opening even when not preceded by mouse movement in web UI (#39166, #39381 by @diondiondion)
 - Fix [ominous](https://mastodon.social/@mcc/116404362104299129) "Moments remaining" timestamp in web UI (#38488 and #38689 by @ChaosExAnima and @MitarashiDango)
 - Fix filters not being applied to search results in web UI (#36346 by @ClearlyClaire)

Gemfile.lock

@@ -134,7 +134,7 @@ GEM
     blurhash (0.1.8)
     bootsnap (1.24.6)
       msgpack (~> 1.2)
-    brakeman (8.0.4)
+    brakeman (8.0.5)
       racc
     browser (6.2.0)
     builder (3.3.0)
@@ -304,8 +304,8 @@ GEM
       json
     highline (3.1.2)
       reline
-    hiredis-client (0.29.0)
-      redis-client (= 0.29.0)
+    hiredis-client (0.30.0)
+      redis-client (= 0.30.0)
     hkdf (0.3.0)
     htmlentities (4.4.2)
     http (5.3.1)
@@ -353,7 +353,7 @@ GEM
       azure-blob (~> 0.5.2)
       hashie (~> 5.0)
     jmespath (1.6.2)
-    json (2.19.8)
+    json (2.19.9)
     json-canonicalization (1.0.0)
     json-jwt (1.17.1)
       activesupport (>= 4.2)
@@ -456,7 +456,7 @@ GEM
     mutex_m (0.3.0)
     net-http (0.9.1)
       uri (>= 0.11.1)
-    net-imap (0.6.4)
+    net-imap (0.6.4.1)
       date
       net-protocol
     net-ldap (0.20.0)
@@ -707,7 +707,7 @@ GEM
     redcarpet (3.6.1)
     redis (5.4.1)
       redis-client (>= 0.22.0)
-    redis-client (0.29.0)
+    redis-client (0.30.0)
       connection_pool
     regexp_parser (2.12.0)
     reline (0.6.3)
@@ -802,7 +802,7 @@ GEM
     ruby-vips (2.3.0)
       ffi (~> 1.12)
       logger
-    rubyzip (3.3.1)
+    rubyzip (3.4.0)
     rufus-scheduler (3.9.2)
       fugit (~> 1.1, >= 1.11.1)
     safety_net_attestation (0.5.0)
@@ -814,8 +814,8 @@ GEM
       activerecord (>= 4.0.0)
       railties (>= 4.0.0)
     securerandom (0.4.1)
-    shoulda-matchers (7.0.1)
-      activesupport (>= 7.1)
+    shoulda-matchers (8.0.1)
+      activesupport (>= 7.2)
     sidekiq (8.1.6)
       connection_pool (>= 3.0.0)
       json (>= 2.16.0)

SECURITY.md

@@ -13,8 +13,9 @@ A "vulnerability in Mastodon" is a vulnerability in the code distributed through
 
 ## Supported Versions
 
-| Version | Supported |
-| ------- | --------- |
-| 4.5.x   | Yes       |
-| 4.4.x   | Yes       |
-| < 4.4   | No        |
+| Version | Supported        |
+| ------- | ---------------- |
+| 4.6.0   | Yes              |
+| 4.5.x   | Yes              |
+| 4.4.x   | Until 2026-12-17 |
+| < 4.4   | No               |

app/javascript/mastodon/actions/compose.js

@@ -61,10 +61,6 @@ export const COMPOSE_LANGUAGE_CHANGE     = 'COMPOSE_LANGUAGE_CHANGE';
 
 export const COMPOSE_EMOJI_INSERT = 'COMPOSE_EMOJI_INSERT';
 
-export const COMPOSE_UPLOAD_CHANGE_REQUEST     = 'COMPOSE_UPLOAD_UPDATE_REQUEST';
-export const COMPOSE_UPLOAD_CHANGE_SUCCESS     = 'COMPOSE_UPLOAD_UPDATE_SUCCESS';
-export const COMPOSE_UPLOAD_CHANGE_FAIL        = 'COMPOSE_UPLOAD_UPDATE_FAIL';
-
 export const COMPOSE_POLL_ADD             = 'COMPOSE_POLL_ADD';
 export const COMPOSE_POLL_REMOVE          = 'COMPOSE_POLL_REMOVE';
 export const COMPOSE_POLL_OPTION_ADD      = 'COMPOSE_POLL_OPTION_ADD';
@@ -461,58 +457,6 @@ export function onChangeMediaFocus(focusX, focusY) {
   };
 }
 
-export function changeUploadCompose(id, params) {
-  return (dispatch, getState) => {
-    dispatch(changeUploadComposeRequest());
-
-    let media = getState().getIn(['compose', 'media_attachments']).find((item) => item.get('id') === id);
-
-    // Editing already-attached media is deferred to editing the post itself.
-    // For simplicity's sake, fake an API reply.
-    if (media && !media.get('unattached')) {
-      const { focus, ...other } = params;
-      const data = { ...media.toJS(), ...other };
-
-      if (focus) {
-        const [x, y] = focus.split(',');
-        data.meta = { focus: { x: parseFloat(x), y: parseFloat(y) } };
-      }
-
-      dispatch(changeUploadComposeSuccess(data, true));
-    } else {
-      api().put(`/api/v1/media/${id}`, params).then(response => {
-        dispatch(changeUploadComposeSuccess(response.data, false));
-      }).catch(error => {
-        dispatch(changeUploadComposeFail(id, error));
-      });
-    }
-  };
-}
-
-export function changeUploadComposeRequest() {
-  return {
-    type: COMPOSE_UPLOAD_CHANGE_REQUEST,
-    skipLoading: true,
-  };
-}
-
-export function changeUploadComposeSuccess(media, attached) {
-  return {
-    type: COMPOSE_UPLOAD_CHANGE_SUCCESS,
-    media: media,
-    attached: attached,
-    skipLoading: true,
-  };
-}
-
-export function changeUploadComposeFail(error) {
-  return {
-    type: COMPOSE_UPLOAD_CHANGE_FAIL,
-    error: error,
-    skipLoading: true,
-  };
-}
-
 export function uploadComposeRequest() {
   return {
     type: COMPOSE_UPLOAD_REQUEST,

app/javascript/mastodon/actions/compose_typed.ts

@@ -49,7 +49,7 @@ const messages = defineMessages({
 });
 
 type SimulatedMediaAttachmentJSON = ApiMediaAttachmentJSON & {
-  unattached?: boolean;
+  attached?: boolean;
 };
 
 const simulateModifiedApiResponse = (
@@ -67,7 +67,8 @@ const simulateModifiedApiResponse = (
         y: parseFloat(y ?? '0'),
       },
     },
-  } as unknown as SimulatedMediaAttachmentJSON;
+    attached: true,
+  } as SimulatedMediaAttachmentJSON;
 
   return data;
 };
@@ -137,7 +138,7 @@ export const changeUploadCompose = createDataLoadingThunk(
   (media: SimulatedMediaAttachmentJSON) => {
     return {
       media,
-      attached: typeof media.unattached !== 'undefined' && !media.unattached,
+      attached: typeof media.attached !== 'undefined' && media.attached,
     };
   },
   {

app/javascript/mastodon/components/__tests__/__snapshots__/avatar-test.jsx.snap

@@ -2,20 +2,11 @@
 
 exports[`<Avatar /> > Autoplay > renders a animated avatar 1`] = `
 <span
-  className="account__avatar account__avatar--loading"
-  onMouseEnter={[Function]}
-  onMouseLeave={[Function]}
-  style={
-    {
-      "height": "100px",
-      "width": "100px",
-    }
-  }
+  class="account__avatar account__avatar--loading"
+  style="width: 100px; height: 100px;"
 >
   <img
     alt=""
-    onError={[Function]}
-    onLoad={[Function]}
     src="/animated/alice.gif"
   />
 </span>
@@ -23,20 +14,11 @@ exports[`<Avatar /> > Autoplay > renders a animated avatar 1`] = `
 
 exports[`<Avatar /> > Still > renders a still avatar 1`] = `
 <span
-  className="account__avatar account__avatar--loading"
-  onMouseEnter={[Function]}
-  onMouseLeave={[Function]}
-  style={
-    {
-      "height": "100px",
-      "width": "100px",
-    }
-  }
+  class="account__avatar account__avatar--loading"
+  style="width: 100px; height: 100px;"
 >
   <img
     alt=""
-    onError={[Function]}
-    onLoad={[Function]}
     src="/static/alice.jpg"
   />
 </span>

app/javascript/mastodon/components/__tests__/__snapshots__/avatar_overlay-test.jsx.snap

@@ -2,50 +2,31 @@
 
 exports[`<AvatarOverlay > renders a overlay avatar 1`] = `
 <div
-  className="account__avatar-overlay"
-  onMouseEnter={[Function]}
-  onMouseLeave={[Function]}
-  style={
-    {
-      "height": 46,
-      "width": 46,
-    }
-  }
+  class="account__avatar-overlay"
+  style="width: 46px; height: 46px;"
 >
   <div
-    className="account__avatar-overlay-base"
+    class="account__avatar-overlay-base"
   >
     <div
-      className="account__avatar"
-      style={
-        {
-          "height": "36px",
-          "width": "36px",
-        }
-      }
+      class="account__avatar"
+      style="width: 36px; height: 36px;"
     >
       <img
         alt="alice"
-        onError={[Function]}
         src="/static/alice.jpg"
       />
     </div>
   </div>
   <div
-    className="account__avatar-overlay-overlay"
+    class="account__avatar-overlay-overlay"
   >
     <div
-      className="account__avatar"
-      style={
-        {
-          "height": "24px",
-          "width": "24px",
-        }
-      }
+      class="account__avatar"
+      style="width: 24px; height: 24px;"
     >
       <img
         alt="eve@blackhat.lair"
-        onError={[Function]}
         src="/static/eve.jpg"
       />
     </div>

app/javascript/mastodon/components/__tests__/__snapshots__/button-test.jsx.snap

@@ -2,41 +2,36 @@
 
 exports[`<Button /> > adds class "button-secondary" if props.secondary given 1`] = `
 <button
-  className="button button-secondary"
-  onClick={[Function]}
+  class="button button-secondary"
   type="button"
 />
 `;
 
 exports[`<Button /> > renders a button element 1`] = `
 <button
-  className="button"
-  onClick={[Function]}
+  class="button"
   type="button"
 />
 `;
 
 exports[`<Button /> > renders a disabled attribute if props.disabled given 1`] = `
 <button
-  className="button"
-  disabled={true}
-  onClick={[Function]}
+  class="button"
+  disabled=""
   type="button"
 />
 `;
 
 exports[`<Button /> > renders class="button--block" if props.block given 1`] = `
 <button
-  className="button button--block"
-  onClick={[Function]}
+  class="button button--block"
   type="button"
 />
 `;
 
 exports[`<Button /> > renders the children 1`] = `
 <button
-  className="button"
-  onClick={[Function]}
+  class="button"
   type="button"
 >
   <p>
@@ -47,8 +42,7 @@ exports[`<Button /> > renders the children 1`] = `
 
 exports[`<Button /> > renders the given text 1`] = `
 <button
-  className="button"
-  onClick={[Function]}
+  class="button"
   type="button"
 >
   foo
@@ -57,8 +51,7 @@ exports[`<Button /> > renders the given text 1`] = `
 
 exports[`<Button /> > renders the props.text instead of children 1`] = `
 <button
-  className="button"
-  onClick={[Function]}
+  class="button"
   type="button"
 >
   foo

app/javascript/mastodon/components/__tests__/avatar-test.jsx

@@ -1,5 +1,5 @@
 
-import renderer from 'react-test-renderer';
+import { render } from '@/testing/rendering';
 
 import { accountDefaultValues, createAccountFromServerJSON } from '@/mastodon/models/account';
 
@@ -19,19 +19,17 @@ describe('<Avatar />', () => {
 
   describe('Autoplay', () => {
     it('renders a animated avatar', () => {
-      const component = renderer.create(<Avatar account={account} animate size={size} />);
-      const tree      = component.toJSON();
+      const { container } = render(<Avatar account={account} animate size={size} />);
 
-      expect(tree).toMatchSnapshot();
+      expect(container.firstChild).toMatchSnapshot();
     });
   });
 
   describe('Still', () => {
     it('renders a still avatar', () => {
-      const component = renderer.create(<Avatar account={account} size={size} />);
-      const tree      = component.toJSON();
+      const { container } = render(<Avatar account={account} size={size} />);
 
-      expect(tree).toMatchSnapshot();
+      expect(container.firstChild).toMatchSnapshot();
     });
   });
 

app/javascript/mastodon/components/__tests__/avatar_overlay-test.jsx

@@ -1,6 +1,6 @@
 import { fromJS } from 'immutable';
 
-import renderer from 'react-test-renderer';
+import { render } from '@/testing/rendering';
 
 import { AvatarOverlay } from '../avatar_overlay';
 
@@ -22,9 +22,8 @@ describe('<AvatarOverlay', () => {
   });
 
   it('renders a overlay avatar', () => {
-    const component = renderer.create(<AvatarOverlay account={account} friend={friend} />);
-    const tree      = component.toJSON();
+    const { container } = render(<AvatarOverlay account={account} friend={friend} />);
 
-    expect(tree).toMatchSnapshot();
+    expect(container.firstChild).toMatchSnapshot();
   });
 });

app/javascript/mastodon/components/__tests__/button-test.jsx

@@ -1,23 +1,19 @@
-import renderer from 'react-test-renderer';
-
 import { render, fireEvent, screen } from '@/testing/rendering';
 
 import { Button } from '../button';
 
 describe('<Button />', () => {
   it('renders a button element', () => {
-    const component = renderer.create(<Button />);
-    const tree      = component.toJSON();
+    const { container } = render(<Button />);
 
-    expect(tree).toMatchSnapshot();
+    expect(container.firstChild).toMatchSnapshot();
   });
 
   it('renders the given text', () => {
     const text      = 'foo';
-    const component = renderer.create(<Button text={text} />);
-    const tree      = component.toJSON();
+    const { container } = render(<Button text={text} />);
 
-    expect(tree).toMatchSnapshot();
+    expect(container.firstChild).toMatchSnapshot();
   });
 
   it('handles click events using the given handler', () => {
@@ -37,40 +33,35 @@ describe('<Button />', () => {
   });
 
   it('renders a disabled attribute if props.disabled given', () => {
-    const component = renderer.create(<Button disabled />);
-    const tree      = component.toJSON();
+    const { container } = render(<Button disabled />);
 
-    expect(tree).toMatchSnapshot();
+    expect(container.firstChild).toMatchSnapshot();
   });
 
   it('renders the children', () => {
     const children  = <p>children</p>;
-    const component = renderer.create(<Button>{children}</Button>);
-    const tree      = component.toJSON();
+    const { container } = render(<Button>{children}</Button>);
 
-    expect(tree).toMatchSnapshot();
+    expect(container.firstChild).toMatchSnapshot();
   });
 
   it('renders the props.text instead of children', () => {
     const text      = 'foo';
     const children  = <p>children</p>;
-    const component = renderer.create(<Button text={text}>{children}</Button>);
-    const tree      = component.toJSON();
+    const { container } = render(<Button text={text}>{children}</Button>);
 
-    expect(tree).toMatchSnapshot();
+    expect(container.firstChild).toMatchSnapshot();
   });
 
   it('renders class="button--block" if props.block given', () => {
-    const component = renderer.create(<Button block />);
-    const tree      = component.toJSON();
+    const { container } = render(<Button block />);
 
-    expect(tree).toMatchSnapshot();
+    expect(container.firstChild).toMatchSnapshot();
   });
 
   it('adds class "button-secondary" if props.secondary given', () => {
-    const component = renderer.create(<Button secondary />);
-    const tree      = component.toJSON();
+    const { container } = render(<Button secondary />);
 
-    expect(tree).toMatchSnapshot();
+    expect(container.firstChild).toMatchSnapshot();
   });
 });

app/javascript/mastodon/components/account_bio/index.tsx

@@ -1,9 +1,10 @@
 import classNames from 'classnames';
 
-import { useAppSelector } from '../store';
+import { useAppSelector } from '../../store';
+import { EmojiHTML } from '../emoji/html';
+import { useElementHandledLink } from '../status/handled_link';
 
-import { EmojiHTML } from './emoji/html';
-import { useElementHandledLink } from './status/handled_link';
+import classes from './styles.module.scss';
 
 interface AccountBioProps {
   className?: string;
@@ -12,7 +13,7 @@ interface AccountBioProps {
 }
 
 export const AccountBio: React.FC<AccountBioProps> = ({
-  className,
+  className = classes.bio,
   accountId,
   showDropdown = false,
 }) => {

app/javascript/mastodon/components/account_bio/styles.module.scss

@@ -0,0 +1,22 @@
+.bio {
+  font-size: 15px;
+  color: var(--color-text-primary);
+  unicode-bidi: plaintext;
+  overflow-wrap: anywhere;
+
+  p {
+    margin-bottom: 20px;
+
+    &:last-child {
+      margin-bottom: 0;
+    }
+  }
+
+  :any-link {
+    color: var(--color-text-status-links);
+
+    &:hover {
+      text-decoration: none;
+    }
+  }
+}

app/javascript/mastodon/components/account_header/index.tsx

@@ -148,11 +148,7 @@ export const AccountHeader: React.FC<{
             <div className={classes.bioButtonsWrapper}>
               {me && account.id !== me && <AccountNote accountId={accountId} />}
 
-              <AccountBio
-                showDropdown
-                accountId={accountId}
-                className={classes.bio}
-              />
+              <AccountBio showDropdown accountId={accountId} />
 
               <AccountHeaderFields accountId={accountId} />
 

app/javascript/mastodon/components/account_header/styles.module.scss

@@ -274,28 +274,6 @@ $button-fallback-breakpoint: $button-breakpoint + 55px;
   }
 }
 
-.bio {
-  font-size: 15px;
-  color: var(--color-text-primary);
-  unicode-bidi: plaintext;
-
-  p {
-    margin-bottom: 20px;
-
-    &:last-child {
-      margin-bottom: 0;
-    }
-  }
-
-  :any-link {
-    color: var(--color-text-status-links);
-
-    &:hover {
-      text-decoration: none;
-    }
-  }
-}
-
 .familiarFollowers {
   margin-top: 16px;
 }

app/javascript/mastodon/components/character_counter/styles.module.scss

@@ -1,4 +1,5 @@
 .counter {
+  display: block;
   margin-top: 4px;
   font-size: 13px;
 }

app/javascript/mastodon/components/hotkeys/index.tsx

@@ -1,6 +1,6 @@
 import { useEffect, useRef } from 'react';
 
-import { normalizeKey, isKeyboardEvent } from './utils';
+import { normalizeKey, isKeyboardEvent, matchesKeyCode } from './utils';
 
 /**
  * In case of multiple hotkeys matching the pressed key(s),
@@ -55,6 +55,30 @@ function any(...keys: string[]): KeyMatcher {
   });
 }
 
+/**
+ * Matches any matcher function out of those provided
+ */
+function anyMatcher(...matchers: KeyMatcher[]): KeyMatcher {
+  return (event) => {
+    let match: ReturnType<KeyMatcher> | undefined;
+
+    for (const matcher of matchers) {
+      const matcherResult = matcher(event);
+      if (matcherResult.isMatch) {
+        match = matcherResult;
+        break;
+      }
+    }
+
+    return (
+      match ?? {
+        isMatch: false,
+        priority: hotkeyPriority.singleKey,
+      }
+    );
+  };
+}
+
 /**
  * Matches a single key combined with the option/alt modifier
  */
@@ -62,7 +86,7 @@ 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()}`,
+    isMatch: event.altKey && matchesKeyCode(key, event.code),
     priority: hotkeyPriority.combo,
   });
 }
@@ -109,8 +133,8 @@ const hotkeyMatcherMap = {
   mention: just('m'),
   open: any('enter', 'o'),
   openProfile: just('p'),
-  moveDown: any('j', 'pagedown'),
-  moveUp: any('k', 'pageup'),
+  moveDown: anyMatcher(just('j'), optionPlus('pagedown')),
+  moveUp: anyMatcher(just('k'), optionPlus('pageup')),
   moveToTop: just('0'),
   toggleHidden: just('x'),
   toggleSensitive: just('h'),
@@ -188,7 +212,7 @@ export function useHotkeys<T extends HTMLElement>(handlers: HandlerMap) {
 
       if (shouldHandleEvent) {
         const matchCandidates: {
-          // A candidate will be have an undefined handler if it's matched,
+          // A candidate can have an undefined handler if it's matched,
           // but handled in a parent component rather than this one.
           handler: HandlerFunction | undefined;
           priority: number;

app/javascript/mastodon/components/hotkeys/utils.ts

@@ -2,6 +2,9 @@ export function isKeyboardEvent(event: Event): event is KeyboardEvent {
   return 'key' in event;
 }
 
+/**
+ * Normalises key values to consistent lowercase strings
+ */
 export function normalizeKey(key: string): string {
   const lowerKey = key.toLowerCase();
 
@@ -27,3 +30,16 @@ export function normalizeKey(key: string): string {
       return lowerKey;
   }
 }
+
+/**
+ * Compare whether a key matches an `event.code` value,
+ * with support for single-letter keys (which are otherwise
+ * represented with a `Key` prefix, e.g. `m` is `KeyM`).
+ */
+export function matchesKeyCode(key: string, code: string) {
+  if (key.length === 1) {
+    return code === `Key${key.toUpperCase()}`;
+  } else {
+    return code.toLowerCase() === key.toLowerCase();
+  }
+}

app/javascript/mastodon/components/navigation_focus_target/index.tsx

@@ -55,13 +55,11 @@ export const FocusTargetProvider: React.FC<{
     | null
   >(null);
 
-  const {
-    pathname,
-    search,
-    state = {},
-  } = useLocation<{ focusTarget?: FocusTarget } | undefined>();
+  const { pathname, search, state } = useLocation<{
+    focusTarget?: FocusTarget;
+  } | null>();
 
-  const { focusTarget } = state;
+  const { focusTarget } = state ?? {};
 
   useLayoutEffect(() => {
     // We never want to set focus on page load, so we keep

app/javascript/mastodon/components/status_quoted.tsx

@@ -1,4 +1,5 @@
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import type { ComponentType, ReactNode } from 'react';
 
 import { defineMessage, FormattedMessage, useIntl } from 'react-intl';
 
@@ -142,6 +143,21 @@ const FilteredQuote: React.FC<{
   );
 };
 
+// Adds a wrapper around StatusContainer as the types aren't inheriting correctly with Redux + React 19.
+// TODO: Remove this after the Status component is in TS.
+interface StatusContainerForQuotesProps {
+  id?: string | null;
+  contextType?: string;
+  isQuotedPost?: boolean;
+  avatarSize?: number;
+  headerRenderFn?: StatusHeaderRenderFn;
+  children?: ReactNode;
+  [key: string]: unknown;
+}
+
+const StatusContainerWithChildren =
+  StatusContainer as unknown as ComponentType<StatusContainerForQuotesProps>;
+
 interface QuotedStatusProps {
   quote: QuoteMap;
   contextType?: string;
@@ -338,7 +354,7 @@ export const QuotedStatus: React.FC<QuotedStatusProps> = ({
 
   return (
     <div className='status__quote'>
-      <StatusContainer
+      <StatusContainerWithChildren
         isQuotedPost
         id={quotedStatusId}
         contextType={contextType}
@@ -356,7 +372,7 @@ export const QuotedStatus: React.FC<QuotedStatusProps> = ({
             nestingLevel={nestingLevel + 1}
           />
         )}
-      </StatusContainer>
+      </StatusContainerWithChildren>
     </div>
   );
 };
@@ -383,15 +399,15 @@ export const StatusQuoteManager = (props: StatusQuoteManagerProps) => {
 
   if (quote) {
     return (
-      <StatusContainer {...props}>
+      <StatusContainerWithChildren {...props}>
         <QuotedStatus
           quote={quote}
           parentQuotePostId={status?.get('id') as string}
           contextType={props.contextType}
         />
-      </StatusContainer>
+      </StatusContainerWithChildren>
     );
   }
 
-  return <StatusContainer {...props} />;
+  return <StatusContainerWithChildren {...props} />;
 };

app/javascript/mastodon/features/account_edit/styles.module.scss

@@ -41,6 +41,7 @@
 
 .bio {
   unicode-bidi: plaintext;
+  overflow-wrap: anywhere;
 
   p:not(:last-child) {
     margin-bottom: 20px;

app/javascript/mastodon/features/emoji/picker.ts

@@ -103,7 +103,9 @@ const selectPickerData = createAppSelector(
       categories: [
         'recent',
         'custom',
-        ...Object.keys(categories).toSorted(),
+        ...Object.keys(categories)
+          .toSorted()
+          .map((category) => `custom-${category}`),
         ...defaultCategories,
       ] as CategoryName[],
     };

app/javascript/mastodon/features/keyboard_shortcuts/index.jsx

@@ -88,11 +88,11 @@ class KeyboardShortcuts extends ImmutablePureComponent {
                 <td><FormattedMessage id='keyboard_shortcuts.toggle_sensitivity' defaultMessage='to show/hide media' /></td>
               </tr>
               <tr>
-                <td><kbd>k</kbd>, <FormattedMessage id='keyboard_shortcuts.keys.page_up' defaultMessage='Page Up' tagName='kbd' /></td>
+                <td><kbd>k</kbd>, <FormattedMessage id='keyboard_shortcuts.keys.alt' defaultMessage='Alt' tagName='kbd' />+<FormattedMessage id='keyboard_shortcuts.keys.page_up' defaultMessage='Page Up' tagName='kbd' /></td>
                 <td><FormattedMessage id='keyboard_shortcuts.up' defaultMessage='to move up in the list' /></td>
               </tr>
               <tr>
-                <td><kbd>j</kbd>, <FormattedMessage id='keyboard_shortcuts.keys.page_down' defaultMessage='Page Down' tagName='kbd' /></td>
+                <td><kbd>j</kbd>, <FormattedMessage id='keyboard_shortcuts.keys.alt' defaultMessage='Alt' tagName='kbd' />+<FormattedMessage id='keyboard_shortcuts.keys.page_down' defaultMessage='Page Down' tagName='kbd' /></td>
                 <td><FormattedMessage id='keyboard_shortcuts.down' defaultMessage='to move down in the list' /></td>
               </tr>
               <tr>

app/javascript/mastodon/features/report/category.jsx

@@ -22,8 +22,9 @@ const messages = defineMessages({
   violation_description: { id: 'report.reasons.violation_description', defaultMessage: 'You are aware that it breaks specific rules' },
   other: { id: 'report.reasons.other', defaultMessage: 'It\'s something else' },
   other_description: { id: 'report.reasons.other_description', defaultMessage: 'The issue does not fit into other categories' },
-  status: { id: 'report.category.title_status', defaultMessage: 'post' },
-  account: { id: 'report.category.title_account', defaultMessage: 'profile' },
+  status: { id: 'report.category.title_status', defaultMessage: "Tell us what's going on with this post" },
+  account: { id: 'report.category.title_account', defaultMessage: "Tell us what's going on with this profile" },
+  collection: { id: 'report.category.title_collection', defaultMessage: "Tell us what's going on with this collection"}
 });
 
 const mapStateToProps = state => ({
@@ -68,7 +69,7 @@ class Category extends PureComponent {
   render () {
     const { category, startedFrom, rules, intl } = this.props;
 
-    const options = rules.length > 0 ? [
+    let options = rules.length > 0 ? [
       'dislike',
       'spam',
       'legal',
@@ -81,10 +82,14 @@ class Category extends PureComponent {
       'other',
     ];
 
+    if (startedFrom === 'collection') {
+      options = options.filter(item => item !== 'dislike');
+    }
+
     return (
       <>
         <NavigationFocusTarget as='h1' className='report-dialog-modal__title'>
-          <FormattedMessage id='report.category.title' defaultMessage="Tell us what's going on with this {type}" values={{ type: intl.formatMessage(messages[startedFrom]) }} />
+          {intl.formatMessage(messages[startedFrom])}
         </NavigationFocusTarget>
         <p className='report-dialog-modal__lead'><FormattedMessage id='report.category.subtitle' defaultMessage='Choose the best match' /></p>
 

app/javascript/mastodon/features/ui/components/report_collection_modal.tsx

@@ -13,7 +13,9 @@ import { NavigationFocusTarget } from 'mastodon/components/navigation_focus_targ
 import { useAccount } from 'mastodon/hooks/useAccount';
 import { useAppDispatch } from 'mastodon/store';
 
+import Category from '../../report/category';
 import Comment from '../../report/comment';
+import Rules from '../../report/rules';
 
 const messages = defineMessages({
   close: { id: 'lightbox.close', defaultMessage: 'Close' },
@@ -60,8 +62,14 @@ export const ReportCollectionModal: React.FC<{
     'idle' | 'submitting' | 'submitted' | 'error'
   >('idle');
 
-  const [step, setStep] = useState<'comment' | 'thanks'>('comment');
+  const [step, setStep] = useState<'category' | 'rules' | 'comment' | 'thanks'>(
+    'category',
+  );
 
+  const [category, setCategory] = useState<
+    'spam' | 'legal' | 'violation' | 'other' | null
+  >(null);
+  const [selectedRuleIds, setSelectedRuleIds] = useState<string[]>([]);
   const [comment, setComment] = useState('');
   const [selectedDomains, setSelectedDomains] = useState<string[]>([]);
 
@@ -73,6 +81,22 @@ export const ReportCollectionModal: React.FC<{
     }
   }, []);
 
+  const handleRuleToggle = useCallback((ruleId: string) => {
+    setSelectedRuleIds((ruleIds) =>
+      ruleIds.includes(ruleId)
+        ? ruleIds.filter((id) => ruleId !== id)
+        : [...ruleIds, ruleId],
+    );
+  }, []);
+
+  const handleNextStep = useCallback(() => {
+    if (step === 'category' && category === 'violation') {
+      setStep('rules');
+    } else {
+      setStep('comment');
+    }
+  }, [category, step]);
+
   const handleSubmit = useCallback(() => {
     setSubmitState('submitting');
 
@@ -85,7 +109,8 @@ export const ReportCollectionModal: React.FC<{
           forward_to_domains: selectedDomains,
           comment,
           forward: selectedDomains.length > 0,
-          category: 'spam',
+          category: category ?? 'other',
+          rule_ids: selectedRuleIds,
         },
         () => {
           setSubmitState('submitted');
@@ -96,7 +121,15 @@ export const ReportCollectionModal: React.FC<{
         },
       ),
     );
-  }, [account_id, comment, dispatch, collectionId, selectedDomains]);
+  }, [
+    account_id,
+    category,
+    selectedRuleIds,
+    comment,
+    dispatch,
+    collectionId,
+    selectedDomains,
+  ]);
 
   if (!account) {
     return null;
@@ -108,15 +141,28 @@ export const ReportCollectionModal: React.FC<{
   let stepComponent;
 
   switch (step) {
+    case 'category':
+      stepComponent = (
+        <Category
+          onNextStep={handleNextStep}
+          startedFrom='collection'
+          category={category}
+          onChangeCategory={setCategory}
+        />
+      );
+      break;
+    case 'rules':
+      stepComponent = (
+        <Rules
+          onNextStep={handleNextStep}
+          selectedRuleIds={selectedRuleIds}
+          onToggle={handleRuleToggle}
+        />
+      );
+      break;
     case 'comment':
       stepComponent = (
         <Comment
-          modalTitle={
-            <FormattedMessage
-              id='report.collection_comment'
-              defaultMessage='Why do you want to report this collection?'
-            />
-          }
           submitError={
             submitState === 'error' && (
               <Callout

app/javascript/mastodon/locales/be.json

@@ -561,7 +561,7 @@
   "confirmations.remove_from_followers.message": "{name} больш не будзе падпісаны(-ая) на Вас. Упэўненыя, што хочаце працягнуць?",
   "confirmations.remove_from_followers.title": "Выдаліць падпісчыка?",
   "confirmations.revoke_collection_inclusion.confirm": "Прыбраць сябе",
-  "confirmations.revoke_collection_inclusion.message": "Гэтае дзеянне канчатковае, і куратар не зможа пасля зноў дадаць Вас у гэтую калекцыю.",
+  "confirmations.revoke_collection_inclusion.message": "Куратар не зможа вярнуць Вас у калекцыю на працягу 24 гадзін. Каб ён больш ніколі не мог дадаваць Вас у калекцыі, Вы можаце заблакіраваць яго.",
   "confirmations.revoke_collection_inclusion.title": "Прыбраць Вас з гэтай калекцыі?",
   "confirmations.revoke_quote.confirm": "Выдаліць допіс",
   "confirmations.revoke_quote.message": "Гэтае дзеянне немагчыма адмяніць.",

app/javascript/mastodon/locales/cy.json

@@ -556,7 +556,6 @@
   "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_collection_inclusion.confirm": "Tynnu fi",
-  "confirmations.revoke_collection_inclusion.message": "Mae'r weithred hon yn barhaol, a fydd y curadur ddim yn gallu eich ail-ychwanegu at y casgliad yn ddiweddarach.",
   "confirmations.revoke_collection_inclusion.title": "Tynnu eich hun o'r casgliad hwn?",
   "confirmations.revoke_quote.confirm": "Dileu'r postiad",
   "confirmations.revoke_quote.message": "Does dim modd dadwneud y weithred hon.",

app/javascript/mastodon/locales/da.json

@@ -561,7 +561,7 @@
   "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_collection_inclusion.confirm": "Fjern mig",
-  "confirmations.revoke_collection_inclusion.message": "Denne handling er permanent, og kuratoren vil ikke kunne føje dig til samlingen igen senere.",
+  "confirmations.revoke_collection_inclusion.message": "Kuratoren kan ikke tilføje dig til denne samling igen før om 24 timer. For permanent at forhindre, at vedkommende tilføjer dig til samlinger, kan du blokere vedkommende.",
   "confirmations.revoke_collection_inclusion.title": "Fjern dig selv fra denne samling?",
   "confirmations.revoke_quote.confirm": "Fjern indlæg",
   "confirmations.revoke_quote.message": "Denne handling kan ikke fortrydes.",

app/javascript/mastodon/locales/de.json

@@ -561,7 +561,7 @@
   "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_collection_inclusion.confirm": "Mich entfernen",
-  "confirmations.revoke_collection_inclusion.message": "Diese Aktion kann nicht rückgängig gemacht werden. Es wird daher nicht möglich sein, dich zu dieser Sammlung erneut hinzuzufügen.",
+  "confirmations.revoke_collection_inclusion.message": "Du wirst in den nächsten 24 Stunden nicht noch einmal zu dieser Sammlung hinzugefügt werden können. Falls du nie wieder von diesem Profil zu einer Sammlung hinzugefügt werden möchtest, kannst du es blockieren.",
   "confirmations.revoke_collection_inclusion.title": "Möchtest du wirklich aus dieser Sammlung entfernt werden?",
   "confirmations.revoke_quote.confirm": "Zitat entfernen",
   "confirmations.revoke_quote.message": "Diese Aktion kann nicht rückgängig gemacht werden.",

app/javascript/mastodon/locales/el.json

@@ -561,7 +561,7 @@
   "confirmations.remove_from_followers.message": "Ο χρήστης {name} θα σταματήσει να σε ακολουθεί. Σίγουρα θες να συνεχίσεις;",
   "confirmations.remove_from_followers.title": "Αφαίρεση ακολούθου;",
   "confirmations.revoke_collection_inclusion.confirm": "Αφαίρεσε με",
-  "confirmations.revoke_collection_inclusion.message": "Αυτή η ενέργεια είναι μόνιμη, και ο επιμελητής δεν θα μπορεί να σε προσθέσει ξανά στη συλλογή αργότερα.",
+  "confirmations.revoke_collection_inclusion.message": "Ο επιμελητής δεν θα μπορεί να σας προσθέσει ξανά σε αυτήν τη συλλογή για 24 ώρες. Για να τον αποτρέψετε μόνιμα από το να σας προσθέτει σε συλλογές, μπορείτε να τον αποκλείσετε.",
   "confirmations.revoke_collection_inclusion.title": "Αφαίρεσε τον εαυτό σου από αυτήν τη συλλογή;",
   "confirmations.revoke_quote.confirm": "Αφαίρεση ανάρτησης",
   "confirmations.revoke_quote.message": "Αυτή η ενέργεια δεν μπορεί να αναιρεθεί.",

app/javascript/mastodon/locales/en-GB.json

@@ -561,7 +561,7 @@
   "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_collection_inclusion.confirm": "Remove me",
-  "confirmations.revoke_collection_inclusion.message": "This action is permanent, and the curator won't be able to re-add you to the collection later on.",
+  "confirmations.revoke_collection_inclusion.message": "The curator won't be able to re-add you to this collection for 24 hours. To prevent them from adding you to collections permanently, you can block them.",
   "confirmations.revoke_collection_inclusion.title": "Remove yourself from this collection?",
   "confirmations.revoke_quote.confirm": "Remove post",
   "confirmations.revoke_quote.message": "This action cannot be undone.",
@@ -649,6 +649,7 @@
   "empty_column.collections": "{acct} has not created any collections yet.",
   "empty_column.collections.featured_in": "You have not been added to any collections yet.",
   "empty_column.collections.featured_in_undiscoverable": "In order for people to add you to collections, you need to allow featuring in discovery experiences from <link>Preferences > Privacy and reach</link>",
+  "empty_column.collections_self": "You have not created any collections yet.",
   "empty_column.community": "The local timeline is empty. Write something publicly to get the ball rolling!",
   "empty_column.direct": "You don't have any private mentions yet. When you send or receive one, it will show up here.",
   "empty_column.disabled_feed": "This feed has been disabled by your server administrators.",
@@ -780,6 +781,7 @@
   "home.pending_critical_update.link": "See updates",
   "home.pending_critical_update.title": "Critical security update available!",
   "home.show_announcements": "Show announcements",
+  "ignore_notifications_modal.bots_title": "Ignore notifications from bots?",
   "ignore_notifications_modal.disclaimer": "Mastodon cannot inform users that you've ignored their notifications. Ignoring notifications will not stop the messages themselves from being sent.",
   "ignore_notifications_modal.filter_instead": "Filter instead",
   "ignore_notifications_modal.filter_to_act_users": "You'll still be able to accept, reject, or report users",
@@ -846,6 +848,7 @@
   "keyboard_shortcuts.toggle_sensitivity": "Show/hide media",
   "keyboard_shortcuts.toot": "to start a brand new post",
   "keyboard_shortcuts.top": "Move to top of list",
+  "keyboard_shortcuts.translate": "Translate a post",
   "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
   "keyboard_shortcuts.up": "Move up in the list",
   "learn_more_link.got_it": "Got it",
@@ -1041,6 +1044,8 @@
   "notifications.policy.drop": "Ignore",
   "notifications.policy.drop_hint": "Send to the void, never to be seen again",
   "notifications.policy.filter": "Filter",
+  "notifications.policy.filter_bots_hint": "Accounts marked as automated",
+  "notifications.policy.filter_bots_title": "Bots",
   "notifications.policy.filter_hint": "Send to filtered notifications inbox",
   "notifications.policy.filter_limited_accounts_hint": "Limited by server moderators",
   "notifications.policy.filter_limited_accounts_title": "Moderated accounts",

app/javascript/mastodon/locales/en.json

@@ -1138,11 +1138,10 @@
   "report.categories.spam": "Spam",
   "report.categories.violation": "Content violates one or more server rules",
   "report.category.subtitle": "Choose the best match",
-  "report.category.title": "Tell us what's going on with this {type}",
-  "report.category.title_account": "profile",
-  "report.category.title_status": "post",
+  "report.category.title_account": "Tell us what's going on with this profile",
+  "report.category.title_collection": "Tell us what's going on with this collection",
+  "report.category.title_status": "Tell us what's going on with this post",
   "report.close": "Done",
-  "report.collection_comment": "Why do you want to report this collection?",
   "report.comment.title": "Is there anything else you think we should know?",
   "report.forward": "Forward to {target}",
   "report.forward_hint": "The account is from another server. Send an anonymized copy of the report there as well?",

app/javascript/mastodon/locales/es-AR.json

@@ -561,7 +561,7 @@
   "confirmations.remove_from_followers.message": "{name} dejará de seguirte. ¿De verdad querés continuar?",
   "confirmations.remove_from_followers.title": "¿Quitar seguidor?",
   "confirmations.revoke_collection_inclusion.confirm": "Quitarme",
-  "confirmations.revoke_collection_inclusion.message": "Esta acción es permanente, y el autor no podrá volver a agregarte a la colección más adelante.",
+  "confirmations.revoke_collection_inclusion.message": "El coleccionista no podrá volver a agregarte a esta colección durante 24 horas. Para evitar que te agreguen a colecciones de forma permanente, podés bloquearlos.",
   "confirmations.revoke_collection_inclusion.title": "¿Querés quitarte de esta colección?",
   "confirmations.revoke_quote.confirm": "Eliminar mensaje",
   "confirmations.revoke_quote.message": "Esta acción no se puede deshacer.",
@@ -649,7 +649,7 @@
   "empty_column.collections": "{acct} todavía no creó ninguna colección.",
   "empty_column.collections.featured_in": "Todavía no te agregaron a ninguna colección.",
   "empty_column.collections.featured_in_undiscoverable": "Para que la gente pueda agregarte a colecciones, tenés que permitir que te destacen en las experiencias de descubrimiento en <link>Configuración > Privacidad y alcance</link>",
-  "empty_column.collections_self": "Aún no has creado ninguna colección.",
+  "empty_column.collections_self": "Todavía no creaste ninguna colección.",
   "empty_column.community": "La línea temporal local está vacía. ¡Escribí algo en modo público para que se empiece a correr la bola!",
   "empty_column.direct": "Todavía no tenés ninguna mención privada. Cuando enviés o recibás una, se mostrará acá.",
   "empty_column.disabled_feed": "Esta línea temporal fue deshabilitada por los administradores de tu servidor.",
@@ -1090,18 +1090,18 @@
   "poll_button.add_poll": "Agregar encuesta",
   "poll_button.remove_poll": "Quitar encuesta",
   "privacy.change": "Configurar privacidad del mensaje",
-  "privacy.direct.long": "Todas las cuentas mencionadas en el mensaje",
-  "privacy.direct.short": "Mención privada",
-  "privacy.private.long": "Solo tus seguidores",
-  "privacy.private.short": "Seguidores",
-  "privacy.public.long": "Cualquier persona dentro y fuera de Mastodon",
-  "privacy.public.short": "Público",
+  "privacy.direct.long": "Visible solo para todas las cuentas mencionadas en el mensaje",
+  "privacy.direct.short": "Visibilidad de mención privada",
+  "privacy.private.long": "Visible solo para tus seguidores",
+  "privacy.private.short": "Visibilidad solo para seguidores",
+  "privacy.public.long": "Visible en Mastodon en los resultados de búsqueda, tendencias y líneas temporales públicas",
+  "privacy.public.short": "Visibilidad pública",
   "privacy.quote.anyone": "{visibility}, citas permitidas",
   "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 pero silencioso",
+  "privacy.unlisted.long": "Oculto en Mastodon de los resultados de búsqueda, tendencias y líneas temporales públicas",
+  "privacy.unlisted.short": "Visibilidad pública pero silenciosa",
   "privacy_policy.last_updated": "Última actualización: {date}",
   "privacy_policy.title": "Política de privacidad",
   "quote_error.edit": "Las citas no se pueden agregar al editar un mensaje.",

app/javascript/mastodon/locales/es-MX.json

@@ -561,7 +561,7 @@
   "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_collection_inclusion.confirm": "Excluirme",
-  "confirmations.revoke_collection_inclusion.message": "Esta acción es permanente y el autor no podrá volver a agregarte a la colección más adelante.",
+  "confirmations.revoke_collection_inclusion.message": "El editor no podrá volver a añadirte a esta colección hasta dentro de 24 horas. Para evitar que te añada a colecciones de forma permanente, puedes bloquearlo.",
   "confirmations.revoke_collection_inclusion.title": "¿Deseas excluirte de esta colección?",
   "confirmations.revoke_quote.confirm": "Eliminar publicación",
   "confirmations.revoke_quote.message": "Esta acción no se puede deshacer.",

app/javascript/mastodon/locales/es.json

@@ -561,7 +561,7 @@
   "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_collection_inclusion.confirm": "Sácame",
-  "confirmations.revoke_collection_inclusion.message": "Esta acción es permanente, y el curador no podrá volver a añadirle a la colección más adelante.",
+  "confirmations.revoke_collection_inclusion.message": "El editor no podrá volver a añadirte a esta colección durante 24 horas. Para evitar que te añada a colecciones de forma permanente, puedes bloquearle.",
   "confirmations.revoke_collection_inclusion.title": "¿Salirse de esta colección?",
   "confirmations.revoke_quote.confirm": "Eliminar publicación",
   "confirmations.revoke_quote.message": "Esta acción no tiene vuelta atrás.",

app/javascript/mastodon/locales/et.json

@@ -2,6 +2,7 @@
   "about.blocks": "Modereeritavad serverid",
   "about.contact": "Kontakt:",
   "about.default_locale": "Vaikimisi",
+  "about.disclaimer": "Mastodon on vaba, tasuta ja avatud lähtekoodiga tarkvara ning Mastodon gGmbH kaubamärk.",
   "about.domain_blocks.no_reason_available": "Põhjus on teadmata",
   "about.domain_blocks.preamble": "Mastodon lubab üldiselt vaadata sisu ning suhelda kasutajatega ükskõik millisest teisest födiversumi serverist. Need on erandid, mis kehtivad selles kindlas serveris.",
   "about.domain_blocks.silenced.explanation": "Sa üldjuhul ei näe profiile ja sisu sellest serverist, kui sa just tahtlikult neid ei otsi või jälgimise moel nõusolekut ei anna.",
@@ -380,7 +381,7 @@
   "collections.collection_language_none": "Pole",
   "collections.collection_name": "Nimi",
   "collections.collection_topic": "Teema",
-  "collections.confirm_account_removal": "Kas oled kindel, et soovid selle konto kogumikust eemaldada?",
+  "collections.confirm_account_removal": "Kas oled kindel, et soovid selle kasutajakonto kogumikust eemaldada?",
   "collections.content_warning": "Sisuhoiatus",
   "collections.continue": "Jätka",
   "collections.copy_link": "Kopeeri link",
@@ -392,7 +393,7 @@
   "collections.delete_collection": "Kustuta kogumik",
   "collections.description_length_hint": "Kuni 100 tähemärki",
   "collections.detail.author_added_you_on_date": "{author} lisas sind {date}",
-  "collections.detail.loading": "Kogumiku laadimine…",
+  "collections.detail.loading": "Laadin kogumikku…",
   "collections.detail.revoke_inclusion": "Eemalda mind",
   "collections.detail.sensitive_content": "Delikaatne sisu",
   "collections.detail.sensitive_note": "Kirjeldus ja kontod ei pruugi kõigi vaatajate jaoks sobivad olla.",
@@ -560,7 +561,7 @@
   "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_collection_inclusion.confirm": "Eemalda mind",
-  "confirmations.revoke_collection_inclusion.message": "See toiming on lõplik ja kuraator ei saa sind hiljem kogumikku uuesti lisada.",
+  "confirmations.revoke_collection_inclusion.message": "Koostaja ei saa sind uuesti lisada sellesse kogumikku 24 tunni jooksul. Kui tahad, et seda ei saaks üldse teha, võid ta blokeerida.",
   "confirmations.revoke_collection_inclusion.title": "Kas eemaldad ennast sellest kogumikust?",
   "confirmations.revoke_quote.confirm": "Eemalda postitus",
   "confirmations.revoke_quote.message": "Seda tegevust ei saa tagasi pöörata.",
@@ -645,8 +646,10 @@
   "empty_column.account_unavailable": "Profiil pole saadaval",
   "empty_column.blocks": "Blokeeritud kasutajaid pole.",
   "empty_column.bookmarked_statuses": "Järjehoidjatesse pole veel lisatud postitusi. Kui lisad mõne, näed neid siin.",
+  "empty_column.collections": "{acct} pole veel koostanud ühtegi kogumikku.",
   "empty_column.collections.featured_in": "Sind pole lisatud veel ühtegi kogumikku.",
   "empty_column.collections.featured_in_undiscoverable": "Selleks, et kasutajad saaks sind lisada kogumikesse, pead sa seadistustest lubama tuvastamise ja esiletõstmise siit: <link>Eelistused > Privaatsus ja ulatus</link>",
+  "empty_column.collections_self": "Sina pole veel koostanud ühtegi kogumikku.",
   "empty_column.community": "Kohalik ajajoon on tühi. Kirjuta midagi avalikult, et pall veerema ajada!",
   "empty_column.direct": "Sul pole veel ühtegi privaatset mainimist. Kui saadad või saad mõne, ilmuvad need siin.",
   "empty_column.disabled_feed": "See infovoog on serveri peakasutajate poolt välja lülitatud.",
@@ -778,6 +781,7 @@
   "home.pending_critical_update.link": "Vaata uuendusi",
   "home.pending_critical_update.title": "Saadaval kriitiline turvauuendus!",
   "home.show_announcements": "Kuva teadaandeid",
+  "ignore_notifications_modal.bots_title": "Kas eirad robotkontode teavitusi?",
   "ignore_notifications_modal.disclaimer": "Mastodon ei saa teavitada kasutajaid, et eirasid nende teavitusi. Teavituste eiramine ei peata sõnumite endi saatmist.",
   "ignore_notifications_modal.filter_instead": "Selle asemel filtreeri",
   "ignore_notifications_modal.filter_to_act_users": "Saad endiselt kasutajaid vastu võtta, tagasi lükata või neist teatada",
@@ -818,6 +822,12 @@
   "keyboard_shortcuts.heading": "Kiirklahvid",
   "keyboard_shortcuts.home": "Ava kodu ajajoon",
   "keyboard_shortcuts.hotkey": "Kiirklahv",
+  "keyboard_shortcuts.keys.alt": "Alt",
+  "keyboard_shortcuts.keys.backspace": "Tagasivõtuklahv",
+  "keyboard_shortcuts.keys.enter": "Sisestusklahv",
+  "keyboard_shortcuts.keys.esc": "Esc",
+  "keyboard_shortcuts.keys.page_down": "Lehekülje võrra alla",
+  "keyboard_shortcuts.keys.page_up": "Lehekülje võrra üles",
   "keyboard_shortcuts.legend": "Kuva see legend",
   "keyboard_shortcuts.load_more": "Fookus „Laadi veel“ nupule",
   "keyboard_shortcuts.local": "Ava kohalik ajajoon",
@@ -838,6 +848,7 @@
   "keyboard_shortcuts.toggle_sensitivity": "Näita/peida meediat",
   "keyboard_shortcuts.toot": "Alusta uut postitust",
   "keyboard_shortcuts.top": "Tõsta loendi algusesse",
+  "keyboard_shortcuts.translate": "Tõlgi postitus",
   "keyboard_shortcuts.unfocus": "Fookus tekstialalt/otsingult ära",
   "keyboard_shortcuts.up": "Liigu loetelus üles",
   "learn_more_link.got_it": "Sain aru",
@@ -1033,6 +1044,8 @@
   "notifications.policy.drop": "Ignoreeri",
   "notifications.policy.drop_hint": "Saada tühjusse, mitte kunagi seda enam näha",
   "notifications.policy.filter": "Filter",
+  "notifications.policy.filter_bots_hint": "Kasutajakontod, millele on lisatud automatiseeritud töö tunnus",
+  "notifications.policy.filter_bots_title": "Robotid",
   "notifications.policy.filter_hint": "Saadetud filtreeritud teavituste sisendkasti",
   "notifications.policy.filter_limited_accounts_hint": "Piiratud serveri moderaatorite poolt",
   "notifications.policy.filter_limited_accounts_title": "Modereeritud kontod",
@@ -1190,6 +1203,7 @@
   "search_popout.user": "kasutaja",
   "search_results.accounts": "Profiilid",
   "search_results.all": "Kõik",
+  "search_results.collections": "Kogumikud",
   "search_results.hashtags": "Teemaviited",
   "search_results.no_results": "Tulemusi pole.",
   "search_results.no_search_yet": "Proovi otsida postitusi, profiile või teemaviiteid.",

app/javascript/mastodon/locales/fa.json

@@ -550,7 +550,6 @@
   "confirmations.remove_from_followers.message": "دیگر {name} پیتان نخواهد گرفت. مطمئنید که می‌خواهید ادامه دهید؟",
   "confirmations.remove_from_followers.title": "برداشتن پی‌گیرنده؟",
   "confirmations.revoke_collection_inclusion.confirm": "حذفم کن",
-  "confirmations.revoke_collection_inclusion.message": "این کنش همیشگی است و سازنده نخواهد توانست دوباره به مجموعه بیفزایدتان.",
   "confirmations.revoke_collection_inclusion.title": "برداشتن خودتان از این مجموعه؟",
   "confirmations.revoke_quote.confirm": "حذف فرسته",
   "confirmations.revoke_quote.message": "این اقدام قابل بازگشت نیست.",
@@ -892,6 +891,7 @@
   "navigation_bar.live_feed_local": "خوراک زنده (محلی)",
   "navigation_bar.live_feed_public": "خوراک زنده (عمومی)",
   "navigation_bar.logout": "خروج",
+  "navigation_bar.main": "اصلی",
   "navigation_bar.moderation": "نظارت",
   "navigation_bar.more": "بیشتر",
   "navigation_bar.mutes": "کاربران خموشانده",

app/javascript/mastodon/locales/fi.json

@@ -561,7 +561,7 @@
   "confirmations.remove_from_followers.message": "{name} lakkaa seuraamasta sinua. Haluatko varmasti jatkaa?",
   "confirmations.remove_from_followers.title": "Poistetaanko seuraaja?",
   "confirmations.revoke_collection_inclusion.confirm": "Poista minut",
-  "confirmations.revoke_collection_inclusion.message": "Tämä toimi on pysyvä, eikä kokoaja pysty lisäämään sinua kokoelmaan myöhemmin uudelleen.",
+  "confirmations.revoke_collection_inclusion.message": "Kokoaja ei voi lisätä sinua uudelleen tähän kokoelmaan seuraavan 24 tunnin aikana. Estämällä hänet voit pysyvästi estää häntä lisäämästä sinua kokoelmiin.",
   "confirmations.revoke_collection_inclusion.title": "Poistetaanko itsesi tästä kokoelmasta?",
   "confirmations.revoke_quote.confirm": "Poista julkaisu",
   "confirmations.revoke_quote.message": "Tätä toimea ei voi peruuttaa.",

app/javascript/mastodon/locales/fr-CA.json

@@ -561,7 +561,7 @@
   "confirmations.remove_from_followers.message": "{name} cessera de vous suivre. Voulez-vous vraiment continuer ?",
   "confirmations.remove_from_followers.title": "Supprimer l'abonné·e ?",
   "confirmations.revoke_collection_inclusion.confirm": "Me retirer",
-  "confirmations.revoke_collection_inclusion.message": "Cette action est permanente, la personne qui gère la collection ne pourra plus vous y rajouter plus tard.",
+  "confirmations.revoke_collection_inclusion.message": "Le compte gérant la collection ne pourra plus vous y ajouter pendant 24 heures. Pour l'empêcher définitivement de vous ajouter à des collections vous pouvez le bloquer.",
   "confirmations.revoke_collection_inclusion.title": "Vous retirer de cette collection ?",
   "confirmations.revoke_quote.confirm": "Retirer le message",
   "confirmations.revoke_quote.message": "Cette action ne peut pas être annulée.",

app/javascript/mastodon/locales/fr.json

@@ -561,7 +561,7 @@
   "confirmations.remove_from_followers.message": "{name} cessera de vous suivre. Voulez-vous vraiment continuer ?",
   "confirmations.remove_from_followers.title": "Supprimer l'abonné·e ?",
   "confirmations.revoke_collection_inclusion.confirm": "Me retirer",
-  "confirmations.revoke_collection_inclusion.message": "Cette action est permanente, la personne qui gère la collection ne pourra plus vous y rajouter plus tard.",
+  "confirmations.revoke_collection_inclusion.message": "Le compte gérant la collection ne pourra plus vous y ajouter pendant 24 heures. Pour l'empêcher définitivement de vous ajouter à des collections vous pouvez le bloquer.",
   "confirmations.revoke_collection_inclusion.title": "Vous retirer de cette collection ?",
   "confirmations.revoke_quote.confirm": "Retirer le message",
   "confirmations.revoke_quote.message": "Cette action ne peut pas être annulée.",
@@ -658,13 +658,13 @@
   "empty_column.favourited_statuses": "Vous n’avez pas encore de message en favori. Lorsque vous en ajouterez un, il apparaîtra ici.",
   "empty_column.favourites": "Personne n’a encore ajouté ce message à ses favoris. Lorsque quelqu’un le fera, il apparaîtra ici.",
   "empty_column.follow_requests": "Vous n’avez pas encore de demande de suivi. Lorsque vous en recevrez une, elle apparaîtra ici.",
-  "empty_column.followed_tags": "Vous n'avez pas encore suivi d'hashtags. Lorsque vous le ferez, ils apparaîtront ici.",
+  "empty_column.followed_tags": "Vous n'avez pas encore suivi de hashtags. Lorsque vous le ferez, ils apparaîtront ici.",
   "empty_column.hashtag": "Il n’y a encore aucun contenu associé à ce hashtag.",
   "empty_column.home": "Votre fil principal est vide ! Suivez plus de personnes pour le remplir.",
   "empty_column.list": "Il n’y a rien dans cette liste pour l’instant. Quand des membres de cette liste publieront de nouveaux messages, ils apparaîtront ici.",
   "empty_column.mutes": "Vous n’avez masqué aucun compte pour le moment.",
   "empty_column.notification_requests": "C'est fini ! Il n'y a plus rien ici. Lorsque vous recevez de nouvelles notifications, elles apparaitront ici conformément à vos préférences.",
-  "empty_column.notifications": "Vous n’avez pas encore de notification. Interagissez avec d’autres personnes pour débuter la conversation.",
+  "empty_column.notifications": "Vous n’avez pas encore de notification. Interagissez avec d’autres personnes pour commencer la conversation.",
   "empty_column.public": "Il n’y a rien ici ! Écrivez quelque chose publiquement, ou bien suivez manuellement des personnes d’autres serveurs pour remplir le fil public",
   "empty_state.no_results": "Aucun résultat",
   "error.no_hashtag_feed_access": "Rejoindre ou se connecter pour voir et suivre cet hashtag.",

app/javascript/mastodon/locales/ga.json

@@ -561,7 +561,7 @@
   "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_collection_inclusion.confirm": "Bain mé",
-  "confirmations.revoke_collection_inclusion.message": "Is gníomh buan é seo, agus ní bheidh an coimeádaí in ann tú a chur leis an mbailiúchán arís níos déanaí.",
+  "confirmations.revoke_collection_inclusion.message": "Ní bheidh an coimeádaí in ann tú a chur leis an mbailiúchán seo arís ar feadh 24 uair an chloig. Chun cosc ​​a chur orthu tú a chur le bailiúcháin go buan, is féidir leat iad a bhlocáil.",
   "confirmations.revoke_collection_inclusion.title": "Bain tú féin den bhailiúchán seo?",
   "confirmations.revoke_quote.confirm": "Bain postáil",
   "confirmations.revoke_quote.message": "Ní féidir an gníomh seo a chealú.",

app/javascript/mastodon/locales/gd.json

@@ -2,6 +2,7 @@
   "about.blocks": "Frithealaichean fo mhaorsainneachd",
   "about.contact": "Fios thugainn:",
   "about.default_locale": "Bun-roghainn",
+  "about.disclaimer": "’S e bathar-bog saor le bun-tùs fosgailte a th’ ann am Mastodon agus ’na chomharra-mhalairt aig Mastodon GmbH.",
   "about.domain_blocks.no_reason_available": "Chan eil an t-adhbhar ga thoirt seachad",
   "about.domain_blocks.preamble": "San fharsaingeachd, leigidh Mastodon leat susbaint o fhrithealaiche sam bith sa cho-shaoghal a shealltainn agus eadar-ghìomh a ghabhail leis na cleachdaichean uapa-san. Seo na h-easgaidhean a tha an sàs air an fhrithealaiche shònraichte seo.",
   "about.domain_blocks.silenced.explanation": "San fharsaingeachd, chan fhaic thu pròifilean agus susbaint an fhrithealaiche seo ach ma nì thu lorg no ma tha thu ga leantainn.",
@@ -85,6 +86,7 @@
   "account.locked_info": "Tha prìobhaideachd ghlaiste aig a’ chunntais seo. Nì an sealbhadair lèirmheas a làimh air cò dh’fhaodas a leantainn.",
   "account.media": "Meadhanan",
   "account.mention": "Thoir iomradh air @{name}",
+  "account.menu.add_to_collection": "Cuir ri cruinneachadh…",
   "account.menu.add_to_list": "Cuir ri liosta…",
   "account.menu.block": "Bac an cunntas",
   "account.menu.block_domain": "Bac {domain}",
@@ -326,11 +328,15 @@
   "annual_report.summary.share_on_mastodon": "Co-roinn air Mastodon",
   "attachments_list.unprocessed": "(gun phròiseasadh)",
   "audio.hide": "Falaich an fhuaim",
+  "block_modal.no_collections": "Chan urrainn do gin agaibh càch a chèile a chur ri cruinneachadh. Thèid ur toirt air falbh o chruinneachaidhean an neach eile a tha ann mu thràth nan robh sibh annta.",
   "block_modal.remote_users_caveat": "Iarraidh sinn air an fhrithealaiche {domain} gun gèill iad ri do cho-dhùnadh. Gidheadh, chan eil barantas gun gèill iad on a làimhsicheas cuid a fhrithealaichean bacaidhean air dòigh eadar-dhealaichte. Dh’fhaoidte gum faic daoine gun chlàradh a-steach na postaichean poblach agad fhathast.",
   "block_modal.show_less": "Seall nas lugha dheth",
   "block_modal.show_more": "Seall barrachd dheth",
+  "block_modal.they_cant_mention": "Chan urrainn do gin agaibh iomradh no luaidh a thoirt air càch a chèile no a leantainn càch a chèile.",
+  "block_modal.they_cant_see_posts": "Chan fhaic iad an t-susbaint agad ’s chan fhaic thu an t-susbaint aca-san.",
   "block_modal.they_will_know": "Chì iad gun deach am bacadh.",
   "block_modal.title": "A bheil thu airson an cleachdaiche a bhacadh?",
+  "block_modal.you_wont_see_mentions": "Chan fhaic thu na postaichean o chàch a bheir iomradh orra.",
   "boost_modal.combo": "Brùth air {combo} nam b’ fheàrr leat leum a ghearradh thar seo an ath-thuras",
   "boost_modal.reblog": "A bheil thu airson am post a bhrosnachadh?",
   "boost_modal.undo_reblog": "A bheil thu airson sgur de bhrosnachadh a’ phuist?",
@@ -360,9 +366,12 @@
   "collection.share_modal.share_via_system": "Co-roinn gu…",
   "collection.share_modal.title": "Co-roinn an cruinneachadh",
   "collection.share_modal.title_new": "Co-roinn an cruinneachadh ùr agad!",
+  "collection.share_template_other": "Thoir sùil air an deagh-chruinneachadh seo:",
+  "collection.share_template_own": "Thoir sùil air a’ chruinneachadh ùr agam:",
   "collections.account_count": "{count, plural, one {# chunntas} two {# chunntas} few {# cunntasan} other {# cunntas}}",
   "collections.accounts.empty_editor_title": "Chan eil neach sam bith sa chruinneachadh seo fhathast",
   "collections.accounts.empty_title": "Tha an an cruinneachadh seo falamh",
+  "collections.add_to_collection": "Cuir {name} ri cruinneachaidhean",
   "collections.block_collection_owner": "Bac an cunntas",
   "collections.by_account": "le {account_handle}",
   "collections.collection_description": "Tuairisgeul",
@@ -385,6 +394,7 @@
   "collections.detail.loading": "A’ luchdadh a’ chruinneachaidh…",
   "collections.detail.revoke_inclusion": "Thoir air falbh mi",
   "collections.detail.sensitive_content": "Susbaint fhrionasach",
+  "collections.detail.sensitive_note": "Dh’fhaoidte nach eil an tuairisgeul ’s na cunntasan iomchaidh dhan a h-uile neach-ammhairc.",
   "collections.detail.share": "Co-roinn an cruinneachadh seo",
   "collections.detail.you_are_in_this_collection": "Thathar do bhrosnachadh sa chruinneachadh seo",
   "collections.edit_details": "Deasaich am fiosrachadh",
@@ -413,6 +423,11 @@
   "collections.search_accounts_max_reached": "Chuir thu na tha ceadaichte de chunntasan ris",
   "collections.sensitive": "Frionasach",
   "collections.share_short": "Co-roinn",
+  "collections.sort_alphabetical": "A-rèir na h-aibidil",
+  "collections.sort_by": "Seòrsaich a-rèir:",
+  "collections.sort_date_added": "Cuin a chaidh a chur ris",
+  "collections.sort_last_active": "Gnìomhach an turas mu dheireadh",
+  "collections.sort_most_followers": "An luchd-leantainn as motha",
   "collections.suggestions.can_not_add": "Cha ghabh a chur ris",
   "collections.suggestions.can_not_add_desc": "Chuir na cunntasan seo romhpa nach nochd iad ann an àrainneachdan rùrachaidh no tha iad air frithealaiche nach cuir taic ri cruinneachaidhean.",
   "collections.suggestions.must_follow": "Feumaidh tu leantainn an toiseach",
@@ -542,7 +557,6 @@
   "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_collection_inclusion.confirm": "Thoir air falbh mi",
-  "confirmations.revoke_collection_inclusion.message": "Tha an gnìomh seo buan agus chan urrainn dhan neach-tasgaidh do chur ris a’ chruinneachadh a-rithist an uair sin.",
   "confirmations.revoke_collection_inclusion.title": "A bheil tu airson do thoirt air falbh on chruinneachadh seo?",
   "confirmations.revoke_quote.confirm": "Thoir am post air falbh",
   "confirmations.revoke_quote.message": "Cha ghabh seo a neo-dhèanamh.",
@@ -565,6 +579,11 @@
   "copy_icon_button.copy_this_text": "Cuir lethbhreac dhen cheangal air an stòr-bhòrd",
   "copypaste.copied": "Chaidh lethbhreac dheth a dhèanamh",
   "copypaste.copy_to_clipboard": "Cuir lethbhreac dheth air an stòr-bhòrd",
+  "custom_homepage.about": "Mu dhèidhinn",
+  "custom_homepage.about_this_server": "Mun fhrithealaiche seo",
+  "custom_homepage.administered_by": "Rianachd le",
+  "custom_homepage.contact": "Fios thugainn:",
+  "custom_homepage.latest_activity": "A’ ghnìomhachd mu dheireadh",
   "directory.federated": "On cho-shaoghal aithnichte",
   "directory.local": "O {domain} a-mhàin",
   "directory.new_arrivals": "Feadhainn ùra",
@@ -621,7 +640,10 @@
   "empty_column.account_unavailable": "Chan eil a’ phròifil ri làimh",
   "empty_column.blocks": "Cha do bhac thu cleachdaiche sam bith fhathast.",
   "empty_column.bookmarked_statuses": "Chan eil comharra-lìn ri post agad fhathast. Nuair a nì thu comharra-lìn de dh’fhear, nochdaidh e an-seo.",
+  "empty_column.collections": "Cha do chruthaich {acct} cruinneachadh sam bith fhathast.",
   "empty_column.collections.featured_in": "Cha deach do chur ri cruinneachadh sam bith fhathast.",
+  "empty_column.collections.featured_in_undiscoverable": "Mus dèid do chur ri cruinneachadh sam bith, feumaidh tu cead a thoirt gun dèid do bhrosnachadh ann an àrainneachdan rùrachaidh o <link>Roghainnean > Prìobhaideachd ’s ruigse</link>",
+  "empty_column.collections_self": "Cha do chruthaich thu cruinneachadh sam bith fhathast.",
   "empty_column.community": "Tha an loidhne-ama ionadail falamh. Sgrìobh rudeigin gu poblach airson toiseach-tòiseachaidh a dhèanamh!",
   "empty_column.direct": "Chan eil iomradh prìobhaideach agad fhathast. Nuair a chuireas no a gheibh thu tè, nochdaidh i an-seo.",
   "empty_column.disabled_feed": "Chaidh an loidhne-ama seo a chur à comas le rianairean an fhrithealaiche agad.",
@@ -753,6 +775,7 @@
   "home.pending_critical_update.link": "Faic na h-ùrachaidhean",
   "home.pending_critical_update.title": "Tha ùrachadh tèarainteachd èiginneach ri fhaighinn!",
   "home.show_announcements": "Seall na brathan-fios",
+  "ignore_notifications_modal.bots_title": "A bheil thu airson brathan o bhotaichean a leigeil seachad?",
   "ignore_notifications_modal.disclaimer": "Chan urrainn do Mhastodon innse do cheachdaichean gun do leig thu seachad na brathan uapa. Cha bhac leigeil seachad nam brathan gun dèid na teachdaireachdan fhèin a chur.",
   "ignore_notifications_modal.filter_instead": "Criathraich ’na àite",
   "ignore_notifications_modal.filter_to_act_users": "’S urrainn dhut gabhail ri cleachdaichean, an diùltadh no gearan a dhèanamh mun dèidhinn fhathast",
@@ -767,6 +790,7 @@
   "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": "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.action_follow": "Mus lean thu {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",
@@ -792,6 +816,12 @@
   "keyboard_shortcuts.heading": "Ath-ghoiridean a’ mheur-chlàir",
   "keyboard_shortcuts.home": "Fosgail loidhne-ama na dachaigh",
   "keyboard_shortcuts.hotkey": "Grad-iuchair",
+  "keyboard_shortcuts.keys.alt": "Alt",
+  "keyboard_shortcuts.keys.backspace": "Backspace",
+  "keyboard_shortcuts.keys.enter": "Enter",
+  "keyboard_shortcuts.keys.esc": "Esc",
+  "keyboard_shortcuts.keys.page_down": "Page Down",
+  "keyboard_shortcuts.keys.page_up": "Page Up",
   "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",
@@ -812,6 +842,7 @@
   "keyboard_shortcuts.toggle_sensitivity": "Seall/Falaich na meadhanan",
   "keyboard_shortcuts.toot": "Tòisich air post ùr",
   "keyboard_shortcuts.top": "Gluais gu bàrr na liosta",
+  "keyboard_shortcuts.translate": "Eadar-theangaich post",
   "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",
@@ -822,6 +853,7 @@
   "lightbox.zoom_in": "Sùm dhan fhìor-mheud",
   "lightbox.zoom_out": "Sùm fèin-obrachail",
   "limited_account_hint.action": "Seall a’ phròifil co-dhiù",
+  "limited_account_hint.title": "Chaidh a’ phròifil no am frithealaiche seo fhalach le maoir {domain}.",
   "link_preview.author": "Le {name}",
   "link_preview.more_from_author": "Barrachd le {name}",
   "link_preview.shares": "{count, plural, one {{counter} phost} two {{counter} phost} few {{counter} postaichean} other {{counter} post}}",
@@ -883,6 +915,7 @@
   "navigation_bar.live_feed_local": "An saoghal beò (ionadail)",
   "navigation_bar.live_feed_public": "An saoghal beò (poblach)",
   "navigation_bar.logout": "Clàraich a-mach",
+  "navigation_bar.main": "Prìomh-sheòladaireachd",
   "navigation_bar.moderation": "Maorsainneachd",
   "navigation_bar.more": "Barrachd",
   "navigation_bar.mutes": "Cleachdaichean mùchte",
@@ -968,6 +1001,7 @@
   "notifications.column_settings.admin.report": "Gearanan ùra:",
   "notifications.column_settings.admin.sign_up": "Clàraidhean ùra:",
   "notifications.column_settings.alert": "Brathan deasga",
+  "notifications.column_settings.collections": "Cruinneachaidhean:",
   "notifications.column_settings.favourite": "Annsachdan:",
   "notifications.column_settings.filter_bar.advanced": "Seall a h-uile roinn-seòrsa",
   "notifications.column_settings.filter_bar.category": "Bàr-criathraidh luath",
@@ -987,6 +1021,7 @@
   "notifications.column_settings.update": "Deasachaidhean:",
   "notifications.filter.all": "Na h-uile",
   "notifications.filter.boosts": "Brosnachaidhean",
+  "notifications.filter.collections": "Cruinneachaidhean",
   "notifications.filter.favourites": "Annsachdan",
   "notifications.filter.follows": "A’ leantainn",
   "notifications.filter.mentions": "Iomraidhean",
@@ -1003,6 +1038,8 @@
   "notifications.policy.drop": "Leig seachad",
   "notifications.policy.drop_hint": "Cuir a-mach à sealladh gu buan",
   "notifications.policy.filter": "Criathraich",
+  "notifications.policy.filter_bots_hint": "Cunntasan ris a bheil comharra gu bheil iad fèin-obrachail",
+  "notifications.policy.filter_bots_title": "Botaichean",
   "notifications.policy.filter_hint": "Cuir gu bogsa a-steach nam brathan criathraichte",
   "notifications.policy.filter_limited_accounts_hint": "Cuingichte le maoir an fhrithealaiche",
   "notifications.policy.filter_limited_accounts_title": "Cunntasan fo mhaorsainneachd",
@@ -1160,6 +1197,7 @@
   "search_popout.user": "cleachdaiche",
   "search_results.accounts": "Pròifilean",
   "search_results.all": "Na h-uile",
+  "search_results.collections": "Cruinneachaidhean",
   "search_results.hashtags": "Tagaichean hais",
   "search_results.no_results": "Gun toradh.",
   "search_results.no_search_yet": "Feuch an lorg thu postaichean, pròifilean no tagaichean hais.",
@@ -1280,6 +1318,7 @@
   "tabs_bar.menu": "Clàr-taice",
   "tabs_bar.notifications": "Brathan",
   "tabs_bar.publish": "Post ùr",
+  "tabs_bar.quick_links": "Grad-cheanglaichean",
   "tabs_bar.search": "Lorg",
   "tag.remove": "Thoir air falbh",
   "terms_of_service.effective_as_of": "Èifeachdach on {date}",

app/javascript/mastodon/locales/gl.json

@@ -561,7 +561,7 @@
   "confirmations.remove_from_followers.message": "{name} vai deixar de seguirte. É isto o que queres?",
   "confirmations.remove_from_followers.title": "Quitar seguidora?",
   "confirmations.revoke_collection_inclusion.confirm": "Quítame",
-  "confirmations.revoke_collection_inclusion.message": "A acción é definitiva, a creadora da colección non poderá volver a engadirte máis adiante.",
+  "confirmations.revoke_collection_inclusion.message": "Non vai poder engadirte a esta colección durante 24 horas. Para evitar de xeito permanente que te volva a engadir podes bloquear a conta que a creou.",
   "confirmations.revoke_collection_inclusion.title": "Queres que non te inclúan nesta colección?",
   "confirmations.revoke_quote.confirm": "Eliminar publicación",
   "confirmations.revoke_quote.message": "Esta acción non se pode desfacer.",
@@ -649,6 +649,7 @@
   "empty_column.collections": "{acct} aínda non creou ningunha colección.",
   "empty_column.collections.featured_in": "Non te engadiron a ningunha colección.",
   "empty_column.collections.featured_in_undiscoverable": "Para que outras persoas poidan engadirte ás súas coleccións ter que conceder permiso para descubrimento da conta en <link>Preferencias > Privacidade e alcance</link>",
+  "empty_column.collections_self": "Aínda non creaches ningunha colección.",
   "empty_column.community": "A cronoloxía local está baleira. Escribe algo de xeito público para espallalo!",
   "empty_column.direct": "Aínda non tes mencións privadas. Cando envíes ou recibas unha, aparecerá aquí.",
   "empty_column.disabled_feed": "A administración do teu servidor desactivou esta canle.",

app/javascript/mastodon/locales/he.json

@@ -561,7 +561,7 @@
   "confirmations.remove_from_followers.message": "{name} יוסר/תוסר ממעקב אחריך. האם להמשיך?",
   "confirmations.remove_from_followers.title": "להסיר עוקב/עוקבת?",
   "confirmations.revoke_collection_inclusion.confirm": "הסירוני",
-  "confirmations.revoke_collection_inclusion.message": "פעולה זו היא סופית, והאוצרים לא יוכלו להוסיף אותך יותר לאוסף בעתיד.",
+  "confirmations.revoke_collection_inclusion.message": "אוצרי האוסף לא יוכלו להוסיפך חזרה לאוסף זה למשך 24 שעות. כדי למנוע מהם להוסיפך לאוספים באופן קבוע, ניתן לחסום אותם.",
   "confirmations.revoke_collection_inclusion.title": "להסירך מאוסף זה?",
   "confirmations.revoke_quote.confirm": "הסרת הודעה",
   "confirmations.revoke_quote.message": "פעולה זו אינה הפיכה.",
@@ -649,6 +649,7 @@
   "empty_column.collections": "{acct} עוד לא יצרו אוספים.",
   "empty_column.collections.featured_in": "עוד לא הוסיפו אותך לאף אוסף.",
   "empty_column.collections.featured_in_undiscoverable": "כדי שאחרים יוכלו להוסיפך לאוספים, עליך לאפשר להופיע ב\"תגליות\" תחת <link>העדפות > פרטיות ומידת חשיפה</link>",
+  "empty_column.collections_self": "עוד לא יצרת אוספים.",
   "empty_column.community": "פיד השרת המקומי ריק. יש לפרסם משהו כדי שדברים יתרחילו להתגלגל!",
   "empty_column.direct": "אין לך שום הודעות פרטיות עדיין. כשתשלחו או תקבלו אחת, היא תופיע כאן.",
   "empty_column.disabled_feed": "פיד זה נחסם לשימוש על ידי מנהלי השרת שלך.",
@@ -689,12 +690,12 @@
   "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}",

app/javascript/mastodon/locales/hu.json

@@ -561,7 +561,7 @@
   "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_collection_inclusion.confirm": "Saját magam eltávolítása",
-  "confirmations.revoke_collection_inclusion.message": "Ez a művelet végleges, és a kurátor nem fog tudni újra hozzáadni ehhez a gyűjteményhez.",
+  "confirmations.revoke_collection_inclusion.message": "A kurátor 24 óráig nem fog tudni hozzáadni ehhez a gyűjteményhez. Hogy véglegesen megakadályozd, hogy gyűjteményekhez adjon, letilthatod.",
   "confirmations.revoke_collection_inclusion.title": "Eltávolítod magadat ebből a gyűjteményből?",
   "confirmations.revoke_quote.confirm": "Bejegyzés eltávolítása",
   "confirmations.revoke_quote.message": "Ez a művelet nem vonható vissza.",
@@ -649,6 +649,7 @@
   "empty_column.collections": "{acct} még nem hozott létre gyűjteményt.",
   "empty_column.collections.featured_in": "Még nem adtak hozzá egyetlen gyűjteményhez sem.",
   "empty_column.collections.featured_in_undiscoverable": "Hogy mások hozzáadhassanak gyűjteményekhez, engedélyezned kell a kiemelést a felfedezési élményekben a <link>Beállítások > Adatvédelem és elérés</link> alatt",
+  "empty_column.collections_self": "Még nem hoztál létre gyűjteményt.",
   "empty_column.community": "A helyi idővonal üres. Tégy közzé valamit nyilvánosan, hogy elindítsd az eseményeket!",
   "empty_column.direct": "Még nincs egy személyes említésed sem. Küldéskor vagy fogadáskor itt fognak megjelenni.",
   "empty_column.disabled_feed": "A kiszolgálód rendszergazdái letiltották ezt a hírfolyamot.",
@@ -780,6 +781,7 @@
   "home.pending_critical_update.link": "Frissítések megtekintése",
   "home.pending_critical_update.title": "Kritikus biztonsági frissítés érhető el!",
   "home.show_announcements": "Közlemények megjelenítése",
+  "ignore_notifications_modal.bots_title": "Botok értesítéseinek figyelmen kívül hagyása?",
   "ignore_notifications_modal.disclaimer": "A Mastodon nem tudja értesíteni azokat a felhasználókat, akiknek figyelmen kívül hagytad az értesítéseit. Az értesítések figyelmen kívül hagyása nem állítja meg az üzenetek elküldését.",
   "ignore_notifications_modal.filter_instead": "Inkább szűrés",
   "ignore_notifications_modal.filter_to_act_users": "Továbbra is el tudod fogadni, el tudod utasítani vagy tudod jelenteni a felhasználókat",
@@ -1042,6 +1044,8 @@
   "notifications.policy.drop": "Figyelmen kívül hagyás",
   "notifications.policy.drop_hint": "Küldés a semmibe, többé ne jelenjen meg",
   "notifications.policy.filter": "Szűrő",
+  "notifications.policy.filter_bots_hint": "Automatizáltnak jelölt fiókok",
+  "notifications.policy.filter_bots_title": "Botok",
   "notifications.policy.filter_hint": "Küldés a szűrt értesítések közé",
   "notifications.policy.filter_limited_accounts_hint": "A szerver moderátorai által korlátozott",
   "notifications.policy.filter_limited_accounts_title": "Moderált fiókok",

app/javascript/mastodon/locales/is.json

@@ -561,7 +561,6 @@
   "confirmations.remove_from_followers.message": "{name} mun hætta að fylgja þér. Ertu viss um að þú viljir halda áfram?",
   "confirmations.remove_from_followers.title": "Fjarlægja fylgjanda?",
   "confirmations.revoke_collection_inclusion.confirm": "Fjarlægja mig",
-  "confirmations.revoke_collection_inclusion.message": "Þessi aðgerð er varanleg og umsjónaraðili safnsins mun ekki geta bætt þér aftur við síðar.",
   "confirmations.revoke_collection_inclusion.title": "Á að fjarlægja þig úr þessu safni?",
   "confirmations.revoke_quote.confirm": "Fjarlægja færslu",
   "confirmations.revoke_quote.message": "Þessa aðgerð er ekki hægt að afturkalla.",
@@ -649,6 +648,7 @@
   "empty_column.collections": "{acct} hefur enn ekki útbúið nein söfn.",
   "empty_column.collections.featured_in": "Þér hefur enn ekki verið bætt við nein söfn.",
   "empty_column.collections.featured_in_undiscoverable": "Til þess að fólk geti bætt þér í söfn þá þarftu að leyfa að þú komir upp í leitum, en það er gert í <link>Kjörstillingar > Gagnaleynd og útbreiðsla</link>",
+  "empty_column.collections_self": "Þú hefur enn ekki útbúið nein söfn.",
   "empty_column.community": "Staðværa tímalínan er tóm. Skrifaðu eitthvað opinberlega til að láta boltann fara að rúlla!",
   "empty_column.direct": "Þú ert ekki ennþá með neitt einkaspjall við neinn. Þegar þú sendir eða tekur við slíku, mun það birtast hér.",
   "empty_column.disabled_feed": "Þetta streymi hefur verið gert óvirkt af stjórnendum netþjónis þíns.",

app/javascript/mastodon/locales/it.json

@@ -561,7 +561,7 @@
   "confirmations.remove_from_followers.message": "{name} smetterà di seguirti. Si è sicuri di voler procedere?",
   "confirmations.remove_from_followers.title": "Rimuovere il follower?",
   "confirmations.revoke_collection_inclusion.confirm": "Rimuovimi",
-  "confirmations.revoke_collection_inclusion.message": "Questa azione è permanente e l'utente responsabile della collezione non sarà in grado di aggiungerti nuovamente ad essa in seguito.",
+  "confirmations.revoke_collection_inclusion.message": "L'account che gestisce la collezione non potrà aggiungerti nuovamente per 24 ore. Per impedirgli definitivamente di aggiungerti alle collezioni, puoi bloccarlo.",
   "confirmations.revoke_collection_inclusion.title": "Rimuovere te stesso/a da questa collezione?",
   "confirmations.revoke_quote.confirm": "Elimina il post",
   "confirmations.revoke_quote.message": "Questa azione non può essere annullata.",

app/javascript/mastodon/locales/ko.json

@@ -218,14 +218,15 @@
   "account_edit.name_modal.edit_title": "표시되는 이름 수정",
   "account_edit.profile_tab.button_label": "사용자 지정",
   "account_edit.profile_tab.hint.description": "이 설정은 공식 앱을 사용하는 {server} 사용자가 보는 내용을 설정하지만 다른 서버나 서드파티 앱 사용자에게는 다르게 나타날 수 있습니다.",
-  "account_edit.profile_tab.hint.title": "환경에 따라 다르게 보일 수 있습니다",
+  "account_edit.profile_tab.hint.title": "서로 다르게 표시됨",
   "account_edit.profile_tab.show_featured.description": "'추천'은 다른 계정을 소개할 수 있는 선택적인 탭입니다.",
-  "account_edit.profile_tab.show_featured.title": "'추천' 탭 표시",
+  "account_edit.profile_tab.show_featured.title": "'추천' 탭 보이기",
   "account_edit.profile_tab.show_media.description": "'미디어' 탭은 이미지나 비디오가 들어간 게시물을 보여주는 선택적인 탭입니다.",
-  "account_edit.profile_tab.show_media.title": "'미디어' 탭 표시",
+  "account_edit.profile_tab.show_media.title": "'미디어' 탭 보이기",
   "account_edit.profile_tab.show_media_replies.description": "활성화 하면 미디어 탭은 내 게시물과 다른 사람에게 한 답글을 모두 보여줍니다.",
   "account_edit.profile_tab.show_media_replies.title": "'미디어' 탭에 답글 포함",
-  "account_edit.profile_tab.show_relations.title": "팔로워와 팔로잉 표시",
+  "account_edit.profile_tab.show_relations.description": "내가 팔로우 하거나 나를 팔로우 하는 계정을 내 프로필에 보여줍니다. 내가 팔로우하는 당사자는 여전히 그 사실을 볼 수 있습니다.",
+  "account_edit.profile_tab.show_relations.title": "팔로워와 팔로잉 보여주기",
   "account_edit.profile_tab.subtitle": "내 프로필이 어떻게 보여질지를 원하는대로 꾸며보세요.",
   "account_edit.profile_tab.title": "프로필 표시 설정",
   "account_edit.save": "저장",
@@ -250,6 +251,7 @@
   "account_edit.verified_modal.title": "인증된 링크 추가하는 방법",
   "account_edit_tags.add_tag": "#{tagName} 추가",
   "account_edit_tags.column_title": "태그 편집",
+  "account_edit_tags.help_text": "추천 해시태그는 사용자들이 내 프로필에서 발견하고 상호작용하는데 도움을 줍니다. 프로필 페이지의 활동 뷰에 필터로 나타납니다.",
   "account_edit_tags.max_tags_reached": "추천 해시태그 최대 개수를 초과합니다.",
   "account_edit_tags.search_placeholder": "해시태그를 입력하세요…",
   "account_edit_tags.suggestions": "제안:",
@@ -404,9 +406,9 @@
   "collections.hints.accounts_counter": "계정 {count}/{max}개",
   "collections.last_updated_at": "마지막 업데이트: {date}",
   "collections.list.collections_with_count": "{count, plural, other {컬렉션 #개}}",
-  "collections.list.created_by_author": "{name} 님이 생성함",
-  "collections.list.created_by_you": "내가 생성함",
-  "collections.list.featuring_you": "나를 추천",
+  "collections.list.created_by_author": "{name} 님이 만듦",
+  "collections.list.created_by_you": "내가 만듦",
+  "collections.list.featuring_you": "나를 추천함",
   "collections.manage_accounts": "계정 관리하기",
   "collections.mark_as_sensitive": "민감함으로 설정",
   "collections.mark_as_sensitive_hint": "열람 주의문구 뒤에 이 컬렉션의 설명과 계정을 숨깁니다. 컬렉션의 이름은 항상 보여집니다.",
@@ -431,7 +433,9 @@
   "collections.sort_last_active": "최근 활동",
   "collections.sort_most_followers": "팔로워 많은순",
   "collections.suggestions.can_not_add": "추가할 수 없음",
+  "collections.suggestions.can_not_add_desc": "이 계정들은 디스커버리에 참여하지 않았거나 컬렉션을 지원하지 않는 서버에 있습니다.",
   "collections.suggestions.must_follow": "먼저 팔로우해야합니다",
+  "collections.suggestions.must_follow_desc": "이 계정들은 팔로우 요청을 리뷰합니다. 팔로워들은 컬렉션에 이들을 넣을 수 있습니다.",
   "collections.topic_hint": "이 컬렉션의 주제가 무엇인지 다른 사용자들이 이해할 수 있도록 해시태그를 추가하세요.",
   "collections.topic_special_chars_hint": "특수문자는 저장할 때 삭제됩니다",
   "collections.unlisted_collections_description": "내 프로필에 나타나지 않습니다. 링크를 가진 누구나 볼 수 있습니다.",
@@ -557,7 +561,7 @@
   "confirmations.remove_from_followers.message": "{name} 님이 나를 팔로우하지 않게 됩니다. 계속할까요?",
   "confirmations.remove_from_followers.title": "팔로워를 제거할까요?",
   "confirmations.revoke_collection_inclusion.confirm": "나를 제거하기",
-  "confirmations.revoke_collection_inclusion.message": "이 작업은 영구적이며 큐레이터는 나를 앞으로 다시 추가할 수 없습니다.",
+  "confirmations.revoke_collection_inclusion.message": "큐레이터는 앞으로 24시간동안 나를 다시 컬렉션에 추가할 수 없습니다. 나를 추가하는 것을 영구적으로 막으려면 큐레이터를 차단할 수 있습니다.",
   "confirmations.revoke_collection_inclusion.title": "나를 이 컬렉션에서 제거할까요?",
   "confirmations.revoke_quote.confirm": "게시물 삭제",
   "confirmations.revoke_quote.message": "이 작업은 되돌릴 수 없습니다.",
@@ -607,6 +611,7 @@
   "dropdown.empty": "옵션 선택",
   "email_subscriptions.email": "이메일",
   "email_subscriptions.form.action": "구독",
+  "email_subscriptions.form.bottom": "마스토돈 계정을 만들지 않고 게시물을 수신하세요. 언제든지 구독을 해지할 수 있습니다. 더 알아보려면 <a>개인정보처리방침</a>을 참고하세요.",
   "email_subscriptions.submitted.title": "한 단계 더",
   "email_subscriptions.validation.email.blocked": "차단된 이메일 공급자",
   "email_subscriptions.validation.email.invalid": "이메일 주소가 올바르지 않습니다",
@@ -631,7 +636,7 @@
   "empty_column.account_featured_self.no_collections_button": "컬렉션 생성",
   "empty_column.account_featured_self.no_collections_hide_tab": "대신 탭 숨기기",
   "empty_column.account_featured_self.showcase_accounts": "좋아하는 계정을 남들에게 소개하세요",
-  "empty_column.account_featured_self.showcase_accounts_desc": "컬렉션은 다른 사람들이 페디버스에서 더 많은 것을 발견할 수 있도록 선별된 계정 목록입니다.",
+  "empty_column.account_featured_self.showcase_accounts_desc": "컬렉션은 남들이 페디버스에서 더 많은 것을 발견할 수 있도록 선별한 계정 목록입니다.",
   "empty_column.account_featured_unknown.other": "이 계정은 아직 아무 것도 추천하지 않았습니다.",
   "empty_column.account_hides_collections": "이 사용자는 이 정보를 사용할 수 없도록 설정했습니다",
   "empty_column.account_suspended": "계정 정지됨",
@@ -642,6 +647,7 @@
   "empty_column.collections": "{acct} 님은 아직 컬렉션을 생성하지 않았습니다.",
   "empty_column.collections.featured_in": "아직 어떤 컬렉션에도 추가되지 않았습니다.",
   "empty_column.collections.featured_in_undiscoverable": "사람들이 나를 컬렉션에 추가하려면 그 전에 <link>설정 > 개인정보와 도달</link>에서 나를 발견하기 기능에서 추천하도록 허용해야 합니다",
+  "empty_column.collections_self": "아직 컬렉션을 만들지 않았습니다.",
   "empty_column.community": "로컬 타임라인에 아무것도 없습니다. 아무거나 적어 보세요!",
   "empty_column.direct": "개인 멘션이 없습니다. 보내거나 받으면 여기에 표시됩니다.",
   "empty_column.disabled_feed": "이 피드는 서버 관리자에 의해 비활성화되었습니다.",
@@ -720,8 +726,9 @@
   "follow_suggestions.view_all": "모두 보기",
   "follow_suggestions.who_to_follow": "팔로우할 만한 사람",
   "followed_tags": "팔로우 중인 해시태그",
+  "followers.hide_other_followers": "이 사용자는 다른 팔로워 목록을 보여주지 않도록 하였습니다",
   "followers.title": "{name} 님을 팔로우합니다",
-  "following.hide_other_following": "이 사용자는 팔로우 중인 다른 사용자 목록을 보여주지 않기로 했습니다",
+  "following.hide_other_following": "이 사용자는 나머지 팔로우 목록을 보여주지 않도록 하였습니다",
   "following.title": "{name} 님이 팔로우",
   "footer.about": "정보",
   "footer.about_mastodon": "마스토돈 정보",
@@ -772,6 +779,7 @@
   "home.pending_critical_update.link": "업데이트 보기",
   "home.pending_critical_update.title": "긴급 보안 업데이트가 있습니다!",
   "home.show_announcements": "공지사항 보기",
+  "ignore_notifications_modal.bots_title": "봇 계정의 알림을 무시할까요?",
   "ignore_notifications_modal.disclaimer": "사용자들은 그들의 알림이 무시되었다는 사실을 알 수 없습니다. 알림을 무시하더라도 해당 사용자가 보내는 메세지는 전송됩니다.",
   "ignore_notifications_modal.filter_instead": "대신 필터로 거르기",
   "ignore_notifications_modal.filter_to_act_users": "여전히 사용자를 수락, 거절, 신고할 수 있습니다",
@@ -838,6 +846,7 @@
   "keyboard_shortcuts.toggle_sensitivity": "미디어 보이기/숨기기",
   "keyboard_shortcuts.toot": "새 게시물 작성",
   "keyboard_shortcuts.top": "목록의 최상단으로 이동",
+  "keyboard_shortcuts.translate": "게시물 번역",
   "keyboard_shortcuts.unfocus": "작성창에서 포커스 해제",
   "keyboard_shortcuts.up": "리스트에서 위로 이동",
   "learn_more_link.got_it": "확인",
@@ -855,7 +864,7 @@
   "lists.add_member": "추가",
   "lists.add_to_list": "리스트에 추가",
   "lists.add_to_lists": "리스트에 {name} 추가",
-  "lists.create": "생성",
+  "lists.create": "만들기",
   "lists.create_a_list_to_organize": "새 리스트를 만들어 홈 피드를 정리하세요",
   "lists.create_list": "리스트 만들기",
   "lists.delete": "리스트 삭제",
@@ -1033,6 +1042,8 @@
   "notifications.policy.drop": "무시",
   "notifications.policy.drop_hint": "공허로 보내고, 다시는 보지 않습니다",
   "notifications.policy.filter": "필터",
+  "notifications.policy.filter_bots_hint": "자동화된 것으로 표시된 계정",
+  "notifications.policy.filter_bots_title": "봇",
   "notifications.policy.filter_hint": "걸러진 알림 목록으로 보내기",
   "notifications.policy.filter_limited_accounts_hint": "서버 중재자에 의해 제한된 계정들",
   "notifications.policy.filter_limited_accounts_title": "중재된 계정",
@@ -1210,6 +1221,7 @@
   "sign_in_banner.sso_redirect": "로그인 또는 가입하기",
   "skip_links.hotkey": "<span>단축키</span> {hotkey}",
   "skip_links.skip_to_content": "주 내용으로 건너뛰기",
+  "skip_links.skip_to_navigation": "주 내비게이션으로 이동",
   "status.admin_account": "@{name}에 대한 중재 화면 열기",
   "status.admin_domain": "{domain}에 대한 중재 화면 열기",
   "status.admin_status": "중재 화면에서 이 게시물 열기",
@@ -1240,7 +1252,7 @@
   "status.favourite": "좋아요",
   "status.favourites_count": "{count, plural, other {{counter}}} 마음에 들어함",
   "status.filter": "이 게시물을 필터",
-  "status.history.created": "{name} 님이 {date}에 게시함",
+  "status.history.created": "{name} 님이 {date}에 만듦",
   "status.history.edited": "{name} 님이 {date}에 수정함",
   "status.load_more": "더보기",
   "status.media.open": "클릭하여 열기",

app/javascript/mastodon/locales/lv.json

@@ -71,6 +71,9 @@
   "account.in_memoriam": "Piemiņai.",
   "account.join_modal.day": "Diena",
   "account.join_modal.me": "Tu pievienojies {server}",
+  "account.join_modal.me_today": "Šī ir Tava pirmā diena {server}.",
+  "account.join_modal.other": "{name} pievienojās {server}",
+  "account.join_modal.other_today": "Šī ir {name} pirmā diena {server}.",
   "account.joined_short": "Pievienojās",
   "account.languages": "Mainīt abonētās valodas",
   "account.link_verified_on": "Šīs saites piederība tika pārbaudīta {date}",

app/javascript/mastodon/locales/nan-TW.json

@@ -561,7 +561,7 @@
   "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_collection_inclusion.confirm": "Kā我suá掉",
-  "confirmations.revoke_collection_inclusion.message": "Tsit ê行動永永有效，了後建立收藏ê bē當kā lí重加kàu收藏內底。",
+  "confirmations.revoke_collection_inclusion.message": "建立收藏列單ê bē當佇24點鐘內底kā lí重加kàu tsit ê收藏內底。Beh永永避免in kā lí加kàu收藏，lí通封鎖in。",
   "confirmations.revoke_collection_inclusion.title": "敢beh kā家kī對收藏內底suá掉？",
   "confirmations.revoke_quote.confirm": "Thâi掉PO文",
   "confirmations.revoke_quote.message": "Tsit ê動作bē當復原。",
@@ -649,6 +649,7 @@
   "empty_column.collections": "{acct} iáu bē建立任何收藏。",
   "empty_column.collections.featured_in": "Lí iáu buē加添kàu任何收藏。",
   "empty_column.collections.featured_in_undiscoverable": "若beh予lâng kā lí加入去收藏，lí需要kàu<link>偏愛ê設定 > 隱私kap資訊ê及至</link>佇探索經驗允准推薦",
+  "empty_column.collections_self": "Lí iáu bē建立任何收藏。",
   "empty_column.community": "本站時間線是空ê。緊來公開PO文oh！",
   "empty_column.direct": "Lí iáu無任何ê私人訊息。Nā是lí送á是收著私人訊息，ē佇tsia顯示。.",
   "empty_column.disabled_feed": "Tsit ê feed已經hōo lí ê服侍器ê管理員停用。",
@@ -780,6 +781,7 @@
   "home.pending_critical_update.link": "看更新內容",
   "home.pending_critical_update.title": "有重要ê安全更新！",
   "home.show_announcements": "顯示公告",
+  "ignore_notifications_modal.bots_title": "Kám beh忽略機器lâng送ê通知？",
   "ignore_notifications_modal.disclaimer": "Lí所忽略in ê通知ê用者，Mastodonbē當kā lí通知。忽略通知bē當阻擋訊息ê寄送。",
   "ignore_notifications_modal.filter_instead": "改做過濾",
   "ignore_notifications_modal.filter_to_act_users": "Lí猶原ē當接受、拒絕猶是檢舉用者",
@@ -846,6 +848,7 @@
   "keyboard_shortcuts.toggle_sensitivity": "顯示／tshàng媒體",
   "keyboard_shortcuts.toot": "PO新PO文",
   "keyboard_shortcuts.top": "Súa kàu列單ê頭",
+  "keyboard_shortcuts.translate": "Kā PO文翻譯",
   "keyboard_shortcuts.unfocus": "離開輸入框仔／tshiau-tshuē格仔",
   "keyboard_shortcuts.up": "佇列單內kā suá khah面頂",
   "learn_more_link.got_it": "知矣",
@@ -1041,6 +1044,8 @@
   "notifications.policy.drop": "忽略",
   "notifications.policy.drop_hint": "送去虛空，bē koh看見",
   "notifications.policy.filter": "過濾器",
+  "notifications.policy.filter_bots_hint": "標做自動化ê口座",
+  "notifications.policy.filter_bots_title": "機器lâng",
   "notifications.policy.filter_hint": "送kàu受過濾ê通知ê收件kheh-á",
   "notifications.policy.filter_limited_accounts_hint": "Hōo服侍器ê管理員限制",
   "notifications.policy.filter_limited_accounts_title": "受管制ê口座",

app/javascript/mastodon/locales/nl.json

@@ -408,7 +408,7 @@
   "collections.list.collections_with_count": "{count, plural, one {# Verzameling} other {# Verzamelingen}}",
   "collections.list.created_by_author": "Aangemaakt door {name}",
   "collections.list.created_by_you": "Aangemaakt door jou",
-  "collections.list.featuring_you": "Uitgelicht door jou",
+  "collections.list.featuring_you": "Met jou",
   "collections.manage_accounts": "Accounts beheren",
   "collections.mark_as_sensitive": "Als gevoelig markeren",
   "collections.mark_as_sensitive_hint": "Verbergt de omschrijving en de accounts van de verzameling achter een waarschuwing. De naam van de verzameling blijft zichtbaar.",
@@ -561,7 +561,7 @@
   "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_collection_inclusion.confirm": "Verwijder mij",
-  "confirmations.revoke_collection_inclusion.message": "Deze actie is definitief en de curator kan je later niet opnieuw aan de verzameling toevoegen.",
+  "confirmations.revoke_collection_inclusion.message": "De komende 24 uur is het voor de maker van de verzameling niet mogelijk om je opnieuw aan de verzameling toe te voegen. Om dit definitief te voorkomen dien je de maker te blokkeren.",
   "confirmations.revoke_collection_inclusion.title": "Jezelf uit deze collectie verwijderen?",
   "confirmations.revoke_quote.confirm": "Bericht verwijderen",
   "confirmations.revoke_quote.message": "Deze actie kan niet ongedaan worden gemaakt.",
@@ -649,6 +649,7 @@
   "empty_column.collections": "{acct} heeft nog geen verzamelingen aangemaakt.",
   "empty_column.collections.featured_in": "Je bent aan nog geen enkele verzameling toegevoegd.",
   "empty_column.collections.featured_in_undiscoverable": "Om ervoor te zorgen dat mensen je aan verzamelingen kunnen toevoegen, moet je jouw account en berichten laten uitlichten door Mastodon onder <link>Instellingen > Privacy en bereik</link>",
+  "empty_column.collections_self": "Je hebt nog geen enkele verzameling aangemaakt.",
   "empty_column.community": "De lokale tijdlijn is nog leeg. Plaats een openbaar bericht om de spits af te bijten!",
   "empty_column.direct": "Je hebt nog geen privéberichten. Wanneer je er een verstuurt of ontvangt, komen deze hier te staan.",
   "empty_column.disabled_feed": "Deze tijdlijn is uitgeschakeld door je serverbeheerders.",

app/javascript/mastodon/locales/nn.json

@@ -561,7 +561,6 @@
   "confirmations.remove_from_followers.message": "{name} vil ikkje fylgja deg meir. Vil du halda fram?",
   "confirmations.remove_from_followers.title": "Fjern fylgjar?",
   "confirmations.revoke_collection_inclusion.confirm": "Fjern meg",
-  "confirmations.revoke_collection_inclusion.message": "Denne handlinga er endeleg, og kuratoren kan ikkje leggja deg til samlinga på nytt seinare.",
   "confirmations.revoke_collection_inclusion.title": "Vil du fjerna deg sjølv frå denne samlinga?",
   "confirmations.revoke_quote.confirm": "Fjern innlegget",
   "confirmations.revoke_quote.message": "Du kan ikkje angra denne handlinga.",

app/javascript/mastodon/locales/pa.json

@@ -1,6 +1,7 @@
 {
   "about.contact": "ਸੰਪਰਕ:",
   "about.default_locale": "ਮੂਲ",
+  "about.disclaimer": "Mastodon ਇੱਕ ਆਜ਼ਾਦ, ਖੁੱਲ੍ਹੇ ਸਰੋਤ ਵਾਲਾ ਸਾਫਟਵੇਅਰ ਹੈ ਅਤੇ Mastodon GmbH ਦਾ ਮਾਰਕਾ ਹੈ।",
   "about.domain_blocks.no_reason_available": "ਕਾਰਨ ਮੌਜੂਦ ਨਹੀਂ ਹੈ",
   "about.domain_blocks.silenced.title": "ਸੀਮਿਤ",
   "about.domain_blocks.suspended.title": "ਸਸਪੈਂਡ ਕੀਤਾ",
@@ -35,7 +36,12 @@
   "account.familiar_followers_two": "{name1} ਅਤੇ {name2} ਵਲੋਂ ਫ਼ਾਲੋ ਕੀਤਾ",
   "account.featured": "ਫ਼ੀਚਰ",
   "account.featured.accounts": "ਪਰੋਫਾਈਲ",
+  "account.featured.collections": "ਭੰਡਾਰ",
+  "account.featured.new_collection": "ਨਵਾਂ ਭੰਡਾਰ",
+  "account.field_overflow": "ਪੂਰਾ ਪ੍ਰਸੰਗ ਵੇਖਾਓ",
   "account.filters.all": "ਸਾਰੀਆਂ ਸਰਗਰਮੀਆਂ",
+  "account.filters.boosts_toggle": "ਬੂਸਟ ਵੇਖਾਓ",
+  "account.filters.posts_boosts": "ਪੋਸਟਾਂ ਅਤੇ ਬੂਸਟ",
   "account.filters.posts_only": "ਪੋਸਟਾਂ",
   "account.filters.posts_replies": "ਪੋਸਟਾਂ ਅਤੇ ਜਵਾਬ",
   "account.filters.replies_toggle": "ਜਵਾਬਾਂ ਨੂੰ ਵੇਖੋ",
@@ -57,8 +63,11 @@
   "account.hide_reblogs": "{name} ਵਲੋਂ ਬੂਸਟ ਨੂੰ ਲੁਕਾਓ",
   "account.join_modal.day": "ਦਿਨ",
   "account.joined_short": "ਜੁਆਇਨ ਕੀਤਾ",
+  "account.last_active": "ਪਿਛਲੀ ਸਰਗਰਮੀ",
   "account.media": "ਮੀਡੀਆ",
   "account.mention": "@{name} ਦਾ ਜ਼ਿਕਰ",
+  "account.menu.add_to_collection": "ਭੰਡਾਰ ਵਿੱਚ ਜੋੜੋ…",
+  "account.menu.add_to_list": "ਸੂਚੀ ਵਿੱਚ ਜੋੜੋ…",
   "account.menu.block": "ਖਾਤੇ ਉੱਤੇ ਪਾਬੰਦੀ ਲਾਓ",
   "account.menu.block_domain": "{domain} ਉੱਤੇ ਪਾਬੰਦੀ ਲਾਓ",
   "account.menu.copied": "ਖਾਤਾ ਲਿੰਕ ਨੂੰ ਕਲਿੱਪਬੋਰਡ ਨੂੰ ਕਾਪੀ ਕੀਤਾ",
@@ -77,6 +86,7 @@
   "account.mute_short": "ਮੌਨ ਕਰੋ",
   "account.muted": "ਮੌਨ ਕੀਤੀਆਂ",
   "account.mutual": "ਤੁਸੀਂ ਇੱਕ ਦੂਜੇ ਨੂੰ ਫ਼ਾਲੋ ਕਰਦੇ ਹੋ",
+  "account.name.copy": "ਹੈਂਡਲ ਨੂੰ ਕਾਪੀ ਕਰੋ",
   "account.no_bio": "ਕੋਈ ਵਰਣਨ ਨਹੀਂ ਦਿੱਤਾ।",
   "account.node_modal.edit_title": "ਨਿੱਜੀ ਨੋਟ ਨੂੰ ਸੋਧੋ",
   "account.node_modal.field_label": "ਨਿੱਜੀ ਨੋਟ",
@@ -103,13 +113,44 @@
   "account.unmute": "@{name} ਲਈ ਮੌਨ ਹਟਾਓ",
   "account.unmute_notifications_short": "ਨੋਟਫਿਕੇਸ਼ਨਾਂ ਨੂੰ ਅਣ-ਮੌਨ ਕਰੋ",
   "account.unmute_short": "ਮੌਨ-ਰਹਿਤ ਕਰੋ",
+  "account_edit.advanced_settings.title": "ਤਕਨੀਕੀ ਸੈਟਿੰਗਾਂ",
+  "account_edit.bio.add_label": "ਜਾਣਕਾਰੀ ਨੂੰ ਜੋੜੋ",
+  "account_edit.bio.edit_label": "ਜਾਣਕਾਰੀ ਨੂੰ ਸੋਧੋ",
   "account_edit.bio.title": "ਜਾਣਕਾਰੀ",
   "account_edit.bio_modal.add_title": "ਜਾਣਕਾਰੀ ਨੂੰ ਜੋੜੋ",
   "account_edit.bio_modal.edit_title": "ਜਾਣਕਾਰੀ ਨੂੰ ਸੋਧੋ",
   "account_edit.column_button": "ਮੁਕੰਮਲ",
   "account_edit.column_title": "ਪਰੋਫਾਈਲ ਨੂੰ ਸੋਧੋ",
+  "account_edit.custom_fields.add_label": "ਖੇਤਰ ਨੂੰ ਜੋੜੋ",
+  "account_edit.custom_fields.edit_label": "ਖੇਤਰ ਨੂੰ ਸੋਧੋ",
+  "account_edit.display_name.add_label": "ਡਿਸਪਲੇਅ ਨਾਂ ਨੂੰ ਜੋੜੋ",
+  "account_edit.display_name.title": "ਦਿਖਾਇਆ ਜਾਣ ਵਾਲਾ ਨਾਂ",
+  "account_edit.field_actions.delete": "ਖੇਤਰ ਨੂੰ ਹਟਾਓ",
+  "account_edit.field_actions.edit": "ਖੇਤਰ ਨੂੰ ਸੋਧੋ",
   "account_edit.field_delete_modal.delete_button": "ਹਟਾਓ",
   "account_edit.field_edit_modal.discard_confirm": "ਖਾਰਜ ਕਰੋ",
+  "account_edit.field_edit_modal.value_label": "ਮੁੱਲ",
+  "account_edit.image_delete_modal.delete_button": "ਹਟਾਓ",
+  "account_edit.image_delete_modal.title": "ਚਿੱਤਰ ਨੂੰ ਹਟਾਉਣਾ ਹੈ?",
+  "account_edit.image_edit.add_button": "ਚਿੱਤਰ ਨੂੰ ਜੋੜੋ",
+  "account_edit.image_edit.remove_button": "ਚਿੱਤਰ ਨੂੰ ਹਟਾਓ",
+  "account_edit.image_edit.replace_button": "ਚਿੱਤਰ ਨੂੰ ਬਦਲੋ",
+  "account_edit.item_list.delete": "{name} ਨੂੰ ਹਟਾਓ",
+  "account_edit.item_list.edit": "{name} ਨੂੰ ਸੋਧੋ",
+  "account_edit.name_modal.add_title": "ਡਿਸਪਲੇਅ ਨਾਂ ਨੂੰ ਜੋੜੋ",
+  "account_edit.name_modal.edit_title": "ਡਿਸਪਲੇਅ ਨਾਂ ਨੂੰ ਸੋਧੋ",
+  "account_edit.profile_tab.button_label": "ਕਸਟਮਾਈਜ਼",
+  "account_edit.profile_tab.title": "ਪਰੋਫ਼ਾਇਲ ਡਿਸਪਲੇਅ ਸੈਟਿੰਗਾਂ",
+  "account_edit.save": "ਸੰਭਾਲੋ",
+  "account_edit.upload_modal.back": "ਪਿੱਛੇ",
+  "account_edit.upload_modal.done": "ਮੁਕੰਮਲ",
+  "account_edit.upload_modal.next": "ਅੱਗੇ",
+  "account_edit.upload_modal.step_crop.zoom": "ਜ਼ੂਮ",
+  "account_edit.upload_modal.step_upload.button": "ਫ਼ਾਇਲਾਂ ਦੀ ਝਲਕ",
+  "account_edit.upload_modal.step_upload.dragging": "ਅੱਪਲੋਡ ਲਈ ਡਰੌਪ ਕਰੋ",
+  "account_edit.upload_modal.step_upload.header": "ਚਿੱਤਰ ਨੂੰ ਚੁਣੋ",
+  "account_edit.upload_modal.title_add.avatar": "ਪਰੋਫ਼ਾਇਲ ਫ਼ੋਟੋ ਜੋੜੋ",
+  "account_edit.upload_modal.title_add.header": "ਕਵਰ ਫ਼ੋਟੋ ਜੋੜੋ",
   "admin.dashboard.retention.average": "ਔਸਤ",
   "admin.dashboard.retention.cohort_size": "ਨਵੇਂ ਵਰਤੋਂਕਾਰ",
   "alert.unexpected.title": "ਓਹੋ!",
@@ -128,6 +169,7 @@
   "annual_report.summary.highlighted_post.title": "ਸਭ ਤੋਂ ਵੱਧ ਹਰਮਨਪਿਆਰੀ ਪੋਸਟ",
   "annual_report.summary.most_used_app.most_used_app": "ਸਭ ਤੋਂ ਵੱਧ ਵਰਤੀ ਐਪ",
   "annual_report.summary.new_posts.new_posts": "ਨਵੀਆਂ ਪੋਸਟਾਂ",
+  "annual_report.summary.share_on_mastodon": "Mastodon ਉੱਤੇ ਸਾਂਝਾ ਕਰੋ",
   "audio.hide": "ਆਡੀਓ ਨੂੰ ਲੁਕਾਓ",
   "block_modal.show_less": "ਘੱਟ ਦਿਖਾਓ",
   "block_modal.show_more": "ਵੱਧ ਦਿਖਾਓ",
@@ -146,13 +188,27 @@
   "carousel.slide": "{max, number} ਵਿੱਚੋਂ {current, number} ਸਲਾਈਡ",
   "closed_registrations_modal.find_another_server": "ਹੋਰ ਸਰਵਰ ਲੱਭੋ",
   "closed_registrations_modal.title": "Mastodon ਲਈ ਸਾਈਨ ਅੱਪ ਕਰੋ",
+  "collection.share_modal.share_link_label": "ਲਿੰਕ ਸਾਂਝਾ ਕਰੋ",
+  "collection.share_modal.share_via_post": "Mastodon ਉੱਤੇ ਪੋਸਟ ਕਰੋ",
+  "collections.block_collection_owner": "…ਰਾਹੀਂ ਸਾਂਝਾ ਕਰੋ",
+  "collections.by_account": "{account_handle} ਵਲੋਂ",
   "collections.collection_description": "ਵਰਣਨ",
+  "collections.collection_language": "ਭਾਸ਼ਾ",
+  "collections.collection_language_none": "ਕੋਈ ਨਹੀਂ",
   "collections.collection_name": "ਨਾਂ",
   "collections.collection_topic": "ਵਿਸ਼ਾ",
   "collections.content_warning": "ਸਮੱਗਰੀ ਬਾਰੇ ਚੇਤਾਵਨੀ",
   "collections.continue": "ਜਾਰੀ ਰੱਖੋ",
+  "collections.copy_link": "ਲਿੰਕ ਨੂੰ ਕਾਪੀ ਕਰੋ",
+  "collections.copy_link_confirmation": "ਭੰਡਾਰ ਲਿੰਕ ਨੂੰ ਕਲਿੱਪਬੋਰਡ ਨੂੰ ਕਾਪੀ ਕੀਤਾ",
   "collections.create.basic_details_title": "ਮੁ਼ੱਢਲੇ ਵੇਰਵੇ",
   "collections.create.steps": "ਪੜਾਅ {step}/{total}",
+  "collections.detail.revoke_inclusion": "ਮੈਨੂੰ ਹਟਾਓ",
+  "collections.detail.sensitive_content": "ਸੰਵੇਦਨਸ਼ੀਲ ਸਮੱਗਰੀ",
+  "collections.edit_details": "ਵੇਰਵਿਆਂ ਨੂੰ ਸੋਧੋ",
+  "collections.remove_account": "ਹਟਾਓ",
+  "collections.sensitive": "ਸੰਵੇਦਨਸ਼ੀਲ",
+  "collections.share_short": "ਸਾਂਝਾ ਕਰੋ",
   "collections.view_collection": "ਭੰਡਾਰ ਨੂੰ ਵੇਖੋ",
   "collections.visibility_public": "ਜਨਤਕ",
   "collections.visibility_title": "ਦਿੱਖ",
@@ -245,6 +301,7 @@
   "confirmations.redraft.title": "ਪੋਸਟ ਨੂੰ ਹਟਾ ਕੇ ਮੁੜ-ਡਰਾਫਟ ਕਰਨਾ ਹੈ?",
   "confirmations.remove_from_followers.confirm": "ਫ਼ਾਲੋਅਰ ਨੂੰ ਹਟਾਓ",
   "confirmations.remove_from_followers.title": "ਫ਼ਾਲੋਅਰ ਨੂੰ ਹਟਾਉਣਾ ਹੈ?",
+  "confirmations.revoke_collection_inclusion.confirm": "ਮੈਨੂੰ ਹਟਾਓ",
   "confirmations.revoke_quote.confirm": "ਪੋਸਟ ਨੂੰ ਹਟਾਓ",
   "confirmations.revoke_quote.message": "ਇਸ ਕਾਰਵਾਈ ਨੂੰ ਵਾਪਸ ਨਹੀਂ ਪਰਤਾਇਆ ਜਾ ਸਕਦਾ ਹੈ।",
   "confirmations.revoke_quote.title": "ਪੋਸਟ ਨੂੰ ਹਟਾਉਣਾ ਹੈ?",
@@ -256,13 +313,17 @@
   "content_warning.hide": "ਪੋਸਟ ਨੂੰ ਲੁਕਾਓ",
   "content_warning.show": "ਕਿਵੇਂ ਵੀ ਵੇਖਾਓ",
   "content_warning.show_more": "ਹੋਰ ਵੇਖਾਓ",
+  "content_warning.show_short": "ਵੇਖਾਓ",
   "conversation.delete": "ਗੱਲਬਾਤ ਨੂੰ ਹਟਾਓ",
   "conversation.mark_as_read": "ਪੜ੍ਹੇ ਵਜੋਂ ਨਿਸ਼ਾਨੀ ਲਾਓ",
   "conversation.open": "ਗੱਲਬਾਤ ਨੂੰ ਵੇਖੋ",
   "conversation.with": "{names} ਨਾਲ",
   "copy_icon_button.copied": "ਕਲਿੱਪਬੋਰਡ 'ਤੇ ਕਾਪੀ ਕਰੋ",
+  "copy_icon_button.copy_this_text": "ਲਿੰਕ ਨੂੰ ਕਲਿੱਪਬੋਰਡ ਵਿੱਚ ਕਾਪੀ ਕਰੋ",
   "copypaste.copied": "ਕਾਪੀ ਕੀਤਾ",
   "copypaste.copy_to_clipboard": "ਕਲਿੱਪਬੋਰਡ 'ਤੇ ਕਾਪੀ ਕਰੋ",
+  "custom_homepage.about": "ਇਸ ਬਾਰੇ",
+  "custom_homepage.about_this_server": "ਇਸ ਸਰਵਰ ਬਾਰੇ",
   "directory.local": "ਸਿਰਫ਼ {domain} ਤੋਂ",
   "directory.new_arrivals": "ਨਵੇਂ ਆਉਣ ਵਾਲੇ",
   "directory.recently_active": "ਸੱਜਰੇ ਸਰਗਰਮ",
@@ -273,6 +334,7 @@
   "domain_block_modal.block_account_instead": "ਇਸ ਦੀ ਬਜਾਏ @{name} ਉੱਤੇ ਪਾਬੰਦੀ ਲਾਓ",
   "domain_block_modal.title": "ਡੋਮੇਨ ਉੱਤੇ ਪਾਬੰਦੀ ਲਾਉਣੀ ਹੈ?",
   "dropdown.empty": "ਕੋਈ ਚੋਣ ਕਰੋ",
+  "email_subscriptions.email": "ਈਮੇਲ",
   "embed.instructions": "ਹੇਠਲੇ ਕੋਡ ਨੂੰ ਕਾਪੀ ਕਰਕੇ ਆਪਣੀ ਵੈੱਬਸਾਈਟ ਉੱਤੇ ਇਸ ਪੋਸਟ ਨੂੰ ਇੰਬੈੱਡ ਕਰੋ।",
   "emoji_button.activity": "ਗਤੀਵਿਧੀ",
   "emoji_button.clear": "ਮਿਟਾਓ",
@@ -305,6 +367,8 @@
   "featured_carousel.header": "{count, plural, one {ਟੰਗੀ ਹੋਈ ਪੋਸਟ} other {ਟੰਗੀਆਂ ਹੋਈਆਂ ਪੋਸਟਾਂ}}",
   "featured_carousel.slide": "{max, number} ਵਿੱਚੋਂ {current, number} ਪੋਸਟ",
   "featured_tags.more_items": "+{count}",
+  "featured_tags.suggestions.add": "ਜੋੜੋ",
+  "featured_tags.suggestions.dismiss": "ਨਹੀਂ, ਧੰਨਵਾਦ",
   "filter_modal.added.expired_title": "ਫਿਲਟਰ ਦੀ ਮਿਆਦ ਪੁੱਗੀ!",
   "filter_modal.added.review_and_configure_title": "ਫਿਲਟਰ ਸੈਟਿੰਗਾਂ",
   "filter_modal.added.settings_link": "ਸੈਟਿੰਗਾਂ ਸਫ਼ਾ",
@@ -327,6 +391,8 @@
   "follow_suggestions.view_all": "ਸਭ ਵੇਖੋ",
   "follow_suggestions.who_to_follow": "ਕਿਸ ਨੂੰ ਫ਼ਾਲੋ ਕਰੀਏ",
   "followed_tags": "ਫ਼ਾਲੋ ਕੀਤੇ ਹੈਸ਼ਟੈਗ",
+  "followers.title": "{name} ਨੂੰ ਫ਼ਾਲੋ ਕਰਦੇ",
+  "following.title": "{name} ਵਲੋਂ ਫ਼ਾਲੋ ਕੀਤਾ",
   "footer.about": "ਸਾਡੇ ਬਾਰੇ",
   "footer.about_mastodon": "Mastodon ਬਾਰੇ",
   "footer.about_server": "{domain} ਬਾਰੇ",
@@ -451,6 +517,7 @@
   "navigation_bar.automated_deletion": "ਆਪਣੇ-ਆਪ ਹਟਾਈ ਪੋਸਟ",
   "navigation_bar.blocks": "ਪਾਬੰਦੀ ਲਾਏ ਵਰਤੋਂਕਾਰ",
   "navigation_bar.bookmarks": "ਬੁੱਕਮਾਰਕ",
+  "navigation_bar.collections": "ਭੰਡਾਰ",
   "navigation_bar.direct": "ਨਿੱਜੀ ਜ਼ਿਕਰ",
   "navigation_bar.domain_blocks": "ਪਾਬੰਦੀ ਲਾਏ ਡੋਮੇਨ",
   "navigation_bar.favourites": "ਮਨਪਸੰਦ",
@@ -462,6 +529,7 @@
   "navigation_bar.live_feed_local": "ਲਾਈਵ ਫੀਡ (ਲੋਕਲ)",
   "navigation_bar.live_feed_public": "ਲਾਈਵ ਫੀਡ (ਪਬਲਿਕ)",
   "navigation_bar.logout": "ਲਾਗ ਆਉਟ",
+  "navigation_bar.main": "ਮੁੱਖ",
   "navigation_bar.more": "ਹੋਰ",
   "navigation_bar.mutes": "ਮੌਨ ਕੀਤੇ ਵਰਤੋਂਕਾਰ",
   "navigation_bar.preferences": "ਪਸੰਦਾਂ",

app/javascript/mastodon/locales/pt-BR.json

@@ -561,7 +561,7 @@
   "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_collection_inclusion.confirm": "Remover-me",
-  "confirmations.revoke_collection_inclusion.message": "Esta ação é permanente e o curador não poderá lhe adicionar de volta à coleção mais tarde.",
+  "confirmations.revoke_collection_inclusion.message": "Este curador não poderá re-adicioná-lo a esta coleção por 24 horas. Para impedir permanentemente que adicionem você às coleções, você pode bloqueá-los.",
   "confirmations.revoke_collection_inclusion.title": "Remover-se desta coleção?",
   "confirmations.revoke_quote.confirm": "Remover publicação",
   "confirmations.revoke_quote.message": "Esta ação não pode ser desfeita.",

app/javascript/mastodon/locales/pt-PT.json

@@ -519,7 +519,6 @@
   "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_collection_inclusion.confirm": "Remover-me",
-  "confirmations.revoke_collection_inclusion.message": "Esta ação é permanente, e o curador não poderá adicioná-lo novamente à coleção mais tarde.",
   "confirmations.revoke_collection_inclusion.title": "Remover-se desta coleção?",
   "confirmations.revoke_quote.confirm": "Remover publicação",
   "confirmations.revoke_quote.message": "Esta ação é irreversível.",

app/javascript/mastodon/locales/ru.json

@@ -499,7 +499,6 @@
   "confirmations.remove_from_followers.message": "Пользователь {name} перестанет быть подписан на вас. Продолжить?",
   "confirmations.remove_from_followers.title": "Убрать подписчика?",
   "confirmations.revoke_collection_inclusion.confirm": "Исключить меня",
-  "confirmations.revoke_collection_inclusion.message": "Это действие необратимо, и куратор подборки не сможет добавить вас в неё заново.",
   "confirmations.revoke_collection_inclusion.title": "Исключить вас из подборки?",
   "confirmations.revoke_quote.confirm": "Убрать пост",
   "confirmations.revoke_quote.message": "Это действие невозможно отменить.",

app/javascript/mastodon/locales/sq.json

@@ -556,7 +556,7 @@
   "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_collection_inclusion.confirm": "Hiqmëni",
-  "confirmations.revoke_collection_inclusion.message": "Ky veprim është i përhershëm dhe mirëmbajtësi s’do të jetë në gjendje t’ju rishtojë te koleksioni më vonë.",
+  "confirmations.revoke_collection_inclusion.message": "Mirëmbajtësit s’do të jenë në gjendje t’ju rishtojnë te ky koleksion për 24 orë. Për ta penguar shtimin përgjithnjë tuaj prej tyre në koleksione, mund t’i bllokoni.",
   "confirmations.revoke_collection_inclusion.title": "Të hiqeni nga ky koleksion?",
   "confirmations.revoke_quote.confirm": "Hiqe postimin",
   "confirmations.revoke_quote.message": "Ky veprim s’mund të zhbëhet.",

app/javascript/mastodon/locales/sv.json

@@ -561,7 +561,7 @@
   "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_collection_inclusion.confirm": "Ta bort mig",
-  "confirmations.revoke_collection_inclusion.message": "Denna åtgärd är permanent, och kuratorn kommer inte att kunna lägga till dig till samlingen senare.",
+  "confirmations.revoke_collection_inclusion.message": "Kuratorn kommer inte att kunna lägga till dig igen i denna samling i 24 timmar. För att hindra dem från att lägga till dig till samlingar permanent, kan du blockera dem.",
   "confirmations.revoke_collection_inclusion.title": "Ta bort dig själv från denna samling?",
   "confirmations.revoke_quote.confirm": "Ta bort inlägg",
   "confirmations.revoke_quote.message": "Denna åtgärd kan inte ångras.",

app/javascript/mastodon/locales/tr.json

@@ -561,7 +561,7 @@
   "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_collection_inclusion.confirm": "Beni çıkar",
-  "confirmations.revoke_collection_inclusion.message": "Bu eylem kalıcıdır ve koleksiyonu derleyen kişi daha sonra sizi koleksiyona tekrar ekleyemeyecektir.",
+  "confirmations.revoke_collection_inclusion.message": "Küratör, 24 saat boyunca sizi bu koleksiyona tekrar ekleyemeyecek. Sizi koleksiyonlara kalıcı olarak eklemesini engellemek için onu engelleyebilirsiniz.",
   "confirmations.revoke_collection_inclusion.title": "Kendini bu koleksiyondan çıkar?",
   "confirmations.revoke_quote.confirm": "Gönderiyi kaldır",
   "confirmations.revoke_quote.message": "Bu işlem geri alınamaz.",

app/javascript/mastodon/locales/vi.json

@@ -561,7 +561,7 @@
   "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_collection_inclusion.confirm": "Xóa tôi",
-  "confirmations.revoke_collection_inclusion.message": "Thao tác này là vĩnh viễn, người tuyển chọn sẽ không thể thêm lại bạn về sau này.",
+  "confirmations.revoke_collection_inclusion.message": "Người tuyển chọn sẽ không thể thêm bạn vào gói khởi đầu này trong vòng 24 giờ. Để ngăn họ thêm bạn vào gói khởi đầu vĩnh viễn, bạn có thể chặn họ.",
   "confirmations.revoke_collection_inclusion.title": "Xóa bạn khỏi gói khởi đầu này?",
   "confirmations.revoke_quote.confirm": "Gỡ tút",
   "confirmations.revoke_quote.message": "Hành động này không thể hoàn tác.",

app/javascript/mastodon/locales/zh-CN.json

@@ -45,7 +45,7 @@
   "account.featured.collections": "收藏列表",
   "account.featured.new_collection": "新建收藏列表",
   "account.field_overflow": "显示完整内容",
-  "account.filters.all": "全部活动",
+  "account.filters.all": "所有活动",
   "account.filters.boosts_toggle": "显示转嘟",
   "account.filters.posts_boosts": "嘟文与转嘟",
   "account.filters.posts_only": "嘟文",
@@ -57,7 +57,7 @@
   "account.follow_request": "请求关注",
   "account.follow_request_cancel": "取消请求",
   "account.follow_request_cancel_short": "取消",
-  "account.follow_request_short": "请求",
+  "account.follow_request_short": "关注请求",
   "account.followers": "关注者",
   "account.followers.empty": "目前无人关注此用户。",
   "account.followers_counter": "{count, plural, other {{counter} 关注者}}",
@@ -68,10 +68,10 @@
   "account.follows_you": "关注了你",
   "account.go_to_profile": "前往个人资料页",
   "account.hide_reblogs": "隐藏来自 @{name} 的转嘟",
-  "account.in_memoriam": "谨此悼念。",
+  "account.in_memoriam": "谨此纪念。",
   "account.join_modal.day": "天",
   "account.join_modal.me": "你加入 {server} 的时间为",
-  "account.join_modal.me_anniversary": "加入 Mastodon 一周年快乐！你加入 {server} 的时间为",
+  "account.join_modal.me_anniversary": "联邦宇宙周年快乐！你加入 {server} 的时间为",
   "account.join_modal.me_today": "这是你加入 {server} 的第一天！",
   "account.join_modal.other": "{name} 加入 {server} 的时间为",
   "account.join_modal.other_today": "这是 {name} 加入 {server} 的第一天！",
@@ -96,7 +96,7 @@
   "account.menu.hide_reblogs": "在时间线中隐藏转嘟",
   "account.menu.mention": "提及",
   "account.menu.mute": "停止提醒账号",
-  "account.menu.note.description": "仅对你可见",
+  "account.menu.note.description": "仅自己可见",
   "account.menu.open_original_page": "在 {domain} 上查看",
   "account.menu.remove_follower": "移除关注者",
   "account.menu.report": "举报账号",
@@ -120,14 +120,14 @@
   "account.name.help.username_self": "{username} 是你在此服务器上的用户名。另一个服务器上的其他人可能拥有相同的用户名。",
   "account.name_info": "这是什么？",
   "account.no_bio": "未提供描述。",
-  "account.node_modal.callout": "个人备注仅对你个人可见。",
+  "account.node_modal.callout": "个人备注仅自己可见。",
   "account.node_modal.edit_title": "编辑个人备注",
   "account.node_modal.error_unknown": "无法保存备注",
   "account.node_modal.field_label": "个人备注",
   "account.node_modal.save": "保存",
   "account.node_modal.title": "添加个人备注",
   "account.note.edit_button": "编辑",
-  "account.note.title": "个人备注（仅对你可见）",
+  "account.note.title": "个人备注（仅自己可见）",
   "account.open_original_page": "打开原始页面",
   "account.pending": "待定",
   "account.posts": "嘟文",
@@ -154,7 +154,7 @@
   "account_edit.bio.add_label": "添加个人简介",
   "account_edit.bio.edit_label": "编辑个人简介",
   "account_edit.bio.placeholder": "添加一段简短介绍，帮助其他人认识你。",
-  "account_edit.bio.title": "简介",
+  "account_edit.bio.title": "个人简介",
   "account_edit.bio_modal.add_title": "添加个人简介",
   "account_edit.bio_modal.edit_title": "编辑个人简介",
   "account_edit.column_button": "完成",
@@ -245,7 +245,7 @@
   "account_edit.verified_modal.details": "要增加 Mastodon 个人资料的可信度，可以验证指向个人网站的链接。运作方式如下：",
   "account_edit.verified_modal.invisible_link.details": "将链接添加到标头（header）中。其中很重要的部分是 rel=\"me\"，可以防止他人通过用户生成内容模仿。你甚至可以在页面标头中使用 link 标签而不是 {tag}，但包含该部分的 HTML 必须在没有 JavaScript 执行环境下访问时依然存在。",
   "account_edit.verified_modal.invisible_link.summary": "如何隐藏此链接？",
-  "account_edit.verified_modal.step1.header": "复制下面的 HTML 代码并粘贴到你网站的标头（header）中",
+  "account_edit.verified_modal.step1.header": "复制下面的 HTML 代码并粘贴到你网站的标头中",
   "account_edit.verified_modal.step2.details": "如果已经将你的网站添加到自定义字段中，你需要删除并重新添加以触发验证。",
   "account_edit.verified_modal.step2.header": "将你的网站添加到自定义字段",
   "account_edit.verified_modal.title": "如何添加已验证的链接",
@@ -256,7 +256,7 @@
   "account_edit_tags.search_placeholder": "输入话题标签…",
   "account_edit_tags.suggestions": "建议：",
   "account_edit_tags.tag_status_count": "{count, plural, other {# 条嘟文}}",
-  "account_list.hidden_notice": "此内容仅对你可见。要让此列表对其他人可见，请前往<link>{page} > {modal} > {field}</link>。",
+  "account_list.hidden_notice": "此内容仅自己可见。如需向他人展示此列表，请前往<link>{page} > {modal} > {field}</link>。",
   "account_list.total": "{total, plural, other {# 个账号}}",
   "admin.dashboard.daily_retention": "注册后用户留存率（按日计算）",
   "admin.dashboard.monthly_retention": "注册后用户留存率（按月计算）",
@@ -561,7 +561,7 @@
   "confirmations.remove_from_followers.message": "{name} 将停止关注你。你确定要继续吗？",
   "confirmations.remove_from_followers.title": "移除关注者？",
   "confirmations.revoke_collection_inclusion.confirm": "移除我",
-  "confirmations.revoke_collection_inclusion.message": "此操作是永久的，且此收藏列表的制作者之后将无法再将你添加到其中。",
+  "confirmations.revoke_collection_inclusion.message": "收藏列表的创建者在24小时内将无法再将你重新添加到此收藏列表中。要永久阻止此列表的创建者将你加入其收藏列表，你可以屏蔽此用户。",
   "confirmations.revoke_collection_inclusion.title": "将自己从此收藏列表中移除吗？",
   "confirmations.revoke_quote.confirm": "移除嘟文",
   "confirmations.revoke_quote.message": "此操作无法撤销。",

app/javascript/mastodon/locales/zh-TW.json

@@ -394,7 +394,7 @@
   "collections.description_length_hint": "100 字限制",
   "collections.detail.author_added_you_on_date": "{author} 於 {date} 將您加入",
   "collections.detail.loading": "讀取收藏名單中...",
-  "collections.detail.revoke_inclusion": "移除我",
+  "collections.detail.revoke_inclusion": "將我移除",
   "collections.detail.sensitive_content": "敏感內容",
   "collections.detail.sensitive_note": "內容說明與帳號也許不適合所有瀏覽者。",
   "collections.detail.share": "分享此收藏名單",
@@ -560,8 +560,8 @@
   "confirmations.remove_from_followers.confirm": "移除跟隨者",
   "confirmations.remove_from_followers.message": "{name} 將停止跟隨您。您確定要繼續嗎？",
   "confirmations.remove_from_followers.title": "是否移除該跟隨者？",
-  "confirmations.revoke_collection_inclusion.confirm": "移除我",
-  "confirmations.revoke_collection_inclusion.message": "此操作永久有效，且該收藏名單之擁有者無法稍候將您再次加入至此收藏名單。",
+  "confirmations.revoke_collection_inclusion.confirm": "將我移除",
+  "confirmations.revoke_collection_inclusion.message": "內容編輯者於 24 小時內無法將您重新加入至此收藏名單。如欲永久防止他們將您加入收藏名單，您可以封鎖他們。",
   "confirmations.revoke_collection_inclusion.title": "是否將您自此收藏名單中移除？",
   "confirmations.revoke_quote.confirm": "移除嘟文",
   "confirmations.revoke_quote.message": "此動作無法復原。",

app/javascript/mastodon/utils/react_router.tsx

@@ -18,7 +18,7 @@ export const WithOptionalRouterPropTypes = {
 
 export interface OptionalRouterProps {
   ref: unknown;
-  wrappedComponentRef: unknown;
+  wrappedComponentRef?: string | ((...args: unknown[]) => unknown) | object;
 }
 
 // This is copied from https://github.com/remix-run/react-router/blob/v5.3.4/packages/react-router/modules/withRouter.js
@@ -54,14 +54,6 @@ export function withOptionalRouter<
 
   C.displayName = displayName;
   C.WrappedComponent = Component;
-  C.propTypes = {
-    ...Component.propTypes,
-    wrappedComponentRef: PropTypes.oneOfType([
-      PropTypes.string,
-      PropTypes.func,
-      PropTypes.object,
-    ]),
-  };
 
   return hoistStatics(C, Component);
 }

app/javascript/styles/mastodon/components.scss

@@ -3017,7 +3017,6 @@ a.account__display-name {
 
     &__pane {
       height: 100%;
-      overflow: hidden;
       display: flex;
       justify-content: flex-end;
       min-width: 285px;

app/models/account.rb

@@ -76,7 +76,7 @@ class Account < ApplicationRecord
   URL_PREFIX_RE = %r{\Ahttp(s?)://[^/]+}
   USERNAME_ONLY_RE = /\A#{USERNAME_RE}\z/i
   USERNAME_LENGTH_LIMIT = 30
-  DISPLAY_NAME_LENGTH_LIMIT = 30
+  DISPLAY_NAME_LENGTH_LIMIT = 40
   NOTE_LENGTH_LIMIT = 500
 
   # Hard limits for federated content

app/models/collection.rb

@@ -33,6 +33,7 @@ class Collection < ApplicationRecord
   has_many :accepted_collection_items, -> { accepted }, class_name: 'CollectionItem', inverse_of: :collection # rubocop:disable Rails/HasManyOrHasOneDependent
   has_many :collection_reports, dependent: :delete_all
   has_many :accounts, -> { merge(CollectionItem.pending_or_accepted) }, through: :collection_items
+  has_many :notifications, as: :activity, dependent: :destroy
 
   validates :name, presence: true
   validates :name, length: { maximum: 40 }, if: :local?

app/models/notification.rb

@@ -136,7 +136,7 @@ class Notification < ApplicationRecord
     belongs_to :generated_annual_report, inverse_of: false
     belongs_to :quote, inverse_of: :notification
     belongs_to :collection_item, inverse_of: false # TODO: have an inverse?
-    belongs_to :collection, inverse_of: false # TODO: have an inverse?
+    belongs_to :collection, inverse_of: :notifications
   end
 
   validates :type, inclusion: { in: TYPES }

app/serializers/rest/instance_serializer.rb

@@ -31,6 +31,7 @@ class REST::InstanceSerializer < ActiveModel::Serializer
     else
       {
         url: frontend_asset_url('images/preview.png'),
+        description: I18n.t('about.default_thumbnail_description', locale: object.languages[0]),
       }
     end
   end

bin/update

@@ -1,31 +0,0 @@
-#!/usr/bin/env ruby
-require 'fileutils'
-include FileUtils
-
-# path to your application root.
-APP_ROOT = File.expand_path('..', __dir__)
-
-def system!(*args)
-  system(*args) || abort("\n== Command #{args} failed ==")
-end
-
-chdir APP_ROOT do
-  # This script is a way to update your development environment automatically.
-  # Add necessary update steps to this file.
-
-  puts '== Installing dependencies =='
-  system! 'gem install bundler --conservative'
-  system('bundle check') || system!('bundle install')
-
-  # Install JavaScript dependencies if using Yarn
-  system('bin/yarn')
-
-  puts "\n== Updating database =="
-  system! 'bin/rails db:migrate'
-
-  puts "\n== Removing old logs and tempfiles =="
-  system! 'bin/rails log:clear tmp:clear'
-
-  puts "\n== Restarting application server =="
-  system! 'bin/rails restart'
-end

config/initializers/cookie_rotator.rb

@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-# TODO: remove this file some time after 4.3.0
-
-Rails.application.config.after_initialize do
-  Rails.application.config.action_dispatch.cookies_rotations.tap do |cookies|
-    authenticated_encrypted_cookie_salt = Rails.application.config.action_dispatch.authenticated_encrypted_cookie_salt
-    signed_cookie_salt = Rails.application.config.action_dispatch.signed_cookie_salt
-
-    secret_key_base = Rails.application.secret_key_base
-
-    key_generator = ActiveSupport::KeyGenerator.new(
-      secret_key_base, iterations: 1000, hash_digest_class: OpenSSL::Digest::SHA1
-    )
-    key_len = ActiveSupport::MessageEncryptor.key_len
-
-    old_encrypted_secret = key_generator.generate_key(authenticated_encrypted_cookie_salt, key_len)
-    old_signed_secret = key_generator.generate_key(signed_cookie_salt)
-
-    cookies.rotate :encrypted, old_encrypted_secret
-    cookies.rotate :signed, old_signed_secret
-  end
-end

config/locales/be.yml

@@ -4,6 +4,7 @@ be:
     about_mastodon_html: 'Сацыяльная сетка будучыні: без рэкламы, без карпаратыўнага назірання, этычны дызайн і дэцэнтралізацыя! Валодайце сваімі данымі з Mastodon!'
     contact_missing: Не зададзены
     contact_unavailable: Недаступна
+    default_thumbnail_description: Два намаляваныя мастадонты з усмешкамі (якія выглядаюць як слонікі) перакідваюцца паміж сабой папяровым самалёцікам. Іх акружае блакітнае неба і планеты з дрэвамі і іншымі мастадонтамі на іх.
     hosted_on: Mastodon месціцца на %{domain}
     title: Пра нас
   accounts:
@@ -1831,6 +1832,7 @@ be:
     types:
       blocking: Спіс заблакіраваных
       bookmarks: Закладкі
+      custom_filters: Фільтры
       domain_blocking: Спіс заблакіраваных даменаў
       following: Падпіскі
       lists: Спісы

config/locales/da.yml

@@ -4,6 +4,7 @@ da:
     about_mastodon_html: 'Fremtidens sociale netværk: Ingen annoncer, ingen virksomhedsovervågning, etisk design og decentralisering! Vær ejer af egne data med Mastodon!'
     contact_missing: Ikke angivet
     contact_unavailable: Utilgængelig
+    default_thumbnail_description: To smilende tegneseriemastodonter (der ligner elefanter) kaster en papirflyver frem og tilbage. De er omgivet af en klar, blå himmel og svævende planeter med træer og flere mastodonter på.
     hosted_on: Mastodon hostet på %{domain}
     title: Om
   accounts:
@@ -1745,6 +1746,7 @@ da:
     types:
       blocking: Blokeringsliste
       bookmarks: Bogmærker
+      custom_filters: Filtre
       domain_blocking: Domæneblokeringsliste
       following: Liste over fulgte
       lists: Lister

config/locales/de.yml

@@ -4,6 +4,7 @@ de:
     about_mastodon_html: 'Das soziale Netzwerk der Zukunft: Keine Werbung, keine Überwachung durch Unternehmen – dafür dezentral und mit Anstand! Behalte mit Mastodon die Kontrolle über deine Daten!'
     contact_missing: Nicht festgelegt
     contact_unavailable: Nicht verfügbar
+    default_thumbnail_description: Zwei lächelnde Mastodonten, die wie Elefanten aussehen, werfen sich in einem Cartoon-Zeichenstil ein Papierflugzeug zu. Sie sind von einem hellblauen Himmel und anderen Planeten umgeben. Auf den Planeten befinden sich Bäume und weitere Mastodonten.
     hosted_on: Mastodon, eingerichtet auf %{domain}
     title: Über
   accounts:
@@ -1728,6 +1729,7 @@ de:
     types:
       blocking: Blockierte Profile
       bookmarks: Lesezeichen
+      custom_filters: Filter
       domain_blocking: Blockierte Domains
       following: Folge ich
       lists: Listen

config/locales/doorkeeper.lv.yml

@@ -120,7 +120,7 @@ lv:
       title:
         accounts: Konti
         admin/accounts: Kontu pārvaldīšana
-        admin/all: Visas administrēšanas funkcijas
+        admin/all: Visas pārvaldīšanas iespējas
         admin/reports: Ziņojumu pārvaldīšana
         all: Pilna piekļuve Tavam Mastodon kontam
         blocks: Liegtie

config/locales/el.yml

@@ -4,6 +4,7 @@ el:
     about_mastodon_html: 'Το κοινωνικό δίκτυο του μέλλοντος: Χωρίς διαφημίσεις, χωρίς εταιρίες να σε κατασκοπεύουν, ηθικά σχεδιασμένο και αποκεντρωμένο! Με το Mastodon τα δεδομένα σου είναι πραγματικά δικά σου!'
     contact_missing: Δεν έχει οριστεί
     contact_unavailable: Μη διαθέσιμο
+    default_thumbnail_description: Δύο χαμογελαστοί καρτουνίστικοι μαστόδοντες (που μοιάζουν με ελέφαντες) πετάνε ένα χάρτινο αεροπλάνο μεταξύ τους. Περιβάλλονται από έναν φωτεινό μπλε ουρανό και αιωρούμενους πλανήτες με δέντρα και περισσότερους μαστόδοντες πάνω τους.
     hosted_on: Το Mastodon φιλοξενείται στο %{domain}
     title: Σχετικά
   accounts:
@@ -1745,6 +1746,7 @@ el:
     types:
       blocking: Λίστα αποκλεισμού
       bookmarks: Σελιδοδείκτες
+      custom_filters: Φίλτρα
       domain_blocking: Λίστα αποκλεισμένων τομέων
       following: Λίστα λογαριασμών που ακολουθείτε
       lists: Λίστες

config/locales/en.yml

@@ -4,6 +4,7 @@ en:
     about_mastodon_html: 'The social network of the future: No ads, no corporate surveillance, ethical design, and decentralization! Own your data with Mastodon!'
     contact_missing: Not set
     contact_unavailable: N/A
+    default_thumbnail_description: Two smiling cartoon mastodons (who look like elephants) toss a paper plane between them. They're surrounded by a bright blue sky and floating planets with trees and more mastodons on them.
     hosted_on: Mastodon hosted on %{domain}
     title: About
   accounts:

config/locales/es-AR.yml

@@ -4,6 +4,7 @@ es-AR:
     about_mastodon_html: 'La red social del futuro: ¡sin publicidad, sin vigilancia corporativa, con diseño ético y descentralización! ¡Con Mastodon vos sos el dueño de tus datos!'
     contact_missing: No establecido
     contact_unavailable: No disponible
+    default_thumbnail_description: Dos dibujos de mastodontes sonrientes (que se parecen a elefantes) se lanzan un avión de papel el uno al otro. A su alrededor, un cielo azul claro y planetas flotando con árboles y más mastodontes en ellos.
     hosted_on: Mastodon alojado en %{domain}
     title: Información
   accounts:
@@ -1745,6 +1746,7 @@ es-AR:
     types:
       blocking: Lista de bloqueados
       bookmarks: Marcadores
+      custom_filters: Filtros
       domain_blocking: Lista de dominios bloqueados
       following: Lista de seguidos
       lists: Listas

config/locales/es-MX.yml

@@ -4,6 +4,7 @@ es-MX:
     about_mastodon_html: 'La red social del futuro: ¡Sin anuncios, sin vigilancia corporativa, con un diseño ético y descentralizada! ¡Sé dueño de tus datos con Mastodon!'
     contact_missing: No establecido
     contact_unavailable: No disponible
+    default_thumbnail_description: Dos dibujos de mastodontes sonrientes (que parecen elefantes) se lanzan un avión de papel el uno al otro. Están rodeados por un cielo azul brillante y planetas flotantes con árboles y más mastodontes en ellos.
     hosted_on: Mastodon alojado en %{domain}
     title: Acerca de
   accounts:
@@ -1665,7 +1666,9 @@ es-MX:
       empty: Archivo CSV vacío
       incompatible_type: Incompatible con el tipo de importación seleccionado
       invalid_csv_file: 'Archivo CSV no válido. Error: %{error}'
+      invalid_json_file: 'Fichero JSON no válido. Error: %{error}'
       over_rows_processing_limit: contiene más de %{count} filas
+      status_not_found_warning: Algunos de tus filtros ocultan publicaciones específicas que este servidor no conoce. Estas publicaciones no se filtrarán automáticamente si el servidor las detecta más adelante.
       too_large: El archivo es demasiado grande
     failures: Fallos
     imported: Importado
@@ -1682,6 +1685,9 @@ es-MX:
       bookmarks_html:
         one: Estás a punto de <strong>reemplazar tus marcadores</strong> por <strong>%{count} publicación</strong> proveniente de <strong>%{filename}</strong>.
         other: Estás a punto de <strong>reemplazar tus marcadores</strong> por hasta <strong>%{count} publicaciones</strong> provenientes de <strong>%{filename}</strong>.
+      custom_filters_html:
+        one: Estás a punto de <strong>reemplazar tus filtros</strong> por el contenido de <strong>%{filename}</strong>. Se añadirán hasta <strong>%{count} filtro</strong> a los nuevos filtros.
+        other: Estás a punto de <strong>reemplazar tus filtros</strong> por el contenido de <strong>%{filename}</strong>. Se añadirán hasta <strong>%{count} filtros</strong> a los nuevos filtros.
       domain_blocking_html:
         one: Estás a punto de <strong>reemplazar tu lista de dominios bloqueados</strong> con <strong>%{count} dominio</strong> de <strong>%{filename}</strong>.
         other: Estás a punto de <strong>reemplazar tu lista de dominios bloqueados</strong> con hasta <strong>%{count} dominios</strong> de <strong>%{filename}</strong>.
@@ -1701,6 +1707,9 @@ es-MX:
       bookmarks_html:
         one: Estás a punto de agregar <strong>%{count} publicación</strong> de <strong>%{filename}</strong> a tus <strong>marcadores</strong>.
         other: Estás a punto de agregar <strong>%{count} publicaciones</strong> de <strong>%{filename}</strong> a tus <strong>marcadores</strong>.
+      custom_filters_html:
+        one: Estás a punto de añadir <strong>%{count} filtro</strong> de <strong>%{filename}</strong> a tus <strong>filtros</strong>.
+        other: Estás a punto de añadir hasta <strong>%{count} filtros</strong> de <strong>%{filename}</strong> a tus <strong>filtros</strong>.
       domain_blocking_html:
         one: Estás a punto de <strong>bloquear</strong> <strong>%{count} dominio</strong> de <strong>%{filename}</strong>.
         other: Estás a punto de <strong>bloquear</strong> hasta <strong>%{count} dominios</strong> de <strong>%{filename}</strong>.
@@ -1737,6 +1746,7 @@ es-MX:
     types:
       blocking: Lista de bloqueados
       bookmarks: Marcadores
+      custom_filters: Filtros
       domain_blocking: Lista de dominios bloqueados
       following: Lista de seguidos
       lists: Listas

config/locales/es.yml

@@ -4,6 +4,7 @@ es:
     about_mastodon_html: 'La red social del futuro: ¡Sin anuncios, sin vigilancia corporativa, diseño ético, y descentralización! ¡Sé dueño de tu información con Mastodon!'
     contact_missing: No establecido
     contact_unavailable: N/D
+    default_thumbnail_description: Dos dibujos de mastodontes sonrientes (que se parecen a elefantes) se lanzan un avión de papel el uno al otro. A su alrededor, un cielo azul claro y planetas flotando con árboles y más mastodontes en ellos.
     hosted_on: Mastodon alojado en %{domain}
     title: Acerca de
   accounts:
@@ -1667,7 +1668,9 @@ es:
       empty: Archivo CSV vacío
       incompatible_type: Incompatible con el tipo de importación seleccionado
       invalid_csv_file: 'Archivo CSV no válido. Error: %{error}'
+      invalid_json_file: 'Fichero JSON no válido. Error: %{error}'
       over_rows_processing_limit: contiene más de %{count} filas
+      status_not_found_warning: Algunos de tus filtros ocultan publicaciones específicas que no son conocidas por este servidor. Estas publicaciones no se filtrarán automáticamente si más tarde son descubiertas por el servidor.
       too_large: El archivo es demasiado grande
     failures: Fallos
     imported: Importado
@@ -1703,6 +1706,9 @@ es:
       bookmarks_html:
         one: Está a punto de añadir <strong>%{count} publicación</strong> proveniente de <strong>%{filename}</strong> a tus <strong>marcadores</strong>.
         other: Está a punto de añadir hasta <strong>%{count} publicaciones</strong> provenientes de <strong>%{filename}</strong> a tus <strong>marcadores</strong>.
+      custom_filters_html:
+        one: Estás a punto de añadir hasta <strong>%{count} filtro</strong> desde <strong>%{filename}</strong> a tus <strong>filtros</strong>.
+        other: Estás a punto de añadir hasta <strong>%{count} filtros</strong> desde <strong>%{filename}</strong> a tus <strong>filtros</strong>.
       domain_blocking_html:
         one: Estás a punto de <strong>bloquear</strong> <strong>%{count} dominio</strong> proveniente de <strong>%{filename}</strong>.
         other: Estás a punto de <strong>bloquear</strong> hasta <strong>%{count} dominios</strong> provenientes de <strong>%{filename}</strong>.
@@ -1739,6 +1745,7 @@ es:
     types:
       blocking: Lista de bloqueados
       bookmarks: Marcadores
+      custom_filters: Filtros
       domain_blocking: Lista de dominios bloqueados
       following: Lista de seguidos
       lists: Listas

config/locales/et.yml

@@ -505,6 +505,15 @@ et:
           no_lists_yet: Veel pole loetelusid
         last_email: Viimane e-post
         lead: Allpool kuvatakse kontod, kus see funktsioon on aktiveeritud ja millel on tellijaid.
+        show:
+          date: Liitumise kuupäev
+          disable_feature: Lülita funktsionaalsus välja
+          disabled: See funktsionaalsus on lülitatud välja ja e-kirju enam seda loendisse ei saadeta.
+          email: E-posti aadress
+          empty:
+            hint: Mitte keegi pole seda kontot veel tellinud.
+            no_subscribers_yet: Tellijaid veel pole
+          enable_feature: Lülita funktsionaalsus sisse
         status: Olek
         subscribers: Tellijad
         title: Meililistid
@@ -662,7 +671,7 @@ et:
         stop: Peata edastus
         unavailable: Pole saadaval
       delivery_available: Üleandmine on saadaval
-      delivery_error_days: Edastustõrgete päevad
+      delivery_error_days: Päevad, millal tekkis edastusvigu
       delivery_error_hint: Kui edastus pole võimalik %{count} päeva, märgitakse automaatselt edastamatuks.
       destroyed_msg: Domeeni %{domain} andmed on märgitud lõplikuks kustutamiseks.
       empty: Domeene ei leidu.
@@ -1531,7 +1540,9 @@ et:
         success_html: Nüüdsest hakkad saama e-kirju, kui %{name} avaldab uusi postitusi. Lisa %{sender} oma kontaktide hulka, et need postitused ei satuks rämpsposti kausta.
         title: Oled registreeritud
         unsubscribe: Lõpeta tellimus
+    disabled: Väljalülitatud
     inactive: Mitteaktiivne
+    no_access: Ligipääs puudub
     status: Olek
     subscribers: Tellijad
   emoji_styles:
@@ -1646,7 +1657,8 @@ et:
     errors:
       empty: Tühi CSV-fail
       incompatible_type: Ei sobi kokku valitud importimistüübiga
-      invalid_csv_file: 'Vigane CSV-fail. Tõrge: %{error}'
+      invalid_csv_file: 'Vigane CSV-fail. Veateade: %{error}'
+      invalid_json_file: 'Vigane JSON-fail. Viga: %{error}'
       over_rows_processing_limit: sisaldab rohkem, kui %{count} rida
       too_large: Fail on liiga suur
     failures: Ebaõnnestumised
@@ -1683,6 +1695,9 @@ et:
       bookmarks_html:
         one: Oled lisamas kuni <strong>%{count} postituse</strong> failist <strong>%{filename}</strong> oma <strong>järjehoidjatesse</strong>.
         other: Oled lisamas kuni <strong>%{count} postitust</strong> failist <strong>%{filename}</strong> oma <strong>järjehoidjatesse</strong>.
+      custom_filters_html:
+        one: Sa oled <strong>%{filename}</strong> failist lisamas oma <strong>filtrite hulka</strong> <strong>%{count} filtri</strong>.
+        other: Sa oled <strong>%{filename}</strong> failist lisamas oma <strong>filtrite hulka</strong> <strong>%{count} filtrit</strong>.
       domain_blocking_html:
         one: Oled <strong>blokeerimas</strong> kuni <strong>%{count} domeeni</strong> failist <strong>%{filename}</strong>.
         other: Oled <strong>blokeerimas</strong> kuni <strong>%{count} domeeni</strong> failist <strong>%{filename}</strong>.
@@ -1719,6 +1734,7 @@ et:
     types:
       blocking: Blokeeringute nimekiri
       bookmarks: Järjehoidjad
+      custom_filters: Filtrid
       domain_blocking: Domeeniblokeeringute nimekiri
       following: Jälgimiste nimekiri
       lists: Loetelud
@@ -2348,13 +2364,13 @@ et:
   webauthn_credentials:
     add: Uue turvavõtme lisamine
     create:
-      error: Turvavõtme lisamisel tekkis tõrge. Proovi palun uuesti.
+      error: Turvavõtme lisamisel tekkis viga või probleem. Proovi palun uuesti.
       success: Turvavõti edukalt lisatud.
     delete: Kustuta
     delete_confirmation: Kindel, et kustutada see turvavõti?
     description_html: Lubades <strong>turvavõtmega autentimise</strong> on sisenemisel tarvis ühte turvavõtmetest.
     destroy:
-      error: Turvavõtme kustutamisel tekkis tõrge. Palun proovi uuesti.
+      error: Turvavõtme kustutamisel tekkis viga või probleem. Palun proovi uuesti.
       success: Turvavõtmed edukalt kustutatud.
     invalid_credential: Vigane turvavõti
     nickname: Hüüdnimi

config/locales/fi.yml

@@ -4,6 +4,7 @@ fi:
     about_mastodon_html: 'Tulevaisuuden sosiaalinen verkosto: ei mainoksia, ei valvontaa, toteutettu avoimilla protokollilla ja hajautettu rakenne! Pidä tietosi ominasi Mastodonin avulla!'
     contact_missing: Ei asetettu
     contact_unavailable: Ei saatavilla
+    default_thumbnail_description: Kaksi hymyilevää sarjakuvamastodonttia (jotka näyttävät norsuilta) heittelee paperilennokkia toisilleen. Taustalla on kirkkaansininen taivas ja kelluvia planeettoja, joilla on puita ja lisää mastodontteja.
     hosted_on: Mastodon palvelimella %{domain}
     title: Tietoja
   accounts:
@@ -1732,6 +1733,7 @@ fi:
     types:
       blocking: Estoluettelo
       bookmarks: Kirjanmerkit
+      custom_filters: Suodattimet
       domain_blocking: Verkkotunnusten estoluettelo
       following: Seurattavien luettelo
       lists: Listat

config/locales/fr-CA.yml

@@ -4,6 +4,7 @@ fr-CA:
     about_mastodon_html: 'Le réseau social de l''avenir : pas de publicité, pas de surveillance institutionnelle, conception éthique et décentralisation ! Gardez le contrôle de vos données avec Mastodon !'
     contact_missing: Non défini
     contact_unavailable: Non disponible
+    default_thumbnail_description: Un dessin représentant deux mastodontes (qui ressemblent à des éléphants) souriants qui se lancent un avion en papier. Derrière eux flottent des planètes avec des arbres et d'autres mastodontes, et en fond un ciel bleu vif.
     hosted_on: Serveur Mastodon hébergé sur %{domain}
     title: À propos
   accounts:
@@ -1665,7 +1666,9 @@ fr-CA:
       empty: Fichier CSV vide
       incompatible_type: Incompatible avec le type d’import sélectionné
       invalid_csv_file: 'Fichier CSV non valide. Erreur : %{error}'
+      invalid_json_file: 'Fichier JSON non valide. Erreur : %{error}'
       over_rows_processing_limit: contient plus de %{count} lignes
+      status_not_found_warning: Certains de vos filtres masquent des messages spécifiques qui ne sont pas connus par ce serveur. Ces messages ne seront pas filtrés automatiquement s'ils sont découverts plus tard par le serveur.
       too_large: Fichier trop lourd
     failures: Échecs
     imported: Importé
@@ -1677,42 +1680,48 @@ fr-CA:
       overwrite_long: Remplacer les enregistrements actuels par les nouveaux
     overwrite_preambles:
       blocking_html:
-        one: Vous allez <strong>remplacer votre liste de blocage</strong> par près de <strong>%{count} compte</strong> tiré de <strong>%{filename}</strong>.
-        other: Vous allez <strong>remplacer votre liste de blocage</strong> par près de <strong>%{count} comptes</strong> tirés de <strong>%{filename}</strong>.
+        one: Vous allez <strong>remplacer votre liste de blocage</strong> par au maximum <strong>%{count} compte</strong> issu de <strong>%{filename}</strong>.
+        other: Vous allez <strong>remplacer votre liste de blocage</strong> par au maximum <strong>%{count} comptes</strong> issus de <strong>%{filename}</strong>.
       bookmarks_html:
-        one: Vous allez <strong>remplacer vos signets</strong> par près de <strong>%{count} post</strong> tiré de <strong>%{filename}</strong>.
-        other: Vous allez <strong>remplacer vos signets</strong> par près de <strong>%{count} posts</strong> tirés de <strong>%{filename}</strong>.
+        one: Vous allez <strong>remplacer vos marque-pages</strong> par au maximum <strong>%{count} message</strong> issu de <strong>%{filename}</strong>.
+        other: Vous allez <strong>remplacer vos marque-pages</strong> par au maximum <strong>%{count} messages</strong> issus de <strong>%{filename}</strong>.
+      custom_filters_html:
+        one: Vous allez <strong>remplacer vos filtres</strong> par le contenu de <strong>%{filename}</strong>. Au maximum <strong>%{count} filtre</strong> sera ajouté aux nouveaux filtres.
+        other: Vous allez <strong>remplacer vos filtres</strong> par le contenu de <strong>%{filename}</strong>. Au maximum <strong>%{count} filtres</strong> seront ajoutés aux nouveaux filtres.
       domain_blocking_html:
-        one: Vous allez <strong>remplacer votre liste de blocage de domaines</strong> par près de <strong>%{count} domaine</strong> tiré de <strong>%{filename}</strong>.
-        other: Vous allez <strong>remplacer votre liste de blocage de domaines</strong> par près de <strong>%{count} domaines</strong> tirés de <strong>%{filename}</strong>.
+        one: Vous allez <strong>remplacer votre liste de domaines bloqués</strong> par au maximum <strong>%{count} domaine</strong> issu de <strong>%{filename}</strong>.
+        other: Vous allez <strong>remplacer votre liste de domaines bloqués</strong> par au maximum <strong>%{count} domaines</strong> issus de <strong>%{filename}</strong>.
       following_html:
-        one: Vous allez <strong>suivre</strong> jusqu’à <strong>%{count} compte</strong> depuis <strong>%{filename}</strong> et <strong>arrêter de suivre n’importe qui d’autre</strong>.
-        other: Vous allez <strong>suivre</strong> jusqu’à <strong>%{count} comptes</strong> depuis <strong>%{filename}</strong> et <strong>arrêter de suivre n’importe qui d’autre</strong>.
+        one: Vous allez <strong>suivre</strong> jusqu’à <strong>%{count} compte</strong> issu de <strong>%{filename}</strong> et <strong>arrêter de suivre n’importe qui d’autre</strong>.
+        other: Vous allez <strong>suivre</strong> jusqu’à <strong>%{count} comptes</strong> issus de <strong>%{filename}</strong> et <strong>arrêter de suivre n’importe qui d’autre</strong>.
       lists_html:
-        one: Vous allez <strong>remplacer vos listes</strong> par le contenu de <strong>%{filename}</strong>. Près de <strong>%{count} compte</strong> sera ajouté à de nouvelles listes.
-        other: Vous allez <strong>remplacer vos listes</strong> par le contenu de <strong>%{filename}</strong>. Près de <strong>%{count} comptes</strong> seront ajoutés à de nouvelles listes.
+        one: Vous allez <strong>remplacer vos listes</strong> par le contenu de <strong>%{filename}</strong>. Au maximum <strong>%{count} compte</strong> sera ajouté aux nouvelles listes.
+        other: Vous allez <strong>remplacer vos listes</strong> par le contenu de <strong>%{filename}</strong>. Au maximum <strong>%{count} comptes</strong> seront ajoutés aux nouvelles listes.
       muting_html:
-        one: Vous allez <strong>remplacer votre liste de comptes masqués</strong> par près de <strong>%{count} compte</strong> tiré de <strong>%{filename}</strong>.
-        other: Vous allez <strong>remplacer votre liste de comptes masqués</strong> par près de <strong>%{count} comptes</strong> tirés de <strong>%{filename}</strong>.
+        one: Vous allez <strong>remplacer votre liste de comptes masqués</strong> par au maximum <strong>%{count} compte</strong> issu de <strong>%{filename}</strong>.
+        other: Vous allez <strong>remplacer votre liste de comptes masqués</strong> par au maximum <strong>%{count} comptes</strong> issus de <strong>%{filename}</strong>.
     preambles:
       blocking_html:
-        one: Vous allez <strong>bloquer</strong> près de <strong>%{count} compte</strong> tiré de <strong>%{filename}</strong>.
-        other: Vous allez <strong>bloquer</strong> près de <strong>%{count} comptes</strong> tirés de <strong>%{filename}</strong>.
+        one: Vous allez <strong>bloquer</strong> jusqu'à <strong>%{count} compte</strong> issu de <strong>%{filename}</strong>.
+        other: Vous allez <strong>bloquer</strong> jusqu'à <strong>%{count} comptes</strong> issus de <strong>%{filename}</strong>.
       bookmarks_html:
-        one: Vous allez ajouter près de <strong>%{count} message</strong> de <strong>%{filename}</strong> à vos <strong>signets</strong>.
-        other: Vous allez ajouter près de <strong>%{count} messages</strong> de <strong>%{filename}</strong> à vos <strong>signets</strong>.
+        one: Vous allez ajouter jusqu'à <strong>%{count} message</strong> de <strong>%{filename}</strong> à vos <strong>marque-pages</strong>.
+        other: Vous allez ajouter jusqu'à <strong>%{count} messages</strong> de <strong>%{filename}</strong> à vos <strong>marque-pages</strong>.
+      custom_filters_html:
+        one: Vous allez ajouter jusqu'à <strong>%{count} filtre</strong> de <strong>%{filename}</strong> à vos <strong>filtres</strong>.
+        other: Vous allez ajouter jusqu'à <strong>%{count} filtres</strong> de <strong>%{filename}</strong> à vos <strong>filtres</strong>.
       domain_blocking_html:
-        one: Vous allez <strong>bloquer</strong> près de <strong>%{count} domaine</strong> tiré de <strong>%{filename}</strong>.
-        other: Vous allez <strong>bloquer</strong> près de <strong>%{count} domaines</strong> tirés de <strong>%{filename}</strong>.
+        one: Vous allez <strong>bloquer</strong> jusqu'à <strong>%{count} domaine</strong> issu de <strong>%{filename}</strong>.
+        other: Vous allez <strong>bloquer</strong> jusqu'à <strong>%{count} domaines</strong> issus de <strong>%{filename}</strong>.
       following_html:
-        one: Vous allez <strong>suivre</strong> près de <strong>%{count} compte</strong> tiré de <strong>%{filename}</strong>.
-        other: Vous allez <strong>suivre</strong> près de <strong>%{count} comptes</strong> tirés de <strong>%{filename}</strong>.
+        one: Vous allez <strong>suivre</strong> jusqu'à <strong>%{count} compte</strong> issu de <strong>%{filename}</strong>.
+        other: Vous allez <strong>suivre</strong> jusqu'à <strong>%{count} comptes</strong> issus de <strong>%{filename}</strong>.
       lists_html:
-        one: Vous allez ajouter près de <strong>%{count} compte</strong> depuis <strong>%{filename}</strong> à vos <strong>listes</strong>. De nouvelles listes seront créées si besoin.
-        other: Vous allez ajouter près de <strong>%{count} comptes</strong> depuis <strong>%{filename}</strong> à vos <strong>listes</strong>. De nouvelles listes seront créées si besoin.
+        one: Vous allez ajouter jusqu'à <strong>%{count} compte</strong> issu de <strong>%{filename}</strong> à vos <strong>listes</strong>. De nouvelles listes seront créées si besoin.
+        other: Vous allez ajouter jusqu'à <strong>%{count} comptes</strong> issus de <strong>%{filename}</strong> à vos <strong>listes</strong>. De nouvelles listes seront créées si besoin.
       muting_html:
-        one: Vous allez <strong>masquer</strong> près de <strong>%{count} compte</strong> tiré de <strong>%{filename}</strong>.
-        other: Vous allez <strong>masquer</strong> près de <strong>%{count} comptes</strong> tirés de <strong>%{filename}</strong>.
+        one: Vous allez <strong>masquer</strong> jusqu'à <strong>%{count} compte</strong> issu de <strong>%{filename}</strong>.
+        other: Vous allez <strong>masquer</strong> jusqu'à <strong>%{count} comptes</strong> issus de <strong>%{filename}</strong>.
     preface: Vous pouvez importer certaines données que vous avez exporté d’un autre serveur, comme une liste des personnes que vous suivez ou bloquez sur votre compte.
     recent_imports: Importations récentes
     states:
@@ -1737,6 +1746,7 @@ fr-CA:
     types:
       blocking: Liste de comptes bloqués
       bookmarks: Marque-pages
+      custom_filters: Filtres
       domain_blocking: Liste des serveurs bloqués
       following: Liste d’utilisateur·rice·s suivi·e·s
       lists: Listes

config/locales/fr.yml

@@ -4,6 +4,7 @@ fr:
     about_mastodon_html: 'Le réseau social de l''avenir : pas de publicité, pas de surveillance institutionnelle, conception éthique et décentralisation ! Gardez le contrôle de vos données avec Mastodon !'
     contact_missing: Non défini
     contact_unavailable: Non disponible
+    default_thumbnail_description: Un dessin représentant deux mastodontes (qui ressemblent à des éléphants) souriants qui se lancent un avion en papier. Derrière eux flottent des planètes avec des arbres et d'autres mastodontes, et en fond un ciel bleu vif.
     hosted_on: Serveur Mastodon hébergé sur %{domain}
     title: À propos
   accounts:
@@ -1658,18 +1659,20 @@ fr:
       other: Sélectionnez tous l'ensemble des %{count} éléments correspondant à votre recherche.
     today: aujourd’hui
     validation_errors:
-      one: Quelque chose ne va pas ! Veuillez vérifiez l’erreur ci-dessous
+      one: Quelque chose ne va pas ! Veuillez vérifier l’erreur ci-dessous
       other: Certaines choses ne vont pas ! Veuillez vérifier les %{count} erreurs ci-dessous
   imports:
     errors:
       empty: Fichier CSV vide
       incompatible_type: Incompatible avec le type d’import sélectionné
       invalid_csv_file: 'Fichier CSV non valide. Erreur : %{error}'
+      invalid_json_file: 'Fichier JSON non valide. Erreur : %{error}'
       over_rows_processing_limit: contient plus de %{count} lignes
+      status_not_found_warning: Certains de vos filtres masquent des messages spécifiques qui ne sont pas connus par ce serveur. Ces messages ne seront pas filtrés automatiquement s'ils sont découverts plus tard par le serveur.
       too_large: Le fichier est trop lourd
     failures: Échecs
     imported: Importé
-    mismatched_types_warning: Il semblerait que vous avez sélectionné le mauvais type pour cet import, veuillez vérifier attentivement.
+    mismatched_types_warning: Il semblerait que vous avez sélectionné le mauvais type pour cet import, veuillez vérifier.
     modes:
       merge: Fusionner
       merge_long: Garder les enregistrements existants et ajouter les nouveaux
@@ -1677,43 +1680,49 @@ fr:
       overwrite_long: Remplacer les enregistrements actuels par les nouveaux
     overwrite_preambles:
       blocking_html:
-        one: Vous allez <strong>remplacer votre liste de blocage</strong> par près de <strong>%{count} compte</strong> tiré de <strong>%{filename}</strong>.
-        other: Vous allez <strong>remplacer votre liste de blocage</strong> par près de <strong>%{count} comptes</strong> tirés de <strong>%{filename}</strong>.
+        one: Vous allez <strong>remplacer votre liste de blocage</strong> par au maximum <strong>%{count} compte</strong> issu de <strong>%{filename}</strong>.
+        other: Vous allez <strong>remplacer votre liste de blocage</strong> par au maximum <strong>%{count} comptes</strong> issus de <strong>%{filename}</strong>.
       bookmarks_html:
-        one: Vous allez <strong>remplacer vos signets</strong> par près de <strong>%{count} post</strong> tiré de <strong>%{filename}</strong>.
-        other: Vous allez <strong>remplacer vos signets</strong> par près de <strong>%{count} posts</strong> tirés de <strong>%{filename}</strong>.
+        one: Vous allez <strong>remplacer vos marque-pages</strong> par au maximum <strong>%{count} message</strong> issu de <strong>%{filename}</strong>.
+        other: Vous allez <strong>remplacer vos marque-pages</strong> par au maximum <strong>%{count} messages</strong> issus de <strong>%{filename}</strong>.
+      custom_filters_html:
+        one: Vous allez <strong>remplacer vos filtres</strong> par le contenu de <strong>%{filename}</strong>. Au maximum <strong>%{count} filtre</strong> sera ajouté aux nouveaux filtres.
+        other: Vous allez <strong>remplacer vos filtres</strong> par le contenu de <strong>%{filename}</strong>. Au maximum <strong>%{count} filtres</strong> seront ajoutés aux nouveaux filtres.
       domain_blocking_html:
-        one: Vous allez <strong>remplacer votre liste de blocage de domaines</strong> par près de <strong>%{count} domaine</strong> tiré de <strong>%{filename}</strong>.
-        other: Vous allez <strong>remplacer votre liste de blocage de domaines</strong> par près de <strong>%{count} domaines</strong> tirés de <strong>%{filename}</strong>.
+        one: Vous allez <strong>remplacer votre liste de domaines bloqués</strong> par au maximum <strong>%{count} domaine</strong> issu de <strong>%{filename}</strong>.
+        other: Vous allez <strong>remplacer votre liste de domaines bloqués</strong> par au maximum <strong>%{count} domaines</strong> issus de <strong>%{filename}</strong>.
       following_html:
-        one: Vous allez <strong>suivre</strong> jusqu’à <strong>%{count} compte</strong> depuis <strong>%{filename}</strong> et <strong>arrêter de suivre n’importe qui d’autre</strong>.
-        other: Vous allez <strong>suivre</strong> jusqu’à <strong>%{count} comptes</strong> depuis <strong>%{filename}</strong> et <strong>arrêter de suivre n’importe qui d’autre</strong>.
+        one: Vous allez <strong>suivre</strong> jusqu’à <strong>%{count} compte</strong> issu de <strong>%{filename}</strong> et <strong>arrêter de suivre n’importe qui d’autre</strong>.
+        other: Vous allez <strong>suivre</strong> jusqu’à <strong>%{count} comptes</strong> issus de <strong>%{filename}</strong> et <strong>arrêter de suivre n’importe qui d’autre</strong>.
       lists_html:
-        one: Vous allez <strong>remplacer vos listes</strong> par le contenu de <strong>%{filename}</strong>. Près de <strong>%{count} compte</strong> sera ajouté à de nouvelles listes.
-        other: Vous allez <strong>remplacer vos listes</strong> par le contenu de <strong>%{filename}</strong>. Près de <strong>%{count} comptes</strong> seront ajoutés à de nouvelles listes.
+        one: Vous allez <strong>remplacer vos listes</strong> par le contenu de <strong>%{filename}</strong>. Au maximum <strong>%{count} compte</strong> sera ajouté aux nouvelles listes.
+        other: Vous allez <strong>remplacer vos listes</strong> par le contenu de <strong>%{filename}</strong>. Au maximum <strong>%{count} comptes</strong> seront ajoutés aux nouvelles listes.
       muting_html:
-        one: Vous allez <strong>remplacer votre liste de comptes masqués</strong> par près de <strong>%{count} compte</strong> tiré de <strong>%{filename}</strong>.
-        other: Vous allez <strong>remplacer votre liste de comptes masqués</strong> par près de <strong>%{count} comptes</strong> tirés de <strong>%{filename}</strong>.
+        one: Vous allez <strong>remplacer votre liste de comptes masqués</strong> par au maximum <strong>%{count} compte</strong> issu de <strong>%{filename}</strong>.
+        other: Vous allez <strong>remplacer votre liste de comptes masqués</strong> par au maximum <strong>%{count} comptes</strong> issus de <strong>%{filename}</strong>.
     preambles:
       blocking_html:
-        one: Vous allez <strong>bloquer</strong> près de <strong>%{count} compte</strong> tiré de <strong>%{filename}</strong>.
-        other: Vous allez <strong>bloquer</strong> près de <strong>%{count} comptes</strong> tirés de <strong>%{filename}</strong>.
+        one: Vous allez <strong>bloquer</strong> jusqu'à <strong>%{count} compte</strong> issu de <strong>%{filename}</strong>.
+        other: Vous allez <strong>bloquer</strong> jusqu'à <strong>%{count} comptes</strong> issus de <strong>%{filename}</strong>.
       bookmarks_html:
-        one: Vous allez ajouter près de <strong>%{count} message</strong> de <strong>%{filename}</strong> à vos <strong>signets</strong>.
-        other: Vous allez ajouter près de <strong>%{count} messages</strong> de <strong>%{filename}</strong> à vos <strong>signets</strong>.
+        one: Vous allez ajouter jusqu'à <strong>%{count} message</strong> de <strong>%{filename}</strong> à vos <strong>marque-pages</strong>.
+        other: Vous allez ajouter jusqu'à <strong>%{count} messages</strong> de <strong>%{filename}</strong> à vos <strong>marque-pages</strong>.
+      custom_filters_html:
+        one: Vous allez ajouter jusqu'à <strong>%{count} filtre</strong> de <strong>%{filename}</strong> à vos <strong>filtres</strong>.
+        other: Vous allez ajouter jusqu'à <strong>%{count} filtres</strong> de <strong>%{filename}</strong> à vos <strong>filtres</strong>.
       domain_blocking_html:
-        one: Vous allez <strong>bloquer</strong> près de <strong>%{count} domaine</strong> tiré de <strong>%{filename}</strong>.
-        other: Vous allez <strong>bloquer</strong> près de <strong>%{count} domaines</strong> tirés de <strong>%{filename}</strong>.
+        one: Vous allez <strong>bloquer</strong> jusqu'à <strong>%{count} domaine</strong> issu de <strong>%{filename}</strong>.
+        other: Vous allez <strong>bloquer</strong> jusqu'à <strong>%{count} domaines</strong> issus de <strong>%{filename}</strong>.
       following_html:
-        one: Vous allez <strong>suivre</strong> près de <strong>%{count} compte</strong> tiré de <strong>%{filename}</strong>.
-        other: Vous allez <strong>suivre</strong> près de <strong>%{count} comptes</strong> tirés de <strong>%{filename}</strong>.
+        one: Vous allez <strong>suivre</strong> jusqu'à <strong>%{count} compte</strong> issu de <strong>%{filename}</strong>.
+        other: Vous allez <strong>suivre</strong> jusqu'à <strong>%{count} comptes</strong> issus de <strong>%{filename}</strong>.
       lists_html:
-        one: Vous allez ajouter près de <strong>%{count} compte</strong> depuis <strong>%{filename}</strong> à vos <strong>listes</strong>. De nouvelles listes seront créées si besoin.
-        other: Vous allez ajouter près de <strong>%{count} comptes</strong> depuis <strong>%{filename}</strong> à vos <strong>listes</strong>. De nouvelles listes seront créées si besoin.
+        one: Vous allez ajouter jusqu'à <strong>%{count} compte</strong> issu de <strong>%{filename}</strong> à vos <strong>listes</strong>. De nouvelles listes seront créées si besoin.
+        other: Vous allez ajouter jusqu'à <strong>%{count} comptes</strong> issus de <strong>%{filename}</strong> à vos <strong>listes</strong>. De nouvelles listes seront créées si besoin.
       muting_html:
-        one: Vous allez <strong>masquer</strong> près de <strong>%{count} compte</strong> tiré de <strong>%{filename}</strong>.
-        other: Vous allez <strong>masquer</strong> près de <strong>%{count} comptes</strong> tirés de <strong>%{filename}</strong>.
-    preface: Vous pouvez importer certaines données que vous avez exporté d’un autre serveur, comme une liste des personnes que vous suivez ou bloquez sur votre compte.
+        one: Vous allez <strong>masquer</strong> jusqu'à <strong>%{count} compte</strong> issu de <strong>%{filename}</strong>.
+        other: Vous allez <strong>masquer</strong> jusqu'à <strong>%{count} comptes</strong> issus de <strong>%{filename}</strong>.
+    preface: Vous pouvez importer certaines données que vous avez exportées d’un autre serveur, comme une liste des personnes que vous suivez ou bloquez sur votre compte.
     recent_imports: Récents imports
     states:
       finished: Terminé
@@ -1732,15 +1741,16 @@ fr:
       muting: En cours d’importation des comptes masqués
     type: Type d’import
     type_groups:
-      constructive: Abonnements et signets
-      destructive: Blocages et masquages
+      constructive: Abonnements et marque-pages
+      destructive: Comptes bloqués et masqués
     types:
       blocking: Liste de comptes bloqués
       bookmarks: Marque-pages
+      custom_filters: Filtres
       domain_blocking: Liste des serveurs bloqués
       following: Liste de comptes suivis
       lists: Listes
-      muting: Liste de comptes que vous masquez
+      muting: Liste de comptes masqués
     upload: Importer
   invites:
     delete: Désactiver

config/locales/ga.yml

@@ -4,6 +4,7 @@ ga:
     about_mastodon_html: 'Líonra sóisialta a sheasfaidh an aimsir: Gan fógraíocht, gan faire chorparáideach, le leagan amach eiticiúil agus dílárú. Bíodh do chuid sonraí agatsa féin le Mastodon!'
     contact_missing: Gan socrú
     contact_unavailable: N/A
+    default_thumbnail_description: Beirt mhastodón cartúin (atá cosúil le heilifintí) ag aoibh gháire agus ag caitheamh eitleáin páipéir eatarthu. Tá spéir ghorm gheal agus pláinéid ar snámh timpeall orthu, crainn agus níos mó mhastodón orthu.
     hosted_on: Mastodon arna óstáil ar %{domain}
     title: Maidir le
   accounts:
@@ -1754,7 +1755,9 @@ ga:
       empty: Comhad CSV folamh
       incompatible_type: Neamh-chomhoiriúnach leis an gcineál iompórtála roghnaithe
       invalid_csv_file: 'Comhad CSV neamhbhailí. Earráid: %{error}'
+      invalid_json_file: 'Comhad JSON neamhbhailí. Earráid: %{error}'
       over_rows_processing_limit: níos mó ná %{count} sraitheanna
+      status_not_found_warning: Cuireann cuid de do scagairí poist shonracha i bhfolach nach bhfuil ar eolas ag an bhfreastalaí seo. Ní scagfar na poist seo go huathoibríoch má aimsíonn an freastalaí iad níos déanaí.
       too_large: Tá an comhad ró-mhór
     failures: Teipeanna
     imported: Iompórtáilte
@@ -1777,6 +1780,12 @@ ga:
         one: Tá tú ar tí <strong>do leabharmharcanna</strong> a chur in ionad suas le <strong>%{count} postáil</strong> ó <strong>%{filename}</strong>.
         other: Tá tú ar tí <strong>do leabharmharcanna</strong> a chur in ionad suas le <strong>%{count} postáil</strong> ó <strong>%{filename}</strong>.
         two: Tá tú ar tí <strong>do leabharmharcanna</strong> a chur in ionad suas le <strong>%{count} postáil</strong> ó <strong>%{filename}</strong>.
+      custom_filters_html:
+        few: Tá tú ar tí <strong>do scagairí a athsholáthar</strong> le hábhar <strong>%{filename}</strong>. Cuirfear suas le <strong>%{count} scagairí</strong> leis na scagairí nua.
+        many: Tá tú ar tí <strong>do scagairí a athsholáthar</strong> le hábhar <strong>%{filename}</strong>. Cuirfear suas le <strong>%{count} scagairí</strong> leis na scagairí nua.
+        one: Tá tú ar tí <strong>do scagairí a athsholáthar</strong> le hábhar <strong>%{filename}</strong>. Cuirfear suas le <strong>%{count} scagaire</strong> leis na scagairí nua.
+        other: Tá tú ar tí <strong>do scagairí a athsholáthar</strong> le hábhar <strong>%{filename}</strong>. Cuirfear suas le <strong>%{count} scagairí</strong> leis na scagairí nua.
+        two: Tá tú ar tí <strong>do scagairí a athsholáthar</strong> le hábhar <strong>%{filename}</strong>. Cuirfear suas le <strong>%{count} scagairí</strong> leis na scagairí nua.
       domain_blocking_html:
         few: Tá tú ar tí <strong>do liosta bloc fearainn</strong> a chur in ionad suas le <strong>%{count} fearainn</strong> ó <strong>%{filename}</strong>.
         many: Tá tú ar tí <strong>do liosta bloc fearainn</strong> a chur in ionad suas le <strong>%{count} fearainn</strong> ó <strong>%{filename}</strong>.
@@ -1814,6 +1823,12 @@ ga:
         one: Tá tú ar tí <strong>%{count} postáil</strong> ó <strong>%{filename}</strong> a chur le do <strong>leabharmharcanna</strong>.
         other: Tá tú ar tí <strong>%{count} postáil</strong> ó <strong>%{filename}</strong> a chur le do <strong>leabharmharcanna</strong>.
         two: Tá tú ar tí <strong>%{count} postáil</strong> ó <strong>%{filename}</strong> a chur le do <strong>leabharmharcanna</strong>.
+      custom_filters_html:
+        few: Tá tú ar tí suas le <strong>%{count} scagairí</strong> ó <strong>%{filename}</strong> a chur le do <strong>scagairí</strong>.
+        many: Tá tú ar tí suas le <strong>%{count} scagairí</strong> ó <strong>%{filename}</strong> a chur le do <strong>scagairí</strong>.
+        one: Tá tú ar tí suas le <strong>%{count} scagaire</strong> ó <strong>%{filename}</strong> a chur le do <strong>scagairí</strong>.
+        other: Tá tú ar tí suas le <strong>%{count} scagairí</strong> ó <strong>%{filename}</strong> a chur le do <strong>scagairí</strong>.
+        two: Tá tú ar tí suas le <strong>%{count} scagairí</strong> ó <strong>%{filename}</strong> a chur le do <strong>scagairí</strong>.
       domain_blocking_html:
         few: Tá tú ar tí <strong>bhac</strong> suas le <strong>%{count} bhfearainn</strong> ó <strong>%{filename}</strong>.
         many: Tá tú ar tí <strong>bhac</strong> suas le <strong>%{count} bhfearainn</strong> ó <strong>%{filename}</strong>.
@@ -1862,6 +1877,7 @@ ga:
     types:
       blocking: Liosta blocála
       bookmarks: Leabharmharcanna
+      custom_filters: Scagairí
       domain_blocking: Liosta blocála fearainn
       following: Liosta ina dhiaidh sin
       lists: Liostaí

config/locales/gd.yml

@@ -353,14 +353,22 @@ gd:
       updated_msg: Chaidh am brath-fios ùrachadh!
     collections:
       accounts: Cunntasan
+      back_to_account: Till gu duilleag a’ chunntais
+      back_to_report: Till gu duilleag a’ ghearain
+      batch:
+        add_to_report: 'Cuir ris a’ ghearan #%{id}'
+        remove_from_report: Thoir air falbh on ghearan
+        report: Dèan gearan
       collection_title: Cruinneachadh le %{name}
       contents: Susbaint
+      no_collection_selected: Cha deach cruinneachadh sam bith atharrachadh o nach deach gin dhiubh a thaghadh
       number_of_accounts:
         few: "%{count} cunntasan"
         one: "%{count} chunntas"
         other: "%{count} cunntas"
         two: "%{count} chunntas"
       open: Fosgail
+      title: Cruinneachaidhean a’ chunntais – @%{name}
       view_publicly: Seall gu poblach
     critical_update_pending: Ùrachadh èiginneach ri dhèiligeadh
     custom_emojis:
@@ -504,9 +512,78 @@ gd:
         title: Bac àrainn puist-d ùr
       no_email_domain_block_selected: Cha deach bacadh àrainn puist-d sam bith atharrachadh o nach deach gin dhiubh a thaghadh
       not_permitted: Chan eil seo ceadaichte
+      reset: Ath-shuidhich
       resolved_dns_records_hint_html: Thèid ainm na h-àrainne fhuasgladh nan àrainnean MX a leanas agus an urra riutha-san gun gabh iad ri post-d. Ma bhacas tu àrainn MX, bacaidh seo an clàradh o sheòladh puist-d sam bith a chleachdas an aon àrainn MX fiù ’s ma bhios ainm àrainne eadar-dhealaichte ’ga sealltainn. <strong>Thoir an aire nach bac thu solaraichean puist-d mòra.</strong>
       resolved_through_html: Chaidh fuasgladh slighe %{domain}
+      search: Lorg
       title: Bacadh àrainnean puist-d
+    email_subscriptions:
+      accounts:
+        account: Cunntas
+        empty:
+          hint: Chan eil fo-sgrìobhaiche aig cunntas sam bith fhathast.
+          no_lists_yet: Chan eil liosta ann fhathast
+        last_email: Am post-d mu dheireadh
+        lead: Thèid na cunntasan a chuir an gleus an comas agus aig a bheil fo-sgrìobhaichean a shealltainn gu h-ìosal.
+        show:
+          confirm_remove_subscriber: Chan fhaigh %{email} puist-d o %{name} tuilleadh. Cha ghabh an gnìomh seo a neo-dhèanamh.
+          consent: Cha do ghabh na fo-sgrìobhaichean ach ri faighinn nam post air a’ phost-d. Na cleachd an liosta seo air adhbhar sam bith eile.
+          date: Ceann-latha a’ chlàraidh
+          disable_feature: Cuir an gleus à comas
+          disabled: Chaidh an gleus a chur à comas ’s cha dèid puist-d a chur dhan liosta seo tuilleadh.
+          email: Seòladh puist-d
+          empty:
+            hint: Cha do dh’fho-sgrìobh neach sam bith dhan chunntas seo fhathast.
+            no_subscribers_yet: Chan eil fo-sgrìobhaiche ann fhathast
+          enable_feature: Cuir an gleus an comas
+          no_access_html: Chan eil cead aig a’ chunntas seo tuilleadh gus an gleus a chur an comas. Atharraich seo sna <a href="%{roles_path}">dreuchdan</a>.
+          title: Cuairt-litrichean puist-d aig %{name}
+          view_account: Seall an cunntas
+        status: Staid
+        subscribers: Fo-sgrìobhaichean
+        title: Liostaichean-puist
+      additional_footer_texts:
+        show:
+          title: Teacsa banna-choise a bharrachd
+      compliance_settings:
+        additional_footer_text:
+          action: Stiùirich
+          hint: Roghainneil teacsa a nochdas sa bhann-choise aig cuairt-litrichean puist-d a-mhàin
+          title: Teacsa banna-choise a bharrachd
+        lead: Dh’fhaoidte gum beachdaichear air cuairt-litrichean mar puist-d margaidheachd a-rèir nan uachdranasan laghail far a bheil thu ag obair.
+        privacy_policy:
+          action: Stiùirich
+          hint: Thèid ceangal ris a’ phoileasaidh seo a chur ri bann-coise gach puist-d
+          title: Poileasaidh prìobhaideachd
+      danger_zone:
+        disable_feature:
+          action: Cuir à comas
+          hint: Cuir an gleus à comas dhan a h-uile cunntas
+          title: Cuir an gleus à comas
+        erase_all_data:
+          action: Suath bàn an dàta
+          hint: Sguabaidh seo às a h-uile post-d aig a h-uile liosta puist-d gu buan
+          title: Suath bàn an dàta air fad
+        title: Earrann chunnartach
+      disabled_msg: Chaidh na fo-sgrìobhaidhean puist-d a chur à comas.
+      index:
+        disabled:
+          cannot_be_enabled: Cha do chuir an solaraiche teicnigeach agad an gleus seo an comas air an fhrithealaiche agad.
+          get_started: Dèan toiseach-tòiseachaidh
+        title: Cuairt-litrichean puist-d
+      roles:
+        accounts: Cunntasan
+        edit_role: Deasaich an dreuchd
+        empty:
+          hint: Chan fhaod neach sam bith an gleus seo a chleachdadh.
+          no_roles_added: Cha deach dreuchd a chur ris
+        manage_roles: Stiùirich na dreuchdan
+        role_name: Ainm na dreuchd
+        title: Dreuchdan
+      setups:
+        show:
+          enable_feature: Cuir an gleus an comas
+          important_information: Fiosrachadh cudromach
     export_domain_allows:
       new:
         title: Ion-phortaich àrainnean ceadaichte
@@ -699,6 +776,7 @@ gd:
       action_log: Sgrùd an loga
       action_taken_by: Chaidh an gnìomh a ghabhail le
       actions:
+        delete_description_html: Thèid na postaichean agus/no cruinneachaidhean le gearan orra a sguabadh às agus rabhadh a chlàradh gus do chuideachadh ach am bi thu nas teinne le droch-ghiùlan on aon chunntas sam àm ri teachd.
         mark_as_sensitive_description_html: Thèid comharra an fhrionasachd a chur ris na meadhanan sna postaichean le gearan orra agus rabhadh a chlàradh gus do chuideachadh ach am bi thu nas teinne le droch-ghiùlan on aon chunntas sam àm ri teachd.
         other_description_html: Seall barrachd roghainnean airson giùlan a’ chunntais a stiùireadh agus an conaltradh leis a’ chunntas a chaidh gearan a dhèanamh mu dhèidhinn a ghnàthachadh.
         resolve_description_html: Cha dèid gnìomh sam bith a ghabhail an aghaidh a’ chunntais le gearan air agus thèid an gearan a dhùnadh gun rabhadh a chlàradh.
@@ -725,6 +803,7 @@ gd:
       confirm: Dearbh
       confirm_action: Dearbh gnìomh na maorsainneachd an aghaidh @%{acct}
       created_at: Chaidh an gearan a dhèanamh
+      delete_and_resolve: Sguab às an t-susbaint
       forwarded: Chaidh a shìneadh air adhart
       forwarded_replies_explanation: Tha an gearan seo o chleachdaiche cèin agus mu shusbaint chèin. Chaidh a shìneadh air adhart thugad on as e freagairt do neach-cleachdaidh agad-sa a tha san t-susbaint a tha na cois.
       forwarded_to: Chaidh a shìneadh air adhart gu %{domain}
@@ -909,6 +988,10 @@ gd:
           authenticated: Cleachdaichean a chlàraich a-steach a-mhàin
           disabled: Iarr dreuchd shònraichte a’ chleachdaiche
           public: A h-uile duine
+      landing_page:
+        values:
+          overview: Foir-shealladh
+          trends: A’ treandadh
       registrations:
         moderation_recommandation: Dèan cinnteach gu bheil sgioba maoir deiseil is deònach agad mus fhosgail thu an clàradh dhan a h-uile duine!
         preamble: Stiùirich cò dh’fhaodas cunntas a chruthachadh air an fhrithealaiche agad.
@@ -928,6 +1011,7 @@ gd:
     site_uploads:
       delete: Sguab às am faidhle a chaidh a luchdadh suas
       destroyed_msg: Chaidh an luchdadh suas dhan làrach a sguabadh às!
+    skip_to_content: Thoir leum dhan t-susbaint
     software_updates:
       critical_update: Èiginneach – ùraich cho luath ’s a ghabhas
       description: Mholamaid gun cùm thu an stàladh agad de Mhastodon ùraichte ach am faigh thu buannachd às na càraidhean ’s gleusan as ùire. A bharrachd air sin, bidh e èiginneach aig amannan gun ùraich thu Mastodon gun dàil airson duilgheadasan tèarainteachd a sheachnadh. Seo as adhbhar gun doir Mastodon sùil airson ùrachaidhean gach leth-uair a thìde ’s gun cuir e brath thugad a-rèir nan roghainnean puist-d agad.
@@ -1453,6 +1537,7 @@ gd:
       your_appeal_rejected: Chaidh an t-ath-thagradh agad a dhiùltadh
   edit_profile:
     other: Eile
+    privacy_redesign_body: Taghaidh tu an seall thu an luchd-leantainn agad is cò leanas tu gus nach seall dìreach on phròifil agad.
     redesign_body: "’S urrainn dhut a’ phròifil agad a dheasachadh air duilleag na pròifile fhèin."
     redesign_button: Tadhail air
     redesign_title: Tha dòigh ùr air deasachadh na pròifil againn
@@ -1487,7 +1572,9 @@ gd:
         success_html: Gheibh thu puist-d a-nis nuair a dh’fhoillsicheas %{name} postaichean ùra. Cuir %{sender} ris an luchd-aithne agad ach nach dèid na postaichean seo a chur do phasgan an spama agad.
         title: Tha thu air clàradh
         unsubscribe: Cuir crìoch air an fho-sgrìobhadh
+    disabled: À comas
     inactive: Neo-ghnìomhach
+    no_access: Gun inntrigeadh
     status: Staid
     subscribers: Fo-sgrìobhaichean
   emoji_styles:
@@ -1523,7 +1610,9 @@ gd:
     blocks: Tha thu a’ bacadh
     bookmarks: Comharran-lìn
     csv: CSV
+    custom_filters: Criathragan
     domain_blocks: Bacaidhean àrainne
+    json: JSON
     lists: Liostaichean
     mutes: Tha thu a’ mùchadh
     storage: Stòras mheadhanan
@@ -1615,7 +1704,9 @@ gd:
       empty: Faidhle CSV falamh
       incompatible_type: Chan eil e co-chòrdail le seòrsa an ion-phortaidh a thagh thu
       invalid_csv_file: 'Faidhle CSV mì-dhligheach. Mearachd: %{error}'
+      invalid_json_file: 'Faidhle JSON mì-dhligheach. Mearachd: %{error}'
       over_rows_processing_limit: tha còrr is %{count} ràgh(an) ann
+      status_not_found_warning: Falaichidh cuid dhe na criathragan agad postaichean sònraichte air nach eil am frithealaiche seo eòlach. Cha dèid na postaichean seo a chriathradh gu fèin-obrachail ma gheibh am frithealaiche lorg orra uaireigin sam àm ri teachd.
       too_large: Tha am faidhle ro mhòr
     failures: Fàilligidhean
     imported: Air ion-phortadh
@@ -1636,6 +1727,11 @@ gd:
         one: Tha thu an impis suas ri <strong>%{count} phost</strong> o <strong>%{filename}</strong> a chur <strong>an àite nan comharra-lìn</strong> agad.
         other: Tha thu an impis suas ri <strong>%{count} post</strong> o <strong>%{filename}</strong> a chur <strong>an àite nan comharra-lìn</strong> agad.
         two: Tha thu an impis suas ri <strong>%{count} phost</strong> o <strong>%{filename}</strong> a chur <strong>an àite nan comharra-lìn</strong> agad.
+      custom_filters_html:
+        few: Tha thu an impis susbaint <strong>%{filename}</strong> a chur <strong>an àite nan criathragan agad</strong>. Thèid suas ri <strong>%{count} criathragan</strong> a chur ri criathragan ùra.
+        one: Tha thu an impis susbaint <strong>%{filename}</strong> a chur <strong>an àite nan criathragan agad</strong>. Thèid suas ri <strong>%{count} chriathrag</strong> a chur ri criathragan ùra.
+        other: Tha thu an impis susbaint <strong>%{filename}</strong> a chur <strong>an àite nan criathragan agad</strong>. Thèid suas ri <strong>%{count} criathrag</strong> a chur ri criathragan ùra.
+        two: Tha thu an impis susbaint <strong>%{filename}</strong> a chur <strong>an àite nan criathragan agad</strong>. Thèid suas ri <strong>%{count} chriathrag</strong> a chur ri criathragan ùra.
       domain_blocking_html:
         few: Tha thu an impis suas ri <strong>%{count} àrainnean</strong> o <strong>%{filename}</strong> a chur <strong>an àite liosta nam bacaidhean àrainne</strong> agad.
         one: Tha thu an impis suas ri <strong>%{count} àrainn</strong> o <strong>%{filename}</strong> a chur <strong>an àite liosta nam bacaidhean àrainne</strong> agad.
@@ -1667,6 +1763,11 @@ gd:
         one: Tha thu an impis suas ri <strong>%{count} phost</strong> o <strong>%{filename}</strong> a chur ris na h-<strong>annsachdan</strong> agad.
         other: Tha thu an impis suas ri <strong>%{count} post</strong> o <strong>%{filename}</strong> a chur ris na h-<strong>annsachdan</strong> agad.
         two: Tha thu an impis suas ri <strong>%{count} phost</strong> o <strong>%{filename}</strong> a chur ris na h-<strong>annsachdan</strong> agad.
+      custom_filters_html:
+        few: Tha thu an impis suas ri <strong>%{count} criathragan</strong> o <strong>%{filename}</strong> a chur ris na <strong>criathragan</strong> agad.
+        one: Tha thu an impis suas ri <strong>%{count} chriathrag</strong> o <strong>%{filename}</strong> a chur ris na <strong>criathragan</strong> agad.
+        other: Tha thu an impis suas ri <strong>%{count} criathrag</strong> o <strong>%{filename}</strong> a chur ris na <strong>criathragan</strong> agad.
+        two: Tha thu an impis suas ri <strong>%{count} chriathrag</strong> o <strong>%{filename}</strong> a chur ris na <strong>criathragan</strong> agad.
       domain_blocking_html:
         few: Tha thu an impis suas ri <strong>%{count} àrainnean</strong> o <strong>%{filename}</strong> a <strong>bhacadh</strong>.
         one: Tha thu an impis suas ri <strong>%{count} àrainn</strong> o <strong>%{filename}</strong> a <strong>bhacadh</strong>.
@@ -1711,6 +1812,7 @@ gd:
     types:
       blocking: Liosta-bhacaidh
       bookmarks: Comharran-lìn
+      custom_filters: Criathragan
       domain_blocking: Liosta-bhacaidh àrainnean
       following: Liosta dhen fheadhainn a leanas tu
       lists: Liostaichean

config/locales/gl.yml

@@ -4,6 +4,7 @@ gl:
     about_mastodon_html: 'A rede social do futuro: Sen publicidade, sen seguimento por empresas, deseño ético e descentralización! En Mastodon ti posúes os teus datos!'
     contact_missing: Non establecido
     contact_unavailable: Non dispoñíbel
+    default_thumbnail_description: Dous mastodóns sorrintes debuxados (que semellan elefantes) tiran un avión de papel polo aire entre eles. De fondo vese o ceo azul con planetas flotando entre árbores e máis mastodóns neles.
     hosted_on: Mastodon aloxado en %{domain}
     title: Sobre
   accounts:
@@ -1665,7 +1666,9 @@ gl:
       empty: Ficheiro CSV de baleiro
       incompatible_type: Non é compatible co tipo de importación seleccionado
       invalid_csv_file: 'Ficheiro CSV non válido. Erro: %{error}'
+      invalid_json_file: 'Ficheiro JSON non válido. Erro: %{error}'
       over_rows_processing_limit: contén máis de %{count} filas
+      status_not_found_warning: Algún dos teus filtros oculta publicacións concretas que non son coñecidas por este servidor. Estas publicacións non se van filtrar automaticamente se son descubertas máis tarde polo servidor.
       too_large: O ficheiro é demasiado grande
     failures: Erros
     imported: Importado
@@ -1682,6 +1685,9 @@ gl:
       bookmarks_html:
         one: Vas <strong>substituír os marcadores</strong> por <strong>%{count} publicación</strong> desde <strong>%{filename}</strong>.
         other: Vas <strong>substituír os marcadores</strong> por <strong>%{count} publicacións</strong> desde <strong>%{filename}</strong>.
+      custom_filters_html:
+        one: Vas <strong>substituír os teus filtros</strong> co contido de <strong>%{filename}</strong>. Vaise engadir só <strong>%{count} filtro</strong> aos novos filtros.
+        other: Vas <strong>substituír os teus filtros</strong> co contido de <strong>%{filename}</strong>. Vaise engadir <strong>%{count} filtros</strong> aos novos filtros.
       domain_blocking_html:
         one: Vas <strong>substituír a lista de dominios bloqueados</strong> por <strong>%{count} dominio</strong> desde <strong>%{filename}</strong>.
         other: Vas <strong>substituír a lista de dominios bloqueados</strong> por <strong>%{count} dominios</strong> desde <strong>%{filename}</strong>.
@@ -1701,6 +1707,9 @@ gl:
       bookmarks_html:
         one: Vas engadir <strong>%{count} publicación</strong> desde <strong>%{filename}</strong> aos teus <strong>marcadores</strong>.
         other: Vas engadir <strong>%{count} publicacións</strong> desde <strong>%{filename}</strong> aos teus <strong>marcadores</strong>.
+      custom_filters_html:
+        one: Vas a engadir <strong>%{count} filtro</strong> desde <strong>%{filename}</strong> aos teus <strong>filtros</strong>.
+        other: Vas a engadir <strong>%{count} filtros</strong> desde <strong>%{filename}</strong> aos teus <strong>filtros</strong>.
       domain_blocking_html:
         one: Vas <strong>bloquear</strong> a <strong>%{count} dominio</strong> desde <strong>%{filename}</strong>.
         other: Vas <strong>bloquear</strong> a <strong>%{count} dominios</strong> desde <strong>%{filename}</strong>.
@@ -1737,6 +1746,7 @@ gl:
     types:
       blocking: Lista de bloqueo
       bookmarks: Marcadores
+      custom_filters: Filtros
       domain_blocking: Lista de bloqueo de dominios
       following: Lista de seguimento
       lists: Listas

config/locales/he.yml

@@ -4,6 +4,7 @@ he:
     about_mastodon_html: מסטודון היא רשת חברתית <em>חופשית, מבוססת תוכנה חופשית ("קוד פתוח")</em>. כאלטרנטיבה <em>בלתי ריכוזית</em> לפלטפרומות המסחריות, מסטודון מאפשרת להמנע מהסיכונים הנלווים להפקדת התקשורת שלך בידי חברה יחידה. שמת את מבטחך בשרת אחד &mdash; לא משנה במי בחרת, תמיד אפשר לדבר עם כל שאר המשתמשים. לכל מי שרוצה יש את האפשרות להקים שרת מסטודון עצמאי, ולהשתתף ב<em>רשת החברתית</em> באופן חלק.
     contact_missing: ללא הגדרה
     contact_unavailable: לא רלוונטי/חסר
+    default_thumbnail_description: שני מסטודונים מצויירים (הדומים לפילים) משחקים במטוס נייר. הם מוקפים בשמיים כחולים בהירים ופלנטות מרחפות עם עצים ומסטודונים נוספים עליהם.
     hosted_on: מסטודון שיושב בכתובת %{domain}
     title: אודות
   accounts:
@@ -1655,7 +1656,7 @@ he:
       deprecated_api_multiple_keywords: לא ניתן לשנות פרמטרים אלו מהיישומון הזה בגלל שהם חלים על יותר ממילת מפתח אחת. ניתן להשתמש ביישומון מעודכן יותר או בממשק הוובי.
       invalid_context: לא סופק הקשר או הקשר לא תקין
     index:
-      contexts: פילטרים ב %{contexts}
+      contexts: סננים ב־%{contexts}
       delete: למחוק
       empty: אין לך מסננים.
       expires_in: פג תוקף ב %{distance}
@@ -1680,9 +1681,9 @@ he:
       save: שמירת מסנן חדש
       title: הוספת מסנן חדש
     statuses:
-      back_to_filter: חזרה לפילטר
+      back_to_filter: חזרה לסנן
       batch:
-        remove: הסרה ממסנן
+        remove: הסרה מסנן
       index:
         hint: סנן זה חל באופן של בחירת הודעות בודדות ללא תלות בקריטריונים אחרים. תוכלו להוסיף עוד הודעות לסנן זה ממנשק הווב.
         title: הודעות שסוננו
@@ -1723,7 +1724,9 @@ he:
       empty: קובץ CSV ריק
       incompatible_type: אין תאימות עם סוג היבוא שנבחר
       invalid_csv_file: 'קובץ CSV שבור. שגיאה: %{error}'
+      invalid_json_file: 'קובץ JSON שבור. שגיאה: %{error}'
       over_rows_processing_limit: מכיל יותר מ-%{count} עמודות
+      status_not_found_warning: חלק מהסננים שלך מסתירים הודעות ספציפיות שאינן מוכרות על ידי שרת זה. הודעות אלו לא יסוננו אוטומטית אם הן יתגלו על ידי השרת מאוחר יותר.
       too_large: קובץ גדול מדי
     failures: כשלים
     imported: יובא
@@ -1744,6 +1747,11 @@ he:
         one: אתם עומדים <strong>להחליף את רשימת הסימניות</strong><strong> בהודעה אחת</strong> מהקובץ <strong>%{filename}</strong>.
         other: אתם עומדים <strong>להחליף את רשימת הסימניות</strong> עד כדי <strong>%{count} הודעות</strong> מהקובץ <strong>%{filename}</strong>.
         two: אתם עומדים <strong>להחליף את רשימת הסימניות</strong> עד כדי <strong>שתי הודעות</strong> מהקובץ <strong>%{filename}</strong>.
+      custom_filters_html:
+        many: הפעולה הבאה <strong>תחליף את סנניך</strong> בתוכן של <strong>%{filename}</strong>. עד <strong>%{count} סננים</strong> יתווספו לסננים חדשים.
+        one: הפעולה הבאה <strong>תחליף את סנניך</strong> בתוכן של <strong>%{filename}</strong>. עד <strong>סנן אחד</strong> יתווסף לסננים חדשים.
+        other: הפעולה הבאה <strong>תחליף את סנניך</strong> בתוכן של <strong>%{filename}</strong>. עד <strong>%{count} סננים</strong> יתווספו לסננים חדשים.
+        two: הפעולה הבאה <strong>תחליף את סנניך</strong> בתוכן של <strong>%{filename}</strong>. עד <strong>%{count} סננים</strong> יתווספו לסננים חדשים.
       domain_blocking_html:
         many: אתם עומדים <strong>להחליף את רשימת חסימות השרתים</strong> עד כדי <strong>%{count} שרתים</strong> מהקובץ <strong>%{filename}</strong>.
         one: אתם עומדים <strong>להחליף את רשימת חסימות השרתים</strong> <strong>בשרת אחד</strong> מהקובץ <strong>%{filename}</strong>.
@@ -1775,6 +1783,11 @@ he:
         one: אתם עומדים <strong>להוסיף</strong><strong>הודעה אחת</strong> מהקובץ <strong>%{filename}</strong> לרשימת <strong>הסימניות שלכם</strong>.
         other: אתם עומדים להוסיף עד <strong>%{count} הודעות</strong> מהקובץ <strong>%{filename}</strong> לרשימת <strong>הסימניות שלכם</strong>.
         two: אתם עומדים <strong>להוסיף</strong> עד <strong>שתי הודעות</strong> מהקובץ <strong>%{filename}</strong> לרשימת <strong>הסימניות שלכם</strong>.
+      custom_filters_html:
+        many: אתם עומדים להוסיף עד <strong>%{count} סננים</strong> מהקובץ <strong>%{filename}</strong> לרשימת <strong>הסננים שלכם</strong>.
+        one: אתם עומדים להוסיף עד <strong>סנן אחד</strong> מהקובץ <strong>%{filename}</strong> לרשימת <strong>הסננים שלכם</strong>.
+        other: אתם עומדים להוסיף עד <strong>%{count} סננים</strong> מהקובץ <strong>%{filename}</strong> לרשימת <strong>הסננים שלכם</strong>.
+        two: אתם עומדים להוסיף עד <strong>%{count} סננים</strong> מהקובץ <strong>%{filename}</strong> לרשימת <strong>הסננים שלכם</strong>.
       domain_blocking_html:
         many: אתם עומדים <strong>לחסום</strong> עד כדי <strong>%{count} שרתים</strong> מהקובץ <strong>%{filename}</strong>.
         one: אתם עומדים <strong>לחסום</strong> עד <strong>שרת אחד</strong> מהקובץ <strong>%{filename}</strong>.
@@ -1819,6 +1832,7 @@ he:
     types:
       blocking: רשימת חסימות
       bookmarks: סימניות
+      custom_filters: סננים
       domain_blocking: רשימת שמות מתחם חסומים
       following: רשימת נעקבים
       lists: רשימות

config/locales/hu.yml

@@ -1665,7 +1665,9 @@ hu:
       empty: Üres CSV-fájl
       incompatible_type: Nem kompatibilis a kiválasztott importálási típussal
       invalid_csv_file: 'Érvénytelen CSV-fájl. Hiba: %{error}'
+      invalid_json_file: 'Érvénytelen JSON-fájl. Hiba: %{error}'
       over_rows_processing_limit: több mint %{count} sort tartalmaz
+      status_not_found_warning: A szűrőid olyan bejegyzéseket rejtenek el, melyeket ez a kiszolgáló nem ismer. Ezek a bejegyzések nem lesznek automatikusan kiszűrve, ha a kiszolgáló később felfedezi őket.
       too_large: A fájl túl nagy
     failures: Hibák
     imported: Importálva
@@ -1682,6 +1684,9 @@ hu:
       bookmarks_html:
         one: 'Arra készülsz, hogy <strong>lecseréld a könyvjelzőket</strong> legfeljebb <strong>%{count} bejegyzésre</strong> a következőből: <strong>%{filename}</strong>.'
         other: 'Arra készülsz, hogy <strong>lecseréld a könyvjelzőket</strong> legfeljebb <strong>%{count} bejegyzésre</strong> a következőből: <strong>%{filename}</strong>.'
+      custom_filters_html:
+        one: Arra készülsz, hogy <strong>lecseréld a szűrőidet</strong> a <strong>%{filename}</strong> tartalmára. Legfeljebb <strong>%{count} szűrő</strong> lesz hozzáadva az új szűrőkhöz.
+        other: Arra készülsz, hogy <strong>lecserád a szűrőidet</strong> a <strong>%{filename}</strong> tartalmára. Legfeljebb <strong>%{count} szűrő</strong> lesz hozzáadva az új szűrőkhöz.
       domain_blocking_html:
         one: 'Arra készülsz, hogy <strong>lecseréld a domain letiltási listát</strong> legfeljebb <strong>%{count} domainre</strong> a következőből: <strong>%{filename}</strong>.'
         other: 'Arra készülsz, hogy <strong>lecseréld a domain letiltási listát</strong> legfeljebb <strong>%{count} domainre</strong> a következőből: <strong>%{filename}</strong>.'
@@ -1701,6 +1706,9 @@ hu:
       bookmarks_html:
         one: 'Arra készülsz, hogy legfeljebb <strong>%{count} bejegyzést</strong> adj hozzá a <strong>könyvjelzőkhöz</strong> a következőből: <strong>%{filename}</strong>.'
         other: 'Arra készülsz, hogy legfeljebb <strong>%{count} bejegyzést</strong> adj hozzá a <strong>könyvjelzőkhöz</strong> a következőből: <strong>%{filename}</strong>.'
+      custom_filters_html:
+        one: Arra készülsz, hogy legfeljebb <strong>%{count} szűrőt</strong> adj hozzá a(z) <strong>%{filename}</strong> fájlból a <strong>szűrőidhöz</strong>.
+        other: Arra készülsz, hogy legfeljebb <strong>%{count} szűrőt</strong> adj hozzá a(z) <strong>%{filename}</strong> fájlból a <strong>szűrőidhöz</strong>.
       domain_blocking_html:
         one: 'Arra készülsz, hogy legfeljebb <strong>%{count} domaint</strong> <strong>letilts</strong> a következőből: <strong>%{filename}</strong>.'
         other: 'Arra készülsz, hogy legfeljebb <strong>%{count} domaint</strong> <strong>letilts</strong> a következőből: <strong>%{filename}</strong>.'
@@ -1737,6 +1745,7 @@ hu:
     types:
       blocking: Letiltottak listája
       bookmarks: Könyvjelzők
+      custom_filters: Szűrők
       domain_blocking: Letiltott domainek listája
       following: Követettjeid listája
       lists: Listák

config/locales/is.yml

@@ -1669,6 +1669,7 @@ is:
       empty: Tóm CSV-skrá
       incompatible_type: Ekki samhæfanlegt valinni tegund innflutnings
       invalid_csv_file: 'Ógild CSV-skrá. Villa: %{error}'
+      invalid_json_file: 'Ógild JSON-skrá. Villa: %{error}'
       over_rows_processing_limit: inniheldur meira en %{count} raðir
       too_large: Skráin er of stór
     failures: Mistök
@@ -1741,6 +1742,7 @@ is:
     types:
       blocking: Listi yfir útilokanir
       bookmarks: Bókamerki
+      custom_filters: Síur
       domain_blocking: Listi yfir útilokanir léna
       following: Listi yfir þá sem fylgst er með
       lists: Listar

config/locales/it.yml

@@ -4,6 +4,7 @@ it:
     about_mastodon_html: 'Il social network del futuro: Nessuna pubblicità, zero sorveglianza aziendale, design etico e decentralizzazione! Sii il proprietario dei tuoi dati, con Mastodonte!'
     contact_missing: Non impostato
     contact_unavailable: N/D
+    default_thumbnail_description: Due mastodonti sorridenti dei cartoni animati (che sembrano elefanti) si lanciano in mezzo un aeroplanino di carta. Sono circondati da un cielo azzurro brillante e da pianeti fluttuanti con alberi e altri mastodonti su di essi.
     hosted_on: Mastodon ospitato su %{domain}
     title: Info
   accounts:
@@ -1745,6 +1746,7 @@ it:
     types:
       blocking: Lista dei bloccati
       bookmarks: Segnalibri
+      custom_filters: Filtri
       domain_blocking: Lista dei domini bloccati
       following: Lista dei seguiti
       lists: Elenchi

config/locales/ko.yml

@@ -496,6 +496,16 @@ ko:
           hint: 구독자를 가진 계정이 없습니다.
           no_lists_yet: 리스트가 없습니다
         last_email: 최근 이메일
+        show:
+          date: 가입 날짜
+          disable_feature: 기능 비활성화
+          email: 이메일 주소
+          empty:
+            hint: 이 계정은 아직 아무도 구독하지 않았습니다.
+            no_subscribers_yet: 구독자가 없습니다
+          enable_feature: 기능 활성화
+          title: "%{name}의 이메일 뉴스레터"
+          view_account: 계정 보기
         status: 상태
         subscribers: 구독자
         title: 메일링 리스트
@@ -528,6 +538,7 @@ ko:
           cannot_be_enabled: 이 서버의 기술제공자가 이 기능을 활성화하지 않았습니다.
           description: 이 기능은 지정된 계정들이 프로필에 위젯을 추가해 마스토돈 계정 없이도 이메일을 통해 게시물을 받아볼 수 있도록 허용합니다.
           get_started: 시작하기
+        lead: 방문자가 이 서버의 전용 계정을 통해 이메일로 게시물을 받을 수 있도록 허용합니다.
         title: 이메일 뉴스레터
       roles:
         accounts: 계정
@@ -1478,6 +1489,7 @@ ko:
     confirmation:
       action: 이메일 주소 확인
       subject: 이메일 주소 확인
+      title: "%{name} 님으로부터 이메일 업데이트를 받겠습니까?"
     notification:
       create_account: 마스토돈 계정 생성
       subject:
@@ -1493,7 +1505,9 @@ ko:
         changed_your_mind: 마음이 바뀌었나요?
         title: 가입되었습니다
         unsubscribe: 구독 해제
+    disabled: 비활성화됨
     inactive: 비활성
+    no_access: 접근 불가
     status: 상태
     subscribers: 구독자
   emoji_styles:
@@ -1602,6 +1616,7 @@ ko:
       empty: 빈 CSV 파일
       incompatible_type: 호환되지 않는 가져오기 유형을 선택함
       invalid_csv_file: '올바르지 않은 CSV 파일입니다. 오류: %{error}'
+      invalid_json_file: '올바르지 않은 JSON 파일입니다. 오류: %{error}'
       over_rows_processing_limit: "%{count}개 이상의 열을 포함합니다"
       too_large: 파일이 너무 큼
     failures: 실패
@@ -1630,6 +1645,8 @@ ko:
         other: "<strong>%{filename}</strong>에서 가져온 <strong>%{count}개의 계정</strong>을 차단하려고 합니다."
       bookmarks_html:
         other: "<strong>%{filename}</strong>에서 가져온 <strong>%{count}개의 게시물</strong>을 북마크에 추가하려고 합니다."
+      custom_filters_html:
+        other: "<strong>%{filename}</strong>에서 가져온 <strong>%{count}개의 필터</strong>를 <strong>필터</strong>에 추가하려고 합니다."
       domain_blocking_html:
         other: "<strong>%{filename}</strong>에서 가져온 <strong>%{count}개의 도메인</strong>을 차단하려고 합니다."
       following_html:
@@ -1662,6 +1679,7 @@ ko:
     types:
       blocking: 차단한 계정 목록
       bookmarks: 북마크
+      custom_filters: 필터
       domain_blocking: 도메인 차단 목록
       following: 팔로잉 목록
       lists: 리스트
@@ -1688,7 +1706,7 @@ ko:
     table:
       expires_at: 만료
       uses: 이용 수
-    title: 초대하기
+    title: 초대
   link_preview:
     author_html: "%{name} 작성"
     potentially_sensitive_content:
@@ -1736,7 +1754,7 @@ ko:
     past_migrations: 과거 이주
     proceed_with_move: 팔로워 이동
     redirected_msg: 당신의 계정은 이제 %{acct} 로 리다이렉트됩니다.
-    redirecting_to: 당신의 계정은 %{acct} 로 리다이렉트됩니다.
+    redirecting_to: 내 계정이 %{acct}에 리디렉트됩니다.
     set_redirect: 리디렉션 설정
     warning:
       backreference_required: 새 계정은 이 계정으로 역참조를 하도록 설정되어 있어야 합니다
@@ -1965,7 +1983,7 @@ ko:
       windows: 윈도우
       windows_mobile: 윈도우 모바일
       windows_phone: 윈도우 폰
-    revoke: 취소
+    revoke: 삭제
     revoke_success: 세션을 성공적으로 취소하였습니다
     title: 세션
     view_authentication_history: 내 계정에 대한 인증 이력 보기

config/locales/lv.yml

@@ -515,10 +515,10 @@ lv:
       description_html: "<strong>Sekošanas ieteikumi palīdz jauniem lietotājiem ātri arast saistošu saturu</strong>. Kad lietotājs nav pietiekami mijiedarbojies ar citiem, lai veidotos pielāgoti sekošanas iteikumi, tiek ieteikti šie konti. Tie tiek pārskaitļoti ik dienas, izmantojot kontu, kuriem ir augstākās nesenās iesaistīšanās un lielākais vietējo sekotāju skaits norādītajā valodā."
       language: Valodai
       status: Stāvoklis
-      suppress: Apspiest sekošanas rekomendāciju
+      suppress: Apspiest sekošanas ieteikumu
       suppressed: Apspiestie
       title: Sekošanas ieteikumi
-      unsuppress: Atjaunot sekošanas rekomendāciju
+      unsuppress: Atjaunot sekošanas ieteikumu
     instances:
       audit_log:
         title: Nesenie pārbaudes žurnāli
@@ -738,9 +738,9 @@ lv:
         moderation: Satura pārraudzība
         special: Īpašās
       delete: Dzēst
-      description_html: Izmantojot <strong>lietotāju lomas</strong>, vari pielāgot, kurām Mastodon funkcijām un apgabaliem var piekļūt tavi lietotāji.
+      description_html: Ar <strong>lietotāju lomām</strong>, var pielāgot, kurām Mastodon iespējām un apgabaliem lietotāji var piekļūt.
       edit: Labot lomu '%{name}'
-      everyone: Noklusētās atļaujas
+      everyone: Noklusējuma atļaujas
       everyone_full_description_html: Šī ir <strong>pamata loma</strong>, kas ietekmē <strong>visus lietotājus</strong>, pat tos, kuriem nav piešķirta loma. Visas pārējās lomas manto atļaujas no šīs.
       permissions_count:
         one: "%{count} atļauja"
@@ -827,7 +827,7 @@ lv:
         desc_html: Ietekmē visus lietotājus, kuri paši nav mainījuši šo iestatījumu
         title: Pēc noklusējuma lietotāji būs atteikušies no meklētājprogrammu indeksēšanas
       discovery:
-        follow_recommendations: Sekotšanas rekomendācijas
+        follow_recommendations: Sekošanas ieteikumi
         privacy: Konfidencialitāte
         profile_directory: Profila direktorija
         public_timelines: Publiskās ziņu lentas
@@ -1611,7 +1611,7 @@ lv:
     incoming_migrations_html: Lai pārnāktu no cita konta uz šo, vispirms tev <a href="%{path}">jāizveido konta aizstājvārds</a>.
     moved_msg: Tavs konts tagad tiek novirzīts uz %{acct}, un tavi sekotāji tiek pārvietoti.
     not_redirecting: Tavs konts pašlaik netiek novirzīts uz jebkādu citu kontu.
-    on_cooldown: Tu nesen migrēji savu kontu. Šī funkcija atkal būs pieejama pēc %{count} dienām.
+    on_cooldown: Tu nesen pārcēli savu kontu. Šī iespēja bīs atkal pieejama pēc %{count} dienām.
     past_migrations: Pagātnes migrācijas
     proceed_with_move: Pārvietot sekotājus
     redirected_msg: Tavs konts tagad tiek novirzīts uz %{acct}.
@@ -1714,7 +1714,7 @@ lv:
     posting_defaults: Ierakstu pievienošanas noklusējumi
     public_timelines: Publiskās ziņu lentas
   privacy:
-    hint_html: "<strong>Pielāgo, kā vēlies atrast savu profilu un ziņas.</strong> Dažādas Mastodon funkcijas var palīdzēt sasniegt plašāku auditoriju, ja tās ir iespējotas. Velti laiku, lai pārskatītu šos iestatījumus, lai pārliecinātos, ka tie atbilst tavam lietošanas gadījumam."
+    hint_html: "<strong>Pielāgo, kā vēlies, lai Tavs profils un ieraksti būtu atrodami.</strong> Dažādas Mastodon iespējas var palīdzēt sasniegt plašāku cilvēku loku, kad tās ir iespējotas. Velti laiku, lai pārskatītu šos iestatījumus, lai pārliecinātos, ka tie atbilst Tavām vajadībām."
     privacy: Privātums
     privacy_hint_html: Kontrolē, cik daudz vēlies izpaust citu labā. Cilvēki atklāj interesantus profilus un lieliskas lietotnes, pārlūkojot citu cilvēku sekotājus un redzot, no kurām lietotnēm viņi izliek ziņas, taču tu, iespējams, vēlēsies to slēpt.
     reach: Sasniedzamība

config/locales/nan-TW.yml

@@ -495,6 +495,18 @@ nan-TW:
           no_lists_yet: Iáu無列單
         last_email: 上新ê電子phue箱
         lead: 有啟用tsit ê功能koh有訂ê lâng ê口座ē展示佇下kha。
+        show:
+          confirm_disable_feature: Kám beh kā %{name} 停止電子報？電子phue更新ē buē koh對 tsit ê口座送出。Tsit ê用者猶原通佇in ê口座設定內底重啟用tsit ê功能。Beh永永禁止接近使用tsit ê功能，請佇角色內底編tsit ê口座ê權限。
+          confirm_remove_subscriber: "%{email} 會無法度收著uì %{name} 來ê電子批。Tsit ê功能bē當復原。"
+          consent: 訂ê lâng kan-ta同意通過電子phue收著PO文。請毋通kā tsit ê列單用做別途。
+          date: 註冊日
+          disable_feature: Kā功能停止使用
+          disabled: Tsit ê功能停用ah，而且電子phue buē當koh送kàu tsit ê列單。
+          email: 電子phue地址
+          empty:
+            hint: Iáu無半个lâng訂tsit ê口座。
+            no_subscribers_yet: Iáu無訂ê lâng
+          enable_feature: 啟用功能
         status: 狀態
         subscribers: 訂ê lâng
         title: 電子phue列單

config/locales/nl.yml

@@ -4,6 +4,7 @@ nl:
     about_mastodon_html: 'Het sociale netwerk van de toekomst: geen reclame, geen meekijkende bedrijven, ethisch ontwerp, en gedecentraliseerd! Met Mastodon ben je baas over je eigen gegevens!'
     contact_missing: Niet ingesteld
     contact_unavailable: n.v.t
+    default_thumbnail_description: Twee glimlachende getekende mastodonten (die op olifanten lijken) gooien een papieren vliegtuigje tussen elkaar in. Ze zijn omringd door een heldere blauwe lucht en zwevende planeten met bomen en meer mastodonten erop.
     hosted_on: Mastodon op %{domain}
     title: Over
   accounts:
@@ -1665,7 +1666,9 @@ nl:
       empty: Leeg CSV-bestand
       incompatible_type: Incompatibel met het geselecteerde importtype
       invalid_csv_file: 'Ongeldig CSV-bestand. Fout: %{error}'
+      invalid_json_file: 'Ongeldig JSON-bestand. Foutmelding: %{error}'
       over_rows_processing_limit: bevat meer dan %{count} rijen
+      status_not_found_warning: Sommige van je filters verbergen specifieke berichten die niet bekend zijn bij deze server. Deze berichten worden niet automatisch gefilterd wanneer ze later alsnog door de server worden ontdekt.
       too_large: Bestand is te groot
     failures: Fouten
     imported: Geïmporteerd
@@ -1682,6 +1685,9 @@ nl:
       bookmarks_html:
         one: Je staat op het punt om vanuit <strong>%{filename}</strong> je <strong>bladwijzers te vervangen</strong> met in het totaal <strong>%{count} bericht</strong>.
         other: Je staat op het punt om vanuit <strong>%{filename}</strong> je <strong>bladwijzers te vervangen</strong> met in het totaal <strong>%{count} berichten</strong>.
+      custom_filters_html:
+        one: Je staat op het punt om met de inhoud van <strong>%{filename}</strong> je <strong>filters te vervangen</strong>. In totaal wordt <strong>%{count} filter</strong> aan de nieuwe filters toegevoegd.
+        other: Je staat op het punt om met de inhoud van <strong>%{filename}</strong> je <strong>filters te vervangen</strong>. In totaal worden <strong>%{count} filters</strong> aan de nieuwe filters toegevoegd.
       domain_blocking_html:
         one: Je staat op het punt om vanuit <strong>%{filename}</strong> je <strong>lijst met geblokkeerde domeinen te vervangen</strong> met in het totaal <strong>%{count} domein</strong>.
         other: Je staat op het punt om vanuit <strong>%{filename}</strong> je <strong>lijst met geblokkeerde domeinen te vervangen</strong> met in het totaal <strong>%{count} domeinen</strong>.
@@ -1701,6 +1707,9 @@ nl:
       bookmarks_html:
         one: Je staat op het punt om vanuit <strong>%{filename}</strong> in het totaal <strong>%{count} bericht</strong> aan je <strong>bladwijzers</strong> toe te voegen.
         other: Je staat op het punt om vanuit <strong>%{filename}</strong> in het totaal <strong>%{count} berichten</strong> aan je <strong>bladwijzers</strong> toe te voegen.
+      custom_filters_html:
+        one: Je staat op het punt om vanuit <strong>%{filename}</strong> in totaal <strong>%{count} filter</strong> aan je <strong>filters</strong> toe te voegen.
+        other: Je staat op het punt om vanuit <strong>%{filename}</strong> in het totaal <strong>%{count} filters</strong> aan je <strong>filters</strong> toe te voegen.
       domain_blocking_html:
         one: Je staat op het punt om vanuit <strong>%{filename}</strong> in het totaal <strong>%{count} domein te blokkeren</strong>.
         other: Je staat op het punt om vanuit <strong>%{filename}</strong> in het totaal <strong>%{count} domeinen te blokkeren</strong>.
@@ -1737,6 +1746,7 @@ nl:
     types:
       blocking: Geblokkeerde accounts
       bookmarks: Bladwijzers
+      custom_filters: Filters
       domain_blocking: Geblokkeerde domeinen
       following: Gevolgde accounts
       lists: Lijsten