electron-rare/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #5219 from luzpaz/gender-neutral-fixes

Browse Source 
Make source code comments use gender neutral pronouns
This commit is contained in:
Yorik van Havre
2021-12-03 13:36:17 +01:00
committed by GitHub
parent 269681d83c 0042f58e4c
commit 59c759ebbd
59 changed files with 77 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/App/Application.h
+6 -6
View File
@@ -330,13 +330,13 @@ public:
//@}
/** @name methods for the open handler
* With this facility a Application module can register
* a ending (filetype) which he can handle to open.
* With this facility an Application module can register
* an ending (filetype) which it can handle to open.
* The ending and the module name are stored and if the file
* type is opened the module get loaded and need to register a
* type is opened the module gets loaded and needs to register an
* OpenHandler class in the OpenHandlerFactorySingleton.
* After the module is loaded a OpenHandler of this type is created
* and the file get loaded.
* After the module is loaded, an OpenHandler of this type is created
* and the file gets loaded.
* @see OpenHandler
* @see OpenHandlerFactorySingleton
*/
@@ -446,7 +446,7 @@ protected:
void renameDocument(const char *OldName, const char *NewName);
/** @name I/O of the document
* This slot get connected to all App::Documents created
* This slot gets connected to all App::Documents created
*/
//@{
void slotBeforeChangeDocument(const App::Document&, const App::Property&);
src/App/Document.h
+1 -1
View File
@@ -367,7 +367,7 @@ public:
* When undo, Gui component can query getAvailableUndo(id) to see if it is
* possible to undo with a given ID. If there more than one undo
* transactions, meaning that there are other transactions before the given
* ID. The Gui component shall ask user if he wants to undo multiple steps.
* ID. The Gui component shall ask user if they want to undo multiple steps.
* And if the user agrees, call undo(id) to unroll all transaction before
* and including the the one with the give ID. Same applies for redo.
*
src/Base/PyExport.h
+1 -1
View File
@@ -79,7 +79,7 @@ class PyObjectBase;
* @remark One big consequence of this specification is that the programmer must know whether the Python interpreter
* gets the Python object or not. If the interpreter gets the object then it decrements the counter later on when
* the internal variable is freed. In case the interpreter doesn't get this object then the programmer must do the
* decrement on his own.
* decrement on their own.
*
* @note To not to undermine this specification the programmer must make sure to get the Python object always via
* GetPyObject().
src/Gui/CornerCrossLetters.h
+1 -1
View File
@@ -10,7 +10,7 @@ namespace Gui {
// 21x27 is 3x a standard 5x7 representation with 1px margin
// This allows good anti-aliasing aspect at any usable size
// It is generated with Gimp using Bitstream Charter Bold font, 28 px, on transparent background
// It is then directy exported as C source type after image is vertically flipped for direct GL usage
// It is then directly exported as C source type after image is vertically flipped for direct GL usage
// With enabled options "Use macros instead of struct" and "Save alpha channel"
#define XPM_WIDTH (21)
src/Gui/DlgMacroExecuteImp.cpp
+2 -2
View File
@@ -536,7 +536,7 @@ Note: your changes will be applied when you next switch workbenches\n"));
Base::Console().Warning("Toolbar walkthrough: Unable to find actionMacros combo box\n");
} else {
int macroIndex = macroListBox->findText(fn); //fn is the macro filename
macroListBox->setCurrentIndex(macroIndex); //select it for the user so he doesn't have to
macroListBox->setCurrentIndex(macroIndex); //select it for the user so they don't have to
}
QLineEdit* menuText = setupCustomMacrosPage->findChild<QLineEdit*>(QString::fromLatin1("actionMenu"));
@@ -580,7 +580,7 @@ Note: your changes will be applied when you next switch workbenches\n"));
moveActionRightButton->setStyleSheet(QString::fromLatin1("background-color: red"));
}
/** tailor instructions depending on whether user already has custom toolbar created
* if not he needs to click New button to create one first
* if not, they need to click New button to create one first
**/
QString instructions2 = tr("Walkthrough instructions: Click right arrow button (->), then Close.");
src/Gui/TextEdit.h
+1 -1
View File
@@ -137,7 +137,7 @@ private:
/**
* The CompletionList class provides a list box that pops up in a text edit if the user has pressed
* an accelerator to complete the current word he is typing in.
* an accelerator to complete the current word they are typing in.
* @author Werner Mayer
*/
class CompletionList : public QListWidget
src/Gui/ViewProviderGroupExtension.cpp
+1 -1
View File
@@ -163,7 +163,7 @@ void ViewProviderGroupExtension::extensionHide(void) {
bool ViewProviderGroupExtension::extensionOnDelete(const std::vector< std::string >& ) {
auto* group = getExtendedViewProvider()->getObject()->getExtensionByType<App::GroupExtension>();
// If the group is nonempty ask the user if he wants to delete its content
// If the group is nonempty ask the user if they want to delete its content
if (group->Group.getSize() > 0) {
QMessageBox::StandardButton choice =
QMessageBox::question(getMainWindow(), QObject::tr ( "Delete group content?" ),
src/Gui/ViewProviderLink.cpp
+1 -1
View File
@@ -2506,7 +2506,7 @@ ViewProvider *ViewProviderLink::startEditing(int mode) {
}
// TODO: the 0x8000 mask here is for caller to disambiguate the intention
// here, whether he wants to, say transform the link itself or the linked
// here, whether they want to, say transform the link itself or the linked
// object. Use of a mask here will allow forwarding those editing modes that
// are supported by both the link and the linked object, such as transform
// and set color. We need to find a better place to declare this constant.
src/Gui/Workbench.cpp
+3 -3
View File
@@ -56,7 +56,7 @@ using namespace Gui;
FreeCAD provides the possibility to have one or more workbenches for a module.
A workbench changes the appearance of the main window in that way that it defines toolbars, items in the toolbox, menus or the context menu and dockable windows that are shown to the user.
The idea behind this concept is that the user should see only the functions that are required for the task that he is doing at this moment and not to show dozens of unneeded functions which the user never uses.
The idea behind this concept is that the user should see only the functions that are required for the task that they are doing at this moment and not to show dozens of unneeded functions which the user never uses.
\section stepbystep Step by step
Here follows a short description of how your own workbench can be added to a module.
@@ -181,8 +181,8 @@ using namespace Gui;
* At startup FreeCAD scans all module directories and invokes InitGui.py. So an item for a workbench gets created. If the user
* clicks on such an item the matching module gets loaded, the C++ workbench gets registered and activated.
*
* The user is able to modify a workbench (Edit|Customize). E.g. he can add new toolbars or items for the toolbox and add his preferred
* functions to them. But he has only full control over "his" toolbars, the default workbench items cannot be modified or even removed.
* The user is able to modify a workbench (Edit|Customize). E.g. they can add new toolbars or items for the toolbox and add their preferred
* functions to them. But the user only has full control over "their" own toolbars, the default workbench items cannot be modified or even removed.
*
* FreeCAD provides also the possibility to define pure Python workbenches. Such workbenches are temporarily only and are lost after exiting
* the FreeCAD session. But if you want to keep your Python workbench you can write a macro and attach it with a user defined button or just
src/Mod/Assembly/App/opendcm/core/property.hpp
+2 -2
View File
@@ -302,7 +302,7 @@ struct pts { //property type sequence
/**
* @brief Type traits to detect if the property has a default value
*
* If the user want to provide a default value for a property than he adds a default_value static function.
* If the user wants to provide a default value for a property than they add a default_value static function.
* To check if the this function is available we add a type traits which searches for this special function.
*/
BOOST_MPL_HAS_XXX_TRAIT_DEF(default_value)
@@ -312,7 +312,7 @@ BOOST_MPL_HAS_XXX_TRAIT_DEF(default_value)
/**
* @brief Functor to assign default values to property
*
* This functor holds a pointer to the PropertyOwner in question. The operator() get the properties which
* This functor holds a pointer to the PropertyOwner in question. The operator() gets the properties which
* hold a default value and assigns this value to the property the owner holds.
*/
template<typename PropertyOwner>
src/Mod/Fem/Gui/TaskPostBoxes.cpp
+1 -1
View File
@@ -1138,7 +1138,7 @@ void TaskPostWarpVector::on_Max_valueChanged(double) {
/*
* problem, if warp_factor is 2000 one would like to input 4000 as max, one starts to input 4
* immediately the warp_factor is changed to 4 because 4 < 2000, but one has just input one character of his 4000
* immediately the warp_factor is changed to 4 because 4 < 2000, but one has just input one character of their 4000
* I do not know how to solve this, but the code to set slider and spinbox is fine thus I leave it ...
*
* mhh it works if "apply changes to pipeline directly" button is deactivated, still it really confuses if
src/Mod/Fem/femmesh/gmshtools.py
+1 -1
View File
@@ -1011,7 +1011,7 @@ for len in max_mesh_sizes:
"""
TODO
class GmshTools should be splittet in two classes
one class should only collect the mesh parameter from mesh object and his childs
one class should only collect the mesh parameter from mesh object and its childs
a second class only uses the collected parameter,
writes the input file runs gmsh reads back the unv and returns a FemMesh
gmsh binary will be collected in the second class
src/Mod/Fem/femmesh/meshtools.py
+1 -1
View File
@@ -1015,7 +1015,7 @@ def get_ref_edgenodes_table(
nodecount += 1
if nodecount > 1:
refedge_fem_faceelements.append(elem)
# for every refedge_fem_faceelement look which of his nodes is in
# for every refedge_fem_faceelement look which of its nodes is in
# refedge_nodes --> add all these nodes to edge_table
for elem in refedge_fem_faceelements:
fe_refedge_nodes = []
src/Mod/Fem/femsolver/calculix/writer.py
+1 -1
View File
@@ -70,7 +70,7 @@ from femtools import constants
units_information = """***********************************************************
** About units:
** See ccx manual, ccx does not know about any unit.
** Golden rule: The user must make sure that the numbers he provides have consistent units.
** Golden rule: The user must make sure that the numbers they provide have consistent units.
** The user is the FreeCAD calculix writer module ;-)
**
** The unit system which is used at Guido Dhondt's company: mm, N, s, K
src/Mod/Fem/femtest/data/calculix/box_frequency.inp
+1 -1
View File
@@ -471,7 +471,7 @@ S, E
***********************************************************
** About units:
** See ccx manual, ccx does not know about any unit.
** Golden rule: The user must make sure that the numbers he provides have consistent units.
** Golden rule: The user must make sure that the numbers they provide have consistent units.
** The user is the FreeCAD calculix writer module ;-)
**
** The unit system which is used at Guido Dhondt's company: mm, N, s, K
src/Mod/Fem/femtest/data/calculix/box_static.inp
+1 -1
View File
@@ -599,7 +599,7 @@ RF
***********************************************************
** About units:
** See ccx manual, ccx does not know about any unit.
** Golden rule: The user must make sure that the numbers he provides have consistent units.
** Golden rule: The user must make sure that the numbers they provide have consistent units.
** The user is the FreeCAD calculix writer module ;-)
**
** The unit system which is used at Guido Dhondt's company: mm, N, s, K
src/Mod/Fem/femtest/data/calculix/ccx_buckling_flexuralbuckling.inp
+1 -1
View File
@@ -818,7 +818,7 @@ RF
***********************************************************
** About units:
** See ccx manual, ccx does not know about any unit.
** Golden rule: The user must make sure that the numbers he provides have consistent units.
** Golden rule: The user must make sure that the numbers they provide have consistent units.
** The user is the FreeCAD calculix writer module ;-)
**
** The unit system which is used at Guido Dhondt's company: mm, N, s, K
src/Mod/Fem/femtest/data/calculix/ccx_cantilever_beam_circle.inp
+1 -1
View File
@@ -113,7 +113,7 @@ RF
***********************************************************
** About units:
** See ccx manual, ccx does not know about any unit.
** Golden rule: The user must make sure that the numbers he provides have consistent units.
** Golden rule: The user must make sure that the numbers they provide have consistent units.
** The user is the FreeCAD calculix writer module ;-)
**
** The unit system which is used at Guido Dhondt's company: mm, N, s, K
src/Mod/Fem/femtest/data/calculix/ccx_cantilever_beam_pipe.inp
+1 -1
View File
@@ -113,7 +113,7 @@ RF
***********************************************************
** About units:
** See ccx manual, ccx does not know about any unit.
** Golden rule: The user must make sure that the numbers he provides have consistent units.
** Golden rule: The user must make sure that the numbers they provide have consistent units.
** The user is the FreeCAD calculix writer module ;-)
**
** The unit system which is used at Guido Dhondt's company: mm, N, s, K
src/Mod/Fem/femtest/data/calculix/ccx_cantilever_beam_rect.inp
+1 -1
View File
@@ -113,7 +113,7 @@ RF
***********************************************************
** About units:
** See ccx manual, ccx does not know about any unit.
** Golden rule: The user must make sure that the numbers he provides have consistent units.
** Golden rule: The user must make sure that the numbers they provide have consistent units.
** The user is the FreeCAD calculix writer module ;-)
**
** The unit system which is used at Guido Dhondt's company: mm, N, s, K
src/Mod/Fem/femtest/data/calculix/ccx_cantilever_ele_hexa20.inp
+1 -1
View File
@@ -453,7 +453,7 @@ RF
***********************************************************
** About units:
** See ccx manual, ccx does not know about any unit.
** Golden rule: The user must make sure that the numbers he provides have consistent units.
** Golden rule: The user must make sure that the numbers they provide have consistent units.
** The user is the FreeCAD calculix writer module ;-)
**
** The unit system which is used at Guido Dhondt's company: mm, N, s, K
src/Mod/Fem/femtest/data/calculix/ccx_cantilever_ele_quad4.inp
+1 -1
View File
@@ -139,7 +139,7 @@ RF
***********************************************************
** About units:
** See ccx manual, ccx does not know about any unit.
** Golden rule: The user must make sure that the numbers he provides have consistent units.
** Golden rule: The user must make sure that the numbers they provide have consistent units.
** The user is the FreeCAD calculix writer module ;-)
**
** The unit system which is used at Guido Dhondt's company: mm, N, s, K
src/Mod/Fem/femtest/data/calculix/ccx_cantilever_ele_quad8.inp
+1 -1
View File
@@ -129,7 +129,7 @@ RF
***********************************************************
** About units:
** See ccx manual, ccx does not know about any unit.
** Golden rule: The user must make sure that the numbers he provides have consistent units.
** Golden rule: The user must make sure that the numbers they provide have consistent units.
** The user is the FreeCAD calculix writer module ;-)
**
** The unit system which is used at Guido Dhondt's company: mm, N, s, K
src/Mod/Fem/femtest/data/calculix/ccx_cantilever_ele_seg2.inp
+1 -1
View File
@@ -255,7 +255,7 @@ RF
***********************************************************
** About units:
** See ccx manual, ccx does not know about any unit.
** Golden rule: The user must make sure that the numbers he provides have consistent units.
** Golden rule: The user must make sure that the numbers they provide have consistent units.
** The user is the FreeCAD calculix writer module ;-)
**
** The unit system which is used at Guido Dhondt's company: mm, N, s, K
src/Mod/Fem/femtest/data/calculix/ccx_cantilever_ele_seg3.inp
+1 -1
View File
@@ -113,7 +113,7 @@ RF
***********************************************************
** About units:
** See ccx manual, ccx does not know about any unit.
** Golden rule: The user must make sure that the numbers he provides have consistent units.
** Golden rule: The user must make sure that the numbers they provide have consistent units.
** The user is the FreeCAD calculix writer module ;-)
**
** The unit system which is used at Guido Dhondt's company: mm, N, s, K
src/Mod/Fem/femtest/data/calculix/ccx_cantilever_ele_tria3.inp
+1 -1
View File
@@ -1620,7 +1620,7 @@ RF
***********************************************************
** About units:
** See ccx manual, ccx does not know about any unit.
** Golden rule: The user must make sure that the numbers he provides have consistent units.
** Golden rule: The user must make sure that the numbers they provide have consistent units.
** The user is the FreeCAD calculix writer module ;-)
**
** The unit system which is used at Guido Dhondt's company: mm, N, s, K
src/Mod/Fem/femtest/data/calculix/ccx_cantilever_ele_tria6.inp
+1 -1
View File
@@ -347,7 +347,7 @@ RF
***********************************************************
** About units:
** See ccx manual, ccx does not know about any unit.
** Golden rule: The user must make sure that the numbers he provides have consistent units.
** Golden rule: The user must make sure that the numbers they provide have consistent units.
** The user is the FreeCAD calculix writer module ;-)
**
** The unit system which is used at Guido Dhondt's company: mm, N, s, K
src/Mod/Fem/femtest/data/calculix/ccx_cantilever_faceload.inp
+1 -1
View File
@@ -419,7 +419,7 @@ RF
***********************************************************
** About units:
** See ccx manual, ccx does not know about any unit.
** Golden rule: The user must make sure that the numbers he provides have consistent units.
** Golden rule: The user must make sure that the numbers they provide have consistent units.
** The user is the FreeCAD calculix writer module ;-)
**
** The unit system which is used at Guido Dhondt's company: mm, N, s, K
src/Mod/Fem/femtest/data/calculix/ccx_cantilever_nodeload.inp
+1 -1
View File
@@ -416,7 +416,7 @@ RF
***********************************************************
** About units:
** See ccx manual, ccx does not know about any unit.
** Golden rule: The user must make sure that the numbers he provides have consistent units.
** Golden rule: The user must make sure that the numbers they provide have consistent units.
** The user is the FreeCAD calculix writer module ;-)
**
** The unit system which is used at Guido Dhondt's company: mm, N, s, K
src/Mod/Fem/femtest/data/calculix/ccx_cantilever_prescribeddisplacement.inp
+1 -1
View File
@@ -426,7 +426,7 @@ RF
***********************************************************
** About units:
** See ccx manual, ccx does not know about any unit.
** Golden rule: The user must make sure that the numbers he provides have consistent units.
** Golden rule: The user must make sure that the numbers they provide have consistent units.
** The user is the FreeCAD calculix writer module ;-)
**
** The unit system which is used at Guido Dhondt's company: mm, N, s, K
src/Mod/Fem/femtest/data/calculix/constraint_centrif.inp
+1 -1
View File
@@ -18792,7 +18792,7 @@ RF
***********************************************************
** About units:
** See ccx manual, ccx does not know about any unit.
** Golden rule: The user must make sure that the numbers he provides have consistent units.
** Golden rule: The user must make sure that the numbers they provide have consistent units.
** The user is the FreeCAD calculix writer module ;-)
**
** The unit system which is used at Guido Dhondt's company: mm, N, s, K
src/Mod/Fem/femtest/data/calculix/constraint_contact_shell_shell.inp
+1 -1
View File
@@ -38424,7 +38424,7 @@ RF
***********************************************************
** About units:
** See ccx manual, ccx does not know about any unit.
** Golden rule: The user must make sure that the numbers he provides have consistent units.
** Golden rule: The user must make sure that the numbers they provide have consistent units.
** The user is the FreeCAD calculix writer module ;-)
**
** The unit system which is used at Guido Dhondt's company: mm, N, s, K
src/Mod/Fem/femtest/data/calculix/constraint_contact_solid_solid.inp
+1 -1
View File
@@ -5356,7 +5356,7 @@ RF
***********************************************************
** About units:
** See ccx manual, ccx does not know about any unit.
** Golden rule: The user must make sure that the numbers he provides have consistent units.
** Golden rule: The user must make sure that the numbers they provide have consistent units.
** The user is the FreeCAD calculix writer module ;-)
**
** The unit system which is used at Guido Dhondt's company: mm, N, s, K
src/Mod/Fem/femtest/data/calculix/constraint_sectionprint.inp
+1 -1
View File
@@ -3470,7 +3470,7 @@ RF
***********************************************************
** About units:
** See ccx manual, ccx does not know about any unit.
** Golden rule: The user must make sure that the numbers he provides have consistent units.
** Golden rule: The user must make sure that the numbers they provide have consistent units.
** The user is the FreeCAD calculix writer module ;-)
**
** The unit system which is used at Guido Dhondt's company: mm, N, s, K
src/Mod/Fem/femtest/data/calculix/constraint_selfweight_cantilever.inp
+1 -1
View File
@@ -2199,7 +2199,7 @@ RF
***********************************************************
** About units:
** See ccx manual, ccx does not know about any unit.
** Golden rule: The user must make sure that the numbers he provides have consistent units.
** Golden rule: The user must make sure that the numbers they provide have consistent units.
** The user is the FreeCAD calculix writer module ;-)
**
** The unit system which is used at Guido Dhondt's company: mm, N, s, K
src/Mod/Fem/femtest/data/calculix/constraint_tie.inp
+1 -1
View File
@@ -18662,7 +18662,7 @@ RF
***********************************************************
** About units:
** See ccx manual, ccx does not know about any unit.
** Golden rule: The user must make sure that the numbers he provides have consistent units.
** Golden rule: The user must make sure that the numbers they provide have consistent units.
** The user is the FreeCAD calculix writer module ;-)
**
** The unit system which is used at Guido Dhondt's company: mm, N, s, K
src/Mod/Fem/femtest/data/calculix/constraint_transform_beam_hinged.inp
+1 -1
View File
@@ -3800,7 +3800,7 @@ RF
***********************************************************
** About units:
** See ccx manual, ccx does not know about any unit.
** Golden rule: The user must make sure that the numbers he provides have consistent units.
** Golden rule: The user must make sure that the numbers they provide have consistent units.
** The user is the FreeCAD calculix writer module ;-)
**
** The unit system which is used at Guido Dhondt's company: mm, N, s, K
src/Mod/Fem/femtest/data/calculix/constraint_transform_torque.inp
+1 -1
View File
@@ -13173,7 +13173,7 @@ RF
***********************************************************
** About units:
** See ccx manual, ccx does not know about any unit.
** Golden rule: The user must make sure that the numbers he provides have consistent units.
** Golden rule: The user must make sure that the numbers they provide have consistent units.
** The user is the FreeCAD calculix writer module ;-)
**
** The unit system which is used at Guido Dhondt's company: mm, N, s, K
src/Mod/Fem/femtest/data/calculix/frequency_beamsimple.inp
+1 -1
View File
@@ -17084,7 +17084,7 @@ RF
***********************************************************
** About units:
** See ccx manual, ccx does not know about any unit.
** Golden rule: The user must make sure that the numbers he provides have consistent units.
** Golden rule: The user must make sure that the numbers they provide have consistent units.
** The user is the FreeCAD calculix writer module ;-)
**
** The unit system which is used at Guido Dhondt's company: mm, N, s, K
src/Mod/Fem/femtest/data/calculix/material_multiple_bendingbeam_fiveboxes.inp
+1 -1
View File
@@ -29200,7 +29200,7 @@ RF
***********************************************************
** About units:
** See ccx manual, ccx does not know about any unit.
** Golden rule: The user must make sure that the numbers he provides have consistent units.
** Golden rule: The user must make sure that the numbers they provide have consistent units.
** The user is the FreeCAD calculix writer module ;-)
**
** The unit system which is used at Guido Dhondt's company: mm, N, s, K
src/Mod/Fem/femtest/data/calculix/material_multiple_bendingbeam_fivefaces.inp
+1 -1
View File
@@ -2711,7 +2711,7 @@ RF
***********************************************************
** About units:
** See ccx manual, ccx does not know about any unit.
** Golden rule: The user must make sure that the numbers he provides have consistent units.
** Golden rule: The user must make sure that the numbers they provide have consistent units.
** The user is the FreeCAD calculix writer module ;-)
**
** The unit system which is used at Guido Dhondt's company: mm, N, s, K
src/Mod/Fem/femtest/data/calculix/material_multiple_tensionrod_twoboxes.inp
+1 -1
View File
@@ -1292,7 +1292,7 @@ RF
***********************************************************
** About units:
** See ccx manual, ccx does not know about any unit.
** Golden rule: The user must make sure that the numbers he provides have consistent units.
** Golden rule: The user must make sure that the numbers they provide have consistent units.
** The user is the FreeCAD calculix writer module ;-)
**
** The unit system which is used at Guido Dhondt's company: mm, N, s, K
src/Mod/Fem/femtest/data/calculix/material_nonlinear.inp
+1 -1
View File
@@ -20129,7 +20129,7 @@ RF
***********************************************************
** About units:
** See ccx manual, ccx does not know about any unit.
** Golden rule: The user must make sure that the numbers he provides have consistent units.
** Golden rule: The user must make sure that the numbers they provide have consistent units.
** The user is the FreeCAD calculix writer module ;-)
**
** The unit system which is used at Guido Dhondt's company: mm, N, s, K
src/Mod/Fem/femtest/data/calculix/square_pipe_end_twisted_edgeforces.inp
+1 -1
View File
@@ -2674,7 +2674,7 @@ RF
***********************************************************
** About units:
** See ccx manual, ccx does not know about any unit.
** Golden rule: The user must make sure that the numbers he provides have consistent units.
** Golden rule: The user must make sure that the numbers they provide have consistent units.
** The user is the FreeCAD calculix writer module ;-)
**
** The unit system which is used at Guido Dhondt's company: mm, N, s, K
src/Mod/Fem/femtest/data/calculix/square_pipe_end_twisted_nodeforces.inp
+1 -1
View File
@@ -2786,7 +2786,7 @@ RF
***********************************************************
** About units:
** See ccx manual, ccx does not know about any unit.
** Golden rule: The user must make sure that the numbers he provides have consistent units.
** Golden rule: The user must make sure that the numbers they provide have consistent units.
** The user is the FreeCAD calculix writer module ;-)
**
** The unit system which is used at Guido Dhondt's company: mm, N, s, K
src/Mod/Fem/femtest/data/calculix/thermomech_bimetall.inp
+1 -1
View File
@@ -8258,7 +8258,7 @@ RF
***********************************************************
** About units:
** See ccx manual, ccx does not know about any unit.
** Golden rule: The user must make sure that the numbers he provides have consistent units.
** Golden rule: The user must make sure that the numbers they provide have consistent units.
** The user is the FreeCAD calculix writer module ;-)
**
** The unit system which is used at Guido Dhondt's company: mm, N, s, K
src/Mod/Fem/femtest/data/calculix/thermomech_flow1D.inp
+1 -1
View File
@@ -168,7 +168,7 @@ MF, PS
***********************************************************
** About units:
** See ccx manual, ccx does not know about any unit.
** Golden rule: The user must make sure that the numbers he provides have consistent units.
** Golden rule: The user must make sure that the numbers they provide have consistent units.
** The user is the FreeCAD calculix writer module ;-)
**
** The unit system which is used at Guido Dhondt's company: mm, N, s, K
src/Mod/Fem/femtest/data/calculix/thermomech_spine.inp
+1 -1
View File
@@ -205,7 +205,7 @@ RF
***********************************************************
** About units:
** See ccx manual, ccx does not know about any unit.
** Golden rule: The user must make sure that the numbers he provides have consistent units.
** Golden rule: The user must make sure that the numbers they provide have consistent units.
** The user is the FreeCAD calculix writer module ;-)
**
** The unit system which is used at Guido Dhondt's company: mm, N, s, K
src/Mod/Fem/femtools/checksanalysis.py
+1 -1
View File
@@ -344,7 +344,7 @@ def check_member_for_solver_calculix(analysis, solver, mesh, member):
):
message += (
"Mesh without geometry link. "
"The mesh needs to know his geometry for the beam rotations.\n"
"The mesh needs to know its geometry for the beam rotations.\n"
)
if len(member.geos_beamrotation) > 1:
message += (
src/Mod/Mesh/App/Core/SetOperations.h
+1 -1
View File
@@ -76,7 +76,7 @@ protected:
float _minDistanceToPoint; /** Minimal distance to facet corner points */
private:
// Helper class cutting edge to his two attached facets
// Helper class cutting edge to its two attached facets
class Edge
{
public:
src/Mod/PartDesign/Gui/Command.cpp
+2 -2
View File
@@ -1183,8 +1183,8 @@ void prepareProfileBased(PartDesign::Body *pcActiveBody, Gui::Command* cmd, cons
// a Part container and if not an error was raised and the function aborted.
// First of all, for the user this wasn't obvious because the error message
// was quite confusing (and thus the user may have done the wrong thing since
// he may have assumed the that the sketch was meant) and second there is no need
// that the body must be inside a Part container.
// they may have assumed the that the sketch was meant) and
// Second, there is no need that the body must be inside a Part container.
// For more details see: https://forum.freecadweb.org/viewtopic.php?f=19&t=32164
// The function has been modified not to expect the body to be in the Part
// and it now directly invokes the 'makeCopy' dialog.
src/Mod/PartDesign/Gui/CommandBody.cpp
+1 -1
View File
@@ -941,7 +941,7 @@ void CmdPartDesignMoveFeatureInTree::activated(int iMsg)
}
// If the selected objects have been moved after the current tip then ask the
// user if he wants the last object to be the new tip.
// user if they want the last object to be the new tip.
// Only do this for features that can hold a tip (not for e.g. datums)
if ( lastObject && body->Tip.getValue() == target
&& lastObject->isDerivedFrom(PartDesign::Feature::getClassTypeId()) ) {
src/Mod/PartDesign/Gui/TaskHelixParameters.cpp
+1 -1
View File
@@ -436,7 +436,7 @@ void TaskHelixParameters::onAxisChanged(int num)
}
propReferenceAxis->Paste(lnk);
// in case user is in selection mode, but changed his mind before selecting anything.
// in case user is in selection mode, but changed their mind before selecting anything.
exitSelectionMode();
}
src/Mod/PartDesign/Gui/TaskPrimitiveParameters.cpp
+4 -4
View File
@@ -398,7 +398,7 @@ void TaskBoxPrimitives::onCylinderRadiusChanged(double v) {
void TaskBoxPrimitives::onCylinderXSkewChanged(double v) {
PartDesign::Cylinder* cyl = static_cast<PartDesign::Cylinder*>(vp->getObject());
// we must assure that if the user incremented from e.g. 85 degree with the
// spin buttons he does not end at 90.0 but 89.9999 which is shown rounded to 90 degree
// spin buttons, they do not end at 90.0 but at 89.9999 which is shown rounded to 90 degree
if ((v < 90.0) && (v > -90.0)) {
cyl->FirstAngle.setValue(v);
}
@@ -415,7 +415,7 @@ void TaskBoxPrimitives::onCylinderXSkewChanged(double v) {
void TaskBoxPrimitives::onCylinderYSkewChanged(double v) {
PartDesign::Cylinder* cyl = static_cast<PartDesign::Cylinder*>(vp->getObject());
// we must assure that if the user incremented from e.g. 85 degree with the
// spin buttons he does not end at 90.0 but 89.9999 which is shown rounded to 90 degree
// spin buttons, they do not end at 90.0 but at 89.9999 which is shown rounded to 90 degree
if ((v < 90.0) && (v > -90.0)) {
cyl->SecondAngle.setValue(v);
}
@@ -572,7 +572,7 @@ void TaskBoxPrimitives::onPrismHeightChanged(double v) {
void TaskBoxPrimitives::onPrismXSkewChanged(double v) {
PartDesign::Prism* sph = static_cast<PartDesign::Prism*>(vp->getObject());
// we must assure that if the user incremented from e.g. 85 degree with the
// spin buttons he does not end at 90.0 but 89.9999 which is shown rounded to 90 degree
// spin buttons, they do not end at 90.0 but at 89.9999 which is shown rounded to 90 degree
if ((v < 90.0) && (v > -90.0)) {
sph->FirstAngle.setValue(v);
}
@@ -589,7 +589,7 @@ void TaskBoxPrimitives::onPrismXSkewChanged(double v) {
void TaskBoxPrimitives::onPrismYSkewChanged(double v) {
PartDesign::Prism* sph = static_cast<PartDesign::Prism*>(vp->getObject());
// we must assure that if the user incremented from e.g. 85 degree with the
// spin buttons he does not end at 90.0 but 89.9999 which is shown rounded to 90 degree
// spin buttons, they do not end at 90.0 but at 89.9999 which is shown rounded to 90 degree
if ((v < 90.0) && (v > -90.0)) {
sph->SecondAngle.setValue(v);
}
src/Mod/PartDesign/Gui/TaskShapeBinder.cpp
+4 -4
View File
@@ -91,8 +91,8 @@ TaskShapeBinder::TaskShapeBinder(ViewProviderShapeBinder *view, bool /*newObj*/,
for (auto sub : subs)
ui->listWidgetReferences->addItem(QString::fromStdString(sub));
//make sure th euser sees al important things: the base feature to select edges and the
//spine/auxiliary spine he already selected
//make sure the user sees all important things: the base feature to select edges and the
//spine/auxiliary spine they already selected
if(obj) {
auto* svp = doc->getViewProvider(obj);
if(svp) {
@@ -148,8 +148,8 @@ TaskShapeBinder::~TaskShapeBinder()
PartDesign::Pipe* pipe = static_cast<PartDesign::Pipe*>(vp->getObject());
Gui::Document* doc = Gui::Application::Instance->activeDocument();
//make sure th euser sees al important things: the base feature to select edges and the
//spine/auxiliary spine he already selected
//make sure the user sees all important things: the base feature to select edges and the
//spine/auxiliary spine they already selected
if(pipe->BaseFeature.getValue())
doc->getViewProvider(pipe->BaseFeature.getValue())->hide();
if(pipe->Spine.getValue()) {
src/Mod/Sketcher/App/Sketch.cpp
+1 -1
View File
@@ -265,7 +265,7 @@ int Sketch::setUpSketch(const std::vector<Part::Geometry *> &GeoList,
while(unsatisfied_groups) {
// We tried hard not to arrive to an unsatisfied group, so we try harder
// This loop has the advantage that the user will notice increased effort to solve,
// so may understand he is abusing the block constraint, while guaranteing that wrong
// so they may understand that they are abusing the block constraint, while guaranteeing that wrong
// behaviour of the block constraint is not undetected.
// Another QR iteration
src/Mod/Sketcher/Gui/CommandSketcherTools.cpp
+1 -1
View File
@@ -1538,7 +1538,7 @@ void SketcherCopy::activate(SketcherCopy::Op op)
}
}
// Ask the user if he wants to clone or to simple copy
// Ask the user if they want to clone or to simple copy
/*
int ret = QMessageBox::question(Gui::getMainWindow(), QObject::tr("Dimensional/Geometric constraints"),
QObject::tr("Do you want to clone the object, i.e. substitute dimensional constraints by geometric constraints?"),
src/Mod/Sketcher/Gui/ViewProviderSketch.cpp
+1 -1
View File
@@ -3931,7 +3931,7 @@ void ViewProviderSketch::initItemsSizes()
//
// Rationale:
// -> Other WBs use the default value as is
// -> If a user has a HDPI, he will eventually change the value for the other WBs
// -> If a user has a HDPI, they will eventually change the value for the other WBs
// -> If we correct the value here in addition, we would get two times a resize
edit->MarkerSize = markersize;
}
src/WindowsInstaller/include/init.nsh
+3 -3
View File
@@ -89,8 +89,8 @@ Function .onInit
${endif}
${if} $0 != ""
# check if the uninstaller was acidentally deleted
# if so don't bother the user if he really wants to install a new FreeCAD over an existing one
# because he won't have a chance to deny this
# if so, don't bother the user if they really want to install a new FreeCAD over an existing one
# because they won't have a chance to deny this
StrCpy $4 $0 -16 # remove '\bin\FreeCAD.exe'
# (for FileCheck the variables $0 and $1 cannot be used)
!insertmacro FileCheck $5 "Uninstall-${APP_NAME}.exe" "$4" # macro from Utils.nsh
@@ -98,7 +98,7 @@ Function .onInit
Goto ForceInstallation
${endif}
# installing over an existing installation of the same FreeCAD release is not necessary
# if the users does this he most probably has a problem with FreeCAD that can better be solved
# if the users does this, they most probably have a problem with FreeCAD that can better be solved
# by reinstalling FreeCAD
# for beta and other test releases over-installing can even cause errors
MessageBox MB_YESNO|MB_DEFBUTTON2|MB_ICONEXCLAMATION "$(AlreadyInstalled)" /SD IDNO IDYES ForceInstallation