diff --git a/src/Mod/AddonManager/Resources/translations/AddonManager.ts b/src/Mod/AddonManager/Resources/translations/AddonManager.ts
index 7bd3af37d8..59e579d1fa 100644
--- a/src/Mod/AddonManager/Resources/translations/AddonManager.ts
+++ b/src/Mod/AddonManager/Resources/translations/AddonManager.ts
@@ -559,26 +559,11 @@
         <source>Please install the missing components first.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="addonmanager_workers.py" line="915"/>
-        <source>Retrieving macro description...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="addonmanager_workers.py" line="653"/>
-        <source>Retrieving info from git</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="addonmanager_workers.py" line="873"/>
         <source>Error: Unable to locate zip from</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="addonmanager_workers.py" line="656"/>
-        <source>Retrieving info from wiki</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="addonmanager_workers.py" line="880"/>
         <source>Error: Unable to download</source>
@@ -589,19 +574,34 @@
         <source>Successfully installed</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="addonmanager_workers.py" line="915"/>
+        <source>Retrieving macro description...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="addonmanager_workers.py" line="653"/>
+        <source>Retrieving info from git</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="addonmanager_workers.py" line="656"/>
+        <source>Retrieving info from wiki</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="addonmanager_workers.py" line="1013"/>
         <source>Error updating module</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="addonmanager_workers.py" line="1078"/>
-        <source>Please fix manually</source>
+        <location filename="addonmanager_workers.py" line="1075"/>
+        <source>Error updating module </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="addonmanager_workers.py" line="1075"/>
-        <source>Error updating module </source>
+        <location filename="addonmanager_workers.py" line="1078"/>
+        <source>Please fix manually</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -779,16 +779,6 @@
         <source>Updating cache...</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="AddonManager.py" line="243"/>
-        <source>Checking for updates...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="AddonManager.py" line="773"/>
-        <source>Apply {} update(s)</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="AddonManager.py" line="86"/>
         <source>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!</source>
@@ -809,6 +799,11 @@
         <source>Could not import QtNetwork -- see Report View for details. Addon Manager unavailable.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="AddonManager.py" line="243"/>
+        <source>Checking for updates...</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="AddonManager.py" line="262"/>
         <source>Apply</source>
@@ -864,6 +859,11 @@
         <source>Restart required</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="AddonManager.py" line="773"/>
+        <source>Apply {} update(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="AddonManager.py" line="577"/>
         <source>No updates available</source>
diff --git a/src/Mod/Draft/Resources/translations/Draft.ts b/src/Mod/Draft/Resources/translations/Draft.ts
index 727439e893..bb7a3a51ba 100644
--- a/src/Mod/Draft/Resources/translations/Draft.ts
+++ b/src/Mod/Draft/Resources/translations/Draft.ts
@@ -635,6 +635,11 @@ This property is read-only, as the number depends on the points contained within
         <source>Area of this object</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="hatch.py" line="49"/>
+        <source>The shape of this object</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="hatch.py" line="52"/>
         <source>The base object used by this object</source>
@@ -660,11 +665,6 @@ This property is read-only, as the number depends on the points contained within
         <source>The pattern rotation used by this object</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="hatch.py" line="49"/>
-        <source>The shape of this object</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="hatch.py" line="67"/>
         <source>If set to False, hatch is applied as is to the faces, without translation (this might give wrong results for non-XY faces)</source>
diff --git a/src/Mod/Path/Gui/Resources/translations/Path.ts b/src/Mod/Path/Gui/Resources/translations/Path.ts
index 79550f0c2e..b7817ff284 100644
--- a/src/Mod/Path/Gui/Resources/translations/Path.ts
+++ b/src/Mod/Path/Gui/Resources/translations/Path.ts
@@ -713,16 +713,6 @@
         <source>Expression used for StepDown of new operations.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="PathPocketBase.py" line="73"/>
-        <source>Start pocketing at center or boundary</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="PathPocketBase.py" line="74"/>
-        <source>Percent of cutter diameter to step over on each pass</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="PathPocketBase.py" line="71"/>
         <source>The direction that the toolpath should go around the part ClockWise (CW) or CounterClockWise (CCW)</source>
@@ -733,6 +723,16 @@
         <source>Extra offset to apply to the operation. Direction is operation dependent.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="PathPocketBase.py" line="73"/>
+        <source>Start pocketing at center or boundary</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="PathPocketBase.py" line="74"/>
+        <source>Percent of cutter diameter to step over on each pass</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="PathPocketBase.py" line="75"/>
         <source>Angle of the zigzag pattern</source>
@@ -1276,6 +1276,21 @@
         <source>The non-planar adaptive start is also unavailable.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="PathUtilsGui.py" line="93"/>
+        <source>Choose a Path Job</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="PathJobGui.py" line="628"/>
+        <source>Feed(H)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="PathJobGui.py" line="632"/>
+        <source>Feed(V)</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="PathToolBitGui.py" line="204"/>
         <source>Invalid Filename</source>
@@ -1553,16 +1568,6 @@
 </context>
 <context>
     <name>PathJob</name>
-    <message>
-        <location filename="PathJobGui.py" line="1258"/>
-        <source>Unsupported stock object %s</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="PathJobGui.py" line="1274"/>
-        <source>Unsupported stock type %s (%d)</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="PathJobGui.py" line="387"/>
         <source>Stock not from Base bound box!</source>
@@ -1578,6 +1583,16 @@
         <source>Stock not a cylinder!</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="PathJobGui.py" line="1258"/>
+        <source>Unsupported stock object %s</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="PathJobGui.py" line="1274"/>
+        <source>Unsupported stock type %s (%d)</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="PathJob.py" line="112"/>
         <source>The NC output file for this project</source>
@@ -1721,17 +1736,17 @@
         <source>Base Location</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="PathOpGui.py" line="855"/>
-        <source>Heights</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="PathOpGui.py" line="848"/>
         <source>FinalDepth cannot be modified for this operation.
 If it is necessary to set the FinalDepth manually please select a different operation.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="PathOpGui.py" line="855"/>
+        <source>Heights</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="PathOpGui.py" line="869"/>
         <source>Depths</source>