[wesnoth-commits] [wesnoth/wesnoth] 2de931: wc: Fix mapgen-related strings being in the wrong ...

[Iris Morelle]

  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 2de931cfa0e4d70b868ad62eabd6749ba411c84e
      https://github.com/wesnoth/wesnoth/commit/2de931cfa0e4d70b868ad62eabd6749ba411c84e
  Author: Iris Morelle <shadowm at wesnoth.org>
  Date:   2021-03-12 (Fri, 12 Mar 2021)

  Changed paths:
    M data/campaigns/World_Conquest/lua/map/main.lua
    M data/campaigns/World_Conquest/lua/map/postgeneration/1A_Start.lua
    M data/campaigns/World_Conquest/lua/map/postgeneration/2A_Springs.lua
    M data/campaigns/World_Conquest/lua/map/postgeneration/2B_Lakes.lua
    M data/campaigns/World_Conquest/lua/map/postgeneration/2C_Glaciers.lua
    M data/campaigns/World_Conquest/lua/map/postgeneration/2D_Provinces.lua
    M data/campaigns/World_Conquest/lua/map/postgeneration/2E_Paradise.lua
    M data/campaigns/World_Conquest/lua/map/postgeneration/2F_Clayey.lua
    M data/campaigns/World_Conquest/lua/map/postgeneration/3A_Savannah.lua
    M data/campaigns/World_Conquest/lua/map/postgeneration/3B_Wreck.lua
    M data/campaigns/World_Conquest/lua/map/postgeneration/3C_Delta.lua
    M data/campaigns/World_Conquest/lua/map/postgeneration/3D_Sulfurous.lua
    M data/campaigns/World_Conquest/lua/map/postgeneration/3E_Coral.lua
    M data/campaigns/World_Conquest/lua/map/postgeneration/3F_Wetland.lua
    M data/campaigns/World_Conquest/lua/map/postgeneration/4A_Thermal.lua
    M data/campaigns/World_Conquest/lua/map/postgeneration/4B_Volcanic.lua
    M data/campaigns/World_Conquest/lua/map/postgeneration/4C_Mines.lua
    M data/campaigns/World_Conquest/lua/map/postgeneration/4D_Podzol.lua
    M data/campaigns/World_Conquest/lua/map/postgeneration/4E_Wicked.lua
    M data/campaigns/World_Conquest/lua/map/postgeneration/4F_Wild.lua
    M data/campaigns/World_Conquest/lua/map/postgeneration/6A_Rural.lua
    M data/campaigns/World_Conquest/lua/map/postgeneration/6B_Maritime.lua
    M data/campaigns/World_Conquest/lua/map/postgeneration/6C_Industrial.lua
    M data/campaigns/World_Conquest/lua/map/postgeneration/6D_Feudal.lua

  Log Message:
  -----------
  wc: Fix mapgen-related strings being in the wrong textdomain

The _ locals are there to ensure that if _ is overridden anywhere else
in the enclosing scope (which I haven't properly determined *where* it
is yet) it gets overridden again with the right textdomain object.
It *does* tell wmlxgettext what the correct textdomain is without using
the `-- #textdomain` hack anyway, so might as well just do it this way
regardless of the global-looking _ in map/main.lua.

CC #5311


  Commit: 3d7842c43e250223748e11d5057a6ebb28c162e2
      https://github.com/wesnoth/wesnoth/commit/3d7842c43e250223748e11d5057a6ebb28c162e2
  Author: Iris Morelle <shadowm at wesnoth.org>
  Date:   2021-03-12 (Fri, 12 Mar 2021)

  Changed paths:
    M data/gui/window/mp_faction_select.cfg

  Log Message:
  -----------
  gui2/mp_faction_select: Use a disambiguator for the Random gender option

You just know sooner or later someone's going to try to use "random" for
something other than gender and some translations will end up looking
wrong as a result.


  Commit: e954c7e38947d98e817a00f83eb38aeb44b6a7a9
      https://github.com/wesnoth/wesnoth/commit/e954c7e38947d98e817a00f83eb38aeb44b6a7a9
  Author: Iris Morelle <shadowm at wesnoth.org>
  Date:   2021-03-12 (Fri, 12 Mar 2021)

  Changed paths:
    M data/campaigns/World_Conquest/lua/map/scenario_utils/side_definitions.lua
    M data/campaigns/World_Conquest/resources/data/artifacts.cfg
    M data/campaigns/World_Conquest/resources/strings/mainline.cfg

  Log Message:
  -----------
  wc: Fix strings wrongly assumed to exist in the wesnoth textdomain

This does not fix #5114 or #5526, but it does fix #5311.


Compare: https://github.com/wesnoth/wesnoth/compare/edef0c5f3303...e954c7e38947