diff --git a/data/tribes/buildings/productionsites/empire/marblemine_deep/init.lua b/data/tribes/buildings/productionsites/empire/marblemine_deep/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname(__file__)
 
 tribes:new_productionsite_type {
-   msgctxt = "empire_building",
    name = "empire_marblemine_deep",
    -- TRANSLATORS: This is a building name used in lists of buildings
    descname = pgettext("empire_building", "Deep Marble Mine"),
@@ -35,7 +36,7 @@ tribes:new_productionsite_type {
    },
 
    aihints = {
-      mines = "stones"
+      mines = "resource_stones"
    },
 
    working_positions = {
@@ -67,15 +68,15 @@ tribes:new_productionsite_type {
          descname = _"mining marble",
          actions = {
             "animate=working duration:7s800ms",
-            "mine=stones radius:2 yield:100% when_empty:5% experience_on_fail:2%",
+            "mine=resource_stones radius:2 yield:100% when_empty:5% experience_on_fail:2%",
             "produce=granite",
          }
       },
       mine_produce_marble = {
          descname = _"mining marble",
          actions = {
             "animate=working duration:7s800ms",
-            "mine=stones radius:2 yield:100% when_empty:5% experience_on_fail:2%",
+            "mine=resource_stones radius:2 yield:100% when_empty:5% experience_on_fail:2%",
             "produce=marble",
          }
       },
@@ -96,3 +97,5 @@ tribes:new_productionsite_type {
          pgettext("empire_building", "This marble mine’s main vein is exhausted. Expect strongly diminished returns on investment. This mine can’t be enhanced any further, so you should consider dismantling or destroying it."),
    },
 }
+
+pop_textdomain()
diff --git a/data/tribes/buildings/productionsites/empire/mill/init.lua b/data/tribes/buildings/productionsites/empire/mill/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname(__file__)
 
 tribes:new_productionsite_type {
-   msgctxt = "empire_building",
    name = "empire_mill",
    -- TRANSLATORS: This is a building name used in lists of buildings
    descname = pgettext("empire_building", "Mill"),
@@ -59,3 +60,5 @@ tribes:new_productionsite_type {
       },
    },
 }
+
+pop_textdomain()
diff --git a/data/tribes/buildings/productionsites/empire/piggery/init.lua b/data/tribes/buildings/productionsites/empire/piggery/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname(__file__)
 
 tribes:new_productionsite_type {
-   msgctxt = "empire_building",
    name = "empire_piggery",
    -- TRANSLATORS: This is a building name used in lists of buildings
    descname = pgettext("empire_building", "Piggery"),
@@ -60,3 +61,5 @@ tribes:new_productionsite_type {
       },
    },
 }
+
+pop_textdomain()
diff --git a/data/tribes/buildings/productionsites/empire/quarry/init.lua b/data/tribes/buildings/productionsites/empire/quarry/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname(__file__)
 
 tribes:new_productionsite_type {
-   msgctxt = "empire_building",
    name = "empire_quarry",
    -- TRANSLATORS: This is a building name used in lists of buildings
    descname = pgettext("empire_building", "Quarry"),
@@ -71,3 +72,5 @@ tribes:new_productionsite_type {
       productivity_threshold = 75
    },
 }
+
+pop_textdomain()
diff --git a/data/tribes/buildings/productionsites/empire/sawmill/init.lua b/data/tribes/buildings/productionsites/empire/sawmill/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname(__file__)
 
 tribes:new_productionsite_type {
-   msgctxt = "empire_building",
    name = "empire_sawmill",
    -- TRANSLATORS: This is a building name used in lists of buildings
    descname = pgettext("empire_building", "Sawmill"),
@@ -59,3 +60,5 @@ tribes:new_productionsite_type {
       },
    },
 }
+
+pop_textdomain()
diff --git a/data/tribes/buildings/productionsites/empire/scouts_house/init.lua b/data/tribes/buildings/productionsites/empire/scouts_house/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname(__file__)
 
 tribes:new_productionsite_type {
-   msgctxt = "empire_building",
    name = "empire_scouts_house",
    -- TRANSLATORS: This is a building name used in lists of buildings
    descname = pgettext("empire_building", "Scout’s House"),
@@ -51,3 +52,5 @@ tribes:new_productionsite_type {
       },
    },
 }
+
+pop_textdomain()
diff --git a/data/tribes/buildings/productionsites/empire/sheepfarm/init.lua b/data/tribes/buildings/productionsites/empire/sheepfarm/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname(__file__)
 
 tribes:new_productionsite_type {
-   msgctxt = "empire_building",
    name = "empire_sheepfarm",
    -- TRANSLATORS: This is a building name used in lists of buildings
    descname = pgettext("empire_building", "Sheep Farm"),
@@ -60,3 +61,5 @@ tribes:new_productionsite_type {
       },
    },
 }
+
+pop_textdomain()
diff --git a/data/tribes/buildings/productionsites/empire/shipyard/init.lua b/data/tribes/buildings/productionsites/empire/shipyard/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname(__file__)
 
 tribes:new_productionsite_type {
-   msgctxt = "empire_building",
    name = "empire_shipyard",
    -- TRANSLATORS: This is a building name used in lists of buildings
    descname = pgettext("empire_building", "Shipyard"),
@@ -82,3 +83,5 @@ tribes:new_productionsite_type {
       },
    },
 }
+
+pop_textdomain()
diff --git a/data/tribes/buildings/productionsites/empire/smelting_works/init.lua b/data/tribes/buildings/productionsites/empire/smelting_works/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname(__file__)
 
 tribes:new_productionsite_type {
-   msgctxt = "empire_building",
    name = "empire_smelting_works",
    -- TRANSLATORS: This is a building name used in lists of buildings
    descname = pgettext("empire_building", "Smelting Works"),
@@ -103,3 +104,5 @@ tribes:new_productionsite_type {
       },
    },
 }
+
+pop_textdomain()
diff --git a/data/tribes/buildings/productionsites/empire/stonemasons_house/init.lua b/data/tribes/buildings/productionsites/empire/stonemasons_house/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname(__file__)
 
 tribes:new_productionsite_type {
-   msgctxt = "empire_building",
    name = "empire_stonemasons_house",
    -- TRANSLATORS: This is a building name used in lists of buildings
    descname = pgettext("empire_building", "Stonemason’s House"),
@@ -60,3 +61,5 @@ tribes:new_productionsite_type {
       },
    },
 }
+
+pop_textdomain()
diff --git a/data/tribes/buildings/productionsites/empire/tavern/init.lua b/data/tribes/buildings/productionsites/empire/tavern/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname(__file__)
 
 tribes:new_productionsite_type {
-   msgctxt = "empire_building",
    name = "empire_tavern",
    -- TRANSLATORS: This is a building name used in lists of buildings
    descname = pgettext("empire_building", "Tavern"),
@@ -64,3 +65,5 @@ tribes:new_productionsite_type {
       },
    },
 }
+
+pop_textdomain()
diff --git a/data/tribes/buildings/productionsites/empire/toolsmithy/init.lua b/data/tribes/buildings/productionsites/empire/toolsmithy/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname(__file__)
 
 tribes:new_productionsite_type {
-   msgctxt = "empire_building",
    name = "empire_toolsmithy",
    -- TRANSLATORS: This is a building name used in lists of buildings
    descname = pgettext("empire_building", "Toolsmithy"),
@@ -209,3 +210,5 @@ tribes:new_productionsite_type {
       },
    },
 }
+
+pop_textdomain()
diff --git a/data/tribes/buildings/productionsites/empire/vineyard/init.lua b/data/tribes/buildings/productionsites/empire/vineyard/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname(__file__)
 
 tribes:new_productionsite_type {
-   msgctxt = "empire_building",
    name = "empire_vineyard",
    -- TRANSLATORS: This is a building name used in lists of buildings
    descname = pgettext("empire_building", "Vineyard"),
@@ -74,3 +75,5 @@ tribes:new_productionsite_type {
       productivity_threshold = 30
    },
 }
+
+pop_textdomain()
diff --git a/data/tribes/buildings/productionsites/empire/weaponsmithy/init.lua b/data/tribes/buildings/productionsites/empire/weaponsmithy/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname(__file__)
 
 tribes:new_productionsite_type {
-   msgctxt = "empire_building",
    name = "empire_weaponsmithy",
    -- TRANSLATORS: This is a building name used in lists of buildings
    descname = pgettext("empire_building", "Weapon Smithy"),
@@ -142,3 +143,5 @@ tribes:new_productionsite_type {
       },
    },
 }
+
+pop_textdomain()
diff --git a/data/tribes/buildings/productionsites/empire/weaving_mill/init.lua b/data/tribes/buildings/productionsites/empire/weaving_mill/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname(__file__)
 
 tribes:new_productionsite_type {
-   msgctxt = "empire_building",
    name = "empire_weaving_mill",
    -- TRANSLATORS: This is a building name used in lists of buildings
    descname = pgettext("empire_building", "Weaving Mill"),
@@ -67,3 +68,5 @@ tribes:new_productionsite_type {
       },
    },
 }
+
+pop_textdomain()
diff --git a/data/tribes/buildings/productionsites/empire/well/init.lua b/data/tribes/buildings/productionsites/empire/well/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname(__file__)
 
 tribes:new_productionsite_type {
-   msgctxt = "empire_building",
    name = "empire_well",
    -- TRANSLATORS: This is a building name used in lists of buildings
    descname = pgettext("empire_building", "Well"),
@@ -45,7 +46,7 @@ tribes:new_productionsite_type {
          actions = {
             "sleep=duration:20s",
             "animate=working duration:20s",
-            "mine=water radius:1 yield:100% when_empty:65%",
+            "mine=resource_water radius:1 yield:100% when_empty:65%",
             "produce=water"
          }
       },
@@ -58,3 +59,5 @@ tribes:new_productionsite_type {
       productivity_threshold = 33
    },
 }
+
+pop_textdomain()
diff --git a/data/tribes/buildings/productionsites/empire/winery/init.lua b/data/tribes/buildings/productionsites/empire/winery/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname(__file__)
 
 tribes:new_productionsite_type {
-   msgctxt = "empire_building",
    name = "empire_winery",
    -- TRANSLATORS: This is a building name used in lists of buildings
    descname = pgettext("empire_building", "Winery"),
@@ -62,3 +63,5 @@ tribes:new_productionsite_type {
       },
    },
 }
+
+pop_textdomain()
diff --git a/data/tribes/buildings/productionsites/frisians/aqua_farm/init.lua b/data/tribes/buildings/productionsites/frisians/aqua_farm/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname(__file__)
 
 tribes:new_productionsite_type {
-   msgctxt = "frisians_building",
    name = "frisians_aqua_farm",
    -- TRANSLATORS: This is a building name used in lists of buildings
    descname = pgettext("frisians_building", "Aqua Farm"),
@@ -93,3 +94,5 @@ tribes:new_productionsite_type {
       productivity_threshold = 12
    },
 }
+
+pop_textdomain()
diff --git a/data/tribes/buildings/productionsites/frisians/armor_smithy_large/init.lua b/data/tribes/buildings/productionsites/frisians/armor_smithy_large/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname (__file__)
 
 tribes:new_productionsite_type {
-   msgctxt = "frisians_building",
    name = "frisians_armor_smithy_large",
    -- TRANSLATORS: This is a building name used in lists of buildings
    descname = pgettext ("frisians_building", "Large Armor Smithy"),
@@ -119,3 +120,5 @@ tribes:new_productionsite_type {
       },
    },
 }
+
+pop_textdomain()
diff --git a/data/tribes/buildings/productionsites/frisians/armor_smithy_small/init.lua b/data/tribes/buildings/productionsites/frisians/armor_smithy_small/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname(__file__)
 
 tribes:new_productionsite_type {
-   msgctxt = "frisians_building",
    name = "frisians_armor_smithy_small",
    -- TRANSLATORS: This is a building name used in lists of buildings
    descname = pgettext("frisians_building", "Small Armor Smithy"),
@@ -119,3 +120,5 @@ tribes:new_productionsite_type {
       },
    },
 }
+
+pop_textdomain()
diff --git a/data/tribes/buildings/productionsites/frisians/bakery/init.lua b/data/tribes/buildings/productionsites/frisians/bakery/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname (__file__)
 
 tribes:new_productionsite_type {
-   msgctxt = "frisians_building",
    name = "frisians_bakery",
    -- TRANSLATORS: This is a building name used in lists of buildings
    descname = pgettext ("frisians_building", "Bakery"),
@@ -78,3 +79,5 @@ tribes:new_productionsite_type {
       },
    },
 }
+
+pop_textdomain()
diff --git a/data/tribes/buildings/productionsites/frisians/barracks/init.lua b/data/tribes/buildings/productionsites/frisians/barracks/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname (__file__)
 
 tribes:new_productionsite_type {
-   msgctxt = "frisians_building",
    name = "frisians_barracks",
    -- TRANSLATORS: This is a building name used in lists of buildings
    descname = pgettext ("frisians_building", "Barracks"),
@@ -80,3 +81,5 @@ tribes:new_productionsite_type {
       },
    }
 }
