diff --git a/src/Mod/Arch/Resources/translations/Arch.ts b/src/Mod/Arch/Resources/translations/Arch.ts
index f23dadef05..97bb03e1de 100644
--- a/src/Mod/Arch/Resources/translations/Arch.ts
+++ b/src/Mod/Arch/Resources/translations/Arch.ts
@@ -3362,7 +3362,7 @@
-
+ Successfully imported
diff --git a/src/Mod/Draft/Resources/translations/Draft.ts b/src/Mod/Draft/Resources/translations/Draft.ts
index 6ad2b93ed2..9d6a75db46 100644
--- a/src/Mod/Draft/Resources/translations/Draft.ts
+++ b/src/Mod/Draft/Resources/translations/Draft.ts
@@ -4949,22 +4949,22 @@ Note: C++ exporter is faster, but is not as featureful yet
draft
-
+ Draft Command Bar
-
+ Toggle construction mode
-
+ Autogroup off
-
+ active command:
@@ -4974,52 +4974,52 @@ Note: C++ exporter is faster, but is not as featureful yet
-
+ Active Draft command
-
+ X coordinate of next point
-
+ X
-
+ Y
-
+ Z
-
+ Y coordinate of next point
-
+ Z coordinate of next point
-
+ Enter point
-
+ Enter a new point with the given coordinates
-
+ Length
@@ -5029,42 +5029,42 @@ Note: C++ exporter is faster, but is not as featureful yet
-
+ Length of current segment
-
+ Angle of current segment
-
+ Radius
-
+ Radius of Circle
-
+ If checked, command will not finish until you press the command button again
-
+ &OCC-style offset
-
+ Sides
-
+ Number of sides
@@ -5074,77 +5074,77 @@ Note: C++ exporter is faster, but is not as featureful yet
-
+ Auto
-
+ Text string to draw
-
+ String
-
+ Height of text
-
+ Height
-
+ Intercharacter spacing
-
+ Tracking
-
+ Full path to font file:
-
+ Open a FileChooser for font file
-
+ Line
-
+ DWire
-
+ Circle
-
+ Arc
-
+ Point
-
+ Label
@@ -5154,87 +5154,87 @@ Note: C++ exporter is faster, but is not as featureful yet
-
+ Pick Object
-
+ Edit
-
+ Global X
-
+ Global Y
-
+ Global Z
-
+ Local X
-
+ Local Y
-
+ Local Z
-
+ Invalid Size value. Using 200.0.
-
+ Invalid Tracking value. Using 0.
-
+ Please enter a text string.
-
+ Select a Font file
-
+ Please enter a font file.
-
+ Faces
-
+ Remove
-
+ Add
-
+ Facebinder elements
@@ -5256,17 +5256,17 @@ To enabled FreeCAD to download these libraries, answer Yes.
-
+ Relative
-
+ Continue
-
+ Close
@@ -5311,7 +5311,7 @@ To enabled FreeCAD to download these libraries, answer Yes.
-
+ Select edge
@@ -5326,7 +5326,7 @@ To enabled FreeCAD to download these libraries, answer Yes.
-
+ Wipe
@@ -5341,62 +5341,62 @@ To enabled FreeCAD to download these libraries, answer Yes.
-
+ Check this to lock the current angle
-
+ Filled
-
+ Finish
-
+ Finishes the current drawing or editing operation
-
+ &Undo (CTRL+Z)
-
+ Undo the last segment
-
+ Finishes and closes the current line
-
+ Wipes the existing segments of this line and starts again from the last point
-
+ Set WP
-
+ Reorients the working plane on the last segment
-
+ Selects an existing edge to be measured by this dimension
-
+ If checked, objects will be copied instead of moved. Preferences -> Draft -> Global copy mode to keep this mode in next commands
@@ -5406,12 +5406,12 @@ To enabled FreeCAD to download these libraries, answer Yes.
-
+ Modify subelements
-
+ If checked, subelements will be modified instead of entire objects
@@ -5446,27 +5446,27 @@ To enabled FreeCAD to download these libraries, answer Yes.
-
+ Create text
-
+ Press this button to create the text object, or finish your text with two blank lines
-
+ Offset distance
-
+ Trim distance
-
+ Change default style for new objects
@@ -6754,7 +6754,7 @@ To enabled FreeCAD to download these libraries, answer Yes.
-
+ Trimex
@@ -7085,65 +7085,65 @@ The final angle will be the base angle plus this amount.
-
+ Global
-
+ Coordinates relative to last point or to coordinate system origin
if is the first point to set
-
+ Coordinates relative to global coordinate system.
Uncheck to use working plane coordinate system
-
+ Check this if the object should appear as filled, otherwise it will appear as wireframe.
Not available if Draft preference option 'Use Part Primitives' is enabled
-
+ If checked, an OCC-style offset will be performedinstead of the classic offset
-
+ Local u0394X
-
+ Local u0394Y
-
+ Local u0394Z
-
+ Global u0394X
-
+ Global u0394Y
-
+ Global u0394Z
-
+ Autogroup:
diff --git a/src/Mod/Fem/Gui/Resources/translations/Fem.ts b/src/Mod/Fem/Gui/Resources/translations/Fem.ts
index d9bd962418..a95ebb0ce3 100755
--- a/src/Mod/Fem/Gui/Resources/translations/Fem.ts
+++ b/src/Mod/Fem/Gui/Resources/translations/Fem.ts
@@ -74,11 +74,6 @@
Geometry reference selector for a
-
-
- Geometry reference selector for a
-
- Add
@@ -124,6 +119,11 @@
Solid
+
+
+ Geometry reference selector for a
+
+ SolidSelector
diff --git a/src/Mod/Part/Gui/Resources/translations/Part.ts b/src/Mod/Part/Gui/Resources/translations/Part.ts
index 0e5288138c..53eb1a0e5e 100644
--- a/src/Mod/Part/Gui/Resources/translations/Part.ts
+++ b/src/Mod/Part/Gui/Resources/translations/Part.ts
@@ -337,6 +337,16 @@ A 'Compound Filter' can be used to extract the individual slices.Slice apart
+
+
+ Boolean Fragments
+
+
+
+
+ Split objects where they intersect
+
+ Slice a selected object by other objects, and split it apart.
@@ -356,16 +366,6 @@ This means the overlapping volumes of the shapes will be removed.
A 'Compound Filter' can be used to extract the remaining pieces.
-
-
- Boolean Fragments
-
-
-
-
- Split objects where they intersect
-
- Continue
diff --git a/src/Mod/Path/Gui/Resources/translations/Path.ts b/src/Mod/Path/Gui/Resources/translations/Path.ts
index 78e381270d..4886ec42e9 100644
--- a/src/Mod/Path/Gui/Resources/translations/Path.ts
+++ b/src/Mod/Path/Gui/Resources/translations/Path.ts
@@ -8,36 +8,6 @@
Show the temporary path construction objects when module is in DEBUG mode.
-
-
- The direction along which dropcutter lines are created
-
-
-
-
- Should the operation be limited by the stock object or by the bounding box of the base object
-
-
-
-
- Step over percentage of the drop cutter path
-
-
-
-
- Z-axis offset from the surface of the object
-
-
-
-
- The Sample Interval. Small values cause long wait times
-
-
-
-
- Enable optimization which removes unnecessary points from G-Code output
-
- Smaller values yield a finer, more accurate mesh. Smaller values increase processing time a lot.
@@ -48,36 +18,11 @@
Smaller values yield a finer, more accurate mesh. Smaller values do not increase processing time much.
-
-
- The completion mode for the operation: single or multi-pass
-
-
-
-
- The direction that the toolpath should go around the part: Climb(ClockWise) or Conventional(CounterClockWise)
-
- Stop index(angle) for rotational scan
-
-
- Ignore areas that proceed below specified depth.
-
-
-
-
- Depth used to identify waste areas to ignore.
-
-
-
-
- Cut through waste to depth at model edge, releasing the model.
-
- Dropcutter lines are created parallel to this axis.
@@ -243,11 +188,6 @@
The path to be copied
-
-
- The base geometry of this toolpath
-
- The tool controller that will be used to calculate the path
@@ -563,6 +503,11 @@
Extra offset to apply to the operation. Direction is operation dependent.
+
+
+ The library to use to generate the path
+
+ Start pocketing at center or boundary
@@ -704,8 +649,63 @@
-
- The library to use to generate the path
+
+ The direction along which dropcutter lines are created
+
+
+
+
+ Should the operation be limited by the stock object or by the bounding box of the base object
+
+
+
+
+ Step over percentage of the drop cutter path
+
+
+
+
+ Z-axis offset from the surface of the object
+
+
+
+
+ The Sample Interval. Small values cause long wait times
+
+
+
+
+ Enable optimization which removes unnecessary points from G-Code output
+
+
+
+
+ The completion mode for the operation: single or multi-pass
+
+
+
+
+ The direction that the toolpath should go around the part: Climb(ClockWise) or Conventional(CounterClockWise)
+
+
+
+
+ Ignore areas that proceed below specified depth.
+
+
+
+
+ Depth used to identify waste areas to ignore.
+
+
+
+
+ Cut through waste to depth at model edge, releasing the model.
+
+
+
+
+ The base geometry of this toolpath
@@ -987,13 +987,13 @@
-
- Invalid Cutting Edge Angle %.2f, must be >0° and <=180°
+
+ Invalid Cutting Edge Angle %.2f, must be <90° and >=0°
-
- Invalid Cutting Edge Angle %.2f, must be <90° and >=0°
+
+ Invalid Cutting Edge Angle %.2f, must be >0° and <=180°
@@ -1157,6 +1157,31 @@ Increased to stock top.
Ignoring non-horizontal Face
+
+
+ Face appears misaligned after initial rotation.
+
+
+
+
+ Consider toggling the 'InverseAngle' property and recomputing.
+
+
+
+
+ Multiple faces in Base Geometry.
+
+
+
+
+ Depth settings will be applied to all faces.
+
+
+
+
+ EnableRotation property is 'Off'.
+
+ Unable to create path for face(s).
@@ -1222,31 +1247,6 @@ Increased to stock top.
Utils
-
-
- Face appears misaligned after initial rotation.
-
-
-
-
- Consider toggling the 'InverseAngle' property and recomputing.
-
-
-
-
- Multiple faces in Base Geometry.
-
-
-
-
- Depth settings will be applied to all faces.
-
-
-
-
- EnableRotation property is 'Off'.
-
-
@@ -1969,6 +1969,16 @@ If it is necessary to set the FinalDepth manually please select a different oper
PathPocket
+
+
+ Pocket Shape
+
+
+
+
+ Creates a Path Pocket object from a face or faces
+
+ Normal
@@ -2019,16 +2029,6 @@ If it is necessary to set the FinalDepth manually please select a different oper
Final depth set below ZMin of face(s) selected.
-
-
- Pocket Shape
-
-
-
-
- Creates a Path Pocket object from a face or faces
-
- 3D Pocket
@@ -3439,16 +3439,6 @@ If it is necessary to set the FinalDepth manually please select a different oper
Path_Dressup
-
-
- Dress-up
-
-
-
-
- Creates a Path Dess-up object from a selected path
-
- Please select one path object
@@ -3466,6 +3456,16 @@ If it is necessary to set the FinalDepth manually please select a different oper
Please select a Path object
+
+
+ Dress-up
+
+
+
+
+ Creates a Path Dess-up object from a selected path
+
+ Path_DressupAxisMap
@@ -3938,6 +3938,12 @@ If it is necessary to set the FinalDepth manually please select a different oper
Creates a Path Hop object
+
+
+ The selected object is not a path
+
+
+ Please select one path object
@@ -3953,12 +3959,6 @@ If it is necessary to set the FinalDepth manually please select a different oper
Create Hop
-
-
- The selected object is not a path
-
-
- Path_Inspect
@@ -4205,11 +4205,6 @@ If it is necessary to set the FinalDepth manually please select a different oper
Path_Sanity
-
-
- The Job has no selected Base object.
-
- Check the path job for common errors
@@ -4460,6 +4455,11 @@ If it is necessary to set the FinalDepth manually please select a different oper
Date
+
+
+ The Job has no selected Base object.
+
+ It appears the machine limits haven't been set. Not able to check path extents.
@@ -4615,6 +4615,11 @@ If it is necessary to set the FinalDepth manually please select a different oper
Path_ToolController
+
+
+ Tool Number to Load
+
+ Add Tool Controller to the Job
@@ -4625,11 +4630,6 @@ If it is necessary to set the FinalDepth manually please select a different oper
Add Tool Controller
-
-
- Tool Number to Load
-
- Path_ToolTable
@@ -4656,6 +4656,11 @@ If it is necessary to set the FinalDepth manually please select a different oper
Creates a medial line engraving path
+
+
+ VCarve requires an engraving cutter with CuttingEdgeAngle
+
+ VCarve requires an engraving cutter with CuttingEdgeAngle
@@ -4666,11 +4671,6 @@ If it is necessary to set the FinalDepth manually please select a different oper
Engraver Cutting Edge Angle must be < 180 degrees.
-
-
- VCarve requires an engraving cutter with CuttingEdgeAngle
-
- Path_Waterline
@@ -4705,11 +4705,56 @@ If it is necessary to set the FinalDepth manually please select a different oper
Save toolbit library
+
+
+ Tooltable JSON (*.json)
+
+
+
+
+ HeeksCAD tooltable (*.tooltable)
+
+
+
+
+ LinuxCNC tooltable (*.tbl)
+
+ Open tooltable
+
+
+ Save tooltable
+
+
+
+
+ Rename Tooltable
+
+
+
+
+ Enter Name:
+
+
+
+
+ Add New Tool Table
+
+
+
+
+ Delete Selected Tool Table
+
+
+
+
+ Rename Selected Tool Table
+
+ Tooltable editor
@@ -4920,11 +4965,6 @@ If it is necessary to set the FinalDepth manually please select a different oper
Tooltable XML (*.xml);;HeeksCAD tooltable (*.tooltable)
-
-
- Save tooltable
-
- Tooltable XML (*.xml)
@@ -4940,46 +4980,6 @@ If it is necessary to set the FinalDepth manually please select a different oper
Object doesn't have a tooltable property
-
-
- Rename Tooltable
-
-
-
-
- Enter Name:
-
-
-
-
- Add New Tool Table
-
-
-
-
- Delete Selected Tool Table
-
-
-
-
- Rename Selected Tool Table
-
-
-
-
- Tooltable JSON (*.json)
-
-
-
-
- HeeksCAD tooltable (*.tooltable)
-
-
-
-
- LinuxCNC tooltable (*.tbl)
-
- Tooltable XML (*.xml);;LinuxCNC tooltable (*.tbl)
diff --git a/src/Mod/Sketcher/Gui/Resources/translations/Sketcher.ts b/src/Mod/Sketcher/Gui/Resources/translations/Sketcher.ts
index aefd12386b..63add151c4 100644
--- a/src/Mod/Sketcher/Gui/Resources/translations/Sketcher.ts
+++ b/src/Mod/Sketcher/Gui/Resources/translations/Sketcher.ts
@@ -186,30 +186,35 @@
CmdSketcherCompConstrainRadDia
-
+ Sketcher
-
+ Constrain arc or circle
-
+ Constrain an arc or a circle
-
+ Constrain radius
-
+ Constrain diameter
+
+
+ Constrain auto radius/diameter
+
+ CmdSketcherCompCopy
@@ -476,17 +481,17 @@
CmdSketcherConstrainAngle
-
+ Sketcher
-
+ Constrain angle
-
+ Fix the angle of a line or the angle between two lines
@@ -602,17 +607,17 @@
CmdSketcherConstrainEqual
-
+ Sketcher
-
+ Constrain equal
-
+ Create an equality constraint between two lines or between circles and arcs
@@ -638,17 +643,17 @@
CmdSketcherConstrainInternalAlignment
-
+ Sketcher
-
+ Constrain internal alignment
-
+ Constrains an element to be aligned with the internal geometry of another element
@@ -726,6 +731,24 @@ on the selected vertex
+
+ CmdSketcherConstrainRadiam
+
+
+ Sketcher
+
+
+
+
+ Constrain auto radius/diameter
+
+
+
+
+ Fix automatically diameter on circle and radius on arc/pole
+
+
+CmdSketcherConstrainRadius
@@ -747,17 +770,17 @@ on the selected vertex
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.
@@ -766,17 +789,17 @@ 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
@@ -1933,17 +1956,17 @@ This will clear the 'Support' property, if any.
CmdSketcherToggleActiveConstraint
-
+ Sketcher
-
+ Activate/deactivate constraint
-
+ Activates or deactivates the selected constraints
@@ -1969,17 +1992,17 @@ This will clear the 'Support' property, if any.
CmdSketcherToggleDrivingConstraint
-
+ Sketcher
-
+ Toggle driving/reference constraint
-
+ Set the toolbar, or the selected constraints,
into driving or reference mode
@@ -2269,48 +2292,56 @@ invalid constraints, degenerated geometry, etc.
-
-
-
-
-
-
+
+
+
+
+ Add radiam constraint
+
+
+
+
+
+
+
+
+ Add angle constraint
-
-
+
+ Add equality constraint
-
-
-
-
-
+
+
+
+
+ Add symmetric constraint
-
+ Add Snell's law constraint
-
-
+
+ Add internal alignment constraint
-
+ Toggle constraint to driving/reference
-
+ Activate/Deactivate constraint
@@ -2787,49 +2818,54 @@ invalid constraints, degenerated geometry, etc.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -3028,7 +3064,7 @@ invalid constraints, degenerated geometry, etc.
-
+ Error
@@ -3076,7 +3112,8 @@ invalid constraints, degenerated geometry, etc.
-
+
+ Select the right things from the sketch.
@@ -3111,10 +3148,10 @@ invalid constraints, degenerated geometry, etc.
-
-
-
-
+
+
+
+ Select an edge that is not a B-spline weight
@@ -3164,7 +3201,7 @@ invalid constraints, degenerated geometry, etc.
-
+ Select at least two lines from the sketch.
@@ -3289,204 +3326,208 @@ Accepted combinations: two curves; an endpoint and a curve; two endpoints; two c
+
+ Select one or more arcs or circles from the sketch.
+ Select either only one or more B-Spline poles or only one or more arcs or circles from the sketch, but not mixed.
+ Constraint only applies to arcs or circles.
-
-
+
+ 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.Constraint_SnellsLaw
-
+ Cannot create constraint with external geometry only.
-
+ Incompatible geometry is selected.
-
+ SnellsLaw on B-spline edge is currently unsupported.
-
+ You cannot internally constrain an ellipse on another ellipse. Select only one ellipse.
-
-
+
+ Currently all internal geometrical elements of the ellipse are already exposed.
-
-
-
-
-
+
+
+
+
+ Select constraints from the sketch.
-
+ Selected objects are not just geometry from one sketch.
-
+ Number of selected objects is not 3 (is %1).
-
-
+
+ Select at least one ellipse and one edge from the sketch.
-
+ Sketch axes cannot be used in internal alignment constraint
-
-
+
+ Maximum 2 points are supported.
-
-
+
+ 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.
-
+ 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.
@@ -3802,12 +3843,12 @@ Accepted combinations: two curves; an endpoint and a curve; two endpoints; two c
-
+ Refractive index ratio
-
+ Ratio n2/n1:
@@ -3815,7 +3856,7 @@ Accepted combinations: two curves; an endpoint and a curve; two endpoints; two c
SketcherGui::ElementView
-
+ Delete
@@ -4819,106 +4860,106 @@ However, no constraints linking to the endpoints were found.
-
+ Elements
-
+ <html><head/><body><p>"%1": multiple selection</p><p>"%2": switch to next valid type</p></body></html>
-
-
-
-
+
+
+
+ Point
-
-
-
+
+
+ Line
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+ Construction
-
-
-
+
+
+ Arc
-
-
-
+
+
+ Circle
-
-
-
+
+
+ Ellipse
-
-
-
+
+
+ Elliptical Arc
-
-
-
+
+
+ Hyperbolic Arc
-
-
-
+
+
+ Parabolic Arc
-
-
-
+
+
+ BSpline
-
-
-
+
+
+ Other
@@ -5326,21 +5367,37 @@ 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
+
+ Sketcher_ConstrainRadiam
+
+
+ Fix the radius/diameter of a circle or an arc
+
+
+Sketcher_ConstrainRadius
-
-
+
+ Fix the radius of a circle or an arc
+
+ Sketcher_ConstraintRadiam
+
+
+ Fix the radius/diameter of a circle or an arc
+
+
+Sketcher_Copy
diff --git a/src/Mod/TechDraw/Gui/Resources/translations/TechDraw.ts b/src/Mod/TechDraw/Gui/Resources/translations/TechDraw.ts
index b4a57855cf..bd77485c4b 100644
--- a/src/Mod/TechDraw/Gui/Resources/translations/TechDraw.ts
+++ b/src/Mod/TechDraw/Gui/Resources/translations/TechDraw.ts
@@ -901,7 +901,7 @@
-
+ Create CenterLine
@@ -1816,12 +1816,12 @@
-
+ Create Center Line
-
+ Edit Center Line