Merge lp:~widelands-dev/widelands/productivity-string-fixes into lp:widelands

[GunChleoc]

Some string fixes for the Frisian helptexts

- Got rid of empty translation strings
- Added 'on average' to productivity helptexts, to be consistent with the other tribes

[hessenfarmer (stephan-lutz)]

Changes Look good to me. Just one small question. Why did you insert the # sing after translators

[GunChleoc (gunchleoc)]

Our script to pick up Lua messages does not like it if there are translators' comments without translations.

Thanks for the review :)

@bunnybot merge

[hessenfarmer (stephan-lutz)]

ok understood. But shouldn't the # be removed if there is a helptext defined? see inline comment

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 3429. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/373541678.
Appveyor build 3234. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_productivity_string_fixes-3234.

[GunChleoc (gunchleoc)]

Yes they should. Strings are long enough though for this not to be
critical, so let's fix these as we go along?

Sgrìobh hessenfarmer na leanas 01/05/2018 aig 17:20:
> ok understood. But shouldn't the # be removed if there is a helptext defined? see inline comment
>
> Diff comments:
>
>>
>> === modified file 'data/tribes/buildings/productionsites/frisians/blacksmithy/helptexts.lua'
>> --- data/tribes/buildings/productionsites/frisians/blacksmithy/helptexts.lua 2018-02-17 15:41:29 +0000
>> +++ data/tribes/buildings/productionsites/frisians/blacksmithy/helptexts.lua 2018-04-28 06:28:06 +0000
>> @@ -20,5 +20,5 @@
>>
>> function building_helptext_performance()
>> -- TRANSLATORS#: Performance helptext for a building
>> - return pgettext("frisians_building", "The blacksmith needs %s to produce one tool."):bformat(ngettext("%d second", "%d seconds", 67):bformat(67))
>
> shouldn't the # sign after translators be removed as there is a helptext to translate?
>
>> + return pgettext("frisians_building", "The blacksmith needs %s on average to produce one tool."):bformat(ngettext("%d second", "%d seconds", 67):bformat(67))
>> end
>
>

--
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v2.0.22 (MingW32)

mQINBFNbSyEBEADh+uhohycnZgPPnyMs5pZQG6pKyLzFZoIKbVjY31ZoPZ2SdltB
elrwn6kFZkQiDx4K6nkZFHsPh8RMvWoFWg1rGiWkdsZessLFawraC8YEZDwtlaU5
SFXbE4+QnMfbPhe9tmC8Nbhec3dfV9zcXAhxc+zkIUsKFhSkpJ2Syvo9FCA/5adW
UZgWWKFwlSg4+/lrhJ6QJnldPlXfWcuEasKF7fjdafDIdS5hdKu8Lv+CiPQWvgsi
J2BDlZLzEZf3PD+NMujUbJa0nilD2ltu3/qRvR2f86YV6wRwt4E2OD8JJQOau4X2
Pg7vqkIbnB9rMiQ6T17rQ4rc80eesGCxQ6XOba9oa1eRRZDwY7HJtYwvPdw9HZaN
Lq2RRbGDGO0q7fxrzbp1WuNN+UXOA/pmVzWWczPfPHVcNIehGf3wQI+Vgh/qa+IZ
jLJ25I1Tv85cDzvv5gdtI8PR4JTfK6Db+gUJmsuIg2fmsljxA7OmeTgSPR7nEVq5
VlHYfx1T0uKlthWw/eDwlS44vTgm6HZzIdYqdPMPa/PU1U+WVuDejyDJTn/1TY78
oJMT/IixFR+N+smohhKASprewcsO2ClWGptSG0sRTiCrVHFD3Mt6SCVaxsQLHvek
KuNAUXhR2KSvYuqGT0Nv3bplN6svCp4CuAGZ3lyOIt/Sb7OFUwzcx2sOdwARAQAB
tC5Gw7JyYW0gbmEgR8OgaWRobGlnIDxmaW9zQGZvcmFtbmFnYWlkaGxpZy5uZXQ+
iQI5BBMBAgAjBQJTW0shAhsPBwsJCAcDAgEGFQgCCQoLBBYCAwECHgECF4AACgkQ
UHP09XBr75NHNBAAxv2C/G13Z1kCFOSOnbPpzqcIDcMuP7RK1Mv5XfOZLfqSw4le
gdDmZggX2/EBH6xFTXFPLSE6rVUKTkHLA7IY8D43GBtDWjcIyyuLnIjtR+LhRKCP
3/Sm8MyZMQvUH1CBpUXFNnP/HCR6xjm1Mog5kXxFeCR9PMjeEiobKXIVuMfuNlBD
WzoR2Nh+oroXLjZw3VMFewiCyhu4Pe7F3sLpVldiI3PBOyPQOBZ3HEIM490D/Lrh
rl3Wwmoug8j8rqkh/Fr+kKaToRJik4PkcxsfepzhMdNfCpr7I3jE5XQHzib5Ubv8
wsSaVNBG92NTnGKoAntWXBUaiDN84St9l+Zm/BgedRk+7wdESHBuOuFXoRc0yEjF
4tLOhyO9u5bYGQWHyJiwhbw51R8G+Kh3OPq/tr4KmsuueEI2v5cLkoDzwCpYyMnu
BfU8d0mt5eULbQCWcy7LYeQs6E+CEB+tPL3Qz2zaAAvwt7N2PLMjHf5Fcqj5LqrV
mzQfcB9zQFq9Rtld/IIIDkE1y/q/SNFYsFNW/u/bxWsu+lMOYtBco++O5DJhAq6t
7rJXUBirju50hhogHfBL2v6RG1b8/uiWm0m8713ZhiSvpr4Dd+V+DU9nPli5nTmU
En6gP7TTYJKETMf7O9i873Z8yG6zd0/fBzFyruS2KRTPV2GiVT6CI37gUtw=
=fcOW
-----END PGP PUBLIC KEY BLOCK-----

