Merge branch 'master' into opengl

src/include/86box/language.h

@@ -115,6 +115,7 @@
 #define IDS_2139	2139		// "MO images (*.IM?)\0*.IM?..."
 #define IDS_2140	2140		// "CD-ROM images (*.ISO;*.CU.."
 #define IDS_2141	2141		// "%hs Device Configuration"
+#define IDS_2142	2142		// "Monitor in sleep mode"
 
 #define IDS_4096	4096		// "Hard disk (%s)"
 #define IDS_4097	4097		// "%01i:%01i"
@@ -222,7 +223,7 @@
 
 #define IDS_LANG_ENUS	IDS_7168
 
-#define STR_NUM_2048	94
+#define STR_NUM_2048	95
 #define STR_NUM_3072	11
 #define STR_NUM_4096	39
 #define STR_NUM_4352	6

src/include/86box/vid_svga.h

@@ -135,6 +135,7 @@ typedef struct svga_t
 	    plane_mask, writemask,
 	    colourcompare, colournocare,
 	    dac_mask, dac_status,
+	    dpms, dpms_ui,
 	    ksc5601_sbyte_mask, ksc5601_udc_area_msb[2];
 
     int ksc5601_swap_mode;