more double space removal..

This commit is contained in:
Gunter Labes 2007-09-15 11:50:33 +00:00
parent f0bab910b4
commit 85f5d31fb6
21 changed files with 42 additions and 42 deletions

View file

@ -179,7 +179,7 @@
[/terrain]
{TERRAIN_BASE xx flat/road}
# Place a door at DOOR_X, DOOR_Y, which is opened by moving a unit of side 1 to location X1,Y1 or X2,Y2. FACING should be one of two values: "nesw" OR "nwse", depending on which direction the door should face. This last selects which graphic to use.
# Place a door at DOOR_X, DOOR_Y, which is opened by moving a unit of side 1 to location X1,Y1 or X2,Y2. FACING should be one of two values: "nesw" OR "nwse", depending on which direction the door should face. This last selects which graphic to use.
# This macro must be used inside an [event]
#define PLACE_DOOR DOOR_X DOOR_Y FACING X1 Y1 X2 Y2
[terrain]

View file

@ -119,11 +119,11 @@
#define DIALOGUE_SH_PURSUE
[message]
speaker=Drogan
message=_ "That was bravely done, lad, holding the orcs off by yourself. The mages taught you well. But there is grave news from the village; your sister Dela was wounded in the attack. Healers attend her, but she may not live out the hour."
message=_ "That was bravely done, lad, holding the orcs off by yourself. The mages taught you well. But there is grave news from the village; your sister Dela was wounded in the attack. Healers attend her, but she may not live out the hour."
[/message]
[message]
speaker=Malin Keshar
message=_ "Orcs. Foul, pestilent creatures. The wide green world would be a better place with them all dead. Dead!"
message=_ "Orcs. Foul, pestilent creatures. The wide green world would be a better place with them all dead. Dead!"
[/message]
[message]
speaker=Drogan
@ -388,7 +388,7 @@
#define DIALOGUE_OW_START
[message]
speaker=Malin Keshar
message=_ "Since the very founding of Wesnoth you have hounded humans at every turn. You have raided my home at every opportunity. You have trampled our fields, slaughtered our livestock. You have brought war to a place of peace, and death to a place of life. You have killed without remorse, and despoiled that which was once beautiful. You have murdered my father and caused endless trouble to me. Now I shall have my revenge on you. Expect no mercy from me, because you have long since lost the right to it. I will crush you into the dust. The attacks on Hal'al will stop here and now. When I bring word of your demise the town will cheer my triumphant return."
message=_ "Since the very founding of Wesnoth you have hounded humans at every turn. You have raided my home at every opportunity. You have trampled our fields, slaughtered our livestock. You have brought war to a place of peace, and death to a place of life. You have killed without remorse, and despoiled that which was once beautiful. You have murdered my father and caused endless trouble to me. Now I shall have my revenge on you. Expect no mercy from me, because you have long since lost the right to it. I will crush you into the dust. The attacks on Hal'al will stop here and now. When I bring word of your demise the town will cheer my triumphant return."
[/message]
[message]
speaker=Borth
@ -1059,7 +1059,7 @@
[/filter]
[message]
speaker=narrator
message=_ "Fear is the path to the dark side. Fear leads to anger. Anger leads to hate. Hate leads to suffering."
message=_ "Fear is the path to the dark side. Fear leads to anger. Anger leads to hate. Hate leads to suffering."
image=wesnoth-icon.png
[/message]
[/event]

View file

@ -444,7 +444,7 @@
[/filter]
[message]
x,y=24,13
message=_ "AAAAAAAaaaaaaaggggggghhhhhhh!!!!...... . . . ."
message=_ "AAAAAAAaaaaaaaggggggghhhhhhh!!!!...... . . . ."
[/message]
{MOVE_UNIT (x,y=24,13) 25 13}
[kill]

View file

@ -18,7 +18,7 @@
experience=50
cost=41
usage=fighter
unit_description= _ "The ghast is a creature taken from humankind's most primal nightmares. Unlike their lesser cousins, ghouls and necrophages, ghasts are not patient enough to wait for their victim to die from poison before consuming the body. They attack directly with their enormous mouths, trying to rip the flesh straight from their foes. Once their enemy is defeated, they eat the rest of the body, gaining strength in the process.
unit_description= _ "The ghast is a creature taken from humankind's most primal nightmares. Unlike their lesser cousins, ghouls and necrophages, ghasts are not patient enough to wait for their victim to die from poison before consuming the body. They attack directly with their enormous mouths, trying to rip the flesh straight from their foes. Once their enemy is defeated, they eat the rest of the body, gaining strength in the process.
Special Notes: This unit gains 1 hitpoint added to its maximum whenever it kills a living unit.
"+{SPECIAL_NOTES_POISON}

View file

@ -145,7 +145,7 @@
[/message]
[message]
description=Tarwen
message= _ "Insolent peasants, you will kneel before your betters! Asheviere is the queen of Wesnoth. The King fell three weeks ago at Abez. I shall not bandy words with you. Your magistrate will be coming with us, and we do not care if it is dead or alive."
message= _ "Insolent peasants, you will kneel before your betters! Asheviere is the queen of Wesnoth. The King fell three weeks ago at Abez. I shall not bandy words with you. Your magistrate will be coming with us, and we do not care if it is dead or alive."
[/message]
{GENERIC_UNIT 2 Cavalryman 19 7}
@ -256,7 +256,7 @@
[message]
description=Baldras
message= _ "Very well. We will go to Delwyn and share counsel with them. I never thought Wesnoth would fall into darkness. Now, not only do the orcs threaten our lands, but some sinister thing is happening with the ascent of the Queen to the throne."
message= _ "Very well. We will go to Delwyn and share counsel with them. I never thought Wesnoth would fall into darkness. Now, not only do the orcs threaten our lands, but some sinister thing is happening with the ascent of the Queen to the throne."
[/message]
[message]

View file

@ -175,7 +175,7 @@
[/message]
[message]
description=Baldras
message= _ "You do not understand. We attacked a Wesnoth army patrol. Not only that, the leader was no man I had ever seen in Annuvin province before. Never has one been sent out here as a patrol captain who was so ruthless and cruel."
message= _ "You do not understand. We attacked a Wesnoth army patrol. Not only that, the leader was no man I had ever seen in Annuvin province before. Never has one been sent out here as a patrol captain who was so ruthless and cruel."
[/message]
[message]
description=Harper

View file

@ -186,7 +186,7 @@
[message]
description=Lord Maddock
message= _ "Baldras, your trip here was not wise. The Queen's patrols have been visiting the local villages and bringing the elders here. Those that swear allegience to the Queen are allowed to return home. Those that do not..."
message= _ "Baldras, your trip here was not wise. The Queen's patrols have been visiting the local villages and bringing the elders here. Those that swear allegience to the Queen are allowed to return home. Those that do not..."
[/message]
[message]
description=Baldras
@ -194,7 +194,7 @@
[/message]
[message]
description=Lord Maddock
message= _ "Well, they do not come within the walls of my city. They are actually camped nearby, and the main garrison is further southeast at Halstead. I know my time will soon come to swear allegience, but they do not press me. They are afraid I will refuse."
message= _ "Well, they do not come within the walls of my city. They are actually camped nearby, and the main garrison is further southeast at Halstead. I know my time will soon come to swear allegience, but they do not press me. They are afraid I will refuse."
[/message]
[message]
description=Baldras
@ -218,7 +218,7 @@
[/message]
[message]
description=Kestrel
message= _ "A foolish miscalculation, Lord Maddock. These men with which you consort are outlaws and fugitives. They are a well-organized gang of criminals and murderers. We will kill them and then expect your oath of allegiance to Queen Asheviere."
message= _ "A foolish miscalculation, Lord Maddock. These men with which you consort are outlaws and fugitives. They are a well-organized gang of criminals and murderers. We will kill them and then expect your oath of allegiance to Queen Asheviere."
[/message]
[message]
description=Lord Maddock
@ -389,7 +389,7 @@
[/message]
[message]
description=Kestrel
message= _ "We are accursed. We were once under the command of Prince Eldred, the King's son and betrayer. The price for our treason is this hellish existence. We know not who or what inflicted this curse upon us, but our mortal deaths may be only the beginning of the penance we are doomed to pay."
message= _ "We are accursed. We were once under the command of Prince Eldred, the King's son and betrayer. The price for our treason is this hellish existence. We know not who or what inflicted this curse upon us, but our mortal deaths may be only the beginning of the penance we are doomed to pay."
[/message]
[kill]

View file

@ -420,7 +420,7 @@
[/message]
[message]
speaker=unit
message= _ "Yes, just south of here. You should avoid the main gate. The west gate is heavily traveled but is less guarded than the east gate. Try to sneak in that way."
message= _ "Yes, just south of here. You should avoid the main gate. The west gate is heavily traveled but is less guarded than the east gate. Try to sneak in that way."
[/message]
[if]
[variable]
@ -467,7 +467,7 @@
[/if]
[message]
speaker=unit
message= _ "You must. Make a run for it if you have to. There is a small path that leads out of the city to the southeast and into the forest; look for the signpost. My brother Hans is waiting for you at that gate so he can take you to our master."
message= _ "You must. Make a run for it if you have to. There is a small path that leads out of the city to the southeast and into the forest; look for the signpost. My brother Hans is waiting for you at that gate so he can take you to our master."
[/message]
[/event]
[event]

View file

@ -208,7 +208,7 @@
[/message]
[message]
description=Helicrom
message= _ "I am Helicrom, and you should not be so glib. I control dangerous men. My henchmen can slip unseen through any city, rob a man while he sleeps, or attack a caravan head-on. It's not noble work, but our pursuits require plenty of gold."
message= _ "I am Helicrom, and you should not be so glib. I control dangerous men. My henchmen can slip unseen through any city, rob a man while he sleeps, or attack a caravan head-on. It's not noble work, but our pursuits require plenty of gold."
[/message]
[message]
description=Baldras
@ -216,7 +216,7 @@
[/message]
[message]
description=Helicrom
message= _ "The former King's magic ministry kept a tight control on the training and employment of mages in Wesnoth. Those of us who dared to... depart from the curriculum, you might say, were dealt with harshly. We are outcasts because we seek to master shadow magic. Our secrecy and security are not cheap."
message= _ "The former King's magic ministry kept a tight control on the training and employment of mages in Wesnoth. Those of us who dared to... depart from the curriculum, you might say, were dealt with harshly. We are outcasts because we seek to master shadow magic. Our secrecy and security are not cheap."
[/message]
[message]
description=Baldras
@ -224,7 +224,7 @@
[/message]
[message]
description=Helicrom
message= _ "Wrong. Necromancers become slaves to their lich masters and eventually lose their humanity. We have proven that practicing the dark arts need not lead down that path to damnation. We remain human, and seek the mystical secret of balance between the ways of light and darkness. We dance between both ways, adhering to neither."
message= _ "Wrong. Necromancers become slaves to their lich masters and eventually lose their humanity. We have proven that practicing the dark arts need not lead down that path to damnation. We remain human, and seek the mystical secret of balance between the ways of light and darkness. We dance between both ways, adhering to neither."
[/message]
[message]
description=Baldras
@ -232,7 +232,7 @@
[/message]
[message]
description=Helicrom
message= _ "We don't. You have sought us out. But, I do know of your situation and am willing to help. Any weakening the Throne of Wesnoth, whether it be occupied by King or Queen, aids us."
message= _ "We don't. You have sought us out. But, I do know of your situation and am willing to help. Any weakening the Throne of Wesnoth, whether it be occupied by King or Queen, aids us."
[/message]
[message]
description=Helicrom
@ -386,7 +386,7 @@
[command]
[message]
description=Helicrom
message= _ "Alright. I need time to clean up this forest and recall my men from the countryside. We will be ready to march in 7 days. All now hinges on you! Until then..."
message= _ "Alright. I need time to clean up this forest and recall my men from the countryside. We will be ready to march in 7 days. All now hinges on you! Until then..."
[/message]
[set_variable]

View file

@ -147,7 +147,7 @@
[message]
description=Baldras
message= _ "The words of Lord Maddock have weighed heavy on me these past few days. It has dawned on me that we can never win. We will never defeat the entire army of Wesnoth. Idiocy! If the noble lord of Elensefar is unwilling to resist the Queen, how should I ever expect to?"
message= _ "The words of Lord Maddock have weighed heavy on me these past few days. It has dawned on me that we can never win. We will never defeat the entire army of Wesnoth. Idiocy! If the noble lord of Elensefar is unwilling to resist the Queen, how should I ever expect to?"
[/message]
[message]
description=Harper
@ -179,7 +179,7 @@
[message]
description=Pitcher
message= _ "Master Baldras, I bring news from the north. During the past week, several patrols have again ventured across the Great River into Annuvin. A man named Relnan opposed them with a small militia. He was victorious."
message= _ "Master Baldras, I bring news from the north. During the past week, several patrols have again ventured across the Great River into Annuvin. A man named Relnan opposed them with a small militia. He was victorious."
[/message]
[message]
description=Majel
@ -187,11 +187,11 @@
[/message]
[message]
description=Pitcher
message= _ "I am afraid it is not. The Queen is sending a branch of her main field army directly from Weldyn. As soon as they arrive, they will burn every village to the ground. No one will live."
message= _ "I am afraid it is not. The Queen is sending a branch of her main field army directly from Weldyn. As soon as they arrive, they will burn every village to the ground. No one will live."
[/message]
[message]
description=Baldras
message= _ "The troop movements all make sense now. We must stop this army from reaching the garrison. We cannot swallow them whole, but we can gnaw away at them. They mustn't take one step without us being there to harass and delay them. When they reach Halstead they must be exhausted or dying."
message= _ "The troop movements all make sense now. We must stop this army from reaching the garrison. We cannot swallow them whole, but we can gnaw away at them. They mustn't take one step without us being there to harass and delay them. When they reach Halstead they must be exhausted or dying."
[/message]
[message]
description=Harper
@ -317,7 +317,7 @@
[else]
[message]
description=Baldras
message= _ "What a bloody mess. We must attack Halstead next. If we wait, they will become invincible. If we can burn it to the ground before that happens, our people may have a chance. Rest well tonight, because tomorrow's battle will decide the fate of our homes, our families, and our freedom."
message= _ "What a bloody mess. We must attack Halstead next. If we wait, they will become invincible. If we can burn it to the ground before that happens, our people may have a chance. Rest well tonight, because tomorrow's battle will decide the fate of our homes, our families, and our freedom."
[/message]
[if]

View file

@ -304,7 +304,7 @@
[/message]
[message]
description=Helicrom
message= _ "I believe it will. Each tower has a passage down to the catacombs. If we can reach the center of each tower, one of our men can escape down to the bowels of the mountain and destroy its support. I am sure we will need to demolish no less than all four supports to raze the fortress."
message= _ "I believe it will. Each tower has a passage down to the catacombs. If we can reach the center of each tower, one of our men can escape down to the bowels of the mountain and destroy its support. I am sure we will need to demolish no less than all four supports to raze the fortress."
[/message]
[/then]
[else]
@ -330,7 +330,7 @@
[/message]
[message]
description=Baldras
message= _ "I believe it will. Each tower has a passage down to the catacombs. If we can reach the center of each tower, one of our men can escape down to the bowels of the mountain and destroy its support. I am sure we will need to demolish no less than all four supports to raze the fortress."
message= _ "I believe it will. Each tower has a passage down to the catacombs. If we can reach the center of each tower, one of our men can escape down to the bowels of the mountain and destroy its support. I am sure we will need to demolish no less than all four supports to raze the fortress."
[/message]
[/else]
[/if]
@ -759,7 +759,7 @@
[/message]
[message]
description=Baldras
message= _ "But we are so close to the end. We must finish this. I am sorry you will not be able to enjoy our freedom. Goodbye, Harper."
message= _ "But we are so close to the end. We must finish this. I am sorry you will not be able to enjoy our freedom. Goodbye, Harper."
[/message]
{VARIABLE harper_dead 1}
[/event]

View file

@ -29,7 +29,7 @@
{CROSS 206 217}
[/part]
[part]
story= _ "As the main body of Asheviere's army neared the ruins of Halstead, strange things began to happen. Every night, men would disappear. Others were found hacked to bloody pieces. Unexplained misfortune plagued the marching columns. Soldiers dropped dead where they stood, slain by unseen assassins. Fear of an undead menace spread through the ranks."
story= _ "As the main body of Asheviere's army neared the ruins of Halstead, strange things began to happen. Every night, men would disappear. Others were found hacked to bloody pieces. Unexplained misfortune plagued the marching columns. Soldiers dropped dead where they stood, slain by unseen assassins. Fear of an undead menace spread through the ranks."
background="maps/wesnoth.png"
{CROSS 155 287}
{CROSS 145 284}
@ -53,7 +53,7 @@
background="maps/wesnoth.png"
[/part]
[part]
story= _ "The peasants-turned-outlaws finally reached Dallben. It was burnt to the ground. In a panic, they raced through the forest to Delwyn. It was likewise devastated. However, they did find one clue as to what happened..."
story= _ "The peasants-turned-outlaws finally reached Dallben. It was burnt to the ground. In a panic, they raced through the forest to Delwyn. It was likewise devastated. However, they did find one clue as to what happened..."
background="maps/wesnoth.png"
{DOT_TIME 139 240 0}
{DOT_TIME 143 228 0}
@ -74,7 +74,7 @@
background=epilogue2.jpg
[/part]
[part]
story= _ "'If you wish to find us, head west. When you reach the land's end, just keep going. See you soon, old friend. - Relnan' "
story= _ "'If you wish to find us, head west. When you reach the land's end, just keep going. See you soon, old friend. - Relnan' "
background=epilogue3.jpg
[/part]
[/story]

View file

@ -1,7 +1,7 @@
#textdomain wesnoth-l
# Note: This is intended to be identical to the mainline Dark Sorcerer unit
# except for having the ID "Dark Sorcerer2" . The ID is actually a sideways
# except for having the ID "Dark Sorcerer2" . The ID is actually a sideways
# way to encode the fact that this unit ought to turn into a Red Mage in
# daylight (Dark Sorcerer without the 2 turns into a White Mage).

View file

@ -49,7 +49,7 @@
story= _ "After that day, nothing could be the same. Hope rose in their hearts like a flame long-smothered but rekindled. The brightest and boldest of them began to plan and to train in secret. And the orcish masters, grown stupid from their own arrogance, did not see."
[/part]
[part]
story= _ "There was one among these peasants named Tallin. He had been a little child, barely out of his mother's arms, when Konrad broke the Orcish host. But he never forgot that day. His father was a weaponsmith, his family used less brutally than most because the orcish masters put more value on that craft. In secret, his mother even taught him letters. As the boy grew to young manhood, he could touch blades, and dream. And he did."
story= _ "There was one among these peasants named Tallin. He had been a little child, barely out of his mother's arms, when Konrad broke the Orcish host. But he never forgot that day. His father was a weaponsmith, his family used less brutally than most because the orcish masters put more value on that craft. In secret, his mother even taught him letters. As the boy grew to young manhood, he could touch blades, and dream. And he did."
[/part]
[part]
story= _ "Then one day Al'tar, the current 'master' of Dwarven Doors, was attacked by a neighboring tribe of orcs. Tallin seized his moment. Using knowledge born of years of watching, listening and planning, he managed to steal a few weapons and a small amount of Al'Tar's gold. He fled to an abandoned ruin in the forest to rally his fellow peasants."

View file

@ -70,7 +70,7 @@
[/part]
[part]
story= _ "That is the problem lad, we ha' been stranded in these tunnels for years now, almost completely cut off from sources of food or metals or tools. It ha' been as much as we could do to survive. We'll ha' more food again now that we can reach the surface, and tools aplenty there are in the stores where we couldna' reach while the orcs and trolls held them. But metal will be scarce for a while yet; ore will have to be briught in for smelting, first."
story= _ "That is the problem lad, we ha' been stranded in these tunnels for years now, almost completely cut off from sources of food or metals or tools. It ha' been as much as we could do to survive. We'll ha' more food again now that we can reach the surface, and tools aplenty there are in the stores where we couldna' reach while the orcs and trolls held them. But metal will be scarce for a while yet; ore will have to be briught in for smelting, first."
background=portraits/Hamel.jpg
[/part]