[hessenfarmer (stephan-lutz)]

Thanks, unfortunately Transifex still showed some empty strings for the ironmine and another mine as far as I remember

=== modified file 'data/tribes/buildings/militarysites/frisians/fortress/helptexts.lua'
--- data/tribes/buildings/militarysites/frisians/fortress/helptexts.lua	2018-01-22 13:40:13 +0000
+++ data/tribes/buildings/militarysites/frisians/fortress/helptexts.lua	2018-04-28 06:28:06 +0000
@@ -1,11 +1,14 @@
+-- This include can be removed when all help texts have been defined.
+include "tribes/scripting/help/global_helptexts.lua"
+
 function building_helptext_lore ()
-   -- TRANSLATORS: Lore helptext for a building
-   return pgettext ("frisians_building", "")
+   -- TRANSLATORS#: Lore helptext for a building
+   return no_lore_text_yet()
 end
 
 function building_helptext_lore_author ()
-   -- TRANSLATORS: Lore author helptext for a building
-   return pgettext ("frisians_building", "")
+   -- TRANSLATORS#: Lore author helptext for a building
+   return no_lore_author_text_yet()
 end
 
 function building_helptext_purpose()

=== modified file 'data/tribes/buildings/militarysites/frisians/outpost/helptexts.lua'
--- data/tribes/buildings/militarysites/frisians/outpost/helptexts.lua	2018-01-22 13:40:13 +0000
+++ data/tribes/buildings/militarysites/frisians/outpost/helptexts.lua	2018-04-28 06:28:06 +0000
@@ -1,11 +1,14 @@
+-- This include can be removed when all help texts have been defined.
+include "tribes/scripting/help/global_helptexts.lua"
+
 function building_helptext_lore ()
-   -- TRANSLATORS: Lore helptext for a building
-   return pgettext ("frisians_building", "")
+   -- TRANSLATORS#: Lore helptext for a building
+   return no_lore_text_yet()
 end
 
 function building_helptext_lore_author ()
-   -- TRANSLATORS: Lore author helptext for a building
-   return pgettext ("frisians_building", "")
+   -- TRANSLATORS#: Lore author helptext for a building
+   return no_lore_author_text_yet()
 end
 
 function building_helptext_purpose()

=== modified file 'data/tribes/buildings/militarysites/frisians/sentinel/helptexts.lua'
--- data/tribes/buildings/militarysites/frisians/sentinel/helptexts.lua	2018-01-22 13:40:13 +0000
+++ data/tribes/buildings/militarysites/frisians/sentinel/helptexts.lua	2018-04-28 06:28:06 +0000
@@ -1,11 +1,14 @@
+-- This include can be removed when all help texts have been defined.
+include "tribes/scripting/help/global_helptexts.lua"
+
 function building_helptext_lore ()
-   -- TRANSLATORS: Lore helptext for a building
-   return pgettext ("frisians_building", "")
+   -- TRANSLATORS#: Lore helptext for a building
+   return no_lore_text_yet()
 end
 
 function building_helptext_lore_author ()
-   -- TRANSLATORS: Lore author helptext for a building
-   return pgettext ("frisians_building", "")
+   -- TRANSLATORS#: Lore author helptext for a building
+   return no_lore_author_text_yet()
 end
 
 function building_helptext_purpose()

=== modified file 'data/tribes/buildings/militarysites/frisians/tower/helptexts.lua'
--- data/tribes/buildings/militarysites/frisians/tower/helptexts.lua	2018-01-22 13:40:13 +0000
+++ data/tribes/buildings/militarysites/frisians/tower/helptexts.lua	2018-04-28 06:28:06 +0000
@@ -1,11 +1,14 @@
+-- This include can be removed when all help texts have been defined.
+include "tribes/scripting/help/global_helptexts.lua"
+
 function building_helptext_lore ()
-   -- TRANSLATORS: Lore helptext for a building
-   return pgettext ("frisians_building", "")
+   -- TRANSLATORS#: Lore helptext for a building
+   return no_lore_text_yet()
 end
 
 function building_helptext_lore_author ()
-   -- TRANSLATORS: Lore author helptext for a building
-   return pgettext ("frisians_building", "")
+   -- TRANSLATORS#: Lore author helptext for a building
+   return no_lore_author_text_yet()
 end
 
 function building_helptext_purpose()

=== modified file 'data/tribes/buildings/militarysites/frisians/wooden_tower/helptexts.lua'
--- data/tribes/buildings/militarysites/frisians/wooden_tower/helptexts.lua	2018-01-22 13:40:13 +0000
+++ data/tribes/buildings/militarysites/frisians/wooden_tower/helptexts.lua	2018-04-28 06:28:06 +0000
@@ -1,11 +1,14 @@
+-- This include can be removed when all help texts have been defined.
+include "tribes/scripting/help/global_helptexts.lua"
+
 function building_helptext_lore ()
-   -- TRANSLATORS: Lore helptext for a building
-   return pgettext ("frisians_building", "")
+   -- TRANSLATORS#: Lore helptext for a building
+   return no_lore_text_yet()
 end
 
 function building_helptext_lore_author ()
-   -- TRANSLATORS: Lore author helptext for a building
-   return pgettext ("frisians_building", "")
+   -- TRANSLATORS#: Lore author helptext for a building
+   return no_lore_author_text_yet()
 end
 
 function building_helptext_purpose()

=== modified file 'data/tribes/buildings/productionsites/frisians/bakery/helptexts.lua'
--- data/tribes/buildings/productionsites/frisians/bakery/helptexts.lua	2018-02-17 15:41:29 +0000
+++ data/tribes/buildings/productionsites/frisians/bakery/helptexts.lua	2018-04-28 06:28:06 +0000
@@ -20,5 +20,5 @@
 
 function building_helptext_performance()
    -- TRANSLATORS#: Performance helptext for a building
-   return pgettext("frisians_building", "The bakery needs %s to produce one loaf of bread."):bformat(ngettext("%d second", "%d seconds", 40):bformat(40))
+   return pgettext("frisians_building", "The bakery needs %s on average to produce one loaf of bread."):bformat(ngettext("%d second", "%d seconds", 40):bformat(40))
 end

=== modified file 'data/tribes/buildings/productionsites/frisians/barracks/helptexts.lua'
--- data/tribes/buildings/productionsites/frisians/barracks/helptexts.lua	2018-04-03 14:47:34 +0000
+++ data/tribes/buildings/productionsites/frisians/barracks/helptexts.lua	2018-04-28 06:28:06 +0000
@@ -20,5 +20,5 @@
 
 function building_helptext_performance()
    -- #TRANSLATORS: Performance helptext for a building
