diff --git a/assets/locales/en.json b/assets/locales/en.json index c5367e41a..19309502c 100644 --- a/assets/locales/en.json +++ b/assets/locales/en.json @@ -1173,7 +1173,7 @@ "cmd.sketch_arc_tangent": "Tangent Arc", "cmd.sketch_arc_three_point": "3-Point Arc", "cmd.sketch_auto_constrain": "AutoConstrain", - "cmd.sketch_auto_constrain_from_datum": "AutoConstrain from datum", + "cmd.sketch_auto_constrain_from_datum": "AutoConstrain from Datum", "cmd.sketch_auto_project": "Auto-Project Edges on Reference", "cmd.sketch_blend_curve": "Blend Curve", "cmd.sketch_cancel": "Cancel Sketch", @@ -1187,7 +1187,7 @@ "cmd.sketch_circle_two_point": "2-Point Circle", "cmd.sketch_circle_two_tangent": "2-Tangent Circle", "cmd.sketch_constrainer": "Sketch Constrainer", - "cmd.sketch_constraint_fix": "Fix/UnFix", + "cmd.sketch_constraint_fix": "Fix/Unfix", "cmd.sketch_constraint_midpoint": "MidPoint", "cmd.sketch_construction": "Normal/Construction", "cmd.sketch_copy": "Copy Sketch Entities", @@ -1313,13 +1313,13 @@ "cmd.view_front": "Front View", "cmd.view_graphics_preset": "Graphics Preset", "cmd.view_grid": "Grid", - "cmd.view_ground_shadow": "Ground shadow", - "cmd.view_home": "Home view", + "cmd.view_ground_shadow": "Ground Shadow", + "cmd.view_home": "Home View", "cmd.view_isometric": "Isometric View", "cmd.view_left": "Left View", "cmd.view_list": "List Named Views", "cmd.view_navigate": "Navigate View", - "cmd.view_navigation_bar": "Navigation bar", + "cmd.view_navigation_bar": "Navigation Bar", "cmd.view_next_tab": "Next Tab", "cmd.view_normal_to": "Normal to Selection", "cmd.view_previous_tab": "Previous Tab", @@ -1328,10 +1328,10 @@ "cmd.view_right": "Right View", "cmd.view_save": "New Named View", "cmd.view_shots_strip": "Shots Strip", - "cmd.view_spin": "Continuous orbit", - "cmd.view_tool": "Navigation tool", + "cmd.view_spin": "Continuous Orbit", + "cmd.view_tool": "Navigation Tool", "cmd.view_top": "Top View", - "cmd.view_visual_style": "Visual style", + "cmd.view_visual_style": "Visual Style", "color.blue": "Blue", "color.copy": "Click to copy color values", "color.edit": "Click to edit color", diff --git a/crates/engine/src/cmd/sketch.rs b/crates/engine/src/cmd/sketch.rs index a08861b42..942112126 100644 --- a/crates/engine/src/cmd/sketch.rs +++ b/crates/engine/src/cmd/sketch.rs @@ -173,7 +173,7 @@ pub static COMMANDS: &[CommandSpec] = &[ .icon("c_perpendicular") .enabled(in_sketch) .params(concat!("a, b: lines or sketch axes (x / y: the sketch's own axes, unless a curve has that id; an axis becomes a linked construction line on it, reported in created)", model_operand_doc!())), - CommandSpec::new("sketch.constraint.fix", "Fix/UnFix", c_fix) + CommandSpec::new("sketch.constraint.fix", "Fix/Unfix", c_fix) .at("SKETCH", "CONSTRAINTS") .icon("c_fix") .enabled(in_sketch) diff --git a/crates/engine/src/cmd/sketch_constraints.rs b/crates/engine/src/cmd/sketch_constraints.rs index f64e45d51..287af484d 100644 --- a/crates/engine/src/cmd/sketch_constraints.rs +++ b/crates/engine/src/cmd/sketch_constraints.rs @@ -32,7 +32,7 @@ pub static COMMANDS: &[CommandSpec] = &[ .icon("auto_constrain") .enabled(in_sketch) .params("tolerance?: mm (default 0.01), angle_tolerance?: deg (default 1), dimensions?: bool (default true): infer constraints, then dimension until fully constrained"), - CommandSpec::new("sketch.auto_constrain_from_datum", "AutoConstrain from datum", auto_constrain_datum) + CommandSpec::new("sketch.auto_constrain_from_datum", "AutoConstrain from Datum", auto_constrain_datum) .at("SKETCH", "CONSTRAINTS") .icon("auto_constrain") .enabled(in_sketch) diff --git a/crates/engine/src/cmd/view_navigation.rs b/crates/engine/src/cmd/view_navigation.rs index 1d50a2678..0e8457eaa 100644 --- a/crates/engine/src/cmd/view_navigation.rs +++ b/crates/engine/src/cmd/view_navigation.rs @@ -51,19 +51,19 @@ CommandSpec::new("view.status_items", "Viewport Status Items", crate::checked!(" .params("no parameters → {items}; persistent viewport effects, oldest slot first, with structured settings and executable clear requests; read-only, no model evaluation"), CommandSpec::new("view.fit", "Fit", fit) .icon("fit").key("F6").noundo().doc_only().params("no parameters → frame the active canvas or selection; display only"), -CommandSpec::new("view.home", "Home view", home) +CommandSpec::new("view.home", "Home View", home) .icon("home").noundo().doc_only().params("no parameters → home orientation framing the active canvas; display only"), -CommandSpec::new("view.tool", "Navigation tool", tool) +CommandSpec::new("view.tool", "Navigation Tool", tool) .icon("orbit").noundo().doc_only().params("tool: orbit|pan|zoom|none → tool; latch a camera tool, none releases it"), -CommandSpec::new("view.spin", "Continuous orbit", spin) +CommandSpec::new("view.spin", "Continuous Orbit", spin) .icon("spin").noundo().doc_only().params("on?: bool (omitted: toggle) → on?; continuous orbit until the next click or key"), -CommandSpec::new("view.visual_style", "Visual style", visual_style) +CommandSpec::new("view.visual_style", "Visual Style", visual_style) .icon("style").noundo().doc_only().params("style: shaded_with_edges|shaded|wireframe|shaded_with_hidden_edges → style, index (0..3 in that order)"), CommandSpec::new("view.grid", "Grid", grid) .icon("style").noundo().doc_only().params("on?: bool (omitted: toggle) → on?; show the viewport grid"), -CommandSpec::new("view.ground_shadow", "Ground shadow", ground_shadow) +CommandSpec::new("view.ground_shadow", "Ground Shadow", ground_shadow) .icon("style").noundo().doc_only().params("on?: bool (omitted: toggle) → on?; show the ground shadow"), -CommandSpec::new("view.navigation_bar", "Navigation bar", navigation_bar) +CommandSpec::new("view.navigation_bar", "Navigation Bar", navigation_bar) .icon("pan").noundo().doc_only().params("visible?: bool (omitted: toggle) → visible?; show the navigation bar (window setting)"), CommandSpec::new("view.navigator", "Custom View Navigator", crate::checked!("view.navigator", navigator)) .icon("nav_settings").noundo().doc_only() diff --git a/crates/ui-egui/src/keymap.rs b/crates/ui-egui/src/keymap.rs index 6698e6783..6f9d6d20f 100644 --- a/crates/ui-egui/src/keymap.rs +++ b/crates/ui-egui/src/keymap.rs @@ -1453,7 +1453,7 @@ mod tests { h.frames(3); h.step(&json!({"click": {"handle": "prefs:search:shortcuts"}})).expect("unfold the shortcut matches"); h.frames(2); - h.step(&json!({"click": {"handle": "shortcut:sketch.constraint.fix"}})).expect("record Fix/UnFix's key"); + h.step(&json!({"click": {"handle": "shortcut:sketch.constraint.fix"}})).expect("record Fix/Unfix's key"); assert!(capturing(&h.app), "recording from a search result"); h.step(&json!({"key": "P", "pressed": true})).unwrap(); h.step(&json!({"text": "p"})).unwrap(); diff --git a/crates/ui-egui/src/view_home_tests.rs b/crates/ui-egui/src/view_home_tests.rs index cdba4c7c3..88d1c5c9d 100644 --- a/crates/ui-egui/src/view_home_tests.rs +++ b/crates/ui-egui/src/view_home_tests.rs @@ -343,7 +343,8 @@ fn navigation_bar_display_menu_runs_grid_and_shadow_commands() { h.step(&json!({"widget":label})).unwrap(); let after = if id == "view.grid" { h.app.ui.show_grid } else { h.app.ui.ground_shadow }; assert_eq!(after, !before); - let echo = crate::i18n::Locale::for_language(&h.app.preferences.language).format("ui.command_done", &[("command", label)]); + let language = crate::i18n::Locale::for_language(&h.app.preferences.language); + let echo = language.format("ui.command_done", &[("command", language.label(crate::command_label(id)))]); assert!(h.app.session.log.iter().skip(log).any(|line| line == &echo), "{id} was not run"); } } diff --git a/docs/ambient-occlusion.md b/docs/ambient-occlusion.md index a6838cc9e..6664d3c37 100644 --- a/docs/ambient-occlusion.md +++ b/docs/ambient-occlusion.md @@ -15,7 +15,7 @@ combines AO with the display-quality and supersampling controls from #1319 and # Custom is derived from the current settings, not a third preset that overwrites them. Individual controls remain editable. Selecting a preset applies all three settings immediately; MSAA, ground shadow, projection and visual style stay unchanged. -Graphics preferences support Cancel, Apply and Restore Defaults. Adaptive supersampling +Graphics preferences support Cancel, Apply and Restore page defaults. Adaptive supersampling keeps #1321's 0.25-second settling delay, texture limit and 384 MiB memory cap; the requested 2× may be reduced or skipped when the device cannot accommodate it. diff --git a/docs/book/src/guide/files.md b/docs/book/src/guide/files.md index 475f355da..5e0648232 100644 --- a/docs/book/src/guide/files.md +++ b/docs/book/src/guide/files.md @@ -182,7 +182,7 @@ up to **256 MB**. A larger file is refused before it is read, and the message sa the limit. In the desktop app you can raise both: - **Preferences › General › Largest file to open** sets each limit in MB, from its default up to - 16 GB (16384 MB). It is kept between runs; Restore Defaults on the General page puts back 512 MB + 16 GB (16384 MB). It is kept between runs; Restore page defaults on the General page puts back 512 MB and 256 MB. - **`--max-file-size SIZE`** at launch (`solidcraft --max-file-size 2GB big-assembly.step`) raises both limits for that run only, over the preference, without saving anything. SIZE is a number diff --git a/docs/book/src/guide/ui-tour.md b/docs/book/src/guide/ui-tour.md index 737745ea0..b140ae1ba 100644 --- a/docs/book/src/guide/ui-tour.md +++ b/docs/book/src/guide/ui-tour.md @@ -200,7 +200,7 @@ compass. Tool sheets remain draggable: their four corners round away from the ri edge, and their two right corners square when docked there. Browser keeps only the height its contents need. Assistant remains on the outside edge, and History keeps its chosen bottom, left or shared Browser column. The choice is saved between launches. Switching preserves the current tool, -camera, selection and design; Cancel and Restore Defaults work like other preferences. +camera, selection and design; Cancel and Restore page defaults work like other preferences. General › **Show text under ribbon icons** is a separate, saved option for either layout. Turn it off for shorter icon-only command buttons; tooltips, section names diff --git a/docs/control-protocol.md b/docs/control-protocol.md index 8ad8c603c..ec74cb88d 100644 --- a/docs/control-protocol.md +++ b/docs/control-protocol.md @@ -482,7 +482,7 @@ the legacy behavior: surface shading and Continuity remain independently active and `view.status_items` faithfully lists both, using a separate stable `continuity` ID. Together with Section there are at most three slots. Turning the preference back on keeps the last successfully started or changed analysis at the oldest analysis-group position beside Section. -Queries never normalize state. Graphics Restore Defaults restores `true`; other page resets +Queries never normalize state. Graphics Restore page defaults restores `true`; other page resets leave it alone. It applies immediately to all open designs without document edits or undo. Cancel restores the opening preference value, but does not restart an analysis already stopped by switching to single mode. Run that analysis again to restore coexistence after cancelling. @@ -798,7 +798,7 @@ when both occur in a call. Imported themes cannot claim the retired built-in ids Theme option values persist per theme, including a followed file's own id, through the same preference store in the browser and on desktop. Switching themes restores their saved values; -Interface's Restore Defaults clears them. Preference exports and settings profiles carry values; +Interface's Restore page defaults clears them. Preference exports and settings profiles carry values; `theme_export` carries the author's defaults. Saved entries that no longer fit a definition remain stored and use the default with a notice; unknown ids have a notice and no effective value. diff --git a/docs/cosmetic-threads.md b/docs/cosmetic-threads.md index a18dd6123..9f7d1ccc0 100644 --- a/docs/cosmetic-threads.md +++ b/docs/cosmetic-threads.md @@ -3,7 +3,7 @@ Cosmetic markings are **off by default**, including when preferences saved by an older version have no setting for them. Turn on **Preferences > Graphics > Cosmetic thread markings** to display them. The switch applies immediately, without moving the camera or rebuilding -the design, and is saved in application preferences. Cancel, Apply and Restore Defaults +the design, and is saved in application preferences. Cancel, Apply and Restore page defaults follow the other Graphics settings. It is not a document property or a geometry feature. Tapped Hole and non-modeled Thread features now mark the threaded cylindrical wall with diff --git a/docs/localization.md b/docs/localization.md index 0e6564001..5e1b07bbd 100644 --- a/docs/localization.md +++ b/docs/localization.md @@ -39,6 +39,15 @@ entry has a note for translators: what the term must not be confused with. Its " than one meaning" table lists the English words that need a separate catalogue entry for each meaning (Construction, Flat, Round, Normal, Gap, Clearance). +## Case + +Command labels (`cmd.*`: what menus, the toolbar, the command palette and the shortcut list show) +are in title case: "Home View", "Center of Mass". All other English text is in sentence case: +buttons, links, settings, rows, headings and tooltips, as in "Restore page defaults" or the "Center of +mass" row in Design properties. So the same words can appear in both cases, as a command and as a +link or row beside it (New Design in the File menu, New design on the home screen). Two buttons +on one page never differ only by case; give them different words. + ## English (UK) `en-GB.json` holds only the English messages whose spelling differs in UK English (Centre, diff --git a/skills/solidcraft-ui-text/SKILL.md b/skills/solidcraft-ui-text/SKILL.md index d01060de0..29835dccf 100644 --- a/skills/solidcraft-ui-text/SKILL.md +++ b/skills/solidcraft-ui-text/SKILL.md @@ -27,4 +27,4 @@ New strings go in a new `assets/locales/pending/.json` (lowercase, dashes, - `docs/features.md` and `THIRD-PARTY-LICENSES.txt` are generated on `main` after each merge: never edit or regenerate them in a PR. ## Wording -Use the terms in the glossary (`docs/book/src/reference/glossary.md`); words with several meanings (Construction, Flat, Round, Normal, Gap, Clearance) have one catalogue entry per meaning. A new idea adds its glossary term. Tests also require tabs, panels, menu labels and command labels to be in `en.json`. +Use the terms in the glossary (`docs/book/src/reference/glossary.md`); words with several meanings (Construction, Flat, Round, Normal, Gap, Clearance) have one catalogue entry per meaning. A new idea adds its glossary term. Command labels are Title Case, other text sentence case. Tests also require tabs, panels, menu labels and command labels to be in `en.json`.