[wesnoth-commits] [wesnoth/wesnoth] 328960: Change the plural race name for merfolk to Merfolk

[GitHub]

  Branch: refs/heads/1.14
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 32896078a00c9ffd0d88af9b7f6e34de60cd6355
      https://github.com/wesnoth/wesnoth/commit/32896078a00c9ffd0d88af9b7f6e34de60cd6355
  Author: Iris Morelle <shadowm at wesnoth.org>
  Date:   2018-05-02 (Wed, 02 May 2018)

  Changed paths:
    M data/core/units.cfg

  Log Message:
  -----------
  Change the plural race name for merfolk to Merfolk

See issue #2940.

[ci skip]


  Commit: bf41826aa724cc8852eea17d031a8248eee7e19e
      https://github.com/wesnoth/wesnoth/commit/bf41826aa724cc8852eea17d031a8248eee7e19e
  Author: Iris Morelle <shadowm at wesnoth.org>
  Date:   2018-05-02 (Wed, 02 May 2018)

  Changed paths:
    M changelog.md
    M data/core/terrain.cfg
    M data/core/units.cfg
    M data/core/units/merfolk/Priestess.cfg

  Log Message:
  -----------
  Replace a few instances of "mermen" with "merfolk" in core descriptions

These are only the ones were it's sufficiently unambiguous that the
description is referring to the merfolk race at whole. There are a few
instances I didn't touch were it's possible that the text refers
exclusively to mermen fighters (e.g. "the mermen armies").

See issue #2940.

[ci skip]


Compare: https://github.com/wesnoth/wesnoth/compare/d4818923b2a6...bf41826aa724
      **NOTE:** This service been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.