merged syncpoint_gettext1_6 from trunk

changelog

@@ -1,6 +1,6 @@
 CVS HEAD:
  * improved user interface theme
- * new graphics: signpost, sting attack frame
+ * new and improved graphics: signpost, mountains, grassland, attack icons and frames
  * new scenarios for 'The Eastern Invasion' campaign:
    * Evacuation
    * Peasant Revolt
@@ -34,6 +34,7 @@ CVS HEAD:
    * Outlaw Princess
    * Outlaw Queen
    * Peasant
+   * Soul Shooter
    * Warrior King
  * return can now be used to navigate through help topics and sections
  * a box is now drawn around images in the help browser (can be disabled through minor tweaks to help config to handle new borders around images wml)
@@ -42,6 +43,7 @@ CVS HEAD:
    * catalan
    * czech
    * german
+   * slovak
    * spanish
    * swedish
  * added [then] and [else] tags under [object] tags
@@ -57,8 +59,8 @@ CVS HEAD:
  * fixed bug where themes with multiple resolution specifiers could be displayed incorrectly
  * fixed missing [removeitem] for Delfador's staff.
  * fixed bug where multiplayer games that disallowed observers didn't work properly
- * fixed removing items when legitimate unit picks it up
- * fixed removal of items in scenarios
+ * fixed items not removed after being picked up
+ * fixed victory conditions in 'The Siege of Barag Gor'
  * small fixes to unit display in help browser
  * moved deaths.cfg from data/ to data/scenarios/Heir_To_The_Throne/
  * moved items to their own hierarchy: images/items/
@@ -79,6 +81,7 @@ CVS HEAD:
  * inlining some stuff for performance reasons
  * optimizing invalide_all redraws
  * adding support for animated terrain images
+ * ran pngcrush on images
 
 Version 0.8:
  * added Drake flying animations

data/battleworld.cfg

@@ -1,123 +0,0 @@
-#
-# Large involved multiplayer
-#
-
-[multiplayer]
-	name="Battle World"
-	map_data="{maps/Multiplayer/BattleWorld}"
-	turns=90
-	id=multiplayer_battleworld
-
-	{DAWN}
-	{MORNING}
-	{AFTERNOON}
-	{DUSK}
-	{FIRST_WATCH}
-	{SECOND_WATCH}
-
-	[side]
-	side=1
-	enemy=2,3,4,5
-	canrecruit=1
-	controller=human
-	[/side]
-	[side]
-	side=2
-	enemy=1,3,4,5
-	canrecruit=1
-	controller=human
-	[/side]
-	[side]
-	side=3
-	enemy=1,2,4,5
-	canrecruit=1
-	controller=human
-	[/side]
-	[side]
-	side=4
-	enemy=1,2,3,5
-	canrecruit=1
-	controller=human
-	[/side]
-	[side]
-	side=5
-	enemy=1,2,3,4
-	canrecruit=1
-	controller=human
-	[/side]
-
-	[item]
-	x=107
-	y=4
-	image=terrain/temple.png
-	[/item]
-
-#	[event]
-#	name=moveto
-#		[filter]
-#		x=107
-#		y=4
-#		[/filter]
-#		[command]
-#			[unit]
-#			side=0
-#			x=107
-#			y=4
-#			description=Kno'nack
-#			type=Orcish Warlord
-#			[/unit]
-#		[/command]
-#	[/event]
-
-	[item]
-	x=61
-	y=49
-	image=terrain/temple.png
-	[/item]
-
-#	[event]
-#	name=moveto
-#		[filter]
-#		x=61
-#		y=49
-#		[/filter]
-#		[command]
-#			[unit]
-#			side=0
-#			x=61
-#			y=49
-#			description=Slivard
-#			type=Lich
-#			[/unit]
-#		[/command]
-#	[/event]
-
-#define ROAM X Y NAME TYPE
-	[unit]
-	x={X}
-	y={Y}
-	type=Dwarvish {TYPE}
-	description={NAME}
-	side=0
-	[/unit]
-
-	[event]
-	name=die
-		[filter]
-		description={NAME}
-		[/filter]
-		[command]
-			[unit]
-			x={X}
-			y={Y}
-			type=Dwarvish {TYPE}
-			description={NAME}
-			side=0
-			[/unit]
-		[/command]
-	[/event]
-#enddef
-
-#{ROAM 60 60 Dwarn Fighter}
-
-[/multiplayer]

data/game.cfg

@@ -121,6 +121,16 @@
 	icon=human-general.png
 [/campaign]
 
+[campaign]
+	id=The_Rise_of_Wesnoth
+	name= _ "The Rise of Wesnoth"
+	define=CAMPAIGN_THE_RISE_OF_WESNOTH
+	first_scenario=A_Summer_of_Storms
+	difficulties=EASY,NORMAL,HARD
+	difficulty_descriptions= _ "&noble-fighter.png,Fighter,(easiest);*&noble-commander.png,Commander;&noble-lord.png,Lord,(hardest)"
+	icon=noble-lord.png
+[/campaign]
+
 
 [+units]
 	{units}
@@ -1094,5 +1104,9 @@
 # ifdef CAMPAIGN_EASTERN_INVASION
 {scenarios/Eastern_Invasion}
 # endif
+# ifdef CAMPAIGN_THE_RISE_OF_WESNOTH
+{scenarios/The_Rise_of_Wesnoth}
+# endif
+
 
 {scenario-test.cfg}

data/help.cfg

@@ -7,19 +7,19 @@ topics=about
 
 [section]
 id=introduction
-title="Introduction"
+title= _ "Introduction"
 topics=introduction_topic
 [/section]
 
 [section]
 id=gameplay
-title="Gameplay"
+title= _ "Gameplay"
 topics=fundamentals,recruit_and_recall,movement,combat,damage_types_and_resistance,time_of_day,experience_and_advancement,healing,income_and_upkeep,wrap_up
 [/section]
 
 [section]
 id=traits
-title="Traits"
+title= _ "Traits"
 topics=traits
 [/section]
 
@@ -43,16 +43,16 @@ generator=weapon_specials
 
 [topic]
 id=introduction_topic
-title=Introduction
-text="<img>src=misc/logo.png align=middle box=no</img>
+title= _ "Introduction"
+text= _ "<img>src=misc/logo.png align=middle box=no</img>
 
 Battle for Wesnoth is a turn-based fantasy strategy game somewhat unusual amongst modern strategy games. While other games strive for complexity, both in rules and gameplay, Battle for Wesnoth strives for simplicity of rules and gameplay. This does not make the game simple, however - from these simple rules arise a wealth of strategy, making the game easy to learn but a challenge to master."
 [/topic]
 
 [topic]
 id=fundamentals
-title="Fundamentals of Gameplay"
-text="This page outlines all you need to know to play Battle for Wesnoth. It covers how to play and the basic mechanics behind the game. For more information on conquering the game, you may wish to consult <ref>dst=basic_strategy text='Basic Strategy'</ref> and <ref>dst=multiplayer_strategy text='Multiplayer Strategy'</ref>. Keep in mind that this is just an outline - for special exceptions and situations, please follow the links included.
+title= _ "Fundamentals of Gameplay"
+text= _ "This page outlines all you need to know to play Battle for Wesnoth. It covers how to play and the basic mechanics behind the game. For more information on conquering the game, you may wish to consult <ref>dst=basic_strategy text='Basic Strategy'</ref> and <ref>dst=multiplayer_strategy text='Multiplayer Strategy'</ref>. Keep in mind that this is just an outline - for special exceptions and situations, please follow the links included.
 
 To begin with, it's best to click the <italic>text=Tutorial</italic> button at the main menu. This will take you to the interactive tutorial, which will teach you the basics of Wesnoth. After this, it is recommended that you play the Heir to the Throne campaign first - click <italic>text=Campaign</italic> then <italic>text='Heir to the Throne'</italic>. As Battle for Wesnoth can be quite challenging, you may wish to start on <italic>text=Easy</italic>.
 
