Update core/about.cfg to use "merfolk" instead of "mermen" (part of #…

…2940)

(cherry-picked from commit fbc74bf)

data/core/about.cfg

@@ -356,7 +356,7 @@
     [/entry]
     [entry]
         name = "Kathrin Polikeit (Kitty)"
-        comment = "portrait director - focus on mages/necromancers, elvish, naga, merman, and troll unit trees"
+        comment = "portrait director - focus on mages/necromancers, elvish, naga, merfolk, and troll unit trees"
     [/entry]
     [entry]
         name = "Lari Nieminen (zookeeper)"
@@ -571,7 +571,7 @@
     [/entry]
     [entry]
         name = "Cernunnos"
-        comment = "merman villages"
+        comment = "merfolk villages"
     [/entry]
     [entry]
         name = "Charles Dang (vultraz)"
@@ -615,7 +615,7 @@
     [/entry]
     [entry]
         name = "Eric Butler (Erk)"
-        comment = "desert and merman villages"
+        comment = "desert and merfolk villages"
     [/entry]
     [entry]
         name = "Evan Crook (Flametrooper)"
@@ -1302,7 +1302,7 @@
     [/entry]
     [entry]
         name = "John Harvey (johndh)"
-        comment = "minor race descriptions; bats, goblins, mechanical, merman, monster, naga, ogre"
+        comment = "minor race descriptions; bats, goblins, mechanical, merfolk, monster, naga, ogre"
     [/entry]
     [entry]
         name = "Jonathan Combs (ScegfOd)"