[Wesnoth-cvs-commits] wesnoth/data scenarios/Heir_To_The_Throne/Battl...

[Guillaume Melquiond]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Guillaume Melquiond <address@hidden>    04/10/19 18:55:51

Modified files:
        data/scenarios/Heir_To_The_Throne: Battle_for_Wesnoth.cfg 
        data           : utils.cfg 

Log message:
        More and more translatable strings. And remove a macro not used anymore 
(I hope).

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/utils.cfg.diff?tr1=1.11&tr2=1.12&r1=text&r2=text

Patches:
Index: wesnoth/data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg
diff -u wesnoth/data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:1.6 
wesnoth/data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:1.7
--- wesnoth/data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:1.6        
Fri Oct  1 19:15:09 2004
+++ wesnoth/data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg    Tue Oct 
19 18:55:51 2004
@@ -137,11 +137,26 @@
                [recall]
                description=Li'sar
                [/recall]
-               {MESSAGE Asheviere ("So, these rebels come at last to face me, 
while most of my army is off fighting the fickle clans.")}
-               {MESSAGE Li'sar ("Surrender, mother. The land's blood is spent. 
I have come to take my rightful place.")}
-               {MESSAGE Asheviere ("Ahh. My own daughter, a turncoat. So it is 
true. Such treason my reign must endure! But endure it will.")}
-               {MESSAGE Delfador ("How long must the people endure your rule? 
Give the throne to your daughter. She is the rightful heir. We even hold the 
scepter to prove it!")}
-               {MESSAGE Asheviere ("Delfador! My old tormentor! Treason! Men! 
Sieze them! Kill them! Kill them all!")}
+               [message]
+               speaker=Asheviere
+               message= _ "So, these rebels come at last to face me, while 
most of my army is off fighting the fickle clans."
+               [/message]
+               [message]
+               speaker=Li'sar
+               message= _ "Surrender, mother. The land's blood is spent. I 
have come to take my rightful place."
+               [/message]
+               [message]
+               speaker=Asheviere
+               message= _ "Ahh. My own daughter, a turncoat. So it is true. 
Such treason my reign must endure! But endure it will."
+               [/message]
+               [message]
+               speaker=Delfador
+               message= _ "How long must the people endure your rule? Give the 
throne to your daughter. She is the rightful heir. We even hold the scepter to 
prove it!"
+               [/message]
+               [message]
+               speaker=Asheviere
+               message= _ "Delfador! My old tormentor! Treason! Men! Seize 
them! Kill them! Kill them all!"
+               [/message]
        [/event]
 
        [event]
@@ -149,10 +164,22 @@
                [filter]
                description=Asheviere
                [/filter]
-               {MESSAGE Asheviere ("Treason! The evil ones have slain me!")}
-               {MESSAGE Delfador ("And so passes Asheviere, the dark queen of 
Wesnoth.")}
-               {MESSAGE Konrad ("We have won at last! Li'sar! You will be 
queen!")}
-               {MESSAGE Li'sar ("Yes, but I won't ever forget what you have 
done for me, Konrad, Delfador, and Kalenz.")}
+               [message]
+               speaker=Asheviere
+               message= _ "Treason! The evil ones have slain me!"
+               [/message]
+               [message]
+               speaker=Delfador
+               message= _ "And so passes Asheviere, the dark queen of Wesnoth."
+               [/message]
+               [message]
+               speaker=Konrad
+               message= _ "We have won at last! Li'sar! You will be queen!"
+               [/message]
+               [message]
+               speaker=Li'sar
+               message= _ "Yes, but I won't ever forget what you have done for 
me, Konrad, Delfador, and Kalenz."
+               [/message]
                [endlevel]
                result=continue
                [/endlevel]
Index: wesnoth/data/utils.cfg
diff -u wesnoth/data/utils.cfg:1.11 wesnoth/data/utils.cfg:1.12
--- wesnoth/data/utils.cfg:1.11 Sun Sep 19 20:44:21 2004
+++ wesnoth/data/utils.cfg      Tue Oct 19 18:55:51 2004
@@ -167,10 +167,3 @@
 [/event]
 #enddef
 
-#define MESSAGE SPEAKER MSG
-       [message]
-       speaker={SPEAKER}
-       message= _ {MSG}
-       [/message]
-#enddef
-