-   return pgettext("frisians_building", "The barracks needs %s to recruit one soldier."):bformat(ngettext("%d second", "%d seconds", 30):bformat(30))
+   return pgettext("frisians_building", "The barracks needs %s on average to recruit one soldier."):bformat(ngettext("%d second", "%d seconds", 30):bformat(30))
 end

=== modified file 'data/tribes/buildings/productionsites/frisians/blacksmithy/helptexts.lua'
--- data/tribes/buildings/productionsites/frisians/blacksmithy/helptexts.lua	2018-02-17 15:41:29 +0000
+++ data/tribes/buildings/productionsites/frisians/blacksmithy/helptexts.lua	2018-04-28 06:28:06 +0000
@@ -20,5 +20,5 @@
 
 function building_helptext_performance()
    -- TRANSLATORS#: Performance helptext for a building
-   return pgettext("frisians_building", "The blacksmith needs %s to produce one tool."):bformat(ngettext("%d second", "%d seconds", 67):bformat(67))
+   return pgettext("frisians_building", "The blacksmith needs %s on average to produce one tool."):bformat(ngettext("%d second", "%d seconds", 67):bformat(67))
 end

=== modified file 'data/tribes/buildings/productionsites/frisians/brewery/helptexts.lua'
--- data/tribes/buildings/productionsites/frisians/brewery/helptexts.lua	2018-02-17 15:41:29 +0000
+++ data/tribes/buildings/productionsites/frisians/brewery/helptexts.lua	2018-04-28 06:28:06 +0000
@@ -20,5 +20,5 @@
 
 function building_helptext_performance()
    -- TRANSLATORS#: Performance helptext for a building
-   return pgettext("frisians_building", "The brewery needs %s to brew one mug of beer."):bformat(ngettext("%d second", "%d seconds", 60):bformat(60))
+   return pgettext("frisians_building", "The brewery needs %s on average to brew one mug of beer."):bformat(ngettext("%d second", "%d seconds", 60):bformat(60))
 end

=== modified file 'data/tribes/buildings/productionsites/frisians/brick_kiln/helptexts.lua'
--- data/tribes/buildings/productionsites/frisians/brick_kiln/helptexts.lua	2018-03-06 09:50:54 +0000
+++ data/tribes/buildings/productionsites/frisians/brick_kiln/helptexts.lua	2018-04-28 06:28:06 +0000
@@ -20,5 +20,5 @@
 
 function building_helptext_performance()
    -- TRANSLATORS#: Performance helptext for a building
-   return pgettext("frisians_building", "The brick kiln needs %s to produce two bricks."):bformat(ngettext("%d second", "%d seconds", 78):bformat(78))
+   return pgettext("frisians_building", "The brick kiln needs %s on average to produce two bricks."):bformat(ngettext("%d second", "%d seconds", 78):bformat(78))
 end

=== modified file 'data/tribes/buildings/productionsites/frisians/charcoal_kiln/helptexts.lua'
--- data/tribes/buildings/productionsites/frisians/charcoal_kiln/helptexts.lua	2018-01-22 13:40:13 +0000
+++ data/tribes/buildings/productionsites/frisians/charcoal_kiln/helptexts.lua	2018-04-28 06:28:06 +0000
@@ -20,5 +20,5 @@
 
 function building_helptext_performance()
    -- TRANSLATORS#: Performance helptext for a building
-   return pgettext("frisians_building", "The charcoal kiln needs %s to produce one coal."):bformat(ngettext("%d second", "%d seconds", 60):bformat(60))
+   return pgettext("frisians_building", "The charcoal kiln needs %s on average to produce one coal."):bformat(ngettext("%d second", "%d seconds", 60):bformat(60))
 end

=== modified file 'data/tribes/buildings/productionsites/frisians/coalmine/helptexts.lua'
--- data/tribes/buildings/productionsites/frisians/coalmine/helptexts.lua	2018-01-22 13:40:13 +0000
+++ data/tribes/buildings/productionsites/frisians/coalmine/helptexts.lua	2018-04-28 06:28:06 +0000
@@ -1,11 +1,14 @@
+-- This include can be removed when all help texts have been defined.
+include "tribes/scripting/help/global_helptexts.lua"
+
 function building_helptext_lore ()
