Merged revision(s) 6894 from branches/ja2_source_official_2014:

Fixes (by Buggler)
- IMPPrejudice page not showing when reviewing in finish mode
- Added message when minor traits are unselectable due to all IMP available slots taken up by major traits
- Display message when pressing hotkey 'G' to toggle artificial merc light
- refactor hotkey weapon switching and make function available in OIV too
- hold ALT key to swap item instead of opening description box for valid attachment on cursor

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6895 3b4a5df2-a311-0410-b5c6-a8a6f20db521

Utils/Text.h

@@ -415,8 +415,8 @@ enum
 	MSG_ENTERING_LEVEL,
 	MSG_LEAVING_BASEMENT,
 	MSG_DASH_S,				// the old 's
-	MSG_TACKING_MODE_OFF,
-	MSG_TACKING_MODE_ON,
+	MSG_TRACKING_MODE_OFF,
+	MSG_TRACKING_MODE_ON,
 	MSG_3DCURSOR_OFF,
 	MSG_3DCURSOR_ON,
 	MSG_SQUAD_ACTIVE,
@@ -461,6 +461,8 @@ enum
 	MSG_WINDOWED_MODE_RELEASE_MOUSE,		// 105
 	MSG_FORMATIONS_ON,						// 106
 	MSG_FORMATIONS_OFF,						// 107
+	MSG_MERC_CASTS_LIGHT_ON,
+	MSG_MERC_CASTS_LIGHT_OFF,
 
 	TEXT_NUM_MSG,
 };