@@ -61,8 +61,8 @@ To begin with, it's best to click the <italic>text=Tutorial</italic> button at t
 
 [topic]
 id=recruit_and_recall
-title="Recruiting and Recalling"
-text="<img>src=help/recruit.png align=left float=yes</img>At the start of any battle, and at times during it, you will need to recruit units into your army. To recruit, you must have your leader (Konrad in the Heir to the Throne campaign) on the Keep square of a Castle. Then you may recruit by either choosing Recruit from the menu or right-clicking on a hex and selecting <italic>text=Recruit</italic>. This brings up the recruit menu, which lists units available for recruitment, along with their gold cost. Click on a unit to see its statistics to the left, then press the recruit button to recruit it.
+title= _ "Recruiting and Recalling"
+text= _ "<img>src=help/recruit.png align=left float=yes</img>At the start of any battle, and at times during it, you will need to recruit units into your army. To recruit, you must have your leader (Konrad in the Heir to the Throne campaign) on the Keep square of a Castle. Then you may recruit by either choosing Recruit from the menu or right-clicking on a hex and selecting <italic>text=Recruit</italic>. This brings up the recruit menu, which lists units available for recruitment, along with their gold cost. Click on a unit to see its statistics to the left, then press the recruit button to recruit it.
 
 If you right-clicked on a castle hex and selected recruit, the new unit will appear in that square. Otherwise, it will appear in a free square near the keep. You may only recruit as many units as you have free hexes in your castle, and you cannot spend more gold than you actually have on recruiting.
 
@@ -76,8 +76,8 @@ Keep in mind that units not only cost gold to Recruit or Recall, they also requi
 
 [topic]
 id=movement
-title=Movement
-text="Movement in Battle for Wesnoth is simple: Simply click on the unit you wish to move, then click on the hex you wish to move it to. When selected, all the hexes a unit can move to this turn will be highlighted, and all those it can't made dull. Mousing over a dull square will show the number of turns required to reach it, and clicking will cause the unit to move towards it by the fastest route over this and subsequent turns.
+title= _ "Movement"
+text= _ "Movement in Battle for Wesnoth is simple: Simply click on the unit you wish to move, then click on the hex you wish to move it to. When selected, all the hexes a unit can move to this turn will be highlighted, and all those it can't made dull. Mousing over a dull square will show the number of turns required to reach it, and clicking will cause the unit to move towards it by the fastest route over this and subsequent turns.
 
 Each unit has a certain number of movement points which are expended when moving into a new hex, depending on the <ref>dst=terrain text=Terrain</ref> of that particular hex. For instance, grassland nearly always costs 1 movement point to enter. Exactly how many movement points are spent entering a hex depends on the unit type - in forest, elvish units only spend 1 movement point, most human and orc units spend 2, while horsemen spend 3. You can learn how many unit points a unit requires to enter a certain terrain type by right-clicking on it, selecting Unit Description, and then clicking <italic>text='Terrain Modifiers'</italic>.
 
@@ -86,8 +86,8 @@ Another thing to keep in mind while moving is <ref>dst=zones_of_control text='Zo
 
 [topic]
 id=combat
-title=Combat
-text="There are two types of combat in Battle for Wesnoth, short- and long-ranged, but both of them take place between units in adjacent hexes. Short-range combat usually involves weapons such as swords, axes or fangs, while long-range combat usually involves weapons such as bows, spears and fireballs. Combat is relatively straightforward; the attacker and defender alternate attacks until each has used their allotted number of attacks.
+title= _ "Combat"
+text= _ "There are two types of combat in Battle for Wesnoth, short- and long-ranged, but both of them take place between units in adjacent hexes. Short-range combat usually involves weapons such as swords, axes or fangs, while long-range combat usually involves weapons such as bows, spears and fireballs. Combat is relatively straightforward; the attacker and defender alternate attacks until each has used their allotted number of attacks.
 
 <header>text='Order and number of attacks'</header>
 
@@ -107,8 +107,8 @@ A few units have special abilities which affect damage dealt in combat. The most
 
 [topic]
 id=damage_types_and_resistance
-title="Damage Types and Resistance"
-text="In Wesnoth, there are three types of damage usually associated with physical attacks: Blade, Pierce and Impact damage. Additionally, there are three further types of damage usually associated with magical attacks: Fire, Cold and Holy attacks. Different units may have resistances which alter the damage which they take from certain damage types.
+title= _ "Damage Types and Resistance"
+text= _ "In Wesnoth, there are three types of damage usually associated with physical attacks: Blade, Pierce and Impact damage. Additionally, there are three further types of damage usually associated with magical attacks: Fire, Cold and Holy attacks. Different units may have resistances which alter the damage which they take from certain damage types.
 
 Resistances work very simply: If a unit has 40% resistance against a damage type, then they will suffer 40% less damage when hit with that damage type. It is also possible for a unit to have weakness; if a unit has -100% resistance against a damage type, it will suffer 100% more damage when hit by that type. 
 
@@ -117,8 +117,8 @@ For example, Skeletons are highly resistant to Blade and Pierce damage, but are
 
 [topic]
 id=time_of_day
-title="Time of Day"
-text="Wesnoth games usually take place with a regular cycle between day and night. The current time of day can be observed under the minimap in the upper right. 
+title= _ "Time of Day"
+text= _ "Wesnoth games usually take place with a regular cycle between day and night. The current time of day can be observed under the minimap in the upper right. 
 
 The usual day/night cycle runs:
 
@@ -142,8 +142,8 @@ Neutral units are unaffected by the time of day.
 
 [topic]
 id=experience_and_advancement
-title="Experience and Advancement"
-text="If both units survive a combat, they gain a number of experience points equal to the level of the unit they're fighting. If a unit kills another in combat, however, it gains much more experience - 4 for a level 0 unit, 8 for level 1, 16 for level 2, 24 for level 3, and so forth.
+title= _ "Experience and Advancement"
+text= _ "If both units survive a combat, they gain a number of experience points equal to the level of the unit they're fighting. If a unit kills another in combat, however, it gains much more experience - 4 for a level 0 unit, 8 for level 1, 16 for level 2, 24 for level 3, and so forth.
 
 Units have a certain amount of experience required to advance (this is 20% less for units with the Intelligent trait). Once they achieve this amount, they immediately advance to the next level, healing fully in the process. In some cases, you will be given a choice of advancement options.
 
@@ -152,8 +152,8 @@ Keep in mind that while most units have three levels, not all do, and that occas
 
 [topic]
 id=healing
-title="Healing"
-text="In combat, your units will inevitably take damage. Wesnoth offers several ways for your units to heal, all of which take place at the beginning of your turn, before you take action.
+title= _ "Healing"
+text= _ "In combat, your units will inevitably take damage. Wesnoth offers several ways for your units to heal, all of which take place at the beginning of your turn, before you take action.
 
 Resting: A unit which neither moves nor attacks will heal 2HP in its next turn.
 Villages: A unit which starts a turn in a village will heal 8HP.
@@ -168,8 +168,8 @@ Keep in mind that while Resting can be combined with other forms of healing, vil
 
 [topic]
 id=income_and_upkeep
-title="Income and Upkeep"
-text="In Wesnoth, it is not enough simply to recruit units and fight. You must watch your gold as well, especially in campaigns, where you can carry extra gold over from one scenario to the next. There are two aspects to this; Income and Upkeep.
+title= _ "Income and Upkeep"
+text= _ "In Wesnoth, it is not enough simply to recruit units and fight. You must watch your gold as well, especially in campaigns, where you can carry extra gold over from one scenario to the next. There are two aspects to this; Income and Upkeep.
 
 Income is simple. For every village you control, you gain one gold a turn. Thus, if you have ten villages, you would normally gain ten gold. Unfortunately, your Upkeep costs are subtracted from this income, as detailed below.
 
@@ -182,8 +182,8 @@ There are two main exceptions to Upkeep. Firstly, units with the Loyal trait wil
 
 [topic]
 id=wrap_up
-title="Wrap Up"
-text="This concludes the fundamentals of Wesnoth. You might want to read up on Basic Strategy, or familiarise yourself with <ref>dst=traits text=Traits</ref> and <ref>dst=abilities text=Abilities</ref>, but you now know everything you need to know to play the Heir to the Throne scenario. Have fun, and good luck!"
+title= _ "Wrap Up"
+text= _ "This concludes the fundamentals of Wesnoth. You might want to read up on Basic Strategy, or familiarise yourself with <ref>dst=traits text=Traits</ref> and <ref>dst=abilities text=Abilities</ref>, but you now know everything you need to know to play the Heir to the Throne scenario. Have fun, and good luck!"
 [/topic]
 
 [topic]
@@ -195,8 +195,8 @@ generator=about
 
 [topic]
 id=traits
-title=Traits
-text="Most units have two traits. Traits are attributes of the unit that modify its attributes slightly. They are assigned to a unit randomly when the unit is recruited.
+title= _ "Traits"
+text= _ "Most units have two traits. Traits are attributes of the unit that modify its attributes slightly. They are assigned to a unit randomly when the unit is recruited.
 
 The currently available traits are the following.
 

data/items.cfg

@@ -260,12 +260,12 @@
 		[message]
 		id=WISHINGWELL1
 		speaker=narrator
-		message="You have come across a wishing well.
+		message= _ "You have come across a wishing well.
 What would you like to wish for?"
 
 		[option]
 		id=WISHINGWELL2a
-		message="A swift victory"
+		message= _ "A swift victory"
 		[command]
 		[gold]
 		amount=-1
@@ -273,14 +273,14 @@ What would you like to wish for?"
 		[message]
 		id=WISHINGWELL2b
 		speaker=unit
-		message="With this golden coin, I wish that this battle end in a swift and safe victory."
+		message= _ "With this golden coin, I wish that this battle end in a swift and safe victory."
 		[/message]
 		[/command]
 		[/option]
 
 		[option]
 		id=WISHINGWELL3
-		message="Lots of gold"
+		message= _ "Lots of gold"
 		[command]
 		[gold]
 		amount=-1
@@ -288,14 +288,14 @@ What would you like to wish for?"
 		[message]
 		id=WISHINGWELL3b
 		speaker=unit
-		message="I wish this single gold coin be returned ten-fold to me."
+		message= _ "I wish this single gold coin be returned ten-fold to me."
 		[/message]
 		[/command]
 		[/option]
 
 		[option]
 		id=WISHINGWELL4
-		message="Peace throughout Wesnoth."
+		message= _ "Peace throughout Wesnoth."
 		[command]
 		[gold]
 		amount=-1
@@ -303,14 +303,14 @@ What would you like to wish for?"
 		[message]
 		id=WISHINGWELL4b
 		speaker=unit
-		message="The only thing worth wishing for is peace throughout the land."
+		message= _ "The only thing worth wishing for is peace throughout the land."
 		[/message]
 		[/command]
 		[/option]
 
 		[option]
 		id=WISHINGWELL5
-		message="Don't make a wish."
+		message= _ "Don't make a wish."
 		[/option]
 		[/message]
 	[/event]
@@ -333,11 +333,11 @@ What would you like to wish for?"
 		[/filter]
 		[object]
 		id={ID}
-		name=Healing
+		name= _ "Potion of Healing"
 		image=misc/item-healingpotion.png
 		duration=level
-		description="A feeling of well-being overwhelms the drinker."
-		cannot_use_message="You are not worthy of healing."
+		description= _ "A feeling of well-being overwhelms the drinker."
+		cannot_use_message= _ "You are not worthy of healing."
 			[filter]
 			x={X}
 			y={Y}
@@ -371,10 +371,10 @@ What would you like to wish for?"
 		[/filter]
 		[object]
 		id={ID}
-		name=Poison
+		name= _ "Poison"
 		image=items/potion-yellow.png
 		duration=level
-		description="Poison is seeping through the veins of this unit at this very moment."
+		description= _ "Poison is seeping through the veins of this unit at this very moment."
 		cannot_use_message=NONE
 			[filter]
 			x={X}
@@ -409,11 +409,11 @@ What would you like to wish for?"
 		[/filter]
 		[object]
 		id={ID}
-		name=Holy Water
+		name= _ "Holy Water"
 		image=misc/item-holywater.png
 		duration=level
-		description="This water will make melee weapons holy."
-		cannot_use_message="I am not suited to the use of this item! Let another take it."
+		description= _ "This water will make melee weapons holy."
+		cannot_use_message= _ "I am not suited to the use of this item! Let another take it."
 			[filter]
 			x={X}
 			y={Y}
@@ -448,10 +448,10 @@ What would you like to wish for?"
 		[/filter]
 		[object]
 		id={ID}
-		name=Strong
+		name= _ "Potion of Strength"
 		image=items/potion-red.png
 		duration=level
-		description="Strength is given to the drinker."
+		description= _ "Strength is given to the drinker."
 		cannot_use_message=NONE
 			[filter]
 			x={X}
@@ -492,10 +492,10 @@ What would you like to wish for?"
 		[/filter]
 		[object]
 		id={ID}
-		name=Decay
+		name= _ "Potion of Decay"
 		image=items/potion-blue.png
 		duration=level
-		description="This poor unit drank something really bad."
+		description= _ "This poor unit drank something really bad."
 		cannot_use_message=NONE
 			[filter]
 			x={X}
@@ -530,10 +530,10 @@ What would you like to wish for?"
 		[/filter]
 		[object]
 		id={ID}
-		name=Ring of Regeneration
+		name= _ "Ring of Regeneration"
 		image=items/ring1.png
 		duration=forever
-		description="This ring will heal the bearer a little each turn."
+		description= _ "This ring will heal the bearer a little each turn."
 		cannot_use_message=NONE
 			[filter]
 			x={X}
@@ -553,7 +553,7 @@ What would you like to wish for?"
 		[message]
 		id=OBJERROR
 		speaker=narrator
-		message="Can't set abilities yet, sorry."
+		message= _ "Can't set abilities yet, sorry."
 		[/message]
 	[/event]
 #enddef
@@ -574,10 +574,10 @@ What would you like to wish for?"
 		[/filter]
 		[object]
 		id={ID}
-		name=Ring of Slowness
+		name= _ "Ring of Slowness"
 		image=items/ring2.png
 		duration=forever
-		description="The bearer of this ring is slowed."
+		description= _ "The bearer of this ring is slowed."
 		cannot_use_message=NONE
 			[filter]
 			x={X}
@@ -612,11 +612,11 @@ What would you like to wish for?"
 		[/filter]
 		[object]
 		id={ID}
-		name=Staff of Swiftness
+		name= _ "Staff of Swiftness"
 		image=misc/item-staff.png
 		duration=forever
