Author: shadowmaster
Date: Sun Apr 27 23:35:40 2008
New Revision: 26189

URL: http://svn.gna.org/viewcvs/wesnoth?rev=26189&view=rev
Log:
* More i18n fixes on the same vein (ally name)

Modified:
    
trunk/data/campaigns/Under_the_Burning_Suns/scenarios/11_Battle_for_Zocthanol_Isle.cfg
    
trunk/data/campaigns/Under_the_Burning_Suns/scenarios/12_The_Final_Confrontation.cfg
    trunk/data/campaigns/Under_the_Burning_Suns/scenarios/13_Epilogue.cfg

Modified: 
trunk/data/campaigns/Under_the_Burning_Suns/scenarios/11_Battle_for_Zocthanol_Isle.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Under_the_Burning_Suns/scenarios/11_Battle_for_Zocthanol_Isle.cfg?rev=26189&r1=26188&r2=26189&view=diff
==============================================================================
--- 
trunk/data/campaigns/Under_the_Burning_Suns/scenarios/11_Battle_for_Zocthanol_Isle.cfg
 (original)
+++ 
trunk/data/campaigns/Under_the_Burning_Suns/scenarios/11_Battle_for_Zocthanol_Isle.cfg
 Sun Apr 27 23:35:40 2008
@@ -2070,19 +2070,11 @@
             [/then]
 
             [else]
-                [store_unit]
-                    [filter]
-                        id=$ally_name
-                    [/filter]
-                    kill=no
-                    variable=temp_ally_store
-                [/store_unit]
                 [message]
                     speaker=$ally_name
                     image=portraits/grog.png
-                    message= _ "$temp_ally_store.name not going to just sit 
here while Kaleh does all the fighting. Kaleh will need strong fighter like 
$ally_name. Other elves may be scared, but $temp_ally_store.name fear no dark 
place. $temp_ally_store.name just hope there still something to smash when he 
gets there."
+                    message= _ "$intl_ally_name not going to just sit here 
while Kaleh does all the fighting. Kaleh will need strong fighter like 
$intl_ally_name|. Other elves may be scared, but $intl_ally_name fear no dark 
place. $intl_ally_name just hope there still something to smash when he gets 
there."
                 [/message]
-                {CLEAR_VARIABLE temp_ally_store}
             [/else]
         [/if]
 

Modified: 
trunk/data/campaigns/Under_the_Burning_Suns/scenarios/12_The_Final_Confrontation.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Under_the_Burning_Suns/scenarios/12_The_Final_Confrontation.cfg?rev=26189&r1=26188&r2=26189&view=diff
==============================================================================
--- 
trunk/data/campaigns/Under_the_Burning_Suns/scenarios/12_The_Final_Confrontation.cfg
 (original)
+++ 
trunk/data/campaigns/Under_the_Burning_Suns/scenarios/12_The_Final_Confrontation.cfg
 Sun Apr 27 23:35:40 2008
@@ -596,28 +596,11 @@
             [/have_unit]
 
             [then]
-                [if]
-                    [variable]
-                        name=ally_race
-                        equals=Dwarf
-                    [/variable]
-
-                    [then]
-                        [message]
-                            speaker=Kaleh
-                            image=portraits/kaleh.png
-                            message= _ "Nym, Zhul, $ally_name , you shouldn't 
have."
-                        [/message]
-                    [/then]
-
-                    [else]
-                        [message]
-                            speaker=Kaleh
-                            image=portraits/kaleh.png
-                            message= _ "Nym, Zhul, $ally_name , you shouldn't 
have."
-                        [/message]
-                    [/else]
-                [/if]
+                [message]
+                    speaker=Kaleh
+                    image=portraits/kaleh.png
+                    message= _ "Nym, Zhul, $intl_ally_name|, you shouldn't 
have."
+                [/message]
             [/then]
 
             [else]
@@ -1860,7 +1843,7 @@
                 [message]
                     speaker=$ally_name
                     image=portraits/grog.png
-                    message= _ "Ugh. $ally_name is covered in blood and guts 
and nasty blue goo. Whatever creature was, she doesn't smell any better dead 
than she did alive."
+                    message= _ "Ugh. $intl_ally_name is covered in blood and 
guts and nasty blue goo. Whatever creature was, she doesn't smell any better 
dead than she did alive."
                 [/message]
             [/else]
         [/if]

Modified: trunk/data/campaigns/Under_the_Burning_Suns/scenarios/13_Epilogue.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Under_the_Burning_Suns/scenarios/13_Epilogue.cfg?rev=26189&r1=26188&r2=26189&view=diff
==============================================================================
--- trunk/data/campaigns/Under_the_Burning_Suns/scenarios/13_Epilogue.cfg 
(original)
+++ trunk/data/campaigns/Under_the_Burning_Suns/scenarios/13_Epilogue.cfg Sun 
Apr 27 23:35:40 2008
@@ -171,7 +171,7 @@
                         [message]
                             speaker=Kaleh
                             image=portraits/kaleh.png
