diff --git a/src/Mod/OpenSCAD/InitGui.py b/src/Mod/OpenSCAD/InitGui.py
index fa294c47d7..ee3c2d31e3 100644
--- a/src/Mod/OpenSCAD/InitGui.py
+++ b/src/Mod/OpenSCAD/InitGui.py
@@ -149,11 +149,11 @@ class OpenSCADWorkbench(Workbench):
)
self.appendToolbar(
- QT_TRANSLATE_NOOP("Workbench", "OpenSCADTools"), toolbarcommands
+ QT_TRANSLATE_NOOP("Workbench", "OpenSCAD Tools"), toolbarcommands
)
self.appendMenu("OpenSCAD", commands)
self.appendToolbar(
- QT_TRANSLATE_NOOP("Workbech", "OpenSCAD Part tools"), parttoolbarcommands
+ QT_TRANSLATE_NOOP("Workbench", "OpenSCAD Part tools"), parttoolbarcommands
)
# self.appendMenu('OpenSCAD',["AddOpenSCADElement"])
###self.appendCommandbar("&Generic Tools",["ColorCodeShape"])
diff --git a/src/Mod/OpenSCAD/OpenSCADCommands.py b/src/Mod/OpenSCAD/OpenSCADCommands.py
index eedc7df637..b9d93b7026 100644
--- a/src/Mod/OpenSCAD/OpenSCADCommands.py
+++ b/src/Mod/OpenSCAD/OpenSCADCommands.py
@@ -457,7 +457,7 @@ class OpenSCADMeshBooleanWidget(QtGui.QWidget):
self.rb_hull = QtGui.QRadioButton("Hull")
self.rb_group.addButton(self.rb_hull)
self.rb_group_box_layout.addWidget(self.rb_hull)
- self.rb_minkowski = QtGui.QRadioButton("Minkowski")
+ self.rb_minkowski = QtGui.QRadioButton("Minkowski sum")
self.rb_group.addButton(self.rb_minkowski)
self.rb_group_box_layout.addWidget(self.rb_minkowski)
layouth=QtGui.QHBoxLayout()
@@ -471,6 +471,7 @@ class OpenSCADMeshBooleanWidget(QtGui.QWidget):
def retranslateUi(self, widget=None):
self.buttonadd.setText(translate('OpenSCAD','Perform'))
self.setWindowTitle(translate('OpenSCAD','Mesh Boolean'))
+ self.rb_minkowski.setText(translate('OpenSCAD','Minkowski sum'))
class OpenSCADMeshBooleanTask:
def __init__(self):
@@ -549,7 +550,7 @@ class Hull:
def GetResources(self):
return {'Pixmap' : 'OpenSCAD_Hull',
'MenuText': QtCore.QT_TRANSLATE_NOOP('OpenSCAD_Hull', 'Hull'),
- 'ToolTip' : QtCore.QT_TRANSLATE_NOOP('OpenSCAD_Hull', 'Perform Hull')}
+ 'ToolTip' : QtCore.QT_TRANSLATE_NOOP('OpenSCAD_Hull', 'Use OpenSCAD to create a hull')}
class Minkowski:
def IsActive(self):
@@ -567,8 +568,8 @@ class Minkowski:
FreeCAD.ActiveDocument.recompute()
def GetResources(self):
return {'Pixmap' : 'OpenSCAD_Minkowski',
- 'MenuText': QtCore.QT_TRANSLATE_NOOP('OpenSCAD_Minkowski', 'Minkowski'),
- 'ToolTip' : QtCore.QT_TRANSLATE_NOOP('OpenSCAD_Minkowski', 'Perform Minkowski')}
+ 'MenuText': QtCore.QT_TRANSLATE_NOOP('OpenSCAD_Minkowski', 'Minkowski sum'),
+ 'ToolTip' : QtCore.QT_TRANSLATE_NOOP('OpenSCAD_Minkowski', 'Use OpenSCAD to create a Minkowski sum')}
FreeCADGui.addCommand('OpenSCAD_ColorCodeShape',ColorCodeShape())
FreeCADGui.addCommand('OpenSCAD_ExplodeGroup',ExplodeGroup())
diff --git a/src/Mod/OpenSCAD/OpenSCADUtils.py b/src/Mod/OpenSCAD/OpenSCADUtils.py
index 148bc1a090..b6eb534dae 100644
--- a/src/Mod/OpenSCAD/OpenSCADUtils.py
+++ b/src/Mod/OpenSCAD/OpenSCADUtils.py
@@ -718,7 +718,7 @@ def process_ObjectsViaOpenSCAD(doc,children,name):
else:
import FreeCAD
FreeCAD.Console.PrintError( translate('OpenSCAD',\
- "Error all shapes must be either 2D or both must be 3D")+u'\n')
+ "Error: either all shapes must be 2D or all shapes must be 3D")+u'\n')
def removesubtree(objs):
diff --git a/src/Mod/OpenSCAD/Resources/ui/openscadprefs-base.ui b/src/Mod/OpenSCAD/Resources/ui/openscadprefs-base.ui
index c1751cbcfe..84a755f059 100644
--- a/src/Mod/OpenSCAD/Resources/ui/openscadprefs-base.ui
+++ b/src/Mod/OpenSCAD/Resources/ui/openscadprefs-base.ui
@@ -6,8 +6,8 @@
0
0
- 575
- 629
+ 577
+ 636
@@ -45,7 +45,7 @@
-
-
+
300
@@ -229,7 +229,7 @@
-
-
+
300
@@ -263,7 +263,7 @@
-
- maximum fragment size
+ Maximum fragment size
@@ -382,7 +382,7 @@
-
- convexity
+ Convexity
@@ -453,7 +453,7 @@
- -
+
-
Deflection
@@ -475,7 +475,7 @@
-
+