+
+pop_textdomain()
diff --git a/data/tribes/buildings/productionsites/frisians/beekeepers_house/init.lua b/data/tribes/buildings/productionsites/frisians/beekeepers_house/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname (__file__)
 
 tribes:new_productionsite_type {
-   msgctxt = "frisians_building",
    name = "frisians_beekeepers_house",
    -- TRANSLATORS: This is a building name used in lists of buildings
    descname = pgettext ("frisians_building", "Beekeeper’s House"),
@@ -67,3 +68,5 @@ tribes:new_productionsite_type {
       productivity_threshold = 8
    },
 }
+
+pop_textdomain()
diff --git a/data/tribes/buildings/productionsites/frisians/berry_farm/init.lua b/data/tribes/buildings/productionsites/frisians/berry_farm/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname (__file__)
 
 tribes:new_productionsite_type {
-   msgctxt = "frisians_building",
    name = "frisians_berry_farm",
    -- TRANSLATORS: This is a building name used in lists of buildings
    descname = pgettext ("frisians_building", "Berry Farm"),
@@ -59,3 +60,5 @@ tribes:new_productionsite_type {
       },
    },
 }
+
+pop_textdomain()
diff --git a/data/tribes/buildings/productionsites/frisians/blacksmithy/init.lua b/data/tribes/buildings/productionsites/frisians/blacksmithy/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname (__file__)
 
 tribes:new_productionsite_type {
-   msgctxt = "frisians_building",
    name = "frisians_blacksmithy",
    -- TRANSLATORS: This is a building name used in lists of buildings
    descname = pgettext ("frisians_building", "Blacksmithy"),
@@ -219,3 +220,5 @@ tribes:new_productionsite_type {
       },
    },
 }
+
+pop_textdomain()
diff --git a/data/tribes/buildings/productionsites/frisians/brewery/init.lua b/data/tribes/buildings/productionsites/frisians/brewery/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname (__file__)
 
 tribes:new_productionsite_type {
-   msgctxt = "frisians_building",
    name = "frisians_brewery",
    -- TRANSLATORS: This is a building name used in lists of buildings
    descname = pgettext ("frisians_building", "Brewery"),
@@ -77,3 +78,5 @@ tribes:new_productionsite_type {
       },
    },
 }
+
+pop_textdomain()
diff --git a/data/tribes/buildings/productionsites/frisians/brick_kiln/init.lua b/data/tribes/buildings/productionsites/frisians/brick_kiln/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname (__file__)
 
 tribes:new_productionsite_type {
-   msgctxt = "frisians_building",
    name = "frisians_brick_kiln",
    -- TRANSLATORS: This is a building name used in lists of buildings
    descname = pgettext ("frisians_building", "Brick Kiln"),
@@ -79,3 +80,5 @@ tribes:new_productionsite_type {
       },
    },
 }
+
+pop_textdomain()
diff --git a/data/tribes/buildings/productionsites/frisians/charcoal_burners_house/init.lua b/data/tribes/buildings/productionsites/frisians/charcoal_burners_house/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname (__file__)
 
 tribes:new_productionsite_type {
-   msgctxt = "frisians_building",
    name = "frisians_charcoal_burners_house",
    -- TRANSLATORS: This is a building name used in lists of buildings
    descname = pgettext ("frisians_building", "Charcoal Burner’s House"),
@@ -92,3 +93,5 @@ tribes:new_productionsite_type {
       productivity_threshold = 12
    },
 }
+
+pop_textdomain()
diff --git a/data/tribes/buildings/productionsites/frisians/charcoal_kiln/init.lua b/data/tribes/buildings/productionsites/frisians/charcoal_kiln/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname (__file__)
 
 tribes:new_productionsite_type {
-   msgctxt = "frisians_building",
    name = "frisians_charcoal_kiln",
    -- TRANSLATORS: This is a building name used in lists of buildings
    descname = pgettext ("frisians_building", "Charcoal Kiln"),
@@ -76,3 +77,5 @@ tribes:new_productionsite_type {
       },
    },
 }
+
+pop_textdomain()
diff --git a/data/tribes/buildings/productionsites/frisians/clay_pit/init.lua b/data/tribes/buildings/productionsites/frisians/clay_pit/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname (__file__)
 
 tribes:new_productionsite_type {
-   msgctxt = "frisians_building",
    name = "frisians_clay_pit",
    -- TRANSLATORS: This is a building name used in lists of buildings
    descname = pgettext ("frisians_building", "Clay Pit"),
@@ -87,3 +88,5 @@ tribes:new_productionsite_type {
       productivity_threshold = 33
    },
 }
+
+pop_textdomain()
diff --git a/data/tribes/buildings/productionsites/frisians/coalmine/init.lua b/data/tribes/buildings/productionsites/frisians/coalmine/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname (__file__)
 
 tribes:new_productionsite_type {
-   msgctxt = "frisians_building",
    name = "frisians_coalmine",
    -- TRANSLATORS: This is a building name used in lists of buildings
    descname = pgettext ("frisians_building", "Coal Mine"),
@@ -60,7 +61,7 @@ tribes:new_productionsite_type {
    },
 
    aihints = {
-      mines = "coal",
+      mines = "resource_coal",
       mines_percent = 50,
    },
 
@@ -88,7 +89,7 @@ tribes:new_productionsite_type {
          descname = _"mining coal",
          actions = {
             "animate=working duration:15s",
-            "mine=coal radius:3 yield:50% when_empty:5% experience_on_fail:20%",
+            "mine=resource_coal radius:3 yield:50% when_empty:5% experience_on_fail:20%",
             "produce=coal",
          }
       },
@@ -109,3 +110,5 @@ tribes:new_productionsite_type {
          pgettext("frisians_building", "This coal mine’s main vein is exhausted. Expect strongly diminished returns on investment. You should consider enhancing, dismantling or destroying it."),
    },
 }
+
+pop_textdomain()
diff --git a/data/tribes/buildings/productionsites/frisians/coalmine_deep/init.lua b/data/tribes/buildings/productionsites/frisians/coalmine_deep/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname(__file__)
 
 tribes:new_productionsite_type {
-   msgctxt = "frisians_building",
    name = "frisians_coalmine_deep",
    -- TRANSLATORS: This is a building name used in lists of buildings
    descname = pgettext("frisians_building", "Deep Coal Mine"),
@@ -59,7 +60,7 @@ tribes:new_productionsite_type {
    },
 
    aihints = {
-      mines = "coal",
+      mines = "resource_coal",
    },
 
    working_positions = {
@@ -92,7 +93,7 @@ tribes:new_productionsite_type {
          descname = _"mining coal",
          actions = {
             "animate=working duration:8s700ms",
-            "mine=coal radius:3 yield:100% when_empty:10% experience_on_fail:5%",
+            "mine=resource_coal radius:3 yield:100% when_empty:10% experience_on_fail:5%",
             "produce=coal",
          }
       },
@@ -113,3 +114,5 @@ tribes:new_productionsite_type {
          pgettext("frisians_building", "This coal mine’s main vein is exhausted. Expect strongly diminished returns on investment. This mine can’t be enhanced any further, so you should consider dismantling or destroying it."),
    },
 }
+
+pop_textdomain()
diff --git a/data/tribes/buildings/productionsites/frisians/collectors_house/init.lua b/data/tribes/buildings/productionsites/frisians/collectors_house/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname (__file__)
 
 tribes:new_productionsite_type {
-   msgctxt = "frisians_building",
    name = "frisians_collectors_house",
    -- TRANSLATORS: This is a building name used in lists of buildings
    descname = pgettext ("frisians_building", "Fruit Collector’s House"),
@@ -67,3 +68,5 @@ tribes:new_productionsite_type {
       productivity_threshold = 8
    },
 }
+
+pop_textdomain()
diff --git a/data/tribes/buildings/productionsites/frisians/drinking_hall/init.lua b/data/tribes/buildings/productionsites/frisians/drinking_hall/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname (__file__)
 
 tribes:new_productionsite_type {
-   msgctxt = "frisians_building",
    name = "frisians_drinking_hall",
    -- TRANSLATORS: This is a building name used in lists of buildings
    descname = pgettext ("frisians_building", "Drinking Hall"),
@@ -101,3 +102,5 @@ tribes:new_productionsite_type {
       },
    },
 }
+
+pop_textdomain()
diff --git a/data/tribes/buildings/productionsites/frisians/farm/init.lua b/data/tribes/buildings/productionsites/frisians/farm/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname (__file__)
 
 tribes:new_productionsite_type {
-   msgctxt = "frisians_building",
    name = "frisians_farm",
    -- TRANSLATORS: This is a building name used in lists of buildings
    descname = pgettext ("frisians_building", "Farm"),
@@ -104,3 +105,5 @@ tribes:new_productionsite_type {
       productivity_threshold = 30
    },
 }
+
+pop_textdomain()
diff --git a/data/tribes/buildings/productionsites/frisians/ferry_yard/init.lua b/data/tribes/buildings/productionsites/frisians/ferry_yard/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname(__file__)
 
 tribes:new_productionsite_type {
-   msgctxt = "frisians_building",
    name = "frisians_ferry_yard",
    -- TRANSLATORS: This is a building name used in lists of buildings
    descname = pgettext("frisians_building", "Ferry Yard"),
@@ -66,3 +67,5 @@ tribes:new_productionsite_type {
       },
    },
 }
+
+pop_textdomain()
diff --git a/data/tribes/buildings/productionsites/frisians/fishers_house/init.lua b/data/tribes/buildings/productionsites/frisians/fishers_house/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname (__file__)
 
 tribes:new_productionsite_type {
-   msgctxt = "frisians_building",
    name = "frisians_fishers_house",
    -- TRANSLATORS: This is a building name used in lists of buildings
    descname = pgettext ("frisians_building", "Fisher’s House"),
@@ -65,3 +66,5 @@ tribes:new_productionsite_type {
       message = pgettext ("frisians_building", "The fisher working out of this fisher’s house can’t find any fish in his work area."),
    },
 }
+
+pop_textdomain()
diff --git a/data/tribes/buildings/productionsites/frisians/foresters_house/init.lua b/data/tribes/buildings/productionsites/frisians/foresters_house/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname(__file__)
 
 tribes:new_productionsite_type {
-   msgctxt = "frisians_building",
    name = "frisians_foresters_house",
    -- TRANSLATORS: This is a building name used in lists of buildings
    descname = pgettext("frisians_building", "Forester’s House"),
@@ -58,3 +59,5 @@ tribes:new_productionsite_type {
       },
    },
 }
+
+pop_textdomain()
diff --git a/data/tribes/buildings/productionsites/frisians/furnace/init.lua b/data/tribes/buildings/productionsites/frisians/furnace/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname(__file__)
 
 tribes:new_productionsite_type {
-   msgctxt = "frisians_building",
    name = "frisians_furnace",
    -- TRANSLATORS: This is a building name used in lists of buildings
    descname = pgettext("frisians_building", "Furnace"),
@@ -127,3 +128,5 @@ tribes:new_productionsite_type {
       },
    },
 }
+
+pop_textdomain()
diff --git a/data/tribes/buildings/productionsites/frisians/goldmine/init.lua b/data/tribes/buildings/productionsites/frisians/goldmine/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname(__file__)
 
 tribes:new_productionsite_type {
-   msgctxt = "frisians_building",
    name = "frisians_goldmine",
    -- TRANSLATORS: This is a building name used in lists of buildings
    descname = pgettext("frisians_building", "Gold Mine"),
@@ -60,7 +61,7 @@ tribes:new_productionsite_type {
    },
 
    aihints = {
-      mines = "gold",
+      mines = "resource_gold",
       mines_percent = 50,
       prohibited_till = 1100
    },
@@ -82,7 +83,7 @@ tribes:new_productionsite_type {
             "consume=ration",
             "sleep=duration:45s",
             "animate=working duration:20s",
-            "mine=gold radius:3 yield:50% when_empty:5% experience_on_fail:20%",
+            "mine=resource_gold radius:3 yield:50% when_empty:5% experience_on_fail:20%",
             "produce=gold_ore"
          }
       },
@@ -95,3 +96,5 @@ tribes:new_productionsite_type {
          pgettext("frisians_building", "This gold mine’s main vein is exhausted. Expect strongly diminished returns on investment. You should consider enhancing, dismantling or destroying it."),
    },
 }
