widelands-dev team mailing list archive

[GunChleoc <fios@xxxxxxxxxxxxxxxxxxx>]

Review: Approve

Can go in as it is when it has been tested.

Diff comments:

> 
> === modified file 'data/campaigns/emp03.wmf/scripting/texts.lua'
> --- data/campaigns/emp03.wmf/scripting/texts.lua	2017-06-25 07:08:38 +0000
> +++ data/campaigns/emp03.wmf/scripting/texts.lua	2018-01-25 19:30:40 +0000
> @@ -205,34 +215,31 @@
>        .. paragraphdivider() ..
>        -- TRANSLATORS: Lutius - Diary
>        _([[It really seems as if we have landed on a very small island with little space.]])
> -     .. paragraphdivider() ..
> +      .. paragraphdivider() ..
>        -- TRANSLATORS: Lutius - Diary
>        _([[To make matters even worse, all the land we can see is blocked by rocks and trees. I fear we won’t find the resources we need to build a new ship.]])
> -     .. paragraphdivider() ..
> +      .. paragraphdivider() ..
>        -- TRANSLATORS: Lutius - Diary
>        _([[I really don’t know if and how we will get back home. And the war is going on without us. I hope my fellow soldiers are defending our empire well.]])),
> -
>     posy=1,
>     w=500,
>  }
>  
>  saledus = {
> -    title=_"No Sight",
> -    body= saledus2(_"Saledus looks around nervously…",
> -       -- TRANSLATORS: Saledus
> -       _([[Sire, we do not know anything about the island. And I believe we are not safe either. It would probably be reasonable to build a tower to explore the island and add some military strength.]])),
> -
> -    posy=1,
> +   title=_"No Sight",
> +   body= saledus2(_"Saledus looks around nervously…",
> +      -- TRANSLATORS: Saledus
> +      _([[Sire, we do not know anything about the island. And I believe we are not safe either. It would probably be reasonable to build a tower to explore the island and add some military strength.]])),
> +   posy=1,
>     w=500,
>  }
>  
>  amalea = {
> -    title=_"Amalea Interrupts",
> -    body= amalea1(_"Amalea raises her hand…",
> -    -- TRANSLATORS: Amalea
> -    _([[As we don’t know how many resources we can get, we should be very restrictive in spending them. Even for military buildings, we should be very careful.]])),
> -
> -    posy=1,
> +   title=_"Amalea Interrupts",
> +   body= amalea1(_"Amalea raises her hand…",
> +      -- TRANSLATORS: Amalea
> +      _([[As we don’t know how many resources we can get, we should be very restrictive in spending them. Even for military buildings, we should be very careful.]])),

I think it's OK, since she has an informal style. Not worth breaking translations over IMHO.

> +   posy=1,
>     w=500,
>  }
>  
> 
> === modified file 'data/campaigns/emp04.wmf/port_spaces'
> --- data/campaigns/emp04.wmf/port_spaces	2017-12-24 16:13:54 +0000
> +++ data/campaigns/emp04.wmf/port_spaces	2018-01-25 19:30:40 +0000
> @@ -6,4 +6,4 @@
>  
>  [port_spaces]
>  0="12 43"
> -1="20 14"
> \ No newline at end of file
> +1="20 14"

The plus sign is not part of the actual code - it means "line added"



-- 
https://code.launchpad.net/~widelands-dev/widelands/bugfix-empire-campaign/+merge/336074
Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bugfix-empire-campaign.