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

[GunChleoc]

Fixed typos / improved language in the first 2 tutorials.

Treat game entities as proper names in tutorials, campaigns and scenarios.

[SirVer (sirver)]

> Treat game entities as proper names in tutorials, campaigns and scenarios.

Why? I just skimmed this so far, but Well and Bakery reads strange to me.

review: Needs Information

[GunChleoc (gunchleoc)]

I showed the game to a native speaker of American English and she played the first 2 tutorials. She hit a spot in the tutorial where a building was mentioned, but she didn't recognize that the text was referring to a game entity, because the building name was in lower case. She said it would be much easier for her to understand the tutorial if the building's name had started with a capital letter.

[SirVer (sirver)]

I suggest to have some more discussion about this before we change a ton of strings again.

Maybe we can fix this through links to the help - once we have it? Or give game entities a small icon or different text color - nintendo does that in their modern games [1]. But I could imagine adding a small icon before the text of a building and change the text - similar to how external links on the wiki are now marked. Then we can change it into a link later on once we have the help in place.

[1] http://holdenlink.com/wp-content/uploads/2012/01/skywardword_new011.jpg

[Teppo Mäenpää (kxq)]

About one year ago, when the refactoring of strings was supposed to be ready, the Finnish translation of Empire was complete. Now about 30% of the strings are "untranslated", despite that hardly anything has changed in the tribe. Other text packages have deteoriated at similar pace. This is not motivating at all.

Can somebody ensure, that these strings do not need retranslation just because of somebody did minor touches on the English originals?

[SirVer (sirver)]

 This is a launchpad bug, the only solution I see is to stop using launchpad translations. https://bugs.launchpad.net/launchpad/+bug/312476

Do you have a suggestion what can be done?

[wl-zocker (wl-zocker)]

You could use an offline translation tool which also suggests similar strings when you are translating. When there are many strings that only contain small changes (typos, or capitalization as this branch requests), you can fix them fairly quickly (if you do not care for capitalization in Finnish).

Another idea is not to change the source strings at all, but do a translation to (different versions of) English. That way, when we find a typo, we leave the source string as it is (with the typo, translators hopefully understand it anyway) and only change the "translation". This will not break the other translations.

Links to help: I think this is a good idea (we need some system for intra-help links, too). However, this needs some way of designating them in the source code, which will break all translations (but when this is done once, we can hopefully do some useful stuff with it). An automatic detection of such strings would not be desirable (e.g. think of "well"). A benefit of this would be that the colors can be used to distinguish between the building in Widelands and talking of the thing in general. (I have no good English example at my fingertips, but think of a language where fortress and fortification are the same word. Then, a sentence like "Reinforce your fortification." could be misunderstood.)

[GunChleoc (gunchleoc)]

I like the idea for links - so let's leave the capitalization for now and I'll change the real bugs in a separate branch.

@Teppo: Have you tried using Virtaal or PoEdit? Launchpad won't recognize similar strings with slight changes in them, but these tools will. I will probably do another round of fixing up translations when we approach string freeze, to give everybody a leg up again.

[SirVer (sirver)]

Gun: It is now the second time a community member as expressed frustrations about lost translations in a very short time. I think we have to swallow the frog and move the web translator somewhere else that can deal with fuzzy strings. Could you open a bug to suggest options, you are most well versed in the tools that are out there.

Sidenote: I am travelling this weeks, so will be slow to reply to email.

[GunChleoc (gunchleoc)]

Transifex can handle fuzzy matches, so I will set up a test project over there.

https://www.transifex.com/projects/p/widelands/

[SirVer (sirver)]

I opened bug 1417586 and moved the discussion there. This merge request is then abandoned, right?

[GunChleoc (gunchleoc)]

Yes - please leave it open until I can port the fixes we do want to a new branch. I'll change the status myself then.

=== modified file 'campaigns/atl01.wmf/scripting/texts.lua'
--- campaigns/atl01.wmf/scripting/texts.lua	2014-11-11 10:43:36 +0000
+++ campaigns/atl01.wmf/scripting/texts.lua	2015-01-24 14:23:38 +0000
@@ -33,10 +33,10 @@
    number = 6,
    body = objective_text(_"Supply Building Wares", _
 [[Supply basic building material for your economy:]] .. paragraphdivider() ..
-      listitem_bullet(_[[Build a quarry]]) ..
-      listitem_bullet(_[[Build two woodcutter’s houses]]) ..
-      listitem_bullet(_[[Build two forester’s houses]]) ..
-      listitem_bullet(_[[Build a sawmill]])
+      listitem_bullet(_[[Build a Quarry]]) ..
+      listitem_bullet(_[[Build two Woodcutter’s Houses]]) ..
+      listitem_bullet(_[[Build two Forester’s Houses]]) ..
+      listitem_bullet(_[[Build a Sawmill]])
    ),
 }
 
@@ -55,28 +55,28 @@
    title = _"Establish a solid food production",
    number = 10,
    body = objective_text(_"Food Production",
-		_[[Food is very important for mines and military training areas. Establish a well working food environment by building at least one farm, one blackroot farm and a mill. The two kinds of flour together with water from a well will be baked into bread in a bakery, so build a bakery and a well, too.]] .. paragraphdivider() ..
-      _[[The other two important food wares are smoked fish and smoked meat. Raw meat is delivered from a hunter. A fisher gets the fish out of the sea while a fish breeder makes sure that a school of fish does not go extinct by breeding more. Make sure that there are always fish left, otherwise the fish breeder won’t be able to breed new ones. The smoking happens in a smokery, you will need at least two of those.]] .. paragraphdivider() ..
-      listitem_bullet(_[[Build a farm and a blackroot farm]]) ..
-      listitem_bullet(_[[Build a mill to make cornflour and blackroot flour]]) ..
-      listitem_bullet(_[[Build a well]]) ..
-      listitem_bullet(_[[Build a bakery to bake bread from cornflour, blackroot flour and water]]) ..
-      listitem_bullet(_[[Build a hunter’s house to get raw meat]]) ..
-      listitem_bullet(_[[Build a fisher’s house close to water to get raw fish]]) ..
-      listitem_bullet(_[[Build a fish breeder’s house close to the fisher to make sure the fish do not die out]]) ..
-      listitem_bullet(_[[Build two smokeries to smoke raw meat and fish]])
+		_[[Food is very important for mines and military training areas. Establish a well working food environment by building at least one Farm, one Blackroot Farm and a Mill. The two kinds of flour together with Water from a Well will be baked into Bread in a Bakery, so build a Bakery and a Well, too.]] .. paragraphdivider() ..
+      _[[The other two important food wares are Smoked Fish and Smoked Meat. Raw Meat is delivered from a Hunter. A Fisher gets the Fish out of the sea while a Fish Breeder makes sure that a school of fish does not go extinct by breeding more. Make sure that there are always Fish left, otherwise the Fish Breeder won’t be able to breed new ones. The smoking happens in a Smokery, you will need at least two of those.]] .. paragraphdivider() ..
+      listitem_bullet(_[[Build a Farm and a Blackroot Farm]]) ..
+      listitem_bullet(_[[Build a Mill to make Cornflour and Blackroot Flour]]) ..
+      listitem_bullet(_[[Build a Well]]) ..
+      listitem_bullet(_[[Build a Bakery to bake Bread from Cornflour, Blackroot Flour and Water]]) ..
+      listitem_bullet(_[[Build a Hunter’s House to get raw Meat]]) ..
+      listitem_bullet(_[[Build a Fisher’s House close to water to get raw Fish]]) ..
+      listitem_bullet(_[[Build a Fish Breeder’s House close to the Fisher to make sure the Fish do not die out]]) ..
+      listitem_bullet(_[[Build two Smokeries to smoke raw Meat and Fish]])
    )
 }
 
 obj_spidercloth_production = {
    name = "obj_spidercloth_production",
-   title = _"Build a spider farm and a weaving mill",
+   title = _"Build a Spider Farm and a Weaving Mill",
    number = 3,
    body = objective_text(_"Spidercloth Production",
-		_[[The weavers produce spidercloth and tabards in the weaving mill. Spidercloth is needed for the construction of some buildings and clothing, while tabards are the uniforms of soldiers. The weaving mill needs gold yarn and spideryarn as raw material. Spideryarn is produced by the spider farm, while gold yarn is produced by the gold spinning mill out of gold.]] .. paragraphdivider() ..
-      listitem_bullet(_[[Build a weaving mill]]) ..
-      listitem_bullet(_[[Build a spider farm]]) ..
-      listitem_bullet(_[[Build a gold spinning mill]])
+		_[[The Weavers produce Spidercloth and Tabards in the Weaving Mill. Spidercloth is needed for the construction of some buildings and clothing, while Tabards are the uniforms of Soldiers. The Weaving Mill needs Gold Yarn and Spideryarn as raw material. Spideryarn is produced by the Spider Farm, while Gold Yarn is produced by the Gold Spinning Mill out of Gold.]] .. paragraphdivider() ..
+      listitem_bullet(_[[Build a Weaving Mill]]) ..
+      listitem_bullet(_[[Build a Spider Farm]]) ..
+      listitem_bullet(_[[Build a Gold Spinning Mill]])
  )
 }
 
@@ -85,12 +85,12 @@
    title = _"Build industry and mines",
    number = 5,
    body = objective_text(_"Industry and Mines",
-		_[[Iron ore, gold ore and coal are mined in the respective mines. The crystal mine will dig for crystal, quartz and diamond – all of them are precious materials and very rarely found. It will produce a lot of stone while searching for them.]] .. paragraphdivider() ..
-      listitem_bullet(_[[The ores have to be smelted at a smelting works before they can be used. The refined materials are then used in the weapon smithy, the armor smithy and the toolsmithy.]]) .. paragraphdivider() ..
-      listitem_bullet(_[[Build a mine of each type. Make sure to send geologists to the mountain first.]]) ..
-      listitem_bullet(_[[Build a smelting works]]) ..
-      listitem_bullet(_[[Build an armor smithy and a weapon smithy]]) ..
-      listitem_bullet(_[[Build a toolsmithy]])
+		_[[Iron Ore, Gold Ore and Coal are mined in the respective mines. The Crystal Mine will dig for Crystal, Quartz and Diamond – all of them are precious materials and very rarely found. It will produce a lot of Stone while searching for them.]] .. paragraphdivider() ..
+      listitem_bullet(_[[The ores have to be smelted at a Smelting Works before they can be used. The refined materials are then used in the Weapon Smithy, the Armor Smithy and the Toolsmithy.]]) .. paragraphdivider() ..
+      listitem_bullet(_[[Build a mine of each type. Make sure to send Geologists to the mountain first.]]) ..
+      listitem_bullet(_[[Build a Smelting Works]]) ..
+      listitem_bullet(_[[Build an Armor Smithy and a Weapon Smithy]]) ..
+      listitem_bullet(_[[Build a Toolsmithy]])
    )
 }
 
@@ -99,29 +99,29 @@
    title = _"Build training sites for soldiers",
    number = 2,
    body = objective_text(_"Soldier Training Sites",
-		_[[Like all other tribes, the Atlanteans are also able to train soldiers: the dungeon trains attack – the major attribute of the Atlanteans – and the labyrinth trains evasion, health and defense. The items produced by the industry are used to train better soldiers in the two training sites.]] .. paragraphdivider() ..
-      listitem_bullet(_[[Build a dungeon and a labyrinth]])
+		_[[Like all other tribes, the Atlanteans are also able to train Soldiers: the Dungeon trains Attack – the major attribute of the Atlanteans – and the Labyrinth trains Evade, Health and Defense. The items produced by the industry are used to train better soldiers in the two training sites.]] .. paragraphdivider() ..
+      listitem_bullet(_[[Build a Dungeon and a Labyrinth]])
  )
 }
 
 obj_horsefarm_and_warehouse = {
    name = "obj_horsefarm_and_warehouse",
-   title = _"Build a warehouse and a horse farm",
+   title = _"Build a Warehouse and a Horse Farm",
    number = 2,
    body = objective_text(_"Warehouse and Horse Farm",
-		_[[As your road network gets longer and more complicated, you should employ horses to help out your carriers. Horses are bred at horse farms using water and corn. A warehouse will also help to ensure that your transportation system does not collapse.]] .. paragraphdivider() ..
-      listitem_bullet(_[[Build a warehouse]]) ..
-      listitem_bullet(_[[Build a horse farm]])
+		_[[As your road network gets longer and more complicated, you should employ Horses to help out your Carriers. Horses are bred at Horse Farms using Water and Corn. A Warehouse will also help to ensure that your transportation system does not collapse.]] .. paragraphdivider() ..
+      listitem_bullet(_[[Build a Warehouse]]) ..
+      listitem_bullet(_[[Build a Horse Farm]])
   )
 }
 
 obj_build_ships = {
    name = "obj_build_ships",
-   title = _"Build 3 ships to escape from the island",
+   title = _"Build 3 Ships to escape from the island",
    number = 1,
    body = objective_text(_"Escape From the Island",
-		_[[There is a lake at the top of the island. Build three ships in these waters and you might be able to rescue your people before the island is swallowed completely by the ocean.]]  .. paragraphdivider() ..
-      listitem_bullet(_[[Build a shipyard close to the lake to start building ships]])
+		_[[There is a lake at the top of the island. Build three Ships in these waters and you might be able to rescue your people before the island is swallowed completely by the ocean.]]  .. paragraphdivider() ..
+      listitem_bullet(_[[Build a Shipyard close to the lake to start building Ships]])
    )
 }
 
@@ -177,7 +177,7 @@
 	{
 		title = _"Loftomor Speaks",
 		body = loftomor(
-			_([[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 will not run out of trees. Oh, and we mustn’t forget the sawmill, for most buildings can’t be made out of logs 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.]]))
+			_([[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 will not run out of trees. Oh, and we mustn’t forget the Sawmill, for most buildings can’t be made out of Logs 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.]]))
 			.. new_objectives(obj_ensure_build_wares_production)
 	},
 	{
@@ -209,9 +209,9 @@
 		body = colionder(
 			_([[Ahh, but I think this is impossible to change. The preparing and eating of food is something deeply ingrained in us Atlanteans – it is a ceremony that we just need for our well-being. So I guess we cannot take this away from the individuals completely.]])
 			.. paragraphdivider() ..
-			_([[But we might find a compromise in between: for me, making bread is a troublesome task. Grinding the blackroot and corn to flour and then baking the bread is tedious and boring; I feel a more industrial approach would be helpful here. I for one would love to just have fresh bread delivered to my house every day.]])
+			_([[But we might find a compromise in between: for me, making Bread is a troublesome task. Grinding the Blackroot and Corn to flour and then baking the Bread is tedious and boring; I feel a more industrial approach would be helpful here. I for one would love to just have fresh Bread delivered to my house every day.]])
 			.. paragraphdivider() ..
-			_([[Oooh and even more important: the smoking of fish and meat to cleanse them and improve their taste is terrible. My house is full of smoke and stinks for weeks afterwards. Don’t you think that this could be done in a special building where the side effects do not matter? I think those two things would be accepted by the people and would reduce the cooking time without taking away the ritual.]]))
+			_([[Oooh and even more important: the smoking of Fish and Meat to cleanse them and improve their taste is terrible. My house is full of smoke and stinks for weeks afterwards. Don’t you think that this could be done in a special building where the side effects do not matter? I think those two things would be accepted by the people and would reduce the cooking time without taking away the ritual.]]))
 	},
 	{
 		title = _"Jundlina Agrees",
@@ -233,14 +233,14 @@
    {
 		title = _"A Man Comes to Jundlina",
 		body = opol(
-			_([[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 weavers’ guild by arranging the building of a weaving mill and a spider farm? The spiders deliver the finest silk and we will produce the finest spidercloth from it.]])
+			_([[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 weavers’ guild by arranging the building of a Weaving Mill and a Spider Farm? The spiders deliver the finest silk and we will produce the finest Spidercloth from it.]])
 			.. paragraphdivider() ..
-			_([[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.]]))
+			_([[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.]]))
 	},
 	{
 		 title = _"Jundlina Replies",
 		 body = jundlina(_"Jundlina",
-			_([[May Satul warm you too, Opol. I wanted to delay production of spidercloth, but I understand your urgency. Your suggestion sounds fair to me, I will build your weaving mill and spider farm. I will also build a gold spinning mill so that the golden tabards you make will not be golden by name alone.]]))
+			_([[May Satul warm you too, Opol. I wanted to delay production of Spidercloth, but I understand your urgency. Your suggestion sounds fair to me, I will build your Weaving Mill and Spider Farm. I will also build a Gold Spinning Mill so that the Golden Tabards you make will not be golden by name alone.]]))
 			..  new_objectives(obj_spidercloth_production)
 	}
 }
@@ -249,7 +249,7 @@
    {
       title = _"Opol Seeks Out Jundlina",
       body = opol(
-			_([[May Satul warm you, Jundlina! The weaving mill, gold spinning mill and spider farm buildings are complete and are starting their work at this very moment. The weavers’ guild is very grateful for your support and we will stand by our word and deliver the first tabard very soon.]]))
+			_([[May Satul warm you, Jundlina! The Weaving Mill, Gold Spinning Mill and Spider Farm buildings are complete and are starting their work at this very moment. The weavers’ guild is very grateful for your support and we will stand by our word and deliver the first Tabard very soon.]]))
    },
    {
       title = _"Jundlina Replies",
@@ -263,7 +263,7 @@
    {
       title = _"Sidolus Seeks Out Jundlina",
       body = sidolus(
-			_([[May Satul warm you, Jundlina. Have you considered mining for resources 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 toolsmithy. And maybe even more.]]))
+			_([[May Satul warm you, Jundlina. Have you considered mining for resources 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 Toolsmithy. And maybe even more.]]))
    },
    {
       title = _"Jundlina Replies",
@@ -282,7 +282,7 @@
    {
       title = _"Sidolus Seems Contrite",
       body = sidolus(
-			_([[I agree with you and I have punished the troublemakers 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.]]))
+			_([[I agree with you and I have punished the troublemakers 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.]]))
    },
    {
       title = _"Jundlina Replies",
@@ -296,7 +296,7 @@
    {
       title = _"Jundlina Received a Letter",
       body = jundlina(_"Jundlina",
-			_([[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 civilian population.]]))
+			_([[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 civilian population.]]))
    }
 }
 
@@ -304,9 +304,9 @@
    {
       title = _"Jundlina Considers the Economy",
       body = jundlina(_"Jundlina",
-			_([[People are complaining about crowded streets and slow transportation. We need to help out our carriers on the roads. I have decided to build a horse farm so that the horses can help with the heavy wares.]])
+			_([[People are complaining about crowded streets and slow transportation. We need to help out our Carriers on the roads. I have decided to build a Horse Farm so that the Horses can help with the heavy wares.]])
 			.. paragraphdivider() ..
-			_([[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.]]))
+			_([[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.]]))
 			.. new_objectives(obj_horsefarm_and_warehouse)
    }
 }
@@ -357,7 +357,7 @@
 		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 that the ocean is rising quickly. We have to reach higher ground and evacuate everybody and as much wares as we can from the headquarters up the mountains. How can we escape?]]))
+			_([[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 as we can from the Headquarters up the mountains. How can we escape?]]))
 	},
 	{
 		title = _"A Young Man Approaches",
@@ -387,7 +387,7 @@
 		body = jundlina(_"Jundlina",
 			_([[Your red hair is a signal from the fire god. I will trust you and support your plan. Our survival lies in your hands now, Ostur.]])
 			.. paragraphdivider() ..
-			_([[Swift now, we need a house for Ostur next to the lake, and we need planks, logs 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.]]))
+			_([[Swift now, we need a house for Ostur next to the lake, and we need Planks, Logs 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.]]))
 			.. new_objectives(obj_build_ships)
 	}
 }

