Merge remote-tracking branch 'upstream/master'

source/core/gamecontrol.cpp

@@ -687,8 +687,8 @@ void SetDefaultStrings()
 	}
 
 	//Set a few quotes which are used for common handling of a few status messages
-	quoteMgr.InitializeQuote(23, "$MESSAGES: ON");
-	quoteMgr.InitializeQuote(24, "$MESSAGES: OFF");
+	quoteMgr.InitializeQuote(23, "$MSGON");
+	quoteMgr.InitializeQuote(24, "$MSGOFF");
 	quoteMgr.InitializeQuote(83, "$FOLLOW MODE OFF");
 	quoteMgr.InitializeQuote(84, "$FOLLOW MODE ON");
 	quoteMgr.InitializeQuote(85, "$AUTORUNOFF");

wadsrc/static/filter/duke/language.txt

@@ -23,8 +23,10 @@
 "#CrosshairOn" = "$$CROSSHAIR: ON";
 "#CrosshairOff" = "$$CROSSHAIR: OFF";
 "#Cheater" = "$$YOU'RE TOO GOOD TO BE CHEATING!";
-"#MessagesOn" = "$$MESSAGES: ON";
-"#MessagesOff" = "$$MESSAGES: OFF";
+"#MessagesOn" = "$$MSGON";
+"#MessagesOff" = "$$MSGOFF";
+"MESSAGES: ON" = "$$MSGON";
+"MESSAGES: OFF" = "$$MSGOFF";
 "#TypeTheCheatCode" = "$$TYPE THE CHEAT CODE:";
 "#DetailLow" = "$$DETAIL: LOW";
 "#DetailHigh" = "$$DETAIL: HIGH";