Merge commit '73fc8d34d98a80cfb32d3c7c5dc4794fad5470d5' into glitch-soc/merge-upstream

Dockerfile

@@ -25,8 +25,8 @@ FROM ${BASE_REGISTRY}/node:${NODE_MAJOR_VERSION}-${DEBIAN_VERSION}-slim AS node
 FROM ${BASE_REGISTRY}/ruby:${RUBY_VERSION}-slim-${DEBIAN_VERSION} AS ruby
 
 # Resulting version string is vX.X.X-MASTODON_VERSION_PRERELEASE+MASTODON_VERSION_METADATA
-# Example: v4.3.0-nightly.2023.11.09+pr-123456
+# Example: v4.3.0-nightly.2023-11-09+pr-123456
-# Overwrite existence of 'alpha.X' in version.rb [--build-arg MASTODON_VERSION_PRERELEASE="nightly.2023.11.09"]
+# Overwrite existence of 'alpha.X' in version.rb [--build-arg MASTODON_VERSION_PRERELEASE="nightly.2023-11-09"]
 ARG MASTODON_VERSION_PRERELEASE=""
 # Append build metadata or fork information to version.rb [--build-arg MASTODON_VERSION_METADATA="pr-123456"]
 ARG MASTODON_VERSION_METADATA=""
@@ -48,29 +48,27 @@ ARG GID="991"
 
 # Apply Mastodon build options based on options above
 ENV \
-  # Apply Mastodon version information
   MASTODON_VERSION_PRERELEASE="${MASTODON_VERSION_PRERELEASE}" \
   MASTODON_VERSION_METADATA="${MASTODON_VERSION_METADATA}" \
   SOURCE_COMMIT="${SOURCE_COMMIT}" \
-  # Apply Mastodon static files and YJIT options
+  RAILS_SERVE_STATIC_FILES="${RAILS_SERVE_STATIC_FILES}" \
-  RAILS_SERVE_STATIC_FILES=${RAILS_SERVE_STATIC_FILES} \
+  RUBY_YJIT_ENABLE="${RUBY_YJIT_ENABLE}" \
-  RUBY_YJIT_ENABLE=${RUBY_YJIT_ENABLE} \
+  TZ="${TZ}"
-  # Apply timezone
-  TZ=${TZ}
 
+# Configure runtime environment
+# BIND: IP to bind Mastodon to when serving traffic
+# NODE_ENV/RAILS_ENV: production settings for Node.js and Ruby on Rails
+# DEBIAN_FRONTEND: suppress interactive prompts
+# PATH: add Ruby and Mastodon installation directories
+# MALLOC_CONF: optimize jemalloc 5.x performance
+# MASTODON_SIDEKIQ_READY_FILENAME: Sidekiq readiness check filename for Kubernetes
 ENV \
-  # Configure the IP to bind Mastodon to when serving traffic
   BIND="0.0.0.0" \
-  # Use production settings for Yarn, Node.js and related tools
   NODE_ENV="production" \
-  # Use production settings for Ruby on Rails
   RAILS_ENV="production" \
-  # Add Ruby and Mastodon installation to the PATH
   DEBIAN_FRONTEND="noninteractive" \
   PATH="${PATH}:/opt/ruby/bin:/opt/mastodon/bin" \
-  # Optimize jemalloc 5.x performance
   MALLOC_CONF="narenas:2,background_thread:true,thp:never,dirty_decay_ms:1000,muzzy_decay_ms:0" \
-  # Sidekiq will touch tmp/sidekiq_process_has_started_and_will_begin_processing_jobs to indicate it is ready. This can be used for a readiness check in Kubernetes
   MASTODON_SIDEKIQ_READY_FILENAME=sidekiq_process_has_started_and_will_begin_processing_jobs
 
 # Set default shell used for running commands
@@ -99,10 +97,10 @@ RUN \
   # Mount Apt cache and lib directories from Docker buildx caches
   --mount=type=cache,id=apt-cache-${TARGETPLATFORM},target=/var/cache/apt,sharing=locked \
   --mount=type=cache,id=apt-lib-${TARGETPLATFORM},target=/var/lib/apt,sharing=locked \
-  # Apt update & upgrade to check for security updates to Debian image
+  # Update package list and upgrade system packages
   apt-get update; \
   apt-get dist-upgrade -yq; \
-  # Install jemalloc, curl and other necessary components
+  # Install jemalloc and other necessary components
   apt-get install -y --no-install-recommends \
   curl \
   file \
@@ -112,6 +110,42 @@ RUN \
   tini \
   tzdata \
   wget \
+  # Mastodon components
+  libexpat1 \
+  libglib2.0-0t64 \
+  libicu76 \
+  libidn12 \
+  libpq5 \
+  libreadline8t64 \
+  libssl3t64 \
+  libyaml-0-2 \
+  # libvips components
+  libcgif0 \
+  libexif12 \
+  libheif1 \
+  libhwy1t64 \
+  libimagequant0 \
+  libjpeg62-turbo \
+  liblcms2-2 \
+  libspng0 \
+  libtiff6 \
+  libwebp7 \
+  libwebpdemux2 \
+  libwebpmux3 \
+  # ffmpeg components
+  libdav1d7 \
+  libmp3lame0 \
+  libopencore-amrnb0 \
+  libopencore-amrwb0 \
+  libopus0 \
+  libsnappy1v5 \
+  libtheora0 \
+  libvorbis0a \
+  libvorbisenc2 \
+  libvorbisfile3 \
+  libvpx9 \
+  libx264-164 \
+  libx265-215 \
   ; \
   # Patch Ruby to use jemalloc
   patchelf --add-needed libjemalloc.so.2 /usr/local/bin/ruby; \
@@ -120,42 +154,37 @@ RUN \
   patchelf \
   ;
 
-# Create temporary build layer from base image
+# Build stage for media libraries (libvips, ffmpeg)
-FROM ruby AS build
+FROM ${BASE_REGISTRY}/ruby:${RUBY_VERSION}-slim-${DEBIAN_VERSION} AS media-build
 
 ARG TARGETPLATFORM
 
+# Set default shell used for running commands
+SHELL ["/bin/bash", "-o", "pipefail", "-o", "errexit", "-c"]
+
 # hadolint ignore=DL3008
 RUN \
-  # Mount Apt cache and lib directories from Docker buildx caches
+  --mount=type=cache,id=apt-native-cache-${TARGETPLATFORM},target=/var/cache/apt,sharing=locked \
-  --mount=type=cache,id=apt-cache-${TARGETPLATFORM},target=/var/cache/apt,sharing=locked \
+  --mount=type=cache,id=apt-native-lib-${TARGETPLATFORM},target=/var/lib/apt,sharing=locked \
-  --mount=type=cache,id=apt-lib-${TARGETPLATFORM},target=/var/lib/apt,sharing=locked \
+  # Remove automatic apt cache Docker cleanup scripts
-  # Install build tools and bundler dependencies from APT
+  rm -f /etc/apt/apt.conf.d/docker-clean; \
+  # Install build tools for native libraries
+  apt-get update; \
   apt-get install -y --no-install-recommends \
   autoconf \
   automake \
   build-essential \
-  cmake \
-  git \
-  libgdbm-dev \
-  libglib2.0-dev \
-  libgmp-dev \
-  libicu-dev \
-  libidn-dev \
-  libpq-dev \
-  libssl-dev \
   libtool \
-  libyaml-dev \
   meson \
   nasm \
   pkg-config \
-  shared-mime-info \
   xz-utils \
   # libvips components
   libcgif-dev \
   libexif-dev \
   libexpat1-dev \
   libgirepository1.0-dev \
+  libglib2.0-dev \
   libheif-dev \
   libhwy-dev \
   libimagequant-dev \
@@ -176,8 +205,8 @@ RUN \
   libx265-dev \
   ;
 
-# Create temporary libvips specific build layer from build layer
+# Create temporary libvips specific build layer
-FROM build AS libvips
+FROM media-build AS libvips
 
 # libvips version to compile, change with [--build-arg VIPS_VERSION="8.15.2"]
 # renovate: datasource=github-releases depName=libvips packageName=libvips/libvips
@@ -192,15 +221,16 @@ RUN tar xf vips-${VIPS_VERSION}.tar.xz;
 
 WORKDIR /usr/local/libvips/src/vips-${VIPS_VERSION}
 
-# Configure and compile libvips
+# Configure libvips
-RUN \
+RUN meson setup build --prefix /usr/local/libvips --libdir=lib -Ddeprecated=false -Dintrospection=disabled -Dmodules=disabled -Dexamples=false
-  meson setup build --prefix /usr/local/libvips --libdir=lib -Ddeprecated=false -Dintrospection=disabled -Dmodules=disabled -Dexamples=false; \
-  cd build; \
-  ninja; \
-  ninja install;
 
-# Create temporary ffmpeg specific build layer from build layer
+WORKDIR /usr/local/libvips/src/vips-${VIPS_VERSION}/build
-FROM build AS ffmpeg
+
+# Compile and install libvips
+RUN ninja && ninja install
+
+# Create temporary ffmpeg specific build layer
+FROM media-build AS ffmpeg
 
 # ffmpeg version to compile, change with [--build-arg FFMPEG_VERSION="7.0.x"]
 # renovate: datasource=repology depName=ffmpeg packageName=openpkg_current/ffmpeg
@@ -241,17 +271,48 @@ RUN \
   --enable-shared \
   --enable-version3 \
   ; \
-  make -j$(nproc); \
+  make -j"$(nproc)"; \
   make install;
 
+# Create temporary build layer from base image for Ruby dependencies
+FROM ruby AS ruby-build
+
+ARG TARGETPLATFORM
+
+# hadolint ignore=DL3008
+RUN \
+  # Mount Apt cache and lib directories from Docker buildx caches
+  --mount=type=cache,id=apt-cache-${TARGETPLATFORM},target=/var/cache/apt,sharing=locked \
+  --mount=type=cache,id=apt-lib-${TARGETPLATFORM},target=/var/lib/apt,sharing=locked \
+  # Install build tools and bundler dependencies from APT
+  apt-get install -y --no-install-recommends \
+  build-essential \
+  git \
+  libgdbm-dev \
+  libgmp-dev \
+  libicu-dev \
+  libidn-dev \
+  libpq-dev \
+  libssl-dev \
+  libyaml-dev \
+  shared-mime-info \
+  zlib1g-dev \
+  ;
+
 # Create temporary bundler specific build layer from build layer
-FROM build AS bundler
+FROM ruby-build AS bundler
 
 ARG TARGETPLATFORM
 
 # Copy Gemfile config into working directory
 COPY Gemfile* /opt/mastodon/
 
+# Copy libvips for gems that need it during install
+COPY --from=libvips /usr/local/libvips/lib /usr/local/lib
+COPY --from=libvips /usr/local/libvips/include /usr/local/include
+
+RUN ldconfig
+
 RUN \
   # Mount Ruby Gem caches
   --mount=type=cache,id=gem-cache-${TARGETPLATFORM},target=/usr/local/bundle/cache/,sharing=locked \
@@ -267,7 +328,7 @@ RUN \
   bundle install -j"$(nproc)";
 
 # Create temporary assets build layer from build layer
-FROM build AS precompiler
+FROM ruby-build AS precompiler
 
 ARG TARGETPLATFORM
 
@@ -311,53 +372,6 @@ FROM ruby AS mastodon
 
 ARG TARGETPLATFORM
 
-# hadolint ignore=DL3008
-RUN \
-  # Mount Apt cache and lib directories from Docker buildx caches
-  --mount=type=cache,id=apt-cache-${TARGETPLATFORM},target=/var/cache/apt,sharing=locked \
-  --mount=type=cache,id=apt-lib-${TARGETPLATFORM},target=/var/lib/apt,sharing=locked \
-  # Mount Corepack and Yarn caches from Docker buildx caches
-  --mount=type=cache,id=corepack-cache-${TARGETPLATFORM},target=/usr/local/share/.cache/corepack,sharing=locked \
-  --mount=type=cache,id=yarn-cache-${TARGETPLATFORM},target=/usr/local/share/.cache/yarn,sharing=locked \
-  # Apt update install non-dev versions of necessary components
-  apt-get install -y --no-install-recommends \
-  libexpat1 \
-  libglib2.0-0t64 \
-  libicu76 \
-  libidn12 \
-  libpq5 \
-  libreadline8t64 \
-  libssl3t64 \
-  libyaml-0-2 \
-  # libvips components
-  libcgif0 \
-  libexif12 \
-  libheif1 \
-  libhwy1t64 \
-  libimagequant0 \
-  libjpeg62-turbo \
-  liblcms2-2 \
-  libspng0 \
-  libtiff6 \
-  libwebp7 \
-  libwebpdemux2 \
-  libwebpmux3 \
-  # ffmpeg components
-  libdav1d7 \
-  libmp3lame0 \
-  libopencore-amrnb0 \
-  libopencore-amrwb0 \
-  libopus0 \
-  libsnappy1v5 \
-  libtheora0 \
-  libvorbis0a \
-  libvorbisenc2 \
-  libvorbisfile3 \
-  libvpx9 \
-  libx264-164 \
-  libx265-215 \
-  ;
-
 # Copy Mastodon sources into final layer
 COPY . /opt/mastodon/
 

Gemfile

@@ -102,10 +102,10 @@ gem 'rdf-normalize', '~> 0.5'
 
 gem 'prometheus_exporter', '~> 2.2', require: false
 
-gem 'opentelemetry-api', '~> 1.8.0'
+gem 'opentelemetry-api', '~> 1.9.0'
 
 group :opentelemetry do
-  gem 'opentelemetry-exporter-otlp', '~> 0.32.0', require: false
+  gem 'opentelemetry-exporter-otlp', '~> 0.33.0', require: false
   gem 'opentelemetry-instrumentation-active_job', '~> 0.10.0', require: false
   gem 'opentelemetry-instrumentation-active_model_serializers', '~> 0.24.0', require: false
   gem 'opentelemetry-instrumentation-concurrent_ruby', '~> 0.24.0', require: false

Gemfile.lock

@@ -99,7 +99,7 @@ GEM
     ast (2.4.3)
     attr_required (1.0.2)
     aws-eventstream (1.4.0)
