widelands-dev team mailing list archive

[GunChleoc <fios@xxxxxxxxxxxxxxxxxxx>]

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.