From 9c6a2f498e0802528167c112b1640a051109b524 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Tejero=20Cantero?= Date: Tue, 3 Nov 2026 13:53:25 +0100 Subject: [PATCH] :lipstick: Say conflict, not clash, in the conflict dialogs The resolve dialog called a property that both sides changed a clash, while the dialog itself speaks of conflicts. Use one word throughout: the tag reads Conflict, the count reads N conflicts, and the intro names the Conflict tag. Only the English copy changes; the message keys and the internal :clash source keep their names. AI-assisted-by: claude-opus-5-5 --- frontend/src/app/main/ui/ds/product/tag.cljs | 2 +- frontend/src/app/main/ui/ds/product/tag.mdx | 2 +- frontend/translations/en.po | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/frontend/src/app/main/ui/ds/product/tag.cljs b/frontend/src/app/main/ui/ds/product/tag.cljs index 3eb7fb7fdb..ec89d3139c 100644 --- a/frontend/src/app/main/ui/ds/product/tag.cljs +++ b/frontend/src/app/main/ui/ds/product/tag.cljs @@ -24,7 +24,7 @@ (mf/defc tag* "A short, static status word. The `label` variant is a small code-font - tag that names what something is (Board, Verified, Clash); + tag that names what something is (Board, Verified, Conflict); the `pill` variant is a rounded word or count that sits at the end of a row (Choose, Decided, 3 edits). The tone colours both; `icon` goes before the text." diff --git a/frontend/src/app/main/ui/ds/product/tag.mdx b/frontend/src/app/main/ui/ds/product/tag.mdx index f54fba84f9..98e4bbf308 100644 --- a/frontend/src/app/main/ui/ds/product/tag.mdx +++ b/frontend/src/app/main/ui/ds/product/tag.mdx @@ -19,7 +19,7 @@ stands. ## Variants `label` (the default) is a small code-font tag that names a type or a -state: Board, Main component, Verified, Clash. +state: Board, Main component, Verified, Conflict. `pill` is a rounded word or count at the end of a row: Choose, Decided, 3 edits, 14 shapes. diff --git a/frontend/translations/en.po b/frontend/translations/en.po index 77447579cc..3518377dd0 100644 --- a/frontend/translations/en.po +++ b/frontend/translations/en.po @@ -11263,7 +11263,7 @@ msgstr "What this choice drops" #: src/app/main/ui/workspace/sidebar/branch_review/conflicts.cljs:305 msgid "workspace.branches.resolve.intro-attrs" -msgstr "Main and this branch both edited this. Only the properties marked Clash need a choice; the others changed on one side only, so they are already filled in." +msgstr "Main and this branch both edited this. Only the properties marked Conflict need a choice; the others changed on one side only, so they are already filled in." #: src/app/main/ui/workspace/sidebar/branch_review/conflicts.cljs:304 msgid "workspace.branches.resolve.intro-text" @@ -11340,7 +11340,7 @@ msgstr "Loses work" #: src/app/main/ui/workspace/sidebar/branch_review/conflicts.cljs:156 msgid "workspace.branches.resolve.tag.clash" -msgstr "Clash" +msgstr "Conflict" #: src/app/main/ui/workspace/sidebar/branch_review/conflicts.cljs:160 msgid "workspace.branches.resolve.tag.from-branch" @@ -11528,8 +11528,8 @@ msgstr[1] "Merge blocked: %s decisions left" #: src/app/main/ui/workspace/sidebar/branch_review/conflicts.cljs:297 msgid "workspace.branches.resolve.tag.clashes" msgid_plural "workspace.branches.resolve.tag.clashes" -msgstr[0] "1 clash" -msgstr[1] "%s clashes" +msgstr[0] "1 conflict" +msgstr[1] "%s conflicts" #: src/app/main/ui/workspace/sidebar/branch_review/conflicts.cljs:299 msgid "workspace.branches.resolve.tag.independent"