Revert string changes in SotA for 1.14 RC 3 - gold

This reverts the following commits: * "SotA S2: fixed inconsistency between unit name and dialog (fixes #2844)" - commit ab9f29a * "SotA S8: fixed inconsistent Ghost name (fixes #2846)" - commit fc6c3ac
wesnoth · Apr 15, 2018 · f843a0e · f843a0e
1 parent e863f79
commit f843a0e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,7 +1,5 @@
 ## Version 1.13.13+dev
  ### Campaigns
-   * Secrets of the Ancients
-     * Fixed several inconsistently spelled names.
    * The Hammer of Thursagan
      * S12 Fixed enemies from ai6 (south-east lich) going to the book (spider)
        room

diff --git a/data/campaigns/Secrets_of_the_Ancients/scenarios/02_Dark_Business.cfg b/data/campaigns/Secrets_of_the_Ancients/scenarios/02_Dark_Business.cfg
@@ -276,7 +276,7 @@ of Healing"
             image=items/gravestone1.png
         [/item]
 
-        {PLACE_GUARD 10 11 (Spearman) RESILIENT QUICK "Gwyllin" (_"Gwyllin")}
+        {PLACE_GUARD 10 11 (Spearman) RESILIENT QUICK "Gwillyn" (_"Gwillyn")}
         {PLACE_GUARD 10 10 (Spearman) QUICK RESILIENT "Veomyr" (_"Veomyr")}
         {PLACE_GUARD 8 10 (Spearman) STRONG RESILIENT "Syrillin" (_"Syrillin")}
         {PLACE_GUARD 7 10 (Bowman) STRONG INTELLIGENT "Glant" (_"Glant")}
@@ -293,7 +293,7 @@ of Healing"
 #endif
 
         # We don't want the guard on the village to move from there:
-        {FREEZE_UNIT Gwyllin}
+        {FREEZE_UNIT Gwillyn}
 
         [store_locations]
             terrain=*^Gryv

diff --git a/data/campaigns/Secrets_of_the_Ancients/scenarios/08_Carcyn.cfg b/data/campaigns/Secrets_of_the_Ancients/scenarios/08_Carcyn.cfg
@@ -89,7 +89,7 @@ After several days of travel, he approached the frontier town of Carcyn."
         [unit]
             type=Shadow
             side=1
-            name= _ "Vash-Gorn"
+            name= _ "Vash Gorn"
         [/unit]
         [unit]
             type=Ghost