added and wired merMAID sounds.

changelog

@@ -66,9 +66,10 @@ SVN trunk (1.1.1+svn):
      additional female-hit, hiss-die, hiss-hit, holy attack, 3 ghostly wails, 
      3 gryphon, miss, 2 orc-die, 3 skeleton, 2 troll hit&die, water blast,
      wolf hit&die, 4 dark magic, 2 lightning, 12 human hit&die, flame hit&miss
+     3 new merfolk hit&die
    * sound added to units: 
      * death sounds: all drakes, dwarves, orcs & goblins, all humans, monsters,
-       nagas, saurians, trolls, all skeletons, woses
+       merfolk, nagas, saurians, trolls, all skeletons, woses
      * lightbeam attacks, elves, gryphons, some ghost attacks
  * units
    * back in mainline: Orcish Leader, Orcish Ruler, Orcish Sovereign

data/units/Mermaid_Diviner.cfg

@@ -36,8 +36,8 @@
 	unit_description= _ "Mermaid Priestesses meet their calling with a fervor that leaves their human counterparts somewhat taken aback. This may have its roots in a legend they recite, telling of a nameless, shadowy horror which was once the bane of their people. Though little is told about it, it is clear that it was the power of the light which somehow defeated it, and made their people safe.
 
 Special Notes: the light cast by a diviner is magical in nature, and always has a high chance of hitting an opponent. This light does tremendous damage to the undead, and even does some to living creatures. Diviners are capable of healing units around them, and curing them of poison. They also have the power of Illumination, which increases the lighting level in the area adjacent to the mermaid."
-	get_hit_sound=mermen-hit.wav
-	die_sound=mermen-die.ogg
+	get_hit_sound=mermaid-hit.ogg
+	die_sound=mermaid-die.ogg
 	
 	[attack]
 		name=staff

data/units/Mermaid_Enchantress.cfg

@@ -25,8 +25,8 @@
 	unit_description= _ "Mermaids, like elves, have a powerful and native ability in magic, though theirs is considerably different. Those who master this ability are held in high regard, and their skill is used in a multitude of crafts, many of which are things that humanity would never dream of. The obvious use in war is forbidden against their own race - this power is the greater part of what protects their people from the monsters that wander out of the abyss.
 
 Special Notes: The blasts of water conjured by mermaids are magical in nature, and always have a high chance of hitting their opponents."
-	get_hit_sound=mermen-hit.wav
-	die_sound=mermen-die.ogg
+	get_hit_sound=mermaid-hit.ogg
+	die_sound=mermaid-die.ogg
 	[attack]
 		name=staff
 		type=impact

data/units/Mermaid_Initiate.cfg

@@ -27,8 +27,8 @@
 Despite their frailty, this makes them quite formidable in combat, as they can call upon the very water about them to smite their enemies.
 
 Special Notes: the blasts of water conjured by mermaids are magical in nature, and always have a high chance of hitting their opponents."
-	get_hit_sound=mermen-hit.wav
-	die_sound=mermen-die.ogg
+	get_hit_sound=mermaid-hit.ogg
+	die_sound=mermaid-die.ogg
 	[attack]
 		name=staff
 		type=impact

data/units/Mermaid_Priestess.cfg

@@ -30,8 +30,8 @@
 	unit_description= _ "Mermen share the creed that much of humanity follows, though for cultural reasons, the upholding of this is left to the mermaids, who are more intellectually inclined. It is they who dedicate themselves to the ideal of bringing peace and life to the world, and they who study the arts of battling sickness and injury, maladies which they share in no small part with humanity. Their diligence and piety also grant them certain spiritual powers, allowing them to guard their people against the unworldly.
 
 Special Notes: the light cast by a priestess is magical in nature, and always has a high chance of hitting an opponent. This light does tremendous damage to the undead, and even does some to living creatures. Priestesses are capable of healing units around them, and curing them of poison."
-	get_hit_sound=mermen-hit.wav
-	die_sound=mermen-die.ogg
+	get_hit_sound=mermaid-hit.ogg
+	die_sound=mermaid-die.ogg
 	[attack]
 		name=staff
 		type=impact

data/units/Mermaid_Siren.cfg

@@ -28,8 +28,8 @@
 The myriad applications of this rarely occur to land dwellers, who simply regard it with wonder.
 
 Special Notes: the attacks of a siren are magical in nature, and always have a high chance of hitting their opponents."
-	get_hit_sound=mermen-hit.wav
-	die_sound=mermen-die.ogg
+	get_hit_sound=mermaid-hit.ogg
+	die_sound=mermaid-die.ogg
 	
 	[attack]
 #note - this "naia" is deliberate, it is not a typo, it is not supposed to be "naiad".