Merge lp:~widelands-dev/widelands/string-fixes into lp:widelands

Proposed by GunChleoc on 2015-07-26
Status: Merged
Merged at revision: 7492
Proposed branch: lp:~widelands-dev/widelands/string-fixes
Merge into: lp:widelands
Diff against target: 478 lines (+37/-39)
36 files modified
campaigns/atl01.wmf/scripting/texts.lua (+1/-1)
campaigns/bar01.wmf/scripting/texts.lua (+1/-1)
campaigns/tutorial01_basic_control.wmf/scripting/texts.lua (+1/-1)
campaigns/tutorial02_warfare.wmf/scripting/texts.lua (+1/-1)
maps/MP Scenarios/Island Hopping.wmf/scripting/texts.lua (+2/-4)
tribes/atlanteans/fishers_house/conf (+1/-1)
tribes/atlanteans/fishers_house/help.lua (+1/-1)
tribes/atlanteans/foresters_house/help.lua (+1/-1)
tribes/atlanteans/hunters_house/conf (+1/-1)
tribes/atlanteans/hunters_house/help.lua (+1/-1)
tribes/atlanteans/quarry/conf (+1/-1)
tribes/atlanteans/quarry/help.lua (+1/-1)
tribes/atlanteans/well/conf (+1/-1)
tribes/atlanteans/woodcutters_house/conf (+1/-1)
tribes/atlanteans/woodcutters_house/help.lua (+1/-1)
tribes/barbarians/fishers_hut/conf (+1/-1)
tribes/barbarians/fishers_hut/help.lua (+1/-1)
tribes/barbarians/hunters_hut/conf (+1/-1)
tribes/barbarians/hunters_hut/help.lua (+1/-1)
tribes/barbarians/lumberjacks_hut/conf (+1/-1)
tribes/barbarians/lumberjacks_hut/help.lua (+1/-1)
tribes/barbarians/quarry/conf (+1/-1)
tribes/barbarians/quarry/help.lua (+1/-1)
tribes/barbarians/rangers_hut/help.lua (+1/-1)
tribes/barbarians/well/conf (+1/-1)
tribes/empire/fishers_house/conf (+1/-1)
tribes/empire/fishers_house/help.lua (+1/-1)
tribes/empire/foresters_house/help.lua (+1/-1)
tribes/empire/hunters_house/conf (+1/-1)
tribes/empire/hunters_house/help.lua (+1/-1)
tribes/empire/lumberjacks_house/conf (+1/-1)
tribes/empire/lumberjacks_house/help.lua (+1/-1)
tribes/empire/quarry/conf (+1/-1)
tribes/empire/quarry/help.lua (+1/-1)
tribes/empire/well/conf (+1/-1)
tribes/scripting/format_help.lua (+1/-1)
To merge this branch: bzr merge lp:~widelands-dev/widelands/string-fixes
Reviewer Review Type Date Requested Status
SirVer 2015-07-26 Approve on 2015-07-27
Review via email: mp+265906@code.launchpad.net

Description of the change

Various string fixes for issues reported on Transifex.

To post a comment you must log in.
SirVer (sirver) wrote :

Gonna merge.

review: Approve
7492. By SirVer on 2015-07-27

Various string fixes for issues reported on Transifex.

Juanjo (juanjo-jj) wrote :

In revision 7492,the change "Working radius" -> "Work area" in the file
tribes/scripting/format_help.lua should be revised. The string prints the
work area radius, so the original text "Working radius" seems more
appropriate.

On 27 July 2015 at 11:10, <email address hidden> wrote:

