← Back to team overview

widelands-dev team mailing list archive

[Merge] lp:~stoecker/widelands/fixes into lp:widelands

 

Dirk Stöcker has proposed merging lp:~stoecker/widelands/fixes into lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)

For more details, see:
https://code.launchpad.net/~stoecker/widelands/fixes/+merge/105307

Fix translation issues.
-- 
https://code.launchpad.net/~stoecker/widelands/fixes/+merge/105307
Your team Widelands Developers is requested to review the proposed merge of lp:~stoecker/widelands/fixes into lp:widelands.
=== modified file 'campaigns/atl01.wmf/scripting/texts.lua'
--- campaigns/atl01.wmf/scripting/texts.lua	2011-01-04 13:07:14 +0000
+++ campaigns/atl01.wmf/scripting/texts.lua	2012-05-10 09:07:22 +0000
@@ -110,8 +110,8 @@
 - Build a mine of each kind. Make sure to send geologists to the mountain first.<br>
 - Build a smelting works.<br>
 - Build an armor smithy and a weapon smithy.<br>
-- Build a tool smithy.<br>
-]])
+- Build a tool smithy.<br>]]
+ )
 }
 
 obj_make_training_buildings = {
@@ -483,8 +483,7 @@
 war being waged on it right now?<br><br>
 We must improve our military capabilities. If there are foes on the island, we
 have to be prepared when we meet them. We should also enforce the fortification
-of our borders.
-]]
+of our borders.]]
    )
 }
 }
@@ -541,8 +540,8 @@
 [[May Satul warm you, Jundlina. My name is Ostur and I construct ships. I have
 invented a new kind of ship: smaller than those we are used to, but much
 sturdier. If we build them correctly, I am confident that we can go with them
-a much longer distance and maybe escape from Lutas' influence.
-]])
+a much longer distance and maybe escape from Lutas' influence.]]
+ )
 },
 {
    title = _ "Jundlina replies",

=== modified file 'campaigns/tutorial01.wmf/scripting/texts.lua'
--- campaigns/tutorial01.wmf/scripting/texts.lua	2011-05-24 11:50:28 +0000
+++ campaigns/tutorial01.wmf/scripting/texts.lua	2012-05-10 09:07:22 +0000
@@ -623,8 +623,7 @@
       ) .. h2(_"Attack:") .. p(_
 [[The amount of damage a soldier inflicts upon a successful attack on the
 enemy. A barbarian soldier with attack level 0 inflicts ~14 hitpoints damage
-when he succeeds to hit an enemy. For each attack level, he gains 7 damage.
-]]
+when he succeeds to hit an enemy. For each attack level, he gains 7 damage.]]
       ) .. h2(_"Defense:") .. p(_
 [[Defense is the value that is subtracted from the attack value. The barbarians
 can not train in this skill and therefore have always defense level 0 which


Follow ups