+
+pop_textdomain()
diff --git a/data/tribes/buildings/productionsites/frisians/goldmine_deep/init.lua b/data/tribes/buildings/productionsites/frisians/goldmine_deep/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname(__file__)
 
 tribes:new_productionsite_type {
-   msgctxt = "frisians_building",
    name = "frisians_goldmine_deep",
    -- TRANSLATORS: This is a building name used in lists of buildings
    descname = pgettext("frisians_building", "Deep Gold Mine"),
@@ -59,7 +60,7 @@ tribes:new_productionsite_type {
    },
 
    aihints = {
-      mines = "gold",
+      mines = "resource_gold",
    },
 
    working_positions = {
@@ -90,7 +91,7 @@ tribes:new_productionsite_type {
          descname = _"mining gold",
          actions = {
             "animate=working duration:12s200ms",
-            "mine=gold radius:3 yield:100% when_empty:10% experience_on_fail:5%",
+            "mine=resource_gold radius:3 yield:100% when_empty:10% experience_on_fail:5%",
             "produce=gold_ore",
          }
       },
@@ -111,3 +112,5 @@ tribes:new_productionsite_type {
          pgettext("frisians_building", "This gold mine’s main vein is exhausted. Expect strongly diminished returns on investment. This mine can’t be enhanced any further, so you should consider dismantling or destroying it."),
    },
 }
+
+pop_textdomain()
diff --git a/data/tribes/buildings/productionsites/frisians/honey_bread_bakery/init.lua b/data/tribes/buildings/productionsites/frisians/honey_bread_bakery/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname (__file__)
 
 tribes:new_productionsite_type {
-   msgctxt = "frisians_building",
    name = "frisians_honey_bread_bakery",
    -- TRANSLATORS: This is a building name used in lists of buildings
    descname = pgettext ("frisians_building", "Honey Bread Bakery"),
@@ -109,3 +110,5 @@ tribes:new_productionsite_type {
       },
    },
 }
+
+pop_textdomain()
diff --git a/data/tribes/buildings/productionsites/frisians/hunters_house/init.lua b/data/tribes/buildings/productionsites/frisians/hunters_house/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname (__file__)
 
 tribes:new_productionsite_type {
-   msgctxt = "frisians_building",
    name = "frisians_hunters_house",
    -- TRANSLATORS: This is a building name used in lists of buildings
    descname = pgettext ("frisians_building", "Hunter’s House"),
@@ -76,3 +77,5 @@ tribes:new_productionsite_type {
       productivity_threshold = 33
    },
 }
+
+pop_textdomain()
diff --git a/data/tribes/buildings/productionsites/frisians/ironmine/init.lua b/data/tribes/buildings/productionsites/frisians/ironmine/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname(__file__)
 
 tribes:new_productionsite_type {
-   msgctxt = "frisians_building",
    name = "frisians_ironmine",
    -- TRANSLATORS: This is a building name used in lists of buildings
    descname = pgettext("frisians_building", "Iron Mine"),
@@ -60,7 +61,7 @@ tribes:new_productionsite_type {
    },
 
    aihints = {
-      mines = "iron",
+      mines = "resource_iron",
       mines_percent = 50,
       prohibited_till = 1000
    },
@@ -82,7 +83,7 @@ tribes:new_productionsite_type {
             "consume=ration",
             "sleep=duration:45s",
             "animate=working duration:20s",
-            "mine=iron radius:3 yield:50% when_empty:5% experience_on_fail:20%",
+            "mine=resource_iron radius:3 yield:50% when_empty:5% experience_on_fail:20%",
             "produce=iron_ore"
          }
       },
@@ -95,3 +96,5 @@ tribes:new_productionsite_type {
          pgettext("frisians_building", "This iron mine’s main vein is exhausted. Expect strongly diminished returns on investment. You should consider enhancing, dismantling or destroying it."),
    },
 }
+
+pop_textdomain()
diff --git a/data/tribes/buildings/productionsites/frisians/ironmine_deep/init.lua b/data/tribes/buildings/productionsites/frisians/ironmine_deep/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname(__file__)
 
 tribes:new_productionsite_type {
-   msgctxt = "frisians_building",
    name = "frisians_ironmine_deep",
    -- TRANSLATORS: This is a building name used in lists of buildings
    descname = pgettext("frisians_building", "Deep Iron Mine"),
@@ -59,7 +60,7 @@ tribes:new_productionsite_type {
    },
 
    aihints = {
-      mines = "iron",
+      mines = "resource_iron",
    },
 
    working_positions = {
@@ -92,7 +93,7 @@ tribes:new_productionsite_type {
          descname = _"mining iron",
          actions = {
             "animate=working duration:8s700ms",
-            "mine=iron radius:3 yield:100% when_empty:10% experience_on_fail:5%",
+            "mine=resource_iron radius:3 yield:100% when_empty:10% experience_on_fail:5%",
             "produce=iron_ore",
          }
       },
@@ -113,3 +114,5 @@ tribes:new_productionsite_type {
          pgettext("frisians_building", "This iron mine’s main vein is exhausted. Expect strongly diminished returns on investment. This mine can’t be enhanced any further, so you should consider dismantling or destroying it."),
    },
 }
+
+pop_textdomain()
diff --git a/data/tribes/buildings/productionsites/frisians/mead_brewery/init.lua b/data/tribes/buildings/productionsites/frisians/mead_brewery/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname (__file__)
 
 tribes:new_productionsite_type {
-   msgctxt = "frisians_building",
    name = "frisians_mead_brewery",
    -- TRANSLATORS: This is a building name used in lists of buildings
    descname = pgettext ("frisians_building", "Mead Brewery"),
@@ -107,3 +108,5 @@ tribes:new_productionsite_type {
       },
    },
 }
+
+pop_textdomain()
diff --git a/data/tribes/buildings/productionsites/frisians/quarry/init.lua b/data/tribes/buildings/productionsites/frisians/quarry/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname (__file__)
 
 tribes:new_productionsite_type {
-   msgctxt = "frisians_building",
    name = "frisians_quarry",
    -- TRANSLATORS: This is a building name used in lists of buildings
    descname = pgettext ("frisians_building", "Quarry"),
@@ -64,3 +65,5 @@ tribes:new_productionsite_type {
       productivity_threshold = 75
    },
 }
+
+pop_textdomain()
diff --git a/data/tribes/buildings/productionsites/frisians/recycling_center/init.lua b/data/tribes/buildings/productionsites/frisians/recycling_center/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname (__file__)
 
 tribes:new_productionsite_type {
-   msgctxt = "frisians_building",
    name = "frisians_recycling_center",
    -- TRANSLATORS: This is a building name used in lists of buildings
    descname = pgettext ("frisians_building", "Recycling Center"),
@@ -124,3 +125,5 @@ tribes:new_productionsite_type {
       },
    }
 }
+
+pop_textdomain()
diff --git a/data/tribes/buildings/productionsites/frisians/reed_farm/init.lua b/data/tribes/buildings/productionsites/frisians/reed_farm/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname (__file__)
 
 tribes:new_productionsite_type {
-   msgctxt = "frisians_building",
    name = "frisians_reed_farm",
    -- TRANSLATORS: This is a building name used in lists of buildings
    descname = pgettext ("frisians_building", "Reed Farm"),
@@ -84,3 +85,5 @@ tribes:new_productionsite_type {
       productivity_threshold = 20
    },
 }
+
+pop_textdomain()
diff --git a/data/tribes/buildings/productionsites/frisians/reindeer_farm/init.lua b/data/tribes/buildings/productionsites/frisians/reindeer_farm/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname (__file__)
 
 tribes:new_productionsite_type {
-   msgctxt = "frisians_building",
    name = "frisians_reindeer_farm",
    -- TRANSLATORS: This is a building name used in lists of buildings
    descname = pgettext ("frisians_building", "Reindeer Farm"),
@@ -111,3 +112,5 @@ tribes:new_productionsite_type {
       },
    },
 }
+
+pop_textdomain()
diff --git a/data/tribes/buildings/productionsites/frisians/rockmine/init.lua b/data/tribes/buildings/productionsites/frisians/rockmine/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname(__file__)
 
 tribes:new_productionsite_type {
-   msgctxt = "frisians_building",
    name = "frisians_rockmine",
    -- TRANSLATORS: This is a building name used in lists of buildings
    descname = pgettext("frisians_building", "Rock Mine"),
@@ -60,7 +61,7 @@ tribes:new_productionsite_type {
    },
 
    aihints = {
-      mines = "stones",
+      mines = "resource_stones",
       mines_percent = 50,
       prohibited_till = 630
    },
@@ -90,7 +91,7 @@ tribes:new_productionsite_type {
          descname = _"mining granite",
          actions = {
             "animate=working duration:21s",
-            "mine=stones radius:3 yield:50% when_empty:5% experience_on_fail:20%",
+            "mine=resource_stones radius:3 yield:50% when_empty:5% experience_on_fail:20%",
             "produce=granite",
          }
       },
@@ -111,3 +112,5 @@ tribes:new_productionsite_type {
          pgettext("frisians_building", "This rock mine’s main vein is exhausted. Expect strongly diminished returns on investment. You should consider enhancing, dismantling or destroying it."),
    },
 }
+
+pop_textdomain()
diff --git a/data/tribes/buildings/productionsites/frisians/rockmine_deep/init.lua b/data/tribes/buildings/productionsites/frisians/rockmine_deep/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname(__file__)
 
 tribes:new_productionsite_type {
-   msgctxt = "frisians_building",
    name = "frisians_rockmine_deep",
    -- TRANSLATORS: This is a building name used in lists of buildings
    descname = pgettext("frisians_building", "Deep Rock Mine"),
@@ -59,7 +60,7 @@ tribes:new_productionsite_type {
    },
 
    aihints = {
-      mines = "stones",
+      mines = "resource_stones",
    },
 
    working_positions = {
@@ -93,7 +94,7 @@ tribes:new_productionsite_type {
          descname = _"mining granite",
          actions = {
             "animate=working duration:8s700ms",
-            "mine=stones radius:3 yield:100% when_empty:10% experience_on_fail:5%",
+            "mine=resource_stones radius:3 yield:100% when_empty:10% experience_on_fail:5%",
             "produce=granite",
          }
       },
@@ -114,3 +115,5 @@ tribes:new_productionsite_type {
          pgettext("frisians_building", "This rock mine’s main vein is exhausted. Expect strongly diminished returns on investment. This mine can’t be enhanced any further, so you should consider dismantling or destroying it."),
    },
 }
+
+pop_textdomain()
diff --git a/data/tribes/buildings/productionsites/frisians/scouts_house/init.lua b/data/tribes/buildings/productionsites/frisians/scouts_house/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname (__file__)
 
 tribes:new_productionsite_type {
-   msgctxt = "frisians_building",
    name = "frisians_scouts_house",
    -- TRANSLATORS: This is a building name used in lists of buildings
    descname = pgettext ("frisians_building", "Scout’s House"),
@@ -60,3 +61,5 @@ tribes:new_productionsite_type {
       },
    },
 }
+
+pop_textdomain()
diff --git a/data/tribes/buildings/productionsites/frisians/sewing_room/init.lua b/data/tribes/buildings/productionsites/frisians/sewing_room/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname (__file__)
 
 tribes:new_productionsite_type {
-   msgctxt = "frisians_building",
    name = "frisians_sewing_room",
    -- TRANSLATORS: This is a building name used in lists of buildings
    descname = pgettext ("frisians_building", "Sewing Room"),
@@ -76,3 +77,5 @@ tribes:new_productionsite_type {
       },
    },
 }
+
+pop_textdomain()
diff --git a/data/tribes/buildings/productionsites/frisians/shipyard/init.lua b/data/tribes/buildings/productionsites/frisians/shipyard/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname (__file__)
 
 tribes:new_productionsite_type {
-   msgctxt = "frisians_building",
    name = "frisians_shipyard",
    -- TRANSLATORS: This is a building name used in lists of buildings
    descname = pgettext ("frisians_building", "Shipyard"),
@@ -84,3 +85,5 @@ tribes:new_productionsite_type {
       },
    },
 }
+
+pop_textdomain()
diff --git a/data/tribes/buildings/productionsites/frisians/smokery/init.lua b/data/tribes/buildings/productionsites/frisians/smokery/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname (__file__)
 
 tribes:new_productionsite_type {
-   msgctxt = "frisians_building",
    name = "frisians_smokery",
    -- TRANSLATORS: This is a building name used in lists of buildings
    descname = pgettext ("frisians_building", "Smokery"),
@@ -100,3 +101,5 @@ tribes:new_productionsite_type {
       },
    },
 }
+
+pop_textdomain()
diff --git a/data/tribes/buildings/productionsites/frisians/tailors_shop/init.lua b/data/tribes/buildings/productionsites/frisians/tailors_shop/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname (__file__)
 
 tribes:new_productionsite_type {
-   msgctxt = "frisians_building",
    name = "frisians_tailors_shop",
    -- TRANSLATORS: This is a building name used in lists of buildings
    descname = pgettext ("frisians_building", "Tailor’s Shop"),
@@ -98,3 +99,5 @@ tribes:new_productionsite_type {
       },
    },
 }
+
+pop_textdomain()
diff --git a/data/tribes/buildings/productionsites/frisians/tavern/init.lua b/data/tribes/buildings/productionsites/frisians/tavern/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname (__file__)
 
 tribes:new_productionsite_type {
-   msgctxt = "frisians_building",
    name = "frisians_tavern",
    -- TRANSLATORS: This is a building name used in lists of buildings
    descname = pgettext ("frisians_building", "Tavern"),
@@ -105,3 +106,5 @@ tribes:new_productionsite_type {
       },
    },
 }
