Merge lp:~widelands-dev/widelands/bug-1618597 into lp:widelands

[GunChleoc]

Fixed outdated explanation on where the message button is in tutorial - Basic Control.
Patch by Steven De Herdt (stdh).

[bunnybot (widelandsofficial)]

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.

[Klaus Halfmann (klaus-halfmann)]

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

review: Approve (code review)

[Klaus Halfmann (klaus-halfmann)]

... will need som new translations ...

[Klaus Halfmann (klaus-halfmann)]

Works as expected, all German text but the fixed string is in English,
please point me to the translation once this was merged.

review: Approve (test, compile)

[GunChleoc (gunchleoc)]

The translators will need to retranslate this on Transifex, so the string appearing in English is normal. Thanks for the review!

@bunnybot merge

=== 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 +0000
+++ data/campaigns/tutorial01_basic_control.wmf/scripting/texts.lua	2016-08-31 09:46:27 +0000
@@ -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.]])) ..