From f2ea18136bae0e8bcae456721f5b6fbc804663f4 Mon Sep 17 00:00:00 2001
From: Echo <ChaosExAnima@users.noreply.github.com>
Date: Wed, 19 Aug 2026 13:03:48 +0000
Subject: [PATCH] Redesign: Clarify message meaning (#40197)

---
 .../mastodon/features/compose/redesign/header.tsx           | 4 ++++
 app/javascript/mastodon/features/compose/redesign/index.tsx | 1 +
 .../mastodon/features/compose/redesign/textarea.tsx         | 2 ++
 .../mastodon/features/compose/redesign/trigger.tsx          | 6 +++++-
 .../mastodon/features/compose/redesign/visibility.tsx       | 1 +
 .../mastodon/features/navigation_panel/redesign/index.tsx   | 1 +
 6 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/app/javascript/mastodon/features/compose/redesign/header.tsx b/app/javascript/mastodon/features/compose/redesign/header.tsx
index 85edc35e59c..7322978dfef 100644
--- a/app/javascript/mastodon/features/compose/redesign/header.tsx
+++ b/app/javascript/mastodon/features/compose/redesign/header.tsx
@@ -39,10 +39,14 @@ const messages = defineMessages({
   messageNew: {
     id: 'compose_form.message.title.new',
     defaultMessage: 'New message',
+    description:
+      'Message refers to a direct message. For languages where this is confusing, "chat" or "direct message" can be used.',
   },
   messageEdit: {
     id: 'compose_form.message.title.edit',
     defaultMessage: 'Edit message',
+    description:
+      'Message refers to a direct message. For languages where this is confusing, "chat" or "direct message" can be used.',
   },
 });
 
diff --git a/app/javascript/mastodon/features/compose/redesign/index.tsx b/app/javascript/mastodon/features/compose/redesign/index.tsx
index a7b4615fe24..1aad10855aa 100644
--- a/app/javascript/mastodon/features/compose/redesign/index.tsx
+++ b/app/javascript/mastodon/features/compose/redesign/index.tsx
@@ -100,6 +100,7 @@ export const RedesignComposeForm: React.FC<RedesignComposeFormProps> = ({
               <FormattedMessage
                 id='compose.message.notice'
                 defaultMessage='Messages are not end-to-end encrypted'
+                description='Message refers to a direct message. For languages where this is confusing, "chat" or "direct message" can be used.'
               />
             </p>
           )}
diff --git a/app/javascript/mastodon/features/compose/redesign/textarea.tsx b/app/javascript/mastodon/features/compose/redesign/textarea.tsx
index 1d5b1e3e2f9..3e59ebe57a2 100644
--- a/app/javascript/mastodon/features/compose/redesign/textarea.tsx
+++ b/app/javascript/mastodon/features/compose/redesign/textarea.tsx
@@ -33,6 +33,8 @@ const messages = defineMessages({
   messagePlaceholder: {
     id: 'compose.message.placeholder',
     defaultMessage: 'Add your recipients and your message.',
+    description:
+      'Message refers to a direct message. For languages where this is confusing, "chat" or "direct message" can be used.',
   },
 });
 
diff --git a/app/javascript/mastodon/features/compose/redesign/trigger.tsx b/app/javascript/mastodon/features/compose/redesign/trigger.tsx
index 91f5253c616..2654e77c75c 100644
--- a/app/javascript/mastodon/features/compose/redesign/trigger.tsx
+++ b/app/javascript/mastodon/features/compose/redesign/trigger.tsx
@@ -108,7 +108,11 @@ export const ComposeRedesignButton: React.FC = () => {
           onClick={handleComposerOpen}
           leadingIcon={ChatCircleIcon}
         >
-          <FormattedMessage id='compose.new.message' defaultMessage='Message' />
+          <FormattedMessage
+            id='compose.new.message'
+            defaultMessage='Message'
+            description='Message refers to a direct message. For languages where this is confusing, "chat" or "direct message" can be used.'
+          />
         </DropdownItemButton>
       </DropdownPopover>
     </>
diff --git a/app/javascript/mastodon/features/compose/redesign/visibility.tsx b/app/javascript/mastodon/features/compose/redesign/visibility.tsx
index 0504ecb1073..b1d2c0b946f 100644
--- a/app/javascript/mastodon/features/compose/redesign/visibility.tsx
+++ b/app/javascript/mastodon/features/compose/redesign/visibility.tsx
@@ -257,6 +257,7 @@ const ComposeVisibilityMenu: React.FC<Record<string, unknown>> = (
         <FormattedMessage
           id='compose.post.to_message'
           defaultMessage='Compose a message instead'
+          description='Message refers to a direct message. For languages where this is confusing, "chat" or "direct message" can be used.'
         />
       </DropdownItemButton>
     </Dropdown>
diff --git a/app/javascript/mastodon/features/navigation_panel/redesign/index.tsx b/app/javascript/mastodon/features/navigation_panel/redesign/index.tsx
index bddd810c24a..da491cd4a25 100644
--- a/app/javascript/mastodon/features/navigation_panel/redesign/index.tsx
+++ b/app/javascript/mastodon/features/navigation_panel/redesign/index.tsx
@@ -91,6 +91,7 @@ export const RedesignNavigationPanel: React.FC<{ siteName?: string }> = ({
               <FormattedMessage
                 id='tabs_bar.messages'
                 defaultMessage='Messages'
+                description='Message refers to a direct message. For languages where this is confusing, "chat" or "direct message" can be used.'
               />
             </NavigationLink>
             <NavigationLink to='/bookmarks' iconComponent={BookmarkSimpleIcon}>