diff --git a/.github/ISSUE_TEMPLATE/2.server_bug_report.yml b/.github/ISSUE_TEMPLATE/2.server_bug_report.yml
index 98801f07f1..743c32b79e 100644
--- a/.github/ISSUE_TEMPLATE/2.server_bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/2.server_bug_report.yml
@@ -59,7 +59,7 @@ body:
         Any additional technical details you may have, like logs or error traces
       value: |
         If this is happening on your own Mastodon server, please fill out those:
-        - Ruby version: (from `ruby --version`, eg. v4.0.3)
+        - Ruby version: (from `ruby --version`, eg. v4.0.4)
         - Node.js version: (from `node --version`, eg. v22.16.0)
     validations:
       required: false
diff --git a/.github/ISSUE_TEMPLATE/3.troubleshooting.yml b/.github/ISSUE_TEMPLATE/3.troubleshooting.yml
index 9856ae4428..ebd8485071 100644
--- a/.github/ISSUE_TEMPLATE/3.troubleshooting.yml
+++ b/.github/ISSUE_TEMPLATE/3.troubleshooting.yml
@@ -60,7 +60,7 @@ body:
       value: |
         Please at least include those informations:
         - Operating system: (eg. Ubuntu 24.04.2)
-        - Ruby version: (from `ruby --version`, eg. v4.0.3)
+        - Ruby version: (from `ruby --version`, eg. v4.0.4)
         - Node.js version: (from `node --version`, eg. v22.16.0)
     validations:
       required: false
diff --git a/.github/actions/setup-ruby/action.yml b/.github/actions/setup-ruby/action.yml
index 317c1256d5..aaf6dc752a 100644
--- a/.github/actions/setup-ruby/action.yml
+++ b/.github/actions/setup-ruby/action.yml
@@ -14,10 +14,16 @@ runs:
       shell: bash
       run: |
         sudo apt-get update
-        sudo apt-get install --no-install-recommends -y libicu-dev libidn11-dev libvips42 ${{ inputs.additional-system-dependencies }}
+        sudo apt-get install --no-install-recommends -y \
+          libicu-dev \
+          libidn11-dev \
+          libvips42 \
+          libheif-plugin-aomdec \
+          libheif-plugin-libde265 \
+          ${{ inputs.additional-system-dependencies }}
 
     - name: Set up Ruby
-      uses: ruby/setup-ruby@94e4d89d3e6c1c7599e0210d114c5ffb23f1a866 # v1
+      uses: ruby/setup-ruby@6aaa311d81eba98ae12eaffbcb63296ace0efcde # v1
       with:
         ruby-version: ${{ inputs.ruby-version }}
         bundler-cache: true
diff --git a/.github/workflows/bundler-audit.yml b/.github/workflows/bundler-audit.yml
index 0cbbeb5878..797dd5687e 100644
--- a/.github/workflows/bundler-audit.yml
+++ b/.github/workflows/bundler-audit.yml
@@ -31,7 +31,7 @@ jobs:
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
 
       - name: Set up Ruby
-        uses: ruby/setup-ruby@94e4d89d3e6c1c7599e0210d114c5ffb23f1a866 # v1
+        uses: ruby/setup-ruby@6aaa311d81eba98ae12eaffbcb63296ace0efcde # v1
         with:
           bundler-cache: true
 
diff --git a/.github/workflows/lint-haml.yml b/.github/workflows/lint-haml.yml
index b59a4b2d69..a453091c1a 100644
--- a/.github/workflows/lint-haml.yml
+++ b/.github/workflows/lint-haml.yml
@@ -36,7 +36,7 @@ jobs:
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
 
       - name: Set up Ruby
-        uses: ruby/setup-ruby@94e4d89d3e6c1c7599e0210d114c5ffb23f1a866 # v1
+        uses: ruby/setup-ruby@6aaa311d81eba98ae12eaffbcb63296ace0efcde # v1
         with:
           bundler-cache: true
 
diff --git a/.github/workflows/lint-ruby.yml b/.github/workflows/lint-ruby.yml
index ae4cc6faf2..942192faa1 100644
--- a/.github/workflows/lint-ruby.yml
+++ b/.github/workflows/lint-ruby.yml
@@ -38,7 +38,7 @@ jobs:
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
 
       - name: Set up Ruby
-        uses: ruby/setup-ruby@94e4d89d3e6c1c7599e0210d114c5ffb23f1a866 # v1
+        uses: ruby/setup-ruby@6aaa311d81eba98ae12eaffbcb63296ace0efcde # v1
         with:
           bundler-cache: true
 
diff --git a/.ruby-version b/.ruby-version
index c4e41f9459..c5106e6d13 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-4.0.3
+4.0.4
diff --git a/Dockerfile b/Dockerfile
index 6159df35e4..feb5b34b80 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,7 +13,7 @@ ARG BASE_REGISTRY="docker.io"
 
 # Ruby image to use for base image, change with [--build-arg RUBY_VERSION="4.0.x"]
 # renovate: datasource=docker depName=docker.io/ruby
-ARG RUBY_VERSION="4.0.3"
+ARG RUBY_VERSION="4.0.4"
 # # Node.js version to use in base image, change with [--build-arg NODE_MAJOR_VERSION="22"]
 # renovate: datasource=node-version depName=node
 ARG NODE_MAJOR_VERSION="24"
diff --git a/Gemfile.lock b/Gemfile.lock
index 9afbcb7920..2387c5dafd 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -99,8 +99,8 @@ GEM
     ast (2.4.3)
     attr_required (1.0.2)
     aws-eventstream (1.4.0)
-    aws-partitions (1.1245.0)
-    aws-sdk-core (3.246.0)
+    aws-partitions (1.1249.0)
+    aws-sdk-core (3.247.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
@@ -108,11 +108,11 @@ GEM
       bigdecimal
       jmespath (~> 1, >= 1.6.1)
       logger
-    aws-sdk-kms (1.124.0)
-      aws-sdk-core (~> 3, >= 3.244.0)
+    aws-sdk-kms (1.125.0)
+      aws-sdk-core (~> 3, >= 3.247.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.221.0)
-      aws-sdk-core (~> 3, >= 3.244.0)
+    aws-sdk-s3 (1.222.0)
+      aws-sdk-core (~> 3, >= 3.247.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
     aws-sigv4 (1.12.1)
@@ -132,7 +132,7 @@ GEM
     binding_of_caller (2.0.0)
       debug_inspector (>= 1.2.0)
     blurhash (0.1.8)
-    bootsnap (1.24.1)
+    bootsnap (1.24.4)
       msgpack (~> 1.2)
     brakeman (8.0.4)
       racc
@@ -816,12 +816,12 @@ GEM
     securerandom (0.4.1)
     shoulda-matchers (7.0.1)
       activesupport (>= 7.1)
-    sidekiq (8.1.4)
+    sidekiq (8.1.5)
       connection_pool (>= 3.0.0)
       json (>= 2.16.0)
       logger (>= 1.7.0)
       rack (>= 3.2.0)
-      redis-client (>= 0.26.0)
+      redis-client (>= 0.29.0)
     sidekiq-bulk (0.2.0)
       sidekiq
     sidekiq-scheduler (6.0.2)
@@ -851,7 +851,7 @@ GEM
       concurrent-ruby
       zeitwerk
     stringio (3.2.0)
-    strong_migrations (2.7.0)
+    strong_migrations (2.8.0)
       activerecord (>= 7.2)
     swd (2.0.3)
       activesupport (>= 3)
@@ -1097,7 +1097,7 @@ DEPENDENCIES
   xorcist (~> 1.1)
 
 RUBY VERSION
-  ruby 4.0.3
+  ruby 4.0.4
 
 BUNDLED WITH
   4.0.11
diff --git a/app/controllers/admin/collections_controller.rb b/app/controllers/admin/collections_controller.rb
index 2698abbd45..405c779e3d 100644
--- a/app/controllers/admin/collections_controller.rb
+++ b/app/controllers/admin/collections_controller.rb
@@ -20,7 +20,7 @@ module Admin
     def batch
       authorize [:admin, :collection], :index?
 
-      @collection_batch_action = Admin::CollectionBatchAction.new(admin_collection_batch_action_params.merge(current_account: current_account, report_id: params[:report_id], type: 'report'))
+      @collection_batch_action = Admin::CollectionBatchAction.new(admin_collection_batch_action_params.merge(current_account: current_account, report_id: params[:report_id], type: action_from_button))
 
       @collection_batch_action.save!
     rescue ActionController::ParameterMissing
@@ -57,5 +57,13 @@ module Admin
     def set_collections
       @collections = @account.collections.includes(accepted_collection_items: :account).page(params[:page]).per(PER_PAGE)
     end
+
+    def action_from_button
+      if params[:report]
+        'report'
+      elsif params[:remove_from_report]
+        'remove_from_report'
+      end
+    end
   end
 end
diff --git a/app/controllers/admin/reports_controller.rb b/app/controllers/admin/reports_controller.rb
index 44ee7206bf..f12e3da4e1 100644
--- a/app/controllers/admin/reports_controller.rb
+++ b/app/controllers/admin/reports_controller.rb
@@ -16,6 +16,8 @@ module Admin
       @report_notes = @report.notes.chronological.includes(:account)
       @action_logs  = @report.history.includes(:target)
       @form         = Admin::StatusBatchAction.new
+      @collection_form = Admin::CollectionBatchAction.new
+      @collections  = @report.collections
       @statuses     = @report.statuses.with_includes
     end
 
diff --git a/app/javascript/entrypoints/admin.tsx b/app/javascript/entrypoints/admin.tsx
index 91c3bd640a..49ab58cc5b 100644
--- a/app/javascript/entrypoints/admin.tsx
+++ b/app/javascript/entrypoints/admin.tsx
@@ -69,8 +69,9 @@ on('change', '#batch_checkbox_all', ({ target }) => {
     '.batch-table__select-all',
   );
 
-  document
-    .querySelectorAll<HTMLInputElement>(batchCheckboxClassName)
+  target
+    .closest('.batch-table')
+    ?.querySelectorAll<HTMLInputElement>(batchCheckboxClassName)
     .forEach((content) => {
       content.checked = target.checked;
     });
@@ -112,17 +113,20 @@ on('click', '.batch-table__select-all button', () => {
   }
 });
 
-on('change', batchCheckboxClassName, () => {
-  const checkAllElement = document.querySelector<HTMLInputElement>(
+on('change', batchCheckboxClassName, (event) => {
+  const targetTable = (event.target as HTMLElement).closest('.batch-table');
+  if (!targetTable) return;
+
+  const checkAllElement = targetTable.querySelector<HTMLInputElement>(
     'input#batch_checkbox_all',
   );
-  const selectAllMatchingElement = document.querySelector(
+  const selectAllMatchingElement = targetTable.querySelector(
     '.batch-table__select-all',
   );
 
   if (checkAllElement) {
     const allCheckboxes = Array.from(
-      document.querySelectorAll<HTMLInputElement>(batchCheckboxClassName),
+      targetTable.querySelectorAll<HTMLInputElement>(batchCheckboxClassName),
     );
     checkAllElement.checked = allCheckboxes.every((content) => content.checked);
     checkAllElement.indeterminate =
diff --git a/app/javascript/mastodon/components/account_header/styles.module.scss b/app/javascript/mastodon/components/account_header/styles.module.scss
index a54ca18c8a..2daf386734 100644
--- a/app/javascript/mastodon/components/account_header/styles.module.scss
+++ b/app/javascript/mastodon/components/account_header/styles.module.scss
@@ -21,7 +21,7 @@
     height: 160px;
   }
 
-  :global(.inactive) & {
+  .moved & {
     filter: grayscale(100%);
   }
 }
@@ -275,9 +275,14 @@ $button-fallback-breakpoint: $button-breakpoint + 55px;
   font-size: 15px;
   color: var(--color-text-primary);
   unicode-bidi: plaintext;
-  display: flex;
-  flex-direction: column;
-  gap: 20px;
+
+  p {
+    margin-bottom: 20px;
+
+    &:last-child {
+      margin-bottom: 0;
+    }
+  }
 
   :any-link {
     color: var(--color-text-status-links);
diff --git a/app/javascript/mastodon/components/button/button.stories.tsx b/app/javascript/mastodon/components/button/button.stories.tsx
index 6827097c50..cb60ca3296 100644
--- a/app/javascript/mastodon/components/button/button.stories.tsx
+++ b/app/javascript/mastodon/components/button/button.stories.tsx
@@ -74,6 +74,24 @@ export const Compact: Story = {
   play: buttonTest,
 };
 
+export const CompactSecondary: Story = {
+  args: {
+    compact: true,
+    secondary: true,
+    children: 'Compact secondary button',
+  },
+  play: buttonTest,
+};
+
+export const CompactPlain: Story = {
+  args: {
+    compact: true,
+    plain: true,
+    children: 'Compact plain button',
+  },
+  play: buttonTest,
+};
+
 export const Dangerous: Story = {
   args: {
     dangerous: true,
diff --git a/app/javascript/mastodon/components/empty_state/empty_state.module.scss b/app/javascript/mastodon/components/empty_state/empty_state.module.scss
index 96aea81d1c..64d9a4e584 100644
--- a/app/javascript/mastodon/components/empty_state/empty_state.module.scss
+++ b/app/javascript/mastodon/components/empty_state/empty_state.module.scss
@@ -35,6 +35,10 @@
     color: var(--color-text-secondary);
     text-wrap: pretty;
   }
+
+  a {
+    color: var(--color-text-status-links);
+  }
 }
 
 [data-color-scheme='dark'] .defaultImage {
diff --git a/app/javascript/mastodon/components/form_fields/form_field_wrapper.module.scss b/app/javascript/mastodon/components/form_fields/form_field_wrapper.module.scss
index cff93be8a6..43b672a2a1 100644
--- a/app/javascript/mastodon/components/form_fields/form_field_wrapper.module.scss
+++ b/app/javascript/mastodon/components/form_fields/form_field_wrapper.module.scss
@@ -48,10 +48,14 @@
 
 .status {
   // If there's no content, we need to compensate for the parent's
-  // flex gap to avoid extra spacing below the field.
+  // flex gap to avoid extra spacing below or next to the field.
   &:empty {
     margin-top: calc(-1 * var(--form-field-label-gap));
   }
+
+  [data-input-placement^='inline'] &:empty {
+    margin-inline-start: calc(-1 * var(--form-field-label-gap));
+  }
 }
 
 .inputWrapper {
diff --git a/app/javascript/mastodon/components/form_fields/form_field_wrapper.tsx b/app/javascript/mastodon/components/form_fields/form_field_wrapper.tsx
index ffa7f491bc..579d6e814c 100644
--- a/app/javascript/mastodon/components/form_fields/form_field_wrapper.tsx
+++ b/app/javascript/mastodon/components/form_fields/form_field_wrapper.tsx
@@ -24,7 +24,7 @@ export interface FieldStatus {
   message?: string;
 }
 
-interface FieldWrapperProps {
+export interface FieldWrapperProps {
   label: ReactNode;
   hint?: ReactNode;
   required?: boolean;
diff --git a/app/javascript/mastodon/components/form_fields/select_field.tsx b/app/javascript/mastodon/components/form_fields/select_field.tsx
index 7c1bfdf47d..f2e9e5c8d3 100644
--- a/app/javascript/mastodon/components/form_fields/select_field.tsx
+++ b/app/javascript/mastodon/components/form_fields/select_field.tsx
@@ -4,11 +4,17 @@ import { forwardRef } from 'react';
 import classNames from 'classnames';
 
 import { FormFieldWrapper } from './form_field_wrapper';
-import type { CommonFieldWrapperProps } from './form_field_wrapper';
+import type {
+  CommonFieldWrapperProps,
+  FieldWrapperProps,
+} from './form_field_wrapper';
 import classes from './select.module.scss';
 
 interface Props
-  extends ComponentPropsWithoutRef<'select'>, CommonFieldWrapperProps {}
+  extends
+    ComponentPropsWithoutRef<'select'>,
+    CommonFieldWrapperProps,
+    Pick<FieldWrapperProps, 'inputPlacement'> {}
 
 /**
  * A simple form field for single-item selections.
@@ -19,13 +25,28 @@ interface Props
  */
 
 export const SelectField = forwardRef<HTMLSelectElement, Props>(
-  ({ id, label, hint, required, status, children, ...otherProps }, ref) => (
+  (
+    {
+      id,
+      label,
+      hint,
+      required,
+      status,
+      inputPlacement,
+      children,
+      wrapperClassName,
+      ...otherProps
+    },
+    ref,
+  ) => (
     <FormFieldWrapper
       label={label}
       hint={hint}
       required={required}
       status={status}
       inputId={id}
+      inputPlacement={inputPlacement}
+      className={wrapperClassName}
     >
       {(inputProps) => (
         <Select {...otherProps} {...inputProps} ref={ref}>
diff --git a/app/javascript/mastodon/components/list_item/index.tsx b/app/javascript/mastodon/components/list_item/index.tsx
index a691762b5d..377196542e 100644
--- a/app/javascript/mastodon/components/list_item/index.tsx
+++ b/app/javascript/mastodon/components/list_item/index.tsx
@@ -67,9 +67,14 @@ interface LinkProps
   extends React.ComponentPropsWithoutRef<typeof Link>, ContentProps {}
 
 export const ListItemLink = polymorphicForwardRef<'h3', LinkProps>(
-  ({ as, subtitle, children, className, ...otherProps }, ref) => {
+  ({ as, subtitle, subtitleId, children, className, ...otherProps }, ref) => {
     return (
-      <ListItemContent ref={ref} as={as} subtitle={subtitle}>
+      <ListItemContent
+        ref={ref}
+        as={as}
+        subtitle={subtitle}
+        subtitleId={subtitleId}
+      >
         <Link className={classNames(className, 'focusable')} {...otherProps}>
           {children}
         </Link>
@@ -82,9 +87,14 @@ interface ButtonProps
   extends React.ComponentPropsWithoutRef<'button'>, ContentProps {}
 
 export const ListItemButton = polymorphicForwardRef<'h3', ButtonProps>(
-  ({ as, subtitle, children, className, ...otherProps }, ref) => {
+  ({ as, subtitle, subtitleId, children, className, ...otherProps }, ref) => {
     return (
-      <ListItemContent as={as} ref={ref} subtitle={subtitle}>
+      <ListItemContent
+        as={as}
+        ref={ref}
+        subtitle={subtitle}
+        subtitleId={subtitleId}
+      >
         <button
           type='button'
           className={classNames(className, 'focusable')}
diff --git a/app/javascript/mastodon/features/collections/detail/accounts_list.tsx b/app/javascript/mastodon/features/collections/detail/accounts_list.tsx
index 441b8345fb..8baa16dec4 100644
--- a/app/javascript/mastodon/features/collections/detail/accounts_list.tsx
+++ b/app/javascript/mastodon/features/collections/detail/accounts_list.tsx
@@ -1,8 +1,10 @@
-import { useCallback, useMemo, useRef, useState } from 'react';
+import { useCallback, useMemo, useRef } from 'react';
 
 import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
 
 import { PendingBadge } from '@/mastodon/components/badge';
+import { SelectField } from '@/mastodon/components/form_fields';
+import { useSearchParam } from '@/mastodon/hooks/useSearchParam';
 import VisibilityOffIcon from '@/material-icons/400-24px/visibility_off.svg?react';
 import type {
   ApiCollectionJSON,
@@ -14,7 +16,6 @@ import {
   AccountListItemFollowButton,
 } from 'mastodon/components/account_list_item';
 import { Button } from 'mastodon/components/button';
-import { Callout } from 'mastodon/components/callout';
 import {
   Article,
   ItemList,
@@ -35,50 +36,6 @@ const messages = defineMessages({
   },
 });
 
-const SensitiveScreen: React.FC<{
-  sensitive: boolean | undefined;
-  focusTargetRef: React.RefObject<HTMLHeadingElement>;
-  children: React.ReactNode;
-}> = ({ sensitive, focusTargetRef, children }) => {
-  const [isVisible, setIsVisible] = useState(!sensitive);
-
-  const showAnyway = useCallback(() => {
-    setIsVisible(true);
-    setTimeout(() => {
-      focusTargetRef.current?.focus();
-    }, 0);
-  }, [focusTargetRef]);
-
-  if (isVisible) {
-    return children;
-  }
-
-  return (
-    <Callout
-      variant='warning'
-      title={
-        <FormattedMessage
-          id='collections.detail.sensitive_content'
-          defaultMessage='Sensitive content'
-        />
-      }
-      primaryLabel={
-        <FormattedMessage
-          id='content_warning.show_short'
-          defaultMessage='Show'
-        />
-      }
-      onPrimary={showAnyway}
-      className={classes.sensitiveScreen}
-    >
-      <FormattedMessage
-        id='collections.detail.sensitive_note'
-        defaultMessage='The description and accounts may not be suitable for all viewers.'
-      />
-    </Callout>
-  );
-};
-
 type CollectionItemWithAccount = CollectionAccountItem & {
   account?: Account | null;
 };
@@ -98,6 +55,43 @@ const getCollectionItems = createAppSelector(
     ),
 );
 
+function sortAccounts(
+  accounts: CollectionItemWithAccount[],
+  sortBy?: string,
+): CollectionItemWithAccount[] {
+  if (!sortBy || sortBy === 'date_added') {
+    return accounts;
+  }
+
+  const sorted = [...accounts];
+
+  switch (sortBy) {
+    case 'alphabetical':
+      return sorted.sort((a, b) => {
+        const nameA = a.account?.display_name ?? '';
+        const nameB = b.account?.display_name ?? '';
+        return nameA.localeCompare(nameB);
+      });
+
+    case 'last_active':
+      return sorted.sort((a, b) => {
+        const dateA = a.account?.last_status_at ?? '';
+        const dateB = b.account?.last_status_at ?? '';
+        return new Date(dateB).getTime() - new Date(dateA).getTime();
+      });
+
+    case 'most_followers':
+      return sorted.sort((a, b) => {
+        const followersA = a.account?.followers_count ?? 0;
+        const followersB = b.account?.followers_count ?? 0;
+        return followersB - followersA;
+      });
+
+    default:
+      return accounts;
+  }
+}
+
 export const CollectionAccountsList: React.FC<{
   collection: ApiCollectionJSON;
 }> = ({ collection }) => {
@@ -113,11 +107,20 @@ export const CollectionAccountsList: React.FC<{
     getCollectionItems(state, id),
   );
 
+  const [sortBy, setSortBy] = useSearchParam('sort', 'date_added');
+  const changeSortBy = useCallback(
+    (event: React.ChangeEvent<HTMLSelectElement>) => {
+      setSortBy(event.target.value);
+    },
+    [setSortBy],
+  );
+  const sortedAccounts = sortAccounts(collectionAccounts, sortBy);
+
   const { visibleAccounts, hiddenAccounts } = useMemo(() => {
     const visibleAccounts: CollectionItemWithAccount[] = [];
     const hiddenAccounts: CollectionItemWithAccount[] = [];
 
-    collectionAccounts.forEach((item) => {
+    sortedAccounts.forEach((item) => {
       const { account, account_id } = item;
 
       if (!isOwnCollection && !account) {
@@ -134,7 +137,7 @@ export const CollectionAccountsList: React.FC<{
     });
 
     return { visibleAccounts, hiddenAccounts };
-  }, [collectionAccounts, isOwnCollection, relationships]);
+  }, [sortedAccounts, isOwnCollection, relationships]);
 
   const renderAccountItemButton = useCallback(
     ({ relationship, accountId }: RenderButtonOptions) => {
@@ -192,46 +195,81 @@ export const CollectionAccountsList: React.FC<{
 
   return (
     <>
-      <h3
-        className={classes.columnSubheading}
-        tabIndex={-1}
-        ref={listHeadingRef}
-      >
-        <FormattedMessage
-          id='collections.account_count'
-          defaultMessage='{count, plural, one {# account} other {# accounts}}'
-          values={{ count: collection.item_count }}
-        />
-      </h3>
-      <SensitiveScreen
-        sensitive={!isOwnCollection && collection.sensitive}
-        focusTargetRef={listHeadingRef}
-      >
-        <ItemList emptyMessage={intl.formatMessage(messages.empty)}>
-          <TruncatedListItems
-            visibleItems={visibleAccounts}
-            truncatedItems={hiddenAccounts}
-            toggleButton={{
-              icon: VisibilityOffIcon,
-              title: (
-                <FormattedMessage
-                  id='collections.hidden_accounts_link'
-                  defaultMessage='{count, plural, one {# hidden account} other {# hidden accounts}}'
-                  values={{ count: hiddenAccounts.length }}
-                />
-              ),
-              subtitle: (
-                <FormattedMessage
-                  id='collections.hidden_accounts_description'
-                  defaultMessage='You’ve blocked or muted {count, plural, one {this user} other {these users}}'
-                  values={{ count: hiddenAccounts.length }}
-                />
-              ),
-            }}
-            renderListItem={renderListItem}
+      <div className={classes.subheadingWithSelect}>
+        <h3
+          className={classes.columnSubheading}
+          tabIndex={-1}
+          ref={listHeadingRef}
+        >
+          <FormattedMessage
+            id='collections.account_count'
+            defaultMessage='{count, plural, one {# account} other {# accounts}}'
+            values={{ count: collection.item_count }}
           />
-        </ItemList>
-      </SensitiveScreen>
+        </h3>
+        <SelectField
+          label={
+            <FormattedMessage
+              id='collections.sort_by'
+              defaultMessage='Sort by:'
+            />
+          }
+          value={sortBy}
+          onChange={changeSortBy}
+          inputPlacement='inline-end'
+          className={classes.select}
+          wrapperClassName={classes.selectWrapper}
+        >
+          <option value='alphabetical'>
+            <FormattedMessage
+              id='collections.sort_alphabetical'
+              defaultMessage='Alphabetical'
+            />
+          </option>
+          <option value='last_active'>
+            <FormattedMessage
+              id='collections.sort_last_active'
+              defaultMessage='Last active'
+            />
+          </option>
+          <option value='most_followers'>
+            <FormattedMessage
+              id='collections.sort_most_followers'
+              defaultMessage='Most followers'
+            />
+          </option>
+          <option value='date_added'>
+            <FormattedMessage
+              id='collections.sort_date_added'
+              defaultMessage='Date added'
+            />
+          </option>
+        </SelectField>
+      </div>
+      <ItemList emptyMessage={intl.formatMessage(messages.empty)}>
+        <TruncatedListItems
+          visibleItems={visibleAccounts}
+          truncatedItems={hiddenAccounts}
+          toggleButton={{
+            icon: VisibilityOffIcon,
+            title: (
+              <FormattedMessage
+                id='collections.hidden_accounts_link'
+                defaultMessage='{count, plural, one {# hidden account} other {# hidden accounts}}'
+                values={{ count: hiddenAccounts.length }}
+              />
+            ),
+            subtitle: (
+              <FormattedMessage
+                id='collections.hidden_accounts_description'
+                defaultMessage='You’ve blocked or muted {count, plural, one {this user} other {these users}}'
+                values={{ count: hiddenAccounts.length }}
+              />
+            ),
+          }}
+          renderListItem={renderListItem}
+        />
+      </ItemList>
     </>
   );
 };
diff --git a/app/javascript/mastodon/features/collections/detail/index.tsx b/app/javascript/mastodon/features/collections/detail/index.tsx
index fd8e68c772..98ce518cf5 100644
--- a/app/javascript/mastodon/features/collections/detail/index.tsx
+++ b/app/javascript/mastodon/features/collections/detail/index.tsx
@@ -1,4 +1,4 @@
-import { useCallback, useEffect } from 'react';
+import { useCallback, useEffect, useRef, useState } from 'react';
 
 import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
 
@@ -138,9 +138,40 @@ export const PendingNote: React.FC = () => {
   );
 };
 
-const CollectionHeader: React.FC<{ collection: ApiCollectionJSON }> = ({
-  collection,
+const SensitiveContentNote: React.FC<{ onReveal: () => void }> = ({
+  onReveal,
 }) => {
+  return (
+    <Callout
+      variant='warning'
+      title={
+        <FormattedMessage
+          id='collections.detail.sensitive_content'
+          defaultMessage='Sensitive content'
+        />
+      }
+      primaryLabel={
+        <FormattedMessage
+          id='content_warning.show_short'
+          defaultMessage='Show'
+        />
+      }
+      onPrimary={onReveal}
+      className={classes.sensitiveScreen}
+    >
+      <FormattedMessage
+        id='collections.detail.sensitive_note'
+        defaultMessage='The description and accounts may not be suitable for all viewers.'
+      />
+    </Callout>
+  );
+};
+
+const CollectionHeader: React.FC<{
+  collection: ApiCollectionJSON;
+  withDescription: boolean;
+  headingRef: React.RefObject<HTMLHeadingElement>;
+}> = ({ collection, withDescription, headingRef }) => {
   const intl = useIntl();
   const { name, description, tag, account_id, items } = collection;
   const dispatch = useAppDispatch();
@@ -181,7 +212,9 @@ const CollectionHeader: React.FC<{ collection: ApiCollectionJSON }> = ({
       <div className={classes.titleWithMenu}>
         <div className={classes.titleWrapper}>
           {tag && <Badge label={`#${tag.name}`} icon={null} />}
-          <h2 className={classes.name}>{name}</h2>
+          <h2 className={classes.name} ref={headingRef} tabIndex={-1}>
+            {name}
+          </h2>
           <AuthorNote id={account_id} />
         </div>
         <div className={classes.headerButtonWrapper}>
@@ -199,7 +232,9 @@ const CollectionHeader: React.FC<{ collection: ApiCollectionJSON }> = ({
           />
         </div>
       </div>
-      {description && <p className={classes.description}>{description}</p>}
+      {withDescription && description && (
+        <p className={classes.description}>{description}</p>
+      )}
       {hasPendingAccounts && <PendingNote />}
       {isCurrentUserInCollection && (
         <RevokeControls
@@ -211,6 +246,52 @@ const CollectionHeader: React.FC<{ collection: ApiCollectionJSON }> = ({
   );
 };
 
+function useRevealSensitiveContent({
+  sensitive,
+}: {
+  sensitive: boolean | undefined;
+}) {
+  const postRevealFocusTargetRef = useRef<HTMLHeadingElement>(null);
+  const [isContentVisible, setIsContentVisible] = useState(!sensitive);
+
+  const revealContent = useCallback(() => {
+    setIsContentVisible(true);
+    setTimeout(() => {
+      postRevealFocusTargetRef.current?.focus();
+    }, 0);
+  }, [postRevealFocusTargetRef]);
+
+  return {
+    isContentVisible,
+    revealContent,
+    postRevealFocusTargetRef,
+  };
+}
+
+const ColumnContent: React.FC<{
+  collection: ApiCollectionJSON;
+}> = ({ collection }) => {
+  const { isContentVisible, revealContent, postRevealFocusTargetRef } =
+    useRevealSensitiveContent({
+      sensitive: collection.sensitive && collection.account_id !== me,
+    });
+
+  return (
+    <>
+      <CollectionHeader
+        collection={collection}
+        headingRef={postRevealFocusTargetRef}
+        withDescription={isContentVisible}
+      />
+      {isContentVisible ? (
+        <CollectionAccountsList collection={collection} />
+      ) : (
+        <SensitiveContentNote onReveal={revealContent} />
+      )}
+    </>
+  );
+};
+
 export const CollectionDetailPage: React.FC<{
   multiColumn?: boolean;
 }> = ({ multiColumn }) => {
@@ -241,10 +322,7 @@ export const CollectionDetailPage: React.FC<{
 
       <Scrollable>
         {collection ? (
-          <>
-            <CollectionHeader collection={collection} />
-            <CollectionAccountsList collection={collection} />
-          </>
+          <ColumnContent collection={collection} />
         ) : (
           <LoadingIndicator />
         )}
diff --git a/app/javascript/mastodon/features/collections/detail/styles.module.scss b/app/javascript/mastodon/features/collections/detail/styles.module.scss
index da972334ff..9f0e18b4b7 100644
--- a/app/javascript/mastodon/features/collections/detail/styles.module.scss
+++ b/app/javascript/mastodon/features/collections/detail/styles.module.scss
@@ -64,11 +64,30 @@
 }
 
 .sensitiveScreen {
-  margin: 16px;
+  margin-inline: 16px;
+}
+
+.subheadingWithSelect {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  gap: 8px 16px;
+  padding-inline: 16px;
+}
+
+.selectWrapper {
+  // Align to right edge even when wrapped to new line
+  margin-inline-start: auto;
+}
+
+.select {
+  height: 36px;
+  border-radius: 8px;
+  font-size: 15px;
+  background-color: var(--color-bg-primary);
 }
 
 .columnSubheading {
-  padding-inline: 16px;
   font-size: 15px;
   font-weight: 500;
 }
diff --git a/app/javascript/mastodon/features/collections/overview/featuring_you.tsx b/app/javascript/mastodon/features/collections/overview/featuring_you.tsx
index 3fb93bbfc9..c521fd2bdc 100644
--- a/app/javascript/mastodon/features/collections/overview/featuring_you.tsx
+++ b/app/javascript/mastodon/features/collections/overview/featuring_you.tsx
@@ -2,6 +2,7 @@ import { useEffect } from 'react';
 
 import { FormattedMessage } from 'react-intl';
 
+import { useAccount } from '@/mastodon/hooks/useAccount';
 import { EmptyState } from 'mastodon/components/empty_state';
 import { LoadingIndicator } from 'mastodon/components/loading_indicator';
 import { ItemList } from 'mastodon/components/scrollable_list/components';
@@ -34,6 +35,7 @@ function useCollectionsFeaturing(accountId: string | null | undefined) {
 
 export const CollectionsFeaturingYou: React.FC = () => {
   const accountId = useAccountId();
+  const account = useAccount(accountId);
 
   const { collections, status } = useCollectionsFeaturing(accountId);
 
@@ -46,16 +48,43 @@ export const CollectionsFeaturingYou: React.FC = () => {
   }
 
   if (collections.length === 0) {
-    return (
-      <EmptyState
-        message={
-          <FormattedMessage
-            id='empty_column.collections.featured_in'
-            defaultMessage='You have not been added to any collections yet.'
-          />
-        }
-      />
-    );
+    if (account?.discoverable) {
+      return (
+        <EmptyState
+          message={
+            <FormattedMessage
+              id='empty_column.collections.featured_in'
+              defaultMessage='You have not been added to any collections yet.'
+            />
+          }
+        />
+      );
+    } else {
+      return (
+        <EmptyState
+          message={
+            <>
+              <FormattedMessage
+                id='empty_column.collections.featured_in'
+                defaultMessage='You have not been added to any collections yet.'
+              />
+              <br />
+              <FormattedMessage
+                id='empty_column.collections.featured_in_undiscoverable'
+                defaultMessage='In order for people to add you to collections, you need to allow featuring in discovery experiences from <link>Preferences > Privacy and reach</link>'
+                values={{
+                  link: (chunks) => (
+                    <a href='/settings/privacy#account_discoverable'>
+                      {chunks}
+                    </a>
+                  ),
+                }}
+              />
+            </>
+          }
+        />
+      );
+    }
   }
 
   return (
diff --git a/app/javascript/mastodon/locales/af.json b/app/javascript/mastodon/locales/af.json
index 5535b09a39..daa78a0cd4 100644
--- a/app/javascript/mastodon/locales/af.json
+++ b/app/javascript/mastodon/locales/af.json
@@ -51,7 +51,6 @@
   "account.unfollow": "Ontvolg",
   "account.unmute": "Hef uitdowing van @{name} op",
   "account.unmute_short": "Hef uitdowing op",
-  "account_note.placeholder": "Klik om nota by te voeg",
   "admin.dashboard.retention.average": "Gemiddeld",
   "admin.dashboard.retention.cohort": "Registrasiemaand",
   "admin.dashboard.retention.cohort_size": "Nuwe gebruikers",
diff --git a/app/javascript/mastodon/locales/an.json b/app/javascript/mastodon/locales/an.json
index 6913197fff..b5d282f1a4 100644
--- a/app/javascript/mastodon/locales/an.json
+++ b/app/javascript/mastodon/locales/an.json
@@ -51,7 +51,6 @@
   "account.unfollow": "Deixar de seguir",
   "account.unmute": "Deixar de silenciar a @{name}",
   "account.unmute_short": "Deixar de silenciar",
-  "account_note.placeholder": "Clic pa anyadir nota",
   "admin.dashboard.daily_retention": "Taxa de retención d'usuarios per día dimpués d'o rechistro",
   "admin.dashboard.monthly_retention": "Taxa de retención d'usuarios per mes dimpués d'o rechistro",
   "admin.dashboard.retention.average": "Media",
@@ -209,7 +208,6 @@
   "footer.keyboard_shortcuts": "Alcorces de teclau",
   "footer.privacy_policy": "Politica de privacidat",
   "footer.source_code": "Veyer codigo fuent",
-  "generic.saved": "Alzau",
   "getting_started.heading": "Primers pasos",
   "hashtag.column_header.tag_mode.all": "y {additional}",
   "hashtag.column_header.tag_mode.any": "u {additional}",
diff --git a/app/javascript/mastodon/locales/ar.json b/app/javascript/mastodon/locales/ar.json
index 7c819ac8ac..260b7de741 100644
--- a/app/javascript/mastodon/locales/ar.json
+++ b/app/javascript/mastodon/locales/ar.json
@@ -182,7 +182,6 @@
   "account_edit.upload_modal.title_replace.header": "استبدال صورة الغلاف",
   "account_edit_tags.add_tag": "إضافة #{tagName}",
   "account_edit_tags.suggestions": "الاقتراحات:",
-  "account_note.placeholder": "اضغط لإضافة مُلاحظة",
   "admin.dashboard.daily_retention": "معدّل بقاء المستخدمين بعد إنشاء الحسابات، بالأيام",
   "admin.dashboard.monthly_retention": "معدّل بقاء المستخدمين بعد إنشاء الحسابات، بالشهور",
   "admin.dashboard.retention.average": "المعدل",
@@ -408,19 +407,6 @@
   "domain_block_modal.you_will_lose_num_followers": "ستخسر {followersCount, plural, zero {}one {{followersCountDisplay} متابع} two {{followersCountDisplay} متابع} few {{followersCountDisplay} متابعين} many {{followersCountDisplay} متابعين} other {{followersCountDisplay} متابعين}} و {followingCount, plural, zero {}one {{followingCountDisplay} شخص تتابعه} two {{followingCountDisplay} شخص تتابعهما} few {{followingCountDisplay} أشخاص تتابعهم} many {{followingCountDisplay} أشخاص تتابعهم} other {{followingCountDisplay} أشخاص تتابعهم}}.",
   "domain_block_modal.you_will_lose_relationships": "ستفقد جميع المتابعين والأشخاص الذين تتابعهم من هذا الخادم.",
   "domain_block_modal.you_wont_see_posts": "لن ترى منشورات أو إشعارات من المستخدمين على هذا الخادم.",
-  "domain_pill.activitypub_lets_connect": "يتيح لك التواصل والتفاعل مع الناس ليس فقط على ماستدون، ولكن عبر تطبيقات اجتماعية مختلفة أيضا.",
-  "domain_pill.activitypub_like_language": "إنّ ActivityPub مثل لغة ماستدون التي يتحدث بها مع شبكات اجتماعية أخرى.",
-  "domain_pill.server": "الخادِم",
-  "domain_pill.their_handle": "مُعرفه:",
-  "domain_pill.their_server": "بيتهم الرقمي، حيث تُستضاف كافة منشوراتهم.",
-  "domain_pill.their_username": "مُعرّفُهم الفريد على الخادم. من الممكن العثور على مستخدمين بنفس اسم المستخدم على خوادم مختلفة.",
-  "domain_pill.username": "اسم المستخدم",
-  "domain_pill.whats_in_a_handle": "ما المقصود بالمُعرِّف؟",
-  "domain_pill.who_they_are": "بما أن المُعرّفات تحدد هوية الشخص ومكان وجوده، فبإمكانك التفاعل مع الأشخاص عبر الويب الاجتماعي لـ <button>المنصات التي تعمل بواسطة أكتيفيتي بوب</button>.",
-  "domain_pill.who_you_are": "بما أن مُعرّفك يحدد هويتك ومكان وجوده، فبإمكانك الآخرين التفاعل معك عبر الويب الاجتماعي لـ <button>المنصات التي تعمل بواسطة أكتيفيتي بوب</button>.",
-  "domain_pill.your_handle": "عنوانك الكامل:",
-  "domain_pill.your_server": "موطِنك الرقمي، حيث توجد فيه كافة منشوراتك. ألا يعجبك المكان؟ يمكنك الانتقال بين الخوادم في أي وقت واصطحاب متابعيك أيضاً.",
-  "domain_pill.your_username": "معرفك الفريد على هذا الخادم. من الممكن العثور على مستخدمين بنفس إسم المستخدم على خوادم مختلفة.",
   "dropdown.empty": "حدد خيارا",
   "email_subscriptions.email": "البريد الإلكتروني",
   "email_subscriptions.form.action": "اشترك",
@@ -533,7 +519,6 @@
   "footer.status": "الحالة",
   "footer.terms_of_service": "شروط الخدمة",
   "form_field.optional": "(اختياري)",
-  "generic.saved": "تم الحفظ",
   "getting_started.heading": "استعدّ للبدء",
   "hashtag.admin_moderation": "افتح الواجهة الإشراف لـ #{name}",
   "hashtag.browse": "تصفح المنشورات التي تحتوي #{hashtag}",
diff --git a/app/javascript/mastodon/locales/ast.json b/app/javascript/mastodon/locales/ast.json
index 41ae7b44d2..8ec910816f 100644
--- a/app/javascript/mastodon/locales/ast.json
+++ b/app/javascript/mastodon/locales/ast.json
@@ -65,7 +65,6 @@
   "account_edit.field_edit_modal.name_hint": "Por exemplu: \"Web personal\"",
   "account_edit.profile_tab.hint.title": "Les visualizaciones sigan variando",
   "account_edit.verified_modal.details": "Añade credibilidá al to perfil de Mastodon verificando enllaces a webs personales. Asina ye como funciona:",
-  "account_note.placeholder": "Calca equí p'amestar una nota",
   "admin.dashboard.retention.average": "Media",
   "admin.dashboard.retention.cohort": "Mes de rexistru",
   "admin.dashboard.retention.cohort_size": "Perfiles nuevos",
@@ -175,8 +174,6 @@
   "domain_block_modal.block": "Bloquiar el sirvidor",
   "domain_block_modal.they_cant_follow": "Naide d'esti sirvidor pue siguite.",
   "domain_block_modal.title": "Bloquiar el dominiu?",
-  "domain_pill.server": "Sirvidor",
-  "domain_pill.username": "Nome d'usuariu",
   "embed.instructions": "Empotra esta publicación nel to sitiu web copiando'l códigu d'abaxo.",
   "embed.preview": "Va apaecer asina:",
   "emoji_button.activity": "Actividá",
@@ -251,7 +248,6 @@
   "footer.source_code": "Ver el códigu fonte",
   "footer.status": "Estáu",
   "footer.terms_of_service": "Términos del serviciu",
-  "generic.saved": "Guardóse",
   "getting_started.heading": "Comienzu",
   "hashtag.column_header.tag_mode.all": "y {additional}",
   "hashtag.column_header.tag_mode.any": "o {additional}",
diff --git a/app/javascript/mastodon/locales/az.json b/app/javascript/mastodon/locales/az.json
index fa80ce6bec..94b65c1426 100644
--- a/app/javascript/mastodon/locales/az.json
+++ b/app/javascript/mastodon/locales/az.json
@@ -132,7 +132,6 @@
   "account_edit.field_edit_modal.discard_message": "Saxlanılmamış dəyişiklikləriniz var. Onları silmək istədiyinizə əminsiniz?",
   "account_edit.field_edit_modal.edit_title": "Özəl xanaya düzəliş",
   "account_edit.field_edit_modal.length_warning": "Tövsiyə edilən xarakter limiti aşıldı. Mobil istifadəçilər xananızın tamamını görməyə bilər.",
-  "account_note.placeholder": "Qeyd əlavə etmək üçün kliklə",
   "admin.dashboard.daily_retention": "Qeydiyyatdan sonrakı günə görə istifadəçi qalma dərəcəsi",
   "admin.dashboard.monthly_retention": "Qeydiyyatdan sonrakı aya görə istifadəçi qalma dərəcəsi",
   "admin.dashboard.retention.average": "Orta",
@@ -307,19 +306,6 @@
   "domain_block_modal.you_will_lose_num_followers": "Siz {followersCount, plural, one {{followersCountDisplay} follower} other {{followersCountDisplay} izləyici}} və izlədiyiniz {followingCount, plural, one {{followingCountDisplay} istifadəçini} other {{followingCountDisplay} istifadəçini}} itirəcəksiniz.",
   "domain_block_modal.you_will_lose_relationships": "Bu serverdən olan bütün izləyicilərinizi və izlədiklərinizi itirəcəksiniz.",
   "domain_block_modal.you_wont_see_posts": "Bu serverdən olan paylaşımları və istifadəçilərdən olan bildirişləri görməyəcəksiniz.",
-  "domain_pill.activitypub_lets_connect": "Bu, təkcə Mastodonda deyil, həm də müxtəlif sosial tətbiqlərdə insanlarla əlaqə saxlamağa və onlarla ünsiyyət qurmağa imkan verir.",
-  "domain_pill.activitypub_like_language": "ActivityPub-ı Mastodonun digər sosial şəbəkələrlə danışdığı dil kimi düşünə bilərsiniz.",
-  "domain_pill.server": "Server",
-  "domain_pill.their_handle": "Tanıdıcısı:",
-  "domain_pill.their_server": "Onların bütün paylaşımlarının yaşadığı rəqəmsal ev.",
-  "domain_pill.their_username": "Serverdəki unikal identifikator. Fərqli serverlərdə eyni istifadəçi adı ilə istifadəçilər tapmaq mümkündür.",
-  "domain_pill.username": "İstifadəçi adı",
-  "domain_pill.whats_in_a_handle": "Tanıdıcı nədir?",
-  "domain_pill.who_they_are": "Tanıdıcılar kimin kim olduğunu və harada olduğunu bildirdiyi üçün siz <button>ActivityPub tərəfindən dəstəklənən platformaların</button> sosial şəbəkəsindəki bütün insanlarla əlaqə saxlaya bilərsiniz.",
-  "domain_pill.who_you_are": "Tanıdıcılar sizin kim olduğunuzu və harada olduğunuzu bildirdiyi üçün <button>ActivityPub tərəfindən dəstəklənən platformaların</button> sosial şəbəkəsindəki bütün insanlar sizlə əlaqə saxlaya bilər.",
-  "domain_pill.your_handle": "Tanıdıcınız:",
-  "domain_pill.your_server": "Bütün paylaşımlarınızın yaşadığı rəqəmsal ev. Buranı bəyənmirsiniz? İstədiyiniz vaxt serverdən köçün və izləyicilərinizi də aparın.",
-  "domain_pill.your_username": "Serverdəki unikal identifikatoruz. Fərqli serverlərdə eyni istifadəçi adı ilə istifadəçilər tapmaq mümkündür.",
   "dropdown.empty": "Bir seçim et",
   "embed.instructions": "Aşağıdakı kodu kopyalayaraq bu postu veb-saytınıza yerləşdirin.",
   "embed.preview": "Belə görünəcək:",
@@ -419,7 +405,6 @@
   "footer.source_code": "Mənbə koduna bax",
   "footer.status": "Status",
   "footer.terms_of_service": "Xidmət şərtləri",
-  "generic.saved": "Saxlanıldı",
   "getting_started.heading": "Başlayaq",
   "hashtag.admin_moderation": "#{name} üçün moderasiya interfeysini aç",
   "hashtag.browse": "#{hashtag} göndərişlərinə bax",
diff --git a/app/javascript/mastodon/locales/be.json b/app/javascript/mastodon/locales/be.json
index b8b00d79b1..098675126b 100644
--- a/app/javascript/mastodon/locales/be.json
+++ b/app/javascript/mastodon/locales/be.json
@@ -257,7 +257,6 @@
   "account_edit_tags.tag_status_count": "{count, plural, one {допіс} few {допісы} many {допісаў} other {допісаў}}",
   "account_list.hidden_notice": "Гэта бачыце толькі Вы. Каб паказаць гэты спіс іншым, перайдзіце ў <link>{page} > {modal} > {field}</link>.",
   "account_list.total": "{total, plural,one {# уліковы запіс} few{# уліковыя запісы} other {# уліковых запісаў}}",
-  "account_note.placeholder": "Націсніце, каб дадаць нататку",
   "admin.dashboard.daily_retention": "Штодзённы паказчык утрымання карыстальнікаў пасля рэгістрацыі",
   "admin.dashboard.monthly_retention": "Штомесячны паказчык утрымання карыстальнікаў пасля рэгістрацыі",
   "admin.dashboard.retention.average": "Сярэдняе",
@@ -596,19 +595,6 @@
   "domain_block_modal.you_will_lose_num_followers": "Вы страціце {followersCount, plural, one {{followersCountDisplay} падпісчыка} other {{followersCountDisplay} падпісчыкаў}} і {followingCount, plural, one {{followingCountDisplay} чалавека, на якога падпісаны} other {{followingCountDisplay} людзей, на якіх падпісаны}}.",
   "domain_block_modal.you_will_lose_relationships": "Вы страціце ўсіх падпісчыкаў і людзей на якіх падпісаны на гэтым серверы.",
   "domain_block_modal.you_wont_see_posts": "Вы не ўбачыце допісаў і апавяшчэнняў ад карыстальнікаў з гэтага сервера.",
-  "domain_pill.activitypub_lets_connect": "Ён дазваляе вам узаемадзейнічаць не толькі з карыстальнікамі Mastodon, але і розных іншых сацыяльных платформ.",
-  "domain_pill.activitypub_like_language": "ActivityPub — гэта мова, на якой Mastodon размаўляе з іншымі сацыяльнымі сеткамі.",
-  "domain_pill.server": "Сервер",
-  "domain_pill.their_handle": "Ідэнтыфікатар карыстальніка:",
-  "domain_pill.their_server": "Лічбавы дом, дзе захоўваюцца ўсе допісы.",
-  "domain_pill.their_username": "Унікальны ідэнтыфікатар карыстальніка на серверы. Можна знайсці карыстальнікаў з аднолькавым іменем карыстальніка на розных серверах.",
-  "domain_pill.username": "Імя карыстальніка",
-  "domain_pill.whats_in_a_handle": "Што такое ідэнтыфікатар карыстальніка?",
-  "domain_pill.who_they_are": "Паколькі ідэнтыфікатары кажуць аб тым, хто гэты чалавек і якім серверам ён карыстаецца, Вы можаце ўзаемадзейнічаць з карыстальнікамі <button> платформ, якія падтрымліваюць ActivityPub</button>.",
-  "domain_pill.who_you_are": "Паколькі Ваш ідэнтыфікатар кажа аб тым, хто Вы і дзе знаходзіцеся, людзі могуць узаемадзейнічаць з вамі ў сацыяльнай сетцы <button> на платформах, якія падтрымліваюць ActivityPub</button>.",
-  "domain_pill.your_handle": "Ваш ідэнтыфікатар:",
-  "domain_pill.your_server": "Ваш лічбавы дом, дзе захоўваюцца ўсе вашыя допісы. Не падабаецца гэты сервер? Змяніце сервер у любы час з захаваннем сваіх падпісчыкаў.",
-  "domain_pill.your_username": "Ваш унікальны ідэнтыфікатар на гэтым серверы. Можна знайсці карыстальнікаў з аднолькавым іменем карыстальніка на розных серверах.",
   "dropdown.empty": "Выбраць варыянт",
   "email_subscriptions.email": "Эл. пошта",
   "email_subscriptions.form.action": "Падпісацца",
@@ -745,7 +731,6 @@
   "footer.terms_of_service": "Умовы выкарыстання",
   "form_error.blank": "Поле не можа быць пустым.",
   "form_field.optional": "(неабавязкова)",
-  "generic.saved": "Захавана",
   "getting_started.heading": "Пачатак працы",
   "hashtag.admin_moderation": "Адкрыць інтэрфейс мадэратара для #{name}",
   "hashtag.browse": "Праглядзець допісы ў #{hashtag}",
@@ -938,7 +923,7 @@
   "notification.admin.sign_up.name_and_others": "{name} і {count, plural, one {# іншы(-ая)} other {# іншых}} зарэгістраваліся",
   "notification.annual_report.message": "Вас чакае Ваш #Wrapstodon нумар {year}! Падзяліцеся сваімі галоўнымі падзеямі і запамінальнымі момантамі ў Mastodon!",
   "notification.annual_report.view": "Перайсці да #Wrapstodon",
-  "notification.collection_update": "{name} рэдагаваў(-ла) калекцыю з Вамі",
+  "notification.collection_update": "{name} рэдагаваў(-ла) калекцыю, у якой ёсць Вы",
   "notification.favourite": "{name} упадабаў(-ла) Ваш допіс",
   "notification.favourite.name_and_others_with_link": "{name} і <a>{count, plural, one {# іншы(-ая)} other {# іншыя}}</a> ўпадабалі Ваш допіс",
   "notification.favourite_pm": "{name} упадабаў(-ла) Вашае прыватнае згадванне",
diff --git a/app/javascript/mastodon/locales/bg.json b/app/javascript/mastodon/locales/bg.json
index 0eb1be738c..58106c55a8 100644
--- a/app/javascript/mastodon/locales/bg.json
+++ b/app/javascript/mastodon/locales/bg.json
@@ -80,7 +80,6 @@
   "account.unmute": "Без заглушаване на @{name}",
   "account.unmute_notifications_short": "Включване на известията",
   "account.unmute_short": "Без заглушаване",
-  "account_note.placeholder": "Щракнете, за да добавите бележка",
   "admin.dashboard.daily_retention": "Ниво на задържани на потребители след регистрация, в дни",
   "admin.dashboard.monthly_retention": "Ниво на задържани на потребители след регистрация, в месеци",
   "admin.dashboard.retention.average": "Средно",
@@ -266,19 +265,6 @@
   "domain_block_modal.you_will_lose_num_followers": "Ще загубите {followersCount, plural, one {{followersCountDisplay} последовател} other {{followersCountDisplay} последователи}} и {followingCount, plural, one {{followingCountDisplay} лице, което следвате} other {{followingCountDisplay} души, които следвате}}.",
   "domain_block_modal.you_will_lose_relationships": "Ще загубите всичките си последователи и хората, които следвате от този сървър.",
   "domain_block_modal.you_wont_see_posts": "Няма да виждате публикации или известия от потребителите на този сървър.",
-  "domain_pill.activitypub_lets_connect": "Позволява ви да се свързвате и взаимодействате с хора не само в Mastodon, но и през различни социални приложения.",
-  "domain_pill.activitypub_like_language": "ActivityPub е като език на Mastodon, говорещ с други социални мрежи.",
-  "domain_pill.server": "Сървър",
-  "domain_pill.their_handle": "Техният адрес:",
-  "domain_pill.their_server": "Цифровият им дом, където живеят всичките им публикации.",
-  "domain_pill.their_username": "Неповторимият им идентификатор на сървъра им. Възможно е да се намерят потребители със същото потребителско име на други сървъри.",
-  "domain_pill.username": "Потребителско име",
-  "domain_pill.whats_in_a_handle": "Как се съставя адресът?",
-  "domain_pill.who_they_are": "Адресът показва за някой кой е той и къде се намира. Това ви позволява да общувате с всички в социалната мрежа от <button>платформите поддържащи ActivityPub</button>.",
-  "domain_pill.who_you_are": "Адресът ви показва кой сте и къде се намирате. Това ви позволява да общувате с всички в социалната мрежа от <button>платформите поддържащи ActivityPub</button>.",
-  "domain_pill.your_handle": "Вашият адрес:",
-  "domain_pill.your_server": "Цифровият ви дом, където живеят всичките ви публикации. Не харесвате ли този? Прехвърляте се на сървъри по всяко време и докарвате последователите си също.",
-  "domain_pill.your_username": "Неповторимият ви идентификатор на този сървър. Възможно е да се намерят потребители със същото потребителско име на други сървъри.",
   "dropdown.empty": "Изберете възможност",
   "embed.instructions": "Вградете публикацията в уебсайта си, копирайки кода долу.",
   "embed.preview": "Ето как ще изглежда:",
@@ -379,7 +365,6 @@
   "footer.source_code": "Преглед на изходния код",
   "footer.status": "Състояние",
   "footer.terms_of_service": "Условия на услугата",
-  "generic.saved": "Запазено",
   "getting_started.heading": "Първи стъпки",
   "hashtag.admin_moderation": "Отваряне на модериращия интерфейс за #{name}",
   "hashtag.browse": "Разглеждане на публикации в #{hashtag}",
diff --git a/app/javascript/mastodon/locales/bn.json b/app/javascript/mastodon/locales/bn.json
index ea4c3e9eaf..f9cbc3f1ca 100644
--- a/app/javascript/mastodon/locales/bn.json
+++ b/app/javascript/mastodon/locales/bn.json
@@ -61,7 +61,6 @@
   "account.unmute": "@{name} র কার্যকলাপ আবার দেখুন",
   "account.unmute_notifications_short": "বিজ্ঞপ্তি শব্দ চালু করো",
   "account.unmute_short": "আনমিউট করুন",
-  "account_note.placeholder": "নোট যোগ করতে ক্লিক করুন",
   "admin.dashboard.daily_retention": "সাইন আপের পর দিনে ব্যবহারকারীর ধরে রাখার হার",
   "admin.dashboard.monthly_retention": "সাইন আপের পর, দিনে ব্যবহারকারীর ধরে রাখার হার",
   "admin.dashboard.retention.average": "গড়",
@@ -209,7 +208,6 @@
   "footer.about": "পরিচিতি",
   "footer.get_app": "অ্যাপ নামাও",
   "footer.status": "অবস্থা",
-  "generic.saved": "সংরক্ষণ হয়েছে",
   "getting_started.heading": "শুরু করা",
   "hashtag.column_header.tag_mode.all": "এবং {additional}",
   "hashtag.column_header.tag_mode.any": "অথবা {additional}",
diff --git a/app/javascript/mastodon/locales/br.json b/app/javascript/mastodon/locales/br.json
index 635858e273..9ec1ff452d 100644
--- a/app/javascript/mastodon/locales/br.json
+++ b/app/javascript/mastodon/locales/br.json
@@ -105,7 +105,6 @@
   "account_edit.save": "Enrollañ",
   "account_edit.upload_modal.back": "Distreiñ",
   "account_edit.upload_modal.step_upload.header": "Dibab ur skeudenn",
-  "account_note.placeholder": "Klikit evit ouzhpennañ un notenn",
   "admin.dashboard.daily_retention": "Feur azdalc'h an implijerien·ezed dre zeiz goude bezañ lakaet o anv",
   "admin.dashboard.monthly_retention": "Feur azdalc'h an implijerien·ezed dre viz goude bezañ lakaet o anv",
   "admin.dashboard.retention.average": "Keidenn",
@@ -276,11 +275,6 @@
   "domain_block_modal.block": "Stankañ ar servijer",
   "domain_block_modal.block_account_instead": "Stankañ @{name} kentoc'h",
   "domain_block_modal.title": "Stankañ an domani?",
-  "domain_pill.server": "Dafariad",
-  "domain_pill.their_handle": "H·ec'h anaouder:",
-  "domain_pill.username": "Anv-implijer",
-  "domain_pill.whats_in_a_handle": "Petra eo an anaouder?",
-  "domain_pill.your_handle": "Hoc'h anaouder:",
   "dropdown.empty": "Diuzit un dibarzh",
   "email_subscriptions.email": "Postel",
   "email_subscriptions.form.action": "Koumanantiñ",
@@ -368,7 +362,6 @@
   "footer.source_code": "Gwelet ar c'hod mammenn",
   "footer.status": "Statud",
   "footer.terms_of_service": "Divizoù implijout hollek",
-  "generic.saved": "Enrollet",
   "getting_started.heading": "Loc'hañ",
   "hashtag.admin_moderation": "Digeriñ an etrefas evezhiañ evit #{name}",
   "hashtag.browse": "Furchal dre an embannadurioù gant #{hashtag}",
diff --git a/app/javascript/mastodon/locales/bs.json b/app/javascript/mastodon/locales/bs.json
index 48d635dca9..7044601314 100644
--- a/app/javascript/mastodon/locales/bs.json
+++ b/app/javascript/mastodon/locales/bs.json
@@ -1,7 +1,6 @@
 {
   "account.badges.bot": "Bot",
   "account.cancel_follow_request": "Withdraw follow request",
-  "account_note.placeholder": "Click to add a note",
   "column.pins": "Pinned post",
   "community.column_settings.media_only": "Media only",
   "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json
index 223209ddd2..7b72137111 100644
--- a/app/javascript/mastodon/locales/ca.json
+++ b/app/javascript/mastodon/locales/ca.json
@@ -120,7 +120,6 @@
   "account.unmute": "Deixa de silenciar @{name}",
   "account.unmute_notifications_short": "Deixa de silenciar les notificacions",
   "account.unmute_short": "Deixa de silenciar",
-  "account_note.placeholder": "Clica per a afegir-hi una nota",
   "admin.dashboard.daily_retention": "Ràtio de retenció d'usuaris per dia, després de registrar-se",
   "admin.dashboard.monthly_retention": "Ràtio de retenció d'usuaris per mes, després de registrar-se",
   "admin.dashboard.retention.average": "Mitjana",
@@ -346,19 +345,6 @@
   "domain_block_modal.you_will_lose_num_followers": "Perdreu {followersCount, plural, one {{followersCountDisplay} seguidor} other {{followersCountDisplay} seguidors}} i {followingCount, plural, one {{followingCountDisplay} persona} other {{followingCountDisplay} persones}} que seguiu.",
   "domain_block_modal.you_will_lose_relationships": "Perdreu seguidors i gent a qui seguiu d'aquest servidor.",
   "domain_block_modal.you_wont_see_posts": "No veureu ni les publicacions ni les notificacions dels usuaris d'aquest servidor.",
-  "domain_pill.activitypub_lets_connect": "Us permet connectar i interactuar amb persones a Mastodon i també a d'altres apps socials.",
-  "domain_pill.activitypub_like_language": "ActivityPub és el llenguatge que Mastodon parla amb altres xarxes socials.",
-  "domain_pill.server": "Servidor",
-  "domain_pill.their_handle": "El seu identificador:",
-  "domain_pill.their_server": "La seva llar digital, on són totes les seves publicacions.",
-  "domain_pill.their_username": "El seu identificador únic al servidor. És possible que hi hagi usuaris amb el mateix nom d'usuari a diferents servidors.",
-  "domain_pill.username": "Nom d'usuari",
-  "domain_pill.whats_in_a_handle": "Què constitueix un identificador?",
-  "domain_pill.who_they_are": "Com que un identificador expressa qui i on s'és, podeu interactuar amb persones d'arreu de les <button>plataformes que funcionen amb ActivityPub</button>.",
-  "domain_pill.who_you_are": "Com que un identificador expressa qui i on sou, les persones d'arreu de les <button>plataformes que funcionen amb ActivityPub</button> poden interactuar amb vosaltres.",
-  "domain_pill.your_handle": "El vostre identificador:",
-  "domain_pill.your_server": "La vostra llar digital, on són totes les vostres publicacions. No us agrada aquesta? Canvieu de servidor quan vulgueu i emporteu-vos els vostres seguidors.",
-  "domain_pill.your_username": "El vostre identificador únic en aquest servidor. Hi pot haver usuaris amb el mateix nom a diferents servidors.",
   "dropdown.empty": "Seleccioneu una opció",
   "embed.instructions": "Incrusta aquest tut a la teva pàgina web copiant el codi següent.",
   "embed.preview": "Aquest aspecte tindrà:",
@@ -468,7 +454,6 @@
   "footer.status": "Estat",
   "footer.terms_of_service": "Condicions de servei",
   "form_field.optional": "(opcional)",
-  "generic.saved": "Desat",
   "getting_started.heading": "Primeres passes",
   "hashtag.admin_moderation": "Obre la interfície de moderació per a #{name}",
   "hashtag.browse": "Fulleja publicacions a #{hashtag}",
diff --git a/app/javascript/mastodon/locales/ckb.json b/app/javascript/mastodon/locales/ckb.json
index a58ae647de..8a7ff76c6f 100644
--- a/app/javascript/mastodon/locales/ckb.json
+++ b/app/javascript/mastodon/locales/ckb.json
@@ -60,7 +60,6 @@
   "account.unmute": "بێدەنگکردنی @{name}",
   "account.unmute_notifications_short": "ئاگادارکردنەوەکان بێدەنگ بکەرەوە",
   "account.unmute_short": "بێدەنگی مەکە",
-  "account_note.placeholder": "کرتەبکە بۆ زیادکردنی تێبینی",
   "admin.dashboard.daily_retention": "ڕێژەی مانەوەی بەکارهێنەر بەپێی ڕۆژ دوای ناو تۆمارکردن",
   "admin.dashboard.monthly_retention": "ڕێژەی مانەوەی بەکارهێنەر بەپێی مانگ دوای ناو تۆمارکردن",
   "admin.dashboard.retention.average": "ڕێژە",
@@ -250,7 +249,6 @@
   "footer.privacy_policy": "سیاسەتی تایبەتمەندێتی",
   "footer.source_code": "پیشاندانی کۆدی سەرچاوە",
   "footer.status": "دۆخ",
-  "generic.saved": "پاشکەوتکرا",
   "getting_started.heading": "دەست پێکردن",
   "hashtag.column_header.tag_mode.all": "و {additional}",
   "hashtag.column_header.tag_mode.any": "یا {additional}",
diff --git a/app/javascript/mastodon/locales/co.json b/app/javascript/mastodon/locales/co.json
index 03e36a6b2b..aa4704c56b 100644
--- a/app/javascript/mastodon/locales/co.json
+++ b/app/javascript/mastodon/locales/co.json
@@ -30,7 +30,6 @@
   "account.unendorse": "Ùn fà figurà nant'à u prufilu",
   "account.unfollow": "Ùn siguità più",
   "account.unmute": "Ùn piattà più @{name}",
-  "account_note.placeholder": "Senza cummentariu",
   "alert.rate_limited.message": "Pruvate ancu dop'à {retry_time, time, medium}.",
   "alert.rate_limited.title": "Ghjettu limitatu",
   "alert.unexpected.message": "Un prublemu inaspettatu hè accadutu.",
@@ -133,7 +132,6 @@
   "follow_request.authorize": "Auturizà",
   "follow_request.reject": "Righjittà",
   "follow_requests.unlocked_explanation": "U vostru contu ùn hè micca privatu, ma a squadra d'amministrazione di {domain} pensa chì e dumande d'abbunamentu di questi conti anu bisognu d'esse verificate manualmente.",
-  "generic.saved": "Salvatu",
   "getting_started.heading": "Per principià",
   "hashtag.column_header.tag_mode.all": "è {additional}",
   "hashtag.column_header.tag_mode.any": "o {additional}",
diff --git a/app/javascript/mastodon/locales/cs.json b/app/javascript/mastodon/locales/cs.json
index 8758c92c33..9b11c74664 100644
--- a/app/javascript/mastodon/locales/cs.json
+++ b/app/javascript/mastodon/locales/cs.json
@@ -138,7 +138,6 @@
   "account_edit.custom_fields.placeholder": "Přidejte svá zájmena, externí odkazy nebo cokoliv jiného, co chcete sdílet.",
   "account_edit.custom_fields.title": "Vlastní pole",
   "account_edit.save": "Uložit",
-  "account_note.placeholder": "Klikněte pro přidání poznámky",
   "admin.dashboard.daily_retention": "Míra udržení uživatelů podle dne po registraci",
   "admin.dashboard.monthly_retention": "Míra udržení uživatelů podle měsíce po registraci",
   "admin.dashboard.retention.average": "Průměr",
@@ -404,19 +403,6 @@
   "domain_block_modal.you_will_lose_num_followers": "Ztratíte {followersCount, plural, one {{followersCountDisplay} sledujícího} few {{followersCountDisplay} sledující} many {{followersCountDisplay} sledujících} other {{followersCountDisplay} sledujících}} a {followingCount, plural, one {{followingCountDisplay} sledovaného} few {{followingCountDisplay} sledované} many {{followingCountDisplay} sledovaných} other {{followingCountDisplay} sledovaných}}.",
   "domain_block_modal.you_will_lose_relationships": "Ztratíte všechny sledující a sledované z tohoto serveru.",
   "domain_block_modal.you_wont_see_posts": "Neuvidíte příspěvky ani upozornění od uživatelů z tohoto serveru.",
-  "domain_pill.activitypub_lets_connect": "Umožňuje vám spojit se a komunikovat s lidmi nejen na Mastodonu, ale i na jiných sociálních aplikacích.",
-  "domain_pill.activitypub_like_language": "ActivityPub je jako jazyk, kterým Mastodon mluví s jinými sociálními sítěmi.",
-  "domain_pill.server": "Server",
-  "domain_pill.their_handle": "Handle:",
-  "domain_pill.their_server": "Jejich digitální domov, kde žijí všechny jejich příspěvky.",
-  "domain_pill.their_username": "Jejich jedinečný identifikátor na jejich serveru. Je možné, že na jiných serverech jsou uživatelé se stejným uživatelským jménem.",
-  "domain_pill.username": "Uživatelské jméno",
-  "domain_pill.whats_in_a_handle": "Co obsahuje handle?",
-  "domain_pill.who_they_are": "Protože handly říkají kdo je kdo a také kde, je možné interagovat s lidmi napříč sociálním webem, skládajícím se z <button>platforem postavených na ActivityPub</button>.",
-  "domain_pill.who_you_are": "Protože handle říká kdo jsi a kde jsi, mohou s tebou komunikovat lidé napříč sociálním webem, skládajícím se z <button>platforem postavených na ActivityPub</button>.",
-  "domain_pill.your_handle": "Tvůj handle:",
-  "domain_pill.your_server": "Tvůj digitální domov, kde žijí všechny tvé příspěvky. Nelíbí se ti? Kdykoliv se přesuň na jiný server a vezmi si sebou i své sledující.",
-  "domain_pill.your_username": "Tvůj jedinečný identifikátor na tomto serveru. Je možné najít uživatele se stejným uživatelským jménem na jiných serverech.",
   "dropdown.empty": "Vyberte možnost",
   "embed.instructions": "Pro přidání příspěvku na vaši webovou stránku zkopírujte níže uvedený kód.",
   "embed.preview": "Takhle to bude vypadat:",
@@ -528,7 +514,6 @@
   "footer.status": "Stav",
   "footer.terms_of_service": "Obchodní podmínky",
   "form_field.optional": "(volitelné)",
-  "generic.saved": "Uloženo",
   "getting_started.heading": "Začínáme",
   "hashtag.admin_moderation": "Otevřít moderátorské rozhraní pro #{name}",
   "hashtag.browse": "Procházet příspěvky na #{hashtag}",
diff --git a/app/javascript/mastodon/locales/cy.json b/app/javascript/mastodon/locales/cy.json
index 9e3b3901b6..f227cebd7f 100644
--- a/app/javascript/mastodon/locales/cy.json
+++ b/app/javascript/mastodon/locales/cy.json
@@ -257,7 +257,6 @@
   "account_edit_tags.tag_status_count": "{count, plural, one {# postiad} other {# postsiad}}",
   "account_list.hidden_notice": "Dim ond chi sy'n gallu gweld hyn. I ddangos y rhestr hon i eraill, ewch i<link> {page} > {modal} > {field}</link> .",
   "account_list.total": "{total, plural, one {# cyfrif} other {# cyfrif}}",
-  "account_note.placeholder": "Clicio i ychwanegu nodyn",
   "admin.dashboard.daily_retention": "Cyfradd cadw defnyddwyr fesul diwrnod ar ôl cofrestru",
   "admin.dashboard.monthly_retention": "Cyfradd cadw defnyddwyr fesul mis ar ôl cofrestru",
   "admin.dashboard.retention.average": "Cyfartaledd",
@@ -592,19 +591,6 @@
   "domain_block_modal.you_will_lose_num_followers": "Byddwch yn colli {followersCount, plural, one {{followersCountDisplay} dilynwr} other {{followersCountDisplay} dilynwr}} a {followingCount, plural, one {{followingCountDisplay} person rydych yn dilyn} other {{followingCountDisplay} o bobl rydych yn eu dilyn}}.",
   "domain_block_modal.you_will_lose_relationships": "Byddwch yn colli'r holl ddilynwyr a phobl rydych chi'n eu dilyn o'r gweinydd hwn.",
   "domain_block_modal.you_wont_see_posts": "Fyddwch chi ddim yn gweld postiadau na hysbysiadau gan ddefnyddwyr ar y gweinydd hwn.",
-  "domain_pill.activitypub_lets_connect": "Mae'n caniatáu ichi gysylltu a rhyngweithio â phobl nid yn unig ar Mastodon, ond ar draws gwahanol apiau cymdeithasol hefyd.",
-  "domain_pill.activitypub_like_language": "Mae ActivityPub fel yr iaith y mae Mastodon yn ei siarad â rhwydweithiau cymdeithasol eraill.",
-  "domain_pill.server": "Gweinydd",
-  "domain_pill.their_handle": "Eu handlen:",
-  "domain_pill.their_server": "Eu cartref digidol, lle mae eu holl negeseuon yn byw.",
-  "domain_pill.their_username": "Eu dynodwr unigryw ar eu gweinydd. Mae'n bosibl dod o hyd i ddefnyddwyr gyda'r un enw defnyddiwr ar wahanol weinyddion.",
-  "domain_pill.username": "Enw Defnyddiwr",
-  "domain_pill.whats_in_a_handle": "Beth sydd mewn handlen?",
-  "domain_pill.who_they_are": "Gan fod handlen yn dweud pwy yw rhywun a ble maen nhw, gallwch chi ryngweithio â phobl ar draws gwe gymdeithasol <button>llwyfannau wedi'u pweru gan ActivityPub</button>.",
-  "domain_pill.who_you_are": "Oherwydd bod eich handlen yn dweud pwy ydych chi a ble rydych chi, gall pobl ryngweithio â chi ar draws gwe gymdeithasol <button>llwyfannau wedi'u pweru gan ActivityPub</button>.",
-  "domain_pill.your_handle": "Eich handlen:",
-  "domain_pill.your_server": "Eich cartref digidol, lle mae'ch holl bostiadau'n byw. Ddim yn hoffi'r un hon? Trosglwyddwch weinyddion ar unrhyw adeg a dewch â'ch dilynwyr hefyd.",
-  "domain_pill.your_username": "Eich dynodwr unigryw ar y gweinydd hwn. Mae'n bosibl dod o hyd i ddefnyddwyr gyda'r un enw defnyddiwr ar wahanol weinyddion.",
   "dropdown.empty": "Dewis dewis",
   "email_subscriptions.email": "E-bost",
   "email_subscriptions.form.action": "Tanysgrifio",
@@ -741,7 +727,6 @@
   "footer.terms_of_service": "Telerau gwasanaeth",
   "form_error.blank": "Gall y maes ddim fod yn wag.",
   "form_field.optional": "(dewisol)",
-  "generic.saved": "Wedi'i Gadw",
   "getting_started.heading": "Dechrau arni",
   "hashtag.admin_moderation": "Agor rhyngwyneb cymedroli #{name}",
   "hashtag.browse": "Pori postiadau yn #{hashtag}",
diff --git a/app/javascript/mastodon/locales/da.json b/app/javascript/mastodon/locales/da.json
index e1e732a0f6..f872af875d 100644
--- a/app/javascript/mastodon/locales/da.json
+++ b/app/javascript/mastodon/locales/da.json
@@ -257,7 +257,6 @@
   "account_edit_tags.tag_status_count": "{count, plural, one {# indlæg} other {# indlæg}}",
   "account_list.hidden_notice": "Dette kan kun ses af dig. Hvis du vil vise denne liste for andre, skal du gå til <link>{page} > {modal} > {field}</link>.",
   "account_list.total": "{total, plural, one {# konto} other {# konti}}",
-  "account_note.placeholder": "Klik for at tilføje notat",
   "admin.dashboard.daily_retention": "Brugerfastholdelsesrate pr. dag efter tilmelding",
   "admin.dashboard.monthly_retention": "Brugerfastholdelsesrate pr. måned efter tilmelding",
   "admin.dashboard.retention.average": "Gennemsnit",
@@ -596,19 +595,6 @@
   "domain_block_modal.you_will_lose_num_followers": "Du vil miste {followersCount, plural, one {{followersCountDisplay} følger} other {{followersCountDisplay} følgere}} og {followingCount, plural, one {{followingCountDisplay} person, du følger} other {{followingCountDisplay} personer, du følger}}.",
   "domain_block_modal.you_will_lose_relationships": "Du vil miste alle følgere og personer, du følger, fra denne server.",
   "domain_block_modal.you_wont_see_posts": "Du vil ikke se indlæg eller notifikationer fra brugere på denne server.",
-  "domain_pill.activitypub_lets_connect": "Det giver dig mulighed for at oprette forbindelse og interagere med mennesker, ikke kun på Mastodon, men også på tværs af forskellige sociale apps.",
-  "domain_pill.activitypub_like_language": "ActivityPub er \"sproget\", som Mastodon taler med andre sociale netværk.",
-  "domain_pill.server": "Server",
-  "domain_pill.their_handle": "Deres handle:",
-  "domain_pill.their_server": "Det digitale hjem, hvor alle indlæggene findes.",
-  "domain_pill.their_username": "Entydig identifikator på denne server. Det er muligt at finde brugere med samme brugernavn på forskellige servere.",
-  "domain_pill.username": "Brugernavn",
-  "domain_pill.whats_in_a_handle": "Hvad indeholder et handle?",
-  "domain_pill.who_they_are": "Da et handle fortæller, hvem nogen er, og hvor de er, kan du interagere med folk på tværs af det sociale net af <button>ActivityPub-drevne platforme</button>.",
-  "domain_pill.who_you_are": "Fordi dit handle fortæller, hvem du er, og hvor du er, kan du interagere med folk på tværs af det sociale net af <button>ActivityPub-drevne platforme</button>.",
-  "domain_pill.your_handle": "Dit handle:",
-  "domain_pill.your_server": "Dit digitale hjem, hvor alle dine indlæg lever. Synes ikke om den her server? Du kan til enhver tid rykke over på en anden server og beholde dine følgere.",
-  "domain_pill.your_username": "Din unikke identifikator på denne server. Det er muligt at finde brugere med samme brugernavn på forskellige servere.",
   "dropdown.empty": "Vælg en indstilling",
   "email_subscriptions.email": "E-mail",
   "email_subscriptions.form.action": "Abonnér",
@@ -745,7 +731,6 @@
   "footer.terms_of_service": "Tjenestevilkår",
   "form_error.blank": "Feltet må ikke være tomt.",
   "form_field.optional": "(valgfri)",
-  "generic.saved": "Gemt",
   "getting_started.heading": "Startmenu",
   "hashtag.admin_moderation": "Åbn modereringsbrugerflade for #{name}",
   "hashtag.browse": "Gennemse indlæg i #{hashtag}",
diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json
index cf1ff3b828..54036bf5bf 100644
--- a/app/javascript/mastodon/locales/de.json
+++ b/app/javascript/mastodon/locales/de.json
@@ -111,11 +111,11 @@
   "account.muted": "Stummgeschaltet",
   "account.mutual": "Ihr folgt einander",
   "account.name.copy": "Adresse kopieren",
-  "account.name.help.domain": "{domain} ist der Server, auf dem das Profil registriert ist und die Beiträge verwaltet werden.",
+  "account.name.help.domain": "{domain} ist der Server, auf dem dieser Profilname registriert ist und dessen Inhalte sich befinden.",
   "account.name.help.domain_self": "{domain} ist der Server, auf dem du registriert bist und deine Beiträge verwaltet werden.",
   "account.name.help.footer": "So wie du E-Mails an andere trotz unterschiedlicher E-Mail-Provider senden kannst, so kannst du auch mit anderen Profilen auf unterschiedlichen Mastodon-Servern interagieren – das funktioniert auch bei allen Fediverse-Apps!",
-  "account.name.help.header": "Deine Adresse im Fediverse ist wie eine E-Mail-Adresse",
-  "account.name.help.username": "{username} ist der Profilname auf deren Server. Es ist möglich, dass jemand auf einem anderen Server den gleichen Profilnamen hat.",
+  "account.name.help.header": "Die Fediverse-Adresse ähnelt einer E-Mail-Adresse",
+  "account.name.help.username": "{username} ist ein einmaliger Profilname auf diesem Server. Es ist möglich, dass jemand auf einem anderen Server den gleichen Profilnamen hat.",
   "account.name.help.username_self": "{username} ist dein Profilname auf diesem Server. Es ist möglich, dass jemand auf einem anderen Server den gleichen Profilnamen hat.",
   "account.name_info": "Was bedeutet das?",
   "account.no_bio": "Keine Beschreibung verfügbar.",
@@ -257,7 +257,6 @@
   "account_edit_tags.tag_status_count": "{count, plural, one {# Beitrag} other {# Beiträge}}",
   "account_list.hidden_notice": "Die Liste ist nur für dich sichtbar. Damit sie für andere zugänglich wird, rufe <link>{page} > {modal}> {field}</link> auf.",
   "account_list.total": "{total, plural, one {# Konto} other {# Konten}}",
-  "account_note.placeholder": "Klicken, um private Anmerkung hinzuzufügen",
   "admin.dashboard.daily_retention": "Verweildauer der Nutzer*innen pro Tag seit der Registrierung",
   "admin.dashboard.monthly_retention": "Verweildauer der Nutzer*innen pro Monat seit der Registrierung",
   "admin.dashboard.retention.average": "Durchschnitt",
@@ -596,19 +595,6 @@
   "domain_block_modal.you_will_lose_num_followers": "Du wirst {followersCount, plural, one {{followersCountDisplay} Follower} other {{followersCountDisplay} Follower}} verlieren und {followingCount, plural, one {{followingCountDisplay} Profil} other {{followingCountDisplay} Profilen}} entfolgen.",
   "domain_block_modal.you_will_lose_relationships": "Du wirst von diesem Server alle Follower und Profile, denen du dort folgst, verlieren.",
   "domain_block_modal.you_wont_see_posts": "Du wirst keine Beiträge oder Benachrichtigungen von Profilen auf diesem Server sehen.",
-  "domain_pill.activitypub_lets_connect": "Somit kannst du dich nicht nur auf Mastodon mit Leuten verbinden und mit ihnen interagieren, sondern über alle sozialen Apps hinweg.",
-  "domain_pill.activitypub_like_language": "ActivityPub ist sozusagen die Sprache, die Mastodon mit anderen sozialen Netzwerken spricht.",
-  "domain_pill.server": "Server",
-  "domain_pill.their_handle": "Vollständige Adresse:",
-  "domain_pill.their_server": "Die digitale Heimat, in der sich alle Beiträge dieses Profils befinden.",
-  "domain_pill.their_username": "Die eindeutige Identifizierung auf einem Server. Es ist möglich, denselben Profilnamen auf verschiedenen Servern im Fediverse zu finden.",
-  "domain_pill.username": "Profilname",
-  "domain_pill.whats_in_a_handle": "Woraus besteht eine Adresse?",
-  "domain_pill.who_they_are": "Adressen teilen mit, wer jemand ist und wo sich jemand aufhält. Daher kannst du mit Leuten im gesamten Social Web interagieren, wenn es eine durch <button>ActivityPub ermöglichte Plattform</button> ist.",
-  "domain_pill.who_you_are": "Deine Adresse teilt mit, wer du bist und wo du dich aufhältst. Daher können andere Leute im gesamten Social Web mit dir interagieren, wenn es eine durch <button>ActivityPub ermöglichte Plattform</button> ist.",
-  "domain_pill.your_handle": "Deine Adresse:",
-  "domain_pill.your_server": "Deine digitale Heimat. Hier „leben“ alle Beiträge von dir. Falls es dir hier nicht gefällt, kannst du jederzeit den Server wechseln und ebenso deine Follower übertragen.",
-  "domain_pill.your_username": "Deine eindeutige Identität auf diesem Server. Es ist möglich, Profile mit dem gleichen Profilnamen auf verschiedenen Servern zu finden.",
   "dropdown.empty": "Option auswählen",
   "email_subscriptions.email": "E-Mail-Adresse",
   "email_subscriptions.form.action": "Abonnieren",
@@ -745,7 +731,6 @@
   "footer.terms_of_service": "Nutzungsbedingungen",
   "form_error.blank": "Feld darf nicht leer sein.",
   "form_field.optional": "(optional)",
-  "generic.saved": "Gespeichert",
   "getting_started.heading": "Auf gehts!",
   "hashtag.admin_moderation": "#{name} moderieren",
   "hashtag.browse": "Beiträge mit #{hashtag} suchen",
diff --git a/app/javascript/mastodon/locales/el.json b/app/javascript/mastodon/locales/el.json
index c4994c8ccd..a725b549ea 100644
--- a/app/javascript/mastodon/locales/el.json
+++ b/app/javascript/mastodon/locales/el.json
@@ -27,7 +27,7 @@
   "account.block": "Αποκλεισμός @{name}",
   "account.block_domain": "Αποκλεισμός τομέα {domain}",
   "account.block_short": "Αποκλεισμός",
-  "account.blocked": "Αποκλεισμένος/η",
+  "account.blocked": "Αποκλεισμένος",
   "account.cancel_follow_request": "Απόσυρση αιτήματος παρακολούθησης",
   "account.copy": "Αντιγραφή συνδέσμου προφίλ",
   "account.direct": "Ιδιωτική επισήμανση @{name}",
@@ -257,7 +257,6 @@
   "account_edit_tags.tag_status_count": "{count, plural, one {# ανάρτηση} other {# αναρτήσεις}}",
   "account_list.hidden_notice": "Αυτό είναι ορατό μόνο σε εσάς. Για να εμφανίσετε αυτή τη λίστα σε άλλους, πηγαίνετε στο <link>{page} > {modal} > {field}</link>.",
   "account_list.total": "{total, plural, one {# λογαριασμός} other {# λογαριασμοί}}",
-  "account_note.placeholder": "Κάνε κλικ για να προσθέσεις σημείωση",
   "admin.dashboard.daily_retention": "Ποσοστό χρηστών που παραμένουν μετά την εγγραφή, ανά ημέρα",
   "admin.dashboard.monthly_retention": "Ποσοστό χρηστών που παραμένουν μετά την εγγραφή, ανά μήνα",
   "admin.dashboard.retention.average": "Μέσος όρος",
@@ -334,7 +333,7 @@
   "block_modal.show_more": "Εμφάνιση περισσότερων",
   "block_modal.they_cant_mention": "Δεν μπορείτε να επισημάνετε, να ακολουθήσετε ή να παραθέσετε ο ένας τον άλλον.",
   "block_modal.they_cant_see_posts": "Δεν μπορεί να δει το περιεχόμενό σου και δε θα δεις το δικό του.",
-  "block_modal.they_will_know": "Μπορούν να δει ότι έχει αποκλειστεί.",
+  "block_modal.they_will_know": "Μπορεί να δει ότι έχει αποκλειστεί.",
   "block_modal.title": "Αποκλεισμός χρήστη;",
   "block_modal.you_wont_see_mentions": "Δε θα βλέπεις τις αναρτήσεις από άλλους που τον επισημαίνουν.",
   "boost_modal.combo": "Μπορείς να πατήσεις {combo} για να το προσπεράσεις την επόμενη φορά",
@@ -596,19 +595,6 @@
   "domain_block_modal.you_will_lose_num_followers": "Θα χάσετε {followersCount, plural, one {{followersCountDisplay} ακόλουθο} other {{followersCountDisplay} ακόλουθους}} και {followingCount, plural, one {{followingCountDisplay} άτομο που ακολουθείτε} other {{followingCountDisplay} άτομα που ακολουθείτε}}.",
   "domain_block_modal.you_will_lose_relationships": "Θα χάσετε όλους τους ακόλουθους και τα άτομα που ακολουθείτε από αυτόν τον διακομιστή.",
   "domain_block_modal.you_wont_see_posts": "Δεν θα βλέπεις αναρτήσεις ή ειδοποιήσεις από χρήστες σε αυτόν το διακομιστή.",
-  "domain_pill.activitypub_lets_connect": "Σου επιτρέπει να συνδεθείς και να αλληλεπιδράσεις με τους ανθρώπους όχι μόνο στο Mastodon, αλλά και σε διαφορετικές κοινωνικές εφαρμογές.",
-  "domain_pill.activitypub_like_language": "Το ActivityPub είναι σαν τη γλώσσα Mastodon μιλάει με άλλα κοινωνικά δίκτυα.",
-  "domain_pill.server": "Διακομιστής",
-  "domain_pill.their_handle": "Το πλήρες όνομα χρήστη:",
-  "domain_pill.their_server": "Το ψηφιακό του σπίτι, όπου ζουν όλες οι αναρτήσεις του.",
-  "domain_pill.their_username": "Το μοναδικό του αναγνωριστικό στο διακομιστή του. Είναι πιθανό να βρεις χρήστες με το ίδιο όνομα χρήστη σε διαφορετικούς διακομιστές.",
-  "domain_pill.username": "Όνομα χρήστη",
-  "domain_pill.whats_in_a_handle": "Τί υπάρχει σε ένα πλήρες όνομα χρήστη;",
-  "domain_pill.who_they_are": "Από τη στιγμή που τα πλήρη ονόματα χρηστών λένε ποιος είναι κάποιος και πού είναι, μπορείς να αλληλεπιδράσεις με άτομα απ' όλο τον κοινωνικό ιστό των <button>πλατφορμών που στηρίζονται στο ActivityPub</button>.",
-  "domain_pill.who_you_are": "Επειδή το πλήρες όνομα χρήστη σου λέει ποιος είσαι και πού βρίσκεσαι, άτομα μπορούν να αλληλεπιδράσουν μαζί σου στον κοινωνικό ιστό των <button>πλατφορμών που στηρίζονται στο ActivityPub</button>.",
-  "domain_pill.your_handle": "Το πλήρες όνομα χρήστη σου:",
-  "domain_pill.your_server": "Το ψηφιακό σου σπίτι, όπου ζουν όλες σου οι αναρτήσεις. Δε σ' αρέσει αυτός; Μετακινήσου σε διακομιστές ανά πάσα στιγμή και πάρε και τους ακόλουθούς σου μαζί.",
-  "domain_pill.your_username": "Το μοναδικό σου αναγνωριστικό σε τούτο τον διακομιστή. Είναι πιθανό να βρεις χρήστες με το ίδιο όνομα χρήστη σε διαφορετικούς διακομιστές.",
   "dropdown.empty": "Διαλέξτε μια επιλογή",
   "email_subscriptions.email": "Email",
   "email_subscriptions.form.action": "Εγγραφή",
@@ -729,7 +715,7 @@
   "follow_suggestions.who_to_follow": "Ποιον να ακολουθήσεις",
   "followed_tags": "Ακολουθούμενες ετικέτες",
   "followers.hide_other_followers": "Αυτός ο χρήστης έχει επιλέξει να μην κάνει τους άλλους ακολούθους του ορατούς",
-  "followers.title": "Ακολουθούν {name}",
+  "followers.title": "Ακολουθούν τον/την {name}",
   "following.hide_other_following": "Αυτός ο χρήστης έχει επιλέξει να μην κάνει τους υπόλοιπους που ακολουθεί ορατούς",
   "following.title": "Ακολουθούνται από {name}",
   "footer.about": "Σχετικά με",
@@ -745,7 +731,6 @@
   "footer.terms_of_service": "Όροι υπηρεσίας",
   "form_error.blank": "Το πεδίο δεν μπορεί να είναι κενό.",
   "form_field.optional": "(προαιρετικό)",
-  "generic.saved": "Αποθηκεύτηκε",
   "getting_started.heading": "Ας ξεκινήσουμε",
   "hashtag.admin_moderation": "Άνοιγμα διεπαφής συντονισμού για το #{name}",
   "hashtag.browse": "Περιήγηση αναρτήσεων με #{hashtag}",
@@ -1136,7 +1121,7 @@
   "report.forward": "Προώθηση προς {target}",
   "report.forward_hint": "Ο λογαριασμός είναι από διαφορετικό διακομιστή. Να σταλεί ανώνυμο αντίγραφο της αναφοράς και εκεί;",
   "report.mute": "Σίγαση",
-  "report.mute_explanation": "Δεν θα βλέπεις τις αναρτήσεις τους. Εκείνοι μπορούν ακόμη να σε ακολουθούν και να βλέπουν τις αναρτήσεις σου χωρίς να γνωρίζουν ότι είναι σε σίγαση.",
+  "report.mute_explanation": "Δεν θα βλέπεις τις αναρτήσεις του. Θα μπορεί ακόμη να σε ακολουθεί και να βλέπει τις αναρτήσεις σου χωρίς να γνωρίζει ότι είναι σε σίγαση.",
   "report.next": "Επόμενο",
   "report.placeholder": "Επιπρόσθετα σχόλια",
   "report.reasons.dislike": "Δεν μου αρέσει",
diff --git a/app/javascript/mastodon/locales/en-GB.json b/app/javascript/mastodon/locales/en-GB.json
index 7d6ddb61be..653a1ed9ed 100644
--- a/app/javascript/mastodon/locales/en-GB.json
+++ b/app/javascript/mastodon/locales/en-GB.json
@@ -113,6 +113,7 @@
   "account.name.copy": "Copy handle",
   "account.name.help.domain": "{domain} is the server that hosts the user’s profile and posts.",
   "account.name.help.domain_self": "{domain} is your server that hosts your profile and posts.",
+  "account.name.help.footer": "Just like you can send emails to people using different email providers, you can interact with people on other Mastodon servers, and with anyone on other Fediverse apps.",
   "account.name.help.header": "A handle is like an email address",
   "account.name.help.username": "{username} is this account’s username on their server. Someone on another server might have the same username.",
   "account.name.help.username_self": "{username} is your username on this server. Someone on another server might have the same username.",
@@ -127,6 +128,7 @@
   "account.note.edit_button": "Edit",
   "account.note.title": "Personal note (visible only to you)",
   "account.open_original_page": "Open original page",
+  "account.pending": "Pending",
   "account.posts": "Posts",
   "account.remove_from_followers": "Remove {name} from followers",
   "account.report": "Report @{name}",
@@ -148,6 +150,7 @@
   "account_edit.advanced_settings.bot_hint": "Signal to others that the account mainly performs automated actions and might not be monitored",
   "account_edit.advanced_settings.bot_label": "Automated account",
   "account_edit.advanced_settings.title": "Advanced settings",
+  "account_edit.bio.add_label": "Add bio",
   "account_edit.bio.edit_label": "Edit bio",
   "account_edit.bio.placeholder": "Add a short introduction to help others identify you.",
   "account_edit.bio.title": "Bio",
@@ -163,16 +166,23 @@
   "account_edit.custom_fields.tip_title": "Tip: adding verified links",
   "account_edit.custom_fields.title": "Custom fields",
   "account_edit.custom_fields.verified_hint": "How do I add a verified link?",
+  "account_edit.display_name.add_label": "Add display name",
+  "account_edit.display_name.edit_label": "Edit display name",
   "account_edit.display_name.placeholder": "Your display name is how your name appears on your profile and in timelines.",
   "account_edit.display_name.title": "Display name",
   "account_edit.featured_hashtags.edit_label": "Add hashtags",
   "account_edit.featured_hashtags.placeholder": "Help others identify, and have quick access to, your favourite topics.",
   "account_edit.featured_hashtags.title": "Featured hashtags",
+  "account_edit.field_actions.delete": "Delete field",
+  "account_edit.field_actions.edit": "Edit field",
   "account_edit.field_delete_modal.confirm": "Are you sure you want to delete this custom field? This action can’t be undone.",
   "account_edit.field_delete_modal.delete_button": "Delete",
   "account_edit.field_delete_modal.title": "Delete custom field?",
   "account_edit.field_edit_modal.add_title": "Add custom field",
+  "account_edit.field_edit_modal.discard_confirm": "Discard",
+  "account_edit.field_edit_modal.discard_message": "You have unsaved changes. Are you sure you want to discard them?",
   "account_edit.field_edit_modal.edit_title": "Edit custom field",
+  "account_edit.field_edit_modal.length_warning": "Recommended character limit exceeded. Mobile users might not see your field in full.",
   "account_edit.field_edit_modal.link_emoji_warning": "We recommend against the use of custom emoji in combination with URLs. Custom fields containing both will display as text only instead of as a link, in order to prevent user confusion.",
   "account_edit.field_edit_modal.name_hint": "Eg “Personal website”",
   "account_edit.field_edit_modal.name_label": "Label",
@@ -187,6 +197,7 @@
   "account_edit.field_reorder_modal.drag_start": "Picked up field \"{item}\".",
   "account_edit.field_reorder_modal.handle_label": "Drag field \"{item}\"",
   "account_edit.field_reorder_modal.title": "Rearrange fields",
+  "account_edit.image_alt_modal.add_title": "Add alt text",
   "account_edit.image_alt_modal.details_content": "DO: <ul> <li>Describe yourself as pictured</li> <li>Use third person language (e.g. “Alex” instead of “me”)</li> <li>Be succinct – a few words is often enough</li> </ul> DON’T: <ul> <li>Start with “Photo of” – it’s redundant for screen readers</li> </ul> EXAMPLE: <ul> <li>“Alex wearing a green shirt and glasses”</li> </ul>",
   "account_edit.image_alt_modal.details_title": "Tips: Alt text for profile photos",
   "account_edit.image_alt_modal.edit_title": "Edit alt text",
@@ -200,6 +211,8 @@
   "account_edit.image_edit.alt_edit_button": "Edit alt text",
   "account_edit.image_edit.remove_button": "Remove image",
   "account_edit.image_edit.replace_button": "Replace image",
+  "account_edit.item_list.delete": "Delete {name}",
+  "account_edit.item_list.edit": "Edit {name}",
   "account_edit.name_modal.add_title": "Add display name",
   "account_edit.name_modal.edit_title": "Edit display name",
   "account_edit.profile_tab.button_label": "Customise",
@@ -211,11 +224,19 @@
   "account_edit.profile_tab.show_media.title": "Show ‘Media’ tab",
   "account_edit.profile_tab.show_media_replies.description": "When enabled, Media tab shows both your posts and replies to other people’s posts.",
   "account_edit.profile_tab.show_media_replies.title": "Include replies on ‘Media’ tab",
+  "account_edit.profile_tab.show_relations.description": "Shows accounts you follow and followers to other users in your profile. People will still be able to see if you are following them.",
+  "account_edit.profile_tab.show_relations.title": "Show ‘Followers’ and ‘Following’",
+  "account_edit.profile_tab.subtitle": "Customise how your profile is displayed.",
+  "account_edit.profile_tab.title": "Profile display settings",
   "account_edit.save": "Save",
+  "account_edit.upload_modal.back": "Back",
   "account_edit.upload_modal.done": "Done",
   "account_edit.upload_modal.next": "Next",
+  "account_edit.upload_modal.step_crop.zoom": "Zoom",
+  "account_edit.upload_modal.step_upload.button": "Browse files",
   "account_edit.upload_modal.step_upload.dragging": "Drop to upload",
   "account_edit.upload_modal.step_upload.header": "Choose an image",
+  "account_edit.upload_modal.step_upload.hint": "WEBP, PNG, GIF or JPG format, up to {limit}MB.{br}Image will be scaled to {width}x{height}px.",
   "account_edit.upload_modal.title_add.avatar": "Add profile photo",
   "account_edit.upload_modal.title_add.header": "Add cover photo",
   "account_edit.upload_modal.title_replace.avatar": "Replace profile photo",
@@ -234,8 +255,8 @@
   "account_edit_tags.search_placeholder": "Enter a hashtag…",
   "account_edit_tags.suggestions": "Suggestions:",
   "account_edit_tags.tag_status_count": "{count, plural, one {# post} other {# posts}}",
+  "account_list.hidden_notice": "This is only visible to you. To show this list to others, go to <link>{page} > {modal} > {field}</link>.",
   "account_list.total": "{total, plural, one {# account} other {# accounts}}",
-  "account_note.placeholder": "Click to add note",
   "admin.dashboard.daily_retention": "User retention rate by day after sign-up",
   "admin.dashboard.monthly_retention": "User retention rate by month after sign-up",
   "admin.dashboard.retention.average": "Average",
@@ -306,11 +327,15 @@
   "annual_report.summary.share_on_mastodon": "Share on Mastodon",
   "attachments_list.unprocessed": "(unprocessed)",
   "audio.hide": "Hide audio",
+  "block_modal.no_collections": "Neither of you can add each other to collections. You'll be automatically removed from each others' existing collections, if applicable.",
   "block_modal.remote_users_caveat": "We will ask the server {domain} to respect your decision. However, compliance is not guaranteed since some servers may handle blocks differently. Public posts may still be visible to non-logged-in users.",
   "block_modal.show_less": "Show less",
   "block_modal.show_more": "Show more",
+  "block_modal.they_cant_mention": "You can't mention, follow, or quote each other.",
+  "block_modal.they_cant_see_posts": "They can't see your content and you won't see theirs.",
   "block_modal.they_will_know": "They can see that they're blocked.",
   "block_modal.title": "Block user?",
+  "block_modal.you_wont_see_mentions": "You won't see posts from others that mention them.",
   "boost_modal.combo": "You can press {combo} to skip this next time",
   "boost_modal.reblog": "Boost post?",
   "boost_modal.undo_reblog": "Unboost post?",
@@ -348,6 +373,7 @@
   "collections.accounts.empty_editor_title": "No one is in this collection yet",
   "collections.accounts.empty_title": "This collection is empty",
   "collections.block_collection_owner": "Block account",
+  "collections.by_account": "by {account_handle}",
   "collections.collection_description": "Description",
   "collections.collection_language": "Language",
   "collections.collection_language_none": "None",
@@ -372,10 +398,15 @@
   "collections.detail.share": "Share this collection",
   "collections.detail.you_are_in_this_collection": "You're featured in this collection",
   "collections.edit_details": "Edit details",
+  "collections.error_loading_collections": "There was an error when trying to load these collections.",
   "collections.hidden_accounts_description": "You’ve blocked or muted {count, plural, one {this user} other {these users}}",
   "collections.hidden_accounts_link": "{count, plural, one {# hidden account} other {# hidden accounts}}",
   "collections.hints.accounts_counter": "{count}/{max} accounts",
   "collections.last_updated_at": "Last updated: {date}",
+  "collections.list.collections_with_count": "{count, plural, one {# Collection} other {# Collections}}",
+  "collections.list.created_by_author": "Created by {name}",
+  "collections.list.created_by_you": "Created by you",
+  "collections.list.featuring_you": "Featuring you",
   "collections.manage_accounts": "Manage accounts",
   "collections.mark_as_sensitive": "Mark as sensitive",
   "collections.mark_as_sensitive_hint": "Hides the collection's description and accounts behind a content warning. The collection name will still be visible.",
@@ -383,6 +414,8 @@
   "collections.maximum_collection_count_reached": "You have created the maximum number of collections",
   "collections.name_length_hint": "40 characters limit",
   "collections.new_collection": "New collection",
+  "collections.pending_accounts.message": "Accounts may appear as pending when we’re awaiting a response from the user or their server. Only you can see pending accounts.",
+  "collections.pending_accounts.title": "Why am I seeing pending accounts?",
   "collections.remove_account": "Remove",
   "collections.report_collection": "Report this collection",
   "collections.revoke_collection_inclusion": "Remove myself from this collection",
@@ -428,6 +461,7 @@
   "column.other_collections": "Collections by {name}",
   "column.pins": "Pinned posts",
   "column.public": "Federated timeline",
+  "column.your_collections": "Your Collections",
   "column_back_button.label": "Back",
   "column_header.hide_settings": "Hide settings",
   "column_header.moveLeft_settings": "Move column to the left",
@@ -561,19 +595,6 @@
   "domain_block_modal.you_will_lose_num_followers": "You will lose {followersCount, plural, one {{followersCountDisplay} follower} other {{followersCountDisplay} followers}} and {followingCount, plural, one {{followingCountDisplay} person you follow} other {{followingCountDisplay} people you follow}}.",
   "domain_block_modal.you_will_lose_relationships": "You will lose all followers and people you follow from this server.",
   "domain_block_modal.you_wont_see_posts": "You won't see posts or notifications from users on this server.",
-  "domain_pill.activitypub_lets_connect": "It lets you connect and interact with people, not just on Mastodon, but across different social apps too.",
-  "domain_pill.activitypub_like_language": "ActivityPub is like the language Mastodon speaks with other social networks.",
-  "domain_pill.server": "Server",
-  "domain_pill.their_handle": "Their handle:",
-  "domain_pill.their_server": "Their digital home, where all of their posts live.",
-  "domain_pill.their_username": "Their unique identifier on their server. It’s possible to find users with the same username on different servers.",
-  "domain_pill.username": "Username",
-  "domain_pill.whats_in_a_handle": "What's in a handle?",
-  "domain_pill.who_they_are": "Since handles say who someone is and where they are, you can interact with people across the social web of <button>ActivityPub-powered platforms</button>.",
-  "domain_pill.who_you_are": "Because your handle says who you are and where you are, people can interact with you across the social web of <button>ActivityPub-powered platforms</button>.",
-  "domain_pill.your_handle": "Your handle:",
-  "domain_pill.your_server": "Your digital home, where all of your posts live. Don’t like this one? Transfer servers at any time and bring your followers too.",
-  "domain_pill.your_username": "Your unique identifier on this server. It’s possible to find users with the same username on different servers.",
   "dropdown.empty": "Select an option",
   "email_subscriptions.email": "Email",
   "email_subscriptions.form.action": "Subscribe",
@@ -614,6 +635,7 @@
   "empty_column.account_unavailable": "Profile unavailable",
   "empty_column.blocks": "You haven't blocked any users yet.",
   "empty_column.bookmarked_statuses": "You don't have any bookmarked posts yet. When you bookmark one, it will show up here.",
+  "empty_column.collections.featured_in": "You have not been added to 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.",
@@ -709,7 +731,6 @@
   "footer.terms_of_service": "Terms of service",
   "form_error.blank": "Field cannot be blank.",
   "form_field.optional": "(optional)",
-  "generic.saved": "Saved",
   "getting_started.heading": "Getting started",
   "hashtag.admin_moderation": "Open moderation interface for #{name}",
   "hashtag.browse": "Browse posts in #{hashtag}",
@@ -760,6 +781,7 @@
   "info_button.label": "Help",
   "info_button.what_is_alt_text": "<h1>What is alt text?</h1> <p>Alt text provides image descriptions for people with vision impairments, low-bandwidth connections, or those seeking extra context.</p> <p>You can improve accessibility and understanding for everyone by writing clear, concise, and objective alt text.</p> <ul> <li>Capture important elements</li> <li>Summarise text in images</li> <li>Use regular sentence structure</li> <li>Avoid redundant information</li> <li>Focus on trends and key findings in complex visuals (like diagrams or maps)</li> </ul>",
   "interaction_modal.action": "To interact with {name}'s post, you need to sign into your account on whatever Mastodon server you use.",
+  "interaction_modal.action_follow": "To follow {name}, you need to sign into your account on whatever Mastodon server you use.",
   "interaction_modal.go": "Go",
   "interaction_modal.no_account_yet": "Don't have an account yet?",
   "interaction_modal.on_another_server": "On a different server",
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index e17abd2ad2..da6f64b3b9 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -394,7 +394,7 @@
   "collections.detail.loading": "Loading collection…",
   "collections.detail.revoke_inclusion": "Remove me",
   "collections.detail.sensitive_content": "Sensitive content",
-  "collections.detail.sensitive_note": "This collection contains accounts and content that may be sensitive to some users.",
+  "collections.detail.sensitive_note": "The description and accounts may not be suitable for all viewers.",
   "collections.detail.share": "Share this collection",
   "collections.detail.you_are_in_this_collection": "You're featured in this collection",
   "collections.edit_details": "Edit details",
@@ -425,6 +425,11 @@
   "collections.search_accounts_max_reached": "You have added the maximum number of accounts",
   "collections.sensitive": "Sensitive",
   "collections.share_short": "Share",
+  "collections.sort_alphabetical": "Alphabetical",
+  "collections.sort_by": "Sort by:",
+  "collections.sort_date_added": "Date added",
+  "collections.sort_last_active": "Last active",
+  "collections.sort_most_followers": "Most followers",
   "collections.suggestions.can_not_add": "Can’t be added",
   "collections.suggestions.can_not_add_desc": "These accounts may have opted out of discovery, or they might be on a server that doesn’t support collections.",
   "collections.suggestions.must_follow": "Must follow first",
@@ -636,6 +641,7 @@
   "empty_column.blocks": "You haven't blocked any users yet.",
   "empty_column.bookmarked_statuses": "You don't have any bookmarked posts yet. When you bookmark one, it will show up here.",
   "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.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.",
diff --git a/app/javascript/mastodon/locales/eo.json b/app/javascript/mastodon/locales/eo.json
index f8e87d1607..4dabacba5d 100644
--- a/app/javascript/mastodon/locales/eo.json
+++ b/app/javascript/mastodon/locales/eo.json
@@ -86,7 +86,6 @@
   "account_edit.featured_hashtags.title": "Elstarigitaj kradvortoj",
   "account_edit.save": "Konservi",
   "account_edit_tags.add_tag": "Aldoni #{tagName}",
-  "account_note.placeholder": "Alklaku por aldoni noton",
   "admin.dashboard.daily_retention": "Uzantoretenprocento laŭ tag post registro",
   "admin.dashboard.monthly_retention": "Uzantoretenprocento laŭ monato post registro",
   "admin.dashboard.retention.average": "Averaĝa",
@@ -274,19 +273,6 @@
   "domain_block_modal.you_will_lose_num_followers": "Vi perdos {followersCount, plural, one {{followersCountDisplay} sekvanton} other {{followersCountDisplay} sekvantojn}} kaj {followingCount, plural, one {{followingCountDisplay} homon, kiu vi sekvas} other {{followingCountDisplay} homojn, kiuj vi sekvas}}.",
   "domain_block_modal.you_will_lose_relationships": "Vi perdos ĉiujn sekvantojn kaj homojn, kiujn vi sekvas de ĉi tiu servilo.",
   "domain_block_modal.you_wont_see_posts": "Vi ne vidos afiŝojn aŭ sciigojn de uzantoj sur ĉi tiu servilo.",
-  "domain_pill.activitypub_lets_connect": "Ĝi ebligas vin konekti kaj interagi kun homoj ne nur sur Mastodon, sed ankaŭ tra diversaj sociaj aplikaĵoj.",
-  "domain_pill.activitypub_like_language": "ActivityPub estas kiel la lingvo kiun Mastodon parolas kun aliaj sociaj retoj.",
-  "domain_pill.server": "Servilo",
-  "domain_pill.their_handle": "Ilia identigo:",
-  "domain_pill.their_server": "Ilia cifereca hejmo, kie ĉiuj iliaj afiŝoj loĝas.",
-  "domain_pill.their_username": "Ilia unika identigilo sur ilia servilo. Eblas trovi uzantojn kun la sama uzantnomo sur malsamaj serviloj.",
-  "domain_pill.username": "Uzantnomo",
-  "domain_pill.whats_in_a_handle": "Kio estas en identigo?",
-  "domain_pill.who_they_are": "Ĉar identigoj diras, kiu iu estas kaj kie ili estas, vi povas interagi kun homoj tra la socia reto de <button>ActivityPub-funkciigitaj platformoj</button>.",
-  "domain_pill.who_you_are": "Ĉar via identigo diras kiu vi estas kaj kie vi estas, homoj povas interagi kun vi tra la socia reto de <button>ActivityPub-funkciigitaj platformoj</button>.",
-  "domain_pill.your_handle": "Via identigo:",
-  "domain_pill.your_server": "Via cifereca hejmo, kie loĝas ĉiuj viaj afiŝoj. Ĉu vi ne ŝatas ĉi tiun? Transloku servilojn iam ajn kaj alportu ankaŭ viajn sekvantojn.",
-  "domain_pill.your_username": "Via unika identigilo sur ĉi tiu servilo. Eblas trovi uzantojn kun la sama uzantnomo sur malsamaj serviloj.",
   "dropdown.empty": "Elektu opcion",
   "embed.instructions": "Enkorpigu ĉi tiun afiŝon en vian retejon per kopio de la suba kodo.",
   "embed.preview": "Ĝi aperos tiel:",
@@ -392,7 +378,6 @@
   "footer.source_code": "Montri fontkodon",
   "footer.status": "Stato",
   "footer.terms_of_service": "Kondiĉoj de uzado",
-  "generic.saved": "Konservita",
   "getting_started.heading": "Por komenci",
   "hashtag.admin_moderation": "Malfermi fasadon de moderigado por #{name}",
   "hashtag.browse": "Folii afiŝojn en #{hashtag}",
diff --git a/app/javascript/mastodon/locales/es-AR.json b/app/javascript/mastodon/locales/es-AR.json
index 5e161751c9..6dcf435c01 100644
--- a/app/javascript/mastodon/locales/es-AR.json
+++ b/app/javascript/mastodon/locales/es-AR.json
@@ -257,7 +257,6 @@
   "account_edit_tags.tag_status_count": "{count, plural, one {voto} other {votos}}",
   "account_list.hidden_notice": "Esto solo es visible para vos. Para mostrar esta lista a otros usuarios, andá a <link>{page} > {modal} > {field}</link>.",
   "account_list.total": "{total, plural, one {# hora} other {# horas}}",
-  "account_note.placeholder": "Hacé clic par agregar una nota",
   "admin.dashboard.daily_retention": "Tasa de retención de usuarios por día, después del registro",
   "admin.dashboard.monthly_retention": "Tasa de retención de usuarios por mes, después del registro",
   "admin.dashboard.retention.average": "Promedio",
@@ -596,19 +595,6 @@
   "domain_block_modal.you_will_lose_num_followers": "Perderás {followersCount, plural, one {{followersCountDisplay} seguidor} other {{followersCountDisplay} seguidores}} y {followingCount, plural, one {{followingCountDisplay} cuenta que seguís} other {{followingCountDisplay} cuentas que seguís}}.",
   "domain_block_modal.you_will_lose_relationships": "Perderás a todos los seguidores y cuentas a las que seguís de este servidor.",
   "domain_block_modal.you_wont_see_posts": "No verás mensajes ni notificaciones de usuarios en este servidor.",
-  "domain_pill.activitypub_lets_connect": "Te permite conectar e interactuar con cuentas no solo en Mastodon, sino también a través de diferentes aplicaciones sociales.",
-  "domain_pill.activitypub_like_language": "ActivityPub es como el idioma que Mastodon habla con otras redes sociales.",
-  "domain_pill.server": "Servidor",
-  "domain_pill.their_handle": "Su alias:",
-  "domain_pill.their_server": "Su hogar digital, donde residen todoas sus mensajes.",
-  "domain_pill.their_username": "Su identificador único en su servidor. Es posible encontrar cuentas con el mismo nombre de usuario en diferentes servidores.",
-  "domain_pill.username": "Nombre de usuario",
-  "domain_pill.whats_in_a_handle": "¿En qué consiste el alias?",
-  "domain_pill.who_they_are": "Los alias indican quiénes son y dónde se encuentran, y gracias a ellos podés interactuar con otras cuentas a través de las redes sociales compatibles con <button>ActivityPub</button>.",
-  "domain_pill.who_you_are": "Los alias dicen quién sos y dónde estás, y gracias a ellos podés interactuar con otras cuentas a través de las redes sociales compatibles con <button>ActivityPub</button>.",
-  "domain_pill.your_handle": "Tu alias:",
-  "domain_pill.your_server": "Tu hogar digital, donde residen todos tus mensajes. ¿No te gusta este sitio? Mudate a otro servidor en cualquier momento y llevate a tus seguidores.",
-  "domain_pill.your_username": "Tu identificador único en este servidor. Es posible encontrar cuentas con el mismo nombre de usuario en diferentes servidores.",
   "dropdown.empty": "Seleccioná una opción",
   "email_subscriptions.email": "Correo electrónico",
   "email_subscriptions.form.action": "Suscribite",
@@ -745,7 +731,6 @@
   "footer.terms_of_service": "Términos del servicio",
   "form_error.blank": "El campo no puede estar en blanco.",
   "form_field.optional": "(opcional)",
-  "generic.saved": "Guardado",
   "getting_started.heading": "Inicio de Mastodon",
   "hashtag.admin_moderation": "Abrir interface de moderación para #{name}",
   "hashtag.browse": "Ver publicaciones con #{hashtag}",
diff --git a/app/javascript/mastodon/locales/es-MX.json b/app/javascript/mastodon/locales/es-MX.json
index d587bfbd51..709e5cb14f 100644
--- a/app/javascript/mastodon/locales/es-MX.json
+++ b/app/javascript/mastodon/locales/es-MX.json
@@ -257,7 +257,6 @@
   "account_edit_tags.tag_status_count": "{count, plural,one {# publicación} other {# publicaciones}}",
   "account_list.hidden_notice": "Esto solo lo puedes ver tú. Para mostrar esta lista a otras personas, ve a <link>{page} > {modal} > {field}</link>.",
   "account_list.total": "{total, plural,one {# cuenta} other {# cuentas}}",
-  "account_note.placeholder": "Haz clic para añadir una nota",
   "admin.dashboard.daily_retention": "Tasa de retención de usuarios por día después de unirse",
   "admin.dashboard.monthly_retention": "Tasa de retención de usuarios por mes después de unirse",
   "admin.dashboard.retention.average": "Promedio",
@@ -596,19 +595,6 @@
   "domain_block_modal.you_will_lose_num_followers": "Vas a perder {followersCount, plural, one {{followersCountDisplay} seguidor} other {{followersCountDisplay} seguidores}} y {followingCount, plural, one {{followingCountDisplay} persona a la que sigues} other {{followingCountDisplay} personas a las que sigas}}.",
   "domain_block_modal.you_will_lose_relationships": "Perderás todos los seguidores y las personas que sigues de este servidor.",
   "domain_block_modal.you_wont_see_posts": "No verás publicaciones ni notificaciones de usuarios en este servidor.",
-  "domain_pill.activitypub_lets_connect": "Te permite conectarte e interactuar con personas no solo en Mastodon, sino también en diferentes aplicaciones sociales.",
-  "domain_pill.activitypub_like_language": "ActivityPub es como el idioma que Mastodon habla con otras redes sociales.",
-  "domain_pill.server": "Servidor",
-  "domain_pill.their_handle": "Su alias:",
-  "domain_pill.their_server": "Su hogar digital, donde residen todas sus publicaciones.",
-  "domain_pill.their_username": "Su identificador único en su servidor. Es posible encontrar usuarios con el mismo nombre de usuario en diferentes servidores.",
-  "domain_pill.username": "Nombre de usuario",
-  "domain_pill.whats_in_a_handle": "¿En qué consiste el alias?",
-  "domain_pill.who_they_are": "Los alias indican quiénes son y dónde se encuentran, puedes interactuar con personas a través de las redes sociales de <button>plataformas que utilizan ActivityPub</button>.",
-  "domain_pill.who_you_are": "Los alias indican quién eres y dónde te encuentras, las personas pueden interactuar contigo a través de las redes sociales de <button>plataformas que utilizan ActivityPub</button>.",
-  "domain_pill.your_handle": "Tu alias:",
-  "domain_pill.your_server": "Tu hogar digital, donde residen todas tus publicaciones. ¿No te gusta este sitio? Muévete a otro servidor en cualquier momento y llévate a tus seguidores.",
-  "domain_pill.your_username": "Tu identificador único en este servidor. Es posible encontrar usuarios con el mismo nombre de usuario en diferentes servidores.",
   "dropdown.empty": "Elige una opción",
   "email_subscriptions.email": "Correo electrónico",
   "email_subscriptions.form.action": "Suscribirse",
@@ -745,7 +731,6 @@
   "footer.terms_of_service": "Condiciones del servicio",
   "form_error.blank": "El campo no puede quedar en blanco.",
   "form_field.optional": "(opcional)",
-  "generic.saved": "Guardado",
   "getting_started.heading": "Primeros pasos",
   "hashtag.admin_moderation": "Abrir interfaz de moderación para #{name}",
   "hashtag.browse": "Explorar publicaciones en #{hashtag}",
diff --git a/app/javascript/mastodon/locales/es.json b/app/javascript/mastodon/locales/es.json
index 904bdc8b3c..90d6100062 100644
--- a/app/javascript/mastodon/locales/es.json
+++ b/app/javascript/mastodon/locales/es.json
@@ -257,7 +257,6 @@
   "account_edit_tags.tag_status_count": "{count, plural, one {# publicación} other {# publicaciones}}",
   "account_list.hidden_notice": "Esto solo es visible para ti. Para mostrar esta lista a otros, ve a <link>{page} > {modal} > {field}</link>.",
   "account_list.total": "{total, plural, one {# cuenta} other {# cuentas}}",
-  "account_note.placeholder": "Haz clic para añadir nota",
   "admin.dashboard.daily_retention": "Tasa de retención de usuarios por día después del registro",
   "admin.dashboard.monthly_retention": "Tasa de retención de usuarios por mes después del registro",
   "admin.dashboard.retention.average": "Media",
@@ -596,19 +595,6 @@
   "domain_block_modal.you_will_lose_num_followers": "Perderás {followersCount, plural, one {{followersCountDisplay} seguidor} other {{followersCountDisplay} seguidores}} y {followingCount, plural, one {{followingCountDisplay} persona a la que sigues} other {{followingCountDisplay} personas a las que sigues}}.",
   "domain_block_modal.you_will_lose_relationships": "Perderás a todos los seguidores y gente a la que sigas de este servidor.",
   "domain_block_modal.you_wont_see_posts": "No verás mensajes ni notificaciones de usuarios en este servidor.",
-  "domain_pill.activitypub_lets_connect": "Te permite conectar e interactuar con personas no sólo en Mastodon, sino también a través de diferentes aplicaciones sociales.",
-  "domain_pill.activitypub_like_language": "ActivityPub es como el idioma que Mastodon habla con otras redes sociales.",
-  "domain_pill.server": "Servidor",
-  "domain_pill.their_handle": "Su alias:",
-  "domain_pill.their_server": "Su hogar digital, donde residen todas sus publicaciones.",
-  "domain_pill.their_username": "Su identificador único en su servidor. Es posible encontrar usuarios con el mismo nombre de usuario en diferentes servidores.",
-  "domain_pill.username": "Nombre de usuario",
-  "domain_pill.whats_in_a_handle": "¿En qué consiste el alias?",
-  "domain_pill.who_they_are": "Los alias indican quiénes son y dónde se encuentran, y gracias a ellos puedes interactuar con personas a través de las redes sociales compatibles con <button>ActivityPub</button>.",
-  "domain_pill.who_you_are": "Los alias indican quién eres y dónde te encuentras, y gracias a ellos puedes interactuar con personas a través de las redes sociales compatibles con <button>ActivityPub</button>.",
-  "domain_pill.your_handle": "Tu alias:",
-  "domain_pill.your_server": "Tu hogar digital, donde residen todas tus publicaciones. ¿No te gusta este sitio? Muévete a otro servidor en cualquier momento y llévate a tus seguidores.",
-  "domain_pill.your_username": "Tu identificador único en este servidor. Es posible encontrar usuarios con el mismo nombre de usuario en diferentes servidores.",
   "dropdown.empty": "Selecciona una opción",
   "email_subscriptions.email": "Correo electrónico",
   "email_subscriptions.form.action": "Suscribirse",
@@ -745,7 +731,6 @@
   "footer.terms_of_service": "Términos del servicio",
   "form_error.blank": "El campo no puede estar vacío.",
   "form_field.optional": "(opcional)",
-  "generic.saved": "Guardado",
   "getting_started.heading": "Primeros pasos",
   "hashtag.admin_moderation": "Abrir interfaz de moderación para #{name}",
   "hashtag.browse": "Explorar publicaciones en #{hashtag}",
diff --git a/app/javascript/mastodon/locales/et.json b/app/javascript/mastodon/locales/et.json
index 7bb3529b79..eed2260ee5 100644
--- a/app/javascript/mastodon/locales/et.json
+++ b/app/javascript/mastodon/locales/et.json
@@ -257,7 +257,6 @@
   "account_edit_tags.tag_status_count": "{count, plural, one {# postitus} other {# postitust}}",
   "account_list.hidden_notice": "See on nähtav ainult sulle. Kui soovid seda loetelu teistele näidata, ava <link>{page} > {modal} > {field}</link>.",
   "account_list.total": "{total, plural, one {# konto} other {# kontot}}",
-  "account_note.placeholder": "Klõpsa märke lisamiseks",
   "admin.dashboard.daily_retention": "Kasutajate päevane allesjäämine peale registreerumist",
   "admin.dashboard.monthly_retention": "Kasutajate kuine allesjäämine peale registreerumist",
   "admin.dashboard.retention.average": "Keskmine",
@@ -596,19 +595,6 @@
   "domain_block_modal.you_will_lose_num_followers": "Sult kaob {followersCount, plural, one {{followersCountDisplay} jälgija} other {{followersCountDisplay} jälgijat}} ja {followingCount, plural, one {{followingCountDisplay} inimene} other {{followingCountDisplay} inimest}}, keda sa ise jälgid.",
   "domain_block_modal.you_will_lose_relationships": "Sa kaotad kõik oma jälgijad ja inimesed, kes sind jälgivad sellest serverist.",
   "domain_block_modal.you_wont_see_posts": "Sa ei näe selle serveri kasutajate postitusi ega teavitusi.",
-  "domain_pill.activitypub_lets_connect": "See võimaldab sul ühenduda inimestega ja nendega suhelda mitte ainult Mastodonis, vaid ka teistes suhtlusrakendustes.",
-  "domain_pill.activitypub_like_language": "ActivityPub on nagu keel, mida Mastodon räägib teiste suhtlusvõrgustikega.",
-  "domain_pill.server": "Server",
-  "domain_pill.their_handle": "Tema tunnus:",
-  "domain_pill.their_server": "Tema digitaalne kodu, kus kõik tema postitused on.",
-  "domain_pill.their_username": "Tema unikaalne tunnus tema serveris. On võimalik, et mingites teistes serverites on sama kasutajanimega kasutajaid.",
-  "domain_pill.username": "Kasutajanimi",
-  "domain_pill.whats_in_a_handle": "Mis on tunnuses?",
-  "domain_pill.who_they_are": "Kuna tunnus ütleb, kes keegi on ja kus, saad suhelda inimestega üle <button>ActivityPub-poolt toetatud sotsiaalvõrkude platvormide</button>.",
-  "domain_pill.who_you_are": "Kuna tunnus ütleb, kes sa oled ja kus, saavad inimesed sinuga suhelda üle <button>ActivityPub-poolt toetatud sotsiaalvõrkude platvormide</button>.",
-  "domain_pill.your_handle": "Sinu tunnus:",
-  "domain_pill.your_server": "Sinu digitaalne kodu, kus on kõik sinu postitused. Sulle ei meeldi see? Vaheta mistahes ajal serverit ja võta jälgijad ka.",
-  "domain_pill.your_username": "Sinu unikaalne identifikaator siin serveris. On võimalik, et leiad teistes serverites samasuguse kasutajanimega kasutajaid.",
   "dropdown.empty": "Vali üks variantidest",
   "email_subscriptions.email": "E-post",
   "email_subscriptions.form.action": "Telli",
@@ -745,7 +731,6 @@
   "footer.terms_of_service": "Kasutustingimused",
   "form_error.blank": "Väli ei tohi olla tühi.",
   "form_field.optional": "(valikuline)",
-  "generic.saved": "Salvestatud",
   "getting_started.heading": "Alustamine",
   "hashtag.admin_moderation": "Ava modereerimisliides #{name} jaoks",
   "hashtag.browse": "Sirvi #{hashtag} teemaviitega postitusi",
diff --git a/app/javascript/mastodon/locales/eu.json b/app/javascript/mastodon/locales/eu.json
index dd7e7c3569..422d37763e 100644
--- a/app/javascript/mastodon/locales/eu.json
+++ b/app/javascript/mastodon/locales/eu.json
@@ -82,7 +82,6 @@
   "account.unmute": "Desmututu @{name}",
   "account.unmute_notifications_short": "Desmututu jakinarazpenak",
   "account.unmute_short": "Desmututu",
-  "account_note.placeholder": "Click to add a note",
   "admin.dashboard.daily_retention": "Erabiltzaile atxikitze-tasa izena eman ondorengo eguneko",
   "admin.dashboard.monthly_retention": "Erabiltzaile atxikitze-tasa izena eman ondorengo hilabeteko",
   "admin.dashboard.retention.average": "Batezbestekoa",
@@ -317,19 +316,6 @@
   "domain_block_modal.you_will_lose_num_followers": "{followersCount, plural, one {Jarraitzaile {followersCountDisplay}} other {{followersCountDisplay} jarraitzaile}} eta {followingCount, plural, one {jarraitzen duzun pertsona {followingCountDisplay}} other {jarraitzen dituzun beste {followingCountDisplay} pertsona}} galduko dituzu.",
   "domain_block_modal.you_will_lose_relationships": "Instantzia honetatik jarraitzen dituzun jarraitzaile eta pertsona guztiak galduko dituzu.",
   "domain_block_modal.you_wont_see_posts": "Ez dituzu zerbitzari honetako erabiltzaileen argitalpenik edota jakinarazpenik ikusiko.",
-  "domain_pill.activitypub_lets_connect": "Mastodon-en ez ezik, beste sare sozialen aplikazioetako jendearekin konektatzea eta harremanetan jartzea uzten dizu.",
-  "domain_pill.activitypub_like_language": "ActivityPub, Mastodon-ek beste sare sozialekin hitz egiteko erabiltzen duen hizkuntza bezalakoxea da.",
-  "domain_pill.server": "Zerbitzaria",
-  "domain_pill.their_handle": "Bere helbidea:",
-  "domain_pill.their_server": "Bere etxe digitala, non bere argitalpenak dauden.",
-  "domain_pill.their_username": "Zerbitzarian duen identifikatzaile bakarra. Baliteke erabiltzaile-izen bera duten erabiltzaileak zerbitzari desberdinetan aurkitzea.",
-  "domain_pill.username": "Erabiltzaile-izena",
-  "domain_pill.whats_in_a_handle": "Zer dago helbide batean?",
-  "domain_pill.who_they_are": "Helbideek norbait nor den eta non dagoen adierazten dute, <button>ActivityPub darabilten plataformen</button> sare sozialeko jendearekin jar zaitezke harremanetan.",
-  "domain_pill.who_you_are": "Zure helbideak nor zaren eta non zauden adierazten duenez, jendea <button>ActivityPub darabilten plataformen</button> sare sozialen bitartez jar daiteke zurekin harremanetan.",
-  "domain_pill.your_handle": "Zure helbidea:",
-  "domain_pill.your_server": "Zure etxe digitala, non zure bidalketak dauden. Ez al zaizu gustatzen? Transferitu zerbitzariak edonoiz eta ekarri zure jarraitzaileak ere.",
-  "domain_pill.your_username": "Zerbitzarian duzun identifikatzaile bakarra. Baliteke erabiltzaile-izen bera duten erabiltzaileak zerbitzari desberdinetan aurkitzea.",
   "dropdown.empty": "Aukeratu bat",
   "embed.instructions": "Txertatu bidalketa hau zure webgunean beheko kodea kopiatuz.",
   "embed.preview": "Hau da izango duen itxura:",
@@ -437,7 +423,6 @@
   "footer.source_code": "Ikusi iturburu kodea",
   "footer.status": "Egoera",
   "footer.terms_of_service": "Erabilera baldintzak",
-  "generic.saved": "Gordea",
   "getting_started.heading": "Menua",
   "hashtag.admin_moderation": "#{name}-(r)en moderazio-interfazea ireki",
   "hashtag.browse": "Arakatu bidalketak #{hashtag}(e)n",
diff --git a/app/javascript/mastodon/locales/fa.json b/app/javascript/mastodon/locales/fa.json
index eff70170f1..b82ac90526 100644
--- a/app/javascript/mastodon/locales/fa.json
+++ b/app/javascript/mastodon/locales/fa.json
@@ -257,7 +257,6 @@
   "account_edit_tags.tag_status_count": "{count, plural, one {# فرسته} other {# فرسته}}",
   "account_list.hidden_notice": "تنها برای شما نمایان است. رفتن به <link>‫{page} > {modal} > {field}‬</link> برای نمایش این سیاهه به دیگران.",
   "account_list.total": "{total, plural, one {# حساب} other {# حساب}}",
-  "account_note.placeholder": "برای افزودن یادداشت کلیک کنید",
   "admin.dashboard.daily_retention": "نرخ حفظ کاربر در روز پس از ثبت نام",
   "admin.dashboard.monthly_retention": "نرخ حفظ کاربر در ماه پس از ثبت نام",
   "admin.dashboard.retention.average": "میانگین",
@@ -328,11 +327,15 @@
   "annual_report.summary.share_on_mastodon": "هم‌رسانی روی ماستودون",
   "attachments_list.unprocessed": "(پردازش نشده)",
   "audio.hide": "نهفتن صدا",
+  "block_modal.no_collections": "هیچ‌کدامتان نمیتواند دیگری را به مجموعه بیفزاید. در صورت امکان به صورت خودکار از مجموعه‌های موجود یکدیگر برداشته خواهید شد.",
   "block_modal.remote_users_caveat": "از کارساز {domain} خواهیم خواست که به تصمیمتان احترام بگذارد. با این حال تضمینی برای رعایتش وجود ندارد؛ زیرا برخی کارسازها ممکن است مسدودی را متفاوت مدیریت کنند. ممکن است فرسته‌های عمومی همچنان برای کاربران وارد نشده نمایان باشند.",
   "block_modal.show_less": "نمایش کم‌تر",
   "block_modal.show_more": "نمایش بیش‌تر",
+  "block_modal.they_cant_mention": "نمی‌توانید یکدیگر را پی‌گرفته یا نقل کرده یا به هم اشاره کنید.",
+  "block_modal.they_cant_see_posts": "نمی‌تواند محتوایتان را ببیند و محتوایش را نمی‌بینید.",
   "block_modal.they_will_know": "می‌تواند ببینند که مسدود شده.",
   "block_modal.title": "انسداد کاربر؟",
+  "block_modal.you_wont_see_mentions": "فرسته‌هایی که به او اشاره کرده‌اند را نخواهید دید.",
   "boost_modal.combo": "دکمهٔ {combo} را بزنید تا دیگر این را نبینید",
   "boost_modal.reblog": "تقویت فرسته؟",
   "boost_modal.undo_reblog": "ناتقویت فرسته؟",
@@ -524,6 +527,8 @@
   "confirmations.follow_to_list.message": "برای افزودن {name} به سیاهه باید پیش گرفته باشید.",
   "confirmations.follow_to_list.title": "پی‌گیری کاربر؟",
   "confirmations.hide_featured_tab.confirm": "نهفتن زبانه",
+  "confirmations.hide_featured_tab.intro": "می‌توانید هر زمانی در <i>ویرایش نماگر > تنظیمات زبانهٔ نماگر</i> تغییرش دهید.",
+  "confirmations.hide_featured_tab.message": "این کار زبانه را برای کاربران روی {serverName} و دیگر کارسازهایی که جدیدترین نگارش ماستودون را اجرا می‌کنند پنهان خواهد کرد. ممکن است نمایش در جاهای دیگر متفاوت باشد.",
   "confirmations.hide_featured_tab.title": "نهفتن زبانهٔ «معرّفی شده»؟",
   "confirmations.logout.confirm": "خروج از حساب",
   "confirmations.logout.message": "مطمئنید می‌خواهید خارج شوید؟",
@@ -549,6 +554,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.title": "برداشتن خودتان از این مجموعه؟",
   "confirmations.revoke_quote.confirm": "حذف فرسته",
   "confirmations.revoke_quote.message": "این اقدام قابل بازگشت نیست.",
@@ -589,22 +595,12 @@
   "domain_block_modal.you_will_lose_num_followers": "شما {followersCount, plural, one {{followersCountDisplay} پی‌گیرنده} other {{followersCountDisplay} پی‌گیرنده}} و {followingCount, plural, one {{followingCountDisplay} فرد پی‌گرفته‌شده} other {{followingCountDisplay} فرد پی‌گرفته‌شده}} را از دست خواهید داد.",
   "domain_block_modal.you_will_lose_relationships": "شما تمام پیگیرکنندگان و افرادی که از این کارساز پیگیری می‌کنید را از دست خواهید داد.",
   "domain_block_modal.you_wont_see_posts": "فرسته‌ها یا آگاهی‌ها از کاربران روی این کارساز را نخواهید دید.",
-  "domain_pill.activitypub_lets_connect": "این به شما اجازه می‌دهد تا نه تنها در ماستودون، بلکه در برنامه‌های اجتماعی مختلف نیز با افراد ارتباط برقرار کرده و تعامل داشته باشید.",
-  "domain_pill.activitypub_like_language": "ActivityPub مانند زبانی است که ماستودون با دیگر شبکه‌های اجتماعی صحبت می‌کند.",
-  "domain_pill.server": "کارساز",
-  "domain_pill.their_handle": "شناسه‌اش:",
-  "domain_pill.their_server": "خانهٔ رقمیش. جایی که همهٔ فرسته‌هایش می‌زیند.",
-  "domain_pill.their_username": "شناسهٔ یکتایش در کارسازش. ممکن است کاربرانی با نام کاربری مشابه روی کارسازهای مختلف باشند.",
-  "domain_pill.username": "نام کاربری",
-  "domain_pill.whats_in_a_handle": "شناسه چیست؟",
-  "domain_pill.who_they_are": "از آن‌جا که شناسه‌ها کیستی و کجایی افراد را می‌گویند، می‌توانید با افرادی در سراسر وب اجتماعی <button>بن‌سازه‌های قدرت گرفته از اکتیویتی پاپ</button> تعامل داشته باشید.",
-  "domain_pill.who_you_are": "از آن‌جا که شناسه‌ها کیستی و کجاییتان را می‌گویند، افراد می‌توانند از سراسر وب اجتماعی <button>بن‌سازه‌های قدرت گرفته از اکتیویتی پاپ</button> با شما تعامل داشته باشند.",
-  "domain_pill.your_handle": "شناسه‌تان:",
-  "domain_pill.your_server": "خانهٔ رقمیتان. جایی که همهٔ فرسته‌هایتان می‌زیند. دوستش ندارید؟ در هر زمان کارسازتان را جابه‌جا کرده و پی‌گیرندگانتان را نیز بیاورید.",
-  "domain_pill.your_username": "شناسهٔ یکتایتان روی این کارساز. ممکن است کاربرانی با نام کاربری مشابه روی کارسازهای دیگر باشند.",
   "dropdown.empty": "انتخاب یک گزینه",
   "email_subscriptions.email": "رایانامه",
   "email_subscriptions.form.action": "اشتراک",
+  "email_subscriptions.form.bottom": "گرفتن فرسته‌ها در صندوق ورودیتان بدون ساختن حساب ماستودون. لغو اشتراک در هر زمان. برای اطّلاعات بیش‌تر به <a>سیاست محرمانگی</a> مراجعه کنید.",
+  "email_subscriptions.form.title": "نام‌نویسی برای به روز رسانی‌های رایانامه‌ای از {name}",
+  "email_subscriptions.submitted.lead": "بررسی صندوق ورودیتان برای رایانامهٔ پایان نام‌نویسی برای به‌روز رسانی‌های رایانامه‌ای.",
   "email_subscriptions.submitted.title": "یک گام دیگر",
   "email_subscriptions.validation.email.blocked": "فراهم کنندهٔ رایانامهٔ مسدود",
   "email_subscriptions.validation.email.invalid": "نشانی رایانامه نامعتبر",
@@ -629,7 +625,9 @@
   "empty_column.account_featured_self.no_collections_button": "ایجاد مجموعه",
   "empty_column.account_featured_self.no_collections_hide_tab": "نهفتن این زبانه",
   "empty_column.account_featured_self.pre_collections": "منتظر مجموعه‌ها باشید",
+  "empty_column.account_featured_self.pre_collections_desc": "مجموعه‌ها (از ماستودون ۴٫۶) می‌گذارند سیاهه‌های خودتان از حساب‌ها را برای پیشنهاد به دیگران بسازید.",
   "empty_column.account_featured_self.showcase_accounts": "نمایشکاه حساب‌های محبوبتان",
+  "empty_column.account_featured_self.showcase_accounts_desc": "مجموعه‌ها سیاهه‌هایی از حساب‌ها برای کمک به دیگران در کشف بهتر وب اجتماعیند.",
   "empty_column.account_featured_unknown.other": "این حساب هنوز چیزی را معرّفی نکرده.",
   "empty_column.account_hides_collections": "کاربر خواسته که این اطّلاعات در دسترس نباشند",
   "empty_column.account_suspended": "حساب معلق شد",
@@ -671,7 +669,10 @@
   "featured_carousel.header": "{count, plural, one {فرسته سنجاق‌شده} other {فرسته‌های سنجاق‌شده}}",
   "featured_carousel.slide": "فرستهٔ {current, number} از {max, number}",
   "featured_tags.more_items": "+{count}",
+  "featured_tags.suggestions": "جدیداً دربارهٔ {items} فرستاده‌اید. به برچسب‌های معرّفی شده افزوده شود؟",
   "featured_tags.suggestions.add": "افزودن",
+  "featured_tags.suggestions.added": "مدیریت برجسب‌های معرّفی شده در هر زمانی زیر <link>ویرایش نماگر > برچسب‌های معرّفی شده</link>.",
+  "featured_tags.suggestions.dismiss": "نه، ممنون",
   "filter_modal.added.context_mismatch_explanation": "این دستهٔ پالایه به بافتاری که در آن به این فرسته دسترسی دارید اعمال نمی‌شود. اگر می‌خواهید فرسته در این بافتار هم پالوده شود، باید پالایه را ویرایش کنید.",
   "filter_modal.added.context_mismatch_title": "بافتار نامطابق!",
   "filter_modal.added.expired_explanation": "این دستهٔ پالایه منقضی شده است. برای اعمالش باید تاریخ انقضا را عوض کنید.",
@@ -713,7 +714,9 @@
   "follow_suggestions.view_all": "دیدن همه",
   "follow_suggestions.who_to_follow": "افرادی برای پی‌گیری",
   "followed_tags": "برچسب‌های پی‌گرفته",
+  "followers.hide_other_followers": "این کاربر گزیده است که پی‌گیرندگانش نمایان نباشند",
   "followers.title": "‫{name} را پی می‌گیرد",
+  "following.hide_other_following": "این کاربر گزیده است که باقی پی‌گرفتگانش نمایان نباشند",
   "following.title": "پی گرفته از سوی {name}",
   "footer.about": "درباره",
   "footer.about_mastodon": "دربارهٔ ماستودون",
@@ -728,7 +731,6 @@
   "footer.terms_of_service": "شرایط استفاده از خدمات",
   "form_error.blank": "زمینه نمی‌تواند خالی باشد.",
   "form_field.optional": "(اختیاری)",
-  "generic.saved": "ذخیره شده",
   "getting_started.heading": "آغاز کنید",
   "hashtag.admin_moderation": "گشودن میانای نظارت برای ‎#{name}",
   "hashtag.browse": "مرور فرسته‌ها در #{hashtag}",
@@ -779,6 +781,7 @@
   "info_button.label": "راهنما",
   "info_button.what_is_alt_text": "<h1>متن جایگزین چیست؟</h1> <p>متن جایگزین توضیحات تصویری را برای افراد دارای اختلالات بینایی، اتصالات با پهنای باند کم یا کسانی که به دنبال زمینه اضافی هستند ارائه می دهد.</p> <p>با نوشتن متن جایگزین واضح، مختصر و عینی می توانید دسترسی و درک را برای همه بهبود بخشید.</p> <ul> <li>عناصر مهم را ضبط کنید</li> <li>متن را در تصاویر خلاصه کنید</li> <li>از ساختار جمله منظم استفاده کنید</li> <li>از اطلاعات اضافی خودداری کنید</li> <li>روی روندها و یافته های کلیدی در تصاویر پیچیده (مانند نمودارها یا نقشه ها) تمرکز کنید.</li> </ul>",
   "interaction_modal.action": "برای تعامل با فرستهٔ {name} باید به حسابتان روی هر کارساز ماستودونی که استفاده می‌کنید وارد شوید.",
+  "interaction_modal.action_follow": "برای پی گرفتن {name} باید به حسابتان روی هر کارساز ماستودونی که استفاده می‌کنید وارد شوید.",
   "interaction_modal.go": "برو",
   "interaction_modal.no_account_yet": "هنوز حساب کاربری ندارید؟",
   "interaction_modal.on_another_server": "روی کارسازی دیگر",
@@ -916,8 +919,8 @@
   "notification.admin.report_account_other": "{name} {count, plural, one {یک پست} other {پست}} از {target} را گزارش داد",
   "notification.admin.report_statuses": "{name} {target} برای {category} را گزارش داد",
   "notification.admin.report_statuses_other": "{name}، {target} را گزارش داد",
-  "notification.admin.sign_up": "{name} ثبت نام کرد",
-  "notification.admin.sign_up.name_and_others": "{name} و {count, plural, one {# نفر دیگر} other {# نفر دیگر}} ثبت‌نام کردند",
+  "notification.admin.sign_up": "{name} نام‌نویسی کرد",
+  "notification.admin.sign_up.name_and_others": "{name} و {count, plural, one {# نفر دیگر} other {# نفر دیگر}} نام‌نویسی کردند",
   "notification.annual_report.message": "#خلاصه_ماستودون {year} منتظرتان است! رونمایی از لحظه‌های به یاد ماندنی و نقاط پررنگ سال روی ماستودون!",
   "notification.annual_report.view": "دیدن #خلاصه_ماستودون",
   "notification.collection_update": "‫{name} مجموعه‌ای که در آن هستید را ویراست",
@@ -1190,7 +1193,8 @@
   "sign_in_banner.follow_anyone": "هر کسی را در سراسر فدیورس دنبال کنید و همه را به ترتیب زمانی ببینید. هیچ الگوریتم، تبلیغات یا طعمه کلیکی در چشم نیست.",
   "sign_in_banner.mastodon_is": "ماستودون بهترین راه برای پیگیری اتفاقات است.",
   "sign_in_banner.sign_in": "ورود",
-  "sign_in_banner.sso_redirect": "ورود یا ثبت نام",
+  "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}",
diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json
index 915702c542..7747357dc9 100644
--- a/app/javascript/mastodon/locales/fi.json
+++ b/app/javascript/mastodon/locales/fi.json
@@ -257,7 +257,6 @@
   "account_edit_tags.tag_status_count": "{count, plural, one {# julkaisu} other {# julkaisua}}",
   "account_list.hidden_notice": "Tämä näkyy vain sinulle. Näytä tämä luettelo muille kohdassa <link>{page} > {modal} > {field}</link>.",
   "account_list.total": "{total, plural, one {# tili} other {# tiliä}}",
-  "account_note.placeholder": "Lisää muistiinpano napsauttamalla",
   "admin.dashboard.daily_retention": "Käyttäjien pysyvyys päivittäin rekisteröitymisen jälkeen",
   "admin.dashboard.monthly_retention": "Käyttäjien pysyvyys kuukausittain rekisteröitymisen jälkeen",
   "admin.dashboard.retention.average": "Keskimäärin",
@@ -596,19 +595,6 @@
   "domain_block_modal.you_will_lose_num_followers": "Menetät {followersCount, plural, one {{followersCountDisplay}:n seuraajasi} other {{followersCountDisplay} seuraajaasi}} ja {followingCount, plural, one {{followingCountDisplay}:n seurattavasi} other {{followingCountDisplay} seurattavaasi}}.",
   "domain_block_modal.you_will_lose_relationships": "Menetät kaikki tämän palvelimen seuraajasi ja seurattavasi.",
   "domain_block_modal.you_wont_see_posts": "Et enää näe julkaisuja etkä ilmoituksia tämän palvelimen käyttäjiltä.",
-  "domain_pill.activitypub_lets_connect": "Sen avulla voit muodostaa yhteyden ja olla vuorovaikutuksessa ihmisten kanssa, ei vain Mastodonissa vaan myös muissa sosiaalisissa sovelluksissa.",
-  "domain_pill.activitypub_like_language": "ActivityPub on kuin kieli, jota Mastodon puhuu muiden sosiaalisten verkostojen kanssa.",
-  "domain_pill.server": "Palvelin",
-  "domain_pill.their_handle": "Hänen käyttäjätunnuksensa:",
-  "domain_pill.their_server": "Hänen digitaalinen kotinsa, jossa kaikki hänen julkaisunsa sijaitsevat.",
-  "domain_pill.their_username": "Hänen yksilöllinen tunnisteensa omalla palvelimellaan. Eri palvelimilta on mahdollista löytää käyttäjiä, joilla on sama käyttäjänimi.",
-  "domain_pill.username": "Käyttäjänimi",
-  "domain_pill.whats_in_a_handle": "Mitä käyttäjätunnuksessa on?",
-  "domain_pill.who_they_are": "Koska käyttäjätunnukset kertovat, kuka ja missä joku on, voit olla vuorovaikutuksessa käyttäjien kanssa kaikkialla sosiaalisessa verkossa, joka koostuu <button>ActivityPub-pohjaisista alustoista</button>.",
-  "domain_pill.who_you_are": "Koska käyttäjätunnuksesi kertoo, kuka ja missä olet, käyttäjät voivat olla vaikutuksessa kanssasi kaikkialla sosiaalisessa verkossa, joka koostuu <button>ActivityPub-pohjaisista alustoista</button>.",
-  "domain_pill.your_handle": "Käyttäjätunnuksesi:",
-  "domain_pill.your_server": "Digitaalinen kotisi, jossa kaikki julkaisusi sijaitsevat. Etkö pidä tästä? Siirry palvelimelta toiselle milloin tahansa ja tuo myös seuraajasi mukanasi.",
-  "domain_pill.your_username": "Yksilöllinen tunnisteesi tällä palvelimella. Eri palvelimilta on mahdollista löytää käyttäjiä, joilla on sama käyttäjänimi.",
   "dropdown.empty": "Valitse vaihtoehto",
   "email_subscriptions.email": "Sähköpostiosoite",
   "email_subscriptions.form.action": "Tilaa",
@@ -745,7 +731,6 @@
   "footer.terms_of_service": "Käyttöehdot",
   "form_error.blank": "Kenttä ei voi olla tyhjä.",
   "form_field.optional": "(valinnainen)",
-  "generic.saved": "Tallennettu",
   "getting_started.heading": "Näin pääset alkuun",
   "hashtag.admin_moderation": "Avaa tunnisteen #{name} moderointinäkymä",
   "hashtag.browse": "Selaa julkaisuja tunnisteella #{hashtag}",
diff --git a/app/javascript/mastodon/locales/fil.json b/app/javascript/mastodon/locales/fil.json
index 2b5a480f7e..7c3a29eafc 100644
--- a/app/javascript/mastodon/locales/fil.json
+++ b/app/javascript/mastodon/locales/fil.json
@@ -82,7 +82,6 @@
   "account.unmute": "I-unmute si @{name}",
   "account.unmute_notifications_short": "I-unmute ang mga notification",
   "account.unmute_short": "I-unmute",
-  "account_note.placeholder": "I-click para magdagdag ng note",
   "admin.dashboard.retention.cohort_size": "Mga bagong tagagamit",
   "alert.rate_limited.message": "Mangyaring subukan muli pagkatapos ng {retry_time, time, medium}.",
   "audio.hide": "Itago ang tunog",
@@ -174,7 +173,6 @@
   "domain_block_modal.title": "Harangan ang domain?",
   "domain_block_modal.you_will_lose_relationships": "Mawawala ang lahat ng mga tagasunod at mga taong sinusindan mo mula sa serbirong ito.",
   "domain_block_modal.you_wont_see_posts": "Hindi mo makikita ang mga post o mga abiso mula sa mga tagagamit sa serbirong ito.",
-  "domain_pill.server": "Serbiro",
   "embed.instructions": "I-embed ang post na ito sa iyong pook-sapot sa pamamagitan ng pagsipi ng kodigo sa ilalim.",
   "embed.preview": "Ito ang magiging itsura:",
   "emoji_button.activity": "Aktibidad",
@@ -228,7 +226,6 @@
   "footer.about": "Tungkol dito",
   "footer.get_app": "Kunin ang app",
   "footer.status": "Katayuan",
-  "generic.saved": "Nakaimbak",
   "hashtag.column_header.tag_mode.all": "at {additional}",
   "hashtag.column_header.tag_mode.any": "o {additional}",
   "hashtag.column_settings.select.no_options_message": "Walang mungkahing nakita",
diff --git a/app/javascript/mastodon/locales/fo.json b/app/javascript/mastodon/locales/fo.json
index 8680c3b72e..bd03f205e7 100644
--- a/app/javascript/mastodon/locales/fo.json
+++ b/app/javascript/mastodon/locales/fo.json
@@ -161,7 +161,6 @@
   "account_edit_tags.search_placeholder": "Áset eitt frámerki…",
   "account_edit_tags.suggestions": "Uppskot:",
   "account_edit_tags.tag_status_count": "{count, plural, one {# postur} other {# postar}}",
-  "account_note.placeholder": "Klikka fyri at leggja viðmerking afturat",
   "admin.dashboard.daily_retention": "Hvussu nógvir brúkarar eru eftir, síðani tey skrásettu seg, roknað í døgum",
   "admin.dashboard.monthly_retention": "Hvussu nógvir brúkarar eru eftir síðani tey skrásettu seg, roknað í mánaðum",
   "admin.dashboard.retention.average": "Miðal",
@@ -447,19 +446,6 @@
   "domain_block_modal.you_will_lose_num_followers": "Tú missir {followersCount, plural, one {{followersCountDisplay} fylgjara} other {{followersCountDisplay} fylgjarar}} og {followingCount, plural, one {{followingCountDisplay} persón, sum tú fylgir} other {{followingCountDisplay} persónar, sum tú fylgir}}.",
   "domain_block_modal.you_will_lose_relationships": "Tú fer at missa allar fylgjarar og øll tey, tú fylgir á hesum ambætaranum.",
   "domain_block_modal.you_wont_see_posts": "Tú sært ongar postar ella boð frá brúkarum á hesum ambætara.",
-  "domain_pill.activitypub_lets_connect": "Tað letur teg fáa samband og samvirka við fólki ikki bara á Mastodon, men á øðrum sosialum appum eisini.",
-  "domain_pill.activitypub_like_language": "ActivityPub er málið, sum Mastodon tosar við onnur sosial netverk.",
-  "domain_pill.server": "Ambætari",
-  "domain_pill.their_handle": "Teirra hald:",
-  "domain_pill.their_server": "Teirra talgilda heim, har allir teirra postar liva.",
-  "domain_pill.their_username": "Teirra eyðmerki á teirra ambætara. Tað er møguligt at finna brúkarar við tí sama brúkaranavninum á ymiskum ambætarum.",
-  "domain_pill.username": "Brúkaranavn",
-  "domain_pill.whats_in_a_handle": "Hvat er í einum haldi?",
-  "domain_pill.who_they_are": "Eftirsum at hald siga, hvør onkur er og hvar tey eru, so kanst tú samvirka við fólk á øllum <button>ActivityPub-riknum pallum</button>.",
-  "domain_pill.who_you_are": "Av tí at tíni hald siga, hvør tú er og hvar tú eru, so kunnu onnur samvirka við teg á øllum <button>ActivityPub-riknum pallum</button>.",
-  "domain_pill.your_handle": "Títt hald:",
-  "domain_pill.your_server": "Títt talgilda heim, har allir tínir postar liva. Dámar tað ikki hendan? Flyt til ein annan ambætara tá tú hevur hug til tess og tak fylgjarar tínar við eisini.",
-  "domain_pill.your_username": "Títt eyðmerki á hesum ambætaranum. Tað er møguligt at finna brúkarar við tí sama brúkaranavninum á ymiskum ambætarum.",
   "dropdown.empty": "Vel ein møguleika",
   "embed.instructions": "Fell hendan postin inní á tínum vevstaði við at taka avrit av koduni niðanfyri.",
   "embed.preview": "Soleiðis fer tað at síggja út:",
@@ -572,7 +558,6 @@
   "footer.status": "Støða",
   "footer.terms_of_service": "Tænastutreytir",
   "form_field.optional": "(valfrítt)",
-  "generic.saved": "Goymt",
   "getting_started.heading": "At byrja",
   "hashtag.admin_moderation": "Lat umsjónarmarkamót upp fyri #{name}",
   "hashtag.browse": "Blaða gjøgnum postar í #{hashtag}",
diff --git a/app/javascript/mastodon/locales/fr-CA.json b/app/javascript/mastodon/locales/fr-CA.json
index 597c50f79d..1b431b137b 100644
--- a/app/javascript/mastodon/locales/fr-CA.json
+++ b/app/javascript/mastodon/locales/fr-CA.json
@@ -257,7 +257,6 @@
   "account_edit_tags.tag_status_count": "{count, plural, one {# message} other {# messages}}",
   "account_list.hidden_notice": "Ceci n'est visible que pour vous. Pour afficher cette liste aux autres, allez à <link>{page} > {modal} > {field}</link>.",
   "account_list.total": "{total, plural, one {# compte} other {# comptes}}",
-  "account_note.placeholder": "Cliquez pour ajouter une note",
   "admin.dashboard.daily_retention": "Taux de rétention des comptes par jour après inscription",
   "admin.dashboard.monthly_retention": "Taux de rétention des comptes par mois après inscription",
   "admin.dashboard.retention.average": "Moyenne",
@@ -596,19 +595,6 @@
   "domain_block_modal.you_will_lose_num_followers": "Vous allez perdre {followersCount, plural, one {{followersCountDisplay} abonné·e} other {{followersCountDisplay} abonné·e·s}} et {followingCount, plural, one {{followingCountDisplay} personne que vous suivez} other {{followingCountDisplay} personnes que vous suivez}}.",
   "domain_block_modal.you_will_lose_relationships": "Vous allez perdre tous les abonné·e·s et les personnes que vous suivez sur ce serveur.",
   "domain_block_modal.you_wont_see_posts": "Vous ne verrez plus les messages ou les notifications des utilisateur·rice·s de ce serveur.",
-  "domain_pill.activitypub_lets_connect": "Cela vous permet de vous connecter et d'interagir avec les autres non seulement sur Mastodon, mais également sur d'autres applications de réseaux sociaux.",
-  "domain_pill.activitypub_like_language": "ActivityPub est comme une langue que Mastodon utilise pour communiquer avec les autres réseaux sociaux.",
-  "domain_pill.server": "Serveur",
-  "domain_pill.their_handle": "Son identifiant :",
-  "domain_pill.their_server": "Son foyer numérique, là où tous ses messages résident.",
-  "domain_pill.their_username": "Son identifiant unique sur leur serveur. Il est possible de rencontrer des utilisateur·rice·s avec le même nom sur différents serveurs.",
-  "domain_pill.username": "Nom d’utilisateur·rice",
-  "domain_pill.whats_in_a_handle": "Qu'est-ce qu'un identifiant ?",
-  "domain_pill.who_they_are": "Comme un identifiant contient le nom et le service hébergeant une personne, vous pouvez interagir sur <button>les plateformes sociales implémentant ActivityPub</button>.",
-  "domain_pill.who_you_are": "Comme un identifiant indique votre nom et le service vous hébergeant, tout le monde peut interagir avec vous à l'aide de <button>plateformes sociales implémentant ActivityPub</button>.",
-  "domain_pill.your_handle": "Votre identifiant :",
-  "domain_pill.your_server": "Votre foyer numérique, là où vos messages résident. Vous souhaitez changer ? Lancez un transfert vers un autre serveur quand vous le voulez et vos abonné·e·s suivront automatiquement.",
-  "domain_pill.your_username": "Votre identifiant unique sur ce serveur. Il est possible de rencontrer des utilisateur·rice·s ayant le même nom d'utilisateur sur différents serveurs.",
   "dropdown.empty": "Sélectionner une option",
   "email_subscriptions.email": "Adresse de courriel",
   "email_subscriptions.form.action": "S’abonner",
@@ -745,7 +731,6 @@
   "footer.terms_of_service": "Conditions d’utilisation",
   "form_error.blank": "Le champ ne peut pas être vide.",
   "form_field.optional": "(facultatif)",
-  "generic.saved": "Sauvegardé",
   "getting_started.heading": "Pour commencer",
   "hashtag.admin_moderation": "Ouvrir l'interface de modération pour #{name}",
   "hashtag.browse": "Parcourir les messages dans #{hashtag}",
diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json
index c844529466..b8a986c4bb 100644
--- a/app/javascript/mastodon/locales/fr.json
+++ b/app/javascript/mastodon/locales/fr.json
@@ -257,7 +257,6 @@
   "account_edit_tags.tag_status_count": "{count, plural, one {# message} other {# messages}}",
   "account_list.hidden_notice": "Ceci n'est visible que pour vous. Pour afficher cette liste aux autres, allez à <link>{page} > {modal} > {field}</link>.",
   "account_list.total": "{total, plural, one {# compte} other {# comptes}}",
-  "account_note.placeholder": "Cliquez pour ajouter une note",
   "admin.dashboard.daily_retention": "Taux de rétention des utilisateur·rice·s par jour après inscription",
   "admin.dashboard.monthly_retention": "Taux de rétention des utilisateur·rice·s par mois après inscription",
   "admin.dashboard.retention.average": "Moyenne",
@@ -596,19 +595,6 @@
   "domain_block_modal.you_will_lose_num_followers": "Vous allez perdre {followersCount, plural, one {{followersCountDisplay} abonné·e} other {{followersCountDisplay} abonné·e·s}} et {followingCount, plural, one {{followingCountDisplay} personne que vous suivez} other {{followingCountDisplay} personnes que vous suivez}}.",
   "domain_block_modal.you_will_lose_relationships": "Vous allez perdre tous les abonné·e·s et les personnes que vous suivez sur ce serveur.",
   "domain_block_modal.you_wont_see_posts": "Vous ne verrez plus les messages ou les notifications des utilisateur·rice·s de ce serveur.",
-  "domain_pill.activitypub_lets_connect": "Cela vous permet de vous connecter et d'interagir avec les autres non seulement sur Mastodon, mais également sur d'autres applications de réseaux sociaux.",
-  "domain_pill.activitypub_like_language": "ActivityPub est comme une langue que Mastodon utilise pour communiquer avec les autres réseaux sociaux.",
-  "domain_pill.server": "Serveur",
-  "domain_pill.their_handle": "Son identifiant :",
-  "domain_pill.their_server": "Son foyer numérique, là où tous ses messages résident.",
-  "domain_pill.their_username": "Son identifiant unique sur leur serveur. Il est possible de rencontrer des utilisateur·rice·s avec le même nom sur différents serveurs.",
-  "domain_pill.username": "Nom d’utilisateur·rice",
-  "domain_pill.whats_in_a_handle": "Qu'est-ce qu'un identifiant ?",
-  "domain_pill.who_they_are": "Comme un identifiant contient le nom et le service hébergeant une personne, vous pouvez interagir sur <button>les plateformes sociales implémentant ActivityPub</button>.",
-  "domain_pill.who_you_are": "Comme un identifiant indique votre nom et le service vous hébergeant, tout le monde peut interagir avec vous à l'aide de <button>plateformes sociales implémentant ActivityPub</button>.",
-  "domain_pill.your_handle": "Votre identifiant :",
-  "domain_pill.your_server": "Votre foyer numérique, là où vos messages résident. Vous souhaitez changer ? Lancez un transfert vers un autre serveur quand vous le voulez et vos abonné·e·s suivront automatiquement.",
-  "domain_pill.your_username": "Votre identifiant unique sur ce serveur. Il est possible de rencontrer des utilisateur·rice·s ayant le même nom d'utilisateur sur différents serveurs.",
   "dropdown.empty": "Sélectionner une option",
   "email_subscriptions.email": "Adresse de courriel",
   "email_subscriptions.form.action": "S’abonner",
@@ -745,7 +731,6 @@
   "footer.terms_of_service": "Conditions d’utilisation",
   "form_error.blank": "Le champ ne peut pas être vide.",
   "form_field.optional": "(facultatif)",
-  "generic.saved": "Sauvegardé",
   "getting_started.heading": "Pour commencer",
   "hashtag.admin_moderation": "Ouvrir l'interface de modération pour #{name}",
   "hashtag.browse": "Parcourir les messages dans #{hashtag}",
diff --git a/app/javascript/mastodon/locales/fy.json b/app/javascript/mastodon/locales/fy.json
index 26b43ac623..507983097d 100644
--- a/app/javascript/mastodon/locales/fy.json
+++ b/app/javascript/mastodon/locales/fy.json
@@ -76,7 +76,6 @@
   "account.unmute": "@{name} net langer negearje",
   "account.unmute_notifications_short": "Meldingen net mear negearje",
   "account.unmute_short": "Net mear negearje",
-  "account_note.placeholder": "Klik om notysje ta te foegjen",
   "admin.dashboard.daily_retention": "Brûkerretinsjegraad per dei nei oanmelding",
   "admin.dashboard.monthly_retention": "Brûkerretinsjegraad per moanne nei oanmelding",
   "admin.dashboard.retention.average": "Gemiddelde",
@@ -248,19 +247,6 @@
   "domain_block_modal.you_will_lose_num_followers": "Jo ferlieze {followersCount, plural, one {{followersCountDisplay} folger} other {{followersCountDisplay} folgers}} en {followingCount, plural, one {{followingCountDisplay} persoan dy’t jo folgje} other {{followingCountDisplay} persoanen dy’t jo folgje}}.",
   "domain_block_modal.you_will_lose_relationships": "Jo ferlieze alle folgers en minsken dy’t jo folgje fan dizze server.",
   "domain_block_modal.you_wont_see_posts": "Jo sjogge gjin berjochten of meldingen mear fan brûkers op dizze server.",
-  "domain_pill.activitypub_lets_connect": "It soarget derfoar dat jo net allinnich mar ferbine en kommunisearje kinne mei minsken op Mastodon, mar ek mei oare sosjale apps.",
-  "domain_pill.activitypub_like_language": "ActivityPub is de taal dy’t Mastodon mei oare sosjale netwurken sprekt.",
-  "domain_pill.server": "Server",
-  "domain_pill.their_handle": "Harren fediverse-adres:",
-  "domain_pill.their_server": "Harren digitale thús, wer’t al harren berjochten binne.",
-  "domain_pill.their_username": "Harren unike identifikaasje-adres op harren server. It is mooglik dat der brûkers mei deselde brûkersnamme op ferskate servers te finen binne.",
-  "domain_pill.username": "Brûkersnamme",
-  "domain_pill.whats_in_a_handle": "Wat is in fediverse-adres?",
-  "domain_pill.who_they_are": "Omdat jo oan in fediverse-adres sjen kinne hoe’t ien hjit en op hokker server dy sit, kinne jo mei minsken op it troch <button>ActivityPub oandreaune</button> sosjale web (fediverse) kommunisearje.",
-  "domain_pill.who_you_are": "Omdat jo oan in fediverse-adres sjen kinne hoe’t jo hjitte en op hokker server jo sitte, kinne jo mei minsken op it troch <button>ActivityPub oandreaune</button> sosjale web (fediverse) kommunisearje.",
-  "domain_pill.your_handle": "Jo fediverse-adres:",
-  "domain_pill.your_server": "Jo digitale thús, wer't al jo berjochten stean. Is dizze server dochs net nei jo winsk? Dan kinne jo op elk momint nei in oare server ferhúzje en ek jo folgers oerbringe.",
-  "domain_pill.your_username": "Jo unike identifikaasje-adres op dizze server. It is mooglik dat der brûkers mei deselde brûkersnamme op ferskate servers te finen binne.",
   "embed.instructions": "Embed this status on your website by copying the code below.",
   "embed.preview": "Sa komt it der út te sjen:",
   "emoji_button.activity": "Aktiviteiten",
@@ -360,7 +346,6 @@
   "footer.source_code": "Boarnekoade besjen",
   "footer.status": "Steat",
   "footer.terms_of_service": "Tsjinstbetingsten",
-  "generic.saved": "Bewarre",
   "getting_started.heading": "Uteinsette",
   "hashtag.admin_moderation": "Moderaasje-omjouwing fan #{name} iepenje",
   "hashtag.browse": "Berjochten mei #{hashtag} besjen",
diff --git a/app/javascript/mastodon/locales/ga.json b/app/javascript/mastodon/locales/ga.json
index 954e8b9339..c9d776dc10 100644
--- a/app/javascript/mastodon/locales/ga.json
+++ b/app/javascript/mastodon/locales/ga.json
@@ -257,7 +257,6 @@
   "account_edit_tags.tag_status_count": "{count, plural, one {# post} two {# poist} few {# poist} many {# poist} other {# poist}}",
   "account_list.hidden_notice": "Níl sé seo le feiceáil ach duit. Chun an liosta seo a thaispeáint do dhaoine eile, téigh chuig <link>{page} > {modal} > {field}</link>.",
   "account_list.total": "{total, plural, one {# cuntas} two {# cuntais} few {# cuntais} many {# cuntais} other {# cuntais}}",
-  "account_note.placeholder": "Cliceáil chun nóta a chuir leis",
   "admin.dashboard.daily_retention": "Ráta coinneála an úsáideora de réir an lae tar éis clárú",
   "admin.dashboard.monthly_retention": "Ráta coinneála na n-úsáideoirí de réir na míosa tar éis dóibh clárú",
   "admin.dashboard.retention.average": "Meán",
@@ -596,19 +595,6 @@
   "domain_block_modal.you_will_lose_num_followers": "Caillfidh tú {followersCount, plural, one {{followersCountDisplay} leantóir} two {{followersCountDisplay} leantóirí} few {{followersCountDisplay} leantóirí} many {{followersCountDisplay} leantóirí} other {{followersCountDisplay} leantóirí}} agus {followingCount, plural, one {{followingCountDisplay} duine atá á leanúint agat} two {{followingCountDisplay} daoine atá á leanúint agat} few {{followingCountDisplay} daoine atá á leanúint agat} many {{followingCountDisplay} daoine atá á leanúint agat} other {{followingCountDisplay} daoine atá á leanúint agat}}.",
   "domain_block_modal.you_will_lose_relationships": "Caillfidh tú gach leantóir agus duine a leanann tú ón bhfreastalaí seo.",
   "domain_block_modal.you_wont_see_posts": "Ní fheicfidh tú postálacha nó fógraí ó úsáideoirí ar an bhfreastalaí seo.",
-  "domain_pill.activitypub_lets_connect": "Ligeann sé duit ceangal agus idirghníomhú le daoine, ní hamháin ar Mastodon, ach thar aipeanna sóisialta éagsúla freisin.",
-  "domain_pill.activitypub_like_language": "Tá GníomhaíochtPub cosúil leis an teanga a labhraíonn Mastodon le líonraí sóisialta eile.",
-  "domain_pill.server": "Freastalaí",
-  "domain_pill.their_handle": "A láimhseáil:",
-  "domain_pill.their_server": "A dteach digiteach, áit a bhfuil a gcuid post go léir ina gcónaí.",
-  "domain_pill.their_username": "Aitheantóir uathúil ar a bhfreastalaí. Is féidir teacht ar úsáideoirí leis an ainm úsáideora céanna ar fhreastalaithe éagsúla.",
-  "domain_pill.username": "Ainm úsáideora",
-  "domain_pill.whats_in_a_handle": "Cad atá i láimhseáil?",
-  "domain_pill.who_they_are": "Ós rud é go ndeir láimhseálaithe cé hé duine agus cá bhfuil siad, is féidir leat idirghníomhú le daoine ar fud an ghréasáin shóisialta de <button>ardáin atá á gcumhachtú le ActionPub</button>.",
-  "domain_pill.who_you_are": "Toisc go ndeir do láimhseáil cé tú féin agus cén áit a bhfuil tú, is féidir le daoine idirghníomhú leat ar fud an ghréasáin shóisialta de <button>ardáin atá á gcumhachtú le ActionPub</button>.",
-  "domain_pill.your_handle": "Do láimhseáil:",
-  "domain_pill.your_server": "Do theach digiteach, áit a bhfuil do phoist go léir ina gcónaí. Nach maith leat an ceann seo? Aistrigh freastalaithe am ar bith agus tabhair leat do leantóirí freisin.",
-  "domain_pill.your_username": "D'aitheantóir uathúil ar an bhfreastalaí seo. Is féidir teacht ar úsáideoirí leis an ainm úsáideora céanna ar fhreastalaithe éagsúla.",
   "dropdown.empty": "Roghnaigh rogha",
   "email_subscriptions.email": "Ríomhphost",
   "email_subscriptions.form.action": "Liostáil",
@@ -745,7 +731,6 @@
   "footer.terms_of_service": "Téarmaí seirbhíse",
   "form_error.blank": "Ní féidir an réimse a fhágáil bán.",
   "form_field.optional": "(roghnach)",
-  "generic.saved": "Sábháilte",
   "getting_started.heading": "Ag tosú amach",
   "hashtag.admin_moderation": "Oscail comhéadan modhnóireachta le haghaidh #{name}",
   "hashtag.browse": "Brabhsáil poist i #{hashtag}",
diff --git a/app/javascript/mastodon/locales/gd.json b/app/javascript/mastodon/locales/gd.json
index a75885358c..15eb011d0b 100644
--- a/app/javascript/mastodon/locales/gd.json
+++ b/app/javascript/mastodon/locales/gd.json
@@ -257,7 +257,6 @@
   "account_edit_tags.tag_status_count": "{count, plural, one {# phost} two {# phost} few {# postaichean} other {# post}}",
   "account_list.hidden_notice": "Chan fhaic ach thu fhèin seo. Gus an liosta seo a shealltainn do chàch, tadhail air <link>{page} > {modal} > {field}</link>.",
   "account_list.total": "{total, plural, one {# chunntas} two {# chunntas} few {# cunntasan} other {# cunntas}}",
-  "account_note.placeholder": "Briog airson nòta a chur ris",
   "admin.dashboard.daily_retention": "Reat glèidheadh nan cleachdaichean às dèidh an clàradh a-rèir latha",
   "admin.dashboard.monthly_retention": "Reat glèidheadh nan cleachdaichean às dèidh an clàradh a-rèir mìos",
   "admin.dashboard.retention.average": "Cuibheasach",
@@ -588,19 +587,6 @@
   "domain_block_modal.you_will_lose_num_followers": "Caillidh tu {followersCount, plural, one {{followersCountDisplay} neach-leantainn} two {{followersCountDisplay} luchd-leantainn} few {{followersCountDisplay} luchd-leantainn} other {{followersCountDisplay} luchd-leantainn}} ’s {followingCount, plural, one {{followingCountDisplay} neach a tha thu a’ leantainn} two {{followingCountDisplay} daoine a tha thu a’ leantainn} few {{followingCountDisplay} daoine a tha thu a’ leantainn} other {{followingCountDisplay} daoine a tha thu a’ leantainn}}.",
   "domain_block_modal.you_will_lose_relationships": "Caillidh tu a h-uile luchd-leantainn ’s neach a leanas tu air an fhrithealaiche seo.",
   "domain_block_modal.you_wont_see_posts": "Chan fhaic thu postaichean no brathan o chleachdaichean a th’ air an fhrithealaiche seo.",
-  "domain_pill.activitypub_lets_connect": "Leigidh e leat ceangal a dhèanamh ri daoine chan ann air Mastodon a-mhàin ach air feadh aplacaidean sòisealta eile cuideachd agus conaltradh leotha.",
-  "domain_pill.activitypub_like_language": "Tha ActivityPub coltach ri cànan a bhruidhneas Mastodon ri lìonraidhean sòisealta eile.",
-  "domain_pill.server": "Frithealaiche",
-  "domain_pill.their_handle": "An t-aithnichear aca:",
-  "domain_pill.their_server": "An dachaigh dhigiteach far a bheil na postaichean uile aca a’ fuireach.",
-  "domain_pill.their_username": "Seo an t-aithnichear àraidh aca air an fhrithealaiche aca. Dh’fhaoidte gu bheil luchd-cleachdaidh air a bheil an t-aon ainm air frithealaichean eile.",
-  "domain_pill.username": "Ainm-cleachdaiche",
-  "domain_pill.whats_in_a_handle": "Dè th’ ann an aithnichear?",
-  "domain_pill.who_they_are": "On a dh’innseas aithnichearan cò cuideigin agus càit a bheil iad, ’s urrainn dhut conaltradh le daoine thar an lìonraidh shòisealta de <button>dh’ùrlaran le cumhachd ActivityPub</button>.",
-  "domain_pill.who_you_are": "On a dh’innseas d’ aithnichear cò thusa agus càit a bheil thu, ’s urrainn do dhaoine conaltradh leat thar an lìonraidh shòisealta de <button>dh’ùrlaran le cumhachd ActivityPub</button>.",
-  "domain_pill.your_handle": "An t-aithnichear agad:",
-  "domain_pill.your_server": "Do dhachaigh dhigiteach far a bheil na postaichean uile agad a’ fuireach. Nach toigh leat an tè seo? Dèan imrich gu frithealaiche eile uair sam bith is thoir an luchd-leantainn agad leat cuideachd.",
-  "domain_pill.your_username": "Seo an t-aithnichear àraidh agad air an fhrithealaiche seo. Dh’fhaoidte gu bheil luchd-cleachdaidh air a bheil an t-aon ainm air frithealaichean eile.",
   "dropdown.empty": "Tagh roghainn",
   "email_subscriptions.email": "Post-d",
   "email_subscriptions.form.action": "Fo-sgrìobh",
@@ -737,7 +723,6 @@
   "footer.terms_of_service": "Teirmichean na seirbheise",
   "form_error.blank": "Chan fhaod an raon a bhith bàn.",
   "form_field.optional": "(roghainneil)",
-  "generic.saved": "Chaidh a shàbhaladh",
   "getting_started.heading": "Toiseach",
   "hashtag.admin_moderation": "Fosgail eadar-aghaidh na maorsainneachd dha #{name}",
   "hashtag.browse": "Rùraich na postaichean sa bheil #{hashtag}",
diff --git a/app/javascript/mastodon/locales/gl.json b/app/javascript/mastodon/locales/gl.json
index 819f7380af..8a7620db63 100644
--- a/app/javascript/mastodon/locales/gl.json
+++ b/app/javascript/mastodon/locales/gl.json
@@ -257,7 +257,6 @@
   "account_edit_tags.tag_status_count": "{count, plural, one {# publicación} other {# publicacións}}",
   "account_list.hidden_notice": "Isto só o ves ti. Para que sexa visible por outras persoas vai a  <link>{page} > {modal} > {field}</link>.",
   "account_list.total": "{total, plural, one {# conta} other {# contas}}",
-  "account_note.placeholder": "Preme para engadir nota",
   "admin.dashboard.daily_retention": "Ratio de retención de usuarias diaria após rexistrarse",
   "admin.dashboard.monthly_retention": "Ratio de retención de usuarias mensual após o rexistro",
   "admin.dashboard.retention.average": "Media",
@@ -596,19 +595,6 @@
   "domain_block_modal.you_will_lose_num_followers": "Vas perder {followersCount, plural, one {{followersCountDisplay} seguidora} other {{followersCountDisplay} seguidoras}} e {followingCount, plural, one {{followingCountDisplay} persoa que segues} other {{followingCountDisplay} persoas que segues}}.",
   "domain_block_modal.you_will_lose_relationships": "Vas perder todas as seguidoras e seguimentos a persoas deste servidor.",
   "domain_block_modal.you_wont_see_posts": "Non verás publicacións ou notificacións das usuarias deste servidor.",
-  "domain_pill.activitypub_lets_connect": "Permíteche conectar e interactuar con persoas non só de Mastodon, se non tamén con outras  sociais.",
-  "domain_pill.activitypub_like_language": "ActivityPub é algo así como o idioma que Mastodon fala con outras redes sociais.",
-  "domain_pill.server": "Servidor",
-  "domain_pill.their_handle": "O seu alcume:",
-  "domain_pill.their_server": "O seu fogar dixital, onde están as súas publicacións.",
-  "domain_pill.their_username": "O seu identificador único no seu servidor. É posible atopar usuarias co mesmo nome de usuaria en diferentes servidores.",
-  "domain_pill.username": "Nome de usuaria",
-  "domain_pill.whats_in_a_handle": "As partes do alcume?",
-  "domain_pill.who_they_are": "O alcume dinos quen é esa persoa e onde está, para que poidas interactuar con ela en toda a web social das <button>plataformas ActivityPub</button>.",
-  "domain_pill.who_you_are": "Como o teu alcume informa de quen es e onde estás, as persoas poden interactuar contigo desde toda a web social das <button>plataformas ActivityPub</button>.",
-  "domain_pill.your_handle": "O teu alcume:",
-  "domain_pill.your_server": "O teu fogar dixital, onde están as túas publicacións. Non é do teu agrado? Podes cambiar de servidor cando queiras levando as túas seguidoras contigo.",
-  "domain_pill.your_username": "O teu identificador único neste servidor. É posible que atopes usuarias co mesmo nome de usuaria en outros servidores.",
   "dropdown.empty": "Escolle unha opción",
   "email_subscriptions.email": "Correo electrónico",
   "email_subscriptions.form.action": "Subscribirse",
@@ -745,7 +731,6 @@
   "footer.terms_of_service": "Condicións do servizo",
   "form_error.blank": "O campo non pode quedar baleiro.",
   "form_field.optional": "(optativo)",
-  "generic.saved": "Gardado",
   "getting_started.heading": "Primeiros pasos",
   "hashtag.admin_moderation": "Abrir interface de moderación para ##{name}",
   "hashtag.browse": "Ver publicacións con #{hashtag}",
diff --git a/app/javascript/mastodon/locales/he.json b/app/javascript/mastodon/locales/he.json
index a4e3ae5b3d..6d975fb439 100644
--- a/app/javascript/mastodon/locales/he.json
+++ b/app/javascript/mastodon/locales/he.json
@@ -257,7 +257,6 @@
   "account_edit_tags.tag_status_count": "{count, plural, one {הודעה אחת} two {הודעותיים} other {# הודעות}}",
   "account_list.hidden_notice": "הרשימה גלויה רק לך. כדי לחשוף אותה לאחרים, יש ללכת אל <link>{page} < {modal} < {field}</link>.",
   "account_list.total": "{total, plural, one {חשבון אחד} other {# חשבונות}}",
-  "account_note.placeholder": "יש ללחוץ כדי להוסיף הערות",
   "admin.dashboard.daily_retention": "קצב שימור משתמשים יומי אחרי ההרשמה",
   "admin.dashboard.monthly_retention": "קצב שימור משתמשים (פר חודש) אחרי ההרשמה",
   "admin.dashboard.retention.average": "ממוצע",
@@ -596,19 +595,6 @@
   "domain_block_modal.you_will_lose_num_followers": "{followersCount, plural,one {יאבד לך עוקב אחד}other {יאבדו לך {followersCountDisplay} עוקבים}} {followingCount, plural,one  {ונעקב אחד}other {ו־{followingCountDisplay} נעקבים}}.",
   "domain_block_modal.you_will_lose_relationships": "יאבדו לך כל העוקבים והנעקבים משרת זה.",
   "domain_block_modal.you_wont_see_posts": "לא תוכלו לראות הודעות ממשתמשים על שרת זה.",
-  "domain_pill.activitypub_lets_connect": "מאפשר לך להתחבר ולהתרועע עם אחרים לא רק במסטודון, אלא גם ביישומים חברתיים שונים אחרים.",
-  "domain_pill.activitypub_like_language": "אקטיביטיפאב היא למעשה השפה בה מסטודון מדבר עם רשתות חברתיות אחרות.",
-  "domain_pill.server": "שרת",
-  "domain_pill.their_handle": "הכינוי שלהם:",
-  "domain_pill.their_server": "הבית המקוון שלהם, היכן שהודעותיהם שוכנות.",
-  "domain_pill.their_username": "המזהה הייחודי של השרת שלהם. ניתן למצוא משתמשים עם שם משתמש זהה על שרתים שונים.",
-  "domain_pill.username": "שם משתמש/ת",
-  "domain_pill.whats_in_a_handle": "מה כולל כינוי?",
-  "domain_pill.who_they_are": "מאחר וכינויים מספרים על מישהו ומה מיקומו, ניתן להיות בקשר עם אנשים לרוחבה של הרשת החברתית של <button>שירותי אקטיביטיפאב</button>.",
-  "domain_pill.who_you_are": "מאחר והכינוי שלך מספר על מי את.ה ומה מקומך בעולם, משתמשים מכל העולם יוכלו להיות בקשר עמך לרוחבה של הרשת החברתית של <button>שירותי אקטיביטיפאב</button>.",
-  "domain_pill.your_handle": "הכינוי שלך:",
-  "domain_pill.your_server": "הבית המקוון שלך, היכן ששוכנות כל הודעותיך. לא מוצא חן בעיניך? ניתן לעבור שרתים בכל עת וגם לשמור על העוקבים.",
-  "domain_pill.your_username": "המזהה הייחודי שלך על שרת זה. ניתן למצוא משתמשים עם שם משתמש זהה על שרתים שונים.",
   "dropdown.empty": "בחירת אפשרות",
   "email_subscriptions.email": "דוא״ל",
   "email_subscriptions.form.action": "הרשמה",
@@ -745,7 +731,6 @@
   "footer.terms_of_service": "תנאי השירות",
   "form_error.blank": "שדות לא יכולים להשאר ריקים.",
   "form_field.optional": "(אפשרות)",
-  "generic.saved": "נשמר",
   "getting_started.heading": "בואו נתחיל",
   "hashtag.admin_moderation": "פתיחת ממשק פיקוח דיון עבור #{name}",
   "hashtag.browse": "קריאת הודעות תחת #{hashtag}",
diff --git a/app/javascript/mastodon/locales/hi.json b/app/javascript/mastodon/locales/hi.json
index 27d86e4190..5db28962ca 100644
--- a/app/javascript/mastodon/locales/hi.json
+++ b/app/javascript/mastodon/locales/hi.json
@@ -74,7 +74,6 @@
   "account.unmute": "अनम्यूट @{name}",
   "account.unmute_notifications_short": "सूचनाओको मूक करे",
   "account.unmute_short": "अनम्यूट",
-  "account_note.placeholder": "नोट्स जोड़ने के लिए क्लिक करें",
   "admin.dashboard.daily_retention": "साईन-अप के बाद उपयोगकर्ता के रिटेंशन दर",
   "admin.dashboard.monthly_retention": "साईन-अप के बाद उपयोगकर्ता के महीने तक रिटेंशन दर",
   "admin.dashboard.retention.average": "औसत",
@@ -197,8 +196,6 @@
   "domain_block_modal.they_cant_follow": "इस सर्वर मेसे कोई भी आपका अनुसरण नहीं कर सकता।",
   "domain_block_modal.they_wont_know": "उनको पता नहीं चलेगा कि वे अवरोधित किए गए है।",
   "domain_block_modal.title": "डोमेन ब्लॉक करें",
-  "domain_pill.server": "सर्वर",
-  "domain_pill.username": "यूज़रनेम",
   "embed.instructions": "अपने वेबसाइट पर, निचे दिए कोड को कॉपी करके, इस स्टेटस को एम्बेड करें",
   "embed.preview": "यह ऐसा दिखेगा :",
   "emoji_button.activity": "गतिविधि",
@@ -274,7 +271,6 @@
   "footer.privacy_policy": "प्राइवेसी पालिसी",
   "footer.source_code": "सोर्स कोड देखें",
   "footer.status": "स्टेटस",
-  "generic.saved": "सेव्ड",
   "getting_started.heading": "पहले कदम रखें",
   "hashtag.column_header.tag_mode.all": "और {additional}",
   "hashtag.column_header.tag_mode.any": "या {additional}",
diff --git a/app/javascript/mastodon/locales/hr.json b/app/javascript/mastodon/locales/hr.json
index 9bfd365db4..859aaaa9ac 100644
--- a/app/javascript/mastodon/locales/hr.json
+++ b/app/javascript/mastodon/locales/hr.json
@@ -82,7 +82,6 @@
   "account_edit.custom_fields.title": "Prilagođena polja",
   "account_edit.featured_hashtags.title": "Istaknuti hashtagovi",
   "account_edit.save": "Spremi",
-  "account_note.placeholder": "Kliknite za dodavanje bilješke",
   "admin.dashboard.daily_retention": "Stopa zadržavanja korisnika po danu nakon prijave",
   "admin.dashboard.monthly_retention": "Stopa zadržavanja korisnika po mjesecu nakon prijave",
   "admin.dashboard.retention.average": "Prosječno",
@@ -247,7 +246,6 @@
   "footer.privacy_policy": "Pravila o zaštiti privatnosti",
   "footer.source_code": "Prikaz izvornog koda",
   "footer.status": "Stanje",
-  "generic.saved": "Spremljeno",
   "getting_started.heading": "Počnimo",
   "hashtag.column_header.tag_mode.all": "i {additional}",
   "hashtag.column_header.tag_mode.any": "ili {additional}",
diff --git a/app/javascript/mastodon/locales/hu.json b/app/javascript/mastodon/locales/hu.json
index 7a19c49dbb..ccb9fb8ba8 100644
--- a/app/javascript/mastodon/locales/hu.json
+++ b/app/javascript/mastodon/locales/hu.json
@@ -257,7 +257,6 @@
   "account_edit_tags.tag_status_count": "{count, plural, one {# bejegyzés} other {# bejegyzés}}",
   "account_list.hidden_notice": "Ezt csak te látod. A lista másoknak való megjelenítéshez ugorj ide: <link>{page} > {modal} > {field}</link>.",
   "account_list.total": "{total, plural, one {# fiók} other {# fiók}}",
-  "account_note.placeholder": "Kattintás jegyzet hozzáadásához",
   "admin.dashboard.daily_retention": "Napi regisztráció utáni felhasználómegtartási arány",
   "admin.dashboard.monthly_retention": "Havi regisztráció utáni felhasználómegtartási arány",
   "admin.dashboard.retention.average": "Átlag",
@@ -596,19 +595,6 @@
   "domain_block_modal.you_will_lose_num_followers": "El fogsz veszíteni {followersCount, plural, one {{followersCountDisplay} követőt} other {{followersCountDisplay} követőt}} és {followingCount, plural, one {{followingCountDisplay} követett személyt} other {{followingCountDisplay} követett személyt}}.",
   "domain_block_modal.you_will_lose_relationships": "Minden követőt és követett személyt el fogsz veszíteni erről a kiszolgálóról.",
   "domain_block_modal.you_wont_see_posts": "Nem látsz majd bejegyzéseket vagy értesítéseket ennek a kiszolgálónak a felhasználóitól.",
-  "domain_pill.activitypub_lets_connect": "Lehetővé teszi, hogy kapcsolatba lépj nem csak a Mastodonon, hanem a más közösségi alkalmazásokon lévő emberekkel is.",
-  "domain_pill.activitypub_like_language": "Az ActivityPub olyan mint egy nyelv, amelyet a Mastodon a más közösségi hálózatokkal való kommunikációra használ.",
-  "domain_pill.server": "Kiszolgáló",
-  "domain_pill.their_handle": "A fiókneve:",
-  "domain_pill.their_server": "A digitális otthona, ahol a bejegyzései találhatók.",
-  "domain_pill.their_username": "Az egyedi azonosítója a kiszolgálóján. Lehet, hogy ugyanazon felhasználónév különböző kiszolgálókon is megtalálható.",
-  "domain_pill.username": "Felhasználónév",
-  "domain_pill.whats_in_a_handle": "Mi is egy fióknév?",
-  "domain_pill.who_they_are": "Mivel a fióknevek mondják meg, hogy valaki kicsoda és hol található, így ezek használatával léphetsz kapcsolatba az <button>ActivityPubot használó platformok</button> közösségi hálózatán lévő emberekkel.",
-  "domain_pill.who_you_are": "Mivel a fiókneved mondja meg, hogy ki vagy és hol, így ezek használatával léphetnek kapcsolatba veled az <button>ActivityPubot használó platformok</button> közösségi hálózatán lévő emberek.",
-  "domain_pill.your_handle": "Saját fióknév:",
-  "domain_pill.your_server": "A digitális otthonod, ahol a bejegyzéseid találhatók. Nem tetszik a mostani? Válts kiszolgálót bármikor, és vidd magaddal a követőidet is.",
-  "domain_pill.your_username": "Az egyedi azonosítód ezen a kiszolgálón. Lehet, hogy ugyanazon felhasználónév különböző kiszolgálókon is megtalálható.",
   "dropdown.empty": "Válassz egy lehetőséget",
   "email_subscriptions.email": "E-mail-cím",
   "email_subscriptions.form.action": "Feliratkozás",
@@ -745,7 +731,6 @@
   "footer.terms_of_service": "Felhasználási feltételek",
   "form_error.blank": "A mező nem lehet üres.",
   "form_field.optional": "(nem kötelező)",
-  "generic.saved": "Elmentve",
   "getting_started.heading": "Első lépések",
   "hashtag.admin_moderation": "Moderációs felület megnyitása a következőhöz: #{name}",
   "hashtag.browse": "Bejegyzések ebben: #{hashtag}",
diff --git a/app/javascript/mastodon/locales/hy.json b/app/javascript/mastodon/locales/hy.json
index 5ad9339564..dc5683b730 100644
--- a/app/javascript/mastodon/locales/hy.json
+++ b/app/javascript/mastodon/locales/hy.json
@@ -50,7 +50,6 @@
   "account.unfollow": "Ապահետեւել",
   "account.unmute": "Ապալռեցնել @{name}֊ին",
   "account.unmute_short": "Ապախլացնել",
-  "account_note.placeholder": "Սեղմէ՛ք գրառելու համար\n",
   "admin.dashboard.retention.average": "Միջին",
   "admin.dashboard.retention.cohort": "Ամսուայ գրանցումներ",
   "admin.dashboard.retention.cohort_size": "Նոր օգտուող",
@@ -192,7 +191,6 @@
   "footer.privacy_policy": "Գաղտնիութեան քաղաքականութիւն",
   "footer.source_code": "Նայել ելակոդը",
   "footer.status": "Կարգավիճակ",
-  "generic.saved": "Պահպանուած է",
   "getting_started.heading": "Ինչպէս սկսել",
   "hashtag.column_header.tag_mode.all": "եւ {additional}",
   "hashtag.column_header.tag_mode.any": "կամ {additional}",
diff --git a/app/javascript/mastodon/locales/ia.json b/app/javascript/mastodon/locales/ia.json
index a880a37074..181b9cbb64 100644
--- a/app/javascript/mastodon/locales/ia.json
+++ b/app/javascript/mastodon/locales/ia.json
@@ -82,7 +82,6 @@
   "account.unmute": "Non plus silentiar @{name}",
   "account.unmute_notifications_short": "Non plus silentiar le notificationes",
   "account.unmute_short": "Non plus silentiar",
-  "account_note.placeholder": "Clicca pro adder un nota",
   "admin.dashboard.daily_retention": "Retention de usatores per die post inscription",
   "admin.dashboard.monthly_retention": "Retention de usatores per mense post inscription",
   "admin.dashboard.retention.average": "Media",
@@ -276,19 +275,6 @@
   "domain_block_modal.you_will_lose_num_followers": "Tu perdera {followersCount, plural, one {{followersCountDisplay} sequitor} other {{followersCountDisplay} sequitores}} e {followingCount, plural, one {{followingCountDisplay} persona que tu seque} other {{followingCountDisplay} personas que tu seque}}.",
   "domain_block_modal.you_will_lose_relationships": "Tu perdera tote le sequitores e personas que tu seque de iste servitor.",
   "domain_block_modal.you_wont_see_posts": "Tu non videra messages e notificationes de usatores sur iste servitor.",
-  "domain_pill.activitypub_lets_connect": "Illo te permitte connecter e interager con personas non solmente sur Mastodon, ma tamben sur altere applicationes social.",
-  "domain_pill.activitypub_like_language": "ActivityPub es le linguage commun que Mastodon parla con altere retes social.",
-  "domain_pill.server": "Servitor",
-  "domain_pill.their_handle": "Su pseudonymo:",
-  "domain_pill.their_server": "Su casa digital, ubi vive tote su messages.",
-  "domain_pill.their_username": "Su identificator unic sur su servitor. Es possibile trovar usatores con le mesme nomine de usator sur servitores differente.",
-  "domain_pill.username": "Nomine de usator",
-  "domain_pill.whats_in_a_handle": "Que significa un pseudonymo?",
-  "domain_pill.who_they_are": "Un pseudonymo indica qui un persona es e ubi se trova, de maniera que tu pote interager con personas sur tote le rete social de <button>platteformas basate sur ActivityPub</button>.",
-  "domain_pill.who_you_are": "Perque tu pseudonymo indica qui tu es e ubi tu te trova, le gente pote interager con te desde tote le rete social de <button>platteformas basate sur ActivityPub</button>.",
-  "domain_pill.your_handle": "Tu pseudonymo:",
-  "domain_pill.your_server": "Tu casa digital, ubi vive tote tu messages. Non te place? Cambia de servitor a omne momento e porta tu sequitores con te.",
-  "domain_pill.your_username": "Tu identificator unic sur iste servitor. Es possibile trovar usatores con le mesme nomine de usator sur servitores differente.",
   "dropdown.empty": "Selige un option",
   "embed.instructions": "Incorpora iste message sur tu sito web con le codice sequente.",
   "embed.preview": "Ecce como illlo parera:",
@@ -394,7 +380,6 @@
   "footer.source_code": "Vider le codice fonte",
   "footer.status": "Stato",
   "footer.terms_of_service": "Conditiones de servicio",
-  "generic.saved": "Salvate",
   "getting_started.heading": "Prime passos",
   "hashtag.admin_moderation": "Aperir le interfacie de moderation pro #{name}",
   "hashtag.browse": "Percurrer messages in #{hashtag}",
diff --git a/app/javascript/mastodon/locales/id.json b/app/javascript/mastodon/locales/id.json
index 31bb045ff8..ae36afb463 100644
--- a/app/javascript/mastodon/locales/id.json
+++ b/app/javascript/mastodon/locales/id.json
@@ -71,7 +71,6 @@
   "account.unmute": "Berhenti membisukan @{name}",
   "account.unmute_notifications_short": "Tampilkan notifikasi",
   "account.unmute_short": "Bunyikan",
-  "account_note.placeholder": "Klik untuk menambah catatan",
   "admin.dashboard.daily_retention": "Tingkat retensi pengguna perhari setelah mendaftar",
   "admin.dashboard.monthly_retention": "Tingkat retensi pengguna perbulan setelah mendaftar",
   "admin.dashboard.retention.average": "Rata-rata",
@@ -206,19 +205,6 @@
   "domain_block_modal.title": "Blokir domain?",
   "domain_block_modal.you_will_lose_relationships": "Kamu akan kehilangan semua pengikut dan orang yang kamu ikuti dari server ini.",
   "domain_block_modal.you_wont_see_posts": "Anda tidak akan melihat postingan atau notifikasi dari pengguna di server ini.",
-  "domain_pill.activitypub_lets_connect": "Ini memungkinkan anda terhubung dan berinteraksi dengan orang-orang tidak hanya di Mastodon, tetapi juga di berbagai aplikasi sosial.",
-  "domain_pill.activitypub_like_language": "ActivityPub seperti bahasa yang digunakan Mastodon dengan jejaring sosial lainnya.",
-  "domain_pill.server": "Server",
-  "domain_pill.their_handle": "Nama penggunanya:",
-  "domain_pill.their_server": "Rumah digital mereka, di mana semua postingan mereka tersedia.",
-  "domain_pill.their_username": "Pengenal unik mereka di server tersebut. Itu memungkinkan dapat mencari pengguna dengan nama yang sama di server lain.",
-  "domain_pill.username": "Nama pengguna",
-  "domain_pill.whats_in_a_handle": "Apa itu nama pengguna?",
-  "domain_pill.who_they_are": "Karena nama pengguna menunjukkan siapa seseorang dan di mana server mereka berada, anda dapat berinteraksi dengan orang-orang di seluruh web sosial  <button>ActivityPub-powered platforms</button>.",
-  "domain_pill.who_you_are": "<button>ActivityPub-powered platforms</button>.",
-  "domain_pill.your_handle": "Nama pengguna anda:",
-  "domain_pill.your_server": "Your digital home, where all of your posts live. Don’t like this one? Transfer servers at any time and bring your followers, too.",
-  "domain_pill.your_username": "Pengenal unik anda di server ini. Itu memungkinkan dapat mencari pengguna dengan nama yang sama di server lain.",
   "embed.instructions": "Sematkan kiriman ini di situs web Anda dengan menyalin kode di bawah ini.",
   "embed.preview": "Tampilan akan seperti ini nantinya:",
   "emoji_button.activity": "Aktivitas",
@@ -304,7 +290,6 @@
   "footer.privacy_policy": "Kebijakan privasi",
   "footer.source_code": "Lihat kode sumber",
   "footer.status": "Status",
-  "generic.saved": "Disimpan",
   "getting_started.heading": "Mulai",
   "hashtag.column_header.tag_mode.all": "dan {additional}",
   "hashtag.column_header.tag_mode.any": "atau {additional}",
diff --git a/app/javascript/mastodon/locales/ie.json b/app/javascript/mastodon/locales/ie.json
index 2b636760ff..0238f4567a 100644
--- a/app/javascript/mastodon/locales/ie.json
+++ b/app/javascript/mastodon/locales/ie.json
@@ -60,7 +60,6 @@
   "account.unmute": "Dessilentiar @{name}",
   "account.unmute_notifications_short": "Dessilentiar notificationes",
   "account.unmute_short": "Dessilentiar",
-  "account_note.placeholder": "Clicca por adjunter un nota",
   "admin.dashboard.daily_retention": "Usator-retention per die pos registration",
   "admin.dashboard.monthly_retention": "Usator-retention per mensu pos registration",
   "admin.dashboard.retention.average": "Medial",
@@ -184,19 +183,6 @@
   "domain_block_modal.they_wont_know": "Ne va esser conscient pri li bloccada.",
   "domain_block_modal.title": "Bloccar dominia?",
   "domain_block_modal.you_wont_see_posts": "Tu ne va vider postas ni notificationes de usatores sur ti-ci servitor.",
-  "domain_pill.activitypub_lets_connect": "It possibilisa tui conexiones e interactiones con persones ne solmen sur Mastodon, ma anc tra diferent social aplis.",
-  "domain_pill.activitypub_like_language": "ActivityPub es li lingue usat de Mastodon por parlar con altri social retages.",
-  "domain_pill.server": "Servitor",
-  "domain_pill.their_handle": "Identificator:",
-  "domain_pill.their_server": "Su digital hem e omni su postas.",
-  "domain_pill.their_username": "Su unic identificator sur su servitor. It es possibil que altri servitores va haver usatores con li sam nómine.",
-  "domain_pill.username": "Usator-nómine",
-  "domain_pill.whats_in_a_handle": "Ex quo consiste un identificator?",
-  "domain_pill.who_they_are": "Pro que identificatores informa qui e u un person is, tu posse interacter con persones tra li rete social de <button>ActivityPub-usant platformes</button>.",
-  "domain_pill.who_you_are": "Pro que tui identificator informa qui e u tu es, persones posse interacter con te tra li rete social de <button>ActivityPub-usant platformes</button>.",
-  "domain_pill.your_handle": "Tui identificator:",
-  "domain_pill.your_server": "Tui digital hem, u trova se omni tui postas. Si it ne plese te, tu posse transferer ad un altri servitor quandecunc e tui sequitores con te.",
-  "domain_pill.your_username": "Tui unic identificator sur ti-ci servitor. It es possibil que altri servitores va haver usatores con li sam nómine.",
   "embed.instructions": "Inbedar ti-ci posta per copiar li code in infra.",
   "embed.preview": "Vi qualmen it va aspecter:",
   "emoji_button.activity": "Activitá",
@@ -291,7 +277,6 @@
   "footer.privacy_policy": "Politica pri privatie",
   "footer.source_code": "Vider li fonte-code",
   "footer.status": "Statu",
-  "generic.saved": "Conservat",
   "getting_started.heading": "Qualmen comensar",
   "hashtag.column_header.tag_mode.all": "e {additional}",
   "hashtag.column_header.tag_mode.any": "o {additional}",
diff --git a/app/javascript/mastodon/locales/ig.json b/app/javascript/mastodon/locales/ig.json
index 176cb0cfa9..e079a752a8 100644
--- a/app/javascript/mastodon/locales/ig.json
+++ b/app/javascript/mastodon/locales/ig.json
@@ -10,7 +10,6 @@
   "account.mute": "Mee ogbi @{name}",
   "account.posts": "Edemede",
   "account.unfollow": "Kwụsị iso",
-  "account_note.placeholder": "Click to add a note",
   "admin.dashboard.retention.cohort_size": "Ojiarụ ọhụrụ",
   "annual_report.summary.new_posts.new_posts": "edemede ọhụrụ",
   "audio.hide": "Zoo ụda",
@@ -47,7 +46,6 @@
   "conversation.delete": "Hichapụ nkata",
   "conversation.open": "Lelee nkata",
   "disabled_account_banner.account_settings": "Mwube akaụntụ",
-  "domain_pill.username": "Ahaojiaru",
   "embed.instructions": "Embed this status on your website by copying the code below.",
   "emoji_button.activity": "Mmemme",
   "emoji_button.food": "Oriri & Ọṅụṅụ",
diff --git a/app/javascript/mastodon/locales/io.json b/app/javascript/mastodon/locales/io.json
index 70a074ea14..c287c20279 100644
--- a/app/javascript/mastodon/locales/io.json
+++ b/app/javascript/mastodon/locales/io.json
@@ -129,7 +129,6 @@
   "account_edit.verified_modal.invisible_link.details": "Adjuntez la ligilo ad vua kapimajo. Vu anke povas uzar ligiletiketo en la kapimajo di la pagino vice {tag}, ma la HTML mustas esar acesebla sen exekutar JavaScript.",
   "account_edit_tags.help_text": "Estalita gretvorti helpas uzanti deskovrar e interagar kun vua profilo.",
   "account_edit_tags.max_tags_reached": "Vu atingas la maxim quanto di estalita gretvorti.",
-  "account_note.placeholder": "Klikez por adjuntar noto",
   "admin.dashboard.daily_retention": "Dia uzantoretenseso pos registro",
   "admin.dashboard.monthly_retention": "Monata uzantoreteneso pos registro",
   "admin.dashboard.retention.average": "Averajo",
@@ -325,19 +324,6 @@
   "domain_block_modal.you_will_lose_num_followers": "Vu desganos {followersCount, plural, one {{followersCountDisplay} sequanto} other {{followersCountDisplay} sequanti}} e {followingCount, plural, one {{followingCountDisplay} persono quan vu sequas} other {{followingCountDisplay} personi quan vu sequas}}.",
   "domain_block_modal.you_will_lose_relationships": "Vu desganos omna sequanti e sequati de ca servilo.",
   "domain_block_modal.you_wont_see_posts": "Vu ne vidos postoi o savigi de uzanti en ca servilo.",
-  "domain_pill.activitypub_lets_connect": "Ol povigas vu kuneskas e interagar kun personi ne nur sur Mastodon, o anke kun dessama socia softwari.",
-  "domain_pill.activitypub_like_language": "ActivityPub esas kam linguo quan Mastodon parolas kun altra socia reti.",
-  "domain_pill.server": "Servilo",
-  "domain_pill.their_handle": "Lua nomo:",
-  "domain_pill.their_server": "Lua komputala hemo, e havas omna lua posti.",
-  "domain_pill.their_username": "Lua unika identesilo sur lua servilo. Posible trovar uzanti kun sama uzantonomo sur dessama servili.",
-  "domain_pill.username": "Uzantonomo",
-  "domain_pill.whats_in_a_handle": "Quo esas nomo?",
-  "domain_pill.who_they_are": "Pro ke nomo esas deskripto di ulu, vu povas interagar kun personi tra socia interreto kun <button>ActivityPub-povizo</button>.",
-  "domain_pill.who_you_are": "Pro ke vua nomo esas deskripto pri vu e vua situo, personi povas interagar kun vu tra socia interreto kun <button>ActivityPub-povizo</button>.",
-  "domain_pill.your_handle": "Vua nomo:",
-  "domain_pill.your_server": "Vua komputerala hemo qua havas omna vua posti. On povas transferar a altra servili ulatempe e anke adportar vua sequanti.",
-  "domain_pill.your_username": "Vua unika identesilo sur lua servilo. Posible trovar uzanti kun sama uzantonomo sur dessama servili.",
   "embed.instructions": "Embed this status on your website by copying the code below.",
   "embed.preview": "Co esas quon ol semblos tale:",
   "emoji_button.activity": "Ago",
@@ -444,7 +430,6 @@
   "footer.source_code": "Vidar la fontokodexo",
   "footer.status": "Stando",
   "footer.terms_of_service": "Serveskondicioni",
-  "generic.saved": "Sparesis",
   "getting_started.heading": "Debuto",
   "hashtag.admin_moderation": "Desklozar administrointervizajo por #{name}",
   "hashtag.column_header.tag_mode.all": "e {additional}",
diff --git a/app/javascript/mastodon/locales/is.json b/app/javascript/mastodon/locales/is.json
index 932ed00e28..cdb7e79894 100644
--- a/app/javascript/mastodon/locales/is.json
+++ b/app/javascript/mastodon/locales/is.json
@@ -257,7 +257,6 @@
   "account_edit_tags.tag_status_count": "{count, plural, one {# færsla} other {# færslur}}",
   "account_list.hidden_notice": "Þetta er aðeins sýnilegt þér. Til að sýna öðrum þennan lista, skaltu fara á <link>{page} > {modal} > {field}</link>.",
   "account_list.total": "{total, plural, one {# aðgangur} other {# aðgangar}}",
-  "account_note.placeholder": "Smelltu til að bæta við minnispunkti",
   "admin.dashboard.daily_retention": "Hlutfall virkra notenda eftir nýskráningu eftir dögum",
   "admin.dashboard.monthly_retention": "Hlutfall virkra notenda eftir nýskráningu eftir mánuðum",
   "admin.dashboard.retention.average": "Meðaltal",
@@ -596,19 +595,6 @@
   "domain_block_modal.you_will_lose_num_followers": "Þú munt missa {followersCount, plural, one {{followersCountDisplay} fylgjanda} other {{followersCountDisplay} fylgjendur}} og {followingCount, plural, one {{followingCountDisplay} aðila sem þú fylgist með} other {{followingCountDisplay} aðila sem þú fylgist með}}.",
   "domain_block_modal.you_will_lose_relationships": "Þú munt missa alla fylgjendur og þá sem þú fylgist með á þessum netþjóni.",
   "domain_block_modal.you_wont_see_posts": "Þú munt ekki sjá neinar færslur eða tilkynningar frá notendum á þessum netþjóni.",
-  "domain_pill.activitypub_lets_connect": "Það gerir þér kleift að tengjast og eiga í samskiptum við fólk, ekki bara á Mastodon, heldur einnig á mörgum öðrum mismunandi samfélagsmiðlum.",
-  "domain_pill.activitypub_like_language": "ActivityPub er eins og tungumál sem Mastodon notar til að tala við önnur samfélagsnet.",
-  "domain_pill.server": "Netþjónn",
-  "domain_pill.their_handle": "Kennislóðin þeirra:",
-  "domain_pill.their_server": "Stafrænt heimili viðkomandi, þar sem allar færslur hans eru hýstar.",
-  "domain_pill.their_username": "Sértækt auðkenni viðkomandi á netþjóni hans. Það er mögulegt að finna notendur með sama notandanafn á mismunandi netþjónum.",
-  "domain_pill.username": "Notandanafn",
-  "domain_pill.whats_in_a_handle": "Hvað er í kennislóð (handle)?",
-  "domain_pill.who_they_are": "Vegna þess að kennislóðir segja hver einhver sé og hvar hann sé að finna, getur þú átt í samskiptum við fólk í gegnum samfélagsvef sem knúinn er af <button>ActivityPub-samhæfðum kerfum</button>.",
-  "domain_pill.who_you_are": "Vegna þess að kennislóðin þín segir hver þú sért og hvar þig sé að finna, getur fólk átt í samskiptum við þig í gegnum samfélagsvef sem knúinn er af <button>ActivityPub-samhæfðum kerfum</button>.",
-  "domain_pill.your_handle": "Kennislóðin þín:",
-  "domain_pill.your_server": "Stafrænt heimili þitt, þar sem allar færslur þínar eru hýstar. Kanntu ekki við þennan netþjón? Þú getur flutt þig á milli netþjóna hvenær sem er og tekið með þér alla fylgjendurna þína.",
-  "domain_pill.your_username": "Sértækt auðkenni þitt á þessum netþjóni. Það er mögulegt að finna notendur með sama notandanafn á mismunandi netþjónum.",
   "dropdown.empty": "Veldu valkost",
   "email_subscriptions.email": "Tölvupóstur",
   "email_subscriptions.form.action": "Gerast áskrifandi",
@@ -745,7 +731,6 @@
   "footer.terms_of_service": "Þjónustuskilmálar",
   "form_error.blank": "Reitur má ekki vera auður.",
   "form_field.optional": "(valfrjálst)",
-  "generic.saved": "Vistað",
   "getting_started.heading": "Komast í gang",
   "hashtag.admin_moderation": "Opna umsjónarviðmót fyrir #{name}",
   "hashtag.browse": "Skoða færslur með #{hashtag}",
diff --git a/app/javascript/mastodon/locales/it.json b/app/javascript/mastodon/locales/it.json
index 23d43834ba..c3f693b091 100644
--- a/app/javascript/mastodon/locales/it.json
+++ b/app/javascript/mastodon/locales/it.json
@@ -257,7 +257,6 @@
   "account_edit_tags.tag_status_count": "{count, plural, one {# post} other {# post}}",
   "account_list.hidden_notice": "Questo è visibile solo a te. Per mostrare questa lista ad altri, vai su <link>{page} > {modal} > {field}</link>.",
   "account_list.total": "{total, plural, one {# account} other {# account}}",
-  "account_note.placeholder": "Clicca per aggiungere una nota",
   "admin.dashboard.daily_retention": "Tasso di ritenzione dell'utente per giorno, dopo la registrazione",
   "admin.dashboard.monthly_retention": "Tasso di ritenzione dell'utente per mese, dopo la registrazione",
   "admin.dashboard.retention.average": "Media",
@@ -596,19 +595,6 @@
   "domain_block_modal.you_will_lose_num_followers": "Perderai {followersCount, plural, one {{followersCountDisplay} follower} other {{followersCountDisplay} follower}} e {followingCount, plural, one {{followingCountDisplay} persona che segui} other {{followingCountDisplay} persone che segui}}.",
   "domain_block_modal.you_will_lose_relationships": "Perderai tutti i follower e le persone che segui da questo server.",
   "domain_block_modal.you_wont_see_posts": "Non vedrai post o notifiche dagli utenti su questo server.",
-  "domain_pill.activitypub_lets_connect": "Ti consente di connetterti e interagire con le persone non solo su Mastodon, ma anche su diverse app social.",
-  "domain_pill.activitypub_like_language": "ActivityPub è come la lingua che Mastodon parla con altri social network.",
-  "domain_pill.server": "Server",
-  "domain_pill.their_handle": "Il loro nome univoco:",
-  "domain_pill.their_server": "La loro casa digitale, dove risiedono tutti i loro post.",
-  "domain_pill.their_username": "Il loro identificatore univoco sul loro server. È possibile trovare utenti con lo stesso nome utente su server diversi.",
-  "domain_pill.username": "Nome utente",
-  "domain_pill.whats_in_a_handle": "Cosa c'è in un nome univoco?",
-  "domain_pill.who_they_are": "Poiché i nomi univoci indicano chi sia qualcuno e dove si trovi, puoi interagire con le persone attraverso la rete sociale delle <button>piattaforme basate su ActivityPub</button>.",
-  "domain_pill.who_you_are": "Poiché il tuo nome univoco indica chi tu sia e dove ti trovi, le persone possono interagire con te sulla rete sociale delle <button>piattaforme basate su ActivityPub</button>.",
-  "domain_pill.your_handle": "Il tuo nome univoco:",
-  "domain_pill.your_server": "La tua casa digitale, dove vivono tutti i tuoi post. Non ti piace questa? Cambia server in qualsiasi momento e porta con te anche i tuoi follower.",
-  "domain_pill.your_username": "Il tuo identificatore univoco su questo server. È possibile trovare utenti con lo stesso nome utente su server diversi.",
   "dropdown.empty": "Seleziona un'opzione",
   "email_subscriptions.email": "Email",
   "email_subscriptions.form.action": "Iscriviti",
@@ -739,13 +725,12 @@
   "footer.directory": "Cartella dei profili",
   "footer.get_app": "Scarica l'app",
   "footer.keyboard_shortcuts": "Scorciatoie da tastiera",
-  "footer.privacy_policy": "Politica sulla privacy",
+  "footer.privacy_policy": "Informativa sulla privacy",
   "footer.source_code": "Visualizza il codice sorgente",
   "footer.status": "Stato",
   "footer.terms_of_service": "Termini di servizio",
   "form_error.blank": "Il campo non può essere vuoto.",
   "form_field.optional": "(opzionale)",
-  "generic.saved": "Salvato",
   "getting_started.heading": "Per iniziare",
   "hashtag.admin_moderation": "Apri l'interfaccia di moderazione per #{name}",
   "hashtag.browse": "Sfoglia i post con #{hashtag}",
@@ -1092,7 +1077,7 @@
   "privacy.unlisted.long": "Nascosto dai risultati di ricerca di Mastodon, dalle tendenze e dalle timeline pubbliche",
   "privacy.unlisted.short": "Pubblico silenzioso",
   "privacy_policy.last_updated": "Ultimo aggiornamento {date}",
-  "privacy_policy.title": "Politica sulla Privacy",
+  "privacy_policy.title": "Informativa sulla privacy",
   "quote_error.edit": "Le citazioni non possono essere aggiunte quando si modifica un post.",
   "quote_error.poll": "Nei sondaggi non sono consentite le citazioni.",
   "quote_error.private_mentions": "Le citazioni non sono consentite con le menzioni dirette.",
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index 3da2e851d4..b8f10e5a76 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -115,7 +115,6 @@
   "account.unmute": "@{name}さんのミュートを解除",
   "account.unmute_notifications_short": "通知オフを解除",
   "account.unmute_short": "ミュート解除",
-  "account_note.placeholder": "クリックしてメモを追加",
   "admin.dashboard.daily_retention": "サインアップ後の日ごとのユーザー継続率",
   "admin.dashboard.monthly_retention": "サインアップ後の月ごとのユーザー継続率",
   "admin.dashboard.retention.average": "平均",
@@ -345,19 +344,6 @@
   "domain_block_modal.you_will_lose_num_followers": "「{followingCount, plural, other {{followingCountDisplay}フォロー}}」、「{followersCount, plural, other {{followersCountDisplay}フォロワー}}」を失うことになります。",
   "domain_block_modal.you_will_lose_relationships": "このサーバーにいるすべてのフォローとフォロワーを失うことになります。",
   "domain_block_modal.you_wont_see_posts": "このサーバーのユーザーからの投稿や通知が閲覧できなくなります。",
-  "domain_pill.activitypub_lets_connect": "この仕組みによって、Mastodonはもちろん、他のさまざまなソーシャルアプリも含めたユーザーとのつながりや交流が実現しています。",
-  "domain_pill.activitypub_like_language": "ActivityPubとは、Mastodonがほかのサーバーと会話をするときにしゃべる「言葉」のようなものです。",
-  "domain_pill.server": "サーバー",
-  "domain_pill.their_handle": "このユーザーのハンドル:",
-  "domain_pill.their_server": "ユーザーの仮想の住所です。そのユーザーIDによるすべての投稿を保持しています。",
-  "domain_pill.their_username": "ユーザーを識別する名前です。ユーザー名はひとつのサーバー内においては唯一無二の名前ですが、ほかのサーバーには同名のユーザーがいることもあります。",
-  "domain_pill.username": "ユーザー名",
-  "domain_pill.whats_in_a_handle": "ユーザーハンドルについて",
-  "domain_pill.who_they_are": "ユーザーハンドルには相手の「名前」と「住所」の情報が書いてあるため、<button>ActivityPub対応サービス</button>が連合してつくるソーシャルネットワークのユーザーであれば交流が可能です。",
-  "domain_pill.who_you_are": "ユーザーハンドルにはあなたの「名前」と「住所」の情報が書いてあるため、<button>ActivityPub対応サービス</button>が連合してつくるソーシャルネットワークのユーザーであればあなたと交流が可能です。",
-  "domain_pill.your_handle": "あなたのハンドル:",
-  "domain_pill.your_server": "あなたの仮想の住所です。投稿した内容はすべてここに保持されます。もし今いるサーバーが気に入っていない場合は、フォロワーを引き継いで別のサーバーに引っ越すこともできます。",
-  "domain_pill.your_username": "あなたを識別する名前です。ユーザー名はひとつのサーバー内においては唯一無二の名前ですが、ほかのサーバーには同名のユーザーがいることもあります。",
   "embed.instructions": "下記のコードをコピーしてウェブサイトに埋め込みます。",
   "embed.preview": "表示例:",
   "emoji_button.activity": "活動",
@@ -460,7 +446,6 @@
   "footer.status": "ステータス",
   "footer.terms_of_service": "サービス利用規約",
   "form_field.optional": "(省略可能)",
-  "generic.saved": "保存しました",
   "getting_started.heading": "スタート",
   "hashtag.admin_moderation": "#{name}のモデレーション画面を開く",
   "hashtag.browse": "#{hashtag}が付いた投稿を閲覧する",
diff --git a/app/javascript/mastodon/locales/ka.json b/app/javascript/mastodon/locales/ka.json
index c6a56055b6..861a40b602 100644
--- a/app/javascript/mastodon/locales/ka.json
+++ b/app/javascript/mastodon/locales/ka.json
@@ -26,7 +26,6 @@
   "account.unendorse": "არ გამოირჩეს პროფილზე",
   "account.unfollow": "ნუღარ მიჰყვები",
   "account.unmute": "ნუღარ აჩუმებ @{name}-ს",
-  "account_note.placeholder": "Click to add a note",
   "admin.dashboard.retention.cohort_size": "ახალი მომხმარებელი",
   "alert.unexpected.message": "წარმოიშვა მოულოდნელი შეცდომა.",
   "alert.unexpected.title": "უპს!",
diff --git a/app/javascript/mastodon/locales/kab.json b/app/javascript/mastodon/locales/kab.json
index 54530631d8..46a0d6e564 100644
--- a/app/javascript/mastodon/locales/kab.json
+++ b/app/javascript/mastodon/locales/kab.json
@@ -195,7 +195,6 @@
   "account_edit_tags.suggestions": "Isumren:",
   "account_edit_tags.tag_status_count": "{count, plural, one {# n yizen} other {# n yiznan}}",
   "account_list.total": "{total, plural, one {# n umiḍan} other {# n imiḍanen}}",
-  "account_note.placeholder": "Ulac iwenniten",
   "admin.dashboard.retention.cohort": "Ajerred deg ayyur",
   "admin.dashboard.retention.cohort_size": "Iseqdacen imaynuten",
   "alert.rate_limited.message": "Ma ulac aɣilif ɛreḍ tikelt-nniḍen akka {retry_time, time, medium}.",
@@ -425,15 +424,6 @@
   "domain_block_modal.they_wont_know": "Ur-d yettawi ara s lexbaṛ belli yettuseḥbes.",
   "domain_block_modal.title": "Sewḥel taɣult?",
   "domain_block_modal.you_wont_see_posts": "Ur tettuɣaleḍ ara ttwaliḍ tisuffaɣ neɣ ulɣuten n iseqdacen n uqeddac-a.",
-  "domain_pill.activitypub_like_language": "ActivityPub am tutlayt yettmeslay Mastodon d izeḍwan inmettiyen nniḍen.",
-  "domain_pill.server": "Aqeddac",
-  "domain_pill.their_handle": "Asulay-is:",
-  "domain_pill.username": "Isem n useqdac",
-  "domain_pill.whats_in_a_handle": "D acu i yellan deg usulay?",
-  "domain_pill.who_they_are": "Imi isulayen qqaren-d anwa i d yiwen d wanda yella, tzemreḍ ad temyigweḍ d yemdanen deg web anmetti yebnan s <button>tɣeṛɣaṛ yemmugen s ActivityPub</button>.",
-  "domain_pill.who_you_are": "Imi isulay-ik·im yeqqar-d anwa i d kečč·kemmi d wanda i telliḍ, zemren medden ad myigwen yid-k·m deg web anmetti yebnan s <button>tɣeṛɣaṛ yemmugen s ActivityPub</button>.",
-  "domain_pill.your_handle": "Asulay-ik·im:",
-  "domain_pill.your_server": "D axxam-inek·inem umḍin, anda i zedɣent akk tsuffaɣ-ik·im. Ur k·m-yeεǧib ara wa? Ssenfel-d iqeddacen melmi i ak·m-yehwa, awi-d daɣen ineḍfaren-ik·im yid-k·m.",
   "dropdown.empty": "Fren taxtiṛit",
   "email_subscriptions.email": "Imayl",
   "email_subscriptions.submitted.title": "Yiwen n usurif nniḍen",
@@ -528,7 +518,6 @@
   "footer.source_code": "Wali tangalt taɣbalut",
   "footer.status": "Addad",
   "footer.terms_of_service": "Tiwtilin n useqdec",
-  "generic.saved": "Yettwasekles",
   "getting_started.heading": "Bdu",
   "hashtag.browse": "Snirem tisuffaɣ yesɛan #{hashtag}",
   "hashtag.browse_from_account": "Snirem tisuffaɣ sɣur @{name} yesɛan #{hashtag}",
diff --git a/app/javascript/mastodon/locales/kk.json b/app/javascript/mastodon/locales/kk.json
index c7bad1cc56..ad693c14b2 100644
--- a/app/javascript/mastodon/locales/kk.json
+++ b/app/javascript/mastodon/locales/kk.json
@@ -74,7 +74,6 @@
   "account.unmute": "@{name} ескертпелерін қосу",
   "account.unmute_notifications_short": "Хабарландыруларды қосу",
   "account.unmute_short": "Қосу",
-  "account_note.placeholder": "Жазба қалдыру үшін бас",
   "admin.dashboard.daily_retention": "Тіркелгеннен кейінгі күн бойынша пайдаланушыларды сақтау көрсеткіші",
   "admin.dashboard.monthly_retention": "Тіркелгеннен кейінгі ай бойынша пайдаланушыларды сақтау көрсеткіші",
   "admin.dashboard.retention.average": "Орташа",
@@ -182,7 +181,6 @@
   "errors.unexpected_crash.report_issue": "Мәселені хабарла",
   "follow_request.authorize": "Авторизация",
   "follow_request.reject": "Қабылдамау",
-  "generic.saved": "Сақталды",
   "getting_started.heading": "Желіде",
   "hashtag.column_header.tag_mode.all": "және {additional}",
   "hashtag.column_header.tag_mode.any": "немесе {additional}",
diff --git a/app/javascript/mastodon/locales/kn.json b/app/javascript/mastodon/locales/kn.json
index b1332fd5a4..1c8875fc34 100644
--- a/app/javascript/mastodon/locales/kn.json
+++ b/app/javascript/mastodon/locales/kn.json
@@ -13,7 +13,6 @@
   "account.followers": "ಹಿಂಬಾಲಕರು",
   "account.posts": "ಟೂಟ್‌ಗಳು",
   "account.unblock_domain": "Unhide {domain}",
-  "account_note.placeholder": "Click to add a note",
   "alert.unexpected.title": "ಅಯ್ಯೋ!",
   "bundle_column_error.retry": "ಮರಳಿ ಪ್ರಯತ್ನಿಸಿ",
   "column.domain_blocks": "Hidden domains",
diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json
index 0dc559865c..c388d53d52 100644
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@@ -117,7 +117,6 @@
   "account_edit.bio_modal.edit_title": "자기소개 편집",
   "account_edit.column_button": "완료",
   "account_edit.column_title": "프로필 편집",
-  "account_note.placeholder": "클릭하여 노트 추가",
   "admin.dashboard.daily_retention": "가입 후 일별 사용자 유지율",
   "admin.dashboard.monthly_retention": "가입 후 월별 사용자 유지율",
   "admin.dashboard.retention.average": "평균",
@@ -358,19 +357,6 @@
   "domain_block_modal.you_will_lose_num_followers": "{followersCount, plural, other {{followersCountDisplay} 명의 팔로워}}와 {followingCount, plural, other {{followingCountDisplay} 명의 팔로우}}를 잃게 됩니다.",
   "domain_block_modal.you_will_lose_relationships": "이 서버의 팔로워와 팔로우를 모두 잃게 됩니다.",
   "domain_block_modal.you_wont_see_posts": "이 서버 사용자의 게시물이나 알림을 보지 않게 됩니다.",
-  "domain_pill.activitypub_lets_connect": "이것은 마스토돈 뿐만이 아니라 다른 소셜 앱들을 넘나들며 사람들을 연결하고 상호작용 할 수 있게 합니다.",
-  "domain_pill.activitypub_like_language": "액티비티펍은 마스토돈이 다른 소셜 네트워크와 대화할 때 사용하는 언어입니다.",
-  "domain_pill.server": "서버",
-  "domain_pill.their_handle": "이 사람의 핸들:",
-  "domain_pill.their_server": "작성한 모든 글들이 담겨있는 디지털 공간입니다.",
-  "domain_pill.their_username": "서버 내에서 사용되는 고유 식별자입니다. 서버마다 동일한 사용자명이 존재할 수 있습니다.",
-  "domain_pill.username": "사용자명",
-  "domain_pill.whats_in_a_handle": "핸들엔 무엇이 담겨 있나요?",
-  "domain_pill.who_they_are": "핸들은 사용자가 누구이며 어디에 있는지 알려주므로 <button>액티비티펍 기반 플랫폼</button> 어디에서든 사람들과 자유롭게 소통할 수 있습니다.",
-  "domain_pill.who_you_are": "사용자의 핸들은 본인이 누구이며 어디에 있는지 나타내므로 <button>액티비티펍 기반 플랫폼</button> 어디에서든 사용자님과 소통할 수 있습니다.",
-  "domain_pill.your_handle": "내 핸들:",
-  "domain_pill.your_server": "작성한 모든 글들이 담기는 디지털 공간입니다. 지금 서버가 마음에 들지 않나요? 언제든지 팔로워와 함께 서버를 이전할 수 있습니다.",
-  "domain_pill.your_username": "이 서버에서 유일한 내 식별자입니다. 다른 서버에서 같은 사용자명을 가진 사용자를 찾을 수도 있습니다.",
   "dropdown.empty": "옵션 선택",
   "embed.instructions": "아래 코드를 복사하여 이 게시물을 사용자님의 웹사이트에 임베드하세요.",
   "embed.preview": "이렇게 표시됩니다:",
@@ -478,7 +464,6 @@
   "footer.source_code": "소스코드 보기",
   "footer.status": "상태",
   "footer.terms_of_service": "이용 약관",
-  "generic.saved": "저장됨",
   "getting_started.heading": "시작하기",
   "hashtag.admin_moderation": "#{name}에 대한 중재화면 열기",
   "hashtag.browse": "#{hashtag}의 게시물 둘러보기",
diff --git a/app/javascript/mastodon/locales/ku.json b/app/javascript/mastodon/locales/ku.json
index 68181f0331..34fa3086b2 100644
--- a/app/javascript/mastodon/locales/ku.json
+++ b/app/javascript/mastodon/locales/ku.json
@@ -87,7 +87,6 @@
   "account.unmute": "@{name} bêdeng neke",
   "account.unmute_notifications_short": "Agahdariyan bêdeng bike",
   "account.unmute_short": "Bêdeng neke",
-  "account_note.placeholder": "Bitikîne bo nîşeyekê tevlî bikî",
   "admin.dashboard.daily_retention": "Rêjeya ragirtina bikarhêner bi roj piştî tomarkirinê",
   "admin.dashboard.monthly_retention": "Rêjeya ragirtina bikarhêner bi meh piştî tomarkirinê",
   "admin.dashboard.retention.average": "Navîn",
@@ -197,8 +196,6 @@
   "dismissable_banner.community_timeline": "Ev şandiyên giştî yên herî dawî ji kesên ku ajimêrê wan ji aliyê {domain} ve têne pêşkêşkirin.",
   "dismissable_banner.dismiss": "Paşguh bike",
   "domain_block_modal.block": "Rajekar asteng bike",
-  "domain_pill.server": "Rajekar",
-  "domain_pill.username": "Navê bikarhêner",
   "embed.instructions": "Bi jêgirtina koda jêrîn vê şandiyê li ser malpera xwe bi cih bike.",
   "embed.preview": "Ew ê çawa xuya bibe li vir tê nîşandan:",
   "emoji_button.activity": "Çalakî",
@@ -271,7 +268,6 @@
   "footer.privacy_policy": "Politîka taybetiyê",
   "footer.source_code": "Koda çavkanî nîşan bide",
   "footer.status": "Rewş",
-  "generic.saved": "Tomarkirî",
   "getting_started.heading": "Destpêkirin",
   "hashtag.column_header.tag_mode.all": "û {additional}",
   "hashtag.column_header.tag_mode.any": "an {additional}",
diff --git a/app/javascript/mastodon/locales/kw.json b/app/javascript/mastodon/locales/kw.json
index 7bf8af9fc9..3c9e23e297 100644
--- a/app/javascript/mastodon/locales/kw.json
+++ b/app/javascript/mastodon/locales/kw.json
@@ -31,7 +31,6 @@
   "account.unendorse": "Na wra diskwedhes yn profil",
   "account.unfollow": "Anholya",
   "account.unmute": "Antawhe @{name}",
-  "account_note.placeholder": "Klyckya dhe geworra noten",
   "alert.rate_limited.message": "Assayewgh arta mar pleg wosa {retry_time, time, medium}.",
   "alert.rate_limited.title": "Kevradh finwethys",
   "alert.unexpected.message": "Gwall anwaytyadow re dharva.",
@@ -132,7 +131,6 @@
   "follow_request.authorize": "Ri kummyas",
   "follow_request.reject": "Denagha",
   "follow_requests.unlocked_explanation": "Kyn na vo agas akont alhwedhys, an meni {domain} a wrug tybi y fia da genowgh dasweles govynnow holya a'n akontys ma dre leuv.",
-  "generic.saved": "Gwithys",
   "getting_started.heading": "Dhe dhalleth",
   "hashtag.column_header.tag_mode.all": "ha(g) {additional}",
   "hashtag.column_header.tag_mode.any": "po {additional}",
diff --git a/app/javascript/mastodon/locales/la.json b/app/javascript/mastodon/locales/la.json
index af2c10551a..59b724d17d 100644
--- a/app/javascript/mastodon/locales/la.json
+++ b/app/javascript/mastodon/locales/la.json
@@ -48,7 +48,6 @@
   "account.muted": "Confutatus",
   "account.requested_follow": "{name} postulavit ut te sequeretur",
   "account.unblock_short": "Solvere impedimentum",
-  "account_note.placeholder": "Click to add a note",
   "admin.dashboard.retention.average": "Mediocritas",
   "admin.impact_report.instance_accounts": "Rationes perfiles hoc deleret",
   "alert.unexpected.message": "Error inopinatus occurrit.",
@@ -85,10 +84,6 @@
   "disabled_account_banner.account_settings": "Praeferentiae ratiōnis",
   "disabled_account_banner.text": "Ratio tua {disabledAccount} debilitata est.",
   "domain_block_modal.you_wont_see_posts": "Nuntios aut notificātiōnēs ab usoribus in hōc servō nōn vidēbis.",
-  "domain_pill.activitypub_like_language": "ActivityPub est velut lingua quam Mastodon cum aliīs sociālibus rētibus loquitur.",
-  "domain_pill.your_handle": "Tuus nominulus:",
-  "domain_pill.your_server": "Tua domus digitalis, ubi omnia tua nuntia habitant. Hanc non amas? Servēs trānsferāre potes quōcumque tempore et sectātōrēs tuōs simul addūcere.",
-  "domain_pill.your_username": "Tuō singulāre id indicium in hōc servō est. Est possibile invenīre usōrēs cum eōdem nōmine in servīs aliīs.",
   "embed.instructions": "Embed this status on your website by copying the code below.",
   "emoji_button.activity": "Actiō",
   "emoji_button.food": "Cibus et potus",
@@ -111,7 +106,6 @@
   "explore.trending_statuses": "Contributa",
   "firehose.all": "Omnis",
   "footer.about": "De",
-  "generic.saved": "Servavit",
   "hashtag.column_header.tag_mode.none": "sine {additional}",
   "hashtag.column_settings.tag_mode.all": "Haec omnia",
   "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
diff --git a/app/javascript/mastodon/locales/lad.json b/app/javascript/mastodon/locales/lad.json
index f4f6a6aa1e..ae72cace9e 100644
--- a/app/javascript/mastodon/locales/lad.json
+++ b/app/javascript/mastodon/locales/lad.json
@@ -14,9 +14,15 @@
   "about.powered_by": "Redes sosyalas desentralizadas kon uzo de {mastodon}",
   "about.rules": "Reglas del sirvidor",
   "account.account_note_header": "Nota personala",
+  "account.activity": "Aktivita",
   "account.add_or_remove_from_list": "Adjusta a o kita de listas",
+  "account.badges.admin": "Administrador",
+  "account.badges.blocked": "Blokado",
   "account.badges.bot": "Otomatizado",
+  "account.badges.domain_blocked": "Domeno blokado",
   "account.badges.group": "Grupo",
+  "account.badges.muted": "Silensiado",
+  "account.badges.muted_until": "Silensyado asta {until}",
   "account.block": "Bloka @{name}",
   "account.block_domain": "Bloka el domeno {domain}",
   "account.block_short": "Bloka",
@@ -33,6 +39,14 @@
   "account.familiar_followers_two": "Segido por {name1} i {name2}",
   "account.featured": "Avaliado",
   "account.featured.accounts": "Profiles",
+  "account.featured.collections": "Koleksyones",
+  "account.featured.new_collection": "Mueva koleksyon",
+  "account.filters.all": "Toda la aktivita",
+  "account.filters.boosts_toggle": "Amostra repartajasyones",
+  "account.filters.posts_boosts": "Puvlikasyones i repartajasyones",
+  "account.filters.posts_only": "Puvlikasyones",
+  "account.filters.posts_replies": "Puvlikasyones i repuestas",
+  "account.filters.replies_toggle": "Amostra repuestas",
   "account.follow": "Sige",
   "account.follow_back": "Sige tamyen",
   "account.follow_back_short": "Sige tambyen",
@@ -51,20 +65,33 @@
   "account.go_to_profile": "Va al profil",
   "account.hide_reblogs": "Eskonde repartajasyones de @{name}",
   "account.in_memoriam": "De bendicha memoria.",
+  "account.join_modal.day": "Diya",
   "account.joined_short": "Adjunto",
   "account.languages": "Troka linguas abonadas",
   "account.link_verified_on": "La propriedad de este atadijo fue verifikada el {date}",
   "account.locked_info": "El estado de privasita de este konto esta konfigurado komo serado. El proprietario reviza manualmente kien le puede segir.",
   "account.media": "Multimedia",
   "account.mention": "Enmenta a @{name}",
+  "account.menu.add_to_list": "Adjusta a lista…",
+  "account.menu.block": "Kuento blokado",
+  "account.menu.block_domain": "Bloka a @{domain}",
+  "account.menu.copy": "Kopia atadijo",
+  "account.menu.mention": "Enmenta",
+  "account.menu.remove_follower": "Kita suivante",
+  "account.menu.share": "Partaja…",
+  "account.menu.unblock_domain": "Dezbloka @{domain}",
   "account.moved_to": "{name} tiene endikado ke su muevo kuento agora es:",
   "account.mute": "Silensia a @{name}",
   "account.mute_notifications_short": "Silensia avizos",
   "account.mute_short": "Silensia",
   "account.muted": "Silensiado",
   "account.mutual": "Vos sigesh mutualmente",
+  "account.name.copy": "Kopia alias",
   "account.no_bio": "No ay deskripsion.",
+  "account.node_modal.save": "Guadra",
+  "account.note.edit_button": "Edita",
   "account.open_original_page": "Avre pajina orijnala",
+  "account.pending": "Asperando",
   "account.posts": "Publikasyones",
   "account.report": "Raporta @{name}",
   "account.requested_follow": "{name} tiene solisitado segirte",
@@ -80,7 +107,19 @@
   "account.unmute": "Desilensia a @{name}",
   "account.unmute_notifications_short": "Desilensia avizos",
   "account.unmute_short": "Desilensia",
-  "account_note.placeholder": "Klika para adjustar nota",
+  "account_edit.advanced_settings.bot_hint": "Indika ke este kuento egzekuta prinsipalmente aksyones otomatizadas i podria no ser monitorizada",
+  "account_edit.advanced_settings.title": "Konfigurasyon avansada",
+  "account_edit.field_delete_modal.delete_button": "Efasa",
+  "account_edit.field_edit_modal.discard_confirm": "Anula",
+  "account_edit.field_edit_modal.name_label": "Etiketa",
+  "account_edit.image_alt_modal.text_label": "Teksto alternativo",
+  "account_edit.image_delete_modal.delete_button": "Efasa",
+  "account_edit.image_edit.alt_add_button": "Adjusta teksto alternativo",
+  "account_edit.image_edit.alt_edit_button": "Edita teksto alternativo",
+  "account_edit.save": "Guadra",
+  "account_edit.upload_modal.back": "Atras",
+  "account_edit.upload_modal.done": "Fecho",
+  "account_edit.upload_modal.next": "Sigiente",
   "admin.dashboard.daily_retention": "Proporsyon de retensyon de utilizadores por diya dempues de enrejistrasyon",
   "admin.dashboard.monthly_retention": "Proporsyon de retensyon de utilizadores por mez dempues de enrejistrasyon",
   "admin.dashboard.retention.average": "Media",
@@ -101,6 +140,9 @@
   "alt_text_modal.change_thumbnail": "Troka minyatura",
   "alt_text_modal.done": "Fecho",
   "announcement.announcement": "Pregon",
+  "annual_report.summary.archetype.die_drei_fragezeichen": "???",
+  "annual_report.summary.close": "Serra",
+  "annual_report.summary.copy_link": "Kopia atadijo",
   "annual_report.summary.most_used_app.most_used_app": "la aplikasyon mas uzada",
   "annual_report.summary.most_used_hashtag.most_used_hashtag": "la etiketa mas uzada",
   "annual_report.summary.new_posts.new_posts": "puvlikasyones muevas",
@@ -125,11 +167,22 @@
   "bundle_modal_error.close": "Serra",
   "bundle_modal_error.message": "Algo negro afito al eskargar este ekran.",
   "bundle_modal_error.retry": "Aprova de muevo",
+  "callout.dismiss": "Kita",
   "closed_registrations.other_server_instructions": "Deke Mastodon es desentralizado, puedes kriyar un kuento en otro sirvidor i ainda enteraktuar kon este.",
   "closed_registrations_modal.description": "Aktualmente no es posivle kriyar un kuento en {domain}, ama por favor akodrate de ke no ay menester de tener un kuento espesifikamente en {domain} para kulanear Mastodon.",
   "closed_registrations_modal.find_another_server": "Bushka otro sirvidor",
   "closed_registrations_modal.preamble": "Mastodon es desentralizado, estonses sin emportansya ande kriyas tu kuento, podras segir i enteraktuar kon kualseker persona en este sirvidor. Tamyen puedes balabayarlo tu mezmo!",
   "closed_registrations_modal.title": "Enrerjistrate en Mastodon",
+  "collections.collection_description": "Deskripsyon",
+  "collections.collection_language": "Lingua",
+  "collections.collection_language_none": "Dinguno",
+  "collections.collection_name": "Nombre",
+  "collections.copy_link": "Kopia atadijo",
+  "collections.mark_as_sensitive": "Marka komo sensivle",
+  "collections.remove_account": "Kita",
+  "collections.visibility_public": "Puvliko",
+  "collections.visibility_title": "Vizivilita",
+  "collections.visibility_unlisted": "No listado",
   "column.about": "Sovre mozotros",
   "column.blocks": "Utilizadores blokados",
   "column.bookmarks": "Markadores",
@@ -157,6 +210,7 @@
   "column_header.show_settings": "Amostra opsyones",
   "column_header.unpin": "Defiksar",
   "column_search.cancel": "Anula",
+  "combobox.loading": "Eskargando",
   "community.column_settings.local_only": "Solo lokalas",
   "community.column_settings.media_only": "Solo multimedia",
   "community.column_settings.remote_only": "Solo remotas",
@@ -189,6 +243,7 @@
   "confirmations.delete.confirm": "Efasa",
   "confirmations.delete.message": "Estas siguro ke keres efasar esta publikasyon?",
   "confirmations.delete.title": "Efasar publikasyon?",
+  "confirmations.delete_collection.confirm": "Efasa",
   "confirmations.delete_list.confirm": "Efasa",
   "confirmations.delete_list.message": "Estas siguro ke keres permanentemente efasar esta lista?",
   "confirmations.delete_list.title": "Efasa lista?",
@@ -219,6 +274,7 @@
   "content_warning.hide": "Eskonde puvlikasyon",
   "content_warning.show": "Amostra entanto",
   "content_warning.show_more": "Amostra mas",
+  "content_warning.show_short": "Amostra",
   "conversation.delete": "Efasa konversasyon",
   "conversation.mark_as_read": "Marka komo meldado",
   "conversation.open": "Ve konversasyon",
@@ -242,11 +298,6 @@
   "domain_block_modal.they_wont_know": "No savra ke tiene sido blokado.",
   "domain_block_modal.title": "Bloka el domeno?",
   "domain_block_modal.you_wont_see_posts": "No veras publikasyones ni avizos de utilizadores en este sirvidor.",
-  "domain_pill.server": "Sirvidor",
-  "domain_pill.their_handle": "Su alias:",
-  "domain_pill.username": "Nombre de utilizador",
-  "domain_pill.whats_in_a_handle": "En ke konsiste el alias?",
-  "domain_pill.your_handle": "Tu alias:",
   "dropdown.empty": "Eskoje una opsyon",
   "embed.instructions": "Enkrusta esta publikasyon en tu sitio internetiko kopiando este kodiche.",
   "embed.preview": "Paresera ansina:",
@@ -285,6 +336,7 @@
   "empty_column.mutes": "Ainda no tienes silensiado a dingun utilizador.",
   "empty_column.notifications": "Ainda no tienes dingun avizo. Kuando otras personas enteraktuen kontigo, se amostraran aki.",
   "empty_column.public": "No ay niente aki! Eskrive algo publikamente o manualmente sige utilizadores de otros sirvidores para inchirlo",
+  "empty_state.no_results": "No ay rezultados",
   "error.unexpected_crash.explanation": "Por un yerro en muestro kodiche o un problem de kompatibilita kon el navigador, no se puede amostrar esta pajina djustamente.",
   "error.unexpected_crash.explanation_addons": "No se puede amostrar esta pajina djustamente. Este yerro probavlemente fue kauzado por un komplimento del navigador o por un enstrumento de traduksyon.",
   "error.unexpected_crash.next_steps": "Aprova arefreskar la pajina. Si esto no ayuda, es posivle ke ainda puedas kulaenar Mastodon kon otro navigador u otra aplikasyon nativa.",
@@ -296,6 +348,7 @@
   "explore.trending_links": "Haberes",
   "explore.trending_statuses": "Publikasyones",
   "explore.trending_tags": "Etiketas",
+  "featured_tags.suggestions.add": "Adjusta",
   "filter_modal.added.context_mismatch_explanation": "Esta kategoria del filtro no se aplika al konteksto en ke tienes aksesido esta publikasyon. Si keres ke la publikasyon sea filtrada en este konteksto tamyen, kale editar el filtro.",
   "filter_modal.added.context_mismatch_title": "El konteksto no koensida!",
   "filter_modal.added.expired_explanation": "Esta kategoria de filtros tiene kadukado. Kale ke trokar la data de kadukasion para aplikarla.",
@@ -344,7 +397,6 @@
   "footer.source_code": "Ve kodiche fuente",
   "footer.status": "Estado",
   "footer.terms_of_service": "Terminos de servisyo",
-  "generic.saved": "Guadrado",
   "getting_started.heading": "Primos pasos",
   "hashtag.admin_moderation": "Avre la enterfaz de moderasyon para #{name}",
   "hashtag.column_header.tag_mode.all": "i {additional}",
@@ -591,6 +643,7 @@
   "onboarding.profile.discoverable_hint": "Kuando permites ke tu profil sea diskuvriravle en Mastodon, tus publikasyones podran apareser en rezultados de bushkedas i trendes i tu profil podra ser sujerido a personas kon intereses similares a los tuyos.",
   "onboarding.profile.display_name": "Nombre amostrado",
   "onboarding.profile.display_name_hint": "Tu nombre para amostrar.",
+  "onboarding.profile.finish": "Finaliza",
   "onboarding.profile.note": "Tu deskripsyon",
   "onboarding.profile.note_hint": "Puedes @enmentar a otra djente o #etiketas…",
   "onboarding.profile.title": "Konfigurasyon de profil",
@@ -803,6 +856,7 @@
   "tabs_bar.notifications": "Avizos",
   "tabs_bar.publish": "Mueva publikasyon",
   "tabs_bar.search": "Bushkeda",
+  "tag.remove": "Kita",
   "terms_of_service.title": "Terminos de servisyo",
   "time_remaining.days": "{number, plural, one {# diya restante} other {# diyas restantes}}",
   "time_remaining.hours": "{number, plural, one {# ora restante} other {# oras restantes}}",
diff --git a/app/javascript/mastodon/locales/lt.json b/app/javascript/mastodon/locales/lt.json
index e9f49ef603..517a9d6265 100644
--- a/app/javascript/mastodon/locales/lt.json
+++ b/app/javascript/mastodon/locales/lt.json
@@ -102,7 +102,6 @@
   "account.unmute": "Atšaukti nutildymą @{name}",
   "account.unmute_notifications_short": "Atšaukti pranešimų nutildymą",
   "account.unmute_short": "Atšaukti nutildymą",
-  "account_note.placeholder": "Spustelėk, kad pridėtum pastabą.",
   "admin.dashboard.daily_retention": "Naudotojų pasilikimo rodiklis pagal dieną po registracijos",
   "admin.dashboard.monthly_retention": "Naudotojų pasilikimo rodiklis pagal mėnesį po registracijos",
   "admin.dashboard.retention.average": "Vidurkis",
@@ -312,19 +311,6 @@
   "domain_block_modal.you_will_lose_num_followers": "Prarasi {followersCount, plural, one {{followersCountDisplay} sekėją} few {{followersCountDisplay} sekėjus} many {{followersCountDisplay} sekėjo} other {{followersCountDisplay} sekėjų}} ir {followingCount, plural, one {{followingCountDisplay} žmogų, kurį seki} few {{followingCountDisplay} žmones, kuriuos seki} many {{followingCountDisplay} žmonės, kuriuos seki} other {{followingCountDisplay} žmonių, kurių seki}}.",
   "domain_block_modal.you_will_lose_relationships": "Prarasi visus sekėjus ir žmones, kuriuos seki iš šio serverio.",
   "domain_block_modal.you_wont_see_posts": "Nematysi naudotojų įrašų ar pranešimų šiame serveryje.",
-  "domain_pill.activitypub_lets_connect": "Tai leidžia tau prisijungti ir bendrauti su žmonėmis ne tik „Mastodon“ platformoje, bet ir įvairiose socialinėse programėlėse.",
-  "domain_pill.activitypub_like_language": "„ActivityPub“ – tai tarsi kalba, kuria „Mastodon“ kalba su kitais socialiniais tinklais.",
-  "domain_pill.server": "Serveris",
-  "domain_pill.their_handle": "Jų socialinis medijos vardas:",
-  "domain_pill.their_server": "Jų skaitmeniniai namai, kuriuose saugomi visi jų įrašai.",
-  "domain_pill.their_username": "Jų unikalus identifikatorius jų serveryje. Skirtinguose serveriuose galima rasti naudotojų su tuo pačiu naudotojo vardu.",
-  "domain_pill.username": "Naudotojo vardas",
-  "domain_pill.whats_in_a_handle": "Kas yra socialiniame medijos varde?",
-  "domain_pill.who_they_are": "Kadangi socialines medijos vardai pasako, kas ir kur jie yra, galima bendrauti su žmonėmis visame socialiniame žiniatinklyje, kurį sudaro <button>„ActivityPub“ veikiančios platformos</button>.",
-  "domain_pill.who_you_are": "Kadangi tavo socialinis medijos vardas pasako, kas ir kur esi, žmonės gali bendrauti su tavimi visame socialiniame žiniatinklyje, kurį sudaro <button>„ActivityPub“ veikiančios platformos</button>.",
-  "domain_pill.your_handle": "Tavo socialinis medijos vardas:",
-  "domain_pill.your_server": "Tavo skaitmeniniai namai, kuriuose saugomi visi tavo įrašai. Nepatinka šis? Bet kada perkelk serverius ir atsivesk ir savo sekėjus.",
-  "domain_pill.your_username": "Tavo unikalus identifikatorius šiame serveryje. Skirtinguose serveriuose galima rasti naudotojų su tuo pačiu naudotojo vardu.",
   "dropdown.empty": "Pasirinkite variantą",
   "embed.instructions": "Įterpk šį įrašą į savo svetainę nukopijuojant toliau pateiktą kodą.",
   "embed.preview": "Štai kaip tai atrodys:",
@@ -430,7 +416,6 @@
   "footer.source_code": "Peržiūrėti šaltinio kodą",
   "footer.status": "Statusas",
   "footer.terms_of_service": "Paslaugų sąlygos",
-  "generic.saved": "Išsaugota",
   "getting_started.heading": "Kaip pradėti",
   "hashtag.admin_moderation": "Atverti moderavimo langą #{name}",
   "hashtag.browse": "Naršyti įrašus su #{hashtag}",
diff --git a/app/javascript/mastodon/locales/lv.json b/app/javascript/mastodon/locales/lv.json
index 094d293d99..5323bab63c 100644
--- a/app/javascript/mastodon/locales/lv.json
+++ b/app/javascript/mastodon/locales/lv.json
@@ -141,7 +141,6 @@
   "account_edit.upload_modal.title_replace.avatar": "Nomainīt profila fotoattēlu",
   "account_edit.upload_modal.title_replace.header": "Nomainīt titullapas fotoattēlu",
   "account_edit_tags.suggestions": "Ieteikumi:",
-  "account_note.placeholder": "Noklikšķini, lai pievienotu piezīmi",
   "admin.dashboard.daily_retention": "Lietotāju saglabāšanas rādītājs dienā pēc reģistrēšanās",
   "admin.dashboard.monthly_retention": "Lietotāju saglabāšanas rādītājs mēnesī pēc reģistrēšanās",
   "admin.dashboard.retention.average": "Vidēji",
@@ -345,15 +344,6 @@
   "domain_block_modal.title": "Liegt domēnu?",
   "domain_block_modal.you_will_lose_num_followers": "Tu zaudēsi {followersCount, plural, one {{followersCountDisplay} sekotāju} other {{followersCountDisplay} sekotājus}} un {followingCount, plural, one {{followingCountDisplay} sekojamo} other {{followingCountDisplay} sekojamos}}.",
   "domain_block_modal.you_will_lose_relationships": "Tu zaudēsi visus sekotājus un sekojamos no šī servera.",
-  "domain_pill.activitypub_lets_connect": "Tas ļauj savienoties un mijiedarboties ar cilvēkiem ne tikai no Mastodon, bet arī starp dažādām sabiedriskajām lietotnēm.",
-  "domain_pill.activitypub_like_language": "ActivityPub ir kā valoda, kurā Mastodon sazināš ar citiem sabiedriskajiem tīkliem.",
-  "domain_pill.server": "Serveris",
-  "domain_pill.their_handle": "Turis:",
-  "domain_pill.username": "Lietotājvārds",
-  "domain_pill.whats_in_a_handle": "Kas ir turī?",
-  "domain_pill.who_they_are": "Tā kā turi norāda, kas kāds ir un kur viņi ir atrodami, Tu vari mijiedarboties ar cilvēkiem viscaur sabiedriskajā tīklā no <button>ar ActivityPub darbinātām platformām</button>.",
-  "domain_pill.who_you_are": "Tā kā Tavs turis norāda, kas Tu esi un kur atrodies, cilvēki var mijiedarboties ar Tevi viscaur sabiedriskajā tīklā no <button>ar ActivityPub darbinātām platformām</button>.",
-  "domain_pill.your_handle": "Tavs turis:",
   "dropdown.empty": "Atlasīt iespēju",
   "embed.instructions": "Iekļauj šo ierakstu savā tīmekļvietnē, ievietojot zemāk redzamo kodu starpliktuvē!",
   "embed.preview": "Tas izskatīsies šādi:",
@@ -446,7 +436,6 @@
   "footer.source_code": "Skatīt pirmkodu",
   "footer.status": "Statuss",
   "footer.terms_of_service": "Pakalpojuma noteikumi",
-  "generic.saved": "Saglabāts",
   "getting_started.heading": "Darba sākšana",
   "hashtag.admin_moderation": "Atvērt #{name} satura pārraudzības saskarni",
   "hashtag.browse": "Pārlūkot #{hashtag} ierakstus",
diff --git a/app/javascript/mastodon/locales/mk.json b/app/javascript/mastodon/locales/mk.json
index 05f0b979fc..ee326baf5f 100644
--- a/app/javascript/mastodon/locales/mk.json
+++ b/app/javascript/mastodon/locales/mk.json
@@ -39,7 +39,6 @@
   "account.unendorse": "Не прикажувај на профил",
   "account.unfollow": "Одследи",
   "account.unmute": "Зачути го @{name}",
-  "account_note.placeholder": "Click to add a note",
   "alert.rate_limited.message": "Обидете се повторно после {retry_time, time, medium}.",
   "alert.unexpected.message": "Неочекувана грешка.",
   "alert.unexpected.title": "Упс!",
diff --git a/app/javascript/mastodon/locales/ml.json b/app/javascript/mastodon/locales/ml.json
index 7734e072c1..27cd28d077 100644
--- a/app/javascript/mastodon/locales/ml.json
+++ b/app/javascript/mastodon/locales/ml.json
@@ -51,7 +51,6 @@
   "account.unfollow": "പിന്തുടരുന്നത് നിര്‍ത്തുക",
   "account.unmute": "നിശ്ശബ്ദമാക്കുന്നത് നിർത്തുക @{name}",
   "account.unmute_short": "അൺമ്യൂട്ട് ചെയ്യുക",
-  "account_note.placeholder": "കുറിപ്പ് ചേർക്കാൻ ക്ലിക്കുചെയ്യുക",
   "admin.dashboard.retention.average": "ശരാശരി",
   "admin.dashboard.retention.cohort_size": "പുതിയ ഉപയോക്താക്കൾ",
   "alert.rate_limited.message": "{retry_time, time, medium} നു ശേഷം വീണ്ടും ശ്രമിക്കുക.",
@@ -149,7 +148,6 @@
   "disabled_account_banner.account_settings": "ഇടപാടു് ക്രമീകരങ്ങൾ",
   "disabled_account_banner.text": "നിങ്ങളുടെ {disabledAccount} എന്ന അക്കൗണ്ട് ഇപ്പോൾ പ്രവർത്തനരഹിതമാണ്.",
   "domain_block_modal.title": "മേഖല തടസ്സപെടുത്തുക?",
-  "domain_pill.username": "ഉപയോക്തൃപേരു്",
   "embed.instructions": "ചുവടെയുള്ള കോഡ് പകർത്തിക്കൊണ്ട് നിങ്ങളുടെ വെബ്‌സൈറ്റിൽ ഈ ടൂട്ട് ഉൾച്ചേർക്കുക.",
   "embed.preview": "ഇത് ഇങ്ങനെ കാണപ്പെടും:",
   "emoji_button.activity": "പ്രവര്‍ത്തനം",
@@ -199,7 +197,6 @@
   "footer.privacy_policy": "സ്വകാര്യത്തനയം",
   "footer.source_code": "ഉറവിടസങ്കേതം കാണുക",
   "footer.status": "അവസ്ഥ",
-  "generic.saved": "സംരക്ഷിച്ചു",
   "getting_started.heading": "തുടക്കം കുറിക്കുക",
   "hashtag.column_header.tag_mode.all": "{additional} ഉം കൂടെ",
   "hashtag.column_header.tag_mode.any": "അല്ലെങ്കിൽ {additional}",
diff --git a/app/javascript/mastodon/locales/mr.json b/app/javascript/mastodon/locales/mr.json
index 6f0e927f12..3eda891333 100644
--- a/app/javascript/mastodon/locales/mr.json
+++ b/app/javascript/mastodon/locales/mr.json
@@ -56,7 +56,6 @@
   "account.unfollow": "अनुयायी असणे थांबवा",
   "account.unmute": "@{name} अनम्यूट करा",
   "account.unmute_short": "अनम्यूट करा",
-  "account_note.placeholder": "Click to add a note",
   "admin.dashboard.daily_retention": "साइन अप केल्यानंतर दिवसा वापरकर्ता धारणा दर",
   "admin.dashboard.monthly_retention": "साइन अप केल्यानंतर महिन्यानुसार वापरकर्ता धारणा दर",
   "admin.dashboard.retention.average": "सरासरी",
diff --git a/app/javascript/mastodon/locales/ms.json b/app/javascript/mastodon/locales/ms.json
index cd34511c1a..3c28a1e275 100644
--- a/app/javascript/mastodon/locales/ms.json
+++ b/app/javascript/mastodon/locales/ms.json
@@ -69,7 +69,6 @@
   "account.unmute": "Nyahbisukan @{name}",
   "account.unmute_notifications_short": "Nyahredamkan pemberitahuan",
   "account.unmute_short": "Nyahredam",
-  "account_note.placeholder": "Klik untuk menambah catatan",
   "admin.dashboard.daily_retention": "Kadar pengekalan pengguna mengikut hari selepas mendaftar",
   "admin.dashboard.monthly_retention": "Kadar pengekalan pengguna mengikut bulan selepas mendaftar",
   "admin.dashboard.retention.average": "Purata",
@@ -231,12 +230,6 @@
   "domain_block_modal.you_will_lose_num_followers": "Anda akan kehilangan {followersCount, plural, other {{followersCountDisplay} pengikut}} dan {followingCount, plural, other {{followingCountDisplay} ikutan}}.",
   "domain_block_modal.you_will_lose_relationships": "Anda akan kehilangan semua pengikut dan ikutan anda dari pelayan ini.",
   "domain_block_modal.you_wont_see_posts": "Anda tidak akan melihat hantaran atau pemberitahuan dari pengguna pada pelayan ini.",
-  "domain_pill.activitypub_lets_connect": "Hal ini membolehkan anda berhubung dan berinteraksi bukan sahaja dengan pengguna Mastodon tetapi melintasi pelbagai aplikasi sosial juga.",
-  "domain_pill.activitypub_like_language": "ActivityPub adalah seperti bahasa yang digunakan oleh Mastodon untuk berhubung dengan jaringan sosial lain.",
-  "domain_pill.server": "Pelayan",
-  "domain_pill.your_handle": "Pemegang anda:",
-  "domain_pill.your_server": "Rumah maya anda, tempatnya hantaran anda disimpan. Tidak berkenan dengan yang ini? Pindah antara pelayan pada bila-bila masa dan bawa pengikut anda sekali.",
-  "domain_pill.your_username": "Pengenal unik anda pada pelayan ini. Anda mungkin akan berkongsi nama pengguna dengan pengguna daripada pelayan lain.",
   "embed.instructions": "Benam hantaran ini di laman sesawang anda dengan menyalin kod berikut.",
   "embed.preview": "Begini rupanya nanti:",
   "emoji_button.activity": "Aktiviti",
@@ -322,7 +315,6 @@
   "footer.privacy_policy": "Dasar privasi",
   "footer.source_code": "Lihat kod sumber",
   "footer.status": "Status:",
-  "generic.saved": "Disimpan",
   "getting_started.heading": "Mari bermula",
   "hashtag.column_header.tag_mode.all": "dan {additional}",
   "hashtag.column_header.tag_mode.any": "atau {additional}",
diff --git a/app/javascript/mastodon/locales/my.json b/app/javascript/mastodon/locales/my.json
index 87604e5912..c45ee000a9 100644
--- a/app/javascript/mastodon/locales/my.json
+++ b/app/javascript/mastodon/locales/my.json
@@ -59,7 +59,6 @@
   "account.unmute": "{name} ကို ပြန်ဖွင့်ရန်",
   "account.unmute_notifications_short": "အကြောင်းကြားချက်များကို ဖွင့်ထားရန်",
   "account.unmute_short": "ပြန်ဖွင့်ရန်",
-  "account_note.placeholder": "Click to add a note",
   "admin.dashboard.daily_retention": "အကောင့်ဖွင့်ပြီးနောက် တစ်ရက်ပြီးတစ်ရက် အသုံးပြုသူ ထိန်းသိမ်းမှုနှုန်း",
   "admin.dashboard.monthly_retention": "အကောင့်ဖွင့်ပြီးနောက် တစ်လအလိုက် အသုံးပြုသူ ထိန်းသိမ်းမှုနှုန်း",
   "admin.dashboard.retention.average": "ပျမ်းမျှ",
@@ -240,7 +239,6 @@
   "footer.privacy_policy": "ကိုယ်ရေးအချက်အလက်မူဝါဒ",
   "footer.source_code": "မူရင်းကုဒ်အားကြည့်ရှုမည်",
   "footer.status": "အခြေအနေ",
-  "generic.saved": "သိမ်းဆည်းထားပြီး",
   "getting_started.heading": "စတင်မည်",
   "hashtag.column_header.tag_mode.all": "နှင့် {additional}",
   "hashtag.column_header.tag_mode.any": "သို့မဟုတ် {additional}",
diff --git a/app/javascript/mastodon/locales/nan-TW.json b/app/javascript/mastodon/locales/nan-TW.json
index 740931123d..3f5e73342f 100644
--- a/app/javascript/mastodon/locales/nan-TW.json
+++ b/app/javascript/mastodon/locales/nan-TW.json
@@ -257,7 +257,6 @@
   "account_edit_tags.tag_status_count": "{count, plural, other {# 篇PO文}}",
   "account_list.hidden_notice": "Tse kan-ta lí ē當看。若beh kā tsit ê列單予別lâng看，請kàu <link>{page} > {modal} > {field}</link>。",
   "account_list.total": "{total, plural, other {# ê口座}}",
-  "account_note.placeholder": "Tshi̍h tse加註kha",
   "admin.dashboard.daily_retention": "註冊以後ê用者維持率（用kang計算）",
   "admin.dashboard.monthly_retention": "註冊以後ê用者維持率",
   "admin.dashboard.retention.average": "平均",
@@ -596,19 +595,6 @@
   "domain_block_modal.you_will_lose_num_followers": "Lí ē失去 {followersCount, plural, other {{followersCountDisplay} ê lâng跟tuè}} kap {followingCount, plural, other {{followingCountDisplay} ê lí所tuè ê 口座}}。",
   "domain_block_modal.you_will_lose_relationships": "Lí ē失去逐ê佇tsit ê服侍器跟tuè lí ê，kap lí所跟tuè ê。",
   "domain_block_modal.you_wont_see_posts": "Lí buē看見tsit ê服侍器ê用者所送ê PO文kap通知。",
-  "domain_pill.activitypub_lets_connect": "伊ē hōo lí kap Mastodon ê lâng連結kap互動，其他社交應用程式ê lâng mā ē使。",
-  "domain_pill.activitypub_like_language": "ActivityPub親像Mastodon kap其他社交應用程式所講ê語言。",
-  "domain_pill.server": "服侍器",
-  "domain_pill.their_handle": "In ê口座：",
-  "domain_pill.their_server": "In數位ê tau，in所有ê PO文lóng tī tsia。",
-  "domain_pill.their_username": "In佇in ê服侍器獨一ê稱呼。佇無kâng ê服侍器有可能tshuē著kāng名ê用者。",
-  "domain_pill.username": "用者ê名",
-  "domain_pill.whats_in_a_handle": "口座是siánn-mih？",
-  "domain_pill.who_they_are": "因為口座(handle)表示tsit ê lâng是siáng kap tī toh，lí ē當佇<button>支援ActivityPub ê平臺</button>. ê社交網路kap lâng交流。",
-  "domain_pill.who_you_are": "因為口座(handle)表示lí是siáng kap tī toh，lâng ē當佇<button>支援ActivityPub ê平臺</button>. ê社交網路kap lí交流。",
-  "domain_pill.your_handle": "Lí ê口座：",
-  "domain_pill.your_server": "Lí數位ê厝，內底有lí所有ê PO文。無kah意？Ē當轉kàu別ê服侍器，koh保有跟tuè lí êl âng。.",
-  "domain_pill.your_username": "Lí 佇tsit ê服侍器獨一ê稱呼。佇無kâng ê服侍器有可能tshuē著kāng名ê用者。",
   "dropdown.empty": "揀選項",
   "email_subscriptions.email": "電子phue箱",
   "email_subscriptions.form.action": "訂",
@@ -745,7 +731,6 @@
   "footer.terms_of_service": "服務規定",
   "form_error.blank": "框á bē當空白。",
   "form_field.optional": "（通揀）",
-  "generic.saved": "儲存ah",
   "getting_started.heading": "開始用",
   "hashtag.admin_moderation": "Phah開 #{name} ê管理界面",
   "hashtag.browse": "瀏覽佇 #{hashtag} ê PO文",
@@ -938,6 +923,7 @@
   "notification.admin.sign_up.name_and_others": "{name} kap {count, plural, other {其他 # ê lâng}} ê口座有開ah",
   "notification.annual_report.message": "Lí ê {year} #Wrapstodon teh等lí！緊來看tsit年lí佇Mastodon頂ê上精彩ê內容，kap難忘ê時刻！",
   "notification.annual_report.view": "Kā #Wrapstodon 看māi。",
+  "notification.collection_update": "{name} 有編lí有佇leh ê收藏",
   "notification.favourite": "{name} kah意lí ê PO文",
   "notification.favourite.name_and_others_with_link": "{name} kap<a>{count, plural, other {另外 # ê lâng}}</a>kah意lí ê PO文",
   "notification.favourite_pm": "{name} kah意lí ê私人ê提起",
@@ -1201,6 +1187,7 @@
   "server_banner.active_users": "活動ê用者",
   "server_banner.administered_by": "管理員：",
   "server_banner.is_one_of_many": "{domain} 屬佇tsē-tsē獨立ê Mastodonê服侍器，lí ē當用tse參與聯邦宇宙。",
+  "server_banner.more_about_this_server": "關係tsit ê服侍器ê詳細",
   "server_banner.server_stats": "服侍器ê統計：",
   "sign_in_banner.create_account": "開口座",
   "sign_in_banner.follow_anyone": "跟tuè聯邦宇宙ê任何tsi̍t ê，用時間ê順序看所有ê內容。無演算法、廣告、點滑鼠ê餌(clickbait)。",
diff --git a/app/javascript/mastodon/locales/ne.json b/app/javascript/mastodon/locales/ne.json
index 7d4788dbcf..ccc4e18b0c 100644
--- a/app/javascript/mastodon/locales/ne.json
+++ b/app/javascript/mastodon/locales/ne.json
@@ -64,7 +64,6 @@
   "account.unmute": "@{name}लाई अनम्युट गर्नुहोस्",
   "account.unmute_notifications_short": "सूचनाहरू अनम्युट गर्नुहोस्",
   "account.unmute_short": "अनम्यूट गर्नुहोस्",
-  "account_note.placeholder": "नोट लेख्न क्लिक गर्नुहोस्",
   "admin.dashboard.retention.average": "औसत",
   "admin.dashboard.retention.cohort_size": "नयाँ प्रयोगकर्ताहरू",
   "alert.rate_limited.message": "कृपया {retry_time, time, medium} पछि पुन: प्रयास गर्नुहोस्।",
diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json
index 54f6d1c71e..6572bce6e6 100644
--- a/app/javascript/mastodon/locales/nl.json
+++ b/app/javascript/mastodon/locales/nl.json
@@ -257,7 +257,6 @@
   "account_edit_tags.tag_status_count": "{count, plural, one {# bericht} other {# berichten}}",
   "account_list.hidden_notice": "Dit is alleen voor jou zichtbaar. Om deze lijst aan anderen te tonen, ga naar <link>{page} > {modal} > {field}</link>.",
   "account_list.total": "{total, plural, one {# account} other {# accounts}}",
-  "account_note.placeholder": "Klik om een opmerking toe te voegen",
   "admin.dashboard.daily_retention": "Retentiegraad van gebruikers per dag, vanaf registratie",
   "admin.dashboard.monthly_retention": "Retentiegraad van gebruikers per maand, vanaf registratie",
   "admin.dashboard.retention.average": "Gemiddelde",
@@ -596,19 +595,6 @@
   "domain_block_modal.you_will_lose_num_followers": "Je verliest {followersCount, plural, one {{followersCountDisplay} volger} other {{followersCountDisplay} volgers}} en {followingCount, plural, one {{followingCountDisplay} persoon die jij volgt} other {{followingCountDisplay} personen die jij volgt}}.",
   "domain_block_modal.you_will_lose_relationships": "Je verliest alle volgers en mensen die je volgt van deze server.",
   "domain_block_modal.you_wont_see_posts": "Je ziet geen berichten of meldingen meer van gebruikers op deze server.",
-  "domain_pill.activitypub_lets_connect": "Het zorgt ervoor dat je niet alleen maar kunt verbinden en communiceren met mensen op Mastodon, maar ook met andere sociale apps.",
-  "domain_pill.activitypub_like_language": "ActivityPub is de taal die Mastodon met andere sociale netwerken spreekt.",
-  "domain_pill.server": "Server",
-  "domain_pill.their_handle": "Hun fediverse-adres:",
-  "domain_pill.their_server": "Hun digitale thuis, waar al hun berichten zich bevinden.",
-  "domain_pill.their_username": "Hun unieke identificatie-adres op hun server. Het is mogelijk dat er gebruikers met dezelfde gebruikersnaam op verschillende servers te vinden zijn.",
-  "domain_pill.username": "Gebruikersnaam",
-  "domain_pill.whats_in_a_handle": "Wat is een fediverse-adres?",
-  "domain_pill.who_they_are": "Omdat je aan een fediverse-adres kunt zien hoe iemand heet en op welke server die zich bevindt, kun je met mensen op het door <button>ActivityPub aangedreven</button> sociale web (fediverse) communiceren.",
-  "domain_pill.who_you_are": "Omdat je aan jouw fediverse-adres kunt zien hoe je heet en op welke server je je bevindt, kunnen mensen op het door <button>ActivityPub aangedreven</button> sociale web (fediverse) met jou communiceren.",
-  "domain_pill.your_handle": "Jouw fediverse-adres:",
-  "domain_pill.your_server": "Jouw digitale thuis, waar al jouw berichten zich bevinden. Is deze server toch niet naar jouw wens? Dan kun je op elk moment naar een andere server verhuizen en ook jouw volgers overbrengen.",
-  "domain_pill.your_username": "Jouw unieke identificatie-adres op deze server. Het is mogelijk dat er gebruikers met dezelfde gebruikersnaam op verschillende servers te vinden zijn.",
   "dropdown.empty": "Selecteer een optie",
   "email_subscriptions.email": "E-mailadres",
   "email_subscriptions.form.action": "Abonneren",
@@ -745,7 +731,6 @@
   "footer.terms_of_service": "Gebruiksvoorwaarden",
   "form_error.blank": "Veld mag niet leeg zijn.",
   "form_field.optional": "(optioneel)",
-  "generic.saved": "Opgeslagen",
   "getting_started.heading": "Aan de slag",
   "hashtag.admin_moderation": "Moderatie-omgeving van #{name} openen",
   "hashtag.browse": "Berichten met #{hashtag} bekijken",
diff --git a/app/javascript/mastodon/locales/nn.json b/app/javascript/mastodon/locales/nn.json
index 4a317a0447..07c62166c0 100644
--- a/app/javascript/mastodon/locales/nn.json
+++ b/app/javascript/mastodon/locales/nn.json
@@ -257,7 +257,6 @@
   "account_edit_tags.tag_status_count": "{count, plural, one {# innlegg} other {# innlegg}}",
   "account_list.hidden_notice": "Berre du ser dette. Gå til <link>{page} > {modal} > {field}</link> for å syna lista til andre.",
   "account_list.total": "{total, plural, one {# konto} other {# kontoar}}",
-  "account_note.placeholder": "Klikk for å leggja til merknad",
   "admin.dashboard.daily_retention": "Mengda brukarar aktive ved dagar etter registrering",
   "admin.dashboard.monthly_retention": "Mengda brukarar aktive ved månader etter registrering",
   "admin.dashboard.retention.average": "Gjennomsnitt",
@@ -559,19 +558,6 @@
   "domain_block_modal.you_will_lose_num_followers": "Du vil mista {followersCount, plural, one {{followersCountDisplay} fylgjar} other {{followersCountDisplay} fylgjarar}} og {followingCount, plural, one {{followingCountDisplay} person du fylgjer} other {{followingCountDisplay} folk du fylgjer}}.",
   "domain_block_modal.you_will_lose_relationships": "Du vil mista alle fylgjarar og folk du fylgjer på denne tenaren.",
   "domain_block_modal.you_wont_see_posts": "Du vil ikkje sjå innlegg eller varslingar frå brukarar på denne tenaren.",
-  "domain_pill.activitypub_lets_connect": "Den lar deg kople til og samhandle med folk ikkje berre på Mastodon, men òg på tvers av forskjellige sosiale appar.",
-  "domain_pill.activitypub_like_language": "ActivityPub er som språket Mastodon snakkar med andre sosiale nettverk.",
-  "domain_pill.server": "Tenar",
-  "domain_pill.their_handle": "Deira handtak:",
-  "domain_pill.their_server": "Deira digitale heim, som alle innlegga deira bur.",
-  "domain_pill.their_username": "Deira unike identifikator på serveren deira. Det er mogleg å finne brukarar med same brukarnamn på forskjellige tenarar.",
-  "domain_pill.username": "Brukarnamn",
-  "domain_pill.whats_in_a_handle": "Kva er i eit handtak?",
-  "domain_pill.who_they_are": "Sidan handtak seier kven nokon er og kvar dei er, kan du interagere med folk på tvers av det sosiale nettverket av <button>plattformar som støttar ActivityPub</button>.",
-  "domain_pill.who_you_are": "Sidan handtaket ditt seier kven du er og kvar du er, kan folk interagere med deg på tvers av det sosiale nettverket av <button>plattformar som støttar ActivityPub</button>.",
-  "domain_pill.your_handle": "Handtaket ditt:",
-  "domain_pill.your_server": "Din digitale heim, der alle innlegga dine bur. Liker du ikkje dette? Byt til ein ny tenar når som helst og ta med fylgjarane dine òg.",
-  "domain_pill.your_username": "Din unike identifikator på denne tenaren. Det er mogleg å finne brukarar med same brukarnamn på forskjellige tenarar.",
   "dropdown.empty": "Vel eit alternativ",
   "email_subscriptions.email": "Epost",
   "email_subscriptions.form.action": "Abonner",
@@ -702,7 +688,6 @@
   "footer.terms_of_service": "Brukarvilkår",
   "form_error.blank": "Feltet kan ikkje vera tomt.",
   "form_field.optional": "(valfritt)",
-  "generic.saved": "Lagra",
   "getting_started.heading": "Kom i gang",
   "hashtag.admin_moderation": "Opne moderasjonsgrensesnitt for #{name}",
   "hashtag.browse": "Bla gjennom innlegg i #{hashtag}",
diff --git a/app/javascript/mastodon/locales/no.json b/app/javascript/mastodon/locales/no.json
index 9ca73413d0..d8851a95bf 100644
--- a/app/javascript/mastodon/locales/no.json
+++ b/app/javascript/mastodon/locales/no.json
@@ -139,7 +139,6 @@
   "account_edit.custom_fields.title": "Egendefinerte felter",
   "account_edit.custom_fields.verified_hint": "Hvordan legger jeg til en verifisert lenke?",
   "account_edit.save": "Lagre",
-  "account_note.placeholder": "Klikk for å legge til et notat",
   "admin.dashboard.daily_retention": "Andel brukere som er aktive, per dag etter registrering",
   "admin.dashboard.monthly_retention": "Andel brukere som er aktive, per måned etter registrering",
   "admin.dashboard.retention.average": "Gjennomsnitt",
@@ -333,19 +332,6 @@
   "domain_block_modal.you_will_lose_num_followers": "Du kommer til å miste {followersCount, plural, one {{followersCountDisplay} følger} other {{followersCountDisplay} følgere}} og {followingCount, plural, one {{followingCountDisplay} du følger} other {{followingCountDisplay} du følger}}.",
   "domain_block_modal.you_will_lose_relationships": "Du vil miste alle følgere og folk du følger fra denne serveren.",
   "domain_block_modal.you_wont_see_posts": "Du vil ikke se innlegg eller få varsler fra brukere på denne serveren.",
-  "domain_pill.activitypub_lets_connect": "Den lar deg koble til og samhandle med folk ikke bare på Mastodon, men også på tvers av forskjellige sosiale apper.",
-  "domain_pill.activitypub_like_language": "ActivityPub er liksom språket Mastodon snakker med andre sosiale nettverk.",
-  "domain_pill.server": "Server",
-  "domain_pill.their_handle": "Deres håndtak:",
-  "domain_pill.their_server": "Deres digitale hjem, hvor alle innleggene deres bor.",
-  "domain_pill.their_username": "Deres unike identifikator på serveren sin. Det er mulig å finne brukere med samme brukernavn på forskjellige servere.",
-  "domain_pill.username": "Brukernavn",
-  "domain_pill.whats_in_a_handle": "Hva er et håndtak?",
-  "domain_pill.who_they_are": "Siden håndtakene sier hvem noen er og hvor de er, kan du samhandle med folk på tvers av det sosiale nettverket bestående av <button>plattformer som støtter ActivityPub</button>.",
-  "domain_pill.who_you_are": "Fordi ditt håndtak sier hvem du er og hvor du er, kan folk kommunisere med deg på tvers av <button>plattformer som støtter ActivityPub</button>.",
-  "domain_pill.your_handle": "Din håndtak:",
-  "domain_pill.your_server": "Ditt digitale hjem, hvor alle dine innlegg bor. Liker du ikke denne? Flytt till en annen server når som helst og ta med følgerne dine.",
-  "domain_pill.your_username": "Din unike identifikator på denne serveren. Det er mulig å finne brukere med samme brukernavn på forskjellige servere.",
   "embed.instructions": "Kopier koden under for å bygge inn denne statusen på hjemmesiden din.",
   "embed.preview": "Slik kommer det til å se ut:",
   "emoji_button.activity": "Aktivitet",
@@ -445,7 +431,6 @@
   "footer.source_code": "Vis kildekode",
   "footer.status": "Status",
   "footer.terms_of_service": "Bruksvilkår",
-  "generic.saved": "Lagret",
   "getting_started.heading": "Kom i gang",
   "hashtag.admin_moderation": "Åpne modereringsgrensesnitt for #{name}",
   "hashtag.browse": "Utforsk poster i #{hashtag}",
diff --git a/app/javascript/mastodon/locales/oc.json b/app/javascript/mastodon/locales/oc.json
index cf13737c7b..a001cc8ec0 100644
--- a/app/javascript/mastodon/locales/oc.json
+++ b/app/javascript/mastodon/locales/oc.json
@@ -86,7 +86,6 @@
   "account_edit.column_title": "Modificar lo perfil",
   "account_edit.field_delete_modal.delete_button": "Suprimir",
   "account_edit.field_edit_modal.value_label": "Valor",
-  "account_note.placeholder": "Clicar per ajustar una nòta",
   "admin.dashboard.retention.average": "Mejana",
   "admin.dashboard.retention.cohort": "Mes d’inscripcion",
   "admin.dashboard.retention.cohort_size": "Utilizaires novèls",
@@ -281,7 +280,6 @@
   "footer.source_code": "Veire lo còdi font",
   "footer.status": "Estat",
   "footer.terms_of_service": "Condicions d’utilizacion",
-  "generic.saved": "Enregistrat",
   "getting_started.heading": "Per començar",
   "hashtag.column_header.tag_mode.all": "e {additional}",
   "hashtag.column_header.tag_mode.any": "o {additional}",
diff --git a/app/javascript/mastodon/locales/pa.json b/app/javascript/mastodon/locales/pa.json
index b1a610cfa5..46cd68748f 100644
--- a/app/javascript/mastodon/locales/pa.json
+++ b/app/javascript/mastodon/locales/pa.json
@@ -103,7 +103,6 @@
   "account.unmute": "@{name} ਲਈ ਮੌਨ ਹਟਾਓ",
   "account.unmute_notifications_short": "ਨੋਟਫਿਕੇਸ਼ਨਾਂ ਨੂੰ ਅਣ-ਮੌਨ ਕਰੋ",
   "account.unmute_short": "ਮੌਨ-ਰਹਿਤ ਕਰੋ",
-  "account_note.placeholder": "Click to add a note",
   "admin.dashboard.retention.average": "ਔਸਤ",
   "admin.dashboard.retention.cohort_size": "ਨਵੇਂ ਵਰਤੋਂਕਾਰ",
   "alert.unexpected.title": "ਓਹੋ!",
@@ -266,12 +265,6 @@
   "domain_block_modal.block": "ਸਰਵਰ ਉੱਤੇ ਪਾਬੰਦੀ ਲਾਓ",
   "domain_block_modal.block_account_instead": "ਇਸ ਦੀ ਬਜਾਏ @{name} ਉੱਤੇ ਪਾਬੰਦੀ ਲਾਓ",
   "domain_block_modal.title": "ਡੋਮੇਨ ਉੱਤੇ ਪਾਬੰਦੀ ਲਾਉਣੀ ਹੈ?",
-  "domain_pill.server": "ਸਰਵਰ",
-  "domain_pill.their_handle": "ਇਹ ਹੈਂਡਲ:",
-  "domain_pill.their_server": "ਉਹਨਾਂ ਦਾ ਡਿਜ਼ਿਟਲ ਘਰ, ਜਿੱਥੇ ਉਹਨਾਂ ਦੀਆਂ ਸਾਰੀਆਂ ਪੋਸਟਾਂ ਹੁੰਦੀਆਂ ਹਨ।",
-  "domain_pill.username": "ਵਰਤੋਂਕਾਰ-ਨਾਂ",
-  "domain_pill.whats_in_a_handle": "ਹੈਂਡਲ ਕੀ ਹੁੰਦਾ ਹੈ?",
-  "domain_pill.your_handle": "ਤੁਹਾਡਾ ਹੈਂਡਲ:",
   "dropdown.empty": "ਕੋਈ ਚੋਣ ਕਰੋ",
   "embed.instructions": "ਹੇਠਲੇ ਕੋਡ ਨੂੰ ਕਾਪੀ ਕਰਕੇ ਆਪਣੀ ਵੈੱਬਸਾਈਟ ਉੱਤੇ ਇਸ ਪੋਸਟ ਨੂੰ ਇੰਬੈੱਡ ਕਰੋ।",
   "emoji_button.activity": "ਗਤੀਵਿਧੀ",
@@ -339,7 +332,6 @@
   "footer.status": "ਹਾਲਤ",
   "footer.terms_of_service": "ਸੇਵਾ ਦੀਆਂ ਸ਼ਰਤਾਂ",
   "form_field.optional": "(ਚੋਣਵਾਂ)",
-  "generic.saved": "ਸਾਂਭੀ ਗਈ",
   "getting_started.heading": "ਸ਼ੁਰੂ ਕਰੀਏ",
   "hashtag.browse": "#{hashtag} ਵਿੱਚ ਪੋਸਟਾਂ ਨੂੰ ਵੇਖੋ",
   "hashtag.column_header.tag_mode.all": "ਅਤੇ {additional}",
diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json
index 4705cd2600..0615f5c914 100644
--- a/app/javascript/mastodon/locales/pl.json
+++ b/app/javascript/mastodon/locales/pl.json
@@ -176,7 +176,6 @@
   "account_edit.upload_modal.done": "Gotowe",
   "account_edit.upload_modal.next": "Następne",
   "account_edit.upload_modal.step_crop.zoom": "Powiększenie",
-  "account_note.placeholder": "Kliknij, aby dodać notatkę",
   "admin.dashboard.daily_retention": "Wskaźnik utrzymania użytkowników według dni od rejestracji",
   "admin.dashboard.monthly_retention": "Wskaźnik utrzymania użytkowników według miesięcy od rejestracji",
   "admin.dashboard.retention.average": "Średnia",
@@ -396,19 +395,6 @@
   "domain_block_modal.you_will_lose_num_followers": "Utracisz {followersCount, plural, one {jednego obserwującego} other {{followersCountDisplay} obserwujących}} i {followingCount, plural, one {jedną osobę którą obserwujesz} few {{followingCountDisplay} osoby które obserwujesz} other {{followingCountDisplay} osób które obserwujesz}}.",
   "domain_block_modal.you_will_lose_relationships": "Utracisz wszystkich obserwujących i obserwowanych z tego serwera.",
   "domain_block_modal.you_wont_see_posts": "Nie zobaczysz wpisów ani powiadomień od osób z tego serwera.",
-  "domain_pill.activitypub_lets_connect": "Umożliwia komunikację i interakcję z innymi nie tylko na Mastodon, ale także w innych aplikacjach.",
-  "domain_pill.activitypub_like_language": "ActivityPub jest jak język, którym Mastodon komunikuje się z innymi sieciami społecznościowymi.",
-  "domain_pill.server": "Serwer",
-  "domain_pill.their_handle": "Nazwa:",
-  "domain_pill.their_server": "Cyfrowy dom wszystkich wpisów tej osoby.",
-  "domain_pill.their_username": "Unikalny identyfikator na serwerze. Możliwe jest znalezienie użytkowników o tej samej nazwie na różnych serwerach.",
-  "domain_pill.username": "Nazwa użytkownika",
-  "domain_pill.whats_in_a_handle": "Z czego składa się nazwa?",
-  "domain_pill.who_they_are": "Dzięki temu, że nazwy wskazują, kim ktoś jest i gdzie się znajduje, możesz wchodzić w interakcje z innymi z różnych <button>sieci społecznościowych opartych na ActivityPub</button>.",
-  "domain_pill.who_you_are": "Dzięki temu, że twoja nazwa wskazuje, kim jesteś i gdzie się znajdujesz, inni mogą wchodzić z tobą w interakcje w różnych <button>sieciach społecznościowych opartych na ActivityPub</button>.",
-  "domain_pill.your_handle": "Twoja nazwa:",
-  "domain_pill.your_server": "Twój cyfrowy dom wszystkich twoich wpisów. Nie podoba ci się ten serwer? Przenieś się na inny w dowolnym momencie i zabierz ze sobą swoich obserwujących.",
-  "domain_pill.your_username": "Twój unikalny identyfikator na tym serwerze. Możliwe jest znalezienie osób z tą samą nazwą na innych serwerach.",
   "dropdown.empty": "Wybierz opcję",
   "embed.instructions": "Umieść ten wpis na swojej stronie, kopiując poniższy kod.",
   "embed.preview": "Tak to będzie wyglądać:",
@@ -513,7 +499,6 @@
   "footer.source_code": "Zobacz kod źródłowy",
   "footer.status": "Status",
   "footer.terms_of_service": "Regulamin",
-  "generic.saved": "Zapisano",
   "getting_started.heading": "Pierwsze kroki",
   "hashtag.admin_moderation": "Otwórz interfejs moderacji #{name}",
   "hashtag.browse": "Przeglądaj posty z #{hashtag}",
diff --git a/app/javascript/mastodon/locales/pt-BR.json b/app/javascript/mastodon/locales/pt-BR.json
index 99638fe17a..24fe8772cd 100644
--- a/app/javascript/mastodon/locales/pt-BR.json
+++ b/app/javascript/mastodon/locales/pt-BR.json
@@ -257,7 +257,6 @@
   "account_edit_tags.tag_status_count": "{count, plural, one {# publicação} other {# publicações}}",
   "account_list.hidden_notice": "Isto é apenas visível a ti. Para mostrar essa lista aos outros, vá a <link>{page} > {modal} > {field}</link>.",
   "account_list.total": "{total, plural,one {#conta}other {#contas}}",
-  "account_note.placeholder": "Nota pessoal sobre este perfil aqui",
   "admin.dashboard.daily_retention": "Taxa de retenção de usuários por dia, após a inscrição",
   "admin.dashboard.monthly_retention": "Taxa de retenção de usuários por mês, após a inscrição",
   "admin.dashboard.retention.average": "Média",
@@ -328,11 +327,15 @@
   "annual_report.summary.share_on_mastodon": "Compartilhar no Mastodon",
   "attachments_list.unprocessed": "(não processado)",
   "audio.hide": "Ocultar áudio",
+  "block_modal.no_collections": "Nenhum de vocês pode adicionar um ao outro a coleções. Vocês serão automaticamente removidos um da coleção do outro, se for o caso.",
   "block_modal.remote_users_caveat": "Pediremos ao servidor {domain} que respeite sua decisão. No entanto, a conformidade não é garantida, já que alguns servidores podem lidar com bloqueios de maneira diferente. As publicações abertas ainda podem estar visíveis para usuários não logados.",
   "block_modal.show_less": "Mostrar menos",
   "block_modal.show_more": "Mostrar mais",
+  "block_modal.they_cant_mention": "Vocês não podem mencionar, seguir ou citar um ao outro.",
+  "block_modal.they_cant_see_posts": "Vocês não podem ver o conteúdo um do outro.",
   "block_modal.they_will_know": "Poderá ver que você bloqueou.",
   "block_modal.title": "Bloquear usuário?",
+  "block_modal.you_wont_see_mentions": "Você não verá publicações de outros que mencionem essa conta.",
   "boost_modal.combo": "Pressione {combo} para pular isto na próxima vez",
   "boost_modal.reblog": "Impulsionar a publicação?",
   "boost_modal.undo_reblog": "Retirar o impulso da publicação?",
@@ -592,19 +595,6 @@
   "domain_block_modal.you_will_lose_num_followers": "Você perderá {followersCount, plural, one {{followersCountDisplay} seguidor} other {{followersCountDisplay} seguidores}} e {followingCount, plural, one {{followingCountDisplay} pessoa que você segue} other {{followingCountDisplay} pessoas que você segue}}.",
   "domain_block_modal.you_will_lose_relationships": "Você irá perder todos os seguidores e pessoas que você segue neste servidor.",
   "domain_block_modal.you_wont_see_posts": "Você não verá publicações ou notificações de usuários neste servidor.",
-  "domain_pill.activitypub_lets_connect": "Permite que você se conecte e interaja com pessoas não apenas no Mastodon, mas também em diferentes aplicativos sociais.",
-  "domain_pill.activitypub_like_language": "ActivityPub é como a linguagem que o Mastodon fala com outras redes sociais.",
-  "domain_pill.server": "Servidor",
-  "domain_pill.their_handle": "Identificador dele/a:",
-  "domain_pill.their_server": "Casa digital dele/a, onde ficam todas as suas postagens.",
-  "domain_pill.their_username": "Seu identificador exclusivo em seu servidor. É possível encontrar usuários com o mesmo nome de usuário em servidores diferentes.",
-  "domain_pill.username": "Nome de usuário",
-  "domain_pill.whats_in_a_handle": "O que há em um identificador?",
-  "domain_pill.who_they_are": "Como os identificadores indicam quem alguém é e onde está, você pode interagir com pessoas na rede de <button>plataformas alimentadas pelo ActivityPub</button>.",
-  "domain_pill.who_you_are": "Como seu identificador indica quem você é e onde está, as pessoas podem interagir com você na rede de <button>plataformas alimentadas pelo ActivityPub</button>.",
-  "domain_pill.your_handle": "Seu identificador:",
-  "domain_pill.your_server": "Sua casa digital, onde ficam todas as suas postagens. Não gosta deste? Transfira servidores a qualquer momento e traga seus seguidores também.",
-  "domain_pill.your_username": "Seu identificador exclusivo neste servidor. É possível encontrar usuários com o mesmo nome de usuário em servidores diferentes.",
   "dropdown.empty": "Escolha uma opção",
   "email_subscriptions.email": "Email",
   "email_subscriptions.form.action": "Inscrever-se",
@@ -741,7 +731,6 @@
   "footer.terms_of_service": "Termos de serviço",
   "form_error.blank": "O espaço não pode estar em branco.",
   "form_field.optional": "(opcional)",
-  "generic.saved": "Salvo",
   "getting_started.heading": "Primeiros passos",
   "hashtag.admin_moderation": "Abrir interface de moderação para #{name}",
   "hashtag.browse": "Buscar publicações em #{hashtag}",
@@ -792,6 +781,7 @@
   "info_button.label": "Ajuda",
   "info_button.what_is_alt_text": "<h1>O que é texto alternativo?</h1><p>O texto alternativo fornece descrições de imagens para pessoas com deficiências visuais, conexões de internet de baixa largura de banda ou aquelas que buscam mais contexto.</p><p>Você pode melhorar a acessibilidade e a compreensão para todos escrevendo texto alternativo claro, conciso e objetivo.</p> <ul> <li>Capture elementos importantes</li> <li>Resuma textos em imagens</li> <li>Use estrutura de frases regular</li> <li>Evite informações redundantes</li> <li>Foque em tendências e descobertas principais em visuais complexos (como diagramas ou mapas)</li> </ul>",
   "interaction_modal.action": "Para interagir com o post de {name}, você precisa entrar em sua conta em qualquer servidor Mastodon que você use.",
+  "interaction_modal.action_follow": "Para seguir {name}, você deve fazer login em sua conta em auqlquer servidor Mastodon que você use.",
   "interaction_modal.go": "Ir",
   "interaction_modal.no_account_yet": "Não possui uma conta ainda?",
   "interaction_modal.on_another_server": "Em um servidor diferente",
@@ -1263,7 +1253,7 @@
   "status.quote_error.revoked": "Publicação removida pelo autor",
   "status.quote_followers_only": "Apenas seguidores podem citar sua publicação",
   "status.quote_manual_review": "Autor irá revisar manualmente",
-  "status.quote_noun": "Citar",
+  "status.quote_noun": "Citação",
   "status.quote_policy_change": "Mude quem pode citar",
   "status.quote_post_author": "Publicação citada por @{name}",
   "status.quote_private": "Publicações privadas não podem ser citadas",
diff --git a/app/javascript/mastodon/locales/pt-PT.json b/app/javascript/mastodon/locales/pt-PT.json
index cfd304599e..9725e16f81 100644
--- a/app/javascript/mastodon/locales/pt-PT.json
+++ b/app/javascript/mastodon/locales/pt-PT.json
@@ -240,7 +240,6 @@
   "account_edit_tags.suggestions": "Sugestões:",
   "account_edit_tags.tag_status_count": "{count, plural, one {# publicação} other {# publicações}}",
   "account_list.total": "{total, plural, one {# conta} other {# contas}}",
-  "account_note.placeholder": "Clicar para adicionar nota",
   "admin.dashboard.daily_retention": "Taxa de retenção de utilizadores por dia após a inscrição",
   "admin.dashboard.monthly_retention": "Taxa de retenção de utilizadores por mês após a inscrição",
   "admin.dashboard.retention.average": "Média",
@@ -565,19 +564,6 @@
   "domain_block_modal.you_will_lose_num_followers": "Irás perder {followersCount, plural, one {{followersCountDisplay} seguidor} other {{followersCountDisplay} seguidores}} e {followingCount, plural, one {{followingCountDisplay} pessoa que estás a seguir} other {{followingCountDisplay} pessoas que estás a seguir}}.",
   "domain_block_modal.you_will_lose_relationships": "Irás perder todos os seguidores e pessoas que segues deste servidor.",
   "domain_block_modal.you_wont_see_posts": "Não verás publicações ou notificações de utilizadores neste servidor.",
-  "domain_pill.activitypub_lets_connect": "Permite-te conectar e interagir com pessoas não só no Mastodon, mas também em diferentes aplicações sociais.",
-  "domain_pill.activitypub_like_language": "O ActivityPub é como a linguagem que o Mastodon fala com outras redes sociais.",
-  "domain_pill.server": "Servidor",
-  "domain_pill.their_handle": "O identificador dele:",
-  "domain_pill.their_server": "A casa digital deste utilizador, onde se encontram todas as suas publicações.",
-  "domain_pill.their_username": "O identificador único dele no seu servidor. É possível encontrar utilizadores com o mesmo nome de utilizador em servidores diferentes.",
-  "domain_pill.username": "Nome de utilizador",
-  "domain_pill.whats_in_a_handle": "Em que consiste um identificador?",
-  "domain_pill.who_they_are": "Uma vez que os identificadores dizem quem é alguém e onde está, podes interagir com as pessoas através da rede social de <button>plataformas que suportam ActivityPub</button>.",
-  "domain_pill.who_you_are": "Uma vez que o teu identificador indica quem és e onde estás, as pessoas podem interagir contigo através da rede social de <button>plataformas que suportam ActivityPub</button>.",
-  "domain_pill.your_handle": "O teu identificador:",
-  "domain_pill.your_server": "A tua casa digital, onde se encontram todas as tuas publicações. Não gostas deste? Muda de servidor a qualquer momento e leva também os teus seguidores.",
-  "domain_pill.your_username": "O teu identificador único neste servidor. É possível encontrares utilizadores com o mesmo nome de utilizador em diferentes servidores.",
   "dropdown.empty": "Selecione uma opção",
   "email_subscriptions.email": "E-mail",
   "email_subscriptions.form.action": "Subscrever",
@@ -713,7 +699,6 @@
   "footer.terms_of_service": "Termos de serviço",
   "form_error.blank": "O campo não pode ficar em branco.",
   "form_field.optional": "(opcional)",
-  "generic.saved": "Guardado",
   "getting_started.heading": "Primeiros passos",
   "hashtag.admin_moderation": "Abrir interface de moderação para #{name}",
   "hashtag.browse": "Ver publicações em #{hashtag}",
diff --git a/app/javascript/mastodon/locales/ro.json b/app/javascript/mastodon/locales/ro.json
index e4875ef365..32990569c1 100644
--- a/app/javascript/mastodon/locales/ro.json
+++ b/app/javascript/mastodon/locales/ro.json
@@ -75,7 +75,6 @@
   "account.unmute": "Nu mai ignora pe @{name}",
   "account.unmute_notifications_short": "Dezamuțire notificări",
   "account.unmute_short": "Reafișare",
-  "account_note.placeholder": "Click to add a note",
   "admin.dashboard.daily_retention": "Rata de retenţie a utilizatorului pe zi după înregistrare",
   "admin.dashboard.monthly_retention": "Rata de retenţie a utilizatorului după luna de înscriere",
   "admin.dashboard.retention.average": "În medie",
@@ -267,7 +266,6 @@
   "footer.privacy_policy": "Politica de confidenţialitate",
   "footer.source_code": "Vizualizează codul sursă",
   "footer.status": "Status",
-  "generic.saved": "Salvat",
   "getting_started.heading": "Primii pași",
   "hashtag.column_header.tag_mode.all": "și {additional}",
   "hashtag.column_header.tag_mode.any": "sau {additional}",
diff --git a/app/javascript/mastodon/locales/ru.json b/app/javascript/mastodon/locales/ru.json
index 354655b2e0..dc57dc7d4d 100644
--- a/app/javascript/mastodon/locales/ru.json
+++ b/app/javascript/mastodon/locales/ru.json
@@ -18,9 +18,9 @@
   "account.add_note": "Добавить заметку для себя",
   "account.add_or_remove_from_list": "Добавить в списки",
   "account.badges.admin": "Администратор",
-  "account.badges.blocked": "Заблокирован",
+  "account.badges.blocked": "Заблокирован(а)",
   "account.badges.bot": "Бот",
-  "account.badges.domain_blocked": "Домен заблокирован",
+  "account.badges.domain_blocked": "Домен заблокирован:",
   "account.badges.group": "Группа",
   "account.badges.muted": "Игнорируется",
   "account.badges.muted_until": "Игнорируется до {until}",
@@ -43,7 +43,7 @@
   "account.featured": "Рекомендации",
   "account.featured.accounts": "Профили",
   "account.featured.collections": "Подборки",
-  "account.featured.new_collection": "Новая коллекция",
+  "account.featured.new_collection": "Создать подборку",
   "account.field_overflow": "Показать полностью",
   "account.filters.all": "Всё вместе",
   "account.filters.boosts_toggle": "Показывать продвижения",
@@ -70,14 +70,15 @@
   "account.hide_reblogs": "Скрыть продвижения от @{name}",
   "account.in_memoriam": "In Memoriam.",
   "account.join_modal.day": "День",
-  "account.join_modal.me": "Вы присоединились к {server} на",
-  "account.join_modal.me_anniversary": "Счастливого помощника! Вы присоединились к {server} на",
-  "account.join_modal.me_today": "Ваш первый день на {server}!",
-  "account.join_modal.other": "{name} присоединился к {server}",
-  "account.join_modal.share.celebrate": "Поделиться праздничным сообщением",
-  "account.join_modal.share.intro": "Поделиться сообщением",
-  "account.join_modal.share.welcome": "Поделиться приветственным сообщением",
-  "account.join_modal.years": "{number, plural, one {year} few {years} many {years} other {years}}",
+  "account.join_modal.me": "Вы зарегистрировались на сервере {server}",
+  "account.join_modal.me_anniversary": "С годовщиной! Вы зарегистрировались на сервере {server}",
+  "account.join_modal.me_today": "Сегодня ваш первый день на сервере {server}!",
+  "account.join_modal.other": "{name} зарегистрировался (-лась) на сервере {server}",
+  "account.join_modal.other_today": "Сегодня {name} отмечает первый день на сервере {server}!",
+  "account.join_modal.share.celebrate": "Написать праздничный пост",
+  "account.join_modal.share.intro": "Написать приветственный пост",
+  "account.join_modal.share.welcome": "Написать приветственный пост",
+  "account.join_modal.years": "{number, plural, one {год} few {года} many {лет} other {года}}",
   "account.joined_short": "Дата регистрации",
   "account.languages": "Изменить языки подписки",
   "account.last_active": "Последняя активность",
@@ -109,10 +110,10 @@
   "account.mute_short": "Игнорировать",
   "account.muted": "Игнорируется",
   "account.mutual": "Вы подписаны друг на друга",
-  "account.name.copy": "Копировать имя пользователя",
+  "account.name.copy": "Копировать адрес",
   "account.name.help.domain": "{domain} — это сервер, на котором размещены профиль и посты пользователя.",
   "account.name.help.domain_self": "{domain} — это ваш сервер, на котором размещены ваши профиль и посты.",
-  "account.name.help.footer": "Так же как вы можете отправлять письма людям, использующим различных поставщиков электронной почты, вы можете взаимодействовать с людьми на других серверах Mastodon, и с кем угодно в других приложениях Fediverse.",
+  "account.name.help.footer": "Точно так же как вы отправляете сообщения пользователям разных почтовых сервисов, вы можете взаимодействовать с пользователями других серверов Mastodon и других платформ в сети Fediverse.",
   "account.name.help.header": "Адрес пользователя напоминает адрес электронной почты",
   "account.name.help.username": "{username} — это имя пользователя на сервере. На разных серверах могут встречаться люди с тем же именем пользователя.",
   "account.name.help.username_self": "{username} — это ваше имя пользователя на этом сервере. На других серверах могут встречаться люди с тем же именем пользователя.",
@@ -146,6 +147,8 @@
   "account.unmute": "Не игнорировать @{name}",
   "account.unmute_notifications_short": "Показать уведомления",
   "account.unmute_short": "Не игнорировать",
+  "account_edit.advanced_settings.bot_hint": "Индикатор бота показывает, что с этой учётной записи выполняются автоматизированные действия и она не всегда может находиться под наблюдением владельца",
+  "account_edit.advanced_settings.bot_label": "Учётная запись бота",
   "account_edit.advanced_settings.title": "Расширенные настройки",
   "account_edit.bio.add_label": "Добавить описание профиля",
   "account_edit.bio.edit_label": "Редактировать описание профиля",
@@ -221,6 +224,10 @@
   "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.description": "Показывать списки ваших подписок и подписчиков в профиле. Люди, на которых вы подписаны, будут знать о том, что вы на них подписаны, вне зависимости от этой настройки.",
+  "account_edit.profile_tab.show_relations.title": "Показывать мои подписки и моих подписчиков",
+  "account_edit.profile_tab.subtitle": "Укажите, что будет отображаться в вашем профиле.",
+  "account_edit.profile_tab.title": "Настройки отображения профиля",
   "account_edit.save": "Сохранить",
   "account_edit.upload_modal.back": "Назад",
   "account_edit.upload_modal.done": "Готово",
@@ -248,8 +255,8 @@
   "account_edit_tags.search_placeholder": "Введите хештег…",
   "account_edit_tags.suggestions": "Подсказки:",
   "account_edit_tags.tag_status_count": "{count, plural, one {# пост} few {# поста} other {# постов}}",
+  "account_list.hidden_notice": "Этот список виден только вам. Чтобы другие люди тоже могли его видеть, включите соответствующую опцию: <link>Редактировать профиль → {modal} → {field}</link>.",
   "account_list.total": "{total, plural, one {# пользователь} few {# пользователя} other {# пользователей}}",
-  "account_note.placeholder": "Текст заметки",
   "admin.dashboard.daily_retention": "Уровень удержания пользователей после регистрации, в днях",
   "admin.dashboard.monthly_retention": "Уровень удержания пользователей после регистрации, в месяцах",
   "admin.dashboard.retention.average": "В среднем",
@@ -301,8 +308,10 @@
   "block_modal.remote_users_caveat": "Мы попросим сервер {domain} уважать ваше решение, однако нельзя гарантировать, что он будет соблюдать блокировку, поскольку некоторые серверы могут по-разному обрабатывать запросы. Публичные посты по-прежнему могут быть видны неавторизованным пользователям.",
   "block_modal.show_less": "Показать меньше",
   "block_modal.show_more": "Показать больше",
+  "block_modal.they_cant_see_posts": "Он не сможет видеть ваши посты, а вы не будете видеть его посты.",
   "block_modal.they_will_know": "Он будет знать, что вы его блокируете.",
   "block_modal.title": "Заблокировать пользователя?",
+  "block_modal.you_wont_see_mentions": "Вы не увидите посты, которые его упоминают.",
   "boost_modal.combo": "{combo}, чтобы пропустить это в следующий раз",
   "boost_modal.reblog": "Продвинуть пост?",
   "boost_modal.undo_reblog": "Отменить продвижение?",
@@ -336,9 +345,10 @@
   "collection.share_template_other": "Зацените эту замечательную подборку: {link}",
   "collection.share_template_own": "Зацените мою новую подборку: {link}",
   "collections.account_count": "{count, plural, one {# пользователь} few {# пользователя} other {# пользователей}}",
-  "collections.accounts.empty_editor_title": "Никто еще не в этой коллекции",
+  "collections.accounts.empty_description": "Вы можете добавить максимум {count} пользователей",
+  "collections.accounts.empty_editor_title": "В этой подборке пока никого нет",
   "collections.accounts.empty_title": "В этой подборке пока никого нет",
-  "collections.block_collection_owner": "Заблокировать аккаунт",
+  "collections.block_collection_owner": "Заблокировать пользователя",
   "collections.by_account": "составил(а) {account_handle}",
   "collections.collection_description": "Описание",
   "collections.collection_language": "Язык",
@@ -349,6 +359,7 @@
   "collections.content_warning": "Предупреждение о содержании",
   "collections.continue": "Продолжить",
   "collections.copy_link": "Копировать ссылку",
+  "collections.copy_link_confirmation": "Ссылка на подборку скопирована в буфер обмена",
   "collections.create.accounts_title": "Кого вы выберете для этой подборки?",
   "collections.create.basic_details_title": "Основная информация",
   "collections.create.steps": "Шаг {step}/{total}",
@@ -356,7 +367,7 @@
   "collections.delete_collection": "Удалить подборку",
   "collections.description_length_hint": "Не более 100 символов",
   "collections.detail.author_added_you_on_date": "{author} добавил(а) вас {date}",
-  "collections.detail.loading": "Загрузка коллекции…",
+  "collections.detail.loading": "Подборка загружается…",
   "collections.detail.revoke_inclusion": "Удалить меня",
   "collections.detail.sensitive_content": "Чувствительный контент",
   "collections.detail.share": "Поделитесь этой коллекцией",
@@ -402,7 +413,6 @@
   "column.notifications": "Уведомления",
   "column.pins": "Закреплённые посты",
   "column.public": "Глобальная лента",
-  "column.your_collections": "Ваша коллекция",
   "column_back_button.label": "Назад",
   "column_header.hide_settings": "Скрыть настройки",
   "column_header.moveLeft_settings": "Передвинуть колонку влево",
@@ -468,7 +478,6 @@
   "confirmations.follow_to_list.message": "Чтобы добавить пользователя {name} в список, вы должны быть на него подписаны.",
   "confirmations.follow_to_list.title": "Подписаться на пользователя?",
   "confirmations.hide_featured_tab.confirm": "Скрыть вкладку",
-  "confirmations.hide_featured_tab.title": "Скрыть вкладку 'Избранное'?",
   "confirmations.logout.confirm": "Выйти",
   "confirmations.logout.message": "Вы уверены, что хотите выйти?",
   "confirmations.logout.title": "Выйти?",
@@ -534,19 +543,6 @@
   "domain_block_modal.you_will_lose_num_followers": "Вы потеряете {followersCount, plural, one {{followersCountDisplay} подписчика} few {{followersCountDisplay} подписчиков} other {{followersCountDisplay} подписчиков}} и {followingCount, plural, one {{followingCountDisplay} подписку} few {{followingCountDisplay} подписки} other {{followingCountDisplay} подписок}}.",
   "domain_block_modal.you_will_lose_relationships": "Вы потеряете все подписки и всех подписчиков с этого сервера.",
   "domain_block_modal.you_wont_see_posts": "Вы не будете видеть посты и уведомления от пользователей с этого сервера.",
-  "domain_pill.activitypub_lets_connect": "Благодаря ему вы можете связываться и взаимодействовать не только с пользователями Mastodon, но и с пользователями других платформ.",
-  "domain_pill.activitypub_like_language": "ActivityPub — это язык, на котором Mastodon говорит с другими социальными сетями.",
-  "domain_pill.server": "Сервер",
-  "domain_pill.their_handle": "Адрес пользователя:",
-  "domain_pill.their_server": "Цифровой дом пользователя, где находятся все его посты.",
-  "domain_pill.their_username": "Уникальный идентификатор пользователя на его сервере. На разных серверах могут встречаться люди с тем же именем пользователя.",
-  "domain_pill.username": "Имя пользователя",
-  "domain_pill.whats_in_a_handle": "Что это значит?",
-  "domain_pill.who_they_are": "Поскольку адрес позволяет однозначно определить, кто и где находится, вы можете взаимодействовать с пользователями социальной сети <button>платформ, работающих на протоколе ActivityPub</button>.",
-  "domain_pill.who_you_are": "Поскольку ваш адрес позволяет однозначно определить, кто вы и где находитесь, пользователи социальной сети <button>платформ, работающих на протоколе ActivityPub</button>, могут взаимодействовать с вами.",
-  "domain_pill.your_handle": "Ваш адрес:",
-  "domain_pill.your_server": "Ваш цифровой дом, где находятся все ваши посты. Если вам не нравится этот сервер, вы можете в любое время перенести свою учётную запись на другой сервер, не теряя подписчиков.",
-  "domain_pill.your_username": "Ваш уникальный идентификатор на этом сервере. На разных серверах могут встречаться люди с тем же именем пользователя.",
   "dropdown.empty": "Выберите вариант",
   "email_subscriptions.email": "Адрес электронной почты",
   "email_subscriptions.form.action": "Подписаться",
@@ -571,9 +567,11 @@
   "emoji_button.search_results": "Результаты поиска",
   "emoji_button.symbols": "Символы",
   "emoji_button.travel": "Путешествия и места",
+  "empty_column.account_featured.other": "{acct} ещё ничего не рекомендовал(а) в своём профиле.",
   "empty_column.account_featured_self.no_collections_button": "Создать коллекцию",
   "empty_column.account_featured_self.pre_collections": "Будьте в курсе коллекций",
   "empty_column.account_featured_self.pre_collections_desc": "Коллекции (входящие в Mastodon 4.6) позволяют создавать собственные курируемые списки учетных записей, чтобы рекомендовать другим пользователям.",
+  "empty_column.account_featured_unknown.other": "Этот пользователь ещё ничего не рекомендовал в своём профиле.",
   "empty_column.account_hides_collections": "Пользователь предпочёл не раскрывать эту информацию",
   "empty_column.account_suspended": "Учётная запись заблокирована",
   "empty_column.account_timeline": "Здесь нет постов!",
@@ -671,7 +669,6 @@
   "footer.terms_of_service": "Пользовательское соглашение",
   "form_error.blank": "Это поле должно быть заполнено.",
   "form_field.optional": "(необязательно)",
-  "generic.saved": "Сохранено",
   "getting_started.heading": "Добро пожаловать",
   "hashtag.admin_moderation": "Открыть интерфейс модератора для #{name}",
   "hashtag.browse": "Обзор постов с хештегом #{hashtag}",
diff --git a/app/javascript/mastodon/locales/ry.json b/app/javascript/mastodon/locales/ry.json
index f608f0039c..b66497a751 100644
--- a/app/javascript/mastodon/locales/ry.json
+++ b/app/javascript/mastodon/locales/ry.json
@@ -59,7 +59,6 @@
   "account.unmute": "Указовати {name}",
   "account.unmute_notifications_short": "Указовати голошіня",
   "account.unmute_short": "Указовати",
-  "account_note.placeholder": "Клопкніт обы додати примітку",
   "admin.dashboard.retention.average": "Середньоє",
   "admin.dashboard.retention.cohort": "Місяць прикапчованя",
   "admin.dashboard.retention.cohort_size": "Нові хосновачі",
diff --git a/app/javascript/mastodon/locales/sa.json b/app/javascript/mastodon/locales/sa.json
index d4d93e292c..4f660c8d1f 100644
--- a/app/javascript/mastodon/locales/sa.json
+++ b/app/javascript/mastodon/locales/sa.json
@@ -53,7 +53,6 @@
   "account.unfollow": "नश्यतामनुसरणम्",
   "account.unmute": "सशब्दम् @{name}",
   "account.unmute_short": "अनमूकीकुरु",
-  "account_note.placeholder": "टीकायोजनार्थं नुद्यताम्",
   "admin.dashboard.daily_retention": "पञ्जीकरणस्यानन्तरमुपयोक्तृधारणदरो दिनेन",
   "admin.dashboard.monthly_retention": "पञ्जीकरणस्यानन्तरमुपयोक्तृधारणदरो मासेन",
   "admin.dashboard.retention.average": "मध्यत्वम्",
@@ -218,7 +217,6 @@
   "footer.privacy_policy": "गोपनीयतानीतिः",
   "footer.source_code": "स्रोतविद्यादेशं दर्शय",
   "footer.status": "स्थितिः",
-  "generic.saved": "रक्षितम्",
   "getting_started.heading": "आरम्भकरणम्",
   "hashtag.column_header.tag_mode.all": "{additional} च",
   "hashtag.column_header.tag_mode.any": "वा {additional}",
diff --git a/app/javascript/mastodon/locales/sc.json b/app/javascript/mastodon/locales/sc.json
index 2cc4cb3818..39baa3f00a 100644
--- a/app/javascript/mastodon/locales/sc.json
+++ b/app/javascript/mastodon/locales/sc.json
@@ -75,7 +75,6 @@
   "account.unmute": "Torra a ativare a @{name}",
   "account.unmute_notifications_short": "Ativa is notìficas",
   "account.unmute_short": "Ativa su sonu",
-  "account_note.placeholder": "Incarca pro agiùnghere una nota",
   "admin.dashboard.daily_retention": "Tassu de ritentzione de is utentes a pustis de sa registratzione",
   "admin.dashboard.monthly_retention": "Tassu de ritentzione de utentes pro mese a pustis de sa registratzione",
   "admin.dashboard.retention.average": "Mèdiu",
@@ -224,16 +223,6 @@
   "domain_block_modal.they_wont_know": "No ant a ischire chi t'ant blocadu.",
   "domain_block_modal.title": "Boles blocare su domìniu?",
   "domain_block_modal.you_wont_see_posts": "No as a bìdere publicatziones o notìficas dae utentes in custu serbidore.",
-  "domain_pill.activitypub_lets_connect": "Ti permitit de ti collegare e de interagire cun persones no isceti in Mastodon, ma in aplicatziones sotziales diferentes puru.",
-  "domain_pill.activitypub_like_language": "ActivityPub est a tipu sa limba chi Mastodon chistionat cun àteras retes sotziales.",
-  "domain_pill.server": "Serbidore",
-  "domain_pill.their_handle": "S'identificadore suo:",
-  "domain_pill.their_server": "Sa domo digitale sua, in ue istant totu is publicatziones suas.",
-  "domain_pill.username": "Nòmine de utente",
-  "domain_pill.whats_in_a_handle": "Ite est un'identificadore?",
-  "domain_pill.your_handle": "S'identificadore tuo:",
-  "domain_pill.your_server": "Sa domo digitale tua, in ue istant totu is publicatziones tuas. Custa non t'agradat? Tràmuda serbidore in cale si siat momentu e bati·ti fintzas in fatu is sighidores tuos.",
-  "domain_pill.your_username": "S'identificadore ùnicu tuo in custu serbidore. Si podent agatare utentes cun su matessi nòmine de utente in àteros serbidores.",
   "embed.instructions": "Inserta custa publicatzione in su situ web tuo copiende su còdighe de suta.",
   "embed.preview": "At a aparèssere aici:",
   "emoji_button.activity": "Atividade",
@@ -314,7 +303,6 @@
   "footer.source_code": "Ammustra su còdighe de orìgine",
   "footer.status": "Istadu",
   "footer.terms_of_service": "Cunditziones de su servìtziu",
-  "generic.saved": "Sarvadu",
   "getting_started.heading": "Comente cumintzare",
   "hashtag.admin_moderation": "Aberi s'interfache de moderatzione pro #{name}",
   "hashtag.browse": "Nàviga in is publicatziones de #{hashtag}",
diff --git a/app/javascript/mastodon/locales/sco.json b/app/javascript/mastodon/locales/sco.json
index ceda9cbd58..746b737302 100644
--- a/app/javascript/mastodon/locales/sco.json
+++ b/app/javascript/mastodon/locales/sco.json
@@ -50,7 +50,6 @@
   "account.unfollow": "Unfollae",
   "account.unmute": "Unwheesht @{name}",
   "account.unmute_short": "Unwheesht",
-  "account_note.placeholder": "Chap tae eik note",
   "admin.dashboard.daily_retention": "Uiser retention rate bi day efter signin-up",
   "admin.dashboard.monthly_retention": "Uiser retention rate bi month efter signin-up",
   "admin.dashboard.retention.average": "Average",
@@ -211,7 +210,6 @@
   "footer.keyboard_shortcuts": "Keyboord shortcuts",
   "footer.privacy_policy": "Privacy policy",
   "footer.source_code": "View the soorce code",
-  "generic.saved": "Saved",
   "getting_started.heading": "Gettin stertit",
   "hashtag.column_header.tag_mode.all": "an {additional}",
   "hashtag.column_header.tag_mode.any": "or {additional}",
diff --git a/app/javascript/mastodon/locales/si.json b/app/javascript/mastodon/locales/si.json
index 3e39a942e2..1bec768e05 100644
--- a/app/javascript/mastodon/locales/si.json
+++ b/app/javascript/mastodon/locales/si.json
@@ -74,7 +74,6 @@
   "account.unmute": "නිහඬ නොකරන්න @{name}",
   "account.unmute_notifications_short": "දැනුම්දීම් නිහඬ නොකරන්න",
   "account.unmute_short": "නොනිහඬ",
-  "account_note.placeholder": "සටහන යෙදීමට ඔබන්න",
   "admin.dashboard.daily_retention": "ලියාපදිංචි වීමෙන් පසු දිනෙන් දින පරිශීලක රඳවා ගැනීමේ අනුපාතය",
   "admin.dashboard.monthly_retention": "ලියාපදිංචි වීමෙන් පසු මාසය අනුව පරිශීලක රඳවා ගැනීමේ අනුපාතය",
   "admin.dashboard.retention.average": "සාමාන්‍යය",
@@ -239,19 +238,6 @@
   "domain_block_modal.you_will_lose_num_followers": "ඔබ {followersCount, plural, one {{followersCountDisplay} අනුගාමිකයා} other {{followersCountDisplay} අනුගාමිකයින්}} සහ {followingCount, plural, one {{followingCountDisplay} ඔබ අනුගමනය කරන පුද්ගලයා} other {{followingCountDisplay} ඔබ අනුගමනය කරන පුද්ගලයින්}}අහිමි වනු ඇත.",
   "domain_block_modal.you_will_lose_relationships": "මෙම සේවාදායකයෙන් ඔබ අනුගමනය කරන සියලුම අනුගාමිකයින් සහ පුද්ගලයින් ඔබට අහිමි වනු ඇත.",
   "domain_block_modal.you_wont_see_posts": "මෙම සේවාදායකයේ පරිශීලකයින්ගෙන් ඔබට සටහන් හෝ දැනුම්දීම් නොපෙනේ.",
-  "domain_pill.activitypub_lets_connect": "එය ඔබට Mastodon හි පමණක් නොව, විවිධ සමාජ යෙදුම් හරහාද පුද්ගලයින් සමඟ සම්බන්ධ වීමට සහ අන්තර් ක්‍රියා කිරීමට ඉඩ සලසයි.",
-  "domain_pill.activitypub_like_language": "ActivityPub යනු Mastodon අනෙකුත් සමාජ ජාල සමඟ කතා කරන භාෂාවට සමානය.",
-  "domain_pill.server": "සේවාදායකය",
-  "domain_pill.their_handle": "ඔවුන්ගේ හසුරුව:",
-  "domain_pill.their_server": "ඔවුන්ගේ සියලුම සටහන් අඩංගු ඩිජිටල් නිවස.",
-  "domain_pill.their_username": "ඔවුන්ගේ සේවාදායකයේ ඔවුන්ගේ අනන්‍ය හඳුනාගැනීමේ යන්ත්‍රය. විවිධ සේවාදායකයන්හි එකම පරිශීලක නාමයක් ඇති පරිශීලකයින් සොයා ගැනීමට හැකිය.",
-  "domain_pill.username": "පරිශ්‍රීලක නාමය",
-  "domain_pill.whats_in_a_handle": "හසුරුවක ඇත්තේ කුමක්ද?",
-  "domain_pill.who_they_are": "හැන්ඩ්ල් මඟින් කෙනෙකු කවුද සහ ඔවුන් සිටින්නේ කොහේද යන්න පවසන බැවින්, ඔබට <button>ActivityPub-බලගැන්වූ වේදිකා</button>හි සමාජ වෙබ් අඩවි හරහා පුද්ගලයින් සමඟ අන්තර් ක්‍රියා කළ හැකිය.",
-  "domain_pill.who_you_are": "ඔබේ හැන්ඩ්ල් එක ඔබ කවුද සහ ඔබ සිටින ස්ථානය පවසන නිසා, <button>ActivityPub-බලගැන්වූ වේදිකා</button>හි සමාජ වෙබ් අඩවි හරහා පුද්ගලයින්ට ඔබ සමඟ අන්තර් ක්‍රියා කළ හැකිය.",
-  "domain_pill.your_handle": "ඔබේ හසුරුව:",
-  "domain_pill.your_server": "ඔබේ සියලුම සටහන් තිබෙන ඔබේ ඩිජිටල් නිවස. මේකට කැමති නැද්ද? ඕනෑම වේලාවක සේවාදායක මාරු කර ඔබේ අනුගාමිකයින් ද රැගෙන එන්න.",
-  "domain_pill.your_username": "මෙම සේවාදායකයේ ඔබගේ අනන්‍ය හඳුනාගැනීමේ අංකය. විවිධ සේවාදායකයන්හි එකම පරිශීලක නාමය ඇති පරිශීලකයින් සොයා ගැනීමට හැකිය.",
   "embed.instructions": "පහත කේතය පිටපත් කිරීමෙන් මෙම ලිපිය ඔබගේ අඩවියට කාවද්දන්න.",
   "embed.preview": "මෙන්න එය පෙනෙන අන්දම:",
   "emoji_button.activity": "ක්‍රියාකාරකම",
@@ -349,7 +335,6 @@
   "footer.source_code": "මූලාශ්‍ර කේතය බලන්න",
   "footer.status": "තත්‍වය",
   "footer.terms_of_service": "සේවා කොන්දේසි",
-  "generic.saved": "සුරැකිණි",
   "getting_started.heading": "පටන් ගන්න",
   "hashtag.admin_moderation": "#{name}සඳහා මධ්‍යස්ථකරණ අතුරුමුහුණත විවෘත කරන්න",
   "hashtag.browse": "#{hashtag}හි සටහන් පිරික්සන්න",
diff --git a/app/javascript/mastodon/locales/sk.json b/app/javascript/mastodon/locales/sk.json
index ccce04abd7..3b50a77caf 100644
--- a/app/javascript/mastodon/locales/sk.json
+++ b/app/javascript/mastodon/locales/sk.json
@@ -85,7 +85,6 @@
   "account.unmute": "Vypnúť stíšenie @{name}",
   "account.unmute_notifications_short": "Vypnúť stíšenie upozornení",
   "account.unmute_short": "Zrušiť stíšenie",
-  "account_note.placeholder": "Kliknutím pridať poznámku",
   "admin.dashboard.daily_retention": "Miera udržania používateľov podľa dňa po registrácii",
   "admin.dashboard.monthly_retention": "Miera udržania používateľov podľa mesiaca po registrácii",
   "admin.dashboard.retention.average": "Priemer",
@@ -268,10 +267,6 @@
   "domain_block_modal.title": "Blokovať doménu?",
   "domain_block_modal.you_will_lose_relationships": "Stratíš všetkých sledovateľov a ľudí, ktorých ty na tomto serveri nasleduješ.",
   "domain_block_modal.you_wont_see_posts": "Neuvidíš príspevky, ani oboznámenia od užívateľov na tomto serveri.",
-  "domain_pill.activitypub_like_language": "ActivityPub je ako jazyk, ktorým Mastodon hovorí s ostatnými sociálnymi sieťami.",
-  "domain_pill.server": "Server",
-  "domain_pill.their_server": "Ich digitálny domov, kde žijú všetky ich príspevky.",
-  "domain_pill.username": "Používateľské meno",
   "dropdown.empty": "Vyber možnosť",
   "embed.instructions": "Tento príspevok môžete pridať na svoju webovú stránku použitím tohto kódu.",
   "embed.preview": "Takto bude vyzerať:",
@@ -370,7 +365,6 @@
   "footer.source_code": "Zobraziť zdrojový kód",
   "footer.status": "Stav",
   "footer.terms_of_service": "Podmienky prevozu",
-  "generic.saved": "Uložené",
   "getting_started.heading": "Začíname",
   "hashtag.admin_moderation": "Otvor moderovacie rozhranie pre #{name}",
   "hashtag.browse": "Prehľadávať príspevky pod #{hashtag}",
diff --git a/app/javascript/mastodon/locales/sl.json b/app/javascript/mastodon/locales/sl.json
index 636b276996..5f4f42cbec 100644
--- a/app/javascript/mastodon/locales/sl.json
+++ b/app/javascript/mastodon/locales/sl.json
@@ -80,7 +80,6 @@
   "account.unmute": "Povrni glas @{name}",
   "account.unmute_notifications_short": "Izklopi utišanje obvestil",
   "account.unmute_short": "Povrni glas",
-  "account_note.placeholder": "Kliknite, da dodate opombo",
   "admin.dashboard.daily_retention": "Mera ohranjanja uporabnikov po dnevih od registracije",
   "admin.dashboard.monthly_retention": "Mera ohranjanja uporabnikov po mesecih od registracije",
   "admin.dashboard.retention.average": "Povprečje",
@@ -286,19 +285,6 @@
   "domain_block_modal.you_will_lose_num_followers": "Izgubili boste {followersCount, plural, one {{followersCountDisplay} sledilca} two {{followersCountDisplay} sledilca} few {{followersCountDisplay} sledilce} other {{followersCountDisplay} sledilcev}} in {followingCount, plural, one {{followingCountDisplay} osebo, ki ji sledite} two {{followingCountDisplay} osebi, ki jima sledite} few {{followingCountDisplay} osebe, ki jim sledite} other {{followingCountDisplay} oseb, ki jim sledite}}.",
   "domain_block_modal.you_will_lose_relationships": "Izgubili boste vse sledilce in ljudi, ki jim sledite na tem strežniku.",
   "domain_block_modal.you_wont_see_posts": "Objav ali obvestil uporabnikov s tega strežnika ne boste videli.",
-  "domain_pill.activitypub_lets_connect": "Omogoča vam povezovanje in interakcijo z ljudmi, ki niso samo na Mastodonu, ampak tudi na drugih družbenih platformah.",
-  "domain_pill.activitypub_like_language": "Protokol ActivityPub je kot jezik, v katerem se Mastodon pogovarja z drugimi družabnimi omrežji.",
-  "domain_pill.server": "Strežnik",
-  "domain_pill.their_handle": "Njegova/njena ročica:",
-  "domain_pill.their_server": "Njegovo/njeno digitalno domovanje, kjer bivajo vse njegove/njene objave.",
-  "domain_pill.their_username": "Njegov/njen edinstveni identifikator na njegovem/njenem strežniku. Uporabnike z istim uporabniškim imenom lahko najdete na različnih strežnikih.",
-  "domain_pill.username": "Uporabniško ime",
-  "domain_pill.whats_in_a_handle": "Kaj je v ročici?",
-  "domain_pill.who_they_are": "Ker ročice povedo, kdo je kdo in kje je, lahko komunicirate z ljudmi po vsem spletu družbenih <button>platform, ki jih poganja ActivityPub</button>.",
-  "domain_pill.who_you_are": "Ker ročice povedo, kdo ste in kje ste, lahko komunicirate z ljudmi po vsem spletu družbenih <button>platform, ki jih poganja ActivityPub</button>.",
-  "domain_pill.your_handle": "Vaša ročica:",
-  "domain_pill.your_server": "Vaše digitalno domovanje, kjer bivajo vse vaše objave. Vam ni všeč? Kadar koli ga prenesite med strežniki in z njim tudi svoje sledilce.",
-  "domain_pill.your_username": "Vaš edinstveni identifikator na tem strežniku. Uporabnike z istim uporabniškim imenom je možno najti na različnih strežnikih.",
   "dropdown.empty": "Izberite možnost",
   "embed.instructions": "Vstavite to objavo na svojo spletno stran tako, da kopirate spodnjo kodo.",
   "embed.preview": "Takole bo videti:",
@@ -403,7 +389,6 @@
   "footer.status": "Stanje",
   "footer.terms_of_service": "Pogoji uporabe",
   "form_field.optional": "(neobvezno)",
-  "generic.saved": "Shranjeno",
   "getting_started.heading": "Kako začeti",
   "hashtag.admin_moderation": "Odpri vmesnik za moderiranje za #{name}",
   "hashtag.column_header.tag_mode.all": "in {additional}",
diff --git a/app/javascript/mastodon/locales/sq.json b/app/javascript/mastodon/locales/sq.json
index a9e9159907..ca223343a9 100644
--- a/app/javascript/mastodon/locales/sq.json
+++ b/app/javascript/mastodon/locales/sq.json
@@ -255,7 +255,6 @@
   "account_edit_tags.tag_status_count": "{count, plural, one {# postim} other {# postime}}",
   "account_list.hidden_notice": "Kjo është e dukshme vetëm për ju. Që t’ua shfaqni këtë listë të tjerëve, kaloni te <link>{page} > {modal} > {field}</link>.",
   "account_list.total": "{total, plural, one {# llogari} other {# llogari}}",
-  "account_note.placeholder": "Klikoni për të shtuar shënim",
   "admin.dashboard.daily_retention": "Shkallë mbajtjeje përdoruesi, në ditë, pas regjistrimit",
   "admin.dashboard.monthly_retention": "Shkallë mbajtjeje përdoruesi, në muaj, pas regjistrimit",
   "admin.dashboard.retention.average": "Mesatare",
@@ -591,19 +590,6 @@
   "domain_block_modal.you_will_lose_num_followers": "Do të humbni {followersCount, plural, one {{followersCountDisplay} ndjekës} other {{followersCountDisplay} ndjekës}} dhe {followingCount, plural, one {{followingCountDisplay} person që ndiqni} other {{followingCountDisplay} vetë që ndiqni}}.",
   "domain_block_modal.you_will_lose_relationships": "Do të humbni krejt ndjekësit dhe personat që ndiqni nga ky shërbyes.",
   "domain_block_modal.you_wont_see_posts": "S’do të shihni postime, apo njoftime nga përdorues në këtë shërbyes.",
-  "domain_pill.activitypub_lets_connect": "Ju lejon të lidheni dhe ndërveproni me persona jo thjesht në Mastodon, por edhe nëpër aplikacione të ndryshme shoqërore.",
-  "domain_pill.activitypub_like_language": "ActivityPub është si gjuha me të cilën Mastodon-i komunikon me rrjete të tjerë shoqërorë.",
-  "domain_pill.server": "Shërbyes",
-  "domain_pill.their_handle": "Targa e tij:",
-  "domain_pill.their_server": "Shtëpia e tij dixhitale, ku rrinë krejt postimet prej tij.",
-  "domain_pill.their_username": "Identifikuesi i tij unik në shërbyesin e vet. Është e mundur të gjenden përdorues me të njëjtin emër përdoruesi në shërbyes të ndryshëm.",
-  "domain_pill.username": "Emër përdoruesi",
-  "domain_pill.whats_in_a_handle": "Ç’është një targë?",
-  "domain_pill.who_they_are": "Nga targat thonë se cili është dikush dhe se ku gjendet, ju mund të ndërveproni me persona nëpër web-in shoqëror të <button>platformave të ngritura mbi ActivityPub</button>.",
-  "domain_pill.who_you_are": "Ngaqë targa juaj thotë se cili jeni dhe se ku gjendeni, njerëzit mund të ndërveprojnë me ju nëpër web-in shoqëror të <button>platformave të bazuara në ActivityPub</button>.",
-  "domain_pill.your_handle": "Targa juaj:",
-  "domain_pill.your_server": "Shtëpia juaj dixhitale, kur gjenden krejt postimet tuaja. S’ju pëlqen kjo këtu? Shpërngulni shërbyes kur të doni dhe sillni edhe ndjekësit tuaj.",
-  "domain_pill.your_username": "Identifikuesi juja unik në këtë shërbyes. Është e mundur të gjenden përdorues me të njëjtin emër përdoruesi në shërbyes të ndryshëm.",
   "dropdown.empty": "Përzgjidhni një mundësi",
   "email_subscriptions.email": "Email",
   "email_subscriptions.form.action": "Pajtohuni",
@@ -740,7 +726,6 @@
   "footer.terms_of_service": "Kushte shërbimi",
   "form_error.blank": "Fusha s’mund të jetë e zbrazët.",
   "form_field.optional": "(opsionale)",
-  "generic.saved": "U ruajt",
   "getting_started.heading": "Si t’ia fillohet",
   "hashtag.admin_moderation": "Hap ndërfaqe moderimi për #{name}",
   "hashtag.browse": "Shfletoni postime me #{hashtag}",
diff --git a/app/javascript/mastodon/locales/sr-Latn.json b/app/javascript/mastodon/locales/sr-Latn.json
index 3561d76127..5d7760a0d4 100644
--- a/app/javascript/mastodon/locales/sr-Latn.json
+++ b/app/javascript/mastodon/locales/sr-Latn.json
@@ -86,7 +86,6 @@
   "account.unmute": "Ne ignoriši @{name}",
   "account.unmute_notifications_short": "Uključi obaveštenja",
   "account.unmute_short": "Ne ignoriši",
-  "account_note.placeholder": "Kliknite da dodate napomenu",
   "admin.dashboard.daily_retention": "Stopa zadržavanja korisnika po danima nakon registracije",
   "admin.dashboard.monthly_retention": "Stopa zadržavanja korisnika po mesecima nakon registracije",
   "admin.dashboard.retention.average": "Prosek",
@@ -210,19 +209,6 @@
   "domain_block_modal.they_wont_know": "Neće znati da su blokirani.",
   "domain_block_modal.title": "Blokirati domen?",
   "domain_block_modal.you_wont_see_posts": "Nećete videti objave ili obaveštenja korisnika na ovom serveru.",
-  "domain_pill.activitypub_lets_connect": "Omogućuje vam da se povežete i komunicirate sa ljudima ne samo na Mastodon-u, već i u različitim društvenim aplikacijama.",
-  "domain_pill.activitypub_like_language": "ActivityPub je kao jezik kojim Mastodon govori sa drugim društvenim mrežama.",
-  "domain_pill.server": "Server",
-  "domain_pill.their_handle": "Njegov regulator:",
-  "domain_pill.their_server": "Njihov digitalni dom, gde žive sve njihove objave.",
-  "domain_pill.their_username": "Njihov jedinstveni identifikator na njihovom serveru. Moguće je pronaći korisnike sa istim korisničkim imenom na različitim serverima.",
-  "domain_pill.username": "Korisničko ime",
-  "domain_pill.whats_in_a_handle": "Šta je regulator?",
-  "domain_pill.who_they_are": "Pošto regulatori govore ko je neko i gde se nalazi, možete da komunicirate sa ljudima širom društvenog veba na <button>platformama koje pokreće ActivityPub</button>.",
-  "domain_pill.who_you_are": "Pošto vaši regulatori govori ko ste i gde ste, ljudi mogu da komuniciraju sa vama širom društvenog veba na <button>platformama koje pokreće ActivityPub</button>.",
-  "domain_pill.your_handle": "Vaš regulator:",
-  "domain_pill.your_server": "Vaš digitalni dom, gde žive sve vaše objave. Ne sviđa vam se ovaj? Prenesite servere u bilo koje vreme i dovedite i svoje pratioce.",
-  "domain_pill.your_username": "Njihov jedinstveni identifikator na njihovom serveru. Moguće je pronaći korisnike sa istim korisničkim imenom na različitim serverima.",
   "embed.instructions": "Ugradite ovu objavu na svoj veb sajt kopiranjem koda ispod.",
   "embed.preview": "Evo kako će to izgledati:",
   "emoji_button.activity": "Aktivnosti",
@@ -317,7 +303,6 @@
   "footer.privacy_policy": "Politika privatnosti",
   "footer.source_code": "Prikaži izvorni kod",
   "footer.status": "Status",
-  "generic.saved": "Sačuvano",
   "getting_started.heading": "Prvi koraci",
   "hashtag.column_header.tag_mode.all": "i {additional}",
   "hashtag.column_header.tag_mode.any": "ili {additional}",
diff --git a/app/javascript/mastodon/locales/sr.json b/app/javascript/mastodon/locales/sr.json
index 0e8c16933c..57e5d93011 100644
--- a/app/javascript/mastodon/locales/sr.json
+++ b/app/javascript/mastodon/locales/sr.json
@@ -63,7 +63,6 @@
   "account.unmute": "Не игнориши @{name}",
   "account.unmute_notifications_short": "Укључи обавештења",
   "account.unmute_short": "Не игнориши",
-  "account_note.placeholder": "Кликните да додате напомену",
   "admin.dashboard.daily_retention": "Стопа задржавања корисника по данима након регистрације",
   "admin.dashboard.monthly_retention": "Стопа задржавања корисника по месецима након регистрације",
   "admin.dashboard.retention.average": "Просек",
@@ -187,19 +186,6 @@
   "domain_block_modal.they_wont_know": "Неће знати да су блокирани.",
   "domain_block_modal.title": "Блокирати домен?",
   "domain_block_modal.you_wont_see_posts": "Нећете видети објаве или обавештења корисника на овом серверу.",
-  "domain_pill.activitypub_lets_connect": "Омогућује вам да се повежете и комуницирате са људима не само на Mastodon-у, већ и у различитим друштвеним апликацијама.",
-  "domain_pill.activitypub_like_language": "ActivityPub је као језик којим Mastodon говори са другим друштвеним мрежама.",
-  "domain_pill.server": "Сервер",
-  "domain_pill.their_handle": "Његов регулатор:",
-  "domain_pill.their_server": "Њихов дигитални дом, где живе све њихове објаве.",
-  "domain_pill.their_username": "Њихов јединствени идентификатор на њиховом серверу. Могуће је пронаћи кориснике са истим корисничким именом на различитим серверима.",
-  "domain_pill.username": "Корисничко име",
-  "domain_pill.whats_in_a_handle": "Шта је регулатор?",
-  "domain_pill.who_they_are": "Пошто регулатори говоре ко је неко и где се налази, можете да комуницирате са људима широм друштвеног веба на <button>платформама које покреће ActivityPub</button>.",
-  "domain_pill.who_you_are": "Пошто ваши регулатори говори ко сте и где сте, људи могу да комуницирају са вама широм друштвеног веба на <button>платформама које покреће ActivityPub</button>.",
-  "domain_pill.your_handle": "Ваш регулатор:",
-  "domain_pill.your_server": "Ваш дигитални дом, где живе све ваше објаве. Не свиђа вам се овај? Пренесите сервере у било које време и доведите и своје пратиоце.",
-  "domain_pill.your_username": "Њихов јединствени идентификатор на њиховом серверу. Могуће је пронаћи кориснике са истим корисничким именом на различитим серверима.",
   "embed.instructions": "Уградите ову објаву на свој веб сајт копирањем кода испод.",
   "embed.preview": "Ево како ће то изгледати:",
   "emoji_button.activity": "Активности",
@@ -294,7 +280,6 @@
   "footer.privacy_policy": "Политика приватности",
   "footer.source_code": "Прикажи изворни код",
   "footer.status": "Статус",
-  "generic.saved": "Сачувано",
   "getting_started.heading": "Први кораци",
   "hashtag.column_header.tag_mode.all": "и {additional}",
   "hashtag.column_header.tag_mode.any": "или {additional}",
diff --git a/app/javascript/mastodon/locales/sv.json b/app/javascript/mastodon/locales/sv.json
index 75e6118859..b46d875066 100644
--- a/app/javascript/mastodon/locales/sv.json
+++ b/app/javascript/mastodon/locales/sv.json
@@ -257,7 +257,6 @@
   "account_edit_tags.tag_status_count": "{count, plural, one {# inlägg} other {# inlägg}}",
   "account_list.hidden_notice": "Detta är endast synligt för dig. För att visa denna lista för andra, gå till <link>{page} > {modal} > {field}</link>.",
   "account_list.total": "{total, plural, one {# konto} other {# konton}}",
-  "account_note.placeholder": "Klicka för att lägga till anteckning",
   "admin.dashboard.daily_retention": "Användarlojalitet per dag efter registrering",
   "admin.dashboard.monthly_retention": "Användarlojalitet per månad efter registrering",
   "admin.dashboard.retention.average": "Genomsnittlig",
@@ -596,19 +595,6 @@
   "domain_block_modal.you_will_lose_num_followers": "Du kommer att förlora {followersCount, plural, other {{followersCountDisplay} följare}} och {followingCount, plural, one {{followingCountDisplay} person du följer} other {{followingCountDisplay} personer du följer}}.",
   "domain_block_modal.you_will_lose_relationships": "Du kommer att förlora alla följare och personer du följer från denna server.",
   "domain_block_modal.you_wont_see_posts": "Du kommer inte att se inlägg eller meddelanden från användare på den här servern.",
-  "domain_pill.activitypub_lets_connect": "Det låter dig ansluta och interagera med människor inte bara på Mastodon, men även på andra sociala appar.",
-  "domain_pill.activitypub_like_language": "ActivityPub är som språket Mastodon talar med andra sociala nätverk.",
-  "domain_pill.server": "Server",
-  "domain_pill.their_handle": "Deras handtag:",
-  "domain_pill.their_server": "Deras digitala hem, där alla deras tjänster bor.",
-  "domain_pill.their_username": "Deras unika identifierare på deras server. Det är möjligt att hitta användare med samma användarnamn på olika servrar.",
-  "domain_pill.username": "Användarnamn",
-  "domain_pill.whats_in_a_handle": "Vad finns i ett handtag?",
-  "domain_pill.who_they_are": "Eftersom handtag säger vem någon är och var de är, kan du interagera med människor på det sociala nätet av <button>ActivityPub-drivna plattformar</button>.",
-  "domain_pill.who_you_are": "Eftersom ditt handtag säger vem du är och var du är kan människor interagera med dig på det sociala nätet på <button>ActivityPub-drivna plattformar</button>.",
-  "domain_pill.your_handle": "Ditt handtag:",
-  "domain_pill.your_server": "Ditt digitala hem, där alla dina inlägg bor. Gillar du inte just denna? Byt server när som helst och ta med dina anhängare också.",
-  "domain_pill.your_username": "Din unika identifierare på denna server. Det är möjligt att hitta användare med samma användarnamn på olika servrar.",
   "dropdown.empty": "Välj ett alternativ",
   "email_subscriptions.email": "E-post",
   "email_subscriptions.form.action": "Prenumerera",
@@ -745,7 +731,6 @@
   "footer.terms_of_service": "Användarvillkor",
   "form_error.blank": "Fältet får inte vara tomt.",
   "form_field.optional": "(valfritt)",
-  "generic.saved": "Sparad",
   "getting_started.heading": "Kom igång",
   "hashtag.admin_moderation": "Öppet modereringsgränssnittet för #{name}",
   "hashtag.browse": "Bläddra bland inlägg i #{hashtag}",
diff --git a/app/javascript/mastodon/locales/szl.json b/app/javascript/mastodon/locales/szl.json
index d699a97721..a758170fa9 100644
--- a/app/javascript/mastodon/locales/szl.json
+++ b/app/javascript/mastodon/locales/szl.json
@@ -18,7 +18,6 @@
   "account.media": "Media",
   "account.mute": "Wycisz @{name}",
   "account.posts": "Posty",
-  "account_note.placeholder": "Wybier, żeby przidac notka",
   "column.bookmarks": "Zokłodki",
   "column.direct": "Prywatne spōmniynia",
   "column.favourites": "Spamiyntane",
diff --git a/app/javascript/mastodon/locales/ta.json b/app/javascript/mastodon/locales/ta.json
index d55dc90166..45a218ebbd 100644
--- a/app/javascript/mastodon/locales/ta.json
+++ b/app/javascript/mastodon/locales/ta.json
@@ -44,7 +44,6 @@
   "account.unfollow": "பின்தொடர்வதை நிறுத்துக",
   "account.unmute": "@{name} இன் மீது மௌனத் தடையை நீக்குக",
   "account.unmute_short": "அமைதியை நீக்கு",
-  "account_note.placeholder": "குறிப்பு ஒன்றை சேர்க்க சொடுக்கவும்",
   "admin.dashboard.daily_retention": "பதிவுசெய்த பிறகு நாள்தோறும் பயனர் தக்கவைப்பு விகிதம்",
   "admin.dashboard.monthly_retention": "பதிவுசெய்த பிறகு மாதந்தோறும் பயனர் தக்கவைப்பு விகிதம்",
   "admin.dashboard.retention.average": "சராசரி",
@@ -175,7 +174,6 @@
   "follow_request.authorize": "அனுமதியளி",
   "follow_request.reject": "நிராகரி",
   "follow_requests.unlocked_explanation": "உங்கள் கணக்கு பூட்டப்படவில்லை என்றாலும், இந்தக் கணக்குகளிலிருந்து உங்களைப் பின்தொடர விரும்பும் கோரிக்கைகளை நீங்கள் பரீசீலிப்பது நலம் என்று {domain} ஊழியர் எண்ணுகிறார்.",
-  "generic.saved": "சேமிக்கப்பட்டது",
   "getting_started.heading": "முதன்மைப் பக்கம்",
   "hashtag.column_header.tag_mode.all": "மற்றும் {additional}",
   "hashtag.column_header.tag_mode.any": "அல்லது {additional}",
diff --git a/app/javascript/mastodon/locales/tai.json b/app/javascript/mastodon/locales/tai.json
index 8a4399e271..c2f0a3ce5d 100644
--- a/app/javascript/mastodon/locales/tai.json
+++ b/app/javascript/mastodon/locales/tai.json
@@ -7,7 +7,6 @@
   "account.media": "Mûi-thé",
   "account.mention": "Thê-khí @{name}",
   "account.posts": "Huah-siann",
-  "account_note.placeholder": "Tiám tsi̍t-ē ka-thiam pī-tsù",
   "column.pins": "Tah thâu-tsîng ê huah-siann",
   "community.column_settings.media_only": "Kan-na muî-thé",
   "compose_form.encryption_warning": "Tī Mastodon tah huah-siann m̄-sī tuan-tuì-tuan ka-pì ê. M̄-thang tī Mastodon hun-hióng jīm-hô bín-kám ê tsū-sìn.",
diff --git a/app/javascript/mastodon/locales/te.json b/app/javascript/mastodon/locales/te.json
index 0981a878ff..53f0bcfff7 100644
--- a/app/javascript/mastodon/locales/te.json
+++ b/app/javascript/mastodon/locales/te.json
@@ -29,7 +29,6 @@
   "account.unendorse": "ప్రొఫైల్లో చూపించవద్దు",
   "account.unfollow": "అనుసరించవద్దు",
   "account.unmute": "@{name}పై మ్యూట్ ని తొలగించు",
-  "account_note.placeholder": "Click to add a note",
   "alert.unexpected.message": "అనుకోని తప్పు జరిగినది.",
   "alert.unexpected.title": "అయ్యో!",
   "boost_modal.combo": "మీరు తదుపరిసారి దీనిని దాటవేయడానికి {combo} నొక్కవచ్చు",
diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json
index 228ed0c7f1..2f9bc2ad4c 100644
--- a/app/javascript/mastodon/locales/th.json
+++ b/app/javascript/mastodon/locales/th.json
@@ -90,7 +90,6 @@
   "account.unmute": "เลิกซ่อน @{name}",
   "account.unmute_notifications_short": "เลิกซ่อนการแจ้งเตือน",
   "account.unmute_short": "เลิกซ่อน",
-  "account_note.placeholder": "คลิกเพื่อเพิ่มหมายเหตุ",
   "admin.dashboard.daily_retention": "อัตราการเก็บรักษาผู้ใช้ตามวันหลังจากการลงทะเบียน",
   "admin.dashboard.monthly_retention": "อัตราการเก็บรักษาผู้ใช้ตามเดือนหลังจากการลงทะเบียน",
   "admin.dashboard.retention.average": "ค่าเฉลี่ย",
@@ -269,19 +268,6 @@
   "domain_block_modal.you_will_lose_num_followers": "คุณจะสูญเสีย {followersCount, plural, other {{followersCountDisplay} ผู้ติดตาม}}และ {followingCount, plural, other {{followingCountDisplay} คนที่คุณติดตาม}}",
   "domain_block_modal.you_will_lose_relationships": "คุณจะสูญเสียผู้ติดตามและผู้คนที่คุณติดตามทั้งหมดจากเซิร์ฟเวอร์นี้",
   "domain_block_modal.you_wont_see_posts": "คุณจะไม่เห็นโพสต์หรือการแจ้งเตือนจากผู้ใช้ในเซิร์ฟเวอร์นี้",
-  "domain_pill.activitypub_lets_connect": "โปรโตคอลช่วยให้คุณเชื่อมต่อและโต้ตอบกับผู้คนไม่ใช่แค่ใน Mastodon แต่ทั่วทั้งแอปสังคมต่าง ๆ เช่นกัน",
-  "domain_pill.activitypub_like_language": "ActivityPub เป็นเหมือนภาษาที่ Mastodon พูดกับเครือข่ายสังคมอื่น ๆ",
-  "domain_pill.server": "เซิร์ฟเวอร์",
-  "domain_pill.their_handle": "นามของเขา:",
-  "domain_pill.their_server": "บ้านดิจิทัลของเขา ที่ซึ่งโพสต์ทั้งหมดของเขาอาศัยอยู่",
-  "domain_pill.their_username": "ตัวระบุที่ไม่ซ้ำกันของเขาในเซิร์ฟเวอร์ของเขา เป็นไปได้ที่จะค้นหาผู้ใช้ที่มีชื่อผู้ใช้เดียวกันในเซิร์ฟเวอร์ที่แตกต่างกัน",
-  "domain_pill.username": "ชื่อผู้ใช้",
-  "domain_pill.whats_in_a_handle": "ในนามมีอะไรอยู่?",
-  "domain_pill.who_they_are": "เนื่องจากนามบอกว่าใครสักคนคือใครและเขาอยู่ที่ไหน คุณสามารถโต้ตอบกับผู้คนทั่วทั้งเว็บสังคมของ <button>แพลตฟอร์มที่ขับเคลื่อนโดย ActivityPub</button>",
-  "domain_pill.who_you_are": "เนื่องจากนามของคุณบอกว่าคุณคือใครและคุณอยู่ที่ไหน ผู้คนสามารถโต้ตอบกับคุณทั่วทั้งเว็บสังคมของ <button>แพลตฟอร์มที่ขับเคลื่อนโดย ActivityPub</button>",
-  "domain_pill.your_handle": "นามของคุณ:",
-  "domain_pill.your_server": "บ้านดิจิทัลของคุณ ที่ซึ่งโพสต์ทั้งหมดของคุณอาศัยอยู่ ไม่ชอบเซิร์ฟเวอร์นี้? ถ่ายโอนเซิร์ฟเวอร์เมื่อใดก็ได้และนำผู้ติดตามของคุณไปด้วยเช่นกัน",
-  "domain_pill.your_username": "ตัวระบุที่ไม่ซ้ำกันของคุณในเซิร์ฟเวอร์นี้ เป็นไปได้ที่จะค้นหาผู้ใช้ที่มีชื่อผู้ใช้เดียวกันในเซิร์ฟเวอร์ที่แตกต่างกัน",
   "dropdown.empty": "เลือกตัวเลือก",
   "embed.instructions": "ฝังโพสต์นี้ในเว็บไซต์ของคุณโดยคัดลอกโค้ดด้านล่าง",
   "embed.preview": "นี่คือลักษณะของการฝังที่จะปรากฏ:",
@@ -388,7 +374,6 @@
   "footer.source_code": "ดูโค้ดต้นฉบับ",
   "footer.status": "สถานะ",
   "footer.terms_of_service": "เงื่อนไขการให้บริการ",
-  "generic.saved": "บันทึกแล้ว",
   "getting_started.heading": "เริ่มต้นใช้งาน",
   "hashtag.admin_moderation": "เปิดส่วนติดต่อการกลั่นกรองสำหรับ #{name}",
   "hashtag.browse": "เรียกดูโพสต์ใน #{hashtag}",
diff --git a/app/javascript/mastodon/locales/tok.json b/app/javascript/mastodon/locales/tok.json
index a90f410272..265d5f422e 100644
--- a/app/javascript/mastodon/locales/tok.json
+++ b/app/javascript/mastodon/locales/tok.json
@@ -81,7 +81,6 @@
   "account.unmute": "o len ala e @{name}",
   "account.unmute_notifications_short": "o kute e mu",
   "account.unmute_short": "o len ala",
-  "account_note.placeholder": "o luka e ni la sona pi sina taso",
   "admin.dashboard.daily_retention": "nanpa pi awen jan lon tenpo suno",
   "admin.dashboard.monthly_retention": "nanpa pi awen jan lon tenpo mun",
   "admin.dashboard.retention.average": "sama",
@@ -266,18 +265,6 @@
   "domain_block_modal.you_will_lose_num_followers": "{followersCount, plural, other {jan {followersCountDisplay}}} li kute e sina la, ona kama kute ala e sina. sina kute e {followingCount, plural,other {jan {followingCountDisplay}}} la, sina kama kute ala e ona.",
   "domain_block_modal.you_will_lose_relationships": "jan li lon kulupu ni la ona kute e sina la, ona li kama kute ala e sina. jan li lon kulupu ni la sina kute e ona la, sina kama kute ala e ona.",
   "domain_block_modal.you_wont_see_posts": "sina ken ala lukin e toki tan jan pi ma ni",
-  "domain_pill.activitypub_lets_connect": "ilo ni la sina ken toki tawa jan ante. ni li lon ma Mastodon taso ala li lon ma mute a.",
-  "domain_pill.activitypub_like_language": "ilo Mastodon li toki kepeken nasin ActivityPub tawa kulupu ilo ante.",
-  "domain_pill.server": "ma",
-  "domain_pill.their_handle": "nimi pi ona taso li ni:",
-  "domain_pill.their_server": "ni li ma ona lon ilo. toki ale ona li lon ma ni.",
-  "domain_pill.their_username": "ni li nimi ona lon ma ni. jan mute li lon ma ante la, nimi ona li ken sama.",
-  "domain_pill.username": "nimi jan",
-  "domain_pill.whats_in_a_handle": "seme li lon nimi?",
-  "domain_pill.who_they_are": "nimi ilo la sona jan en sona ma li lon. ni la sina ken toki tawa jan ni lon <button>kulupu ma ale</button>.",
-  "domain_pill.your_handle": "nimi sina:",
-  "domain_pill.your_server": "ni li ma sina lon ilo. toki ale sina li lon ma ni. ma li ike tawa sina la, sina ken tawa ma ante. ni la jan kute sina li tawa sama.",
-  "domain_pill.your_username": "ni li nimi sina. ma sina la, sina taso li jo e ona. jan mute li lon ma ante la, ona li ken jo e nimi sama.",
   "dropdown.empty": "o wile e ijo wan",
   "embed.instructions": "o pana e toki ni la, toki li lon lipu ante. ",
   "embed.preview": "ni li jo e sitelen ni:",
@@ -348,7 +335,6 @@
   "footer.source_code": "o lukin e toki ilo",
   "footer.status": "lon",
   "footer.terms_of_service": "lipu lawa",
-  "generic.saved": "mi awen e ni",
   "getting_started.heading": "mi open",
   "hashtag.admin_moderation": "o lawa e kulupu #{name}",
   "hashtag.browse": "o lukin e kulupu toki #{hashtag}",
diff --git a/app/javascript/mastodon/locales/tr.json b/app/javascript/mastodon/locales/tr.json
index a441fbafdb..5ebddd7d13 100644
--- a/app/javascript/mastodon/locales/tr.json
+++ b/app/javascript/mastodon/locales/tr.json
@@ -257,7 +257,6 @@
   "account_edit_tags.tag_status_count": "{count, plural, one {# gönderi} other {# gönderi}}",
   "account_list.hidden_notice": "Bu liste yalnızca sizin tarafınızdan görülebilir. Bu listeyi başkalarına göstermek için <link>{page} > {modal} > {field}</link> adresine gidin.",
   "account_list.total": "{total, plural, one {# hesap} other {# hesap}}",
-  "account_note.placeholder": "Not eklemek için tıklayın",
   "admin.dashboard.daily_retention": "Kayıttan sonra günlük kullanıcı saklama oranı",
   "admin.dashboard.monthly_retention": "Kayıttan sonra aylık kullanıcı saklama oranı",
   "admin.dashboard.retention.average": "Ortalama",
@@ -596,19 +595,6 @@
   "domain_block_modal.you_will_lose_num_followers": "{followersCount, plural, one {{followersCountDisplay} takipçi} other {{followersCountDisplay} takipçi}} ve {followingCount, plural, one {{followingCountDisplay} takip ettiğiniz kişi} other {{followingCountDisplay} takip ettiğiniz kişi}} kaybedeceksiniz.",
   "domain_block_modal.you_will_lose_relationships": "Bu sunucudaki tüm takip edenleri ve takip ettiklerinizi kaybedeceksiniz.",
   "domain_block_modal.you_wont_see_posts": "Bu sunucudaki kullanıcılardan gelen gönderileri veya bildirimleri göremezsiniz.",
-  "domain_pill.activitypub_lets_connect": "Sadece Mastodon üzerindeki değil, diğer sosyal uygulamalardaki kişilerle de bağlantı kurmanıza ve etkileşmenize olanak sağlar.",
-  "domain_pill.activitypub_like_language": "ActivityPub, Mastodon'un diğer sosyal ağlarla konuşmak için kullandığı dil gibidir.",
-  "domain_pill.server": "Sunucu",
-  "domain_pill.their_handle": "Kullanıcı kimliği:",
-  "domain_pill.their_server": "Dijital evleri, tüm gönderilerinin yaşadığı yerdir.",
-  "domain_pill.their_username": "Sunucularındaki tekil tanımlayıcıları. Farklı sunucularda aynı kullanıcı adına sahip kullanıcıları bulmak mümkündür.",
-  "domain_pill.username": "Kullanıcı adı",
-  "domain_pill.whats_in_a_handle": "Kullanıcı kimliği nedir?",
-  "domain_pill.who_they_are": "Kullanıcı kimlikleri bir kişinin kim olduğunu ve nerede olduğunu söylediği için, <button>ActivityPub destekli platformların</button> sosyal ağındaki insanlarla etkileşime geçebilirsiniz.",
-  "domain_pill.who_you_are": "Kullanıcı kimliğiniz kim olduğunuzu ve nerede olduğunuzu söylediği için, <button>ActivityPub destekli platformların</button> sosyal ağındaki insanlar sizinle etkileşime geçebilir.",
-  "domain_pill.your_handle": "Kullanıcı kimliğiniz:",
-  "domain_pill.your_server": "Dijital anasayfanız, tüm gönderilerinizin yaşadığı yerdir. Bunu beğenmediniz mi? İstediğiniz zaman sunucularınızı değiştirin ve takipçilerinizi de getirin.",
-  "domain_pill.your_username": "Bu sunucudaki tekil tanımlayıcınız. Farklı sunucularda aynı kullanıcı adına sahip kullanıcıları bulmak mümkündür.",
   "dropdown.empty": "Bir seçenek seçin",
   "email_subscriptions.email": "E-posta",
   "email_subscriptions.form.action": "Abone ol",
@@ -745,7 +731,6 @@
   "footer.terms_of_service": "Hizmet şartları",
   "form_error.blank": "Alan boş bırakılamaz.",
   "form_field.optional": "(isteğe bağlı)",
-  "generic.saved": "Kaydet",
   "getting_started.heading": "Başlarken",
   "hashtag.admin_moderation": "#{name} için denetim arayüzünü açın",
   "hashtag.browse": "#{hashtag} gönderilerine gözat",
diff --git a/app/javascript/mastodon/locales/tt.json b/app/javascript/mastodon/locales/tt.json
index 228dcc4004..e09cfa8daf 100644
--- a/app/javascript/mastodon/locales/tt.json
+++ b/app/javascript/mastodon/locales/tt.json
@@ -73,7 +73,6 @@
   "account.unmute": "Kабызыгыз @{name}",
   "account.unmute_notifications_short": "Искәртүләрне кабыз",
   "account.unmute_short": "Kабызыгыз",
-  "account_note.placeholder": "Click to add a note",
   "admin.dashboard.daily_retention": "Теркәлгәннән соң икенче көнне кулланучыларны тоту коэффициенты",
   "admin.dashboard.monthly_retention": "Теркәлгәннән соң ай саен кулланучыларны тоту күрсәткече",
   "admin.dashboard.retention.average": "Урта",
@@ -219,7 +218,6 @@
   "footer.privacy_policy": "Хосусыйлык сәясәте",
   "footer.source_code": "Чыганак кодын карау",
   "footer.status": "Халәт",
-  "generic.saved": "Сакланды",
   "getting_started.heading": "Башлау",
   "hashtag.column_header.tag_mode.all": "һәм {additional}",
   "hashtag.column_header.tag_mode.any": "яки {additional}",
diff --git a/app/javascript/mastodon/locales/ug.json b/app/javascript/mastodon/locales/ug.json
index 97edc4e8b2..df88e26645 100644
--- a/app/javascript/mastodon/locales/ug.json
+++ b/app/javascript/mastodon/locales/ug.json
@@ -28,7 +28,6 @@
   "account.go_to_profile": "تەرجىمىھالغا يۆتكەل",
   "account.posts": "يازما",
   "account.report": "@{name} نى پاش قىل",
-  "account_note.placeholder": "چېكىلسە ئىزاھات قوشىدۇ",
   "column.pins": "چوققىلانغان يازما",
   "community.column_settings.media_only": "ۋاسىتەلا",
   "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
diff --git a/app/javascript/mastodon/locales/uk.json b/app/javascript/mastodon/locales/uk.json
index 7a6d6dd60e..a514e36990 100644
--- a/app/javascript/mastodon/locales/uk.json
+++ b/app/javascript/mastodon/locales/uk.json
@@ -113,7 +113,6 @@
   "account_edit.save": "Зберегти",
   "account_edit_tags.suggestions": "Пропозиції:",
   "account_edit_tags.tag_status_count": "{count, plural, one {# допис} few {# дописи} many {# дописів} other {# допису}}",
-  "account_note.placeholder": "Натисніть, щоб додати примітку",
   "admin.dashboard.daily_retention": "Щоденний показник утримання користувачів після реєстрації",
   "admin.dashboard.monthly_retention": "Щомісячний показник утримання користувачів після реєстрації",
   "admin.dashboard.retention.average": "Середнє",
@@ -317,19 +316,6 @@
   "domain_block_modal.you_will_lose_num_followers": "Ви втратите {followersCount, plural, one {{followersCountDisplay} підписника} few {{followersCountDisplay} підписника} many {{followersCountDisplay} підписників} other {{followersCountDisplay} підписника}} та {followingCount, plural, one {{followingCountDisplay} особу, за якою ви стежите} few {{followingCountDisplay} особи, за якими ви стежите} many {{followingCountDisplay} осіб, за якими ви стежите} other {{followingCountDisplay} особу, за якою ви стежите}}.",
   "domain_block_modal.you_will_lose_relationships": "Ви втратите всіх підписників і людей, на яких ви підписані.",
   "domain_block_modal.you_wont_see_posts": "Ви не бачитимете дописів і сповіщень від користувачів на цьому сервері.",
-  "domain_pill.activitypub_lets_connect": "Це дозволяє вам спілкуватися та взаємодіяти з людьми не лише на Mastodon, але й у різних соціальних застосунках.",
-  "domain_pill.activitypub_like_language": "ActivityPub - це як мова, якою Mastodon розмовляє з іншими соціальними мережами.",
-  "domain_pill.server": "Сервер",
-  "domain_pill.their_handle": "Їхня адреса:",
-  "domain_pill.their_server": "Їхній цифровий дім, де живуть усі їхні дописи.",
-  "domain_pill.their_username": "Їхній унікальний ідентифікатор на їхньому сервері. Ви можете знайти користувачів з однаковими іменами на різних серверах.",
-  "domain_pill.username": "Ім'я користувача",
-  "domain_pill.whats_in_a_handle": "Що є в адресі?",
-  "domain_pill.who_they_are": "Оскільки дескриптори вказують, хто це і де він знаходиться, ви можете взаємодіяти з людьми через соціальну мережу платформ на основі <button>ActivityPub</button>.",
-  "domain_pill.who_you_are": "Оскільки ваш нікнейм вказує, хто ви та де ви, люди можуть взаємодіяти з вами через соціальну мережу платформ на основі <button>ActivityPub</button>.",
-  "domain_pill.your_handle": "Ваша адреса:",
-  "domain_pill.your_server": "Ваш цифровий дім, де живуть усі ваші дописи. Не подобається цей? Перенесіть сервери в будь-який час і залучайте своїх підписників.",
-  "domain_pill.your_username": "Ваш унікальний ідентифікатор на цьому сервері. Ви можете знайти користувачів з однаковими іменами на різних серверах.",
   "dropdown.empty": "Оберіть варіант",
   "embed.instructions": "Вбудуйте цей допис до вашого вебсайту, скопіювавши код нижче.",
   "embed.preview": "Ось який вигляд це матиме:",
@@ -432,7 +418,6 @@
   "footer.source_code": "Перегляд програмного коду",
   "footer.status": "Статус",
   "footer.terms_of_service": "Умови використання",
-  "generic.saved": "Збережено",
   "getting_started.heading": "Розпочати",
   "hashtag.admin_moderation": "Відкрити інтерфейс модерації для #{name}",
   "hashtag.column_header.tag_mode.all": "та {additional}",
diff --git a/app/javascript/mastodon/locales/uz.json b/app/javascript/mastodon/locales/uz.json
index 32f5da4cb4..f0db658b5e 100644
--- a/app/javascript/mastodon/locales/uz.json
+++ b/app/javascript/mastodon/locales/uz.json
@@ -51,7 +51,6 @@
   "account.unfollow": "Kuzatishni To'xtatish",
   "account.unmute": "@{name} ovozini yoqish",
   "account.unmute_short": "Ovozni yoqish",
-  "account_note.placeholder": "Eslatma qo'shish uchun bosing",
   "admin.dashboard.daily_retention": "Ro'yxatdan o'tgandan keyingi kun bo'yicha foydalanuvchini ushlab turish darajasi",
   "admin.dashboard.monthly_retention": "Ro'yxatdan o'tgandan keyin oy bo'yicha foydalanuvchini ushlab turish darajasi",
   "admin.dashboard.retention.average": "O‘rtacha",
@@ -211,7 +210,6 @@
   "footer.keyboard_shortcuts": "Klaviatura yorliqlari",
   "footer.privacy_policy": "Maxfiylik siyosati",
   "footer.source_code": "Kodini ko'rish",
-  "generic.saved": "Saqlandi",
   "getting_started.heading": "Ishni boshlash",
   "hashtag.column_header.tag_mode.all": "va {additional}",
   "hashtag.column_header.tag_mode.any": "yoki {additional}",
diff --git a/app/javascript/mastodon/locales/vi.json b/app/javascript/mastodon/locales/vi.json
index 94a99c011a..db3b08ca7a 100644
--- a/app/javascript/mastodon/locales/vi.json
+++ b/app/javascript/mastodon/locales/vi.json
@@ -257,7 +257,6 @@
   "account_edit_tags.tag_status_count": "{count, plural, other {# tút}}",
   "account_list.hidden_notice": "Chỉ bạn mới thấy. Để hiển thị danh sách này cho người khác, hãy vào <link>{page} > {modal} > {field}</link>.",
   "account_list.total": "{total, plural, other {# tài khoản}}",
-  "account_note.placeholder": "Nhấn để thêm",
   "admin.dashboard.daily_retention": "Tỉ lệ người dùng sau đăng ký ở lại theo ngày",
   "admin.dashboard.monthly_retention": "Tỉ lệ người dùng ở lại sau khi đăng ký",
   "admin.dashboard.retention.average": "Trung bình",
@@ -596,19 +595,6 @@
   "domain_block_modal.you_will_lose_num_followers": "Bạn sẽ mất {followersCount, plural, other {{followersCountDisplay} người theo dõi}} và {followingCount, plural, other {{followingCountDisplay} tài khoản mà bạn theo dõi}}.",
   "domain_block_modal.you_will_lose_relationships": "Bạn sẽ mất tất cả người theo dõi và những tài khoản mà bạn theo dõi ở máy chủ này.",
   "domain_block_modal.you_wont_see_posts": "Bạn không còn thấy tút hoặc thông báo từ thành viên máy chủ này.",
-  "domain_pill.activitypub_lets_connect": "Nó cho phép bạn kết nối và tương tác với mọi người, không chỉ trên Mastodon mà còn trên các nền tảng khác.",
-  "domain_pill.activitypub_like_language": "ActivityPub giống như ngôn ngữ Mastodon giao tiếp với các mạng xã hội khác.",
-  "domain_pill.server": "Máy chủ",
-  "domain_pill.their_handle": "Địa chỉ Mastodon:",
-  "domain_pill.their_server": "Nơi lưu trữ tút của tài khoản này.",
-  "domain_pill.their_username": "Độc nhất trên máy chủ này. Những máy chủ khác có thể cũng có tên người dùng giống vậy.",
-  "domain_pill.username": "Tên người dùng",
-  "domain_pill.whats_in_a_handle": "Địa chỉ Mastodon là gì?",
-  "domain_pill.who_they_are": "Vì địa chỉ Mastodon cho biết một người là ai và họ ở đâu, nên bạn có thể tương tác với mọi người trên các nền tảng <button>hỗ trợ ActivityPub</button>.",
-  "domain_pill.who_you_are": "Vì địa chỉ Mastodon cho biết bạn là ai và bạn ở đâu, nên mọi người có thể tương tác với bạn từ các nền tảng <button>hỗ trợ ActivityPub</button>.",
-  "domain_pill.your_handle": "Địa chỉ Mastodon của bạn:",
-  "domain_pill.your_server": "Nơi lưu trữ tút của bạn. Không thích ở đây? Chuyển sang máy chủ khác và giữ nguyên người theo dõi của bạn.",
-  "domain_pill.your_username": "Chỉ riêng bạn trên máy chủ này. Những máy chủ khác có thể cũng có tên người dùng giống vậy.",
   "dropdown.empty": "Chọn một lựa chọn",
   "email_subscriptions.email": "Email",
   "email_subscriptions.form.action": "Đăng ký",
@@ -745,7 +731,6 @@
   "footer.terms_of_service": "Điều khoản dịch vụ",
   "form_error.blank": "Không thể để trống trường.",
   "form_field.optional": "(tùy chọn)",
-  "generic.saved": "Đã lưu",
   "getting_started.heading": "Quản lý",
   "hashtag.admin_moderation": "Mở giao diện quản trị #{name}",
   "hashtag.browse": "Tìm tút #{hashtag}",
diff --git a/app/javascript/mastodon/locales/zgh.json b/app/javascript/mastodon/locales/zgh.json
index 0d14451b49..645b3a4811 100644
--- a/app/javascript/mastodon/locales/zgh.json
+++ b/app/javascript/mastodon/locales/zgh.json
@@ -15,7 +15,6 @@
   "account.posts": "Toots",
   "account.share": "ⴱⴹⵓ ⵉⴼⵔⵙ ⵏ @{name}",
   "account.unfollow": "ⴽⴽⵙ ⴰⴹⴼⴼⵓⵕ",
-  "account_note.placeholder": "Click to add a note",
   "bundle_column_error.retry": "ⴰⵍⵙ ⴰⵔⵎ",
   "bundle_modal_error.close": "ⵔⴳⵍ",
   "bundle_modal_error.retry": "ⴰⵍⵙ ⴰⵔⵎ",
diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json
index c7c33dd27f..0072b83ac9 100644
--- a/app/javascript/mastodon/locales/zh-CN.json
+++ b/app/javascript/mastodon/locales/zh-CN.json
@@ -257,7 +257,6 @@
   "account_edit_tags.tag_status_count": "{count, plural, other {# 条嘟文}}",
   "account_list.hidden_notice": "此内容仅对你可见。要让此列表对其他人可见，请前往<link>{page} > {modal} > {field}</link>。",
   "account_list.total": "{total, plural, other {# 个账号}}",
-  "account_note.placeholder": "点击添加备注",
   "admin.dashboard.daily_retention": "注册后用户留存率（按日计算）",
   "admin.dashboard.monthly_retention": "注册后用户留存率（按月计算）",
   "admin.dashboard.retention.average": "平均",
@@ -596,19 +595,6 @@
   "domain_block_modal.you_will_lose_num_followers": "你将失去 {followersCount, plural, other {{followersCountDisplay} 名关注者}}和 {followingCount, plural, other {{followingCountDisplay} 名关注}}。",
   "domain_block_modal.you_will_lose_relationships": "你将丢失该站点上的全部关注与关注者。",
   "domain_block_modal.you_wont_see_posts": "你将不会看到此服务器上用户的嘟文或通知。",
-  "domain_pill.activitypub_lets_connect": "它可以让你与不同社交应用上的人交流互动，而不仅限于 Mastodon。",
-  "domain_pill.activitypub_like_language": "ActivityPub 好比 Mastodon 与其它社交网络交流时使用的语言。",
-  "domain_pill.server": "服务器",
-  "domain_pill.their_handle": "对方用户名：",
-  "domain_pill.their_server": "对方的数字家园，对方的所有嘟文都存放在那里。",
-  "domain_pill.their_username": "对方在其服务器上的唯一标识。不同服务器上可能会存在相同用户名的用户。",
-  "domain_pill.username": "用户名",
-  "domain_pill.whats_in_a_handle": "用户名的构成",
-  "domain_pill.who_they_are": "用户名可以表明用户的身份和其所在站点，这样你就可以通过<button>基于 ActivityPub 的平台</button>在社交网络和人们互动。",
-  "domain_pill.who_you_are": "用户名可以表明你的身份和你所在的站点，这样人们就可以通过<button>基于 ActivityPub 的平台</button>在社交网络与你互动。",
-  "domain_pill.your_handle": "你的用户名：",
-  "domain_pill.your_server": "你的数字家园，你的全部嘟文都在此存储。不喜欢这里吗？你可以随时迁移到其它服务器，并带上你的关注者。",
-  "domain_pill.your_username": "你在此服务器上的唯一标识。不同服务器上可能存在相同用户名的用户。",
   "dropdown.empty": "选项",
   "email_subscriptions.email": "电子邮件",
   "email_subscriptions.form.action": "订阅",
@@ -745,7 +731,6 @@
   "footer.terms_of_service": "服务条款",
   "form_error.blank": "字段不能为空。",
   "form_field.optional": "（选填）",
-  "generic.saved": "已保存",
   "getting_started.heading": "开始使用",
   "hashtag.admin_moderation": "打开 #{name} 的管理界面",
   "hashtag.browse": "浏览#{hashtag}中的贴子",
diff --git a/app/javascript/mastodon/locales/zh-HK.json b/app/javascript/mastodon/locales/zh-HK.json
index d47f2da6f6..837ae22f90 100644
--- a/app/javascript/mastodon/locales/zh-HK.json
+++ b/app/javascript/mastodon/locales/zh-HK.json
@@ -152,7 +152,6 @@
   "account_edit.field_edit_modal.discard_confirm": "散啦",
   "account_edit.field_edit_modal.discard_message": "你有啲嘢改咗未 Save, 係咪真係要閃㗎？",
   "account_edit.field_edit_modal.edit_title": "修改自訂欄目",
-  "account_note.placeholder": "點擊添加備注",
   "admin.dashboard.daily_retention": "註冊後按天計算的使用者存留率",
   "admin.dashboard.monthly_retention": "註冊後按月計算的使用者存留率",
   "admin.dashboard.retention.average": "平均",
@@ -303,19 +302,6 @@
   "domain_block_modal.they_wont_know": "對方不會知道自己被封鎖。",
   "domain_block_modal.title": "封鎖網域？",
   "domain_block_modal.you_wont_see_posts": "你將看不到此伺服器使用者的帖文和通知。",
-  "domain_pill.activitypub_lets_connect": "這讓你不僅能在 Mastodon 上，也能在其他社交應用程式中與人交流互動。",
-  "domain_pill.activitypub_like_language": "ActivityPub 就像 Mastodon 與其他社交網絡溝通所用的語言。",
-  "domain_pill.server": "伺服器",
-  "domain_pill.their_handle": "他們的帳號：",
-  "domain_pill.their_server": "他們的數碼家園，所有帖文的棲息地。",
-  "domain_pill.their_username": "在他們的伺服器上的獨特識別碼。不同伺服器上的使用者有可能擁有相同的使用者名稱。",
-  "domain_pill.username": "使用者名稱",
-  "domain_pill.whats_in_a_handle": "帳號是甚麼？",
-  "domain_pill.who_they_are": "帳號代表了使用者的身份和所在之處，因此你能夠在以 <button>ActivityPub 支援的平台</button>構建的社交網絡中與他人互動交流。",
-  "domain_pill.who_you_are": "你的帳號代表了你的身份和所在之處，因此人們能夠在以 <button>ActivityPub 支援的平台</button>構建的社交網絡中與你互動交流。",
-  "domain_pill.your_handle": "你的帳號：",
-  "domain_pill.your_server": "你的數碼家園，你所有帖文的棲息地。不喜歡這裏嗎？隨時搬家到其他伺服器，把你的追蹤者也帶來。",
-  "domain_pill.your_username": "你在這台伺服器的獨特識別碼。可以在不同伺服器上找到相同使用者名稱的人。",
   "embed.instructions": "要內嵌此文章，請將以下代碼貼進你的網站。",
   "embed.preview": "看上去會是這樣：",
   "emoji_button.activity": "活動",
@@ -410,7 +396,6 @@
   "footer.privacy_policy": "私隱政策",
   "footer.source_code": "查看原始碼",
   "footer.status": "狀態",
-  "generic.saved": "已儲存",
   "getting_started.heading": "開始使用",
   "hashtag.column_header.tag_mode.all": "以及{additional}",
   "hashtag.column_header.tag_mode.any": "或是{additional}",
diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json
index 8d3a97867f..8b0d9143ec 100644
--- a/app/javascript/mastodon/locales/zh-TW.json
+++ b/app/javascript/mastodon/locales/zh-TW.json
@@ -257,7 +257,6 @@
   "account_edit_tags.tag_status_count": "{count, plural, other {# 則嘟文}}",
   "account_list.hidden_notice": "僅您可見。如欲向他人展示此列表，請前往 <link>{page} > {modal} > {field}</link>。",
   "account_list.total": "{total, plural, other {# 個帳號}}",
-  "account_note.placeholder": "點擊以新增備註",
   "admin.dashboard.daily_retention": "註冊後使用者存留率（日）",
   "admin.dashboard.monthly_retention": "註冊後使用者存留率（月）",
   "admin.dashboard.retention.average": "平均",
@@ -596,19 +595,6 @@
   "domain_block_modal.you_will_lose_num_followers": "您將失去 {followersCount, plural, other {{followersCountDisplay} 個跟隨者}} 與 {followingCount, plural, other {{followingCountDisplay} 個您跟隨之帳號}}。",
   "domain_block_modal.you_will_lose_relationships": "您將失去所有的跟隨者與您自此伺服器跟隨之帳號。",
   "domain_block_modal.you_wont_see_posts": "您將不會見到來自此伺服器使用者之任何嘟文或推播通知。",
-  "domain_pill.activitypub_lets_connect": "它使您能於 Mastodon 及其他不同的社群應用程式與人連結及互動。",
-  "domain_pill.activitypub_like_language": "ActivityPub 像是 Mastodon 與其他社群網路溝通時所用的語言。",
-  "domain_pill.server": "伺服器",
-  "domain_pill.their_handle": "他們的帳號：",
-  "domain_pill.their_server": "他們數位世界的家，他們所有的嘟文都在這裡。",
-  "domain_pill.their_username": "他們於他們的伺服器中獨一無二的識別。於不同的伺服器上可能找到具有相同帳號的使用者。",
-  "domain_pill.username": "使用者名稱",
-  "domain_pill.whats_in_a_handle": "什麼是帳號 (@handle) ？",
-  "domain_pill.who_they_are": "由於帳號 (@handle) 能說明某人是誰以及他們來自何方，您能於 <button>支援 ActivityPub 的平臺</button> 之社群網路上與人們互動。",
-  "domain_pill.who_you_are": "由於帳號 (@handle) 能說明您是誰以及您來自何方，人們能於 <button>支援 ActivityPub 的平臺</button> 之社群網路上與您互動。",
-  "domain_pill.your_handle": "您的帳號：",
-  "domain_pill.your_server": "您數位世界的家，您所有的嘟文都在這裡。不喜歡這台伺服器嗎？您能隨時搬家至其他伺服器並且仍保有您的跟隨者。",
-  "domain_pill.your_username": "您於您的伺服器中獨一無二的識別。於不同的伺服器上可能找到具有相同帳號的使用者。",
   "dropdown.empty": "請選擇一個選項",
   "email_subscriptions.email": "電子郵件",
   "email_subscriptions.form.action": "訂閱",
@@ -745,7 +731,6 @@
   "footer.terms_of_service": "服務條款",
   "form_error.blank": "欄位內容無法為空白。",
   "form_field.optional": "（非必填）",
-  "generic.saved": "已儲存",
   "getting_started.heading": "開始使用",
   "hashtag.admin_moderation": "開啟 #{name} 之管理介面",
   "hashtag.browse": "瀏覽 #{hashtag} 之嘟文",
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index a2ece4e517..6ff8e73b9c 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -84,7 +84,7 @@
 
 .button {
   background-color: var(--color-bg-brand-base);
-  border: 10px none;
+  border: 1px solid transparent;
   border-radius: 4px;
   box-sizing: border-box;
   color: var(--color-text-on-brand-base);
@@ -99,7 +99,7 @@
   letter-spacing: 0;
   line-height: 22px;
   overflow: hidden;
-  padding: 7px 18px;
+  padding: 6px 17px;
   position: relative;
   text-align: center;
   text-decoration: none;
@@ -168,8 +168,7 @@
   &.button-secondary {
     color: var(--color-text-brand);
     background: transparent;
-    padding: 6px 17px;
-    border: 1px solid var(--color-border-brand);
+    border-color: var(--color-border-brand);
 
     &:active,
     &:focus,
@@ -212,7 +211,11 @@
     // visually align its label with its surroundings while maintaining
     // a generous click target
     margin-inline: -6px;
-    border: 1px solid transparent;
+
+    &.button--compact {
+      padding: 5px;
+      margin-inline: -5px;
+    }
 
     &:active,
     &:focus,
diff --git a/app/models/account.rb b/app/models/account.rb
index a42a6e5926..b9b58d9b00 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -268,7 +268,19 @@ class Account < ApplicationRecord
   def needs_background_refresh?
     return false if local?
 
-    last_webfingered_at.blank? || last_webfingered_at <= BACKGROUND_REFRESH_INTERVAL.ago
+    return true if last_webfingered_at.blank? || last_webfingered_at <= BACKGROUND_REFRESH_INTERVAL.ago
+
+    # TODO: Remove some time after 4.6
+    # This is temporary workaround to speed up account refreshs after
+    # collections have been enabled / deployed.
+    # Accounts will be refreshed when they lack a feature_approval_policy
+    # but we know from other account's on the same server that they should
+    # have.
+    return false unless feature_approval_policy.zero?
+
+    Rails.cache.fetch("feature_approval_policy_availability:#{domain}", expires_in: 30.minutes) do
+      Account.where(domain:).where.not(feature_approval_policy: 0).exists?
+    end
   end
 
   def schedule_refresh_if_stale!
diff --git a/app/models/admin/collection_batch_action.rb b/app/models/admin/collection_batch_action.rb
index d08f17d747..750582191c 100644
--- a/app/models/admin/collection_batch_action.rb
+++ b/app/models/admin/collection_batch_action.rb
@@ -13,7 +13,12 @@ class Admin::CollectionBatchAction < Admin::BaseAction
   def process_action!
     return unless collection_ids
 
-    add_to_report!
+    case type
+    when 'report'
+      add_to_report!
+    when 'remove_from_report'
+      handle_remove_from_report!
+    end
   end
 
   def add_to_report!
@@ -24,6 +29,13 @@ class Admin::CollectionBatchAction < Admin::BaseAction
     @report_id = @report.id
   end
 
+  def handle_remove_from_report!
+    return unless with_report?
+
+    @report.collections = (@report.collections - selected_collections)
+    @report.save!
+  end
+
   def selected_collections
     @report.target_account.collections.where(id: collection_ids)
   end
diff --git a/app/views/admin/reports/show.html.haml b/app/views/admin/reports/show.html.haml
index 0aa2f69ba5..bae69cca04 100644
--- a/app/views/admin/reports/show.html.haml
+++ b/app/views/admin/reports/show.html.haml
@@ -63,23 +63,26 @@
           = render partial: 'admin/shared/status_batch_row', collection: @statuses, as: :status, locals: { f: f }
 
 - if Mastodon::Feature.collections_enabled?
-  %details{ open: @report.collections.any? }
+  %details{ open: @collections.any? }
     %summary
-      = t 'admin.reports.collections', count: @report.collections.size
+      = t 'admin.reports.collections', count: @collections.size
 
-    = form_with model: @form, url: batch_admin_account_collections_path(@report.target_account_id, report_id: @report.id) do |f|
+    = form_with model: @collection_form, url: batch_admin_account_collections_path(@report.target_account_id, report_id: @report.id) do |f|
       .batch-table
         .batch-table__toolbar
           %label.batch-table__toolbar__select.batch-checkbox-all
+            = check_box_tag :batch_checkbox_all, nil, false
           .batch-table__toolbar__actions
             = link_to safe_join([material_symbol('add'), t('admin.reports.add_to_report')]),
                       admin_account_collections_path(@report.target_account_id, report_id: @report.id),
                       class: 'table-action-link'
+            - if !@collections.empty? && @report.unresolved?
+              = f.button safe_join([material_symbol('close'), t('admin.collections.batch.remove_from_report')]), name: :remove_from_report, class: 'table-action-link', type: :submit
         .batch-table__body
-          - if @report.collections.empty?
+          - if @collections.empty?
             = nothing_here 'nothing-here--under-tabs'
           - else
-            = render partial: 'admin/shared/collection_batch_row', collection: @report.collections, as: :collection, locals: { f: f }
+            = render partial: 'admin/shared/collection_batch_row', collection: @collections, as: :collection, locals: { f: f }
 
 - if @report.unresolved?
   %hr.spacer/
diff --git a/bin/retry b/bin/retry
deleted file mode 100755
index 419ece62a5..0000000000
--- a/bin/retry
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/bash
-# https://github.com/travis-ci/travis-build/blob/cbe49ea239ab37b9b38b5b44d287b7ec7a108c16/lib/travis/build/templates/header.sh#L243-L260
-#
-# MIT LICENSE
-#
-# Copyright (c) 2016 Travis CI GmbH <contact@travis-ci.org>
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-retry() {
-  local result=0
-  local count=1
-
-  while [ $count -le 3 ]; do
-    if [ $result -ne 0 ]; then
-      echo -e "\n${ANSI_RED}The command \"$@\" failed. Retrying, $count of 3.${ANSI_RESET}\n" >&2
-    fi
-
-    "$@" && { result=0 && break; } || result=$?
-    count=$(($count + 1))
-    sleep 1
-  done
-
-  if [ $count -gt 3 ]; then
-    echo -e "\n${ANSI_RED}The command \"$@\" failed 3 times.${ANSI_RESET}\n" >&2
-  fi
-
-  return $result
-}
-
-retry $@
diff --git a/config/locales/be.yml b/config/locales/be.yml
index f5da3b1517..d61b89e5b9 100644
--- a/config/locales/be.yml
+++ b/config/locales/be.yml
@@ -353,14 +353,21 @@ be:
       updated_msg: Аб’ява абноўлена!
     collections:
       accounts: Уліковыя запісы
+      back_to_account: Назад да старонкі ўліковага запісу
+      back_to_report: Назад да старонкі скаргі
+      batch:
+        add_to_report: 'Дадаць да скаргі #%{id}'
+        report: Скарга
       collection_title: Калекцыя %{name}
       contents: Змесціва
+      no_collection_selected: Ніводная калекцыя не была змененая, бо ніводная не была выбраная
       number_of_accounts:
         few: "%{count} уліковыя запісы"
         many: "%{count} уліковых запісаў"
         one: 1 уліковы запіс
         other: "%{count} уліковых запісаў"
       open: Адкрыць
+      title: Калекцыі ўліковага запісу - @%{name}
       view_publicly: Глядзець публічна
     critical_update_pending: Чакаецца абнаўленне
     custom_emojis:
diff --git a/config/locales/doorkeeper.fa.yml b/config/locales/doorkeeper.fa.yml
index 8076819d46..1f38d9cdb6 100644
--- a/config/locales/doorkeeper.fa.yml
+++ b/config/locales/doorkeeper.fa.yml
@@ -83,6 +83,10 @@ fa:
         access_denied: صاحب منبع یا کارساز تأیید هویت، درخواست را رد کردند.
         credential_flow_not_configured: جریان اعتبارنامهٔ گذرواژهٔ مالک منبع به دلیل پیکربندی نشده بودن Doorkeeper.configure.resource_owner_from_credentials شکست خورد.
         invalid_client: تأیید هویت کارخواه به دلیل کارخواه ناشناخته، عدم وجود تأیید هویت کاره یا روش تأیید هویت پشتیبانی‌نشده شکست خورد.
+        invalid_code_challenge_method:
+          one: مقدار code_challenge_method باید %{challenge_methods} باشد.
+          other: مقدار code_challenge_method باید یکی از %{challenge_methods} باشد.
+          zero: کارساز تأیید از PKCE پشتیبانی نمی‌کند و مقدار code_challenge_method پذیرفته‌ای وجود ندارد.
         invalid_grant: اعطای دسترسی فراهم ‌شده نامعتبر، منقضی یا نامطابق با نشانی بازگشت استفاده‌شده در درخواست تأیید هویت بوده و یا برای کارخواهی دیگر صادر شده است.
         invalid_redirect_uri: نشانی بازگشت موجود، معتبر نیست.
         invalid_request:
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 4a95e738b4..41c80e39d0 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -349,6 +349,7 @@ en:
       back_to_report: Back to report page
       batch:
         add_to_report: 'Add to report #%{id}'
+        remove_from_report: Remove from report
         report: Report
       collection_title: Collection by %{name}
       contents: Contents
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 861d82f83e..47fe8de881 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -349,10 +349,10 @@ es:
       back_to_report: Volver a la página del informe
       batch:
         add_to_report: 'Añadir al informe #%{id}'
-        report: Informe
+        report: Informar
       collection_title: Colección de %{name}
       contents: Contenidos
-      no_collection_selected: No se ha cambiado ninguna colección ya que no se ha seleccionado ninguna
+      no_collection_selected: No se ha cambiado ninguna colección, ya que no se ha seleccionado ninguna
       number_of_accounts:
         one: 1 cuenta
         other: "%{count} cuentas"
diff --git a/config/locales/et.yml b/config/locales/et.yml
index 79720e784c..0d7cb79975 100644
--- a/config/locales/et.yml
+++ b/config/locales/et.yml
@@ -345,12 +345,19 @@ et:
       updated_msg: Teadaande uuendamine õnnestus!
     collections:
       accounts: Kontod
+      back_to_account: Tagasi konto lehele
+      back_to_report: Tagasi raporti lehele
+      batch:
+        add_to_report: 'Lisa raportile #%{id}'
+        report: Raport
       collection_title: Kasutaja %{name} kogumikud
       contents: Sisu
+      no_collection_selected: Ühtegi kogumikku ei muudetud, sest ühtegi polnud valitud
       number_of_accounts:
         one: 1 konto
         other: "%{count} kontot"
       open: Ava
+      title: Konto kogumikud - @%{name}
       view_publicly: Nähtav avalikult
     critical_update_pending: Kriitiline turvauuendus ootel
     custom_emojis:
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index 9e5135fd50..8c2f5ebb0b 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -345,12 +345,19 @@ fa:
       updated_msg: اعلامیه با موفقیت به‌روز شد!
     collections:
       accounts: حساب‌ها
+      back_to_account: بازگشت به صفحهٔ حساب
+      back_to_report: بازگشت به صفحهٔ گزارش
+      batch:
+        add_to_report: 'افزودن به گزارش #%{id}'
+        report: گزارش
       collection_title: محموعه به دست %{name}
       contents: محتوا
+      no_collection_selected: هیچ مجموعه‌ای تغییر نکرد چرا که مجموعه‌ای گزیده نشده بود
       number_of_accounts:
         one: ۱ حساب
         other: "%{count} حساب"
       open: گشودن
+      title: مجموعه‌ّای حساب - @%{name}
       view_publicly: دیدن عمومی
     critical_update_pending: به‌روز رسانی‌های بحرانی منتظرند
     custom_emojis:
@@ -493,7 +500,11 @@ fa:
       accounts:
         account: حساب
         active: فعّال
+        empty:
+          hint: هنوز هیچ حسابی مشترک نشده.
+          no_lists_yet: هنوز سیاهه‌ای وجود ندارد
         inactive: غیرفعّال
+        last_email: آخرین رایانامه
         status: وضعیت
         subscribers: مشترکان
         title: سیاهه‌های پستی
@@ -510,6 +521,7 @@ fa:
       danger_zone:
         disable_feature:
           action: از کار انداختن
+          hint: خاموش کردن ویژگی برای همه
           title: از کار انداختن ویژگی
         erase_all_data:
           action: پاک کردن داده‌ها
@@ -518,6 +530,7 @@ fa:
       index:
         disabled:
           get_started: آغاز به کار
+        title: خبرنامه‌های رایانامه‌ای
       roles:
         accounts: حساب ها
         edit_role: ویرایش نقش
@@ -1467,6 +1480,7 @@ fa:
     confirmation:
       action: تأیید نشانی رایانامه
       subject: تأیید نشانی رایانامه‌تان
+      title: گرفتن به‌روز رسانی‌های رایانامه‌ای از %{name}؟
     notification:
       create_account: ایجاد حساب ماستودون
       subject:
diff --git a/config/locales/fr-CA.yml b/config/locales/fr-CA.yml
index 6df6fb2599..cd6c848a21 100644
--- a/config/locales/fr-CA.yml
+++ b/config/locales/fr-CA.yml
@@ -346,18 +346,18 @@ fr-CA:
     collections:
       accounts: Comptes
       back_to_account: Retour à la page du compte
-      back_to_report: Retour à la page de signalement
+      back_to_report: Retour à la page du signalement
       batch:
         add_to_report: 'Ajouter au signalement #%{id}'
         report: Signaler
       collection_title: Collection par %{name}
       contents: Contenu
-      no_collection_selected: Aucune collection n'a était changé vu qu'aucune n'a était sélectionné
+      no_collection_selected: Aucune collection n'a était changé car qu'aucune n'a était sélectionnée
       number_of_accounts:
         one: 1 compte
         other: "%{count} comptes"
       open: Ouvrir
-      title: Collection du compte - @%{name}
+      title: Collections du compte - @%{name}
       view_publicly: Afficher publiquement
     critical_update_pending: Mise à jour critique en attente
     custom_emojis:
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 738bb5cb71..ddf63b0147 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -346,18 +346,18 @@ fr:
     collections:
       accounts: Comptes
       back_to_account: Retour à la page du compte
-      back_to_report: Retour à la page de signalement
+      back_to_report: Retour à la page du signalement
       batch:
         add_to_report: 'Ajouter au signalement #%{id}'
         report: Signaler
       collection_title: Collection par %{name}
       contents: Contenu
-      no_collection_selected: Aucune collection n'a était changé vu qu'aucune n'a était sélectionné
+      no_collection_selected: Aucune collection n'a était changé car qu'aucune n'a était sélectionnée
       number_of_accounts:
         one: 1 compte
         other: "%{count} comptes"
       open: Ouvrir
-      title: Collection du compte - @%{name}
+      title: Collections du compte - @%{name}
       view_publicly: Afficher publiquement
     critical_update_pending: Mise à jour critique en attente
     custom_emojis:
diff --git a/config/locales/ga.yml b/config/locales/ga.yml
index 6f08f5e807..0dec8d025c 100644
--- a/config/locales/ga.yml
+++ b/config/locales/ga.yml
@@ -357,8 +357,14 @@ ga:
       updated_msg: D'éirigh leis an bhfógra a nuashonrú!
     collections:
       accounts: Cuntais
+      back_to_account: Ar ais chuig leathanach an chuntais
+      back_to_report: Ar ais chuig leathanach na tuarascála
+      batch:
+        add_to_report: 'Cuir le tuarascáil #%{id}'
+        report: Tuairisc
       collection_title: Bailiúchán le %{name}
       contents: Ábhar
+      no_collection_selected: Níor athraíodh aon bhailiúcháin mar nár roghnaíodh aon cheann acu
       number_of_accounts:
         few: "%{count} cuntais"
         many: "%{count} cuntais"
@@ -366,6 +372,7 @@ ga:
         other: "%{count} cuntais"
         two: "%{count} cuntais"
       open: Oscail
+      title: Bailiúcháin chuntais - @%{name}
       view_publicly: Féach go poiblí
     critical_update_pending: Nuashonrú criticiúil ar feitheamh
     custom_emojis:
diff --git a/config/locales/he.yml b/config/locales/he.yml
index 20d3022b2d..afb5ee59e5 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -353,14 +353,21 @@ he:
       updated_msg: ההכרזה עודכנה בהצלחה!
     collections:
       accounts: חשבונות
+      back_to_account: חזרה לדף החשבון
+      back_to_report: חזרה לעמוד הדיווח
+      batch:
+        add_to_report: להוסיף לדו"ח מספר %{id}
+        report: דווח
       collection_title: אוספים מאת %{name}
       contents: תוכן
+      no_collection_selected: לא בוצעו שינויים באוספים שכן לא נבחרו כאלו
       number_of_accounts:
         many: "%{count} חשבונות"
         one: חשבון אחד
         other: "%{count} חשבונות"
         two: חשבונותיים
       open: פתיחה
+      title: אוספי החשבון - @%{name}
       view_publicly: צפיה בפומבי
     critical_update_pending: עידכון קריטי ממתין
     custom_emojis:
diff --git a/config/locales/it.yml b/config/locales/it.yml
index 11151412f5..ffbc69c52a 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -1458,7 +1458,7 @@ it:
       email_contact_html: Se ancora non arriva, puoi inviare un'e-mail a <a href="mailto:%{email}">%{email}</a> per assistenza
       email_reconfirmation_html: Se non ricevi l'e-mail di conferma, puoi <a href="%{path}">richiederla nuovamente</a>
       irreversible: Non potrai ripristinare o riattivare il tuo account
-      more_details_html: Per maggiori dettagli, vedi la <a href="%{terms_path}">politica di privacy</a>.
+      more_details_html: Per maggiori dettagli, vedi l'<a href="%{terms_path}">informativa sulla privacy</a>.
       username_available: Il tuo nome utente sarà nuovamente disponibile
       username_unavailable: Il tuo nome utente rimarrà non disponibile
   disputes:
@@ -1929,7 +1929,7 @@ it:
     search_hint_html: Controlla come vuoi essere trovato. Vuoi che le persone ti trovino in base a ciò che hai postato pubblicamente? Vuoi che le persone al di fuori di Mastodon trovino il tuo profilo durante la ricerca sul web? Si prega di notare che l'esclusione totale da tutti i motori di ricerca non può essere garantita per le informazioni pubbliche.
     title: Privacy e copertura
   privacy_policy:
-    title: Politica sulla privacy
+    title: Informativa sulla privacy
   reactions:
     errors:
       limit_reached: Raggiunto il limite di reazioni diverse
diff --git a/config/locales/lad.yml b/config/locales/lad.yml
index 70a2872f52..dedb87bf7a 100644
--- a/config/locales/lad.yml
+++ b/config/locales/lad.yml
@@ -50,6 +50,7 @@ lad:
         label: Troka rolo
         no_role: Sin rolo
         title: Troka rolo para %{username}
+      collections: Koleksyones
       confirm: Konfirma
       confirmed: Konfirmado
       confirming: Konfirmando
@@ -320,6 +321,16 @@ lad:
       unpublish: Retira publikasyon
       unpublished_msg: Pregon retirado kon sukseso!
       updated_msg: Pregon aktualizado kon sukseso!
+    collections:
+      back_to_account: Retorna a la pajina del kuento
+      back_to_report: Retorna a la pajina del raporto
+      batch:
+        add_to_report: 'Adjusta al raporto #%{id}'
+        report: Raporto
+      no_collection_selected: No se troko dinguna koleksyon porke no eskojites dinguna
+      open: Avre
+      title: Koleksyones de kuentos - @%{name}
+      view_publicly: Ve puvlikamente
     critical_update_pending: Aktualizasyon kritika esta asperando
     custom_emojis:
       assign_category: Asinya kategoria
@@ -452,9 +463,20 @@ lad:
         title: Bloka muevo domeno de posta
       no_email_domain_block_selected: No se tienen trokado blokos de domeno porke dinguno a sido eskojido
       not_permitted: Sin permiso
+      reset: Reinisya
       resolved_dns_records_hint_html: El nombre de domeno rezolve los sigientes domenos MX, los kualos son responsavles en ultima instansya de achetar la posta elektronika. Blokar un domeno MX blokara los rejistros de kualkier adreso de posta elektronika ke utilize el mezmo domeno MX, inkluzo si el nombre de domeno vizivle es desferente. <strong>Tenga kudiado de no blokar los prinsipales domenos de posta elektronika.</strong>
       resolved_through_html: Rezolvido por %{domain}
+      search: Bushka
       title: Domenos de posta blokados
+    email_subscriptions:
+      accounts:
+        account: Kuento
+        active: Aktivo
+      danger_zone:
+        disable_feature:
+          action: Inkapasita
+      roles:
+        title: Rolos
     export_domain_allows:
       new:
         title: Importa permisos de domeno
@@ -715,6 +737,7 @@ lad:
       categories:
         administration: Administrasyon
         devops: DevOps
+        email: Posta elektronika
         invites: Envytasyones
         moderation: Moderasyon
         special: Espesial
@@ -1235,6 +1258,10 @@ lad:
     hint_html: "<strong>Konsejo:</strong> No retornaremos a demandarte por el kod durante la sigiente ora."
     invalid_password: Kod inkorekto
     prompt: Konfirma kod para segir
+  color_scheme:
+    auto: Otomatiko
+  contrast:
+    auto: Otomatiko
   crypto:
     errors:
       invalid_key: no es una yave Ed25519 o Curve25519 valida
@@ -1305,6 +1332,15 @@ lad:
       your_appeal_rejected: Tu apelasyon fue refuzada
   edit_profile:
     other: Otros
+  email_subscription_mailer:
+    confirmation:
+      action: Konfirma tu adreso de posta elektronika
+  email_subscriptions:
+    active: Aktivo
+    confirmations:
+      show:
+        unsubscribe: Dezabona
+    status: Estado
   emoji_styles:
     auto: Otomatiko
     native: Nativo
@@ -1848,6 +1884,8 @@ lad:
     does_not_match_previous_name: no koensida kon el nombre anterior
   terms_of_service:
     title: Terminos de servisyo
+  themes:
+    default: Mastodon
   time:
     formats:
       default: "%d de %b del %Y, %H:%M"
@@ -1873,6 +1911,9 @@ lad:
     recovery_codes_regenerated: Kodiches de rekupersayon redjenerados kon sukseso
     recovery_instructions_html: Si piedres akseso a tu telefon, puedes uzar uno de los sigientes kodiches de rekuperasyon para obtener akseso a tu kuento. <strong>Mantenlos a salvo</strong>. Por enshemplo, puedes imprimirlos i guadrarlos kon otros dokumentos emportantes.
     webauthn: Yaves de sigurita
+  unsubscriptions:
+    show:
+      action: Dezabona
   user_mailer:
     announcement_published:
       subject: Pregon de servisyo
diff --git a/config/locales/nan-TW.yml b/config/locales/nan-TW.yml
index 513fdf8f49..8936902287 100644
--- a/config/locales/nan-TW.yml
+++ b/config/locales/nan-TW.yml
@@ -341,11 +341,18 @@ nan-TW:
       updated_msg: 公告成功更新ah！
     collections:
       accounts: 口座
+      back_to_account: Tńg去口座ê頁
+      back_to_report: Tńg去檢舉ê頁
+      batch:
+        add_to_report: '加kàu檢舉 #%{id}'
+        report: 檢舉
       collection_title: "%{name} ê收藏"
       contents: 內容
+      no_collection_selected: 因為無揀任何收藏，所以lóng無改變
       number_of_accounts:
         other: "%{count} ê口座"
       open: 開
+      title: Tsit ê口座ê 收藏 - @%{name}
       view_publicly: 公開看
     critical_update_pending: 愛處理ê重大更新
     custom_emojis:
@@ -474,9 +481,30 @@ nan-TW:
         title: 封鎖新ê電子phue ê域名
       no_email_domain_block_selected: 因為無揀任何電子phue域名封鎖，所以lóng無改變
       not_permitted: 無允准
+      reset: 重頭設
       resolved_dns_records_hint_html: 域名解析做下kha ê MX域名，tsiah ê域名上後負責收電子phue。封鎖MX域名ē封任何有siâng款MX域名ê電子郵件ê註冊，就算通看見ê域名無kâng，mā án-ne。<strong>Tio̍h細膩，m̄通封鎖主要ê電子phue提供者。</strong>
       resolved_through_html: 通過 %{domain} 解析
+      search: Tshiau-tshuē
       title: 封鎖ê電子phue域名
+    email_subscriptions:
+      accounts:
+        account: 口座
+        active: 有效ê
+        empty:
+          hint: Iáu無半ê口座有訂ê lâng。
+          no_lists_yet: Iáu無列單
+        inactive: 停止使用ah
+        last_email: 上新ê電子phue箱
+        lead: 有啟用tsit ê功能koh有訂ê lâng ê口座ē展示佇下kha。
+        status: 狀態
+        subscribers: 訂ê lâng
+        title: 電子phue列單
+      additional_footer_texts:
+        show:
+          title: 其他註kha ê文字
+      compliance_settings:
+        additional_footer_text:
+          action: 管理
     export_domain_allows:
       new:
         title: 輸入允准ê域名
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 86daaa8744..98b4177c06 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -556,6 +556,11 @@ nl:
         show:
           enable_feature: Functionaliteit inschakelen
           important_information: Belangrijke informatie
+          list:
+            1_permission_explanation: Wanneer deze functie is ingeschakeld, kunnen klanten met de bijbehorende machtigingen een e-mailverzamelformulier toevoegen aan hun profielen.
+            2_feature_explanation: Wanneer bezoekers zich aanmelden op een accountprofielpagina en hun abonnement bevestigen, zullen zij e-mail updates ontvangen wanneer het account nieuwe openbare berichten aanmaakt.
+            3_privacy_policy_warning: Serverbeheerders hebben toegang tot verzamelde PII (e-mailadressen). Daarom moeten het privacybeleid en de Servicevoorwaarden voor de server worden bijgewerkt voordat deze functie wordt gebruikt.
+            4_cost_warning: E-mails kunnen kosten in rekening brengen, afhankelijk van de hosting-installatie. Overleg met uw hostingprovider voordat u deze optie inschakelt, omdat deze het aantal e-mails van uw server drastisch kan verhogen.
     export_domain_allows:
       new:
         title: Toegestane domeinen importeren
@@ -861,6 +866,7 @@ nl:
         manage_custom_emojis: Lokale emoji's beheren
         manage_custom_emojis_description: Staat gebruikers toe om lokale emoji's op de server te beheren
         manage_email_subscriptions: E-mailabonnementen beheren
+        manage_email_subscriptions_description: Gebruikers met deze machtiging toestaan om de nieuwsbrieffunctie per e-mail voor hun account in te schakelen
         manage_federation: Federatie beheren
         manage_federation_description: Staat gebruikers toe om federatie met andere domeinen te blokkeren of toe te staan en om de bezorging te bepalen
         manage_invites: Uitnodigingen beheren
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index b19d0e34cf..ff7dd7bef6 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -345,12 +345,19 @@ pt-BR:
       updated_msg: Anúncio atualizado!
     collections:
       accounts: Contas
+      back_to_account: Voltar à página da conta
+      back_to_report: Voltar à página de denúncia
+      batch:
+        add_to_report: 'Adicionar à denúncia #%{id}'
+        report: Denunciar
       collection_title: Coleção de %{name}
       contents: Conteúdo
+      no_collection_selected: Nenhuma coleção foi modificada pois nenhuma estava selecionada
       number_of_accounts:
         one: 1 conta
         other: "%{count} contas"
       open: Abrir
+      title: Coleções da conta — @%{name}
       view_publicly: Ver publicamente
     critical_update_pending: Atualização crítica pendente
     custom_emojis:
@@ -484,9 +491,63 @@ pt-BR:
         title: Bloquear novo domínio de e-mail
       no_email_domain_block_selected: Nenhum bloco de domínio de email foi alterado, pois, nenhum foi selecionado
       not_permitted: Não permitido
+      reset: Reiniciar
       resolved_dns_records_hint_html: O nome de domínio é associado aos seguintes domínios MX, que são responsáveis por aceitar e-mails. Ao bloquear um domínio MX, você bloqueará as inscrições de qualquer endereço de e-mail que use o mesmo domínio MX, mesmo que o nome de domínio visível seja diferente. <strong>Tenha cuidado para não bloquear os principais provedores de e-mail.</strong>
       resolved_through_html: Resolvido através de %{domain}
+      search: Buscar
       title: Domínios de e-mail bloqueados
+    email_subscriptions:
+      accounts:
+        account: Conta
+        active: Ativas
+        empty:
+          hint: Não há contas com inscritos ainda.
+          no_lists_yet: Não há listas ainda
+        inactive: Inativas
+        last_email: Último email
+        lead: Contas que ativaram o recurso e têm inscritos aparecerão abaixo.
+        status: Estado
+        subscribers: Inscritos
+        title: Listas de envio
+      additional_footer_texts:
+        show:
+          title: Texto adicional no rodapé
+      compliance_settings:
+        additional_footer_text:
+          action: Gerenciar
+          hint: Texto opcional que aparece no rodapé somente dos boletins via email
+          title: Texto adicional no rodapé
+        lead: Boletins via email podem ser consideradas email de marketing, dependendo das juridições em que você opera.
+        privacy_policy:
+          action: Gerenciar
+          hint: Esta política está linkada no rodapé de todos os emails
+          title: Política de privacidade
+        title: Configuraçõe de compliance
+      danger_zone:
+        disable_feature:
+          action: Desativar
+          hint: Desativar recurso para todas as contas
+          title: Desativar recurso
+        erase_all_data:
+          action: Excluir dados
+          hint: Exclui permanentemente todos os emails em todas as listas de envio
+          title: Excluir todos os dados
+        title: Zona de perigo
+      disabled_msg: Assinaturas de email foram desativadas com sucesso.
+      index:
+        disabled:
+          cannot_be_enabled: Seu provedor técnico não ativou este recurso para seu servidor.
+          description: Este recurso permite que contas específicas adicionem um widget a seus perfis, permitindo que visitantes sem conta no Mastodon possam receber suas publicações por email.
+          get_started: Iniciar
+        lead: Permitir que vistantes recebam publicações via email de contas dedicadas neste servidor.
+        title: Boletins via email
+      purged_msg: Todos os dados de inscrições via email estão sendo apagados.
+      roles:
+        accounts: Contas
+        edit_role: Editar função
+        empty:
+          hint: Ninguém ter permissão para usar este recurso.
+          no_roles_added: Nenhuma função adicionada
     export_domain_allows:
       new:
         title: Importar domínios permitidos
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index acb55b8bf5..1b7cb9a6e6 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -1263,7 +1263,7 @@ ru:
     discovery: Актуальное
     localization:
       body: Mastodon переводится добровольцами.
-      guide_link: https://ru.crowdin.com/project/mastodon/ru
+      guide_link: https://ru.crowdin.com/project/mastodon
       guide_link_text: Каждый может внести свой вклад.
     sensitive_content: Содержимое деликатного характера
   application_mailer:
diff --git a/config/locales/simple_form.fa.yml b/config/locales/simple_form.fa.yml
index cd101a3d49..09bb0ead79 100644
--- a/config/locales/simple_form.fa.yml
+++ b/config/locales/simple_form.fa.yml
@@ -4,6 +4,7 @@ fa:
     hints:
       account:
         attribution_domains: در هر خط، یک مورد. از ویژگی های نادرست محافظت می کند.
+        discoverable: ممکن است در مجموعه‌های ساخته به دست دیگر کاربران معرّفی شوید. ممکن است شما و فرسته‌های عمومیتان به کاربرانی در تجربه‌های کشف دیگر در ماستودون پیشنهاد شود.
         display_name: نام کامل یا باحالتان.
         fields: صفحهٔ خانگی، تلفّظ، سن و هرچیزی که دوست دارید.
         indexable: ممکن است فرسته‌های عمومیتان در نتیجه‌های جست‌وجوی ماستودون ظاهر شود. افرادی که با فرسته‌هایتان تعامل داشتند در هر صورت می‌توانند جست‌وجویشان کنند.
@@ -60,7 +61,9 @@ fa:
         setting_default_quote_policy_private: فرسته‌های فقط پی‌گیران روی ماستودون نمی‌توانند به دست دیگران نقل شوند.
         setting_default_quote_policy_unlisted: هنگامی که کسی نقلتان می‌کند هم فرسته‌اش از خط زمانی‌های داغ پنهان خواهد بود.
         setting_default_sensitive: تصاویر حساس به طور پیش‌فرض پنهان هستند و می‌توانند با یک کلیک آشکار شوند
+        setting_display_media_default: هشدار پیش از نمایش رسانه‌های علامت خورده به عنوان حسّاس
         setting_display_media_hide_all: هشدار پیش از نمایش همهٔ رسانه‌ها
+        setting_display_media_show_all: نمایش همهٔ رسانه‌ها بدون هشدار از جمله رسانه‌های علامت خورده به عنوان حسّاس
         setting_emoji_style: چگونگی نمایش شکلک‌ها. «خودکار» تلاش خواهد کرد از شکلک‌های بومی استفاده کند؛ ولی برای مرورگرهای قدیمی به توییموجی برخواهد گشت.
         setting_quick_boosting_html: هنگام به کار افتادن، زدن روی %{boost_icon} نقشک تقویت به جای گشودنِ فهرست پایین افتادنی تقویت و نقل، بلافاصله تقویت خواهد کرد. کنشِ نقل قول را به فهرست %{options_icon} (گزینه‌ها) منتقل می‌کند.
         setting_system_scrollbars_ui: فقط برای مرورگرهای دسکتاپ مبتنی بر سافاری و کروم اعمال می شود
@@ -89,6 +92,7 @@ fa:
         closed_registrations_message: نمایش داده هنگام بسته بودن ثبت‌نام‌ها
         content_cache_retention_period: پس از تعداد روزهای مشخّص شده تمامی فرسته‌ها از دیگر کارسازها (از جمله تقویت‌ها و پاسخ‌ها) بدون توجّه به هر تعامل کاربری محلی با آن‌ها حذف خواهند شد. این موضوع شامل حال فرسته‌هایی که کاربران محلی به عنوان نشانک یا برگزیده علامت زده‌اند نیز می‌شود. اشاره‌های خصوصی بین کاربران نمونه‌های مختلف نیزی از دست رفته و قابل بازگردانی نخواهند بود. استفاده از این تنظیم برای نمونه‌هایی با هدف خاص در نظر گرفته شده و برای استفادهٔ عمومی بسیاری از انتظارات کاربر را زیر پا می‌گذارد.
         custom_css: می‌توانیدروی نگارش وب ماستودون سبک‌های سفارشی اعمال کنید.
+        email_footer_text: متنی اختیاری که فقط در پانویس رایانامه‌های خبرنامه ظاهر می‌شود.
         favicon: WEBP، PNG، GIF یا JPG. فاویکون پیش‌فرض ماستودون را با یک نماد سفارشی لغو می‌کند.
         landing_page: گزینش صفحه‌ای که بینندگان هنگام نخستین بازدید از کارسازتان می‌بینند. اگر «داغ‌ها» را بگزینید باید داغ‌ها در تنظمیات کشف به کار افتاده باشند. اگر «خوراک محلی» را بگزینید باید «دسترسی به خوراک‌های محلی» در تنظیمات کشف روی «هرکسی» تنظیم شده باشد.
         mascot: نقش میانای وب پیش‌رفته را پایمال می‌کند.
@@ -106,6 +110,7 @@ fa:
         status_page_url: نشانی وب صفحه‌ای که در آن افراد می‌توانند وضعیت این سرور را در هنگام قطع شدن ببینند
         theme: زمینه‌ای که بینندگان خارج شده و کاربران جدید می‌بینند.
         thumbnail: یک تصویر تقریباً 2:1 در کنار اطلاعات سرور شما نمایش داده می شود.
+        thumbnail_description: شرح تصویر برای کمک به فهم افراد با مشکلات بینایی از محتوایش.
         trendable_by_default: از بررسی دستی محتوای پرطرفدار صرف نظر کنید. آیتم های فردی هنوز هم می توانند پس از واقعیت از روند حذف شوند.
         trends: روندها نشان می‌دهند که کدام پست‌ها، هشتگ‌ها و داستان‌های خبری در سرور شما مورد توجه قرار گرفته‌اند.
         wrapstodon: پیشنهاد به کاربران محلی برای ایجاد خلاصه‌ای بامزه از استفادهٔ مساتودونشان در طول سال. این ویژگی بین دهم و سی‌ویکم دسامبر هر سال در دسترس بوده و به کاربرانی که در طول سال، کمینه یک فرستهٔ عمومی یا عمومی ساکت فرستاده و کمینه از یک برچسب استفاده کرده باشند پیشنهاد داده می‌شود.
@@ -131,6 +136,7 @@ fa:
         otp: 'کد تأیید دومرحله‌ای که کاره روی تلفن شما ساخته را وارد کنید یا یکی از کدهای بازیابی را به کار ببرید:'
         webauthn: اگر کلید USB باشد ، از اتصاڵ آن مطمئن شوید و، اگر لازم باشد، به آن ضربه‌ایی بزنید.
       settings:
+        email_subscriptions: از کار انداختن اشتراک‌های موجود را حفظ کرده؛ ولی فرستادن رایانامه‌ها را متوقّف خواهد کرد.
         indexable: صفحهٔ نمایه‌تان ممکن است در نتیجه‌های جست‌وجو روی گوگل، بینگ و جاهای دیگر ظاهر شود.
         show_application: خودتان همواره خواهید توانست ببینید که کدام کاره فرسته‌تان را منتشر کرده.
       tag:
@@ -150,16 +156,19 @@ fa:
         jurisdiction: کشوری را که هر کسی که صورتحسابها را پرداخت می کند در آن زندگی می کند، فهرست کنید. اگر یک شرکت یا نهاد دیگری است، کشوری که در آن ثبت شده است و شهر، منطقه، قلمرو یا ایالت در صورت لزوم فهرست کنید.
         min_age: نباید کم‌تر از کمینهٔ زمان لازم از سوی قوانین حقوقیتان باشد.
       user:
+        chosen_languages: هنگام علامت زدن، فقط فرسته‌های در زبان‌های گزیده در خط‌های زمانی عمومی نشان داده خواهند شد. این تنظیم روی خط‌زمانی خانه و سیاهه‌ها تأثیری ندارد.
         date_of_birth:
           one: برای استفاده از %{domain} باید مطمئن شویم کمینه %{count} سال را دارید. این مورد را ذخیره نخواهیم کرد.
           other: برای استفاده از %{domain} باید مطمئن شویم کمینه %{count} سال را دارید. این مورد را ذخیره نخواهیم کرد.
         role: نقش کنترل می کند که کاربر چه مجوزهایی دارد.
       user_role:
+        collection_limit: محدود کردن شمار مجموعه‌هایی که هر کاربری با این نقش می‌تواند بسازد. لطفاً‌به خاطر داشته باشید که با کاهش این عدد، کاربرانی که مجموعه‌های بیش‌تری دارند، مجموعه‌ای را از دست نخواهند داد و فقط دیگر نخواهند توانست مجموعهٔ جدیدی بسازند.
         color: رنگی که برای نقش در سرتاسر UI استفاده می شود، به عنوان RGB در قالب هگز
         highlighted: این باعث می شود که نقش به طور عمومی قابل مشاهده باشد
         name: نام عمومی نقش، اگر قرار است نقش به عنوان یک نشان نمایش داده شود
         permissions_as_keys: کاربرانی که این نقش را دارند به...
         position: نقش بالاتر در موقعیت‌های خاص حل تعارض را تعیین می‌کند. برخی اقدامات را فقط می توان روی نقش هایی با اولویت کمتر انجام داد
+        require_2fa: کاربرانی با این نقش لازم خواهند داشت که برای استفاده از ماستودون هویت‌سنجی دو عاملی را برپا کنند
       username_block:
         allow_with_approval: به جای جلوگیری از ثبت‌نام، ثبت‌نام‌های مطابق نیازمند تأییدتان خواهند بود
         comparison: لطفاً هنگام مسدود کردن تطابق‌های جزیی به مشکل اسکان‌ثورپ توجّه داشته باشید
@@ -171,6 +180,7 @@ fa:
     labels:
       account:
         attribution_domains: وب‌سایت‌هایی که اجازه دارند به شما اعتبار بدهند
+        discoverable: در تجربه‌های کشف معرّفی شوم
         fields:
           name: برچسب
           value: محتوا
@@ -314,6 +324,9 @@ fa:
         trendable_by_default: اجازهٔ پرطرفدار شدن بدون بازبینی پیشین
         trends: به کار انداختن پرطرفدارها
         wrapstodon: به کار انداختن خلاصهٔ ماستودون
+      form_email_subscriptions_confirmation:
+        agreement_email_volume: متوجّهم که به کار انداختن این ویژگی می‌توانید حجم رایانامه‌های فرستاده از کارساز را به طور جشمگیری افزایش داده و تنها خودم مسئول هر هزینه‌ای هستم.
+        agreement_privacy_and_terms: سیاست محرمانگی و شرایط خدمت را به‌روز کرده‌ام.
       interactions:
         must_be_follower: انسداد آگاهی‌ها از ناپی‌گیران
         must_be_following: انسداد آگاهی‌ها از افرادی که پی نمی‌گیرید
diff --git a/config/locales/simple_form.it.yml b/config/locales/simple_form.it.yml
index 7013f2460e..116d3d94d4 100644
--- a/config/locales/simple_form.it.yml
+++ b/config/locales/simple_form.it.yml
@@ -105,7 +105,7 @@ it:
         site_contact_username: In che modo le persone possono raggiungerti su Mastodon.
         site_extended_description: Qualsiasi informazione aggiuntiva che possa essere utile ai visitatori e ai tuoi utenti. Può essere strutturata con la sintassi Markdown.
         site_short_description: Una breve descrizione per aiutare a identificare in modo univoco il tuo server. Chi lo gestisce, a chi è rivolto?
-        site_terms: Usa la tua politica sulla privacy o lascia vuoto per usare l'impostazione predefinita. Può essere strutturata con la sintassi Markdown.
+        site_terms: Usa la tua informativa sulla privacy o lascia vuoto per usare l'impostazione predefinita. Può essere strutturata con la sintassi Markdown.
         site_title: In che modo le persone possono fare riferimento al tuo server oltre al suo nome di dominio.
         status_page_url: URL di una pagina in cui le persone possono visualizzare lo stato di questo server durante un disservizio
         theme: Tema visualizzato dai visitatori e dai nuovi utenti disconnessi.
@@ -315,7 +315,7 @@ it:
         site_contact_username: Nome utente di contatto
         site_extended_description: Descrizione estesa
         site_short_description: Descrizione del server
-        site_terms: Politica sulla privacy
+        site_terms: Informativa sulla privacy
         site_title: Nome del server
         status_page_url: URL della pagina di stato
         theme: Tema predefinito
diff --git a/config/locales/simple_form.nl.yml b/config/locales/simple_form.nl.yml
index 16fe05dacd..9fbf0da952 100644
--- a/config/locales/simple_form.nl.yml
+++ b/config/locales/simple_form.nl.yml
@@ -325,6 +325,7 @@ nl:
         trends: Trends inschakelen
         wrapstodon: Wrapstodon inschakelen
       form_email_subscriptions_confirmation:
+        agreement_email_volume: Ik begrijp dat het inschakelen van deze functie de hoeveelheid e-mails die van de server wordt verzonden aanzienlijk kan verhogen en dat ik alleen verantwoordelijk ben voor alle gemaakte kosten.
         agreement_privacy_and_terms: Ik heb het Privacybeleid en de Gebruiksvoorwaarden bijgewerkt.
       interactions:
         must_be_follower: Meldingen van mensen die jou niet volgen blokkeren
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 819667c9f1..cfffbf500e 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -345,12 +345,19 @@ tr:
       updated_msg: Duyuru başarıyla güncellendi!
     collections:
       accounts: Hesaplar
+      back_to_account: Hesap sayfasına geri dön
+      back_to_report: Bildirim sayfasına geri dön
+      batch:
+        add_to_report: "#%{id} raporuna ekle"
+        report: Bildirim
       collection_title: "%{name} koleksiyonu"
       contents: İçerikler
+      no_collection_selected: Hiçbiri seçilmediği için hiçbir koleksiyon değiştirilmedi
       number_of_accounts:
         one: 1 hesap
         other: "%{count} hesap"
       open: Aç
+      title: Hesap koleksiyonları - @%{name}
       view_publicly: Herkese açık görüntüle
     critical_update_pending: Kritik güncelleme bekliyor
     custom_emojis:
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index 8f7ee329f8..a30a76e265 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -341,11 +341,18 @@ vi:
       updated_msg: Cập nhật thông báo thành công!
     collections:
       accounts: Tài khoản
+      back_to_account: Quay lại trang tài khoản
+      back_to_report: Quay lại trang báo cáo
+      batch:
+        add_to_report: 'Thêm vào báo cáo #%{id}'
+        report: Báo cáo
       collection_title: Gói khởi đầu bởi %{name}
       contents: Nội dung
+      no_collection_selected: Không có gói khởi đầu nào thay đổi vì không có mục nào được chọn
       number_of_accounts:
         other: "%{count} tài khoản"
       open: Mở
+      title: Gói khởi đầu - @%{name}
       view_publicly: Xem công khai
     critical_update_pending: Cập nhật quan trọng đang chờ
     custom_emojis:
diff --git a/spec/models/account_spec.rb b/spec/models/account_spec.rb
index e449dfcbe8..b3f0916107 100644
--- a/spec/models/account_spec.rb
+++ b/spec/models/account_spec.rb
@@ -868,7 +868,17 @@ RSpec.describe Account do
       context 'when account has been updated in the last week' do
         let(:last_webfingered_at) { 4.days.ago }
 
-        it { is_expected.to be false }
+        context 'when there is no other account from the same domain with an feature approval policy' do
+          it { is_expected.to be false }
+        end
+
+        context 'when there is another account from the same domain with a feature approval policy' do
+          before do
+            Fabricate(:remote_account, domain: account.domain, feature_approval_policy: 1)
+          end
+
+          it { is_expected.to be true }
+        end
       end
     end
   end
diff --git a/spec/models/admin/collection_batch_action_spec.rb b/spec/models/admin/collection_batch_action_spec.rb
index 0ed57817e0..e4ebb2439e 100644
--- a/spec/models/admin/collection_batch_action_spec.rb
+++ b/spec/models/admin/collection_batch_action_spec.rb
@@ -46,5 +46,15 @@ RSpec.describe Admin::CollectionBatchAction do
         expect(Report.last.collections).to include(collection)
       end
     end
+
+    context 'when type is remove_from_report' do
+      let(:report_id) { report.id }
+      let(:type) { 'remove_from_report' }
+
+      it 'does not remove report but removes collection' do
+        expect { subject.save! }.to change { report.reload.collections }.to([])
+          .and not_change(Report, :count)
+      end
+    end
   end
 end
diff --git a/spec/requests/admin/collections_spec.rb b/spec/requests/admin/collections_spec.rb
index 6cb3a1ec2d..c6f1833a2b 100644
--- a/spec/requests/admin/collections_spec.rb
+++ b/spec/requests/admin/collections_spec.rb
@@ -6,7 +6,8 @@ RSpec.describe 'Admin Collections' do
   let(:account) { Fabricate(:account) }
   let(:other_account) { Fabricate(:account) }
   let(:collection) { Fabricate(:collection, account: account) }
-  let!(:second_collection) { Fabricate(:collection, account: account) }
+  let(:unreported_collection) { Fabricate(:collection, account: account) }
+  let(:second_collection) { Fabricate(:collection, account: account) }
   let(:report) { Fabricate(:report, account: other_account, target_account: account) }
 
   before do
@@ -32,20 +33,49 @@ RSpec.describe 'Admin Collections' do
   end
 
   describe 'POST /admin/accounts/:account_id/collections/batch' do
-    subject { post batch_admin_account_collections_path(account_id: account.id, report_id: report_id, admin_collection_batch_action: { collection_ids: [collection.id, second_collection.id] }) }
+    subject { post batch_admin_account_collections_path(:account_id => account.id, :report_id => report_id, action_from_button => '', :admin_collection_batch_action => { collection_ids: [collection.id, second_collection.id] }) }
 
     context 'with a valid report' do
       let(:report_id) { report.id }
+      let(:action_from_button) { 'report' }
 
       it 'redirects to the report page' do
         report.collections << collection
         subject
         expect(response).to redirect_to(admin_report_path(report.id))
+        expect(response.body).to be_empty
+        expect(response).to have_http_status(302)
       end
     end
 
     context 'with an invalid report' do
       let(:report_id) { nil }
+      let(:action_from_button) { 'report' }
+
+      it 'redirects to the account collections page' do
+        subject
+        expect(response).to redirect_to(admin_account_collections_path(account.id))
+        expect(response).to have_http_status(302)
+      end
+    end
+
+    context 'with valid remove_from_report' do
+      let(:report_id) { report.id }
+      let(:action_from_button) { 'remove_from_report' }
+
+      before do
+        report.collections << [second_collection, unreported_collection]
+      end
+
+      it 'redirects to the account collections page' do
+        subject
+        expect(response).to redirect_to(admin_report_path(report.id))
+      end
+    end
+
+    context 'with invalid remove_from_report' do
+      let(:report_id) { nil }
+      let(:action_from_button) { 'remove_from_report' }
 
       it 'redirects to the account collections page' do
         subject
diff --git a/yarn.lock b/yarn.lock
index f90d3a0a9d..eedf0f8b32 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2439,10 +2439,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@formatjs/bigdecimal@npm:0.2.3":
-  version: 0.2.3
-  resolution: "@formatjs/bigdecimal@npm:0.2.3"
-  checksum: 10c0/e928ecb903cb71ab5e2214a825263fd3d10369e924d546c595d2828a1771b133994395b321d6ea50ce55fcac7581c1b65e74ac7e8768801cdf1790eb8a7a964d
+"@formatjs/bigdecimal@npm:0.2.5":
+  version: 0.2.5
+  resolution: "@formatjs/bigdecimal@npm:0.2.5"
+  checksum: 10c0/094417c931b11b46d1314fe3e949927e700b6ea9e1276c60d3203fcd06d831a15426aae4504b3d96fcfaf38053438ae1c74c4837339e22e9b032acdb8d1159ce
   languageName: node
   linkType: hard
 
@@ -2493,10 +2493,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@formatjs/fast-memoize@npm:3.1.4":
-  version: 3.1.4
-  resolution: "@formatjs/fast-memoize@npm:3.1.4"
-  checksum: 10c0/7704f4a26099727dff4aadcadb130a9e512eac69fa366f8de57f5437f250daf90e0ccfe47eb0a2e1f14b83a639e58fe9c7682a139ecd3c1c55fe8d3da6c4616c
+"@formatjs/fast-memoize@npm:3.1.5":
+  version: 3.1.5
+  resolution: "@formatjs/fast-memoize@npm:3.1.5"
+  checksum: 10c0/80e5d5c6b3b558de5cabfbb7b5df89e291c9b05fb5f5edaa7234a581e55a96d15fab35c5922229f7885b160fe5a3654d029029bcb5e9a86ce4143db4a5ecea79
   languageName: node
   linkType: hard
 
@@ -2510,12 +2510,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@formatjs/icu-messageformat-parser@npm:3.5.7":
-  version: 3.5.7
-  resolution: "@formatjs/icu-messageformat-parser@npm:3.5.7"
+"@formatjs/icu-messageformat-parser@npm:3.5.9":
+  version: 3.5.9
+  resolution: "@formatjs/icu-messageformat-parser@npm:3.5.9"
   dependencies:
-    "@formatjs/icu-skeleton-parser": "npm:2.1.7"
-  checksum: 10c0/229c5ecf28a08eedc4185f756db7942ed5837226ff932885d1a7219ef895aa08177efd68a02efe2ca4d0612b5a1137e7f3e4a55b1b0850d5320b9328caad394e
+    "@formatjs/icu-skeleton-parser": "npm:2.1.9"
+  checksum: 10c0/6c016c71e41d6a3f8708dfe1e848dc63c29812cce86fe0de5330a01dab0e2472e251b531c82034884b9b28a221067e6622031463cc1616c176c53b0523f253df
   languageName: node
   linkType: hard
 
@@ -2528,10 +2528,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@formatjs/icu-skeleton-parser@npm:2.1.7":
-  version: 2.1.7
-  resolution: "@formatjs/icu-skeleton-parser@npm:2.1.7"
-  checksum: 10c0/d0dff576c11bc60f043540a695f6be523a4e1ebab41fad81918f5b8609cac9a88664a8ed3e5574f2b0e624a75d7020ddc12b88fc979b069136ac7bd9da07dfe7
+"@formatjs/icu-skeleton-parser@npm:2.1.9":
+  version: 2.1.9
+  resolution: "@formatjs/icu-skeleton-parser@npm:2.1.9"
+  checksum: 10c0/6f1837bc75b0132407e6a49c2f9a150bf2cbd58c7d0fde1c6998d8e62950bb602f4f531a89cc666682c1abe819e34fd79020468e1c4a119be69fcba48c10ca38
   languageName: node
   linkType: hard
 
@@ -2544,33 +2544,33 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@formatjs/intl-localematcher@npm:0.8.6":
-  version: 0.8.6
-  resolution: "@formatjs/intl-localematcher@npm:0.8.6"
+"@formatjs/intl-localematcher@npm:0.8.8":
+  version: 0.8.8
+  resolution: "@formatjs/intl-localematcher@npm:0.8.8"
   dependencies:
-    "@formatjs/fast-memoize": "npm:3.1.4"
-  checksum: 10c0/de6f3e426febb048249d73f4dce04a7ef868c2ff891c3dd5ff4ffac815565798d395ac1dbccc39ded7d8118a508f5bf08980c7b3bf0cffe485fb475046b53ca4
+    "@formatjs/fast-memoize": "npm:3.1.5"
+  checksum: 10c0/c661bb779e42018575b3718cad8053e0ee0262f51734f59c6ecc717be29060c345aa88aad7bf923d08f78b0a9244ab8a8ffdda97127e4a415e68d13a74ac2823
   languageName: node
   linkType: hard
 
 "@formatjs/intl-pluralrules@npm:^6.0.0":
-  version: 6.3.5
-  resolution: "@formatjs/intl-pluralrules@npm:6.3.5"
+  version: 6.3.7
+  resolution: "@formatjs/intl-pluralrules@npm:6.3.7"
   dependencies:
-    "@formatjs/bigdecimal": "npm:0.2.3"
-    "@formatjs/intl-localematcher": "npm:0.8.6"
-  checksum: 10c0/aac326900fcd2439b420724a7458eb75f57fbc8987efd2947bbfef7532220b6febe9a1053aa39dee314f38b54fe1a4386d8f97b34f48dd74c0b3fc4cd794b032
+    "@formatjs/bigdecimal": "npm:0.2.5"
+    "@formatjs/intl-localematcher": "npm:0.8.8"
+  checksum: 10c0/81b1bb824edfdb5429da770eb438083a0ecbc3cf7b27da93a17d3db6f106793683008adfb968e5968294ce6ba78363f1f1599305c0abf3e464f44d2b3165522c
   languageName: node
   linkType: hard
 
-"@formatjs/intl@npm:4.1.9":
-  version: 4.1.9
-  resolution: "@formatjs/intl@npm:4.1.9"
+"@formatjs/intl@npm:4.1.11":
+  version: 4.1.11
+  resolution: "@formatjs/intl@npm:4.1.11"
   dependencies:
-    "@formatjs/fast-memoize": "npm:3.1.4"
-    "@formatjs/icu-messageformat-parser": "npm:3.5.7"
-    intl-messageformat: "npm:11.2.4"
-  checksum: 10c0/50bdec85fdc02a9fda06c7a771d773f2d2374e58ca15edea93b7a6d033273e0fbec795c42cadf893e201a45ab228efcd3ee5f538cfa67d37e42bf96ef3621618
+    "@formatjs/fast-memoize": "npm:3.1.5"
+    "@formatjs/icu-messageformat-parser": "npm:3.5.9"
+    intl-messageformat: "npm:11.2.6"
+  checksum: 10c0/2699300ce6e9835bbbe91a3379b4dc33159674c47563f6fba419b33448df76059e6c0f1f17e7572e3b41d2886e507d56bb6a57d16e380e4edd4fd1adca678756
   languageName: node
   linkType: hard
 
@@ -2591,11 +2591,11 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@formatjs/ts-transformer@npm:4.4.7":
-  version: 4.4.7
-  resolution: "@formatjs/ts-transformer@npm:4.4.7"
+"@formatjs/ts-transformer@npm:4.4.9":
+  version: 4.4.9
+  resolution: "@formatjs/ts-transformer@npm:4.4.9"
   dependencies:
-    "@formatjs/icu-messageformat-parser": "npm:3.5.7"
+    "@formatjs/icu-messageformat-parser": "npm:3.5.9"
     "@types/node": "npm:22 || 24"
     json-stable-stringify: "npm:^1.3.0"
     typescript: "npm:^5.6 || 6"
@@ -2604,18 +2604,18 @@ __metadata:
   peerDependenciesMeta:
     ts-jest:
       optional: true
-  checksum: 10c0/62ac9dbd948ca6718c896d2684c4f3f87739fabb85a426f3b8089a9fce7f0cbd4153a319b7b2921783d90c23caa9b5a441b420ade3a20375ba7dcbf78652fe4d
+  checksum: 10c0/6e9ab11f6ebffa5f6518157f9392b27232ce6241e6e48d715cd3a5fd5bb8ec0de3b8bf6fe3d54bcbc0b189c0837e400d6547e6501e1e143086ec8fd2cdb14463
   languageName: node
   linkType: hard
 
 "@formatjs/unplugin@npm:^1.1.5":
-  version: 1.1.10
-  resolution: "@formatjs/unplugin@npm:1.1.10"
+  version: 1.1.12
+  resolution: "@formatjs/unplugin@npm:1.1.12"
   dependencies:
-    "@formatjs/icu-messageformat-parser": "npm:3.5.7"
-    "@formatjs/ts-transformer": "npm:4.4.7"
+    "@formatjs/icu-messageformat-parser": "npm:3.5.9"
+    "@formatjs/ts-transformer": "npm:4.4.9"
     magic-string: "npm:^0.30.0"
-    oxc-parser: "npm:^0.128.0"
+    oxc-parser: "npm:^0.130.0"
     unplugin: "npm:^3.0.0"
   peerDependencies:
     "@rspack/core": ">=1"
@@ -2634,7 +2634,7 @@ __metadata:
       optional: true
     webpack:
       optional: true
-  checksum: 10c0/54d8ea307d1cd1c122b10366e931b52c3d4932825af1ad18ce8d7319619ab280f0d0bfdbb084c1bfe46aa1b95bc816137a81c548780195f60f6e29a6b73aadfb
+  checksum: 10c0/3eff928c3c72cb2eada7caf70fdeb92b96f459cc600d2cd74f7d7fecbb1e1dd7d313beb2b5f491af2221436bf610c142265a9c5711c22cef6a8a60031eb2a0c8
   languageName: node
   linkType: hard
 
@@ -3229,9 +3229,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@oxc-parser/binding-android-arm-eabi@npm:0.128.0":
-  version: 0.128.0
-  resolution: "@oxc-parser/binding-android-arm-eabi@npm:0.128.0"
+"@oxc-parser/binding-android-arm-eabi@npm:0.130.0":
+  version: 0.130.0
+  resolution: "@oxc-parser/binding-android-arm-eabi@npm:0.130.0"
   conditions: os=android & cpu=arm
   languageName: node
   linkType: hard
@@ -3250,9 +3250,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@oxc-parser/binding-android-arm64@npm:0.128.0":
-  version: 0.128.0
-  resolution: "@oxc-parser/binding-android-arm64@npm:0.128.0"
+"@oxc-parser/binding-android-arm64@npm:0.130.0":
+  version: 0.130.0
+  resolution: "@oxc-parser/binding-android-arm64@npm:0.130.0"
   conditions: os=android & cpu=arm64
   languageName: node
   linkType: hard
@@ -3271,9 +3271,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@oxc-parser/binding-darwin-arm64@npm:0.128.0":
-  version: 0.128.0
-  resolution: "@oxc-parser/binding-darwin-arm64@npm:0.128.0"
+"@oxc-parser/binding-darwin-arm64@npm:0.130.0":
+  version: 0.130.0
+  resolution: "@oxc-parser/binding-darwin-arm64@npm:0.130.0"
   conditions: os=darwin & cpu=arm64
   languageName: node
   linkType: hard
@@ -3292,9 +3292,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@oxc-parser/binding-darwin-x64@npm:0.128.0":
-  version: 0.128.0
-  resolution: "@oxc-parser/binding-darwin-x64@npm:0.128.0"
+"@oxc-parser/binding-darwin-x64@npm:0.130.0":
+  version: 0.130.0
+  resolution: "@oxc-parser/binding-darwin-x64@npm:0.130.0"
   conditions: os=darwin & cpu=x64
   languageName: node
   linkType: hard
@@ -3313,9 +3313,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@oxc-parser/binding-freebsd-x64@npm:0.128.0":
-  version: 0.128.0
-  resolution: "@oxc-parser/binding-freebsd-x64@npm:0.128.0"
+"@oxc-parser/binding-freebsd-x64@npm:0.130.0":
+  version: 0.130.0
+  resolution: "@oxc-parser/binding-freebsd-x64@npm:0.130.0"
   conditions: os=freebsd & cpu=x64
   languageName: node
   linkType: hard
@@ -3334,9 +3334,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@oxc-parser/binding-linux-arm-gnueabihf@npm:0.128.0":
-  version: 0.128.0
-  resolution: "@oxc-parser/binding-linux-arm-gnueabihf@npm:0.128.0"
+"@oxc-parser/binding-linux-arm-gnueabihf@npm:0.130.0":
+  version: 0.130.0
+  resolution: "@oxc-parser/binding-linux-arm-gnueabihf@npm:0.130.0"
   conditions: os=linux & cpu=arm
   languageName: node
   linkType: hard
@@ -3355,9 +3355,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@oxc-parser/binding-linux-arm-musleabihf@npm:0.128.0":
-  version: 0.128.0
-  resolution: "@oxc-parser/binding-linux-arm-musleabihf@npm:0.128.0"
+"@oxc-parser/binding-linux-arm-musleabihf@npm:0.130.0":
+  version: 0.130.0
+  resolution: "@oxc-parser/binding-linux-arm-musleabihf@npm:0.130.0"
   conditions: os=linux & cpu=arm
   languageName: node
   linkType: hard
@@ -3376,9 +3376,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@oxc-parser/binding-linux-arm64-gnu@npm:0.128.0":
-  version: 0.128.0
-  resolution: "@oxc-parser/binding-linux-arm64-gnu@npm:0.128.0"
+"@oxc-parser/binding-linux-arm64-gnu@npm:0.130.0":
+  version: 0.130.0
+  resolution: "@oxc-parser/binding-linux-arm64-gnu@npm:0.130.0"
   conditions: os=linux & cpu=arm64 & libc=glibc
   languageName: node
   linkType: hard
@@ -3397,9 +3397,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@oxc-parser/binding-linux-arm64-musl@npm:0.128.0":
-  version: 0.128.0
-  resolution: "@oxc-parser/binding-linux-arm64-musl@npm:0.128.0"
+"@oxc-parser/binding-linux-arm64-musl@npm:0.130.0":
+  version: 0.130.0
+  resolution: "@oxc-parser/binding-linux-arm64-musl@npm:0.130.0"
   conditions: os=linux & cpu=arm64 & libc=musl
   languageName: node
   linkType: hard
@@ -3418,9 +3418,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@oxc-parser/binding-linux-ppc64-gnu@npm:0.128.0":
-  version: 0.128.0
-  resolution: "@oxc-parser/binding-linux-ppc64-gnu@npm:0.128.0"
+"@oxc-parser/binding-linux-ppc64-gnu@npm:0.130.0":
+  version: 0.130.0
+  resolution: "@oxc-parser/binding-linux-ppc64-gnu@npm:0.130.0"
   conditions: os=linux & cpu=ppc64 & libc=glibc
   languageName: node
   linkType: hard
@@ -3439,9 +3439,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@oxc-parser/binding-linux-riscv64-gnu@npm:0.128.0":
-  version: 0.128.0
-  resolution: "@oxc-parser/binding-linux-riscv64-gnu@npm:0.128.0"
+"@oxc-parser/binding-linux-riscv64-gnu@npm:0.130.0":
+  version: 0.130.0
+  resolution: "@oxc-parser/binding-linux-riscv64-gnu@npm:0.130.0"
   conditions: os=linux & cpu=riscv64 & libc=glibc
   languageName: node
   linkType: hard
@@ -3460,9 +3460,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@oxc-parser/binding-linux-riscv64-musl@npm:0.128.0":
-  version: 0.128.0
-  resolution: "@oxc-parser/binding-linux-riscv64-musl@npm:0.128.0"
+"@oxc-parser/binding-linux-riscv64-musl@npm:0.130.0":
+  version: 0.130.0
+  resolution: "@oxc-parser/binding-linux-riscv64-musl@npm:0.130.0"
   conditions: os=linux & cpu=riscv64 & libc=musl
   languageName: node
   linkType: hard
@@ -3481,9 +3481,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@oxc-parser/binding-linux-s390x-gnu@npm:0.128.0":
-  version: 0.128.0
-  resolution: "@oxc-parser/binding-linux-s390x-gnu@npm:0.128.0"
+"@oxc-parser/binding-linux-s390x-gnu@npm:0.130.0":
+  version: 0.130.0
+  resolution: "@oxc-parser/binding-linux-s390x-gnu@npm:0.130.0"
   conditions: os=linux & cpu=s390x & libc=glibc
   languageName: node
   linkType: hard
@@ -3502,9 +3502,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@oxc-parser/binding-linux-x64-gnu@npm:0.128.0":
-  version: 0.128.0
-  resolution: "@oxc-parser/binding-linux-x64-gnu@npm:0.128.0"
+"@oxc-parser/binding-linux-x64-gnu@npm:0.130.0":
+  version: 0.130.0
+  resolution: "@oxc-parser/binding-linux-x64-gnu@npm:0.130.0"
   conditions: os=linux & cpu=x64 & libc=glibc
   languageName: node
   linkType: hard
@@ -3523,9 +3523,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@oxc-parser/binding-linux-x64-musl@npm:0.128.0":
-  version: 0.128.0
-  resolution: "@oxc-parser/binding-linux-x64-musl@npm:0.128.0"
+"@oxc-parser/binding-linux-x64-musl@npm:0.130.0":
+  version: 0.130.0
+  resolution: "@oxc-parser/binding-linux-x64-musl@npm:0.130.0"
   conditions: os=linux & cpu=x64 & libc=musl
   languageName: node
   linkType: hard
@@ -3544,9 +3544,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@oxc-parser/binding-openharmony-arm64@npm:0.128.0":
-  version: 0.128.0
-  resolution: "@oxc-parser/binding-openharmony-arm64@npm:0.128.0"
+"@oxc-parser/binding-openharmony-arm64@npm:0.130.0":
+  version: 0.130.0
+  resolution: "@oxc-parser/binding-openharmony-arm64@npm:0.130.0"
   conditions: os=openharmony & cpu=arm64
   languageName: node
   linkType: hard
@@ -3573,9 +3573,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@oxc-parser/binding-wasm32-wasi@npm:0.128.0":
-  version: 0.128.0
-  resolution: "@oxc-parser/binding-wasm32-wasi@npm:0.128.0"
+"@oxc-parser/binding-wasm32-wasi@npm:0.130.0":
+  version: 0.130.0
+  resolution: "@oxc-parser/binding-wasm32-wasi@npm:0.130.0"
   dependencies:
     "@emnapi/core": "npm:1.10.0"
     "@emnapi/runtime": "npm:1.10.0"
@@ -3598,9 +3598,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@oxc-parser/binding-win32-arm64-msvc@npm:0.128.0":
-  version: 0.128.0
-  resolution: "@oxc-parser/binding-win32-arm64-msvc@npm:0.128.0"
+"@oxc-parser/binding-win32-arm64-msvc@npm:0.130.0":
+  version: 0.130.0
+  resolution: "@oxc-parser/binding-win32-arm64-msvc@npm:0.130.0"
   conditions: os=win32 & cpu=arm64
   languageName: node
   linkType: hard
@@ -3619,9 +3619,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@oxc-parser/binding-win32-ia32-msvc@npm:0.128.0":
-  version: 0.128.0
-  resolution: "@oxc-parser/binding-win32-ia32-msvc@npm:0.128.0"
+"@oxc-parser/binding-win32-ia32-msvc@npm:0.130.0":
+  version: 0.130.0
+  resolution: "@oxc-parser/binding-win32-ia32-msvc@npm:0.130.0"
   conditions: os=win32 & cpu=ia32
   languageName: node
   linkType: hard
@@ -3640,14 +3640,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@oxc-parser/binding-win32-x64-msvc@npm:0.128.0":
-  version: 0.128.0
-  resolution: "@oxc-parser/binding-win32-x64-msvc@npm:0.128.0"
+"@oxc-parser/binding-win32-x64-msvc@npm:0.130.0":
+  version: 0.130.0
+  resolution: "@oxc-parser/binding-win32-x64-msvc@npm:0.130.0"
   conditions: os=win32 & cpu=x64
   languageName: node
   linkType: hard
 
-"@oxc-project/types@npm:=0.128.0, @oxc-project/types@npm:^0.128.0":
+"@oxc-project/types@npm:=0.128.0":
   version: 0.128.0
   resolution: "@oxc-project/types@npm:0.128.0"
   checksum: 10c0/b6999b1b6b012d979364231a2c0c9204bca814a73f8417234edd39bf352a081779dad72aaf18ac60a676fb904c1408b63553e4e1230d7408a4f885002d66c809
@@ -3668,6 +3668,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@oxc-project/types@npm:^0.130.0":
+  version: 0.130.0
+  resolution: "@oxc-project/types@npm:0.130.0"
+  checksum: 10c0/7ec8c03407b0bcb235b930c62859e6efcb3fe5cbaa5db98770d760df5c3e6b3e28a0ad22c2e35d1addede8065b40000c3822c5235dde2959af226639eb870000
+  languageName: node
+  linkType: hard
+
 "@oxfmt/binding-android-arm-eabi@npm:0.47.0":
   version: 0.47.0
   resolution: "@oxfmt/binding-android-arm-eabi@npm:0.47.0"
@@ -6033,6 +6040,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"agent-base@npm:6":
+  version: 6.0.2
+  resolution: "agent-base@npm:6.0.2"
+  dependencies:
+    debug: "npm:4"
+  checksum: 10c0/dc4f757e40b5f3e3d674bc9beb4f1048f4ee83af189bae39be99f57bf1f48dde166a8b0a5342a84b5944ee8e6ed1e5a9d801858f4ad44764e84957122fe46261
+  languageName: node
+  linkType: hard
+
 "agent-base@npm:^7.1.0, agent-base@npm:^7.1.2":
   version: 7.1.3
   resolution: "agent-base@npm:7.1.3"
@@ -6389,13 +6405,14 @@ __metadata:
   linkType: hard
 
 "axios@npm:^1.4.0":
-  version: 1.16.0
-  resolution: "axios@npm:1.16.0"
+  version: 1.16.1
+  resolution: "axios@npm:1.16.1"
   dependencies:
     follow-redirects: "npm:^1.16.0"
     form-data: "npm:^4.0.5"
+    https-proxy-agent: "npm:^5.0.1"
     proxy-from-env: "npm:^2.1.0"
-  checksum: 10c0/1c91a5221b77b76072026b4cc95ecdf38f7c3e33e63423abec09a85e6e9a12279637dcc9ac2ba1fc333e0c447fb3b0f46d7965acb5d7cea02d188e9c6d425c0b
+  checksum: 10c0/2f77e37e6552bbff8a772d058fb09500198e9188c6b20dc799d82dbe12a8cb506f6eed4e4e62a9ba612a35cbab496faa26d68f9bff14a53af6d15c3e136391a7
   languageName: node
   linkType: hard
 
@@ -9301,6 +9318,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"https-proxy-agent@npm:^5.0.1":
+  version: 5.0.1
+  resolution: "https-proxy-agent@npm:5.0.1"
+  dependencies:
+    agent-base: "npm:6"
+    debug: "npm:4"
+  checksum: 10c0/6dd639f03434003577c62b27cafdb864784ef19b2de430d8ae2a1d45e31c4fd60719e5637b44db1a88a046934307da7089e03d6089ec3ddacc1189d8de8897d1
+  languageName: node
+  linkType: hard
+
 "https-proxy-agent@npm:^7.0.1":
   version: 7.0.6
   resolution: "https-proxy-agent@npm:7.0.6"
@@ -9492,13 +9519,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"intl-messageformat@npm:11.2.4, intl-messageformat@npm:^11.0.0":
-  version: 11.2.4
-  resolution: "intl-messageformat@npm:11.2.4"
+"intl-messageformat@npm:11.2.6, intl-messageformat@npm:^11.0.0":
+  version: 11.2.6
+  resolution: "intl-messageformat@npm:11.2.6"
   dependencies:
-    "@formatjs/fast-memoize": "npm:3.1.4"
-    "@formatjs/icu-messageformat-parser": "npm:3.5.7"
-  checksum: 10c0/a35128139b821334dccb76495f274b4cecd7807f69099f1f539dbf727df78465f8266a5f88efb064f18a636ec2b0e6cd994d40a6b196faffe843cdfb1b909509
+    "@formatjs/fast-memoize": "npm:3.1.5"
+    "@formatjs/icu-messageformat-parser": "npm:3.5.9"
+  checksum: 10c0/65b9e686f1ad3e39a47f06c17f7d84d6645b4beacfa3b39f38eb1eae4cb6869fa3b94af1171172ad34c37f0000020a7befd7c45ec919f30731fdc59bbabf9cbd
   languageName: node
   linkType: hard
 
@@ -11546,31 +11573,31 @@ __metadata:
   languageName: node
   linkType: hard
 
-"oxc-parser@npm:^0.128.0":
-  version: 0.128.0
-  resolution: "oxc-parser@npm:0.128.0"
+"oxc-parser@npm:^0.130.0":
+  version: 0.130.0
+  resolution: "oxc-parser@npm:0.130.0"
   dependencies:
-    "@oxc-parser/binding-android-arm-eabi": "npm:0.128.0"
-    "@oxc-parser/binding-android-arm64": "npm:0.128.0"
-    "@oxc-parser/binding-darwin-arm64": "npm:0.128.0"
-    "@oxc-parser/binding-darwin-x64": "npm:0.128.0"
-    "@oxc-parser/binding-freebsd-x64": "npm:0.128.0"
-    "@oxc-parser/binding-linux-arm-gnueabihf": "npm:0.128.0"
-    "@oxc-parser/binding-linux-arm-musleabihf": "npm:0.128.0"
-    "@oxc-parser/binding-linux-arm64-gnu": "npm:0.128.0"
-    "@oxc-parser/binding-linux-arm64-musl": "npm:0.128.0"
-    "@oxc-parser/binding-linux-ppc64-gnu": "npm:0.128.0"
-    "@oxc-parser/binding-linux-riscv64-gnu": "npm:0.128.0"
-    "@oxc-parser/binding-linux-riscv64-musl": "npm:0.128.0"
-    "@oxc-parser/binding-linux-s390x-gnu": "npm:0.128.0"
-    "@oxc-parser/binding-linux-x64-gnu": "npm:0.128.0"
-    "@oxc-parser/binding-linux-x64-musl": "npm:0.128.0"
-    "@oxc-parser/binding-openharmony-arm64": "npm:0.128.0"
-    "@oxc-parser/binding-wasm32-wasi": "npm:0.128.0"
-    "@oxc-parser/binding-win32-arm64-msvc": "npm:0.128.0"
-    "@oxc-parser/binding-win32-ia32-msvc": "npm:0.128.0"
-    "@oxc-parser/binding-win32-x64-msvc": "npm:0.128.0"
-    "@oxc-project/types": "npm:^0.128.0"
+    "@oxc-parser/binding-android-arm-eabi": "npm:0.130.0"
+    "@oxc-parser/binding-android-arm64": "npm:0.130.0"
+    "@oxc-parser/binding-darwin-arm64": "npm:0.130.0"
+    "@oxc-parser/binding-darwin-x64": "npm:0.130.0"
+    "@oxc-parser/binding-freebsd-x64": "npm:0.130.0"
+    "@oxc-parser/binding-linux-arm-gnueabihf": "npm:0.130.0"
+    "@oxc-parser/binding-linux-arm-musleabihf": "npm:0.130.0"
+    "@oxc-parser/binding-linux-arm64-gnu": "npm:0.130.0"
+    "@oxc-parser/binding-linux-arm64-musl": "npm:0.130.0"
+    "@oxc-parser/binding-linux-ppc64-gnu": "npm:0.130.0"
+    "@oxc-parser/binding-linux-riscv64-gnu": "npm:0.130.0"
+    "@oxc-parser/binding-linux-riscv64-musl": "npm:0.130.0"
+    "@oxc-parser/binding-linux-s390x-gnu": "npm:0.130.0"
+    "@oxc-parser/binding-linux-x64-gnu": "npm:0.130.0"
+    "@oxc-parser/binding-linux-x64-musl": "npm:0.130.0"
+    "@oxc-parser/binding-openharmony-arm64": "npm:0.130.0"
+    "@oxc-parser/binding-wasm32-wasi": "npm:0.130.0"
+    "@oxc-parser/binding-win32-arm64-msvc": "npm:0.130.0"
+    "@oxc-parser/binding-win32-ia32-msvc": "npm:0.130.0"
+    "@oxc-parser/binding-win32-x64-msvc": "npm:0.130.0"
+    "@oxc-project/types": "npm:^0.130.0"
   dependenciesMeta:
     "@oxc-parser/binding-android-arm-eabi":
       optional: true
@@ -11612,7 +11639,7 @@ __metadata:
       optional: true
     "@oxc-parser/binding-win32-x64-msvc":
       optional: true
-  checksum: 10c0/c750d5d205353efd67276019d50a315cab1fe68f10067a892154e9fa81ba62844760aa8536ae0008580e421e10fb8d2d419455744de862eb0037499b4760c1c9
+  checksum: 10c0/7b6b3fee853429520f5c61765add938b57d1b6fdb0f86dc806f2c2ba13f6f007a22316561c4c98754b272aac3ac3c7b92051bb1a8e0fa699ef68982c4f257f7e
   languageName: node
   linkType: hard
 
@@ -12914,16 +12941,16 @@ __metadata:
   linkType: hard
 
 "react-intl@npm:^10.0.0":
-  version: 10.1.5
-  resolution: "react-intl@npm:10.1.5"
+  version: 10.1.7
+  resolution: "react-intl@npm:10.1.7"
   dependencies:
-    "@formatjs/icu-messageformat-parser": "npm:3.5.7"
-    "@formatjs/intl": "npm:4.1.9"
-    intl-messageformat: "npm:11.2.4"
+    "@formatjs/icu-messageformat-parser": "npm:3.5.9"
+    "@formatjs/intl": "npm:4.1.11"
+    intl-messageformat: "npm:11.2.6"
   peerDependencies:
     "@types/react": 19
     react: 19
-  checksum: 10c0/6c136a26692f2eb93feacaed1235f550075095e81e21cf9e713873429bac7326713c522bfebe04500b631e7e6ba2bc04b60d81f1ed5fbd3232956f1fc8ef5d0a
+  checksum: 10c0/128a3b9600dc86ac1f27eef0e94d8df088a1b7670769518b871e23b9e808edcc96b9e359563213fe2c0496e88df7d5c98a7df3fc0f8cf5a767a51fb09fada881
   languageName: node
   linkType: hard
 
@@ -16279,8 +16306,8 @@ __metadata:
   linkType: hard
 
 "ws@npm:^8.12.1, ws@npm:^8.18.0, ws@npm:^8.19.0, ws@npm:^8.20.0":
-  version: 8.20.0
-  resolution: "ws@npm:8.20.0"
+  version: 8.20.1
+  resolution: "ws@npm:8.20.1"
   peerDependencies:
     bufferutil: ^4.0.1
     utf-8-validate: ">=5.0.2"
@@ -16289,7 +16316,7 @@ __metadata:
       optional: true
     utf-8-validate:
       optional: true
-  checksum: 10c0/956ac5f11738c914089b65878b9223692ace77337ba55379ae68e1ecbeae9b47a0c6eb9403688f609999a58c80d83d99865fe0029b229d308b08c1ef93d4ea14
+  checksum: 10c0/ce162433218399cdedeb76fd33363d4d86a7d910058d4e3c679dce08cea65d6da6b39f11baa4d7808d024cf46ed88f6a05c17611621aaad8fc5e62edacc30c5d
   languageName: node
   linkType: hard