That comma wasn't supposed to be replaced with a period, and I didn't
notice the mistake before pushing the commit.
[ci skip]
(cherry-picked from commit 20bfb35bdda3dca06a9e997812d50bea0e24f341)
The tool that generates .po files splits lines in order to limit line
length, and pofix can't track split strings. Thus, pofix search rules need
to be shorter so that pofix finds the affected strings.
I also moved the replacements to the right text domains, placed wesnoth-l
to the right spot, and removed the "Asheviere is the Queen of Wesnoth"
replacement because it isn't pofixable. (The second part of the string
becomes just "Queen of Wesnoth." and "queen of Wesnoth." with lowercase Q
is used legitimately elsewhere.)
[ci skip]
(cherry-picked from commit 3df91c9fc126ac3fd70ab9c0ea9e97eb3d008b33)
* bugfix: https://github.com/wesnoth/wesnoth/issues/3469
* wmlxgettext: removed a debug comment forgotten on the previous bugfix
(cherry-picked from commit 4b79c263d357fb23e4531ad8fbd37b2bfbc85c55)
Otherwise people will keep complaining that it doesn't reflect the
latest 1.14 version since the original number was valid for 1.14.0 and
1.14.4.
[ci skip]
(cherry-picked from commit c589e39098614b2180b4043db6b9faa71afe6c84)
Also fixes a mistake from the 1.14.3 rules that caused "xxx MiB" to be
replaced with "xxx MB MiB" for all platforms. Oops. Nobody noticed
anyway (?).
[ci skip]
(cherry-picked from commit 12a3b973b9f357d0b1685df5b29fbcea0fefc7be)
This avoids one of the two files which are currently causing macOS SCons
builds to fail in the master branch.
(cherry-picked from commit 8dc60ae98fa472d7a5fa124002f7b1a2f552e0f3)
NOTE: the rule for the "true orc" case does not work. The string in
question will just have to be fuzzied.
[ci skip]
(cherry-picked from commit 72948787450d2ba273b9a901455ae02ccf1cce5e)
This reverts commit 4d5a3de4e63ebaac4a853b0f724d1d342d451dd0.
Restoring correction at @Vultraz's request.
[ci skip]
(cherry-picked from commit e161d59536452ca78897d92cb2eaae2099228075)
Scons OpenGL/GLEW test taken mostly verbatim from 3e2eba22a96cb2c6c69ee5109059b806f22a372f
(cherry-picked from commit 5e36a90039ddde3625690ace5259198e1932a7f8)
Two of these strings were not a fix, just a removed string, so no need for pofix.
The other was not specific enough for pofix to match unambiguously.
Also, someone forgot a comma somewhere, causing a syntax error.
(cherry-picked from commit 3768dc687d9f8a709243912f7388f2917d20e2db)
This reverts commit fb866c6d1310d8398f0f481a8ab16b1606286cdd.
This fix is specific to master and translators aren't supposed to be
touching master at this time. There is no point to its existence.
(cherry-picked from commit 4d5a3de4e63ebaac4a853b0f724d1d342d451dd0)
Travis now also makes use of this to set the optimization level for the -O0 builds, rather than extra_flags_*. This additionally fixes an issue where using -O0 in the release build with LTO resulted in the individual *.o files being compiled with -O0, but LTO then still linked with release's default -O3.
(cherry-picked from commit 63ff641662d4192401a49f9a002d7872000a3f02)
Though given 00d87f8fe4078ffd84fcdc0d73fcc2104efef1e7 I would say this is better than nothing.
(cherry-picked from commit 33ad6be326c234b173d680ce34589464f88f8418)
The intent behind this is that, if there most likely wouldn't be enough time left to complete the unit tests anyway, then just fail the job after compiling so the cache can be updated. Otherwise, if the unit tests were run and the job timed out, then the cache would not be uploaded at all and the next time the job ran it would be from scratch again.
(cherry-picked from commit 5d970e40cd43a23a8d1b8198e962f198fc9282b0)
Note: UBSan at least does seem to take a fairly significant amount of extra time to compile and run the WML tests with.
(cherry-picked from commit 92f74c39f6aedc10bd04f1cf6dc9144fb35e3a19)
This allows having multiple Dockerfile-base-* files without also needing to add a separate Dockerfile-travis-* file due to the FROM line changing.
(cherry-picked from commit 3f67c2fbf051aa9e322defb66c782477cd53b8bd)
This makes it simpler in the future to have branches that have dependencies that are different from master, rather than having a single image with all necessary dependencies installed, which may at some point end up not being possible to do.
(cherry-picked from commit 1bb5fdf2830515d33793c52f298d305bd12b5a60)
