Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/gci18nfixes into lp:widelands
We merged the i18n branch - so this merge request is superseeded by this merge and therefore rejected. -- https://code.launchpad.net/~widelands-dev/widelands/gci18nfixes/+merge/192288 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/gci18nfixes into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/gci18nfixes into lp:widelands
just fyi: We did some more hacking on properly merging this branch yesterday. The result can be found in lp:~widelands-dev/widelands/i18n - that is the branch that we are going to merge on wednesday. This merge request is therefore kinda outdated. -- https://code.launchpad.net/~widelands-dev/widelands/gci18nfixes/+merge/192288 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/gci18nfixes into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/gci18nfixes into lp:widelands
Do you have any ideas how to get rid of the added/removed/deleted conflicts? I did a full manual merge and now bzr wants to track something somewhere and is generating these conflicts. I tried saving my work, doing a bzr merge and then copying my files over, but then I get the same conflicts directly in the branch. I tried stuff like deleting the test and po directories and copying them over from trunk, how to I tell bzr to shut up and accept the changes already? -- https://code.launchpad.net/~widelands-dev/widelands/gci18nfixes/+merge/192288 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/gci18nfixes into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/gci18nfixes into lp:widelands
Mmh.. but it seems like the merge conflicts are not gone. If I do a bzr merge lp:widelands I still get tons of merge conflicts. We need to resolve those, otherwise we will not be able to merge on wed. Can you have another look? -- https://code.launchpad.net/~widelands-dev/widelands/gci18nfixes/+merge/192288 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/gci18nfixes into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/gci18nfixes into lp:widelands
I fixed the compile errors in trunk and ran the testsuite. So it seems like everything is working fine now. Are you able to compile trunk again? You'll need gcc 4.7 or later. -- https://code.launchpad.net/~widelands-dev/widelands/gci18nfixes/+merge/192288 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/gci18nfixes into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/gci18nfixes into lp:widelands
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 lp:~widelands-dev/widelands/gci18nfixes into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/gci18nfixes into lp:widelands
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 :) -- https://code.launchpad.net/~widelands-dev/widelands/gci18nfixes/+merge/192288 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/gci18nfixes into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/gci18nfixes into lp:widelands
Feel free to push a non-compiling version that does not contain any merge conflicts any more. I'll look into this. as for the compiler warnings: you need gcc 4.6 or later (or clang 3) to compile widelands since a c++11 transition I pushed to trunk recently. It made troubles for lots of people, but I believe dealing with getting the fleet to support c++11 is the right choice mid and long term. -- https://code.launchpad.net/~widelands-dev/widelands/gci18nfixes/+merge/192288 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/gci18nfixes into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/gci18nfixes into lp:widelands
P.S: I also noticed than when I merge from trunk to my branch, some of the texts I proofread are reverted to the previous version. I will will also have to mantually diff everything. after the merge. The general rules for the merge conflicts that bazaar flags up are this: - Ignore the po/pot, we will need to run buildcat.py/buildlocale.py anyway after the merge - Anything changed in Lua or for Lua stays in. Especially localized strings in the tribes and scenarios. - Anything that is a localized string in C++ stays in - Take anything else in C++ from Master. The file with the most conflicts is src/logic/playercommand.cc. Take all of these from Master. -- https://code.launchpad.net/~widelands-dev/widelands/gci18nfixes/+merge/192288 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/gci18nfixes into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/gci18nfixes into lp:widelands
I did a merge on my local hard drive trunk -> gci18nfixes, and now I get a whole bunch of errors of the type /src/logic/productionsite.h:156:33: error: ‘override’ does not name a type /src/logic/productionsite.h:157:38: error: expected ‘;’ at end of member declaration I get them in logic and economy files as well. This is code I have not touched, so I have no idea where to start looking. -- https://code.launchpad.net/~widelands-dev/widelands/gci18nfixes/+merge/192288 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/gci18nfixes into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/gci18nfixes into lp:widelands
If we merge this soon after the next build release, we could retrieve the translations from the build tag. -- https://code.launchpad.net/~widelands-dev/widelands/gci18nfixes/+merge/192288 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/gci18nfixes into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/gci18nfixes into lp:widelands
A short amendment: As soon as we merge this a lot of translations will go stale - we have manually save them somehow, otherwise a lot of work is lost. -- https://code.launchpad.net/~widelands-dev/widelands/gci18nfixes/+merge/192288 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/gci18nfixes into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/gci18nfixes into lp:widelands
> I haven't looked closely at this, but it seems to have fixed the VICTORY/NEW > OBJECTIVES headlines in campaing texts. This is correct. I have overhauled the code in all the tutorial campaigns, taking the Atlanteans as a blueprint. -- https://code.launchpad.net/~widelands-dev/widelands/gci18nfixes/+merge/192288 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/gci18nfixes into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/gci18nfixes into lp:widelands
> Does ngettext need to be added as a new build dependency No new dependencies are needed, so this should be fine without any (further) cmake file fixes. -- https://code.launchpad.net/~widelands-dev/widelands/gci18nfixes/+merge/192288 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/gci18nfixes into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/gci18nfixes into lp:widelands
Hi, thanks for your work on this. :) I haven't looked closely at this, but it seems to have fixed the VICTORY/NEW OBJECTIVES headlines in campaing texts. I think this branch perhaps should be linked up to bug 835559 (maybe it's even fixed most of the issues), could you take a look at that? >- Adds support for ngettext into Lua, the lua xgettext extractor. Does ngettext need to be added as a new build dependency, or is it already provided either by lua or gettext? If it needs to be added, we should probably look at that before this branch is merged so that CMake is able to tell whether all required dependencies are present or not. -- https://code.launchpad.net/~widelands-dev/widelands/gci18nfixes/+merge/192288 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/gci18nfixes into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