-                            message= _ "If you had told me at the start of our 
journey the price I was to pay in blood, I do not know if I would have had the 
strength to take that first step. I suppose I should have known that my friends 
would not let me confront Yechnagoth alone. But I would gladly give up my life 
today if I could bring $ally_name back. He left his homeland to fight 
faithfully by my side, and then to lose him at the end... I wish I could go 
back and do it all over again."
+                            message= _ "If you had told me at the start of our 
journey the price I was to pay in blood, I do not know if I would have had the 
strength to take that first step. I suppose I should have known that my friends 
would not let me confront Yechnagoth alone. But I would gladly give up my life 
today if I could bring $intl_ally_name back. He left his homeland to fight 
faithfully by my side, and then to lose him at the end... I wish I could go 
back and do it all over again."
                         [/message]
                     [/then]
                 [/if]
@@ -240,7 +240,7 @@
                         [message]
                             speaker=Kaleh
                             image=portraits/kaleh.png
-                            message= _ "Although I believe that our battle in 
the black citadel was our finest hour, I am still haunted by the death of 
$ally_name in that dark place. And so every morning at sunrise I come out to 
the southeastern tip of the island and look out upon the waters, upon the world 
that we sacrificed so much to preserve. I remind myself what Zhul said, and 
they all believed, that despite all the death and fighting we saw in our 
journey, this world was a beautiful and good enough place that $ally_name was 
willing to sacrifice his life to save it. Looking out over the waters, and back 
upon the prosperity of my people, I tell myself it was worth it. But when I 
think of the desperate war that his people are probably still fighting 
underground, it seems a small consolation."
+                            message= _ "Although I believe that our battle in 
the black citadel was our finest hour, I am still haunted by the death of 
$intl_ally_name in that dark place. And so every morning at sunrise I come out 
to the southeastern tip of the island and look out upon the waters, upon the 
world that we sacrificed so much to preserve. I remind myself what Zhul said, 
and they all believed, that despite all the death and fighting we saw in our 
journey, this world was a beautiful and good enough place that $intl_ally_name 
was willing to sacrifice his life to save it. Looking out over the waters, and 
back upon the prosperity of my people, I tell myself it was worth it. But when 
I think of the desperate war that his people are probably still fighting 
underground, it seems a small consolation."
                         [/message]
                     [/then]
                 [/if]
@@ -315,7 +315,7 @@
                         [message]
                             speaker=Kaleh
                             image=portraits/rogrimir.png
-                            message= _ "I am saddened by the death of 
$ally_name, but by saving my life in the end he did fulfill his life debt to 
me. I think he also would have been glad to have died in battle. I considered 
leading an expedition to go back and return his body to his people, but my 
fellow elves have been weakened by our long journey and I do not want to risk 
losing any more. Instead I searched all across the islands and at last in the 
rocky outcroppings to the northwest I found a series of caves. They were not as 
deep as his homeland but I thought $ally_name would have appreciated being laid 
to rest under some solid rock. And so we buried him with much honor and will 
long remember the service that his kind has done for our people."
+                            message= _ "I am saddened by the death of 
$intl_ally_name, but by saving my life in the end he did fulfill his life debt 
to me. I think he also would have been glad to have died in battle. I 
considered leading an expedition to go back and return his body to his people, 
but my fellow elves have been weakened by our long journey and I do not want to 
risk losing any more. Instead I searched all across the islands and at last in 
the rocky outcroppings to the northwest I found a series of caves. They were 
not as deep as his homeland but I thought $intl_ally_name would have 
appreciated being laid to rest under some solid rock. And so we buried him with 
much honor and will long remember the service that his kind has done for our 
people."
                         [/message]
                     [/then]
 
@@ -323,7 +323,7 @@
                         [message]
                             speaker=Kaleh
                             image=portraits/grog.png
-                            message= _ "I am saddened by the death of 
$ally_name, but by saving my life in the end he did fulfill his life debt to 
me. I think he also would have been glad to have died in battle. I considered 
leading an expedition to go back and return his body to his people, but my 
fellow elves have been weakened by our long journey and I do not want to risk 
losing any more. Instead I searched all across the islands and at last in the 
rocky outcroppings to the northwest I found a series of caves. They were not as 
deep as his homeland but I thought $ally_name would have appreciated being laid 
to rest under some solid rock. And so we buried him with much honor and will 
long remember the service that his kind has done for our people."
+                            message= _ "I am saddened by the death of 
$intl_ally_name, but by saving my life in the end he did fulfill his life debt 
to me. I think he also would have been glad to have died in battle. I 
considered leading an expedition to go back and return his body to his people, 
but my fellow elves have been weakened by our long journey and I do not want to 
risk losing any more. Instead I searched all across the islands and at last in 
the rocky outcroppings to the northwest I found a series of caves. They were 
not as deep as his homeland but I thought $intl_ally_name would have 
appreciated being laid to rest under some solid rock. And so we buried him with 
much honor and will long remember the service that his kind has done for our 
people."
                         [/message]
                     [/else]
                 [/if]