+
+pop_textdomain()
diff --git a/data/tribes/buildings/productionsites/frisians/weaving_mill/init.lua b/data/tribes/buildings/productionsites/frisians/weaving_mill/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname (__file__)
 
 tribes:new_productionsite_type {
-   msgctxt = "frisians_building",
    name = "frisians_weaving_mill",
    -- TRANSLATORS: This is a building name used in lists of buildings
    descname = pgettext ("frisians_building", "Weaving Mill"),
@@ -78,3 +79,5 @@ tribes:new_productionsite_type {
       },
    },
 }
+
+pop_textdomain()
diff --git a/data/tribes/buildings/productionsites/frisians/well/init.lua b/data/tribes/buildings/productionsites/frisians/well/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname (__file__)
 
 tribes:new_productionsite_type {
-   msgctxt = "frisians_building",
    name = "frisians_well",
    -- TRANSLATORS: This is a building name used in lists of buildings
    descname = pgettext ("frisians_building", "Well"),
@@ -54,7 +55,7 @@ tribes:new_productionsite_type {
          actions = {
             "sleep=duration:20s",
             "animate=working duration:20s",
-            "mine=water radius:1 yield:100% when_empty:65%",
+            "mine=resource_water radius:1 yield:100% when_empty:65%",
             "produce=water",
          }
       },
@@ -68,3 +69,5 @@ tribes:new_productionsite_type {
       productivity_threshold = 33
    },
 }
+
+pop_textdomain()
diff --git a/data/tribes/buildings/productionsites/frisians/woodcutters_house/init.lua b/data/tribes/buildings/productionsites/frisians/woodcutters_house/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname (__file__)
 
 tribes:new_productionsite_type {
-   msgctxt = "frisians_building",
    name = "frisians_woodcutters_house",
    -- TRANSLATORS: This is a building name used in lists of buildings
    descname = pgettext ("frisians_building", "Woodcutter’s House"),
@@ -64,3 +65,5 @@ tribes:new_productionsite_type {
       productivity_threshold = 66
    },
 }
+
+pop_textdomain()
diff --git a/data/tribes/buildings/trainingsites/atlanteans/dungeon/init.lua b/data/tribes/buildings/trainingsites/atlanteans/dungeon/init.lua
@@ -12,10 +12,7 @@
 -- ``data/tribes/buildings/trainingsites/<tribe_name>/<building_name>/init.lua``.
 -- The building will also need its help texts, which are defined in
 -- ``data/tribes/buildings/trainingsites/<tribe_name>/<building_name>/helptexts.lua``
-
-dirname = path.dirname(__file__)
-
--- RST
+--
 -- .. function:: new_trainingsite_type{table}
 --
 --    This function adds the definition of a training site building to the engine.
@@ -75,8 +72,105 @@ dirname = path.dirname(__file__)
 --    **soldier evade**
 --            *Optional*. Just like ``soldier attack``, but for evade training.
 --