-		description="This staff will grant the bearer swift movement."
-		cannot_use_message="Only magical beings can wield such an object."
+		description= _ "This staff will grant the bearer swift movement."
+		cannot_use_message= _ "Only magical beings can wield such an object."
 			[filter]
 			x={X}
 			y={Y}
@@ -650,11 +650,11 @@ What would you like to wish for?"
 		[/filter]
 		[object]
 		id={ID}
-		name=Storm Trident
+		name= _ "Storm Trident"
 		image=misc/item-stormtrident.png
 		duration=forever
-		description="This trident allows a merman to shoot electric bolts at his enemies!"
-		cannot_use_message="Only the mermen can use this item!"
+		description= _ "This trident allows a merman to shoot electric bolts at his enemies!"
+		cannot_use_message= _ "Only the mermen can use this item!"
 			[filter]
 			type=Merman,Merman Lord,Triton
 			x,y={X},{Y}
@@ -666,7 +666,7 @@ What would you like to wish for?"
 			[/then]
 			[effect]
 			apply_to=new_attack
-			name=storm trident
+			name= _ "storm trident"
 			type=fire
 			range=long
 			special=magical
@@ -704,11 +704,11 @@ What would you like to wish for?"
 		[/filter]
 		[object]
 		id={ID}
-		name=Flaming Sword
+		name= _ "Flaming Sword"
 		image=misc/item-flamesword.png
 		duration=forever
 		description=""
-		cannot_use_message="Only the leader of an army can wield this sword!"
+		cannot_use_message= _ "Only the leader of an army can wield this sword!"
 			[filter]
 			description=Konrad
 			x,y={X},{Y}
@@ -720,7 +720,7 @@ What would you like to wish for?"
 			[/then]
 			[effect]
 			apply_to=new_attack
-			name=flaming sword
+			name= _ "flaming sword"
 			type=fire
 			range=short
 			special=magical
@@ -752,11 +752,11 @@ What would you like to wish for?"
 		[/filter]
 		[object]
 		id={ID}
-		name=Sceptre of Fire
+		name= _ "Sceptre of Fire"
 		image=misc/item-sceptreoffire.png
 		duration=forever
-		description="This ancient Sceptre was forged by the Dwarves. A symbol of the kingship of Wesnoth, the Sceptre has the power to shoot fireballs at enemies of the bearer!"
-		cannot_use_message="This is the Sceptre of Fire. Only a true successor to the throne can possibly dare to take this!"
+		description= _ "This ancient Sceptre was forged by the Dwarves. A symbol of the kingship of Wesnoth, the Sceptre has the power to shoot fireballs at enemies of the bearer!"
+		cannot_use_message= _ "This is the Sceptre of Fire. Only a true successor to the throne can possibly dare to take this!"
 			[filter]
 			type=Princess,Commander,Lord
 			x,y={X},{Y}
@@ -768,7 +768,7 @@ What would you like to wish for?"
 			[/then]
 			[effect]
 			apply_to=new_attack
-			name=sceptre of fire
+			name= _ "sceptre of fire"
 			type=fire
 			range=long
 			special=magical
@@ -824,7 +824,7 @@ What would you like to wish for?"
 		[message]
 		id=TELEPORT1
 		speaker=narrator
-		message="Zap~"
+		message= _ "Zap~"
 		[/message]
 	[/event]
 #enddef

data/multiplayer.cfg

@@ -91,7 +91,7 @@ id=era_default
 [/era]
 
 [era]
-name=Classic
+name= _ "Classic"
 id=era_classic
 
 [multiplayer_side]
@@ -166,7 +166,7 @@ id=era_classic
 [/era]
 
 [era]
-name=Age of Heroes
+name= _ "Age of Heroes"
 id=era_heroes
 
 [multiplayer_side]

data/terrain-graphics.cfg

@@ -47,6 +47,8 @@
 {TERRAIN_BASE_PROBABILITY f forest-stones3 1}
 {TERRAIN_BASE_PROBABILITY f forest-stones4 1}
 {TERRAIN_BASE f forest}
+{TERRAIN_BASE_PROBABILITY m mountains-peak1 33}
+{TERRAIN_BASE_PROBABILITY m mountains-peak2 33}
 {TERRAIN_BASE m mountains}
 {TERRAIN_BASE H snow-hills}
 {TERRAIN_BASE_PROBABILITY h hills-variation1 15}
@@ -137,6 +139,7 @@ K
 
 # Forest, hills and mountains should always overlay on northern sides
 {TERRAIN_ADJACENT_NORTH m mountains}
+{TERRAIN_ADJACENT_1     m      !m      mountains}
 {TERRAIN_ADJACENT_NORTH H snow-hills}
 {TERRAIN_ADJACENT_NORTH h hills}
 {TERRAIN_ADJACENT_NORTH F snow-forest}
@@ -158,7 +161,6 @@ K
 
 {TERRAIN_ADJACENT_123   f      !f      forest}
 {TERRAIN_ADJACENT_1     F      !F      snow-forest}
-{TERRAIN_ADJACENT_1     m      !m      mountains}
 {TERRAIN_ADJACENT_12    H      !H      snow-hills}
 {TERRAIN_ADJACENT_12    h      !h      hills}
 {TERRAIN_ADJACENT_1234  SV     !SV     snow}

data/translations/english.cfg

@@ -179,7 +179,7 @@ hordes_undead="The Dark Hordes"
 
 error_no_campaigns="There are no campaigns available"
 
-new_campaign=_"Campaign"
+new_campaign= _ "Campaign"
 choose_campaign="Choose the campaign you want to play:"
 
 difficulty="Difficulty"

data/tutorial.cfg

@@ -1,5 +1,5 @@
 [tutorial]
-	name=Under Elves' Protection
+	name= _ "Under Elves' Protection"
 	map_data="{maps/Tutorial/Tutorial1}"
 	turns=48
 	music=wesnoth-4.ogg
@@ -13,7 +13,7 @@
 	{FIRST_WATCH}
 	{SECOND_WATCH}
 
-	objectives="Tasks:
+	objectives= _ "Tasks:
 @1. Control two villages near the river.
 @2. Return to the castle and recruit units.
 @3. Defeat enemies, control western villages.
@@ -120,12 +120,12 @@ Defeat:
 	[story]
 		[part]
 		id=tutorial_1
-		story="After they found refuge in the Elvish lands, the elder mage Delfador tried to teach the young Konrad all the skills and knowledge he would need to be a leader among his people."
+		story= _ "After they found refuge in the Elvish lands, the elder mage Delfador tried to teach the young Konrad all the skills and knowledge he would need to be a leader among his people."
 		image="misc/story0a.png"
 		[/part]
 		[part]
 		id=tutorial_2
-		story="Meanwhile in the nearby woods, a group of dark preachers made an unholy pact with some desperate bandits."
+		story= _ "Meanwhile in the nearby woods, a group of dark preachers made an unholy pact with some desperate bandits."
 		image="misc/story0b.png"
 		[/part]
 	[/story]
@@ -172,7 +172,7 @@ Defeat:
 		[message]
 		id=tut1
 		description=Delfador
-		message="It has been a great time here, Konrad. With our friends, the Elves, we have enjoyed many years in peace.
+		message= _ "It has been a great time here, Konrad. With our friends, the Elves, we have enjoyed many years in peace.
 
 But you are no longer a child, Konrad. Every lord must learn the ways of battle, and gain the ability to lead his army against enemies of any race. Soon it will be time to replace your wooden training sword with one of iron, and to claim your inheritance. But there are things that you must learn before that."
 		[/message]
@@ -180,13 +180,13 @@ But you are no longer a child, Konrad. Every lord must learn the ways of battle,
 		[message]
 		id=tut2
 		description=Konrad