@@ -380,7 +380,7 @@
                         [message]
                             speaker=Kaleh
                             image=portraits/rogrimir.png
-                            message= _ "By saving my life, $ally_name 
fulfilled his life debt to me, but we convinced him to hang around for a while 
and revel in the celebrations that we held after our great victory. We 
celebrated for days and days, thanking Eloh and the merfolk's god, and 
delighting in the bounty and beauty of our new home. Afterwards we set to work 
building new dwellings for our people. $ally_name stayed to help us with the 
construction, he was the hardest worker among us. But after a while he came to 
me and told me that he had to return to his own people. $ally_name said his 
time with us had been like a wonderful dream, and he promised he would remember 
us always, but his people needed him and he had to go back home. He said that 
someday he would return and visit us again, but I doubt I shall ever see him 
again in life. All the same I treasure the memory of him and his kind, and I 
will long remember his steadfast loyalty and all that he did to aid us in our 
struggle."
+                            message= _ "By saving my life, $intl_ally_name 
fulfilled his life debt to me, but we convinced him to hang around for a while 
and revel in the celebrations that we held after our great victory. We 
celebrated for days and days, thanking Eloh and the merfolk's god, and 
delighting in the bounty and beauty of our new home. Afterwards we set to work 
building new dwellings for our people. $intl_ally_name stayed to help us with 
the construction, he was the hardest worker among us. But after a while he came 
to me and told me that he had to return to his own people. $intl_ally_name said 
his time with us had been like a wonderful dream, and he promised he would 
remember us always, but his people needed him and he had to go back home. He 
said that someday he would return and visit us again, but I doubt I shall ever 
see him again in life. All the same I treasure the memory of him and his kind, 
and I will long remember his steadfast loyalty and all that he did to aid us in 
our struggle."
                         [/message]
                     [/then]
 
@@ -388,7 +388,7 @@
                         [message]
                             speaker=Kaleh
                             image=portraits/grog.png
-                            message= _ "By saving my life, $ally_name 
fulfilled his life debt to me, but we convinced him to hang around for a while 
and revel in the celebrations that we held after our great victory. We 
celebrated for days and days, thanking Eloh and the merfolk's god, and 
delighting in the bounty and beauty of our new home. And afterwards we set to 
work building new dwellings for our people. $ally_name stayed to help us with 
the construction, he was the hardest worker among us. But after a while he came 
to me and told me that he had to return to his own people. $ally_name said his 
time with us had been like a wonderful dream, and he promised he would remember 
us always, but his people needed him and he had to go back home. He said that 
someday he would return and visit us again, but I doubt I shall ever see him 
again in life. All the same I treasure the memory of him and his kind, and I 
will long remember his steadfast loyalty and all that he did to aid us in our 
struggle. "
+                            message= _ "By saving my life, $intl_ally_name 
fulfilled his life debt to me, but we convinced him to hang around for a while 
and revel in the celebrations that we held after our great victory. We 
celebrated for days and days, thanking Eloh and the merfolk's god, and 
delighting in the bounty and beauty of our new home. And afterwards we set to 
work building new dwellings for our people. $intl_ally_name stayed to help us 
with the construction, he was the hardest worker among us. But after a while he 
came to me and told me that he had to return to his own people. $intl_ally_name 
said his time with us had been like a wonderful dream, and he promised he would 
remember us always, but his people needed him and he had to go back home. He 
said that someday he would return and visit us again, but I doubt I shall ever 
see him again in life. All the same I treasure the memory of him and his kind, 
and I will long remember his steadfast loyalty and all that he did to aid us in 
our struggle. "
                         [/message]
                     [/else]
                 [/if]
@@ -418,7 +418,7 @@
                         [message]
                             speaker=Kaleh
                             image=portraits/rogrimir.png
-                            message= _ "And I will always remember $ally_name 
who died along our journey. A braver warrior I have never seen, and though he 
was taken from us too soon, I am glad for the short time that I knew him."
+                            message= _ "And I will always remember 
$intl_ally_name who died along our journey. A braver warrior I have never seen, 
and though he was taken from us too soon, I am glad for the short time that I 
knew him."
                         [/message]
                     [/then]
 
@@ -426,7 +426,7 @@
                         [message]
                             speaker=Kaleh
                             image=portraits/grog.png
-                            message= _ "And I will always remember $ally_name 
who died along our journey. A braver warrior I have never seen, and though he 
was taken from us too soon, I am glad for the short time that I knew him."
+                            message= _ "And I will always remember 
$intl_ally_name who died along our journey. A braver warrior I have never seen, 
and though he was taken from us too soon, I am glad for the short time that I 
knew him."
                         [/message]
                     [/else]
                 [/if]


_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits

Reply via email to