DW: change mermen to merfolk/mer

data/campaigns/Dead_Water/scenarios/01_Invasion.cfg

@@ -52,12 +52,12 @@
 
         [part]
             {DW_BIGMAP}
-            story= _ "Under the cover of darkness, the mermen slid into the bay, intending to launch a surprise attack at dawn. But the orcs were prepared for this, and had hastily devised a surprise of their own. Ships at the mouth of the bay that had seemed but derelict hulks disgorged hordes of orcs. More of them poured forth from the city. The merfolk were trapped, and found themselves vastly outnumbered."
+            story= _ "Under the cover of darkness, the merfolk slid into the bay, intending to launch a surprise attack at dawn. But the orcs were prepared for this, and had hastily devised a surprise of their own. Ships at the mouth of the bay that had seemed but derelict hulks disgorged hordes of orcs. More of them poured forth from the city. The merfolk were trapped, and found themselves vastly outnumbered."
         [/part]
 
         [part]
             {DW_BIGMAP}
-            story= _ "Kai Laudiss’s army fought fiercely, slaying five orcs for every warrior they lost. The kai himself fought with reckless abandon; foes fell with each swing of his great mace. The orcs discovered that trapped mermen were tougher than they had imagined, and found themselves fleeing into the forest to escape their vengeful spears. As the kai had intended, it was a defeat the orcs would not soon forget; but the cost was heavy. Kai Laudiss was felled by a poisoned orcish dart, and the greater part of his army was destroyed. When the remaining soldiers returned to Jotha, Krellis, the young son of Kai Laudiss, learned that he had become kai."
+            story= _ "Kai Laudiss’s army fought fiercely, slaying five orcs for every warrior they lost. The kai himself fought with reckless abandon; foes fell with each swing of his great mace. The orcs discovered that trapped mer were tougher than they had imagined, and found themselves fleeing into the forest to escape their vengeful spears. As the kai had intended, it was a defeat the orcs would not soon forget; but the cost was heavy. Kai Laudiss was felled by a poisoned orcish dart, and the greater part of his army was destroyed. When the remaining soldiers returned to Jotha, Krellis, the young son of Kai Laudiss, learned that he had become kai."
         [/part]
 
         [part]

data/campaigns/Dead_Water/scenarios/05_Tirigaz.cfg

@@ -14,7 +14,7 @@
 # necessary, but he helps someone level up, and he has a fair bit of
 # gold. The next level is much easier with lots of gold.
 
-# A lot of the code here is to activate the orc side if the mermen do
+# A lot of the code here is to activate the orc side if the merfolk do
 # anything wrong, and keep it passive until then. There is also some
 # animation of the orcs coming out to tear down the keep after the
 # first turn.
@@ -158,7 +158,7 @@
             [/goal]
             village_value=0
             # Even though they are less attractive targets, the ghosts
-            # will attack the orcs if they are in range and the mermen
+            # will attack the orcs if they are in range and the merfolk
             # aren't. We will keep the ghosts from attacking the orcs
             # by telling them to avoid the hexes around the guardians.
             [avoid]
@@ -447,9 +447,9 @@
         name=turn 2
 
         # If, at the end of turn 2, (actually, beginning of turn 3)
-        # the mermen are still ashore, the orcs attack.  The event
+        # the merfolk are still ashore, the orcs attack.  The event
         # doesn't need to check for the turn being 3, because that's
-        # the only way the mermen could be ashore with the orcs still
+        # the only way the merfolk could be ashore with the orcs still
         # passive.
         [event]
             name=side turn
@@ -485,7 +485,7 @@
         [/event]
     [/event]
 
-    # After turn 3, if the mermen touch land, the orcs attack.
+    # After turn 3, if the merfolk touch land, the orcs attack.
     [event]
         name=turn 3
 
@@ -557,7 +557,7 @@
         [/if]
     [/event]
 
-    # If a mermen attacks an orc, the orcs can attack back:
+    # If a merfolk attacks an orc, the orcs can attack back:
     [event]
         name=attack_end
         first_time_only=yes
@@ -590,7 +590,7 @@
         [/if]
     [/event]
 
-    # Remove the orcs movement points each turn if the mermen have
+    # Remove the orcs movement points each turn if the merfolk have
     # stayed in the water.
     [event]
         name=turn refresh

data/campaigns/Dead_Water/scenarios/10_The_Flaming_Sword.cfg

@@ -305,7 +305,7 @@
         [/message]
         [message]
             speaker=Mal-Govon
-            message= _ "What I remember, you old fool, is you leaving behind the smoldering bodies of the orcs you had hired to steal my sword. Now, you bring mermen. When they lay expiring like gasping fish on the shore, will you not flee again? Do not speak to <i>me</i> of fear."
+            message= _ "What I remember, you old fool, is you leaving behind the smoldering bodies of the orcs you had hired to steal my sword. Now, you bring mer to do your dirty work. When they lay expiring like gasping fish on the shore, will you not flee again? Do not speak to <i>me</i> of fear."
         [/message]
         [message]
             speaker=Kai Krellis
@@ -1146,7 +1146,7 @@
 
         [message]
             speaker=Caladon
-            message= _ "CURSE you mermen!"
+            message= _ "CURSE you merfolk!"
         [/message]
 
         {VARIABLE Caladon_leader_status dead}

data/campaigns/Dead_Water/scenarios/12_Revenge.cfg

@@ -504,6 +504,7 @@
 
         [message]
             speaker=Mel Daveth
+            # usage of mermen here is deliberate
             message= _ "The mermen...they came back! Bring back the search parties! Call back the hordes!"
         [/message]
 

data/campaigns/Dead_Water/units/Child_King.cfg

@@ -14,7 +14,7 @@
     advances_to=Merman Young King
     cost=8
     usage=fighter
-    description= _ "When a merman king dies, the next in line becomes king however young he is. It is his job to lead his troops in combat if necessary. Good soldiers will do as they are told, but a very young king will get little real respect."
+    description= _ "When a mer king dies, the next in line becomes king however young he is. It is his job to lead his troops in combat if necessary. Good soldiers will do as they are told, but a very young king will get little real respect."
     die_sound=mermen-die.ogg
     {DEFENSE_ANIM "units/merfolk/child_king.png" "units/merfolk/child_king.png" mermen-hit.wav }
     [attack]