Merge pull request #4023 from nemaara/prose

Campaign/core prose fixes

changelog.md

@@ -121,13 +121,19 @@
      * Update maps for S1 and S6
    * Eastern Invasion:
      * S9: add dialogue on victory
+   * Heir to the Throne:
+     * Remove 'Princess' as a direct address
+   * Northern Rebirth:
+     * Remove 'Princess' as a direct address
    * Sceptre of Fire:
      * S5: tell player that gryphon riders can now be recruited
      * S9: objectives changed to be more accurate upon moving to the volcano
    * Son of the Black Eye:
      * S10: add dialogue on victory
    * The Rise of Wesnoth:
      * S17a: prevent time over defeat if player chooses to defeat remaining saurians
+ ### Miscellaneous and bug fixes
+     * Update various references of mermen to merfolk or mer
 
 ## Version 1.14.6+dev
  ### Campaigns

data/campaigns/Dead_Water/scenarios/01_Invasion.cfg

@@ -52,12 +52,12 @@
 
         [part]
             {DW_BIGMAP}
-            story= _ "Under the cover of darkness, the mermen slid into the bay, intending to launch a surprise attack at dawn. But the orcs were prepared for this, and had hastily devised a surprise of their own. Ships at the mouth of the bay that had seemed but derelict hulks disgorged hordes of orcs. More of them poured forth from the city. The merfolk were trapped, and found themselves vastly outnumbered."
+            story= _ "Under the cover of darkness, the merfolk slid into the bay, intending to launch a surprise attack at dawn. But the orcs were prepared for this, and had hastily devised a surprise of their own. Ships at the mouth of the bay that had seemed but derelict hulks disgorged hordes of orcs. More of them poured forth from the city. The merfolk were trapped, and found themselves vastly outnumbered."
         [/part]
 
         [part]
             {DW_BIGMAP}
-            story= _ "Kai Laudiss’s army fought fiercely, slaying five orcs for every warrior they lost. The kai himself fought with reckless abandon; foes fell with each swing of his great mace. The orcs discovered that trapped mermen were tougher than they had imagined, and found themselves fleeing into the forest to escape their vengeful spears. As the kai had intended, it was a defeat the orcs would not soon forget; but the cost was heavy. Kai Laudiss was felled by a poisoned orcish dart, and the greater part of his army was destroyed. When the remaining soldiers returned to Jotha, Krellis, the young son of Kai Laudiss, learned that he had become kai."
+            story= _ "Kai Laudiss’s army fought fiercely, slaying five orcs for every warrior they lost. The kai himself fought with reckless abandon; foes fell with each swing of his great mace. The orcs discovered that trapped mer were tougher than they had imagined, and found themselves fleeing into the forest to escape their vengeful spears. As the kai had intended, it was a defeat the orcs would not soon forget; but the cost was heavy. Kai Laudiss was felled by a poisoned orcish dart, and the greater part of his army was destroyed. When the remaining soldiers returned to Jotha, Krellis, the young son of Kai Laudiss, learned that he had become kai."
         [/part]
 
         [part]

data/campaigns/Dead_Water/scenarios/05_Tirigaz.cfg

@@ -14,7 +14,7 @@
 # necessary, but he helps someone level up, and he has a fair bit of
 # gold. The next level is much easier with lots of gold.
 
-# A lot of the code here is to activate the orc side if the mermen do
+# A lot of the code here is to activate the orc side if the merfolk do
 # anything wrong, and keep it passive until then. There is also some
 # animation of the orcs coming out to tear down the keep after the
 # first turn.
@@ -158,7 +158,7 @@
             [/goal]
             village_value=0
             # Even though they are less attractive targets, the ghosts
-            # will attack the orcs if they are in range and the mermen
+            # will attack the orcs if they are in range and the merfolk
             # aren't. We will keep the ghosts from attacking the orcs
             # by telling them to avoid the hexes around the guardians.
             [avoid]
@@ -447,9 +447,9 @@
         name=turn 2
 
         # If, at the end of turn 2, (actually, beginning of turn 3)
-        # the mermen are still ashore, the orcs attack.  The event
+        # the merfolk are still ashore, the orcs attack.  The event
         # doesn't need to check for the turn being 3, because that's
-        # the only way the mermen could be ashore with the orcs still
+        # the only way the merfolk could be ashore with the orcs still
         # passive.
         [event]
             name=side turn
@@ -485,7 +485,7 @@
         [/event]
     [/event]
 
-    # After turn 3, if the mermen touch land, the orcs attack.
+    # After turn 3, if the merfolk touch land, the orcs attack.
     [event]
         name=turn 3
 
