Merge lp:~widelands-dev/widelands/i18n-20140314 into lp:widelands

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
Reviewer Review Type Date Requested Status
Widelands Developers Pending
Review via email: mp+211191@code.launchpad.net

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
=== modified file 'campaigns/emp02.wmf/scripting/texts.lua'
--- campaigns/emp02.wmf/scripting/texts.lua 2014-03-12 09:14:19 +0000
+++ campaigns/emp02.wmf/scripting/texts.lua 2014-03-16 06:41:40 +0000
@@ -167,10 +167,7 @@
167saledus_2 = {167saledus_2 = {
168 title =_ "Marble on the Mountain",168 title =_ "Marble on the Mountain",
169 body= saledus(_"Saledus smiles",169 body= saledus(_"Saledus smiles",
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>" ..
171[[As I walked to the east, I found a larger mountain.]] ..
172[[I am not absolutely sure – a geologist should check if I am right]] ..
173[[ – but I believe we could mine marble from some places on the mountain.]]) .. "<br><br>" ..
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, ]] ..
175[[beyond the meager quantities available from the quarry. ]] ..172[[beyond the meager quantities available from the quarry. ]] ..
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>" ..
177174
=== modified file 'global/militarysites/barracks.empire/conf'
--- global/militarysites/barracks.empire/conf 2013-10-29 10:55:20 +0000
+++ global/militarysites/barracks.empire/conf 2014-03-16 06:41:40 +0000
@@ -5,10 +5,10 @@
5buildable=no5buildable=no
6prefer_heroes=false6prefer_heroes=false
7occupied_string=7occupied_string=
8aggressor_string=_Your Barracks discovered an aggressor.8aggressor_string=_Your barracks discovered an aggressor.
9attack_string=_Your Barracks is under attack.9attack_string=_Your barracks is under attack.
10defeated_enemy_string=_The enemy defeated your soldiers at the Barracks10defeated_enemy_string=_The enemy defeated your soldiers at the barracks.
11defeated_you_string=_Your soldiers defeated the enemy at the Barracks11defeated_you_string=_Your soldiers defeated the enemy at the barracks.
1212
1313
14[idle]14[idle]
1515
=== modified file 'global/militarysites/barrier.barbarians/conf'
--- global/militarysites/barrier.barbarians/conf 2013-10-29 10:55:20 +0000
+++ global/militarysites/barrier.barbarians/conf 2014-03-16 06:41:40 +0000
@@ -5,10 +5,10 @@
5buildable=no5buildable=no
6prefer_heroes=true6prefer_heroes=true
7occupied_string=7occupied_string=
8aggressor_string=_Your Barrier discovered an aggressor.8aggressor_string=_Your barrier discovered an aggressor.
9attack_string=_Your Barrier is under attack.9attack_string=_Your barrier is under attack.
10defeated_enemy_string=_The enemy defeated your soldiers at the Barrier10defeated_enemy_string=_The enemy defeated your soldiers at the barrier.
11defeated_you_string=_Your soldiers defeated the enemy at the Barrier11defeated_you_string=_Your soldiers defeated the enemy at the barrier.
1212
1313
14[idle]14[idle]
1515
=== modified file 'global/militarysites/barrier.empire/conf'
--- global/militarysites/barrier.empire/conf 2013-10-29 10:55:20 +0000
+++ global/militarysites/barrier.empire/conf 2014-03-16 06:41:40 +0000
@@ -5,10 +5,10 @@
5buildable=no5buildable=no
6prefer_heroes=true6prefer_heroes=true
7occupied_string=7occupied_string=
8aggressor_string=_Your Barrier discovered an aggressor.8aggressor_string=_Your barrier discovered an aggressor.
9attack_string=_Your Barrier is under attack.9attack_string=_Your barrier is under attack.
10defeated_enemy_string=_The enemy defeated your soldiers at the Barrier10defeated_enemy_string=_The enemy defeated your soldiers at the barrier.
11defeated_you_string=_Your soldiers defeated the enemy at the Barrier11defeated_you_string=_Your soldiers defeated the enemy at the barrier.
1212
1313
14[idle]14[idle]
1515
=== modified file 'global/militarysites/castle.atlanteans/conf'
--- global/militarysites/castle.atlanteans/conf 2013-10-29 10:55:20 +0000
+++ global/militarysites/castle.atlanteans/conf 2014-03-16 06:41:40 +0000
@@ -5,10 +5,10 @@
5buildable=no5buildable=no
6prefer_heroes=true6prefer_heroes=true
7occupied_string=7occupied_string=
8aggressor_string=_Your Castle discovered an aggressor.8aggressor_string=_Your castle discovered an aggressor.
9attack_string=_Your Castle is under attack.9attack_string=_Your castle is under attack.
10defeated_enemy_string=_The enemy defeated your soldiers at the Castle10defeated_enemy_string=_The enemy defeated your soldiers at the castle.
11defeated_you_string=_Your soldiers defeated the enemy at the Castle11defeated_you_string=_Your soldiers defeated the enemy at the castle.
1212
1313
14[idle]14[idle]
1515
=== modified file 'global/militarysites/castle.empire/conf'
--- global/militarysites/castle.empire/conf 2013-10-29 10:55:20 +0000
+++ global/militarysites/castle.empire/conf 2014-03-16 06:41:40 +0000
@@ -5,10 +5,10 @@
5buildable=no5buildable=no
6prefer_heroes=true6prefer_heroes=true
7occupied_string=7occupied_string=
8aggressor_string=_Your Castle discovered an aggressor.8aggressor_string=_Your castle discovered an aggressor.
9attack_string=_Your Castle is under attack.9attack_string=_Your castle is under attack.
10defeated_enemy_string=_The enemy defeated your soldiers at the Castle10defeated_enemy_string=_The enemy defeated your soldiers at the castle.
11defeated_you_string=_Your soldiers defeated the enemy at the Castle11defeated_you_string=_Your soldiers defeated the enemy at the castle.
1212
1313
14[idle]14[idle]
1515
=== modified file 'global/militarysites/citadel.barbarians/conf'
--- global/militarysites/citadel.barbarians/conf 2013-10-29 10:55:20 +0000
+++ global/militarysites/citadel.barbarians/conf 2014-03-16 06:41:40 +0000
@@ -5,10 +5,10 @@
5buildable=no5buildable=no
6prefer_heroes=true6prefer_heroes=true
7occupied_string=7occupied_string=
8aggressor_string=_Your Citadel discovered an aggressor.8aggressor_string=_Your citadel discovered an aggressor.
9attack_string=_Your Citadel is under attack.9attack_string=_Your citadel is under attack.
10defeated_enemy_string=_The enemy defeated your soldiers at the Citadel10defeated_enemy_string=_The enemy defeated your soldiers at the citadel.
11defeated_you_string=_Your soldiers defeated the enemy at the Citadel11defeated_you_string=_Your soldiers defeated the enemy at the citadel.
1212
1313
14[idle]14[idle]
1515
=== modified file 'global/militarysites/donjon.barbarians/conf'
--- global/militarysites/donjon.barbarians/conf 2013-10-29 10:55:20 +0000
+++ global/militarysites/donjon.barbarians/conf 2014-03-16 06:41:40 +0000
@@ -6,10 +6,10 @@
6buildable=no6buildable=no
7prefer_heroes=true7prefer_heroes=true
8occupied_string=8occupied_string=
9aggressor_string=_Your Donjon discovered an aggressor.9aggressor_string=_Your donjon discovered an aggressor.
10attack_string=_Your Donjon is under attack.10attack_string=_Your donjon is under attack.
11defeated_enemy_string=_The enemy defeated your soldiers at the Donjon11defeated_enemy_string=_The enemy defeated your soldiers at the donjon.
12defeated_you_string=_Your soldiers defeated the enemy at the Donjon12defeated_you_string=_Your soldiers defeated the enemy at the donjon.
1313
1414
15[idle]15[idle]
1616
=== modified file 'global/militarysites/fortress.barbarians/conf'
--- global/militarysites/fortress.barbarians/conf 2013-10-29 10:55:20 +0000
+++ global/militarysites/fortress.barbarians/conf 2014-03-16 06:41:40 +0000
@@ -5,10 +5,10 @@
5buildable=no5buildable=no
6prefer_heroes=true6prefer_heroes=true
7occupied_string=7occupied_string=
8aggressor_string=_Your Fortress discovered an aggressor.8aggressor_string=_Your fortress discovered an aggressor.
9attack_string=_Your Fortress is under attack.9attack_string=_Your fortress is under attack.
10defeated_enemy_string=_The enemy defeated your soldiers at the Fortress10defeated_enemy_string=_The enemy defeated your soldiers at the fortress.
11defeated_you_string=_Your soldiers defeated the enemy at the Fortress11defeated_you_string=_Your soldiers defeated the enemy at the fortress.
1212
1313
14[idle]14[idle]
1515
=== modified file 'global/militarysites/fortress.empire/conf'
--- global/militarysites/fortress.empire/conf 2013-10-29 10:55:20 +0000
+++ global/militarysites/fortress.empire/conf 2014-03-16 06:41:40 +0000
@@ -5,10 +5,10 @@
5buildable=no5buildable=no
6prefer_heroes=true6prefer_heroes=true
7occupied_string=7occupied_string=
8aggressor_string=_Your Fortress discovered an aggressor.8aggressor_string=_Your fortress discovered an aggressor.
9attack_string=_Your Fortress is under attack.9attack_string=_Your fortress is under attack.
10defeated_enemy_string=_The enemy defeated your soldiers at the Fortress10defeated_enemy_string=_The enemy defeated your soldiers at the fortress.
11defeated_you_string=_Your soldiers defeated the enemy at the Fortress11defeated_you_string=_Your soldiers defeated the enemy at the fortress.
1212
1313
14[idle]14[idle]
1515
=== modified file 'global/militarysites/guardhall.atlanteans/conf'
--- global/militarysites/guardhall.atlanteans/conf 2013-10-29 10:55:20 +0000
+++ global/militarysites/guardhall.atlanteans/conf 2014-03-16 06:41:40 +0000
@@ -5,10 +5,10 @@
5buildable=no5buildable=no
6prefer_heroes=true6prefer_heroes=true
7occupied_string=7occupied_string=
8aggressor_string=_Your Guardhall discovered an aggressor.8aggressor_string=_Your guardhall discovered an aggressor.
9attack_string=_Your Guardhall is under attack.9attack_string=_Your guardhall is under attack.
10defeated_enemy_string=_The enemy defeated your soldiers at the Guardhall10defeated_enemy_string=_The enemy defeated your soldiers at the guardhall.
11defeated_you_string=_Your soldiers defeated the enemy at the Guardhall11defeated_you_string=_Your soldiers defeated the enemy at the guardhall.
1212
1313
14[idle]14[idle]
1515
=== modified file 'global/militarysites/guardhouse.atlanteans/conf'
--- global/militarysites/guardhouse.atlanteans/conf 2013-10-29 10:55:20 +0000
+++ global/militarysites/guardhouse.atlanteans/conf 2014-03-16 06:41:40 +0000
@@ -5,10 +5,10 @@
5buildable=no5buildable=no
6prefer_heroes=false6prefer_heroes=false
7occupied_string=7occupied_string=
8aggressor_string=_Your Guardhouse discovered an aggressor.8aggressor_string=_Your guardhouse discovered an aggressor.
9attack_string=_Your Guardhouse is under attack.9attack_string=_Your guardhouse is under attack.
10defeated_enemy_string=_The enemy defeated your soldiers at the Guardhouse10defeated_enemy_string=_The enemy defeated your soldiers at the guardhouse.
11defeated_you_string=_Your soldiers defeated the enemy at the Guardhouse11defeated_you_string=_Your soldiers defeated the enemy at the guardhouse.
1212
1313
14[idle]14[idle]
1515
=== modified file 'global/militarysites/high_tower.atlanteans/conf'
--- global/militarysites/high_tower.atlanteans/conf 2013-10-29 10:55:20 +0000
+++ global/militarysites/high_tower.atlanteans/conf 2014-03-16 06:41:40 +0000
@@ -6,10 +6,10 @@
6buildable=no6buildable=no
7prefer_heroes=true7prefer_heroes=true
8occupied_string=8occupied_string=
9aggressor_string=_Your High Tower discovered an aggressor.9aggressor_string=_Your high tower discovered an aggressor.
10attack_string=_Your High Tower is under attack.10attack_string=_Your high tower is under attack.
11defeated_enemy_string=_The enemy defeated your soldiers at the High Tower11defeated_enemy_string=_The enemy defeated your soldiers at the high tower.
12defeated_you_string=_Your soldiers defeated the enemy at the High Tower12defeated_you_string=_Your soldiers defeated the enemy at the high tower.
1313
1414
15[idle]15[idle]
1616
=== modified file 'global/militarysites/outpost.empire/conf'
--- global/militarysites/outpost.empire/conf 2013-10-29 10:55:20 +0000
+++ global/militarysites/outpost.empire/conf 2014-03-16 06:41:40 +0000
@@ -5,10 +5,10 @@
5buildable=no5buildable=no
6prefer_heroes=false6prefer_heroes=false
7occupied_string=7occupied_string=
8aggressor_string=_Your Outpost discovered an aggressor.8aggressor_string=_Your outpost discovered an aggressor.
9attack_string=_Your Outpost is under attack.9attack_string=_Your outpost is under attack.
10defeated_enemy_string=_The enemy defeated your soldiers at the Outpost10defeated_enemy_string=_The enemy defeated your soldiers at the outpost.
11defeated_you_string=_Your soldiers defeated the enemy at the Outpost11defeated_you_string=_Your soldiers defeated the enemy at the outpost.
1212
1313
14[idle]14[idle]
1515
=== modified file 'global/militarysites/sentry.barbarians/conf'
--- global/militarysites/sentry.barbarians/conf 2013-10-29 10:55:20 +0000
+++ global/militarysites/sentry.barbarians/conf 2014-03-16 06:41:40 +0000
@@ -5,10 +5,10 @@
5buildable=no5buildable=no
6prefer_heroes=false6prefer_heroes=false
7occupied_string=7occupied_string=
8aggressor_string=_Your Sentry discovered an aggressor.8aggressor_string=_Your sentry discovered an aggressor.
9attack_string=_Your Sentry is under attack.9attack_string=_Your sentry is under attack.
10defeated_enemy_string=_The enemy defeated your soldiers at the Sentry10defeated_enemy_string=_The enemy defeated your soldiers at the sentry.
11defeated_you_string=_Your soldiers defeated the enemy at the Sentry11defeated_you_string=_Your soldiers defeated the enemy at the sentry.
1212
1313
14[idle]14[idle]
1515
=== modified file 'global/militarysites/sentry.empire/conf'
--- global/militarysites/sentry.empire/conf 2013-10-29 10:55:20 +0000
+++ global/militarysites/sentry.empire/conf 2014-03-16 06:41:40 +0000
@@ -5,10 +5,10 @@
5buildable=no5buildable=no
6prefer_heroes=false6prefer_heroes=false
7occupied_string=7occupied_string=
8aggressor_string=_Your Sentry discovered an aggressor.8aggressor_string=_Your sentry discovered an aggressor.
9attack_string=_Your Sentry is under attack.9attack_string=_Your sentry is under attack.
10defeated_enemy_string=_The enemy defeated your soldiers at the Sentry10defeated_enemy_string=_The enemy defeated your soldiers at the sentry.
11defeated_you_string=_Your soldiers defeated the enemy at the Sentry11defeated_you_string=_Your soldiers defeated the enemy at the sentry.
1212
1313
14[idle]14[idle]
1515
=== modified file 'global/militarysites/small_tower.atlanteans/conf'
--- global/militarysites/small_tower.atlanteans/conf 2013-10-29 10:55:20 +0000
+++ global/militarysites/small_tower.atlanteans/conf 2014-03-16 06:41:40 +0000
@@ -6,10 +6,10 @@
6buildable=no6buildable=no
7prefer_heroes=false7prefer_heroes=false
8occupied_string=8occupied_string=
9aggressor_string=_Your Small Tower discovered an aggressor.9aggressor_string=_Your small tower discovered an aggressor.
10attack_string=_Your Small Tower is under attack.10attack_string=_Your small tower is under attack.
11defeated_enemy_string=_The enemy defeated your soldiers at the Small Tower11defeated_enemy_string=_The enemy defeated your soldiers at the small tower.
12defeated_you_string=_Your soldiers defeated the enemy at the Small Tower12defeated_you_string=_Your soldiers defeated the enemy at the small tower.
1313
1414
15[idle]15[idle]
1616
=== modified file 'global/militarysites/tower.atlanteans/conf'
--- global/militarysites/tower.atlanteans/conf 2013-10-29 10:55:20 +0000
+++ global/militarysites/tower.atlanteans/conf 2014-03-16 06:41:40 +0000
@@ -6,10 +6,10 @@
6buildable=no6buildable=no
7prefer_heroes=true7prefer_heroes=true
8occupied_string=8occupied_string=
9aggressor_string=_Your Tower discovered an aggressor.9aggressor_string=_Your tower discovered an aggressor.
10attack_string=_Your Tower is under attack.10attack_string=_Your tower is under attack.
11defeated_enemy_string=_The enemy defeated your soldiers at the Tower11defeated_enemy_string=_The enemy defeated your soldiers at the tower.
12defeated_you_string=_Your soldiers defeated the enemy at the Tower12defeated_you_string=_Your soldiers defeated the enemy at the tower.
1313
1414
15[idle]15[idle]
1616
=== modified file 'global/militarysites/tower.empire/conf'
--- global/militarysites/tower.empire/conf 2013-10-29 10:55:20 +0000
+++ global/militarysites/tower.empire/conf 2014-03-16 06:41:40 +0000
@@ -6,10 +6,10 @@
6buildable=no6buildable=no
7prefer_heroes=true7prefer_heroes=true
8occupied_string=8occupied_string=
9aggressor_string=_Your Tower discovered an aggressor.9aggressor_string=_Your tower discovered an aggressor.
10attack_string=_Your Tower is under attack.10attack_string=_Your tower is under attack.
11defeated_enemy_string=_The enemy defeated your soldiers at the Tower11defeated_enemy_string=_The enemy defeated your soldiers at the tower.
12defeated_you_string=_Your soldiers defeated the enemy at the Tower12defeated_you_string=_Your soldiers defeated the enemy at the tower.
1313
1414
15[idle]15[idle]
1616
=== modified file 'src/ui_fsmenu/options.cc'
--- src/ui_fsmenu/options.cc 2014-03-09 21:19:30 +0000
+++ src/ui_fsmenu/options.cc 2014-03-16 06:41:40 +0000
@@ -22,8 +22,6 @@
22#include <cstdio>22#include <cstdio>
23#include <iostream>23#include <iostream>
2424
25#include <libintl.h>
26
27#include "constants.h"25#include "constants.h"
28#include "graphic/graphic.h"26#include "graphic/graphic.h"
29#include "i18n.h"27#include "i18n.h"
3028
=== modified file 'tribes/atlanteans/castle/conf'
--- tribes/atlanteans/castle/conf 2013-10-29 10:55:20 +0000
+++ tribes/atlanteans/castle/conf 2014-03-16 06:41:40 +0000
@@ -3,11 +3,11 @@
3heal_per_second=2003heal_per_second=200
4conquers=124conquers=12
5prefer_heroes=true5prefer_heroes=true
6occupied_string=_Your soldiers have occupied your Castle6occupied_string=_Your soldiers have occupied your castle.
7aggressor_string=_Your Castle discovered an aggressor.7aggressor_string=_Your castle discovered an aggressor.
8attack_string=_Your Castle is under attack.8attack_string=_Your castle is under attack.
9defeated_enemy_string=_The enemy defeated your soldiers at the Castle9defeated_enemy_string=_The enemy defeated your soldiers at the castle.
10defeated_you_string=_Your soldiers defeated the enemy at the Castle10defeated_you_string=_Your soldiers defeated the enemy at the castle.
1111
12[buildcost]12[buildcost]
13planks=413planks=4
1414
=== modified file 'tribes/atlanteans/guardhall/conf'
--- tribes/atlanteans/guardhall/conf 2013-10-29 10:55:20 +0000
+++ tribes/atlanteans/guardhall/conf 2014-03-16 06:41:40 +0000
@@ -3,11 +3,11 @@
3heal_per_second=1403heal_per_second=140
4conquers=74conquers=7
5prefer_heroes=true5prefer_heroes=true
6occupied_string=_Your soldiers have occupied your Guardhall6occupied_string=_Your soldiers have occupied your guardhall.
7aggressor_string=_Your Guardhall discovered an aggressor.7aggressor_string=_Your guardhall discovered an aggressor.
8attack_string=_Your Guardhall is under attack.8attack_string=_Your guardhall is under attack.
9defeated_enemy_string=_The enemy defeated your soldiers at the Guardhall9defeated_enemy_string=_The enemy defeated your soldiers at the guardhall.
10defeated_you_string=_Your soldiers defeated the enemy at the Guardhall10defeated_you_string=_Your soldiers defeated the enemy at the guardhall.
1111
12[buildcost]12[buildcost]
13trunk=213trunk=2
1414
=== modified file 'tribes/atlanteans/guardhouse/conf'
--- tribes/atlanteans/guardhouse/conf 2013-10-29 10:55:20 +0000
+++ tribes/atlanteans/guardhouse/conf 2014-03-16 06:41:40 +0000
@@ -3,11 +3,11 @@
3conquers=63conquers=6
4max_soldiers=24max_soldiers=2
5prefer_heroes=false5prefer_heroes=false
6occupied_string=_Your soldiers have occupied your Guardhouse6occupied_string=_Your soldiers have occupied your guardhouse.
7aggressor_string=_Your Guardhouse discovered an aggressor.7aggressor_string=_Your guardhouse discovered an aggressor.
8attack_string=_Your Guardhouse is under attack.8attack_string=_Your guardhouse is under attack.
9defeated_enemy_string=_The enemy defeated your soldiers at the Guardhouse9defeated_enemy_string=_The enemy defeated your soldiers at the guardhouse.
10defeated_you_string=_Your soldiers defeated the enemy at the Guardhouse10defeated_you_string=_Your soldiers defeated the enemy at the guardhouse.
1111
12[buildcost]12[buildcost]
13trunk=113trunk=1
1414
=== modified file 'tribes/atlanteans/high_tower/conf'
--- tribes/atlanteans/high_tower/conf 2013-10-29 10:55:20 +0000
+++ tribes/atlanteans/high_tower/conf 2014-03-16 06:41:40 +0000
@@ -6,11 +6,11 @@
6vision_range=216vision_range=21
7enhanced_building=yes7enhanced_building=yes
8prefer_heroes=true8prefer_heroes=true
9occupied_string=_Your soldiers have occupied your High Tower9occupied_string=_Your soldiers have occupied your high tower.
10aggressor_string=_Your High Tower discovered an aggressor.10aggressor_string=_Your high tower discovered an aggressor.
11attack_string=_Your High Tower is under attack.11attack_string=_Your high tower is under attack.
12defeated_enemy_string=_The enemy defeated your soldiers at the High Tower12defeated_enemy_string=_The enemy defeated your soldiers at the high tower.
13defeated_you_string=_Your soldiers defeated the enemy at the High Tower13defeated_you_string=_Your soldiers defeated the enemy at the high tower.
1414
15[enhancement_cost]15[enhancement_cost]
16trunk=116trunk=1
1717
=== modified file 'tribes/atlanteans/horse/conf'
--- tribes/atlanteans/horse/conf 2014-02-24 21:12:30 +0000
+++ tribes/atlanteans/horse/conf 2014-03-16 06:41:40 +0000
@@ -1,4 +1,4 @@
1help=_Horses help to carry items at heavily used roads. They are reared in a horse farm.1help=_Horses help to carry items along busy roads. They are reared in a horse farm.
2default_target_quantity=52default_target_quantity=5
3ware_hotspot=-2 123ware_hotspot=-2 12
44
55
=== modified file 'tribes/atlanteans/small_tower/conf'
--- tribes/atlanteans/small_tower/conf 2013-10-29 10:55:20 +0000
+++ tribes/atlanteans/small_tower/conf 2014-03-16 06:41:40 +0000
@@ -4,11 +4,11 @@
4vision_range=134vision_range=13
5max_soldiers=35max_soldiers=3
6prefer_heroes=true6prefer_heroes=true
7occupied_string=_Your soldiers have occupied your Small Tower7occupied_string=_Your soldiers have occupied your small tower.
8aggressor_string=_Your Small Tower discovered an aggressor.8aggressor_string=_Your small tower discovered an aggressor.
9attack_string=_Your Small Tower is under attack.9attack_string=_Your small tower is under attack.
10defeated_enemy_string=_The enemy defeated your soldiers at the Small Tower10defeated_enemy_string=_The enemy defeated your soldiers at the small tower.
11defeated_you_string=_Your soldiers defeated the enemy at the Small Tower11defeated_you_string=_Your soldiers defeated the enemy at the small tower.
1212
13[buildcost]13[buildcost]
14trunk=114trunk=1
1515
=== modified file 'tribes/atlanteans/tower/conf'
--- tribes/atlanteans/tower/conf 2013-10-29 10:55:20 +0000
+++ tribes/atlanteans/tower/conf 2014-03-16 06:41:40 +0000
@@ -5,11 +5,11 @@
5vision_range=175vision_range=17
6enhancement=high_tower6enhancement=high_tower
7prefer_heroes=false7prefer_heroes=false
8occupied_string=_Your soldiers have occupied your Tower8occupied_string=_Your soldiers have occupied your tower.
9aggressor_string=_Your Tower discovered an aggressor.9aggressor_string=_Your tower discovered an aggressor.
10attack_string=_Your Tower is under attack.10attack_string=_Your tower is under attack.
11defeated_enemy_string=_The enemy defeated your soldiers at the Tower11defeated_enemy_string=_The enemy defeated your soldiers at the tower.
12defeated_you_string=_Your soldiers defeated the enemy at the Tower12defeated_you_string=_Your soldiers defeated the enemy at the tower.
1313
14[buildcost]14[buildcost]
15trunk=215trunk=2
1616
=== modified file 'tribes/barbarians/barrier/conf'
--- tribes/barbarians/barrier/conf 2013-10-29 10:55:20 +0000
+++ tribes/barbarians/barrier/conf 2014-03-16 06:41:40 +0000
@@ -3,11 +3,11 @@
3heal_per_second=1303heal_per_second=130
4conquers=84conquers=8
5prefer_heroes=true5prefer_heroes=true
6occupied_string=_Your soldiers have occupied your Barrier6occupied_string=_Your soldiers have occupied your barrier.
7aggressor_string=_Your Barrier discovered an aggressor.7aggressor_string=_Your barrier discovered an aggressor.
8attack_string=_Your Barrier is under attack.8attack_string=_Your barrier is under attack.
9defeated_enemy_string=_The enemy defeated your soldiers at the Barrier9defeated_enemy_string=_The enemy defeated your soldiers at the barrier.
10defeated_you_string=_Your soldiers defeated the enemy at the Barrier10defeated_you_string=_Your soldiers defeated the enemy at the barrier.
1111
12[buildcost]12[buildcost]
13blackwood=513blackwood=5
1414
=== modified file 'tribes/barbarians/citadel/conf'
--- tribes/barbarians/citadel/conf 2013-10-29 10:55:20 +0000
+++ tribes/barbarians/citadel/conf 2014-03-16 06:41:40 +0000
@@ -5,11 +5,11 @@
5conquers=125conquers=12
6enhanced_building=yes6enhanced_building=yes
7prefer_heroes=true7prefer_heroes=true
8occupied_string=_Your soldiers have occupied your Citadel8occupied_string=_Your soldiers have occupied your citadel.
9aggressor_string=_Your Citadel discovered an aggressor.9aggressor_string=_Your citadel discovered an aggressor.
10attack_string=_Your Citadel is under attack.10attack_string=_Your citadel is under attack.
11defeated_enemy_string=_The enemy defeated your soldiers at the Citadel11defeated_enemy_string=_The enemy defeated your soldiers at the citadel.
12defeated_you_string=_Your soldiers defeated the enemy at the Citadel12defeated_you_string=_Your soldiers defeated the enemy at the citadel.
1313
1414
15[enhancement_cost]15[enhancement_cost]
1616
=== modified file 'tribes/barbarians/donjon/conf'
--- tribes/barbarians/donjon/conf 2013-10-29 10:55:20 +0000
+++ tribes/barbarians/donjon/conf 2014-03-16 06:41:40 +0000
@@ -4,11 +4,11 @@
4conquers=84conquers=8
5vision_range=175vision_range=17
6prefer_heroes=true6prefer_heroes=true
7occupied_string=_Your soldiers have occupied your Donjon7occupied_string=_Your soldiers have occupied your donjon.
8aggressor_string=_Your Donjon discovered an aggressor.8aggressor_string=_Your donjon discovered an aggressor.
9attack_string=_Your Donjon is under attack.9attack_string=_Your donjon is under attack.
10defeated_enemy_string=_The enemy defeated your soldiers at the Donjon10defeated_enemy_string=_The enemy defeated your soldiers at the donjon.
11defeated_you_string=_Your soldiers defeated the enemy at the Donjon11defeated_you_string=_Your soldiers defeated the enemy at the donjon.
1212
1313
14[buildcost]14[buildcost]
1515
=== modified file 'tribes/barbarians/fernery/help.lua'
--- tribes/barbarians/fernery/help.lua 2014-03-05 18:47:03 +0000
+++ tribes/barbarians/fernery/help.lua 2014-03-16 06:41:40 +0000
@@ -23,6 +23,8 @@
23 rt(h3(_"Outgoing:")) ..23 rt(h3(_"Outgoing:")) ..
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")) ..
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")) ..
26 -- TRANSLATORS: This is a detail for the reed -> construction site flow
27 -- TRANSLATORS: The weaving mill is mentioned separately
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.")) ..
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")) ..
28 --Building Section30 --Building Section
2931
=== modified file 'tribes/barbarians/fortress/conf'
--- tribes/barbarians/fortress/conf 2013-10-29 10:55:20 +0000
+++ tribes/barbarians/fortress/conf 2014-03-16 06:41:40 +0000
@@ -4,11 +4,11 @@
4conquers=114conquers=11
5enhancement=citadel5enhancement=citadel
6prefer_heroes=true6prefer_heroes=true
7occupied_string=_Your soldiers have occupied your Fortress7occupied_string=_Your soldiers have occupied your fortress.
8aggressor_string=_Your Fortress discovered an aggressor.8aggressor_string=_Your fortress discovered an aggressor.
9attack_string=_Your Fortress is under attack.9attack_string=_Your fortress is under attack.
10defeated_enemy_string=_The enemy defeated your soldiers at the Fortress10defeated_enemy_string=_The enemy defeated your soldiers at the fortress.
11defeated_you_string=_Your soldiers defeated the enemy at the Fortress11defeated_you_string=_Your soldiers defeated the enemy at the fortress.
1212
13[buildcost]13[buildcost]
14blackwood=914blackwood=9
1515
=== modified file 'tribes/barbarians/ox/conf'
--- tribes/barbarians/ox/conf 2014-02-24 21:12:30 +0000
+++ tribes/barbarians/ox/conf 2014-03-16 06:41:40 +0000
@@ -1,4 +1,4 @@
1help=_Helps with carrying items on heavily used roads.1help=_Oxen help to carry items along busy roads. They are reared in a cattle farm.
2default_target_quantity=52default_target_quantity=5
3ware_hotspot=-2 133ware_hotspot=-2 13
44
55
=== modified file 'tribes/barbarians/sentry/conf'
--- tribes/barbarians/sentry/conf 2013-10-29 10:55:20 +0000
+++ tribes/barbarians/sentry/conf 2014-03-16 06:41:40 +0000
@@ -3,11 +3,11 @@
3conquers=63conquers=6
4max_soldiers=24max_soldiers=2
5prefer_heroes=false5prefer_heroes=false
6occupied_string=_Your soldiers have occupied your Sentry6occupied_string=_Your soldiers have occupied your sentry.
7aggressor_string=_Your Sentry discovered an aggressor.7aggressor_string=_Your sentry discovered an aggressor.
8attack_string=_Your Sentry is under attack.8attack_string=_Your sentry is under attack.
9defeated_enemy_string=_The enemy defeated your soldiers at the Sentry9defeated_enemy_string=_The enemy defeated your soldiers at the sentry.
10defeated_you_string=_Your soldiers defeated the enemy at the Sentry10defeated_you_string=_Your soldiers defeated the enemy at the sentry.
1111
12[buildcost]12[buildcost]
13blackwood=213blackwood=2
1414
=== modified file 'tribes/empire/barracks/conf'
--- tribes/empire/barracks/conf 2013-10-29 10:55:20 +0000
+++ tribes/empire/barracks/conf 2014-03-16 06:41:40 +0000
@@ -4,11 +4,11 @@
4max_soldiers=14max_soldiers=1
5enhancement=sentry5enhancement=sentry
6prefer_heroes=false6prefer_heroes=false
7occupied_string=_Your soldiers have occupied your Barracks7occupied_string=_Your soldiers have occupied your barracks.
8aggressor_string=_Your Barracks discovered an aggressor.8aggressor_string=_Your barracks discovered an aggressor.
9attack_string=_Your Barracks is under attack.9attack_string=_Your barracks is under attack.
10defeated_enemy_string=_The enemy defeated your soldiers at the Barracks10defeated_enemy_string=_The enemy defeated your soldiers at the barracks.
11defeated_you_string=_Your soldiers defeated the enemy at the Barracks11defeated_you_string=_Your soldiers defeated the enemy at the barracks.
1212
1313
14[buildcost]14[buildcost]
1515
=== modified file 'tribes/empire/barrier/conf'
--- tribes/empire/barrier/conf 2013-10-29 10:55:20 +0000
+++ tribes/empire/barrier/conf 2014-03-16 06:41:40 +0000
@@ -4,11 +4,11 @@
4conquers=84conquers=8
5enhanced_building=yes5enhanced_building=yes
6prefer_heroes=true6prefer_heroes=true
7occupied_string=_Your soldiers have occupied your Barrier7occupied_string=_Your soldiers have occupied your barrier.
8aggressor_string=_Your Barrier discovered an aggressor.8aggressor_string=_Your barrier discovered an aggressor.
9attack_string=_Your Barrier is under attack.9attack_string=_Your barrier is under attack.
10defeated_enemy_string=_The enemy defeated your soldiers at the Barrier10defeated_enemy_string=_The enemy defeated your soldiers at the barrier.
11defeated_you_string=_Your soldiers defeated the enemy at the Barrier11defeated_you_string=_Your soldiers defeated the enemy at the barrier.
1212
1313
14[buildcost]14[buildcost]
1515
=== modified file 'tribes/empire/castle/conf'
--- tribes/empire/castle/conf 2013-10-29 10:55:20 +0000
+++ tribes/empire/castle/conf 2014-03-16 06:41:40 +0000
@@ -5,11 +5,11 @@
5conquers=125conquers=12
6enhanced_building=yes6enhanced_building=yes
7prefer_heroes=true7prefer_heroes=true
8occupied_string=_Your soldiers have occupied your Castle8occupied_string=_Your soldiers have occupied your castle.
9aggressor_string=_Your Castle discovered an aggressor.9aggressor_string=_Your castle discovered an aggressor.
10attack_string=_Your Castle is under attack.10attack_string=_Your castle is under attack.
11defeated_enemy_string=_The enemy defeated your soldiers at the Castle11defeated_enemy_string=_The enemy defeated your soldiers at the castle.
12defeated_you_string=_Your soldiers defeated the enemy at the Castle12defeated_you_string=_Your soldiers defeated the enemy at the castle.
1313
1414
15[enhancement_cost]15[enhancement_cost]
1616
=== modified file 'tribes/empire/donkey/conf'
--- tribes/empire/donkey/conf 2014-02-24 21:12:30 +0000
+++ tribes/empire/donkey/conf 2014-03-16 06:41:40 +0000
@@ -1,4 +1,4 @@
1help=_Helps to carry items along busy roads.1help=_Donkeys help to carry items along busy roads. They are reared in a donkey farm.
2default_target_quantity=52default_target_quantity=5
3ware_hotspot=-2 83ware_hotspot=-2 8
44
55
=== modified file 'tribes/empire/fortress/conf'
--- tribes/empire/fortress/conf 2013-10-29 10:55:20 +0000
+++ tribes/empire/fortress/conf 2014-03-16 06:41:40 +0000
@@ -4,11 +4,11 @@
4conquers=114conquers=11
5enhancement=castle5enhancement=castle
6prefer_heroes=true6prefer_heroes=true
7occupied_string=_Your soldiers have occupied your Fortress7occupied_string=_Your soldiers have occupied your fortress.
8aggressor_string=_Your Fortress discovered an aggressor.8aggressor_string=_Your fortress discovered an aggressor.
9attack_string=_Your Fortress is under attack.9attack_string=_Your fortress is under attack.
10defeated_enemy_string=_The enemy defeated your soldiers at the Fortress10defeated_enemy_string=_The enemy defeated your soldiers at the fortress.
11defeated_you_string=_Your soldiers defeated the enemy at the Fortress11defeated_you_string=_Your soldiers defeated the enemy at the fortress.
1212
1313
14[buildcost]14[buildcost]
1515
=== modified file 'tribes/empire/outpost/conf'
--- tribes/empire/outpost/conf 2013-10-29 10:55:20 +0000
+++ tribes/empire/outpost/conf 2014-03-16 06:41:40 +0000
@@ -4,11 +4,11 @@
4conquers=74conquers=7
5enhancement=barrier5enhancement=barrier
6prefer_heroes=false6prefer_heroes=false
7occupied_string=_Your soldiers have occupied your Outpost7occupied_string=_Your soldiers have occupied your outpost.
8aggressor_string=_Your Outpost discovered an aggressor.8aggressor_string=_Your outpost discovered an aggressor.
9attack_string=_Your Outpost is under attack.9attack_string=_Your outpost is under attack.
10defeated_enemy_string=_The enemy defeated your soldiers at the Outpost10defeated_enemy_string=_The enemy defeated your soldiers at the outpost.
11defeated_you_string=_Your soldiers defeated the enemy at the Outpost11defeated_you_string=_Your soldiers defeated the enemy at the outpost.
1212
1313
14[buildcost]14[buildcost]
1515
=== modified file 'tribes/empire/sentry/conf'
--- tribes/empire/sentry/conf 2013-10-29 10:55:20 +0000
+++ tribes/empire/sentry/conf 2014-03-16 06:41:40 +0000
@@ -4,11 +4,11 @@
4max_soldiers=24max_soldiers=2
5enhanced_building=yes5enhanced_building=yes
6prefer_heroes=false6prefer_heroes=false
7occupied_string=_Your soldiers have occupied your Sentry7occupied_string=_Your soldiers have occupied your sentry.
8aggressor_string=_Your Sentry discovered an aggressor.8aggressor_string=_Your sentry discovered an aggressor.
9attack_string=_Your Sentry is under attack.9attack_string=_Your sentry is under attack.
10defeated_enemy_string=_The enemy defeated your soldiers at the Sentry10defeated_enemy_string=_The enemy defeated your soldiers at the sentry.
11defeated_you_string=_Your soldiers defeated the enemy at the Sentry11defeated_you_string=_Your soldiers defeated the enemy at the sentry.
1212
1313
14[buildcost]14[buildcost]
1515
=== modified file 'tribes/empire/tower/conf'
--- tribes/empire/tower/conf 2013-10-29 10:55:20 +0000
+++ tribes/empire/tower/conf 2014-03-16 06:41:40 +0000
@@ -4,11 +4,11 @@
4conquers=94conquers=9
5vision_range=195vision_range=19
6prefer_heroes=true6prefer_heroes=true
7occupied_string=_Your soldiers have occupied your Tower7occupied_string=_Your soldiers have occupied your tower.
8aggressor_string=_Your Tower discovered an aggressor.8aggressor_string=_Your tower discovered an aggressor.
9attack_string=_Your Tower is under attack.9attack_string=_Your tower is under attack.
10defeated_enemy_string=_The enemy defeated your soldiers at the Tower10defeated_enemy_string=_The enemy defeated your soldiers at the tower.
11defeated_you_string=_Your soldiers defeated the enemy at the Tower11defeated_you_string=_Your soldiers defeated the enemy at the tower.
1212
1313
14[buildcost]14[buildcost]

Subscribers

People subscribed via source and target branches

to status/vote changes: