Merge pull request #3537 from glitch-soc/glitch-soc/merge-4.6

Merge upstream changes up to 137d5801544ca5b8078ce2242ff3b5505e648166 into stable-4.6
2026-06-17 15:30:35 +02:00 · 2026-06-17 15:30:35 +02:00 · 0c4bf90bae
commit 0c4bf90bae
parent 1f927a8f77 ada096fd2b
182 changed files with 925 additions and 859 deletions
--- a/CHANGELOG.md
+++ b/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, and #39429 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.
@ -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,6 +55,7 @@ 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, #39402, and #39421 by @ChaosExAnima, @ClearlyClaire, @diondiondion, @gomasy, and @Hanage999)
@ -103,6 +104,8 @@ 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, #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)
--- a/SECURITY.md
+++ b/SECURITY.md
@ -13,8 +13,9 @@ A "vulnerability in Mastodon" is a vulnerability in the code distributed through

 ## Supported Versions

-| Version | Supported |
-| ------- | --------- |
-| 4.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               |
--- a/app/javascript/flavours/glitch/actions/compose.js
+++ b/app/javascript/flavours/glitch/actions/compose.js
@ -64,10 +64,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_DOODLE_SET        = 'COMPOSE_DOODLE_SET';

 export const COMPOSE_POLL_ADD             = 'COMPOSE_POLL_ADD';
@ -495,58 +491,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,
--- a/app/javascript/flavours/glitch/actions/compose_typed.ts
+++ b/app/javascript/flavours/glitch/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,
    };
  },
  {
--- a/app/javascript/flavours/glitch/components/account_bio/index.tsx
+++ b/app/javascript/flavours/glitch/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,
 }) => {
--- a/app/javascript/flavours/glitch/components/account_bio/styles.module.scss
+++ b/app/javascript/flavours/glitch/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;
+    }
+  }
+}
--- a/app/javascript/flavours/glitch/components/account_header/index.tsx
+++ b/app/javascript/flavours/glitch/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} />

--- a/app/javascript/flavours/glitch/components/account_header/styles.module.scss
+++ b/app/javascript/flavours/glitch/components/account_header/styles.module.scss
@ -274,29 +274,6 @@ $button-fallback-breakpoint: $button-breakpoint + 55px;
  }
 }

-.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;
-    }
-  }
-}
-
 .familiarFollowers {
  margin-top: 16px;
 }
--- a/app/javascript/flavours/glitch/components/character_counter/styles.module.scss
+++ b/app/javascript/flavours/glitch/components/character_counter/styles.module.scss
@ -1,4 +1,5 @@
 .counter {
+  display: block;
  margin-top: 4px;
  font-size: 13px;
 }
--- a/app/javascript/flavours/glitch/features/report/category.jsx
+++ b/app/javascript/flavours/glitch/features/report/category.jsx
@ -20,8 +20,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 => ({
@ -66,7 +67,7 @@ class Category extends PureComponent {
  render () {
    const { category, startedFrom, rules, intl } = this.props;

-    const options = rules.length > 0 ? [
+    let options = rules.length > 0 ? [
      'spam',
      'violation',
      'other',
@ -75,10 +76,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>

--- a/app/javascript/flavours/glitch/features/ui/components/report_collection_modal.tsx
+++ b/app/javascript/flavours/glitch/features/ui/components/report_collection_modal.tsx
@ -13,7 +13,9 @@ import { NavigationFocusTarget } from 'flavours/glitch/components/navigation_foc
 import { useAccount } from 'flavours/glitch/hooks/useAccount';
 import { useAppDispatch } from 'flavours/glitch/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
--- a/app/javascript/mastodon/actions/compose.js
+++ b/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';
@ -463,58 +459,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,
--- a/app/javascript/mastodon/actions/compose_typed.ts
+++ b/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,
    };
  },
  {
--- a/app/javascript/mastodon/components/account_bio/index.tsx
+++ b/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,
 }) => {
--- a/app/javascript/mastodon/components/account_bio/styles.module.scss
+++ b/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;
+    }
+  }
+}
--- a/app/javascript/mastodon/components/account_header/index.tsx
+++ b/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} />

--- a/app/javascript/mastodon/components/account_header/styles.module.scss
+++ b/app/javascript/mastodon/components/account_header/styles.module.scss
@ -274,29 +274,6 @@ $button-fallback-breakpoint: $button-breakpoint + 55px;
  }
 }

-.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;
-    }
-  }
-}
-
 .familiarFollowers {
  margin-top: 16px;
 }
--- a/app/javascript/mastodon/components/character_counter/styles.module.scss
+++ b/app/javascript/mastodon/components/character_counter/styles.module.scss
@ -1,4 +1,5 @@
 .counter {
+  display: block;
  margin-top: 4px;
  font-size: 13px;
 }
--- a/app/javascript/mastodon/features/report/category.jsx
+++ b/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>

--- a/app/javascript/mastodon/features/ui/components/report_collection_modal.tsx
+++ b/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
--- a/app/javascript/mastodon/locales/an.json
+++ b/app/javascript/mastodon/locales/an.json
@ -356,9 +356,6 @@
  "report.categories.spam": "Spam",
  "report.categories.violation": "Lo conteniu viola una u mas reglas d'o servidor",
  "report.category.subtitle": "Tría la millor coincidencia",
-  "report.category.title": "Conta-nos lo que ye pasando con este {type}",
-  "report.category.title_account": "perfil",
-  "report.category.title_status": "publicacion",
  "report.close": "Feito",
  "report.comment.title": "I hai bella cosa mas que creigas que habríanos de saber?",
  "report.forward": "Reninviar a {target}",
--- a/app/javascript/mastodon/locales/ar.json
+++ b/app/javascript/mastodon/locales/ar.json
@ -1036,9 +1036,6 @@
  "report.categories.spam": "مزعج",
  "report.categories.violation": "المحتوى ينتهك شرطا أو عدة شروط استخدام للخادم",
  "report.category.subtitle": "اختر أفضل تطابق",
-  "report.category.title": "وضح لنا ما أمر {type}",
-  "report.category.title_account": "ملف تعريفي",
-  "report.category.title_status": "منشور",
  "report.close": "تم",
  "report.comment.title": "هل لديك شيء آخر لتخبرنا به؟",
  "report.forward": "التحويل إلى {target}",
--- a/app/javascript/mastodon/locales/ast.json
+++ b/app/javascript/mastodon/locales/ast.json
@ -419,9 +419,6 @@
  "report.categories.spam": "Spam",
  "report.categories.violation": "El conteníu incumple una o más normes del sirvidor",
  "report.category.subtitle": "Escueyi la meyor opción",
-  "report.category.title": "Dinos qué pasa con esti {type}",
-  "report.category.title_account": "perfil",
-  "report.category.title_status": "publicación",
  "report.close": "Fecho",
  "report.comment.title": "¿Hai daqué más qu'habríemos saber?",
  "report.forward": "Reunviar a {target}",
--- a/app/javascript/mastodon/locales/az.json
+++ b/app/javascript/mastodon/locales/az.json
@ -792,9 +792,6 @@
  "report.categories.spam": "Spam",
  "report.categories.violation": "Məzmun, bir və ya daha çox server qaydasını pozur",
  "report.category.subtitle": "Ən çox uyuşanı seçin",
-  "report.category.title": "Bu {type} ilə bağlı nələrin baş verdiyini bizə deyin",
-  "report.category.title_account": "profil",
-  "report.category.title_status": "göndəriş",
  "report.close": "Hazırdır",
  "report.comment.title": "Bilməyimizi istədiyiniz başqa nəsə var?",
  "report.forward": "Bura yönləndir: {target}",
--- a/app/javascript/mastodon/locales/be.json
+++ b/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": "Гэтае дзеянне немагчыма адмяніць.",
@ -1138,11 +1138,7 @@
  "report.categories.spam": "Спам",
  "report.categories.violation": "Змест парушае адно ці некалькі правілаў сервера",
  "report.category.subtitle": "Выберыце найлепшае падабенства",
-  "report.category.title": "Паведаміце нам, што адбываецца з гэтым {type}",
-  "report.category.title_account": "профіль",
-  "report.category.title_status": "допіс",
  "report.close": "Гатова",