+-- For making the UI texts translateable, we also need to push/pop the correct textdomain.
+--
+-- Example:
+--
+-- .. code-block:: lua
+--
+--    push_textdomain("tribes")
+--
+--    dirname = path.dirname(__file__)
+--
+--    tribes:new_trainingsite_type {
+--       name = "empire_arena",
+--       descname = pgettext("empire_building", "Arena"),
+--       icon = dirname .. "menu.png",
+--       animation_directory = dirname,
+--       size = "big",
+--       enhancement = "empire_colosseum",
+--
+--       buildcost = {
+--          log = 2,
+--          granite = 4,
+--          marble = 5,
+--          planks = 5,
+--          marble_column = 2
+--       },
+--       return_on_dismantle = {
+--          log = 1,
+--          granite = 3,
+--          marble = 3,
+--          planks = 2,
+--          marble_column = 1
+--       },
+--
+--       animations = {
+--          idle = {
+--             hotspot = { 81, 82 }
+--          },
+--          build = {
+--             hotspot = { 82, 83 },
+--          }
+--       },
+--
+--       aihints = {
+--          trainingsites_max_percent = 10,
+--          prohibited_till = 900,
+--          very_weak_ai_limit = 1,
+--          weak_ai_limit = 2
+--       },
+--
+--       working_positions = {
+--          empire_trainer = 1
+--       },
+--
+--       inputs = {
+--          { name = "fish", amount = 6 },
+--          { name = "meat", amount = 6 },
+--          { name = "empire_bread", amount = 10 }
+--       },
+--
+--       ["soldier evade"] = {
+--          food = {
+--             {"fish", "meat"},
+--             {"empire_bread"}
+--          }
+--       },
+--
+--       programs = {
+--          sleep = {
+--             descname = _"sleeping",
+--             actions = {
+--                "sleep=duration:5s",
+--                "return=skipped",
+--             }
+--          },
+--          upgrade_soldier_evade_0 = {
+--             descname = pgettext("empire_building", "upgrading soldier evade from level 0 to level 1"),
+--             actions = {
+--                "checksoldier=soldier:evade level:0", -- Fails when aren't any soldier of level 0 evade
+--                "return=failed unless site has empire_bread",
+--                "return=failed unless site has fish,meat",
+--                "sleep=duration:30s",
+--                "checksoldier=soldier:evade level:0", -- Because the soldier can be expelled by the player
+--                "consume=empire_bread fish,meat",
+--                "train=soldier:evade level:1"
+--             }
+--          },
+--       },
+--
+--       soldier_capacity = 8,
+--       trainer_patience = 8
+--    }
+--
+--    pop_textdomain()
+
+push_textdomain("tribes")
+
+dirname = path.dirname(__file__)
+
 tribes:new_trainingsite_type {
-   msgctxt = "atlanteans_building",
    name = "atlanteans_dungeon",
    -- TRANSLATORS: This is a building name used in lists of buildings
    descname = pgettext("atlanteans_building", "Dungeon"),
@@ -213,3 +307,5 @@ tribes:new_trainingsite_type {
    soldier_capacity = 8,
    trainer_patience = 16
 }
+
+pop_textdomain()
diff --git a/data/tribes/buildings/trainingsites/atlanteans/labyrinth/init.lua b/data/tribes/buildings/trainingsites/atlanteans/labyrinth/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname(__file__)
 
 tribes:new_trainingsite_type {
-   msgctxt = "atlanteans_building",
    name = "atlanteans_labyrinth",
    -- TRANSLATORS: This is a building name used in lists of buildings
    descname = pgettext("atlanteans_building", "Labyrinth"),
@@ -65,15 +66,15 @@ tribes:new_trainingsite_type {
    ["soldier health"] = {
       food = {
          {"smoked_fish", "smoked_meat"},
-         {"atlanteans_bread"}
       },
       weapons = {
          "tabard_golden"
       }
    },
    ["soldier evade"] = {
       food = {
-         {"smoked_fish", "smoked_meat"}
+         {"smoked_fish", "smoked_meat"},
+         {"atlanteans_bread"}
       }
    },
 
@@ -158,3 +159,5 @@ tribes:new_trainingsite_type {
    soldier_capacity = 8,
    trainer_patience = 20
 }
+
+pop_textdomain()
diff --git a/data/tribes/buildings/trainingsites/barbarians/battlearena/init.lua b/data/tribes/buildings/trainingsites/barbarians/battlearena/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname(__file__)
 
 tribes:new_trainingsite_type {
-   msgctxt = "barbarians_building",
    name = "barbarians_battlearena",
    -- TRANSLATORS: This is a building name used in lists of buildings
    descname = pgettext("barbarians_building", "Battle Arena"),
@@ -115,3 +116,5 @@ tribes:new_trainingsite_type {
    soldier_capacity = 8,
    trainer_patience = 3
 }
+
+pop_textdomain()
diff --git a/data/tribes/buildings/trainingsites/barbarians/trainingcamp/init.lua b/data/tribes/buildings/trainingsites/barbarians/trainingcamp/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname(__file__)
 
 tribes:new_trainingsite_type {
-   msgctxt = "barbarians_building",
    name = "barbarians_trainingcamp",
    -- TRANSLATORS: This is a building name used in lists of buildings
    descname = pgettext("barbarians_building", "Training Camp"),
@@ -213,3 +214,5 @@ tribes:new_trainingsite_type {
    soldier_capacity = 12,
    trainer_patience = 5
 }
+
+pop_textdomain()
diff --git a/data/tribes/buildings/trainingsites/empire/arena/init.lua b/data/tribes/buildings/trainingsites/empire/arena/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname(__file__)
 
 tribes:new_trainingsite_type {
-   msgctxt = "empire_building",
    name = "empire_arena",
    -- TRANSLATORS: This is a building name used in lists of buildings
    descname = pgettext("empire_building", "Arena"),
@@ -88,3 +89,5 @@ tribes:new_trainingsite_type {
    soldier_capacity = 8,
    trainer_patience = 8
 }
+
+pop_textdomain()
diff --git a/data/tribes/buildings/trainingsites/empire/colosseum/init.lua b/data/tribes/buildings/trainingsites/empire/colosseum/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname(__file__)
 
 tribes:new_trainingsite_type {
-   msgctxt = "empire_building",
    name = "empire_colosseum",
    -- TRANSLATORS: This is a building name used in lists of buildings
    descname = pgettext("empire_building", "Colosseum"),
@@ -96,3 +97,5 @@ tribes:new_trainingsite_type {
    soldier_capacity = 8,
    trainer_patience = 9
 }
+
+pop_textdomain()
diff --git a/data/tribes/buildings/trainingsites/empire/trainingcamp/init.lua b/data/tribes/buildings/trainingsites/empire/trainingcamp/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname(__file__)
 
 tribes:new_trainingsite_type {
-   msgctxt = "empire_building",
    name = "empire_trainingcamp",
    -- TRANSLATORS: This is a building name used in lists of buildings
    descname = pgettext("empire_building", "Training Camp"),
@@ -207,3 +208,5 @@ tribes:new_trainingsite_type {
    soldier_capacity = 12,
    trainer_patience = 12
 }
+
+pop_textdomain()
diff --git a/data/tribes/buildings/trainingsites/frisians/training_arena/init.lua b/data/tribes/buildings/trainingsites/frisians/training_arena/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname (__file__)
 
 tribes:new_trainingsite_type {
-   msgctxt = "frisians_building",
    name = "frisians_training_arena",
    -- TRANSLATORS: This is a building name used in lists of buildings
    descname = pgettext ("frisians_building", "Training Arena"),
@@ -200,3 +201,5 @@ tribes:new_trainingsite_type {
    soldier_capacity = 6,
    trainer_patience = 3
 }
+
+pop_textdomain()
diff --git a/data/tribes/buildings/trainingsites/frisians/training_camp/init.lua b/data/tribes/buildings/trainingsites/frisians/training_camp/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname (__file__)
 
 tribes:new_trainingsite_type {
-   msgctxt = "frisians_building",
    name = "frisians_training_camp",
    -- TRANSLATORS: This is a building name used in lists of buildings
    descname = pgettext ("frisians_building", "Training Camp"),
@@ -197,3 +198,5 @@ tribes:new_trainingsite_type {
    soldier_capacity = 10,
    trainer_patience = 5
 }
+
+pop_textdomain()
diff --git a/data/tribes/buildings/warehouses/atlanteans/headquarters/init.lua b/data/tribes/buildings/warehouses/atlanteans/headquarters/init.lua
@@ -15,10 +15,7 @@
 -- ``data/tribes/buildings/warehouses/<tribe_name>/<building_name>/init.lua``.
 -- The building will also need its help texts, which are defined in
 -- ``data/tribes/buildings/warehouses/<tribe_name>/<building_name>/helptexts.lua``
-
-dirname = path.dirname(__file__)
-
--- RST
+--
 -- .. function:: new_warehouse_type{table}
 --
 --    This function adds the definition of a warehouse building to the engine.
@@ -39,9 +36,44 @@ dirname = path.dirname(__file__)
 --
 --    **destructible**
 --        *Optional. Default:* ``true``. Set this to ``false`` for headquarters.
+--
+-- For making the UI texts translateable, we also need to push/pop the correct textdomain.
+--
+-- Example:
+--
+-- .. code-block:: lua
+--
+--    push_textdomain("tribes")
+--
+--    dirname = path.dirname(__file__)
+--
+--    tribes:new_warehouse_type {
+--       name = "atlanteans_headquarters",
+--       descname = pgettext("atlanteans_building", "Headquarters"),
+--       animation_directory = dirname,
+--       icon = dirname .. "menu.png",
+--       size = "big",
+--       destructible = false,
+--
+--       animations = {
+--          idle = {
+--             hotspot = { 81, 110 },
+--          },
+--       },
+--
+--       aihints = {},
+--
+--       heal_per_second = 220,
+--       conquers = 9,
+--    }
+--
+--    pop_textdomain()
+
+push_textdomain("tribes")
+
+dirname = path.dirname(__file__)
 
 tribes:new_warehouse_type {
-   msgctxt = "atlanteans_building",
    name = "atlanteans_headquarters",
    -- TRANSLATORS: This is a building name used in lists of buildings
    descname = pgettext("atlanteans_building", "Headquarters"),
@@ -62,3 +94,5 @@ tribes:new_warehouse_type {
    heal_per_second = 220,
    conquers = 9,
 }
+
+pop_textdomain()
diff --git a/data/tribes/buildings/warehouses/atlanteans/port/init.lua b/data/tribes/buildings/warehouses/atlanteans/port/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname(__file__)
 
 tribes:new_warehouse_type {
-   msgctxt = "atlanteans_building",
    name = "atlanteans_port",
    -- TRANSLATORS: This is a building name used in lists of buildings
    descname = pgettext("atlanteans_building", "Port"),
@@ -46,3 +47,5 @@ tribes:new_warehouse_type {
    conquers = 5,
    heal_per_second = 170,
 }
+
+pop_textdomain()
diff --git a/data/tribes/buildings/warehouses/atlanteans/warehouse/init.lua b/data/tribes/buildings/warehouses/atlanteans/warehouse/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname(__file__)
 
 tribes:new_warehouse_type {
-   msgctxt = "atlanteans_building",
    name = "atlanteans_warehouse",
    -- TRANSLATORS: This is a building name used in lists of buildings
    descname = pgettext("atlanteans_building", "Warehouse"),
@@ -34,3 +35,5 @@ tribes:new_warehouse_type {
 
    heal_per_second = 170,
 }
+
+pop_textdomain()
diff --git a/data/tribes/buildings/warehouses/barbarians/headquarters/init.lua b/data/tribes/buildings/warehouses/barbarians/headquarters/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname(__file__)
 
 tribes:new_warehouse_type {
-   msgctxt = "barbarians_building",
    name = "barbarians_headquarters",
    -- TRANSLATORS: This is a building name used in lists of buildings
    descname = pgettext("barbarians_building", "Headquarters"),
@@ -26,3 +27,5 @@ tribes:new_warehouse_type {
    heal_per_second = 220,
    conquers = 9,
 }
+
+pop_textdomain()
diff --git a/data/tribes/buildings/warehouses/barbarians/headquarters_interim/init.lua b/data/tribes/buildings/warehouses/barbarians/headquarters_interim/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname(__file__)
 
 tribes:new_warehouse_type {
-   msgctxt = "barbarians_building",
    name = "barbarians_headquarters_interim",
    -- TRANSLATORS: This is a building name used in lists of buildings
    descname = pgettext("barbarians_building", "Headquarters"),
@@ -24,3 +25,5 @@ tribes:new_warehouse_type {
    heal_per_second = 170,
    conquers = 9,
 }
+
+pop_textdomain()
diff --git a/data/tribes/buildings/warehouses/barbarians/port/init.lua b/data/tribes/buildings/warehouses/barbarians/port/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname(__file__)
 
 tribes:new_warehouse_type {
-   msgctxt = "barbarians_building",
    name = "barbarians_port",
    -- TRANSLATORS: This is a building name used in lists of buildings
    descname = pgettext("barbarians_building", "Port"),
@@ -48,3 +49,5 @@ tribes:new_warehouse_type {
    conquers = 5,
    heal_per_second = 170,
 }
+
+pop_textdomain()
diff --git a/data/tribes/buildings/warehouses/barbarians/warehouse/init.lua b/data/tribes/buildings/warehouses/barbarians/warehouse/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname(__file__)
 
 tribes:new_warehouse_type {
-   msgctxt = "barbarians_building",
    name = "barbarians_warehouse",
    -- TRANSLATORS: This is a building name used in lists of buildings
    descname = pgettext("barbarians_building", "Warehouse"),
@@ -37,3 +38,5 @@ tribes:new_warehouse_type {
 
    heal_per_second = 170,
 }
+
+pop_textdomain()
diff --git a/data/tribes/buildings/warehouses/empire/headquarters/init.lua b/data/tribes/buildings/warehouses/empire/headquarters/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname(__file__)
 
 tribes:new_warehouse_type {
-   msgctxt = "empire_building",
    name = "empire_headquarters",
    -- TRANSLATORS: This is a building name used in lists of buildings
    descname = pgettext("empire_building", "Headquarters"),
@@ -22,3 +23,5 @@ tribes:new_warehouse_type {
    heal_per_second = 220,
    conquers = 9,
 }
+
+pop_textdomain()
diff --git a/data/tribes/buildings/warehouses/empire/headquarters_shipwreck/init.lua b/data/tribes/buildings/warehouses/empire/headquarters_shipwreck/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname(__file__)
 
 tribes:new_warehouse_type {
-   msgctxt = "empire_building",
    name = "empire_headquarters_shipwreck",
    -- TRANSLATORS: This is a building name used in lists of buildings
    descname = pgettext("empire_building", "Headquarters Shipwreck"),
@@ -22,3 +23,5 @@ tribes:new_warehouse_type {
    heal_per_second = 170,
    conquers = 9,
 }
+
+pop_textdomain()
diff --git a/data/tribes/buildings/warehouses/empire/port/init.lua b/data/tribes/buildings/warehouses/empire/port/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname(__file__)
 
 tribes:new_warehouse_type {
-   msgctxt = "empire_building",
    name = "empire_port",
    -- TRANSLATORS: This is a building name used in lists of buildings
    descname = pgettext("empire_building", "Port"),
@@ -47,3 +48,5 @@ tribes:new_warehouse_type {
    conquers = 5,
    heal_per_second = 170,
 }
+
+pop_textdomain()
diff --git a/data/tribes/buildings/warehouses/empire/warehouse/init.lua b/data/tribes/buildings/warehouses/empire/warehouse/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname(__file__)
 
 tribes:new_warehouse_type {
-   msgctxt = "empire_building",
    name = "empire_warehouse",
    -- TRANSLATORS: This is a building name used in lists of buildings
    descname = pgettext("empire_building", "Warehouse"),
@@ -34,3 +35,5 @@ tribes:new_warehouse_type {
 
    heal_per_second = 170,
 }
+
+pop_textdomain()
diff --git a/data/tribes/buildings/warehouses/frisians/headquarters/init.lua b/data/tribes/buildings/warehouses/frisians/headquarters/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname (__file__)
 
 tribes:new_warehouse_type {
-   msgctxt = "frisians_building",
    name = "frisians_headquarters",
    -- TRANSLATORS: This is a building name used in lists of buildings
    descname = pgettext ("frisians_building", "Headquarters"),
@@ -27,3 +28,5 @@ tribes:new_warehouse_type {
    heal_per_second = 220,
    conquers = 9,
 }
+
+pop_textdomain()
diff --git a/data/tribes/buildings/warehouses/frisians/port/init.lua b/data/tribes/buildings/warehouses/frisians/port/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname (__file__)
 
 tribes:new_warehouse_type {
-   msgctxt = "frisians_building",
    name = "frisians_port",
    -- TRANSLATORS: This is a building name used in lists of buildings
    descname = pgettext ("frisians_building", "Port"),
@@ -53,3 +54,5 @@ tribes:new_warehouse_type {
    conquers = 5,
    heal_per_second = 170,
 }
+
+pop_textdomain()
diff --git a/data/tribes/buildings/warehouses/frisians/warehouse/init.lua b/data/tribes/buildings/warehouses/frisians/warehouse/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname (__file__)
 
 tribes:new_warehouse_type {
-   msgctxt = "frisians_building",
    name = "frisians_warehouse",
    -- TRANSLATORS: This is a building name used in lists of buildings
    descname = pgettext ("frisians_building", "Warehouse"),
@@ -45,3 +46,5 @@ tribes:new_warehouse_type {
 
    heal_per_second = 170,
 }
+
+pop_textdomain()
diff --git a/data/tribes/immovables/ashes/init.lua b/data/tribes/immovables/ashes/init.lua
@@ -9,24 +9,17 @@
 --
 -- Tribe Immovables are defined in
 -- ``data/tribes/immovables/<immovable_name>/init.lua``.
-
-dirname = path.dirname(__file__)
-
--- RST
+--
 -- .. function:: new_immovable_type(table)
 --
 --    This function adds the definition of a tribe immovable to the engine.
 --
 --    :arg table: This table contains all the data that the game engine will
 --                add to this immovable. It contains the following entries:
 --
---    **msgctxt**: The context that Gettext will use to disambiguate the
---    translations for strings in this table.
---
 --    **name**: A string containing the internal name of this immovable.
 --
---    **descname**: The translatable display name. Use ``pgettext`` with the
---    ``msgctxt`` above to fetch the string.
+--    **descname**: The translatable display name. Use ``pgettext`` to fetch the string.
 --
 --    **helptext_script**:  The full path to the ``helptexts.lua`` script for this immovable.
 --
@@ -35,8 +28,43 @@ dirname = path.dirname(__file__)
 --
 --    **animations**: A table containing all animations for this immovable.
 --
+-- For making the UI texts translateable, we also need to push/pop the correct textdomain.
+--
+-- Example:
+--
+-- .. code-block:: lua
+--
+--    push_textdomain("tribes")
+--
+--    dirname = path.dirname(__file__)
+--
+--    tribes:new_immovable_type {
+--       name = "ashes",
+--       descname = pgettext("immovable", "Ashes"),
+--       anmation_directory = dirname,
+--       icon = dirname .. "menu.png",
+--       size = "small",
+--       programs = {
+--          main = {
+--             "animate=idle duration:45s",
+--             "remove=",
+--          }
+--       },
+--
+--       animations = {
+--          idle = {
+--             hotspot = { 40, 39 },
+--          },
+--       }
+--    }
+--
+--    pop_textdomain()
+
+push_textdomain("tribes")
+
+dirname = path.dirname(__file__)
+
 tribes:new_immovable_type {
-   msgctxt = "immovable",
    name = "ashes",
    -- TRANSLATORS: This is an immovable name used in lists of immovables
    descname = pgettext("immovable", "Ashes"),
@@ -58,6 +86,7 @@ tribes:new_immovable_type {
    }
 }
 
+pop_textdomain()
 
 -- RST
 --

diff --git a/data/tribes/immovables/barleyfield/harvested/init.lua b/data/tribes/immovables/barleyfield/harvested/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname(__file__)
 
 tribes:new_immovable_type {
-   msgctxt = "immovable",
    name = "barleyfield_harvested",
    -- TRANSLATORS: This is an immovable name used in lists of immovables
    descname = pgettext("immovable", "Barley Field (harvested)"),
@@ -21,3 +22,5 @@ tribes:new_immovable_type {
       }
    }
 }
+
+pop_textdomain()
diff --git a/data/tribes/immovables/barleyfield/medium/init.lua b/data/tribes/immovables/barleyfield/medium/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname(__file__)
 
 tribes:new_immovable_type {
-   msgctxt = "immovable",
    name = "barleyfield_medium",
    -- TRANSLATORS: This is an immovable name used in lists of immovables
    descname = pgettext("immovable", "Barley Field (medium)"),
@@ -22,3 +23,5 @@ tribes:new_immovable_type {
       }
    }
 }
+
+pop_textdomain()
diff --git a/data/tribes/immovables/barleyfield/ripe/init.lua b/data/tribes/immovables/barleyfield/ripe/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname(__file__)
 
 tribes:new_immovable_type {
-   msgctxt = "immovable",
    name = "barleyfield_ripe",
    -- TRANSLATORS: This is an immovable name used in lists of immovables
    descname = pgettext("immovable", "Barley Field (ripe)"),
@@ -25,3 +26,5 @@ tribes:new_immovable_type {
       }
    }
 }
+
+pop_textdomain()
diff --git a/data/tribes/immovables/barleyfield/small/init.lua b/data/tribes/immovables/barleyfield/small/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname(__file__)
 
 tribes:new_immovable_type {
-   msgctxt = "immovable",
    name = "barleyfield_small",
    -- TRANSLATORS: This is an immovable name used in lists of immovables
    descname = pgettext("immovable", "Barley Field (small)"),
@@ -22,3 +23,5 @@ tribes:new_immovable_type {
       }
    }
 }
+
+pop_textdomain()
diff --git a/data/tribes/immovables/barleyfield/tiny/init.lua b/data/tribes/immovables/barleyfield/tiny/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname(__file__)
 
 tribes:new_immovable_type {
-   msgctxt = "immovable",
    name = "barleyfield_tiny",
    -- TRANSLATORS: This is an immovable name used in lists of immovables
    descname = pgettext("immovable", "Barley Field (tiny)"),
@@ -22,3 +23,5 @@ tribes:new_immovable_type {
       }
    }
 }
+
+pop_textdomain()
diff --git a/data/tribes/immovables/berry_bushes/blueberry/init.lua b/data/tribes/immovables/berry_bushes/blueberry/init.lua
@@ -10,7 +10,6 @@ terrain_affinity = {
 }
 
 tribes:new_immovable_type {
-   msgctxt = "immovable",
    name = "berry_bush_blueberry_tiny",
    descname = _ "Blueberry Bush (tiny)",
    size = "small",
@@ -36,7 +35,6 @@ tribes:new_immovable_type {
 }
 
 tribes:new_immovable_type {
-   msgctxt = "immovable",
    name = "berry_bush_blueberry_small",
    descname = _ "Blueberry Bush (small)",
    size = "small",
@@ -62,7 +60,6 @@ tribes:new_immovable_type {
 }
 
 tribes:new_immovable_type {
-   msgctxt = "immovable",
    name = "berry_bush_blueberry_medium",
    descname = _ "Blueberry Bush (medium)",
    size = "small",
@@ -88,7 +85,6 @@ tribes:new_immovable_type {
 }
 
 tribes:new_immovable_type {
-   msgctxt = "immovable",
    name = "berry_bush_blueberry_ripe",
    descname = _ "Blueberry Bush (ripe)",
    size = "small",

diff --git a/data/tribes/immovables/berry_bushes/currant_black/init.lua b/data/tribes/immovables/berry_bushes/currant_black/init.lua
@@ -1,3 +1,5 @@
+push_textdomain("tribes")
+
 dirname = path.dirname (__file__)
 
 terrain_affinity = {
@@ -8,7 +10,6 @@ terrain_affinity = {
 }
 
 tribes:new_immovable_type {
-   msgctxt = "immovable",
    name = "berry_bush_currant_black_tiny",
    descname = _ "Black Currant (tiny)",
    size = "small",
@@ -34,7 +35,6 @@ tribes:new_immovable_type {
 }
 
 tribes:new_immovable_type {
-   msgctxt = "immovable",
    name = "berry_bush_currant_black_small",
    descname = _ "Black Currant (small)",
    size = "small",
@@ -60,7 +60,6 @@ tribes:new_immovable_type {
 }
 
 tribes:new_immovable_type {
-   msgctxt = "immovable",
    name = "berry_bush_currant_black_medium",
    descname = _ "Black Currant (medium)",
    size = "small",
@@ -86,7 +85,6 @@ tribes:new_immovable_type {
 }
 
 tribes:new_immovable_type {
-   msgctxt = "immovable",
    name = "berry_bush_currant_black_ripe",
    descname = _ "Black Currant (ripe)",
    size = "small",
@@ -113,3 +111,5 @@ tribes:new_immovable_type {
       }
    }
 }
+
+pop_textdomain()
diff --git a/data/tribes/immovables/berry_bushes/currant_red/init.lua b/data/tribes/immovables/berry_bushes/currant_red/init.lua
@@ -1,3 +1,5 @@
+push_textdomain("tribes")
+
 dirname = path.dirname (__file__)
 
 terrain_affinity = {
@@ -8,7 +10,6 @@ terrain_affinity = {
 }
 
 tribes:new_immovable_type {
-   msgctxt = "immovable",
    name = "berry_bush_currant_red_tiny",
    descname = _ "Red Currant (tiny)",
    size = "small",
@@ -34,7 +35,6 @@ tribes:new_immovable_type {
 }
 
 tribes:new_immovable_type {
-   msgctxt = "immovable",
    name = "berry_bush_currant_red_small",
    descname = _ "Red Currant (small)",
    size = "small",
@@ -60,7 +60,6 @@ tribes:new_immovable_type {
 }
 
 tribes:new_immovable_type {
-   msgctxt = "immovable",
    name = "berry_bush_currant_red_medium",
    descname = _ "Red Currant (medium)",
    size = "small",
@@ -86,7 +85,6 @@ tribes:new_immovable_type {
 }
 
 tribes:new_immovable_type {
-   msgctxt = "immovable",
    name = "berry_bush_currant_red_ripe",
    descname = _ "Red Currant (ripe)",
    size = "small",
@@ -113,3 +111,5 @@ tribes:new_immovable_type {
       }
    }
 }
+
+pop_textdomain()
diff --git a/data/tribes/immovables/berry_bushes/desert_hackberry/init.lua b/data/tribes/immovables/berry_bushes/desert_hackberry/init.lua
@@ -1,3 +1,5 @@
+push_textdomain("tribes")
+
 dirname = path.dirname (__file__)
 
 terrain_affinity = {
@@ -8,7 +10,6 @@ terrain_affinity = {
 }
 
 tribes:new_immovable_type {
-   msgctxt = "immovable",
    name = "berry_bush_desert_hackberry_tiny",
    descname = _ "Desert Hackberry (tiny)",
    size = "small",
@@ -34,7 +35,6 @@ tribes:new_immovable_type {
 }
 
 tribes:new_immovable_type {
-   msgctxt = "immovable",
    name = "berry_bush_desert_hackberry_small",
    descname = _ "Desert Hackberry (small)",
    size = "small",
@@ -60,7 +60,6 @@ tribes:new_immovable_type {
 }
 
 tribes:new_immovable_type {
-   msgctxt = "immovable",
    name = "berry_bush_desert_hackberry_medium",
    descname = _ "Desert Hackberry (medium)",
    size = "small",
@@ -86,7 +85,6 @@ tribes:new_immovable_type {
 }
 
 tribes:new_immovable_type {
-   msgctxt = "immovable",
    name = "berry_bush_desert_hackberry_ripe",
    descname = _ "Desert Hackberry (ripe)",
    size = "small",
@@ -113,3 +111,5 @@ tribes:new_immovable_type {
       }
    }
 }
+
+pop_textdomain()
diff --git a/data/tribes/immovables/berry_bushes/juniper/init.lua b/data/tribes/immovables/berry_bushes/juniper/init.lua
@@ -1,3 +1,5 @@
+push_textdomain("tribes")
+
 dirname = path.dirname (__file__)
 
 terrain_affinity = {
@@ -8,7 +10,6 @@ terrain_affinity = {
 }
 
 tribes:new_immovable_type {
-   msgctxt = "immovable",
    name = "berry_bush_juniper_tiny",
    descname = _ "Juniper (tiny)",
    size = "small",
@@ -34,7 +35,6 @@ tribes:new_immovable_type {
 }
 
 tribes:new_immovable_type {
-   msgctxt = "immovable",
    name = "berry_bush_juniper_small",
    descname = _ "Juniper (small)",
    size = "small",
@@ -60,7 +60,6 @@ tribes:new_immovable_type {
 }
 
 tribes:new_immovable_type {
-   msgctxt = "immovable",
    name = "berry_bush_juniper_medium",
    descname = _ "Juniper (medium)",
    size = "small",
@@ -86,7 +85,6 @@ tribes:new_immovable_type {
 }
 
 tribes:new_immovable_type {
-   msgctxt = "immovable",
    name = "berry_bush_juniper_ripe",
    descname = _ "Juniper (ripe)",
    size = "small",
@@ -113,3 +111,5 @@ tribes:new_immovable_type {
       }
    }
 }
+
+pop_textdomain()
diff --git a/data/tribes/immovables/berry_bushes/raspberry/init.lua b/data/tribes/immovables/berry_bushes/raspberry/init.lua
@@ -1,3 +1,5 @@
+push_textdomain("tribes")
+
 dirname = path.dirname (__file__)
 
 terrain_affinity = {
@@ -8,7 +10,6 @@ terrain_affinity = {
 }
 
 tribes:new_immovable_type {
-   msgctxt = "immovable",
    name = "berry_bush_raspberry_tiny",
    descname = _ "Raspberry Bush (tiny)",
    size = "small",
@@ -34,7 +35,6 @@ tribes:new_immovable_type {
 }
 
 tribes:new_immovable_type {
-   msgctxt = "immovable",
    name = "berry_bush_raspberry_small",
    descname = _ "Raspberry Bush (small)",
    size = "small",
@@ -60,7 +60,6 @@ tribes:new_immovable_type {
 }
 
 tribes:new_immovable_type {
-   msgctxt = "immovable",
    name = "berry_bush_raspberry_medium",
    descname = _ "Raspberry Bush (medium)",
    size = "small",
@@ -86,7 +85,6 @@ tribes:new_immovable_type {
 }
 
 tribes:new_immovable_type {
-   msgctxt = "immovable",
    name = "berry_bush_raspberry_ripe",
    descname = _ "Raspberry Bush (ripe)",
    size = "small",
@@ -113,3 +111,5 @@ tribes:new_immovable_type {
       }
    }
 }
+
+pop_textdomain()
diff --git a/data/tribes/immovables/berry_bushes/sea_buckthorn/init.lua b/data/tribes/immovables/berry_bushes/sea_buckthorn/init.lua
@@ -1,3 +1,5 @@
+push_textdomain("tribes")
+
 dirname = path.dirname (__file__)
 
 terrain_affinity = {
@@ -8,7 +10,6 @@ terrain_affinity = {
 }
 
 tribes:new_immovable_type {
-   msgctxt = "immovable",
    name = "berry_bush_sea_buckthorn_tiny",
    descname = _ "Sea Buckthorn (tiny)",
    size = "small",
@@ -34,7 +35,6 @@ tribes:new_immovable_type {
 }
 
 tribes:new_immovable_type {
-   msgctxt = "immovable",
    name = "berry_bush_sea_buckthorn_small",
    descname = _ "Sea Buckthorn (small)",
    size = "small",
@@ -60,7 +60,6 @@ tribes:new_immovable_type {
 }
 
 tribes:new_immovable_type {
-   msgctxt = "immovable",
    name = "berry_bush_sea_buckthorn_medium",
    descname = _ "Sea Buckthorn (medium)",
    size = "small",
@@ -86,7 +85,6 @@ tribes:new_immovable_type {
 }
 
 tribes:new_immovable_type {
-   msgctxt = "immovable",
    name = "berry_bush_sea_buckthorn_ripe",
    descname = _ "Sea Buckthorn (ripe)",
    size = "small",
@@ -113,3 +111,5 @@ tribes:new_immovable_type {
       }
    }
 }
+
+pop_textdomain()
diff --git a/data/tribes/immovables/berry_bushes/stink_tree/init.lua b/data/tribes/immovables/berry_bushes/stink_tree/init.lua
@@ -1,3 +1,5 @@
+push_textdomain("tribes")
+
 dirname = path.dirname (__file__)
 
 terrain_affinity = {
@@ -8,7 +10,6 @@ terrain_affinity = {
 }
 
 tribes:new_immovable_type {
-   msgctxt = "immovable",
    name = "berry_bush_stink_tree_tiny",
    descname = _ "Stink Shepherd’s Tree (tiny)",
    size = "small",
@@ -34,7 +35,6 @@ tribes:new_immovable_type {
 }
 
 tribes:new_immovable_type {
-   msgctxt = "immovable",
    name = "berry_bush_stink_tree_small",
    descname = _ "Stink Shepherd’s Tree (small)",
    size = "small",
@@ -60,7 +60,6 @@ tribes:new_immovable_type {
 }
 
 tribes:new_immovable_type {
-   msgctxt = "immovable",
    name = "berry_bush_stink_tree_medium",
    descname = _ "Stink Shepherd’s Tree (medium)",
    size = "small",
@@ -86,7 +85,6 @@ tribes:new_immovable_type {
 }
 
 tribes:new_immovable_type {
-   msgctxt = "immovable",
    name = "berry_bush_stink_tree_ripe",
    descname = _ "Stink Shepherd’s Tree (ripe)",
    size = "small",
@@ -113,3 +111,5 @@ tribes:new_immovable_type {
       }
    }
 }
+
+pop_textdomain()
diff --git a/data/tribes/immovables/berry_bushes/strawberry/init.lua b/data/tribes/immovables/berry_bushes/strawberry/init.lua
@@ -1,3 +1,5 @@
+push_textdomain("tribes")
+
 dirname = path.dirname (__file__)
 
 terrain_affinity = {
@@ -8,7 +10,6 @@ terrain_affinity = {
 }
 
 tribes:new_immovable_type {
-   msgctxt = "immovable",
    name = "berry_bush_strawberry_tiny",
    descname = _ "Strawberries (tiny)",
    size = "small",
@@ -34,7 +35,6 @@ tribes:new_immovable_type {
 }
 
 tribes:new_immovable_type {
-   msgctxt = "immovable",
    name = "berry_bush_strawberry_small",
    descname = _ "Strawberries (small)",
    size = "small",
@@ -60,7 +60,6 @@ tribes:new_immovable_type {
 }
 
 tribes:new_immovable_type {
-   msgctxt = "immovable",
    name = "berry_bush_strawberry_medium",
    descname = _ "Strawberries (medium)",
    size = "small",
@@ -86,7 +85,6 @@ tribes:new_immovable_type {
 }
 
 tribes:new_immovable_type {
-   msgctxt = "immovable",
    name = "berry_bush_strawberry_ripe",
    descname = _ "Strawberries (ripe)",
    size = "small",
@@ -113,3 +111,5 @@ tribes:new_immovable_type {
       }
    }
 }
+
+pop_textdomain()
diff --git a/data/tribes/immovables/blackrootfield/harvested/init.lua b/data/tribes/immovables/blackrootfield/harvested/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname(__file__)
 
 tribes:new_immovable_type {
-   msgctxt = "immovable",
    name = "blackrootfield_harvested",
    -- TRANSLATORS: This is an immovable name used in lists of immovables
    descname = pgettext("immovable", "Blackroot Field (harvested)"),
@@ -21,3 +22,5 @@ tribes:new_immovable_type {
       },
    }
 }
+
+pop_textdomain()
diff --git a/data/tribes/immovables/blackrootfield/medium/init.lua b/data/tribes/immovables/blackrootfield/medium/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname(__file__)
 
 tribes:new_immovable_type {
-   msgctxt = "immovable",
    name = "blackrootfield_medium",
    -- TRANSLATORS: This is an immovable name used in lists of immovables
    descname = pgettext("immovable", "Blackroot Field (medium)"),
@@ -22,3 +23,5 @@ tribes:new_immovable_type {
       },
    }
 }
+
+pop_textdomain()
diff --git a/data/tribes/immovables/blackrootfield/ripe/init.lua b/data/tribes/immovables/blackrootfield/ripe/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname(__file__)
 
 tribes:new_immovable_type {
-   msgctxt = "immovable",
    name = "blackrootfield_ripe",
    -- TRANSLATORS: This is an immovable name used in lists of immovables
    descname = pgettext("immovable", "Blackroot Field (ripe)"),
@@ -25,3 +26,5 @@ tribes:new_immovable_type {
       },
    }
 }
+
+pop_textdomain()
diff --git a/data/tribes/immovables/blackrootfield/small/init.lua b/data/tribes/immovables/blackrootfield/small/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname(__file__)
 
 tribes:new_immovable_type {
-   msgctxt = "immovable",
    name = "blackrootfield_small",
    -- TRANSLATORS: This is an immovable name used in lists of immovables
    descname = pgettext("immovable", "Blackroot Field (small)"),
@@ -22,3 +23,5 @@ tribes:new_immovable_type {
       },
    }
 }
+
+pop_textdomain()
diff --git a/data/tribes/immovables/blackrootfield/tiny/init.lua b/data/tribes/immovables/blackrootfield/tiny/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname(__file__)
 
 tribes:new_immovable_type {
-   msgctxt = "immovable",
    name = "blackrootfield_tiny",
    -- TRANSLATORS: This is an immovable name used in lists of immovables
    descname = pgettext("immovable", "Blackroot Field (tiny)"),
@@ -22,3 +23,5 @@ tribes:new_immovable_type {
       },
    }
 }
+
+pop_textdomain()
diff --git a/data/tribes/immovables/cornfield/harvested/init.lua b/data/tribes/immovables/cornfield/harvested/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname(__file__)
 
 tribes:new_immovable_type {
-   msgctxt = "immovable",
    name = "cornfield_harvested",
    -- TRANSLATORS: This is an immovable name used in lists of immovables
    descname = pgettext("immovable", "Cornfield (harvested)"),
@@ -21,3 +22,5 @@ tribes:new_immovable_type {
       },
    }
 }
+
+pop_textdomain()
diff --git a/data/tribes/immovables/cornfield/medium/init.lua b/data/tribes/immovables/cornfield/medium/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname(__file__)
 
 tribes:new_immovable_type {
-   msgctxt = "immovable",
    name = "cornfield_medium",
    -- TRANSLATORS: This is an immovable name used in lists of immovables
    descname = pgettext("immovable", "Cornfield (medium)"),
@@ -22,3 +23,5 @@ tribes:new_immovable_type {
       },
    }
 }
+
+pop_textdomain()
diff --git a/data/tribes/immovables/cornfield/ripe/init.lua b/data/tribes/immovables/cornfield/ripe/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname(__file__)
 
 tribes:new_immovable_type {
-   msgctxt = "immovable",
    name = "cornfield_ripe",
    -- TRANSLATORS: This is an immovable name used in lists of immovables
    descname = pgettext("immovable", "Cornfield (ripe)"),
@@ -25,3 +26,5 @@ tribes:new_immovable_type {
       },
    }
 }
+
+pop_textdomain()
diff --git a/data/tribes/immovables/cornfield/small/init.lua b/data/tribes/immovables/cornfield/small/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname(__file__)
 
 tribes:new_immovable_type {
-   msgctxt = "immovable",
    name = "cornfield_small",
    -- TRANSLATORS: This is an immovable name used in lists of immovables
    descname = pgettext("immovable", "Cornfield (small)"),
@@ -22,3 +23,5 @@ tribes:new_immovable_type {
       },
    }
 }
+
+pop_textdomain()
diff --git a/data/tribes/immovables/cornfield/tiny/init.lua b/data/tribes/immovables/cornfield/tiny/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname(__file__)
 
 tribes:new_immovable_type {
-   msgctxt = "immovable",
    name = "cornfield_tiny",
    -- TRANSLATORS: This is an immovable name used in lists of immovables
    descname = pgettext("immovable", "Cornfield (tiny)"),
@@ -22,3 +23,5 @@ tribes:new_immovable_type {
       },
    }
 }
+
+pop_textdomain()
diff --git a/data/tribes/immovables/destroyed_building/init.lua b/data/tribes/immovables/destroyed_building/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname(__file__)
 
 tribes:new_immovable_type {
-   msgctxt = "immovable",
    name = "destroyed_building",
    -- TRANSLATORS: This is an immovable name used in lists of immovables
    descname = pgettext("immovable", "Destroyed building"),
@@ -23,3 +24,5 @@ tribes:new_immovable_type {
       },
    }
 }
+
+pop_textdomain()
diff --git a/data/tribes/immovables/grapevine/medium/init.lua b/data/tribes/immovables/grapevine/medium/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname(__file__)
 
 tribes:new_immovable_type {
-   msgctxt = "immovable",
    name = "grapevine_medium",
    -- TRANSLATORS: This is an immovable name used in lists of immovables
    descname = pgettext("immovable", "Grapevine (medium)"),
@@ -22,3 +23,5 @@ tribes:new_immovable_type {
       },
    }
 }
+
+pop_textdomain()
diff --git a/data/tribes/immovables/grapevine/ripe/init.lua b/data/tribes/immovables/grapevine/ripe/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname(__file__)
 
 tribes:new_immovable_type {
-   msgctxt = "immovable",
    name = "grapevine_ripe",
    -- TRANSLATORS: This is an immovable name used in lists of immovables
    descname = pgettext("immovable", "Grapevine (ripe)"),
@@ -25,3 +26,5 @@ tribes:new_immovable_type {
       },
    }
 }
+
+pop_textdomain()
diff --git a/data/tribes/immovables/grapevine/small/init.lua b/data/tribes/immovables/grapevine/small/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname(__file__)
 
 tribes:new_immovable_type {
-   msgctxt = "immovable",
    name = "grapevine_small",
    -- TRANSLATORS: This is an immovable name used in lists of immovables
    descname = pgettext("immovable", "Grapevine (small)"),
@@ -22,3 +23,5 @@ tribes:new_immovable_type {
       },
    }
 }
+
+pop_textdomain()
diff --git a/data/tribes/immovables/grapevine/tiny/init.lua b/data/tribes/immovables/grapevine/tiny/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname(__file__)
 
 tribes:new_immovable_type {
-   msgctxt = "immovable",
    name = "grapevine_tiny",
    -- TRANSLATORS: This is an immovable name used in lists of immovables
    descname = pgettext("immovable", "Grapevine (tiny)"),
@@ -22,3 +23,5 @@ tribes:new_immovable_type {
       },
    }
 }
+
+pop_textdomain()
diff --git a/data/tribes/immovables/pond/burning/init.lua b/data/tribes/immovables/pond/burning/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname (__file__)
 
 tribes:new_immovable_type {
-   msgctxt = "immovable",
    name = "pond_burning",
    -- TRANSLATORS: This is an immovable name used in lists of immovables
    descname = pgettext ("immovable", "Burning Charcoal Stack"),
@@ -26,3 +27,5 @@ tribes:new_immovable_type {
       }
    }
 }
+
+pop_textdomain()
diff --git a/data/tribes/immovables/pond/coal/init.lua b/data/tribes/immovables/pond/coal/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname (__file__)
 
 tribes:new_immovable_type {
-   msgctxt = "immovable",
    name = "pond_coal",
    -- TRANSLATORS: This is an immovable name used in lists of immovables
    descname = pgettext ("immovable", "Pond With Charcoal"),
@@ -25,3 +26,5 @@ tribes:new_immovable_type {
       }
    }
 }
+
+pop_textdomain()
diff --git a/data/tribes/immovables/pond/dry/init.lua b/data/tribes/immovables/pond/dry/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname (__file__)
 
 tribes:new_immovable_type {
-   msgctxt = "immovable",
    name = "pond_dry",
    -- TRANSLATORS: This is an immovable name used in lists of immovables
    descname = pgettext ("immovable", "Dry Pond"),
@@ -28,3 +29,5 @@ tribes:new_immovable_type {
       }
    }
 }
+
+pop_textdomain()
diff --git a/data/tribes/immovables/pond/growing/init.lua b/data/tribes/immovables/pond/growing/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname (__file__)
 
 tribes:new_immovable_type {
-   msgctxt = "immovable",
    name = "pond_growing",
    -- TRANSLATORS: This is an immovable name used in lists of immovables
    descname = pgettext ("immovable", "Pond With Fish Spawn"),
@@ -22,3 +23,5 @@ tribes:new_immovable_type {
       }
    }
 }
+
+pop_textdomain()
diff --git a/data/tribes/immovables/pond/mature/init.lua b/data/tribes/immovables/pond/mature/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname (__file__)
 
 tribes:new_immovable_type {
-   msgctxt = "immovable",
    name = "pond_mature",
    -- TRANSLATORS: This is an immovable name used in lists of immovables
    descname = pgettext ("immovable", "Pond With Fish"),
@@ -25,3 +26,5 @@ tribes:new_immovable_type {
       }
    }
 }
+
+pop_textdomain()
diff --git a/data/tribes/immovables/reedfield/medium/init.lua b/data/tribes/immovables/reedfield/medium/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname(__file__)
 
 tribes:new_immovable_type {
-   msgctxt = "immovable",
    name = "reedfield_medium",
    -- TRANSLATORS: This is an immovable name used in lists of immovables
    descname = pgettext("immovable", "Reed Field (medium)"),
@@ -22,3 +23,5 @@ tribes:new_immovable_type {
       },
    }
 }
+
+pop_textdomain()
diff --git a/data/tribes/immovables/reedfield/ripe/init.lua b/data/tribes/immovables/reedfield/ripe/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname(__file__)
 
 tribes:new_immovable_type {
-   msgctxt = "immovable",
    name = "reedfield_ripe",
    -- TRANSLATORS: This is an immovable name used in lists of immovables
    descname = pgettext("immovable", "Reed Field (ripe)"),
@@ -25,3 +26,5 @@ tribes:new_immovable_type {
       },
    }
 }
+
+pop_textdomain()
diff --git a/data/tribes/immovables/reedfield/small/init.lua b/data/tribes/immovables/reedfield/small/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname(__file__)
 
 tribes:new_immovable_type {
-   msgctxt = "immovable",
    name = "reedfield_small",
    -- TRANSLATORS: This is an immovable name used in lists of immovables
    descname = pgettext("immovable", "Reed Field (small)"),
@@ -22,3 +23,5 @@ tribes:new_immovable_type {
       },
    }
 }
+
+pop_textdomain()
diff --git a/data/tribes/immovables/reedfield/tiny/init.lua b/data/tribes/immovables/reedfield/tiny/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname(__file__)
 
 tribes:new_immovable_type {
-   msgctxt = "immovable",
    name = "reedfield_tiny",
    -- TRANSLATORS: This is an immovable name used in lists of immovables
    descname = pgettext("immovable", "Reed Field (tiny)"),
@@ -22,3 +23,5 @@ tribes:new_immovable_type {
       },
    }
 }
+
+pop_textdomain()
diff --git a/data/tribes/immovables/resi/atlanteans/init.lua b/data/tribes/immovables/resi/atlanteans/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname(__file__)
 
 tribes:new_immovable_type {
-   msgctxt = "resource_indicator",
    name = "atlanteans_resi_none",
    -- TRANSLATORS: This is a resource name used in lists of resources
    descname = pgettext("resource_indicator", "No Resources"),
@@ -26,7 +27,6 @@ tribes:new_immovable_type {
 }
 
 tribes:new_immovable_type {
-   msgctxt = "resource_indicator",
    name = "atlanteans_resi_water",
    -- TRANSLATORS: This is a resource name used in lists of resources
    descname = pgettext("resource_indicator", "Water"),
@@ -51,7 +51,6 @@ tribes:new_immovable_type {
 }
 
 tribes:new_immovable_type {
-   msgctxt = "resource_indicator",
    name = "atlanteans_resi_coal_1",
    -- TRANSLATORS: This is a resource name used in lists of resources
    descname = pgettext("resource_indicator", "Some Coal"),
@@ -76,7 +75,6 @@ tribes:new_immovable_type {
 }
 
 tribes:new_immovable_type {
-   msgctxt = "resource_indicator",
    name = "atlanteans_resi_gold_1",
    -- TRANSLATORS: This is a resource name used in lists of resources
    descname = pgettext("resource_indicator", "Some Gold"),
@@ -101,7 +99,6 @@ tribes:new_immovable_type {
 }
 
 tribes:new_immovable_type {
-   msgctxt = "resource_indicator",
    name = "atlanteans_resi_iron_1",
    -- TRANSLATORS: This is a resource name used in lists of resources
    descname = pgettext("resource_indicator", "Some Iron"),
@@ -126,7 +123,6 @@ tribes:new_immovable_type {
 }
 
 tribes:new_immovable_type {
-   msgctxt = "resource_indicator",
    name = "atlanteans_resi_stones_1",
    -- TRANSLATORS: This is a resource name used in lists of resources
    descname = pgettext("resource_indicator", "Some Crystals"),
@@ -151,7 +147,6 @@ tribes:new_immovable_type {
 }
 
 tribes:new_immovable_type {
-   msgctxt = "resource_indicator",
    name = "atlanteans_resi_coal_2",
    -- TRANSLATORS: This is a resource name used in lists of resources
    descname = pgettext("resource_indicator", "A Lot of Coal"),
@@ -176,7 +171,6 @@ tribes:new_immovable_type {
 }
 
 tribes:new_immovable_type {
-   msgctxt = "resource_indicator",
    name = "atlanteans_resi_gold_2",
    -- TRANSLATORS: This is a resource name used in lists of resources
    descname = pgettext("resource_indicator", "A Lot of Gold"),
@@ -201,7 +195,6 @@ tribes:new_immovable_type {
 }
 
 tribes:new_immovable_type {
-   msgctxt = "resource_indicator",
    name = "atlanteans_resi_iron_2",
    -- TRANSLATORS: This is a resource name used in lists of resources
    descname = pgettext("resource_indicator", "A Lot of Iron"),
@@ -226,7 +219,6 @@ tribes:new_immovable_type {
 }
 
 tribes:new_immovable_type {
-   msgctxt = "resource_indicator",
    name = "atlanteans_resi_stones_2",
    -- TRANSLATORS: This is a resource name used in lists of resources
    descname = pgettext("resource_indicator", "A Lot of Crystals"),
@@ -249,3 +241,5 @@ tribes:new_immovable_type {
       }
    }
 }
+
+pop_textdomain()
diff --git a/data/tribes/immovables/resi/barbarians/init.lua b/data/tribes/immovables/resi/barbarians/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname(__file__)
 
 tribes:new_immovable_type {
-   msgctxt = "resource_indicator",
    name = "barbarians_resi_none",
    -- TRANSLATORS: This is a resource name used in lists of resources
    descname = pgettext("resource_indicator", "No Resources"),
@@ -23,7 +24,6 @@ tribes:new_immovable_type {
 }
 
 tribes:new_immovable_type {
-   msgctxt = "resource_indicator",
    name = "barbarians_resi_water",
    -- TRANSLATORS: This is a resource name used in lists of resources
    descname = pgettext("resource_indicator", "Water"),
@@ -45,7 +45,6 @@ tribes:new_immovable_type {
 }
 
 tribes:new_immovable_type {
-   msgctxt = "resource_indicator",
    name = "barbarians_resi_coal_1",
    -- TRANSLATORS: This is a resource name used in lists of resources
    descname = pgettext("resource_indicator", "Some Coal"),
@@ -67,7 +66,6 @@ tribes:new_immovable_type {
 }
 
 tribes:new_immovable_type {
-   msgctxt = "resource_indicator",
    name = "barbarians_resi_gold_1",
    -- TRANSLATORS: This is a resource name used in lists of resources
    descname = pgettext("resource_indicator", "Some Gold"),
@@ -89,7 +87,6 @@ tribes:new_immovable_type {
 }
 
 tribes:new_immovable_type {
-   msgctxt = "resource_indicator",
    name = "barbarians_resi_iron_1",
    -- TRANSLATORS: This is a resource name used in lists of resources
    descname = pgettext("resource_indicator", "Some Iron"),
@@ -111,7 +108,6 @@ tribes:new_immovable_type {
 }
 
 tribes:new_immovable_type {
-   msgctxt = "resource_indicator",
    name = "barbarians_resi_stones_1",
    -- TRANSLATORS: This is a resource name used in lists of resources
    descname = pgettext("resource_indicator", "Some Granite"),
@@ -133,7 +129,6 @@ tribes:new_immovable_type {
 }
 
 tribes:new_immovable_type {
-   msgctxt = "resource_indicator",
    name = "barbarians_resi_coal_2",
    -- TRANSLATORS: This is a resource name used in lists of resources
    descname = pgettext("resource_indicator", "A Lot of Coal"),
@@ -155,7 +150,6 @@ tribes:new_immovable_type {
 }
 
 tribes:new_immovable_type {
-   msgctxt = "resource_indicator",
    name = "barbarians_resi_gold_2",
    -- TRANSLATORS: This is a resource name used in lists of resources
    descname = pgettext("resource_indicator", "A Lot of Gold"),
@@ -177,7 +171,6 @@ tribes:new_immovable_type {
 }
 
 tribes:new_immovable_type {
-   msgctxt = "resource_indicator",
    name = "barbarians_resi_iron_2",
    -- TRANSLATORS: This is a resource name used in lists of resources
    descname = pgettext("resource_indicator", "A Lot of Iron"),
@@ -199,7 +192,6 @@ tribes:new_immovable_type {
 }
 
 tribes:new_immovable_type {
-   msgctxt = "resource_indicator",
    name = "barbarians_resi_stones_2",
    -- TRANSLATORS: This is a resource name used in lists of resources
    descname = pgettext("resource_indicator", "A Lot of Granite"),
@@ -219,3 +211,5 @@ tribes:new_immovable_type {
       }
    }
 }
+
+pop_textdomain()
diff --git a/data/tribes/immovables/resi/empire/init.lua b/data/tribes/immovables/resi/empire/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname(__file__)
 
 tribes:new_immovable_type {
-   msgctxt = "resource_indicator",
    name = "empire_resi_none",
    -- TRANSLATORS: This is a resource name used in lists of resources
    descname = pgettext("resource_indicator", "No Resources"),
@@ -23,7 +24,6 @@ tribes:new_immovable_type {
 }
 
 tribes:new_immovable_type {
-   msgctxt = "resource_indicator",
    name = "empire_resi_water",
    -- TRANSLATORS: This is a resource name used in lists of resources
    descname = pgettext("resource_indicator", "Water"),
@@ -45,7 +45,6 @@ tribes:new_immovable_type {
 }
 
 tribes:new_immovable_type {
-   msgctxt = "resource_indicator",
    name = "empire_resi_coal_1",
    -- TRANSLATORS: This is a resource name used in lists of resources
    descname = pgettext("resource_indicator", "Some Coal"),
@@ -67,7 +66,6 @@ tribes:new_immovable_type {
 }
 
 tribes:new_immovable_type {
-   msgctxt = "resource_indicator",
    name = "empire_resi_gold_1",
    -- TRANSLATORS: This is a resource name used in lists of resources
    descname = pgettext("resource_indicator", "Some Gold"),
@@ -89,7 +87,6 @@ tribes:new_immovable_type {
 }
 
 tribes:new_immovable_type {
-   msgctxt = "resource_indicator",
    name = "empire_resi_iron_1",
    -- TRANSLATORS: This is a resource name used in lists of resources
    descname = pgettext("resource_indicator", "Some Iron"),
@@ -111,7 +108,6 @@ tribes:new_immovable_type {
 }
 
 tribes:new_immovable_type {
-   msgctxt = "resource_indicator",
    name = "empire_resi_stones_1",
    -- TRANSLATORS: This is a resource name used in lists of resources
    descname = pgettext("resource_indicator", "Some Marble"),
@@ -133,7 +129,6 @@ tribes:new_immovable_type {
 }
 
 tribes:new_immovable_type {
-   msgctxt = "resource_indicator",
    name = "empire_resi_coal_2",
    -- TRANSLATORS: This is a resource name used in lists of resources
    descname = pgettext("resource_indicator", "A Lot of Coal"),
@@ -155,7 +150,6 @@ tribes:new_immovable_type {
 }
 
 tribes:new_immovable_type {
-   msgctxt = "resource_indicator",
    name = "empire_resi_gold_2",
    -- TRANSLATORS: This is a resource name used in lists of resources
    descname = pgettext("resource_indicator", "A Lot of Gold"),
@@ -177,7 +171,6 @@ tribes:new_immovable_type {
 }
 
 tribes:new_immovable_type {
-   msgctxt = "resource_indicator",
    name = "empire_resi_iron_2",
    -- TRANSLATORS: This is a resource name used in lists of resources
    descname = pgettext("resource_indicator", "A Lot of Iron"),
@@ -199,7 +192,6 @@ tribes:new_immovable_type {
 }
 
 tribes:new_immovable_type {
-   msgctxt = "resource_indicator",
    name = "empire_resi_stones_2",
    -- TRANSLATORS: This is a resource name used in lists of resources
    descname = pgettext("resource_indicator", "A Lot of Marble"),
@@ -219,3 +211,5 @@ tribes:new_immovable_type {
       }
    }
 }
+
+pop_textdomain()
diff --git a/data/tribes/immovables/resi/frisians/init.lua b/data/tribes/immovables/resi/frisians/init.lua
@@ -1,7 +1,8 @@
+push_textdomain("tribes")
+
 dirname = path.dirname(__file__)
 
 tribes:new_immovable_type {
-   msgctxt = "resource_indicator",
    name = "frisians_resi_none",
    -- TRANSLATORS: This is a resource name used in lists of resources
    descname = pgettext("resource_indicator", "No Resources"),
@@ -26,7 +27,6 @@ tribes:new_immovable_type {
 }
 
 tribes:new_immovable_type {
-   msgctxt = "resource_indicator",
    name = "frisians_resi_water",
    -- TRANSLATORS: This is a resource name used in lists of resources
    descname = pgettext("resource_indicator", "Water"),
@@ -51,7 +51,6 @@ tribes:new_immovable_type {
 }
 
 tribes:new_immovable_type {
-   msgctxt = "resource_indicator",
    name = "frisians_resi_coal_1",
    -- TRANSLATORS: This is a resource name used in lists of resources
    descname = pgettext("resource_indicator", "Some Coal"),
@@ -76,7 +75,6 @@ tribes:new_immovable_type {
 }
 
 tribes:new_immovable_type {
-   msgctxt = "resource_indicator",
    name = "frisians_resi_gold_1",
    -- TRANSLATORS: This is a resource name used in lists of resources
    descname = pgettext("resource_indicator", "Some Gold"),
@@ -101,7 +99,6 @@ tribes:new_immovable_type {
 }
 
 tribes:new_immovable_type {
-   msgctxt = "resource_indicator",
    name = "frisians_resi_iron_1",
    -- TRANSLATORS: This is a resource name used in lists of resources
    descname = pgettext("resource_indicator", "Some Iron"),
@@ -126,7 +123,6 @@ tribes:new_immovable_type {
 }
 
 tribes:new_immovable_type {
-   msgctxt = "resource_indicator",
    name = "frisians_resi_stones_1",
    -- TRANSLATORS: This is a resource name used in lists of resources
    descname = pgettext("resource_indicator", "Some Granite"),
@@ -151,7 +147,6 @@ tribes:new_immovable_type {
 }
 
 tribes:new_immovable_type {
-   msgctxt = "resource_indicator",
    name = "frisians_resi_coal_2",
    -- TRANSLATORS: This is a resource name used in lists of resources
    descname = pgettext("resource_indicator", "A Lot of Coal"),
@@ -176,7 +171,6 @@ tribes:new_immovable_type {
 }
 
 tribes:new_immovable_type {
-   msgctxt = "resource_indicator",
    name = "frisians_resi_gold_2",
    -- TRANSLATORS: This is a resource name used in lists of resources
    descname = pgettext("resource_indicator", "A Lot of Gold"),
@@ -201,7 +195,6 @@ tribes:new_immovable_type {
 }
 
 tribes:new_immovable_type {
-   msgctxt = "resource_indicator",
    name = "frisians_resi_iron_2",
    -- TRANSLATORS: This is a resource name used in lists of resources
    descname = pgettext("resource_indicator", "A Lot of Iron"),
@@ -226,7 +219,6 @@ tribes:new_immovable_type {
 }
 
 tribes:new_immovable_type {
-   msgctxt = "resource_indicator",
    name = "frisians_resi_stones_2",
    -- TRANSLATORS: This is a resource name used in lists of resources
    descname = pgettext("resource_indicator", "A Lot of Granite"),
@@ -249,3 +241,5 @@ tribes:new_immovable_type {
       }
    }
 }
+
+pop_textdomain()