widelands-dev team mailing list archive

[GunChleoc <fios@xxxxxxxxxxxxxxxxxxx>]

GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1341079 into lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #1341079 in widelands: "Building help: get image filenames from C++"
  https://bugs.launchpad.net/widelands/+bug/1341079

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1341079/+merge/227441

Building help now gets the image filenames for buildings, workers and wares from C++
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1341079/+merge/227441
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1341079 into lp:widelands.

=== modified file 'scripting/format_help.lua'
--- scripting/format_help.lua	2014-07-17 09:42:13 +0000
+++ scripting/format_help.lua	2014-07-20 17:56:19 +0000
@@ -1,5 +1,5 @@
--- TODO Textdomain?
--- TODO: get images from C++, e.g. menu.png, resi_00.png for the small image, first idle picture for the big header images. soldiers, tools, wares etc.
+-- TODO(GunChleoc) Textdomain?
+-- TODO(GunChleoc): get images from C++, e.g. menu.png, resi_00.png for the small image, first idle picture for the big header images. soldiers, tools, wares etc.
 
 --  =======================================================
 --  *************** Basic helper functions ****************
@@ -100,40 +100,41 @@
 --
 --    Creates a dependencies line of any length.
 --
---    :arg tribename: name of the tribe.
---    :arg items: ware and/or building names in the correct order from left to right as table (set in {}).
+--    :arg items: ware, worker and/or building descriptions in the correct order
+--                from left to right as table (set in {}).
 --    :arg text: comment of the image.
 --    :returns: a row of pictures connected by arrows.
 --
-function dependencies(tribename, items, text)
+function dependencies(items, text)
 	if not text then
 		text = ""
 	end
-	string = "image=tribes/" .. tribename .. "/" .. items[1]  .. "/menu.png"
+	string = "image=" .. items[1].icon_name
 	for k,v in ipairs({table.unpack(items,2)}) do
-		string = string .. ";pics/arrow-right.png;" ..  "tribes/" .. tribename .. "/" .. v  .. "/menu.png"
+		string = string .. ";pics/arrow-right.png;" ..  v.icon_name
 	end
 	return rt(string, p(text))
 end
 
 
 -- RST
--- .. function:: dependencies_resi(tribename, items[, text = nil])
+-- .. function:: dependencies_resi(tribename, resource, items[, text = nil])
 --
 --    Creates a dependencies line of any length for resources (that don't have menu.png files).
 --
 --    :arg tribename: name of the tribe.
---    :arg items: resource names in the correct order from left to right as table (set in {}).
+--    :arg resource: name of the geological resource.
+--    :arg items: ware/building descriptions in the correct order from left to right as table (set in {}).
 --    :arg text: comment of the image.
 --    :returns: a row of pictures connected by arrows.
 --
-function dependencies_resi(tribename, items, text)
+function dependencies_resi(tribename, resource, items, text)
 	if not text then
 		text = ""
 	end
-	string = "image=tribes/" .. tribename .. "/" .. items[1]  .. "/resi_00.png"
-	for k,v in ipairs({table.unpack(items,2)}) do
-		string = string .. ";pics/arrow-right.png;" ..  "tribes/" .. tribename .. "/" .. v  .. "/menu.png"
+	string = "image=tribes/" .. tribename .. "/" .. resource  .. "/resi_00.png"
+	for k,v in ipairs({table.unpack(items)}) do
+		string = string .. ";pics/arrow-right.png;" ..  v.icon_name
 	end
 	return rt(string, p(text))
 end
@@ -144,75 +145,6 @@
 --  =======================================================
 
 -- RST
--- .. function:: building_help_depencencies_ware(tribename, items, ware)
---
---    Formats a chain of ware dependencies for the help window
---
---    :arg tribename: e.g. "barbarians".
---    :arg items: an array with ware and building names,
---                            e.g. {"constructionsite", "trunk"}
---    :arg warename: the internal name of the ware to use as a title.
---    :returns: an rt string with images describing a chain of ware/building dependencies
---
-function building_help_dependencies_ware(tribename, items, warename)
-	local ware_description = wl.Game():get_ware_description(tribename, warename)
-	return dependencies(tribename, items, ware_description.descname)
-end
-
-
--- RST
--- .. function:: building_help_depencencies_building(tribename, items, building)
---
---    Formats a chain of ware dependencies for the help window
---
---    :arg tribename: e.g. "barbarians".
---    :arg items: an array with ware and building names,
---                            e.g. {"constructionsite", "trunk"}
---    :arg buildingname: the internal name of the building to use as a title.
---    :returns: an rt string with images describing a chain of ware/building dependencies
---
-function building_help_dependencies_building(tribename, items, buildingname)
-	local building_description = wl.Game():get_building_description(tribename,buildingname)
-	return dependencies(tribename, items, building_description.descname)
-end
-
-
-
--- RST
--- .. function:: building_help_depencencies_building(tribename, items, building)
---
---    Formats a chain of ware dependencies for the help window
---
---    :arg tribename: e.g. "barbarians".
---    :arg items: an array with ware and building names,
---                            e.g. {"constructionsite", "trunk"}
---    :arg ware_description: the description of the ware to use in the title.
---    :arg building: the internal name of the building to use in the title.
---    :returns: an rt string with images describing a chain of ware/building dependencies
---
-function building_help_dependencies_ware_building(tribename, items, ware_description, building_description)
-	return dependencies(tribename, items,
-		_"%1$s from: %2$s":bformat(ware_description.descname, building_description.descname))
-end
-
-
--- RST
--- .. function:: building_help_depencencies_ware(tribename, items, ware)
---
---    Formats a chain of ware dependencies for the help window. First item is a mining resource.
---
---    :arg tribename: e.g. "barbarians".
---    :arg items: an array with ware and building names,
---                            e.g. {"constructionsite", "trunk"}
---    :arg warename: the internal name of the ware to use in the title.
---    :returns: an rt string with images describing a chain of ware/building dependencies
---
-function building_help_dependencies_resi(tribename, items, warename)
-	local ware_description = wl.Game():get_ware_description(tribename, warename)
-	return dependencies_resi(tribename, items, ware_description.descname)
-end
-
--- RST
 -- .. function:: dependencies_training(tribename, building_description, interim1, interim2)
 --
 --    Creates a dependencies line for soldiers in a training site.
@@ -228,11 +160,11 @@
 		rt(h2(_"Dependencies")) .. rt(h3(_"Soldiers:")) ..
 		dependencies_basic({
 			"tribes/" .. tribename .. "/soldier/untrained.png",
-			"tribes/" .. tribename .. "/" .. building_description.name  .. "/menu.png",
+			building_description.icon_name,
 			"tribes/" .. tribename .. "/soldier/" .. interim1 .. ".png"}) ..
 		dependencies_basic({
 			"tribes/" .. tribename .. "/soldier/" .. interim2 .. ".png",
-			"tribes/" .. tribename .. "/" .. building_description.name  .. "/menu.png",
+			building_description.icon_name,
 			"tribes/" .. tribename .. "/soldier/fulltrained.png"})
 end
 
@@ -260,7 +192,7 @@
 			else
 				text = ware_description.descname
 			end
-			images = images .. "tribes/" .. tribename .. "/" .. ware_description.name .. "/menu.png"
+			images = ware_description.icon_name
 		end
 		if(countlist > 1) then
 			text = _"%s and":bformat(text)
@@ -290,7 +222,8 @@
 		if(count > 1) then
 			weaponsstring = weaponsstring .. ";"
 		end
-		weaponsstring = weaponsstring .. "tribes/" .. tribename .. "/" .. weapon .. "/menu.png"
+		local weapon_description = wl.Game():get_ware_description(tribename, weapon)
+		weaponsstring = weaponsstring .. weapon_description.icon_name
 	end
 	-- TRANSLATORS: This is a headline, you can see it in the building help for trainingsites, in the dependencies section
 	local equipmentstring = _"Equipment from"
@@ -300,7 +233,7 @@
 	elseif (and_or == "or" ) then equipmentstring = _"or equipment from" end
 	return rt(p(equipmentstring)) ..
 		dependencies_basic({
-			"tribes/" .. tribename .. "/" .. manufacturer_description.name  .. "/menu.png",
+			manufacturer_description.icon_name,
 			weaponsstring,
 		}, rt(p(manufacturer_description.descname)))
 end
@@ -317,17 +250,36 @@
 --
 --    :arg tribename: e.g. "barbarians".
 --    :arg building_description: The building's building description from C++
---    :arg resourcename: The name of a representative resource that this building produces
 --    :arg purpose: A string explaining the purpose of the building
 --    :arg purpose: A string with a note about the building. Drop this argument if you don't want to add a note.
 --    :returns: rt of the formatted text
 --
-function building_help_general_string(tribename, building_description, resourcename, purpose, note)
+function building_help_general_string(tribename, building_description, purpose, note)
 	-- Need to get the building description again to make sure we have the correct type, e.g. "productionsite"
 	local building_description = wl.Game():get_building_description(tribename, building_description.name)
+
+-- TODO(GunChleoc) "carrier" for headquarters, "ship" for ports, "scout" for scouts_hut, "shipwright" for shipyard?
+-- TODO(GunChleoc) use aihints for gamekeeper, forester?
+	local representative_resource = nil
+	if(building_description.type == "productionsite") then
+		representative_resource = building_description.output_ware_types[1]
+-- TODO(GunChleoc) need a bob_descr for the ship -> port and shipyard
+-- TODO(GunChleoc) create descr objects for flag, portdock, ...
+	elseif(building_description.is_port or building_description.name == "shipyard") then
+		representative_resource = nil
+	elseif(building_description.type == "warehouse") then
+		representative_resource = wl.Game():get_ware_description(tribename, "log")
+	elseif(building_description.type == "militarysite" or building_description.type == "trainingsite") then
+		representative_resource = wl.Game():get_worker_description(tribename, "soldier")
+	end
+
 	local result = rt(h2(_"General"))
-	result = result .. rt(h3(_"Purpose:")) ..
-		image_line("tribes/" .. tribename .. "/" .. resourcename  .. "/menu.png", 1, p(purpose))
+	result = result .. rt(h3(_"Purpose:"))
+	if(representative_resource) then
+		result = result .. image_line(representative_resource.icon_name, 1, p(purpose))
+	else
+		result = result .. rt(p(purpose))
+	end
 	if (note) then	result = result .. rt(h3(_"Note:")) .. rt(p(note)) end
 
 	if(building_description.type == "productionsite") then
@@ -385,7 +337,7 @@
 --
 function building_help_lore_string(tribename, building_description, flavourtext, author)
 	local result = rt(h2(_"Lore")) ..
-		rt("image=tribes/" .. tribename .. "/" .. building_description.name  .. "/" .. building_description.name .. "_i_00.png", p(flavourtext))
+		rt("image=" .. building_description.representative_image, p(flavourtext))
 		if author then
 			result = result .. rt("text-align=right",p("font-size=10 font-style=italic", author))
 		end
@@ -410,8 +362,9 @@
 	for i, ware_description in ipairs(building_description.inputs) do
 	 hasinput = true
 		for j, producer in ipairs(ware_description.producers) do
-			result = result .. building_help_dependencies_ware_building(
-				tribename, {producer.name, ware_description.name}, ware_description, producer
+			result = result .. dependencies(
+				{producer, ware_description},
+				_"%1$s from: %2$s":bformat(ware_description.descname, producer.descname)
 			)
 		end
 	end
@@ -421,50 +374,52 @@
 
 	if ((not hasinput) and building_description.output_ware_types[1]) then
 		result = result .. rt(h3(_"Collects:"))
-		for i, ware in ipairs(building_description.output_ware_types) do
+		for i, ware_description in ipairs(building_description.output_ware_types) do
 			result = result ..
-				building_help_dependencies_ware(tribename, {building_description.name, ware}, ware)
+				dependencies({building_description, ware_description}, ware_description.descname)
 		end
 
-	elseif (building_description.ismine) then
+	elseif (building_description.is_mine) then
 		-- TRANSLATORS: This is a verb (The miner mines)
 		result = result .. rt(h3(_"Mines:"))
-		for i, ware in ipairs(building_description.output_ware_types) do
-			-- Need to hack this because of inconsistency in the naming system.
-			-- Can't rename the files, because geologist won't work.
-			local resi_name = ware
+		for i, ware_description in ipairs(building_description.output_ware_types) do
+
+			-- Need to hack this, because resource != produced ware.
+			local resi_name = ware_description.name
 			if(resi_name == "ironore") then resi_name = "iron"
-			elseif(resi_name == "raw_stone") then resi_name = "granit"
-			elseif(resi_name == "stone") then resi_name = "granit"
-			elseif(resi_name == "diamond") then resi_name = "granit"
-			elseif(resi_name == "quartz") then resi_name = "granit"
-			elseif(resi_name == "marble") then resi_name = "granit"
+			elseif(resi_name == "raw_stone") then resi_name = "granite"
+			elseif(resi_name == "stone") then resi_name = "granite"
+			elseif(resi_name == "diamond") then resi_name = "granite"
+			elseif(resi_name == "quartz") then resi_name = "granite"
+			elseif(resi_name == "marble") then resi_name = "granite"
 			elseif(resi_name == "goldore") then resi_name = "gold" end
-			result = result ..
-				building_help_dependencies_resi(tribename, {"resi_"..resi_name.."2", building_description.name, ware}, ware)
+			result = result .. dependencies_resi(
+				tribename,
+				"resi_"..resi_name.."2",
+				{building_description, ware_description},
+				ware_description.descname
+			)
 		end
 
 	else
-		for i, ware in ipairs(building_description.output_ware_types) do
+		for i, ware_description in ipairs(building_description.output_ware_types) do
 			if(i == 1) then result = result .. rt(h3(_"Produces:")) end
 			result = result ..
-				building_help_dependencies_ware(tribename, {building_description.name, ware}, ware)
+				dependencies({building_description, ware_description}, ware_description.descname)
 		end
 	end
 
 	local outgoing = ""
-	for i, ware in ipairs(building_description.output_ware_types) do
-		local ware_description = wl.Game():get_ware_description(tribename, ware)
-
-		-- constructionsite isn't listed with the consumers, and needs special treatment because it isn't a building
+	for i, ware_description in ipairs(building_description.output_ware_types) do
+		-- constructionsite isn't listed with the consumers, so we need a special switch
 		if (add_constructionsite) then
-			outgoing = outgoing .. dependencies(tribename, {ware, "constructionsite"}, _"Construction Site")
+			local constructionsite_description = wl.Game():get_building_description(tribename, "constructionsite")
+			outgoing = outgoing .. dependencies({ware_description, constructionsite_description},
+															 constructionsite_description.descname)
 		end
 
 		for j, consumer in ipairs(ware_description.consumers) do
-			outgoing = outgoing .. building_help_dependencies_building(
-				tribename, {ware, consumer.name}, consumer.name
-			)
+			outgoing = outgoing .. dependencies({ware_description, consumer}, consumer.descname)
 		end
 
 		-- soldiers aren't listed with the consumers
@@ -472,7 +427,8 @@
 		local addsoldier = false
 		for j, buildcost in ipairs(soldier.buildcost) do
 			if(buildcost == ware) then
-			outgoing = outgoing .. dependencies(tribename, {ware, "headquarters", soldier.name}, soldier.descname)
+			local headquarters_description = wl.Game():get_building_description(tribename, "headquarters")
+			outgoing = outgoing .. dependencies({ware, headquarters_description, soldier}, soldier.descname)
 			end
 		end
 	end
@@ -484,10 +440,9 @@
 
 
 -- Helper function for building_help_building_section
-function building_help_building_line(tribename, ware, amount)
-	local ware_description = wl.Game():get_ware_description(tribename, ware)
+function building_help_building_line(ware_description, amount)
 	amount = tonumber(amount)
-	local image = "tribes/" .. tribename .. "/" .. ware  .. "/menu.png"
+	local image = ware_description.icon_name
 	local result = ""
 	local imgperline = 6
 	local temp_amount = amount
@@ -521,9 +476,9 @@
 	local result = rt(h2(_"Building"))
 
 	-- Space required
-	if (building_description.ismine) then
+	if (building_description.is_mine) then
 		result = result .. text_line(_"Space required:",_"Mine plot","pics/mine.png")
-	elseif (building_description.isport) then
+	elseif (building_description.is_port) then
 		result = result .. text_line(_"Space required:",_"Port plot","pics/port.png")
 	else
 		if (building_description.size == 1) then
@@ -553,7 +508,8 @@
 				result = result .. rt(h3(_"Build cost:"))
 			end
 			for ware, amount in pairs(building_description.build_cost) do
-				result = result .. building_help_building_line(tribename, ware, amount)
+				local ware_description = wl.Game():get_ware_description(tribename, ware)
+				result = result .. building_help_building_line(ware_description, amount)
 			end
 		end
 		if (building_description.enhanced) then
@@ -570,7 +526,8 @@
 			end
 
 			for ware, amount in pairs(building_description.enhancement_cost) do
-				result = result .. building_help_building_line(tribename, ware, amount)
+				local ware_description = wl.Game():get_ware_description(tribename, ware)
+				result = result .. building_help_building_line(ware_description, amount)
 			end
 
 			-- Cumulative cost
@@ -606,7 +563,8 @@
 			end
 			if (warescost ~= {}) then
 				for ware, amount in pairs(warescost) do
-					result = result .. building_help_building_line(tribename, ware, amount)
+					local ware_description = wl.Game():get_ware_description(tribename, ware)
+					result = result .. building_help_building_line(ware_description, amount)
 				end
 			else
 				result = result .. rt(p(_"Unknown"))
@@ -616,7 +574,8 @@
 			if (building_description.buildable) then
 				result = result .. rt(h3(_"If built directly, dismantle yields:"))
 				for ware, amount in pairs(building_description.returned_wares) do
-					result = result .. building_help_building_line(tribename, ware, amount)
+					local ware_description = wl.Game():get_ware_description(tribename, ware)
+					result = result .. building_help_building_line(ware_description, amount)
 				end
 				result = result .. rt(h3(_"If enhanced, dismantle yields:"))
 			else
@@ -652,7 +611,8 @@
 			end
 			if (warescost ~= {}) then
 				for ware, amount in pairs(warescost) do
-					result = result .. building_help_building_line(tribename, ware, amount)
+					local ware_description = wl.Game():get_ware_description(tribename, ware)
+					result = result .. building_help_building_line(ware_description, amount)
 				end
 			else
 				result = result .. rt(p(_"Unknown"))
@@ -662,7 +622,8 @@
 			-- Dismantle yields
 			result = result .. rt(h3(_"Dismantle yields:"))
 			for ware, amount in pairs(building_description.returned_wares) do
-				result = result .. building_help_building_line(tribename, ware, amount)
+				local ware_description = wl.Game():get_ware_description(tribename, ware)
+				result = result .. building_help_building_line(ware_description, amount)
 			end
 		end
 
@@ -670,7 +631,8 @@
 		if (building_description.enhancement) then
 			result = result .. text_line(_"Can be enhanced to:", building_description.enhancement.descname)
 			for ware, amount in pairs(building_description.enhancement.enhancement_cost) do
-				result = result .. building_help_building_line(tribename, ware, amount)
+				local ware_description = wl.Game():get_ware_description(tribename, ware)
+				result = result .. building_help_building_line(ware_description, amount)
 			end
 		end
 	end
@@ -717,10 +679,10 @@
 			number_of_workers = number_of_workers + 1
 
 			if(becomes_description) then
-				result = result .. image_line("tribes/" .. tribename .. "/" .. worker_description.name  .. "/menu.png", 1,
+				result = result .. image_line(worker_description.icon_name, 1,
 					p(_"%s or better":bformat(worker_description.descname)))
 			else
-				result = result .. image_line("tribes/" .. tribename .. "/" .. worker_description.name  .. "/menu.png", 1,
+				result = result .. image_line(worker_description.icon_name, 1,
 					p(worker_description.descname))
 			end
 		end
@@ -764,9 +726,9 @@
 --    :returns: text_line for the tool
 --
 function building_help_tool_string(tribename, toolname, no_of_workers)
-	local ware_description = wl.Game():get_ware_description(tribename,toolname)
+	local ware_description = wl.Game():get_ware_description(tribename, toolname)
 	return text_line((ngettext("Worker uses:","Workers use:", no_of_workers)),
-		ware_description.descname, "tribes/" .. tribename .. "/" .. toolname  .. "/menu.png")
+		ware_description.descname, ware_description.icon_name)
 end
 
 -- RST

=== modified file 'src/editor/ui_menus/editor_player_menu_allowed_buildings_menu.cc'
--- src/editor/ui_menus/editor_player_menu_allowed_buildings_menu.cc	2014-06-08 21:47:45 +0000
+++ src/editor/ui_menus/editor_player_menu_allowed_buildings_menu.cc	2014-07-20 17:56:19 +0000
@@ -116,7 +116,7 @@
 		if (not building.is_enhanced() and not building.is_buildable())
 			continue;
 		(m_player.is_building_type_allowed(i) ? m_allowed : m_forbidden).add
-			(building.descname().c_str(), i, building.get_buildicon());
+			(building.descname().c_str(), i, building.get_icon());
 	}
 	m_forbidden.sort();
 	m_allowed  .sort();
@@ -158,7 +158,7 @@
 	target.add
 		(building.descname().c_str(),
 		 building_index,
-		 building.get_buildicon());
+		 building.get_icon());
 	target.sort();
 	m_player.allow_building_type(building_index, allow);
 }