-  "report.collection_comment": "Чаму Вы хочаце паскардзіцца на гэту калекцыю?",
  "report.comment.title": "Што-небудзь яшчэ, што нам неабходна ведаць?",
  "report.forward": "Пераслаць на {target}",
  "report.forward_hint": "Гэты ўліковы запіс з іншага сервера. Даслаць ананімную копію скаргі і туды?",
--- a/app/javascript/mastodon/locales/bg.json
+++ b/app/javascript/mastodon/locales/bg.json
@ -719,9 +719,6 @@
  "report.categories.spam": "Спам",
  "report.categories.violation": "Съдържание, нарушаващо едно или повече правила на сървъра",
  "report.category.subtitle": "Изберете най-доброто съвпадение",
-  "report.category.title": "Разкажете ни какво се случва с това: {type}",
-  "report.category.title_account": "профил",
-  "report.category.title_status": "публикация",
  "report.close": "Готово",
  "report.comment.title": "Има ли нещо друго, което смятате, че трябва да знаем?",
  "report.forward": "Препращане до {target}",
--- a/app/javascript/mastodon/locales/bn.json
+++ b/app/javascript/mastodon/locales/bn.json
@ -325,8 +325,6 @@
  "report.block": "অবরোধ",
  "report.categories.other": "অন্যান্য",
  "report.categories.spam": "স্প্যাম",
-  "report.category.title_account": "প্রোফাইল",
-  "report.category.title_status": "পোস্ট",
  "report.close": "সম্পন্ন",
  "report.forward": "এটা আরো পাঠান {target} তে",
  "report.forward_hint": "এই নিবন্ধনটি অন্য একটি সার্ভারে। অপ্রকাশিতনামাভাবে রিপোর্টের কপি সেখানেও কি পাঠাতে চান ?",
--- a/app/javascript/mastodon/locales/br.json
+++ b/app/javascript/mastodon/locales/br.json
@ -614,9 +614,6 @@
  "report.categories.spam": "Spam",
  "report.categories.violation": "Torret e vez gant an endalc'had unan pe meur a reolenn",
  "report.category.subtitle": "Choazit ar pezh a glot ar gwellañ",
-  "report.category.title": "Lârit deomp petra c'hoarvez gant {type}",
-  "report.category.title_account": "profil",
-  "report.category.title_status": "an embannadur-mañ",
  "report.close": "Graet",
  "report.comment.title": "Ha traoù all a rankfemp gouzout ?",
  "report.forward": "Treuzkas da: {target}",
--- a/app/javascript/mastodon/locales/ca.json
+++ b/app/javascript/mastodon/locales/ca.json
@ -825,9 +825,6 @@
  "report.categories.spam": "Brossa",
  "report.categories.violation": "El contingut viola una o més regles del servidor",
  "report.category.subtitle": "Tria la millor coincidència",
-  "report.category.title": "Explica'ns què passa amb això ({type})",
-  "report.category.title_account": "perfil",
-  "report.category.title_status": "tut",
  "report.close": "Fet",
  "report.comment.title": "Hi ha res més que creguis que hauríem de saber?",
  "report.forward": "Reenvia a {target}",
--- a/app/javascript/mastodon/locales/ckb.json
+++ b/app/javascript/mastodon/locales/ckb.json
@ -400,9 +400,6 @@
  "report.categories.spam": "سپام",
  "report.categories.violation": "ناوەڕۆک یەک یان زیاتر لە یاساکانی سێرڤەر پێشێل دەکات",
  "report.category.subtitle": "باشترین هاوتا هەڵبژێرە",
-  "report.category.title": "پێمان بڵێ بە {type} چی ڕوودەدات",
-  "report.category.title_account": "پرۆفایل",
-  "report.category.title_status": "پۆست",
  "report.close": "تەواو",
  "report.comment.title": "ئایا هیچ شتێکی تر هەیە کە پێت وایە ئێمە دەبێت بزانین?",
  "report.forward": "ناردن بۆ {target}",
--- a/app/javascript/mastodon/locales/cs.json
+++ b/app/javascript/mastodon/locales/cs.json
@ -885,9 +885,6 @@
  "report.categories.spam": "Spam",
  "report.categories.violation": "Obsah porušuje jedno nebo více pravidel serveru",
  "report.category.subtitle": "Vyberte nejbližší možnost",
-  "report.category.title": "Povězte nám, proč chcete tento {type} nahlásit",
-  "report.category.title_account": "profil",
-  "report.category.title_status": "příspěvek",
  "report.close": "Hotovo",
  "report.comment.title": "Je ještě něco jiného, co myslíte, že bychom měli vědět?",
  "report.forward": "Přeposlat do {target}",
--- a/app/javascript/mastodon/locales/cy.json
+++ b/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.",
@ -1111,11 +1110,7 @@
  "report.categories.spam": "Sbam",
  "report.categories.violation": "Mae cynnwys yn torri un neu fwy o reolau'r gweinydd",
  "report.category.subtitle": "Dewiswch yr ateb gorau",
-  "report.category.title": "Beth sy'n digwydd gyda'r {type} yma",
-  "report.category.title_account": "proffil",
-  "report.category.title_status": "post",
  "report.close": "Iawn",
-  "report.collection_comment": "Pam ydych chi eisiau rhoi gwybod am y casgliad hwn?",
  "report.comment.title": "Oes unrhyw beth arall y dylem ei wybod yn eich barn chi?",
  "report.forward": "Ymlaen i {target}",
  "report.forward_hint": "Mae'r cyfrif o weinydd arall. Anfon copi anhysbys o'r adroddiad yno hefyd?",
--- a/app/javascript/mastodon/locales/da.json
+++ b/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.",
@ -1138,11 +1138,7 @@
  "report.categories.spam": "Spam",
  "report.categories.violation": "Indhold overtræder en eller flere serverregler",
  "report.category.subtitle": "Vælg den bedste match",
-  "report.category.title": "Fortæl os, hvad der foregår med denne {type}",
-  "report.category.title_account": "profil",
-  "report.category.title_status": "indlæg",
  "report.close": "Udført",
-  "report.collection_comment": "Hvorfor vil du anmelde denne samling?",
  "report.comment.title": "Er der andet, som vi bør vide?",
  "report.forward": "Videresend til {target}",
  "report.forward_hint": "Kontoen er fra en anden server. Send også en anonymiseret kopi af anmeldelsen dertil?",
--- a/app/javascript/mastodon/locales/de.json
+++ b/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.",
@ -1138,11 +1138,7 @@
  "report.categories.spam": "Spam",
  "report.categories.violation": "Der Inhalt verletzt eine oder mehrere Serverregeln",
  "report.category.subtitle": "Wähle die passendste Kategorie",
-  "report.category.title": "Sag uns, was das Problem mit diesem {type} ist",
-  "report.category.title_account": "Profil",
-  "report.category.title_status": "Beitrag",
  "report.close": "Fertig",
-  "report.collection_comment": "Weshalb möchtest du diese Sammlung melden?",
  "report.comment.title": "Gibt es noch etwas, das wir wissen sollten?",
  "report.forward": "Meldung auch an den externen Server {target} weiterleiten",
  "report.forward_hint": "Das gemeldete Konto befindet sich auf einem anderen Server. Soll zusätzlich eine anonymisierte Kopie deiner Meldung an diesen Server geschickt werden?",
--- a/app/javascript/mastodon/locales/el.json
+++ b/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": "Αυτή η ενέργεια δεν μπορεί να αναιρεθεί.",
@ -1138,11 +1138,7 @@
  "report.categories.spam": "Ανεπιθύμητα",
  "report.categories.violation": "Το περιεχόμενο παραβιάζει έναν ή περισσότερους κανόνες διακομιστή",
  "report.category.subtitle": "Επέλεξε την καλύτερη αντιστοίχιση",
-  "report.category.title": "Πείτε μας τι συμβαίνει με {type}",
-  "report.category.title_account": "προφίλ",
-  "report.category.title_status": "ανάρτηση",
  "report.close": "Τέλος",
-  "report.collection_comment": "Γιατί θέλετε να αναφέρετε αυτήν τη συλλογή;",
  "report.comment.title": "Υπάρχει κάτι άλλο που νομίζεις ότι θα πρέπει να γνωρίζουμε;",
  "report.forward": "Προώθηση προς {target}",
  "report.forward_hint": "Ο λογαριασμός είναι από διαφορετικό διακομιστή. Να σταλεί ανώνυμο αντίγραφο της αναφοράς και εκεί;",
