Merge commit 'c44cc1f5c3bafb49a324f8f72a42a91d09eecfe3' into glitch-soc/merge-upstream

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

@@ -28,7 +28,7 @@
   padding: 4px;
   border-radius: 4px;
   color: var(--color-text-primary);
-  background: var(--color-bg-elevated);
+  background: var(--color-bg-primary);
   border: 1px solid var(--color-border-primary);
   box-shadow: var(--dropdown-shadow);
 

app/javascript/mastodon/features/account_timeline/components/redesign.module.scss

@@ -272,7 +272,7 @@ svg.badgeIcon {
   position: absolute;
   top: 50%;
   transform: translateY(-50%);
-  background-color: var(--color-bg-elevated);
+  background-color: var(--color-bg-primary);
   box-shadow: 0 1px 4px 0 var(--color-shadow-primary);
   border-radius: 9999px;
   transition:
@@ -295,7 +295,7 @@ svg.badgeIcon {
     background-color: color-mix(
       in oklab,
       var(--color-bg-brand-base) var(--overlay-strength-brand),
-      var(--color-bg-elevated)
+      var(--color-bg-primary)
     );
   }
 }

app/javascript/mastodon/features/account_timeline/v2/styles.module.scss

@@ -24,7 +24,7 @@
 }
 
 .filterOverlay {
-  background: var(--color-bg-elevated);
+  background: var(--color-bg-primary);
   border-radius: 12px;
   box-shadow: var(--dropdown-shadow);
   min-width: 230px;

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

@@ -1,7 +1,8 @@
-import { useEffect, useMemo, useCallback } from 'react';
+import { useEffect, useMemo, useCallback, useId } from 'react';
 
 import { defineMessages, useIntl, FormattedMessage } from 'react-intl';
 
+import classNames from 'classnames';
 import { Helmet } from 'react-helmet';
 import { Link } from 'react-router-dom';
 
@@ -10,10 +11,12 @@ import ListAltIcon from '@/material-icons/400-24px/list_alt.svg?react';
 import MoreHorizIcon from '@/material-icons/400-24px/more_horiz.svg?react';
 import SquigglyArrow from '@/svg-icons/squiggly_arrow.svg?react';
 import { openModal } from 'mastodon/actions/modal';
+import type { ApiCollectionJSON } from 'mastodon/api_types/collections';
 import { Column } from 'mastodon/components/column';
 import { ColumnHeader } from 'mastodon/components/column_header';
 import { Dropdown } from 'mastodon/components/dropdown_menu';
 import { Icon } from 'mastodon/components/icon';
+import { RelativeTimestamp } from 'mastodon/components/relative_timestamp';
 import ScrollableList from 'mastodon/components/scrollable_list';
 import {
   fetchAccountCollections,
@@ -22,6 +25,7 @@ import {
 import { useAppSelector, useAppDispatch } from 'mastodon/store';
 
 import { messages as editorMessages } from './editor';
+import classes from './styles.module.scss';
 
 const messages = defineMessages({
   heading: { id: 'column.collections', defaultMessage: 'My collections' },
@@ -36,13 +40,14 @@ const messages = defineMessages({
   more: { id: 'status.more', defaultMessage: 'More' },
 });
 
-const ListItem: React.FC<{
-  id: string;
-  name: string;
-}> = ({ id, name }) => {
+const CollectionItem: React.FC<{
+  collection: ApiCollectionJSON;
+}> = ({ collection }) => {
   const dispatch = useAppDispatch();
   const intl = useIntl();
 
+  const { id, name } = collection;
+
   const handleDeleteClick = useCallback(() => {
     dispatch(
       openModal({
@@ -81,14 +86,45 @@ const ListItem: React.FC<{
     [intl, id, handleDeleteClick],
   );
 
+  const linkId = useId();
+
   return (
-    <div className='lists__item'>
-      <Link
-        to={`/collections/${id}/edit/details`}
-        className='lists__item__title'
-      >
-        <span>{name}</span>
-      </Link>
+    <article
+      className={classNames(classes.collectionItemWrapper, 'focusable')}
+      tabIndex={-1}
+      aria-labelledby={linkId}
+    >
+      <div className={classes.collectionItemContent}>
+        <h2 id={linkId}>
+          <Link
+            to={`/collections/${id}/edit/details`}
+            className={classes.collectionItemLink}
+          >
+            {name}
+          </Link>
+        </h2>
+        <ul className={classes.collectionItemInfo}>
+          <FormattedMessage
+            id='collections.account_count'
+            defaultMessage='{count, plural, one {# account} other {# accounts}}'
+            values={{ count: collection.item_count }}
+            tagName='li'
+          />
+          <FormattedMessage
+            id='collections.last_updated_at'
+            defaultMessage='Last updated: {date}'
+            values={{
+              date: (
+                <RelativeTimestamp
+                  timestamp={collection.updated_at}
+                  short={false}
+                />
+              ),
+            }}
+            tagName='li'
+          />
+        </ul>
+      </div>
 
       <Dropdown
         scrollKey='collections'
@@ -97,7 +133,7 @@ const ListItem: React.FC<{
         iconComponent={MoreHorizIcon}
         title={intl.formatMessage(messages.more)}
       />
-    </div>
+    </article>
   );
 };
 
@@ -166,7 +202,7 @@ export const Collections: React.FC<{
         bindToDocument={!multiColumn}
       >
         {collections.map((item) => (
-          <ListItem key={item.id} id={item.id} name={item.name} />
+          <CollectionItem key={item.id} collection={item} />
         ))}
       </ScrollableList>
 

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

@@ -0,0 +1,48 @@
+.collectionItemWrapper {
+  display: flex;
+  align-items: center;
+  gap: 16px;
+  margin-inline: 10px;
+  padding-inline-end: 5px;
+  border-bottom: 1px solid var(--color-border-primary);
+}
+
+.collectionItemContent {
+  position: relative;
+  flex-grow: 1;
+  padding: 15px 5px;
+}
+
+.collectionItemLink {
+  display: block;
+  margin-bottom: 2px;
+  font-size: 15px;
+  font-weight: 500;
+  text-decoration: none;
+  color: var(--color-text-primary);
+
+  &:hover {
+    color: var(--color-text-brand);
+  }
+
+  &::after {
+    // Increase clickable area by extending link across parent
+    content: '';
+    position: absolute;
+    inset: 0;
+  }
+}
+
+.collectionItemInfo {
+  --gap: 0.75ch;
+
+  display: flex;
+  gap: var(--gap);
+  font-size: 13px;
+  color: var(--color-text-secondary);
+
+  & > li:not(:first-child)::before {
+    content: '·';
+    margin-inline-end: var(--gap);
+  }
+}

app/javascript/mastodon/locales/be.json

@@ -535,6 +535,8 @@
   "follow_suggestions.view_all": "Праглядзець усё",
   "follow_suggestions.who_to_follow": "На каго падпісацца",
   "followed_tags": "Падпіскі на хэштэгі",
+  "followers.hide_other_followers": "Гэты карыстальнік вырашыў не паказваць сваіх іншых падпісчыкаў",
+  "following.hide_other_following": "Гэты карыстальнік вырашыў не паказваць свае іншыя падпіскі",
   "footer.about": "Пра нас",
   "footer.about_mastodon": "Пра Mastodon",
   "footer.about_server": "Пра {domain}",
@@ -576,7 +578,7 @@
   "hints.profiles.see_more_followers": "Глядзець больш падпісаных на {domain}",
   "hints.profiles.see_more_follows": "Глядзець больш падпісак на {domain}",
   "hints.profiles.see_more_posts": "Глядзець больш допісаў на {domain}",
-  "home.column_settings.show_quotes": "Паказаць цытаты",
+  "home.column_settings.show_quotes": "Паказаць цытаванні",
   "home.column_settings.show_reblogs": "Паказваць пашырэнні",
   "home.column_settings.show_replies": "Паказваць адказы",
   "home.hide_announcements": "Схаваць аб'явы",
@@ -882,9 +884,9 @@
   "privacy.private.short": "Падпісчыкі",
   "privacy.public.long": "Усе, хто ёсць і каго няма ў Mastodon",
   "privacy.public.short": "Публічны",
-  "privacy.quote.anyone": "{visibility}, цытаты дазволеныя",
-  "privacy.quote.disabled": "{visibility}, цытаты адключаныя",
-  "privacy.quote.limited": "{visibility}, абмежаваныя цытаты",
+  "privacy.quote.anyone": "{visibility}, цытаванні дазволеныя",
+  "privacy.quote.disabled": "{visibility}, цытаванні адключаныя",
+  "privacy.quote.limited": "{visibility}, абмежаваныя цытаванні",
   "privacy.unlisted.additional": "Паводзіць сябе гэтак жа, як і публічны, за выключэннем таго, што допіс не будзе адлюстроўвацца ў жывой стужцы, хэштэгах, аглядзе або ў пошуку Mastodon, нават калі Вы ўключылі бачнасць у пошуку ў наладах.",
   "privacy.unlisted.long": "Схаваны ад вынікаў пошуку Mastodon, трэндавага і публічных стужак",
   "privacy.unlisted.short": "Ціхі публічны",
@@ -893,7 +895,7 @@
   "quote_error.edit": "Нельга дадаваць цытаты пры рэдагаванні допісаў.",
   "quote_error.poll": "Нельга цытаваць з апытаннямі.",
   "quote_error.private_mentions": "Цытаванне не дазваляецца ў прамых узгадваннях.",
-  "quote_error.quote": "За раз дазволена рабіць толькі адну цытату.",
+  "quote_error.quote": "За раз дазволена рабіць толькі адно цытаванне.",
   "quote_error.unauthorized": "Вы не ўвайшлі, каб цытаваць гэты допіс.",
   "quote_error.upload": "Нельга цытаваць з медыя далучэннямі.",
   "recommended": "Рэкамендаванае",

app/javascript/mastodon/locales/da.json

@@ -535,6 +535,8 @@
   "follow_suggestions.view_all": "Vis alle",
   "follow_suggestions.who_to_follow": "Profiler, du kan følge",
   "followed_tags": "Hashtags, som følges",
+  "followers.hide_other_followers": "Denne bruger har valgt ikke at gøre sine øvrige følgere synlige",
+  "following.hide_other_following": "Denne bruger har valgt at skjule resten af sine fulgte konti",
   "footer.about": "Om",
   "footer.about_mastodon": "Om Mastodon",
   "footer.about_server": "Om {domain}",

app/javascript/mastodon/locales/de.json

@@ -535,6 +535,8 @@
   "follow_suggestions.view_all": "Alle anzeigen",
   "follow_suggestions.who_to_follow": "Wem folgen?",
   "followed_tags": "Abonnierte Hashtags",
+  "followers.hide_other_followers": "Dieses Profil möchte die weiteren Follower geheim halten",
+  "following.hide_other_following": "Dieses Profil möchte die gefolgten Profile geheim halten",
   "footer.about": "Über",
   "footer.about_mastodon": "Über Mastodon",
   "footer.about_server": "Über {domain}",

app/javascript/mastodon/locales/el.json

@@ -535,6 +535,8 @@
   "follow_suggestions.view_all": "Εμφάνιση όλων",
   "follow_suggestions.who_to_follow": "Ποιον να ακολουθήσεις",
   "followed_tags": "Ακολουθούμενες ετικέτες",
+  "followers.hide_other_followers": "Αυτός ο χρήστης έχει επιλέξει να μην κάνει τους άλλους ακολούθους του ορατούς",
+  "following.hide_other_following": "Αυτός ο χρήστης έχει επιλέξει να μην κάνει τους υπόλοιπους που ακολουθεί ορατούς",
   "footer.about": "Σχετικά με",
   "footer.about_mastodon": "Σχετικά με το Mastodon",
   "footer.about_server": "Σχετικά με το {domain}",

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

@@ -535,6 +535,8 @@
   "follow_suggestions.view_all": "View all",
   "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",
+  "following.hide_other_following": "This user has chosen not to make the rest of who they follow visible",
   "footer.about": "About",
   "footer.about_mastodon": "About Mastodon",
   "footer.about_server": "About {domain}",

app/javascript/mastodon/locales/en.json

@@ -244,6 +244,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",
+  "collections.account_count": "{count, plural, one {# account} other {# accounts}}",
   "collections.collection_description": "Description",
   "collections.collection_name": "Name",
   "collections.collection_topic": "Topic",
@@ -261,6 +262,7 @@
   "collections.edit_details": "Edit basic details",
   "collections.edit_settings": "Edit settings",
   "collections.error_loading_collections": "There was an error when trying to load your collections.",
+  "collections.last_updated_at": "Last updated: {date}",
   "collections.manage_accounts": "Manage accounts",
   "collections.manage_accounts_in_collection": "Manage accounts in this collection",
   "collections.mark_as_sensitive": "Mark as sensitive",

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

@@ -535,6 +535,8 @@
   "follow_suggestions.view_all": "Ver todo",
   "follow_suggestions.who_to_follow": "A quién seguir",
   "followed_tags": "Etiquetas seguidas",
+  "followers.hide_other_followers": "Este usuario eligió no hacer visibles a sus otros seguidores",
+  "following.hide_other_following": "Este usuario eligió no hacer visibles al resto de quienes lo siguen",
   "footer.about": "Información",
   "footer.about_mastodon": "Acerca de Mastodon",
   "footer.about_server": "Acerca de {domain}",

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

@@ -535,6 +535,8 @@
   "follow_suggestions.view_all": "Ver todo",
   "follow_suggestions.who_to_follow": "Recomendamos seguir",
   "followed_tags": "Etiquetas seguidas",
+  "followers.hide_other_followers": "Este usuario ha elegido no hacer visibles a sus otros seguidores",
+  "following.hide_other_following": "Este usuario ha elegido no hacer visible el resto de personas a las que sigue",
   "footer.about": "Acerca de",
   "footer.about_mastodon": "Acerca de Mastodon",
   "footer.about_server": "Acerca de {domain}",

app/javascript/mastodon/locales/fi.json

@@ -105,6 +105,13 @@
   "account.muted": "Mykistetty",
   "account.muting": "Mykistetty",
   "account.mutual": "Seuraatte toisianne",
+  "account.name.help.domain": "{domain} on palvelin, jolla käyttäjän profiili ja julkaisut sijaitsevat.",
+  "account.name.help.domain_self": "{domain} on palvelin, jolla profiilisi ja julkaisusi sijaitsevat.",
+  "account.name.help.footer": "Aivan kuten voit lähettää sähköpostia eri sähköpostiohjelmilla, voit olla yhteydessä muihin Mastodon-palvelimiin – ja kehen tahansa, joka käyttää sosiaalisen median sovelluksia, jotka toimivat samoilla säännöillä kuin Mastodon (hyödyntävät ActivityPub-protokollaa).",
+  "account.name.help.header": "Käyttäjätunnus on kuin sähköpostiosoite",
+  "account.name.help.username": "{username} on tämän tilin käyttäjänimi omalla palvelimellaan. Jollakin toisen palvelimen tilillä voi olla sama käyttäjänimi.",
+  "account.name.help.username_self": "{username} on käyttäjänimesi tällä palvelimella. Jollakin toisen palvelimen tilillä voi olla sama käyttäjänimi.",
+  "account.name_info": "Mitä tämä tarkoittaa?",
   "account.no_bio": "Kuvausta ei ole annettu.",
   "account.node_modal.callout": "Henkilökohtaiset muistiinpanot näkyvät vain sinulle.",
   "account.node_modal.edit_title": "Muokkaa henkilökohtaista muistiinpanoa",
@@ -528,6 +535,8 @@
   "follow_suggestions.view_all": "Näytä kaikki",
   "follow_suggestions.who_to_follow": "Seurantaehdotuksia",
   "followed_tags": "Seurattavat aihetunnisteet",
+  "followers.hide_other_followers": "Käyttäjä on päättänyt piilottaa muut seuraajansa",
+  "following.hide_other_following": "Käyttäjä on päättänyt piilottaa muut seurattavansa",
   "footer.about": "Tietoja",
   "footer.about_mastodon": "Tietoja Mastodonista",
   "footer.about_server": "Tietoja palvelimesta {domain}",

app/javascript/mastodon/locales/fo.json

@@ -535,6 +535,8 @@
   "follow_suggestions.view_all": "Vís øll",
   "follow_suggestions.who_to_follow": "Hvørji tú átti at fylgt",
   "followed_tags": "Fylgd frámerki",
+  "followers.hide_other_followers": "Hesin brúkarin hevur valt ikki at lata hinar fylgjararnar vera sjónligar",
+  "following.hide_other_following": "Hesin brúkarin hevur valt ikki at lata hini, sum tey fylgja, vera sjónligar",
   "footer.about": "Um",
   "footer.about_mastodon": "Um Mastodon",
   "footer.about_server": "Um {domain}",

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

@@ -535,6 +535,8 @@
   "follow_suggestions.view_all": "Tout afficher",
   "follow_suggestions.who_to_follow": "Qui suivre",
   "followed_tags": "Hashtags suivis",
+  "followers.hide_other_followers": "Ce compte a choisi de ne pas rendre visible ses autres abonné·e·s",
+  "following.hide_other_following": "Ce compte a choisi de ne pas rendre visible ses autres abonnements",
   "footer.about": "À propos",
   "footer.about_mastodon": "À propos de Mastodon",
   "footer.about_server": "À propos de {domain}",

app/javascript/mastodon/locales/fr.json

@@ -535,6 +535,8 @@
   "follow_suggestions.view_all": "Tout afficher",
   "follow_suggestions.who_to_follow": "Qui suivre",
   "followed_tags": "Hashtags suivis",
+  "followers.hide_other_followers": "Ce compte a choisi de ne pas rendre visible ses autres abonné·e·s",
+  "following.hide_other_following": "Ce compte a choisi de ne pas rendre visible ses autres abonnements",
   "footer.about": "À propos",
   "footer.about_mastodon": "À propos de Mastodon",
   "footer.about_server": "À propos de {domain}",

app/javascript/mastodon/locales/ga.json

@@ -535,6 +535,8 @@
   "follow_suggestions.view_all": "Féach uile",
   "follow_suggestions.who_to_follow": "Cé le leanúint",
   "followed_tags": "Hashtags le leanúint",
+  "followers.hide_other_followers": "Tá an t-úsáideoir seo tar éis a roghnú gan a leantóirí eile a dhéanamh le feiceáil",
+  "following.hide_other_following": "Tá an t-úsáideoir seo tar éis a roghnú gan an chuid eile de na daoine a leanann siad a dhéanamh le feiceáil",
   "footer.about": "Maidir le",
   "footer.about_mastodon": "Maidir le Mastodon",
   "footer.about_server": "Maidir le {domain}",

app/javascript/mastodon/locales/gl.json

@@ -535,6 +535,8 @@
   "follow_suggestions.view_all": "Ver todas",
   "follow_suggestions.who_to_follow": "A quen seguir",
   "followed_tags": "Cancelos seguidos",
+  "followers.hide_other_followers": "Esta usuaria escolleu non mostrar as outras persoas que a seguen",
+  "following.hide_other_following": "Esta usuaria escolleu non mostrar as outras persoas que segue",
   "footer.about": "Sobre",
   "footer.about_mastodon": "Sobre Mastodon",
   "footer.about_server": "Sobre {domain}",

app/javascript/mastodon/locales/is.json

@@ -535,6 +535,8 @@
   "follow_suggestions.view_all": "Skoða allt",
   "follow_suggestions.who_to_follow": "Hverjum á að fylgjast með",
   "followed_tags": "Vöktuð myllumerki",
+  "followers.hide_other_followers": "Þessi notandi hefur valið að gera ekki sýnilega aðra fylgjendur sína",
+  "following.hide_other_following": "Þessi notandi hefur valið að gera ekki sýnilega aðra þá sem þeir fylgjast með",
   "footer.about": "Nánari upplýsingar",
   "footer.about_mastodon": "Um Mastodon",
   "footer.about_server": "Um {domain}",

app/javascript/mastodon/locales/it.json

@@ -64,7 +64,7 @@
   "account.follow_request_short": "Richiesta",
   "account.followers": "Follower",
   "account.followers.empty": "Ancora nessuno segue questo utente.",
-  "account.followers_counter": "{count, plural, one {{counter} seguace} other {{counter} seguaci}}",
+  "account.followers_counter": "{count, plural, one {{counter} follower} other {{counter} follower}}",
   "account.followers_you_know_counter": "{counter} che conosci",
   "account.following": "Seguiti",
   "account.following_counter": "{count, plural, one {{counter} segui} other {{counter} seguiti}}",
@@ -91,7 +91,7 @@
   "account.menu.mute": "Silenzia l'account",
   "account.menu.note.description": "Visibile solo a te",
   "account.menu.open_original_page": "Visualizza su {domain}",
-  "account.menu.remove_follower": "Rimuovi il seguace",
+  "account.menu.remove_follower": "Rimuovi il follower",
   "account.menu.report": "Segnala l'account",
   "account.menu.share": "Condividi…",
   "account.menu.show_reblogs": "Mostra le condivisioni nella timeline",
@@ -124,7 +124,7 @@
   "account.open_original_page": "Apri la pagina originale",
   "account.posts": "Post",
   "account.posts_with_replies": "Post e risposte",
-  "account.remove_from_followers": "Rimuovi {name} dai seguaci",
+  "account.remove_from_followers": "Rimuovi {name} dai follower",
   "account.report": "Segnala @{name}",
   "account.requested_follow": "{name} ha richiesto di seguirti",
   "account.requests_to_follow_you": "Richieste di seguirti",
@@ -149,8 +149,8 @@
   "admin.dashboard.retention.cohort": "Mese d'iscrizione",
   "admin.dashboard.retention.cohort_size": "Nuovi utenti",
   "admin.impact_report.instance_accounts": "Profili di account che questo eliminerebbe",
-  "admin.impact_report.instance_followers": "I seguaci che i nostri utenti perderebbero",
-  "admin.impact_report.instance_follows": "I seguaci che i loro utenti perderebbero",
+  "admin.impact_report.instance_followers": "I follower che i nostri utenti perderebbero",
+  "admin.impact_report.instance_follows": "I follower che i loro utenti perderebbero",
   "admin.impact_report.title": "Riepilogo dell'impatto",
   "alert.rate_limited.message": "Sei pregato di riprovare dopo le {retry_time, time, medium}.",
   "alert.rate_limited.title": "Limitazione per eccesso di richieste",
@@ -196,7 +196,7 @@
   "annual_report.summary.archetype.title_self": "Il tuo archetipo",
   "annual_report.summary.close": "Chiudi",
   "annual_report.summary.copy_link": "Copia il сollegamento",
-  "annual_report.summary.followers.new_followers": "{count, plural, one {nuovo seguace} other {nuovi seguaci}}",
+  "annual_report.summary.followers.new_followers": "{count, plural, one {nuovo follower} other {nuovi follower}}",
   "annual_report.summary.highlighted_post.boost_count": "Questo post è stato condiviso {count, plural, one {1 volta} other {# volte}}.",
   "annual_report.summary.highlighted_post.favourite_count": "Questo post è stato aggiunto ai preferiti {count, plural, one {1 volta} other {# volte}}.",
   "annual_report.summary.highlighted_post.reply_count": "Questo post ha ricevuto {count, plural, one {1 risposta} other {# risposte}}.",
@@ -322,7 +322,7 @@
   "compose_form.direct_message_warning_learn_more": "Scopri di più",
   "compose_form.encryption_warning": "I post su Mastodon non sono crittografati end-to-end. Non condividere alcuna informazione sensibile su Mastodon.",
   "compose_form.hashtag_warning": "Questo post non sarà elencato sotto alcun hashtag, poiché non è pubblico. Solo i post pubblici possono essere cercati per hashtag.",
-  "compose_form.lock_disclaimer": "Il tuo profilo non è {locked}. Chiunque può seguirti per visualizzare i tuoi post per soli seguaci.",
+  "compose_form.lock_disclaimer": "Il tuo profilo non è {locked}. Chiunque può seguirti per visualizzare i tuoi post per soli follower.",
   "compose_form.lock_disclaimer.lock": "bloccato",
   "compose_form.placeholder": "Cos'hai in mente?",
   "compose_form.poll.duration": "Durata del sondaggio",
@@ -373,7 +373,7 @@
   "confirmations.private_quote_notify.confirm": "Pubblica il post",
   "confirmations.private_quote_notify.do_not_show_again": "Non mostrarmi più questo messaggio",
   "confirmations.private_quote_notify.message": "La persona che stai citando e le altre persone menzionate riceveranno una notifica e potranno visualizzare il tuo post, anche se non ti stanno seguendo.",
-  "confirmations.private_quote_notify.title": "Condividere con i seguaci e gli utenti menzionati?",
+  "confirmations.private_quote_notify.title": "Condividere con i follower e gli utenti menzionati?",
   "confirmations.quiet_post_quote_info.dismiss": "Non ricordarmelo più",
   "confirmations.quiet_post_quote_info.got_it": "Ho capito",
   "confirmations.quiet_post_quote_info.message": "Quando citi un post pubblico silenzioso, il tuo post verrà nascosto dalle timeline di tendenza.",
@@ -381,9 +381,9 @@
   "confirmations.redraft.confirm": "Elimina e riscrivi",
   "confirmations.redraft.message": "Sei sicuro di voler eliminare questo post e riscriverlo? I preferiti e i boost andranno persi e le risposte al post originale non saranno più collegate.",
   "confirmations.redraft.title": "Eliminare e riformulare il post?",
-  "confirmations.remove_from_followers.confirm": "Rimuovi il seguace",
+  "confirmations.remove_from_followers.confirm": "Rimuovi il follower",
   "confirmations.remove_from_followers.message": "{name} smetterà di seguirti. Si è sicuri di voler procedere?",
-  "confirmations.remove_from_followers.title": "Rimuovi il seguace?",
+  "confirmations.remove_from_followers.title": "Rimuovere il follower?",
   "confirmations.revoke_quote.confirm": "Elimina il post",
   "confirmations.revoke_quote.message": "Questa azione non può essere annullata.",
   "confirmations.revoke_quote.title": "Rimuovere il post?",
@@ -418,8 +418,8 @@
   "domain_block_modal.they_cant_follow": "Nessuno da questo server può seguirti.",
   "domain_block_modal.they_wont_know": "Non sapranno di essere stati bloccati.",
   "domain_block_modal.title": "Bloccare il dominio?",
-  "domain_block_modal.you_will_lose_num_followers": "Perderai {followersCount, plural, one {{followersCountDisplay} seguace} other {{followersCountDisplay} seguaci}} e {followingCount, plural, one {{followingCountDisplay} persona che segui} other {{followingCountDisplay} persone che segui}}.",
-  "domain_block_modal.you_will_lose_relationships": "Perderai tutti i seguaci e le persone che segui da questo server.",
+  "domain_block_modal.you_will_lose_num_followers": "Perderai {followersCount, plural, one {{followersCountDisplay} follower} other {{followersCountDisplay} follower}} e {followingCount, plural, one {{followingCountDisplay} persona che segui} other {{followingCountDisplay} persone che segui}}.",
+  "domain_block_modal.you_will_lose_relationships": "Perderai tutti i follower e le persone che segui da questo server.",
   "domain_block_modal.you_wont_see_posts": "Non vedrai post o notifiche dagli utenti su questo server.",
   "domain_pill.activitypub_lets_connect": "Ti consente di connetterti e interagire con le persone non solo su Mastodon, ma anche su diverse app social.",
   "domain_pill.activitypub_like_language": "ActivityPub è come la lingua che Mastodon parla con altri social network.",
@@ -432,7 +432,7 @@
   "domain_pill.who_they_are": "Poiché i nomi univoci indicano chi sia qualcuno e dove si trovi, puoi interagire con le persone attraverso la rete sociale delle <button>piattaforme basate su ActivityPub</button>.",
   "domain_pill.who_you_are": "Poiché il tuo nome univoco indica chi tu sia e dove ti trovi, le persone possono interagire con te sulla rete sociale delle <button>piattaforme basate su ActivityPub</button>.",
   "domain_pill.your_handle": "Il tuo nome univoco:",
-  "domain_pill.your_server": "La tua casa digitale, dove vivono tutti i tuoi post. Non ti piace questa? Cambia server in qualsiasi momento e porta con te anche i tuoi seguaci.",
+  "domain_pill.your_server": "La tua casa digitale, dove vivono tutti i tuoi post. Non ti piace questa? Cambia server in qualsiasi momento e porta con te anche i tuoi follower.",
   "domain_pill.your_username": "Il tuo identificatore univoco su questo server. È possibile trovare utenti con lo stesso nome utente su server diversi.",
   "dropdown.empty": "Seleziona un'opzione",
   "embed.instructions": "Incorpora questo post sul tuo sito web, copiando il seguente codice.",
@@ -535,6 +535,8 @@
   "follow_suggestions.view_all": "Vedi tutto",
   "follow_suggestions.who_to_follow": "Chi seguire",
   "followed_tags": "Hashtag seguiti",
+  "followers.hide_other_followers": "Questo/a utente ha scelto di non rendere visibili gli altri suoi follower",
+  "following.hide_other_following": "Questo/a utente ha scelto di non rendere visibile il resto dei profili che segue",
   "footer.about": "Info",
   "footer.about_mastodon": "Riguardo Mastodon",
   "footer.about_server": "Riguardo {domain}",
@@ -570,10 +572,10 @@
   "hashtag.unfeature": "Non mettere in evidenza sul profilo",
   "hashtag.unfollow": "Smetti di seguire l'hashtag",
   "hashtags.and_other": "…e {count, plural, other {# in più}}",
-  "hints.profiles.followers_may_be_missing": "I seguaci per questo profilo potrebbero essere mancanti.",
+  "hints.profiles.followers_may_be_missing": "I follower per questo profilo potrebbero essere mancanti.",
   "hints.profiles.follows_may_be_missing": "I profili seguiti per questo profilo potrebbero essere mancanti.",
   "hints.profiles.posts_may_be_missing": "Alcuni post da questo profilo potrebbero essere mancanti.",
-  "hints.profiles.see_more_followers": "Vedi altri seguaci su {domain}",
+  "hints.profiles.see_more_followers": "Vedi altri follower su {domain}",
   "hints.profiles.see_more_follows": "Vedi altri profili seguiti su {domain}",
   "hints.profiles.see_more_posts": "Vedi altri post su {domain}",
   "home.column_settings.show_quotes": "Mostra le citazioni",
@@ -708,7 +710,7 @@
   "navigation_bar.filters": "Parole silenziate",
   "navigation_bar.follow_requests": "Richieste di seguirti",
   "navigation_bar.followed_tags": "Hashtag seguiti",
-  "navigation_bar.follows_and_followers": "Seguiti e seguaci",
+  "navigation_bar.follows_and_followers": "Seguiti e follower",
   "navigation_bar.import_export": "Importa ed esporta",
   "navigation_bar.lists": "Liste",
   "navigation_bar.live_feed_local": "Feed in diretta (locale)",
@@ -767,9 +769,9 @@
   "notification.reblog.name_and_others_with_link": "{name} e <a>{count,  plural, one {# altro} other {altri #}}</a> hanno condiviso il tuo post",
   "notification.relationships_severance_event": "Connessioni perse con {name}",
   "notification.relationships_severance_event.account_suspension": "Un amministratore da {from} ha sospeso {target}, il che significa che non puoi più ricevere aggiornamenti da loro o interagire con loro.",
-  "notification.relationships_severance_event.domain_block": "Un amministratore da {from} ha bloccato {target}, inclusi {followersCount} dei tuoi seguaci e {followingCount, plural, one {# account} other {# account}} che segui.",
+  "notification.relationships_severance_event.domain_block": "Un amministratore da {from} ha bloccato {target}, inclusi {followersCount} dei tuoi follower e {followingCount, plural, one {# account} other {# account}} che segui.",
   "notification.relationships_severance_event.learn_more": "Scopri di più",
-  "notification.relationships_severance_event.user_domain_block": "Tu hai bloccato {target}, rimuovendo {followersCount} dei tuoi seguaci e {followingCount, plural, one {# account} other {# account}} che segui.",
+  "notification.relationships_severance_event.user_domain_block": "Hai bloccato {target}, rimuovendo {followersCount} dei tuoi follower e {followingCount, plural, one {# account} other {# account}} che segui.",
   "notification.status": "{name} ha appena pubblicato un post",
   "notification.update": "{name} ha modificato un post",
   "notification_requests.accept": "Accetta",
@@ -800,7 +802,7 @@
   "notifications.column_settings.favourite": "Preferiti:",
   "notifications.column_settings.filter_bar.advanced": "Mostra tutte le categorie",
   "notifications.column_settings.filter_bar.category": "Barra del filtro veloce",
-  "notifications.column_settings.follow": "Nuovi seguaci:",
+  "notifications.column_settings.follow": "Nuovi follower:",
   "notifications.column_settings.follow_request": "Nuove richieste di seguirti:",
   "notifications.column_settings.group": "Gruppo",
   "notifications.column_settings.mention": "Menzioni:",
@@ -1056,7 +1058,7 @@
   "status.quote_error.pending_approval": "Post in attesa",
   "status.quote_error.pending_approval_popout.body": "Su Mastodon, puoi controllare se qualcuno può citarti. Questo post è in attesa dell'approvazione dell'autore originale.",
   "status.quote_error.revoked": "Post rimosso dall'autore",
-  "status.quote_followers_only": "Solo i seguaci possono citare questo post",
+  "status.quote_followers_only": "Solo i follower possono citare questo post",
   "status.quote_manual_review": "L'autore esaminerà manualmente",
   "status.quote_noun": "Citazione",
   "status.quote_policy_change": "Cambia chi può citare",
@@ -1069,7 +1071,7 @@
   "status.read_more": "Leggi di più",
   "status.reblog": "Reblog",
   "status.reblog_or_quote": "Condividi o cita",
-  "status.reblog_private": "Condividi di nuovo con i tuoi seguaci",
+  "status.reblog_private": "Condividi di nuovo con i tuoi follower",
   "status.reblogged_by": "Rebloggato da {name}",
   "status.reblogs.empty": "Ancora nessuno ha rebloggato questo post. Quando qualcuno lo farà, apparirà qui.",
   "status.reblogs_count": "{count, plural, one {{counter} condivisione} other {{counter} condivisioni}}",
@@ -1153,11 +1155,11 @@
   "visibility_modal.helper.direct_quoting": "Le menzioni private scritte su Mastodon non possono essere citate da altri.",
   "visibility_modal.helper.privacy_editing": "La visibilità non può essere modificata dopo la pubblicazione di un post.",
   "visibility_modal.helper.privacy_private_self_quote": "Le autocitazioni di post privati ​​non possono essere rese pubbliche.",
-  "visibility_modal.helper.private_quoting": "I post scritti e riservati ai seguaci su Mastodon non possono essere citati da altri.",
+  "visibility_modal.helper.private_quoting": "I post scritti e riservati ai follower su Mastodon non possono essere citati da altri.",
   "visibility_modal.helper.unlisted_quoting": "Quando le persone ti citano, il loro post verrà nascosto anche dalle timeline di tendenza.",
   "visibility_modal.instructions": "Controlla chi può interagire con questo post. Puoi anche applicare le impostazioni a tutti i post futuri andando su <link>Preferenze > Impostazioni predefinite per i post</link>.",
   "visibility_modal.privacy_label": "Visibilità",
-  "visibility_modal.quote_followers": "Solo i seguaci",
+  "visibility_modal.quote_followers": "Solo i follower",
   "visibility_modal.quote_label": "Chi può citare",
   "visibility_modal.quote_nobody": "Solo io",
   "visibility_modal.quote_public": "Chiunque",

app/javascript/mastodon/locales/kab.json

@@ -27,6 +27,7 @@
   "account.copy": "Nɣel assaɣ ɣer umaɣnu",
   "account.direct": "Bder-d @{name} weḥd-s",
   "account.disable_notifications": "Ḥbes ur iyi-d-ttazen ara ilɣa mi ara d-isuffeɣ @{name}",
+  "account.edit_note": "Ẓreg tazmilt tudmawant",
   "account.edit_profile": "Ẓreg amaɣnu",
   "account.edit_profile_short": "Ẓreg",
   "account.enable_notifications": "Azen-iyi-d ilɣa mi ara d-isuffeɣ @{name}",
@@ -38,6 +39,7 @@
   "account.featured.hashtags": "Ihacṭagen",
   "account.featured_tags.last_status_at": "Tasuffeɣt taneggarut ass n {date}",
   "account.featured_tags.last_status_never": "Ulac tisuffaɣ",
+  "account.fields.scroll_next": "Sken-d aḍris",
   "account.filters.posts_only": "Tisuffaɣ",
   "account.filters.posts_replies": "Tisuffaɣ d tririyin",
   "account.filters.replies_toggle": "Sken-d tiririyin",
@@ -57,6 +59,7 @@
   "account.follows_you": "Yeṭṭafaṛ-ik·em-id",
   "account.go_to_profile": "Ddu ɣer umaɣnu",
   "account.hide_reblogs": "Ffer ayen i ibeṭṭu @{name}",
+  "account.joined_long": "Yerna-d ass n {date}",
   "account.joined_short": "Izeddi da seg ass n",
   "account.languages": "Beddel tutlayin yettwajerden",
   "account.link_verified_on": "Taɣara n useɣwen-a tettwasenqed ass n {date}",
@@ -67,16 +70,28 @@
   "account.menu.block": "Sewḥel amiḍan",
   "account.menu.block_domain": "Sewḥel {domain}",
   "account.menu.copy": "Nɣel aseɣwen",
+  "account.menu.mention": "Bder-d",
+  "account.menu.mute": "Sgugem amiḍan",
+  "account.menu.note.description": "Ad tettbin i kečč·mm kan",
+  "account.menu.open_original_page": "Wali-t ɣef {domain}",
+  "account.menu.remove_follower": "Kkes aneḍfar",
+  "account.menu.report": "Cetki ɣef umiḍan-a",
+  "account.menu.share": "Zuzer…",
   "account.moved_to": "{name} yenna-d dakken amiḍan-is amaynut yuɣal :",
   "account.mute": "Sgugem @{name}",
   "account.mute_notifications_short": "Susem ilɣa",
   "account.mute_short": "Sgugem",
   "account.muted": "Yettwasgugem",
   "account.mutual": "Temmeḍfaṛem",
+  "account.name_info": "D acu i d lmeεna-s?",
   "account.no_bio": "Ulac aglam i d-yettunefken.",
+  "account.node_modal.edit_title": "Ẓreg tazmilt tudmawant",
+  "account.node_modal.error_unknown": "Ur izmir ara ad isekles tazmilt-a",
+  "account.node_modal.field_label": "Tazmilt tudmawant",
   "account.node_modal.save": "Sekles",
   "account.node_modal.title": "Rnu tazmilt tudmawant",
   "account.note.edit_button": "Ẓreg",
+  "account.note.title": "Tazmilt tudmawant (tettbin-d i kečč·mm kan)",
   "account.open_original_page": "Ldi asebter anasli",
   "account.posts": "Tisuffaɣ",
   "account.posts_with_replies": "Tisuffaɣ d tririyin",
@@ -139,6 +154,7 @@
   "boost_modal.reblog": "Zuzer tasuffeɣt?",
   "bundle_column_error.copy_stacktrace": "Nɣel tuccḍa n uneqqis",
   "bundle_column_error.error.title": "Uh, ala !",
+  "bundle_column_error.network.body": "Teḍra-d tuccḍa deg usali n usebter-a. Aya yezmer ad yili d ugur akudan deg tuqqna-inek·inem ɣer internet neɣ deg uqeddac-a.",
   "bundle_column_error.network.title": "Tuccḍa deg uẓeṭṭa",
   "bundle_column_error.retry": "Ɛreḍ tikelt-nniḍen",
   "bundle_column_error.return": "Uɣal ɣer ugejdan",
@@ -153,6 +169,7 @@
   "collections.collection_name": "Isem",
   "collections.continue": "Kemmel",
   "collections.create.settings_title": "Iɣewwaren",
+  "collections.edit_settings": "Ẓreg iɣewwaren",
   "collections.manage_accounts": "Sefrek imiḍanen",
   "column.about": "Ɣef",
   "column.blocks": "Imiḍanen yettusḥebsen",
@@ -181,6 +198,9 @@
   "column_header.show_settings": "Ssken iɣewwaṛen",
   "column_header.unpin": "Kkes asenteḍ",
   "column_search.cancel": "Semmet",
+  "combobox.close_results": "Mdel igmaḍ",
+  "combobox.loading": "Yessalay-d",
+  "combobox.open_results": "Ldi igmaḍ",
   "community.column_settings.local_only": "Adigan kan",
   "community.column_settings.media_only": "Imidyaten kan",
   "community.column_settings.remote_only": "Anmeggag kan",
@@ -212,10 +232,15 @@
   "confirmations.delete.message": "Tebɣiḍ s tidet ad tekkseḍ tasuffeɣt-agi?",
   "confirmations.delete.title": "Tukksa n tasuffeɣt?",
   "confirmations.delete_collection.confirm": "Kkes",
+  "confirmations.delete_collection.title": "Ad tekkseḍ \"{name}\"?",
   "confirmations.delete_list.confirm": "Kkes",
   "confirmations.delete_list.message": "Tebɣiḍ s tidet ad tekkseḍ umuɣ-agi i lebda?",
   "confirmations.delete_list.title": "Tukksa n tebdart?",
   "confirmations.discard_draft.confirm": "Ttu-t u kemmel",
+  "confirmations.discard_draft.edit.cancel": "Tuɣalin ar umaẓrag",
+  "confirmations.discard_draft.edit.title": "Deggeṛ isenfal n yizen-ik·im?",
+  "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_list.confirm": "Ḍfeṛ-it sakin rnu-t ɣer tebdart",
   "confirmations.follow_to_list.title": "Ḍfer aseqdac?",
@@ -226,9 +251,11 @@
   "confirmations.missing_alt_text.secondary": "Suffeɣ akken yebɣu yili",
   "confirmations.missing_alt_text.title": "Rnu aḍris amlellay?",
   "confirmations.mute.confirm": "Sgugem",
+  "confirmations.private_quote_notify.confirm": "Suffeɣ tasuffeɣt",
   "confirmations.quiet_post_quote_info.dismiss": "Ur iyi-d-smektay ara",
   "confirmations.quiet_post_quote_info.got_it": "Gziɣ-t",
   "confirmations.redraft.confirm": "Kkes sakin ɛiwed tira",
+  "confirmations.redraft.title": "Kkes sakin ɛiwed tira n tsuffeɣt?",
   "confirmations.remove_from_followers.confirm": "Kkes aneḍfar",
   "confirmations.revoke_quote.confirm": "Kkes tasuffeɣt",
   "confirmations.revoke_quote.title": "Kkes tasuffeɣt?",
@@ -300,6 +327,7 @@
   "empty_column.mutes": "Ulac ɣur-k·m imseqdacen i yettwasgugmen.",
   "empty_column.notifications": "Ulac ɣur-k·m ilɣa. Sedmer akked yemdanen-nniḍen akken ad tebduḍ adiwenni.",
   "empty_column.public": "Ulac kra da! Aru kra, neɣ ḍfeṛ imdanen i yellan deg yiqeddacen-nniḍen akken ad d-teččar tsuddemt tazayezt",
+  "empty_state.no_results": "Ulac igmaḍ",
   "error.unexpected_crash.next_steps": "Smiren asebter-a, ma ur yekkis ara wugur, ẓer d akken tzemreḍ ad tesqedceḍ Maṣṭudun deg yiminig-nniḍen neɣ deg usnas anaṣli.",
   "errors.unexpected_crash.copy_stacktrace": "Nɣel stacktrace ɣef wafus",
   "errors.unexpected_crash.report_issue": "Mmel ugur",
@@ -309,6 +337,7 @@
   "explore.trending_statuses": "Tisuffaɣ",
   "explore.trending_tags": "Ihacṭagen",
   "featured_carousel.header": "{count, plural, one {n tsuffeɣt tunṭiḍt} other {n tsuffaɣ tunṭiḍin}}",
+  "featured_tags.more_items": "+{count}",
   "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}.",
@@ -362,8 +391,11 @@
   "hashtag.counter_by_accounts": "{count, plural, one {{counter} imtekki} other {{counter} n imtekkiyen}}",
   "hashtag.counter_by_uses": "{count, plural, one {{counter} n tsuffeɣt} other {{counter} n tsuffaɣ}}",
   "hashtag.counter_by_uses_today": "{count, plural, one {{counter} n tsuffeɣt} other {{counter} n tsuffaɣ}} ass-a",
+  "hashtag.feature": "Welleh fell-as deg umaɣnu-inek·inem",
   "hashtag.follow": "Ḍfeṛ ahacṭag",
   "hashtag.mute": "Sgugem #{hashtag}",
+  "hashtag.unfeature": "Ur ttwellih ara fell-as deg umaɣnu-inek·inem",
+  "hashtag.unfollow": "Ḥbes aḍfar n uhacṭag",
   "hashtags.and_other": "…d {count, plural, one {}other {# nniḍen}}",
   "hints.profiles.see_more_posts": "Wali ugar n tsuffaɣ ɣef {domain}",
   "home.column_settings.show_quotes": "Sken-d tibdarin",

app/javascript/mastodon/locales/nl.json

@@ -409,7 +409,7 @@
   "directory.recently_active": "Onlangs actief",
   "disabled_account_banner.account_settings": "Accountinstellingen",
   "disabled_account_banner.text": "Jouw account {disabledAccount} is momenteel uitgeschakeld.",
-  "dismissable_banner.community_timeline": "Dit zijn de meest recente openbare berichten van accounts op {domain}. Je kunt onder 'instellingen > voorkeuren > overig' kiezen welke talen je wilt zien.",
+  "dismissable_banner.community_timeline": "Dit zijn de meest recente openbare berichten van gebruikers met een account op {domain}.",
   "dismissable_banner.dismiss": "Sluiten",
   "dismissable_banner.public_timeline": "Dit zijn de meest recente openbare berichten van mensen op de fediverse die mensen op {domain} volgen.",
   "domain_block_modal.block": "Server blokkeren",
@@ -535,6 +535,8 @@
   "follow_suggestions.view_all": "Alles weergeven",
   "follow_suggestions.who_to_follow": "Wie te volgen",
   "followed_tags": "Gevolgde hashtags",
+  "followers.hide_other_followers": "Deze gebruiker heeft ervoor gekozen diens andere volgers niet zichtbaar te maken",
+  "following.hide_other_following": "Deze gebruiker heeft ervoor gekozen de rest van diens gevolgde accounts niet zichtbaar te maken",
   "footer.about": "Over",
   "footer.about_mastodon": "Over Mastodon",
   "footer.about_server": "Over {domain}",
@@ -741,7 +743,7 @@
   "notification.favourite_pm": "{name} heeft je privébericht als favoriet gemarkeerd",
   "notification.favourite_pm.name_and_others_with_link": "{name} en <a>{count, plural, one {# ander} other {# anderen}}</a> hebben je privébericht als favoriet gemarkeerd",
   "notification.follow": "{name} volgt jou nu",
-  "notification.follow.name_and_others": "{name} en <a>{count, plural, one {# ander persoon} other {# andere personen}}</a> volgen jou nou",
+  "notification.follow.name_and_others": "{name} en <a>{count, plural, one {# ander persoon} other {# andere personen}}</a> volgen jou nu",
   "notification.follow_request": "{name} wil jou graag volgen",
   "notification.follow_request.name_and_others": "{name} en {count, plural, one {# ander persoon} other {# andere personen}} hebben gevraagd om je te volgen",
   "notification.label.mention": "Vermelding",

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

@@ -89,6 +89,7 @@
   "account.menu.hide_reblogs": "Ocultar partilhas na cronologia",
   "account.menu.mention": "Mencionar",
   "account.menu.mute": "Silenciar conta",
+  "account.menu.note.description": "Visível apenas para ti",
   "account.menu.open_original_page": "Ver em {domain}",
   "account.menu.remove_follower": "Remover seguidor",
   "account.menu.report": "Denunciar conta",
@@ -104,6 +105,13 @@
   "account.muted": "Ocultada",
   "account.muting": "A silenciar",
   "account.mutual": "Seguem-se mutuamente",
+  "account.name.help.domain": "{domain} é o servidor onde estão alojados o perfil e publicações do utilizador.",
+  "account.name.help.domain_self": "{domain} é o servidor que hospeda o teu perfil e publicações.",
+  "account.name.help.footer": "Tal como podes enviar mensagens para pessoas que usam diferentes aplicações de correio eletrónico, podes interagir com as pessoas noutros servidores Mastodon — e com qualquer pessoa noutras aplicações sociais suportadas pelas mesmas regras usadas pelo Mastodon (o protocolo ActivityPub).",
+  "account.name.help.header": "Um identificador é como um endereço de correio eletrónico",
+  "account.name.help.username": "{username} é o nome de utilizador desta conta no seu servidor. Alguém pode ter o mesmo nome de utilizador noutro servidor.",
+  "account.name.help.username_self": "{username} é o teu nome de utilizador neste servidor. Alguém pode ter o mesmo nome de utilizador noutro servidor.",
+  "account.name_info": "O que significa isto?",
   "account.no_bio": "Nenhuma descrição fornecida.",
   "account.node_modal.callout": "As notas pessoais só são visíveis por si.",
   "account.node_modal.edit_title": "Editar nota pessoal",
@@ -527,6 +535,8 @@
   "follow_suggestions.view_all": "Ver tudo",
   "follow_suggestions.who_to_follow": "Quem seguir",
   "followed_tags": "Etiquetas seguidas",
+  "followers.hide_other_followers": "Este utilizador optou por não mostrar os seus outros seguidores",
+  "following.hide_other_following": "Este utilizador optou por não mostrar quem mais segue",
   "footer.about": "Sobre",
   "footer.about_mastodon": "Sobre o Mastodon",
   "footer.about_server": "Sobre {domain}",

app/javascript/mastodon/locales/sq.json

@@ -89,6 +89,7 @@
   "account.menu.hide_reblogs": "Fshihi përforcimet te rrjedhë kohore",
   "account.menu.mention": "Përmendje",
   "account.menu.mute": "Heshtoje llogarinë",
+  "account.menu.note.description": "I dukshëm vetëm për ju",
   "account.menu.open_original_page": "Shiheni në {domain}",
   "account.menu.remove_follower": "Hiqni ndjekës",
   "account.menu.report": "Raportoni llogari",
@@ -104,6 +105,13 @@
   "account.muted": "Heshtuar",
   "account.muting": "Heshtim",
   "account.mutual": "Ndiqni njëri-tjetrin",
+  "account.name.help.domain": "{domain} është shërbyesi që strehon profilin dhe postimet e përdoruesit.",
+  "account.name.help.domain_self": "{domain} është shërbyesi juaj që strehon profilin dhe postimet tuaja.",
+  "account.name.help.footer": "Ashtu siç mund të dërgoni email-e për persona që përdorin shërbime të ndryshëm email, mund të ndërveproni me persona në shërbyes të tjerë Mastodon – dhe me këdo në aplikacione të tjerë shoqërorë të ngritur mbi të njëjtin grup rregullash që përdor Mastodon-i (protokollin ActivityPub).",
+  "account.name.help.header": "Handle-i është i ngashëm me një adresë email",
+  "account.name.help.username": "{username} është emri i përdoruesit të kësaj llogarie në shërbyesin e tij. Dikush në një tjetër shërbyes mund të ketë të njëjtin emër përdoruesi.",
+  "account.name.help.username_self": "{username} është emri juaj i përdoruesit në këtë shërbyes. Dikush në një tjetër shërbyes mund të ketë të njëjtin emër përdoruesi.",
+  "account.name_info": "Ç’do të thotë kjo?",
   "account.no_bio": "S’u dha përshkrim.",
   "account.node_modal.callout": "Shënimet personale janë të dukshme vetëm për ju.",
   "account.node_modal.edit_title": "Përpunoni shënim personal",
@@ -525,6 +533,8 @@
   "follow_suggestions.view_all": "Shihni krejt",
   "follow_suggestions.who_to_follow": "Cilët të ndiqen",
   "followed_tags": "Hashtag-ë të ndjekur",
+  "followers.hide_other_followers": "Ky përdorues ka zgjedhur të mos i bëjë të dukshëm ndjekësit e vet të tjerë",
+  "following.hide_other_following": "Ky përdorues ka zgjedhur të mos bëjë të dukshëm pjesën tjetër të përdoruesve që ndjek",
   "footer.about": "Mbi",
   "footer.about_mastodon": "Mbi Mastodon-in",
   "footer.about_server": "Mbi {domain}",

app/javascript/mastodon/locales/sv.json

@@ -449,6 +449,8 @@
   "follow_suggestions.view_all": "Visa alla",
   "follow_suggestions.who_to_follow": "Rekommenderade profiler",
   "followed_tags": "Följda hashtags",
+  "followers.hide_other_followers": "Denna användare har valt att inte göra sina andra följare synliga",
+  "following.hide_other_following": "Denna användare har valt att inte göra resten av vilka de följer synliga",
   "footer.about": "Om",
   "footer.about_mastodon": "Om Mastodon",
   "footer.about_server": "Om {domain}",

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

@@ -89,6 +89,7 @@
   "account.menu.hide_reblogs": "在时间线中隐藏转嘟",
   "account.menu.mention": "提及",
   "account.menu.mute": "停止提醒账户",
+  "account.menu.note.description": "仅对你可见",
   "account.menu.open_original_page": "在 {domain} 上查看",
   "account.menu.remove_follower": "移除关注者",
   "account.menu.report": "举报账户",
@@ -104,6 +105,13 @@
   "account.muted": "已隐藏",
   "account.muting": "正在静音",
   "account.mutual": "你们互相关注",
+  "account.name.help.domain": "{domain} 是托管该用户个人资料及嘟文的服务器。",
+  "account.name.help.domain_self": "{domain} 是托管你的个人资料及嘟文的服务器。",
+  "account.name.help.footer": "就像你可以用不同的电子邮件客户端向其他人发送同样的电子邮件一般，你也可以和其他 Mastodon 服务器上的用户互动，甚至还能和与 Mastodon 采用相同规则（即 ActivityPub 协议）的其他社交软件上的任何人互动。",
+  "account.name.help.header": "用户名类似电子邮件地址",
+  "account.name.help.username": "{username} 是此账号在其服务器上的用户名。另一个服务器上的其他人可能拥有相同的用户名。",
+  "account.name.help.username_self": "{username} 是你在此服务器上的用户名。另一个服务器上的其他人可能拥有相同的用户名。",
+  "account.name_info": "这是什么？",
   "account.no_bio": "未提供描述。",
   "account.node_modal.callout": "个人备注仅对你个人可见。",
   "account.node_modal.edit_title": "编辑个人备注",
@@ -527,6 +535,8 @@
   "follow_suggestions.view_all": "查看全部",
   "follow_suggestions.who_to_follow": "推荐关注",
   "followed_tags": "已关注话题",
+  "followers.hide_other_followers": "该用户选择不展示其他关注者",
+  "following.hide_other_following": "该用户选择不展示其关注的其他人",
   "footer.about": "关于",
   "footer.about_mastodon": "关于 Mastodon",
   "footer.about_server": "关于 {domain}",

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

@@ -535,6 +535,8 @@
   "follow_suggestions.view_all": "檢視全部",
   "follow_suggestions.who_to_follow": "推薦跟隨帳號",
   "followed_tags": "已跟隨主題標籤",
+  "followers.hide_other_followers": "此使用者選擇不公開跟隨者",
+  "following.hide_other_following": "此使用者選擇不公開跟隨中",
   "footer.about": "關於",
   "footer.about_mastodon": "關於 Mastodon",
   "footer.about_server": "關於 {domain}",

app/javascript/styles/mastodon/_mixins.scss

@@ -14,7 +14,7 @@
 }
 
 @mixin search-popout {
-  background: var(--color-bg-elevated);
+  background: var(--color-bg-primary);
   border-radius: 4px;
   padding: 10px 14px;
   padding-bottom: 14px;

app/javascript/styles/mastodon/components.scss

@@ -411,7 +411,7 @@ body > [data-popper-placement] {
 
   &__suggestions {
     box-shadow: var(--dropdown-shadow);
-    background: var(--color-bg-elevated);
+    background: var(--color-bg-primary);
     border: 1px solid var(--color-border-primary);
     border-radius: 0 0 4px 4px;
     color: var(--color-text-primary);
@@ -2066,7 +2066,7 @@ body > [data-popper-placement] {
     }
 
     &__popout {
-      background: var(--color-bg-elevated);
+      background: var(--color-bg-primary);
       backdrop-filter: $backdrop-blur-filter;
       border: 1px solid var(--color-border-primary);
       box-shadow: var(--dropdown-shadow);
@@ -2770,7 +2770,7 @@ a.account__display-name {
 }
 
 .dropdown-menu {
-  background: var(--color-bg-elevated);
+  background: var(--color-bg-primary);
   backdrop-filter: $backdrop-blur-filter;
   border: 1px solid var(--color-border-primary);
   padding: 4px;
@@ -5169,7 +5169,7 @@ a.status-card {
       @include search-popout;
 
       padding: 0;
-      background: var(--color-bg-elevated);
+      background: var(--color-bg-primary);
     }
 
     &__menu-list {
@@ -5339,7 +5339,7 @@ a.status-card {
   position: relative;
   margin-top: 5px;
   z-index: 2;
-  background: var(--color-bg-elevated);
+  background: var(--color-bg-primary);
   backdrop-filter: $backdrop-blur-filter;
   border: 1px solid var(--color-border-primary);
   box-shadow: var(--dropdown-shadow);
@@ -5366,7 +5366,7 @@ a.status-card {
   z-index: 4;
   top: -5px;
   inset-inline-start: -9px;
-  background: var(--color-bg-elevated);
+  background: var(--color-bg-primary);
   border: 1px solid var(--color-border-primary);
   border-radius: 4px;
   box-shadow: var(--dropdown-shadow);
@@ -5433,7 +5433,7 @@ a.status-card {
   inset-inline-start: 0;
   z-index: -1;
   border-radius: 4px;
-  background: var(--color-bg-elevated);
+  background: var(--color-bg-primary);
   box-shadow: 0 0 5px var(--color-shadow-primary);
 }
 
@@ -5538,7 +5538,7 @@ a.status-card {
 .language-dropdown__dropdown,
 .visibility-dropdown__dropdown {
   box-shadow: var(--dropdown-shadow);
-  background: var(--color-bg-elevated);
+  background: var(--color-bg-primary);
   border: 1px solid var(--color-border-primary);
   padding: 4px;
   border-radius: 4px;
@@ -5653,7 +5653,7 @@ a.status-card {
 
     .emoji-mart-search {
       padding: 10px;
-      background: var(--color-bg-elevated);
+      background: var(--color-bg-primary);
 
       input {
         padding: 8px 12px;
@@ -5686,7 +5686,7 @@ a.status-card {
 
     .emoji-mart-scroll {
       padding: 0 10px 10px;
-      background: var(--color-bg-elevated);
+      background: var(--color-bg-primary);
     }
 
     &__results {
@@ -5812,7 +5812,7 @@ a.status-card {
     inset-inline-start: 0;
     margin-top: -2px;
     width: 100%;
-    background: var(--color-bg-elevated);
+    background: var(--color-bg-primary);
     border: 1px solid var(--color-border-primary);
     border-radius: 0 0 4px 4px;
     box-shadow: var(--dropdown-shadow);
@@ -6569,7 +6569,7 @@ a.status-card {
   width: 588px;
   max-height: 80vh;
   flex-direction: column;
-  background: var(--color-bg-elevated);
+  background: var(--color-bg-primary);
   backdrop-filter: $backdrop-blur-filter;
   border: 1px solid var(--color-border-primary);
   border-radius: 16px;
@@ -6653,7 +6653,7 @@ a.status-card {
   }
 
   &__popout {
-    background: var(--color-bg-elevated);
+    background: var(--color-bg-primary);
     backdrop-filter: $backdrop-blur-filter;
     border: 1px solid var(--color-border-primary);
     box-shadow: var(--dropdown-shadow);
@@ -6935,7 +6935,7 @@ a.status-card {
 
 .actions-modal {
   border-radius: 8px 8px 0 0;
-  background: var(--color-bg-elevated);
+  background: var(--color-bg-primary);
   backdrop-filter: $backdrop-blur-filter;
   border-color: var(--color-border-primary);
   box-shadow: var(--dropdown-shadow);
@@ -7123,7 +7123,7 @@ a.status-card {
 
   &--solid {
     color: var(--color-text-primary);
-    background: var(--color-bg-elevated);
+    background: var(--color-bg-primary);
     border: 1px solid var(--color-border-primary);
   }
 
@@ -10510,6 +10510,8 @@ noscript {
     position: relative;
 
     &__scroll-button {
+      --scroll-button-bg: var(--color-bg-brand-base);
+
       position: absolute;
       height: 100%;
       background: transparent;
@@ -10517,7 +10519,6 @@ noscript {
       cursor: pointer;
       top: 0;
       color: var(--color-text-primary);
-      opacity: 0.5;
 
       &.left {
         left: 0;
@@ -10530,7 +10531,7 @@ noscript {
       &__icon {
         border-radius: 50%;
         color: var(--color-text-on-brand-base);
-        background: var(--color-bg-brand-base);
+        background: var(--scroll-button-bg);
         display: flex;
         align-items: center;
         justify-content: center;
@@ -10546,7 +10547,7 @@ noscript {
       &:hover,
       &:focus,
       &:active {
-        opacity: 1;
+        --scroll-button-bg: var(--color-bg-brand-base-hover);
       }
     }
 

app/javascript/styles/mastodon/theme/_base.scss

@@ -1,27 +1,40 @@
 @mixin palette {
   --color-black: #000;
-  --color-grey-950: #181821;
-  --color-grey-800: #292938;
-  --color-grey-700: #444664;
-  --color-grey-600: #545778;
-  --color-grey-500: #696d91;
-  --color-grey-400: #8b8dac;
-  --color-grey-300: #b4b6cb;
-  --color-grey-200: #d8d9e3;
-  --color-grey-100: #f0f0f5;
-  --color-grey-50: #f0f1ff;
+  --color-grey-950: #181820;
+  --color-grey-800: #3a3a50;
+  --color-grey-700: #44445f;
+  --color-grey-600: #535374;
+  --color-grey-500: #67678e;
+  --color-grey-400: #88a;
+  --color-grey-300: #b2b1c8;
+  --color-grey-200: #d7d6e1;
+  --color-grey-100: #eeedf3;
+  --color-grey-50: #f6f6f9;
   --color-white: #fff;
+  --color-indigo-700: #5638cc;
   --color-indigo-600: #6147e6;
-  --color-indigo-400: #8886ff;
+  --color-indigo-400: #8280f9;
   --color-indigo-300: #a5abfd;
   --color-indigo-200: #c8cdfe;
   --color-indigo-100: #e0e3ff;
   --color-indigo-50: #f0f1ff;
-  --color-red-500: #ff637e;
-  --color-red-600: #ec003f;
+  --color-red-50: #fef2f2;
+  --color-red-100: #ffe2e2;
+  --color-red-300: #ffa2a2;
+  --color-red-800: #9f0712;
+  --color-red-900: #82181a;
+  --color-red-950: #460809;
+  --color-yellow-50: #fffbeb;
+  --color-yellow-100: #fef3c6;
   --color-yellow-400: #ffb900;
   --color-yellow-600: #e17100;
   --color-yellow-700: #bb4d00;
+  --color-yellow-900: #7b3306;
+  --color-yellow-950: #461901;
+  --color-green-50: #f0fdf4;
+  --color-green-100: #dcfce7;
   --color-green-400: #05df72;
   --color-green-600: #00a63e;
+  --color-green-900: #0d542b;
+  --color-green-950: #032e15;
 }

app/javascript/styles/mastodon/theme/_dark.scss

@@ -3,11 +3,11 @@
 @mixin tokens {
   /* TEXT TOKENS */
 
-  --color-text-primary: var(--color-grey-50);
-  --color-text-secondary: var(--color-grey-400);
-  --color-text-tertiary: var(--color-grey-500);
+  --color-text-primary: var(--color-grey-100);
+  --color-text-secondary: var(--color-grey-300);
+  --color-text-tertiary: var(--color-grey-400);
   --color-text-on-inverted: var(--color-grey-950);
-  --color-text-brand: var(--color-indigo-400);
+  --color-text-brand: var(--color-indigo-300);
   --color-text-brand-soft: color-mix(
     in oklab,
     var(--color-text-primary),
@@ -15,7 +15,7 @@
   );
   --color-text-on-brand-base: var(--color-white);
   --color-text-brand-on-inverted: var(--color-indigo-600);
-  --color-text-error: var(--color-red-500);
+  --color-text-error: var(--color-red-300);
   --color-text-on-error-base: var(--color-white);
   --color-text-warning: var(--color-yellow-400);
   --color-text-on-warning-base: var(--color-white);
@@ -36,8 +36,8 @@
 
   // Neutrals
   --color-bg-primary: var(--color-grey-950);
-  --overlay-strength-secondary: 8%;
-  --color-bg-secondary-base: var(--color-indigo-200);
+  --overlay-strength-secondary: 4%;
+  --color-bg-secondary-base: var(--color-white);
   --color-bg-secondary: #{utils.css-alpha(
       var(--color-bg-secondary-base),
       var(--overlay-strength-secondary)
@@ -55,7 +55,6 @@
 
   // Utility
   --color-bg-ambient: var(--color-bg-primary);
-  --color-bg-elevated: var(--color-bg-primary);
   --color-bg-inverted: var(--color-grey-50);
   --color-bg-media-base: var(--color-black);
   --color-bg-media-strength: 65%;
@@ -67,16 +66,16 @@
   --color-bg-disabled: var(--color-grey-700);
 
   // Brand
-  --overlay-strength-brand: 10%;
-  --color-bg-brand-base: var(--color-indigo-600);
+  --overlay-strength-brand: 22%;
+  --color-bg-brand-base: var(--color-indigo-700);
   --color-bg-brand-base-hover: color-mix(
     in oklab,
     var(--color-bg-brand-base),
-    black var(--overlay-strength-brand)
+    var(--color-bg-primary) var(--overlay-strength-brand)
   );
   --color-bg-brand-soft: #{utils.css-alpha(
-      var(--color-bg-brand-base),
-      calc(var(--overlay-strength-brand) * 1.5)
+      #6f4df5,
+      calc(var(--overlay-strength-brand) * 2)
     )};
   --color-bg-brand-softer: #{utils.css-alpha(
       var(--color-bg-brand-base),
@@ -84,21 +83,15 @@
     )};
 
   // Error
-  --overlay-strength-error: 12%;
-  --color-bg-error-base: var(--color-red-600);
+  --overlay-strength-error: 10%;
+  --color-bg-error-base: var(--color-red-800);
   --color-bg-error-base-hover: color-mix(
     in oklab,
     var(--color-bg-error-base),
-    black var(--overlay-strength-error)
+    var(--color-bg-primary) var(--overlay-strength-error)
   );
-  --color-bg-error-soft: #{utils.css-alpha(
-      var(--color-bg-error-base),
-      calc(var(--overlay-strength-error) * 1.5)
-    )};
-  --color-bg-error-softer: #{utils.css-alpha(
-      var(--color-bg-error-base),
-      var(--overlay-strength-error)
-    )};
+  --color-bg-error-soft: var(--color-red-900);
+  --color-bg-error-softer: var(--color-red-950);
 
   // Warning
   --overlay-strength-warning: 10%;
@@ -106,16 +99,10 @@
   --color-bg-warning-base-hover: color-mix(
     in oklab,
     var(--color-bg-warning-base),
-    black var(--overlay-strength-warning)
+    var(--color-bg-primary) var(--overlay-strength-warning)
   );
-  --color-bg-warning-soft: #{utils.css-alpha(
-      var(--color-bg-warning-base),
-      calc(var(--overlay-strength-warning) * 1.5)
-    )};
-  --color-bg-warning-softer: #{utils.css-alpha(
-      var(--color-bg-warning-base),
-      var(--overlay-strength-warning)
-    )};
+  --color-bg-warning-soft: var(--color-yellow-900);
+  --color-bg-warning-softer: var(--color-yellow-950);
 
   // Success
   --overlay-strength-success: 15%;
@@ -123,16 +110,10 @@
   --color-bg-success-base-hover: color-mix(
     in oklab,
     var(--color-bg-success-base),
-    black var(--overlay-strength-success)
+    var(--color-bg-primary) var(--overlay-strength-success)
   );
-  --color-bg-success-soft: #{utils.css-alpha(
-      var(--color-bg-success-base),
-      calc(var(--overlay-strength-success) * 1.5)
-    )};
-  --color-bg-success-softer: #{utils.css-alpha(
-      var(--color-bg-success-base),
-      var(--overlay-strength-success)
-    )};
+  --color-bg-success-soft: var(--color-green-900);
+  --color-bg-success-softer: var(--color-green-950);
 
   /* BORDER TOKENS */
 
@@ -194,12 +175,9 @@
   /* TEXT TOKENS */
 
   --color-text-primary: var(--color-grey-50);
-  --color-text-secondary: var(--color-grey-300);
-  --color-text-tertiary: var(--color-grey-400);
-  --color-text-brand: var(--color-indigo-300);
   --color-text-status-links: var(--color-text-brand);
 
   /* BORDER TOKENS */
 
-  --border-strength-primary: 18%;
+  --border-strength-primary: 30%;
 }

app/javascript/styles/mastodon/theme/_light.scss

@@ -7,7 +7,7 @@
   --color-text-secondary: var(--color-grey-600);
   --color-text-tertiary: var(--color-grey-500);
   --color-text-on-inverted: var(--color-white);
-  --color-text-brand: var(--color-indigo-600);
+  --color-text-brand: var(--color-indigo-700);
   --color-text-brand-soft: color-mix(
     in oklab,
     var(--color-text-primary),
@@ -15,7 +15,7 @@
   );
   --color-text-on-brand-base: var(--color-white);
   --color-text-brand-on-inverted: var(--color-indigo-400);
-  --color-text-error: var(--color-red-600);
+  --color-text-error: var(--color-red-800);
   --color-text-on-error-base: var(--color-white);
   --color-text-warning: var(--color-yellow-600);
   --color-text-on-warning-base: var(--color-white);
@@ -32,8 +32,8 @@
 
   // Neutrals
   --color-bg-primary: var(--color-white);
-  --overlay-strength-secondary: 5%;
-  --color-bg-secondary-base: var(--color-grey-600);
+  --overlay-strength-secondary: 4%;
+  --color-bg-secondary-base: #000550;
   --color-bg-secondary: #{color-mix(
       in oklab,
       var(--color-bg-primary),
@@ -52,7 +52,6 @@
 
   // Utility
   --color-bg-ambient: var(--color-bg-primary);
-  --color-bg-elevated: var(--color-bg-primary);
   --color-bg-inverted: var(--color-grey-950);
   --color-bg-media-base: var(--color-black);
   --color-bg-media-strength: 65%;
@@ -64,38 +63,32 @@
   --color-bg-disabled: var(--color-grey-400);
 
   // Brand
-  --overlay-strength-brand: 8%;
-  --color-bg-brand-base: var(--color-indigo-600);
+  --overlay-strength-brand: 6%;
+  --color-bg-brand-base: var(--color-indigo-700);
   --color-bg-brand-base-hover: color-mix(
     in oklab,
     var(--color-bg-brand-base),
     black var(--overlay-strength-brand)
   );
   --color-bg-brand-soft: #{utils.css-alpha(
-      var(--color-bg-brand-base),
-      calc(var(--overlay-strength-brand) * 1.5)
+      #0012d8,
+      calc(var(--overlay-strength-brand) * 2)
     )};
   --color-bg-brand-softer: #{utils.css-alpha(
-      var(--color-bg-brand-base),
+      #0012d8,
       var(--overlay-strength-brand)
     )};
 
   // Error
-  --overlay-strength-error: 12%;
-  --color-bg-error-base: var(--color-red-600);
+  --overlay-strength-error: 5%;
+  --color-bg-error-base: var(--color-red-800);
   --color-bg-error-base-hover: color-mix(
     in oklab,
     var(--color-bg-error-base),
     black var(--overlay-strength-error)
   );
-  --color-bg-error-soft: #{utils.css-alpha(
-      var(--color-bg-error-base),
-      calc(var(--overlay-strength-error) * 1.5)
-    )};
-  --color-bg-error-softer: #{utils.css-alpha(
-      var(--color-bg-error-base),
-      var(--overlay-strength-error)
-    )};
+  --color-bg-error-soft: var(--color-red-100);
+  --color-bg-error-softer: var(--color-red-50);
 
   // Warning
   --overlay-strength-warning: 10%;
@@ -105,14 +98,8 @@
     var(--color-bg-warning-base),
     black var(--overlay-strength-warning)
   );
-  --color-bg-warning-soft: #{utils.css-alpha(
-      var(--color-bg-warning-base),
-      calc(var(--overlay-strength-warning) * 1.5)
-    )};
-  --color-bg-warning-softer: #{utils.css-alpha(
-      var(--color-bg-warning-base),
-      var(--overlay-strength-warning)
-    )};
+  --color-bg-warning-soft: var(--color-yellow-100);
+  --color-bg-warning-softer: var(--color-yellow-50);
 
   // Success
   --overlay-strength-success: 15%;
@@ -122,14 +109,8 @@
     var(--color-bg-success-base),
     black var(--overlay-strength-success)
   );
-  --color-bg-success-soft: #{utils.css-alpha(
-      var(--color-bg-success-base),
-      calc(var(--overlay-strength-success) * 1.5)
-    )};
-  --color-bg-success-softer: #{utils.css-alpha(
-      var(--color-bg-success-base),
-      var(--overlay-strength-success)
-    )};
+  --color-bg-success-soft: var(--color-green-100);
+  --color-bg-success-softer: var(--color-green-50);
 
   /* BORDER TOKENS */