diff --git a/package/fedora/freecad.spec b/package/fedora/freecad.spec index a5e22604bd..837a82381e 100644 --- a/package/fedora/freecad.spec +++ b/package/fedora/freecad.spec @@ -142,7 +142,7 @@ Recommends: python3-pysolar FreeCAD is a general purpose Open Source 3D CAD/MCAD/CAx/CAE/PLM modeler, aimed directly at mechanical engineering and product design but also fits a wider range of uses in engineering, such as architecture or other engineering -specialties. It is a feature-based parametric modeler with a modular software +specialities. It is a feature-based parametric modeler with a modular software architecture which makes it easy to provide additional functionality without modifying the core system. diff --git a/package/makepkg b/package/makepkg index 1b2d79acd4..66defab726 100644 --- a/package/makepkg +++ b/package/makepkg @@ -4,7 +4,7 @@ pkgname=freecad-svn pkgver=2152 pkgrel=2 -pkgdesc="A general purpose 3D CAD modeler, aimed directly at mechanical engineering and product design but also architecture or other engineering specialties" +pkgdesc="A general purpose 3D CAD modeler, aimed directly at mechanical engineering and product design but also architecture or other engineering specialities" arch=('x86_64') url="https://sourceforge.net/apps/mediawiki/free-cad/" license=('GPL') diff --git a/src/Gui/CommandView.cpp b/src/Gui/CommandView.cpp index 0e36b1404a..2672074db6 100644 --- a/src/Gui/CommandView.cpp +++ b/src/Gui/CommandView.cpp @@ -1816,7 +1816,7 @@ void StdViewScreenShot::activated(int iMsg) QString comment = opt->comment(); if (!comment.isEmpty()) { - // Replace newline escape sequence trough '\\n' string to build one big string, + // Replace newline escape sequence through '\\n' string to build one big string, // otherwise Python would interpret it as an invalid command. // Python does the decoding for us. QStringList lines = comment.split(QLatin1String("\n"), QString::KeepEmptyParts ); diff --git a/src/Mod/Arch/ArchSpace.py b/src/Mod/Arch/ArchSpace.py index 5de54084f6..eddff12c4b 100644 --- a/src/Mod/Arch/ArchSpace.py +++ b/src/Mod/Arch/ArchSpace.py @@ -350,7 +350,7 @@ class _Space(ArchComponent.Component): def getShape(self,obj): - "computes a shape from a base shape and/or bounday faces" + "computes a shape from a base shape and/or boundary faces" import Part shape = None faces = [] diff --git a/src/Mod/Assembly/Gui/TaskAssemblyConstraints.cpp b/src/Mod/Assembly/Gui/TaskAssemblyConstraints.cpp index 1ab6005f68..38f575c947 100644 --- a/src/Mod/Assembly/Gui/TaskAssemblyConstraints.cpp +++ b/src/Mod/Assembly/Gui/TaskAssemblyConstraints.cpp @@ -486,7 +486,7 @@ void TaskAssemblyConstraints::setPossibleOptions() { void TaskAssemblyConstraints::setPossibleConstraints() { - ////diasble all constraints for easier enabling + ////disable all constraints for easier enabling //ui->fix->setEnabled(false); //ui->distance->setEnabled(false); //ui->orientation->setEnabled(false); diff --git a/src/Mod/Draft/DraftEdit.py b/src/Mod/Draft/DraftEdit.py index dc79405e06..397c0819e4 100644 --- a/src/Mod/Draft/DraftEdit.py +++ b/src/Mod/Draft/DraftEdit.py @@ -633,7 +633,7 @@ class Edit(): return node def sendRay(self, mouse_pos): - "sends a ray trough the scene and return the nearest entity" + "sends a ray through the scene and return the nearest entity" ray_pick = coin.SoRayPickAction(self.render_manager.getViewportRegion()) ray_pick.setPoint(coin.SbVec2s(*mouse_pos)) ray_pick.setRadius(self.pick_radius) diff --git a/src/Mod/Draft/DraftGeomUtils.py b/src/Mod/Draft/DraftGeomUtils.py index a54ffeb272..c98dc29506 100644 --- a/src/Mod/Draft/DraftGeomUtils.py +++ b/src/Mod/Draft/DraftGeomUtils.py @@ -2867,7 +2867,7 @@ def circleFrom3CircleTangents(circle1, circle2, circle3): # @todo Create 3 lines from the inner and 4 from the outer h. center. # @todo Calc. the 4 inversion poles of these lines for each circle. # @todo Calc. the radical center of the 3 circles. - # @todo Calc. the intersection points (max. 8) of 4 lines (trough each inversion pole and the radical center) with the circle. + # @todo Calc. the intersection points (max. 8) of 4 lines (through each inversion pole and the radical center) with the circle. # This gives us all the tangent points. else: # Some circles are inside each other or an error has occurred. diff --git a/src/Mod/Draft/importDXF.py b/src/Mod/Draft/importDXF.py index 8c55bcef9a..d145a76104 100644 --- a/src/Mod/Draft/importDXF.py +++ b/src/Mod/Draft/importDXF.py @@ -3941,7 +3941,7 @@ def getViewBlock(geom, view, blockcount): If the global variable `dxfExportBlocks` exists, it will create the appropriate strings for `BLOCK` and `INSERT` sections, and increment the `blockcount`. - Otherwise, it will just creaate an insert by changing the layer, + Otherwise, it will just create an insert by changing the layer, and setting a handle. Parameters @@ -4020,7 +4020,7 @@ def getViewDXF(view, blocks=True): and if the global variable `dxfExportBlocks` exists, it will create the appropriate strings for `BLOCK` and `INSERT` sections, and increment the `blockcount`. - Otherwise, it will just creaate an insert by changing the layer, + Otherwise, it will just create an insert by changing the layer, and setting a handle Parameters diff --git a/src/Mod/Fem/Gui/ViewProviderFemPostFunction.h b/src/Mod/Fem/Gui/ViewProviderFemPostFunction.h index f3cd3c6a6a..2b318324ae 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemPostFunction.h +++ b/src/Mod/Fem/Gui/ViewProviderFemPostFunction.h @@ -111,7 +111,7 @@ public: std::vector getDisplayModes() const; //creates the widget used in the task dalogs, either for the function itself or for - //the fiter using it + //the filter using it virtual FunctionWidget* createControlWidget() {return NULL;} protected: diff --git a/src/Mod/Fem/femexamples/constraint_contact_solid_solid.py b/src/Mod/Fem/femexamples/constraint_contact_solid_solid.py index b06970f0ea..e6b0d00c6b 100644 --- a/src/Mod/Fem/femexamples/constraint_contact_solid_solid.py +++ b/src/Mod/Fem/femexamples/constraint_contact_solid_solid.py @@ -22,7 +22,7 @@ # *************************************************************************** -# connstraint contact for solid to solid mesh +# constraint contact for solid to solid mesh # https://forum.freecadweb.org/viewtopic.php?f=18&t=20276 # to run the example use: """ diff --git a/src/Mod/Fem/femexamples/constraint_tie.py b/src/Mod/Fem/femexamples/constraint_tie.py index 29168888c5..d23e229b8e 100644 --- a/src/Mod/Fem/femexamples/constraint_tie.py +++ b/src/Mod/Fem/femexamples/constraint_tie.py @@ -22,7 +22,7 @@ # *************************************************************************** -# connstraint tie, bond tow surfaces together (solid mesh only) +# constraint tie, bond two surfaces together (solid mesh only) # https://forum.freecadweb.org/viewtopic.php?f=18&t=42783 # to run the example use: """ diff --git a/src/Mod/Path/Gui/Resources/panels/PathEdit.ui b/src/Mod/Path/Gui/Resources/panels/PathEdit.ui index 18544971a7..4c768a4c5b 100644 --- a/src/Mod/Path/Gui/Resources/panels/PathEdit.ui +++ b/src/Mod/Path/Gui/Resources/panels/PathEdit.ui @@ -1331,7 +1331,7 @@ - <html><head/><body><p>Rapid vertical speed assigne to VertRapid of new ToolController.</p></body></html> + <html><head/><body><p>Rapid vertical speed assigned to VertRapid of new ToolController.</p></body></html> diff --git a/src/Mod/Path/Gui/Resources/panels/SetupGlobal.ui b/src/Mod/Path/Gui/Resources/panels/SetupGlobal.ui index 412c6e69b7..e241335849 100644 --- a/src/Mod/Path/Gui/Resources/panels/SetupGlobal.ui +++ b/src/Mod/Path/Gui/Resources/panels/SetupGlobal.ui @@ -208,7 +208,7 @@ - <html><head/><body><p>Rapid vertical speed assigne to VertRapid of new ToolController.</p></body></html> + <html><head/><body><p>Rapid vertical speed assigned to VertRapid of new ToolController.</p></body></html> diff --git a/src/Mod/Path/Gui/Resources/panels/ToolBitLibraryEdit.ui b/src/Mod/Path/Gui/Resources/panels/ToolBitLibraryEdit.ui index 4663aa712f..b5cfdae83c 100644 --- a/src/Mod/Path/Gui/Resources/panels/ToolBitLibraryEdit.ui +++ b/src/Mod/Path/Gui/Resources/panels/ToolBitLibraryEdit.ui @@ -198,7 +198,7 @@ - <html><head/><body><p>Assigne numbers to each Tool Bit according to its current position in the library. The first Tool Bit is assigned the ID 1.</p></body></html> + <html><head/><body><p>Assigned numbers to each Tool Bit according to its current position in the library. The first Tool Bit is assigned the ID 1.</p></body></html> Enumerate diff --git a/src/Mod/Path/PathScripts/PathDressupHoldingTags.py b/src/Mod/Path/PathScripts/PathDressupHoldingTags.py index 96c6c72867..e1dd5daba6 100644 --- a/src/Mod/Path/PathScripts/PathDressupHoldingTags.py +++ b/src/Mod/Path/PathScripts/PathDressupHoldingTags.py @@ -939,7 +939,7 @@ class ObjectTagDressup: PathLog.debug("previousTag = %d [%s]" % (i, prev)) else: disabled.append(i) - tag.nr = i # assigne final nr + tag.nr = i # assign final nr tags.append(tag) positions.append(tag.originAt(self.pathData.minZ)) return (tags, positions, disabled) diff --git a/src/Mod/Path/PathScripts/PathDressupPathBoundary.py b/src/Mod/Path/PathScripts/PathDressupPathBoundary.py index 808778f2d7..8cf186021e 100644 --- a/src/Mod/Path/PathScripts/PathDressupPathBoundary.py +++ b/src/Mod/Path/PathScripts/PathDressupPathBoundary.py @@ -163,7 +163,7 @@ class DressupPathBoundary(object): flip = PathGeom.pointsCoincide(pos, ptL) newPos = e.valueAt(e.FirstParameter) if flip else ptL # outside edges are never taken at this point (see swap of - # inside/oustide above) - so just move along ... + # inside/outside above) - so just move along ... outside.remove(e) pos = newPos else: diff --git a/src/Mod/Path/PathScripts/PathOpTools.py b/src/Mod/Path/PathScripts/PathOpTools.py index 7ce01d92af..2fe95e1873 100644 --- a/src/Mod/Path/PathScripts/PathOpTools.py +++ b/src/Mod/Path/PathScripts/PathOpTools.py @@ -212,7 +212,7 @@ def offsetWire(wire, base, offset, forward): # Of the remaining edges we take the longest wire to be the engraving side # Looking for a circle with the start vertex as center marks and end # starting from there follow the edges until a circle with the end vertex as center is found - # if the traversed edges include any oof the remainig from above, all those edges are remaining + # if the traversed edges include any of the remaining from above, all those edges are remaining # this is to also include edges which might partially be inside shape # if they need to be discarded, split, that should happen in a post process # Depending on the Axis of the circle, and which side remains we know if the wire needs to be flipped diff --git a/src/Mod/Surface/App/FeatureGeomFillSurface.cpp b/src/Mod/Surface/App/FeatureGeomFillSurface.cpp index 28eedc3630..65553f05fe 100644 --- a/src/Mod/Surface/App/FeatureGeomFillSurface.cpp +++ b/src/Mod/Surface/App/FeatureGeomFillSurface.cpp @@ -116,7 +116,7 @@ void ShapeValidator::checkAndAdd(const Part::TopoShape &ts, const char *subName, checkAndAdd(ts.getShape(), aWD); } } - catch (Standard_Failure&) { // any OCC exception means an unappropriate shape in the selection + catch (Standard_Failure&) { // any OCC exception means an inappropriate shape in the selection Standard_Failure::Raise("Wrong shape type.\n"); } }