--- a/app/javascript/mastodon/locales/en-GB.json
+++ b/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",
@ -1133,11 +1138,7 @@
  "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.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 anonymised copy of the report there as well?",
--- a/app/javascript/mastodon/locales/en.json
+++ b/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?",
--- a/app/javascript/mastodon/locales/eo.json
+++ b/app/javascript/mastodon/locales/eo.json
@ -734,9 +734,6 @@
  "report.categories.spam": "Trudmesaĝo",
  "report.categories.violation": "Enhavo malobservas unu aŭ plurajn servilajn regulojn",
  "report.category.subtitle": "Elektu la plej bonan kongruon",
-  "report.category.title": "Diru al ni kio okazas pri ĉi tiu {type}",
-  "report.category.title_account": "profilo",
-  "report.category.title_status": "afiŝo",
  "report.close": "Farita",
  "report.comment.title": "Ĉu estas ajn ion alian kiun vi pensas ke ni devus scii?",
  "report.forward": "Plusendi al {target}",
--- a/app/javascript/mastodon/locales/es-AR.json
+++ b/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.",
@ -1138,11 +1138,7 @@
  "report.categories.spam": "Spam",
  "report.categories.violation": "El contenido viola una o más reglas del servidor",
  "report.category.subtitle": "Elegí la mejor coincidencia",
-  "report.category.title": "Contanos lo que pasa con este {type}",
-  "report.category.title_account": "perfil",
-  "report.category.title_status": "mensaje",
  "report.close": "Listo",
-  "report.collection_comment": "¿Por qué querés denunciar esta colección?",
  "report.comment.title": "¿Hay algo más que creés que deberíamos saber?",
  "report.forward": "Reenviar a {target}",
  "report.forward_hint": "La cuenta es de otro servidor. ¿Querés enviar una copia anonimizada del informe también ahí?",
--- a/app/javascript/mastodon/locales/es-MX.json
+++ b/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.",
@ -1138,11 +1138,7 @@
  "report.categories.spam": "Spam",
  "report.categories.violation": "El contenido viola una o más reglas del servidor",
  "report.category.subtitle": "Selecciona la mejor coincidencia",
-  "report.category.title": "Cuéntanos lo que sucede con este {type}",
-  "report.category.title_account": "perfil",
-  "report.category.title_status": "publicación",
  "report.close": "Realizado",
-  "report.collection_comment": "¿Por qué quieres reportar esta colección?",
  "report.comment.title": "¿Hay algo más que creas que deberíamos saber?",
  "report.forward": "Reenviar a {target}",
  "report.forward_hint": "La cuenta es de otro servidor. ¿Enviar también una copia anónima del informe allí?",
--- a/app/javascript/mastodon/locales/es.json
+++ b/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.",
@ -1138,11 +1138,7 @@
  "report.categories.spam": "Spam",
  "report.categories.violation": "El contenido viola una o más reglas del servidor",
  "report.category.subtitle": "Elige la mejor coincidencia",
-  "report.category.title": "Cuéntanos lo que está pasando con este {type}",
-  "report.category.title_account": "perfil",
-  "report.category.title_status": "publicación",
  "report.close": "Hecho",
-  "report.collection_comment": "¿Por qué quieres informar de esta colección?",
  "report.comment.title": "¿Hay algo más que creas que deberíamos saber?",
  "report.forward": "Reenviar a {target}",
  "report.forward_hint": "Esta cuenta es de otro servidor. ¿Enviar una copia anonimizada del informe allí también?",
--- a/app/javascript/mastodon/locales/et.json
+++ b/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",
@ -1125,11 +1138,7 @@
  "report.categories.spam": "Rämpspost",
  "report.categories.violation": "Sisu, mis rikub ühte või enamat serveri reeglit",
  "report.category.subtitle": "Vali parim vaste",
-  "report.category.title": "Selgita, mis on selle {type} valesti",
-  "report.category.title_account": "kontoga",
-  "report.category.title_status": "postitusega",
  "report.close": "Valmis",
-  "report.collection_comment": "Miks soovid sellest kogumikust raporteerida?",
  "report.comment.title": "Kas arvad, et on veel midagi, mida me peaks teadma?",
  "report.forward": "Edasta ka {target} domeeni",
  "report.forward_hint": "See kasutaja on teisest serverist. Kas saadan anonümiseeritud koopia sellest teatest sinna ka?",
@ -1190,6 +1199,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.",
--- a/app/javascript/mastodon/locales/eu.json
+++ b/app/javascript/mastodon/locales/eu.json
@ -792,9 +792,6 @@
  "report.categories.spam": "Spam",
  "report.categories.violation": "Edukiak zerbitzariko arau bat edo gehiago urratzen ditu",
  "report.category.subtitle": "Aukeratu egokiena",
-  "report.category.title": "Kontaiguzu zer gertatzen den {type} honekin",
-  "report.category.title_account": "profil",
-  "report.category.title_status": "bidalketa",
  "report.close": "Egina",
  "report.comment.title": "Beste zerbait jakin beharko genuke?",
  "report.forward": "Birbidali hona: {target}",
--- a/app/javascript/mastodon/locales/fa.json
+++ b/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": "کاربران خموشانده",
@ -1104,11 +1104,7 @@
  "report.categories.spam": "هرزنامه",
  "report.categories.violation": "محتوا یک یا چند قانون کارساز را نقض می‌کند",
  "report.category.subtitle": "منطبق‌ترین را انتخاب کنید",
-  "report.category.title": "به ما بگویید با این {type} چه مشکلی دارید",
-  "report.category.title_account": "نمایه",
-  "report.category.title_status": "فرسته",
  "report.close": "انجام شد",
-  "report.collection_comment": "چرا می‌خواهید این مجموعه را گزارش دهید؟",
  "report.comment.title": "آیا چیز دیگری هست که فکر می‌کنید باید بدانیم؟",
  "report.forward": "فرستادن به {target}",
  "report.forward_hint": "این حساب در کارساز دیگری ثبت شده. آیا می‌خواهید رونوشتی ناشناس از این گزارش به آن‌جا هم فرستاده شود؟",
--- a/app/javascript/mastodon/locales/fi.json
+++ b/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.",
@ -1138,11 +1138,7 @@
  "report.categories.spam": "Roskaposti",
  "report.categories.violation": "Sisältö rikkoo yhtä tai useampaa palvelimen säännöistä",
  "report.category.subtitle": "Valitse sopivin",
-  "report.category.title": "Kerro meille, miksi tämä {type} pitää raportoida",
-  "report.category.title_account": "profiili",
-  "report.category.title_status": "julkaisu",
  "report.close": "Valmis",
-  "report.collection_comment": "Miksi haluat raportoida tämän kokoelman?",
  "report.comment.title": "Onko vielä jotain muuta, mitä meidän pitäisi tietää?",
  "report.forward": "Välitä palvelimelle {target}",
  "report.forward_hint": "Tämä tili on toisella palvelimella. Haluatko lähettää nimettömän raportin myös sinne?",
--- a/app/javascript/mastodon/locales/fil.json
+++ b/app/javascript/mastodon/locales/fil.json
@ -328,7 +328,6 @@
  "report.categories.other": "Iba pa",
  "report.categories.violation": "Lumalabag ang nilalaman sa isa o higit pang mga patakaran ng serbiro",
  "report.category.subtitle": "Piliin ang pinakamahusay na tugma",
-  "report.category.title": "Sabihin mo sa amin kung anong nangyari sa {type} na ito",
  "report.close": "Tapos na",
  "report.comment.title": "Mayroon pa bang dapat naming malaman?",
  "report.next": "Sunod",
--- a/app/javascript/mastodon/locales/fo.json
+++ b/app/javascript/mastodon/locales/fo.json
@ -928,11 +928,7 @@
  "report.categories.spam": "Ruskpostur",
  "report.categories.violation": "Innihaldið brýtur eina ella fleiri ambætarareglur",
  "report.category.subtitle": "Vel besta boðið",
-  "report.category.title": "Fortel okkum, hvat hendir við hesum {type}",
-  "report.category.title_account": "vangi",
-  "report.category.title_status": "postinum",
  "report.close": "Liðugt",
-  "report.collection_comment": "Hví vilt tú melda hetta savnið?",
  "report.comment.title": "Er nakað annað, sum tú heldur, at vit áttu at vitað?",
  "report.forward": "Víðarisend til {target}",
  "report.forward_hint": "Kontan er frá einum øðrum ambætara. Send eitt dulnevnt avrit av meldingini hagar eisini?",
