From 1de0aebc0b9f96f37642ceb313cba3de947227be Mon Sep 17 00:00:00 2001
From: Chris Hennes <chennes@pioneerlibrarysystem.org>
Date: Tue, 27 Dec 2022 21:30:34 -0600
Subject: [PATCH] OpenSCAD: Minor translation fixes

---
 src/Mod/OpenSCAD/InitGui.py                      |  4 ++--
 src/Mod/OpenSCAD/OpenSCADCommands.py             |  9 +++++----
 src/Mod/OpenSCAD/OpenSCADUtils.py                |  2 +-
 .../OpenSCAD/Resources/ui/openscadprefs-base.ui  | 16 ++++++++--------
 4 files changed, 16 insertions(+), 15 deletions(-)

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 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>575</width>
-    <height>629</height>
+    <width>577</width>
+    <height>636</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -45,7 +45,7 @@
          </widget>
         </item>
         <item>
-         <widget class="Gui::PrefFileChooser" name="gui::preffilechooser">
+         <widget class="Gui::PrefFileChooser" name="gui::preffilechooser" native="true">
           <property name="minimumSize">
            <size>
             <width>300</width>
@@ -229,7 +229,7 @@
          </widget>
         </item>
         <item>
-         <widget class="Gui::PrefFileChooser" name="gui::preffilechooser">
+         <widget class="Gui::PrefFileChooser" name="gui::preffilechooser" native="true">
           <property name="minimumSize">
            <size>
             <width>300</width>
@@ -263,7 +263,7 @@
         <item>
          <widget class="QLabel" name="label">
           <property name="text">
-           <string>maximum fragment size</string>
+           <string>Maximum fragment size</string>
           </property>
          </widget>
         </item>
@@ -382,7 +382,7 @@
         <item>
          <widget class="QLabel" name="label_2">
           <property name="text">
-           <string>convexity</string>
+           <string>Convexity</string>
           </property>
          </widget>
         </item>
@@ -453,7 +453,7 @@
           </property>
          </widget>
         </item>
-       <item row="1" column="2">
+        <item row="1" column="2">
          <widget class="Gui::PrefDoubleSpinBox" name="doubleSpinBox_2a">
           <property name="toolTip">
            <string>Deflection</string>
@@ -475,7 +475,7 @@
           </property>
          </widget>
         </item>
-        </layout>
+       </layout>
       </item>
      </layout>
     </widget>