From 5eafaa37fd9d18137040113ba3bfa796058738ab Mon Sep 17 00:00:00 2001 From: Yorik van Havre Date: Wed, 28 Oct 2020 10:46:51 +0100 Subject: [PATCH] Updated ts files --- src/Gui/Language/FreeCAD.ts | 26 +- .../Resources/translations/AddonManager.ts | 117 +- src/Mod/Arch/Resources/translations/Arch.ts | 589 ++--- src/Mod/Draft/Resources/translations/Draft.ts | 73 +- .../Gui/Resources/translations/Drawing.ts | 52 +- .../Gui/Resources/translations/MeshPart.ts | 30 +- .../Part/Gui/Resources/translations/Part.ts | 136 +- .../Path/Gui/Resources/translations/Path.ts | 345 ++- .../Gui/Resources/translations/Sketcher.ts | 1923 +++++++++-------- src/Mod/Web/Gui/Resources/translations/Web.ts | 18 +- 10 files changed, 1930 insertions(+), 1379 deletions(-) diff --git a/src/Gui/Language/FreeCAD.ts b/src/Gui/Language/FreeCAD.ts index 7b8a23d50e97..05ad625a9cfc 100644 --- a/src/Gui/Language/FreeCAD.ts +++ b/src/Gui/Language/FreeCAD.ts @@ -120,6 +120,13 @@ + + Command + + Edit + + + DlgCustomizeSpNavSettings @@ -2486,6 +2493,16 @@ opening or creation Show axis cross by default + + Pick radius (px): + + + + Area for picking elements in 3D view. +Larger value eases to pick things, but can make small features impossible to select. + + + Gui::Dialog::DlgSettings3DViewImp @@ -3524,10 +3541,6 @@ Mouse tilting is not disabled by this setting. Simple color - - Pick radius (px): - - Object being edited @@ -3544,11 +3557,6 @@ Mouse tilting is not disabled by this setting. Enable selection highlighting and use specified color - - Area for picking elements in 3D view. -Larger value eases to pick things, but can make small features impossible to select. - - Background color for the model view diff --git a/src/Mod/AddonManager/Resources/translations/AddonManager.ts b/src/Mod/AddonManager/Resources/translations/AddonManager.ts index 222e070b3ce5..aa67aa739026 100644 --- a/src/Mod/AddonManager/Resources/translations/AddonManager.ts +++ b/src/Mod/AddonManager/Resources/translations/AddonManager.ts @@ -3,7 +3,7 @@ AddonInstaller - + Installed location @@ -11,62 +11,62 @@ AddonsInstaller - + Unable to fetch the code of this macro. - + Unable to retrieve a description for this macro. - + The addons that can be installed here are not officially part of FreeCAD, and are not reviewed by the FreeCAD team. Make sure you know what you are installing! - + Addon manager - + You must restart FreeCAD for changes to take effect. Press Ok to restart FreeCAD now, or Cancel to restart later. - + Checking for updates... - + Apply - + update(s) - + No update available - + Macro successfully installed. The macro is now available from the Macros dialog. - + Unable to install - + Addon successfully removed. Please restart FreeCAD @@ -86,190 +86,195 @@ - + Unable to download addon list. - + Workbenches list was updated. - + Outdated GitPython detected, consider upgrading with pip. - + List of macros successfully retrieved. - + Retrieving description... - + Retrieving info from - + An update is available for this addon. - + This addon is already installed. - + Retrieving info from git - + Retrieving info from wiki - + GitPython not found. Using standard download instead. - + Your version of python doesn't appear to support ZIP files. Unable to proceed. - + Workbench successfully installed. Please restart FreeCAD to apply the changes. - + Missing workbench - + Missing python module - + Missing optional python module (doesn't prevent installing) - + Some errors were found that prevent to install this workbench - + Please install the missing components first. - + Error: Unable to download - + Successfully installed - + GitPython not installed! Cannot retrieve macros from git - - Unable to clean macro code - - - - + Installed - + Update available - + Restart required - + This macro is already installed. - + A macro has been installed and is available under Macro -> Macros menu - + This addon is marked as obsolete - + This usually means it is no longer maintained, and some more advanced addon in this list provides the same functionality. - + Error: Unable to locate zip from - + Something went wrong with the Git Macro Retrieval, possibly the Git executable is not in the path - + This addon is marked as Python 2 Only - + This workbench may no longer be maintained and installing it on a Python 3 system will more than likely result in errors at startup or while in use. - + User requested updating a Python 2 workbench on a system running Python 3 - - + Workbench successfully updated. Please restart FreeCAD to apply the changes. - + User requested installing a Python 2 workbench on a system running Python 3 - - + Appears to be an issue connecting to the Wiki, therefore cannot retrieve Wiki macro list at this time + + + Raw markdown displayed + + + + + Python Markdown library is missing. + + Dialog @@ -405,12 +410,12 @@ to be scanned for available addons Std_AddonMgr - + &Addon manager - + Manage external workbenches and macros diff --git a/src/Mod/Arch/Resources/translations/Arch.ts b/src/Mod/Arch/Resources/translations/Arch.ts index d40a10221a8a..f27b6793e6dd 100644 --- a/src/Mod/Arch/Resources/translations/Arch.ts +++ b/src/Mod/Arch/Resources/translations/Arch.ts @@ -113,7 +113,7 @@ - + The placement of this object @@ -198,17 +198,17 @@ - + The normal extrusion direction of this object (keep (0,0,0) for automatic normal) - + The linked object - + The line width of the rendered objects @@ -537,51 +537,6 @@ The fillet to apply to the angle of the base profile. This value is multiplied by the bar diameter. - - - A list of angles for each roof pane - - - - - A list of horizontal length projections for each roof pane - - - - - A list of IDs of relative profiles for each roof pane - - - - - A list of thicknesses for each roof pane - - - - - A list of overhangs for each roof pane - - - - - A list of calculated heights for each roof pane - - - - - The face number of the base object used to build this roof - - - - - The total length of ridges and hips of this roof - - - - - The total length of borders of this roof - - The description column @@ -613,52 +568,52 @@ - + If false, non-solids will be cut too, with possible wrong results. - + The display length of this section plane - + The display height of this section plane - + The size of the arrows of this section plane - + Show the cut in the 3D view - + The rendering mode to use - + If cut geometry is shown or not - + If cut geometry is filled or not - + The size of the texts inside this object - + If checked, source objects are displayed regardless of being visible in the 3D model @@ -993,32 +948,32 @@ - + The length of this wall. Not used if this wall is based on an underlying object - + The width of this wall. Not used if this wall is based on a face - + The height of this wall. Keep 0 for automatic. Not used if this wall is based on a solid - + The alignment of this wall on its base object, if applicable - + The face number of the base object used to build this wall - + The offset between this wall and its baseline (only for left and right alignments) @@ -1048,47 +1003,47 @@ - + A standard code (MasterFormat, OmniClass,...) - + A description for this material - + The transparency value of this material - + The color of this material - + The list of layer names - + The list of layer materials - + The list of layer thicknesses - + The line color of the projected objects - + The color of the cut faces (if turned on) @@ -1192,11 +1147,6 @@ Shape of rebar - - - Flip the roof direction if going the wrong way - - Shows plan opening symbols if available @@ -1263,12 +1213,12 @@ - + The shape of this object - + The line width of this object @@ -1338,7 +1288,7 @@ - + A URL where to find information about this material @@ -1393,22 +1343,22 @@ - + The objects that must be considered by this section plane. Empty means the whole document. - + The transparency of this object - + The color of this object - + The distance between the cut plane and the actual view cut (keep this a very small value but not zero) @@ -1483,42 +1433,42 @@ - + Enable this to make the wall generate blocks - + The length of each block - + The height of each block - + The horizontal offset of the first line of blocks - + The horizontal offset of the second line of blocks - + The size of the joints between each block - + The number of entire blocks - + The number of broken blocks @@ -1628,12 +1578,12 @@ - + If True, resulting views will be clipped to the section plane area. - + If true, the color of the objects material will be used to fill cut areas. @@ -1938,17 +1888,17 @@ - + This overrides Width attribute to set width of each segment of wall. Ignored if Base object provides Widths information, with getWidths() method. (The 1st value override 'Width' attribute for 1st segment of wall; if a value is zero, 1st value of 'OverrideWidth' will be followed) - + This overrides Align attribute to set Align of each segment of wall. Ignored if Base object provides Aligns information, with getAligns() method. (The 1st value override 'Align' attribute for 1st segment of wall; if a value is not 'Left, Right, Center', 1st value of 'OverrideAlign' will be followed) - + The area of this wall as a simple Height * Length calculation @@ -2002,21 +1952,81 @@ The rebar mark + + + The color of this material when cut + + + + + The list of angles of the roof segments + + + + + The list of horizontal length projections of the roof segments + + + + + The list of IDs of the relative profiles of the roof segments + + + + + The list of thicknesses of the roof segments + + + + + The list of overhangs of the roof segments + + + + + The list of calculated heights of the roof segments + + + + + The face number of the base object used to build the roof + + + + + The total length of the ridges and hips of the roof + + + + + The total length of the borders of the roof + + + + + Specifies if the direction of the roof should be flipped + + + + + Show the label in the 3D view + + Arch - + Components - + Components of this object - + Axes @@ -2026,12 +2036,12 @@ - + Remove - + Add @@ -2096,37 +2106,37 @@ - + Base component - + Additions - + Subtractions - + Objects - + Roof - + Create Roof - + Unable to create a roof @@ -2141,7 +2151,7 @@ - + Create Section Plane @@ -2156,22 +2166,22 @@ - + Create Wall - + Width - + Height - + This mesh is an invalid solid @@ -2181,42 +2191,42 @@ - + Edit - + Create/update component - + Base 2D object - + Wires - + Create new component - + Name - + Type - + Thickness @@ -2246,7 +2256,7 @@ - + Fixtures @@ -2276,7 +2286,7 @@ - + Length @@ -2291,17 +2301,17 @@ - + Merge Wall - + Please select only wall objects - + Merge Walls @@ -2396,27 +2406,12 @@ - - Parameters of the profiles of the roof: -* Angle : slope in degrees compared to the horizontal one. -* Run : outdistance between the wall and the ridge sheathing. -* Thickness : thickness of the side of roof. -* Overhang : outdistance between the sewer and the wall. -* Height : height of the ridge sheathing (calculated automatically) -* IdRel : Relative Id for calculations automatic. ---- -If Angle = 0 and Run = 0 then profile is identical to the relative profile. -If Angle = 0 then angle is calculated so that the height is the same one as the relative profile. -If Run = 0 then Run is calculated so that the height is the same one as the relative profile. - - - - + Id - + IdRel @@ -2441,27 +2436,27 @@ If Run = 0 then Run is calculated so that the height is the same one as the rela - + Angle (deg) - + Run (mm) - + Thickness (mm) - + Overhang (mm) - + Height (mm) @@ -2476,7 +2471,7 @@ If Run = 0 then Run is calculated so that the height is the same one as the rela - + Walls can only be based on Part or Mesh objects @@ -2496,12 +2491,12 @@ If Run = 0 then Run is calculated so that the height is the same one as the rela - + Value - + Unit @@ -2516,7 +2511,7 @@ If Run = 0 then Run is calculated so that the height is the same one as the rela - + Group @@ -2691,7 +2686,7 @@ If Run = 0 then Run is calculated so that the height is the same one as the rela - + Offset @@ -2711,7 +2706,7 @@ If Run = 0 then Run is calculated so that the height is the same one as the rela - + Schedule @@ -2778,22 +2773,22 @@ Site creation aborted. - + Hinge - + Opening mode - + Get selected edge - + Press to retrieve the selected edge @@ -2813,27 +2808,27 @@ Site creation aborted. - + Material - + New layer - + Wall Presets... - + Hole wire - + Pick selected @@ -2853,62 +2848,62 @@ Site creation aborted. - + Axis system components - + Grid - + Total width - + Total height - + Add row - + Del row - + Add col - + Del col - + Create span - + Remove span - + Rows - + Columns @@ -2923,12 +2918,12 @@ Site creation aborted. - + Error: Unable to modify the base object of this wall - + Window elements @@ -2963,7 +2958,7 @@ Site creation aborted. - + Description @@ -2978,7 +2973,7 @@ Site creation aborted. - + Hosts @@ -2993,22 +2988,22 @@ Site creation aborted. - + Auto height is larger than height - + Total row size is larger than height - + Auto width is larger than width - + Total column size is larger than width @@ -3054,47 +3049,47 @@ Building creation aborted. - + Component - + Edit IFC properties - + Edit standard code - + Property - + Add property... - + Add property set... - + New... - + New property - + New property set @@ -3208,42 +3203,42 @@ Floor creation aborted. - + Section plane settings - + Objects seen by this section plane: - + Section plane placement: - + Rotate X - + Rotate Y - + Rotate Z - + Resize - + Center @@ -3286,12 +3281,12 @@ Note: You can change that in the preferences. - + The selected wall contains no subwall to merge - + Cannot compute blocks for wall @@ -3301,27 +3296,27 @@ Note: You can change that in the preferences. - + Unable to create component - + The number of the wire that defines a hole in the host object. A value of zero will automatically adopt the largest wire - + + default - + If this is checked, the default Frame value of this window will be added to the value entered here - + If this is checked, the default Offset value of this window will be added to the value entered here @@ -3389,42 +3384,42 @@ You can change that in the preferences. - + Remove highlighted objects from the list above - + Add selected - + Add selected object(s) to the scope of this section plane - + Rotates the plane along the X axis - + Rotates the plane along the Y axis - + Rotates the plane along the Z axis - + Resizes the plane to fit the objects in the list above - + Centers the plane on the objects in the list above @@ -3439,7 +3434,7 @@ You can change that in the preferences. - + Next point @@ -3479,42 +3474,42 @@ You can change that in the preferences. - + Con&tinue - + First point of wall - + Wall options - + This list shows all the MultiMaterials objects of this document. Create some to define wall types. - + Alignment - + Left - + Right - + Use sketches @@ -3559,12 +3554,12 @@ You can change that in the preferences. - + Total thickness - + depends on the object @@ -3574,7 +3569,7 @@ You can change that in the preferences. - + Unable to recognize that file type @@ -3663,6 +3658,26 @@ You can change that in the preferences. The shapefile python library was not found on your system. Would you like to download it now from <a href="https://github.com/GeospatialPython/pyshp">https://github.com/GeospatialPython/pyshp</a>? It will be placed in your macros folder. + + + Parameters of the roof profiles : +* Angle : slope in degrees relative to the horizontal. +* Run : horizontal distance between the wall and the ridge. +* Thickness : thickness of the roof. +* Overhang : horizontal distance between the eave and the wall. +* Height : height of the ridge above the base (calculated automatically). +* IdRel : Id of the relative profile used for automatic calculations. +--- +If Angle = 0 and Run = 0 then the profile is identical to the relative profile. +If Angle = 0 then the angle is calculated so that the height is the same as the relative profile. +If Run = 0 then the run is calculated so that the height is the same as the relative profile. + + + + + Wall + + ArchMaterial @@ -3692,7 +3707,7 @@ You can change that in the preferences. - + URL @@ -3727,45 +3742,50 @@ You can change that in the preferences. - + Transparency - + A transparency value for this material - + Standard code - + A standard (MasterFormat, Omniclass...) code for this material - + Opens the URL in a browser - + A URL describing this material - + Opens a browser dialog to choose a class from a BIM standard - + Father + + + Section Color + + Arch_3Views @@ -3832,7 +3852,7 @@ You can change that in the preferences. Arch_AxisTools - + Axis tools @@ -4006,62 +4026,62 @@ You can change that in the preferences. Arch_Grid - + The number of rows - + The number of columns - + The sizes for rows - + The sizes of columns - + The span ranges of cells that are merged together - + The type of 3D points produced by this grid object - + The total width of this grid - + The total height of this grid - + Creates automatic column divisions (set to 0 to disable) - + Creates automatic row divisions (set to 0 to disable) - + When in edge midpoint mode, if this grid must reorient its children along edge normals or not - + The indices of faces to hide @@ -4095,7 +4115,7 @@ You can change that in the preferences. Arch_MaterialTools - + Material tools @@ -4103,12 +4123,12 @@ You can change that in the preferences. Arch_MergeWalls - + Merge Walls - + Merges the selected walls, if possible @@ -4168,7 +4188,7 @@ You can change that in the preferences. Arch_PanelTools - + Panel tools @@ -4314,12 +4334,12 @@ You can change that in the preferences. Arch_Roof - + Roof - + Creates a roof object from the selected wire. @@ -4340,12 +4360,12 @@ You can change that in the preferences. Arch_SectionPlane - + Section Plane - + Creates a section plane object, including the selected objects @@ -4483,12 +4503,12 @@ You can change that in the preferences. Arch_Wall - + Wall - + Creates a wall object from scratch or from a selected object (wire, face or solid) @@ -4592,47 +4612,47 @@ You can change that in the preferences. - + Description - + A description for this operation - + Unit - + Objects - + Filter - + Adds a line below the selected line/cell - + Deletes the selected line - + Clears the whole list - + Clear @@ -4727,42 +4747,42 @@ You can change that in the preferences. - + Property - + An optional unit to express the resulting value. Ex: m^3 (you can also write m³ or m3) - + If this is enabled, an associated spreadsheet containing the results will be maintained together with this schedule object - + Associate spreadsheet - + If this is turned on, additional lines will be filled with each object considered. If not, only the totals. - + Detailed results - + Add row - + Del row @@ -4777,7 +4797,7 @@ You can change that in the preferences. - + The property to retrieve from each object. Can be "Count" to count the objects, or property names like "Length" or "Shape.Volume" to retrieve @@ -4785,7 +4805,7 @@ a certain property. - + An optional semicolon (;) separated list of object names (internal names, not labels), to be considered by this operation. If the list contains groups, children will be added. @@ -4793,10 +4813,15 @@ Leave blank to use all objects from the document - + <html><head/><body><p>An optional semicolon (;) separated list of property:value filters. Prepend ! to a property name to invert the effect of the filer (exclude objects that match the filter). Objects whose property contains the value will be matched. Examples of valid filters (everything is case-insensitive):</p><p><span style=" font-weight:600;">Name:Wall</span> - Will only consider objects with &quot;wall&quot; in their name (internal name)</p><p><span style=" font-weight:600;">!Name:Wall</span> - Will only consider objects which DON'T have &quot;wall&quot; in their name (internal name)</p><p><span style=" font-weight:600;">Description:Win</span> - Will only consider objects with &quot;win&quot; in their description</p><p><span style=" font-weight:600;">!Label:Win</span> - Will only consider objects which DO NOT have &quot;win&quot; in their label</p><p><span style=" font-weight:600;">IfcType:Wall</span> - Will only consider objects which Ifc Type is &quot;Wall&quot;</p><p><span style=" font-weight:600;">!Tag:Wall</span> - Will only consider objects which tag is NOT &quot;Wall&quot;</p><p>If you leave this field empty, no filtering is applied</p></body></html> + + + Unnamed schedule + + Draft diff --git a/src/Mod/Draft/Resources/translations/Draft.ts b/src/Mod/Draft/Resources/translations/Draft.ts index 886790c3b17f..7b94ad5ce2cb 100644 --- a/src/Mod/Draft/Resources/translations/Draft.ts +++ b/src/Mod/Draft/Resources/translations/Draft.ts @@ -815,25 +815,35 @@ value by using the [ and ] keys while drawing - + Centers the view on the current working plane - + Center view - + Resets the working plane to its previous position - + Previous + + + Grid extension + + + + + lines + + Gui::Dialog::DlgSettingsDraft @@ -1261,7 +1271,7 @@ such as "Arial:Bold" - + Select a font file @@ -1341,32 +1351,32 @@ such as "Arial:Bold" - + Dashed line definition - + 0.09,0.05 - + Dashdot line definition - + 0.09,0.05,0.02,0.05 - + Dotted line definition - + 0.02,0.02 @@ -1421,17 +1431,17 @@ such as "Arial:Bold" - + ShapeString settings - + Default ShapeString font file - + Drawing view line definitions @@ -1571,7 +1581,7 @@ such as "Arial:Bold" - + An SVG linestyle definition @@ -1611,22 +1621,22 @@ such as "Arial:Bold" - + Check this if you want to preserve colors of faces while doing downgrade and upgrade (splitFaces and makeShell only) - + Preserve colors of faces during downgrade/upgrade - + Check this if you want the face names to derive from the originating object name and vice versa while doing downgrade/upgrade (splitFaces and makeShell only) - + Preserve names of faces during downgrade/upgrade @@ -2169,6 +2179,31 @@ This value is the maximum segment length. Show grid border + + + Override unit + + + + + By leaving this field blank, the dimension measurements will be shown in the current unit defined in FreeCAD. By indicating a unit here such as m or cm, you can force new dimensions to be shown in that unit. + + + + + The resolution to draw the patterns in. Default value is 128. Higher values give better resolutions, lower values make drawing faster + + + + + Hatch Pattern default size + + + + + The default size of hatch patterns + + ImportDWG diff --git a/src/Mod/Drawing/Gui/Resources/translations/Drawing.ts b/src/Mod/Drawing/Gui/Resources/translations/Drawing.ts index 07450298d8ee..abe3ba19d77e 100644 --- a/src/Mod/Drawing/Gui/Resources/translations/Drawing.ts +++ b/src/Mod/Drawing/Gui/Resources/translations/Drawing.ts @@ -238,126 +238,126 @@ DrawingGui::DrawingView - + &Background - + &Outline - + &Native - + &OpenGL - + &Image - + &High Quality Antialiasing - + Open SVG File - + Could not open file '%1'. - + &Renderer - + Export PDF - + PDF file - + Page sizes - + A0 - + A1 - + A2 - + A3 - + A4 - + A5 - + Different orientation - + The printer uses a different orientation than the drawing. Do you want to continue? - - + + Different paper size - - + + The printer uses a different paper size than the drawing. Do you want to continue? - + Opening file failed - + Can't open file '%1' for writing. diff --git a/src/Mod/MeshPart/Gui/Resources/translations/MeshPart.ts b/src/Mod/MeshPart/Gui/Resources/translations/MeshPart.ts index de400cd8b441..25c426b91266 100644 --- a/src/Mod/MeshPart/Gui/Resources/translations/MeshPart.ts +++ b/src/Mod/MeshPart/Gui/Resources/translations/MeshPart.ts @@ -33,7 +33,8 @@ - Curve on mesh + Creates an approximated curve on top of a mesh. +This command only works with a 'mesh' object. @@ -201,47 +202,54 @@ - + + Press 'Start', then pick points on the mesh; when enough points have been set, right-click and choose 'Create'. Repeat this process to create more splines. Close this task panel to complete the operation. + +This command only works with a 'mesh' object, not a regular face or surface. To convert an object to a mesh use the tools of the Mesh Workbench. + + + + Wire - - Snap tolerance to vertexes + + Snap tolerance to vertices - + px - + Split threshold - + Spline Approximation - + Tolerance to mesh - + Continuity - + Maximum curve degree - + Start diff --git a/src/Mod/Part/Gui/Resources/translations/Part.ts b/src/Mod/Part/Gui/Resources/translations/Part.ts index f97ee1e6e579..20af3f28a20a 100644 --- a/src/Mod/Part/Gui/Resources/translations/Part.ts +++ b/src/Mod/Part/Gui/Resources/translations/Part.ts @@ -126,6 +126,14 @@ Compound Filter + + + Filter out objects from a selected compound by characteristics like volume, +area, or length, or by choosing specific items. +If a second object is selected, it will be used as reference, for example, +for collision or distance filtering. + + Compound Filter: remove some childs from a compound @@ -136,6 +144,11 @@ Select a shape that is a compound, first! Second selected item (optional) will be treated as a stencil. + + + First select a shape that is a compound. If a second object is selected (optional) it will be treated as a stencil. + + Computing the result failed with an error: @@ -167,6 +180,12 @@ Click 'Continue' to create the feature anyway, or 'Abort' to Explode compound + + + Split up a compound of shapes into separate objects. +It will create a 'Compound Filter' for each shape. + + Explode compound: split up a list of shapes into separate objects @@ -177,6 +196,11 @@ Click 'Continue' to create the feature anyway, or 'Abort' to Select a shape that is a compound, first! + + + First select a shape that is a compound. + + Bad selection @@ -225,12 +249,12 @@ Click 'Continue' to create the feature anyway, or 'Abort' to Part_JoinFeatures - - Computing the result failed with an error: + + Computing the result failed with an error: {err} - Click 'Continue' to create the feature anyway, or 'Abort' to cancel. +Click 'Continue' to create the feature anyway, or 'Abort' to cancel. @@ -243,27 +267,51 @@ Click 'Continue' to create the feature anyway, or 'Abort' to Continue + + + Computing the result failed with an error: + +{err} + + Click 'Continue' to create the feature anyway, or 'Abort' to cancel. + + Select at least two objects, or one or more compounds, first! + + + Select at least two objects, or one or more compounds + + Select base object, then the object to embed, and invoke this tool. + + + Select base object, then the object to embed, and then invoke this tool. + + Select the object to make a cutout in, then the object that should fit into the cutout, and invoke this tool. + + + Select the object to make a cutout in, then the object that should fit into the cutout, and then invoke this tool. + + Part_SplitFeatures - - Computing the result failed with an error: + + Computing the result failed with an error: {err} @@ -281,18 +329,22 @@ Click 'Continue' to create the feature anyway, or 'Abort' to - - Boolean Fragments + + Boolean fragments - - Split objects where they intersect + + Create a 'Boolean Fragments' object from two or more selected objects, +or from the shapes inside a compound. +This is a boolean union which is then sliced at the intersections +of the original shapes. +A 'Compound Filter' can be used to extract the individual slices. - - Select at least two objects, or one or more compounds, first! If only one compound is selected, the compounded shapes will be intersected between each other (otherwise, compounds with self-intersections are invalid). + + Select at least two objects, or one or more compounds. If only one compound is selected, the compounded shapes will be intersected between each other (otherwise, compounds with self-intersections are invalid). @@ -301,13 +353,15 @@ Click 'Continue' to create the feature anyway, or 'Abort' to - - Split object by intersections with other objects, and pack the pieces into a compound. + + Slice a selected object by using other objects as cutting tools. +The resulting pieces will be stored in a compound. +A 'Compound Filter' can be used to extract the individual slices. - - Select at least two objects, first! First one is the object to be sliced; the rest are objects to slice with. + + Select at least two objects. The first one is the object to be sliced; the rest are objects to slice with. @@ -315,14 +369,44 @@ Click 'Continue' to create the feature anyway, or 'Abort' to Slice apart + + + Boolean Fragments + + + + + Split objects where they intersect + + + + + Split object by intersections with other objects, and pack the pieces into a compound. + + Split object by intersections with other objects. - - Boolean XOR + + Select at least two objects, first! First one is the object to be sliced; the rest are objects to slice with. + + + + + Slice a selected object by other objects, and split it apart. +It will create a 'Compound Filter' for each slice. + + + + + Computing the result failed with an error: + +{err} + +Click 'Continue' to create the feature anyway, or 'Abort' to cancel. @@ -330,6 +414,24 @@ Click 'Continue' to create the feature anyway, or 'Abort' to Remove intersection fragments + + + Select at least two objects, or one or more compounds, first! If only one compound is selected, the compounded shapes will be intersected between each other (otherwise, compounds with self-intersections are invalid). + + + + + Boolean XOR + + + + + Perform an 'exclusive OR' boolean operation with two or more selected objects, +or with the shapes inside a compound. +This means the overlapping volumes of the shapes will be removed. +A 'Compound Filter' can be used to extract the remaining pieces. + + Part_Tube diff --git a/src/Mod/Path/Gui/Resources/translations/Path.ts b/src/Mod/Path/Gui/Resources/translations/Path.ts index ca72d9a4b4a6..179fabcd6670 100644 --- a/src/Mod/Path/Gui/Resources/translations/Path.ts +++ b/src/Mod/Path/Gui/Resources/translations/Path.ts @@ -133,6 +133,11 @@ Positive values push the cutter toward, or into, the feature. Negative values retract the cutter away from the feature. + + + Cut internal feature areas within a larger selected face. + + Ignore internal feature areas within a larger selected face. @@ -623,6 +628,11 @@ Pattern method + + + A material for this object + + Extend the profile clearing beyond the Extra Offset. @@ -894,11 +904,6 @@ Path - - - Edit - - %s is not a Base Model object of the job %s @@ -914,6 +919,11 @@ Ignoring vertex + + + Edit + + Didn't find job %s @@ -1009,6 +1019,11 @@ Heights + + + Diameters + + AreaOp Operation @@ -1148,11 +1163,26 @@ Always select the bottom edge of the hole when using an edge. + + + Ignoring non-horizontal Face + + Unable to create path for face(s). + + + Applying inverse angle automatically. + + + + + Applying inverse angle manually. + + Engraving Operations @@ -1563,6 +1593,11 @@ Arguments for the Post Processor (specific to the script) + + + Last Time the Job was post-processed + + An optional description for this job @@ -1771,6 +1806,16 @@ Make True, if specifying a Start Point + + + Lower limit of the turning diameter + + + + + Upper limit of the turning diameter. + + Coolant option for this operation @@ -2891,6 +2936,39 @@ If it is necessary to set the FinalDepth manually please select a different oper + + PathVcarve + + + Vcarve + + + + + Creates a medial line engraving path + + + + + Additional base objects to be engraved + + + + + The deflection value for discretizing arcs + + + + + cutoff for removing colinear segments (degrees). default=10.0. + + + + + The Job Base Object has no engraveable element. Engraving operation will produce no output. + + + PathWaterline @@ -3146,6 +3224,11 @@ If it is necessary to set the FinalDepth manually please select a different oper Path_DressupDragKnife + + + Edit Dragknife Dress-up + + DragKnife Dress-up @@ -3634,19 +3717,58 @@ If it is necessary to set the FinalDepth manually please select a different oper Path_Sanity - - It appears the machine limits haven't been set. Not able to check path extents. - + + Check the path job for common errors - - Check the Path project for common errors + + Base Object(s) - - Check the Path Project for common errors + + Job Sequence + + + + + Job Description + + + + + Job Type + + + + + CAD File Name + + + + + Last Save Date + + + + + Customer + + + + + Designer + + + + + Operation + + + + + Minimum Z Height @@ -3679,6 +3801,192 @@ If it is necessary to set the FinalDepth manually please select a different oper No issues detected, {} has passed basic sanity check. + + + Maximum Z Height + + + + + Cycle Time + + + + + Coolant + + + + + TOTAL JOB + + + + + Tool Number + + + + + Description + + + + + Manufacturer + + + + + Part Number + + + + + URL + + + + + Inspection Notes + + + + + Tool Controller + + + + + Feed Rate + + + + + Spindle Speed + + + + + Tool Shape + + + + + Tool Diameter + + + + + X Size + + + + + Y Size + + + + + Z Size + + + + + Material + + + + + Work Offsets + + + + + Order By + + + + + Part Datum + + + + + Gcode File + + + + + Last Post Process Date + + + + + Stops + + + + + Programmer + + + + + Machine + + + + + Postprocessor + + + + + Post Processor Flags + + + + + File Size (kbs) + + + + + Line Count + + + + + Note + + + + + Operator + + + + + Date + + + + + It appears the machine limits haven't been set. Not able to check path extents. + + + + + + Check the Path project for common errors + + + + + Check the Path Project for common errors + + Path_SelectLoop @@ -3792,6 +4100,19 @@ If it is necessary to set the FinalDepth manually please select a different oper + + Path_Vcarve + + + VCarve requires an engraving cutter with CuttingEdgeAngle + + + + + Engraver Cutting Edge Angle must be < 180 degrees. + + + Probe diff --git a/src/Mod/Sketcher/Gui/Resources/translations/Sketcher.ts b/src/Mod/Sketcher/Gui/Resources/translations/Sketcher.ts index e03f5de34f4f..bfc637c22707 100644 --- a/src/Mod/Sketcher/Gui/Resources/translations/Sketcher.ts +++ b/src/Mod/Sketcher/Gui/Resources/translations/Sketcher.ts @@ -4,17 +4,17 @@ CmdSketcherBSplineComb - + Sketcher - - Show/Hide B-spline curvature comb + + Show/hide B-spline curvature comb - + Switches between showing and hiding the curvature comb for all B-splines @@ -22,17 +22,17 @@ CmdSketcherBSplineDegree - + Sketcher - - Show/Hide B-spline degree + + Show/hide B-spline degree - + Switches between showing and hiding the degree for all B-splines @@ -40,17 +40,17 @@ CmdSketcherBSplineKnotMultiplicity - + Sketcher - - Show/Hide B-spline knot multiplicity + + Show/hide B-spline knot multiplicity - + Switches between showing and hiding the knot multiplicity for all B-splines @@ -58,17 +58,17 @@ CmdSketcherBSplinePolygon - + Sketcher - - Show/Hide B-spline control polygon + + Show/hide B-spline control polygon - + Switches between showing and hiding the control polygons for all B-splines @@ -76,17 +76,17 @@ CmdSketcherCarbonCopy - + Sketcher - - CarbonCopy + + Carbon copy - + Copies the geometry of another sketch @@ -94,17 +94,17 @@ CmdSketcherClone - + Sketcher - + Clone - + Creates a clone of the geometry taking as reference the last selected point @@ -118,73 +118,73 @@ - Close Shape + Close shape - Produce closed shape by Link end point of element with next elements' starting point + Produce a closed shape by tying the end point of one element with the next element's starting point CmdSketcherCompBSplineShowHideGeometryInformation - + Sketcher - - + + Show/hide B-spline information layer - - Show/Hide B-spline degree + + Show/hide B-spline degree - - Show/Hide B-spline control polygon + + Show/hide B-spline control polygon - - Show/Hide B-spline curvature comb + + Show/hide B-spline curvature comb - - Show/Hide B-spline knot multiplicity + + Show/hide B-spline knot multiplicity CmdSketcherCompConstrainRadDia - + Sketcher - + Constrain arc or circle - + Constrain an arc or a circle - + Constrain radius - + Constrain diameter @@ -192,17 +192,17 @@ CmdSketcherCompCopy - + Sketcher - + Copy - + Creates a clone of the geometry taking as reference the last selected point @@ -210,27 +210,27 @@ CmdSketcherCompCreateArc - + Sketcher - + Create arc - + Create an arc in the sketcher - + Center and end points - + End points and rim point @@ -238,17 +238,17 @@ CmdSketcherCompCreateBSpline - + Sketcher - + Create a B-spline - + Create a B-spline in the sketch @@ -256,27 +256,27 @@ CmdSketcherCompCreateCircle - + Sketcher - + Create circle - + Create a circle in the sketcher - + Center and rim point - + 3 rim points @@ -284,42 +284,42 @@ CmdSketcherCompCreateConic - + Sketcher - + Create a conic - + Create a conic in the sketch - + Ellipse by center, major radius, point - - Ellipse by Periapsis, apoapsis, minor radius + + Ellipse by periapsis, apoapsis, minor radius - + Arc of ellipse by center, major radius, endpoints - + Arc of hyperbola by center, major radius, endpoints - + Arc of parabola by focus, vertex, endpoints @@ -327,52 +327,52 @@ CmdSketcherCompCreateRegularPolygon - + Sketcher - + Create regular polygon - + Create a regular polygon in the sketcher - + Triangle - + Square - + Pentagon - + Hexagon - + Heptagon - + Octagon - + Regular Polygon @@ -380,27 +380,27 @@ CmdSketcherCompModifyKnotMultiplicity - + Sketcher - + Modify knot multiplicity - + Modifies the multiplicity of the selected knot of a B-spline - + Increase knot multiplicity - + Decrease knot multiplicity @@ -414,29 +414,29 @@ - Connect Edges + Connect edges - Link end point of element with next elements' starting point + Tie the end point of the element with next element's starting point CmdSketcherConstrainAngle - + Sketcher - + Constrain angle - + Fix the angle of a line or the angle between two lines @@ -444,35 +444,35 @@ CmdSketcherConstrainBlock - + Sketcher - - Constrain Block + + Constrain block - - Create a Block constraint on the selected item + + Block constraint: block the selected edge from moving CmdSketcherConstrainCoincident - + Sketcher - + Constrain coincident - + Create a coincident constraint on the selected item @@ -480,17 +480,17 @@ CmdSketcherConstrainDiameter - + Sketcher - + Constrain diameter - + Fix the diameter of a circle or an arc @@ -498,17 +498,17 @@ CmdSketcherConstrainDistance - + Sketcher - + Constrain distance - + Fix a length of a line or the distance between a line and a vertex @@ -516,17 +516,17 @@ CmdSketcherConstrainDistanceX - + Sketcher - + Constrain horizontal distance - + Fix the horizontal distance between two points or line ends @@ -534,17 +534,17 @@ CmdSketcherConstrainDistanceY - + Sketcher - + Constrain vertical distance - + Fix the vertical distance between two points or line ends @@ -552,17 +552,17 @@ CmdSketcherConstrainEqual - + Sketcher - + Constrain equal - + Create an equality constraint between two lines or between circles and arcs @@ -570,17 +570,17 @@ CmdSketcherConstrainHorizontal - + Sketcher - + Constrain horizontally - + Create a horizontal constraint on the selected item @@ -588,17 +588,17 @@ CmdSketcherConstrainInternalAlignment - + Sketcher - - Constrain InternalAlignment + + Constrain internal alignment - + Constrains an element to be aligned with the internal geometry of another element @@ -606,35 +606,36 @@ CmdSketcherConstrainLock - + Sketcher - + Constrain lock - - Create a lock constraint on the selected item + + Lock constraint: create both a horizontal and a vertical distance constraint +on the selected vertex CmdSketcherConstrainParallel - + Sketcher - + Constrain parallel - + Create a parallel constraint between two lines @@ -642,17 +643,17 @@ CmdSketcherConstrainPerpendicular - + Sketcher - + Constrain perpendicular - + Create a perpendicular constraint between two lines @@ -660,17 +661,17 @@ CmdSketcherConstrainPointOnObject - + Sketcher - + Constrain point onto object - + Fix a point onto an object @@ -678,17 +679,17 @@ CmdSketcherConstrainRadius - + Sketcher - + Constrain radius - + Fix the radius of a circle or an arc @@ -696,53 +697,55 @@ CmdSketcherConstrainSnellsLaw - + Sketcher - + Constrain refraction (Snell's law') - - Create a refraction law (Snell's law) constraint between two endpoints of rays and an edge as an interface. + + Create a refraction law (Snell's law) constraint between two endpoints of rays +and an edge as an interface. CmdSketcherConstrainSymmetric - + Sketcher - + Constrain symmetrical - - Create a symmetry constraint between two points with respect to a line or a third point + + Create a symmetry constraint between two points +with respect to a line or a third point CmdSketcherConstrainTangent - + Sketcher - + Constrain tangent - + Create a tangent constraint between two entities @@ -750,17 +753,17 @@ CmdSketcherConstrainVertical - + Sketcher - + Constrain vertically - + Create a vertical constraint on the selected item @@ -768,35 +771,35 @@ CmdSketcherConvertToNURB - + Sketcher - - Convert Geometry to B-spline + + Convert geometry to B-spline - - Converts the given Geometry to a B-spline + + Converts the selected geometry to a B-spline CmdSketcherCopy - + Sketcher - + Copy - + Creates a simple copy of the geometry taking as reference the last selected point @@ -804,17 +807,17 @@ CmdSketcherCreate3PointArc - + Sketcher - + Create arc by three points - + Create an arc by its end points and a point along the arc @@ -822,17 +825,17 @@ CmdSketcherCreate3PointCircle - + Sketcher - + Create circle by three points - + Create a circle by 3 perimeter points @@ -840,17 +843,17 @@ CmdSketcherCreateArc - + Sketcher - + Create arc by center - + Create an arc by its center and by its end points @@ -858,17 +861,17 @@ CmdSketcherCreateArcOfEllipse - + Sketcher - + Create an arc of ellipse - + Create an arc of ellipse in the sketch @@ -876,17 +879,17 @@ CmdSketcherCreateArcOfHyperbola - + Sketcher - + Create an arc of hyperbola - + Create an arc of hyperbola in the sketch @@ -894,17 +897,17 @@ CmdSketcherCreateArcOfParabola - + Sketcher - + Create an arc of parabola - + Create an arc of parabola in the sketch @@ -912,17 +915,17 @@ CmdSketcherCreateBSpline - + Sketcher - + Create B-spline - + Create a B-spline via control points in the sketch. @@ -930,17 +933,17 @@ CmdSketcherCreateCircle - + Sketcher - + Create circle - + Create a circle in the sketch @@ -948,17 +951,17 @@ CmdSketcherCreateDraftLine - + Sketcher - + Create draft line - + Create a draft line in the sketch @@ -966,17 +969,17 @@ CmdSketcherCreateEllipseBy3Points - + Sketcher - + Create ellipse by 3 points - + Create an ellipse by 3 points in the sketch @@ -984,17 +987,17 @@ CmdSketcherCreateEllipseByCenter - + Sketcher - + Create ellipse by center - + Create an ellipse by center in the sketch @@ -1002,17 +1005,17 @@ CmdSketcherCreateFillet - + Sketcher - + Create fillet - + Create a fillet between two lines or at a coincident point @@ -1020,17 +1023,17 @@ CmdSketcherCreateHeptagon - + Sketcher - + Create heptagon - + Create a heptagon in the sketch @@ -1038,17 +1041,17 @@ CmdSketcherCreateHexagon - + Sketcher - + Create hexagon - + Create a hexagon in the sketch @@ -1056,17 +1059,17 @@ CmdSketcherCreateLine - + Sketcher - + Create line - + Create a line in the sketch @@ -1074,17 +1077,17 @@ CmdSketcherCreateOctagon - + Sketcher - + Create octagon - + Create an octagon in the sketch @@ -1092,17 +1095,17 @@ CmdSketcherCreatePentagon - + Sketcher - + Create pentagon - + Create a pentagon in the sketch @@ -1110,17 +1113,17 @@ CmdSketcherCreatePeriodicBSpline - + Sketcher - + Create periodic B-spline - + Create a periodic B-spline via control points in the sketch. @@ -1128,17 +1131,17 @@ CmdSketcherCreatePoint - + Sketcher - + Create point - + Create a point in the sketch @@ -1146,17 +1149,17 @@ CmdSketcherCreatePolyline - + Sketcher - + Create polyline - + Create a polyline in the sketch. 'M' Key cycles behaviour @@ -1164,17 +1167,17 @@ CmdSketcherCreateRectangle - + Sketcher - + Create rectangle - + Create a rectangle in the sketch @@ -1182,17 +1185,17 @@ CmdSketcherCreateRegularPolygon - + Sketcher - + Create regular polygon - + Create a regular polygon in the sketch @@ -1200,17 +1203,17 @@ CmdSketcherCreateSlot - + Sketcher - + Create slot - + Create a slot in the sketch @@ -1218,17 +1221,17 @@ CmdSketcherCreateSquare - + Sketcher - + Create square - + Create a square in the sketch @@ -1236,17 +1239,17 @@ CmdSketcherCreateText - + Sketcher - + Create text - + Create text in the sketch @@ -1254,35 +1257,53 @@ CmdSketcherCreateTriangle - + Sketcher - + Create equilateral triangle - + Create an equilateral triangle in the sketch + + CmdSketcherDecreaseDegree + + + Sketcher + + + + + Decrease B-spline degree + + + + + Decreases the degree of the B-spline + + + CmdSketcherDecreaseKnotMultiplicity - + Sketcher - - Decrease multiplicity + + Decrease knot multiplicity - + Decreases the multiplicity of the selected knot of a B-spline @@ -1290,71 +1311,71 @@ CmdSketcherDeleteAllConstraints - + Sketcher - - Delete All Constraints + + Delete all constraints - - Deletes all the constraints + + Delete all constraints in the sketch CmdSketcherDeleteAllGeometry - + Sketcher - - Delete All Geometry + + Delete all geometry - - Deletes all the geometry and constraints but external geometry + + Delete all geometry and constraints in the current sketch, with the exception of external geometry CmdSketcherEditSketch - + Sketcher - + Edit sketch - - Edit the selected sketch + + Edit the selected sketch. CmdSketcherExtend - + Sketcher - + Extend edge - + Extend an edge with respect to the picked position @@ -1362,17 +1383,17 @@ CmdSketcherExternal - + Sketcher - + External geometry - + Create an edge linked to an external geometry @@ -1380,17 +1401,17 @@ CmdSketcherIncreaseDegree - + Sketcher - - Increase degree + + Increase B-spline degree - + Increases the degree of the B-spline @@ -1398,17 +1419,17 @@ CmdSketcherIncreaseKnotMultiplicity - + Sketcher - + Increase knot multiplicity - + Increases the multiplicity of the selected knot of a B-spline @@ -1416,106 +1437,118 @@ CmdSketcherLeaveSketch - + Sketcher - + Leave sketch - - Close the editing of the sketch + + Finish editing the active sketch. CmdSketcherMapSketch - + Sketcher - + Map sketch to face... - - Map a sketch to a face + + Set the 'Support' of a sketch. +First select the supporting geometry, for example, a face or an edge of a solid object, +then call this command, then choose the desired sketch. - - Some of the selected objects depend on the sketch to be mapped. Circular dependencies are not allowed! + + Some of the selected objects depend on the sketch to be mapped. Circular dependencies are not allowed. CmdSketcherMergeSketches - + Sketcher - - + Merge sketches - + + Create a new sketch from merging two or more selected sketches. + + + + Wrong selection - - Select at least two sketches, please. + + Select at least two sketches. CmdSketcherMirrorSketch - + Sketcher - - + Mirror sketch - + + Create a new mirrored sketch for each selected sketch +by using the X or Y axes, or the origin point, +as mirroring reference. + + + + Wrong selection - - Select one or more sketches, please. + + Select one or more sketches. CmdSketcherMove - + Sketcher - + Move - + Moves the geometry taking as reference the last selected point @@ -1534,24 +1567,24 @@ - Create a new sketch + Create a new sketch. CmdSketcherRectangularArray - + Sketcher - - Rectangular Array + + Rectangular array - + Creates a rectangular array pattern of the geometry taking as reference the last selected point @@ -1559,118 +1592,123 @@ CmdSketcherReorientSketch - + Sketcher - + Reorient sketch... - - Reorient the selected sketch + + Place the selected sketch on one of the global coordinate planes. +This will clear the 'Support' property, if any. CmdSketcherRestoreInternalAlignmentGeometry - + Sketcher - + Show/hide internal geometry - - Show all internal geometry / hide unused internal geometry + + Show all internal geometry or hide unused internal geometry CmdSketcherSelectConflictingConstraints - + Sketcher - - - Select Conflicting Constraints + + + Select conflicting constraints CmdSketcherSelectConstraints - + Sketcher - - Select Constraints + + Select associated constraints - - Select the constraints associated to the selected elements + + Select the constraints associated with the selected geometrical elements CmdSketcherSelectElementsAssociatedWithConstraints - + Sketcher - - - Select Elements associated with constraints + + Select associated geometry + + + + + Select the geometrical elements associated with the selected constraints CmdSketcherSelectElementsWithDoFs - + Sketcher - - Select solver DoFs + + Select unconstrained DoF - - Select elements where the solver still detects unconstrained degrees of freedom. + + Select geometrical elements where the solver still detects unconstrained degrees of freedom. CmdSketcherSelectHorizontalAxis - + Sketcher - - Select Horizontal Axis + + Select horizontal axis - - Select the horizontal axis + + Select the local horizontal axis of the sketch @@ -1683,79 +1721,79 @@ - Select Origin + Select origin - Select the origin point + Select the local origin point of the sketch CmdSketcherSelectRedundantConstraints - + Sketcher - - - Select Redundant Constraints + + + Select redundant constraints CmdSketcherSelectVerticalAxis - + Sketcher - - Select Vertical Axis + + Select vertical axis - - Select the vertical axis + + Select the local vertical axis of the sketch CmdSketcherStopOperation - + Sketcher - + Stop operation - - Stop current operation + + When in edit mode, stop the active operation (drawing, constraining, etc.). CmdSketcherSwitchVirtualSpace - + Sketcher - + Switch virtual space - + Switches the selected constraints or the view to the other virtual space @@ -1763,17 +1801,17 @@ CmdSketcherSymmetry - + Sketcher - + Symmetry - + Creates symmetric geometry with respect to the last selected line or point @@ -1781,18 +1819,18 @@ CmdSketcherToggleActiveConstraint - + Sketcher - - Toggle activate/deactivate constraint + + Activate/deactivate constraint - - Toggles activate/deactivate state for selected constraints + + Activates or deactivates the selected constraints @@ -1817,35 +1855,36 @@ CmdSketcherToggleDrivingConstraint - + Sketcher - - Toggle reference/driving constraint + + Toggle driving/reference constraint - - Toggles the toolbar or selected constraints to/from reference mode + + Set the toolbar, or the selected constraints, +into driving or reference mode CmdSketcherTrimming - + Sketcher - + Trim edge - + Trim an edge with respect to the picked position @@ -1853,64 +1892,65 @@ CmdSketcherValidateSketch - + Sketcher - + Validate sketch... - - Validate sketch + + Validate a sketch by looking at missing coincidences, +invalid constraints, degenerated geometry, etc. - - Wrong selection + + Select only one sketch. - - Select one sketch, please. + + Wrong selection CmdSketcherViewSection - + Sketcher - + View section - - Switches between section and full view + + When in edit mode, switch between section view and full view. CmdSketcherViewSketch - + Sketcher - + View sketch - - View sketch perpendicular to sketch plane + + When in edit mode, set the camera orientation perpendicular to the sketch plane. @@ -1957,42 +1997,42 @@ - + This version of OCE/OCC does not support knot operation. You need 6.9.0 or higher. - + BSpline Geometry Index (GeoID) is out of bounds. - + You are requesting no change in knot multiplicity. - + The Geometry Index (GeoId) provided is not a B-spline curve. - + The knot index is out of bounds. Note that in accordance with OCC notation, the first knot has index 1 and not zero. - + The multiplicity cannot be increased beyond the degree of the B-spline. - + The multiplicity cannot be decreased beyond zero. - + OCC is unable to decrease the multiplicity within the maximum tolerance. @@ -2008,9 +2048,9 @@ QObject - - - + + + Sketcher @@ -2052,7 +2092,7 @@ - + Don't attach @@ -2061,136 +2101,137 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + Wrong selection @@ -2201,304 +2242,304 @@ - - - - + + + + Dimensional constraint - - Cannot add a constraint between two external geometries! - - - - - Cannot add a constraint between two fixed geometries! Fixed geometries involve external geometry, blocked geometry or special points as B-spline knot points. - - - - - - + + + Only sketch and its support is allowed to select - + One of the selected has to be on the sketch - - + + Select an edge from the sketch. - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + Impossible constraint - - - - + + + + The selected edge is not a line segment - - - - - - + + + + + + Double constraint - - - - + + + + The selected edge already has a horizontal constraint! - - - - + + + + The selected edge already has a vertical constraint! - - - - - - + + + + + + The selected edge already has a Block constraint! - + The selected item(s) can't accept a horizontal constraint! - + There are more than one fixed point selected. Select a maximum of one fixed point! - + The selected item(s) can't accept a vertical constraint! - + There are more than one fixed points selected. Select a maximum of one fixed point! - - + + Select vertices from the sketch. - + Select one vertex from the sketch other than the origin. - + Select only vertices from the sketch. The last selected vertex may be the origin. - + Wrong solver status - - A Block constraint cannot be added if the sketch is unsolved or there are redundant and/or conflicting constraints. + + Cannot add a constraint between two external geometries. - + + Cannot add a constraint between two fixed geometries. Fixed geometries involve external geometry, blocked geometry or special points as B-spline knot points. + + + + + A Block constraint cannot be added if the sketch is unsolved or there are redundant and conflicting constraints. + + + + Select one edge from the sketch. - + Select only edges from the sketch. - - - - - - - - + + + + + + + + Error - + Select two or more points from the sketch. - - + + Select two or more vertexes from the sketch. - - + + Constraint Substitution - + Endpoint to endpoint tangency was applied instead. - + Select vertexes from the sketch. - - + + Select exactly one line or one point and one line or two points from the sketch. - + Cannot add a length constraint on an axis! - + This constraint does not make sense for non-linear curves - - - - - - + + + + + + Select the right things from the sketch. - - + + Point on B-spline edge currently unsupported. - - + + None of the selected points were constrained onto the respective curves, either because they are parts of the same element, or because they are both external geometry. - + Select either one point and several curves, or one curve and several points. You have selected %1 curves and %2 points. - - - - + + + + Select exactly one line or up to two points from the sketch. - + Cannot add a horizontal length constraint on an axis! - + Cannot add a fixed x-coordinate constraint on the origin point! - - + + This constraint only makes sense on a line segment or a pair of points - + Cannot add a vertical length constraint on an axis! - + Cannot add a fixed y-coordinate constraint on the origin point! - + Select two or more lines from the sketch. - - + + Select at least two lines from the sketch. - + Select a valid line - - + + The selected edge is not a valid line - + There is a number of ways this constraint can be applied. Accepted combinations: two curves; an endpoint and a curve; two endpoints; two curves and a point. @@ -2506,45 +2547,45 @@ Accepted combinations: two curves; an endpoint and a curve; two endpoints; two c - + Select some geometry from the sketch. perpendicular constraint - + Wrong number of selected objects! perpendicular constraint - - + + With 3 objects, there must be 2 curves and 1 point. tangent constraint - - + + Cannot add a perpendicularity constraint at an unconnected point! - - - + + + Perpendicular to B-spline edge currently unsupported. - - + + One of the selected edges should be a line. - + There are a number of ways this constraint can be applied. Accepted combinations: two curves; an endpoint and a curve; two endpoints; two curves and a point. @@ -2552,374 +2593,379 @@ Accepted combinations: two curves; an endpoint and a curve; two endpoints; two c - + Select some geometry from the sketch. tangent constraint - + Wrong number of selected objects! tangent constraint - - - + + + Cannot add a tangency constraint at an unconnected point! - - - + + + Tangency to B-spline edge currently unsupported. - + Endpoint to endpoint tangency was applied. The coincident constraint was deleted. - - - - + + + + Select one or more arcs or circles from the sketch. - - + + Constrain equal - + Do you want to share the same radius for all selected elements? - - + + Constraint only applies to arcs or circles. - + Do you want to share the same diameter for all selected elements? - - + + Select one or two lines from the sketch. Or select two edges and a point. - - + + Parallel lines - - + + An angle constraint cannot be set for two parallel lines. - + Cannot add an angle constraint on an axis! - + Select two edges from the sketch. - - + + Select two or more compatible edges - + Sketch axes cannot be used in equality constraints - + Equality for B-spline edge currently unsupported. - - + + Select two or more edges of similar type - - - - - + + + + + Select two points and a symmetry line, two points and a symmetry point or a line and a symmetry point from the sketch. - - - - + + + Cannot add a symmetry constraint between a line and its end points. + + + + + Cannot add a symmetry constraint between a line and its end points! - - Select two endpoints of lines to act as rays, and an edge representing a boundary. The first selected point corresponds to index n1, second - to n2, and datum value sets the ratio n2/n1. + + Select two endpoints of lines to act as rays, and an edge representing a boundary. The first selected point corresponds to index n1, second to n2, and datum value sets the ratio n2/n1. Constraint_SnellsLaw - - Selected objects are not just geometry from one sketch. + + Cannot create constraint with external geometry only. - - Number of selected objects is not 3 (is %1). + + Incompatible geometry is selected. - - Cannot create constraint with external geometry only!! + + SnellsLaw on B-spline edge is currently unsupported. - - Incompatible geometry is selected! + + You cannot internally constrain an ellipse on another ellipse. Select only one ellipse. - - SnellsLaw on B-spline edge currently unsupported. + + + Currently all internal geometrical elements of the ellipse are already exposed. - - - Select at least one ellipse and one edge from the sketch. + + + + + + Select constraints from the sketch. - - Sketch axes cannot be used in internal alignment constraint + + Selected objects are not just geometry from one sketch. - - You cannot internally constrain an ellipse on other ellipse. Select only one ellipse. + + Number of selected objects is not 3 (is %1). - - - Maximum 2 points are supported. + + + Select at least one ellipse and one edge from the sketch. - - - Maximum 2 lines are supported. + + Sketch axes cannot be used in internal alignment constraint - - - Nothing to constrain + + + Maximum 2 points are supported. - - Currently all internal geometry of the ellipse is already exposed. + + + Maximum 2 lines are supported. - - - - + + + Nothing to constrain + + + + + + + Extra elements - - - + + + More elements than possible for the given ellipse were provided. These were ignored. - + You cannot internally constrain an arc of ellipse on another arc of ellipse. Select only one arc of ellipse. - + You cannot internally constrain an ellipse on an arc of ellipse. Select only one ellipse or arc of ellipse. - - Currently all internal geometry of the arc of ellipse is already exposed. - - - - + More elements than possible for the given arc of ellipse were provided. These were ignored. - + Currently internal geometry is only supported for ellipse or arc of ellipse. The last selected element must be an ellipse or an arc of ellipse. - - - - - - - - + + + Select constraint(s) from the sketch. - - + + CAD Kernel Error - + None of the selected elements is an edge. - + + At least one of the selected objects was not a B-Spline and was ignored. - - + + Wrong OCE/OCC version - - + + This version of OCE/OCC does not support knot operation. You need 6.9.0 or higher - - + + The selection comprises more than one item. Please select just one knot. - + Input Error - - + + None of the selected elements is a knot of a B-spline - - + + Select at least two edges from the sketch. - + One selected edge is not connectable - + Closing a shape formed by exactly two lines makes no sense. - - - - - - - - + + + + + + + + Select elements from a single sketch. - + No constraint selected - + At least one constraint must be selected - + A symmetric construction requires at least two geometric elements, the last geometric element being the reference for the symmetry construction. - + The last element must be a point or a line serving as reference for the symmetry construction. - - + + A copy requires at least one selected non-external geometric element - + Delete All Geometry - - Are you really sure you want to delete all the geometry and constraints? + + Are you really sure you want to delete all geometry and constraints? - + Delete All Constraints - + Are you really sure you want to delete all the constraints? @@ -2937,42 +2983,42 @@ Accepted combinations: two curves; an endpoint and a curve; two endpoints; two c SketcherGui::CarbonCopySelection - + Carbon copy would cause a circular dependency. - + This object is in another document. - + This object belongs to another body. Hold Ctrl to allow cross-references. - + This object belongs to another body and it contains external geometry. Cross-reference not allowed. - + This object belongs to another part. - + The selected sketch is not parallel to this sketch. Hold Ctrl+Alt to allow non-parallel sketches. - + The XY axes of the selected sketch do not have the same direction as this sketch. Hold Ctrl+Alt to disregard it. - + The origin of the selected sketch is not aligned with the origin of this sketch. Hold Ctrl+Alt to disregard it. @@ -3058,8 +3104,8 @@ Accepted combinations: two curves; an endpoint and a curve; two endpoints; two c - - + + Radius: @@ -3070,8 +3116,8 @@ Accepted combinations: two curves; an endpoint and a curve; two endpoints; two c - - + + Diameter: @@ -3099,24 +3145,24 @@ Accepted combinations: two curves; an endpoint and a curve; two endpoints; two c - - + + Change radius - - + + Change diameter - + Refractive index ratio - + Ratio n2/n1: @@ -3124,7 +3170,7 @@ Accepted combinations: two curves; an endpoint and a curve; two endpoints; two c SketcherGui::ElementView - + Delete @@ -3132,22 +3178,22 @@ Accepted combinations: two curves; an endpoint and a curve; two endpoints; two c SketcherGui::ExternalSelection - + Linking this will cause circular dependency. - + This object is in another document. - + This object belongs to another body, can't link. - + This object belongs to another part, can't link. @@ -3718,7 +3764,12 @@ Supports all unit systems except 'US customary' and 'Building US/ - Show object(s) sketch is attached to + Show objects that the sketch is attached to + + + + + Note: these settings are defaults applied to new sketches. The behavior is remembered for each sketch individually as properties on the View tab. @@ -3731,11 +3782,6 @@ Supports all unit systems except 'US customary' and 'Building US/ Restore camera position after editing - - - Note: these settings are defaults applied to new sketches. The behavior is remembered for each sketch individually as properties on View tab. - - Applies current visibility automation settings to all sketches in open documents @@ -4058,106 +4104,106 @@ However, no constraints linking to the endpoints were found. - + Elements - + <html><head/><body><p>&quot;%1&quot;: multiple selection</p><p>&quot;%2&quot;: switch to next valid type</p></body></html> - - - - + + + + Point - - - - + + + + Line - - - - - - - - - + + + + + + + + + Construction - - - - - Arc - - - - - - - Circle - - - - - Ellipse + Arc + - - Elliptical Arc + Circle + - - Hyperbolic Arc + Ellipse + - - Parabolic Arc + Elliptical Arc + - - BSpline + Hyperbolic Arc + - + Parabolic Arc + + + + + + + + BSpline + + + + + + + Other @@ -4222,7 +4268,7 @@ Points must be set closer than a fifth of the grid size to a grid line to snap.< - Rendering order (global) : + Rendering order (global): @@ -4338,104 +4384,104 @@ Points must be set closer than a fifth of the grid size to a grid line to snap.< SketcherGui::ViewProviderSketch - + Edit sketch - + A dialog is already open in the task panel - + Do you want to close this dialog? - + Invalid sketch - + Do you want to open the sketch validation tool? - + The sketch is invalid and cannot be edited. - + Please remove the following constraint: - + Please remove at least one of the following constraints: - + Please remove the following redundant constraint: - + Please remove the following redundant constraints: - + Empty sketch - + Over-constrained sketch - - - + + + (click to select) - + Sketch contains conflicting constraints - + Sketch contains redundant constraints - + Fully constrained sketch - + Under-constrained sketch with <a href="#dofs"><span style=" text-decoration: underline; color:#0000ff; background-color: #F8F8FF;">1 degree</span></a> of freedom - + Under-constrained sketch with <a href="#dofs"><span style=" text-decoration: underline; color:#0000ff; background-color: #F8F8FF;">%1 degrees</span></a> of freedom - + Solved in %1 sec - + Unsolved (%1 sec) @@ -4443,8 +4489,8 @@ Points must be set closer than a fifth of the grid size to a grid line to snap.< Sketcher_BSplineComb - - + + Switches between showing and hiding the curvature comb for all B-splines @@ -4452,8 +4498,8 @@ Points must be set closer than a fifth of the grid size to a grid line to snap.< Sketcher_BSplineDecreaseKnotMultiplicity - - + + Decreases the multiplicity of the selected knot of a B-spline @@ -4461,8 +4507,8 @@ Points must be set closer than a fifth of the grid size to a grid line to snap.< Sketcher_BSplineDegree - - + + Switches between showing and hiding the degree for all B-splines @@ -4470,8 +4516,8 @@ Points must be set closer than a fifth of the grid size to a grid line to snap.< Sketcher_BSplineIncreaseKnotMultiplicity - - + + Increases the multiplicity of the selected knot of a B-spline @@ -4479,8 +4525,8 @@ Points must be set closer than a fifth of the grid size to a grid line to snap.< Sketcher_BSplineKnotMultiplicity - - + + Switches between showing and hiding the knot multiplicity for all B-splines @@ -4488,8 +4534,8 @@ Points must be set closer than a fifth of the grid size to a grid line to snap.< Sketcher_BSplinePolygon - - + + Switches between showing and hiding the control polygons for all B-splines @@ -4497,8 +4543,8 @@ Points must be set closer than a fifth of the grid size to a grid line to snap.< Sketcher_Clone - - + + Creates a clone of the geometry taking as reference the last selected point @@ -4506,17 +4552,17 @@ Points must be set closer than a fifth of the grid size to a grid line to snap.< Sketcher_CompCopy - + Clone - + Copy - + Move @@ -4524,8 +4570,8 @@ Points must be set closer than a fifth of the grid size to a grid line to snap.< Sketcher_ConstrainDiameter - - + + Fix the diameter of a circle or an arc @@ -4533,8 +4579,8 @@ Points must be set closer than a fifth of the grid size to a grid line to snap.< Sketcher_ConstrainRadius - - + + Fix the radius of a circle or an arc @@ -4542,8 +4588,8 @@ Points must be set closer than a fifth of the grid size to a grid line to snap.< Sketcher_Copy - - + + Creates a simple copy of the geometry taking as reference the last selected point @@ -4551,8 +4597,8 @@ Points must be set closer than a fifth of the grid size to a grid line to snap.< Sketcher_Create3PointArc - + Create an arc by its end points and a point along the arc @@ -4560,8 +4606,8 @@ Points must be set closer than a fifth of the grid size to a grid line to snap.< Sketcher_Create3PointCircle - + Create a circle by 3 rim points @@ -4569,8 +4615,8 @@ Points must be set closer than a fifth of the grid size to a grid line to snap.< Sketcher_CreateArc - + Create an arc by its center and by its end points @@ -4578,40 +4624,40 @@ Points must be set closer than a fifth of the grid size to a grid line to snap.< Sketcher_CreateArcOfEllipse - - Create an arc of ellipse by its center, major radius, endpoints + + Create an arc of ellipse by its center, major radius, and endpoints Sketcher_CreateArcOfHyperbola - - Create an arc of hyperbola by its center, major radius, endpoints + + Create an arc of hyperbola by its center, major radius, and endpoints Sketcher_CreateArcOfParabola - - Create an arc of parabola by its focus, vertex, endpoints + + Create an arc of parabola by its focus, vertex, and endpoints Sketcher_CreateBSpline - + B-spline by control points - + Create a B-spline by control points @@ -4619,8 +4665,8 @@ Points must be set closer than a fifth of the grid size to a grid line to snap.< Sketcher_CreateCircle - + Create a circle by its center and by a rim point @@ -4628,8 +4674,8 @@ Points must be set closer than a fifth of the grid size to a grid line to snap.< Sketcher_CreateEllipseBy3Points - + Create a ellipse by periapsis, apoapsis, and minor radius @@ -4637,8 +4683,8 @@ Points must be set closer than a fifth of the grid size to a grid line to snap.< Sketcher_CreateEllipseByCenter - + Create an ellipse by center, major radius and point @@ -4646,8 +4692,8 @@ Points must be set closer than a fifth of the grid size to a grid line to snap.< Sketcher_CreateHeptagon - + Create a heptagon by its center and by one corner @@ -4655,8 +4701,8 @@ Points must be set closer than a fifth of the grid size to a grid line to snap.< Sketcher_CreateHexagon - + Create a hexagon by its center and by one corner @@ -4664,14 +4710,14 @@ Points must be set closer than a fifth of the grid size to a grid line to snap.< Sketcher_CreateOctagon - + Create an octagon by its center and by one corner - + Create a regular polygon by its center and by one corner @@ -4679,8 +4725,8 @@ Points must be set closer than a fifth of the grid size to a grid line to snap.< Sketcher_CreatePentagon - + Create a pentagon by its center and by one corner @@ -4688,8 +4734,8 @@ Points must be set closer than a fifth of the grid size to a grid line to snap.< Sketcher_CreateSquare - + Create a square by its center and by one corner @@ -4697,8 +4743,8 @@ Points must be set closer than a fifth of the grid size to a grid line to snap.< Sketcher_CreateTriangle - + Create an equilateral triangle by its center and by one corner @@ -4706,13 +4752,13 @@ Points must be set closer than a fifth of the grid size to a grid line to snap.< Sketcher_Create_Periodic_BSpline - + Periodic B-spline by control points - + Create a periodic B-spline by control points @@ -4720,62 +4766,63 @@ Points must be set closer than a fifth of the grid size to a grid line to snap.< Sketcher_MapSketch - + No sketch found - + The document doesn't have a sketch - + Select sketch - + Select a sketch from the list - + (incompatible with selection) - + (current) - + (suggested) - + Sketch attachment - - Current attachment mode is incompatible with the new selection. Select the method to attach this sketch to selected objects. + + Current attachment mode is incompatible with the new selection. +Select the method to attach this sketch to selected objects. - + Select the method to attach this sketch to selected objects. - + Map sketch - + Can't map a sketch to support: %1 @@ -4784,8 +4831,8 @@ Points must be set closer than a fifth of the grid size to a grid line to snap.< Sketcher_Move - - + + Moves the geometry taking as reference the last selected point @@ -4806,12 +4853,12 @@ Points must be set closer than a fifth of the grid size to a grid line to snap.< Sketcher_ReorientSketch - + Sketch has support - + Sketch with a support face cannot be reoriented. Do you want to detach it from the support? diff --git a/src/Mod/Web/Gui/Resources/translations/Web.ts b/src/Mod/Web/Gui/Resources/translations/Web.ts index 8ba38d73fd9f..da0b4a3cbbc1 100644 --- a/src/Mod/Web/Gui/Resources/translations/Web.ts +++ b/src/Mod/Web/Gui/Resources/translations/Web.ts @@ -129,12 +129,12 @@ QObject - + Browser - + File does not exist! @@ -142,18 +142,18 @@ WebGui::BrowserView - - + + Error - + There were errors while loading the file. Some data might have been modified or not recovered at all. Look in the report view for more specific information about the objects involved. - + Loading %1... @@ -161,17 +161,17 @@ WebGui::WebView - + Open in External Browser - + Open in new window - + View source