Fix source string typos mentioned on Crowdin (#15261)

This commit is contained in:
Max Wilfinger
2024-07-08 17:18:31 -05:00
committed by GitHub
parent cb12b639d1
commit 7d21d9edb8
123 changed files with 252 additions and 258 deletions
+1 -1
View File
@@ -78,7 +78,7 @@ QString UnitsApi::getDescription(UnitSystem system)
case UnitSystem::ImperialBuilding:
return tr("Building US (ft-in, sqft, cft)");
case UnitSystem::MmMin:
return tr("Metric small parts & CNC(mm, mm/min)");
return tr("Metric small parts & CNC (mm, mm/min)");
case UnitSystem::ImperialCivil:
return tr("Imperial for Civil Eng (ft, ft/s)");
case UnitSystem::FemMilliMeterNewton:
+1 -1
View File
@@ -55,7 +55,7 @@ const char* BlenderNavigationStyle::mouseButtons(ViewerMode mode)
case NavigationStyle::DRAGGING:
return QT_TR_NOOP("Press middle mouse button");
case NavigationStyle::ZOOMING:
return QT_TR_NOOP("Scroll middle mouse button");
return QT_TR_NOOP("Scroll mouse wheel");
default:
return "No description";
}
+3 -3
View File
@@ -775,10 +775,10 @@ StdCmdUnitsCalculator::StdCmdUnitsCalculator()
: Command("Std_UnitsCalculator")
{
sGroup = "Tools";
sMenuText = QT_TR_NOOP("&Units calculator...");
sToolTipText = QT_TR_NOOP("Start the units calculator");
sMenuText = QT_TR_NOOP("&Units converter...");
sToolTipText = QT_TR_NOOP("Start the units converter");
sWhatsThis = "Std_UnitsCalculator";
sStatusTip = QT_TR_NOOP("Start the units calculator");
sStatusTip = QT_TR_NOOP("Start the units converter");
sPixmap = "accessories-calculator";
eType = 0;
}
+1 -1
View File
@@ -3713,7 +3713,7 @@ StdCmdDockOverlayToggleTransparent::StdCmdDockOverlayToggleTransparent()
:Command("Std_DockOverlayToggleTransparent")
{
sGroup = "Standard-View";
sMenuText = QT_TR_NOOP("Toggle transparent");
sMenuText = QT_TR_NOOP("Toggle transparent mode");
sToolTipText = QT_TR_NOOP("Toggle transparent mode for the docked window under cursor.\n"
"This makes the docked window stay transparent at all times.");
sWhatsThis = "Std_DockOverlayToggleTransparent";
+2 -2
View File
@@ -350,9 +350,9 @@ StdCmdToggleToolBarLock::StdCmdToggleToolBarLock()
{
sGroup = "Tools";
sMenuText = QT_TR_NOOP("Lock toolbars");
sToolTipText = QT_TR_NOOP("Locks toolbar so they are no longer moveable");
sToolTipText = QT_TR_NOOP("Lock toolbars so they are no longer moveable");
sWhatsThis = "Std_ToggleToolBarLock";
sStatusTip = QT_TR_NOOP("Locks toolbar so they are no longer moveable");
sStatusTip = QT_TR_NOOP("Lock toolbars so they are no longer moveable");
eType = 0;
}
+1 -1
View File
@@ -11,7 +11,7 @@
</rect>
</property>
<property name="windowTitle">
<string>Units calculator</string>
<string>Units converter</string>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0">
+2 -2
View File
@@ -858,9 +858,9 @@ const char* GestureNavigationStyle::mouseButtons(ViewerMode mode)
case NavigationStyle::PANNING:
return QT_TR_NOOP("Drag screen with two fingers OR press right mouse button.");
case NavigationStyle::DRAGGING:
return QT_TR_NOOP("Drag screen with one finger OR press left mouse button. In Sketcher && other edit modes, hold Alt in addition.");
return QT_TR_NOOP("Drag screen with one finger OR press left mouse button. In Sketcher and other edit modes, hold Alt in addition.");
case NavigationStyle::ZOOMING:
return QT_TR_NOOP("Pinch (place two fingers on the screen && drag them apart from || towards each other) OR scroll middle mouse button OR PgUp/PgDown on keyboard.");
return QT_TR_NOOP("Pinch (place two fingers on the screen and drag them apart from or towards each other) OR scroll middle mouse button OR PgUp/PgDown on keyboard.");
default:
return "No description";
}
+1 -1
View File
@@ -315,7 +315,7 @@ StdCmdPythonHelp::StdCmdPythonHelp()
: Command("Std_PythonHelp"), server(nullptr)
{
sGroup = "Tools";
sMenuText = QT_TR_NOOP("Automatic python modules documentation");
sMenuText = QT_TR_NOOP("Automatic Python modules documentation");
sToolTipText = QT_TR_NOOP("Opens a browser to show the Python modules documentation");
sWhatsThis = "Std_PythonHelp";
sStatusTip = QT_TR_NOOP("Opens a browser to show the Python modules documentation");
+1 -1
View File
@@ -223,7 +223,7 @@
<widget class="QComboBox" name="rotationInput">
<item>
<property name="text">
<string>Rotation axis with angle</string>
<string>Rotation axis and angle</string>
</property>
</item>
<item>
@@ -89,7 +89,7 @@ wbListItem::wbListItem(const QString& wbName, bool enabled, bool startupWb, bool
if (startupWb) {
enableCheckBox->setChecked(true);
enableCheckBox->setEnabled(false);
enableCheckBox->setToolTip(tr("This is the current startup module, and must be enabled. See Preferences/General/Autoload to change."));
enableCheckBox->setToolTip(tr("This is the current startup module, and must be enabled."));
}
connect(enableCheckBox, &QCheckBox::toggled, this, [this](bool checked) { onWbToggled(checked); });
@@ -134,7 +134,7 @@ wbListItem::wbListItem(const QString& wbName, bool enabled, bool startupWb, bool
if (startupWb) { // Figure out whether to check and/or disable this checkBox:
autoloadCheckBox->setChecked(true);
autoloadCheckBox->setEnabled(false);
autoloadCheckBox->setToolTip(tr("This is the current startup module, and must be autoloaded. See Preferences/General/Autoload to change."));
autoloadCheckBox->setToolTip(tr("This is the current startup module, and must be autoloaded."));
}
else if (autoLoad) {
autoloadCheckBox->setChecked(true);
+1 -1
View File
@@ -3271,7 +3271,7 @@ void TreeWidget::setupText()
this->toggleVisibilityInTreeAction->setText(tr("Toggle visibility in tree view"));
this->toggleVisibilityInTreeAction->setStatusTip(tr("Toggles the visibility of selected items in the tree view"));
this->createGroupAction->setText(tr("Create group..."));
this->createGroupAction->setText(tr("Create group"));
this->createGroupAction->setStatusTip(tr("Create a group"));
this->relabelObjectAction->setText(tr("Rename"));
+1 -1
View File
@@ -350,7 +350,7 @@ installed addons will be checked for available updates</string>
<item row="1" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
<string>Path to git executable (optional):</string>
<string>Path to Git executable (optional):</string>
</property>
</widget>
</item>
@@ -148,7 +148,7 @@ class AddonInstallerGUI(QtCore.QObject):
"<p>"
+ translate(
"AddonsInstaller",
"This addon requires Python packages that are not installed, and cannot be installed automatically. To use this workbench you must install the following Python packages manually:",
"This addon requires Python packages that are not installed, and cannot be installed automatically. To use this addon you must install the following Python packages manually:",
)
+ "</p><ul>"
)
@@ -243,7 +243,7 @@ class AddonInstallerGUI(QtCore.QObject):
translate("AddonsInstaller", "Incompatible Python version"),
translate(
"AddonsInstaller",
"This Addon (or one if its dependencies) requires Python {}.{}, and your system is running {}.{}. Installation cancelled.",
"This Addon (or one of its dependencies) requires Python {}.{}, and your system is running {}.{}. Installation cancelled.",
).format(
missing.python_min_version["major"],
missing.python_min_version["minor"],
+1 -1
View File
@@ -290,7 +290,7 @@ class Joint:
"Joint",
QT_TRANSLATE_NOOP(
"App::Property",
"This is the distance of the joint. It is used only by the distance joint and by RackPinion (pitch radius), Screw and Gears and Belt(radius1)",
"This is the distance of the joint. It is used only by the Distance joint and Rack and Pinion (pitch radius), Screw and Gears and Belt (radius1)",
),
)
+3 -3
View File
@@ -229,7 +229,7 @@ class BuildingPart(ArchIFC.IfcProduct):
if not "Shape" in pl:
obj.addProperty("Part::PropertyPartShape","Shape","BuildingPart",QT_TRANSLATE_NOOP("App::Property","The shape of this object"))
if not "SavedInventor" in pl:
obj.addProperty("App::PropertyFileIncluded","SavedInventor","BuildingPart",QT_TRANSLATE_NOOP("App::Property","This property stores an inventor representation for this object"))
obj.addProperty("App::PropertyFileIncluded","SavedInventor","BuildingPart",QT_TRANSLATE_NOOP("App::Property","This property stores an OpenInventor representation for this object"))
obj.setEditorMode("SavedInventor",2)
if not "OnlySolids" in pl:
obj.addProperty("App::PropertyBool","OnlySolids","BuildingPart",QT_TRANSLATE_NOOP("App::Property","If true, only solids will be collected by this object when referenced from other files"))
@@ -489,9 +489,9 @@ class ViewProviderBuildingPart:
# inventor saving
if not "SaveInventor" in pl:
vobj.addProperty("App::PropertyBool","SaveInventor","Interaction",QT_TRANSLATE_NOOP("App::Property","If this is enabled, the inventor representation of this object will be saved in the FreeCAD file, allowing to reference it in other files in lightweight mode."))
vobj.addProperty("App::PropertyBool","SaveInventor","Interaction",QT_TRANSLATE_NOOP("App::Property","If this is enabled, the OpenInventor representation of this object will be saved in the FreeCAD file, allowing to reference it in other files in lightweight mode."))
if not "SavedInventor" in pl:
vobj.addProperty("App::PropertyFileIncluded","SavedInventor","Interaction",QT_TRANSLATE_NOOP("App::Property","A slot to save the inventor representation of this object, if enabled"))
vobj.addProperty("App::PropertyFileIncluded","SavedInventor","Interaction",QT_TRANSLATE_NOOP("App::Property","A slot to save the OpenInventor representation of this object, if enabled"))
vobj.setEditorMode("SavedInventor",2)
# children properties
+6 -6
View File
@@ -204,7 +204,7 @@ def removeComponents(objectsList,host=None):
h.Objects = a
def makeComponent(baseobj=None,name=None,delete=False):
'''makeComponent([baseobj],[name],[delete]): creates an undefined, non-parametric Arch
'''makeComponent([baseobj],[name],[delete]): creates an undefined, non-parametric BIM
component from the given base object'''
if not FreeCAD.ActiveDocument:
FreeCAD.Console.PrintError("No active document. Aborting\n")
@@ -405,7 +405,7 @@ def getCutVolume(cutplane,shapes,clip=False,depth=None):
else:
p = cutplane.copy().Faces[0]
except Part.OCCError:
FreeCAD.Console.PrintMessage(translate("Arch","Invalid cutplane")+"\n")
FreeCAD.Console.PrintMessage(translate("Arch","Invalid cut plane")+"\n")
return None,None,None
ce = p.CenterOfMass
ax = p.normalAt(0,0)
@@ -1134,19 +1134,19 @@ def toggleIfcBrepFlag(obj):
"""toggleIfcBrepFlag(obj): toggles the IFC brep flag of the given object, forcing it
to be exported as brep geometry or not."""
if not hasattr(obj,"IfcData"):
FreeCAD.Console.PrintMessage(translate("Arch","Object doesn't have settable IFCData"))
FreeCAD.Console.PrintMessage(translate("Arch","Object doesn't have settable IFC attributes"))
else:
d = obj.IfcData
if "FlagForceBrep" in d:
if d["FlagForceBrep"] == "True":
d["FlagForceBrep"] = "False"
FreeCAD.Console.PrintMessage(translate("Arch","Disabling Brep force flag of object")+" "+obj.Label+"\n")
FreeCAD.Console.PrintMessage(translate("Arch","Disabling B-rep force flag of object")+" "+obj.Label+"\n")
else:
d["FlagForceBrep"] = "True"
FreeCAD.Console.PrintMessage(translate("Arch","Enabling Brep force flag of object")+" "+obj.Label+"\n")
FreeCAD.Console.PrintMessage(translate("Arch","Enabling B-rep force flag of object")+" "+obj.Label+"\n")
else:
d["FlagForceBrep"] = "True"
FreeCAD.Console.PrintMessage(translate("Arch","Enabling Brep force flag of object")+" "+obj.Label+"\n")
FreeCAD.Console.PrintMessage(translate("Arch","Enabling B-rep force flag of object")+" "+obj.Label+"\n")
obj.IfcData = d
+1 -1
View File
@@ -1137,7 +1137,7 @@ class Component(ArchIFC.IfcProduct):
Returns
-------
list of <Arch._Structure>
The Arch Structures hosting this component.
The BIM Structures hosting this component.
"""
hosts = []
+2 -2
View File
@@ -103,7 +103,7 @@ class _CommandFloor:
Create a floor from the objects selected by the user, if any. Exclude
objects that appear higher in the object hierarchy, such as sites or
buildings. If free linking is enabled in the Arch preferences, allow higher
buildings. If free linking is enabled in the BIM preferences, allow higher
hierarchy objects to be part of floors.
Find documentation on the end user usage of Arch Floor here:
@@ -132,7 +132,7 @@ class _CommandFloor:
Create a floor from the objects selected by the user, if any. Exclude
objects that appear higher in the object hierarchy, such as sites or
buildings. If free linking is enabled in the Arch preferences, allow
buildings. If free linking is enabled in the BIM preferences, allow
higher hierarchy objects to be part of floors.
"""
+2 -2
View File
@@ -387,8 +387,8 @@ class ArchGridTaskPanel:
self.hLabel.setText(QtGui.QApplication.translate("Arch", "Total height", None))
self.addRowButton.setText(QtGui.QApplication.translate("Arch", "Add row", None))
self.delRowButton.setText(QtGui.QApplication.translate("Arch", "Del row", None))
self.addColumnButton.setText(QtGui.QApplication.translate("Arch", "Add col", None))
self.delColumnButton.setText(QtGui.QApplication.translate("Arch", "Del col", None))
self.addColumnButton.setText(QtGui.QApplication.translate("Arch", "Add column", None))
self.delColumnButton.setText(QtGui.QApplication.translate("Arch", "Del column", None))
self.spanButton.setText(QtGui.QApplication.translate("Arch", "Create span", None))
self.delSpanButton.setText(QtGui.QApplication.translate("Arch", "Remove span", None))
self.title.setText(QtGui.QApplication.translate("Arch", "Rows", None)+": "+str(self.table.rowCount())+" / "+QtGui.QApplication.translate("Arch", "Columns", None)+": "+str(self.table.columnCount()))
+1 -1
View File
@@ -127,7 +127,7 @@ class _ArchSchedule:
"App::PropertyLink",
"Schedule",
"Arch",
QT_TRANSLATE_NOOP("App::Property", "The Arch Schedule that uses this spreadsheet"))
QT_TRANSLATE_NOOP("App::Property", "The BIM Schedule that uses this spreadsheet"))
sp.Schedule = obj
def getSpreadSheet(self, obj, force=False):
+6 -6
View File
@@ -194,7 +194,7 @@ class CommandStructuresFromSelection:
def GetResources(self):
return {'Pixmap': 'Arch_MultipleStructures',
'MenuText': QT_TRANSLATE_NOOP("Arch_StructuresFromSelection", "Multiple Structures"),
'ToolTip': QT_TRANSLATE_NOOP("Arch_StructuresFromSelection", "Create multiple Arch Structures from a selected base, using each selected edge as an extrusion path")}
'ToolTip': QT_TRANSLATE_NOOP("Arch_StructuresFromSelection", "Create multiple BIM Structures from a selected base, using each selected edge as an extrusion path")}
def IsActive(self):
v = hasattr(FreeCADGui.getMainWindow().getActiveWindow(), "getSceneGraph")
@@ -441,7 +441,7 @@ class _CommandStructure:
grid = QtGui.QGridLayout(w)
# mode box
labelmode = QtGui.QLabel(translate("Arch","Drawing mode")+":")
labelmode = QtGui.QLabel(translate("Arch","Parameters of the structure")+":")
self.modeb = QtGui.QRadioButton(translate("Arch","Beam"))
self.modec = QtGui.QRadioButton(translate("Arch","Column"))
if self.bpoint or self.beammode:
@@ -496,9 +496,9 @@ class _CommandStructure:
grid.addWidget(self.vHeight,6,1,1,1)
# horizontal button
value5 = QtGui.QPushButton(translate("Arch","Switch L/H"))
value5 = QtGui.QPushButton(translate("Arch","Switch Length/Height"))
grid.addWidget(value5,7,0,1,1)
value6 = QtGui.QPushButton(translate("Arch","Switch L/W"))
value6 = QtGui.QPushButton(translate("Arch","Switch Length/Width"))
grid.addWidget(value6,7,1,1,1)
# continue button
@@ -716,7 +716,7 @@ class _Structure(ArchComponent.Component):
obj.addProperty("App::PropertyEnumeration","FaceMaker","Structure",QT_TRANSLATE_NOOP("App::Property","The facemaker type to use to build the profile of this object"))
obj.FaceMaker = ["None","Simple","Cheese","Bullseye"]
if not "ArchSketchEdges" in pl: # PropertyStringList
obj.addProperty("App::PropertyStringList","ArchSketchEdges","Structure",QT_TRANSLATE_NOOP("App::Property","Selected edges (or group of edges) of the base ArchSketch, to use in creating the shape of this Arch Structure (instead of using all the Base shape's edges by default). Input are index numbers of edges or groups."))
obj.addProperty("App::PropertyStringList","ArchSketchEdges","Structure",QT_TRANSLATE_NOOP("App::Property","Selected edges (or group of edges) of the base ArchSketch, to use in creating the shape of this BIM Structure (instead of using all the Base shape's edges by default). Input are index numbers of edges or groups."))
else:
# test if the property was added but as IntegerList, then update;
type = obj.getTypeIdOfProperty('ArchSketchEdges')
@@ -724,7 +724,7 @@ class _Structure(ArchComponent.Component):
oldIntValue = obj.ArchSketchEdges
newStrValue = [str(x) for x in oldIntValue]
obj.removeProperty("ArchSketchEdges")
obj.addProperty("App::PropertyStringList","ArchSketchEdges","Structure",QT_TRANSLATE_NOOP("App::Property","Selected edges (or group of edges) of the base ArchSketch, to use in creating the shape of this Arch Structure (instead of using all the Base shape's edges by default). Input are index numbers of edges or groups."))
obj.addProperty("App::PropertyStringList","ArchSketchEdges","Structure",QT_TRANSLATE_NOOP("App::Property","Selected edges (or group of edges) of the base ArchSketch, to use in creating the shape of this BIM Structure (instead of using all the Base shape's edges by default). Input are index numbers of edges or groups."))
obj.ArchSketchEdges = newStrValue
self.Type = "Structure"
+1 -1
View File
@@ -265,7 +265,7 @@
<item>
<widget class="QLabel" name="label_7">
<property name="text">
<string>Father</string>
<string>Parent</string>
</property>
</widget>
</item>
@@ -25,10 +25,10 @@
<item>
<widget class="QLabel" name="labelServerName">
<property name="toolTip">
<string>The name of the BimServer you are currently connecting to. Change settings in Arch Preferences</string>
<string>The name of the BIM Server you are currently connecting to. Change settings in the BIM preferences</string>
</property>
<property name="text">
<string>Bim Server</string>
<string>BIM Server</string>
</property>
</widget>
</item>
@@ -94,7 +94,7 @@
<item>
<widget class="QComboBox" name="comboProjects">
<property name="toolTip">
<string>The list of projects present on the Bim Server</string>
<string>The list of projects present on the BIM Server</string>
</property>
</widget>
</item>
@@ -40,7 +40,7 @@
<string>If this is checked, you won't be asked again when creating a new FreeCAD document,
and that document won't be turned into an IFC document automatically.
You can still turn a FreeCAD document into an IFC document manually, using
menu IFC -&gt; Convert document</string>
Utils -&gt; Make IFC project</string>
</property>
<property name="text">
<string>Do not ask again</string>
@@ -48,7 +48,7 @@
<item>
<widget class="QRadioButton" name="radioButton_2">
<property name="toolTip">
<string>The property will be hidden in the interface, and can only be modified via python script</string>
<string>The property will be hidden in the interface, and can only be modified via Python script</string>
</property>
<property name="text">
<string>Hidden</string>
+2 -2
View File
@@ -48,7 +48,7 @@
<item row="3" column="1">
<widget class="QComboBox" name="comboSingleDoc">
<property name="toolTip">
<string>This defines how the IFC data is stored in the FreeCAD document. 'Single IFC document' means that the FreeCAD document is the IFC document, anything you create in it belongs to the IFC document too. 'Use IFCdocument object' means that an object will be created inside the FreeCAD document to represent the IFC document. You will be able to add non-IFC objects alongside.</string>
<string>This defines how the IFC data is stored in the FreeCAD document. 'Single IFC document' means that the FreeCAD document is the IFC document, anything you create in it belongs to the IFC document too. 'Use IFC document object' means that an object will be created inside the FreeCAD document to represent the IFC document. You will be able to add non-IFC objects alongside.</string>
</property>
<item>
<property name="text">
@@ -146,7 +146,7 @@
<item>
<widget class="QCheckBox" name="checkAskAgain">
<property name="toolTip">
<string>If this is unchecked, these settings will be applied automatically next time. You can change this later under menu Edit -&gt; Preferences -&gt; Import/Export -&gt; Native IFC</string>
<string>If this is unchecked, these settings will be applied automatically next time. You can change this later under menu Edit -&gt; Preferences -&gt; BIM -&gt; Native IFC</string>
</property>
<property name="text">
<string>Ask me again next time</string>
+1 -1
View File
@@ -412,7 +412,7 @@
<item row="3" column="0">
<widget class="QLabel" name="labelRectangleProfileDef">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;When exporting a model to IFC, all BIM objects that are an extrusion of a rectangular profile will use an IfcRectangleProfileDef entity as their extrusion profile. However, Revit won't import these correctly. If you are going to use the IFC file in Revit, we recommend you to disable this behavior by checking the option under menu &lt;span style=&quot; font-weight:600;&quot;&gt;Edit -&amp;gt; Preferences -&amp;gt; Import/Export -&amp;gt; IFC -&amp;gt; Disable IfcRectangularProfileDef&lt;/span&gt;.&lt;/p&gt;&lt;p&gt;When that option is checked, all extrusion profiles will be exported as generic IfcArbitraryProfileDef entities, regardless of if they are rectangular or not, which will contain a little less information, but will open correctly in Revit.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;When exporting a model to IFC, all BIM objects that are an extrusion of a rectangular profile will use an IfcRectangleProfileDef entity as their extrusion profile. However, Revit won't import these correctly. If you are going to use the IFC file in Revit, we recommend you to disable this behavior by checking the option under menu &lt;span style=&quot; font-weight:600;&quot;&gt;Edit -&amp;gt; Preferences -&amp;gt; BIM -&amp;gt; NativeIFC -&amp;gt; Disable IfcRectangularProfileDef&lt;/span&gt;.&lt;/p&gt;&lt;p&gt;When that option is checked, all extrusion profiles will be exported as generic IfcArbitraryProfileDef entities, regardless of if they are rectangular or not, which will contain a little less information, but will open correctly in Revit.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string>Is IfcRectangleProfileDef export disabled? (Revit only)</string>
@@ -160,7 +160,7 @@
<item>
<widget class="QCheckBox" name="checkBox">
<property name="toolTip">
<string>If locked, any new object created in FreeCAd will automatically become an IFC object and part of this project</string>
<string>If locked, any new object created in FreeCAD will automatically become an IFC object and part of this project</string>
</property>
<property name="text">
<string>Locked</string>
+5 -5
View File
@@ -112,7 +112,7 @@
<item row="3" column="1">
<widget class="QComboBox" name="settingUnits">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The unit you prefer to work with, that will be used everywhere: in dialogs, measurements and dimensions. However, you can enter any other unit anytime. For example, if you configured FreeCAD to work in millimeters, you can still enter measures as &amp;quot;10m&amp;quot; or &amp;quot;5ft&amp;quot;. You can also change the working unit anytime without causing any modification to your model. Location in preferences: &lt;span style=&quot; font-weight:600;&quot;&gt;General &amp;gt; Units &amp;gt; User system&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The unit you prefer to work with, that will be used everywhere: in dialogs, measurements and dimensions. However, you can enter any other unit anytime. For example, if you configured FreeCAD to work in millimeters, you can still enter measures as &amp;quot;10m&amp;quot; or &amp;quot;5ft&amp;quot;. You can also change the default unit system anytime without causing any modification to your model. Location in preferences: &lt;span style=&quot; font-weight:600;&quot;&gt;General &amp;gt; Default unit system&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<item>
<property name="text">
@@ -346,7 +346,7 @@
<item row="3" column="3">
<widget class="Gui::ColorButton" name="colorButtonConstruction">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The default color of construction geometry. Location in preferences: &lt;span style=&quot; font-weight:600;&quot;&gt;Draft &amp;gt; General Settings &amp;gt; Construction geometry color&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The default color of construction geometry. Location in preferences: &lt;span style=&quot; font-weight:600;&quot;&gt;Draft &amp;gt; General &amp;gt; Construction geometry color&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
@@ -381,7 +381,7 @@
<item row="3" column="1">
<widget class="Gui::ColorButton" name="colorButtonHelpers">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The default color for helper objects such as grids and axes. Location in preferences: &lt;span style=&quot; font-weight:600;&quot;&gt;Arch &amp;gt; Defaults &amp;gt; Helpers&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The default color for helper objects such as grids and axes. Location in preferences: &lt;span style=&quot; font-weight:600;&quot;&gt;BIM &amp;gt; Defaults &amp;gt; Helpers&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
@@ -567,7 +567,7 @@
<item row="7" column="1">
<widget class="QComboBox" name="settingWP">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Where the grid appears at FreeCAD startup. Location in preferences: &lt;span style=&quot; font-weight:600;&quot;&gt;Draft &amp;gt; General settings &amp;gt; Default working plane&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Where the grid appears at FreeCAD startup. Location in preferences: &lt;span style=&quot; font-weight:600;&quot;&gt;Draft &amp;gt; General &amp;gt; Default working plane&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<item>
<property name="text">
@@ -623,7 +623,7 @@
<item>
<widget class="QLabel" name="labelMissingWorkbenches">
<property name="text">
<string>MissingWorkbenches</string>
<string>Missing Workbenches</string>
</property>
<property name="wordWrap">
<bool>true</bool>
+1 -1
View File
@@ -60,7 +60,7 @@
<item>
<widget class="QLabel" name="label_2">
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This appears to be the first time that you are using the BIM workbench. If you press OK, the next screen will propose you to set a couple of typical FreeCAD options that are suitable for BIM work. You can change these options anytime later under menu &lt;span style=&quot; font-weight:600;&quot;&gt;Manage -&amp;gt; Setup&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;This appears to be the first time that you are using the BIM workbench. If you press OK, the next screen will propose you to set a couple of typical FreeCAD options that are suitable for BIM work. You can change these options anytime later under menu &lt;span style=&quot; font-weight:600;&quot;&gt;Manage -&amp;gt; BIM Setup...&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="wordWrap">
<bool>true</bool>
+4 -4
View File
@@ -512,7 +512,7 @@ a Footprint display mode</string>
<item>
<widget class="QGroupBox" name="groupBox_4">
<property name="title">
<string>Bim server</string>
<string>BIM server</string>
</property>
<layout class="QGridLayout" name="gridLayout_4">
<item row="0" column="0">
@@ -525,7 +525,7 @@ a Footprint display mode</string>
<item row="0" column="1">
<widget class="Gui::PrefLineEdit" name="lineEdit_BimServerUrl">
<property name="toolTip">
<string>The URL of a bim server instance (www.bimserver.org) to connect to.</string>
<string>The URL of a BIM server instance (www.bimserver.org) to connect to.</string>
</property>
<property name="text">
<string notr="true">http://localhost:8082</string>
@@ -541,8 +541,8 @@ a Footprint display mode</string>
<item row="1" column="0" colspan="2">
<widget class="Gui::PrefCheckBox" name="checkBox_BimServerBrowser">
<property name="toolTip">
<string>If this is selected, the &quot;Open BimServer in browser&quot;
button will open the Bim Server interface in an external browser
<string>If this is selected, the &quot;Open BIM Server in browser&quot;
button will open the BIM Server interface in an external browser
instead of the FreeCAD web workbench</string>
</property>
<property name="text">
+1 -1
View File
@@ -105,7 +105,7 @@ If using Netgen, make sure that it is available.</string>
<item>
<widget class="QGroupBox" name="groupBox_2">
<property name="title">
<string>Builtin and mefisto mesher options</string>
<string>Builtin and Mefisto mesher options</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
+3 -3
View File
@@ -179,12 +179,12 @@ if you start getting crashes when you set multiple cores.</string>
</property>
<item>
<property name="text">
<string>Parametric Arch objects</string>
<string>Parametric BIM objects</string>
</property>
</item>
<item>
<property name="text">
<string>Non-parametric Arch objects</string>
<string>Non-parametric BIM objects</string>
</property>
</item>
<item>
@@ -228,7 +228,7 @@ if you start getting crashes when you set multiple cores.</string>
</property>
<item>
<property name="text">
<string>Non-parametric Arch objects</string>
<string>Non-parametric BIM objects</string>
</property>
</item>
<item>
+2 -2
View File
@@ -436,9 +436,9 @@ class ArchTest(unittest.TestCase):
"Arch Wall with MultiMaterial and 3 alignments failed")
def testStructure(self):
App.Console.PrintLog ('Checking Arch Structure...\n')
App.Console.PrintLog ('Checking BIM Structure...\n')
s = Arch.makeStructure(length=2,width=3,height=5)
self.assertTrue(s,"Arch Structure failed")
self.assertTrue(s,"BIM Structure failed")
def testRebar(self):
App.Console.PrintLog ('Checking Arch Rebar...\n')
+6 -6
View File
@@ -209,8 +209,8 @@ class Arch_RemoveShape:
"the Arch RemoveShape command definition"
def GetResources(self):
return {'Pixmap' : 'Arch_RemoveShape',
'MenuText': QT_TRANSLATE_NOOP("Arch_RemoveShape","Remove Shape from Arch"),
'ToolTip': QT_TRANSLATE_NOOP("Arch_RemoveShape","Removes cubic shapes from Arch components")}
'MenuText': QT_TRANSLATE_NOOP("Arch_RemoveShape","Remove Shape from BIM"),
'ToolTip': QT_TRANSLATE_NOOP("Arch_RemoveShape","Removes cubic shapes from BIM components")}
def IsActive(self):
v = hasattr(FreeCADGui.getMainWindow().getActiveWindow(), "getSceneGraph")
@@ -283,12 +283,12 @@ class Arch_Survey:
class Arch_ToggleIfcBrepFlag:
"the Toggle IFC Brep flag command definition"
"the Toggle IFC B-rep flag command definition"
def GetResources(self):
return {'Pixmap' : 'Arch_ToggleIfcBrepFlag',
'MenuText': QT_TRANSLATE_NOOP("Arch_ToggleIfcBrepFlag","Toggle IFC Brep flag"),
'ToolTip': QT_TRANSLATE_NOOP("Arch_ToggleIfcBrepFlag","Force an object to be exported as Brep or not")}
'MenuText': QT_TRANSLATE_NOOP("Arch_ToggleIfcBrepFlag","Toggle IFC B-rep flag"),
'ToolTip': QT_TRANSLATE_NOOP("Arch_ToggleIfcBrepFlag","Force an object to be exported as B-rep or not")}
def IsActive(self):
v = hasattr(FreeCADGui.getMainWindow().getActiveWindow(), "getSceneGraph")
@@ -458,7 +458,7 @@ class Arch_MergeWalls:
ostr += ",FreeCAD.ActiveDocument." + o.Name
ok = True
if ok:
FreeCAD.ActiveDocument.openTransaction(translate("Arch","Merge Wall"))
FreeCAD.ActiveDocument.openTransaction(translate("Arch","Merge Walls"))
FreeCADGui.addModule("Arch")
FreeCADGui.doCommand("Arch.joinWalls(["+ostr+"],delete=True)")
FreeCAD.ActiveDocument.commitTransaction()
+1 -1
View File
@@ -104,7 +104,7 @@ class BIM_IfcExplorer:
# create the dialog
self.dialog = QtGui.QDialog()
self.dialog.setObjectName("IfcExplorer")
self.dialog.setWindowTitle(translate("BIM", "Ifc Explorer"))
self.dialog.setWindowTitle(translate("BIM", "IFC Explorer"))
self.dialog.resize(720, 540)
toolbar = FreeCADGui.UiLoader().createWidget("Gui::ToolBar")
+3 -3
View File
@@ -350,7 +350,7 @@ class BIM_Preflight_TaskPanel:
msg = (
translate(
"BIM",
"The version of ifcopenshell installed on your system could not be parsed",
"The version of Ifcopenshell installed on your system could not be parsed",
)
+ " "
)
@@ -362,7 +362,7 @@ class BIM_Preflight_TaskPanel:
msg += (
translate(
"BIM",
"The version of ifcopenshell installed on your system will produce files with this schema version:",
"The version of Ifcopenshell installed on your system will produce files with this schema version:",
)
+ "\n\n"
)
@@ -647,7 +647,7 @@ class BIM_Preflight_TaskPanel:
msg += o.Label + "\n"
msg += translate(
"BIM",
"You can turn these objects into BIM objects by using the Utils -> Make Component tool.",
"You can turn these objects into BIM objects by using the Modify -> Add Component tool.",
)
if msg:
self.failed(test)
+1 -1
View File
@@ -68,7 +68,7 @@ class BIM_TDView:
FreeCAD.Console.PrintError(
translate(
"BIM",
"No section view or draft objects selected, or no page selected, or no page found in document",
"No section view or Draft objects selected, or no page selected, or no page found in document",
)
+ "\n"
)
+1 -1
View File
@@ -743,7 +743,7 @@ def insert(srcfile, docname, skip=[], only=[], root=None, preferences=None):
elif (preferences['MERGE_MODE_ARCH'] == 1 and archobj) or (preferences['MERGE_MODE_STRUCT'] == 0 and not archobj):
# non-parametric Arch objects (just Arch components with a shape)
# non-parametric BIM objects (just Arch components with a shape)
if ptype in ["IfcSite","IfcBuilding","IfcBuildingStorey"]:
for freecadtype,ifctypes in typesmap.items():
+2 -2
View File
@@ -78,8 +78,8 @@ def getPreferences():
"""Retrieve the IFC preferences available in import and export.
MERGE_MODE_ARCH:
0 = parametric arch objects
1 = non-parametric arch objects
0 = parametric BIM objects
1 = non-parametric BIM objects
2 = Part shapes
3 = One compound per storey
"""
+2 -2
View File
@@ -935,7 +935,7 @@ def export(exportList,filename):
if (not hasattr(ifcw,"IfcFile")) and (not hasattr(ifcw,"file")):
FreeCAD.Console.PrintError(translate("Arch","Error: your IfcOpenShell version is too old")+"\n")
print("""importIFC: The version of ifcOpenShell installed on this system doesn't
print("""importIFC: The version of IfcOpenShell installed on this system doesn't
have IFC export capabilities. IFC export currently requires an experimental
version of IfcOpenShell available from https://github.com/aothms/IfcOpenShell""")
return
@@ -1852,7 +1852,7 @@ def explorer(filename,schema="IFC2X3_TC1.exp"):
d = QtGui.QDialog()
d.setObjectName("IfcExplorer")
d.setWindowTitle("Ifc Explorer")
d.setWindowTitle("IFC Explorer")
d.resize(640, 480)
layout = QtGui.QVBoxLayout(d)
layout.addWidget(tree)
+1 -1
View File
@@ -14,7 +14,7 @@
</rect>
</property>
<property name="windowTitle">
<string>Choose a Path Job</string>
<string>Choose a CAM Job</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
@@ -152,7 +152,7 @@
</sizepolicy>
</property>
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;List of bone locations (with all bones at that location) that are part of this dressup. The list is determined by the corners in the profile and the selected &lt;span style=" font-weight:600;"&gt;Side&lt;/span&gt; for the bones. &lt;/p&gt;&lt;p&gt;You can &lt;span style=" font-weight:600;"&gt;un-check&lt;/span&gt; the bones you don't want to be dressed up.&lt;/p&gt;&lt;p&gt;If a bone is &lt;span style=" font-weight:600;"&gt;grayed out&lt;/span&gt; it means that it is already dressed up by a previous dressup. Or put another way, if you dress up this dogobone dressup again you will only be able to select the bones that are un-checked here.&lt;/p&gt;&lt;p&gt;If this list is empty it probably means you're trying to create bones on the wrong side of the profile.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;List of bone locations (with all bones at that location) that are part of this dressup. The list is determined by the corners in the profile and the selected &lt;span style=" font-weight:600;"&gt;Side&lt;/span&gt; for the bones. &lt;/p&gt;&lt;p&gt;You can &lt;span style=" font-weight:600;"&gt;un-check&lt;/span&gt; the bones you don't want to be dressed up.&lt;/p&gt;&lt;p&gt;If a bone is &lt;span style=" font-weight:600;"&gt;grayed out&lt;/span&gt; it means that it is already dressed up by a previous dressup. Or put another way, if you dress up this dogbone dressup again you will only be able to select the bones that are un-checked here.&lt;/p&gt;&lt;p&gt;If this list is empty it probably means you're trying to create bones on the wrong side of the profile.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
@@ -59,7 +59,7 @@
<item>
<widget class="QLabel" name="label_2">
<property name="text">
<string>G Gode</string>
<string>G-Code</string>
</property>
</widget>
</item>
+1 -1
View File
@@ -252,7 +252,7 @@ Ordering by operation will do each operation in all coordinate systems before mo
</property>
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;Work Coordinate Systems&lt;/span&gt; also called &lt;span style=&quot; font-style:italic;&quot;&gt;Work Offsets&lt;/span&gt;, &lt;span style=&quot; font-style:italic;&quot;&gt;Fixture Offsets&lt;/span&gt;, or &lt;span style=&quot; font-style:italic;&quot;&gt;Fixtures &lt;/span&gt;are useful for building efficient production jobs where the same part is done many times on the machine.
FreeCAD has no knowledge of where a particular coordinate system exists within the machine coordinate system so adding additional coordinate systems to your job will have no visual change within your job. It will, however, change your gcode output. The exact way in which the output is affected is controlled by the 'order by' setting.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
FreeCAD has no knowledge of where a particular coordinate system exists within the machine coordinate system so adding additional coordinate systems to your job will have no visual change within your job. It will, however, change your G-code output. The exact way in which the output is affected is controlled by the 'order by' setting.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="resizeMode">
<enum>QListView::Adjust</enum>
@@ -65,14 +65,14 @@
<item>
<widget class="QPushButton" name="btnLaunchCamotics">
<property name="text">
<string>Launch Camotics</string>
<string>Launch CAMotics</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="btnMakeFile">
<property name="text">
<string>Make Camotics File</string>
<string>Make CAMotics File</string>
</property>
</widget>
</item>
+3 -3
View File
@@ -81,7 +81,7 @@ class CAMoticsUI:
self.form,
translate("Path", "Save Project As"),
"",
translate("Path", "Camotics Project (*.camotics)"),
translate("Path", "CAMotics Project (*.camotics)"),
)[0]
if filename:
if not filename.endswith(".camotics"):
@@ -311,9 +311,9 @@ class CommandCamoticsSimulate:
def GetResources(self):
return {
"Pixmap": "CAM_Camotics",
"MenuText": QT_TRANSLATE_NOOP("CAM_Camotics", "Camotics"),
"MenuText": QT_TRANSLATE_NOOP("CAM_Camotics", "CAMotics"),
"Accel": "P, C",
"ToolTip": QT_TRANSLATE_NOOP("CAM_Camotics", "Simulate using Camotics"),
"ToolTip": QT_TRANSLATE_NOOP("CAM_Camotics", "Simulate using CAMotics"),
"CmdType": "ForEdit",
}
@@ -74,7 +74,7 @@ class ReportGenerator:
"opLabel": translate("CAM_Sanity", "Operation"),
"operatorLabel": translate("CAM_Sanity", "Operator"),
"orderByLabel": translate("CAM_Sanity", "Order By"),
"outputLabel": translate("CAM_Sanity", "Output (Gcode)"),
"outputLabel": translate("CAM_Sanity", "Output (G-code)"),
"partInformationLabel": translate("CAM_Sanity", "Part Information"),
"partNumberLabel": translate("CAM_Sanity", "Part Number"),
"postLabel": translate("CAM_Sanity", "Postprocessor"),
@@ -86,7 +86,7 @@ class ReportGenerator:
"squawksLabel": translate("CAM_Sanity", "Squawks"),
"stopsLabel": translate("CAM_Sanity", "Stops"),
"sSpeedCarbideLabel": translate("CAM_Sanity", "Surface Speed Carbide"),
"sSpeedHSSLabel": translate("CAM_Sanity", "Surace Speed HSS"),
"sSpeedHSSLabel": translate("CAM_Sanity", "Surface Speed HSS"),
"tableOfContentsLabel": translate("CAM_Sanity", "Table of Contents"),
"tcLabel": translate("CAM_Sanity", "Tool Controller"),
"toolDataLabel": translate("CAM_Sanity", "Tool Data"),
+1 -1
View File
@@ -185,7 +185,7 @@ class ObjectCustom(PathOp.ObjectOp):
self.commandlist.append(newcommand)
except ValueError:
Path.Log.warning(
translate("PathCustom", "Invalid Gcode line: %s") % l
translate("PathCustom", "Invalid G-code line: %s") % l
)
continue
+1 -1
View File
@@ -130,7 +130,7 @@ class ObjectProfile(PathAreaOp.ObjectOp):
"MiterLimit",
"Profile",
QT_TRANSLATE_NOOP(
"App::Property", "Maximum distance before a miter join is truncated"
"App::Property", "Maximum distance before a miter joint is truncated"
),
),
(
+1 -1
View File
@@ -206,7 +206,7 @@ class ObjectSlot(PathOp.ObjectOp):
"Slot",
QtCore.QT_TRANSLATE_NOOP(
"App::Property",
"For arcs/circlular edges, offset the radius for the toolpath.",
"For arcs/circular edges, offset the radius for the toolpath.",
),
),
(
+1 -1
View File
@@ -783,7 +783,7 @@ class ObjectSurface(PathOp.ObjectOp):
JOB = PathUtils.findParentJob(obj)
self.JOB = JOB
if JOB is None:
Path.Log.error(translate("PathSurface", "No JOB"))
Path.Log.error(translate("PathSurface", "No job"))
return
self.stockZMin = JOB.Stock.Shape.BoundBox.ZMin
+1 -1
View File
@@ -876,7 +876,7 @@ class ToolBitLibrary(object):
TooltableTypeJSON = translate("CAM_ToolBit", "Tooltable JSON (*.fctl)")
TooltableTypeLinuxCNC = translate("CAM_ToolBit", "LinuxCNC tooltable (*.tbl)")
TooltableTypeCamotics = translate("CAM_ToolBit", "Camotics tooltable (*.json)")
TooltableTypeCamotics = translate("CAM_ToolBit", "CAMotics tooltable (*.json)")
filename = PySide.QtGui.QFileDialog.getSaveFileName(
self.form,
+1 -1
View File
@@ -88,7 +88,7 @@ class PathUtilsUserInput(object):
mylist = [j.Label for j in jobs]
jobname, result = QtGui.QInputDialog.getItem(
None, translate("Path", "Choose a Path Job"), None, mylist
None, translate("Path", "Choose a CAM Job"), None, mylist
)
if result is False:
@@ -485,7 +485,7 @@ The 'Custom Text' is displayed only if 'Label Type' is set to 'Custom'.</transla
If 'Custom' is chosen, the contents of 'Custom Text' will be used.
For other types, the string will be calculated automatically from the object defined in 'Target'.
'Tag' and 'Material' only work for objects that have these properties, like Arch objects.
'Tag' and 'Material' only work for objects that have these properties, like BIM objects.
For 'Position', 'Length', and 'Area' these properties will be extracted from the main object in 'Target',
or from the subelement 'VertexN', 'EdgeN', or 'FaceN', respectively, if it is specified.</source>
@@ -493,7 +493,7 @@ or from the subelement 'VertexN', 'EdgeN', or 'FaceN', respectively, if it is sp
If 'Custom' is chosen, the contents of 'Custom Text' will be used.
For other types, the string will be calculated automatically from the object defined in 'Target'.
'Tag' and 'Material' only work for objects that have these properties, like Arch objects.
'Tag' and 'Material' only work for objects that have these properties, like BIM objects.
For 'Position', 'Length', and 'Area' these properties will be extracted from the main object in 'Target',
or from the subelement 'VertexN', 'EdgeN', or 'FaceN', respectively, if it is specified.</translation>
@@ -55,7 +55,7 @@
Note: C++ importer is faster, but is not as featureful yet</string>
</property>
<property name="text">
<string>Use legacy python importer</string>
<string>Use legacy Python importer</string>
</property>
<property name="checked">
<bool>false</bool>
@@ -75,7 +75,7 @@ Note: C++ importer is faster, but is not as featureful yet</string>
Note: C++ exporter is faster, but is not as featureful yet</string>
</property>
<property name="text">
<string>Use legacy python exporter</string>
<string>Use legacy Python exporter</string>
</property>
<property name="prefEntry" stdset="0">
<cstring>dxfUseLegacyExporter</cstring>
@@ -164,7 +164,7 @@ from the Addon Manager.</string>
<string>If unchecked, texts and mtexts won't be imported</string>
</property>
<property name="text">
<string>texts and dimensions</string>
<string>Texts and dimensions</string>
</property>
<property name="prefEntry" stdset="0">
<cstring>dxftext</cstring>
@@ -196,7 +196,7 @@ from the Addon Manager.</string>
<string>If checked, paper space objects will be imported too</string>
</property>
<property name="text">
<string>layouts</string>
<string>Layouts</string>
</property>
<property name="prefEntry" stdset="0">
<cstring>dxflayout</cstring>
@@ -245,7 +245,7 @@ from the Addon Manager.</string>
<string>Only standard Part objects will be created (fastest)</string>
</property>
<property name="text">
<string>simple Part shapes</string>
<string>Simple Part shapes</string>
</property>
<property name="checked">
<bool>true</bool>
+1 -1
View File
@@ -256,7 +256,7 @@ class Edit(gui_base_original.Modifier):
return {'Pixmap': 'Draft_Edit',
'Accel': "D, E",
'MenuText': QtCore.QT_TRANSLATE_NOOP("Draft_Edit", "Edit"),
'ToolTip': QtCore.QT_TRANSLATE_NOOP("Draft_Edit", "Edits the active object.\nPress E or ALT+LeftClick to display context menu\non supported nodes and on supported objects.")
'ToolTip': QtCore.QT_TRANSLATE_NOOP("Draft_Edit", "Edits the active object.\nPress E or ALT + Left Click to display context menu\non supported nodes and on supported objects.")
}
@@ -774,7 +774,7 @@ class DraftBezCurveGuiTools(GuiTools):
knot = 0
else:
App.Console.PrintWarning(translate("draft",
"Endpoint of BezCurve can't be smoothed")
"Endpoint of Bézier curve can't be smoothed")
+ "\n")
return
segment = knot // deg # segment index
@@ -59,7 +59,7 @@ class SketcherSketchObjectGuiTools(GuiTools):
return editpoints
else:
_wrn = translate("draft", "Sketch is too complex to edit: "
"it is suggested to use sketcher default editor")
"it is suggested to use the default Sketcher editor")
App.Console.PrintWarning(_wrn + "\n")
return None
+1 -1
View File
@@ -207,7 +207,7 @@ class SetAutoGroup(gui_base.GuiCommandSimplest):
"""Set icon, menu and tooltip."""
return {'Pixmap': 'Draft_AutoGroup',
'MenuText': QT_TRANSLATE_NOOP("Draft_AutoGroup", "Autogroup"),
'ToolTip': QT_TRANSLATE_NOOP("Draft_AutoGroup", "Select a group to add all Draft and Arch objects to.")}
'ToolTip': QT_TRANSLATE_NOOP("Draft_AutoGroup", "Select a group to add all Draft and BIM objects to.")}
def Activated(self):
"""Execute when the command is called.
+1 -1
View File
@@ -134,7 +134,7 @@ from menu Tools -> Addon Manager""")
if gui:
message = translate('draft', """The DXF import/export libraries needed by FreeCAD to handle
the DXF format were not found on this system.
Please either enable FreeCAD to download these libraries:
Please either allow FreeCAD to download these libraries:
1 - Load Draft workbench
2 - Menu Edit > Preferences > Import-Export > DXF > Enable downloads
Or download these libraries manually, as explained on
+2 -2
View File
@@ -614,9 +614,9 @@ CmdDrawingSymbol::CmdDrawingSymbol()
// setting the
sGroup = QT_TR_NOOP("Drawing");
sMenuText = QT_TR_NOOP("&Symbol");
sToolTipText = QT_TR_NOOP("Inserts a symbol from a svg file in the active drawing");
sToolTipText = QT_TR_NOOP("Inserts a symbol from a SVG file in the active drawing");
sWhatsThis = "Drawing_Symbol";
sStatusTip = QT_TR_NOOP("Inserts a symbol from a svg file in the active drawing");
sStatusTip = QT_TR_NOOP("Inserts a symbol from a SVG file in the active drawing");
sPixmap = "actions/drawing-symbol";
}
+2 -2
View File
@@ -355,7 +355,7 @@
</item>
<item>
<property name="text">
<string>Spooles</string>
<string>Spooles equation solver</string>
</property>
</item>
<item>
@@ -365,7 +365,7 @@
</item>
<item>
<property name="text">
<string>Iterative Cholesky</string>
<string>Cholesky iterative solver</string>
</property>
</item>
</widget>
+1 -1
View File
@@ -258,7 +258,7 @@
<item row="1" column="0">
<widget class="QLabel" name="l_elmer_multiCPU">
<property name="text">
<string>Multi-CPU core support:</string>
<string>Multi-core CPU support:</string>
</property>
</widget>
</item>
+1 -1
View File
@@ -28,7 +28,7 @@
</sizepolicy>
</property>
<property name="title">
<string>Working directory for solving analysis and gmsh meshing</string>
<string>Working directory for solving analysis and Gmsh meshing</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
+1 -1
View File
@@ -96,7 +96,7 @@
</size>
</property>
<property name="toolTip">
<string>Leave blank to use default gmsh binary file</string>
<string>Leave blank to use default Gmsh binary file</string>
</property>
<property name="prefEntry" stdset="0">
<cstring>gmshBinaryPath</cstring>
+1 -1
View File
@@ -108,7 +108,7 @@
</size>
</property>
<property name="toolTip">
<string>Leave blank to use default Z88 z88r binary file</string>
<string>Leave blank to use default Z88, z88r binary file</string>
</property>
<property name="prefEntry" stdset="0">
<cstring>z88BinaryPath</cstring>
@@ -648,7 +648,7 @@
</column>
<column>
<property name="text">
<string>Head Loss[mm]</string>
<string>Head Loss [mm]</string>
</property>
</column>
<item row="0" column="0">
+4 -4
View File
@@ -104,7 +104,7 @@
<item row="1" column="1">
<widget class="QPushButton" name="pushButton_editMat">
<property name="text">
<string>use FreeCAD material editor</string>
<string>Use FreeCAD material editor</string>
</property>
</widget>
</item>
@@ -120,7 +120,7 @@
<enum>Qt::RightToLeft</enum>
</property>
<property name="text">
<string>use this task panel</string>
<string>Use this task panel</string>
</property>
<property name="checked">
<bool>false</bool>
@@ -389,7 +389,7 @@
</size>
</property>
<property name="title">
<string>Thermal Properties</string>
<string>Thermal Properties</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_8">
<item>
@@ -494,7 +494,7 @@
<item row="2" column="0">
<widget class="QLabel" name="label_14">
<property name="text">
<string>Specific Heat:</string>
<string>Specific Heat Capacity:</string>
</property>
</widget>
</item>
+1 -1
View File
@@ -23,7 +23,7 @@
</size>
</property>
<property name="title">
<string>FEM Mesh Parameter</string>
<string>FEM Mesh Parameters</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_9">
<item>
@@ -361,7 +361,7 @@ void TaskFemConstraintDisplacement::addToSelection()
}
for (const auto& SubElement : SubElements) {
if (SubElement.find(searchStr) == std::string::npos) {
QString msg = tr("Only one type of selection (vertex,face or edge) per "
QString msg = tr("Only one type of selection (vertex, face or edge) per "
"analysis feature allowed!");
QMessageBox::warning(this, tr("Selection error"), msg);
addMe = false;
@@ -509,7 +509,7 @@ void TaskFemConstraintFluidBoundary::updateTurbulenceUI()
ui->labelTurbulentLengthValue->setText(tr("Dissipation Rate [m2/s3]"));
}
else if (turbulenceSpec == "intensity&LengthScale") {
ui->labelTurbulentLengthValue->setText(tr("Length Scale[m]"));
ui->labelTurbulentLengthValue->setText(tr("Length Scale [m]"));
}
else if (turbulenceSpec == "intensity&ViscosityRatio") {
ui->labelTurbulentLengthValue->setText(tr("Viscosity Ratio [1]"));
@@ -408,7 +408,7 @@ normal vector of the face is used as direction</string>
<item row="1" column="0">
<widget class="QLabel" name="labelTemperature">
<property name="text">
<string>Temperature[K]</string>
<string>Temperature [K]</string>
</property>
</widget>
</item>
@@ -319,8 +319,8 @@ void TaskFemConstraintRigidBody::addToSelection()
}
for (size_t iStr = 0; iStr < (SubElements.size()); ++iStr) {
if (SubElements[iStr].find(searchStr) == std::string::npos) {
QString msg = tr(
"Only one type of selection (vertex,face or edge) per constraint allowed!");
QString msg = tr("Only one type of selection (vertex, face or edge) per "
"constraint allowed!");
QMessageBox::warning(this, tr("Selection error"), msg);
addMe = false;
break;
+2 -2
View File
@@ -126,7 +126,7 @@
<item row="2" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
<string>Nbr. Segs per Edge:</string>
<string>Number of Segments per Edge:</string>
</property>
</widget>
</item>
@@ -143,7 +143,7 @@
<item row="3" column="0">
<widget class="QLabel" name="label_5">
<property name="text">
<string>Nbr. Segs per Radius:</string>
<string>Number of Segments per Radius:</string>
</property>
</widget>
</item>
+4 -4
View File
@@ -392,7 +392,7 @@ class _EquationDeformation(CommandManager):
self.menutext = Qt.QT_TRANSLATE_NOOP("FEM_EquationDeformation", "Deformation equation")
self.tooltip = Qt.QT_TRANSLATE_NOOP(
"FEM_EquationDeformation",
"Creates a FEM equation for\n deformation (nonlinear elasticity)",
"Creates a FEM equation for deformation (nonlinear elasticity)",
)
self.is_active = "with_solver_elmer"
self.do_activated = "add_obj_on_gui_selobj_expand_noset_edit"
@@ -405,7 +405,7 @@ class _EquationElasticity(CommandManager):
super().__init__()
self.menutext = Qt.QT_TRANSLATE_NOOP("FEM_EquationElasticity", "Elasticity equation")
self.tooltip = Qt.QT_TRANSLATE_NOOP(
"FEM_EquationElasticity", "Creates a FEM equation for\n elasticity (stress)"
"FEM_EquationElasticity", "Creates a FEM equation for elasticity (stress)"
)
self.is_active = "with_solver_elmer"
self.do_activated = "add_obj_on_gui_selobj_expand_noset_edit"
@@ -480,7 +480,7 @@ class _EquationMagnetodynamic(CommandManager):
)
self.tooltip = Qt.QT_TRANSLATE_NOOP(
"FEM_EquationMagnetodynamic",
"Creates a FEM equation for\n magnetodynamic forces",
"Creates a FEM equation for magnetodynamic forces",
)
self.is_active = "with_solver_elmer"
self.do_activated = "add_obj_on_gui_selobj_expand_noset_edit"
@@ -496,7 +496,7 @@ class _EquationMagnetodynamic2D(CommandManager):
)
self.tooltip = Qt.QT_TRANSLATE_NOOP(
"FEM_EquationMagnetodynamic2D",
"Creates a FEM equation for\n 2D magnetodynamic forces",
"Creates a FEM equation for 2D magnetodynamic forces",
)
self.is_active = "with_solver_elmer"
self.do_activated = "add_obj_on_gui_selobj_expand_noset_edit"
+1 -1
View File
@@ -79,7 +79,7 @@ LOGTXT = translate(
)
CONVERTTXT = translate(
"Help",
"There is no markdown renderer installed on your system, so this help page is rendered as is. Please install the markdown or pandoc python modules to improve the rendering of this page.",
"There is no Markdown renderer installed on your system, so this help page is rendered as is. Please install the Markdown or Pandoc Python modules to improve the rendering of this page.",
)
PREFS = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Help")
ICON = ":/icons/help-browser.svg"
+1 -1
View File
@@ -493,7 +493,7 @@ protected:
};
// This is a combination of ui options:
// "Group layers into blocks" (groupLayers) checkbox which means MergeShapes,
// "simple part shapes" (dxfCreatePart) radio button which means SingleShapes
// "Simple part shapes" (dxfCreatePart) radio button which means SingleShapes
// "Draft objects" (dxfCreateDraft) radio button which means DraftObjects
// We do not support (dxfCreateSketch).
// (joingeometry) is described as being slow so I think the implication is that it only joins
+1 -1
View File
@@ -238,7 +238,7 @@ void GmshWidget::started()
if (!d->label) {
d->label = new Gui::StatusWidget(this);
d->label->setAttribute(Qt::WA_DeleteOnClose);
d->label->setStatusText(tr("Running gmsh..."));
d->label->setStatusText(tr("Running Gmsh..."));
d->label->show();
}
}
+1 -1
View File
@@ -278,7 +278,7 @@ TextSet getUIStrings(Base::Type attacherType, eMapMode mmode)
qApp->translate("Attacher0D", "Attachment is disabled. Point can be moved by editing Placement property.","AttachmentPoint mode tooltip"));
case mm0Origin:
return TwoStrings(qApp->translate("Attacher0D", "Object's origin","AttachmentPoint mode caption"),
qApp->translate("Attacher0D", "Point is put at object's Placement.Position. Works on objects with placements, and ellipse/parabola/hyperbola edges.","AttachmentPoint mode tooltip"));
qApp->translate("Attacher0D", "Point is put at object's placement position. Works on objects with placements, and ellipse/parabola/hyperbola edges.","AttachmentPoint mode tooltip"));
case mm0Focus1:
return TwoStrings(qApp->translate("Attacher0D", "Focus1","AttachmentPoint mode caption"),
qApp->translate("Attacher0D", "Focus of ellipse, parabola, hyperbola.","AttachmentPoint mode tooltip"));
+4 -4
View File
@@ -386,7 +386,7 @@ void CmdPartCommon::activated(int iMsg)
}
if (numShapes < 2) {
QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"),
QObject::tr("Select two shapes or more, please. Or, select one compound containing two or more shapes to compute common between."));
QObject::tr("Please select two shapes or more. Or, select one compound containing two or more shapes to compute the intersection between."));
return;
}
@@ -462,7 +462,7 @@ void CmdPartFuse::activated(int iMsg)
}
if (numShapes < 2) {
QMessageBox::warning(Gui::getMainWindow(), QObject::tr("Wrong selection"),
QObject::tr("Select two shapes or more, please. Or, select one compound containing two or more shapes to be fused."));
QObject::tr("Please select two shapes or more. Or, select one compound containing two or more shapes to be fused."));
return;
}
@@ -944,7 +944,7 @@ CmdPartImport::CmdPartImport()
{
sAppModule = "Part";
sGroup = QT_TR_NOOP("Part");
sMenuText = QT_TR_NOOP("Import CAD...");
sMenuText = QT_TR_NOOP("Import CAD file...");
sToolTipText = QT_TR_NOOP("Imports a CAD file");
sWhatsThis = "Part_Import";
sStatusTip = sToolTipText;
@@ -1007,7 +1007,7 @@ CmdPartExport::CmdPartExport()
{
sAppModule = "Part";
sGroup = QT_TR_NOOP("Part");
sMenuText = QT_TR_NOOP("Export CAD...");
sMenuText = QT_TR_NOOP("Export CAD file...");
sToolTipText = QT_TR_NOOP("Exports to a CAD file");
sWhatsThis = "Part_Export";
sStatusTip = sToolTipText;
+1 -1
View File
@@ -266,7 +266,7 @@ DlgFilletEdges::DlgFilletEdges(FilletType type, Part::FilletBase* fillet, QWidge
d->filletType = type;
if (d->filletType == DlgFilletEdges::CHAMFER) {
ui->parameterName->setTitle(tr("Chamfer Parameter"));
ui->parameterName->setTitle(tr("Chamfer Parameters"));
ui->labelfillet->setText(tr("Chamfer type"));
ui->labelRadius->setText(tr("Length:"));
ui->filletType->setItemText(0, tr("Equal distance"));
+2 -2
View File
@@ -48,7 +48,7 @@
<item row="1" column="0">
<widget class="QGroupBox" name="parameterName">
<property name="title">
<string>Fillet Parameter</string>
<string>Parameters</string>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0" colspan="2">
@@ -107,7 +107,7 @@
<item row="1" column="0">
<widget class="QLabel" name="labelfillet">
<property name="text">
<string>Fillet type:</string>
<string>Type:</string>
</property>
</widget>
</item>
+1 -1
View File
@@ -62,7 +62,7 @@
<item row="1" column="0" colspan="3">
<widget class="QGroupBox" name="groupBox_3">
<property name="title">
<string>Write solids and shells as</string>
<string>Export solids and shells as</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
+1 -1
View File
@@ -11,7 +11,7 @@
</rect>
</property>
<property name="windowTitle">
<string>Step input file</string>
<string>STEP input file</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
+1 -1
View File
@@ -1010,7 +1010,7 @@ TaskCheckGeometryDialog::TaskCheckGeometryDialog()
Content.push_back(settingsBox);
autoRunCheckBox = new QCheckBox();
autoRunCheckBox->setText(tr("Skip settings page"));
autoRunCheckBox->setText(tr("Skip this settings page"));
autoRunCheckBox->setToolTip(
tr("Skip this settings page and run the geometry check automatically.")
+ QStringLiteral("\n")
+1 -1
View File
@@ -94,7 +94,7 @@
<item row="0" column="1">
<widget class="QPushButton" name="boxSelection">
<property name="toolTip">
<string>When checked, the you can select multiple faces
<string>When checked, you can select multiple faces
by dragging a selection rectangle in the 3D view</string>
</property>
<property name="text">
+1 -1
View File
@@ -125,7 +125,7 @@ App::DocumentObjectExecReturn* Helix::execute()
HelixMode mode = static_cast<HelixMode>(Mode.getValue());
if (mode == HelixMode::pitch_height_angle) {
if (Pitch.getValue() < Precision::Confusion())
return new App::DocumentObjectExecReturn(QT_TRANSLATE_NOOP("Exception", "Error: Pitch too small"));
return new App::DocumentObjectExecReturn(QT_TRANSLATE_NOOP("Exception", "Error: Pitch too small!"));
if (Height.getValue() < Precision::Confusion())
return new App::DocumentObjectExecReturn(QT_TRANSLATE_NOOP("Exception", "Error: height too small!"));
Turns.setValue(Height.getValue() / Pitch.getValue());
+1 -1
View File
@@ -431,7 +431,7 @@ void CmdPartDesignMigrate::activated(int iMsg)
}
// do the actual migration
Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Migrate legacy part design features to Bodies"));
Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Migrate legacy Part Design features to Bodies"));
for ( auto chainIt = featureChains.begin(); !featureChains.empty();
featureChains.erase (chainIt), chainIt = featureChains.begin () ) {
@@ -176,9 +176,9 @@ void ViewProviderTransformed::recomputeFeature(bool recompute)
if (rejected > 0) {
msg = QString::fromLatin1("<font color='orange'>%1<br/></font>\r\n%2");
if (rejected == 1)
msg = msg.arg(QObject::tr("One transformed shape does not intersect support"));
msg = msg.arg(QObject::tr("One transformed shape does not intersect the support"));
else {
msg = msg.arg(QObject::tr("%1 transformed shapes do not intersect support"));
msg = msg.arg(QObject::tr("%1 transformed shapes do not intersect the support"));
msg = msg.arg(rejected);
}
}
+3 -3
View File
@@ -98,17 +98,17 @@ class _InvoluteGear:
doc=QtCore.QT_TRANSLATE_NOOP("App::Property", "Number of gear teeth"),
default=26)
ensure_property("App::PropertyLength", "Modules",
doc=QtCore.QT_TRANSLATE_NOOP("App::Property", "Modules of the gear"),
doc=QtCore.QT_TRANSLATE_NOOP("App::Property", "Module of the gear"),
default="2.5 mm")
ensure_property("App::PropertyAngle", "PressureAngle",
doc=QtCore.QT_TRANSLATE_NOOP("App::Property", "Pressure angle of gear teeth"),
default="20 deg")
ensure_property("App::PropertyBool", "HighPrecision",
doc=QtCore.QT_TRANSLATE_NOOP("App::Property",
"True=2 curves with each 3 control points False=1 curve with 4 control points."),
"True=2 curves with each 3 control points, False=1 curve with 4 control points."),
default=True)
ensure_property("App::PropertyBool", "ExternalGear",
doc=QtCore.QT_TRANSLATE_NOOP("App::Property", "True=external Gear False=internal Gear"),
doc=QtCore.QT_TRANSLATE_NOOP("App::Property", "True=external Gear, False=internal Gear"),
default=True)
ensure_property("App::PropertyFloat", "AddendumCoefficient",
doc=QtCore.QT_TRANSLATE_NOOP("App::Property",
+2 -2
View File
@@ -11,7 +11,7 @@
</rect>
</property>
<property name="windowTitle">
<string>Sprocket parameter</string>
<string>Sprocket parameters</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
@@ -307,7 +307,7 @@
<item row="4" column="0">
<widget class="QLabel" name="label_7">
<property name="text">
<string>Tooth Width</string>
<string>Tooth Width:</string>
</property>
</widget>
</item>
@@ -136,7 +136,7 @@ void FitBSplineCurveWidget::exeCommand(const QString& cmd)
{
Gui::WaitCursor wc;
Gui::Command::addModule(Gui::Command::App, "ReverseEngineering");
Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Fit B-Spline"));
Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Fit B-spline"));
Gui::Command::runCommand(Gui::Command::Doc, cmd.toLatin1());
Gui::Command::commitCommand();
Gui::Command::updateActive();
@@ -228,7 +228,7 @@ bool FitBSplineSurfaceWidget::accept()
Gui::WaitCursor wc;
Gui::Command::addModule(Gui::Command::App, "ReverseEngineering");
Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Fit B-Spline"));
Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Fit B-spline"));
Gui::Command::runCommand(Gui::Command::Doc, command.toLatin1());
Gui::Command::commitCommand();
Gui::Command::updateActive();
+7 -7
View File
@@ -673,7 +673,7 @@ void SketchAnalysis::makeMissingPointOnPointCoincidentOneByOne()
{
makeConstraintsOneByOne(vertexConstraints,
QT_TRANSLATE_NOOP("Exceptions",
"Autoconstrain error: Unsolvable sketch while "
"Autoconstraint error: Unsolvable sketch while "
"applying coincident constraints."));
}
@@ -720,7 +720,7 @@ void SketchAnalysis::makeMissingVerticalHorizontalOneByOne()
{
makeConstraintsOneByOne(verthorizConstraints,
QT_TRANSLATE_NOOP("Exceptions",
"Autoconstrain error: Unsolvable sketch while "
"Autoconstraint error: Unsolvable sketch while "
"applying vertical/horizontal constraints."));
}
@@ -812,7 +812,7 @@ void SketchAnalysis::makeMissingEqualityOneByOne()
makeConstraintsOneByOne(equalities,
QT_TRANSLATE_NOOP("Exceptions",
"Autoconstrain error: Unsolvable sketch while "
"Autoconstraint error: Unsolvable sketch while "
"applying equality constraints."));
lineequalityConstraints.clear();
radiusequalityConstraints.clear();
@@ -852,7 +852,7 @@ void SketchAnalysis::autoDeleteAllConstraints()
// a failure should not be possible at this moment as we start from a clean situation
solveSketch(QT_TRANSLATE_NOOP("Exceptions",
"Autoconstrain error: Unsolvable sketch without constraints."));
"Autoconstraint error: Unsolvable sketch without constraints."));
}
void SketchAnalysis::autoHorizontalVerticalConstraints()
@@ -866,7 +866,7 @@ void SketchAnalysis::autoHorizontalVerticalConstraints()
doc->commitTransaction();
solveSketch(QT_TRANSLATE_NOOP("Exceptions",
"Autoconstrain error: Unsolvable sketch after applying "
"Autoconstraint error: Unsolvable sketch after applying "
"horizontal and vertical constraints."));
}
@@ -881,7 +881,7 @@ void SketchAnalysis::autoPointOnPointCoincident()
doc->commitTransaction();
solveSketch(QT_TRANSLATE_NOOP("Exceptions",
"Autoconstrain error: Unsolvable sketch after applying "
"Autoconstraint error: Unsolvable sketch after applying "
"point-on-point constraints."));
}
@@ -902,7 +902,7 @@ void SketchAnalysis::autoMissingEquality()
doc->commitTransaction();
solveSketch(QT_TRANSLATE_NOOP("Exceptions",
"Autoconstrain error: Unsolvable sketch after "
"Autoconstraint error: Unsolvable sketch after "
"applying equality constraints."));
}
+5 -5
View File
@@ -6613,7 +6613,7 @@ bool SketchObject::modifyBSplineKnotMultiplicity(int GeoId, int knotIndex, int m
if (GeoId < 0 || GeoId > getHighestCurveIndex())
THROWMT(Base::ValueError,
QT_TRANSLATE_NOOP("Exceptions", "BSpline Geometry Index (GeoID) is out of bounds."))
QT_TRANSLATE_NOOP("Exceptions", "B-spline Geometry Index (GeoID) is out of bounds."))
if (multiplicityincr == 0)// no change in multiplicity
THROWMT(
@@ -6625,7 +6625,7 @@ bool SketchObject::modifyBSplineKnotMultiplicity(int GeoId, int knotIndex, int m
if (geo->getTypeId() != Part::GeomBSplineCurve::getClassTypeId())
THROWMT(Base::TypeError,
QT_TRANSLATE_NOOP("Exceptions",
"The Geometry Index (GeoId) provided is not a B-spline curve."))
"The Geometry Index (GeoId) provided is not a B-spline."))
const Part::GeomBSplineCurve* bsp = static_cast<const Part::GeomBSplineCurve*>(geo);
@@ -6797,7 +6797,7 @@ bool SketchObject::insertBSplineKnot(int GeoId, double param, int multiplicity)
if (GeoId < 0 || GeoId > getHighestCurveIndex())
THROWMT(
Base::ValueError,
QT_TRANSLATE_NOOP("Exceptions", "BSpline Geometry Index (GeoID) is out of bounds."));
QT_TRANSLATE_NOOP("Exceptions", "B-spline Geometry Index (GeoID) is out of bounds."));
if (multiplicity == 0)
THROWMT(Base::ValueError,
@@ -6808,7 +6808,7 @@ bool SketchObject::insertBSplineKnot(int GeoId, double param, int multiplicity)
if (geo->getTypeId() != Part::GeomBSplineCurve::getClassTypeId())
THROWMT(Base::TypeError,
QT_TRANSLATE_NOOP("Exceptions",
"The Geometry Index (GeoId) provided is not a B-spline curve."));
"The Geometry Index (GeoId) provided is not a B-spline."));
const Part::GeomBSplineCurve* bsp = static_cast<const Part::GeomBSplineCurve*>(geo);
@@ -6825,7 +6825,7 @@ bool SketchObject::insertBSplineKnot(int GeoId, double param, int multiplicity)
if (param > lastParam || param < firstParam)
THROWMT(Base::ValueError,
QT_TRANSLATE_NOOP("Exceptions",
"Knot cannot be inserted outside the BSpline parameter range."));
"Knot cannot be inserted outside the B-spline parameter range."));
std::unique_ptr<Part::GeomBSplineCurve> bspline;
+3 -3
View File
@@ -619,17 +619,17 @@ setLabelDistance(constraintIndex:int, value:float)
</Methode>
<Methode Name="convertToNURBS">
<Documentation>
<UserDocu>Approximates the given geometry with a B-Spline</UserDocu>
<UserDocu>Approximates the given geometry with a B-spline</UserDocu>
</Documentation>
</Methode>
<Methode Name="increaseBSplineDegree">
<Documentation>
<UserDocu>Increases the given BSpline Degree by a number of degrees</UserDocu>
<UserDocu>Increases the given B-spline Degree by a number of degrees</UserDocu>
</Documentation>
</Methode>
<Methode Name="decreaseBSplineDegree">
<Documentation>
<UserDocu>Decreases the given BSpline Degree by a number of degrees by approximating this curve</UserDocu>
<UserDocu>Decreases the given B-spline Degree by a number of degrees by approximating this curve</UserDocu>
</Documentation>
</Methode>
<Methode Name="modifyBSplineKnotMultiplicity">
+2 -2
View File
@@ -784,7 +784,7 @@ CmdSketcherValidateSketch::CmdSketcherValidateSketch()
sAppModule = "Sketcher";
sGroup = "Sketcher";
sMenuText = QT_TR_NOOP("Validate sketch...");
sToolTipText = QT_TR_NOOP("Validate a sketch by looking at missing coincidences,\n"
sToolTipText = QT_TR_NOOP("Validates a sketch by looking at missing coincidences,\n"
"invalid constraints, degenerated geometry, etc.");
sWhatsThis = "Sketcher_ValidateSketch";
sStatusTip = sToolTipText;
@@ -824,7 +824,7 @@ CmdSketcherMirrorSketch::CmdSketcherMirrorSketch()
sAppModule = "Sketcher";
sGroup = "Sketcher";
sMenuText = QT_TR_NOOP("Mirror sketch");
sToolTipText = QT_TR_NOOP("Create a new mirrored sketch for each selected sketch\n"
sToolTipText = QT_TR_NOOP("Creates a new mirrored sketch for each selected sketch\n"
"by using the X or Y axes, or the origin point,\n"
"as mirroring reference.");
sWhatsThis = "Sketcher_MirrorSketch";
+10 -15
View File
@@ -3968,12 +3968,7 @@ void CmdSketcherConstrainCoincidentUnified::activatedPointOnObject(SketchObject*
abortCommand();
Gui::TranslatedUserWarning(obj,
QObject::tr("Wrong selection"),
QObject::tr("None of the selected points were constrained "
"onto the respective curves, "
"because they are parts "
"of the same element, "
"because they are both external geometry, "
"or because the edge is not eligible."));
QObject::tr("None of the selected points were constrained onto the respective curves, because they are part of the same element, they are both external geometry, or the edge is not eligible."));
}
return;
}
@@ -6592,7 +6587,7 @@ bool CmdSketcherConstrainTangent::substituteConstraintCombinations(SketchObject*
Gui::Command::openCommand(
QT_TRANSLATE_NOOP("Command",
"Swap PointOnObject+tangency with point to curve tangency"));
"Swap point on object and tangency with point to curve tangency"));
doEndpointToEdgeTangency(Obj, (*it)->First, (*it)->FirstPos, (*it)->Second);
@@ -7516,7 +7511,7 @@ void CmdSketcherConstrainRadius::activated(int iMsg)
Gui::TranslatedUserWarning(
Obj,
QObject::tr("Wrong selection"),
QObject::tr("Select either only one or more B-Spline poles or only one or more arcs or "
QObject::tr("Select either only one or more B-spline poles or only one or more arcs or "
"circles from the sketch, but not mixed."));
return;
}
@@ -8193,7 +8188,7 @@ void CmdSketcherConstrainRadiam::activated(int iMsg)
Gui::TranslatedUserWarning(
Obj,
QObject::tr("Wrong selection"),
QObject::tr("Select either only one or more B-Spline poles or only one or more arcs or "
QObject::tr("Select either only one or more B-spline poles or only one or more arcs or "
"circles from the sketch, but not mixed."));
return;
}
@@ -8560,9 +8555,9 @@ void CmdSketcherCompConstrainRadDia::languageChange()
QAction* arc1 = a[0];
arc1->setText(QApplication::translate("CmdSketcherCompConstrainRadDia", "Constrain radius"));
arc1->setToolTip(QApplication::translate("Sketcher_ConstrainRadius",
"Fix the radius of a circle or an arc"));
"Fix the radius of an arc or a circle"));
arc1->setStatusTip(QApplication::translate("Sketcher_ConstrainRadius",
"Fix the radius of a circle or an arc"));
"Fix the radius of an arc or a circle"));
QAction* arc2 = a[1];
arc2->setText(QApplication::translate("CmdSketcherCompConstrainRadDia", "Constrain diameter"));
arc2->setToolTip(QApplication::translate("Sketcher_ConstrainDiameter",
@@ -8573,9 +8568,9 @@ void CmdSketcherCompConstrainRadDia::languageChange()
arc3->setText(QApplication::translate("CmdSketcherCompConstrainRadDia",
"Constrain auto radius/diameter"));
arc3->setToolTip(QApplication::translate("Sketcher_ConstrainRadiam",
"Fix the radius/diameter of a circle or an arc"));
"Fix the radius/diameter of an arc or a circle"));
arc3->setStatusTip(QApplication::translate("Sketcher_ConstrainRadiam",
"Fix the radius/diameter of a circle or an arc"));
"Fix the radius/diameter of an arc or a circle"));
}
bool CmdSketcherCompConstrainRadDia::isActive()
@@ -9684,7 +9679,7 @@ void CmdSketcherConstrainSnellsLaw::activated(int iMsg)
"and an edge representing a boundary. "
"The first selected point corresponds "
"to index n1, second to n2, "
"and datum value sets the ratio n2/n1.",
"and the value sets the ratio n2/n1.",
"Constraint_SnellsLaw");
const char dmbg[] = "Constraint_SnellsLaw";
@@ -10113,7 +10108,7 @@ void CmdSketcherToggleActiveConstraint::activated(int iMsg)
}
// undo command open
openCommand(QT_TRANSLATE_NOOP("Command", "Activate/Deactivate constraint"));
openCommand(QT_TRANSLATE_NOOP("Command", "Activate/Deactivate constraints"));
int successful = SubNames.size();
@@ -214,7 +214,7 @@ void CmdSketcherIncreaseDegree::activated(int iMsg)
const std::vector<std::string>& SubNames = selection[0].getSubNames();
Sketcher::SketchObject* Obj = static_cast<Sketcher::SketchObject*>(selection[0].getObject());
openCommand(QT_TRANSLATE_NOOP("Command", "Increase spline degree"));
openCommand(QT_TRANSLATE_NOOP("Command", "Increase B-spline degree"));
bool ignored = false;
@@ -243,7 +243,7 @@ void CmdSketcherIncreaseDegree::activated(int iMsg)
Gui::TranslatedUserWarning(Obj,
QObject::tr("Wrong selection"),
QObject::tr("At least one of the selected "
"objects was not a B-Spline and was ignored."));
"objects was not a B-spline and was ignored."));
}
commitCommand();
@@ -293,7 +293,7 @@ void CmdSketcherDecreaseDegree::activated(int iMsg)
const std::vector<std::string>& SubNames = selection[0].getSubNames();
Sketcher::SketchObject* Obj = static_cast<Sketcher::SketchObject*>(selection[0].getObject());
openCommand(QT_TRANSLATE_NOOP("Command", "Decrease spline degree"));
openCommand(QT_TRANSLATE_NOOP("Command", "Decrease B-spline degree"));
bool ignored = false;
@@ -326,7 +326,7 @@ void CmdSketcherDecreaseDegree::activated(int iMsg)
Gui::TranslatedUserWarning(Obj,
QObject::tr("Wrong selection"),
QObject::tr("At least one of the selected "
"objects was not a B-Spline and was ignored."));
"objects was not a B-spline and was ignored."));
}
commitCommand();
@@ -918,7 +918,7 @@ void CmdSketcherInsertKnot::activated(int iMsg)
// as we need only one object to get the new GeoId after multiplicity change
Gui::TranslatedUserWarning(getActiveGuiDocument()->getDocument(),
QObject::tr("Selection is empty"),
QObject::tr("Nothing is selected. Please select a b-spline."));
QObject::tr("Nothing is selected. Please select a B-spline."));
return;
}
@@ -936,8 +936,8 @@ void CmdSketcherInsertKnot::activated(int iMsg)
Gui::TranslatedUserWarning(
Obj,
QObject::tr("Wrong selection"),
QObject::tr("Please select a b-spline curve to insert a knot (not a knot on it). "
"If the curve is not a b-spline, please convert it into one first."));
QObject::tr("Please select a B-spline to insert a knot (not a knot on it). "
"If the curve is not a B-spline, please convert it into one first."));
}
getSelection().clearSelection();

Some files were not shown because too many files have changed in this diff Show More