Merge commit '2dd630bc581dfd73950b45f6c3b1f47619b7ea6c' into glitch-soc/merge-upstream

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

@@ -1,6 +1,8 @@
 import classNames from 'classnames';
 import { Link } from 'react-router-dom';
 
+import { polymorphicForwardRef } from '@/types/polymorphic';
+
 import classes from './styles.module.scss';
 
 interface WrapperProps extends Omit<
@@ -8,7 +10,7 @@ interface WrapperProps extends Omit<
   'title'
 > {
   icon?: React.ReactNode;
-  iconEnd?: React.ReactNode;
+  sideContent?: React.ReactNode;
 }
 
 /**
@@ -20,7 +22,7 @@ interface WrapperProps extends Omit<
  */
 export const ListItemWrapper: React.FC<WrapperProps> = ({
   icon,
-  iconEnd,
+  sideContent,
   children,
   className,
   ...otherProps
@@ -29,69 +31,68 @@ export const ListItemWrapper: React.FC<WrapperProps> = ({
     <div {...otherProps} className={classNames(classes.wrapper, className)}>
       {icon}
       <div>{children}</div>
-      {iconEnd && <span className={classes.iconEnd}>{iconEnd}</span>}
+      {sideContent && (
+        <span className={classes.sideContent}>{sideContent}</span>
+      )}
     </div>
   );
 };
 
-interface WithSubtitle {
+interface ContentProps {
   subtitle?: React.ReactNode;
+  subtitleId?: string;
 }
 
-interface ContentProps
-  extends React.ComponentPropsWithoutRef<'h3'>, WithSubtitle {}
-
-export const ListItemContent: React.FC<ContentProps> = ({
-  subtitle,
-  children,
-  ...otherProps
-}) => {
-  return (
-    <>
-      <h3 className={classes.title} {...otherProps}>
-        {children}
-      </h3>
-      {subtitle && <div className={classes.subtitle}>{subtitle}</div>}
-    </>
-  );
-};
+export const ListItemContent = polymorphicForwardRef<'h3', ContentProps>(
+  (
+    { as: Component = 'h3', subtitle, subtitleId, children, ...otherProps },
+    ref,
+  ) => {
+    return (
+      <>
+        <Component className={classes.title} ref={ref} {...otherProps}>
+          {children}
+        </Component>
+        {subtitle && (
+          <div className={classes.subtitle} id={subtitleId}>
+            {subtitle}
+          </div>
+        )}
+      </>
+    );
+  },
+);
 
 interface LinkProps
-  extends React.ComponentPropsWithoutRef<typeof Link>, WithSubtitle {}
+  extends React.ComponentPropsWithoutRef<typeof Link>, ContentProps {}
 
-export const ListItemLink: React.FC<LinkProps> = ({
-  subtitle,
-  children,
-  className,
-  ...otherProps
-}) => {
-  return (
-    <ListItemContent subtitle={subtitle}>
-      <Link className={classNames(className, 'focusable')} {...otherProps}>
-        {children}
-      </Link>
-    </ListItemContent>
-  );
-};
+export const ListItemLink = polymorphicForwardRef<'h3', LinkProps>(
+  ({ as, subtitle, children, className, ...otherProps }, ref) => {
+    return (
+      <ListItemContent ref={ref} as={as} subtitle={subtitle}>
+        <Link className={classNames(className, 'focusable')} {...otherProps}>
+          {children}
+        </Link>
+      </ListItemContent>
+    );
+  },
+);
 
 interface ButtonProps
-  extends React.ComponentPropsWithoutRef<'button'>, WithSubtitle {}
+  extends React.ComponentPropsWithoutRef<'button'>, ContentProps {}
 
-export const ListItemButton: React.FC<ButtonProps> = ({
-  subtitle,
-  children,
-  className,
-  ...otherProps
-}) => {
-  return (
-    <ListItemContent subtitle={subtitle}>
-      <button
-        type='button'
-        className={classNames(className, 'focusable')}
-        {...otherProps}
-      >
-        {children}
-      </button>
-    </ListItemContent>
-  );
-};
+export const ListItemButton = polymorphicForwardRef<'h3', ButtonProps>(
+  ({ as, subtitle, children, className, ...otherProps }, ref) => {
+    return (
+      <ListItemContent as={as} ref={ref} subtitle={subtitle}>
+        <button
+          type='button'
+          className={classNames(className, 'focusable')}
+          {...otherProps}
+        >
+          {children}
+        </button>
+      </ListItemContent>
+    );
+  },
+);

app/javascript/mastodon/components/list_item/list_item.stories.tsx

@@ -5,6 +5,8 @@ import KeyboardArrowDownIcon from '@/material-icons/400-24px/keyboard_arrow_down
 import VisibilityIcon from '@/material-icons/400-24px/visibility.svg?react';
 import VisibilityOffIcon from '@/material-icons/400-24px/visibility_off.svg?react';
 
+import { AvatarById } from '../avatar';
+import { Button } from '../button';
 import { Icon } from '../icon';
 
 import {
@@ -36,7 +38,7 @@ export const WithButton: Story = {
   render: () => (
     <ListItemWrapper
       icon={<Icon icon={VisibilityOffIcon} id='visibility' />}
-      iconEnd={<Icon icon={KeyboardArrowDownIcon} id='down' />}
+      sideContent={<Icon icon={KeyboardArrowDownIcon} id='down' />}
     >
       <ListItemButton subtitle='You’ve blocked or muted these users'>
         3 hidden accounts
@@ -49,9 +51,22 @@ export const WithLink: Story = {
   render: () => (
     <ListItemWrapper
       icon={<Icon icon={VisibilityIcon} id='visibility' />}
-      iconEnd={<Icon icon={ChevronRightIcon} id='right' />}
+      sideContent={<Icon icon={ChevronRightIcon} id='right' />}
     >
       <ListItemLink to='/'>View more</ListItemLink>
     </ListItemWrapper>
   ),
 };
+
+export const WithInteractiveSideContent: Story = {
+  render: () => (
+    <ListItemWrapper
+      icon={<AvatarById accountId='1' size={40} />}
+      sideContent={<Button compact>Follow</Button>}
+    >
+      <ListItemLink to='/' subtitle='@test@example.com'>
+        Test account
+      </ListItemLink>
+    </ListItemWrapper>
+  ),
+};

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

@@ -1,11 +1,15 @@
 .wrapper {
+  --list-item-padding: 16px;
+  --list-item-padding-block: var(--list-item-padding);
+  --list-item-gap: 12px;
+
   box-sizing: border-box;
   position: relative;
   display: flex;
   align-items: center;
   width: 100%;
-  gap: 12px;
-  padding: 16px;
+  gap: var(--list-item-gap);
+  padding: var(--list-item-padding-block) var(--list-item-padding);
   font-size: 15px;
   color: var(--color-text-primary);
 }
@@ -29,7 +33,7 @@
     &::before {
       content: '';
       position: absolute;
-      inset: 0;
+      inset: var(--clickable-area-spread, 0);
     }
   }
 }
@@ -39,6 +43,32 @@
   color: var(--color-text-secondary);
 }
 
-.iconEnd {
+.sideContent {
+  display: flex;
+  gap: var(--list-item-gap);
+  align-self: stretch;
+  align-items: center;
   margin-inline-start: auto;
+
+  &:has(button, a) {
+    // If the sideContent has interactive children, move it
+    // above the clickable area of the .title content
+    position: relative;
+    z-index: 1;
+
+    // Cover up the .title content's clickable area in the
+    // padding box around the sideContent
+    &::before {
+      content: '';
+      position: absolute;
+      inset-block: calc(-1 * var(--list-item-padding-block));
+      inset-inline: calc(-1 * var(--list-item-padding));
+      z-index: -1;
+    }
+  }
+
+  // Improve vertical alignment of slotted icons
+  & > .icon {
+    vertical-align: middle;
+  }
 }

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

@@ -1,4 +1,4 @@
-import { useCallback, useState } from 'react';
+import { useCallback, useId, useState } from 'react';
 
 import { Article } from '@/mastodon/components/scrollable_list/components';
 import KeyboardArrowDownIcon from '@/material-icons/400-24px/keyboard_arrow_down.svg?react';
@@ -42,6 +42,8 @@ export const TruncatedListItems = <TListItem,>({
   toggleButton,
   renderListItem,
 }: TruncatedListProps<TListItem>) => {
+  const toggleButtonId = useId();
+  const toggleButtonDescId = `${toggleButtonId}-desc`;
   const [showTruncatedItems, setShowTruncatedItems] = useState(false);
   const toggleTruncatedItems = useCallback(() => {
     setShowTruncatedItems((prev) => !prev);
@@ -65,14 +67,19 @@ export const TruncatedListItems = <TListItem,>({
         });
       })}
       {hasHiddenAccounts && (
-        <Article aria-posinset={initialListSize} aria-setsize={totalListLength}>
+        <Article
+          aria-posinset={initialListSize}
+          aria-setsize={totalListLength}
+          aria-labelledby={toggleButtonId}
+          aria-describedby={toggleButtonDescId}
+        >
           <ListItemWrapper
             icon={
               toggleButton.icon && (
                 <Icon id='toggle-icon' icon={toggleButton.icon} />
               )
             }
-            iconEnd={
+            sideContent={
               <Icon
                 id='open-status'
                 icon={
@@ -84,6 +91,8 @@ export const TruncatedListItems = <TListItem,>({
             }
           >
             <ListItemButton
+              id={toggleButtonId}
+              subtitleId={toggleButtonDescId}
               aria-expanded={showTruncatedItems}
               onClick={toggleTruncatedItems}
               subtitle={toggleButton.subtitle}

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

@@ -1,8 +1,7 @@
 .wrapper {
-  display: flex;
-  align-items: start;
-  padding: 12px 16px;
-  gap: 16px;
+  --list-item-padding: 16px;
+  --list-item-padding-block: 12px;
+  --list-item-gap: 16px;
 
   &:not(.wrapperWithoutBorder) {
     border-bottom: 1px solid var(--color-border-primary);
@@ -10,8 +9,10 @@
 }
 
 .menuButton {
+  align-self: start;
   padding: 4px;
-  margin-top: -2px;
+  margin-top: -4px;
+  margin-inline-end: -4px;
 
   svg {
     width: 20px;

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

@@ -9,7 +9,10 @@ import { CollectionMenu } from 'mastodon/features/collections/components/collect
 
 import classes from './collection_list_item.module.scss';
 
-interface CollectionListItemProps extends CollectionLockupProps {
+interface CollectionListItemProps extends Omit<
+  CollectionLockupProps,
+  'sideContent'
+> {
   withoutBorder?: boolean;
   positionInList: number;
   listSize: number;
@@ -20,6 +23,7 @@ export const CollectionListItem: React.FC<CollectionListItemProps> = ({
   withoutBorder,
   positionInList,
   listSize,
+  className,
   ...otherProps
 }) => {
   const uniqueId = useId();
@@ -29,21 +33,26 @@ export const CollectionListItem: React.FC<CollectionListItemProps> = ({
   return (
     <Article
       focusable
-      className={classNames(
-        classes.wrapper,
-        withoutBorder && classes.wrapperWithoutBorder,
-      )}
       aria-labelledby={linkId}
       aria-describedby={infoId}
       aria-posinset={positionInList}
       aria-setsize={listSize}
     >
-      <CollectionLockup collection={collection} {...otherProps} />
-
-      <CollectionMenu
-        context='list'
+      <CollectionLockup
         collection={collection}
-        className={classes.menuButton}
+        className={classNames(
+          classes.wrapper,
+          withoutBorder && classes.wrapperWithoutBorder,
+          className,
+        )}
+        sideContent={
+          <CollectionMenu
+            context='list'
+            collection={collection}
+            className={classes.menuButton}
+          />
+        }
+        {...otherProps}
       />
     </Article>
   );

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

@@ -1,11 +1,5 @@
-.content {
-  position: relative;
-  flex-grow: 1;
-  display: flex;
-  align-items: center;
-  column-gap: 12px;
-  color: var(--color-text-primary);
-  line-height: 1.3;
+.wrapper {
+  --list-item-padding: 0px;
 }
 
 .avatarGrid {
@@ -36,27 +30,3 @@
   fill: var(--color-text-primary);
   background: var(--color-bg-warning-softest);
 }
-
-.link {
-  display: block;
-  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;
-  }
-}
-
-.info {
-  font-size: 13px;
-  color: var(--color-text-secondary);
-}

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

@@ -1,10 +1,8 @@
-import { useId } from 'react';
-
 import { FormattedMessage } from 'react-intl';
 
 import classNames from 'classnames';
-import { Link } from 'react-router-dom';
 
+import { ListItemLink, ListItemWrapper } from '@/mastodon/components/list_item';
 import WarningIcon from '@/material-icons/400-24px/warning.svg?react';
 import type { ApiCollectionJSON } from 'mastodon/api_types/collections';
 import { AvatarById } from 'mastodon/components/avatar';
@@ -47,71 +45,78 @@ export interface CollectionLockupProps {
   collection: ApiCollectionJSON;
   withAuthorHandle?: boolean;
   withTimestamp?: boolean;
+  sideContent?: React.ReactNode;
+  className?: string;
 }
 
 export const CollectionLockup: React.FC<CollectionLockupProps> = ({
   collection,
   withAuthorHandle = true,
   withTimestamp,
+  sideContent,
+  className,
 }) => {
   const { id, name } = collection;
-  const uniqueId = useId();
-  const linkId = `${uniqueId}-link`;
-  const infoId = `${uniqueId}-info`;
   const authorAccount = useAccount(collection.account_id);
   const authorHandle = useAccountHandle(authorAccount, domain);
 
-  return (
-    <div className={classes.content}>
-      <AvatarGrid
-        accountIds={collection.items.map((item) => item.account_id)}
-        sensitive={collection.sensitive}
-      />
-      <div>
-        <h2 id={linkId}>
-          <Link to={getCollectionPath(id)} className={classes.link}>
-            {name}
-          </Link>
-        </h2>
-        <ul className={classes.info} id={infoId}>
-          {collection.sensitive && (
-            <li className='sr-only'>
-              <FormattedMessage
-                id='collections.sensitive'
-                defaultMessage='Sensitive'
-              />
-            </li>
-          )}
-          {withAuthorHandle && authorAccount && (
-            <FormattedMessage
-              id='collections.by_account'
-              defaultMessage='by {account_handle}'
-              values={{
-                account_handle: authorHandle,
-              }}
-              tagName='li'
-            />
-          )}
+  const collectionInfo = (
+    <ul>
+      {collection.sensitive && (
+        <li className='sr-only'>
           <FormattedMessage
-            id='collections.account_count'
-            defaultMessage='{count, plural, one {# account} other {# accounts}}'
-            values={{ count: collection.item_count }}
-            tagName='li'
+            id='collections.sensitive'
+            defaultMessage='Sensitive'
           />
-          {withTimestamp && (
-            <FormattedMessage
-              id='collections.last_updated_at'
-              defaultMessage='Last updated: {date}'
-              values={{
-                date: (
-                  <RelativeTimestamp timestamp={collection.updated_at} long />
-                ),
-              }}
-              tagName='li'
-            />
-          )}
-        </ul>
-      </div>
-    </div>
+        </li>
+      )}
+      {withAuthorHandle && authorAccount && (
+        <FormattedMessage
+          id='collections.by_account'
+          defaultMessage='by {account_handle}'
+          values={{
+            account_handle: authorHandle,
+          }}
+          tagName='li'
+        />
+      )}
+      <FormattedMessage
+        id='collections.account_count'
+        defaultMessage='{count, plural, one {# account} other {# accounts}}'
+        values={{ count: collection.item_count }}
+        tagName='li'
+      />
+      {withTimestamp && (
+        <FormattedMessage
+          id='collections.last_updated_at'
+          defaultMessage='Last updated: {date}'
+          values={{
+            date: <RelativeTimestamp timestamp={collection.updated_at} long />,
+          }}
+          tagName='li'
+        />
+      )}
+    </ul>
+  );
+
+  return (
+    <ListItemWrapper
+      className={classNames(classes.wrapper, className)}
+      icon={
+        <AvatarGrid
+          accountIds={collection.items.map((item) => item.account_id)}
+          sensitive={collection.sensitive}
+        />
+      }
+      sideContent={sideContent}
+    >
+      <ListItemLink
+        as='h2'
+        to={getCollectionPath(id)}
+        subtitle={collectionInfo}
+      >
+        {name}
+      </ListItemLink>
+    </ListItemWrapper>
   );
 };

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

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

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

@@ -1,5 +1,9 @@
+import { useIntl } from 'react-intl';
+
 import classNames from 'classnames';
 
+import CloseIcon from '@/material-icons/400-24px/close.svg?react';
+import { IconButton } from 'mastodon/components/icon_button';
 import type { CollectionLockupProps } from 'mastodon/features/collections/components/collection_lockup';
 import { CollectionLockup } from 'mastodon/features/collections/components/collection_lockup';
 
@@ -14,9 +18,26 @@ export const CollectionPreviewCard: React.FC<CollectionPreviewCardProps> = ({
   onRemove,
   ...otherProps
 }) => {
+  const intl = useIntl();
+  const removeButton = onRemove && (
+    <IconButton
+      icon='remove'
+      iconComponent={CloseIcon}
+      onClick={onRemove}
+      title={intl.formatMessage({
+        id: 'tag.remove',
+        defaultMessage: 'Remove',
+      })}
+      className={classes.removeButton}
+    />
+  );
+
   return (
-    <div className={classNames(classes.wrapper, 'collection-preview')}>
-      <CollectionLockup collection={collection} {...otherProps} />
-    </div>
+    <CollectionLockup
+      collection={collection}
+      className={classNames(classes.wrapper, 'collection-preview')}
+      sideContent={removeButton}
+      {...otherProps}
+    />
   );
 };

app/javascript/mastodon/locales/az.json

@@ -14,9 +14,16 @@
   "about.powered_by": "{mastodon} tərəfindən təchiz edilən desentralizasiya edilmiş sosial media",
   "about.rules": "Server qaydaları",
   "account.account_note_header": "Şəxsi qeyd",
+  "account.activity": "Fəaliyyət",
+  "account.add_note": "Fərdi bir not əlavə et",
   "account.add_or_remove_from_list": "Siyahılara əlavə et və ya sil",
+  "account.badges.admin": "Admin",
+  "account.badges.blocked": "Əngəlləndi",
   "account.badges.bot": "Avtomatlaşdırılmış",
+  "account.badges.domain_blocked": "Əngəllənmiş domen",
   "account.badges.group": "Qrup",
+  "account.badges.muted": "Səssizdə",
+  "account.badges.muted_until": "{until} qədər səssizdə",
   "account.block": "@{name} istifadəçisini blokla",
   "account.block_domain": "{domain} domenini blokla",
   "account.block_short": "Blok",
@@ -27,7 +34,9 @@
   "account.direct": "@{name} istifadəçisini fərdi olaraq etiketlə",
   "account.disable_notifications": "@{name} paylaşım edəndə mənə bildiriş göndərməyi dayandır",
   "account.domain_blocking": "Domenin bloklanması",
+  "account.edit_note": "Fərdi nota düzəliş",
   "account.edit_profile": "Profili redaktə et",
+  "account.edit_profile_short": "Düzəliş",
   "account.enable_notifications": "@{name} paylaşım edəndə mənə bildiriş göndər",
   "account.endorse": "Profildə seçilmişlərə əlavə et",
   "account.familiar_followers_many": "{name1}, {name2} və tanıdığınız digər {othersCount, plural, one {digər bir nəfər} other {# nəfər}} izləyir",
@@ -35,8 +44,22 @@
   "account.familiar_followers_two": "{name1} və {name2} izləyir",
   "account.featured": "Seçilmiş",
   "account.featured.accounts": "Profillər",
+  "account.featured.collections": "Kolleksiyalar",
+  "account.featured.new_collection": "Yeni kolleksiya",
+  "account.field_overflow": "Tam məzmunu göstər",
+  "account.filters.all": "Bütün fəaliyyət",
+  "account.filters.boosts_toggle": "Təkrar paylaşmaları göstər",
+  "account.filters.posts_boosts": "Göndərişlər və təkrar paylaşmalar",
+  "account.filters.posts_only": "Göndərişlər",
+  "account.filters.posts_replies": "Göndərişlər və cavablar",
+  "account.filters.replies_toggle": "Cavabları göstər",
   "account.follow": "İzlə",
   "account.follow_back": "Sən də izlə",
+  "account.follow_back_short": "Geri izlə",
+  "account.follow_request": "İzləmə istəyi",
+  "account.follow_request_cancel": "İstəyi ləğv et",
+  "account.follow_request_cancel_short": "İmtina",
+  "account.follow_request_short": "İstək",
   "account.followers": "İzləyicilər",
   "account.followers.empty": "Bu istifadəçini hələ ki, heç kim izləmir.",
   "account.followers_counter": "{count, plural, one {{counter} izləyici} other {{counter} izləyici}}",
@@ -48,12 +71,39 @@
   "account.go_to_profile": "Profilə get",
   "account.hide_reblogs": "@{name} - təkrar paylaşımlarını gizlət",
   "account.in_memoriam": "Xatirə.",
+  "account.join_modal.day": "Gün",
+  "account.join_modal.me": "{server} - qoşuldunuz",
+  "account.join_modal.me_anniversary": "Fediversary-niz mübarək! {server} - qoşuldunuz",
+  "account.join_modal.me_today": "{server} üzərində ilk gününüzdür!",
+  "account.join_modal.other": "{name}, {server} serverinə qoşuldu",
+  "account.join_modal.other_today": "{name} - {server} serverində ilk günüdür!",
+  "account.join_modal.share.celebrate": "Qeyd etmək üçün göndəriş paylaş",
+  "account.join_modal.share.intro": "Tanıtım üçün göndəriş paylaş",
+  "account.join_modal.share.welcome": "Xoş gəlmisiniz göndərişi paylaş",
+  "account.join_modal.years": "{number, plural, one {il} other {il}}",
   "account.joined_short": "Qoşulub",
   "account.languages": "Abunə olunmuş dilləri dəyiş",
+  "account.last_active": "Son aktivlik",
   "account.link_verified_on": "Bu linkin dəqiqliyi {date} tarixində yoxlanılıb",
   "account.locked_info": "Bu hesabın məxfilik statusu kilidlənib. Sahibi, onu kimin izləyə biləcəyini manual olaraq incələyir.",
   "account.media": "Media",
   "account.mention": "@{name} istifadəçisini teq et",
+  "account.menu.add_to_list": "Siyahıya əlavə et…",
+  "account.menu.block": "Hesabı əngəllə",
+  "account.menu.block_domain": "{domain} - əngəllə",
+  "account.menu.copied": "Hesab keçidi lövhəyə kopyalandı",
+  "account.menu.copy": "Keçidi kopyala",
+  "account.menu.direct": "Adını özəl olaraq çək",
+  "account.menu.hide_reblogs": "Zaman xəttində təkrar paylaşmaları gizlət",
+  "account.menu.mention": "Adçəkmə",
+  "account.menu.mute": "Hesabı səssizə al",
+  "account.menu.note.description": "Yalnız sizə görünəndir",
+  "account.menu.open_original_page": "Burada bax: {domain}",
+  "account.menu.remove_follower": "İzləyicini çıxart",
+  "account.menu.report": "Hesabı bildir",
+  "account.menu.share": "Paylaş…",
+  "account.menu.show_reblogs": "Zaman xəttində təkrar paylaşmaları göstər",
+  "account.menu.unblock": "Hesabın əngəlini götür",
   "account.moved_to": "{name} onun yeni hesabının artıq bu olduğunu bildirdi:",
   "account.mute": "@{name} istifadəçisini susdur",
   "account.mute_notifications_short": "Bildirişləri səssizləşdir",
@@ -80,6 +130,12 @@
   "account.unmute": "@{name} səssizləşdirmədən çıxart",
   "account.unmute_notifications_short": "Bildirişlərin səsini aç",
   "account.unmute_short": "Səssizləşdirmədən çıxart",
+  "account_edit.field_delete_modal.title": "Özəl xananı sil?",
+  "account_edit.field_edit_modal.add_title": "Özəl xana əlavə et",
+  "account_edit.field_edit_modal.discard_confirm": "İmtina",
+  "account_edit.field_edit_modal.discard_message": "Saxlanılmamış dəyişiklikləriniz var. Onları silmək istədiyinizə əminsiniz?",
+  "account_edit.field_edit_modal.edit_title": "Özəl xanaya düzəliş",
+  "account_edit.field_edit_modal.length_warning": "Tövsiyə edilən xarakter limiti aşıldı. Mobil istifadəçilər xananızın tamamını görməyə bilər.",
   "account_note.placeholder": "Qeyd əlavə etmək üçün kliklə",
   "admin.dashboard.daily_retention": "Qeydiyyatdan sonrakı günə görə istifadəçi qalma dərəcəsi",
   "admin.dashboard.monthly_retention": "Qeydiyyatdan sonrakı aya görə istifadəçi qalma dərəcəsi",

app/javascript/mastodon/locales/be.json

@@ -71,7 +71,15 @@
   "account.go_to_profile": "Перайсці да профілю",
   "account.hide_reblogs": "Схаваць пашырэнні ад @{name}",
   "account.in_memoriam": "У памяць.",
+  "account.join_modal.day": "Дзень",
   "account.join_modal.me": "Вы далучыліся да {server}",
+  "account.join_modal.me_anniversary": "З гадавінай! Вы далучыліся да {server}",
+  "account.join_modal.me_today": "Сёння Ваш першы дзень на {server}!",
+  "account.join_modal.other": "{name} далучыў(-ла)ся да {server}",
+  "account.join_modal.other_today": "Сёння першы дзень {name} на {server}!",
+  "account.join_modal.share.celebrate": "Абагуліць урачысты допіс",
+  "account.join_modal.share.intro": "Абагуліць допіс, каб прадставіцца",
+  "account.join_modal.share.welcome": "Абагуліць прывітальны допіс",
   "account.join_modal.years": "{number, plural, one {# год} few {# гады} many {# гадоў} other {# гады}}",
   "account.joined_short": "Далучыўся",
   "account.languages": "Змяніць выбраныя мовы",
@@ -1188,6 +1196,7 @@
   "server_banner.active_users": "актыўныя карыстальнікі",
   "server_banner.administered_by": "Адміністратар:",
   "server_banner.is_one_of_many": "{domain} - гэта адзін з многіх незалежных сервераў Mastodon, які Вы можаце выкарыстоўваць для ўдзелу ў федэральным сусвеце.",
+  "server_banner.more_about_this_server": "Падрабязней пра гэты сервер",
   "server_banner.server_stats": "Статыстыка сервера:",
   "sign_in_banner.create_account": "Стварыць уліковы запіс",
   "sign_in_banner.follow_anyone": "Падпісвайцеся на каго захочаце ва ўсім федэральным сусвеце і глядзіце ўсё ў храналагічным парадку. Ніякіх алгарытмаў, рэкламы або клікбэйту.",

app/javascript/mastodon/locales/da.json

@@ -1196,6 +1196,7 @@
   "server_banner.active_users": "aktive brugere",
   "server_banner.administered_by": "Administreret af:",
   "server_banner.is_one_of_many": "{domain} er en af de mange uafhængige Mastodon-servere, du kan bruge for at deltage i fediverset.",
+  "server_banner.more_about_this_server": "Mere om denne server",
   "server_banner.server_stats": "Serverstatstik:",
   "sign_in_banner.create_account": "Opret konto",
   "sign_in_banner.follow_anyone": "Følg alle på tværs af fediverset og se alt i kronologisk rækkefølge. Ingen algoritmer, annoncer eller clickbait i syne.",

app/javascript/mastodon/locales/de.json

@@ -73,7 +73,7 @@
   "account.in_memoriam": "Zum Andenken.",
   "account.join_modal.day": "Tag",
   "account.join_modal.me": "Du bist auf {server} dabei seit",
-  "account.join_modal.me_anniversary": "Happy Fediversary! Du bist auf {server} dabei seit",
+  "account.join_modal.me_anniversary": "Alles Gute zum Fediläum! Auf {server} bist du seit",
   "account.join_modal.me_today": "Dein erster Tag auf {server}!",
   "account.join_modal.other": "{name} ist auf {server} dabei seit",
   "account.join_modal.other_today": "{name} ist seit einem Tag auf {server}!",
@@ -1196,6 +1196,7 @@
   "server_banner.active_users": "aktive Profile",
   "server_banner.administered_by": "Verwaltet von:",
   "server_banner.is_one_of_many": "{domain} ist einer von vielen unabhängigen Mastodon-Servern, mit dem du dich im Fediverse beteiligen kannst.",
+  "server_banner.more_about_this_server": "Mehr über diesen Server",
   "server_banner.server_stats": "Serverstatistik:",
   "sign_in_banner.create_account": "Konto erstellen",
   "sign_in_banner.follow_anyone": "Du kannst jedem im Fediverse folgen und alles in chronologischer Reihenfolge sehen. Keine Algorithmen, Werbung oder Clickbaits vorhanden.",

app/javascript/mastodon/locales/el.json

@@ -1196,6 +1196,7 @@
   "server_banner.active_users": "ενεργοί χρήστες",
   "server_banner.administered_by": "Διαχειριστής:",
   "server_banner.is_one_of_many": "Το {domain} είναι ένας από τους πολλούς ανεξάρτητους διακομιστές Mastodon που μπορείς να χρησιμοποιήσεις για να συμμετάσχεις στο fediverse.",
+  "server_banner.more_about_this_server": "Περισσότερα για αυτόν τον διακομιστή",
   "server_banner.server_stats": "Στατιστικά διακομιστή:",
   "sign_in_banner.create_account": "Δημιουργία λογαριασμού",
   "sign_in_banner.follow_anyone": "Ακολούθησε οποιονδήποτε κατά μήκος του fediverse και δες τα όλα με χρονολογική σειρά. Δεν υπάρχουν αλγόριθμοι, διαφημίσεις ή clickbait ούτε για δείγμα.",

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

@@ -71,6 +71,16 @@
   "account.go_to_profile": "Go to profile",
   "account.hide_reblogs": "Hide boosts from @{name}",
   "account.in_memoriam": "In Memoriam.",
+  "account.join_modal.day": "Day",
+  "account.join_modal.me": "You joined {server} on",
+  "account.join_modal.me_anniversary": "Happy Fediversary! You joined {server} on",
+  "account.join_modal.me_today": "It’s your first day on {server}!",
+  "account.join_modal.other": "{name} joined {server} on",
+  "account.join_modal.other_today": "It’s {name}’s first day on {server}!",
+  "account.join_modal.share.celebrate": "Share a celebratory post",
+  "account.join_modal.share.intro": "Share an intro post",
+  "account.join_modal.share.welcome": "Share a welcome post",
+  "account.join_modal.years": "{number, plural, one {year} other {years}}",
   "account.joined_short": "Joined",
   "account.languages": "Change subscribed languages",
   "account.last_active": "Last active",
@@ -398,6 +408,8 @@
   "collections.manage_accounts": "Manage accounts",
   "collections.mark_as_sensitive": "Mark as sensitive",
   "collections.mark_as_sensitive_hint": "Hides the collection's description and accounts behind a content warning. The collection name will still be visible.",
+  "collections.maximum_collection_count_description": "Your server allows creation of up to {count} collections.",
+  "collections.maximum_collection_count_reached": "You have created the maximum number of collections",
   "collections.name_length_hint": "40 characters limit",
   "collections.new_collection": "New collection",
   "collections.no_collections_yet": "No collections yet.",
@@ -1184,6 +1196,7 @@
   "server_banner.active_users": "active users",
   "server_banner.administered_by": "Administered by:",
   "server_banner.is_one_of_many": "{domain} is one of the many independent Mastodon servers you can use to participate in the Fediverse.",
+  "server_banner.more_about_this_server": "More about this server",
   "server_banner.server_stats": "Server stats:",
   "sign_in_banner.create_account": "Create account",
   "sign_in_banner.follow_anyone": "Follow anyone across the Fediverse and see it all in chronological order. No algorithms, ads, or clickbait in sight.",

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

@@ -1196,6 +1196,7 @@
   "server_banner.active_users": "usuarios activos",
   "server_banner.administered_by": "Administrado por:",
   "server_banner.is_one_of_many": "{domain} es uno de los muchos servidores de Mastodon independientes que podés usar para participar en el Fediverso.",
+  "server_banner.more_about_this_server": "Más acerca de este servidor",
   "server_banner.server_stats": "Estadísticas del servidor:",
   "sign_in_banner.create_account": "Crear cuenta",
   "sign_in_banner.follow_anyone": "Seguí a cualquiera cuenta a través del Fediverso y leé todo en orden cronológico. Nada de algoritmos, publicidad o titulares engañosos.",

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

@@ -409,7 +409,7 @@
   "collections.mark_as_sensitive": "Marcar como sensible",
   "collections.mark_as_sensitive_hint": "Oculta la descripción y las cuentas de la colección detrás de una advertencia de contenido. El nombre de la colección seguirá siendo visible.",
   "collections.maximum_collection_count_description": "Tu servidor permite la creación de hasta {count} colecciones.",
-  "collections.maximum_collection_count_reached": "Has creado el número máximo de colecciones",
+  "collections.maximum_collection_count_reached": "Has alcanzado el número máximo de colecciones",
   "collections.name_length_hint": "Limitado a 40 caracteres",
   "collections.new_collection": "Nueva colección",
   "collections.no_collections_yet": "No hay colecciones todavía.",
@@ -1196,6 +1196,7 @@
   "server_banner.active_users": "usuarios activos",
   "server_banner.administered_by": "Administrado por:",
   "server_banner.is_one_of_many": "{domain} es uno de los varios servidores independientes de Mastodon que puedes usar para participar en el fediverso.",
+  "server_banner.more_about_this_server": "Más información sobre este servidor",
   "server_banner.server_stats": "Estadísticas del servidor:",
   "sign_in_banner.create_account": "Crear cuenta",
   "sign_in_banner.follow_anyone": "Sigue a cualquier persona en el fediverso y velo todo en orden cronológico. Sin algoritmos, sin anuncios o titulares engañosos.",

app/javascript/mastodon/locales/es.json

@@ -1196,6 +1196,7 @@
   "server_banner.active_users": "usuarios activos",
   "server_banner.administered_by": "Administrado por:",
   "server_banner.is_one_of_many": "{domain} es uno de los varios servidores independientes de Mastodon que puedes usar para participar en el fediverso.",
+  "server_banner.more_about_this_server": "Más información acerca de este servidor",
   "server_banner.server_stats": "Estadísticas del servidor:",
   "sign_in_banner.create_account": "Crear cuenta",
   "sign_in_banner.follow_anyone": "Sigue a cualquier persona en el fediverso y velo todo en orden cronológico. Sin algoritmos, sin anuncios o titulares engañosos.",

app/javascript/mastodon/locales/et.json

@@ -69,16 +69,22 @@
   "account.follows.empty": "See kasutaja ei jälgi veel mitte kedagi.",
   "account.follows_you": "Jälgib sind",
   "account.go_to_profile": "Vaata profiili",
-  "account.hide_reblogs": "Peida @{name} jagamised",
+  "account.hide_reblogs": "Peida kasutaja @{name} hooandmised",
   "account.in_memoriam": "In Memoriam.",
   "account.join_modal.day": "Päev",
-  "account.join_modal.me": "Ühinesid {server} kohas",
-  "account.join_modal.me_anniversary": "Rõõmsat Födiversumist! Ühinesid {server} kohas",
-  "account.join_modal.me_today": "See on sinu esimene päev kohas {server}!",
+  "account.join_modal.me": "Ühinesid {server} serveriga aadressil",
+  "account.join_modal.me_anniversary": "Sinu tähtpäev Födiversumis! Ühinesid {server} serveriga aadressil",
+  "account.join_modal.me_today": "See on sinu esimene päev {server} serveris!",
+  "account.join_modal.other": "{name} liitus {server} severiga",
+  "account.join_modal.other_today": "Kasutajale {name} on see esimene päev serveris {server}!",
+  "account.join_modal.share.celebrate": "Koosta postitus, mis selle ära märgib",
+  "account.join_modal.share.intro": "Koosta sissejuhatav postitus",
+  "account.join_modal.share.welcome": "Koosta tervituspostitus",
+  "account.join_modal.years": "{number, plural, one {aasta} other {aastat}}",
   "account.joined_short": "Liitus",
   "account.languages": "Muuda tellitud keeli",
   "account.last_active": "Viimati aktiivne",
-  "account.link_verified_on": "Selle lingi autorsust kontrolliti {date}",
+  "account.link_verified_on": "Selle lingi autorsus on kontrollitud {date}",
   "account.locked_info": "Selle konto privaatsussätteks on lukustatud. Omanik vaatab käsitsi üle, kes teda jälgida saab.",
   "account.media": "Meedium",
   "account.mention": "Maini @{name}",
@@ -179,11 +185,11 @@
   "account_edit.field_edit_modal.discard_confirm": "Loobu",
   "account_edit.field_edit_modal.discard_message": "Sul on salvestamata muudatusi. Kas soovid tõesti neist loobuda?",
   "account_edit.field_edit_modal.edit_title": "Muuda kohandatud välja",
-  "account_edit.field_edit_modal.length_warning": "Soovitatud tähemärkide piir on ületatud. Mobiilikasutajad ei pruugi välja tervikuna näha.",
-  "account_edit.field_edit_modal.link_emoji_warning": "Soovitame vältida kohandatud emojide kasutamist koos Url-aadressidega. Mõlemat sisaldavad kohandatud väljad kuvatakse segaduse vältimiseks ainult tekstina, mitte lingina.",
+  "account_edit.field_edit_modal.length_warning": "Soovitatud tähemärkide piir on ületatud. Mobiilikasutajad ei pruugi seda välja tervikuna näha.",
+  "account_edit.field_edit_modal.link_emoji_warning": "Soovitame vältida kohandatud emojide kasutamist koos võrguaadressidega. Mõlemat sisaldavad kohandatud väljad kuvatakse segaduse vältimiseks ainult tekstina, mitte lingina.",
   "account_edit.field_edit_modal.name_hint": "Näit. \"Isiklik veebileht\"",
   "account_edit.field_edit_modal.name_label": "Silt",
-  "account_edit.field_edit_modal.url_warning": "Lingi lisamiseks lisa palun algusesse {protocol}.",
+  "account_edit.field_edit_modal.url_warning": "Lingi lisamisel lisa palun algusesse {protocol}.",
   "account_edit.field_edit_modal.value_hint": "Näit. \"https://naiteks.me\"",
   "account_edit.field_edit_modal.value_label": "Väärtus",
   "account_edit.field_reorder_modal.drag_cancel": "Lohistamine tühistati. Väli \"{item}\" kukutati.",
@@ -229,20 +235,20 @@
   "account_edit.upload_modal.next": "Edasi",
   "account_edit.upload_modal.step_crop.zoom": "Suum",
   "account_edit.upload_modal.step_upload.button": "Sirvi faile",
-  "account_edit.upload_modal.step_upload.dragging": "Üleslaadimiseks kukuta",
+  "account_edit.upload_modal.step_upload.dragging": "Sisu üleslaadimiseks lohista ta siia",
   "account_edit.upload_modal.step_upload.header": "Vali pilt",
   "account_edit.upload_modal.step_upload.hint": "WEBP-, PNG-, GIF- või JPG-vormingus, maksimaalselt {limit} MB.{br}Pilt skaleeritakse mõõtmeteni {width}x{height} pikselit.",
-  "account_edit.upload_modal.title_add.avatar": "Lisa profiilifoto",
-  "account_edit.upload_modal.title_add.header": "Lisa kaanefoto",
-  "account_edit.upload_modal.title_replace.avatar": "Asenda profiilifoto",
-  "account_edit.upload_modal.title_replace.header": "Asenda kaanefoto",
-  "account_edit.verified_modal.details": "Tõsta oma Mastodoni profiili usaldusväärsust, kinnitades lingid isiklikele veebisaitidele. See toimib järgmiselt:",
-  "account_edit.verified_modal.invisible_link.details": "Lisa link oma päisesse. Oluline on atribuut rel=\"me\", mis takistab identiteedivargust kasutajate loodud sisuga veebisaitidel. Lehe päises võib kasutada isegi silti link {tag} asemel, kuid HTML peab olema kättesaadav ka ilma JavaScripti käivitamiseta.",
+  "account_edit.upload_modal.title_add.avatar": "Lisa profiilipilt",
+  "account_edit.upload_modal.title_add.header": "Lisa kaanepilt",
+  "account_edit.upload_modal.title_replace.avatar": "Profiilipildi vahetamine",
+  "account_edit.upload_modal.title_replace.header": "Kaanepildi vahetamine",
+  "account_edit.verified_modal.details": "Paranda oma Mastodoni profiili usaldusväärsust, kinnitades isiklike veebisaitide lingid. See toimib järgmiselt:",
+  "account_edit.verified_modal.invisible_link.details": "Lisa link oma saidi päisesse. Oluline on atribuut rel=\"me\", mis takistab identiteedivargust kasutajate loodud sisuga veebisaitides. Lehe päises võid {tag} elemendi asemel kasutada isegi silti link, kuid HTML peab olema kättesaadav ka ilma JavaScripti käivitamiseta.",
   "account_edit.verified_modal.invisible_link.summary": "Kuidas ma muudan lingi nähtamatuks?",
-  "account_edit.verified_modal.step1.header": "Kopeeri allpool olev HTML-kood ja kleebi oma veebisaidi päisesse",
+  "account_edit.verified_modal.step1.header": "Kopeeri allpool olev HTML-kood ja aseta oma veebisaidi päisesse",
   "account_edit.verified_modal.step2.details": "Kui oled oma veebisaidi kohandatud väljana juba lisanud, pead kinnitamise käivitamiseks selle kustutama ja uuesti lisama.",
-  "account_edit.verified_modal.step2.header": "Lisa oma veebileht kohandatud väljana",
-  "account_edit.verified_modal.title": "Kuidas lisada kinnitatud link",
+  "account_edit.verified_modal.step2.header": "Lisa oma veebisait kohandatud väljana",
+  "account_edit.verified_modal.title": "Kuidas toimib kinnitatud lingi lisamine",
   "account_edit_tags.add_tag": "Lisa #{tagName}",
   "account_edit_tags.column_title": "Muuda silte",
   "account_edit_tags.help_text": "Esiletõstetud teemaviited aitavad kasutajatel sinu profiili leida ja sellega suhestuda. Need kuvatakse filtritena sinu profiili lehe tegevuste vaates.",
@@ -402,6 +408,8 @@
   "collections.manage_accounts": "Halda kasutajakontosid",
   "collections.mark_as_sensitive": "Märgi delikaatseks",
   "collections.mark_as_sensitive_hint": "Peidab kogumiku kirjelduse ja kontod sisuhoiatuse taha. Kogumiku nimi ise on sellele vaatamata nähtav.",
+  "collections.maximum_collection_count_description": "Sinu server lubab luua kuni {count} kogumikku.",
+  "collections.maximum_collection_count_reached": "Sa oled loonud nii palju kogumikke, kui on lubatud",
   "collections.name_length_hint": "40 märgi piir",
   "collections.new_collection": "Uus kogumik",
   "collections.no_collections_yet": "Kogumikke veel pole.",
@@ -1188,6 +1196,7 @@
   "server_banner.active_users": "aktiivset kasutajaid",
   "server_banner.administered_by": "Administraator:",
   "server_banner.is_one_of_many": "{domain} on üks paljudest sõltumatutest Mastodoni serveritest, mida saab fediversumis osalemiseks kasutada.",
+  "server_banner.more_about_this_server": "Rohkem selle serveri kohta",
   "server_banner.server_stats": "Serveri statistika:",
   "sign_in_banner.create_account": "Loo konto",
   "sign_in_banner.follow_anyone": "Jälgi ükskõik keda kogu fediversumist ja näe kõike ajalises järjestuses. Ei mingeid algoritme, reklaame või klikipüüdjaid segamas.",

app/javascript/mastodon/locales/fi.json

@@ -1196,6 +1196,7 @@
   "server_banner.active_users": "aktiivista käyttäjää",
   "server_banner.administered_by": "Ylläpitäjä:",
   "server_banner.is_one_of_many": "{domain} on yksi monista itsenäisistä Mastodon-palvelimista, joiden välityksellä voit toimia fediversumissa.",
+  "server_banner.more_about_this_server": "Lisää tästä palvelimesta",
   "server_banner.server_stats": "Palvelimen tilastot:",
   "sign_in_banner.create_account": "Luo tili",
   "sign_in_banner.follow_anyone": "Seuraa kenen tahansa julkaisuja fediversumissa ja näe ne kaikki aikajärjestyksessä. Ei algoritmeja, mainoksia eikä klikkausten kalastelua.",

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

@@ -71,6 +71,16 @@
   "account.go_to_profile": "Voir ce profil",
   "account.hide_reblogs": "Masquer les boosts de @{name}",
   "account.in_memoriam": "En souvenir de",
+  "account.join_modal.day": "Jour",
+  "account.join_modal.me": "Vous avez rejoint {server} le",
+  "account.join_modal.me_anniversary": "Joyeux Fédiversaire ! Vous avez rejoint {server} le",
+  "account.join_modal.me_today": "C'est votre premier jour sur {server} !",
+  "account.join_modal.other": "{name} a rejoint {server} le",
+  "account.join_modal.other_today": "C'est le premier jour de {name} sur {server} !",
+  "account.join_modal.share.celebrate": "Partager un message de célébration",
+  "account.join_modal.share.intro": "Partager un message d'introduction",
+  "account.join_modal.share.welcome": "Partager un message de bienvenue",
+  "account.join_modal.years": "{number, plural, one {an} other {ans}}",
   "account.joined_short": "Inscrit·e",
   "account.languages": "Changer les langues abonnées",
   "account.last_active": "Dernière activité",
@@ -398,6 +408,8 @@
   "collections.manage_accounts": "Gérer les comptes",
   "collections.mark_as_sensitive": "Marquer comme sensible",
   "collections.mark_as_sensitive_hint": "Masque la description et les comptes de la collection derrière un avertissement au public. Le titre reste visible.",
+  "collections.maximum_collection_count_description": "Votre serveur permet la création de {count} collections au maximum.",
+  "collections.maximum_collection_count_reached": "Vous avez créé le nombre maximum de collections",
   "collections.name_length_hint": "Maximum 40 caractères",
   "collections.new_collection": "Nouvelle collection",
   "collections.no_collections_yet": "Aucune collection pour le moment.",
@@ -622,7 +634,7 @@
   "empty_column.account_featured.other": "{acct} n'a pas encore mis de contenu en avant.",
   "empty_column.account_featured_self.no_collections_button": "Créer une collection",
   "empty_column.account_featured_self.no_collections_hide_tab": "Cacher cet onglet",
-  "empty_column.account_featured_self.pre_collections": "Restez à l'écoute pour les collections",
+  "empty_column.account_featured_self.pre_collections": "Restez connecté pour les collections",
   "empty_column.account_featured_self.pre_collections_desc": "Les collections (à venir dans Mastodon 4.6) permettent d'organiser vos propres listes de comptes à recommander aux autres.",
   "empty_column.account_featured_self.showcase_accounts": "Présentez vos comptes préférés",
   "empty_column.account_featured_self.showcase_accounts_desc": "Les collections sont des listes de comptes sélectionnés pour aider les autres à découvrir le Fédivers.",
@@ -1184,6 +1196,7 @@
   "server_banner.active_users": "comptes actifs",
   "server_banner.administered_by": "Administré par:",
   "server_banner.is_one_of_many": "{domain} est l'un des nombreux serveurs Mastodon indépendants que vous pouvez utiliser pour participer au fédivers.",
+  "server_banner.more_about_this_server": "En savoir plus sur ce serveur",
   "server_banner.server_stats": "Statistiques du serveur:",
   "sign_in_banner.create_account": "Créer un compte",
   "sign_in_banner.follow_anyone": "Suivez n'importe qui à travers le fédivers et affichez tout dans un ordre chronologique. Ni algorithmes, ni publicités, ni appâts à clics en perspective.",

app/javascript/mastodon/locales/fr.json

@@ -71,6 +71,16 @@
   "account.go_to_profile": "Voir le profil",
   "account.hide_reblogs": "Masquer les partages de @{name}",
   "account.in_memoriam": "En mémoire.",
+  "account.join_modal.day": "Jour",
+  "account.join_modal.me": "Vous avez rejoint {server} le",
+  "account.join_modal.me_anniversary": "Joyeux Fédiversaire ! Vous avez rejoint {server} le",
+  "account.join_modal.me_today": "C'est votre premier jour sur {server} !",
+  "account.join_modal.other": "{name} a rejoint {server} le",
+  "account.join_modal.other_today": "C'est le premier jour de {name} sur {server} !",
+  "account.join_modal.share.celebrate": "Partager un message de célébration",
+  "account.join_modal.share.intro": "Partager un message d'introduction",
+  "account.join_modal.share.welcome": "Partager un message de bienvenue",
+  "account.join_modal.years": "{number, plural, one {an} other {ans}}",
   "account.joined_short": "Ici depuis",
   "account.languages": "Modifier les langues d'abonnements",
   "account.last_active": "Dernière activité",
@@ -398,6 +408,8 @@
   "collections.manage_accounts": "Gérer les comptes",
   "collections.mark_as_sensitive": "Marquer comme sensible",
   "collections.mark_as_sensitive_hint": "Masque la description et les comptes de la collection derrière un avertissement au public. Le titre reste visible.",
+  "collections.maximum_collection_count_description": "Votre serveur permet la création de {count} collections au maximum.",
+  "collections.maximum_collection_count_reached": "Vous avez créé le nombre maximum de collections",
   "collections.name_length_hint": "Maximum 40 caractères",
   "collections.new_collection": "Nouvelle collection",
   "collections.no_collections_yet": "Aucune collection pour le moment.",
@@ -622,7 +634,7 @@
   "empty_column.account_featured.other": "{acct} n'a pas encore mis de contenu en avant.",
   "empty_column.account_featured_self.no_collections_button": "Créer une collection",
   "empty_column.account_featured_self.no_collections_hide_tab": "Cacher cet onglet",
-  "empty_column.account_featured_self.pre_collections": "Restez à l'écoute pour les collections",
+  "empty_column.account_featured_self.pre_collections": "Restez connecté pour les collections",
   "empty_column.account_featured_self.pre_collections_desc": "Les collections (à venir dans Mastodon 4.6) permettent d'organiser vos propres listes de comptes à recommander aux autres.",
   "empty_column.account_featured_self.showcase_accounts": "Présentez vos comptes préférés",
   "empty_column.account_featured_self.showcase_accounts_desc": "Les collections sont des listes de comptes sélectionnés pour aider les autres à découvrir le Fédivers.",
@@ -1184,6 +1196,7 @@
   "server_banner.active_users": "comptes actifs",
   "server_banner.administered_by": "Administré par :",
   "server_banner.is_one_of_many": "{domain} est l'un des nombreux serveurs Mastodon indépendants que vous pouvez utiliser pour participer au fédivers.",
+  "server_banner.more_about_this_server": "En savoir plus sur ce serveur",
   "server_banner.server_stats": "Statistiques du serveur :",
   "sign_in_banner.create_account": "Créer un compte",
   "sign_in_banner.follow_anyone": "Suivez n'importe qui à travers le fédivers et affichez tout dans un ordre chronologique. Ni algorithmes, ni publicités, ni appâts à clics en perspective.",

app/javascript/mastodon/locales/ga.json

@@ -1196,6 +1196,7 @@
   "server_banner.active_users": "úsáideoirí gníomhacha",
   "server_banner.administered_by": "Arna riar ag:",
   "server_banner.is_one_of_many": "Tá {domain} ar cheann de na freastalaithe Mastodon neamhspleácha go leor is féidir leat a úsáid chun páirt a ghlacadh sa feiliúnach.",
+  "server_banner.more_about_this_server": "Tuilleadh faoin bhfreastalaí seo",
   "server_banner.server_stats": "Staitisticí freastalaí:",
   "sign_in_banner.create_account": "Cruthaigh cuntas",
   "sign_in_banner.follow_anyone": "Lean aon duine ar fud an fhealsúnachta agus féach ar fad in ord croineolaíoch. Gan algartam, fógraí, nó clickbait i radharc.",

app/javascript/mastodon/locales/gl.json

@@ -1196,6 +1196,7 @@
   "server_banner.active_users": "usuarias activas",
   "server_banner.administered_by": "Administrada por:",
   "server_banner.is_one_of_many": "{domain} é un dos moitos servidores Mastodon independentes que podes usar para participar do Fediverso.",
+  "server_banner.more_about_this_server": "Máis info sobre este servidor",
   "server_banner.server_stats": "Estatísticas do servidor:",
   "sign_in_banner.create_account": "Crear conta",
   "sign_in_banner.follow_anyone": "Sigue a quen queiras no Fediverso e le as publicacións en orde cronolóxica. Sen algoritmos, publicidade nin titulares enganosos.",

app/javascript/mastodon/locales/he.json

@@ -71,6 +71,16 @@
   "account.go_to_profile": "מעבר לפרופיל",
   "account.hide_reblogs": "להסתיר הידהודים מאת @{name}",
   "account.in_memoriam": "פרופיל זכרון.",
+  "account.join_modal.day": "יום",
+  "account.join_modal.me": "הצטרפת אל {server} בתאריך",
+  "account.join_modal.me_anniversary": "פדילדת שמח! הצטרפת אל {server} בתאריך",
+  "account.join_modal.me_today": "זהו יומך הראשון על {server}!",
+  "account.join_modal.other": "{name} הצטרפו אל {server} בתאריך",
+  "account.join_modal.other_today": "זהו היום הראשון של {name} על {server}!",
+  "account.join_modal.share.celebrate": "שתפו הודעה לחגיגת האירוע",
+  "account.join_modal.share.intro": "שתפו הודעת היכרות",
+  "account.join_modal.share.welcome": "שתפו הודעת קבלת פנים",
+  "account.join_modal.years": "{number, plural, one {שנה} two {שנתיים} other {# שנים}}",
   "account.joined_short": "תאריך הצטרפות",
   "account.languages": "שנה רישום לשפות",
   "account.last_active": "פעילות אחרונה",
@@ -398,6 +408,8 @@
   "collections.manage_accounts": "ניהול חשבונות",
   "collections.mark_as_sensitive": "מסומנים כרגישים",
   "collections.mark_as_sensitive_hint": "הסתרת תיאור וחשבונות האוסף מאחורי אזהרת תוכן. שם האוסף עדיין ישאר גלוי.",
+  "collections.maximum_collection_count_description": "השרת שלך מגביל יצירה של עד {count} אוספים.",
+  "collections.maximum_collection_count_reached": "יצרת את מספר האוספים המירבי",
   "collections.name_length_hint": "מגבלה של 40 תווים",
   "collections.new_collection": "אוסף חדש",
   "collections.no_collections_yet": "עוד אין אוספים.",
@@ -785,7 +797,7 @@
   "interaction_modal.on_this_server": "על שרת זה",
   "interaction_modal.title": "יש להזדהות כדי להמשיך",
   "interaction_modal.username_prompt": "למשל {example}",
-  "intervals.full.days": "{number, plural, one {# יום} other {# ימים}}",
+  "intervals.full.days": "{number, plural, one {יום} two {יומיים} other {# ימים}}",
   "intervals.full.hours": "{number, plural, one {# שעה} other {# שעות}}",
   "intervals.full.minutes": "{number, plural, one {# דקה} other {# דקות}}",
   "keyboard_shortcuts.back": "ניווט חזרה",
@@ -1184,6 +1196,7 @@
   "server_banner.active_users": "משתמשים פעילים",
   "server_banner.administered_by": "מנוהל ע\"י:",
   "server_banner.is_one_of_many": "{domain} הוא שרת אחד משרתי מסטודון עצמאיים רבים שדרגם תוכלו להשתתף בפדיוורס (רשת חברתית מבוזרת).",
+  "server_banner.more_about_this_server": "עוד אודות שרת זה",
   "server_banner.server_stats": "סטטיסטיקות שרת:",
   "sign_in_banner.create_account": "יצירת חשבון",
   "sign_in_banner.follow_anyone": "תוכלו לעקוב אחרי כל משמתמש בפדיוורס ולקרוא הכל לפי סדר הפרסום בציר הזמן. אין אלגוריתמים, פרסומות, או קליקבייט מטעם בעלי הרשת.",
@@ -1298,7 +1311,7 @@
   "terms_of_service.effective_as_of": "בתוקף החל מתאריך {date}",
   "terms_of_service.title": "תנאי השירות",
   "terms_of_service.upcoming_changes_on": "שינויים עתידיים שיחולו ביום {date}",
-  "time_remaining.days": "נותרו {number, plural, one {# יום} other {# ימים}}",
+  "time_remaining.days": "נותרו {number, plural, one {יום} two {יומיים} other {# ימים}}",
   "time_remaining.hours": "נותרו {number, plural, one {# שעה} other {# שעות}}",
   "time_remaining.minutes": "נותרו {number, plural, one {# דקה} other {# דקות}}",
   "time_remaining.moments": "רגעים נותרו",

app/javascript/mastodon/locales/is.json

@@ -1196,6 +1196,7 @@
   "server_banner.active_users": "virkir notendur",
   "server_banner.administered_by": "Stýrt af:",
   "server_banner.is_one_of_many": "{domain} er einn af fjölmörgum óháðum Mastodon-þjónum sem þú getur notað til að taka þátt í fediverse-samfélaginu.",
+  "server_banner.more_about_this_server": "Nánar um þennan netþjón",
   "server_banner.server_stats": "Tölfræði þjóns:",
   "sign_in_banner.create_account": "Búa til notandaaðgang",
   "sign_in_banner.follow_anyone": "Fylgstu með hverjum sem er í þessum samtvinnaða heimi og skoðaðu allt í tímaröð. Engin reiknirit, auglýsingar eða smellbeitur.",

app/javascript/mastodon/locales/it.json

@@ -149,7 +149,7 @@
   "account.unfollow": "Smetti di seguire",
   "account.unmute": "Riattiva @{name}",
   "account.unmute_notifications_short": "Riattiva notifiche",
-  "account.unmute_short": "Attiva audio",
+  "account.unmute_short": "Riattiva",
   "account_edit.advanced_settings.bot_hint": "Segnala ad altri che l'account esegue principalmente azioni automatizzate e potrebbe non essere monitorato",
   "account_edit.advanced_settings.bot_label": "Account automatizzato",
   "account_edit.advanced_settings.title": "Impostazioni avanzate",
@@ -1196,6 +1196,7 @@
   "server_banner.active_users": "utenti attivi",
   "server_banner.administered_by": "Amministrato da:",
   "server_banner.is_one_of_many": "{domain} è uno dei tanti server Mastodon indipendenti che puoi usare per partecipare al fediverso.",
+  "server_banner.more_about_this_server": "Maggiori informazioni su questo server",
   "server_banner.server_stats": "Statistiche del server:",
   "sign_in_banner.create_account": "Crea un profilo",
   "sign_in_banner.follow_anyone": "Segui chiunque nel fediverso e vedi tutto in ordine cronologico. Nessun algoritmo, annunci o clickbait in vista.",

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

@@ -71,6 +71,16 @@
   "account.go_to_profile": "行kàu個人資料",
   "account.hide_reblogs": "Tshàng tuì @{name} 來ê轉PO",
   "account.in_memoriam": "佇tsia追悼。",
+  "account.join_modal.day": "Kang",
+  "account.join_modal.me": "Lí加入 {server} 佇",
+  "account.join_modal.me_anniversary": "加入聯邦宇宙周年快樂！Lí加入 {server} 佇",
+  "account.join_modal.me_today": "Che是lí加入 {server} ê頭一kang！",
+  "account.join_modal.other": "{name} 加入 {server} 佇",
+  "account.join_modal.other_today": "Che是 {name} 加入 {server} ê頭一kang！",
+  "account.join_modal.share.celebrate": "分享慶祝ê PO文",
+  "account.join_modal.share.intro": "分享介紹ê PO文",
+  "account.join_modal.share.welcome": "分享歡迎ê PO文",
+  "account.join_modal.years": "{number, plural, other {年}}",
   "account.joined_short": "加入ê時",
   "account.languages": "變更訂閱的語言",
   "account.last_active": "頂kái活動ê時間",
@@ -398,6 +408,8 @@
   "collections.manage_accounts": "管理口座",
   "collections.mark_as_sensitive": "標做敏感ê",
   "collections.mark_as_sensitive_hint": "Kā收藏ê描述kap口座tshàng佇內容警告ê後壁。收藏ê名猶原會當看。",
+  "collections.maximum_collection_count_description": "Lí ê服侍器允准增加kàu上tsē {count} ê收藏。",
+  "collections.maximum_collection_count_reached": "Lí已經建立kàu收藏數ê盡磅ah",
   "collections.name_length_hint": "限制 40 字",
   "collections.new_collection": "新ê收藏",
   "collections.no_collections_yet": "Iáu無收藏。",
@@ -416,6 +428,8 @@
   "collections.suggestions.must_follow_desc": "Tsiah ê口座審查所有跟tuè ê請求。跟tuè ê tsiah通kā in加入去收藏內底。",
   "collections.topic_hint": "加 hashtag，幫tsān別lâng了解tsit ê收藏ê主題。",
   "collections.topic_special_chars_hint": "儲存ê時陣ê suá掉特殊字元",
+  "collections.unlisted_collections_description": "Chiah ê buē佇lí ê個人資料顯示予別lâng看。毋koh有tsit ê連結ê ē當發現in。",
+  "collections.unlisted_collections_with_count": "無公開ê收藏（{count}）",
   "collections.view_collection": "看收藏",
   "collections.visibility_public": "公共ê",
   "collections.visibility_public_hint": "佇tshiau-tshuē結果kap別位有推薦ê所在通發現。",

app/javascript/mastodon/locales/nl.json

@@ -71,6 +71,16 @@
   "account.go_to_profile": "Ga naar profiel",
   "account.hide_reblogs": "Boosts van @{name} verbergen",
   "account.in_memoriam": "In memoriam.",
+  "account.join_modal.day": "Dag",
+  "account.join_modal.me": "Je bent op {server} sinds",
+  "account.join_modal.me_anniversary": "Fijne Fediversary! Je bent op {server} sinds",
+  "account.join_modal.me_today": "Het is je eerste dag op {server}!",
+  "account.join_modal.other": "{name} is op {server} sinds",
+  "account.join_modal.other_today": "Het is voor {name} de eerste dag op {server}!",
+  "account.join_modal.share.celebrate": "Deel een feestelijk bericht",
+  "account.join_modal.share.intro": "Deel een introductie",
+  "account.join_modal.share.welcome": "Deel een welkomstbericht",
+  "account.join_modal.years": "{number, plural, one {jaar} other {jaar}}",
   "account.joined_short": "Sinds",
   "account.languages": "Getoonde talen wijzigen",
   "account.last_active": "Laatst actief",
@@ -398,6 +408,8 @@
   "collections.manage_accounts": "Accounts beheren",
   "collections.mark_as_sensitive": "Als gevoelig markeren",
   "collections.mark_as_sensitive_hint": "Verbergt de omschrijving en de accounts van de verzameling achter een waarschuwing. De naam van de verzameling blijft zichtbaar.",
+  "collections.maximum_collection_count_description": "Je server maakt het mogelijk om maximaal {count} verzamelingen aan te maken.",
+  "collections.maximum_collection_count_reached": "Je hebt het maximum aantal lijsten aangemaakt",
   "collections.name_length_hint": "Limiet van 40 tekens",
   "collections.new_collection": "Nieuwe verzameling",
   "collections.no_collections_yet": "Nog geen verzamelingen.",
@@ -1184,6 +1196,7 @@
   "server_banner.active_users": "actieve gebruikers",
   "server_banner.administered_by": "Beheerd door:",
   "server_banner.is_one_of_many": "{domain} is een van de vele onafhankelijke Mastodon-servers die je kunt gebruiken om deel te nemen aan de fediverse.",
+  "server_banner.more_about_this_server": "Meer informatie over deze server",
   "server_banner.server_stats": "Serverstats:",
   "sign_in_banner.create_account": "Registreren",
   "sign_in_banner.follow_anyone": "Volg iedereen in de fediverse en zie het allemaal in chronologische volgorde. Geen algoritmes, advertenties of clickbaits.",

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

@@ -71,6 +71,16 @@
   "account.go_to_profile": "Ir ao perfil",
   "account.hide_reblogs": "Ocultar impulsos de @{name}",
   "account.in_memoriam": "In Memoriam.",
+  "account.join_modal.day": "Dia",
+  "account.join_modal.me": "Você uniu-se a {server} em",
+  "account.join_modal.me_anniversary": "Feliz Fediversário! Você uniu-se a {server} em",
+  "account.join_modal.me_today": "É o seu primeiro dia em {server}!",
+  "account.join_modal.other": "{name} uniu-se a {server} em",
+  "account.join_modal.other_today": "Este é o primeiro dia de {name} em {server}!",
+  "account.join_modal.share.celebrate": "Compartilhe uma postagem comemorativa",
+  "account.join_modal.share.intro": "Compartilhe uma postagem de introdução",
+  "account.join_modal.share.welcome": "Compartilhe uma postagem de boas-vindas",
+  "account.join_modal.years": "{number, plural, one {ano} other {anos}}",
   "account.joined_short": "Entrou",
   "account.languages": "Mudar idiomas inscritos",
   "account.last_active": "Última atividade",
@@ -95,7 +105,7 @@
   "account.menu.show_reblogs": "Mostrar impulsos na linha do tempo",
   "account.menu.unblock": "Desbloquear conta",
   "account.menu.unblock_domain": "Desbloquear {domain}",
-  "account.menu.unmute": "Dessilenciar conta",
+  "account.menu.unmute": "Deixar de silenciar a conta",
   "account.moved_to": "{name} indicou que sua nova conta agora é:",
   "account.mute": "Silenciar @{name}",
   "account.mute_notifications_short": "Silenciar notificações",
@@ -145,7 +155,7 @@
   "account_edit.advanced_settings.title": "Configurações avançadas",
   "account_edit.bio.add_label": "Adicionar biografia",
   "account_edit.bio.edit_label": "Editar Biografia",
-  "account_edit.bio.placeholder": "Insira uma breve introdução para ajudar os outros a lhe identificar.",
+  "account_edit.bio.placeholder": "Insira uma breve introdução para ajudar as outras pessoas a te identificar.",
   "account_edit.bio.title": "Bio",
   "account_edit.bio_modal.add_title": "Adicionar biografia",
   "account_edit.bio_modal.edit_title": "Editar biografia",
@@ -179,12 +189,12 @@
   "account_edit.field_edit_modal.link_emoji_warning": "Recomendamos não utilizar emojis personalizados combinados com URLs. Campos personalizados contendo ambos serão exibidos apenas como texto em vez de link, para evitar confusão dos usuários.",
   "account_edit.field_edit_modal.name_hint": "Ex. \"Site pessoal\"",
   "account_edit.field_edit_modal.name_label": "Descrição",
-  "account_edit.field_edit_modal.url_warning": "Para adicionar um link, por favor inclia {protocol} no início.",
+  "account_edit.field_edit_modal.url_warning": "Para adicionar um link, inclua {protocol} no início.",
   "account_edit.field_edit_modal.value_hint": "Ex.: \"https://example.me\"",
   "account_edit.field_edit_modal.value_label": "Valor",
   "account_edit.field_reorder_modal.drag_cancel": "O arrasto foi cancelado. O campo \"{item}\" foi descartado.",
   "account_edit.field_reorder_modal.drag_end": "O campo \"{item}\" foi descartado.",
-  "account_edit.field_reorder_modal.drag_instructions": "Para reordenar campos personalizados, pressione espaço ou enter. Enquanto arrasta, utilize as teclas de seta para mover o campo para cima ou para baixo. Pressione espaço ou enter novamente para colocar o campo em sua nova posição, ou pressione Esc para cancelar.",
+  "account_edit.field_reorder_modal.drag_instructions": "Para reordenar campos personalizados, pressione espaço ou enter. Enquanto arrasta, utilize as teclas de seta para mover o campo para cima ou para baixo. Pressione espaço ou enter novamente para colocar o campo em sua nova posição, ou pressione 'Esc' para cancelar.",
   "account_edit.field_reorder_modal.drag_move": "Campo \"{item}\" foi movido.",
   "account_edit.field_reorder_modal.drag_over": "Campo \"{item}\" foi movido para \"{over}\".",
   "account_edit.field_reorder_modal.drag_start": "Campo \"{item}\" foi pego.",
@@ -209,7 +219,7 @@
   "account_edit.name_modal.add_title": "Inserir nome de exibição",
   "account_edit.name_modal.edit_title": "Editar nome de exibição",
   "account_edit.profile_tab.button_label": "Personalizar",
-  "account_edit.profile_tab.hint.description": "Essas configurações definem o que os usuários veem no {servidor} nos apps oficiais, mas podem não se aplicar a usuários em servidores e apps de terceiros.",
+  "account_edit.profile_tab.hint.description": "Essas configurações definem o que os usuários veem no {server} nos apps oficiais, mas podem não se aplicar a usuários em servidores e apps de terceiros.",
   "account_edit.profile_tab.hint.title": "Exibições divergem",
   "account_edit.profile_tab.show_featured.description": "'Em Destaque' é uma aba opcional onde você pode exibir outras contas.",
   "account_edit.profile_tab.show_featured.title": "Mostrar aba \"Destaque\"",
@@ -353,7 +363,7 @@
   "closed_registrations_modal.title": "Inscrevendo-se no Mastodon",
   "collection.share_modal.share_link_label": "Compartilhar link",
   "collection.share_modal.share_via_post": "Postar no Mastodon",
-  "collection.share_modal.share_via_system": "Enviar para...",
+  "collection.share_modal.share_via_system": "Enviar para…",
   "collection.share_modal.title": "Compartilhar coleção",
   "collection.share_modal.title_new": "Compartilhe sua nova coleção!",
   "collection.share_template_other": "Confira esta coleção incrível: {link}",
@@ -398,6 +408,8 @@
   "collections.manage_accounts": "Gerenciar contas",
   "collections.mark_as_sensitive": "Marcar como sensível",
   "collections.mark_as_sensitive_hint": "Oculta a descrição e as contas da coleção por trás de um aviso de conteúdo. O nome da coleção ainda será visível.",
+  "collections.maximum_collection_count_description": "Seu servidor permite a criação de, no máximo, {count} coleções.",
+  "collections.maximum_collection_count_reached": "Você criou a quantidade máxima de coleções",
   "collections.name_length_hint": "limite de 40 caracteres",
   "collections.new_collection": "Nova coleção",
   "collections.no_collections_yet": "Ainda não há coleções.",
@@ -407,7 +419,7 @@
   "collections.revoke_inclusion.confirmation": "Você foi removido de \"{collection}\"",
   "collections.revoke_inclusion.error": "Houve um erro, por favor tente novamente mais tarde.",
   "collections.search_accounts_label": "Pesquisar por uma conta para adicionar",
-  "collections.search_accounts_max_reached": "Você acrescentou o numero máximo de contas",
+  "collections.search_accounts_max_reached": "Você acrescentou o número máximo de contas",
   "collections.sensitive": "Sensível",
   "collections.share_short": "Compartilhar",
   "collections.suggestions.can_not_add": "Não pôde ser adicionado",
@@ -623,9 +635,9 @@
   "empty_column.account_featured_self.no_collections_button": "Criar uma coleção",
   "empty_column.account_featured_self.no_collections_hide_tab": "Ocultar esta aba em vez disso",
   "empty_column.account_featured_self.pre_collections": "Acompanhe este espaço para Coleções",
-  "empty_column.account_featured_self.pre_collections_desc": "Coleções (chegando no mastodon 4.6) permitem que você crie sua própria lista curada de contas para recomendar aos outros.",
+  "empty_column.account_featured_self.pre_collections_desc": "Coleções (chegando no Mastodon 4.6) permitem que você crie sua própria lista curada de contas para recomendar aos outros.",
   "empty_column.account_featured_self.showcase_accounts": "Exibir suas contas favoritas",
-  "empty_column.account_featured_self.showcase_accounts_desc": "Coleçòes são listas curadas de contas que ajudam os outros a descobrir mais do Fediverso.",
+  "empty_column.account_featured_self.showcase_accounts_desc": "Coleções são listas curadas de contas que ajudam os outros a descobrir mais do Fediverso.",
   "empty_column.account_featured_unknown.other": "Esta conta ainda não pôs nada em destaque.",
   "empty_column.account_hides_collections": "A pessoa optou por não disponibilizar esta informação",
   "empty_column.account_suspended": "Conta suspensa",
@@ -716,7 +728,7 @@
   "following.hide_other_following": "Este usuário escolheu não deixar visíveis aqueles a quem segue",
   "following.title": "Seguido por {name}",
   "footer.about": "Sobre",
-  "footer.about_mastodon": "Sobre o mastodon",
+  "footer.about_mastodon": "Sobre o Mastodon",
   "footer.about_server": "Sobre {domain}",
   "footer.about_this_server": "Sobre",
   "footer.directory": "Diretório de perfis",
@@ -1184,6 +1196,7 @@
   "server_banner.active_users": "usuários ativos",
   "server_banner.administered_by": "Administrado por:",
   "server_banner.is_one_of_many": "{domain} é um dos muitos servidores Mastodon independentes que você pode usar para participar do fediverso.",
+  "server_banner.more_about_this_server": "Saiba mais sobre este servidor",
   "server_banner.server_stats": "Estatísticas do servidor:",
   "sign_in_banner.create_account": "Criar conta",
   "sign_in_banner.follow_anyone": "Siga alguém pelo fediverso e veja tudo em ordem cronológica. Sem algoritmos, anúncios ou clickbait à vista.",

app/javascript/mastodon/locales/sq.json

@@ -71,6 +71,16 @@
   "account.go_to_profile": "Kalo te profili",
   "account.hide_reblogs": "Fshih përforcime nga @{name}",
   "account.in_memoriam": "In Memoriam.",
+  "account.join_modal.day": "Ditë",
+  "account.join_modal.me": "U bëtë pjesë e {server} më",
+  "account.join_modal.me_anniversary": "Gëzuar përvjetorin në Fedivers! U bëtë pjesë e {server} më",
+  "account.join_modal.me_today": "Është dita jua e parë në {server}!",
+  "account.join_modal.other": "{name} erdhi në {server} më",
+  "account.join_modal.other_today": "Është dita e parë në {server} për {name}!",
+  "account.join_modal.share.celebrate": "Ndani me të tjerë një postim kremtimi",
+  "account.join_modal.share.intro": "Ndani me të tjerë një postim hyrës",
+  "account.join_modal.share.welcome": "Mdani me të tjerë një postim mirëseardhjeje",
+  "account.join_modal.years": "{number, plural, one {vit} other {vjet}}",
   "account.joined_short": "U bë pjesë",
   "account.languages": "Ndryshoni gjuhë pajtimesh",
   "account.last_active": "Aktiv së fundi më",
@@ -393,6 +403,8 @@
   "collections.manage_accounts": "Administroni llogari",
   "collections.mark_as_sensitive": "Vëri shenjë si rezervat",
   "collections.mark_as_sensitive_hint": "Bën fshehjen e përshkrimit të koleksionit dhe llogarive prapa një sinjalizimi lënde. Emri i koleksionit do të jetë ende i dukshëm.",
+  "collections.maximum_collection_count_description": "Shërbyesi juaj lejon krijimin e deri në {count} koleksioneve.",
+  "collections.maximum_collection_count_reached": "Keni krijuar një numër maksimum koleksionesh",
   "collections.name_length_hint": "Kufi 40 shenja",
   "collections.new_collection": "Koleksion i ri",
   "collections.no_collections_yet": "Ende pa koleksione.",
@@ -1179,6 +1191,7 @@
   "server_banner.active_users": "përdorues aktivë",
   "server_banner.administered_by": "Administruar nga:",
   "server_banner.is_one_of_many": "{domain} është një nga mjaft shërbyes të pavarur Mastodon te të cilët mund të merrni pjesë në Fedivers.",
+  "server_banner.more_about_this_server": "Më tepër rreth këtij shërbyesi",
   "server_banner.server_stats": "Statistika shërbyesi:",
   "sign_in_banner.create_account": "Krijoni llogari",
   "sign_in_banner.follow_anyone": "Ndiqni këdo në Fedivers dhe shihni gjithçka në rend kohor. Pa algortime, apo marifete.",

app/javascript/mastodon/locales/tr.json

@@ -1196,6 +1196,7 @@
   "server_banner.active_users": "etkin kullanıcılar",
   "server_banner.administered_by": "Yönetici:",
   "server_banner.is_one_of_many": "{domain} fediverse katılımı için kullanabileceğiniz birçok bağımsız Mastodon sunucusundan biridir.",
+  "server_banner.more_about_this_server": "Bu sunucu hakkında daha fazla bilgi",
   "server_banner.server_stats": "Sunucu istatistikleri:",
   "sign_in_banner.create_account": "Hesap oluştur",
   "sign_in_banner.follow_anyone": "Fediverse çapında herhangi bir kimseyi takip edin ve tümünü kronolojik sırada görüntüleyin. Algoritma, reklam veya tıklama tuzağı yok.",

app/javascript/mastodon/locales/vi.json

@@ -1196,6 +1196,7 @@
   "server_banner.active_users": "người hoạt động",
   "server_banner.administered_by": "Vận hành:",
   "server_banner.is_one_of_many": "{domain} là một trong nhiều máy chủ Mastodon độc lập mà bạn có thể sử dụng để tham gia vào Fediverse.",
+  "server_banner.more_about_this_server": "Về máy chủ này",
   "server_banner.server_stats": "Thống kê:",
   "sign_in_banner.create_account": "Đăng ký",
   "sign_in_banner.follow_anyone": "Theo dõi bất kỳ ai trên Fediverse và đọc tút theo thứ tự thời gian. Không thuật toán, quảng cáo hoặc clickbait.",

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

@@ -1196,6 +1196,7 @@
   "server_banner.active_users": "活跃用户",
   "server_banner.administered_by": "本站管理员：",
   "server_banner.is_one_of_many": "{domain} 是可用于参与联邦宇宙的众多独立 Mastodon 站点之一。",
+  "server_banner.more_about_this_server": "关于此服务器的更多信息",
   "server_banner.server_stats": "服务器统计数据：",
   "sign_in_banner.create_account": "创建账号",
   "sign_in_banner.follow_anyone": "关注联邦宇宙中的任何人，并按时间顺序查看全部内容。没有算法、广告或诱导链接。",

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

@@ -73,13 +73,13 @@
   "account.in_memoriam": "謹此悼念。",
   "account.join_modal.day": "日",
   "account.join_modal.me": "您加入 {server} 的時間為",
-  "account.join_modal.me_anniversary": "聯邦宇宙週年快了！您加入 {server} 的時間為",
+  "account.join_modal.me_anniversary": "歡慶聯邦宇宙週年！您加入 {server} 的時間為",
   "account.join_modal.me_today": "這是您在 {server} 的第一天！",
   "account.join_modal.other": "{name} 加入 {server} 的時間為",
   "account.join_modal.other_today": "這是 {name} 在 {server} 的第一天！",
-  "account.join_modal.share.celebrate": "分享慶祝嘟文",
-  "account.join_modal.share.intro": "分享介紹嘟文",
-  "account.join_modal.share.welcome": "分享歡迎嘟文",
+  "account.join_modal.share.celebrate": "發一則慶祝嘟文",
+  "account.join_modal.share.intro": "發一則介紹嘟文",
+  "account.join_modal.share.welcome": "發一則歡迎嘟文",
   "account.join_modal.years": "{number, plural, other {年}}",
   "account.joined_short": "加入時間",
   "account.languages": "變更訂閱的語言",
@@ -408,6 +408,8 @@
   "collections.manage_accounts": "管理帳號",
   "collections.mark_as_sensitive": "標記為敏感內容",
   "collections.mark_as_sensitive_hint": "將此收藏名單之說明隱藏於內容警告之後。此收藏名單名稱仍將可見。",
+  "collections.maximum_collection_count_description": "您的伺服器允許新增至多 {count} 個收藏名單。",
+  "collections.maximum_collection_count_reached": "您所建立之收藏名單數量已達上限",
   "collections.name_length_hint": "40 字限制",
   "collections.new_collection": "新增收藏名單",
   "collections.no_collections_yet": "您沒有任何收藏名單。",
@@ -1194,6 +1196,7 @@
   "server_banner.active_users": "活躍使用者",
   "server_banner.administered_by": "管理者：",
   "server_banner.is_one_of_many": "{domain} 為許多獨立的 Mastodon 伺服器之一，您能透過該伺服器參與聯邦宇宙。",
+  "server_banner.more_about_this_server": "更多關於此伺服器",
   "server_banner.server_stats": "伺服器統計：",
   "sign_in_banner.create_account": "新增帳號",
   "sign_in_banner.follow_anyone": "跟隨聯邦宇宙中的任何人，並且以時間順序瀏覽所有內容。沒有演算法、廣告、或騙點擊連結。",