widelands-dev team mailing list archive

[GunChleoc <fios@xxxxxxxxxxxxxxxxxxx>]

GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1300724 into lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #1300724 in widelands: "Minor string issues"
  https://bugs.launchpad.net/widelands/+bug/1300724

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1300724/+merge/214666

Some minor string fixes
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1300724/+merge/214666
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1300724 into lp:widelands.

=== modified file 'campaigns/atl01.wmf/scripting/texts.lua'
--- campaigns/atl01.wmf/scripting/texts.lua	2014-04-03 12:16:03 +0000
+++ campaigns/atl01.wmf/scripting/texts.lua	2014-04-08 06:31:24 +0000
@@ -82,12 +82,12 @@
    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. ]] ..
+[[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. ]] ..
+[[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 weaver out of gold.]]) .. "<br>" ..
-[[• ]] .. _[[Build a weaving-mill]] .. "<br>" ..
+[[• ]] .. _[[Build a weaving mill]] .. "<br>" ..
 [[• ]] .. _[[Build a spider farm]] .. "<br>" ..
 [[• ]] .. _[[Build a goldweaver]]
  )
@@ -303,7 +303,7 @@
 .. 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.]])
 .. 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 were 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.]]
  ))
 },
 {
@@ -328,7 +328,7 @@
    {
       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.]]))
  },
@@ -336,7 +336,7 @@
     title = _ "Jundlina Replies",
     body = jundlina(_ "Jundlina Replies", _(
 [[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. ]] ..
+[[Your suggestion sounds fair to me, I will build your weaving mill and spider farm. ]] ..
 [[I will also build a goldweaver so that the golden tabards you make will not be golden by name alone.]]
     )) ..  new_objectives(obj_spidercloth_production)
  }
@@ -347,7 +347,7 @@
       title = _ "Opol Seeks Out Jundlina",
       body = opol(_(
 [[May Satul warm you, Jundlina! ]] ..
-[[The weaving-mill, goldweaver and spider farm buildings are complete ]] ..
+[[The weaving mill, goldweaver 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.]]
       ))
@@ -376,8 +376,7 @@
    {
       title = _ "Jundlina Replies",
       body = jundlina(_"Jundlina Nods", _(
-[[I have considered this, Sidolus. I think, it is about time. We will make this a priority for now. ]] ..
-[[You shall get your industry and soon!]]
+[[I have considered this, Sidolus. I think  it is about time. We will make this a priority for now. You shall get your industry soon!]]
       )) .. new_objectives(obj_make_heavy_industry_and_mining)
    },
 }

=== modified file 'campaigns/emp02.wmf/scripting/texts.lua'
--- campaigns/emp02.wmf/scripting/texts.lua	2014-04-03 12:46:12 +0000
+++ campaigns/emp02.wmf/scripting/texts.lua	2014-04-08 06:31:24 +0000
@@ -251,10 +251,7 @@
    body= lutius(_"Diary of Lutius",
 _([[Today a pigeon landed on our island. ]] ..
 [[It brought a message which fills me with dark thoughts and brings back my fears.]]) .. paragraphdivider() ..
-_([[The message was addressed to me, begging me to come back to Fremil.]] ..
-[[It says that the Empire is at war with the Barbarians. ]] ..
-[[They were attacked from the north by the tribe that I was forbidden to attack. ]] ..
-[[It is clear to me what I must do...]]) .. paragraphdivider() ..
+_([[The message was addressed to me, begging me to come back to Fremil. It says that the Empire is at war with the Barbarians. They were attacked from the north by the tribe that I was forbidden to attack. It is clear to me what I must do...]]) .. paragraphdivider() ..
 _([[You have completed this mission. You may continue playing if you wish, otherwise move on to the next mission.]])),
 }
 

=== modified file 'campaigns/t02.wmf/scripting/mission_thread_texts.lua'
--- campaigns/t02.wmf/scripting/mission_thread_texts.lua	2014-04-03 12:46:12 +0000
+++ campaigns/t02.wmf/scripting/mission_thread_texts.lua	2014-04-08 06:31:24 +0000
@@ -195,7 +195,7 @@
 _([[So you want to prepare us for a longer stay in these forests, Thron? ]] ..
 [[Well, I see the wisdom in doing so, yet my heart is yearning for a glorious return to Al’thunran. ]] ..
 [[Too long have we waited while our brethren have fought on the battlefield, ]] ..
-[[and our axs and swords have turned rusty over time.]])
+[[and our axes and swords have turned rusty over time.]])
    )
 }
 

=== modified file 'tribes/atlanteans/conf'
--- tribes/atlanteans/conf	2014-03-17 17:23:26 +0000
+++ tribes/atlanteans/conf	2014-04-08 06:31:24 +0000
@@ -183,7 +183,7 @@
 armorsmithy=_Armor Smithy
 horsefarm=_Horse Farm
 spiderfarm=_Spider Farm
-weaving-mill=_Weaving-Mill
+weaving-mill=_Weaving Mill
 farm=_Farm
 blackroot_farm=_Blackroot Farm
 crystalmine=_Crystal Mine

=== modified file 'tribes/atlanteans/golden_tabard/conf'
--- tribes/atlanteans/golden_tabard/conf	2014-03-16 20:55:15 +0000
+++ tribes/atlanteans/golden_tabard/conf	2014-04-08 06:31:24 +0000
@@ -1,4 +1,4 @@
-help=_Golden tabards are produced in Atlantean weaving-mills out of gold yarn. They are used in the labyrinth – together with food – to train soldiers from health level 0 to level 1.
+help=_Golden tabards are produced in Atlantean weaving mills out of gold yarn. They are used in the labyrinth – together with food – to train soldiers from health level 0 to level 1.
 
 
 preciousness=1