--- a/app/javascript/mastodon/locales/fr-CA.json
+++ b/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.",
@ -1138,11 +1138,7 @@
  "report.categories.spam": "Spam",
  "report.categories.violation": "Le contenu enfreint une ou plusieurs règles du serveur",
  "report.category.subtitle": "Sélctionnez ce qui correspond le mieux",
-  "report.category.title": "Dites-nous ce qui se passe avec ce {type}",
-  "report.category.title_account": "ce profil",
-  "report.category.title_status": "ce message",
  "report.close": "Terminé",
-  "report.collection_comment": "Pourquoi voulez-vous signaler cette collection ?",
  "report.comment.title": "Y a-t-il autre chose que nous devrions savoir?",
  "report.forward": "Transférer à {target}",
  "report.forward_hint": "Le compte provient d’un autre serveur. Envoyer une copie anonyme du rapport là-bas également?",
--- a/app/javascript/mastodon/locales/fr.json
+++ b/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.",
@ -1138,11 +1138,7 @@
  "report.categories.spam": "Spam",
  "report.categories.violation": "Le contenu enfreint une ou plusieurs règles du serveur",
  "report.category.subtitle": "Sélctionnez ce qui correspond le mieux",
-  "report.category.title": "Dites-nous ce qu'il se passe avec {type}",
-  "report.category.title_account": "ce profil",
-  "report.category.title_status": "ce message",
  "report.close": "Terminé",
-  "report.collection_comment": "Pourquoi voulez-vous signaler cette collection ?",
  "report.comment.title": "Y a-t-il autre chose que nous devrions savoir ?",
  "report.forward": "Transférer à {target}",
  "report.forward_hint": "Le compte provient d’un autre serveur. Envoyer également une copie anonyme du rapport ?",
--- a/app/javascript/mastodon/locales/fy.json
+++ b/app/javascript/mastodon/locales/fy.json
@ -693,9 +693,6 @@
  "report.categories.spam": "Spam",
  "report.categories.violation": "De ynhâld oertrêdet ien of mear serverrigels",
  "report.category.subtitle": "Selektearje wat it bêste past",
-  "report.category.title": "Fertel ús wat der mei dit {type} oan de hân is",
-  "report.category.title_account": "profyl",
-  "report.category.title_status": "berjocht",
  "report.close": "Klear",
  "report.comment.title": "Tinksto dat wy noch mear witte moatte?",
  "report.forward": "Nei {target} trochstjoere",
--- a/app/javascript/mastodon/locales/ga.json
+++ b/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ú.",
@ -1138,11 +1138,7 @@
  "report.categories.spam": "Turscar",
  "report.categories.violation": "Sáraíonn ábhar riail freastalaí amháin nó níos mó",
  "report.category.subtitle": "Roghnaigh an toradh is fearr",
-  "report.category.title": "Inis dúinn cad atá ar siúl leis an {type} seo",
-  "report.category.title_account": "próifíl",
-  "report.category.title_status": "postáil",
  "report.close": "Déanta",
-  "report.collection_comment": "Cén fáth ar mhaith leat an bailiúchán seo a thuairisciú?",
  "report.comment.title": "An bhfuil aon rud eile ba chóir dúinn a fhios agat, dar leat?",
  "report.forward": "Seol ar aghaidh chun {target}",
  "report.forward_hint": "Is ó fhreastalaí eile an cuntas. Cuir cóip gan ainm den tuarascáil ansin freisin?",
--- a/app/javascript/mastodon/locales/gd.json
+++ b/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",
@ -1095,11 +1132,7 @@
  "report.categories.spam": "Spama",
  "report.categories.violation": "Tha an t-susbaint a’ briseadh riaghailt no dhà an fhrithealaiche",
  "report.category.subtitle": "Tagh an roghainn as iomchaidhe",
-  "report.category.title": "Innis dhuinn dè tha a’ dol leis a’ {type}",
-  "report.category.title_account": "phròifil",
-  "report.category.title_status": "phost",
  "report.close": "Deiseil",
-  "report.collection_comment": "Carson a tha thu airson gearan a dhèanamh mun chruinneachadh seo?",
  "report.comment.title": "A bheil rud sam bith eile a bu toigh leat innse dhuinn?",
  "report.forward": "Sìn air adhart gu {target}",
  "report.forward_hint": "Chaidh an cunntas a chlàradh air frithealaiche eile. A bheil thu airson lethbhreac dhen ghearan a chur dha-san gun ainm cuideachd?",
@ -1160,6 +1193,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 +1314,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}",
--- a/app/javascript/mastodon/locales/gl.json
+++ b/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.",
@ -1137,11 +1138,7 @@
  "report.categories.spam": "Spam",
  "report.categories.violation": "O contido viola unha ou máis regras do servidor",
  "report.category.subtitle": "Elixe a mellor coincidencia",
-  "report.category.title": "Cóntanos o problema con {type}",
-  "report.category.title_account": "perfil",
-  "report.category.title_status": "publicación",
  "report.close": "Feito",
-  "report.collection_comment": "Por que queres denunciar esta colección?",
  "report.comment.title": "Hai algo máis que creas debamos saber?",
  "report.forward": "Reenviar a {target}",
  "report.forward_hint": "A conta é doutro servidor. Enviar unha copia anónima da denuncia aló tamén?",
--- a/app/javascript/mastodon/locales/he.json
+++ b/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}",
@ -1137,11 +1138,7 @@
  "report.categories.spam": "ספאם",
  "report.categories.violation": "התוכן מפר אחד או יותר מחוקי השרת",
  "report.category.subtitle": "בחר/י את המתאים ביותר",
-  "report.category.title": "ספר/י לנו מה קורה עם ה-{type} הזה",
-  "report.category.title_account": "פרופיל",
-  "report.category.title_status": "הודעה",
  "report.close": "בוצע",
-  "report.collection_comment": "מדוע ברצונכם לדווח על האוסף הזה?",
  "report.comment.title": "האם יש דבר נוסף שלדעתך חשוב שנדע?",
  "report.forward": "קדם ל-{target}",
  "report.forward_hint": "חשבון זה הוא משרת אחר. האם לשלוח בנוסף עותק אנונימי לשם?",
--- a/app/javascript/mastodon/locales/hi.json
+++ b/app/javascript/mastodon/locales/hi.json
@ -397,7 +397,6 @@
  "report.block_explanation": "आपको उनकी पोस्टें नहीं दिखेंगे। वे आपकी पोस्टें को देख नहीं पाएंगे और आपको फ़ॉलो नहीं कर पाएंगे। उन्हे पता लगेगा कि वे blocked हैं।",
  "report.categories.other": "अन्य",
  "report.categories.spam": "अवांछित",
-  "report.category.title_account": "रूपरेखा",
  "report.close": "स्वीकार करें",
  "report.comment.title": "क्या और कुछ है जिसके बारे में आपको लगता है कि हमें सूचित होना चाहिए?",
  "report.next": "आगे",
--- a/app/javascript/mastodon/locales/hr.json
+++ b/app/javascript/mastodon/locales/hr.json
@ -372,9 +372,6 @@
  "report.categories.other": "Drugo",
  "report.categories.spam": "Spam",
  "report.categories.violation": "Sadržaj krši jedno ili više pravila poslužitelja",
-  "report.category.title": "Recite nam što nije u redu s {type}",
-  "report.category.title_account": "profilom",
-  "report.category.title_status": "objavom",
  "report.close": "Gotovo",
  "report.comment.title": "Postoji li još nešto što bismo trebali znati?",
  "report.forward": "Proslijedi {target}",
--- a/app/javascript/mastodon/locales/hu.json
+++ b/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",
@ -1134,11 +1138,10 @@
  "report.categories.spam": "Kéretlen üzenet",
  "report.categories.violation": "A tartalom a kiszolgáló egy vagy több szabályát sérti",
  "report.category.subtitle": "Válaszd ki a legjobb találatot",
-  "report.category.title": "Mondd el, hogy mi van ezzel a {type}",
-  "report.category.title_account": "profillal",
-  "report.category.title_status": "bejegyzéssel",
+  "report.category.title_account": "Mondd el, hogy mi van ezzel a profillal",
+  "report.category.title_collection": "Mondd el, hogy mi van ezzel a gyűjteménnyel",
+  "report.category.title_status": "Mondd el, hogy mi van ezzel a bejegyzéssel",
  "report.close": "Kész",