=== modified file 'campaigns/bar01.wmf/scripting/texts.lua'
--- campaigns/bar01.wmf/scripting/texts.lua	2014-10-31 08:59:54 +0000
+++ campaigns/bar01.wmf/scripting/texts.lua	2015-01-24 14:23:38 +0000
@@ -20,30 +20,30 @@
 -- =======================================================================
 obj_build_rangers = {
    name = "mission rangers",
-   title = _"Build two ranger’s huts",
+   title = _"Build two Ranger’s Huts",
    number = 1,
-   body = objective_text(_"Build two ranger’s huts",
-      listitem_bullet(_"Build a ranger’s hut next to each lumberjack’s hut.") ..
-      listitem_arrow(_"Naturally, trees only grow at a slow rate. To make sure you have enough logs, you have to build rangers.")
+   body = objective_text(_"Build two Ranger’s Huts",
+      listitem_bullet(_"Build a Ranger’s Hut next to each Lumberjack’s Hut.") ..
+      listitem_arrow(_"Naturally, trees only grow at a slow rate. To make sure you have enough Logs, you have to build Rangers.")
    )
 }
 
 obj_claim_northeastern_rocks = {
    name = "mission quarry",
-   title = _"Expand north-east and build a quarry",
+   title = _"Expand north-east and build a Quarry",
    number = 1,
    body = objective_text(_"Expand north-east to the rocks",
-      listitem_bullet(_"Build military buildings (like sentries or barriers) to expand your territory.") ..
-      listitem_bullet(_"Get to the rocks north-east from you and build a quarry there."))
+      listitem_bullet(_"Build military buildings (like Sentries or Barriers) to expand your territory.") ..
+      listitem_bullet(_"Get to the rocks north-east from you and build a Quarry there."))
 }
 
 obj_build_mines = {
    name = "mission mines",
    title = _"Start building mines on the mountain",
    number = 2,
-   body = objective_text(_"Build coal and iron ore mines",
-      listitem_bullet(_"Build a coal mine and an iron ore mine.") ..
-      listitem_arrow(_"To do so, place a flag up on the mountain’s flank to the east (on mountain terrain though, not mountain meadow). When you click on the new flag, you can send geologists there. Because the flag is on a mountain, the geologists will search for ores; otherwise, they would search for water. Then build a mine for both kinds of resources that he will find, choosing the appropriate mine to be built:") ..
+   body = objective_text(_"Build Coal and Iron Ore Mines",
+      listitem_bullet(_"Build a Coal Mine and an Iron Ore Mine.") ..
+      listitem_arrow(_"To do so, place a flag up on the mountain’s flank to the east (on mountain terrain though, not mountain meadow). When you click on the new flag, you can send Geologists there. Because the flag is on a mountain, the Geologists will search for ores; otherwise, they would search for water. Then build a mine for both kinds of resources that he will find, choosing the appropriate mine to be built:") ..
 		"</rt>" ..
 		rt("image=tribes/barbarians/resi_coal1/resi_00.png", p(_"a bit of coal")) ..
 		rt("image=tribes/barbarians/resi_coal2/resi_00.png", p(_"a lot of coal")) ..
@@ -63,88 +63,88 @@
    name = "basic food began",
    title = _"Provide your miners with food",
    number = 3,
-   body = objective_text(_"Build a hunter, a gamekeeper and a tavern",
+   body = objective_text(_"Build a Hunter, a Gamekeeper and a Tavern",
       listitem_bullet(_"In order to work, your miners need food.") ..
-      listitem_arrow(_"A hunter can hunt down animals, while a gamekeeper prevents them from becoming extinct. The meat is then processed in a tavern into lunches for your miners.") .. " " ..
+      listitem_arrow(_"A Hunter can hunt down animals, while a Gamekeeper prevents them from becoming extinct. The Meat is then processed in a Tavern into lunches for your miners.") .. " " ..
       _([[This is only the first example of a ware which has to be refined before being used in a secondary building – others will follow.]]))
 }
 
 obj_begin_farming = {
    name = "farming began",
-   title = _"Bake bread",
+   title = _"Bake Bread",
    number = 3,
-   body = objective_text(_"Build a well, a farm and a bakery",
-      _([[Other ways to produce food – different kinds of food – are fishers and hunters. The wheat of the farms has to be processed with water in a bakery before it becomes edible. You can obtain water by building a well on a spot where your geologists have found a water source.]]))
+   body = objective_text(_"Build a Well, a Farm and a Bakery",
+      _([[Other ways to produce food – different kinds of food – are Fishers and Hunters. The Wheat of the Farms has to be processed with Water in a Bakery before it becomes edible. You can obtain Water by building a Well on a spot where your Geologists have found a water source.]]))
 }
 
 obj_refine_ores = {
    name = "refining began",
    title = _"Refine your mined resources",
    number = 1,
-   body = objective_text(_"Build a smelting works",
-      _[[The iron ore your miners dig up is not usable yet – it has to be melted into iron first.]])
+   body = objective_text(_"Build a Smelting Works",
+      _[[The Iron Ore your miners dig up is not usable yet – it has to be melted into Iron first.]])
 }
 
 obj_enhance_buildings = {
    name = "enhance buildings",
-   title = _"Enhance buildings and build a micro brewery",
+   title = _"Enhance buildings and build a Micro Brewery",
    number = 3,
-   body = objective_text(_[[Enhance a mine and the tavern, and build a micro brewery.]],
-      listitem_bullet(_"Enhance the coal mine or the iron mine to a deep mine, and enhance the tavern to an inn.") ..
-      listitem_bullet(_"Also build a micro brewery.") ..
+   body = objective_text(_[[Enhance a mine and the Tavern, and build a Micro Brewery.]],
+      listitem_bullet(_"Enhance the Coal Mine or the Iron Mine to a deep mine, and enhance the Tavern to an Inn.") ..
+      listitem_bullet(_"Also build a Micro Brewery.") ..
       listitem_arrow(_"A normal mine can only dig up about one third of all the resources that lie beneath it; then it must be enhanced to a deep mine in order to keep it working properly. To enhance a building, choose it and then click the appropriate button in the appearing window.")  ..
       listitem_arrow(_"Workers gain experience by successful work. With enough experience, they become more advanced workers, who are necessary to operate the enhanced buildings. Do not enhance a building before you have enough advanced workers to operate the advanced building!") ..
-      listitem_arrow(_"Such buildings usually have greater demands than the basic kind of that building – for instance, deep mines need snacks instead of rations. You will have to enhance your tavern to an inn in order to produce snacks out of pitta bread AND a second kind of food (meat or fish) AND beer.") ..
+      listitem_arrow(_"Such buildings usually have greater demands than the basic kind of that building – for instance, deep mines need Snacks instead of Rations. You will have to enhance your Tavern to an Inn in order to produce Snacks out of Pitta Bread AND a second kind of food (Meat or Fish) AND Beer.") ..
       _"You may of course enhance all mines to deep mines instantly given you have the workers – bigger mines work a bit faster, smaller mines need cheaper food. It’s up to you which strategy you prefer.")
 }
 
 obj_better_material_1 = {
    name = "build hardener",
-   title = _"Build a wood hardener",
+   title = _"Build a Wood Hardener",
    number = 1,
-   body = objective_text(_"Build a wood hardener",
-      _([[Bigger and better buildings – including all military ones – require better building materials. They cannot be built out of simple logs – the wood has to be refined to blackwood by a wood hardener first. Always remember to build a wood hardener before you run out of blackwood, as without it you cannot expand.]])
+   body = objective_text(_"Build a Wood Hardener",
+      _([[Bigger and better buildings – including all military ones – require better building materials. They cannot be built out of simple Logs – the wood has to be refined to Blackwood by a Wood Hardener first. Always remember to build a Wood Hardener before you run out of Blackwood, as without it you cannot expand.]])
       .. paragraphdivider() ..
-      listitem_bullet(_"Build a wood hardener"))
+      listitem_bullet(_"Build a Wood Hardener"))
 }
 
 obj_better_material_2 = {
    name = "mission grout",
-   title = _"Build a lime kiln and coal economy",
+   title = _"Build a Lime Kiln and Coal economy",
    number = 3,
-   body = objective_text(_"Build a lime kiln fed by a well, and by a charcoal kiln or by a coal mine",
-      _([[Better buildings may also require other improved materials besides blackwood. One of these is grout, which is produced out of raw stone, water and coal by a lime-burner.]])
+   body = objective_text(_"Build a Lime Kiln fed by a Well, and by a Charcoal Kiln or by a Coal Mine",
+      _([[Better buildings may also require other improved materials besides Blackwood. One of these is Grout, which is produced out of Raw Stone, Water and Coal by a Lime-Burner.]])
       .. paragraphdivider() ..
-      _([[You can obtain water by building a well upon a water source, which your geologists can discover when you send them to any flag that is not on a mountain.]])
+      _([[You can obtain Water by building a Well upon a water source, which your Geologists can discover when you send them to any flag that is not on a mountain.]])
       ..paragraphdivider() ..
       "</p></rt>" ..
-      rt("image=pics/menu_geologist.png", p(_"In order to call a geologist to search for water, click on a flag in the area that you want him to search and then on the button labeled ‘Send geologist to explore site’.")
-      .. paragraphdivider() ..
-      _([[Coal can be obtained by building a charcoal kiln or a coal mine. Burning charcoal out of logs is slow. You should only build a charcoal kiln when no coal is available.]])
-      .. paragraphdivider() ..
-      listitem_bullet(_"Build a lime kiln and a well. Additionally, build either a charcoal kiln or a coal mine for coal supply.")))
+      rt("image=pics/menu_geologist.png", p(_"In order to call a Geologist to search for water, click on a flag in the area that you want him to search and then on the button labeled ‘Send geologist to explore site’.")
+      .. paragraphdivider() ..
+      _([[Coal can be obtained by building a Charcoal Kiln or a Coal Mine. Burning charcoal out of Logs is slow. You should only build a Charcoal Kiln when no Coal is available.]])
+      .. paragraphdivider() ..
+      listitem_bullet(_"Build a Lime Kiln and a Well. Additionally, build either a Charcoal Kiln or a Coal Mine for Coal supply.")))
 }
 
 obj_better_material_3 = {
    name = "mission reed_yard",
-   title = _"Build a reed yard",
+   title = _"Build a Reed Yard",
    number = 1,
-   body = objective_text(_"Build a reed yard",
-      _([[The third material necessary for improved buildings is thatch reed, used to cover roofs. Thatch reed is planted by a gardener around his building, the reed yard.]])
+   body = objective_text(_"Build a Reed Yard",
+      _([[The third material necessary for improved buildings is Thatch Reed, used to cover roofs. Thatch Reed is planted by a Gardener around his building, the Reed Yard.]])
       .. paragraphdivider() ..
-      listitem_bullet(_"Build a reed yard"))
+      listitem_bullet(_"Build a Reed Yard"))
 }
 
 obj_build_cattlefarm = {
    name = "mission cattlefarm",
-   title = _"Build a cattle farm",
+   title = _"Build a Cattle Farm",
    number = 1,
-   body = objective_text(_"Build a cattle farm",
-      _([[When roads are under heavy load for a long time, one carrier is usually not enough to transport goods swiftly. Traffic jams are the consequence. Such roads therefore employ a second carrier: an ox that helps to carry the wares. This doubles the transport capacity.]])
-      .. paragraphdivider() ..
-      _([[Oxen are bred in cattle farms out of wheat and water.]])
-      .. paragraphdivider() ..
-      listitem_bullet(_"Build a cattle farm"))
+   body = objective_text(_"Build a Cattle Farm",
+      _([[When roads are under heavy load for a long time, one Carrier is usually not enough to transport goods swiftly. Traffic jams are the consequence. Such roads therefore employ a second carrier: an Ox that helps to carry the wares. This doubles the transport capacity.]])
+      .. paragraphdivider() ..
+      _([[Oxen are bred in Cattle Farms out of Wheat and Water.]])
+      .. paragraphdivider() ..
+      listitem_bullet(_"Build a Cattle Farm"))
 }
 
 
@@ -232,11 +232,11 @@
 order_msg_ranger = {
    title = _"The Advisor",
    body = khantrukh(_"Khantrukh notes…",
-      _[[I see you have already built a quarry and two lumberjack’s huts. That is a good beginning if we want to stay here longer.]]
+      _[[I see you have already built a Quarry and two Lumberjack’s Huts. That is a good beginning if we want to stay here longer.]]
       .. paragraphdivider() ..
       _[[But never forget – these forests are our heritage, entrusted upon us by our ancestors. We must always respect and care for them. What we take, we must give back again.]]
       .. paragraphdivider() ..
-      _[[So, in order to replace the trees we chop down, we should build some ranger’s huts, preferably close to the lumberjack’s huts.]])
+      _[[So, in order to replace the trees we chop down, we should build some Ranger’s Huts, preferably close to the Lumberjack’s Huts.]])
       .. new_objectives(obj_build_rangers)
 }
 
@@ -329,7 +329,7 @@
 order_msg_7_mines_up = {
    title = _"Your Loyal Companion",
    body = boldreth(_"Boldreth laughs…",
-      _([[By Chat’Karuth’s beard, this is amazing! Just imagine what we can use this coal and iron ore for!]])
+      _([[By Chat’Karuth’s beard, this is amazing! Just imagine what we can use this Coal and Iron Ore for!]])
       .. paragraphdivider() ..
       _([[It might even be enough to…]]))
 }
@@ -346,7 +346,7 @@
    body = boldreth(_"Boldreth nods…",
       _([[I have to hand it to you: you are right here, old man.]])
       .. paragraphdivider() ..
-      _([[There seem to be quite a lot of animals in the forests here – we might just hunt down more of them. And, of course, the people would cheer a new tavern – hey, we might call it ‘Thron’s Pride’ or so if you want!]]))
+      _([[There seem to be quite a lot of animals in the forests here – we might just hunt down more of them. And, of course, the people would cheer a new Tavern – hey, we might call it ‘Thron’s Pride’ or so if you want!]]))
       .. new_objectives(obj_basic_food)
 }
 
@@ -355,7 +355,7 @@
    body = khantrukh(_"The elder jumps into the air…",
       _([[Wisdom commands to seek variety.]])
       .. paragraphdivider() ..
-      _([[North of the great mountain is a large plain – why don’t we use the space Mother Nature gave us and build a farm? I sure would enjoy a freshly baked pitta bread for a change…]]))
+      _([[North of the great mountain is a large plain – why don’t we use the space Mother Nature gave us and build a Farm? I sure would enjoy a freshly baked Pitta Bread for a change…]]))
       .. new_objectives(obj_begin_farming)
 }
 
@@ -376,7 +376,7 @@
 order_msg_13_tavern = {
    title = _"A Beautiful Morning",
    body = thron(_"Thron recognizes…",
-      _([[A tavern opened for our people yesterday. While I am hardly in the mood for celebration, I noticed how much this tiny bit of home means to my people. Their songs filled the air until deep in the night, and they were in higher spirits still the day after.]])
+      _([[A Tavern opened for our people yesterday. While I am hardly in the mood for celebration, I noticed how much this tiny bit of home means to my people. Their songs filled the air until deep in the night, and they were in higher spirits still the day after.]])
       .. paragraphdivider() ..
       _([[Maybe we actually are slowly creating a place here which we can… call home.]]))
 }
@@ -384,7 +384,7 @@
 order_msg_14_refine_ore = {
    title = _"Your Loyal Companion",
    body = boldreth(_"Boldreth remarks…",
-      _([[So now that we have both the mines and the food to sustain them, we should bring what our brave miners gain for us into a more useful state. The iron ore has to be melted into iron so that it is ready to be forged into whatever we want. And we need the coal to keep the smelter’s ovens burning.]]))
+      _([[So now that we have both the mines and the food to sustain them, we should bring what our brave miners gain for us into a more useful state. The Iron Ore has to be melted into Iron so that it is ready to be forged into whatever we want. And we need the Coal to keep the Smelter’s ovens burning.]]))
       .. new_objectives(obj_refine_ores)
 }
 
@@ -400,9 +400,9 @@
 order_msg_16_blackwood = {
    title = _"Your Loyal Companion",
    body = boldreth(_"Boldreth seems concerned…",
-      _([[As I just discovered, we are running short on blackwood! We cannot put our warriors into some crumbling huts, and even less so in times as dangerous as ours!]])
+      _([[As I just discovered, we are running short on Blackwood! We cannot put our warriors into some crumbling huts, and even less so in times as dangerous as ours!]])
       .. paragraphdivider() ..
-      _([[We need a wood hardener, and we need one now!]]))
+      _([[We need a Wood Hardener, and we need one now!]]))
       .. new_objectives(obj_better_material_1)
 }
 
@@ -411,14 +411,14 @@
    body = boldreth(_"Boldreth smiles…",
       _([[Well, old friend, this should ensure that our fortifications do not break down with our foes’ first battle cry! Now we can expand safely!]])
       .. paragraphdivider() ..
-      _([[Still, it would not hurt to accumulate some grout for our further campaign; thus we could, in times of need, build a fortress such as the world has never seen before!]]))
+      _([[Still, it would not hurt to accumulate some Grout for our further campaign; thus we could, in times of need, build a Fortress such as the world has never seen before!]]))
       .. new_objectives(obj_better_material_2)
 }
 
 order_msg_18_reed = {
    title = _"The Advisor",
    body = khantrukh(_"Khantrukh steps in…",
-      _([[Chieftain, this is a disgrace! It is well that we can produce grout for mighty fortifications and great buildings now – only this does not prevent our roofs from becoming leaky! Maybe the young ones like spending their nights in the rain, but I just can’t find any sleep with these raindrops dripping on my face!]])
+      _([[Chieftain, this is a disgrace! It is well that we can produce Grout for mighty fortifications and great buildings now – only this does not prevent our roofs from becoming leaky! Maybe the young ones like spending their nights in the rain, but I just can’t find any sleep with these raindrops dripping on my face!]])
       .. paragraphdivider() ..
       _([[Now this is a problem we should do something about!]]))
       .. new_objectives(obj_better_material_3)
@@ -433,9 +433,9 @@
 msg_cattlefarm_00 = {
    title = _"We Need Oxen!",
    body = khantrukh(_"Khantrukh speaks…",
-      _([[As our realm is getting bigger and bigger, the traffic on the roads is overwhelming. Our poor carriers are no longer able to transport the goods as fast as we need them to. I suggest we give them some support by breeding oxen.]])
+      _([[As our realm is getting bigger and bigger, the traffic on the roads is overwhelming. Our poor Carriers are no longer able to transport the goods as fast as we need them to. I suggest we give them some support by breeding Oxen.]])
       .. paragraphdivider() ..
-      _([[They are amazing animals: The ox is as swift as a human being while being much stronger and very frugal: all we need is wheat and water to breed them and they will do their work on the roads loyally and reliably.]]))
+      _([[They are amazing animals: The Ox is as swift as a human being while being much stronger and very frugal: all we need is Wheat and Water to breed them and they will do their work on the roads loyally and reliably.]]))
       .. new_objectives(obj_build_cattlefarm)
 }
 

=== modified file 'campaigns/bar02.wmf/scripting/texts.lua'
--- campaigns/bar02.wmf/scripting/texts.lua	2014-10-30 11:37:38 +0000
+++ campaigns/bar02.wmf/scripting/texts.lua	2015-01-24 14:23:38 +0000
@@ -23,30 +23,30 @@
    body = objective_text(_"Build up a small food economy",
       _"Build up a basic food economy to provide your people with food."
       .. paragraphdivider() ..
-      listitem_bullet(_"Build a fisher’s hut") ..
-      listitem_bullet(_"Build a hunter’s hut") ..
-      listitem_bullet(_"Build a well") ..
-      listitem_bullet(_"Build a farm") ..
-      listitem_bullet(_"Build a bakery"))
+      listitem_bullet(_"Build a Fisher’s Hut") ..
+      listitem_bullet(_"Build a Hunter’s Hut") ..
+      listitem_bullet(_"Build a Well") ..
+      listitem_bullet(_"Build a Farm") ..
+      listitem_bullet(_"Build a Bakery"))
 }
 
 obj_build_cattlefarm = {
    name = "obj_build_cattlefarm",
-   title = _"Build a cattle farm",
+   title = _"Build a Cattle Farm",
    number = 1,
-   body = objective_text(_"Remember to build a cattle farm",
-      _"As your roads grow longer and your economy bigger, you should make good use of your oxen to help transport wares more quickly."
+   body = objective_text(_"Remember to build a Cattle Farm",
+      _"As your roads grow longer and your economy bigger, you should make good use of your Oxen to help transport wares more quickly."
       .. paragraphdivider () ..
-      listitem_bullet(_"Remember to build a cattle farm")
+      listitem_bullet(_"Remember to build a Cattle Farm")
    ),
 }
 
 obj_build_a_donjon = {
    name = "build_a_donjon",
-   title = _"Build a donjon",
+   title = _"Build a Donjon",
    number = 1,
-   body = objective_text(_"Build a donjon",
-      listitem_bullet(_"Build a donjon at the north-east border of your territory to get greater visual range and to protect your people from sudden attacks by enemies."))
+   body = objective_text(_"Build a Donjon",
+      listitem_bullet(_"Build a Donjon at the north-east border of your territory to get greater visual range and to protect your people from sudden attacks by enemies."))
 }
 
 obj_explore_further = {
@@ -54,7 +54,7 @@
    title = _"Explore further",
    number = 1,
    body = objective_text(_"Explore further",
-      listitem_bullet(_"Build more military buildings to explore the area around the headquarters and to ensure the safety of your people."))
+      listitem_bullet(_"Build more military buildings to explore the area around the Headquarters and to ensure the safety of your people."))
 }
 
 obj_build_mining_economy = {
@@ -62,15 +62,15 @@
    title = _"Build a mining infrastructure",
    number = 6,
    body = objective_text(_"Build a mining infrastructure",
-      listitem_bullet(_"Expand your territory to the mountains, send geologists to search for ore and coal and build a mining economy with mines, taverns, smelting works and metal workshop."))
+      listitem_bullet(_"Expand your territory to the mountains, send Geologists to search for ore and coal and build a mining economy with Mines, Taverns, Smelting Works and Metal Workshop."))
 }
 
 obj_build_a_fortress = {
    name = "build_a_fortress",
-   title = _"Build a fortress",
+   title = _"Build a Fortress",
    number = 1,
-   body = objective_text(_"Build a fortress",
-      listitem_bullet(_"Build a fortress to the east of the mountains."))
+   body = objective_text(_"Build a Fortress",
+      listitem_bullet(_"Build a Fortress to the east of the mountains."))
 }
 
 obj_build_training_infrastructure = {
@@ -78,19 +78,19 @@
    title = _"Build a training infrastructure",
    number = 4,
    body = objective_text(_"Build a training infrastructure",
-      listitem_bullet(_"Build a battle arena and a training camp to the west of the mountains.") ..
-      listitem_bullet(_"Enhance your metal workshop to an axfactory in order to produce weapons, and build up a second metal workshop to ensure the production of tools. When the blacksmith reaches his next level (master blacksmith), you can even enhance the axfactory to a war mill, which will produce additional weapons.") ..
-      listitem_bullet(_"Build a helm smithy to the west of the mountains to provide your soldiers with better armor."))
+      listitem_bullet(_"Build a Battle Arena and a Training Camp to the west of the mountains.") ..
+      listitem_bullet(_"Enhance your Metal Workshop to an Axfactory in order to produce weapons, and build up a second Metal Workshop to ensure the production of tools. When the Blacksmith reaches his next level (Master Blacksmith), you can even enhance the Axfactory to a War Mill, which will produce additional weapons.") ..
+      listitem_bullet(_"Build a Helm Smithy to the west of the mountains to provide your soldiers with better armor."))
 }
 
 
 obj_build_a_warehouse = {
    name = "build_a_warehouse",
-   title = _"Build a warehouse",
+   title = _"Build a Warehouse",
    number = 1,
-   body = objective_text(_"Build a warehouse",
-      listitem_bullet(_"Build a warehouse to the west of the mountains.") ..
-      listitem_arrow(_"Warehouses are similar to your headquarters, with the only difference that they aren’t defended by soldiers. It is often wise to build a warehouse when your territory is growing and the paths to your headquarters get longer and longer."))
+   body = objective_text(_"Build a Warehouse",
+      listitem_bullet(_"Build a Warehouse to the west of the mountains.") ..
+      listitem_arrow(_"Warehouses are similar to your Headquarters, with the only difference that they aren’t defended by soldiers. It is often wise to build a Warehouse when your territory is growing and the paths to your Headquarters get longer and longer."))
 }
 
 obj_build_trainingssites = {
@@ -98,10 +98,10 @@
    title = _"Build training sites",
    number = 2,
    body = objective_text(_"Build training sites",
-      listitem_bullet(_"Build a battle arena and a training camp to the west of the mountains.") ..
-      listitem_arrow(_"Training sites like a training camp or a battle arena are used for training soldiers in their different attributes. These attributes are important in fights and the better a soldier is, the higher is the chance to win a fight."
+      listitem_bullet(_"Build a Battle Arena and a Training Camp to the west of the mountains.") ..
+      listitem_arrow(_"Training sites like a Training Camp or a Battle Arena are used for training soldiers in their different attributes. These attributes are important in fights and the better a soldier is, the higher is the chance to win a fight."
       .. "<br>" ..
-		_"The attributes are: health, attack, defense and evade."))
+		_"The attributes are: Health, Attack, Defense and Evade."))
 }
 
 obj_build_weapon_productions = {
@@ -109,15 +109,15 @@
    title = _"Build weapons production",
    number = 3,
    body = objective_text(_"Build weapons production",
-      listitem_bullet(_"Enhance your metal workshop to an axfactory in order to produce weapons, and build up a second metal workshop to ensure the production of tools. When the blacksmith reaches his next level (master blacksmith), you can even enhance the axfactory to a war mill, which will produce additional weapons."))
+      listitem_bullet(_"Enhance your Metal Workshop to an Axfactory in order to produce weapons, and build up a second Metal Workshop to ensure the production of tools. When the Blacksmith reaches his next level (Master Blacksmith), you can even enhance the Axfactory to a War Mill, which will produce additional weapons."))
 }
 
 obj_build_a_helmsmithy = {
    name = "build_a_helm smithy",
-   title=_"Build a helm smithy",
+   title=_"Build a Helm Smithy",
    number = 1,
-   body = objective_text(_"Build a helm smithy",
-      listitem_bullet(_"Build a helm smithy to the west of the mountains to provide your soldiers with better armor."))
+   body = objective_text(_"Build a Helm Smithy",
+      listitem_bullet(_"Build a Helm Smithy to the west of the mountains to provide your soldiers with better armor."))
 }
 
 obj_destroy_kalitaths_army = {
@@ -215,7 +215,7 @@
    posy = 1,
    title = _"The Advisor",
    body = khantrukh(_"Khantrukh nods.",
-		_([[Boldreth is right! We don’t have enough food to survive a long, cold winter. We should start building a well, a fisher’s and a hunter’s hut. And if we find enough space, we should as well build up a farm and a bakery! One of our farmers seems to be very clever – he already got some crops to grow in this cold soil.]]))
+		_([[Boldreth is right! We don’t have enough food to survive a long, cold winter. We should start building a Well, a Fisher’s and a Hunter’s Hut. And if we find enough space, we should as well build up a Farm and a Bakery! One of our farmers seems to be very clever – he already got some crops to grow in this cold soil.]]))
 		.. new_objectives(obj_build_small_food_economy)
 }
 
