Merfolk: change mer to merfolk

data/core/units/merfolk/Entangler.cfg

@@ -18,7 +18,7 @@
     usage=mixed fighter
     description= _ "Merfolk tend to use a combination of both nets and clubs in fishing; nets to collect the fish, and clubs to finish the kill. Both of these tools have seen adaptation for warfare, and are valuable enough that auxiliaries who specialize in using them are deliberately brought to battle.
 
-Merfolk often find themselves in a standoff with land-based enemies; the mer are too strong in the water, and are too weak to make any offense on land. Nets are a key bit of leverage; without nets, merfolk cannot give any effective chase over land, and are at a great disadvantage in hand-to-hand combat."+{SPECIAL_NOTES}+{SPECIAL_NOTES_SLOW}
+Merfolk often find themselves in a standoff with land-based enemies; the merfolk are too strong in the water, and are too weak to make any offense on land. Nets are a key bit of leverage; without nets, merfolk cannot give any effective chase over land, and are at a great disadvantage in hand-to-hand combat."+{SPECIAL_NOTES}+{SPECIAL_NOTES_SLOW}
     {DEFENSE_ANIM "units/merfolk/entangler-defend2.png" "units/merfolk/entangler-defend1.png" mermen-hit.wav }
     die_sound=mermen-die.ogg
     [attack]

data/core/units/merfolk/Hunter.cfg

@@ -15,7 +15,7 @@
     advances_to=Merman Spearman,Merman Netcaster
     cost=15
     usage=mixed fighter
-    description= _ "The skills employed by merfolk in spear-fishing are easily translated into warfare, especially against those who are not at home in the water. In times of need, many mer of that occupation will volunteer to swell the ranks of their military."
+    description= _ "The skills employed by merfolk in spear-fishing are easily translated into warfare, especially against those who are not at home in the water. In times of need, many merfolk of that occupation will volunteer to swell the ranks of their military."
     die_sound=mermen-die.ogg
     {DEFENSE_ANIM_RANGE "units/merfolk/hunter.png" "units/merfolk/hunter.png" mermen-hit.wav melee}
     {DEFENSE_ANIM_RANGE "units/merfolk/hunter-javelin-defend-2.png" "units/merfolk/hunter-javelin-defend-1.png" mermen-hit.wav ranged}

data/core/units/merfolk/Javelineer.cfg

@@ -15,7 +15,7 @@
     {AMLA_DEFAULT}
     cost=48
     usage=mixed fighter
-    description= _ "Those mer who master the art of the javelin can become nearly as effective as an archer — though the heft of their weapons impedes their range, the impact of one is considerably greater. In the water, the mobility of the merfolk more than makes up for this when facing foes who cannot swim."
+    description= _ "Those merfolk who master the art of the javelin can become nearly as effective as an archer — though the heft of their weapons impedes their range, the impact of one is considerably greater. In the water, the mobility of the merfolk more than makes up for this when facing foes who cannot swim."
     die_sound=mermen-die.ogg
     {DEFENSE_ANIM "units/merfolk/javelineer-defend2.png" "units/merfolk/javelineer-defend1.png" mermen-hit.wav }
     [attack]

data/core/units/merfolk/Spearman.cfg

@@ -14,7 +14,7 @@
     advances_to=Merman Javelineer
     cost=27
     usage=mixed fighter
-    description= _ "Archery is little favored by the mer, for whom use of javelins serves a similar function. Though thrown javelins are of little use under the water, they are extremely effective at the surface, where their weight allows them to plunge several feet below the water while retaining enough momentum to wreak damage. They are also useful in melee, even deep under the surface, which is something that certainly cannot be said of arrows."
+    description= _ "Archery is little favored by the merfolk, for whom use of javelins serves a similar function. Though thrown javelins are of little use under the water, they are extremely effective at the surface, where their weight allows them to plunge several feet below the water while retaining enough momentum to wreak damage. They are also useful in melee, even deep under the surface, which is something that certainly cannot be said of arrows."
     die_sound=mermen-die.ogg
     {DEFENSE_ANIM "units/merfolk/spearman-defend2.png" "units/merfolk/spearman-defend1.png" mermen-hit.wav }
     [attack]