Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/gci18nfixes into lp:widelands

2014-03-01 Thread GunChleoc
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 :) --

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/gci18nfixes into lp:widelands

2014-03-01 Thread GunChleoc
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