@@ -230,7 +230,7 @@
    posy = 1,
    title = _"Tracks",
    body = boldreth(_"Boldreth says:",
-		_([[Thron told me that he discovered tracks in the snow to the northeast of our settlement. He has instructed us to build a donjon, to have a greater visual range over the area around our hall to protect our people from sudden attacks.]]))
+		_([[Thron told me that he discovered tracks in the snow to the northeast of our settlement. He has instructed us to build a Donjon, to have a greater visual range over the area around our hall to protect our people from sudden attacks.]]))
 		.. new_objectives(obj_build_a_donjon)
 }
 
@@ -263,7 +263,7 @@
    posy = 1,
    title = _"Fortress Needed",
    body = thron(_"Thron says:",
-		_([[Boldreth and I just explored the area around the three mountains. One major strategic problem of that area seems to be that there are two bigger passages – one north and one south of the central mountain. Those passages are quite hard to control, and so it seems to me like we have only one chance to secure the mountains from enemy hands: we must build a fortress to the east of the mountains!]]))
+		_([[Boldreth and I just explored the area around the three mountains. One major strategic problem of that area seems to be that there are two bigger passages – one north and one south of the central mountain. Those passages are quite hard to control, and so it seems to me like we have only one chance to secure the mountains from enemy hands: we must build a Fortress to the east of the mountains!]]))
 		.. new_objectives(obj_build_a_fortress)
 }
 
@@ -271,7 +271,7 @@
    posy = 1,
    title = _"Fortress Completed",
    body = thron(_"Thron says:",
-		_([[Finally! The fortress has just been completed, so the entrance to our settlement should be safe for now. For the future, we might think on building some more fortifications like barriers and donjons at the passages, but for now we can take a deep breath.]]))
+		_([[Finally! The Fortress has just been completed, so the entrance to our settlement should be safe for now. For the future, we might think on building some more fortifications like Barriers and Donjons at the passages, but for now we can take a deep breath.]]))
 }
 
 order_msg_6_build_enhanced_economy_and_training = {
@@ -280,7 +280,7 @@
    body = boldreth(_"Boldreth says:",
 		_([[Our mining economy seems to work fine, that is already good news! Anyway, there are still a lot of men and women waiting in our hall to get a task, so they can help our soldiers to prepare for the war to come.]])
 		.. paragraphdivider() ..
-		_([[Our geologists found a lot more deposits of iron ore, coal and even gold. We should enhance our current mines as soon as our miners are more experienced. We should build up some more mines, a bigger food infrastructure to always supply our men with sufficient food and a further processing economy. But that’s still not everything – most of our soldiers are quite young and neither have a good weapon nor are they well trained. We should build up training sites to prepare them for their future tasks.]]))
+		_([[Our Geologists found a lot more deposits of Iron Ore, Coal and even Gold. We should enhance our current mines as soon as our miners are more experienced. We should build up some more mines, a bigger food infrastructure to always supply our men with sufficient food and a further processing economy. But that’s still not everything – most of our soldiers are quite young and neither have a good weapon nor are they well trained. We should build up training sites to prepare them for their future tasks.]]))
 		.. new_objectives(obj_build_training_infrastructure)
 }
 
@@ -310,6 +310,6 @@
 cattlefarm_01 = {
    title = _"Faster Transportation",
    body = khantrukh(_"Khantrukh says:",
-		_([[Chieftain, remember the poor carriers: Our roads get longer and longer and the burden on their shoulders never gets lighter. We should breed more oxen to make their work lighter and our transportation more efficient.]]))
+		_([[Chieftain, remember the poor Carriers: Our roads get longer and longer and the burden on their shoulders never gets lighter. We should breed more Oxen to make their work lighter and our transportation more efficient.]]))
 		.. new_objectives(obj_build_cattlefarm),
 }

=== modified file 'campaigns/campaigns.conf'
--- campaigns/campaigns.conf	2014-10-28 12:50:28 +0000
+++ campaigns/campaigns.conf	2015-01-24 14:23:38 +0000
@@ -37,7 +37,7 @@
 camptribe1=_"Empire"
 campdiff1=1
 campdiffdescr1=_"Easy. Introduces the Empire"
-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."
+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 Introduction
 campname2=_"The Run for the Fire"

=== modified file 'campaigns/emp01.wmf/scripting/texts.lua'
--- campaigns/emp01.wmf/scripting/texts.lua	2014-10-30 11:37:38 +0000
+++ campaigns/emp01.wmf/scripting/texts.lua	2015-01-24 14:23:38 +0000
@@ -28,43 +28,43 @@
    title=_"Build a barracks",
    number = 1,
    body = objective_text(_"Barracks",
-      listitem_bullet(_[[Build a barracks at the red house symbol on the east side of the forests, to the right of your provisional headquarters.]])
+      listitem_bullet(_[[Build a Barracks at the red house symbol on the east side of the forests, to the right of your provisional Headquarters.]])
    ),
 }
 
 obj_build_lumberjack = {
    name = "build_lumberjack",
-   title=_"Build a lumberjack’s house",
+   title=_"Build a Lumberjack’s House",
    number = 1,
    body = objective_text(_"Lumberjack’s House",
-      listitem_bullet(_[[Build a lumberjack’s house at the red house symbol, south of your provisional headquarters.]])
+      listitem_bullet(_[[Build a Lumberjack’s House at the red house symbol, south of your provisional Headquarters.]])
    ),
 }
 
 obj_build_sawmill_and_lumberjacks = {
    name = "build_sawmill_and_lumberjacks",
-   title=_"Build 2 lumberjack’s houses and a sawmill",
+   title=_"Build 2 Lumberjack’s Houses and a Sawmill",
    number = 3,
    body = objective_text(_"Two Lumberjack’s Houses and a Sawmill",
-      listitem_bullet(_[[Build two more lumberjack’s houses and a sawmill as soon as there is enough space for them.]])
+      listitem_bullet(_[[Build two more Lumberjack’s Houses and a Sawmill as soon as there is enough space for them.]])
    ),
 }
 
 obj_build_forester = {
    name = "build_forester",
-   title=_"Build a forester’s house",
+   title=_"Build a Forester’s House",
    number = 1,
    body = objective_text(_"Forester’s House",
-      listitem_bullet(_[[Build a forester’s house to preserve the wood resources of this island.]])
+      listitem_bullet(_[[Build a Forester’s House to preserve the wood resources of this island.]])
    ),
 }
 
 obj_build_quarry = {
    name = "build_quarry",
-   title=_"Build a quarry",
+   title=_"Build a Quarry",
    number = 5,
    body = objective_text(_"Quarry",
-      listitem_bullet(_[[Build a quarry in the south to cut some stones and marble out of the rocks.]]) ..
+      listitem_bullet(_[[Build a Quarry in the south to cut some Stones and Marble out of the rocks.]]) ..
       listitem_arrow(_[[These might be used for future buildings.]])
    ),
 }
@@ -77,15 +77,15 @@
 diary_page_1 = {
    title =_ "A Dark Night",
    body=lutius(_"Diary of Lutius",
-		_([[What has become of our Empire? I really ask this question – why did my king forbid me from fighting against that monstrous barbarian tribe, who first acted as a peaceful friend and then attacked my army in the darkest night?]])
+		_([[What has become of our Empire? I really ask this question – why did my king forbid me from fighting against that monstrous Barbarian tribe, who first acted as a peaceful friend and then attacked my army in the darkest night?]])
 		.. paragraphdivider() ..
-		_([[With an army of 150 men, I was assigned to patrol on our northern frontier, which lies near the Galdin Mountains in a great, beautiful and ancient forest. Soon, we met a barbarian tribe, which at first was friendly. A few of my men even traded with them and their kids came to us, to admire our clean and tidy uniforms and weapons.]])
+		_([[With an army of 150 men, I was assigned to patrol on our northern frontier, which lies near the Galdin Mountains in a great, beautiful and ancient forest. Soon, we met a Barbarian tribe, which at first was friendly. A few of my men even traded with them and their kids came to us, to admire our clean and tidy uniforms and weapons.]])
 		.. paragraphdivider() ..
 		_([[But during our fifth night in that region, they attacked us with no reason. I lost dozens of good men, and found myself imprisoned and brought to their chieftain. He spat at me, mocked me and told me to leave this land forever. He did not want new land and did not want our land, but he told me that THIS forest was their land – and it would stay theirs until the ghosts took the last man of his folk!]])
 		.. paragraphdivider() ..
-		_([[Three weeks later, I returned to Fremil to speak with our king. He was furious at the Barbarians, yet forbade any attack on these tribes. He believed that our army was too weak to survive in a war against the barbarians.]])
+		_([[Three weeks later, I returned to Fremil to speak with our king. He was furious at the Barbarians, yet forbade any attack on these tribes. He believed that our army was too weak to survive in a war against the Barbarians.]])
 		.. paragraphdivider() ..
-		_([[Still, I saw no way that I could erase my shame without fighting against these barbarians. So, I left Fremil by boat to find a new world and a new life for myself, somewhere in the south. Now I am sailing on the perl-gulf with my family, some of my friends and a few of my best warriors.]])),
+		_([[Still, I saw no way that I could erase my shame without fighting against these Barbarians. So, I left Fremil by boat to find a new world and a new life for myself, somewhere in the south. Now I am sailing on the perl-gulf with my family, some of my friends and a few of my best warriors.]])),
    w=500,
    posy=1,
 }
@@ -119,7 +119,7 @@
 		.. paragraphdivider() ..
 		_([[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.]])
 		.. paragraphdivider() ..
-		_([[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.]]))
+		_([[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.]]))
 		.. new_objectives(obj_build_barracks),
    w=400,
 }
@@ -128,7 +128,7 @@
 saledus_2 = {
    title=_"Safe For Now",
    body= saledus(_"Saledus speaks with a sigh of relief…",
-		_([[Sire, I saw that the construction of the barracks was completed, so I have assigned one of my best soldiers to it to keep watch on the desert.]])
+		_([[Sire, I saw that the construction of the Barracks was completed, so I have assigned one of my best soldiers to it to keep watch on the desert.]])
 		.. paragraphdivider() ..
 	_([[This is a good step forward. Now we can feel a bit safer and can look forward to repairing our ship.]])),
    w=400,
@@ -139,9 +139,9 @@
    body= amalea(_"Amalea smiles…",
 		_([[Hey Lutius, I just met Saledus outside.]])
 		.. paragraphdivider() ..
-		_([[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.]])
+		_([[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.]])
 		.. paragraphdivider() ..
-		_([[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.]]))
+		_([[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.]]))
 		.. new_objectives(obj_build_lumberjack),
    w=400,
 }
@@ -149,9 +149,9 @@
 amalea_2 = {
    title=_"Young Amalea",
    body= amalea(_"Amalea recommends…",
-		_([[Hey Lutius, I got the message that our first lumberjack has started his work today. Perhaps it would be a good idea to wait until he cleans enough space for constructing two more lumberjack’s houses, so that we can harvest the logs faster.]])
+		_([[Hey Lutius, I got the message that our first Lumberjack has started his work today. Perhaps it would be a good idea to wait until he cleans enough space for constructing two more Lumberjack’s Houses, so that we can harvest the Logs faster.]])
 		.. paragraphdivider() ..
-		_([[But unfortunately the logs are useless for repairing our ship – we need refined lumber, like every ship and every bigger building needs, too. So we should build a sawmill – as soon as we have enough space for this.]]))
+		_([[But unfortunately the Logs are useless for repairing our ship – we need Planks, like every ship and every bigger building needs, too. So we should build a Sawmill – as soon as we have enough space for this.]]))
 		.. new_objectives(obj_build_sawmill_and_lumberjacks),
    w=400,
 }
@@ -161,9 +161,9 @@
    body= amalea(_"Amalea comes in…",
 		_([[Hi Lutius, I’ve got two important things to talk about… First the good news:]])
 		.. paragraphdivider() ..
-		_([[I noticed that the construction of the sawmill is complete, so we can begin to refine the logs that the lumberjacks are harvesting into lumber.]])
+		_([[I noticed that the construction of the Sawmill is complete, so we can begin to refine the Logs that the Lumberjacks are harvesting into Planks.]])
 		.. paragraphdivider() ..
-		_([[But that’s just about the only positive thing I know to talk about. The bad news is that our lumberjacks harvest at an incredible speed. There are almost no trees left on this island.]])
+		_([[But that’s just about the only positive thing I know to talk about. The bad news is that our Lumberjacks harvest at an incredible speed. There are almost no trees left on this island.]])
 		.. paragraphdivider() ..
 		_([[Lutius, these trees provide shelter from the sandstorms that sweep in from the desert and shade on the hot days, and they are the home of so many gentle animals. We shouldn’t leave this island a complete desert.]])
 		.. paragraphdivider() ..
@@ -175,7 +175,7 @@
 saledus_3 = {
    title=_"Thinking About the Future",
    body= saledus(_"Saledus notes…",
-		_([[Hey, my good old friend. I just thought about the rocks standing on the south shore of this land. Perhaps we could cut out some useful hard stones and beautiful marble.]])
+		_([[Hey, my good old friend. I just thought about the rocks standing on the south shore of this land. Perhaps we could cut out some useful hard Stones and beautiful Marble.]])
 		.. paragraphdivider() ..
 		_([[The repair of our ship will take a few weeks, anyway, and the resources we harvest now might be the base of strong and big buildings in another land.]]))
 		.. new_objectives(obj_build_quarry),
@@ -185,7 +185,7 @@
 saledus_4 = {
    title=_"A Step Forward",
    body= saledus(_"Saledus looks promising…",
-		_([[Hey Lutius, today we got a lot closer to our first castle. The quarry to the south began its work today and will soon provide us with stones and beautiful marble.]])
+		_([[Hey Lutius, today we got a lot closer to our first Castle. The Quarry to the south began its work today and will soon provide us with Stones and beautiful Marble.]])
 		.. paragraphdivider() ..
 		_([[Now we truly can look forward to settling down on another island.]])),
    w=400,

=== modified file 'campaigns/emp02.wmf/scripting/texts.lua'
--- campaigns/emp02.wmf/scripting/texts.lua	2014-10-30 11:37:38 +0000
+++ campaigns/emp02.wmf/scripting/texts.lua	2015-01-24 14:23:38 +0000
@@ -28,16 +28,16 @@
    title =_"Build up a wood economy",
    number = 5,
    body = objective_text(_"Wood Economy",
-      listitem_bullet(_[[Build three lumberjack’s houses, a forester’s house and a sawmill.]])
+      listitem_bullet(_[[Build three Lumberjack’s Houses, a Forester’s House and a Sawmill.]])
    ),
 }
 
 obj_build_quarry = {
    name = "build_quarry ",
-   title =_"Build a quarry",
+   title =_"Build a Wuarry",
    number = 1,
    body = objective_text(_"Quarry",
-      listitem_bullet(_[[Build a quarry to the south of your headquarters.]])
+      listitem_bullet(_[[Build a Wuarry to the south of your Headquarters.]])
    ),
 }
 
@@ -46,25 +46,25 @@
    title =_"Protect your colony",
    number = 1,
    body = objective_text(_"Protect Your Colony",
-      listitem_bullet(_[[Build some barracks and sentries around the colony.]])
+      listitem_bullet(_[[Build some Barracks and Sentries around the colony.]])
    ),
 }
 
 obj_build_marblemine = {
    name = "build_marblemine ",
-   title =_"Start mining marble",
+   title =_"Start mining Marble",
    number = 1,
    body = objective_text(_"Marble",
-      listitem_bullet(_[[Expand to the east, to start mining marble from the mountain.]])
+      listitem_bullet(_[[Expand to the east, to start mining Marble from the mountain.]])
    ),
 }
 
 obj_build_mining_infrastructure = {
    name = "build_mining_infrastructure ",
-   title =_"Build a stonemason and mining infrastructure",
+   title =_"Build a Stonemason and mining infrastructure",
    number = 7,
    body = objective_text(_"Stonemason and Mining Infrastructure",
-      listitem_bullet(_[[Build a stonemason and then a complete mining and production infrastructure (coal mine and / or charcoal kiln, iron ore mine, toolsmithy, weapon smithy, armor smithy and smelting works).]])
+      listitem_bullet(_[[Build a Stonemason and then a complete mining and production infrastructure (Coal Mine and / or Charcoal Kiln, Iron Ore Mine, Toolsmithy, Weapon Smithy, Armor Smithy and Smelting Works).]])
    ),
 }
 
@@ -73,10 +73,10 @@
    title =_"Provide your miners with food",
    number = 1,
    body = objective_text(_"Food For Your Miners",
-      listitem_bullet(_[[To produce some sustaining food for our miners, we could build up a tavern. To supply them with some good and strong drinks, we could build up a brewery and a winery.]]) ..
-      listitem_bullet(_[[Of course this means we will need more resources for preparing this food – like fish, meat or bread. To provide these foodstuffs, you would have to build a fisher’s house, a farm, a mill and a bakery.]]) ..
-      listitem_bullet(_[[Maybe you will also need a hunter’s house, a piggery, a vineyard and some wells.]]) ..
-      listitem_arrow(_[[It’s up to you what you want to build. But remember – coal and iron ore mines need beer, marble and gold mines need wine and all mines need at least rations, which are produced out of bread OR meat OR fish.]])
+      listitem_bullet(_[[To produce some sustaining food for our miners, we could build up a Tavern. To supply them with some good and strong drinks, we could build up a Brewery and a Winery.]]) ..
+      listitem_bullet(_[[Of course this means we will need more resources for preparing this food – like Fish, Meat or Bread. To provide these foodstuffs, you would have to build a Fisher’s House, a Farm, a Mill and a Bakery.]]) ..
+      listitem_bullet(_[[Maybe you will also need a Hunter’s House, a Piggery, a Vineyard and some Wells.]]) ..
+      listitem_arrow(_[[It’s up to you what you want to build. But remember – Coal and Iron Ore Mines need Beer, Marble and Gold Mines need Wine and all mines need at least Rations, which are produced out of Bread OR Meat OR Fish.]])
    ),
 }
 
