widelands-dev team mailing list archive

[hessenfarmer <stephan-lutz@xxxxxx>]

hessenfarmer has proposed merging lp:~widelands-dev/widelands/translators-fix-bug-1768859 into lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #1768859 in widelands: "Remove # from translators' comments in Frisian texts"
  https://bugs.launchpad.net/widelands/+bug/1768859

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/translators-fix-bug-1768859/+merge/345116
-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/translators-fix-bug-1768859 into lp:widelands.

=== modified file 'data/tribes/buildings/productionsites/atlanteans/barracks/helptexts.lua'
--- data/tribes/buildings/productionsites/atlanteans/barracks/helptexts.lua	2017-01-21 09:39:55 +0000
+++ data/tribes/buildings/productionsites/atlanteans/barracks/helptexts.lua	2018-05-04 21:46:51 +0000
@@ -12,7 +12,7 @@
 end
 
 function building_helptext_purpose()
-   -- #TRANSLATORS: Purpose helptext for a building
+   -- TRANSLATORS: Purpose helptext for a building
    return pgettext("atlanteans_building", "Equips recruits and trains them as soldiers.")
 end
 

=== modified file 'data/tribes/buildings/productionsites/atlanteans/mill/helptexts.lua'
--- data/tribes/buildings/productionsites/atlanteans/mill/helptexts.lua	2016-11-30 07:04:33 +0000
+++ data/tribes/buildings/productionsites/atlanteans/mill/helptexts.lua	2018-05-04 21:46:51 +0000
@@ -12,7 +12,7 @@
 end
 
 function building_helptext_purpose()
- -- TRANSLATORS: Purpose helptext for a building
+   -- TRANSLATORS: Purpose helptext for a building
    return pgettext("atlanteans_building", "Grinds blackroots and corn to produce blackroot flour and cornmeal, respectively.")
 end
 

=== modified file 'data/tribes/buildings/productionsites/barbarians/barracks/helptexts.lua'
--- data/tribes/buildings/productionsites/barbarians/barracks/helptexts.lua	2017-01-21 09:39:55 +0000
+++ data/tribes/buildings/productionsites/barbarians/barracks/helptexts.lua	2018-05-04 21:46:51 +0000
@@ -12,7 +12,7 @@
 end
 
 function building_helptext_purpose()
-   -- #TRANSLATORS: Purpose helptext for a building
+   -- TRANSLATORS: Purpose helptext for a building
    return pgettext("barbarians_building", "Equips recruits and trains them as soldiers.")
 end
 

=== modified file 'data/tribes/buildings/productionsites/empire/barracks/helptexts.lua'
--- data/tribes/buildings/productionsites/empire/barracks/helptexts.lua	2017-01-21 10:49:37 +0000
+++ data/tribes/buildings/productionsites/empire/barracks/helptexts.lua	2018-05-04 21:46:51 +0000
@@ -12,7 +12,7 @@
 end
 
 function building_helptext_purpose()
-   -- #TRANSLATORS: Purpose helptext for a building
+   -- TRANSLATORS: Purpose helptext for a building
    return pgettext("empire_building", "Equips recruits and trains them as soldiers.")
 end
 

=== modified file 'data/tribes/buildings/productionsites/frisians/bakery/helptexts.lua'
--- data/tribes/buildings/productionsites/frisians/bakery/helptexts.lua	2018-04-25 07:55:28 +0000
+++ data/tribes/buildings/productionsites/frisians/bakery/helptexts.lua	2018-05-04 21:46:51 +0000
@@ -19,6 +19,6 @@
 end
 
 function building_helptext_performance()
-   -- TRANSLATORS#: Performance helptext for a building
+   -- TRANSLATORS: Performance helptext for a building
    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-25 07:55:28 +0000
+++ data/tribes/buildings/productionsites/frisians/barracks/helptexts.lua	2018-05-04 21:46:51 +0000
@@ -9,16 +9,16 @@
 end
 
 function building_helptext_purpose()
-   -- #TRANSLATORS: Purpose helptext for a building
+   -- TRANSLATORS: Purpose helptext for a building
    return pgettext("frisians_building", "Equips recruits and trains them as soldiers.")
 end
 
 function building_helptext_note()
-   -- #TRANSLATORS: Note helptext for a building
+   -- TRANSLATORS#: Note helptext for a building
    return ""
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
+   -- TRANSLATORS: Performance helptext for a building
    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-04-25 07:55:28 +0000
+++ data/tribes/buildings/productionsites/frisians/blacksmithy/helptexts.lua	2018-05-04 21:46:51 +0000
@@ -19,6 +19,6 @@
 end
 
 function building_helptext_performance()
-   -- TRANSLATORS#: Performance helptext for a building
+   -- TRANSLATORS: Performance helptext for a building
    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-04-25 07:55:28 +0000
+++ data/tribes/buildings/productionsites/frisians/brewery/helptexts.lua	2018-05-04 21:46:51 +0000
@@ -19,6 +19,6 @@
 end
 
 function building_helptext_performance()
-   -- TRANSLATORS#: Performance helptext for a building
+   -- TRANSLATORS: Performance helptext for a building
    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-04-25 07:55:28 +0000
+++ data/tribes/buildings/productionsites/frisians/brick_kiln/helptexts.lua	2018-05-04 21:46:51 +0000
@@ -19,6 +19,6 @@
 end
 
 function building_helptext_performance()
-   -- TRANSLATORS#: Performance helptext for a building
+   -- TRANSLATORS: Performance helptext for a building
    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-04-25 07:55:28 +0000
+++ data/tribes/buildings/productionsites/frisians/charcoal_kiln/helptexts.lua	2018-05-04 21:46:51 +0000
@@ -19,6 +19,6 @@
 end
 
 function building_helptext_performance()
-   -- TRANSLATORS#: Performance helptext for a building
+   -- TRANSLATORS: Performance helptext for a building
    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-04-27 17:02:13 +0000
+++ data/tribes/buildings/productionsites/frisians/coalmine/helptexts.lua	2018-05-04 21:46:51 +0000
@@ -12,7 +12,7 @@
 end
 
 function building_helptext_purpose()
-   -- TRANSLATORS#: Purpose helptext for a building
+   -- TRANSLATORS: Purpose helptext for a building
    return pgettext("building", "Digs coal out of the ground in mountain terrain.")
 end
 

=== modified file 'data/tribes/buildings/productionsites/frisians/goldmine/helptexts.lua'
--- data/tribes/buildings/productionsites/frisians/goldmine/helptexts.lua	2018-04-27 17:02:13 +0000
+++ data/tribes/buildings/productionsites/frisians/goldmine/helptexts.lua	2018-05-04 21:46:51 +0000
@@ -12,7 +12,7 @@
 end
 
 function building_helptext_purpose()
-   -- TRANSLATORS#: Purpose helptext for a building
+   -- TRANSLATORS: Purpose helptext for a building
    return pgettext("building", "Digs gold ore out of the ground in mountain terrain.")
 end
 

=== modified file 'data/tribes/buildings/productionsites/frisians/recycling_center/helptexts.lua'
--- data/tribes/buildings/productionsites/frisians/recycling_center/helptexts.lua	2018-04-03 14:47:34 +0000
+++ data/tribes/buildings/productionsites/frisians/recycling_center/helptexts.lua	2018-05-04 21:46:51 +0000
@@ -12,16 +12,16 @@
 end
 
 function building_helptext_purpose()
-   -- #TRANSLATORS: Purpose helptext for a building
+   -- TRANSLATORS: Purpose helptext for a building
    return pgettext("frisians_building", "Recycles old armor and weapon parts that have been discarded by training sites into fur, iron and gold.")
 end
 
 function building_helptext_note()
-   -- #TRANSLATORS: Note helptext for a building
+   -- TRANSLATORS#: Note helptext for a building
    return ""
 end
 
 function building_helptext_performance()
-   -- #TRANSLATORS: Performance helptext for a building
+   -- TRANSLATORS#: Performance helptext for a building
    return no_performance_text_yet()
 end

=== modified file 'data/tribes/buildings/productionsites/frisians/rockmine/helptexts.lua'
--- data/tribes/buildings/productionsites/frisians/rockmine/helptexts.lua	2018-05-02 09:56:12 +0000
+++ data/tribes/buildings/productionsites/frisians/rockmine/helptexts.lua	2018-05-04 21:46:51 +0000
@@ -12,7 +12,7 @@
 end
 
 function building_helptext_purpose()
-   -- TRANSLATORS#: Purpose helptext for a building
+   -- TRANSLATORS: Purpose helptext for a building
    return pgettext("building", "Digs granite out of the ground in mountain terrain.")
 end
 

=== modified file 'data/tribes/buildings/productionsites/frisians/scouts_house/helptexts.lua'
--- data/tribes/buildings/productionsites/frisians/scouts_house/helptexts.lua	2018-04-06 06:43:31 +0000
+++ data/tribes/buildings/productionsites/frisians/scouts_house/helptexts.lua	2018-05-04 21:46:51 +0000
@@ -19,6 +19,6 @@
 end
 
 function building_helptext_performance()
-   -- TRANSLATORS#: Performance helptext for a building
+   -- TRANSLATORS: Performance helptext for a building
    return pgettext("frisians_building", "The scout pauses %s before going to work again."):bformat(ngettext("%d second", "%d seconds", 30):bformat(30))
 end

=== modified file 'data/tribes/buildings/productionsites/frisians/sewing_room/helptexts.lua'
--- data/tribes/buildings/productionsites/frisians/sewing_room/helptexts.lua	2018-04-25 07:55:28 +0000
+++ data/tribes/buildings/productionsites/frisians/sewing_room/helptexts.lua	2018-05-04 21:46:51 +0000
@@ -19,6 +19,6 @@
 end
 
 function building_helptext_performance()
-   -- TRANSLATORS#: Performance helptext for a building
+   -- TRANSLATORS: Performance helptext for a building
    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-04-25 07:55:28 +0000
+++ data/tribes/buildings/productionsites/frisians/smokery/helptexts.lua	2018-05-04 21:46:51 +0000
@@ -19,6 +19,6 @@
 end
 
 function building_helptext_performance()
-   -- TRANSLATORS#: Performance helptext for a building
+   -- TRANSLATORS: Performance helptext for a building
    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/tavern/helptexts.lua'
--- data/tribes/buildings/productionsites/frisians/tavern/helptexts.lua	2018-05-02 10:12:31 +0000
+++ data/tribes/buildings/productionsites/frisians/tavern/helptexts.lua	2018-05-04 21:46:51 +0000
@@ -19,6 +19,6 @@
 end
 
 function building_helptext_performance()
-   -- TRANSLATORS#: Performance helptext for a building
+   -- TRANSLATORS: Performance helptext for a building
    return pgettext("frisians_building", "The tavern can produce one ration in %s on average if the supply is steady; otherwise, it will take 50%% longer."):bformat(ngettext("%d second", "%d seconds", 33):bformat(33))
 end

=== modified file 'data/tribes/buildings/productionsites/frisians/weaving_mill/helptexts.lua'
--- data/tribes/buildings/productionsites/frisians/weaving_mill/helptexts.lua	2018-05-02 10:12:31 +0000
+++ data/tribes/buildings/productionsites/frisians/weaving_mill/helptexts.lua	2018-05-04 21:46:51 +0000
@@ -19,6 +19,6 @@
 end
 
 function building_helptext_performance()
-   -- TRANSLATORS#: Performance helptext for a building
+   -- TRANSLATORS: Performance helptext for a building
    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/trainingsites/frisians/training_arena/helptexts.lua'
--- data/tribes/buildings/trainingsites/frisians/training_arena/helptexts.lua	2018-02-17 15:41:29 +0000
+++ data/tribes/buildings/trainingsites/frisians/training_arena/helptexts.lua	2018-05-04 21:46:51 +0000
@@ -22,6 +22,6 @@
 end
 
 function building_helptext_performance()
