diff --git a/data/tutorial/scenarios/1_Tutorial.cfg b/data/tutorial/scenarios/1_Tutorial.cfg
index 80f93a61e8e..ebfbd054ccd 100644
--- a/data/tutorial/scenarios/1_Tutorial.cfg
+++ b/data/tutorial/scenarios/1_Tutorial.cfg
@@ -35,6 +35,7 @@
 
 [tutorial]
 	id=tutorial
+	translator_comment=_ "Hello translators!  Tutorial is meant to be a little funny at the start, welcoming new players.  Please keep friendly fun feeling!  Any questions email rusty@rustcorp.com.au!"
 	name=_ "Wesnoth Tutorial"
 	map_data="ffffggcctggggggfffff
 ffgggggccggggggggfff
@@ -148,7 +149,6 @@ ffffgggggggggcgggfff
 				[command]
 					{VARIABLE gender male}
 					{VARIABLE student _"Konrad"}
-					{VARIABLE he _"he"}
 				[/command]
 			[/option]
 			[option]
@@ -156,7 +156,6 @@ ffffgggggggggcgggfff
 				[command]
 					{VARIABLE gender female}
 					{VARIABLE student _"Li'sar"}
-					{VARIABLE he _"she"}
 					[store_unit]
 						[filter]
 							description=student
@@ -177,14 +176,27 @@ ffffgggggggggcgggfff
 		[unhide_unit][/unhide_unit]
 		{LABEL $student {STUDENT_START_LOC}}
 		[redraw][/redraw]
-		[message]
-			speaker=narrator
-			message=_ "*Welcome to Wesnoth!
-For this tutorial, you are playing $student.  You are standing in the keep, and your mentor Delfador is on the East side of the river.
-*Left click or any key to continue..."
-		[/message]
 
-		{PRINT (_"Left click on $student")}
+		{GENDER ([message]
+			speaker=narrator
+			message=_ "*Welcome to Wesnoth!" +
+				_ "
+For this tutorial, you are playing Konrad. " +
+				_ "You are standing in the keep, and your mentor Delfador is on the East side of the river." +
+				_ "
+*Left click or any key to continue..."
+		[/message]) ([message]
+			speaker=narrator
+			message=_ "*Welcome to Wesnoth!" +
+				_ "
+For this tutorial, you are playing Li'sar. " +
+				_ "You are standing in the keep, and your mentor Delfador is on the East side of the river." +
+				_ "
+*Left click or any key to continue..."
+		[/message])}
+
+		{GENDER ({PRINT (_"Left click on Konrad")})
+			({PRINT (_"Left click on Li'sar")})}
 	[/event]
 
 	[event]
@@ -197,21 +209,34 @@ For this tutorial, you are playing $student.  You are standing in the keep, and
 		{CLEAR_PRINT}
 
 		[redraw][/redraw]
-		[message]
+		{GENDER ([message]
 			speaker=narrator
-			message=_ "*You have selected $student.
-The places $he could move to are highlighted.
+			message=_ "*You have selected Konrad.
+The places he could move to are highlighted." +
+				_ "
 *Left click or any key to continue..."
-		[/message]
+		[/message]) ([message]
+			speaker=narrator
+			message=_ "*You have selected Li'sar.
+The places she could move to are highlighted." +
+				_ "
+*Left click or any key to continue..."
+		[/message])}
 
 		{LABEL (_ "HERE") {MARKER_LOC}}
 		[redraw][/redraw]
 
-		[message]
+		{GENDER ([message]
 			speaker=narrator
-			message=_ "Move $student next to Delfador, by clicking on the place marked 'HERE'.
+			message=_ "Move Konrad next to Delfador, by clicking on the place marked 'HERE'." +
+			_ "
 *Left click or any key to continue..."
-		[/message]
+		[/message]) ([message]
+			speaker=narrator
+			message=_ "Move Li'sar next to Delfador, by clicking on the place marked 'HERE'." +
+			_ "
+*Left click or any key to continue..."
+		[/message])}
 
 		{DEST 12 5}
 		{PRINT (_"Left click on tile labelled HERE")}
@@ -343,11 +368,17 @@ You moved to the wrong place!  After this message, you can press 'u' to Undo, th
 		message=_ "Child, you have 32 hitpoints and a sword.    I'm fairly sure you'll win."
 		[/message]
 
-		[message]
+		{GENDER ([message]
 			speaker=narrator
-			message=_ "To attack the quintain, you will first select the attacker ($student) and then the target (the quintain).  You will see a description of the details of the attack.  When you click OK, $student will attack.
+			message=_ "To attack the quintain, you will first select the attacker (Konrad) and then the target (the quintain).  You will see a description of the details of the attack.  When you click OK, Konrad will attack." +
+		_ "
 *Left click or any key to continue..."
-		[/message]
+		[/message]) ([message]
+			speaker=narrator
+			message=_ "To attack the quintain, you will first select the attacker (Li'sar) and then the target (the quintain).  You will see a description of the details of the attack.  When you click OK, Li'sar will attack." +
+		_ "
+*Left click or any key to continue..."
+		[/message])}
 
 		[event]
 			name=select
@@ -358,7 +389,8 @@ You moved to the wrong place!  After this message, you can press 'u' to Undo, th
 			{PRINT (_"Click on the quintain to attack it")}
 		[/event]
 
-		{PRINT (_"Click on $student")}
+		{GENDER ({PRINT (_"Left click on Konrad")})
+			({PRINT (_"Left click on Li'sar")})}
 	[/event]
 
 	# We track student's hitpoints so Delfador can explain them.
@@ -444,7 +476,8 @@ Now, this quintain gets five chances to hit you, and if it hits every time, you'
 			message=_ "There is a village on the other side of the river.  Visiting villages is a good idea, and ending your turn in one will heal you: you should retreat to there."
 		[/message]
 
-		{PRINT (_ "Click on $student")}
+		{GENDER ({PRINT (_"Left click on Konrad")})
+			({PRINT (_"Left click on Li'sar")})}
 
 		[event]
 			name=select
@@ -452,7 +485,8 @@ Now, this quintain gets five chances to hit you, and if it hits every time, you'
 				side=1
 			[/filter]
 			
-			{PRINT (_ "Click on the village to move $student")}
+			{GENDER ({PRINT (_"Click on the village to move Konrad")})
+				({PRINT (_"Click on the village to move Li'sar")})}
 		[/event]
 
 		{DEST 11 7}
@@ -521,7 +555,9 @@ Now, this quintain gets five chances to hit you, and if it hits every time, you'
 		[/message]
 
 		{DEST 9 6}
-		{PRINT (_"Move $student to the keep")}
+		{GENDER ({PRINT (_"Move Konrad to the keep")})
+			({PRINT (_"Move Li'sar to the keep")})}
+		{PRINT (_"")}
 
 		[event]
 			name=moveto
@@ -846,11 +882,15 @@ Once you select a unit, you see percentages for different places: higher means m
 			speaker=second_unit
 			message=_ "The quintain is dead, sirs, and I have gained more experience!"
 		[/message]
-		[message]
+		{GENDER ([message]
 			description=Delfador
-			message=_ "Yes, you gain more experience through battle, especially killing an opponent: gain enough experience and you become more powerful.
-Now $student, I will leave you with more dummies to practice on!  After that, we have real work to do..."
-		[/message]
+			message=_ "Yes, you gain more experience through battle, especially killing an opponent: gain enough experience and you become more powerful." +
+			_ "Now Konrad, I will leave you with more dummies to practice on!  After that, we have real work to do..."
+		[/message]) ([message]
+			description=Delfador
+			message=_ "Yes, you gain more experience through battle, especially killing an opponent: gain enough experience and you become more powerful." +
+			_ "Now Li'sar, I will leave you with more dummies to practice on!  After that, we have real work to do..."
+		[/message])}
 		{VARIABLE quintain_dead 1}
 
 		[unit]
diff --git a/data/tutorial/scenarios/2_Tutorial.cfg b/data/tutorial/scenarios/2_Tutorial.cfg
index 79446277b63..6bf474e2657 100644
--- a/data/tutorial/scenarios/2_Tutorial.cfg
+++ b/data/tutorial/scenarios/2_Tutorial.cfg
@@ -371,7 +371,9 @@
 		{VARIABLE recruit_num 1}
 		{VARIABLE income_exceeded 0}
 		{STUDENT (_"Ho Galdrad!  Has Delfador conjured something else to beat me with?  A flock of scarecrows, perhaps?")}
-		{TEACHER (_ "This is no game, $student|.  Orcs have encamped across the river.  This is elven country: we Elves are fast and hard to hit in forests.  They are fools to enter here.  You must defeat their leader, so they never bother us again.  I will advise you.")}
+		{GENDER ({TEACHER (_ "This is no game, Konrad! " +
+			  _ "Orcs have encamped across the river.  This is elven country: we Elves are fast and hard to hit in forests.  They are fools to enter here.  You must defeat their leader, so they never bother us again.  I will advise you.")}) ({TEACHER (_ "This is no game, Li'sar! " +
+			  _ "Orcs have encamped across the river.  This is elven country: we Elves are fast and hard to hit in forests.  They are fools to enter here.  You must defeat their leader, so they never bother us again.  I will advise you.")})}
 		{STUDENT (_"What should I do?")}
 
 		# Now we're into it... start music.
