widelands-dev team mailing list archive

[GunChleoc <fios@xxxxxxxxxxxxxxxxxxx>]

GunChleoc has proposed merging lp:~widelands-dev/widelands/i18n-20140314 into lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/i18n-20140314/+merge/211191

Some more small string fixes.
-- 
https://code.launchpad.net/~widelands-dev/widelands/i18n-20140314/+merge/211191
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/i18n-20140314 into lp:widelands.

=== 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 @@
 saledus_2 = {
    title =_ "Marble on the Mountain",
    body= saledus(_"Saledus smiles",
-_([[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>" ..
+_([[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>" ..
 _([[It would be a good source for bolstering our supply of quality marble, ]] ..
 [[beyond the meager quantities available from the quarry. ]] ..
 [[Perhaps you were right when you said that this island was like paradise.]]) .. "<br><br>" ..

=== 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 @@
 buildable=no
 prefer_heroes=false
 occupied_string=
-aggressor_string=_Your Barracks discovered an aggressor.
-attack_string=_Your Barracks is under attack.
-defeated_enemy_string=_The enemy defeated your soldiers at the Barracks
-defeated_you_string=_Your soldiers defeated the enemy at the Barracks
+aggressor_string=_Your barracks discovered an aggressor.
+attack_string=_Your barracks is under attack.
+defeated_enemy_string=_The enemy defeated your soldiers at the barracks.
+defeated_you_string=_Your soldiers defeated the enemy at the barracks.
 
 
 [idle]

=== 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 @@
 buildable=no
 prefer_heroes=true
 occupied_string=
-aggressor_string=_Your Barrier discovered an aggressor.
-attack_string=_Your Barrier is under attack.
-defeated_enemy_string=_The enemy defeated your soldiers at the Barrier
-defeated_you_string=_Your soldiers defeated the enemy at the Barrier
+aggressor_string=_Your barrier discovered an aggressor.
+attack_string=_Your barrier is under attack.
+defeated_enemy_string=_The enemy defeated your soldiers at the barrier.
+defeated_you_string=_Your soldiers defeated the enemy at the barrier.
 
 
 [idle]

=== 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 @@
 buildable=no
 prefer_heroes=true
 occupied_string=
-aggressor_string=_Your Barrier discovered an aggressor.
-attack_string=_Your Barrier is under attack.
-defeated_enemy_string=_The enemy defeated your soldiers at the Barrier
-defeated_you_string=_Your soldiers defeated the enemy at the Barrier
+aggressor_string=_Your barrier discovered an aggressor.
+attack_string=_Your barrier is under attack.
+defeated_enemy_string=_The enemy defeated your soldiers at the barrier.
+defeated_you_string=_Your soldiers defeated the enemy at the barrier.
 
 
 [idle]

=== 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 @@
 buildable=no
 prefer_heroes=true
 occupied_string=
-aggressor_string=_Your Castle discovered an aggressor.
-attack_string=_Your Castle is under attack.
-defeated_enemy_string=_The enemy defeated your soldiers at the Castle
-defeated_you_string=_Your soldiers defeated the enemy at the Castle
+aggressor_string=_Your castle discovered an aggressor.
+attack_string=_Your castle is under attack.
+defeated_enemy_string=_The enemy defeated your soldiers at the castle.
+defeated_you_string=_Your soldiers defeated the enemy at the castle.
 
 
 [idle]

=== 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 @@
 buildable=no
 prefer_heroes=true
 occupied_string=
-aggressor_string=_Your Castle discovered an aggressor.
-attack_string=_Your Castle is under attack.
-defeated_enemy_string=_The enemy defeated your soldiers at the Castle
-defeated_you_string=_Your soldiers defeated the enemy at the Castle
+aggressor_string=_Your castle discovered an aggressor.
+attack_string=_Your castle is under attack.
+defeated_enemy_string=_The enemy defeated your soldiers at the castle.
+defeated_you_string=_Your soldiers defeated the enemy at the castle.
 
 
 [idle]

=== 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 @@
 buildable=no
 prefer_heroes=true
 occupied_string=
-aggressor_string=_Your Citadel discovered an aggressor.
-attack_string=_Your Citadel is under attack.
-defeated_enemy_string=_The enemy defeated your soldiers at the Citadel
-defeated_you_string=_Your soldiers defeated the enemy at the Citadel
+aggressor_string=_Your citadel discovered an aggressor.
+attack_string=_Your citadel is under attack.
+defeated_enemy_string=_The enemy defeated your soldiers at the citadel.
+defeated_you_string=_Your soldiers defeated the enemy at the citadel.
 
 
 [idle]

=== 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 @@
 buildable=no
 prefer_heroes=true
 occupied_string=
-aggressor_string=_Your Donjon discovered an aggressor.
-attack_string=_Your Donjon is under attack.
-defeated_enemy_string=_The enemy defeated your soldiers at the Donjon
-defeated_you_string=_Your soldiers defeated the enemy at the Donjon
+aggressor_string=_Your donjon discovered an aggressor.
+attack_string=_Your donjon is under attack.
+defeated_enemy_string=_The enemy defeated your soldiers at the donjon.
+defeated_you_string=_Your soldiers defeated the enemy at the donjon.
 
 
 [idle]

=== 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 @@
 buildable=no
 prefer_heroes=true
 occupied_string=
-aggressor_string=_Your Fortress discovered an aggressor.
-attack_string=_Your Fortress is under attack.
-defeated_enemy_string=_The enemy defeated your soldiers at the Fortress
-defeated_you_string=_Your soldiers defeated the enemy at the Fortress
+aggressor_string=_Your fortress discovered an aggressor.
+attack_string=_Your fortress is under attack.
+defeated_enemy_string=_The enemy defeated your soldiers at the fortress.
+defeated_you_string=_Your soldiers defeated the enemy at the fortress.
 
 
 [idle]

=== 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 @@
 buildable=no
 prefer_heroes=true
 occupied_string=
-aggressor_string=_Your Fortress discovered an aggressor.
-attack_string=_Your Fortress is under attack.
-defeated_enemy_string=_The enemy defeated your soldiers at the Fortress
-defeated_you_string=_Your soldiers defeated the enemy at the Fortress
+aggressor_string=_Your fortress discovered an aggressor.
+attack_string=_Your fortress is under attack.
+defeated_enemy_string=_The enemy defeated your soldiers at the fortress.
+defeated_you_string=_Your soldiers defeated the enemy at the fortress.
 
 
 [idle]

=== 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 @@
 buildable=no
 prefer_heroes=true
 occupied_string=
-aggressor_string=_Your Guardhall discovered an aggressor.
-attack_string=_Your Guardhall is under attack.
-defeated_enemy_string=_The enemy defeated your soldiers at the Guardhall
-defeated_you_string=_Your soldiers defeated the enemy at the Guardhall
+aggressor_string=_Your guardhall discovered an aggressor.
+attack_string=_Your guardhall is under attack.
+defeated_enemy_string=_The enemy defeated your soldiers at the guardhall.
+defeated_you_string=_Your soldiers defeated the enemy at the guardhall.
 
 
 [idle]

=== 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 @@
 buildable=no
 prefer_heroes=false
 occupied_string=
-aggressor_string=_Your Guardhouse discovered an aggressor.
-attack_string=_Your Guardhouse is under attack.
-defeated_enemy_string=_The enemy defeated your soldiers at the Guardhouse
-defeated_you_string=_Your soldiers defeated the enemy at the Guardhouse
+aggressor_string=_Your guardhouse discovered an aggressor.
+attack_string=_Your guardhouse is under attack.
+defeated_enemy_string=_The enemy defeated your soldiers at the guardhouse.
+defeated_you_string=_Your soldiers defeated the enemy at the guardhouse.
 
 
 [idle]

=== 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 @@
 buildable=no
 prefer_heroes=true
 occupied_string=
-aggressor_string=_Your High Tower discovered an aggressor.
-attack_string=_Your High Tower is under attack.
-defeated_enemy_string=_The enemy defeated your soldiers at the High Tower
-defeated_you_string=_Your soldiers defeated the enemy at the High Tower
+aggressor_string=_Your high tower discovered an aggressor.
+attack_string=_Your high tower is under attack.
+defeated_enemy_string=_The enemy defeated your soldiers at the high tower.
+defeated_you_string=_Your soldiers defeated the enemy at the high tower.
 
 
 [idle]

=== 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 @@
 buildable=no
 prefer_heroes=false
 occupied_string=
-aggressor_string=_Your Outpost discovered an aggressor.
-attack_string=_Your Outpost is under attack.
-defeated_enemy_string=_The enemy defeated your soldiers at the Outpost
-defeated_you_string=_Your soldiers defeated the enemy at the Outpost
+aggressor_string=_Your outpost discovered an aggressor.
+attack_string=_Your outpost is under attack.
+defeated_enemy_string=_The enemy defeated your soldiers at the outpost.
+defeated_you_string=_Your soldiers defeated the enemy at the outpost.
 
 
 [idle]

=== 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 @@
 buildable=no
 prefer_heroes=false
 occupied_string=
-aggressor_string=_Your Sentry discovered an aggressor.
-attack_string=_Your Sentry is under attack.
-defeated_enemy_string=_The enemy defeated your soldiers at the Sentry
-defeated_you_string=_Your soldiers defeated the enemy at the Sentry
+aggressor_string=_Your sentry discovered an aggressor.
+attack_string=_Your sentry is under attack.
+defeated_enemy_string=_The enemy defeated your soldiers at the sentry.
+defeated_you_string=_Your soldiers defeated the enemy at the sentry.
 
 
 [idle]

=== 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 @@
 buildable=no
 prefer_heroes=false
 occupied_string=
-aggressor_string=_Your Sentry discovered an aggressor.
-attack_string=_Your Sentry is under attack.
-defeated_enemy_string=_The enemy defeated your soldiers at the Sentry
-defeated_you_string=_Your soldiers defeated the enemy at the Sentry
+aggressor_string=_Your sentry discovered an aggressor.
+attack_string=_Your sentry is under attack.
+defeated_enemy_string=_The enemy defeated your soldiers at the sentry.
+defeated_you_string=_Your soldiers defeated the enemy at the sentry.
 
 
 [idle]

=== 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 @@
 buildable=no
 prefer_heroes=false
 occupied_string=
-aggressor_string=_Your Small Tower discovered an aggressor.
-attack_string=_Your Small Tower is under attack.
-defeated_enemy_string=_The enemy defeated your soldiers at the Small Tower
-defeated_you_string=_Your soldiers defeated the enemy at the Small Tower
+aggressor_string=_Your small tower discovered an aggressor.
+attack_string=_Your small tower is under attack.
+defeated_enemy_string=_The enemy defeated your soldiers at the small tower.
+defeated_you_string=_Your soldiers defeated the enemy at the small tower.
 
 
 [idle]

=== 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 @@
 buildable=no
 prefer_heroes=true
 occupied_string=
-aggressor_string=_Your Tower discovered an aggressor.
-attack_string=_Your Tower is under attack.
-defeated_enemy_string=_The enemy defeated your soldiers at the Tower
-defeated_you_string=_Your soldiers defeated the enemy at the Tower
+aggressor_string=_Your tower discovered an aggressor.
+attack_string=_Your tower is under attack.
+defeated_enemy_string=_The enemy defeated your soldiers at the tower.
+defeated_you_string=_Your soldiers defeated the enemy at the tower.
 
 
 [idle]

=== 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 @@
 buildable=no
 prefer_heroes=true
 occupied_string=
-aggressor_string=_Your Tower discovered an aggressor.
-attack_string=_Your Tower is under attack.
-defeated_enemy_string=_The enemy defeated your soldiers at the Tower
-defeated_you_string=_Your soldiers defeated the enemy at the Tower
+aggressor_string=_Your tower discovered an aggressor.
+attack_string=_Your tower is under attack.
+defeated_enemy_string=_The enemy defeated your soldiers at the tower.
+defeated_you_string=_Your soldiers defeated the enemy at the tower.
 
 
 [idle]

=== 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 @@
 #include <cstdio>
 #include <iostream>
 
-#include <libintl.h>
-
 #include "constants.h"
 #include "graphic/graphic.h"
 #include "i18n.h"

=== 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 @@
 heal_per_second=200
 conquers=12
 prefer_heroes=true
-occupied_string=_Your soldiers have occupied your Castle
-aggressor_string=_Your Castle discovered an aggressor.
-attack_string=_Your Castle is under attack.
-defeated_enemy_string=_The enemy defeated your soldiers at the Castle
-defeated_you_string=_Your soldiers defeated the enemy at the Castle
+occupied_string=_Your soldiers have occupied your castle.
+aggressor_string=_Your castle discovered an aggressor.
+attack_string=_Your castle is under attack.
+defeated_enemy_string=_The enemy defeated your soldiers at the castle.
+defeated_you_string=_Your soldiers defeated the enemy at the castle.
 
 [buildcost]
 planks=4

=== 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 @@
 heal_per_second=140
 conquers=7
 prefer_heroes=true
-occupied_string=_Your soldiers have occupied your Guardhall
-aggressor_string=_Your Guardhall discovered an aggressor.
-attack_string=_Your Guardhall is under attack.
-defeated_enemy_string=_The enemy defeated your soldiers at the Guardhall
-defeated_you_string=_Your soldiers defeated the enemy at the Guardhall
+occupied_string=_Your soldiers have occupied your guardhall.
+aggressor_string=_Your guardhall discovered an aggressor.
+attack_string=_Your guardhall is under attack.
+defeated_enemy_string=_The enemy defeated your soldiers at the guardhall.
+defeated_you_string=_Your soldiers defeated the enemy at the guardhall.
 
 [buildcost]
 trunk=2

=== 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 @@
 conquers=6
 max_soldiers=2
 prefer_heroes=false
-occupied_string=_Your soldiers have occupied your Guardhouse
-aggressor_string=_Your Guardhouse discovered an aggressor.
-attack_string=_Your Guardhouse is under attack.
-defeated_enemy_string=_The enemy defeated your soldiers at the Guardhouse
-defeated_you_string=_Your soldiers defeated the enemy at the Guardhouse
+occupied_string=_Your soldiers have occupied your guardhouse.
+aggressor_string=_Your guardhouse discovered an aggressor.
+attack_string=_Your guardhouse is under attack.
+defeated_enemy_string=_The enemy defeated your soldiers at the guardhouse.
+defeated_you_string=_Your soldiers defeated the enemy at the guardhouse.
 
 [buildcost]
 trunk=1

=== 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 @@
 vision_range=21
 enhanced_building=yes
 prefer_heroes=true
-occupied_string=_Your soldiers have occupied your High Tower
-aggressor_string=_Your High Tower discovered an aggressor.
-attack_string=_Your High Tower is under attack.
-defeated_enemy_string=_The enemy defeated your soldiers at the High Tower
-defeated_you_string=_Your soldiers defeated the enemy at the High Tower
+occupied_string=_Your soldiers have occupied your high tower.
+aggressor_string=_Your high tower discovered an aggressor.
+attack_string=_Your high tower is under attack.
+defeated_enemy_string=_The enemy defeated your soldiers at the high tower.
+defeated_you_string=_Your soldiers defeated the enemy at the high tower.
 
 [enhancement_cost]
 trunk=1

=== 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 @@
-help=_Horses help to carry items at heavily used roads. They are reared in a horse farm.
+help=_Horses help to carry items along busy roads. They are reared in a horse farm.
 default_target_quantity=5
 ware_hotspot=-2 12
 

=== 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 @@
 vision_range=13
 max_soldiers=3
 prefer_heroes=true
-occupied_string=_Your soldiers have occupied your Small Tower
-aggressor_string=_Your Small Tower discovered an aggressor.
-attack_string=_Your Small Tower is under attack.
-defeated_enemy_string=_The enemy defeated your soldiers at the Small Tower
-defeated_you_string=_Your soldiers defeated the enemy at the Small Tower
+occupied_string=_Your soldiers have occupied your small tower.
+aggressor_string=_Your small tower discovered an aggressor.
+attack_string=_Your small tower is under attack.
+defeated_enemy_string=_The enemy defeated your soldiers at the small tower.
+defeated_you_string=_Your soldiers defeated the enemy at the small tower.
 
 [buildcost]
 trunk=1

=== 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 @@
 vision_range=17
 enhancement=high_tower
 prefer_heroes=false
-occupied_string=_Your soldiers have occupied your Tower
-aggressor_string=_Your Tower discovered an aggressor.
-attack_string=_Your Tower is under attack.
-defeated_enemy_string=_The enemy defeated your soldiers at the Tower
-defeated_you_string=_Your soldiers defeated the enemy at the Tower
+occupied_string=_Your soldiers have occupied your tower.
+aggressor_string=_Your tower discovered an aggressor.
+attack_string=_Your tower is under attack.
+defeated_enemy_string=_The enemy defeated your soldiers at the tower.
+defeated_you_string=_Your soldiers defeated the enemy at the tower.
 
 [buildcost]
 trunk=2

=== 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 @@
 heal_per_second=130
 conquers=8
 prefer_heroes=true
-occupied_string=_Your soldiers have occupied your Barrier
-aggressor_string=_Your Barrier discovered an aggressor.
-attack_string=_Your Barrier is under attack.
-defeated_enemy_string=_The enemy defeated your soldiers at the Barrier
-defeated_you_string=_Your soldiers defeated the enemy at the Barrier
+occupied_string=_Your soldiers have occupied your barrier.
+aggressor_string=_Your barrier discovered an aggressor.
+attack_string=_Your barrier is under attack.
+defeated_enemy_string=_The enemy defeated your soldiers at the barrier.
+defeated_you_string=_Your soldiers defeated the enemy at the barrier.
 
 [buildcost]
 blackwood=5

=== 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 @@
 conquers=12
 enhanced_building=yes
 prefer_heroes=true
-occupied_string=_Your soldiers have occupied your Citadel
-aggressor_string=_Your Citadel discovered an aggressor.
-attack_string=_Your Citadel is under attack.
-defeated_enemy_string=_The enemy defeated your soldiers at the Citadel
-defeated_you_string=_Your soldiers defeated the enemy at the Citadel
+occupied_string=_Your soldiers have occupied your citadel.
+aggressor_string=_Your citadel discovered an aggressor.
+attack_string=_Your citadel is under attack.
+defeated_enemy_string=_The enemy defeated your soldiers at the citadel.
+defeated_you_string=_Your soldiers defeated the enemy at the citadel.
 
 
 [enhancement_cost]

=== 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 @@
 conquers=8
 vision_range=17
 prefer_heroes=true
-occupied_string=_Your soldiers have occupied your Donjon
-aggressor_string=_Your Donjon discovered an aggressor.
-attack_string=_Your Donjon is under attack.
-defeated_enemy_string=_The enemy defeated your soldiers at the Donjon
-defeated_you_string=_Your soldiers defeated the enemy at the Donjon
+occupied_string=_Your soldiers have occupied your donjon.
+aggressor_string=_Your donjon discovered an aggressor.
+attack_string=_Your donjon is under attack.
+defeated_enemy_string=_The enemy defeated your soldiers at the donjon.
+defeated_you_string=_Your soldiers defeated the enemy at the donjon.
 
 
 [buildcost]

=== 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 @@
 		rt(h3(_"Outgoing:")) ..
 		dependencies({"tribes/barbarians/fernery/menu.png","tribes/barbarians/thatchreed/menu.png"},p(_"Thatch Reed")) ..
 		dependencies({"tribes/barbarians/thatchreed/menu.png","tribes/barbarians/constructionsite/menu.png"},p(_"Construction Site")) ..
+		-- TRANSLATORS: This is a detail for the reed -> construction site flow
+		-- TRANSLATORS: The weaving mill is mentioned separately
 		rt(p(_"The Reed Yard’s output will only go to construction sites that need it.")) ..
 		dependencies({"tribes/barbarians/thatchreed/menu.png","tribes/barbarians/weaving-mill/menu.png"},p(_"Weaving-Mill")) ..
 	--Building Section

=== 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 @@
 conquers=11
 enhancement=citadel
 prefer_heroes=true
-occupied_string=_Your soldiers have occupied your Fortress
-aggressor_string=_Your Fortress discovered an aggressor.
-attack_string=_Your Fortress is under attack.
-defeated_enemy_string=_The enemy defeated your soldiers at the Fortress
-defeated_you_string=_Your soldiers defeated the enemy at the Fortress
+occupied_string=_Your soldiers have occupied your fortress.
+aggressor_string=_Your fortress discovered an aggressor.
+attack_string=_Your fortress is under attack.
+defeated_enemy_string=_The enemy defeated your soldiers at the fortress.
+defeated_you_string=_Your soldiers defeated the enemy at the fortress.
 
 [buildcost]
 blackwood=9

=== 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 @@
-help=_Helps with carrying items on heavily used roads.
+help=_Oxen help to carry items along busy roads. They are reared in a cattle farm.
 default_target_quantity=5
 ware_hotspot=-2 13
 

=== 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 @@
 conquers=6
 max_soldiers=2
 prefer_heroes=false
-occupied_string=_Your soldiers have occupied your Sentry
-aggressor_string=_Your Sentry discovered an aggressor.
-attack_string=_Your Sentry is under attack.
-defeated_enemy_string=_The enemy defeated your soldiers at the Sentry
-defeated_you_string=_Your soldiers defeated the enemy at the Sentry
+occupied_string=_Your soldiers have occupied your sentry.
+aggressor_string=_Your sentry discovered an aggressor.
+attack_string=_Your sentry is under attack.
+defeated_enemy_string=_The enemy defeated your soldiers at the sentry.
+defeated_you_string=_Your soldiers defeated the enemy at the sentry.
 
 [buildcost]
 blackwood=2

=== 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 @@
 max_soldiers=1
 enhancement=sentry
 prefer_heroes=false
-occupied_string=_Your soldiers have occupied your Barracks
-aggressor_string=_Your Barracks discovered an aggressor.
-attack_string=_Your Barracks is under attack.
-defeated_enemy_string=_The enemy defeated your soldiers at the Barracks
-defeated_you_string=_Your soldiers defeated the enemy at the Barracks
+occupied_string=_Your soldiers have occupied your barracks.
+aggressor_string=_Your barracks discovered an aggressor.
+attack_string=_Your barracks is under attack.
+defeated_enemy_string=_The enemy defeated your soldiers at the barracks.
+defeated_you_string=_Your soldiers defeated the enemy at the barracks.
 
 
 [buildcost]

=== 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 @@
 conquers=8
 enhanced_building=yes
 prefer_heroes=true
-occupied_string=_Your soldiers have occupied your Barrier
-aggressor_string=_Your Barrier discovered an aggressor.
-attack_string=_Your Barrier is under attack.
-defeated_enemy_string=_The enemy defeated your soldiers at the Barrier
-defeated_you_string=_Your soldiers defeated the enemy at the Barrier
+occupied_string=_Your soldiers have occupied your barrier.
+aggressor_string=_Your barrier discovered an aggressor.
+attack_string=_Your barrier is under attack.
+defeated_enemy_string=_The enemy defeated your soldiers at the barrier.
+defeated_you_string=_Your soldiers defeated the enemy at the barrier.
 
 
 [buildcost]

=== 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 @@
 conquers=12
 enhanced_building=yes
 prefer_heroes=true
-occupied_string=_Your soldiers have occupied your Castle
-aggressor_string=_Your Castle discovered an aggressor.
-attack_string=_Your Castle is under attack.
-defeated_enemy_string=_The enemy defeated your soldiers at the Castle
-defeated_you_string=_Your soldiers defeated the enemy at the Castle
+occupied_string=_Your soldiers have occupied your castle.
+aggressor_string=_Your castle discovered an aggressor.
+attack_string=_Your castle is under attack.
+defeated_enemy_string=_The enemy defeated your soldiers at the castle.
+defeated_you_string=_Your soldiers defeated the enemy at the castle.
 
 
 [enhancement_cost]

=== 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 @@
-help=_Helps to carry items along busy roads.
+help=_Donkeys help to carry items along busy roads. They are reared in a donkey farm.
 default_target_quantity=5
 ware_hotspot=-2 8
 

=== 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 @@
 conquers=11
 enhancement=castle
 prefer_heroes=true
-occupied_string=_Your soldiers have occupied your Fortress
-aggressor_string=_Your Fortress discovered an aggressor.
-attack_string=_Your Fortress is under attack.
-defeated_enemy_string=_The enemy defeated your soldiers at the Fortress
-defeated_you_string=_Your soldiers defeated the enemy at the Fortress
+occupied_string=_Your soldiers have occupied your fortress.
+aggressor_string=_Your fortress discovered an aggressor.
+attack_string=_Your fortress is under attack.
+defeated_enemy_string=_The enemy defeated your soldiers at the fortress.
+defeated_you_string=_Your soldiers defeated the enemy at the fortress.
 
 
 [buildcost]

=== 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 @@
 conquers=7
 enhancement=barrier
 prefer_heroes=false
-occupied_string=_Your soldiers have occupied your Outpost
-aggressor_string=_Your Outpost discovered an aggressor.
-attack_string=_Your Outpost is under attack.
-defeated_enemy_string=_The enemy defeated your soldiers at the Outpost
-defeated_you_string=_Your soldiers defeated the enemy at the Outpost
+occupied_string=_Your soldiers have occupied your outpost.
+aggressor_string=_Your outpost discovered an aggressor.
+attack_string=_Your outpost is under attack.
+defeated_enemy_string=_The enemy defeated your soldiers at the outpost.
+defeated_you_string=_Your soldiers defeated the enemy at the outpost.
 
 
 [buildcost]

=== 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 @@
 max_soldiers=2
 enhanced_building=yes
 prefer_heroes=false
-occupied_string=_Your soldiers have occupied your Sentry
-aggressor_string=_Your Sentry discovered an aggressor.
-attack_string=_Your Sentry is under attack.
-defeated_enemy_string=_The enemy defeated your soldiers at the Sentry
-defeated_you_string=_Your soldiers defeated the enemy at the Sentry
+occupied_string=_Your soldiers have occupied your sentry.
+aggressor_string=_Your sentry discovered an aggressor.
+attack_string=_Your sentry is under attack.
+defeated_enemy_string=_The enemy defeated your soldiers at the sentry.
+defeated_you_string=_Your soldiers defeated the enemy at the sentry.
 
 
 [buildcost]

=== 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 @@
 conquers=9
 vision_range=19
 prefer_heroes=true
-occupied_string=_Your soldiers have occupied your Tower
-aggressor_string=_Your Tower discovered an aggressor.
-attack_string=_Your Tower is under attack.
-defeated_enemy_string=_The enemy defeated your soldiers at the Tower
-defeated_you_string=_Your soldiers defeated the enemy at the Tower
+occupied_string=_Your soldiers have occupied your tower.
+aggressor_string=_Your tower discovered an aggressor.
+attack_string=_Your tower is under attack.
+defeated_enemy_string=_The enemy defeated your soldiers at the tower.
+defeated_you_string=_Your soldiers defeated the enemy at the tower.
 
 
 [buildcost]