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

2018-05-06 Thread kaputtnik
This is merged in production, but not committed yet. Lets see if my conclusion was correct. For the server error related to the search, i am currently rebuilding the index, hoping this will help. -- https://code.launchpad.net/~widelands-dev/widelands-website/fix_online_users/+merge/345132 Your

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

2018-05-06 Thread GunChleoc
Review: Approve LGTM :) -- https://code.launchpad.net/~widelands-dev/widelands-website/fix_online_users/+merge/345132 Your team Widelands Developers is subscribed to branch lp:widelands-website. ___ Mailing list: https://launchpad.net/~widelands-dev Po

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/string-fixes into lp:widelands

2018-05-06 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/string-fixes into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/345135 -- Your team Widelands Developers is subscribed to branch

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

2018-05-06 Thread GunChleoc
Yes it is, thanks for the review! I want to give this a final test under Windows before I merge. -- https://code.launchpad.net/~widelands-dev/widelands/background_images/+merge/337629 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/background_images. _

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/frisian-campaign-string-fixes into lp:widelands

2018-05-06 Thread GunChleoc
Thanks for the reviews :) @bunnybot merge Diff comments: > === modified file 'data/campaigns/fri01.wmf/scripting/texts.lua' > --- data/campaigns/fri01.wmf/scripting/texts.lua 2018-04-06 06:33:08 > + > +++ data/campaigns/fri01.wmf/scripting/texts.lua 2018-05-06 06:35:33 > + >

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

2018-05-06 Thread GunChleoc
Thanks! @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/345135 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ Mailing list: https://launchpad.net/~widelan

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

2018-05-06 Thread bunnybot
Continuous integration builds have changed state: Travis build 3473. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/375597592. Appveyor build 3278. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_road_promo

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

2018-05-06 Thread Benedikt Straub
Review: Approve review As far as I can judge, this should work fine. DidnĀ“t test it though. I mainly checked the logic behind the code and found nothing that can go wrong; if it compiles and works, I guess there are no problems c++-wise either. I reviewed style_manager.*, panel_styles.h, the dra

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/string-fixes into lp:widelands

2018-05-06 Thread bunnybot
Continuous integration builds have changed state: Travis build 3471. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/375468542. Appveyor build 3276. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_string_fix

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/frisian-campaign-string-fixes into lp:widelands

2018-05-06 Thread bunnybot
Continuous integration builds have changed state: Travis build 3470. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/375468100. Appveyor build 3275. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_frisian_ca

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1767919-trainingsite-messages into lp:widelands

2018-05-06 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/bug-1767919-trainingsite-messages into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1767919-trainingsite-messages/+merge/344813 -- Your team Wid

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1767919-trainingsite-messages into lp:widelands

2018-05-06 Thread bunnybot
Continuous integration builds have changed state: Travis build 3468. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/375457879. Appveyor build 3273. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_176791

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/frisian-campaign-string-fixes into lp:widelands

2018-05-06 Thread Benedikt Straub
Review: Approve Changes look good to me. Two further diff comments, not sure about the first one though. Diff comments: > === modified file 'data/campaigns/fri01.wmf/scripting/texts.lua' > --- data/campaigns/fri01.wmf/scripting/texts.lua 2018-04-06 06:33:08 > + > +++ data/campaigns/fr

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

2018-05-06 Thread Benedikt Straub
Review: Approve Approved, changes sound good to me. -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/345135 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ Mailing list: ht

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/frisian-campaign-string-fixes into lp:widelands

2018-05-06 Thread Klaus Halfmann
Review: Approve review Going to review this now, found: "sew better armor" -> "sew sturdier garments" "constructionsite" -> "cronstruction site" "Build a recruitment center" -> "Start recruiting soldiers" "But meanwhile, we can start -> "However, we can already start" "what your business you have