GunChleoc has proposed merging lp:~widelands-dev/widelands/fh1-finish_help into
lp:widelands.
Commit message:
Converted the Tribal Encyclopedia to the new font renderer.
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/fh1-finish_help/+merge/335708
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/fh1-finish_help into lp:widelands.
=== modified file 'data/scripting/richtext.lua'
--- data/scripting/richtext.lua 2017-12-27 14:25:35 +
+++ data/scripting/richtext.lua 2018-01-04 15:35:20 +
@@ -436,6 +436,7 @@
--
function inline_header(header, text)
return
- div("width=100%", font("size=13 color=D1D1D1", header .. " ") ..
+ div("width=100%", vspace(8)) ..
+ div("width=100%", font("size=13 color=D1D1D1", header .. " ") ..
font("size=12", text))
end
=== modified file 'data/tribes/buildings/productionsites/barbarians/coalmine/helptexts.lua'
--- data/tribes/buildings/productionsites/barbarians/coalmine/helptexts.lua 2016-04-15 16:46:20 +
+++ data/tribes/buildings/productionsites/barbarians/coalmine/helptexts.lua 2018-01-04 15:35:20 +
@@ -1,7 +1,10 @@
function building_helptext_lore()
- -- TRANSLATORS#: Lore helptext for a building
- return pgettext("barbarians_building", [[Ages ago, the Barbarians learned to delve into mountainsides for that black material that feeds their furnaces.
-Wood may serve for a household fire and to keep you warm, but when it comes to working with iron or gold, there is no way around coal.]])
+ return {
+ -- TRANSLATORS: Lore helptext for a coal mine building, part 1
+ pgettext("barbarians_building", "Ages ago, the Barbarians learned to delve into mountainsides for that black material that feeds their furnaces."),
+ -- TRANSLATORS: Lore helptext for a coal mine building, part 2
+ pgettext("barbarians_building", "Wood may serve for a household fire and to keep you warm, but when it comes to working with iron or gold, there is no way around coal.")
+ }
end
function building_helptext_lore_author()
@@ -10,7 +13,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/barbarians/coalmine_deep/helptexts.lua'
--- data/tribes/buildings/productionsites/barbarians/coalmine_deep/helptexts.lua 2016-04-15 16:46:20 +
+++ data/tribes/buildings/productionsites/barbarians/coalmine_deep/helptexts.lua 2018-01-04 15:35:20 +
@@ -1,7 +1,10 @@
function building_helptext_lore()
- -- TRANSLATORS#: Lore helptext for a building
- return pgettext("barbarians_building", [[Ages ago, the Barbarians learned to delve into mountainsides for that black material that feeds their furnaces.
-Wood may serve for a household fire and to keep you warm, but when it comes to working with iron or gold, there is no way around coal.]])
+ return {
+ -- TRANSLATORS: Lore helptext for a coal mine building, part 1
+ pgettext("barbarians_building", "Ages ago, the Barbarians learned to delve into mountainsides for that black material that feeds their furnaces."),
+ -- TRANSLATORS: Lore helptext for a coal mine building, part 2
+ pgettext("barbarians_building", "Wood may serve for a household fire and to keep you warm, but when it comes to working with iron or gold, there is no way around coal.")
+ }
end
function building_helptext_lore_author()
@@ -10,7 +13,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/barbarians/coalmine_deeper/helptexts.lua'
--- data/tribes/buildings/productionsites/barbarians/coalmine_deeper/helptexts.lua 2016-04-15 16:46:20 +
+++ data/tribes/buildings/productionsites/barbarians/coalmine_deeper/helptexts.lua 2018-01-04 15:35:20 +
@@ -1,7 +1,10 @@
function building_helptext_lore()
- -- TRANSLATORS#: Lore helptext for a building
- return pgettext("barbarians_building", [[Ages ago, the Barbarians learned to delve into mountainsides for that black material that feeds their furnaces.
-Wood may serve for a household fire and to keep you warm, but when it comes to working with iron or gold, there is no way around coal.]])
+ return {
+ -- TRANSLATORS: Lore helptext for a coal mine building, part 1
+ pge