diff --git a/.gitignore b/.gitignore
index fcf42311ae..83c653a823 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,3 +43,4 @@ tags
src/Tools/freecad.zip
tsupdate_stderr.log
tsupdate_stdout.log
+files_to_translate.txt
diff --git a/src/Gui/Language/FreeCAD.ts b/src/Gui/Language/FreeCAD.ts
index 4cdae7a1ec..060b477be9 100644
--- a/src/Gui/Language/FreeCAD.ts
+++ b/src/Gui/Language/FreeCAD.ts
@@ -1386,22 +1386,22 @@ If this is not ticked, then the property must be uniquely named, and it is acces
- Multiple defined shortcut
+ Multiple defined keyboard shortcut
- The shortcut '%1' is defined more than once. This could result in unexpected behaviour.
+ The keyboard shortcut '%1' is defined more than once. This could result in unexpected behaviour.
- Already defined shortcut
+ Already defined keyboard shortcut
- The shortcut '%1' is already assigned to '%2'.
+ The keyboard shortcut '%1' is already assigned to '%2'.
@@ -4606,7 +4606,7 @@ You can also use the form: John Doe <john@doe.com>
- Shortcut count
+ Keyboard shortcut count
@@ -5485,6 +5485,7 @@ The 'Status' column shows whether the document could be recovered.
+ Delete
@@ -5519,11 +5520,6 @@ The 'Status' column shows whether the document could be recovered.Transient directories deleted.
-
-
- Transient deleted
-
- Gui::Dialog::DownloadItem
@@ -7469,7 +7465,7 @@ Do you want to exit without saving your data?
- Run macro %1 (Shift+click to edit) shortcut: %2
+ Run macro %1 (Shift+click to edit) keyboard shortcut: %2
diff --git a/src/Mod/AddonManager/Resources/translations/AddonManager.ts b/src/Mod/AddonManager/Resources/translations/AddonManager.ts
index e1fa35d0de..46c6d9b179 100644
--- a/src/Mod/AddonManager/Resources/translations/AddonManager.ts
+++ b/src/Mod/AddonManager/Resources/translations/AddonManager.ts
@@ -88,223 +88,223 @@
-
+ Refresh local cache
-
+ Updating cache...
-
+ Could not find addon '{}' to select
-
-
+
+ Checking for updates...
-
+ Apply {} update(s)
-
+ No updates available
-
+ This addon requires Python packages that are not installed, and cannot be installed automatically. To use this workbench you must install the following Python packages manually:
-
+ Too many to list
-
-
+
+ Missing Requirement
-
+ The following Python packages are allowed to be automatically installed
-
+ Addon '{}' requires '{}', which is not available in your copy of FreeCAD.
-
+ Addon '{}' requires the following workbenches, which are not available in your copy of FreeCAD:
-
+ Press OK to install anyway.
-
+ Optional dependency on {} ignored because it is not in the allow-list
-
-
+
+ Installing dependencies
-
+ Cannot execute Python
-
+ Failed to automatically locate your Python executable, or the path is set incorrectly. Please check the Addon Manager preferences setting for the path to Python.
-
+ Dependencies could not be installed. Continue with installation of {} anyway?
-
+ Cannot execute pip
-
+ Failed to execute pip, which may be missing from your Python installation. Please ensure your system has pip installed and try again. The failed command was:
-
+ Continue with installation of {} anyway?
-
+ Package installation failed
-
+ See Report View for detailed failure log.
-
+ Macro successfully installed. The macro is now available from the Macros dialog.
-
+ Installation of macro failed
-
+ {} total, see Report view for listDescribes the number of updates that were completed ('{}' is replaced by the number of updates)
-
+ All packages were successfully updated
-
-
-
+
+
+ Succeeded
-
+ All packages updates failed:
-
-
+
+ Failed
-
+ Some packages updates failed.
-
+ Update report
-
+ Installation succeeded
-
+ Installation failed
-
+ Execution of macro failed. See console for failure details.
-
+ Confirm remove
-
+ Are you sure you want to uninstall this Addon?
-
+ Macro {} has local changes in the macros directory, so is not being removed by this uninstall process.
-
+ Execution of Addon's uninstall.py script failed. Proceeding with uninstall...
-
+ Unable to remove this addon with the Addon Manager.
-
+ Successfully uninstalled {}
-
+ Failed to uninstall {}. Please remove manually.
@@ -329,236 +329,251 @@
-
+ Unable to read data from GitHub: check your internet connection and proxy settings and try again.
-
+ Failed to connect to GitHub. Check your connection and proxy settings.
-
+ Workbenches list was updated.
-
+ Unable to fetch git updates for workbench {}
-
+ git fetch failed for {}
-
+ Failed to read metadata from {name}
-
+ Failed to fetch code for macro '{name}'
-
+ Retrieving macros from FreeCAD/FreeCAD-Macros Git repository
-
+ Retrieving macros from FreeCAD wiki
-
+ Done locating macros.
-
+ Failed to execute Git Python command: check installation of GitPython and/or git
-
+ Attempting to change non-git Macro setup to use git
-
- An error occurred updating macros from GitHub
+
+ 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
-
+ Caching macro code...
-
+ Addon Manager: a worker process failed to halt ({name})
-
+ Addon Manager: a worker process failed to complete while fetching {name}
-
+ Out of {num_macros} macros, {num_failed} timed out while processing
-
+ 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
-
+ GitPython not found. Using ZIP file download instead.
-
+ Your version of Python doesn't appear to support ZIP files. Unable to proceed.
-
+ No Git Python installed, skipping git operations
-
-
+
+ You are installing a Python 2 workbench on a system running Python 3 -
-
+ Workbench successfully updated. Please restart FreeCAD to apply the changes.
-
+ Workbench successfully updated.
-
+ Error updating module
-
+ Please fix manually
-
+ Workbench successfully installed. Please restart FreeCAD to apply the changes.
-
+ Addon successfully installed.
-
+ A macro has been installed and is available under Macro -> Macros menu
-
+ Error: Unable to locate ZIP from
-
+ Downloading: {mbytes_str}MB of {mbytes_total_str}MB ({percent}%)
-
+ Downloading: {bytes_str} of {bytes_total_str} bytes ({percent}%)
-
+ Downloading: {bytes_str}MB of unknown total
-
+ Error: Error while downloading ZIP file for {}
-
+ Successfully installed {} from ZIP file
-
-
+
+ Installation of Python package {} failed
-
+ Downloaded package.xml for {}
-
+ Downloaded metadata.txt for {}
-
+ Downloaded requirements.txt for {}
-
+ Downloaded icon for {}
diff --git a/src/Mod/Fem/Gui/Resources/translations/Fem.ts b/src/Mod/Fem/Gui/Resources/translations/Fem.ts
index 95c9b0472c..e83938a6a9 100644
--- a/src/Mod/Fem/Gui/Resources/translations/Fem.ts
+++ b/src/Mod/Fem/Gui/Resources/translations/Fem.ts
@@ -334,17 +334,17 @@
CmdFemPostApllyChanges
-
+ Fem
-
+ Apply changes to pipeline
-
+ Apply changes to parameters directly and not on recompute only...
@@ -352,27 +352,27 @@
CmdFemPostClipFilter
-
+ Fem
-
+ Region clip filter
-
+ Define/create a clip filter which uses functions to define the cliped region
-
+ Wrong selection
-
+ Select a pipeline, please.
@@ -380,7 +380,7 @@
CmdFemPostCreateDataAtPointFilter
-
+ Data At Point
@@ -388,17 +388,17 @@
CmdFemPostCutFilter
-
+ Fem
-
+ Function cut filter
-
+ Cut the data along an implicit function
@@ -406,17 +406,17 @@
CmdFemPostDataAlongLineFilter
-
+ Fem
-
+ Line clip filter
-
+ Define/create a clip filter which clips a field along a line
@@ -424,17 +424,17 @@
CmdFemPostDataAtPointFilter
-
+ Fem
-
+ Data at point clip filter
-
+ Define/create a clip filter which clips a field data at point
@@ -442,27 +442,27 @@
CmdFemPostFunctions
-
+ Fem
-
+ Filter functions
-
+ Functions for use in postprocessing filter...
-
+ Plane
-
+ Sphere
@@ -470,65 +470,65 @@
CmdFemPostLinearizedStressesFilter
-
+ Thickness [mm]Plot X-Axis Label
-
+ Stress [MPa]Plot Y-Axis Label
-
+ Linearized StressesPlot title
-
+ MembranePlot legend item label
-
+ Membrane and BendingPlot legend item label
-
+ TotalPlot legend item label
-
+ Fem
-
+ Stress linearization plot
-
+ Define/create stress linearization plots
-
+ Wrong selection
-
+ Select a Clip filter which clips a STRESS field along a line, please.
@@ -536,27 +536,27 @@
CmdFemPostPipelineFromResult
-
+ Fem
-
+ Post pipeline from result
-
+ Creates a post processing pipeline from a result object
-
+ Wrong selection type
-
+ Select a result object, please.
@@ -564,17 +564,17 @@
CmdFemPostScalarClipFilter
-
+ Fem
-
+ Scalar clip filter
-
+ Define/create a clip filter which clips a field with a scalar value
@@ -582,17 +582,17 @@
CmdFemPostWarpVectorFilter
-
+ Fem
-
+ Warp filter
-
+ Warp the geometry along a vector field by a certain factor
@@ -690,17 +690,17 @@
-
+ Create filter
-
+ Create function
-
+ Create pipeline from result
@@ -917,38 +917,38 @@ Please select a result type first.
-
+ Histogram of {}
-
+ Nodes
-
+ FEM: there are no nodes in result mesh, there will be nothing to show.
-
+ Empty result mesh
-
+ FEM: Graphical bending stress output for beam or shell FEM Meshes not yet supported.
-
+ No result object
-
+ FEM: Result node numbers are not equal to FEM Mesh NodeCount.
@@ -1412,12 +1412,12 @@ Please select a result type first.
FEM_PostCreateFunctions
-
+ Create a plane function, defined by its origin and normal
-
+ Create a sphere function, defined by its center and radius
@@ -2396,7 +2396,7 @@ that "MAXKOI" needs to be increased.
FemGui::TaskDlgPost
-
+ Input error
@@ -3040,7 +3040,7 @@ that "MAXKOI" needs to be increased.
FemGui::TaskPostClip
-
+ Clip region, choose implicit function
@@ -3048,7 +3048,7 @@ that "MAXKOI" needs to be increased.
FemGui::TaskPostCut
-
+ Function cut, choose implicit function
@@ -3056,12 +3056,12 @@ that "MAXKOI" needs to be increased.
FemGui::TaskPostDataAlongLine
-
+ Data along a line options
-
+ LengthX-Axis plot label
@@ -3070,7 +3070,7 @@ that "MAXKOI" needs to be increased.
FemGui::TaskPostDataAtPoint
-
+ Data at point options
@@ -3078,7 +3078,7 @@ that "MAXKOI" needs to be increased.
FemGui::TaskPostDisplay
-
+ Result display options
@@ -3086,7 +3086,7 @@ that "MAXKOI" needs to be increased.
FemGui::TaskPostFunction
-
+ Implicit function
@@ -3094,7 +3094,7 @@ that "MAXKOI" needs to be increased.
FemGui::TaskPostScalarClip
-
+ Scalar clip options
@@ -3102,7 +3102,7 @@ that "MAXKOI" needs to be increased.
FemGui::TaskPostWarpVector
-
+ Warp options
@@ -4058,7 +4058,7 @@ that "MAXKOI" needs to be increased.
-
+ Edit post processing object
@@ -5354,22 +5354,32 @@ normal vector of the face is used as direction
TaskPostDataAtPoint
-
- Form
-
-
-
-
+ Center
-
+
+ x
+
+
+
+
+ y
+
+
+
+
+ z
+
+
+
+ Select Point
-
+ Field
@@ -5820,14 +5830,14 @@ normal vector of the face is used as direction
-
-
+
+ The filter could not be set up.
-
-
+
+ Error: no post processing object selected.
diff --git a/src/Mod/Sketcher/Gui/Resources/translations/Sketcher.ts b/src/Mod/Sketcher/Gui/Resources/translations/Sketcher.ts
index 57edaf7ad8..1752744b34 100644
--- a/src/Mod/Sketcher/Gui/Resources/translations/Sketcher.ts
+++ b/src/Mod/Sketcher/Gui/Resources/translations/Sketcher.ts
@@ -5308,10 +5308,12 @@ This is done by analyzing the sketch geometries and constraints.
Under constrained:
-
+
- DoF
-
+ %n DoF(s)
+
+
+
diff --git a/src/Mod/Spreadsheet/Gui/Resources/translations/Spreadsheet.ts b/src/Mod/Spreadsheet/Gui/Resources/translations/Spreadsheet.ts
index ffe7d5c8e0..031098d9ec 100644
--- a/src/Mod/Spreadsheet/Gui/Resources/translations/Spreadsheet.ts
+++ b/src/Mod/Spreadsheet/Gui/Resources/translations/Spreadsheet.ts
@@ -352,26 +352,26 @@
-
-
+
+ Insert rows
-
-
+
+ Remove rows
-
-
+
+ Insert columns
-
+ Clear cell(s)
@@ -449,27 +449,28 @@ The expression must evaluate to a string of some cell address.
- Use hidden reference to avoid creating a dependency
-with the referenced object. Use with caution!
+ The dependency with the referenced spreadsheet will
+be hidden to the dependency checking.
+Useful to avoid cyclic dependencies, but use with caution!
-
- Use hidden reference
+
+ Hide dependency of binding
-
+ Unbind
-
+ Cancel
-
+ OK
@@ -699,7 +700,7 @@ switch the design configuration. The property will be created if not exist.
-
+ Copy & Paste failed
@@ -913,12 +914,30 @@ Spreadsheet.my_alias_name instead of Spreadsheet.B1
SpreadsheetGui::DlgBindSheet
-
+ Bind cells
-
+
+ Source and target cell count mismatch. Partial binding may still work.
+
+Do you want to continue?
+
+
+
+
+ Bind Spreadsheet Cells
+
+
+
+
+ Error:
+
+
+
+
+ Unbind cells