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

2016-11-30 Thread GunChleoc
GunChleoc has proposed merging lp:~widelands-dev/widelands/string-fixes into lp:widelands. Commit message: Fixed various string issues reported on Transifex and added some translators' comments. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1421942 in widelands:

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

2016-11-30 Thread bunnybot
Continuous integration builds have changed state: Travis build 1135. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/130899893. Appveyor build 972. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_string_fixe

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

2016-11-30 Thread SirVer
Review: Approve lgtm. -- https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/312126 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/string-fixes. ___ Mailing list: https://launchpad.net/~widelands

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

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

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

2016-11-30 Thread GunChleoc
Above is better - you did nothing wrong, it was just a case of my being a bit screen-blind on this one. -- https://code.launchpad.net/~widelands-dev/widelands-website/wlimages_rework/+merge/311985 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widel

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

2016-11-30 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/312126 -- Your team Widelands Developers is subscribed to branch

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

2016-11-30 Thread bunnybot
Continuous integration builds have changed state: Travis build 1665. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/180021645. Appveyor build 1505. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_compiler_w

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

2016-11-30 Thread SirVer
Review: Approve Self approve!! https://media.giphy.com/media/OcZp0maz6ALok/giphy.gif @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/mac_os_x_build_fixes/+merge/312105 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/mac_os_x_build_fixes

Re: [Widelands-dev] [Merge] lp:~janus-jhor/widelands-website/unread_read_outbox_messages into lp:widelands-website

2016-11-30 Thread kaputtnik
Review: Approve Prima :-) -- https://code.launchpad.net/~janus-jhor/widelands-website/unread_read_outbox_messages/+merge/311994 Your team Widelands Developers is subscribed to branch lp:widelands-website. ___ Mailing list: https://launchpad.net/~widel

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

2016-11-30 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/mac_os_x_build_fixes into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/mac_os_x_build_fixes/+merge/312105 -- Your team Widelands Developers is subscr

Re: [Widelands-dev] [Merge] lp:~janus-jhor/widelands-website/unread_read_outbox_messages into lp:widelands-website

2016-11-30 Thread kaputtnik
Review: Approve -- https://code.launchpad.net/~janus-jhor/widelands-website/unread_read_outbox_messages/+merge/311994 Your team Widelands Developers is subscribed to branch lp:widelands-website. ___ Mailing list: https://launchpad.net/~widelands-dev P

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

2016-11-30 Thread Notabilis
Merging trunk is fine by me but I am not sure about your comments. I tried it with only one call of set_textdomain("win_conditions") at the beginning of the function. However, this does not translate the "Game over" string. When it should include the widelands-domain it does not seem to be work

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

2016-11-30 Thread bunnybot
Continuous integration builds have changed state: Travis build 1671. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/180198181. Appveyor build 1511. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_compiler_wa

[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1426465-scenario-timings into lp:widelands

2016-11-30 Thread bunnybot
Continuous integration builds have changed state: Travis build 1672. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/180199443. Appveyor build 1512. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_142646

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

2016-11-30 Thread bunnybot
Continuous integration builds have changed state: Travis build 1674. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/180231631. Appveyor build 1514. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_collec

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

2016-11-30 Thread GunChleoc
The reason "Game Over" won't translate is that it hasn't been translated yet - if you hack a win condition PO file to add a translation and recompile, the translation should appear then. I have looked at this again in Meld and you're correct with the if-else as it is. Just fix the textdomain an

[Widelands-dev] [Merge] lp:~janus-jhor/widelands-website/unread_read_outbox_messages into lp:widelands-website

2016-11-30 Thread noreply
The proposal to merge lp:~janus-jhor/widelands-website/unread_read_outbox_messages into lp:widelands-website has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~janus-jhor/widelands-website/unread_read_outbox_messages/+merge/311994 -- Your te

Re: [Widelands-dev] [Merge] lp:~janus-jhor/widelands-website/unread_read_outbox_messages into lp:widelands-website

2016-11-30 Thread kaputtnik
Merged and deployed. Die Ă„nderung ist online. Danke :-) -- https://code.launchpad.net/~janus-jhor/widelands-website/unread_read_outbox_messages/+merge/311994 Your team Widelands Developers is subscribed to branch lp:widelands-website. ___ Mailing list