[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1618597 into lp:widelands
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1618597 into
lp:widelands.
Commit message:
Fixed outdated explanation on where the message button is in tutorial - Basic
Control.
Patch by Steven De Herdt (stdh).
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1618597 in widelands: "Small error in tutorial"
https://bugs.launchpad.net/widelands/+bug/1618597
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1618597/+merge/304464
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/bug-1618597 into lp:widelands.
=== modified file 'data/campaigns/tutorial01_basic_control.wmf/scripting/texts.lua'
--- data/campaigns/tutorial01_basic_control.wmf/scripting/texts.lua 2016-03-16 10:41:23 +
+++ data/campaigns/tutorial01_basic_control.wmf/scripting/texts.lua 2016-08-31 09:46:27 +
@@ -398,7 +398,7 @@
heading = _"Introducing Messages",
body = rt(
p(_[[Hi, it’s me again! This time, I have sent you a message. Messages are sent to you by Widelands to inform you about important events: empty mines, attacks on your tribe, won or lost military buildings, resources found…]]) ..
- p(_[[The message window can be toggled by the button on the very right at the bottom of the screen. This button will also change appearance whenever new messages are available, but there is also a bell sound played whenever you receive a new message.]]) ..
+ p(_[[The message window can be toggled by the second button from the right at the bottom of the screen. This button will also change appearance whenever new messages are available, but there is also a bell sound played whenever you receive a new message.]]) ..
p(_[[You have two messages at the moment. This one, which you are currently reading, and the one that informed you that a new headquarters was added to your economy. Let’s learn how to archive messages: first, select the message that you wish to archive by clicking on it in the list. Then, click the]])
) ..
rt("image=images/wui/messages/message_archive.png", p(_[[‘Archive selected message’ button to move it into your archive.]])) ..
___
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
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1618597 into lp:widelands
Continuous integration builds have changed state: Travis build 1292. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/156473128. Appveyor build 1134. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1618597-1134. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1618597/+merge/304464 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1618597 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/bug-1618597 into lp:widelands
Review: Approve code review That code change is straight foreward, but will some new translations once it is merged. Correct? I will compile this and then try it in English and German -- https://code.launchpad.net/~widelands-dev/widelands/bug-1618597/+merge/304464 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1618597. ___ 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/bug-1618597 into lp:widelands
... will need som new translations ... -- https://code.launchpad.net/~widelands-dev/widelands/bug-1618597/+merge/304464 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1618597. ___ 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/bug-1618597 into lp:widelands
Review: Approve test, compile Works as expected, all German text but the fixed string is in English, please point me to the translation once this was merged. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1618597/+merge/304464 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1618597. ___ 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/bug-1618597 into lp:widelands
The translators will need to retranslate this on Transifex, so the string appearing in English is normal. Thanks for the review! @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1618597/+merge/304464 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1618597. ___ 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
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1618597 into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/bug-1618597 into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1618597/+merge/304464 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1618597. ___ 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
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/appveyor_allow_failure into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/appveyor_allow_failure into lp:widelands has been updated. Commit Message changed to: Allow failure of x64 debug build on appveyor, which currently fails due to memory limits. For more details, see: https://code.launchpad.net/~widelands-dev/widelands/appveyor_allow_failure/+merge/304594 -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/appveyor_allow_failure 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
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/appveyor_allow_failure into lp:widelands
Tino has proposed merging lp:~widelands-dev/widelands/appveyor_allow_failure into lp:widelands. Commit message: Allow failure of x64 debug build on appveyor, which currently fails due to memory limits. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/appveyor_allow_failure/+merge/304594 Allow failure of x64 debug build on appveyor, which currently fails due to memory limits. -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/appveyor_allow_failure into lp:widelands. === modified file 'appveyor.yml' --- appveyor.yml 2016-05-04 17:23:16 + +++ appveyor.yml 2016-09-01 06:37:32 + @@ -48,6 +48,11 @@ - x64 - x86 +matrix: + allow_failures: +- platform: x64 + configuration: Debug + configuration: - Release - Debug \ No newline at end of file ___ 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
