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

[GunChleoc]

Various string fixes for Empire scenario 3. Removed all instances of the term "upgrade" from the UI.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 2365. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/246730986.
Appveyor build 2193. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_string_fixes-2193.

[SirVer (sirver)]

@bunnybot merge

review: Approve

=== modified file 'data/campaigns/bar02.wmf/scripting/texts.lua'
--- data/campaigns/bar02.wmf/scripting/texts.lua	2017-01-05 21:04:20 +0000
+++ data/campaigns/bar02.wmf/scripting/texts.lua	2017-06-28 10:48:39 +0000
@@ -205,7 +205,7 @@
    title = _"The Story Continues",
    body = thron(_"Thron says:",
       -- TRANSLATORS: Thron
-      _([[I have sent men to meet with Kalitath in his fortress. He has barricaded the former main entrance to the capital and is trying to set up a siege ring around Al’thunran. He will not let anyone enter or leave the city while the ring is intact. Until now, he has not answered any of my messages. But the time I spend waiting won’t be lost. I will further upgrade my soldiers and prepare for battle.]]))
+      _([[I have sent men to meet with Kalitath in his fortress. He has barricaded the former main entrance to the capital and is trying to set up a siege ring around Al’thunran. He will not let anyone enter or leave the city while the ring is intact. Until now, he has not answered any of my messages. But the time I spend waiting won’t be lost. I will train my soldiers further and prepare for battle.]]))
 }
 
 order_msg_7_destroy_kalitaths_army = {

=== modified file 'data/campaigns/emp03.wmf/scripting/texts.lua'
--- data/campaigns/emp03.wmf/scripting/texts.lua	2017-05-16 18:50:05 +0000
+++ data/campaigns/emp03.wmf/scripting/texts.lua	2017-06-28 10:48:39 +0000
@@ -114,7 +114,7 @@
    -- TRANSLATORS: Objective - create 2 expeditions and found new colonies with them
    body = objective_text(_"Build 2 Expedition Ports",
       listitem_bullet(_[[We should explore the island in the south. Use an expedition to build a port there. Afterwards, let’s try to find some mining resources.]]) ..
-     listitem_bullet(_[[We should send a ship nothwards to gather some intelligence about the Barbarians. Try to build a port on the island and found an outpost.]])
+     listitem_bullet(_[[We should send a ship northwards to gather some intelligence about the Barbarians. Try to build a port on the island and found an outpost.]])
    ),
 }
 
@@ -201,7 +201,7 @@
       _([[Finally, the wrath of the gods and the ocean seems to be over.]])
       .. paragraphdivider() ..
       -- TRANSLATORS: Lutius - Diary
-      _([[We landed on an unknown coast and found some rest under the palm trees growing at the shore. But that is about as good as it gets. The truth is: when I woke up this morning, I saw nothing but sand and stone around us.]])
+      _([[Again, we stranded on an unknown coast and slept in the shade under some palm trees until the sun was risen high up in the sky. I’m afraid that when we awoke at noon, nobody was really surprised that all we could see was sand… although the amount of rocks near our camp was astonishing.]])
       .. paragraphdivider() ..
       -- TRANSLATORS: Lutius - Diary
       _([[It really seems as if we have landed on a very small island with little space.]])
@@ -526,7 +526,7 @@
 }
 
 amalea_13 = {
-   title=_"Amalea’s Councel",
+   title=_"Amalea’s Counsel",
    body= amalea1(_"Amalea is clapping her hands…",
       -- TRANSLATORS: Amalea
       _([[Salve Lutius. We just completed our weaving mill. Now we are very close to taking to the sea again. However, I thought it would be helpful to remind you that ship production is not the only industry that needs cloth.]])
@@ -555,7 +555,7 @@
       -- TRANSLATORS: Saledus
       _([[Sire, we are making good progress towards getting home eventually. But there is one thing I need to talk about:]])
       .. paragraphdivider() ..
-      _([[As we have seen on our last journey, it is of great importance to put the gods and especially Neptune in a good mood to safeguard our journey.]])
+      _([[As we have seen on our journeys, it is of great importance to put the gods and especially Neptune in a good mood to safeguard our journey.]])
       .. paragraphdivider() ..
       _([[Unfortunately, we lost our holy shrine of Neptune in the great storm, so we can’t worship him well. I think we should search the whole region to see if we can recover all six pieces of the shrine.]])
       .. paragraphdivider() ..
@@ -581,7 +581,7 @@
    title=_"Unpleasant Discoveries",
    body= saledus3(_"Saledus looks very worried…",
       -- TRANSLATORS: Saledus
-      _([[Sire, we found the ruins of a former Barbarian fortress and village. I’m somewhat worried that we will have to fight against them before we are ready.]])),
+      _([[Sire, we found the ruins of a former Barbarian fortress and village. I’m somewhat worried that we will have to fight against them before we are ready to do so.]])),
    posy=1,
    w=500,
 }

=== modified file 'data/tribes/buildings/productionsites/barbarians/granitemine/helptexts.lua'
--- data/tribes/buildings/productionsites/barbarians/granitemine/helptexts.lua	2015-10-31 12:11:44 +0000
+++ data/tribes/buildings/productionsites/barbarians/granitemine/helptexts.lua	2017-06-28 10:48:39 +0000
@@ -18,7 +18,7 @@
    return
       (pgettext("barbarians_building","This mine exploits all of the resource down to the deepest level. But even after having done so, it will still have a %s chance of finding some more granite."):bformat("5%") .. "<br>"
          -- TRANSLATORS: 'It' is a mine
-         .. pgettext("barbarians_building", "It cannot be upgraded."))
+         .. pgettext("barbarians_building", "It cannot be enhanced."))
 end
 
 function building_helptext_performance()

=== modified file 'data/tribes/buildings/productionsites/barbarians/warmill/helptexts.lua'
--- data/tribes/buildings/productionsites/barbarians/warmill/helptexts.lua	2015-11-07 08:45:50 +0000
+++ data/tribes/buildings/productionsites/barbarians/warmill/helptexts.lua	2017-06-28 10:48:39 +0000
@@ -18,7 +18,7 @@
 
 function building_helptext_note()
    -- TRANSLATORS: Note helptext for a building
-   return pgettext("barbarians_building", "The Barbarian war mill is their most advanced production site for weapons. As such it needs to be upgraded from an ax workshop.")
+   return pgettext("barbarians_building", "The Barbarian war mill is their most advanced production site for weapons. As such you will need to enhance an ax workshop in order to get one.")
 end
 
 function building_helptext_performance()