-   -- TRANSLATORS: Performance helptext for a building. Placeholders are for "4 minutes" and "40 seconds"
+   -- TRANSLATORS#: Performance helptext for a building. Placeholders are for "4 minutes" and "40 seconds"
    return no_performance_text_yet ()
 end

=== modified file 'data/tribes/buildings/warehouses/frisians/headquarters/helptexts.lua'
--- data/tribes/buildings/warehouses/frisians/headquarters/helptexts.lua	2018-04-27 17:02:13 +0000
+++ data/tribes/buildings/warehouses/frisians/headquarters/helptexts.lua	2018-05-04 21:46:51 +0000
@@ -18,11 +18,10 @@
 
 function building_helptext_note()
    -- TRANSLATORS: Note helptext for a building
-   return
-      pgettext ("frisians_building", "The headquarters is your main building.")
+   return pgettext ("frisians_building", "The headquarters is your main building.")
 end
 
 function building_helptext_performance()
    -- TRANSLATORS#: Performance helptext for a building
-   return ""
+   return no_performance_text_yet ()
 end

=== modified file 'data/tribes/buildings/warehouses/frisians/port/helptexts.lua'
--- data/tribes/buildings/warehouses/frisians/port/helptexts.lua	2018-04-27 17:02:13 +0000
+++ data/tribes/buildings/warehouses/frisians/port/helptexts.lua	2018-05-04 21:46:51 +0000
@@ -23,5 +23,5 @@
 
 function building_helptext_performance()
    -- TRANSLATORS#: Performance helptext for a building
-   return ""
+   return no_performance_text_yet ()
 end

=== modified file 'data/tribes/buildings/warehouses/frisians/warehouse/helptexts.lua'
--- data/tribes/buildings/warehouses/frisians/warehouse/helptexts.lua	2018-04-27 17:02:13 +0000
+++ data/tribes/buildings/warehouses/frisians/warehouse/helptexts.lua	2018-05-04 21:46:51 +0000
@@ -23,5 +23,5 @@
 
 function building_helptext_performance()
    -- TRANSLATORS#: Performance helptext for a building
-   return ""
+   return no_performance_text_yet ()
 end

=== modified file 'data/tribes/wares/meal/helptexts.lua'
--- data/tribes/wares/meal/helptexts.lua	2017-07-07 16:51:39 +0000
+++ data/tribes/wares/meal/helptexts.lua	2018-05-04 21:46:51 +0000
@@ -5,7 +5,7 @@
       -- TRANSLATORS: Helptext for a ware: Meal
       empire = pgettext("empire_ware", "A real meal is made in inns out of bread and fish/meat. It satisfies the needs of miners in deep mines."),
       -- TRANSLATORS: Helptext for a ware: Meal
-      frisians = pgettext("frisians_ware", "A meal is made out of honey bread, mead and either fruit or smoked fish or meat. It is consumed by miners in deep mines.")
+      frisians = pgettext("frisians_ware", "A meal is made out of honey bread and beer and either smoked fish or meat. It is consumed by miners in deep mines.")
    }
    local result = ""
    if tribe then

=== modified file 'data/tribes/wares/ration/helptexts.lua'
--- data/tribes/wares/ration/helptexts.lua	2018-05-02 10:12:31 +0000
+++ data/tribes/wares/ration/helptexts.lua	2018-05-04 21:46:51 +0000
@@ -7,7 +7,7 @@
       -- TRANSLATORS: Helptext for a ware: Ration
       empire = pgettext("empire_ware", "Rations are produced in a tavern out of fish or meat or bread."),
       -- TRANSLATORS: Helptext for a ware: Ration
-      frisians = pgettext("frisians_ware", "Rations are produced in taverns and drinking halls out of beer and something to eat: Fruit, smoked meat or fish or bread.")
+      frisians = pgettext("frisians_ware", "Rations are produced in taverns and drinking halls out of something to eat: Fruit, bread or smoked meat or fish.")
    }
    local result = ""
    if tribe then