Skip to content

i18n(fr): the drafting terms in the older rows (depends on #2102) - #2580

Open
ATARYS-LAB wants to merge 5 commits into
storytold:mainfrom
ATARYS-LAB:i18n-fr-vocabulaire
Open

ATARYS-LAB wants to merge 5 commits into
storytold:mainfrom
ATARYS-LAB:i18n-fr-vocabulaire

Conversation

@ATARYS-LAB

@ATARYS-LAB ATARYS-LAB commented Oct 31, 2026 •

Copy link
Copy Markdown
Contributor

Depends on #2102 (this branch is on top of it; the diff includes it until it is merged). It's the follow-up agreed with @Atalantis there.

Problem

#2102 brings the French catalog to the drafting terms (repérage, ligne de repère multiple, contour, attacher…) in the rows it adds. The rows that were in the catalog before still use other words for the same commands, so the interface mixes both: Polar Tracking is « Recherche polaire » in the status bar while the tracking settings say « repérage », and Ray reads « Rayon », which means radius.

Change

33 older rows of fr.tsv:

English Before After
Ray Rayon Demi-droite
Construction Line, Xline (+ 2 prompts) Ligne de construction Droite
Contents Sommaire Contenu
Override / Dimension Style Override Outrepasser / Substitution de style de cotation Remplacer / Remplacement de style de cotation
Fillet (+ 2 prompts) Congé Raccord
Blend Raccord lissé Courbe de raccord
Offset (the command) Décalage Décaler
Rotate Pivoter Rotation
Break, Break At Point (+ 1 prompt) Rupture Coupure
Join Rejoindre Joindre
Boundary, Boundary... Frontière Contour
Wipeout Masquage Masque
Polar Tracking (3 rows) Recherche polaire Repérage polaire
Object Snap Tracking (2 rows) Suivi de l'accrochage aux objets Repérage d'accrochage aux objets
Multileader, Multileader style (3 rows) Repère multiple Ligne de repère multiple
Ordinate Ordonnée Superposée
Dimension Space Espace entre cotations Espacer les cotes
Change to Current Layer Déplacer vers le calque courant Transférer sur le calque courant
Attach Joindre Attacher

Nouns that aren't the command keep their word: « Décalage du tracé », « distance de décalage », a circle's « rayon », « Rejoindre le Discord d'ArtCraft ».

Overlap with #2235 (@YannFR81)

#2235 changes four of these rows too:

  • Polar Tracking: the same word, « Repérage polaire ».
  • Object Snap Tracking: « Repérage par accrochage aux objets » there, « Repérage d'accrochage aux objets » here, as i18n(fr): complete the French catalog (429 entries) #2102's settings row.
  • Dimension Space: « Espacement des cotes » there, « Espacer les cotes » here.
  • Dimension Style Override: « Substitution de style de cote » there, « Remplacement de style de cotation » here.

Whichever lands second takes the other's rows, or we settle on one word each; happy to go with what you prefer.

Tests

cargo test -p cadcraft-ui-egui --lib i18n: 14 passed. cargo xtask ci passes locally.
Docs rows (#2520): none; the French coverage in localization-parity.md doesn't change, only words.

Not changed

« Continue » stays « Continuer »: the same string is both Arc ▸ Continue and Dimension ▸ Continue, which can't be told apart in the catalog yet. No English string, no other language, no code.

Atalantis and others added 4 commits October 24, 2026 21:52
…raccord, décaler, coupure, contour, masque, repérage)

The rows that were in the catalog before storytold#2102 now use the words storytold#2102 adopted for its new
rows: Ray, Xline, Fillet, Blend, Offset, Rotate, Break, Join, Boundary, Wipeout, the
tracking modes, Multileader, Ordinate, Override, Dimension Space, Change to Current Layer,
Attach and Contents. Nouns that are not the command keep their word (plot offset, offset
distance, the radius of a circle).

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01XkJ8y83ji68FwkuL22Qf4n
@coderabbitai

coderabbitai Bot commented Oct 31, 2026 •

Copy link
Copy Markdown

Important

Review skipped

Review was skipped due to path filters

⛔ Files ignored due to path filters: 1

  • crates/ui-egui/src/i18n/fr.tsv is excluded by !**/*.tsv

CodeRabbit blocks several paths by default. You can override this behavior by explicitly including those paths in the path filters. For example, including **/dist/** will override the default block on the dist directory, by removing the pattern from both the lists.

Run configuration

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • Trigger review
  • Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

Share

@FredApps FredApps left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ReviewerA — source-read COMMENT (not an approval)

I read the first hunk: the French catalogue changes "Attach" from "Joindre" to "Attacher", and the title says the drafting terms in the older rows are corrected (it depends on #2102). For the CAD command ATTACH (attach an external reference), the AutoCAD French name is "Attacher", so the change matches the Autodesk term, while "Joindre" is the verb of JOIN. Correcting terms to the vendor's French is good, and I can't judge the other rows; a French-speaking draughtsperson should review the list. Make sure a changed key does not break a place where the old word is used in a sentence built from parts, and that the change is also applied wherever "Attach" appears in other rows (menu and command line). I did not read all the rows. Nothing was run.

I ran nothing and have no exact-head CI result for this PR, so this is not an approval. Where a diff was long I read its code hunks rather than every generated or documentation line.

Status: waiting_author.

@ATARYS-LAB

Copy link
Copy Markdown
Contributor Author

Thanks. "Attach" is now "Attacher" in every row that uses it ("Attacher un DWG...", "Aucune référence externe n'est attachée."). "Joindre" stays the translation of JOIN. These strings are whole rows of the catalogue, not built from parts, so no sentence changes elsewhere.

@austin62jake austin62jake left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approving on the mechanics. I can't judge the French wording itself, so a fluent reader is still worth having.

I merged this onto current main with #2102 under it and the other open catalog PRs (#2581, #2564, #2296). cargo xtask i18n and the cadcraft-ui-egui i18n tests pass. French falls back to English for 306 strings on main, and for 7 with both French PRs merged.

Heads-up on landing: this conflicts with #2563, which renames 14 prompt keys (dropping a trailing "or") in every catalog, fr.tsv included. Whichever lands second needs main merged in, and the renamed keys need their French text carried over.

The xline angle prompt says "or" once since storytold#2563: its row takes the new
source text and keeps "droite". The rows main added at the catalog's end
are kept.
YannFR81 added a commit to YannFR81/cadcraft that referenced this pull request Nov 11, 2026
Dimension Space, Dimension Style Override and Object Snap Tracking (with its
F11 variant) are also changed by storytold#2580. Use one wording in both pull requests
so they merge in either order:

- Dimension Space: "Espacer les cotes" (menu labels keep the infinitive)
- Dimension Style Override: "Remplacement de style de cote"
- Object Snap Tracking: "Repérage d'accrochage aux objets", as storytold#2102 already
  uses for Object Snap Tracking Settings
@YannFR81

Copy link
Copy Markdown

Hi @ATARYS-LAB, #2235 and this PR both change seven existing rows of fr.tsv. I've aligned #2235 with your wording where they differed:

  • Dimension Space: "Espacer les cotes"
  • Object Snap Tracking and Object Snap Tracking (F11): "Repérage d'accrochage aux objets"

One shared row still differs, so whichever PR merges second will conflict on it:

English #2235 #2580
Dimension Style Override Remplacement de style de cote Remplacement de style de cotation

#2235 uses "style de cote" for the dimension style everywhere (Dim style, Dimension Style..., Delete/Rename/Set Current Dimension Style), so I'd suggest "Remplacement de style de cote" here too. If you'd rather keep "cotation", tell me and I'll align #2235 instead. Either way the two PRs then merge in any order.

This branch has not been deployed

No deployments
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants