[Commits] [wesnoth/wesnoth] eb9fe5: Fix bug #22650: nontranslatable strings displayed ...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/wesnoth/wesnoth
  Commit: eb9fe515f0314e88d673ade2e1b3948e3cc9596a
      https://github.com/wesnoth/wesnoth/commit/eb9fe515f0314e88d673ade2e1b3948e3cc9596a
  Author: LovCAPONE <lweche159 at gmail.com>
  Date:   2014-09-26 (Fri, 26 Sep 2014)

  Changed paths:
    M changelog
    M src/reports.cpp

  Log Message:
  -----------
  Fix bug #22650: nontranslatable strings displayed in tooltips for terrain icons

The string for the tooltip of the terrain icon was the
underlying terrain id (same string as the one used to
retreive the image). "gamemap::get_terrain_string"
method is used as string for the tooltip in order to have
a correct translatable string.


  Commit: cf32ce74a9a15e405ed84982e7abc43699403331
      https://github.com/wesnoth/wesnoth/commit/cf32ce74a9a15e405ed84982e7abc43699403331
  Author: Ignacio R. Morelle <shadowm at wesnoth.org>
  Date:   2014-10-03 (Fri, 03 Oct 2014)

  Changed paths:
    M changelog
    M src/reports.cpp

  Log Message:
  -----------
  Merge branch 'NontransStrTooltipTerrainIcon' of https://github.com/LovCAPONE/wesnoth into LovCAPONE-NontransStrTooltipTerrainIcon

Conflicts:
	changelog


  Commit: d5de2bf7ba622ab837b09d153d25d488fe406b57
      https://github.com/wesnoth/wesnoth/commit/d5de2bf7ba622ab837b09d153d25d488fe406b57
  Author: Ignacio R. Morelle <shadowm at wesnoth.org>
  Date:   2014-10-03 (Fri, 03 Oct 2014)

  Changed paths:
    M changelog
    M src/reports.cpp

  Log Message:
  -----------
  Merge branch 'LovCAPONE-NontransStrTooltipTerrainIcon'


Compare: https://github.com/wesnoth/wesnoth/compare/54f149150e1b...d5de2bf7ba62