=== modified file 'tribes/atlanteans/goldyarn/conf'
--- tribes/atlanteans/goldyarn/conf	2013-07-23 19:04:12 +0000
+++ tribes/atlanteans/goldyarn/conf	2014-04-08 06:31:24 +0000
@@ -1,4 +1,4 @@
-help=_This yarn, made of gold by the goldweaver, is used for weaving the exclusive golden tabard in the weaving-mill.
+help=_This yarn, made of gold by the goldweaver, is used for weaving the exclusive golden tabard in the weaving mill.
 
 preciousness=2
 default_target_quantity=5

=== modified file 'tribes/atlanteans/spidercloth/conf'
--- tribes/atlanteans/spidercloth/conf	2013-07-23 19:04:12 +0000
+++ tribes/atlanteans/spidercloth/conf	2014-04-08 06:31:24 +0000
@@ -1,4 +1,4 @@
-help=_Spidercloth is made out of spideryarn in a weaving-mill. It is used in the toolsmithy and the shipyard. Also some higher developed buildings need spidercloth for their construction.
+help=_Spidercloth is made out of spideryarn in a weaving mill. It is used in the toolsmithy and the shipyard. Also some higher developed buildings need spidercloth for their construction.
 
 default_target_quantity=10
 preciousness=1

=== modified file 'tribes/atlanteans/spideryarn/conf'
--- tribes/atlanteans/spideryarn/conf	2014-03-16 20:55:15 +0000
+++ tribes/atlanteans/spideryarn/conf	2014-04-08 06:31:24 +0000
@@ -1,4 +1,4 @@
-help=_This yarn is produced by spiders, which are bred by spider farms. It is processed into spidercloth in a weaving-mill.
+help=_This yarn is produced by spiders, which are bred by spider farms. It is processed into spidercloth in a weaving mill.
 
 default_target_quantity=10
 preciousness=2

=== modified file 'tribes/atlanteans/tabard/conf'
--- tribes/atlanteans/tabard/conf	2013-07-23 19:04:12 +0000
+++ tribes/atlanteans/tabard/conf	2014-04-08 06:31:24 +0000
@@ -1,4 +1,4 @@
-help=_A tabard and a light trident are the basic equipment for young soldiers. Tabards are produced in the weaving-mill.
+help=_A tabard and a light trident are the basic equipment for young soldiers. Tabards are produced in the weaving mill.
 
 preciousness=1
 default_target_quantity=20

=== modified file 'tribes/barbarians/conf'
--- tribes/barbarians/conf	2014-03-17 17:23:26 +0000
+++ tribes/barbarians/conf	2014-04-08 06:31:24 +0000
@@ -189,7 +189,7 @@
 axfactory=_Axfactory
 metalworks=_Metal Workshop
 cattlefarm=_Cattle Farm
-weaving-mill=_Weaving-Mill
+weaving-mill=_Weaving Mill
 farm=_Farm
 helmsmithy=_Helm Smithy
 granitemine=_Granite Mine

=== modified file 'tribes/barbarians/metalworks/help.lua'
--- tribes/barbarians/metalworks/help.lua	2014-03-25 06:18:48 +0000
+++ tribes/barbarians/metalworks/help.lua	2014-04-08 06:31:24 +0000
@@ -15,7 +15,7 @@
 		rt(h2(_"General")) ..
 		text_line(_"Purpose:", _"The Barbarian Metal Workshop is the basic production site in a series of three buildings and creates all the tools that Barbarians need. The others are for weapons.") ..
 		rt("image=tribes/barbarians/bread_paddle/menu.png;tribes/barbarians/felling_ax/menu.png;tribes/barbarians/fire_tongs/menu.png;tribes/barbarians/fishing_rod/menu.png;tribes/barbarians/hammer/menu.png;tribes/barbarians/hunting_spear/menu.png;tribes/barbarians/kitchen_tools/menu.png;tribes/barbarians/pick/menu.png;tribes/barbarians/scythe/menu.png;tribes/barbarians/shovel/menu.png image-align=right",p("")) ..
-		rt(p(_"It can make Bread Paddles, Felling axs, Fire Tongs, Fishing Rods, Hammers, Hunting Spears, Kitchen Tools, Picks, Scythes and Shovels.")) ..
+		rt(p(_"It can make Bread Paddles, Felling Axes, Fire Tongs, Fishing Rods, Hammers, Hunting Spears, Kitchen Tools, Picks, Scythes and Shovels.")) ..
 		text_line(_"Working radius:", "n/a") ..
 		text_line(_"Conquer range:", "n/a") ..
 		text_line(_"Vision range:", "4") ..

=== modified file 'tribes/barbarians/reed_yard/help.lua'
--- tribes/barbarians/reed_yard/help.lua	2014-03-25 06:18:48 +0000
+++ tribes/barbarians/reed_yard/help.lua	2014-04-08 06:31:24 +0000
@@ -24,7 +24,7 @@
 		dependencies({"tribes/barbarians/reed_yard/menu.png","tribes/barbarians/thatchreed/menu.png"},p(_"Thatch Reed")) ..
 		dependencies({"tribes/barbarians/thatchreed/menu.png","tribes/barbarians/constructionsite/menu.png"},p(_"Construction Site")) ..
 		rt(p(_"The Reed Yard’s output will only go to construction sites that need it.")) ..
-		dependencies({"tribes/barbarians/thatchreed/menu.png","tribes/barbarians/weaving-mill/menu.png"},p(_"Weaving-Mill")) ..
+		dependencies({"tribes/barbarians/thatchreed/menu.png","tribes/barbarians/weaving-mill/menu.png"},p(_"Weaving Mill")) ..
 	--Building Section
 		rt(h2(_"Building")) ..
 		text_line(_"Space required:",_"Medium plot","pics/medium.png") ..