From 9ed4f330488342834e0301d3d50e223dcf889045 Mon Sep 17 00:00:00 2001
From: declan-millar <declan.millar@cern.ch>
Date: Mon, 21 May 2018 19:10:24 +0100
Subject: [PATCH] Replace spelling: soulgem -> soul gem

---
 apps/launcher/advancedpage.cpp | 4 ++--
 apps/openmw/mwclass/misc.cpp   | 2 +-
 files/settings-default.cfg     | 4 ++--
 files/ui/advancedpage.ui       | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/launcher/advancedpage.cpp b/apps/launcher/advancedpage.cpp
index dcf376362..9ae83419d 100644
--- a/apps/launcher/advancedpage.cpp
+++ b/apps/launcher/advancedpage.cpp
@@ -23,7 +23,7 @@ bool Launcher::AdvancedPage::loadSettings()
     loadSettingBool(showEnchantChanceCheckBox, "show enchant chance", "Game");
     loadSettingBool(showMeleeInfoCheckBox, "show melee info", "Game");
     loadSettingBool(showProjectileDamageCheckBox, "show projectile damage", "Game");
-    loadSettingBool(rebalanceSoulgemValuesCheckBox, "rebalance soulgem values", "Game");
+    loadSettingBool(rebalanceSoulGemValuesCheckBox, "rebalance soul gem values", "Game");
 
     // Expected values are (0, 1, 2, 3)
     int showOwnedIndex = mEngineSettings.getInt("show owned", "Game");
@@ -62,7 +62,7 @@ void Launcher::AdvancedPage::saveSettings()
     saveSettingBool(showEnchantChanceCheckBox, "show enchant chance", "Game");
     saveSettingBool(showMeleeInfoCheckBox, "show melee info", "Game");
     saveSettingBool(showProjectileDamageCheckBox, "show projectile damage", "Game");
-    saveSettingBool(rebalanceSoulgemValuesCheckBox, "rebalance soulgem values", "Game");
+    saveSettingBool(rebalanceSoulGemValuesCheckBox, "rebalance soul gem values", "Game");
 
     int showOwnedCurrentIndex = showOwnedComboBox->currentIndex();
     if (showOwnedCurrentIndex != mEngineSettings.getInt("show owned", "Game"))
diff --git a/apps/openmw/mwclass/misc.cpp b/apps/openmw/mwclass/misc.cpp
index c7e0796d5..091bb3120 100644
--- a/apps/openmw/mwclass/misc.cpp
+++ b/apps/openmw/mwclass/misc.cpp
@@ -88,7 +88,7 @@ namespace MWClass
             if (creature)
             {
                 int soul = creature->mData.mSoul;
-                if (Settings::Manager::getBool("rebalance soulgem values", "Game"))
+                if (Settings::Manager::getBool("rebalance soul gem values", "Game"))
                 {
                     // use soulgem value rebalance formula from morrowind code patch 
                     float soulValue = 0.0001 * pow(soul, 3) + 2 * soul;
diff --git a/files/settings-default.cfg b/files/settings-default.cfg
index a2524ff17..b10b91eb1 100644
--- a/files/settings-default.cfg
+++ b/files/settings-default.cfg
@@ -216,8 +216,8 @@ followers attack on sight = false
 # Can loot non-fighting actors during death animation
 can loot during death animation = true
 
-# Makes the value of filled soulgems dependent only on soul magnitude (with formula from the Morrowind Code Patch)
-rebalance soulgem values = false
+# Makes the value of filled soul gems dependent only on soul magnitude (with formula from the Morrowind Code Patch)
+rebalance soul gem values = false
 
 [General]
 
diff --git a/files/ui/advancedpage.ui b/files/ui/advancedpage.ui
index 28d0f0543..f436b4db3 100644
--- a/files/ui/advancedpage.ui
+++ b/files/ui/advancedpage.ui
@@ -110,12 +110,12 @@
            </widget>
           </item>
           <item>
-           <widget class="QCheckBox" name="rebalanceSoulgemValuesCheckBox">
+           <widget class="QCheckBox" name="rebalanceSoulGemValuesCheckBox">
             <property name="toolTip">
-             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If this setting is true, the value of filled soulgems is dependent only on soul magnitude.&lt;/p&gt;&lt;p&gt;The default value is false.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+             <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If this setting is true, the value of filled soul gems is dependent only on soul magnitude.&lt;/p&gt;&lt;p&gt;The default value is false.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
             </property>
             <property name="text">
-             <string>Rebalance soulgem values</string>
+             <string>Rebalance soul gem values</string>
             </property>
            </widget>
           </item>