From 29bb32c0391b006e3859c5058b1dd5b2fa7caee9 Mon Sep 17 00:00:00 2001
From: Rachael Alexanderson <raa-eruanna@users.noreply.github.com>
Date: Thu, 2 Aug 2018 09:53:34 -0400
Subject: [PATCH] - export resolution strings to the language file

---
 wadsrc/static/language.enu | 18 ++++++++++++++++--
 wadsrc/static/menudef.txt  | 24 ++++++++++++------------
 2 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/wadsrc/static/language.enu b/wadsrc/static/language.enu
index 0cb1e42fc..1a938080d 100644
--- a/wadsrc/static/language.enu
+++ b/wadsrc/static/language.enu
@@ -2265,6 +2265,22 @@ VIDMNU_SCALEFACTOR		= "Scale Factor";
 VIDMNU_ENTERTEXT		= "Press ENTER to set mode";
 VIDMNU_TESTTEXT1		= "T to test mode for 5 seconds";
 VIDMNU_TESTTEXT2		= "Please wait 5 seconds...";
+VIDMNU_USELINEAR		= "Use Linear Scaling (Fullscreen)";
+VIDMNU_CUSTOMRES		= "Custom Resolution Mode";
+VIDMNU_CUSTOMX			= "Custom Width";
+VIDMNU_CUSTOMY			= "Custom Height";
+VIDMNU_APPLYW			= "Apply Changes (Windowed)";
+VIDMNU_APPLYFS			= "Apply Changes (Fullscreen)";
+VIDMNU_RESPRESET		= "Choose Resolution Preset";
+VIDMNU_RESPRESETTTL		= "Custom Resolution Presets";
+VIDMNU_RESPRESETHEAD	= "Preset Resolution Modes";
+VIDMNU_ASPECT43			= "4:3 Aspect";
+VIDMNU_ASPECT169		= "16:9 Aspect";
+VIDMNU_ASPECT1610		= "16:10 Aspect";
+VIDMNU_CUSTOMX			= "Custom Width";
+VIDMNU_CUSTOMX			= "Custom Width";
+VIDMNU_CUSTOMX			= "Custom Width";
+VIDMNU_CUSTOMX			= "Custom Width";
 
 // Network Options
 NETMNU_TITLE					= "NETWORK OPTIONS";
@@ -2891,8 +2907,6 @@ OPTVAL_EXTREME				= "Extreme";
 OPTVAL_OBVERSEFIRST			= "Obverse";
 OPTVAL_REVERSEFIRST			= "Reverse";
 
-// QZDoom exclusive:
-
 DSPLYMNU_TCOPT		= "TrueColor Options";
 
 TCMNU_TITLE		= "TRUECOLOR OPTIONS";
diff --git a/wadsrc/static/menudef.txt b/wadsrc/static/menudef.txt
index 81fe8f77f..3c6c8600a 100644
--- a/wadsrc/static/menudef.txt
+++ b/wadsrc/static/menudef.txt
@@ -1929,39 +1929,39 @@ OptionMenu VideoModeMenu protected
 	Slider "$VIDMNU_SCALEFACTOR",		"vid_scalefactor", 0.25, 2.0, 0.25, 2
 
 	StaticText ""
-	StaticText "Custom Resolution Mode"
-	TextField "Custom Width", menu_resolution_custom_width
-	TextField "Custom Height", menu_resolution_custom_height
-	Option "Use Linear Scaling (Fullscreen)", "vid_scale_customlinear", "YesNo"
+	StaticText "$VIDMNU_CUSTOMRES"
+	TextField "$VIDMNU_CUSTOMX", menu_resolution_custom_width
+	TextField "$VIDMNU_CUSTOMY", menu_resolution_custom_height
+	Option "$VIDMNU_USELINEAR", "vid_scale_customlinear", "YesNo"
 	StaticText ""
-	Command "Apply Changes (Windowed)", "menu_resolution_commit_changes 0"
-	Command "Apply Changes (Fullscreen)", "menu_resolution_commit_changes 1"
+	Command "$VIDMNU_APPLYW", "menu_resolution_commit_changes 0"
+	Command "$VIDMNU_APPLYFS", "menu_resolution_commit_changes 1"
 	StaticText ""
 
-	SubMenu "Choose Resolution Preset", CustomResolutionMenu
+	SubMenu "$VIDMNU_RESPRESET", CustomResolutionMenu
 }
 
 OptionMenu CustomResolutionMenu protected
 {
-	Title "Custom Resolution Presets"
+	Title "$VIDMNU_RESPRESETTTL"
 	
-	StaticText "Preset Resolution Modes"
+	StaticText "$VIDMNU_RESPRESETHEAD"
 	StaticText ""
-	StaticText "4:3 Aspect"
+	StaticText "$VIDMNU_ASPECT43"
 	Command "320x240", "menu_resolution_set_custom 320 240"
 	Command "640x480", "menu_resolution_set_custom 640 480"
 	Command "1024x768", "menu_resolution_set_custom 1024 768"
 	Command "1280x960", "menu_resolution_set_custom 1280 960"
 	Command "1600x1200", "menu_resolution_set_custom 1600 1200"
 	StaticText ""
-	StaticText "16:9 Aspect"
+	StaticText "$VIDMNU_ASPECT169"
 	Command "960x540", "menu_resolution_set_custom 960 540"
 	Command "(720p HD)   1280x720", "menu_resolution_set_custom 1280 720"
 	Command "1366x768", "menu_resolution_set_custom 1366 768"
 	Command "(1080p HD) 1920x1080", "menu_resolution_set_custom 1920 1080"
 	Command "(1440p HD)  2560x1440", "menu_resolution_set_custom 2560 1440"
 	StaticText ""
-	StaticText "16:10 Aspect"
+	StaticText "$VIDMNU_ASPECT1610"
 	Command "960x600", "menu_resolution_set_custom 960 600"
 	Command "1280x800", "menu_resolution_set_custom 1280 800"
 	Command "1440x900", "menu_resolution_set_custom 1440 900"