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 | 167 | saledus_2 = { | 167 | saledus_2 = { |
6 | 168 | title =_ "Marble on the Mountain", | 168 | title =_ "Marble on the Mountain", |
7 | 169 | body= saledus(_"Saledus smiles", | 169 | body= saledus(_"Saledus smiles", |
12 | 170 | _([[Lutius, I’ve got good news for you: ]] .. | 170 | _([[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>" .. |
9 | 171 | [[As I walked to the east, I found a larger mountain.]] .. | ||
10 | 172 | [[I am not absolutely sure – a geologist should check if I am right]] .. | ||
11 | 173 | [[ – but I believe we could mine marble from some places on the mountain.]]) .. "<br><br>" .. | ||
13 | 174 | _([[It would be a good source for bolstering our supply of quality marble, ]] .. | 171 | _([[It would be a good source for bolstering our supply of quality marble, ]] .. |
14 | 175 | [[beyond the meager quantities available from the quarry. ]] .. | 172 | [[beyond the meager quantities available from the quarry. ]] .. |
15 | 176 | [[Perhaps you were right when you said that this island was like paradise.]]) .. "<br><br>" .. | 173 | [[Perhaps you were right when you said that this island was like paradise.]]) .. "<br><br>" .. |
16 | 177 | 174 | ||
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 | 5 | buildable=no | 5 | buildable=no |
22 | 6 | prefer_heroes=false | 6 | prefer_heroes=false |
23 | 7 | occupied_string= | 7 | occupied_string= |
28 | 8 | aggressor_string=_Your Barracks discovered an aggressor. | 8 | aggressor_string=_Your barracks discovered an aggressor. |
29 | 9 | attack_string=_Your Barracks is under attack. | 9 | attack_string=_Your barracks is under attack. |
30 | 10 | defeated_enemy_string=_The enemy defeated your soldiers at the Barracks | 10 | defeated_enemy_string=_The enemy defeated your soldiers at the barracks. |
31 | 11 | defeated_you_string=_Your soldiers defeated the enemy at the Barracks | 11 | defeated_you_string=_Your soldiers defeated the enemy at the barracks. |
32 | 12 | 12 | ||
33 | 13 | 13 | ||
34 | 14 | [idle] | 14 | [idle] |
35 | 15 | 15 | ||
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 | 5 | buildable=no | 5 | buildable=no |
41 | 6 | prefer_heroes=true | 6 | prefer_heroes=true |
42 | 7 | occupied_string= | 7 | occupied_string= |
47 | 8 | aggressor_string=_Your Barrier discovered an aggressor. | 8 | aggressor_string=_Your barrier discovered an aggressor. |
48 | 9 | attack_string=_Your Barrier is under attack. | 9 | attack_string=_Your barrier is under attack. |
49 | 10 | defeated_enemy_string=_The enemy defeated your soldiers at the Barrier | 10 | defeated_enemy_string=_The enemy defeated your soldiers at the barrier. |
50 | 11 | defeated_you_string=_Your soldiers defeated the enemy at the Barrier | 11 | defeated_you_string=_Your soldiers defeated the enemy at the barrier. |
51 | 12 | 12 | ||
52 | 13 | 13 | ||
53 | 14 | [idle] | 14 | [idle] |
54 | 15 | 15 | ||
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 | 5 | buildable=no | 5 | buildable=no |
60 | 6 | prefer_heroes=true | 6 | prefer_heroes=true |
61 | 7 | occupied_string= | 7 | occupied_string= |
66 | 8 | aggressor_string=_Your Barrier discovered an aggressor. | 8 | aggressor_string=_Your barrier discovered an aggressor. |
67 | 9 | attack_string=_Your Barrier is under attack. | 9 | attack_string=_Your barrier is under attack. |
68 | 10 | defeated_enemy_string=_The enemy defeated your soldiers at the Barrier | 10 | defeated_enemy_string=_The enemy defeated your soldiers at the barrier. |
69 | 11 | defeated_you_string=_Your soldiers defeated the enemy at the Barrier | 11 | defeated_you_string=_Your soldiers defeated the enemy at the barrier. |
70 | 12 | 12 | ||
71 | 13 | 13 | ||
72 | 14 | [idle] | 14 | [idle] |
73 | 15 | 15 | ||
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 | 5 | buildable=no | 5 | buildable=no |
79 | 6 | prefer_heroes=true | 6 | prefer_heroes=true |
80 | 7 | occupied_string= | 7 | occupied_string= |
85 | 8 | aggressor_string=_Your Castle discovered an aggressor. | 8 | aggressor_string=_Your castle discovered an aggressor. |
86 | 9 | attack_string=_Your Castle is under attack. | 9 | attack_string=_Your castle is under attack. |
87 | 10 | defeated_enemy_string=_The enemy defeated your soldiers at the Castle | 10 | defeated_enemy_string=_The enemy defeated your soldiers at the castle. |
88 | 11 | defeated_you_string=_Your soldiers defeated the enemy at the Castle | 11 | defeated_you_string=_Your soldiers defeated the enemy at the castle. |
89 | 12 | 12 | ||
90 | 13 | 13 | ||
91 | 14 | [idle] | 14 | [idle] |
92 | 15 | 15 | ||
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 | 5 | buildable=no | 5 | buildable=no |
98 | 6 | prefer_heroes=true | 6 | prefer_heroes=true |
99 | 7 | occupied_string= | 7 | occupied_string= |
104 | 8 | aggressor_string=_Your Castle discovered an aggressor. | 8 | aggressor_string=_Your castle discovered an aggressor. |
105 | 9 | attack_string=_Your Castle is under attack. | 9 | attack_string=_Your castle is under attack. |
106 | 10 | defeated_enemy_string=_The enemy defeated your soldiers at the Castle | 10 | defeated_enemy_string=_The enemy defeated your soldiers at the castle. |
107 | 11 | defeated_you_string=_Your soldiers defeated the enemy at the Castle | 11 | defeated_you_string=_Your soldiers defeated the enemy at the castle. |
108 | 12 | 12 | ||
109 | 13 | 13 | ||
110 | 14 | [idle] | 14 | [idle] |
111 | 15 | 15 | ||
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 | 5 | buildable=no | 5 | buildable=no |
117 | 6 | prefer_heroes=true | 6 | prefer_heroes=true |
118 | 7 | occupied_string= | 7 | occupied_string= |
123 | 8 | aggressor_string=_Your Citadel discovered an aggressor. | 8 | aggressor_string=_Your citadel discovered an aggressor. |
124 | 9 | attack_string=_Your Citadel is under attack. | 9 | attack_string=_Your citadel is under attack. |
125 | 10 | defeated_enemy_string=_The enemy defeated your soldiers at the Citadel | 10 | defeated_enemy_string=_The enemy defeated your soldiers at the citadel. |
126 | 11 | defeated_you_string=_Your soldiers defeated the enemy at the Citadel | 11 | defeated_you_string=_Your soldiers defeated the enemy at the citadel. |
127 | 12 | 12 | ||
128 | 13 | 13 | ||
129 | 14 | [idle] | 14 | [idle] |
130 | 15 | 15 | ||
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 | 6 | buildable=no | 6 | buildable=no |
136 | 7 | prefer_heroes=true | 7 | prefer_heroes=true |
137 | 8 | occupied_string= | 8 | occupied_string= |
142 | 9 | aggressor_string=_Your Donjon discovered an aggressor. | 9 | aggressor_string=_Your donjon discovered an aggressor. |
143 | 10 | attack_string=_Your Donjon is under attack. | 10 | attack_string=_Your donjon is under attack. |
144 | 11 | defeated_enemy_string=_The enemy defeated your soldiers at the Donjon | 11 | defeated_enemy_string=_The enemy defeated your soldiers at the donjon. |
145 | 12 | defeated_you_string=_Your soldiers defeated the enemy at the Donjon | 12 | defeated_you_string=_Your soldiers defeated the enemy at the donjon. |
146 | 13 | 13 | ||
147 | 14 | 14 | ||
148 | 15 | [idle] | 15 | [idle] |
149 | 16 | 16 | ||
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 | 5 | buildable=no | 5 | buildable=no |
155 | 6 | prefer_heroes=true | 6 | prefer_heroes=true |
156 | 7 | occupied_string= | 7 | occupied_string= |
161 | 8 | aggressor_string=_Your Fortress discovered an aggressor. | 8 | aggressor_string=_Your fortress discovered an aggressor. |
162 | 9 | attack_string=_Your Fortress is under attack. | 9 | attack_string=_Your fortress is under attack. |
163 | 10 | defeated_enemy_string=_The enemy defeated your soldiers at the Fortress | 10 | defeated_enemy_string=_The enemy defeated your soldiers at the fortress. |
164 | 11 | defeated_you_string=_Your soldiers defeated the enemy at the Fortress | 11 | defeated_you_string=_Your soldiers defeated the enemy at the fortress. |
165 | 12 | 12 | ||
166 | 13 | 13 | ||
167 | 14 | [idle] | 14 | [idle] |
168 | 15 | 15 | ||
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 | 5 | buildable=no | 5 | buildable=no |
174 | 6 | prefer_heroes=true | 6 | prefer_heroes=true |
175 | 7 | occupied_string= | 7 | occupied_string= |
180 | 8 | aggressor_string=_Your Fortress discovered an aggressor. | 8 | aggressor_string=_Your fortress discovered an aggressor. |
181 | 9 | attack_string=_Your Fortress is under attack. | 9 | attack_string=_Your fortress is under attack. |
182 | 10 | defeated_enemy_string=_The enemy defeated your soldiers at the Fortress | 10 | defeated_enemy_string=_The enemy defeated your soldiers at the fortress. |
183 | 11 | defeated_you_string=_Your soldiers defeated the enemy at the Fortress | 11 | defeated_you_string=_Your soldiers defeated the enemy at the fortress. |
184 | 12 | 12 | ||
185 | 13 | 13 | ||
186 | 14 | [idle] | 14 | [idle] |
187 | 15 | 15 | ||
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 | 5 | buildable=no | 5 | buildable=no |
193 | 6 | prefer_heroes=true | 6 | prefer_heroes=true |
194 | 7 | occupied_string= | 7 | occupied_string= |
199 | 8 | aggressor_string=_Your Guardhall discovered an aggressor. | 8 | aggressor_string=_Your guardhall discovered an aggressor. |
200 | 9 | attack_string=_Your Guardhall is under attack. | 9 | attack_string=_Your guardhall is under attack. |
201 | 10 | defeated_enemy_string=_The enemy defeated your soldiers at the Guardhall | 10 | defeated_enemy_string=_The enemy defeated your soldiers at the guardhall. |
202 | 11 | defeated_you_string=_Your soldiers defeated the enemy at the Guardhall | 11 | defeated_you_string=_Your soldiers defeated the enemy at the guardhall. |
203 | 12 | 12 | ||
204 | 13 | 13 | ||
205 | 14 | [idle] | 14 | [idle] |
206 | 15 | 15 | ||
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 | 5 | buildable=no | 5 | buildable=no |
212 | 6 | prefer_heroes=false | 6 | prefer_heroes=false |
213 | 7 | occupied_string= | 7 | occupied_string= |
218 | 8 | aggressor_string=_Your Guardhouse discovered an aggressor. | 8 | aggressor_string=_Your guardhouse discovered an aggressor. |
219 | 9 | attack_string=_Your Guardhouse is under attack. | 9 | attack_string=_Your guardhouse is under attack. |
220 | 10 | defeated_enemy_string=_The enemy defeated your soldiers at the Guardhouse | 10 | defeated_enemy_string=_The enemy defeated your soldiers at the guardhouse. |
221 | 11 | defeated_you_string=_Your soldiers defeated the enemy at the Guardhouse | 11 | defeated_you_string=_Your soldiers defeated the enemy at the guardhouse. |
222 | 12 | 12 | ||
223 | 13 | 13 | ||
224 | 14 | [idle] | 14 | [idle] |
225 | 15 | 15 | ||
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 | 6 | buildable=no | 6 | buildable=no |
231 | 7 | prefer_heroes=true | 7 | prefer_heroes=true |
232 | 8 | occupied_string= | 8 | occupied_string= |
237 | 9 | aggressor_string=_Your High Tower discovered an aggressor. | 9 | aggressor_string=_Your high tower discovered an aggressor. |
238 | 10 | attack_string=_Your High Tower is under attack. | 10 | attack_string=_Your high tower is under attack. |
239 | 11 | defeated_enemy_string=_The enemy defeated your soldiers at the High Tower | 11 | defeated_enemy_string=_The enemy defeated your soldiers at the high tower. |
240 | 12 | defeated_you_string=_Your soldiers defeated the enemy at the High Tower | 12 | defeated_you_string=_Your soldiers defeated the enemy at the high tower. |
241 | 13 | 13 | ||
242 | 14 | 14 | ||
243 | 15 | [idle] | 15 | [idle] |
244 | 16 | 16 | ||
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 | 5 | buildable=no | 5 | buildable=no |
250 | 6 | prefer_heroes=false | 6 | prefer_heroes=false |
251 | 7 | occupied_string= | 7 | occupied_string= |
256 | 8 | aggressor_string=_Your Outpost discovered an aggressor. | 8 | aggressor_string=_Your outpost discovered an aggressor. |
257 | 9 | attack_string=_Your Outpost is under attack. | 9 | attack_string=_Your outpost is under attack. |
258 | 10 | defeated_enemy_string=_The enemy defeated your soldiers at the Outpost | 10 | defeated_enemy_string=_The enemy defeated your soldiers at the outpost. |
259 | 11 | defeated_you_string=_Your soldiers defeated the enemy at the Outpost | 11 | defeated_you_string=_Your soldiers defeated the enemy at the outpost. |
260 | 12 | 12 | ||
261 | 13 | 13 | ||
262 | 14 | [idle] | 14 | [idle] |
263 | 15 | 15 | ||
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 | 5 | buildable=no | 5 | buildable=no |
269 | 6 | prefer_heroes=false | 6 | prefer_heroes=false |
270 | 7 | occupied_string= | 7 | occupied_string= |
275 | 8 | aggressor_string=_Your Sentry discovered an aggressor. | 8 | aggressor_string=_Your sentry discovered an aggressor. |
276 | 9 | attack_string=_Your Sentry is under attack. | 9 | attack_string=_Your sentry is under attack. |
277 | 10 | defeated_enemy_string=_The enemy defeated your soldiers at the Sentry | 10 | defeated_enemy_string=_The enemy defeated your soldiers at the sentry. |
278 | 11 | defeated_you_string=_Your soldiers defeated the enemy at the Sentry | 11 | defeated_you_string=_Your soldiers defeated the enemy at the sentry. |
279 | 12 | 12 | ||
280 | 13 | 13 | ||
281 | 14 | [idle] | 14 | [idle] |
282 | 15 | 15 | ||
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 | 5 | buildable=no | 5 | buildable=no |
288 | 6 | prefer_heroes=false | 6 | prefer_heroes=false |
289 | 7 | occupied_string= | 7 | occupied_string= |
294 | 8 | aggressor_string=_Your Sentry discovered an aggressor. | 8 | aggressor_string=_Your sentry discovered an aggressor. |
295 | 9 | attack_string=_Your Sentry is under attack. | 9 | attack_string=_Your sentry is under attack. |
296 | 10 | defeated_enemy_string=_The enemy defeated your soldiers at the Sentry | 10 | defeated_enemy_string=_The enemy defeated your soldiers at the sentry. |
297 | 11 | defeated_you_string=_Your soldiers defeated the enemy at the Sentry | 11 | defeated_you_string=_Your soldiers defeated the enemy at the sentry. |
298 | 12 | 12 | ||
299 | 13 | 13 | ||
300 | 14 | [idle] | 14 | [idle] |
301 | 15 | 15 | ||
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 | 6 | buildable=no | 6 | buildable=no |
307 | 7 | prefer_heroes=false | 7 | prefer_heroes=false |
308 | 8 | occupied_string= | 8 | occupied_string= |
313 | 9 | aggressor_string=_Your Small Tower discovered an aggressor. | 9 | aggressor_string=_Your small tower discovered an aggressor. |
314 | 10 | attack_string=_Your Small Tower is under attack. | 10 | attack_string=_Your small tower is under attack. |
315 | 11 | defeated_enemy_string=_The enemy defeated your soldiers at the Small Tower | 11 | defeated_enemy_string=_The enemy defeated your soldiers at the small tower. |
316 | 12 | defeated_you_string=_Your soldiers defeated the enemy at the Small Tower | 12 | defeated_you_string=_Your soldiers defeated the enemy at the small tower. |
317 | 13 | 13 | ||
318 | 14 | 14 | ||
319 | 15 | [idle] | 15 | [idle] |
320 | 16 | 16 | ||
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 | 6 | buildable=no | 6 | buildable=no |
326 | 7 | prefer_heroes=true | 7 | prefer_heroes=true |
327 | 8 | occupied_string= | 8 | occupied_string= |
332 | 9 | aggressor_string=_Your Tower discovered an aggressor. | 9 | aggressor_string=_Your tower discovered an aggressor. |
333 | 10 | attack_string=_Your Tower is under attack. | 10 | attack_string=_Your tower is under attack. |
334 | 11 | defeated_enemy_string=_The enemy defeated your soldiers at the Tower | 11 | defeated_enemy_string=_The enemy defeated your soldiers at the tower. |
335 | 12 | defeated_you_string=_Your soldiers defeated the enemy at the Tower | 12 | defeated_you_string=_Your soldiers defeated the enemy at the tower. |
336 | 13 | 13 | ||
337 | 14 | 14 | ||
338 | 15 | [idle] | 15 | [idle] |
339 | 16 | 16 | ||
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 | 6 | buildable=no | 6 | buildable=no |
345 | 7 | prefer_heroes=true | 7 | prefer_heroes=true |
346 | 8 | occupied_string= | 8 | occupied_string= |
351 | 9 | aggressor_string=_Your Tower discovered an aggressor. | 9 | aggressor_string=_Your tower discovered an aggressor. |
352 | 10 | attack_string=_Your Tower is under attack. | 10 | attack_string=_Your tower is under attack. |
353 | 11 | defeated_enemy_string=_The enemy defeated your soldiers at the Tower | 11 | defeated_enemy_string=_The enemy defeated your soldiers at the tower. |
354 | 12 | defeated_you_string=_Your soldiers defeated the enemy at the Tower | 12 | defeated_you_string=_Your soldiers defeated the enemy at the tower. |
355 | 13 | 13 | ||
356 | 14 | 14 | ||
357 | 15 | [idle] | 15 | [idle] |
358 | 16 | 16 | ||
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 | 22 | #include <cstdio> | 22 | #include <cstdio> |
364 | 23 | #include <iostream> | 23 | #include <iostream> |
365 | 24 | 24 | ||
366 | 25 | #include <libintl.h> | ||
367 | 26 | |||
368 | 27 | #include "constants.h" | 25 | #include "constants.h" |
369 | 28 | #include "graphic/graphic.h" | 26 | #include "graphic/graphic.h" |
370 | 29 | #include "i18n.h" | 27 | #include "i18n.h" |
371 | 30 | 28 | ||
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 | 3 | heal_per_second=200 | 3 | heal_per_second=200 |
377 | 4 | conquers=12 | 4 | conquers=12 |
378 | 5 | prefer_heroes=true | 5 | prefer_heroes=true |
384 | 6 | occupied_string=_Your soldiers have occupied your Castle | 6 | occupied_string=_Your soldiers have occupied your castle. |
385 | 7 | aggressor_string=_Your Castle discovered an aggressor. | 7 | aggressor_string=_Your castle discovered an aggressor. |
386 | 8 | attack_string=_Your Castle is under attack. | 8 | attack_string=_Your castle is under attack. |
387 | 9 | defeated_enemy_string=_The enemy defeated your soldiers at the Castle | 9 | defeated_enemy_string=_The enemy defeated your soldiers at the castle. |
388 | 10 | defeated_you_string=_Your soldiers defeated the enemy at the Castle | 10 | defeated_you_string=_Your soldiers defeated the enemy at the castle. |
389 | 11 | 11 | ||
390 | 12 | [buildcost] | 12 | [buildcost] |
391 | 13 | planks=4 | 13 | planks=4 |
392 | 14 | 14 | ||
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 | 3 | heal_per_second=140 | 3 | heal_per_second=140 |
398 | 4 | conquers=7 | 4 | conquers=7 |
399 | 5 | prefer_heroes=true | 5 | prefer_heroes=true |
405 | 6 | occupied_string=_Your soldiers have occupied your Guardhall | 6 | occupied_string=_Your soldiers have occupied your guardhall. |
406 | 7 | aggressor_string=_Your Guardhall discovered an aggressor. | 7 | aggressor_string=_Your guardhall discovered an aggressor. |
407 | 8 | attack_string=_Your Guardhall is under attack. | 8 | attack_string=_Your guardhall is under attack. |
408 | 9 | defeated_enemy_string=_The enemy defeated your soldiers at the Guardhall | 9 | defeated_enemy_string=_The enemy defeated your soldiers at the guardhall. |
409 | 10 | defeated_you_string=_Your soldiers defeated the enemy at the Guardhall | 10 | defeated_you_string=_Your soldiers defeated the enemy at the guardhall. |
410 | 11 | 11 | ||
411 | 12 | [buildcost] | 12 | [buildcost] |
412 | 13 | trunk=2 | 13 | trunk=2 |
413 | 14 | 14 | ||
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 | 3 | conquers=6 | 3 | conquers=6 |
419 | 4 | max_soldiers=2 | 4 | max_soldiers=2 |
420 | 5 | prefer_heroes=false | 5 | prefer_heroes=false |
426 | 6 | occupied_string=_Your soldiers have occupied your Guardhouse | 6 | occupied_string=_Your soldiers have occupied your guardhouse. |
427 | 7 | aggressor_string=_Your Guardhouse discovered an aggressor. | 7 | aggressor_string=_Your guardhouse discovered an aggressor. |
428 | 8 | attack_string=_Your Guardhouse is under attack. | 8 | attack_string=_Your guardhouse is under attack. |
429 | 9 | defeated_enemy_string=_The enemy defeated your soldiers at the Guardhouse | 9 | defeated_enemy_string=_The enemy defeated your soldiers at the guardhouse. |
430 | 10 | defeated_you_string=_Your soldiers defeated the enemy at the Guardhouse | 10 | defeated_you_string=_Your soldiers defeated the enemy at the guardhouse. |
431 | 11 | 11 | ||
432 | 12 | [buildcost] | 12 | [buildcost] |
433 | 13 | trunk=1 | 13 | trunk=1 |
434 | 14 | 14 | ||
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 | 6 | vision_range=21 | 6 | vision_range=21 |
440 | 7 | enhanced_building=yes | 7 | enhanced_building=yes |
441 | 8 | prefer_heroes=true | 8 | prefer_heroes=true |
447 | 9 | occupied_string=_Your soldiers have occupied your High Tower | 9 | occupied_string=_Your soldiers have occupied your high tower. |
448 | 10 | aggressor_string=_Your High Tower discovered an aggressor. | 10 | aggressor_string=_Your high tower discovered an aggressor. |
449 | 11 | attack_string=_Your High Tower is under attack. | 11 | attack_string=_Your high tower is under attack. |
450 | 12 | defeated_enemy_string=_The enemy defeated your soldiers at the High Tower | 12 | defeated_enemy_string=_The enemy defeated your soldiers at the high tower. |
451 | 13 | defeated_you_string=_Your soldiers defeated the enemy at the High Tower | 13 | defeated_you_string=_Your soldiers defeated the enemy at the high tower. |
452 | 14 | 14 | ||
453 | 15 | [enhancement_cost] | 15 | [enhancement_cost] |
454 | 16 | trunk=1 | 16 | trunk=1 |
455 | 17 | 17 | ||
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 @@ | |||
461 | 1 | help=_Horses help to carry items at heavily used roads. They are reared in a horse farm. | 1 | help=_Horses help to carry items along busy roads. They are reared in a horse farm. |
462 | 2 | default_target_quantity=5 | 2 | default_target_quantity=5 |
463 | 3 | ware_hotspot=-2 12 | 3 | ware_hotspot=-2 12 |
464 | 4 | 4 | ||
465 | 5 | 5 | ||
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 | 4 | vision_range=13 | 4 | vision_range=13 |
471 | 5 | max_soldiers=3 | 5 | max_soldiers=3 |
472 | 6 | prefer_heroes=true | 6 | prefer_heroes=true |
478 | 7 | occupied_string=_Your soldiers have occupied your Small Tower | 7 | occupied_string=_Your soldiers have occupied your small tower. |
479 | 8 | aggressor_string=_Your Small Tower discovered an aggressor. | 8 | aggressor_string=_Your small tower discovered an aggressor. |
480 | 9 | attack_string=_Your Small Tower is under attack. | 9 | attack_string=_Your small tower is under attack. |
481 | 10 | defeated_enemy_string=_The enemy defeated your soldiers at the Small Tower | 10 | defeated_enemy_string=_The enemy defeated your soldiers at the small tower. |
482 | 11 | defeated_you_string=_Your soldiers defeated the enemy at the Small Tower | 11 | defeated_you_string=_Your soldiers defeated the enemy at the small tower. |
483 | 12 | 12 | ||
484 | 13 | [buildcost] | 13 | [buildcost] |
485 | 14 | trunk=1 | 14 | trunk=1 |
486 | 15 | 15 | ||
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 | 5 | vision_range=17 | 5 | vision_range=17 |
492 | 6 | enhancement=high_tower | 6 | enhancement=high_tower |
493 | 7 | prefer_heroes=false | 7 | prefer_heroes=false |
499 | 8 | occupied_string=_Your soldiers have occupied your Tower | 8 | occupied_string=_Your soldiers have occupied your tower. |
500 | 9 | aggressor_string=_Your Tower discovered an aggressor. | 9 | aggressor_string=_Your tower discovered an aggressor. |
501 | 10 | attack_string=_Your Tower is under attack. | 10 | attack_string=_Your tower is under attack. |
502 | 11 | defeated_enemy_string=_The enemy defeated your soldiers at the Tower | 11 | defeated_enemy_string=_The enemy defeated your soldiers at the tower. |
503 | 12 | defeated_you_string=_Your soldiers defeated the enemy at the Tower | 12 | defeated_you_string=_Your soldiers defeated the enemy at the tower. |
504 | 13 | 13 | ||
505 | 14 | [buildcost] | 14 | [buildcost] |
506 | 15 | trunk=2 | 15 | trunk=2 |
507 | 16 | 16 | ||
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 | 3 | heal_per_second=130 | 3 | heal_per_second=130 |
513 | 4 | conquers=8 | 4 | conquers=8 |
514 | 5 | prefer_heroes=true | 5 | prefer_heroes=true |
520 | 6 | occupied_string=_Your soldiers have occupied your Barrier | 6 | occupied_string=_Your soldiers have occupied your barrier. |
521 | 7 | aggressor_string=_Your Barrier discovered an aggressor. | 7 | aggressor_string=_Your barrier discovered an aggressor. |
522 | 8 | attack_string=_Your Barrier is under attack. | 8 | attack_string=_Your barrier is under attack. |
523 | 9 | defeated_enemy_string=_The enemy defeated your soldiers at the Barrier | 9 | defeated_enemy_string=_The enemy defeated your soldiers at the barrier. |
524 | 10 | defeated_you_string=_Your soldiers defeated the enemy at the Barrier | 10 | defeated_you_string=_Your soldiers defeated the enemy at the barrier. |
525 | 11 | 11 | ||
526 | 12 | [buildcost] | 12 | [buildcost] |
527 | 13 | blackwood=5 | 13 | blackwood=5 |
528 | 14 | 14 | ||
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 | 5 | conquers=12 | 5 | conquers=12 |
534 | 6 | enhanced_building=yes | 6 | enhanced_building=yes |
535 | 7 | prefer_heroes=true | 7 | prefer_heroes=true |
541 | 8 | occupied_string=_Your soldiers have occupied your Citadel | 8 | occupied_string=_Your soldiers have occupied your citadel. |
542 | 9 | aggressor_string=_Your Citadel discovered an aggressor. | 9 | aggressor_string=_Your citadel discovered an aggressor. |
543 | 10 | attack_string=_Your Citadel is under attack. | 10 | attack_string=_Your citadel is under attack. |
544 | 11 | defeated_enemy_string=_The enemy defeated your soldiers at the Citadel | 11 | defeated_enemy_string=_The enemy defeated your soldiers at the citadel. |
545 | 12 | defeated_you_string=_Your soldiers defeated the enemy at the Citadel | 12 | defeated_you_string=_Your soldiers defeated the enemy at the citadel. |
546 | 13 | 13 | ||
547 | 14 | 14 | ||
548 | 15 | [enhancement_cost] | 15 | [enhancement_cost] |
549 | 16 | 16 | ||
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 | 4 | conquers=8 | 4 | conquers=8 |
555 | 5 | vision_range=17 | 5 | vision_range=17 |
556 | 6 | prefer_heroes=true | 6 | prefer_heroes=true |
562 | 7 | occupied_string=_Your soldiers have occupied your Donjon | 7 | occupied_string=_Your soldiers have occupied your donjon. |
563 | 8 | aggressor_string=_Your Donjon discovered an aggressor. | 8 | aggressor_string=_Your donjon discovered an aggressor. |
564 | 9 | attack_string=_Your Donjon is under attack. | 9 | attack_string=_Your donjon is under attack. |
565 | 10 | defeated_enemy_string=_The enemy defeated your soldiers at the Donjon | 10 | defeated_enemy_string=_The enemy defeated your soldiers at the donjon. |
566 | 11 | defeated_you_string=_Your soldiers defeated the enemy at the Donjon | 11 | defeated_you_string=_Your soldiers defeated the enemy at the donjon. |
567 | 12 | 12 | ||
568 | 13 | 13 | ||
569 | 14 | [buildcost] | 14 | [buildcost] |
570 | 15 | 15 | ||
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 | 23 | rt(h3(_"Outgoing:")) .. | 23 | rt(h3(_"Outgoing:")) .. |
576 | 24 | dependencies({"tribes/barbarians/fernery/menu.png","tribes/barbarians/thatchreed/menu.png"},p(_"Thatch Reed")) .. | 24 | dependencies({"tribes/barbarians/fernery/menu.png","tribes/barbarians/thatchreed/menu.png"},p(_"Thatch Reed")) .. |
577 | 25 | dependencies({"tribes/barbarians/thatchreed/menu.png","tribes/barbarians/constructionsite/menu.png"},p(_"Construction Site")) .. | 25 | dependencies({"tribes/barbarians/thatchreed/menu.png","tribes/barbarians/constructionsite/menu.png"},p(_"Construction Site")) .. |
578 | 26 | -- TRANSLATORS: This is a detail for the reed -> construction site flow | ||
579 | 27 | -- TRANSLATORS: The weaving mill is mentioned separately | ||
580 | 26 | rt(p(_"The Reed Yard’s output will only go to construction sites that need it.")) .. | 28 | rt(p(_"The Reed Yard’s output will only go to construction sites that need it.")) .. |
581 | 27 | dependencies({"tribes/barbarians/thatchreed/menu.png","tribes/barbarians/weaving-mill/menu.png"},p(_"Weaving-Mill")) .. | 29 | dependencies({"tribes/barbarians/thatchreed/menu.png","tribes/barbarians/weaving-mill/menu.png"},p(_"Weaving-Mill")) .. |
582 | 28 | --Building Section | 30 | --Building Section |
583 | 29 | 31 | ||
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 | 4 | conquers=11 | 4 | conquers=11 |
589 | 5 | enhancement=citadel | 5 | enhancement=citadel |
590 | 6 | prefer_heroes=true | 6 | prefer_heroes=true |
596 | 7 | occupied_string=_Your soldiers have occupied your Fortress | 7 | occupied_string=_Your soldiers have occupied your fortress. |
597 | 8 | aggressor_string=_Your Fortress discovered an aggressor. | 8 | aggressor_string=_Your fortress discovered an aggressor. |
598 | 9 | attack_string=_Your Fortress is under attack. | 9 | attack_string=_Your fortress is under attack. |
599 | 10 | defeated_enemy_string=_The enemy defeated your soldiers at the Fortress | 10 | defeated_enemy_string=_The enemy defeated your soldiers at the fortress. |
600 | 11 | defeated_you_string=_Your soldiers defeated the enemy at the Fortress | 11 | defeated_you_string=_Your soldiers defeated the enemy at the fortress. |
601 | 12 | 12 | ||
602 | 13 | [buildcost] | 13 | [buildcost] |
603 | 14 | blackwood=9 | 14 | blackwood=9 |
604 | 15 | 15 | ||
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 @@ | |||
610 | 1 | help=_Helps with carrying items on heavily used roads. | 1 | help=_Oxen help to carry items along busy roads. They are reared in a cattle farm. |
611 | 2 | default_target_quantity=5 | 2 | default_target_quantity=5 |
612 | 3 | ware_hotspot=-2 13 | 3 | ware_hotspot=-2 13 |
613 | 4 | 4 | ||
614 | 5 | 5 | ||
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 | 3 | conquers=6 | 3 | conquers=6 |
620 | 4 | max_soldiers=2 | 4 | max_soldiers=2 |
621 | 5 | prefer_heroes=false | 5 | prefer_heroes=false |
627 | 6 | occupied_string=_Your soldiers have occupied your Sentry | 6 | occupied_string=_Your soldiers have occupied your sentry. |
628 | 7 | aggressor_string=_Your Sentry discovered an aggressor. | 7 | aggressor_string=_Your sentry discovered an aggressor. |
629 | 8 | attack_string=_Your Sentry is under attack. | 8 | attack_string=_Your sentry is under attack. |
630 | 9 | defeated_enemy_string=_The enemy defeated your soldiers at the Sentry | 9 | defeated_enemy_string=_The enemy defeated your soldiers at the sentry. |
631 | 10 | defeated_you_string=_Your soldiers defeated the enemy at the Sentry | 10 | defeated_you_string=_Your soldiers defeated the enemy at the sentry. |
632 | 11 | 11 | ||
633 | 12 | [buildcost] | 12 | [buildcost] |
634 | 13 | blackwood=2 | 13 | blackwood=2 |
635 | 14 | 14 | ||
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 | 4 | max_soldiers=1 | 4 | max_soldiers=1 |
641 | 5 | enhancement=sentry | 5 | enhancement=sentry |
642 | 6 | prefer_heroes=false | 6 | prefer_heroes=false |
648 | 7 | occupied_string=_Your soldiers have occupied your Barracks | 7 | occupied_string=_Your soldiers have occupied your barracks. |
649 | 8 | aggressor_string=_Your Barracks discovered an aggressor. | 8 | aggressor_string=_Your barracks discovered an aggressor. |
650 | 9 | attack_string=_Your Barracks is under attack. | 9 | attack_string=_Your barracks is under attack. |
651 | 10 | defeated_enemy_string=_The enemy defeated your soldiers at the Barracks | 10 | defeated_enemy_string=_The enemy defeated your soldiers at the barracks. |
652 | 11 | defeated_you_string=_Your soldiers defeated the enemy at the Barracks | 11 | defeated_you_string=_Your soldiers defeated the enemy at the barracks. |
653 | 12 | 12 | ||
654 | 13 | 13 | ||
655 | 14 | [buildcost] | 14 | [buildcost] |
656 | 15 | 15 | ||
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 | 4 | conquers=8 | 4 | conquers=8 |
662 | 5 | enhanced_building=yes | 5 | enhanced_building=yes |
663 | 6 | prefer_heroes=true | 6 | prefer_heroes=true |
669 | 7 | occupied_string=_Your soldiers have occupied your Barrier | 7 | occupied_string=_Your soldiers have occupied your barrier. |
670 | 8 | aggressor_string=_Your Barrier discovered an aggressor. | 8 | aggressor_string=_Your barrier discovered an aggressor. |
671 | 9 | attack_string=_Your Barrier is under attack. | 9 | attack_string=_Your barrier is under attack. |
672 | 10 | defeated_enemy_string=_The enemy defeated your soldiers at the Barrier | 10 | defeated_enemy_string=_The enemy defeated your soldiers at the barrier. |
673 | 11 | defeated_you_string=_Your soldiers defeated the enemy at the Barrier | 11 | defeated_you_string=_Your soldiers defeated the enemy at the barrier. |
674 | 12 | 12 | ||
675 | 13 | 13 | ||
676 | 14 | [buildcost] | 14 | [buildcost] |
677 | 15 | 15 | ||
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 | 5 | conquers=12 | 5 | conquers=12 |
683 | 6 | enhanced_building=yes | 6 | enhanced_building=yes |
684 | 7 | prefer_heroes=true | 7 | prefer_heroes=true |
690 | 8 | occupied_string=_Your soldiers have occupied your Castle | 8 | occupied_string=_Your soldiers have occupied your castle. |
691 | 9 | aggressor_string=_Your Castle discovered an aggressor. | 9 | aggressor_string=_Your castle discovered an aggressor. |
692 | 10 | attack_string=_Your Castle is under attack. | 10 | attack_string=_Your castle is under attack. |
693 | 11 | defeated_enemy_string=_The enemy defeated your soldiers at the Castle | 11 | defeated_enemy_string=_The enemy defeated your soldiers at the castle. |
694 | 12 | defeated_you_string=_Your soldiers defeated the enemy at the Castle | 12 | defeated_you_string=_Your soldiers defeated the enemy at the castle. |
695 | 13 | 13 | ||
696 | 14 | 14 | ||
697 | 15 | [enhancement_cost] | 15 | [enhancement_cost] |
698 | 16 | 16 | ||
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 @@ | |||
704 | 1 | help=_Helps to carry items along busy roads. | 1 | help=_Donkeys help to carry items along busy roads. They are reared in a donkey farm. |
705 | 2 | default_target_quantity=5 | 2 | default_target_quantity=5 |
706 | 3 | ware_hotspot=-2 8 | 3 | ware_hotspot=-2 8 |
707 | 4 | 4 | ||
708 | 5 | 5 | ||
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 | 4 | conquers=11 | 4 | conquers=11 |
714 | 5 | enhancement=castle | 5 | enhancement=castle |
715 | 6 | prefer_heroes=true | 6 | prefer_heroes=true |
721 | 7 | occupied_string=_Your soldiers have occupied your Fortress | 7 | occupied_string=_Your soldiers have occupied your fortress. |
722 | 8 | aggressor_string=_Your Fortress discovered an aggressor. | 8 | aggressor_string=_Your fortress discovered an aggressor. |
723 | 9 | attack_string=_Your Fortress is under attack. | 9 | attack_string=_Your fortress is under attack. |
724 | 10 | defeated_enemy_string=_The enemy defeated your soldiers at the Fortress | 10 | defeated_enemy_string=_The enemy defeated your soldiers at the fortress. |
725 | 11 | defeated_you_string=_Your soldiers defeated the enemy at the Fortress | 11 | defeated_you_string=_Your soldiers defeated the enemy at the fortress. |
726 | 12 | 12 | ||
727 | 13 | 13 | ||
728 | 14 | [buildcost] | 14 | [buildcost] |
729 | 15 | 15 | ||
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 | 4 | conquers=7 | 4 | conquers=7 |
735 | 5 | enhancement=barrier | 5 | enhancement=barrier |
736 | 6 | prefer_heroes=false | 6 | prefer_heroes=false |
742 | 7 | occupied_string=_Your soldiers have occupied your Outpost | 7 | occupied_string=_Your soldiers have occupied your outpost. |
743 | 8 | aggressor_string=_Your Outpost discovered an aggressor. | 8 | aggressor_string=_Your outpost discovered an aggressor. |
744 | 9 | attack_string=_Your Outpost is under attack. | 9 | attack_string=_Your outpost is under attack. |
745 | 10 | defeated_enemy_string=_The enemy defeated your soldiers at the Outpost | 10 | defeated_enemy_string=_The enemy defeated your soldiers at the outpost. |
746 | 11 | defeated_you_string=_Your soldiers defeated the enemy at the Outpost | 11 | defeated_you_string=_Your soldiers defeated the enemy at the outpost. |
747 | 12 | 12 | ||
748 | 13 | 13 | ||
749 | 14 | [buildcost] | 14 | [buildcost] |
750 | 15 | 15 | ||
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 | 4 | max_soldiers=2 | 4 | max_soldiers=2 |
756 | 5 | enhanced_building=yes | 5 | enhanced_building=yes |
757 | 6 | prefer_heroes=false | 6 | prefer_heroes=false |
763 | 7 | occupied_string=_Your soldiers have occupied your Sentry | 7 | occupied_string=_Your soldiers have occupied your sentry. |
764 | 8 | aggressor_string=_Your Sentry discovered an aggressor. | 8 | aggressor_string=_Your sentry discovered an aggressor. |
765 | 9 | attack_string=_Your Sentry is under attack. | 9 | attack_string=_Your sentry is under attack. |
766 | 10 | defeated_enemy_string=_The enemy defeated your soldiers at the Sentry | 10 | defeated_enemy_string=_The enemy defeated your soldiers at the sentry. |
767 | 11 | defeated_you_string=_Your soldiers defeated the enemy at the Sentry | 11 | defeated_you_string=_Your soldiers defeated the enemy at the sentry. |
768 | 12 | 12 | ||
769 | 13 | 13 | ||
770 | 14 | [buildcost] | 14 | [buildcost] |
771 | 15 | 15 | ||
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 | 4 | conquers=9 | 4 | conquers=9 |
777 | 5 | vision_range=19 | 5 | vision_range=19 |
778 | 6 | prefer_heroes=true | 6 | prefer_heroes=true |
784 | 7 | occupied_string=_Your soldiers have occupied your Tower | 7 | occupied_string=_Your soldiers have occupied your tower. |
785 | 8 | aggressor_string=_Your Tower discovered an aggressor. | 8 | aggressor_string=_Your tower discovered an aggressor. |
786 | 9 | attack_string=_Your Tower is under attack. | 9 | attack_string=_Your tower is under attack. |
787 | 10 | defeated_enemy_string=_The enemy defeated your soldiers at the Tower | 10 | defeated_enemy_string=_The enemy defeated your soldiers at the tower. |
788 | 11 | defeated_you_string=_Your soldiers defeated the enemy at the Tower | 11 | defeated_you_string=_Your soldiers defeated the enemy at the tower. |
789 | 12 | 12 | ||
790 | 13 | 13 | ||
791 | 14 | [buildcost] | 14 | [buildcost] |