From 7186e30803a61ff9e21ca71f1badcc139d69839c Mon Sep 17 00:00:00 2001 From: josteph Date: Tue, 18 Sep 2018 03:34:53 +0000 Subject: [PATCH] Typo fixes In Caves of the Basilisk, give the monsters names so their descriptions would show in-game. The descriptions show in the tooltip, so a non-empty name is required in order for players to be able to summon th tooltip. --- .../scenarios/01_Defend_the_Forest.cfg | 2 +- data/campaigns/Dead_Water/scenarios/01_Invasion.cfg | 2 +- .../Descent_Into_Darkness/scenarios/09_A_Small_Favor3.cfg | 2 +- .../Heir_To_The_Throne/scenarios/07_Crossroads.cfg | 2 +- .../scenarios/09_The_Valley_of_Death.cfg | 2 +- .../Heir_To_The_Throne/scenarios/13_The_Dwarven_Doors.cfg | 3 +++ .../scenarios/18_A_Choice_Must_Be_Made.cfg | 2 +- .../Heir_To_The_Throne/scenarios/19b_Swamp_Of_Dread.cfg | 2 +- .../Heir_To_The_Throne/scenarios/20a_North_Elves.cfg | 4 ++-- .../Heir_To_The_Throne/scenarios/23_Test_of_the_Clans.cfg | 2 +- data/campaigns/Heir_To_The_Throne/utils/intro.cfg | 2 +- .../scenarios/chapter1/02_Hostile_Mountains.cfg | 2 +- data/campaigns/Liberty/scenarios/01_The_Raid.cfg | 2 +- .../campaigns/Liberty/scenarios/03_A_Strategy_Of_Hope.cfg | 2 +- data/campaigns/Liberty/scenarios/04_Unlawful_Orders.cfg | 2 +- data/campaigns/Liberty/scenarios/08_Glory.cfg | 2 +- .../scenarios/07_Mages_and_Drakes.cfg | 4 ++-- .../The_Hammer_of_Thursagan/scenarios/08_Fear.cfg | 2 +- .../scenarios/10_The_Siege_of_Kal_Kartha.cfg | 4 ++-- data/campaigns/Two_Brothers/scenarios/02_The_Chase.cfg | 2 +- .../Two_Brothers/scenarios/03_Guarded_Castle.cfg | 4 ++-- data/core/about_i18n.cfg | 1 + data/core/units.cfg | 8 ++++---- data/multiplayer/scenarios/2p_Caves_of_the_Basilisk.cfg | 8 ++++++-- src/events.cpp | 2 +- src/gui/dialogs/wml_message.hpp | 2 +- src/playmp_controller.cpp | 2 +- src/saved_game.cpp | 2 +- src/units/unit.cpp | 2 +- 29 files changed, 43 insertions(+), 35 deletions(-) diff --git a/data/campaigns/An_Orcish_Incursion/scenarios/01_Defend_the_Forest.cfg b/data/campaigns/An_Orcish_Incursion/scenarios/01_Defend_the_Forest.cfg index ac9091aea0d1..44926257431a 100644 --- a/data/campaigns/An_Orcish_Incursion/scenarios/01_Defend_the_Forest.cfg +++ b/data/campaigns/An_Orcish_Incursion/scenarios/01_Defend_the_Forest.cfg @@ -146,7 +146,7 @@ [message] speaker=Erlornas - message=_ "So the grim tales of them prove true. They must not be allowed to continue; we must banish this blight from our forests. I shall marshal the wardens and drive them off. And the Council needs to hear of this; take the message and return with reinforcements, there might be more of them." + message=_ "So the grim tales of them prove true. They must not be allowed to continue; we must banish this blight from our forests. I shall marshal the wardens and drive them off. And the Council needs to hear of this; take the message and return with reinforcements, for there might be more of them." [/message] [message] diff --git a/data/campaigns/Dead_Water/scenarios/01_Invasion.cfg b/data/campaigns/Dead_Water/scenarios/01_Invasion.cfg index 7640945e1c7c..6cd492777759 100644 --- a/data/campaigns/Dead_Water/scenarios/01_Invasion.cfg +++ b/data/campaigns/Dead_Water/scenarios/01_Invasion.cfg @@ -623,7 +623,7 @@ [/message] [message] speaker=Gwabbo - message= _ "Good work Kai, if I may say so." + message= _ "Good work, Kai, if I may say so." [/message] [/event] diff --git a/data/campaigns/Descent_Into_Darkness/scenarios/09_A_Small_Favor3.cfg b/data/campaigns/Descent_Into_Darkness/scenarios/09_A_Small_Favor3.cfg index 8b2099f58610..595b3c076f4c 100644 --- a/data/campaigns/Descent_Into_Darkness/scenarios/09_A_Small_Favor3.cfg +++ b/data/campaigns/Descent_Into_Darkness/scenarios/09_A_Small_Favor3.cfg @@ -13,7 +13,7 @@ {SCENARIO_MUSIC the_city_falls.ogg} {EXTRA_SCENARIO_MUSIC the_king_is_dead.ogg} - # No storyl; this occurs immediately after the previous scenario + # No story; this occurs immediately after the previous scenario # wmllint: validate-off [side] diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/07_Crossroads.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/07_Crossroads.cfg index 69e32d5d9211..7d06e330842b 100644 --- a/data/campaigns/Heir_To_The_Throne/scenarios/07_Crossroads.cfg +++ b/data/campaigns/Heir_To_The_Throne/scenarios/07_Crossroads.cfg @@ -50,7 +50,7 @@ show_title=no [/part] [part] - story= _ "The queen’s agents were still scouring the coastal regions, for news of Elensefar’s rescue had not yet reached her." + story= _ "The Queen’s agents were still scouring the coastal regions, for news of Elensefar’s rescue had not yet reached her." {HTTT_BIGMAP} show_title=no [/part] diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/09_The_Valley_of_Death.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/09_The_Valley_of_Death.cfg index 69adacb23a61..d6be6032a040 100644 --- a/data/campaigns/Heir_To_The_Throne/scenarios/09_The_Valley_of_Death.cfg +++ b/data/campaigns/Heir_To_The_Throne/scenarios/09_The_Valley_of_Death.cfg @@ -386,7 +386,7 @@ [/message] [message] speaker=Moremirmu - message= _ "It is both my duty and pleasure, my lord! We were dining with some royal guards of the princess, taking a rest from our pilgrimage, when they spoke of how you were tricked into traveling these dangerous lands. We could do nothing but help you!" + message= _ "It is both my duty and pleasure, my lord! We were dining with some royal guards of the Princess, taking a rest from our pilgrimage, when they spoke of how you were tricked into traveling these dangerous lands. We could do nothing but help you!" [/message] [message] speaker=Konrad diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/13_The_Dwarven_Doors.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/13_The_Dwarven_Doors.cfg index ef7a3df9d1ef..500a78062cc1 100644 --- a/data/campaigns/Heir_To_The_Throne/scenarios/13_The_Dwarven_Doors.cfg +++ b/data/campaigns/Heir_To_The_Throne/scenarios/13_The_Dwarven_Doors.cfg @@ -416,6 +416,7 @@ end [then] [message] speaker=Uncle Somf + # po: The addressed person is the speaker's niece or nephew. message= _ "$outlaw_name|! How have you been? I haven’t seen you in years." [/message] [/then] @@ -423,6 +424,7 @@ end [else] [message] speaker=Uncle Somf + # po: The mentioned person, $outlaw_name, is the speaker's niece or nephew. message= _ "Haw! Any friend of $outlaw_name is a friend of mine too." [/message] [/else] @@ -483,6 +485,7 @@ end [message] speaker=Uncle Somf + # po: The addressed person is the speaker's niece or nephew. message= _ "How are we doing, $outlaw_name|?" [/message] [message] diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/18_A_Choice_Must_Be_Made.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/18_A_Choice_Must_Be_Made.cfg index 3325473cdcef..f013d7ba31d7 100644 --- a/data/campaigns/Heir_To_The_Throne/scenarios/18_A_Choice_Must_Be_Made.cfg +++ b/data/campaigns/Heir_To_The_Throne/scenarios/18_A_Choice_Must_Be_Made.cfg @@ -332,7 +332,7 @@ [message] speaker=Konrad {KONRAD_VARIATION concerned} - message= _ "Hold your tongue, Kalenz. The princess is our ally and of royal blood. She deserves not your disrespect." + message= _ "Hold your tongue, Kalenz. The Princess is our ally and of royal blood. She deserves not your disrespect." [/message] [message] speaker=Kalenz diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/19b_Swamp_Of_Dread.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/19b_Swamp_Of_Dread.cfg index cbf863c67029..cb62ef187119 100644 --- a/data/campaigns/Heir_To_The_Throne/scenarios/19b_Swamp_Of_Dread.cfg +++ b/data/campaigns/Heir_To_The_Throne/scenarios/19b_Swamp_Of_Dread.cfg @@ -336,7 +336,7 @@ [/message] [message] speaker=Konrad - message= _ "Aimucasur? So you know of this Lich-Lord? Did you know him? He was a powerful mage?" + message= _ "Aimucasur? So you know of this Lich-Lord? Did you know him? Was he a powerful mage?" [/message] [message] speaker=Delfador diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/20a_North_Elves.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/20a_North_Elves.cfg index f5329b9122ae..22bebbb66394 100644 --- a/data/campaigns/Heir_To_The_Throne/scenarios/20a_North_Elves.cfg +++ b/data/campaigns/Heir_To_The_Throne/scenarios/20a_North_Elves.cfg @@ -516,7 +516,7 @@ [/message] [message] speaker=Konrad - message= _ "Stop for a moment, princess. Look — you can barely see them in the distance there, but the advance scouts have found each other. The Queen’s troops are marching full speed for the orcs’ camp, and vice-versa. These armies are out for blood." + message= _ "Stop for a moment, Princess. Look — you can barely see them in the distance there, but the advance scouts have found each other. The Queen’s troops are marching full speed for the orcs’ camp, and vice-versa. These armies are out for blood." [/message] [message] speaker="Li'sar" @@ -524,7 +524,7 @@ [/message] [message] speaker=Konrad - message= _ "(hushed) Our soldiers will defend us as we rush across the field. Sorry to be blunt, princess, but you and I are the only ones who need to make it across alive." + message= _ "(hushed) Our soldiers will defend us as we rush across the field. Sorry to be blunt, Princess, but you and I are the only ones who need to make it across alive." [/message] [message] speaker=Delfador diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/23_Test_of_the_Clans.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/23_Test_of_the_Clans.cfg index 904f5a9b6f5c..435948e1a6de 100644 --- a/data/campaigns/Heir_To_The_Throne/scenarios/23_Test_of_the_Clans.cfg +++ b/data/campaigns/Heir_To_The_Throne/scenarios/23_Test_of_the_Clans.cfg @@ -465,7 +465,7 @@ [/message] [message] speaker=Delfador - message= _ "You will serve us. You will protect our flanks while we make way straight for the queen. With you on either flank, we can surely overcome her." + message= _ "You will serve us. You will protect our flanks while we make way straight for the Queen. With you on either flank, we can surely overcome her." [/message] [message] speaker=Kalenz diff --git a/data/campaigns/Heir_To_The_Throne/utils/intro.cfg b/data/campaigns/Heir_To_The_Throne/utils/intro.cfg index 7a2ef24cc777..964e22b611dc 100644 --- a/data/campaigns/Heir_To_The_Throne/utils/intro.cfg +++ b/data/campaigns/Heir_To_The_Throne/utils/intro.cfg @@ -9,7 +9,7 @@ [/part] [part] # wmllint: local spelling Galcadar - story= _ "The Northern host encamped at Galcadar, by the ford of Abez, and the king led his forces to meet them. Splitting his army in two, he led one half while his son, the crown prince Eldred, led the other." + story= _ "The Northern host encamped at Galcadar, by the Ford of Abez, and the king led his forces to meet them. Splitting his army in two, he led one half while his son, the crown prince Eldred, led the other." background=story/httt_story1.jpg [/part] [part] diff --git a/data/campaigns/Legend_of_Wesmere/scenarios/chapter1/02_Hostile_Mountains.cfg b/data/campaigns/Legend_of_Wesmere/scenarios/chapter1/02_Hostile_Mountains.cfg index 90ad0b50e777..0b7bbc94500c 100644 --- a/data/campaigns/Legend_of_Wesmere/scenarios/chapter1/02_Hostile_Mountains.cfg +++ b/data/campaigns/Legend_of_Wesmere/scenarios/chapter1/02_Hostile_Mountains.cfg @@ -474,7 +474,7 @@ [/message] [message] id=Landar - message= _ "Our troubles will be yours, too, whether either of us will it or not. The orcs have come down from the north like a flood; if we squabble among ourselves they will feast on our discord." + message= _ "Our troubles will be yours, too, whether either of us wills it or not. The orcs have come down from the north like a flood; if we squabble among ourselves they will feast on our discord." [/message] [message] id=Olurf diff --git a/data/campaigns/Liberty/scenarios/01_The_Raid.cfg b/data/campaigns/Liberty/scenarios/01_The_Raid.cfg index 1f9a17012cbc..01f92d1838b0 100644 --- a/data/campaigns/Liberty/scenarios/01_The_Raid.cfg +++ b/data/campaigns/Liberty/scenarios/01_The_Raid.cfg @@ -19,7 +19,7 @@ [story] [part] - story= _ "In the Era of Turmoil, during the reign of King Garard II, the border towns of Delwyn and Dallben in the province of Annuvin grew increasingly dissatisfied with the King’s rule. Being preoccupied with the great wars, the King was unable to send adequate forces to protect the frontier." + story= _ "In the Era of Turmoil, during the reign of King Garard II, the border towns of Delwyn and Dallben in the Province of Annuvin grew increasingly dissatisfied with the King’s rule. Being preoccupied with the great wars, the King was unable to send adequate forces to protect the frontier." background=story/frontier.jpg [/part] [part] diff --git a/data/campaigns/Liberty/scenarios/03_A_Strategy_Of_Hope.cfg b/data/campaigns/Liberty/scenarios/03_A_Strategy_Of_Hope.cfg index c2e605ee27a5..dd133910c38c 100644 --- a/data/campaigns/Liberty/scenarios/03_A_Strategy_Of_Hope.cfg +++ b/data/campaigns/Liberty/scenarios/03_A_Strategy_Of_Hope.cfg @@ -181,7 +181,7 @@ [/message] [message] speaker=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] speaker=Harper diff --git a/data/campaigns/Liberty/scenarios/04_Unlawful_Orders.cfg b/data/campaigns/Liberty/scenarios/04_Unlawful_Orders.cfg index 8b1bb63a9f47..35f2a60a27ba 100644 --- a/data/campaigns/Liberty/scenarios/04_Unlawful_Orders.cfg +++ b/data/campaigns/Liberty/scenarios/04_Unlawful_Orders.cfg @@ -200,7 +200,7 @@ [/message] [message] speaker=Harper - message= _ "What can we do then? We have brought with us many from Annuvin province who are willing to fight, but our families are still at home. They will not last long if the Queen’s patrols return." + message= _ "What can we do then? We have brought with us many from Annuvin Province who are willing to fight, but our families are still at home. They will not last long if the Queen’s patrols return." [/message] [message] speaker=Lord Maddock diff --git a/data/campaigns/Liberty/scenarios/08_Glory.cfg b/data/campaigns/Liberty/scenarios/08_Glory.cfg index 7fd4a589a883..925bddadf93c 100644 --- a/data/campaigns/Liberty/scenarios/08_Glory.cfg +++ b/data/campaigns/Liberty/scenarios/08_Glory.cfg @@ -800,7 +800,7 @@ Uu, Uu, Chr, Uh, Re, Uu, Uu, Uh, Uu, Chr, Chr name=time over [message] speaker=narrator - message= _ "After more than a week of fierce fighting, the main body of Asheviere’s host arrived from Weldyn. The battle was soon finished. Every last man from the province of Annuvin was executed." + message= _ "After more than a week of fierce fighting, the main body of Asheviere’s host arrived from Weldyn. The battle was soon finished. Every last man from the Province of Annuvin was executed." image="wesnoth-icon.png" [/message] [endlevel] diff --git a/data/campaigns/The_Hammer_of_Thursagan/scenarios/07_Mages_and_Drakes.cfg b/data/campaigns/The_Hammer_of_Thursagan/scenarios/07_Mages_and_Drakes.cfg index fed24511ced3..8bb06dd04db9 100644 --- a/data/campaigns/The_Hammer_of_Thursagan/scenarios/07_Mages_and_Drakes.cfg +++ b/data/campaigns/The_Hammer_of_Thursagan/scenarios/07_Mages_and_Drakes.cfg @@ -193,12 +193,12 @@ #ifdef EASY [message] speaker=Master Perrin - message= _ "We’re grateful for your assistance. And I’d like to send a couple of our senior apprentices with you to the east. It has come time for them to be journeymen... and I sense something being born to the east that I do not like the feel of." + message= _ "We’re grateful for your assistance. Moreover, I’d like to send a couple of our senior apprentices with you to the east. It has come time for them to be journeymen... and I sense something being born to the east that I do not like the feel of." [/message] #else [message] speaker=Master Perrin - message= _ "We’re grateful for your assistance. And I’d like to send one of our senior apprentices with you to the east. It has come time for him to be a journeyman... and I sense something being born to the east that I do not like the feel of." + message= _ "We’re grateful for your assistance. Moreover, I’d like to send one of our senior apprentices with you to the east. It has come time for him to be a journeyman... and I sense something being born to the east that I do not like the feel of." [/message] #endif diff --git a/data/campaigns/The_Hammer_of_Thursagan/scenarios/08_Fear.cfg b/data/campaigns/The_Hammer_of_Thursagan/scenarios/08_Fear.cfg index 0a03a22546e9..f4861086bfcf 100644 --- a/data/campaigns/The_Hammer_of_Thursagan/scenarios/08_Fear.cfg +++ b/data/campaigns/The_Hammer_of_Thursagan/scenarios/08_Fear.cfg @@ -369,7 +369,7 @@ [message] speaker=Angarthing - message= _ "They were seeking captives. To what purpose, I cannot say. But I doubt it was any good one." + message= _ "They were seeking captives. To what purpose, I cannot say, but I doubt it was any good one." [/message] [kill] diff --git a/data/campaigns/The_Hammer_of_Thursagan/scenarios/10_The_Siege_of_Kal_Kartha.cfg b/data/campaigns/The_Hammer_of_Thursagan/scenarios/10_The_Siege_of_Kal_Kartha.cfg index de37de29102f..589fcf3a5aa3 100644 --- a/data/campaigns/The_Hammer_of_Thursagan/scenarios/10_The_Siege_of_Kal_Kartha.cfg +++ b/data/campaigns/The_Hammer_of_Thursagan/scenarios/10_The_Siege_of_Kal_Kartha.cfg @@ -322,7 +322,7 @@ [message] speaker=Angarthing - message=_"A runemaster? There had been none such since Thursagan’s day. And for one to lead a holding was unheard-of; they tended towards the solitary life." + message=_"A runemaster? There have been none such since Thursagan’s day. And for one to lead a holding was unheard-of; they tended towards the solitary life." [/message] [message] @@ -347,7 +347,7 @@ [message] speaker=Dulcatulos - message=_"That’s for lords and loremasters to worry about, not the likes of me. I must see to my troop’s care. Food will be brought to you; rest well, we will speak again." + message=_"That’s for lords and loremasters to worry about, not the likes of me. I must see to my troop’s care. Food will be brought to you; rest well. We will speak again." [/message] [endlevel] diff --git a/data/campaigns/Two_Brothers/scenarios/02_The_Chase.cfg b/data/campaigns/Two_Brothers/scenarios/02_The_Chase.cfg index 5b05acfa5ec5..0c9d00687f68 100644 --- a/data/campaigns/Two_Brothers/scenarios/02_The_Chase.cfg +++ b/data/campaigns/Two_Brothers/scenarios/02_The_Chase.cfg @@ -447,7 +447,7 @@ Besides... I want my brother back." [message] speaker=Muff Toras - message= _ "Curses! If they had been an hour slower our master’s reinforcements would already be here to meet us." + message= _ "Curses! If they had been an hour slower, our master’s reinforcements would already be here to meet us." [/message] {VARIABLE found_kidnappers yes} diff --git a/data/campaigns/Two_Brothers/scenarios/03_Guarded_Castle.cfg b/data/campaigns/Two_Brothers/scenarios/03_Guarded_Castle.cfg index 3bdf416fdbc7..3a8bdc319afc 100644 --- a/data/campaigns/Two_Brothers/scenarios/03_Guarded_Castle.cfg +++ b/data/campaigns/Two_Brothers/scenarios/03_Guarded_Castle.cfg @@ -489,12 +489,12 @@ Yet for some reason I fear these brothers more. If Mordak were here it would be [message] speaker=Knago-Brek - message= _ "Haha! We not kill people for long time. Weapon wants blood. We now kill humans!!" + message= _ "Haha! We not kill people for long time. Weapon wants blood. We now kill humans!" [/message] [message] speaker=Arvith - message= _ "My sword-arm has a say in who will do the dying. Come on, men, let’s kill some orcs." + message= _ "My sword-arm shall have a say in who will do the dying. Come on, men, let’s kill some orcs." [/message] [/event] diff --git a/data/core/about_i18n.cfg b/data/core/about_i18n.cfg index 5816deb78333..5916791ac6f4 100644 --- a/data/core/about_i18n.cfg +++ b/data/core/about_i18n.cfg @@ -1714,6 +1714,7 @@ sort=yes [/about] [about] + # po: Real Acadèmia de Cultura Valenciana title = _"RACV’s Translation" # wmllint: no spellcheck [entry] name = "Mario Rodríguez (Mavorte)" diff --git a/data/core/units.cfg b/data/core/units.cfg index b1f46ae7f239..fce8520dcba8 100644 --- a/data/core/units.cfg +++ b/data/core/units.cfg @@ -65,7 +65,7 @@ Drakes are inherently magical creatures, with a mysterious internal fire fueling
text='Society'
Drakes are a relatively warlike race and their societies can be best described as cultured martial societies. The core of a drake tribe is a small group of veteran warriors headed by a mutually respected — or simply feared — dominant who rules the society with an iron fist. Every drake is expected to earn their place in the strict hierarchy, to obey their superiors and command their inferiors. Entry to the ruling elite is only possible through challenging and defeating a superior in single combat, which is the way the hierarchy within the elite itself is established. The use of deception of any kind towards any fellow drake is, without exception, seen as cowardly and unacceptable. -While their warlike nature and sense of territory drives them to defend their territories savagely, drakes rarely invade or trespass on areas already occupied by the other major races. Instead, they settle in unpopulated areas to establish their own territory there. They primarily feed on large game they hunt in the lowlands around their homes, but hatchlings and lower caste drakes are known to feed also on certain kinds of moss and fungi they cultivate deep in their caverns. The only technology drakes value is armor- and weapon-smithing, and neither know or need other science and culture besides this. However, the few implements they do fashion are almost unrivaled in quality, only matched by those produced in the finest Dwarvish foundries. +While their warlike nature and sense of territory drives them to defend their territories savagely, drakes rarely invade or trespass on areas already occupied by the other major races. Instead, they settle in unpopulated areas to establish their own territory there. They primarily feed on large game they hunt in the lowlands around their homes, but hatchlings and lower caste drakes are known to feed also on certain kinds of moss and fungi they cultivate deep in their caverns. Drakes value armor- and weapon-smithing, but neither know nor need other science and culture besides this. Nonetheless, the few implements they do fashion are almost unrivaled in quality, only matched by those produced in the finest Dwarvish foundries. Drakes hatch from eggs and usually live naturally between 20 to 30 years. Death in battle is the most preferred way for a drake to leave this world. Unlike the elder members of other races, drakes naturally grow more aggressive and reckless towards the ends of their natural lives, perhaps to help ensure their place in the heroic legends of their kind. @@ -98,7 +98,7 @@ Drakes originated from an archipelago of volcanic islands called dst='morog Possibly due to their isolation, the dwarves are generally distrustful or hostile towards most other races, particularly the elves. The single exception to this temperament is towards humans. This could be traced back to the era of Haldric I and the arrival of humans and orcs to the continent. At this point the dwarves began allowing some humans, mostly dissidents and outlaws from the Kingdom of Wesnoth, to settle in certain areas of the Northlands. Their motivation was unsurprising. The plight of these individuals reminded the dwarves of their early history of persecution, eliciting a sense of solidarity. The dwarves also had much to gain in forming a bond with these outcasts. They would settle in areas where dwarves disliked living themselves; plains, forests, and swamps, freeing them from defending these areas. -Dwarves are of small stature by human measure, but they are by no means fragile. Their warriors, tough and powerful are both feared and respected throughout the continent for their prowess in battle. In addition, dwarves are known for their calculating intellects and superb craftsmanship. Dwarven smiths are renowned for their deadly weapons and heavy armor. These accouterments are unrivaled in quality, possibly only matched by those produced by drake armorers. Their intelligence and natural inquisitiveness has also made them the most technically advanced race on the continent. One of their most famous, and feared, discoveries was a mysterious powder that produces an immense explosion when exposed to fire or sparks. Certain dwarf warriors use this powder to hurl small objects at tremendous speeds. Given their technological inclinations, many dwarves tend to distrust magic users. However some practice a form of magic based on the engraving of runes. Called runesmiths, they use these carvings to enchant items in order to augment certain aspects of their natures." +Dwarves are of small stature by human measure, but they are by no means fragile. Their warriors, tough and powerful are both feared and respected throughout the continent for their prowess in battle. In addition, dwarves are known for their calculating intellects and superb craftsmanship. Dwarven smiths are renowned for their deadly weapons and heavy armor. These accouterments are unrivaled in quality, possibly only matched by those produced by drake armorers. Their intelligence and natural inquisitiveness has also made them the most technically advanced race on the continent. One of their most famous, and feared, discoveries was a mysterious powder that produces an immense explosion when exposed to fire or sparks. Certain dwarf warriors use this powder to hurl small objects at tremendous speeds. Given their technological inclinations, many dwarves tend to distrust magic users. However, some practice a form of magic based on the engraving of runes. Called runesmiths, they use these carvings to enchant items in order to augment certain aspects of their natures." num_traits=2 undead_variation=dwarf {DWARVISH_NAMES} @@ -121,7 +121,7 @@ Elves are naturally imbued with magic to a small degree. Though most are unable A few elves, venturing far down the paths of magic and mysticism, become sensitive to the presence of cold iron and can even be burned by it. Elvish legend hints that this was more common in the far past. -Elves spend much of their time honing their talents and skills. Those not adept at the magical arts typically devote their time honing their physical skills. As a result, elves excel at archery, which is perhaps their most important method of warfare. Most elvish troops carry a bow and no other race can rival their archers in speed and accuracy. All elves also share an intense affection for unspoiled nature. They often feel uncomfortable in open unvegetated spaces. They live primarily in the forests of the Great Continent; the Aethenwood in the southwest, Wesmere in the northwest, and the great northern woods of which the Lintanir Forest is the southernmost edge. +Elves spend much of their time honing their talents and skills. Those not adept at the magical arts typically devote their time honing their physical skills. As a result, elves excel at archery, which is perhaps their most important method of warfare. Most elvish troops carry a bow and no other race can rival their archers in speed and accuracy. All elves also share an intense affection for unspoiled nature. They often feel uncomfortable in open, unvegetated spaces. They live primarily in the forests of the Great Continent; the Aethenwood in the southwest, Wesmere in the northwest, and the great northern woods of which the Lintanir Forest is the southernmost edge. Elves are the eldest race of the continent, with the possible exception of trolls. Many of their settlements cannot be reliably dated, undoubtedly having existed for over a millennium." num_traits=2 @@ -400,7 +400,7 @@ While undead lords arrived on the Great Continent in considerable numbers only i id=wose name= _ "race^Wose" plural_name= _ "race^Woses" - description= _ "The mighty wose resides within the deepest forests of the known world. To the untrained eye, the wose appears to be nothing more than an oddly shaped, yet noble, tree. As guardians of the forest, the woses share a deeper connection to the woodlands than even the elves. While the woses are a peaceful race, disturbance of the ancient forests, which they tend, will incite the wrath of nature itself. Woses are slow moving creatures that may spend centuries standing in one location undisturbed by the ebb and flow of time. + description= _ "The mighty wose resides within the deepest forests of the known world. To the untrained eye, the wose appears to be nothing more than an oddly shaped, yet noble, tree. As guardians of the forest, the woses share a connection to the woodlands deeper than even the elves’. While the woses are a peaceful race, disturbance of the ancient forests, which they tend, will incite the wrath of nature itself. Woses are slow moving creatures that may spend centuries standing in one location undisturbed by the ebb and flow of time. Although they practice no magic of their own, the woses share a deep connection to faerie. What little is known of this ancient race comes from elvish scholars who believe that this mystical power, which the mightiest elves have dedicated their lives to master, is inherent to the wose. Though woses resemble them, they share no ancestry with trees. Woses are believed to be some of the oldest creatures in the world, perhaps even more ancient than the forests in which they dwell, and it is thought that the power of faerie has given these beings the eternal task of serving as wardens of the forest. diff --git a/data/multiplayer/scenarios/2p_Caves_of_the_Basilisk.cfg b/data/multiplayer/scenarios/2p_Caves_of_the_Basilisk.cfg index bca31998f806..55603f258869 100644 --- a/data/multiplayer/scenarios/2p_Caves_of_the_Basilisk.cfg +++ b/data/multiplayer/scenarios/2p_Caves_of_the_Basilisk.cfg @@ -145,7 +145,9 @@ Marksman known as Dragonbane {UNIT_PETRIFY "Direwolf Rider" (_"Blum Duk") 8 18} [+unit] description=_ "Blum Duk was renowned among his goblin clan for having tamed one of the Dire Wolves of the mountains, and he had the courage to match. His leadership and skills alone were what kept the area’s goblins alive despite human and elvish menaces. Rumor had it that his wolf had slain fifty men and a hundred Elves. + Thus, when he heard of the awful monster that was inhabiting the area, it was only natural that he ride out alone to face it. All the other goblins expected him to slay the creature easily and drag back its carcass to feast on. + He was in for quite a shock. As soon as he saw the Basilisk, Blum Duk cowered in fright. He tried to wheel his wolf around to run away, but it wouldn’t move. As the creature stalked towards him, he screamed his last words: Good Gog, dog, are yer legs made of stone?! (inscribed by Elvish Pillager)" [/unit] @@ -157,7 +159,7 @@ He was in for quite a shock. As soon as he saw the Basilisk, Blum Duk cowered in [/unit] # wmllint: local spelling Turin - {UNIT_PETRIFY "Sea Serpent" "" 22 12} + {UNIT_PETRIFY "Sea Serpent" _"Turin's Monster of the Lake" 22 12} [+unit] facing=sw description=_ "He had lived there for ages upon ages, in the depths of the water, preying upon the various fish and frogs and merfolk that entered his domain. It was his lake, no other’s, and though it was not large, he was its master. Then, the Basilisk came, and looked into the Serpent’s eyes. And the Serpent had not died, but it was no longer alive. Thus the new lord of the lake had arrived. @@ -165,7 +167,7 @@ He was in for quite a shock. As soon as he saw the Basilisk, Blum Duk cowered in [/unit] # wmllint: local spelling WinnerA - {UNIT_PETRIFY "Giant Spider" "" 37 17} + {UNIT_PETRIFY "Giant Spider" _"The Spider" 37 17} [+unit] facing=sw description=_ "It would seem that no one knows the tale of this brave spider. @@ -192,7 +194,9 @@ He was in for quite a shock. As soon as he saw the Basilisk, Blum Duk cowered in {UNIT_PETRIFY "Elder Wose" _"Bramwythl" 34 6} [+unit] description=_ "Bramwythl the Wose was always considered a slow, taciturn fellow, even by other Woses. More than any other Wose, he enjoyed simply standing alone in the sun, arms upraised, admiring the beauty of the empty sky. Once, even, he confided in a fellow that his greatest wish was to be able to bask forever in the sun’s glory. + However, not long after, the local wose community heard of the approach of a horrible monster, powerful enough to easily destroy the few woses that lived in the area. They quickly moved off (quickly for Woses, anyway), but Bramwythl was left behind — in their haste, no one had remembered to find him and tell him of the danger. + He was taken quite unawares by the Basilisk, and turned to stone before he even recognized the beast. His petrified form still stands there today, warmed by the sun’s rays, under an open sky. His greatest wish has been granted. (inscribed by Elvish Pillager)" [/unit] diff --git a/src/events.cpp b/src/events.cpp index 34f0d69e223a..b5eec1b154ec 100644 --- a/src/events.cpp +++ b/src/events.cpp @@ -486,7 +486,7 @@ void pump() } // remove all inputs, draw events and only keep the last of the resize events - // This will turn horrible after ~38 days when the uint32_t wraps. + // This will turn horrible after ~49 days when the uint32_t wraps. if(resize_found || SDL_GetTicks() <= last_resize_event.window.timestamp + resize_timeout) { events.erase(std::remove_if(events.begin(), events.end(), remove_on_resize), events.end()); } else if(SDL_GetTicks() > last_resize_event.window.timestamp + resize_timeout && !last_resize_event_used) { diff --git a/src/gui/dialogs/wml_message.hpp b/src/gui/dialogs/wml_message.hpp index dd10b2d3ebeb..b363dcd6908a 100644 --- a/src/gui/dialogs/wml_message.hpp +++ b/src/gui/dialogs/wml_message.hpp @@ -228,7 +228,7 @@ struct wml_message_input */ struct wml_message_portrait { - /// FIlename of the portrait. + /// Filename of the portrait. std::string portrait; /// Does the portrait need to be mirrored? bool mirror; diff --git a/src/playmp_controller.cpp b/src/playmp_controller.cpp index d837146bc181..81458289f76a 100644 --- a/src/playmp_controller.cpp +++ b/src/playmp_controller.cpp @@ -301,7 +301,7 @@ void playmp_controller::wait_for_upload() void playmp_controller::after_human_turn(){ if(saved_game_.mp_settings().mp_countdown) { - //time_left + turn_bonus + (action_bouns * number of actions done) + //time_left + turn_bonus + (action_bonus * number of actions done) const int new_time_in_secs = (current_team().countdown_time() / 1000) + saved_game_.mp_settings().mp_countdown_turn_bonus + saved_game_.mp_settings().mp_countdown_action_bonus * current_team().action_bonus_count(); diff --git a/src/saved_game.cpp b/src/saved_game.cpp index 501fdb4cb7bb..7e9a937bd269 100644 --- a/src/saved_game.cpp +++ b/src/saved_game.cpp @@ -472,7 +472,7 @@ void saved_game::post_scenario_generation(const config& old_scenario, config& ge generated_scenario[str] = old_scenario[str]; } - // Preserve "story" form the scenario toplevel. + // Preserve "story" from the scenario toplevel. // Note that it does not delete [story] tags in generated_scenario, so you can still have your story // dependent on the generated scenario. for(const config& story : old_scenario.child_range("story")) { diff --git a/src/units/unit.cpp b/src/units/unit.cpp index a207544261f5..74a33afe8e8e 100644 --- a/src/units/unit.cpp +++ b/src/units/unit.cpp @@ -2611,7 +2611,7 @@ void unit::parse_upkeep(const config::attribute_value& upkeep) } else if(upkeep == upkeep_full::type()) { upkeep_ = upkeep_full(); } else { - WRN_UT << "Fund invalid upkeep=\"" << upkeep << "\" in a unit" << std::endl; + WRN_UT << "Found invalid upkeep=\"" << upkeep << "\" in a unit" << std::endl; upkeep_ = upkeep_full(); } }