[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1807701_string_fixes_2 into lp:widelands

2018-12-18 Thread kaputtnik
kaputtnik has proposed merging lp:~widelands-dev/widelands/bug-1807701_string_fixes_2 into lp:widelands. Commit message: fixed some strings Requested reviews: Widelands Developers (widelands-dev) For more details, see:

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1808169-disable-focus into lp:widelands

2018-12-18 Thread bunnybot
Continuous integration builds have changed state: Travis build 4347. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/469721440. Appveyor build 4141. State: failed. Details:

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/appveyor-boost-168 into lp:widelands

2018-12-18 Thread bunnybot
Continuous integration builds have changed state: Travis build 4346. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/469689821. Appveyor build 4140. State: failed. Details:

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1808169-disable-focus into lp:widelands

2018-12-18 Thread Notabilis
Notabilis has proposed merging lp:~widelands-dev/widelands/bug-1808169-disable-focus into lp:widelands. Commit message: Allowing hotkey usage while windows are open. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1808169 in widelands: "scrolling not possible with

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/ai-hint-debug into lp:widelands

2018-12-18 Thread Toni Förster
Should be alright, now. If nobody objects I would merge this branch into trunk. -- https://code.launchpad.net/~widelands-dev/widelands/ai-hint-debug/+merge/360943 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/ai-hint-debug into

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/appveyor-boost-168 into lp:widelands

2018-12-18 Thread Toni Förster
Toni Förster has proposed merging lp:~widelands-dev/widelands/appveyor-boost-168 into lp:widelands. Commit message: since boost 1.69 breaks compiling use 1.68 to unbreak compiling on appveyor. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1808481 in widelands:

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1807701_string_fixes into lp:widelands

2018-12-18 Thread kaputtnik
The file data/txts/translators_data.lua is automatically created through utils/update_authors.py: https://bazaar.launchpad.net/~widelands-dev/widelands/trunk/view/head:/utils/update_authors.py It will be overwritten when the translations are updated. I guess this file will not change a lot,