diff --git a/src/Gui/Language/FreeCAD.ts b/src/Gui/Language/FreeCAD.ts index 39843f9b3b..e2e588b442 100644 --- a/src/Gui/Language/FreeCAD.ts +++ b/src/Gui/Language/FreeCAD.ts @@ -757,37 +757,37 @@ while doing a left or right click and move the mouse up or down Gui::Dialog::CameraDialog - + Camera settings - + Orientation - + Q0 - + Q1 - + Q2 - + Q3 - + Current view @@ -4627,7 +4627,7 @@ You can also use the form: John Doe <john@doe.com> Gui::Dialog::DlgSettingsNavigation - + Navigation @@ -4653,6 +4653,7 @@ You can also use the form: John Doe <john@doe.com> + Corner where navigation cube is shown @@ -4688,42 +4689,57 @@ You can also use the form: John Doe <john@doe.com> + Font name: + + + + Cube size - + Size of the navigation cube - + + Font size: + + + + + <html><head/><body><p>Font size for the NaviCube text</p></body></html> + + + + 3D Navigation - + List the mouse button configs for each chosen navigation setting. Select a set and then press the button to view said configurations. - + Mouse... - + Navigation settings set - + Orbit style - + Rotation orbit style. Trackball: moving the mouse horizontally will rotate the part around the y-axis Turntable: the part will be rotated around the z-axis (with constrained axes). @@ -4731,171 +4747,171 @@ Free Turntable: the part will be rotated around the z-axis. - + Turntable - + Trackball - + Free Turntable - + Rotation mode - + Rotations in 3D will use current cursor position as center for rotation - + Window center - + Drag at cursor - + Object center - + Default camera orientation - + Default camera orientation when creating a new document or selecting the home view - + Camera zoom - + Sets camera zoom for new documents. The value is the diameter of the sphere to fit on the screen. - + mm - + Enable animated rotations - + Enable animation - + Zoom operations will be performed at position of mouse pointer - + Zoom at cursor - + Zoom step - + How much will be zoomed. Zoom step of '1' means a factor of 7.5 for every zoom step. - + Direction of zoom operations will be inverted - + Invert zoom - + Prevents view tilting when pinch-zooming. Affects only gesture navigation style. Mouse tilting is not disabled by this setting. - + Disable touchscreen tilt gesture - + Isometric - + Dimetric - + Trimetric - + Top - + Front - + Left - + Right - + Rear - + Bottom - + Custom @@ -6544,7 +6560,7 @@ Do you want to save your changes? Gui::ExpressionLineEdit - + Exact match @@ -6552,7 +6568,7 @@ Do you want to save your changes? Gui::ExpressionTextEdit - + Exact match @@ -9098,12 +9114,12 @@ Please open a browser window and type in: http://localhost:%1. - + Out of memory - + Not enough memory available to display the data. @@ -12006,12 +12022,12 @@ Do you still want to proceed? ViewIsometricCmd - + Isometric - + Set NaviCube to Isometric mode @@ -12019,12 +12035,12 @@ Do you still want to proceed? ViewOrthographicCmd - + Orthographic - + Set View to Orthographic mode @@ -12032,12 +12048,12 @@ Do you still want to proceed? ViewPerspectiveCmd - + Perspective - + Set View to Perspective mode @@ -12045,12 +12061,12 @@ Do you still want to proceed? ViewZoomToFitCmd - + Zoom to fit - + Zoom so that model fills the view diff --git a/src/Mod/AddonManager/Resources/translations/AddonManager.ts b/src/Mod/AddonManager/Resources/translations/AddonManager.ts index 0bbd61937c..ba4eb61061 100644 --- a/src/Mod/AddonManager/Resources/translations/AddonManager.ts +++ b/src/Mod/AddonManager/Resources/translations/AddonManager.ts @@ -1266,28 +1266,28 @@ installed addons will be checked for available updates - + New Python Version Detected - + This appears to be the first time this version of Python has been used with the Addon Manager. Would you like to install the same auto-installed dependencies for it? - + Processing, please wait... - + Update - + Updating... @@ -1806,25 +1806,25 @@ installed addons will be checked for available updates - + Create new toolbar - + A macro installed with the FreeCAD Addon Manager - + Run Indicates a macro that can be 'run' - + Unable to read data from GitHub: check your internet connection and proxy settings and try again. @@ -2068,65 +2068,65 @@ installed addons will be checked for available updates - + DANGER: Developer feature - + DANGER: Switching branches is intended for developers and beta testers, and may result in broken, non-backwards compatible documents, instability, crashes, and/or the premature heat death of the universe. Are you sure you want to continue? - + There are local changes - + WARNING: This repo has uncommitted local changes. Are you sure you want to change branches (bringing the changes with you)? - - - + + + Branch git terminology - + Tag git terminology - + Kind Table header for git ref type (e.g. either Tag or Branch) - + Local name Table header for git ref name - + Tracking Table header for git remote tracking branch name name - + Local updated Table header for git update time of local branch - + Remote updated Table header for git update time of remote branch @@ -2152,68 +2152,68 @@ installed addons will be checked for available updates - + Downloaded package.xml for {} - + Failed to decode {} file for Addon '{}' - + Any dependency information in this file will be ignored - + Downloaded metadata.txt for {} - + Downloaded requirements.txt for {} - + Downloaded icon for {} - - + + Syntax error while reading {} from macro {} - + Unable to open macro wiki page at {} - + Unable to fetch the code of this macro. - + Unable to retrieve a description from the wiki for macro {} - + Unable to open macro code URL {} - + Unable to fetch macro-specified file {} from {} - + Could not locate macro-specified file {} (should have been at {}) @@ -2263,124 +2263,124 @@ installed addons will be checked for available updates - + Failed to connect to GitHub. Check your connection and proxy settings. - + WARNING: Duplicate addon {} ignored - + Workbenches list was updated. - + Git is disabled, skipping git macros - + Attempting to change non-git Macro setup to use git - + An error occurred updating macros from GitHub, trying clean checkout... - + Attempting to do a clean checkout... - + Clean checkout succeeded - + Failed to update macros from GitHub -- try clearing the Addon Manager's cache. - + Error connecting to the Wiki, FreeCAD cannot retrieve the Wiki macro list at this time - + Unable to fetch git updates for workbench {} - + git status failed for {} - + Failed to read metadata from {name} - + Failed to fetch code for macro '{name}' - + Caching macro code... - + Addon Manager: a worker process failed to complete while fetching {name} - + Out of {num_macros} macros, {num_failed} timed out while processing - + Addon Manager: a worker process failed to halt ({name}) - + Getting metadata from macro {} - + Timeout while fetching metadata for macro {} - + Failed to kill process for macro {}! - + Retrieving macro description... - + Retrieving info from git - + Retrieving info from wiki diff --git a/src/Mod/Arch/Resources/translations/Arch.ts b/src/Mod/Arch/Resources/translations/Arch.ts index c80a137771..cb2ffd9485 100644 --- a/src/Mod/Arch/Resources/translations/Arch.ts +++ b/src/Mod/Arch/Resources/translations/Arch.ts @@ -3509,7 +3509,7 @@ Building creation aborted. - Object doesn't have settable IFC Attributes + Object doesn't have settable IFCData diff --git a/src/Mod/Draft/Resources/translations/Draft.ts b/src/Mod/Draft/Resources/translations/Draft.ts index aca046f8f9..7d54c64f78 100644 --- a/src/Mod/Draft/Resources/translations/Draft.ts +++ b/src/Mod/Draft/Resources/translations/Draft.ts @@ -3027,9 +3027,9 @@ Not available if Draft preference option 'Use Part Primitives' is enab - - - + + + Offset @@ -3927,7 +3927,7 @@ The final angle will be the base angle plus this amount. - + Pick distance @@ -4332,22 +4332,22 @@ The final angle will be the base angle plus this amount. - + Select an object to offset - + Offset only works on one object at a time. - + Cannot offset this object type - + Offset of Bezier curves is currently not supported @@ -5034,34 +5034,34 @@ The final angle will be the base angle plus this amount. - + Activate this layer - + Select layer contents - - + + Merge layer duplicates - - + + Add new layer - + Relabeling layer: - + Merging layer: @@ -5262,6 +5262,11 @@ The final angle will be the base angle plus this amount. renamed view property 'TextSize' to 'FontSize' + + + added missing view properties + + Workbench @@ -5405,7 +5410,7 @@ from menu Tools -> Addon Manager - + Offset direction is not defined. Please move the mouse on either side of the object first to indicate a direction @@ -6692,12 +6697,12 @@ convert closed edges into filled faces and parametric polygons, and merge faces Draft_Offset - + Offset - + Offsets of the selected object. It can also create an offset copy of the original object. CTRL to snap, SHIFT to constrain. Hold ALT and click to create a copy with each click. @@ -6913,7 +6918,7 @@ set True for fusion or False for compound - + The objects that are part of this layer diff --git a/src/Mod/Fem/Gui/Resources/translations/Fem.ts b/src/Mod/Fem/Gui/Resources/translations/Fem.ts index cedb491fa9..cbb58dc2b0 100644 --- a/src/Mod/Fem/Gui/Resources/translations/Fem.ts +++ b/src/Mod/Fem/Gui/Resources/translations/Fem.ts @@ -1746,7 +1746,7 @@ Specify another file please. FemGui::TaskDlgPost - + Input error @@ -2390,7 +2390,7 @@ Specify another file please. FemGui::TaskPostClip - + Clip region, choose implicit function @@ -2398,7 +2398,7 @@ Specify another file please. FemGui::TaskPostCut - + Function cut, choose implicit function @@ -2406,12 +2406,12 @@ Specify another file please. FemGui::TaskPostDataAlongLine - + Data along a line options - + Length X-Axis plot label @@ -2420,12 +2420,12 @@ Specify another file please. FemGui::TaskPostDataAtPoint - + Data at point options - + %1 at (%2; %3; %4) is: %5 %6 @@ -2433,7 +2433,7 @@ Specify another file please. FemGui::TaskPostDisplay - + Result display options @@ -2441,7 +2441,7 @@ Specify another file please. FemGui::TaskPostFunction - + Implicit function @@ -2449,7 +2449,7 @@ Specify another file please. FemGui::TaskPostScalarClip - + Scalar clip options @@ -2457,7 +2457,7 @@ Specify another file please. FemGui::TaskPostWarpVector - + Warp options @@ -3382,7 +3382,7 @@ Specify another file please. - + Edit post processing object diff --git a/src/Mod/Part/Gui/Resources/translations/Part.ts b/src/Mod/Part/Gui/Resources/translations/Part.ts index bf46bc0500..d25e16c118 100644 --- a/src/Mod/Part/Gui/Resources/translations/Part.ts +++ b/src/Mod/Part/Gui/Resources/translations/Part.ts @@ -4664,7 +4664,7 @@ only created cuts will be visible - + Sliders are disabled for assemblies diff --git a/src/Mod/Sketcher/Gui/Resources/translations/Sketcher.ts b/src/Mod/Sketcher/Gui/Resources/translations/Sketcher.ts index 754a179a3a..4766ab6f90 100644 --- a/src/Mod/Sketcher/Gui/Resources/translations/Sketcher.ts +++ b/src/Mod/Sketcher/Gui/Resources/translations/Sketcher.ts @@ -128,27 +128,27 @@ CmdSketcherCompConstrainRadDia - + Constrain arc or circle - + Constrain an arc or a circle - + Constrain radius - + Constrain diameter - + Constrain auto radius/diameter @@ -388,12 +388,12 @@ CmdSketcherConstrainAngle - + Constrain angle - + Fix the angle of a line or the angle between two lines @@ -427,12 +427,12 @@ CmdSketcherConstrainDiameter - + Constrain diameter - + Fix the diameter of a circle or an arc @@ -440,12 +440,12 @@ CmdSketcherConstrainDistance - + Constrain distance - + Fix a length of a line or the distance between a line and a vertex @@ -453,12 +453,12 @@ CmdSketcherConstrainDistanceX - + Constrain horizontal distance - + Fix the horizontal distance between two points or line ends @@ -466,12 +466,12 @@ CmdSketcherConstrainDistanceY - + Constrain vertical distance - + Fix the vertical distance between two points or line ends @@ -479,12 +479,12 @@ CmdSketcherConstrainEqual - + Constrain equal - + Create an equality constraint between two lines or between circles and arcs @@ -505,12 +505,12 @@ CmdSketcherConstrainInternalAlignment - + Constrain internal alignment - + Constrains an element to be aligned with the internal geometry of another element @@ -532,12 +532,12 @@ on the selected vertex CmdSketcherConstrainParallel - + Constrain parallel - + Create a parallel constraint between two lines @@ -545,12 +545,12 @@ on the selected vertex CmdSketcherConstrainPerpendicular - + Constrain perpendicular - + Create a perpendicular constraint between two lines @@ -558,12 +558,12 @@ on the selected vertex CmdSketcherConstrainPointOnObject - + Constrain point onto object - + Fix a point onto an object @@ -571,12 +571,12 @@ on the selected vertex CmdSketcherConstrainRadiam - + Constrain auto radius/diameter - + Fix the diameter if a circle is chosen, or the radius if an arc/spline pole is chosen @@ -584,12 +584,12 @@ on the selected vertex CmdSketcherConstrainRadius - + Constrain radius or weight - + Fix the radius of a circle or an arc or fix the weight of a pole of a B-Spline @@ -597,12 +597,12 @@ on the selected vertex CmdSketcherConstrainSnellsLaw - + Constrain refraction (Snell's law') - + Create a refraction law (Snell's law) constraint between two endpoints of rays and an edge as an interface. @@ -611,12 +611,12 @@ and an edge as an interface. CmdSketcherConstrainSymmetric - + Constrain symmetrical - + Create a symmetry constraint between two points with respect to a line or a third point @@ -625,12 +625,12 @@ with respect to a line or a third point CmdSketcherConstrainTangent - + Constrain tangent - + Create a tangent constraint between two entities @@ -1497,12 +1497,12 @@ This will clear the 'Support' property, if any. CmdSketcherToggleActiveConstraint - + Activate/deactivate constraint - + Activates or deactivates the selected constraints @@ -1523,12 +1523,12 @@ This will clear the 'Support' property, if any. CmdSketcherToggleDrivingConstraint - + Toggle driving/reference constraint - + Set the toolbar, or the selected constraints, into driving or reference mode @@ -1650,197 +1650,197 @@ invalid constraints, degenerated geometry, etc. - - + + Add coincident constraint - - + + Add distance from horizontal axis constraint - - + + Add distance from vertical axis constraint - - + + Add point to point distance constraint - - + + Add point to line Distance constraint - - + + Add length constraint - - + + Add point on object constraint - - + + Add point to point horizontal distance constraint - + Add fixed x-coordinate constraint - - + + Add point to point vertical distance constraint - + Add fixed y-coordinate constraint - - + + Add parallel constraint - - - - - - - + + + + + + + Add perpendicular constraint - + Add perpendicularity constraint - + Swap coincident+tangency with ptp tangency - + Swap PointOnObject+tangency with point to curve tangency - - - - - - - + + + + + + + Add tangent constraint - - - - - - - - - - - - - - + + + + + + + + + + + + + + Add tangent constraint point - - - - + + + + Add radius constraint - - - - + + + + Add diameter constraint - - - - + + + + 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 @@ -2316,128 +2316,128 @@ invalid constraints, degenerated geometry, etc. - - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - - - + + + + + + + + - - - - - + + + - - - - - - + + + + + + + + + @@ -2598,7 +2598,7 @@ invalid constraints, degenerated geometry, etc. - + Select vertices from the sketch. @@ -2637,11 +2637,11 @@ invalid constraints, degenerated geometry, etc. - - - - - + + + + + Error @@ -2651,151 +2651,151 @@ invalid constraints, degenerated geometry, etc. - + Select two or more points from the sketch. - + Select two or more vertices from the sketch. - + Select two or more vertices from the sketch for a coincident constraint, or two or more circles, ellipses, arcs or arcs of ellipse for a concentric constraint. - + Select two vertices from the sketch for a coincident constraint, or two circles, ellipses, arcs or arcs of ellipse for a concentric constraint. - - + + 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. - + Endpoint to edge tangency was applied instead. - - - - - - - + + + + + + + Select the right things from the sketch. - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + Select an edge that is not a B-spline weight. - + None of the selected points were constrained onto the respective curves, because they are parts of the same element, because they are both external geometry, or because the edge is not eligible. - + Select either one point and several curves, or one curve and several points. You have selected %1 curves and %2 points. - + 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 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. @@ -2803,55 +2803,55 @@ 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. - + Endpoint to endpoint tangency was applied. The coincident constraint was deleted. - + Endpoint to edge tangency was applied. The point on object constraint was deleted. - + 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. @@ -2859,249 +2859,254 @@ 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! - - + + Tangent constraint at B-spline knot is only supported with lines! - - - + + B-spline knot to endpoint tangency was applied instead. + + + + + + Tangency to B-spline edge currently unsupported. - - - - - - + + + + + + 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 an edge that is not a B-spline weight - - + + 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 - + Selected objects are not just geometry from one sketch. - + Number of selected objects is not 3 (is %1). - + Cannot create constraint with external geometry only. - + Incompatible geometry is selected. - + SnellsLaw on B-spline edge is currently unsupported. - - + + Select at least one ellipse and one edge from the sketch. - + Sketch axes cannot be used in internal alignment constraint. - + You cannot internally constrain an ellipse on another ellipse. Select only one ellipse. - - + + Maximum 2 points are supported. - - + + Maximum 2 lines are supported. - - + + Nothing to constrain - - + + Currently all internal geometrical elements of the ellipse are already exposed. - - - - + + + + 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. - - - - - + + + + + Select constraints from the sketch. @@ -3570,12 +3575,12 @@ Accepted combinations: two curves; an endpoint and a curve; two endpoints; two c - + Refractive index ratio - + Ratio n2/n1: @@ -5238,8 +5243,8 @@ This is done by analyzing the sketch geometries and constraints. Sketcher_ConstrainDiameter - - + + Fix the diameter of a circle or an arc @@ -5247,7 +5252,7 @@ This is done by analyzing the sketch geometries and constraints. Sketcher_ConstrainRadiam - + Fix the radius/diameter of a circle or an arc @@ -5255,8 +5260,8 @@ This is done by analyzing the sketch geometries and constraints. Sketcher_ConstrainRadius - - + + Fix the radius of a circle or an arc @@ -5264,7 +5269,7 @@ This is done by analyzing the sketch geometries and constraints. Sketcher_ConstraintRadiam - + Fix the radius/diameter of a circle or an arc diff --git a/src/Mod/Spreadsheet/Gui/Resources/translations/Spreadsheet.ts b/src/Mod/Spreadsheet/Gui/Resources/translations/Spreadsheet.ts index 9dbe5184ca..e7106c03de 100644 --- a/src/Mod/Spreadsheet/Gui/Resources/translations/Spreadsheet.ts +++ b/src/Mod/Spreadsheet/Gui/Resources/translations/Spreadsheet.ts @@ -347,7 +347,7 @@ - + Edit cell @@ -891,41 +891,65 @@ Do you want to continue? + Display Settings + + + + + If checked, use the custom presentation to display cell string. + + + + + Show alias in cell with format + + + + + The format of the custom cell string presentation. +Defaults to: %V = %A + +%A - alias name +%V - cell value + + + + Import/Export Settings - + Delimiter Character: - + <html><head/><body><p>Character to use as field delimiter. Default is tab, but also commonly used are commas (,) and semicolons (;). Select from the list or enter your own in the field. Must be a single character or the words <span style=" font-style:italic;">tab</span>, <span style=" font-style:italic;">comma</span>, or <span style=" font-style:italic;">semicolon</span>.</p></body></html> - + tab - + Quote Character: - + <html><head/><body><p>Character used to delimit strings, typically is single quote (') or double quote (&quot;). Must be a single character.</p></body></html> - + Escape Character: - + <html><head/><body><p>Escape character, typically the backslash (\), used to indicate special unprintable characters, e.g. \t = tab. Must be a single character.</p></body></html>