-   -- TRANSLATORS: Lore helptext for a building
-   return pgettext ("frisians_building", "")
+   -- TRANSLATORS#: Lore helptext for a building
+   return no_lore_text_yet()
 end
 
 function building_helptext_lore_author ()
-   -- TRANSLATORS: Lore author helptext for a building
-   return pgettext ("frisians_building", "")
+   -- TRANSLATORS#: Lore author helptext for a building
+   return no_lore_author_text_yet()
 end
 
 function building_helptext_purpose()
@@ -20,5 +23,5 @@
 
 function building_helptext_performance()
    -- TRANSLATORS: Performance helptext for a building
-   return pgettext("frisians_building", "The coal mine needs %s to produce two pieces of coal."):bformat(ngettext("%d second", "%d seconds", 85):bformat(85))
+   return pgettext("frisians_building", "If the food supply is steady, the coal mine can produce two pieces of coal in %s on average."):bformat(ngettext("%d second", "%d seconds", 85):bformat(85))
 end

=== modified file 'data/tribes/buildings/productionsites/frisians/coalmine_deep/helptexts.lua'
--- data/tribes/buildings/productionsites/frisians/coalmine_deep/helptexts.lua	2018-01-22 13:40:13 +0000
+++ data/tribes/buildings/productionsites/frisians/coalmine_deep/helptexts.lua	2018-04-28 06:28:06 +0000
@@ -1,11 +1,14 @@
+-- This include can be removed when all help texts have been defined.
+include "tribes/scripting/help/global_helptexts.lua"
+
 function building_helptext_lore ()
-   -- TRANSLATORS: Lore helptext for a building
-   return pgettext ("frisians_building", "")
+   -- TRANSLATORS#: Lore helptext for a building
+   return no_lore_text_yet()
 end
 
 function building_helptext_lore_author ()
-   -- TRANSLATORS: Lore author helptext for a building
-   return pgettext ("frisians_building", "")
+   -- TRANSLATORS#: Lore author helptext for a building
+   return no_lore_author_text_yet()
 end
 
 function building_helptext_purpose()
@@ -20,5 +23,5 @@
 
 function building_helptext_performance()
    -- TRANSLATORS: Performance helptext for a building
-   return pgettext("frisians_building", "The deep coal mine needs %s to produce four pieces of coal."):bformat(ngettext("%d second", "%d seconds", 76):bformat(76))
+   return pgettext("frisians_building", "If the food supply is steady, the deep coal mine can produce four pieces of coal in %s on average."):bformat(ngettext("%d second", "%d seconds", 76):bformat(76))
 end

=== modified file 'data/tribes/buildings/productionsites/frisians/goldmine/helptexts.lua'
--- data/tribes/buildings/productionsites/frisians/goldmine/helptexts.lua	2018-01-22 13:40:13 +0000
+++ data/tribes/buildings/productionsites/frisians/goldmine/helptexts.lua	2018-04-28 06:28:06 +0000
@@ -1,11 +1,14 @@
+-- This include can be removed when all help texts have been defined.
+include "tribes/scripting/help/global_helptexts.lua"
+
 function building_helptext_lore ()
-   -- TRANSLATORS: Lore helptext for a building
-   return pgettext ("frisians_building", "")
+   -- TRANSLATORS#: Lore helptext for a building
+   return no_lore_text_yet()
 end
 
 function building_helptext_lore_author ()
-   -- TRANSLATORS: Lore author helptext for a building
-   return pgettext ("frisians_building", "")
+   -- TRANSLATORS#: Lore author helptext for a building
+   return no_lore_author_text_yet()
 end
 
 function building_helptext_purpose()
@@ -20,5 +23,5 @@
 
 function building_helptext_performance()
    -- TRANSLATORS: Performance helptext for a building
-   return pgettext("frisians_building", "The gold mine needs %s to produce one piece of gold ore."):bformat(ngettext("%d second", "%d seconds", 65):bformat(65))
+   return pgettext("frisians_building", "If the food supply is steady, the gold mine can produce one piece of gold ore in %s on average."):bformat(ngettext("%d second", "%d seconds", 65):bformat(65))
 end