-		message="What must I learn, Delfador?"
+		message= _ "What must I learn, Delfador?"
 		[/message]
 
 		[message]
 		id=tut3
 		description=Delfador
-		message="Before entering any battle, you need to hire soldiers. Gold is necessary for that. There are villages throughout the land. Those of which you gain control (marked with a red flag) will give you an extra gold coin every turn and thus pay the cost of one of your units. To gain control of a village, simply move any of your units there.
+		message= _ "Before entering any battle, you need to hire soldiers. Gold is necessary for that. There are villages throughout the land. Those of which you gain control (marked with a red flag) will give you an extra gold coin every turn and thus pay the cost of one of your units. To gain control of a village, simply move any of your units there.
 @EXERCISE
 Go to the nearest villages, so that with the earned gold we can continue our lesson."
 		[/message]
@@ -194,20 +194,20 @@ Go to the nearest villages, so that with the earned gold we can continue our les
 		id=tut3a
 		speaker=narrator
 		image="misc/tutorial1.png"
-		message="To move a unit first select it..."
+		message= _ "To move a unit first select it..."
 		[/message]
 		[message]
 		id=tut3b
 		speaker=narrator
 		image="misc/tutorial2.png"
-		message=".. then select its destination.
+		message= _ ".. then select its destination.
 If the destination is far away a unit may need more than one turn to reach it. The number shows how many turns it will take the unit to get there."
 		[/message]
 		[message]
 		id=tut3c
 		speaker=narrator
 		image="misc/tutorial3.png"
-		message="After you are done with all the movements you need, click on the 'End Turn' button."
+		message= _ "After you are done with all the movements you need, click on the 'End Turn' button."
 		[/message]
 	[/event]
 
@@ -221,7 +221,7 @@ If the destination is far away a unit may need more than one turn to reach it. T
 		[message]
 		id=tut15
 		description=Delfador
-		message="This was only practice, Konrad, but remember that if it had been a real battle, you would now be dead."
+		message= _ "This was only practice, Konrad, but remember that if it had been a real battle, you would now be dead."
 		[/message]
 	[/event]
 
@@ -233,7 +233,7 @@ If the destination is far away a unit may need more than one turn to reach it. T
 		[message]
 		id=tut16
 		description=Delfador
-		message="Konrad, I did my best to stop them, but you were obliged to protect me as well. That is the end of training for today."
+		message= _ "Konrad, I did my best to stop them, but you were obliged to protect me as well. That is the end of training for today."
 		[/message]
 		[endlevel]
 		result=defeat
@@ -248,7 +248,7 @@ If the destination is far away a unit may need more than one turn to reach it. T
 		[message]
 		id=tut17
 		description=Chantal
-		message="Indeed, Lofar, you were right. Humans can't lead armies."
+		message= _ "Indeed, Lofar, you were right. Humans can't lead armies."
 		[/message]
 		[endlevel]
 		result=defeat
@@ -263,7 +263,7 @@ If the destination is far away a unit may need more than one turn to reach it. T
 		[message]
 		id=tut18
 		description=Galdrad
-		message="Konrad! You should have helped me!"
+		message= _ "Konrad! You should have helped me!"
 		[/message]
 		[endlevel]
 		result=defeat
@@ -278,7 +278,7 @@ If the destination is far away a unit may need more than one turn to reach it. T
 		[message]
 		id=tut19
 		description=Lofar
-		message="Huh, human the leader! Wasn't telling you, Galdrad, it is waste of time?"
+		message= _ "Huh, human the leader! Wasn't telling you, Galdrad, it is waste of time?"
 		[/message]
 		[endlevel]
 		result=defeat
@@ -290,22 +290,22 @@ If the destination is far away a unit may need more than one turn to reach it. T
 		[message]
 		id=tut20
 		description=Delfador
-		message="Alright, Konrad. You were excellent today."
+		message= _ "Alright, Konrad. You were excellent today."
 		[/message]
 		[message]
 		id=tut21
 		description=Chantal
-		message="This young commander deserves the crown of Wesnoth. Let him be our hope for peace with Wesnoth, Lofar."
+		message= _ "This young commander deserves the crown of Wesnoth. Let him be our hope for peace with Wesnoth, Lofar."
 		[/message]
 		[message]
 		id=tut22
 		description=Lofar
-		message="Congratulations, Human. Your performance today was impressive, I must admit."
+		message= _ "Congratulations, Human. Your performance today was impressive, I must admit."
 		[/message]
 		[message]
 		id=tut23
 		description=Delfador
-		message="A mission of a great importance is before us. Asheviere must not remain queen any longer!"
+		message= _ "A mission of a great importance is before us. Asheviere must not remain queen any longer!"
 		[/message]
 	[/event]
 
@@ -320,19 +320,19 @@ If the destination is far away a unit may need more than one turn to reach it. T
 				[message]
 				id=tut24
 				description=Delfador
-				message="You did all the exercies, but four days was not enough for you to defeat bandits. I'm afraid you won't have so much time in real battle."
+				message= _ "You did all the exercies, but four days was not enough for you to defeat bandits. I'm afraid you won't have so much time in real battle."
 				[/message]
 				[message]
 				id=tut25
 				description=Galdrad
-				message="Do not be so cautious, Konrad. Go yourself to the fight, if there is no risk to your life."
+				message= _ "Do not be so cautious, Konrad. Go yourself to the fight, if there is no risk to your life."
 				[/message]
 			[/then]
 			[else]
 				[message]
 				id=tut26
 				description=Delfador
-				message="You look miserable, Konrad. Four days have passed and you have not completed the exercises. In a real battle you must act quickly, before your enemies summon reinforcements. We will have to try again another time."
+				message= _ "You look miserable, Konrad. Four days have passed and you have not completed the exercises. In a real battle you must act quickly, before your enemies summon reinforcements. We will have to try again another time."
 				[/message]
 			[/else]
 		[/if]
@@ -359,8 +359,8 @@ If the destination is far away a unit may need more than one turn to reach it. T
 		id=obj_staff
 		name=Delfador's staff
 		image=misc/item-staff.png
-		description="Hmmm...this is Delfador's...I wonder what it is used for..."
-		cannot_use_message="A human's magical staff -- I'd better not touch it!"
+		description= _ "Hmmm...this is Delfador's...I wonder what it is used for..."
+		cannot_use_message= _ "A human's magical staff -- I'd better not touch it!"
 			[filter]
 			description=Konrad
 			[/filter]
@@ -411,13 +411,13 @@ If the destination is far away a unit may need more than one turn to reach it. T
 		[message]
 		id=tut_staff
 		description=Delfador
-		message="This is my old staff. Although not very useful at close range, its magic may still prove deadly to your enemies. Its powers are waning, so it will not last long. Do not be afraid to use this weapon now - I will make sure you do not hurt yourself."
+		message= _ "This is my old staff. Although not very useful at close range, its magic may still prove deadly to your enemies. Its powers are waning, so it will not last long. Do not be afraid to use this weapon now - I will make sure you do not hurt yourself."
 		[/message]
 		[message]
 		id=tut_staff2
 		speaker=narrator
 		image="misc/tutorial3b.png"
-		message="Magic items could help you in your quest, but you should be aware that some items can only be picked up by certain units."
+		message= _ "Magic items could help you in your quest, but you should be aware that some items can only be picked up by certain units."
 		[/message]
 	[/event]
 
@@ -474,27 +474,27 @@ If the destination is far away a unit may need more than one turn to reach it. T
 		[message]
 		id=amb1
 		description=Rapprah
