0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

HttT: change mermen to merfolk/mer

Browse source
This commit is contained in:
nemaara 2019-04-14 11:38:18 -04:00
parent a2fa0666cf
commit 75f02d5b81
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/campaigns/Heir_To_The_Throne/scenarios/03_The_Isle_of_Alduin.cfg
View file

@ -310,7 +310,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]

4
data/campaigns/Heir_To_The_Throne/scenarios/04_The_Bay_of_Pearls.cfg
View file

@ -555,7 +555,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]
@ -665,7 +665,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]

4
data/campaigns/Heir_To_The_Throne/scenarios/05b_Isle_of_the_Damned.cfg
View file

@ -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]
@ -176,7 +176,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

4
data/campaigns/Heir_To_The_Throne/scenarios/19c_Cliffs_of_Thoria.cfg
View file

@ -245,7 +245,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
@ -338,7 +338,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]