=== modified file 'data/tribes/buildings/productionsites/frisians/goldmine_deep/helptexts.lua'
--- data/tribes/buildings/productionsites/frisians/goldmine_deep/helptexts.lua	2018-01-22 13:40:13 +0000
+++ data/tribes/buildings/productionsites/frisians/goldmine_deep/helptexts.lua	2018-04-28 06:28:06 +0000
@@ -1,11 +1,14 @@
+-- This include can be removed when all help texts have been defined.
+include "tribes/scripting/help/global_helptexts.lua"
+
 function building_helptext_lore ()
-   -- TRANSLATORS: Lore helptext for a building
-   return pgettext ("frisians_building", "")
+   -- TRANSLATORS#: Lore helptext for a building
+   return no_lore_text_yet()
 end
 
 function building_helptext_lore_author ()
-   -- TRANSLATORS: Lore author helptext for a building
-   return pgettext ("frisians_building", "")
+   -- TRANSLATORS#: Lore author helptext for a building
+   return no_lore_author_text_yet()
 end
 
 function building_helptext_purpose()
@@ -20,5 +23,5 @@
 
 function building_helptext_performance()
    -- TRANSLATORS: Performance helptext for a building
-   return pgettext("frisians_building", "The deep gold mine needs %s to produce two pieces of gold ore."):bformat(ngettext("%d second", "%d seconds", 76):bformat(76))
+   return pgettext("frisians_building", "If the food supply is steady, the deep gold mine can produce two pieces of gold ore in %s on average."):bformat(ngettext("%d second", "%d seconds", 76):bformat(76))
 end

=== modified file 'data/tribes/buildings/productionsites/frisians/ironmine/helptexts.lua'
--- data/tribes/buildings/productionsites/frisians/ironmine/helptexts.lua	2018-01-22 13:40:13 +0000
+++ data/tribes/buildings/productionsites/frisians/ironmine/helptexts.lua	2018-04-28 06:28:06 +0000
@@ -20,5 +20,5 @@
 
 function building_helptext_performance()
    -- TRANSLATORS: Performance helptext for a building
-   return pgettext("frisians_building", "The iron mine needs %s to produce one piece of iron ore."):bformat(ngettext("%d second", "%d seconds", 65):bformat(65))
+   return pgettext("frisians_building", "If the food supply is steady, the iron mine can produce one piece of iron ore in %s on average."):bformat(ngettext("%d second", "%d seconds", 65):bformat(65))
 end

=== modified file 'data/tribes/buildings/productionsites/frisians/ironmine_deep/helptexts.lua'
--- data/tribes/buildings/productionsites/frisians/ironmine_deep/helptexts.lua	2018-01-22 13:40:13 +0000
+++ data/tribes/buildings/productionsites/frisians/ironmine_deep/helptexts.lua	2018-04-28 06:28:06 +0000
@@ -1,11 +1,14 @@
+-- This include can be removed when all help texts have been defined.
+include "tribes/scripting/help/global_helptexts.lua"
+
 function building_helptext_lore ()
-   -- TRANSLATORS: Lore helptext for a building
-   return pgettext ("frisians_building", "")
+   -- TRANSLATORS#: Lore helptext for a building
+   return no_lore_text_yet()
 end
 
 function building_helptext_lore_author ()
-   -- TRANSLATORS: Lore author helptext for a building
-   return pgettext ("frisians_building", "")
+   -- TRANSLATORS#: Lore author helptext for a building
+   return no_lore_author_text_yet()
 end
 
 function building_helptext_purpose()
@@ -20,5 +23,5 @@
 
 function building_helptext_performance()
    -- TRANSLATORS: Performance helptext for a building
-   return pgettext("frisians_building", "The deep iron mine needs %s to produce two pieces of iron ore."):bformat(ngettext("%d second", "%d seconds", 76):bformat(76))
+   return pgettext("frisians_building", "If the food supply is steady, the deep iron mine can produce two pieces of iron ore in %s on average."):bformat(ngettext("%d second", "%d seconds", 76):bformat(76))
 end

=== modified file 'data/tribes/buildings/productionsites/frisians/rockmine/helptexts.lua'
--- data/tribes/buildings/productionsites/frisians/rockmine/helptexts.lua	2018-01-22 13:40:13 +0000
+++ data/tribes/buildings/productionsites/frisians/rockmine/helptexts.lua	2018-04-28 06:28:06 +0000
@@ -20,5 +20,5 @@
 
 function building_helptext_performance()
    -- TRANSLATORS: Performance helptext for a building
-   return pgettext("frisians_building", "The rock mine needs %s to produce two blocks of granite."):bformat(ngettext("%d second", "%d seconds", 85):bformat(85))
+   return pgettext("frisians_building", "If the food supply is steady, the rock mine can produce two blocks of granite in %s on average."):bformat(ngettext("%d second", "%d seconds", 85):bformat(85))
 end

=== modified file 'data/tribes/buildings/productionsites/frisians/rockmine_deep/helptexts.lua'
--- data/tribes/buildings/productionsites/frisians/rockmine_deep/helptexts.lua	2018-01-22 13:40:13 +0000
+++ data/tribes/buildings/productionsites/frisians/rockmine_deep/helptexts.lua	2018-04-28 06:28:06 +0000
@@ -1,11 +1,14 @@
-function building_helptext_lore()
-   -- TRANSLATORS: Lore helptext for a building
-   return pgettext ("frisians_building", "")
+-- This include can be removed when all help texts have been defined.
+include "tribes/scripting/help/global_helptexts.lua"
+
+function building_helptext_lore ()
+   -- TRANSLATORS#: Lore helptext for a building
+   return no_lore_text_yet()
 end
 
-function building_helptext_lore_author()
-   -- TRANSLATORS: Lore author helptext for a building
-   return pgettext ("frisians_building", "")
+function building_helptext_lore_author ()
+   -- TRANSLATORS#: Lore author helptext for a building
+   return no_lore_author_text_yet()
 end
 
 function building_helptext_purpose()
@@ -20,5 +23,5 @@
 
 function building_helptext_performance()
    -- TRANSLATORS: Performance helptext for a building
-   return pgettext("frisians_building", "The deep rock mine needs %s to produce three blocks of granite."):bformat(ngettext("%d second", "%d seconds", 76):bformat(76))
+   return pgettext("frisians_building", "If the food supply is steady, the deep rock mine can produce three blocks of granite in %s on average."):bformat(ngettext("%d second", "%d seconds", 76):bformat(76))
 end

=== modified file 'data/tribes/buildings/productionsites/frisians/sewing_room/helptexts.lua'
--- data/tribes/buildings/productionsites/frisians/sewing_room/helptexts.lua	2018-02-19 08:50:22 +0000
+++ data/tribes/buildings/productionsites/frisians/sewing_room/helptexts.lua	2018-04-28 06:28:06 +0000
@@ -20,5 +20,5 @@
 
 function building_helptext_performance()
    -- TRANSLATORS#: Performance helptext for a building
-   return pgettext("frisians_building", "The sewing room needs %s to produce one fur garment."):bformat(ngettext("%d second", "%d seconds", 45):bformat(45))
+   return pgettext("frisians_building", "The sewing room needs %s on average to produce one fur garment."):bformat(ngettext("%d second", "%d seconds", 45):bformat(45))
 end

=== modified file 'data/tribes/buildings/productionsites/frisians/smokery/helptexts.lua'
--- data/tribes/buildings/productionsites/frisians/smokery/helptexts.lua	2018-02-17 15:41:29 +0000
+++ data/tribes/buildings/productionsites/frisians/smokery/helptexts.lua	2018-04-28 06:28:06 +0000
@@ -20,5 +20,5 @@
 
 function building_helptext_performance()
    -- TRANSLATORS#: Performance helptext for a building
-   return pgettext("frisians_building", "The smokery needs %s to smoke two fish or two meat."):bformat(ngettext("%d second", "%d seconds", 46):bformat(46))
+   return pgettext("frisians_building", "The smokery needs %s on average to smoke two fish or two meat."):bformat(ngettext("%d second", "%d seconds", 46):bformat(46))
 end

=== modified file 'data/tribes/buildings/productionsites/frisians/weaving_mill/helptexts.lua'
--- data/tribes/buildings/productionsites/frisians/weaving_mill/helptexts.lua	2018-04-06 06:43:31 +0000
+++ data/tribes/buildings/productionsites/frisians/weaving_mill/helptexts.lua	2018-04-28 06:28:06 +0000
@@ -20,5 +20,5 @@
 
 function building_helptext_performance()
    -- TRANSLATORS#: Performance helptext for a building
