diff --git a/Gemfile.lock b/Gemfile.lock
index 86fcfb84f0..4096fb39d1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -99,8 +99,8 @@ GEM
     ast (2.4.3)
     attr_required (1.0.2)
     aws-eventstream (1.4.0)
-    aws-partitions (1.1220.0)
-    aws-sdk-core (3.242.0)
+    aws-partitions (1.1222.0)
+    aws-sdk-core (3.243.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
diff --git a/app/javascript/mastodon/components/form_fields/emoji_text_field.stories.tsx b/app/javascript/mastodon/components/form_fields/emoji_text_field.stories.tsx
index aed04bbcbf..05df009ecf 100644
--- a/app/javascript/mastodon/components/form_fields/emoji_text_field.stories.tsx
+++ b/app/javascript/mastodon/components/form_fields/emoji_text_field.stories.tsx
@@ -26,13 +26,13 @@ export const Simple: Story = {};
 
 export const WithMaxLength: Story = {
   args: {
-    maxLength: 20,
+    counterMax: 20,
   },
 };
 
 export const WithRecommended: Story = {
   args: {
-    maxLength: 20,
+    counterMax: 20,
     recommended: true,
   },
 };
@@ -52,7 +52,7 @@ export const TextArea: Story = {
         value={value}
         onChange={setValue}
         label='Label'
-        maxLength={100}
+        counterMax={100}
       />
     );
   },
diff --git a/app/javascript/mastodon/components/form_fields/emoji_text_field.tsx b/app/javascript/mastodon/components/form_fields/emoji_text_field.tsx
index 9c29bcbf91..a57c4d1dd4 100644
--- a/app/javascript/mastodon/components/form_fields/emoji_text_field.tsx
+++ b/app/javascript/mastodon/components/form_fields/emoji_text_field.tsx
@@ -26,7 +26,7 @@ import { TextInput } from './text_input_field';
 export type EmojiInputProps = {
   value?: string;
   onChange?: Dispatch<SetStateAction<string>>;
-  maxLength?: number;
+  counterMax?: number;
   recommended?: boolean;
 } & Omit<CommonFieldWrapperProps, 'wrapperClassName'>;
 
@@ -39,6 +39,7 @@ export const EmojiTextInputField: FC<
   hint,
   hasError,
   maxLength,
+  counterMax = maxLength,
   recommended,
   disabled,
   ...otherProps
@@ -49,7 +50,7 @@ export const EmojiTextInputField: FC<
     label,
     hint,
     hasError,
-    maxLength,
+    counterMax,
     recommended,
     disabled,
     inputRef,
@@ -63,6 +64,7 @@ export const EmojiTextInputField: FC<
         <TextInput
           {...inputProps}
           {...otherProps}
+          maxLength={maxLength}
           value={value}
           ref={inputRef}
         />
@@ -78,7 +80,8 @@ export const EmojiTextAreaField: FC<
   value,
   label,
   maxLength,
-  recommended = false,
+  counterMax = maxLength,
+  recommended,
   disabled,
   hint,
   hasError,
@@ -90,7 +93,7 @@ export const EmojiTextAreaField: FC<
     label,
     hint,
     hasError,
-    maxLength,
+    counterMax,
     recommended,
     disabled,
     inputRef: textareaRef,
@@ -104,6 +107,7 @@ export const EmojiTextAreaField: FC<
         <TextArea
           {...otherProps}
           {...inputProps}
+          maxLength={maxLength}
           value={value}
           ref={textareaRef}
         />
@@ -126,7 +130,7 @@ const EmojiFieldWrapper: FC<
   children,
   disabled,
   inputRef,
