From 528450db61140f1fbbeae4b41b604fefd495916e Mon Sep 17 00:00:00 2001
From: Linus Rath <139418639+rathlinus@users.noreply.github.com>
Date: Wed, 28 Oct 2026 07:10:42 +0100
Subject: [PATCH] fix: name the edit button of a shared tag after the tag, not
 the list

---
 components/admin/org/sections/shared-tags-section.tsx | 2 +-
 components/layout/sidebar.tsx                         | 1 +
 components/settings/shared-tag-settings.tsx           | 4 ++--
 locales/de/common.json                                | 1 +
 locales/en/common.json                                | 1 +
 5 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/components/admin/org/sections/shared-tags-section.tsx b/components/admin/org/sections/shared-tags-section.tsx
index 847748d3c..4bd0c35d5 100644
--- a/components/admin/org/sections/shared-tags-section.tsx
+++ b/components/admin/org/sections/shared-tags-section.tsx
@@ -15,7 +15,7 @@ export function SharedTagsSection({ draft }: { draft: OrgPolicyDraft }) {
     <SettingsSection
       id="shared-tags"
       title="Shared tags"
-      description="Members of a group mailbox see the same tag names and colours on its mail, and members who may change the mailbox edit them (Stalwart 1.0 or later)."
+      description="Members of a group mailbox see the same tag names and colours on its mail; members who may change the mailbox can edit them (Stalwart 1.0 or later)."
     >
       <div data-testid="org-shared-tags-section">
         {restrictionKeysForPage('org-sharing')
diff --git a/components/layout/sidebar.tsx b/components/layout/sidebar.tsx
index e75782412..f61ab4922 100644
--- a/components/layout/sidebar.tsx
+++ b/components/layout/sidebar.tsx
@@ -868,6 +868,7 @@ function SharedAccountTags({
           onToggle={() => setExpanded((open) => !open)}
           onSettings={() => router.push(buildSettingsPath('organize', 'shared-tags'))}
           settingsTitle={t('edit')}
+          testId="section-shared-tags"
           isCollapsed={false}
           sub
         />
diff --git a/components/settings/shared-tag-settings.tsx b/components/settings/shared-tag-settings.tsx
index 694c690a4..1301b5259 100644
--- a/components/settings/shared-tag-settings.tsx
+++ b/components/settings/shared-tag-settings.tsx
@@ -237,8 +237,8 @@ function SharedAccountTagEditor({ scope, name }: { scope: TagScope; name: string
               type="button"
               onClick={() => { setEditing({ id: tag.id }); setConfirmDelete(null); }}
               className="grid h-8 w-8 place-items-center rounded-md text-muted-foreground hover:bg-muted hover:text-foreground"
-              title={found ? t("name_it") : t("edit")}
-              aria-label={found ? t("name_it") : t("edit")}
+              title={found ? t("name_it") : t("edit_tag")}
+              aria-label={found ? t("name_it") : t("edit_tag")}
             >
               {found ? <Plus className="h-4 w-4" /> : <Pencil className="h-4 w-4" />}
             </button>
diff --git a/locales/de/common.json b/locales/de/common.json
index 665df692d..740dc7289 100644
--- a/locales/de/common.json
+++ b/locales/de/common.json
@@ -332,6 +332,7 @@
     "picker_heading": "Mit allen in diesem Postfach geteilt",
     "sidebar_heading": "Tags",
     "edit": "Geteilte Labels bearbeiten",
+    "edit_tag": "Label bearbeiten",
     "add": "Geteiltes Label hinzufügen",
     "name": "Name",
     "colour": "Farbe",
diff --git a/locales/en/common.json b/locales/en/common.json
index 258aa53a5..75f0e3ab1 100644
--- a/locales/en/common.json
+++ b/locales/en/common.json
@@ -332,6 +332,7 @@
     "picker_heading": "Shared with everyone in this mailbox",
     "sidebar_heading": "Tags",
     "edit": "Edit shared tags",
+    "edit_tag": "Edit tag",
     "add": "Add shared tag",
     "name": "Name",
     "colour": "Colour",