@@ -85,18 +85,18 @@
    title =_"Protect your eastern frontier",
    number = 1,
    body = objective_text(_"Protect Your Eastern Frontier",
-      listitem_bullet(_[[Build up stronger military buildings, such as an outpost, a barrier or a tower, on the eastern frontier.]]) ..
-      listitem_arrow(_[[To watch deep inside the enemy territory, build a tower.]])
+      listitem_bullet(_[[Build up stronger military buildings, such as an Outpost, a Barrier or a Tower, on the eastern frontier.]]) ..
+      listitem_arrow(_[[To watch deep inside the enemy territory, build a Tower.]])
    ),
 }
 
 obj_remove_the_barbarians = {
    name = "remove_the_barbarians ",
-   title =_"Destroy the barbarian tribe",
+   title =_"Destroy the Barbarian tribe",
    number = 2,
    body = objective_text(_"Destroy the Barbarian Tribe",
-      listitem_bullet(_[[As soon as you have enough soldiers, attack and completely destroy the barbarian buildings.]]) ..
-      listitem_bullet(_[[Finally, build up a fortress on the peninsula (near where the barbarian headquarters stood before), to avoid new settlements of other tribes in that region.]])
+      listitem_bullet(_[[As soon as you have enough Soldiers, attack and completely destroy the Barbarian buildings.]]) ..
+      listitem_bullet(_[[Finally, build up a Fortress on the peninsula (near where the Barbarian Headquarters stood before), to avoid new settlements of other tribes in that region.]])
    ),
 }
 
@@ -118,9 +118,9 @@
    body= lutius(_"Diary of Lutius",
 		_([[As Saledus and I walked through these wonderful forests in the north, we felt that our future had just begun. This land is so peaceful, good and beautiful, I could stay here until the end of my life.]])
 		.. paragraphdivider() ..
-		_([[But until that day, may many years pass! For now, we must concentrate on the present, and build a few lumberjack’s houses and a sawmill to produce some basic building materials.]])
+		_([[But until that day, may many years pass! For now, we must concentrate on the present, and build a few Lumberjack’s Houses and a Sawmill to produce some basic building materials.]])
 		.. paragraphdivider() ..
-		_([[But we shouldn’t forget to preserve this natural bounty. These forests should last forever, so we really should build a forester’s house too.]]))
+		_([[But we shouldn’t forget to preserve this natural bounty. These forests should last forever, so we really should build a Forester’s House too.]]))
 		.. new_objectives(obj_build_woodeconomy)
 }
 
@@ -128,9 +128,9 @@
    title =_ "The Rocks",
    posy = 1,
    body= lutius(_"Diary of Lutius",
-		_([[Later, I walked down to the rocks in the south and looked for a place where we could build a quarry to get some hard stone for our larger buildings.]])
+		_([[Later, I walked down to the rocks in the south and looked for a place where we could build a Quarry to get some hard Stone for our larger buildings.]])
 		.. paragraphdivider() ..
-		_([[Again, I felt like I was in paradise when I noticed that some marble-like stones were among the rocks. It seems that we will soon be able to build strong, luxurious buildings, like those we were accustomed to in Fremil.]]))
+		_([[Again, I felt like I was in paradise when I noticed that some Marble-like stones were among the rocks. It seems that we will soon be able to build strong, luxurious buildings, like those we were accustomed to in Fremil.]]))
 		.. new_objectives(obj_build_quarry)
 }
 
@@ -145,7 +145,7 @@
    title =_ "Stone for the Colony",
    posy=1,
    body= lutius(_"Diary of Lutius",
-_[[Great! Today the building of the quarry was completed. Now we will get enough stone to construct larger buildings.]]),
+_[[Great! Today the building of the Quarry was completed. Now we will get enough Stone to construct larger buildings.]]),
 }
 
 saledus_1 = {
@@ -156,27 +156,27 @@
 		.. paragraphdivider() ..
 		_([[Perhaps the people aboard that ship were caught in the same storm which brought us to Malac’ Mor – and were brought to this island.]])
 		.. paragraphdivider() ..
-		_([[I beg you to be cautious and to build some barracks or sentries around our colony.]]))
+		_([[I beg you to be cautious and to build some Barracks or Sentries around our colony.]]))
 		.. new_objectives(obj_build_military_buildings)
 }
 
 saledus_2 = {
    title =_ "Marble on the Mountain",
    body= saledus(_"Saledus smiles",
-		_([[Lutius, I’ve got good news for you: As I walked to the east, I found a larger mountain. I am not absolutely sure – a geologist should check if I am right – but I believe we could mine marble from some places on the mountain.]])
-		.. paragraphdivider() ..
-		_([[It would be a good source for bolstering our supply of quality marble, beyond the meager quantities available from the quarry. Perhaps you were right when you said that this island was like paradise.]])
-		.. paragraphdivider() ..
-		_([[Let us expand to that mountain and start mining marble.]]))
+		_([[Lutius, I’ve got good news for you: As I walked to the east, I found a larger mountain. I am not absolutely sure – a Geologist should check if I am right – but I believe we could mine Marble from some places on the mountain.]])
+		.. paragraphdivider() ..
+		_([[It would be a good source for bolstering our supply of quality Marble, beyond the meager quantities available from the Quarry. Perhaps you were right when you said that this island was like paradise.]])
+		.. paragraphdivider() ..
+		_([[Let us expand to that mountain and start mining Marble.]]))
 		.. new_objectives(obj_build_marblemine)
 }
 
 saledus_3 = {
    title =_ "Further Mountains",
    body= saledus(_"Saledus is amazed",
-		_([[By the Gods, this is an unbelievable stroke of fortune! There are two more mountains, and it seems that one has a large quantity of coal and the other of iron ore. We should immediately start to build iron ore and coal mines (or at least charcoal kilns), smelting works, toolsmithies, armor and weapon smithies.]])
+		_([[By the Gods, this is an unbelievable stroke of fortune! There are two more mountains, and it seems that one has a large quantity of Coal and the other of Iron Ore. We should immediately start to build Iron Ore and Coal Mines (or at least Charcoal Kilns), Smelting Works, Toolsmithies, Armor and Weapon Smithies.]])
 		.. paragraphdivider() ..
-		_([[However: for all these bigger buildings, we need better and more elegant building materials. So, let’s build a stonemason, who will cut columns from marble.]])
+		_([[However: for all these bigger buildings, we need better and more elegant building materials. So, let’s build a Stonemason, who will cut Columns from Marble.]])
 		.. paragraphdivider() ..
 		_([[After everything, we can now begin to live like we did in Fremil.]]))
 		.. new_objectives(obj_build_mining_infrastructure)
@@ -207,7 +207,7 @@
    body= lutius(_"Diary of Lutius",
 		_([[By the Gods! This is absolutely terrible. It seems as if we stand close to a test – and it seems as if Saledus was right with his fear concerning the shipwreck he found.]])
 		.. paragraphdivider() ..
-		_([[Today, as I walked down to the eastern shore, I got a shock. I caught sight of one of those hated, evil, barbarian tribes with whom we have had so many problems before.]])
+		_([[Today, as I walked down to the eastern shore, I got a shock. I caught sight of one of those hated, evil, Barbarian tribes with whom we have had so many problems before.]])
 		.. paragraphdivider() ..
 		_([[At first, I was naive and hoped that they were peaceful, but as soon as one of them saw me, they charged towards me and started attacking me with their throwing-spears. Thanks be to the Gods that I was able to flee and hide myself, before retreating back to our colony under cover of darkness.]])
 		.. paragraphdivider() ..
@@ -229,9 +229,9 @@
    body= lutius(_"Diary of Lutius",
 		_([[Today is a proud day. We have fought for our new home and risen victorious.]])
 		.. paragraphdivider() ..
-		_([[There are still a few barbarians hiding on our island, but I am sure that we will find them soon. Every barbarian who doesn’t attack us will be put in a boat with the other peaceful ones, and sent back to their country.]]))
+		_([[There are still a few Barbarians hiding on our island, but I am sure that we will find them soon. Every Barbarian who doesn’t attack us will be put in a boat with the other peaceful ones, and sent back to their country.]]))
 		..  objective_text(_"Victory",
-		_[[You have established a working economy, trained new soldiers and driven the barbarians from the island.]])
+		_[[You have established a working economy, trained new soldiers and driven the Barbarians from the island.]])
 }
 
 seven_days_later = {

=== modified file 'campaigns/tutorial01_basic_control.wmf/scripting/texts.lua'
--- campaigns/tutorial01_basic_control.wmf/scripting/texts.lua	2014-11-11 10:21:43 +0000
+++ campaigns/tutorial01_basic_control.wmf/scripting/texts.lua	2015-01-24 14:23:38 +0000
@@ -39,9 +39,9 @@
    field = sf,
    body = rt(
       h1(_"Let’s dive right in!") ..
-      p(_[[There are three different tribes in Widelands: the Barbarians, the Empire and the Atlanteans. All tribes have a different economy, strength and weaknesses, but the general gameplay is the same for all. We will play the barbarians for now.]]) ..
-      p(_[[You will usually start the game with one headquarters. This is the big building with the blue flag in front of it. The headquarters is a warehouse that stores wares, workers and soldiers. Some wares are needed for building houses, others for making other wares. Obviously, the wares in the headquarters will not last forever, so you must make sure to replace them. The most important wares in the early game are the basic construction wares: logs and raw stone. Let’s make sure that we do not run out of logs. For this, we need a lumberjack and a hut for him to stay in.]]) ..
-      p(_[[We need to find a nice place for the lumberjack’s hut. To make this easier, we can activate ‘Show Building Spaces’. There are two ways you can do this, either by clicking on the ‘Show Building Spaces’ button at the bottom of the screen, which is the fourth one from the left. Or you can use the SPACE key to toggle it.]]) ..
+      p(_[[There are three different tribes in Widelands: the Barbarians, the Empire and the Atlanteans. All tribes have a different economy, strength and weaknesses, but the general gameplay is the same for all. We will play the Barbarians for now.]]) ..
+      p(_[[You will usually start the game with one Headquarters. This is the big building with the blue flag in front of it. The Headquarters is a warehouse that stores Wares, Workers and Soldiers. Some wares are needed for building houses, others for making other wares. Obviously, the wares in the Headquarters will not last forever, so you must make sure to replace them. The most important wares in the early game are the basic construction wares: Logs and Raw Stone. Let’s make sure that we do not run out of Logs. For this, we need a Lumberjack and a hut for him to stay in.]]) ..
+      p(_[[We need to find a nice place for the Lumberjack’s Hut. To make this easier, we can activate ‘Show Building Spaces’. There are two ways you can do this, either by clicking on the ‘Show Building Spaces’ button at the bottom of the screen, which is the fourth one from the left. Or you can use the SPACE key to toggle it.]]) ..
       paragraphdivider() ..
       listitem_bullet(_[[Left-click the ‘OK’ button to close this box and then try it.]])
    ),
@@ -60,7 +60,7 @@
    position = "topright",
    field = first_lumberjack_field,
    body = rt(
-      p(_[[There you go. I will explain about all those symbols in a minute. First, let me show you how to make a lumberjack’s hut and how to connect it with a road. There is a sweet spot for a lumberjack right next to those trees. I’ll describe the steps I will take and then ask you to click on the ‘OK’ button for me to demonstrate.]])
+      p(_[[There you go. I will explain about all those symbols in a minute. First, let me show you how to make a Lumberjack’s Hut and how to connect it with a road. There is a sweet spot for a Lumberjack right next to those trees. I’ll describe the steps I will take and then ask you to click on the ‘OK’ button for me to demonstrate.]])
    ),
    h = 300,
    w = 350
@@ -70,7 +70,7 @@
    title = _"Building the Lumberjack",
    position = "topright",
    body = rt(
-      p(_[[First, I’ll left-click on the symbol where I want the lumberjack’s hut to be built. A window will appear where I can choose between buildings. Because I’ll click a yellow house symbol – which means that its field can house medium and small buildings – I am presented with all the medium buildings that I can build. The lumberjack’s hut is a small building, so I will go on to select the small buildings tab. Then I’ll choose the lumberjack’s hut.]]) ..
+      p(_[[First, I’ll left-click on the symbol where I want the Lumberjack’s Hut to be built. A window will appear where I can choose between buildings. Because I’ll click a yellow house symbol – which means that its field can house medium and small buildings – I am presented with all the medium buildings that I can build. The Lumberjack’s Hut is a small building, so I will go on to select the small buildings tab. Then I’ll choose the Lumberjack’s Hut.]]) ..
       paragraphdivider() ..
       listitem_bullet(_[[Click the ‘OK’ button to watch me. I’ll go really slowly: I will click – then select the tab – and finally I’ll choose the building.]])
    ),
@@ -81,7 +81,7 @@
    title = _"Building a Connecting Road",
    position = "topright",
    body = rt(
-      p(_[[That won’t do yet. I still need to connect the lumberjack’s hut to the rest of my road network. After ordering the construction site, I was automatically put into road building mode, so all I have to do is click on the blue flag in front of my headquarters.]])
+      p(_[[That won’t do yet. I still need to connect the Lumberjack’s Hut to the rest of my road network. After ordering the construction site, I was automatically put into road building mode, so all I have to do is click on the blue flag in front of my Headquarters.]])
    ),
    show_instantly = true,
    h = 300,
@@ -92,7 +92,7 @@
    title = _"Building a Connecting Road",
    position = "topright",
    body = rt(
-      p(_[[That won’t do yet. I still need to connect the lumberjack’s hut to the rest of my road network. You have disabled the option ‘Start building road after placing a flag’ (to change that, choose ‘Options’ in the Widelands main menu). Therefore, I have entered the road building mode manually. I will tell you later how to do that. To build the road, all I have to do now is click on the blue flag in front of my headquarters.]])
+      p(_[[That won’t do yet. I still need to connect the Lumberjack’s Hut to the rest of my road network. You have disabled the option ‘Start building road after placing a flag’ (to change that, choose ‘Options’ in the Widelands main menu). Therefore, I have entered the road building mode manually. I will tell you later how to do that. To build the road, all I have to do now is click on the blue flag in front of my Headquarters.]])
    ),
    show_instantly = true,
    h = 300,
@@ -103,7 +103,7 @@
    title = _"Waiting for the Lumberjack to Go Up",
    position = "topright",
    body = rt(
-      p(_[[Now watch closely while a builder leaves the headquarters and goes to the construction site. Also, a carrier will take position in between the two blue flags and carry wares from one blue flag to the other.]])
+      p(_[[Now watch closely while a Builder leaves the Headquarters and goes to the construction site. Also, a Carrier will take position in between the two blue flags and carry wares from one blue flag to the other.]])
    ),
    h = 300,
    w = 350
@@ -113,7 +113,7 @@
    title = _"Placing Another Flag",
    position = "topright",
    body = rt(
-      p(_[[Nice how they are working, isn’t it? But the poor carrier has a very long way to go. We can make it easier for him (and more efficient for us) by placing another blue flag on the road.]]) ..
+      p(_[[Nice how they are working, isn’t it? But the poor Carrier has a very long way to go. We can make it easier for him (and more efficient for us) by placing another blue flag on the road.]]) ..
       paragraphdivider() ..
       listitem_bullet(_[[You try it this time: click on the yellow flag symbol in between the two blue flags we just placed and then click on the]])
    ) ..
@@ -121,12 +121,12 @@
    ),
    h = 300,
    obj_name = "build_flag_on_road_to_lumberjack",
-   obj_title = _"Build a flag to divide the road to the lumberjack",
+   obj_title = _"Build a flag to divide the road to the Lumberjack",
    obj_body = rt(
       h1(_"Build a Flag on the Road") ..
       p(_[[The shorter your road segments are, the faster your wares will be transported. You should therefore make sure that your roads have as many flags as possible.]]) ..
       paragraphdivider() ..
-      listitem_bullet(_[[Build a blue flag now in the middle of the road that connects your headquarters to your lumberjack’s hut.]])
+      listitem_bullet(_[[Build a blue flag now in the middle of the road that connects your Headquarters to your Lumberjack’s Hut.]])
    )
 }
 
@@ -146,7 +146,7 @@
    position = "topright",
    body = rt(
       p(_[[I wanted to teach you how to build new flags, but it seems you have already found out on your own. Well done!]]) ..
-      p(_[[Now you have split the road in two parts with a carrier each. This means less work for him and higher efficiency for us. You should therefore always place as many flags as possible on your roads.]]) ..
+      p(_[[Now you have split the road in two parts with a Carrier each. This means less work for him and higher efficiency for us. You should therefore always place as many flags as possible on your roads.]]) ..
       p(_[[Now we only have to wait till the hut is finished.]]) ..
       p(_[[If you want things to go faster, simply use the PAGE UP key on your keyboard to increase the game speed. You can use PAGE DOWN to make the game slower again.]])
    ),
@@ -169,7 +169,7 @@
    title = _"Lumberjack is Done",
    position = "topright",
    body = rt(
-      p(_[[Excellent. The lumberjack’s hut is done. A lumberjack will now move in and start chopping down trees, so our log income is secured for now. Now on to the raw stone.]])
+      p(_[[Excellent. The Lumberjack’s Hut is done. A Lumberjack will now move in and start chopping down trees, so our log income is secured for now. Now on to the raw stone.]])
    ),
    h = 300,
    w = 350
@@ -179,7 +179,7 @@
    title = _"Some Rocks Were Found",
    body = rt(h1(_"Getting a Quarry Up")) ..
    rt(
-      p(_[[Stones can be mined in granite mines, but the easier way is to build a quarry next to some rocks lying around. As it happens, there is a pile of them just to the west (left) of your headquarters. I will teach you now how to move your view over there.]]) ..
+      p(_[[Stones can be mined in Granite Mines, but the easier way is to build a Quarry next to some rocks lying around. As it happens, there is a pile of them just to the west (left) of your Headquarters. I will teach you now how to move your view over there.]]) ..
       paragraphdivider() ..
       listitem_arrow(_[[There are three ways to move your view. The first one is using the cursor keys on your keyboard. Go ahead and try this out.]]) ..
       listitem_bullet(_[[Click the ‘OK’ button and then move the view using the cursor keys]])
@@ -221,7 +221,7 @@
    rt(
       p(_[[The minimap shows 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 minimap.]]) ..
       paragraphdivider() ..
-      listitem_bullet(_[[Try it out. Open the minimap, click on a few buttons and try moving around. Close it when you have have experimented enough.]])
+      listitem_bullet(_[[Try it out. Open the minimap, click on a few buttons and try moving around. Close it when you have experimented enough.]])
    ),
    h = 350,
    obj_name = "use_minimap",
@@ -236,7 +236,7 @@
 
 congratulate_and_on_to_quarry = {
    title = _"Onward to the Quarry",
-   body = rt(p(_[[Great. Now about that quarry…]])),
+   body = rt(p(_[[Great. Now about that Quarry…]])),
    h = 200,
    w = 250
 }
@@ -246,7 +246,7 @@
    position = "topright",
    title = _"How to Build a Quarry",
    body = rt(
-      p(_[[Build a quarry next to those rocks here. Remember how I did it earlier?]]) ..
+      p(_[[Build a Quarry next to those rocks here. Remember how I did it earlier?]]) ..
       p(_[[Make sure that you are showing the building spaces, then just click on the space were you want the building to be, choose it from the window that appears, and it is placed. Maybe this is a good time to explain about all those building space symbols we activated earlier.]]) ..
       p(_[[You can build four things on fields in Widelands: flags, small houses, medium houses and big houses. But not every field can hold everything. The build space symbols ease recognition:]])
    ) ..
@@ -257,16 +257,16 @@
    rt(
       p(_[[If you place something on a field, the surrounding fields might have less space for holding buildings, so choose your fields wisely.]]) ..
       paragraphdivider() ..
-      listitem_bullet(_[[Now go ahead, try it. The quarry is a small building, so if you click on a medium or big building symbol, you will have to select the small buildings tab first to find it. Go on, check it out!]])
+      listitem_bullet(_[[Now go ahead, try it. The Quarry is a small building, so if you click on a medium or big building symbol, you will have to select the small buildings tab first to find it. Go on, check it out!]])
    ),
    obj_name = "build_a_quarry",
-   obj_title = _"Build a quarry next to the rocks",
+   obj_title = _"Build a Quarry next to the rocks",
    obj_body = rt(
       h1(_"Build a Quarry") ..
       paragraphdivider() ..
-      listitem_bullet(_[[There are some rocks to the west of your headquarters. Build a quarry right next to them.]]) ..
-      listitem_arrow(_[[The quarry is a small building like the lumberjack’s hut. You can therefore build it on any field that shows a red, yellow or green house when the building spaces symbols are enabled (Press SPACE for that).]]) ..
-      listitem_arrow(_[[Just click on any house symbol next to the rocks, select the small buildings tab in the window that opens up, then click on the quarry symbol.]])
+      listitem_bullet(_[[There are some rocks to the west of your Headquarters. Build a Quarry right next to them.]]) ..
+      listitem_arrow(_[[The Quarry is a small building like the Lumberjack’s Hut. You can therefore build it on any field that shows a red, yellow or green house when the building spaces symbols are enabled (Press SPACE for that).]]) ..
+      listitem_arrow(_[[Just click on any house symbol next to the rocks, select the small buildings tab in the window that opens up, then click on the Quarry symbol.]])
    )
 }
 
@@ -282,7 +282,7 @@
       p(_[[If you decide you do not want to build a road at this time, you can cancel road building by clicking on the starting flag of the road and selecting]])) ..
    rt("image=pics/menu_abort.png", p(_[[the abort symbol.]])) ..
    rt(
-      p(_[[Now, about this road. Remember: we are already in road building mode since you just ordered the quarry. You can either make it longer by one field at a time by left-clicking multiple times on neighboring fields for perfect control over the route the road takes, like so:]])
+      p(_[[Now, about this road. Remember: we are already in road building mode since you just ordered the Quarry. You can either make it longer by one field at a time by left-clicking multiple times on neighboring fields for perfect control over the route the road takes, like so:]])
    ),
    show_instantly = true
 }
@@ -319,38 +319,38 @@
    body = rt(
       p(_[[One more thing: around the field where your road would end, you can see different markers. They have the following meaning:]])
    ) ..
