widelands-dev team mailing list archive

[kraileth <angreeone@xxxxxxxxx>]

You have been requested to review the proposed merge of lp:~angreeone/widelands/trunk into lp:widelands.

Corrected untranslated strings, adjusted barbarian tutorial 3 according to new changes ("felling axes"), fixed typos, updated empire texts to match new build help ("red spots"), unification of the text strings, etc.

-- 
https://code.launchpad.net/~angreeone/widelands/trunk/+merge/40936
Your team Widelands Developers is requested to review the proposed merge of lp:~angreeone/widelands/trunk into lp:widelands.

=== modified file 'campaigns/atl01.wmf/scripting/texts.lua'
--- campaigns/atl01.wmf/scripting/texts.lua	2010-11-15 19:37:32 +0000
+++ campaigns/atl01.wmf/scripting/texts.lua	2010-11-16 16:09:35 +0000
@@ -301,32 +301,32 @@
 {
    title = _ "Loftomor and Sidolus arrive",
    body = jundlina( "Jundlina", _
-[[May Satul warm you both. Loftomor, you have been the island's most renowned
+[["May Satul warm you both. Loftomor, you have been the island's most renowned
 architect. Sidolus, you are a seasoned warrior and strategist. I have called
 you before me to seek your counsel: What needs to be done to make this our new
-home?]]
+home?"]]
    )
 },
 {
    title = _ "Loftomor speaks",
    body = loftomor(_
-[[May Satul warm you, Jundlina! The most important things for building a
+[["May Satul warm you, Jundlina! The most important things for building a
 settlement are the building materials. There are some trees here, so we should
 build housings for some woodcutters and of course also for foresters, so
 we do not run out of trees. Oh, and we mustn't forget the sawmill, for most
 buildings can't be made out of trunks alone. Stronger buildings also need
 stone, but there is plenty to the north-east of here; we just need to build a
-quarry and my stonemasons will go to work promptly.]]
+quarry and my stonemasons will go to work promptly."]]
    ) .. new_objectives(obj_ensure_build_wares_production)
 },
 {
    title = _ "Sidolus speaks",
    body = sidolus(_
-[[May Satul warm you, Jundlina! I agree with what Loftomor proposes. We need
+[["May Satul warm you, Jundlina! I agree with what Loftomor proposes. We need
 a good supply of building materials for we have to expand our territory swiftly.
 I will not feel safe on this island as long as we have not seen all shores
 on it. I brought plenty of good men from Atlantis. The military might is
-available. We only need some housings to live in.]]
+available. We only need some housings to live in."]]
    ) ..  new_objectives(obj_expand)
 }
 }
@@ -335,33 +335,33 @@
 {
    title = _ "Jundlina is satisfied",
    body = jundlina("Jundlina's Memoirs", _
-[[Our building infrastructure is done and I spent some days making sure that
+[["Our building infrastructure is done and I spent some days making sure that
 they work well together. Now, there are other pressing matters. I called
 Colionder, my personal cook, before me to get his help with sorting some things
-out.]]
+out."]]
    )
 },
 {
    title = _ "Colionder arrives",
    body = colionder(_
-[[May Satul warm you, Jundlina. Can I be of any service to you or the
-god?]]
+[["May Satul warm you, Jundlina. Can I be of any service to you or the
+god?"]]
    )
 },
 {
    title = _ "Jundlina replies",
    body = jundlina(_"Jundlina", _
-[[May Satul warm you too, Colionder. Yes, I wondered if there is not a way
+[["May Satul warm you too, Colionder. Yes, I wondered if there is not a way
 that we can centralize our food production. We lose a lot of productivity
 because our people are accustomed to making their own food. I feel if we
 could split responsibilities, it would be better for us all. I want your
-thoughts on this.]]
+thoughts on this."]]
    )
 },
 {
    title = _ "Colionder is in thought",
    body = colionder(_
-[[Ahh, but I think this is impossible to change. The preparing and eating of
+[["Ahh, but I think this is impossible to change. The preparing and eating of
 food is something deeply ingrained in us Atlanteans - it is just a ceremony
 that we need for our well being. So I guess we cannot take this away from
 the individuals completely. But we might find a compromise in between: For me,
@@ -373,13 +373,13 @@
 full of smoke and stinks for weeks after it. Don't you think that this could be
 done in a special building were the side effects do not matter?  I think those
 two things would be accepted by the people and would reduce the cooking times
-without taking away the ritual.]]
+without taking away the ritual."]]
  )
 },
 {
    title = _ "Jundlina agrees",
    body = jundlina(_
-[[Your words sound wise to me, Colionder. So be it then.]]
+[["Your words sound wise to me, Colionder. So be it then."]]
    ) .. new_objectives(obj_make_food_infrastructure)
 },
 }
@@ -388,8 +388,8 @@
    {
       title = _ "Jundlina is satisfied",
       body = jundlina(_ "Jundlina is reviewing the reports", _
-[[Seems like our food production is finished and everybody is working together
-nicely. It is really starting to feel like home here.]]
+[["Seems like our food production is finished and everybody is working together
+nicely. It is really starting to feel like home here."]]
       )
    }
 }
@@ -398,22 +398,22 @@
    {
       title = _"A man comes to Jundlina",
       body = opol(_
-[[May Satul warm you, Jundlina. My Name is Opol and I am the highest weaver of
+[["May Satul warm you, Jundlina. My Name is Opol and I am the highest weaver of
 the guild abandoning Atlantis and Lutas with you. I come with sad news indeed:
 We have no more spidercloth. Not a single piece is to be found in our
 warehouses.  Could you not help the weaver guild by arranging the building of a
 weaving-mill and a spiderfarm? The spiders deliver the finest silk and we will
 produce the finest spidercloth from it. We offer to also produce the tabards
 for young soldiers and the golden tabards for officers for you in exchange.
-You will need them for sure as soon as you want to recruit new soldiers.]])
+You will need them for sure as soon as you want to recruit new soldiers."]])
  },
  {
     title = _ "Jundlina replies",
     body = jundlina(_ "Jundlina replies", _
-[[May Satul warm you too, Opol. I wanted to delay production of spider cloth,
+[["May Satul warm you too, Opol. I wanted to delay production of spider cloth,
 but I understand your urgency. Your suggestion sounds fair to me, I will build
 your weaving-mill and spiderfarm. I will also build a goldweaver so that the
-golden tabards you make will not be golden by name alone.]]
+golden tabards you make will not be golden by name alone."]]
     ) ..  new_objectives(obj_spidercloth_production)
  }
 }
@@ -422,17 +422,17 @@
    {
       title = _ "Opol seeks out Jundlina",
       body = opol(_
-[[May Satul warm you, Jundlina!. The weaving-mill, goldweaver and spiderfarm
+[["May Satul warm you, Jundlina! The weaving-mill, goldweaver and spiderfarm
 buildings are complete and are starting their work at this very moment. The
 weaving guild is very grateful for your support and we will stand by our word
-and deliver the first tabard very soon.]]
+and deliver the first tabard very soon."]]
       )
    },
    {
       title = _ "Jundlina replies",
       body = jundlina(_
-[[This is good news indeed, Opol. Our economy is developing very well. Go back
-to your work now, Opol, and may Satul warm you and all your guild members!]]
+[["This is good news indeed, Opol. Our economy is developing very well. Go back
+to your work now, Opol, and may Satul warm you and all your guild members!"]]
       )
    }
 }
@@ -442,19 +442,19 @@
    {
       title = _ "Sidolus seeks out Jundlina",
       body = sidolus(_
-[[May Satul warm you, Jundlina. Have you considered mining for goods in the
+[["May Satul warm you, Jundlina. Have you considered mining for goods in the
 mountains around us? We are running short of quartz, crystal and diamonds for
 our buildings. Also we could use more iron, gold and especially coal. If we
 find an ample supply of those commodities, we could start producing weapons
 and tools; this would help enormously. Of course, we would need smelters,
-a weapon smithy, an armor smithy and a tool smithy. And maybe even more.]]
+a weapon smithy, an armor smithy and a tool smithy. And maybe even more."]]
       )
    },
    {
       title = _ "Jundlina replies",
       body = jundlina(_"Jundlina nods",
-[[I have considered this, Sidolus. I think, it is about time. We will make this
-a priority for now. You shall get your industry and soon!]]
+[["I have considered this, Sidolus. I think, it is about time. We will make this
+a priority for now. You shall get your industry and soon!"]]
       ) .. new_objectives(obj_make_heavy_industry_and_mining)
    },
 }
@@ -463,30 +463,30 @@
    {
       title = _ "Jundlina summons Sidolus",
       body = jundlina(_ "Jundlina is angry", _
-[[What is this I hear, Sidolus? I received words about your soldiers
+[["What is this I hear, Sidolus? I received words about your soldiers
 misbehaving and bullying the common folk. What is this nonsense all about? They
 are servants for the common good and must not misuse their powers. This is
-inexcusable! Explain this, if you will!]]
+inexcusable! Explain this, if you will!"]]
       )
    },
    {
       title = _ "Sidolus seems contrite",
       body = sidolus(_
-[[I agree with you and I have punished the trouble makers severely. But it is
+[["I agree with you and I have punished the trouble makers severely. But it is
 very difficult to keep my men quiet: they are bored and have nothing to do. I
 would like to ramp up their drill. I think more routine in their life would
 keep them occupied and focused on their duties. I would need a dungeon and a
 labyrinth for them.  I have the plans ready, but I guess they won't come
-cheap.]]
+cheap."]]
       )
    },
    {
       title = _"Jundlina replies",
       body = jundlina(_
-[[I do not fear the cost and labor as long as it keeps your people at bay. You
+[["I do not fear the cost and labor as long as it keeps your people at bay. You
 shall get your buildings. But note that I will not tolerate any rogue soldier;
 if similar things happen again, I will make you responsible for them.
-Dismissed.]]
+Dismissed."]]
       ) .. new_objectives(obj_make_training_buildings)
    }
 }
@@ -495,11 +495,11 @@
    {
       title = _ "Jundlina received a letter",
       body = jundlina("Jundlina", _
-[[I received an invitation from Sidolus. The first day of training in the newly
+[["I received an invitation from Sidolus. The first day of training in the newly
 finished labyrinth will be tomorrow. The dungeon is done as well and will start
 its work soon. I am looking forward to tomorrow; I am very interested in how our
 soldiers are trained and I wonder if the additional workload will keep them from
-bullying the civil population.]]
+bullying the civil population."]]
       )
    }
 }
@@ -508,12 +508,12 @@
    {
       title = _ "Jundlina considers the economy",
       body = jundlina(_"Jundlina", _
-[[People are complaining about crowded streets and slow transportation. We
+[["People are complaining about crowded streets and slow transportation. We
 need to help out our carriers on the roads. I decided to build a horsefarm
 so that the horses can help with the heavy wares.<br>
 Another way to take load from our roads is to build warehouses. We have claimed
 the mountain now, it seems a good idea to have a warehouse on the plateau to
-avoid having to transport everything up and down the slopes.]]
+avoid having to transport everything up and down the slopes."]]
       ) .. new_objectives(obj_horsefarm_and_warehouse)
    }
 }
@@ -527,7 +527,7 @@
    posy = 0,
    title = _ "A dangerous finding",
    body = jundlina(_ "Jundlina is in thought", _
-[[We found an old building, destroyed and burned by flames. I am very worried
+[["We found an old building, destroyed and burned by flames. I am very worried
 about this finding. The building is not of any kind I've ever seen. It is
 certainly not designed by any Atlantean architect I've ever heard about. The
 building is crude, the assemblage is sloppy. But the materials are very
@@ -539,8 +539,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 foritfication
-of our borders.
-]]
+of our borders."]]
    )
 }
 }
@@ -551,11 +550,11 @@
    posy = 0,
    title = _ "Another building.",
    body = jundlina(_ "Jundlina is worried", _
-[[We found one more building of this strange making. We have yet to see any of
+[["We found one more building of this strange making. We have yet to see any of
 its builders. But obviously there has been a community on this island before
 and obviously it has been militarized. I have to check on our military status
 with my generals. I will not allow that a potential enemy will find us
-unprepared.]]
+unprepared."]]
    )
 }
 }
@@ -566,12 +565,12 @@
    posy = 0,
    title = _ "One more building",
    body = jundlina(_
-[[And yet another of these buildings. We know now that the tribe that built
+[["And yet another of these buildings. We know now that the tribe that built
 them once had complete control over the island. But I am no longer so scared of
 potential enemies. We know so much of this island already and there is no trace
 of this old economy to be found. I am starting to relax, but I will not let
 our guard down as we continue to explore this beautiful island. But without
-obvious dangers I am feeling very much at home here already.]]
+obvious dangers I am feeling very much at home here already."]]
    )
 }
 }
@@ -585,26 +584,26 @@
    posy = 0,
    title = _ "The water is rising!",
    body = jundlina(_"Jundlina", _
-[[May Satul save us! Lutas is still trying to get to us. A scout informed me
+[["May Satul save us! Lutas is still trying to get to us. A scout informed me
 that the ocean is rising quickly. We have to reach higher ground and evacuate
 everybody and as much wares from the headquarters up the mountains. How can we
-escape?]]
+escape?"]]
    )
 },
 {
    title = _ "A young man approaches",
    body = ostur(_
-[[May Satul warm you, Jundlina. My name is Ostur and I construct ships. I have
+[["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",
    body = jundlina(_ "Jundlina", _
-[[Ostur, we have no time. The water rises too fast and if we build the ships on
-shore they will vanish in the sea before they can float. I fear we are doomed!]]
+[["Ostur, we have no time. The water rises too fast and if we build the ships on
+shore they will vanish in the sea before they can float. I fear we are doomed!"]]
    ),
 },
 {
@@ -618,21 +617,21 @@
       sleep(200)
    end,
    body = ostur(_
-[[A friend of mine explored the island on his own and he told me of a big lake
+[["A friend of mine explored the island on his own and he told me of a big lake
 at the top of the mountain. I suggest we build the ships in this lake and wait
 until the island drowns beneath us. Then we can sail away. It is a bold plan,
-but I think, it could work.]]
+but I think, it could work."]]
    )
 },
 {
    title = _ "Jundlina replies",
    body = jundlina(_ [[
-Your red hair is a signal from the fire god. I will trust you and support your
+"Your red hair is a signal from the fire god. I will trust you and support your
 plan. Our survival lays in your hands now, Ostur.
 <br><br>Swift now, we need a house for Ostur next to the lake and we need
 planks, trunks and spidercloth for the construction there. Forget about
 everything else, we need those wares on top of the mountain before our
-warehouses are all swallowed by the sea.]]
+warehouses are all swallowed by the sea."]]
    ) .. new_objectives(obj_build_ships)
 }
 }
@@ -641,13 +640,13 @@
    {
       title = _ "Jundlina is relieved",
       body = jundlina(_"Jundlina", _ [[
-Praise Satul! Ostur, the young ship builder did it. We have three ships -
+"Praise Satul! Ostur, the young ship builder did it. We have three ships -
 never have I seen sturdier ones - with enough room to carry all of us and some
 wares too. And this rescue came just in time: Lutas is about to swallow the rest
 of this island, the water rises faster by the hour. But we can make our escape
 now and start over in some country farther away... I expect a long journey, but
 we will find the land of Satul in the end. This is what I promised my people.
-And myself.]]
+And myself."]]
       ) .. rt(h1(_ "Congratulations") .. p(_
 [[You have won this mission. Continue with the next one or keep playing for
 as long as you like.]]

=== modified file 'campaigns/cconfig'
--- campaigns/cconfig	2010-11-12 11:57:54 +0000
+++ campaigns/cconfig	2010-11-16 16:09:35 +0000
@@ -24,19 +24,23 @@
 [global]
 version = 5
 # Barbarian Tutorial Campaign
-campname0=_"(Tutorial) Barbarians - The second Empire"
+campname0=_"(Tutorial) Barbarians - The second empire"
 campsect0=barbariantut
 campdiff0=1
 campdesc0=_"When Chat’Karuth died, he was an old man, father to three strong and ambitious sons and warlord to an army that could match any enemy willing to rise against the ancient forests. Though at the end of his glorious reign, Chat’Karuth left his eldest son, Thron, to succeed him as the tribe's warlord – a decision that left his two brothers unsatisfied. The old warlord knew that. As his father instructed him, Thron left the capital of Al’thunran, the home of the Throne Among the Trees and withdrew his forces to the high hills where he buried the corpse of his father. There he swore to the gods and his father's spirit that he’d return to re-established order. While his brothers raged in blind war against Thron and the few forces he left to secure the borders of Al’thunran, the young warlord seeks to reunite his ambitious brothers and force the tribes to march once again under a common banner."
 campvisi0=1
 # Empire Campaign
-campname1=_"Empire - The months of exile"
+campname1=_"(Tutorial) Empire - The months of exile"
 campsect1=empiretut
 campdiff1=2
 campdesc1=_"Six months ago, Lutius - a young general of the Empire - was sent with 150 soldiers to the frontier beyond the northern forests where Barbarian tribes were crossing onto land held by the Empire. His task was to defend the Empire's land. At first, everything was calm. He even talked to a few barbarian children and thought about a peaceful life - side by side with this archaic folk. He began to feel safer and his army began to drop their attention off the potential enemy. That was their undoing. One night in March his unprepared army was attacked by 100 barbarian footmen and was completely scattered. Only with his bare life he and a handful of his soldiers survived."
 campvisi1=0
 # Atlantean Campaign
+<<<<<<< TREE
 campname2=_"Atlanteans - The run for the fire"
+=======
+campname2=_"(Tutorial) Atlanteans - the new rise"
+>>>>>>> MERGE-SOURCE
 campsect2=atlanteans
 campdiff2=3
 campdesc2=_"When the God lost faith in the Atlanteans and drowned their island, one woman's struggle for justice and a second chance for her people would become the stuff of legends. Leading the remaining Atlanteans into a new future in a new part of the World, Jundlina became the most powerful human of her time, but at a high cost: her humanity and soul."
@@ -58,34 +62,34 @@
 #####
 
 [barbariantut00]
-name=_"Tutorial1 - Eyes in the Dark"
+name=_"Barbarians tutorial1 - Eyes in the dark"
 visible=1
 path="campaigns/t01.wmf"
 
 [barbariantut01]
-name=_"Tutorial2 - A Place to call Home"
+name=_"Barbarians tutorial2 - A Place to call home"
 visible=0
 path="campaigns/t02.wmf"
 
 [barbariantut02]
-name=_"Tutorial3 - This land is our land"
+name=_"Barbarians tutorial3 - This land is our land"
 newvisi="campsect1"
 visible=0
 path="campaigns/t03.wmf"
 
 
 [empiretut00]
-name=_"Empire Tutorial1 - The strands of Malac' Mor"
+name=_"Empire tutorial1 - The strands of Malac' Mor"
 visible=1
 path="campaigns/emp01.wmf"
 
 [empiretut01]
-name=_"Empire Tutorial2 - An outpost for exile"
+name=_"Empire tutorial2 - An outpost for exile"
 visible=0
 path="campaigns/emp02.wmf"
 
 [atlanteans00]
-name=_"01 - From nemesis to genesis"
+name=_"Atlanteans tutorial1 - From nemesis to genesis"
 visible=1
 path="campaigns/atl01.wmf"
 

=== modified file 'campaigns/emp01.wmf/elemental'
--- campaigns/emp01.wmf/elemental	2010-04-21 17:45:21 +0000
+++ campaigns/emp01.wmf/elemental	2010-11-16 16:09:35 +0000
@@ -6,5 +6,5 @@
 world=desert
 name=_"Empire Tutorial1 - The strands of Malac' Mor"
 author=Nasenbaer
-descr=_"After losing an important battle against the barbarians which lead to the lost of a big part of the Empire's territory, Lutius leaves Fremil to start a new life. But his destiny takes his ship into a heavy storm, which nearly destroys it. Only with a lot of luck he manages to beach his damaged ship on an unknown desert strand and save his people. For now."
+descr=_"After losing an important battle against the barbarians which lead to the loss of a big part of the Empire's territory, Lutius leaves Fremil to start a new life. But his destiny takes his ship into a heavy storm, which nearly destroys it. Only with a lot of luck he manages to beach his damaged ship on an unknown desert strand and save his people. For now."
 background="tribes/empire/pics/campmap-emp01.jpg"

=== modified file 'campaigns/emp01.wmf/scripting/texts.lua'
--- campaigns/emp01.wmf/scripting/texts.lua	2010-04-30 03:39:46 +0000
+++ campaigns/emp01.wmf/scripting/texts.lua	2010-11-16 16:09:35 +0000
@@ -48,7 +48,7 @@
    _"Saledus looks around nervously..." ..
    "</p></rt><rt image=map:Saledus.png><p line-spacing=3 font-size=12><br>" ..
    _[[ "Sire, I fear we are not safe in this foreign land. Who knows what terrible creatures live beyond this forest, in that mighty desert? What if these creatures enter the woods and await the time to attack us?<br> Well, perhaps my fear is misguided, but it can't be wrong to keep watch in the forests - so that we can be sure to see any potential enemies before they can see us.<br> We really should build a barracks in the eastern portion of the forest. Then one of us can keep watch in the darkness and keep us safe from these creatures."<br><br>-- NEW OBJECTIVE --<br> ]] ..
-   _"* Build a barracks at the red point on the east side of the forests, to the right of your headquarters." ..
+   _"* Build a barracks at the red house symbol on the east side of the forests, to the right of your provisional headquarters." ..
    "</p></rt>",
    width=400,
    height=350,
@@ -70,9 +70,9 @@
    body="<rt><p font-size=24 font-face=FreeSerif font-weight=bold font-color=AF7511>" ..
    _"Amalea smiles..." ..
    "</p></rt><rt image=map:Amalea.png><p line-spacing=3 font-size=12><br>" ..
-   _[[ "Hey Lutius, I just met Saledus outside.<br> He told me about the barracks. Well, I am not one of those girls who think we need more barracks - instead, we might concentrate on other things now.<br> It is absolutely clear that we need wood to repair our ship. So, I walked through the forest yesterday and found a nice place for a lumberjack's house, south of our headquarters."<br><br>-- NEW OBJECTIVE --<br> ]] ..
+   _[[ "Hey Lutius, I just met Saledus outside.<br> He told me about the barracks. Well, I am not one of those girls who think we need more barracks - instead, we might concentrate on other things now.<br> It is absolutely clear that we need wood to repair our ship. So, I walked through the forest yesterday and found a nice place for a lumberjack's house, south of our provisional headquarters."<br><br>-- NEW OBJECTIVE --<br> ]] ..
    _(
-   "* Build a lumberjack's house at the red point, south of your headquarters. " ..
+   "* Build a lumberjack's house at the red house symbol, south of your provisional headquarters. " ..
    "Cutting down enough trees for more buildings will take a while. You can " ..
    "speed the game up using PAGE UP and slow it down again with PAGE DOWN."
    ) .. 
@@ -153,7 +153,7 @@
    name = "build_barracks",
    title=_"Build a barracks",
    body= "<rt><p>" ..
-   _"* Build a barracks at the red point on the east side of the forests, to the right of your headquarters." ..
+   _"* Build a barracks at the red house symbol on the east side of the forests, to the right of your provisional headquarters." ..
    "</p></rt>"
 }
 obj_build_lumberjack = {
@@ -161,7 +161,7 @@
    title=_"Build a lumberjack's house",
    body= "<rt><p>" ..
    _(
-   "* Build a lumberjack's house at the red point, south of your headquarters. " ..
+   "* Build a lumberjack's house at the red point, south of your provisional headquarters. " ..
    "Cutting down enough trees for more buildings will take a while. You can " ..
    "speed the game up using PAGE UP and slow it down again with PAGE DOWN."
    ) .. 

=== modified file 'campaigns/t03.wmf/scripting/starting_conditions.lua'
--- campaigns/t03.wmf/scripting/starting_conditions.lua	2010-09-22 17:50:53 +0000
+++ campaigns/t03.wmf/scripting/starting_conditions.lua	2010-11-16 16:09:35 +0000
@@ -14,10 +14,11 @@
 
 hq = p1:place_building("headquarters", wl.Game().map:get_field(52, 33), false, true)
 hq:set_wares{
-   axe=6,
+   axe=1,
    bakingtray=2,
    blackwood=32,
    coal=12,
+   felling_axe=5,
    fire_tongs=2,
    fish=6,
    grout=12,

=== modified file 'campaigns/t03.wmf/scripting/texts.lua'
--- campaigns/t03.wmf/scripting/texts.lua	2010-04-30 03:39:46 +0000
+++ campaigns/t03.wmf/scripting/texts.lua	2010-11-16 16:09:35 +0000
@@ -108,7 +108,7 @@
    name = "build_weapon_productions",
    title=_"Build weapon productions",
    body= "<rt><p line-spacing=3 font-size=12>" ..
-_"* As soon as the blacksmith reaches his next level (master blacksmith) enhance your metalworks to an axefactory or even a war mill and build up another metalworks to ensure the production of tools." ..
+_"* Enhance your metalworks to an axefactory or - as soon as the blacksmith reaches his next level (master blacksmith) - even to a war mill and build up another metalworks to ensure the production of tools." ..
 "</p></rt>",
 }
 

=== modified file 'campaigns/tutorial01.wmf/scripting/init.lua'
--- campaigns/tutorial01.wmf/scripting/init.lua	2010-10-20 13:49:29 +0000
+++ campaigns/tutorial01.wmf/scripting/init.lua	2010-11-16 16:09:35 +0000
@@ -550,7 +550,7 @@
    terminate_bad_boy_sentinel = true
    
    -- Wait a while
-   sleep( 120*1000 )   
+   sleep( 100*1000 )   
 
    -- Interludium: talk about census and statistics
    census_and_statistics(cs.fields[1])

=== modified file 'campaigns/tutorial01.wmf/scripting/texts.lua'
--- campaigns/tutorial01.wmf/scripting/texts.lua	2010-09-19 11:19:40 +0000
+++ campaigns/tutorial01.wmf/scripting/texts.lua	2010-11-16 16:09:35 +0000
@@ -91,7 +91,7 @@
    obj_name = "enable_buildhelp",
    obj_title = _ "Enable the build help",
    obj_body = rt(h1(_"Enable the build help") ..
-      p(
+      p(_
 [[It is easier to understand what is allowed to be built on which field when
 the build help symbols are enabled. Do so now either by pressing SPACE or by
 clicking the fourth button from the left at the very bottom of the screen.
@@ -329,7 +329,7 @@
       )) .. rt("image=pics/roadb_green.png", p(_
 [[The terrain is flat here. Your carriers will be very swift on this terrain.]]
    )) .. rt("image=pics/roadb_yellow.png", p(_
-[[There is a small slope to climb to reach this field. This means you're
+[[There is a small slope to climb to reach this field. This means your
 workers are faster walking downwards than they are walking upwards.]]
    )) .. rt("image=pics/roadb_red.png", p(_
 [[The connection between the fields is extremely steep. The speed increase in
@@ -349,7 +349,7 @@
 are directly in road building mode when you ordered a new site. But now, you
 aren't. To build a completely new road just click on the flag in front of your
 construction site, click on the build road icon then click on the flag in front
-of your headquarters.]]
+of your headquarters. Afterwards wait for the completion of the stonemason's hut.]]
       )
    )
 }
@@ -460,7 +460,7 @@
    title = _ "Message arrived!",
    body = rt(p(_
 [[A message has been sent to you. See how the button at the bottom of the
-screen has changed appearance? You should now burn this quarry down as it is
+screen has changed appearance? You could now burn this quarry down as it is
 no longer of any use and is just blocking space. To do that, click on the
 quarry and select the destroy button.]]
    ))
@@ -555,8 +555,9 @@
    pos = "topright",
    title = _ "Mining conclusion",
    body = rt(p(_
-[[So our geologist found a lot of coal on this mountain. You should therefore
-build a coal mine here. Building a mine is like building a house. The build
+[[So our geologist found a lot of coal on this mountain. If this was a regular
+game, you should therefore build a coal mine here. However mining infrastructure
+is not part of this tutorial. Building a mine is like building a house. The build
 help symbol for where a mine can be built is]]
    )) .. rt("image=pics/mine.png", p(_"this one.")) ..
    rt(p(_
@@ -580,7 +581,7 @@
 economies of the tribes are explained in their individual tutorial campaigns.
 Ok, I am going to create us a little training ground with a training camp and a
 warehouse to the north east of here.]]) .. p(_
-[[If you want to come back to this eastern part of your realm, just scroll here
+[[If you want to come back to this south-western part of your realm, just scroll here
 via right-button scrolling or open the minimap by clicking on the]]
          )) .. rt("image=pics/menu_toggle_minimap.png", p(_
 [[minimap button at the bottom of the screen. Alternatively you could also press
@@ -588,7 +589,7 @@
          )) .. (rt(p(_
 [[The minimap shows you the complete map in miniature. You can directly jump to
 any field by left-clicking on it. You can also toggle buildings, roads, flags
-and player indicators on and off inside the map.]]
+and player indicators on and off inside the minimap.]]
          ) .. p(_
 [[But I digress. Back to soldiers. What was I about to do? Oh yes, I wanted to
 build a small training scenario for you. Let's do that now.]]
@@ -631,7 +632,7 @@
 means that they always get 3 hitpoints subtracted from the damage inflicted. If
 an attacker with an attack value of 15 hitpoints hits a barbarian soldier, the
 barbarian would lose 15 - 3 = 12 hitpoints. The 3 hitpoints that are subtracted
-are because of the defense ability.]]
+are because of the basic defense ability.]]
       ) .. h2(_"Evade:") .. p(_
 [[Evade is the chance that the soldier is able to dodge an attack. It is 25% for
 a level 0 evade barbarian and increases in steps of 15% for each level.]]

=== modified file 'tribes/empire/weaponsmithy/conf'
--- tribes/empire/weaponsmithy/conf	2010-08-01 14:35:38 +0000
+++ tribes/empire/weaponsmithy/conf	2010-11-16 16:09:35 +0000
@@ -30,7 +30,7 @@
 produce_lance=_Produce lance
 produce_advanced_lance=_Produce advanced lance
 produce_heavy_lance=_Produce heavy lance
-produce_war_lance=Produce war lance
+produce_war_lance=_Produce war lance
 work=_Work
 
 [produce_wood_lance]