Merge branch 'master' of github.com:widelands/widelands into uiplugin…

…gs-more-widgets

.github/scripts/vcpkg_ref

@@ -1 +1 @@
-4a3c366f2
+d1e11918f

data/i18n/translation_stats.conf

@@ -20,7 +20,7 @@ translated=73441
 translated=56879
 
 [de]
-translated=88560
+translated=88716
 
 [el]
 translated=12101

data/scripting/infrastructure.lua

@@ -216,7 +216,8 @@ function is_building(immovable)
    return immovable.descr.type_name == "productionsite" or
       immovable.descr.type_name == "warehouse" or
       immovable.descr.type_name == "militarysite" or
-      immovable.descr.type_name == "trainingsite"
+      immovable.descr.type_name == "trainingsite" or
+      immovable.descr.type_name == "market"
 end
 
 -- RST

data/tribes/initialization/amazons/units.lua

@@ -1295,8 +1295,12 @@ wl.Descriptions():new_tribe {
          helptexts = {
             -- TRANSLATORS: Purpose helptext for an Amazon production site: Hunter-Gatherer's Hut
             purpose = pgettext("amazons_building", "Hunts animals to produce meat. Catches fish in the waters."),
-            -- TRANSLATORS: Note helptext for an Amazon production site: Hunter-Gatherer's Hut
-            note = pgettext("amazons_building", "The hunter-gatherer’s hut needs animals or fish to hunt or catch within the work area."),
+            note = {
+               -- TRANSLATORS: Note helptext for an Amazon production site: Hunter-Gatherer's Hut
+               pgettext("amazons_building", "The hunter-gatherer’s hut needs animals or fish to hunt or catch within the work area."),
+               -- TRANSLATORS: Note helptext for an Amazon production site: Hunter-Gatherer's Hut
+               pgettext("amazons_building", "Roads and trees along the shoreline block fishing."),
+            },
             -- TRANSLATORS: Performance helptext for an Amazon production site: Hunter-Gatherer's Hut
             performance = pgettext("amazons_building", "The hunter-gatherer pauses %s before going to work again."):bformat(format_seconds(34))
 
@@ -1322,8 +1326,12 @@ wl.Descriptions():new_tribe {
          helptexts = {
             -- TRANSLATORS: Purpose helptext for an Amazon production site: Water Gatherer's Hut
             purpose = pgettext("amazons_building", "Draws water out of the rivers and lakes."),
-            -- TRANSLATORS: Note helptext for an Amazon production site: Water Gatherer's Hut
-            note = pgettext("amazons_building", "The water gatherer’s hut needs open water within the work area. Your workers cannot dig up water from the ground!")
+            note = {
+               -- TRANSLATORS: Note helptext for an Amazon production site: Water Gatherer's Hut, part 1
+               pgettext("amazons_building", "The water gatherer’s hut needs open water within the work area. Your workers cannot dig up water from the ground!"),
+               -- TRANSLATORS: Note helptext for an Amazon production site: Water Gatherer's Hut, part 2
+               pgettext("amazons_building", "Roads and trees along the shoreline block drawing water."),
+            }
          }
       },
       {
@@ -1596,15 +1604,25 @@ wl.Descriptions():new_tribe {
          helptexts = {
             -- TRANSLATORS: Purpose helptext for an Amazon production site: Ferry Yard
             purpose = pgettext("amazons_building", "Builds ferries."),
-            -- TRANSLATORS: Note helptext for an Amazon production site: Ferry Yard
-            note = pgettext("amazons_building", "Needs water nearby.")
+            note = {
+               -- TRANSLATORS: Note helptext for an Amazon production site: Ferry Yard, part 1
+               pgettext("amazons_building", "Needs water nearby. Be aware ferries carry wares only, no workers."),
+               -- TRANSLATORS: Note helptext for an Amazon production site: Ferry Yard, part 2
+               pgettext("building", "Roads and trees along the shoreline block access to water."),
+            }
          }
       },
       {
          name = "amazons_shipyard",
          helptexts = {
             -- TRANSLATORS: Purpose helptext for an Amazon production site: Shipyard
-            purpose = pgettext("amazons_building", "Constructs ships that are used for overseas colonization and for trading between ports.")
+            purpose = pgettext("amazons_building", "Constructs ships that are used for overseas colonization and for trading between ports."),
+            note = {
+               -- TRANSLATORS: Note helptext for an Amazon production site: Shipyard, part 1
+               pgettext("building", "Needs wide open water nearby."),
+               -- TRANSLATORS: Note helptext for an Amazon production site: Shipyard, part 2
+               pgettext("building", "Roads and trees along the shoreline block access to water."),
+            }
          }
       },
 

data/tribes/initialization/atlanteans/units.lua

@@ -1521,7 +1521,9 @@ wl.Descriptions():new_tribe {
                -- TRANSLATORS: Note helptext for an Atlantean production site: Fisher's House, part 1
                pgettext("atlanteans_building", "The fisher’s house needs water full of fish within the work area."),
                -- TRANSLATORS: Note helptext for an Atlantean production site: Fisher's House, part 2
-               pgettext("atlanteans_building", "Build a fish breeder’s house close to the fisher’s house to make sure that you don’t run out of fish.")
+               pgettext("atlanteans_building", "Build a fish breeder’s house close to the fisher’s house to make sure that you don’t run out of fish."),
+               -- TRANSLATORS: Note helptext for an Atlantean production site: Fisher's House, part 3
+               pgettext("atlanteans_building", "Roads and trees along the shoreline block fishing."),
             },
             -- TRANSLATORS: Note lore for an Atlantean production site: Fisher's House use some local fise song as you like
             lore = pgettext("atlanteans_building", [[‘Take your net and come to the sea<br>]] ..
@@ -1981,8 +1983,12 @@ wl.Descriptions():new_tribe {
          helptexts = {
             -- TRANSLATORS: Purpose helptext for an Atlantean production site: Ferry Yard
             purpose = pgettext("building", "Builds ferries."),
-            -- TRANSLATORS: Note helptext for an Atlantean production site: Ferry Yard
-            note = pgettext("building", "Needs water nearby. Be aware ferries carry wares only, no workers."),
+            note = {
+               -- TRANSLATORS: Note helptext for an Atlantean production site: Ferry Yard, part 1
+               pgettext("building", "Needs water nearby. Be aware ferries carry wares only, no workers."),
+               -- TRANSLATORS: Note helptext for an Atlantean production site: Ferry Yard, part 2
+               pgettext("building", "Roads and trees along the shoreline block access to water."),
+            },
             -- TRANSLATORS: Lore helptext for an Atlantean production site: Ferry Yard
             lore = pgettext("atlanteans_building", [[‘Row, row, row your boat<br>]] ..
                                           [[gently ’long the shore.<br>]] ..
@@ -1997,14 +2003,19 @@ wl.Descriptions():new_tribe {
          helptexts = {
             -- TRANSLATORS: Purpose helptext for an Atlantean production site: Shipyard
             purpose = pgettext("building", "Constructs ships that are used for overseas colonization and for trading between ports."),
+            note = {
+               -- TRANSLATORS: Note helptext for an Atlantean production site: Shipyard, part 1
+               pgettext("building", "Needs wide open water nearby."),
+               -- TRANSLATORS: Note helptext for an Atlantean production site: Shipyard, part 2
+               pgettext("building", "Roads and trees along the shoreline block access to water."),
+            },
             -- TRANSLATORS: Lore helptext for an Atlantean production site: Shipyard
             lore = pgettext("atlanteans_building", [[‘Soon may the wellerman come,<br>]] ..
                                           [[to bring us bread and smoked fish.<br>]] ..
                                           [[We set sail for a faraway shore<br>]] ..
                                           [[we praise Satul the best we wish.’]]),
             -- TRANSLATORS: Lore author helptext for an Atlantean production site: Shipyard -- not directly stolen from the wellerman song
-            lore_author = pgettext("atlanteans_building", "Transcript from oral tradition")
-
+            lore_author = pgettext("atlanteans_building", "Transcript from oral tradition"),
          }
       },
 

data/tribes/initialization/barbarians/units.lua

@@ -1186,8 +1186,12 @@ wl.Descriptions():new_tribe {
             lore_author = pgettext("barbarians_building", "Frequent response of a Barbarian fisherman,<br>often followed by an enjoyable brawl"),
             -- TRANSLATORS: Purpose helptext for production site: Fisher's Hut
             purpose = pgettext("barbarians_building", "Fishes on the coast near the fisher’s hut."),
-            -- TRANSLATORS: Note helptext for production site: Fisher's Hut
-            note = pgettext("barbarians_building", "The fisher’s hut needs water full of fish within the work area."),
+            note = {
+               -- TRANSLATORS: Note helptext for production site: Fisher's Hut, part 1
+               pgettext("barbarians_building", "The fisher’s hut needs water full of fish within the work area."),
+               -- TRANSLATORS: Note helptext for production site: Fisher's Hut, part 2
+               pgettext("building", "Roads and trees along the shoreline block fishing."),
+            },
             -- TRANSLATORS: Performance helptext for production site: Fisher's Hut
             performance = pgettext("barbarians_building", "The fisher pauses %s before going to work again."):bformat(format_seconds(18))
          }
@@ -1767,8 +1771,12 @@ wl.Descriptions():new_tribe {
          helptexts = {
             -- TRANSLATORS: Purpose helptext for production site: Ferry Yard
             purpose = pgettext("building", "Builds ferries."),
-            -- TRANSLATORS: Note helptext for production site: Ferry Yard
-            note = pgettext("building", "Needs water nearby.")
+            note = {
+               -- TRANSLATORS: Note helptext for a Barbarian production site: Ferry Yard, part 1
+               pgettext("building", "Needs water nearby. Be aware ferries carry wares only, no workers."),
+               -- TRANSLATORS: Note helptext for a Barbarian production site: Ferry Yard, part 2
+               pgettext("building", "Roads and trees along the shoreline block access to water."),
+            }
          }
       },
       {
@@ -1780,7 +1788,13 @@ wl.Descriptions():new_tribe {
             -- TRANSLATORS: Lore author helptext for a Barbarian production site: Shipyard
             lore_author = pgettext("barbarians_building", "Captain Thanlas the Elder,<br>Explorer"),
             -- TRANSLATORS: Purpose helptext for a Barbarian production site: Shipyard
-            purpose = pgettext("building", "Constructs ships that are used for overseas colonization and for trading between ports.")
+            purpose = pgettext("building", "Constructs ships that are used for overseas colonization and for trading between ports."),
+            note = {
+               -- TRANSLATORS: Note helptext for a Barbarian production site: Shipyard, part 1
+               pgettext("building", "Needs wide open water nearby."),
+               -- TRANSLATORS: Note helptext for a Barbarian production site: Shipyard, part 2
+               pgettext("building", "Roads and trees along the shoreline block access to water."),
+            }
          }
       },
       {

data/tribes/initialization/empire/units.lua

@@ -1309,8 +1309,12 @@ wl.Descriptions():new_tribe {
             lore_author = pgettext("empire_building", "A fisherman criticising the Grand Master of the Fishermans’ Guild"),
             -- TRANSLATORS: Purpose helptext for an Empire production site: Fisher's House
             purpose = pgettext("empire_building", "Fishes on the coast near the fisher’s house."),
-            -- TRANSLATORS: Note helptext for an Empire production site: Fisher's House
-            note = pgettext("empire_building", "The fisher’s house needs water full of fish within the work area.")
+            note = {
+               -- TRANSLATORS: Note helptext for an Empire production site: Fisher's House, part 1
+               pgettext("empire_building", "The fisher’s house needs water full of fish within the work area."),
+               -- TRANSLATORS: Note helptext for an Empire production site: Fisher's House, part 2
+               pgettext("empire_building", "Roads and trees along the shoreline block fishing."),
+            }
          }
       },
       {
@@ -2241,8 +2245,12 @@ wl.Descriptions():new_tribe {
             ),
             -- TRANSLATORS: Purpose helptext for an Empire production site: Ferry Yard
             purpose = pgettext("building", "Builds ferries."),
-            -- TRANSLATORS: Note helptext for an Empire production site: Ferry Yard
-            note = pgettext("building", "Needs water nearby.")
+            note = {
+               -- TRANSLATORS: Note helptext for an Empire production site: Ferry Yard, part 1
+               pgettext("building", "Needs water nearby. Be aware ferries carry wares only, no workers."),
+               -- TRANSLATORS: Note helptext for an Empire production site: Ferry Yard, part 2
+               pgettext("building", "Roads and trees along the shoreline block access to water."),
+            }
          }
       },
       {
@@ -2263,7 +2271,13 @@ wl.Descriptions():new_tribe {
                "A shipwright lamenting when he was instructed to stop working"
             ),
             -- TRANSLATORS: Purpose helptext for an Empire production site: Shipyard
-            purpose = pgettext("building", "Constructs ships that are used for overseas colonization and for trading between ports.")
+            purpose = pgettext("building", "Constructs ships that are used for overseas colonization and for trading between ports."),
+            note = {
+               -- TRANSLATORS: Note helptext for an Empire production site: Shipyard, part 1
+               pgettext("building", "Needs wide open water nearby."),
+               -- TRANSLATORS: Note helptext for an Empire production site: Shipyard, part 2
+               pgettext("building", "Roads and trees along the shoreline block access to water."),
+            }
          }
       },
 

data/tribes/initialization/frisians/units.lua

@@ -1612,8 +1612,12 @@ wl.Descriptions():new_tribe {
             lore_author = pgettext("frisians_building", "A hunter admiring a fisher"),
             -- TRANSLATORS: Purpose helptext for a Frisian production site: Fisher's House
             purpose = pgettext("frisians_building", "Fishes on the coast near the fisher’s house."),
-            -- TRANSLATORS: Note helptext for a Frisian production site: Fisher's House
-            note = pgettext("frisians_building", "The fisher’s house needs water full of fish within the work area."),
+            note = {
+               -- TRANSLATORS: Note helptext for a Frisian production site: Fisher's House, part 1
+               pgettext("frisians_building", "The fisher’s house needs water full of fish within the work area."),
+               -- TRANSLATORS: Note helptext for a Frisian production site: Fisher's House, part 2
+               pgettext("frisians_building", "Roads and trees along the shoreline block fishing."),
+            },
             -- TRANSLATORS: Performance helptext for a Frisian production site: Fisher's House
             performance = pgettext("frisians_building", "The fisher pauses %s before going to work again."):bformat(format_seconds(16))
          }
@@ -2161,8 +2165,12 @@ wl.Descriptions():new_tribe {
          helptexts = {
             -- TRANSLATORS: Purpose helptext for a Frisian production site: Ferry Yard
             purpose = pgettext("building", "Builds ferries."),
-            -- TRANSLATORS: Note helptext for a Frisian production site: Ferry Yard
-            note = pgettext("building", "Needs water nearby.")
+            note = {
+               -- TRANSLATORS: Note helptext for a Frisian production site: Ferry Yard, part 1
+               pgettext("building", "Needs water nearby. Be aware ferries carry wares only, no workers."),
+               -- TRANSLATORS: Note helptext for an Frisian production site: Ferry Yard, part 2
+               pgettext("building", "Roads and trees along the shoreline block access to water."),
+            }
          }
       },
       {
@@ -2173,7 +2181,13 @@ wl.Descriptions():new_tribe {
             -- TRANSLATORS: Lore author helptext for a Frisian production site: Shipyard
             lore_author = pgettext("frisians_building", "A shipwright who only constructed toy ships after being chid that his ships were too small"),
             -- TRANSLATORS: Purpose helptext for a Frisian production site: Shipyard
-            purpose = pgettext("building", "Constructs ships that are used for overseas colonization and for trading between ports.")
+            purpose = pgettext("building", "Constructs ships that are used for overseas colonization and for trading between ports."),
+            note = {
+               -- TRANSLATORS: Note helptext for a Frisian production site: Shipyard, part 1
+               pgettext("building", "Needs wide open water nearby."),
+               -- TRANSLATORS: Note helptext for a Frisian production site: Shipyard, part 2
+               pgettext("building", "Roads and trees along the shoreline block access to water."),
+            }
          }
       },
       {

po/scenario_tutorial01_basic_control.wmf/de.po

@@ -389,7 +389,7 @@ msgid ""
 "on a laptop with a touchpad. You can enable map movement with touchpad "
 "scrolling in the the Widelands main menu: Choose ‘Options’, then press ‘Edit"
 " keyboard and mouse actions’, and select the ‘Mouse Scrolling’ tab."
-msgstr ""
+msgstr "Es kann unkomfortabel sein, die Karte mit der rechten Maustaste zu bewegen, wenn du an einem Laptop mit Touchpad spielst. Du kannst die Kartenbewegung per Touchpadscrollen im Widelands Hauptmenü aktivieren: Wähle \"Optionen\", dann drücke \"Tastatur- und Mausaktionen ändern\", und wähle den \"Scrollen mit der Maus\" Reiter."
 
 #: ../../data/campaigns/tutorial01_basic_control.wmf/scripting/texts.lua:266
 msgid "Some Rocks Were Found"

po/tribes_encyclopedia/de.po

@@ -9841,7 +9841,7 @@ msgid ""
 "smithy. In combination with a wooden spear, it is the equipment to fit out "
 "young soldiers. Helmets are also used in training camps – together with food"
 " – to train soldiers from health level 0 to level 1."
-msgstr ""
+msgstr "Der Helm ist der Grundschutz eines Soldaten. Er wird in Rüstungsschmieden hergestellt. Zusammen mit einem Holzspeer ist er die Grundausrüstung für junge Soldaten. Helme werden auch in Ausbildungslagern – zusammen mit Nahrung – benötigt, um die Lebenspunkte der Soldaten von Stufe 0 auf 1 zu erhöhen."
 
 #. TRANSLATORS: Helptext for an Empire ware: Armor
 #: ../../data/tribes/initialization/empire/units.lua:569
@@ -14122,7 +14122,7 @@ msgid ""
 "If all needed wares are delivered in time, this building can produce one "
 "broadsword in %1$s on average, one double-edged sword in %2$s on average and"
 " one golden helmet in %3$s on average."
-msgstr ""
+msgstr "Wenn alle Waren pünktlich geliefert werden, kann dieses Gebäude ein Breitschwert durchschnittlich in %1$s, ein zweischneidiges Schwert durchschnittlich in %2$s und einen  goldenen Helm durchschnittlich in %3$s herstellen."
 
 #. TRANSLATORS: Lore helptext for a Frisian production site: Sewing Room
 #: ../../data/tribes/initialization/frisians/units.lua:1825