-   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_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 that your workers will be faster walking downhill than they will be walking uphill.]])) ..
    rt("image=pics/roadb_red.png", p(_[[The connection between the fields is extremely steep. The speed increase in one direction is huge while the slowdown in the other is also substantial.]])) ..
    rt(
       p(_[[Keep the slopes in mind while placing roads and use them to your advantage. Also, try to keep roads as short as possible and always remember to place as many flags as you can on road segments to share the load better. If you hold Ctrl or Shift+Ctrl while you finish the road, flags are placed automatically.]]) ..
       paragraphdivider() ..
-      listitem_bullet(_[[Now please rebuild the road between your quarry and your headquarters.]])
+      listitem_bullet(_[[Now please rebuild the road between your Quarry and your Headquarters.]])
    ),
    h = 450,
    obj_name = "build_road_to_quarry",
-   obj_title = _"Connect the quarry to the headquarters",
+   obj_title = _"Connect the Quarry to the Headquarters",
    obj_body = rt(
       h1(_"Connect Your Construction Site") ..
-      p(_[[Connect your quarry construction site to your headquarters with a road. You would have been put directly into road building mode after ordering a new site. But now, you aren’t.]]) ..
+      p(_[[Connect your Quarry construction site to your Headquarters with a road. You would have been put directly into road building mode after ordering a new site. But now, you aren’t.]]) ..
       paragraphdivider() ..
-      listitem_arrow(_[[To build a completely new road, just click on the flag in front of your construction site, click on the build road icon and then click on the flag in front of your headquarters. Wait for the completion of the quarry.]])
+      listitem_arrow(_[[To build a completely new road, just click on the flag in front of your construction site, click on the build road icon and then click on the flag in front of your Headquarters. Wait for the completion of the Quarry.]])
    )
 }
 
 build_second_quarry = {
    position = "topright",
-   title = _"Build a second quarry",
+   title = _"Build a second Quarry",
    body = rt(
-      p(_[[When there are many rocks, you can consider building another quarry. This will make the stone production faster.]]) ..
+      p(_[[When there are many rocks, you can consider building another Quarry. This will make the stone production faster.]]) ..
       paragraphdivider() ..
-      listitem_bullet(_[[Build a second quarry near the rocks and connect it to your road network.]])
+      listitem_bullet(_[[Build a second Quarry near the rocks and connect it to your road network.]])
    ),
    obj_name = "build_the_second_quarry",
-   obj_title = _"Build another quarry",
+   obj_title = _"Build another Quarry",
    obj_body = rt(
-      h1(_"Build another quarry") ..
-      p(_[[Build a second quarry next to the rocks. Do not forget to connect it to another flag.]]) ..
+      h1(_"Build another Quarry") ..
+      p(_[[Build a second Quarry next to the rocks. Do not forget to connect it to another flag.]]) ..
       paragraphdivider() ..
       listitem_arrow(_[[You can connect the new road to any flag of your existing road network. You can create junctions everywhere, not only in front of buildings.]])
    ),
@@ -369,7 +369,7 @@
 
 census_and_statistics_01 = {
    title = _"Census and Statistics",
-   body = rt(p(_[[Now we know what’s going on. Let’s wait for the quarries to finish.]])),
+   body = rt(p(_[[Now we know what’s going on. Let’s wait for the Quarries to finish.]])),
    h = 200,
    w = 250
 }
@@ -381,7 +381,7 @@
       h1(_"Messages") ..
       p(_[[Hi, it’s me again! This time, I have sent you a message. Messages are sent to you by Widelands to inform you about important events: empty mines, attacks on your tribe, won or lost military buildings, resources found…]]) ..
       p(_[[The message window can be toggled by the button on the very right at the bottom of the screen. This button will also change appearance whenever new messages are available, but there is also a bell sound played whenever you receive a new message.]]) ..
-      p(_[[You have two messages at the moment. This one, which you are currently reading, and the one that informed you that a new headquarters was added to your economy. Let’s learn how to archive messages: You can check them off in your inbox so that they get a tick-symbol in front of them. Then, you can click the]])
+      p(_[[You have two messages at the moment. This one, which you are currently reading, and the one that informed you that a new Headquarters was added to your economy. Let’s learn how to archive messages: You can check them off in your inbox so that they get a tick-symbol in front of them. Then, you can click the]])
    ) ..
    rt("image=pics/message_archive.png", p(_[[archive message button to move them into your archive.]])) ..
    rt(
@@ -425,7 +425,7 @@
    field = first_quarry_field,
    title = _"Closing Windows",
    body = rt(
-      p(_[[Well done! Let’s see how messages work in a real game, shall we? For this, I’ll take all rocks away from the poor stonemasons in the quarries. They will then send a message each that they can’t find any in their working areas the next time they try to do some work.]])
+      p(_[[Well done! Let’s see how messages work in a real game, shall we? For this, I’ll take all rocks away from the poor Stonemasons in the Quarries. They will then send a message each that they can’t find any in their working areas the next time they try to do some work.]])
    ),
    h = 300,
    w = 350
@@ -435,32 +435,32 @@
    position = "topright",
    title = _"Messages Arrived!",
    body = rt(
-      p(_[[You received some messages. See how the button at the bottom of the screen has changed appearance? You can destroy the quarries now as they are no longer of any use and just blocking space. To do so, there are two possibilities:]]) ..
+      p(_[[You received some messages. See how the button at the bottom of the screen has changed appearance? You can destroy the Quarries now as they are no longer of any use and just blocking space. To do so, there are two possibilities:]]) ..
       paragraphdivider() ..
-      listitem_bullet(_[[Burning down the quarry: this is the fastest way of clearing the space. While the worker abandons the building, the wares are lost.]]) ..
-      listitem_bullet(_[[Dismantling the quarry: a builder will walk from the headquarters to dismantle the quarry piece by piece. Thereby, you regain some of the resources you used for the construction.]])
+      listitem_bullet(_[[Burning down the Quarry: this is the fastest way of clearing the space. While the worker abandons the building, the wares are lost.]]) ..
+      listitem_bullet(_[[Dismantling the Quarry: a builder will walk from the Headquarters to dismantle the Quarry piece by piece. Thereby, you regain some of the resources you used for the construction.]])
    ),
    h = 300,
    obj_name = "destroy_quarries",
-   obj_title = "Destroy the two quarries",
+   obj_title = "Destroy the two Quarries",
    obj_body = rt(
-      p(_[[Since our quarries are useless now, you can destroy them and reuse the space later on.]]) ..
+      p(_[[Since our Quarries are useless now, you can destroy them and reuse the space later on.]]) ..
       paragraphdivider() ..
-      listitem_arrow(_[[There are two different ways of destroying a building: burning down and dismantling. Try them both out on your quarries.]]) ..
-      listitem_arrow(_[[Burning down the quarry: This is the fastest way of clearing the space. While the worker abandons the building, the wares are lost.]]) ..
-      listitem_arrow(_[[Dismantling the quarry: A builder will walk from the headquarters to dismantle the quarry piece by piece. Thereby, you regain some of the resources you used for the construction.]])
+      listitem_arrow(_[[There are two different ways of destroying a building: burning down and dismantling. Try them both out on your Quarries.]]) ..
+      listitem_arrow(_[[Burning down the Quarry: This is the fastest way of clearing the space. While the worker abandons the building, the wares are lost.]]) ..
+      listitem_arrow(_[[Dismantling the Quarry: A builder will walk from the Headquarters to dismantle the Quarry piece by piece. Thereby, you regain some of the resources you used for the construction.]])
    )
 }
 
 introduce_expansion = {
    title = _"Expanding Your Territory!",
    body = rt(
-      p(_[[There is one more thing I’d like to teach you now: Expanding your territory. The place that we started with around our headquarters is barely enough for a basic building infrastructure, and we do not have access to mountains, which we need to mine minerals and coal. So, we have to expand our territory.]]) ..
-      p(_[[Expanding is as simple as building a military building at the edge of your territory. The barbarians have a selection of different military buildings: sentries, barriers, donjons, fortresses and citadels. The bigger the building, the more expensive it is to build, but the more land it will conquer around itself and the more soldiers can be stationed there. The buildings also vary in their vision range: buildings with a tower see farther than others.]]) ..
+      p(_[[There is one more thing I’d like to teach you now: Expanding your territory. The place that we started with around our Headquarters is barely enough for a basic building infrastructure, and we do not have access to mountains, which we need to mine minerals and coal. So, we have to expand our territory.]]) ..
+      p(_[[Expanding is as simple as building a military building at the edge of your territory. The Barbarians have a selection of different military buildings: Sentries, Barriers, Donjons, Fortresses and Citadels. The bigger the building, the more expensive it is to build, but the more land it will conquer around itself and the more Soldiers can be stationed there. The buildings also vary in their vision range: buildings with a tower see farther than others.]]) ..
       p(_[[As soon as a military building is manned, it will extend your land. I will tell your more about military buildings in another tutorial.]]) ..
       paragraphdivider() ..
       listitem_bullet(_[[Let’s try it out now: build a military building on your border.]]) ..
-      listitem_arrow(_[[The sentry is the only military site that fits on a small building plot. If your lumberjack has cleared enough space, you can also build another military building.]])
+      listitem_arrow(_[[The Sentry is the only military site that fits on a small building plot. If your Lumberjack has cleared enough space, you can also build another military building.]])
    ),
    obj_name = "expand_territory",
    obj_title = _"Expand your territory",
@@ -468,7 +468,7 @@
       h1(_"Make your territory grow") ..
       p(_[[In Widelands, it is necessary to build many buildings, which take up a lot of space. To expand your territory, you have to build military buildings next to your border. Every tribe has several military buildings.]]) ..
       paragraphdivider() ..
-      listitem_bullet(_[[The Barbarians have four different military buildings you can build: the sentry (small), the barrier and the donjon (both medium) and the fortress (big). Just choose the one you like most.]]) ..
+      listitem_bullet(_[[The Barbarians have four different military buildings you can build: the Sentry (small), the Barrier and the Donjon (both medium) and the Fortress (big). Just choose the one you like most.]]) ..
       listitem_arrow(_[[Remember that big buildings (green icon) cannot be built on small (red) or medium (yellow) building plots, but buildings can be built on a building plot that provides more space than they need. You should always keep that in mind when you search for a suitable place.]])
    )
 }
@@ -478,7 +478,7 @@
    title = _"Military Site Occupied",
    body = rt(
       h1(_"Your territory has just grown!") ..
-      p(_[[Great. Do you see how your territory has grown since your soldiers entered your new military building?]]) ..
+      p(_[[Great. Do you see how your territory has grown since your Soldiers entered your new military building?]]) ..
       p(_[[Every military building has a certain conquer area – the more expensive the building, the more land it conquers.]])
    ),
    h = 300,

=== modified file 'campaigns/tutorial02_warfare.wmf/scripting/texts.lua'
--- campaigns/tutorial02_warfare.wmf/scripting/texts.lua	2014-11-11 10:29:02 +0000
+++ campaigns/tutorial02_warfare.wmf/scripting/texts.lua	2015-01-24 14:23:38 +0000
@@ -17,7 +17,7 @@
    title = _"Introduction",
    body = rt(
       h1(_"Soldiers, Training and Warfare") ..
-      p(_[[In this scenario, I’m going to tell you about soldiers, their training and their profession: warfare. Although Widelands is about building up, not burning down, there is an enemy you sometimes have to defeat. Yet warfare is mainly focused on economics, not on military strategies, and its mechanics deserve explanation.]]) ..
+      p(_[[In this scenario, I’m going to tell you about Soldiers, their training and their profession: warfare. Although Widelands is about building up, not burning down, there is an enemy you sometimes have to defeat. Yet warfare is mainly focused on economics, not on military strategies, and its mechanics deserve explanation.]]) ..
       p(_[[I’ve set up a small village that contains the most important buildings. You also have enough wares, so you do not have to take care of your weapons production. In a real game, you will not have this luxury.]])
    ),
    h = 300
@@ -27,19 +27,19 @@
    position = "topright",
    title = _"Soldiers’ abilities",
    body = rt(
-      p(_[[A new soldier is created like a worker: when a military building needs a soldier, a carrier grabs the needed weapons and armor from a warehouse (or your headquarters) and walks up the road to your new building. Basic Barbarian soldiers do not use armor, they only need an ax.]]) ..
-      p(_[[Take a look at the soldiers that are on their way to our military buildings. They look different from normal workers: they have a health bar over their head that displays their remaining health, and they have four symbols, which symbolize the individual soldier’s current levels in the four different categories: health, attack, defense and evade.]]) ..
-      p(_[[If a barbarian soldier is fully trained, he has level 3 health, level 5 attack, level 0 defense and level 2 evade. This is one fearsome warrior then! The individual abilities have the following meaning:]])
+      p(_[[A new Soldier is created like a Worker: when a military building needs a Soldier, a Carrier grabs the needed weapons and armor from a Warehouse (or your Headquarters) and walks up the road to your new building. Basic Barbarian Soldiers do not use armor, they only need an Ax.]]) ..
+      p(_[[Take a look at the Soldiers that are on their way to our military buildings. They look different from normal workers: they have a health bar over their head that displays their remaining health, and they have four symbols, which symbolize the individual Soldier’s current levels in the four different categories: Health, Attack, Defense and Evade.]]) ..
+      p(_[[If a Barbarian Soldier is fully trained, he has level 3 Health, level 5 Attack, level 0 Defense and level 2 Evade. This is one fearsome warrior then! The individual abilities have the following meaning:]])
    ) ..
    rt("image=tribes/barbarians/soldier/hp_level0.png", h2(_"Health:"))..
-   rt(p(_[[The total life of a soldier. A barbarian soldier starts with 130 health, and he will gain 28 health with each health level.]])) ..
+   rt(p(_[[The total life of a Soldier. A Barbarian Soldier starts with 130 Health, and he will gain 28 Health with each Health level.]])) ..
    rt("image=tribes/barbarians/soldier/attack_level0.png", h2(_"Attack:")) ..
-   rt(p(_[[The amount of damage a soldier will inflict on the enemy when an attack is successful. A barbarian soldier with attack level 0 inflicts ~14 points of health damage when he succeeds in hitting an enemy. For each attack level, he gains 7 damage points.]])) ..
+   rt(p(_[[The amount of damage a Soldier will inflict on the enemy when an attack is successful. A Barbarian Soldier with Attack level 0 inflicts ~14 points of Health damage when he succeeds in hitting an enemy. For each Attack level, he gains 7 damage points.]])) ..
    -- The Atlanteans' image, because the Barbarian one has a white background
    rt("image=tribes/atlanteans/soldier/defense_level0.png", h2(_"Defense:")) ..
-   rt(p(_[[The defense is the percentage that is subtracted from the attack value. The barbarians cannot train in this skill and therefore have always defense level 0, which means that the damage is always reduced by 3%. If an attacker with an attack value of 35 points hits a barbarian soldier, the barbarian will lose 35·0.97 = 34 health.]])) ..
+   rt(p(_[[The Defense is the percentage that is subtracted from the Attack value. The Barbarians cannot train in this skill and therefore have always Defense level 0, which means that the damage is always reduced by 3%. If an attacker with an Attack value of 35 points hits a Barbarian Soldier, the Barbarian will lose 35·0.97 = 34 Health.]])) ..
    rt("image=tribes/barbarians/soldier/evade_level0.png", h2(_"Evade:")) ..
-   rt(p(_[[Evade is the chance that the soldier is able to dodge an attack. A level 0 barbarian has a 25% chance to evade an attack, and this increases in steps of 15% for each level.]]))
+   rt(p(_[[Evade is the chance that the Soldier is able to dodge an attack. A level 0 Barbarian has a 25% chance to evade an attack, and this increases in steps of 15% for each level.]]))
 }
 
 battlearena1 = {
@@ -47,17 +47,17 @@
    title = _"The Battle Arena",
    body = rt(
       p(_[[Now I have talked about training and levels. Let me elaborate on that.]]) ..
-      p(_[[A newly created soldier has no experience and is not very good at fighting. To make him stronger, you can build training sites.]]) ..
-      p(_[[One of these training sites is the battle arena. It is a big and expensive building, and it trains soldiers in evade. Since soldiers get very hungry during their workout, this building needs a lot of food and strongbeer. In a real game, you should have a good infrastructure before you build it.]]) ..
+      p(_[[A newly created Soldier has no experience and is not very good at fighting. To make him stronger, you can build training sites.]]) ..
+      p(_[[One of these training sites is the Battle Arena. It is a big and expensive building, and it trains Soldiers in Evade. Since Soldiers get very hungry during their workout, this building needs a lot of food and Strongbeer. In a real game, you should have a good infrastructure before you build it.]]) ..
       paragraphdivider() ..
-      listitem_bullet(_[[To see evade training in action, build a battle arena.]])
+      listitem_bullet(_[[To see Evade training in action, build a Battle Arena.]])
    ),
    h = 350,
    obj_name = "build_battlearena",
-   obj_title = _"Build a battle arena",
+   obj_title = _"Build a Battle Arena",
    obj_body = rt(
       paragraphdivider() ..
-      listitem_bullet(_[[Build a battle arena. It is a big building.]]) ..
+      listitem_bullet(_[[Build a Battle Arena. It is a big building.]]) ..
       listitem_arrow(_[[Since the construction will take some time, you can change the game speed using PAGE UP and PAGE DOWN.]])
    )
 }
@@ -67,15 +67,15 @@
    title = _"The Battle Arena",
    body = rt(
       h1(_"The Battle Arena Has Been Constructed") ..
-      p(_[[Very good. Our battle arena has been finished, and the soldiers are already walking towards it.]]) ..
+      p(_[[Very good. Our Battle Arena has been finished, and the Soldiers are already walking towards it.]]) ..
       -- Not perfectly correct (some training steps need either bread or meat), but we do not want to confuse new players
-      p(_[[The needed wares are also delivered there. For successful training, you need pitta bread and strongbeer. Most steps additionally require either fish or meat.]] .. " " ..
+      p(_[[The needed wares are also delivered there. For successful training, you need Pitta Bread and Strongbeer. Most steps additionally require either Fish or Meat.]] .. " " ..
 		_[[For more information, you can have a look at the building’s help window, accessible via the question mark in every building’s window.]]) ..
-      p(_[[To learn how far your soldiers have progressed in their training, you can have a look at their icons. They are modified by red dots:]])
+      p(_[[To learn how far your Soldiers have progressed in their training, you can have a look at their icons. They are modified by red dots:]])
    ) ..
-   rt("image=tribes/barbarians/soldier/evade_level0.png", p(_[[No red dots means that the soldier is not trained, so he has level 0. All your new recruits have this.]])) ..
-   rt("image=tribes/barbarians/soldier/evade_level1.png", p(_[[With every successful training step, your soldier becomes stronger. This is indicated by a red dot. This soldier is on level 1 in evade training.]])) ..
-   rt("image=tribes/barbarians/soldier/evade_level2.png", p(_[[When your soldier has reached the highest possible level (in this case level 2), this is indicated by a white background color.]])),
+   rt("image=tribes/barbarians/soldier/evade_level0.png", p(_[[No red dots means that the Soldier is not trained, so he has level 0. All your new recruits have this.]])) ..
+   rt("image=tribes/barbarians/soldier/evade_level1.png", p(_[[With every successful training step, your Soldier becomes stronger. This is indicated by a red dot. This Soldier is on level 1 in Evade training.]])) ..
+   rt("image=tribes/barbarians/soldier/evade_level2.png", p(_[[When your Soldier has reached the highest possible level (in this case level 2), this is indicated by a white background color.]])),
    h = 450
 }
 
@@ -84,17 +84,17 @@
    title = _"The Training Camp",
    body = rt(
       h1(_"The Training Camp") ..
-      p(_[[There is a second training site: the training camp. It is a big building too, and to complement the battle arena, it trains attack and health (remember, the Barbarian soldiers cannot be trained in defense).]]) ..
+      p(_[[There is a second training site: the Training Camp. It is a big building too, and to complement the Battle Arena, it trains Attack and Health (remember, the Barbarian Soldiers cannot be trained in Defense).]]) ..
       paragraphdivider() ..
-      listitem_bullet(_[[Build a training camp.]])
+      listitem_bullet(_[[Build a Training Camp.]])
    ),
    h = 300,
    obj_name = "build_trainingcamp",
-   obj_title = _"Build a training camp",
+   obj_title = _"Build a Training Camp",
    obj_body = rt(
-      p(_[[The battle arena only trains the soldiers in evade. To get the strongest possible soldier, you also need to build a training camp, which trains them in attack and health.]]) ..
+      p(_[[The Battle Arena only trains the Soldiers in Evade. To get the strongest possible Soldier, you also need to build a Training Camp, which trains them in Attack and Health.]]) ..
       paragraphdivider() ..
-      listitem_bullet(_[[Build a training camp.]])
+      listitem_bullet(_[[Build a Training Camp.]])
    )
 }
 
@@ -102,10 +102,10 @@
    position = "topright",
    title = _"The Training Camp",
    body = rt(
-      p(_[[Great, our training camp has now been finished, too. Now nothing will hinder us from getting the strongest warriors the world has ever seen.]]) ..
-      p(_[[To train in the training camp, our soldiers need food like in the battle arena, but no strongbeer. Instead, they need different axes for attack training and helmets for health training.]]) ..
-      p(_[[This equipment is produced in smithies out of coal, iron, and sometimes gold. To explain this in detail would lead too far at the moment. You will learn more about this in the second scenario of the Barbarian campaign.]]) ..
-      p(_[[You should also keep in mind that each of the three tribes in Widelands has its own way of training, so the buildings and wares are different. Also, the ability levels cannot be compared: an Imperial soldier with evade level 0 has a 30% chance of evading, while a Barbarian soldier at the same level only has a 25% chance.]])
+      p(_[[Great, our Training Camp has now been finished, too. Now nothing will hinder us from getting the strongest warriors the world has ever seen.]]) ..
+      p(_[[To train in the Training Camp, our Soldiers need food like in the Battle Arena, but no Strongbeer. Instead, they need different axes for Attack training and helmets for Health training.]]) ..
+      p(_[[This equipment is produced in smithies out of Coal, Iron, and sometimes Gold. You will learn more about this in the second scenario of the Barbarian campaign.]]) ..
+      p(_[[You should also keep in mind that each of the three tribes in Widelands has its own way of training, so the buildings and wares are different. Also, the ability levels cannot be compared: an Imperial Soldier with Evade level 0 has a 30% chance of evading, while a Barbarian Soldier at the same level only has a 25% chance.]])
    )
 }
 
