From 49d53795a6e382385ca4eb5b37deb115efef7581 Mon Sep 17 00:00:00 2001 From: Steve Cotton Date: Thu, 31 May 2018 16:10:54 +0200 Subject: [PATCH] Update core/about.cfg to use "merfolk" instead of "mermen" (part of #2940) (cherry-picked from commit fbc74bf007258436a65926bf3e3edf9f7aa143f3) --- data/core/about.cfg | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/data/core/about.cfg b/data/core/about.cfg index 5f17f7131d4c..6d0227af6526 100644 --- a/data/core/about.cfg +++ b/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)"