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

Proposed by GunChleoc
Status: Merged
Merged at revision: 6938
Proposed branch: lp:~widelands-dev/widelands/bug-1290070
Merge into: lp:widelands
Diff against target: 21 lines (+2/-2)
1 file modified
maps/Plateau.wmf/scripting/texts.lua (+2/-2)
To merge this branch: bzr merge lp:~widelands-dev/widelands/bug-1290070
Reviewer Review Type Date Requested Status
SirVer Approve
Review via email: mp+215005@code.launchpad.net

Description of the change

String fixes for Plateau scenario

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

lgtm.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'maps/Plateau.wmf/scripting/texts.lua'
2--- maps/Plateau.wmf/scripting/texts.lua 2014-04-03 12:46:12 +0000
3+++ maps/Plateau.wmf/scripting/texts.lua 2014-04-09 18:02:04 +0000
4@@ -40,7 +40,7 @@
5 name = "defeat_jomo",
6 title =_ "Defeat Jomo",
7 body = [[• ]] .. _
8-[[Defeat Jomo. He will take care of the soldiers’ food supply.]]
9+[[Defeat Jomo. He is taking care of the soldiers’ food supply.]]
10 ,
11 }
12
13@@ -110,7 +110,7 @@
14 [[We have discovered enemy positions held by Erwyn to the north and east of the castle. ]] ..
15 [[He is known to be a strong warlord and surely commands the strongest warriors. ]] ..
16 [[In the south, we caught sight of some food infrastructures guarded by Jomo – a younger warlord – ]] ..
17-[[and we should take care of those infrastructures so we can take our cut of the food supply.]]), obj_defeat_erwyn, obj_defeat_jomo),
18+[[and we should take care of those infrastructures so we can cut off our enemies’ food supply.]]), obj_defeat_erwyn, obj_defeat_jomo),
19 }
20
21 briefing_erwyn_defeated = {

Subscribers

People subscribed via source and target branches

to status/vote changes: