diff --git a/changelog.md b/changelog.md
index baba5c8be3ee..8e056cc403b6 100644
--- a/changelog.md
+++ b/changelog.md
@@ -121,6 +121,10 @@
* 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
@@ -128,6 +132,8 @@
* 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
diff --git a/data/campaigns/Dead_Water/scenarios/01_Invasion.cfg b/data/campaigns/Dead_Water/scenarios/01_Invasion.cfg
index 6cd492777759..2a3012cdccae 100644
--- a/data/campaigns/Dead_Water/scenarios/01_Invasion.cfg
+++ b/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]
diff --git a/data/campaigns/Dead_Water/scenarios/05_Tirigaz.cfg b/data/campaigns/Dead_Water/scenarios/05_Tirigaz.cfg
index 7b15a4d65d7e..23388ba1646a 100644
--- a/data/campaigns/Dead_Water/scenarios/05_Tirigaz.cfg
+++ b/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
diff --git a/data/campaigns/Dead_Water/scenarios/10_The_Flaming_Sword.cfg b/data/campaigns/Dead_Water/scenarios/10_The_Flaming_Sword.cfg
index 53a88d04b0dc..d21bcd1a2c9a 100644
--- a/data/campaigns/Dead_Water/scenarios/10_The_Flaming_Sword.cfg
+++ b/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 me 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 me 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}
diff --git a/data/campaigns/Dead_Water/scenarios/12_Revenge.cfg b/data/campaigns/Dead_Water/scenarios/12_Revenge.cfg
index 709730a23b83..dcfdf1792157 100644
--- a/data/campaigns/Dead_Water/scenarios/12_Revenge.cfg
+++ b/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]
diff --git a/data/campaigns/Dead_Water/units/Child_King.cfg b/data/campaigns/Dead_Water/units/Child_King.cfg
index 6aef29fb4c96..19c45d72ef46 100644
--- a/data/campaigns/Dead_Water/units/Child_King.cfg
+++ b/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]
diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/03_The_Isle_of_Alduin.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/03_The_Isle_of_Alduin.cfg
index 13fc4617812a..60452a7bdf57 100644
--- a/data/campaigns/Heir_To_The_Throne/scenarios/03_The_Isle_of_Alduin.cfg
+++ b/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]
diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/04_The_Bay_of_Pearls.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/04_The_Bay_of_Pearls.cfg
index 132342d17a54..2f47209af3aa 100644
--- a/data/campaigns/Heir_To_The_Throne/scenarios/04_The_Bay_of_Pearls.cfg
+++ b/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]
diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/05b_Isle_of_the_Damned.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/05b_Isle_of_the_Damned.cfg
index ce464b075797..48b3955e7e4f 100644
--- a/data/campaigns/Heir_To_The_Throne/scenarios/05b_Isle_of_the_Damned.cfg
+++ b/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
diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/08_The_Princess_of_Wesnoth.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/08_The_Princess_of_Wesnoth.cfg
index 13d4896d4918..bda8c8127821 100644
--- a/data/campaigns/Heir_To_The_Throne/scenarios/08_The_Princess_of_Wesnoth.cfg
+++ b/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
diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/16_Hasty_Alliance.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/16_Hasty_Alliance.cfg
index dc31c358a26b..fba85ce7af34 100644
--- a/data/campaigns/Heir_To_The_Throne/scenarios/16_Hasty_Alliance.cfg
+++ b/data/campaigns/Heir_To_The_Throne/scenarios/16_Hasty_Alliance.cfg
@@ -353,7 +353,7 @@
[/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"
@@ -361,7 +361,7 @@
[/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]
diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/17_Scepter_of_Fire.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/17_Scepter_of_Fire.cfg
index 2e977223e2ef..fe526e47f332 100644
--- a/data/campaigns/Heir_To_The_Throne/scenarios/17_Scepter_of_Fire.cfg
+++ b/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"
diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/18_A_Choice_Must_Be_Made.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/18_A_Choice_Must_Be_Made.cfg
index f013d7ba31d7..1d5f78cc4496 100644
--- a/data/campaigns/Heir_To_The_Throne/scenarios/18_A_Choice_Must_Be_Made.cfg
+++ b/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,7 +205,7 @@
[/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"
@@ -213,7 +213,7 @@
[/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, Princess, it is once again we who will spare you, Sceptre or no Sceptre."
[/message]
[message]
speaker="Li'sar"
@@ -253,7 +253,7 @@
[/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"
@@ -261,7 +261,7 @@
[/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
diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/19a_Snow_Plains.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/19a_Snow_Plains.cfg
index ddc4f6ca7d29..d8cd4e1c7a3a 100644
--- a/data/campaigns/Heir_To_The_Throne/scenarios/19a_Snow_Plains.cfg
+++ b/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]
diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/19b_Swamp_Of_Dread.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/19b_Swamp_Of_Dread.cfg
index cb62ef187119..1126be282d04 100644
--- a/data/campaigns/Heir_To_The_Throne/scenarios/19b_Swamp_Of_Dread.cfg
+++ b/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
diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/19c_Cliffs_of_Thoria.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/19c_Cliffs_of_Thoria.cfg
index 083de4fbf378..03a68d5c0955 100644
--- a/data/campaigns/Heir_To_The_Throne/scenarios/19c_Cliffs_of_Thoria.cfg
+++ b/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
diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/20a_North_Elves.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/20a_North_Elves.cfg
index 22bebbb66394..a64f32b27bb0 100644
--- a/data/campaigns/Heir_To_The_Throne/scenarios/20a_North_Elves.cfg
+++ b/data/campaigns/Heir_To_The_Throne/scenarios/20a_North_Elves.cfg
@@ -457,7 +457,7 @@
[/message]
[message]
speaker=Konrad
- message= _ "I think these wild lands are too dangerous for that! Anyhow... I expected you to be on the side of Wesnoth, Princess?"
+ message= _ "I think these wild lands are too dangerous for that! Anyhow... I expected you to be on the side of Wesnoth, Li’sar?"
[/message]
[message]
speaker="Li'sar"
@@ -516,7 +516,7 @@
[/message]
[message]
speaker=Konrad
- message= _ "Stop for a moment, Princess. Look — you can barely see them in the distance there, but the advance scouts have found each other. The Queen’s troops are marching full speed for the orcs’ camp, and vice-versa. These armies are out for blood."
+ message= _ "Stop for a moment, Li’sar. Look — you can barely see them in the distance there, but the advance scouts have found each other. The Queen’s troops are marching full speed for the orcs’ camp, and vice-versa. These armies are out for blood."
[/message]
[message]
speaker="Li'sar"
@@ -524,7 +524,7 @@
[/message]
[message]
speaker=Konrad
- message= _ "(hushed) Our soldiers will defend us as we rush across the field. Sorry to be blunt, Princess, but you and I are the only ones who need to make it across alive."
+ message= _ "(hushed) Our soldiers will defend us as we rush across the field. Sorry to be blunt, but you and I are the only ones who need to make it across alive."
[/message]
[message]
speaker=Delfador
diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/20b_Underground_Channels.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/20b_Underground_Channels.cfg
index 0bce5044b7ef..00af4937abf6 100644
--- a/data/campaigns/Heir_To_The_Throne/scenarios/20b_Underground_Channels.cfg
+++ b/data/campaigns/Heir_To_The_Throne/scenarios/20b_Underground_Channels.cfg
@@ -215,7 +215,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]
diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/21_Elven_Council.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/21_Elven_Council.cfg
index 609383b2fb44..1821063a2fa4 100644
--- a/data/campaigns/Heir_To_The_Throne/scenarios/21_Elven_Council.cfg
+++ b/data/campaigns/Heir_To_The_Throne/scenarios/21_Elven_Council.cfg
@@ -148,7 +148,7 @@
[/message]
[message]
speaker=Parandra
- message= _ "Princess, when Delfador the Great speaks of the Queen Dowager, Asheviere, ordering the princes of Wesnoth to be put to death, he speaks the truth."
+ message= _ "When Delfador the Great speaks of the Queen Dowager, Asheviere, ordering the princes of Wesnoth to be put to death, he speaks the truth."
[/message]
[message]
speaker="Li'sar"
@@ -156,7 +156,7 @@
[/message]
[message]
speaker=Uradredia
- message= _ "I did not see it myself, Princess, but I have heard many reliable reports. Asheviere indeed has the blood of the princes on her hands. She has also allowed orcs to desecrate the lands, abandoning all respect for the peoples around her."
+ message= _ "I did not see it myself, but I have heard many reliable reports. Asheviere indeed has the blood of the princes on her hands. She has also allowed orcs to desecrate the lands, abandoning all respect for the peoples around her."
[/message]
[if]
[variable]
@@ -171,7 +171,7 @@
[message]
speaker=Delfador
{DELFADOR_MENTORING}
- message= _ "Princess, there is some good in you, but the throne is not yours to claim. Konrad has the Sceptre. He will take the throne."
+ message= _ "Young lady, there is some good in you, but the throne is not yours to claim. Konrad has the Sceptre. He will take the throne."
[/message]
[/then]
[else]
@@ -182,7 +182,7 @@
[message]
speaker=Delfador
{DELFADOR_MENTORING}
- message= _ "Though you have the Sceptre, Princess, it is rightfully Konrad’s. You have it now only because we helped you get it."
+ message= _ "Though you have the Sceptre, Li’sar, it is rightfully Konrad’s. You have it now only because we helped you get it."
[/message]
[message]
speaker="Li'sar"
@@ -191,7 +191,7 @@
[message]
speaker=Delfador
{DELFADOR_MENTORING}
- message= _ "If it is necessary, Princess, I will ask Konrad to fight you in a duel for it."
+ message= _ "If it is necessary, I will ask Konrad to fight you in a duel for it."
[/message]
[message]
speaker=Konrad
diff --git a/data/campaigns/Northern_Rebirth/scenarios/09a_Introductions.cfg b/data/campaigns/Northern_Rebirth/scenarios/09a_Introductions.cfg
index 1c71c9aae7dc..6ccc8c068657 100644
--- a/data/campaigns/Northern_Rebirth/scenarios/09a_Introductions.cfg
+++ b/data/campaigns/Northern_Rebirth/scenarios/09a_Introductions.cfg
@@ -197,7 +197,7 @@
[message]
speaker=Tallin
- message= _ "Not at all, Princess. I am no more than a humble peasant trying to free my people from enslavement."
+ message= _ "Not at all, Your Highness. I am no more than a humble peasant trying to free my people from enslavement."
[/message]
[message]
@@ -217,7 +217,7 @@
[message]
speaker=Tallin
- message= _ "Ahh, it was nothing, princess."
+ message= _ "Ahh, it was nothing, my lady."
[/message]
[message]
@@ -227,7 +227,7 @@
[message]
speaker=Tallin
- message= _ "Princess, as Elenia has said, we are currently locked in a death-struggle with the orcs led by a warlord named Rakshas. You could help us most by joining us in our quest to crush this menace once and for all."
+ message= _ "As Elenia has said, we are currently locked in a death-struggle with the orcs led by a warlord named Rakshas. You could help us most by joining us in our quest to crush this menace once and for all."
[/message]
[message]
@@ -237,7 +237,7 @@
[message]
speaker=Tallin
- message= _ "Princess, we are not seeking to do business here: “I do this for you and you do this for me.” No, we seek to build everlasting friendships which will forever ensure the peace and prosperity of these Northlands. Therefore, let there be no talk of debts and repayments between us."
+ message= _ "My lady, we are not seeking to do business here: “I do this for you and you do this for me.” No, we seek to build everlasting friendships which will forever ensure the peace and prosperity of these Northlands. Therefore, let there be no talk of debts and repayments between us."
[/message]
[message]
@@ -317,7 +317,7 @@
[message]
speaker=Tallin
- message= _ "Well, what about the orcs then, princess? Don’t you wish to be rid of them?"
+ message= _ "Well, what about the orcs then, princess? Don’t you wish to be rid of them?"
[/message]
[message]
@@ -350,7 +350,7 @@
[message]
speaker=Father Morvin
- message= _ "Frankly, princess, I am disappointed. I was always under the impression that elves were an honorable lot who took their debts seriously."
+ message= _ "Frankly, my lady, I am disappointed. I was always under the impression that elves were an honorable lot who took their debts seriously."
[/message]
[message]
diff --git a/data/campaigns/Northern_Rebirth/scenarios/10a_Stolen_Gold.cfg b/data/campaigns/Northern_Rebirth/scenarios/10a_Stolen_Gold.cfg
index e481cd5bcce2..7a4e4486b483 100644
--- a/data/campaigns/Northern_Rebirth/scenarios/10a_Stolen_Gold.cfg
+++ b/data/campaigns/Northern_Rebirth/scenarios/10a_Stolen_Gold.cfg
@@ -771,7 +771,7 @@
[message]
speaker=Hidel
- message= _ "Princess! We have finally found you!"
+ message= _ "Your Highness! We have finally found you!"
[/message]
[message]
@@ -781,7 +781,7 @@
[message]
speaker=Hidel
- message= _ "They are all here, princess! Hand picked by your father — the finest and bravest elvish troops in the entire Northlands. We will follow you to the end of the world if need be."
+ message= _ "They are all here, my lady! Hand picked by your father — the finest and bravest elvish troops in the entire Northlands. We will follow you to the end of the world if need be."
[/message]
[message]
@@ -791,7 +791,7 @@
[message]
speaker=Hidel
- message= _ "With pleasure, Princess! Quickly men, set up a base!"
+ message= _ "With pleasure! Quickly men, set up a base!"
[/message]
[terrain]
@@ -1082,7 +1082,7 @@
[message]
speaker=Hidel
- message= _ "Princess! We have finally found you! Thank the Bright Gods you are free! Your father had originally sent us to rescue you."
+ message= _ "Your Highness! We have finally found you! Thank the Bright Gods you are free! Your father had originally sent us to rescue you."
[/message]
[message]
@@ -1127,7 +1127,7 @@
[message]
speaker=Hidel
- message= _ "They are all here, princess! Hand picked by your father — the finest and bravest elvish troops in the entire Northlands."
+ message= _ "They are all here, my lady! Hand picked by your father — the finest and bravest elvish troops in the entire Northlands."
[/message]
[message]
@@ -1137,7 +1137,7 @@
[message]
speaker=Hidel
- message= _ "As you wish, princess."
+ message= _ "As you wish, my lady."
[/message]
[message]
diff --git a/data/campaigns/Northern_Rebirth/scenarios/12a_Get_the_Gold.cfg b/data/campaigns/Northern_Rebirth/scenarios/12a_Get_the_Gold.cfg
index e0884669bfe7..ccb8a7e7de0c 100644
--- a/data/campaigns/Northern_Rebirth/scenarios/12a_Get_the_Gold.cfg
+++ b/data/campaigns/Northern_Rebirth/scenarios/12a_Get_the_Gold.cfg
@@ -36,7 +36,7 @@
story= _ "With tears streaming down her face, Eryssa approached the fallen hero and cradled his head in her lap. As she stroked his face, his eyes fluttered open."
[/part]
- {STORY_PART_HIDEL (_ "I am sorry, princess... We held him for... as long as we could... but his bodyguards... were... just too many and powerful... And then... the orcish... reinforcements arrived...")}
+ {STORY_PART_HIDEL (_ "I am sorry, my lady... We held him for... as long as we could... but his bodyguards... were... just too many and powerful... And then... the orcish... reinforcements arrived...")}
[part]
story= _ "Her face streaked with tears, Eryssa gazed imploringly at Father Morvin and Sister Thera. They simply sighed and shook their heads. It was too late to save Hidel. In a broken voice Eryssa addressed him:"
@@ -44,7 +44,7 @@
{STORY_PART_ERYSSA (_ "Hidel, I am sorry. I have sent you to your death, and I grieve.")}
- {STORY_PART_HIDEL (_ "... Don’t tax yourself... princess... I have died... a warrior’s death... You should be proud...")}
+ {STORY_PART_HIDEL (_ "... Don’t tax yourself... Eryssa... I have died... a warrior’s death... You should be proud...")}
{STORY_PART_HIDEL (_ "... But... there is... one thing... we... could do. We... managed to... recover the gold... Sisal... took it and... retreated south...")}
@@ -78,7 +78,7 @@
story= _ "As Tallin comforted Eryssa, the rest of the party spread out and rallied the scattered elves, and tending to the wounded. This being done, they once again came before Tallin and Eryssa."
[/part]
- {STORY_PART_FATHER_MORVIN (_ "Princess... it is a hard thing, I know, but you must put your grief behind you. Or at least, put it aside for a little while. We must go quickly to the aid of Sisal and recover our gold.")}
+ {STORY_PART_FATHER_MORVIN (_ "My lady... it is a hard thing, I know, but you must put your grief behind you. Or at least, put it aside for a little while. We must go quickly to the aid of Sisal and recover our gold.")}
{STORY_PART_ARTHIAN (_ "Forge your sorrow into rage, girl, and visit it on the slayers of your kinsmen. Teach them what happens to those who make an enemy of an elf.")}
@@ -422,7 +422,7 @@
[message]
id=Sisal
- message= _ "Princess! You are here! How fares Hidel?"
+ message= _ "Your Highness! You are here! How fares Hidel?"
[/message]
[message]
diff --git a/data/campaigns/The_South_Guard/scenarios/01_Born_to_the_Banner.cfg b/data/campaigns/The_South_Guard/scenarios/01_Born_to_the_Banner.cfg
index 1b180998bac8..50d1672f2d5f 100644
--- a/data/campaigns/The_South_Guard/scenarios/01_Born_to_the_Banner.cfg
+++ b/data/campaigns/The_South_Guard/scenarios/01_Born_to_the_Banner.cfg
@@ -399,7 +399,7 @@
[/event]
#endif
- # Mermen - You find mermen who will become allies and protect your waterways.
+ # Merfolk - You find merfolk who will become allies and protect your waterways.
[event]
name=moveto
@@ -462,7 +462,7 @@
[message]
speaker=narrator
image="units/merfolk/hunter.png~RC(magenta>red)"
- message= _ "You may now recruit Merman Hunters. Mermen are aquatic creatures and fight best in rivers and swamps. They are much less effective on dry land."
+ message= _ "You may now recruit Merman Hunters. Merfolk are aquatic creatures and fight best in rivers and swamps. They are much less effective on dry land."
[/message]
#endif
@@ -470,7 +470,7 @@
side=1
type=Merman Hunter
[/allow_recruit]
- {VARIABLE has_mermen "yes"}
+ {VARIABLE has_merfolk "yes"}
[/event]
# Dusk - Sir Gerrick suggests that you should hold the north banks of the river.
diff --git a/data/campaigns/The_South_Guard/scenarios/02_Proven_by_the_Sword.cfg b/data/campaigns/The_South_Guard/scenarios/02_Proven_by_the_Sword.cfg
index 416b531a731b..3287540e33c7 100644
--- a/data/campaigns/The_South_Guard/scenarios/02_Proven_by_the_Sword.cfg
+++ b/data/campaigns/The_South_Guard/scenarios/02_Proven_by_the_Sword.cfg
@@ -454,7 +454,7 @@
[/if]
[/event]
- # you can get some mermen reinforcements if you go on the village here
+ # you can get some merfolk reinforcements if you go on the village here
# it will replay the event from the first scenario if you didn't get them there
[event]
@@ -466,7 +466,7 @@
[if]
[variable]
- name=has_mermen
+ name=has_merfolk
equals="yes"
[/variable]
[then]
@@ -552,7 +552,7 @@
[message]
speaker=narrator
image="units/merfolk/hunter.png~RC(magenta>red)"
- message= _ "You may now recruit Merman Hunters. Mermen are aquatic creatures and fight best in rivers and swamps. They are much less effective on dry land."
+ message= _ "You may now recruit Merman Hunters. Merfolk are aquatic creatures and fight best in rivers and swamps. They are much less effective on dry land."
[/message]
#endif
@@ -560,7 +560,7 @@
side=1
type=Merman Hunter
[/allow_recruit]
- {VARIABLE has_mermen "yes"}
+ {VARIABLE has_merfolk "yes"}
[/else]
[/if]
[/event]
@@ -852,7 +852,7 @@
message= _ "Very well. Although it will probably take too long to send word to the King for reinforcements, I remember there being a small outpost within a couple days’ ride of here. I will send a message to them asking for a few riders, then we should make haste toward the Aethenwood to find the elves."
[/message]
- {CLEAR_VARIABLE citadel_secured}
+ {CLEAR_VARIABLE citadel_secured,has_merfolk}
[endlevel]
result=victory
diff --git a/data/campaigns/The_South_Guard/scenarios/05_Choice_In_The_Fog.cfg b/data/campaigns/The_South_Guard/scenarios/05_Choice_In_The_Fog.cfg
index 474e053575dd..56ad7f01e2b8 100644
--- a/data/campaigns/The_South_Guard/scenarios/05_Choice_In_The_Fog.cfg
+++ b/data/campaigns/The_South_Guard/scenarios/05_Choice_In_The_Fog.cfg
@@ -1118,7 +1118,7 @@
image=portraits/deoran-sad.png
message= _ "Then we shall retreat towards Westin and prepare for the oncoming battle. I pray our only chance at victory was not lost today."
[/message]
- {CLEAR_VARIABLE side_with_bandits,found_urza_afalas,has_mermen,know_about_lich}
+ {CLEAR_VARIABLE side_with_bandits,found_urza_afalas,know_about_lich}
[endlevel]
result=victory
next_scenario=06b_The_Long_March
diff --git a/data/core/images/portraits/ARTISTS b/data/core/images/portraits/ARTISTS
index 2c989670aa66..c5e99da8d54a 100644
--- a/data/core/images/portraits/ARTISTS
+++ b/data/core/images/portraits/ARTISTS
@@ -213,7 +213,7 @@ Drakes:
Clasher
Fighter
Glider
-Mermen:
+Merfolk:
Fighter
Hunter
Others:
diff --git a/data/core/units/merfolk/Entangler.cfg b/data/core/units/merfolk/Entangler.cfg
index 964ea83ca887..1e527c48453f 100644
--- a/data/core/units/merfolk/Entangler.cfg
+++ b/data/core/units/merfolk/Entangler.cfg
@@ -18,7 +18,7 @@
usage=mixed fighter
description= _ "Merfolk tend to use a combination of both nets and clubs in fishing; nets to collect the fish, and clubs to finish the kill. Both of these tools have seen adaptation for warfare, and are valuable enough that auxiliaries who specialize in using them are deliberately brought to battle.
-Mermen often find themselves in a standoff with land-based enemies; the merfolk are too strong in the water, and are too weak to make any offense on land. Nets are a key bit of leverage; without nets, mermen can’t give any effective chase over land, and are at a great disadvantage in hand-to-hand combat."+{SPECIAL_NOTES}+{SPECIAL_NOTES_SLOW}
+Merfolk often find themselves in a standoff with land-based enemies; the mer are too strong in the water, and are too weak to make any offense on land. Nets are a key bit of leverage; without nets, merfolk cannot give any effective chase over land, and are at a great disadvantage in hand-to-hand combat."+{SPECIAL_NOTES}+{SPECIAL_NOTES_SLOW}
{DEFENSE_ANIM "units/merfolk/entangler-defend2.png" "units/merfolk/entangler-defend1.png" mermen-hit.wav }
die_sound=mermen-die.ogg
[attack]
diff --git a/data/core/units/merfolk/Hunter.cfg b/data/core/units/merfolk/Hunter.cfg
index f09173583fb2..c0ce417455d0 100644
--- a/data/core/units/merfolk/Hunter.cfg
+++ b/data/core/units/merfolk/Hunter.cfg
@@ -15,7 +15,7 @@
advances_to=Merman Spearman,Merman Netcaster
cost=15
usage=mixed fighter
- description= _ "The skills employed by mermen in spear-fishing are easily translated into warfare, especially against those who are not at home in the water. In times of need, many mermen of that occupation will volunteer to swell the ranks of their military."
+ description= _ "The skills employed by merfolk in spear-fishing are easily translated into warfare, especially against those who are not at home in the water. In times of need, many mer of that occupation will volunteer to swell the ranks of their military."
die_sound=mermen-die.ogg
{DEFENSE_ANIM_RANGE "units/merfolk/hunter.png" "units/merfolk/hunter.png" mermen-hit.wav melee}
{DEFENSE_ANIM_RANGE "units/merfolk/hunter-javelin-defend-2.png" "units/merfolk/hunter-javelin-defend-1.png" mermen-hit.wav ranged}
diff --git a/data/core/units/merfolk/Javelineer.cfg b/data/core/units/merfolk/Javelineer.cfg
index d4437046218f..904e7564f7d2 100644
--- a/data/core/units/merfolk/Javelineer.cfg
+++ b/data/core/units/merfolk/Javelineer.cfg
@@ -15,7 +15,7 @@
{AMLA_DEFAULT}
cost=48
usage=mixed fighter
- description= _ "Those mermen who master the art of the javelin can become nearly as effective as an archer — though the heft of their weapons impedes their range, the impact of one is considerably greater. In the water, the mobility of the mermen more than makes up for this when facing foes who cannot swim."
+ description= _ "Those mer who master the art of the javelin can become nearly as effective as an archer — though the heft of their weapons impedes their range, the impact of one is considerably greater. In the water, the mobility of the merfolk more than makes up for this when facing foes who cannot swim."
die_sound=mermen-die.ogg
{DEFENSE_ANIM "units/merfolk/javelineer-defend2.png" "units/merfolk/javelineer-defend1.png" mermen-hit.wav }
[attack]
diff --git a/data/core/units/merfolk/Netcaster.cfg b/data/core/units/merfolk/Netcaster.cfg
index d6e75849aaa3..423ad082273f 100644
--- a/data/core/units/merfolk/Netcaster.cfg
+++ b/data/core/units/merfolk/Netcaster.cfg
@@ -15,7 +15,7 @@
advances_to=Merman Entangler
cost=27
usage=mixed fighter
- description= _ "Fishing, as practiced by mermen, is largely a matter of chasing schools of fish into waiting nets, where oar-like clubs are used to dispatch the prey. The improvisation of using these against soldiers proved very effective; most land-native creatures are already quite awkward when waist-deep in water, and getting caught in a net can render them nearly helpless.
+ description= _ "Fishing, as practiced by merfolk, is largely a matter of chasing schools of fish into waiting nets, where oar-like clubs are used to dispatch the prey. The improvisation of using these against soldiers proved very effective; most land-native creatures are already quite awkward when waist-deep in water, and getting caught in a net can render them nearly helpless.
The effectiveness of this method led to the development of smaller, weighted nets, which could be cast through the air; these were useless for fishing, but were useful both in combat and in hunting game that came too close to shore. Clubs were used in combat with little or no adaptation from fishing, since they were already quite deadly."+{SPECIAL_NOTES}+{SPECIAL_NOTES_SLOW}
{DEFENSE_ANIM "units/merfolk/netcaster-defend2.png" "units/merfolk/netcaster-defend1.png" mermen-hit.wav }
diff --git a/data/core/units/merfolk/Spearman.cfg b/data/core/units/merfolk/Spearman.cfg
index a29b3bfa37a2..5d976458cf79 100644
--- a/data/core/units/merfolk/Spearman.cfg
+++ b/data/core/units/merfolk/Spearman.cfg
@@ -14,7 +14,7 @@
advances_to=Merman Javelineer
cost=27
usage=mixed fighter
- description= _ "Archery is little favored by the mermen, for whom use of javelins serves a similar function. Though thrown javelins are of little use under the water, they are extremely effective at the surface, where their weight allows them to plunge several feet below the water while retaining enough momentum to wreak damage. They are also useful in melee, even deep under the surface, which is something that certainly cannot be said of arrows."
+ description= _ "Archery is little favored by the mer, for whom use of javelins serves a similar function. Though thrown javelins are of little use under the water, they are extremely effective at the surface, where their weight allows them to plunge several feet below the water while retaining enough momentum to wreak damage. They are also useful in melee, even deep under the surface, which is something that certainly cannot be said of arrows."
die_sound=mermen-die.ogg
{DEFENSE_ANIM "units/merfolk/spearman-defend2.png" "units/merfolk/spearman-defend1.png" mermen-hit.wav }
[attack]
diff --git a/data/core/units/merfolk/Warrior.cfg b/data/core/units/merfolk/Warrior.cfg
index 103ad5141411..38d3b4561fd6 100644
--- a/data/core/units/merfolk/Warrior.cfg
+++ b/data/core/units/merfolk/Warrior.cfg
@@ -14,7 +14,7 @@
advances_to=Merman Triton,Merman Hoplite
cost=28
usage=fighter
- description= _ "The Mermen Warriors form the core of the mermen armies. They wield their tridents with a skill and diligence impressive even compared to the soldiers of other races, but doubly so considering the difficulties of fighting underwater, as any who try to match them in their homes can attest."
+ description= _ "Mermen Warriors form the core of merfolk armies. They wield their tridents with a skill and diligence impressive even compared to the soldiers of other races, but doubly so considering the difficulties of fighting underwater, as any who try to match them in their homes can attest."
die_sound=mermen-die.ogg
{DEFENSE_ANIM "units/merfolk/warrior-defend-2.png" "units/merfolk/warrior-defend-1.png" mermen-hit.wav }
[attack]
diff --git a/data/multiplayer/scenarios/Random_Scenario.cfg b/data/multiplayer/scenarios/Random_Scenario.cfg
index bd18d72d1a66..4f7af05a72dd 100644
--- a/data/multiplayer/scenarios/Random_Scenario.cfg
+++ b/data/multiplayer/scenarios/Random_Scenario.cfg
@@ -234,7 +234,7 @@
adjacent_liked=Gg, Ww, Ww, Ww, Ww^Bw|, Ww^Bw/, Ww^Bw\, Rr, Rr, Re, Re, Gg^Ve, Gg^Vh, Hh, Gs^Fp
[/village]
- #mermen villages - give them low chance of appearing
+ #merfolk villages - give them low chance of appearing
[village]
terrain=Ww
convert_to=Ww^Vm
diff --git a/data/multiplayer/scenarios/Random_Scenario_Desert.cfg b/data/multiplayer/scenarios/Random_Scenario_Desert.cfg
index ebc5f7580c0b..1d7cb99c2cfe 100644
--- a/data/multiplayer/scenarios/Random_Scenario_Desert.cfg
+++ b/data/multiplayer/scenarios/Random_Scenario_Desert.cfg
@@ -171,7 +171,7 @@
adjacent_liked=Gs, Dd, Ww, Ww, Ww, Ww^Bw|, Ww^Bw/, Ww^Bw\, Rr, Rr, Re, Re, Rd, Rd, Gg^Ve, Gg^Vh, Hd, Gs^Ft
[/village]
- #mermen villages - give them low chance of appearing
+ #merfolk villages - give them low chance of appearing
[village]
terrain=Ww
convert_to=Ww^Vm
diff --git a/data/multiplayer/scenarios/Random_Scenario_Marsh.cfg b/data/multiplayer/scenarios/Random_Scenario_Marsh.cfg
index d51fbb9cb48d..dab2b2238510 100644
--- a/data/multiplayer/scenarios/Random_Scenario_Marsh.cfg
+++ b/data/multiplayer/scenarios/Random_Scenario_Marsh.cfg
@@ -192,7 +192,7 @@
adjacent_liked=Gg, Ss, Ww, Ww, Ww, Ww^Bw|, Ww^Bw/, Ww^Bw\, Rr, Rr, Re, Re, Gg^Ve, Gg^Vh, Hh, Gs^Fp
[/village]
- #mermen villages - give them low chance of appearing
+ #merfolk villages - give them low chance of appearing
[village]
terrain=Ww
convert_to=Ww^Vm
diff --git a/data/multiplayer/scenarios/test_lua_mapgen.lua b/data/multiplayer/scenarios/test_lua_mapgen.lua
index 03a970f6d00f..0a1efc7c462d 100644
--- a/data/multiplayer/scenarios/test_lua_mapgen.lua
+++ b/data/multiplayer/scenarios/test_lua_mapgen.lua
@@ -322,7 +322,7 @@ local d_mapgen_data_village = {
rating=2,
adjacent_liked="Gg, Ww, Ww, Ww, Ww^Bsb|, Ww^Bsb/, Ww^Bsb\\, Rr, Rr, Re, Re, Gg^Ve, Gg^Vh, Hh, Gs^Fp",
},
- -- mermen villages - give them low chance of appearing
+ -- merfolk villages - give them low chance of appearing
{
terrain="Wwg",
convert_to="Wwg^Vm",
diff --git a/data/scenario-test.cfg b/data/scenario-test.cfg
index c88922bdf400..784f11193a67 100644
--- a/data/scenario-test.cfg
+++ b/data/scenario-test.cfg
@@ -2344,7 +2344,7 @@ Over the land are scattered villages where you can heal your troops and gather t
The Creatures
^^^^^^^^^^^^^
-In the world of Wesnoth there dwell humans, elves, dwarves, orcs, drakes, saurians, mermen, nagas, and many other races yet more obscure and wondrous. In accursed lands walk undead and ghosts and specters; monsters lurk in its ruins and dungeons. Each has adapted to particular terrains. Humans inhabit primarily the temperate grasslands. In the hills, mountains and underground caves orcs and dwarves are most at home. In the forests the elves reign supreme. In the oceans and rivers mermen and nagas dominate.
+In the world of Wesnoth there dwell humans, elves, dwarves, orcs, drakes, saurians, merfolk, nagas, and many other races yet more obscure and wondrous. In accursed lands walk undead and ghosts and specters; monsters lurk in its ruins and dungeons. Each has adapted to particular terrains. Humans inhabit primarily the temperate grasslands. In the hills, mountains and underground caves orcs and dwarves are most at home. In the forests the elves reign supreme. In the oceans and rivers, merfolk and nagas dominate.
For game purposes, the races group into factions; for example, orcs often cooperate with trolls, and elves or dwarves with humans. Some other factions reflect divisions within human society — loyalists vs. outlaws, for example. In most campaigns, you will control units drawn a single faction. But sometimes factions make alliances with others, so you may face more than one faction in a scenario."
[/message]