-    aws-partitions (1.1227.0)
+    aws-partitions (1.1236.0)
     aws-sdk-core (3.244.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
@@ -111,7 +111,7 @@ GEM
     aws-sdk-kms (1.123.0)
       aws-sdk-core (~> 3, >= 3.244.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.217.0)
+    aws-sdk-s3 (1.219.0)
       aws-sdk-core (~> 3, >= 3.244.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
@@ -278,7 +278,7 @@ GEM
       raabro (~> 1.4)
     globalid (1.3.0)
       activesupport (>= 6.1)
-    google-protobuf (4.34.0)
+    google-protobuf (4.34.1)
       bigdecimal
       rake (~> 13.3)
     googleapis-common-protos-types (1.22.0)
@@ -451,7 +451,7 @@ GEM
     mime-types-data (3.2026.0317)
     mini_mime (1.1.5)
     mini_portile2 (2.8.9)
-    minitest (6.0.2)
+    minitest (6.0.3)
       drb (~> 2.0)
       prism (~> 1.5)
     msgpack (1.8.0)
@@ -509,11 +509,11 @@ GEM
     openssl (4.0.1)
     openssl-signature_algorithm (1.3.0)
       openssl (> 2.0)
-    opentelemetry-api (1.8.0)
+    opentelemetry-api (1.9.0)
       logger
-    opentelemetry-common (0.23.0)
+    opentelemetry-common (0.24.0)
       opentelemetry-api (~> 1.0)
-    opentelemetry-exporter-otlp (0.32.0)
+    opentelemetry-exporter-otlp (0.33.0)
       google-protobuf (>= 3.18)
       googleapis-common-protos-types (~> 1.3)
       opentelemetry-api (~> 1.1)
@@ -576,14 +576,15 @@ GEM
       opentelemetry-instrumentation-base (~> 0.25)
     opentelemetry-instrumentation-sidekiq (0.28.1)
       opentelemetry-instrumentation-base (~> 0.25)
-    opentelemetry-registry (0.4.0)
+    opentelemetry-registry (0.5.0)
       opentelemetry-api (~> 1.1)
-    opentelemetry-sdk (1.10.0)
+    opentelemetry-sdk (1.11.0)
+      logger
       opentelemetry-api (~> 1.1)
       opentelemetry-common (~> 0.20)
       opentelemetry-registry (~> 0.2)
       opentelemetry-semantic_conventions
-    opentelemetry-semantic_conventions (1.36.0)
+    opentelemetry-semantic_conventions (1.37.0)
       opentelemetry-api (~> 1.0)
     orm_adapter (0.5.0)
     ostruct (0.6.3)
@@ -851,8 +852,8 @@ GEM
       concurrent-ruby
       zeitwerk
     stringio (3.2.0)
-    strong_migrations (2.5.2)
+    strong_migrations (2.6.0)
-      activerecord (>= 7.1)
+      activerecord (>= 7.2)
     swd (2.0.3)
       activesupport (>= 3)
       attr_required (>= 0.0.5)
@@ -1020,8 +1021,8 @@ DEPENDENCIES
   omniauth-rails_csrf_protection (~> 2.0)
   omniauth-saml (~> 2.0)
   omniauth_openid_connect (~> 0.8.0)
-  opentelemetry-api (~> 1.8.0)
+  opentelemetry-api (~> 1.9.0)
-  opentelemetry-exporter-otlp (~> 0.32.0)
+  opentelemetry-exporter-otlp (~> 0.33.0)
   opentelemetry-instrumentation-active_job (~> 0.10.0)
   opentelemetry-instrumentation-active_model_serializers (~> 0.24.0)
   opentelemetry-instrumentation-concurrent_ruby (~> 0.24.0)

app/javascript/mastodon/api_types/accounts.ts

@@ -53,7 +53,7 @@ export interface BaseApiAccountJSON {
   header_static: string;
   header_description: string;
   id: string;
-  last_status_at: string;
+  last_status_at: string | null;
   locked: boolean;
   show_media: boolean;
   show_media_replies: boolean;

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

@@ -11,7 +11,6 @@ import { useRelationship } from 'mastodon/hooks/useRelationship';
 import type { Relationship } from 'mastodon/models/relationship';
 
 import { EmojiHTML } from '../emoji/html';
-import { FamiliarFollowers } from '../familiar_followers';
 import { FollowButton } from '../follow_button';
 import { FormattedDateWrapper } from '../formatted_date';
 import { NumberFields, NumberFieldsItem } from '../number_fields';
@@ -31,10 +30,11 @@ interface Props {
   accountId: string | undefined;
   stats?: Stat[];
   renderButton?: (options: RenderButtonOptions) => React.ReactNode;
+  withBio?: boolean;
   withBorder?: boolean;
 }
 
-const DEFAULT_STATS: Stat[] = ['followers', 'following', 'joined'];
+const DEFAULT_STATS: Stat[] = ['followers', 'posts', 'last-active'];
 
 /**
  * Extended account list item with bio, verified link badge,
@@ -46,6 +46,7 @@ const DEFAULT_STATS: Stat[] = ['followers', 'following', 'joined'];
 export const AccountListItem: React.FC<Props> = ({
   accountId,
   stats = DEFAULT_STATS,
+  withBio = true,
   withBorder = true,
   renderButton = defaultRenderButton,
 }) => {
@@ -147,11 +148,15 @@ export const AccountListItem: React.FC<Props> = ({
               />
             }
           >
-            <RelativeTimestamp
+            {account.last_status_at ? (
-              long
+              <RelativeTimestamp
-              timestamp={account.last_status_at}
+                long
-              noFuture
+                timestamp={account.last_status_at}
-            />
+                noFuture
+              />
+            ) : (
+              '-'
+            )}
           </NumberFieldsItem>
         )}
         {firstVerifiedField && (
@@ -161,8 +166,7 @@ export const AccountListItem: React.FC<Props> = ({
           />
         )}
       </NumberFields>
-      <FamiliarFollowers accountId={accountId} />
+      {withBio && account.note.length > 0 && (
-      {account.note.length > 0 && (
         <EmojiHTML
           className={classNames(classes.bio, 'translate')}
           htmlString={account.note_emojified}

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

@@ -8,13 +8,6 @@
   &[data-with-border='true'] {
     border-bottom: 1px solid var(--color-border-primary);
   }
-
-  :global(.account__note) {
-    display: -webkit-box;
-    -webkit-box-orient: vertical;
-    -webkit-line-clamp: 3;
-    line-clamp: 3;
-  }
 }
 
 .header {
@@ -40,6 +33,12 @@
 }
 
 .bio {
+  overflow: hidden;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 3;
+  line-clamp: 3;
+
   :any-link {
     color: var(--color-text-status-links);
 

app/javascript/mastodon/components/column_header.tsx

@@ -73,7 +73,7 @@ const BackButton: React.FC<{
 };
 
 export interface Props {
-  title?: string;
+  title?: React.ReactNode;
   icon?: string;
   iconComponent?: IconProp;
   active?: boolean;

app/javascript/mastodon/components/empty_state/empty_state.module.scss

@@ -3,16 +3,20 @@
   flex-direction: column;
   align-items: center;
   max-width: 600px;
-  padding: 20px;
+  padding: 24px;
   gap: 16px;
   text-align: center;
   color: var(--color-text-primary);
 }
 
 .content {
+  max-width: 370px;
+
   svg,
   img {
-    width: 240px;
+    width: 200px;
+    aspect-ratio: 1;
+    object-fit: contain;
     max-width: 100%;
     margin-bottom: 16px;
   }
@@ -20,11 +24,14 @@
   h3 {
     font-size: 17px;
     font-weight: 500;
+    text-wrap: balance;
+    line-height: 1.2;
   }
 
   p {
-    font-size: 15px;
     margin-top: 8px;
+    font-size: 15px;
     color: var(--color-text-secondary);
+    text-wrap: pretty;
   }
 }

app/javascript/mastodon/components/form_fields/combobox.module.scss

@@ -8,9 +8,9 @@
 
 .menuButton {
   position: absolute;
-  inset-inline-end: 0;
+  inset-inline-end: 1px;
-  top: 0;
+  top: 1px;
-  padding: 9px;
+  padding: 7px;
 
   &::before {
     // Subtle divider line separating the button from the input field

app/javascript/mastodon/components/form_fields/copy_link_field.module.scss

@@ -8,7 +8,7 @@
 
 .copyButton {
   position: absolute;
-  inset-inline-end: 0;
+  inset-inline-end: 1px;
-  top: 0;
+  top: 1px;
-  padding: 9px;
+  padding: 7px;
 }

app/javascript/mastodon/features/account_featured/components/empty_message.tsx

@@ -1,3 +1,5 @@
+import { useCallback } from 'react';
+
 import { FormattedMessage } from 'react-intl';
 
 import { useParams } from 'react-router';
@@ -5,17 +7,21 @@ import { Link } from 'react-router-dom';
 
 import ElephantDarkImage from '@/images/elephant_ui_dark.svg?react';
 import ElephantLightImage from '@/images/elephant_ui_light.svg?react';
+import { openModal } from '@/mastodon/actions/modal';
+import { Button } from '@/mastodon/components/button';
 import { EmptyState } from '@/mastodon/components/empty_state';
 import { LimitedAccountHint } from '@/mastodon/features/account_timeline/components/limited_account_hint';
 import { areCollectionsEnabled } from '@/mastodon/features/collections/utils';
 import { useCurrentAccountId } from '@/mastodon/hooks/useAccountId';
 import { useTheme } from '@/mastodon/hooks/useTheme';
+import { useAppDispatch } from '@/mastodon/store';
 
 interface EmptyMessageProps {
   suspended: boolean;
   hidden: boolean;
   blockedBy: boolean;
   accountId?: string;
+  withoutAddCollectionButton?: boolean;
 }
 
 export const EmptyMessage: React.FC<EmptyMessageProps> = ({
@@ -23,6 +29,7 @@ export const EmptyMessage: React.FC<EmptyMessageProps> = ({
   suspended,
   hidden,
   blockedBy,
+  withoutAddCollectionButton,
 }) => {
   const { acct } = useParams<{ acct?: string }>();
   const me = useCurrentAccountId();
@@ -30,6 +37,17 @@ export const EmptyMessage: React.FC<EmptyMessageProps> = ({
   const ElephantImage =
     theme === 'dark' ? ElephantDarkImage : ElephantLightImage;
 
+  const dispatch = useAppDispatch();
+
+  const confirmHideFeaturedTab = useCallback(() => {
+    void dispatch(
+      openModal({
+        modalType: 'ACCOUNT_HIDE_FEATURED_TAB',
+        modalProps: {},
+      }),
+    );
+  }, [dispatch]);
+
   if (!accountId) {
     return null;
   }
@@ -49,17 +67,31 @@ export const EmptyMessage: React.FC<EmptyMessageProps> = ({
           image={image}
           title={
             <FormattedMessage
-              id='empty_column.account_featured_self.no_collections'
+              id='empty_column.account_featured_self.showcase_accounts'
-              defaultMessage='No collections yet'
+              defaultMessage='Showcase your favorite accounts'
+            />
+          }
+          message={
+            <FormattedMessage
+              id='empty_column.account_featured_self.showcase_accounts_desc'
+              defaultMessage='Collections are curated lists of accounts to help others discover more of the Fediverse.'
             />
           }
         >
-          <Link to='/collections/new' className='button'>
+          {!withoutAddCollectionButton && (
+            <Link to='/collections/new' className='button'>
+              <FormattedMessage
+                id='empty_column.account_featured_self.no_collections_button'
+                defaultMessage='Create a collection'
+              />
+            </Link>
+          )}
+          <Button secondary onClick={confirmHideFeaturedTab}>
             <FormattedMessage
-              id='empty_column.account_featured_self.no_collections_button'
+              id='empty_column.account_featured_self.no_collections_hide_tab'
-              defaultMessage='Create a collection'
+              defaultMessage='Hide this tab instead'
             />
-          </Link>
+          </Button>
         </EmptyState>
       );
     } else {
@@ -72,7 +104,7 @@ export const EmptyMessage: React.FC<EmptyMessageProps> = ({
       message = (
         <FormattedMessage
           id='empty_column.account_featured_self.pre_collections_desc'
-          defaultMessage='Collections (coming in Mastodon 4.6) allows you to create your own curated lists of accounts to recommend to others.'
+          defaultMessage='Collections (coming in Mastodon 4.6) allow you to create your own curated lists of accounts to recommend to others.'
         />
       );
     }
@@ -93,47 +125,21 @@ export const EmptyMessage: React.FC<EmptyMessageProps> = ({
       />
     );
   } else {
-    // Standard other account empty state.
+    if (acct) {
-    title = (
+      title = (
-      <FormattedMessage
+        <FormattedMessage
-        id='empty_column.account_featured_other.title'
+          id='empty_column.account_featured.other'
-        defaultMessage='Nothing to see here'
+          defaultMessage='{acct} has not featured anything yet.'
-      />
+          values={{ acct }}
-    );
+        />
-    if (hasCollections) {
+      );
-      if (acct) {
-        message = (
-          <FormattedMessage
-            id='empty_column.account_featured_other.no_collections_desc'
-            defaultMessage='{acct} hasn’t created any collections yet.'
-            values={{ acct }}
-          />
-        );
-      } else {
-        message = (
-          <FormattedMessage
-            id='empty_column.account_featured_unknown.no_collections_desc'
-            defaultMessage='This account hasn’t created any collections yet.'
-          />
-        );
-      }
     } else {
-      if (acct) {
+      title = (
-        message = (
+        <FormattedMessage
-          <FormattedMessage
+          id='empty_column.account_featured_unknown.other'
-            id='empty_column.account_featured.other'
+          defaultMessage='This account has not featured anything yet.'
-            defaultMessage='{acct} hasn’t featured anything yet.'
+        />
-            values={{ acct }}
+      );
-          />
-        );
-      } else {
-        message = (
-          <FormattedMessage
-            id='empty_column.account_featured_unknown.other'
-            defaultMessage='This account hasn’t featured anything yet.'
-          />
-        );
-      }
     }
   }
 

app/javascript/mastodon/features/account_featured/components/subheading.module.scss

@@ -0,0 +1,37 @@
+.subheading {
+  box-sizing: border-box;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  min-height: 52px;
+  padding: 12px 16px;
+  font-size: 13px;
+  font-weight: 500;
+  text-transform: uppercase;
+  color: var(--color-text-primary);
+  background: var(--color-bg-secondary);
+}
+
+.link {
+  display: flex;
+  padding-block: 4px;
+  font-size: 13px;
+  font-weight: 500;
+  text-transform: none;
+  text-decoration: none;
+  color: inherit;
+
+  &:hover {
+    text-decoration: underline;
+  }
+
+  &:focus-visible {
+    outline: var(--outline-focus-default);
+    outline-offset: 2px;
+  }
+
+  :global(.icon) {
+    width: 18px;
+    height: 18px;
+  }
+}

app/javascript/mastodon/features/account_featured/components/subheading.tsx

@@ -0,0 +1,42 @@
+import type { ComponentPropsWithoutRef } from 'react';
+
+import classNames from 'classnames';
+import { Link } from 'react-router-dom';
+
+import type { IconProp } from '@/mastodon/components/icon';
+import { Icon } from '@/mastodon/components/icon';
+import { polymorphicForwardRef } from '@/types/polymorphic';
+
+import classes from './subheading.module.scss';
+
+export const Subheading = polymorphicForwardRef<'h2'>(
+  ({ as: Component = 'h2', children, className, ...props }, ref) => {
+    return (
+      <Component
+        ref={ref}
+        className={classNames(classes.subheading, className)}
+        {...props}
+      >
+        {children}
+      </Component>
+    );
+  },
+);
+
+interface SubheadingLinkProps extends ComponentPropsWithoutRef<typeof Link> {
+  icon: IconProp;
+}
+
+export const SubheadingLink: React.FC<SubheadingLinkProps> = ({
+  icon,
+  children,
+  className,
+  ...props
+}) => {
+  return (
+    <Link className={classNames(classes.link, className)} {...props}>
+      <Icon id='subheading-icon' icon={icon} />
+      {children}
+    </Link>
+  );
+};

app/javascript/mastodon/features/account_featured/index.tsx

@@ -6,9 +6,10 @@ import { useHistory } from 'react-router';
 
 import { List as ImmutableList } from 'immutable';
 
+import { AccountListItem } from '@/mastodon/components/account_list_item';
 import { useAccount } from '@/mastodon/hooks/useAccount';
+import AddIcon from '@/material-icons/400-24px/add.svg?react';
 import { fetchEndorsedAccounts } from 'mastodon/actions/accounts';
-import { Account } from 'mastodon/components/account';
 import { ColumnBackButton } from 'mastodon/components/column_back_button';
 import { LoadingIndicator } from 'mastodon/components/loading_indicator';
 import { RemoteHint } from 'mastodon/components/remote_hint';
@@ -28,10 +29,13 @@ import {
 } from 'mastodon/reducers/slices/collections';
 import { useAppDispatch, useAppSelector } from 'mastodon/store';
 
-import { CollectionListItem } from '../collections/detail/collection_list_item';
+import { CollectionListItem } from '../collections/components/collection_list_item';
 import { areCollectionsEnabled } from '../collections/utils';
 
 import { EmptyMessage } from './components/empty_message';
+import { Subheading, SubheadingLink } from './components/subheading';
+
+const collectionsEnabled = areCollectionsEnabled();
 
 const AccountFeatured: React.FC<{ multiColumn: boolean }> = ({
   multiColumn,
@@ -54,13 +58,12 @@ const AccountFeatured: React.FC<{ multiColumn: boolean }> = ({
     if (accountId) {
       void dispatch(fetchEndorsedAccounts({ accountId }));
 
-      if (areCollectionsEnabled()) {
+      if (collectionsEnabled) {
         void dispatch(fetchAccountCollections({ accountId }));
       }
     }
   }, [accountId, dispatch]);
 
-  const isLoading = !accountId;
   const featuredAccountIds = useAppSelector(
     (state) =>
       state.user_lists.getIn(
@@ -68,8 +71,8 @@ const AccountFeatured: React.FC<{ multiColumn: boolean }> = ({
         ImmutableList(),
       ) as ImmutableList<string>,
   );
-  const { collections, status } = useAppSelector((state) =>
+  const { collections, status: collectionsLoadStatus } = useAppSelector(
-    selectAccountCollections(state, accountId ?? null),
+    (state) => selectAccountCollections(state, accountId ?? null),
   );
   const listedCollections = collections.filter(
     // Hide unlisted and empty collections to avoid confusion
@@ -78,6 +81,15 @@ const AccountFeatured: React.FC<{ multiColumn: boolean }> = ({
     (item) => item.discoverable && !!item.item_count,
   );
 
+  const hasCollections =
+    collectionsEnabled &&
+    collectionsLoadStatus === 'idle' &&
+    listedCollections.length > 0;
+
+  const hasFeaturedAccounts = !featuredAccountIds.isEmpty();
+
+  const isLoading = !accountId || collectionsLoadStatus !== 'idle';
+
   if (accountId === null) {
     return <BundleColumnError multiColumn={multiColumn} errorType='routing' />;
   }
@@ -92,7 +104,7 @@ const AccountFeatured: React.FC<{ multiColumn: boolean }> = ({
     );
   }
 
-  if (featuredAccountIds.isEmpty() && listedCollections.length === 0) {
+  if (!hasFeaturedAccounts && !hasCollections) {
     return (
       <AccountFeaturedWrapper accountId={accountId}>
         <EmptyMessage
@@ -114,36 +126,14 @@ const AccountFeatured: React.FC<{ multiColumn: boolean }> = ({
         {accountId && (
           <AccountHeader accountId={accountId} hideTabs={forceEmptyState} />
         )}
-        {listedCollections.length > 0 && status === 'idle' && (
-          <>
-            <h4 className='column-subheading'>
-              <FormattedMessage
-                id='account.featured.collections'
-                defaultMessage='Collections'
-              />
-            </h4>
-            <ItemList>
-              {listedCollections.map((item, index) => (
-                <CollectionListItem
-                  key={item.id}
-                  collection={item}
-                  withoutBorder={index === listedCollections.length - 1}
-                  withAuthorHandle={false}
-                  positionInList={index + 1}
-                  listSize={listedCollections.length}
-                />
-              ))}
-            </ItemList>
-          </>
-        )}
         {!featuredAccountIds.isEmpty() && (
           <>
-            <h4 className='column-subheading'>
+            <Subheading as='h2'>
               <FormattedMessage
                 id='account.featured.accounts'
                 defaultMessage='Profiles'
               />
-            </h4>
+            </Subheading>
             <ItemList>
               {featuredAccountIds.map((featuredAccountId, index) => (
                 <Article
@@ -152,12 +142,52 @@ const AccountFeatured: React.FC<{ multiColumn: boolean }> = ({
                   aria-posinset={index + 1}
                   aria-setsize={featuredAccountIds.size}
                 >
-                  <Account id={featuredAccountId} />
+                  <AccountListItem accountId={featuredAccountId} />
                 </Article>
               ))}
             </ItemList>
           </>
         )}
+        {collectionsEnabled && (
+          <>
+            <Subheading as='header'>
+              <h2>
+                <FormattedMessage
+                  id='account.featured.collections'
+                  defaultMessage='Collections'
+                />
+              </h2>
+              <SubheadingLink to='/collections/new' icon={AddIcon}>
+                <FormattedMessage
+                  id='account.featured.new_collection'
+                  defaultMessage='New collection'
+                />
+              </SubheadingLink>
+            </Subheading>
+            {hasCollections ? (
+              <ItemList>
+                {listedCollections.map((item, index) => (
+                  <CollectionListItem
+                    key={item.id}
+                    collection={item}
+                    withoutBorder={index === listedCollections.length - 1}
+                    withAuthorHandle={false}
+                    positionInList={index + 1}
+                    listSize={listedCollections.length}
+                  />
+                ))}
+              </ItemList>
+            ) : (
+              <EmptyMessage
+                withoutAddCollectionButton
+                blockedBy={blockedBy}
+                hidden={hidden}
+                suspended={suspended}
+                accountId={accountId}
+              />
+            )}
+          </>
+        )}
         <RemoteHint accountId={accountId} />
       </Scrollable>
     </Column>

app/javascript/mastodon/features/account_timeline/components/tabs.tsx

@@ -8,8 +8,6 @@ import { NavLink } from 'react-router-dom';
 import { useAccount } from '@/mastodon/hooks/useAccount';
 import { useAccountId } from '@/mastodon/hooks/useAccountId';
 
-import { areCollectionsEnabled } from '../../collections/utils';
-
 import classes from './styles.module.scss';
 
 const isActive: Required<NavLinkProps>['isActive'] = (match, location) =>
@@ -41,14 +39,7 @@ export const AccountTabs: FC = () => {
       )}
       {show_featured && (
         <NavLink exact to={`/@${acct}/featured`}>
-          {areCollectionsEnabled() ? (
+          <FormattedMessage id='account.featured' defaultMessage='Featured' />
-            <FormattedMessage
-              id='account.featured.collections'
-              defaultMessage='Collections'
-            />
-          ) : (
-            <FormattedMessage id='account.featured' defaultMessage='Featured' />
-          )}
         </NavLink>
       )}
     </div>

app/javascript/mastodon/features/collections/components/collection_list_item.module.scss

@@ -0,0 +1,20 @@
+.wrapper {
+  display: flex;
+  align-items: start;
+  padding: 12px 16px;
+  gap: 16px;
+
+  &:not(.wrapperWithoutBorder) {
+    border-bottom: 1px solid var(--color-border-primary);
+  }
+}
+
+.menuButton {
+  padding: 4px;
+  margin-top: -2px;
+
+  svg {
+    width: 20px;
+    height: 20px;
+  }
+}

app/javascript/mastodon/features/collections/components/collection_list_item.tsx

@@ -0,0 +1,50 @@
+import { useId } from 'react';
+
+import classNames from 'classnames';
+
+import { Article } from 'mastodon/components/scrollable_list/components';
+import type { CollectionLockupProps } from 'mastodon/features/collections/components/collection_lockup';
+import { CollectionLockup } from 'mastodon/features/collections/components/collection_lockup';
+import { CollectionMenu } from 'mastodon/features/collections/components/collection_menu';
+
+import classes from './collection_list_item.module.scss';
+
+interface CollectionListItemProps extends CollectionLockupProps {
+  withoutBorder?: boolean;
+  positionInList: number;
+  listSize: number;
+}
+
+export const CollectionListItem: React.FC<CollectionListItemProps> = ({
+  collection,
+  withoutBorder,
+  positionInList,
+  listSize,
+  ...otherProps
+}) => {
+  const uniqueId = useId();
+  const linkId = `${uniqueId}-link`;
+  const infoId = `${uniqueId}-info`;
+
+  return (
+    <Article
+      focusable
+      className={classNames(
+        classes.wrapper,
+        withoutBorder && classes.wrapperWithoutBorder,
+      )}
+      aria-labelledby={linkId}
+      aria-describedby={infoId}
+      aria-posinset={positionInList}
+      aria-setsize={listSize}
+    >
+      <CollectionLockup collection={collection} {...otherProps} />
+
+      <CollectionMenu
+        context='list'
+        collection={collection}
+        className={classes.menuButton}
+      />
+    </Article>
+  );
+};

app/javascript/mastodon/features/collections/components/collection_lockup.module.scss

@@ -1,21 +1,11 @@
-.wrapper {
-  display: flex;
-  align-items: start;
-  margin-inline: 24px;
-  padding-block: 12px;
-  gap: 16px;
-
-  &:not(.wrapperWithoutBorder) {
-    border-bottom: 1px solid var(--color-border-primary);
-  }
-}
-
 .content {
   position: relative;
   flex-grow: 1;
   display: flex;
   align-items: center;
   column-gap: 12px;
+  color: var(--color-text-primary);
+  line-height: 1.3;
 }
 
 .avatarGrid {
@@ -70,13 +60,3 @@
   font-size: 13px;
   color: var(--color-text-secondary);
 }
-
-.menuButton {
-  padding: 4px;
-  margin-top: -2px;
-
-  svg {
-    width: 20px;
-    height: 20px;
-  }
-}

app/javascript/mastodon/features/collections/components/collection_lockup.tsx

@@ -0,0 +1,115 @@
+import { useId } from 'react';
+
+import { FormattedMessage } from 'react-intl';
+
+import classNames from 'classnames';
+import { Link } from 'react-router-dom';
+
+import WarningIcon from '@/material-icons/400-24px/warning.svg?react';
+import type { ApiCollectionJSON } from 'mastodon/api_types/collections';
+import { AvatarById } from 'mastodon/components/avatar';
+import { useAccountHandle } from 'mastodon/components/display_name/default';
+import { RelativeTimestamp } from 'mastodon/components/relative_timestamp';
+import { useAccount } from 'mastodon/hooks/useAccount';
+import { domain } from 'mastodon/initial_state';
+
+import classes from './collection_lockup.module.scss';
+
+export const AvatarGrid: React.FC<{
+  accountIds: (string | undefined)[];
+  sensitive?: boolean;
+}> = ({ accountIds: ids, sensitive }) => {
+  const avatarIds = [ids[0], ids[1], ids[2], ids[3]];
+  return (
+    <div
+      className={classNames(
+        classes.avatarGrid,
+        sensitive ? classes.avatarGridSensitive : null,
+      )}
+    >
+      {avatarIds.map((id) => (
+        <AvatarById
+          animate={false}
+          key={id}
+          accountId={id}
+          className={classes.avatar}
+          size={25}
+        />
+      ))}
+      {sensitive && <WarningIcon className={classes.avatarSensitiveBadge} />}
+    </div>
+  );
+};
+
+export interface CollectionLockupProps {
+  collection: ApiCollectionJSON;
+  withAuthorHandle?: boolean;
+  withTimestamp?: boolean;
+}
+
+export const CollectionLockup: React.FC<CollectionLockupProps> = ({
+  collection,
+  withAuthorHandle = true,
+  withTimestamp,
+}) => {
+  const { id, name } = collection;
+  const uniqueId = useId();
+  const linkId = `${uniqueId}-link`;
+  const infoId = `${uniqueId}-info`;
+  const authorAccount = useAccount(collection.account_id);
+  const authorHandle = useAccountHandle(authorAccount, domain);
+
+  return (
+    <div className={classes.content}>
+      <AvatarGrid
+        accountIds={collection.items.map((item) => item.account_id)}
+        sensitive={collection.sensitive}
+      />
+      <div>
+        <h2 id={linkId}>
+          <Link to={`/collections/${id}`} className={classes.link}>
+            {name}
+          </Link>
+        </h2>
+        <ul className={classes.info} id={infoId}>
+          {collection.sensitive && (
+            <li className='sr-only'>
+              <FormattedMessage
+                id='collections.sensitive'
+                defaultMessage='Sensitive'
+              />
+            </li>
+          )}
+          {withAuthorHandle && authorAccount && (
+            <FormattedMessage
+              id='collections.by_account'
+              defaultMessage='by {account_handle}'
+              values={{
+                account_handle: authorHandle,
+              }}
+              tagName='li'
+            />
+          )}
+          <FormattedMessage
+            id='collections.account_count'
+            defaultMessage='{count, plural, one {# account} other {# accounts}}'
+            values={{ count: collection.item_count }}
+            tagName='li'
+          />
+          {withTimestamp && (
+            <FormattedMessage
+              id='collections.last_updated_at'
+              defaultMessage='Last updated: {date}'
+              values={{
+                date: (
+                  <RelativeTimestamp timestamp={collection.updated_at} long />
+                ),
+              }}
+              tagName='li'
+            />
+          )}
+        </ul>
+      </div>
+    </div>
+  );
+};

app/javascript/mastodon/features/collections/components/collection_preview_card.module.scss

@@ -0,0 +1,8 @@
+.wrapper {
+  display: flex;
+  align-items: start;
+  padding: 12px;
+  gap: 12px;
+  border-radius: 12px;
+  border: 1px solid var(--color-border-primary);
+}

app/javascript/mastodon/features/collections/components/collection_preview_card.tsx

@@ -0,0 +1,20 @@
+import type { CollectionLockupProps } from 'mastodon/features/collections/components/collection_lockup';
+import { CollectionLockup } from 'mastodon/features/collections/components/collection_lockup';
+
+import classes from './collection_preview_card.module.scss';
+
+interface CollectionPreviewCardProps extends CollectionLockupProps {
+  onRemove?: () => void;
+}
+
+export const CollectionPreviewCard: React.FC<CollectionPreviewCardProps> = ({
+  collection,
+  onRemove,
+  ...otherProps
+}) => {
+  return (
+    <div className={classes.wrapper}>
+      <CollectionLockup collection={collection} {...otherProps} />
+    </div>
+  );
+};

app/javascript/mastodon/features/collections/components/share_modal.module.scss

@@ -5,27 +5,7 @@
 }
 
 .preview {
-  display: flex;
-  flex-wrap: wrap-reverse;
-  align-items: start;
-  justify-content: space-between;
-  gap: 8px;
-  padding: 16px;
   margin-bottom: 16px;
-  border-radius: 8px;
-  color: var(--color-text-primary);
-  background: linear-gradient(
-    145deg,
-    var(--color-bg-brand-soft),
-    var(--color-bg-primary)
-  );
-  border: 1px solid var(--color-bg-brand-base);
-}
-
-.previewHeading {
-  font-size: 22px;
-  line-height: 1.3;
-  margin-bottom: 4px;
 }
 
 .actions {

app/javascript/mastodon/features/collections/components/share_modal.tsx

@@ -8,8 +8,6 @@ import { me } from '@/mastodon/initial_state';
 import CloseIcon from '@/material-icons/400-24px/close.svg?react';
 import { changeCompose, focusCompose } from 'mastodon/actions/compose';
 import type { ApiCollectionJSON } from 'mastodon/api_types/collections';
-import { AvatarById } from 'mastodon/components/avatar';
-import { AvatarGroup } from 'mastodon/components/avatar_group';
 import { Button } from 'mastodon/components/button';
 import { CopyLinkField } from 'mastodon/components/form_fields';
 import { IconButton } from 'mastodon/components/icon_button';
@@ -20,7 +18,7 @@ import {
 } from 'mastodon/components/modal_shell';
 import { useAppDispatch } from 'mastodon/store';
 
-import { AuthorNote } from '.';
+import { CollectionPreviewCard } from './collection_preview_card';
 import classes from './share_modal.module.scss';
 
 const messages = defineMessages({
@@ -95,24 +93,13 @@ export const CollectionShareModal: React.FC<{
         />
 
         <div className={classes.preview}>
-          <div>
+          <CollectionPreviewCard collection={collection} />
-            <h2 className={classes.previewHeading}>{collection.name}</h2>
-            <AuthorNote id={collection.account_id} />
-          </div>
-          <AvatarGroup>
-            {collection.items.slice(0, 5).map(({ account_id }) => {
-              if (!account_id) return;
-              return (
-                <AvatarById key={account_id} accountId={account_id} size={28} />
-              );
-            })}
-          </AvatarGroup>
         </div>
 
         <CopyLinkField
           label={intl.formatMessage({
             id: 'collection.share_modal.share_link_label',
-            defaultMessage: 'Invite share link',
+            defaultMessage: 'Share link',
           })}
           value={collectionLink}
         />

app/javascript/mastodon/features/collections/detail/accounts_list.tsx

@@ -146,7 +146,6 @@ export const CollectionAccountsList: React.FC<{
                 <AccountListItem
                   accountId={account_id}
                   withBorder={index !== items.length - 1}
-                  stats={['followers', 'last-active']}
                   renderButton={renderAccountItemButton}
                 />
               </Article>

app/javascript/mastodon/features/collections/detail/collection_list_item.tsx

@@ -1,139 +0,0 @@
-import { useId } from 'react';
-
-import { FormattedMessage } from 'react-intl';
-
-import classNames from 'classnames';
-import { Link } from 'react-router-dom';
-
-import WarningIcon from '@/material-icons/400-24px/warning.svg?react';
-import type { ApiCollectionJSON } from 'mastodon/api_types/collections';
-import { AvatarById } from 'mastodon/components/avatar';
-import { useAccountHandle } from 'mastodon/components/display_name/default';
-import { RelativeTimestamp } from 'mastodon/components/relative_timestamp';
-import { Article } from 'mastodon/components/scrollable_list/components';
-import { useAccount } from 'mastodon/hooks/useAccount';
-import { domain } from 'mastodon/initial_state';
-
-import classes from './collection_list_item.module.scss';
-import { CollectionMenu } from './collection_menu';
-
-export const AvatarGrid: React.FC<{
-  accountIds: (string | undefined)[];
-  sensitive?: boolean;
-}> = ({ accountIds: ids, sensitive }) => {
-  const avatarIds = [ids[0], ids[1], ids[2], ids[3]];
-  return (
-    <div
-      className={classNames(
-        classes.avatarGrid,
-        sensitive ? classes.avatarGridSensitive : null,
-      )}
-    >
-      {avatarIds.map((id) => (
-        <AvatarById
-          animate={false}
-          key={id}
-          accountId={id}
-          className={classes.avatar}
-          size={25}
-        />
-      ))}
-      {sensitive && <WarningIcon className={classes.avatarSensitiveBadge} />}
-    </div>
-  );
-};
-
-export const CollectionListItem: React.FC<{
-  collection: ApiCollectionJSON;
-  withoutBorder?: boolean;
-  withAuthorHandle?: boolean;
-  withTimestamp?: boolean;
-  positionInList: number;
-  listSize: number;
-}> = ({
-  collection,
-  withoutBorder,
-  withAuthorHandle = true,
-  withTimestamp,
-  positionInList,
-  listSize,
-}) => {
-  const { id, name } = collection;
-  const uniqueId = useId();
-  const linkId = `${uniqueId}-link`;
-  const infoId = `${uniqueId}-info`;
-  const authorAccount = useAccount(collection.account_id);
-  const authorHandle = useAccountHandle(authorAccount, domain);
-
-  return (
-    <Article
-      focusable
-      className={classNames(
-        classes.wrapper,
-        withoutBorder && classes.wrapperWithoutBorder,
-      )}
-      aria-labelledby={linkId}
-      aria-describedby={infoId}
-      aria-posinset={positionInList}
-      aria-setsize={listSize}
-    >
-      <div className={classes.content}>
-        <AvatarGrid
-          accountIds={collection.items.map((item) => item.account_id)}
-          sensitive={collection.sensitive}
-        />
-        <div>
-          <h2 id={linkId}>
-            <Link to={`/collections/${id}`} className={classes.link}>
-              {name}
-            </Link>
-          </h2>
-          <ul className={classes.info} id={infoId}>
-            {collection.sensitive && (
-              <li className='sr-only'>
-                <FormattedMessage
-                  id='collections.sensitive'
-                  defaultMessage='Sensitive'
-                />
-              </li>
-            )}
-            {withAuthorHandle && authorAccount && (
-              <FormattedMessage
-                id='collections.by_account'
-                defaultMessage='by {account_handle}'
-                values={{
-                  account_handle: authorHandle,
-                }}
-                tagName='li'
-              />
-            )}
-            <FormattedMessage
-              id='collections.account_count'
-              defaultMessage='{count, plural, one {# account} other {# accounts}}'
-              values={{ count: collection.item_count }}
-              tagName='li'
-            />
-            {withTimestamp && (
-              <FormattedMessage
-                id='collections.last_updated_at'
-                defaultMessage='Last updated: {date}'
-                values={{
-                  date: (
-                    <RelativeTimestamp timestamp={collection.updated_at} long />
-                  ),
-                }}
-                tagName='li'
-              />
-            )}
-          </ul>
-        </div>
-      </div>
-
-      <CollectionMenu
-        context='list'
-        collection={collection}
-        className={classes.menuButton}
-      />
-    </Article>
-  );
-};

app/javascript/mastodon/features/collections/detail/index.tsx

@@ -23,8 +23,9 @@ import { domain, me } from 'mastodon/initial_state';
 import { fetchCollection } from 'mastodon/reducers/slices/collections';
 import { useAppDispatch, useAppSelector } from 'mastodon/store';
 
+import { CollectionMenu } from '../components/collection_menu';
+
 import { CollectionAccountsList } from './accounts_list';
-import { CollectionMenu } from './collection_menu';
 import { useConfirmRevoke } from './revoke_collection_inclusion_modal';
 import classes from './styles.module.scss';
 
@@ -66,7 +67,7 @@ export const AuthorNote: React.FC<{ id: string }> = ({ id }) => {
   );
 };
 
-export const RevokeControls: React.FC<{
+const RevokeControls: React.FC<{
   collection: ApiCollectionJSON;
 }> = ({ collection }) => {
   const authorAccount = useAccount(collection.account_id);

app/javascript/mastodon/features/collections/editor/accounts.tsx

@@ -61,9 +61,11 @@ const AddedAccountItem: React.FC<{
     onRemove(accountId);
   }, [accountId, onRemove]);
 
+  const lastStatusAt = account?.last_status_at;
+
   const lastPostHint = useMemo(
     () =>
-      isOlderThanAWeek(account?.last_status_at) && (
+      (!lastStatusAt || isOlderThanAWeek(lastStatusAt)) && (
         <Badge
           label={
             <FormattedMessage
@@ -75,7 +77,7 @@ const AddedAccountItem: React.FC<{
           className={classes.accountBadge}
         />
       ),
-    [account?.last_status_at],
+    [lastStatusAt],
   );
 
   return (

app/javascript/mastodon/features/collections/index.tsx

@@ -10,22 +10,29 @@ import CollectionsFilledIcon from '@/material-icons/400-24px/category-fill.svg?r
 import SquigglyArrow from '@/svg-icons/squiggly_arrow.svg?react';
 import { Column } from 'mastodon/components/column';
 import { ColumnHeader } from 'mastodon/components/column_header';
+import { DisplayNameSimple } from 'mastodon/components/display_name/simple';
 import { Icon } from 'mastodon/components/icon';
 import {
   ItemList,
   Scrollable,
 } from 'mastodon/components/scrollable_list/components';
+import { useAccount } from 'mastodon/hooks/useAccount';
+import { useAccountId, useCurrentAccountId } from 'mastodon/hooks/useAccountId';
 import {
   fetchAccountCollections,
   selectAccountCollections,
 } from 'mastodon/reducers/slices/collections';
 import { useAppSelector, useAppDispatch } from 'mastodon/store';
 
-import { CollectionListItem } from './detail/collection_list_item';
+import { CollectionListItem } from './components/collection_list_item';
 import { messages as editorMessages } from './editor';
 
 const messages = defineMessages({
-  heading: { id: 'column.collections', defaultMessage: 'My collections' },
+  headingMe: { id: 'column.my_collections', defaultMessage: 'My collections' },
+  headingOther: {
+    id: 'column.other_collections',
+    defaultMessage: 'Collections by {name}',
+  },
 });
 
 export const Collections: React.FC<{
@@ -33,17 +40,22 @@ export const Collections: React.FC<{
 }> = ({ multiColumn }) => {
   const dispatch = useAppDispatch();
   const intl = useIntl();
-  const me = useAppSelector((state) => state.meta.get('me') as string);
+  const me = useCurrentAccountId();
+  const accountId = useAccountId();
+  const account = useAccount(accountId);
+
   const { collections, status } = useAppSelector((state) =>
-    selectAccountCollections(state, me),
+    selectAccountCollections(state, accountId),
   );
 
   useEffect(() => {
-    void dispatch(fetchAccountCollections({ accountId: me }));
+    if (accountId) {
-  }, [dispatch, me]);
+      void dispatch(fetchAccountCollections({ accountId }));
+    }
+  }, [dispatch, accountId]);
 
   const emptyMessage =
-    status === 'error' ? (
+    status === 'error' || !accountId ? (
       <FormattedMessage
         id='collections.error_loading_collections'
         defaultMessage='There was an error when trying to load your collections.'
@@ -67,25 +79,36 @@ export const Collections: React.FC<{
       </>
     );
 
+  const isOwnCollection = accountId === me;
+  const titleMessage = isOwnCollection
+    ? messages.headingMe
+    : messages.headingOther;
+
+  const pageTitle = intl.formatMessage(titleMessage, {
+    name: account?.get('display_name'),
+  });
+  const pageTitleHtml = intl.formatMessage(titleMessage, {
+    name: <DisplayNameSimple account={account} />,
+  });
+
   return (
-    <Column
+    <Column bindToDocument={!multiColumn} label={pageTitle}>
-      bindToDocument={!multiColumn}
-      label={intl.formatMessage(messages.heading)}
-    >
       <ColumnHeader
-        title={intl.formatMessage(messages.heading)}
+        title={pageTitleHtml}
         icon='collections'
         iconComponent={CollectionsFilledIcon}
         multiColumn={multiColumn}
         extraButton={
-          <Link
+          isOwnCollection && (
-            to='/collections/new'
+            <Link
-            className='column-header__button'
+              to='/collections/new'
-            title={intl.formatMessage(editorMessages.create)}
+              className='column-header__button'
-            aria-label={intl.formatMessage(editorMessages.create)}
+              title={intl.formatMessage(editorMessages.create)}
-          >
+              aria-label={intl.formatMessage(editorMessages.create)}
-            <Icon id='plus' icon={AddIcon} />
+            >
-          </Link>
+              <Icon id='plus' icon={AddIcon} />
+            </Link>
+          )
         }
       />
 
@@ -105,7 +128,7 @@ export const Collections: React.FC<{
       </Scrollable>
 
       <Helmet>
-        <title>{intl.formatMessage(messages.heading)}</title>
+        <title>{pageTitle}</title>
         <meta name='robots' content='noindex' />
       </Helmet>
     </Column>

app/javascript/mastodon/features/followers/components/list.tsx

@@ -53,12 +53,20 @@ export const AccountList: FC<AccountListProps> = ({
     }
     const children =
       list?.items.map((followerId) => (
-        <AccountListItem key={followerId} accountId={followerId} />
+        <AccountListItem
+          key={followerId}
+          accountId={followerId}
+          withBio={false}
+        />
       )) ?? [];
 
     if (prependAccountId) {
       children.unshift(
-        <AccountListItem key={prependAccountId} accountId={prependAccountId} />,
+        <AccountListItem
+          key={prependAccountId}
+          accountId={prependAccountId}
+          withBio={false}
+        />,
       );
     }
     return children;

app/javascript/mastodon/features/navigation_panel/index.tsx

@@ -10,6 +10,7 @@ import type { Map as ImmutableMap } from 'immutable';
 import { animated, useSpring } from '@react-spring/web';
 import { useDrag } from '@use-gesture/react';
 
+import { useAccount } from '@/mastodon/hooks/useAccount';
 import AddIcon from '@/material-icons/400-24px/add.svg?react';
 import AlternateEmailIcon from '@/material-icons/400-24px/alternate_email.svg?react';
 import BookmarksActiveIcon from '@/material-icons/400-24px/bookmarks-fill.svg?react';
@@ -212,6 +213,7 @@ export const NavigationPanel: React.FC<{ multiColumn?: boolean }> = ({
   const { signedIn, permissions, disabledAccountId } = useIdentity();
   const location = useLocation();
   const showSearch = useBreakpoint('full') && !multiColumn;
+  const account = useAccount(me);
 
   let banner: React.ReactNode;
 
@@ -335,7 +337,7 @@ export const NavigationPanel: React.FC<{ multiColumn?: boolean }> = ({
             {areCollectionsEnabled() && (
               <ColumnLink
                 transparent
-                to='/collections'
+                to={`/@${account?.acct}/collections`}
                 icon='collections'
                 iconComponent={CollectionsIcon}
                 activeIconComponent={CollectionsActiveIcon}

app/javascript/mastodon/features/notifications_v2/components/notification_collection.tsx

@@ -0,0 +1,69 @@
+import { FormattedMessage } from 'react-intl';
+
+import classNames from 'classnames';
+
+import { DisplayNameSimple } from '@/mastodon/components/display_name/simple';
+import { Icon } from '@/mastodon/components/icon';
+import { useAccount } from '@/mastodon/hooks/useAccount';
+import CollectionsFilledIcon from '@/material-icons/400-24px/category-fill.svg?react';
+import type {
+  NotificationGroupAddedToCollection,
+  NotificationGroupCollectionUpdate,
+} from 'mastodon/models/notification_group';
+
+import { CollectionPreviewCard } from '../../collections/components/collection_preview_card';
+
+export const NotificationCollection: React.FC<{
+  notification:
+    | NotificationGroupAddedToCollection
+    | NotificationGroupCollectionUpdate;
+  unread: boolean;
+}> = ({ notification, unread }) => {
+  const { collection, type } = notification;
+  const collectionCreatorAccount = useAccount(collection.account_id);
+
+  return (
+    <div
+      className={classNames(
+        'notification-group',
+        `notification-group--${type}`,
+        { 'notification-group--unread': unread },
+      )}
+    >
+      <div className='notification-group__icon'>
+        <Icon id='collection' icon={CollectionsFilledIcon} />
+      </div>
+
+      <div className='notification-group__main'>
+        <div className='notification-group__main__header'>
+          <div className='notification-group__main__header__label'>
+            {type === 'added_to_collection' && (
+              <FormattedMessage
+                id='notification.added_to_collection'
+                defaultMessage='{name} added you to a collection'
+                values={{
+                  name: (
+                    <DisplayNameSimple account={collectionCreatorAccount} />
+                  ),
+                }}
+              />
+            )}
+            {type === 'collection_update' && (
+              <FormattedMessage
+                id='notification.collection_update'
+                defaultMessage='{name} edited a collection you’re in'
+                values={{
+                  name: (
+                    <DisplayNameSimple account={collectionCreatorAccount} />
+                  ),
+                }}
+              />
+            )}
+          </div>
+        </div>
+
+        <CollectionPreviewCard collection={collection} />
+      </div>
+    </div>
+  );
+};

app/javascript/mastodon/features/notifications_v2/components/notification_group.tsx

@@ -9,6 +9,7 @@ import { useAppSelector, useAppDispatch } from 'mastodon/store';
 import { NotificationAdminReport } from './notification_admin_report';
 import { NotificationAdminSignUp } from './notification_admin_sign_up';
 import { NotificationAnnualReport } from './notification_annual_report';
+import { NotificationCollection } from './notification_collection';
 import { NotificationFavourite } from './notification_favourite';
 import { NotificationFollow } from './notification_follow';
 import { NotificationFollowRequest } from './notification_follow_request';
@@ -156,6 +157,15 @@ export const NotificationGroup: React.FC<{
         />
       );
       break;
+    case 'added_to_collection':
+    case 'collection_update':
+      content = (
+        <NotificationCollection
+          unread={unread}
+          notification={notificationGroup}
+        />
+      );
+      break;
     default:
       return null;
   }

app/javascript/mastodon/features/ui/components/column_subheading.jsx

@@ -1,15 +0,0 @@
-import PropTypes from 'prop-types';
-
-const ColumnSubheading = ({ text }) => {
-  return (
-    <div className='column-subheading'>
-      {text}
-    </div>
-  );
-};
-
-ColumnSubheading.propTypes = {
-  text: PropTypes.string.isRequired,
-};
-
-export default ColumnSubheading;

app/javascript/mastodon/features/ui/components/confirmation_modals/delete_collection.tsx

@@ -4,6 +4,8 @@ import { defineMessages, useIntl } from 'react-intl';
 
 import { useHistory } from 'react-router';
 
+import { useAccount } from '@/mastodon/hooks/useAccount';
+import { me } from '@/mastodon/initial_state';
 import { deleteCollection } from 'mastodon/reducers/slices/collections';
 import { useAppDispatch } from 'mastodon/store';
 
@@ -34,11 +36,12 @@ export const ConfirmDeleteCollectionModal: React.FC<
   const intl = useIntl();
   const dispatch = useAppDispatch();
   const history = useHistory();
+  const { acct: currentUserName } = useAccount(me) ?? {};
 
   const onConfirm = useCallback(() => {
     void dispatch(deleteCollection({ collectionId: id }));
-    history.push('/collections');
+    history.push(`/@${currentUserName}/collections`);
-  }, [dispatch, history, id]);
+  }, [dispatch, history, id, currentUserName]);
 
   return (
     <ConfirmationModal

app/javascript/mastodon/features/ui/components/confirmation_modals/hide_featured_tab.tsx

@@ -0,0 +1,73 @@
+import { useCallback } from 'react';
+
+import { defineMessages, useIntl } from 'react-intl';
+
+import { useHistory } from 'react-router';
+
+import { useAccount } from '@/mastodon/hooks/useAccount';
+import { useCurrentAccountId } from '@/mastodon/hooks/useAccountId';
+import { domain } from '@/mastodon/initial_state';
+import { patchProfile } from '@/mastodon/reducers/slices/profile_edit';
+import { useAppDispatch } from 'mastodon/store';
+
+import type { BaseConfirmationModalProps } from './confirmation_modal';
+import { ConfirmationModal } from './confirmation_modal';
+
+const messages = defineMessages({
+  title: {
+    id: 'confirmations.hide_featured_tab.title',
+    defaultMessage: 'Hide "Featured" tab?',
+  },
+  intro: {
+    id: 'confirmations.hide_featured_tab.intro',
+    defaultMessage:
+      'You can change this at any time under <i>Edit profile > Profile tab settings</i>.',
+  },
+  message: {
+    id: 'confirmations.hide_featured_tab.message',
+    defaultMessage:
+      'This will hide the tab for users on {serverName} and other servers running the latest version of Mastodon. Other displays may vary.',
+  },
+  confirm: {
+    id: 'confirmations.hide_featured_tab.confirm',
+    defaultMessage: 'Hide tab',
+  },
+});
+
+export const ConfirmHideFeaturedTabModal: React.FC<
+  BaseConfirmationModalProps
+> = ({ onClose }) => {
+  const intl = useIntl();
+  const dispatch = useAppDispatch();
+  const history = useHistory();
+  const currentAccountId = useCurrentAccountId();
+  const { acct: currentUserName } = useAccount(currentAccountId) ?? {};
+
+  const onConfirm = useCallback(() => {
+    void dispatch(patchProfile({ show_featured: false }));
+    history.push(`/@${currentUserName}`);
+  }, [currentUserName, dispatch, history]);
+
+  return (
+    <ConfirmationModal
+      title={intl.formatMessage(messages.title)}
+      extraContent={
+        <div className='prose'>
+          <p>
+            {intl.formatMessage(messages.intro, {
+              i: (words) => <i>{words}</i>,
+            })}
+          </p>
+          <p>
+            {intl.formatMessage(messages.message, {
+              serverName: domain,
+            })}
+          </p>
+        </div>
+      }
+      confirm={intl.formatMessage(messages.confirm)}
+      onConfirm={onConfirm}
+      onClose={onClose}
+    />
+  );
+};

app/javascript/mastodon/features/ui/components/modal_root.jsx

@@ -79,7 +79,7 @@ export const MODAL_COMPONENTS = {
   'DOMAIN_BLOCK': DomainBlockModal,
   'REPORT': ReportModal,
   'REPORT_COLLECTION': ReportCollectionModal,
-  'SHARE_COLLECTION': () => import('@/mastodon/features/collections/detail/share_modal').then(module => ({ default: module.CollectionShareModal })),
+  'SHARE_COLLECTION': () => import('@/mastodon/features/collections/components/share_modal').then(module => ({ default: module.CollectionShareModal })),
   'REVOKE_COLLECTION_INCLUSION': () => import('@/mastodon/features/collections/detail/revoke_collection_inclusion_modal').then(module => ({ default: module.RevokeCollectionInclusionModal })),
   'ACTIONS': () => Promise.resolve({ default: ActionsModal }),
   'EMBED': EmbedModal,
@@ -105,6 +105,7 @@ export const MODAL_COMPONENTS = {
   'ACCOUNT_EDIT_IMAGE_ALT': accountEditModal('ImageAltModal'),
   'ACCOUNT_EDIT_IMAGE_DELETE': accountEditModal('ImageDeleteModal'),
   'ACCOUNT_EDIT_IMAGE_UPLOAD': accountEditModal('ImageUploadModal'),
+  'ACCOUNT_HIDE_FEATURED_TAB': () => import('@/mastodon/features/ui/components/confirmation_modals/hide_featured_tab').then(module => ({ default: module.ConfirmHideFeaturedTabModal })),
 };
 
 /** @arg {keyof import('@/mastodon/features/account_edit/modals')} type */

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

@@ -232,6 +232,13 @@ class SwitchingColumnsArea extends PureComponent {
 
             <WrappedRoute path={['/@:acct', '/accounts/:id']} exact component={AccountTimeline} content={children} />
             <WrappedRoute path={['/@:acct/featured', '/accounts/:id/featured']} component={AccountFeatured} content={children} />
+            {areCollectionsEnabled() &&
+              [
+                <WrappedRoute path={['/@:acct/collections']} component={Collections} content={children} key='collections-list' />,
+                <WrappedRoute path={['/collections/new', '/collections/:id/edit']} component={CollectionsEditor} content={children} key='collections-editor' />,
+                <WrappedRoute path='/collections/:id' component={CollectionDetail} content={children} key='collections-detail' />,
+              ]
+            }
             <WrappedRoute path='/@:acct/tagged/:tagged?' exact component={AccountTimeline} content={children} />
             <WrappedRoute path={['/@:acct/with_replies', '/accounts/:id/with_replies']} component={AccountTimeline} content={children} componentParams={{ withReplies: true }} />
             <WrappedRoute path={['/accounts/:id/followers', '/users/:acct/followers', '/@:acct/followers']} component={Followers} content={children} />
@@ -255,13 +262,6 @@ class SwitchingColumnsArea extends PureComponent {
             <WrappedRoute path='/followed_tags' component={FollowedTags} content={children} />
             <WrappedRoute path='/mutes' component={Mutes} content={children} />
             <WrappedRoute path='/lists' component={Lists} content={children} />
-            {areCollectionsEnabled() &&
-              [
-                <WrappedRoute path={['/collections/new', '/collections/:id/edit']} component={CollectionsEditor} content={children} key='collections-editor' />,
-                <WrappedRoute path='/collections/:id' component={CollectionDetail} content={children} key='collections-detail' />,
-                <WrappedRoute path='/collections' component={Collections} content={children} key='collections-list' />
-              ]
-            }
             <Route component={BundleColumnError} />
           </WrappedSwitch>
         </ColumnsArea>

app/javascript/mastodon/locales/ar.json

@@ -31,6 +31,7 @@
   "account.disable_notifications": "توقف عن إشعاري عندما ينشر @{name}",
   "account.domain_blocking": "نطاق محظور",
   "account.edit_profile": "تعديل الملف الشخصي",
+  "account.edit_profile_short": "تعديل",
   "account.enable_notifications": "أشعرني عندما ينشر @{name}",
   "account.endorse": "أوصِ به على صفحتك الشخصية",
   "account.familiar_followers_many": "يتبعه {name1}، {name2} و{othersCount, plural, one {شخص آخر تعرفه} other {# أشخاص آخرون تعرفهم}}",
@@ -97,6 +98,27 @@
   "account.unmute": "إلغاء الكَتم عن @{name}",
   "account.unmute_notifications_short": "إلغاء كَتم الإشعارات",
   "account.unmute_short": "إلغاء الكتم",
+  "account_edit.bio.add_label": "إضافة سيرة ذاتية",
+  "account_edit.bio_modal.add_title": "إضافة سيرة ذاتية",
+  "account_edit.custom_fields.add_label": "إضافة حقل",
+  "account_edit.field_actions.edit": "تعديل الحقل",
+  "account_edit.field_delete_modal.delete_button": "حذف",
+  "account_edit.field_edit_modal.value_label": "قيمة",
+  "account_edit.image_alt_modal.text_label": "نص بديل",
+  "account_edit.image_delete_modal.delete_button": "حذف",
+  "account_edit.image_edit.add_button": "إضافة صورة",
+  "account_edit.image_edit.alt_add_button": "إضافة نص بديل",
+  "account_edit.save": "حفظ",
+  "account_edit.upload_modal.back": "العودة",
+  "account_edit.upload_modal.done": "تمّ",
+  "account_edit.upload_modal.next": "التالي",
+  "account_edit.upload_modal.step_upload.dragging": "إسقاط للتحميل",
+  "account_edit.upload_modal.step_upload.header": "اختيار صورة",
+  "account_edit.upload_modal.title_add.avatar": "إضافة صورة الملف الشخصي",
+  "account_edit.upload_modal.title_add.header": "إضافة صورة الغلاف",
+  "account_edit.upload_modal.title_replace.avatar": "استبدال صورة الملف الشخصي",
+  "account_edit.upload_modal.title_replace.header": "استبدال صورة الغلاف",
+  "account_edit_tags.add_tag": "إضافة #{tagName}",
   "account_note.placeholder": "اضغط لإضافة مُلاحظة",
   "admin.dashboard.daily_retention": "معدّل بقاء المستخدمين بعد إنشاء الحسابات، بالأيام",
   "admin.dashboard.monthly_retention": "معدّل بقاء المستخدمين بعد إنشاء الحسابات، بالشهور",
@@ -120,6 +142,9 @@
   "alt_text_modal.describe_for_people_with_visual_impairments": "قم بوصفها للأشخاص ذوي الإعاقة البصرية…",
   "alt_text_modal.done": "تمّ",
   "announcement.announcement": "إعلان",
+  "annual_report.announcement.action_dismiss": "لا شكراً",
+  "annual_report.nav_item.badge": "جديد",
+  "annual_report.shared_page.donate": "تبرع",
   "annual_report.summary.archetype.replier.name": "الفراشة",
   "annual_report.summary.close": "اغلق",
   "annual_report.summary.copy_link": "نسخ الرابط",
@@ -162,11 +187,15 @@
   "closed_registrations_modal.preamble": "ماستدون لامركزي، لذلك بغض النظر عن مكان إنشاء حسابك، سيكون بإمكانك المتابعة والتفاعل مع أي شخص على هذا الخادم. يمكنك حتى أن تستضيفه ذاتياً!",
   "closed_registrations_modal.title": "إنشاء حساب على ماستدون",
   "collections.collection_description": "الوصف",
+  "collections.collection_language": "اللغة",
   "collections.collection_name": "الاسم",
   "collections.collection_topic": "الموضوع",
   "collections.content_warning": "تحذير عن المحتوى",
   "collections.continue": "مواصلة",
   "collections.create.steps": "الخطوة {step}/{total}",
+  "collections.detail.accounts_heading": "الحسابات",
+  "collections.detail.sensitive_content": "محتوى حساس",
+  "collections.edit_details": "تعديل التفاصيل",
   "collections.manage_accounts": "إدارة الحسابات",
   "column.about": "عن",
   "column.blocks": "المُستَخدِمون المَحظورون",
@@ -195,6 +224,9 @@
   "column_header.show_settings": "إظهار الإعدادات",
   "column_header.unpin": "إلغاء التَّثبيت",
   "column_search.cancel": "إلغاء",
+  "combobox.close_results": "إغلاق النتائج",
+  "combobox.loading": "جاري التحميل",
+  "combobox.open_results": "فتح النتائج",
   "community.column_settings.local_only": "المحلي فقط",
   "community.column_settings.media_only": "الوسائط فقط",
   "community.column_settings.remote_only": "عن بُعد فقط",
@@ -268,11 +300,13 @@
   "content_warning.hide": "إخفاء المنشور",
   "content_warning.show": "إظهار على أي حال",
   "content_warning.show_more": "إظهار المزيد",
+  "content_warning.show_short": "إظهار",
   "conversation.delete": "احذف المحادثة",
   "conversation.mark_as_read": "اعتبرها كمقروءة",
   "conversation.open": "اعرض المحادثة",
   "conversation.with": "مع {names}",
   "copy_icon_button.copied": "نُسِخ إلى الحافظة",
+  "copy_icon_button.copy_this_text": "نسخ الرابط إلى الحافظة",
   "copypaste.copied": "تم نسخه",
   "copypaste.copy_to_clipboard": "نسخ إلى الحافظة",
   "directory.federated": "مِن الفديفرس المعروف",
@@ -307,6 +341,8 @@
   "domain_pill.your_server": "موطِنك الرقمي، حيث توجد فيه كافة منشوراتك. ألا يعجبك المكان؟ يمكنك الانتقال بين الخوادم في أي وقت واصطحاب متابعيك أيضاً.",
   "domain_pill.your_username": "معرفك الفريد على هذا الخادم. من الممكن العثور على مستخدمين بنفس إسم المستخدم على خوادم مختلفة.",
   "dropdown.empty": "حدد خيارا",
+  "email_subscriptions.email": "البريد الإلكتروني",
+  "email_subscriptions.form.action": "اشترك",
   "embed.instructions": "يمكنكم إدماج هذا المنشور على موقعكم الإلكتروني عن طريق نسخ الشفرة أدناه.",
   "embed.preview": "إليك ما سيبدو عليه:",
   "emoji_button.activity": "الأنشطة",
@@ -324,7 +360,6 @@
   "emoji_button.search_results": "نتائج البحث",
   "emoji_button.symbols": "رموز",
   "emoji_button.travel": "الأماكن والسفر",
-  "empty_column.account_featured.other": "{acct} لم يعرض أي شيء حتى الآن. هل تعلم أنه يمكنك عرض الهاشتاقات التي تستخدمها، وحتى حسابات أصدقاءك على ملفك الشخصي؟",
   "empty_column.account_hides_collections": "اختار هذا المستخدم عدم إتاحة هذه المعلومات للعامة",
   "empty_column.account_suspended": "حساب معلق",
   "empty_column.account_timeline": "لا توجد منشورات هنا!",
@@ -346,6 +381,7 @@
   "empty_column.notification_requests": "لا يوجد شيء هنا. عندما تتلقى إشعارات جديدة، سوف تظهر هنا وفقًا لإعداداتك.",
   "empty_column.notifications": "لم تتلق أي إشعار بعدُ. تفاعل مع المستخدمين الآخرين لإنشاء محادثة.",
   "empty_column.public": "لا يوجد أي شيء هنا! قم بنشر شيء ما للعامة، أو اتبع المستخدمين الآخرين المتواجدين على الخوادم الأخرى لملء خيط المحادثات",
+  "empty_state.no_results": "لا توجد نتائج",
   "error.unexpected_crash.explanation": "نظرا لوجود خطأ في التعليمات البرمجية أو مشكلة توافق مع المتصفّح، تعذر عرض هذه الصفحة بشكل صحيح.",
   "error.unexpected_crash.explanation_addons": "لا يمكن عرض هذه الصفحة بشكل صحيح. من المحتمل أن يكون هذا الخطأ بسبب إضافة متصفح أو أدوات ترجمة تلقائية.",
   "error.unexpected_crash.next_steps": "حاول إعادة إنعاش الصفحة. إن لم تُحلّ المشكلة، يمكنك دائمًا استخدام ماستدون عبر متصفّح آخر أو تطبيق أصلي.",
@@ -358,6 +394,8 @@
   "explore.trending_statuses": "المنشورات",
   "explore.trending_tags": "وُسُوم",
   "featured_carousel.header": "{count, plural, zero {}one {منشور معروض} two {منشور معروضَين} few {منشورات معروضة} many {منشورات معروضة} other {منشورات معروضة}}",
+  "featured_tags.suggestions.add": "إضافة",
+  "featured_tags.suggestions.dismiss": "لا شكراً",
   "filter_modal.added.context_mismatch_explanation": "فئة عامل التصفية هذه لا تنطبق على السياق الذي وصلت فيه إلى هذه المشاركة. إذا كنت ترغب في تصفية المنشور في هذا السياق أيضا، فسيتعين عليك تعديل عامل التصفية.",
   "filter_modal.added.context_mismatch_title": "عدم تطابق السياق!",
   "filter_modal.added.expired_explanation": "انتهت صلاحية فئة عامل التصفية هذه، سوف تحتاج إلى تغيير تاريخ انتهاء الصلاحية لتطبيقها.",
@@ -867,6 +905,8 @@
   "status.cancel_reblog_private": "إلغاء إعادة النشر",
   "status.cannot_quote": "غير مصرح لك باقتباس هذا المنشور",
   "status.cannot_reblog": "لا يمكن إعادة نشر هذا المنشور",
+  "status.context.retry": "حاول مجددًا",
+  "status.context.show": "إظهار",
   "status.continued_thread": "تكملة للخيط",
   "status.copy": "انسخ رابط الرسالة",
   "status.delete": "احذف",

app/javascript/mastodon/locales/be.json

@@ -45,6 +45,7 @@
   "account.featured": "Выбранае",
   "account.featured.accounts": "Профілі",
   "account.featured.collections": "Калекцыі",
+  "account.featured.new_collection": "Новая калекцыя",
   "account.field_overflow": "Паказаць усё змесціва",
   "account.filters.all": "Уся актыўнасць",
   "account.filters.boosts_toggle": "Паказваць пашырэнні",
@@ -416,7 +417,6 @@
   "column.about": "Пра нас",
   "column.blocks": "Заблакіраваныя карыстальнікі",
   "column.bookmarks": "Закладкі",
-  "column.collections": "Мае калекцыі",
   "column.community": "Лакальная стужка",
   "column.create_list": "Стварыць спіс",
   "column.direct": "Прыватныя згадванні",
@@ -432,7 +432,9 @@
   "column.list_members": "Кіраванне ўдзельнікамі спіса",
   "column.lists": "Спісы",
   "column.mutes": "Ігнараваныя карыстальнікі",
+  "column.my_collections": "Мае калекцыі",
   "column.notifications": "Апавяшчэнні",
+  "column.other_collections": "Калекцыі {name}",
   "column.pins": "Замацаваныя допісы",
   "column.public": "Інтэграваная стужка",
   "column_back_button.label": "Назад",
@@ -502,6 +504,10 @@
   "confirmations.follow_to_list.confirm": "Падпісацца і дадаць у спіс",
   "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} і іншых сервераў з апошняй версіяй Mastodon. Яе адлюстраванне на іншых серверах можа адрознівацца.",
+  "confirmations.hide_featured_tab.title": "Схаваць укладку \"Выбранае\"?",
   "confirmations.logout.confirm": "Выйсці",
   "confirmations.logout.message": "Вы ўпэўненыя, што хочаце выйсці?",
   "confirmations.logout.title": "Выйсці?",
@@ -606,14 +612,13 @@
   "emoji_button.search_results": "Вынікі пошуку",
   "emoji_button.symbols": "Сімвалы",
   "emoji_button.travel": "Падарожжы і месцы",
-  "empty_column.account_featured.other": "{acct} яшчэ нічога не адабраў для паказу. Ці ведалі Вы, што ў сваім профілі Вы можаце паказаць свае хэштэгі, якімі найбольш карыстаецеся, і нават профілі сваіх сяброў?",
+  "empty_column.account_featured.other": "{acct} пакуль нічога не адабраў(-ла) для паказу.",
-  "empty_column.account_featured_other.no_collections_desc": "{acct} пакуль не стварыў(-ла) аніводнай калекцыі.",
-  "empty_column.account_featured_other.title": "Тут нічога няма",
-  "empty_column.account_featured_self.no_collections": "Пакуль няма калекцый",
   "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": "Калекцыі (новая функцыя Mastodon 4.6) дазволяць Вам ствараць свае ўласныя спісы ўліковых запісаў, каб раіць іх іншым.",
-  "empty_column.account_featured_unknown.no_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": "Уліковы запіс прыпынены",

app/javascript/mastodon/locales/ca.json

@@ -219,7 +219,6 @@
   "column.about": "Quant a",
   "column.blocks": "Usuaris blocats",
   "column.bookmarks": "Marcadors",
-  "column.collections": "Les meves coŀleccions",
   "column.community": "Línia de temps local",
   "column.create_list": "Crea una llista",
   "column.direct": "Mencions privades",
@@ -388,7 +387,6 @@
   "emoji_button.search_results": "Resultats de la cerca",
   "emoji_button.symbols": "Símbols",
   "emoji_button.travel": "Viatges i llocs",
-  "empty_column.account_featured.other": "{acct} encara no ha destacat res. Sabeu que podeu destacar les etiquetes que més feu servir i fins i tot els comptes dels vostres amics al vostre perfil?",
   "empty_column.account_hides_collections": "Aquest usuari ha decidit no mostrar aquesta informació",
   "empty_column.account_suspended": "Compte suspès",
   "empty_column.account_timeline": "No hi ha tuts aquí!",

app/javascript/mastodon/locales/cs.json

@@ -266,7 +266,6 @@
   "column.about": "O aplikaci",
   "column.blocks": "Blokovaní uživatelé",
   "column.bookmarks": "Záložky",
-  "column.collections": "Mé sbírky",
   "column.community": "Místní časová osa",
   "column.create_list": "Vytvořit seznam",
   "column.direct": "Soukromé zmínky",
@@ -439,7 +438,6 @@
   "emoji_button.search_results": "Výsledky hledání",
   "emoji_button.symbols": "Symboly",
   "emoji_button.travel": "Cestování a místa",
-  "empty_column.account_featured.other": "{acct} zatím nic nezvýraznili. Věděli jste, že na svém profilu můžete zvýraznit hashtagy, které používáte nejvíce, a dokonce účty vašich přátel?",
   "empty_column.account_hides_collections": "Tento uživatel se rozhodl tuto informaci nezveřejňovat",
   "empty_column.account_suspended": "Účet je pozastaven",
   "empty_column.account_timeline": "Nejsou tu žádné příspěvky!",

app/javascript/mastodon/locales/cy.json

@@ -383,7 +383,6 @@
   "column.about": "Ynghylch",
   "column.blocks": "Defnyddwyr wedi'u rhwystro",
   "column.bookmarks": "Llyfrnodau",
-  "column.collections": "Fy nghasgliadau",
   "column.community": "Ffrwd lleol",
   "column.create_list": "Creu rhestr",
   "column.direct": "Crybwylliadau preifat",
@@ -564,7 +563,6 @@
   "emoji_button.search_results": "Canlyniadau chwilio",
   "emoji_button.symbols": "Symbolau",
   "emoji_button.travel": "Teithio a Llefydd",
-  "empty_column.account_featured.other": "Dyw {acct} heb gynnwys unrhyw beth eto. Oeddech chi'n gwybod y gallwch chi gynnwys yr hashnodau rydych chi'n eu defnyddio fwyaf, a hyd yn oed cyfrifon eich ffrindiau ar eich proffil?",
   "empty_column.account_hides_collections": "Mae'r defnyddiwr wedi dewis i beidio rhannu'r wybodaeth yma",
   "empty_column.account_suspended": "Cyfrif wedi'i atal",
   "empty_column.account_timeline": "Dim postiadau yma!",

app/javascript/mastodon/locales/da.json

@@ -45,6 +45,7 @@
   "account.featured": "Fremhævet",
   "account.featured.accounts": "Profiler",
   "account.featured.collections": "Samlinger",
+  "account.featured.new_collection": "Ny samling",
   "account.field_overflow": "Vis fuldt indhold",
   "account.filters.all": "Al aktivitet",
   "account.filters.boosts_toggle": "Vis fremhævelser",
@@ -416,7 +417,6 @@
   "column.about": "Om",
   "column.blocks": "Blokerede brugere",
   "column.bookmarks": "Bogmærker",
-  "column.collections": "Mine samlinger",
   "column.community": "Lokal tidslinje",
   "column.create_list": "Opret liste",
   "column.direct": "Private omtaler",
@@ -432,7 +432,9 @@
   "column.list_members": "Håndtér listemedlemmer",
   "column.lists": "Lister",
   "column.mutes": "Skjulte brugere",
+  "column.my_collections": "Mine samlinger",
   "column.notifications": "Notifikationer",
+  "column.other_collections": "Samlinger af {name}",
   "column.pins": "Fastgjorte indlæg",
   "column.public": "Fælles tidslinje",
   "column_back_button.label": "Tilbage",
@@ -502,6 +504,10 @@
   "confirmations.follow_to_list.confirm": "Følg og føj til liste",
   "confirmations.follow_to_list.message": "Du skal følge {name} for at føje vedkommende til en liste.",
   "confirmations.follow_to_list.title": "Følg bruger?",
+  "confirmations.hide_featured_tab.confirm": "Skjul fane",
+  "confirmations.hide_featured_tab.intro": "Du kan til enhver tid ændre dette under <i>Rediger profil > Indstillinger for profil-fane</i>.",
+  "confirmations.hide_featured_tab.message": "Dette vil skjule fanen for brugere på {serverName} og andre servere, der kører den nyeste version af Mastodon. Andre visninger kan variere.",
+  "confirmations.hide_featured_tab.title": "Skjul fanen \"Fremhævet\"?",
   "confirmations.logout.confirm": "Log ud",
   "confirmations.logout.message": "Er du sikker på, at du vil logge ud?",
   "confirmations.logout.title": "Log ud?",
@@ -606,14 +612,13 @@
   "emoji_button.search_results": "Søgeresultater",
   "emoji_button.symbols": "Symboler",
   "emoji_button.travel": "Rejser og steder",
-  "empty_column.account_featured.other": "{acct} har ikke fremhævet noget endnu. Vidste du, at du kan fremhæve dine mest brugte hashtags og endda din vens konti på din profil?",
+  "empty_column.account_featured.other": "{acct} har ikke fremhævet noget endnu.",
-  "empty_column.account_featured_other.no_collections_desc": "{acct} har endnu ikke oprettet nogen samlinger.",
-  "empty_column.account_featured_other.title": "Intet at se her",
-  "empty_column.account_featured_self.no_collections": "Ingen samlinger endnu",
   "empty_column.account_featured_self.no_collections_button": "Opret en samling",
+  "empty_column.account_featured_self.no_collections_hide_tab": "Skjul denne fane i stedet",
   "empty_column.account_featured_self.pre_collections": "Hold udkig efter Samlinger",
   "empty_column.account_featured_self.pre_collections_desc": "Med samlinger (kommer i Mastodon 4.6) kan du oprette dine egne kuraterede lister over konti, som du kan anbefale til andre.",
-  "empty_column.account_featured_unknown.no_collections_desc": "Denne konto har endnu ikke oprettet nogen samlinger.",
+  "empty_column.account_featured_self.showcase_accounts": "Vis dine favoritkonti",
+  "empty_column.account_featured_self.showcase_accounts_desc": "Samlinger er kuraterede lister over konti, der skal hjælpe andre med at opdage mere af Fediverset.",
   "empty_column.account_featured_unknown.other": "Denne konto har ikke fremhævet noget endnu.",
   "empty_column.account_hides_collections": "Brugeren har valgt ikke at gøre denne information tilgængelig",
   "empty_column.account_suspended": "Konto suspenderet",

app/javascript/mastodon/locales/de.json

@@ -45,6 +45,7 @@
   "account.featured": "Vorgestellt",
   "account.featured.accounts": "Profile",
   "account.featured.collections": "Sammlungen",
+  "account.featured.new_collection": "Neue Sammlung",
   "account.field_overflow": "Vollständigen Inhalt anzeigen",
   "account.filters.all": "Alle Aktivitäten",
   "account.filters.boosts_toggle": "Geteilte Beiträge anzeigen",
@@ -416,7 +417,6 @@
   "column.about": "Über",
   "column.blocks": "Blockierte Profile",
   "column.bookmarks": "Lesezeichen",
-  "column.collections": "Meine Sammlungen",
   "column.community": "Lokale Timeline",
   "column.create_list": "Liste erstellen",
   "column.direct": "Private Erwähnungen",
@@ -432,7 +432,9 @@
   "column.list_members": "Listenmitglieder verwalten",
   "column.lists": "Listen",
   "column.mutes": "Stummgeschaltete Profile",
+  "column.my_collections": "Meine Sammlungen",
   "column.notifications": "Benachrichtigungen",
+  "column.other_collections": "Sammlungen von {name}",
   "column.pins": "Angeheftete Beiträge",
   "column.public": "Föderierte Timeline",
   "column_back_button.label": "Zurück",
@@ -502,6 +504,10 @@
   "confirmations.follow_to_list.confirm": "Folgen und zur Liste hinzufügen",
   "confirmations.follow_to_list.message": "Du musst {name} folgen, um das Profil zu einer Liste hinzufügen zu können.",
   "confirmations.follow_to_list.title": "Profil folgen?",
+  "confirmations.hide_featured_tab.confirm": "Tab ausblenden",
+  "confirmations.hide_featured_tab.intro": "Du kannst die Einstellungen jederzeit unter <i>Profil bearbeiten > Profil-Tab-Einstellungen</i> ändern.",
+  "confirmations.hide_featured_tab.message": "Dieser Tab wird auf {serverName} und anderen Servern mit der neuesten Mastodon-Version nicht angezeigt. Darstellung kann darüber hinaus abweichen.",
+  "confirmations.hide_featured_tab.title": "„Vorgestellt“-Tab ausblenden?",
   "confirmations.logout.confirm": "Abmelden",
   "confirmations.logout.message": "Möchtest du dich wirklich ausloggen?",
   "confirmations.logout.title": "Abmelden?",
@@ -606,14 +612,13 @@
   "emoji_button.search_results": "Suchergebnisse",
   "emoji_button.symbols": "Symbole",
   "emoji_button.travel": "Reisen & Orte",
-  "empty_column.account_featured.other": "{acct} hat bisher noch nichts vorgestellt. Wusstest du, dass du deine häufig verwendeten Hashtags und sogar Profile von Freund*innen vorstellen kannst?",
+  "empty_column.account_featured.other": "{acct} hat noch nichts vorgestellt.",
-  "empty_column.account_featured_other.no_collections_desc": "{acct} hat noch keine Sammlungen erstellt.",
-  "empty_column.account_featured_other.title": "Hier gibt es nichts zu sehen",
-  "empty_column.account_featured_self.no_collections": "Noch keine Sammlungen",
   "empty_column.account_featured_self.no_collections_button": "Sammlung erstellen",
+  "empty_column.account_featured_self.no_collections_hide_tab": "Diesen Tab ausblenden",
   "empty_column.account_featured_self.pre_collections": "Sammlungen sind bald verfügbar",
   "empty_column.account_featured_self.pre_collections_desc": "Mit Sammlungen (neue Funktion in Mastodon 4.6) kannst du deine eigenen kuratierten Listen erstellen, um ausgewählte Konten zu empfehlen.",
-  "empty_column.account_featured_unknown.no_collections_desc": "Dieser Account hat noch keine Sammlungen erstellt.",
+  "empty_column.account_featured_self.showcase_accounts": "Präsentiere deine liebsten Konten",
+  "empty_column.account_featured_self.showcase_accounts_desc": "Sammlungen sind kuratierte Listen, die anderen helfen, mehr Konten im Fediverse zu entdecken.",
   "empty_column.account_featured_unknown.other": "Dieser Account hat noch nichts vorgestellt.",
   "empty_column.account_hides_collections": "Das Profil hat sich entschieden, diese Information nicht zu veröffentlichen",
   "empty_column.account_suspended": "Konto dauerhaft gesperrt",

app/javascript/mastodon/locales/el.json

@@ -45,6 +45,7 @@
   "account.featured": "Αναδεδειγμένα",
   "account.featured.accounts": "Προφίλ",
   "account.featured.collections": "Συλλογές",
+  "account.featured.new_collection": "Νέα συλλογή",
   "account.field_overflow": "Εμφάνιση πλήρους περιεχομένου",
   "account.filters.all": "Όλη η δραστηριότητα",
   "account.filters.boosts_toggle": "Εμφάνιση ενισχύσεων",
@@ -217,7 +218,7 @@
   "account_edit.profile_tab.show_media_replies.description": "Όταν ενεργοποιηθεί, η καρτέλα Πολυμέσα εμφανίζει τόσο τις αναρτήσεις σας όσο και τις απαντήσεις σας σε αναρτήσεις άλλων ατόμων.",
   "account_edit.profile_tab.show_media_replies.title": "Συμπερίληψη απαντήσεων στην καρτέλα «Πολυμέσα»",
   "account_edit.profile_tab.subtitle": "Προσαρμόστε τις καρτέλες στο προφίλ σας και τι εμφανίζουν.",
-  "account_edit.profile_tab.title": "Ρυθμίσεις καρτέλας προφίλ",
+  "account_edit.profile_tab.title": "Ρυθμίσεις καρτελών προφίλ",
   "account_edit.save": "Αποθήκευση",
   "account_edit.upload_modal.back": "Πίσω",
   "account_edit.upload_modal.done": "Έγινε",
@@ -416,7 +417,6 @@
   "column.about": "Σχετικά με",
   "column.blocks": "Αποκλεισμένοι χρήστες",
   "column.bookmarks": "Σελιδοδείκτες",
-  "column.collections": "Οι συλλογές μου",
   "column.community": "Τοπική ροή",
   "column.create_list": "Δημιουργία λίστας",
   "column.direct": "Ιδιωτικές επισημάνσεις",
@@ -432,7 +432,9 @@
   "column.list_members": "Διαχείριση μελών λίστας",
   "column.lists": "Λίστες",
   "column.mutes": "Αποσιωπημένοι χρήστες",
+  "column.my_collections": "Οι συλλογές μου",
   "column.notifications": "Ειδοποιήσεις",
+  "column.other_collections": "Συλλογές από {name}",
   "column.pins": "Καρφιτσωμένες αναρτήσεις",
   "column.public": "Ομοσπονδιακή ροή",
   "column_back_button.label": "Πίσω",
@@ -502,6 +504,10 @@
   "confirmations.follow_to_list.confirm": "Ακολούθησε και πρόσθεσε στη λίστα",
   "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} και σε άλλους διακομιστές που εκτελούν την τελευταία έκδοση του Mastodon. Άλλες εμφανίσεις μπορεί να ποικίλλουν.",
+  "confirmations.hide_featured_tab.title": "Απόκρυψη καρτέλας \"Αναδεδειγμένα\";",
   "confirmations.logout.confirm": "Αποσύνδεση",
   "confirmations.logout.message": "Σίγουρα θέλεις να αποσυνδεθείς;",
   "confirmations.logout.title": "Αποσύνδεση;",
@@ -606,14 +612,13 @@
   "emoji_button.search_results": "Αποτελέσματα αναζήτησης",
   "emoji_button.symbols": "Σύμβολα",
   "emoji_button.travel": "Ταξίδια & Τοποθεσίες",
-  "empty_column.account_featured.other": "Ο/Η {acct} δεν έχει αναδείξει τίποτα ακόμη. Γνώριζες ότι μπορείς να αναδείξεις τις ετικέτες που χρησιμοποιείς περισσότερο, ακόμη και τους λογαριασμούς των φίλων σου στο προφίλ σου;",
+  "empty_column.account_featured.other": "Ο/Η {acct} δεν έχει αναδείξει τίποτα ακόμη.",
-  "empty_column.account_featured_other.no_collections_desc": "Ο χρήστης {acct} δεν έχει δημιουργήσει ακόμη καμία συλλογή.",
-  "empty_column.account_featured_other.title": "Δεν υπάρχει τίποτα να δείτε εδώ",
-  "empty_column.account_featured_self.no_collections": "Καμία συλλογή ακόμη",
   "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": "Οι Συλλογές (που έρχονται στο Mastodon 4.6) σας επιτρέπουν να δημιουργήσετε τις δικές σας επιμελημένες λίστες λογαριασμών για να συστήσετε σε άλλους.",
+  "empty_column.account_featured_self.pre_collections_desc": "Οι Συλλογές (που έρχονται στο Mastodon 4.6) επιτρέπουν να δημιουργήσετε τις δικές σας επιμελημένες λίστες λογαριασμών για να συστήσετε σε άλλους.",
-  "empty_column.account_featured_unknown.no_collections_desc": "Αυτός ο λογαριασμός δεν έχει δημιουργήσει ακόμη καμία συλλογή.",
+  "empty_column.account_featured_self.showcase_accounts": "Παρουσιάστε τους αγαπημένους σας λογαριασμούς",
+  "empty_column.account_featured_self.showcase_accounts_desc": "Οι συλλογές είναι επιμελημένες λίστες λογαριασμών για να βοηθήσουν άλλους να ανακαλύψουν περισσότερα από το Fediverse.",
   "empty_column.account_featured_unknown.other": "Αυτός ο λογαριασμός δεν έχει αναδείξει τίποτα ακόμη.",
   "empty_column.account_hides_collections": "Αυτός ο χρήστης έχει επιλέξει να μην καταστήσει αυτές τις πληροφορίες διαθέσιμες",
   "empty_column.account_suspended": "Λογαριασμός σε αναστολή",

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

@@ -45,6 +45,7 @@
   "account.featured": "Featured",
   "account.featured.accounts": "Profiles",
   "account.featured.collections": "Collections",
+  "account.featured.new_collection": "New collection",
   "account.field_overflow": "Show full content",
   "account.filters.all": "All activity",
   "account.filters.boosts_toggle": "Show boosts",
@@ -102,6 +103,7 @@
   "account.muted": "Muted",
   "account.muting": "Muting",
   "account.mutual": "You follow each other",
+  "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 clients, you can interact with people on other Mastodon servers – and with anyone on other social apps powered by the same set of rules as Mastodon uses (the ActivityPub protocol).",
@@ -138,6 +140,9 @@
   "account.unmute": "Unmute @{name}",
   "account.unmute_notifications_short": "Unmute notifications",
   "account.unmute_short": "Unmute",
+  "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": "",
   "account_edit.bio.edit_label": "Edit bio",
   "account_edit.bio.placeholder": "Add a short introduction to help others identify you.",
@@ -346,7 +351,7 @@
   "closed_registrations_modal.find_another_server": "Find another server",
   "closed_registrations_modal.preamble": "Mastodon is decentralised, so no matter where you create your account, you will be able to follow and interact with anyone on this server. You can even self-host it!",
   "closed_registrations_modal.title": "Signing up on Mastodon",
-  "collection.share_modal.share_link_label": "Invite share link",
+  "collection.share_modal.share_link_label": "Share link",
   "collection.share_modal.share_via_post": "Post on Mastodon",
   "collection.share_modal.share_via_system": "Share to…",
   "collection.share_modal.title": "Share collection",
@@ -380,6 +385,7 @@
   "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.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 your collections.",
   "collections.hints.accounts_counter": "{count} / {max} accounts",
@@ -411,7 +417,6 @@
   "column.about": "About",
   "column.blocks": "Blocked users",
   "column.bookmarks": "Bookmarks",
-  "column.collections": "My collections",
   "column.community": "Local timeline",
   "column.create_list": "Create list",
   "column.direct": "Private mentions",
@@ -427,7 +432,9 @@
   "column.list_members": "Manage list members",
   "column.lists": "Lists",
   "column.mutes": "Muted users",
+  "column.my_collections": "My collections",
   "column.notifications": "Notifications",
+  "column.other_collections": "Collections by {name}",
   "column.pins": "Pinned posts",
   "column.public": "Federated timeline",
   "column_back_button.label": "Back",
@@ -497,6 +504,10 @@
   "confirmations.follow_to_list.confirm": "Follow and add to list",
   "confirmations.follow_to_list.message": "You need to be following {name} to add them to a list.",
   "confirmations.follow_to_list.title": "Follow user?",
+  "confirmations.hide_featured_tab.confirm": "Hide tab",
+  "confirmations.hide_featured_tab.intro": "You can change this at any time under <i>Edit profile > Profile tab settings</i>.",
+  "confirmations.hide_featured_tab.message": "This will hide the tab for users on {serverName} and other servers running the latest version of Mastodon. Other displays may vary.",
+  "confirmations.hide_featured_tab.title": "Hide \"Featured\" tab?",
   "confirmations.logout.confirm": "Log out",
   "confirmations.logout.message": "Are you sure you want to log out?",
   "confirmations.logout.title": "Log out?",
@@ -535,6 +546,7 @@
   "content_warning.hide": "Hide post",
   "content_warning.show": "Show anyway",
   "content_warning.show_more": "Show more",
+  "content_warning.show_short": "Show",
   "conversation.delete": "Delete conversation",
   "conversation.mark_as_read": "Mark as read",
   "conversation.open": "View conversation",
@@ -575,6 +587,14 @@
   "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",
+  "email_subscriptions.form.bottom": "Get posts in your inbox without creating a Mastodon account. Unsubscribe at any time. For more information, refer to the <a>Privacy Policy</a>.",
+  "email_subscriptions.form.title": "Sign up for email updates from {name}",
+  "email_subscriptions.submitted.lead": "Check your inbox for an email to finish signing up for email updates.",
+  "email_subscriptions.submitted.title": "One more step",
+  "email_subscriptions.validation.email.blocked": "Blocked email provider",
+  "email_subscriptions.validation.email.invalid": "Invalid email address",
   "embed.instructions": "Embed this post on your website by copying the code below.",
   "embed.preview": "Here is what it will look like:",
   "emoji_button.activity": "Activity",
@@ -592,7 +612,14 @@
   "emoji_button.search_results": "Search results",
   "emoji_button.symbols": "Symbols",
   "emoji_button.travel": "Travel & Places",
-  "empty_column.account_featured.other": "{acct} has not featured anything yet. Did you know that you can feature your hashtags you use the most, and even your friend’s accounts on your profile?",
+  "empty_column.account_featured.other": "{acct} has not featured anything yet.",
+  "empty_column.account_featured_self.no_collections_button": "Create a collection",
+  "empty_column.account_featured_self.no_collections_hide_tab": "Hide this tab instead",
+  "empty_column.account_featured_self.pre_collections": "Stay tuned for Collections",
+  "empty_column.account_featured_self.pre_collections_desc": "Collections (coming in Mastodon 4.6) allow you to create your own curated lists of accounts to recommend to others.",
+  "empty_column.account_featured_self.showcase_accounts": "Showcase your favourite accounts",
+  "empty_column.account_featured_self.showcase_accounts_desc": "Collections are curated lists of accounts to help others discover more of the Fediverse.",
+  "empty_column.account_featured_unknown.other": "This account hasn’t featured anything yet.",
   "empty_column.account_hides_collections": "This user has chosen not to make this information available",
   "empty_column.account_suspended": "Account suspended",
   "empty_column.account_timeline": "No posts here!",
@@ -632,6 +659,10 @@
   "featured_carousel.header": "{count, plural, one {Pinned Post} other {Pinned Posts}}",
   "featured_carousel.slide": "Post {current, number} of {max, number}",
   "featured_tags.more_items": "+{count}",
+  "featured_tags.suggestions": "Lately you’ve posted about {items}. Add these as featured hashtags?",
+  "featured_tags.suggestions.add": "Add",
+  "featured_tags.suggestions.added": "Manage your featured hashtags at any time under <link>Edit Profile > Featured hashtags</link>.",
+  "featured_tags.suggestions.dismiss": "No thanks",
   "filter_modal.added.context_mismatch_explanation": "This filter category does not apply to the context in which you have accessed this post. If you want the post to be filtered in this context too, you will have to edit the filter.",
   "filter_modal.added.context_mismatch_title": "Context mismatch!",
   "filter_modal.added.expired_explanation": "This filter category has expired, you will need to change the expiration date for it to apply.",
@@ -674,7 +705,9 @@
   "follow_suggestions.who_to_follow": "Who to follow",
   "followed_tags": "Followed hashtags",
   "followers.hide_other_followers": "This user has chosen not to make their other followers visible",
+  "followers.title": "Following {name}",
   "following.hide_other_following": "This user has chosen not to make the rest of who they follow visible",
+  "following.title": "Followed by {name}",
   "footer.about": "About",
   "footer.about_mastodon": "About Mastodon",
   "footer.about_server": "About {domain}",
@@ -686,6 +719,7 @@
   "footer.source_code": "View source code",
   "footer.status": "Status",
   "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",

app/javascript/mastodon/locales/en.json

@@ -45,6 +45,7 @@
   "account.featured": "Featured",
   "account.featured.accounts": "Profiles",
   "account.featured.collections": "Collections",
+  "account.featured.new_collection": "New collection",
   "account.field_overflow": "Show full content",
   "account.filters.all": "All activity",
   "account.filters.boosts_toggle": "Show boosts",
@@ -350,7 +351,7 @@
   "closed_registrations_modal.find_another_server": "Find another server",
   "closed_registrations_modal.preamble": "Mastodon is decentralized, so no matter where you create your account, you will be able to follow and interact with anyone on this server. You can even self-host it!",
   "closed_registrations_modal.title": "Signing up on Mastodon",
-  "collection.share_modal.share_link_label": "Invite share link",
+  "collection.share_modal.share_link_label": "Share link",
   "collection.share_modal.share_via_post": "Post on Mastodon",
   "collection.share_modal.share_via_system": "Share to…",
   "collection.share_modal.title": "Share collection",
@@ -416,7 +417,6 @@
   "column.about": "About",
   "column.blocks": "Blocked users",
   "column.bookmarks": "Bookmarks",
-  "column.collections": "My collections",
   "column.community": "Local timeline",
   "column.create_list": "Create list",
   "column.direct": "Private mentions",
@@ -432,7 +432,9 @@
   "column.list_members": "Manage list members",
   "column.lists": "Lists",
   "column.mutes": "Muted users",
+  "column.my_collections": "My collections",
   "column.notifications": "Notifications",
+  "column.other_collections": "Collections by {name}",
   "column.pins": "Pinned posts",
   "column.public": "Federated timeline",
   "column_back_button.label": "Back",
@@ -502,6 +504,10 @@
   "confirmations.follow_to_list.confirm": "Follow and add to list",
   "confirmations.follow_to_list.message": "You need to be following {name} to add them to a list.",
   "confirmations.follow_to_list.title": "Follow user?",
+  "confirmations.hide_featured_tab.confirm": "Hide tab",
+  "confirmations.hide_featured_tab.intro": "You can change this at any time under <i>Edit profile > Profile tab settings</i>.",
+  "confirmations.hide_featured_tab.message": "This will hide the tab for users on {serverName} and other servers running the latest version of Mastodon. Other displays may vary.",
+  "confirmations.hide_featured_tab.title": "Hide \"Featured\" tab?",
   "confirmations.logout.confirm": "Log out",
   "confirmations.logout.message": "Are you sure you want to log out?",
   "confirmations.logout.title": "Log out?",
@@ -606,14 +612,13 @@
   "emoji_button.search_results": "Search results",
   "emoji_button.symbols": "Symbols",
   "emoji_button.travel": "Travel & Places",
-  "empty_column.account_featured.other": "{acct} has not featured anything yet. Did you know that you can feature your hashtags you use the most, and even your friend’s accounts on your profile?",
+  "empty_column.account_featured.other": "{acct} has not featured anything yet.",
-  "empty_column.account_featured_other.no_collections_desc": "{acct} hasn’t created any collections yet.",
-  "empty_column.account_featured_other.title": "Nothing to see here",
-  "empty_column.account_featured_self.no_collections": "No collections yet",
   "empty_column.account_featured_self.no_collections_button": "Create a collection",
+  "empty_column.account_featured_self.no_collections_hide_tab": "Hide this tab instead",
   "empty_column.account_featured_self.pre_collections": "Stay tuned for Collections",
-  "empty_column.account_featured_self.pre_collections_desc": "Collections (coming in Mastodon 4.6) allows you to create your own curated lists of accounts to recommend to others.",
+  "empty_column.account_featured_self.pre_collections_desc": "Collections (coming in Mastodon 4.6) allow you to create your own curated lists of accounts to recommend to others.",
-  "empty_column.account_featured_unknown.no_collections_desc": "This account hasn’t created any collections yet.",
+  "empty_column.account_featured_self.showcase_accounts": "Showcase your favorite accounts",
+  "empty_column.account_featured_self.showcase_accounts_desc": "Collections are curated lists of accounts to help others discover more of the Fediverse.",
   "empty_column.account_featured_unknown.other": "This account hasn’t featured anything yet.",
   "empty_column.account_hides_collections": "This user has chosen to not make this information available",
   "empty_column.account_suspended": "Account suspended",
@@ -898,6 +903,7 @@
   "navigation_panel.expand_followed_tags": "Expand followed hashtags menu",
   "navigation_panel.expand_lists": "Expand list menu",
   "not_signed_in_indicator.not_signed_in": "You need to login to access this resource.",
+  "notification.added_to_collection": "{name} added you to a collection",
   "notification.admin.report": "{name} reported {target}",
   "notification.admin.report_account": "{name} reported {count, plural, one {one post} other {# posts}} from {target} for {category}",
   "notification.admin.report_account_other": "{name} reported {count, plural, one {one post} other {# posts}} from {target}",
@@ -907,6 +913,7 @@
   "notification.admin.sign_up.name_and_others": "{name} and {count, plural, one {# other} other {# others}} signed up",
   "notification.annual_report.message": "Your {year} #Wrapstodon awaits! Unveil your year's highlights and memorable moments on Mastodon!",
   "notification.annual_report.view": "View #Wrapstodon",
+  "notification.collection_update": "{name} edited a collection you’re in",
   "notification.favourite": "{name} favorited your post",
   "notification.favourite.name_and_others_with_link": "{name} and <a>{count, plural, one {# other} other {# others}}</a> favorited your post",
   "notification.favourite_pm": "{name} favorited your private mention",

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

@@ -45,6 +45,7 @@
   "account.featured": "Destacados",
   "account.featured.accounts": "Perfiles",
   "account.featured.collections": "Colecciones",
+  "account.featured.new_collection": "Nueva colección",
   "account.field_overflow": "Mostrar contenido completo",
   "account.filters.all": "Toda la actividad",
   "account.filters.boosts_toggle": "Mostrar adhesiones",
@@ -416,7 +417,6 @@
   "column.about": "Información",
   "column.blocks": "Usuarios bloqueados",
   "column.bookmarks": "Marcadores",
-  "column.collections": "Mis colecciones",
   "column.community": "Línea temporal local",
   "column.create_list": "Crear lista",
   "column.direct": "Menciones privadas",
@@ -432,7 +432,9 @@
   "column.list_members": "Administrar miembros de la lista",
   "column.lists": "Listas",
   "column.mutes": "Usuarios silenciados",
+  "column.my_collections": "Mis colecciones",
   "column.notifications": "Notificaciones",
+  "column.other_collections": "Colecciones de {name}",
   "column.pins": "Mensajes fijados",
   "column.public": "Línea temporal federada",
   "column_back_button.label": "Volver",
@@ -502,6 +504,10 @@
   "confirmations.follow_to_list.confirm": "Seguir y agregar a la lista",
   "confirmations.follow_to_list.message": "Necesitás seguir a {name} para agregarle a una lista.",
   "confirmations.follow_to_list.title": "¿Querés seguirle?",
+  "confirmations.hide_featured_tab.confirm": "Ocultar pestaña",
+  "confirmations.hide_featured_tab.intro": "Podés cambiar esto en cualquier momento en <i>Editar perfil > Configuración de pestaña de perfil</i>.",
+  "confirmations.hide_featured_tab.message": "Esto ocultará la pestaña para los usuarios en {serverName} y otros servidores que tengan instalada la última versión de Mastodon. Otras pantallas pueden variar.",
+  "confirmations.hide_featured_tab.title": "¿Ocultar la pestaña «Destacados»?",
   "confirmations.logout.confirm": "Cerrar sesión",
   "confirmations.logout.message": "¿De verdad querés cerrar la sesión?",
   "confirmations.logout.title": "¿Cerrar sesión?",
@@ -606,14 +612,13 @@
   "emoji_button.search_results": "Resultados de búsqueda",
   "emoji_button.symbols": "Símbolos",
   "emoji_button.travel": "Viajes y lugares",
-  "empty_column.account_featured.other": "{acct} todavía no destacó nada. ¿Sabías que en tu perfil podés destacar tus etiquetas que más usás e incluso las cuentas de tus contactos?",
+  "empty_column.account_featured.other": "{acct} todavía no destacó nada.",
-  "empty_column.account_featured_other.no_collections_desc": "{acct} todavía no creó ninguna colección.",
-  "empty_column.account_featured_other.title": "No hay nada por acá",
-  "empty_column.account_featured_self.no_collections": "No hay colecciones aún",
   "empty_column.account_featured_self.no_collections_button": "Crear colección",
+  "empty_column.account_featured_self.no_collections_hide_tab": "En su lugar, ocultar esta pestaña",
   "empty_column.account_featured_self.pre_collections": "Mantenete pendiente de las colecciones",
-  "empty_column.account_featured_self.pre_collections_desc": "Las colecciones (que vendrán en Mastodon 4.6) te permite crear tus propias listas de cuentas seleccionadas para recomendar a otras personas.",
+  "empty_column.account_featured_self.pre_collections_desc": "Las colecciones (que vendrán en Mastodon 4.6) te permiten crear tus propias listas de cuentas seleccionadas para recomendar a otras personas.",
-  "empty_column.account_featured_unknown.no_collections_desc": "Esta cuenta todavía no creó ninguna colección.",
+  "empty_column.account_featured_self.showcase_accounts": "Mostrá tus cuentas favoritas",
+  "empty_column.account_featured_self.showcase_accounts_desc": "Las colecciones son listas de cuentas seleccionadas para ayudar a otras personas a descubrir más del Fediverso.",
   "empty_column.account_featured_unknown.other": "Esta cuenta todavía no destacó nada.",
   "empty_column.account_hides_collections": "Este usuario eligió no publicar esta información",
   "empty_column.account_suspended": "Cuenta suspendida",

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

@@ -45,6 +45,7 @@
   "account.featured": "Destacado",
   "account.featured.accounts": "Perfiles",
   "account.featured.collections": "Colecciones",
+  "account.featured.new_collection": "Nueva colección",
   "account.field_overflow": "Mostrar contenido completo",
   "account.filters.all": "Toda la actividad",
   "account.filters.boosts_toggle": "Mostrar impulsos",
@@ -416,7 +417,6 @@
   "column.about": "Acerca de",
   "column.blocks": "Usuarios bloqueados",
   "column.bookmarks": "Marcadores",
-  "column.collections": "Mis colecciones",
   "column.community": "Cronología local",
   "column.create_list": "Crear lista",
   "column.direct": "Menciones privadas",
@@ -432,7 +432,9 @@
   "column.list_members": "Administrar miembros de la lista",
   "column.lists": "Listas",
   "column.mutes": "Usuarios silenciados",
+  "column.my_collections": "Mis colecciones",
   "column.notifications": "Notificaciones",
+  "column.other_collections": "Colecciones de {name}",
   "column.pins": "Publicaciones fijadas",
   "column.public": "Cronología federada",
   "column_back_button.label": "Atrás",
@@ -502,6 +504,10 @@
   "confirmations.follow_to_list.confirm": "Seguir y agregar a la lista",
   "confirmations.follow_to_list.message": "Tienes que seguir a {name} para añadirlo a una lista.",
   "confirmations.follow_to_list.title": "¿Seguir a usuario?",
+  "confirmations.hide_featured_tab.confirm": "Ocultar pestaña",
+  "confirmations.hide_featured_tab.intro": "Puedes cambiar esto en cualquier momento en <i>Editar perfil > Configuración de la pestaña Perfil</i>.",
+  "confirmations.hide_featured_tab.message": "Esto ocultará la pestaña para los usuarios de {serverName} y otros servidores que ejecuten la última versión de Mastodon. La visualización puede variar en otros casos.",
+  "confirmations.hide_featured_tab.title": "¿Deseas ocultar la pestaña \"Destacado\"?",
   "confirmations.logout.confirm": "Cerrar sesión",
   "confirmations.logout.message": "¿Estás seguro de que quieres cerrar la sesión?",
   "confirmations.logout.title": "¿Deseas cerrar sesión?",
@@ -606,14 +612,13 @@
   "emoji_button.search_results": "Resultados de búsqueda",
   "emoji_button.symbols": "Símbolos",
   "emoji_button.travel": "Viajes y lugares",
-  "empty_column.account_featured.other": "{acct} no ha destacado nada todavía. ¿Sabías que puedes destacar las etiquetas que más usas e incluso las cuentas de tus amigos en tu perfil?",
+  "empty_column.account_featured.other": "{acct} no ha destacado nada todavía.",
-  "empty_column.account_featured_other.no_collections_desc": "{acct} aún no ha creado ninguna colección.",
-  "empty_column.account_featured_other.title": "Aquí no hay nada que ver",
-  "empty_column.account_featured_self.no_collections": "Aún no hay colecciones",
   "empty_column.account_featured_self.no_collections_button": "Crear una colección",
+  "empty_column.account_featured_self.no_collections_hide_tab": "Ocultar esta pestaña",
   "empty_column.account_featured_self.pre_collections": "No te pierdas las colecciones",
-  "empty_column.account_featured_self.pre_collections_desc": "Las colecciones (disponibles en Mastodon 4.6) te permiten crear tus propias listas seleccionadas de cuentas para recomendarlas a otras personas.",
+  "empty_column.account_featured_self.pre_collections_desc": "Las colecciones (que llegarán en Mastodon 4.6) te permiten crear tus propias listas de cuentas seleccionadas para recomendarlas a otras personas.",
-  "empty_column.account_featured_unknown.no_collections_desc": "Esta cuenta aún no ha creado ninguna colección.",
+  "empty_column.account_featured_self.showcase_accounts": "Destaca tus cuentas favoritas",
+  "empty_column.account_featured_self.showcase_accounts_desc": "Las colecciones son listas de cuentas seleccionadas que ayudan a otros a descubrir más del Fediverso.",
   "empty_column.account_featured_unknown.other": "Esta cuenta no ha destacado nada todavía.",
   "empty_column.account_hides_collections": "Este usuario ha elegido no hacer disponible esta información",
   "empty_column.account_suspended": "Cuenta suspendida",

app/javascript/mastodon/locales/es.json

@@ -45,6 +45,7 @@
   "account.featured": "Destacado",
   "account.featured.accounts": "Perfiles",
   "account.featured.collections": "Colecciones",
+  "account.featured.new_collection": "Nueva colección",
   "account.field_overflow": "Mostrar contenido completo",
   "account.filters.all": "Toda la actividad",
   "account.filters.boosts_toggle": "Mostrar impulsos",
@@ -416,7 +417,6 @@
   "column.about": "Acerca de",
   "column.blocks": "Usuarios bloqueados",
   "column.bookmarks": "Marcadores",
-  "column.collections": "Mis colecciones",
   "column.community": "Cronología local",
   "column.create_list": "Crear lista",
   "column.direct": "Menciones privadas",
@@ -432,7 +432,9 @@
   "column.list_members": "Administrar miembros de la lista",
   "column.lists": "Listas",
   "column.mutes": "Usuarios silenciados",
+  "column.my_collections": "Mis colecciones",
   "column.notifications": "Notificaciones",
+  "column.other_collections": "Colecciones de {name}",
   "column.pins": "Publicaciones fijadas",
   "column.public": "Cronología federada",
   "column_back_button.label": "Atrás",
@@ -502,6 +504,10 @@
   "confirmations.follow_to_list.confirm": "Seguir y añadir a la lista",
   "confirmations.follow_to_list.message": "Necesitas seguir a {name} para agregarlo a una lista.",
   "confirmations.follow_to_list.title": "¿Seguir usuario?",
+  "confirmations.hide_featured_tab.confirm": "Ocultar pestaña",
+  "confirmations.hide_featured_tab.intro": "Puedes cambiar esto en cualquier momento en <i>Editar perfil > Configuración de pestañas del perfil</i>.",
+  "confirmations.hide_featured_tab.message": "Esto esconderá la pestaña a los usuarios en {serverName} y otros servidores con la última versión de Mastodon. En otros lugares, puede variar.",
+  "confirmations.hide_featured_tab.title": "¿Ocultar la pestaña \"Destacado\"?",
   "confirmations.logout.confirm": "Cerrar sesión",
   "confirmations.logout.message": "¿Seguro que quieres cerrar la sesión?",
   "confirmations.logout.title": "¿Cerrar sesión?",
@@ -606,14 +612,13 @@
   "emoji_button.search_results": "Resultados de búsqueda",
   "emoji_button.symbols": "Símbolos",
   "emoji_button.travel": "Viajes y lugares",
-  "empty_column.account_featured.other": "{acct} aún no ha destacado nada. ¿Sabías que puedes destacar las etiquetas que más usas e incluso las cuentas de tus amigos en tu perfil?",
+  "empty_column.account_featured.other": "{acct} aún no ha destacado nada.",
-  "empty_column.account_featured_other.no_collections_desc": "{acct} aún no ha creado ninguna colección.",
-  "empty_column.account_featured_other.title": "Nada que ver aquí",
-  "empty_column.account_featured_self.no_collections": "Aún no hay colecciones",
   "empty_column.account_featured_self.no_collections_button": "Crear una colección",
+  "empty_column.account_featured_self.no_collections_hide_tab": "Ocultar esta pestaña",
   "empty_column.account_featured_self.pre_collections": "No te pierdas las Colecciones",
-  "empty_column.account_featured_self.pre_collections_desc": "Las colecciones (disponibles en Mastodon 4.6) te permiten crear tus propias listas seleccionadas de cuentas para recomendarlas a otras personas.",
+  "empty_column.account_featured_self.pre_collections_desc": "Las colecciones (disponibles a partir de Mastodon 4.6) te permiten crear tus propias listas de cuentas seleccionadas para recomendarlas a otros.",
-  "empty_column.account_featured_unknown.no_collections_desc": "Esta cuenta aún no ha creado ninguna colección.",
+  "empty_column.account_featured_self.showcase_accounts": "Muestra tus cuentas favoritas",
+  "empty_column.account_featured_self.showcase_accounts_desc": "Las colecciones son listas de cuentas seleccionadas para ayudar a otros a descubrir más del Fediverso.",
   "empty_column.account_featured_unknown.other": "Esta cuenta no ha destacado nada todavía.",
   "empty_column.account_hides_collections": "Este usuario ha decidido no mostrar esta información",
   "empty_column.account_suspended": "Cuenta suspendida",

app/javascript/mastodon/locales/et.json

@@ -386,7 +386,6 @@
   "column.about": "Teave",
   "column.blocks": "Blokeeritud kasutajad",
   "column.bookmarks": "Järjehoidjad",
-  "column.collections": "Minu kogumikud",
   "column.community": "Kohalik ajajoon",
   "column.create_list": "Loo loend",
   "column.direct": "Privaatsed mainimised",
@@ -560,7 +559,6 @@
   "emoji_button.search_results": "Otsitulemused",
   "emoji_button.symbols": "Sümbolid",
   "emoji_button.travel": "Reisimine & kohad",
-  "empty_column.account_featured.other": "{acct} pole veel midagi esile tõstnud. Kas teadsid, et oma profiilis saad esile tõsta rohkem kasutatud teemaviiteid või sõbra kasutajakontot?",
   "empty_column.account_hides_collections": "See kasutaja otsustas mitte teha seda infot saadavaks",
   "empty_column.account_suspended": "Konto kustutatud",
   "empty_column.account_timeline": "Siin postitusi ei ole!",

app/javascript/mastodon/locales/eu.json

@@ -355,7 +355,6 @@
   "emoji_button.search_results": "Bilaketaren emaitzak",
   "emoji_button.symbols": "Sinboloak",
   "emoji_button.travel": "Bidaiak eta tokiak",
-  "empty_column.account_featured.other": "{acct}-ek ez du ezer nabarmendu oraindik. Ba al zenekien gehien erabiltzen dituzun traolak eta baita zure lagunen kontuak ere zure profilean nabarmendu ditzakezula?",
   "empty_column.account_hides_collections": "Erabiltzaile honek informazio hau erabilgarri ez egotea aukeratu du.",
   "empty_column.account_suspended": "Kanporatutako kontua",
   "empty_column.account_timeline": "Ez dago bidalketarik hemen!",

app/javascript/mastodon/locales/fa.json

@@ -355,7 +355,6 @@
   "emoji_button.search_results": "نتایج جست‌وجو",
   "emoji_button.symbols": "نمادها",
   "emoji_button.travel": "سفر و مکان",
-  "empty_column.account_featured.other": "{acct} هنوز هیچ چیزی را پیشنهاد نکرده است. آیا می‌دانستید که می‌توانید برچسب‌هایی را که بیشتر استفاده می‌کنید و حتی حساب‌های کاربری دوستانتان را در نمایه خود پیشنهاد کنید؟",
   "empty_column.account_hides_collections": "کاربر خواسته که این اطّلاعات در دسترس نباشند",
   "empty_column.account_suspended": "حساب معلق شد",
   "empty_column.account_timeline": "هیچ فرسته‌ای این‌جا نیست!",

app/javascript/mastodon/locales/fi.json

@@ -45,6 +45,7 @@
   "account.featured": "Esittelyssä",
   "account.featured.accounts": "Profiilit",
   "account.featured.collections": "Kokoelmat",
+  "account.featured.new_collection": "Uusi kokoelma",
   "account.field_overflow": "Näytä koko sisältö",
   "account.filters.all": "Kaikki toiminta",
   "account.filters.boosts_toggle": "Näytä tehostukset",
@@ -416,7 +417,6 @@
   "column.about": "Tietoja",
   "column.blocks": "Estetyt käyttäjät",
   "column.bookmarks": "Kirjanmerkit",
-  "column.collections": "Omat kokoelmat",
   "column.community": "Paikallinen aikajana",
   "column.create_list": "Luo lista",
   "column.direct": "Yksityismaininnat",
@@ -432,7 +432,9 @@
   "column.list_members": "Hallitse listan jäseniä",
   "column.lists": "Listat",
   "column.mutes": "Mykistetyt käyttäjät",
+  "column.my_collections": "Omat kokoelmat",
   "column.notifications": "Ilmoitukset",
+  "column.other_collections": "Käyttäjän {name} kokoelmat",
   "column.pins": "Kiinnitetyt julkaisut",
   "column.public": "Yleinen aikajana",
   "column_back_button.label": "Takaisin",
@@ -502,6 +504,10 @@
   "confirmations.follow_to_list.confirm": "Seuraa ja lisää listaan",
   "confirmations.follow_to_list.message": "Sinun on seurattava käyttäjää {name}, jotta voit lisätä hänet listaan.",
   "confirmations.follow_to_list.title": "Seurataanko käyttäjää?",
+  "confirmations.hide_featured_tab.confirm": "Piilota välilehti",
+  "confirmations.hide_featured_tab.intro": "Voit muuttaa tätä milloin tahansa kohdasta <i>Muokkaa profiilia > Profiilin välilehtien asetukset</i>.",
+  "confirmations.hide_featured_tab.message": "Tämä piilottaa välilehden palvelimen {serverName} käyttäjiltä ja muilta palvelimilta, jotka toimivat Mastodonin uusimmalla versiolla. Muut näkymät voivat vaihdella.",
+  "confirmations.hide_featured_tab.title": "Piilotetaanko Esittelyssä-välilehti?",
   "confirmations.logout.confirm": "Kirjaudu ulos",
   "confirmations.logout.message": "Haluatko varmasti kirjautua ulos?",
   "confirmations.logout.title": "Kirjaudutaanko ulos?",
@@ -606,14 +612,13 @@
   "emoji_button.search_results": "Hakutulokset",
   "emoji_button.symbols": "Symbolit",
   "emoji_button.travel": "Matkailu ja paikat",
-  "empty_column.account_featured.other": "{acct} ei esittele vielä mitään. Tiesitkö, että voit esitellä profiilissasi eniten käyttämiäsi aihetunnisteita ja jopa ystäviesi tilejä?",
+  "empty_column.account_featured.other": "{acct} ei esittele vielä mitään.",
-  "empty_column.account_featured_other.no_collections_desc": "{acct} ei ole luonut vielä yhtään kokoelmaa.",
-  "empty_column.account_featured_other.title": "Täällä ei mitään nähtävää",
-  "empty_column.account_featured_self.no_collections": "Ei vielä kokoelmia",
   "empty_column.account_featured_self.no_collections_button": "Luo kokoelma",
+  "empty_column.account_featured_self.no_collections_hide_tab": "Piilota tämä välilehti sen sijaan",
   "empty_column.account_featured_self.pre_collections": "Ole valmiina kokoelmiin",
-  "empty_column.account_featured_self.pre_collections_desc": "Kokoelmien (tulossa Mastodon 4.6:ssa) avulla voit luoda valikoidun listan muille suosittelemiasi tilejä.",
+  "empty_column.account_featured_self.pre_collections_desc": "Kokoelmien (tulossa Mastodon 4.6:ssa) avulla voit luoda valikoidun listan muille suosittelemistasi tileistä.",
-  "empty_column.account_featured_unknown.no_collections_desc": "Tämä tili ei ole luonut vielä yhtään kokoelmaa.",
+  "empty_column.account_featured_self.showcase_accounts": "Esittele suosikkitilejäsi",
+  "empty_column.account_featured_self.showcase_accounts_desc": "Kokoelmat ovat valikoituja listoja tileistä, jotka auttavat muita löytämään enemmän fediversumissa.",
   "empty_column.account_featured_unknown.other": "Tämä tili ei esittele vielä mitään.",
   "empty_column.account_hides_collections": "Käyttäjä on päättänyt pitää nämä tiedot yksityisinä",
   "empty_column.account_suspended": "Tili jäädytetty",

app/javascript/mastodon/locales/fo.json

@@ -326,7 +326,6 @@
   "column.about": "Um",
   "column.blocks": "Bannaðir brúkarar",
   "column.bookmarks": "Bókamerki",
-  "column.collections": "Míni søvn",
   "column.community": "Lokal tíðarlinja",
   "column.create_list": "Ger lista",
   "column.direct": "Privatar umrøður",
@@ -504,7 +503,6 @@
   "emoji_button.search_results": "Leitiúrslit",
   "emoji_button.symbols": "Ímyndir",
   "emoji_button.travel": "Ferðing og støð",
-  "empty_column.account_featured.other": "{acct} hevur ikki tikið nakað fram enn. Visti tú, at tú kanst taka fram tey frámerki, tú brúkar mest, og sjálvt kontur hjá vinum tínum á vangan hjá tær?",
   "empty_column.account_hides_collections": "Hesin brúkarin hevur valt, at hesar upplýsingarnar ikki skulu vera tøkar",
   "empty_column.account_suspended": "Kontan gjørd óvirkin",
   "empty_column.account_timeline": "Einki uppslag her!",

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

@@ -45,6 +45,7 @@
   "account.featured": "En vedette",
   "account.featured.accounts": "Profils",
   "account.featured.collections": "Collections",
+  "account.featured.new_collection": "Nouvelle collection",
   "account.field_overflow": "Voir tout",
   "account.filters.all": "Toutes les activités",
   "account.filters.boosts_toggle": "Afficher les partages",
@@ -416,7 +417,6 @@
   "column.about": "À propos",
   "column.blocks": "Comptes bloqués",
   "column.bookmarks": "Signets",
-  "column.collections": "Mes collections",
   "column.community": "Fil local",
   "column.create_list": "Créer une liste",
   "column.direct": "Mention privée",
@@ -502,6 +502,10 @@
   "confirmations.follow_to_list.confirm": "Suivre et ajouter à la liste",
   "confirmations.follow_to_list.message": "Vous devez suivre {name} pour l'ajouter à une liste.",
   "confirmations.follow_to_list.title": "Suivre l'utilisateur·rice ?",
+  "confirmations.hide_featured_tab.confirm": "Cacher l'onglet",
+  "confirmations.hide_featured_tab.intro": "Vous pouvez modifier ce paramétrage à tout moment depuis <i>Modifier le profil > Paramètres de l'onglet du profil</i>.",
+  "confirmations.hide_featured_tab.message": "Cela masquera l'onglet pour les utilisateur·rice·s de {serverName} et des autres serveurs utilisant la dernière version de Mastodon. Pour les autres l'affichage peut varier.",
+  "confirmations.hide_featured_tab.title": "Cacher l'onglet « En vedette » ?",
   "confirmations.logout.confirm": "Se déconnecter",
   "confirmations.logout.message": "Voulez-vous vraiment vous déconnecter?",
   "confirmations.logout.title": "Se déconnecter ?",
@@ -606,14 +610,13 @@
   "emoji_button.search_results": "Résultats",
   "emoji_button.symbols": "Symboles",
   "emoji_button.travel": "Voyage et lieux",
-  "empty_column.account_featured.other": "{acct} n'a pas encore mis de contenu en avant. Saviez-vous que vous pouviez mettre en avant les hashtags que vous utilisez le plus, et même les comptes de vos amis sur votre profil ?",
+  "empty_column.account_featured.other": "{acct} n'a pas encore mis de contenu en avant.",
-  "empty_column.account_featured_other.no_collections_desc": "{acct} n'a pas encore créé de collection.",
-  "empty_column.account_featured_other.title": "Il n'y a rien à voir",
-  "empty_column.account_featured_self.no_collections": "Aucune collection pour le moment",
   "empty_column.account_featured_self.no_collections_button": "Créer une collection",
+  "empty_column.account_featured_self.no_collections_hide_tab": "Cacher cet onglet",
   "empty_column.account_featured_self.pre_collections": "Restez à l'écoute pour les collections",
-  "empty_column.account_featured_self.pre_collections_desc": "Les collections (à venir dans Mastodon 4.6) vous permettent d'organiser vos propres listes de comptes à recommander aux autres.",
+  "empty_column.account_featured_self.pre_collections_desc": "Les collections (à venir dans Mastodon 4.6) permettent d'organiser vos propres listes de comptes à recommander aux autres.",
-  "empty_column.account_featured_unknown.no_collections_desc": "Ce compte n'a pas encore créé de collection.",
+  "empty_column.account_featured_self.showcase_accounts": "Présentez vos comptes préférés",
+  "empty_column.account_featured_self.showcase_accounts_desc": "Les collections sont des listes de comptes sélectionnés pour aider les autres à découvrir le Fédivers.",
   "empty_column.account_featured_unknown.other": "Ce compte n'a mis aucun contenu en avant pour l'instant.",
   "empty_column.account_hides_collections": "Cet utilisateur·ice préfère ne pas rendre publiques ces informations",
   "empty_column.account_suspended": "Compte suspendu",

app/javascript/mastodon/locales/fr.json

@@ -45,6 +45,7 @@
   "account.featured": "En vedette",
   "account.featured.accounts": "Profils",
   "account.featured.collections": "Collections",
+  "account.featured.new_collection": "Nouvelle collection",
   "account.field_overflow": "Voir tout",
   "account.filters.all": "Toutes les activités",
   "account.filters.boosts_toggle": "Afficher les partages",
@@ -416,7 +417,6 @@
   "column.about": "À propos",
   "column.blocks": "Comptes bloqués",
   "column.bookmarks": "Marque-pages",
-  "column.collections": "Mes collections",
   "column.community": "Fil local",
   "column.create_list": "Créer une liste",
   "column.direct": "Mentions privées",
@@ -502,6 +502,10 @@
   "confirmations.follow_to_list.confirm": "Suivre et ajouter à la liste",
   "confirmations.follow_to_list.message": "Vous devez suivre {name} pour l'ajouter à une liste.",
   "confirmations.follow_to_list.title": "Suivre l'utilisateur·rice ?",
+  "confirmations.hide_featured_tab.confirm": "Cacher l'onglet",
+  "confirmations.hide_featured_tab.intro": "Vous pouvez modifier ce paramétrage à tout moment depuis <i>Modifier le profil > Paramètres de l'onglet du profil</i>.",
+  "confirmations.hide_featured_tab.message": "Cela masquera l'onglet pour les utilisateur·rice·s de {serverName} et des autres serveurs utilisant la dernière version de Mastodon. Pour les autres l'affichage peut varier.",
+  "confirmations.hide_featured_tab.title": "Cacher l'onglet « En vedette » ?",
   "confirmations.logout.confirm": "Se déconnecter",
   "confirmations.logout.message": "Voulez-vous vraiment vous déconnecter ?",
   "confirmations.logout.title": "Se déconnecter ?",
@@ -606,14 +610,13 @@
   "emoji_button.search_results": "Résultats de la recherche",
   "emoji_button.symbols": "Symboles",
   "emoji_button.travel": "Voyage et lieux",
-  "empty_column.account_featured.other": "{acct} n'a pas encore mis de contenu en avant. Saviez-vous que vous pouviez mettre en avant les hashtags que vous utilisez le plus, et même les comptes de vos amis sur votre profil ?",
+  "empty_column.account_featured.other": "{acct} n'a pas encore mis de contenu en avant.",
-  "empty_column.account_featured_other.no_collections_desc": "{acct} n'a pas encore créé de collection.",
-  "empty_column.account_featured_other.title": "Il n'y a rien à voir",
-  "empty_column.account_featured_self.no_collections": "Aucune collection pour le moment",
   "empty_column.account_featured_self.no_collections_button": "Créer une collection",
+  "empty_column.account_featured_self.no_collections_hide_tab": "Cacher cet onglet",
   "empty_column.account_featured_self.pre_collections": "Restez à l'écoute pour les collections",
-  "empty_column.account_featured_self.pre_collections_desc": "Les collections (à venir dans Mastodon 4.6) vous permettent d'organiser vos propres listes de comptes à recommander aux autres.",
+  "empty_column.account_featured_self.pre_collections_desc": "Les collections (à venir dans Mastodon 4.6) permettent d'organiser vos propres listes de comptes à recommander aux autres.",
-  "empty_column.account_featured_unknown.no_collections_desc": "Ce compte n'a pas encore créé de collection.",
+  "empty_column.account_featured_self.showcase_accounts": "Présentez vos comptes préférés",
+  "empty_column.account_featured_self.showcase_accounts_desc": "Les collections sont des listes de comptes sélectionnés pour aider les autres à découvrir le Fédivers.",
   "empty_column.account_featured_unknown.other": "Ce compte n'a mis aucun contenu en avant pour l'instant.",
   "empty_column.account_hides_collections": "Cet utilisateur·ice préfère ne pas rendre publiques ces informations",
   "empty_column.account_suspended": "Compte suspendu",

app/javascript/mastodon/locales/fy.json

@@ -285,7 +285,6 @@
   "emoji_button.search_results": "Sykresultaten",
   "emoji_button.symbols": "Symboalen",
   "emoji_button.travel": "Reizgje en lokaasjes",
-  "empty_column.account_featured.other": "{acct} hat noch neat útljochte. Wisten jo dat jo jo hashtags dy’t jo it meast brûke, en sels de accounts fan dyn freonen fermelde kinne op jo profyl?",
   "empty_column.account_hides_collections": "Dizze brûker hat derfoar keazen dizze ynformaasje net beskikber te meitsjen",
   "empty_column.account_suspended": "Account beskoattele",
   "empty_column.account_timeline": "Hjir binne gjin berjochten!",

app/javascript/mastodon/locales/ga.json

@@ -416,7 +416,6 @@
   "column.about": "Maidir le",
   "column.blocks": "Úsáideoirí blocáilte",
   "column.bookmarks": "Leabharmharcanna",
-  "column.collections": "Mo bhailiúcháin",
   "column.community": "Amlíne áitiúil",
   "column.create_list": "Cruthaigh liosta",
   "column.direct": "Luann príobháideach",
@@ -581,7 +580,9 @@
   "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",
+  "email_subscriptions.form.bottom": "Faigh poist i do bhosca isteach gan cuntas Mastodon a chruthú. Díliostáil ag am ar bith. Le haghaidh tuilleadh eolais, féach ar an <a>Polasaí Príobháideachta</a>.",
   "email_subscriptions.form.title": "Cláraigh le haghaidh nuashonruithe ríomhphoist ó {name}",
   "email_subscriptions.submitted.lead": "Seiceáil do bhosca isteach le haghaidh ríomhphoist chun clárú le haghaidh nuashonruithe ríomhphoist a chríochnú.",
   "email_subscriptions.submitted.title": "Céim amháin eile",
@@ -604,14 +605,8 @@
   "emoji_button.search_results": "Torthaí cuardaigh",
   "emoji_button.symbols": "Comharthaí",
   "emoji_button.travel": "Taisteal ⁊ Áiteanna",
-  "empty_column.account_featured.other": "Níl aon rud feicthe ag {acct} go fóill. An raibh a fhios agat gur féidir leat na hashtags is mó a úsáideann tú, agus fiú cuntais do chairde, a chur ar do phróifíl?",
-  "empty_column.account_featured_other.no_collections_desc": "Níl aon bhailiúcháin cruthaithe ag {acct} go fóill.",
-  "empty_column.account_featured_other.title": "Níl aon rud le feiceáil anseo",
-  "empty_column.account_featured_self.no_collections": "Gan aon bhailiúcháin fós",
   "empty_column.account_featured_self.no_collections_button": "Cruthaigh bailiúchán",
   "empty_column.account_featured_self.pre_collections": "Fan tiúnta le haghaidh bailiúcháin",
-  "empty_column.account_featured_self.pre_collections_desc": "Le bailiúcháin (atá ag teacht i Mastodon 4.6) is féidir leat do liostaí cuntas féin a chruthú le moladh do dhaoine eile.",
-  "empty_column.account_featured_unknown.no_collections_desc": "Níl aon bhailiúcháin cruthaithe ag an gcuntas seo go fóill.",
   "empty_column.account_featured_unknown.other": "Níl aon rud le feiceáil ar an gcuntas seo go fóill.",
   "empty_column.account_hides_collections": "Roghnaigh an t-úsáideoir seo gan an fhaisnéis seo a chur ar fáil",
   "empty_column.account_suspended": "Cuntas ar fionraí",

app/javascript/mastodon/locales/gd.json

@@ -416,7 +416,6 @@
   "column.about": "Mu dhèidhinn",
   "column.blocks": "Cleachdaichean bacte",
   "column.bookmarks": "Comharran-lìn",
-  "column.collections": "Na cruinneachaidhean agam",
   "column.community": "Loidhne-ama ionadail",
   "column.create_list": "Cruthaich liosta",
   "column.direct": "Iomraidhean prìobhaideach",
@@ -605,12 +604,7 @@
   "emoji_button.search_results": "Toraidhean an luirg",
   "emoji_button.symbols": "Samhlaidhean",
   "emoji_button.travel": "Siubhal ⁊ àitichean",
-  "empty_column.account_featured.other": "Chan eil {acct} a’ brosnachadh dad fhathast. An robh fios agad gur urrainn dhut na tagaichean hais a chleachdas tu as trice agus fiù ’s cunntasan do charaidean a bhrosnachadh air a’ phròifil agad?",
-  "empty_column.account_featured_other.no_collections_desc": "Cha do chruthaich {acct} cruinneachadh sam bith fhathast.",
-  "empty_column.account_featured_other.title": "Chan eil dad ri fhaicinn an-seo",
-  "empty_column.account_featured_self.no_collections": "Chan eil cruinneachadh ann fhathast",
   "empty_column.account_featured_self.no_collections_button": "Cruthaich cruinneachadh",
-  "empty_column.account_featured_unknown.no_collections_desc": "Cha do chruthaich an cunntas seo cruinneachadh sam bith fhathast.",
   "empty_column.account_featured_unknown.other": "Chan eil an cunntas seo a’ brosnachadh dad fhathast.",
   "empty_column.account_hides_collections": "Chuir an cleachdaiche seo roimhe nach eil am fiosrachadh seo ri fhaighinn",
   "empty_column.account_suspended": "Chaidh an cunntas a chur à rèim",

app/javascript/mastodon/locales/gl.json

@@ -45,6 +45,7 @@
   "account.featured": "Destacado",
   "account.featured.accounts": "Perfís",
   "account.featured.collections": "Coleccións",
+  "account.featured.new_collection": "Nova colección",
   "account.field_overflow": "Mostrar contido completo",
   "account.filters.all": "Toda actividade",
   "account.filters.boosts_toggle": "Mostrar promocións",
@@ -416,7 +417,6 @@
   "column.about": "Sobre",
   "column.blocks": "Usuarias bloqueadas",
   "column.bookmarks": "Marcadores",
-  "column.collections": "As miñas coleccións",
   "column.community": "Cronoloxía local",
   "column.create_list": "Crear lista",
   "column.direct": "Mencións privadas",
@@ -432,7 +432,9 @@
   "column.list_members": "Xestionar membros da lista",
   "column.lists": "Listaxes",
   "column.mutes": "Usuarias acaladas",
+  "column.my_collections": "As miñas coleccións",
   "column.notifications": "Notificacións",
+  "column.other_collections": "Coleccións de {name}",
   "column.pins": "Publicacións fixadas",
   "column.public": "Cronoloxía federada",
   "column_back_button.label": "Volver",
@@ -502,6 +504,10 @@
   "confirmations.follow_to_list.confirm": "Seguir e engadir á lista",
   "confirmations.follow_to_list.message": "Tes que seguir a {name} para poder engadila a unha lista.",
   "confirmations.follow_to_list.title": "Seguir á usuaria?",
+  "confirmations.hide_featured_tab.confirm": "Ocultar pestana",
+  "confirmations.hide_featured_tab.intro": "Podes cambiar isto cando queiras nos axustes en <i>Editar perfil > pestana Perfil</i>.",
+  "confirmations.hide_featured_tab.message": "Vas ocultar a pestana para as usuarias de {serverName} e outros servidores que usen a última versión de Mastodon. Noutros lugares podería ser diferente.",
+  "confirmations.hide_featured_tab.title": "Ocultar a pestana «Destacado»?",
   "confirmations.logout.confirm": "Pechar sesión",
   "confirmations.logout.message": "Desexas pechar a sesión?",
   "confirmations.logout.title": "Pechar sesión?",
@@ -583,6 +589,7 @@
   "dropdown.empty": "Escolle unha opción",
   "email_subscriptions.email": "Correo electrónico",
   "email_subscriptions.form.action": "Subscribirse",
+  "email_subscriptions.form.bottom": "Recibe publicacións no teu correo sen precisar crear unha conta de Mastodon. Date de baixa cando queiras. Máis información na <a>Directiva de privacidade</a>.",
   "email_subscriptions.form.title": "Subscríbete para recibir actualizacións por correo de {name}",
   "email_subscriptions.submitted.lead": "Comproba a túa caixa de correo para completar a subscrición ás actualizacións por correo.",
   "email_subscriptions.submitted.title": "Un último paso",
@@ -605,14 +612,13 @@
   "emoji_button.search_results": "Resultados da procura",
   "emoji_button.symbols": "Símbolos",
   "emoji_button.travel": "Viaxes e Lugares",
-  "empty_column.account_featured.other": "{acct} aínda non escolleu nada para destacar. Sabías que podes facer destacatar no teu perfil os cancelos que máis usas, incluso os perfís das túas amizades?",
+  "empty_column.account_featured.other": "{acct} aínda non destacou nada.",
-  "empty_column.account_featured_other.no_collections_desc": "{acct} aínda non creou ningunha colección.",
-  "empty_column.account_featured_other.title": "Non hai nada que ver aquí",
-  "empty_column.account_featured_self.no_collections": "Aínda non tes coleccións",
   "empty_column.account_featured_self.no_collections_button": "Crea unha colección",
+  "empty_column.account_featured_self.no_collections_hide_tab": "Ocultar esta pestana entonces",
   "empty_column.account_featured_self.pre_collections": "Van chegar as Coleccións",
   "empty_column.account_featured_self.pre_collections_desc": "Coas Coleccións (a partir de Mastodon 4.6) podes crear as túas listas persoais de contas para recomendar a outras persoas.",
-  "empty_column.account_featured_unknown.no_collections_desc": "Esta conta aínda non creou ningunha colección.",
+  "empty_column.account_featured_self.showcase_accounts": "Salienta as túas contas favoritas",
+  "empty_column.account_featured_self.showcase_accounts_desc": "As coleccións son listas de contas para que outras persoas as coñezan e desfruten aquí no Fediverso.",
   "empty_column.account_featured_unknown.other": "Esta conta aínda non destacou nada.",
   "empty_column.account_hides_collections": "A usuaria decideu non facer pública esta información",
   "empty_column.account_suspended": "Conta suspendida",

app/javascript/mastodon/locales/he.json

@@ -102,6 +102,7 @@
   "account.muted": "מושתק",
   "account.muting": "רשימת החשבונות המושתקים",
   "account.mutual": "אתם עוקביםות הדדית",
+  "account.name.copy": "העתקת הכינוי",
   "account.name.help.domain": "{domain} הוא השרת שמארח את פרופיל המשתמש(ת) וההודעות שכתב(ה).",
   "account.name.help.domain_self": "{domain} הוא השרת שמארח את פרופיל המשתמש(ת) שלך ואת ההודעות שכתבת.",
   "account.name.help.footer": "בדיוק כמו שתוכלו לשלוח דואל לאנשים דרך תוכנות דואל שונות, ניתן להיות בקשר עם אנשים על שרתי מסטודון וכל אדם בשרתי פדיברס (המשתמשים בפרוטוכול אקטיביטיפאב ActivityPub).",
@@ -138,6 +139,9 @@
   "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": "עריכת ביוגרפיה",
   "account_edit.bio.placeholder": "הוסיפו הצגה קצרה כדי לעזור לאחרים לזהות אותך.",
@@ -206,14 +210,14 @@
   "account_edit.profile_tab.button_label": "התאמה אישית",
   "account_edit.profile_tab.hint.description": "הגדרות אלו משנות מה משתמשים יראו על {server} ביישומונים הרשמיים, אבל הן לא בהכרח רלוונטיות למשתמשים על שרתים אחרים ועל יישומונים צד ג'.",
   "account_edit.profile_tab.hint.title": "התצוגה עשויה להיות שונה",
-  "account_edit.profile_tab.show_featured.description": "\"נבחרים\" הוא טאב לבחירה שבו תוכלו להציג חשבונות אחרים.",
+  "account_edit.profile_tab.show_featured.description": "\"נבחרים\" הוא כרטיסיה לבחירה שבו תוכלו להציג חשבונות אחרים.",
-  "account_edit.profile_tab.show_featured.title": "הצגת טאב \"נבחרים\"",
+  "account_edit.profile_tab.show_featured.title": "הצגת כרטיסיית \"נבחרים\"",
-  "account_edit.profile_tab.show_media.description": "\"מדיה\" הוא טאב לבחירה שבוא יוצגו הודעות שלך שמכילות תמונות או וידאו.",
+  "account_edit.profile_tab.show_media.description": "\"מדיה\" הוא כרטיסיה לבחירה שבה יוצגו הודעות שלך שמכילות תמונות או וידאו.",
-  "account_edit.profile_tab.show_media.title": "הצגת טאב \"מדיה\"",
+  "account_edit.profile_tab.show_media.title": "הצגת כרטיסיית \"מדיה\"",
-  "account_edit.profile_tab.show_media_replies.description": "כשמאופשר, טאב המדיה מציג גם הודעות מקוריות וגם תשובות להודעות של אחרים.",
+  "account_edit.profile_tab.show_media_replies.description": "כשמאופשר, כרטיסיית המדיה מציגה גם הודעות מקוריות וגם תשובות להודעות של אחרים.",
-  "account_edit.profile_tab.show_media_replies.title": "לכלול תגובות בטאב המדיה",
+  "account_edit.profile_tab.show_media_replies.title": "לכלול תגובות בכרטיסיית המדיה",
-  "account_edit.profile_tab.subtitle": "התאימו את הטאבים בפרופיל שלכם ומה שהם יציגו.",
+  "account_edit.profile_tab.subtitle": "התאימו את הכרטיסיות בפרופיל שלכם ומה שהן יציגו.",
-  "account_edit.profile_tab.title": "הגדרות טאבים לפרופיל",
+  "account_edit.profile_tab.title": "הגדרות כרטיסיות לפרופיל",
   "account_edit.save": "שמירה",
   "account_edit.upload_modal.back": "חזרה",
   "account_edit.upload_modal.done": "בוצע",
@@ -412,7 +416,6 @@
   "column.about": "אודות",
   "column.blocks": "משתמשים חסומים",
   "column.bookmarks": "סימניות",
-  "column.collections": "האוספים שלי",
   "column.community": "פיד שרת מקומי",
   "column.create_list": "יצירת רשימה",
   "column.direct": "הודעות פרטיות",
@@ -498,6 +501,10 @@
   "confirmations.follow_to_list.confirm": "עקיבה והוספה לרשימה",
   "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": "האם אתם בטוחים שאתם רוצים להתנתק?",
   "confirmations.logout.title": "להתנתק?",
@@ -577,7 +584,9 @@
   "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": "עוד שלב אחד אחרון",
@@ -600,14 +609,9 @@
   "emoji_button.search_results": "תוצאות חיפוש",
   "emoji_button.symbols": "סמלים",
   "emoji_button.travel": "טיולים ואתרים",
-  "empty_column.account_featured.other": "{acct} עוד לא קידם תכנים. הידעת שניתן לקדם תגיות שבשימושך התדיר או אפילו את החשבונות של חבריםות בפרופיל שלך?",
-  "empty_column.account_featured_other.no_collections_desc": "{acct} עוד לא יצרו אוספים.",
-  "empty_column.account_featured_other.title": "אין כאן מה לראות",
-  "empty_column.account_featured_self.no_collections": "עוד אין אוספים",
   "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": "אוספים (מגיע במסטודון גרסא 4.6) יאפשרו לך לאצור רשימות חשבונות להמלצה לאחרים.",
-  "empty_column.account_featured_unknown.no_collections_desc": "בחשבון זה עוד לא יצרו אוספים.",
   "empty_column.account_featured_unknown.other": "חשבון זה עוד לא קידם תכנים.",
   "empty_column.account_hides_collections": "המשתמש.ת בחר.ה להסתיר מידע זה",
   "empty_column.account_suspended": "חשבון מושעה",

app/javascript/mastodon/locales/hu.json

@@ -45,6 +45,7 @@
   "account.featured": "Kiemelt",
   "account.featured.accounts": "Profilok",
   "account.featured.collections": "Gyűjtemények",
+  "account.featured.new_collection": "Új gyűjtemény",
   "account.field_overflow": "Teljes tartalom megjelenítése",
   "account.filters.all": "Összes tevékenység",
   "account.filters.boosts_toggle": "Megtolások megjelenítése",
@@ -416,7 +417,6 @@
   "column.about": "Névjegy",
   "column.blocks": "Letiltott felhasználók",
   "column.bookmarks": "Könyvjelzők",
-  "column.collections": "Saját gyűjtemények",
   "column.community": "Helyi idővonal",
   "column.create_list": "Lista létrehozása",
   "column.direct": "Személyes említések",
@@ -432,7 +432,9 @@
   "column.list_members": "Listatagok kezelése",
   "column.lists": "Listák",
   "column.mutes": "Némított felhasználók",
+  "column.my_collections": "Saját gyűjtemények",
   "column.notifications": "Értesítések",
+  "column.other_collections": "{name} gyűjteményei",
   "column.pins": "Kitűzött bejegyzések",
   "column.public": "Föderációs idővonal",
   "column_back_button.label": "Vissza",
@@ -502,6 +504,10 @@
   "confirmations.follow_to_list.confirm": "Követés, és hozzáadás a listához",
   "confirmations.follow_to_list.message": "Követned kell {name} felhasználót, hogy hozzáadhasd a listához.",
   "confirmations.follow_to_list.title": "Felhasználó követése?",
+  "confirmations.hide_featured_tab.confirm": "Lap elrejtése",
+  "confirmations.hide_featured_tab.intro": "Ezt bármikor megváltoztathatod a <i>Profil szerkesztése > Profillap beállításai</i> alatt.",
+  "confirmations.hide_featured_tab.message": "Ez elrejti a lapot a(z) {serverName} és más olyan kiszolgálók felhasználói elől, amelyek a Mastodon legfrissebb verzióját futtatják. Más esetekben a megjelenítés eltérhet.",
+  "confirmations.hide_featured_tab.title": "Elrejti a „Kiemelt” lapot?",
   "confirmations.logout.confirm": "Kijelentkezés",
   "confirmations.logout.message": "Biztos, hogy kijelentkezel?",
   "confirmations.logout.title": "Kijelentkezel?",
@@ -606,14 +612,13 @@
   "emoji_button.search_results": "Keresési találatok",
   "emoji_button.symbols": "Szimbólumok",
   "emoji_button.travel": "Utazás és helyek",
-  "empty_column.account_featured.other": "{acct} még semmit sem emelt ki. Tudtad, hogy kiemelheted a profilodon a legtöbbet használt hashtageidet, és még a barátaid fiókját is?",
+  "empty_column.account_featured.other": "{acct} még nem emelt ki semmit.",
-  "empty_column.account_featured_other.no_collections_desc": "{acct} még nem hozott létre gyűjteményt.",
-  "empty_column.account_featured_other.title": "Nincs itt semmi látnivaló",
-  "empty_column.account_featured_self.no_collections": "Még nincsenek gyűjtemények",
   "empty_column.account_featured_self.no_collections_button": "Gyűjtemény létrehozása",
+  "empty_column.account_featured_self.no_collections_hide_tab": "Inkább a lap elrejtése",
   "empty_column.account_featured_self.pre_collections": "Készülj fel a gyűjteményekre",
   "empty_column.account_featured_self.pre_collections_desc": "A gyűjtemények (a Mastodon 4.6-ban érkezik) lehetővé teszik, hogy létrehozd a saját válogatott fióklistáidat, és ajánld másoknak.",
-  "empty_column.account_featured_unknown.no_collections_desc": "Ez a fiók még nem hozott létre gyűjteményt.",
+  "empty_column.account_featured_self.showcase_accounts": "Emeld ki a kedvenc fiókjaidat",
+  "empty_column.account_featured_self.showcase_accounts_desc": "A gyűjtemények fiókok válogatott listái, melyek segítenek másoknak a Födiverzum még nagyobb részének felfedezésében.",
   "empty_column.account_featured_unknown.other": "Ez a fiók még nem emelt ki semmit.",
   "empty_column.account_hides_collections": "Ez a felhasználó úgy döntött, hogy nem teszi elérhetővé ezt az információt.",
   "empty_column.account_suspended": "Fiók felfüggesztve",

app/javascript/mastodon/locales/ia.json

@@ -314,7 +314,6 @@
   "emoji_button.search_results": "Resultatos de recerca",
   "emoji_button.symbols": "Symbolos",
   "emoji_button.travel": "Viages e locos",
-  "empty_column.account_featured.other": "{acct} non ha ancora mittite alcun cosa in evidentia. Sapeva tu que tu pote mitter in evidentia sur tu profilo le hashtags que tu usa le plus e mesmo le contos de tu amicos?",
   "empty_column.account_hides_collections": "Le usator non ha rendite iste information disponibile",
   "empty_column.account_suspended": "Conto suspendite",
   "empty_column.account_timeline": "Nulle messages hic!",

app/javascript/mastodon/locales/io.json

@@ -366,7 +366,6 @@
   "emoji_button.search_results": "Trovuri",
   "emoji_button.symbols": "Simboli",
   "emoji_button.travel": "Vizito & Plasi",
-  "empty_column.account_featured.other": "{acct} ne estalas irga ankore. Ka vu savas?",
   "empty_column.account_hides_collections": "Ca uzanto selektis ne publikigar ca informo",
   "empty_column.account_suspended": "Konto restriktesis",
   "empty_column.account_timeline": "No toots here!",

app/javascript/mastodon/locales/is.json

@@ -45,6 +45,7 @@
   "account.featured": "Með aukið vægi",
   "account.featured.accounts": "Notendasnið",
   "account.featured.collections": "Söfn",
+  "account.featured.new_collection": "Nýtt safn",
   "account.field_overflow": "Birta allt efnið",
   "account.filters.all": "Öll virkni",
   "account.filters.boosts_toggle": "Sýna endurbirtingar",
@@ -416,7 +417,6 @@
   "column.about": "Um hugbúnaðinn",
   "column.blocks": "Útilokaðir notendur",
   "column.bookmarks": "Bókamerki",
-  "column.collections": "Söfnin mín",
   "column.community": "Staðvær tímalína",
   "column.create_list": "Búa til lista",
   "column.direct": "Einkaspjall",
@@ -432,7 +432,9 @@
   "column.list_members": "Sýsla með meðlimi listans",
   "column.lists": "Listar",
   "column.mutes": "Þaggaðir notendur",
+  "column.my_collections": "Söfnin mín",
   "column.notifications": "Tilkynningar",
+  "column.other_collections": "Söfn frá {name}",
   "column.pins": "Festar færslur",
   "column.public": "Sameiginleg tímalína",
   "column_back_button.label": "Til baka",
@@ -502,6 +504,10 @@
   "confirmations.follow_to_list.confirm": "Fylgjast með og bæta á lista",
   "confirmations.follow_to_list.message": "Þú þarft að fylgjast með {name} til að bæta viðkomandi á lista.",
   "confirmations.follow_to_list.title": "Fylgjast með notanda?",
+  "confirmations.hide_featured_tab.confirm": "Fela flipa",
+  "confirmations.hide_featured_tab.intro": "Þú getur breytt þessu hvenær sem er í <i>Breyta notandasniði > Stillingar notandasniðsflipa</i>.",
+  "confirmations.hide_featured_tab.message": "Þetta mun fela flipann fyrir notendum á {serverName} og öðrum netþjónum sem nota nýjustu útgáfuna af Mastodon. Birting í öðrum viðmótum gæti verið á ýmsan máta.",
+  "confirmations.hide_featured_tab.title": "Fela \"Með aukið vægi\" flipann?",
   "confirmations.logout.confirm": "Skrá út",
   "confirmations.logout.message": "Ertu viss um að þú viljir skrá þig út?",
   "confirmations.logout.title": "Skrá út?",
@@ -606,14 +612,13 @@
   "emoji_button.search_results": "Leitarniðurstöður",
   "emoji_button.symbols": "Tákn",
   "emoji_button.travel": "Ferðalög og staðir",
-  "empty_column.account_featured.other": "{acct} hefur enn ekki sett neitt sem áberandi. Vissirðu að þú getur gefið meira vægi á notandasniðinu þínu ýmsum myllumerkjum sem þú notar oft og jafnvel aðgöngum vina þinna?",
+  "empty_column.account_featured.other": "{acct} hefur enn ekki gefið neinu aukið vægi.",
-  "empty_column.account_featured_other.no_collections_desc": "{acct} hefur enn ekki útbúið nein söfn.",
-  "empty_column.account_featured_other.title": "Ekkert að sjá hér",
-  "empty_column.account_featured_self.no_collections": "Engin söfn ennþá",
   "empty_column.account_featured_self.no_collections_button": "Búa til safn",
+  "empty_column.account_featured_self.no_collections_hide_tab": "Fela frekar þennan flipa",
   "empty_column.account_featured_self.pre_collections": "Kynntu þér hvað séu söfn",
   "empty_column.account_featured_self.pre_collections_desc": "Söfn (sem koma fram í Mastodon 4.6) gera þér kleift að búa til þina eigin ritstýrðu lista yfir þá aðganga sem þú vilt mæla með við aðra.",
-  "empty_column.account_featured_unknown.no_collections_desc": "Þessi notandi hefur enn ekki útbúið nein söfn.",
+  "empty_column.account_featured_self.showcase_accounts": "Kynntu eftirlætisaðgangana þína",
+  "empty_column.account_featured_self.showcase_accounts_desc": "Söfn eru ritstýrðir listar yfir aðganga til að hjálpa öðrum að uppgötva fleira á samfélagsnetinu.",
   "empty_column.account_featured_unknown.other": "Þessi notandi hefur enn ekki sett neitt með meira vægi.",
   "empty_column.account_hides_collections": "Notandinn hefur valið að gera ekki tiltækar þessar upplýsingar",
   "empty_column.account_suspended": "Notandaaðgangur í frysti",

app/javascript/mastodon/locales/it.json

@@ -45,6 +45,7 @@
   "account.featured": "In evidenza",
   "account.featured.accounts": "Profili",
   "account.featured.collections": "Collezioni",
+  "account.featured.new_collection": "Nuova collezione",
   "account.field_overflow": "Mostra il contenuto completo",
   "account.filters.all": "Tutte le attività",
   "account.filters.boosts_toggle": "Mostra le condivisioni",
@@ -416,7 +417,6 @@
   "column.about": "Info",
   "column.blocks": "Utenti bloccati",
   "column.bookmarks": "Segnalibri",
-  "column.collections": "Le mie collezioni",
   "column.community": "Cronologia locale",
   "column.create_list": "Crea lista",
   "column.direct": "Menzioni private",
@@ -432,7 +432,9 @@
   "column.list_members": "Gestisci i membri della lista",
   "column.lists": "Liste",
   "column.mutes": "Utenti silenziati",
+  "column.my_collections": "Le mie collezioni",
   "column.notifications": "Notifiche",
+  "column.other_collections": "Collezioni di {name}",
   "column.pins": "Post fissati",
   "column.public": "Timeline federata",
   "column_back_button.label": "Indietro",
@@ -502,6 +504,10 @@
   "confirmations.follow_to_list.confirm": "Segui e aggiungi alla lista",
   "confirmations.follow_to_list.message": "Devi seguire {name} per aggiungerli a una lista.",
   "confirmations.follow_to_list.title": "Seguire l'utente?",
+  "confirmations.hide_featured_tab.confirm": "Nascondi la scheda",
+  "confirmations.hide_featured_tab.intro": "Puoi modificare questa impostazione in qualsiasi momento in <i>Modifica profilo > Impostazioni della scheda del profilo</i>.",
+  "confirmations.hide_featured_tab.message": "Questa opzione nasconderà la scheda per gli utenti su {serverName} e su altri server che eseguono l'ultima versione di Mastodon. Per gli altri utenti, la visualizzazione potrebbe variare.",
+  "confirmations.hide_featured_tab.title": "Nascondere la scheda \"In evidenza\"?",
   "confirmations.logout.confirm": "Disconnettiti",
   "confirmations.logout.message": "Sei sicuro di volerti disconnettere?",
   "confirmations.logout.title": "Uscire?",
@@ -606,14 +612,13 @@
   "emoji_button.search_results": "Risultati della ricerca",
   "emoji_button.symbols": "Simboli",
   "emoji_button.travel": "Viaggi & Luoghi",
-  "empty_column.account_featured.other": "{acct} non ha ancora messo in evidenza nulla. Sapevi che puoi mettere in evidenza gli hashtag che usi più spesso e persino gli account dei tuoi amici sul tuo profilo?",
+  "empty_column.account_featured.other": "{acct} non ha ancora messo nulla in evidenza.",
-  "empty_column.account_featured_other.no_collections_desc": "{acct} non ha ancora creato alcuna collezione.",
-  "empty_column.account_featured_other.title": "Niente da vedere qui",
-  "empty_column.account_featured_self.no_collections": "Nessuna collezione ancora",
   "empty_column.account_featured_self.no_collections_button": "Crea una collezione",
+  "empty_column.account_featured_self.no_collections_hide_tab": "Nascondi questa scheda invece",
   "empty_column.account_featured_self.pre_collections": "Resta sintonizzato/a per le collezioni",
-  "empty_column.account_featured_self.pre_collections_desc": "Le collezioni (in arrivo su Mastodon 4.6) ti consentono di creare i tuoi elenchi curati di account da consigliare ad altri.",
+  "empty_column.account_featured_self.pre_collections_desc": "Le collezioni (in arrivo su Mastodon 4.6) ti permettono di creare i tuoi elenchi curati di account da consigliare ad altri.",
-  "empty_column.account_featured_unknown.no_collections_desc": "Questo account non ha ancora creato alcuna collezione.",
+  "empty_column.account_featured_self.showcase_accounts": "Mostra i tuoi account preferiti",
+  "empty_column.account_featured_self.showcase_accounts_desc": "Le collezioni sono elenchi curati di account che aiutano gli altri utenti a scoprire di più sul fediverso.",
   "empty_column.account_featured_unknown.other": "Questo account non ha ancora presentato nulla.",
   "empty_column.account_hides_collections": "Questo utente ha scelto di non rendere disponibili queste informazioni",
   "empty_column.account_suspended": "Profilo sospeso",

app/javascript/mastodon/locales/ja.json

@@ -44,6 +44,8 @@
   "account.familiar_followers_two": "{name1} さんと {name2} さんもフォローしています",
   "account.featured": "注目",
   "account.featured.accounts": "プロフィール",
+  "account.featured.collections": "コレクション",
+  "account.featured.new_collection": "新規のコレクション",
   "account.filters.all": "全てのアクティビティ",
   "account.filters.boosts_toggle": "ブーストを表示",
   "account.filters.posts_boosts": "投稿とブースト",
@@ -183,6 +185,28 @@
   "closed_registrations_modal.find_another_server": "別のサーバーを探す",
   "closed_registrations_modal.preamble": "Mastodonは分散型なのでどのサーバーでアカウントを作成してもこのサーバーのユーザーを誰でもフォローして交流することができます。また自分でホスティングすることもできます！",
   "closed_registrations_modal.title": "Mastodonでアカウントを作成",
+  "collection.share_modal.share_via_post": "Mastodonに投稿",
+  "collection.share_modal.share_via_system": "共有…",
+  "collection.share_modal.title": "コレクションを共有",
+  "collection.share_modal.title_new": "新しいコレクションを共有しよう！",
+  "collection.share_template_other": "この素敵なコレクションを見てみてください： {link}",
+  "collection.share_template_own": "私の新しいコレクションを見てみてください： {link}",
+  "collections.accounts.empty_title": "このコレクションは空です",
+  "collections.by_account": "{account_handle} による",
+  "collections.collection_language": "言語",
+  "collections.confirm_account_removal": "このコレクションからこのアカウントを削除してもよろしいですか？",
+  "collections.create_collection": "コレクションを作成",
+  "collections.delete_collection": "コレクションを削除",
+  "collections.description_length_hint": "100 文字制限",
+  "collections.detail.accounts_heading": "アカウント",
+  "collections.detail.author_added_you_on_date": "{author} があなたを {date} に追加しました",
+  "collections.detail.loading": "コレクションを読み込み中…",
+  "collections.detail.share": "コレクションを共有",
+  "collections.detail.you_are_in_this_collection": "あなたはこのコレクションで紹介されています",
+  "collections.new_collection": "新規のコレクション",
+  "collections.no_collections_yet": "コレクションはまだありません。",
+  "collections.remove_account": "このアカウントを削除する",
+  "collections.report_collection": "このコレクションを通報する",
   "column.about": "概要",
   "column.blocks": "ブロックしたユーザー",
   "column.bookmarks": "ブックマーク",
@@ -341,7 +365,6 @@
   "emoji_button.search_results": "検索結果",
   "emoji_button.symbols": "記号",
   "emoji_button.travel": "旅行と場所",
-  "empty_column.account_featured.other": "{acct}ではまだ何もフィーチャーされていません。最もよく使うハッシュタグや、更には友達のアカウントまでプロフィール上でフィーチャーできると知っていましたか？",
   "empty_column.account_hides_collections": "このユーザーはこの情報を開示しないことにしています。",
   "empty_column.account_suspended": "アカウントは停止されています",
   "empty_column.account_timeline": "投稿がありません！",

app/javascript/mastodon/locales/kab.json

@@ -36,6 +36,7 @@
   "account.familiar_followers_one": "Yeṭṭafar-it {name1}",
   "account.familiar_followers_two": "Yeṭṭafar-it {name1} akked {name2}",
   "account.featured.accounts": "Imeɣna",
+  "account.featured.collections": "Tilkensa",
   "account.filters.posts_only": "Tisuffaɣ",
   "account.filters.posts_replies": "Tisuffaɣ d tririyin",
   "account.filters.replies_toggle": "Sken-d tiririyin",
@@ -95,6 +96,7 @@
   "account.share": "Bḍu amaɣnu n @{name}",
   "account.show_reblogs": "Ssken-d inebḍa n @{name}",
   "account.statuses_counter": "{count, plural, one {{counter} n tsuffeɣt} other {{counter} n tsuffaɣ}}",
+  "account.timeline.pinned": "Yettwasenṭeḍ",
   "account.unblock": "Serreḥ i @{name}",
   "account.unblock_domain": "Ssken-d {domain}",
   "account.unblock_domain_short": "Serreḥ",
@@ -104,6 +106,34 @@
   "account.unmute": "Kkes asgugem ɣef @{name}",
   "account.unmute_notifications_short": "Serreḥ i yilɣa",
   "account.unmute_short": "Kkes asgugem",
+  "account_edit.advanced_settings.bot_label": "Amiḍan awurman",
+  "account_edit.advanced_settings.title": "Iɣewwaren leqqayen",
+  "account_edit.bio.add_label": "Rnu tameddurt",
+  "account_edit.bio.edit_label": "Ẓreg tameddurt",
+  "account_edit.bio.title": "Tameddurt",
+  "account_edit.bio_modal.add_title": "Rnu tameddurt",
+  "account_edit.bio_modal.edit_title": "Ẓreg tameddurt",
+  "account_edit.column_button": "Immed",
+  "account_edit.column_title": "Ẓreg amaɣnu",
+  "account_edit.custom_fields.add_label": "Rnu urti",
+  "account_edit.field_actions.delete": "Kkes urti",
+  "account_edit.field_actions.edit": "Ẓreg urti",
+  "account_edit.field_delete_modal.delete_button": "Kkes",
+  "account_edit.field_edit_modal.value_hint": "Amedya “https://example.me”",
+  "account_edit.field_edit_modal.value_label": "Azal",
+  "account_edit.image_alt_modal.add_title": "Rnu aḍris amlellay",
+  "account_edit.image_alt_modal.edit_title": "Ẓreg aḍris amlellay",
+  "account_edit.image_alt_modal.text_label": "Aḍris amlellay",
+  "account_edit.image_delete_modal.delete_button": "Kkes",
+  "account_edit.image_edit.add_button": "Rnu tugna",
+  "account_edit.image_edit.alt_add_button": "Rnu aḍris amlellay",
+  "account_edit.image_edit.alt_edit_button": "Ẓreg aḍris amlellay",
+  "account_edit.image_edit.remove_button": "Kkes tugna",
+  "account_edit.image_edit.replace_button": "Semselsi tugna",
+  "account_edit.item_list.delete": "Kkes {name}",
+  "account_edit.item_list.edit": "Ẓreg {name}",
+  "account_edit.profile_tab.button_label": "Sagen",
+  "account_edit_tags.add_tag": "Rnu #{tagName}",
   "account_note.placeholder": "Ulac iwenniten",
   "admin.dashboard.retention.cohort_size": "Iseqdacen imaynuten",
   "alert.rate_limited.message": "Ma ulac aɣilif ɛreḍ tikelt-nniḍen akka {retry_time, time, medium}.",
@@ -159,10 +189,39 @@
   "closed_registrations_modal.description": "Asnulfu n umiḍan deg {domain} mačči d ayen izemren ad yili, maca ttxil-k·m, err deg lbal-ik·im belli ur teḥwaǧeḍ ara amiḍan s wudem ibanen ɣef {domain} akken ad tesqedceḍ Mastodon.",
   "closed_registrations_modal.find_another_server": "Aff-d aqeddac nniḍen",
   "closed_registrations_modal.title": "Ajerred deg Masṭudun",
+  "collection.share_modal.share_link_label": "Aseɣwen ara tezzureḍ",
+  "collection.share_modal.share_via_post": "Asuffeɣ deg Matodon",
+  "collection.share_modal.share_via_system": "Zuzer s…",
+  "collection.share_modal.title": "Bḍu talkensit",
+  "collection.share_modal.title_new": "Zuzer talkensit-ik·im tamaynut!",
+  "collections.accounts.empty_title": "Talkensit-a d tilemt",
+  "collections.by_account": "sɣur {account_handle}",
   "collections.collection_description": "Aglam",
+  "collections.collection_language": "Tutlayt",
+  "collections.collection_language_none": "Ula yiwet",
   "collections.collection_name": "Isem",
+  "collections.collection_topic": "Asentel",
   "collections.continue": "Kemmel",
+  "collections.create_collection": "Snulfu-d talkensit",
+  "collections.delete_collection": "Kkes talkensit",
+  "collections.detail.accounts_heading": "Imiḍanen",
+  "collections.detail.loading": "Aɛebbi n telkensit…",
+  "collections.detail.revoke_inclusion": "Kkes-iyi",
+  "collections.detail.sensitive_content": "Agbur amḥulfu",
+  "collections.detail.share": "Zuzer talkensit-a",
+  "collections.edit_details": "Ẓreg talqayt",
+  "collections.hints.accounts_counter": "{count} / {max} n yimiḍanen",
   "collections.manage_accounts": "Sefrek imiḍanen",
+  "collections.new_collection": "Talkensit tamaynut",
+  "collections.no_collections_yet": "Ur ɛad llant tilkensa.",
+  "collections.remove_account": "Kkes amiḍan-a",
+  "collections.report_collection": "Cetki ɣef telkensit-a",
+  "collections.revoke_collection_inclusion": "Kkes-iyi seg telkensit-a",
+  "collections.search_accounts_label": "Nadi ɣef imiḍanen ara ternuḍ…",
+  "collections.view_collection": "Wali talkensit",
+  "collections.view_other_collections_by_user": "Wali tilkensa nniḍen sɣur useqdac-a",
+  "collections.visibility_public": "Azayaz",
+  "collections.visibility_title": "Abani",
   "column.about": "Ɣef",
   "column.blocks": "Imiḍanen yettusḥebsen",
   "column.bookmarks": "Ticraḍ",
@@ -234,6 +293,7 @@
   "confirmations.discard_draft.post.cancel": "Tuɣalin ar urewway",
   "confirmations.discard_draft.post.title": "Deggeṛ arewway n yizen?",
   "confirmations.discard_edit_media.confirm": "Sefsex",
+  "confirmations.follow_to_collection.confirm": "Ḍfeṛ-it sakin rnu-t ɣer telkensit",
   "confirmations.follow_to_list.confirm": "Ḍfeṛ-it sakin rnu-t ɣer tebdart",
   "confirmations.follow_to_list.title": "Ḍfer aseqdac?",
   "confirmations.logout.confirm": "Ffeɣ",
@@ -249,6 +309,7 @@
   "confirmations.redraft.confirm": "Kkes sakin ɛiwed tira",
   "confirmations.redraft.title": "Kkes sakin ɛiwed tira n tsuffeɣt?",
   "confirmations.remove_from_followers.confirm": "Kkes aneḍfar",
+  "confirmations.revoke_collection_inclusion.confirm": "Kkes-iyi",
   "confirmations.revoke_quote.confirm": "Kkes tasuffeɣt",
   "confirmations.revoke_quote.title": "Kkes tasuffeɣt?",
   "confirmations.unblock.confirm": "Serreḥ",
@@ -259,6 +320,7 @@
   "content_warning.hide": "Ffer tasuffeɣt",
   "content_warning.show": "Ssken-d akken tebɣu tili",
   "content_warning.show_more": "Sken-d ugar",
+  "content_warning.show_short": "Sken-d",
   "conversation.delete": "Kkes adiwenni",
   "conversation.mark_as_read": "Creḍ yettwaɣṛa",
   "conversation.open": "Ssken adiwenni",
@@ -287,6 +349,7 @@
   "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",
   "embed.instructions": "Ẓẓu addad-agi deg usmel-inek·inem s wenɣal n tangalt yellan sdaw-agi.",
   "embed.preview": "Akka ara d-iban:",
   "emoji_button.activity": "Aqeddic",
@@ -304,6 +367,7 @@
   "emoji_button.search_results": "Igemmaḍ n unadi",
   "emoji_button.symbols": "Izamulen",
   "emoji_button.travel": "Imeḍqan d Yinigen",
+  "empty_column.account_featured_self.no_collections_button": "Snulfu-d talkensit",
   "empty_column.account_suspended": "Amiḍan yettwaḥbas",
   "empty_column.account_timeline": "Ulac tisuffaɣ da !",
   "empty_column.account_unavailable": "Ur nufi ara amaɣnu-ayi",
@@ -330,6 +394,8 @@
   "explore.trending_tags": "Ihacṭagen",
   "featured_carousel.header": "{count, plural, one {n tsuffeɣt tunṭiḍt} other {n tsuffaɣ tunṭiḍin}}",
   "featured_tags.more_items": "+{count}",
+  "featured_tags.suggestions.add": "Rnu",
+  "featured_tags.suggestions.dismiss": "Uhu, tanemmirt",
   "filter_modal.added.review_and_configure_title": "Iɣewwaṛen n imzizdig",
   "filter_modal.added.settings_link": "asebter n yiɣewwaṛen",
   "filter_modal.added.short_explanation": "Tasuffeɣt-a tettwarna ɣer taggayt-a n yimsizdegen: {title}.",
@@ -356,6 +422,7 @@
   "follow_suggestions.view_all": "Wali-ten akk",
   "follow_suggestions.who_to_follow": "Ad tḍefreḍ?",
   "followed_tags": "Ihacṭagen yettwaḍfaren",
+  "followers.title": "Yeṭṭafaṛ {name}",
   "footer.about": "Ɣef",
   "footer.about_mastodon": "Ɣef Mastodon",
   "footer.about_server": "Ɣef {domain}",
@@ -490,6 +557,7 @@
   "navigation_bar.automated_deletion": "Tukksa tawurmant n tsuffaɣ",
   "navigation_bar.blocks": "Iseqdacen yettusḥebsen",
   "navigation_bar.bookmarks": "Ticraḍ",
+  "navigation_bar.collections": "Tilkensa",
   "navigation_bar.direct": "Tibdarin tusligin",
   "navigation_bar.domain_blocks": "Tiɣula yeffren",
   "navigation_bar.favourites": "Imenyafen",

app/javascript/mastodon/locales/ko.json

@@ -397,7 +397,6 @@
   "emoji_button.search_results": "검색 결과",
   "emoji_button.symbols": "기호",
   "emoji_button.travel": "여행과 장소",
-  "empty_column.account_featured.other": "{acct} 님은 아직 아무 것도 추천하지 않았습니다. 자주 사용하는 해시태그, 친구의 계정까지 내 계정에서 추천할 수 있다는 것을 알고 계셨나요?",
   "empty_column.account_hides_collections": "이 사용자는 이 정보를 사용할 수 없도록 설정했습니다",
   "empty_column.account_suspended": "계정 정지됨",
   "empty_column.account_timeline": "이곳에는 게시물이 없습니다!",

app/javascript/mastodon/locales/lt.json

@@ -350,7 +350,6 @@
   "emoji_button.search_results": "Paieškos rezultatai",
   "emoji_button.symbols": "Simboliai",
   "emoji_button.travel": "Kelionės ir vietos",
-  "empty_column.account_featured.other": "{acct} dar nieko neparyškino. Ar žinojote, kad savo profilyje galite pateikti dažniausiai naudojamus grotžymes ir netgi savo draugų paskyras?",
   "empty_column.account_hides_collections": "Šis (-i) naudotojas (-a) pasirinko nepadaryti šią informaciją prieinamą.",
   "empty_column.account_suspended": "Paskyra pristabdyta.",
   "empty_column.account_timeline": "Nėra čia įrašų.",

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

@@ -412,7 +412,6 @@
   "column.about": "概要",
   "column.blocks": "封鎖ê用者",
   "column.bookmarks": "冊籤",
-  "column.collections": "我ê收藏",
   "column.community": "本地ê時間線",
   "column.create_list": "建立列單",
   "column.direct": "私人ê提起",
@@ -600,14 +599,8 @@
   "emoji_button.search_results": "Tshiau-tshuē ê結果",
   "emoji_button.symbols": "符號",
   "emoji_button.travel": "旅行kap地點",
-  "empty_column.account_featured.other": "{acct} iáu無任何ê特色內容。Lí kám知影lí ē當kā lí tsia̍p-tsia̍p用ê hashtag，甚至是朋友ê口座揀做特色ê內容，khǹg佇lí ê個人資料內底？",
-  "empty_column.account_featured_other.no_collections_desc": "{acct} iáu bē建立任何收藏。",
-  "empty_column.account_featured_other.title": "無半項通看",
-  "empty_column.account_featured_self.no_collections": "Iáu無收藏",
   "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 推出）允准lí建立家kī斟酌揀ê口座列單，推薦予別lâng。",
-  "empty_column.account_featured_unknown.no_collections_desc": "Tsit ê口座 iáu bē建立任何收藏。",
   "empty_column.account_featured_unknown.other": "Tsit ê口座iáu無收藏siánn物。",
   "empty_column.account_hides_collections": "Tsit位用者選擇無愛公開tsit ê資訊",
   "empty_column.account_suspended": "口座已經受停止",

app/javascript/mastodon/locales/nl.json

@@ -45,6 +45,7 @@
   "account.featured": "Uitgelicht",
   "account.featured.accounts": "Profielen",
   "account.featured.collections": "Verzamelingen",
+  "account.featured.new_collection": "Nieuwe verzameling",
   "account.field_overflow": "Volledige inhoud tonen",
   "account.filters.all": "Alle activiteit",
   "account.filters.boosts_toggle": "Boosts tonen",
@@ -70,8 +71,9 @@
   "account.go_to_profile": "Ga naar profiel",
   "account.hide_reblogs": "Boosts van @{name} verbergen",
   "account.in_memoriam": "In memoriam.",
-  "account.joined_short": "Geregistreerd",
+  "account.joined_short": "Sinds",
   "account.languages": "Getoonde talen wijzigen",
+  "account.last_active": "Laatst actief",
   "account.link_verified_on": "Eigendom van deze link is gecontroleerd op {date}",
   "account.locked_info": "De privacystatus van dit account is ingesteld op vergrendeld. De eigenaar beoordeelt handmatig wie diegene kan volgen.",
   "account.media": "Media",
@@ -101,6 +103,7 @@
   "account.muted": "Genegeerd",
   "account.muting": "Genegeerd",
   "account.mutual": "Jullie volgen elkaar",
+  "account.name.copy": "Fediverse-adres kopiëren",
   "account.name.help.domain": "{domain} is de server waar zich het profiel en de berichten van de gebruiker bevinden.",
   "account.name.help.domain_self": "{domain} is jouw server waar zich jouw profiel en berichten bevinden.",
   "account.name.help.footer": "Net zoals je e-mails kunt verzenden naar mensen met verschillende e-mailproviders, kun je interactie hebben met mensen op andere Mastodon-servers – en met iedereen op andere social apps, die met behulp van het ActivityPub-protocol met Mastodon kunnen communiceren.",
@@ -137,6 +140,9 @@
   "account.unmute": "@{name} niet langer negeren",
   "account.unmute_notifications_short": "Meldingen niet langer negeren",
   "account.unmute_short": "Niet langer negeren",
+  "account_edit.advanced_settings.bot_hint": "Maak aan anderen duidelijk dat dit account voornamelijk automatische acties uitvoert en dat deze waarschijnlijk niet wordt gecontroleerd",
+  "account_edit.advanced_settings.bot_label": "Geautomatiseerd account",
+  "account_edit.advanced_settings.title": "Geavanceerde instellingen",
   "account_edit.bio.add_label": "Biografie toevoegen",
   "account_edit.bio.edit_label": "Biografie bewerken",
   "account_edit.bio.placeholder": "Vertel iets over jezelf, zodat anderen inzicht krijgen in wat voor persoon je bent.",
@@ -162,15 +168,15 @@
   "account_edit.featured_hashtags.title": "Uitgelichte hashtags",
   "account_edit.field_actions.delete": "Veld verwijderen",
   "account_edit.field_actions.edit": "Veld bewerken",
-  "account_edit.field_delete_modal.confirm": "Weet je zeker dat je dit aangepaste veld wilt verwijderen? Deze actie kan niet ongedaan worden gemaakt.",
+  "account_edit.field_delete_modal.confirm": "Weet je zeker dat je dit extra veld wilt verwijderen? Deze actie kan niet ongedaan worden gemaakt.",
   "account_edit.field_delete_modal.delete_button": "Verwijderen",
-  "account_edit.field_delete_modal.title": "Aangepast veld verwijderen?",
+  "account_edit.field_delete_modal.title": "Extra veld verwijderen?",
-  "account_edit.field_edit_modal.add_title": "Aangepast veld toevoegen",
+  "account_edit.field_edit_modal.add_title": "Extra veld toevoegen",
   "account_edit.field_edit_modal.discard_confirm": "Weggooien",
   "account_edit.field_edit_modal.discard_message": "Je hebt niet-opgeslagen wijzigingen. Weet je zeker dat je ze wilt weggooien?",
-  "account_edit.field_edit_modal.edit_title": "Aangepast veld bewerken",
+  "account_edit.field_edit_modal.edit_title": "Extra veld bewerken",
   "account_edit.field_edit_modal.length_warning": "Aanbevolen tekenlimiet overschreden. Mobiele gebruikers zien mogelijk niet volledig je veld.",
-  "account_edit.field_edit_modal.link_emoji_warning": "We raden aan om geen lokale emoji in combinatie met URL's te gebruiken. Aangepaste velden die beide bevatten worden alleen als tekst weergegeven, in plaats van als een link. Dit om verwarring voor de gebruiker te voorkomen.",
+  "account_edit.field_edit_modal.link_emoji_warning": "We raden aan om geen lokale emoji in combinatie met URL's te gebruiken. Extra velden die beide bevatten worden alleen als tekst weergegeven, in plaats van als een link. Dit om verwarring voor de gebruiker te voorkomen.",
   "account_edit.field_edit_modal.name_hint": "Bijv. \"Persoonlijke website\"",
   "account_edit.field_edit_modal.name_label": "Label",
   "account_edit.field_edit_modal.url_warning": "Voeg {protocol} aan het begin toe om een link toe te voegen.",
@@ -178,7 +184,7 @@
   "account_edit.field_edit_modal.value_label": "Waarde",
   "account_edit.field_reorder_modal.drag_cancel": "Slepen is geannuleerd. Veld \"{item}\" werd geschrapt.",
   "account_edit.field_reorder_modal.drag_end": "Veld \"{item}\" werd geschrapt.",
-  "account_edit.field_reorder_modal.drag_instructions": "Druk op spatie of enter om de aangepaste velden te herschikken. Gebruik de pijltjestoetsen om het veld omhoog of omlaag te verplaatsen. Druk opnieuw op spatie of enter om het veld op diens nieuwe positie te laten vallen, of druk op escape om te annuleren.",
+  "account_edit.field_reorder_modal.drag_instructions": "Druk op spatie of enter om de extra velden te herschikken. Gebruik de pijltjestoetsen om het veld omhoog of omlaag te verplaatsen. Druk opnieuw op spatie of enter om het veld op diens nieuwe positie te laten vallen, of druk op escape om te annuleren.",
   "account_edit.field_reorder_modal.drag_move": "Veld \"{item}\" is verplaatst.",
   "account_edit.field_reorder_modal.drag_over": "Veld \"{item}\" is over \"{over}\" geplaatst.",
   "account_edit.field_reorder_modal.drag_start": "Opgepakt veld \"{item}\".",
@@ -212,7 +218,7 @@
   "account_edit.profile_tab.show_media_replies.description": "Wanneer dit is ingeschakeld, worden op het tabblad Media zowel jouw berichten en reacties op berichten van anderen weergegeven.",
   "account_edit.profile_tab.show_media_replies.title": "Jouw reacties aan het tabblad 'Media' toevoegen",
   "account_edit.profile_tab.subtitle": "De tabbladen op je profiel aanpassen en wat er op wordt weergegeven.",
-  "account_edit.profile_tab.title": "Instellingen voor tabblad Profiel",
+  "account_edit.profile_tab.title": "Instellingen voor Profieltabblad",
   "account_edit.save": "Opslaan",
   "account_edit.upload_modal.back": "Terug",
   "account_edit.upload_modal.done": "Klaar",
@@ -230,8 +236,8 @@
   "account_edit.verified_modal.invisible_link.details": "Voeg de link aan de HTML van je website toe. Het belangrijkste onderdeel is rel=\"me\", waarmee wordt voorkomen dat websites met user-generated content geïmpersoneerd kunnen worden. Je kunt zelfs een <link>-tag gebruiken binnen de <head>-tag van je website in plaats van {tag}, maar de HTML moet zonder JavaScript toegankelijk zijn.",
   "account_edit.verified_modal.invisible_link.summary": "Hoe maak ik de link onzichtbaar?",
   "account_edit.verified_modal.step1.header": "Kopieer de onderstaande HTML-code en plak deze binnen de <head>-tag van je website",
-  "account_edit.verified_modal.step2.details": "Als je je website al als een aangepast veld hebt toegevoegd, moet je deze verwijderen en opnieuw toevoegen om de verificatie te activeren.",
+  "account_edit.verified_modal.step2.details": "Wanneer je je website al als een extra veld hebt toegevoegd, moet je deze verwijderen en opnieuw toevoegen om de verificatie te activeren.",
-  "account_edit.verified_modal.step2.header": "Voeg je website toe als een aangepast veld",
+  "account_edit.verified_modal.step2.header": "Je website als een extra veld toevoegen",
   "account_edit.verified_modal.title": "Hoe voeg je een geverifieerde link toe",
   "account_edit_tags.add_tag": "#{tagName} toevoegen",
   "account_edit_tags.column_title": "Labels bewerken",
@@ -373,11 +379,13 @@
   "collections.delete_collection": "Verzameling verwijderen",
   "collections.description_length_hint": "Maximaal 100 karakters",
   "collections.detail.accounts_heading": "Accounts",
+  "collections.detail.author_added_you_on_date": "{author} heeft je op {date} toegevoegd",
   "collections.detail.loading": "Verzameling laden…",
   "collections.detail.revoke_inclusion": "Verwijder mij",
   "collections.detail.sensitive_content": "Gevoelige inhoud",
   "collections.detail.sensitive_note": "Deze verzameling bevat accounts en inhoud die mogelijk gevoelig zijn voor sommige gebruikers.",
   "collections.detail.share": "Deze verzameling delen",
+  "collections.detail.you_are_in_this_collection": "Je wordt in deze verzameling uitgelicht",
   "collections.edit_details": "Gegevens bewerken",
   "collections.error_loading_collections": "Er is een fout opgetreden bij het laden van je verzamelingen.",
   "collections.hints.accounts_counter": "{count} / {max} accounts",
@@ -409,7 +417,6 @@
   "column.about": "Over",
   "column.blocks": "Geblokkeerde gebruikers",
   "column.bookmarks": "Bladwijzers",
-  "column.collections": "Mijn verzamelingen",
   "column.community": "Lokale tijdlijn",
   "column.create_list": "Lijst aanmaken",
   "column.direct": "Privéberichten",
@@ -425,7 +432,9 @@
   "column.list_members": "Lijstleden beheren",
   "column.lists": "Lijsten",
   "column.mutes": "Genegeerde gebruikers",
+  "column.my_collections": "Mijn verzamelingen",
   "column.notifications": "Meldingen",
+  "column.other_collections": "Verzamelingen door {name}",
   "column.pins": "Vastgezette berichten",
   "column.public": "Globale tijdlijn",
   "column_back_button.label": "Terug",
@@ -495,6 +504,10 @@
   "confirmations.follow_to_list.confirm": "Volgen en toevoegen aan de lijst",
   "confirmations.follow_to_list.message": "Je moet {name} volgen om dit account aan een lijst toe te kunnen voegen.",
   "confirmations.follow_to_list.title": "Gebruiker volgen?",
+  "confirmations.hide_featured_tab.confirm": "Tabblad verbergen",
+  "confirmations.hide_featured_tab.intro": "Je kunt dit op elk moment wijzigen onder <i>Profiel bewerken > Instellingen voor Profieltabblad</i>.",
+  "confirmations.hide_featured_tab.message": "Dit verbergt het tabblad voor gebruikers op {serverName} en andere servers met de meest recente versie van Mastodon. Dit kan op andere apparaten afwijken.",
+  "confirmations.hide_featured_tab.title": "Tabblad \"Uitgelicht\" verbergen?",
   "confirmations.logout.confirm": "Uitloggen",
   "confirmations.logout.message": "Weet je zeker dat je wilt uitloggen?",
   "confirmations.logout.title": "Uitloggen?",
@@ -574,9 +587,11 @@
   "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",
+  "email_subscriptions.form.bottom": "Krijg berichten in je e-mail zonder een Mastodon-account aan te maken. Je kunt je op elk moment uitschrijven. Bekijk het <a>Privacybeleid</a> voor meer informatie.",
   "email_subscriptions.form.title": "Op e-mailupdates van {name} abonneren",
-  "email_subscriptions.submitted.lead": "Kijk in je inbox voor een e-mail waarmee je het abbonement op de e-mailupdates kunt bevestigen.",
+  "email_subscriptions.submitted.lead": "Kijk in je e-mail voor een mail waarmee je het abbonement op de e-mailupdates kunt bevestigen.",
   "email_subscriptions.submitted.title": "Nog één stap",
   "email_subscriptions.validation.email.blocked": "Geblokkeerde e-mailprovider",
   "email_subscriptions.validation.email.invalid": "Ongeldig e-mailadres",
@@ -597,7 +612,14 @@
   "emoji_button.search_results": "Zoekresultaten",
   "emoji_button.symbols": "Symbolen",
   "emoji_button.travel": "Reizen en locaties",
-  "empty_column.account_featured.other": "{acct} heeft nog niets uitgelicht. Wist je dat je een aantal van jouw berichten, jouw meest gebruikte hashtags en zelfs accounts van je vrienden op je profiel kunt uitlichten?",
+  "empty_column.account_featured.other": "{acct} heeft nog niks uitgelicht.",
+  "empty_column.account_featured_self.no_collections_button": "Een verzameling aanmaken",
+  "empty_column.account_featured_self.no_collections_hide_tab": "In plaats daarvan dit tabblad verbergen",
+  "empty_column.account_featured_self.pre_collections": "Binnenkort: Verzamelingen",
+  "empty_column.account_featured_self.pre_collections_desc": "Met Verzamelingen (vanaf Mastodon 4.6) kun je jouw eigen gecureerde lijsten met accounts samenstellen om aan anderen aan te bevelen.",
+  "empty_column.account_featured_self.showcase_accounts": "Jouw favoriete accounts aanbevelen",
+  "empty_column.account_featured_self.showcase_accounts_desc": "Verzamelingen zijn gecureerde lijsten met accounts, om anderen te helpen meer van de Fediverse te ontdekken.",
+  "empty_column.account_featured_unknown.other": "Dit account heeft nog niks uitgelicht.",
   "empty_column.account_hides_collections": "Deze gebruiker heeft ervoor gekozen deze informatie niet beschikbaar te maken",
   "empty_column.account_suspended": "Account opgeschort",
   "empty_column.account_timeline": "Hier zijn geen berichten!",
@@ -834,7 +856,7 @@
   "lists.replies_policy.none": "Niemand",
   "lists.save": "Opslaan",
   "lists.search": "Zoeken",
-  "lists.show_replies_to": "Voeg antwoorden van lijstleden toe aan",
+  "lists.show_replies_to": "Ook reacties van lijstleden toevoegen",
   "load_pending": "{count, plural, one {# nieuw item} other {# nieuwe items}}",
   "loading_indicator.label": "Laden…",
   "media_gallery.hide": "Verberg",

app/javascript/mastodon/locales/nn.json

@@ -416,7 +416,6 @@
   "column.about": "Om",
   "column.blocks": "Blokkerte brukarar",
   "column.bookmarks": "Bokmerke",
-  "column.collections": "Samlingane mine",
   "column.community": "Lokal tidsline",
   "column.create_list": "Lag liste",
   "column.direct": "Private omtaler",
@@ -606,14 +605,8 @@
   "emoji_button.search_results": "Søkeresultat",
   "emoji_button.symbols": "Symbol",
   "emoji_button.travel": "Reise & stader",
-  "empty_column.account_featured.other": "{acct} har ikkje valt ut noko enno. Visste du at du kan velja ut emneknaggar du bruker mykje, og til og med venekontoar på profilen din?",
-  "empty_column.account_featured_other.no_collections_desc": "{acct} har ikkje laga nokon samlingar enno.",
-  "empty_column.account_featured_other.title": "Ingenting å sjå her",
-  "empty_column.account_featured_self.no_collections": "Ingen samlingar enno",
   "empty_column.account_featured_self.no_collections_button": "Lag ei samling",
   "empty_column.account_featured_self.pre_collections": "Fylg med for å sjå samlingar",
-  "empty_column.account_featured_self.pre_collections_desc": "Samlingar (kjem i Mastodon 4.6) gjer det mogleg å laga dine eigne lister med kontoar du kan tilrå til andre.",
-  "empty_column.account_featured_unknown.no_collections_desc": "Denne kontoen har ikkje laga nokon samlingar enno.",
   "empty_column.account_featured_unknown.other": "Denne kontoen har ikkje valt ut noko enno.",
   "empty_column.account_hides_collections": "Denne brukaren har valt å ikkje gjere denne informasjonen tilgjengeleg",
   "empty_column.account_suspended": "Kontoen er utestengd",

app/javascript/mastodon/locales/no.json

@@ -372,7 +372,6 @@
   "emoji_button.search_results": "Søkeresultat",
   "emoji_button.symbols": "Symboler",
   "emoji_button.travel": "Reise & steder",
-  "empty_column.account_featured.other": "{acct} har ikke fremhevet noe ennå. Visste du at du kan fremheve emneknaggene du bruker mest, eller til og med dine venners profilsider?",
   "empty_column.account_hides_collections": "Denne brukeren har valgt å ikke gjøre denne informasjonen tilgjengelig",
   "empty_column.account_suspended": "Kontoen er suspendert",
   "empty_column.account_timeline": "Ingen innlegg her!",

app/javascript/mastodon/locales/pa.json

@@ -156,7 +156,6 @@
   "column.about": "ਸਾਡੇ ਬਾਰੇ",
   "column.blocks": "ਪਾਬੰਦੀ ਲਾਏ ਵਰਤੋਂਕਾਰ",
   "column.bookmarks": "ਬੁੱਕਮਾਰਕ",
-  "column.collections": "ਮੇਰਾ ਭੰਡਾਰ",
   "column.community": "ਲੋਕਲ ਸਮਾਂ-ਲਾਈਨ",
   "column.create_list": "ਸੂਚੀ ਬਣਾਓ",
   "column.direct": "ਨਿੱਜੀ ਜ਼ਿਕਰ",

app/javascript/mastodon/locales/pl.json

@@ -434,7 +434,6 @@
   "emoji_button.search_results": "Wyniki wyszukiwania",
   "emoji_button.symbols": "Symbole",
   "emoji_button.travel": "Podróże i miejsca",
-  "empty_column.account_featured.other": "Konto {acct} nie wyróżniło jeszcze żadnych treści. Czy wiesz, że możesz wyróżnić najczęściej używane hashtagi, a nawet konta znajomych w swoim profilu?",
   "empty_column.account_hides_collections": "Ta osoba postanowiła nie udostępniać tych informacji",
   "empty_column.account_suspended": "Konto zawieszone",
   "empty_column.account_timeline": "Brak wpisów!",

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

@@ -408,7 +408,6 @@
   "column.about": "Sobre",
   "column.blocks": "Usuários bloqueados",
   "column.bookmarks": "Salvos",
-  "column.collections": "Minhas coleções",
   "column.community": "Linha local",
   "column.create_list": "Criar lista",
   "column.direct": "Menções privadas",
@@ -589,7 +588,6 @@
   "emoji_button.search_results": "Resultado da pesquisa",
   "emoji_button.symbols": "Símbolos",
   "emoji_button.travel": "Viagem e Lugares",
-  "empty_column.account_featured.other": "{acct} Ainda não destacou nada. Você sabia que pode destacar suas publicações, hashtags que você mais usa e até mesmo contas de seus amigos no seu perfil?",
   "empty_column.account_hides_collections": "A pessoa optou por não disponibilizar esta informação",
   "empty_column.account_suspended": "Conta suspensa",
   "empty_column.account_timeline": "Nada aqui.",

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

@@ -386,7 +386,6 @@
   "column.about": "Sobre",
   "column.blocks": "Utilizadores bloqueados",
   "column.bookmarks": "Favoritos",
-  "column.collections": "As minhas coleções",
   "column.community": "Cronologia local",
   "column.create_list": "Criar lista",
   "column.direct": "Menções privadas",
@@ -567,7 +566,6 @@
   "emoji_button.search_results": "Resultados da pesquisa",
   "emoji_button.symbols": "Símbolos",
   "emoji_button.travel": "Viagens e lugares",
-  "empty_column.account_featured.other": "{acct} ainda não colocou nada em destaque. Sabia que pode destacar as etiquetas que mais utiliza e até as contas dos seus amigos no seu perfil?",
   "empty_column.account_hides_collections": "Este utilizador escolheu não disponibilizar esta informação",
   "empty_column.account_suspended": "Conta suspensa",
   "empty_column.account_timeline": "Sem publicações por aqui!",

app/javascript/mastodon/locales/ru.json

@@ -138,6 +138,7 @@
   "account.unmute": "Не игнорировать @{name}",
   "account.unmute_notifications_short": "Показать уведомления",
   "account.unmute_short": "Не игнорировать",
+  "account_edit.advanced_settings.title": "Расширенные настройки",
   "account_edit.bio.add_label": "Добавить описание профиля",
   "account_edit.bio.edit_label": "Редактировать описание профиля",
   "account_edit.bio.placeholder": "Добавьте немного информации о себе, чтобы другие люди могли легче узнать вас.",
@@ -371,7 +372,6 @@
   "column.about": "О проекте",
   "column.blocks": "Заблокированные пользователи",
   "column.bookmarks": "Закладки",
-  "column.collections": "Мои подборки",
   "column.community": "Локальная лента",
   "column.create_list": "Создать список",
   "column.direct": "Личные упоминания",
@@ -536,6 +536,7 @@
   "domain_pill.your_server": "Ваш цифровой дом, где находятся все ваши посты. Если вам не нравится этот сервер, вы можете в любое время перенести свою учётную запись на другой сервер, не теряя подписчиков.",
   "domain_pill.your_username": "Ваш уникальный идентификатор на этом сервере. На разных серверах могут встречаться люди с тем же именем пользователя.",
   "dropdown.empty": "Выберите вариант",
+  "email_subscriptions.email": "Адрес электронной почты",
   "email_subscriptions.form.action": "Подписаться",
   "email_subscriptions.form.title": "Оформите email-подписку на этого пользователя",
   "email_subscriptions.submitted.title": "Ещё один шаг",
@@ -558,8 +559,6 @@
   "emoji_button.search_results": "Результаты поиска",
   "emoji_button.symbols": "Символы",
   "emoji_button.travel": "Путешествия и места",
-  "empty_column.account_featured.other": "{acct} ещё ничего не рекомендовал(а) в своём профиле. Знаете ли вы, что вы можете рекомендовать в своём профиле часто используемые вами хештеги и даже профили друзей?",
-  "empty_column.account_featured_other.title": "Здесь ничего нет",
   "empty_column.account_hides_collections": "Пользователь предпочёл не раскрывать эту информацию",
   "empty_column.account_suspended": "Учётная запись заблокирована",
   "empty_column.account_timeline": "Здесь нет постов!",
@@ -1114,6 +1113,7 @@
   "sign_in_banner.mastodon_is": "Mastodon — лучший способ быть в курсе всего происходящего.",
   "sign_in_banner.sign_in": "Войти",
   "sign_in_banner.sso_redirect": "Вход/Регистрация",
+  "skip_links.skip_to_content": "Перейти к основному содержимому",
   "status.admin_account": "Открыть интерфейс модератора для @{name}",
   "status.admin_domain": "Открыть интерфейс модератора для {domain}",
   "status.admin_status": "Открыть этот пост в интерфейсе модератора",

app/javascript/mastodon/locales/sl.json

@@ -169,7 +169,6 @@
   "column.about": "O programu",
   "column.blocks": "Blokirani uporabniki",
   "column.bookmarks": "Zaznamki",
-  "column.collections": "Moje zbirke",
   "column.community": "Krajevna časovnica",
   "column.create_list": "Ustvari seznam",
   "column.direct": "Zasebne omembe",

app/javascript/mastodon/locales/sq.json

@@ -45,6 +45,7 @@
   "account.featured": "Të zgjedhur",
   "account.featured.accounts": "Profile",
   "account.featured.collections": "Koleksione",
+  "account.featured.new_collection": "Koleksion i ri",
   "account.field_overflow": "Shfaq lëndë të plotë",
   "account.filters.all": "Krejt veprimtarinë",
   "account.filters.boosts_toggle": "Shfaq përforcime",
@@ -411,7 +412,6 @@
   "column.about": "Mbi",
   "column.blocks": "Përdorues të bllokuar",
   "column.bookmarks": "Faqerojtës",
-  "column.collections": "Koleksionet e mi",
   "column.community": "Rrjedhë kohore vendore",
   "column.create_list": "Krijo listë",
   "column.direct": "Përmendje private",
@@ -427,7 +427,9 @@
   "column.list_members": "Administroni anëtarë liste",
   "column.lists": "Lista",
   "column.mutes": "Përdorues të heshtuar",
+  "column.my_collections": "Koleksionet e mia",
   "column.notifications": "Njoftime",
+  "column.other_collections": "Koleksione nga {name}",
   "column.pins": "Mesazhe të fiksuar",
   "column.public": "Rrjedhë kohore e të federuarave",
   "column_back_button.label": "Mbrapsht",
@@ -497,6 +499,10 @@
   "confirmations.follow_to_list.confirm": "Ndiqe dhe shtoje te listë",
   "confirmations.follow_to_list.message": "Lypset të jeni duke e ndjekur {name}, që të shtohte te një listë.",
   "confirmations.follow_to_list.title": "Të ndiqet përdoruesi?",
+  "confirmations.hide_featured_tab.confirm": "Fshihe skedën",
+  "confirmations.hide_featured_tab.intro": "Mund ta ndryshoni kurdo këtë, që nga <i>Përpunoni profil > Rregullime skede profili</i>.",
+  "confirmations.hide_featured_tab.message": "Kjo do ta fshehë skedën për përdorues në {serverName} dhe shërbyes të tjerë që xhirojnë versionin më të ri të Mastodon. Se si shfaqet te të tjera… varet.",
+  "confirmations.hide_featured_tab.title": "Të fshihet skeda “Të zgjedhur”?",
   "confirmations.logout.confirm": "Dilni",
   "confirmations.logout.message": "Jeni i sigurt se doni të dilet?",
   "confirmations.logout.title": "Të dilet?",
@@ -601,14 +607,13 @@
   "emoji_button.search_results": "Përfundime kërkimi",
   "emoji_button.symbols": "Simbole",
   "emoji_button.travel": "Udhëtime & Vende",
-  "empty_column.account_featured.other": "{acct} s’ka të zgjedhur ende ndonjë gjë. E dini se në profilin tuaj mund të shfaqni si të zgjedhura hashtag-ët që përdorni më tepër dhe madje edhe llogaritë e shokëve tuaj?",
+  "empty_column.account_featured.other": "{acct} s’ka ende ndonjë gjë të zgjedhur.",
-  "empty_column.account_featured_other.no_collections_desc": "{acct} s’ka krijuar ende ndonjë koleksion.",
-  "empty_column.account_featured_other.title": "S’ka ç’shihet këtu",
-  "empty_column.account_featured_self.no_collections": "Ende pa koleksione",
   "empty_column.account_featured_self.no_collections_button": "Krijoni një koleksion",
+  "empty_column.account_featured_self.no_collections_hide_tab": "Fshihe këtë skedë, më mirë",
   "empty_column.account_featured_self.pre_collections": "Ndiqeni për Koleksione",
   "empty_column.account_featured_self.pre_collections_desc": "Koleksionet (që vijnë me Mastodon 4.6) ju lejojnë të krijoni lista tuajat llogarish për t’ua rekomanduar të tjerëve.",
-  "empty_column.account_featured_unknown.no_collections_desc": "Kjo llogari s’ka krijuar ende ndonjë koleksion.",
+  "empty_column.account_featured_self.showcase_accounts": "Shpalosni llogaritë tuaja të parapëlqyera",
+  "empty_column.account_featured_self.showcase_accounts_desc": "Koleksionet janë lista llogarish për të ndihmuar të tjerët të zbulojnë më tepër gjëra në Fedivers.",
   "empty_column.account_featured_unknown.other": "Kjo llogari s’ka zgjedhur gjë ende.",
   "empty_column.account_hides_collections": "Ky përdorues ka zgjedhur të mos e japë këtë informacion",
   "empty_column.account_suspended": "Llogaria u pezullua",

app/javascript/mastodon/locales/sv.json

@@ -45,6 +45,7 @@
   "account.featured": "Utvalda",
   "account.featured.accounts": "Profiler",
   "account.featured.collections": "Samlingar",
+  "account.featured.new_collection": "Ny samling",
   "account.field_overflow": "Visa hela innehållet",
   "account.filters.all": "All aktivitet",
   "account.filters.boosts_toggle": "Visa förstärkningar",
@@ -102,6 +103,7 @@
   "account.muted": "Tystad",
   "account.muting": "Stänger av ljud",
   "account.mutual": "Ni följer varandra",
+  "account.name.copy": "Kopiera handtag",
   "account.name.help.domain": "{domain} är servern som är värd för användarens profil och inlägg.",
   "account.name.help.domain_self": "{domain} är din server som är värd för användarens profil och inlägg.",
   "account.name.help.footer": "Precis som du kan skicka e-post till personer med olika e-postklienter, du kan interagera med personer på andra Mastodon-servrar – och med vem som helst på andra sociala appar som drivs av samma uppsättning regler som Mastodon använder (ActivityPub-protokollet).",
@@ -138,6 +140,8 @@
   "account.unmute": "Sluta tysta @{name}",
   "account.unmute_notifications_short": "Aktivera aviseringsljud",
   "account.unmute_short": "Avtysta",
+  "account_edit.advanced_settings.bot_hint": "Signalera till andra att kontot huvudsakligen utför automatiserade åtgärder och kanske inte övervakas",
+  "account_edit.advanced_settings.bot_label": "Automatiserat konto",
   "account_edit.advanced_settings.title": "Avancerade inställningar",
   "account_edit.bio.add_label": "Lägg till biografi",
   "account_edit.bio.edit_label": "Redigera biografi",
@@ -172,19 +176,76 @@
   "account_edit.field_edit_modal.discard_message": "Du har osparade ändringar. Är du säker på att du vill ta bort dem?",
   "account_edit.field_edit_modal.edit_title": "Redigera tilläggsfält",
   "account_edit.field_edit_modal.length_warning": "Rekommenderad teckengräns överskrids. Mobilanvändare kanske inte ser ditt fält i sin helhet.",
+  "account_edit.field_edit_modal.link_emoji_warning": "Vi rekommenderar att anpassade emoji inte används i kombination med webbadresser. Anpassade fält som innehåller båda kommer endast att visas som text i stället för som en länk för att förhindra förvirring bland användare.",
   "account_edit.field_edit_modal.name_hint": "T.ex. “Personlig webbplats”",
   "account_edit.field_edit_modal.name_label": "Etikett",
   "account_edit.field_edit_modal.url_warning": "För att lägga till en länk, vänligen inkludera {protocol} i början.",
   "account_edit.field_edit_modal.value_hint": "T.ex. \"https://example.me”",
   "account_edit.field_edit_modal.value_label": "Värde",
   "account_edit.field_reorder_modal.drag_cancel": "Flytten avbröts. Fältet \"{item}\" släpptes.",
+  "account_edit.field_reorder_modal.drag_end": "Fältet \"{item}\" har tagits bort.",
+  "account_edit.field_reorder_modal.drag_instructions": "För att organisera om anpassade fält, tryck på mellanslag eller retur. Använd piltangenterna för att flytta fältet upp eller ner. Tryck på mellanslag eller retur igen för att släppa fältet i sin nya position, eller tryck Esc för att avbryta.",
+  "account_edit.field_reorder_modal.drag_move": "Fältet \"{item}\" har flyttats.",
+  "account_edit.field_reorder_modal.drag_over": "Fältet \"{item}\" flyttades över \"{over}\".",
+  "account_edit.field_reorder_modal.drag_start": "Plockade upp fält \"{item}\".",
+  "account_edit.field_reorder_modal.handle_label": "Dra fält \"{item}\"",
+  "account_edit.field_reorder_modal.title": "Organisera om fält",
   "account_edit.image_alt_modal.add_title": "Lägg till alternativ text",
+  "account_edit.image_alt_modal.details_content": "RÄTT: <ul> <li>Beskriv dig själv som avbildad</li> <li>Tala om din själv i tredje person (t.ex. “Alex” istället för “jag”)</li> <li>Var kortfattad – några ord räcker ofta</li> </ul> FEL: <ul> <li>Börja med “Foto av” – det är överflödigt för skärmläsarna</li> </ul> EXEMPEL: <ul> <li>“Alex iklädd en grön skjorta och glasögon”</li> </ul>",
+  "account_edit.image_alt_modal.details_title": "Tips: Alternativ text för profilbilder",
+  "account_edit.image_alt_modal.edit_title": "Redigera alternativ text",
+  "account_edit.image_alt_modal.text_hint": "Alternativ text hjälper användare av skärmläsare att förstå ditt innehåll.",
+  "account_edit.image_alt_modal.text_label": "Alternativ text",
+  "account_edit.image_delete_modal.confirm": "Är du säker du vill ta bort denna bild? Denna åtgärd kan inte ångras.",
+  "account_edit.image_delete_modal.delete_button": "Radera",
+  "account_edit.image_delete_modal.title": "Radera bild?",
   "account_edit.image_edit.add_button": "Lägg till bild",
   "account_edit.image_edit.alt_add_button": "Lägg till alternativtext",
   "account_edit.image_edit.alt_edit_button": "Redigera alternativtext",
   "account_edit.image_edit.remove_button": "Ta bort bild",
   "account_edit.image_edit.replace_button": "Ersätt bild",
+  "account_edit.item_list.delete": "Radera {name}",
+  "account_edit.item_list.edit": "Redigera {name}",
+  "account_edit.name_modal.add_title": "Lägg till visningsnamn",
+  "account_edit.name_modal.edit_title": "Redigera visningsnamn",
   "account_edit.profile_tab.button_label": "Anpassa",
+  "account_edit.profile_tab.hint.description": "Dessa inställningar anpassar vad användare ser på {server} i de officiella apparna, men de kanske inte gäller för användare på andra servrar och tredjepartsappar.",
+  "account_edit.profile_tab.hint.title": "Hur detta visas varierar fortfarande",
+  "account_edit.profile_tab.show_featured.description": "‘Utvalda’ är en valfri flik där du kan visa upp andra konton.",
+  "account_edit.profile_tab.show_featured.title": "Visa fliken 'Utvalda'",
+  "account_edit.profile_tab.show_media.description": "‘Media’ är en valfri flik som visar dina inlägg som innehåller bilder eller videor.",
+  "account_edit.profile_tab.show_media.title": "Visa fliken ‘Media’",
+  "account_edit.profile_tab.show_media_replies.description": "När den är aktiverad visar fliken Media både dina inlägg och svar på andras inlägg.",
+  "account_edit.profile_tab.show_media_replies.title": "Inkludera svar på fliken Media",
+  "account_edit.profile_tab.subtitle": "Anpassa flikarna på din profil och vad de visar.",
+  "account_edit.profile_tab.title": "Inställningar för profil-fliken",
+  "account_edit.save": "Spara",
+  "account_edit.upload_modal.back": "Tillbaka",
+  "account_edit.upload_modal.done": "Färdig",
+  "account_edit.upload_modal.next": "Nästa",
+  "account_edit.upload_modal.step_crop.zoom": "Zooma",
+  "account_edit.upload_modal.step_upload.button": "Bläddra bland filer",
+  "account_edit.upload_modal.step_upload.dragging": "Släpp för att ladda upp",
+  "account_edit.upload_modal.step_upload.header": "Välj en bild",
+  "account_edit.upload_modal.step_upload.hint": "WEBP, PNG, GIF eller JPG-format, upp till {limit}MB.{br}Bild kommer att skalas till {width}x{height}px.",
+  "account_edit.upload_modal.title_add.avatar": "Lägg till profilbild",
+  "account_edit.upload_modal.title_add.header": "Lägg till omslagsbild",
+  "account_edit.upload_modal.title_replace.avatar": "Ersätt profilbild",
+  "account_edit.upload_modal.title_replace.header": "Ersätt omslagsbild",
+  "account_edit.verified_modal.details": "Öka trovärdigheten för din Mastodon-profil genom att verifiera länkar till personliga webbplatser. Så här fungerar det:",
+  "account_edit.verified_modal.invisible_link.details": "Lägg till länken till din överskrift. Den viktiga delen är rel=\"me\" som förhindrar personifiering på webbplatser med användargenererat innehåll. Du kan även använda en länktagg i överskriften på sidan istället för {tag}, men HTML:en måste vara tillgänglig utan att exekvera JavaScript.",
+  "account_edit.verified_modal.invisible_link.summary": "Hur gör jag länken osynlig?",
+  "account_edit.verified_modal.step1.header": "Kopiera HTML-koden nedan och klistra in i överskriften för din webbplats",
+  "account_edit.verified_modal.step2.details": "Om du redan har lagt till din webbplats som ett anpassat fält måste du ta bort och lägga till den igen för att utlösa verifiering.",
+  "account_edit.verified_modal.step2.header": "Lägg till din webbplats som ett anpassat fält",
+  "account_edit.verified_modal.title": "Hur man lägger till en verifierad länk",
+  "account_edit_tags.add_tag": "Lägg till #{tagName}",
+  "account_edit_tags.column_title": "Redigera taggar",
+  "account_edit_tags.help_text": "Utvalda hashtaggar hjälper användare att upptäcka och interagera med din profil. De visas som filter på din profilsidas aktivitetsvy.",
+  "account_edit_tags.max_tags_reached": "Du har nått det maximala antalet utvalda hashtaggar.",
+  "account_edit_tags.search_placeholder": "Ange en hashtagg…",
+  "account_edit_tags.suggestions": "Förslag:",
+  "account_edit_tags.tag_status_count": "{count, plural, one {# inlägg} other {# inlägg}}",
   "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",
@@ -290,28 +351,72 @@
   "closed_registrations_modal.find_another_server": "Hitta en annan server",
   "closed_registrations_modal.preamble": "Mastodon är decentraliserat så oavsett var du skapar ditt konto kommer du att kunna följa och interagera med någon på denna server. Du kan också köra din egen server!",
   "closed_registrations_modal.title": "Registrera sig på Mastodon",
+  "collection.share_modal.share_link_label": "Delningslänk för inbjudan",
+  "collection.share_modal.share_via_post": "Publicera på Mastodon",
+  "collection.share_modal.share_via_system": "Dela med…",
+  "collection.share_modal.title": "Dela samling",
+  "collection.share_modal.title_new": "Dela din nya samling!",
+  "collection.share_template_other": "Kolla in denna coola samling: {link}",
+  "collection.share_template_own": "Kolla in min nya samling: {link}",
+  "collections.account_count": "{count, plural, one {# konto} other {# konton}}",
   "collections.accounts.empty_description": "Lägg till upp till {count} konton som du följer",
+  "collections.accounts.empty_title": "Denna samling är tom",
   "collections.by_account": "av {account_handle}",
+  "collections.collection_description": "Beskrivning",
   "collections.collection_language": "Språk",
   "collections.collection_language_none": "Inga",
+  "collections.collection_name": "Namn",
+  "collections.collection_topic": "Ämne",
+  "collections.confirm_account_removal": "Är du säker på att du vill ta bort detta konto från denna samling?",
+  "collections.content_warning": "Innehållsvarning",
+  "collections.continue": "Fortsätt",
+  "collections.create.accounts_subtitle": "Endast konton som du följer som har valt att upptäcka kan läggas till.",
+  "collections.create.accounts_title": "Vem kommer du att visa i den här samlingen?",
+  "collections.create.basic_details_title": "Grundläggande detaljer",
+  "collections.create.steps": "Steg {step}/{total}",
   "collections.create_a_collection_hint": "Skapa en samling för att rekommendera eller dela dina favoritkonton med andra.",
   "collections.create_collection": "Skapa samling",
   "collections.delete_collection": "Radera samling",
+  "collections.description_length_hint": "Begränsat till 100 tecken",
   "collections.detail.accounts_heading": "Konton",
+  "collections.detail.author_added_you_on_date": "{author} lade till dig {date}",
+  "collections.detail.loading": "Laddar samling…",
   "collections.detail.revoke_inclusion": "Ta bort mig",
   "collections.detail.sensitive_content": "Känsligt innehåll",
+  "collections.detail.sensitive_note": "Denna samling innehåller konton och innehåll som kan vara känsliga för vissa användare.",
+  "collections.detail.share": "Dela denna samling",
+  "collections.detail.you_are_in_this_collection": "Du är med i denna samling",
+  "collections.edit_details": "Redigera detaljer",
   "collections.error_loading_collections": "Det uppstod ett fel när dina samlingar skulle laddas.",
   "collections.hints.accounts_counter": "{count} / {max} konton",
+  "collections.last_updated_at": "Senast uppdaterad: {date}",
+  "collections.manage_accounts": "Hantera konton",
+  "collections.mark_as_sensitive": "Markera som känsligt innehåll",
+  "collections.mark_as_sensitive_hint": "Döljer samlingens beskrivning och konton bakom en innehållsvarning. Samlingsnamnet kommer fortfarande att vara synligt.",
+  "collections.name_length_hint": "Begränsat till 40 tecken",
+  "collections.new_collection": "Ny samling",
   "collections.no_collections_yet": "Inga samlingar än.",
+  "collections.old_last_post_note": "Skapade senast ett inlägg för över en vecka sedan",
   "collections.remove_account": "Ta bort detta konto",
+  "collections.report_collection": "Rapportera denna samling",
+  "collections.revoke_collection_inclusion": "Ta bort mig själv från denna samling",
+  "collections.revoke_inclusion.confirmation": "Du har tagits bort från \"{collection}\"",
   "collections.revoke_inclusion.error": "Ett fel uppstod, försök igen senare.",
   "collections.search_accounts_label": "Sök efter konton för att lägga till…",
   "collections.search_accounts_max_reached": "Du har lagt till maximalt antal konton",
+  "collections.sensitive": "Känsligt",
+  "collections.topic_hint": "Lägg till en hashtagg som hjälper andra att förstå huvudämnet i denna samling.",
+  "collections.topic_special_chars_hint": "Specialtecken kommer att tas bort när du sparar",
   "collections.view_collection": "Visa samling",
+  "collections.view_other_collections_by_user": "Visa andra samlingar av användaren",
+  "collections.visibility_public": "Offentlig",
+  "collections.visibility_public_hint": "Upptäckbar i sökresultat och andra områden där rekommendationer visas.",
+  "collections.visibility_title": "Synlighet",
+  "collections.visibility_unlisted": "Olistad",
+  "collections.visibility_unlisted_hint": "Synlig för alla med en länk. Gömd från sökresultat och rekommendationer.",
   "column.about": "Om",
   "column.blocks": "Blockerade användare",
   "column.bookmarks": "Bokmärken",
-  "column.collections": "Mina samlingar",
   "column.community": "Lokal tidslinje",
   "column.create_list": "Skapa lista",
   "column.direct": "Privata omnämnande",
@@ -338,6 +443,11 @@
   "column_header.show_settings": "Visa inställningar",
   "column_header.unpin": "Ångra fäst",
   "column_search.cancel": "Avbryt",
+  "combobox.close_results": "Stäng resultat",
+  "combobox.loading": "Laddar",
+  "combobox.no_results_found": "Inga resultat för denna sökning",
+  "combobox.open_results": "Öppna resultat",
+  "combobox.results_available": "{count, plural, one {# förslag tillgängligt} other {# förslag tillgängliga}}. Använd upp- och ner-piltangenterna för att navigera. Tryck på Retur för att välja.",
   "community.column_settings.local_only": "Endast lokalt",
   "community.column_settings.media_only": "Endast media",
   "community.column_settings.remote_only": "Endast fjärr",
@@ -371,6 +481,9 @@
   "confirmations.delete.confirm": "Radera",
   "confirmations.delete.message": "Är du säker på att du vill radera detta inlägg?",
   "confirmations.delete.title": "Ta bort inlägg?",
+  "confirmations.delete_collection.confirm": "Radera",
+  "confirmations.delete_collection.message": "Denna åtgärd kan inte ångras.",
+  "confirmations.delete_collection.title": "Radera \"{name}\"?",
   "confirmations.delete_list.confirm": "Radera",
   "confirmations.delete_list.message": "Är du säker på att du vill radera denna lista permanent?",
   "confirmations.delete_list.title": "Ta bort listan?",
@@ -383,9 +496,15 @@
   "confirmations.discard_draft.post.title": "Vill du förkasta utkastet?",
   "confirmations.discard_edit_media.confirm": "Kasta",
   "confirmations.discard_edit_media.message": "Du har osparade ändringar till mediabeskrivningen eller förhandsgranskningen, kasta bort dem ändå?",
+  "confirmations.follow_to_collection.confirm": "Följ och lägg till i samlingen",
+  "confirmations.follow_to_collection.message": "Du måste följa {name} för att lägga till dem i en samling.",
+  "confirmations.follow_to_collection.title": "Följ kontot?",
   "confirmations.follow_to_list.confirm": "Följ och lägg till i listan",
   "confirmations.follow_to_list.message": "Du måste följa {name} för att lägga till dem i en lista.",
   "confirmations.follow_to_list.title": "Följ användare?",
+  "confirmations.hide_featured_tab.confirm": "Dölj flik",
+  "confirmations.hide_featured_tab.intro": "Du kan ändra detta när som helst under <i>Redigera profil > Inställningar för profilfliken</i>.",
+  "confirmations.hide_featured_tab.title": "Dölj fliken \"Utvald\"?",
   "confirmations.logout.confirm": "Logga ut",
   "confirmations.logout.message": "Är du säker på att du vill logga ut?",
   "confirmations.logout.title": "Logga ut?",
@@ -410,6 +529,8 @@
   "confirmations.remove_from_followers.message": "{name} kommer att sluta följa dig. Är du säker på att du vill fortsätta?",
   "confirmations.remove_from_followers.title": "Ta bort följare?",
   "confirmations.revoke_collection_inclusion.confirm": "Ta bort mig",
+  "confirmations.revoke_collection_inclusion.message": "Denna åtgärd är permanent, och kuratorn kommer inte att kunna lägga till dig till samlingen senare.",
+  "confirmations.revoke_collection_inclusion.title": "Ta bort dig själv från denna samling?",
   "confirmations.revoke_quote.confirm": "Ta bort inlägg",
   "confirmations.revoke_quote.message": "Denna åtgärd kan inte ångras.",
   "confirmations.revoke_quote.title": "Ta bort inlägg?",
@@ -428,6 +549,7 @@
   "conversation.open": "Visa konversation",
   "conversation.with": "Med {names}",
   "copy_icon_button.copied": "Kopierad till urklipp",
+  "copy_icon_button.copy_this_text": "Kopiera länken till urklipp",
   "copypaste.copied": "Kopierad",
   "copypaste.copy_to_clipboard": "Kopiera till urklipp",
   "directory.federated": "Från känt fediversum",
@@ -457,11 +579,12 @@
   "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 handtag säger vem någon är och var de är, kan människor interagera med dig 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",
   "email_subscriptions.submitted.title": "Ett steg kvar",
   "email_subscriptions.validation.email.blocked": "Blockerad e-postleverantör",
@@ -483,7 +606,6 @@
   "emoji_button.search_results": "Sökresultat",
   "emoji_button.symbols": "Symboler",
   "emoji_button.travel": "Resor & platser",
-  "empty_column.account_featured.other": "{acct} har inte presenterat något ännu. Visste du att du kan markera de fyrkantstaggar som du använder mest och även din väns konton på din profil?",
   "empty_column.account_hides_collections": "Användaren har valt att inte göra denna information tillgänglig",
   "empty_column.account_suspended": "Kontot är avstängt",
   "empty_column.account_timeline": "Inga inlägg här!",
@@ -506,6 +628,7 @@
   "empty_column.notification_requests": "Allt klart! Det finns inget mer här. När du får nya meddelanden visas de här enligt dina inställningar.",
   "empty_column.notifications": "Du har inga meddelanden än. Interagera med andra för att starta konversationen.",
   "empty_column.public": "Det finns inget här! Skriv något offentligt, eller följ manuellt användarna från andra instanser för att fylla på det",
+  "empty_state.no_results": "Inga resultat",
   "error.no_hashtag_feed_access": "Gå med eller logga in för att visa och följa denna hashtag.",
   "error.unexpected_crash.explanation": "På grund av en bugg i vår kod eller kompatiblitetsproblem i webbläsaren kan den här sidan inte visas korrekt.",
   "error.unexpected_crash.explanation_addons": "Denna sida kunde inte visas korrekt. Detta beror troligen på ett webbläsartillägg eller ett automatiskt översättningsverktyg.",
@@ -521,6 +644,7 @@
   "featured_carousel.current": "<sr>Inlägg</sr> {current, number} / {max, number}",
   "featured_carousel.header": "{count, plural,one {Fäst inlägg} other {Fästa inlägg}}",
   "featured_carousel.slide": "Inlägg {current, number} av {max, number}",
+  "featured_tags.more_items": "+{count}",
   "featured_tags.suggestions": "På senare tid har du skrivit om {items}. Lägg till dessa som utvalda hashtaggar?",
   "featured_tags.suggestions.add": "Lägg till",
   "featured_tags.suggestions.added": "Hantera dina utvalda hashtaggar när som helst under <link>Redigera profil > Utvalda hashtaggar</link>.",
@@ -582,6 +706,7 @@
   "footer.status": "Status",
   "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}",
@@ -651,6 +776,7 @@
   "keyboard_shortcuts.direct": "Öppna kolumnen med privata omnämnanden",
   "keyboard_shortcuts.down": "Flytta ner i listan",
   "keyboard_shortcuts.enter": "Öppna inlägg",
+  "keyboard_shortcuts.explore": "Öppna trendande tidslinje",
   "keyboard_shortcuts.favourite": "Favoritmarkera inlägg",
   "keyboard_shortcuts.favourites": "Öppna favoritlistan",
   "keyboard_shortcuts.federated": "Öppna federerad tidslinje",
@@ -737,6 +863,7 @@
   "navigation_bar.automated_deletion": "Automatisk radering av inlägg",
   "navigation_bar.blocks": "Blockerade användare",
   "navigation_bar.bookmarks": "Bokmärken",
+  "navigation_bar.collections": "Samlingar",
   "navigation_bar.direct": "Privata omnämnande",
   "navigation_bar.domain_blocks": "Dolda domäner",
   "navigation_bar.favourites": "Favoriter",
@@ -917,6 +1044,7 @@
   "privacy.private.short": "Följare",
   "privacy.public.long": "Alla på och utanför Mastodon",
   "privacy.public.short": "Offentlig",
+  "privacy.quote.anyone": "{visibility}, citat tillåtna",
   "privacy.quote.disabled": "{visibility}, citat inaktiverade",
   "privacy.quote.limited": "{visibility}, citat begränsade",
   "privacy.unlisted.additional": "Detta fungerar precis som offentlig, förutom att inlägget inte visas i liveflöden eller hashtaggar, utforska eller Mastodon-sökning, även om du har valt detta för hela kontot.",
@@ -962,6 +1090,7 @@
   "report.category.title_account": "profil",
   "report.category.title_status": "inlägg",
   "report.close": "Färdig",
+  "report.collection_comment": "Varför vill du rapportera denna samling?",
   "report.comment.title": "Finns det något annat vi borde veta?",
   "report.forward": "Vidarebefordra till {target}",
   "report.forward_hint": "Kontot är från en annan server. Skicka även en anonymiserad kopia av anmälan dit?",
@@ -983,6 +1112,7 @@
   "report.rules.title": "Vilka regler överträds?",
   "report.statuses.subtitle": "Välj alla som stämmer",
   "report.statuses.title": "Finns det några inlägg som stöder denna rapport?",
+  "report.submission_error": "Rapporten kunde inte skickas",
   "report.submission_error_details": "Kontrollera din nätverksanslutning och försök igen senare.",
   "report.submit": "Skicka",
   "report.target": "Rapporterar {target}",
@@ -1037,6 +1167,9 @@
   "sign_in_banner.mastodon_is": "Mastodon är det bästa sättet att hänga med i vad som händer.",
   "sign_in_banner.sign_in": "Logga in",
   "sign_in_banner.sso_redirect": "Logga in eller registrera dig",
+  "skip_links.hotkey": "<span>Snabbtangent</span> {hotkey}",
+  "skip_links.skip_to_content": "Hoppa över till huvudinnehållet",
+  "skip_links.skip_to_navigation": "Hoppa till huvudnavigering",
   "status.admin_account": "Öppet modereringsgränssnitt för @{name}",
   "status.admin_domain": "Öppet modereringsgränssnitt för @{domain}",
   "status.admin_status": "Öppna detta inlägg i modereringsgränssnittet",
@@ -1138,6 +1271,7 @@
   "tabs_bar.notifications": "Aviseringar",
   "tabs_bar.publish": "Nytt inlägg",
   "tabs_bar.search": "Sök",
+  "tag.remove": "Ta bort",
   "terms_of_service.effective_as_of": "Gäller från och med {date}",
   "terms_of_service.title": "Användarvillkor",
   "terms_of_service.upcoming_changes_on": "Kommande ändringar {date}",

app/javascript/mastodon/locales/tr.json

@@ -45,6 +45,7 @@
   "account.featured": "Öne çıkan",
   "account.featured.accounts": "Profiller",
   "account.featured.collections": "Koleksiyonlar",
+  "account.featured.new_collection": "Yeni koleksiyon",
   "account.field_overflow": "Tüm içeriği göster",
   "account.filters.all": "Tüm aktiviteler",
   "account.filters.boosts_toggle": "Yeniden paylaşımları göster",
@@ -416,7 +417,6 @@
   "column.about": "Hakkında",
   "column.blocks": "Engellenen kullanıcılar",
   "column.bookmarks": "Yer İşaretleri",
-  "column.collections": "Koleksiyonlarım",
   "column.community": "Yerel ağ akışı",
   "column.create_list": "Liste oluştur",
   "column.direct": "Özel bahsetmeler",
@@ -502,6 +502,10 @@
   "confirmations.follow_to_list.confirm": "Takip et ve yapılacaklar listesine ekle",
   "confirmations.follow_to_list.message": "Bir listeye eklemek için {name} kişisini takip etmeniz gerekiyor.",
   "confirmations.follow_to_list.title": "Kullanıcıyı takip et?",
+  "confirmations.hide_featured_tab.confirm": "Sekmeyi Gizle",
+  "confirmations.hide_featured_tab.intro": "Bunu istediğiniz zaman <i>Profil düzenle > Profil sekmesi ayarları</i> bölümünden değiştirebilirsiniz.",
+  "confirmations.hide_featured_tab.message": "Bu, {serverName} ve Mastodon'un en son sürümünü çalıştıran diğer sunuculardaki kullanıcılar için sekmeyi gizleyecektir. Diğer sunucularda görüntü farklılık gösterebilir.",
+  "confirmations.hide_featured_tab.title": "\"Öne Çıkanlar\" sekmesi gizlensin mi?",
   "confirmations.logout.confirm": "Oturumu kapat",
   "confirmations.logout.message": "Oturumu kapatmak istediğinden emin misin?",
   "confirmations.logout.title": "Oturumu kapat?",
@@ -606,14 +610,13 @@
   "emoji_button.search_results": "Arama sonuçları",
   "emoji_button.symbols": "Semboller",
   "emoji_button.travel": "Seyahat ve Yerler",
-  "empty_column.account_featured.other": "{acct} henüz hiçbir şeyi öne çıkarmadı. En çok kullandığınız etiketleri ve hatta arkadaşlarınızın hesaplarını profilinizde öne çıkarabileceğinizi biliyor muydunuz?",
+  "empty_column.account_featured.other": "{acct} henüz hiçbir şeyi öne çıkarmadı.",
-  "empty_column.account_featured_other.no_collections_desc": "{acct} henüz bir koleksiyon oluşturmadı.",
-  "empty_column.account_featured_other.title": "Burada görülecek bir şey yok",
-  "empty_column.account_featured_self.no_collections": "Henüz hiçbir koleksiyon yok",
   "empty_column.account_featured_self.no_collections_button": "Bir koleksiyon oluştur",
+  "empty_column.account_featured_self.no_collections_hide_tab": "Onun yerine bu sekmeyi gizle",
   "empty_column.account_featured_self.pre_collections": "Koleksiyonlar için beklemede kalın",
   "empty_column.account_featured_self.pre_collections_desc": "“Koleksiyonlar” (Mastodon 4.6 sürümünde kullanıma sunulacak) özelliği başkalarına önermek üzere kendi seçtiğiniz hesap listelerini oluşturmanıza olanak tanır.",
-  "empty_column.account_featured_unknown.no_collections_desc": "Bu hesap henüz bir koleksiyon oluşturmadı.",
+  "empty_column.account_featured_self.showcase_accounts": "Sevdiğiniz hesapları öne çıkarın",
+  "empty_column.account_featured_self.showcase_accounts_desc": "Koleksiyonlar başkalarının Fediverse'i daha iyi keşfetmesine yardımcı olmak amacıyla derlenmiş hesap listeleridir.",
   "empty_column.account_featured_unknown.other": "Bu hesap henüz hiçbir şeyi öne çıkarmadı.",
   "empty_column.account_hides_collections": "Bu kullanıcı bu bilgiyi sağlamayı tercih etmemiştir",
   "empty_column.account_suspended": "Hesap askıya alındı",
@@ -1329,7 +1332,7 @@
   "visibility_modal.header": "Görünürlük ve etkileşim",
   "visibility_modal.helper.direct_quoting": "Mastodon'da özel değiniler başkaları tarafından alıntılanamaz.",
   "visibility_modal.helper.privacy_editing": "Gönderi yayınlandıktan sonra görünürlük değiştirilemez.",
-  "visibility_modal.helper.privacy_private_self_quote": "Özel gönderilerin kendi alıntıları herkese açık hale getirilemez.",
+  "visibility_modal.helper.privacy_private_self_quote": "Özel mesajların kendi kendine alıntılanması herkese açık hale getirilemez.",
   "visibility_modal.helper.private_quoting": "Mastodon'da sadece takipçilere yönelik gönderiler başkaları tarafından alıntılanamaz.",
   "visibility_modal.helper.unlisted_quoting": "İnsanlar sizden alıntı yaptığında, onların gönderileri de trend zaman tünellerinden gizlenecektir.",
   "visibility_modal.instructions": "Bu gönderiyle kimlerin etkileşime girebileceğini kontrol edin. Ayrıca, <link>Tercihler > Gönderme varsayılanları</link> bölümüne giderek tüm gelecek gönderiler için ayarlayabilirsiniz.",

app/javascript/mastodon/locales/vi.json

@@ -45,6 +45,7 @@
   "account.featured": "Nêu bật",
   "account.featured.accounts": "Tài khoản",
   "account.featured.collections": "Gói khởi đầu",
+  "account.featured.new_collection": "Gói khởi đầu mới",
   "account.field_overflow": "Hiện đầy đủ nội dung",
   "account.filters.all": "Tất cả hoạt động",
   "account.filters.boosts_toggle": "Hiện những lượt đăng lại",
@@ -102,6 +103,7 @@
   "account.muted": "Đã phớt lờ",
   "account.muting": "Đang ẩn",
   "account.mutual": "Theo dõi nhau",
+  "account.name.copy": "Sao chép địa chỉ",
   "account.name.help.domain": "{domain} là máy chủ lưu trữ hồ sơ và tút của tài khoản.",
   "account.name.help.domain_self": "{domain} là máy chủ lưu trữ hồ sơ và tút của bạn.",
   "account.name.help.footer": "Giống như bạn có thể gửi email cho mọi người trên các dịch vụ email khác nhau, bạn có thể tương tác với mọi người trên các máy chủ Mastodon khác – và trên các ứng dụng xã hội khác sử dụng cùng giao thức mà Mastodon sử dụng (ActivityPub).",
@@ -138,6 +140,9 @@
   "account.unmute": "Bỏ phớt lờ @{name}",
   "account.unmute_notifications_short": "Bỏ phớt lờ thông báo",
   "account.unmute_short": "Bỏ phớt lờ",
+  "account_edit.advanced_settings.bot_hint": "Tài khoản này tự động thực hiện các hành động và không cần thiết theo dõi",
+  "account_edit.advanced_settings.bot_label": "Tài khoản tự động",
+  "account_edit.advanced_settings.title": "Thiết lập nâng cao",
   "account_edit.bio.add_label": "Thêm giới thiệu",
   "account_edit.bio.edit_label": "Sửa giới thiệu",
   "account_edit.bio.placeholder": "Giúp mọi người nhận ra bạn là ai.",
@@ -412,7 +417,6 @@
   "column.about": "Giới thiệu",
   "column.blocks": "Tài khoản đã chặn",
   "column.bookmarks": "Những tút đã lưu",
-  "column.collections": "Những gói khởi đầu của tôi",
   "column.community": "Máy chủ này",
   "column.create_list": "Tạo danh sách",
   "column.direct": "Nhắn riêng",
@@ -498,6 +502,10 @@
   "confirmations.follow_to_list.confirm": "Theo dõi & thêm vào danh sách",
   "confirmations.follow_to_list.message": "Bạn cần theo dõi {name} trước khi thêm họ vào danh sách.",
   "confirmations.follow_to_list.title": "Theo dõi tài khoản?",
+  "confirmations.hide_featured_tab.confirm": "Ẩn tab",
+  "confirmations.hide_featured_tab.intro": "Bạn có thể thay đổi bất kỳ lúc nào trong <i>Sửa hồ sơ > Thiết lập Tab hồ sơ</i>.",
+  "confirmations.hide_featured_tab.message": "Việc này khiến ẩn tab cho tài khoản trên {serverName} và những máy chủ Mastodon khác. Kiểu hiển thị có thể khác nhau.",
+  "confirmations.hide_featured_tab.title": "Ẩn tab \"Nêu bật\"?",
   "confirmations.logout.confirm": "Đăng xuất",
   "confirmations.logout.message": "Bạn có chắc muốn thoát?",
   "confirmations.logout.title": "Đăng xuất",
@@ -577,7 +585,9 @@
   "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ý",
+  "email_subscriptions.form.bottom": "Nhận tút được gửi đến hộp thư đến mà không cần tài khoản Mastodon. Hủy nhận bất cứ lúc nào. Xem thêm chi tiết tại <a>Chính sách bảo mật</a>.",
   "email_subscriptions.form.title": "Đăng ký nhận cập nhật qua email từ {name}",
   "email_subscriptions.submitted.lead": "Kiểm tra hộp thư đến của bạn để tìm email hoàn tất đăng ký nhận thông báo qua email.",
   "email_subscriptions.submitted.title": "Một bước nữa",
@@ -600,14 +610,13 @@
   "emoji_button.search_results": "Kết quả tìm kiếm",
   "emoji_button.symbols": "Biểu tượng",
   "emoji_button.travel": "Du lịch",
-  "empty_column.account_featured.other": "{acct} chưa nêu bật gì. Bạn có biết rằng, bạn có thể giới thiệu hashtag thường dùng và hồ sơ của bạn bè trên trang cá nhân của mình không?",
+  "empty_column.account_featured.other": "{acct} chưa nêu bật gì.",
-  "empty_column.account_featured_other.no_collections_desc": "{acct} chưa tạo gói khởi đầu nào.",
-  "empty_column.account_featured_other.title": "Không có gì để xem ở đây",
-  "empty_column.account_featured_self.no_collections": "Chưa có gói khởi đầu",
   "empty_column.account_featured_self.no_collections_button": "Tạo một gói khởi đầu",
+  "empty_column.account_featured_self.no_collections_hide_tab": "Ẩn tab này",
   "empty_column.account_featured_self.pre_collections": "Hãy đón chờ Gói khởi đầu",
   "empty_column.account_featured_self.pre_collections_desc": "Gói khởi đầu (sẽ có trong Mastodon 4.6) cho phép bạn tạo danh sách các tài khoản được tuyển chọn để giới thiệu cho người khác.",
-  "empty_column.account_featured_unknown.no_collections_desc": "Tài khoản này chưa tạo gói khởi đầu nào.",
+  "empty_column.account_featured_self.showcase_accounts": "Hiện những tài khoản yêu thích của bạn",
+  "empty_column.account_featured_self.showcase_accounts_desc": "Gói khởi đầu là những danh sách chứa những tài khoản tuyển chọn để giúp khám phá mọi người trên Fediverse.",
   "empty_column.account_featured_unknown.other": "Tài khoản này chưa nêu bật gì.",
   "empty_column.account_hides_collections": "Tài khoản này đã chọn ẩn thông tin",
   "empty_column.account_suspended": "Tài khoản vô hiệu hóa",

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

@@ -45,6 +45,7 @@
   "account.featured": "精选",
   "account.featured.accounts": "个人资料",
   "account.featured.collections": "收藏列表",
+  "account.featured.new_collection": "新建收藏列表",
   "account.field_overflow": "显示完整内容",
   "account.filters.all": "全部活动",
   "account.filters.boosts_toggle": "显示转嘟",
@@ -216,8 +217,8 @@
   "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.subtitle": "自定义你个人资料的标签页及其显示的内容。",
+  "account_edit.profile_tab.subtitle": "自定义你个人资料的选项卡及其显示的内容。",
-  "account_edit.profile_tab.title": "个人资料标签页设置",
+  "account_edit.profile_tab.title": "个人资料选项卡设置",
   "account_edit.save": "保存",
   "account_edit.upload_modal.back": "上一步",
   "account_edit.upload_modal.done": "完成",
@@ -416,7 +417,6 @@
   "column.about": "关于",
   "column.blocks": "屏蔽的用户",
   "column.bookmarks": "书签",
-  "column.collections": "我的收藏列表",
   "column.community": "本站时间线",
   "column.create_list": "创建列表",
   "column.direct": "私下提及",
@@ -432,7 +432,9 @@
   "column.list_members": "管理列表成员",
   "column.lists": "列表",
   "column.mutes": "已隐藏的用户",
+  "column.my_collections": "我的收藏列表",
   "column.notifications": "通知",
+  "column.other_collections": "{name} 的收藏列表",
   "column.pins": "置顶嘟文",
   "column.public": "跨站公共时间线",
   "column_back_button.label": "返回",
@@ -502,6 +504,10 @@
   "confirmations.follow_to_list.confirm": "关注并添加到列表",
   "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} 及运行最新版本 Mastodon 的其他实例隐藏此选项卡。其他实例的显示情况可能不同。",
+  "confirmations.hide_featured_tab.title": "隐藏“精选”选项卡吗？",
   "confirmations.logout.confirm": "退出登录",
   "confirmations.logout.message": "确定要退出登录吗？",
   "confirmations.logout.title": "确定要退出登录？",
@@ -606,14 +612,13 @@
   "emoji_button.search_results": "搜索结果",
   "emoji_button.symbols": "符号",
   "emoji_button.travel": "旅行与地点",
-  "empty_column.account_featured.other": "{acct} 尚未设置任何精选。你知道吗？你可以将自己最常使用的话题标签，甚至是好友的账号，在你的个人主页上设为精选。",
+  "empty_column.account_featured.other": "{acct} 尚未设置任何精选。",
-  "empty_column.account_featured_other.no_collections_desc": "{acct} 尚未创建任何收藏列表。",
-  "empty_column.account_featured_other.title": "这里还没有内容",
-  "empty_column.account_featured_self.no_collections": "尚无收藏列表",
   "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": "收藏列表（将于 Mastodon 4.6 版本上线）允许你创建自己的精选账号列表，方便你将这些账号推荐给其他人。",
-  "empty_column.account_featured_unknown.no_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": "账号已被停用",

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

@@ -45,6 +45,7 @@
   "account.featured": "精選內容",
   "account.featured.accounts": "個人檔案",
   "account.featured.collections": "收藏名單",
+  "account.featured.new_collection": "新收藏名單",
   "account.field_overflow": "顯示完整內容",
   "account.filters.all": "所有活動",
   "account.filters.boosts_toggle": "顯示轉嘟",
@@ -416,7 +417,6 @@
   "column.about": "關於",
   "column.blocks": "已封鎖使用者",
   "column.bookmarks": "書籤",
-  "column.collections": "我的收藏名單",
   "column.community": "本站時間軸",
   "column.create_list": "建立列表",
   "column.direct": "私訊",
@@ -432,7 +432,9 @@
   "column.list_members": "管理列表成員",
   "column.lists": "列表",
   "column.mutes": "已靜音使用者",
+  "column.my_collections": "我的收藏名單",
   "column.notifications": "推播通知",
+  "column.other_collections": "{name} 的收藏名單",
   "column.pins": "釘選的嘟文",
   "column.public": "聯邦時間軸",
   "column_back_button.label": "上一頁",
@@ -502,6 +504,10 @@
   "confirmations.follow_to_list.confirm": "跟隨並加入至列表",
   "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} 及其他執行最新版本 Mastodon 伺服器上的使用者所看到的分頁。其他介面顯示可能有所不同。",
+  "confirmations.hide_featured_tab.title": "隱藏「精選內容」分頁？",
   "confirmations.logout.confirm": "登出",
   "confirmations.logout.message": "您確定要登出嗎？",
   "confirmations.logout.title": "您確定要登出嗎？",
@@ -606,14 +612,13 @@
   "emoji_button.search_results": "搜尋結果",
   "emoji_button.symbols": "符號",
   "emoji_button.travel": "旅遊與地點",
-  "empty_column.account_featured.other": "{acct} 尚未有任何精選內容。您知道您可以將您的常用主題標籤、甚至您朋友們的帳號作為您個人檔案上之精選內容嗎？",
+  "empty_column.account_featured.other": "{acct} 尚未有任何精選內容。",
-  "empty_column.account_featured_other.no_collections_desc": "{acct} 尚未建立任何收藏名單。",
-  "empty_column.account_featured_other.title": "此地一無所有",
-  "empty_column.account_featured_self.no_collections": "尚無蒐藏名單",
   "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": "收藏名單功能（將於 Mastodon 4.6 上線）允許您建立自己的精選帳號名單並推薦予其他人。",
-  "empty_column.account_featured_unknown.no_collections_desc": "此帳號尚未建立任何收藏名單。",
+  "empty_column.account_featured_self.showcase_accounts": "展示您最喜歡的帳號",
+  "empty_column.account_featured_self.showcase_accounts_desc": "收藏名單為幫助其他人探索 Fediverse 之精選帳號名單。",
   "empty_column.account_featured_unknown.other": "此帳號尚未有任何精選內容。",
   "empty_column.account_hides_collections": "這位使用者選擇不提供此資訊",
   "empty_column.account_suspended": "帳號已被停權",

app/javascript/mastodon/reducers/slices/collections.ts

@@ -311,7 +311,7 @@ interface AccountCollectionQuery {
 
 export const selectAccountCollections = createAppSelector(
   [
-    (_, accountId: string | null) => accountId,
+    (_, accountId?: string | null) => accountId,
     (state) => state.collections.accountCollections,
     (state) => state.collections.collections,
   ],

app/javascript/styles/mastodon/components.scss

@@ -4105,15 +4105,6 @@ a.account__display-name {
   margin: -6px 10px;
 }
 
-.column-subheading {
-  background: var(--color-bg-secondary);
-  color: var(--color-text-secondary);
-  padding: 12px 24px;
-  font-size: 13px;
-  font-weight: 500;
-  text-transform: uppercase;
-}
-
 .getting-started__wrapper {
   flex: 0 0 auto;
 }

app/javascript/styles/mastodon/modal.scss

@@ -1,7 +1,7 @@
 @use 'variables' as *;
 
 .modal-layout {
-  background: var(--color-bg-brand-softest);
+  background: var(--color-bg-primary);
   display: flex;
   flex-direction: column;
   height: 100vh;
@@ -37,6 +37,8 @@
 }
 
 .with-zig-zag-decoration {
+  isolation: isolate;
+
   &::after {
     content: '';
     position: absolute;

app/models/notification.rb

@@ -85,7 +85,7 @@ class Notification < ApplicationRecord
     }.freeze,
     collection_update: {
       filterable: false,
-    },
+    }.freeze,
   }.freeze
 
   TYPES = PROPERTIES.keys.freeze

app/serializers/rest/collection_serializer.rb

@@ -13,6 +13,10 @@ class REST::CollectionSerializer < ActiveModel::Serializer
     object.id.to_s
   end
 
+  def uri
+    ActivityPub::TagManager.instance.uri_for(object)
+  end
+
   def description
     return object.description if object.local?
     return if object.description_html.nil?

app/services/activitypub/fetch_remote_actor_service.rb

@@ -33,14 +33,12 @@ class ActivityPub::FetchRemoteActorService < BaseService
 
     # FEP-2c59 defines a `webfinger` attribute that makes things more explicit and spares an extra request in some cases.
     # It supersedes `preferredUsername`.
-    if @json['webfinger'].present? && @json['webfinger'].is_a?(String)
+    @username, @domain = split_acct(@json['webfinger']) if @json['webfinger'].present? && @json['webfinger'].is_a?(String)
-      @username, @domain = split_acct(@json['webfinger'])
-      Rails.logger.debug { "Actor #{uri} has an invalid `webfinger` value, falling back to `preferredUsername`" }
-    end
 
     if @username.blank? || @domain.blank?
       raise "Actor #{uri} has no `preferredUsername`, and either a bogus or missing `webfinger`, which is a requirement for Mastodon compatibility" if @json['preferredUsername'].blank?
 
+      Rails.logger.debug { "Actor #{uri} has an invalid `webfinger` value, falling back to `preferredUsername`" } if @json['webfinger'].present?
       @username = @json['preferredUsername']
       @domain   = Addressable::URI.parse(@uri).normalized_host
     end

app/services/create_collection_service.rb

@@ -42,7 +42,7 @@ class CreateCollectionService
 
   def notify_local_users
     @collection.collection_items.select(&:with_local_account?).each do |collection_item|
-      LocalNotificationWorker.perform_async(@account.id, collection_item.id, collection_item.class.name, 'added_to_collection')
+      LocalNotificationWorker.perform_async(collection_item.account_id, collection_item.id, collection_item.class.name, 'added_to_collection')
     end
   end
 

app/services/notify_of_collection_update_service.rb

@@ -16,6 +16,6 @@ class NotifyOfCollectionUpdateService
     return false if collection.previously_new_record?
 
     # Only notify of change to description or name
-    %i(description description_html name).any? { |attr| collection.attribute_previously_changed?(attr) }
+    %i(description description_html name sensitive tag_id).any? { |attr| collection.attribute_previously_changed?(attr) }
   end
 end

config/locales/ar.yml

@@ -343,6 +343,10 @@ ar:
       unpublish: إلغاء النشر
       unpublished_msg: تم إلغاء نشر الإعلان بنجاح!
       updated_msg: تم تحديث الإعلان بنجاح!
+    collections:
+      accounts: الحسابات
+      contents: المحتوى
+      open: فتح
     critical_update_pending: تحديث حَرِج قيد الانتظار
     custom_emojis:
       assign_category: اسند فئة
@@ -790,6 +794,7 @@ ar:
       categories:
         administration: الإدارة
         devops: DevOps
+        email: البريد الإلكتروني
         invites: الدعوات
         moderation: الإشراف
         special: مميز
@@ -1331,6 +1336,7 @@ ar:
       invited_by: 'يمكنك الانضمام إلى %{domain} بفضل الدعوة التي تلقيتها من:'
       preamble: يتم تعيين هذه القوانين وفرضها من قبل مشرفي %{domain}.
       preamble_invited: قبل المتابعة، يرجى قراءة القواعد الأساسية التي وضعها مشرفو %{domain}.
+      read_more: اقرأ المزيد
       title: بعض القواعد الأساسية.
       title_invited: لقد تمت دعوتك.
     security: الأمان
@@ -1449,6 +1455,11 @@ ar:
       your_appeal_rejected: تم رفض طعنك
   edit_profile:
     other: أخرى
+  email_subscription_mailer:
+    confirmation:
+      subject: تأكيد عنوان بريدك الإلكتروني
+    notification:
+      create_account: إنشاء حساب ماستدون
   emoji_styles:
     auto: تلقائي
     native: محلي
@@ -1741,6 +1752,7 @@ ar:
       uses: عدد الاستخدامات
     title: دعوة أشخاص
   link_preview:
+    author_html: مِن %{name}
     potentially_sensitive_content:
       hide_button: إخفاء
   lists:
@@ -2126,6 +2138,8 @@ ar:
     past_preamble_html: لقد غيرنا شروط خدمتنا منذ زيارتكم الأخيرة. نشجعكم على مراجعة الشروط المحدثة.
     review_link: مراجعة شروط الخدمة
     title: شروط خدمة النطاق %{domain} ستتغير
+  themes:
+    default: ماستدون
   time:
     formats:
       default: "%b %d, %Y, %H:%M"

config/locales/de.yml

@@ -2210,7 +2210,7 @@ de:
     extra_instructions_html: <strong>Hinweis:</strong> Der Link auf deiner Website kann unsichtbar sein. Der wichtige Teil ist <code>rel="me"</code>. Du kannst auch den Tag <code>link</code> im <code>head</code> (statt <code>a</code> im <code>body</code>) verwenden, jedoch muss die Internetseite ohne JavaScript abrufbar sein.
     here_is_how: So funktioniert’s
     hint_html: "<strong>Alle können ihre Identität auf Mastodon verifizieren.</strong> Basierend auf offenen Standards – jetzt und für immer kostenlos. Alles, was du brauchst, ist eine eigene Website. Wenn du von deinem Profil auf diese Website verlinkst, überprüfen wir, ob die Website zu deinem Profil zurückverlinkt, und zeigen einen visuellen Hinweis an."
-    instructions_html: Kopiere den unten stehenden Code und füge ihn in den HTML-Code deiner Website ein. Trage anschließend die Adresse deiner Website in ein Zusatzfeld auf deinem Profil ein und speichere die Änderungen. Die Zusatzfelder befinden sich im Reiter „Profil bearbeiten“.
+    instructions_html: Kopiere den unten stehenden Code und füge ihn in den HTML-Code deiner Website ein. Trage anschließend die Adresse deiner Website in ein Zusatzfeld auf deinem Profil ein und speichere die Änderungen. Die Zusatzfelder können „Profil bearbeiten“ verwaltet werden.
     verification: Verifizierung
     verified_links: Deine verifizierten Links
     website_verification: Verifizierung einer Website

config/locales/en-GB.yml

@@ -762,6 +762,7 @@ en-GB:
       categories:
         administration: Administration
         devops: DevOps
+        email: Email
         invites: Invites
         moderation: Moderation
         special: Special
@@ -778,6 +779,8 @@ en-GB:
         administrator_description: Users with this permission will bypass every permission
         delete_user_data: Delete User Data
         delete_user_data_description: Allows users to delete other users' data without delay
+        invite_bypass_approval: Invite Users without review
+        invite_bypass_approval_description: Allows people invited to the server by these users to bypass moderation approval
         invite_users: Invite Users
         invite_users_description: Allows users to invite new people to the server
         manage_announcements: Manage Announcements
@@ -788,6 +791,8 @@ en-GB:
         manage_blocks_description: Allows users to block email providers and IP addresses
         manage_custom_emojis: Manage Custom Emojis
         manage_custom_emojis_description: Allows users to manage custom emojis on the server
+        manage_email_subscriptions: Manage Email Subscriptions
+        manage_email_subscriptions_description: Allow users to subscribe to users with this permission by email
         manage_federation: Manage Federation
         manage_federation_description: Allows users to block or allow federation with other domains, and control deliverability
         manage_invites: Manage Invites
@@ -1278,6 +1283,7 @@ en-GB:
     progress:
       confirm: Confirm email
       details: Your details
+      list: Sign up progress
       review: Our review
       rules: Accept rules
     providers:
@@ -1293,6 +1299,7 @@ en-GB:
       invited_by: 'You can join %{domain} thanks to the invitation you have received from:'
       preamble: These are set and enforced by the %{domain} moderators.
       preamble_invited: Before you proceed, please consider the ground rules set by the moderators of %{domain}.
+      read_more: Read more
       title: Some ground rules.
       title_invited: You've been invited.
     security: Security
@@ -1412,6 +1419,41 @@ en-GB:
       your_appeal_rejected: Your appeal has been rejected
   edit_profile:
     other: Other
+    redesign_body: Profile editing can now be accessed directly from the profile page.
+    redesign_button: Go there
+    redesign_title: There’s a new profile editing experience
+  email_subscription_mailer:
+    confirmation:
+      action: Confirm email address
+      instructions_to_confirm: Confirm you'd like to receive emails from %{name} (@%{acct}) when they publish new posts.
+      instructions_to_ignore: If you're not sure why you received this email, you can delete it. You will not be subscribed if you don't click on the link above.
+      subject: Confirm your email address
+      title: Get email updates from %{name}?
+    notification:
+      create_account: Create a Mastodon account
+      footer:
+        privacy_html: Emails are sent from %{domain}, a server powered by Mastodon. To understand how this server processes your personal data, refer to the <a href="%{privacy_policy_path}">Privacy Policy</a>.
+        reason_for_email_html: You're receiving this email because you opted into email updates from %{name}. Don't want to receive these emails? <a href="%{unsubscribe_path}">Unsubscribe</a>
+      interact_with_this_post:
+        one: Interact with this post and discover more like it.
+        other: Interact with these posts and discover more.
+      subject:
+        plural: New posts from %{name}
+        singular: 'New post: "%{excerpt}"'
+      title:
+        plural: New posts from %{name}
+        singular: 'New post: "%{excerpt}"'
+  email_subscriptions:
+    active: Active
+    confirmations:
+      show:
+        changed_your_mind: Changed your mind?
+        success_html: You'll now start receiving emails when %{name} publishes new posts. Add %{sender} to your contacts so these posts don't end up in your Spam folder.
+        title: You're signed up
+        unsubscribe: Unsubscribe
+    inactive: Inactive
+    status: Status
+    subscribers: Subscribers
   emoji_styles:
     auto: Auto
     native: Native
@@ -1781,6 +1823,8 @@ en-GB:
     posting_defaults: Posting defaults
     public_timelines: Public timelines
   privacy:
+    email_subscriptions: Send posts via email
+    email_subscriptions_hint_html: Add an email sign-up form to your profile that appears for logged-out users. When visitors enter their email address and opt in, Mastodon will send email updates for your public posts.
     hint_html: "<strong>Customise how you want your profile and your posts to be found.</strong> A variety of features in Mastodon can help you reach a wider audience when enabled. Take a moment to review these settings to make sure they fit your use case."
     privacy: Privacy
     privacy_hint_html: Control how much you want to disclose for the benefit of others. People discover interesting profiles and cool apps by browsing other people's follows and seeing from which apps they post, but you may prefer to keep it hidden.
@@ -2044,6 +2088,28 @@ en-GB:
     resume_app_authorization: Resume application authorisation
     role_requirement: "%{domain} requires you to set up Two-Factor Authentication before you can use Mastodon."
     webauthn: Security keys
+  unsubscriptions:
+    create:
+      action: Go to server homepage
+      email_subscription:
+        confirmation_html: You'll no longer receive emails from %{name}.
+      title: You are unsubscribed
+      user:
+        confirmation_html: You'll no longer receive %{type} from Mastodon on %{domain}.
+    notification_emails:
+      favourite: favourite notification emails
+      follow: follow notification emails
+      follow_request: follow request emails
+      mention: mention notification emails
+      reblog: boost notification emails
+    show:
+      action: Unsubscribe
+      email_subscription:
+        confirmation_html: You'll stop receiving emails when this account publishes new posts.
+        title: Unsubscribe from %{name}?
+      user:
+        confirmation_html: You'll stop receiving %{type} from Mastodon on %{domain}.
+        title: Unsubscribe from %{type}?
   user_mailer:
     announcement_published:
       description: 'The administrators of %{domain} are making an announcement:'

config/locales/he.yml

@@ -2330,7 +2330,7 @@ he:
     extra_instructions_html: <strong>טיפ:</strong> הלינק באתר שלך יכול להיות מוסתר. החלק החשוב הוא <code>rel="me"</code> שמונע התחזות על אתרים עם תוכן משתמשים. ניתן גם ליצור תגית <code>link</code> בכותרת העמוד במקום קישור <code>a</code> אבל קוד ה־HTML חייב להופיע שם ללא הרצה של ג'אווהסקריפט.
     here_is_how: זה נעשה כך
     hint_html: "<strong>אשרור זהותך במסטודון הוא לטובת כולם.</strong> על בסיס תקני ווב פתוחים, חינם מעתה ולעד. כל שדרוש הוא אתר אישי שבו אנשים מזהים אותך דרכו. כשתקשרו מהאתר הזה לפרופיל שלך פה, אנו נבדוק באתר קישורים לפרופיל ונציין זאת בסימן בולט כזהות בדוקה."
-    instructions_html: יש להדביק את הקוד שלמטה אל האתר שלך. ואז להוסיף את כתובת האתר לאחד השדות הנוספים בפרופיל מתוך טאב "עריכת פרופיל" ולשמור את השינויים.
+    instructions_html: יש להדביק את הקוד שלמטה אל האתר שלך. ואז להוסיף את כתובת האתר לאחד השדות הנוספים בפרופיל מתוך כרטיסיית "עריכת פרופיל" ולשמור את השינויים.
     verification: אימות
     verified_links: קישוריך המאומתים
     website_verification: אימות אתר רשת