@@ -114,10 +114,10 @@
    title = _"Heroes and Rookies",
    body = rt(
       h1(_"Heroes and Rookies") ..
-      p(_[[While our soldiers are training, let me tell you what we can do with them.]]) ..
-      p(_[[In every military building, you can set the preference for heroes (trained soldiers) or rookies. From time to time, a soldier will walk out of the building and be replaced by a stronger/weaker one automatically.]]) ..
-      p(_[[The initial setting depends on the type of the building. For the Barbarians, the sentry is the only building that prefers rookies by default. You should change this setting to fit your current needs.]]) ..
-      p(_[[When you are expanding into no man’s land, you can make your buildings prefer rookies. When you are planning to attack, send heroes into that region. Conquered buildings always prefer heroes.]])
+      p(_[[While our Soldiers are training, let me tell you what we can do with them.]]) ..
+      p(_[[In every military building, you can set the preference for Heroes (trained Soldiers) or Rookies. From time to time, a Soldier will walk out of the building and be replaced by a stronger/weaker one automatically.]]) ..
+      p(_[[The initial setting depends on the type of the building. For the Barbarians, the Sentry is the only building that prefers Rookies by default. You should change this setting to fit your current needs.]]) ..
+      p(_[[When you are expanding into no man’s land, you can make your buildings prefer Rookies. When you are planning to attack, send Heroes into that region. Conquered buildings always prefer Heroes.]])
    )
 }
 
@@ -125,36 +125,36 @@
    position = "topright",
    title = _"Soldier capacity",
    body = rt(
-      h1(_"Adjusting the number of soldiers") ..
-      p(_[[There is another way how you can control the strength of a military building: by the number of soldiers stationed there. Just click on the arrow buttons to decrease or increase the desired number of soldiers. Every buildings has a maximum capacity. In case of the barrier, it is five, for example.]]) ..
-      p(_[[If you wish to send a certain soldier away, you can simply click on it. It will then be replaced by another soldier.]]) ..
+      h1(_"Adjusting the number of Soldiers") ..
+      p(_[[There is another way how you can control the strength of a military building: by the number of Soldiers stationed there. Just click on the arrow buttons to decrease or increase the desired number of Soldiers. Every building has a maximum capacity. In case of the Barrier, it is five, for example.]]) ..
+      p(_[[If you wish to send a certain Soldier away, you can simply click on it. It will then be replaced by another Soldier.]]) ..
       p(_[[Let me also describe what the numbers in the statistics string mean. This string can contain up to three numbers, e.g. ‘1 (+5) soldier (+2)’.]]) ..
       paragraphdivider() ..
-      listitem_bullet(_[[The first number describes how many soldiers are currently in this building. In this example, only one soldier is left inside (each military building is always guarded by at least one soldier).]]) ..
-      listitem_bullet(_[[The second number tells you how many additional soldiers reside in this building, but are currently outside. The five soldiers are maybe attacking an enemy. They will return when they have been successful.]]) ..
-      listitem_bullet(_[[The third number indicates the missing soldiers. From the eight soldiers (1 + 5 + 2) you wish to have here, two have maybe died. They will be replaced by new soldiers from your warehouse, if possible.]])
+      listitem_bullet(_[[The first number describes how many Soldiers are currently in this building. In this example, only one Soldier is left inside (each military building is always guarded by at least one Soldier).]]) ..
+      listitem_bullet(_[[The second number tells you how many additional Soldiers reside in this building, but are currently outside. The five Soldiers may be attacking an enemy. They will return when they have been successful.]]) ..
+      listitem_bullet(_[[The third number indicates the missing Soldiers. From the eight Soldiers (1 + 5 + 2) you wish to have here, two may have died. They will be replaced by new Soldiers from your Warehouse, if possible.]])
    )
 }
 
 dismantle = {
    position = "topright",
-   title = _"Dismantle your sentry",
+   title = _"Dismantle your Sentry",
    body = rt(
       h1(_"Dismantling military buildings") ..
-      p(_[[You can only reduce the number of soldiers to one. The last soldier of a building will never come out (unless this building is attacked). If you want to have your soldier elsewhere, you will have to dismantle the building (buildings of an alien tribe cannot be dismantled, only be burned down).]]) ..
+      p(_[[You can only reduce the number of Soldiers to one. The last Soldier of a building will never come out (unless this building is attacked). If you want to have your Soldier elsewhere, you will have to dismantle the building (buildings of an alien tribe cannot be dismantled, only be burned down).]]) ..
       p(_[[However, destroying a military building is always linked with a risk: the land is still yours, but it is no longer protected. Any enemy that builds his own military sites can take over that land without a fight, causing your buildings to burst into flames. Furthermore, some parts of the land can now be hidden under the fog of war. You should therefore only dismantle military buildings deep inside your territory where you are safe from enemies.]]) ..
-      p(_[[Have you seen your sentry? Since it cannot contain many soldiers and is next to a stronger barrier, it is rather useless.]]) ..
+      p(_[[Have you seen your Sentry? Since it cannot contain many Soldiers and is next to a stronger Barrier, it is rather useless.]]) ..
       paragraphdivider() ..
       -- TRANSLATORS: 'it' refers to the Barbarian sentry
       listitem_bullet(_[[Dismantle it.]])
    ) ..
    rt(p(_[[You can also use this opportunity to become familiar with the other options: the heroes/rookies preference and the capacity.]])),
    obj_name = "dismantle_sentry",
-   obj_title = _"Dismantle your north-western sentry",
+   obj_title = _"Dismantle your north-western Sentry",
    obj_body = rt(
-      p(_[[You can control the number of soldiers stationed at a military site with the arrow buttons. If you want to get even your last soldier out, you will have to destroy it. However, it then will no longer protect your territory, which will make it vulnerable to hostile attacks.]]) ..
+      p(_[[You can control the number of Soldiers stationed at a military site with the arrow buttons. If you want to get even your last Soldier out, you will have to destroy it. However, it then will no longer protect your territory, which will make it vulnerable to hostile attacks.]]) ..
       paragraphdivider() ..
-      listitem_bullet(_[[Dismantle your sentry in the north-west, next to the barrier.]])
+      listitem_bullet(_[[Dismantle your Sentry in the north-west, next to the Barrier.]])
    )
 }
 
@@ -163,19 +163,19 @@
    title = _"Enhance Your Fortress",
    body = rt(
       h1(_"Enhancing Buildings") ..
-      p(_[[Well done. Now you know how to draw back your soldiers from the places where you don’t need them. It is time to tell you how to reinforce your front line.]]) ..
-      p(_[[Your fortress is already quite strong and conquers a lot of space. But there is an even bigger building: the citadel.]]) ..
-      p(_[[Citadels can’t be built directly. Instead, you’ll have to construct a fortress first and then enhance it to a citadel. To do so, click on the fortress, then choose the ‘Enhance to Citadel’ button.]]) ..
-      p(_[[Your soldiers will leave the fortress while the construction is going on. This means that your fortress will lose its military influence, as I described above.]]) ..
-      listitem_bullet(_[[Enhance your fortress to a citadel now.]])
+      p(_[[Well done. Now you know how to draw back your Soldiers from the places where you don’t need them. It is time to tell you how to reinforce your front line.]]) ..
+      p(_[[Your Fortress is already quite strong and conquers a lot of space. But there is an even bigger building: the Citadel.]]) ..
+      p(_[[Citadels can’t be built directly. Instead, you’ll have to construct a Fortress first and then enhance it to a Citadel. To do so, click on the Fortress, then choose the ‘Enhance to Citadel’ button.]]) ..
+      p(_[[Your Soldiers will leave the Fortress while the construction is going on. This means that your Fortress will lose its military influence, as I described above.]]) ..
+      listitem_bullet(_[[Enhance your Fortress to a Citadel now.]])
    ),
    obj_name = "enhance_fortress",
-   obj_title = _"Enhance your fortress to a citadel",
+   obj_title = _"Enhance your Fortress to a Citadel",
    obj_body = rt(
       h1(_"Enhance Your Fortress") ..
       paragraphdivider() ..
-      listitem_bullet(_[[Enhance your fortress to a mighty citadel.]]) ..
-      listitem_arrow(_[[The citadel can house 12 soldiers, and it is the biggest military building the barbarians can build. It also costs a lot of resources and takes a long time to build. It is most suited to guard strategically important points like constricted points or mountains.]])
+      listitem_bullet(_[[Enhance your Fortress to a mighty Citadel.]]) ..
+      listitem_arrow(_[[The Citadel can house 12 Soldiers, and it is the biggest military building the Barbarians can build. It also costs a lot of resources and takes a long time to build. It is most suited to guard strategically important points like constricted points or mountains.]])
    )
 }
 
@@ -185,10 +185,10 @@
    title = _"Defeat your Enemy",
    body = rt(
       h1(_"Defeat the Enemy") ..
-      p(_[[Great work, the citadel is finished. But what’s that? A hostile tribe has settled next to us while the citadel was under construction! Do you see how they took away a part of our land? And our lumberjack has now lost his place of work. This is what I was talking about. Let’s take our land back and defeat the enemy!]]) ..
-      p(_[[To attack a building, click on its doors, choose the number of soldiers that you wish to send and click on the ‘Attack’ button.]] .. " " .. _[[Your soldiers will come from all nearby military buildings. Likewise, the defenders will come from all nearby military buildings of the enemy and intercept your forces.]]) ..
+      p(_[[Great work, the Citadel is finished. But what’s that? A hostile tribe has settled next to us while the Citadel was under construction! Do you see how they took away a part of our land? And our Lumberjack has now lost his place of work. This is what I was talking about. Let’s take our land back and defeat the enemy!]]) ..
+      p(_[[To attack a building, click on its doors, choose the number of Soldiers that you wish to send and click on the ‘Attack’ button.]] .. " " .. _[[Your Soldiers will come from all nearby military buildings. Likewise, the defenders will come from all nearby military buildings of the enemy and intercept your forces.]]) ..
       paragraphdivider() ..
-      listitem_bullet(_[[Attack and conquer all military buildings of the enemy and destroy their headquarters.]])
+      listitem_bullet(_[[Attack and conquer all military buildings of the enemy and destroy their Headquarters.]])
    ),
    h = 350,
    obj_name = "defeated_the_empire",
@@ -197,7 +197,7 @@
       h1(_"Defeat Your Enemy") ..
       paragraphdivider() ..
       listitem_bullet(_[[Defeat the nearby enemy.]]) ..
-      listitem_arrow(_[[To attack a building, click on its doors, choose the number of soldiers that you wish to send and click on the ‘Attack’ button.]])
+      listitem_arrow(_[[To attack a building, click on its doors, choose the number of Soldiers that you wish to send and click on the ‘Attack’ button.]])
    )
 }
 
@@ -205,7 +205,7 @@
    title = _"Conclusion",
    body = rt(
       h1(_"Conclusion") ..
-      p(_[[Thank you for playing this tutorial. I hope you enjoyed it and you learned how to create and train soldiers, how to control where they go and how to defeat an enemy. Did you see how easily you could overwhelm your enemy? Having trained soldiers is a huge advantage.]]) ..
+      p(_[[Thank you for playing this tutorial. I hope you enjoyed it and you learned how to create and train Soldiers, how to control where they go and how to defeat an enemy. Did you see how easily you could overwhelm your enemy? Having trained Soldiers is a huge advantage.]]) ..
       p(_[[But a war is expensive, and not always the path leading to the goal. When setting up a new game, you can also choose peaceful win conditions. You should definitely try them out, they’re worth it.]]) ..
       p(_[[You are now ready to play the campaigns. They will teach you about the different economies of the tribes. You can also play the remaining tutorials, but they are not crucial for succeeding in the campaigns.]])
    )

=== modified file 'campaigns/tutorial03_seafaring.wmf/scripting/texts.lua'
--- campaigns/tutorial03_seafaring.wmf/scripting/texts.lua	2014-11-11 10:31:01 +0000
+++ campaigns/tutorial03_seafaring.wmf/scripting/texts.lua	2015-01-24 14:23:38 +0000
@@ -20,7 +20,7 @@
    title = _"Seafaring",
    body = rt(
       h1(_"Seafaring Tutorial") ..
-      p(_[[Welcome back. In this tutorial, you are going to learn the most important things about seafaring, that is ships, ports, and expedition.]]) ..
+      p(_[[Welcome back. In this tutorial, you are going to learn the most important things about seafaring, which are Ships, Ports, and Expeditions.]]) ..
       p(_[[But let me first give you an overview about your territory: here in the south, you have a whole economy with almost everything you need.]])
    ),
    h = 250
@@ -31,7 +31,7 @@
    field = castle_field,
    title = _"The Northern Part",
    body = rt(
-      p(_[[Here in the northern part, you only have a goldmine and a warehouse. While the miners are supplied well with food, there is no way to transport the gold ore to our smelting works in the southern part.]]) ..
+      p(_[[Here in the northern part, you only have a Goldmine and a Warehouse. While the miners are supplied well with food, there is no way to transport the Gold Ore to our Smelting Works in the southern part.]]) ..
       p(_[[We have tried to build a road, but the mountain is too wide and too steep. We therefore have only one possibility: we need to establish a sea lane between these two parts.]]) ..
       p(_[[But I don’t want to rush you: you have just arrived here and you would probably like to have a closer look at your camp. I will also take a short break and be back soon.]])
    ),
@@ -43,8 +43,8 @@
    title = _"Ports",
    body = rt(
       h1(_"Ports") ..
-      p(_[[For everything you do on the high seas, you need a port at the shore. Ports are like headquarters: they can store wares, workers and soldiers. The soldiers inside will automatically come out when an enemy attacks the port.]]) ..
-      p(_[[Additionally, ports offer the possibility of transporting wares via ships. When you click on the port you already have, you will notice two additional tabs: wares and workers in the dock. They are waiting for a ship to transport them to another port. Currently, there are none because we have not yet built a second port. So let’s change this!]])
+      p(_[[For everything you do on the high seas, you need a Port at the shore. Ports are like Headquarters: they can store Wares, Workers and Soldiers. The Soldiers inside will automatically come out when an enemy attacks the Port.]]) ..
+      p(_[[Additionally, Ports offer the possibility of transporting wares via Ships. When you click on the Port you already have, you will notice two additional tabs: Wares and Workers in the dock. They are waiting for a Ship to transport them to another Port. Currently, there are none because we have not yet built a second Port. So let’s change this!]])
    ),
    h = 350
 }
@@ -52,71 +52,71 @@
 tell_about_port_building = {
    position = "topright",
    field = second_port_field,
-   title = _"Building ports",
+   title = _"Building Ports",
    body = rt(
-      h1(_"How to build a port") ..
+      h1(_"How to build a Port") ..
       p(_[[Ports are big buildings, but they can only be built at special locations: those marked with the]])
    ) ..
-   rt("image=pics/port.png", p(_[[blue port space icon.]])) ..
+   rt("image=pics/port.png", p(_[[blue Port Space icon.]])) ..
    rt(
-      p(_[[Port spaces are set by the map designer, so a map will either contain them or not. They might, however, be hidden under trees or be blocked by surrounding buildings.]]) ..
-      p(_[[You might already have noticed that you have such an icon next to your castle.]]) ..
+      p(_[[Port Spaces are set by the map designer, so a map will either contain them or not. They might, however, be hidden under trees or be blocked by surrounding buildings.]]) ..
+      p(_[[You might already have noticed that you have such an icon next to your Castle.]]) ..
       paragraphdivider() ..
-      listitem_bullet(_[[Build a port in the northern part of your camp.]])
+      listitem_bullet(_[[Build a Port in the northern part of your camp.]])
    ),
    obj_name = "build_port",
-   obj_title = _"Build a port in the northern part of your camp.",
+   obj_title = _"Build a Port in the northern part of your camp.",
    obj_body = rt(
       h1(_"Build a port") ..
-      p(_[[You always need a port when you want to transport wares with a ship.]]) ..
+      p(_[[You always need a Port when you want to transport wares with a Ship.]]) ..
       paragraphdivider() ..
-      listitem_bullet(_[[Build a port next to your castle, on the blue port space icon.]]) ..
-      listitem_arrow(_[[Ports are built like normal buildings, but are only available on blue port spaces. Just click on a field with the icon and the building menu automatically offers you to build a port.]]) ..
-      listitem_arrow(_[[Although ports act as warehouses, you should not build more than necessary: they cost quartz, diamonds and gold, which makes them quite expensive.]])
+      listitem_bullet(_[[Build a Port next to your Castle, on the blue Port Space icon.]]) ..
+      listitem_arrow(_[[Ports are built like normal buildings, but are only available on blue Port Spaces. Just click on a field with the icon and the building menu automatically offers you to build a Port.]]) ..
+      listitem_arrow(_[[Although Ports act as Warehouses, you should not build more than necessary: they cost Quartz, Diamonds and Gold, which makes them quite expensive.]])
    ),
 }
 
 tell_about_shipyard = {
    position = "topright",
-   title = _"Constructing ships",
+   title = _"Constructing Ships",
    body = rt(
-      h1(_"Let’s build ships") ..
-      p(_[[Great. Your port has just been finished. Now we need some ships.]]) ..
-      p(_[[Ships are constructed in a shipyard by a shipwright. We have to build one somewhere close to the shore.]]) ..
+      h1(_"Let’s build Ships") ..
+      p(_[[Great. Your Port has just been finished. Now we need some Ships.]]) ..
+      p(_[[Ships are constructed in a Shipyard by a Shipwright. We have to build one somewhere close to the shore.]]) ..
       paragraphdivider() ..
-      listitem_bullet(_[[Build a shipyard close to the coast. It is a medium building.]])
+      listitem_bullet(_[[Build a Shipyard close to the coast. It is a medium building.]])
    ),
    h = 300,
    obj_name = "build_shipyard",
-   obj_title = _"Build a shipyard",
+   obj_title = _"Build a Shipyard",
    obj_body = rt(
-      h1(_"Build a shipyard") ..
-      p(_[[Ships are produced in a shipyard.]]) ..
+      h1(_"Build a Shipyard") ..
+      p(_[[Ships are produced in a Shipyard.]]) ..
       paragraphdivider() ..
-      listitem_bullet(_[[Build a shipyard close to the shore of the southern part of your territory.]]) ..
-      listitem_arrow(_[[The shipyard is a medium building. Although it can be built everywhere on the map, the shipwright only works when he is close to the water and there are no trees or roads at the shoreline.]])
+      listitem_bullet(_[[Build a Shipyard close to the shore of the southern part of your territory.]]) ..
+      listitem_arrow(_[[The Shipyard is a medium building. Although it can be built everywhere on the map, the Shipwright only works when he is close to the water and there are no trees or roads at the shoreline.]])
    ),
 }
 
 tell_about_ships = {
    position = "topright",
-   title = _"Constructing ships",
+   title = _"Constructing Ships",
    body = rt(
-      h1(_"Waiting for the ships") ..
-      p(_[[Very good. Your shipyard is finished and your shipwright immediately started working. For the construction of ships, he needs logs, planks and spidercloth, which will be transported to the shipyard.]] .. " " ..
-		_[[The shipwright will take the ware he needs to a free spot at the shoreline and build a ship there. When the first ship is finished, it will launch onto the sea, and the shipwright will construct another one.]]) ..
+      h1(_"Waiting for the Sships") ..
+      p(_[[Very good. Your Shipyard is finished and your Shipwright immediately started working. For the construction of Ships, he needs Logs, Planks and Spidercloth, which will be transported to the Shipyard.]] .. " " ..
+		_[[The Shipwright will take the ware he needs to a free spot at the shoreline and build a Ship there. When the first Ship is finished, it will launch onto the sea, and the Shipwright will construct another one.]]) ..
       paragraphdivider() ..
-      listitem_bullet(_[[We should wait until we have two ships. That should be enough for now.]]) ..
-      listitem_arrow(_[[You need to stop your shipyard when you have enough ships. Otherwise, your shipwright will consume all your logs and spidercloth, producing dozens of ships.]])
+      listitem_bullet(_[[We should wait until we have two Ships. That should be enough for now.]]) ..
+      listitem_arrow(_[[You need to stop your Shipyard when you have enough Ships. Otherwise, your Shipwright will consume all your Logs and Spidercloth, producing dozens of Ships.]])
    ) ..
    rt("image=pics/stop.png",p(_[[This is the icon for stopping production. You will find it in the building window.]])),
    obj_name = "wait_for_ships",
-   obj_title = _"Construct two ships",
+   obj_title = _"Construct two Ships",
    obj_body = rt(
-      p(_[[Ships are constructed automatically when the shipyard is complete and the needed wares have been delivered.]]) ..
+      p(_[[Ships are constructed automatically when the Shipyard is complete and the needed wares have been delivered.]]) ..
       paragraphdivider() ..
-      listitem_bullet(_[[Wait until the shipwright has constructed two ships.]]) ..
-      listitem_arrow(_[[Do not forget to stop your shipyard when you have enough ships.]])
+      listitem_bullet(_[[Wait until the Shipwright has constructed two Ships.]]) ..
+      listitem_arrow(_[[Do not forget to stop your Shipyard when you have enough Ships.]])
    )
 }
 
