Merge lp:~widelands-dev/widelands/bug1780401_rtfix into lp:widelands

Proposed by hessenfarmer
Status: Merged
Merged at revision: 8739
Proposed branch: lp:~widelands-dev/widelands/bug1780401_rtfix
Merge into: lp:widelands
Diff against target: 12 lines (+1/-1)
1 file modified
data/scripting/infrastructure.lua (+1/-1)
To merge this branch: bzr merge lp:~widelands-dev/widelands/bug1780401_rtfix
Reviewer Review Type Date Requested Status
GunChleoc Approve
Review via email: mp+349076@code.launchpad.net

Commit message

Fixed richtext markup error in data/scripting/infrastructure.lua

To post a comment you must log in.
Revision history for this message
GunChleoc (gunchleoc) wrote :

That fixes it, thanks!

@bunnybot merge

review: Approve
Revision history for this message
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 3630. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/401052196.
Appveyor build 3429. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug1780401_rtfix-3429.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/scripting/infrastructure.lua'
2--- data/scripting/infrastructure.lua 2018-02-08 16:11:26 +0000
3+++ data/scripting/infrastructure.lua 2018-07-06 20:32:19 +0000
4@@ -166,7 +166,7 @@
5 plr:send_message(
6 -- TRANSLATORS: Short for "Not enough space"
7 _"No Space",
8- rt(p(_([[Some of your starting buildings didn’t have enough room and weren’t built. You are at a disadvantage with this; consider restarting this map with a fair starting condition.]]))),
9+ p(_([[Some of your starting buildings didn’t have enough room and weren’t built. You are at a disadvantage with this; consider restarting this map with a fair starting condition.]])),
10 {popup=true, heading=_"Not enough space"}
11 )
12 end

Subscribers

People subscribed via source and target branches

to status/vote changes: