diff --git a/package/debian/freecad.appdata.xml b/package/debian/freecad.appdata.xml index 93ddcbed8e..0a739762b2 100644 --- a/package/debian/freecad.appdata.xml +++ b/package/debian/freecad.appdata.xml @@ -11,7 +11,7 @@ your model history and changing its parameters. FreeCAD is open source (LGPL license) and completely modular, allowing for very advanced extension and customization.

-

FreeCAD is multiplatfom, and reads and writes many open +

FreeCAD is multiplatform, and reads and writes many open file formats such as STEP, IGES, STL and others.

diff --git a/src/3rdParty/CxImage/CxImage/ximawmf.h b/src/3rdParty/CxImage/CxImage/ximawmf.h index fb59452872..e5903ae2e5 100644 --- a/src/3rdParty/CxImage/CxImage/ximawmf.h +++ b/src/3rdParty/CxImage/CxImage/ximawmf.h @@ -53,7 +53,7 @@ a 6000*4000 Bitmap with 24 Bits/Pixes, the Bitmap would consume about 68MB of memory. - I have choosen, to limit the size of the Bitmap to max. + I have chosen to limit the size of the Bitmap to max. screensize, to avoid memory problems. If you want something else, diff --git a/src/3rdParty/CxImage/CxImage/ximawnd.cpp b/src/3rdParty/CxImage/CxImage/ximawnd.cpp index 8b9249ad69..dd5540ca53 100644 --- a/src/3rdParty/CxImage/CxImage/ximawnd.cpp +++ b/src/3rdParty/CxImage/CxImage/ximawnd.cpp @@ -650,7 +650,7 @@ long CxImage::Draw(HDC hdc, const RECT& rect, RECT* pClipRect, bool bSmooth) * - If cx or cy are different than width or height, the image will be stretched * * \param pClipRect : limit the drawing operations inside a given rectangle in the output device context. - * \param bSmooth : activates a bilinear filter that will enhance the appearence for zommed pictures. + * \param bSmooth : activates a bilinear filter that will enhance the appearance for zommed pictures. * Quite slow. Needs CXIMAGE_SUPPORT_INTERPOLATION. * \return true if everything is ok */ diff --git a/src/Gui/DAGView/DAGViewerDesign.svg b/src/Gui/DAGView/DAGViewerDesign.svg index e8772fb5d7..656cde9b81 100644 --- a/src/Gui/DAGView/DAGViewerDesign.svg +++ b/src/Gui/DAGView/DAGViewerDesign.svg @@ -3105,7 +3105,7 @@ id="flowPara10075"> Modify = for features like fillet, chamfer, fuse, cut, common. Create = for features like box, cylinder, linked copy, section. Construction = datums. These will determin whether dag forks or stays linear by default. These will determine whether dag forks or stays linear by default. Maybe another virtual method to return target for feature that modify. Relation to claimChildren? Relation to BranchTags: Create, Terminate, Continue? - Press 'Start Recovery' to start the recovery process of the doument listed below. + Press 'Start Recovery' to start the recovery process of the document listed below. The 'Status' column shows whether the document could be recovered. diff --git a/src/Mod/Fem/Gui/TaskCreateNodeSet.ui b/src/Mod/Fem/Gui/TaskCreateNodeSet.ui index 58889c18db..8ae0631def 100644 --- a/src/Mod/Fem/Gui/TaskCreateNodeSet.ui +++ b/src/Mod/Fem/Gui/TaskCreateNodeSet.ui @@ -99,7 +99,7 @@ - Collect adjancent nodes + Collect adjacent nodes diff --git a/src/Mod/Fem/Gui/TaskTetParameter.ui b/src/Mod/Fem/Gui/TaskTetParameter.ui index 12cf7b784a..31b71c7edf 100644 --- a/src/Mod/Fem/Gui/TaskTetParameter.ui +++ b/src/Mod/Fem/Gui/TaskTetParameter.ui @@ -191,7 +191,7 @@ - Tetraeder count: + Tetrahedron count: diff --git a/src/Mod/Fem/PyGui/_CommandFemConstraintSelfWeight.py b/src/Mod/Fem/PyGui/_CommandFemConstraintSelfWeight.py index 03e5fe06d6..4e5fe0f172 100644 --- a/src/Mod/Fem/PyGui/_CommandFemConstraintSelfWeight.py +++ b/src/Mod/Fem/PyGui/_CommandFemConstraintSelfWeight.py @@ -38,9 +38,9 @@ class _CommandFemConstraintSelfWeight(FemCommands): def __init__(self): super(_CommandFemConstraintSelfWeight, self).__init__() self.resources = {'Pixmap': 'fem-constraint-selfweight', - 'MenuText': QtCore.QT_TRANSLATE_NOOP("FEM_ConstraintSelfWeight", "Constraint self weigt"), + 'MenuText': QtCore.QT_TRANSLATE_NOOP("FEM_ConstraintSelfWeight", "Constraint self weight"), 'Accel': "C, W", - 'ToolTip': QtCore.QT_TRANSLATE_NOOP("FEM_ConstraintSelfWeight", "Creates a FEM constraint self weigt")} + 'ToolTip': QtCore.QT_TRANSLATE_NOOP("FEM_ConstraintSelfWeight", "Creates a FEM constraint self weight")} self.is_active = 'with_analysis' def Activated(self): diff --git a/src/Mod/OpenSCAD/Resources/ui/openscadprefs-base.ui b/src/Mod/OpenSCAD/Resources/ui/openscadprefs-base.ui index 53b121c835..e02c9de7fa 100644 --- a/src/Mod/OpenSCAD/Resources/ui/openscadprefs-base.ui +++ b/src/Mod/OpenSCAD/Resources/ui/openscadprefs-base.ui @@ -44,7 +44,7 @@ - The path to the OpenSCAD executeable + The path to the OpenSCAD executable openscadexecutable diff --git a/src/Mod/OpenSCAD/replaceobj.py b/src/Mod/OpenSCAD/replaceobj.py index 37022e326c..7ccd66bf87 100644 --- a/src/Mod/OpenSCAD/replaceobj.py +++ b/src/Mod/OpenSCAD/replaceobj.py @@ -70,7 +70,7 @@ def replaceobjfromselection(objs): elif objs[1] in objs[2].InList: newchild, parent, oldchild = objs elif objs[2] in objs[1].InList: newchild, oldchild, parent = objs else: - raise ValueError("Cannot determin current parent-child relationship") + raise ValueError("Cannot determine current parent-child relationship") else: raise ValueError("Wrong number of selected objects") replaceobj(parent,oldchild,newchild) diff --git a/src/Mod/Part/Gui/AttacherTexts.cpp b/src/Mod/Part/Gui/AttacherTexts.cpp index ed9c3f7294..f7f831cba7 100644 --- a/src/Mod/Part/Gui/AttacherTexts.cpp +++ b/src/Mod/Part/Gui/AttacherTexts.cpp @@ -141,7 +141,7 @@ TextSet getUIStrings(Base::Type attacherType, eMapMode mmode) qApp->translate("Attacher2D", "Align to plane to osculating circle of an edge. Origin is aligned to point of curvature. Optional vertex link defines where.","AttachmentPlane mode tooltip")); case mmRevolutionSection: return TwoStrings(qApp->translate("Attacher2D", "Revolution Section","AttachmentPlane mode caption"), - qApp->translate("Attacher2D", "Plane is prependicular to edge, and Y axis is matched with axis of osculating circle. Optional vertex link defines where.","AttachmentPlane mode tooltip")); + qApp->translate("Attacher2D", "Plane is perpendicular to edge, and Y axis is matched with axis of osculating circle. Optional vertex link defines where.","AttachmentPlane mode tooltip")); case mmThreePointsPlane: return TwoStrings(qApp->translate("Attacher2D", "Plane by 3 points","AttachmentPlane mode caption"), qApp->translate("Attacher2D", "Align plane to pass through three vertices.","AttachmentPlane mode tooltip")); @@ -240,10 +240,10 @@ TextSet getUIStrings(Base::Type attacherType, eMapMode mmode) qApp->translate("Attacher0D", "Second focus of ellipse and hyperbola.","AttachmentPoint mode tooltip")); case mm0OnEdge: return TwoStrings(qApp->translate("Attacher0D", "On edge","AttachmentPoint mode caption"), - qApp->translate("Attacher0D", "Point is put on edge, MapPathParametr controls where. Additionally, vertex can be linked in for making a projection.","AttachmentPoint mode tooltip")); + qApp->translate("Attacher0D", "Point is put on edge, MapPathParameter controls where. Additionally, vertex can be linked in for making a projection.","AttachmentPoint mode tooltip")); case mm0CenterOfCurvature: return TwoStrings(qApp->translate("Attacher0D", "Center of curvature","AttachmentPoint mode caption"), - qApp->translate("Attacher0D", "Center of osculating circle of an edge. Optinal vertex link defines where.","AttachmentPoint mode tooltip")); + qApp->translate("Attacher0D", "Center of osculating circle of an edge. Optional vertex link defines where.","AttachmentPoint mode tooltip")); case mm0CenterOfMass: return TwoStrings(qApp->translate("Attacher0D", "Center of mass","AttachmentPoint mode caption"), qApp->translate("Attacher0D", "Center of mass of all references (equal densities are assumed).","AttachmentPoint mode tooltip")); diff --git a/src/Mod/PartDesign/Gui/Command.cpp b/src/Mod/PartDesign/Gui/Command.cpp index 11758cda3a..dba0159846 100644 --- a/src/Mod/PartDesign/Gui/Command.cpp +++ b/src/Mod/PartDesign/Gui/Command.cpp @@ -124,7 +124,7 @@ void UnifiedDatumCommand(Gui::Command &cmd, Base::Type type, std::string name) cmd.doCommand(Gui::Command::Doc,"App.activeDocument().%s.Support = %s",FeatName.c_str(),support.getPyReprString().c_str()); cmd.doCommand(Gui::Command::Doc,"App.activeDocument().%s.MapMode = '%s'",FeatName.c_str(),AttachEngine::getModeName(sugr.bestFitMode).c_str()); } else { - QMessageBox::information(Gui::getMainWindow(),QObject::tr("Invalid selection"), QObject::tr("There are no attachment modes that fit seleted objects. Select something else.")); + QMessageBox::information(Gui::getMainWindow(),QObject::tr("Invalid selection"), QObject::tr("There are no attachment modes that fit selected objects. Select something else.")); } } if (pcActiveBody) { diff --git a/src/Mod/PartDesign/Gui/CommandBody.cpp b/src/Mod/PartDesign/Gui/CommandBody.cpp index 4fdfa54082..e19488bcfb 100644 --- a/src/Mod/PartDesign/Gui/CommandBody.cpp +++ b/src/Mod/PartDesign/Gui/CommandBody.cpp @@ -502,7 +502,7 @@ void CmdPartDesignMoveTip::activated(int iMsg) return; } else if (!body) { QMessageBox::warning (0, QObject::tr( "Selection error" ), - QObject::tr( "Couldn't determin a body for the selected feature '%s'.", selFeature->Label.getValue() ) ); + QObject::tr( "Couldn't determine a body for the selected feature '%s'.", selFeature->Label.getValue() ) ); return; } else if ( !selFeature->isDerivedFrom(PartDesign::Feature::getClassTypeId () ) && selFeature != body && body->BaseFeature.getValue() != selFeature ) { diff --git a/src/Mod/Path/App/AreaPyImp.cpp b/src/Mod/Path/App/AreaPyImp.cpp index 971b429007..8d2090dac4 100644 --- a/src/Mod/Path/App/AreaPyImp.cpp +++ b/src/Mod/Path/App/AreaPyImp.cpp @@ -113,7 +113,7 @@ static const PyMethodDef areaOverrides[] = { "\nThe first shape's wires will be unioned together regardless of the op code given\n" "(except for 'Compound'). Subsequent shape's wire will be combined using the op code.\n" "All shape wires shall be coplanar, and are used to determine a working plane for face\n" - "making and offseting. You can call setPlane() to supply a reference shape to determin\n" + "making and offseting. You can call setPlane() to supply a reference shape to determine\n" "the workplane in case the added shapes are all colinear lines.\n", }, diff --git a/src/Mod/Path/PathScripts/PathCompoundExtended.py b/src/Mod/Path/PathScripts/PathCompoundExtended.py index 7a2e547a92..f29bbca729 100644 --- a/src/Mod/Path/PathScripts/PathCompoundExtended.py +++ b/src/Mod/Path/PathScripts/PathCompoundExtended.py @@ -43,7 +43,7 @@ except AttributeError: class ObjectCompoundExtended: def __init__(self,obj): - obj.addProperty("App::PropertyString","Description", "Path",QtCore.QT_TRANSLATE_NOOP("App::Property","An ptional description of this compounded operation")) + obj.addProperty("App::PropertyString","Description", "Path",QtCore.QT_TRANSLATE_NOOP("App::Property","An optional description of this compounded operation")) # obj.addProperty("App::PropertySpeed", "FeedRate", "Path",QtCore.QT_TRANSLATE_NOOP("App::Property","The feed rate of the paths in these compounded operations")) # obj.addProperty("App::PropertyFloat", "SpindleSpeed", "Path",QtCore.QT_TRANSLATE_NOOP("App::Property","The spindle speed, in revolutions per minute, of the tool used in these compounded operations")) obj.addProperty("App::PropertyLength","SafeHeight", "Path",QtCore.QT_TRANSLATE_NOOP("App::Property","The safe height for this operation")) diff --git a/src/Mod/Path/PathScripts/PathDrilling.py b/src/Mod/Path/PathScripts/PathDrilling.py index 2a849e5d8a..e2f163f931 100644 --- a/src/Mod/Path/PathScripts/PathDrilling.py +++ b/src/Mod/Path/PathScripts/PathDrilling.py @@ -76,7 +76,7 @@ class ObjectDrilling: # Heights & Depths obj.addProperty("App::PropertyDistance", "ClearanceHeight", "Depth", QtCore.QT_TRANSLATE_NOOP("App::Property", "The height needed to clear clamps and obstructions")) obj.addProperty("App::PropertyDistance", "FinalDepth", "Depth", QtCore.QT_TRANSLATE_NOOP("App::Property", "Final Depth of Tool- lowest value in Z")) - obj.addProperty("App::PropertyDistance", "SafeHeight", "Depth", QtCore.QT_TRANSLATE_NOOP("App::Property", "Height to clear top of materil")) + obj.addProperty("App::PropertyDistance", "SafeHeight", "Depth", QtCore.QT_TRANSLATE_NOOP("App::Property", "Height to clear top of material")) obj.addProperty("App::PropertyDistance", "RetractHeight", "Depth", QtCore.QT_TRANSLATE_NOOP("App::Property", "The height where feed starts and height during retract tool when path is finished")) # Tool Properties diff --git a/src/Mod/Path/PathScripts/PathStock.py b/src/Mod/Path/PathScripts/PathStock.py index 5e676de0c4..8ed265a140 100644 --- a/src/Mod/Path/PathScripts/PathStock.py +++ b/src/Mod/Path/PathScripts/PathStock.py @@ -42,9 +42,9 @@ class Stock: def __init__(self, obj): "Make stock" - obj.addProperty("App::PropertyFloat","Length_Allowance","Stock",QtCore.QT_TRANSLATE_NOOP("App::Property","extra allownace from part width")).Length_Allowance = 1.0 - obj.addProperty("App::PropertyFloat","Width_Allowance","Stock",QtCore.QT_TRANSLATE_NOOP("App::Property","extra allownace from part width")).Width_Allowance = 1.0 - obj.addProperty("App::PropertyFloat","Height_Allowance","Stock",QtCore.QT_TRANSLATE_NOOP("App::Property","extra allownace from part width")).Height_Allowance = 1.0 + obj.addProperty("App::PropertyFloat","Length_Allowance","Stock",QtCore.QT_TRANSLATE_NOOP("App::Property","extra allowance from part width")).Length_Allowance = 1.0 + obj.addProperty("App::PropertyFloat","Width_Allowance","Stock",QtCore.QT_TRANSLATE_NOOP("App::Property","extra allowance from part width")).Width_Allowance = 1.0 + obj.addProperty("App::PropertyFloat","Height_Allowance","Stock",QtCore.QT_TRANSLATE_NOOP("App::Property","extra allowance from part width")).Height_Allowance = 1.0 obj.addProperty("App::PropertyLink","Base","Base",QtCore.QT_TRANSLATE_NOOP("App::Property","The base object this represents")) obj.Proxy = self diff --git a/src/Mod/Plot/plotPositions/TaskPanel.py b/src/Mod/Plot/plotPositions/TaskPanel.py index 5c2319a867..946984b580 100644 --- a/src/Mod/Plot/plotPositions/TaskPanel.py +++ b/src/Mod/Plot/plotPositions/TaskPanel.py @@ -135,7 +135,7 @@ class TaskPanel: self.widget(QtGui.QListWidget, "items").setToolTip( QtGui.QApplication.translate( "plot_positions", - "List of modificable items", + "List of modifiable items", None)) self.widget(QtGui.QDoubleSpinBox, "x").setToolTip( QtGui.QApplication.translate( diff --git a/src/Mod/Plot/plotSeries/TaskPanel.py b/src/Mod/Plot/plotSeries/TaskPanel.py index 163786442e..4eecb70037 100644 --- a/src/Mod/Plot/plotSeries/TaskPanel.py +++ b/src/Mod/Plot/plotSeries/TaskPanel.py @@ -158,7 +158,7 @@ class TaskPanel: self.widget(QtGui.QPushButton, "remove").setText( QtGui.QApplication.translate( "plot_series", - "Remove serie", + "Remove series", None)) self.widget(QtGui.QLabel, "styleLabel").setText( QtGui.QApplication.translate( @@ -183,7 +183,7 @@ class TaskPanel: self.widget(QtGui.QCheckBox, "isLabel").setToolTip( QtGui.QApplication.translate( "plot_series", - "If checked serie will not be considered for legend", + "If checked, series will not be considered for legend", None)) self.widget(QtGui.QComboBox, "lineStyle").setToolTip( QtGui.QApplication.translate( @@ -213,7 +213,7 @@ class TaskPanel: self.widget(QtGui.QPushButton, "remove").setToolTip( QtGui.QApplication.translate( "plot_series", - "Removes this serie", + "Removes this series", None)) def fillStyles(self):