github/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2026-11-04 09:00:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

💄 Say conflict, not clash, in the conflict dialogs

Browse Source 
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
This commit is contained in:
Álvaro Tejero Cantero 2026-11-03 13:53:25 +01:00
parent 5b4ea64b88
commit 9c6a2f498e
No known key found for this signature in database
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/app/main/ui/ds/product/tag.cljs
View File

@ -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."

2
frontend/src/app/main/ui/ds/product/tag.mdx
View File

@ -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.

8
frontend/translations/en.po
View File

@ -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"