-		message="Surprise! You have walked into our trap, foolish boy!"
+		message= _ "Surprise! You have walked into our trap, foolish boy!"
 		[/message]
 		[message]
 		id=amb2
 		description=Delfador
-		message="Konrad!"
+		message= _ "Konrad!"
 		[/message]
 		[message]
 		id=amb3
 		description=Konrad
-		message="Delfador! Help me!"
+		message= _ "Delfador! Help me!"
 		[/message]
 		[message]
 		id=amb4
 		description=Galdrad
-		message="Stay calm, Konrad. I am coming to save you. Meanwhile try to defend yourself. When you are in a village they have little chance to hurt you. Look -- one of them stays in the water. Try to hit him!"
+		message= _ "Stay calm, Konrad. I am coming to save you. Meanwhile try to defend yourself. When you are in a village they have little chance to hurt you. Look -- one of them stays in the water. Try to hit him!"
 		[/message]
 		[message]
 		id=amb5
 		description=Delfador
-		message="Fighting is the best way to improve your skills. When you get enough experience (XP) you advance to become a better fighter.
+		message= _ "Fighting is the best way to improve your skills. When you get enough experience (XP) you advance to become a better fighter.
 
 When you attack an enemy unit, you may choose which weapon you want to fight with. For every weapon, there are three important numbers shown: the damage it causes, the number of attempts you make with it, and the probability of hitting the enemy. The opponent's values are likewise displayed."
 		[/message]
@@ -502,13 +502,13 @@ When you attack an enemy unit, you may choose which weapon you want to fight wit
 		id=tut4a
 		speaker=narrator
 		image="misc/tutorial4.png"
-		message="To attack with a unit, first select it..."
+		message= _ "To attack with a unit, first select it..."
 		[/message]
 		[message]
 		id=tut5a
 		speaker=narrator
 		image="misc/tutorial5.png"
-		message="...then click to select a target.
+		message= _ "...then click to select a target.
 Once you do this you have to choose the weapon."
 		[/message]
 	[/event]
@@ -524,7 +524,7 @@ Once you do this you have to choose the weapon."
 		[message]
 		id=kill1
 		description=Delfador
-		message="Well done! This is Garard's nephew!"
+		message= _ "Well done! This is Garard's nephew!"
 		[/message]
 	[/event]
 	[event]
@@ -538,7 +538,7 @@ Once you do this you have to choose the weapon."
 		[message]
 		id=kill2
 		description=Galdrad
-		message="Excellent, young human!"
+		message= _ "Excellent, young human!"
 		[/message]
 	[/event]
 
@@ -568,13 +568,13 @@ Once you do this you have to choose the weapon."
 						[message]
 						id=kill4
 						description=Delfador
-						message="If you are finished with the villages, go back to the castle to recruit your soldiers. Remember that in a real battle, you will probably start with some money to recruit soldiers at the beginning."
+						message= _ "If you are finished with the villages, go back to the castle to recruit your soldiers. Remember that in a real battle, you will probably start with some money to recruit soldiers at the beginning."
 						[/message]
 						[message]
 						id=kill4a
 						speaker=narrator
 						image="misc/tutorial6.png"
-						message="To recruit units you must place your main leader in the keep tile of the castle.
+						message= _ "To recruit units you must place your main leader in the keep tile of the castle.
 If you move away from it you will be unable to recruit or recall units."
 						[/message]
 					[/then]
@@ -593,7 +593,7 @@ If you move away from it you will be unable to recruit or recall units."
 				[message]
 				id=kill3
 				description=Delfador
-				message="Look behind you!"
+				message= _ "Look behind you!"
 				[/message]
 			[/then]
 			[else]
@@ -614,7 +614,7 @@ If you move away from it you will be unable to recruit or recall units."
 				[message]
 				id=kill5
 				description=Galdrad
-				message="There is one still hiding there!"
+				message= _ "There is one still hiding there!"
 				[/message]
 			[/then]
 			[else]
@@ -644,17 +644,17 @@ If you move away from it you will be unable to recruit or recall units."
 				[message]
 				id=recr1
 				description=Delfador
-				message="Now you are ready to recruit units (right click and select Recruit)."
+				message= _ "Now you are ready to recruit units (right click and select Recruit)."
 				[/message]
 				[message]
 				id=recr2
 				description=Konrad
-				message="So how should I choose what kind of soldiers to hire, Delfador?"
+				message= _ "So how should I choose what kind of soldiers to hire, Delfador?"
 				[/message]
 				[message]
 				id=recr3
 				description=Delfador
-				message="You have to carefully review their skills. Early on, you want fast units to sieze as many villages as possible. After that, fighters should probably make up the bulk of your army. Remember: all Elvish units fight very well in the forest; horsemen are excellent on open ground; and mages are good for support and can be used much like archers. If you can get your mages more experienced, they can be especially powerful."
+				message= _ "You have to carefully review their skills. Early on, you want fast units to sieze as many villages as possible. After that, fighters should probably make up the bulk of your army. Remember: all Elvish units fight very well in the forest; horsemen are excellent on open ground; and mages are good for support and can be used much like archers. If you can get your mages more experienced, they can be especially powerful."
 				[/message]
 				[gold]	
 					side=1
@@ -671,7 +671,7 @@ If you move away from it you will be unable to recruit or recall units."
 						[message]
 						id=tut27
 						description=Delfador
-						message="Go to the two villages near the river."
+						message= _ "Go to the two villages near the river."
 						[/message]
 					[/then]
 				[/if]
@@ -714,7 +714,7 @@ If you move away from it you will be unable to recruit or recall units."
 					[message]
 					id=tut28
 					description=Uli'ar
-					message="Now you have control over the majority of villages here. Well done!"
+					message= _ "Now you have control over the majority of villages here. Well done!"
 					[/message]
 				[/then]
 			[/if]
@@ -733,7 +733,7 @@ If you move away from it you will be unable to recruit or recall units."
 					[message]
 					id=tut29
 					description=Uli'ar
-					message="So far, so good, but we need more of them."
+					message= _ "So far, so good, but we need more of them."
 					[/message]
 				[/then]
 			[/if]
@@ -761,7 +761,7 @@ If you move away from it you will be unable to recruit or recall units."
 		[message]
 		id=tut30
 		description=Alisar
-		message="Excellent, human commander!"
+		message= _ "Excellent, human commander!"
 		[/message]
 	[/event]
 
@@ -776,7 +776,7 @@ If you move away from it you will be unable to recruit or recall units."
 		[message]
 		id=tut31
 		description=Lofar
-		message="Well, fighter is an excellent choice for every battle, but I would use archers here instead. They are better shooters than fighters."
+		message= _ "Well, fighter is an excellent choice for every battle, but I would use archers here instead. They are better shooters than fighters."
 		[/message]
 	[/event]
 
@@ -791,7 +791,7 @@ If you move away from it you will be unable to recruit or recall units."
 		[message]
 		id=tut32
 		description=Uli'ar
-		message="Scouts are known for their horse riding. Here I would rather use archers, who can defeat the enemy before he is close enough to respond."
+		message= _ "Scouts are known for their horse riding. Here I would rather use archers, who can defeat the enemy before he is close enough to respond."
 		[/message]
 	[/event]
 
@@ -817,7 +817,7 @@ If you move away from it you will be unable to recruit or recall units."
 		[message]
 		id=tut33
 		description=Enelar
-		message="This task is complete!"
+		message= _ "This task is complete!"
 		[/message]
 	[/event]
 	[event]
@@ -831,7 +831,7 @@ If you move away from it you will be unable to recruit or recall units."
 		[message]
 		id=tut34
 		description=Alisar