@@ -124,9 +124,9 @@
    position = "topright",
    title = _"No Iron",
    body = rt(
-      h1(_"We lack iron") ..
-      p(_[[The second ship might not be finished yet, but we have an urgent problem.]]) ..
-      p(_[[As you surely have already noticed, there is no iron in the mountain in the west. We have plenty of coal and gold ore, but without iron ore, we cannot produce any tools.]]) ..
+      h1(_"We lack Iron") ..
+      p(_[[The second Ship might not be finished yet, but we have an urgent problem.]]) ..
+      p(_[[As you surely have already noticed, there is no Iron in the western mountain. We have plenty of Coal and Gold Ore, but without Iron Ore, we cannot produce any tools.]]) ..
       p(_[[Although it might take long and be expensive and not without dangers – who knows what monsters live in the sea? – I see no other possibility: we will have to undertake an expedition to the unknown seas.]])
    ),
    h = 300
@@ -138,21 +138,21 @@
    title = _"A trip by the sea, what fun it can be",
    body = rt(
       h1(_"Expeditions") ..
-      p(_[[During an expedition, you send a ship out to discover new islands and maybe found a colony there.]])
+      p(_[[During an Expedition, you send a Ship out to discover new islands and maybe found a colony there.]])
    ) ..
-   rt("image=pics/start_expedition.png",p(_[[Expeditions can be started in every port. Then, all needed wares are transported to that port. The wares are exactly those your tribe needs to build a port (your goal is to build a port far away from home, so this is not surprising), and of course you need a builder, too. When everything is prepared, a ship will come and pick it up.]] .. " " ..
-		_[[You can check out the needed wares in the fifth tab of your port (it will appear when you’ve started an expedition).]]) ..
+   rt("image=pics/start_expedition.png",p(_[[Expeditions can be started in every Port. Then, all needed wares are transported to that Port. The wares are exactly those your tribe needs to build a Port (your goal is to build a Port far away from home, so this is not surprising), and of course you need a Builder, too. When everything is prepared, a Ship will come and pick it up.]] .. " " ..
+		_[[You can check out the needed wares in the fifth tab of your Port (it will appear when you’ve started an Expedition).]]) ..
       p(_[[Now try this out. I will tell you later what the next steps are.]]) ..
       paragraphdivider() ..
-      listitem_bullet(_[[Start an expedition in any of your ports.]])
+      listitem_bullet(_[[Start an Expedition in any of your Ports.]])
    ),
    obj_name = "start_expedition",
-   obj_title = _"Start an expedition",
+   obj_title = _"Start an Expedition",
    obj_body = rt(
       paragraphdivider() ..
-      listitem_bullet(_[[Start an expedition.]])
+      listitem_bullet(_[[Start an Expedition.]])
    ) ..
-   rt("image=pics/start_expedition.png",p(_[[To do so, click on the ‘Start Expedition’ button in any port. A new tab where you can see the needed wares will appear.]])
+   rt("image=pics/start_expedition.png",p(_[[To do so, click on the ‘Start Expedition’ button in any Port. A new tab where you can see the needed wares will appear.]])
    )
 }
 
@@ -160,21 +160,21 @@
    position = "topright",
    title = _"Off to greener pastures",
    body = rt(
-      h1(_"Start your expedition") ..
-      p(_[[Your expedition should be ready about now. If not, please wait a bit – you will receive a message.]]) ..
-		p(_[[Your ship will be waiting for your orders in front of your port. It won’t be transporting wares anymore. Use its buttons to send your ship in any of the six main directions of the Widelands map. When it has reached a coastline, you can make it travel around the coast, where it will look for suitable places for landing.]] .. " " ..
-		_[[Once a port space has been found, you can construct a new port with the button in the center of the ship’s control window.]]) ..
-      p(_[[The wares will then be unloaded, and the ship will take up the task of transporting wares once again. The builder will start his work and build a port.]]) ..
+      h1(_"Start your Expedition") ..
+      p(_[[Your Expedition should be ready about now. If not, please wait a bit – you will receive a message.]]) ..
+		p(_[[Your Ship will be waiting for your orders in front of your Port. It won’t be transporting wares anymore. Use its buttons to send your Ship in any of the six main directions of the Widelands map. When it has reached a coastline, you can make it travel around the coast, where it will look for suitable places for landing.]] .. " " ..
+		_[[Once a Port Space has been found, you can construct a new Port with the button in the center of the Ship’s control window.]]) ..
+      p(_[[The wares will then be unloaded, and the Ship will take up the task of transporting wares once again. The Builder will start his work and build a Port.]]) ..
       paragraphdivider() ..
-      listitem_bullet(_[[Search for an island with a mountain, and look for a port space there. Colonize the island.]])
+      listitem_bullet(_[[Search for an island with a mountain, and look for a Port Space there. Colonize the island.]])
    ),
    obj_name = "found_settlement",
    obj_title = _"Found a settlement",
    obj_body = rt(
       paragraphdivider() ..
-      listitem_bullet(_[[Navigate your ship to an island that could contain iron ore.]]) ..
-      listitem_arrow(_[[When you click on the expedition ship, a window opens where you can control your ship.]]) ..
-      listitem_bullet(_[[When you have found a suitable port space, build a port there.]])
+      listitem_bullet(_[[Navigate your Ship to an island that could contain Iron Ore.]]) ..
+      listitem_arrow(_[[When you click on the Expedition’s Ship, a window opens where you can control your Ship.]]) ..
+      listitem_bullet(_[[When you have found a suitable Port Space, build a Port there.]])
    )
 }
 
@@ -184,10 +184,10 @@
    title = _"Conclusion",
    body = rt(
       h1(_"Congratulations") ..
-      p(_[[You’ve lead the expedition to a successful end and founded a new colony. I’ve sent out some geologists – they already report that they’ve found some iron ore.]]) ..
-      p(_[[In this scenario, you’ve learned everything about seafaring: how to build ports and ships and how to send out an expedition. Remember that expeditions are sometimes the fastest way to reach essential resources – and sometimes the only one.]]) ..
-      p(_[[But I want to speak a word of warning. Ports are like headquarters: they can be attacked by a nearby enemy. While your headquarters has soldiers to defend it, your newly built port won’t. You should therefore avoid settling next to an enemy.]]) ..
-      p(_[[On this map, there is no enemy to fear. As always, you can continue playing and watch how the ships deliver wares to the island when you construct some buildings there. There is also another island where you can build a port.]])
+      p(_[[You’ve lead the Expedition to a successful end and founded a new colony. I’ve sent out some Geologists – they already report that they’ve found some Iron Ore.]]) ..
+      p(_[[In this scenario, you’ve learned everything about seafaring: how to build Ports and Ships and how to send out an Expedition. Remember that Expeditions are sometimes the fastest way to reach essential resources – and sometimes the only one.]]) ..
+      p(_[[But I want to speak a word of warning. Ports are like Headquarters: they can be attacked by a nearby enemy. While your Headquarters has Soldiers to defend it, your newly built Port won’t. You should therefore avoid settling next to an enemy.]]) ..
+      p(_[[On this map, there is no enemy to fear. As always, you can continue playing and watch how the Ships deliver wares to the island when you construct some buildings there. There is also another island where you can build a Port.]])
    ),
    h = 450
 }

=== modified file 'campaigns/tutorial04_economy.wmf/scripting/texts.lua'
--- campaigns/tutorial04_economy.wmf/scripting/texts.lua	2014-11-11 10:41:28 +0000
+++ campaigns/tutorial04_economy.wmf/scripting/texts.lua	2015-01-24 14:23:38 +0000
@@ -30,8 +30,8 @@
    field = field_near_border,
    title = _"A Peaceful Land",
    body = rt(
-      p(_[[Now about the map: you have settled in a nice valley between two mountains, rich in marble, iron ore and coal. All were hoping for a peaceful life.]]) ..
-      p(_[[But one day, you discovered a barren wasteland with abandoned buildings in the east. A strange aura came from there, and no one wanted to set foot there. But the border could not be left undefended, and so you constructed three castles.]]) ..
+      p(_[[Now about the map: you have settled in a nice valley between two mountains, rich in Marble, Iron Ore and Coal. All were hoping for a peaceful life.]]) ..
+      p(_[[But one day, you discovered a barren wasteland with abandoned buildings in the east. A strange aura came from there, and no one wanted to set foot there. But the border could not be left undefended, and so you constructed three Castles.]]) ..
       p(_[[You had not been prepared for war, and you have to hurry now to build up an army.]])
    ),
    h = 300
@@ -42,7 +42,7 @@
    title = _"The Tavern is Burning!",
    body = rt(
       h1(_[[An accident]]) ..
-      p(_[[Oh no, look at this: our tavern is burning! In all the hurry, our innkeeper accidentally dropped a torch. She is fine, but we could not extinguish the fire in time.]])
+      p(_[[Oh no, look at this: our Tavern is burning! In all the hurry, our Innkeeper accidentally dropped a torch. She is fine, but we could not extinguish the fire in time.]])
    ),
    w = 300,
    h = 250
@@ -52,27 +52,27 @@
    position = "topright",
    title = _"Building statistics",
    body = rt(
-      h1(_[[Check out your taverns]]) ..
-      p(_[[At first, we should find out how many taverns we currently have. Widelands offers you a list where you can easily check this.]])
+      h1(_[[Check out your Taverns]]) ..
+      p(_[[At first, we should find out how many Taverns we currently have. Widelands offers you a list where you can easily check this.]])
    ) ..
-   rt("image=pics/menu_toggle_menu.png",p(_[[First, you will have to open the statistics menu (you can find the corresponding button at the bottom). We will need this menu several times.]])) ..
-   rt("image=pics/menu_building_stats.png",p(_[[Afterwards, choose the ‘Building statistics’.]]) ..
+   rt("image=pics/menu_toggle_menu.png",p(_[[First, you will have to open the Statistics Menu (you can find the corresponding button at the bottom). We will need this menu several times.]])) ..
+   rt("image=pics/menu_building_stats.png",p(_[[Afterwards, choose the ‘Building Statistics’.]]) ..
       paragraphdivider() ..
-      listitem_bullet(_[[Open the building statistics window.]]) ..
-      listitem_bullet(_[[When you have looked up the number of taverns, close it.]])
+      listitem_bullet(_[[Open the Building Statistics window.]]) ..
+      listitem_bullet(_[[When you have looked up the number of Taverns, close it.]])
    ),
    h = 350,
    obj_name = "open_building_stat",
-   obj_title = _"Look up your number of taverns in the building statistics window.",
+   obj_title = _"Look up your number of Taverns in the Building Statistics window.",
    obj_body =
-      rt("image=pics/menu_building_stats.png", p(_[[The building statistics window gives you an overview over the buildings you have.]])) ..
+      rt("image=pics/menu_building_stats.png", p(_[[The Building Statistics window gives you an overview over the buildings you have.]])) ..
    rt(
       paragraphdivider() ..
       -- TRANSLATORS: "it" refers to the building statistics window
-      listitem_bullet(_[[Open it. You can access it from the statistics menu.]]) ..
-      listitem_arrow(_[[The statistics menu is accessed via the second button at the bottom. It provides several windows that give you information about the game.]]) ..
-      listitem_bullet(_[[Look up how many taverns you have (in the column ‘Owned’)]]) ..
-      listitem_bullet(_[[Close the building statistics window when you are done.]])
+      listitem_bullet(_[[Open it. You can access it from the Statistics Menu.]]) ..
+      listitem_arrow(_[[The Statistics Menu is accessed via the second button at the bottom. It provides several windows that give you information about the game.]]) ..
+      listitem_bullet(_[[Look up how many Taverns you have (in the column ‘Owned’)]]) ..
+      listitem_bullet(_[[Close the Building Statistics window when you are done.]])
    )
 }
 
@@ -80,8 +80,8 @@
    position = "topright",
    title = _"Stock",
    body = rt(
-      h1(_[[Check for rations]]) ..
-      p(_[[OK. In the list, you’ve seen that you have no more taverns or inns. That means that you’re not producing any rations. But let’s see what we still have in stock.]])
+      h1(_[[Check for Rations]]) ..
+      p(_[[OK. In the list, you’ve seen that you have no more Taverns or Inns. That means that you’re not producing any Rations. But let’s see what we still have in stock.]])
    ) ..
    rt("image=pics/menu_stock.png",p(_[[Click on the ‘Stock’ button.]])) ..
    rt(
@@ -90,21 +90,21 @@
    ),
    h = 300,
    obj_name = "open_inventory",
