Add and wire new Merman Fighter/Warrior portrait,

...update changelogs, portrait credits.

changelog

@@ -4,7 +4,7 @@ Version 1.7.2+svn:
      * Fixed bug #13978: UtBS: "stun" ability doesn't modify enemy ZoC
  * Graphics:
    * New portrait for the Duelist, Mermaid Enchantress/Siren,
-     Priestess/Diviner.
+     Priestess/Diviner, Merman Fighter/Warrior.
    * New unit graphics and animations for the Troll Hero.
  * Language and i18n:
    * Updated translations: Dutch, Estonian, French, Hungarian

data/core/images/portraits/ARTISTS

@@ -44,6 +44,7 @@ Goblins
 Merfolk
     Enchantress
     Priestess
+    Fighter
 Others:
     Troll Whelp
     Gryphon

data/core/units/merfolk/Fighter.cfg

@@ -20,6 +20,18 @@
     description= _ "Skilled creatures of the sea, Mermen are powerful and quick in any watery environment, but lose most of their mobility on land."
     die_sound=mermen-die.ogg
     {DEFENSE_ANIM "units/merfolk/fighter.png" "units/merfolk/fighter.png" mermen-hit.wav }
+    [portrait]
+        size=400
+        side="left"
+        mirror="false"
+        image="portraits/merfolk/transparent/fighter.png"
+    [/portrait]
+    [portrait]
+        size=400
+        side="right"
+        mirror="true"
+        image="portraits/merfolk/transparent/fighter.png"
+    [/portrait]
     [attack]
         name=trident
         description=_"trident"

data/core/units/merfolk/Warrior.cfg

@@ -19,6 +19,18 @@
     description= _ "The Mermen Warriors form the core of the mermen armies. Wielding powerful tridents, they are a bane to any who dare enter their waters."
     die_sound=mermen-die.ogg
     {DEFENSE_ANIM "units/merfolk/warrior.png" "units/merfolk/warrior.png" mermen-hit.wav }
+    [portrait]
+        size=400
+        side="left"
+        mirror="false"
+        image="portraits/merfolk/transparent/fighter.png"
+    [/portrait]
+    [portrait]
+        size=400
+        side="right"
+        mirror="true"
+        image="portraits/merfolk/transparent/fighter.png"
+    [/portrait]
     [attack]
         name=trident
         description=_"trident"

players_changelog

@@ -9,7 +9,7 @@ Version 1.7.2+svn:
 
   * Graphics
     * New portrait for the Duelist, Mermaid Enchantress/Siren,
-      Priestess/Diviner.
+      Priestess/Diviner, Merman Fighter/Warrior.
     * New unit graphics and animations for the Troll Hero.
 
   * Language and translations