Merge lp:~widelands-dev/widelands/localization-post-build20 into lp:widelands

[GunChleoc]

Backlog of localization updates
- Add localized versions to the basic SDL error messages. We will show
  the unlocalized version along with it due to lack of font support for
  some languages.
- String improvements for fri01 and fri02
- Improved headings for worker help

[hessenfarmer (stephan-lutz)]

I think we should link the open bugs for these changes to the branch. There are other open bugs regarding the e.g the frisians which could be fixed as well. I will link all relevant bugs. If they should be fixed seperatly feel free to remove them again.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 4937. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/531119384.
Appveyor build 4718. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_localization_post_build20-4718.

[GunChleoc (gunchleoc)]

Thanks for collecting them - let's fix them all in this branch.

[hessenfarmer (stephan-lutz)]

Just saw that there are 2 issues on transifex for the first frisian scenario which would fit in here as well.

[GunChleoc (gunchleoc)]

Done. I have also changed the descnames for the resource indicators.

Resource indicators, fields, rocks and trees now have tooltips. Do we want them for all of these?

[hessenfarmer (stephan-lutz)]

Code looks good so far. one nit in a diff. will download compile and test now.

[hessenfarmer (stephan-lutz)]

Sorry found another bug which fits in here. Can be solved in seperate branch though.

[hessenfarmer (stephan-lutz)]

have tested this - at least for the encyclopedia part. Texts look good.
Although while watching at them I noticed that some words seem to be out of line (menaing they seem to be slighly above or below the other words. that looks weird but is unrelated to this branch as it is the same in b20.

so from my side this can go in

review: Approve (test and review)

[GunChleoc (gunchleoc)]

Yes, that's https://bugs.launchpad.net/widelands/+bug/1827544

Thanks for the review :)

@bunnybot merge

=== modified file 'data/campaigns/fri01.wmf/scripting/texts.lua'
--- data/campaigns/fri01.wmf/scripting/texts.lua	2018-09-29 08:43:57 +0000
+++ data/campaigns/fri01.wmf/scripting/texts.lua	2019-05-13 05:46:56 +0000
@@ -129,8 +129,8 @@
       -- TRANSLATORS: Reebaud – Introduction 1
       _([[Welcome to the beautiful isle of Langeness! I am Reebaud, the chieftain of this pristine island.]])
       .. paragraphdivider() ..