-   obj_title = _"Open your stock window.",
+   obj_title = _"Open your Stock window.",
    obj_body = rt(
-      p(_[[The stock menu window gives you an overview over the wares you currently have.]]) ..
+      p(_[[The Stock window gives you an overview over the wares you currently have.]]) ..
       paragraphdivider() ..
       -- TRANSLATORS: "it" refers to the stock menu window
-      listitem_bullet(_[[Open it. You can access it from the statistics menu.]]) ..
-      listitem_arrow(_[[The statistics menu is accessed via the second button at the bottom. It provides several windows that give you information about the game.]])
+      listitem_bullet(_[[Open it. You can access it from the Statistics Menu.]]) ..
+      listitem_arrow(_[[The Statistics Menu is accessed via the second button at the bottom. It provides several windows that give you information about the game.]])
    )
 }
 
 inventory2 = {
    title = _"Stock",
    body = rt(
-      p(_[[The stock menu window has four tabs. The first (and currently selected) one shows you all your current wares, including those on roads, at flags and inside buildings waiting for processing.]]) ..
-      p(_[[Looking at the rations, there are currently only five in total, probably on their way to somewhere. Five rations are not much for such a big economy.]]) ..
+      p(_[[The Stock window has four tabs. The first (and currently selected) one shows you all your current wares, including those on roads, at flags and inside buildings waiting for processing.]]) ..
+      p(_[[Looking at the Rations, there are currently only five in total, probably on their way to somewhere. Five Rations are not much for such a big economy.]]) ..
       p(_[[The second tab shows you all your workers, again those on roads and in buildings summed up.]]) ..
       p(_[[Now have a look at these two tabs. When you click on the]])) ..
    rt("image=pics/menu_tab_wares_warehouse.png",p(_[[third tab (‘Wares in warehouses’), I’ll continue.]])
@@ -112,9 +112,9 @@
    h = 350,
    show_instantly = true,
    obj_name = "switch_stock_tab",
-   obj_title = _"Switch to the third tab in the stock menu window.",
+   obj_title = _"Switch to the third tab in the Stock window.",
    obj_body = rt(
-      p(_[[Have a look at the first two tabs in the stock menu window. They show all the wares and workers you have.]]) ..
+      p(_[[Have a look at the first two tabs in the Stock window. They show all the wares and workers you have.]]) ..
       paragraphdivider() ..
       listitem_bullet(_[[When you have seen enough, switch to the third tab.]])
    ),
@@ -123,18 +123,18 @@
 inventory3 = {
    title = _"Stock",
    body = rt(
-      p(_[[The third tab shows you the wares that are stored in your headquarters, your warehouses and ports. They are not needed anywhere and are therefore your reserve.]]) ..
+      p(_[[The third tab shows you the wares that are stored in your Headquarters, your Warehouses and Ports. They are not needed anywhere and are therefore your reserve.]]) ..
       p(_[[The fourth tab shows the same thing for workers.]]) ..
-      p(_[[The third tab tells you that there are no rations left in your headquarters – that’s not good!]])
+      p(_[[The third tab tells you that there are no Rations left in your Headquarters – that’s not good!]])
    ),
    show_instantly = true,
    h = 300
 }
 
 reopen_stock_menu = {
-   title = _"You closed the stock window!",
+   title = _"You closed the Stock window!",
    body = rt(
-      p(_[[You have closed the stock menu window, but I have not yet finished with my explanation. Would you please reopen it and choose the third tab?]])
+      p(_[[You have closed the Stock window, but I have not yet finished with my explanation. Would you please reopen it and choose the third tab?]])
    ),
    show_instantly = true,
    w = 300,
@@ -143,9 +143,9 @@
 
 reopen_stock_menu_obj = {
    obj_name = "open_stock_menu_again",
-   obj_title = _"Open the stock window again.",
+   obj_title = _"Open the Stock window again.",
    obj_body = rt(
-      p(_[[You closed the stock menu window before I finished telling you everything about it. If you already know everything, please feel free to leave this tutorial at any time.]]) ..
+      p(_[[You closed the Stock window before I finished telling you everything about it. If you already know everything, please feel free to leave this tutorial at any time.]]) ..
       paragraphdivider() ..
       -- TRANSLATORS: "it" refers to the stock menu window.
       listitem_bullet(_[[Otherwise, please reopen it and choose the third tab.]])
@@ -155,32 +155,32 @@
 
 build_taverns = {
    position = "topright",
-   title = _"New taverns",
+   title = _"New Taverns",
    body = rt(
-      h1(_[[We need new taverns]]) ..
-      p(_[[Now that you have an overview, you should act. I think we should build more than one tavern – two or three are better. Remember: as long as we don’t produce rations, our miners won’t dig for ore. And without iron, we cannot forge a single helm.]]) ..
+      h1(_[[We need new Taverns]]) ..
+      p(_[[Now that you have an overview, you should act. I think we should build more than one Tavern – two or three are better. Remember: as long as we don’t produce Rations, our miners won’t dig for ore. And without Iron, we cannot forge a single helm.]]) ..
       paragraphdivider() ..
-      listitem_bullet(_[[Build at least two taverns.]])
+      listitem_bullet(_[[Build at least two Taverns.]])
    ),
    h = 300,
    obj_name = "build_taverns",
-   obj_title = _"Build new taverns.",
+   obj_title = _"Build new Taverns.",
    obj_body = rt(
-      p(_[[To make our mines work, we need rations again – the more, the better.]]) ..
+      p(_[[To make our mines work, we need Rations again – the more, the better.]]) ..
       paragraphdivider() ..
-      listitem_bullet(_[[Build at least two taverns.]])
+      listitem_bullet(_[[Build at least two Taverns.]])
    )
 }
 
 ware_encyclopedia = {
    title = _"Ware Encyclopedia",
    body = rt(
-      p(_[[I am not sure if you could follow my remarks. Why do we need rations to get soldiers?]]) ..
-      p(_[[When you’ve played a lot, you will know such things by heart. But when you’re unsure what this tribe needs for a special ware, you can easily look it up in your tribe’s ware encyclopedia.]]) ..
+      p(_[[I am not sure if you could follow my remarks. Why do we need Rations to get Soldiers?]]) ..
+      p(_[[When you’ve played a lot, you will know such things by heart. But when you’re unsure what this tribe needs for a special ware, you can easily look it up in your tribe’s Ware Encyclopedia.]]) ..
       p(_[[This encyclopedia can be accessed via]])
    ) ..
    rt("image=pics/menu_help.png",p(_[[the help button at the bottom. For all your tribe’s wares, it shows a short help text, a list of buildings that produces the ware and the needed wares.]]) ..
-      p(_[[If you want, you can try it out. A soldier needs a wood lance and a helm – from there on out, you can search backwards.]])
+      p(_[[If you want, you can try it out. A Soldier needs a Wood Lance and a Helm – from there on out, you can search backwards.]])
    ),
    h = 350
 }
@@ -190,10 +190,10 @@
    title = _"Priority Settings",
    body = rt(
       h1(_[[Send the wares where they’re needed]]) ..
-      p(_[[Great. Our taverns have now been built up and are supplying us with rations.]]) ..
-      p(_[[At the moment, all mines are supplied with rations. If you want to prioritize a special mine, you simply have to open its window. In the wares tab, behind every ware, you can see ‘traffic lights’.]]) ..
-      p(_[[When you click on the red dot (low priority), the corresponding ware gets delivered less frequently. Green means that as many wares as possible should be delivered to this building, maybe because it produces something important.]]) ..
-      p(_[[In our situation, you might want to work the bakeries as fast as possible because they supply our taverns, so you could set water to the highest priority for them. The other buildings (for example the donkey farm) would then get less water, but the bakery could work faster.]])
+      p(_[[Great. Our Taverns have now been built up and are supplying us with Rations.]]) ..
+      p(_[[At the moment, all mines are supplied with Rations. If you want to prioritize a special mine, just open its window. In the wares tab, behind every ware, you can see ‘traffic lights’.]]) ..
+      p(_[[When you click on the red dot (lowest priority), the corresponding ware gets delivered less frequently. Green means that as many wares as possible should be delivered to this building, maybe because it produces something important.]]) ..
+      p(_[[In our situation, you might want to work the Bakeries as fast as possible because they supply our Taverns, so you could set water to the highest priority for them. The other buildings (for example the Donkey Farm) would then get less water, but the Bakery could work faster.]])
       -- we cannot check whether the user does this, so no objective
       -- see bug https://bugs.launchpad.net/widelands/+bug/1380288
    )
@@ -203,8 +203,8 @@
    position = "top",
    title = _"Ware Statistics",
    body = rt(
-      p(_[[In the statistics menu, there is also a]])) ..
-      rt("image=pics/menu_ware_stats.png",p(_[[‘Ware statistics’ button.]])) ..
+      p(_[[In the Statistics Menu, there is also a]])) ..
+      rt("image=pics/menu_ware_stats.png",p(_[[‘Ware Statistics’ button.]])) ..
       rt(paragraphdivider() ..
       -- TRANSLATORS: "it" refers to the ware statistics button
       listitem_bullet(_[[Click on it.]])
@@ -212,17 +212,17 @@
    w = 200,
    h = 200,
    obj_name = "open_ware_stat",
-   obj_title = _"Open the ware statistics window.",
+   obj_title = _"Open the Ware Statistics window.",
    obj_body = rt(
       paragraphdivider() ..
-      listitem_bullet(_[[Open the ‘Ware statistics’ window, accessed via the statistics menu.]])
+      listitem_bullet(_[[Open the ‘Ware Statistics’ window, accessed via the Statistics Menu.]])
    )
 }
 
 ware_stats2 = {
    title = _"Ware Statistics",
    body = rt(
-      p(_[[In this menu window, you can select wares to see how their production or consumption has changed over time. Try it out with some wares.]]) ..
+      p(_[[In this window, you can select wares to see how their production or consumption has changed over time. Try it out with some wares.]]) ..
       paragraphdivider() ..
       listitem_bullet(_[[I’ll continue as soon as you click on the]])) ..
    rt("image=pics/menu_tab_wares_econ_health.png",p(_[[third tab (‘Economy Health’).]])
@@ -230,7 +230,7 @@
    h = 250,
    show_instantly = true,
    obj_name = "switch_ware_stat_tab_to_third",
-   obj_title = _"Switch to the third tab in the ware statistics menu window.",
+   obj_title = _"Switch to the third tab in the Ware Statistics window.",
    obj_body = rt(
       p(_[[The first two tabs show you the production and consumption of any ware. You can toggle them by simply clicking on them.]]) ..
       paragraphdivider() ..
@@ -241,7 +241,7 @@
 ware_stats3 = {
    title = _"Ware Statistics",
    body = rt(
-      p(_[[In this tab, you can see the difference between production and consumption, called ‘economy health’. You can see at one glance which one of those two is higher for the selected ware, that means whether the amount increases or decreases.]]) ..
+      p(_[[In this tab, you can see the difference between production and consumption, called ‘Economy Health’. You can see at one glance which one of those two is higher for the selected ware, that means whether the amount increases or decreases.]]) ..
       p(_[[Now try this out. You can also compare it with the two previous tabs.]]) ..
       paragraphdivider() ..
       listitem_bullet(_[[Click on the last tab when I should continue.]])
@@ -249,9 +249,9 @@
    h = 250,
    show_instantly = true,
    obj_name = "switch_ware_stat_tab_to_forth",
-   obj_title = _"Switch to the last tab in the ware statistics menu window.",
+   obj_title = _"Switch to the last tab in the Ware Statistics window.",
    obj_body = rt(
-      p(_[[The third tab shows you the economy health of the ware. When the value is positive, this means your stock is growing.]]) ..
+      p(_[[The third tab shows you the Economy Health of the ware. When the value is positive, this means your stock is growing.]]) ..
       paragraphdivider() ..
       listitem_bullet(_[[When you have seen enough, switch to the fourth tab.]])
    )
@@ -260,7 +260,7 @@
 ware_stats4 = {
    title = _"Ware Statistics",
    body = rt(
-      p(_[[In the last tab, you can also see your absolute stock. It will increase when the economy health is positive, and decrease otherwise. Compare the two graphs!]]) ..
+      p(_[[In the last tab, you can also see your absolute stock. It will increase when the Economy Health is positive, and decrease otherwise. Compare the two graphs!]]) ..
       p(_[[The last two tabs are good indicators to see whether shortages are about to come. Don’t forget to check them regularly!]]) ..
       paragraphdivider() ..
       listitem_bullet(_[[Close this window when you’re done.]])
@@ -268,18 +268,18 @@
    h = 250,
    show_instantly = true,
    obj_name = "close_ware_stats",
-   obj_title = _"Close the ware statistics window.",
+   obj_title = _"Close the Ware Statistics window.",
    obj_body = rt(
-      p(_[[The stock tab shows you how many wares you have. Compare the information from the four tabs to understand the correlation.]]) ..
+      p(_[[The Stock tab shows you how many wares you have. Compare the information from the four tabs to understand the correlation.]]) ..
       paragraphdivider() ..
-      listitem_bullet(_[[When you have finished, close the ware statistics window.]])
+      listitem_bullet(_[[When you have finished, close the Ware Statistics window.]])
    ),
 }
 
 reopen_ware_stats1 = {
-   title = _"You closed the ware statistics window!",
+   title = _"You closed the Ware Statistics window!",
    body = rt(
-      p(_[[You have closed the ware statistics menu window, but I have not yet finished with my explanation. Would you please reopen it and choose the third tab?]])
+      p(_[[You have closed the Ware Statistics window, but I have not yet finished with my explanation. Would you please reopen it and choose the third tab?]])
    ),
    show_instantly = true,
    w = 300,
@@ -288,9 +288,9 @@
 
 reopen_ware_stats1_obj = {
    obj_name = "open_ware_stats_menu_again1",
-   obj_title = _"Open the ware statistics window again.",
+   obj_title = _"Open the Ware Statistics window again.",
    obj_body = rt(
-      p(_[[You closed the ware statistics menu window before I finished telling you everything about it. If you already know everything, please feel free to leave this tutorial at any time.]]) ..
+      p(_[[You closed the Ware Statistics window before I finished telling you everything about it. If you already know everything, please feel free to leave this tutorial at any time.]]) ..
       paragraphdivider() ..
       -- TRANSLATORS: "it" refers to the ware statistics window.
       listitem_bullet(_[[Otherwise, please reopen it and choose the third tab.]])
@@ -298,9 +298,9 @@
 }
 
 reopen_ware_stats2 = {
-   title = _"You closed the ware statistics window!",
+   title = _"You closed the Ware Statistics window!",
    body = rt(
-      p(_[[You have closed the ware statistics menu window, but I have not yet finished with my explanation. Would you please reopen it and choose the fourth tab?]])
+      p(_[[You have closed the Ware Statistics window, but I have not yet finished with my explanation. Would you please reopen it and choose the fourth tab?]])
    ),
    show_instantly = true,
    w = 300,
@@ -309,9 +309,9 @@
 
 reopen_ware_stats2_obj = {
    obj_name = "open_ware_stats_menu_again2",
-   obj_title = _"Open the ware statistics window again.",
+   obj_title = _"Open the Ware Statistics window again.",
    obj_body = rt(
-      p(_[[You closed the ware statistics menu window before I finished telling you everything about it. If you already know everything, please feel free to leave this tutorial at any time.]]) ..
+      p(_[[You closed the Wware Statistics window before I finished telling you everything about it. If you already know everything, please feel free to leave this tutorial at any time.]]) ..
       paragraphdivider() ..
       -- TRANSLATORS: "it" refers to the ware statistics window.
       listitem_bullet(_[[Otherwise, please reopen it and choose the fourth tab.]])
@@ -320,10 +320,10 @@
 
 economy_settings1 = {
    position = "topright",
-   title = _"Economy options",
+   title = _"Economy Options",
    body = rt(
-      p(_[[I’ve shown you our stock menu window, where you could see which wares are at the warehouses. You remember?]]) ..
-      p(_[[Now I’ll tell you how you can determine how many wares you want to have. The menu window for this purpose can be accessed via any flag and is called ‘Configure economy’.]])) ..
+      p(_[[I’ve shown you our Stock window, where you could see which wares are at the Warehouses. You remember?]]) ..
+      p(_[[Now I’ll tell you how you can determine how many wares you want to have. The  window for this purpose can be accessed via any flag and is called ‘Economy Options’.]])) ..
    -- Yup, that's indeed the correct icon
    rt("image=pics/genstats_nrwares.png",p(_[[This is the icon.]])) ..
    rt(
@@ -332,43 +332,43 @@
    ),
    h = 350,
    obj_name = "open_economy_settings",
-   obj_title = _"Open the ‘Configure economy’ window.",
+   obj_title = _"Open the ‘Economy Options’ window.",
    obj_body = rt(
       paragraphdivider() ..
-      listitem_bullet(_[[Open the ‘Configure economy’ window.]]) ..
+      listitem_bullet(_[[Open the ‘Economy Options’ window.]]) ..
       listitem_arrow(_[[The window can be accessed by clicking on any flag you own.]])
    )
 }
 
 economy_settings2 = {
-   title = _"Economy options",
+   title = _"Economy Options",
    body = rt(
-      p(_[[This window looks similar to the stock window, but it has additional buttons at the bottom.]]) ..
+      p(_[[This window looks similar to the Stock window, but it has additional buttons at the bottom.]]) ..
       p(_[[You first have to select one or more wares (you can also left-click and drag). Then you can set the desired target quantity for the selected wares.]]) ..
-      p(_[[Most buildings will only produce something when when the stock level in your warehouses falls below the target quantity, so you should indicate the reserve you want to stockpile.]]) ..
-      p(_[[An example: the default value for scythes is 1. If you build a farm, a carrier will take a scythe and become a farmer. Then there will be no scythes left, but the target quantity is 1, therefore your toolsmith will start producing another one.]]) ..
-      p(_[[If you build two farms, only one of them will start working immediately. The second farm will have to wait for its worker, who will lack a scythe. If you had set the target quantity to 2 before, two scythes would have been available and both farms would have been able to start working right away.]])
+      p(_[[Most buildings will only produce something when when the stock level in your Warehouses falls below the target quantity, so you should indicate the reserve you want to stockpile.]]) ..
+      p(_[[An example: the default value for Scythes is 1. If you build a Farm, a Carrier will take a Scythe and become a Farmer. Then there will be no Scythes left, but the target quantity is 1, therefore your Toolsmith will start producing another one.]]) ..
+      p(_[[If you build two Farms, only one of them will start working immediately. The second Farm will have to wait for its worker, who will lack a Scythe. If you had set the target quantity to 2 before, two Scythes would have been available and both Farms would have been able to start working right away.]])
    ),
    h = 450
 }
 
 economy_settings3 = {
-   title = _"Economy options",
+   title = _"Economy Options",
    body = rt(
-      p(_[[By changing the target quantity, you can therefore decide which wares/tools your resources (in this case: iron) should be turned into or whether you would like to save your iron and wait until you know what you will need it for.]]) ..
-      p(_[[Only buildings that consume wares care about this setting. Buildings that produce wares for free (e.g. your farms or wells) will always keep working.]]) ..
-      p(_[[Now let’s try it out: the current target quantity for marble columns is 10. Increase it to be prepared in case you will have to build up your fortifications quickly.]]) ..
+      p(_[[By changing the target quantity, you can therefore decide which wares/tools your resources (in this case: Iron) should be turned into or whether you would like to save your Iron and wait until you know what you will need it for.]]) ..
+      p(_[[Only buildings that consume wares care about this setting. Buildings that produce wares for free (e.g. your Farms or Wells) will always keep working.]]) ..
+      p(_[[Now let’s try it out: the current target quantity for Marble Columns is 10. Increase it to be prepared in case you will have to build up your fortifications quickly.]]) ..
       paragraphdivider() ..
-      listitem_bullet(_[[Set the target quantity for marble columns to 20 and wait for your stonemason to produce them.]])
+      listitem_bullet(_[[Set the target quantity for Marble Columns to 20 and wait for your Stonemason to produce them.]])
    ),
    obj_name = "produce_marble_columns",
-   obj_title = "Produce 20 marble columns.",
+   obj_title = "Produce 20 Marble Columns.",
    obj_body = rt(
       p(_[[Sometimes, you will need many wares at the same time quickly – faster than they can be produced. In this case, it is good to have enough on reserve.]]) ..
       paragraphdivider() ..
-      listitem_bullet(_[[To be prepared for additional fortifications, you should produce 20 marble columns.]]) ..
-      listitem_arrow(_[[Your stonemason will not produce marble columns when they are not needed. You have to increase the target quantity.]]) ..
-      listitem_arrow(_[[To do so, click on any flag and choose ‘Configure economy’. In this menu window, you can decide how many wares of each type you wish to have in stock.]])
+      listitem_bullet(_[[To be prepared for additional fortifications, you should produce 20 Marble Columns.]]) ..
+      listitem_arrow(_[[Your Stonemason will not produce Marble Columns when they are not needed. You have to increase the target quantity.]]) ..
+      listitem_arrow(_[[To do so, click on any flag and choose ‘Economy Options’. In this  window, you can decide how many wares of each type you wish to have in stock.]])
    )
 }
 
@@ -377,22 +377,22 @@
    position = "topright",
    title = _"Warehouse Preferences",
    body = rt(
-      h1(_[[Bring the marble columns to the front line]]) ..
-      p(_[[It is great that we are producing marble columns, but it would be great if they were stored where we need them.]]) ..
-      p(_[[Normally, produced wares are brought to the closest warehouse if they are not needed elsewhere. In this case, this means our headquarters. But we would like to have them in the warehouse near our fortresses.]]) ..
-      p(_[[Every warehouse has four buttons to set the preference. If you move your mouse pointer over them, you will see tooltips that explain what the buttons do.]]) ..
+      h1(_[[Bring the Marble Columns to the front line]]) ..
+      p(_[[It is great that we are producing Marble Columns, but it would be great if they were stored where we need them.]]) ..
+      p(_[[Normally, produced wares are brought to the closest Warehouse if they are not needed elsewhere. In this case, this means our Headquarters. But we would like to have them in the Warehouse near our Fortresses.]]) ..
+      p(_[[Every Warehouse has four buttons to set the preference. If you move your mouse pointer over them, you will see tooltips that explain what the buttons do.]]) ..
       paragraphdivider() ..
-      listitem_bullet(_[[Bring all the marble columns to the warehouse near the front line.]]) ..
-      listitem_arrow(_[[To achieve this, you will have to do two things. First, set a preference for marble columns in the desired warehouse. All marble columns produced in the future will be brought there if possible.]]) ..
-      listitem_arrow(_[[Then, to move the marble columns out of your headquarters, you will have to click on the remove button there.]])
+      listitem_bullet(_[[Bring all the Marble Columns to the Warehouse near the front line.]]) ..
+      listitem_arrow(_[[To achieve this, you will have to do two things. First, set a preference for Marble Columns in the desired Warehouse. All Marble Columns produced in the future will be brought there if possible.]]) ..
+      listitem_arrow(_[[Then, to move the Marble Columns out of your Headquarters, you will have to click on the remove button there.]])
    ),
    obj_name = "bring_marble_columns_to_front",
-   obj_title = _"Bring 20 marble columns to the front line.",
+   obj_title = _"Bring 20 Marble Columns to the front line.",
    obj_body = economy_settings3.obj_body .. rt(
-      p(_[[To decide where your wares get stored, you can use the preference buttons in the warehouses.]]) ..
-      listitem_bullet(_[[Bring all the marble columns to the warehouse near the front line.]]) ..
-      listitem_arrow(_[[To achieve this, you will have to do two things. First, set a preference for marble columns in the desired warehouse. All marble columns produced in the future will be brought there if possible.]]) ..
-      listitem_arrow(_[[Then, to move the marble columns out of your headquarters, you will have to click on the remove button there.]])
+      p(_[[To decide where your wares get stored, you can use the preference buttons in the Warehouses.]]) ..
+      listitem_bullet(_[[Bring all the Marble Columns to the Warehouse near the front line.]]) ..
+      listitem_arrow(_[[To achieve this, you will have to do two things. First, set a preference for Marble Columns in the desired Warehouse. All Marble Columns produced in the future will be brought there if possible.]]) ..
+      listitem_arrow(_[[Then, to move the Marble Columns out of your Headquarters, you will have to click on the remove button there.]])
    )
 }
 
@@ -400,7 +400,7 @@
    title = _"Borders Secured",
    body = rt(
       h1(_[[We’re safe now]]) ..
-      p(_[[Great. We now have enough marble columns so that in case of an aggressor, we can build up our fortifications. But I do not think that that will be necessary. So far, no enemy has shown up.]]) ..
+      p(_[[Great. We now have enough Marble Columns so that in case of an aggressor, we can build up our fortifications. But I do not think that that will be necessary. So far, no enemy has shown up.]]) ..
       p(_[[I hope I could teach you how you can control the economy in Widelands. There are many options and they can be confusing at first. Even if you’ve only understood a few concepts, you mustn’t give up. Try them out in some games, become familiar with them and experience the possibilities. Then, return to this tutorial and learn the rest!]]) ..
       p([[]]) ..
       p(_[[This was the last tutorial I had prepared for you. I’ve now taught you everything I know. There are still secrets hidden in this world even I don’t know about. I will now search for a quiet place to spend my sunset years. If you have still questions, the Widelands community will surely help you. You can find it at:]])

=== modified file 'maps/MP Scenarios/Island Hopping.wmf/scripting/texts.lua'
--- maps/MP Scenarios/Island Hopping.wmf/scripting/texts.lua	2014-02-25 23:23:41 +0000
+++ maps/MP Scenarios/Island Hopping.wmf/scripting/texts.lua	2015-01-24 14:23:38 +0000
@@ -6,14 +6,14 @@
    h2(_"Rules") ..
    p(_(
 [[Island Hopping is a traditional tournament in Atlantean culture. ]] ..
-[[The rules of the game are simple: you start with a headquarters on an island. ]] ..
-[[When you finish a castle at the end of the first island, you are granted a ]] ..
-[[second headquarters on a second island, which will contain all wares from your ]] ..
-[[first headquarters.]]
-)) .. 
+[[The rules of the game are simple: you start with a Headquarters on an island. ]] ..
+[[When you finish a Castle at the end of the first island, you are granted a ]] ..
+[[second Headquarters on a second island, which will contain all wares from your ]] ..
+[[first Headquarters.]]
+)) ..
  p(_(
-[[If you finish a castle in the target area on the second island, you will get ]] ..
-[[a third headquarters on the third island. You must build a castle at ]] ..
+[[If you finish a Castle in the target area on the second island, you will get ]] ..
+[[a third Headquarters on the third island. You must build a Castle at ]] ..
 [[the center of the third island and hold it for 20 minutes to win the game.]]
 )) ..
  p(_(
@@ -25,7 +25,7 @@
 [[work for you, but you will only reap the benefits at the moment you reach a new island.]])
 ) ..
 p(_
-[[Finally, be careful not to waste your quartz and diamonds.]]
+[[Finally, be careful not to waste your Quartz and Diamonds.]]
 ) ..
 h2(_"Finish Rewards") ..
 h3(_"First Island") ..

=== modified file 'maps/MP Scenarios/Smugglers.wmf/scripting/texts.lua'
--- maps/MP Scenarios/Smugglers.wmf/scripting/texts.lua	2014-10-03 20:16:29 +0000
+++ maps/MP Scenarios/Smugglers.wmf/scripting/texts.lua	2015-01-24 14:23:38 +0000
@@ -5,14 +5,14 @@
    h1(_"Smugglers") ..
    h2(_"Rules") ..
    p(_([[Smugglers is a fun map for 4 players. You and your partner start diagonally from each other on a point symmetric island. There are plenty of smuggling tunnels on this island, each consisting of a receiving and a sending end. ]]) ..
-   _([[To establish a smuggling route, you need to build a warehouse on a sending/receiving spot while your team mate has to build one on the corresponding receiving/sending spot. A ware is then transported every 10 seconds. ]]) ..
+   _([[To establish a smuggling route, you need to build a Warehouse on a sending/receiving spot while your team mate has to build one on the corresponding receiving/sending spot. A ware is then transported every 10 seconds. ]]) ..
 -- TRANSLATORS: %s = '<number> points'
 	_([[For harder to defend smuggling routes, you get 2 or 3 points per ware smuggled. The first team to collect %s wins.]])) ..
 	rt(h2(_"A sending spot")) .. rt("image=map:send_spot.png", p(" ")) ..
 	rt(h2(_"A receiving spot")) .. rt("image=map:recv_spot.png", p(" ")) ..
 	rt(h2(_"Notes") ..
-		p(_([[Remember that the map has rotational symmetry. For example, when you have found a spot to the top-left of your headquarters, the corresponding spot will be to the bottom-right of the headquarters of your team mate.]])))  ..
-		p(_([[You can see the number of wares traded at any time in the general statistics menu. Good luck!]])))
+		p(_([[Remember that the map has rotational symmetry. For example, when you have found a spot to the top-left of your Headquarters, the corresponding spot will be to the bottom-right of the Headquarters of your team mate.]])))  ..
+		p(_([[You can see the number of wares traded at any time in the General Statistics menu. Good luck!]])))
 
 smuggling_route_established_other_team = rt(
 -- TRANSLATORS: the first 2 parameters are player names, the last parameter is '<number> points'
@@ -21,12 +21,12 @@
 
 smuggling_route_established_sender = rt(
 -- TRANSLATORS: %s = '<number> points'
-		p(_([[Your team has established a new smuggling route. You have the sending warehouse. Every ware smuggled here is worth %s.]]))
+		p(_([[Your team has established a new smuggling route. You have the sending Warehouse. Every ware smuggled here is worth %s.]]))
 	)
 
 smuggling_route_established_receiver = rt(
 -- TRANSLATORS: %s = '<number> points'
-		p(_([[Your team has established a new smuggling route. You have the receiving warehouse. Every ware smuggled here is worth %s.]]))
+		p(_([[Your team has established a new smuggling route. You have the receiving Warehouse. Every ware smuggled here is worth %s.]]))
 	)
 
 smuggling_route_broken = rt(

=== modified file 'src/wui/fieldaction.cc'
--- src/wui/fieldaction.cc	2014-12-06 16:14:53 +0000
+++ src/wui/fieldaction.cc	2015-01-24 14:23:38 +0000
@@ -377,7 +377,7 @@
 					(buildbox, "configure_economy",
 					 "pics/genstats_nrwares.png",
 					 &FieldActionWindow::act_configure_economy,
-					 _("Configure economy"));
+					 _("Economy Options"));
 				if (can_act)
 					add_button
 						(buildbox, "geologist",

=== modified file 'src/wui/transport_ui.cc'
--- src/wui/transport_ui.cc	2014-11-30 18:49:38 +0000
+++ src/wui/transport_ui.cc	2015-01-24 14:23:38 +0000
@@ -49,7 +49,7 @@
 		:
 		UI::UniqueWindow
 			(&parent, "economy_options", &economy.optionswindow_registry(), 0, 0,
-			 _("Economy options")),
+			 _("Economy Options")),
 		m_tabpanel(this, 0, 0, g_gr->images().get("pics/but1.png"))
 	{
 		set_center_panel(&m_tabpanel);