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

Proposed by GunChleoc
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 Approve
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.
Revision history for this message
SirVer (sirver) wrote :

Gonna merge.

review: Approve
Revision history for this message
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
1=== modified file 'campaigns/atl01.wmf/scripting/texts.lua'
2--- campaigns/atl01.wmf/scripting/texts.lua 2014-11-11 10:43:36 +0000
3+++ campaigns/atl01.wmf/scripting/texts.lua 2015-07-26 11:35:42 +0000
4@@ -85,7 +85,7 @@
5 title = _"Build industry and mines",
6 number = 5,
7 body = objective_text(_"Industry and Mines",
8- _[[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() ..
9+ _[[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() ..
10 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() ..
11 listitem_bullet(_[[Build a mine of each type. Make sure to send geologists to the mountain first.]]) ..
12 listitem_bullet(_[[Build a smelting works]]) ..
13
14=== modified file 'campaigns/bar01.wmf/scripting/texts.lua'
15--- campaigns/bar01.wmf/scripting/texts.lua 2014-10-31 08:59:54 +0000
16+++ campaigns/bar01.wmf/scripting/texts.lua 2015-07-26 11:35:42 +0000
17@@ -74,7 +74,7 @@
18 title = _"Bake bread",
19 number = 3,
20 body = objective_text(_"Build a well, a farm and a bakery",
21- _([[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.]]))
22+ _([[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.]]))
23 }
24
25 obj_refine_ores = {
26
27=== modified file 'campaigns/tutorial01_basic_control.wmf/scripting/texts.lua'
28--- campaigns/tutorial01_basic_control.wmf/scripting/texts.lua 2015-06-01 20:08:40 +0000
29+++ campaigns/tutorial01_basic_control.wmf/scripting/texts.lua 2015-07-26 11:35:42 +0000
30@@ -350,7 +350,7 @@
31 quarry_illegally_destroyed = {
32 title = _"You Destroyed the Construction Site!",
33 body = rt(
34- 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.]])
35+ 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.]])
36 ),
37 w = 350,
38 h = 250
39
40=== modified file 'campaigns/tutorial02_warfare.wmf/scripting/texts.lua'
41--- campaigns/tutorial02_warfare.wmf/scripting/texts.lua 2015-01-24 11:43:42 +0000
42+++ campaigns/tutorial02_warfare.wmf/scripting/texts.lua 2015-07-26 11:35:42 +0000
43@@ -69,7 +69,7 @@
44 h1(_"The Battle Arena Has Been Constructed") ..
45 p(_[[Very good. Our battle arena has been finished, and the soldiers are already walking towards it.]]) ..
46 -- Not perfectly correct (some training steps need either bread or meat), but we do not want to confuse new players
47- 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.]] .. " " ..
48+ p(_[[The needed wares are also delivered there. For successful training, you need pitta bread and strongbeer, as well as either fish or meat.]] .. " " ..
49 _[[For more information, you can have a look at the building’s help window, accessible via the question mark in every building’s window.]]) ..
50 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:]])
51 ) ..
52
53=== modified file 'maps/MP Scenarios/Island Hopping.wmf/scripting/texts.lua'
54--- maps/MP Scenarios/Island Hopping.wmf/scripting/texts.lua 2014-02-25 23:23:41 +0000
55+++ maps/MP Scenarios/Island Hopping.wmf/scripting/texts.lua 2015-07-26 11:35:42 +0000
56@@ -10,7 +10,7 @@
57 [[When you finish a castle at the end of the first island, you are granted a ]] ..
58 [[second headquarters on a second island, which will contain all wares from your ]] ..
59 [[first headquarters.]]
60-)) ..
61+)) ..
62 p(_(
63 [[If you finish a castle in the target area on the second island, you will get ]] ..
64 [[a third headquarters on the third island. You must build a castle at ]] ..
65@@ -20,9 +20,7 @@
66 [[Whenever you finish an island, you will get bonus wares, depending on how many players ]] ..
67 [[have finished the island before you. The earlier you finish, the fewer wares you will get. ]] ..
68 [[See below for the details.]])) .. p(_(
69-[[The clue is that the first island only provides stones and wood, the second ]] ..
70-[[only meadows and resources. The economies you leave behind will continue to ]] ..
71-[[work for you, but you will only reap the benefits at the moment you reach a new island.]])
72+[[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.]])
73 ) ..
74 p(_
75 [[Finally, be careful not to waste your quartz and diamonds.]]
76
77=== modified file 'tribes/atlanteans/fishers_house/conf'
78--- tribes/atlanteans/fishers_house/conf 2014-08-02 19:55:23 +0000
79+++ tribes/atlanteans/fishers_house/conf 2015-07-26 11:35:42 +0000
80@@ -25,7 +25,7 @@
81
82 [out_of_resource_notification]
83 title=_Out of Fish
84-message=_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.
85+message=_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.
86
87 [idle]
88 pics=fishers_house_i_??.png # ???
89
90=== modified file 'tribes/atlanteans/fishers_house/help.lua'
91--- tribes/atlanteans/fishers_house/help.lua 2014-07-25 12:19:33 +0000
92+++ tribes/atlanteans/fishers_house/help.lua 2015-07-26 11:35:42 +0000
93@@ -15,7 +15,7 @@
94 --General Section
95 building_help_general_string("atlanteans", building_description,
96 _"Fishes on the coast near the house.",
97- _"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." ) ..
98+ _"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." ) ..
99
100 --Dependencies
101 building_help_dependencies_production("atlanteans", building_description) ..
102
103=== modified file 'tribes/atlanteans/foresters_house/help.lua'
104--- tribes/atlanteans/foresters_house/help.lua 2014-07-25 12:19:33 +0000
105+++ tribes/atlanteans/foresters_house/help.lua 2015-07-26 11:35:42 +0000
106@@ -15,7 +15,7 @@
107 --General Section
108 building_help_general_string("atlanteans", building_description,
109 _"Plants trees in the surrounding area.",
110- _"The foresters’s house needs free space within the working radius to plant the trees.") ..
111+ _"The foresters’s house needs free space within the work area to plant the trees.") ..
112
113 --Dependencies
114 building_help_dependencies_production("atlanteans", building_description) ..
115
116=== modified file 'tribes/atlanteans/hunters_house/conf'
117--- tribes/atlanteans/hunters_house/conf 2015-06-10 07:00:10 +0000
118+++ tribes/atlanteans/hunters_house/conf 2015-07-26 11:35:42 +0000
119@@ -26,7 +26,7 @@
120 [out_of_resource_notification]
121 # TRANSLATORS: "Game" means animals that you can hunt
122 title=_Out of Game
123-message=_The hunter working out of this hunter’s house can’t find any game in his working radius.
124+message=_The hunter working out of this hunter’s house can’t find any game in his work area.
125 productivity_threshold=0
126
127 [idle]
128
129=== modified file 'tribes/atlanteans/hunters_house/help.lua'
130--- tribes/atlanteans/hunters_house/help.lua 2014-07-25 12:19:33 +0000
131+++ tribes/atlanteans/hunters_house/help.lua 2015-07-26 11:35:42 +0000
132@@ -15,7 +15,7 @@
133 --General Section
134 building_help_general_string("atlanteans", building_description,
135 _"Hunts animals to produce meat.",
136- _"The hunter’s house needs animals to hunt within the working radius.") ..
137+ _"The hunter’s house needs animals to hunt within the work area.") ..
138
139 --Dependencies
140 building_help_dependencies_production("atlanteans", building_description) ..
141
142=== modified file 'tribes/atlanteans/quarry/conf'
143--- tribes/atlanteans/quarry/conf 2015-03-30 18:49:45 +0000
144+++ tribes/atlanteans/quarry/conf 2015-07-26 11:35:42 +0000
145@@ -31,7 +31,7 @@
146
147 [out_of_resource_notification]
148 title=_Out of Rocks
149-message=_The stonecutter working at this quarry can’t find any rocks in his working radius.
150+message=_The stonecutter working at this quarry can’t find any rocks in his work area.
151
152 [idle]
153 pics=quarry_i_??.png # ???
154
155=== modified file 'tribes/atlanteans/quarry/help.lua'
156--- tribes/atlanteans/quarry/help.lua 2014-07-25 12:19:33 +0000
157+++ tribes/atlanteans/quarry/help.lua 2015-07-26 11:35:42 +0000
158@@ -14,7 +14,7 @@
159
160 --General Section
161 building_help_general_string("atlanteans", building_description,
162- _"Carves stones out of rocks in the vicinity.", _"The quarry needs stones to cut within the working radius.") ..
163+ _"Carves stones out of rocks in the vicinity.", _"The quarry needs stones to cut within the work area.") ..
164
165 --Dependencies
166 building_help_dependencies_production("atlanteans", building_description, true) ..
167
168=== modified file 'tribes/atlanteans/well/conf'
169--- tribes/atlanteans/well/conf 2015-05-14 12:01:35 +0000
170+++ tribes/atlanteans/well/conf 2015-07-26 11:35:42 +0000
171@@ -30,7 +30,7 @@
172
173 [out_of_resource_notification]
174 title=_Out of Water
175-message=_The carrier working at this well can’t find any water in his working radius.
176+message=_The carrier working at this well can’t find any water in his work area.
177 productivity_threshold=33
178
179 [idle]
180
181=== modified file 'tribes/atlanteans/woodcutters_house/conf'
182--- tribes/atlanteans/woodcutters_house/conf 2015-06-10 07:00:10 +0000
183+++ tribes/atlanteans/woodcutters_house/conf 2015-07-26 11:35:42 +0000
184@@ -26,7 +26,7 @@
185
186 [out_of_resource_notification]
187 title=_Out of Trees
188-message=_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.
189+message=_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.
190 productivity_threshold=66
191
192 [idle]
193
194=== modified file 'tribes/atlanteans/woodcutters_house/help.lua'
195--- tribes/atlanteans/woodcutters_house/help.lua 2014-07-25 12:19:33 +0000
196+++ tribes/atlanteans/woodcutters_house/help.lua 2015-07-26 11:35:42 +0000
197@@ -14,7 +14,7 @@
198 --General Section
199 building_help_general_string("atlanteans", building_description,
200 _"Fell trees in the surrounding area and process them into logs.",
201- _"The woodcutter's house needs trees to fell within the working radius.") ..
202+ _"The woodcutter's house needs trees to fell within the work area.") ..
203
204 --Dependencies
205 building_help_dependencies_production("atlanteans", building_description, true) ..
206
207=== modified file 'tribes/barbarians/fishers_hut/conf'
208--- tribes/barbarians/fishers_hut/conf 2015-02-08 16:21:44 +0000
209+++ tribes/barbarians/fishers_hut/conf 2015-07-26 11:35:42 +0000
210@@ -24,7 +24,7 @@
211
212 [out_of_resource_notification]
213 title=_Out of Fish
214-message=_The fisher working out of this fisher’s hut can’t find any fish in his working radius.
215+message=_The fisher working out of this fisher’s hut can’t find any fish in his work area.
216
217 [build]
218 pics=build_??.png # ???
219
220=== modified file 'tribes/barbarians/fishers_hut/help.lua'
221--- tribes/barbarians/fishers_hut/help.lua 2014-07-25 12:19:33 +0000
222+++ tribes/barbarians/fishers_hut/help.lua 2015-07-26 11:35:42 +0000
223@@ -15,7 +15,7 @@
224 --General Section
225 building_help_general_string("barbarians", building_description,
226 _"Fishes on the coast near the hut.",
227- _"The fisher’s hut needs water full of fish within the working radius.") ..
228+ _"The fisher’s hut needs water full of fish within the work area.") ..
229
230 --Dependencies
231 building_help_dependencies_production("barbarians", building_description) ..
232
233=== modified file 'tribes/barbarians/hunters_hut/conf'
234--- tribes/barbarians/hunters_hut/conf 2015-05-14 12:01:35 +0000
235+++ tribes/barbarians/hunters_hut/conf 2015-07-26 11:35:42 +0000
236@@ -26,7 +26,7 @@
237 [out_of_resource_notification]
238 # TRANSLATORS: "Game" means animals that you can hunt
239 title=_Out of Game
240-message=_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.
241+message=_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.
242 productivity_threshold=33
243
244 [build]
245
246=== modified file 'tribes/barbarians/hunters_hut/help.lua'
247--- tribes/barbarians/hunters_hut/help.lua 2014-07-25 12:19:33 +0000
248+++ tribes/barbarians/hunters_hut/help.lua 2015-07-26 11:35:42 +0000
249@@ -15,7 +15,7 @@
250 --General Section
251 building_help_general_string("barbarians", building_description,
252 _"Hunts animals to produce meat.",
253- _"The hunter’s hut needs animals to hunt within the working radius.") ..
254+ _"The hunter’s hut needs animals to hunt within the work area.") ..
255
256 --Dependencies
257 building_help_dependencies_production("barbarians", building_description) ..
258
259=== modified file 'tribes/barbarians/lumberjacks_hut/conf'
260--- tribes/barbarians/lumberjacks_hut/conf 2015-06-10 07:00:10 +0000
261+++ tribes/barbarians/lumberjacks_hut/conf 2015-07-26 11:35:42 +0000
262@@ -24,7 +24,7 @@
263
264 [out_of_resource_notification]
265 title=_Out of Trees
266-message=_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.
267+message=_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.
268 productivity_threshold=66
269
270 [idle]
271
272=== modified file 'tribes/barbarians/lumberjacks_hut/help.lua'
273--- tribes/barbarians/lumberjacks_hut/help.lua 2014-11-11 10:19:51 +0000
274+++ tribes/barbarians/lumberjacks_hut/help.lua 2015-07-26 11:35:42 +0000
275@@ -14,7 +14,7 @@
276 --General Section
277 building_help_general_string("barbarians", building_description,
278 _"Fell trees in the surrounding area and process them into logs.",
279- _"The lumberjack’s hut needs trees to fell within the working radius.") ..
280+ _"The lumberjack’s hut needs trees to fell within the work area.") ..
281
282 --Dependencies
283 building_help_dependencies_production("barbarians", building_description, true) ..
284
285=== modified file 'tribes/barbarians/quarry/conf'
286--- tribes/barbarians/quarry/conf 2015-03-30 18:49:45 +0000
287+++ tribes/barbarians/quarry/conf 2015-07-26 11:35:42 +0000
288@@ -30,7 +30,7 @@
289
290 [out_of_resource_notification]
291 title=_Out of Rocks
292-message=_The stonemason working at this quarry can’t find any rocks in his working radius.
293+message=_The stonemason working at this quarry can’t find any rocks in his work area.
294
295 [idle]
296 pics=idle_??.png # ???
297
298=== modified file 'tribes/barbarians/quarry/help.lua'
299--- tribes/barbarians/quarry/help.lua 2014-07-25 12:19:33 +0000
300+++ tribes/barbarians/quarry/help.lua 2015-07-26 11:35:42 +0000
301@@ -14,7 +14,7 @@
302
303 --General Section
304 building_help_general_string("barbarians", building_description,
305- _"Carves raw stone out of rocks in the vicinity.", _"The quarry needs stones to cut within the working radius.") ..
306+ _"Carves raw stone out of rocks in the vicinity.", _"The quarry needs stones to cut within the work area.") ..
307
308 --Dependencies
309 building_help_dependencies_production("barbarians", building_description, true) ..
310
311=== modified file 'tribes/barbarians/rangers_hut/help.lua'
312--- tribes/barbarians/rangers_hut/help.lua 2014-07-25 12:19:33 +0000
313+++ tribes/barbarians/rangers_hut/help.lua 2015-07-26 11:35:42 +0000
314@@ -16,7 +16,7 @@
315 --General Section
316 building_help_general_string("barbarians", building_description,
317 _"Plants trees in the surrounding area.",
318- _"The ranger’s hut needs free space within the working radius to plant the trees.") ..
319+ _"The ranger’s hut needs free space within the work area to plant the trees.") ..
320
321 --Dependencies
322 building_help_dependencies_production("barbarians", building_description) ..
323
324=== modified file 'tribes/barbarians/well/conf'
325--- tribes/barbarians/well/conf 2015-05-14 12:01:35 +0000
326+++ tribes/barbarians/well/conf 2015-07-26 11:35:42 +0000
327@@ -26,7 +26,7 @@
328
329 [out_of_resource_notification]
330 title=_Out of Water
331-message=_The carrier working at this well can’t find any water in his working radius.
332+message=_The carrier working at this well can’t find any water in his work area.
333 productivity_threshold=33
334
335 [idle]
336
337=== modified file 'tribes/empire/fishers_house/conf'
338--- tribes/empire/fishers_house/conf 2014-08-02 19:55:23 +0000
339+++ tribes/empire/fishers_house/conf 2015-07-26 11:35:42 +0000
340@@ -26,7 +26,7 @@
341
342 [out_of_resource_notification]
343 title=_Out of Fish
344-message=_The fisher working in this fisher’s house can’t find any fish in his working radius.
345+message=_The fisher working in this fisher’s house can’t find any fish in his work area.
346
347 [idle]
348 pics=fishers_house_i_??.png # ???
349
350=== modified file 'tribes/empire/fishers_house/help.lua'
351--- tribes/empire/fishers_house/help.lua 2014-07-25 12:19:33 +0000
352+++ tribes/empire/fishers_house/help.lua 2015-07-26 11:35:42 +0000
353@@ -15,7 +15,7 @@
354 --General Section
355 building_help_general_string("empire", building_description,
356 _"Fishes on the coast near the house.",
357- _"The fisher’s house needs water full of fish within the working radius.") ..
358+ _"The fisher’s house needs water full of fish within the work area.") ..
359
360 --Dependencies
361 building_help_dependencies_production("empire", building_description) ..
362
363=== modified file 'tribes/empire/foresters_house/help.lua'
364--- tribes/empire/foresters_house/help.lua 2014-07-25 12:19:33 +0000
365+++ tribes/empire/foresters_house/help.lua 2015-07-26 11:35:42 +0000
366@@ -15,7 +15,7 @@
367 --General Section
368 building_help_general_string("empire", building_description,
369 _"Plants trees in the surrounding area.",
370- _"The foresters’s house needs free space within the working radius to plant the trees.") ..
371+ _"The foresters’s house needs free space within the work area to plant the trees.") ..
372
373 --Dependencies
374 building_help_dependencies_production("empire", building_description) ..
375
376=== modified file 'tribes/empire/hunters_house/conf'
377--- tribes/empire/hunters_house/conf 2015-06-10 07:00:10 +0000
378+++ tribes/empire/hunters_house/conf 2015-07-26 11:35:42 +0000
379@@ -25,7 +25,7 @@
380 [out_of_resource_notification]
381 # TRANSLATORS: "Game" means animals that you can hunt
382 title=_Out of Game
383-message=_The hunter working out of this hunter’s house can’t find any game in his working radius.
384+message=_The hunter working out of this hunter’s house can’t find any game in his work area.
385 productivity_threshold=0
386
387 [idle]
388
389=== modified file 'tribes/empire/hunters_house/help.lua'
390--- tribes/empire/hunters_house/help.lua 2014-07-25 12:19:33 +0000
391+++ tribes/empire/hunters_house/help.lua 2015-07-26 11:35:42 +0000
392@@ -15,7 +15,7 @@
393 --General Section
394 building_help_general_string("empire", building_description,
395 _"Hunts animals to produce meat.",
396- _"The hunter’s house needs animals to hunt within the working radius.") ..
397+ _"The hunter’s house needs animals to hunt within the work area.") ..
398
399 --Dependencies
400 building_help_dependencies_production("empire", building_description) ..
401
402=== modified file 'tribes/empire/lumberjacks_house/conf'
403--- tribes/empire/lumberjacks_house/conf 2015-06-10 07:00:10 +0000
404+++ tribes/empire/lumberjacks_house/conf 2015-07-26 11:35:42 +0000
405@@ -26,7 +26,7 @@
406
407 [out_of_resource_notification]
408 title=_Out of Trees
409-message=_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.
410+message=_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.
411 productivity_threshold=66
412
413 [idle]
414
415=== modified file 'tribes/empire/lumberjacks_house/help.lua'
416--- tribes/empire/lumberjacks_house/help.lua 2014-07-25 12:19:33 +0000
417+++ tribes/empire/lumberjacks_house/help.lua 2015-07-26 11:35:42 +0000
418@@ -14,7 +14,7 @@
419 --General Section
420 building_help_general_string("empire", building_description,
421 _"Fell trees in the surrounding area and process them into logs.",
422- _"The lumberjack's house needs trees to fell within the working radius.") ..
423+ _"The lumberjack's house needs trees to fell within the work area.") ..
424
425 --Dependencies
426 building_help_dependencies_production("empire", building_description, true) ..
427
428=== modified file 'tribes/empire/quarry/conf'
429--- tribes/empire/quarry/conf 2014-08-02 19:55:23 +0000
430+++ tribes/empire/quarry/conf 2015-07-26 11:35:42 +0000
431@@ -44,7 +44,7 @@
432
433 [out_of_resource_notification]
434 title=_Out of Rocks
435-message=_The stonemason working at this quarry can’t find any rocks in his working radius.
436+message=_The stonemason working at this quarry can’t find any rocks in his work area.
437
438 [idle]
439 pics=quarry_i_??.png # ???
440
441=== modified file 'tribes/empire/quarry/help.lua'
442--- tribes/empire/quarry/help.lua 2014-07-25 12:19:33 +0000
443+++ tribes/empire/quarry/help.lua 2015-07-26 11:35:42 +0000
444@@ -14,7 +14,7 @@
445
446 --General Section
447 building_help_general_string("empire", building_description,
448- _"Carves marble and stone out of rocks in the vicinity.", _"The quarry needs stones to cut within the working radius.") ..
449+ _"Carves marble and stone out of rocks in the vicinity.", _"The quarry needs stones to cut within the work area.") ..
450
451 --Dependencies
452 building_help_dependencies_production("empire", building_description, true) ..
453
454=== modified file 'tribes/empire/well/conf'
455--- tribes/empire/well/conf 2015-05-14 12:01:35 +0000
456+++ tribes/empire/well/conf 2015-07-26 11:35:42 +0000
457@@ -29,7 +29,7 @@
458
459 [out_of_resource_notification]
460 title=_Out of Water
461-message=_The carrier working at this well can’t find any water in his working radius.
462+message=_The carrier working at this well can’t find any water in his work area.
463 productivity_threshold=33
464
465 [idle]
466
467=== modified file 'tribes/scripting/format_help.lua'
468--- tribes/scripting/format_help.lua 2015-05-21 06:57:43 +0000
469+++ tribes/scripting/format_help.lua 2015-07-26 11:35:42 +0000
470@@ -278,7 +278,7 @@
471
472 if(building_description.type_name == "productionsite") then
473 if(building_description.workarea_radius and building_description.workarea_radius > 0) then
474- result = result .. text_line(_"Working radius:", building_description.workarea_radius)
475+ result = result .. text_line(_"Work area:", building_description.workarea_radius)
476 end
477
478 elseif(building_description.type_name == "warehouse") then

Subscribers

People subscribed via source and target branches

to status/vote changes: