apply patch #1871

(correct map count for all mainline campaigns) by elvish sovereign.

I'll let zookeeper test if that is correct

changelog

@@ -1,4 +1,6 @@
 Version 1.9.0+svn:
+ * Campaigns:
+   * Unified the campaign description of the number of scenarios. Now the the number reflects only the battle scenarios of each campaign.
  * Language and i18n:
    * Updated fonts: DejaVu 2.32
    * Updated translations: Chinese (Traditional), French, Hungarian,

data/campaigns/Dead_Water/_main.cfg

@@ -18,7 +18,7 @@
     {MENU_IMG_TXT2 "units/merfolk/triton.png~RC(magenta>red)" (_ "Triton") (_ "(Difficult)")}
     description= _ "You are Kai Krellis, son and heir of the last merman king but only a child. A necromancer is turning your subjects into undead slaves! Lead your people on a mission to convince a powerful mer-sorceress to help you repel the invasion. The oceans near the Northern Lands are perilous, so you will need cunning and bravery to be survive. But first you need to gain the respect of your troops!
 
-" + _ "(Intermediate level, 13 scenarios.)"
+" + _ "(Intermediate level, 10 scenarios.)"
     image="data/campaigns/Dead_Water/images/campaign_image.png"
 
     # This version, ready for mainline, is lightly adapted from UMC version 0.9.18

data/campaigns/Delfadors_Memoirs/_main.cfg

@@ -35,7 +35,7 @@
 
     description= _ "Wesnoth seems to be slipping inexorably into chaos, as marauding orcs pour south across the Great River, and mysterious and deadly creatures roam the night. Who is the shadowy Iliah-Malal? Can you defeat him before he destroys all life in Wesnoth?
 
-" + _ "(Intermediate level, 23 scenarios)"
+" + _ "(Intermediate level, 19 scenarios.)"
 
     [about]
         title= _ "Creator and Original Designer"

data/campaigns/Descent_Into_Darkness/_main.cfg

@@ -19,7 +19,7 @@
     ";" + {MENU_IMG_TXT2 "units/undead-necromancers/lich.png~RC(magenta>black)" _"Summoner" _"(Difficult)"}
     description=_ "Learn the dark arts of necromancy in order to save your people from an orcish incursion.
 
-" + _"(Intermediate level, 11 scenarios.)"
+" + _"(Intermediate level, 12 scenarios.)"
 
     [about]
         title = _ "Campaign Design"

data/campaigns/Eastern_Invasion/_main.cfg

@@ -18,7 +18,7 @@
     ";" + {MENU_IMG_TXT2 "units/human-loyalists/royalguard.png~RC(magenta>red)" _"Royal Guard" _"(Challenging)"}
     description= _ "There are rumors of undead attacks on the eastern border of Wesnoth. You, an officer in the Royal Army, have been sent to the eastern front to protect the villagers and find out what is happening.
 
-" + _"(Intermediate level, 18 scenarios.)"
+" + _"(Intermediate level, 16 scenarios.)"
     image="data/campaigns/Eastern_Invasion/images/campaign_image.png"
 
     [about]

data/campaigns/Heir_To_The_Throne/_main.cfg

@@ -18,7 +18,7 @@
     ";" + {MENU_IMG_TXT2 "units/elves-wood/champion.png~RC(magenta>red)" _"Champion" _"(Challenging)"}
     description= _ "Fight to regain the throne of Wesnoth, of which you are the legitimate heir.
 
-" + _"(Novice level, 25 scenarios.)"
+" + _"(Novice level, 23 scenarios.)"
     image="data/campaigns/Heir_To_The_Throne/images/campaign_image.png"
 
     [about]

data/campaigns/Legend_of_Wesmere/_main.cfg

@@ -68,7 +68,7 @@
     name=_ "Legend of Wesmere"
     description=_ "The tale of Kalenz, the High Lord who rallied his people after the second orcish invasion of the Great Continent and became the most renowned hero in the recorded history of the Elves.
 
-" + _"(Intermediate level, 17 scenarios.)"
+" + _"(Intermediate level, 18 scenarios.)"
     difficulty_descriptions={MENU_IMG_TXT2 "units/elves-wood/fighter.png~RC(magenta>brown)"  _"Soldier"  _"(Easy)"} +
     ";*" + {MENU_IMG_TXT2  "units/elves-wood/lord.png~RC(magenta>brown)" _"Lord"  _"(Normal)"} +
     ";" + {MENU_IMG_TXT2   "units/elves-wood/high-lord.png~RC(magenta>brown)" _"High Lord"  _"(Hard)"}

data/campaigns/Liberty/_main.cfg

