Merge commit '0ef43a431d353a17419ea6664ed745b5dbfbf2f9' into glitch-soc/merge-upstream

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

@@ -1,4 +1,4 @@
-import type { FC, ReactNode } from 'react';
+import type { FC, ReactElement, ReactNode } from 'react';
 
 import { useIntl } from 'react-intl';
 
@@ -19,7 +19,7 @@ import classes from './styles.module.css';
 export interface CalloutProps {
   variant?:
     | 'default'
-    // | 'subtle'
+    | 'subtle'
     | 'feature'
     | 'inverted'
     | 'success'
@@ -31,9 +31,9 @@ export interface CalloutProps {
   /** Set to false to hide the icon. */
   icon?: IconProp | boolean;
   onPrimary?: () => void;
-  primaryLabel?: string;
+  primaryLabel?: string | ReactElement;
   onSecondary?: () => void;
-  secondaryLabel?: string;
+  secondaryLabel?: string | ReactElement;
   onClose?: () => void;
   id?: string;
   extraContent?: ReactNode;
@@ -41,7 +41,7 @@ export interface CalloutProps {
 
 const variantClasses = {
   default: classes.variantDefault as string,
-  // subtle: classes.variantSubtle as string,
+  subtle: classes.variantSubtle as string,
   feature: classes.variantFeature as string,
   inverted: classes.variantInverted as string,
   success: classes.variantSuccess as string,

app/javascript/mastodon/components/callout/styles.module.css

@@ -32,6 +32,10 @@
 .body {
   flex-grow: 1;
 
+  a {
+    color: inherit;
+  }
+
   h3 {
     font-weight: 500;
     margin-bottom: 5px;
@@ -51,6 +55,7 @@
   color: inherit;
   font-weight: 500;
   padding: 0;
+  text-wrap: nowrap;
   text-decoration: underline;
   transition: color 0.1s ease-in-out;
 
@@ -80,14 +85,14 @@
   }
 }
 
-/* .variantSubtle {
+.variantSubtle {
   border: 1px solid var(--color-bg-brand-softer);
   background-color: var(--color-bg-primary);
 
   .icon {
     background-color: var(--color-bg-brand-softer);
   }
-} */
+}
 
 .variantFeature {
   background-color: var(--color-bg-brand-base);

app/javascript/mastodon/features/account_edit/components/tag_search.tsx

@@ -6,7 +6,7 @@ import { defineMessages, useIntl } from 'react-intl';
 import { Combobox } from '@/mastodon/components/form_fields';
 import { useSearchTags } from '@/mastodon/hooks/useSearchTags';
 import type { TagSearchResult } from '@/mastodon/hooks/useSearchTags';
-import { addFeaturedTag } from '@/mastodon/reducers/slices/profile_edit';
+import { addFeaturedTags } from '@/mastodon/reducers/slices/profile_edit';
 import { useAppDispatch } from '@/mastodon/store';
 import SearchIcon from '@/material-icons/400-24px/search.svg?react';
 
@@ -47,7 +47,7 @@ export const AccountEditTagSearch: FC = () => {
     (item: TagSearchResult) => {
       resetSearch();
       setQuery('');
-      void dispatch(addFeaturedTag({ name: item.name }));
+      void dispatch(addFeaturedTags({ names: [item.name] }));
     },
     [dispatch, resetSearch],
   );

app/javascript/mastodon/features/account_edit/featured_tags.tsx

@@ -9,7 +9,7 @@ import { useAccount } from '@/mastodon/hooks/useAccount';
 import { useCurrentAccountId } from '@/mastodon/hooks/useAccountId';
 import type { TagData } from '@/mastodon/reducers/slices/profile_edit';
 import {
-  addFeaturedTag,
+  addFeaturedTags,
   deleteFeaturedTag,
   fetchProfile,
   fetchSuggestedTags,
@@ -128,7 +128,7 @@ const SuggestedTag: FC<{ name: string; disabled?: boolean }> = ({
 }) => {
   const dispatch = useAppDispatch();
   const handleAddTag = useCallback(() => {
-    void dispatch(addFeaturedTag({ name }));
+    void dispatch(addFeaturedTags({ names: [name] }));
   }, [dispatch, name]);
   return <Tag name={name} onClick={handleAddTag} disabled={disabled} />;
 };

app/javascript/mastodon/features/account_timeline/v2/index.tsx

@@ -18,7 +18,10 @@ import { LoadingIndicator } from '@/mastodon/components/loading_indicator';
 import { RemoteHint } from '@/mastodon/components/remote_hint';
 import StatusList from '@/mastodon/components/status_list';
 import BundleColumnError from '@/mastodon/features/ui/components/bundle_column_error';
-import { useAccountId } from '@/mastodon/hooks/useAccountId';
+import {
+  useAccountId,
+  useCurrentAccountId,
+} from '@/mastodon/hooks/useAccountId';
 import { useAccountVisibility } from '@/mastodon/hooks/useAccountVisibility';
 import { selectTimelineByKey } from '@/mastodon/selectors/timelines';
 import { useAppDispatch, useAppSelector } from '@/mastodon/store';
@@ -34,6 +37,7 @@ import {
   usePinnedStatusIds,
 } from './pinned_statuses';
 import classes from './styles.module.scss';
+import { TagSuggestions } from './tags_suggestions';
 
 const emptyList = ImmutableList<string>();
 
@@ -135,6 +139,7 @@ const Prepend: FC<{
   accountId: string;
   forceEmpty: boolean;
 }> = ({ forceEmpty, accountId }) => {
+  const me = useCurrentAccountId();
   if (forceEmpty) {
     return <AccountHeader accountId={accountId} hideTabs />;
   }
@@ -144,6 +149,7 @@ const Prepend: FC<{
       <AccountHeader accountId={accountId} hideTabs />
       <AccountFilters />
       <FeaturedTags accountId={accountId} />
+      {me === accountId && <TagSuggestions />}
     </>
   );
 };

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

@@ -49,8 +49,12 @@
   }
 }
 
-.tagsWrapper {
+.tagsWrapper,
+.tagSuggestions {
   margin: 0 24px 8px;
+}
+
+.tagsWrapper {
   display: flex;
   flex-wrap: nowrap;
   justify-content: flex-start;

app/javascript/mastodon/features/account_timeline/v2/tags_suggestions.tsx

@@ -0,0 +1,128 @@
+import type { FC } from 'react';
+import { useEffect, useCallback, useState } from 'react';
+
+import { FormattedMessage, FormattedList } from 'react-intl';
+
+import { Link } from 'react-router-dom';
+
+import { fetchFeaturedTags } from '@/mastodon/actions/featured_tags';
+import { Callout } from '@/mastodon/components/callout';
+import { useCurrentAccountId } from '@/mastodon/hooks/useAccountId';
+import { useDismissible } from '@/mastodon/hooks/useDismissible';
+import {
+  fetchProfile,
+  fetchSuggestedTags,
+  addFeaturedTags,
+} from '@/mastodon/reducers/slices/profile_edit';
+import { useAppSelector, useAppDispatch } from '@/mastodon/store';
+
+import classes from './styles.module.scss';
+
+const MAX_SUGGESTED_TAGS = 3;
+
+export const TagSuggestions: FC = () => {
+  const { dismiss, wasDismissed } = useDismissible(
+    'profile/featured_tag_suggestions',
+  );
+
+  const suggestedTags = useAppSelector((state) =>
+    state.profileEdit.tagSuggestions?.slice(0, MAX_SUGGESTED_TAGS),
+  );
+  const existingTagCount = useAppSelector(
+    (state) => state.profileEdit.profile?.featuredTags.length,
+  );
+  const dispatch = useAppDispatch();
+
+  const isLoading = !suggestedTags || existingTagCount === undefined;
+
+  useEffect(() => {
+    if (isLoading) {
+      void dispatch(fetchProfile());
+      void dispatch(fetchSuggestedTags());
+    }
+  }, [dispatch, isLoading]);
+
+  const me = useCurrentAccountId();
+  const [showSuccessNotice, setSuccessNotice] = useState(false);
+
+  const handleAdd = useCallback(() => {
+    if (!suggestedTags?.length || !me) {
+      return;
+    }
+
+    const addTags = async () => {
+      await dispatch(
+        addFeaturedTags({ names: suggestedTags.map((tag) => tag.name) }),
+      );
+      await dispatch(fetchFeaturedTags({ accountId: me }));
+      setSuccessNotice(true);
+      dismiss();
+    };
+    void addTags();
+  }, [dismiss, dispatch, me, suggestedTags]);
+
+  const handleDismissSuccessNotice = useCallback(() => {
+    setSuccessNotice(false);
+  }, []);
+
+  if (showSuccessNotice) {
+    return (
+      <Callout
+        variant='subtle'
+        className={classes.tagSuggestions}
+        onClose={handleDismissSuccessNotice}
+      >
+        <FormattedMessage
+          id='featured_tags.suggestions.added'
+          defaultMessage='Manage your featured hashtags at any time under <link>Edit Profile > Featured hashtags</link>.'
+          values={{
+            link: (chunks) => <Link to='/profile/featured_tags'>{chunks}</Link>,
+          }}
+        />
+      </Callout>
+    );
+  }
+
+  if (
+    isLoading ||
+    !suggestedTags.length ||
+    existingTagCount > 0 ||
+    wasDismissed
+  ) {
+    return null;
+  }
+
+  return (
+    <Callout
+      id='featured_tags.suggestions'
+      variant='subtle'
+      className={classes.tagSuggestions}
+      onPrimary={handleAdd}
+      primaryLabel={
+        <FormattedMessage
+          id='featured_tags.suggestions.add'
+          defaultMessage='Add'
+        />
+      }
+      onSecondary={dismiss}
+      secondaryLabel={
+        <FormattedMessage
+          id='featured_tags.suggestions.dismiss'
+          defaultMessage='No thanks'
+        />
+      }
+    >
+      <FormattedMessage
+        id='featured_tags.suggestions'
+        defaultMessage='Lately you’ve posted about {items}. Add these as featured hashtags?'
+        values={{
+          items: (
+            <FormattedList
+              value={suggestedTags.map(({ name }) => `#${name}`)}
+            />
+          ),
+        }}
+      />
+    </Callout>
+  );
+};

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

@@ -1,9 +1,4 @@
 import { EMOJI_DB_NAME_SHORTCODES, EMOJI_TYPE_CUSTOM } from './constants';
-import {
-  importCustomEmojiData,
-  importEmojiData,
-  importLegacyShortcodes,
-} from './loader';
 
 addEventListener('message', handleMessage);
 self.postMessage('ready'); // After the worker is ready, notify the main thread
@@ -16,6 +11,8 @@ function handleMessage(event: MessageEvent<{ locale: string }>) {
 }
 
 async function loadData(locale: string) {
+  const { importCustomEmojiData, importEmojiData, importLegacyShortcodes } =
+    await import('./loader');
   let importCount: number | undefined;
   if (locale === EMOJI_TYPE_CUSTOM) {
     importCount = (await importCustomEmojiData())?.length;

app/javascript/mastodon/locales/be.json

@@ -349,6 +349,8 @@
   "collections.accounts.empty_description": "Дадайце да {count} уліковых запісаў, на якія Вы падпісаныя",
   "collections.accounts.empty_title": "Гэтая калекцыя пустая",
   "collections.collection_description": "Апісанне",
+  "collections.collection_language": "Мова",
+  "collections.collection_language_none": "Няма",
   "collections.collection_name": "Назва",
   "collections.collection_topic": "Тэма",
   "collections.confirm_account_removal": "Упэўненыя, што хочаце прыбраць гэты ўліковы запіс з гэтай калекцыі?",
@@ -626,6 +628,10 @@
   "featured_carousel.header": "{count, plural,one {Замацаваны допіс} other {Замацаваныя допісы}}",
   "featured_carousel.slide": "Допіс {current, number} з {max, number}",
   "featured_tags.more_items": "+{count}",
+  "featured_tags.suggestions": "Апошнім часам Вы рабілі допісы пра {items}. Дадаць гэта ў рэкамендаваныя хэштэгі?",
+  "featured_tags.suggestions.add": "Дадаць",
+  "featured_tags.suggestions.added": "Кіруйце сваімі рэкамендаванымі хэштэгамі ў любы час праз <link>Рэдагаваць профіль > Рэкамендаваныя хэштэгі</link>.",
+  "featured_tags.suggestions.dismiss": "Не, дзякуй",
   "filter_modal.added.context_mismatch_explanation": "Гэтая катэгорыя фільтра не прымяняецца да кантэксту, у якім Вы адкрылі гэты допіс. Калі Вы хочаце, каб паведамленне таксама было адфільтраванае ў гэтым кантэксце, Вам трэба будзе адрэдагаваць фільтр.",
   "filter_modal.added.context_mismatch_title": "Неадпаведны кантэкст!",
   "filter_modal.added.expired_explanation": "Тэрмін дзеяння гэтай катэгорыі фільтраў скончыўся, вам трэба будзе змяніць дату заканчэння тэрміну дзеяння, каб яна прымянялася",

app/javascript/mastodon/locales/da.json

@@ -349,6 +349,8 @@
   "collections.accounts.empty_description": "Tilføj op til {count} konti, du følger",
   "collections.accounts.empty_title": "Denne samling er tom",
   "collections.collection_description": "Beskrivelse",
+  "collections.collection_language": "Sprog",
+  "collections.collection_language_none": "Intet",
   "collections.collection_name": "Navn",
   "collections.collection_topic": "Emne",
   "collections.confirm_account_removal": "Er du sikker på, at du vil fjerne denne konto fra denne samling?",
@@ -626,6 +628,10 @@
   "featured_carousel.header": "{count, plural, one {fastgjort indlæg} other {fastgjorte indlæg}}",
   "featured_carousel.slide": "Indlæg {current, number} af {max, number}",
   "featured_tags.more_items": "+{count}",
+  "featured_tags.suggestions": "Du har for nylig lagt indlæg op om {items}. Skal disse tilføjes som fremhævede hashtags?",
+  "featured_tags.suggestions.add": "Tilføj",
+  "featured_tags.suggestions.added": "Du kan til enhver tid administrere dine fremhævede hashtags under <link>Rediger profil > Fremhævede hashtags</link>.",
+  "featured_tags.suggestions.dismiss": "Nej tak",
   "filter_modal.added.context_mismatch_explanation": "Denne filterkategori omfatter ikke konteksten, hvorunder dette indlæg er tilgået. Redigér filteret, hvis indlægget også ønskes filtreret i denne kontekst.",
   "filter_modal.added.context_mismatch_title": "Kontekstmisforhold!",
   "filter_modal.added.expired_explanation": "Denne filterkategori er udløbet. Ændr dens udløbsdato, for at anvende den.",

app/javascript/mastodon/locales/de.json

@@ -349,6 +349,8 @@
   "collections.accounts.empty_description": "Füge bis zu {count} Konten, denen du folgst, hinzu",
   "collections.accounts.empty_title": "Diese Sammlung ist leer",
   "collections.collection_description": "Beschreibung",
+  "collections.collection_language": "Sprache",
+  "collections.collection_language_none": "Nicht festgelegt",
   "collections.collection_name": "Titel",
   "collections.collection_topic": "Thema",
   "collections.confirm_account_removal": "Möchtest du dieses Konto wirklich aus der Sammlung entfernen?",
@@ -626,6 +628,10 @@
   "featured_carousel.header": "{count, plural, one {Angehefteter Beitrag} other {Angeheftete Beiträge}}",
   "featured_carousel.slide": "Beitrag {current, number} von {max, number}",
   "featured_tags.more_items": "+{count}",
+  "featured_tags.suggestions": "In deinen letzten Beiträgen hast du {items} verwendet. Möchtest du sie zu deinen vorgestellten Hashtags hinzufügen?",
+  "featured_tags.suggestions.add": "Hinzufügen",
+  "featured_tags.suggestions.added": "Du kannst deine vorgestellten Hashtags jederzeit in den Einstellungen <link>Profil bearbeiten > Vorgestellte Hashtags</link> anpassen.",
+  "featured_tags.suggestions.dismiss": "Nein danke",
   "filter_modal.added.context_mismatch_explanation": "Diese Filterkategorie gilt nicht für den Kontext, in welchem du auf diesen Beitrag zugegriffen hast. Wenn der Beitrag auch in diesem Kontext gefiltert werden soll, musst du den Filter bearbeiten.",
   "filter_modal.added.context_mismatch_title": "Kontext stimmt nicht überein!",
   "filter_modal.added.expired_explanation": "Diese Filterkategorie ist abgelaufen. Du musst das Ablaufdatum für diese Kategorie ändern.",

app/javascript/mastodon/locales/el.json

@@ -349,6 +349,8 @@
   "collections.accounts.empty_description": "Προσθέστε μέχρι και {count} λογαριασμούς που ακολουθείτε",
   "collections.accounts.empty_title": "Αυτή η συλλογή είναι κενή",
   "collections.collection_description": "Περιγραφή",
+  "collections.collection_language": "Γλώσσα",
+  "collections.collection_language_none": "Καμία",
   "collections.collection_name": "Όνομα",
   "collections.collection_topic": "Θέμα",
   "collections.confirm_account_removal": "Σίγουρα θέλετε να αφαιρέσετε αυτόν τον λογαριασμό από αυτή τη συλλογή;",
@@ -626,6 +628,10 @@
   "featured_carousel.header": "{count, plural, one {Καρφιτσωμένη Ανάρτηση} other {Καρφιτσωμένες Αναρτήσεις}}",
   "featured_carousel.slide": "Ανάρτηση {current, number} από {max, number}",
   "featured_tags.more_items": "+{count}",
+  "featured_tags.suggestions": "Τον τελευταίο καιρό έχετε δημοσιεύσει για {items}. Προσθέστε αυτά ως αναδεδειγμένες ετικέτες;",
+  "featured_tags.suggestions.add": "Προσθήκη",
+  "featured_tags.suggestions.added": "Διαχειριστείτε τις αναδεδειγμένες ετικέτες σας οποιαδήποτε στιγμή κάτω από το <link>Επεξεργασία προφίλ > Αναδεδειγμένες ετικέτες</link>.",
+  "featured_tags.suggestions.dismiss": "Όχι, ευχαριστώ",
   "filter_modal.added.context_mismatch_explanation": "Αυτή η κατηγορία φίλτρων δεν ισχύει για το περιεχόμενο εντός του οποίου προσπελάσατε αυτή την ανάρτηση. Αν θέλετε να φιλτραριστεί η ανάρτηση και εντός αυτού του πλαισίου, θα πρέπει να τροποποιήσετε το φίλτρο.",
   "filter_modal.added.context_mismatch_title": "Ασυμφωνία περιεχομένου!",
   "filter_modal.added.expired_explanation": "Αυτή η κατηγορία φίλτρων έχει λήξει, πρέπει να αλλάξετε την ημερομηνία λήξης για να ισχύσει.",

app/javascript/mastodon/locales/en.json

@@ -628,6 +628,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.",

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

@@ -349,6 +349,8 @@
   "collections.accounts.empty_description": "Agregá hasta {count} cuentas que seguís",
   "collections.accounts.empty_title": "Esta colección está vacía",
   "collections.collection_description": "Descripción",
+  "collections.collection_language": "Idioma",
+  "collections.collection_language_none": "Ninguno",
   "collections.collection_name": "Nombre",
   "collections.collection_topic": "Tema",
   "collections.confirm_account_removal": "¿De verdad querés eliminar esta cuenta de esta colección?",
@@ -626,6 +628,10 @@
   "featured_carousel.header": "{count, plural, one {Mensaje fijado} other {Mensajes fijados}}",
   "featured_carousel.slide": "Mensaje {current, number} de {max, number}",
   "featured_tags.more_items": "+{count}",
+  "featured_tags.suggestions": "Recientemente, publicaste sobre {items}. ¿Querés agregarlas como etiquetas destacadas?",
+  "featured_tags.suggestions.add": "Agregar",
+  "featured_tags.suggestions.added": "Administrá tus etiquetas destacadas cuando quieras en <link>Editar perfil > Etiquetas destacadas</link>.",
+  "featured_tags.suggestions.dismiss": "No, gracias",
   "filter_modal.added.context_mismatch_explanation": "Esta categoría de filtro no se aplica al contexto en el que accediste a este mensaje. Si querés que el mensaje sea filtrado también en este contexto, vas a tener que editar el filtro.",
   "filter_modal.added.context_mismatch_title": "¡El contexto no coincide!",
   "filter_modal.added.expired_explanation": "Esta categoría de filtro caducó; vas a necesitar cambiar la fecha de caducidad para que se aplique.",

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

@@ -349,6 +349,8 @@
   "collections.accounts.empty_description": "Añade hasta {count} cuentas que sigues",
   "collections.accounts.empty_title": "Esta colección está vacía",
   "collections.collection_description": "Descripción",
+  "collections.collection_language": "Idioma",
+  "collections.collection_language_none": "Ninguno",
   "collections.collection_name": "Nombre",
   "collections.collection_topic": "Tema",
   "collections.confirm_account_removal": "¿Estás seguro/a de que quieres eliminar esta cuenta de esta colección?",
@@ -466,7 +468,7 @@
   "confirmation_modal.cancel": "Cancelar",
   "confirmations.block.confirm": "Bloquear",
   "confirmations.delete.confirm": "Eliminar",
-  "confirmations.delete.message": "¿Estás seguro de que quieres borrar esta publicación?",
+  "confirmations.delete.message": "¿Estás seguro de que quieres eliminar esta publicación?",
   "confirmations.delete.title": "¿Deseas eliminar la publicación?",
   "confirmations.delete_collection.confirm": "Eliminar",
   "confirmations.delete_collection.message": "Esta acción no se puede deshacer.",
@@ -506,9 +508,9 @@
   "confirmations.quiet_post_quote_info.got_it": "Entendido",
   "confirmations.quiet_post_quote_info.message": "Al citar una publicación pública discreta, tu publicación se ocultará de las cronologías de tendencias.",
   "confirmations.quiet_post_quote_info.title": "Citar publicaciones públicas discretas",
-  "confirmations.redraft.confirm": "Borrar y volver a borrador",
-  "confirmations.redraft.message": "¿Estás seguro de que quieres borrar esta publicación y editarla? Los favoritos e impulsos se perderán, y las respuestas a la publicación original quedarán separadas.",
-  "confirmations.redraft.title": "¿Deseas borrar y volver a redactar la publicación?",
+  "confirmations.redraft.confirm": "Eliminar y volver a redactar",
+  "confirmations.redraft.message": "¿Estás seguro de que quieres eliminar esta publicación y volver a redactarla? Se perderán tanto los «Me gusta» como los impulsos, y las respuestas a la publicación original quedarán sin referencia.",
+  "confirmations.redraft.title": "¿Deseas eliminar y volver a redactar la publicación?",
   "confirmations.remove_from_followers.confirm": "Eliminar seguidor",
   "confirmations.remove_from_followers.message": "{name} dejará de seguirte. ¿Estás seguro de que quieres continuar?",
   "confirmations.remove_from_followers.title": "¿Eliminar seguidor?",
@@ -527,7 +529,7 @@
   "content_warning.hide": "Ocultar publicación",
   "content_warning.show": "Mostrar de todos modos",
   "content_warning.show_more": "Mostrar más",
-  "conversation.delete": "Borrar conversación",
+  "conversation.delete": "Eliminar conversación",
   "conversation.mark_as_read": "Marcar como leído",
   "conversation.open": "Ver conversación",
   "conversation.with": "Con {names}",
@@ -570,7 +572,7 @@
   "embed.instructions": "Añade esta publicación a tu sitio web con el siguiente código.",
   "embed.preview": "Así es como se verá:",
   "emoji_button.activity": "Actividad",
-  "emoji_button.clear": "Borrar",
+  "emoji_button.clear": "Eliminar",
   "emoji_button.custom": "Personalizado",
   "emoji_button.flags": "Marcas",
   "emoji_button.food": "Comida y bebida",
@@ -626,6 +628,10 @@
   "featured_carousel.header": "{count, plural,one {Publicación fijada}other {Publicaciones fijadas}}",
   "featured_carousel.slide": "Publicación {current, number} de {max, number}",
   "featured_tags.more_items": "+{count}",
+  "featured_tags.suggestions": "Últimamente has publicado sobre {items}. ¿Deseas añadirlo como etiqueta destacada?",
+  "featured_tags.suggestions.add": "Añadir",
+  "featured_tags.suggestions.added": "Controla tus etiquetas destacadas en cualquier momento en <link>Editar perfil > Etiquetas destacadas</link>.",
+  "featured_tags.suggestions.dismiss": "No, gracias",
   "filter_modal.added.context_mismatch_explanation": "Esta categoría de filtro no se aplica al contexto en el que has accedido a esta publicación. Si deseas que la publicación también se filtre en este contexto, tendrás que editar el filtro.",
   "filter_modal.added.context_mismatch_title": "¡El contexto no coincide!",
   "filter_modal.added.expired_explanation": "Esta categoría de filtro ha caducado; deberás cambiar la fecha de caducidad para que se aplique.",
@@ -798,7 +804,7 @@
   "lists.create": "Crear",
   "lists.create_a_list_to_organize": "Crea una nueva lista para organizar tu página de inicio",
   "lists.create_list": "Crear lista",
-  "lists.delete": "Borrar lista",
+  "lists.delete": "Eliminar lista",
   "lists.done": "Hecho",
   "lists.edit": "Editar lista",
   "lists.exclusive": "Ocultar miembros en Inicio",
@@ -928,7 +934,7 @@
   "notification_requests.title": "Notificaciones filtradas",
   "notification_requests.view": "Ver notificaciones",
   "notifications.clear": "Limpiar notificaciones",
-  "notifications.clear_confirmation": "¿Seguro de querer borrar permanentemente todas tus notificaciones?",
+  "notifications.clear_confirmation": "¿Estás seguro de que quieres eliminar definitivamente todas tus notificaciones?",
   "notifications.clear_title": "¿Limpiar notificaciones?",
   "notifications.column_settings.admin.report": "Nuevas denuncias:",
   "notifications.column_settings.admin.sign_up": "Registros nuevos:",
@@ -1162,7 +1168,7 @@
   "status.context.show": "Mostrar",
   "status.continued_thread": "Hilo continuado",
   "status.copy": "Copiar enlace al estado",
-  "status.delete": "Borrar",
+  "status.delete": "Eliminar",
   "status.delete.success": "Publicación eliminada",
   "status.detailed_status": "Vista de conversación detallada",
   "status.direct": "Mención privada @{name}",
@@ -1215,7 +1221,7 @@
   "status.reblogged_by": "Impulsado por {name}",
   "status.reblogs.empty": "Nadie impulsó esta publicación todavía. Cuando alguien lo haga, aparecerá aquí.",
   "status.reblogs_count": "{count, plural,one {{counter} impulso} other {{counter} impulsos}}",
-  "status.redraft": "Borrar y volver a borrador",
+  "status.redraft": "Eliminar y volver a redactar",
   "status.remove_bookmark": "Eliminar marcador",
   "status.remove_favourite": "Eliminar de favoritos",
   "status.remove_quote": "Eliminar",

app/javascript/mastodon/locales/es.json

@@ -626,6 +626,10 @@
   "featured_carousel.header": "{count, plural,one {Publicación fijada} other {Publicaciones fijadas}}",
   "featured_carousel.slide": "Publicación {current, number} de {max, number}",
   "featured_tags.more_items": "+{count}",
+  "featured_tags.suggestions": "Últimamente has publicado sobre {items}. ¿Quieres añadirlo como etiqueta destacada?",
+  "featured_tags.suggestions.add": "Añadir",
+  "featured_tags.suggestions.added": "Controla tus etiquetas destacadas cuando quieras en <link>Editar perfil > Etiquetas destacadas</link>.",
+  "featured_tags.suggestions.dismiss": "No, gracias",
   "filter_modal.added.context_mismatch_explanation": "Esta categoría de filtro no se aplica al contexto en el que ha accedido a esta publlicación. Si quieres que la publicación sea filtrada también en este contexto, tendrás que editar el filtro.",
   "filter_modal.added.context_mismatch_title": "¡El contexto no coincide!",
   "filter_modal.added.expired_explanation": "Esta categoría de filtro ha caducado, tendrás que cambiar la fecha de caducidad para que se aplique.",

app/javascript/mastodon/locales/fi.json

@@ -349,6 +349,8 @@
   "collections.accounts.empty_description": "Lisää enintään {count} seuraamaasi tiliä",
   "collections.accounts.empty_title": "Tämä kokoelma on tyhjä",
   "collections.collection_description": "Kuvaus",
+  "collections.collection_language": "Kieli",
+  "collections.collection_language_none": "Ei mikään",
   "collections.collection_name": "Nimi",
   "collections.collection_topic": "Aihe",
   "collections.confirm_account_removal": "Haluatko varmasti poistaa tämän tilin tästä kokoelmasta?",
@@ -626,6 +628,10 @@
   "featured_carousel.header": "{count, plural, one {Kiinnitetty julkaisu} other {Kiinnitetyt julkaisut}}",
   "featured_carousel.slide": "Julkaisu {current, number} / {max, number}",
   "featured_tags.more_items": "+{count}",
+  "featured_tags.suggestions": "Olet viime aikoina julkaissut aiheista {items}. Lisätäänkö nämä esiteltäviksi aihetunnisteiksi?",
+  "featured_tags.suggestions.add": "Lisää",
+  "featured_tags.suggestions.added": "Hallitse esiteltäviä aihetunnisteitasi milloin tahansa kohdasta <link>Muokkaa profiilia > Esiteltävät aihetunnisteet</link>.",
+  "featured_tags.suggestions.dismiss": "Ei kiitos",
   "filter_modal.added.context_mismatch_explanation": "Tämä suodatinluokka ei koske asiayhteyttä, jossa olet tarkastellut tätä julkaisua. Jos haluat julkaisun suodatettavan myös tässä asiayhteydessä, muokkaa suodatinta.",
   "filter_modal.added.context_mismatch_title": "Asiayhteys ei täsmää!",
   "filter_modal.added.expired_explanation": "Tämä suodatinluokka on vanhentunut, joten sinun on muutettava viimeistä voimassaolopäivää, jotta suodatusta käytettäisiin.",

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

@@ -349,6 +349,8 @@
   "collections.accounts.empty_description": "Ajouter jusqu'à {count} comptes que vous suivez",
   "collections.accounts.empty_title": "Cette collection est vide",
   "collections.collection_description": "Description",
+  "collections.collection_language": "Langue",
+  "collections.collection_language_none": "Aucune",
   "collections.collection_name": "Nom",
   "collections.collection_topic": "Sujet",
   "collections.confirm_account_removal": "Voulez-vous vraiment supprimer ce compte de la collection ?",
@@ -626,6 +628,10 @@
   "featured_carousel.header": "{count, plural, one {Pinned Post} other {Pinned Posts}}",
   "featured_carousel.slide": "Message {current, number} de {max, number}",
   "featured_tags.more_items": "+{count}",
+  "featured_tags.suggestions": "Récemment, vous avez posté à propos de {items}. Voulez-vous mettre ces hashtags en avant ?",
+  "featured_tags.suggestions.add": "Ajouter",
+  "featured_tags.suggestions.added": "Gérer vos hashtags mis en avant à tout moment depuis <link>Modifier le profil > Hashtags mis en avant</link>.",
+  "featured_tags.suggestions.dismiss": "Non merci",
   "filter_modal.added.context_mismatch_explanation": "Cette catégorie de filtre ne s'applique pas au contexte dans lequel vous avez accédé à cette publication. Si vous voulez que la publication soit filtrée dans ce contexte également, vous devrez modifier le filtre.",
   "filter_modal.added.context_mismatch_title": "Incompatibilité du contexte!",
   "filter_modal.added.expired_explanation": "Cette catégorie de filtre a expiré, vous devrez modifier la date d'expiration pour qu'elle soit appliquée.",

app/javascript/mastodon/locales/fr.json

@@ -349,6 +349,8 @@
   "collections.accounts.empty_description": "Ajouter jusqu'à {count} comptes que vous suivez",
   "collections.accounts.empty_title": "Cette collection est vide",
   "collections.collection_description": "Description",
+  "collections.collection_language": "Langue",
+  "collections.collection_language_none": "Aucune",
   "collections.collection_name": "Nom",
   "collections.collection_topic": "Sujet",
   "collections.confirm_account_removal": "Voulez-vous vraiment supprimer ce compte de la collection ?",
@@ -626,6 +628,10 @@
   "featured_carousel.header": "{count, plural, one {Pinned Post} other {Pinned Posts}}",
   "featured_carousel.slide": "Message {current, number} de {max, number}",
   "featured_tags.more_items": "+{count}",
+  "featured_tags.suggestions": "Récemment, vous avez posté à propos de {items}. Voulez-vous mettre ces hashtags en avant ?",
+  "featured_tags.suggestions.add": "Ajouter",
+  "featured_tags.suggestions.added": "Gérer vos hashtags mis en avant à tout moment depuis <link>Modifier le profil > Hashtags mis en avant</link>.",
+  "featured_tags.suggestions.dismiss": "Non merci",
   "filter_modal.added.context_mismatch_explanation": "Cette catégorie de filtre ne s'applique pas au contexte dans lequel vous avez accédé à ce message. Si vous voulez que le message soit filtré dans ce contexte également, vous devrez modifier le filtre.",
   "filter_modal.added.context_mismatch_title": "Incompatibilité du contexte !",
   "filter_modal.added.expired_explanation": "Cette catégorie de filtre a expiré, vous devrez modifier la date d'expiration pour qu'elle soit appliquée.",

app/javascript/mastodon/locales/ga.json

@@ -349,6 +349,8 @@
   "collections.accounts.empty_description": "Cuir suas le {count} cuntas leis a leanann tú",
   "collections.accounts.empty_title": "Tá an bailiúchán seo folamh",
   "collections.collection_description": "Cur síos",
+  "collections.collection_language": "Teanga",
+  "collections.collection_language_none": "Dada",
   "collections.collection_name": "Ainm",
   "collections.collection_topic": "Topaic",
   "collections.confirm_account_removal": "An bhfuil tú cinnte gur mian leat an cuntas seo a bhaint den bhailiúchán seo?",
@@ -626,6 +628,10 @@
   "featured_carousel.header": "{count, plural, one {Postáil phinnáilte} two {Poist Phionáilte} few {Poist Phionáilte} many {Poist Phionáilte} other {Poist Phionáilte}}",
   "featured_carousel.slide": "Post {current, number} of {max, number}",
   "featured_tags.more_items": "+{count}",
+  "featured_tags.suggestions": "Le déanaí, tá postáil déanta agat faoi {items}. An gcuirfeá iad seo leis mar hashtags le feiceáil?",
+  "featured_tags.suggestions.add": "Cuir leis",
+  "featured_tags.suggestions.added": "Bainistigh do hashtags le feiceáil ag am ar bith faoi <link>Cuir Próifíl in Eagar > Hashtags le feiceáil</link>.",
+  "featured_tags.suggestions.dismiss": "Ní raibh maith agat",
   "filter_modal.added.context_mismatch_explanation": "Ní bhaineann an chatagóir scagaire seo leis an gcomhthéacs ina bhfuair tú rochtain ar an bpostáil seo. Más mian leat an postáil a scagadh sa chomhthéacs seo freisin, beidh ort an scagaire a chur in eagar.",
   "filter_modal.added.context_mismatch_title": "Neamhréir comhthéacs!",
   "filter_modal.added.expired_explanation": "Tá an chatagóir scagaire seo imithe in éag, beidh ort an dáta éaga a athrú chun é a chur i bhfeidhm.",

app/javascript/mastodon/locales/gl.json

@@ -349,6 +349,8 @@
   "collections.accounts.empty_description": "Engade ata {count} contas que segues",
   "collections.accounts.empty_title": "A colección está baleira",
   "collections.collection_description": "Descrición",
+  "collections.collection_language": "Idioma",
+  "collections.collection_language_none": "Ningún",
   "collections.collection_name": "Nome",
   "collections.collection_topic": "Temática",
   "collections.confirm_account_removal": "Tes certeza de querer retirar esta conta desta colección?",
@@ -626,6 +628,10 @@
   "featured_carousel.header": "{count, plural, one {Publicación fixada} other {Publicacións fixadas}}",
   "featured_carousel.slide": "Publicación {current, number} de {max, number}",
   "featured_tags.more_items": "+{count}",
+  "featured_tags.suggestions": "Ultimamente publicaches sobre {items}. Engadimos isto como cancelos destacados?",
+  "featured_tags.suggestions.add": "Engadir",
+  "featured_tags.suggestions.added": "Xestiona os teus cancelos destacados cando queiras en <link>Editar perfil > Cancelos destacados</link>.",
+  "featured_tags.suggestions.dismiss": "Non, grazas",
   "filter_modal.added.context_mismatch_explanation": "Esta categoría de filtro non se aplica ao contexto no que accedeches a esta publicación. Se queres que a publicación se filtre nese contexto tamén, terás que editar o filtro.",
   "filter_modal.added.context_mismatch_title": "Non concorda o contexto!",
   "filter_modal.added.expired_explanation": "Esta categoría de filtro caducou, terás que cambiar a data de caducidade para que se aplique.",

app/javascript/mastodon/locales/he.json

@@ -349,6 +349,8 @@
   "collections.accounts.empty_description": "להוסיף עד ל־{count} חשבונות שאתם עוקבים אחריהם",
   "collections.accounts.empty_title": "האוסף הזה ריק",
   "collections.collection_description": "תיאור",
+  "collections.collection_language": "שפה",
+  "collections.collection_language_none": "לא מצוין",
   "collections.collection_name": "כינוי",
   "collections.collection_topic": "נושא",
   "collections.confirm_account_removal": "בוודאות להסיר חשבון זה מהאוסף?",
@@ -626,6 +628,10 @@
   "featured_carousel.header": "{count, plural, one {הודעה אחת נעוצה} two {הודעותיים נעוצות} many {הודעות נעוצות} other {הודעות נעוצות}}",
   "featured_carousel.slide": "הודעה {current, number} מתוך {max, number}",
   "featured_tags.more_items": "+{count}",
+  "featured_tags.suggestions": "לאחרונה פרסמת על {items}. להוסיף את הנושאים לתגיות הנבחרות?",
+  "featured_tags.suggestions.add": "הוספה",
+  "featured_tags.suggestions.added": "ניהול התגיות הנבחרות בכל עת תחת <link>עריכת פרופיל > תגיות נבחרות</link>.",
+  "featured_tags.suggestions.dismiss": "לא תודה",
   "filter_modal.added.context_mismatch_explanation": "קטגוריית הסנן הזאת לא חלה על ההקשר שממנו הגעת אל ההודעה הזו. אם תרצה/י שההודעה תסונן גם בהקשר זה, תצטרך/י לערוך את הסנן.",
   "filter_modal.added.context_mismatch_title": "אין התאמה להקשר!",
   "filter_modal.added.expired_explanation": "פג תוקפה של קטגוריית הסינון הזו, יש צורך לשנות את תאריך התפוגה כדי שהסינון יוחל.",

app/javascript/mastodon/locales/hu.json

@@ -348,6 +348,8 @@
   "collections.accounts.empty_description": "Adj hozzá legfeljebb {count} követett fiókot",
   "collections.accounts.empty_title": "Ez a gyűjtemény üres",
   "collections.collection_description": "Leírás",
+  "collections.collection_language": "Nyelv",
+  "collections.collection_language_none": "Egyik sem",
   "collections.collection_name": "Név",
   "collections.collection_topic": "Téma",
   "collections.confirm_account_removal": "Biztos, hogy eltávolítod ezt a fiókot ebből a gyűjteményből?",

app/javascript/mastodon/locales/is.json

@@ -349,6 +349,8 @@
   "collections.accounts.empty_description": "Bættu við allt að {count} aðgöngum sem þú fylgist með",
   "collections.accounts.empty_title": "Þetta safn er tómt",
   "collections.collection_description": "Lýsing",
+  "collections.collection_language": "Tungumál",
+  "collections.collection_language_none": "Ekkert",
   "collections.collection_name": "Nafn",
   "collections.collection_topic": "Umfjöllunarefni",
   "collections.confirm_account_removal": "Ertu viss um að þú viljir fjarlægja þennan aðgang úr þessu safni?",
@@ -626,6 +628,10 @@
   "featured_carousel.header": "{count, plural, one {Fest færsla} other {Festar færslur}}",
   "featured_carousel.slide": "Færsla {current, number} af {max, number}",
   "featured_tags.more_items": "+{count}",
+  "featured_tags.suggestions": "Að undanförnu hefurðu skrifað um {items}. Ætti að bæta þessu við sem myllumerkjum með aukið vægi?",
+  "featured_tags.suggestions.add": "Bæta við",
+  "featured_tags.suggestions.added": "Sýslaðu með þau myllumerki þín sem eru með með aukið vægi með því að fara í <link>Breyta notandasniði > Myllumerki með aukið vægi</link>.",
+  "featured_tags.suggestions.dismiss": "Nei takk",
   "filter_modal.added.context_mismatch_explanation": "Þessi síuflokkur á ekki við í því samhengi sem aðgangur þinn að þessari færslu felur í sér. Ef þú vilt að færslan sé einnig síuð í þessu samhengi, þá þarftu að breyta síunni.",
   "filter_modal.added.context_mismatch_title": "Misræmi í samhengi!",
   "filter_modal.added.expired_explanation": "Þessi síuflokkur er útrunninn, þú þarft að breyta gidistímanum svo hann geti átt við.",

app/javascript/mastodon/locales/it.json

@@ -349,6 +349,8 @@
   "collections.accounts.empty_description": "Aggiungi fino a {count} account che segui",
   "collections.accounts.empty_title": "Questa collezione è vuota",
   "collections.collection_description": "Descrizione",
+  "collections.collection_language": "Lingua",
+  "collections.collection_language_none": "Nessuna",
   "collections.collection_name": "Nome",
   "collections.collection_topic": "Argomento",
   "collections.confirm_account_removal": "Si è sicuri di voler rimuovere questo account da questa collezione?",
@@ -626,6 +628,10 @@
   "featured_carousel.header": "{count, plural, one {Post appuntato} other {Post appuntati}}",
   "featured_carousel.slide": "Post {current, number} di {max, number}",
   "featured_tags.more_items": "+{count}",
+  "featured_tags.suggestions": "Ultimamente hai pubblicato contenuti relativi a {items}. Vuoi aggiungerli come hashtag in evidenza?",
+  "featured_tags.suggestions.add": "Aggiungi",
+  "featured_tags.suggestions.added": "Gestisci i tuoi hashtag in evidenza in qualsiasi momento in <link>Modifica profilo > Hashtag in evidenza</link>.",
+  "featured_tags.suggestions.dismiss": "No, grazie",
   "filter_modal.added.context_mismatch_explanation": "La categoria di questo filtro non si applica al contesto in cui hai acceduto a questo post. Se desideri che il post sia filtrato anche in questo contesto, dovrai modificare il filtro.",
   "filter_modal.added.context_mismatch_title": "Contesto non corrispondente!",
   "filter_modal.added.expired_explanation": "La categoria di questo filtro è scaduta, dovrvai modificarne la data di scadenza per applicarlo.",

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

@@ -162,7 +162,7 @@
   "account_edit.featured_hashtags.item": "hashtag",
   "account_edit.featured_hashtags.placeholder": "幫tsān別lâng認捌，kap緊緊接近使用lí收藏ê主題。",
   "account_edit.featured_hashtags.title": "特色ê hashtag",
-  "account_edit.field_delete_modal.confirm": "Lí敢確定behthâi掉tsit ê自訂ê框á？Tsit ê動作bē當改倒轉。",
+  "account_edit.field_delete_modal.confirm": "Lí敢確定beh thâi掉tsit ê自訂ê框á？Tsit ê動作bē當改倒轉。",
   "account_edit.field_delete_modal.delete_button": "Thâi掉",
   "account_edit.field_delete_modal.title": "敢beh thâi掉自訂ê框á？",
   "account_edit.field_edit_modal.add_title": "加自訂ê框á",
@@ -183,6 +183,15 @@
   "account_edit.field_reorder_modal.drag_start": "有揀框á「{item}」。",
   "account_edit.field_reorder_modal.handle_label": "Giú框á「{item}」",
   "account_edit.field_reorder_modal.title": "重整理框á",
+  "account_edit.image_alt_modal.add_title": "加添說明文字",
+  "account_edit.image_alt_modal.details_content": "著愛：<ul> <li>照圖描述家kī</li> <li>用第三人稱（比如用「阿明」，毋是「我」）</li> <li>束結，幾个詞就夠ah</li> </ul> 毋通：<ul> <li>用「……ê相片」結束，這對讀螢幕程式是加講ê</li> </ul> 例：<ul> <li>「阿明穿青ê siá-tsuh，koh掛眼鏡」</li> </ul>",
+  "account_edit.image_alt_modal.details_title": "撇步：個人資料ê相片 ê 說明文字",
+  "account_edit.image_alt_modal.edit_title": "編說明文字",
+  "account_edit.image_alt_modal.text_hint": "ALT說明文字通幫tsān讀螢幕程式ê用者知影lí ê內容。",
+  "account_edit.image_alt_modal.text_label": "替代文字",
+  "account_edit.image_delete_modal.confirm": "Lí敢確定beh thâi掉tsit幅圖？Tsit ê動作bē當改倒轉。",
+  "account_edit.image_delete_modal.delete_button": "Thâi掉",
+  "account_edit.image_delete_modal.title": "Kám beh thâi掉影像？",
   "account_edit.image_edit.add_button": "加圖片",
   "account_edit.image_edit.alt_add_button": "加添說明文字",
   "account_edit.image_edit.alt_edit_button": "編說明文字",
@@ -202,6 +211,16 @@
   "account_edit.profile_tab.subtitle": "自訂lí ê個人資料ê分頁kap顯示ê內容。",
   "account_edit.profile_tab.title": "個人資料分頁設定",
   "account_edit.save": "儲存",
+  "account_edit.upload_modal.back": "轉去",
+  "account_edit.upload_modal.done": "做好ah",
+  "account_edit.upload_modal.next": "後一步",
+  "account_edit.upload_modal.step_crop.zoom": "伸kiu",
+  "account_edit.upload_modal.step_upload.button": "瀏覽檔案",
+  "account_edit.upload_modal.step_upload.dragging": "Giú kàu tsia傳上去",
+  "account_edit.upload_modal.step_upload.header": "揀圖片",
+  "account_edit.upload_modal.step_upload.hint": "WEBP、PNG、GIF á是 JPG 格式，上大 {limit}MB。{br}圖會伸kiu kàu {width}x{height} px。",
+  "account_edit.upload_modal.title_add": "加個人資料ê相",
+  "account_edit.upload_modal.title_replace": "替換個人資料ê相",
   "account_edit.verified_modal.details": "用驗證連kàu個人網站ê連結來加添lí ê Mastodon個人檔案ê通信ê程度。下kha是運作ê方法：",
   "account_edit.verified_modal.invisible_link.details": "加連結kàu lí ê網頁頭(header)。上重要ê部份是 rel=\"me\"，伊防止通過用者生成ê網站內容來做假包。Lí甚至佇網頁ê header毋免用 {tag}，反轉用link標簽，但是HTML定著佇無執行JavaScript ê時陣，就ē當接近使用。",
   "account_edit.verified_modal.invisible_link.summary": "Án-tsuánn khàm掉tsit ê連結？",
@@ -330,6 +349,8 @@
   "collections.accounts.empty_description": "加lí跟tuè ê口座，上tsē {count} ê",
   "collections.accounts.empty_title": "收藏內底無半項",
   "collections.collection_description": "說明",
+  "collections.collection_language": "語言",
+  "collections.collection_language_none": "無",
   "collections.collection_name": "名",
   "collections.collection_topic": "主題",
   "collections.confirm_account_removal": "Lí確定beh對收藏suá掉tsit ê口座？",
@@ -488,7 +509,7 @@
   "confirmations.quiet_post_quote_info.message": "Nā是引用無tī公共時間線內底êPO文，lí êPO文bē當tī趨勢ê時間線顯示。",
   "confirmations.quiet_post_quote_info.title": "引用無tī公開ê時間線內底顯示ê PO文",
   "confirmations.redraft.confirm": "Thâi掉了後重寫",
-  "confirmations.redraft.message": "Lí kám確定behthâi掉tsit篇PO文了後koh重寫？收藏kap轉PO ē無去，而且原底ê PO文ê回應ē變孤立。",
+  "confirmations.redraft.message": "Lí kám確定beh thâi掉tsit篇PO文了後koh重寫？收藏kap轉PO ē無去，而且原底ê PO文ê回應ē變孤立。",
   "confirmations.redraft.title": "Kám beh thâi掉koh重寫PO文？",
   "confirmations.remove_from_followers.confirm": "Suá掉跟tuè lí ê",
   "confirmations.remove_from_followers.message": "{name} ē停止跟tuè lí。Lí kám確定beh繼續？",

app/javascript/mastodon/locales/nl.json

@@ -153,7 +153,7 @@
   "account_edit.custom_fields.name": "veld",
   "account_edit.custom_fields.placeholder": "Voeg je voornaamwoorden, externe links of iets anders toe dat je wilt delen.",
   "account_edit.custom_fields.reorder_button": "Velden opnieuw ordenen",
-  "account_edit.custom_fields.tip_content": "Je kunt gemakkelijk geloofwaardigheid toevoegen aan je Mastodon account door links te controleren naar websites die je bezit.",
+  "account_edit.custom_fields.tip_content": "Je kunt gemakkelijk je Mastodon-account geloofwaardig maken door links naar websites die van jou zijn te laten verifiëren.",
   "account_edit.custom_fields.tip_title": "Tip: Geverifieerde links toevoegen",
   "account_edit.custom_fields.title": "Extra velden",
   "account_edit.custom_fields.verified_hint": "Hoe voeg ik een geverifieerde link toe?",
@@ -179,15 +179,15 @@
   "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_move": "Veld \"{item}\" is verplaatst.",
-  "account_edit.field_reorder_modal.drag_over": "Veld \"{item}\" is over \"{over} \" verplaatst.",
+  "account_edit.field_reorder_modal.drag_over": "Veld \"{item}\" is over \"{over}\" geplaatst.",
   "account_edit.field_reorder_modal.drag_start": "Opgepakt veld \"{item}\".",
   "account_edit.field_reorder_modal.handle_label": "Veld \"{item}\" slepen",
   "account_edit.field_reorder_modal.title": "Velden herschikken",
   "account_edit.image_alt_modal.add_title": "Alt-tekst toevoegen",
-  "account_edit.image_alt_modal.details_content": "DOEN: <ul> <li>Beschrijf jezelf zoals afgebeeld</li> <li>Gebruik taal van een derde persoon (bijv. “Alex” in plaats van “ik”)</li> <li>Wees beknopt - een paar woorden is vaak genoeg</li> </ul> NIET DOEN: <ul> <li>Begin met “Foto van” - dit is overbodig voor schermlezers</li> </ul> VOORBEELD: <ul> <li>“Alex draagt een groen shirt en een bril”</li> </ul>",
+  "account_edit.image_alt_modal.details_content": "DOEN: <ul> <li>Beschrijf jezelf zoals afgebeeld</li> <li>Schrijf in de derde persoon (bijv. “Alex” in plaats van “ik”)</li> <li>Wees beknopt - een paar woorden is vaak genoeg</li> </ul> NIET DOEN: <ul> <li>Begin met “Foto van” - dit is overbodig voor schermlezers</li> </ul> VOORBEELD: <ul> <li>“Alex draagt een groen shirt en een bril”</li> </ul>",
   "account_edit.image_alt_modal.details_title": "Tips: Alt-tekst voor profielfoto's",
   "account_edit.image_alt_modal.edit_title": "Alt-tekst bewerken",
-  "account_edit.image_alt_modal.text_hint": "Alt-text helpt gebruikers van schermlezer jouw inhoud te begrijpen.",
+  "account_edit.image_alt_modal.text_hint": "Alt-text helpt gebruikers van schermlezers jouw inhoud te begrijpen.",
   "account_edit.image_alt_modal.text_label": "Alt-tekst",
   "account_edit.image_delete_modal.confirm": "Weet je zeker dat je deze afbeelding wilt verwijderen? Deze actie kan niet ongedaan worden gemaakt.",
   "account_edit.image_delete_modal.delete_button": "Verwijderen",
@@ -221,10 +221,10 @@
   "account_edit.upload_modal.step_upload.hint": "WEBP-, PNG-, GIF- of JPG-formaat, tot max. {limit}MB.{br}Afbeelding wordt geschaald naar {width}x{height}px.",
   "account_edit.upload_modal.title_add": "Profielfoto toevoegen",
   "account_edit.upload_modal.title_replace": "Profielfoto vervangen",
-  "account_edit.verified_modal.details": "Voeg geloofwaardigheid toe aan je Mastodonprofiel door links naar persoonlijke websites te verifiëren. Zo werkt het:",
-  "account_edit.verified_modal.invisible_link.details": "Voeg de link toe aan uw header. Het belangrijke onderdeel is rel=\"me\" om te voorkomen dat websites impersoneren met door de gebruiker gegenereerde inhoud. Je kunt zelfs een linktag gebruiken in de kop van de pagina in plaats van {tag}, maar de HTML moet toegankelijk zijn zonder JavaScript uit te voeren.",
+  "account_edit.verified_modal.details": "Maak je Mastodonprofiel geloofwaardig door links naar persoonlijke websites te verifiëren. Zo werkt het:",
+  "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 in de koptekst van je website",
+  "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.header": "Voeg je website toe als een aangepast veld",
   "account_edit.verified_modal.title": "Hoe voeg je een geverifieerde link toe",
@@ -349,6 +349,8 @@
   "collections.accounts.empty_description": "Tot {count} accounts die je volgt toevoegen",
   "collections.accounts.empty_title": "Deze verzameling is leeg",
   "collections.collection_description": "Omschrijving",
+  "collections.collection_language": "Taal",
+  "collections.collection_language_none": "Geen",
   "collections.collection_name": "Naam",
   "collections.collection_topic": "Onderwerp",
   "collections.confirm_account_removal": "Weet je zeker dat je dit account uit deze verzameling wilt verwijderen?",

app/javascript/mastodon/locales/sq.json

@@ -344,6 +344,8 @@
   "collections.account_count": "{count, plural, one {# llogari} other {# llogari}}",
   "collections.accounts.empty_title": "Ky koleksion është i zbrazët",
   "collections.collection_description": "Përshkrim",
+  "collections.collection_language": "Gjuhë",
+  "collections.collection_language_none": "Asnjë",
   "collections.collection_name": "Emër",
   "collections.collection_topic": "Temë",
   "collections.confirm_account_removal": "Jeni i sigurt se doni të hiqet kjo llogari nga ky koleksion?",

app/javascript/mastodon/locales/sv.json

@@ -277,6 +277,8 @@
   "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",
   "collections.accounts.empty_description": "Lägg till upp till {count} konton som du följer",
+  "collections.collection_language": "Språk",
+  "collections.collection_language_none": "Inga",
   "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",
@@ -501,6 +503,10 @@
   "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.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>.",
+  "featured_tags.suggestions.dismiss": "Nej tack",
   "filter_modal.added.context_mismatch_explanation": "Denna filterkategori gäller inte för det sammanhang där du har tillgång till det här inlägget. Om du vill att inlägget ska filtreras även i detta sammanhang måste du redigera filtret.",
   "filter_modal.added.context_mismatch_title": "Misspassning av sammanhang!",
   "filter_modal.added.expired_explanation": "Denna filterkategori har utgått, du måste ändra utgångsdatum för att den ska kunna tillämpas.",

app/javascript/mastodon/locales/tr.json

@@ -349,6 +349,8 @@
   "collections.accounts.empty_description": "Takip ettiğiniz hesapların sayısını {count} kadar artırın",
   "collections.accounts.empty_title": "Bu koleksiyon boş",
   "collections.collection_description": "Açıklama",
+  "collections.collection_language": "Dil",
+  "collections.collection_language_none": "Hiçbiri",
   "collections.collection_name": "Ad",
   "collections.collection_topic": "Konu",
   "collections.confirm_account_removal": "Bu hesabı bu koleksiyondan çıkarmak istediğinizden emin misiniz?",
@@ -626,6 +628,10 @@
   "featured_carousel.header": "{count, plural, one {{counter} Sabitlenmiş Gönderi} other {{counter} Sabitlenmiş Gönderi}}",
   "featured_carousel.slide": "Gönderi {current, number} / {max, number}",
   "featured_tags.more_items": "+{count}",
+  "featured_tags.suggestions": "Son zamanlarda {items} hakkında gönderileriniz var. Bunlar öne çıkan etiketler olarak eklensin mi?",
+  "featured_tags.suggestions.add": "Ekle",
+  "featured_tags.suggestions.added": "Öne çıkan etiketlerinizi istediğiniz zaman <link>Profil Düzenle > Öne çıkan etiketler</link> bölümünden yönetebilirsiniz.",
+  "featured_tags.suggestions.dismiss": "Hayır teşekkürler",
   "filter_modal.added.context_mismatch_explanation": "Bu süzgeç kategorisi, bu gönderide eriştiğin bağlama uymuyor. Eğer gönderinin bu bağlamda da filtrelenmesini istiyorsanız, süzgeci düzenlemeniz gerekiyor.",
   "filter_modal.added.context_mismatch_title": "Bağlam uyumsuzluğu!",
   "filter_modal.added.expired_explanation": "Bu süzgeç kategorisinin süresi dolmuş, süzgeci uygulamak için bitiş tarihini değiştirmeniz gerekiyor.",

app/javascript/mastodon/locales/vi.json

@@ -349,6 +349,8 @@
   "collections.accounts.empty_description": "Thêm tối đa {count} tài khoản mà bạn theo dõi",
   "collections.accounts.empty_title": "Gói khởi đầu này trống",
   "collections.collection_description": "Mô tả",
+  "collections.collection_language": "Ngôn ngữ",
+  "collections.collection_language_none": "Không",
   "collections.collection_name": "Tên",
   "collections.collection_topic": "Chủ đề",
   "collections.confirm_account_removal": "Bạn có chắc muốn gỡ tài khoản này khỏi gói khởi đầu?",
@@ -626,6 +628,10 @@
   "featured_carousel.header": "{count, plural, other {Tút đã ghim}}",
   "featured_carousel.slide": "Tút {current, number} trong {max, number}",
   "featured_tags.more_items": "+{count}",
+  "featured_tags.suggestions": "Gần đây bạn đã đăng về {items}. Thêm cái này vào hashtag thường dùng?",
+  "featured_tags.suggestions.add": "Thêm",
+  "featured_tags.suggestions.added": "Quản lý hashtag bạn thường dùng vào bất cứ lúc nào tại <link>Sửa hồ sơ > Hashtag thường dùng</link>.",
+  "featured_tags.suggestions.dismiss": "Không, cảm ơn",
   "filter_modal.added.context_mismatch_explanation": "Danh mục bộ lọc này không áp dụng cho ngữ cảnh mà bạn đã truy cập tút này. Nếu bạn muốn tút cũng được lọc trong ngữ cảnh này, bạn sẽ phải chỉnh sửa bộ lọc.",
   "filter_modal.added.context_mismatch_title": "Bối cảnh không phù hợp!",
   "filter_modal.added.expired_explanation": "Danh mục bộ lọc này đã hết hạn, bạn sẽ cần thay đổi ngày hết hạn để áp dụng.",

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

@@ -349,6 +349,8 @@
   "collections.accounts.empty_description": "添加你关注的账号，最多 {count} 个",
   "collections.accounts.empty_title": "收藏列表为空",
   "collections.collection_description": "说明",
+  "collections.collection_language": "语言",
+  "collections.collection_language_none": "无",
   "collections.collection_name": "名称",
   "collections.collection_topic": "话题",
   "collections.confirm_account_removal": "你确定要将从收藏列表中移除此账号吗？",
@@ -626,6 +628,10 @@
   "featured_carousel.header": "{count, plural, other {# 条置顶嘟文}}",
   "featured_carousel.slide": "第 {current, number} 条嘟文，共 {max, number} 条",
   "featured_tags.more_items": "+{count}",
+  "featured_tags.suggestions": "你最近发布了有关{items}的内容。要将这些添加为精选的话题标签吗？",
+  "featured_tags.suggestions.add": "添加",
+  "featured_tags.suggestions.added": "你可以在<link>修改个人资料 > 精选的话题标签</link>下随时管理你精选的话题标签。",
+  "featured_tags.suggestions.dismiss": "不了，谢谢",
   "filter_modal.added.context_mismatch_explanation": "这条过滤规则不适用于你当前访问此嘟文的场景。要在此场景下过滤嘟文，你必须编辑此过滤规则。",
   "filter_modal.added.context_mismatch_title": "场景不匹配！",
   "filter_modal.added.expired_explanation": "此过滤规则类别已过期，你需要修改到期日期才能应用。",

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

@@ -349,6 +349,8 @@
   "collections.accounts.empty_description": "加入最多 {count} 個您跟隨之帳號",
   "collections.accounts.empty_title": "此收藏名單是空的",
   "collections.collection_description": "說明",
+  "collections.collection_language": "語言",
+  "collections.collection_language_none": "無",
   "collections.collection_name": "名稱",
   "collections.collection_topic": "主題",
   "collections.confirm_account_removal": "您是否確定要自此收藏名單中移除此帳號？",
@@ -626,6 +628,10 @@
   "featured_carousel.header": "{count, plural, other {# 則釘選嘟文}}",
   "featured_carousel.slide": "{max, number} 則嘟文中之第 {current, number} 則",
   "featured_tags.more_items": "+{count}",
+  "featured_tags.suggestions": "最近您曾發有關 {items} 之嘟文。是否新增其為推薦主題標籤？",
+  "featured_tags.suggestions.add": "新增",
+  "featured_tags.suggestions.added": "於 <link>編輯個人檔案 > 推薦主題標籤</link> 隨時管理您的推薦主題標籤。",
+  "featured_tags.suggestions.dismiss": "不需要，謝謝",
   "filter_modal.added.context_mismatch_explanation": "此過濾器類別不是用您所存取嘟文的情境。若您想要此嘟文被於此情境被過濾，您必須編輯過濾器。",
   "filter_modal.added.context_mismatch_title": "不符合情境！",
   "filter_modal.added.expired_explanation": "此過濾器類別已失效，您需要更新過期日期以套用。",

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

@@ -104,24 +104,24 @@ const profileEditSlice = createSlice({
       state.isPending = false;
     });
 
-    builder.addCase(addFeaturedTag.pending, (state) => {
+    builder.addCase(addFeaturedTags.pending, (state) => {
       state.isPending = true;
     });
-    builder.addCase(addFeaturedTag.rejected, (state) => {
+    builder.addCase(addFeaturedTags.rejected, (state) => {
       state.isPending = false;
     });
-    builder.addCase(addFeaturedTag.fulfilled, (state, action) => {
+    builder.addCase(addFeaturedTags.fulfilled, (state, action) => {
       if (!state.profile) {
         return;
       }
 
       state.profile.featuredTags = [
         ...state.profile.featuredTags,
-        transformTag(action.payload),
+        ...action.payload.map(transformTag),
       ].toSorted((a, b) => a.name.localeCompare(b.name));
       if (state.tagSuggestions) {
         state.tagSuggestions = state.tagSuggestions.filter(
-          (tag) => tag.name !== action.meta.arg.name,
+          (tag) => !action.meta.arg.names.includes(tag.name),
         );
       }
       state.isPending = false;
@@ -350,20 +350,11 @@ export const fetchSuggestedTags = createDataLoadingThunk(
   { useLoadingBar: false },
 );
 
-export const addFeaturedTag = createDataLoadingThunk(
+export const addFeaturedTags = createDataLoadingThunk(
   `${profileEditSlice.name}/addFeaturedTag`,
-  ({ name }: { name: string }) => apiPostFeaturedTag(name),
-  {
-    condition(arg, { getState }) {
-      const state = getState();
-      return (
-        !!state.profileEdit.profile &&
-        !state.profileEdit.profile.featuredTags.some(
-          (tag) => tag.name === arg.name,
-        )
-      );
-    },
-  },
+  ({ names }: { names: string[] }) =>
+    Promise.all(names.map((n) => apiPostFeaturedTag(n))),
+  { useLoadingBar: false },
 );
 
 export const deleteFeaturedTag = createDataLoadingThunk(

app/javascript/testing/api.ts

@@ -51,13 +51,17 @@ export const mockHandlers = {
     '/packs-dev/emoji/:locale.json',
     async ({ params }) => {
       const locale = toSupportedLocale(params.locale);
+      const key = `../../../../../node_modules/emojibase-data/${locale}/compact.json`;
+      const emojiModules = import.meta.glob<CompactEmoji[]>(
+        '../../../../../node_modules/emojibase-data/**/compact.json',
+        { import: 'default' },
+      );
+      const path = emojiModules[key];
+      if (!path) {
+        throw new Error(`Unsupported locale: ${locale}`);
+      }
       action('fetching emoji data')(locale);
-      const { default: data } = (await import(
-        /* @vite-ignore */
-        `emojibase-data/${locale}/compact.json`
-      )) as {
-        default: CompactEmoji[];
-      };
+      const data = await path();
 
       return HttpResponse.json([data]);
     },