-  "report.collection_comment": "Miért jelented ezt a gyűjteményt?",
  "report.comment.title": "Van valami, amiről tudnunk kellene?",
  "report.forward": "Továbbítás: {target}",
  "report.forward_hint": "Ez a fiók egy másik kiszolgálóról van. Oda is elküldésre kerüljön a jelentés egy anonimizált másolata?",
--- a/app/javascript/mastodon/locales/hy.json
+++ b/app/javascript/mastodon/locales/hy.json
@ -339,8 +339,6 @@
  "report.block": "Արգելափակել",
  "report.categories.other": "Այլ",
  "report.categories.spam": "Սպամ",
-  "report.category.title_account": "հաշիւ",
-  "report.category.title_status": "գրառում",
  "report.close": "Աւարտել",
  "report.forward": "Փոխանցել {target}֊ին",
  "report.forward_hint": "Այս հաշիւ այլ հանգոյցից է։ Ուղարկե՞մ այնտեղ էլ այս բողոքի անոնիմ պատճէնը։",
--- a/app/javascript/mastodon/locales/ia.json
+++ b/app/javascript/mastodon/locales/ia.json
@ -748,9 +748,6 @@
  "report.categories.spam": "Spam",
  "report.categories.violation": "Le contento viola un o plus regulas del servitor",
  "report.category.subtitle": "Elige le option plus adequate",
-  "report.category.title": "Describe le problema con iste {type}",
-  "report.category.title_account": "profilo",
-  "report.category.title_status": "message",
  "report.close": "Facite",
  "report.comment.title": "Ha il altere cosas que nos deberea saper?",
  "report.forward": "Reinviar a {target}",
--- a/app/javascript/mastodon/locales/id.json
+++ b/app/javascript/mastodon/locales/id.json
@ -445,9 +445,6 @@
  "report.categories.spam": "Spam",
  "report.categories.violation": "Konten melanggar satu atau lebih peraturan server",
  "report.category.subtitle": "Pilih pasangan terbaik",
-  "report.category.title": "Beritahu kami apa yang terjadi dengan {type} ini",
-  "report.category.title_account": "profil",
-  "report.category.title_status": "kiriman",
  "report.close": "Selesai",
  "report.comment.title": "Adakah hal lain yang perlu kami ketahui?",
  "report.forward": "Teruskan ke {target}",
--- a/app/javascript/mastodon/locales/ie.json
+++ b/app/javascript/mastodon/locales/ie.json
@ -504,9 +504,6 @@
  "report.categories.spam": "Spam",
  "report.categories.violation": "Contenete violant un o pluri regules del servitor",
  "report.category.subtitle": "Selecte li max bon option",
-  "report.category.title": "Di nos quo passa con ti-ci {type}",
-  "report.category.title_account": "profil",
-  "report.category.title_status": "posta",
  "report.close": "Finit",
  "report.comment.title": "Hay alquo plu quel tu pensa que noi deve saver?",
  "report.forward": "Misser anc a {target}",
--- a/app/javascript/mastodon/locales/ig.json
+++ b/app/javascript/mastodon/locales/ig.json
@ -115,7 +115,6 @@
  "reply_indicator.cancel": "Kagbuo",
  "report.categories.other": "Ọzọ",
  "report.categories.spam": "Nzipụ Ozièlètrọniìk Nkeāchọghị",
-  "report.category.title_account": "profaịlụ",
  "report.mute": "Mee ogbi",
  "report.placeholder": "Type or paste additional comments",
  "report.submit": "Submit report",
--- a/app/javascript/mastodon/locales/io.json
+++ b/app/javascript/mastodon/locales/io.json
@ -783,9 +783,6 @@
  "report.categories.spam": "Spamo",
  "report.categories.violation": "Kontenaj nesequas servilregulo",
  "report.category.subtitle": "Selektez maxim bona parigato",
-  "report.category.title": "Savigez ni pri quo eventas kun ca {type}",
-  "report.category.title_account": "profilo",
-  "report.category.title_status": "posto",
  "report.close": "Fina",
  "report.comment.title": "Ka altra irgo quon vu pensas ke ni debas savar?",
  "report.forward": "Sendez a {target}",
--- a/app/javascript/mastodon/locales/is.json
+++ b/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.",
@ -1137,11 +1137,7 @@
  "report.categories.spam": "Ruslpóstur",
  "report.categories.violation": "Efnið brýtur gegn einni eða fleiri reglum netþjónsins",
  "report.category.subtitle": "Veldu hvað samsvarar best",
-  "report.category.title": "Segðu okkur hvað er í gangi með þetta {type}-atriði",
-  "report.category.title_account": "notandasnið",
-  "report.category.title_status": "færsla",
  "report.close": "Lokið",
-  "report.collection_comment": "Afhverju viltu tilkynna þetta safn?",
  "report.comment.title": "Er eitthvað annað sem þú heldur að við ættum að vita?",
  "report.forward": "Áframsenda til {target}",
  "report.forward_hint": "Notandaaðgangurinn er af öðrum vefþjóni. Á einnig að senda nafnlaust afrit af kærunni þangað?",
--- a/app/javascript/mastodon/locales/it.json
+++ b/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.",
@ -1138,11 +1138,10 @@
  "report.categories.spam": "Spam",
  "report.categories.violation": "Il contenuto viola una o più regole del server",
  "report.category.subtitle": "Scegli la corrispondenza migliore",
-  "report.category.title": "Dicci cosa sta succedendo con questo {type}",
-  "report.category.title_account": "profilo",
-  "report.category.title_status": "post",
+  "report.category.title_account": "Dicci cosa sta succedendo con questo profilo",
+  "report.category.title_collection": "Dicci cosa sta succedendo con questa collezione",
+  "report.category.title_status": "Dicci cosa sta succedendo con questo post",
  "report.close": "Fatto",
-  "report.collection_comment": "Perché vuoi segnalare questa collezione?",
  "report.comment.title": "C'è altro che pensi che dovremmo sapere?",
  "report.forward": "Inoltra a {target}",
  "report.forward_hint": "Il profilo proviene da un altro server. Inviare anche lì una copia anonima del rapporto?",
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@ -804,9 +804,6 @@
  "report.categories.spam": "スパム",
  "report.categories.violation": "サーバーのルールに違反",
  "report.category.subtitle": "近いものを選択してください",
-  "report.category.title": "この{type}について教えてください",
-  "report.category.title_account": "プロフィール",
-  "report.category.title_status": "投稿",
  "report.close": "完了",
  "report.comment.title": "その他に私たちに伝えておくべき事はありますか？",
  "report.forward": "{target}に転送する",
--- a/app/javascript/mastodon/locales/kab.json
+++ b/app/javascript/mastodon/locales/kab.json
@ -800,9 +800,6 @@
  "report.categories.other": "Tiyyaḍ",
  "report.categories.spam": "Aspam",
  "report.category.subtitle": "Fren amṣada akk ufrin",
-  "report.category.title": "Ini-aɣ-d d acu i yuɣen {type}-a",
-  "report.category.title_account": "ameɣnu",
-  "report.category.title_status": "tasuffeɣt",
  "report.close": "Immed",
  "report.forward": "Bren-it ɣeṛ {target}",
  "report.mute": "Sgugem",
--- a/app/javascript/mastodon/locales/ko.json
+++ b/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": "중재된 계정",
@ -1125,11 +1136,7 @@
  "report.categories.spam": "스팸",
  "report.categories.violation": "콘텐츠가 한 개 이상의 서버 규칙을 위반합니다",
  "report.category.subtitle": "가장 알맞은 것을 선택",
-  "report.category.title": "이 {type}에 무슨 문제가 있는지 알려주세요",
-  "report.category.title_account": "프로필",
-  "report.category.title_status": "게시물",
  "report.close": "완료",
-  "report.collection_comment": "이 컬렉션을 신고하려는 이유가 무엇인가요?",
  "report.comment.title": "우리가 더 알아야 할 내용이 있나요?",
  "report.forward": "{target}에 전달",
  "report.forward_hint": "이 계정은 다른 서버에 있습니다. 익명화 된 사본을 해당 서버에도 전송할까요?",