@@ -22,7 +22,7 @@
     # wmllint: local spelling marchlanders
     description= _ "As the shadow of civil war lengthens across Wesnoth, a band of hardy marchlanders revolts against the tyranny of Queen Asheviere. To win their way to freedom, they must defeat not just the trained blades of Wesnothian troops but darker foes including orcs and undead.
 
-" + _"(Intermediate level, 9 scenarios)"
+" + _"(Intermediate level, 8 scenarios.)"
 
     [about]
         title = _ "Campaign Design"

data/campaigns/Northern_Rebirth/_main.cfg

@@ -19,7 +19,7 @@
 
     description= _ "For the people of Dwarven Doors the choice was stark: either drudge as downtrodden slaves for the orcs until the end of their brief and miserable lives, or risk all for freedom and rise up against their cruel overlords. Little did they suspect that their struggle would be the hinge of great events that might restore the Northlands to the glory they had once known.
 
-" + _"(Expert level, 14 scenarios.)"
+" + _"(Expert level, 13 scenarios.)"
     icon="scenery/dwarven-doors-closed.png"
     image="data/campaigns/Northern_Rebirth/images/campaign_image.jpg"
 

data/campaigns/The_Hammer_of_Thursagan/_main.cfg

@@ -20,7 +20,7 @@
     # wmllint: directory spelling Kal Kartha
     description= _ "In the first years of the Northern Alliance, an expedition from Knalga seeks out their kin at Kal Kartha and to learn the fate of the legendary Hammer of Thursagan. The perils of their journey through the wild Northern Lands, though great, pale beside the evil they will face at its end.
 
-" + _"(Intermediate level, 13 scenarios.)"
+" + _"(Intermediate level, 11 scenarios.)"
 
     [about]
         title = _ "Author"

data/campaigns/The_Rise_Of_Wesnoth/_main.cfg

@@ -19,7 +19,7 @@
     icon="data/campaigns/The_Rise_Of_Wesnoth/images/units/noble-lord.png"
     description= _ "Lead Prince Haldric through the destruction of the Green Isle and across the Ocean to establish the very kingdom of Wesnoth itself. The confrontation with Lich-Lord Jevyan awaits...
 
-" + _"(Expert level, 25 scenarios.)"
+" + _"(Expert level, 24 scenarios.)"
     image="data/campaigns/The_Rise_Of_Wesnoth/images/campaign_image.png"
 
     [about]

data/campaigns/The_South_Guard/_main.cfg

@@ -16,7 +16,7 @@
     image="data/campaigns/The_South_Guard/images/campaign_image.png"
     description= _ "A young Knight, Deoran, is dispatched to take command of the South Guard... Note: This campaign is designed as an introduction to Wesnoth. The 'Civilian' difficulty level is aimed at first-time players.
 
-" + _"(Novice level, 8 or 9 scenarios depending on the branch you take.)"
+" + _"(Novice level, 9 scenarios.)"
 
     difficulties=EASY,NORMAL,HARD
     difficulty_descriptions={MENU_IMG_TXT2 "units/human-peasants/peasant.png~RC(magenta>red)" _"Civilian" _"(Beginner)"} +

data/campaigns/Two_Brothers/_main.cfg

@@ -18,7 +18,7 @@
     ";" + {MENU_IMG_TXT2 "units/human-loyalists/grand-knight.png~RC(magenta>red)" _"Knight" _"(Challenging)"}
     description= _ "An evil mage is threatening the small village of Maghre and its inhabitants. The village’s mage Bjarn sends for his brother to help, but not all goes as planned. Can you help?
 
-" + _"(Novice level, 4 scenarios; the 'Hard' version may challenge more experienced players.)"
+" + _"(Novice level, 4 scenarios.)"
 
     [about]
         images = "story/Two_Brothers_M1P1.png,story/Two_Brothers_M1P2.png,story/Two_Brothers_M2P1.png,story/Two_Brothers_M4P1_the_end.png"

data/campaigns/Under_the_Burning_Suns/_main.cfg

@@ -24,7 +24,7 @@
 
     description= _ "In the distant future a small band of elves struggles to survive amidst the ruins of fallen empires. Lead your people out of the desert on an epic journey to find a new home.
 
-" + _"(Expert level, 11 scenarios.)"
+" + _"(Expert level, 10 scenarios.)"
 
     # UTBS credits
     [about]

data/core/about.cfg

@@ -902,6 +902,9 @@
         name = "Doug Rosvick (dlr365)"
         wikiuser = "dlr365"
     [/entry]
+    [entry]
+        name = "elvish_sovereign"
+    [/entry]
     [entry]
         name = "Ely Levy (Nakee)"
     [/entry]