From 261c06a0521bf60518defdf34f08b6da92e8023b Mon Sep 17 00:00:00 2001 From: luz paz Date: Sat, 29 May 2021 05:37:11 -0400 Subject: [PATCH 1/7] Fix misc. typos Found via ```codespell -q 3 -L aci,ake,aline,alle,alledges,alocation,als,ang,anid,apoints,ba,beginn,behaviour,bloaded,byteorder,calculater,cancelled,cancelling,cas,cascade,centimetre,childs,colour,colours,commen,connexion,currenty,dof,doubleclick,dum,eiter,elemente,ende,feld,finde,findf,freez,hist,iff,indicies,initialisation,initialise,initialised,initialises,initialisiert,ist,kilometre,lod,mantatory,methode,metres,millimetre,modell,nd,noe,normale,normaly,nto,numer,oder,orgin,orginx,orginy,ot,pard,parms,pres,programm,que,recurrance,rougly,seperator,serie,sinc,strack,substraction,te,thist,thru,tread,uint,unter,vertexes,wallthickness,whitespaces -S ./.git,*.po,*.ts,./ChangeLog.txt,./src/3rdParty,./src/Mod/Assembly/App/opendcm,./src/CXX,./src/zipios++,./src/Base/swig*,./src/Mod/Robot/App/kdl_cp,./src/Mod/Import/App/SCL,./src/WindowsInstaller,./src/Doc/FreeCAD.uml,./build/doc/SourceDocu``` --- src/Mod/Material/StandardMaterial/Graphite.FCMat | 2 +- src/Mod/Path/PathScripts/PathPocketShape.py | 2 +- src/Mod/Path/PathScripts/PathPocketShapeGui.py | 2 +- src/Mod/Path/PathScripts/post/philips_post.py | 2 +- src/Tools/updatecrowdin.py | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Mod/Material/StandardMaterial/Graphite.FCMat b/src/Mod/Material/StandardMaterial/Graphite.FCMat index 7c2cd08756..d686617e49 100644 --- a/src/Mod/Material/StandardMaterial/Graphite.FCMat +++ b/src/Mod/Material/StandardMaterial/Graphite.FCMat @@ -9,7 +9,7 @@ Name = Graphite Description = Typical material properties for pure graphite Father = Carbon KindOfMaterial = Solid -ReferenceSource = Poperties and characteristics of graphite +ReferenceSource = Properties and characteristics of graphite SourceURL = https://www.entegris.com/content/dam/web/resources/manuals-and-guides/manual-properties-and-characteristics-of-graphite-109441.pdf [Mechanical] diff --git a/src/Mod/Path/PathScripts/PathPocketShape.py b/src/Mod/Path/PathScripts/PathPocketShape.py index 4a90bf96be..ed59357020 100644 --- a/src/Mod/Path/PathScripts/PathPocketShape.py +++ b/src/Mod/Path/PathScripts/PathPocketShape.py @@ -192,7 +192,7 @@ class Extension(object): def getExtensionFaces(self, extensionWire): '''getExtensionFace(extensionWire)... A public helper method to retrieve the requested extension as a face, - rather than a wire becuase some extensions require a face shape + rather than a wire because some extensions require a face shape for definition that allows for two wires for boundary definition. ''' diff --git a/src/Mod/Path/PathScripts/PathPocketShapeGui.py b/src/Mod/Path/PathScripts/PathPocketShapeGui.py index 5f7050e634..c7e96cc796 100644 --- a/src/Mod/Path/PathScripts/PathPocketShapeGui.py +++ b/src/Mod/Path/PathScripts/PathPocketShapeGui.py @@ -75,7 +75,7 @@ class _Extension(object): hnt = coin.SoShapeHints() if not ext is None: - numVert = list() # track number of verticies in each polygon face + numVert = list() # track number of vertices in each polygon face try: wire = ext.getWire() except FreeCAD.Base.FreeCADError: diff --git a/src/Mod/Path/PathScripts/post/philips_post.py b/src/Mod/Path/PathScripts/post/philips_post.py index d48a5265c9..254c2dc4c5 100644 --- a/src/Mod/Path/PathScripts/post/philips_post.py +++ b/src/Mod/Path/PathScripts/post/philips_post.py @@ -20,7 +20,7 @@ #* * #*************************************************************************** -# 03-24-2021 Sliptonic: I've removed teh PathUtils import and job lookup +# 03-24-2021 Sliptonic: I've removed the PathUtils import and job lookup # post processors shouldn't be reaching back to the job. This can cause a # proxy error. diff --git a/src/Tools/updatecrowdin.py b/src/Tools/updatecrowdin.py index cb36e9ddab..58c8293314 100755 --- a/src/Tools/updatecrowdin.py +++ b/src/Tools/updatecrowdin.py @@ -253,7 +253,7 @@ if __name__ == "__main__": main_ts_files = list(filter(lambda f: not [a for a in ts_files_wo_ext if a in f and f != a], ts_files_wo_ext)) # Create tuples to map Crowdin name with local path name names_and_path = [(f'{basename(f)}.ts', f'{f}.ts') for f in main_ts_files] - # Accomodate for legacy naming + # Accommodate for legacy naming ts_files = [TsFile(LEGACY_NAMING_MAP[a] if a in LEGACY_NAMING_MAP else a, b) for (a, b) in names_and_path] updater.update(ts_files) From e1af437848d4ce0d1eee15fad19b6322b851b1f3 Mon Sep 17 00:00:00 2001 From: luz paz Date: Sat, 29 May 2021 05:37:50 -0400 Subject: [PATCH 2/7] Arch: fix typo in getIfcPsetProperties() --- src/Mod/Arch/importIFCHelper.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Mod/Arch/importIFCHelper.py b/src/Mod/Arch/importIFCHelper.py index c705e83890..22e15360c5 100644 --- a/src/Mod/Arch/importIFCHelper.py +++ b/src/Mod/Arch/importIFCHelper.py @@ -608,7 +608,7 @@ def getIfcProperties(ifcfile, pid, psets, d): return d -def getIfcPsetPoperties(ifcfile, pid): +def getIfcPsetProperties(ifcfile, pid): """ directly build the property table from pid and ifcfile for FreeCAD""" return getIfcProperties(ifcfile, pid, getIfcPropertySets(ifcfile, pid), {}) From 097bb0769cb639d640af22e6bbe5b0cc4ae3c3d9 Mon Sep 17 00:00:00 2001 From: luz paz Date: Sat, 29 May 2021 05:38:59 -0400 Subject: [PATCH 3/7] Arch: fix typo in translate() --- src/Mod/Draft/draftguitools/gui_setstyle.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Mod/Draft/draftguitools/gui_setstyle.py b/src/Mod/Draft/draftguitools/gui_setstyle.py index 4f0048fcee..188e7b33d7 100644 --- a/src/Mod/Draft/draftguitools/gui_setstyle.py +++ b/src/Mod/Draft/draftguitools/gui_setstyle.py @@ -264,7 +264,7 @@ class Draft_SetStyle_TaskPanel: if pdict: if name in pdict.keys(): reply = QtGui.QMessageBox.question(None, - tranlate("Draft","Warning"), + translate("Draft","Warning"), translate("Draft","Name exists. Overwrite?"), QtGui.QMessageBox.Yes | QtGui.QMessageBox.No, QtGui.QMessageBox.No) From f4ac6e9e773982fd1741e9178c81c7fd6bd9e1a5 Mon Sep 17 00:00:00 2001 From: luz paz Date: Mon, 31 May 2021 12:57:34 -0400 Subject: [PATCH 4/7] Crowdin: Fix a .ts file translation [skip ci] ref: https://crowdin.com/translate/freecad/27909/en-en?filter=basic&value=2#6585856 --- src/Mod/Path/Gui/Resources/translations/Path.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Mod/Path/Gui/Resources/translations/Path.ts b/src/Mod/Path/Gui/Resources/translations/Path.ts index 2719a4bed2..87722a405d 100644 --- a/src/Mod/Path/Gui/Resources/translations/Path.ts +++ b/src/Mod/Path/Gui/Resources/translations/Path.ts @@ -2855,7 +2855,7 @@ If it is necessary to set the FinalDepth manually please select a different oper - Devfines which standard thread was chosen + Defines which standard thread was chosen From c61d37776f3a2af569e78a68e830a61fb82d664a Mon Sep 17 00:00:00 2001 From: luz paz Date: Wed, 2 Jun 2021 12:42:00 -0400 Subject: [PATCH 5/7] Crowdin: remove superfluous whitespace in Gui/Command.cpp ref: https://crowdin.com/translate/freecad/564/en-de?filter=basic&value=2#6589648 --- src/Mod/PartDesign/Gui/Command.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Mod/PartDesign/Gui/Command.cpp b/src/Mod/PartDesign/Gui/Command.cpp index e592a10e94..6b268304d9 100644 --- a/src/Mod/PartDesign/Gui/Command.cpp +++ b/src/Mod/PartDesign/Gui/Command.cpp @@ -1054,7 +1054,7 @@ void prepareProfileBased(PartDesign::Body *pcActiveBody, Gui::Command* cmd, cons if (!pcActiveBody->isSolid()) { QMessageBox msgBox; msgBox.setText(QObject::tr("Cannot use this command as there is no solid to subtract from.")); - msgBox.setInformativeText(QObject::tr("Ensure that the body contains a feature before attempting a subtractive command.")); + msgBox.setInformativeText(QObject::tr("Ensure that the body contains a feature before attempting a subtractive command.")); msgBox.setStandardButtons(QMessageBox::Ok); msgBox.setDefaultButton(QMessageBox::Ok); msgBox.exec(); From f3540ee41bd3612be0e64601bd6455a5bf88874e Mon Sep 17 00:00:00 2001 From: luz paz Date: Wed, 2 Jun 2021 13:31:11 -0400 Subject: [PATCH 6/7] Crowdin: uniformity and grammar in FEM translation ref: https://crowdin.com/translate/freecad/559/en-ca?filter=basic&value=2#6589150 --- src/Mod/Fem/femguiutils/selection_widgets.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Mod/Fem/femguiutils/selection_widgets.py b/src/Mod/Fem/femguiutils/selection_widgets.py index b0d399cb0f..fd7edb4174 100644 --- a/src/Mod/Fem/femguiutils/selection_widgets.py +++ b/src/Mod/Fem/femguiutils/selection_widgets.py @@ -280,7 +280,7 @@ class GeometryElementsSelection(QtGui.QWidget): self._helpTextLbl = QtGui.QLabel() self._helpTextLbl.setWordWrap(True) helpTextPart1 = self.tr( - "Click on 'Add' and select geometric elements to add them to the list." + "Click on "Add" and select geometric elements to add to the list." ) helpTextPart2 = self.tr( "The following geometry elements are allowed to select: " From 91852ecc58b1238014a58b9fbbc1d6524288b4c7 Mon Sep 17 00:00:00 2001 From: luz paz Date: Thu, 3 Jun 2021 14:42:58 -0400 Subject: [PATCH 7/7] Fix previous commit --- src/Mod/Fem/femguiutils/selection_widgets.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Mod/Fem/femguiutils/selection_widgets.py b/src/Mod/Fem/femguiutils/selection_widgets.py index fd7edb4174..19fe48ba25 100644 --- a/src/Mod/Fem/femguiutils/selection_widgets.py +++ b/src/Mod/Fem/femguiutils/selection_widgets.py @@ -280,7 +280,7 @@ class GeometryElementsSelection(QtGui.QWidget): self._helpTextLbl = QtGui.QLabel() self._helpTextLbl.setWordWrap(True) helpTextPart1 = self.tr( - "Click on "Add" and select geometric elements to add to the list." + 'Click on "Add" and select geometric elements to add to the list.' ) helpTextPart2 = self.tr( "The following geometry elements are allowed to select: "