Merge remote-tracking branch 'Karma/master'

locations/gschool_socialchg1.qsrc

@@ -209,8 +209,8 @@ if $ARGS[0] = 'tChristina':
 	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/18.jpg"></center>'
-	'"What are you two up to?" you ask Christina ignoring Lina as you walk up to them.'
-	'"I''m trying to get this lazy ass to perform better..." Christina sourly answers. "Thanks to her we lost the last relay race. And now I''ve got to whip her into shape before the next race."'
+	'"What are the two of you up to?" you ask Christina ignoring Lina as you walk up to them.'
+	'"I''m trying to get this lazy ass to perform better..." Christina sourly answers. "Thanks to her we lost the last relay race. And now I''ve got to whip her into shape before the next one."'
 	
 	act 'You''re right':
 		cla & *clr
@@ -221,9 +221,9 @@ if $ARGS[0] = 'tChristina':
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/18.jpg"> <img <<$set_imgh>> src="images/characters/pavlovsk/school/head/19.jpg"></center>'
 		'"But... But..." Lina tries to explain but gets interrupted by you, "No Lina, Christina is right. If you messed it up then you need to train harder and perform better next time. There''s no slacking off."'
 		'"Of course I''m correct." Christina fills in, "I''m the most prominent athlete at the school and also the captain of the track and field team. My word is law."'
-		'Dejected, Lina stares at the ground and you can hear her quietly whimper as she thought that you would help her out.'
-		'"No time to rest, time for you to take another run around the lake. I''ll time you this time and if you fail, you''ll be in a world of hurt." Christina commands.'
-		'As Lina can''t find a way out she nods and gets ready. You hear Christina yell out "GO!" and watch Lina speed off...'
+		'Dejected, Lina stares at the ground and you can hear her quietly whimper since she thought that you would have helped her out.'
+		'"No time to rest, time for you to take another run around the lake. I''ll time you this time and if you fail, you''ll be in a world of troubles." Christina commands.'
+		'As Lina can''t find a way out she nods and gets ready. You hear Christina shout "GO!" and watch Lina speed off...'
 		
 		act 'Leave them alone': gt 'gLake'
 	
@@ -237,9 +237,9 @@ if $ARGS[0] = 'tChristina':
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/18.jpg"></center>'
 		'"Give her a break, Christina. Everyone can have a bad race once in a while..." you begin defending Lina.'
-		'"What do you know, <<$pcs_nickname>>? Where you there?! You have no idea how humiliated I felt." Christina replies.'
+		'"What do you know, <<$pcs_nickname>>? Were you there?! You have no idea how humiliated I felt." Christina replies.'
 		'"Put your ego aside. Just look at Lina, she''s totally exhausted and needs a break. What will you do if she gets injured?" you continue on.'
-		'Christina is looking at you with despise in her eyes, "Like I care... Only because of this you''ll do double the sprints, Lina."'
+		'Christina glares at you menacingly, "Like I care... Because of this you''ll do double the sprints, Lina."'
 		'The only thing you can do is sigh and look apologetically to Lina while she nods understandingly.'
 		
 		act 'Leave them alone': gt 'gLake'