-		message="Archers are too weak to defeat poachers with swords. Attempting to attack one at a long range may be the last act of this archer's life!"
+		message= _ "Archers are too weak to defeat poachers with swords. Attempting to attack one at a long range may be the last act of this archer's life!"
 		[/message]
 	[/event]
 
@@ -865,12 +865,12 @@ If you move away from it you will be unable to recruit or recall units."
 				[message]
 				id=tut35
 				description=Uli'ar
-				message="Well done!"
+				message= _ "Well done!"
 				[/message]
 				[message]
 				id=tut36
 				description=Delfador
-				message="Now the last excercise. To continue, recruit some mages, so they can show you their skills."
+				message= _ "Now the last excercise. To continue, recruit some mages, so they can show you their skills."
 				[/message]
 				[disallow_recruit]
 				side=1
@@ -920,22 +920,22 @@ If you move away from it you will be unable to recruit or recall units."
 				[message]
 				id=tut37
 				description=Chantal
-				message="Good work, Konrad!"
+				message= _ "Good work, Konrad!"
 				[/message]
 				[message]
 				id=tut38
 				description=Delfador
-				message="You are now a real commander, Konrad."
+				message= _ "You are now a real commander, Konrad."
 				[/message]
 				[message]
 				id=tut39
 				description=Konrad
-				message="Thank you, Delfador. It wasn't so difficult as I had thought!"
+				message= _ "Thank you, Delfador. It wasn't as difficult as I had thought!"
 				[/message]
 				[message]
 				id=tut40
 				description=Delfador
-				message="Now a real test of your commanding skills: in the castle north-east of ours, a bandit leader is preparing to take Elven land. Help Galdrad defeat this evil leader.
+				message= _ "Now a real test of your commanding skills: in the castle north-east of ours, a bandit leader is preparing to take Elven land. Help Galdrad defeat this evil leader.
 There are also Elvish friends of ours who want to help you (use menu button and Unit List to find them).
 You are now allowed to recruit all units. Good luck!"
 				[/message]
@@ -1050,7 +1050,7 @@ You are now allowed to recruit all units. Good luck!"
 						[message]
 						id=tut41
 						description=Uli'ar
-						message="You have recruited Scouts. Elvish Scouts aren't very good in combat although they can sieze large territories in a short time. They are excellent at capturing villages.
+						message= _ "You have recruited Scouts. Elvish Scouts aren't very good in combat although they can sieze large territories in a short time. They are excellent at capturing villages.
 @EXERCISE
 Take over the western villages to get more gold."
 						[/message]
@@ -1072,7 +1072,7 @@ Take over the western villages to get more gold."
 						[message]
 						id=tut42
 						description=Alisar
-						message="You have recruited Archers. Elvish Archers are weak in hand-to-hand combat, but are excellent shooters. Send your archers against enemies who don't have long range weapons and avoid leaving the forests and villages.
+						message= _ "You have recruited Archers. Elvish Archers are weak in hand-to-hand combat, but are excellent shooters. Send your archers against enemies who don't have long range weapons and avoid leaving the forests and villages.
 Archers advance to Marksman or Rangers, who are deadly with their long bows and swords.
 @EXERCISE
 We have prepared a practice target for you -- Gerlog, the thief, due south of your castle."
@@ -1102,7 +1102,7 @@ We have prepared a practice target for you -- Gerlog, the thief, due south of yo
 						[message]
 						id=tut43
 						description=Enelar
-						message="You have recruited Fighters. They are well prepared for combat in both close and long range. As all the Elves, they defend themselves well in forests and villages.
+						message= _ "You have recruited Fighters. They are well prepared for combat in both close and long range. As all the Elves, they defend themselves well in forests and villages.
 A Fighter's career ends at Marshal or Champion, both well prepared to fight against all types of enemies. Marshals can also lead soldiers in battle.
 @EXERCISE
 To test Fighters, send them against Kharhbrah, the Poacher on the brigde."
@@ -1141,17 +1141,17 @@ To test Fighters, send them against Kharhbrah, the Poacher on the brigde."
 				[message]
 				id=tut44
 				description=Uli'ar
-				message="Horses are very fast on roads and grass. Therefore Horsemen have an advantage on that terrain."
+				message= _ "Horses are very fast on roads and grass. Therefore Horsemen have an advantage on that terrain."
 				[/message]
 				[message]
 				id=tut45
 				description=Lofar
-				message="Clearly, humans are less talented than the Elves. I'm doubful about usefulness of horsemen on the battlefield."
+				message= _ "Clearly, humans are less talented than the Elves. I'm doubful about usefulness of horsemen on the battlefield."
 				[/message]
 				[message]
 				id=tut46
 				description=Uli'ar
-				message="Horsemen advance to Paladins, great warriors who can also heal their companions in battle.
+				message= _ "Horsemen advance to Paladins, great warriors who can also heal their companions in battle.
 @EXERCISE
 There is practice target on the clearing, south-east of your castle. Go there and wipe the area out of our enemies."
 				[/message]
@@ -1206,7 +1206,7 @@ There is practice target on the clearing, south-east of your castle. Go there an
 				[message]
 				id=tut47
 				description=Chantal
-				message="Humans are famous for their deep knowledge about the world. Mages are the elite of human researchers -- they are able to summon forces of nature and use them against any fool who would oppose them. Because of magic, their flaming missiles almost always hit the target.
+				message= _ "Humans are famous for their deep knowledge about the world. Mages are the elite of human researchers -- they are able to summon forces of nature and use them against any fool who would oppose them. Because of magic, their flaming missiles almost always hit the target.
 Mages are physically weak. As they gain in experience, they specialize either in white magic as Mages of Light, or in other kinds of forces to become Great Mages.
 @EXERCISE
 On the other side of the road, Undead have spread. Make sure they don't move another step further!"
@@ -1277,7 +1277,7 @@ On the other side of the road, Undead have spread. Make sure they don't move ano
 				[message]
 				id=tut48
 				description=Delfador
-				message="All right. In the next lesson, you will learn how to command horsemen. Now recruit some of them."
+				message= _ "All right. In the next lesson, you will learn how to command horsemen. Now recruit some of them."
 				[/message]
 				[gold]	
 					side=1
@@ -1366,7 +1366,7 @@ On the other side of the road, Undead have spread. Make sure they don't move ano
 				id=tut49
 				speaker=narrator
 				image="misc/tutorial7.png"
-				message="Chaotic creatures are stronger at night. Lawful ones are stronger at day. Neutral creatures' strength is not changed by daytime."
+				message= _ "Chaotic creatures are stronger at night. Lawful ones are stronger at day. Neutral creatures' strength is not changed by daytime."
 				[/message]
 			[/then]
 		[/if]
@@ -1388,7 +1388,7 @@ On the other side of the road, Undead have spread. Make sure they don't move ano
 				[message]
 				id=tut50
 				description=Delfador
-				message="Hurry up! You should have been here back a long time ago!"
+				message= _ "Hurry up! You should have been here back a long time ago!"
 				[/message]
 			[/then]
 		[/if]
@@ -1407,7 +1407,7 @@ On the other side of the road, Undead have spread. Make sure they don't move ano
 				[message]
 				id=tut51
 				description=Delfador
-				message="What are you doing, Konrad?! One day has passed and you have not completed a single task!"
+				message= _ "What are you doing, Konrad?! One day has passed and you have not completed a single task!"
 				[/message]
 			[/then]
 		[/if]
@@ -1420,7 +1420,7 @@ On the other side of the road, Undead have spread. Make sure they don't move ano
 				[message]
 				id=tut52
 				description=Delfador
-				message="You should have completed the second practice. Make haste!"
+				message= _ "You should have completed the second practice. Make haste!"
 				[/message]
 			[/then]
 		[/if]