View file

@ -833,7 +833,7 @@
[message]
description=Hamel
message= _ "Aye. We must do both. I'm thinking it might be best if I muster my folk to start on the weapon-making while you and your followers pursue yon lich. By the time you've laid him to final rest and return here, we'll ha' made a good start on the work."
message= _ "Aye. We must do both. I'm thinking it might be best if I muster my folk to start on the weapon-making while you and your followers pursue yon lich. By the time you've laid him to final rest and return here, we'll ha' made a good start on the work."
[/message]
[message]

View file

@ -4,11 +4,11 @@
#
# This campaign was apparently designed before the geography of Wesnoth
# was fixed to the main map -- there was a reference in it to unknown forest
# south of the "Great River", which doesn't fit at all. To rescue this, the
# south of the "Great River", which doesn't fit at all. To rescue this, the
# original tSG Great River has to be either the unnamed river running through
# the Aethenwood or off the map entirely. I've opted for the latter, thus the
# reference to Kerlath being "in the furthermost south", and renamed the river
# as the "Black River". Since the original campaign placed the "elvish woods"
# as the "Black River". Since the original campaign placed the "elvish woods"
# west of Westin, I'm supposing they're in fact a southern (off-map) lobe
# of the Aethenwood.
#

View file

@ -521,7 +521,7 @@ Most units have about 50% defense in rocky caves, whereas cavalry are limited to
title= _ "Mushroom Grove"
text= "<img>src=terrain/mushrooms-tile.png align=left box=no</img>
" + _ "Mushroom groves are vast underground forests of giant mushrooms, which thrive in the damp darkness. Most units have trouble negotiating the spongy floor of smaller fungi, but they have plenty of cover behind the larger stalks. Mounted units, however, become completely mired and lack proper freedom of movement in combat. Undead units have a natural affinity for decay and function quite well in mushroom forests.
" + _ "Mushroom groves are vast underground forests of giant mushrooms, which thrive in the damp darkness. Most units have trouble negotiating the spongy floor of smaller fungi, but they have plenty of cover behind the larger stalks. Mounted units, however, become completely mired and lack proper freedom of movement in combat. Undead units have a natural affinity for decay and function quite well in mushroom forests.
Most units receive 50% to 60% defense in mushroom groves, whereas cavalry receive only 20%."
[/topic]

View file

@ -427,7 +427,7 @@ gamemap::location ai_interface::move_unit_partial(location from, location to,
std::vector<location> steps = rt->second.steps;
while(steps.empty() == false && (!(info_.units.find(to) == info_.units.end() || from == to))){
LOG_AI << "AI attempting illegal move. Attempting to move onto existing unit\n";
LOG_AI << "AI attempting illegal move. Attempting to move onto existing unit\n";
LOG_AI << "\t" << info_.units.find(to)->second.underlying_description() <<" already on " << to << "\n";
LOG_AI <<"\tremoving "<<*(steps.end()-1)<<"\n";
to = *(steps.end()-1);

View file

@ -1132,7 +1132,7 @@ bool show_theme_dialog(display& disp)
return(1);
}
}else{
gui::message_dialog(disp,"",_("No known themes. Try changing from within an existing game.")).show();
gui::message_dialog(disp,"",_("No known themes. Try changing from within an existing game.")).show();
}
return(0);
}

View file

@ -287,7 +287,7 @@ void upload_log::quit(int turn)
//! Ask user for permission to upload his game-stats.
void upload_log_dialog::show_beg_dialog(display& disp)
{
std::string msg = std::string(_("Wesnoth relies on volunteers like yourself for feedback, especially beginners and new players. Wesnoth keeps summaries of your games: you can help us improve game play by giving permission to send these summaries (anonymously) to wesnoth.org.\n"))
std::string msg = std::string(_("Wesnoth relies on volunteers like yourself for feedback, especially beginners and new players. Wesnoth keeps summaries of your games: you can help us improve game play by giving permission to send these summaries (anonymously) to wesnoth.org.\n"))
+ " \n`" + _("Summaries are stored here:")
+ " \n`~" + get_upload_dir() + "\n \n`"
+ _("You can view the results at:") + "\n`~"