-      -- TRANSLATORS: Reebaud – Introduction 1
-      _([[My tribe and I have just arrived from the mainland. There were fights with the Danes in the North, the Vikings in the East… So, I decided to lead my tribe away to start a quiet, peaceful life on this untouched island.]])),
+      -- TRANSLATORS: Reebaud – Introduction 1. Schauenburg and Holstein are dukedoms
+      _([[My tribe and I have just arrived from the mainland. There were fights with the Danes in the North, the Schauenburgers and Holsteiners in the East and South… So I decided to lead my tribe away to start a quiet, peaceful life on this untouched island.]])),
 }
 intro_2 = {
    title =_ "Introduction",
@@ -139,13 +139,13 @@
       _([[This is as good a place as any to start building our new home. First of all, we must ensure a stable supply of basic building materials.]])
       .. paragraphdivider() ..
       -- TRANSLATORS: Reebaud – Introduction 2
-      _([[I have asked Hauke, one of my advisors to oversee the construction of our settlement.]])),
+      _([[I have asked Hauke, one of my advisors, to oversee the construction of our settlement.]])),
 }
 intro_3 = {
    title =_ "Introduction",
    body=hauke(_"The first buildings",
-      -- TRANSLATORS: Hauke – Introduction 3
-      _([[Greetings, Chieftain Reebaud! I will start with the colonization of the island straight away.]])
+      -- TRANSLATORS: Hauke – Introduction 3. "Peace" is the traditional frisian greeting
+      _([[Peace, Chieftain Reebaud! I will start with the colonization of the island straight away.]])
       .. paragraphdivider() ..
       -- TRANSLATORS: Hauke – Introduction 3
       _([[Like all Frisians, we build our houses mainly with bricks. We improve them by adding some logs and granite. The roofs are thatched with reed, naturally. Nothing is better suited to keep the rain out.]])
@@ -231,7 +231,7 @@
       _([[Well done. The miners are satisfied and have started working again.]])
       .. paragraphdivider() ..
       -- TRANSLATORS: Hauke – better food
-      _([[But when the mines will have to be expanded, rations won’t keep the miners happy. Better take precautions – build a second tavern, then consider enhancing one to a drinking hall.]])
+      _([[But when the mines will have to be enhanced, rations won’t keep the miners happy. Better take precautions – build a second tavern, then consider enhancing one to a drinking hall.]])
       .. paragraphdivider() ..
       -- TRANSLATORS: Hauke – better food
       _([[A drinking hall needs better food. Build a bakery, a brewery, and two or three farms to start growing barley. Keep in mind that barley grows very slowly; therefore, these few farms won’t suffice when we actually need the bread and beer. We should keep expanding quickly to have more space for farming.]])
@@ -409,7 +409,7 @@
    title =_ "Don’t Forget the Soldiers",
    body=reebaud(_"Soldiers to the port!",
       -- TRANSLATORS: Reebaud – rising water
-      _([[I almost forgot in this haste – whereever we will land, we’ll need soldiers to secure and expand our new colony. There’s space for up to 10 soldiers on our ship, if they don’t mind being all crammed up together. Let’s send some to the port when it’s completed, so they can embark when we set sail!]])),
+      _([[I almost forgot in this haste – whereever we will land, we’ll need soldiers to secure and expand our new colony. There’s space for up to ten soldiers on our ship, if they don’t mind being all crammed together. Let’s send some to the port when it’s completed, so they can embark when we set sail!]])),
 }
 
 victory_1 = {

=== modified file 'data/campaigns/fri02.wmf/scripting/texts.lua'
--- data/campaigns/fri02.wmf/scripting/texts.lua	2018-09-29 08:43:57 +0000
+++ data/campaigns/fri02.wmf/scripting/texts.lua	2019-05-13 05:46:56 +0000
@@ -243,7 +243,7 @@
    title =_ "Recruiting",
    body=reebaud(_"Our economy is complete",
       -- TRANSLATORS: Reebaud – Aqua Farms 4
-      _([[You are right – we should build more berry farms, collector’s houses and taverns as well as a drinking hall, and advanced bakeries and breweries.]])
+      _([[You are right – we should build more berry farms, fruit collector’s houses and taverns as well as a drinking hall, and advanced bakeries and breweries.]])
       .. paragraphdivider() ..
       -- TRANSLATORS: Reebaud – Aqua Farms 4
       _([[However, we can already start focusing on recruiting and training soldiers. We can now afford to use metal for weapons, helmets and garments. I propose building armor smithies, a barracks, a training arena and a tailor’s shop now.]])),
@@ -274,8 +274,8 @@
 supply_murilius_4 = {
    title =_ "We Are Not Alone",
    body=reebaud(_"Strangers",
-      -- TRANSLATORS: Reebaud – Supply Murilius 4
-      _([[Greetings, representative of the Empire! I am Reebaud, the chieftain of this tribe. All we want is to settle down here, build our home and live our lives in peace. We do not seek trouble, but we aren’t afraid to fight, either.]])),
+      -- TRANSLATORS: Reebaud – Supply Murilius 4. "Peace" is the traditional frisian greeting, nothing more.
+      _([[Peace, representative of the Empire! I am Reebaud, the chieftain of this tribe. All we want is to settle down here, build our home and live our lives in peace. We do not seek trouble, but we aren’t afraid to fight, either.]])),
 }
 supply_murilius_5 = {
    title =_ "We Are Not Alone",

=== modified file 'data/scripting/editor/terrain_help.lua'
--- data/scripting/editor/terrain_help.lua	2018-09-11 10:31:02 +0000
+++ data/scripting/editor/terrain_help.lua	2019-05-13 05:46:56 +0000
@@ -20,9 +20,14 @@
       if (#valid_resources > 0) then
          result = result .. h2(_"Resources")
          if (#valid_resources > 0) then
-            -- TRANSLATORS: A header in the editor help
-            result = result .. h3(ngettext(
-               "Valid Resource:", "Valid Resources:", #valid_resources))
+            if (#valid_resources == 1) then
+               -- TRANSLATORS: A header in the editor help if there is 1 valid resource
+               result = result .. h3(_"Valid Resource:")
+            else
+               -- TRANSLATORS: A header in the editor help if there is more than 1 valid resource
+               result = result .. h3(_"Valid Resources:")
+            end
+
             for count, resource in pairs(valid_resources) do
                result = result .. li_image(
                   resource.representative_image, resource.descname)

=== removed file 'data/scripting/format_scenario.lua'
--- data/scripting/format_scenario.lua	2018-02-12 10:09:42 +0000
+++ data/scripting/format_scenario.lua	1970-01-01 00:00:00 +0000
@@ -1,41 +0,0 @@
--- TODO(GunChleoc): This is for the legacy font renderer. Remove when we remove the old renderer and break savegame compatibility.
-
-
-function speech(img, clr, g_title, g_text)
-   local title, text = g_title, g_text
-   if not text then
-      title = nil
-      text = g_title
-   end
-
-   -- Surround the text with translatable ","
-   text = (_'“%s”'):format(text)
-
-   local s = ""
-   if title then
-      s = rt("<p font-size=20 font-weight=bold font-face=serif " ..
-         ("font-color=%s>"):format(clr) .. title ..
-         "</p><p font-size=8> <br></p>"
-      )
-   end
-
-   return s .. rt(("image=%s"):format(img), p(text))
-end
-
-
-function objective_text(heading, body)
-   return rt(h2(heading) .. p(body))
-end
-
-
-function new_objectives(...)
-   local sum = 0
-   local s = ""
-   for idx,obj in ipairs{...} do
-      s = s .. obj.body
-      sum = sum + obj.number
-   end
-   return rt("<p font-size=10> <br></p>" ..
-      "<p font=serif font-size=18 font-weight=bold font-color=D1D1D1>"
-      .. ngettext("New Objective", "New Objectives", sum) .. "</p>") .. s
-end

=== modified file 'data/scripting/richtext_scenarios.lua'
--- data/scripting/richtext_scenarios.lua	2018-02-24 09:01:10 +0000
+++ data/scripting/richtext_scenarios.lua	2019-05-13 05:46:56 +0000
@@ -87,5 +87,9 @@
       text = text .. obj.body
       sum = sum + obj.number
    end
-   return h1(ngettext("New Objective", "New Objectives", sum)) .. text
+      local objectives_header = _"New Objective"
+   if (sum > 1) then
+      objectives_header = _"New Objectives"
+   end
+   return h1(objectives_header) .. text
 end

=== modified file 'data/tribes/buildings/productionsites/frisians/mead_brewery/helptexts.lua'
--- data/tribes/buildings/productionsites/frisians/mead_brewery/helptexts.lua	2018-02-17 15:41:29 +0000
+++ data/tribes/buildings/productionsites/frisians/mead_brewery/helptexts.lua	2019-05-13 05:46:56 +0000
@@ -13,7 +13,7 @@
 
 function building_helptext_purpose()
    -- TRANSLATORS: Purpose helptext for a building
-   return pgettext("building", "Brews beer out of barley and water. It also brews mead, which is beer refined with honey. Mead is consumed by miners in deep mines and by experienced soldiers.")
+   return pgettext("building", "Brews beer out of barley and water. It also brews mead, which is beer refined with honey. Mead is consumed by experienced soldiers.")
 end
 
 function building_helptext_note()

=== modified file 'data/tribes/immovables/resi/atlanteans/init.lua'
--- data/tribes/immovables/resi/atlanteans/init.lua	2018-09-29 12:33:27 +0000
+++ data/tribes/immovables/resi/atlanteans/init.lua	2019-05-13 05:46:56 +0000
@@ -1,10 +1,10 @@
 dirname = path.dirname(__file__)
 
 tribes:new_immovable_type {
-   msgctxt = "immovable",
+   msgctxt = "resource_indicator",
    name = "atlanteans_resi_none",
    -- TRANSLATORS: This is a resource name used in lists of resources
-   descname = pgettext("immovable", "Resources: None"),
+   descname = pgettext("resource_indicator", "No Resources"),
    helptext_script = dirname .. "../helptexts/none.lua",
    icon = dirname .. "pics/none_0.png",
    attributes = { "resi" },
@@ -24,10 +24,10 @@
 }
 
 tribes:new_immovable_type {
-   msgctxt = "immovable",
+   msgctxt = "resource_indicator",
    name = "atlanteans_resi_water",
    -- TRANSLATORS: This is a resource name used in lists of resources
-   descname = pgettext("immovable", "Resources: Water Vein"),
+   descname = pgettext("resource_indicator", "Water"),
    helptext_script = dirname .. "../helptexts/water.lua",
    icon = dirname .. "pics/water_0.png",
    attributes = { "resi" },
@@ -48,10 +48,10 @@
 }
 
 tribes:new_immovable_type {
-   msgctxt = "immovable",
+   msgctxt = "resource_indicator",
    name = "atlanteans_resi_coal_1",
    -- TRANSLATORS: This is a resource name used in lists of resources
-   descname = pgettext("immovable", "Resources: Coal Vein"),
+   descname = pgettext("resource_indicator", "Some Coal"),
    helptext_script = dirname .. "../helptexts/coal_1.lua",
    icon = dirname .. "pics/coal_1_0.png",
    attributes = { "resi" },
@@ -72,10 +72,10 @@
 }
 
 tribes:new_immovable_type {
-   msgctxt = "immovable",
+   msgctxt = "resource_indicator",
    name = "atlanteans_resi_gold_1",
    -- TRANSLATORS: This is a resource name used in lists of resources
-   descname = pgettext("immovable", "Resources: Gold Vein"),
+   descname = pgettext("resource_indicator", "Some Gold"),
    helptext_script = dirname .. "../helptexts/gold_1.lua",
    icon = dirname .. "pics/gold_1_0.png",
    attributes = { "resi" },
@@ -96,10 +96,10 @@
 }
 
 tribes:new_immovable_type {
-   msgctxt = "immovable",
+   msgctxt = "resource_indicator",
    name = "atlanteans_resi_iron_1",
    -- TRANSLATORS: This is a resource name used in lists of resources
-   descname = pgettext("immovable", "Resources: Iron Vein"),
+   descname = pgettext("resource_indicator", "Some Iron"),
    helptext_script = dirname .. "../helptexts/iron_1.lua",
    icon = dirname .. "pics/iron_1_0.png",
    attributes = { "resi" },
@@ -120,10 +120,10 @@
 }
 
 tribes:new_immovable_type {
-   msgctxt = "immovable",
+   msgctxt = "resource_indicator",
    name = "atlanteans_resi_stones_1",
    -- TRANSLATORS: This is a resource name used in lists of resources
-   descname = pgettext("immovable", "Resources: Some Stones"),
+   descname = pgettext("resource_indicator", "Some Precious Stones"),
    helptext_script = dirname .. "../helptexts/stones_1.lua",
    icon = dirname .. "pics/stones_1_0.png",
    attributes = { "resi" },
@@ -144,10 +144,10 @@
 }
 
 tribes:new_immovable_type {
-   msgctxt = "immovable",
+   msgctxt = "resource_indicator",
    name = "atlanteans_resi_coal_2",
    -- TRANSLATORS: This is a resource name used in lists of resources
-   descname = pgettext("immovable", "Resources: Main Coal Vein"),
+   descname = pgettext("resource_indicator", "A Lot of Coal"),
    helptext_script = dirname .. "../helptexts/coal_2.lua",
    icon = dirname .. "pics/coal_2_0.png",
    attributes = { "resi" },
@@ -168,10 +168,10 @@
 }
 
 tribes:new_immovable_type {
-   msgctxt = "immovable",
+   msgctxt = "resource_indicator",
    name = "atlanteans_resi_gold_2",
    -- TRANSLATORS: This is a resource name used in lists of resources
-   descname = pgettext("immovable", "Resources: Main Gold Vein"),
+   descname = pgettext("resource_indicator", "A Lot of Gold"),
    helptext_script = dirname .. "../helptexts/gold_2.lua",
    icon = dirname .. "pics/gold_2_0.png",
    attributes = { "resi" },
@@ -192,10 +192,10 @@
 }
 
 tribes:new_immovable_type {
-   msgctxt = "immovable",
+   msgctxt = "resource_indicator",
    name = "atlanteans_resi_iron_2",
    -- TRANSLATORS: This is a resource name used in lists of resources
-   descname = pgettext("immovable", "Resources: Main Iron Vein"),
+   descname = pgettext("resource_indicator", "A Lot of Iron"),
    helptext_script = dirname .. "../helptexts/iron_2.lua",
    icon = dirname .. "pics/iron_2_0.png",
    attributes = { "resi" },
@@ -216,10 +216,10 @@
 }
 
 tribes:new_immovable_type {
-   msgctxt = "immovable",
+   msgctxt = "resource_indicator",
    name = "atlanteans_resi_stones_2",
    -- TRANSLATORS: This is a resource name used in lists of resources
-   descname = pgettext("immovable", "Resources: A Lot of Stones"),
+   descname = pgettext("resource_indicator", "A Lot of Precious Stones"),
    helptext_script = dirname .. "../helptexts/stones_2.lua",
    icon = dirname .. "pics/stones_2_0.png",
    attributes = { "resi" },

=== modified file 'data/tribes/immovables/resi/barbarians/init.lua'
--- data/tribes/immovables/resi/barbarians/init.lua	2018-09-29 12:33:27 +0000
+++ data/tribes/immovables/resi/barbarians/init.lua	2019-05-13 05:46:56 +0000
@@ -1,10 +1,10 @@
 dirname = path.dirname(__file__)
 
 tribes:new_immovable_type {
-   msgctxt = "immovable",
+   msgctxt = "resource_indicator",
    name = "barbarians_resi_none",
    -- TRANSLATORS: This is a resource name used in lists of resources
-   descname = pgettext("immovable", "Resources: None"),
+   descname = pgettext("resource_indicator", "No Resources"),
    helptext_script = dirname .. "../helptexts/none.lua",
    icon = dirname .. "pics/none.png",
    attributes = { "resi" },
@@ -24,10 +24,10 @@
 }
 
 tribes:new_immovable_type {
-   msgctxt = "immovable",
+   msgctxt = "resource_indicator",
    name = "barbarians_resi_water",
    -- TRANSLATORS: This is a resource name used in lists of resources
-   descname = pgettext("immovable", "Resources: Water Vein"),
+   descname = pgettext("resource_indicator", "Water"),
    helptext_script = dirname .. "../helptexts/water.lua",
    icon = dirname .. "pics/water.png",
    attributes = { "resi" },
@@ -47,10 +47,10 @@
 }
 
 tribes:new_immovable_type {
-   msgctxt = "immovable",
+   msgctxt = "resource_indicator",
    name = "barbarians_resi_coal_1",
    -- TRANSLATORS: This is a resource name used in lists of resources
-   descname = pgettext("immovable", "Resources: Coal Vein"),
+   descname = pgettext("resource_indicator", "Some Coal"),
    helptext_script = dirname .. "../helptexts/coal_1.lua",
    icon = dirname .. "pics/coal_1.png",
    attributes = { "resi" },
@@ -70,10 +70,10 @@
 }
 
 tribes:new_immovable_type {
-   msgctxt = "immovable",
+   msgctxt = "resource_indicator",
    name = "barbarians_resi_gold_1",
    -- TRANSLATORS: This is a resource name used in lists of resources
-   descname = pgettext("immovable", "Resources: Gold Vein"),
+   descname = pgettext("resource_indicator", "Some Gold"),
    helptext_script = dirname .. "../helptexts/gold_1.lua",
    icon = dirname .. "pics/gold_1.png",
    attributes = { "resi" },
@@ -93,10 +93,10 @@
 }
 
 tribes:new_immovable_type {
-   msgctxt = "immovable",
+   msgctxt = "resource_indicator",
    name = "barbarians_resi_iron_1",
    -- TRANSLATORS: This is a resource name used in lists of resources
-   descname = pgettext("immovable", "Resources: Iron Vein"),
+   descname = pgettext("resource_indicator", "Some Iron"),
    helptext_script = dirname .. "../helptexts/iron_1.lua",
    icon = dirname .. "pics/iron_1.png",
    attributes = { "resi" },
@@ -116,10 +116,10 @@
 }
 
 tribes:new_immovable_type {
-   msgctxt = "immovable",
+   msgctxt = "resource_indicator",
    name = "barbarians_resi_stones_1",
    -- TRANSLATORS: This is a resource name used in lists of resources
-   descname = pgettext("immovable", "Resources: Some Stones"),
+   descname = pgettext("resource_indicator", "Some Granite"),
    helptext_script = dirname .. "../helptexts/stones_1.lua",
    icon = dirname .. "pics/stones_1.png",
    attributes = { "resi" },
@@ -139,10 +139,10 @@
 }
 
 tribes:new_immovable_type {
-   msgctxt = "immovable",
+   msgctxt = "resource_indicator",
    name = "barbarians_resi_coal_2",
    -- TRANSLATORS: This is a resource name used in lists of resources
-   descname = pgettext("immovable", "Resources: Main Coal Vein"),
+   descname = pgettext("resource_indicator", "A Lot of Coal"),
    helptext_script = dirname .. "../helptexts/coal_2.lua",
    icon = dirname .. "pics/coal_2.png",
    attributes = { "resi" },
@@ -162,10 +162,10 @@
 }
 
 tribes:new_immovable_type {
-   msgctxt = "immovable",
+   msgctxt = "resource_indicator",
    name = "barbarians_resi_gold_2",
    -- TRANSLATORS: This is a resource name used in lists of resources
-   descname = pgettext("immovable", "Resources: Main Gold Vein"),
+   descname = pgettext("resource_indicator", "A Lot of Gold"),
    helptext_script = dirname .. "../helptexts/gold_2.lua",
    icon = dirname .. "pics/gold_2.png",
    attributes = { "resi" },
@@ -185,10 +185,10 @@
 }
 
 tribes:new_immovable_type {
-   msgctxt = "immovable",
+   msgctxt = "resource_indicator",
    name = "barbarians_resi_iron_2",
    -- TRANSLATORS: This is a resource name used in lists of resources
-   descname = pgettext("immovable", "Resources: Main Iron Vein"),
+   descname = pgettext("resource_indicator", "A Lot of Iron"),
    helptext_script = dirname .. "../helptexts/iron_2.lua",
    icon = dirname .. "pics/iron_2.png",
    attributes = { "resi" },
@@ -208,10 +208,10 @@
 }
 
 tribes:new_immovable_type {
-   msgctxt = "immovable",
+   msgctxt = "resource_indicator",
    name = "barbarians_resi_stones_2",
    -- TRANSLATORS: This is a resource name used in lists of resources
-   descname = pgettext("immovable", "Resources: A Lot of Stones"),
+   descname = pgettext("resource_indicator", "A Lot of Granite"),
    helptext_script = dirname .. "../helptexts/stones_2.lua",
    icon = dirname .. "pics/stones_2.png",
    attributes = { "resi" },

=== modified file 'data/tribes/immovables/resi/empire/init.lua'
--- data/tribes/immovables/resi/empire/init.lua	2018-09-29 12:33:27 +0000
+++ data/tribes/immovables/resi/empire/init.lua	2019-05-13 05:46:56 +0000
@@ -1,10 +1,10 @@
 dirname = path.dirname(__file__)
 
 tribes:new_immovable_type {
-   msgctxt = "immovable",
+   msgctxt = "resource_indicator",
    name = "empire_resi_none",
    -- TRANSLATORS: This is a resource name used in lists of resources
-   descname = pgettext("immovable", "Resources: None"),
+   descname = pgettext("resource_indicator", "No Resources"),
    helptext_script = dirname .. "../helptexts/none.lua",
    icon = dirname .. "pics/none.png",
    attributes = { "resi" },
@@ -24,10 +24,10 @@
 }
 
 tribes:new_immovable_type {
-   msgctxt = "immovable",
+   msgctxt = "resource_indicator",
    name = "empire_resi_water",
    -- TRANSLATORS: This is a resource name used in lists of resources
-   descname = pgettext("immovable", "Resources: Water Vein"),
+   descname = pgettext("resource_indicator", "Water"),
    helptext_script = dirname .. "../helptexts/water.lua",
    icon = dirname .. "pics/water.png",
    attributes = { "resi" },
@@ -47,10 +47,10 @@
 }
 
 tribes:new_immovable_type {
-   msgctxt = "immovable",
+   msgctxt = "resource_indicator",
    name = "empire_resi_coal_1",
    -- TRANSLATORS: This is a resource name used in lists of resources
-   descname = pgettext("immovable", "Resources: Coal Vein"),
+   descname = pgettext("resource_indicator", "Some Coal"),
    helptext_script = dirname .. "../helptexts/coal_1.lua",
    icon = dirname .. "pics/coal_1.png",
    attributes = { "resi" },
@@ -70,10 +70,10 @@
 }
 
 tribes:new_immovable_type {
-   msgctxt = "immovable",
+   msgctxt = "resource_indicator",
    name = "empire_resi_gold_1",
    -- TRANSLATORS: This is a resource name used in lists of resources
-   descname = pgettext("immovable", "Resources: Gold Vein"),
+   descname = pgettext("resource_indicator", "Some Gold"),
    helptext_script = dirname .. "../helptexts/gold_1.lua",
    icon = dirname .. "pics/gold_1.png",
    attributes = { "resi" },
@@ -93,10 +93,10 @@
 }
 
 tribes:new_immovable_type {
-   msgctxt = "immovable",
+   msgctxt = "resource_indicator",
    name = "empire_resi_iron_1",
    -- TRANSLATORS: This is a resource name used in lists of resources
-   descname = pgettext("immovable", "Resources: Iron Vein"),
+   descname = pgettext("resource_indicator", "Some Iron"),
    helptext_script = dirname .. "../helptexts/iron_1.lua",
    icon = dirname .. "pics/iron_1.png",
    attributes = { "resi" },
@@ -116,10 +116,10 @@
 }
 
 tribes:new_immovable_type {
-   msgctxt = "immovable",
+   msgctxt = "resource_indicator",
    name = "empire_resi_stones_1",
    -- TRANSLATORS: This is a resource name used in lists of resources
-   descname = pgettext("immovable", "Resources: Some Stones"),
+   descname = pgettext("resource_indicator", "Some Marble"),
    helptext_script = dirname .. "../helptexts/stones_1.lua",
    icon = dirname .. "pics/stones_1.png",
    attributes = { "resi" },
@@ -139,10 +139,10 @@
 }
 
 tribes:new_immovable_type {
-   msgctxt = "immovable",
+   msgctxt = "resource_indicator",
    name = "empire_resi_coal_2",
    -- TRANSLATORS: This is a resource name used in lists of resources
-   descname = pgettext("immovable", "Resources: Main Coal Vein"),
+   descname = pgettext("resource_indicator", "A Lot of Coal"),
    helptext_script = dirname .. "../helptexts/coal_2.lua",
    icon = dirname .. "pics/coal_2.png",
    attributes = { "resi" },
@@ -162,10 +162,10 @@
 }
 
 tribes:new_immovable_type {
-   msgctxt = "immovable",
+   msgctxt = "resource_indicator",
    name = "empire_resi_gold_2",
    -- TRANSLATORS: This is a resource name used in lists of resources
-   descname = pgettext("immovable", "Resources: Main Gold Vein"),
+   descname = pgettext("resource_indicator", "A Lot of Gold"),
    helptext_script = dirname .. "../helptexts/gold_2.lua",
    icon = dirname .. "pics/gold_2.png",
    attributes = { "resi" },
@@ -185,10 +185,10 @@
 }
 
 tribes:new_immovable_type {
-   msgctxt = "immovable",
+   msgctxt = "resource_indicator",
    name = "empire_resi_iron_2",
    -- TRANSLATORS: This is a resource name used in lists of resources
-   descname = pgettext("immovable", "Resources: Main Iron Vein"),
+   descname = pgettext("resource_indicator", "A Lot of Iron"),
    helptext_script = dirname .. "../helptexts/iron_2.lua",
    icon = dirname .. "pics/iron_2.png",
    attributes = { "resi" },
@@ -208,10 +208,10 @@
 }
 
 tribes:new_immovable_type {
-   msgctxt = "immovable",
+   msgctxt = "resource_indicator",
    name = "empire_resi_stones_2",
    -- TRANSLATORS: This is a resource name used in lists of resources
-   descname = pgettext("immovable", "Resources: A Lot of Stones"),
+   descname = pgettext("resource_indicator", "A Lot of Marble"),
    helptext_script = dirname .. "../helptexts/stones_2.lua",
    icon = dirname .. "pics/stones_2.png",
    attributes = { "resi" },

=== modified file 'data/tribes/immovables/resi/frisians/init.lua'
--- data/tribes/immovables/resi/frisians/init.lua	2018-09-29 12:33:27 +0000
+++ data/tribes/immovables/resi/frisians/init.lua	2019-05-13 05:46:56 +0000
@@ -1,10 +1,10 @@
 dirname = path.dirname(__file__)
 
 tribes:new_immovable_type {
-   msgctxt = "immovable",
+   msgctxt = "resource_indicator",
    name = "frisians_resi_none",
    -- TRANSLATORS: This is a resource name used in lists of resources
-   descname = pgettext("immovable", "Resources: None"),
+   descname = pgettext("resource_indicator", "No Resources"),
    helptext_script = dirname .. "../helptexts/none.lua",
    icon = dirname .. "pics/none_0.png",
    attributes = { "resi" },
@@ -24,10 +24,10 @@
 }
 
 tribes:new_immovable_type {
-   msgctxt = "immovable",
+   msgctxt = "resource_indicator",
    name = "frisians_resi_water",
    -- TRANSLATORS: This is a resource name used in lists of resources
-   descname = pgettext("immovable", "Resources: Water Vein"),
+   descname = pgettext("resource_indicator", "Water"),
    helptext_script = dirname .. "../helptexts/water.lua",
    icon = dirname .. "pics/water_0.png",
    attributes = { "resi" },
@@ -48,10 +48,10 @@
 }
 
 tribes:new_immovable_type {
-   msgctxt = "immovable",
+   msgctxt = "resource_indicator",
    name = "frisians_resi_coal_1",
    -- TRANSLATORS: This is a resource name used in lists of resources
-   descname = pgettext("immovable", "Resources: Coal Vein"),
+   descname = pgettext("resource_indicator", "Some Coal"),
    helptext_script = dirname .. "../helptexts/coal_1.lua",
    icon = dirname .. "pics/coal_1_0.png",
    attributes = { "resi" },
@@ -72,10 +72,10 @@
 }
 
 tribes:new_immovable_type {
-   msgctxt = "immovable",
+   msgctxt = "resource_indicator",
    name = "frisians_resi_gold_1",
    -- TRANSLATORS: This is a resource name used in lists of resources
-   descname = pgettext("immovable", "Resources: Gold Vein"),
+   descname = pgettext("resource_indicator", "Some Gold"),
    helptext_script = dirname .. "../helptexts/gold_1.lua",
    icon = dirname .. "pics/gold_1_0.png",
    attributes = { "resi" },
@@ -96,10 +96,10 @@
 }
 
 tribes:new_immovable_type {
-   msgctxt = "immovable",
+   msgctxt = "resource_indicator",
    name = "frisians_resi_iron_1",
    -- TRANSLATORS: This is a resource name used in lists of resources
-   descname = pgettext("immovable", "Resources: Iron Vein"),
+   descname = pgettext("resource_indicator", "Some Iron"),
    helptext_script = dirname .. "../helptexts/iron_1.lua",
    icon = dirname .. "pics/iron_1_0.png",
    attributes = { "resi" },
@@ -120,10 +120,10 @@
 }
 
 tribes:new_immovable_type {
-   msgctxt = "immovable",
+   msgctxt = "resource_indicator",
    name = "frisians_resi_stones_1",
    -- TRANSLATORS: This is a resource name used in lists of resources
-   descname = pgettext("immovable", "Resources: Some Stones"),
+   descname = pgettext("resource_indicator", "Some Granite"),
    helptext_script = dirname .. "../helptexts/stones_1.lua",
    icon = dirname .. "pics/stones_1_0.png",
    attributes = { "resi" },
@@ -144,10 +144,10 @@
 }
 
 tribes:new_immovable_type {
-   msgctxt = "immovable",
+   msgctxt = "resource_indicator",
    name = "frisians_resi_coal_2",
    -- TRANSLATORS: This is a resource name used in lists of resources
-   descname = pgettext("immovable", "Resources: Main Coal Vein"),
+   descname = pgettext("resource_indicator", "A Lot of Coal"),
    helptext_script = dirname .. "../helptexts/coal_2.lua",
    icon = dirname .. "pics/coal_2_0.png",
    attributes = { "resi" },
@@ -168,10 +168,10 @@
 }
 
 tribes:new_immovable_type {
-   msgctxt = "immovable",
+   msgctxt = "resource_indicator",
    name = "frisians_resi_gold_2",
    -- TRANSLATORS: This is a resource name used in lists of resources
-   descname = pgettext("immovable", "Resources: Main Gold Vein"),
+   descname = pgettext("resource_indicator", "A Lot of Gold"),
    helptext_script = dirname .. "../helptexts/gold_2.lua",
    icon = dirname .. "pics/gold_2_0.png",
    attributes = { "resi" },
@@ -192,10 +192,10 @@
 }
 
 tribes:new_immovable_type {
-   msgctxt = "immovable",
+   msgctxt = "resource_indicator",
    name = "frisians_resi_iron_2",
    -- TRANSLATORS: This is a resource name used in lists of resources
-   descname = pgettext("immovable", "Resources: Main Iron Vein"),
+   descname = pgettext("resource_indicator", "A Lot of Iron"),
    helptext_script = dirname .. "../helptexts/iron_2.lua",
    icon = dirname .. "pics/iron_2_0.png",
    attributes = { "resi" },
@@ -216,10 +216,10 @@
 }
 
 tribes:new_immovable_type {
-   msgctxt = "immovable",
+   msgctxt = "resource_indicator",
    name = "frisians_resi_stones_2",
    -- TRANSLATORS: This is a resource name used in lists of resources
-   descname = pgettext("immovable", "Resources: A Lot of Stones"),
+   descname = pgettext("resource_indicator", "A Lot of Granite"),
    helptext_script = dirname .. "../helptexts/stones_2.lua",
    icon = dirname .. "pics/stones_2_0.png",
    attributes = { "resi" },

=== modified file 'data/tribes/scripting/help/building_help.lua'
--- data/tribes/scripting/help/building_help.lua	2019-04-14 13:43:55 +0000
+++ data/tribes/scripting/help/building_help.lua	2019-05-13 05:46:56 +0000
@@ -660,8 +660,14 @@
       if (number_of_workers > 0) then
          local tool_string = help_tool_string(tribe, toolnames, number_of_workers)
          if (tool_string ~= "") then
-            -- TRANSLATORS: Tribal Encyclopedia: Heading for which tool workers use
-            result = result .. h3(ngettext("Worker uses:","Workers use:", number_of_workers)) .. tool_string
+            if (number_of_workers == 1) then
+               -- TRANSLATORS: Tribal Encyclopedia: Heading for which tool 1 worker uses
+               result = result .. h3(_"Worker uses:")
+            else
+               -- TRANSLATORS: Tribal Encyclopedia: Heading for which tool more than 1 worker uses
+               result = result .. h3(_"Workers use:")
+            end
+            result = result .. tool_string
          end
       end
 

=== modified file 'data/tribes/scripting/help/ware_help.lua'
--- data/tribes/scripting/help/ware_help.lua	2019-04-07 05:46:13 +0000
+++ data/tribes/scripting/help/ware_help.lua	2019-05-13 05:46:56 +0000
@@ -102,10 +102,14 @@
             for j, program_name in ipairs(producing_programs) do
                result = result .. help_consumed_wares_workers(tribe, building, program_name)
                if (produced_wares_counters[program_name] > 0) then
-                  result = result
-                     -- TRANSLATORS: Ware Encyclopedia: Wares produced by a productionsite
-                     .. h3(ngettext("Ware produced:", "Wares produced:", produced_wares_counters[program_name]))
-                     .. produced_wares_strings[program_name]
+                  if (produced_wares_counters[program_name] == 1) then
+                     -- TRANSLATORS: Ware Encyclopedia: 1 ware produced by a productionsite
+                     result = result .. h3(_"Ware produced:")
+                  else
+                     -- TRANSLATORS: Ware Encyclopedia: More than 1 ware produced by a productionsite
+                     result = result .. h3(_"Wares produced:")
+                  end
+                  result = result .. produced_wares_strings[program_name]
                end
             end
          end
@@ -163,8 +167,13 @@
 
    -- Now show consumers (buildings + workers)
    if (consumers_amount > 0) then
-      -- TRANSLATORS: Ware Encyclopedia: A list of buildings and / or workers that consume a ware
-      result = result .. h2(ngettext("Consumer", "Consumers", consumers_amount))
+      if (consumers_amount == 1) then
+         -- TRANSLATORS: Ware Encyclopedia: Heading for 1 building and / or worker that consumes a ware
+         result = result .. h2(_"Consumer")
+      else
+         -- TRANSLATORS: Ware Encyclopedia: A list of buildings and / or workers that consume a ware
+         result = result .. h2(_"Consumers")
+      end
       if (consumers ~= "") then
          result = result .. consumers_string
       end

=== modified file 'data/tribes/scripting/help/worker_help.lua'
--- data/tribes/scripting/help/worker_help.lua	2018-09-29 05:10:39 +0000
+++ data/tribes/scripting/help/worker_help.lua	2019-05-13 05:46:56 +0000
@@ -74,10 +74,14 @@
             for j, program_name in ipairs(producing_programs) do
                result = result .. help_consumed_wares_workers(tribe, building, program_name)
                if (recruited_workers_counters[program_name] > 0) then
-                  result = result
-                     -- TRANSLATORS: Worker Encyclopedia: Workers recruited by a productionsite
-                     .. h3(ngettext("Worker recruited:", "Workers recruited:", recruited_workers_counters[program_name]))
-                     .. recruited_workers_strings[program_name]
+                  if (recruited_workers_counters[program_name] == 1) then
+                     -- TRANSLATORS: Worker Encyclopedia: 1 worker recruited by a productionsite
+                     result = result .. h3(_"Worker recruited:")
+                  else
+                     -- TRANSLATORS: Worker Encyclopedia: More than 1 worker recruited by a productionsite
+                     result = result .. h3(_"Workers recruited:")
+                  end
+                  result = result .. recruited_workers_strings[program_name]
                end
             end
          end
@@ -101,9 +105,16 @@
    if (#worker_description.employers > 0) then
       local normal = {}
       local additional = {}
-      -- TRANSLATORS: Worker Encyclopedia: A list of buildings where a worker is needed to work at
-      -- TRANSLATORS: You can also translate this as 'workplace(s)'
-      result = result .. h2(ngettext("Works at", "Works at", #worker_description.employers))
+
+      if (#worker_description.employers == 1) then
+      -- TRANSLATORS: Worker Encyclopedia: Heading for 1 building where a worker can work
+      -- TRANSLATORS: You can also translate this as 'workplace'
+         result = result .. h2(pgettext("workerhelp_one_building", "Works at"))
+      else
+      -- TRANSLATORS: Worker Encyclopedia: A list of more than 1 building where a worker can work
+      -- TRANSLATORS: You can also translate this as 'workplaces'
+         result = result .. h2(pgettext("workerhelp_multiple_buildings", "Works at"))
+      end
       for i, building in ipairs(worker_description.employers) do
          result = result .. dependencies({worker_description, building}, building.descname)
          normal[building.descname] = true
@@ -115,17 +126,15 @@
                   table.insert(additional, build)
                end
             end
-            --[[ TODO(GunChleoc): Put this in after Build 20, activate the translators comments and also fix the plural above
             if #additional == 1 then
-               -- #Translators: Worker Encyclopedia: Heading above a list of buildings where a worker may work instead of a less experienced worker
-               -- #TRANSLATORS: You can also translate this as 'additional workplace'
-               result = result .. h3(pgettext("workerhelp_one_building", "Can also work at"))
+               -- Translators: Worker Encyclopedia: Heading above a list 1 building where a worker may work instead of a less experienced worker
+               -- TRANSLATORS: You can also translate this as 'additional workplace'
+               result = result .. h2(pgettext("workerhelp_one_building", "Can also work at"))
             else
-               -- #Translators: Worker Encyclopedia: Heading above a list of buildings where a worker may work instead of a less experienced worker
-                  -- #TRANSLATORS: You can also translate this as 'additional workplaces'
-               result = result .. h3(ngettext("Can also work at", "Can also work at", #additional))
+               -- Translators: Worker Encyclopedia: Heading above a list of buildings where a worker may work instead of a less experienced worker
+               -- TRANSLATORS: You can also translate this as 'additional workplaces'
+               result = result .. h2(pgettext("workerhelp_multiple_buildings", "Can also work at"))
             end
-            ]]
             for i, build in ipairs(additional) do
                result = result .. dependencies({worker_description, build}, build.descname)
             end

=== modified file 'data/tribes/wares/bread_frisians/helptexts.lua'
--- data/tribes/wares/bread_frisians/helptexts.lua	2017-07-07 16:51:39 +0000
+++ data/tribes/wares/bread_frisians/helptexts.lua	2019-05-13 05:46:56 +0000
@@ -1,7 +1,7 @@
 function ware_helptext(tribe)
    local helptext = {
       -- TRANSLATORS: Helptext for a ware: Frisian Bread
-      frisians = pgettext("frisians_ware", "Bread is made out of barley and water and is used in the taverns and drinking halls to prepare rations. It is also consumed by training soldiers.")
+      frisians = pgettext("frisians_ware", "Bread is made out of barley and water and is used in the taverns to prepare rations. It is also consumed by training soldiers.")
    }
    local result = ""
    if tribe then

=== modified file 'data/tribes/wares/brick/helptexts.lua'
--- data/tribes/wares/brick/helptexts.lua	2017-07-07 16:51:39 +0000
+++ data/tribes/wares/brick/helptexts.lua	2019-05-13 05:46:56 +0000
@@ -1,7 +1,7 @@
 function ware_helptext(tribe)
    local helptext = {
       -- TRANSLATORS: Helptext for a ware: Brick
-      frisians = pgettext("frisians_ware", "Bricks are the best and most important building material. They are made out of clay and granite.")
+      frisians = pgettext("frisians_ware", "Bricks are the best and most important building material. They are made out of a mix of clay and granite dried in a coal fire.")
    }
    local result = ""
    if tribe then

=== modified file 'data/tribes/wares/coal/helptexts.lua'
--- data/tribes/wares/coal/helptexts.lua	2018-02-17 15:41:29 +0000
+++ data/tribes/wares/coal/helptexts.lua	2019-05-13 05:46:56 +0000
@@ -9,7 +9,7 @@
       -- TRANSLATORS: Helptext for a ware: Coal
       empire = pgettext("empire_ware", "The fires of the Empire smelting works, armor smithies and weapon smithies are usually fed with coal."),
       -- TRANSLATORS: Helptext for a ware: Coal
-      frisians = pgettext("frisians_ware", "The fires of the furnaces and armor smithies are fed with coal.")
+      frisians = pgettext("frisians_ware", "The fires of the brick kilns, furnaces and armor smithies are fed with coal.")
    }
    local result = ""
    if tribe then

=== modified file 'data/tribes/wares/felling_ax/helptexts.lua'
--- data/tribes/wares/felling_ax/helptexts.lua	2017-07-07 16:51:39 +0000
+++ data/tribes/wares/felling_ax/helptexts.lua	2019-05-13 05:46:56 +0000
@@ -1,13 +1,13 @@
 function ware_helptext(tribe)
    local helptext = {
       -- TRANSLATORS: Helptext for a ware: Felling Ax
-      default = pgettext("ware", "The felling ax is the tool of the lumberjack to chop down trees."),
-      -- TRANSLATORS: Helptext for a ware: Felling Ax
-      barbarians = pgettext("barbarians_ware", "Felling axes are produced in the metal workshop (but cease to be produced by the building if it is enhanced to an ax workshop and war mill)."),
-      -- TRANSLATORS: Helptext for a ware: Felling Ax
-      frisians = pgettext("frisians_ware", "Felling axes are produced by the blacksmithy."),
-      -- TRANSLATORS: Helptext for a ware: Felling Ax
-      empire = pgettext("empire_ware", "Felling axes are produced by the toolsmith.")
+      default = pgettext("ware", "The felling ax is the tool to chop down trees."),
+      -- TRANSLATORS: Helptext for a ware: Felling Ax
+      barbarians = pgettext("barbarians_ware", "Felling axes are used by lumberjacks and produced in the metal workshop (but cease to be produced by the building if it is enhanced to an ax workshop and war mill)."),
+      -- TRANSLATORS: Helptext for a ware: Felling Ax
+      frisians = pgettext("frisians_ware", "Felling axes are used by woodcutters and produced by the blacksmithy."),
+      -- TRANSLATORS: Helptext for a ware: Felling Ax
+      empire = pgettext("empire_ware", "Felling axes are used by lumberjacks and produced by the toolsmithy.")
    }
    local result = ""
    if tribe then

=== modified file 'data/tribes/wares/fire_tongs/helptexts.lua'
--- data/tribes/wares/fire_tongs/helptexts.lua	2017-07-07 16:51:39 +0000
+++ data/tribes/wares/fire_tongs/helptexts.lua	2019-05-13 05:46:56 +0000
@@ -1,15 +1,15 @@
 function ware_helptext(tribe)
    local helptext = {
       -- TRANSLATORS: Helptext for a ware: Fire Tongs
-      default = pgettext("ware", "Fire tongs are the tools of the smelter, who works in the smelting works."),
-      -- TRANSLATORS: Helptext for a ware: Fire Tongs
-      atlanteans = pgettext("atlanteans_ware_fire_tongs", "They are produced by the toolsmith."),
-      -- TRANSLATORS: Helptext for a ware: Fire Tongs
-      frisians = pgettext("frisians_ware", "They are produced by the blacksmithy."),
-      -- TRANSLATORS: Helptext for a ware: Fire Tongs
-      barbarians = pgettext("barbarians_ware", "Produced by the metal workshop (but they cease to be produced by the building if it is enhanced to an ax workshop and war mill)."),
-      -- TRANSLATORS: Helptext for a ware: Fire Tongs
-      empire = pgettext("empire_ware_fire_tongs", "They are produced by the toolsmith.")
+      default = pgettext("ware", "Fire tongs are the tools for smelting ores."),
+      -- TRANSLATORS: Helptext for a ware: Fire Tongs
+      atlanteans = pgettext("atlanteans_ware_fire_tongs", "They are used in the smelting works and produced by the toolsmith."),
+      -- TRANSLATORS: Helptext for a ware: Fire Tongs
+      frisians = pgettext("frisians_ware", "They are used in the furnace and the brick kiln and produced by the blacksmithy."),
+      -- TRANSLATORS: Helptext for a ware: Fire Tongs
+      barbarians = pgettext("barbarians_ware", "They are used in the smelting works and produced by the metal workshop (but they cease to be produced by the building if it is enhanced to an ax workshop and war mill)."),
+      -- TRANSLATORS: Helptext for a ware: Fire Tongs
+      empire = pgettext("empire_ware_fire_tongs", "They are used in the smelting works and produced by the toolsmith.")
    }
    local result = ""
    if tribe then

=== modified file 'data/tribes/wares/fruit/helptexts.lua'
--- data/tribes/wares/fruit/helptexts.lua	2017-07-07 16:51:39 +0000
+++ data/tribes/wares/fruit/helptexts.lua	2019-05-13 05:46:56 +0000
@@ -1,7 +1,7 @@
 function ware_helptext(tribe)
    local helptext = {
       -- TRANSLATORS: Helptext for a ware: Fruit
-      frisians = pgettext("frisians_ware", "Fruit are berries gathered from berry bushes by a fruit collector. They are used for rations and meals.")
+      frisians = pgettext("frisians_ware", "Fruit are berries gathered from berry bushes by a fruit collector. They are used for rations and for feeding the fish at the aqua farms.")
    }
    local result = ""
    if tribe then

=== modified file 'data/tribes/wares/gold/helptexts.lua'
--- data/tribes/wares/gold/helptexts.lua	2018-02-17 15:41:29 +0000
+++ data/tribes/wares/gold/helptexts.lua	2019-05-13 05:46:56 +0000
@@ -1,15 +1,15 @@
 function ware_helptext(tribe)
    local helptext = {
       -- TRANSLATORS: Helptext for a ware: Gold
-      default = pgettext("ware", "Gold is the most valuable of all metals, and it is obtained out of gold ore in a smelting works."),
-      -- TRANSLATORS: Helptext for a ware: Gold
-      atlanteans = pgettext("atlanteans_ware", "Gold is used by the armor smithy, the weapon smithy and the gold spinning mill."),
-      -- TRANSLATORS: Helptext for a ware: Gold
-      barbarians = pgettext("barbarians_ware", "Only very important things are embellished with gold. It is used as a precious building material and to produce different axes (in the war mill) and different parts of armor (in the helm smithy)."),
-      -- TRANSLATORS: Helptext for a ware: Gold
-      frisians = pgettext("frisians_ware", "Only very important things are embellished with gold. It is used to produce better swords and the best helmets. The best armor is also decorated with gold."),
-      -- TRANSLATORS: Helptext for a ware: Gold
-      empire = pgettext("empire_ware", "Armor and weapons are embellished with gold in the armor smithy and the weapon smithy.")
+      default = pgettext("ware", "Gold is the most valuable of all metals, and it is smelted out of gold ore."),
+      -- TRANSLATORS: Helptext for a ware: Gold
+      atlanteans = pgettext("atlanteans_ware", "It is produced by the smelting works and used by the armor smithy, the weapon smithy and the gold spinning mill."),
+      -- TRANSLATORS: Helptext for a ware: Gold
+      barbarians = pgettext("barbarians_ware", "Only very important things are embellished with gold. It is produced by the smelting works and used as a precious building material and to produce different axes (in the war mill) and different parts of armor (in the helm smithy)."),
+      -- TRANSLATORS: Helptext for a ware: Gold
+      frisians = pgettext("frisians_ware", "Only very important things are embellished with gold. It is produced by the furnace and is used to produce better swords and the best helmets. The best armor is also decorated with gold."),
+      -- TRANSLATORS: Helptext for a ware: Gold
+      empire = pgettext("empire_ware", "It is produced by the smelting works. Armor and weapons are embellished with gold in the armor smithy and the weapon smithy.")
    }
    local result = ""
    if tribe then

=== modified file 'data/tribes/wares/gold_ore/helptexts.lua'
--- data/tribes/wares/gold_ore/helptexts.lua	2018-02-17 15:41:29 +0000
+++ data/tribes/wares/gold_ore/helptexts.lua	2019-05-13 05:46:56 +0000
@@ -1,7 +1,15 @@
 function ware_helptext(tribe)
    local helptext = {
       -- TRANSLATORS: Helptext for a ware: Gold Ore
-      default = pgettext("ware", "Gold ore is mined in a gold mine. Smelted in a smelting works, it turns into gold which is used as a precious building material and to produce weapons and armor.")
+      default = pgettext("ware", "Gold ore is mined in a gold mine."),
+      -- TRANSLATORS: Helptext for a ware: Gold Ore
+      atlanteans = pgettext("atlanteans_ware", "Smelted in a smelting works, it turns into gold which is used as a precious building material and to produce weapons and armor."),
+      -- TRANSLATORS: Helptext for a ware: Gold Ore
+      barbarians = pgettext("barbarians_ware", "Smelted in a smelting works, it turns into gold which is used as a precious building material and to produce weapons and armor."),
+      -- TRANSLATORS: Helptext for a ware: Gold Ore
+      frisians = pgettext("frisians_ware", "Smelted in a furnace, it turns into gold which is used as a precious building material and to produce weapons and armor."),
+      -- TRANSLATORS: Helptext for a ware: Gold Ore
+      empire = pgettext("empire_ware", "Smelted in a smelting works, it turns into gold which is used as a precious building material and to produce weapons and armor.")
    }
    local result = ""
    if tribe then

=== modified file 'data/tribes/wares/iron/helptexts.lua'
--- data/tribes/wares/iron/helptexts.lua	2018-02-17 15:41:29 +0000
+++ data/tribes/wares/iron/helptexts.lua	2019-05-13 05:46:56 +0000
@@ -1,15 +1,15 @@
 function ware_helptext(tribe)
    local helptext = {
       -- TRANSLATORS: Helptext for a ware: Iron
-      default = pgettext("ware", "Iron is extracted from iron ore in the smelting works."),
-      -- TRANSLATORS: Helptext for a ware: Iron
-      atlanteans = pgettext("atlanteans_ware", "It is used in the toolsmithy, armor smithy and weapon smithy."),
-      -- TRANSLATORS: Helptext for a ware: Iron
-      barbarians = pgettext("barbarians_ware", "It is used to produce weapons and tools in the metal workshop, ax workshop, war mill and helm smithy."),
-      -- TRANSLATORS: Helptext for a ware: Iron
-      empire = pgettext("empire_ware", "Weapons, armor and tools are made of iron."),
-      -- TRANSLATORS: Helptext for a ware: Iron
-      frisians = pgettext("frisians_ware", "Tools and weapons are made of iron. It is also used as jewellery for fur garment armor to give it a silver shine.")
+      default = pgettext("ware", "Iron is smelted out of iron ores."),
+      -- TRANSLATORS: Helptext for a ware: Iron
+      atlanteans = pgettext("atlanteans_ware", "It is produced by the smelting works and used in the toolsmithy, armor smithy and weapon smithy."),
+      -- TRANSLATORS: Helptext for a ware: Iron
+      barbarians = pgettext("barbarians_ware", "It is produced by the smelting works and used to produce weapons and tools in the metal workshop, ax workshop, war mill and helm smithy."),
+      -- TRANSLATORS: Helptext for a ware: Iron
+      empire = pgettext("empire_ware", "It is produced by the smelting works. Weapons, armor and tools are made of iron."),
+      -- TRANSLATORS: Helptext for a ware: Iron
+      frisians = pgettext("frisians_ware", "It is produced by the furnace. Tools and weapons are made of iron. It is also used as jewellery for fur garment armor to give it a silver shine.")
    }
    local result = ""
    if tribe then

=== modified file 'data/tribes/wares/iron_ore/helptexts.lua'
--- data/tribes/wares/iron_ore/helptexts.lua	2015-10-31 12:11:44 +0000
+++ data/tribes/wares/iron_ore/helptexts.lua	2019-05-13 05:46:56 +0000
@@ -1,7 +1,16 @@
 function ware_helptext(tribe)
    local helptext = {
       -- TRANSLATORS: Helptext for a ware: Iron Ore
-      default = pgettext("default_ware", "Iron ore is mined in iron mines. It is smelted in a smelting works to retrieve the iron.")
+      default = pgettext("default_ware", "Iron ore is mined in iron mines."),
+      -- TRANSLATORS: Helptext for a ware: Iron Ore
+      atlanteans = pgettext("atlanteans_ware", "It is smelted in a smelting works to retrieve the iron."),
+      -- TRANSLATORS: Helptext for a ware: Iron Ore
+      barbarians = pgettext("barbarians_ware", "It is smelted in a smelting works to retrieve the iron."),
+      -- TRANSLATORS: Helptext for a ware: Iron Ore
+      frisians = pgettext("frisians_ware", "It is smelted in a furnace to retrieve the iron."),
+      -- TRANSLATORS: Helptext for a ware: Iron Ore
+      empire = pgettext("empire_ware", "It is smelted in a smelting works to retrieve the iron.")
+
    }
    local result = ""
    if tribe then

=== modified file 'data/tribes/wares/mead/helptexts.lua'
--- data/tribes/wares/mead/helptexts.lua	2018-02-17 15:41:29 +0000
+++ data/tribes/wares/mead/helptexts.lua	2019-05-13 05:46:56 +0000
@@ -1,7 +1,7 @@
 function ware_helptext(tribe)
    local helptext = {
       -- TRANSLATORS: Helptext for a ware: Mead
-      frisians = pgettext("frisians_ware", "Mead is produced by mead breweries and used in drinking halls for producing meals. Soldiers drink mead during advanced training."),
+      frisians = pgettext("frisians_ware", "Mead is produced by mead breweries. Soldiers drink mead during advanced training."),
    }
    local result = ""
    if tribe then

=== modified file 'src/graphic/CMakeLists.txt'
--- src/graphic/CMakeLists.txt	2019-05-04 15:37:33 +0000
+++ src/graphic/CMakeLists.txt	2019-05-13 05:46:56 +0000
@@ -104,8 +104,10 @@
   DEPENDS
     base_exceptions
     base_geometry
+    base_i18n
     base_log
     base_macros
+    graphic_text
     io_fileread
     io_filesystem
 )

=== modified file 'src/graphic/gl/initialize.cc'
--- src/graphic/gl/initialize.cc	2019-04-09 16:43:49 +0000
+++ src/graphic/gl/initialize.cc	2019-05-13 05:46:56 +0000
@@ -24,10 +24,13 @@
 
 #include <SDL.h>
 #include <boost/algorithm/string.hpp>
+#include <boost/format.hpp>
 #include <boost/regex.hpp>
 
+#include "base/i18n.h"
 #include "base/macros.h"
 #include "graphic/gl/utils.h"
+#include "graphic/text/bidi.h"
 
 namespace Gl {
 
@@ -184,6 +187,21 @@
 	   reinterpret_cast<const char*>(glGetString(GL_SHADING_LANGUAGE_VERSION));
 	log("Graphics: OpenGL: ShadingLanguage: \"%s\"\n", shading_language_version_string);
 
+	// Show a basic SDL window with an error message, and log it too, then exit 1. Since font support does not exist for all languages, we show both the original and a localized text.
+	auto show_opengl_error_and_exit = [] (const std::string& message, const std::string& localized_message) {
+		std::string display_message = "";
+		if (message != localized_message) {
+			display_message = message + "\n\n" + (i18n::has_rtl_character(localized_message.c_str()) ? i18n::line2bidi(i18n::make_ligatures(localized_message.c_str()).c_str()) : localized_message);
+		} else {
+			display_message = message;
+		}
+
+		/** TRANSLATORS: Error message printed to console/command line/log file */
+		log(_("ERROR: %s\n"), display_message.c_str());
+		SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "OpenGL Error", display_message.c_str(), NULL);
+		exit(1);
+	};
+
 	std::vector<std::string> shading_language_version_vector;
 	boost::split(
 	   shading_language_version_vector, shading_language_version_string, boost::is_any_of("."));
@@ -196,12 +214,14 @@
 		   atoi(shading_language_version_vector.at(1).c_str());
 		if (major_shading_language_version < 1 ||
 		    (major_shading_language_version == 1 && minor_shading_language_version < 20)) {
-			log("ERROR: Shading language version is too old!\n");
-			SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "OpenGL Error",
-			                         "Widelands won’t work because your graphics driver is too old.\n"
-			                         "The shading language needs to be version 1.20 or newer.",
-			                         nullptr);
-			exit(1);
+			show_opengl_error_and_exit("Widelands won’t work because your graphics driver is too old.\n"
+									   "The shading language needs to be version 1.20 or newer.",
+									   (boost::format("%s\n%s") %
+									   /** TRANSLATORS: Basic error message when we can't handle the graphics driver. Font support is limited here, so do not use advanced typography **/
+									   _("Widelands won’t work because your graphics driver is too old.") %
+										/** TRANSLATORS: Basic error message when we can't handle the graphics driver. Font support is limited here, so do not use advanced typography **/
+										_("The shading language needs to be version 1.20 or newer.")).str());
+
 		}
 	} else {
 		// We don't have a minor version. Ensure that the string to compare is a valid integer before
@@ -210,25 +230,26 @@
 		if (boost::regex_match(shading_language_version_string, re)) {
 			const int major_shading_language_version = atoi(shading_language_version_string);
 			if (major_shading_language_version < 2) {
-				log("ERROR: Shading language version is too old!\n");
-				SDL_ShowSimpleMessageBox(
-				   SDL_MESSAGEBOX_ERROR, "OpenGL Error",
-				   "Widelands won’t work because your graphics driver is too old.\n"
-				   "The shading language needs to be version 1.20 or newer.",
-				   nullptr);
-				exit(1);
+				show_opengl_error_and_exit("Widelands won’t work because your graphics driver is too old.\n"
+										   "The shading language needs to be version 1.20 or newer.",
+										   (boost::format("%s\n%s") %
+										   /** TRANSLATORS: Basic error message when we can't handle the graphics driver. Font support is limited here, so do not use advanced typography **/
+										   _("Widelands won’t work because your graphics driver is too old.") %
+											/** TRANSLATORS: Basic error message when we can't handle the graphics driver. Font support is limited here, so do not use advanced typography **/
+											_("The shading language needs to be version 1.20 or newer.")).str());
+
 			}
 		} else {
 			// Exit because we couldn't detect the shading language version, so there must be a problem
 			// communicating with the graphics adapter.
-			log("ERROR: Unable to detect the shading language version!\n");
-			SDL_ShowSimpleMessageBox(
-			   SDL_MESSAGEBOX_ERROR, "OpenGL Error",
-			   "Widelands won't work because we were unable to detect the shading "
-			   "language version.\nThere is an unknown problem with reading the "
-			   "information from the graphics driver.",
-			   nullptr);
-			exit(1);
+			show_opengl_error_and_exit("Widelands won't work because we were unable to detect the shading language version.\n"
+									   "There is an unknown problem with reading the information from the graphics driver.",
+									   (boost::format("%s\n%s") %
+										/** TRANSLATORS: Basic error message when we can't handle the graphics driver. Font support is limited here, so do not use advanced typography **/
+										_("Widelands won't work because we were unable to detect the shading language version.") %
+										/** TRANSLATORS: Basic error message when we can't handle the graphics driver. Font support is limited here, so do not use advanced typography **/
+										 _("There is an unknown problem with reading the information from the graphics driver.")).str());
+
 		}
 	}
 

=== modified file 'src/logic/map_objects/tribes/productionsite.cc'
--- src/logic/map_objects/tribes/productionsite.cc	2019-05-05 14:05:07 +0000
+++ src/logic/map_objects/tribes/productionsite.cc	2019-05-13 05:46:56 +0000
@@ -302,7 +302,11 @@
 
 	if (uint32_t const nr_requests = nr_working_positions - nr_workers) {
 		*s = (boost::format("<font color=%s>%s</font>") % UI_FONT_CLR_BAD.hex_value() %
-		      ngettext("Worker missing", "Workers missing", nr_requests))
+		      (nr_requests == 1 ?
+				  /** TRANSLATORS: Productivity label on a building if there is 1 worker missing */
+				  _("Worker missing") :
+				  /** TRANSLATORS: Productivity label on a building if there is more than 1 worker missing. If you need plural forms here, please let us know. */
+				  _("Workers missing")))
 		        .str();
 		return;
 	}

=== modified file 'src/logic/map_objects/tribes/worker.cc'
--- src/logic/map_objects/tribes/worker.cc	2019-05-04 10:47:44 +0000
+++ src/logic/map_objects/tribes/worker.cc	2019-05-13 05:46:56 +0000
@@ -985,7 +985,7 @@
 			   game,
 			   std::unique_ptr<Message>(new Message(Message::Type::kGeologists, game.get_gametime(),
 			                                        rdescr->descname(), rdescr->representative_image(),
-			                                        rdescr->descname(), message, position, serial_,
+			                                        ri.descr().descname(), message, position, serial_,
 			                                        rdescr->name())),
 			   rdescr->timeout_ms(), rdescr->timeout_radius());
 		}

=== modified file 'src/ui_fsmenu/scenariodetails.cc'
--- src/ui_fsmenu/scenariodetails.cc	2019-04-24 01:33:04 +0000
+++ src/ui_fsmenu/scenariodetails.cc	2019-05-13 05:46:56 +0000
@@ -51,9 +51,14 @@
 	                        .str());
 
 	if (scenariodata.playable) {
+		const std::string authors_heading = (scenariodata.authors.get_number() == 1) ?
+												/** TRANSLATORS: Label in campaign scenario details if there is 1 author */
+												_("Author") :
+												/** TRANSLATORS: Label in campaign scenario details if there is more than 1 author. If you need plural forms here, please let us know. */
+												_("Authors");
 		std::string description =
 		   (boost::format("%s%s") %
-		    as_heading(ngettext("Author", "Authors", scenariodata.authors.get_number()),
+		    as_heading(authors_heading,
 		               UI::PanelStyle::kFsMenu) %
 		    as_content(scenariodata.authors.get_names(), UI::PanelStyle::kFsMenu))
 		      .str();

=== modified file 'src/wui/interactive_base.cc'
--- src/wui/interactive_base.cc	2019-05-04 05:37:07 +0000
+++ src/wui/interactive_base.cc	2019-05-13 05:46:56 +0000
@@ -51,7 +51,6 @@
 #include "sound/sound_handler.h"
 #include "wui/game_chat_menu.h"
 #include "wui/game_debug_ui.h"
-#include "wui/interactive_player.h"
 #include "wui/logmessage.h"
 #include "wui/mapviewpixelconstants.h"
 #include "wui/mapviewpixelfunctions.h"
@@ -223,22 +222,7 @@
 }
 
 void InteractiveBase::set_sel_pos(Widelands::NodeAndTriangle<> const center) {
-	const Map& map = egbase().map();
 	sel_.pos = center;
-
-	if (upcast(InteractiveGameBase const, igbase, this))
-		if (upcast(Widelands::ProductionSite, productionsite, map[center.node].get_immovable())) {
-			if (upcast(InteractivePlayer const, iplayer, igbase)) {
-				const Widelands::Player& player = iplayer->player();
-				if (!player.see_all() &&
-				    (1 >= player.vision(Widelands::Map::get_index(center.node, map.get_width())) ||
-				     player.is_hostile(*productionsite->get_owner())))
-					return set_tooltip("");
-			}
-			set_tooltip(productionsite->info_string(Widelands::Building::InfoStringFormat::kTooltip));
-			return;
-		}
-	set_tooltip("");
 }
 
 /*

=== modified file 'src/wui/interactive_gamebase.cc'
--- src/wui/interactive_gamebase.cc	2019-04-20 05:44:37 +0000
+++ src/wui/interactive_gamebase.cc	2019-05-13 05:46:56 +0000
@@ -40,6 +40,7 @@
 #include "wui/dismantlesitewindow.h"
 #include "wui/game_client_disconnected.h"
 #include "wui/game_summary.h"
+#include "wui/interactive_player.h"
 #include "wui/militarysitewindow.h"
 #include "wui/productionsitewindow.h"
 #include "wui/shipwindow.h"
@@ -139,6 +140,40 @@
 	}
 }
 
+void InteractiveGameBase::set_sel_pos(Widelands::NodeAndTriangle<> const center) {
+	InteractiveBase::set_sel_pos(center);
+
+	const Widelands::Map& map = egbase().map();
+
+	// If we have an immovable, we might want to show a tooltip
+	Widelands::BaseImmovable* imm = map[center.node].get_immovable();
+	if (imm == nullptr) {
+		return set_tooltip("");
+	}
+
+	// If we have a player, only show tooltips if he sees the field
+	const Widelands::Player* player = nullptr;
+	if (upcast(InteractivePlayer, iplayer, this)) {
+		player = iplayer->get_player();
+		if (player != nullptr && !player->see_all() &&
+			(1 >= player->vision(Widelands::Map::get_index(center.node, map.get_width())))) {
+			return set_tooltip("");
+		}
+	}
+
+	if (imm->descr().type() == Widelands::MapObjectType::IMMOVABLE) {
+		// Trees, Resource Indicators, fields ...
+		return set_tooltip(imm->descr().descname());
+	} else if (upcast(Widelands::ProductionSite, productionsite, imm)) {
+		// No productionsite tips for hostile players
+		if (player == nullptr || !player->is_hostile(*productionsite->get_owner())) {
+			return set_tooltip(productionsite->info_string(Widelands::Building::InfoStringFormat::kTooltip));
+		}
+	}
+	set_tooltip("");
+
+}
+
 /**
  * Called for every game after loading (from a savegame or just from a map
  * during single/multiplayer/scenario).

=== modified file 'src/wui/interactive_gamebase.h'
--- src/wui/interactive_gamebase.h	2019-02-27 17:19:00 +0000
+++ src/wui/interactive_gamebase.h	2019-05-13 05:46:56 +0000
@@ -74,6 +74,8 @@
 	// 'map_views', hence this function.
 	virtual void draw_map_view(MapView* given_map_view, RenderTarget* dst) = 0;
 
+	void set_sel_pos(Widelands::NodeAndTriangle<> const center) override;
+
 	virtual void node_action(const Widelands::NodeAndTriangle<>& node_and_triangle) = 0;
 	const PlayerType& get_playertype() const {
 		return playertype_;

=== modified file 'src/wui/mapdetails.cc'
--- src/wui/mapdetails.cc	2019-04-18 16:50:35 +0000
+++ src/wui/mapdetails.cc	2019-05-13 05:46:56 +0000
@@ -88,7 +88,7 @@
 	// Show directory information
 	if (mapdata.maptype == MapData::MapType::kDirectory) {
 		name_label_.set_text(
-		   (boost::format("<rt>%s%s</rt>") % as_heading(_("Directory:"), style_, true) %
+		   (boost::format("<rt>%s%s</rt>") % as_heading(_("Directory"), style_, true) %
 		    as_content(mapdata.localized_name, style_))
 		      .str());
 		main_box_.set_size(main_box_.get_w(), get_h());
@@ -96,7 +96,7 @@
 	} else {  // Show map information
 		name_label_.set_text(
 		   (boost::format("<rt>%s%s</rt>") %
-		    as_heading(mapdata.maptype == MapData::MapType::kScenario ? _("Scenario:") : _("Map:"),
+		    as_heading(mapdata.maptype == MapData::MapType::kScenario ? _("Scenario") : _("Map"),
 		               style_, true) %
 		    as_content(localize_mapname ? mapdata.localized_name : mapdata.name, style_))
 		      .str());
@@ -122,8 +122,12 @@
 		}
 
 		// Show map information
-		std::string description =
-		   as_heading(ngettext("Author:", "Authors:", mapdata.authors.get_number()), style_);
+		const std::string authors_heading = (mapdata.authors.get_number() == 1) ?
+												/** TRANSLATORS: Label in map details if there is 1 author */
+												_("Author") :
+												/** TRANSLATORS: Label in map details if there is more than 1 author. If you need plural forms here, please let us know. */
+												_("Authors");
+		std::string description = as_heading(authors_heading, style_);
 		description =
 		   (boost::format("%s%s") % description % as_content(mapdata.authors.get_names(), style_))
 		      .str();
@@ -133,19 +137,19 @@
 			tags.push_back(localize_tag(tag));
 		}
 		std::sort(tags.begin(), tags.end());
-		description = (boost::format("%s%s") % description % as_heading(_("Tags:"), style_)).str();
+		description = (boost::format("%s%s") % description % as_heading(_("Tags"), style_)).str();
 		description = (boost::format("%s%s") % description %
 		               as_content(i18n::localize_list(tags, i18n::ConcatenateWith::COMMA), style_))
 		                 .str();
 
 		description =
-		   (boost::format("%s%s") % description % as_heading(_("Description:"), style_)).str();
+		   (boost::format("%s%s") % description % as_heading(_("Description"), style_)).str();
 		description =
 		   (boost::format("%s%s") % description % as_content(mapdata.description, style_)).str();
 
 		if (!mapdata.hint.empty()) {
 			/** TRANSLATORS: Map hint header when selecting a map. */
-			description = (boost::format("%s%s") % description % as_heading(_("Hint:"), style_)).str();
+			description = (boost::format("%s%s") % description % as_heading(_("Hint"), style_)).str();
 			description =
 			   (boost::format("%s%s") % description % as_content(mapdata.hint, style_)).str();
 		}

=== modified file 'src/wui/productionsitewindow.cc'
--- src/wui/productionsitewindow.cc	2019-02-23 11:00:49 +0000
+++ src/wui/productionsitewindow.cc	2019-05-13 05:46:56 +0000
@@ -96,8 +96,13 @@
 		worker_table_ = new UI::Table<uintptr_t>(worker_box, 0, 0, 0, 100, UI::PanelStyle::kWui);
 		worker_caps_ = new UI::Box(worker_box, 0, 0, UI::Box::Horizontal);
 
-		worker_table_->add_column(
-		   210, (ngettext("Worker", "Workers", production_site->descr().nr_working_positions())));
+		const std::string workers_heading = (production_site->descr().nr_working_positions() == 1) ?
+											   /** TRANSLATORS: Header in production site window if there is 1 worker */
+											   _("Worker") :
+											   /** TRANSLATORS: Header in production site window if there is more than 1 worker. If you need plural forms here, please let us know. */
+											   _("Workers");
+
+		worker_table_->add_column(210, workers_heading);
 		worker_table_->add_column(60, _("Exp"));
 		worker_table_->add_column(150, _("Next Level"));
 
@@ -122,7 +127,7 @@
 		worker_box->add(worker_caps_, UI::Box::Resizing::kFullSize);
 		get_tabs()->add(
 		   "workers", g_gr->images().get(pic_tab_workers), worker_box,
-		   (ngettext("Worker", "Workers", production_site->descr().nr_working_positions())));
+		   workers_heading);
 		update_worker_table(production_site);
 	}
 	think();

=== modified file 'src/wui/suggested_teams_box.cc'
--- src/wui/suggested_teams_box.cc	2019-02-23 11:00:49 +0000
+++ src/wui/suggested_teams_box.cc	2019-05-13 05:46:56 +0000
@@ -87,7 +87,7 @@
 		set_visible(true);
 		suggested_teams_box_label_->set_visible(true);
 		/** TRANSLATORS: Label for the list of suggested teams when choosing a map */
-		suggested_teams_box_label_->set_text(_("Suggested Teams:"));
+		suggested_teams_box_label_->set_text(_("Suggested Teams"));
 		int32_t teamlist_offset =
 		   suggested_teams_box_label_->get_y() + suggested_teams_box_label_->get_h() + padding_;