=== modified file 'src/logic/building.cc'
--- src/logic/building.cc	2014-07-16 08:25:35 +0000
+++ src/logic/building.cc	2014-07-20 17:56:19 +0000
@@ -59,7 +59,7 @@
 	Map_Object_Descr(_name, _descname),
 	m_tribe         (_descr),
 	m_buildable     (true),
-	m_buildicon     (nullptr),
+	m_icon     (nullptr),
 	m_size          (BaseImmovable::SMALL),
 	m_mine          (false),
 	m_port          (false),
@@ -127,8 +127,8 @@
 	m_global = directory.find("global/") < directory.size();
 	if (m_buildable || m_enhanced_building) {
 		//  get build icon
-		m_buildicon_fname  = directory;
-		m_buildicon_fname += "/menu.png";
+		m_icon_fname  = directory;
+		m_icon_fname += "/menu.png";
 
 		//  build animation
 		if (Section * const build_s = prof.get_section("build")) {
@@ -154,8 +154,8 @@
 		}
 	} else if (m_global) {
 		//  get build icon for global buildings (for statistics window)
-		m_buildicon_fname  = directory;
-		m_buildicon_fname += "/menu.png";
+		m_icon_fname  = directory;
+		m_icon_fname += "/menu.png";
 	}
 
 	{ //  parse basic animation data
@@ -230,8 +230,8 @@
 */
 void Building_Descr::load_graphics()
 {
-	if (m_buildicon_fname.size())
-		m_buildicon = g_gr->images().get(m_buildicon_fname);
+	if (m_icon_fname.size())
+		m_icon = g_gr->images().get(m_icon_fname);
 }
 
 /*

=== modified file 'src/logic/building.h'
--- src/logic/building.h	2014-07-16 08:25:35 +0000
+++ src/logic/building.h	2014-07-20 17:56:19 +0000
@@ -94,7 +94,8 @@
 	 * The returned wares for a enhaced building
 	 */
 	const Buildcost & returned_wares_enhanced() const {return m_return_enhanced;}
-	const Image* get_buildicon() const {return m_buildicon;}
+	const Image* get_icon() const {return m_icon;}
+	std::string icon_name() const {return m_icon_fname;}
 	int32_t get_size() const {return m_size;}
 	bool get_ismine() const {return m_mine;}
 	bool get_isport() const {return m_port;}
@@ -144,8 +145,8 @@
 	Buildcost     m_return_dismantle; // Returned wares on dismantle
 	Buildcost     m_enhance_cost;     // cost for enhancing
 	Buildcost     m_return_enhanced;   // Returned ware for dismantling an enhanced building
-	const Image*     m_buildicon;       // if buildable: picture in the build dialog
-	std::string   m_buildicon_fname; // filename for this icon
+	const Image*     m_icon;       // if buildable: picture in the build dialog
+	std::string   m_icon_fname; // filename for this icon
 	int32_t       m_size;            // size of the building
 	bool          m_mine;
 	bool          m_port;

=== modified file 'src/logic/worker_descr.cc'
--- src/logic/worker_descr.cc	2014-07-05 13:18:57 +0000
+++ src/logic/worker_descr.cc	2014-07-20 17:56:19 +0000
@@ -43,7 +43,7 @@
 	BobDescr(_name, _descname, &_tribe),
 	m_helptext(global_s.get_string("help", "")),
 	m_ware_hotspot(global_s.get_Point("ware_hotspot", Point(0, 15))),
-	m_icon_fname(directory + "/menu.png"),
+	m_icon_fname(directory + "menu.png"),
 	m_icon(nullptr),
 	m_buildable     (false),
 	m_level_experience(-1),

=== modified file 'src/logic/worker_descr.h'
--- src/logic/worker_descr.h	2014-07-11 22:53:34 +0000
+++ src/logic/worker_descr.h	2014-07-20 17:56:19 +0000
@@ -92,6 +92,7 @@
 	}
 
 	const Image* icon() const {return m_icon;}
