Merge lp:~widelands-dev/widelands/empire-string-fix into lp:widelands

Proposed by hessenfarmer
Status: Merged
Merged at revision: 8848
Proposed branch: lp:~widelands-dev/widelands/empire-string-fix
Merge into: lp:widelands
Diff against target: 12 lines (+1/-1)
1 file modified
data/campaigns/emp04.wmf/scripting/texts.lua (+1/-1)
To merge this branch: bzr merge lp:~widelands-dev/widelands/empire-string-fix
Reviewer Review Type Date Requested Status
GunChleoc Approve
Review via email: mp+355562@code.launchpad.net

Commit message

semantic fix of a string in empire 04 that got wrong in the last scenario improvement branch.

Description of the change

replace dismantle by destroy as by the time the message is triggered there is no option to dismantle

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

@bunnybot merge

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

Continuous integration builds have changed state:

Travis build 4034. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/432687258.
Appveyor build 3830. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_empire_string_fix-3830.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/campaigns/emp04.wmf/scripting/texts.lua'
2--- data/campaigns/emp04.wmf/scripting/texts.lua 2018-09-08 11:25:18 +0000
3+++ data/campaigns/emp04.wmf/scripting/texts.lua 2018-09-24 20:17:23 +0000
4@@ -330,7 +330,7 @@
5 _([[So, we urgently need to recover the plans regarding the construction and operation of farms. One older constructor told me that they might have been concealed in a cave in the hills east of our border.]])
6 .. paragraphdivider() ..
7 -- TRANSLATORS: Amalea
8- _([[Until we have found the plans, the only option for our farms is to dismantle them.]]))
9+ _([[Until we have found the plans, the only option for our farms is to destroy them.]]))
10 .. new_objectives(obj_find_farm_plans),
11 posy=1,
12 h=500,

Subscribers

People subscribed via source and target branches

to status/vote changes: