diff --git a/assets/locales/en.json b/assets/locales/en.json index 9e24427c2..f62a5d564 100644 --- a/assets/locales/en.json +++ b/assets/locales/en.json @@ -6,7 +6,7 @@ "2. Attach your screenshot: copy and paste it, or save and upload the PNG.": "2. Attach your screenshot: copy and paste it, or save and upload the PNG.", "2D": "2D", "3. Click Submit new issue on GitHub to send your report.": "3. Click Submit new issue on GitHub to send your report.", - "A Single hole snaps to the middle of its face and to the centres of its round edges": "A Single hole snaps to the middle of its face and to the centres of its round edges", + "A Single hole snaps to the middle of its face and to the centres of its round edges": "A Single hole snaps to the middle of its face and to the centers of its round edges", "A new configuration, a copy of the active one": "A new configuration, a copy of the active one", "A placed Single hole has a handle to drag it, and picking its face again moves the hole there instead of taking it out": "A placed Single hole has a handle to drag it, and picking its face again moves the hole there instead of taking it out", "A short title for the problem (optional)": "A short title for the problem (optional)", @@ -100,7 +100,7 @@ "Center X": "Center X", "Center Y": "Center Y", "Center of mass": "Center of mass", - "Centre to centre": "Centre to centre", + "Centre to centre": "Center to center", "Centroid": "Centroid", "Chamfer Type": "Chamfer Type", "Channel": "Channel", @@ -117,7 +117,7 @@ "Close draft": "Close draft", "Collapse": "Collapse", "Collisions": "Collisions", - "Colour": "Colour", + "Colour": "Color", "Command": "Command", "Comment": "Comment", "Component 1": "Component 1", @@ -137,7 +137,7 @@ "Copies the definition only. Assign it from Physical Material when ready.": "Copies the definition only. Assign it from Physical Material when ready.", "Copy Error Message": "Copy Error Message", "Copy Warning Message": "Copy Warning Message", - "Copy all licences": "Copy all licences", + "Copy all licences": "Copy all licenses", "Copy diagnostic information": "Copy diagnostic information", "Copy report": "Copy report", "Copy screenshot": "Copy screenshot", @@ -244,7 +244,7 @@ "Factor must be a positive number": "Factor must be a positive number", "Fastener": "Fastener", "Favorites": "Favorites", - "Favourite": "Favourite", + "Favourite": "Favorite", "Feature": "Feature", "Files from many CAD programs have Y up, so they open lying on their back here (Z up).": "Files from many CAD programs have Y up, so they open lying on their back here (Z up).", "Filter": "Filter", @@ -563,7 +563,7 @@ "Select bodies or faces instead": "Select bodies or faces instead", "Select edges": "Select edges", "Select points of the sketch being edited": "Select points of the sketch being edited", - "Select the centre the pattern turns around first": "Select the centre the pattern turns around first", + "Select the centre the pattern turns around first": "Select the center the pattern turns around first", "Select the curves to offset first": "Select the curves to offset first", "Select the mirror line": "Select the mirror line", "Select the sketch curves or points to mirror first": "Select the sketch curves or points to mirror first", @@ -592,12 +592,12 @@ "Sketch points": "Sketch points", "Slider": "Slider", "Slot width": "Slot width", - "Snap to face and edge centres": "Snap to face and edge centres", + "Snap to face and edge centres": "Snap to face and edge centers", "SolidCraft cannot submit reports directly. Submit on GitHub; no token is needed in the app.": "SolidCraft cannot submit reports directly. Submit on GitHub; no token is needed in the app.", "SolidCraft closed before these designs were saved. Their last autosave can be opened.": "SolidCraft closed before these designs were saved. Their last autosave can be opened.", "Spacing 2 must be a non-zero number": "Spacing 2 must be a non-zero number", "Spacing must be a non-zero number": "Spacing must be a non-zero number", - "Specialise": "Specialise", + "Specialise": "Specialize", "Speed": "Speed", "Splitting tool": "Splitting tool", "Square": "Square", @@ -809,7 +809,7 @@ "cmd.appearance_assign": "Appearance", "cmd.appearance_chain": "Appearance Chain", "cmd.appearance_copy": "Copy Look", - "cmd.appearance_favorite": "Favourite Look", + "cmd.appearance_favorite": "Favorite Look", "cmd.appearance_library": "Appearance Library", "cmd.appearance_list": "List Appearances", "cmd.appearance_paint": "Paint Appearance", @@ -1003,7 +1003,7 @@ "cmd.parameters_complete": "Complete Expression", "cmd.parameters_delete": "Delete Parameter", "cmd.parameters_export": "Export Parameters", - "cmd.parameters_favorite": "Favourite Parameter", + "cmd.parameters_favorite": "Favorite Parameter", "cmd.parameters_graph": "Parameter Graph", "cmd.parameters_import": "Import Parameters", "cmd.parameters_list": "List Parameters", @@ -1340,8 +1340,8 @@ "drive.stopped_by_loop": "Stopped at {value}: the loop through {joint} can't close any further", "drive.unconnected": "Moves nothing: {part} is not connected to anything grounded", "dxf.cancel_wait": "Waiting for the export to stop…", - "dxf.cancelled": "DXF export cancelled", - "dxf.cancelling": "Cancelling DXF export", + "dxf.cancelled": "DXF export canceled", + "dxf.cancelling": "Canceling DXF export", "dxf.exporting": "Exporting DXF", "dxf.invalid_tolerance": "Curve tolerance must be between 0.0001 and 1 mm.", "dxf.progress.index": "Preparing surfaces (2/5)", @@ -1372,19 +1372,19 @@ "fits the face, e.g. M8": "fits the face, e.g. M8", "from the profile": "from the profile", "from the rule": "from the rule", - "help.apache": "Apache licence 2.0", - "help.appearance.assign": "Gives the selected bodies, faces or components a colour or a material look, without changing their weight. Use it to tell parts apart or to preview a finish.", + "help.apache": "Apache license 2.0", + "help.appearance.assign": "Gives the selected bodies, faces or components a color or a material look, without changing their weight. Use it to tell parts apart or to preview a finish.", "help.attributions": "Attributions (ATTRIBUTION.md)", "help.build": "Version {version} · commit {commit} · built {date}", "help.component.finish_edit": "Saves the part you are editing in place, returns to its assembly and updates the assembly from it. Use it when your changes to the linked part are done.", "help.connect_note": "Restart each assistant to load the SolidCraft server. Each file was backed up as .bak before it changed.", "help.connect_title": "Connect AI assistants", - "help.face.delete": "Removes the selected faces and lets the neighbouring faces close the gap, or leaves the gap open as a surface. Use it to take off a rounded edge, a hole or a boss that is in the way.", - "help.font_details": "The interface uses egui's built-in fonts (Ubuntu Light and Hack, under the Ubuntu Font Licence and the MIT/Bitstream Vera licence; Noto Emoji and the emoji icon font, under the OFL and MIT). Sketch text uses Liberation Sans (SIL OFL 1.1). The Crafting Apps' optional font pack, craft-fonts (BIZ UDPGothic, Shippori Mincho, BIZ UDMincho, Noto Sans CJK SC, Noto Sans Arabic; SIL OFL 1.1), is not bundled in SolidCraft builds.", + "help.face.delete": "Removes the selected faces and lets the neighboring faces close the gap, or leaves the gap open as a surface. Use it to take off a rounded edge, a hole or a boss that is in the way.", + "help.font_details": "The interface uses egui's built-in fonts (Ubuntu Light and Hack, under the Ubuntu Font Licence and the MIT/Bitstream Vera license; Noto Emoji and the emoji icon font, under the OFL and MIT). Sketch text uses Liberation Sans (SIL OFL 1.1). The Crafting Apps' optional font pack, craft-fonts (BIZ UDPGothic, Shippori Mincho, BIZ UDMincho, Noto Sans CJK SC, Noto Sans Arabic; SIL OFL 1.1), is not bundled in SolidCraft builds.", "help.fonts": "Fonts", - "help.licences": "Licences", - "help.material.assign": "Sets what the selected bodies are made of, such as steel, aluminium or ABS. Use it so that the mass and weight match the real part.", - "help.mit": "MIT licence", + "help.licences": "Licenses", + "help.material.assign": "Sets what the selected bodies are made of, such as steel, aluminum or ABS. Use it so that the mass and weight match the real part.", + "help.mit": "MIT license", "help.notice": "NOTICE", "help.occurrence.move": "Moves an assembly part only along freedoms allowed by its joints. Select a part face, then drag an available arrow or arc.", "help.parameters.change": "Opens the table of named values and expressions that drive the dimensions of the design. Use it to change a size in one place and let every feature that uses it follow.", @@ -1393,7 +1393,7 @@ "help.solid.align": "Moves the selected bodies so that a point, face or plane on them meets a point, face or plane elsewhere. Use it to place a part against another one without measuring the offset.", "help.solid.chamfer": "Cuts the selected edges with a flat bevel of the distance you set. Use it to break sharp edges or to ease the entry of a pin or screw.", "help.solid.combine": "Joins bodies, cuts them out of a target body, or keeps only the volume they share, and can keep the tool bodies. Use it to merge parts, to cut one shape with another or to find where two bodies overlap.", - "help.solid.draft": "Tilts the selected faces by the angle you set, measured from a neutral plane. Use it on moulded or cast parts so that they slide out of the mould.", + "help.solid.draft": "Tilts the selected faces by the angle you set, measured from a neutral plane. Use it on molded or cast parts so that they slide out of the mold.", "help.solid.extrude": "Pushes a sketch profile into 3D along a distance, adding or removing material. Use it to turn a flat outline into a block, a boss or a pocket.", "help.solid.fillet": "Rounds the selected edges with a smooth circular blend of the radius you set. Use it to soften sharp edges for strength, comfort or looks.", "help.solid.hole": "Drills a round hole of the diameter you set at a chosen point on a face. Use it for screw clearances, pins and other simple round openings.", @@ -1406,13 +1406,13 @@ "help.solid.press_pull": "Adds or removes material as you drag a face, or rounds edges as you drag them. Use it for quick changes straight on the model.", "help.solid.remove": "Takes the selected bodies out of the design from this point in the timeline on; earlier steps keep them. Use it to drop a helper body, such as a cutting tool you no longer need.", "help.solid.replace_face": "Moves the selected flat faces onto a plane or onto a parallel face, and the body grows or shrinks to meet it. Use it to bring a face flush with another part or a construction plane.", - "help.solid.revolve": "Spins a sketch profile around an axis to make a round solid. Use it for shafts, knobs, bowls and any part that is round about a centre line.", + "help.solid.revolve": "Spins a sketch profile around an axis to make a round solid. Use it for shafts, knobs, bowls and any part that is round about a center line.", "help.solid.scale": "Makes the selected bodies larger or smaller by a factor, the same in every direction or one per axis. Use it to resize an imported shape or to allow for shrinkage.", "help.solid.shell": "Hollows out a solid, leaving walls of the thickness you set, and can open the faces you pick. Use it for boxes, covers and other thin-walled parts.", - "help.solid.split_body": "Cuts a body into separate bodies with a plane, the face of another body or a sketch line. Use it to make parts that are printed, machined or coloured on their own.", - "help.solid.split_face": "Divides the selected faces along a plane, the face of another body or sketch curves, without cutting the body. Use it to give part of a face its own draft, colour or offset.", + "help.solid.split_body": "Cuts a body into separate bodies with a plane, the face of another body or a sketch line. Use it to make parts that are printed, machined or colored on their own.", + "help.solid.split_face": "Divides the selected faces along a plane, the face of another body or sketch curves, without cutting the body. Use it to give part of a face its own draft, color or offset.", "help.solid.sweep": "Drags a sketch profile along a path to make a solid. Use it for pipes, rails, handles and any part of constant section that follows a curve.", - "help.third_party": "Third-party licences", + "help.third_party": "Third-party licenses", "help.timeline.compute_all": "Rebuilds every feature in the timeline from the start. Use it to refresh the model and to see which features fail.", "help.timeline.delete": "Deletes the selected features from the timeline; deleting a sketch also deletes the features built from it. Use it to remove a step that is no longer wanted.", "help.timeline.play": "Replay the remaining features one at a time, with a half-second pause after each rebuild. Run this command again or press Escape to stop; Go to end jumps immediately.", @@ -1466,7 +1466,7 @@ "home.new_inches": "New design, inches", "home.new_inches_hint": "Inches · opens in Design", "home.new_mm": "New design", - "home.new_mm_hint": "Millimetres · opens in Design", + "home.new_mm_hint": "Millimeters · opens in Design", "home.open": "Open…", "home.open_hint": "A .sc design ({shortcut})", "home.open_now": "Open now", @@ -1647,7 +1647,7 @@ "navbar.custom.buttons": "Buttons", "navbar.custom.compact": "Compact", "navbar.custom.count": "{count} of 16 slots", - "navbar.custom.customise": "Customise navigation bar…", + "navbar.custom.customise": "Customize navigation bar…", "navbar.custom.design": "Design", "navbar.custom.duplicate": "This slot is already on the bar.", "navbar.custom.edge": "Edge", @@ -1667,7 +1667,7 @@ "navbar.custom.labels": "Icons and labels", "navbar.custom.left": "Move left", "navbar.custom.position": "Position", - "navbar.custom.position_centre": "Centre", + "navbar.custom.position_centre": "Center", "navbar.custom.position_left": "Left", "navbar.custom.position_right": "Right", "navbar.custom.preview_as": "Preview as", @@ -1696,7 +1696,7 @@ "navbar.description.orbit": "Turns the view around the model.", "navbar.description.pan": "Slides the view sideways, up or down.", "navbar.description.projection": "Switches between orthographic and perspective views.", - "navbar.description.separator": "A thin line that groups neighbouring slots.", + "navbar.description.separator": "A thin line that groups neighboring slots.", "navbar.description.spin": "Keeps the view turning until you click or press a key.", "navbar.description.visual_style": "Switches how the model is drawn: shaded, wireframe or with hidden edges.", "navbar.description.zoom": "Moves the view closer to or further from the model.", @@ -1815,7 +1815,7 @@ "prefs.bodies_folders_never": "Never", "prefs.bodies_folders_several": "Several bodies only", "prefs.bottom": "Bottom", - "prefs.bottom_centre": "Bottom centre", + "prefs.bottom_centre": "Bottom center", "prefs.bottom_right": "Bottom right", "prefs.browser": "Browser", "prefs.browser_reveal_on_hover": "Reveal on hover", @@ -2031,7 +2031,7 @@ "prefs.trackpad_zoom_modifier.alt": "⌥ / Alt", "prefs.trackpad_zoom_modifier.cmd": "⌘", "prefs.trackpad_zoom_modifier.ctrl": "Ctrl", - "prefs.trackpad_zoom_modifier.help": "Hold only this key to zoom at the pointer with vertical scroll. Off keeps the existing scroll behaviour.", + "prefs.trackpad_zoom_modifier.help": "Hold only this key to zoom at the pointer with vertical scroll. Off keeps the existing scroll behavior.", "prefs.trackpad_zoom_modifier.off": "Off", "prefs.translucent": "Translucent", "prefs.under_browser": "Under browser", @@ -2076,13 +2076,13 @@ "render.aging_class_any": "All opaque material classes", "render.aging_class_dielectric": "Nonmetallic surfaces only", "render.aging_class_metal": "Metallic surfaces only", - "render.aging_color": "Layer colour · sRGB", + "render.aging_color": "Layer color · sRGB", "render.aging_coverage": "Coverage", "render.aging_dust": "Deposited dust", "render.aging_empty": "No aging layers: the original surfaces remain unchanged.", "render.aging_fading": "Faded coating", "render.aging_grime": "Grime & staining", - "render.aging_help": "Combine up to eight optical layers, in order. Rust and patina are authored appearances, not age/corrosion simulations. Scale is in world millimetres. No geometry, mass or engineering property is changed; glass and passive stages are excluded.", + "render.aging_help": "Combine up to eight optical layers, in order. Rust and patina are authored appearances, not age/corrosion simulations. Scale is in world millimeters. No geometry, mass or engineering property is changed; glass and passive stages are excluded.", "render.aging_metallic": "Layer metallic fraction", "render.aging_origin": "Field origin · world mm", "render.aging_patina": "Copper-green patina", @@ -2098,7 +2098,7 @@ "render.all_controls_help": "Dense inspection of all current controls. Section pages provide focused editing without changing the underlying request.", "render.all_shots_label": "All Shots", "render.appearance_editor.absorption": "Absorption", - "render.appearance_editor.base_colour": "Base colour", + "render.appearance_editor.base_colour": "Base color", "render.appearance_editor.body_reason": "Optical bindings target one whole body. Pick Body to edit these controls.", "render.appearance_editor.boundary": "Boundary", "render.appearance_editor.box": "Box", @@ -2162,7 +2162,7 @@ "render.background_not_light": "Background color is presentation, not an additional lighting source.", "render.background_regrade": "Apply to retained raw master", "render.background_stage_occlusion": "This shot includes physical stage geometry. A large floor or wall can fill the frame and hide a camera-only background. Clear or resize the stage deliberately, or change its physical reflectance. Regrading cannot remove captured geometry.", - "render.background_workflow": "Choose the background you intend: a camera-only colour/gradient, a physical stage that receives light, or HDR illumination. They are independent. Live Preview is a modelling view; render a new image or regrade a retained master to see camera finishing.", + "render.background_workflow": "Choose the background you intend: a camera-only color/gradient, a physical stage that receives light, or HDR illumination. They are independent. Live Preview is a modeling view; render a new image or regrade a retained master to see camera finishing.", "render.base_appearance": "Editable body appearance", "render.base_apply": "Apply body appearance", "render.base_apply_help": "One undoable visual assignment to the reviewed exact body. Existing face-specific looks and engineering materials remain separate.", @@ -2283,7 +2283,7 @@ "render.cpu_aa_help": "Spatial samples: more samples improve edges and increase render time.", "render.cpu_area_add": "Add rectangular CPU light", "render.cpu_area_editor": "CPU rectangular lights", - "render.cpu_area_editor_help": "Full side vectors in millimeters; U cross V points towards the emitting side. This differs from GPU half-edge vectors.", + "render.cpu_area_editor_help": "Full side vectors in millimeters; U cross V points toward the emitting side. This differs from GPU half-edge vectors.", "render.cpu_area_full_u": "Full U side · mm", "render.cpu_area_full_v": "Full V side · mm", "render.cpu_area_samples": "Area-light samples", @@ -2372,7 +2372,7 @@ "render.draft_confirm_help": "The current render draft has unapplied edits. Save them before switching, discard them explicitly, or keep editing.", "render.draft_confirm_title": "Preserve edited render settings", "render.effects_gpu_only": "These effects require GPU path tracing. Changing the page never switches the renderer automatically.", - "render.effects_help": "Combine ordered colour looks and image-space lens effects. Rendering and raw-master regrading use the same saved settings. Raw EXR stays unchanged. These are original artistic controls, not calibrated lens or branded-film emulations.", + "render.effects_help": "Combine ordered color looks and image-space lens effects. Rendering and raw-master regrading use the same saved settings. Raw EXR stays unchanged. These are original artistic controls, not calibrated lens or branded-film emulations.", "render.effects_reset_lens": "Reset lens effects", "render.effects_seed": "Pattern seed", "render.emitted_axis": "Emitted axis", @@ -2383,7 +2383,7 @@ "render.env_change": "Change", "render.env_choose_source": "Choose an environment in Studios and Environments before editing the lighting.", "render.env_clear": "Clear", - "render.env_colour": "Colour", + "render.env_colour": "Color", "render.env_environments": "Environments", "render.env_ground": "Ground", "render.env_ground_pending": "Physical ground receives shadows as a finite diffuse surface. Shadow-only catching and ground reflections are not supported yet.", @@ -2438,7 +2438,7 @@ "render.environment.primaries": "Treat unspecified primaries as linear sRGB", "render.environment.primaries_gpu": "Interpreting unspecified primaries needs GPU path tracing.", "render.environment.radial": "Radial", - "render.environment.radial_only": "Centre and radius apply to Radial mode.", + "render.environment.radial_only": "Center and radius apply to Radial mode.", "render.environment.reflectance": "Reflectance", "render.environment.remove": "Remove stage", "render.environment.remove_confirm": "Remove the saved stage?", @@ -2470,8 +2470,8 @@ "render.error_duplicate_face": "duplicate product face appearance", "render.error_export_document": "The render export document changed while choosing its destination", "render.error_face_cap": "product preview exceeds the face-appearance admission cap", - "render.error_finish_gesture": "finish the modelling gesture before previewing", - "render.error_finish_operation": "finish the current modelling operation before entering Render", + "render.error_finish_gesture": "finish the modeling gesture before previewing", + "render.error_finish_operation": "finish the current modeling operation before entering Render", "render.error_fixed_preview": "fixed studio preview requires exposure 0, environment rotation 0 and intensity 1", "render.error_geometry_size": "product geometry size overflow", "render.error_glass_recipe": "unknown glass recipe", @@ -2529,7 +2529,7 @@ "render.flare_threshold": "Scene-linear flare threshold", "render.fold_browser": "Fold Browser", "render.frame_aspect": "Aspect", - "render.frame_centre_mark": "Centre mark", + "render.frame_centre_mark": "Center mark", "render.frame_copy_limit": "No available duplicate shot name", "render.frame_copy_name": "{name} copy {number}", "render.frame_custom": "Custom", @@ -2584,8 +2584,8 @@ "render.hide_shots_label": "Hide Shots strip", "render.hover_look": "{object} · {look} · click to select", "render.image_advanced": "Advanced GPU controls", - "render.image_cancelled": "Render cancelled", - "render.image_cancelling": "Cancelling", + "render.image_cancelled": "Render canceled", + "render.image_cancelling": "Canceling", "render.image_completed": "Image ready to export", "render.image_encoding": "Encoding PNG", "render.image_export": "Export completed image", @@ -2602,7 +2602,7 @@ "render.image_reduce": "Try a smaller image or simpler scene.", "render.image_running": "Rendering image", "render.image_samples": "Samples per pixel", - "render.image_scene_stale": "Finish the modelling gesture or refresh the scene before checking or starting an image.", + "render.image_scene_stale": "Finish the modeling gesture or refresh the scene before checking or starting an image.", "render.image_stale": "This image uses the scene captured before subsequent changes.", "render.image_start": "Start Render", "render.image_supported": "Render request is supported; the queue and memory pool are checked again at start.", @@ -2621,7 +2621,7 @@ "render.inspector_applies_to": "Applies to", "render.inspector_both_users": "Both users", "render.inspector_chain": "Where this look comes from", - "render.inspector_colour": "Colour", + "render.inspector_colour": "Color", "render.inspector_edit": "Edit", "render.inspector_finish": "Finish", "render.inspector_from_material": "From Material", @@ -2733,7 +2733,7 @@ "render.light_anchor_pending": "Changing the light coordinate frame is not supported yet.", "render.light_azimuth": "Azimuth", "render.light_backend_limit": "Choose CPU ray tracing or an explicit GPU studio to edit lights. Legacy GPU studio lights remain read-only.", - "render.light_behaviour": "BEHAVIOUR", + "render.light_behaviour": "BEHAVIOR", "render.light_default_fill": "Fill", "render.light_default_key": "Key", "render.light_default_number": "Light {number}", @@ -2749,11 +2749,11 @@ "render.light_place_highlight": "Place by highlight", "render.light_place_pending": "Highlight placement needs viewport light picking and is not supported yet.", "render.light_position": "POSITION", - "render.light_preview_help": "Live view is unshadowed; Area lights use a centre-sample approximation. Render uses the complete light model.", - "render.light_product_centre": "Product centre", + "render.light_preview_help": "Live view is unshadowed; Area lights use a center-sample approximation. Render uses the complete light model.", + "render.light_product_centre": "Product center", "render.light_size": "Size", "render.light_softness": "Softness", - "render.light_temperature": "Colour temperature", + "render.light_temperature": "Color temperature", "render.light_temperature_help": "Approximate blackbody tint; saved as linear RGB.", "render.light_type": "Type", "render.light_type_area": "Area", @@ -2767,7 +2767,7 @@ "render.lighting_area_samples": "Area samples", "render.lighting_budget": "Budget", "render.lighting_budget_help": "Counts are read-only. Add, duplicate or delete lights to change them; the method sets the limits.", - "render.lighting_colour": "Colour", + "render.lighting_colour": "Color", "render.lighting_consent": "Replace the directional lights with this preset", "render.lighting_custom": "Custom lights", "render.lighting_custom_help": "Choosing Custom turns the preset into editable lights, one row each in the tree.", @@ -2809,7 +2809,7 @@ "render.linear_help": "Keeps a 32-bit float RGBA master before denoising, exposure, tone mapping, filters and backdrop. Linear sRGB/D65; coverage-premultiplied. Additional memory is admitted explicitly. No compression or extra passes.", "render.linear_retain": "Retain raw linear EXR", "render.linear_unavailable": "The selected completed frame has no retained EXR. Enable retention before rendering; an older PNG cannot recover raw radiance.", - "render.look_add": "Add colour look", + "render.look_add": "Add color look", "render.look_applied": "Applied {name}", "render.look_bleach": "Bleach-bypass-inspired", "render.look_cool": "Cool", @@ -3049,7 +3049,7 @@ "render.ribbon_saved_camera": "Saved Camera", "render.ribbon_shots": "Shots", "render.ribbon_studios": "Studios", - "render.ribbon_studios_help": "Browse implemented studio compositions and review their replacements before applying. Concept-only scenes remain labelled.", + "render.ribbon_studios_help": "Browse implemented studio compositions and review their replacements before applying. Concept-only scenes remain labeled.", "render.ribbon_surface_maps": "Surface Maps", "render.sampling_title": "Adaptive and transmission sampling", "render.save_continue": "Save and continue", @@ -3160,7 +3160,7 @@ "render.stage_panels.badge_specification": "spec only", "render.stage_panels.candidate_summary": "Candidates: {count} sourced values. Grade and finish need review.", "render.stage_panels.captured_bounds": "Use captured scene bounds", - "render.stage_panels.centre": "Centre", + "render.stage_panels.centre": "Center", "render.stage_panels.depth": "depth", "render.stage_panels.environments": "Environments", "render.stage_panels.extent": "Extent", @@ -3215,7 +3215,7 @@ "render.stage_panels.scope": "Scope", "render.stage_panels.search_studios": "Search studios", "render.stage_panels.search_surfaces": "Search surfaces and references", - "render.stage_panels.source_note": "Authored base-colour source map. Not a measured material.", + "render.stage_panels.source_note": "Authored base-color source map. Not a measured material.", "render.stage_panels.specifications": "Specifications · read-only", "render.stage_panels.studio_ack": "Confirm replacing lighting, environment, exposure and stage", "render.stage_panels.studio_note": "Click to review. Applying replaces lighting, environment and stage only after you confirm. Lights stay editable.", @@ -3245,7 +3245,7 @@ "render.studio_ambient_rgb": "Constant environment radiance (linear RGB)", "render.studio_aperture": "Aperture radius", "render.studio_area": "Area light", - "render.studio_area_help": "Up to four one-sided rectangles. Orthogonal half-edges U and V define size; U × V faces the lit side. Coordinates are world-space millimetres.", + "render.studio_area_help": "Up to four one-sided rectangles. Orthogonal half-edges U and V define size; U × V faces the lit side. Coordinates are world-space millimeters.", "render.studio_center": "Center X, Y, Z (mm)", "render.studio_denoise": "Reduce noise in the finished image", "render.studio_denoise_help": "Final edge-aware filter; fine detail can soften. Glass and sharp specular surfaces bypass the filter.", @@ -3585,7 +3585,7 @@ "ui.3d_mouse_offer_swap": "Swap to Hidraw (Direct Driver)", "ui.3d_mouse_orbit": "Orbit", "ui.3d_mouse_orbit_classic": "Classic", - "ui.3d_mouse_orbit_tip": "Traced: the 3D mouse turns the view around the part of the model in the middle of the view when the turn begins, marked by a faint ball. Classic: around the view's centre", + "ui.3d_mouse_orbit_tip": "Traced: the 3D mouse turns the view around the part of the model in the middle of the view when the turn begins, marked by a faint ball. Classic: around the view's center", "ui.3d_mouse_orbit_traced": "Traced", "ui.3d_mouse_reading": "Reading", "ui.3d_mouse_reset_axes": "Reset axis assignment", @@ -3713,7 +3713,7 @@ "ui.agent_chat_left": "Left", "ui.agent_chat_limit": "The agent reached the limit of {limit} changes for one message. Send another message to let it go on.", "ui.agent_chat_login_found": "login found", - "ui.agent_chat_minimize": "Minimise to a strip", + "ui.agent_chat_minimize": "Minimize to a strip", "ui.agent_chat_mode_all": "All", "ui.agent_chat_mode_ask": "Ask", "ui.agent_chat_mode_edits": "Edits", @@ -3830,7 +3830,7 @@ "ui.ai_mode_ask": "Ask every time", "ui.ai_mode_ask_note": "Every change to the design, and every file action, waits for your Allow.", "ui.ai_mode_edits": "Auto-allow model edits", - "ui.ai_mode_edits_note": "Modelling commands run without asking; saving, opening, exporting and other file or destructive actions still ask.", + "ui.ai_mode_edits_note": "Modeling commands run without asking; saving, opening, exporting and other file or destructive actions still ask.", "ui.ai_mode_global": "As set above", "ui.ai_model": "Model", "ui.ai_model_hint": "qwen3:14b", @@ -3948,15 +3948,15 @@ "ui.coincident": "Coincident", "ui.collapse": "Collapse", "ui.collinear": "Collinear", - "ui.colour_vision": "Colour vision", + "ui.colour_vision": "Color vision", "ui.colour_vision_deutan": "Deutan", "ui.colour_vision_deutan_tip": "For a weak or missing green sense", "ui.colour_vision_failed": "Failed", "ui.colour_vision_fixed": "Fixed", "ui.colour_vision_mode": "Mode", - "ui.colour_vision_note": "Changes the colours that carry a meaning: sketch states, axes, bends, analyses and icons. If you use Windows colour filters, keep this Off.", + "ui.colour_vision_note": "Changes the colors that carry a meaning: sketch states, axes, bends, analyses and icons. If you use Windows color filters, keep this Off.", "ui.colour_vision_off": "Off", - "ui.colour_vision_off_tip": "The theme's own colours", + "ui.colour_vision_off_tip": "The theme's own colors", "ui.colour_vision_projected": "Projected", "ui.colour_vision_protan": "Protan", "ui.colour_vision_protan_tip": "For a weak or missing red sense", @@ -3998,7 +3998,7 @@ "ui.cut": "Cut", "ui.cylinder": "Cylinder", "ui.dark": "Dark", - "ui.default_modelling_orientation": "Default modelling orientation", + "ui.default_modelling_orientation": "Default modeling orientation", "ui.delete": "Delete", "ui.depth": "Depth", "ui.design": "Design", @@ -4076,7 +4076,7 @@ "ui.expand": "Expand", "ui.exportDxf": "Export DXF…", "ui.export_ellipsis_keymap": "Export…", - "ui.export_keymap_tip": "Keys, S box favourites and the toolbar, as a file", + "ui.export_keymap_tip": "Keys, S box favorites and the toolbar, as a file", "ui.extend": "Extend", "ui.extent_type": "Extent Type", "ui.extract_component": "Extract to File…", @@ -4261,7 +4261,7 @@ "ui.manipulator_free_alt_tip": "On: Alt/Option or Ctrl/Cmd on extrude / gizmo arrows disables value snapping. Off: Ctrl/Cmd only.", "ui.manufacture": "Manufacture", "ui.material_review.axes": "Material-local axes; no body orientation is assigned.", - "ui.material_review.claims": "Sources and licences are unverified claims. Missing values remain unknown.", + "ui.material_review.claims": "Sources and licenses are unverified claims. Missing values remain unknown.", "ui.material_review.compressive_strength": "Compressive strength", "ui.material_review.conditions": "Stated conditions", "ui.material_review.density": "Density", @@ -4599,7 +4599,7 @@ "ui.view_angles_readout": "Pitch {pitch} · Yaw {yaw} · Roll {roll}", "ui.view_angles_roll": "Roll", "ui.view_angles_yaw": "Yaw", - "ui.view_centre": "View centre", + "ui.view_centre": "View center", "ui.viewport_status_clear": "Turn off {name}", "ui.viewport_status_clear_hint": "Turn off {name} · Esc", "ui.viewport_status_key": "Show key for {name}", @@ -4636,7 +4636,7 @@ "ui.y_up": "Y up", "ui.z_up": "Z up", "ui.zoom": "Zoom", - "ui.zoom_to_cursor_tip": "The wheel zooms toward the point under the cursor (off: toward the view's centre)", + "ui.zoom_to_cursor_tip": "The wheel zooms toward the point under the cursor (off: toward the view's center)", "ui.zoom_to_the_cursor": "Zoom to the cursor", "update.available": "SolidCraft {version} is available", "update.button": "Update", diff --git a/assets/locales/pending/en-us-spelling.json b/assets/locales/pending/en-us-spelling.json new file mode 100644 index 000000000..1b6fd02b8 --- /dev/null +++ b/assets/locales/pending/en-us-spelling.json @@ -0,0 +1,64 @@ +{ + "en-GB": { + "A Single hole snaps to the middle of its face and to the centres of its round edges": "A Single hole snaps to the middle of its face and to the centres of its round edges", + "Centre to centre": "Centre to centre", + "Colour": "Colour", + "Copy all licences": "Copy all licences", + "Favourite": "Favourite", + "Select the centre the pattern turns around first": "Select the centre the pattern turns around first", + "Snap to face and edge centres": "Snap to face and edge centres", + "Specialise": "Specialise", + "cmd.appearance_favorite": "Favourite Look", + "cmd.parameters_favorite": "Favourite Parameter", + "dxf.cancelled": "DXF export cancelled", + "dxf.cancelling": "Cancelling DXF export", + "help.apache": "Apache licence 2.0", + "help.appearance.assign": "Gives the selected bodies, faces or components a colour or a material look, without changing their weight. Use it to tell parts apart or to preview a finish.", + "help.face.delete": "Removes the selected faces and lets the neighbouring faces close the gap, or leaves the gap open as a surface. Use it to take off a rounded edge, a hole or a boss that is in the way.", + "help.font_details": "The interface uses egui's built-in fonts (Ubuntu Light and Hack, under the Ubuntu Font Licence and the MIT/Bitstream Vera licence; Noto Emoji and the emoji icon font, under the OFL and MIT). Sketch text uses Liberation Sans (SIL OFL 1.1). The Crafting Apps' optional font pack, craft-fonts (BIZ UDPGothic, Shippori Mincho, BIZ UDMincho, Noto Sans CJK SC, Noto Sans Arabic; SIL OFL 1.1), is not bundled in SolidCraft builds.", + "help.licences": "Licences", + "help.material.assign": "Sets what the selected bodies are made of, such as steel, aluminium or ABS. Use it so that the mass and weight match the real part.", + "help.mit": "MIT licence", + "help.solid.draft": "Tilts the selected faces by the angle you set, measured from a neutral plane. Use it on moulded or cast parts so that they slide out of the mould.", + "help.solid.revolve": "Spins a sketch profile around an axis to make a round solid. Use it for shafts, knobs, bowls and any part that is round about a centre line.", + "help.solid.split_body": "Cuts a body into separate bodies with a plane, the face of another body or a sketch line. Use it to make parts that are printed, machined or coloured on their own.", + "help.solid.split_face": "Divides the selected faces along a plane, the face of another body or sketch curves, without cutting the body. Use it to give part of a face its own draft, colour or offset.", + "help.third_party": "Third-party licences", + "home.new_mm_hint": "Millimetres · opens in Design", + "navbar.custom.customise": "Customise navigation bar…", + "navbar.custom.position_centre": "Centre", + "navbar.description.separator": "A thin line that groups neighbouring slots.", + "prefs.bottom_centre": "Bottom centre", + "prefs.trackpad_zoom_modifier.help": "Hold only this key to zoom at the pointer with vertical scroll. Off keeps the existing scroll behaviour.", + "render.appearance_editor.base_colour": "Base colour", + "render.cpu_area_editor_help": "Full side vectors in millimeters; U cross V points towards the emitting side. This differs from GPU half-edge vectors.", + "render.env_colour": "Colour", + "render.environment.radial_only": "Centre and radius apply to Radial mode.", + "render.error_finish_gesture": "finish the modelling gesture before previewing", + "render.error_finish_operation": "finish the current modelling operation before entering Render", + "render.frame_centre_mark": "Centre mark", + "render.image_cancelled": "Render cancelled", + "render.image_cancelling": "Cancelling", + "render.image_scene_stale": "Finish the modelling gesture or refresh the scene before checking or starting an image.", + "render.inspector_colour": "Colour", + "render.light_behaviour": "BEHAVIOUR", + "render.light_preview_help": "Live view is unshadowed; Area lights use a centre-sample approximation. Render uses the complete light model.", + "render.light_product_centre": "Product centre", + "render.light_temperature": "Colour temperature", + "render.lighting_colour": "Colour", + "render.ribbon_studios_help": "Browse implemented studio compositions and review their replacements before applying. Concept-only scenes remain labelled.", + "render.stage_panels.centre": "Centre", + "render.stage_panels.source_note": "Authored base-colour source map. Not a measured material.", + "render.studio_area_help": "Up to four one-sided rectangles. Orthogonal half-edges U and V define size; U × V faces the lit side. Coordinates are world-space millimetres.", + "ui.3d_mouse_orbit_tip": "Traced: the 3D mouse turns the view around the part of the model in the middle of the view when the turn begins, marked by a faint ball. Classic: around the view's centre", + "ui.agent_chat_minimize": "Minimise to a strip", + "ui.ai_mode_edits_note": "Modelling commands run without asking; saving, opening, exporting and other file or destructive actions still ask.", + "ui.colour_vision": "Colour vision", + "ui.colour_vision_note": "Changes the colours that carry a meaning: sketch states, axes, bends, analyses and icons. If you use Windows colour filters, keep this Off.", + "ui.colour_vision_off_tip": "The theme's own colours", + "ui.default_modelling_orientation": "Default modelling orientation", + "ui.export_keymap_tip": "Keys, S box favourites and the toolbar, as a file", + "ui.material_review.claims": "Sources and licences are unverified claims. Missing values remain unknown.", + "ui.view_centre": "View centre" + } +} diff --git a/crates/engine/src/cmd/inspect.rs b/crates/engine/src/cmd/inspect.rs index ac76790dc..c0705a7d5 100644 --- a/crates/engine/src/cmd/inspect.rs +++ b/crates/engine/src/cmd/inspect.rs @@ -56,7 +56,7 @@ pub static COMMANDS: &[CommandSpec] = &[ .params("target: appearance.chain target. Copies its resolved look to a transient session clipboard. No document change or dialogs."), CommandSpec::new("appearance.paste", "Paste Look", appearance_gestures::paste).icon("paste").key("Ctrl+Alt+V") .params("bodies/faces/components: appearance.assign targets. Applies the copied look atomically in one undo step; no dialogs."), - CommandSpec::new("appearance.favorite", "Favourite Look", appearance_gestures::favorite).icon("star").noundo().doc_only() + CommandSpec::new("appearance.favorite", "Favorite Look", appearance_gestures::favorite).icon("star").noundo().doc_only() .params("look: appearance.assign look; favorite: bool → validated look and preference request; UI library preference only, no document change or dialogs."), CommandSpec::new("appearance.chain", "Appearance Chain", appearance_chain::chain).icon("inspect").noundo().params( "target: {body: name} | {body: name, face: zero-based model.faces index} | {component: name or id}. Returns steps [{step: face|body|component|material, look: {name,color,opacity,pbr?} or null}] in precedence order and active (step or null). Component material is the common default look of its directly owned bodies, null if mixed/empty. Imported paint is a display fallback outside the four steps. Read-only; no dialogs", diff --git a/crates/engine/src/cmd/parameters.rs b/crates/engine/src/cmd/parameters.rs index 1ab65dc6d..3f22f176b 100644 --- a/crates/engine/src/cmd/parameters.rs +++ b/crates/engine/src/cmd/parameters.rs @@ -35,7 +35,7 @@ pub static COMMANDS: &[CommandSpec] = &[ CommandSpec::new("parameters.delete", "Delete Parameter", delete) .icon("delete") .params("name (refused while something uses it; the error lists the users)"), - CommandSpec::new("parameters.favorite", "Favourite Parameter", favorite).icon("star").params("name, favorite?: bool (default true)"), + CommandSpec::new("parameters.favorite", "Favorite Parameter", favorite).icon("star").params("name, favorite?: bool (default true)"), CommandSpec::new("parameters.move", "Move Parameter", move_param) .icon("reorder") .params("name, before | after: another user parameter; the user parameter is listed just before or after it"), diff --git a/crates/ui-egui/src/dialogs_dense.rs b/crates/ui-egui/src/dialogs_dense.rs index 2c0701fb3..ae2b85aa9 100644 --- a/crates/ui-egui/src/dialogs_dense.rs +++ b/crates/ui-egui/src/dialogs_dense.rs @@ -762,7 +762,7 @@ fn additional_rows(app: &mut SolveApp, d: &mut Dialog, ui: &mut egui::Ui) -> boo // the other, an edge at its middle), its centre, or a round one's centre. for (label, key) in [("From Snap", "from_snap"), ("To Snap", "to_snap")] { form_row(ui, label, |ui| { - extra_choice(ui, &mut d.extra, key, key, &[("As Picked", "picked"), ("Centre", "center"), ("Circle Centre", "circle")]); + extra_choice(ui, &mut d.extra, key, key, &[("As Picked", "picked"), ("Center", "center"), ("Circle Center", "circle")]); }); } ui_kit::options(ui, "feature_options", &mut [("Flip", flip)]); diff --git a/crates/ui-egui/src/help.rs b/crates/ui-egui/src/help.rs index d7b5e653b..ea6f7fec2 100644 --- a/crates/ui-egui/src/help.rs +++ b/crates/ui-egui/src/help.rs @@ -28,15 +28,16 @@ pub struct HelpState { /// One line per fact, for bug reports. pub fn diagnostics(app: &SolveApp) -> String { let renderer = if app.viewport.gpu.is_some() { "GPU" } else { "CPU" }; + let count = |n: usize, one: &str, many: &str| format!("{n} {}", if n == 1 { one } else { many }); format!( - "SolidCraft {VERSION} ({COMMIT}, built {BUILD_DATE})\nOS: {} {}\nRenderer: {renderer}{}\nWindow: {}\nDesign: {} ({} features, {} bodies)", + "SolidCraft {VERSION} ({COMMIT}, built {BUILD_DATE})\nOS: {} {}\nRenderer: {renderer}{}\nWindow: {}\nDesign: {} ({}, {})", std::env::consts::OS, std::env::consts::ARCH, app.help.gpu.as_ref().map(|g| format!(", {g}")).unwrap_or_default(), if app.custom_titlebar { "custom title bar" } else { "system title bar" }, app.session.doc.name, - app.session.doc.features.len(), - app.session.world_state().bodies.len(), + count(app.session.doc.features.len(), "feature", "features"), + count(app.session.world_state().bodies.len(), "body", "bodies"), ) } @@ -227,4 +228,15 @@ mod tests { let d = diagnostics(&app); assert!(d.contains(VERSION) && d.contains(std::env::consts::OS) && d.contains("Renderer: CPU"), "{d}"); } + + /// One feature and one body are counted in the singular (#9085), more in the plural. + #[test] + fn diagnostics_count_one_feature_and_one_body_in_the_singular() { + let mut app = SolveApp::new(solidcraft_engine::Session::default(), Default::default()); + assert!(diagnostics(&app).ends_with("(0 features, 0 bodies)"), "{}", diagnostics(&app)); + app.session.execute("solid.box", &serde_json::json!({"length": 10, "width": 10, "height": 10})).unwrap(); + assert!(diagnostics(&app).ends_with("(1 feature, 1 body)"), "{}", diagnostics(&app)); + app.session.execute("solid.box", &serde_json::json!({"length": 10, "width": 10, "height": 10, "corner": [30, 0, 0]})).unwrap(); + assert!(diagnostics(&app).ends_with("(2 features, 2 bodies)"), "{}", diagnostics(&app)); + } } diff --git a/crates/ui-egui/src/hole_place_ui_tests.rs b/crates/ui-egui/src/hole_place_ui_tests.rs index edf780914..771842b8c 100644 --- a/crates/ui-egui/src/hole_place_ui_tests.rs +++ b/crates/ui-egui/src/hole_place_ui_tests.rs @@ -334,7 +334,7 @@ fn hole_design_preferences_keep_both_controls_and_cancel_after_page_split() { let mut h = Harness::new(); h.call("ui.prefs", json!({"language":"en", "open":"Design"})); let page = rect_of("prefs:page_body").unwrap(); - for label in ["Snap to face and edge centres", "Move holes by clicking or dragging"] { + for label in ["Snap to face and edge centers", "Move holes by clicking or dragging"] { let mut point = None; for _ in 0..12 { point = h.output.accesskit_update.as_ref().and_then(|tree| { diff --git a/crates/ui-egui/src/keymap.rs b/crates/ui-egui/src/keymap.rs index 220c20ef7..990236e93 100644 --- a/crates/ui-egui/src/keymap.rs +++ b/crates/ui-egui/src/keymap.rs @@ -574,7 +574,7 @@ pub fn page(app: &mut SolveApp, ui: &mut egui::Ui) { label: app.tr_label("Export…"), icon: Some("export_tray"), visible: true, - tooltip: Some(app.tr_label("Keys, S box favourites and the toolbar, as a file")), + tooltip: Some(app.tr_label("Keys, S box favorites and the toolbar, as a file")), }, ]; let (filter, toolbar_action) = ui_kit::search_actions_row( diff --git a/crates/ui-egui/src/measurement_ui_tests.rs b/crates/ui-egui/src/measurement_ui_tests.rs index 8c5071921..d2a958c76 100644 --- a/crates/ui-egui/src/measurement_ui_tests.rs +++ b/crates/ui-egui/src/measurement_ui_tests.rs @@ -77,7 +77,7 @@ fn measurement_axis_distances_follow_the_upstream_centre_min_and_max_choices() { assert!(measured["distance_mm"].as_f64().unwrap() < 50. && measured["max"].as_f64().unwrap() > 50.); for (label, distance, from, to) in [ - ("Centre to centre", "center_distance", "center_from", "center_to"), + ("Center to center", "center_distance", "center_from", "center_to"), ("Min", "distance_mm", "from", "to"), ("Max", "max", "max_from", "max_to"), ] { diff --git a/crates/ui-egui/src/prefs.rs b/crates/ui-egui/src/prefs.rs index e1eda4187..c54a58b2e 100644 --- a/crates/ui-egui/src/prefs.rs +++ b/crates/ui-egui/src/prefs.rs @@ -1139,7 +1139,7 @@ preference_settings! { /// When components' bodies sit in a Bodies folder in the browser (#4217). browser_bodies_folders: BodiesFolders = BodiesFolders::Several, PAGE_INTERFACE; /// The wheel zooms toward the point under the cursor (else toward the view's centre). - zoom_to_cursor: bool = true, PAGE_NAVIGATION => check("Zoom to the cursor", "The wheel zooms toward the point under the cursor (off: toward the view's centre)"); + zoom_to_cursor: bool = true, PAGE_NAVIGATION => check("Zoom to the cursor", "The wheel zooms toward the point under the cursor (off: toward the view's center)"); /// Speed multiplier for wheel zoom, independent of the 3D mouse. wheel_zoom_speed: f32 = 1.0, PAGE_NAVIGATION, accept(0.25..=4.0) => slider("ui.wheel_zoom_speed", 0.25..=4.0, 0.05, |v| format!("{v:.2}×"), "prefs:wheel_zoom_speed"); /// Opt-in surface anchoring for the 3D mouse, navigation bridge and drag-zoom. The wheel @@ -3640,7 +3640,7 @@ mod tests { h.call("ui.prefs", json!({"open":"Interface/Navigation bar", "navigation_bar":{"slots":["fit","visual_style","display","spin"]}})); h.frames(20); for (key, label, labels) in [ - ("position", "Position", &["Left", "Centre", "Right"][..]), + ("position", "Position", &["Left", "Center", "Right"][..]), ("size", "Size", &["Compact", "Regular"][..]), ("buttons", "Buttons", &["Icons", "Icons and labels"][..]), ("idle", "When idle", &["Always visible", "Fade", "Hide until hovered"][..]), diff --git a/crates/ui-egui/src/prefs/navigation.rs b/crates/ui-egui/src/prefs/navigation.rs index 647395f28..2cd0d504a 100644 --- a/crates/ui-egui/src/prefs/navigation.rs +++ b/crates/ui-egui/src/prefs/navigation.rs @@ -97,7 +97,7 @@ pub(super) fn show(app: &mut SolveApp, ui: &mut egui::Ui, t: &Tokens) { ui.horizontal_wrapped(|ui| { ui.spacing_mut().item_spacing.x = t.space_8; for (index, (mode, label)) in - [(OrbitAround::Origin, "Origin"), (OrbitAround::ViewCentre, "View centre"), (OrbitAround::Cursor, "prefs.under_cursor")] + [(OrbitAround::Origin, "Origin"), (OrbitAround::ViewCentre, "View center"), (OrbitAround::Cursor, "prefs.under_cursor")] .into_iter() .enumerate() { diff --git a/crates/ui-egui/src/ui_kit/choice_tests.rs b/crates/ui-egui/src/ui_kit/choice_tests.rs index 23d9fe57d..8103303f2 100644 --- a/crates/ui-egui/src/ui_kit/choice_tests.rs +++ b/crates/ui-egui/src/ui_kit/choice_tests.rs @@ -147,7 +147,7 @@ fn optional_field_keeps_empty_default_and_options_use_two_columns() { /// really is too narrow. #[test] fn segments_stay_segments_when_a_scrollbar_appears_and_disappears() { - let options = ["Origin", "View centre", "Point under the cursor"]; + let options = ["Origin", "View center", "Point under the cursor"]; let solid = egui::style::ScrollStyle::solid(); let scrollbar = solid.allocated_width(); assert!(scrollbar > 0.0); diff --git a/crates/ui-egui/src/ui_kit/gallery.rs b/crates/ui-egui/src/ui_kit/gallery.rs index a9d2dbbef..cec9f2f07 100644 --- a/crates/ui-egui/src/ui_kit/gallery.rs +++ b/crates/ui-egui/src/ui_kit/gallery.rs @@ -123,7 +123,7 @@ const ELEMENTS: &[Element] = &[ }); navigation_tile(ui, "grid", "Grid", "style", false); row(ui, "Position", |ui| { - segmented(ui, &mut state.selected, &["Left", "Centre", "Right"], Default::default()); + segmented(ui, &mut state.selected, &["Left", "Center", "Right"], Default::default()); }); checkbox(ui, "Show navigation bar", &mut state.checked); button(ui, "Reset to default", Button::Normal); @@ -271,7 +271,7 @@ const ELEMENTS: &[Element] = &[ let actions = [ StageAction { icon: Some("chain"), label: "Appearance Chain", enabled: true, primary: false, reason: None }, StageAction { icon: Some("reorder"), label: "Replace All", enabled: true, primary: false, reason: None }, - StageAction { icon: Some("star"), label: "Favourite Look", enabled: true, primary: true, reason: None }, + StageAction { icon: Some("star"), label: "Favorite Look", enabled: true, primary: true, reason: None }, StageAction { icon: Some("suppress"), label: "Hide", enabled: true, primary: false, reason: None }, ]; selection_actions(ui, "Boss", &actions); @@ -695,7 +695,7 @@ const ELEMENTS: &[Element] = &[ }); }), element!("file_action", |ui, _| { - FileView::action_tile(ui, "gallery:file:new", ui.available_width(), "new", "New design", "Millimetres · opens in Design", true); + FileView::action_tile(ui, "gallery:file:new", ui.available_width(), "new", "New design", "Millimeters · opens in Design", true); }), element!("file_recovery_banner", |ui, _| { FileView::recovery_banner( diff --git a/crates/ui-egui/src/ui_kit/preferences_figures.rs b/crates/ui-egui/src/ui_kit/preferences_figures.rs index acc9cea99..2c7ce82b2 100644 --- a/crates/ui-egui/src/ui_kit/preferences_figures.rs +++ b/crates/ui-egui/src/ui_kit/preferences_figures.rs @@ -89,7 +89,7 @@ pub(crate) fn paint_orbit(p: &Painter, rect: Rect, pivot: usize) { p.line_segment([centre, c.at(x - 11.0, y + 5.5)], grey); } if pivot == 1 { - // A restrained screen-space crosshair makes "View centre" distinct from origin. + // A restrained screen-space crosshair makes "View center" distinct from origin. let guide = Stroke::new(c.width(1.0), t.form_dim.gamma_multiply(0.7)); for (a, b) in [((x - 9.0, y), (x - 5.0, y)), ((x + 5.0, y), (x + 9.0, y)), ((x, y - 9.0), (x, y - 5.0))] { p.line_segment([c.at(a.0, a.1), c.at(b.0, b.1)], guide); diff --git a/crates/ui-egui/src/viewport.rs b/crates/ui-egui/src/viewport.rs index 251861cb5..e1df0bc66 100644 --- a/crates/ui-egui/src/viewport.rs +++ b/crates/ui-egui/src/viewport.rs @@ -10799,7 +10799,7 @@ mod tests { let keys = |app: &SolveApp| (scene_key(app), highlight_key(app)); h.call("ui.prefs", json!({"open": "Interface"})); crate::prefs::reveal_preference(&mut h, "prefs:color_vision"); - assert!(h.widget("Colour vision").is_some() && h.widget("Off").is_some() && h.widget("Deutan").is_some()); + assert!(h.widget("Color vision").is_some() && h.widget("Off").is_some() && h.widget("Deutan").is_some()); let before = keys(&h.app); h.step(&json!({"click":{"handle":"dialog:Mode:Deutan"}})).unwrap(); h.frame(); diff --git a/crates/ui-egui/tests/scenarios/colour_vision_setting.json b/crates/ui-egui/tests/scenarios/colour_vision_setting.json index 96c2429c0..5d3b47ca6 100644 --- a/crates/ui-egui/tests/scenarios/colour_vision_setting.json +++ b/crates/ui-egui/tests/scenarios/colour_vision_setting.json @@ -5,7 +5,7 @@ {"widget": "Interface"}, {"call": "ui.scroll", "params": {"x": 1000, "y": 500, "delta": -5000}}, {"call": "ui.inspect", "params": {}}, - {"expect": {"shown": "Colour vision", "prefs": {"dialog": "Interface"}, "same_width": "prefs:window"}}, + {"expect": {"shown": "Color vision", "prefs": {"dialog": "Interface"}, "same_width": "prefs:window"}}, {"widget": "Deutan"}, {"expect": {"prefs": {"color_vision": "deutan"}, "same_width": "prefs:window"}}, {"widget": "Cancel"}, diff --git a/crates/ui-egui/tests/scenarios/s44_about_licences.json b/crates/ui-egui/tests/scenarios/s44_about_licences.json index cee6376b5..72d338fb3 100644 --- a/crates/ui-egui/tests/scenarios/s44_about_licences.json +++ b/crates/ui-egui/tests/scenarios/s44_about_licences.json @@ -1,9 +1,9 @@ [ - {"note": "Help ▸ About ▸ Licences shows SolidCraft's licences and every third-party crate's, built into the program."}, + {"note": "Help ▸ About ▸ Licenses shows SolidCraft's licenses and every third-party crate's, built into the program."}, {"call": "ui.help", "params": {"item": "about"}}, - {"widget": "Licences"}, - {"expect": {"shown": "Third-party licences"}}, - {"widget": "Third-party licences"}, - {"expect": {"shown": "Copy all licences"}}, + {"widget": "Licenses"}, + {"expect": {"shown": "Third-party licenses"}}, + {"widget": "Third-party licenses"}, + {"expect": {"shown": "Copy all licenses"}}, {"expect": {"shown": "Third-party software in SolidCraft"}} ] diff --git a/docs/book/src/reference/glossary.md b/docs/book/src/reference/glossary.md index 8371981e4..690a2e6bf 100644 --- a/docs/book/src/reference/glossary.md +++ b/docs/book/src/reference/glossary.md @@ -497,6 +497,6 @@ reports a different name (`EdgeFlangeFeature`), so a script can't match one agai ## Open questions for the maintainer -- **British or American spelling** for labels and docs. Today both are in use (colour and color, - centre and center, favourite and favorite); ids and keys use American spelling. #2501 proposes - an English (UK) language option, so either base spelling can be read in the other. +- **British or American spelling** in the docs. The labels are settled: `en.json` is American + English, and English (UK) (`en-GB.json`, #2501) holds the British spelling. The docs still use + both (colour and color, centre and center); ids and keys use American spelling.