@@ -1437,7 +1437,7 @@ On the other side of the road, Undead have spread. Make sure they don't move ano
 				[message]
 				id=tut53
 				description=Delfador
-				message="Konrad, get on with it! They are not so many."
+				message= _ "Konrad, get on with it! They are not so many."
 				[/message]
 			[/then]
 		[/if]
@@ -1450,7 +1450,7 @@ On the other side of the road, Undead have spread. Make sure they don't move ano
 				[message]
 				id=tut54
 				description=Delfador
-				message="All right, but you're wasting too much time."
+				message= _ "All right, but you're wasting too much time."
 				[/message]
 			[/then]
 		[/if]
@@ -1467,7 +1467,7 @@ On the other side of the road, Undead have spread. Make sure they don't move ano
 				[message]
 				id=tut55
 				description=Delfador
-				message="Konrad! This is your last warning -- put an end to them now!"
+				message= _ "Konrad! This is your last warning -- put an end to them now!"
 				[/message]
 			[/then]
 		[/if]
@@ -1480,7 +1480,7 @@ On the other side of the road, Undead have spread. Make sure they don't move ano
 				[message]
 				id=tut56
 				description=Delfador
-				message="This is a simple task! Why are you performing so slowly!"
+				message= _ "This is a simple task! Why are you performing so slowly!"
 				[/message]
 			[/then]
 		[/if]
@@ -1497,7 +1497,7 @@ On the other side of the road, Undead have spread. Make sure they don't move ano
 				[message]
 				id=tut57
 				description=Delfador
-				message="Well, hurry up!"
+				message= _ "Well, hurry up!"
 				[/message]
 			[/then]
 		[/if]
@@ -1510,7 +1510,7 @@ On the other side of the road, Undead have spread. Make sure they don't move ano
 				[message]
 				id=tut58
 				description=Delfador
-				message="So far, so good, but hurry up! I have one more task to do for you."
+				message= _ "So far, so good, but hurry up! I have one more task to do for you."
 				[/message]
 			[/then]
 		[/if]
@@ -1527,7 +1527,7 @@ On the other side of the road, Undead have spread. Make sure they don't move ano
 				[message]
 				id=tut59
 				description=Delfador
-				message="You have too little time now, I must say."
+				message= _ "You have too little time now, I must say."
 				[/message]
 			[/then]
 		[/if]
@@ -1540,7 +1540,7 @@ On the other side of the road, Undead have spread. Make sure they don't move ano
 				[message]
 				id=tut60
 				description=Delfador
-				message="Only eight turns left, Konrad."
+				message= _ "Only eight turns left, Konrad."
 				[/message]
 			[/then]
 		[/if]
@@ -1568,7 +1568,7 @@ On the other side of the road, Undead have spread. Make sure they don't move ano
 				[message]
 				id=tutnope
 				description=Delfador
-				message="You should complete your training before attacking the bandit leader."
+				message= _ "You should complete your training before attacking the bandit leader."
 				[/message]
 			[/then]
 		[/if]

data/tutorial2.cfg

@@ -1,5 +1,5 @@
 [tutorial]
-	name=The Raiders Camp
+	name= _ "The Raiders Camp"
 	map_data="{maps/Tutorial/Tutorial2}"
 	turns=28
 
@@ -13,7 +13,7 @@
 	{FIRST_WATCH}
 	{SECOND_WATCH}
 
-	objectives="Victory:
+	objectives= _ "Victory:
 @Defeat Minueth
 Defeat:
 #Death of Konrad
@@ -79,31 +79,31 @@ Defeat:
 		[message]
 		id=newtut2_1
 		description=Delfador
-		message="Now, we have arrived at their camp. I am going to teach you about recall."
+		message= _ "Now, we have arrived at their camp. I am going to teach you about recall."
 		[/message]
 
 		[message]
 		id=newtut2_2
 		description=Korad
-		message="Recall?"
+		message= _ "Recall?"
 		[/message]
 
 		[message]
 		id=newtut2_3
 		description=Delfador
-		message="Soldiers that have fought for you in past battles - and survived - may be called again to serve you."
+		message= _ "Soldiers that have fought for you in past battles - and survived - may be called again to serve you."
 		[/message]
 
 		[message]
 		id=newtut2_4
 		description=Konrad
-		message="Ahhh, I see. So I can have more experienced soldiers at my side."
+		message= _ "Ahhh, I see. So I can have more experienced soldiers at my side."
 		[/message]
 
 		[message]
 		id=newtut2_5
 		description=Delfador
-		message="Yes, that is the point."
+		message= _ "Yes, that is the point."
 		[/message]
 	[/event]
 
@@ -112,32 +112,32 @@ Defeat:
 		[message]
 		id=newtut2_6
 		description=Delfador
-		message="I noticed that the bandits have the aid of some dark initiates and their undead minions."
+		message= _ "I noticed that the bandits have the aid of some dark initiates and their undead minions."
 		[/message]
 		[message]
 		id=newtut2_7
 		description=Konrad
-		message="Yes, I could see them. Those unholy creatures look nasty!"
+		message= _ "Yes, I could see them. Those unholy creatures look nasty!"
 		[/message]
 
 		[message]
 		id=newtut2_8
 		description=Delfador
-		message="And they are dangerous too. Their claws can poison your troops. Perhaps you should recruit some Shamans to your side."
+		message= _ "And they are dangerous too. Their claws can poison your troops. Perhaps you should recruit some Shamans to your side."
 		[/message]
 
 		[message]
 		id=newtut2_9
 		speaker=narrator
 		image="misc/tutorial7.png"
-		message="Units with healing power heal units near around them."
+		message= _ "Units with healing power heal units near around them."
 		[/message]
 
 		[message]
 		id=newtut2_10
 		speaker=narrator
 		image="misc/tutorial8.png"
-		message="Poisoned units lose hitpoints every turn until they are cured. 
+		message= _ "Poisoned units lose hitpoints every turn until they are cured. 
 The heal skill can only hold off the poison's effects for one turn.
 You must use a village or a unit with the cure skill to eliminate the poison."
 
@@ -156,7 +156,7 @@ You must use a village or a unit with the cure skill to eliminate the poison."
 		[message]
 		id=newtut2_11
 		description=Delfador
-		message="A nice try, Konrad, but it seems your skills still have much to be improved."
+		message= _ "A nice try, Konrad, but it seems your skills still have much to be improved."
 		[/message]
 	[/event]
 
@@ -168,7 +168,7 @@ You must use a village or a unit with the cure skill to eliminate the poison."
 		[message]
 		id=newtut2_12
 		description=Delfador
-		message="They caught me. You should have been more cautious."
+		message= _ "They caught me. You should have been more cautious."
 		[/message]
 	[/event]
 
@@ -180,7 +180,7 @@ You must use a village or a unit with the cure skill to eliminate the poison."
 		[message]
 		id=newtut2_13
 		description=Delfador
-		message="You have bested all your enemies, Konrad. Congratulations on your skill."
+		message= _ "You have bested all your enemies, Konrad. Congratulations on your skill."
 		[/message]
 	[/event]
 [/tutorial]

data/units/Bone_Shooter.cfg

@@ -6,10 +6,10 @@ image_defensive=undead-boneshooter-defend.png
 hitpoints=40
 movement_type=undeadfoot
 movement=5
-experience=500
+experience=100
 level=2
 alignment=chaotic
-advanceto=null
+advanceto=Soul Shooter
 cost=24
 unit_description="These elite undead archers strike terror in the hearts of their foes by using the bones of the slain as weapons."
 usage=archer