@ -1210,6 +1217,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 +1248,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": "클릭하여 열기",
--- a/app/javascript/mastodon/locales/ku.json
+++ b/app/javascript/mastodon/locales/ku.json
@ -423,9 +423,6 @@
  "report.categories.spam": "Nexwestî (Spam)",
  "report.categories.violation": "Naverok yek an çend rêbazên rajekar binpê dike",
  "report.category.subtitle": "Baştirîn lihevhatin hilbijêre",
-  "report.category.title": "Ji me re bêje ka çi diqewime bi vê {type} re",
-  "report.category.title_account": "profîl",
-  "report.category.title_status": "şandî",
  "report.close": "Qediya",
  "report.comment.title": "Tiştek din heye ku tu difikirî ku divê em zanibin?",
  "report.forward": "Biçe bo {target}",
--- a/app/javascript/mastodon/locales/la.json
+++ b/app/javascript/mastodon/locales/la.json
@ -202,8 +202,6 @@
  "report.block": "Impedimentum",
  "report.block_explanation": "Non videbis eorum nuntios. Non poterunt vidēre tuōs nuntios aut tē sequī. Intelligere poterunt sē obstrūctōs esse.",
  "report.categories.other": "Altera",
-  "report.category.title_account": "notio",
-  "report.category.title_status": "contributum",
  "report.close": "Confectum",
  "report.mute": "Confutare",
  "report.mute_explanation": "Non videbis eōrum nuntiōs. Possunt adhuc tē sequī et tuōs nuntiōs vidēre, nec sciēbunt sē tacitōs esse.",
--- a/app/javascript/mastodon/locales/lad.json
+++ b/app/javascript/mastodon/locales/lad.json
@ -695,9 +695,6 @@
  "report.categories.spam": "Spam",
  "report.categories.violation": "El kontenido viola una o mas reglas del sirvidor",
  "report.category.subtitle": "Eskoje la mijor koensidensya",
-  "report.category.title": "Deskrive el problem kon {type}",
-  "report.category.title_account": "profil",
-  "report.category.title_status": "publikasyon",
  "report.close": "Fecho",
  "report.comment.title": "Ay algo mas ke deveriamos saver?",
  "report.forward": "Reembia a {target}",
--- a/app/javascript/mastodon/locales/lt.json
+++ b/app/javascript/mastodon/locales/lt.json
@ -786,9 +786,6 @@
  "report.categories.spam": "Šlamštas",
  "report.categories.violation": "Turinys pažeidžia vieną ar daugiau serverio taisyklių",
  "report.category.subtitle": "Pasirink geriausią atitikmenį.",
-  "report.category.title": "Papasakok mums, kas vyksta su šiuo {type}",
-  "report.category.title_account": "profiliu",
-  "report.category.title_status": "įrašas",
  "report.close": "Atlikta",
  "report.comment.title": "Ar yra dar kas nors, ką, tavo manymu, turėtume žinoti?",
  "report.forward": "Persiųsti į {target}",
--- a/app/javascript/mastodon/locales/lv.json
+++ b/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}",
@ -722,9 +725,6 @@
  "report.categories.spam": "Mēstule",
  "report.categories.violation": "Saturs pārkāpj vienu vai vairākus servera noteikumus",
  "report.category.subtitle": "Izvēlieties labāko atbilstību",
-  "report.category.title": "Pastāsti mums, kas notiek ar šo {type}",
-  "report.category.title_account": "profilu",
-  "report.category.title_status": "ierakstu",
  "report.close": "Darīts",
  "report.comment.title": "Vai, tavuprāt, mums vēl būtu kas jāzina?",
  "report.forward": "Pārsūtīt {target}",
--- a/app/javascript/mastodon/locales/ml.json
+++ b/app/javascript/mastodon/locales/ml.json
@ -323,7 +323,6 @@
  "relative_time.today": "ഇന്ന്",
  "reply_indicator.cancel": "റദ്ദാക്കുക",
  "report.block": "തടസ്സപെടുത്തുക",
-  "report.category.title_account": "രൂപരേഖ",
  "report.close": "ചെയ്തു",
  "report.forward_hint": "ഈ അക്കൗണ്ട് മറ്റൊരു സെർവറിൽ നിന്നാണ്. റിപ്പോർട്ടിന്റെ അജ്ഞാത പകർപ്പ് അവിടെ അയയ്ക്കണോ?",
  "report.next": "അടുത്തതു്",
--- a/app/javascript/mastodon/locales/ms.json
+++ b/app/javascript/mastodon/locales/ms.json
@ -507,9 +507,6 @@
  "report.categories.spam": "Spam",
  "report.categories.violation": "Kandungan melanggar satu atau lebih peraturan pelayan",
  "report.category.subtitle": "Pilih yang terdekat",
-  "report.category.title": "Beritahu kami apa yang berlaku dengan {type} ini",
-  "report.category.title_account": "profil",
-  "report.category.title_status": "siaran",
  "report.close": "Selesai",
  "report.comment.title": "Adakah ada hal-hal lain yang perlu kita ketahui?",
  "report.forward": "Panjangkan ke {target}",
--- a/app/javascript/mastodon/locales/my.json
+++ b/app/javascript/mastodon/locales/my.json
@ -418,9 +418,6 @@
  "report.categories.spam": "ပြင်ပစာများ",
  "report.categories.violation": "ဤစာတွင် သတ်မှတ်ထားသောစည်းကမ်းများကို ဖောက်ဖျက်သောအကြောင်းအရာပါဝင်နေသည်",
  "report.category.subtitle": "အကိုက်ညီဆုံးကိုရွေးချယ်ပါ",
-  "report.category.title": "ဤ {type} တွင် ဘာဖြစ်နေသည်ကို ပြောပြပါ",
-  "report.category.title_account": "ကိုယ်ရေးမှတ်တမ်း",
-  "report.category.title_status": "ပို့စ်",
  "report.close": "ပြီးပြီ",
  "report.comment.title": "မိမိထင်မြင်ယူဆချက်များကိုဖော်ပြပေးပါ",
  "report.forward": "{target} သို့တစ်ဆင့်ပို့ပေးမည်",
--- a/app/javascript/mastodon/locales/nan-TW.json
+++ b/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": "受管制ê口座",
@ -1133,11 +1138,7 @@
  "report.categories.spam": "Pùn-sò訊息",
  "report.categories.violation": "內容違反tsi̍t ê以上服侍器ê規則",
  "report.category.subtitle": "揀上合ê選項",
-  "report.category.title": "Kā guán講tsit ê {type} 有siánn-mih代誌",
-  "report.category.title_account": "個人資料",
-  "report.category.title_status": "PO文",
  "report.close": "完成",
-  "report.collection_comment": "Lí是án-tsuánn beh檢舉tsit ê收藏？",
  "report.comment.title": "Lí敢有別ê想beh hōo guán知ê？",
  "report.forward": "轉送kàu {target}",
  "report.forward_hint": "Tsit ê口座是別ê服侍器ê。Kám iā beh送bô落名ê檢舉ê khóo-pih？",
--- a/app/javascript/mastodon/locales/nl.json
+++ b/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.",
@ -1137,11 +1138,7 @@
  "report.categories.spam": "Spam",
  "report.categories.violation": "De inhoud overtreedt een of meerdere serverregels",
  "report.category.subtitle": "Kies wat het beste overeenkomt",
-  "report.category.title": "Vertel ons wat er met dit {type} aan de hand is",
-  "report.category.title_account": "account",
-  "report.category.title_status": "bericht",
  "report.close": "Klaar",
-  "report.collection_comment": "Waarom wil je deze verzameling rapporteren?",
  "report.comment.title": "Zijn er nog andere dingen waarvan je denkt dat wij dat moeten weten?",
  "report.forward": "Naar {target} doorsturen",
  "report.forward_hint": "Het account bevindt zich op een andere server. Wil je daar eveneens een geanonimiseerde kopie van deze rapportage naar toe sturen?",
--- a/app/javascript/mastodon/locales/nn.json
+++ b/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.",
@ -1133,11 +1132,7 @@
  "report.categories.spam": "Søppelpost",
  "report.categories.violation": "Innhaldet bryt med ein eller fleire reglar for tenaren",
  "report.category.subtitle": "Vel det som passar best",
-  "report.category.title": "Fortel oss kva som skjer med denne {type}",
-  "report.category.title_account": "profil",
-  "report.category.title_status": "innlegg",
  "report.close": "Ferdig",