-  maxLength,
+  counterMax,
   recommended = false,
   ...otherProps
 }) => {
@@ -159,10 +163,10 @@ const EmojiFieldWrapper: FC<
         <>
           {children({ ...inputProps, onChange: handleChange })}
           <EmojiPickerButton onPick={handlePickEmoji} disabled={disabled} />
-          {maxLength && (
+          {counterMax && (
             <CharacterCounter
               currentString={value ?? ''}
-              maxLength={maxLength}
+              maxLength={counterMax}
               recommended={recommended}
               id={counterId}
             />
diff --git a/app/javascript/mastodon/features/account_edit/components/field.tsx b/app/javascript/mastodon/features/account_edit/components/field.tsx
new file mode 100644
index 0000000000..703a81b869
--- /dev/null
+++ b/app/javascript/mastodon/features/account_edit/components/field.tsx
@@ -0,0 +1,29 @@
+import type { FC } from 'react';
+
+import { EmojiHTML } from '@/mastodon/components/emoji/html';
+import type { useElementHandledLink } from '@/mastodon/components/status/handled_link';
+import type { FieldData } from '@/mastodon/reducers/slices/profile_edit';
+
+import classes from '../styles.module.scss';
+
+export const AccountField: FC<
+  FieldData & Partial<ReturnType<typeof useElementHandledLink>>
+> = ({ onElement, ...field }) => {
+  return (
+    <>
+      <EmojiHTML
+        as='h2'
+        htmlString={field.name}
+        className={classes.fieldName}
+        onElement={onElement}
+      />
+
+      <EmojiHTML
+        as='p'
+        htmlString={field.value}
+        className={classes.fieldValue}
+        onElement={onElement}
+      />
+    </>
+  );
+};
diff --git a/app/javascript/mastodon/features/account_edit/index.tsx b/app/javascript/mastodon/features/account_edit/index.tsx
index 45b55f46bf..43a13f612a 100644
--- a/app/javascript/mastodon/features/account_edit/index.tsx
+++ b/app/javascript/mastodon/features/account_edit/index.tsx
@@ -21,6 +21,7 @@ import { useAppDispatch, useAppSelector } from '@/mastodon/store';
 
 import { AccountEditColumn, AccountEditEmptyColumn } from './components/column';
 import { EditButton } from './components/edit_button';
+import { AccountField } from './components/field';
 import { AccountFieldActions } from './components/field_actions';
 import { AccountEditSection } from './components/section';
 import classes from './styles.module.scss';
@@ -99,6 +100,16 @@ export const AccountEdit: FC = () => {
     void dispatch(fetchProfile());
   }, [dispatch]);
 
+  const maxFieldCount = useAppSelector(
+    (state) =>
+      (state.server.getIn([
+        'server',
+        'configuration',
+        'accounts',
+        'max_profile_fields',
+      ]) as number | undefined) ?? 4,
+  );
+
   const handleOpenModal = useCallback(
     (type: ModalType, props?: Record<string, unknown>) => {
       dispatch(openModal({ modalType: type, modalProps: props ?? {} }));
@@ -111,6 +122,12 @@ export const AccountEdit: FC = () => {
   const handleBioEdit = useCallback(() => {
     handleOpenModal('ACCOUNT_EDIT_BIO');
   }, [handleOpenModal]);
+  const handleCustomFieldAdd = useCallback(() => {
+    handleOpenModal('ACCOUNT_EDIT_FIELD_EDIT');
+  }, [handleOpenModal]);
+  const handleCustomFieldReorder = useCallback(() => {
+    handleOpenModal('ACCOUNT_EDIT_FIELDS_REORDER');
+  }, [handleOpenModal]);
   const handleCustomFieldsVerifiedHelp = useCallback(() => {
     handleOpenModal('ACCOUNT_EDIT_VERIFY_LINKS');
   }, [handleOpenModal]);
@@ -186,25 +203,44 @@ export const AccountEdit: FC = () => {
           title={messages.customFieldsTitle}
           description={messages.customFieldsPlaceholder}
           showDescription={!hasFields}
-        >
-          <ol>
-            {profile.fields.map((field) => (
-              <li key={field.id} className={classes.field}>
-                <div>
-                  <EmojiHTML
-                    htmlString={field.name}
-                    className={classes.fieldName}
-                    {...htmlHandlers}
+          buttons={
+            <>
+              {profile.fields.length > 1 && (
+                <Button
+                  className={classes.editButton}
+                  onClick={handleCustomFieldReorder}
+                >
+                  <FormattedMessage
+                    id='account_edit.custom_fields.reorder_button'
+                    defaultMessage='Reorder fields'
                   />
-                  <EmojiHTML htmlString={field.value} {...htmlHandlers} />
-                </div>
-                <AccountFieldActions
-                  item={intl.formatMessage(messages.customFieldsName)}
-                  id={field.id}
+                </Button>
+              )}
+              {hasFields && (
+                <EditButton
+                  item={messages.customFieldsName}
+                  onClick={handleCustomFieldAdd}
+                  disabled={profile.fields.length >= maxFieldCount}
                 />
-              </li>
-            ))}
-          </ol>
+              )}
+            </>
+          }
+        >
+          {hasFields && (
+            <ol>
+              {profile.fields.map((field) => (
+                <li key={field.id} className={classes.field}>
+                  <div>
+                    <AccountField {...field} {...htmlHandlers} />
+                  </div>
+                  <AccountFieldActions
+                    item={intl.formatMessage(messages.customFieldsName)}
+                    id={field.id}
+                  />
+                </li>
+              ))}
+            </ol>
+          )}
           <Button
             onClick={handleCustomFieldsVerifiedHelp}
             className={classes.verifiedLinkHelpButton}
diff --git a/app/javascript/mastodon/features/account_edit/modals/bio_modal.tsx b/app/javascript/mastodon/features/account_edit/modals/bio_modal.tsx
index 13547aacd1..ff4febeebb 100644
--- a/app/javascript/mastodon/features/account_edit/modals/bio_modal.tsx
+++ b/app/javascript/mastodon/features/account_edit/modals/bio_modal.tsx
@@ -4,11 +4,14 @@ import type { FC } from 'react';
 import { defineMessages, useIntl } from 'react-intl';
 
 import { EmojiTextAreaField } from '@/mastodon/components/form_fields';
+import type { TextAreaProps } from '@/mastodon/components/form_fields/text_area_field';
 import type { BaseConfirmationModalProps } from '@/mastodon/features/ui/components/confirmation_modals';
 import { ConfirmationModal } from '@/mastodon/features/ui/components/confirmation_modals';
 import { patchProfile } from '@/mastodon/reducers/slices/profile_edit';
 import { useAppDispatch, useAppSelector } from '@/mastodon/store';
 
+import classes from './styles.module.scss';
+
 const messages = defineMessages({
   addTitle: {
     id: 'account_edit.bio_modal.add_title',
@@ -49,6 +52,12 @@ export const BioModal: FC<BaseConfirmationModalProps> = ({ onClose }) => {
     }
   }, [dispatch, isPending, newBio, onClose]);
 
+  // TypeScript isn't correctly picking up minRows when on the element directly.
+  const textAreaProps = {
+    autoSize: true,
+    minRows: 3,
+  } as const satisfies TextAreaProps;
+
   return (
     <ConfirmationModal
       title={intl.formatMessage(bio ? messages.editTitle : messages.addTitle)}
@@ -66,9 +75,10 @@ export const BioModal: FC<BaseConfirmationModalProps> = ({ onClose }) => {
         onChange={setNewBio}
         aria-labelledby={titleId}
         maxLength={maxLength}
+        className={classes.bioField}
+        {...textAreaProps}
         // eslint-disable-next-line jsx-a11y/no-autofocus -- This is a modal, it's fine.
         autoFocus
-        autoSize
       />
     </ConfirmationModal>
   );
diff --git a/app/javascript/mastodon/features/account_edit/modals/fields_modals.tsx b/app/javascript/mastodon/features/account_edit/modals/fields_modals.tsx
index 6a8fdc96ba..c7b3b6ebc5 100644
--- a/app/javascript/mastodon/features/account_edit/modals/fields_modals.tsx
+++ b/app/javascript/mastodon/features/account_edit/modals/fields_modals.tsx
@@ -1,4 +1,4 @@
-import { useCallback, useState } from 'react';
+import { useCallback, useMemo, useState } from 'react';
 import type { FC } from 'react';
 
 import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
@@ -6,6 +6,7 @@ import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
 import type { Map as ImmutableMap } from 'immutable';
 
 import { Button } from '@/mastodon/components/button';
+import { Callout } from '@/mastodon/components/callout';
 import { EmojiTextInputField } from '@/mastodon/components/form_fields';
 import {
   removeField,
@@ -49,12 +50,18 @@ const messages = defineMessages({
     id: 'account_edit.field_edit_modal.value_hint',
     defaultMessage: 'E.g. “example.me”',
   },
+  limitHeader: {
+    id: 'account_edit.field_edit_modal.limit_header',
+    defaultMessage: 'Recommended character limit exceeded',
+  },
   save: {
     id: 'account_edit.save',
     defaultMessage: 'Save',
   },
 });
 
+// We have two different values- the hard limit set by the server,
+// and the soft limit for mobile display.
 const selectFieldLimits = createAppSelector(
   [
     (state) =>
@@ -68,6 +75,13 @@ const selectFieldLimits = createAppSelector(
   }),
 );
 
+const RECOMMENDED_LIMIT = 40;
+
+const selectEmojiCodes = createAppSelector(
+  [(state) => state.custom_emojis],
+  (emojis) => emojis.map((emoji) => emoji.get('shortcode')).toArray(),
+);
+
 export const EditFieldModal: FC<DialogModalProps & { fieldKey?: string }> = ({
   onClose,
   fieldKey,
@@ -86,6 +100,16 @@ export const EditFieldModal: FC<DialogModalProps & { fieldKey?: string }> = ({
     newLabel.length > nameLimit ||
     newValue.length > valueLimit;
 
+  const customEmojiCodes = useAppSelector(selectEmojiCodes);
+  const hasLinkAndEmoji = useMemo(() => {
+    const text = `${newLabel} ${newValue}`; // Combine text, as we're searching it all.
+    const hasLink = /https?:\/\//.test(text);
+    const hasEmoji = customEmojiCodes.some((code) =>
+      text.includes(`:${code}:`),
+    );
+    return hasLink && hasEmoji;
+  }, [customEmojiCodes, newLabel, newValue]);
+
   const dispatch = useAppDispatch();
   const handleSave = useCallback(() => {
     if (disabled || isPending) {
@@ -116,6 +140,8 @@ export const EditFieldModal: FC<DialogModalProps & { fieldKey?: string }> = ({
         label={intl.formatMessage(messages.editLabelField)}
         hint={intl.formatMessage(messages.editLabelHint)}
         maxLength={nameLimit}
+        counterMax={RECOMMENDED_LIMIT}
+        recommended
       />
 
       <EmojiTextInputField
@@ -124,7 +150,31 @@ export const EditFieldModal: FC<DialogModalProps & { fieldKey?: string }> = ({
         label={intl.formatMessage(messages.editValueField)}
         hint={intl.formatMessage(messages.editValueHint)}
         maxLength={valueLimit}
+        counterMax={RECOMMENDED_LIMIT}
+        recommended
       />
+
+      {hasLinkAndEmoji && (
+        <Callout variant='warning'>
+          <FormattedMessage
+            id='account_edit.field_edit_modal.link_emoji_warning'
+            defaultMessage='We recommend against the use of custom emoji in combination with urls. Custom fields containing both will display as text only instead of as a link, in order to prevent user confusion.'
+          />
+        </Callout>
+      )}
+
+      {(newLabel.length > RECOMMENDED_LIMIT ||
+        newValue.length > RECOMMENDED_LIMIT) && (
+        <Callout
+          variant='warning'
+          title={intl.formatMessage(messages.limitHeader)}
+        >
+          <FormattedMessage
+            id='account_edit.field_edit_modal.limit_message'
+            defaultMessage='Mobile users might not see your field in full.'
+          />
+        </Callout>
+      )}
     </ConfirmationModal>
   );
 };
@@ -165,11 +215,3 @@ export const DeleteFieldModal: FC<DialogModalProps & { fieldKey: string }> = ({
     </DialogModal>
   );
 };
-
-export const RearrangeFieldsModal: FC<DialogModalProps> = ({ onClose }) => {
-  return (
-    <DialogModal onClose={onClose} title='Not implemented yet'>
-      <p>Not implemented yet</p>
-    </DialogModal>
-  );
-};
diff --git a/app/javascript/mastodon/features/account_edit/modals/fields_reorder_modal.tsx b/app/javascript/mastodon/features/account_edit/modals/fields_reorder_modal.tsx
new file mode 100644
index 0000000000..5eee431a27
--- /dev/null
+++ b/app/javascript/mastodon/features/account_edit/modals/fields_reorder_modal.tsx
@@ -0,0 +1,322 @@
+import type { FC, KeyboardEventHandler } from 'react';
+import { useState, useCallback, useMemo } from 'react';
+
+import { defineMessages, useIntl } from 'react-intl';
+
+import classNames from 'classnames';
+
+import type {
+  DragEndEvent,
+  ScreenReaderInstructions,
+  Announcements,
+  Active,
+} from '@dnd-kit/core';
+import {
+  useSensors,
+  useSensor,
+  PointerSensor,
+  KeyboardSensor,
+  DndContext,
+  closestCenter,
+} from '@dnd-kit/core';
+import {
+  restrictToVerticalAxis,
+  restrictToParentElement,
+} from '@dnd-kit/modifiers';
+import {
+  arrayMove,
+  sortableKeyboardCoordinates,
+  SortableContext,
+  useSortable,
+  verticalListSortingStrategy,
+} from '@dnd-kit/sortable';
+import { CSS } from '@dnd-kit/utilities';
+
+import { CustomEmojiProvider } from '@/mastodon/components/emoji/context';
+import { normalizeKey } from '@/mastodon/components/hotkeys/utils';
+import { Icon } from '@/mastodon/components/icon';
+import type { FieldData } from '@/mastodon/reducers/slices/profile_edit';
+import {
+  patchProfile,
+  selectFieldById,
+} from '@/mastodon/reducers/slices/profile_edit';
+import {
+  createAppSelector,
+  useAppDispatch,
+  useAppSelector,
+} from '@/mastodon/store';
+import DragIndicatorIcon from '@/material-icons/400-24px/drag_indicator.svg?react';
+
+import { ConfirmationModal } from '../../ui/components/confirmation_modals';
+import type { DialogModalProps } from '../../ui/components/dialog_modal';
+import { AccountField } from '../components/field';
+
+import classes from './styles.module.scss';
+
+const messages = defineMessages({
+  rearrangeTitle: {
+    id: 'account_edit.field_reorder_modal.title',
+    defaultMessage: 'Rearrange fields',
+  },
+  handleLabel: {
+    id: 'account_edit.field_reorder_modal.handle_label',
+    defaultMessage: 'Drag field "{item}"',
+  },
+  screenReaderInstructions: {
+    id: 'account_edit.field_reorder_modal.drag_instructions',
+    defaultMessage:
+      'To rearrange custom fields, press space or enter. While dragging, use the arrow keys to move the field up or down. Press space or enter again to drop the field in its new position, or press escape to cancel.',
+  },
+  onDragStart: {
+    id: 'account_edit.field_reorder_modal.drag_start',
+    defaultMessage: 'Picked up field "{item}".',
+  },
+  onDragMove: {
+    id: 'account_edit.field_reorder_modal.drag_move',
+    defaultMessage: 'Field "{item}" was moved.',
+  },
+  onDragMoveOver: {
+    id: 'account_edit.field_reorder_modal.drag_over',
+    defaultMessage: 'Field "{item}" was moved over "{over}".',
+  },
+  onDragEnd: {
+    id: 'account_edit.field_reorder_modal.drag_end',
+    defaultMessage: 'Field "{item}" was dropped.',
+  },
+  onDragCancel: {
+    id: 'account_edit.field_reorder_modal.drag_cancel',
+    defaultMessage: 'Dragging was cancelled. Field "{item}" was dropped.',
+  },
+  save: {
+    id: 'account_edit.save',
+    defaultMessage: 'Save',
+  },
+});
+
+const selectFields = createAppSelector(
+  [(state) => state.profileEdit],
+  ({ isPending, profile }) => ({
+    isPending: isPending,
+    fields: profile?.fields ?? [],
+  }),
+);
+
+export const ReorderFieldsModal: FC<DialogModalProps> = ({ onClose }) => {
+  const intl = useIntl();
+  const { fields, isPending } = useAppSelector(selectFields);
+  const [fieldKeys, setFieldKeys] = useState<string[]>(
+    fields.map((field) => field.id),
+  );
+
+  const [isDragging, setIsDragging] = useState(false);
+  const handleDragStart = useCallback(() => {
+    setIsDragging(true);
+  }, []);
+  const handleDragEnd = useCallback((event: DragEndEvent) => {
+    const { active, over } = event;
+
+    setFieldKeys((prev) => {
+      if (!over) {
+        return prev;
+      }
+      const oldIndex = prev.indexOf(active.id as string);
+      const newIndex = prev.indexOf(over.id as string);
+
+      return arrayMove(prev, oldIndex, newIndex);
+    });
+    setIsDragging(false);
+  }, []);
+
+  // Combines the Escape shortcut for closing the modal and for cancelling the drag, depending on the current state.
+  const handleEscape: KeyboardEventHandler = useCallback(
+    (event) => {
+      const key = normalizeKey(event.key);
+      if (key === 'Escape') {
+        // Stops propagation to avoid triggering the handler in ModalRoot.
+        event.stopPropagation();
+
+        // Trigger the drag cancel here, since onDragCancel triggers before this handler.
+        if (isDragging) {
+          setIsDragging(false);
+        } else {
+          onClose();
+        }
+      }
+    },
+    [isDragging, onClose],
+  );
+
+  const sensors = useSensors(
+    useSensor(PointerSensor, {
+      activationConstraint: {
+        distance: 5,
+      },
+    }),
+    useSensor(KeyboardSensor, {
+      coordinateGetter: sortableKeyboardCoordinates,
+    }),
+  );
+
+  const accessibility: {
+    screenReaderInstructions: ScreenReaderInstructions;
+    announcements: Announcements;
+  } = useMemo(
+    () => ({
+      screenReaderInstructions: {
+        draggable: intl.formatMessage(messages.screenReaderInstructions),
+      },
+
+      announcements: {
+        onDragStart({ active }) {
+          return intl.formatMessage(messages.onDragStart, {
+            item: labelFromActive(active),
+          });
+        },
+
+        onDragOver({ active, over }) {
+          if (over && active.id !== over.id) {
+            return intl.formatMessage(messages.onDragMoveOver, {
+              item: labelFromActive(active),
+              over: labelFromActive(over),
+            });
+          }
+          return intl.formatMessage(messages.onDragMove, {
+            item: labelFromActive(active),
+          });
+        },
+
+        onDragEnd({ active }) {
+          return intl.formatMessage(messages.onDragEnd, {
+            item: labelFromActive(active),
+          });
+        },
+
+        onDragCancel({ active }) {
+          return intl.formatMessage(messages.onDragCancel, {
+            item: labelFromActive(active),
+          });
+        },
+      },
+    }),
+    [intl],
+  );
+
+  const dispatch = useAppDispatch();
+  const handleSave = useCallback(() => {
+    const newFields: Pick<FieldData, 'name' | 'value'>[] = [];
+    for (const key of fieldKeys) {
+      const field = fields.find((f) => f.id === key);
+      if (!field) {
+        console.warn(`Field with id ${key} not found, closing modal.`);
+        onClose();
+        return;
+      }
+      newFields.push({ name: field.name, value: field.value });
+
+      void dispatch(patchProfile({ fields_attributes: newFields })).then(
+        onClose,
+      );
+    }
+  }, [dispatch, fieldKeys, fields, onClose]);
+
+  const emojis = useAppSelector((state) => state.custom_emojis);
+
+  return (
+    // Add a wrapper here in the capture phase, so that it can be intercepted before the window listener in ModalRoot.
+    <div onKeyUpCapture={handleEscape}>
+      <ConfirmationModal
+        onClose={onClose}
+        title={intl.formatMessage(messages.rearrangeTitle)}
+        confirm={intl.formatMessage(messages.save)}
+        onConfirm={handleSave}
+        className={classes.wrapper}
+        updating={isPending}
+        noFocusButton
+      >
+        <DndContext
+          sensors={sensors}
+          collisionDetection={closestCenter}
+          onDragStart={handleDragStart}
+          onDragEnd={handleDragEnd}
+          modifiers={[restrictToVerticalAxis, restrictToParentElement]}
+          accessibility={accessibility}
+        >
+          <SortableContext
+            items={fieldKeys}
+            strategy={verticalListSortingStrategy}
+            disabled={isPending}
+          >
+            <CustomEmojiProvider emojis={emojis}>
+              <ol>
+                {fieldKeys.map((key) => (
+                  <ReorderFieldItem key={key} id={key} />
+                ))}
+              </ol>
+            </CustomEmojiProvider>
+          </SortableContext>
+        </DndContext>
+      </ConfirmationModal>
+    </div>
+  );
+};
+
+const ReorderFieldItem: FC<{ id: string }> = ({ id }) => {
+  const intl = useIntl();
+  const field = useAppSelector((state) => selectFieldById(state, id));
+  const {
+    attributes,
+    listeners,
+    setNodeRef,
+    transform,
+    transition,
+    isDragging,
+    newIndex,
+    overIndex,
+  } = useSortable({
+    id,
+    data: {
+      label: field?.name ?? id,
+    },
+  });
+
+  if (!field) {
+    return null;
+  }
+
+  const style = {
+    transform: CSS.Translate.toString(transform),
+    transition,
+  };
+
+  return (
+    <li
+      ref={setNodeRef}
+      className={classNames(
+        classes.field,
+        isDragging && classes.fieldDragging,
+        !isDragging && newIndex > 0 && classes.fieldNotFirst,
+        !isDragging && newIndex + 1 === overIndex && classes.fieldActiveUnder,
+      )}
+      style={style}
+    >
+      <Icon
+        icon={DragIndicatorIcon}
+        id='drag'
+        className={classes.fieldHandle}
+        aria-label={intl.formatMessage(messages.handleLabel, {
+          item: field.name,
+        })}
+        {...listeners}
+        {...attributes}
+      />
+      <AccountField {...field} />
+    </li>
+  );
+};
+
+function labelFromActive(item: Pick<Active, 'id' | 'data'>) {
+  if (item.data.current?.label) {
+    return item.data.current.label as string;
+  }
+  return item.id as string;
+}
diff --git a/app/javascript/mastodon/features/account_edit/modals/index.ts b/app/javascript/mastodon/features/account_edit/modals/index.ts
index 4240544c51..861e81f597 100644
--- a/app/javascript/mastodon/features/account_edit/modals/index.ts
+++ b/app/javascript/mastodon/features/account_edit/modals/index.ts
@@ -1,5 +1,6 @@
 export * from './bio_modal';
 export * from './fields_modals';
+export * from './fields_reorder_modal';
 export * from './name_modal';
 export * from './profile_display_modal';
 export * from './verified_modal';
diff --git a/app/javascript/mastodon/features/account_edit/modals/name_modal.tsx b/app/javascript/mastodon/features/account_edit/modals/name_modal.tsx
index 32fd70024e..07779a02a7 100644
--- a/app/javascript/mastodon/features/account_edit/modals/name_modal.tsx
+++ b/app/javascript/mastodon/features/account_edit/modals/name_modal.tsx
@@ -66,7 +66,7 @@ export const NameModal: FC<BaseConfirmationModalProps> = ({ onClose }) => {
         value={newName}
         onChange={setNewName}
         aria-labelledby={titleId}
-        maxLength={maxLength}
+        counterMax={maxLength}
         label=''
         // eslint-disable-next-line jsx-a11y/no-autofocus -- This is a modal, it's fine.
         autoFocus
diff --git a/app/javascript/mastodon/features/account_edit/modals/styles.module.scss b/app/javascript/mastodon/features/account_edit/modals/styles.module.scss
index 4c00f85cfe..0bd4c07a15 100644
--- a/app/javascript/mastodon/features/account_edit/modals/styles.module.scss
+++ b/app/javascript/mastodon/features/account_edit/modals/styles.module.scss
@@ -2,6 +2,12 @@
   display: flex;
   gap: 16px;
   flex-direction: column;
+  font-size: 15px;
+}
+
+.bioField {
+  // 160px is approx the height of the modal header and footer
+  max-height: calc(80vh - 160px);
 }
 
 .toggleInputWrapper {
@@ -14,6 +20,66 @@
   }
 }
 
+.field {
+  padding: 12px 0;
+  display: grid;
+  grid-template-columns: auto 1fr;
+  grid-template-rows: auto auto;
+  column-gap: 12px;
+  touch-action: none;
+  position: relative;
+}
+
+.fieldNotFirst::before,
+.fieldActiveUnder::after {
+  content: '';
+  position: absolute;
+  left: 0;
+  right: 0;
+  height: 1px;
+  background: var(--color-border-primary);
+}
+
+.fieldNotFirst::before {
+  top: 0;
+}
+
+.fieldActiveUnder::after {
+  bottom: -1px; // -1px to cover the border of the next field
+}
+
+.fieldHandle {
+  grid-row: span 2;
+  padding: 8px 0;
+  align-self: center;
+  border-radius: 4px;
+  background: var(--color-bg-secondary);
+  cursor: grab;
+  transition: background 0.2s ease-in-out;
+
+  &:hover {
+    background: var(--color-bg-brand-softer);
+  }
+
+  &:focus-visible {
+    outline: var(--outline-focus-default);
+    outline-offset: 2px;
+  }
+}
+
+.fieldDragging {
+  cursor: grabbing;
+
+  p {
+    opacity: 0.7;
+  }
+
+  .fieldHandle {
+    cursor: grabbing;
+    background: var(--color-bg-brand-soft);
+  }
+}
+
 .verifiedSteps {
   font-size: 15px;
 
diff --git a/app/javascript/mastodon/features/account_edit/modals/verified_modal.tsx b/app/javascript/mastodon/features/account_edit/modals/verified_modal.tsx
index 8134950412..fd4d89be02 100644
--- a/app/javascript/mastodon/features/account_edit/modals/verified_modal.tsx
+++ b/app/javascript/mastodon/features/account_edit/modals/verified_modal.tsx
@@ -33,6 +33,7 @@ export const VerifiedModal: FC<DialogModalProps> = ({ onClose }) => {
         />
       }
       noCancelButton
+      wrapperClassName={classes.wrapper}
     >
       <FormattedMessage
         id='account_edit.verified_modal.details'
diff --git a/app/javascript/mastodon/features/account_edit/styles.module.scss b/app/javascript/mastodon/features/account_edit/styles.module.scss
index 9408e80942..bafe1bc5b1 100644
--- a/app/javascript/mastodon/features/account_edit/styles.module.scss
+++ b/app/javascript/mastodon/features/account_edit/styles.module.scss
@@ -35,11 +35,6 @@
   }
 }
 
-.fieldName {
-  color: var(--color-text-secondary);
-  font-size: 13px;
-}
-
 .verifiedLinkHelpButton {
   font-size: 13px;
   font-weight: 600;
@@ -127,6 +122,11 @@
     &:hover {
       background-color: var(--color-bg-brand-softer);
     }
+
+    &:disabled {
+      background-color: var(--color-bg-primary);
+      opacity: 0.5;
+    }
   }
 
   svg {
@@ -141,6 +141,18 @@
   --hover-icon-color: var(--color-text-on-error-base);
 }
 
+// Field component
+
+.fieldName {
+  color: var(--color-text-secondary);
+  font-size: 13px;
+}
+
+.fieldValue {
+  color: var(--color-text-primary);
+  font-size: 15px;
+}
+
 // Item list component
 
 .itemList {
diff --git a/app/javascript/mastodon/locales/be.json b/app/javascript/mastodon/locales/be.json
index f5ddf31936..b4a6c58bfd 100644
--- a/app/javascript/mastodon/locales/be.json
+++ b/app/javascript/mastodon/locales/be.json
@@ -149,7 +149,6 @@
   "account_edit.button.add": "Дадаць {item}",
   "account_edit.button.delete": "Выдаліць {item}",
   "account_edit.button.edit": "Змяніць {item}",
-  "account_edit.char_counter": "{currentLength}/{maxLength} сімвалаў",
   "account_edit.column_button": "Гатова",
   "account_edit.column_title": "Рэдагаваць профіль",
   "account_edit.custom_fields.placeholder": "Дадайце свае займеннікі, знешнія спасылкі ці нешта іншае, чым Вы хацелі б падзяліцца.",
@@ -276,6 +275,8 @@
   "callout.dismiss": "Адхіліць",
   "carousel.current": "<sr>Слайд</sr> {current, number} з {max, number}",
   "carousel.slide": "Слайд {current, number} з {max, number}",
+  "character_counter.recommended": "{currentLength}/{maxLength} рэкамендаваных сімвалаў",
+  "character_counter.required": "{currentLength}/{maxLength} сімвалаў",
   "closed_registrations.other_server_instructions": "Паколькі Mastodon дэцэнтралізаваны, вы можаце стварыць уліковы запіс на іншым серверы і працягваць узаемадзейнічаць з ім.",
   "closed_registrations_modal.description": "Стварэнне ўліковага запісу на {domain} цяпер немагчыма. Заўважце, што няма неабходнасці мець уліковы запіс менавіта на {domain}, каб выкарыстоўваць Mastodon.",
   "closed_registrations_modal.find_another_server": "Знайсці іншы сервер",
@@ -313,8 +314,6 @@
   "collections.edit_details": "Рэдагаваць падрабязнасці",
   "collections.error_loading_collections": "Адбылася памылка падчас загрузкі Вашых калекцый.",
   "collections.hints.accounts_counter": "{count} / {max} уліковых запісаў",
-  "collections.hints.add_more_accounts": "Дадайце як мінімум {count, plural, one {# уліковы запіс} few{# ўліковыя запісы} other {# уліковых запісаў}}, каб працягнуць",
-  "collections.hints.can_not_remove_more_accounts": "У калекцыі мусіць быць як мінімум {count, plural, one {# уліковы запіс} few{# ўліковыя запісы} other {# уліковых запісаў}}. Немагчыма прыбраць больш уліковых запісаў.",
   "collections.last_updated_at": "Апошняе абнаўленне: {date}",
   "collections.manage_accounts": "Кіраванне ўліковымі запісамі",
   "collections.mark_as_sensitive": "Пазначыць як адчувальную",
diff --git a/app/javascript/mastodon/locales/cs.json b/app/javascript/mastodon/locales/cs.json
index e79fafa076..d79d67d4da 100644
--- a/app/javascript/mastodon/locales/cs.json
+++ b/app/javascript/mastodon/locales/cs.json
@@ -141,7 +141,6 @@
   "account.unmute_notifications_short": "Zrušit ztlumení oznámení",
   "account.unmute_short": "Zrušit skrytí",
   "account_edit.bio.placeholder": "Přidejte krátký úvod a pomozte ostatním vás poznat.",
-  "account_edit.char_counter": "{currentLength}/{maxLength} znaků",
   "account_edit.column_button": "Hotovo",
   "account_edit.column_title": "Upravit profil",
   "account_edit.custom_fields.placeholder": "Přidejte svá zájmena, externí odkazy nebo cokoliv jiného, co chcete sdílet.",
diff --git a/app/javascript/mastodon/locales/cy.json b/app/javascript/mastodon/locales/cy.json
index d53972f052..abd6056969 100644
--- a/app/javascript/mastodon/locales/cy.json
+++ b/app/javascript/mastodon/locales/cy.json
@@ -149,7 +149,6 @@
   "account_edit.button.add": "Ychwanegu {item}",
   "account_edit.button.delete": "Dileu {item}",
   "account_edit.button.edit": "Golygu {item}",
-  "account_edit.char_counter": "{currentLength}/{maxLength} nod",
   "account_edit.column_button": "Gorffen",
   "account_edit.column_title": "Golygu Proffil",
   "account_edit.custom_fields.placeholder": "Ychwanegwch eich rhagenwau, dolenni allanol, neu unrhyw beth arall hoffech ei rannu.",
@@ -312,8 +311,6 @@
   "collections.edit_details": "Golygu manylion",
   "collections.error_loading_collections": "Bu gwall wrth geisio llwytho eich casgliadau.",
   "collections.hints.accounts_counter": "{count} / {max} cyfrif",
-  "collections.hints.add_more_accounts": "Ychwanegwch o leiaf {count, plural, one {# cyfrif} other {# cyfrif}} i barhau",
-  "collections.hints.can_not_remove_more_accounts": "Rhaid i gasgliadau gynnwys o leiaf {count, plural, one {# cyfrif} other {# cyfrif}}. Nid yw'n bosibl dileu mwy o gyfrifon.",
   "collections.last_updated_at": "Diweddarwyd ddiwethaf: {date}",
   "collections.manage_accounts": "Rheoli cyfrifon",
   "collections.mark_as_sensitive": "Marcio fel sensitif",
diff --git a/app/javascript/mastodon/locales/da.json b/app/javascript/mastodon/locales/da.json
index b778efb8c3..12f05b0324 100644
--- a/app/javascript/mastodon/locales/da.json
+++ b/app/javascript/mastodon/locales/da.json
@@ -149,16 +149,28 @@
   "account_edit.button.add": "Tilføj {item}",
   "account_edit.button.delete": "Slet {item}",
   "account_edit.button.edit": "Rediger {item}",
-  "account_edit.char_counter": "{currentLength}/{maxLength} tegn",
   "account_edit.column_button": "Færdig",
   "account_edit.column_title": "Rediger profil",
+  "account_edit.custom_fields.name": "felt",
   "account_edit.custom_fields.placeholder": "Tilføj dine pronominer, eksterne links eller andet, du gerne vil dele.",
+  "account_edit.custom_fields.tip_content": "Du kan nemt øge troværdigheden af din Mastodon-konto ved at verificere links til alle websteder, du ejer.",
+  "account_edit.custom_fields.tip_title": "Tip: Tilføjelse af bekræftede links",
   "account_edit.custom_fields.title": "Brugerdefinerede felter",
+  "account_edit.custom_fields.verified_hint": "Hvordan tilføjer jeg et bekræftet link?",
   "account_edit.display_name.placeholder": "Dit visningsnavn er det navn, der vises på din profil og i tidslinjer.",
   "account_edit.display_name.title": "Visningsnavn",
   "account_edit.featured_hashtags.item": "hashtags",
   "account_edit.featured_hashtags.placeholder": "Hjælp andre med at identificere og få hurtig adgang til dine yndlingsemner.",
   "account_edit.featured_hashtags.title": "Fremhævede hashtags",
+  "account_edit.field_delete_modal.confirm": "Er du sikker på, at du vil slette dette brugerdefinerede felt? Denne handling kan ikke fortrydes.",
+  "account_edit.field_delete_modal.delete_button": "Slet",
+  "account_edit.field_delete_modal.title": "Slet brugerdefineret felt?",
+  "account_edit.field_edit_modal.add_title": "Tilføj brugerdefineret felt",
+  "account_edit.field_edit_modal.edit_title": "Rediger brugerdefineret felt",
+  "account_edit.field_edit_modal.name_hint": "F.eks. “Personligt websted”",
+  "account_edit.field_edit_modal.name_label": "Etiket",
+  "account_edit.field_edit_modal.value_hint": "F.eks. “eksempel.me”",
+  "account_edit.field_edit_modal.value_label": "Værdi",
   "account_edit.name_modal.add_title": "Tilføj visningsnavn",
   "account_edit.name_modal.edit_title": "Rediger visningsnavn",
   "account_edit.profile_tab.button_label": "Tilpas",
@@ -173,6 +185,13 @@
   "account_edit.profile_tab.subtitle": "Tilpas fanerne på din profil og det, de viser.",
   "account_edit.profile_tab.title": "Indstillinger for profil-fane",
   "account_edit.save": "Gem",
+  "account_edit.verified_modal.details": "Øg troværdigheden af din Mastodon-profil ved at verificere links til personlige websteder. Sådan fungerer det:",
+  "account_edit.verified_modal.invisible_link.details": "Føj linket til din header. Det vigtige er rel=\"me\", som forhindrer imitatorer på websteder med brugergenereret indhold. Du kan endda bruge et link-tag i sidens header i stedet for {tag}, men HTML-koden skal være tilgængelig uden at afvikle JavaScript.",
+  "account_edit.verified_modal.invisible_link.summary": "Hvordan gør jeg linket usynligt?",
+  "account_edit.verified_modal.step1.header": "Kopiér HTML-koden nedenfor og indsæt i headeren på dit websted",
+  "account_edit.verified_modal.step2.details": "Hvis du allerede har tilføjet dit websted som et brugerdefineret felt, skal du slette og tilføje det igen for at udløse bekræftelse.",
+  "account_edit.verified_modal.step2.header": "Tilføj dit websted som et brugerdefineret felt",
+  "account_edit.verified_modal.title": "Sådan tilføjes et bekræftet link",
   "account_edit_tags.add_tag": "Tilføj #{tagName}",
   "account_edit_tags.column_title": "Rediger fremhævede hashtags",
   "account_edit_tags.help_text": "Fremhævede hashtags hjælper brugere med at finde og interagere med din profil. De vises som filtre i aktivitetsvisningen på din profilside.",
@@ -308,15 +327,16 @@
   "collections.delete_collection": "Slet samling",
   "collections.description_length_hint": "Begrænset til 100 tegn",
   "collections.detail.accounts_heading": "Konti",
+  "collections.detail.author_added_you": "{author} tilføjede dig til denne samling",
   "collections.detail.curated_by_author": "Kurateret af {author}",
   "collections.detail.curated_by_you": "Kurateret af dig",
   "collections.detail.loading": "Indlæser samling…",
+  "collections.detail.other_accounts_in_collection": "Andre i denne samling:",
+  "collections.detail.sensitive_note": "Denne samling indeholder konti og indhold, der kan være følsomt for nogle brugere.",
   "collections.detail.share": "Del denne samling",
   "collections.edit_details": "Rediger detaljer",
   "collections.error_loading_collections": "Der opstod en fejl under indlæsning af dine samlinger.",
   "collections.hints.accounts_counter": "{count} / {max} konti",
-  "collections.hints.add_more_accounts": "Tilføj mindst {count, plural, one {# konto} other {# konti}} for at fortsætte",
-  "collections.hints.can_not_remove_more_accounts": "Samlinger skal indeholde mindst {count, plural, one {# konto} other {# konti}}. Det er ikke muligt at fjerne flere konti.",
   "collections.last_updated_at": "Senest opdateret: {date}",
   "collections.manage_accounts": "Administrer konti",
   "collections.mark_as_sensitive": "Markér som sensitiv",
@@ -772,6 +792,7 @@
   "navigation_bar.automated_deletion": "Automatiseret sletning af indlæg",
   "navigation_bar.blocks": "Blokerede brugere",
   "navigation_bar.bookmarks": "Bogmærker",
+  "navigation_bar.collections": "Samlinger",
   "navigation_bar.direct": "Private omtaler",
   "navigation_bar.domain_blocks": "Blokerede domæner",
   "navigation_bar.favourites": "Favoritter",
diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json
index 897d4bb768..b3426e51cc 100644
--- a/app/javascript/mastodon/locales/de.json
+++ b/app/javascript/mastodon/locales/de.json
@@ -149,16 +149,28 @@
   "account_edit.button.add": "{item} hinzufügen",
   "account_edit.button.delete": "{item} löschen",
   "account_edit.button.edit": "{item} bearbeiten",
-  "account_edit.char_counter": "{currentLength}/{maxLength} Zeichen",
   "account_edit.column_button": "Erledigt",
   "account_edit.column_title": "Profil bearbeiten",
+  "account_edit.custom_fields.name": "Feld",
   "account_edit.custom_fields.placeholder": "Ergänze deine Pronomen, weiterführenden Links oder etwas anderes, das du teilen möchtest.",
+  "account_edit.custom_fields.tip_content": "Du kannst deine Echtheit im Mastodon-Profil beweisen, wenn du verifizierte Links zu deinen Websites bereitstellst.",
+  "account_edit.custom_fields.tip_title": "Tipp: Ergänze verifizierte Links",
   "account_edit.custom_fields.title": "Zusatzfelder",
+  "account_edit.custom_fields.verified_hint": "Wie erstelle ich einen verifizierten Link?",
   "account_edit.display_name.placeholder": "Dein Anzeigename wird auf deinem Profil und in Timelines angezeigt.",
   "account_edit.display_name.title": "Anzeigename",
   "account_edit.featured_hashtags.item": "Hashtags",
   "account_edit.featured_hashtags.placeholder": "Präsentiere deine Lieblingsthemen und ermögliche anderen einen schnellen Zugriff darauf.",
   "account_edit.featured_hashtags.title": "Vorgestellte Hashtags",
+  "account_edit.field_delete_modal.confirm": "Möchtest du dieses Zusatzfeld wirklich löschen? Diese Aktion kann nicht rückgängig gemacht werden.",
+  "account_edit.field_delete_modal.delete_button": "Löschen",
+  "account_edit.field_delete_modal.title": "Zusatzfeld löschen?",
+  "account_edit.field_edit_modal.add_title": "Zusatzfeld hinzufügen",
+  "account_edit.field_edit_modal.edit_title": "Zusatzfeld bearbeiten",
+  "account_edit.field_edit_modal.name_hint": "z. B. „Meine Website“",
+  "account_edit.field_edit_modal.name_label": "Beschriftung",
+  "account_edit.field_edit_modal.value_hint": "z. B. „example.me“",
+  "account_edit.field_edit_modal.value_label": "Inhalt",
   "account_edit.name_modal.add_title": "Anzeigenamen hinzufügen",
   "account_edit.name_modal.edit_title": "Anzeigenamen bearbeiten",
   "account_edit.profile_tab.button_label": "Anpassen",
@@ -173,6 +185,13 @@
   "account_edit.profile_tab.subtitle": "Passe die Tabs deines Profils und deren Inhalte an.",
   "account_edit.profile_tab.title": "Profil-Tab-Einstellungen",
   "account_edit.save": "Speichern",
+  "account_edit.verified_modal.details": "Beweise die Echtheit deines Mastodon-Profils, indem du verifizierte Links zu deinen persönlichen Websites ergänzt. So funktioniert’s:",
+  "account_edit.verified_modal.invisible_link.details": "Füge den Link in den Header ein. Der wichtige Teil ist rel=\"me\". Du kannst auch den Tag link im Header (statt {tag}) verwenden, jedoch muss die Internetseite ohne JavaScript abrufbar sein.",
+  "account_edit.verified_modal.invisible_link.summary": "Wie blende ich den Link aus?",
+  "account_edit.verified_modal.step1.header": "Kopiere den unten stehenden HTML-Code und füge ihn in den Header deiner Website ein",
+  "account_edit.verified_modal.step2.details": "Wenn du deine Website bereits in ein Zusatzfeld eingetragen hast, musst du es noch einmal löschen und sie neu hinzufügen, damit die Verifizierung startet.",
+  "account_edit.verified_modal.step2.header": "Ergänze deine Website in ein Zusatzfeld",
+  "account_edit.verified_modal.title": "So erstellst du einen verifizierten Link",
   "account_edit_tags.add_tag": "#{tagName} hinzufügen",
   "account_edit_tags.column_title": "Vorgestellte Hashtags bearbeiten",
   "account_edit_tags.help_text": "Vorgestellte Hashtags können dabei helfen, dein Profil zu entdecken und besser mit dir zu interagieren. Sie dienen als Filter in der Aktivitätenübersicht deines Profils.",
@@ -308,15 +327,16 @@
   "collections.delete_collection": "Sammlung löschen",
   "collections.description_length_hint": "Maximal 100 Zeichen",
   "collections.detail.accounts_heading": "Konten",
+  "collections.detail.author_added_you": "{author} hat dich zur Sammlung hinzugefügt",
   "collections.detail.curated_by_author": "Kuratiert von {author}",
   "collections.detail.curated_by_you": "Kuratiert von dir",
   "collections.detail.loading": "Sammlung wird geladen …",
+  "collections.detail.other_accounts_in_collection": "Weitere Profile in dieser Sammlung:",
+  "collections.detail.sensitive_note": "Diese Sammlung enthält Profile und Inhalte, die manche als anstößig empfinden.",
   "collections.detail.share": "Sammlung teilen",
   "collections.edit_details": "Details bearbeiten",
   "collections.error_loading_collections": "Beim Laden deiner Sammlungen ist ein Fehler aufgetreten.",
   "collections.hints.accounts_counter": "{count}/{max} Konten",
-  "collections.hints.add_more_accounts": "Füge mindestens {count, plural, one {# Konto} other {# Konten}} hinzu, um fortzufahren",
-  "collections.hints.can_not_remove_more_accounts": "Sammlungen müssen mindestens {count, plural, one {# Konto} other {# Konten}} enthalten. Weitere Konten zu entfernen, ist daher nicht erlaubt.",
   "collections.last_updated_at": "Aktualisiert: {date}",
   "collections.manage_accounts": "Profile verwalten",
   "collections.mark_as_sensitive": "Mit Inhaltswarnung versehen",
@@ -772,6 +792,7 @@
   "navigation_bar.automated_deletion": "Automatisiertes Löschen",
   "navigation_bar.blocks": "Blockierte Profile",
   "navigation_bar.bookmarks": "Lesezeichen",
+  "navigation_bar.collections": "Sammlungen",
   "navigation_bar.direct": "Private Erwähnungen",
   "navigation_bar.domain_blocks": "Blockierte Domains",
   "navigation_bar.favourites": "Favoriten",
diff --git a/app/javascript/mastodon/locales/el.json b/app/javascript/mastodon/locales/el.json
index 62c4ed7ca7..49ba9480f3 100644
--- a/app/javascript/mastodon/locales/el.json
+++ b/app/javascript/mastodon/locales/el.json
@@ -149,16 +149,28 @@
   "account_edit.button.add": "Προσθήκη {item}",
   "account_edit.button.delete": "Διαγραφή {item}",
   "account_edit.button.edit": "Επεξεργασία {item}",
-  "account_edit.char_counter": "{currentLength}/{maxLength} χαρακτήρες",
   "account_edit.column_button": "Έγινε",
   "account_edit.column_title": "Επεξεργασία Προφίλ",
+  "account_edit.custom_fields.name": "πεδίο",
   "account_edit.custom_fields.placeholder": "Προσθέστε τις αντωνυμίες σας, εξωτερικούς συνδέσμους ή οτιδήποτε άλλο θέλετε να μοιραστείτε.",
+  "account_edit.custom_fields.tip_content": "Μπορείς εύκολα να προσθέσεις αξιοπιστία στον Mastodon λογαριασμό σου επαληθεύοντας συνδέσμους σε οποιεσδήποτε ιστοσελίδες κατέχεις.",
+  "account_edit.custom_fields.tip_title": "Συμβουλή: Προσθήκη επαληθευμένων συνδέσμων",
   "account_edit.custom_fields.title": "Προσαρμοσμένα πεδία",
+  "account_edit.custom_fields.verified_hint": "Πώς προσθέτω έναν επαληθευμένο σύνδεσμο;",
   "account_edit.display_name.placeholder": "Το εμφανιζόμενο όνομα σας είναι πως εμφανίζεται το όνομά σας στο προφίλ σας και στα χρονοδιαγράμματα.",
   "account_edit.display_name.title": "Εμφανιζόμενο όνομα",
   "account_edit.featured_hashtags.item": "ετικέτες",
   "account_edit.featured_hashtags.placeholder": "Βοηθήστε τους άλλους να εντοπίσουν και να έχουν γρήγορη πρόσβαση στα αγαπημένα σας θέματα.",
   "account_edit.featured_hashtags.title": "Αναδεδειγμένες ετικέτες",
+  "account_edit.field_delete_modal.confirm": "Σίγουρα θέλετε να διαγράψετε αυτό το προσαρμοσμένο πεδίο; Αυτή η ενέργεια δεν μπορεί να αναιρεθεί.",
+  "account_edit.field_delete_modal.delete_button": "Διαγραφή",
+  "account_edit.field_delete_modal.title": "Διαγραφή προσαρμοσμένου πεδίου;",
+  "account_edit.field_edit_modal.add_title": "Προσθήκη προσαρμοσμένου πεδίου",
+  "account_edit.field_edit_modal.edit_title": "Επεξεργασία προσαρμοσμένου πεδίου",
+  "account_edit.field_edit_modal.name_hint": "Π.χ. “Προσωπική ιστοσελίδα”",
+  "account_edit.field_edit_modal.name_label": "Ετικέτα",
+  "account_edit.field_edit_modal.value_hint": "Π.χ. “example.me”",
+  "account_edit.field_edit_modal.value_label": "Τιμή",
   "account_edit.name_modal.add_title": "Προσθήκη εμφανιζόμενου ονόματος",
   "account_edit.name_modal.edit_title": "Επεξεργασία εμφανιζόμενου ονόματος",
   "account_edit.profile_tab.button_label": "Προσαρμογή",
@@ -173,6 +185,13 @@
   "account_edit.profile_tab.subtitle": "Προσαρμόστε τις καρτέλες στο προφίλ σας και τι εμφανίζουν.",
   "account_edit.profile_tab.title": "Ρυθμίσεις καρτέλας προφίλ",
   "account_edit.save": "Αποθήκευση",
+  "account_edit.verified_modal.details": "Πρόσθεσε αξιοπιστία στο Mastodon προφίλ σας επαληθεύοντας συνδέσμους σε προσωπικές ιστοσελίδες. Ορίστε πως δουλεύει:",
+  "account_edit.verified_modal.invisible_link.details": "Πρόσθεσε τον σύνδεσμο στην κεφαλίδα σου. Το σημαντικό μέρος είναι το rel=\"me\" που αποτρέπει την μίμηση σε ιστοσελίδες με περιεχόμενο παραγόμενο από χρήστες. Μπορείς ακόμα να χρησιμοποιήσεις μια ετικέτα link στην κεφαλίδα της σελίδας αντί για {tag}, αλλά η HTML πρέπει να είναι προσβάσιμη χωρίς την εκτέλεση JavaScript.",
+  "account_edit.verified_modal.invisible_link.summary": "Πώς κάνω αυτόν τον σύνδεσμο αόρατο;",
+  "account_edit.verified_modal.step1.header": "Αντίγραψε τον παρακάτω κώδικα HTML και επικόλλησε τον στην κεφαλίδα της ιστοσελίδας σου",
+  "account_edit.verified_modal.step2.details": "Αν έχεις ήδη προσθέσει τον ιστότοπό σου ως προσαρμοσμένο πεδίο, θα χρειαστεί να τον διαγράψεις και να τον προσθέσεις ξανά για να ενεργοποιηθεί η επαλήθευση.",
+  "account_edit.verified_modal.step2.header": "Πρόσθεσε την ιστοσελίδα σου ως προσαρμοσμένο πεδίο",
+  "account_edit.verified_modal.title": "Πώς να προσθέσεις έναν επαληθευμένο σύνδεσμο",
   "account_edit_tags.add_tag": "Προσθήκη #{tagName}",
   "account_edit_tags.column_title": "Επεξεργασία αναδεδειγμένων ετικετών",
   "account_edit_tags.help_text": "Οι αναδεδειγμένες ετικέτες βοηθούν τους χρήστες να ανακαλύψουν και να αλληλεπιδράσουν με το προφίλ σας. Εμφανίζονται ως φίλτρα στην προβολή Δραστηριότητας της σελίδας προφίλ σας.",
@@ -308,15 +327,16 @@
   "collections.delete_collection": "Διαγραφή συλλογής",
   "collections.description_length_hint": "Όριο 100 χαρακτήρων",
   "collections.detail.accounts_heading": "Λογαριασμοί",
+  "collections.detail.author_added_you": "Ο/Η {author} σας πρόσθεσε σε αυτήν τη συλλογή",
   "collections.detail.curated_by_author": "Επιμέλεια από {author}",
   "collections.detail.curated_by_you": "Επιμέλεια από εσάς",
   "collections.detail.loading": "Γίνεται φόρτωση της συλλογής…",
+  "collections.detail.other_accounts_in_collection": "Άλλοι σε αυτήν τη συλλογή:",
+  "collections.detail.sensitive_note": "Αυτή η συλλογή περιέχει λογαριασμούς και περιεχόμενο που μπορεί να είναι ευαίσθητα σε ορισμένους χρήστες.",
   "collections.detail.share": "Κοινοποιήστε αυτήν τη συλλογή",
   "collections.edit_details": "Επεξεργασία λεπτομερειών",
   "collections.error_loading_collections": "Παρουσιάστηκε σφάλμα κατά την προσπάθεια φόρτωσης των συλλογών σας.",
   "collections.hints.accounts_counter": "{count} / {max} λογαριασμοί",
-  "collections.hints.add_more_accounts": "Προσθέστε τουλάχιστον {count, plural, one {# λογαριασμό} other {# λογαριασμούς}} για να συνεχίσετε",
-  "collections.hints.can_not_remove_more_accounts": "Οι συλλογές πρέπει να περιέχουν τουλάχιστον {count, plural, one {# λογαριασμό} other {# λογαριασμούς}}. Δεν είναι δυνατή η αφαίρεση περισσότερων λογαριασμών.",
   "collections.last_updated_at": "Τελευταία ενημέρωση: {date}",
   "collections.manage_accounts": "Διαχείριση λογαριασμών",
   "collections.mark_as_sensitive": "Σήμανση ως ευαίσθητο",
@@ -772,6 +792,7 @@
   "navigation_bar.automated_deletion": "Αυτοματοποιημένη διαγραφή αναρτήσεων",
   "navigation_bar.blocks": "Αποκλεισμένοι χρήστες",
   "navigation_bar.bookmarks": "Σελιδοδείκτες",
+  "navigation_bar.collections": "Συλλογές",
   "navigation_bar.direct": "Ιδιωτικές επισημάνσεις",
   "navigation_bar.domain_blocks": "Αποκλεισμένοι τομείς",
   "navigation_bar.favourites": "Αγαπημένα",
diff --git a/app/javascript/mastodon/locales/en-GB.json b/app/javascript/mastodon/locales/en-GB.json
index f9ab01f562..0637704eb2 100644
--- a/app/javascript/mastodon/locales/en-GB.json
+++ b/app/javascript/mastodon/locales/en-GB.json
@@ -149,16 +149,28 @@
   "account_edit.button.add": "Add {item}",
   "account_edit.button.delete": "Delete {item}",
   "account_edit.button.edit": "Edit {item}",
-  "account_edit.char_counter": "{currentLength}/{maxLength} characters",
   "account_edit.column_button": "Done",
   "account_edit.column_title": "Edit Profile",
+  "account_edit.custom_fields.name": "field",
   "account_edit.custom_fields.placeholder": "Add your pronouns, external links, or anything else you’d like to share.",
+  "account_edit.custom_fields.tip_content": "You can easily add credibility to your Mastodon account by verifying links to any websites you own.",
+  "account_edit.custom_fields.tip_title": "Tip: adding verified links",
   "account_edit.custom_fields.title": "Custom fields",
+  "account_edit.custom_fields.verified_hint": "How do I add a verified link?",
   "account_edit.display_name.placeholder": "Your display name is how your name appears on your profile and in timelines.",
   "account_edit.display_name.title": "Display name",
   "account_edit.featured_hashtags.item": "hashtags",
   "account_edit.featured_hashtags.placeholder": "Help others identify, and have quick access to, your favourite topics.",
   "account_edit.featured_hashtags.title": "Featured hashtags",
+  "account_edit.field_delete_modal.confirm": "Are you sure you want to delete this custom field? This action can’t be undone.",
+  "account_edit.field_delete_modal.delete_button": "Delete",
+  "account_edit.field_delete_modal.title": "Delete custom field?",
+  "account_edit.field_edit_modal.add_title": "Add custom field",
+  "account_edit.field_edit_modal.edit_title": "Edit custom field",
+  "account_edit.field_edit_modal.name_hint": "Eg “Personal website”",
+  "account_edit.field_edit_modal.name_label": "Label",
+  "account_edit.field_edit_modal.value_hint": "Eg “example.me”",
+  "account_edit.field_edit_modal.value_label": "Value",
   "account_edit.name_modal.add_title": "Add display name",
   "account_edit.name_modal.edit_title": "Edit display name",
   "account_edit.profile_tab.button_label": "Customise",
@@ -173,6 +185,13 @@
   "account_edit.profile_tab.subtitle": "Customise the tabs on your profile and what they display.",
   "account_edit.profile_tab.title": "Profile tab settings",
   "account_edit.save": "Save",
+  "account_edit.verified_modal.details": "Add credibility to your Mastodon profile by verifying links to personal websites. Here’s how it works:",
+  "account_edit.verified_modal.invisible_link.details": "Add the link to your header. The important part is rel=\"me\" which prevents impersonation on websites with user-generated content. You can even use a link tag in the header of the page instead of {tag}, but the HTML must be accessible without executing JavaScript.",
+  "account_edit.verified_modal.invisible_link.summary": "How do I make the link invisible?",
+  "account_edit.verified_modal.step1.header": "Copy the HTML code below and paste into the header of your website",
+  "account_edit.verified_modal.step2.details": "If you’ve already added your website as a custom field, you’ll need to delete and re-add it to trigger verification.",
+  "account_edit.verified_modal.step2.header": "Add your website as a custom field",
+  "account_edit.verified_modal.title": "How to add a verified link",
   "account_edit_tags.add_tag": "Add #{tagName}",
   "account_edit_tags.column_title": "Edit featured hashtags",
   "account_edit_tags.help_text": "Featured hashtags help users discover and interact with your profile. They appear as filters on your Profile page’s Activity view.",
@@ -308,15 +327,16 @@
   "collections.delete_collection": "Delete collection",
   "collections.description_length_hint": "100 characters limit",
   "collections.detail.accounts_heading": "Accounts",
+  "collections.detail.author_added_you": "{author} added you to this collection",
   "collections.detail.curated_by_author": "Curated by {author}",
   "collections.detail.curated_by_you": "Curated by you",
   "collections.detail.loading": "Loading collection…",
+  "collections.detail.other_accounts_in_collection": "Others in this collection:",
+  "collections.detail.sensitive_note": "This collection contains accounts and content that may be sensitive to some users.",
   "collections.detail.share": "Share this collection",
   "collections.edit_details": "Edit details",
   "collections.error_loading_collections": "There was an error when trying to load your collections.",
   "collections.hints.accounts_counter": "{count} / {max} accounts",
-  "collections.hints.add_more_accounts": "Add at least {count, plural, one {# account} other {# accounts}} to continue",
-  "collections.hints.can_not_remove_more_accounts": "Collections must contain at least {count, plural, one {# account} other {# accounts}}. Removing more accounts is not possible.",
   "collections.last_updated_at": "Last updated: {date}",
   "collections.manage_accounts": "Manage accounts",
   "collections.mark_as_sensitive": "Mark as sensitive",
@@ -772,6 +792,7 @@
   "navigation_bar.automated_deletion": "Automated post deletion",
   "navigation_bar.blocks": "Blocked users",
   "navigation_bar.bookmarks": "Bookmarks",
+  "navigation_bar.collections": "Collections",
   "navigation_bar.direct": "Private mentions",
   "navigation_bar.domain_blocks": "Blocked domains",
   "navigation_bar.favourites": "Favourites",
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index 9f8c883729..649849d528 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -153,6 +153,7 @@
   "account_edit.column_title": "Edit Profile",
   "account_edit.custom_fields.name": "field",
   "account_edit.custom_fields.placeholder": "Add your pronouns, external links, or anything else you’d like to share.",
+  "account_edit.custom_fields.reorder_button": "Reorder fields",
   "account_edit.custom_fields.tip_content": "You can easily add credibility to your Mastodon account by verifying links to any websites you own.",
   "account_edit.custom_fields.tip_title": "Tip: Adding verified links",
   "account_edit.custom_fields.title": "Custom fields",
@@ -167,10 +168,21 @@
   "account_edit.field_delete_modal.title": "Delete custom field?",
   "account_edit.field_edit_modal.add_title": "Add custom field",
   "account_edit.field_edit_modal.edit_title": "Edit custom field",
+  "account_edit.field_edit_modal.limit_header": "Recommended character limit exceeded",
+  "account_edit.field_edit_modal.limit_message": "Mobile users might not see your field in full.",
+  "account_edit.field_edit_modal.link_emoji_warning": "We recommend against the use of custom emoji in combination with urls. Custom fields containing both will display as text only instead of as a link, in order to prevent user confusion.",
   "account_edit.field_edit_modal.name_hint": "E.g. “Personal website”",
   "account_edit.field_edit_modal.name_label": "Label",
   "account_edit.field_edit_modal.value_hint": "E.g. “example.me”",
   "account_edit.field_edit_modal.value_label": "Value",
+  "account_edit.field_reorder_modal.drag_cancel": "Dragging was cancelled. Field \"{item}\" was dropped.",
+  "account_edit.field_reorder_modal.drag_end": "Field \"{item}\" was dropped.",
+  "account_edit.field_reorder_modal.drag_instructions": "To rearrange custom fields, press space or enter. While dragging, use the arrow keys to move the field up or down. Press space or enter again to drop the field in its new position, or press escape to cancel.",
+  "account_edit.field_reorder_modal.drag_move": "Field \"{item}\" was moved.",
+  "account_edit.field_reorder_modal.drag_over": "Field \"{item}\" was moved over \"{over}\".",
+  "account_edit.field_reorder_modal.drag_start": "Picked up field \"{item}\".",
+  "account_edit.field_reorder_modal.handle_label": "Drag field \"{item}\"",
+  "account_edit.field_reorder_modal.title": "Rearrange fields",
   "account_edit.name_modal.add_title": "Add display name",
   "account_edit.name_modal.edit_title": "Edit display name",
   "account_edit.profile_tab.button_label": "Customize",
diff --git a/app/javascript/mastodon/locales/es-AR.json b/app/javascript/mastodon/locales/es-AR.json
index b63731d21a..b1d21b7382 100644
--- a/app/javascript/mastodon/locales/es-AR.json
+++ b/app/javascript/mastodon/locales/es-AR.json
@@ -149,16 +149,28 @@
   "account_edit.button.add": "Agregar {item}",
   "account_edit.button.delete": "Eliminar {item}",
   "account_edit.button.edit": "Editar {item}",
-  "account_edit.char_counter": "{currentLength}/{maxLength} caracteres",
   "account_edit.column_button": "Listo",
   "account_edit.column_title": "Editar perfil",
+  "account_edit.custom_fields.name": "campo",
   "account_edit.custom_fields.placeholder": "Agregá tus pronombres personales, enlaces externos o cualquier otra cosa que quisieras compartir.",
+  "account_edit.custom_fields.tip_content": "Podés agregar fácilmente credibilidad a tu cuenta de Mastodon verificando enlaces a cualquier sitio web que tengas.",
+  "account_edit.custom_fields.tip_title": "Consejo: Agregá enlaces verificados",
   "account_edit.custom_fields.title": "Campos personalizados",
+  "account_edit.custom_fields.verified_hint": "¿Cómo agrego un enlace verificado?",
   "account_edit.display_name.placeholder": "Tu nombre a mostrar es cómo aparecerá tu nombre en tu perfil y en las líneas temporales.",
   "account_edit.display_name.title": "Nombre a mostrar",
   "account_edit.featured_hashtags.item": "etiquetas",
   "account_edit.featured_hashtags.placeholder": "Ayudá a otras personas a identificarte y a tener un rápido acceso a tus temas favoritos.",
   "account_edit.featured_hashtags.title": "Etiquetas destacadas",
+  "account_edit.field_delete_modal.confirm": "¿Estás seguro de que querés eliminar este campo personalizado? Esta acción no se puede deshacer.",
+  "account_edit.field_delete_modal.delete_button": "Eliminar",
+  "account_edit.field_delete_modal.title": "¿Eliminar campo personalizado?",
+  "account_edit.field_edit_modal.add_title": "Agregar campo personalizado",
+  "account_edit.field_edit_modal.edit_title": "Editar campo personalizado",
+  "account_edit.field_edit_modal.name_hint": "Por ejemplo: «Sitio web personal»",
+  "account_edit.field_edit_modal.name_label": "Etiqueta",
+  "account_edit.field_edit_modal.value_hint": "Por ejemplo: «ejemplo.com.ar»",
+  "account_edit.field_edit_modal.value_label": "Valor",
   "account_edit.name_modal.add_title": "Agregar nombre a mostrar",
   "account_edit.name_modal.edit_title": "Editar nombre a mostrar",
   "account_edit.profile_tab.button_label": "Personalizar",
@@ -173,6 +185,13 @@
   "account_edit.profile_tab.subtitle": "Personalizá las pestañas en tu perfil y qué van a mostrar.",
   "account_edit.profile_tab.title": "Configuración de pestaña de perfil",
   "account_edit.save": "Guardar",
+  "account_edit.verified_modal.details": "Agregá credibilidad a tu perfil de Mastodon verificando enlaces a sitios web personales. Así es cómo funciona:",
+  "account_edit.verified_modal.invisible_link.details": "Agregá el enlace a tu encabezado. La parte importante es rel=\"yo\" que evita la suplantación en sitios web con contenido generado por el usuario. Incluso podés usar una etiqueta de enlace en el encabezado de la página en lugar de {tag}, pero el código HTML debe ser accesible sin ejecutar JavaScript.",
+  "account_edit.verified_modal.invisible_link.summary": "¿Cómo hago el enlace invisible?",
+  "account_edit.verified_modal.step1.header": "Copiá el código HTML de abajo y pegalo en el encabezado de tu sitio web",
+  "account_edit.verified_modal.step2.details": "Si ya agregaste tu sitio web como un campo personalizado, vas a necesitar eliminarlo y volver a agregarlo para activar la verificación.",
+  "account_edit.verified_modal.step2.header": "Agregá tu sitio web como un campo personalizado",
+  "account_edit.verified_modal.title": "¿Cómo agregar un enlace verificado?",
   "account_edit_tags.add_tag": "Agregar #{tagName}",
   "account_edit_tags.column_title": "Editar etiquetas destacadas",
   "account_edit_tags.help_text": "Las etiquetas destacadas ayudan a los usuarios a descubrir e interactuar con tu perfil. Las etiquetas destacadas aparecen como filtros en la vista de actividad de la página de tu perfil.",
@@ -308,15 +327,16 @@
   "collections.delete_collection": "Eliminar colección",
   "collections.description_length_hint": "Límite de 100 caracteres",
   "collections.detail.accounts_heading": "Cuentas",
+  "collections.detail.author_added_you": "{author} te agregó a esta colección",
   "collections.detail.curated_by_author": "Curado por {author}",
   "collections.detail.curated_by_you": "Curado por vos",
   "collections.detail.loading": "Cargando colección…",
+  "collections.detail.other_accounts_in_collection": "Otras cuentas en esta colección:",
+  "collections.detail.sensitive_note": "Esta colección contiene cuentas y contenido que pueden ser sensibles a algunos usuarios.",
   "collections.detail.share": "Compartir esta colección",
   "collections.edit_details": "Editar detalles",
   "collections.error_loading_collections": "Hubo un error al intentar cargar tus colecciones.",
   "collections.hints.accounts_counter": "{count} / {max} cuentas",
-  "collections.hints.add_more_accounts": "Agregá, al menos, {count, plural, one {# cuenta} other {# cuentas}} para continuar",
-  "collections.hints.can_not_remove_more_accounts": "Las colecciones deben contener, al menos, {count, plural, one {# cuenta} other {# cuentas}}. No es posible eliminar más cuentas.",
   "collections.last_updated_at": "Última actualización: {date}",
   "collections.manage_accounts": "Administrar cuentas",
   "collections.mark_as_sensitive": "Marcar como sensible",
@@ -772,6 +792,7 @@
   "navigation_bar.automated_deletion": "Eliminación auto. de mensajes",
   "navigation_bar.blocks": "Usuarios bloqueados",
   "navigation_bar.bookmarks": "Marcadores",
+  "navigation_bar.collections": "Colecciones",
   "navigation_bar.direct": "Menciones privadas",
   "navigation_bar.domain_blocks": "Dominios bloqueados",
   "navigation_bar.favourites": "Favoritos",
diff --git a/app/javascript/mastodon/locales/es-MX.json b/app/javascript/mastodon/locales/es-MX.json
index 795422514b..bb9aa90281 100644
--- a/app/javascript/mastodon/locales/es-MX.json
+++ b/app/javascript/mastodon/locales/es-MX.json
@@ -149,7 +149,6 @@
   "account_edit.button.add": "Añadir {item}",
   "account_edit.button.delete": "Eliminar {item}",
   "account_edit.button.edit": "Editar {item}",
-  "account_edit.char_counter": "{currentLength}/{maxLength} caracteres",
   "account_edit.column_button": "Hecho",
   "account_edit.column_title": "Editar perfil",
   "account_edit.custom_fields.placeholder": "Añade tus pronombres, enlaces externos o cualquier otra información que quieras compartir.",
@@ -313,8 +312,6 @@
   "collections.edit_details": "Editar detalles",
   "collections.error_loading_collections": "Se produjo un error al intentar cargar tus colecciones.",
   "collections.hints.accounts_counter": "{count} / {max} cuentas",
-  "collections.hints.add_more_accounts": "Añade al menos {count, plural,one {# cuenta} other {# cuentas}} para continuar",
-  "collections.hints.can_not_remove_more_accounts": "Las colecciones deben contener al menos {count, plural,one {# cuenta} other {# cuentas}}. No es posible eliminar más cuentas.",
   "collections.last_updated_at": "Última actualización: {date}",
   "collections.manage_accounts": "Administrar cuentas",
   "collections.mark_as_sensitive": "Marcar como sensible",
diff --git a/app/javascript/mastodon/locales/es.json b/app/javascript/mastodon/locales/es.json
index 6b93ec8a22..e7c3d8a22a 100644
--- a/app/javascript/mastodon/locales/es.json
+++ b/app/javascript/mastodon/locales/es.json
@@ -149,7 +149,6 @@
   "account_edit.button.add": "Añadir {item}",
   "account_edit.button.delete": "Eliminar {item}",
   "account_edit.button.edit": "Editar {item}",
-  "account_edit.char_counter": "{currentLength}/{maxLength} caracteres",
   "account_edit.column_button": "Hecho",
   "account_edit.column_title": "Editar perfil",
   "account_edit.custom_fields.placeholder": "Añade tus pronombres, enlaces externos o cualquier otra cosa que quieras compartir.",
@@ -313,8 +312,6 @@
   "collections.edit_details": "Editar detalles",
   "collections.error_loading_collections": "Se ha producido un error al intentar cargar tus colecciones.",
   "collections.hints.accounts_counter": "{count} / {max} cuentas",
-  "collections.hints.add_more_accounts": "¡Añade al menos {count, plural, one {# cuenta} other {# cuentas}} para continuar",
-  "collections.hints.can_not_remove_more_accounts": "Las colecciones deben contener al menos {count, plural, one {# cuenta} other {# cuentas}}. No es posible eliminar más cuentas.",
   "collections.last_updated_at": "Última actualización: {date}",
   "collections.manage_accounts": "Administrar cuentas",
   "collections.mark_as_sensitive": "Marcar como sensible",
diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json
index 55bf3daee7..f6a91c724e 100644
--- a/app/javascript/mastodon/locales/fi.json
+++ b/app/javascript/mastodon/locales/fi.json
@@ -149,9 +149,9 @@
   "account_edit.button.add": "Lisää {item}",
   "account_edit.button.delete": "Poista {item}",
   "account_edit.button.edit": "Muokkaa {item}",
-  "account_edit.char_counter": "{currentLength}/{maxLength} merkkiä",
   "account_edit.column_button": "Valmis",
   "account_edit.column_title": "Muokkaa profiilia",
+  "account_edit.custom_fields.name": "kenttä",
   "account_edit.custom_fields.placeholder": "Lisää pronominisi, ulkoisia linkkejä tai mitä tahansa muuta, jonka haluat jakaa.",
   "account_edit.custom_fields.title": "Mukautetut kentät",
   "account_edit.display_name.placeholder": "Näyttönimesi on nimi, joka näkyy profiilissasi ja aikajanoilla.",
@@ -159,6 +159,13 @@
   "account_edit.featured_hashtags.item": "aihetunnisteet",
   "account_edit.featured_hashtags.placeholder": "Auta muita tunnistamaan suosikkiaiheesi ja saamaan nopea pääsy niihin.",
   "account_edit.featured_hashtags.title": "Esiteltävät aihetunnisteet",
+  "account_edit.field_delete_modal.delete_button": "Poista",
+  "account_edit.field_delete_modal.title": "Poistetaanko mukautettu kenttä?",
+  "account_edit.field_edit_modal.add_title": "Lisää mukautettu kenttä",
+  "account_edit.field_edit_modal.edit_title": "Muokkaa mukautettua kenttää",
+  "account_edit.field_edit_modal.name_hint": "Esim. ”Henkilökohtainen verkkosivusto”",
+  "account_edit.field_edit_modal.name_label": "Nimike",
+  "account_edit.field_edit_modal.value_label": "Arvo",
   "account_edit.name_modal.add_title": "Lisää näyttönimi",
   "account_edit.name_modal.edit_title": "Muokkaa näyttönimeä",
   "account_edit.profile_tab.button_label": "Mukauta",
@@ -276,6 +283,8 @@
   "callout.dismiss": "Hylkää",
   "carousel.current": "<sr>Dia</sr> {current, number} / {max, number}",
   "carousel.slide": "Dia {current, number} / {max, number}",
+  "character_counter.recommended": "{currentLength}/{maxLength} suositeltua merkkiä",
+  "character_counter.required": "{currentLength}/{maxLength} merkkiä",
   "closed_registrations.other_server_instructions": "Koska Mastodon on hajautettu, voit luoda tilin toiselle palvelimelle ja olla silti vuorovaikutuksessa tämän kanssa.",
   "closed_registrations_modal.description": "Tilin luonti palvelimelle {domain} ei tällä hetkellä ole mahdollista, mutta ota huomioon, ettei Mastodonin käyttö edellytä juuri kyseisen palvelimen tiliä.",
   "closed_registrations_modal.find_another_server": "Etsi toinen palvelin",
@@ -313,8 +322,6 @@
   "collections.edit_details": "Muokkaa tietoja",
   "collections.error_loading_collections": "Kokoelmien latauksessa tapahtui virhe.",
   "collections.hints.accounts_counter": "{count} / {max} tiliä",
-  "collections.hints.add_more_accounts": "Jatka lisäämällä vähintään {count, plural, one {# tili} other {# tiliä}}",
-  "collections.hints.can_not_remove_more_accounts": "Kokoelmien on sisällettävä vähintään {count, plural, one {# tili} other {# tiliä}}. Enempää tilejä ei ole mahdollista poistaa.",
   "collections.last_updated_at": "Päivitetty viimeksi {date}",
   "collections.manage_accounts": "Hallitse tilejä",
   "collections.mark_as_sensitive": "Merkitse arkaluonteiseksi",
@@ -770,6 +777,7 @@
   "navigation_bar.automated_deletion": "Julkaisujen automaattipoisto",
   "navigation_bar.blocks": "Estetyt käyttäjät",
   "navigation_bar.bookmarks": "Kirjanmerkit",
+  "navigation_bar.collections": "Kokoelmat",
   "navigation_bar.direct": "Yksityismaininnat",
   "navigation_bar.domain_blocks": "Estetyt verkkotunnukset",
   "navigation_bar.favourites": "Suosikit",
diff --git a/app/javascript/mastodon/locales/fo.json b/app/javascript/mastodon/locales/fo.json
index a93ec5068d..799b0a4bc4 100644
--- a/app/javascript/mastodon/locales/fo.json
+++ b/app/javascript/mastodon/locales/fo.json
@@ -149,7 +149,6 @@
   "account_edit.button.add": "Legg afturat {item}",
   "account_edit.button.delete": "Strika {item}",
   "account_edit.button.edit": "Broyt {item}",
-  "account_edit.char_counter": "{currentLength}/{maxLength} tekn",
   "account_edit.column_button": "Liðugt",
   "account_edit.column_title": "Rætta vanga",
   "account_edit.custom_fields.placeholder": "Legg tíni forheiti, uttanhýsis leinki ella okkurt annað, sum tú kundi hugsað tær at deilt.",
@@ -315,8 +314,6 @@
   "collections.edit_details": "Rætta smálutir",
   "collections.error_loading_collections": "Ein feilur hendi, tá tú royndi at finna fram søvnini hjá tær.",
   "collections.hints.accounts_counter": "{count} / {max} kontur",
-  "collections.hints.add_more_accounts": "Legg minst {count, plural, one {# kontu} other {# kontur}} afturat fyri at halda fram",
-  "collections.hints.can_not_remove_more_accounts": "Søvn mugu innihalda minst {count, plural, one {# kontu} other {# kontur}}. Ikki møguligt at strika fleiri kontur.",
   "collections.last_updated_at": "Seinast dagført: {date}",
   "collections.manage_accounts": "Umsit kontur",
   "collections.mark_as_sensitive": "Merk sum viðkvæmt",
diff --git a/app/javascript/mastodon/locales/fr-CA.json b/app/javascript/mastodon/locales/fr-CA.json
index 85970ed2fe..2733ef316b 100644
--- a/app/javascript/mastodon/locales/fr-CA.json
+++ b/app/javascript/mastodon/locales/fr-CA.json
@@ -149,7 +149,6 @@
   "account_edit.button.add": "Ajouter {item}",
   "account_edit.button.delete": "Supprimer {item}",
   "account_edit.button.edit": "Modifier {item}",
-  "account_edit.char_counter": "{currentLength}/{maxLength} caractères",
   "account_edit.column_button": "Terminé",
   "account_edit.column_title": "Modifier le profil",
   "account_edit.custom_fields.placeholder": "Ajouter vos pronoms, vos sites, ou tout ce que vous voulez partager.",
@@ -276,6 +275,8 @@
   "callout.dismiss": "Rejeter",
   "carousel.current": "<sr>Diapositive</sr> {current, number} / {max, number}",
   "carousel.slide": "Diapositive {current, number} de {max, number}",
+  "character_counter.recommended": "{currentLength}/{maxLength} caractères recommandés",
+  "character_counter.required": "{currentLength}/{maxLength} caractères",
   "closed_registrations.other_server_instructions": "Puisque Mastodon est décentralisé, vous pouvez créer un compte sur un autre serveur et interagir quand même avec celui-ci.",
   "closed_registrations_modal.description": "Créer un compte sur {domain} est présentement impossible, néanmoins souvenez-vous que vous n'avez pas besoin d'un compte spécifiquement sur {domain} pour utiliser Mastodon.",
   "closed_registrations_modal.find_another_server": "Trouver un autre serveur",
@@ -313,8 +314,6 @@
   "collections.edit_details": "Modifier les détails",
   "collections.error_loading_collections": "Une erreur s'est produite durant le chargement de vos collections.",
   "collections.hints.accounts_counter": "{count} / {max} comptes",
-  "collections.hints.add_more_accounts": "Ajouter au moins {count, plural, one {# compte} other {# comptes}} pour continuer",
-  "collections.hints.can_not_remove_more_accounts": "Les collections doivent contenir au moins {count, plural, one {# compte} other {# comptes}}. Il n'est pas possible de supprimer plus de comptes.",
   "collections.last_updated_at": "Dernière mise à jour : {date}",
   "collections.manage_accounts": "Gérer les comptes",
   "collections.mark_as_sensitive": "Marquer comme sensible",
@@ -770,6 +769,7 @@
   "navigation_bar.automated_deletion": "Suppression automatique de messages",
   "navigation_bar.blocks": "Comptes bloqués",
   "navigation_bar.bookmarks": "Signets",
+  "navigation_bar.collections": "Collections",
   "navigation_bar.direct": "Mention privée",
   "navigation_bar.domain_blocks": "Domaines bloqués",
   "navigation_bar.favourites": "Favoris",
diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json
index 5f32e9361c..8d34fc935d 100644
--- a/app/javascript/mastodon/locales/fr.json
+++ b/app/javascript/mastodon/locales/fr.json
@@ -149,7 +149,6 @@
   "account_edit.button.add": "Ajouter {item}",
   "account_edit.button.delete": "Supprimer {item}",
   "account_edit.button.edit": "Modifier {item}",
-  "account_edit.char_counter": "{currentLength}/{maxLength} caractères",
   "account_edit.column_button": "Terminé",
   "account_edit.column_title": "Modifier le profil",
   "account_edit.custom_fields.placeholder": "Ajouter vos pronoms, vos sites, ou tout ce que vous voulez partager.",
@@ -276,6 +275,8 @@
   "callout.dismiss": "Rejeter",
   "carousel.current": "<sr>Diapositive</sr> {current, number} / {max, number}",
   "carousel.slide": "Diapositive {current, number} de {max, number}",
+  "character_counter.recommended": "{currentLength}/{maxLength} caractères recommandés",
+  "character_counter.required": "{currentLength}/{maxLength} caractères",
   "closed_registrations.other_server_instructions": "Puisque Mastodon est décentralisé, vous pouvez créer un compte sur un autre serveur et interagir quand même avec celui-ci.",
   "closed_registrations_modal.description": "Créer un compte sur {domain} est actuellement impossible, néanmoins souvenez-vous que vous n'avez pas besoin d'un compte spécifiquement sur {domain} pour utiliser Mastodon.",
   "closed_registrations_modal.find_another_server": "Trouver un autre serveur",
@@ -313,8 +314,6 @@
   "collections.edit_details": "Modifier les détails",
   "collections.error_loading_collections": "Une erreur s'est produite durant le chargement de vos collections.",
   "collections.hints.accounts_counter": "{count} / {max} comptes",
-  "collections.hints.add_more_accounts": "Ajouter au moins {count, plural, one {# compte} other {# comptes}} pour continuer",
-  "collections.hints.can_not_remove_more_accounts": "Les collections doivent contenir au moins {count, plural, one {# compte} other {# comptes}}. Il n'est pas possible de supprimer plus de comptes.",
   "collections.last_updated_at": "Dernière mise à jour : {date}",
   "collections.manage_accounts": "Gérer les comptes",
   "collections.mark_as_sensitive": "Marquer comme sensible",
@@ -770,6 +769,7 @@
   "navigation_bar.automated_deletion": "Suppression automatique de messages",
   "navigation_bar.blocks": "Comptes bloqués",
   "navigation_bar.bookmarks": "Marque-pages",
+  "navigation_bar.collections": "Collections",
   "navigation_bar.direct": "Mention privée",
   "navigation_bar.domain_blocks": "Domaines bloqués",
   "navigation_bar.favourites": "Favoris",
diff --git a/app/javascript/mastodon/locales/ga.json b/app/javascript/mastodon/locales/ga.json
index e8b0c623e7..fae885d1bd 100644
--- a/app/javascript/mastodon/locales/ga.json
+++ b/app/javascript/mastodon/locales/ga.json
@@ -149,16 +149,28 @@
   "account_edit.button.add": "Cuir {item} leis",
   "account_edit.button.delete": "Scrios {item}",
   "account_edit.button.edit": "Cuir {item} in eagar",
-  "account_edit.char_counter": "{currentLength}/{maxLength} carachtair",
   "account_edit.column_button": "Déanta",
   "account_edit.column_title": "Cuir Próifíl in Eagar",
+  "account_edit.custom_fields.name": "réimse",
   "account_edit.custom_fields.placeholder": "Cuir do fhorainmneacha, naisc sheachtracha, nó aon rud eile ar mhaith leat a roinnt leis.",
+  "account_edit.custom_fields.tip_content": "Is féidir leat creidiúnacht a chur le do chuntas Mastodon go héasca trí naisc chuig aon suíomhanna Gréasáin ar leatsa iad a fhíorú.",
+  "account_edit.custom_fields.tip_title": "Leid: Ag cur naisc fhíoraithe leis",
   "account_edit.custom_fields.title": "Réimsí saincheaptha",
+  "account_edit.custom_fields.verified_hint": "Conas a chuirim nasc fíoraithe leis?",
   "account_edit.display_name.placeholder": "Is é d’ainm taispeána an chaoi a bhfeictear d’ainm ar do phróifíl agus in amlínte.",
   "account_edit.display_name.title": "Ainm taispeána",
   "account_edit.featured_hashtags.item": "haischlibeanna",
   "account_edit.featured_hashtags.placeholder": "Cabhraigh le daoine eile do thopaicí is fearr leat a aithint, agus rochtain thapa a bheith acu orthu.",
   "account_edit.featured_hashtags.title": "Haischlibeanna Réadmhaoine",
+  "account_edit.field_delete_modal.confirm": "An bhfuil tú cinnte gur mhaith leat an réimse saincheaptha seo a scriosadh? Ní féidir an gníomh seo a chealú.",
+  "account_edit.field_delete_modal.delete_button": "Scrios",
+  "account_edit.field_delete_modal.title": "An bhfuil fonn ort an réimse saincheaptha a scriosadh?",
+  "account_edit.field_edit_modal.add_title": "Cuir réimse saincheaptha leis",
+  "account_edit.field_edit_modal.edit_title": "Cuir réimse saincheaptha in eagar",
+  "account_edit.field_edit_modal.name_hint": "M.sh. “Suíomh Gréasáin pearsanta”",
+  "account_edit.field_edit_modal.name_label": "Lipéad",
+  "account_edit.field_edit_modal.value_hint": "M.sh. “shampla.me”",
+  "account_edit.field_edit_modal.value_label": "Luach",
   "account_edit.name_modal.add_title": "Cuir ainm taispeána leis",
   "account_edit.name_modal.edit_title": "Cuir ainm taispeána in eagar",
   "account_edit.profile_tab.button_label": "Saincheap",
@@ -173,6 +185,14 @@
   "account_edit.profile_tab.subtitle": "Saincheap na cluaisíní ar do phróifíl agus a bhfuil á thaispeáint iontu.",
   "account_edit.profile_tab.title": "Socruithe an chluaisín próifíle",
   "account_edit.save": "Sábháil",
+  "account_edit.verified_modal.details": "Cuir creidiúnacht le do phróifíl Mastodon trí naisc chuig láithreáin ghréasáin phearsanta a fhíorú. Seo mar a oibríonn sé:",
+  "account_edit.verified_modal.invisible_link.details": "Cuir an nasc le do cheanntásc. Is í an chuid thábhachtach ná rel=\"me\" a chuireann cosc ​​ar phearsanú ar shuíomhanna gréasáin a bhfuil inneachar a ghintear ag úsáideoirí. Is féidir leat clib nasc a úsáid fiú i gceanntásc an leathanaigh in ionad {tag}, ach caithfidh an HTML a bheith inrochtana gan JavaScript a chur i gcrích.",
+  "account_edit.verified_modal.invisible_link.summary": "Conas a dhéanaim an nasc dofheicthe?",
+  "account_edit.verified_modal.step1.header": "Cóipeáil an cód HTML thíos agus greamaigh isteach ceanntásc do shuíomh Gréasáin",
+  "account_edit.verified_modal.step2.details": "Má tá do shuíomh Gréasáin curtha leis agat cheana féin mar réimse saincheaptha, beidh ort é a scriosadh agus a chur leis arís chun fíorú a spreagadh.",
+  "account_edit.verified_modal.step2.header": "Cuir do shuíomh Gréasáin leis mar réimse saincheaptha",
+  "account_edit.verified_modal.title": "Conas nasc fíoraithe a chur leis",
+  "account_edit_tags.add_tag": "Cuir #{tagName} leis",
   "account_edit_tags.column_title": "Cuir haischlibeanna le feiceáil in eagar",
   "account_edit_tags.help_text": "Cuidíonn haischlibeanna le húsáideoirí do phróifíl a aimsiú agus idirghníomhú léi. Feictear iad mar scagairí ar radharc Gníomhaíochta do leathanaigh Phróifíle.",
   "account_edit_tags.search_placeholder": "Cuir isteach haischlib…",
@@ -275,6 +295,8 @@
   "callout.dismiss": "Díbhe",
   "carousel.current": "<sr>Sleamhnán</sr> {current, number} / {max, number}",
   "carousel.slide": "Sleamhnán {current, number} of {max, number}",
+  "character_counter.recommended": "{currentLength}/{maxLength} carachtar molta",
+  "character_counter.required": "{currentLength}/{maxLength} carachtar",
   "closed_registrations.other_server_instructions": "Mar rud díláraithe Mastodon, is féidir leat cuntas a chruthú ar seirbheálaí eile ach fós idirghníomhaigh leis an ceann seo.",
   "closed_registrations_modal.description": "Ní féidir cuntas a chruthú ar {domain} faoi láthair, ach cuimhnigh nach gá go mbeadh cuntas agat go sonrach ar {domain} chun Mastodon a úsáid.",
   "closed_registrations_modal.find_another_server": "Faigh freastalaí eile",
@@ -312,8 +334,6 @@
   "collections.edit_details": "Cuir sonraí in eagar",
   "collections.error_loading_collections": "Tharla earráid agus iarracht á déanamh do bhailiúcháin a luchtú.",
   "collections.hints.accounts_counter": "{count} / {max} cuntais",
-  "collections.hints.add_more_accounts": "Cuir ar a laghad {count, plural, one {# cuntas} two {# cuntais} few {# cuntais} many {# cuntais} other {# cuntais}} leis chun leanúint ar aghaidh",
-  "collections.hints.can_not_remove_more_accounts": "Ní mór go mbeadh ar a laghad {count, plural, one {# cuntas} two {# cuntais} few {# cuntais} many {# cuntais} other {# cuntais}} i mbailiúcháin. Ní féidir tuilleadh cuntas a bhaint.",
   "collections.last_updated_at": "Nuashonraithe go deireanach: {date}",
   "collections.manage_accounts": "Bainistigh cuntais",
   "collections.mark_as_sensitive": "Marcáil mar íogair",
@@ -769,6 +789,7 @@
   "navigation_bar.automated_deletion": "Scriosadh uathoibrithe postála",
   "navigation_bar.blocks": "Cuntais bhactha",
   "navigation_bar.bookmarks": "Leabharmharcanna",
+  "navigation_bar.collections": "Bailiúcháin",
   "navigation_bar.direct": "Luann príobháideach",
   "navigation_bar.domain_blocks": "Fearainn bhactha",
   "navigation_bar.favourites": "Ceanáin",
diff --git a/app/javascript/mastodon/locales/gl.json b/app/javascript/mastodon/locales/gl.json
index 57b8a6dfb8..93b3e0ea01 100644
--- a/app/javascript/mastodon/locales/gl.json
+++ b/app/javascript/mastodon/locales/gl.json
@@ -149,16 +149,28 @@
   "account_edit.button.add": "Engadir {item}",
   "account_edit.button.delete": "Eliminar {item}",
   "account_edit.button.edit": "Editar {item}",
-  "account_edit.char_counter": "{currentLength}/{maxLength} caracteres",
   "account_edit.column_button": "Feito",
   "account_edit.column_title": "Editar perfil",
+  "account_edit.custom_fields.name": "campo",
   "account_edit.custom_fields.placeholder": "Engade os teus pronomes, ligazóns externas, ou o que queiras compartir.",
+  "account_edit.custom_fields.tip_content": "Podes darlle maior credibilidade á túa conta Mastodon se verificas as ligazóns a sitios web da túa propiedade.",
+  "account_edit.custom_fields.tip_title": "Consello: Engadir ligazóns verificadas",
   "account_edit.custom_fields.title": "Campos personalizados",
+  "account_edit.custom_fields.verified_hint": "Como engado unha ligazón verificada?",
   "account_edit.display_name.placeholder": "O nome público é o nome que aparece no perfil e nas cronoloxías.",
   "account_edit.display_name.title": "Nome público",
   "account_edit.featured_hashtags.item": "cancelos",
   "account_edit.featured_hashtags.placeholder": "Facilita que te identifiquen, e da acceso rápido aos teus intereses favoritos.",
   "account_edit.featured_hashtags.title": "Cancelos destacados",
+  "account_edit.field_delete_modal.confirm": "Tes certeza de querer eliminar este campo persoal? A acción non se pode desfacer.",
+  "account_edit.field_delete_modal.delete_button": "Eliminar",
+  "account_edit.field_delete_modal.title": "Eliminar campo persoal?",
+  "account_edit.field_edit_modal.add_title": "Engadir campo persoal",
+  "account_edit.field_edit_modal.edit_title": "Editar campo persoal",
+  "account_edit.field_edit_modal.name_hint": "Ex. \"Páxina web persoal\"",
+  "account_edit.field_edit_modal.name_label": "Etiqueta",
+  "account_edit.field_edit_modal.value_hint": "Ex. \"exemplo.gal\"",
+  "account_edit.field_edit_modal.value_label": "Valor",
   "account_edit.name_modal.add_title": "Engadir nome público",
   "account_edit.name_modal.edit_title": "Editar o nome público",
   "account_edit.profile_tab.button_label": "Personalizar",
@@ -173,6 +185,13 @@
   "account_edit.profile_tab.subtitle": "Personaliza as pestanas e o seu contido no teu perfil.",
   "account_edit.profile_tab.title": "Perfil e axustes das pestanas",
   "account_edit.save": "Gardar",
+  "account_edit.verified_modal.details": "Engade maior credibilidade ao teu perfil Mastodon verificando as ligazóns ás túas páxinas web persoais. Funciona así:",
+  "account_edit.verified_modal.invisible_link.details": "Engade a ligazón ao «header» da páxina web. A parte importante é rel=\"me\", que evita a suplantación en sitios web con contido creado polas usuarias. Tamén podes usar a etiqueta «link» na cabeceira da páxina no lugar de {tag}, pero o HTML ten que ser accesible sen usar JavaScript.",
+  "account_edit.verified_modal.invisible_link.summary": "Como fago visible a ligazón?",
+  "account_edit.verified_modal.step1.header": "Copia o código HTML inferior e pégao no «header» da túa páxina web",
+  "account_edit.verified_modal.step2.details": "Se xa engadiches a túa páxina a un dos campos persoais terás que eliminalo e volvelo a engadir para realizar a verificación.",
+  "account_edit.verified_modal.step2.header": "Engade a túa páxina como campo persoal",
+  "account_edit.verified_modal.title": "Como engadir unha ligazón verificada",
   "account_edit_tags.add_tag": "Engadir #{tagName}",
   "account_edit_tags.column_title": "Editar cancelos destacados",
   "account_edit_tags.help_text": "Os cancelos destacados axúdanlle ás usuarias a atopar e interactuar co teu perfil. Aparecen como filtros na túa páxina de perfil na vista Actividade.",
@@ -308,15 +327,16 @@
   "collections.delete_collection": "Eliminar colección",
   "collections.description_length_hint": "Límite de 100 caracteres",
   "collections.detail.accounts_heading": "Contas",
+  "collections.detail.author_added_you": "{author} engadíute a esta colección",
   "collections.detail.curated_by_author": "Seleccionadas por {author}",
   "collections.detail.curated_by_you": "Seleccionadas por ti",
   "collections.detail.loading": "Cargando colección…",
+  "collections.detail.other_accounts_in_collection": "Outras contas na colección:",
+  "collections.detail.sensitive_note": "Esta colección presenta contas e contido que poderían ser sensibles para algunhas persoas.",
   "collections.detail.share": "Compartir esta colección",
   "collections.edit_details": "Editar detalles",
   "collections.error_loading_collections": "Houbo un erro ao intentar cargar as túas coleccións.",
   "collections.hints.accounts_counter": "{count} / {max} contas",
-  "collections.hints.add_more_accounts": "Engade polo menos {count, plural, one {# conta} other {# contas}} para continuar",
-  "collections.hints.can_not_remove_more_accounts": "As coleccións teñen que conter polo menos {count, plural, one {# conta} other {# contas}}. Non é posible retirar máis contas.",
   "collections.last_updated_at": "Última actualización: {date}",
   "collections.manage_accounts": "Xestionar contas",
   "collections.mark_as_sensitive": "Marcar como sensible",
@@ -772,6 +792,7 @@
   "navigation_bar.automated_deletion": "Borrado automático das publicacións",
   "navigation_bar.blocks": "Usuarias bloqueadas",
   "navigation_bar.bookmarks": "Marcadores",
+  "navigation_bar.collections": "Coleccións",
   "navigation_bar.direct": "Mencións privadas",
   "navigation_bar.domain_blocks": "Dominios agochados",
   "navigation_bar.favourites": "Favoritas",
diff --git a/app/javascript/mastodon/locales/he.json b/app/javascript/mastodon/locales/he.json
index 2fe5995649..54af1720af 100644
--- a/app/javascript/mastodon/locales/he.json
+++ b/app/javascript/mastodon/locales/he.json
@@ -149,7 +149,6 @@
   "account_edit.button.add": "הוספת {item}",
   "account_edit.button.delete": "מחיקת {item}",
   "account_edit.button.edit": "עריכת {item}",
-  "account_edit.char_counter": "{currentLength}/{maxLength} תווים",
   "account_edit.column_button": "סיום",
   "account_edit.column_title": "עריכת הפרופיל",
   "account_edit.custom_fields.placeholder": "הוסיפו צורת פניה, קישורים חיצוניים וכל דבר שתרצו לשתף.",
@@ -315,8 +314,6 @@
   "collections.edit_details": "עריכת פרטים",
   "collections.error_loading_collections": "חלה שגיאה בנסיון לטעון את אוספיך.",
   "collections.hints.accounts_counter": "{count} \\ {max} חשבונות",
-  "collections.hints.add_more_accounts": "הוסיפו לפחות {count, plural,one {חשבון אחד}other {# חשבונות}} כדי להמשיך",
-  "collections.hints.can_not_remove_more_accounts": "אוספים חייבים להכיל לפחות {count, plural,one {חשבון אחד}other {# חשבונות}}. הסרת חשבונות נוספים איננה אפשרית.",
   "collections.last_updated_at": "עדכון אחרון: {date}",
   "collections.manage_accounts": "ניהול חשבונות",
   "collections.mark_as_sensitive": "מסומנים כרגישים",
@@ -772,6 +769,7 @@
   "navigation_bar.automated_deletion": "מחיקת הודעות אוטומטית",
   "navigation_bar.blocks": "משתמשים חסומים",
   "navigation_bar.bookmarks": "סימניות",
+  "navigation_bar.collections": "אוספים",
   "navigation_bar.direct": "הודעות פרטיות",
   "navigation_bar.domain_blocks": "קהילות (שמות מתחם) חסומות",
   "navigation_bar.favourites": "חיבובים",
diff --git a/app/javascript/mastodon/locales/hr.json b/app/javascript/mastodon/locales/hr.json
index 9e6a9f1b22..29b658cccb 100644
--- a/app/javascript/mastodon/locales/hr.json
+++ b/app/javascript/mastodon/locales/hr.json
@@ -80,7 +80,6 @@
   "account_edit.bio.title": "Biografija",
   "account_edit.bio_modal.add_title": "Dodaj biografiju",
   "account_edit.bio_modal.edit_title": "Uredi biografiju",
-  "account_edit.char_counter": "{currentLength}/{maxLength} znakova",
   "account_edit.column_button": "Završi",
   "account_edit.column_title": "Uredi profil",
   "account_edit.custom_fields.title": "Prilagođena polja",
diff --git a/app/javascript/mastodon/locales/hu.json b/app/javascript/mastodon/locales/hu.json
index a8c307ff66..05df7cc402 100644
--- a/app/javascript/mastodon/locales/hu.json
+++ b/app/javascript/mastodon/locales/hu.json
@@ -149,9 +149,9 @@
   "account_edit.button.add": "{item} hozzáadása",
   "account_edit.button.delete": "{item} törlése",
   "account_edit.button.edit": "{item} szerkesztése",
-  "account_edit.char_counter": "{currentLength}/{maxLength} karakter",
   "account_edit.column_button": "Kész",
   "account_edit.column_title": "Profil szerkesztése",
+  "account_edit.custom_fields.name": "mező",
   "account_edit.custom_fields.placeholder": "Add meg a névmásaidat, külső hivatkozásaidat vagy bármi mást, amelyet megosztanál.",
   "account_edit.custom_fields.title": "Egyéni mezők",
   "account_edit.display_name.placeholder": "A megjelenítendő név az, ahogy a neved megjelenik a profilodon és az idővonalakon.",
@@ -159,6 +159,14 @@
   "account_edit.featured_hashtags.item": "hashtagek",
   "account_edit.featured_hashtags.placeholder": "Segíts másoknak, hogy azonosíthassák a kedvenc témáid, és gyorsan elérjék azokat.",
   "account_edit.featured_hashtags.title": "Kiemelt hashtagek",
+  "account_edit.field_delete_modal.delete_button": "Törlés",
+  "account_edit.field_delete_modal.title": "Egyéni mező törlése?",
+  "account_edit.field_edit_modal.add_title": "Egyéni mező hozzáadása",
+  "account_edit.field_edit_modal.edit_title": "Egyéni mező szerkesztése",
+  "account_edit.field_edit_modal.name_hint": "Például „Személyes webhely”",
+  "account_edit.field_edit_modal.name_label": "Címke",
+  "account_edit.field_edit_modal.value_hint": "Például „example.me”",
+  "account_edit.field_edit_modal.value_label": "Érték",
   "account_edit.name_modal.add_title": "Megjelenítendő név hozzáadása",
   "account_edit.name_modal.edit_title": "Megjelenítendő név szerkesztése",
   "account_edit.profile_tab.button_label": "Testreszabás",
@@ -173,6 +181,8 @@
   "account_edit.profile_tab.subtitle": "Szabd testre a profilodon látható lapokat, és a megjelenített tartalmukat.",
   "account_edit.profile_tab.title": "Profil lap beállításai",
   "account_edit.save": "Mentés",
+  "account_edit.verified_modal.step2.header": "Saját webhely hozzáadása egyéni mezőként",
+  "account_edit.verified_modal.title": "Hogyan kell ellenőrzött hivatkozást hozzáadni",
   "account_edit_tags.add_tag": "#{tagName} hozzáadása",
   "account_edit_tags.column_title": "Kiemelt hashtagek szerkesztése",
   "account_edit_tags.help_text": "A kiemelt hashtagek segítenek a felhasználóknak abban, hogy interakcióba lépjenek a profiloddal. Szűrőként jelennek meg a Profil oldalad Tevékenység nézetében.",
@@ -308,15 +318,16 @@
   "collections.delete_collection": "Gyűjtemény törlése",
   "collections.description_length_hint": "100 karakteres korlát",
   "collections.detail.accounts_heading": "Fiókok",
+  "collections.detail.author_added_you": "{author} hozzáadott ehhez a gyűjteményhez",
   "collections.detail.curated_by_author": "Válogatta: {author}",
   "collections.detail.curated_by_you": "Te válogattad",
   "collections.detail.loading": "Gyűjtemény betöltése…",
+  "collections.detail.other_accounts_in_collection": "Mások ebben a gyűjteményben:",
+  "collections.detail.sensitive_note": "Ebben a gyűjteményben egyesek számára érzékeny fiókok és tartalmak vannak.",
   "collections.detail.share": "Gyűjtemény megosztása",
   "collections.edit_details": "Részletek szerkesztése",
   "collections.error_loading_collections": "Hiba történt a gyűjtemények betöltése során.",
   "collections.hints.accounts_counter": "{count} / {max} fiók",
-  "collections.hints.add_more_accounts": "Adj hozzá legalább {count, plural, one {# fiókot} other {# fiókot}} a folytatáshoz",
-  "collections.hints.can_not_remove_more_accounts": "A gyűjteményeknek legalább {count, plural, one {# fiókot} other {# fiókot}} kell tartalmazniuk. Több fiók eltávolítása nem lehetséges.",
   "collections.last_updated_at": "Utoljára frissítve: {date}",
   "collections.manage_accounts": "Fiókok kezelése",
   "collections.mark_as_sensitive": "Megjelelölés érzénykenként",
@@ -772,6 +783,7 @@
   "navigation_bar.automated_deletion": "Bejegyzések automatikus törlése",
   "navigation_bar.blocks": "Letiltott felhasználók",
   "navigation_bar.bookmarks": "Könyvjelzők",
+  "navigation_bar.collections": "Gyűjtemények",
   "navigation_bar.direct": "Személyes említések",
   "navigation_bar.domain_blocks": "Letiltott domainek",
   "navigation_bar.favourites": "Kedvencek",
diff --git a/app/javascript/mastodon/locales/is.json b/app/javascript/mastodon/locales/is.json
index 1fb6417ede..43b095e011 100644
--- a/app/javascript/mastodon/locales/is.json
+++ b/app/javascript/mastodon/locales/is.json
@@ -149,16 +149,28 @@
   "account_edit.button.add": "Bæta við {item}",
   "account_edit.button.delete": "Eyða {item}",
   "account_edit.button.edit": "Breyta {item}",
-  "account_edit.char_counter": "{currentLength}/{maxLength} stafir",
   "account_edit.column_button": "Lokið",
   "account_edit.column_title": "Breyta notandasniði",
+  "account_edit.custom_fields.name": "reitur",
   "account_edit.custom_fields.placeholder": "Settu inn fornöfn sem þú vilt nota, ytri tengla eða hvaðeina sem þú vilt deila með öðrum.",
+  "account_edit.custom_fields.tip_content": "Þú getur á einfaldan hátt aukið trúverðugleika Mastodon-aðgangsins þíns með því að bæta við staðfestingartenglum sem vísa á vefsvæði sem þú átt.",
+  "account_edit.custom_fields.tip_title": "Ábending: Bæta við staðfestingartenglum",
   "account_edit.custom_fields.title": "Sérsniðnir reitir",
+  "account_edit.custom_fields.verified_hint": "Hvernig bæti ég við staðfestingartengli?",
   "account_edit.display_name.placeholder": "Birtingarnafn er það sem birtist sem nafnið þitt á notandasniðinu þínu og í tímalínum.",
   "account_edit.display_name.title": "Birtingarnafn",
   "account_edit.featured_hashtags.item": "myllumerki",
   "account_edit.featured_hashtags.placeholder": "Hjálpaðu öðrum að sjá og komast í eftirlætis-umfjöllunarefnin þín.",
   "account_edit.featured_hashtags.title": "Myllumerki með aukið vægi",
+  "account_edit.field_delete_modal.confirm": "Ertu viss um að þú viljir eyða þessum sérsniðna reit? Þessa aðgerð er ekki hægt að afturkalla.",
+  "account_edit.field_delete_modal.delete_button": "Eyða",
+  "account_edit.field_delete_modal.title": "Eyða sérsniðnum reit?",
+  "account_edit.field_edit_modal.add_title": "Bæta við sérsniðnum reit",
+  "account_edit.field_edit_modal.edit_title": "Breyta sérsniðnum reit",
+  "account_edit.field_edit_modal.name_hint": "T.d. \"Eigið vefsvæði\"",
+  "account_edit.field_edit_modal.name_label": "Skýring",
+  "account_edit.field_edit_modal.value_hint": "T.d. \"minnvefur.is\"",
+  "account_edit.field_edit_modal.value_label": "Gildi",
   "account_edit.name_modal.add_title": "Bættu við birtingarnafni",
   "account_edit.name_modal.edit_title": "Breyta birtingarnafni",
   "account_edit.profile_tab.button_label": "Sérsníða",
@@ -173,6 +185,9 @@
   "account_edit.profile_tab.subtitle": "Sérsníddu flipana á notandasniðinu þínu og hvað þeir birta.",
   "account_edit.profile_tab.title": "Stillingar notandasniðsflipa",
   "account_edit.save": "Vista",
+  "account_edit.verified_modal.details": "Auktu trúverðugleika Mastodon-aðgangsins þíns með því að bæta við staðfestingartenglum sem vísa á vefsvæðin þín. Hérna sérðu hvernig það virkar:",
+  "account_edit.verified_modal.invisible_link.summary": "Hvernig geri ég tengilinn ósýnilegan?",
+  "account_edit.verified_modal.title": "Hvernig er hægt að bæta við staðfestingartengli",
   "account_edit_tags.add_tag": "Bæta við #{tagName}",
   "account_edit_tags.column_title": "Breyta myllumerkjum með aukið vægi",
   "account_edit_tags.help_text": "Myllumerki með aukið vægi hjálpa lesendum að finna og eiga við notandasíðuna þína. Þau birtast sem síur í virkniflipa notandasíðunnar þinnar.",
@@ -315,8 +330,6 @@
   "collections.edit_details": "Breyta ítarupplýsingum",
   "collections.error_loading_collections": "Villa kom upp þegar reynt var að hlaða inn söfnunum þínum.",
   "collections.hints.accounts_counter": "{count} / {max} aðgangar",
-  "collections.hints.add_more_accounts": "Bættu við að minnsta kosti {count, plural, one {# aðgangi} other {# aðgöngum}} til að halda áfram",
-  "collections.hints.can_not_remove_more_accounts": "Söfn verða að innihalda að minnsta kosti {count, plural, one {# aðgang} other {# aðganga}}. Ekki er hægt að fjarlægja fleiri aðganga.",
   "collections.last_updated_at": "Síðast uppfært: {date}",
   "collections.manage_accounts": "Sýsla með notandaaðganga",
   "collections.mark_as_sensitive": "Merkja sem viðkvæmt",
@@ -772,6 +785,7 @@
   "navigation_bar.automated_deletion": "Sjálfvirk eyðing færslna",
   "navigation_bar.blocks": "Útilokaðir notendur",
   "navigation_bar.bookmarks": "Bókamerki",
+  "navigation_bar.collections": "Söfn",
   "navigation_bar.direct": "Einkaspjall",
   "navigation_bar.domain_blocks": "Útilokuð lén",
   "navigation_bar.favourites": "Eftirlæti",
diff --git a/app/javascript/mastodon/locales/it.json b/app/javascript/mastodon/locales/it.json
index 74efa656a7..e6e1e21435 100644
--- a/app/javascript/mastodon/locales/it.json
+++ b/app/javascript/mastodon/locales/it.json
@@ -149,16 +149,28 @@
   "account_edit.button.add": "Aggiungi {item}",
   "account_edit.button.delete": "Elimina {item}",
   "account_edit.button.edit": "Modifica {item}",
-  "account_edit.char_counter": "{currentLength}/{maxLength} caratteri",
   "account_edit.column_button": "Fatto",
   "account_edit.column_title": "Modifica il profilo",
+  "account_edit.custom_fields.name": "campo",
   "account_edit.custom_fields.placeholder": "Aggiungi i tuoi pronomi, collegamenti esterni o qualsiasi altra cosa desideri condividere.",
+  "account_edit.custom_fields.tip_content": "Puoi facilmente aggiungere credibilità al tuo account Mastodon, verificando i collegamenti a qualsiasi sito web di tua proprietà.",
+  "account_edit.custom_fields.tip_title": "Suggerimento: aggiunta di collegamenti verificati",
   "account_edit.custom_fields.title": "Campi personalizzati",
+  "account_edit.custom_fields.verified_hint": "Come aggiungo un collegamento verificato?",
   "account_edit.display_name.placeholder": "Il tuo nome mostrato è il modo in cui il tuo nome appare sul tuo profilo e nelle timeline.",
   "account_edit.display_name.title": "Nome mostrato",
   "account_edit.featured_hashtags.item": "hashtag",
   "account_edit.featured_hashtags.placeholder": "Aiuta gli altri a identificare e ad accedere rapidamente ai tuoi argomenti preferiti.",
   "account_edit.featured_hashtags.title": "Hashtag in evidenza",
+  "account_edit.field_delete_modal.confirm": "Si è sicuri di voler eliminare questo campo personalizzato? Questa azione non può essere annullata.",
+  "account_edit.field_delete_modal.delete_button": "Elimina",
+  "account_edit.field_delete_modal.title": "Eliminare il campo personalizzato?",
+  "account_edit.field_edit_modal.add_title": "Aggiungi campo personalizzato",
+  "account_edit.field_edit_modal.edit_title": "Modifica campo personalizzato",
+  "account_edit.field_edit_modal.name_hint": "Ad esempio: “Sito web personale”",
+  "account_edit.field_edit_modal.name_label": "Etichetta",
+  "account_edit.field_edit_modal.value_hint": "Ad esempio: “example.me”",
+  "account_edit.field_edit_modal.value_label": "Valore",
   "account_edit.name_modal.add_title": "Aggiungi il nome mostrato",
   "account_edit.name_modal.edit_title": "Modifica il nome mostrato",
   "account_edit.profile_tab.button_label": "Personalizza",
@@ -173,6 +185,13 @@
   "account_edit.profile_tab.subtitle": "Personalizza le schede del tuo profilo e ciò che mostrano.",
   "account_edit.profile_tab.title": "Impostazioni della scheda del profilo",
   "account_edit.save": "Salva",
+  "account_edit.verified_modal.details": "Aggiungi credibilità al tuo profilo Mastodon verificando i collegamenti ai siti web personali. Ecco come funziona:",
+  "account_edit.verified_modal.invisible_link.details": "Aggiungi il collegamento alla tua intestazione. La parte importante è rel=\"me\" che impedisce l'impersonificazione sui siti web con contenuti generati dagli utenti. Puoi anche utilizzare un link tag nell'intestazione della pagina al posto di {tag}, ma il codice HTML deve essere accessibile senza eseguire JavaScript.",
+  "account_edit.verified_modal.invisible_link.summary": "Come faccio a rendere il collegamento invisibile?",
+  "account_edit.verified_modal.step1.header": "Copia il codice HTML qui sotto e incollalo nell'intestazione del tuo sito web",
+  "account_edit.verified_modal.step2.details": "Se hai già aggiunto il tuo sito web come campo personalizzato, dovrai eliminarlo e aggiungerlo di nuovo per attivare la verifica.",
+  "account_edit.verified_modal.step2.header": "Aggiungi il tuo sito web come campo personalizzato",
+  "account_edit.verified_modal.title": "Come aggiungere un collegamento verificato",
   "account_edit_tags.add_tag": "Aggiungi #{tagName}",
   "account_edit_tags.column_title": "Modifica gli hashtag in evidenza",
   "account_edit_tags.help_text": "Gli hashtag in evidenza aiutano gli utenti a scoprire e interagire con il tuo profilo. Appaiono come filtri nella visualizzazione Attività della tua pagina del profilo.",
@@ -315,8 +334,6 @@
   "collections.edit_details": "Modifica i dettagli",
   "collections.error_loading_collections": "Si è verificato un errore durante il tentativo di caricare le tue collezioni.",
   "collections.hints.accounts_counter": "{count} / {max} account",
-  "collections.hints.add_more_accounts": "Aggiungi almeno {count, plural, one {# account} other {# account}} per continuare",
-  "collections.hints.can_not_remove_more_accounts": "Le collezioni devono contenere almeno {count, plural, one {# account} other {# account}}. La rimozione di altri account, non è possibile.",
   "collections.last_updated_at": "Ultimo aggiornamento: {date}",
   "collections.manage_accounts": "Gestisci account",
   "collections.mark_as_sensitive": "Segna come sensibile",
@@ -772,6 +789,7 @@
   "navigation_bar.automated_deletion": "Cancellazione automatica dei post",
   "navigation_bar.blocks": "Utenti bloccati",
   "navigation_bar.bookmarks": "Segnalibri",
+  "navigation_bar.collections": "Collezioni",
   "navigation_bar.direct": "Menzioni private",
   "navigation_bar.domain_blocks": "Domini bloccati",
   "navigation_bar.favourites": "Preferiti",
diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json
index aece536ee4..af65322b11 100644
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@@ -126,7 +126,6 @@
   "account_edit.button.add": "{item} 추가",
   "account_edit.button.delete": "{item} 제거",
   "account_edit.button.edit": "{item} 편집",
-  "account_edit.char_counter": "{currentLength}/{maxLength} 글자",
   "account_edit.column_button": "완료",
   "account_edit.column_title": "프로필 편집",
   "account_note.placeholder": "클릭하여 노트 추가",
diff --git a/app/javascript/mastodon/locales/nan-TW.json b/app/javascript/mastodon/locales/nan-TW.json
index 634ea4e248..0c863ab16e 100644
--- a/app/javascript/mastodon/locales/nan-TW.json
+++ b/app/javascript/mastodon/locales/nan-TW.json
@@ -149,7 +149,6 @@
   "account_edit.button.add": "加 {item}",
   "account_edit.button.delete": "Thâi {item}",
   "account_edit.button.edit": "編 {item}",
-  "account_edit.char_counter": "{currentLength}/{maxLength} ê字",
   "account_edit.column_button": "做好ah",
   "account_edit.column_title": "編輯個人資料",
   "account_edit.custom_fields.placeholder": "加lí ê代名詞、外部連結，á是其他lí beh分享ê。",
@@ -312,8 +311,6 @@
   "collections.edit_details": "編輯詳細",
   "collections.error_loading_collections": "佇載入lí ê收藏ê時陣出tshê。",
   "collections.hints.accounts_counter": "{count} / {max} ê口座",
-  "collections.hints.add_more_accounts": "加上無 {count, plural, other {# ê口座}}來繼續",
-  "collections.hints.can_not_remove_more_accounts": "收藏定著愛上無 {count, plural, other {# ê口座}}。Bē當suá掉koh較tsē口座。",
   "collections.last_updated_at": "上尾更新tī：{date}",
   "collections.manage_accounts": "管理口座",
   "collections.mark_as_sensitive": "標做敏感ê",
diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json
index 05dd5e11b5..54025d2f06 100644
--- a/app/javascript/mastodon/locales/nl.json
+++ b/app/javascript/mastodon/locales/nl.json
@@ -149,7 +149,6 @@
   "account_edit.button.add": "{item} toevoegen",
   "account_edit.button.delete": "{item} verwijderen",
   "account_edit.button.edit": "{item} bewerken",
-  "account_edit.char_counter": "{currentLength}/{maxLength} tekens",
   "account_edit.column_button": "Klaar",
   "account_edit.column_title": "Profiel bewerken",
   "account_edit.custom_fields.placeholder": "Voeg je voornaamwoorden, externe links of iets anders toe dat je wilt delen.",
@@ -313,8 +312,6 @@
   "collections.edit_details": "Gegevens bewerken",
   "collections.error_loading_collections": "Er is een fout opgetreden bij het laden van je verzamelingen.",
   "collections.hints.accounts_counter": "{count} / {max} accounts",
-  "collections.hints.add_more_accounts": "Voeg ten minste {count, plural, one {# account} other {# accounts}} toe om door te gaan",
-  "collections.hints.can_not_remove_more_accounts": "Verzamelingen moeten ten minste {count, plural, one {# account} other {# accounts}} bevatten. Meer accounts verwijderen is niet mogelijk.",
   "collections.last_updated_at": "Laatst bijgewerkt: {date}",
   "collections.manage_accounts": "Accounts beheren",
   "collections.mark_as_sensitive": "Als gevoelig markeren",
diff --git a/app/javascript/mastodon/locales/nn.json b/app/javascript/mastodon/locales/nn.json
index d272362b99..9d7ca37c0d 100644
--- a/app/javascript/mastodon/locales/nn.json
+++ b/app/javascript/mastodon/locales/nn.json
@@ -149,7 +149,6 @@
   "account_edit.button.add": "Legg til {item}",
   "account_edit.button.delete": "Slett {item}",
   "account_edit.button.edit": "Rediger {item}",
-  "account_edit.char_counter": "{currentLength}/{maxLength} teikn",
   "account_edit.column_button": "Ferdig",
   "account_edit.column_title": "Rediger profil",
   "account_edit.custom_fields.placeholder": "Legg til pronomen, lenkjer eller kva du elles vil dela.",
@@ -313,8 +312,6 @@
   "collections.edit_details": "Rediger detaljar",
   "collections.error_loading_collections": "Noko gjekk gale då me prøvde å henta samlingane dine.",
   "collections.hints.accounts_counter": "{count} av {max} kontoar",
-  "collections.hints.add_more_accounts": "Legg til minst {count, plural, one {# konto} other {# kontoar}} for å halda fram",
-  "collections.hints.can_not_remove_more_accounts": "Samlingar må innehalda minst {count, plural, one {# konto} other {# kontoar}}. Du kan ikkje fjerna fleire kontoar.",
   "collections.last_updated_at": "Sist oppdatert: {date}",
   "collections.manage_accounts": "Handter kontoar",
   "collections.mark_as_sensitive": "Merk som ømtolig",
diff --git a/app/javascript/mastodon/locales/pt-BR.json b/app/javascript/mastodon/locales/pt-BR.json
index 1dfabccddc..ded303958f 100644
--- a/app/javascript/mastodon/locales/pt-BR.json
+++ b/app/javascript/mastodon/locales/pt-BR.json
@@ -149,7 +149,6 @@
   "account_edit.button.add": "Adicionar {item}",
   "account_edit.button.delete": "Remover {item}",
   "account_edit.button.edit": "Editar {item}",
-  "account_edit.char_counter": "{currentLength}/{maxLength} caracteres",
   "account_edit.column_button": "Feito",
   "account_edit.column_title": "Editar perfil",
   "account_edit.custom_fields.placeholder": "Insira seus pronomes, links externos ou qualquer coisa que queira compartilhar.",
@@ -310,8 +309,6 @@
   "collections.edit_details": "Editar detalhes",
   "collections.error_loading_collections": "Houve um erro ao tentar carregar suas coleções.",
   "collections.hints.accounts_counter": "{count} / {max} contas",
-  "collections.hints.add_more_accounts": "Insira pelo menos {count, plural, one {# conta} other {# contas}} para continuar",
-  "collections.hints.can_not_remove_more_accounts": "Coleções devem conter pelo menos {count, plural,one {# conta} other {# contas}}. Não é possível remover contas.",
   "collections.last_updated_at": "Atualizado pela última vez em {date}",
   "collections.manage_accounts": "Gerenciar contas",
   "collections.mark_as_sensitive": "Marcar como sensível",
diff --git a/app/javascript/mastodon/locales/pt-PT.json b/app/javascript/mastodon/locales/pt-PT.json
index 84ec51043b..9ee10e95d4 100644
--- a/app/javascript/mastodon/locales/pt-PT.json
+++ b/app/javascript/mastodon/locales/pt-PT.json
@@ -149,7 +149,6 @@
   "account_edit.button.add": "Adicionar {item}",
   "account_edit.button.delete": "Eliminar \"{item}",
   "account_edit.button.edit": "Editar {item}",
-  "account_edit.char_counter": "{currentLength}/{maxLength} caracteres",
   "account_edit.column_button": "Concluído",
   "account_edit.column_title": "Editar Perfil",
   "account_edit.custom_fields.placeholder": "Adicione os seus pronomes, hiperligações externas ou qualquer outra coisa que queira partilhar.",
@@ -306,8 +305,6 @@
   "collections.edit_details": "Editar detalhes",
   "collections.error_loading_collections": "Ocorreu um erro ao tentar carregar as suas coleções.",
   "collections.hints.accounts_counter": "{count} / {max} contas",
-  "collections.hints.add_more_accounts": "Adicione pelo menos {count, plural, one {# conta} other {# contas}} para continuar",
-  "collections.hints.can_not_remove_more_accounts": "As coleções devem conter pelo menos {count, plural, one {# conta} other {# contas}}. Não é possível remover mais contas.",
   "collections.last_updated_at": "Última atualização: {date}",
   "collections.manage_accounts": "Gerir contas",
   "collections.mark_as_sensitive": "Marcar como sensível",
diff --git a/app/javascript/mastodon/locales/sq.json b/app/javascript/mastodon/locales/sq.json
index da3794b12b..5c4974e182 100644
--- a/app/javascript/mastodon/locales/sq.json
+++ b/app/javascript/mastodon/locales/sq.json
@@ -149,16 +149,28 @@
   "account_edit.button.add": "Shtoje {item}",
   "account_edit.button.delete": "Fshije {item}",
   "account_edit.button.edit": "Përpunojeni {item}",
-  "account_edit.char_counter": "{currentLength}/{maxLength} shenja",
   "account_edit.column_button": "U bë",
   "account_edit.column_title": "Përpunoni Profil",
+  "account_edit.custom_fields.name": "fushë",
   "account_edit.custom_fields.placeholder": "Shtoni përemrat tuaj, lidhje të jashme, ose gjithçka tjetë që do të donit të ndanit me të tjerë.",
+  "account_edit.custom_fields.tip_content": "Mundeni të shtoni kollak besueshmëri për llogarinë tuaj Mastodon duke verifikuar lidhje për te çfarëdo sajti që është pronë e juaja.",
+  "account_edit.custom_fields.tip_title": "Ndihmëz: Duke shtuar lidhje të verifikuara",
   "account_edit.custom_fields.title": "Fusha vetjake",
+  "account_edit.custom_fields.verified_hint": "Si të shtoj një lidhje të verifikuar?",
   "account_edit.display_name.placeholder": "Emri juaj në ekran është ajo si duket emri juaj në profilikin dhe rrjedhat tuaja kohore.",
   "account_edit.display_name.title": "Emër në ekran",
   "account_edit.featured_hashtags.item": "hashtag-ë",
   "account_edit.featured_hashtags.placeholder": "Ndihmoni të tjerët të identifikojnë dhe të hyjnë shpejt e shpejt te subjektet tuaj të parapëlqyer.",
   "account_edit.featured_hashtags.title": "Hashtag-ë të zgjedhur",
+  "account_edit.field_delete_modal.confirm": "Jeni i sigurt se doni të fshihet kjo fushë e përshtatur? Ky veprim s’mund të zhbëhet.",
+  "account_edit.field_delete_modal.delete_button": "Fshije",
+  "account_edit.field_delete_modal.title": "Të fshihet fushë e përshtatur?",
+  "account_edit.field_edit_modal.add_title": "Shtoni fushë të përshtatur",
+  "account_edit.field_edit_modal.edit_title": "Përpunoni fushë të përshtatur",
+  "account_edit.field_edit_modal.name_hint": "P.sh., “Sajt personal”",
+  "account_edit.field_edit_modal.name_label": "Etiketë",
+  "account_edit.field_edit_modal.value_hint": "P.sh., “shembull.me”",
+  "account_edit.field_edit_modal.value_label": "Vlerë",
   "account_edit.name_modal.add_title": "Shtoni emër në ekran",
   "account_edit.name_modal.edit_title": "Përpunoni emër në ekran",
   "account_edit.profile_tab.button_label": "Përshtateni",
@@ -173,6 +185,13 @@
   "account_edit.profile_tab.subtitle": "Përshtatni skedat në profilin tuaj dhe ato çka shfaqet në to.",
   "account_edit.profile_tab.title": "Rregullime skede profili",
   "account_edit.save": "Ruaje",
+  "account_edit.verified_modal.details": "Shtoni besueshmëri te profili juaj Mastodon duke verifikuar lidhje për te sajte personalë. Ja se si funksionon:",
+  "account_edit.verified_modal.invisible_link.details": "Shtojeni lidhjen te kryet tuaja. Pjesa e rëndësishme është rel=\"me\", e cila pengon imitime në sajte me lëndë të prodhuar nga përdoruesit. Mundeni madje të përdorni një etiketë lidhjeje te kryet e faqes në vend të {tag}, por HTML-ja duhet të jetë e përdorshme pa ekzekutim të JavaScript-it.",
+  "account_edit.verified_modal.invisible_link.summary": "Si ta bëj lidhjen të padukshme?",
+  "account_edit.verified_modal.step1.header": "Kopjoni kodin HTML më poshtë dhe ngjiteni te kryet e sajtit tuaj",
+  "account_edit.verified_modal.step2.details": "Nëse e keni shtuar tashmë sajtin tuaj si një fushë të përshtatur, do t’ju duhet ta fshini dhe ta rishtoni, që të shkaktohet verifikimi.",
+  "account_edit.verified_modal.step2.header": "Shtojeni sajtin tuaj si një fushë të përshtatur",
+  "account_edit.verified_modal.title": "Si të shtohet një lidhje e verifikuar",
   "account_edit_tags.add_tag": "Shtoje #{tagName}",
   "account_edit_tags.column_title": "Përpunoni hashtag-ë të zgjedhur",
   "account_edit_tags.help_text": "Hashtag-ët e zgjedhur i ndihmojnë përdoruesit të zbulojnë dhe ndërveprojnë me profilin tuaj. Ata duken si filtra te pamja Veprimtari e faqes tuaj të Profilit.",
@@ -304,15 +323,16 @@
   "collections.delete_collection": "Fshije koleksionin",
   "collections.description_length_hint": "Kufi prej 100 shenjash",
   "collections.detail.accounts_heading": "Llogari",
+  "collections.detail.author_added_you": "{author} ju shtoi te ky koleksion",
   "collections.detail.curated_by_author": "Në kujdesin e {author}",
   "collections.detail.curated_by_you": "Nën kujdesin tuaj",
   "collections.detail.loading": "Po ngarkohet koleksion…",
+  "collections.detail.other_accounts_in_collection": "Të tjerë në këtë koleksion:",
+  "collections.detail.sensitive_note": "Ky koleksion përmban llogari dhe lëndë që mund të jetë me spec për disa përdorues.",
   "collections.detail.share": "Ndajeni këtë koleksion me të tjerë",
   "collections.edit_details": "Përpunoni hollësi",
   "collections.error_loading_collections": "Pati një gabim teksa provohej të ngarkoheshin koleksionet tuaj.",
   "collections.hints.accounts_counter": "{count} / {max} llogari",
-  "collections.hints.add_more_accounts": "Që të vazhdohet, shtoni të paktën {count, plural, one {# llogari} other {# llogari}}",
-  "collections.hints.can_not_remove_more_accounts": "Koleksionet duhet të përmbajnë të paktën {count, plural, one {# llogari} other {# llogari}}. S’është e mundshme heqja e më tepër llogarive.",
   "collections.last_updated_at": "Përditësuar së fundi më: {date}",
   "collections.manage_accounts": "Administroni llogari",
   "collections.mark_as_sensitive": "Vëri shenjë si rezervat",
@@ -768,6 +788,7 @@
   "navigation_bar.automated_deletion": "Fshirje e automatizuar postimesh",
   "navigation_bar.blocks": "Përdorues të bllokuar",
   "navigation_bar.bookmarks": "Faqerojtës",
+  "navigation_bar.collections": "Koleksione",
   "navigation_bar.direct": "Përmendje private",
   "navigation_bar.domain_blocks": "Përkatësi të bllokuara",
   "navigation_bar.favourites": "Të parapëlqyer",
diff --git a/app/javascript/mastodon/locales/tr.json b/app/javascript/mastodon/locales/tr.json
index 55cc5daef6..ea92132687 100644
--- a/app/javascript/mastodon/locales/tr.json
+++ b/app/javascript/mastodon/locales/tr.json
@@ -149,16 +149,28 @@
   "account_edit.button.add": "{item} ekle",
   "account_edit.button.delete": "{item} sil",
   "account_edit.button.edit": "{item} düzenle",
-  "account_edit.char_counter": "{currentLength}/{maxLength} karakter",
   "account_edit.column_button": "Tamamlandı",
   "account_edit.column_title": "Profili Düzenle",
+  "account_edit.custom_fields.name": "alan",
   "account_edit.custom_fields.placeholder": "Zamirlerinizi, harici bağlantılarınızı veya paylaşmak istediğiniz diğer bilgileri ekleyin.",
+  "account_edit.custom_fields.tip_content": "Sahip olduğunuz web sitelerine bağlantıları doğrulayarak Mastodon hesabınıza kolayca güvenilirlik katabilirsiniz.",
+  "account_edit.custom_fields.tip_title": "İpucu: Doğrulanmış bağlantılar ekleme",
   "account_edit.custom_fields.title": "Özel alanlar",
+  "account_edit.custom_fields.verified_hint": "Doğrulanmış bir bağlantı nasıl eklerim?",
   "account_edit.display_name.placeholder": "Görünen adınız profilinizde ve zaman akışlarında adınızın nasıl göründüğüdür.",
   "account_edit.display_name.title": "Görünen ad",
   "account_edit.featured_hashtags.item": "etiketler",
   "account_edit.featured_hashtags.placeholder": "Başkalarının favori konularınızı tanımlamasına ve bunlara hızlı bir şekilde erişmesine yardımcı olun.",
   "account_edit.featured_hashtags.title": "Öne çıkan etiketler",
+  "account_edit.field_delete_modal.confirm": "Bu özel alanı silmek istediğinizden emin misiniz? Bu işlem geri alınamaz.",
+  "account_edit.field_delete_modal.delete_button": "Sil",
+  "account_edit.field_delete_modal.title": "Özel alanı sil?",
+  "account_edit.field_edit_modal.add_title": "Özel alan ekle",
+  "account_edit.field_edit_modal.edit_title": "Özel alanı düzenle",
+  "account_edit.field_edit_modal.name_hint": "Örn. \"Kişisel web sitesi\"",
+  "account_edit.field_edit_modal.name_label": "Etiket",
+  "account_edit.field_edit_modal.value_hint": "Örn. \"example.me\"",
+  "account_edit.field_edit_modal.value_label": "Değer",
   "account_edit.name_modal.add_title": "Görünen ad ekle",
   "account_edit.name_modal.edit_title": "Görünen adı düzenle",
   "account_edit.profile_tab.button_label": "Özelleştir",
@@ -173,6 +185,13 @@
   "account_edit.profile_tab.subtitle": "Profilinizdeki sekmeleri ve bunların görüntülediği bilgileri özelleştirin.",
   "account_edit.profile_tab.title": "Profil sekme ayarları",
   "account_edit.save": "Kaydet",
+  "account_edit.verified_modal.details": "Kişisel web sitelerine bağlantıları doğrulayarak Mastodon profilinize güvenilirlik katın. İşte böyle çalışıyor:",
+  "account_edit.verified_modal.invisible_link.details": "Bağlantıyı başlığınıza ekleyin. Önemli olan kısım, kullanıcı tarafından oluşturulan içeriğe sahip web sitelerinde kimlik sahtekarlığını önleyen rel=\"me\" özniteliğidir. {tag} yerine sayfanın başlığında bir bağlantı etiketi bile kullanabilirsiniz, ancak HTML, JavaScript çalıştırılmadan erişilebilir olmalıdır.",
+  "account_edit.verified_modal.invisible_link.summary": "Bağlantıyı nasıl görünmez hale getirebilirim?",
+  "account_edit.verified_modal.step1.header": "Aşağıdaki HTML kodunu kopyalayın ve web sitenizin başlığına yapıştırın",
+  "account_edit.verified_modal.step2.details": "Web sitenizi özel alan olarak zaten eklediyseniz, doğrulamayı tetiklemek için onu silip yeniden eklemeniz gerekir.",
+  "account_edit.verified_modal.step2.header": "Web sitenizi özel bir alan olarak ekleyin",
+  "account_edit.verified_modal.title": "Doğrulanmış bir bağlantı nasıl eklenir",
   "account_edit_tags.add_tag": "#{tagName} ekle",
   "account_edit_tags.column_title": "Öne çıkarılmış etiketleri düzenle",
   "account_edit_tags.help_text": "Öne çıkan etiketler kullanıcıların profilinizi keşfetmesine ve etkileşim kurmasına yardımcı olur. Profil sayfanızın Etkinlik görünümünde filtreler olarak görünürler.",
@@ -276,6 +295,8 @@
   "callout.dismiss": "Yoksay",
   "carousel.current": "<sr>Slayt</sr> {current, number} / {max, number}",
   "carousel.slide": "Slayt {current, number} / {max, number}",
+  "character_counter.recommended": "{currentLength}/{maxLength} önerilen karakter",
+  "character_counter.required": "{currentLength}/{maxLength} karakter",
   "closed_registrations.other_server_instructions": "Mastodon merkeziyetsiz olduğu için, başka bir sunucuda bir hesap oluşturabilir ve bu sunucuyla etkileşimde bulunmaya devam edebilirsiniz.",
   "closed_registrations_modal.description": "{domain} adresinde hesap oluşturmak şu an mümkün değil ancak unutmayın ki Mastodon kullanmak için özellikle {domain} adresinde hesap oluşturmanız gerekmez.",
   "closed_registrations_modal.find_another_server": "Başka sunucu bul",
@@ -313,8 +334,6 @@
   "collections.edit_details": "Ayrıntıları düzenle",
   "collections.error_loading_collections": "Koleksiyonlarınızı yüklemeye çalışırken bir hata oluştu.",
   "collections.hints.accounts_counter": "{count} / {max} hesap",
-  "collections.hints.add_more_accounts": "Devam etmek için en az {count, plural, one {# hesap} other {# hesap}} ekleyin",
-  "collections.hints.can_not_remove_more_accounts": "Koleksiyonlar en azından {count, plural, one {# hesap} other {# hesap}} içermelidir. Daha fazla hesap çıkarmak mümkün değil.",
   "collections.last_updated_at": "Son güncelleme: {date}",
   "collections.manage_accounts": "Hesapları yönet",
   "collections.mark_as_sensitive": "Hassas olarak işaretle",
@@ -770,6 +789,7 @@
   "navigation_bar.automated_deletion": "Otomatik gönderi silme",
   "navigation_bar.blocks": "Engellenen kullanıcılar",
   "navigation_bar.bookmarks": "Yer İşaretleri",
+  "navigation_bar.collections": "Koleksiyonlar",
   "navigation_bar.direct": "Özel bahsetmeler",
   "navigation_bar.domain_blocks": "Engellenen alan adları",
   "navigation_bar.favourites": "Favorilerin",
diff --git a/app/javascript/mastodon/locales/vi.json b/app/javascript/mastodon/locales/vi.json
index f99382e69a..c2a73a77e4 100644
--- a/app/javascript/mastodon/locales/vi.json
+++ b/app/javascript/mastodon/locales/vi.json
@@ -44,7 +44,7 @@
   "account.familiar_followers_two": "Theo dõi bởi {name1} và {name2}",
   "account.featured": "Nêu bật",
   "account.featured.accounts": "Tài khoản",
-  "account.featured.collections": "Collection",
+  "account.featured.collections": "Gói khởi đầu",
   "account.featured.hashtags": "Hashtag thường dùng",
   "account.featured_tags.last_status_at": "Tút gần nhất {date}",
   "account.featured_tags.last_status_never": "Chưa có tút",
@@ -132,7 +132,7 @@
   "account.show_reblogs": "Hiện tút do @{name} đăng lại",
   "account.statuses_counter": "{count, plural, other {{counter} Tút}}",
   "account.timeline.pinned": "Đã ghim",
-  "account.timeline.pinned.view_all": "Xem tất cả tút đã ghim",
+  "account.timeline.pinned.view_all": "Xem toàn bộ tút đã ghim",
   "account.unblock": "Bỏ chặn @{name}",
   "account.unblock_domain": "Bỏ ẩn {domain}",
   "account.unblock_domain_short": "Bỏ chặn",
@@ -149,16 +149,28 @@
   "account_edit.button.add": "Thêm {item}",
   "account_edit.button.delete": "Xóa {item}",
   "account_edit.button.edit": "Sửa {item}",
-  "account_edit.char_counter": "{currentLength}/{maxLength} ký tự",
   "account_edit.column_button": "Xong",
   "account_edit.column_title": "Sửa hồ sơ",
+  "account_edit.custom_fields.name": "trường",
   "account_edit.custom_fields.placeholder": "Thêm nghề nghiệp, liên kết ngoài hoặc bất kỳ gì mà bạn muốn.",
+  "account_edit.custom_fields.tip_content": "Bạn có thể dễ dàng tăng độ tin cậy cho tài khoản Mastodon của mình bằng cách xác minh liên kết đến bất kỳ trang web nào bạn sở hữu.",
+  "account_edit.custom_fields.tip_title": "Mẹo: Thêm liên kết xác minh",
   "account_edit.custom_fields.title": "Trường tùy chỉnh",
+  "account_edit.custom_fields.verified_hint": "Làm thế nào để thêm liên kết xác minh?",
   "account_edit.display_name.placeholder": "Tên gọi là tên hiển thị trên hồ sơ của bạn, cũng như bảng tin.",
   "account_edit.display_name.title": "Tên gọi",
   "account_edit.featured_hashtags.item": "hashtag",
   "account_edit.featured_hashtags.placeholder": "Giúp mọi người nhận diện và truy cập nhanh những chủ đề mà bạn thích.",
   "account_edit.featured_hashtags.title": "Hashtag thường dùng",
+  "account_edit.field_delete_modal.confirm": "Bạn có chắc muốn xóa trường này? Hành động này không thể hoàn tác.",
+  "account_edit.field_delete_modal.delete_button": "Xóa",
+  "account_edit.field_delete_modal.title": "Xóa trường tùy chỉnh?",
+  "account_edit.field_edit_modal.add_title": "Thêm trường tùy chỉnh",
+  "account_edit.field_edit_modal.edit_title": "Sửa trường tùy chỉnh",
+  "account_edit.field_edit_modal.name_hint": "Vd: “Website cá nhân”",
+  "account_edit.field_edit_modal.name_label": "Nhãn",
+  "account_edit.field_edit_modal.value_hint": "Vd: “example.me”",
+  "account_edit.field_edit_modal.value_label": "Giá trị",
   "account_edit.name_modal.add_title": "Thêm tên gọi",
   "account_edit.name_modal.edit_title": "Sửa tên gọi",
   "account_edit.profile_tab.button_label": "Tùy chỉnh",
@@ -173,6 +185,13 @@
   "account_edit.profile_tab.subtitle": "Tùy chỉnh tab trên hồ sơ của bạn và những gì chúng hiển thị.",
   "account_edit.profile_tab.title": "Thiết lập tab hồ sơ",
   "account_edit.save": "Lưu",
+  "account_edit.verified_modal.details": "Tăng độ tin cậy cho hồ sơ Mastodon của bạn bằng cách xác minh liên kết đến trang web cá nhân. Cách thức thực hiện như sau:",
+  "account_edit.verified_modal.invisible_link.details": "Thêm liên kết trên header của trang. Quan trọng là rel=\"me\" giúp ngăn chặn việc mạo danh trên các trang web có nội dung do người dùng tạo. Bạn cũng có thể sử dụng một thẻ link thay vì {tag}, nhưng HTML phải có thể truy cập được mà không cần thực thi JavaScript.",
+  "account_edit.verified_modal.invisible_link.summary": "Làm thế nào để ẩn liên kết?",
+  "account_edit.verified_modal.step1.header": "Sao chép đoạn mã HTML bên dưới và dán vào phần đầu (header) của trang web của bạn",
+  "account_edit.verified_modal.step2.details": "Nếu bạn từng trang web của mình dưới dạng trường tùy chỉnh, bạn cần xóa và thêm lại trang web đó để kích hoạt quá trình xác minh.",
+  "account_edit.verified_modal.step2.header": "Thêm trang web của bạn dưới dạng trường tùy chỉnh",
+  "account_edit.verified_modal.title": "Làm thế nào để thêm liên kết xác minh",
   "account_edit_tags.add_tag": "Thêm #{tagName}",
   "account_edit_tags.column_title": "Sửa hashtag thường dùng",
   "account_edit_tags.help_text": "Hashtag thường dùng giúp bạn mọi người khám phá và tương tác với hồ sơ của bạn. Chúng xuất hiện như những bộ lọc trên phần Hoạt động hồ sơ.",
@@ -283,56 +302,57 @@
   "closed_registrations_modal.find_another_server": "Tìm máy chủ khác",
   "closed_registrations_modal.preamble": "Mastodon liên hợp nên bất kể bạn tạo tài khoản ở đâu, bạn cũng sẽ có thể theo dõi và tương tác với tài khoản trên máy chủ này. Bạn thậm chí có thể tự mở máy chủ!",
   "closed_registrations_modal.title": "Đăng ký Mastodon",
-  "collection.share_modal.share_link_label": "Mời chia sẻ liên kết",
+  "collection.share_modal.share_link_label": "Liên kết mời chia sẻ",
   "collection.share_modal.share_via_post": "Đăng lên Mastodon",
   "collection.share_modal.share_via_system": "Chia sẻ qua…",
-  "collection.share_modal.title": "Chia sẻ collection",
-  "collection.share_modal.title_new": "Chia sẻ collection mới của bạn!",
-  "collection.share_template_other": "Xem ngay collection tuyệt vời này: {link}",
-  "collection.share_template_own": "Xem ngay collection mới của tôi: {link}",
+  "collection.share_modal.title": "Chia sẻ gói khởi đầu",
+  "collection.share_modal.title_new": "Chia sẻ gói khởi đầu mới của bạn!",
+  "collection.share_template_other": "Xem ngay gói khởi đầu tuyệt vời này: {link}",
+  "collection.share_template_own": "Xem ngay gói khởi đầu mới của tôi: {link}",
   "collections.account_count": "{count, plural, other {# tài khoản}}",
   "collections.accounts.empty_description": "Thêm tối đa {count} tài khoản mà bạn theo dõi",
-  "collections.accounts.empty_title": "Collection này trống",
+  "collections.accounts.empty_title": "Gói khởi đầu này trống",
   "collections.collection_description": "Mô tả",
   "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 collection?",
+  "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?",
   "collections.content_warning": "Nội dung ẩn",
   "collections.continue": "Tiếp tục",
-  "collections.create.accounts_subtitle": "Chỉ những tài khoản bạn theo dõi và đã chọn tham gia chương trình khám phá mới có thể được thêm vào.",
-  "collections.create.accounts_title": "Bạn sẽ chọn ai để giới thiệu trong bộ sưu tập này?",
+  "collections.create.accounts_subtitle": "Chỉ những tài khoản bạn theo dõi và đã chọn khám phá mới có thể được thêm vào.",
+  "collections.create.accounts_title": "Bạn sẽ chọn ai để giới thiệu trong gói khởi đầu này?",
   "collections.create.basic_details_title": "Thông tin cơ bản",
   "collections.create.steps": "Bước {step}/{total}",
-  "collections.create_a_collection_hint": "Tạo một collection để giới thiệu hoặc chia sẻ những tài khoản yêu thích của bạn với người khác.",
-  "collections.create_collection": "Tạo collection",
-  "collections.delete_collection": "Xóa collection",
+  "collections.create_a_collection_hint": "Tạo một gói khởi đầu để giới thiệu hoặc chia sẻ những tài khoản yêu thích của bạn với người khác.",
+  "collections.create_collection": "Tạo gói khởi đầu",
+  "collections.delete_collection": "Xóa gói khởi đầu",
   "collections.description_length_hint": "Giới hạn 100 ký tự",
   "collections.detail.accounts_heading": "Tài khoản",
+  "collections.detail.author_added_you": "{author} đã thêm bạn vào gói khởi đầu này",
   "collections.detail.curated_by_author": "Tuyển chọn bởi {author}",
   "collections.detail.curated_by_you": "Tuyển chọn bởi bạn",
-  "collections.detail.loading": "Đang tải collection…",
-  "collections.detail.share": "Chia sẻ collection này",
+  "collections.detail.loading": "Đang tải gói khởi đầu…",
+  "collections.detail.other_accounts_in_collection": "Những người khác trong gói khởi đầu này:",
+  "collections.detail.sensitive_note": "Gói khởi đầu này chứa các tài khoản và nội dung có thể nhạy cảm đối với một số người.",
+  "collections.detail.share": "Chia sẻ gói khởi đầu này",
   "collections.edit_details": "Sửa chi tiết",
-  "collections.error_loading_collections": "Đã xảy ra lỗi khi tải những collection của bạn.",
+  "collections.error_loading_collections": "Đã xảy ra lỗi khi tải những gói khởi đầu của bạn.",
   "collections.hints.accounts_counter": "{count} / {max} tài khoản",
-  "collections.hints.add_more_accounts": "Thêm tối thiểu {count, plural, other {# tài khoản}} để tiếp tục",
-  "collections.hints.can_not_remove_more_accounts": "Bộ sưu tập phải chứa tối thiểu {count, plural, other {# tài khoản}}. Không thể gỡ nữa.",
   "collections.last_updated_at": "Lần cuối cập nhật: {date}",
   "collections.manage_accounts": "Quản lý tài khoản",
   "collections.mark_as_sensitive": "Đánh dấu nhạy cảm",
-  "collections.mark_as_sensitive_hint": "Ẩn phần mô tả và thông tin tài khoản của collection phía sau cảnh báo nội dung. Tên bộ sưu tập vẫn hiển thị.",
+  "collections.mark_as_sensitive_hint": "Ẩn phần mô tả và các tài khoản của gói khởi đầu phía sau cảnh báo nội dung. Tên gói khởi đầu vẫn hiển thị.",
   "collections.name_length_hint": "Giới hạn 40 ký tự",
-  "collections.new_collection": "Collection mới",
-  "collections.no_collections_yet": "Chưa có collection.",
+  "collections.new_collection": "Gói khởi đầu mới",
+  "collections.no_collections_yet": "Chưa có gói khởi đầu.",
   "collections.old_last_post_note": "Đăng lần cuối hơn một tuần trước",
   "collections.remove_account": "Gỡ tài khoản này",
-  "collections.report_collection": "Báo cáo collection này",
+  "collections.report_collection": "Báo cáo gói khởi đầu này",
   "collections.search_accounts_label": "Tìm tài khoản để thêm…",
   "collections.search_accounts_max_reached": "Bạn đã đạt đến số lượng tài khoản tối đa",
   "collections.sensitive": "Nhạy cảm",
-  "collections.topic_hint": "Thêm hashtag giúp người khác hiểu chủ đề chính của collection này.",
-  "collections.view_collection": "Xem collection",
-  "collections.view_other_collections_by_user": "View những collection khác từ tài khoản này",
+  "collections.topic_hint": "Thêm hashtag giúp người khác hiểu chủ đề chính của gói khởi đầu này.",
+  "collections.view_collection": "Xem gói khởi đầu",
+  "collections.view_other_collections_by_user": "Xem những gói khởi đầu khác từ tài khoản này",
   "collections.visibility_public": "Công khai",
   "collections.visibility_public_hint": "Có thể tìm thấy trong kết quả tìm kiếm và các khu vực khác nơi xuất hiện đề xuất.",
   "collections.visibility_title": "Hiển thị",
@@ -341,7 +361,7 @@
   "column.about": "Giới thiệu",
   "column.blocks": "Tài khoản đã chặn",
   "column.bookmarks": "Những tút đã lưu",
-  "column.collections": "Collection của tôi",
+  "column.collections": "Những gói khởi đầu của tôi",
   "column.community": "Máy chủ này",
   "column.create_list": "Tạo danh sách",
   "column.direct": "Nhắn riêng",
@@ -421,8 +441,8 @@
   "confirmations.discard_draft.post.title": "Bỏ tút đang soạn?",
   "confirmations.discard_edit_media.confirm": "Bỏ qua",
   "confirmations.discard_edit_media.message": "Bạn chưa lưu thay đổi của phần mô tả hoặc bản xem trước của media, vẫn bỏ qua?",
-  "confirmations.follow_to_collection.confirm": "Theo dõi & thêm vào collection",
-  "confirmations.follow_to_collection.message": "Bạn cần theo dõi {name} trước khi thêm họ vào collection.",
+  "confirmations.follow_to_collection.confirm": "Theo dõi & thêm vào gói khởi đầu",
+  "confirmations.follow_to_collection.message": "Bạn cần theo dõi {name} trước khi thêm họ vào gói khởi đầu.",
   "confirmations.follow_to_collection.title": "Theo dõi tài khoản?",
   "confirmations.follow_to_list.confirm": "Theo dõi & thêm vào danh sách",
   "confirmations.follow_to_list.message": "Bạn cần theo dõi {name} trước khi thêm họ vào danh sách.",
@@ -678,7 +698,7 @@
   "intervals.full.minutes": "{number, plural, other {# phút}}",
   "keyboard_shortcuts.back": "quay lại",
   "keyboard_shortcuts.blocked": "mở danh sách tài khoản đã chặn",
-  "keyboard_shortcuts.boost": "đăng lại",
+  "keyboard_shortcuts.boost": "đăng lại tút",
   "keyboard_shortcuts.column": "mở các cột",
   "keyboard_shortcuts.compose": "mở khung soạn tút",
   "keyboard_shortcuts.description": "Mô tả",
@@ -693,7 +713,7 @@
   "keyboard_shortcuts.home": "mở trang chủ",
   "keyboard_shortcuts.hotkey": "Phím tắt",
   "keyboard_shortcuts.legend": "hiện bảng hướng dẫn này",
-  "keyboard_shortcuts.load_more": "Mở nút \"Tải thêm\"",
+  "keyboard_shortcuts.load_more": "mở nút \"Tải thêm\"",
   "keyboard_shortcuts.local": "mở máy chủ của bạn",
   "keyboard_shortcuts.mention": "nhắc đến ai đó",
   "keyboard_shortcuts.muted": "mở danh sách tài khoản đã phớt lờ",
@@ -702,7 +722,7 @@
   "keyboard_shortcuts.open_media": "mở ảnh hoặc video",
   "keyboard_shortcuts.pinned": "mở những tút đã ghim",
   "keyboard_shortcuts.profile": "mở trang của người đăng tút",
-  "keyboard_shortcuts.quote": "Trích dẫn tút",
+  "keyboard_shortcuts.quote": "trích dẫn tút",
   "keyboard_shortcuts.reply": "trả lời",
   "keyboard_shortcuts.requests": "mở danh sách yêu cầu theo dõi",
   "keyboard_shortcuts.search": "mở tìm kiếm",
@@ -711,7 +731,7 @@
   "keyboard_shortcuts.toggle_hidden": "ẩn/hiện nội dung ẩn",
   "keyboard_shortcuts.toggle_sensitivity": "ẩn/hiện ảnh hoặc video",
   "keyboard_shortcuts.toot": "soạn tút mới",
-  "keyboard_shortcuts.top": "Chuyển đến đầu danh sách",
+  "keyboard_shortcuts.top": "di chuyển đến đầu danh sách",
   "keyboard_shortcuts.translate": "dịch tút",
   "keyboard_shortcuts.unfocus": "đưa con trỏ ra khỏi ô soạn thảo hoặc ô tìm kiếm",
   "keyboard_shortcuts.up": "di chuyển lên trên danh sách",
@@ -772,6 +792,7 @@
   "navigation_bar.automated_deletion": "Tự động xóa tút cũ",
   "navigation_bar.blocks": "Tài khoản đã chặn",
   "navigation_bar.bookmarks": "Tút lưu",
+  "navigation_bar.collections": "Gói khởi đầu",
   "navigation_bar.direct": "Nhắn riêng",
   "navigation_bar.domain_blocks": "Máy chủ đã ẩn",
   "navigation_bar.favourites": "Tút thích",
@@ -998,7 +1019,7 @@
   "report.category.title_account": "Người",
   "report.category.title_status": "Tút",
   "report.close": "Xong",
-  "report.collection_comment": "Vì sao bạn muốn báo cáo collection này?",
+  "report.collection_comment": "Vì sao bạn muốn báo cáo gói khởi đầu này?",
   "report.comment.title": "Có điều gì mà chúng tôi cần biết không?",
   "report.forward": "Chuyển đến {target}",
   "report.forward_hint": "Người này thuộc máy chủ khác. Gửi một báo cáo ẩn danh tới máy chủ đó?",
diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json
index e29dd87347..d8d2dd76b4 100644
--- a/app/javascript/mastodon/locales/zh-CN.json
+++ b/app/javascript/mastodon/locales/zh-CN.json
@@ -149,7 +149,6 @@
   "account_edit.button.add": "添加 {item}",
   "account_edit.button.delete": "删除 {item}",
   "account_edit.button.edit": "编辑 {item}",
-  "account_edit.char_counter": "{currentLength}/{maxLength} 个字",
   "account_edit.column_button": "完成",
   "account_edit.column_title": "修改个人资料",
   "account_edit.custom_fields.placeholder": "添加你的人称代词、外部链接，或其他你想分享的内容。",
@@ -276,7 +275,7 @@
   "callout.dismiss": "忽略",
   "carousel.current": "<sr>幻灯片</sr> {current, number} / {max, number}",
   "carousel.slide": "第 {current, number} 张幻灯片，共 {max, number} 张",
-  "character_counter.recommended": "{currentLength}/{maxLength} 个推荐字符",
+  "character_counter.recommended": "{currentLength}/{maxLength} 个建议字数",
   "character_counter.required": "{currentLength}/{maxLength} 个字",
   "closed_registrations.other_server_instructions": "基于 Mastodon 去中心化的特性，你可以其他服务器上创建账号，并继续与此服务器互动。",
   "closed_registrations_modal.description": "你目前无法在 {domain} 上创建账号，但请注意，使用 Mastodon 并非需要专门在 {domain} 上注册账号。",
@@ -315,8 +314,6 @@
   "collections.edit_details": "编辑详情",
   "collections.error_loading_collections": "加载你的收藏列表时发生错误。",
   "collections.hints.accounts_counter": "{count} / {max} 个账号",
-  "collections.hints.add_more_accounts": "添加至少 {count, plural, other {# 个账号}}以继续",
-  "collections.hints.can_not_remove_more_accounts": "收藏列表必须包含至少 {count, plural, other {# 个账号}}。无法移除更多账号。",
   "collections.last_updated_at": "最后更新：{date}",
   "collections.manage_accounts": "管理账户",
   "collections.mark_as_sensitive": "标记为敏感内容",
@@ -772,6 +769,7 @@
   "navigation_bar.automated_deletion": "自动删除嘟文",
   "navigation_bar.blocks": "已屏蔽的用户",
   "navigation_bar.bookmarks": "书签",
+  "navigation_bar.collections": "收藏列表",
   "navigation_bar.direct": "私下提及",
   "navigation_bar.domain_blocks": "已屏蔽的域名",
   "navigation_bar.favourites": "喜欢",
diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json
index 18d9539512..f380953cae 100644
--- a/app/javascript/mastodon/locales/zh-TW.json
+++ b/app/javascript/mastodon/locales/zh-TW.json
@@ -149,16 +149,28 @@
   "account_edit.button.add": "加入 {item}",
   "account_edit.button.delete": "刪除 {item}",
   "account_edit.button.edit": "編輯 {item}",
-  "account_edit.char_counter": "{currentLength}/{maxLength} 個字",
   "account_edit.column_button": "完成",
   "account_edit.column_title": "編輯個人檔案",
+  "account_edit.custom_fields.name": "欄位",
   "account_edit.custom_fields.placeholder": "加入您的稱謂、外部連結、或其他您想分享的。",
-  "account_edit.custom_fields.title": "自定義欄位",
+  "account_edit.custom_fields.tip_content": "您能透過驗證任何您擁有網站之連結，以輕鬆增加您 Mastodon 帳號之可信度。",
+  "account_edit.custom_fields.tip_title": "小撇步：新增驗證連結",
+  "account_edit.custom_fields.title": "自訂欄位",
+  "account_edit.custom_fields.verified_hint": "如何新增驗證連結？",
   "account_edit.display_name.placeholder": "您的顯示名稱是您將於個人檔案與時間軸的出現方式。",
   "account_edit.display_name.title": "顯示名稱",
   "account_edit.featured_hashtags.item": "主題標籤",
   "account_edit.featured_hashtags.placeholder": "協助其他人識別、以及快速存取您的最愛主題。",
   "account_edit.featured_hashtags.title": "推薦主題標籤",
+  "account_edit.field_delete_modal.confirm": "您確定要刪除此自訂欄位嗎？此動作無法復原。",
+  "account_edit.field_delete_modal.delete_button": "刪除",
+  "account_edit.field_delete_modal.title": "是否刪除自訂欄位？",
+  "account_edit.field_edit_modal.add_title": "新增自訂欄位",
+  "account_edit.field_edit_modal.edit_title": "編輯自訂欄位",
+  "account_edit.field_edit_modal.name_hint": "例如：「個人網站」",
+  "account_edit.field_edit_modal.name_label": "標籤",
+  "account_edit.field_edit_modal.value_hint": "例如「example.me」",
+  "account_edit.field_edit_modal.value_label": "值",
   "account_edit.name_modal.add_title": "新增顯示名稱",
   "account_edit.name_modal.edit_title": "編輯顯示名稱",
   "account_edit.profile_tab.button_label": "自訂",
@@ -173,6 +185,13 @@
   "account_edit.profile_tab.subtitle": "自訂您個人檔案之分頁與內容。",
   "account_edit.profile_tab.title": "個人檔案分頁設定",
   "account_edit.save": "儲存",
+  "account_edit.verified_modal.details": "藉由驗證連結至個人網站增加您 Mastodon 個人檔案之可信度。運作方式如下：",
+  "account_edit.verified_modal.invisible_link.details": "新增連結至您的標頭 (header)。其重要的部分是 rel=\"me\" ，防止透過使用者產生內容模擬。您甚至能使用頁面標頭之 link 標籤取代頁面中的 {tag}，但 HTML 必須能於不執行 JavaScript 情況下所存取。",
+  "account_edit.verified_modal.invisible_link.summary": "如何隱藏此連結？",
+  "account_edit.verified_modal.step1.header": "複製下面的 HTML 程式碼並貼至您網站的標頭 (header) 中",
+  "account_edit.verified_modal.step2.details": "若您已將您的網站新增至自訂欄位，您需要刪除並重新加入以觸發驗證。",
+  "account_edit.verified_modal.step2.header": "將您的網站加入為自訂欄位",
+  "account_edit.verified_modal.title": "如何新增驗證連結",
   "account_edit_tags.add_tag": "加入 #{tagName}",
   "account_edit_tags.column_title": "編輯推薦主題標籤",
   "account_edit_tags.help_text": "推薦主題標籤幫助其他人發現並與您的個人檔案互動。它們將作為過濾器出現於您個人檔案頁面之動態中。",
@@ -308,15 +327,16 @@
   "collections.delete_collection": "刪除收藏名單",
   "collections.description_length_hint": "100 字限制",
   "collections.detail.accounts_heading": "帳號",
+  "collections.detail.author_added_you": "{author} 將您加入至此收藏名單",
   "collections.detail.curated_by_author": "由 {author} 精選",
   "collections.detail.curated_by_you": "由您精選",
   "collections.detail.loading": "讀取收藏名單中...",
+  "collections.detail.other_accounts_in_collection": "此收藏名單中其他人：",
+  "collections.detail.sensitive_note": "此收藏名單可能包含對某些使用者敏感之帳號或內容。",
   "collections.detail.share": "分享此收藏名單",
   "collections.edit_details": "編輯詳細資料",
   "collections.error_loading_collections": "讀取您的收藏名單時發生錯誤。",
   "collections.hints.accounts_counter": "{count} / {max} 個帳號",
-  "collections.hints.add_more_accounts": "加入至少 {count, plural, other {# 個帳號}}以繼續",
-  "collections.hints.can_not_remove_more_accounts": "收藏名單必須至少包含 {count, plural, other {# 個帳號}}。無法移除更多帳號。",
   "collections.last_updated_at": "最後更新：{date}",
   "collections.manage_accounts": "管理帳號",
   "collections.mark_as_sensitive": "標記為敏感內容",
@@ -772,6 +792,7 @@
   "navigation_bar.automated_deletion": "自動嘟文刪除",
   "navigation_bar.blocks": "已封鎖使用者",
   "navigation_bar.bookmarks": "書籤",
+  "navigation_bar.collections": "收藏名單",
   "navigation_bar.direct": "私訊",
   "navigation_bar.domain_blocks": "已封鎖網域",
   "navigation_bar.favourites": "最愛",
diff --git a/app/javascript/material-icons/400-24px/drag_indicator-fill.svg b/app/javascript/material-icons/400-24px/drag_indicator-fill.svg
new file mode 100644
index 0000000000..e5221f8d5d
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/drag_indicator-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M360-160q-33 0-56.5-23.5T280-240q0-33 23.5-56.5T360-320q33 0 56.5 23.5T440-240q0 33-23.5 56.5T360-160Zm240 0q-33 0-56.5-23.5T520-240q0-33 23.5-56.5T600-320q33 0 56.5 23.5T680-240q0 33-23.5 56.5T600-160ZM360-400q-33 0-56.5-23.5T280-480q0-33 23.5-56.5T360-560q33 0 56.5 23.5T440-480q0 33-23.5 56.5T360-400Zm240 0q-33 0-56.5-23.5T520-480q0-33 23.5-56.5T600-560q33 0 56.5 23.5T680-480q0 33-23.5 56.5T600-400ZM360-640q-33 0-56.5-23.5T280-720q0-33 23.5-56.5T360-800q33 0 56.5 23.5T440-720q0 33-23.5 56.5T360-640Zm240 0q-33 0-56.5-23.5T520-720q0-33 23.5-56.5T600-800q33 0 56.5 23.5T680-720q0 33-23.5 56.5T600-640Z"/></svg>
\ No newline at end of file
diff --git a/app/javascript/material-icons/400-24px/drag_indicator.svg b/app/javascript/material-icons/400-24px/drag_indicator.svg
new file mode 100644
index 0000000000..e5221f8d5d
--- /dev/null
+++ b/app/javascript/material-icons/400-24px/drag_indicator.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path d="M360-160q-33 0-56.5-23.5T280-240q0-33 23.5-56.5T360-320q33 0 56.5 23.5T440-240q0 33-23.5 56.5T360-160Zm240 0q-33 0-56.5-23.5T520-240q0-33 23.5-56.5T600-320q33 0 56.5 23.5T680-240q0 33-23.5 56.5T600-160ZM360-400q-33 0-56.5-23.5T280-480q0-33 23.5-56.5T360-560q33 0 56.5 23.5T440-480q0 33-23.5 56.5T360-400Zm240 0q-33 0-56.5-23.5T520-480q0-33 23.5-56.5T600-560q33 0 56.5 23.5T680-480q0 33-23.5 56.5T600-400ZM360-640q-33 0-56.5-23.5T280-720q0-33 23.5-56.5T360-800q33 0 56.5 23.5T440-720q0 33-23.5 56.5T360-640Zm240 0q-33 0-56.5-23.5T520-720q0-33 23.5-56.5T600-800q33 0 56.5 23.5T680-720q0 33-23.5 56.5T600-640Z"/></svg>
\ No newline at end of file
diff --git a/app/validators/note_length_validator.rb b/app/validators/note_length_validator.rb
index 1a16bbf2b3..9e554e49c0 100644
--- a/app/validators/note_length_validator.rb
+++ b/app/validators/note_length_validator.rb
@@ -2,7 +2,7 @@
 
 class NoteLengthValidator < ActiveModel::EachValidator
   def validate_each(record, attribute, value)
-    record.errors.add(attribute, :too_long, message: I18n.t('statuses.over_character_limit', max: options[:maximum]), count: options[:maximum]) if too_long?(value)
+    record.errors.add(attribute, :too_long, count: options[:maximum]) if too_long?(value)
   end
 
   private
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index c68c7f755e..4c470d2e6c 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -8,7 +8,7 @@ vi:
     title: Giới thiệu
   accounts:
     errors:
-      cannot_be_added_to_collections: Tài khoản này không thể thêm vào bộ sưu tập.
+      cannot_be_added_to_collections: Tài khoản này không thể thêm vào gói khởi đầu.
     followers:
       other: Người theo dõi
     following:
@@ -53,7 +53,7 @@ vi:
         label: Đổi vai trò
         no_role: Chưa có vai trò
         title: Thay đổi vai trò %{username}
-      collections: Collection
+      collections: Những gói khởi đầu
       confirm: Phê duyệt
       confirmed: Đã xác minh
       confirming: Chờ xác nhận
@@ -263,7 +263,7 @@ vi:
         demote_user_html: "%{name} đã hạ vai trò của %{target}"
         destroy_announcement_html: "%{name} đã xóa thông báo %{target}"
         destroy_canonical_email_block_html: "%{name} đã bỏ chặn địa chỉ email biến thể %{target}"
-        destroy_collection_html: "%{name} đã gỡ collection của %{target}"
+        destroy_collection_html: "%{name} đã gỡ gói khởi đầu của %{target}"
         destroy_custom_emoji_html: "%{name} đã xóa emoji %{target}"
         destroy_domain_allow_html: "%{name} đã ngừng liên hợp với %{target}"
         destroy_domain_block_html: "%{name} đã bỏ chặn máy chủ %{target}"
@@ -303,7 +303,7 @@ vi:
         unsilence_account_html: "%{name} đã bỏ ẩn %{target}"
         unsuspend_account_html: "%{name} đã bỏ vô hiệu hóa %{target}"
         update_announcement_html: "%{name} đã cập nhật thông báo %{target}"
-        update_collection_html: "%{name} đã cập nhật collection của %{target}"
+        update_collection_html: "%{name} đã cập nhật gói khởi đầu của %{target}"
         update_custom_emoji_html: "%{name} đã cập nhật emoji %{target}"
         update_domain_block_html: "%{name} đã cập nhật chặn máy chủ %{target}"
         update_ip_block_html: "%{name} đã cập nhật chặn IP %{target}"
@@ -341,7 +341,7 @@ vi:
       updated_msg: Cập nhật thông báo thành công!
     collections:
       accounts: Tài khoản
-      collection_title: Collection bởi %{name}
+      collection_title: Gói khởi đầu bởi %{name}
       contents: Nội dung
       number_of_accounts:
         other: "%{count} tài khoản"
@@ -677,7 +677,7 @@ vi:
       cancel: Hủy bỏ
       category: Phân loại
       category_description_html: Lý do tài khoản hoặc nội dung này bị báo cáo sẽ được trích dẫn khi giao tiếp với họ
-      collections: Collection (%{count})
+      collections: Gói khởi đầu (%{count})
       comment:
         none: Không có mô tả
       comment_description_html: "%{name} cho biết thêm:"
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index d9582685f9..d7c00ec9df 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -1200,7 +1200,7 @@ zh-TW:
     advanced_settings: 進階設定
     animations_and_accessibility: 動畫與無障礙設定
     boosting_preferences: 轉嘟偏好設定
-    boosting_preferences_info_html: "<strong>小技巧：</strong> 無論設定為何， <kbd>Shift</kbd> + <kbd>Click</kbd> 於 %{icon} 轉嘟圖示將會立即轉嘟。"
+    boosting_preferences_info_html: "<strong>小撇步：</strong> 無論設定為何， <kbd>Shift</kbd> + <kbd>Click</kbd> 於 %{icon} 轉嘟圖示將會立即轉嘟。"
     discovery: 探索
     localization:
       body: Mastodon 是由志願者所翻譯。
diff --git a/package.json b/package.json
index 8d599f8d64..a169cab970 100644
--- a/package.json
+++ b/package.json
@@ -42,6 +42,7 @@
   "dependencies": {
     "@csstools/stylelint-formatter-github": "^2.0.0",
     "@dnd-kit/core": "^6.1.0",
+    "@dnd-kit/modifiers": "^9.0.0",
     "@dnd-kit/sortable": "^10.0.0",
     "@dnd-kit/utilities": "^3.2.2",
     "@formatjs/intl-pluralrules": "^5.4.4",
diff --git a/spec/requests/api/v1/accounts/credentials_spec.rb b/spec/requests/api/v1/accounts/credentials_spec.rb
index f68ebbdb22..a3cbc40e0f 100644
--- a/spec/requests/api/v1/accounts/credentials_spec.rb
+++ b/spec/requests/api/v1/accounts/credentials_spec.rb
@@ -91,7 +91,7 @@ RSpec.describe 'credentials API' do
         expect(response.parsed_body)
           .to include(
             error: /Validation failed/,
-            details: include(note: contain_exactly(include(error: 'ERR_TOO_LONG', description: /character limit/)))
+            details: include(note: contain_exactly(include(error: 'ERR_TOO_LONG', description: /too long/)))
           )
       end
     end
diff --git a/spec/requests/api/v1/profiles_spec.rb b/spec/requests/api/v1/profiles_spec.rb
index faff16bcc1..b2c74b0191 100644
--- a/spec/requests/api/v1/profiles_spec.rb
+++ b/spec/requests/api/v1/profiles_spec.rb
@@ -89,7 +89,7 @@ RSpec.describe 'Profile API' do
         expect(response.parsed_body)
           .to include(
             error: /Validation failed/,
-            details: include(note: contain_exactly(include(error: 'ERR_TOO_LONG', description: /character limit/)))
+            details: include(note: contain_exactly(include(error: 'ERR_TOO_LONG', description: /too long/)))
           )
       end
     end
diff --git a/spec/validators/note_length_validator_spec.rb b/spec/validators/note_length_validator_spec.rb
index b391390a55..1acf33575b 100644
--- a/spec/validators/note_length_validator_spec.rb
+++ b/spec/validators/note_length_validator_spec.rb
@@ -50,7 +50,7 @@ RSpec.describe NoteLengthValidator do
   private
 
   def too_long_message
-    I18n.t('statuses.over_character_limit', max: 100)
+    I18n.t('errors.messages.too_long', count: 100)
   end
 
   def starting_string
diff --git a/yarn.lock b/yarn.lock
index 51e8353f93..3b8fea5ffe 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1917,6 +1917,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@dnd-kit/modifiers@npm:^9.0.0":
+  version: 9.0.0
+  resolution: "@dnd-kit/modifiers@npm:9.0.0"
+  dependencies:
+    "@dnd-kit/utilities": "npm:^3.2.2"
+    tslib: "npm:^2.0.0"
+  peerDependencies:
+    "@dnd-kit/core": ^6.3.0
+    react: ">=16.8.0"
+  checksum: 10c0/ca8cc9da8296df10774d779c1611074dc327ccc3c49041c102111c98c7f2b2b73b6af5209c0eef6b2fe978ac63dc2a985efa87c85a8d786577304bd2e64cee1d
+  languageName: node
+  linkType: hard
+
 "@dnd-kit/sortable@npm:^10.0.0":
   version: 10.0.0
   resolution: "@dnd-kit/sortable@npm:10.0.0"
@@ -2804,6 +2817,7 @@ __metadata:
   dependencies:
     "@csstools/stylelint-formatter-github": "npm:^2.0.0"
     "@dnd-kit/core": "npm:^6.1.0"
+    "@dnd-kit/modifiers": "npm:^9.0.0"
     "@dnd-kit/sortable": "npm:^10.0.0"
     "@dnd-kit/utilities": "npm:^3.2.2"
     "@eslint/js": "npm:^9.39.2"