Merfolk: change references of mermen to merfolk/mer

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.
 
-Mermen 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, mermen can’t 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 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}
     {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 mermen in spear-fishing are easily translated into warfare, especially against those who are not at home in the water. In times of need, many mermen 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 mer 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 mermen 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 mermen more than makes up for this when facing foes who cannot swim."
+    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."
     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/Netcaster.cfg

@@ -15,7 +15,7 @@
     advances_to=Merman Entangler
     cost=27
     usage=mixed fighter
-    description= _ "Fishing, as practiced by mermen, is largely a matter of chasing schools of fish into waiting nets, where oar-like clubs are used to dispatch the prey. The improvisation of using these against soldiers proved very effective; most land-native creatures are already quite awkward when waist-deep in water, and getting caught in a net can render them nearly helpless.
+    description= _ "Fishing, as practiced by merfolk, is largely a matter of chasing schools of fish into waiting nets, where oar-like clubs are used to dispatch the prey. The improvisation of using these against soldiers proved very effective; most land-native creatures are already quite awkward when waist-deep in water, and getting caught in a net can render them nearly helpless.
 
 The effectiveness of this method led to the development of smaller, weighted nets, which could be cast through the air; these were useless for fishing, but were useful both in combat and in hunting game that came too close to shore. Clubs were used in combat with little or no adaptation from fishing, since they were already quite deadly."+{SPECIAL_NOTES}+{SPECIAL_NOTES_SLOW}
     {DEFENSE_ANIM "units/merfolk/netcaster-defend2.png" "units/merfolk/netcaster-defend1.png" mermen-hit.wav }

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 mermen, 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 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."
     die_sound=mermen-die.ogg
     {DEFENSE_ANIM "units/merfolk/spearman-defend2.png" "units/merfolk/spearman-defend1.png" mermen-hit.wav }
     [attack]

data/core/units/merfolk/Warrior.cfg

@@ -14,7 +14,7 @@
     advances_to=Merman Triton,Merman Hoplite
     cost=28
     usage=fighter
-    description= _ "The Mermen Warriors form the core of the mermen armies. They wield their tridents with a skill and diligence impressive even compared to the soldiers of other races, but doubly so considering the difficulties of fighting underwater, as any who try to match them in their homes can attest."
+    description= _ "Mermen Warriors form the core of merfolk armies. They wield their tridents with a skill and diligence impressive even compared to the soldiers of other races, but doubly so considering the difficulties of fighting underwater, as any who try to match them in their homes can attest."
     die_sound=mermen-die.ogg
     {DEFENSE_ANIM "units/merfolk/warrior-defend-2.png" "units/merfolk/warrior-defend-1.png" mermen-hit.wav }
     [attack]