widelands-dev team mailing list archive
-
widelands-dev team
-
Mailing list archive
-
Message #02473
[Merge] lp:~widelands-dev/widelands/bug-1345663 into lp:widelands
GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1345663 into lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1345663 in widelands: "format_help.lua has no Textdomain"
https://bugs.launchpad.net/widelands/+bug/1345663
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1345663/+merge/228284
Moved format_help.lua into tribes/scripting and added messages to all 3 tribes' textdomains.
Ran into issues with creating a new textdomain and it's not that big anyway, so there shouldn't be too much Launchpad clicking involved.
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1345663/+merge/228284
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1345663 into lp:widelands.
=== modified file 'tribes/atlanteans/armorsmithy/help.lua'
--- tribes/atlanteans/armorsmithy/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/atlanteans/armorsmithy/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Atlantean Armor Smithy
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_atlanteans")
=== modified file 'tribes/atlanteans/bakery/help.lua'
--- tribes/atlanteans/bakery/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/atlanteans/bakery/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Atlantean Bakery
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_atlanteans")
=== modified file 'tribes/atlanteans/blackroot_farm/help.lua'
--- tribes/atlanteans/blackroot_farm/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/atlanteans/blackroot_farm/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Atlantean Blackroot Farm
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_atlanteans")
=== modified file 'tribes/atlanteans/burners_house/help.lua'
--- tribes/atlanteans/burners_house/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/atlanteans/burners_house/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Atlantean Charcoal Burner's House
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_atlanteans")
=== modified file 'tribes/atlanteans/castle/help.lua'
--- tribes/atlanteans/castle/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/atlanteans/castle/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Atlantean Castle
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_atlanteans")
=== modified file 'tribes/atlanteans/coalmine/help.lua'
--- tribes/atlanteans/coalmine/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/atlanteans/coalmine/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Atlantean Coal Mine
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_atlanteans")
=== modified file 'tribes/atlanteans/crystalmine/help.lua'
--- tribes/atlanteans/crystalmine/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/atlanteans/crystalmine/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Atlantean Crystal Mine
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_atlanteans")
=== modified file 'tribes/atlanteans/dungeon/help.lua'
--- tribes/atlanteans/dungeon/help.lua 2014-07-20 19:29:03 +0000
+++ tribes/atlanteans/dungeon/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Atlantean Dungeon
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_atlanteans")
=== modified file 'tribes/atlanteans/farm/help.lua'
--- tribes/atlanteans/farm/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/atlanteans/farm/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Atlantean Farm
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_atlanteans")
=== modified file 'tribes/atlanteans/fish_breeders_house/help.lua'
--- tribes/atlanteans/fish_breeders_house/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/atlanteans/fish_breeders_house/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Atlantean Fish Breeder's House
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_atlanteans")
=== modified file 'tribes/atlanteans/fishers_house/help.lua'
--- tribes/atlanteans/fishers_house/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/atlanteans/fishers_house/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Atlantean Fisher's House
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_atlanteans")
=== modified file 'tribes/atlanteans/foresters_house/help.lua'
--- tribes/atlanteans/foresters_house/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/atlanteans/foresters_house/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Imperial Atlantean's House
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_atlanteans")
=== modified file 'tribes/atlanteans/gold-spinning-mill/help.lua'
--- tribes/atlanteans/gold-spinning-mill/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/atlanteans/gold-spinning-mill/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Atlantean Goldweaver
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_atlanteans")
=== modified file 'tribes/atlanteans/goldmine/help.lua'
--- tribes/atlanteans/goldmine/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/atlanteans/goldmine/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Atlantean Gold Mine
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_atlanteans")
=== modified file 'tribes/atlanteans/guardhall/help.lua'
--- tribes/atlanteans/guardhall/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/atlanteans/guardhall/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Atlantean Guardhall
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_atlanteans")
=== modified file 'tribes/atlanteans/guardhouse/help.lua'
--- tribes/atlanteans/guardhouse/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/atlanteans/guardhouse/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Atlantean Guardhouse
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_atlanteans")
=== modified file 'tribes/atlanteans/headquarters/help.lua'
--- tribes/atlanteans/headquarters/help.lua 2014-07-23 16:01:30 +0000
+++ tribes/atlanteans/headquarters/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Atlantean Headquarters
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_atlanteans")
=== modified file 'tribes/atlanteans/high_tower/help.lua'
--- tribes/atlanteans/high_tower/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/atlanteans/high_tower/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Atlantean High Tower
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_atlanteans")
=== modified file 'tribes/atlanteans/horsefarm/help.lua'
--- tribes/atlanteans/horsefarm/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/atlanteans/horsefarm/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Atlantean Horse Farm
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_atlanteans")
=== modified file 'tribes/atlanteans/hunters_house/help.lua'
--- tribes/atlanteans/hunters_house/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/atlanteans/hunters_house/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Atlantean Hunter's House
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_atlanteans")
=== modified file 'tribes/atlanteans/ironmine/help.lua'
--- tribes/atlanteans/ironmine/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/atlanteans/ironmine/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Atlantean Iron Ore Mine
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_atlanteans")
=== modified file 'tribes/atlanteans/labyrinth/help.lua'
--- tribes/atlanteans/labyrinth/help.lua 2014-07-20 19:29:03 +0000
+++ tribes/atlanteans/labyrinth/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Atlantean Labyrinth
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_atlanteans")
=== modified file 'tribes/atlanteans/mill/help.lua'
--- tribes/atlanteans/mill/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/atlanteans/mill/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Atlantean Mill
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_atlanteans")
=== modified file 'tribes/atlanteans/port/help.lua'
--- tribes/atlanteans/port/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/atlanteans/port/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Atlantean Port
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_atlanteans")
=== modified file 'tribes/atlanteans/quarry/help.lua'
--- tribes/atlanteans/quarry/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/atlanteans/quarry/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Atlantean Quarry
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_atlanteans")
=== modified file 'tribes/atlanteans/sawmill/help.lua'
--- tribes/atlanteans/sawmill/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/atlanteans/sawmill/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Atlantean Sawmill
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_atlanteans")
=== modified file 'tribes/atlanteans/scouts_house/help.lua'
--- tribes/atlanteans/scouts_house/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/atlanteans/scouts_house/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Atlantean Scout's House
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_atlanteans")
=== modified file 'tribes/atlanteans/shipyard/help.lua'
--- tribes/atlanteans/shipyard/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/atlanteans/shipyard/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Atlantean Ship Yard
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_atlanteans")
=== modified file 'tribes/atlanteans/small_tower/help.lua'
--- tribes/atlanteans/small_tower/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/atlanteans/small_tower/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Atlantean Small Tower
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_atlanteans")
=== modified file 'tribes/atlanteans/smelting_works/help.lua'
--- tribes/atlanteans/smelting_works/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/atlanteans/smelting_works/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Atlantean Smelting Works
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_atlanteans")
=== modified file 'tribes/atlanteans/smokery/help.lua'
--- tribes/atlanteans/smokery/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/atlanteans/smokery/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Atlantean Smokery
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_atlanteans")
=== modified file 'tribes/atlanteans/spiderfarm/help.lua'
--- tribes/atlanteans/spiderfarm/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/atlanteans/spiderfarm/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Atlantean Spider Farm
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_atlanteans")
=== modified file 'tribes/atlanteans/toolsmithy/help.lua'
--- tribes/atlanteans/toolsmithy/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/atlanteans/toolsmithy/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Atlantean Toolsmithy
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_atlanteans")
=== modified file 'tribes/atlanteans/tower/help.lua'
--- tribes/atlanteans/tower/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/atlanteans/tower/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Atlantean Tower
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_atlanteans")
=== modified file 'tribes/atlanteans/warehouse/help.lua'
--- tribes/atlanteans/warehouse/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/atlanteans/warehouse/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Atlantean Warehouse
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_atlanteans")
=== modified file 'tribes/atlanteans/weaponsmithy/help.lua'
--- tribes/atlanteans/weaponsmithy/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/atlanteans/weaponsmithy/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Atlantean Weapon Smithy
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_atlanteans")
=== modified file 'tribes/atlanteans/weaving-mill/help.lua'
--- tribes/atlanteans/weaving-mill/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/atlanteans/weaving-mill/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Atlantean Weaving Mill
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_atlanteans")
=== modified file 'tribes/atlanteans/well/help.lua'
--- tribes/atlanteans/well/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/atlanteans/well/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Atlantean Well
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_atlanteans")
=== modified file 'tribes/atlanteans/woodcutters_house/help.lua'
--- tribes/atlanteans/woodcutters_house/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/atlanteans/woodcutters_house/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Atlantean Lumberjack's House
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_atlanteans")
=== modified file 'tribes/barbarians/axfactory/help.lua'
--- tribes/barbarians/axfactory/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/barbarians/axfactory/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Barbarian Axfactory
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_barbarians")
=== modified file 'tribes/barbarians/bakery/help.lua'
--- tribes/barbarians/bakery/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/barbarians/bakery/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Barbarian Bakery
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_barbarians")
=== modified file 'tribes/barbarians/battlearena/help.lua'
--- tribes/barbarians/battlearena/help.lua 2014-07-20 19:29:03 +0000
+++ tribes/barbarians/battlearena/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Barbarian Battle Arena"
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_barbarians")
=== modified file 'tribes/barbarians/big_inn/help.lua'
--- tribes/barbarians/big_inn/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/barbarians/big_inn/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- "The Barbarian Big Inn"
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_barbarians")
=== modified file 'tribes/barbarians/brewery/help.lua'
--- tribes/barbarians/brewery/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/barbarians/brewery/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Barbarian Brewery
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_barbarians")
=== modified file 'tribes/barbarians/burners_house/help.lua'
--- tribes/barbarians/burners_house/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/barbarians/burners_house/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Barbarian Charcoal Burner's House
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_barbarians")
=== modified file 'tribes/barbarians/cattlefarm/help.lua'
--- tribes/barbarians/cattlefarm/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/barbarians/cattlefarm/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Barbarian Cattle Farm
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_barbarians")
=== modified file 'tribes/barbarians/citadel/help.lua'
--- tribes/barbarians/citadel/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/barbarians/citadel/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Barbarian Citadel
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_barbarians")
=== modified file 'tribes/barbarians/coalmine/help.lua'
--- tribes/barbarians/coalmine/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/barbarians/coalmine/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Barbarian Coal Mine
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_barbarians")
=== modified file 'tribes/barbarians/deep_coalmine/help.lua'
--- tribes/barbarians/deep_coalmine/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/barbarians/deep_coalmine/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Barbarian Deep Coal Mine
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_barbarians")
=== modified file 'tribes/barbarians/deep_goldmine/help.lua'
--- tribes/barbarians/deep_goldmine/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/barbarians/deep_goldmine/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Barbarian Deep Gold Mine
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_barbarians")
=== modified file 'tribes/barbarians/deep_oremine/help.lua'
--- tribes/barbarians/deep_oremine/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/barbarians/deep_oremine/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Barbarian Deep Iron Ore Mine
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_barbarians")
=== modified file 'tribes/barbarians/deeper_coalmine/help.lua'
--- tribes/barbarians/deeper_coalmine/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/barbarians/deeper_coalmine/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Barbarian Deep Coal Mine
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_barbarians")
=== modified file 'tribes/barbarians/deeper_goldmine/help.lua'
--- tribes/barbarians/deeper_goldmine/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/barbarians/deeper_goldmine/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Barbarian Deeper Gold Mine
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_barbarians")
=== modified file 'tribes/barbarians/deeper_oremine/help.lua'
--- tribes/barbarians/deeper_oremine/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/barbarians/deeper_oremine/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Barbarian Deeper Iron Ore Mine
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_barbarians")
=== modified file 'tribes/barbarians/donjon/help.lua'
--- tribes/barbarians/donjon/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/barbarians/donjon/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Barbarian Donjon
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_barbarians")
=== modified file 'tribes/barbarians/farm/help.lua'
--- tribes/barbarians/farm/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/barbarians/farm/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Barbarian Farm
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_barbarians")
=== modified file 'tribes/barbarians/fishers_hut/help.lua'
--- tribes/barbarians/fishers_hut/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/barbarians/fishers_hut/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Barbarian Fisher's Hut
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_barbarians")
=== modified file 'tribes/barbarians/fortress/help.lua'
--- tribes/barbarians/fortress/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/barbarians/fortress/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Barbarian Fortress
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_barbarians")
=== modified file 'tribes/barbarians/gamekeepers_hut/help.lua'
--- tribes/barbarians/gamekeepers_hut/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/barbarians/gamekeepers_hut/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Barbarian Gamekeeper's Hut
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_barbarians")
=== modified file 'tribes/barbarians/goldmine/help.lua'
--- tribes/barbarians/goldmine/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/barbarians/goldmine/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- "The Barbarian Gold Mine"
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_barbarians")
=== modified file 'tribes/barbarians/granitemine/help.lua'
--- tribes/barbarians/granitemine/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/barbarians/granitemine/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Barbarian Granite Mine
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_barbarians")
=== modified file 'tribes/barbarians/hardener/help.lua'
--- tribes/barbarians/hardener/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/barbarians/hardener/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Barbarian Wood Hardener
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_barbarians")
=== modified file 'tribes/barbarians/headquarters/help.lua'
--- tribes/barbarians/headquarters/help.lua 2014-07-23 16:01:30 +0000
+++ tribes/barbarians/headquarters/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Barbarian Headquarters
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_barbarians")
=== modified file 'tribes/barbarians/headquarters_interim/help.lua'
--- tribes/barbarians/headquarters_interim/help.lua 2014-07-23 16:01:30 +0000
+++ tribes/barbarians/headquarters_interim/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Barbarian Interim Headquarters
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_barbarians")
=== modified file 'tribes/barbarians/helmsmithy/help.lua'
--- tribes/barbarians/helmsmithy/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/barbarians/helmsmithy/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Barbarian Helm Smithy
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_barbarians")
=== modified file 'tribes/barbarians/hunters_hut/help.lua'
--- tribes/barbarians/hunters_hut/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/barbarians/hunters_hut/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Barbarian Hunter's Hut
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_barbarians")
=== modified file 'tribes/barbarians/inn/help.lua'
--- tribes/barbarians/inn/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/barbarians/inn/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Barbarian Inn
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_barbarians")
=== modified file 'tribes/barbarians/lime_kiln/help.lua'
--- tribes/barbarians/lime_kiln/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/barbarians/lime_kiln/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Barbarian Lime Kiln
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_barbarians")
=== modified file 'tribes/barbarians/lumberjacks_hut/help.lua'
--- tribes/barbarians/lumberjacks_hut/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/barbarians/lumberjacks_hut/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Barbarian Lumberjack's Hut
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_barbarians")
=== modified file 'tribes/barbarians/metalworks/help.lua'
--- tribes/barbarians/metalworks/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/barbarians/metalworks/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Barbarian Metal Workshop
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_barbarians")
=== modified file 'tribes/barbarians/micro-brewery/help.lua'
--- tribes/barbarians/micro-brewery/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/barbarians/micro-brewery/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Barbarian Micro Brewery
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_barbarians")
=== modified file 'tribes/barbarians/oremine/help.lua'
--- tribes/barbarians/oremine/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/barbarians/oremine/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Barbarian Iron Ore Mine
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_barbarians")
=== modified file 'tribes/barbarians/port/help.lua'
--- tribes/barbarians/port/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/barbarians/port/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Barbarian Port
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_barbarians")
=== modified file 'tribes/barbarians/quarry/help.lua'
--- tribes/barbarians/quarry/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/barbarians/quarry/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Barbarian Quarry
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_barbarians")
=== modified file 'tribes/barbarians/rangers_hut/help.lua'
--- tribes/barbarians/rangers_hut/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/barbarians/rangers_hut/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Barbarian Ranger's Hut
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_barbarians")
=== modified file 'tribes/barbarians/reed_yard/help.lua'
--- tribes/barbarians/reed_yard/help.lua 2014-07-23 16:01:30 +0000
+++ tribes/barbarians/reed_yard/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Barbarian Reed Yard
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_barbarians")
=== modified file 'tribes/barbarians/scouts_hut/help.lua'
--- tribes/barbarians/scouts_hut/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/barbarians/scouts_hut/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Barbarian Scout's Hut
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_barbarians")
=== modified file 'tribes/barbarians/sentry/help.lua'
--- tribes/barbarians/sentry/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/barbarians/sentry/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Barbarian Sentry
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_barbarians")
=== modified file 'tribes/barbarians/shipyard/help.lua'
--- tribes/barbarians/shipyard/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/barbarians/shipyard/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Barbarian Ship Yard
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_barbarians")
=== modified file 'tribes/barbarians/smelting_works/help.lua'
--- tribes/barbarians/smelting_works/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/barbarians/smelting_works/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Barbarian Smelting Works
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_barbarians")
=== modified file 'tribes/barbarians/tavern/help.lua'
--- tribes/barbarians/tavern/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/barbarians/tavern/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Barbarian Tavern
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_barbarians")
=== modified file 'tribes/barbarians/trainingcamp/help.lua'
--- tribes/barbarians/trainingcamp/help.lua 2014-07-20 19:29:03 +0000
+++ tribes/barbarians/trainingcamp/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Barbarian Training Camp
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_barbarians")
=== modified file 'tribes/barbarians/warehouse/help.lua'
--- tribes/barbarians/warehouse/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/barbarians/warehouse/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Barbarian Warehouse
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_barbarians")
=== modified file 'tribes/barbarians/warmill/help.lua'
--- tribes/barbarians/warmill/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/barbarians/warmill/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Barbarian War Mill
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_barbarians")
=== modified file 'tribes/barbarians/weaving-mill/help.lua'
--- tribes/barbarians/weaving-mill/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/barbarians/weaving-mill/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Barbarian Weaving Mill
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_barbarians")
=== modified file 'tribes/barbarians/well/help.lua'
--- tribes/barbarians/well/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/barbarians/well/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Barbarian Well
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_barbarians")
=== modified file 'tribes/empire/arena/help.lua'
--- tribes/empire/arena/help.lua 2014-07-20 19:29:03 +0000
+++ tribes/empire/arena/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Imperial Arena
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_empire")
=== modified file 'tribes/empire/armorsmithy/help.lua'
--- tribes/empire/armorsmithy/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/empire/armorsmithy/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Imperial Armor Smithy
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_empire")
=== modified file 'tribes/empire/bakery/help.lua'
--- tribes/empire/bakery/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/empire/bakery/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Imperial Bakery
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_empire")
=== modified file 'tribes/empire/barracks/help.lua'
--- tribes/empire/barracks/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/empire/barracks/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Imperial Barracks
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_empire")
=== modified file 'tribes/empire/barrier/help.lua'
--- tribes/empire/barrier/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/empire/barrier/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Imperial Barrier
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_empire")
=== modified file 'tribes/empire/brewery/help.lua'
--- tribes/empire/brewery/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/empire/brewery/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Imperial Brewery
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_empire")
=== modified file 'tribes/empire/burners_house/help.lua'
--- tribes/empire/burners_house/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/empire/burners_house/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Imperial Charcoal Burner's House
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_empire")
=== modified file 'tribes/empire/castle/help.lua'
--- tribes/empire/castle/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/empire/castle/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Imperial Castle
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_empire")
=== modified file 'tribes/empire/coalmine/help.lua'
--- tribes/empire/coalmine/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/empire/coalmine/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Imperial Coal Mine
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_empire")
=== modified file 'tribes/empire/colosseum/help.lua'
--- tribes/empire/colosseum/help.lua 2014-07-20 19:29:03 +0000
+++ tribes/empire/colosseum/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Imperial Colosseum
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_empire")
=== modified file 'tribes/empire/deep_coalmine/help.lua'
--- tribes/empire/deep_coalmine/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/empire/deep_coalmine/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Imperial Deep Coal Mine
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_empire")
=== modified file 'tribes/empire/deep_goldmine/help.lua'
--- tribes/empire/deep_goldmine/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/empire/deep_goldmine/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Imperial Deep Gold Mine
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_empire")
=== modified file 'tribes/empire/deep_marblemine/help.lua'
--- tribes/empire/deep_marblemine/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/empire/deep_marblemine/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Imperial Deep Marble Mine
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_empire")
=== modified file 'tribes/empire/deep_oremine/help.lua'
--- tribes/empire/deep_oremine/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/empire/deep_oremine/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Imperial Deep Iron Ore Mine
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_empire")
=== modified file 'tribes/empire/donkeyfarm/help.lua'
--- tribes/empire/donkeyfarm/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/empire/donkeyfarm/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Imperial Donkey Farm
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_empire")
=== modified file 'tribes/empire/farm/help.lua'
--- tribes/empire/farm/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/empire/farm/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Imperial Farm
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_empire")
=== modified file 'tribes/empire/fishers_house/help.lua'
--- tribes/empire/fishers_house/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/empire/fishers_house/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Imperial Fisher's House
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_empire")
=== modified file 'tribes/empire/foresters_house/help.lua'
--- tribes/empire/foresters_house/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/empire/foresters_house/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Imperial Forester's House
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_empire")
=== modified file 'tribes/empire/fortress/help.lua'
--- tribes/empire/fortress/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/empire/fortress/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Imperial Fortress
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_empire")
=== modified file 'tribes/empire/goldmine/help.lua'
--- tribes/empire/goldmine/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/empire/goldmine/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Imperial Gold Mine
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_empire")
=== modified file 'tribes/empire/headquarters/help.lua'
--- tribes/empire/headquarters/help.lua 2014-07-23 16:01:30 +0000
+++ tribes/empire/headquarters/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Imperial Headquarters
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_empire")
=== modified file 'tribes/empire/headquarters_shipwreck/help.lua'
--- tribes/empire/headquarters_shipwreck/help.lua 2014-07-23 16:01:30 +0000
+++ tribes/empire/headquarters_shipwreck/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Imperial Headquarters Shipwreck
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_empire")
=== modified file 'tribes/empire/hunters_house/help.lua'
--- tribes/empire/hunters_house/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/empire/hunters_house/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Imperial Hunter's House
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_empire")
=== modified file 'tribes/empire/inn/help.lua'
--- tribes/empire/inn/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/empire/inn/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Imperial Inn
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_empire")
=== modified file 'tribes/empire/lumberjacks_house/help.lua'
--- tribes/empire/lumberjacks_house/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/empire/lumberjacks_house/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Imperial Lumberjack's House
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_empire")
=== modified file 'tribes/empire/marblemine/help.lua'
--- tribes/empire/marblemine/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/empire/marblemine/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Imperial Marble Mine
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_empire")
=== modified file 'tribes/empire/mill/help.lua'
--- tribes/empire/mill/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/empire/mill/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Imperial Mill
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_empire")
=== modified file 'tribes/empire/oremine/help.lua'
--- tribes/empire/oremine/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/empire/oremine/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Imperial Iron Ore Mine
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_empire")
=== modified file 'tribes/empire/outpost/help.lua'
--- tribes/empire/outpost/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/empire/outpost/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Imperial Outpost
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_empire")
=== modified file 'tribes/empire/piggery/help.lua'
--- tribes/empire/piggery/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/empire/piggery/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Imperial Piggery
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_empire")
=== modified file 'tribes/empire/port/help.lua'
--- tribes/empire/port/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/empire/port/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Imperial Port
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_empire")
=== modified file 'tribes/empire/quarry/help.lua'
--- tribes/empire/quarry/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/empire/quarry/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Imperial Quarry
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_empire")
=== modified file 'tribes/empire/sawmill/help.lua'
--- tribes/empire/sawmill/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/empire/sawmill/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Imperial Sawmill
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_empire")
=== modified file 'tribes/empire/scouts_house/help.lua'
--- tribes/empire/scouts_house/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/empire/scouts_house/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Imperial Scout's House
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_empire")
=== modified file 'tribes/empire/sentry/help.lua'
--- tribes/empire/sentry/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/empire/sentry/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Imperial Sentry
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_empire")
=== modified file 'tribes/empire/sheepfarm/help.lua'
--- tribes/empire/sheepfarm/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/empire/sheepfarm/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Imperial Sheepfarm
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_empire")
=== modified file 'tribes/empire/shipyard/help.lua'
--- tribes/empire/shipyard/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/empire/shipyard/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Imperial Ship Yard
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_empire")
=== modified file 'tribes/empire/smelting_works/help.lua'
--- tribes/empire/smelting_works/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/empire/smelting_works/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Imperial Smelting Works
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_empire")
=== modified file 'tribes/empire/stonemasons_house/help.lua'
--- tribes/empire/stonemasons_house/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/empire/stonemasons_house/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Imperial Stonemason's House
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_empire")
=== modified file 'tribes/empire/tavern/help.lua'
--- tribes/empire/tavern/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/empire/tavern/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Imperial Tavern
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_empire")
=== modified file 'tribes/empire/toolsmithy/help.lua'
--- tribes/empire/toolsmithy/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/empire/toolsmithy/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Imperial Toolsmithy
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_empire")
=== modified file 'tribes/empire/tower/help.lua'
--- tribes/empire/tower/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/empire/tower/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Imperial Tower
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_empire")
=== modified file 'tribes/empire/trainingcamp/help.lua'
--- tribes/empire/trainingcamp/help.lua 2014-07-20 19:29:03 +0000
+++ tribes/empire/trainingcamp/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Imperial Training Camp
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_empire")
=== modified file 'tribes/empire/vineyard/help.lua'
--- tribes/empire/vineyard/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/empire/vineyard/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Imperial Vineyard
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_empire")
=== modified file 'tribes/empire/warehouse/help.lua'
--- tribes/empire/warehouse/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/empire/warehouse/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Imperial Warehouse
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_empire")
=== modified file 'tribes/empire/weaponsmithy/help.lua'
--- tribes/empire/weaponsmithy/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/empire/weaponsmithy/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Imperial Weapon Smithy
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_empire")
=== modified file 'tribes/empire/weaving-mill/help.lua'
--- tribes/empire/weaving-mill/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/empire/weaving-mill/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Imperial Weaving Mill
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_empire")
=== modified file 'tribes/empire/well/help.lua'
--- tribes/empire/well/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/empire/well/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Imperial Well
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_empire")
=== modified file 'tribes/empire/winery/help.lua'
--- tribes/empire/winery/help.lua 2014-07-20 15:19:51 +0000
+++ tribes/empire/winery/help.lua 2014-07-25 12:23:49 +0000
@@ -1,7 +1,7 @@
-- The Imperial Winery
include "scripting/formatting.lua"
-include "scripting/format_help.lua"
+include "tribes/scripting/format_help.lua"
set_textdomain("tribe_empire")
=== added directory 'tribes/scripting'
=== renamed file 'scripting/format_help.lua' => 'tribes/scripting/format_help.lua'
--- scripting/format_help.lua 2014-07-23 13:36:49 +0000
+++ tribes/scripting/format_help.lua 2014-07-25 12:23:49 +0000
@@ -1,6 +1,7 @@
--- TODO(GunChleoc) Textdomain?
-- TODO(GunChleoc): get resi_00.png from C++
+set_textdomain("tribes")
+
-- =======================================================
-- *************** Basic helper functions ****************
-- =======================================================
=== modified file 'utils/buildcat.py'
--- utils/buildcat.py 2014-06-11 05:26:38 +0000
+++ utils/buildcat.py 2014-07-25 12:23:49 +0000
@@ -55,6 +55,9 @@
"../../world/*/*/*/*/*.lua",
"../../world/*/*/*/*/*/*.lua",
]),
+ ("tribes/tribes", [
+ "../../tribes/scripting/*.lua",
+ ]),
]
@@ -85,11 +88,30 @@
("mp_scenario_%(name)s/mp_scenario_%(name)s", "maps/MP Scenarios/",
[ "../../maps/MP Scenarios/%(name)s/scripting/*.lua", ]
),
- ("tribe_%(name)s/tribe_%(name)s", "tribes/",
- ["../../tribes/%(name)s/conf",
- "../../tribes/%(name)s/*/conf",
- "../../tribes/%(name)s/scripting/*.lua",
- "../../tribes/%(name)s/*/help.lua",
+ ("tribe_atlanteans/tribe_atlanteans", "tribes/",
+ ["../../tribes/atlanteans/conf",
+ "../../tribes/atlanteans/*/conf",
+ "../../tribes/atlanteans/scripting/*.lua",
+ "../../tribes/atlanteans/*/help.lua",
+ "../../tribes/scripting/*.lua",
+ "../../global/militarysites/*/conf"
+ ]
+ ),
+ ("tribe_barbarians/tribe_barbarians", "tribes/",
+ ["../../tribes/barbarians/conf",
+ "../../tribes/barbarians/*/conf",
+ "../../tribes/barbarians/scripting/*.lua",
+ "../../tribes/barbarians/*/help.lua",
+ "../../tribes/scripting/*.lua",
+ "../../global/militarysites/*/conf"
+ ]
+ ),
+ ("tribe_empire/tribe_empire", "tribes/",
+ ["../../tribes/empire/conf",
+ "../../tribes/empire/*/conf",
+ "../../tribes/empire/scripting/*.lua",
+ "../../tribes/empire/*/help.lua",
+ "../../tribes/scripting/*.lua",
"../../global/militarysites/*/conf"
]
),
Follow ups
