diff --git a/src/Mod/Assembly/Gui/TaskAssemblyConstraints.ui b/src/Mod/Assembly/Gui/TaskAssemblyConstraints.ui index eb0fdb708b..6aa00a8222 100644 --- a/src/Mod/Assembly/Gui/TaskAssemblyConstraints.ui +++ b/src/Mod/Assembly/Gui/TaskAssemblyConstraints.ui @@ -192,7 +192,7 @@ - <html><head/><body><p>Fixes the first geometry in its rotation and translation. Note that fix only works its the direct parent assembly. If you stack assemblys, the parent assembly will not be fixed inside the other ones.</p></body></html> + <html><head/><body><p>Fixes the first geometry in its rotation and translation. Note: this fix only works its direct parent assembly. If you stack assemblies, the parent assembly will not be fixed inside the other ones.</p></body></html> Fix diff --git a/src/Mod/Cam/App/SpringbackCorrection.cpp b/src/Mod/Cam/App/SpringbackCorrection.cpp index 8248a0a3cf..6f81f3c68a 100644 --- a/src/Mod/Cam/App/SpringbackCorrection.cpp +++ b/src/Mod/Cam/App/SpringbackCorrection.cpp @@ -1,7 +1,7 @@ /*************************************************************************** - * Copyright (c) 2007 * - * Joachim Zettler * - * Human Rezai * + * Copyright (c) 2007 Joachim Zettler * + * Copyright (c) 2007 Human Rezai * + * * * This file is part of the FreeCAD CAx development system. * * * * This library is free software; you can redistribute it and/or * @@ -73,7 +73,7 @@ SpringbackCorrection::SpringbackCorrection(const TopoDS_Shape& aShape, const Mes MeshMap.clear(); //Remove any existing Triangulation on the Shape BRepTools::Clean(m_Shape); - best_fit::Tesselate_Shape(m_Shape,m_CadMesh,(float) 0.1); // Basistriangulierung des ganzen Shapes + best_fit::Tesselate_Shape(m_Shape,m_CadMesh,(float) 0.1); // Basic triangulation of the entire shape MeshCore::MeshTopoAlgorithm algo(m_CadMesh); algo.HarmonizeNormals(); @@ -1394,7 +1394,7 @@ bool SpringbackCorrection::Perform(int deg_Tol, bool out) - // ********************************** GLOBALE KORREKTUR **************************************** + // ********************************** GLOBAL CORRECTION **************************************** int cm = 49; InitFaceCheck(m_CadMesh, deg_Tol+1); // kritische dreiecke -> _ulProp = 0 MeshCore::MeshFacetArray facAr2 = m_CadMesh.GetFacets(); @@ -1545,7 +1545,7 @@ bool SpringbackCorrection::Perform(int deg_Tol, bool out) Base::Builder3D logg; double d; - // stelle die regionen dar + // represent the regions for (unsigned int i=0; i