-   return pgettext("frisians_building", "The weaving mill needs %s to produce one piece of cloth."):bformat(ngettext("%d second", "%d seconds", 45):bformat(45))
+   return pgettext("frisians_building", "The weaving mill needs %s on average to produce one piece of cloth."):bformat(ngettext("%d second", "%d seconds", 45):bformat(45))
 end

=== modified file 'data/tribes/buildings/productionsites/frisians/well/helptexts.lua'
--- data/tribes/buildings/productionsites/frisians/well/helptexts.lua	2018-02-17 15:41:29 +0000
+++ data/tribes/buildings/productionsites/frisians/well/helptexts.lua	2018-04-28 06:28:06 +0000
@@ -15,5 +15,5 @@
 
 function building_helptext_performance()
    -- TRANSLATORS: Performance helptext for a building
-   return pgettext("frisians_building", "The well needs %s to produce one bucket of water."):bformat(ngettext("%d second", "%d seconds", 40):bformat(40))
+   return pgettext("frisians_building", "The well needs %s on average to produce one bucket of water."):bformat(ngettext("%d second", "%d seconds", 40):bformat(40))
 end

=== modified file 'data/tribes/buildings/warehouses/frisians/headquarters/helptexts.lua'
--- data/tribes/buildings/warehouses/frisians/headquarters/helptexts.lua	2018-01-22 13:40:13 +0000
+++ data/tribes/buildings/warehouses/frisians/headquarters/helptexts.lua	2018-04-28 06:28:06 +0000
@@ -1,11 +1,14 @@
+-- This include can be removed when all help texts have been defined.
+include "tribes/scripting/help/global_helptexts.lua"
+
 function building_helptext_lore ()
-   -- TRANSLATORS: Lore helptext for a building
-   return pgettext ("frisians_building", "")
+   -- TRANSLATORS#: Lore helptext for a building
+   return no_lore_text_yet()
 end
 
 function building_helptext_lore_author ()
-   -- TRANSLATORS: Lore author helptext for a building
-   return pgettext ("frisians_building", "")
+   -- TRANSLATORS#: Lore author helptext for a building
+   return no_lore_author_text_yet()
 end
 
 function building_helptext_purpose()

=== modified file 'data/tribes/buildings/warehouses/frisians/port/helptexts.lua'
--- data/tribes/buildings/warehouses/frisians/port/helptexts.lua	2018-01-22 13:40:13 +0000
+++ data/tribes/buildings/warehouses/frisians/port/helptexts.lua	2018-04-28 06:28:06 +0000
@@ -1,11 +1,14 @@
+-- This include can be removed when all help texts have been defined.
+include "tribes/scripting/help/global_helptexts.lua"
+
 function building_helptext_lore ()
-   -- TRANSLATORS: Lore helptext for a building
-   return pgettext ("frisians_building", "")
+   -- TRANSLATORS#: Lore helptext for a building
+   return no_lore_text_yet()
 end
 
 function building_helptext_lore_author ()
-   -- TRANSLATORS: Lore author helptext for a building
-   return pgettext ("frisians_building", "")
+   -- TRANSLATORS#: Lore author helptext for a building
+   return no_lore_author_text_yet()
 end
 
 function building_helptext_purpose()

=== modified file 'data/tribes/buildings/warehouses/frisians/warehouse/helptexts.lua'
--- data/tribes/buildings/warehouses/frisians/warehouse/helptexts.lua	2018-01-22 13:40:13 +0000
+++ data/tribes/buildings/warehouses/frisians/warehouse/helptexts.lua	2018-04-28 06:28:06 +0000
@@ -1,11 +1,14 @@
+-- This include can be removed when all help texts have been defined.
+include "tribes/scripting/help/global_helptexts.lua"
+
 function building_helptext_lore ()
-   -- TRANSLATORS: Lore helptext for a building
-   return pgettext ("frisians_building", "")
+   -- TRANSLATORS#: Lore helptext for a building
+   return no_lore_text_yet()
 end
 
 function building_helptext_lore_author ()
-   -- TRANSLATORS: Lore author helptext for a building
-   return pgettext ("frisians_building", "")
+   -- TRANSLATORS#: Lore author helptext for a building
+   return no_lore_author_text_yet()
 end
 
 function building_helptext_purpose()