Merge lp:~widelands-dev/widelands/i18n-20140314 into lp:widelands
- i18n-20140314
- Merge into trunk
Proposed by
GunChleoc
Status: | Merged |
---|---|
Merged at revision: | 6877 |
Proposed branch: | lp:~widelands-dev/widelands/i18n-20140314 |
Merge into: | lp:widelands |
Diff against target: |
791 lines (+168/-171) 42 files modified
campaigns/emp02.wmf/scripting/texts.lua (+1/-4) global/militarysites/barracks.empire/conf (+4/-4) global/militarysites/barrier.barbarians/conf (+4/-4) global/militarysites/barrier.empire/conf (+4/-4) global/militarysites/castle.atlanteans/conf (+4/-4) global/militarysites/castle.empire/conf (+4/-4) global/militarysites/citadel.barbarians/conf (+4/-4) global/militarysites/donjon.barbarians/conf (+4/-4) global/militarysites/fortress.barbarians/conf (+4/-4) global/militarysites/fortress.empire/conf (+4/-4) global/militarysites/guardhall.atlanteans/conf (+4/-4) global/militarysites/guardhouse.atlanteans/conf (+4/-4) global/militarysites/high_tower.atlanteans/conf (+4/-4) global/militarysites/outpost.empire/conf (+4/-4) global/militarysites/sentry.barbarians/conf (+4/-4) global/militarysites/sentry.empire/conf (+4/-4) global/militarysites/small_tower.atlanteans/conf (+4/-4) global/militarysites/tower.atlanteans/conf (+4/-4) global/militarysites/tower.empire/conf (+4/-4) src/ui_fsmenu/options.cc (+0/-2) tribes/atlanteans/castle/conf (+5/-5) tribes/atlanteans/guardhall/conf (+5/-5) tribes/atlanteans/guardhouse/conf (+5/-5) tribes/atlanteans/high_tower/conf (+5/-5) tribes/atlanteans/horse/conf (+1/-1) tribes/atlanteans/small_tower/conf (+5/-5) tribes/atlanteans/tower/conf (+5/-5) tribes/barbarians/barrier/conf (+5/-5) tribes/barbarians/citadel/conf (+5/-5) tribes/barbarians/donjon/conf (+5/-5) tribes/barbarians/fernery/help.lua (+2/-0) tribes/barbarians/fortress/conf (+5/-5) tribes/barbarians/ox/conf (+1/-1) tribes/barbarians/sentry/conf (+5/-5) tribes/empire/barracks/conf (+5/-5) tribes/empire/barrier/conf (+5/-5) tribes/empire/castle/conf (+5/-5) tribes/empire/donkey/conf (+1/-1) tribes/empire/fortress/conf (+5/-5) tribes/empire/outpost/conf (+5/-5) tribes/empire/sentry/conf (+5/-5) tribes/empire/tower/conf (+5/-5) |
To merge this branch: | bzr merge lp:~widelands-dev/widelands/i18n-20140314 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Widelands Developers | Pending | ||
Review via email: mp+211191@code.launchpad.net |
Commit message
Description of the change
Some more small string fixes.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'campaigns/emp02.wmf/scripting/texts.lua' |
2 | --- campaigns/emp02.wmf/scripting/texts.lua 2014-03-12 09:14:19 +0000 |
3 | +++ campaigns/emp02.wmf/scripting/texts.lua 2014-03-16 06:41:40 +0000 |
4 | @@ -167,10 +167,7 @@ |
5 | saledus_2 = { |
6 | title =_ "Marble on the Mountain", |
7 | body= saledus(_"Saledus smiles", |
8 | -_([[Lutius, I’ve got good news for you: ]] .. |
9 | -[[As I walked to the east, I found a larger mountain.]] .. |
10 | -[[I am not absolutely sure – a geologist should check if I am right]] .. |
11 | -[[ – but I believe we could mine marble from some places on the mountain.]]) .. "<br><br>" .. |
12 | +_([[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.]]) .. "<br><br>" .. |
13 | _([[It would be a good source for bolstering our supply of quality marble, ]] .. |
14 | [[beyond the meager quantities available from the quarry. ]] .. |
15 | [[Perhaps you were right when you said that this island was like paradise.]]) .. "<br><br>" .. |
16 | |
17 | === modified file 'global/militarysites/barracks.empire/conf' |
18 | --- global/militarysites/barracks.empire/conf 2013-10-29 10:55:20 +0000 |
19 | +++ global/militarysites/barracks.empire/conf 2014-03-16 06:41:40 +0000 |
20 | @@ -5,10 +5,10 @@ |
21 | buildable=no |
22 | prefer_heroes=false |
23 | occupied_string= |
24 | -aggressor_string=_Your Barracks discovered an aggressor. |
25 | -attack_string=_Your Barracks is under attack. |
26 | -defeated_enemy_string=_The enemy defeated your soldiers at the Barracks |
27 | -defeated_you_string=_Your soldiers defeated the enemy at the Barracks |
28 | +aggressor_string=_Your barracks discovered an aggressor. |
29 | +attack_string=_Your barracks is under attack. |
30 | +defeated_enemy_string=_The enemy defeated your soldiers at the barracks. |
31 | +defeated_you_string=_Your soldiers defeated the enemy at the barracks. |
32 | |
33 | |
34 | [idle] |
35 | |
36 | === modified file 'global/militarysites/barrier.barbarians/conf' |
37 | --- global/militarysites/barrier.barbarians/conf 2013-10-29 10:55:20 +0000 |
38 | +++ global/militarysites/barrier.barbarians/conf 2014-03-16 06:41:40 +0000 |
39 | @@ -5,10 +5,10 @@ |
40 | buildable=no |
41 | prefer_heroes=true |
42 | occupied_string= |
43 | -aggressor_string=_Your Barrier discovered an aggressor. |
44 | -attack_string=_Your Barrier is under attack. |
45 | -defeated_enemy_string=_The enemy defeated your soldiers at the Barrier |
46 | -defeated_you_string=_Your soldiers defeated the enemy at the Barrier |
47 | +aggressor_string=_Your barrier discovered an aggressor. |
48 | +attack_string=_Your barrier is under attack. |
49 | +defeated_enemy_string=_The enemy defeated your soldiers at the barrier. |
50 | +defeated_you_string=_Your soldiers defeated the enemy at the barrier. |
51 | |
52 | |
53 | [idle] |
54 | |
55 | === modified file 'global/militarysites/barrier.empire/conf' |
56 | --- global/militarysites/barrier.empire/conf 2013-10-29 10:55:20 +0000 |
57 | +++ global/militarysites/barrier.empire/conf 2014-03-16 06:41:40 +0000 |
58 | @@ -5,10 +5,10 @@ |
59 | buildable=no |
60 | prefer_heroes=true |
61 | occupied_string= |
62 | -aggressor_string=_Your Barrier discovered an aggressor. |
63 | -attack_string=_Your Barrier is under attack. |
64 | -defeated_enemy_string=_The enemy defeated your soldiers at the Barrier |
65 | -defeated_you_string=_Your soldiers defeated the enemy at the Barrier |
66 | +aggressor_string=_Your barrier discovered an aggressor. |
67 | +attack_string=_Your barrier is under attack. |
68 | +defeated_enemy_string=_The enemy defeated your soldiers at the barrier. |
69 | +defeated_you_string=_Your soldiers defeated the enemy at the barrier. |
70 | |
71 | |
72 | [idle] |
73 | |
74 | === modified file 'global/militarysites/castle.atlanteans/conf' |
75 | --- global/militarysites/castle.atlanteans/conf 2013-10-29 10:55:20 +0000 |
76 | +++ global/militarysites/castle.atlanteans/conf 2014-03-16 06:41:40 +0000 |
77 | @@ -5,10 +5,10 @@ |
78 | buildable=no |
79 | prefer_heroes=true |
80 | occupied_string= |
81 | -aggressor_string=_Your Castle discovered an aggressor. |
82 | -attack_string=_Your Castle is under attack. |
83 | -defeated_enemy_string=_The enemy defeated your soldiers at the Castle |
84 | -defeated_you_string=_Your soldiers defeated the enemy at the Castle |
85 | +aggressor_string=_Your castle discovered an aggressor. |
86 | +attack_string=_Your castle is under attack. |
87 | +defeated_enemy_string=_The enemy defeated your soldiers at the castle. |
88 | +defeated_you_string=_Your soldiers defeated the enemy at the castle. |
89 | |
90 | |
91 | [idle] |
92 | |
93 | === modified file 'global/militarysites/castle.empire/conf' |
94 | --- global/militarysites/castle.empire/conf 2013-10-29 10:55:20 +0000 |
95 | +++ global/militarysites/castle.empire/conf 2014-03-16 06:41:40 +0000 |
96 | @@ -5,10 +5,10 @@ |
97 | buildable=no |
98 | prefer_heroes=true |
99 | occupied_string= |
100 | -aggressor_string=_Your Castle discovered an aggressor. |
101 | -attack_string=_Your Castle is under attack. |
102 | -defeated_enemy_string=_The enemy defeated your soldiers at the Castle |
103 | -defeated_you_string=_Your soldiers defeated the enemy at the Castle |
104 | +aggressor_string=_Your castle discovered an aggressor. |
105 | +attack_string=_Your castle is under attack. |
106 | +defeated_enemy_string=_The enemy defeated your soldiers at the castle. |
107 | +defeated_you_string=_Your soldiers defeated the enemy at the castle. |
108 | |
109 | |
110 | [idle] |
111 | |
112 | === modified file 'global/militarysites/citadel.barbarians/conf' |
113 | --- global/militarysites/citadel.barbarians/conf 2013-10-29 10:55:20 +0000 |
114 | +++ global/militarysites/citadel.barbarians/conf 2014-03-16 06:41:40 +0000 |
115 | @@ -5,10 +5,10 @@ |
116 | buildable=no |
117 | prefer_heroes=true |
118 | occupied_string= |
119 | -aggressor_string=_Your Citadel discovered an aggressor. |
120 | -attack_string=_Your Citadel is under attack. |
121 | -defeated_enemy_string=_The enemy defeated your soldiers at the Citadel |
122 | -defeated_you_string=_Your soldiers defeated the enemy at the Citadel |
123 | +aggressor_string=_Your citadel discovered an aggressor. |
124 | +attack_string=_Your citadel is under attack. |
125 | +defeated_enemy_string=_The enemy defeated your soldiers at the citadel. |
126 | +defeated_you_string=_Your soldiers defeated the enemy at the citadel. |
127 | |
128 | |
129 | [idle] |
130 | |
131 | === modified file 'global/militarysites/donjon.barbarians/conf' |
132 | --- global/militarysites/donjon.barbarians/conf 2013-10-29 10:55:20 +0000 |
133 | +++ global/militarysites/donjon.barbarians/conf 2014-03-16 06:41:40 +0000 |
134 | @@ -6,10 +6,10 @@ |
135 | buildable=no |
136 | prefer_heroes=true |
137 | occupied_string= |
138 | -aggressor_string=_Your Donjon discovered an aggressor. |
139 | -attack_string=_Your Donjon is under attack. |
140 | -defeated_enemy_string=_The enemy defeated your soldiers at the Donjon |
141 | -defeated_you_string=_Your soldiers defeated the enemy at the Donjon |
142 | +aggressor_string=_Your donjon discovered an aggressor. |
143 | +attack_string=_Your donjon is under attack. |
144 | +defeated_enemy_string=_The enemy defeated your soldiers at the donjon. |
145 | +defeated_you_string=_Your soldiers defeated the enemy at the donjon. |
146 | |
147 | |
148 | [idle] |
149 | |
150 | === modified file 'global/militarysites/fortress.barbarians/conf' |
151 | --- global/militarysites/fortress.barbarians/conf 2013-10-29 10:55:20 +0000 |
152 | +++ global/militarysites/fortress.barbarians/conf 2014-03-16 06:41:40 +0000 |
153 | @@ -5,10 +5,10 @@ |
154 | buildable=no |
155 | prefer_heroes=true |
156 | occupied_string= |
157 | -aggressor_string=_Your Fortress discovered an aggressor. |
158 | -attack_string=_Your Fortress is under attack. |
159 | -defeated_enemy_string=_The enemy defeated your soldiers at the Fortress |
160 | -defeated_you_string=_Your soldiers defeated the enemy at the Fortress |
161 | +aggressor_string=_Your fortress discovered an aggressor. |
162 | +attack_string=_Your fortress is under attack. |
163 | +defeated_enemy_string=_The enemy defeated your soldiers at the fortress. |
164 | +defeated_you_string=_Your soldiers defeated the enemy at the fortress. |
165 | |
166 | |
167 | [idle] |
168 | |
169 | === modified file 'global/militarysites/fortress.empire/conf' |
170 | --- global/militarysites/fortress.empire/conf 2013-10-29 10:55:20 +0000 |
171 | +++ global/militarysites/fortress.empire/conf 2014-03-16 06:41:40 +0000 |
172 | @@ -5,10 +5,10 @@ |
173 | buildable=no |
174 | prefer_heroes=true |
175 | occupied_string= |
176 | -aggressor_string=_Your Fortress discovered an aggressor. |
177 | -attack_string=_Your Fortress is under attack. |
178 | -defeated_enemy_string=_The enemy defeated your soldiers at the Fortress |
179 | -defeated_you_string=_Your soldiers defeated the enemy at the Fortress |
180 | +aggressor_string=_Your fortress discovered an aggressor. |
181 | +attack_string=_Your fortress is under attack. |
182 | +defeated_enemy_string=_The enemy defeated your soldiers at the fortress. |
183 | +defeated_you_string=_Your soldiers defeated the enemy at the fortress. |
184 | |
185 | |
186 | [idle] |
187 | |
188 | === modified file 'global/militarysites/guardhall.atlanteans/conf' |
189 | --- global/militarysites/guardhall.atlanteans/conf 2013-10-29 10:55:20 +0000 |
190 | +++ global/militarysites/guardhall.atlanteans/conf 2014-03-16 06:41:40 +0000 |
191 | @@ -5,10 +5,10 @@ |
192 | buildable=no |
193 | prefer_heroes=true |
194 | occupied_string= |
195 | -aggressor_string=_Your Guardhall discovered an aggressor. |
196 | -attack_string=_Your Guardhall is under attack. |
197 | -defeated_enemy_string=_The enemy defeated your soldiers at the Guardhall |
198 | -defeated_you_string=_Your soldiers defeated the enemy at the Guardhall |
199 | +aggressor_string=_Your guardhall discovered an aggressor. |
200 | +attack_string=_Your guardhall is under attack. |
201 | +defeated_enemy_string=_The enemy defeated your soldiers at the guardhall. |
202 | +defeated_you_string=_Your soldiers defeated the enemy at the guardhall. |
203 | |
204 | |
205 | [idle] |
206 | |
207 | === modified file 'global/militarysites/guardhouse.atlanteans/conf' |
208 | --- global/militarysites/guardhouse.atlanteans/conf 2013-10-29 10:55:20 +0000 |
209 | +++ global/militarysites/guardhouse.atlanteans/conf 2014-03-16 06:41:40 +0000 |
210 | @@ -5,10 +5,10 @@ |
211 | buildable=no |
212 | prefer_heroes=false |
213 | occupied_string= |
214 | -aggressor_string=_Your Guardhouse discovered an aggressor. |
215 | -attack_string=_Your Guardhouse is under attack. |
216 | -defeated_enemy_string=_The enemy defeated your soldiers at the Guardhouse |
217 | -defeated_you_string=_Your soldiers defeated the enemy at the Guardhouse |
218 | +aggressor_string=_Your guardhouse discovered an aggressor. |
219 | +attack_string=_Your guardhouse is under attack. |
220 | +defeated_enemy_string=_The enemy defeated your soldiers at the guardhouse. |
221 | +defeated_you_string=_Your soldiers defeated the enemy at the guardhouse. |
222 | |
223 | |
224 | [idle] |
225 | |
226 | === modified file 'global/militarysites/high_tower.atlanteans/conf' |
227 | --- global/militarysites/high_tower.atlanteans/conf 2013-10-29 10:55:20 +0000 |
228 | +++ global/militarysites/high_tower.atlanteans/conf 2014-03-16 06:41:40 +0000 |
229 | @@ -6,10 +6,10 @@ |
230 | buildable=no |
231 | prefer_heroes=true |
232 | occupied_string= |
233 | -aggressor_string=_Your High Tower discovered an aggressor. |
234 | -attack_string=_Your High Tower is under attack. |
235 | -defeated_enemy_string=_The enemy defeated your soldiers at the High Tower |
236 | -defeated_you_string=_Your soldiers defeated the enemy at the High Tower |
237 | +aggressor_string=_Your high tower discovered an aggressor. |
238 | +attack_string=_Your high tower is under attack. |
239 | +defeated_enemy_string=_The enemy defeated your soldiers at the high tower. |
240 | +defeated_you_string=_Your soldiers defeated the enemy at the high tower. |
241 | |
242 | |
243 | [idle] |
244 | |
245 | === modified file 'global/militarysites/outpost.empire/conf' |
246 | --- global/militarysites/outpost.empire/conf 2013-10-29 10:55:20 +0000 |
247 | +++ global/militarysites/outpost.empire/conf 2014-03-16 06:41:40 +0000 |
248 | @@ -5,10 +5,10 @@ |
249 | buildable=no |
250 | prefer_heroes=false |
251 | occupied_string= |
252 | -aggressor_string=_Your Outpost discovered an aggressor. |
253 | -attack_string=_Your Outpost is under attack. |
254 | -defeated_enemy_string=_The enemy defeated your soldiers at the Outpost |
255 | -defeated_you_string=_Your soldiers defeated the enemy at the Outpost |
256 | +aggressor_string=_Your outpost discovered an aggressor. |
257 | +attack_string=_Your outpost is under attack. |
258 | +defeated_enemy_string=_The enemy defeated your soldiers at the outpost. |
259 | +defeated_you_string=_Your soldiers defeated the enemy at the outpost. |
260 | |
261 | |
262 | [idle] |
263 | |
264 | === modified file 'global/militarysites/sentry.barbarians/conf' |
265 | --- global/militarysites/sentry.barbarians/conf 2013-10-29 10:55:20 +0000 |
266 | +++ global/militarysites/sentry.barbarians/conf 2014-03-16 06:41:40 +0000 |
267 | @@ -5,10 +5,10 @@ |
268 | buildable=no |
269 | prefer_heroes=false |
270 | occupied_string= |
271 | -aggressor_string=_Your Sentry discovered an aggressor. |
272 | -attack_string=_Your Sentry is under attack. |
273 | -defeated_enemy_string=_The enemy defeated your soldiers at the Sentry |
274 | -defeated_you_string=_Your soldiers defeated the enemy at the Sentry |
275 | +aggressor_string=_Your sentry discovered an aggressor. |
276 | +attack_string=_Your sentry is under attack. |
277 | +defeated_enemy_string=_The enemy defeated your soldiers at the sentry. |
278 | +defeated_you_string=_Your soldiers defeated the enemy at the sentry. |
279 | |
280 | |
281 | [idle] |
282 | |
283 | === modified file 'global/militarysites/sentry.empire/conf' |
284 | --- global/militarysites/sentry.empire/conf 2013-10-29 10:55:20 +0000 |
285 | +++ global/militarysites/sentry.empire/conf 2014-03-16 06:41:40 +0000 |
286 | @@ -5,10 +5,10 @@ |
287 | buildable=no |
288 | prefer_heroes=false |
289 | occupied_string= |
290 | -aggressor_string=_Your Sentry discovered an aggressor. |
291 | -attack_string=_Your Sentry is under attack. |
292 | -defeated_enemy_string=_The enemy defeated your soldiers at the Sentry |
293 | -defeated_you_string=_Your soldiers defeated the enemy at the Sentry |
294 | +aggressor_string=_Your sentry discovered an aggressor. |
295 | +attack_string=_Your sentry is under attack. |
296 | +defeated_enemy_string=_The enemy defeated your soldiers at the sentry. |
297 | +defeated_you_string=_Your soldiers defeated the enemy at the sentry. |
298 | |
299 | |
300 | [idle] |
301 | |
302 | === modified file 'global/militarysites/small_tower.atlanteans/conf' |
303 | --- global/militarysites/small_tower.atlanteans/conf 2013-10-29 10:55:20 +0000 |
304 | +++ global/militarysites/small_tower.atlanteans/conf 2014-03-16 06:41:40 +0000 |
305 | @@ -6,10 +6,10 @@ |
306 | buildable=no |
307 | prefer_heroes=false |
308 | occupied_string= |
309 | -aggressor_string=_Your Small Tower discovered an aggressor. |
310 | -attack_string=_Your Small Tower is under attack. |
311 | -defeated_enemy_string=_The enemy defeated your soldiers at the Small Tower |
312 | -defeated_you_string=_Your soldiers defeated the enemy at the Small Tower |
313 | +aggressor_string=_Your small tower discovered an aggressor. |
314 | +attack_string=_Your small tower is under attack. |
315 | +defeated_enemy_string=_The enemy defeated your soldiers at the small tower. |
316 | +defeated_you_string=_Your soldiers defeated the enemy at the small tower. |
317 | |
318 | |
319 | [idle] |
320 | |
321 | === modified file 'global/militarysites/tower.atlanteans/conf' |
322 | --- global/militarysites/tower.atlanteans/conf 2013-10-29 10:55:20 +0000 |
323 | +++ global/militarysites/tower.atlanteans/conf 2014-03-16 06:41:40 +0000 |
324 | @@ -6,10 +6,10 @@ |
325 | buildable=no |
326 | prefer_heroes=true |
327 | occupied_string= |
328 | -aggressor_string=_Your Tower discovered an aggressor. |
329 | -attack_string=_Your Tower is under attack. |
330 | -defeated_enemy_string=_The enemy defeated your soldiers at the Tower |
331 | -defeated_you_string=_Your soldiers defeated the enemy at the Tower |
332 | +aggressor_string=_Your tower discovered an aggressor. |
333 | +attack_string=_Your tower is under attack. |
334 | +defeated_enemy_string=_The enemy defeated your soldiers at the tower. |
335 | +defeated_you_string=_Your soldiers defeated the enemy at the tower. |
336 | |
337 | |
338 | [idle] |
339 | |
340 | === modified file 'global/militarysites/tower.empire/conf' |
341 | --- global/militarysites/tower.empire/conf 2013-10-29 10:55:20 +0000 |
342 | +++ global/militarysites/tower.empire/conf 2014-03-16 06:41:40 +0000 |
343 | @@ -6,10 +6,10 @@ |
344 | buildable=no |
345 | prefer_heroes=true |
346 | occupied_string= |
347 | -aggressor_string=_Your Tower discovered an aggressor. |
348 | -attack_string=_Your Tower is under attack. |
349 | -defeated_enemy_string=_The enemy defeated your soldiers at the Tower |
350 | -defeated_you_string=_Your soldiers defeated the enemy at the Tower |
351 | +aggressor_string=_Your tower discovered an aggressor. |
352 | +attack_string=_Your tower is under attack. |
353 | +defeated_enemy_string=_The enemy defeated your soldiers at the tower. |
354 | +defeated_you_string=_Your soldiers defeated the enemy at the tower. |
355 | |
356 | |
357 | [idle] |
358 | |
359 | === modified file 'src/ui_fsmenu/options.cc' |
360 | --- src/ui_fsmenu/options.cc 2014-03-09 21:19:30 +0000 |
361 | +++ src/ui_fsmenu/options.cc 2014-03-16 06:41:40 +0000 |
362 | @@ -22,8 +22,6 @@ |
363 | #include <cstdio> |
364 | #include <iostream> |
365 | |
366 | -#include <libintl.h> |
367 | - |
368 | #include "constants.h" |
369 | #include "graphic/graphic.h" |
370 | #include "i18n.h" |
371 | |
372 | === modified file 'tribes/atlanteans/castle/conf' |
373 | --- tribes/atlanteans/castle/conf 2013-10-29 10:55:20 +0000 |
374 | +++ tribes/atlanteans/castle/conf 2014-03-16 06:41:40 +0000 |
375 | @@ -3,11 +3,11 @@ |
376 | heal_per_second=200 |
377 | conquers=12 |
378 | prefer_heroes=true |
379 | -occupied_string=_Your soldiers have occupied your Castle |
380 | -aggressor_string=_Your Castle discovered an aggressor. |
381 | -attack_string=_Your Castle is under attack. |
382 | -defeated_enemy_string=_The enemy defeated your soldiers at the Castle |
383 | -defeated_you_string=_Your soldiers defeated the enemy at the Castle |
384 | +occupied_string=_Your soldiers have occupied your castle. |
385 | +aggressor_string=_Your castle discovered an aggressor. |
386 | +attack_string=_Your castle is under attack. |
387 | +defeated_enemy_string=_The enemy defeated your soldiers at the castle. |
388 | +defeated_you_string=_Your soldiers defeated the enemy at the castle. |
389 | |
390 | [buildcost] |
391 | planks=4 |
392 | |
393 | === modified file 'tribes/atlanteans/guardhall/conf' |
394 | --- tribes/atlanteans/guardhall/conf 2013-10-29 10:55:20 +0000 |
395 | +++ tribes/atlanteans/guardhall/conf 2014-03-16 06:41:40 +0000 |
396 | @@ -3,11 +3,11 @@ |
397 | heal_per_second=140 |
398 | conquers=7 |
399 | prefer_heroes=true |
400 | -occupied_string=_Your soldiers have occupied your Guardhall |
401 | -aggressor_string=_Your Guardhall discovered an aggressor. |
402 | -attack_string=_Your Guardhall is under attack. |
403 | -defeated_enemy_string=_The enemy defeated your soldiers at the Guardhall |
404 | -defeated_you_string=_Your soldiers defeated the enemy at the Guardhall |
405 | +occupied_string=_Your soldiers have occupied your guardhall. |
406 | +aggressor_string=_Your guardhall discovered an aggressor. |
407 | +attack_string=_Your guardhall is under attack. |
408 | +defeated_enemy_string=_The enemy defeated your soldiers at the guardhall. |
409 | +defeated_you_string=_Your soldiers defeated the enemy at the guardhall. |
410 | |
411 | [buildcost] |
412 | trunk=2 |
413 | |
414 | === modified file 'tribes/atlanteans/guardhouse/conf' |
415 | --- tribes/atlanteans/guardhouse/conf 2013-10-29 10:55:20 +0000 |
416 | +++ tribes/atlanteans/guardhouse/conf 2014-03-16 06:41:40 +0000 |
417 | @@ -3,11 +3,11 @@ |
418 | conquers=6 |
419 | max_soldiers=2 |
420 | prefer_heroes=false |
421 | -occupied_string=_Your soldiers have occupied your Guardhouse |
422 | -aggressor_string=_Your Guardhouse discovered an aggressor. |
423 | -attack_string=_Your Guardhouse is under attack. |
424 | -defeated_enemy_string=_The enemy defeated your soldiers at the Guardhouse |
425 | -defeated_you_string=_Your soldiers defeated the enemy at the Guardhouse |
426 | +occupied_string=_Your soldiers have occupied your guardhouse. |
427 | +aggressor_string=_Your guardhouse discovered an aggressor. |
428 | +attack_string=_Your guardhouse is under attack. |
429 | +defeated_enemy_string=_The enemy defeated your soldiers at the guardhouse. |
430 | +defeated_you_string=_Your soldiers defeated the enemy at the guardhouse. |
431 | |
432 | [buildcost] |
433 | trunk=1 |
434 | |
435 | === modified file 'tribes/atlanteans/high_tower/conf' |
436 | --- tribes/atlanteans/high_tower/conf 2013-10-29 10:55:20 +0000 |
437 | +++ tribes/atlanteans/high_tower/conf 2014-03-16 06:41:40 +0000 |
438 | @@ -6,11 +6,11 @@ |
439 | vision_range=21 |
440 | enhanced_building=yes |
441 | prefer_heroes=true |
442 | -occupied_string=_Your soldiers have occupied your High Tower |
443 | -aggressor_string=_Your High Tower discovered an aggressor. |
444 | -attack_string=_Your High Tower is under attack. |
445 | -defeated_enemy_string=_The enemy defeated your soldiers at the High Tower |
446 | -defeated_you_string=_Your soldiers defeated the enemy at the High Tower |
447 | +occupied_string=_Your soldiers have occupied your high tower. |
448 | +aggressor_string=_Your high tower discovered an aggressor. |
449 | +attack_string=_Your high tower is under attack. |
450 | +defeated_enemy_string=_The enemy defeated your soldiers at the high tower. |
451 | +defeated_you_string=_Your soldiers defeated the enemy at the high tower. |
452 | |
453 | [enhancement_cost] |
454 | trunk=1 |
455 | |
456 | === modified file 'tribes/atlanteans/horse/conf' |
457 | --- tribes/atlanteans/horse/conf 2014-02-24 21:12:30 +0000 |
458 | +++ tribes/atlanteans/horse/conf 2014-03-16 06:41:40 +0000 |
459 | @@ -1,4 +1,4 @@ |
460 | -help=_Horses help to carry items at heavily used roads. They are reared in a horse farm. |
461 | +help=_Horses help to carry items along busy roads. They are reared in a horse farm. |
462 | default_target_quantity=5 |
463 | ware_hotspot=-2 12 |
464 | |
465 | |
466 | === modified file 'tribes/atlanteans/small_tower/conf' |
467 | --- tribes/atlanteans/small_tower/conf 2013-10-29 10:55:20 +0000 |
468 | +++ tribes/atlanteans/small_tower/conf 2014-03-16 06:41:40 +0000 |
469 | @@ -4,11 +4,11 @@ |
470 | vision_range=13 |
471 | max_soldiers=3 |
472 | prefer_heroes=true |
473 | -occupied_string=_Your soldiers have occupied your Small Tower |
474 | -aggressor_string=_Your Small Tower discovered an aggressor. |
475 | -attack_string=_Your Small Tower is under attack. |
476 | -defeated_enemy_string=_The enemy defeated your soldiers at the Small Tower |
477 | -defeated_you_string=_Your soldiers defeated the enemy at the Small Tower |
478 | +occupied_string=_Your soldiers have occupied your small tower. |
479 | +aggressor_string=_Your small tower discovered an aggressor. |
480 | +attack_string=_Your small tower is under attack. |
481 | +defeated_enemy_string=_The enemy defeated your soldiers at the small tower. |
482 | +defeated_you_string=_Your soldiers defeated the enemy at the small tower. |
483 | |
484 | [buildcost] |
485 | trunk=1 |
486 | |
487 | === modified file 'tribes/atlanteans/tower/conf' |
488 | --- tribes/atlanteans/tower/conf 2013-10-29 10:55:20 +0000 |
489 | +++ tribes/atlanteans/tower/conf 2014-03-16 06:41:40 +0000 |
490 | @@ -5,11 +5,11 @@ |
491 | vision_range=17 |
492 | enhancement=high_tower |
493 | prefer_heroes=false |
494 | -occupied_string=_Your soldiers have occupied your Tower |
495 | -aggressor_string=_Your Tower discovered an aggressor. |
496 | -attack_string=_Your Tower is under attack. |
497 | -defeated_enemy_string=_The enemy defeated your soldiers at the Tower |
498 | -defeated_you_string=_Your soldiers defeated the enemy at the Tower |
499 | +occupied_string=_Your soldiers have occupied your tower. |
500 | +aggressor_string=_Your tower discovered an aggressor. |
501 | +attack_string=_Your tower is under attack. |
502 | +defeated_enemy_string=_The enemy defeated your soldiers at the tower. |
503 | +defeated_you_string=_Your soldiers defeated the enemy at the tower. |
504 | |
505 | [buildcost] |
506 | trunk=2 |
507 | |
508 | === modified file 'tribes/barbarians/barrier/conf' |
509 | --- tribes/barbarians/barrier/conf 2013-10-29 10:55:20 +0000 |
510 | +++ tribes/barbarians/barrier/conf 2014-03-16 06:41:40 +0000 |
511 | @@ -3,11 +3,11 @@ |
512 | heal_per_second=130 |
513 | conquers=8 |
514 | prefer_heroes=true |
515 | -occupied_string=_Your soldiers have occupied your Barrier |
516 | -aggressor_string=_Your Barrier discovered an aggressor. |
517 | -attack_string=_Your Barrier is under attack. |
518 | -defeated_enemy_string=_The enemy defeated your soldiers at the Barrier |
519 | -defeated_you_string=_Your soldiers defeated the enemy at the Barrier |
520 | +occupied_string=_Your soldiers have occupied your barrier. |
521 | +aggressor_string=_Your barrier discovered an aggressor. |
522 | +attack_string=_Your barrier is under attack. |
523 | +defeated_enemy_string=_The enemy defeated your soldiers at the barrier. |
524 | +defeated_you_string=_Your soldiers defeated the enemy at the barrier. |
525 | |
526 | [buildcost] |
527 | blackwood=5 |
528 | |
529 | === modified file 'tribes/barbarians/citadel/conf' |
530 | --- tribes/barbarians/citadel/conf 2013-10-29 10:55:20 +0000 |
531 | +++ tribes/barbarians/citadel/conf 2014-03-16 06:41:40 +0000 |
532 | @@ -5,11 +5,11 @@ |
533 | conquers=12 |
534 | enhanced_building=yes |
535 | prefer_heroes=true |
536 | -occupied_string=_Your soldiers have occupied your Citadel |
537 | -aggressor_string=_Your Citadel discovered an aggressor. |
538 | -attack_string=_Your Citadel is under attack. |
539 | -defeated_enemy_string=_The enemy defeated your soldiers at the Citadel |
540 | -defeated_you_string=_Your soldiers defeated the enemy at the Citadel |
541 | +occupied_string=_Your soldiers have occupied your citadel. |
542 | +aggressor_string=_Your citadel discovered an aggressor. |
543 | +attack_string=_Your citadel is under attack. |
544 | +defeated_enemy_string=_The enemy defeated your soldiers at the citadel. |
545 | +defeated_you_string=_Your soldiers defeated the enemy at the citadel. |
546 | |
547 | |
548 | [enhancement_cost] |
549 | |
550 | === modified file 'tribes/barbarians/donjon/conf' |
551 | --- tribes/barbarians/donjon/conf 2013-10-29 10:55:20 +0000 |
552 | +++ tribes/barbarians/donjon/conf 2014-03-16 06:41:40 +0000 |
553 | @@ -4,11 +4,11 @@ |
554 | conquers=8 |
555 | vision_range=17 |
556 | prefer_heroes=true |
557 | -occupied_string=_Your soldiers have occupied your Donjon |
558 | -aggressor_string=_Your Donjon discovered an aggressor. |
559 | -attack_string=_Your Donjon is under attack. |
560 | -defeated_enemy_string=_The enemy defeated your soldiers at the Donjon |
561 | -defeated_you_string=_Your soldiers defeated the enemy at the Donjon |
562 | +occupied_string=_Your soldiers have occupied your donjon. |
563 | +aggressor_string=_Your donjon discovered an aggressor. |
564 | +attack_string=_Your donjon is under attack. |
565 | +defeated_enemy_string=_The enemy defeated your soldiers at the donjon. |
566 | +defeated_you_string=_Your soldiers defeated the enemy at the donjon. |
567 | |
568 | |
569 | [buildcost] |
570 | |
571 | === modified file 'tribes/barbarians/fernery/help.lua' |
572 | --- tribes/barbarians/fernery/help.lua 2014-03-05 18:47:03 +0000 |
573 | +++ tribes/barbarians/fernery/help.lua 2014-03-16 06:41:40 +0000 |
574 | @@ -23,6 +23,8 @@ |
575 | rt(h3(_"Outgoing:")) .. |
576 | dependencies({"tribes/barbarians/fernery/menu.png","tribes/barbarians/thatchreed/menu.png"},p(_"Thatch Reed")) .. |
577 | dependencies({"tribes/barbarians/thatchreed/menu.png","tribes/barbarians/constructionsite/menu.png"},p(_"Construction Site")) .. |
578 | + -- TRANSLATORS: This is a detail for the reed -> construction site flow |
579 | + -- TRANSLATORS: The weaving mill is mentioned separately |
580 | rt(p(_"The Reed Yard’s output will only go to construction sites that need it.")) .. |
581 | dependencies({"tribes/barbarians/thatchreed/menu.png","tribes/barbarians/weaving-mill/menu.png"},p(_"Weaving-Mill")) .. |
582 | --Building Section |
583 | |
584 | === modified file 'tribes/barbarians/fortress/conf' |
585 | --- tribes/barbarians/fortress/conf 2013-10-29 10:55:20 +0000 |
586 | +++ tribes/barbarians/fortress/conf 2014-03-16 06:41:40 +0000 |
587 | @@ -4,11 +4,11 @@ |
588 | conquers=11 |
589 | enhancement=citadel |
590 | prefer_heroes=true |
591 | -occupied_string=_Your soldiers have occupied your Fortress |
592 | -aggressor_string=_Your Fortress discovered an aggressor. |
593 | -attack_string=_Your Fortress is under attack. |
594 | -defeated_enemy_string=_The enemy defeated your soldiers at the Fortress |
595 | -defeated_you_string=_Your soldiers defeated the enemy at the Fortress |
596 | +occupied_string=_Your soldiers have occupied your fortress. |
597 | +aggressor_string=_Your fortress discovered an aggressor. |
598 | +attack_string=_Your fortress is under attack. |
599 | +defeated_enemy_string=_The enemy defeated your soldiers at the fortress. |
600 | +defeated_you_string=_Your soldiers defeated the enemy at the fortress. |
601 | |
602 | [buildcost] |
603 | blackwood=9 |
604 | |
605 | === modified file 'tribes/barbarians/ox/conf' |
606 | --- tribes/barbarians/ox/conf 2014-02-24 21:12:30 +0000 |
607 | +++ tribes/barbarians/ox/conf 2014-03-16 06:41:40 +0000 |
608 | @@ -1,4 +1,4 @@ |
609 | -help=_Helps with carrying items on heavily used roads. |
610 | +help=_Oxen help to carry items along busy roads. They are reared in a cattle farm. |
611 | default_target_quantity=5 |
612 | ware_hotspot=-2 13 |
613 | |
614 | |
615 | === modified file 'tribes/barbarians/sentry/conf' |
616 | --- tribes/barbarians/sentry/conf 2013-10-29 10:55:20 +0000 |
617 | +++ tribes/barbarians/sentry/conf 2014-03-16 06:41:40 +0000 |
618 | @@ -3,11 +3,11 @@ |
619 | conquers=6 |
620 | max_soldiers=2 |
621 | prefer_heroes=false |
622 | -occupied_string=_Your soldiers have occupied your Sentry |
623 | -aggressor_string=_Your Sentry discovered an aggressor. |
624 | -attack_string=_Your Sentry is under attack. |
625 | -defeated_enemy_string=_The enemy defeated your soldiers at the Sentry |
626 | -defeated_you_string=_Your soldiers defeated the enemy at the Sentry |
627 | +occupied_string=_Your soldiers have occupied your sentry. |
628 | +aggressor_string=_Your sentry discovered an aggressor. |
629 | +attack_string=_Your sentry is under attack. |
630 | +defeated_enemy_string=_The enemy defeated your soldiers at the sentry. |
631 | +defeated_you_string=_Your soldiers defeated the enemy at the sentry. |
632 | |
633 | [buildcost] |
634 | blackwood=2 |
635 | |
636 | === modified file 'tribes/empire/barracks/conf' |
637 | --- tribes/empire/barracks/conf 2013-10-29 10:55:20 +0000 |
638 | +++ tribes/empire/barracks/conf 2014-03-16 06:41:40 +0000 |
639 | @@ -4,11 +4,11 @@ |
640 | max_soldiers=1 |
641 | enhancement=sentry |
642 | prefer_heroes=false |
643 | -occupied_string=_Your soldiers have occupied your Barracks |
644 | -aggressor_string=_Your Barracks discovered an aggressor. |
645 | -attack_string=_Your Barracks is under attack. |
646 | -defeated_enemy_string=_The enemy defeated your soldiers at the Barracks |
647 | -defeated_you_string=_Your soldiers defeated the enemy at the Barracks |
648 | +occupied_string=_Your soldiers have occupied your barracks. |
649 | +aggressor_string=_Your barracks discovered an aggressor. |
650 | +attack_string=_Your barracks is under attack. |
651 | +defeated_enemy_string=_The enemy defeated your soldiers at the barracks. |
652 | +defeated_you_string=_Your soldiers defeated the enemy at the barracks. |
653 | |
654 | |
655 | [buildcost] |
656 | |
657 | === modified file 'tribes/empire/barrier/conf' |
658 | --- tribes/empire/barrier/conf 2013-10-29 10:55:20 +0000 |
659 | +++ tribes/empire/barrier/conf 2014-03-16 06:41:40 +0000 |
660 | @@ -4,11 +4,11 @@ |
661 | conquers=8 |
662 | enhanced_building=yes |
663 | prefer_heroes=true |
664 | -occupied_string=_Your soldiers have occupied your Barrier |
665 | -aggressor_string=_Your Barrier discovered an aggressor. |
666 | -attack_string=_Your Barrier is under attack. |
667 | -defeated_enemy_string=_The enemy defeated your soldiers at the Barrier |
668 | -defeated_you_string=_Your soldiers defeated the enemy at the Barrier |
669 | +occupied_string=_Your soldiers have occupied your barrier. |
670 | +aggressor_string=_Your barrier discovered an aggressor. |
671 | +attack_string=_Your barrier is under attack. |
672 | +defeated_enemy_string=_The enemy defeated your soldiers at the barrier. |
673 | +defeated_you_string=_Your soldiers defeated the enemy at the barrier. |
674 | |
675 | |
676 | [buildcost] |
677 | |
678 | === modified file 'tribes/empire/castle/conf' |
679 | --- tribes/empire/castle/conf 2013-10-29 10:55:20 +0000 |
680 | +++ tribes/empire/castle/conf 2014-03-16 06:41:40 +0000 |
681 | @@ -5,11 +5,11 @@ |
682 | conquers=12 |
683 | enhanced_building=yes |
684 | prefer_heroes=true |
685 | -occupied_string=_Your soldiers have occupied your Castle |
686 | -aggressor_string=_Your Castle discovered an aggressor. |
687 | -attack_string=_Your Castle is under attack. |
688 | -defeated_enemy_string=_The enemy defeated your soldiers at the Castle |
689 | -defeated_you_string=_Your soldiers defeated the enemy at the Castle |
690 | +occupied_string=_Your soldiers have occupied your castle. |
691 | +aggressor_string=_Your castle discovered an aggressor. |
692 | +attack_string=_Your castle is under attack. |
693 | +defeated_enemy_string=_The enemy defeated your soldiers at the castle. |
694 | +defeated_you_string=_Your soldiers defeated the enemy at the castle. |
695 | |
696 | |
697 | [enhancement_cost] |
698 | |
699 | === modified file 'tribes/empire/donkey/conf' |
700 | --- tribes/empire/donkey/conf 2014-02-24 21:12:30 +0000 |
701 | +++ tribes/empire/donkey/conf 2014-03-16 06:41:40 +0000 |
702 | @@ -1,4 +1,4 @@ |
703 | -help=_Helps to carry items along busy roads. |
704 | +help=_Donkeys help to carry items along busy roads. They are reared in a donkey farm. |
705 | default_target_quantity=5 |
706 | ware_hotspot=-2 8 |
707 | |
708 | |
709 | === modified file 'tribes/empire/fortress/conf' |
710 | --- tribes/empire/fortress/conf 2013-10-29 10:55:20 +0000 |
711 | +++ tribes/empire/fortress/conf 2014-03-16 06:41:40 +0000 |
712 | @@ -4,11 +4,11 @@ |
713 | conquers=11 |
714 | enhancement=castle |
715 | prefer_heroes=true |
716 | -occupied_string=_Your soldiers have occupied your Fortress |
717 | -aggressor_string=_Your Fortress discovered an aggressor. |
718 | -attack_string=_Your Fortress is under attack. |
719 | -defeated_enemy_string=_The enemy defeated your soldiers at the Fortress |
720 | -defeated_you_string=_Your soldiers defeated the enemy at the Fortress |
721 | +occupied_string=_Your soldiers have occupied your fortress. |
722 | +aggressor_string=_Your fortress discovered an aggressor. |
723 | +attack_string=_Your fortress is under attack. |
724 | +defeated_enemy_string=_The enemy defeated your soldiers at the fortress. |
725 | +defeated_you_string=_Your soldiers defeated the enemy at the fortress. |
726 | |
727 | |
728 | [buildcost] |
729 | |
730 | === modified file 'tribes/empire/outpost/conf' |
731 | --- tribes/empire/outpost/conf 2013-10-29 10:55:20 +0000 |
732 | +++ tribes/empire/outpost/conf 2014-03-16 06:41:40 +0000 |
733 | @@ -4,11 +4,11 @@ |
734 | conquers=7 |
735 | enhancement=barrier |
736 | prefer_heroes=false |
737 | -occupied_string=_Your soldiers have occupied your Outpost |
738 | -aggressor_string=_Your Outpost discovered an aggressor. |
739 | -attack_string=_Your Outpost is under attack. |
740 | -defeated_enemy_string=_The enemy defeated your soldiers at the Outpost |
741 | -defeated_you_string=_Your soldiers defeated the enemy at the Outpost |
742 | +occupied_string=_Your soldiers have occupied your outpost. |
743 | +aggressor_string=_Your outpost discovered an aggressor. |
744 | +attack_string=_Your outpost is under attack. |
745 | +defeated_enemy_string=_The enemy defeated your soldiers at the outpost. |
746 | +defeated_you_string=_Your soldiers defeated the enemy at the outpost. |
747 | |
748 | |
749 | [buildcost] |
750 | |
751 | === modified file 'tribes/empire/sentry/conf' |
752 | --- tribes/empire/sentry/conf 2013-10-29 10:55:20 +0000 |
753 | +++ tribes/empire/sentry/conf 2014-03-16 06:41:40 +0000 |
754 | @@ -4,11 +4,11 @@ |
755 | max_soldiers=2 |
756 | enhanced_building=yes |
757 | prefer_heroes=false |
758 | -occupied_string=_Your soldiers have occupied your Sentry |
759 | -aggressor_string=_Your Sentry discovered an aggressor. |
760 | -attack_string=_Your Sentry is under attack. |
761 | -defeated_enemy_string=_The enemy defeated your soldiers at the Sentry |
762 | -defeated_you_string=_Your soldiers defeated the enemy at the Sentry |
763 | +occupied_string=_Your soldiers have occupied your sentry. |
764 | +aggressor_string=_Your sentry discovered an aggressor. |
765 | +attack_string=_Your sentry is under attack. |
766 | +defeated_enemy_string=_The enemy defeated your soldiers at the sentry. |
767 | +defeated_you_string=_Your soldiers defeated the enemy at the sentry. |
768 | |
769 | |
770 | [buildcost] |
771 | |
772 | === modified file 'tribes/empire/tower/conf' |
773 | --- tribes/empire/tower/conf 2013-10-29 10:55:20 +0000 |
774 | +++ tribes/empire/tower/conf 2014-03-16 06:41:40 +0000 |
775 | @@ -4,11 +4,11 @@ |
776 | conquers=9 |
777 | vision_range=19 |
778 | prefer_heroes=true |
779 | -occupied_string=_Your soldiers have occupied your Tower |
780 | -aggressor_string=_Your Tower discovered an aggressor. |
781 | -attack_string=_Your Tower is under attack. |
782 | -defeated_enemy_string=_The enemy defeated your soldiers at the Tower |
783 | -defeated_you_string=_Your soldiers defeated the enemy at the Tower |
784 | +occupied_string=_Your soldiers have occupied your tower. |
785 | +aggressor_string=_Your tower discovered an aggressor. |
786 | +attack_string=_Your tower is under attack. |
787 | +defeated_enemy_string=_The enemy defeated your soldiers at the tower. |
788 | +defeated_you_string=_Your soldiers defeated the enemy at the tower. |
789 | |
790 | |
791 | [buildcost] |