widelands-dev team mailing list archive

[GunChleoc <fios@xxxxxxxxxxxxxxxxxxx>]

Some nits for the strings + variable names

Diff comments:

> 
> === modified file 'data/campaigns/fri01.wmf/scripting/texts.lua'
> --- data/campaigns/fri01.wmf/scripting/texts.lua	2018-07-24 11:09:41 +0000
> +++ data/campaigns/fri01.wmf/scripting/texts.lua	2018-09-28 14:41: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. The "Schauenburger" and "Holsteiner" are dukedoms.
> +      _([[My tribe and I have just arrived from the mainland. There were fights with the Danes in the North, the Schauenburgians 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.]])),

We're in string freeze - please postpone this change to Build 21. We can only accept string changes that are absolutely necessary to fix a bug at this point.

I already have a branch up that you can use: https://code.launchpad.net/~widelands-dev/widelands/localization-post-build20

>  }
>  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.]])),

Please postpone

>  }
>  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.]])

Please postpone

>        .. 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.]])
> @@ -405,6 +405,12 @@
>        _([[The storm flood seems to be coming from the west. If we hurry, we will just make it! We only need to build a port and a shipyard – oh, and a weaving mill to weave the durable cloth, which is made from reed and fur, for the sails. Then we can launch an expedition from the port. Pray to the gods and make haste!]]))
>        .. new_objectives(obj_escape),
>  }
> +rising_water_5 = {
> +   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 sails!]])),

set sails -> set sail

> +}
>  
>  victory_1 = {
>     title =_ "Victory",
> 
> === modified file 'data/campaigns/fri02.wmf/scripting/mission_thread.lua'
> --- data/campaigns/fri02.wmf/scripting/mission_thread.lua	2018-04-15 18:24:47 +0000
> +++ data/campaigns/fri02.wmf/scripting/mission_thread.lua	2018-09-28 14:41:56 +0000
> @@ -99,13 +102,56 @@
>     set_objective_done(o)
>  
>     o = add_campaign_objective(obj_supply_murilius)
> +   local o_s = add_campaign_objective(obj_scout)

Can you make the names for these longer, so we will instantly know what they mean?

o_scout
o_poem

> +   local o_p = nil
>     local choice = ""
> +   sleep(30000) -- give the player some time to account for nearly completed buildings
>     local milbld = count_military_buildings_p1()
> +   local scout = nil
>     while choice == "" do
> -      sleep(2791)
> +      sleep(791)
> +
> +      local milsites = count_military_buildings_p1()
> +      if o_p and milsites < milbld then
> +         -- the player has dismantled a militarysite, so we assume he understood the poem
> +         set_objective_done(o_p)
> +         o_p = nil
> +      end
> +
> +      if o_s and not scout then
> +         -- let's see if a scout is spying in Murilius's territory
> +         for i,house in pairs(p1:get_buildings("frisians_scouts_house")) do
> +            for j,field in pairs(house.fields[1]:region(17)) do -- the scout has a radius of 15
> +               for k,bob in pairs(field.bobs) do
> +                  if bob.descr.name == "frisians_scout" and
> +                        field.owner == p2 and
> +                        field.brn.owner == p2 and
> +                        field.bln.owner == p2 and
> +                        field.trn.owner == p2 and
> +                        field.tln.owner == p2 and
> +                        field.rn.owner == p2 and
> +                        field.ln.owner == p2 then
> +                     scout = bob
> +                     break
> +                  end
> +               end
> +               if scout then break end
> +            end
> +            if scout then break end
> +         end
> +      elseif o_s and scout then
> +         if scout.field.immovable and scout.field.immovable.descr.name == "frisians_scouts_house" then
> +            set_objective_done(o_s)
> +            campaign_message_box(expansion_hint)
> +            o_p = add_campaign_objective(obj_poem)
> +            o_s = nil
> +            scout = nil
> +         end
> +      end
> +
>        if #(p1:get_buildings("frisians_warehouse_empire")) < 1 then
>           choice = "destroy"
> -      elseif count_military_buildings_p1() > milbld then
> +      elseif milsites > milbld then
>           -- It *is* permitted to destroy/dismantle a military building and build a new one elsewhere
>           choice = "military"
>        else
> 
> === modified file 'data/campaigns/fri02.wmf/scripting/texts.lua'
> --- data/campaigns/fri02.wmf/scripting/texts.lua	2018-05-07 05:29:12 +0000
> +++ data/campaigns/fri02.wmf/scripting/texts.lua	2018-09-28 14:41:56 +0000
> @@ -247,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.]])),

Please postpone

>  }
>  supply_murilius_5 = {
>     title =_ "We Are Not Alone",
> @@ -291,7 +318,34 @@
>        _([[This is the greatest outrage of all. How dare he order us to stop expanding our territory when all we want is to build a new home, and threaten us with war if we refuse to be his slaves?]])
>        .. paragraphdivider() ..
>        -- TRANSLATORS: Reebaud – Supply Murilius 9
> -      _([[I’d like to say we should attack him right now, but I fear we aren’t strong enough yet to hold our own against him in battle. We should hurry our soldier training while pretending to be gathering his so-called gift. That would buy us some time. As for expansion – I wonder how strictly he can possibly control us…]])),
> +      _([[I’d like to say we should attack him right now, but I fear we aren’t strong enough yet to hold our own against him in battle. We should hurry our soldier training while pretending to be gathering his so-called gift. That would buy us some time.]])
> +      .. paragraphdivider() ..
> +      -- TRANSLATORS: Reebaud – Supply Murilius 9
> +      _([[As for expansion – I wonder how strictly he can possibly control us. Perhaps we should send a scout to spy on him…]]))
> +      .. new_objectives(obj_scout),
> +}
> +
> +expansion_hint = {
> +   title =_ "The Scout Discovered Something",
> +   body=hauke(_"Our scout returned",
> +      -- TRANSLATORS: Hauke – Expansion hint
> +      _([[Chieftain Reebaud! Our scout just returned. He has found a poem in the strange tongue this Proconsule speaks. With some difficulty, I have translated it into our language. If I did not mistranslate, it runs as follows:]])

Proconsule -> Proconsul

> +      .. paragraphdivider() ..
> +      -- TRANSLATORS: Hauke – Expansion hint. A poem, verse 1
> +      space(10) .. (_([[How many sites where soldiers stay,]]))
> +      .. paragraphdivider() ..
> +      -- TRANSLATORS: Hauke – Expansion hint. A poem, verse 2
> +      space(10) .. (_([[How many sites where thou hold’st sway,]]))
> +      .. paragraphdivider() ..
> +      -- TRANSLATORS: Hauke – Expansion hint. A poem, verse 3
> +      space(10) .. (_([[Though not their whereabouts sees he]]))
> +      .. paragraphdivider() ..
> +      -- TRANSLATORS: Hauke – Expansion hint. A poem, verse 4
> +      space(10) .. (_([[Who’s ordering around here thee!]]))
> +      .. paragraphdivider() ..
> +      -- TRANSLATORS: Hauke – Expansion hint
> +      _([[I don’t know what it means, but I’m sure it’s important. Perhaps you can make some sense of it.]]))
> +      .. new_objectives(obj_poem),
>  }
>  
>  supply_murilius_destroy = {


-- 
https://code.launchpad.net/~widelands-dev/widelands/fri-01-02-improvements/+merge/355843
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/fri-01-02-improvements into lp:widelands.