> The proposal to merge lp:~widelands-dev/widelands/string-fixes into
> lp:widelands has been updated.
>
> Status: Needs review => Merged
>
> For more details, see:
>
> https://code.launchpad.net/~widelands-dev/widelands/string-fixes/+merge/265906
> --
> You are subscribed to branch lp:widelands.
>

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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-07-26 11:35:42 +0000
@@ -85,7 +85,7 @@
85 title = _"Build industry and mines",85 title = _"Build industry and mines",
86 number = 5,86 number = 5,
87 body = objective_text(_"Industry and Mines",87 body = objective_text(_"Industry and Mines",
88 _[[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() ..88 _[[Iron ore, gold ore and coal are mined in the respective mines. The crystal mine will dig for quartz and diamonds – all of them are precious materials and very rarely found. It will produce a lot of stone while searching for them.]] .. paragraphdivider() ..
89 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() ..89 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() ..
90 listitem_bullet(_[[Build a mine of each type. Make sure to send geologists to the mountain first.]]) ..90 listitem_bullet(_[[Build a mine of each type. Make sure to send geologists to the mountain first.]]) ..
91 listitem_bullet(_[[Build a smelting works]]) ..91 listitem_bullet(_[[Build a smelting works]]) ..
9292
=== 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-07-26 11:35:42 +0000
@@ -74,7 +74,7 @@
74 title = _"Bake bread",74 title = _"Bake bread",
75 number = 3,75 number = 3,
76 body = objective_text(_"Build a well, a farm and a bakery",76 body = objective_text(_"Build a well, a farm and a bakery",
77 _([[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.]]))77 _([[Other ways to produce food – different kinds of food – are fishers and farms. 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.]]))
78}78}
7979
80obj_refine_ores = {80obj_refine_ores = {
8181
=== modified file 'campaigns/tutorial01_basic_control.wmf/scripting/texts.lua'
--- campaigns/tutorial01_basic_control.wmf/scripting/texts.lua 2015-06-01 20:08:40 +0000
+++ campaigns/tutorial01_basic_control.wmf/scripting/texts.lua 2015-07-26 11:35:42 +0000
@@ -350,7 +350,7 @@
350quarry_illegally_destroyed = {350quarry_illegally_destroyed = {
351 title = _"You Destroyed the Construction Site!",351 title = _"You Destroyed the Construction Site!",
352 body = rt(352 body = rt(
353 p(_[[It seems you destroyed a construction site for a quarry we wanted to build. Since we need the stones, I suggest you reload the game from a previous savegame. Luckily, the are created from time to time. To do so, you have to go back to the main menu and choose ‘Single Player’ → ‘Load Game’. And please be a bit more careful next time.]])353 p(_[[It seems like you destroyed a construction site for a quarry we wanted to build. Since we need the stones, I suggest you reload the game from a previous savegame. Luckily, these are created from time to time. To do so, you have to go back to the main menu and choose ‘Single Player’ → ‘Load Game’. And please be a bit more careful next time.]])
354 ),354 ),
355 w = 350,355 w = 350,
356 h = 250356 h = 250
357357
=== modified file 'campaigns/tutorial02_warfare.wmf/scripting/texts.lua'
--- campaigns/tutorial02_warfare.wmf/scripting/texts.lua 2015-01-24 11:43:42 +0000
+++ campaigns/tutorial02_warfare.wmf/scripting/texts.lua 2015-07-26 11:35:42 +0000
@@ -69,7 +69,7 @@
69 h1(_"The Battle Arena Has Been Constructed") ..69 h1(_"The Battle Arena Has Been Constructed") ..
70 p(_[[Very good. Our battle arena has been finished, and the soldiers are already walking towards it.]]) ..70 p(_[[Very good. Our battle arena has been finished, and the soldiers are already walking towards it.]]) ..
71 -- Not perfectly correct (some training steps need either bread or meat), but we do not want to confuse new players71 -- Not perfectly correct (some training steps need either bread or meat), but we do not want to confuse new players
72 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.]] .. " " ..72 p(_[[The needed wares are also delivered there. For successful training, you need pitta bread and strongbeer, as well as either fish or meat.]] .. " " ..
73 _[[For more information, you can have a look at the building’s help window, accessible via the question mark in every building’s window.]]) ..73 _[[For more information, you can have a look at the building’s help window, accessible via the question mark in every building’s window.]]) ..
74 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:]])74 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:]])
75 ) ..75 ) ..
7676
=== 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-07-26 11:35:42 +0000
@@ -10,7 +10,7 @@
10[[When you finish a castle at the end of the first island, you are granted a ]] ..10[[When you finish a castle at the end of the first island, you are granted a ]] ..
11[[second headquarters on a second island, which will contain all wares from your ]] ..11[[second headquarters on a second island, which will contain all wares from your ]] ..
12[[first headquarters.]]12[[first headquarters.]]
13)) .. 13)) ..
14 p(_(14 p(_(
15[[If you finish a castle in the target area on the second island, you will get ]] ..15[[If you finish a castle in the target area on the second island, you will get ]] ..
16[[a third headquarters on the third island. You must build a castle at ]] ..16[[a third headquarters on the third island. You must build a castle at ]] ..
@@ -20,9 +20,7 @@
20[[Whenever you finish an island, you will get bonus wares, depending on how many players ]] ..20[[Whenever you finish an island, you will get bonus wares, depending on how many players ]] ..
21[[have finished the island before you. The earlier you finish, the fewer wares you will get. ]] ..21[[have finished the island before you. The earlier you finish, the fewer wares you will get. ]] ..
22[[See below for the details.]])) .. p(_(22[[See below for the details.]])) .. p(_(
23[[The clue is that the first island only provides stones and wood, the second ]] ..23[[The point is that the first island only provides stones and wood, the second only meadows and resources. The economies you leave behind will continue to work for you, but you will only reap the benefits at the moment you reach a new island.]])
24[[only meadows and resources. The economies you leave behind will continue to ]] ..
25[[work for you, but you will only reap the benefits at the moment you reach a new island.]])
26) ..24) ..
27p(_25p(_
28[[Finally, be careful not to waste your quartz and diamonds.]]26[[Finally, be careful not to waste your quartz and diamonds.]]
2927
=== modified file 'tribes/atlanteans/fishers_house/conf'
--- tribes/atlanteans/fishers_house/conf 2014-08-02 19:55:23 +0000
+++ tribes/atlanteans/fishers_house/conf 2015-07-26 11:35:42 +0000
@@ -25,7 +25,7 @@
2525
26[out_of_resource_notification]26[out_of_resource_notification]
27title=_Out of Fish27title=_Out of Fish
28message=_The fisher working out of this fisher’s house can’t find any fish in his working radius. Remember that you can increase the number of existing fish by building a fishbreeder’s house.28message=_The fisher working out of this fisher’s house can’t find any fish in his work area. Remember that you can increase the number of existing fish by building a fish breeder’s house.
2929
30[idle]30[idle]
31pics=fishers_house_i_??.png # ???31pics=fishers_house_i_??.png # ???
3232
=== modified file 'tribes/atlanteans/fishers_house/help.lua'
--- tribes/atlanteans/fishers_house/help.lua 2014-07-25 12:19:33 +0000
+++ tribes/atlanteans/fishers_house/help.lua 2015-07-26 11:35:42 +0000
@@ -15,7 +15,7 @@
15 --General Section15 --General Section
16 building_help_general_string("atlanteans", building_description,16 building_help_general_string("atlanteans", building_description,
17 _"Fishes on the coast near the house.",17 _"Fishes on the coast near the house.",
18 _"The fisher’s house needs water full of fish within the working radius." .. " " .. _"Build a fisher breeder’s house close to the fisher’s house to make sure that you don’t run out of fish." ) ..18 _"The fisher’s house needs water full of fish within the work area." .. " " .. _"Build a fisher breeder’s house close to the fisher’s house to make sure that you don’t run out of fish." ) ..
1919
20 --Dependencies20 --Dependencies
21 building_help_dependencies_production("atlanteans", building_description) ..21 building_help_dependencies_production("atlanteans", building_description) ..
2222
=== modified file 'tribes/atlanteans/foresters_house/help.lua'
--- tribes/atlanteans/foresters_house/help.lua 2014-07-25 12:19:33 +0000
+++ tribes/atlanteans/foresters_house/help.lua 2015-07-26 11:35:42 +0000
@@ -15,7 +15,7 @@
15 --General Section15 --General Section
16 building_help_general_string("atlanteans", building_description,16 building_help_general_string("atlanteans", building_description,
17 _"Plants trees in the surrounding area.",17 _"Plants trees in the surrounding area.",
18 _"The foresters’s house needs free space within the working radius to plant the trees.") ..18 _"The foresters’s house needs free space within the work area to plant the trees.") ..
1919
20 --Dependencies20 --Dependencies
21 building_help_dependencies_production("atlanteans", building_description) ..21 building_help_dependencies_production("atlanteans", building_description) ..
2222
=== modified file 'tribes/atlanteans/hunters_house/conf'
--- tribes/atlanteans/hunters_house/conf 2015-06-10 07:00:10 +0000
+++ tribes/atlanteans/hunters_house/conf 2015-07-26 11:35:42 +0000
@@ -26,7 +26,7 @@
26[out_of_resource_notification]26[out_of_resource_notification]
27# TRANSLATORS: "Game" means animals that you can hunt27# TRANSLATORS: "Game" means animals that you can hunt
28title=_Out of Game28title=_Out of Game
29message=_The hunter working out of this hunter’s house can’t find any game in his working radius.29message=_The hunter working out of this hunter’s house can’t find any game in his work area.
30productivity_threshold=030productivity_threshold=0
3131
32[idle]32[idle]
3333
=== modified file 'tribes/atlanteans/hunters_house/help.lua'
--- tribes/atlanteans/hunters_house/help.lua 2014-07-25 12:19:33 +0000
+++ tribes/atlanteans/hunters_house/help.lua 2015-07-26 11:35:42 +0000
@@ -15,7 +15,7 @@
15 --General Section15 --General Section
16 building_help_general_string("atlanteans", building_description,16 building_help_general_string("atlanteans", building_description,
17 _"Hunts animals to produce meat.",17 _"Hunts animals to produce meat.",
18 _"The hunter’s house needs animals to hunt within the working radius.") ..18 _"The hunter’s house needs animals to hunt within the work area.") ..
1919
20 --Dependencies20 --Dependencies
21 building_help_dependencies_production("atlanteans", building_description) ..21 building_help_dependencies_production("atlanteans", building_description) ..
2222
=== modified file 'tribes/atlanteans/quarry/conf'
--- tribes/atlanteans/quarry/conf 2015-03-30 18:49:45 +0000
+++ tribes/atlanteans/quarry/conf 2015-07-26 11:35:42 +0000
@@ -31,7 +31,7 @@
3131
32[out_of_resource_notification]32[out_of_resource_notification]
33title=_Out of Rocks33title=_Out of Rocks
34message=_The stonecutter working at this quarry can’t find any rocks in his working radius.34message=_The stonecutter working at this quarry can’t find any rocks in his work area.
3535
36[idle]36[idle]
37pics=quarry_i_??.png # ???37pics=quarry_i_??.png # ???
3838
=== modified file 'tribes/atlanteans/quarry/help.lua'
--- tribes/atlanteans/quarry/help.lua 2014-07-25 12:19:33 +0000
+++ tribes/atlanteans/quarry/help.lua 2015-07-26 11:35:42 +0000
@@ -14,7 +14,7 @@
1414
15 --General Section15 --General Section
16 building_help_general_string("atlanteans", building_description,16 building_help_general_string("atlanteans", building_description,
17 _"Carves stones out of rocks in the vicinity.", _"The quarry needs stones to cut within the working radius.") ..17 _"Carves stones out of rocks in the vicinity.", _"The quarry needs stones to cut within the work area.") ..
1818
19 --Dependencies19 --Dependencies
20 building_help_dependencies_production("atlanteans", building_description, true) ..20 building_help_dependencies_production("atlanteans", building_description, true) ..
2121
=== modified file 'tribes/atlanteans/well/conf'
--- tribes/atlanteans/well/conf 2015-05-14 12:01:35 +0000
+++ tribes/atlanteans/well/conf 2015-07-26 11:35:42 +0000
@@ -30,7 +30,7 @@
3030
31[out_of_resource_notification]31[out_of_resource_notification]
32title=_Out of Water32title=_Out of Water
33message=_The carrier working at this well can’t find any water in his working radius.33message=_The carrier working at this well can’t find any water in his work area.
34productivity_threshold=3334productivity_threshold=33
3535
36[idle]36[idle]
3737
=== modified file 'tribes/atlanteans/woodcutters_house/conf'
--- tribes/atlanteans/woodcutters_house/conf 2015-06-10 07:00:10 +0000
+++ tribes/atlanteans/woodcutters_house/conf 2015-07-26 11:35:42 +0000
@@ -26,7 +26,7 @@
2626
27[out_of_resource_notification]27[out_of_resource_notification]
28title=_Out of Trees28title=_Out of Trees
29message=_The woodcutter working at this woodcutter’s house can’t find any trees in his working radius. You should consider dismantling or destroying the building or building a forester’s house.29message=_The woodcutter working at this woodcutter’s house can’t find any trees in his work area. You should consider dismantling or destroying the building or building a forester’s house.
30productivity_threshold=6630productivity_threshold=66
3131
32[idle]32[idle]
3333
=== modified file 'tribes/atlanteans/woodcutters_house/help.lua'
--- tribes/atlanteans/woodcutters_house/help.lua 2014-07-25 12:19:33 +0000
+++ tribes/atlanteans/woodcutters_house/help.lua 2015-07-26 11:35:42 +0000
@@ -14,7 +14,7 @@
14 --General Section14 --General Section
15 building_help_general_string("atlanteans", building_description,15 building_help_general_string("atlanteans", building_description,
16 _"Fell trees in the surrounding area and process them into logs.",16 _"Fell trees in the surrounding area and process them into logs.",
17 _"The woodcutter's house needs trees to fell within the working radius.") ..17 _"The woodcutter's house needs trees to fell within the work area.") ..
1818
19 --Dependencies19 --Dependencies
20 building_help_dependencies_production("atlanteans", building_description, true) ..20 building_help_dependencies_production("atlanteans", building_description, true) ..
2121
=== modified file 'tribes/barbarians/fishers_hut/conf'
--- tribes/barbarians/fishers_hut/conf 2015-02-08 16:21:44 +0000
+++ tribes/barbarians/fishers_hut/conf 2015-07-26 11:35:42 +0000
@@ -24,7 +24,7 @@
2424
25[out_of_resource_notification]25[out_of_resource_notification]
26title=_Out of Fish26title=_Out of Fish
27message=_The fisher working out of this fisher’s hut can’t find any fish in his working radius.27message=_The fisher working out of this fisher’s hut can’t find any fish in his work area.
2828
29[build]29[build]
30pics=build_??.png # ???30pics=build_??.png # ???
3131
=== modified file 'tribes/barbarians/fishers_hut/help.lua'
--- tribes/barbarians/fishers_hut/help.lua 2014-07-25 12:19:33 +0000
+++ tribes/barbarians/fishers_hut/help.lua 2015-07-26 11:35:42 +0000
@@ -15,7 +15,7 @@
15 --General Section15 --General Section
16 building_help_general_string("barbarians", building_description,16 building_help_general_string("barbarians", building_description,
17 _"Fishes on the coast near the hut.",17 _"Fishes on the coast near the hut.",
18 _"The fisher’s hut needs water full of fish within the working radius.") ..18 _"The fisher’s hut needs water full of fish within the work area.") ..
1919
20 --Dependencies20 --Dependencies
21 building_help_dependencies_production("barbarians", building_description) ..21 building_help_dependencies_production("barbarians", building_description) ..
2222
=== modified file 'tribes/barbarians/hunters_hut/conf'
--- tribes/barbarians/hunters_hut/conf 2015-05-14 12:01:35 +0000
+++ tribes/barbarians/hunters_hut/conf 2015-07-26 11:35:42 +0000
@@ -26,7 +26,7 @@
26[out_of_resource_notification]26[out_of_resource_notification]
27# TRANSLATORS: "Game" means animals that you can hunt27# TRANSLATORS: "Game" means animals that you can hunt
28title=_Out of Game28title=_Out of Game
29message=_The hunter working out of this hunter’s hut can’t find any game in his working radius. Remember that you can build a gamekeeper’s hut to release more game into the wild.29message=_The hunter working out of this hunter’s hut can’t find any game in his work area. Remember that you can build a gamekeeper’s hut to release more game into the wild.
30productivity_threshold=3330productivity_threshold=33
3131
32[build]32[build]
3333
=== modified file 'tribes/barbarians/hunters_hut/help.lua'
--- tribes/barbarians/hunters_hut/help.lua 2014-07-25 12:19:33 +0000
+++ tribes/barbarians/hunters_hut/help.lua 2015-07-26 11:35:42 +0000
@@ -15,7 +15,7 @@
15 --General Section15 --General Section
16 building_help_general_string("barbarians", building_description,16 building_help_general_string("barbarians", building_description,
17 _"Hunts animals to produce meat.",17 _"Hunts animals to produce meat.",
18 _"The hunter’s hut needs animals to hunt within the working radius.") ..18 _"The hunter’s hut needs animals to hunt within the work area.") ..
1919
20 --Dependencies20 --Dependencies
21 building_help_dependencies_production("barbarians", building_description) ..21 building_help_dependencies_production("barbarians", building_description) ..
2222
=== modified file 'tribes/barbarians/lumberjacks_hut/conf'
--- tribes/barbarians/lumberjacks_hut/conf 2015-06-10 07:00:10 +0000
+++ tribes/barbarians/lumberjacks_hut/conf 2015-07-26 11:35:42 +0000
@@ -24,7 +24,7 @@
2424
25[out_of_resource_notification]25[out_of_resource_notification]
26title=_Out of Trees26title=_Out of Trees
27message=_The lumberjack working at this lumberjack’s hut can’t find any trees in his working radius. You should consider dismantling or destroying the building or building a rangers’s hut.27message=_The lumberjack working at this lumberjack’s hut can’t find any trees in his work area. You should consider dismantling or destroying the building or building a rangers’s hut.
28productivity_threshold=6628productivity_threshold=66
2929
30[idle]30[idle]
3131
=== modified file 'tribes/barbarians/lumberjacks_hut/help.lua'
--- tribes/barbarians/lumberjacks_hut/help.lua 2014-11-11 10:19:51 +0000
+++ tribes/barbarians/lumberjacks_hut/help.lua 2015-07-26 11:35:42 +0000
@@ -14,7 +14,7 @@
14 --General Section14 --General Section
15 building_help_general_string("barbarians", building_description,15 building_help_general_string("barbarians", building_description,
16 _"Fell trees in the surrounding area and process them into logs.",16 _"Fell trees in the surrounding area and process them into logs.",
17 _"The lumberjack’s hut needs trees to fell within the working radius.") ..17 _"The lumberjack’s hut needs trees to fell within the work area.") ..
1818
19 --Dependencies19 --Dependencies
20 building_help_dependencies_production("barbarians", building_description, true) ..20 building_help_dependencies_production("barbarians", building_description, true) ..
2121
=== modified file 'tribes/barbarians/quarry/conf'
--- tribes/barbarians/quarry/conf 2015-03-30 18:49:45 +0000
+++ tribes/barbarians/quarry/conf 2015-07-26 11:35:42 +0000
@@ -30,7 +30,7 @@
3030
31[out_of_resource_notification]31[out_of_resource_notification]
32title=_Out of Rocks32title=_Out of Rocks
33message=_The stonemason working at this quarry can’t find any rocks in his working radius.33message=_The stonemason working at this quarry can’t find any rocks in his work area.
3434
35[idle]35[idle]
36pics=idle_??.png # ???36pics=idle_??.png # ???
3737
=== modified file 'tribes/barbarians/quarry/help.lua'
--- tribes/barbarians/quarry/help.lua 2014-07-25 12:19:33 +0000
+++ tribes/barbarians/quarry/help.lua 2015-07-26 11:35:42 +0000
@@ -14,7 +14,7 @@
1414
15 --General Section15 --General Section
16 building_help_general_string("barbarians", building_description,16 building_help_general_string("barbarians", building_description,
17 _"Carves raw stone out of rocks in the vicinity.", _"The quarry needs stones to cut within the working radius.") ..17 _"Carves raw stone out of rocks in the vicinity.", _"The quarry needs stones to cut within the work area.") ..
1818
19 --Dependencies19 --Dependencies
20 building_help_dependencies_production("barbarians", building_description, true) ..20 building_help_dependencies_production("barbarians", building_description, true) ..
2121
=== modified file 'tribes/barbarians/rangers_hut/help.lua'
--- tribes/barbarians/rangers_hut/help.lua 2014-07-25 12:19:33 +0000
+++ tribes/barbarians/rangers_hut/help.lua 2015-07-26 11:35:42 +0000
@@ -16,7 +16,7 @@
16 --General Section16 --General Section
17 building_help_general_string("barbarians", building_description,17 building_help_general_string("barbarians", building_description,
18 _"Plants trees in the surrounding area.",18 _"Plants trees in the surrounding area.",
19 _"The ranger’s hut needs free space within the working radius to plant the trees.") ..19 _"The ranger’s hut needs free space within the work area to plant the trees.") ..
2020
21 --Dependencies21 --Dependencies
22 building_help_dependencies_production("barbarians", building_description) ..22 building_help_dependencies_production("barbarians", building_description) ..
2323
=== modified file 'tribes/barbarians/well/conf'
--- tribes/barbarians/well/conf 2015-05-14 12:01:35 +0000
+++ tribes/barbarians/well/conf 2015-07-26 11:35:42 +0000
@@ -26,7 +26,7 @@
2626
27[out_of_resource_notification]27[out_of_resource_notification]
28title=_Out of Water28title=_Out of Water
29message=_The carrier working at this well can’t find any water in his working radius.29message=_The carrier working at this well can’t find any water in his work area.
30productivity_threshold=3330productivity_threshold=33
3131
32[idle]32[idle]
3333
=== modified file 'tribes/empire/fishers_house/conf'
--- tribes/empire/fishers_house/conf 2014-08-02 19:55:23 +0000
+++ tribes/empire/fishers_house/conf 2015-07-26 11:35:42 +0000
@@ -26,7 +26,7 @@
2626
27[out_of_resource_notification]27[out_of_resource_notification]
28title=_Out of Fish28title=_Out of Fish
29message=_The fisher working in this fisher’s house can’t find any fish in his working radius.29message=_The fisher working in this fisher’s house can’t find any fish in his work area.
3030
31[idle]31[idle]
32pics=fishers_house_i_??.png # ???32pics=fishers_house_i_??.png # ???
3333
=== modified file 'tribes/empire/fishers_house/help.lua'
--- tribes/empire/fishers_house/help.lua 2014-07-25 12:19:33 +0000
+++ tribes/empire/fishers_house/help.lua 2015-07-26 11:35:42 +0000
@@ -15,7 +15,7 @@
15 --General Section15 --General Section
16 building_help_general_string("empire", building_description,16 building_help_general_string("empire", building_description,
17 _"Fishes on the coast near the house.",17 _"Fishes on the coast near the house.",
18 _"The fisher’s house needs water full of fish within the working radius.") ..18 _"The fisher’s house needs water full of fish within the work area.") ..
1919
20 --Dependencies20 --Dependencies
21 building_help_dependencies_production("empire", building_description) ..21 building_help_dependencies_production("empire", building_description) ..
2222
=== modified file 'tribes/empire/foresters_house/help.lua'
--- tribes/empire/foresters_house/help.lua 2014-07-25 12:19:33 +0000
+++ tribes/empire/foresters_house/help.lua 2015-07-26 11:35:42 +0000
@@ -15,7 +15,7 @@
15 --General Section15 --General Section
16 building_help_general_string("empire", building_description,16 building_help_general_string("empire", building_description,
17 _"Plants trees in the surrounding area.",17 _"Plants trees in the surrounding area.",
18 _"The foresters’s house needs free space within the working radius to plant the trees.") ..18 _"The foresters’s house needs free space within the work area to plant the trees.") ..
1919
20 --Dependencies20 --Dependencies
21 building_help_dependencies_production("empire", building_description) ..21 building_help_dependencies_production("empire", building_description) ..
2222
=== modified file 'tribes/empire/hunters_house/conf'
--- tribes/empire/hunters_house/conf 2015-06-10 07:00:10 +0000
+++ tribes/empire/hunters_house/conf 2015-07-26 11:35:42 +0000
@@ -25,7 +25,7 @@
25[out_of_resource_notification]25[out_of_resource_notification]
26# TRANSLATORS: "Game" means animals that you can hunt26# TRANSLATORS: "Game" means animals that you can hunt
27title=_Out of Game27title=_Out of Game
28message=_The hunter working out of this hunter’s house can’t find any game in his working radius.28message=_The hunter working out of this hunter’s house can’t find any game in his work area.
29productivity_threshold=029productivity_threshold=0
3030
31[idle]31[idle]
3232
=== modified file 'tribes/empire/hunters_house/help.lua'
--- tribes/empire/hunters_house/help.lua 2014-07-25 12:19:33 +0000
+++ tribes/empire/hunters_house/help.lua 2015-07-26 11:35:42 +0000
@@ -15,7 +15,7 @@
15 --General Section15 --General Section
16 building_help_general_string("empire", building_description,16 building_help_general_string("empire", building_description,
17 _"Hunts animals to produce meat.",17 _"Hunts animals to produce meat.",
18 _"The hunter’s house needs animals to hunt within the working radius.") ..18 _"The hunter’s house needs animals to hunt within the work area.") ..
1919
20 --Dependencies20 --Dependencies
21 building_help_dependencies_production("empire", building_description) ..21 building_help_dependencies_production("empire", building_description) ..
2222
=== modified file 'tribes/empire/lumberjacks_house/conf'
--- tribes/empire/lumberjacks_house/conf 2015-06-10 07:00:10 +0000
+++ tribes/empire/lumberjacks_house/conf 2015-07-26 11:35:42 +0000
@@ -26,7 +26,7 @@
2626
27[out_of_resource_notification]27[out_of_resource_notification]
28title=_Out of Trees28title=_Out of Trees
29message=_The lumberjack working at this lumberjack’s house can’t find any trees in his working radius. You should consider dismantling or destroying the building or building a forester’s house.29message=_The lumberjack working at this lumberjack’s house can’t find any trees in his work area. You should consider dismantling or destroying the building or building a forester’s house.
30productivity_threshold=6630productivity_threshold=66
3131
32[idle]32[idle]
3333
=== modified file 'tribes/empire/lumberjacks_house/help.lua'
--- tribes/empire/lumberjacks_house/help.lua 2014-07-25 12:19:33 +0000
+++ tribes/empire/lumberjacks_house/help.lua 2015-07-26 11:35:42 +0000
@@ -14,7 +14,7 @@
14 --General Section14 --General Section
15 building_help_general_string("empire", building_description,15 building_help_general_string("empire", building_description,
16 _"Fell trees in the surrounding area and process them into logs.",16 _"Fell trees in the surrounding area and process them into logs.",
17 _"The lumberjack's house needs trees to fell within the working radius.") ..17 _"The lumberjack's house needs trees to fell within the work area.") ..
1818
19 --Dependencies19 --Dependencies
20 building_help_dependencies_production("empire", building_description, true) ..20 building_help_dependencies_production("empire", building_description, true) ..
2121
=== modified file 'tribes/empire/quarry/conf'
--- tribes/empire/quarry/conf 2014-08-02 19:55:23 +0000
+++ tribes/empire/quarry/conf 2015-07-26 11:35:42 +0000
@@ -44,7 +44,7 @@
4444
45[out_of_resource_notification]45[out_of_resource_notification]
46title=_Out of Rocks46title=_Out of Rocks
47message=_The stonemason working at this quarry can’t find any rocks in his working radius.47message=_The stonemason working at this quarry can’t find any rocks in his work area.
4848
49[idle]49[idle]
50pics=quarry_i_??.png # ???50pics=quarry_i_??.png # ???
5151
=== modified file 'tribes/empire/quarry/help.lua'
--- tribes/empire/quarry/help.lua 2014-07-25 12:19:33 +0000
+++ tribes/empire/quarry/help.lua 2015-07-26 11:35:42 +0000
@@ -14,7 +14,7 @@
1414
15 --General Section15 --General Section
16 building_help_general_string("empire", building_description,16 building_help_general_string("empire", building_description,
17 _"Carves marble and stone out of rocks in the vicinity.", _"The quarry needs stones to cut within the working radius.") ..17 _"Carves marble and stone out of rocks in the vicinity.", _"The quarry needs stones to cut within the work area.") ..
1818
19 --Dependencies19 --Dependencies
20 building_help_dependencies_production("empire", building_description, true) ..20 building_help_dependencies_production("empire", building_description, true) ..
2121
=== modified file 'tribes/empire/well/conf'
--- tribes/empire/well/conf 2015-05-14 12:01:35 +0000
+++ tribes/empire/well/conf 2015-07-26 11:35:42 +0000
@@ -29,7 +29,7 @@
2929
30[out_of_resource_notification]30[out_of_resource_notification]
31title=_Out of Water31title=_Out of Water
32message=_The carrier working at this well can’t find any water in his working radius.32message=_The carrier working at this well can’t find any water in his work area.
33productivity_threshold=3333productivity_threshold=33
3434
35[idle]35[idle]
3636
=== modified file 'tribes/scripting/format_help.lua'
--- tribes/scripting/format_help.lua 2015-05-21 06:57:43 +0000
+++ tribes/scripting/format_help.lua 2015-07-26 11:35:42 +0000
@@ -278,7 +278,7 @@
278278
279 if(building_description.type_name == "productionsite") then279 if(building_description.type_name == "productionsite") then
280 if(building_description.workarea_radius and building_description.workarea_radius > 0) then280 if(building_description.workarea_radius and building_description.workarea_radius > 0) then
281 result = result .. text_line(_"Working radius:", building_description.workarea_radius)281 result = result .. text_line(_"Work area:", building_description.workarea_radius)
282 end282 end
283283
284 elseif(building_description.type_name == "warehouse") then284 elseif(building_description.type_name == "warehouse") then