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

Rectifying the incorrect merge committed by 2007-08-23T23:35:30Z!mythological@mt.net.mk

Browse source 
where I completed the dialog in HttT's 19c_Cliffs_of_Thoria.cfg
This commit is contained in:
Dimitar Ilccov 2007-08-23 23:45:10 +00:00
parent f4c8f24048
commit cd5ef40068
1 changed files with 15 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -353,19 +353,11 @@
[/message]
[message]
description=Keh Ohn
<<<<<<< .mine
message= _ "I am Keh Ohn, leader of the Drakes who have settled down on these cliffs. Who are you?"
=======
message= _ "I am Keh Ohn, leader of the Drakes who have settled upon these cliffs. Who are you?"
>>>>>>> .r19754
[/message]
[message]
description=Konrad
<<<<<<< .mine
message= _ "A talking daragon?"
=======
message= _ "A talking dragon?"
>>>>>>> .r19754
[/message]
[message]
description="Li'sar"
@ -377,11 +369,7 @@
[/message]
[message]
description=Delfador
<<<<<<< .mine
message= _ "Drakes here ? But Drakes have never been seen in Wesnoth before... Are you sure it is a drake?"
=======
message= _ "Here? But, drakes have never been seen in Wesnoth before... Are you certain of this?"
>>>>>>> .r19754
[/message]
[message]
role=merman-advisor
@ -564,7 +552,7 @@ Soooo... It is you who sent your subordinates to attack us. Now when we've destr
[/gold]
[message]
speaker=unit
message= _ "We've found $random gold in the drake base"
message= _ "We've found $random gold in the drake base."
image=items/gold-coins-medium.png
[/message]
@ -594,7 +582,7 @@ Soooo... It is you who sent your subordinates to attack us. Now when we've destr
[/gold]
[message]
speaker=unit
message= _ "We've found $random gold in the drake base"
message= _ "We've found $random gold in the drake base."
image=items/gold-coins-medium.png
[/message]
@ -624,7 +612,7 @@ Soooo... It is you who sent your subordinates to attack us. Now when we've destr
[/gold]
[message]
speaker=unit
message= _ "We've found $random gold in the drake base"
message= _ "We've found $random gold in the drake base."
image=items/gold-coins-medium.png
[/message]
@ -654,7 +642,7 @@ Soooo... It is you who sent your subordinates to attack us. Now when we've destr
[/gold]
[message]
speaker=unit
message= _ "We've found $random gold in the drake base"
message= _ "We've found $random gold in the drake base."
image=items/gold-coins-medium.png
[/message]
@ -684,7 +672,7 @@ Soooo... It is you who sent your subordinates to attack us. Now when we've destr
[/gold]
[message]
speaker=unit
message= _ "We've found $random gold in the drake base"
message= _ "We've found $random gold in the drake base."
image=items/gold-coins-medium.png
[/message]
@ -714,7 +702,7 @@ Soooo... It is you who sent your subordinates to attack us. Now when we've destr
[/gold]
[message]
speaker=unit
message= _ "We've found $random gold in the drake base"
message= _ "We've found $random gold in the drake base."
image=items/gold-coins-medium.png
[/message]
@ -744,7 +732,7 @@ Soooo... It is you who sent your subordinates to attack us. Now when we've destr
[/gold]
[message]
speaker=unit
message= _ "We've found $random gold in the drake base"
message= _ "We've found $random gold in the drake base."
image=items/gold-coins-medium.png
[/message]
@ -774,7 +762,7 @@ Soooo... It is you who sent your subordinates to attack us. Now when we've destr
[/gold]
[message]
speaker=unit
message= _ "We've found $random gold in the drake base"
message= _ "We've found $random gold in the drake base."
image=items/gold-coins-medium.png
[/message]
@ -804,7 +792,7 @@ Soooo... It is you who sent your subordinates to attack us. Now when we've destr
[/gold]
[message]
speaker=unit
message= _ "We've found $random gold in the drake base"
message= _ "We've found $random gold in the drake base."
image=items/gold-coins-medium.png
[/message]
@ -834,7 +822,7 @@ Soooo... It is you who sent your subordinates to attack us. Now when we've destr
[/gold]
[message]
speaker=unit
message= _ "We've found $random gold in the drake base"
message= _ "We've found $random gold in the drake base."
image=items/gold-coins-medium.png
[/message]
@ -864,7 +852,7 @@ Soooo... It is you who sent your subordinates to attack us. Now when we've destr
[/gold]
[message]
speaker=unit
message= _ "We've found $random gold in the drake base"
message= _ "We've found $random gold in the drake base."
image=items/gold-coins-medium.png
[/message]
@ -894,7 +882,7 @@ Soooo... It is you who sent your subordinates to attack us. Now when we've destr
[/gold]
[message]
speaker=unit
message= _ "We've found $random gold in the drake base"
message= _ "We've found $random gold in the drake base."
image=items/gold-coins-medium.png
[/message]
@ -1325,15 +1313,15 @@ Soooo... It is you who sent your subordinates to attack us. Now when we've destr
[message]
description=Warven
message= _ "Who...who are you? A friend or a foe"
message= _ "Who...who are you? A friend or a foe?"
[/message]
[message]
speaker=unit
message= _ "We are friends. Don't worry about it and don't try to fight us - you are in no position to fight"
message= _ "We are friends. Don't worry about it and don't try to fight us - you are in no position to fight."
[/message]
[message]
description=Li'sar
message= _ "I am Princess Li'sar, and we are friends. Join us and wait for the healers to help you, young sargeant"
message= _ "I am Princess Li'sar, and we are friends. Join us and wait for the healers to help you, young sargeant."
[/message]
[message]
description=Warven