-  "report.collection_comment": "Kvifor vil du rapportera denne samlinga?",
  "report.comment.title": "Er det noko anna du meiner me bør vite?",
  "report.forward": "Vidaresend til {target}",
  "report.forward_hint": "Kontoen er frå ein annan tenar. Vil du senda ein anonymisert kopi av rapporten dit òg?",
--- a/app/javascript/mastodon/locales/no.json
+++ b/app/javascript/mastodon/locales/no.json
@ -759,9 +759,6 @@
  "report.categories.spam": "Søppelpost",
  "report.categories.violation": "Innholdet bryter en eller flere serverregler",
  "report.category.subtitle": "Velg det som passer best",
-  "report.category.title": "Fortell oss hva som skjer med denne {type}",
-  "report.category.title_account": "profil",
-  "report.category.title_status": "innlegg",
  "report.close": "Utført",
  "report.comment.title": "Er det noe annet du mener vi burde vite?",
  "report.forward": "Videresend til {target}",
--- a/app/javascript/mastodon/locales/oc.json
+++ b/app/javascript/mastodon/locales/oc.json
@ -475,8 +475,6 @@
  "report.categories.other": "Autre",
  "report.categories.spam": "Messatge indesirable",
  "report.category.subtitle": "Causissètz çò que correspond mai",
-  "report.category.title_account": "perfil",
-  "report.category.title_status": "publicacion",
  "report.close": "Acabat",
  "report.forward": "Far sègre a {target}",
  "report.forward_hint": "Lo compte ven d’un autre servidor. Volètz mandar una còpia anonima del rapòrt enlai tanben ?",
--- a/app/javascript/mastodon/locales/pa.json
+++ b/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": "ਪਸੰਦਾਂ",
@ -580,8 +648,6 @@
  "report.categories.legal": "ਕਨੂੰਨੀ",
  "report.categories.other": "ਬਾਕੀ",
  "report.categories.spam": "ਸਪੈਮ",
-  "report.category.title_account": "ਪਰੋਫਾਈਲ",
-  "report.category.title_status": "ਪੋਸਟ",
  "report.close": "ਮੁਕੰਮਲ",
  "report.forward": "{target} ਨੂੰ ਅੱਗੇ ਭੇਜੋ",
  "report.mute": "ਮੌਨ ਕਰੋ",
--- a/app/javascript/mastodon/locales/pl.json
+++ b/app/javascript/mastodon/locales/pl.json
@ -1000,11 +1000,7 @@
  "report.categories.spam": "Spam",
  "report.categories.violation": "Zawartość narusza co najmniej jedną zasadę serwera",
  "report.category.subtitle": "Wybierz najbardziej pasującą opcję",
-  "report.category.title": "Powiedz, co się dzieje z tym {type}",
-  "report.category.title_account": "profilem",
-  "report.category.title_status": "wpisem",
  "report.close": "Gotowe",
-  "report.collection_comment": "Dlaczego chcesz zgłosić tę kolekcję?",
  "report.comment.title": "Czy jest coś jeszcze, co powinniśmy wiedzieć?",
  "report.forward": "Prześlij do {target}",
  "report.forward_hint": "Konto pochodzi z innego serwera. Czy chcesz również tam wysłać kopię zgłoszenia anonimowo?",
--- a/app/javascript/mastodon/locales/pt-BR.json
+++ b/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.",
@ -1138,11 +1138,7 @@
  "report.categories.spam": "Spam",
  "report.categories.violation": "O conteúdo viola uma ou mais regras do servidor",
  "report.category.subtitle": "Escolha a alternativa de melhor correspondência",
-  "report.category.title": "Conte-nos o que está acontecendo com esse {type}",
-  "report.category.title_account": "perfil",
-  "report.category.title_status": "publicação",
  "report.close": "Concluir",
-  "report.collection_comment": "Por que você quer denunciar esta coleção?",
  "report.comment.title": "Há algo mais que você acredita que devemos saber?",
  "report.forward": "Encaminhar para {target}",
  "report.forward_hint": "A conta está em outra instância. Enviar uma cópia anônima da denúncia para lá?",
--- a/app/javascript/mastodon/locales/pt-PT.json
+++ b/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.",
@ -1071,11 +1070,7 @@
  "report.categories.spam": "Spam",
  "report.categories.violation": "O conteúdo viola uma ou mais regras do servidor",
  "report.category.subtitle": "Escolhe o mais adequado",
-  "report.category.title": "Diz-nos o que se passa com este(a) {type}",
-  "report.category.title_account": "perfil",
-  "report.category.title_status": "publicação",
  "report.close": "Concluído",
-  "report.collection_comment": "Porque quer denunciar esta coleção?",
  "report.comment.title": "Há mais alguma coisa que devamos saber?",
  "report.forward": "Reencaminhar para {target}",
  "report.forward_hint": "A conta pertence a outro servidor. Enviar uma cópia anónima da denúncia para esse servidor também?",
--- a/app/javascript/mastodon/locales/ro.json
+++ b/app/javascript/mastodon/locales/ro.json
@ -424,9 +424,6 @@
  "report.categories.spam": "Mesaje nedorite",
  "report.categories.violation": "Conținutul încalcă una sau mai multe dintre regulile serverului",
  "report.category.subtitle": "Alege varianta care se potrivește cel mai bine",
-  "report.category.title": "Spune-ne care este problema cu acest {type}",
-  "report.category.title_account": "profil",
-  "report.category.title_status": "mesaj",
  "report.close": "Gata",
  "report.comment.title": "Mai este ceva important pe care ai vrea să ni-l spui?",
  "report.forward": "Redirecționează către {target}",
--- a/app/javascript/mastodon/locales/ru.json
+++ b/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": "Это действие невозможно отменить.",
@ -1038,11 +1037,7 @@
  "report.categories.spam": "Спам",
  "report.categories.violation": "Содержимое нарушает одно или несколько правил сервера",
  "report.category.subtitle": "Выберите наиболее подходящий вариант",
-  "report.category.title": "Расскажите нам, что не так с {type}",
-  "report.category.title_account": "этим профилем",
-  "report.category.title_status": "этим постом",
  "report.close": "Готово",
-  "report.collection_comment": "Почему вы хотите пожаловаться на эту подборку?",
  "report.comment.title": "Есть ли ещё подробности, о которых нам стоит знать?",
  "report.forward": "Переслать в {target}",
  "report.forward_hint": "Эта учётная запись расположена на другом сервере. Отправить туда обезличенную копию вашей жалобы?",
--- a/app/javascript/mastodon/locales/sa.json
+++ b/app/javascript/mastodon/locales/sa.json
@ -368,9 +368,6 @@
  "report.categories.spam": "फल्गुसन्देशाः",
  "report.categories.violation": "पूरकः एकं वा एकाधिकान्सर्वरो नियमानुल्लङ्घयति",
  "report.category.subtitle": "उत्तमं मेलनं चिनु",
-  "report.category.title": "अनेन {type} इत्यनेन किम्भवतीति ब्रूहि नः",
-  "report.category.title_account": "प्रोफैल्",
-  "report.category.title_status": "पत्रम्",
  "report.close": "कृतम्",
  "report.comment.title": "अन्य किमपि नो ज्ञापयितुमिच्छसि वा?",
  "report.forward": "{target} प्रत्यग्रे प्रेषय",
--- a/app/javascript/mastodon/locales/sc.json
+++ b/app/javascript/mastodon/locales/sc.json
@ -582,9 +582,6 @@
  "report.categories.other": "Àteru",
  "report.categories.spam": "Àliga",
  "report.category.subtitle": "Sèbera sa currispondèntzia prus arta",
-  "report.category.title": "Nara·nos ite sutzedet cun custu {type}",
-  "report.category.title_account": "profilu",
-  "report.category.title_status": "publicatzione",
  "report.close": "Fatu",
  "report.comment.title": "Nch'at àteru chi depamus ischire?",
  "report.forward": "Torra a imbiare a {target}",
--- a/app/javascript/mastodon/locales/sco.json
+++ b/app/javascript/mastodon/locales/sco.json
@ -358,9 +358,6 @@
  "report.categories.spam": "Guff",
  "report.categories.violation": "Content breks ae or mair server rules",
  "report.category.subtitle": "Pick the best match",
-  "report.category.title": "Tell us whit's gaun on wi this {type}",
-  "report.category.title_account": "profile",
-  "report.category.title_status": "post",
  "report.close": "Duin",
  "report.comment.title": "There ocht else thit ye hink we shuid ken?",
  "report.forward": "Forret tae {target}",
--- a/app/javascript/mastodon/locales/si.json
+++ b/app/javascript/mastodon/locales/si.json
@ -667,9 +667,6 @@
  "report.categories.spam": "ආයාචිත",
  "report.categories.violation": "අන්තර්ගතය නිසා සේවාදායකයේ නීතියක් හෝ කිහිපයක් කඩ වේ",
  "report.category.subtitle": "හොඳම ගැලපීම තෝරන්න",
-  "report.category.title": "මෙම {type}සමඟ සිදුවන්නේ කුමක්දැයි අපට කියන්න",
-  "report.category.title_account": "පැතිකඩ",
-  "report.category.title_status": "ලිපිය",
  "report.close": "අහවරයි",
  "report.comment.title": "අප දැනගත යුතු යැයි ඔබ සිතන තවත් යමක් තිබේද?",
  "report.forward": "{target} වෙත හරවන්න",
--- a/app/javascript/mastodon/locales/sk.json
+++ b/app/javascript/mastodon/locales/sk.json
@ -682,9 +682,6 @@
  "report.categories.spam": "Spam",
  "report.categories.violation": "Obsah porušuje jedno alebo viacero pravidiel servera",
  "report.category.subtitle": "Vyberte najlepšiu voľbu",
-  "report.category.title": "Povedzte nám, čo je zlé na tomto {type}",
-  "report.category.title_account": "profile",
-  "report.category.title_status": "príspevku",
  "report.close": "Hotovo",
  "report.comment.title": "Je ešte niečo, čo by sme podľa vás mali vedieť?",
  "report.forward": "Preposlať na {target}",
--- a/app/javascript/mastodon/locales/sl.json
+++ b/app/javascript/mastodon/locales/sl.json
@ -737,9 +737,6 @@
  "report.categories.spam": "Neželeno",
  "report.categories.violation": "Vsebina krši eno ali več pravil strežnika",
  "report.category.subtitle": "Izberite najustreznejši zadetek",
-  "report.category.title": "Povejte nam, kaj se dogaja s to/tem {type}",
-  "report.category.title_account": "profil",
-  "report.category.title_status": "objava",
  "report.close": "Opravljeno",
  "report.comment.title": "Je še kaj, za kar menite, da bi morali vedeti?",
  "report.forward": "Posreduj k {target}",
--- a/app/javascript/mastodon/locales/sq.json
+++ b/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.",
@ -1133,11 +1133,7 @@
  "report.categories.spam": "I padëshiruar",
  "report.categories.violation": "Lënda shkel një ose disa rregulla shërbyesi",
  "report.category.subtitle": "Zgjidhni përputhjen më të mirë",
-  "report.category.title": "Tregonani se ç’po ndodh me këtë {type}",
-  "report.category.title_account": "profil",
-  "report.category.title_status": "postim",
  "report.close": "U bë",
-  "report.collection_comment": "Pse doni ta raportoni këtë koleksion?",
  "report.comment.title": "Ka ndonjë gjë tjetër që do të duhej ta dinim?",
  "report.forward": "Përcillja {target}",
  "report.forward_hint": "Llogaria është nga një shërbyes tjetër. Të dërgohet edhe një kopje e anonimizuar e raportimit?",
--- a/app/javascript/mastodon/locales/sr-Latn.json
+++ b/app/javascript/mastodon/locales/sr-Latn.json
@ -532,9 +532,6 @@
  "report.categories.spam": "Spam",
  "report.categories.violation": "Sadržaj krši jedno ili više pravila servera",
  "report.category.subtitle": "Odaberite najpribližnije",
-  "report.category.title": "Recite nam šta je problem sa {type}",
-  "report.category.title_account": "ovim profilom",
-  "report.category.title_status": "objavom",
  "report.close": "Gotovo",
  "report.comment.title": "Da li ima još nešto što biste hteli da nam date do znanja?",
  "report.forward": "Proslediti {target}",
--- a/app/javascript/mastodon/locales/sr.json
+++ b/app/javascript/mastodon/locales/sr.json
@ -509,9 +509,6 @@
  "report.categories.spam": "Спам",
  "report.categories.violation": "Садржај крши једно или више правила сервера",
  "report.category.subtitle": "Одаберите најприближније",
-  "report.category.title": "Реците нам шта је проблем са {type}",
-  "report.category.title_account": "овим профилом",
-  "report.category.title_status": "објавом",
  "report.close": "Готово",
  "report.comment.title": "Да ли има још нешто што бисте хтели да нам дате до знања?",
  "report.forward": "Проследити {target}",
--- a/app/javascript/mastodon/locales/sv.json
+++ b/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.",
@ -1138,11 +1138,7 @@
  "report.categories.spam": "Skräppost",
  "report.categories.violation": "Innehåll bryter mot en eller flera serverregler",
  "report.category.subtitle": "Välj den bästa träffen",
-  "report.category.title": "Berätta för oss vad som händer med den här {type}",
-  "report.category.title_account": "profil",
-  "report.category.title_status": "inlägg",
  "report.close": "Färdig",
-  "report.collection_comment": "Varför vill du rapportera denna samling?",
  "report.comment.title": "Finns det något annat vi borde veta?",
  "report.forward": "Vidarebefordra till {target}",
  "report.forward_hint": "Kontot är från en annan server. Skicka även en anonymiserad kopia av anmälan dit?",
--- a/app/javascript/mastodon/locales/th.json
+++ b/app/javascript/mastodon/locales/th.json
@ -732,9 +732,6 @@
  "report.categories.spam": "สแปม",
  "report.categories.violation": "เนื้อหาละเมิดกฎของเซิร์ฟเวอร์จำนวนหนึ่งหรือมากกว่า",
  "report.category.subtitle": "เลือกที่ตรงกันที่สุด",
-  "report.category.title": "บอกเราถึงสิ่งที่กำลังเกิดขึ้นกับ{type}นี้",
-  "report.category.title_account": "โปรไฟล์",
-  "report.category.title_status": "โพสต์",
  "report.close": "เสร็จสิ้น",
  "report.comment.title": "มีสิ่งอื่นใดที่คุณคิดว่าเราควรทราบหรือไม่?",
  "report.forward": "ส่งต่อไปยัง {target}",
--- a/app/javascript/mastodon/locales/tok.json
+++ b/app/javascript/mastodon/locales/tok.json
@ -491,9 +491,6 @@
  "report.block_explanation": "sina kama lukin ala e toki ona. ona li kama ala ken lukin e toki sina li kama ala ken kute e sina. ona li ken sona e kama ni.",
  "report.categories.other": "ante",
  "report.categories.spam": "ike tan toki mute",
-  "report.category.title": "ike seme li lon {type} ni",
-  "report.category.title_account": "lipu",
-  "report.category.title_status": "toki",
  "report.close": "ale li pona",
  "report.mute": "o kute ala e ona",
  "report.mute_explanation": "sina kama ala lukin e ijo pana ona. ona li awen ken kute e sina li awen ken lukin e sina li sona ala e weka kute sina e weka lukin sina.",
--- a/app/javascript/mastodon/locales/tr.json
+++ b/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.",
@ -1138,11 +1138,10 @@
  "report.categories.spam": "İstenmeyen",
  "report.categories.violation": "İçerik bir veya daha fazla sunucu kuralını ihlal ediyor",
  "report.category.subtitle": "En uygun eşleşmeyi seçin",
-  "report.category.title": "Bu {type} ile ilgili neler oluyor bize söyleyin",
-  "report.category.title_account": "profil",
-  "report.category.title_status": "gönderi",
+  "report.category.title_account": "Bu profilde neler olduğunu bizimle paylaşın",
+  "report.category.title_collection": "Bu koleksiyonda neler olduğunu bizimle paylaşın",
+  "report.category.title_status": "Bu gönderide neler olduğunu bizimle paylaşın",
  "report.close": "Tamam",
-  "report.collection_comment": "Bu koleksiyonu neden bildirmek istiyorsunuz?",
  "report.comment.title": "Bilmemizi istediğiniz başka bir şey var mı?",
  "report.forward": "{target} ilet",
  "report.forward_hint": "Hesap başka bir sunucudan. Raporun anonim bir kopyası da oraya gönderilsin mi?",
--- a/Show More
+++ b/Show More