@@ -540,7 +542,8 @@ One Elvish Shaman")}
 				{STUDENT (_"So, should I end my turn now?")}
 				# FIXME: If any level 2 units, costs will be higher.
 				{TEACHER (_"It's true, none of your recruited units can move, but you still can.  Your five units cost you 5 gold, leaving you 3 gold pieces poorer per turn.  You need more income.")}
-				{PRINT (_"Move $student to capture a village")}
+				{GENDER ({PRINT (_"Move Konrad to capture a village")})
+					({PRINT (_"Move Li'sar to capture a village")})}
 			[/else]
 			[/if]
 		[/then]
@@ -841,7 +844,10 @@ One Elvish Shaman")}
 			{NUMEQ villages_around_keep 1}
 		[then]
 			# FIXME: Level 2 units change costs.
-			{TEACHER (_"You've learned well, $student|!  The village supports one unit, and pays one gold per turn: you're only losing 1 gold per turn now.")}
+			{GENDER ({TEACHER (_"You've learned well, Konrad! " +
+				  _ "The village supports one unit, and pays one gold per turn: you're only losing 1 gold per turn now.")})
+				({TEACHER (_"You've learned well, Li'sar! " +
+				  _ "The village supports one unit, and pays one gold per turn: you're only losing 1 gold per turn now.")})}
 			{PRINT (_"End your turn")}
 		[/then]
 		[/if]
@@ -863,7 +869,8 @@ One Elvish Shaman")}
 				description=student
 			[/not]
 		[/filter]
-		{TEACHER (_"You should leave the villages near your keep for $student to capture, as $he needs to stay nearby to recruit more units anyway.")}
+		{GENDER ({TEACHER (_"You should leave the villages near your keep for Konrad to capture, as he needs to stay nearby to recruit more units anyway.")})
+			({TEACHER (_"You should leave the villages near your keep for Li'sar to capture, as she needs to stay nearby to recruit more units anyway.")})}
 		{UNDO_REMINDER}
 	[/event]
 
@@ -921,7 +928,8 @@ One Elvish Shaman")}
 						{UNLABEL 19,5}
 						{LABEL (_"Keep") 10,3}
 						{TEACHER (_"Send the other Fighter and the Shaman south so they can attack next turn, then return to the keep to recruit more units!")}
-						{PRINT (_"Move Fighter and Shaman south, then return $student to the Keep")}
+						{GENDER ({PRINT (_"Move Fighter and Shaman south, then return Konrad to the Keep")})
+							({PRINT (_"Move Fighter and Shaman south, then return Li'sar to the Keep")})}
 					[/event]
 
 					[event]
@@ -948,7 +956,8 @@ One Elvish Shaman")}
 						[then]
 							{STUDENT (_"I have no more money to recruit!")}
 							{TEACHER (_"This is often a problem, which is why owning villages is important.")}
-							{PRINT (_"Move $student to another (unowned) village")}
+							{GENDER ({PRINT (_"Move Konrad to another (unowned) village")})
+								({PRINT (_"Move Li'sar to another (unowned) village")})}
 						[/then]
 						[/if]
 					[/event]
@@ -1311,7 +1320,7 @@ When 'n' no longer selects a new unit, you can end your turn.")}
 			[/then]
 			[else]
 				# Must be level 2 unit.
-				{TEACHER (_"Level 2 units are powerful, but not invulnerable $student!  Goodbye, $deadguy.user_description|.")}
+				{TEACHER (_"Level 2 units are powerful, but not invulnerable!  Goodbye, $deadguy.user_description|.")}
 			[/else]
 			[/if]
 		[/else]
diff --git a/data/tutorial/scenarios/utils.cfg b/data/tutorial/scenarios/utils.cfg
index b1c72f0969e..94689b243b5 100644
--- a/data/tutorial/scenarios/utils.cfg
+++ b/data/tutorial/scenarios/utils.cfg
@@ -72,4 +72,18 @@
 	numerical_equals={VAL}
 [/variable]
 #enddef
-		 
+
+#define GENDER A B
+[if]
+	[variable]
+		name=gender
+		equals=male
+	[/variable]
+[then]
+	{A}
+[/then]
+[else]
+	{B}
+[/else]
+[/if]
+#enddef