@@ -557,7 +557,7 @@
         [/if]
     [/event]
 
-    # If a mermen attacks an orc, the orcs can attack back:
+    # If a merfolk attacks an orc, the orcs can attack back:
     [event]
         name=attack_end
         first_time_only=yes
@@ -590,7 +590,7 @@
         [/if]
     [/event]
 
-    # Remove the orcs movement points each turn if the mermen have
+    # Remove the orcs movement points each turn if the merfolk have
     # stayed in the water.
     [event]
         name=turn refresh

data/campaigns/Dead_Water/scenarios/10_The_Flaming_Sword.cfg

@@ -305,7 +305,7 @@
         [/message]
         [message]
             speaker=Mal-Govon
-            message= _ "What I remember, you old fool, is you leaving behind the smoldering bodies of the orcs you had hired to steal my sword. Now, you bring mermen. When they lay expiring like gasping fish on the shore, will you not flee again? Do not speak to <i>me</i> of fear."
+            message= _ "What I remember, you old fool, is you leaving behind the smoldering bodies of the orcs you had hired to steal my sword. Now, you bring mer to do your dirty work. When they lay expiring like gasping fish on the shore, will you not flee again? Do not speak to <i>me</i> of fear."
         [/message]
         [message]
             speaker=Kai Krellis
@@ -1146,7 +1146,7 @@
 
         [message]
             speaker=Caladon
-            message= _ "CURSE you mermen!"
+            message= _ "CURSE you merfolk!"
         [/message]
 
         {VARIABLE Caladon_leader_status dead}

data/campaigns/Dead_Water/scenarios/12_Revenge.cfg

@@ -504,7 +504,7 @@
 
         [message]
             speaker=Mel Daveth
-            message= _ "The mermen...they came back! Bring back the search parties! Call back the hordes!"
+            message= _ "The mer...they came back! Bring back the search parties! Call back the hordes!"
         [/message]
 
         [message]

data/campaigns/Dead_Water/units/Child_King.cfg

@@ -14,7 +14,7 @@
     advances_to=Merman Young King
     cost=8
     usage=fighter
-    description= _ "When a merman king dies, the next in line becomes king however young he is. It is his job to lead his troops in combat if necessary. Good soldiers will do as they are told, but a very young king will get little real respect."
+    description= _ "When a mer king dies, the next in line becomes king however young he is. It is his job to lead his troops in combat if necessary. Good soldiers will do as they are told, but a very young king will get little real respect."
     die_sound=mermen-die.ogg
     {DEFENSE_ANIM "units/merfolk/child_king.png" "units/merfolk/child_king.png" mermen-hit.wav }
     [attack]

data/campaigns/Heir_To_The_Throne/scenarios/03_The_Isle_of_Alduin.cfg

@@ -309,7 +309,7 @@
 
         [message]
             speaker=Seimus
-            message= _ "She has taken control of the Bay of Pearls, long held by the Mermen, and has turned them into slaves. There they dive for pearls by which she grows richer every day. There are even rumors that she may break the ancient treaty and attack Elensefar!"
+            message= _ "She has taken control of the Bay of Pearls, long held by the Mer, and has turned them into slaves. There they dive for pearls by which she grows richer every day. There are even rumors that she may break the ancient treaty and attack Elensefar!"
         [/message]
 
         [message]

data/campaigns/Heir_To_The_Throne/scenarios/04_The_Bay_of_Pearls.cfg

@@ -551,7 +551,7 @@
 #endif
         [message]
             speaker=Gwimli
-            message= _ "Thank you for rescuing us! Now we can help you fight the evil orcs! The main cage where they keep most of the mermen is in the northwest!"
+            message= _ "Thank you for rescuing us! Now we can help you fight the evil orcs! The main cage where they keep most of the merfolk is in the northwest!"
         [/message]
     [/event]
 
@@ -661,7 +661,7 @@
         [message]
             speaker=Konrad
             {KONRAD_VARIATION_ELF glad}
-            message= _ "At last, we have freed the mermen. Go back to the ocean and live in peace."
+            message= _ "At last, we have freed the merfolk. Go back to the ocean and live in peace."
         [/message]
 #define MERMAN_SPEAKS
     [role]

data/campaigns/Heir_To_The_Throne/scenarios/05b_Isle_of_the_Damned.cfg

@@ -92,7 +92,7 @@
             show_title=no
         [/part]
         [part]
-            story= _ "The mermen finally saved Konrad from the sea, but were unable to get him back to the ship. By dint of great effort they reached a nearby island..."
+            story= _ "The merfolk finally saved Konrad from the sea, but were unable to get him back to the ship. By dint of great effort they reached a nearby island..."
             {HTTT_BIGMAP}
             show_title=no
         [/part]
@@ -174,7 +174,7 @@
             gold=0
         [/modify_side]
 
-        # disallow recruiting of everything except mermen
+        # disallow recruiting of everything except merfolk
         [disallow_recruit]
             side=1
             type=Elvish Fighter,Elvish Archer,Elvish Shaman,Elvish Scout,Mage,Horseman

data/campaigns/Heir_To_The_Throne/scenarios/08_The_Princess_of_Wesnoth.cfg

@@ -399,7 +399,7 @@
         [/message]
         [message]
             speaker=Konrad
-            message= _ "Good day then, Princess. Come, men, to the northern road!"
+            message= _ "Good day to you, then. Come, men, to the northern road!"
         [/message]
         [message]
             speaker=unit

data/campaigns/Heir_To_The_Throne/scenarios/16_Hasty_Alliance.cfg

@@ -353,15 +353,15 @@
         [/message]
         [message]
             speaker=Kalenz
-            message= _ "Now we are surrounded! Do you still want to fight us, Princess? Surely that would lead to doom for us all!"
+            message= _ "Now we are surrounded! Do you still want to fight us, Li’sar? Surely that would lead to doom for us all!"
         [/message]
         [message]
             speaker="Li'sar"
             message= _ "I see we have little choice but to help each other. Let us fight together until we return to the surface. Agreed?"
         [/message]
         [message]
             speaker=Konrad
-            message= _ "Very well, I promise that you will reach the surface again, or we shall all perish together, Princess."
+            message= _ "Very well, I promise that you will reach the surface again, or we shall all perish together."
         [/message]
         [message]
             speaker="Li'sar"
@@ -374,7 +374,7 @@
 
         [message]
             speaker=Konrad
-            message= _ "Well, we have helped each other survive so far, Princess. Now let’s continue together. What do you say?"
+            message= _ "Well, we have helped each other survive so far. Now let’s continue together. What do you say?"
         [/message]
         [message]
             speaker="Li'sar"
@@ -383,7 +383,7 @@
 
         [message]
             speaker=Konrad
-            message= _ "Thank you, Princess. Come, men. Let us find the Sceptre!"
+            message= _ "Thank you. Come, men. Let us find the Sceptre!"
         [/message]
 
         [endlevel]

data/campaigns/Heir_To_The_Throne/scenarios/17_Scepter_of_Fire.cfg

@@ -507,7 +507,7 @@
         [/message]
         [message]
             speaker=Kalenz
-            message= _ "No, not an earthquake, Princess. I feel it too. Something is... aware... of us."
+            message= _ "No, not an earthquake, but I feel it too. Something is... aware... of us."
         [/message]
         [message]
             speaker="Li'sar"

data/campaigns/Heir_To_The_Throne/scenarios/18_A_Choice_Must_Be_Made.cfg

@@ -173,7 +173,7 @@
                 [/message]
                 [message]
                     speaker=Konrad
-                    message= _ "You still want to fight me, do you, Princess?"
+                    message= _ "You still want to fight me, do you, Li’sar?"
                 [/message]
                 [message]
                     speaker="Li'sar"
@@ -185,7 +185,7 @@
                 [/message]
                 [message]
                     speaker=Konrad
-                    message= _ "Indeed there are. We shall have to fight our way out. Are you with us, Princess, or against us?"
+                    message= _ "Indeed there are. We shall have to fight our way out. Are you with us or against us?"
                 [/message]
                 [message]
                     speaker="Li'sar"
@@ -205,15 +205,15 @@
                 [/message]
                 [message]
                     speaker=Konrad
-                    message= _ "Yes, we have. Now I suppose you want to use the Sceptre against me, Princess?"
+                    message= _ "Yes, we have. Now I suppose you want to use the Sceptre against me, Li’sar?"
                 [/message]
                 [message]
                     speaker="Li'sar"
                     message= _ "No, I was thinking... I don’t really want to kill you. I have what I came to get. So if you promise never to come south of the Great River, I will spare your life."
                 [/message]
                 [message]
                     speaker=Kalenz
-                    message= _ "With all due respect, Princess, it is once again we who will spare you, Sceptre or no Sceptre."
+                    message= _ "With all due respect, <i>Princess</i>, it is once again we who will spare you, Sceptre or no Sceptre."
                 [/message]
                 [message]
                     speaker="Li'sar"
@@ -253,15 +253,15 @@
         [/message]
         [message]
             speaker=Konrad
-            message= _ "And will you join us in seeking refuge with the North Elves, Princess?"
+            message= _ "And will you join us in seeking refuge with the North Elves, Li’sar?"
         [/message]
         [message]
             speaker="Li'sar"
             message= _ "If the elves will promise me refuge and safe passage, then I will go."
         [/message]
         [message]
             speaker=Kalenz
