widelands-dev team mailing list archive

[GunChleoc <fios@xxxxxxxxxxxxxxxxxxx>]

GunChleoc has proposed merging lp:~widelands-dev/widelands/i18n-20140310 into lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/i18n-20140310/+merge/210561

Some more string fixes. Resized Objectives window.
-- 
https://code.launchpad.net/~widelands-dev/widelands/i18n-20140310/+merge/210561
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/i18n-20140310 into lp:widelands.

=== modified file 'campaigns/atl01.wmf/scripting/texts.lua'
--- campaigns/atl01.wmf/scripting/texts.lua	2014-03-09 09:44:35 +0000
+++ campaigns/atl01.wmf/scripting/texts.lua	2014-03-12 09:30:41 +0000
@@ -337,7 +337,7 @@
       title = _"A Man Comes to Jundlina",
       body = opol(p(_(
 [[May Satul warm you, Jundlina. ]] ..
-[[My Name is Opol, and I am the highest weaver of the guild abandoning Atlantis and Lutas with you. ]] ..
+[[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.]])) .. p(_(

=== modified file 'campaigns/emp02.wmf/scripting/texts.lua'
--- campaigns/emp02.wmf/scripting/texts.lua	2014-03-09 09:44:35 +0000
+++ campaigns/emp02.wmf/scripting/texts.lua	2014-03-12 09:30:41 +0000
@@ -60,8 +60,7 @@
    title =_"Build a stonemason and mining infrastructure",
    number = 7,
    body = objective_text(_"Stonemason and Mining Infrastructure", 
-[[• ]] .. _[[Build a stonemason and then a complete mining and production infrastructure 
-(coal mine and / or charcoal burner, iron ore mine, toolsmithy, weapon smithy, armor smithy and smelting works).]]),
+[[• ]] .. _[[Build a stonemason and then a complete mining and production infrastructure (coal mine and / or charcoal burner, iron ore mine, toolsmithy, weapon smithy, armor smithy and smelting works).]]),
 }
 
 obj_build_Food_infrastructure = {
@@ -71,8 +70,7 @@
    body = objective_text(_"Food For Your Miners", 
 [[• ]] .. _([[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.]]) .. "<br>" ..
-[[• ]] .. _([[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.]]) .. "<br>" ..
+[[• ]] .. _([[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.]]) .. "<br>" ..
 [[• ]] .. _[[Maybe you will also need a hunter’s house, a piggery, a vineyard and some wells.]] .. "<br><br>" ..
 [[→ ]] .. _([[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.]])),
@@ -234,8 +232,7 @@
    posy=1,
    body= lutius(
 _([[Today is a proud day. We have fought for our new home and risen victorious.]]) .. "<br><br>" ..
-_([[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.]]
 ),

=== modified file 'src/wui/game_objectives_menu.cc'
--- src/wui/game_objectives_menu.cc	2014-03-10 19:27:00 +0000
+++ src/wui/game_objectives_menu.cc	2014-03-12 09:30:41 +0000
@@ -39,7 +39,7 @@
 :
 	UI::UniqueWindow
 		(&plr, "objectives", &registry,
-		 340,
+		 580,
 		 5 + OBJECTIVE_LIST + 5 + FULL_OBJECTIVE_TEXT + 5 + BUTTON_HEIGHT + 5,
 		 _("Objectives")),
 	list

=== modified file 'tribes/atlanteans/goldore/conf'
--- tribes/atlanteans/goldore/conf	2014-02-24 21:12:30 +0000
+++ tribes/atlanteans/goldore/conf	2014-03-12 09:30:41 +0000
@@ -1,4 +1,4 @@
-help=_Gold ore is mined in gold mines and processed to gold in smelting works.
+help=_Gold ore is mined in a goldmine. Smelted in a smelting works, it turns into gold which is used as a precious building material and to produce weapons and armor.
 
 preciousness=2
 

=== modified file 'tribes/empire/goldstone/conf'
--- tribes/empire/goldstone/conf	2014-02-25 14:45:19 +0000
+++ tribes/empire/goldstone/conf	2014-03-12 09:30:41 +0000
@@ -1,4 +1,4 @@
-help=_Gold Ore is mined in goldmines and processed at the smelting works.
+help=_Gold ore is mined in a goldmine. Smelted in a smelting works, it turns into gold which is used as a precious building material and to produce weapons and armor.
 
 preciousness=2