From 3fe94ea7cfccdd9659156f87a6a110840580612d Mon Sep 17 00:00:00 2001 From: "luz.paz" Date: Thu, 20 Jun 2019 02:58:39 -0400 Subject: [PATCH] [Crowdin] string fix + misc. typo and whitespace fixes * Crowdin link: https://crowdin.com/translate/freecad/6766/en-hu#6576162 * Tacked on a few typo+whitespace fixes --- src/Gui/MayaGestureNavigationStyle.cpp | 2 +- src/Mod/Arch/Resources/ui/preferences-ifc.ui | 16 +++++++------- src/Mod/Fem/femmesh/meshtools.py | 6 +++--- src/Mod/Material/Material.py | 4 ++-- src/Mod/Material/MaterialEditor.py | 2 +- src/Tools/SubWCRev.py | 22 +++++++++----------- 6 files changed, 25 insertions(+), 27 deletions(-) diff --git a/src/Gui/MayaGestureNavigationStyle.cpp b/src/Gui/MayaGestureNavigationStyle.cpp index dd09521992..8e6fc2c2d6 100644 --- a/src/Gui/MayaGestureNavigationStyle.cpp +++ b/src/Gui/MayaGestureNavigationStyle.cpp @@ -507,7 +507,7 @@ SbBool MayaGestureNavigationStyle::processSoEvent(const SoEvent * const ev) //end of dragging/panning/whatever setViewingMode(NavigationStyle::SELECTION); processed = true; - } //else of if (some bottons down) + } //end of else (some buttons down) break; } //switch(button) } //if(evIsButton) diff --git a/src/Mod/Arch/Resources/ui/preferences-ifc.ui b/src/Mod/Arch/Resources/ui/preferences-ifc.ui index 9be2e6965e..03cf8203c0 100644 --- a/src/Mod/Arch/Resources/ui/preferences-ifc.ui +++ b/src/Mod/Arch/Resources/ui/preferences-ifc.ui @@ -203,7 +203,7 @@ - If this is checked, openings will be imported as subtractions, otherwise wall shapes will already have their openings subtracted + If this is checked, openings will be imported as subtractions. Otherwise wall shapes will already have their openings subtracted Separate openings @@ -399,7 +399,7 @@ - Curved shapes that cannot be represented as curves in IFC are decomposed into flat facets. If this is checked, some additional calculation is done to join coplanar facets. + Curved shapes that cannot be represented as curves in IFC are decomposed into flat facets. If this is checked, some additional calculations are done to join coplanar facets. Join coplanar facets when triangulating @@ -533,10 +533,10 @@ - When exporting an IFC file, if no site if found in the FreeCAD document, a default one will be added. A site is not mandatory by the IFC standard, but it is a common practice to always have at least one in the file. + When exporting an IFC file, if no site is found in the FreeCAD document, a default one will be added. A site is not mandatory by the IFC standard, but it is a common practice to always have at least one in the file. - Add default site if none is found in the document + Add default site if one is not found in the document IfcAddDefaultSite @@ -549,10 +549,10 @@ - When exporting an IFC file, if no building if found in the FreeCAD document, a default one will be added.<br/><b>Warning</b>: The IFC standard asks for at least one building in each file. By turning this option off, you will produce a non-standard IFC file. However, at FreeCAD, we believe having a building should not be mandatory, and this option is there so we have a chance to show our point of view to the world and try to convince others. + When exporting an IFC file, if no building is found in the FreeCAD document, a default one will be added.<br/><b>Warning</b>: The IFC standard asks for at least one building in each file. By turning this option off, you will produce a non-standard IFC file. However, at FreeCAD, we believe having a building should not be mandatory, and this option is there so we have a chance to show our point of view to the world and try to convince others. - Add default building if no ne is found in the document (no standard) + Add default building if one is not found in the document (no standard) true @@ -568,10 +568,10 @@ - When exporting an IFC file, if no building storey if found in the FreeCAD document, a default one will be added. A building storey is not mandatory by the IFC standard, but it is a common practice to always have at least one in the file. + When exporting an IFC file, if no building storey is found in the FreeCAD document, a default one will be added. A building storey is not mandatory by the IFC standard, but it is a common practice to always have at least one in the file. - Add default building storey if none is found in the document + Add default building storey if one is not found in the document IfcAddDefaultStorey diff --git a/src/Mod/Fem/femmesh/meshtools.py b/src/Mod/Fem/femmesh/meshtools.py index 6b589b0358..a43a46a80e 100644 --- a/src/Mod/Fem/femmesh/meshtools.py +++ b/src/Mod/Fem/femmesh/meshtools.py @@ -1174,9 +1174,9 @@ def get_ref_facenodes_table( 'to retrieve the volume elements of the ref_face.\n' ) # there is no face data - # if we retrieve the nodes ourself we gone have a problem: - # they are not sorted we just have the nodes. - # We need to sort them according the + # if we retrieve the nodes ourself we will have a problem: + # they are not sorted, we just have the nodes. + # We need to sort them according to the # shell mesh notation of tria3, tria6, quad4, quad8 ref_face_nodes = femmesh.getNodesByFace(ref_face) # try to use getccxVolumesByFace() to get the volume ids diff --git a/src/Mod/Material/Material.py b/src/Mod/Material/Material.py index 1e15ea74d0..e97d4e81fe 100644 --- a/src/Mod/Material/Material.py +++ b/src/Mod/Material/Material.py @@ -65,7 +65,7 @@ def importFCMat(fileName): import configparser FreeCAD.Console.PrintError( - 'This mat card reader is probably depretiated and not widely used in FreeCAD. ' + 'This mat card reader is probably deprecated and not widely used in FreeCAD. ' 'See comment in Material.py module.\n' ) Config = configparser.RawConfigParser() @@ -90,7 +90,7 @@ def exportFCMat(fileName, matDict): Config = configparser.RawConfigParser() FreeCAD.Console.PrintError( - 'This mat card writer is probably depretiated and not widely used in FreeCAD. ' + 'This mat card writer is probably deprecated and not widely used in FreeCAD. ' 'See comment in Material.py module.\n' ) # create groups diff --git a/src/Mod/Material/MaterialEditor.py b/src/Mod/Material/MaterialEditor.py index 9a871a9cc3..69bc193daa 100644 --- a/src/Mod/Material/MaterialEditor.py +++ b/src/Mod/Material/MaterialEditor.py @@ -682,7 +682,7 @@ def editMaterial(material=None, card_path=None): if result: return editor.getDict() else: - # on chancel button an empty dict is returned + # on cancel button an empty dict is returned return {} diff --git a/src/Tools/SubWCRev.py b/src/Tools/SubWCRev.py index e74e6aaa01..0864798010 100644 --- a/src/Tools/SubWCRev.py +++ b/src/Tools/SubWCRev.py @@ -4,8 +4,8 @@ # # FreeCAD RevInfo script to get the revision information from Subversion, Bazaar, and Git. # -# Under Linux the Subversion tool SubWCRev shipped with TortoiseSVN isn't -# available which is provided by this script. +# Under Linux the Subversion tool SubWCRev shipped with TortoiseSVN isn't +# available which is provided by this script. # 2012/02/01: The script was extended to support git # 2011/02/05: The script was extended to support also Bazaar @@ -33,7 +33,7 @@ class SvnHandler(xml.sax.handler.ContentHandler): self.inUrl = 1 elif name == "date": self.inDate = 1 - + def characters(self, data): if self.inUrl: self.buffer += data @@ -98,7 +98,7 @@ class DebianChangelog(VersionControl): r=re.search("bzr(\\d+)",c) if r != None: self.rev = r.groups()[0] + " (Launchpad)" - + t = time.localtime() self.date = ("%d/%02d/%02d %02d:%02d:%02d") % (t.tm_year, t.tm_mon, t.tm_mday, t.tm_hour, t.tm_min, t.tm_sec) self.url = "https://code.launchpad.net/~vcs-imports/freecad/trunk" @@ -175,11 +175,10 @@ class GitControl(VersionControl): def revisionNumber(self, srcdir,origin=None): """sets the revision number for master and release branches all commits are counted - for other branches the version numver is split in two parts - the first number reflects the number of commits in common with the - blessed master repository. - the second part, separated by " +" reflects the number of commits that are - different from the master repository""" + for other branches. The version number is split in to two parts: + The first number reflects the number of commits in common with the + blessed master repository. The second part (separated by " +") reflects + the number of commits that are different from the master repository""" referencecommit="7d8e53aaab17961d85c5009de34f69f2af084e8b" referencerevision=14555 @@ -246,7 +245,7 @@ class GitControl(VersionControl): float(info.strip().split(' ',1)[0]))) for self.branch in os.popen("git branch --no-color").read().split('\n'): if re.match( "\*", self.branch ) != None: - break + break self.branch=self.branch[2:] self.getremotes() #setup self.remotes and branchlst @@ -275,7 +274,7 @@ class GitControl(VersionControl): self.branch = '(%s)' % \ os.popen("git describe --all --dirty").read().strip() #if the branch name contained any slashes but was not a remote - #there might be not result by now. Hence we assume origin + #there might be no result by now. Hence we assume origin if self.url == "Unknown": for i in info: r = re.match("origin\\W+(\\S+)",i) @@ -393,4 +392,3 @@ def main(): if __name__ == "__main__": main() -