From a094bf0df7e2b3e5c5b2e3b158a9040a6474892f Mon Sep 17 00:00:00 2001
From: Furgo <148809153+furgo16@users.noreply.github.com>
Date: Thu, 16 May 2024 22:24:04 +0200
Subject: [PATCH] Update grid size nomenclature (#13093)

* Update grid nomenclature to major/minor. Closes #13090
---
 src/Mod/Draft/Resources/ui/TaskSelectPlane.ui | 45 ++++++++++++-------
 .../Resources/ui/preferences-draftsnap.ui     | 13 +++---
 2 files changed, 38 insertions(+), 20 deletions(-)

diff --git a/src/Mod/Draft/Resources/ui/TaskSelectPlane.ui b/src/Mod/Draft/Resources/ui/TaskSelectPlane.ui
index 16cb11103b..b62c46f67b 100644
--- a/src/Mod/Draft/Resources/ui/TaskSelectPlane.ui
+++ b/src/Mod/Draft/Resources/ui/TaskSelectPlane.ui
@@ -144,7 +144,7 @@ of the buttons above</string>
      <property name="toolTip">
       <string>Moves the working plane without changing its
 orientation. If no point is selected, the plane
-will be moved to the center of the view</string>
+will be moved to the center of the view.</string>
      </property>
      <property name="text">
       <string>Move working plane</string>
@@ -155,18 +155,25 @@ will be moved to the center of the view</string>
     <layout class="QGridLayout" name="gridLayout">
      <item row="0" column="0">
       <widget class="QLabel" name="label_9">
+       <property name="toolTip">
+        <string>The color of the grid</string>
+       </property>
        <property name="text">
         <string>Grid color</string>
        </property>
       </widget>
      </item>
      <item row="0" column="1">
-      <widget class="Gui::ColorButton" name="buttonColor"/>
+      <widget class="Gui::ColorButton" name="buttonColor">
+       <property name="toolTip">
+        <string>The color of the grid</string>
+       </property>
+      </widget>
      </item>
      <item row="1" column="0">
       <widget class="QLabel" name="label_3">
        <property name="toolTip">
-        <string>The spacing between the smaller grid lines</string>
+        <string>The distance between grid lines</string>
        </property>
        <property name="text">
         <string>Grid spacing</string>
@@ -176,7 +183,7 @@ will be moved to the center of the view</string>
      <item row="1" column="1">
       <widget class="Gui::InputField" name="fieldGridSpacing">
        <property name="toolTip">
-        <string>The spacing between the smaller grid lines</string>
+        <string>The distance between grid lines</string>
        </property>
        <property name="unit" stdset="0">
         <string notr="true">mm</string>
@@ -186,31 +193,40 @@ will be moved to the center of the view</string>
      <item row="2" column="0">
       <widget class="QLabel" name="label_4">
        <property name="toolTip">
-        <string>The number of squares between each main line of the grid</string>
+        <string>The number of squares between major grid lines</string>
        </property>
        <property name="text">
-        <string>Main line every</string>
+        <string>Major lines every</string>
        </property>
       </widget>
      </item>
      <item row="2" column="1">
       <widget class="QSpinBox" name="fieldGridMainLine">
        <property name="toolTip">
-        <string>The number of squares between each main line of the grid</string>
+        <string>The number of squares between major grid lines</string>
+       </property>
+       <property name="suffix">
+        <string> squares</string>
        </property>
       </widget>
      </item>
      <item row="3" column="0">
       <widget class="QLabel" name="label_8">
+       <property name="toolTip">
+        <string>The number of squares in the X and Y direction of the grid</string>
+       </property>
        <property name="text">
-        <string>Grid extension</string>
+        <string>Grid size</string>
        </property>
       </widget>
      </item>
      <item row="3" column="1">
       <widget class="QSpinBox" name="fieldGridExtension">
+       <property name="toolTip">
+        <string>The number of squares in the X and Y direction of the grid</string>
+       </property>
        <property name="suffix">
-        <string> lines</string>
+        <string> squares</string>
        </property>
        <property name="minimum">
         <number>1</number>
@@ -223,9 +239,7 @@ will be moved to the center of the view</string>
     <item row="4" column="0">
       <widget class="QLabel" name="label_6">
        <property name="toolTip">
-        <string>The distance at which a point can be snapped to
-when approaching the mouse. You can also change this
-value by using the [ and ] keys while drawing</string>
+        <string>The distance at which a point can be snapped to</string>
        </property>
        <property name="text">
         <string>Snapping radius</string>
@@ -235,9 +249,10 @@ value by using the [ and ] keys while drawing</string>
      <item row="4" column="1">
       <widget class="QSpinBox" name="fieldSnapRadius">
        <property name="toolTip">
-        <string>The distance at which a point can be snapped to
-when approaching the mouse. You can also change this
-value by using the [ and ] keys while drawing</string>
+        <string>The distance at which a point can be snapped to</string>
+       </property>
+       <property name="suffix">
+        <string> px</string>
        </property>
       </widget>
      </item>
diff --git a/src/Mod/Draft/Resources/ui/preferences-draftsnap.ui b/src/Mod/Draft/Resources/ui/preferences-draftsnap.ui
index 5d0d5df56a..bd8f771208 100644
--- a/src/Mod/Draft/Resources/ui/preferences-draftsnap.ui
+++ b/src/Mod/Draft/Resources/ui/preferences-draftsnap.ui
@@ -130,7 +130,7 @@ if they match the X, Y or Z axis of the global coordinate system</string>
       <item row="5" column="0">
        <widget class="QLabel" name="label_gridEvery">
         <property name="text">
-         <string>Main lines every</string>
+         <string>Major lines every</string>
         </property>
        </widget>
       </item>
@@ -143,8 +143,11 @@ if they match the X, Y or Z axis of the global coordinate system</string>
          </size>
         </property>
         <property name="toolTip">
-         <string>The number of squares between main grid lines.
-These lines are thicker than normal grid lines.</string>
+         <string>The number of squares between major grid lines.
+Major grid lines are thicker than minor grid lines.</string>
+        </property>
+        <property name="suffix">
+         <string> squares</string>
         </property>
         <property name="value">
          <number>10</number>
@@ -212,10 +215,10 @@ These lines are thicker than normal grid lines.</string>
       <item row="7" column="1">
        <widget class="Gui::PrefSpinBox" name="spinBox_gridSize">
         <property name="toolTip">
-         <string>The number of horizontal and vertical lines in the grid</string>
+         <string>The number of squares in the X and Y direction of the grid</string>
         </property>
         <property name="suffix">
-         <string> lines</string>
+         <string> squares</string>
         </property>
         <property name="maximum">
          <number>9999</number>