+	std::string icon_name() const {return m_icon_fname;}
 	const DirAnimations & get_walk_anims() const {return m_walk_anims;}
 	const DirAnimations & get_right_walk_anims(bool const carries_ware) const {
 		return carries_ware ? m_walkload_anims : m_walk_anims;

=== modified file 'src/scripting/lua_map.cc'
--- src/scripting/lua_map.cc	2014-07-17 14:49:37 +0000
+++ src/scripting/lua_map.cc	2014-07-20 17:56:19 +0000
@@ -22,6 +22,7 @@
 #include "base/deprecated.h"
 #include "base/log.h"
 #include "economy/wares_queue.h"
+#include "graphic/graphic.h"
 #include "logic/carrier.h"
 #include "logic/checkstep.h"
 #include "logic/findimmovable.h"
@@ -1023,6 +1024,7 @@
 const PropertyType<L_MapObjectDescription> L_MapObjectDescription::Properties[] = {
 	PROP_RO(L_MapObjectDescription, descname),
 	PROP_RO(L_MapObjectDescription, name),
+	PROP_RO(L_MapObjectDescription, representative_image),
 	PROP_RO(L_MapObjectDescription, type),
 	{nullptr, nullptr, nullptr},
 };
@@ -1042,6 +1044,19 @@
  ==========================================================
  */
 
+
+/* RST
+	.. attribute:: descname
+
+			(RO) a :class:`string` with the map object's localized name
+*/
+
+int L_MapObjectDescription::get_descname(lua_State * L) {
+	lua_pushstring(L, get()->descname());
+	return 1;
+}
+
+
 /* RST
 	.. attribute:: name
 
@@ -1055,6 +1070,22 @@
 
 
 /* RST
+	.. attribute:: representative_image
+
+			(RO) a :class:`string` with the file path to the representative image
+			of the map object's idle animation
+*/
+int L_MapObjectDescription::get_representative_image(lua_State * L) {
+
+	const std::string& filepath = g_gr->animations().get_animation
+		(get()->get_animation("idle")).representative_image_from_disk().hash();
+
+	lua_pushstring(L, filepath);
+	return 1;
+}
+
+
+/* RST
 	.. attribute:: type
 
 			(RO) the name of the building, e.g. building.
@@ -1064,20 +1095,6 @@
 	return 1;
 }
 
-
-/* RST
-	.. attribute:: name
-
-			(RO) a :class:`string` with the map object's localized name
-*/
-
-int L_MapObjectDescription::get_descname(lua_State * L) {
-	lua_pushstring(L, get()->descname());
-	return 1;
-}
-
-
-
 /* RST
 BuildingDescription
 -------------------
@@ -1102,6 +1119,7 @@
 	PROP_RO(L_BuildingDescription, enhanced),
 	PROP_RO(L_BuildingDescription, enhancement_cost),
 	PROP_RO(L_BuildingDescription, enhancement),
+	PROP_RO(L_BuildingDescription, icon_name),
 	PROP_RO(L_BuildingDescription, is_mine),
 	PROP_RO(L_BuildingDescription, is_port),
 	PROP_RO(L_BuildingDescription, returned_wares),
@@ -1217,6 +1235,16 @@
 	return upcasted_building_descr_to_lua(L, get()->tribe().get_building_descr(enhancement));
 }
 
+/* RST
+	.. attribute:: icon_name
+
+			(RO) the filename for the menu icon.
+*/
+int L_BuildingDescription::get_icon_name(lua_State * L) {
+	lua_pushstring(L, get()->icon_name());
+	return 1;
+}
+
 
 /* RST
 	.. attribute:: is_mine
@@ -1322,7 +1350,8 @@
 
 /* RST
 	.. attribute:: inputs
-		(RO) An array with pairs of int, ware_descr.name describing the input of the productionsite
+		(RO) An array with :class:`L_WareDescription` containing the wares that
+		the productionsite needs for its production.
 */
 int L_ProductionSiteDescription::get_inputs(lua_State * L) {
 	const Tribe_Descr& tribe = get()->tribe();
@@ -1338,11 +1367,10 @@
 	return 1;
 }
 
-
 /* RST
 	.. attribute:: output_ware_types
-
-		(RO) An array with pairs of int, ware_descr.name describing the output of the productionsite
+		(RO) An array with :class:`L_WareDescription` containing the wares that
+		the productionsite can produce.
 */
 int L_ProductionSiteDescription::get_output_ware_types(lua_State * L) {
 	const Tribe_Descr& tribe = get()->tribe();
@@ -1352,15 +1380,13 @@
 	int index = 1;
 	for (auto ware_index : descr->output_ware_types()) {
 		lua_pushint32(L, index++);
-		lua_pushstring(L, tribe.get_ware_descr(ware_index)->name());
+		to_lua<L_WareDescription>(L, new L_WareDescription(tribe.get_ware_descr(ware_index)));
 		lua_rawset(L, -3);
 	}
+
 	return 1;
-
-
 }
 
-
 /* RST
 	.. attribute:: working_positions
 		(RO) An array with :class:`WorkerDescription` containing the workers that
@@ -1419,7 +1445,7 @@
 /* RST
 	.. attribute:: heal_per_second
 
-		(RO) The number of health healed ber second by the militarysite
+		(RO) The number of health healed per second by the militarysite
 */
 int L_MilitarySiteDescription::get_heal_per_second(lua_State * L) {
 	const MilitarySite_Descr * descr = get();
@@ -1618,22 +1644,6 @@
 };
 
 
-void L_WareDescription::__persist(lua_State* L) {
-	const WareDescr* descr = get();
-	PERS_STRING("tribe", descr->tribe().name());
-	PERS_STRING("name", descr->name());
-}
-
-void L_WareDescription::__unpersist(lua_State* L) {
-	std::string name, tribe_name;
-	UNPERS_STRING("tribe", tribe_name);
-	UNPERS_STRING("name", name);
-	const Tribe_Descr* tribe = get_egbase(L).get_tribe(tribe_name);
-	Ware_Index idx = tribe->safe_ware_index(name.c_str());
-	set_description_pointer(tribe->get_ware_descr(idx));
-}
-
-
 /*
  ==========================================================
  PROPERTIES
@@ -1667,11 +1677,29 @@
 	{nullptr, nullptr},
 };
 const PropertyType<L_WareDescription> L_WareDescription::Properties[] = {
+	PROP_RO(L_WareDescription, consumers),
+	PROP_RO(L_WareDescription, icon_name),
 	PROP_RO(L_WareDescription, producers),
-	PROP_RO(L_WareDescription, consumers),
 	{nullptr, nullptr, nullptr},
 };
 
+
+void L_WareDescription::__persist(lua_State* L) {
+	const WareDescr* descr = get();
+	PERS_STRING("tribe", descr->tribe().name());
+	PERS_STRING("name", descr->name());
+}
+
+void L_WareDescription::__unpersist(lua_State* L) {
+	std::string name, tribe_name;
+	UNPERS_STRING("tribe", tribe_name);
+	UNPERS_STRING("name", name);
+	const Tribe_Descr* tribe = get_egbase(L).get_tribe(tribe_name);
+	Ware_Index idx = tribe->safe_ware_index(name.c_str());
+	set_description_pointer(tribe->get_ware_descr(idx));
+}
+
+
 /*
  ==========================================================
  PROPERTIES
@@ -1679,48 +1707,11 @@
  */
 
 
-/* RST
-	.. attribute:: producers
-
-		(RO) a list of building descriptions that can procude this ware.
-*/
-// TODO(GunChleoc): move the calculation somewhere else.
-// You get the (mutable) wares_description container from the tribe_description
-// into the building constructor and add a member (mutable_ware_description(), either in Tribe_Descr
-// or if there is a container with every ware in there than there).
-// So you can get something like this in the buildingdesc constructor:
-// tribe.mutable_ware_description("log")->add_producer(*this);
-int L_WareDescription::get_producers(lua_State * L) {
-	const Tribe_Descr& tribe = get()->tribe();
-	Building_Index const nr_buildings = tribe.get_nrbuildings();
-
-	lua_newtable(L);
-	int index = 1;
-
-	for (Building_Index i = 0; i < nr_buildings; ++i) {
-
-		const Building_Descr & descr = *tribe.get_building_descr(i);
-
-		if (upcast(ProductionSite_Descr const, de, &descr)) {
-			for (auto ware_index : de->output_ware_types()) {
-				if (std::string(get()->name()) ==
-					std::string(tribe.get_ware_descr(ware_index)->name())) {
-					lua_pushint32(L, index++);
-					upcasted_building_descr_to_lua(L, tribe.get_building_descr(i));
-					lua_rawset(L, -3);
-				}
-			}
-		}
-	}
-	return 1;
-}
-
-
 
 /* RST
 	.. attribute:: consumers
-
-		(RO) a list of building descriptions that can consume this ware.
+		(RO) An array with :class:`L_BuildingDescription` with buildings that
+		need this ware for their production.
 */
 // TODO(GunChleoc): move the calculation somewhere else.
 // You get the (mutable) wares_description container from the tribe_description
@@ -1756,6 +1747,55 @@
 
 
 /* RST
+	.. attribute:: icon_name
+
+			(RO) the filename for the menu icon.
+*/
+int L_WareDescription::get_icon_name(lua_State * L) {
+	lua_pushstring(L, get()->icon_name());
+	return 1;
+}
+
+
+/* RST
+	.. attribute:: producers
+		(RO) An array with :class:`L_BuildingDescription` with buildings that
+		can procude this ware.
+*/
+// TODO(GunChleoc): move the calculation somewhere else.
+// You get the (mutable) wares_description container from the tribe_description
+// into the building constructor and add a member (mutable_ware_description(), either in Tribe_Descr
+// or if there is a container with every ware in there than there).
+// So you can get something like this in the buildingdesc constructor:
+// tribe.mutable_ware_description("log")->add_producer(*this);
+int L_WareDescription::get_producers(lua_State * L) {
+	const Tribe_Descr& tribe = get()->tribe();
+	Building_Index const nr_buildings = tribe.get_nrbuildings();
+
+	lua_newtable(L);
+	int index = 1;
+
+	for (Building_Index i = 0; i < nr_buildings; ++i) {
+
+		const Building_Descr & descr = *tribe.get_building_descr(i);
+
+		if (upcast(ProductionSite_Descr const, de, &descr)) {
+			for (auto ware_index : de->output_ware_types()) {
+				if (std::string(get()->name()) ==
+					std::string(tribe.get_ware_descr(ware_index)->name())) {
+					lua_pushint32(L, index++);
+					upcasted_building_descr_to_lua(L, tribe.get_building_descr(i));
+					lua_rawset(L, -3);
+				}
+			}
+		}
+	}
+	return 1;
+}
+
+
+
+/* RST
 WorkerDescription
 -----------------
 
@@ -1771,9 +1811,10 @@
 };
 const PropertyType<L_WorkerDescription> L_WorkerDescription::Properties[] = {
 	PROP_RO(L_WorkerDescription, becomes),
-	PROP_RO(L_WorkerDescription, level_experience),
 	PROP_RO(L_WorkerDescription, buildable),
 	PROP_RO(L_WorkerDescription, buildcost),
+	PROP_RO(L_WorkerDescription, icon_name),
+	PROP_RO(L_WorkerDescription, level_experience),
 	{nullptr, nullptr, nullptr},
 };
 
@@ -1818,16 +1859,6 @@
 
 
 /* RST
-	.. attribute:: level_experience
-
-			(RO) the experience the worker needs to reach this level.
-*/
-int L_WorkerDescription::get_level_experience(lua_State * L) {
-	lua_pushinteger(L, get()->get_level_experience());
-	return 1;
-}
-
-/* RST
 	.. attribute:: buildable
 
 			(RO) `true` if the worker is buildable.
@@ -1856,6 +1887,28 @@
 }
 
 
+/* RST
+	.. attribute:: icon_name
+
+			(RO) the filename for the menu icon.
+*/
+int L_WorkerDescription::get_icon_name(lua_State * L) {
+	lua_pushstring(L, get()->icon_name());
+	return 1;
+}
+
+
+/* RST
+	.. attribute:: level_experience
+
+			(RO) the experience the worker needs to reach this level.
+*/
+int L_WorkerDescription::get_level_experience(lua_State * L) {
+	lua_pushinteger(L, get()->get_level_experience());
+	return 1;
+}
+
+
 /*
  ==========================================================
  LUA METHODS

=== modified file 'src/scripting/lua_map.h'
--- src/scripting/lua_map.h	2014-07-16 08:23:42 +0000
+++ src/scripting/lua_map.h	2014-07-20 17:56:19 +0000
@@ -111,9 +111,10 @@
 	/*
 	 * Properties
 	 */
+	int get_descname(lua_State *);
 	int get_name(lua_State *);
+	int get_representative_image(lua_State *);
 	int get_type(lua_State *);
-	int get_descname(lua_State *);
 
 	/*
 	 * Lua methods
@@ -167,6 +168,7 @@
 	int get_enhanced(lua_State *);
 	int get_enhancement_cost(lua_State *);
 	int get_enhancement(lua_State *);
+	int get_icon_name(lua_State*);
 	int get_is_mine(lua_State *);
 	int get_is_port(lua_State *);
 	int get_isproductionsite(lua_State *);
@@ -344,8 +346,9 @@
 	/*
 	 * Properties
 	 */
+	int get_consumers(lua_State *);
+	int get_icon_name(lua_State*);
 	int get_producers(lua_State *);
-	int get_consumers(lua_State *);
 
 	/*
 	 * Lua methods
@@ -380,9 +383,10 @@
 	 * Properties
 	 */
 	int get_becomes(lua_State*);
-	int get_level_experience(lua_State*);
 	int get_buildable(lua_State*);
 	int get_buildcost(lua_State*);
+	int get_icon_name(lua_State*);
+	int get_level_experience(lua_State*);
 
 	/*
 	 * Lua methods

=== modified file 'src/wui/building_statistics_menu.cc'
--- src/wui/building_statistics_menu.cc	2014-07-03 19:26:30 +0000
+++ src/wui/building_statistics_menu.cc	2014-07-20 17:56:19 +0000
@@ -438,7 +438,7 @@
 		//  add new Table Entry
 		char buffer[100];
 		te->set_picture
-			(Columns::Name, building.get_buildicon(), building.descname());
+			(Columns::Name, building.get_icon(), building.descname());
 
 		{
 			char const * pic = "pics/novalue.png";

=== modified file 'src/wui/buildingwindow.cc'
--- src/wui/buildingwindow.cc	2014-07-16 08:25:35 +0000
+++ src/wui/buildingwindow.cc	2014-07-20 17:56:19 +0000
@@ -236,7 +236,7 @@
 						new UI::Button
 							(capsbuttons, "enhance", 0, 0, 34, 34,
 							 g_gr->images().get("pics/but4.png"),
-							 building_descr.get_buildicon(),
+							 building_descr.get_icon(),
 							 std::string(buffer) + "<br><font size=11>" + _("Construction costs:") + "</font><br>" +
 								 waremap_to_richtext(tribe, building_descr.enhancement_cost()));
 					//  button id = building id

=== modified file 'src/wui/encyclopedia_window.cc'
--- src/wui/encyclopedia_window.cc	2014-07-03 20:11:14 +0000
+++ src/wui/encyclopedia_window.cc	2014-07-20 17:56:19 +0000
@@ -125,7 +125,7 @@
 				 and
 				 de->output_ware_types().count(wares.get_selected()))
 			{
-				prodSites.add(de->descname().c_str(), i, de->get_buildicon());
+				prodSites.add(de->descname().c_str(), i, de->get_icon());
 				found = true;
 			}
 		}

=== modified file 'test/maps/lua_testsuite.wmf/scripting/immovables_descriptions.lua'
--- test/maps/lua_testsuite.wmf/scripting/immovables_descriptions.lua	2014-07-16 06:05:23 +0000
+++ test/maps/lua_testsuite.wmf/scripting/immovables_descriptions.lua	2014-07-20 17:56:19 +0000
@@ -92,6 +92,10 @@
 	assert_equal(nil, egbase:get_building_description("barbarians","lumberjacks_hut").enhancement)
 end
 
+function test_descr:test_icon_name()
+   assert_equal("tribes/barbarians/headquarters/menu.png", egbase:get_building_description("barbarians","headquarters").icon_name)
+end
+
 function test_descr:test_ismine()
    assert_equal(false, egbase:get_building_description("barbarians","headquarters").is_mine)
    assert_equal(true, egbase:get_building_description("barbarians","oremine").is_mine)
@@ -171,7 +175,7 @@
 
 function test_descr:test_output_ware_types()
 	local building_description = egbase:get_building_description("barbarians","bakery")
-	assert_equal("pittabread", building_description.output_ware_types[1])
+	assert_equal("pittabread", building_description.output_ware_types[1].name)
 	building_description = egbase:get_building_description("barbarians","gamekeepers_hut")
 	assert_equal(nil, building_description.output_ware_types[1])
 end
@@ -335,6 +339,10 @@
    assert_equal("helmsmithy", ware_description.consumers[5].name)
 end
 
+function test_descr:test_icon_name()
+   assert_equal("tribes/barbarians/coal/menu.png", egbase:get_ware_description("barbarians","coal").icon_name)
+end
+
 function test_descr:test_producers()
 	local ware_description = egbase:get_ware_description("barbarians","coal")
 	assert_equal("burners_house", ware_description.producers[1].name)
@@ -373,6 +381,10 @@
    assert_equal(nil, worker_descr)
 end
 
+function test_descr:test_icon_name()
+   assert_equal("tribes/barbarians/miner/menu.png", egbase:get_worker_description("barbarians","miner").icon_name)
+end
+
 function test_descr:test_level_experience()
    assert_equal(19, egbase:get_worker_description("barbarians","miner").level_experience)
    assert_equal(28, egbase:get_worker_description("barbarians","chief-miner").level_experience)

=== modified file 'tribes/atlanteans/armorsmithy/help.lua'
--- tribes/atlanteans/armorsmithy/help.lua	2014-05-27 14:14:14 +0000
+++ tribes/atlanteans/armorsmithy/help.lua	2014-07-20 17:56:19 +0000
@@ -13,7 +13,7 @@
 	building_help_lore_string("atlanteans", building_description, _[[Text needed]], _[[Source needed]]) ..
 
 	--General Section
-	building_help_general_string("atlanteans", building_description, "advanced_shield",
+	building_help_general_string("atlanteans", building_description,
 		_[[Text needed]]) ..
 
 	--Dependencies

=== modified file 'tribes/atlanteans/bakery/help.lua'
--- tribes/atlanteans/bakery/help.lua	2014-05-27 14:14:14 +0000
+++ tribes/atlanteans/bakery/help.lua	2014-07-20 17:56:19 +0000
@@ -13,7 +13,7 @@
 	building_help_lore_string("atlanteans", building_description, _[[Text needed]], _[[Source needed]]) ..
 
 	--General Section
-	building_help_general_string("atlanteans", building_description, "bread",
+	building_help_general_string("atlanteans", building_description,
 		_[[Text needed]]) ..
 
 	--Dependencies

=== modified file 'tribes/atlanteans/blackroot_farm/help.lua'
--- tribes/atlanteans/blackroot_farm/help.lua	2014-05-27 14:14:14 +0000
+++ tribes/atlanteans/blackroot_farm/help.lua	2014-07-20 17:56:19 +0000
@@ -13,7 +13,7 @@
 	building_help_lore_string("atlanteans", building_description, _[[Text needed]], _[[Source needed]]) ..
 
 	--General Section
-	building_help_general_string("atlanteans", building_description, "blackroot",
+	building_help_general_string("atlanteans", building_description,
 		_"Sow and harvest blackroot.") ..
 
 	--Dependencies

=== modified file 'tribes/atlanteans/burners_house/help.lua'
--- tribes/atlanteans/burners_house/help.lua	2014-05-27 14:14:14 +0000
+++ tribes/atlanteans/burners_house/help.lua	2014-07-20 17:56:19 +0000
@@ -10,10 +10,10 @@
 	return
 
 	--Lore Section
-	-- TODO rename pictures building_help_lore_string("atlanteans", building_description, _[[Text needed]], _[[Source needed]]) ..
+	building_help_lore_string("atlanteans", building_description, _[[Text needed]], _[[Source needed]]) ..
 
 	--General Section
-	building_help_general_string("atlanteans", building_description, "coal",
+	building_help_general_string("atlanteans", building_description,
 		_[[Text needed]]) ..
 
 	--Dependencies

=== modified file 'tribes/atlanteans/castle/help.lua'
--- tribes/atlanteans/castle/help.lua	2014-05-27 14:14:14 +0000
+++ tribes/atlanteans/castle/help.lua	2014-07-20 17:56:19 +0000
@@ -12,7 +12,7 @@
 	--Lore Section
 	building_help_lore_string("atlanteans", building_description, _[[Text needed]], _[[Source needed]]) ..
 	--General Section
-	building_help_general_string("atlanteans", building_description, "soldier",
+	building_help_general_string("atlanteans", building_description,
 		_"Garrisons soldiers to expand your territory.",
 		_"If you’re low on soldiers to occupy new military sites, use the downward arrow button to decrease the capacity. You can also click on a soldier to send him away.") ..
 

=== modified file 'tribes/atlanteans/coalmine/help.lua'
--- tribes/atlanteans/coalmine/help.lua	2014-05-27 14:14:14 +0000
+++ tribes/atlanteans/coalmine/help.lua	2014-07-20 17:56:19 +0000
@@ -13,7 +13,7 @@
 	building_help_lore_string("atlanteans", building_description, _[[Text needed]]) ..
 
 	--General Section
-	building_help_general_string("atlanteans", building_description, "coal",
+	building_help_general_string("atlanteans", building_description,
 		_"Digs coal out of the ground in mountain terrain.") ..
 
 	--Dependencies

=== modified file 'tribes/atlanteans/crystalmine/help.lua'
--- tribes/atlanteans/crystalmine/help.lua	2014-05-27 14:14:14 +0000
+++ tribes/atlanteans/crystalmine/help.lua	2014-07-20 17:56:19 +0000
@@ -13,7 +13,7 @@
 	building_help_lore_string("atlanteans", building_description, _[[Text needed]], _[[Source needed]]) ..
 
 	--General Section
-	building_help_general_string("atlanteans", building_description, "diamond",
+	building_help_general_string("atlanteans", building_description,
 		_"Carve precious stones out of the rock in mountain terrain.") ..
 
 	--Dependencies

=== modified file 'tribes/atlanteans/dungeon/help.lua'
--- tribes/atlanteans/dungeon/help.lua	2014-05-27 14:14:14 +0000
+++ tribes/atlanteans/dungeon/help.lua	2014-07-20 17:56:19 +0000
@@ -15,17 +15,17 @@
 	building_help_lore_string("atlanteans", building_description, _[[Text needed]], _[[Source needed]]) ..
 
 	--General Section
-	building_help_general_string("atlanteans", building_description, "soldier",
+	building_help_general_string("atlanteans", building_description,
 		_"Trains soldiers in ‘Attack’."
 			.. " " .."Equips the soldiers with all necessary weapons and armor parts.") ..
 
 	--Dependencies
 	-- We would need to parse the production programs to automate the parameters here; so we do it manually
-	-- TODO make pictures dependencies_training("atlanteans", building_description, "fulltrained-evade", "untrained+evade") ..
+	-- TODO(GunChleoc) make pictures dependencies_training("atlanteans", building_description, "fulltrained-evade", "untrained+evade") ..
 
 	rt(h3(_"Attack Training:")) ..
 	dependencies_training_food("atlanteans", { {"smoked_fish", "smoked_meat"}, {"bread"}}) ..
-	dependencies_training_weapons("atlanteans", building_description, "and", 
+	dependencies_training_weapons("atlanteans", building_description, "and",
 		{"long_trident", "steel_trident", "double_trident", "heavy_double_trident"}, "weaponsmithy") ..
 
 	--Workers Section

=== modified file 'tribes/atlanteans/farm/help.lua'
--- tribes/atlanteans/farm/help.lua	2014-05-27 14:14:14 +0000
+++ tribes/atlanteans/farm/help.lua	2014-07-20 17:56:19 +0000
@@ -13,7 +13,7 @@
 	building_help_lore_string("atlanteans", building_description, _[[Text needed]], _[[Source needed]]) ..
 
 	--General Section
-	building_help_general_string("atlanteans", building_description, "corn",
+	building_help_general_string("atlanteans", building_description,
 		_"Sow and harvest corn.") ..
 
 	--Dependencies

=== modified file 'tribes/atlanteans/fish_breeders_house/help.lua'
--- tribes/atlanteans/fish_breeders_house/help.lua	2014-05-27 14:14:14 +0000
+++ tribes/atlanteans/fish_breeders_house/help.lua	2014-07-20 17:56:19 +0000
@@ -13,7 +13,7 @@
 	building_help_lore_string("atlanteans", building_description, _[[Text needed]],_[[Source needed]]) ..
 
 	--General Section
-	building_help_general_string("atlanteans", building_description, "fish",
+	building_help_general_string("atlanteans", building_description,
 		_[[Text needed]]) ..
 
 	--Dependencies

=== modified file 'tribes/atlanteans/fishers_house/help.lua'
--- tribes/atlanteans/fishers_house/help.lua	2014-05-27 14:14:14 +0000
+++ tribes/atlanteans/fishers_house/help.lua	2014-07-20 17:56:19 +0000
@@ -13,7 +13,7 @@
 	building_help_lore_string("atlanteans", building_description, _[[Text needed]], _[[Source needed]]) ..
 
 	--General Section
-	building_help_general_string("atlanteans", building_description, "fish",
+	building_help_general_string("atlanteans", building_description,
 		_"Fishes on the coast near the house.",
 		_"The fisher’s house needs water full of fish within the working radius." .. " " .. _"Build a fisher breeder’s house close to the fisher’s house to make sure that you don’t run out of fish." ) ..
 

=== modified file 'tribes/atlanteans/foresters_house/help.lua'
--- tribes/atlanteans/foresters_house/help.lua	2014-07-17 09:27:03 +0000
+++ tribes/atlanteans/foresters_house/help.lua	2014-07-20 17:56:19 +0000
@@ -13,7 +13,7 @@
 	building_help_lore_string("atlanteans", building_description, _[[Text needed]],_[[Source needed]]) ..
 
 	--General Section
-	building_help_general_string("atlanteans", building_description, "log",
+	building_help_general_string("atlanteans", building_description,
 		_"Plants trees in the surrounding area.",
 		_"The foresters’s house needs free space within the working radius to plant the trees.") ..
 

=== modified file 'tribes/atlanteans/gold-spinning-mill/help.lua'
--- tribes/atlanteans/gold-spinning-mill/help.lua	2014-05-27 14:14:14 +0000
+++ tribes/atlanteans/gold-spinning-mill/help.lua	2014-07-20 17:56:19 +0000
@@ -13,7 +13,7 @@
 	building_help_lore_string("atlanteans", building_description, _[[Text needed]], _[[Source needed]]) ..
 
 	--General Section
-	building_help_general_string("atlanteans", building_description, "goldyarn",
+	building_help_general_string("atlanteans", building_description,
 		_"Spins goldyarn out of gold.") ..
 
 	--Dependencies

=== modified file 'tribes/atlanteans/goldmine/help.lua'
--- tribes/atlanteans/goldmine/help.lua	2014-05-27 14:14:14 +0000
+++ tribes/atlanteans/goldmine/help.lua	2014-07-20 17:56:19 +0000
@@ -13,7 +13,7 @@
 	building_help_lore_string("atlanteans", building_description, _[[Text needed]], _[[Source needed]]) ..
 
 	--General Section
-	building_help_general_string("atlanteans", building_description, "goldore",
+	building_help_general_string("atlanteans", building_description,
 		_"Digs gold ore out of the ground in mountain terrain.") ..
 
 	--Dependencies

=== modified file 'tribes/atlanteans/guardhall/help.lua'
--- tribes/atlanteans/guardhall/help.lua	2014-05-27 14:14:14 +0000
+++ tribes/atlanteans/guardhall/help.lua	2014-07-20 17:56:19 +0000
@@ -12,7 +12,7 @@
 	--Lore Section
 	building_help_lore_string("atlanteans", building_description, _[[Text needed]], _[[Source needed]]) ..
 	--General Section
-	building_help_general_string("atlanteans", building_description, "soldier",
+	building_help_general_string("atlanteans", building_description,
 		_"Garrisons soldiers to expand your territory.",
 		_"If you’re low on soldiers to occupy new military sites, use the downward arrow button to decrease the capacity. You can also click on a soldier to send him away.") ..
 

=== modified file 'tribes/atlanteans/guardhouse/help.lua'
--- tribes/atlanteans/guardhouse/help.lua	2014-05-27 14:14:14 +0000
+++ tribes/atlanteans/guardhouse/help.lua	2014-07-20 17:56:19 +0000
@@ -12,7 +12,7 @@
 	--Lore Section
 	building_help_lore_string("atlanteans", building_description, _[[Text needed]], _[[Source needed]]) ..
 	--General Section
-	building_help_general_string("atlanteans", building_description, "soldier",
+	building_help_general_string("atlanteans", building_description,
 		_"Garrisons soldiers to expand your territory.",
 		_"If you’re low on soldiers to occupy new military sites, use the downward arrow button to decrease the capacity. You can also click on a soldier to send him away.") ..
 

=== modified file 'tribes/atlanteans/headquarters/help.lua'
--- tribes/atlanteans/headquarters/help.lua	2014-05-27 14:14:14 +0000
+++ tribes/atlanteans/headquarters/help.lua	2014-07-20 17:56:19 +0000
@@ -12,7 +12,7 @@
 	--Lore Section
 	building_help_lore_string("atlanteans", building_description, _[[Text needed]], _[[Source needed]]) ..
 	--General Section
-	building_help_general_string("atlanteans", building_description, "carrier",
+	building_help_general_string("atlanteans", building_description,
 		_"Accomodation for your people. Also stores your wares and tools.",
 		_"The headquarters is your main building." .. "<br>" .. _[[Text needed]]) ..
 

=== modified file 'tribes/atlanteans/high_tower/help.lua'
--- tribes/atlanteans/high_tower/help.lua	2014-05-27 14:14:14 +0000
+++ tribes/atlanteans/high_tower/help.lua	2014-07-20 17:56:19 +0000
@@ -12,7 +12,7 @@
 	--Lore Section
 	building_help_lore_string("atlanteans", building_description, _[[Text needed]], _[[Source needed]]) ..
 	--General Section
-	building_help_general_string("atlanteans", building_description, "soldier",
+	building_help_general_string("atlanteans", building_description,
 		_"Garrisons soldiers to expand your territory.",
 		_"If you’re low on soldiers to occupy new military sites, use the downward arrow button to decrease the capacity. You can also click on a soldier to send him away.") ..
 

=== modified file 'tribes/atlanteans/horsefarm/help.lua'
--- tribes/atlanteans/horsefarm/help.lua	2014-05-27 14:14:14 +0000
+++ tribes/atlanteans/horsefarm/help.lua	2014-07-20 17:56:19 +0000
@@ -13,11 +13,10 @@
 	building_help_lore_string("atlanteans", building_description, _[[Text needed]], _[[Source needed]]) ..
 
 	--General Section
-	building_help_general_string("atlanteans", building_description, "horse",
+	building_help_general_string("atlanteans", building_description,
 		_"Breeds horses for adding them to the transportation system.") ..
 
 	--Dependencies
-	-- TODO: why is "Produces" empty?
 	building_help_dependencies_production("atlanteans", building_description) ..
 
 	--Workers Section

=== modified file 'tribes/atlanteans/hunters_house/help.lua'
--- tribes/atlanteans/hunters_house/help.lua	2014-05-27 14:14:14 +0000
+++ tribes/atlanteans/hunters_house/help.lua	2014-07-20 17:56:19 +0000
@@ -13,7 +13,7 @@
 	building_help_lore_string("atlanteans", building_description, _[[Text needed]], _[[Source needed]]) ..
 
 	--General Section
-	building_help_general_string("atlanteans", building_description, "meat",
+	building_help_general_string("atlanteans", building_description,
 		_"Hunts animals to produce meat.",
 		_"The hunter’s house needs animals to hunt within the working radius.") ..
 

=== modified file 'tribes/atlanteans/ironmine/help.lua'
--- tribes/atlanteans/ironmine/help.lua	2014-05-27 14:14:14 +0000
+++ tribes/atlanteans/ironmine/help.lua	2014-07-20 17:56:19 +0000
@@ -13,7 +13,7 @@
 	building_help_lore_string("atlanteans", building_description, _[[Text needed]], _[[Source needed]]) ..
 
 	--General Section
-	building_help_general_string("atlanteans", building_description, "ironore",
+	building_help_general_string("atlanteans", building_description,
 		_"Digs iron ore out of the ground in mountain terrain.") ..
 
 	--Dependencies

=== modified file 'tribes/atlanteans/labyrinth/help.lua'
--- tribes/atlanteans/labyrinth/help.lua	2014-05-27 14:14:14 +0000
+++ tribes/atlanteans/labyrinth/help.lua	2014-07-20 17:56:19 +0000
@@ -15,17 +15,17 @@
 	building_help_lore_string("atlanteans", building_description, _[[Text needed]], _[[Source needed]]) ..
 
 	--General Section
-	building_help_general_string("atlanteans", building_description, "soldier",
+	building_help_general_string("atlanteans", building_description,
 		_"Trains soldiers in ‘Defense’, ‘Evade’, and ‘Health’."
 			.. " " .."Equips the soldiers with all necessary weapons and armor parts.") ..
 
 	--Dependencies
 	-- We would need to parse the production programs to automate the parameters here; so we do it manually
-	-- TODO make pictures dependencies_training("atlanteans", building_description, "fulltrained-evade", "untrained+evade") ..
+	-- TODO(GunChleoc) make pictures dependencies_training("atlanteans", building_description, "fulltrained-evade", "untrained+evade") ..
 
 	rt(h3(_"Defense Training:")) ..
 	dependencies_training_food("atlanteans", { {"smoked_fish", "smoked_meat"}, {"bread"}}) ..
-	dependencies_training_weapons("atlanteans", building_description, "and", 
+	dependencies_training_weapons("atlanteans", building_description, "and",
 		{"steel_shield", "advanced_shield"}, "armorsmithy") ..
 
 	rt(h3(_"Evade Training:")) ..
@@ -33,7 +33,7 @@
 
 	rt(h3(_"Health Training:")) ..
 	dependencies_training_food("atlanteans", { {"smoked_fish", "smoked_meat"}, {"bread"}}) ..
-	dependencies_training_weapons("atlanteans", building_description, "and", 
+	dependencies_training_weapons("atlanteans", building_description, "and",
 		{"golden_tabard"}, "weaving-mill") ..
 
 	--Workers Section

=== modified file 'tribes/atlanteans/mill/help.lua'
--- tribes/atlanteans/mill/help.lua	2014-05-27 14:14:14 +0000
+++ tribes/atlanteans/mill/help.lua	2014-07-20 17:56:19 +0000
@@ -13,7 +13,7 @@
 	building_help_lore_string("atlanteans", building_description, _[[Text needed]], _[[Source needed]]) ..
 
 	--General Section
-	building_help_general_string("atlanteans", building_description, "cornflour",
+	building_help_general_string("atlanteans", building_description,
 		_[[Text needed]]) ..
 
 	--Dependencies

=== modified file 'tribes/atlanteans/port/help.lua'
--- tribes/atlanteans/port/help.lua	2014-05-27 14:14:14 +0000
+++ tribes/atlanteans/port/help.lua	2014-07-20 17:56:19 +0000
@@ -13,12 +13,11 @@
 	building_help_lore_string("atlanteans", building_description, _[[Text needed]], _[[Source needed]]) ..
 
 	--General Section
-	-- TODO this building acts like a warehouse
-	building_help_general_string("atlanteans", building_description, "ship",
+	building_help_general_string("atlanteans", building_description,
 		_[[Text needed]]) ..
 
 	--Dependencies
-	-- TODO expedition costs here?
+	-- TODO(GunChleoc) expedition costs here?
 
 	--Building Section
 	building_help_building_section("atlanteans", building_description) ..

=== modified file 'tribes/atlanteans/quarry/help.lua'
--- tribes/atlanteans/quarry/help.lua	2014-05-27 14:14:14 +0000
+++ tribes/atlanteans/quarry/help.lua	2014-07-20 17:56:19 +0000
@@ -13,7 +13,7 @@
 	building_help_lore_string("atlanteans", building_description, _[[Text needed]],_[[Source needed]]) ..
 
 	--General Section
-	building_help_general_string("atlanteans", building_description, "stone",
+	building_help_general_string("atlanteans", building_description,
 		_"Carves stones out of rocks in the vicinity.", _"The quarry needs stones to cut within the working radius.") ..
 
 	--Dependencies

=== modified file 'tribes/atlanteans/sawmill/help.lua'
--- tribes/atlanteans/sawmill/help.lua	2014-05-27 14:14:14 +0000
+++ tribes/atlanteans/sawmill/help.lua	2014-07-20 17:56:19 +0000
@@ -13,7 +13,7 @@
 	building_help_lore_string("atlanteans", building_description, _[[Text needed]], _[[Source needed]]) ..
 
 	--General Section
-	building_help_general_string("atlanteans", building_description, "planks",
+	building_help_general_string("atlanteans", building_description,
 		_[[Text needed]]) ..
 
 	--Dependencies

=== modified file 'tribes/atlanteans/scouts_house/help.lua'
--- tribes/atlanteans/scouts_house/help.lua	2014-05-27 14:14:14 +0000
+++ tribes/atlanteans/scouts_house/help.lua	2014-07-20 17:56:19 +0000
@@ -13,7 +13,7 @@
 	building_help_lore_string("atlanteans", building_description, _[[Text needed]],_[[Source needed]]) ..
 
 	--General Section
-	building_help_general_string("atlanteans", building_description, "scout",
+	building_help_general_string("atlanteans", building_description,
 		_[[Text needed]]) ..
 
 	--Dependencies

=== modified file 'tribes/atlanteans/shipyard/help.lua'
--- tribes/atlanteans/shipyard/help.lua	2014-05-27 14:14:14 +0000
+++ tribes/atlanteans/shipyard/help.lua	2014-07-20 17:56:19 +0000
@@ -13,7 +13,7 @@
 	building_help_lore_string("atlanteans", building_description, _[[Text needed]], _[[Source needed]]) ..
 
 	--General Section
-	building_help_general_string("atlanteans", building_description, "shipwright",
+	building_help_general_string("atlanteans", building_description,
 		_[[Text needed]]) ..
 
 	--Dependencies

=== modified file 'tribes/atlanteans/small_tower/help.lua'
--- tribes/atlanteans/small_tower/help.lua	2014-05-27 14:14:14 +0000
+++ tribes/atlanteans/small_tower/help.lua	2014-07-20 17:56:19 +0000
@@ -12,7 +12,7 @@
 	--Lore Section
 	building_help_lore_string("atlanteans", building_description, _[[Text needed]], _[[Source needed]]) ..
 	--General Section
-	building_help_general_string("atlanteans", building_description, "soldier",
+	building_help_general_string("atlanteans", building_description,
 		_"Garrisons soldiers to expand your territory.",
 		_"If you’re low on soldiers to occupy new military sites, use the downward arrow button to decrease the capacity. You can also click on a soldier to send him away.") ..
 

=== modified file 'tribes/atlanteans/smelting_works/help.lua'
--- tribes/atlanteans/smelting_works/help.lua	2014-05-27 14:14:14 +0000
+++ tribes/atlanteans/smelting_works/help.lua	2014-07-20 17:56:19 +0000
@@ -13,7 +13,7 @@
 	building_help_lore_string("atlanteans", building_description, _[[Text needed]], _[[Source needed]]) ..
 
 	--General Section
-	building_help_general_string("atlanteans", building_description, "iron",
+	building_help_general_string("atlanteans", building_description,
 		_"Smelts iron ore into iron and gold ore into gold.") ..
 
 	--Dependencies

=== modified file 'tribes/atlanteans/smokery/help.lua'
--- tribes/atlanteans/smokery/help.lua	2014-05-27 14:14:14 +0000
+++ tribes/atlanteans/smokery/help.lua	2014-07-20 17:56:19 +0000
@@ -13,7 +13,7 @@
 	building_help_lore_string("atlanteans", building_description, _[[Text needed]], _[[Source needed]]) ..
 
 	--General Section
-	building_help_general_string("atlanteans", building_description, "smoked_meat",
+	building_help_general_string("atlanteans", building_description,
 		_[[Text needed]]) ..
 
 	--Dependencies

=== modified file 'tribes/atlanteans/spiderfarm/help.lua'
--- tribes/atlanteans/spiderfarm/help.lua	2014-05-27 14:14:14 +0000
+++ tribes/atlanteans/spiderfarm/help.lua	2014-07-20 17:56:19 +0000
@@ -13,7 +13,7 @@
 	building_help_lore_string("atlanteans", building_description, _[[Text needed]], _[[Source needed]]) ..
 
 	--General Section
-	building_help_general_string("atlanteans", building_description, "spideryarn",
+	building_help_general_string("atlanteans", building_description,
 		_[[Text needed]]) ..
 
 	--Dependencies

=== modified file 'tribes/atlanteans/toolsmithy/help.lua'
--- tribes/atlanteans/toolsmithy/help.lua	2014-05-27 14:14:14 +0000
+++ tribes/atlanteans/toolsmithy/help.lua	2014-07-20 17:56:19 +0000
@@ -13,7 +13,7 @@
 	building_help_lore_string("atlanteans", building_description, _[[Text needed]], _[[Source needed]]) ..
 
 	--General Section
-	building_help_general_string("atlanteans", building_description, "hammer",
+	building_help_general_string("atlanteans", building_description,
 		_[[Text needed]]) ..
 
 	--Dependencies

=== modified file 'tribes/atlanteans/tower/help.lua'
--- tribes/atlanteans/tower/help.lua	2014-05-27 14:14:14 +0000
+++ tribes/atlanteans/tower/help.lua	2014-07-20 17:56:19 +0000
@@ -12,7 +12,7 @@
 	--Lore Section
 	building_help_lore_string("atlanteans", building_description, _[[Text needed]], _[[Source needed]]) ..
 	--General Section
-	building_help_general_string("atlanteans", building_description, "soldier",
+	building_help_general_string("atlanteans", building_description,
 		_"Garrisons soldiers to expand your territory.",
 		_"If you’re low on soldiers to occupy new military sites, use the downward arrow button to decrease the capacity. You can also click on a soldier to send him away.") ..
 

=== modified file 'tribes/atlanteans/warehouse/help.lua'
--- tribes/atlanteans/warehouse/help.lua	2014-05-27 14:14:14 +0000
+++ tribes/atlanteans/warehouse/help.lua	2014-07-20 17:56:19 +0000
@@ -12,7 +12,7 @@
 	--Lore Section
 	building_help_lore_string("atlanteans", building_description, _[[Text needed]], _[[Source needed]]) ..
 	--General Section
-	building_help_general_string("atlanteans", building_description, "log",
+	building_help_general_string("atlanteans", building_description,
 		_"Warehouses store soldiers, wares and tools.") ..
 
 	--Building Section

=== modified file 'tribes/atlanteans/weaponsmithy/help.lua'
--- tribes/atlanteans/weaponsmithy/help.lua	2014-05-27 14:14:14 +0000
+++ tribes/atlanteans/weaponsmithy/help.lua	2014-07-20 17:56:19 +0000
@@ -13,7 +13,7 @@
 	building_help_lore_string("atlanteans", building_description, _[[Text needed]], _[[Source needed]]) ..
 
 	--General Section
-	building_help_general_string("atlanteans", building_description, "light_trident",
+	building_help_general_string("atlanteans", building_description,
 		_[[Text needed]]) ..
 
 	--Dependencies

=== modified file 'tribes/atlanteans/weaving-mill/help.lua'
--- tribes/atlanteans/weaving-mill/help.lua	2014-05-27 14:14:14 +0000
+++ tribes/atlanteans/weaving-mill/help.lua	2014-07-20 17:56:19 +0000
@@ -10,10 +10,10 @@
 	return
 
 	--Lore Section
-	-- TODO rename pictures building_help_lore_string("atlanteans", building_description, _[[Text needed]], _[[Source needed]]) ..
+	building_help_lore_string("atlanteans", building_description, _[[Text needed]], _[[Source needed]]) ..
 
 	--General Section
-	building_help_general_string("atlanteans", building_description, "spidercloth",
+	building_help_general_string("atlanteans", building_description,
 		_[[Text needed]]) ..
 
 	--Dependencies

=== modified file 'tribes/atlanteans/well/help.lua'
--- tribes/atlanteans/well/help.lua	2014-05-27 14:14:14 +0000
+++ tribes/atlanteans/well/help.lua	2014-07-20 17:56:19 +0000
@@ -14,7 +14,7 @@
 
 	--General Section
 	--General Section
-	building_help_general_string("atlanteans", building_description, "water",
+	building_help_general_string("atlanteans", building_description,
 		_"Draws water out of the deep.") ..
 
 	--Dependencies

=== modified file 'tribes/atlanteans/woodcutters_house/help.lua'
--- tribes/atlanteans/woodcutters_house/help.lua	2014-05-27 14:14:14 +0000
+++ tribes/atlanteans/woodcutters_house/help.lua	2014-07-20 17:56:19 +0000
@@ -12,7 +12,7 @@
 	--Lore Section
 	building_help_lore_string("atlanteans", building_description, _[[Text needed]],_[[Source needed]]) ..
 	--General Section
-	building_help_general_string("atlanteans", building_description, "log",
+	building_help_general_string("atlanteans", building_description,
 		_"Fell trees in the surrounding area and process them into logs.",
 		_"The woodcutter's house needs trees to fell within the working radius.") ..
 

=== modified file 'tribes/barbarians/axfactory/help.lua'
--- tribes/barbarians/axfactory/help.lua	2014-05-26 12:44:12 +0000
+++ tribes/barbarians/axfactory/help.lua	2014-07-20 17:56:19 +0000
@@ -13,7 +13,7 @@
 	building_help_lore_string("barbarians", building_description, _[[‘A new warrior’s ax brings forth the best in its wielder – or the worst in its maker.’]], _[[An old Barbarian proverb<br> meaning that you need to take some risks sometimes.]]) ..
 
 	--General Section
-	building_help_general_string("barbarians", building_description, "ax",
+	building_help_general_string("barbarians", building_description,
 		_"Produces axes, sharp axes and broad axes.",
 		_"The barbarian axfactory is the intermediate production site in a series of three buildings. It is an upgrade from the metal workshop but doesn’t require additional qualification for the worker.") ..
 

=== modified file 'tribes/barbarians/bakery/help.lua'
--- tribes/barbarians/bakery/help.lua	2014-05-26 18:14:46 +0000
+++ tribes/barbarians/bakery/help.lua	2014-07-20 17:56:19 +0000
@@ -13,7 +13,7 @@
 	building_help_lore_string("barbarians", building_description, _[[Text needed]], _[[Source needed]]) ..
 
 	--General Section
-	building_help_general_string("barbarians", building_description, "pittabread",
+	building_help_general_string("barbarians", building_description,
 		_"Bakes pitta bread for soldiers and miners alike.") ..
 
 	--Dependencies

=== modified file 'tribes/barbarians/barrier/help.lua'
--- tribes/barbarians/barrier/help.lua	2014-04-18 10:08:08 +0000
+++ tribes/barbarians/barrier/help.lua	2014-07-20 17:56:19 +0000
@@ -12,7 +12,7 @@
 	--Lore Section
 	building_help_lore_string("barbarians", building_description, _[[Text needed]], _[[Source needed]]) ..
 	--General Section
-	building_help_general_string("barbarians", building_description, "soldier",
+	building_help_general_string("barbarians", building_description,
 		_"Garrisons soldiers to expand your territory.",
 		_"If you’re low on soldiers to occupy new military sites, use the downward arrow button to decrease the capacity. You can also click on a soldier to send him away.") ..
 

=== modified file 'tribes/barbarians/battlearena/help.lua'
--- tribes/barbarians/battlearena/help.lua	2014-05-27 14:14:14 +0000
+++ tribes/barbarians/battlearena/help.lua	2014-07-20 17:56:19 +0000
@@ -15,7 +15,7 @@
 	building_help_lore_string("barbarians", building_description, _[[‘No better friend you have in battle than the enemy’s blow that misses.’]], _[[Said to originate from Neidhardt, the famous trainer.]]) ..
 
 	--General Section
-	building_help_general_string("barbarians", building_description, "soldier",
+	building_help_general_string("barbarians", building_description,
 		_"Trains soldiers in ‘Evade’." .. " " .. _"‘Evade’ increases the soldier’s chance not to be hit by the enemy and so to remain totally unaffected.",
 		_"Barbarian soldiers cannot be trained in ‘Defense’ and will remain at the level with which they came.") ..
 

=== modified file 'tribes/barbarians/big_inn/help.lua'
--- tribes/barbarians/big_inn/help.lua	2014-05-26 18:14:46 +0000
+++ tribes/barbarians/big_inn/help.lua	2014-07-20 17:56:19 +0000
@@ -13,7 +13,7 @@
 	building_help_lore_string("barbarians", building_description, _[[Text needed]], _[[Source needed]]) ..
 
 	--General Section
-	building_help_general_string("barbarians", building_description, "meal",
+	building_help_general_string("barbarians", building_description,
 		_[[Text needed]]) ..
 
 	--Dependencies

=== modified file 'tribes/barbarians/brewery/help.lua'
--- tribes/barbarians/brewery/help.lua	2014-05-26 18:14:46 +0000
+++ tribes/barbarians/brewery/help.lua	2014-07-20 17:56:19 +0000
@@ -13,7 +13,7 @@
 	building_help_lore_string("barbarians", building_description, _[[Text needed]], _[[Source needed]]) ..
 
 	--General Section
-	building_help_general_string("barbarians", building_description, "strongbeer",
+	building_help_general_string("barbarians", building_description,
 		_[[Text needed]]) ..
 
 	--Dependencies

=== modified file 'tribes/barbarians/burners_house/help.lua'
--- tribes/barbarians/burners_house/help.lua	2014-05-27 14:14:14 +0000
+++ tribes/barbarians/burners_house/help.lua	2014-07-20 17:56:19 +0000
@@ -13,7 +13,7 @@
 	building_help_lore_string("barbarians", building_description, _[[Text needed]], _[[Source needed]]) ..
 
 	--General Section
-	building_help_general_string("barbarians", building_description, "coal",
+	building_help_general_string("barbarians", building_description,
 		_[[Text needed]]) ..
 
 	--Dependencies

=== modified file 'tribes/barbarians/cattlefarm/help.lua'
--- tribes/barbarians/cattlefarm/help.lua	2014-05-26 18:14:46 +0000
+++ tribes/barbarians/cattlefarm/help.lua	2014-07-20 17:56:19 +0000
@@ -13,11 +13,10 @@
 	building_help_lore_string("barbarians", building_description, _[[Text needed]], _[[Source needed]]) ..
 
 	--General Section
-	building_help_general_string("barbarians", building_description, "ox",
+	building_help_general_string("barbarians", building_description,
 		_"Breeds oxen for adding them to the transportation system.") ..
 
 	--Dependencies
-	-- TODO: why is "Produces" empty?
 	building_help_dependencies_production("barbarians", building_description) ..
 
 	--Workers Section

=== modified file 'tribes/barbarians/citadel/help.lua'
--- tribes/barbarians/citadel/help.lua	2014-04-18 10:08:08 +0000
+++ tribes/barbarians/citadel/help.lua	2014-07-20 17:56:19 +0000
@@ -12,7 +12,7 @@
 	--Lore Section
 	building_help_lore_string("barbarians", building_description, _[[Text needed]], _[[Source needed]]) ..
 	--General Section
-	building_help_general_string("barbarians", building_description, "soldier",
+	building_help_general_string("barbarians", building_description,
 		_"Garrisons soldiers to expand your territory.",
 		_"If you’re low on soldiers to occupy new military sites, use the downward arrow button to decrease the capacity. You can also click on a soldier to send him away.") ..
 

=== modified file 'tribes/barbarians/coalmine/help.lua'
--- tribes/barbarians/coalmine/help.lua	2014-05-26 18:14:46 +0000
+++ tribes/barbarians/coalmine/help.lua	2014-07-20 17:56:19 +0000
@@ -14,7 +14,7 @@
 Wood may serve for a household fire and to keep you warm, but when it comes to working with iron or gold, there is no way around coal.]]) ..
 
 	--General Section
-	building_help_general_string("barbarians", building_description, "coal",
+	building_help_general_string("barbarians", building_description,
 		_"Digs coal out of the ground in mountain terrain.",
 		_"This mine exploits only %s of the resource. From there on out, it will only have a 5%% chance of finding any coal.":bformat("1/3")) ..
 

=== modified file 'tribes/barbarians/deep_coalmine/help.lua'
--- tribes/barbarians/deep_coalmine/help.lua	2014-05-26 18:14:46 +0000
+++ tribes/barbarians/deep_coalmine/help.lua	2014-07-20 17:56:19 +0000
@@ -16,7 +16,7 @@
 
 	--General Section
 	-- Keeping the parameters here hardcoded for the moment, too hard to get from C++.
-	building_help_general_string("barbarians", building_description, "coal",
+	building_help_general_string("barbarians", building_description,
 		_"Digs coal out of the ground in mountain terrain.",
 		_"This mine exploits only %s of the resource. From there on out, it will only have a 5%% chance of finding any coal.":bformat("2/3")) ..
 

=== modified file 'tribes/barbarians/deep_goldmine/help.lua'
--- tribes/barbarians/deep_goldmine/help.lua	2014-05-26 18:14:46 +0000
+++ tribes/barbarians/deep_goldmine/help.lua	2014-07-20 17:56:19 +0000
@@ -14,7 +14,7 @@
 	building_help_lore_string("barbarians", building_description, _[[‘Soft and supple.<br> And yet untouched by time and weather.<br> Rays of sun, wrought into eternity ...’]], _[[Excerpt from ‘Our Treasures Underground’,<br> a traditional Barbarian song.]]) ..
 
 	--General Section
-	building_help_general_string("barbarians", building_description, "goldore",
+	building_help_general_string("barbarians", building_description,
 		_"Digs gold ore out of the ground in mountain terrain.",
 		_"This mine exploits only %s of the resource. From there on out, it will only have a 5%% chance of finding any gold ore.":bformat("2/3")) ..
 

=== modified file 'tribes/barbarians/deep_oremine/help.lua'
--- tribes/barbarians/deep_oremine/help.lua	2014-05-26 18:14:46 +0000
+++ tribes/barbarians/deep_oremine/help.lua	2014-07-20 17:56:19 +0000
@@ -14,7 +14,7 @@
 	building_help_lore_string("barbarians", building_description, _[[‘I look at my own pick wearing away day by day and I realize why my work is important.’]], _[[Quote from an anonymous miner.]]) ..
 
 	--General Section
-	building_help_general_string("barbarians", building_description, "ironore",
+	building_help_general_string("barbarians", building_description,
 		_"Digs iron ore out of the ground in mountain terrain.",
 		_"This mine exploits only %s of the resource. From there on out, it will only have a 5%% chance of finding any iron ore.":bformat("2/3")) ..
 

=== modified file 'tribes/barbarians/deeper_coalmine/help.lua'
--- tribes/barbarians/deeper_coalmine/help.lua	2014-05-26 18:14:46 +0000
+++ tribes/barbarians/deeper_coalmine/help.lua	2014-07-20 17:56:19 +0000
@@ -15,7 +15,7 @@
 Wood may serve for a household fire and to keep you warm, but when it comes to working with iron or gold, there is no way around coal.]]) ..
 
 	--General Section
-	building_help_general_string("barbarians", building_description, "coal",
+	building_help_general_string("barbarians", building_description,
 		_"Digs coal out of the ground in mountain terrain.",
 		_"This mine exploits all of the resource down to the deepest level. But even after having done so, it will still have a %s chance of finding some more coal.":bformat("10%")) ..
 

=== modified file 'tribes/barbarians/deeper_goldmine/help.lua'
--- tribes/barbarians/deeper_goldmine/help.lua	2014-05-26 18:14:46 +0000
+++ tribes/barbarians/deeper_goldmine/help.lua	2014-07-20 17:56:19 +0000
@@ -14,7 +14,7 @@
 	building_help_lore_string("barbarians", building_description, _[[‘Soft and supple.<br> And yet untouched by time and weather.<br> Rays of sun, wrought into eternity ...’]], _[[Excerpt from ‘Our Treasures Underground’,<br> a traditional Barbarian song.]]) ..
 
 	--General Section
-	building_help_general_string("barbarians", building_description, "goldore",
+	building_help_general_string("barbarians", building_description,
 		_"Digs gold ore out of the ground in mountain terrain.",
 		_"This mine exploits all of the resource down to the deepest level. But even after having done so, it will still have a %s chance of finding some more gold ore.":bformat("10%")) ..
 

=== modified file 'tribes/barbarians/deeper_oremine/help.lua'
--- tribes/barbarians/deeper_oremine/help.lua	2014-05-26 18:14:46 +0000
+++ tribes/barbarians/deeper_oremine/help.lua	2014-07-20 17:56:19 +0000
@@ -14,7 +14,7 @@
 	building_help_lore_string("barbarians", building_description, _[[‘I look at my own pick wearing away day by day and I realize why my work is important.’]], _[[Quote from an anonymous miner.]]) ..
 
 	--General Section
-	building_help_general_string("barbarians", building_description, "ironore",
+	building_help_general_string("barbarians", building_description,
 		_"Digs iron ore out of the ground in mountain terrain.",
 		_"This mine exploits all of the resource down to the deepest level. But even after having done so, it will still have a %s chance of finding some more iron ore.":bformat("10%")) ..
 

=== modified file 'tribes/barbarians/donjon/help.lua'
--- tribes/barbarians/donjon/help.lua	2014-04-18 10:08:08 +0000
+++ tribes/barbarians/donjon/help.lua	2014-07-20 17:56:19 +0000
@@ -12,7 +12,7 @@
 	--Lore Section
 	building_help_lore_string("barbarians", building_description, _[[Text needed]], _[[Source needed]]) ..
 	--General Section
-	building_help_general_string("barbarians", building_description, "soldier",
+	building_help_general_string("barbarians", building_description,
 		_"Garrisons soldiers to expand your territory.",
 		_"If you’re low on soldiers to occupy new military sites, use the downward arrow button to decrease the capacity. You can also click on a soldier to send him away.") ..
 

=== modified file 'tribes/barbarians/farm/help.lua'
--- tribes/barbarians/farm/help.lua	2014-05-26 18:14:46 +0000
+++ tribes/barbarians/farm/help.lua	2014-07-20 17:56:19 +0000
@@ -13,7 +13,7 @@
 	building_help_lore_string("barbarians", building_description, _[[Text needed]], _[[Source needed]]) ..
 
 	--General Section
-	building_help_general_string("barbarians", building_description, "wheat",
+	building_help_general_string("barbarians", building_description,
 		_"Sow and harvest wheat.") ..
 
 	--Dependencies

=== modified file 'tribes/barbarians/fishers_hut/help.lua'
--- tribes/barbarians/fishers_hut/help.lua	2014-05-26 20:36:01 +0000
+++ tribes/barbarians/fishers_hut/help.lua	2014-07-20 17:56:19 +0000
@@ -13,7 +13,7 @@
 	building_help_lore_string("barbarians", building_description, _[[‘What do you mean, my fish ain’t fresh?!’]], _[[Source needed]]) ..
 
 	--General Section
-	building_help_general_string("barbarians", building_description, "fish",
+	building_help_general_string("barbarians", building_description,
 		_"Fishes on the coast near the hut.",
 		_"The fisher’s hut needs water full of fish within the working radius.") ..
 

=== modified file 'tribes/barbarians/fortress/help.lua'
--- tribes/barbarians/fortress/help.lua	2014-04-18 10:08:08 +0000
+++ tribes/barbarians/fortress/help.lua	2014-07-20 17:56:19 +0000
@@ -12,7 +12,7 @@
 	--Lore Section
 	building_help_lore_string("barbarians", building_description, _[[Text needed]], _[[Source needed]]) ..
 	--General Section
-	building_help_general_string("barbarians", building_description, "soldier",
+	building_help_general_string("barbarians", building_description,
 		_"Garrisons soldiers to expand your territory.",
 		_"If you’re low on soldiers to occupy new military sites, use the downward arrow button to decrease the capacity. You can also click on a soldier to send him away.") ..
 

=== modified file 'tribes/barbarians/gamekeepers_hut/help.lua'
--- tribes/barbarians/gamekeepers_hut/help.lua	2014-05-26 18:14:46 +0000
+++ tribes/barbarians/gamekeepers_hut/help.lua	2014-07-20 17:56:19 +0000
@@ -10,11 +10,13 @@
 	return
 
 	--Lore Section
---	building_help_lore_string("barbarians", building_description, _[[‘He loves the animals and to breed them<br>
---as we love to cook and eat them.’]],_[[Barbarian nursery rhyme]]) ..
+	building_help_lore_string("barbarians", building_description,
+		_[[‘He loves the animals and to breed them<br>
+			as we love to cook and eat them.’]],
+		_[[Barbarian nursery rhyme]]) ..
 
 	--General Section
-	building_help_general_string("barbarians", building_description, "meat",
+	building_help_general_string("barbarians", building_description,
 		_"Releases animals into the wild to steady the meat production.") ..
 
 	--Dependencies

=== modified file 'tribes/barbarians/goldmine/help.lua'
--- tribes/barbarians/goldmine/help.lua	2014-05-26 18:14:46 +0000
+++ tribes/barbarians/goldmine/help.lua	2014-07-20 17:56:19 +0000
@@ -13,7 +13,7 @@
 	building_help_lore_string("barbarians", building_description, _[[‘Soft and supple.<br> And yet untouched by time and weather.<br> Rays of sun, wrought into eternity ...’]], _[[Excerpt from ‘Our Treasures Underground’,<br> a traditional Barbarian song.]]) ..
 
 	--General Section
-	building_help_general_string("barbarians", building_description, "goldore",
+	building_help_general_string("barbarians", building_description,
 		_"Digs gold ore out of the ground in mountain terrain.",
 		_"This mine exploits only %s of the resource. From there on out, it will only have a 5%% chance of finding any gold ore.":bformat("1/3")) ..
 

=== modified file 'tribes/barbarians/granitemine/help.lua'
--- tribes/barbarians/granitemine/help.lua	2014-06-26 05:24:04 +0000
+++ tribes/barbarians/granitemine/help.lua	2014-07-20 17:56:19 +0000
@@ -13,7 +13,7 @@
 	building_help_lore_string("barbarians", building_description, _[[‘I can handle tons of granite, man, but no more of your vain prattle.’]], _[[This phrase was the reply Rimbert the miner – later known as Rimbert the loner – gave, when he was asked to remain seated on an emergency meeting at Stonford in the year of the great flood. <br> The same man had all the 244 granite blocks ready only a week later, and they still fortify the city’s levee.]]) ..
 
 	--General Section
-	building_help_general_string("barbarians", building_description, "raw_stone",
+	building_help_general_string("barbarians", building_description,
 		_"Carve raw stone out of the rock in mountain terrain.",
 		_"This mine exploits all of the resource down to the deepest level. But even after having done so, it will still have a %s chance of finding some more raw stone.":bformat("5%") .. "<br>" .. _"It cannot be upgraded.") ..
 

=== modified file 'tribes/barbarians/hardener/help.lua'
--- tribes/barbarians/hardener/help.lua	2014-05-26 18:14:46 +0000
+++ tribes/barbarians/hardener/help.lua	2014-07-20 17:56:19 +0000
@@ -13,7 +13,7 @@
 	building_help_lore_string("barbarians", building_description, _[[Text needed]], _[[Source needed]]) ..
 
 	--General Section
-	building_help_general_string("barbarians", building_description, "blackwood",
+	building_help_general_string("barbarians", building_description,
 		_[[Text needed]]) ..
 
 	--Dependencies

=== modified file 'tribes/barbarians/headquarters/help.lua'
--- tribes/barbarians/headquarters/help.lua	2014-04-18 10:08:08 +0000
+++ tribes/barbarians/headquarters/help.lua	2014-07-20 17:56:19 +0000
@@ -12,7 +12,7 @@
 	--Lore Section
 	building_help_lore_string("barbarians", building_description, _[[Text needed]], _[[Source needed]]) ..
 	--General Section
-	building_help_general_string("barbarians", building_description, "carrier",
+	building_help_general_string("barbarians", building_description,
 		_"Accomodation for your people. Also stores your wares and tools.",
 		_"The headquarters is your main building." .. "<br>" .. _[[Text needed]]) ..
 

=== modified file 'tribes/barbarians/headquarters_interim/help.lua'
--- tribes/barbarians/headquarters_interim/help.lua	2014-04-18 10:08:08 +0000
+++ tribes/barbarians/headquarters_interim/help.lua	2014-07-20 17:56:19 +0000
@@ -12,7 +12,7 @@
 	--Lore Section
 	building_help_lore_string("barbarians", building_description, _[[Text needed]], _[[Source needed]]) ..
 	--General Section
-	building_help_general_string("barbarians", building_description, "carrier",
+	building_help_general_string("barbarians", building_description,
 		_"Accomodation for your people. Also stores your wares and tools.",
 		_"The headquarters is your main building." .. "<br>" .. _[[Text needed]]) ..
 

=== modified file 'tribes/barbarians/helmsmithy/help.lua'
--- tribes/barbarians/helmsmithy/help.lua	2014-05-26 18:14:46 +0000
+++ tribes/barbarians/helmsmithy/help.lua	2014-07-20 17:56:19 +0000
@@ -13,7 +13,7 @@
 	building_help_lore_string("barbarians", building_description, _[[Text needed]], _[[Source needed]]) ..
 
 	--General Section
-	building_help_general_string("barbarians", building_description, "helm",
+	building_help_general_string("barbarians", building_description,
 		_[[Text needed]]) ..
 
 	--Dependencies

=== modified file 'tribes/barbarians/hunters_hut/help.lua'
--- tribes/barbarians/hunters_hut/help.lua	2014-05-26 18:14:46 +0000
+++ tribes/barbarians/hunters_hut/help.lua	2014-07-20 17:56:19 +0000
@@ -13,7 +13,7 @@
 	building_help_lore_string("barbarians", building_description, _[[‘As silent as a panther,<br> as deft as a weasel,<br> as swift as an arrow,<br> as deadly as a viper.’]], _[[‘The Art of Hunting’]]) ..
 
 	--General Section
-	building_help_general_string("barbarians", building_description, "meat",
+	building_help_general_string("barbarians", building_description,
 		_"Hunts animals to produce meat.",
 		_"The hunter’s hut needs animals to hunt within the working radius.") ..
 

=== modified file 'tribes/barbarians/inn/help.lua'
--- tribes/barbarians/inn/help.lua	2014-05-26 18:14:46 +0000
+++ tribes/barbarians/inn/help.lua	2014-07-20 17:56:19 +0000
@@ -13,7 +13,7 @@
 	building_help_lore_string("barbarians", building_description, _[[Text needed]], _[[Source needed]]) ..
 
 	--General Section
-	building_help_general_string("barbarians", building_description, "snack",
+	building_help_general_string("barbarians", building_description,
 		_[[Text needed]]) ..
 
 	--Dependencies

=== modified file 'tribes/barbarians/lime_kiln/help.lua'
--- tribes/barbarians/lime_kiln/help.lua	2014-05-26 12:44:12 +0000
+++ tribes/barbarians/lime_kiln/help.lua	2014-07-20 17:56:19 +0000
@@ -13,7 +13,7 @@
 	building_help_lore_string("barbarians", building_description, _[[‘Forming new stone from old with fire and water.’]], _[[Ragnald the Child’s answer to the question, what he’s doing in the dirt. His ‘new stone’ now is an important building material.]]) ..
 
 	--General Section
-	building_help_general_string("barbarians", building_description, "grout",
+	building_help_general_string("barbarians", building_description,
 		_[[The Lime Kiln processes Raw Stones to make ‘Grout’, a substance that solidifies and so reinforces masonry.]],
 		_"The Lime Kiln’s output will only go to construction sites that need it. Those are predominantly houses that work with fire, and some military sites.") ..
 

=== modified file 'tribes/barbarians/lumberjacks_hut/help.lua'
--- tribes/barbarians/lumberjacks_hut/help.lua	2014-05-27 14:14:14 +0000
+++ tribes/barbarians/lumberjacks_hut/help.lua	2014-07-20 17:56:19 +0000
@@ -12,7 +12,7 @@
 	--Lore Section
 	building_help_lore_string("barbarians", building_description, _[["Take 200 hits to fell a tree and you're a baby. Take 100 and you're a soldier. Take 50 and you're a hero. Take 20 and soon you will be a honorable lumberjack."]],_[[Krumta, carpenter of Chat'Karuth]]) ..
 	--General Section
-	building_help_general_string("barbarians", building_description, "log",
+	building_help_general_string("barbarians", building_description,
 		_"Fell trees in the surrounding area and process them into logs.",
 		_"The lumberjack's hut needs trees to fell within the working radius.") ..
 

=== modified file 'tribes/barbarians/metalworks/help.lua'
--- tribes/barbarians/metalworks/help.lua	2014-05-26 12:44:12 +0000
+++ tribes/barbarians/metalworks/help.lua	2014-07-20 17:56:19 +0000
@@ -13,7 +13,7 @@
 	building_help_lore_string("barbarians", building_description, _[[‘We make it work!’]], _[[Inscription on the threshold of the now ruined Olde Forge at Harradsheim, the eldest known smithy.]]) ..
 
 	--General Section
-	building_help_general_string("barbarians", building_description, "hammer",
+	building_help_general_string("barbarians", building_description,
 		_"The barbarian metal workshop can make bread paddles, felling axes, fire tongs, fishing rods, hammers, hunting spears, kitchen tools, picks, scythes and shovels.",
 		_"The barbarian metal workshop is the basic production site in a series of three buildings and creates all the tools that barbarians need. The others are for weapons.") ..
 

=== modified file 'tribes/barbarians/micro-brewery/help.lua'
--- tribes/barbarians/micro-brewery/help.lua	2014-05-26 18:14:46 +0000
+++ tribes/barbarians/micro-brewery/help.lua	2014-07-20 17:56:19 +0000
@@ -13,7 +13,7 @@
 	building_help_lore_string("barbarians", building_description, _[[‘Let the first one drive away the hunger, the second one put you at ease; when you have swallowed up your third one, it’s time for the next shift!’]], _[[Widespread toast among Miners]]) ..
 
 	--General Section
-	building_help_general_string("barbarians", building_description, "beer",
+	building_help_general_string("barbarians", building_description,
 		_"The micro brewery produces Beer of the lower grade. This beer is a vital component of the snacks that inns and big inns prepare for miners in deep mines.") ..
 
 	--Dependencies

=== modified file 'tribes/barbarians/oremine/help.lua'
--- tribes/barbarians/oremine/help.lua	2014-05-26 18:14:46 +0000
+++ tribes/barbarians/oremine/help.lua	2014-07-20 17:56:19 +0000
@@ -13,7 +13,7 @@
 	building_help_lore_string("barbarians", building_description, _[[‘I look at my own pick wearing away day by day and I realize why my work is important.’]], _[[Quote from an anonymous miner.]]) ..
 
 	--General Section
-	building_help_general_string("barbarians", building_description, "ironore",
+	building_help_general_string("barbarians", building_description,
 		_"Digs iron ore out of the ground in mountain terrain.",
 		_"This mine exploits only %s of the resource. From there on out, it will only have a 5%% chance of finding any iron ore.":bformat("1/3")) ..
 

=== modified file 'tribes/barbarians/port/help.lua'
--- tribes/barbarians/port/help.lua	2014-05-26 20:36:01 +0000
+++ tribes/barbarians/port/help.lua	2014-07-20 17:56:19 +0000
@@ -13,12 +13,11 @@
 	building_help_lore_string("barbarians", building_description, _[[Text needed]], _[[Source needed]]) ..
 
 	--General Section
-	-- TODO this building acts like a warehouse
-	building_help_general_string("barbarians", building_description, "ship",
+	building_help_general_string("barbarians", building_description,
 		_[[Text needed]]) ..
 
 	--Dependencies
-	-- TODO expedition costs here?
+	-- TODO(GunChleoc) expedition costs here?
 
 	--Building Section
 	building_help_building_section("barbarians", building_description) ..

=== modified file 'tribes/barbarians/quarry/help.lua'
--- tribes/barbarians/quarry/help.lua	2014-05-26 20:36:01 +0000
+++ tribes/barbarians/quarry/help.lua	2014-07-20 17:56:19 +0000
@@ -13,7 +13,7 @@
 	building_help_lore_string("barbarians", building_description, _[[Text needed]],_[[Source needed]]) ..
 
 	--General Section
-	building_help_general_string("barbarians", building_description, "raw_stone",
+	building_help_general_string("barbarians", building_description,
 		_"Carves raw stone out of rocks in the vicinity.", _"The quarry needs stones to cut within the working radius.") ..
 
 	--Dependencies

=== modified file 'tribes/barbarians/rangers_hut/help.lua'
--- tribes/barbarians/rangers_hut/help.lua	2014-05-26 18:14:46 +0000
+++ tribes/barbarians/rangers_hut/help.lua	2014-07-20 17:56:19 +0000
@@ -14,7 +14,7 @@
 	building_help_lore_string("barbarians", building_description, _[[‘He who can grow two trees where normally only one will grow exceeds the most important general!’]],_[[Chat’Karuth in a conversation with a Ranger]]) ..
 
 	--General Section
-	building_help_general_string("barbarians", building_description, "log",
+	building_help_general_string("barbarians", building_description,
 		_"Plants trees in the surrounding area.",
 		_"The ranger’s hut needs free space within the working radius to plant the trees.") ..
 

=== modified file 'tribes/barbarians/reed_yard/help.lua'
--- tribes/barbarians/reed_yard/help.lua	2014-05-26 18:14:46 +0000
+++ tribes/barbarians/reed_yard/help.lua	2014-07-20 17:56:19 +0000
@@ -13,7 +13,7 @@
 	building_help_lore_string("barbarians", building_description, _[[‘We grow roofs’]],_[[Slogan of the Guild of Gardeners]]) ..
 
 	--General Section
-	building_help_general_string("barbarians", building_description, "thatchreed",
+	building_help_general_string("barbarians", building_description,
 		_"The Reed Yard cultivates reed that serves two different purposes for the Barbarian tribe.",
 		"Thatch reed is the traditional material for roofing, and it is woven into the extremely durable cloth that they use for their ships’ sails.") ..
 

=== modified file 'tribes/barbarians/scouts_hut/help.lua'
--- tribes/barbarians/scouts_hut/help.lua	2014-05-26 18:14:46 +0000
+++ tribes/barbarians/scouts_hut/help.lua	2014-07-20 17:56:19 +0000
@@ -13,7 +13,7 @@
 	building_help_lore_string("barbarians", building_description, _[[Text needed]],_[[Source needed]]) ..
 
 	--General Section
-	building_help_general_string("barbarians", building_description, "scout",
+	building_help_general_string("barbarians", building_description,
 		_[[Text needed]]) ..
 
 	--Dependencies

=== modified file 'tribes/barbarians/sentry/help.lua'
--- tribes/barbarians/sentry/help.lua	2014-04-18 10:08:08 +0000
+++ tribes/barbarians/sentry/help.lua	2014-07-20 17:56:19 +0000
@@ -12,7 +12,7 @@
 	--Lore Section
 	building_help_lore_string("barbarians", building_description, _[[Text needed]], _[[Source needed]]) ..
 	--General Section
-	building_help_general_string("barbarians", building_description, "soldier",
+	building_help_general_string("barbarians", building_description,
 		_"Garrisons soldiers to expand your territory.",
 		_"If you’re low on soldiers to occupy new military sites, use the downward arrow button to decrease the capacity. You can also click on a soldier to send him away.") ..
 

=== modified file 'tribes/barbarians/shipyard/help.lua'
--- tribes/barbarians/shipyard/help.lua	2014-05-26 18:14:46 +0000
+++ tribes/barbarians/shipyard/help.lua	2014-07-20 17:56:19 +0000
@@ -10,11 +10,10 @@
 	return
 
 	--Lore Section
--- TODO crashes because of missing image
-	--building_help_lore_string("barbarians", building_description, _[[Text needed]], _[[Source needed]]) ..
+	building_help_lore_string("barbarians", building_description, _[[Text needed]], _[[Source needed]]) ..
 
 	--General Section
-	building_help_general_string("barbarians", building_description, "shipwright",
+	building_help_general_string("barbarians", building_description,
 		_[[Text needed]]) ..
 
 	--Dependencies

=== modified file 'tribes/barbarians/smelting_works/help.lua'
--- tribes/barbarians/smelting_works/help.lua	2014-05-26 18:14:46 +0000
+++ tribes/barbarians/smelting_works/help.lua	2014-07-20 17:56:19 +0000
@@ -13,7 +13,7 @@
 	building_help_lore_string("barbarians", building_description, _[[Text needed]], _[[Source needed]]) ..
 
 	--General Section
-	building_help_general_string("barbarians", building_description, "iron",
+	building_help_general_string("barbarians", building_description,
 		_"Smelts iron ore into iron and gold ore into gold.") ..
 
 	--Dependencies

=== modified file 'tribes/barbarians/tavern/help.lua'
--- tribes/barbarians/tavern/help.lua	2014-05-26 18:14:46 +0000
+++ tribes/barbarians/tavern/help.lua	2014-07-20 17:56:19 +0000
@@ -13,7 +13,7 @@
 	building_help_lore_string("barbarians", building_description, _[[Text needed]], _[[Source needed]]) ..
 
 	--General Section
-	building_help_general_string("barbarians", building_description, "ration",
+	building_help_general_string("barbarians", building_description,
 		_[[Text needed]]) ..
 
 	--Dependencies

=== modified file 'tribes/barbarians/trainingcamp/help.lua'
--- tribes/barbarians/trainingcamp/help.lua	2014-05-27 14:14:14 +0000
+++ tribes/barbarians/trainingcamp/help.lua	2014-07-20 17:56:19 +0000
@@ -15,7 +15,7 @@
 	building_help_lore_string("barbarians", building_description, _[[‘He who is strong shall neither forgive nor forget, but revenge injustice suffered – in the past and for all future.’]], _[[Chief Chat’Karuth in a speech to his army.]]) ..
 
 	--General Section
-	building_help_general_string("barbarians", building_description, "soldier",
+	building_help_general_string("barbarians", building_description,
 		_"Trains soldiers in ‘Attack’ and in ‘Health’."
 			.. " " .."Equips the soldiers with all necessary weapons and armor parts.",
 		_"Barbarian soldiers cannot be trained in ‘Defense’ and will remain at their initial level.") ..
@@ -27,7 +27,7 @@
 	rt(h3(_"Attack Training:")) ..
 	dependencies_training_food("barbarians", { {"fish", "meat"}, {"pittabread"}}) ..
 	dependencies_training_weapons("barbarians", building_description, "and", {"sharpax", "broadax"}, "axfactory") ..
-	dependencies_training_weapons("barbarians", building_description, "or", 
+	dependencies_training_weapons("barbarians", building_description, "or",
 		{"sharpax", "broadax", "bronzeax", "battleax", "warriorsax"}, "warmill") ..
 
 	rt(h3(_"Health Training:")) ..

=== modified file 'tribes/barbarians/warehouse/help.lua'
--- tribes/barbarians/warehouse/help.lua	2014-05-26 18:14:46 +0000
+++ tribes/barbarians/warehouse/help.lua	2014-07-20 17:56:19 +0000
@@ -12,7 +12,7 @@
 	--Lore Section
 	building_help_lore_string("barbarians", building_description, _[[Text needed]], _[[Source needed]]) ..
 	--General Section
-	building_help_general_string("barbarians", building_description, "log",
+	building_help_general_string("barbarians", building_description,
 		_"Warehouses store soldiers, wares and tools.") ..
 
 	--Building Section

=== modified file 'tribes/barbarians/warmill/help.lua'
--- tribes/barbarians/warmill/help.lua	2014-05-26 12:44:12 +0000
+++ tribes/barbarians/warmill/help.lua	2014-07-20 17:56:19 +0000
@@ -13,7 +13,7 @@
 	building_help_lore_string("barbarians", building_description, _[[‘A new warrior’s ax brings forth the best in its wielder – or the worst in its maker.’]], _[[An old Barbarian proverb<br> meaning that you need to take some risks sometimes.]]) ..
 
 	--General Section
-	building_help_general_string("barbarians", building_description, "ax",
+	building_help_general_string("barbarians", building_description,
 		_"The war mill produces all the axes that the barbarians use for warfare.",
 		_"The barbarian war mill is their most advanced production site for weapons. As such it needs to be upgraded from an axfactory.") ..
 

=== modified file 'tribes/barbarians/weaving-mill/help.lua'
--- tribes/barbarians/weaving-mill/help.lua	2014-05-26 18:14:46 +0000
+++ tribes/barbarians/weaving-mill/help.lua	2014-07-20 17:56:19 +0000
@@ -13,7 +13,7 @@
 	building_help_lore_string("barbarians", building_description, _[[Text needed]], _[[Source needed]]) ..
 
 	--General Section
-	building_help_general_string("barbarians", building_description, "cloth",
+	building_help_general_string("barbarians", building_description,
 		_"Weaves cloth out of thatch reed.") ..
 
 	--Dependencies

=== modified file 'tribes/barbarians/well/help.lua'
--- tribes/barbarians/well/help.lua	2014-05-26 20:36:01 +0000
+++ tribes/barbarians/well/help.lua	2014-07-20 17:56:19 +0000
@@ -14,7 +14,7 @@
 
 	--General Section
 	--General Section
-	building_help_general_string("barbarians", building_description, "water",
+	building_help_general_string("barbarians", building_description,
 		_"Draws water out of the deep.") ..
 
 	--Dependencies

=== modified file 'tribes/empire/arena/help.lua'
--- tribes/empire/arena/help.lua	2014-05-27 14:14:14 +0000
+++ tribes/empire/arena/help.lua	2014-07-20 17:56:19 +0000
@@ -21,7 +21,7 @@
 
 	--Dependencies
 	-- We would need to parse the production programs to automate the parameters here; so we do it manually
-	-- TODO create images for this
+	-- TODO(GunChleoc) create images for this
 	-- dependencies_training("empire", building_description, "untrained+evade", "fulltrained-evade") ..
 
 	rt(h3(_"Evade Training:")) ..

=== modified file 'tribes/empire/armorsmithy/help.lua'
--- tribes/empire/armorsmithy/help.lua	2014-05-26 20:36:01 +0000
+++ tribes/empire/armorsmithy/help.lua	2014-07-20 17:56:19 +0000
@@ -10,10 +10,10 @@
 	return
 
 	--Lore Section
-	-- TODO rename pictures building_help_lore_string("empire", building_description, _[[Text needed]], _[[Source needed]]) ..
+	building_help_lore_string("empire", building_description, _[[Text needed]], _[[Source needed]]) ..
 
 	--General Section
-	building_help_general_string("empire", building_description, "helm",
+	building_help_general_string("empire", building_description,
 		_[[Text needed]]) ..
 
 	--Dependencies

=== modified file 'tribes/empire/bakery/help.lua'
--- tribes/empire/bakery/help.lua	2014-05-26 20:36:01 +0000
+++ tribes/empire/bakery/help.lua	2014-07-20 17:56:19 +0000
@@ -13,7 +13,7 @@
 	building_help_lore_string("empire", building_description, _[[Text needed]], _[[Source needed]]) ..
 
 	--General Section
-	building_help_general_string("empire", building_description, "bread",
+	building_help_general_string("empire", building_description,
 		_[[Text needed]]) ..
 
 	--Dependencies

=== modified file 'tribes/empire/barracks/help.lua'
--- tribes/empire/barracks/help.lua	2014-05-26 20:36:01 +0000
+++ tribes/empire/barracks/help.lua	2014-07-20 17:56:19 +0000
@@ -12,7 +12,7 @@
 	--Lore Section
 	building_help_lore_string("empire", building_description, _[[Text needed]], _[[Source needed]]) ..
 	--General Section
-	building_help_general_string("empire", building_description, "soldier",
+	building_help_general_string("empire", building_description,
 		_"Garrisons soldiers to expand your territory.",
 		_"If you’re low on soldiers to occupy new military sites, use the downward arrow button to decrease the capacity. You can also click on a soldier to send him away.") ..
 

=== modified file 'tribes/empire/barrier/help.lua'
--- tribes/empire/barrier/help.lua	2014-04-18 10:29:47 +0000
+++ tribes/empire/barrier/help.lua	2014-07-20 17:56:19 +0000
@@ -12,12 +12,12 @@
 	--Lore Section
 	building_help_lore_string("empire", building_description, _[[Text needed]], _[[Source needed]]) ..
 	--General Section
-	building_help_general_string("empire", building_description, "soldier",
+	building_help_general_string("empire", building_description,
 		_"Garrisons soldiers to expand your territory.",
 		_"If you’re low on soldiers to occupy new military sites, use the downward arrow button to decrease the capacity. You can also click on a soldier to send him away.") ..
 
 	--Building Section
-	-- TODO this building can both be upgraded or built directly.
+	-- This building can both be upgraded or built directly.
 	-- Display build cost, upgrade cost, and dismantle costs for both versions.
 	-- Dismantle returns for upgraded version: 2 stone, 1 wood, 1 marble
 	-- Dismantle returns for built version: 1 stone, 1 log, 1 wood

=== modified file 'tribes/empire/brewery/help.lua'
--- tribes/empire/brewery/help.lua	2014-05-26 20:36:01 +0000
+++ tribes/empire/brewery/help.lua	2014-07-20 17:56:19 +0000
@@ -13,7 +13,7 @@
 	building_help_lore_string("empire", building_description, _[[Text needed]], _[[Source needed]]) ..
 
 	--General Section
-	building_help_general_string("empire", building_description, "beer",
+	building_help_general_string("empire", building_description,
 		_[[Text needed]]) ..
 
 	--Dependencies

=== modified file 'tribes/empire/burners_house/help.lua'
--- tribes/empire/burners_house/help.lua	2014-05-27 14:14:14 +0000
+++ tribes/empire/burners_house/help.lua	2014-07-20 17:56:19 +0000
@@ -13,7 +13,7 @@
 	building_help_lore_string("empire", building_description, _[[Text needed]], _[[Source needed]]) ..
 
 	--General Section
-	building_help_general_string("empire", building_description, "coal",
+	building_help_general_string("empire", building_description,
 		_[[Text needed]]) ..
 
 	--Dependencies

=== modified file 'tribes/empire/castle/help.lua'
--- tribes/empire/castle/help.lua	2014-05-27 14:14:14 +0000
+++ tribes/empire/castle/help.lua	2014-07-20 17:56:19 +0000
@@ -12,7 +12,7 @@
 	--Lore Section
 	building_help_lore_string("empire", building_description, _[[Text needed]], _[[Source needed]]) ..
 	--General Section
-	building_help_general_string("empire", building_description, "soldier",
+	building_help_general_string("empire", building_description,
 		_"Garrisons soldiers to expand your territory.",
 		_"If you’re low on soldiers to occupy new military sites, use the downward arrow button to decrease the capacity. You can also click on a soldier to send him away.") ..
 

=== modified file 'tribes/empire/coalmine/help.lua'
--- tribes/empire/coalmine/help.lua	2014-05-26 20:36:01 +0000
+++ tribes/empire/coalmine/help.lua	2014-07-20 17:56:19 +0000
@@ -13,9 +13,9 @@
 	building_help_lore_string("empire", building_description, _[[Text needed]]) ..
 
 	--General Section
-	building_help_general_string("empire", building_description, "coal",
+	building_help_general_string("empire", building_description,
 		_"Digs coal out of the ground in mountain terrain.") ..
--- TODO  calculate "This mine exploits only %s of the resource. From there on out, it will only have a 5%% chance of finding any coal.":bformat("1/3"))
+-- TODO(GunChleoc)  calculation needed "This mine exploits only %s of the resource. From there on out, it will only have a 5%% chance of finding any coal.":bformat("1/3"))
 
 	--Dependencies
 	building_help_dependencies_production("empire", building_description) ..

=== modified file 'tribes/empire/colosseum/help.lua'
--- tribes/empire/colosseum/help.lua	2014-05-27 14:14:14 +0000
+++ tribes/empire/colosseum/help.lua	2014-07-20 17:56:19 +0000
@@ -15,13 +15,13 @@
 	building_help_lore_string("empire", building_description, _[[Text needed]]) ..
 
 	--General Section
-	building_help_general_string("empire", building_description, "soldier",
+	building_help_general_string("empire", building_description,
 		_"Trains soldiers in ‘Evade’." .. " " .. _"‘Evade’ increases the soldier’s chance not to be hit by the enemy and so to remain totally unaffected.",
 		_"Imperial soldiers cannot be trained in ‘Defense’ and will remain at the level with which they came.") ..
 
 	--Dependencies
 	-- We would need to parse the production programs to automate the parameters here; so we do it manually
-	-- TODO create images for this
+	-- TODO(GunChleoc) create images for this
 	-- dependencies_training("empire", building_description, "untrained+evade", "fulltrained-evade") ..
 
 	rt(h3(_"Evade Training:")) ..

=== modified file 'tribes/empire/deep_coalmine/help.lua'
--- tribes/empire/deep_coalmine/help.lua	2014-05-26 20:36:01 +0000
+++ tribes/empire/deep_coalmine/help.lua	2014-07-20 17:56:19 +0000
@@ -14,7 +14,7 @@
 
 	--General Section
 	-- Keeping the parameters here hardcoded for the moment, too hard to get from C++.
-	building_help_general_string("empire", building_description, "coal",
+	building_help_general_string("empire", building_description,
 		_"Digs coal out of the ground in mountain terrain.") ..
 
 	--Dependencies

=== modified file 'tribes/empire/deep_goldmine/help.lua'
--- tribes/empire/deep_goldmine/help.lua	2014-05-26 20:36:01 +0000
+++ tribes/empire/deep_goldmine/help.lua	2014-07-20 17:56:19 +0000
@@ -13,7 +13,7 @@
 	building_help_lore_string("empire", building_description, _[[Text needed]], _[[Text needed]]) ..
 
 	--General Section
-	building_help_general_string("empire", building_description, "goldore",
+	building_help_general_string("empire", building_description,
 		_"Digs gold ore out of the ground in mountain terrain.") ..
 
 	--Dependencies

=== modified file 'tribes/empire/deep_marblemine/help.lua'
--- tribes/empire/deep_marblemine/help.lua	2014-05-26 20:36:01 +0000
+++ tribes/empire/deep_marblemine/help.lua	2014-07-20 17:56:19 +0000
@@ -13,7 +13,7 @@
 	building_help_lore_string("empire", building_description, _[[Text needed]], _[[Text needed]]) ..
 
 	--General Section
-	building_help_general_string("empire", building_description, "marble",
+	building_help_general_string("empire", building_description,
 		_"Digs marble and stones out of the ground in mountain terrain.") ..
 
 	--Dependencies

=== modified file 'tribes/empire/deep_oremine/help.lua'
--- tribes/empire/deep_oremine/help.lua	2014-05-26 20:36:01 +0000
+++ tribes/empire/deep_oremine/help.lua	2014-07-20 17:56:19 +0000
@@ -13,7 +13,7 @@
 	building_help_lore_string("empire", building_description, _[[Text needed]], _[[Text needed]]) ..
 
 	--General Section
-	building_help_general_string("empire", building_description, "ironore",
+	building_help_general_string("empire", building_description,
 		_"Digs iron ore out of the ground in mountain terrain.") ..
 
 	--Dependencies

=== modified file 'tribes/empire/donkeyfarm/help.lua'
--- tribes/empire/donkeyfarm/help.lua	2014-05-26 20:36:01 +0000
+++ tribes/empire/donkeyfarm/help.lua	2014-07-20 17:56:19 +0000
@@ -13,11 +13,10 @@
 	building_help_lore_string("empire", building_description, _[[Text needed]], _[[Source needed]]) ..
 
 	--General Section
-	building_help_general_string("empire", building_description, "donkey",
+	building_help_general_string("empire", building_description,
 		_"Breeds donkeys for adding them to the transportation system.") ..
 
 	--Dependencies
-	-- TODO: why is "Produces" empty?
 	building_help_dependencies_production("empire", building_description) ..
 
 	--Workers Section

=== modified file 'tribes/empire/farm/help.lua'
--- tribes/empire/farm/help.lua	2014-05-26 20:36:01 +0000
+++ tribes/empire/farm/help.lua	2014-07-20 17:56:19 +0000
@@ -13,7 +13,7 @@
 	building_help_lore_string("empire", building_description, _[[Text needed]], _[[Source needed]]) ..
 
 	--General Section
-	building_help_general_string("empire", building_description, "wheat",
+	building_help_general_string("empire", building_description,
 		_"Sow and harvest wheat.") ..
 
 	--Dependencies

=== modified file 'tribes/empire/fishers_house/help.lua'
--- tribes/empire/fishers_house/help.lua	2014-05-27 14:14:14 +0000
+++ tribes/empire/fishers_house/help.lua	2014-07-20 17:56:19 +0000
@@ -13,7 +13,7 @@
 	building_help_lore_string("empire", building_description, _[[Text needed]], _[[Source needed]]) ..
 
 	--General Section
-	building_help_general_string("empire", building_description, "fish",
+	building_help_general_string("empire", building_description,
 		_"Fishes on the coast near the house.",
 		_"The fisher’s house needs water full of fish within the working radius.") ..
 

=== modified file 'tribes/empire/foresters_house/help.lua'
--- tribes/empire/foresters_house/help.lua	2014-07-17 09:27:03 +0000
+++ tribes/empire/foresters_house/help.lua	2014-07-20 17:56:19 +0000
@@ -13,7 +13,7 @@
 	building_help_lore_string("empire", building_description, _[[Text needed]],_[[Source needed]]) ..
 
 	--General Section
-	building_help_general_string("empire", building_description, "log",
+	building_help_general_string("empire", building_description,
 		_"Plants trees in the surrounding area.",
 		_"The foresters’s house needs free space within the working radius to plant the trees.") ..
 

=== modified file 'tribes/empire/fortress/help.lua'
--- tribes/empire/fortress/help.lua	2014-05-26 20:36:01 +0000
+++ tribes/empire/fortress/help.lua	2014-07-20 17:56:19 +0000
@@ -12,7 +12,7 @@
 	--Lore Section
 	building_help_lore_string("empire", building_description, _[[Text needed]], _[[Source needed]]) ..
 	--General Section
-	building_help_general_string("empire", building_description, "soldier",
+	building_help_general_string("empire", building_description,
 		_"Garrisons soldiers to expand your territory.",
 		_"If you’re low on soldiers to occupy new military sites, use the downward arrow button to decrease the capacity. You can also click on a soldier to send him away.") ..
 

=== modified file 'tribes/empire/goldmine/help.lua'
--- tribes/empire/goldmine/help.lua	2014-05-26 20:36:01 +0000
+++ tribes/empire/goldmine/help.lua	2014-07-20 17:56:19 +0000
@@ -13,9 +13,9 @@
 	building_help_lore_string("empire", building_description, _[[Text needed]], _[[Source needed]]) ..
 
 	--General Section
-	building_help_general_string("empire", building_description, "goldore",
+	building_help_general_string("empire", building_description,
 		_"Digs gold ore out of the ground in mountain terrain.") ..
--- TODO calculation needed "This mine exploits only %s of the resource. From there on out, it will only have a 5%% chance of finding any gold ore.":bformat("1/3"))
+-- TODO(GunChleoc) calculation needed "This mine exploits only %s of the resource. From there on out, it will only have a 5%% chance of finding any gold ore.":bformat("1/3"))
 
 	--Dependencies
 	building_help_dependencies_production("empire", building_description) ..

=== modified file 'tribes/empire/headquarters/help.lua'
--- tribes/empire/headquarters/help.lua	2014-05-26 20:36:01 +0000
+++ tribes/empire/headquarters/help.lua	2014-07-20 17:56:19 +0000
@@ -12,7 +12,7 @@
 	--Lore Section
 	building_help_lore_string("empire", building_description, _[[Text needed]], _[[Source needed]]) ..
 	--General Section
-	building_help_general_string("empire", building_description, "carrier",
+	building_help_general_string("empire", building_description,
 		_"Accomodation for your people. Also stores your wares and tools.",
 		_"The headquarters is your main building." .. "<br>" .. _[[Text needed]]) ..
 

=== modified file 'tribes/empire/headquarters_shipwreck/help.lua'
--- tribes/empire/headquarters_shipwreck/help.lua	2014-05-26 20:36:01 +0000
+++ tribes/empire/headquarters_shipwreck/help.lua	2014-07-20 17:56:19 +0000
@@ -12,7 +12,7 @@
 	--Lore Section
 	building_help_lore_string("empire", building_description, _[[Text needed]], _[[Source needed]]) ..
 	--General Section
-	building_help_general_string("empire", building_description, "carrier",
+	building_help_general_string("empire", building_description,
 		_"Although this ship ran aground, it still serves as accomodation for your people. It also stores your wares and tools.",
 		_"The headquarters shipwreck is your main building." .. "<br>" .. _[[Text needed]]) ..
 

=== modified file 'tribes/empire/hunters_house/help.lua'
--- tribes/empire/hunters_house/help.lua	2014-05-26 20:36:01 +0000
+++ tribes/empire/hunters_house/help.lua	2014-07-20 17:56:19 +0000
@@ -13,7 +13,7 @@
 	building_help_lore_string("empire", building_description, _[[Text needed]], _[[Source needed]]) ..
 
 	--General Section
-	building_help_general_string("empire", building_description, "meat",
+	building_help_general_string("empire", building_description,
 		_"Hunts animals to produce meat.",
 		_"The hunter’s house needs animals to hunt within the working radius.") ..
 

=== modified file 'tribes/empire/inn/help.lua'
--- tribes/empire/inn/help.lua	2014-05-26 20:36:01 +0000
+++ tribes/empire/inn/help.lua	2014-07-20 17:56:19 +0000
@@ -13,7 +13,7 @@
 	building_help_lore_string("empire", building_description, _[[Text needed]], _[[Source needed]]) ..
 
 	--General Section
-	building_help_general_string("empire", building_description, "meal",
+	building_help_general_string("empire", building_description,
 		_[[Text needed]]) ..
 
 	--Dependencies

=== modified file 'tribes/empire/lumberjacks_house/help.lua'
--- tribes/empire/lumberjacks_house/help.lua	2014-05-27 14:14:14 +0000
+++ tribes/empire/lumberjacks_house/help.lua	2014-07-20 17:56:19 +0000
@@ -12,7 +12,7 @@
 	--Lore Section
 	building_help_lore_string("empire", building_description, _[[Text needed]],_[[Source needed]]) ..
 	--General Section
-	building_help_general_string("empire", building_description, "log",
+	building_help_general_string("empire", building_description,
 		_"Fell trees in the surrounding area and process them into logs.",
 		_"The lumberjack's house needs trees to fell within the working radius.") ..
 

=== modified file 'tribes/empire/marblemine/help.lua'
--- tribes/empire/marblemine/help.lua	2014-05-26 20:36:01 +0000
+++ tribes/empire/marblemine/help.lua	2014-07-20 17:56:19 +0000
@@ -13,7 +13,7 @@
 	building_help_lore_string("empire", building_description, _[[Text needed]], _[[Source needed]]) ..
 
 	--General Section
-	building_help_general_string("empire", building_description, "marble",
+	building_help_general_string("empire", building_description,
 		_"Carve marble and stones out of the rock in mountain terrain.") ..
 
 	--Dependencies

=== modified file 'tribes/empire/mill/help.lua'
--- tribes/empire/mill/help.lua	2014-05-26 20:36:01 +0000
+++ tribes/empire/mill/help.lua	2014-07-20 17:56:19 +0000
@@ -10,10 +10,10 @@
 	return
 
 	--Lore Section
-	-- TODO rename images building_help_lore_string("empire", building_description, _[[Text needed]], _[[Source needed]]) ..
+	building_help_lore_string("empire", building_description, _[[Text needed]], _[[Source needed]]) ..
 
 	--General Section
-	building_help_general_string("empire", building_description, "flour",
+	building_help_general_string("empire", building_description,
 		_[[Text needed]]) ..
 
 	--Dependencies

=== modified file 'tribes/empire/oremine/help.lua'
--- tribes/empire/oremine/help.lua	2014-05-26 20:36:01 +0000
+++ tribes/empire/oremine/help.lua	2014-07-20 17:56:19 +0000
@@ -13,9 +13,9 @@
 	building_help_lore_string("empire", building_description, _[[Text needed]], _[[Source needed]]) ..
 
 	--General Section
-	building_help_general_string("empire", building_description, "ironore",
+	building_help_general_string("empire", building_description,
 		_"Digs iron ore out of the ground in mountain terrain.") ..
--- TODO calculation needed "This mine exploits only %s of the resource. From there on out, it will only have a 5%% chance of finding any iron ore.":bformat("1/3"))
+-- TODO(GunChleoc) calculation needed "This mine exploits only %s of the resource. From there on out, it will only have a 5%% chance of finding any iron ore.":bformat("1/3"))
 
 	--Dependencies
 	building_help_dependencies_production("empire", building_description) ..

=== modified file 'tribes/empire/outpost/help.lua'
--- tribes/empire/outpost/help.lua	2014-05-26 20:36:01 +0000
+++ tribes/empire/outpost/help.lua	2014-07-20 17:56:19 +0000
@@ -12,7 +12,7 @@
 	--Lore Section
 	building_help_lore_string("empire", building_description, _[[Text needed]], _[[Source needed]]) ..
 	--General Section
-	building_help_general_string("empire", building_description, "soldier",
+	building_help_general_string("empire", building_description,
 		_"Garrisons soldiers to expand your territory.",
 		_"If you’re low on soldiers to occupy new military sites, use the downward arrow button to decrease the capacity. You can also click on a soldier to send him away.") ..
 

=== modified file 'tribes/empire/piggery/help.lua'
--- tribes/empire/piggery/help.lua	2014-05-26 20:36:01 +0000
+++ tribes/empire/piggery/help.lua	2014-07-20 17:56:19 +0000
@@ -13,7 +13,7 @@
 	building_help_lore_string("empire", building_description, _[[Text needed]], _[[Source needed]]) ..
 
 	--General Section
-	building_help_general_string("empire", building_description, "meat",
+	building_help_general_string("empire", building_description,
 		_[[Text needed]]) ..
 
 	--Dependencies

=== modified file 'tribes/empire/port/help.lua'
--- tribes/empire/port/help.lua	2014-05-26 20:36:01 +0000
+++ tribes/empire/port/help.lua	2014-07-20 17:56:19 +0000
@@ -13,12 +13,11 @@
 	building_help_lore_string("empire", building_description, _[[Text needed]], _[[Source needed]]) ..
 
 	--General Section
-	-- TODO this building acts like a warehouse
-	building_help_general_string("empire", building_description, "ship",
+	building_help_general_string("empire", building_description,
 		_[[Text needed]]) ..
 
 	--Dependencies
-	-- TODO expedition costs here?
+	-- TODO(GunChleoc) expedition costs here?
 
 	--Building Section
 	building_help_building_section("empire", building_description) ..

=== modified file 'tribes/empire/quarry/help.lua'
--- tribes/empire/quarry/help.lua	2014-05-26 20:36:01 +0000
+++ tribes/empire/quarry/help.lua	2014-07-20 17:56:19 +0000
@@ -13,7 +13,7 @@
 	building_help_lore_string("empire", building_description, _[[Text needed]],_[[Source needed]]) ..
 
 	--General Section
-	building_help_general_string("empire", building_description, "stone",
+	building_help_general_string("empire", building_description,
 		_"Carves marble and stone out of rocks in the vicinity.", _"The quarry needs stones to cut within the working radius.") ..
 
 	--Dependencies

=== modified file 'tribes/empire/sawmill/help.lua'
--- tribes/empire/sawmill/help.lua	2014-05-26 20:36:01 +0000
+++ tribes/empire/sawmill/help.lua	2014-07-20 17:56:19 +0000
@@ -13,7 +13,7 @@
 	building_help_lore_string("empire", building_description, _[[Text needed]], _[[Source needed]]) ..
 
 	--General Section
-	building_help_general_string("empire", building_description, "wood",
+	building_help_general_string("empire", building_description,
 		_[[Text needed]]) ..
 
 	--Dependencies

=== modified file 'tribes/empire/scouts_house/help.lua'
--- tribes/empire/scouts_house/help.lua	2014-05-26 20:36:01 +0000
+++ tribes/empire/scouts_house/help.lua	2014-07-20 17:56:19 +0000
@@ -13,7 +13,7 @@
 	building_help_lore_string("empire", building_description, _[[Text needed]],_[[Source needed]]) ..
 
 	--General Section
-	building_help_general_string("empire", building_description, "scout",
+	building_help_general_string("empire", building_description,
 		_[[Text needed]]) ..
 
 	--Dependencies

=== modified file 'tribes/empire/sentry/help.lua'
--- tribes/empire/sentry/help.lua	2014-04-18 10:29:47 +0000
+++ tribes/empire/sentry/help.lua	2014-07-20 17:56:19 +0000
@@ -12,12 +12,12 @@
 	--Lore Section
 	building_help_lore_string("empire", building_description, _[[Text needed]], _[[Source needed]]) ..
 	--General Section
-	building_help_general_string("empire", building_description, "soldier",
+	building_help_general_string("empire", building_description,
 		_"Garrisons soldiers to expand your territory.",
 		_"If you’re low on soldiers to occupy new military sites, use the downward arrow button to decrease the capacity. You can also click on a soldier to send him away.") ..
 
 	--Building Section
-	-- TODO this building can both be upgraded or built directly.
+	-- This building can both be upgraded or built directly.
 	-- Display build cost, upgrade cost, and dismantle costs for both versions.
 	-- Dismantle returns the same for both versions
 	building_help_building_section("empire", building_description, "barracks", {"barracks"})

=== modified file 'tribes/empire/sheepfarm/help.lua'
--- tribes/empire/sheepfarm/help.lua	2014-05-26 20:36:01 +0000
+++ tribes/empire/sheepfarm/help.lua	2014-07-20 17:56:19 +0000
@@ -13,7 +13,7 @@
 	building_help_lore_string("empire", building_description, _[[Text needed]], _[[Source needed]]) ..
 
 	--General Section
-	building_help_general_string("empire", building_description, "wool",
+	building_help_general_string("empire", building_description,
 		_[[Text needed]]) ..
 
 	--Dependencies

=== modified file 'tribes/empire/shipyard/help.lua'
--- tribes/empire/shipyard/help.lua	2014-05-26 20:36:01 +0000
+++ tribes/empire/shipyard/help.lua	2014-07-20 17:56:19 +0000
@@ -10,11 +10,10 @@
 	return
 
 	--Lore Section
--- TODO crashes because of missing image
-	--building_help_lore_string("empire", building_description, _[[Text needed]], _[[Source needed]]) ..
+	building_help_lore_string("empire", building_description, _[[Text needed]], _[[Source needed]]) ..
 
 	--General Section
-	building_help_general_string("empire", building_description, "shipwright",
+	building_help_general_string("empire", building_description,
 		_[[Text needed]]) ..
 
 	--Dependencies

=== modified file 'tribes/empire/smelting_works/help.lua'
--- tribes/empire/smelting_works/help.lua	2014-05-26 20:36:01 +0000
+++ tribes/empire/smelting_works/help.lua	2014-07-20 17:56:19 +0000
@@ -13,7 +13,7 @@
 	building_help_lore_string("empire", building_description, _[[Text needed]], _[[Source needed]]) ..
 
 	--General Section
-	building_help_general_string("empire", building_description, "iron",
+	building_help_general_string("empire", building_description,
 		_"Smelts iron ore into iron and gold ore into gold.") ..
 
 	--Dependencies

=== modified file 'tribes/empire/stonemasons_house/help.lua'
--- tribes/empire/stonemasons_house/help.lua	2014-05-26 20:36:01 +0000
+++ tribes/empire/stonemasons_house/help.lua	2014-07-20 17:56:19 +0000
@@ -13,7 +13,7 @@
 	building_help_lore_string("empire", building_description, _[[Text needed]], _[[Source needed]]) ..
 
 	--General Section
-	building_help_general_string("empire", building_description, "marblecolumn",
+	building_help_general_string("empire", building_description,
 		_[[Text needed]]) ..
 
 	--Dependencies

=== modified file 'tribes/empire/tavern/help.lua'
--- tribes/empire/tavern/help.lua	2014-05-26 20:36:01 +0000
+++ tribes/empire/tavern/help.lua	2014-07-20 17:56:19 +0000
@@ -13,7 +13,7 @@
 	building_help_lore_string("empire", building_description, _[[Text needed]], _[[Source needed]]) ..
 
 	--General Section
-	building_help_general_string("empire", building_description, "ration",
+	building_help_general_string("empire", building_description,
 		_[[Text needed]]) ..
 
 	--Dependencies

=== modified file 'tribes/empire/toolsmithy/help.lua'
--- tribes/empire/toolsmithy/help.lua	2014-05-26 20:36:01 +0000
+++ tribes/empire/toolsmithy/help.lua	2014-07-20 17:56:19 +0000
@@ -13,7 +13,7 @@
 	building_help_lore_string("empire", building_description, _[[Text needed]], _[[Source needed]]) ..
 
 	--General Section
-	building_help_general_string("empire", building_description, "hammer",
+	building_help_general_string("empire", building_description,
 		_[[Text needed]]) ..
 
 	--Dependencies

=== modified file 'tribes/empire/tower/help.lua'
--- tribes/empire/tower/help.lua	2014-05-26 20:36:01 +0000
+++ tribes/empire/tower/help.lua	2014-07-20 17:56:19 +0000
@@ -12,7 +12,7 @@
 	--Lore Section
 	building_help_lore_string("empire", building_description, _[[Text needed]], _[[Source needed]]) ..
 	--General Section
-	building_help_general_string("empire", building_description, "soldier",
+	building_help_general_string("empire", building_description,
 		_"Garrisons soldiers to expand your territory.",
 		_"If you’re low on soldiers to occupy new military sites, use the downward arrow button to decrease the capacity. You can also click on a soldier to send him away.") ..
 

=== modified file 'tribes/empire/trainingcamp/help.lua'
--- tribes/empire/trainingcamp/help.lua	2014-05-27 14:14:14 +0000
+++ tribes/empire/trainingcamp/help.lua	2014-07-20 17:56:19 +0000
@@ -15,23 +15,23 @@
 	building_help_lore_string("empire", building_description, _[[Text needed]], _[[Source needed]]) ..
 
 	--General Section
-	building_help_general_string("empire", building_description, "soldier",
+	building_help_general_string("empire", building_description,
 		_"Trains soldiers in ‘Attack’ and in ‘Health’."
 			.. " " .."Equips the soldiers with all necessary weapons and armor parts.",
 		_"Imperial soldiers cannot be trained in ‘Defense’ and will remain at the level with which they came.") ..
 
 	--Dependencies
 	-- We would need to parse the production programs to automate the parameters here; so we do it manually
-	-- TODO make pictures dependencies_training("empire", building_description, "fulltrained-evade", "untrained+evade") ..
+	-- TODO(GunChleoc) make pictures dependencies_training("empire", building_description, "fulltrained-evade", "untrained+evade") ..
 
 	rt(h3(_"Attack Training:")) ..
 	dependencies_training_food("empire", { {"fish", "meat"}, {"bread"}}) ..
-	dependencies_training_weapons("empire", building_description, "and", 
+	dependencies_training_weapons("empire", building_description, "and",
 		{"lance", "advanced_lance", "heavy_lance", "war_lance"}, "weaponsmithy") ..
 
 	rt(h3(_"Health Training:")) ..
 	dependencies_training_food("empire", { {"fish", "meat"}, {"bread"}}) ..
-	dependencies_training_weapons("empire", building_description, "and", 
+	dependencies_training_weapons("empire", building_description, "and",
 		{"helm", "armor", "chain_armor", "plate_armor"}, "armorsmithy") ..
 
 	--Workers Section

=== modified file 'tribes/empire/vineyard/help.lua'
--- tribes/empire/vineyard/help.lua	2014-05-26 20:36:01 +0000
+++ tribes/empire/vineyard/help.lua	2014-07-20 17:56:19 +0000
@@ -13,7 +13,7 @@
 	building_help_lore_string("empire", building_description, _[[Text needed]], _[[Source needed]]) ..
 
 	--General Section
-	building_help_general_string("empire", building_description, "grape",
+	building_help_general_string("empire", building_description,
 		_"Sow and harvest wheat.") ..
 
 	--Dependencies

=== modified file 'tribes/empire/warehouse/help.lua'
--- tribes/empire/warehouse/help.lua	2014-05-26 20:36:01 +0000
+++ tribes/empire/warehouse/help.lua	2014-07-20 17:56:19 +0000
@@ -12,7 +12,7 @@
 	--Lore Section
 	building_help_lore_string("empire", building_description, _[[Text needed]], _[[Source needed]]) ..
 	--General Section
-	building_help_general_string("empire", building_description, "log",
+	building_help_general_string("empire", building_description,
 		_"Warehouses store soldiers, wares and tools.") ..
 
 	--Building Section

=== modified file 'tribes/empire/weaponsmithy/help.lua'
--- tribes/empire/weaponsmithy/help.lua	2014-05-26 20:36:01 +0000
+++ tribes/empire/weaponsmithy/help.lua	2014-07-20 17:56:19 +0000
@@ -10,10 +10,10 @@
 	return
 
 	--Lore Section
-	-- TODO rename pictures building_help_lore_string("empire", building_description, _[[Text needed]], _[[Source needed]]) ..
+	building_help_lore_string("empire", building_description, _[[Text needed]], _[[Source needed]]) ..
 
 	--General Section
-	building_help_general_string("empire", building_description, "wood_lance",
+	building_help_general_string("empire", building_description,
 		_[[Text needed]]) ..
 
 	--Dependencies

=== modified file 'tribes/empire/weaving-mill/help.lua'
--- tribes/empire/weaving-mill/help.lua	2014-05-26 20:36:01 +0000
+++ tribes/empire/weaving-mill/help.lua	2014-07-20 17:56:19 +0000
@@ -10,10 +10,10 @@
 	return
 
 	--Lore Section
-	-- TODO rename pictures building_help_lore_string("empire", building_description, _[[Text needed]], _[[Source needed]]) ..
+	building_help_lore_string("empire", building_description, _[[Text needed]], _[[Source needed]]) ..
 
 	--General Section
-	building_help_general_string("empire", building_description, "cloth",
+	building_help_general_string("empire", building_description,
 		_"Weaves cloth out of wool.") ..
 
 	--Dependencies

=== modified file 'tribes/empire/well/help.lua'
--- tribes/empire/well/help.lua	2014-05-26 20:36:01 +0000
+++ tribes/empire/well/help.lua	2014-07-20 17:56:19 +0000
@@ -14,7 +14,7 @@
 
 	--General Section
 	--General Section
-	building_help_general_string("empire", building_description, "water",
+	building_help_general_string("empire", building_description,
 		_"Draws water out of the deep.") ..
 
 	--Dependencies

=== modified file 'tribes/empire/winery/help.lua'
--- tribes/empire/winery/help.lua	2014-05-26 20:36:01 +0000
+++ tribes/empire/winery/help.lua	2014-07-20 17:56:19 +0000
@@ -13,7 +13,7 @@
 	building_help_lore_string("empire", building_description, _[[Text needed]], _[[Source needed]]) ..
 
 	--General Section
-	building_help_general_string("empire", building_description, "wine",
+	building_help_general_string("empire", building_description,
 		_[[Text needed]]) ..
 
 	--Dependencies