-            message= _ "That we will, Princess. Even though you are the daughter of the Queen, our enemy, we shall not harm you on this encounter, for you have helped us."
+            message= _ "That we will. Even though you are the daughter of the Queen, our enemy, we shall not harm you on this encounter, for you have helped us."
         [/message]
         [message]
             speaker=Delfador

data/campaigns/Heir_To_The_Throne/scenarios/19a_Snow_Plains.cfg

@@ -171,7 +171,7 @@
         [message]
             speaker=Konrad
             {KONRAD_VARIATION mad}
-            message= _ "Enough! I can listen to no more of this. Princess, you may want to end your mother’s rule, but I will end her life as she ended the life of my father and my brothers. Asheviere’s masterwork of treachery will end, and it will end by my blade!"
+            message= _ "Enough! I can listen to no more of this. Li’sar, you may want to end your mother’s rule, but I will end her life as she ended the life of my father and my brothers. Asheviere’s masterwork of treachery will end, and it will end by my blade!"
         [/message]
     [/event]
 

data/campaigns/Heir_To_The_Throne/scenarios/19b_Swamp_Of_Dread.cfg

@@ -378,7 +378,7 @@
         [message]
             speaker=Konrad
             {KONRAD_VARIATION mad}
-            message= _ "Enough! I can listen to no more of this. Princess, you may want to end your mother’s rule, but I will end her life as she ended the life of my father and my brothers. Asheviere’s masterwork of treachery will end, and it will end by my blade!"
+            message= _ "Enough! I can listen to no more of this. Li’sar, you may want to end your mother’s rule, but I will end her life as she ended the life of my father and my brothers. Asheviere’s masterwork of treachery will end, and it will end by my blade!"
         [/message]
         [endlevel]
             result=victory

data/campaigns/Heir_To_The_Throne/scenarios/19c_Cliffs_of_Thoria.cfg

@@ -243,7 +243,7 @@
         [message]
             speaker=narrator
             image=wesnoth-icon.png
-            message= _ "One day they saw a gruesome sight — a fleet of boats and rafts sunk or shattered among the river islands. Konrad sent some of the mermen to investigate."
+            message= _ "One day they saw a gruesome sight — a fleet of boats and rafts sunk or shattered among the river islands. Konrad sent some of the merfolk to investigate."
         [/message]
         [message]
             role=merman-advisor
@@ -336,7 +336,7 @@
         [/message]
         [message]
             role=merman-advisor
-            # po: Yes, "Eastern Shore" is correct. Mermen are water-oriented;
+            # po: Yes, "Eastern Shore" is correct. Merfolk are water-oriented;
             # po: it's the eastern shore of the Great Ocean.
             message= _ "I was born in the Bay of Pearls and spent my entire life on the Eastern Shore. But I have spoken with those who have traveled the Western Ocean and met drakes on their journeys. Therefore, I am certain beyond doubt that the creature flying in front of us is a drake, Delfador. Concerning the drakes having never been seen in Wesnoth, must I remind you that we are not in Wesnoth anymore? There are many unthinkable things and creatures which can be found outside of Wesnoth."
         [/message]
@@ -351,7 +351,7 @@
         [/message]
         [message]
             speaker="Li'sar"
-            message= _ "And I am Princess Li’sar, the only daughter of the late King Garard II and Queen Asheviere. I too am an heir to the throne of Wesnoth!"
+            message= _ "And I am the Princess, Li’sar, the only daughter of the late King Garard II and Queen Asheviere. I, too, am an heir to the throne of Wesnoth!"
         [/message]
         [message]
             speaker=Keh Ohn
@@ -764,7 +764,7 @@ Soooo... It is you who sent your subordinates to attack us. Now when we’ve des
         [/message]
         [message]
             speaker=Delfador
-            message= _ "Princess Li’sar, do I have to remind you again that it is Konrad, not you, who is the rightful heir?"
+            message= _ "Li’sar, do I have to remind you again that it is Konrad, not you, who is the rightful heir?"
         [/message]
         [message]
             speaker="Li'sar"
@@ -831,7 +831,7 @@ Soooo... It is you who sent your subordinates to attack us. Now when we’ve des
         [/message]
         [message]
             speaker="Li'sar"
-            message= _ "I am Princess Li’sar, and we are friends. Join us and wait for the healers to help you, young sergeant."
+            message= _ "I am the Princess, Li’sar, and we are friends. Join us and wait for the healers to help you, young sergeant."
         [/message]
         [message]
             speaker=Warven