Sound like that is the reason then. I just tried and can't compile trunk either.
I decided to do a full manual diff, because the automated merge killed some of
my string changes. I'll do my best not to kill your bformat and ngettext Lua
functions :)
--
So did my best to merge trunk. All uncompiled and untested. Also, the .pot
catalogs etc. will need to be rebuilt.
--
https://code.launchpad.net/~widelands-dev/widelands/gci18nfixes/+merge/192288
Your team Widelands Developers is requested to review the proposed merge of
2 matches
Mail list logo