[wesnoth-commits] [wesnoth/wesnoth] 321fdc: Workaround for the warning about conflicting files...

Steve Cotton noreply at github.com
Fri Jan 31 16:08:25 UTC 2020


  Branch: refs/heads/1.14
  Home:   https://github.com/wesnoth/wesnoth
  Commit: 321fdce6d9ec10ce3a0a53ccfe55073f4748fc86
      https://github.com/wesnoth/wesnoth/commit/321fdce6d9ec10ce3a0a53ccfe55073f4748fc86
  Author: Steve Cotton <steve at octalot.co.uk>
  Date:   2020-01-31 (Fri, 31 Jan 2020)

  Changed paths:
    M src/picture.cpp

  Log Message:
  -----------
  Workaround for the warning about conflicting files called "l10n-track"

I think the correct fix is to simply delete the localized_file_uptodate
function, however this commit is the minimal change to avoid the warning.

The functionality still works, which can be tested by:

1. set Wesnoth to French
2. note the logo on the title screen says "Bataille pour Wesnoth"
3. change l10n-track
    -ok        ¦images/misc/l10n/fr/logo.png¦  f13ab03e31b1aaeec3036ebfe049e78f  6e0af4f77ed425d62ae06ce7157a5b37f67c8f7
    +fuzzy        ¦images/misc/l10n/fr/logo.png¦  f13ab03e31b1aaeec3036ebfe049e78f  6e0af4f77ed425d62ae06ce7157a5b37f67c8f7
4. exit and re-launch Wesnoth (just pressing F5 does not work)
5. note the logo on the title screen is in English





More information about the Commits mailing list