Merge branch 'master' of https://github.com/mamedev/mame

3rdparty/libjpeg/jconfig.h

@@ -8,6 +8,7 @@
 /* #define const */
 #undef CHAR_IS_UNSIGNED
 #define HAVE_STDDEF_H
+#undef HAVE_STDLIB_H
 #define HAVE_STDLIB_H
 #undef NEED_BSD_STRINGS
 #undef NEED_SYS_TYPES_H

3rdparty/libjpeg/jpeglib.h

@@ -11,13 +11,6 @@
  * and perhaps jerror.h if they want to know the exact error codes.
  */
 
-#ifdef USE_SYSTEM_JPEGLIB
-#ifndef XMD_H
-#define XMD_H
-#endif
-#include <jpeglib.h>
-#else
-
 #ifndef JPEGLIB_H
 #define JPEGLIB_H
 
@@ -1165,4 +1158,3 @@ struct jpeg_color_quantizer { long dummy; };
 #endif
 
 #endif /* JPEGLIB_H */
-#endif /* USE_SYSTEM_JPEGLIB */

3rdparty/lsqlite3/lsqlite3.c

@@ -31,8 +31,8 @@
 #include <assert.h>
 
 #define LUA_LIB
-#include "lua.h"
+#include <lua.h>
-#include "lauxlib.h"
+#include <lauxlib.h>
 
 #if LUA_VERSION_NUM > 501
 //
@@ -47,11 +47,7 @@
 #define luaL_openlib(L,name,reg,nup) luaL_setfuncs(L,reg,nup)
 #endif
 
-#ifndef USE_SYSTEM_SQLITE
-#include "sqlite3/sqlite3.h"
-#else
 #include <sqlite3.h>
-#endif
 
 /* compile time features */
 #if !defined(SQLITE_OMIT_PROGRESS_CALLBACK)

android-project/LICENSE

@@ -0,0 +1,27 @@
+Copyright (c) 2016, MAME Development Team
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+* Neither the name of bsd3 nor the names of its
+  contributors may be used to endorse or promote products derived from
+  this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

android-project/README.md

@@ -0,0 +1,9 @@
+# **android-project** #
+
+Cointains code by needed to run MAME on Android
+
+Licensed under [The BSD 3-Clause License](http://opensource.org/licenses/BSD-3-Clause)
+
+It also contains org.libsdl.app.Activity part of SDL2 project under [zlib license](http://opensource.org/licenses/Zlib)
+
+And for building Gradle-wrapper is used that is under [Apache License, Version 2.0](http://opensource.org/licenses/Apache-2.0)

android-project/app/src/main/res/layout/main.xml

@@ -7,7 +7,7 @@
 <TextView  
     android:layout_width="fill_parent" 
     android:layout_height="wrap_content" 
-    android:text="Hello World, SDLActivity"
+    android:text="MAME"
     />
 </LinearLayout>
 

bgfx/chains/default.json

@@ -7,17 +7,10 @@
 		}
 	],
 	"passes": [
-		{	"effect": "blit",
+		{	"effect": "default/blit",
-			"name": "Copy To Unstretched Texture",
-			"input": [
-				{ "sampler": "s_tex", "texture": "screen" }
-			],
-			"output": "temp"
-		},
-		{	"effect": "blit",
 			"name": "Final Upscale",
 			"input": [
-				{ "sampler": "s_tex", "target": "temp" }
+				{ "sampler": "s_tex", "texture": "screen" }
 			],
 			"output": "output"
 		}

bgfx/chains/hlsl.json

@@ -57,17 +57,18 @@
 		
 		{ "type": "intenum", "name": "adjustments", "text": "Enable Adjustments", "default": 0, "max": 1, "min": 0, "step": 1, "scale": 1.0, "format": "%s", "screen": "any", "strings": [ "Off", "On" ] },
 
-		{ "type": "intenum", "name": "ntsc",            "text": "Enable NTSC",                   "default": 0,        "max": 1,        "min": 0,        "step": 1,   "scale": 1.0,       "format": "%s",    "screen": "any", "strings": [ "Off", "On" ] },
+		{ "type": "intenum", "name": "ntsc",            "text": "Enable NTSC",                           "default": 0,        "max": 1,        "min": 0,        "step": 1,   "scale": 1.0,       "format": "%s",    "screen": "any", "strings": [ "Off", "On" ] },
-		{ "type": "float",    "name": "a_value",         "text": "NTSC A Value",                  "default": 50,       "max": 100,      "min": 0,        "step": 1,   "scale": 0.01,      "format": "%1.2f", "screen": "raster" },
+		{ "type": "float",   "name": "a_value",         "text": "NTSC A Value",                          "default": 50,       "max": 100,      "min": 0,        "step": 1,   "scale": 0.01,      "format": "%1.2f", "screen": "raster" },
-		{ "type": "float",    "name": "b_value",         "text": "NTSC B Value",                  "default": 50,       "max": 100,      "min": 0,        "step": 1,   "scale": 0.01,      "format": "%1.2f", "screen": "raster" },
+		{ "type": "float",   "name": "b_value",         "text": "NTSC B Value",                          "default": 50,       "max": 100,      "min": 0,        "step": 1,   "scale": 0.01,      "format": "%1.2f", "screen": "raster" },
-		{ "type": "float",    "name": "cc_value",        "text": "NTSC Color Carrier (Hz)",       "default": 35795454, "max": 36795454, "min": 34795454, "step": 100, "scale": 0.0000001, "format": "%1.7f", "screen": "raster" },
+		{ "type": "float",   "name": "cc_value",        "text": "NTSC Color Carrier (Hz)",               "default": 35795454, "max": 36795454, "min": 34795454, "step": 100, "scale": 0.0000001, "format": "%1.7f", "screen": "raster" },
-		{ "type": "float",    "name": "p_value",         "text": "NTSC Phase Offset",             "default": 100,      "max": 200,      "min": 0,        "step": 1,   "scale": 0.01,      "format": "%1.2f", "screen": "raster" },
+		{ "type": "float",   "name": "o_value",         "text": "NTSC Outgoing Phase Offset",            "default": 0,        "max": 100,      "min": 0,        "step": 1,   "scale": 0.01,      "format": "%1.2f", "screen": "raster" },
-		{ "type": "float",    "name": "scan_time",       "text": "NTSC Scanline Duration (uSec)", "default": 526,      "max": 1500,     "min": 1,        "step": 1,   "scale": 0.1,       "format": "%3.1f", "screen": "raster" },
+		{ "type": "float",   "name": "p_value",         "text": "NTSC Incoming Phase Pixel Clock Scale", "default": 100,      "max": 200,      "min": 0,        "step": 1,   "scale": 0.01,      "format": "%1.2f", "screen": "raster" },
-		{ "type": "float",    "name": "notch_width",     "text": "NTSC Color Notch Filter Width", "default": 100,      "max": 400,      "min": 1,        "step": 1,   "scale": 0.01,      "format": "%1.2f", "screen": "raster" },
+		{ "type": "float",   "name": "scan_time",       "text": "NTSC Scanline Duration (uSec)",         "default": 526,      "max": 1500,     "min": 1,        "step": 1,   "scale": 0.1,       "format": "%3.1f", "screen": "raster" },
-		{ "type": "float",    "name": "y_freq_response", "text": "NTSC Y Signal Bandwidth (Hz)",  "default": 600,      "max": 2100,     "min": 1,        "step": 10,  "scale": 0.01,      "format": "%2.2f", "screen": "raster" },
+		{ "type": "float",   "name": "notch_width",     "text": "NTSC Color Notch Filter Width",         "default": 200,      "max": 400,      "min": 1,        "step": 1,   "scale": 0.01,      "format": "%1.2f", "screen": "raster" },
-		{ "type": "float",    "name": "i_freq_response", "text": "NTSC I Signal Bandwidth (Hz)",  "default": 120,      "max": 2100,     "min": 1,        "step": 10,  "scale": 0.01,      "format": "%2.2f", "screen": "raster" },
+		{ "type": "float",   "name": "y_freq_response", "text": "NTSC Y Signal Bandwidth (Hz)",          "default": 600,      "max": 2100,     "min": 1,        "step": 10,  "scale": 0.01,      "format": "%2.2f", "screen": "raster" },
-		{ "type": "float",    "name": "q_freq_response", "text": "NTSC Q Signal Bandwidth (Hz)",  "default": 60,       "max": 2100,     "min": 1,        "step": 10,  "scale": 0.01,      "format": "%2.2f", "screen": "raster" },
+		{ "type": "float",   "name": "i_freq_response", "text": "NTSC I Signal Bandwidth (Hz)",          "default": 120,      "max": 2100,     "min": 1,        "step": 10,  "scale": 0.01,      "format": "%2.2f", "screen": "raster" },
-		{ "type": "float",    "name": "jitter_offset",   "text": "NTSC Frame Jitter Offset",      "default": 0,        "max": 200,      "min": 1,        "step": 1,   "scale": 0.01,      "format": "%1.2f", "screen": "raster" },
+		{ "type": "float",   "name": "q_freq_response", "text": "NTSC Q Signal Bandwidth (Hz)",          "default": 60,       "max": 2100,     "min": 1,        "step": 10,  "scale": 0.01,      "format": "%2.2f", "screen": "raster" },
+		{ "type": "float",   "name": "jitter_offset",   "text": "NTSC Frame Jitter Offset",              "default": 0,        "max": 200,      "min": 1,        "step": 1,   "scale": 0.01,      "format": "%1.2f", "screen": "raster" },
 
 		{ "type": "color", "name": "red_ratios", "text": "Red Output from ",   "default": [ 100,   0,   0 ], "max": [ 200, 200, 200 ], "min": [ 0, 0, 0 ], "step": 1, "scale": 0.01, "format": "%1.2f", "screen": "raster" },
 		{ "type": "color", "name": "grn_ratios", "text": "Green Output from ", "default": [   0, 100,   0 ], "max": [ 200, 200, 200 ], "min": [ 0, 0, 0 ], "step": 1, "scale": 0.01, "format": "%1.2f", "screen": "raster" },
@@ -86,29 +87,29 @@
 
 		{ "type": "vec2", "name": "defocus", "text": "Defocus, ",  "default": [ 15, 15 ], "max": [ 500, 500 ], "min": [ 0, 0 ], "step": 1, "scale": 0.1, "format": "%2.1f", "screen": "crt" },
 
-		{ "type": "color", "name": "phosphor", "text": "Phosphor Persistence, ",  "default": [ 55, 55, 55 ], "max": [ 100, 100, 100 ], "min": [ 0, 0, 0 ], "step": 1, "scale": 0.01, "format": "%1.2f", "screen": "crt" },
+		{ "type": "color", "name": "phosphor", "text": "Phosphor Persistence, ",  "default": [ 45, 45, 45 ], "max": [ 100, 100, 100 ], "min": [ 0, 0, 0 ], "step": 1, "scale": 0.01, "format": "%1.2f", "screen": "crt" },
 
-		{ "type": "float",   "name": "scanline_alpha",         "text": "Scanline Amount",            "default": 0,                 "max": 100,               "min": 0,           "step": 1, "scale": 0.01,       "format": "%1.2f", "screen": "crt" },
+		{ "type": "float",   "name": "scanline_alpha",         "text": "Scanline Amount",            "default": 60,             "max": 100,               "min": 0,           "step": 1, "scale": 0.01,    "format": "%1.2f", "screen": "crt" },
-		{ "type": "float",   "name": "scanline_scale",         "text": "Overall Scanline Scale",     "default": 100,               "max": 400,               "min": 0,           "step": 1, "scale": 0.01,       "format": "%1.2f", "screen": "crt" },
+		{ "type": "float",   "name": "scanline_scale",         "text": "Overall Scanline Scale",     "default": 100,            "max": 400,               "min": 0,           "step": 1, "scale": 0.01,    "format": "%1.2f", "screen": "crt" },
-		{ "type": "float",   "name": "scanline_bright_scale",  "text": "Scanline Brightness Scale",  "default": 200,               "max": 400,               "min": 0,           "step": 1, "scale": 0.01,       "format": "%1.2f", "screen": "crt" },
+		{ "type": "float",   "name": "scanline_bright_scale",  "text": "Scanline Brightness Scale",  "default": 200,            "max": 400,               "min": 0,           "step": 1, "scale": 0.01,    "format": "%1.2f", "screen": "crt" },
-		{ "type": "float",   "name": "scanline_bright_offset", "text": "Scanline Brightness Offset", "default": 0,                 "max": 400,               "min": 0,           "step": 1, "scale": 0.01,       "format": "%1.2f", "screen": "crt" },
+		{ "type": "float",   "name": "scanline_bright_offset", "text": "Scanline Brightness Offset", "default": 0,              "max": 400,               "min": 0,           "step": 1, "scale": 0.01,    "format": "%1.2f", "screen": "crt" },
-		{ "type": "float",   "name": "scanline_jitter_amount", "text": "Scanline Jitter Amount",     "default": 0,                 "max": 400,               "min": 0,           "step": 1, "scale": 0.01,       "format": "%1.2f", "screen": "crt" },
+		{ "type": "float",   "name": "scanline_jitter_amount", "text": "Scanline Jitter Amount",     "default": 0,              "max": 400,               "min": 0,           "step": 1, "scale": 0.01,    "format": "%1.2f", "screen": "crt" },
-		{ "type": "float",   "name": "scanline_height",        "text": "Individual Scanline Scale",  "default": 100,               "max": 400,               "min": 0,           "step": 1, "scale": 0.01,       "format": "%1.2f", "screen": "crt" },
+		{ "type": "float",   "name": "scanline_height",        "text": "Individual Scanline Scale",  "default": 100,            "max": 400,               "min": 0,           "step": 1, "scale": 0.01,    "format": "%1.2f", "screen": "crt" },
-		{ "type": "float",   "name": "scanline_variation",     "text": "Scanline Variation",         "default": 100,               "max": 400,               "min": 0,           "step": 1, "scale": 0.01,       "format": "%1.2f", "screen": "crt" },
+		{ "type": "float",   "name": "scanline_variation",     "text": "Scanline Variation",         "default": 100,            "max": 400,               "min": 0,           "step": 1, "scale": 0.01,    "format": "%1.2f", "screen": "crt" },
-		{ "type": "float",   "name": "shadow_alpha",           "text": "Shadow Mask Amount",         "default": 0,                 "max": 100,               "min": 0,           "step": 1, "scale": 0.01,       "format": "%1.2f", "screen": "crt" },
+		{ "type": "float",   "name": "shadow_alpha",           "text": "Shadow Mask Amount",         "default": 40,             "max": 100,               "min": 0,           "step": 1, "scale": 0.01,    "format": "%1.2f", "screen": "crt" },
-		{ "type": "vec2",    "name": "shadow_uv_size",         "text": "Shadow Mask UV Size ",       "default": [ 250, 333 ],      "max": [ 1000, 1000 ],    "min": [ 0, 0 ],    "step": 1, "scale": 0.001,      "format": "%1.4f", "screen": "crt" },
+		{ "type": "vec2",    "name": "shadow_uv_count",        "text": "Shadow Mask Pixel Count ",   "default": [  12,  12 ],   "max": [ 128, 128 ],      "min": [ 1, 1 ],    "step": 1, "scale": 1.0,     "format": "%3f",   "screen": "crt" },
-		{ "type": "vec2",    "name": "shadow_uv_offset",       "text": "Shadow Mask UV Offset ",     "default": [   0,   0 ],      "max": [ 1000, 1000 ],    "min": [ 0, 0 ],    "step": 1, "scale": 0.001,      "format": "%1.4f", "screen": "crt" },
+		{ "type": "vec2",    "name": "shadow_uv_size",         "text": "Shadow Mask UV Size ",       "default": [ 500, 500 ],   "max": [ 1000, 1000 ],    "min": [ 0, 0 ],    "step": 1, "scale": 0.001,   "format": "%1.4f", "screen": "crt" },
-		{ "type": "intenum", "name": "shadow_tile_mode",       "text": "Shadow Mask Tile Mode",      "default": 0,                 "max": 1,                 "min": 0,           "step": 1, "scale": 1.0,        "format": "%s",    "screen": "crt", "strings": [ "Screen", "Source" ] },
+		{ "type": "vec2",    "name": "shadow_uv_offset",       "text": "Shadow Mask UV Offset ",     "default": [   0,   0 ],   "max": [ 1000, 1000 ],    "min": [ 0, 0 ],    "step": 1, "scale": 0.001,   "format": "%1.4f", "screen": "crt" },
-		{ "type": "float",   "name": "humbar_alpha",           "text": "Hum Bar Amount",             "default": 5,                 "max": 100,               "min": 0,           "step": 1, "scale": 0.01,       "format": "%1.2f", "screen": "crt" },
+		{ "type": "float",   "name": "humbar_alpha",           "text": "Hum Bar Amount",             "default": 5,              "max": 100,               "min": 0,           "step": 1, "scale": 0.01,    "format": "%1.2f", "screen": "crt" },
-		{ "type": "float",   "name": "humbar_hertz_rate",      "text": "Hum Bar Frequency",          "default": 100,               "max": 10000,             "min": 0,           "step": 1, "scale": 0.00001,    "format": "%1.7f", "screen": "crt" },
+		{ "type": "float",   "name": "humbar_hertz_rate",      "text": "Hum Bar Frequency",          "default": 100,            "max": 10000,             "min": 0,           "step": 1, "scale": 0.00001, "format": "%1.7f", "screen": "crt" },
-		{ "type": "color",   "name": "floor",                  "text": "Signal Floor, ",             "default": [   5,   5,   5 ], "max": [ 100, 100, 100 ], "min": [ 0, 0, 0 ], "step": 1, "scale": 0.01,       "format": "%1.2f", "screen": "crt" },
+		{ "type": "color",   "name": "floor",                  "text": "Signal Floor, ",             "default": [  5,  5,  5 ], "max": [ 100, 100, 100 ], "min": [ 0, 0, 0 ], "step": 1, "scale": 0.01,    "format": "%1.2f", "screen": "crt" },
-		{ "type": "color",   "name": "power",                  "text": "Signal Exponent, ",          "default": [ 100, 100, 100 ], "max": [ 400, 400, 400 ], "min": [ 0, 0, 0 ], "step": 1, "scale": 0.01,       "format": "%1.2f", "screen": "crt" },
+		{ "type": "color",   "name": "power",                  "text": "Signal Exponent, ",          "default": [ 80, 80, 80 ], "max": [ 400, 400, 400 ], "min": [ 0, 0, 0 ], "step": 1, "scale": 0.01,    "format": "%1.2f", "screen": "crt" },
 		
-		{ "type": "float", "name": "curvature",     "text": "Screen Curvature Amount", "default": 25, "max": 200, "min": 0, "step": 1, "scale": 0.01, "format": "%1.2f", "screen": "crt" },
+		{ "type": "float", "name": "curvature",     "text": "Screen Curvature Amount", "default": 20, "max": 200, "min": 0, "step": 1, "scale": 0.01, "format": "%1.2f", "screen": "crt" },
 		{ "type": "float", "name": "round_corner",  "text": "Rounded Corner Amount",   "default": 15, "max": 200, "min": 0, "step": 1, "scale": 0.01, "format": "%1.2f", "screen": "crt" },
 		{ "type": "float", "name": "smooth_border", "text": "Smooth Border Amount",    "default": 5,  "max": 200, "min": 0, "step": 1, "scale": 0.01, "format": "%1.2f", "screen": "crt" },
 		{ "type": "float", "name": "vignetting",    "text": "Vignetting Amount",       "default": 20, "max": 200, "min": 0, "step": 1, "scale": 0.01, "format": "%1.2f", "screen": "crt" },
-		{ "type": "float", "name": "reflection",    "text": "Reflection Amount",       "default": 25, "max": 200, "min": 0, "step": 1, "scale": 0.01, "format": "%1.2f", "screen": "crt" }
+		{ "type": "float", "name": "reflection",    "text": "Reflection Amount",       "default": 15, "max": 200, "min": 0, "step": 1, "scale": 0.01, "format": "%1.2f", "screen": "crt" }
 	],
 	
 	// parameters (optional): A list of procedurally-generated parameters that can be bound to entry uniforms.
@@ -154,6 +155,11 @@
 		// oversample (optional): Double the internal size of this render target. Certain effects benefit from operating at a higher internal resolution. If you're not sure, leave it as false.
 		// values: true, false
 		// default: false
+		{
+			"name": "ntsc",
+			"mode": "guest",
+			"doublebuffer": true
+		},
 		{
 			"name": "guest",
 			"mode": "guest",
@@ -172,7 +178,7 @@
 		{
 			// effect (required): The name of the effect JSON file to load for this pass.
 			// value: Any valid JSON filename included in your shader chain, without the extension.
-			"effect": "ntsc_encode",
+			"effect": "hlsl/ntsc_encode",
 
 			// name (required): A verbal name for the effect. It is only used internally, but is required nonetheless.
 			// value: Any valid ASCII string.
@@ -252,9 +258,9 @@
 			// output (required): The target to use as the output for this pass. Can be one of the named targets in "targets", or "output" 
 			//                    or "previous" for one of two automatically-generated targets.
 			// value: Any valid ASCII string that names a target.
-			"output": "guest"
+			"output": "ntsc"
 		},
-		{	"effect": "ntsc_decode",
+		{	"effect": "hlsl/ntsc_decode",
 			"name": "NTSC Decode",
 			"disablewhen": [
 				{ "type": "slider", "condition": "equal", "combine": "or", "name": "adjustments", "value": 0 },
@@ -264,6 +270,7 @@
 				{ "uniform": "u_a_value",         "slider": "a_value" },
 				{ "uniform": "u_b_value",         "slider": "b_value" },
 				{ "uniform": "u_cc_value",        "slider": "cc_value" },
+				{ "uniform": "u_o_value",         "slider": "o_value" },
 				{ "uniform": "u_scan_time",       "slider": "scan_time" },
 				{ "uniform": "u_notch_width",     "slider": "notch_width" },
 				{ "uniform": "u_y_freq_response", "slider": "y_freq_response" },
@@ -274,22 +281,23 @@
 				{ "uniform": "u_jitter_amount",   "parameter": "jitter" }
 			],
 			"input": [
-				{ "sampler": "s_tex", "target": "guest" }
+				{ "sampler": "s_tex", "target": "ntsc" },
+				{ "sampler": "s_screen", "texture": "screen" }
 			],
 			"output": "guest"
 		},
-		{	"effect": "blit",
+		{	"effect": "hlsl/blit",
 			"name": "NTSC Skip",
 			"disablewhen": [
 				{ "type": "slider", "condition": "notequal", "combine": "and", "name": "adjustments", "value": 0 },
 				{ "type": "slider", "condition": "notequal", "combine": "and", "name": "ntsc",        "value": 0 }
 			],
 			"input": [
-				{ "sampler": "s_tex", "target": "screen" }
+				{ "sampler": "s_tex", "texture": "screen" }
 			],
 			"output": "guest"
 		},
-		{	"effect": "color",
+		{	"effect": "hlsl/color",
 			"name": "Color Convolution",
 			"disablewhen": [
 				{ "type": "slider", "condition": "equal", "name": "adjustments", "value": 0 }
@@ -307,14 +315,14 @@
 			],
 			"output": "guest"
 		},
- 		{	"effect": "prescale",
+ 		{	"effect": "hlsl/prescale",
 			"name": "Prescale",
 			"input": [
 				{ "sampler": "s_tex", "target": "guest" }
 			],
 			"output": "internal"
 		},
-		{	"effect": "deconverge",
+		{	"effect": "hlsl/deconverge",
 			"name": "Deconvergence",
 			"disablewhen": [
 				{ "type": "slider", "condition": "equal", "combine": "or",  "name": "adjustments",           "value": 0 },
@@ -338,7 +346,7 @@
 			],
 			"output": "internal"
 		},
-		{	"effect": "defocus",
+		{	"effect": "hlsl/defocus",
 			"name": "Defocus Pass 1",
 			"disablewhen": [
 				{ "type": "slider", "condition": "equal", "combine": "or", "name": "adjustments", "value": 0 },
@@ -352,7 +360,7 @@
 			],
 			"output": "internal"
 		},
-		{	"effect": "defocus",
+		{	"effect": "hlsl/defocus",
 			"name": "Defocus Pass 2",
 			"disablewhen": [
 				{ "type": "slider", "condition": "equal", "combine": "or", "name": "adjustments", "value": 0 },
@@ -366,7 +374,7 @@
 			],
 			"output": "internal"
 		},
-		{	"effect": "phosphor",
+		{	"effect": "hlsl/phosphor",
 			"name": "Phosphor Decay",
 			"disablewhen": [
 				{ "type": "slider", "condition": "equal", "combine": "or", "name": "adjustments", "value": 0 },
@@ -382,7 +390,7 @@
 			],
 			"output": "internal"
 		},
-		{	"effect": "phosphor",
+		{	"effect": "hlsl/phosphor",
 			"name": "Phosphor Store",
 			"disablewhen": [
 				{ "type": "slider", "condition": "equal", "combine": "or", "name": "adjustments", "value": 0 },
@@ -398,7 +406,7 @@
 			],
 			"output": "previous"
 		},
-		{	"effect": "post",
+		{	"effect": "hlsl/post",
 			"name": "Non-Bloom Post Pass",
 			"disablewhen": [
 				{ "type": "slider", "condition": "equal", "combine": "or",  "name": "adjustments",    "value": 0 },
@@ -416,9 +424,9 @@
 				{ "uniform": "u_scanline_height",        "slider": "scanline_height" },
 				{ "uniform": "u_scanline_variation",     "slider": "scanline_variation" },
 				{ "uniform": "u_shadow_alpha",           "slider": "shadow_alpha" },
+				{ "uniform": "u_shadow_count",           "slider": "shadow_uv_count" },
 				{ "uniform": "u_shadow_uv",              "slider": "shadow_uv_size" },
 				{ "uniform": "u_shadow_uv_offset",       "slider": "shadow_uv_offset" },
-				{ "uniform": "u_shadow_tile_mode",       "slider": "shadow_tile_mode" },
 				{ "uniform": "u_humbar_alpha",           "slider": "humbar_alpha" },
 				{ "uniform": "u_humbar_hertz_rate",      "slider": "humbar_hertz_rate" },
 				{ "uniform": "u_floor",                  "slider": "floor" },
@@ -428,12 +436,12 @@
 				{ "uniform": "u_time",                   "parameter": "time" }
 			],
 			"input": [
-				{ "sampler": "s_tex", "target": "internal" },
+				{ "sampler": "s_tex",    "target": "internal" },
-				{ "sampler": "s_shadow",  "option": "bgfx_shadow_mask" }
+				{ "sampler": "s_shadow", "option": "bgfx_shadow_mask" }
 			],
 			"output": "internal"
 		},
-		{	"effect": "distortion",
+		{	"effect": "hlsl/distortion",
 			"name": "Distortion Pass",
 			"disablewhen": [
 				{ "type": "slider", "condition": "equal", "combine": "or", "name": "adjustments",    "value": 0 },
@@ -455,7 +463,7 @@
 			],
 			"output": "internal"
 		},
-		{	"effect": "blit",
+		{	"effect": "hlsl/blit",
 			"name": "Final Blit",
 			"input": [
 				{ "sampler": "s_tex", "target": "internal" }

bgfx/chains/unfiltered.json

@@ -7,14 +7,14 @@
 		}
 	],
 	"passes": [
-		{	"effect": "blit",
+		{	"effect": "unfiltered/blit",
 			"name": "Copy To Unstretched Texture",
 			"input": [
 				{ "sampler": "s_tex", "texture": "screen" }
 			],
 			"output": "temp"
 		},
-		{	"effect": "blit",
+		{	"effect": "unfiltered/blit",
 			"name": "Final Upscale",
 			"input": [
 				{ "sampler": "s_tex", "target": "temp" }

bgfx/effects/default/LICENSE

@@ -0,0 +1,27 @@
+Copyright (c) 2016, Ryan Holtz and MAME Development Team
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+* Neither the name of bsd3 nor the names of its
+  contributors may be used to endorse or promote products derived from
+  this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

bgfx/effects/default/README.md

@@ -0,0 +1,5 @@
+# **BGFX shader effects** #
+
+Cointains definitions for BGFX shader effects
+
+Licensed under [The BSD 3-Clause License](http://opensource.org/licenses/BSD-3-Clause) by Ryan Holtz and MAME Development Team

bgfx/effects/default/blit.json

@@ -16,15 +16,15 @@
     	"equation": "add",
     	
     	// blend function parameters (optional): What factors to use in the blend function when calculating the final pixel.
-    	// values: "0", "1", "srcColor", "1-srcColor", "dstColor", "1-dstColor", "srcAlpha", "1-srcAlpha", "dstAlpha", "1-dstAlpha"
+    	// values: "0", "1", "srccolor", "1-srccolor", "dstcolor", "1-dstcolor", "srcalpha", "1-srcalpha", "dstalpha", "1-dstalpha"
     	// defaults (srcColor, srcAlpha): "1"
     	// defaults (dstColor, dstAlpha): "0"
     	// 
-    	// "zero", "one", "invSrcColor", "invDstColor", "invSrcAlpha", and "invDstAlpha" are provided as aliases for "0", "1", "1-srcColor", "1-dstColor", "1-srcAlpha", and "1-dstAlpha"
+    	// "zero", "one", "invsrccolor", "invdstcolor", "invsrcalpha", and "invdstalpha" are provided as aliases for "0", "1", "1-srccolor", "1-dstcolor", "1-srcalpha", and "1-dstalpha"
-    	"srcColor": "1",
+    	"srcColor": "srcalpha",
-    	"dstColor": "0",
+    	"dstColor": "1-srcalpha",
-    	"srcAlpha": "1",
+    	"srcAlpha": "srcalpha",
-    	"dstAlpha": "0"
+    	"dstAlpha": "1-srcalpha"
     },
     
     // depth (required): The depth state for this effect.

bgfx/effects/hlsl/LICENSE

@@ -0,0 +1,27 @@
+Copyright (c) 2016, Ryan Holtz and MAME Development Team
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+* Neither the name of bsd3 nor the names of its
+  contributors may be used to endorse or promote products derived from
+  this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

bgfx/effects/hlsl/README.md

@@ -0,0 +1,5 @@
+# **BGFX shader effects** #
+
+Cointains definitions for BGFX shader effects
+
+Licensed under [The BSD 3-Clause License](http://opensource.org/licenses/BSD-3-Clause) by Ryan Holtz and MAME Development Team

bgfx/effects/hlsl/blit.json

@@ -0,0 +1,121 @@
+// license:BSD-3-Clause
+// copyright-holders:Ryan Holtz
+//============================================================
+//
+//  blit.json: A simple texture-to-target copy.
+//
+//============================================================
+{
+	// blend (required): The blend state for this effect.
+    "blend": {
+    	// equation (optional): What equation to perform on the source and destination blend values.
+    	// values: "add", "sub", "revSub", "min", "max"
+    	// default: "add"
+    	// 
+    	// "subtract" and "revSubtract" are provided as aliases for "sub" and "revSub"
+    	"equation": "add",
+    	
+    	// blend function parameters (optional): What factors to use in the blend function when calculating the final pixel.
+    	// values: "0", "1", "srccolor", "1-srccolor", "dstcolor", "1-dstcolor", "srcalpha", "1-srcalpha", "dstalpha", "1-dstalpha"
+    	// defaults (srcColor, srcAlpha): "1"
+    	// defaults (dstColor, dstAlpha): "0"
+    	// 
+    	// "zero", "one", "invsrccolor", "invdstcolor", "invsrcalpha", and "invdstalpha" are provided as aliases for "0", "1", "1-srccolor", "1-dstcolor", "1-srcalpha", and "1-dstalpha"
+    	"srcColor": "srcalpha",
+    	"dstColor": "1-srcalpha",
+    	"srcAlpha": "srcalpha",
+    	"dstAlpha": "1-srcalpha"
+    },
+    
+    // depth (required): The depth state for this effect.
+    "depth": {
+    	// function (optional): The depth function to use when drawing.
+    	// values: "never", "less", "equal", "lequal", "greater", "notequal", "gequal", "always"
+    	// default: "always"
+    	"function": "always",
+    	
+    	// writeenable (optional): Whether to store Z-buffer data.
+    	// values: true, false
+    	// default: false
+    	"writeenable": false
+    },
+    
+    // cull (required): The cull mode for this effect.
+    "cull": {
+    	// mode (optional): What winding, if any, to cull.
+    	// values: "none", "cw", "ccw"
+    	// default: "ccw"
+    	// 
+    	// "clockwise" and "counterclockwise" are provided as aliases for "cw" and "ccw"
+    	"mode": "none"
+    },
+    
+    // write (required): Write enable for color and alpha channels.
+    "write": {
+    	// rgb (optional): Whether to store color data when drawing.
+    	// values: true, false
+    	// default: false
+    	"rgb": true,
+
+    	// alpha (optional): Whether to store alpha data when drawing.
+    	// values: true, false
+    	// default: false
+    	"alpha": true
+    },
+
+	// vertex (required): The vertex shader to use when drawing.
+	// value: A string containing the name of a shader file to use, minus the extension.
+    "vertex": "vs_blit",
+
+	// pixel/fragment (required): The pixel or fragment shader to use when drawing.
+	// value: A string containing the name of a shader file to use, minus the extension.
+    "fragment": "fs_blit",
+    
+    // uniforms (required): The list of uniforms for this effect. Can be empty, but must exist.
+    "uniforms": [    	
+    	{
+    		// name (required): The name of the uniform, as used in either the vertex or pixel/fragment shader.
+    		// value: A string containing the name of the uniform as described above.
+    		// 
+    		// NOTE: Some names correspond to special values that will be automatically filled by the BGFX
+    		//       code if they are used by the shader. These names are:
+    		//           "u_screen_dims"
+    		//				The dimensions of the first texture input if present, otherwise the dimensions of the output window.
+    		//				Valid values: xy
+    		//           "u_inv_screen_dims"
+    		//				The reciprocal of u_screen_dims.
+    		//				Valid values: xy
+    		//           "u_source_dims"
+    		//				The size, in pixels, of the screen texture incoming to the chain.
+    		//				Valid values: xy
+    		//           "u_rotation_type"
+    		//				This screen's rotation type. 0 if ROT0, 1 if ROT90, 2 if ROT180, 3 of ROT270.
+    		//              Valid values: x
+    		//           "u_swap_xy"
+    		//				Whether this screen is swapped on the X and Y axes. 1 if true, 0 if false.
+    		//				Valid values: x
+    		//			 "u_quad_dims"
+    		//				The dimensions, in pixels, occupied by this one screen primitive itself in the output window.
+    		//				Valid values: xy
+    		//			 "u_tex_sizeN"
+    		//				The dimensions, in pixels, of the texture in input pair N. Starts at 0.
+    		//				valid values: xy
+    		"name": "s_tex",
+
+    		// type (required): The type of the uniform.
+    		// values: "int", "vec4", "mat3", "mat4"
+    		//
+    		// Note: "int" should only be used for samplers.
+    		"type": "int",
+    		
+    		// values (required): The array of numbers with which to initialize the uniform.
+    		// value: A JSON array containin the correct amount of numbers to initialize a uniform of the
+    		//        above-specified type. The following size rules should be followed:
+    		//            "int": 1 float
+    		//            "vec4": 4 floats
+    		//            "mat3": 9 floats
+    		//            "mat4": 16 floats
+    		"values": [ 1.0 ]
+    	}
+    ]
+}

bgfx/effects/hlsl/color.json

@@ -8,10 +8,10 @@
 {
     "blend": {
     	"equation": "add",
-    	"srcColor": "1",
+    	"srcColor": "srcalpha",
-    	"dstColor": "0",
+    	"dstColor": "1-srcalpha",
-    	"srcAlpha": "1",
+    	"srcAlpha": "srcalpha",
-    	"dstAlpha": "0"
+    	"dstAlpha": "1-srcalpha"
     },
     "depth": {
     	"function": "always"

bgfx/effects/hlsl/deconverge.json

@@ -9,10 +9,10 @@
 {
     "blend": {
     	"equation": "add",
-    	"srcColor": "1",
+    	"srcColor": "srcalpha",
-    	"dstColor": "0",
+    	"dstColor": "1-srcalpha",
-    	"srcAlpha": "1",
+    	"srcAlpha": "srcalpha",
-    	"dstAlpha": "0"
+    	"dstAlpha": "1-srcalpha"
     },
     "depth": {
     	"function": "always"

bgfx/effects/hlsl/defocus.json

@@ -8,10 +8,10 @@
 {
     "blend": {
     	"equation": "add",
-    	"srcColor": "1",
+    	"srcColor": "srcalpha",
-    	"dstColor": "0",
+    	"dstColor": "1-srcalpha",
-    	"srcAlpha": "1",
+    	"srcAlpha": "srcalpha",
-    	"dstAlpha": "0"
+    	"dstAlpha": "1-srcalpha"
     },
     "depth": {
     	"function": "always"

bgfx/effects/hlsl/distortion.json

@@ -9,10 +9,10 @@
 {
     "blend": {
     	"equation": "add",
-    	"srcColor": "1",
+    	"srcColor": "srcalpha",
-    	"dstColor": "0",
+    	"dstColor": "1-srcalpha",
-    	"srcAlpha": "1",
+    	"srcAlpha": "srcalpha",
-    	"dstAlpha": "0"
+    	"dstAlpha": "1-srcalpha"
     },
     "depth": {
     	"function": "always"

bgfx/effects/hlsl/ntsc_decode.json

@@ -26,6 +26,7 @@
     "fragment": "fs_ntsc_decode",
     "uniforms": [
     	{ "name": "s_tex",             "type": "int",  "values": [ 1.0 ] },
+    	{ "name": "s_screen",        "type": "int",  "values": [ 1.0 ] },
     	{ "name": "u_source_dims",     "type": "vec4", "values": [ 1.0,  1.0, 0.0, 0.0 ] },
     	{ "name": "u_a_value",         "type": "vec4", "values": [ 0.5,  0.5, 0.5, 0.5 ] },
     	{ "name": "u_b_value",         "type": "vec4", "values": [ 0.5,  0.5, 0.5, 0.5 ] },

bgfx/effects/hlsl/ntsc_encode.json

@@ -9,10 +9,10 @@
 {
     "blend": {
     	"equation": "add",
-    	"srcColor": "1",
+    	"srcColor": "srcalpha",
-    	"dstColor": "0",
+    	"dstColor": "1-srcalpha",
-    	"srcAlpha": "1",
+    	"srcAlpha": "srcalpha",
-    	"dstAlpha": "0"
+    	"dstAlpha": "1-srcalpha"
     },
     "depth": {
     	"function": "always"

bgfx/effects/hlsl/phosphor.json

@@ -9,10 +9,10 @@
 {
     "blend": {
     	"equation": "add",
-    	"srcColor": "1",
+    	"srcColor": "srcalpha",
-    	"dstColor": "0",
+    	"dstColor": "1-srcalpha",
-    	"srcAlpha": "1",
+    	"srcAlpha": "srcalpha",
-    	"dstAlpha": "0"
+    	"dstAlpha": "1-srcalpha"
     },
     "depth": {
     	"function": "always"

bgfx/effects/hlsl/post.json

@@ -9,10 +9,10 @@
 {
     "blend": {
     	"equation": "add",
-    	"srcColor": "1",
+    	"srcColor": "srcalpha",
-    	"dstColor": "0",
+    	"dstColor": "1-srcalpha",
-    	"srcAlpha": "1",
+    	"srcAlpha": "srcalpha",
-    	"dstAlpha": "0"
+    	"dstAlpha": "1-srcalpha"
     },
     "depth": {
     	"function": "always"
@@ -28,11 +28,8 @@
     	{ "name": "s_tex",                    "type": "int",  "values": [ 0.0 ] },
     	{ "name": "s_shadow",                 "type": "int",  "values": [ 1.0 ] },
     	{ "name": "u_swap_xy",                "type": "vec4", "values": [ 0.0, 0.0, 0.0, 0.0 ] },
-    	{ "name": "u_screen_dims",            "type": "vec4", "values": [ 1336.0, 1002.0, 0.0, 0.0 ] },
     	{ "name": "u_source_dims",            "type": "vec4", "values": [ 256.0, 256.0, 0.0, 0.0 ] },
-    	{ "name": "u_shadow_uv_offset",       "type": "vec4", "values": [ 0.0, 0.0, 0.0, 0.0 ] },
+    	{ "name": "u_quad_dims",              "type": "vec4", "values": [ 256.0, 256.0, 0.0, 0.0 ] },
-    	{ "name": "u_prepare_bloom",          "type": "vec4", "values": [ 0.0, 0.0, 0.0, 0.0 ] },
-    	{ "name": "u_prepare_vector",         "type": "vec4", "values": [ 0.0, 0.0, 0.0, 0.0 ] },
     	{ "name": "u_humbar_hertz_rate",      "type": "vec4", "values": [ 0.001, 0.0, 0.0, 0.0 ] },
     	{ "name": "u_humbar_alpha",           "type": "vec4", "values": [ 0.0, 0.0, 0.0, 0.0 ] },
     	{ "name": "u_time",                   "type": "vec4", "values": [ 0.0, 0.0, 0.0, 0.0 ] },
@@ -46,10 +43,10 @@
     	{ "name": "u_scanline_height",        "type": "vec4", "values": [ 1.0, 0.0, 0.0, 0.0 ] },
     	{ "name": "u_scanline_variation",     "type": "vec4", "values": [ 1.0, 0.0, 0.0, 0.0 ] },
     	{ "name": "u_jitter_amount",          "type": "vec4", "values": [ 0.0, 0.0, 0.0, 0.0 ] },
-    	{ "name": "u_back_color",             "type": "vec4", "values": [ 0.0, 0.0, 0.0, 0.0 ] },
-    	{ "name": "u_shadow_tile_mode",       "type": "vec4", "values": [ 0.0, 0.0, 0.0, 0.0 ] },
     	{ "name": "u_shadow_alpha",           "type": "vec4", "values": [ 0.0, 0.0, 0.0, 0.0 ] },
-    	{ "name": "u_shadow_uv",              "type": "vec4", "values": [ 0.25, 0.333, 0.0, 0.0 ] },
+    	{ "name": "u_shadow_count",           "type": "vec4", "values": [ 12.0, 12.0, 0.0, 0.0 ] },
+    	{ "name": "u_shadow_uv",              "type": "vec4", "values": [ 0.25, 0.25, 0.0, 0.0 ] },
+    	{ "name": "u_shadow_uv_offset",       "type": "vec4", "values": [ 0.0, 0.0, 0.0, 0.0 ] },
     	{ "name": "u_power",                  "type": "vec4", "values": [ 1.0, 1.0, 1.0, 0.0 ] },
     	{ "name": "u_floor",                  "type": "vec4", "values": [ 0.0, 0.0, 0.0, 0.0 ] }
     ]

bgfx/effects/hlsl/prescale.json

@@ -9,10 +9,10 @@
 {
     "blend": {
     	"equation": "add",
-    	"srcColor": "1",
+    	"srcColor": "srcalpha",
-    	"dstColor": "0",
+    	"dstColor": "1-srcalpha",
-    	"srcAlpha": "1",
+    	"srcAlpha": "srcalpha",
-    	"dstAlpha": "0"
+    	"dstAlpha": "1-srcalpha"
     },
     "depth": {
     	"function": "always"

bgfx/effects/unfiltered/LICENSE

@@ -0,0 +1,27 @@
+Copyright (c) 2016, Ryan Holtz and MAME Development Team
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+* Neither the name of bsd3 nor the names of its
+  contributors may be used to endorse or promote products derived from
+  this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

bgfx/effects/unfiltered/README.md

@@ -0,0 +1,5 @@
+# **BGFX shader effects** #
+
+Cointains definitions for BGFX shader effects
+
+Licensed under [The BSD 3-Clause License](http://opensource.org/licenses/BSD-3-Clause) by Ryan Holtz and MAME Development Team

bgfx/effects/unfiltered/blit.json

@@ -0,0 +1,121 @@
+// license:BSD-3-Clause
+// copyright-holders:Ryan Holtz
+//============================================================
+//
+//  blit.json: A simple texture-to-target copy.
+//
+//============================================================
+{
+	// blend (required): The blend state for this effect.
+    "blend": {
+    	// equation (optional): What equation to perform on the source and destination blend values.
+    	// values: "add", "sub", "revSub", "min", "max"
+    	// default: "add"
+    	// 
+    	// "subtract" and "revSubtract" are provided as aliases for "sub" and "revSub"
+    	"equation": "add",
+    	
+    	// blend function parameters (optional): What factors to use in the blend function when calculating the final pixel.
+    	// values: "0", "1", "srccolor", "1-srccolor", "dstcolor", "1-dstcolor", "srcalpha", "1-srcalpha", "dstalpha", "1-dstalpha"
+    	// defaults (srcColor, srcAlpha): "1"
+    	// defaults (dstColor, dstAlpha): "0"
+    	// 
+    	// "zero", "one", "invsrccolor", "invdstcolor", "invsrcalpha", and "invdstalpha" are provided as aliases for "0", "1", "1-srccolor", "1-dstcolor", "1-srcalpha", and "1-dstalpha"
+    	"srcColor": "srcalpha",
+    	"dstColor": "1-srcalpha",
+    	"srcAlpha": "srcalpha",
+    	"dstAlpha": "1-srcalpha"
+    },
+    
+    // depth (required): The depth state for this effect.
+    "depth": {
+    	// function (optional): The depth function to use when drawing.
+    	// values: "never", "less", "equal", "lequal", "greater", "notequal", "gequal", "always"
+    	// default: "always"
+    	"function": "always",
+    	
+    	// writeenable (optional): Whether to store Z-buffer data.
+    	// values: true, false
+    	// default: false
+    	"writeenable": false
+    },
+    
+    // cull (required): The cull mode for this effect.
+    "cull": {
+    	// mode (optional): What winding, if any, to cull.
+    	// values: "none", "cw", "ccw"
+    	// default: "ccw"
+    	// 
+    	// "clockwise" and "counterclockwise" are provided as aliases for "cw" and "ccw"
+    	"mode": "none"
+    },
+    
+    // write (required): Write enable for color and alpha channels.
+    "write": {
+    	// rgb (optional): Whether to store color data when drawing.
+    	// values: true, false
+    	// default: false
+    	"rgb": true,
+
+    	// alpha (optional): Whether to store alpha data when drawing.
+    	// values: true, false
+    	// default: false
+    	"alpha": true
+    },
+
+	// vertex (required): The vertex shader to use when drawing.
+	// value: A string containing the name of a shader file to use, minus the extension.
+    "vertex": "vs_blit",
+
+	// pixel/fragment (required): The pixel or fragment shader to use when drawing.
+	// value: A string containing the name of a shader file to use, minus the extension.
+    "fragment": "fs_blit",
+    
+    // uniforms (required): The list of uniforms for this effect. Can be empty, but must exist.
+    "uniforms": [    	
+    	{
+    		// name (required): The name of the uniform, as used in either the vertex or pixel/fragment shader.
+    		// value: A string containing the name of the uniform as described above.
+    		// 
+    		// NOTE: Some names correspond to special values that will be automatically filled by the BGFX
+    		//       code if they are used by the shader. These names are:
+    		//           "u_screen_dims"
+    		//				The dimensions of the first texture input if present, otherwise the dimensions of the output window.
+    		//				Valid values: xy
+    		//           "u_inv_screen_dims"
+    		//				The reciprocal of u_screen_dims.
+    		//				Valid values: xy
+    		//           "u_source_dims"
+    		//				The size, in pixels, of the screen texture incoming to the chain.
+    		//				Valid values: xy
+    		//           "u_rotation_type"
+    		//				This screen's rotation type. 0 if ROT0, 1 if ROT90, 2 if ROT180, 3 of ROT270.
+    		//              Valid values: x
+    		//           "u_swap_xy"
+    		//				Whether this screen is swapped on the X and Y axes. 1 if true, 0 if false.
+    		//				Valid values: x
+    		//			 "u_quad_dims"
+    		//				The dimensions, in pixels, occupied by this one screen primitive itself in the output window.
+    		//				Valid values: xy
+    		//			 "u_tex_sizeN"
+    		//				The dimensions, in pixels, of the texture in input pair N. Starts at 0.
+    		//				valid values: xy
+    		"name": "s_tex",
+
+    		// type (required): The type of the uniform.
+    		// values: "int", "vec4", "mat3", "mat4"
+    		//
+    		// Note: "int" should only be used for samplers.
+    		"type": "int",
+    		
+    		// values (required): The array of numbers with which to initialize the uniform.
+    		// value: A JSON array containin the correct amount of numbers to initialize a uniform of the
+    		//        above-specified type. The following size rules should be followed:
+    		//            "int": 1 float
+    		//            "vec4": 4 floats
+    		//            "mat3": 9 floats
+    		//            "mat4": 16 floats
+    		"values": [ 1.0 ]
+    	}
+    ]
+}

docs/hlsl.txt

@@ -111,9 +111,20 @@ bloom_lvl1_weight       0.64            Bloom level 1  (1/2-size target) weight.
 bloom_lvl2_weight       0.32            Bloom level 2  (1/4-size target) weight.  (0.00-1.00)
 bloom_lvl3_weight       0.16            Bloom level 3  (1/8-size target) weight.  (0.00-1.00)
 bloom_lvl4_weight       0.08            Bloom level 4  (1/16-size target) weight.  (0.00-1.00)
-bloom_lvl5_weight       0.04            Bloom level 5  (1/32-size target) weight.  (0.00-1.00)
+bloom_lvl5_weight       0.06            Bloom level 5  (1/32-size target) weight.  (0.00-1.00)
 bloom_lvl6_weight       0.04            Bloom level 6  (1/64-size target) weight.  (0.00-1.00)
 bloom_lvl7_weight       0.02            Bloom level 7  (1/128-size target) weight.  (0.00-1.00)
-bloom_lvl8_weight       0.02            Bloom level 8  (1/256-size target) weight.  (0.00-1.00)
+bloom_lvl8_weight       0.01            Bloom level 8  (1/256-size target) weight.  (0.00-1.00)
-bloom_lvl9_weight       0.01            Bloom level 9  (1/512-size target) weight.  (0.00-1.00)
+
-bloom_lvl10_weight      0.01            Bloom level 10 (1/1024-size target) weight.  (0.00-1.00)
+
+Presets
+-------
+../ini/presets/raster.ini               for raster screens
+../ini/presets/vector.ini               for color vector screens
+../ini/presets/vector-mono.ini          for monochrome vector screens (rename to vector.ini or <system>.ini)
+../ini/presets/lcd.ini                  for screens with TFT color LCD
+../ini/presets/lcd-matrix.ini           for screens with STN LCD matrix (rename to lcd.ini or <system>.ini)
+../ini/presets/gameboy.ini              for Game Boy screen (same as lcd-matrix.ini with greenish color transformation)
+../ini/presets/gba.ini                  for Game Boy Advance screen (same as lcd.ini)
+
+Copy them to ../ini/ to use.

hash/pockchalv1.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<!DOCTYPE softwarelist SYSTEM "softwarelist.dtd">
+
+<!-- this is NOT Wonderswan based hardware (should be connected to a new driver instead) -->
+
+<softwarelist name="pockchalv1" description="Pocket Challenge V1 cartridges">
+
+	<!-- *K : Chuugaku Koumin -->
+
+	<software name="chuukoum" supported="no" >
+		<description>Chuugaku Koumin (1K - 0BE311)</description>
+		<year>2000?</year>
+		<publisher>Benesse Corporation</publisher>
+		<part name="cart" interface="wswan_cart">
+			<feature name="slot" value="ws_sram" />
+			<dataarea name="rom" size="0x100000">
+				<rom name="0BE311.bin" size="0x100000" crc="bf9da3ea" sha1="423266d16f6fecc367223c45658e3802176f1f7a" offset="000000" />
+			</dataarea>
+			<dataarea name="sram" size="0x2000">
+			</dataarea>			
+		</part>
+	</software>
+
+</softwarelist>
+

hash/pockchalv2.xml

@@ -0,0 +1,166 @@
+<?xml version="1.0"?>
+<!DOCTYPE softwarelist SYSTEM "softwarelist.dtd">
+
+<!-- the Pocket Challenge V2 appears to be compatible with the Wonderswan from a software point of view -->
+
+<softwarelist name="pockchalv2" description="Pocket Challenge V2 cartridges">
+
+	<!-- *EC : Chuu1 English New Crown Total English Taiouban -->
+
+	<software name="chuuengl" supported="no" >
+		<description>Chuu1 English New Crown Total English Taiouban (2EC - 2BB113)</description>
+		<year>2002</year>
+		<publisher>Benesse Corporation</publisher>
+		<part name="cart" interface="wswan_cart">
+			<feature name="slot" value="ws_sram" />
+			<dataarea name="rom" size="0x400000">
+				<rom name="2BB113.pc2" size="0x400000" crc="4e0b65b4" sha1="3a8ded7174ad8e0003604dca4ea158eeefac4610" offset="000000" />
+			</dataarea>
+			<dataarea name="sram" size="0x2000">
+			</dataarea>			
+		</part>
+	</software>
+	
+	<!-- *PS : Chuugaku Chiri Rekishi Pack (Chiri Soft Rekishi Soft Kanzen Taiouban)-->
+	
+	<software name="chuuchir" supported="no" >
+		<description>Chuugaku Chiri Rekishi Pack (Chiri Soft Rekishi Soft Kanzen Taiouban) (2PS - 2BD400)</description>
+		<year>2002</year>
+		<publisher>Benesse Corporation</publisher>
+		<part name="cart" interface="wswan_cart">
+			<feature name="slot" value="ws_sram" />
+			<dataarea name="rom" size="0x400000">
+				<rom name="2BD400.pc2" size="0x400000" crc="93454b4a" sha1="3d820b91bb0fed87fc9343a8bc57c81256e4c490" offset="000000" />
+			</dataarea>
+			<dataarea name="sram" size="0x2000">
+			</dataarea>			
+		</part>
+	</software>	
+	
+	<software name="chuuchir4" cloneof="chuuchir" supported="no" >
+		<description>Chuugaku Chiri Rekishi Pack (Chiri Soft Rekishi Soft Kanzen Taiouban) (4PS - 4BD400)</description>
+		<year>2004</year>
+		<publisher>Benesse Corporation</publisher>
+		<part name="cart" interface="wswan_cart">
+			<feature name="slot" value="ws_sram" />
+			<dataarea name="rom" size="0x400000">
+				<rom name="4BD400.pc2" size="0x400000" crc="4cfd118d" sha1="8b395327209dae56461ef792cd2183d803e4687d" offset="000000" />
+			</dataarea>
+			<dataarea name="sram" size="0x2000">
+			</dataarea>			
+		</part>
+	</software>	
+
+	<software name="chuuchir6" cloneof="chuuchir" supported="no" >
+		<description>Chuugaku Chiri Rekishi Pack (Chiri Soft Rekishi Soft Kanzen Taiouban) (6PS - 6FD400)</description>
+		<year>2006</year>
+		<publisher>Benesse Corporation</publisher>
+		<part name="cart" interface="wswan_cart">
+			<feature name="slot" value="ws_sram" />
+			<dataarea name="rom" size="0x400000">
+				<rom name="6FD400.pc2" size="0x400000" crc="0ac0e39d" sha1="1c47daf71ef4277fcf3eabfa4697827c7c322867" offset="000000" />
+			</dataarea>
+			<dataarea name="sram" size="0x2000">
+			</dataarea>			
+		</part>
+	</software>		
+	
+	<!-- *PL : Chuugaku Rika Pack (1bunya Soft 2bunya Soft Kanzen Taiouban) -->	
+	
+	<software name="chuurika" supported="no" >
+		<description>Chuugaku Rika Pack (1bunya Soft 2bunya Soft Kanzen Taiouban) (2PL - 2BF400)</description>
+		<year>2002</year>
+		<publisher>Benesse Corporation</publisher>
+		<part name="cart" interface="wswan_cart">
+			<feature name="slot" value="ws_sram" />
+			<dataarea name="rom" size="0x200000">
+				<rom name="2BF400.pc2" size="0x200000" crc="75379357" sha1="791cd70cc9dc49a7ff38cc22a374c7d19eef1f70" offset="000000" />
+			</dataarea>
+			<dataarea name="sram" size="0x2000">
+			</dataarea>			
+		</part>
+	</software>		
+
+	<software name="chuurika6" cloneof="chuurika" supported="no" >
+		<description>Chuugaku Rika Pack (1bunya Soft 2bunya Soft Kanzen Taiouban) (6PL 6FF400)</description>
+		<year>2006</year>
+		<publisher>Benesse Corporation</publisher>
+		<part name="cart" interface="wswan_cart">
+			<feature name="slot" value="ws_sram" />
+			<dataarea name="rom" size="0x400000">
+				<rom name="6FF400.pc2" size="0x400000" crc="fc46a921" sha1="5b2fd488c6ab734dcf8893509589a751458ce977" offset="000000" />
+			</dataarea>
+			<dataarea name="sram" size="0x2000">
+			</dataarea>			
+		</part>
+	</software>		
+
+	<!-- *BG : Jitsugi 4kyouka (Gijutsu Katei Hoken Taiiku Ongaku Bijutsu) -->
+	
+	<software name="jitsugi" supported="no" >
+		<description>Jitsugi 4kyouka (Gijutsu Katei Hoken Taiiku Ongaku Bijutsu) (2BG - 2BG410)</description>
+		<year>2002</year>
+		<publisher>Benesse Corporation</publisher>
+		<part name="cart" interface="wswan_cart">
+			<feature name="slot" value="ws_sram" />
+			<dataarea name="rom" size="0x400000">
+				<rom name="2BG410.pc2" size="0x400000" crc="84b430e9" sha1="bb1de1f0fc80a85f3b7fb7e53ed04718855aaf0b" offset="000000" />
+			</dataarea>
+			<dataarea name="sram" size="0x2000">
+			</dataarea>			
+		</part>
+	</software>		
+		
+	<software name="jitsugi3" cloneof="jitsugi" supported="no" >
+		<description>Jitsugi 4kyouka (Gijutsu Katei Hoken Taiiku Ongaku Bijutsu) (3BG - 3BG410)</description>
+		<year>2002</year>
+		<publisher>Benesse Corporation</publisher>
+		<part name="cart" interface="wswan_cart">
+			<feature name="slot" value="ws_sram" />
+			<dataarea name="rom" size="0x400000">
+				<rom name="3BG410.pc2" size="0x400000" crc="2ff15e1a" sha1="f6c61d95fb26063c9d49ed0f36169aafbd6a3738" offset="000000" />
+			</dataarea>
+			<dataarea name="sram" size="0x2000">
+			</dataarea>			
+		</part>
+	</software>		
+		
+	<!-- *JA : Chuu1 Kokugo Hyakunin Isshu -->
+		
+	<software name="chuukoku" supported="no" >
+		<description>Chuu1 Kokugo Hyakunin Isshu (2JA - 2BK401)</description>
+		<year>2002</year>
+		<publisher>Benesse Corporation</publisher>
+		<part name="cart" interface="wswan_cart">
+			<feature name="slot" value="ws_sram" />
+			<dataarea name="rom" size="0x400000">
+				<rom name="2BK401.pc2" size="0x400000" crc="b9d67f24" sha1="15c86cf056f680b91f2a6c15329bb31b44e030c6" offset="000000" />
+			</dataarea>
+			<dataarea name="sram" size="0x2000">
+			</dataarea>			
+		</part>
+	</software>			
+
+	<!-- *2M1 : Chuu1 Kokugo Hyakunin Isshu -->
+
+	<software name="chuusuug" supported="no" >
+		<description>Chuu1 Suugaku (2M1 - 2BM110)</description>
+		<year>2002</year>
+		<publisher>Benesse Corporation</publisher>
+		<part name="cart" interface="wswan_cart">
+			<feature name="slot" value="ws_sram" />
+			<dataarea name="rom" size="0x200000">
+				<rom name="2BM110.pc2" size="0x200000" crc="723a239d" sha1="a21d7c39ef64a37e0055c17d97c2ae7da29b8240" offset="000000" />
+			</dataarea>
+			<dataarea name="sram" size="0x2000">
+			</dataarea>			
+		</part>
+	</software>			
+	
+
+
+		
+
+	
+</softwarelist>
+

hlsl/bloom.fx

@@ -8,21 +8,29 @@
 // Sampler Definitions
 //-----------------------------------------------------------------------------
 
-texture DiffuseA;
+texture DiffuseTexture;
-texture DiffuseB;
-texture DiffuseC;
-texture DiffuseD;
-texture DiffuseE;
-texture DiffuseF;
-texture DiffuseG;
-texture DiffuseH;
-texture DiffuseI;
-texture DiffuseJ;
-texture DiffuseK;
 
-sampler DiffuseSampler0 = sampler_state
+texture BloomTextureA;
+texture BloomTextureB;
+texture BloomTextureC;
+texture BloomTextureD;
+texture BloomTextureE;
+texture BloomTextureF;
+texture BloomTextureG;
+texture BloomTextureH;
+
+// vector screen uses twice -1 as many bloom levels
+texture BloomTextureI;
+texture BloomTextureJ;
+texture BloomTextureK;
+texture BloomTextureL;
+texture BloomTextureM;
+texture BloomTextureN;
+texture BloomTextureO;
+
+sampler DiffuseSampler = sampler_state
 {
-	Texture = <DiffuseA>;
+	Texture = <DiffuseTexture>;
 	MipFilter = LINEAR;
 	MinFilter = LINEAR;
 	MagFilter = LINEAR;
@@ -31,9 +39,9 @@ sampler DiffuseSampler0 = sampler_state
 	AddressW = CLAMP;
 };
 
-sampler DiffuseSampler1 = sampler_state
+sampler BloomSamplerA = sampler_state
 {
-	Texture = <DiffuseB>;
+	Texture = <BloomTextureA>;
 	MipFilter = LINEAR;
 	MinFilter = LINEAR;
 	MagFilter = LINEAR;
@@ -42,9 +50,9 @@ sampler DiffuseSampler1 = sampler_state
 	AddressW = CLAMP;
 };
 
-sampler DiffuseSampler2 = sampler_state
+sampler BloomSamplerB = sampler_state
 {
-	Texture = <DiffuseC>;
+	Texture = <BloomTextureB>;
 	MipFilter = LINEAR;
 	MinFilter = LINEAR;
 	MagFilter = LINEAR;
@@ -53,9 +61,9 @@ sampler DiffuseSampler2 = sampler_state
 	AddressW = CLAMP;
 };
 
-sampler DiffuseSampler3 = sampler_state
+sampler BloomSamplerC = sampler_state
 {
-	Texture = <DiffuseD>;
+	Texture = <BloomTextureC>;
 	MipFilter = LINEAR;
 	MinFilter = LINEAR;
 	MagFilter = LINEAR;
@@ -64,9 +72,9 @@ sampler DiffuseSampler3 = sampler_state
 	AddressW = CLAMP;
 };
 
-sampler DiffuseSampler4 = sampler_state
+sampler BloomSamplerD = sampler_state
 {
-	Texture = <DiffuseE>;
+	Texture = <BloomTextureD>;
 	MipFilter = LINEAR;
 	MinFilter = LINEAR;
 	MagFilter = LINEAR;
@@ -75,9 +83,9 @@ sampler DiffuseSampler4 = sampler_state
 	AddressW = CLAMP;
 };
 
-sampler DiffuseSampler5 = sampler_state
+sampler BloomSamplerE = sampler_state
 {
-	Texture = <DiffuseF>;
+	Texture = <BloomTextureE>;
 	MipFilter = LINEAR;
 	MinFilter = LINEAR;
 	MagFilter = LINEAR;
@@ -86,9 +94,9 @@ sampler DiffuseSampler5 = sampler_state
 	AddressW = CLAMP;
 };
 
-sampler DiffuseSampler6 = sampler_state
+sampler BloomSamplerF = sampler_state
 {
-	Texture = <DiffuseG>;
+	Texture = <BloomTextureF>;
 	MipFilter = LINEAR;
 	MinFilter = LINEAR;
 	MagFilter = LINEAR;
@@ -97,9 +105,9 @@ sampler DiffuseSampler6 = sampler_state
 	AddressW = CLAMP;
 };
 
-sampler DiffuseSampler7 = sampler_state
+sampler BloomSamplerG = sampler_state
 {
-	Texture = <DiffuseH>;
+	Texture = <BloomTextureG>;
 	MipFilter = LINEAR;
 	MinFilter = LINEAR;
 	MagFilter = LINEAR;
@@ -108,9 +116,9 @@ sampler DiffuseSampler7 = sampler_state
 	AddressW = CLAMP;
 };
 
-sampler DiffuseSampler8 = sampler_state
+sampler BloomSamplerH = sampler_state
 {
-	Texture = <DiffuseI>;
+	Texture = <BloomTextureH>;
 	MipFilter = LINEAR;
 	MinFilter = LINEAR;
 	MagFilter = LINEAR;
@@ -119,9 +127,9 @@ sampler DiffuseSampler8 = sampler_state
 	AddressW = CLAMP;
 };
 
-sampler DiffuseSampler9 = sampler_state
+sampler BloomSamplerI = sampler_state
 {
-	Texture = <DiffuseJ>;
+	Texture = <BloomTextureI>;
 	MipFilter = LINEAR;
 	MinFilter = LINEAR;
 	MagFilter = LINEAR;
@@ -130,9 +138,64 @@ sampler DiffuseSampler9 = sampler_state
 	AddressW = CLAMP;
 };
 
-sampler DiffuseSamplerA = sampler_state
+sampler BloomSamplerJ = sampler_state
 {
-	Texture = <DiffuseK>;
+	Texture = <BloomTextureJ>;
+	MipFilter = LINEAR;
+	MinFilter = LINEAR;
+	MagFilter = LINEAR;
+	AddressU = CLAMP;
+	AddressV = CLAMP;
+	AddressW = CLAMP;
+};
+
+sampler BloomSamplerK = sampler_state
+{
+	Texture = <BloomTextureK>;
+	MipFilter = LINEAR;
+	MinFilter = LINEAR;
+	MagFilter = LINEAR;
+	AddressU = CLAMP;
+	AddressV = CLAMP;
+	AddressW = CLAMP;
+};
+
+sampler BloomSamplerL = sampler_state
+{
+	Texture = <BloomTextureL>;
+	MipFilter = LINEAR;
+	MinFilter = LINEAR;
+	MagFilter = LINEAR;
+	AddressU = CLAMP;
+	AddressV = CLAMP;
+	AddressW = CLAMP;
+};
+
+sampler BloomSamplerM = sampler_state
+{
+	Texture = <BloomTextureM>;
+	MipFilter = LINEAR;
+	MinFilter = LINEAR;
+	MagFilter = LINEAR;
+	AddressU = CLAMP;
+	AddressV = CLAMP;
+	AddressW = CLAMP;
+};
+
+sampler BloomSamplerN = sampler_state
+{
+	Texture = <BloomTextureN>;
+	MipFilter = LINEAR;
+	MinFilter = LINEAR;
+	MagFilter = LINEAR;
+	AddressU = CLAMP;
+	AddressV = CLAMP;
+	AddressW = CLAMP;
+};
+
+sampler BloomSamplerO = sampler_state
+{
+	Texture = <BloomTextureO>;
 	MipFilter = LINEAR;
 	MinFilter = LINEAR;
 	MagFilter = LINEAR;
@@ -149,12 +212,8 @@ struct VS_OUTPUT
 {
 	float4 Position : POSITION;
 	float4 Color : COLOR0;
-	float2 TexCoord0 : TEXCOORD0;
+	float2 TexCoord : TEXCOORD0;
-	float4 TexCoord12 : TEXCOORD1;
+	float2 BloomCoord : TEXCOORD1;
-	float4 TexCoord34 : TEXCOORD2;
-	float4 TexCoord56 : TEXCOORD3;
-	float4 TexCoord78 : TEXCOORD4;
-	float4 TexCoord9A : TEXCOORD5;
 };
 
 struct VS_INPUT
@@ -167,12 +226,8 @@ struct VS_INPUT
 struct PS_INPUT
 {
 	float4 Color : COLOR0;
-	float2 TexCoord0 : TEXCOORD0;
+	float2 TexCoord : TEXCOORD0;
-	float4 TexCoord12 : TEXCOORD1;
+	float2 BloomCoord : TEXCOORD1;
-	float4 TexCoord34 : TEXCOORD2;
-	float4 TexCoord56 : TEXCOORD3;
-	float4 TexCoord78 : TEXCOORD4;
-	float4 TexCoord9A : TEXCOORD5;
 };
 
 //-----------------------------------------------------------------------------
@@ -204,14 +259,6 @@ uniform float2 ScreenDims;
 uniform float2 TargetDims;
 uniform float2 SourceDims;
 
-// level dimensions not necessary anymore?
-uniform float2 Level0Size;
-uniform float4 Level12Size;
-uniform float4 Level34Size;
-uniform float4 Level56Size;
-uniform float4 Level78Size;
-uniform float4 Level9ASize;
-
 uniform bool VectorScreen = false;
 
 VS_OUTPUT vs_main(VS_INPUT Input)
@@ -229,17 +276,13 @@ VS_OUTPUT vs_main(VS_INPUT Input)
 	float2 TexCoord = Input.TexCoord;
 	TexCoord += 0.5f / TargetDims; // half texel offset correction (DX9)
 
-	Output.TexCoord0 = TexCoord.xy; // + (0.5f / Level0Size);
+	Output.TexCoord = TexCoord.xy;
 
 	TexCoord += VectorScreen
 		? 0.5f / TargetDims.xy
 		: 0.5f / SourceDims.xy;
 
-	Output.TexCoord12 = TexCoord.xyxy; // + (0.5f / Level12Size);
+	Output.BloomCoord = TexCoord.xy;
-	Output.TexCoord34 = TexCoord.xyxy; // + (0.5f / Level34Size);
-	Output.TexCoord56 = TexCoord.xyxy; // + (0.5f / Level56Size);
-	Output.TexCoord78 = TexCoord.xyxy; // + (0.5f / Level78Size);
-	Output.TexCoord9A = TexCoord.xyxy; // + (0.5f / Level9ASize);
 
 	return Output;
 }
@@ -249,11 +292,14 @@ VS_OUTPUT vs_main(VS_INPUT Input)
 //-----------------------------------------------------------------------------
 
 uniform float Level0Weight;
-uniform float2 Level12Weight;
+uniform float Level1Weight;
-uniform float2 Level34Weight;
+uniform float Level2Weight;
-uniform float2 Level56Weight;
+uniform float Level3Weight;
-uniform float2 Level78Weight;
+uniform float Level4Weight;
-uniform float2 Level9AWeight;
+uniform float Level5Weight;
+uniform float Level6Weight;
+uniform float Level7Weight;
+uniform float Level8Weight;
 
 uniform int BloomBlendMode = 0; // 0 brighten, 1 darken
 uniform float BloomScale;
@@ -267,48 +313,80 @@ float3 GetNoiseFactor(float3 n, float random)
 
 float4 ps_main(PS_INPUT Input) : COLOR
 {
-	float3 texel0 = tex2D(DiffuseSampler0, Input.TexCoord0).rgb;
+	float3 texel = tex2D(DiffuseSampler, Input.TexCoord).rgb;
-	float3 texel1 = tex2D(DiffuseSampler1, Input.TexCoord12.xy).rgb;
+
-	float3 texel2 = tex2D(DiffuseSampler2, Input.TexCoord12.zw).rgb;
+	float3 texelA = tex2D(BloomSamplerA, Input.BloomCoord.xy).rgb;
-	float3 texel3 = tex2D(DiffuseSampler3, Input.TexCoord34.xy).rgb;
+	float3 texelB = tex2D(BloomSamplerB, Input.BloomCoord.xy).rgb;
-	float3 texel4 = tex2D(DiffuseSampler4, Input.TexCoord34.zw).rgb;
+	float3 texelC = tex2D(BloomSamplerC, Input.BloomCoord.xy).rgb;
-	float3 texel5 = tex2D(DiffuseSampler5, Input.TexCoord56.xy).rgb;
+	float3 texelD = tex2D(BloomSamplerD, Input.BloomCoord.xy).rgb;
-	float3 texel6 = tex2D(DiffuseSampler6, Input.TexCoord56.zw).rgb;
+	float3 texelE = tex2D(BloomSamplerE, Input.BloomCoord.xy).rgb;
-	float3 texel7 = tex2D(DiffuseSampler7, Input.TexCoord78.xy).rgb;
+	float3 texelF = tex2D(BloomSamplerF, Input.BloomCoord.xy).rgb;
-	float3 texel8 = tex2D(DiffuseSampler8, Input.TexCoord78.zw).rgb;
+	float3 texelG = tex2D(BloomSamplerG, Input.BloomCoord.xy).rgb;
-	float3 texel9 = tex2D(DiffuseSampler9, Input.TexCoord9A.xy).rgb;
+	float3 texelH = tex2D(BloomSamplerH, Input.BloomCoord.xy).rgb;
-	float3 texelA = tex2D(DiffuseSamplerA, Input.TexCoord9A.zw).rgb;
+
+	float3 texelI = float3(0.0f, 0.0f, 0.0f);
+	float3 texelJ = float3(0.0f, 0.0f, 0.0f);
+	float3 texelK = float3(0.0f, 0.0f, 0.0f);
+	float3 texelL = float3(0.0f, 0.0f, 0.0f);
+	float3 texelM = float3(0.0f, 0.0f, 0.0f);
+	float3 texelN = float3(0.0f, 0.0f, 0.0f);
+	float3 texelO = float3(0.0f, 0.0f, 0.0f);
+
+	// vector screen uses twice -1 as many bloom levels
+	if (VectorScreen)
+	{
+		texelI = tex2D(BloomSamplerI, Input.BloomCoord.xy).rgb;
+		texelJ = tex2D(BloomSamplerJ, Input.BloomCoord.xy).rgb;
+		texelK = tex2D(BloomSamplerK, Input.BloomCoord.xy).rgb;
+		texelL = tex2D(BloomSamplerL, Input.BloomCoord.xy).rgb;
+		texelM = tex2D(BloomSamplerM, Input.BloomCoord.xy).rgb;
+		texelN = tex2D(BloomSamplerN, Input.BloomCoord.xy).rgb;
+		texelO = tex2D(BloomSamplerO, Input.BloomCoord.xy).rgb;
+	}
 
 	float3 blend;
 
 	// brighten
 	if (BloomBlendMode == 0)
 	{
-		texel0 *= Level0Weight;
+		float3 bloom = float3(0.0f, 0.0f, 0.0f);
-		texel1 *= Level12Weight.x;
-		texel2 *= Level12Weight.y;
-		texel3 *= Level34Weight.x;
-		texel4 *= Level34Weight.y;
-		texel5 *= Level56Weight.x;
-		texel6 *= Level56Weight.y;
-		texel7 *= Level78Weight.x;
-		texel8 *= Level78Weight.y;
-		texel9 *= Level9AWeight.x;
-		texelA *= Level9AWeight.y;
 
-		float3 bloom = float3(
+		texel *= Level0Weight;
-			texel1 +
-			texel2 +
-			texel3 +
-			texel4 +
-			texel5 +
-			texel6 +
-			texel7 +
-			texel8 +
-			texel9 +
-			texelA) * BloomScale;
 
-		float3 bloomOverdrive = max(0.0f, texel0 + bloom - 1.0f) * BloomOverdrive;
+		if (!VectorScreen)
+		{
+			bloom += texelA * Level1Weight;
+			bloom += texelB * Level2Weight;
+			bloom += texelC * Level3Weight;
+			bloom += texelD * Level4Weight;
+			bloom += texelE * Level5Weight;
+			bloom += texelF * Level6Weight;
+			bloom += texelG * Level7Weight;
+			bloom += texelH * Level8Weight;
+		}
+		// vector screen uses twice -1 as many bloom levels
+		else
+		{
+			bloom += texelA * (Level1Weight);
+			bloom += texelB * (Level1Weight + Level2Weight) * 0.5f;
+			bloom += texelC * (Level2Weight);
+			bloom += texelD * (Level2Weight + Level3Weight) * 0.5f;
+			bloom += texelE * (Level3Weight);
+			bloom += texelF * (Level3Weight + Level4Weight) * 0.5f;
+			bloom += texelG * (Level4Weight);
+			bloom += texelH * (Level4Weight + Level5Weight) * 0.5f;
+			bloom += texelI * (Level5Weight);
+			bloom += texelJ * (Level5Weight + Level6Weight) * 0.5f;
+			bloom += texelK * (Level6Weight);
+			bloom += texelL * (Level6Weight + Level7Weight) * 0.5f;
+			bloom += texelM * (Level7Weight);
+			bloom += texelN * (Level7Weight + Level8Weight) * 0.5f;
+			bloom += texelO * (Level8Weight);
+		}
+
+		bloom *= BloomScale;
+
+		float3 bloomOverdrive = max(0.0f, texel + bloom - 1.0f) * BloomOverdrive;
 
 		bloom.r += bloomOverdrive.g * 0.5f;
 		bloom.r += bloomOverdrive.b * 0.5f;
@@ -317,37 +395,33 @@ float4 ps_main(PS_INPUT Input) : COLOR
 		bloom.b += bloomOverdrive.r * 0.5f;
 		bloom.b += bloomOverdrive.g * 0.5f;
 
-		float2 NoiseCoord = Input.TexCoord0;
+		float2 NoiseCoord = Input.TexCoord;
 		float3 NoiseFactor = GetNoiseFactor(bloom, random(NoiseCoord));
 
-		blend = texel0 + bloom * NoiseFactor;
+		blend = texel + bloom * NoiseFactor;
 	}
 
 	// darken
 	else
 	{
-		texel1 = min(texel0, texel1);
+		texelA = min(texel, texelA);
-		texel2 = min(texel0, texel2);
+		texelB = min(texel, texelB);
-		texel3 = min(texel0, texel3);
+		texelC = min(texel, texelC);
-		texel4 = min(texel0, texel4);
+		texelD = min(texel, texelD);
-		texel5 = min(texel0, texel5);
+		texelE = min(texel, texelE);
-		texel6 = min(texel0, texel6);
+		texelF = min(texel, texelF);
-		texel7 = min(texel0, texel7);
+		texelG = min(texel, texelG);
-		texel8 = min(texel0, texel8);
+		texelH = min(texel, texelH);
-		texel9 = min(texel0, texel9);
-		texelA = min(texel0, texelA);
 
-		blend = texel0 * Level0Weight;
+		blend = texel * Level0Weight;
-		blend = lerp(blend, texel1, Level12Weight.x * BloomScale);
+		blend = lerp(blend, texelA, Level1Weight * BloomScale);
-		blend = lerp(blend, texel2, Level12Weight.y * BloomScale);
+		blend = lerp(blend, texelB, Level2Weight * BloomScale);
-		blend = lerp(blend, texel3, Level34Weight.x * BloomScale);
+		blend = lerp(blend, texelC, Level3Weight * BloomScale);
-		blend = lerp(blend, texel4, Level34Weight.y * BloomScale);
+		blend = lerp(blend, texelD, Level4Weight * BloomScale);
-		blend = lerp(blend, texel5, Level56Weight.x * BloomScale);
+		blend = lerp(blend, texelE, Level5Weight * BloomScale);
-		blend = lerp(blend, texel6, Level56Weight.y * BloomScale);
+		blend = lerp(blend, texelF, Level6Weight * BloomScale);
-		blend = lerp(blend, texel7, Level78Weight.x * BloomScale);
+		blend = lerp(blend, texelG, Level7Weight * BloomScale);
-		blend = lerp(blend, texel8, Level78Weight.y * BloomScale);
+		blend = lerp(blend, texelH, Level8Weight * BloomScale);
-		blend = lerp(blend, texel9, Level9AWeight.x * BloomScale);
-		blend = lerp(blend, texelA, Level9AWeight.y * BloomScale);
 	}
 
 	return float4(blend, 1.0f);

hlsl/ntsc.fx

@@ -49,7 +49,6 @@ struct PS_INPUT
 
 uniform float2 ScreenDims;
 uniform float2 SourceDims;
-uniform float2 SourceRect;
 
 VS_OUTPUT vs_main(VS_INPUT Input)
 {
@@ -108,10 +107,7 @@ static const int HalfSampleCount = SampleCount / 2;
 
 float4 GetCompositeYIQ(float2 TexCoord)
 {
-	float2 SourceTexelDims = 1.0f / SourceDims;
+	float2 PValueSourceTexel = float2(PValue / SourceDims.x, 0.0f);
-	float2 SourceRes = SourceDims * SourceRect;
-
-	float2 PValueSourceTexel = float2(PValue, 0.0f) * SourceTexelDims;
 
 	float2 C0 = TexCoord + PValueSourceTexel * OffsetX.x;
 	float2 C1 = TexCoord + PValueSourceTexel * OffsetX.y;
@@ -124,8 +120,8 @@ float4 GetCompositeYIQ(float2 TexCoord)
 	float4 Texel2 = tex2D(DiffuseSampler, C2);
 	float4 Texel3 = tex2D(DiffuseSampler, C3);
 
-	float4 HPosition = Cx / SourceRect.x;
+	float4 HPosition = Cx;
-	float4 VPosition = Cy / SourceRect.y;
+	float4 VPosition = Cy;
 
 	float4 Y = float4(dot(Texel0, YDot), dot(Texel1, YDot), dot(Texel2, YDot), dot(Texel3, YDot));
 	float4 I = float4(dot(Texel0, IDot), dot(Texel1, IDot), dot(Texel2, IDot), dot(Texel3, IDot));
@@ -135,7 +131,7 @@ float4 GetCompositeYIQ(float2 TexCoord)
 	float WoPI = W / PI;
 
 	float HOffset = (BValue + SignalOffset) / WoPI;
-	float VScale = (AValue * SourceRes.y) / WoPI;
+	float VScale = (AValue * SourceDims.y) / WoPI;
 
 	float4 T = HPosition + HOffset + VPosition * VScale;
 	float4 TW = T * W;
@@ -149,10 +145,7 @@ float4 ps_main(PS_INPUT Input) : COLOR
 {
 	float4 BaseTexel = tex2D(DiffuseSampler, Input.TexCoord);
 
-	float2 SourceTexelDims = 1.0f / SourceDims;
+	float TimePerSample = ScanTime / (SourceDims.x * 4.0f);
-	float2 SourceRes = SourceDims * SourceRect;
-
-	float TimePerSample = ScanTime / (SourceRes.x * 4.0f);
 
 	float Fc_y1 = (CCValue - NotchHalfWidth) * TimePerSample;
 	float Fc_y2 = (CCValue + NotchHalfWidth) * TimePerSample;
@@ -175,23 +168,22 @@ float4 ps_main(PS_INPUT Input) : COLOR
 	float WoPI = W / PI;
 
 	float HOffset = (BValue + SignalOffset) / WoPI;
-	float VScale = (AValue * SourceRes.y) / WoPI;
+	float VScale = (AValue * SourceDims.y) / WoPI;
 
 	float4 YAccum = 0.0f;
 	float4 IAccum = 0.0f;
 	float4 QAccum = 0.0f;
 
 	float4 Cy = Input.TexCoord.y;
-	float4 VPosition = Cy / SourceRect.y;
+	float4 VPosition = Cy;
 
 	for (float i = 0; i < SampleCount; i += 4.0f)
 	{
 		float n = i - HalfSampleCount;
-
 		float4 n4 = n + NotchOffset;
 
-		float4 Cx = Input.TexCoord.x + SourceTexelDims.x * (n4 * 0.25f);
+		float4 Cx = Input.TexCoord.x + (n4 * 0.25f) / SourceDims.x;
-		float4 HPosition = Cx / SourceRect.x;
+		float4 HPosition = Cx;
 
 		float4 C = GetCompositeYIQ(float2(Cx.r, Cy.r));
 

ini/presets/gameboy.ini

@@ -47,9 +47,7 @@ bloom_lvl1_weight         0.64
 bloom_lvl2_weight         0.32
 bloom_lvl3_weight         0.16
 bloom_lvl4_weight         0.08
-bloom_lvl5_weight         0.04
+bloom_lvl5_weight         0.06
 bloom_lvl6_weight         0.04
 bloom_lvl7_weight         0.02
-bloom_lvl8_weight         0.02
+bloom_lvl8_weight         0.01
-bloom_lvl9_weight         0.01
-bloom_lvl10_weight        0.01

ini/presets/gba.ini

@@ -47,9 +47,7 @@ bloom_lvl1_weight         0.64
 bloom_lvl2_weight         0.32
 bloom_lvl3_weight         0.16
 bloom_lvl4_weight         0.08
-bloom_lvl5_weight         0.04
+bloom_lvl5_weight         0.06
 bloom_lvl6_weight         0.04
 bloom_lvl7_weight         0.02
-bloom_lvl8_weight         0.02
+bloom_lvl8_weight         0.01
-bloom_lvl9_weight         0.01
-bloom_lvl10_weight        0.01

ini/presets/lcd-matrix.ini

@@ -0,0 +1,53 @@
+#
+# DIRECT3D POST-PROCESSING OPTIONS
+#
+shadow_mask_tile_mode     1
+shadow_mask_alpha         0.5
+shadow_mask_texture       monochrome-matrix.png
+shadow_mask_x_count       2
+shadow_mask_y_count       2
+shadow_mask_usize         0.5
+shadow_mask_vsize         0.5
+shadow_mask_uoffset       0.0
+shadow_mask_voffset       0.0
+curvature                 0.0
+round_corner              0.0
+smooth_border             0.0
+reflection                0.0
+vignetting                0.0
+scanline_alpha            0.0
+defocus                   0.5,0.5
+converge_x                0.0,0.0,0.0
+converge_y                0.0,0.0,0.0
+radial_converge_x         0.0,0.0,0.0
+radial_converge_y         0.0,0.0,0.0
+red_ratio                 1.0,0.0,0.0
+grn_ratio                 0.0,1.0,0.0
+blu_ratio                 0.0,0.0,1.0
+saturation                1.0
+offset                    0.0,0.0,0.0
+scale                     1.0,1.0,1.0
+power                     1.0,1.0,1.0
+floor                     0.0,0.0,0.0
+phosphor_life             0.5,0.5,0.5
+
+#
+# NTSC POST-PROCESSING OPTIONS
+#
+yiq_enable                0
+
+#
+# BLOOM POST-PROCESSING OPTIONS
+#
+bloom_blend_mode          1
+bloom_scale               0.5
+bloom_overdrive           0.0,0.0,0.0
+bloom_lvl0_weight         1.0
+bloom_lvl1_weight         0.64
+bloom_lvl2_weight         0.32
+bloom_lvl3_weight         0.16
+bloom_lvl4_weight         0.08
+bloom_lvl5_weight         0.06
+bloom_lvl6_weight         0.04
+bloom_lvl7_weight         0.02
+bloom_lvl8_weight         0.01

ini/presets/lcd.ini

@@ -0,0 +1,53 @@
+#
+# DIRECT3D POST-PROCESSING OPTIONS
+#
+shadow_mask_tile_mode     1
+shadow_mask_alpha         0.75
+shadow_mask_texture       slot-mask-aligned.png
+shadow_mask_x_count       2
+shadow_mask_y_count       2
+shadow_mask_usize         0.1875
+shadow_mask_vsize         0.1875
+shadow_mask_uoffset       0.0
+shadow_mask_voffset       0.0
+curvature                 0.0
+round_corner              0.0
+smooth_border             0.0
+reflection                0.0
+vignetting                0.0
+scanline_alpha            0.0
+defocus                   0.0,0.0
+converge_x                0.0,0.0,0.0
+converge_y                0.0,0.0,0.0
+radial_converge_x         0.0,0.0,0.0
+radial_converge_y         0.0,0.0,0.0
+red_ratio                 1.0,0.0,0.0
+grn_ratio                 0.0,1.0,0.0
+blu_ratio                 0.0,0.0,1.0
+saturation                1.0
+offset                    0.0,0.0,0.0
+scale                     1.0,1.0,1.0
+power                     1.0,1.0,1.0
+floor                     0.0,0.0,0.0
+phosphor_life             0.5,0.5,0.5
+
+#
+# NTSC POST-PROCESSING OPTIONS
+#
+yiq_enable                0
+
+#
+# BLOOM POST-PROCESSING OPTIONS
+#
+bloom_blend_mode          0
+bloom_scale               0.25
+bloom_overdrive           0.0,0.0,0.0
+bloom_lvl0_weight         1.0
+bloom_lvl1_weight         0.64
+bloom_lvl2_weight         0.32
+bloom_lvl3_weight         0.16
+bloom_lvl4_weight         0.08
+bloom_lvl5_weight         0.06
+bloom_lvl6_weight         0.04
+bloom_lvl7_weight         0.02
+bloom_lvl8_weight         0.01

ini/presets/raster.ini

@@ -53,9 +53,7 @@ bloom_lvl1_weight         0.64
 bloom_lvl2_weight         0.32
 bloom_lvl3_weight         0.16
 bloom_lvl4_weight         0.08
-bloom_lvl5_weight         0.04
+bloom_lvl5_weight         0.06
 bloom_lvl6_weight         0.04
 bloom_lvl7_weight         0.02
-bloom_lvl8_weight         0.02
+bloom_lvl8_weight         0.01
-bloom_lvl9_weight         0.01
-bloom_lvl10_weight        0.01

ini/presets/vector-mono.ini

@@ -0,0 +1,66 @@
+#
+# CORE SCREEN OPTIONS
+#
+gamma                     0.50
+
+#
+# CORE VECTOR OPTIONS
+#
+antialias                 1
+beam_width_min            0.75
+beam_width_max            4.00
+beam_intensity_weight     0.75
+flicker                   0.15
+
+#
+# DIRECT3D POST-PROCESSING OPTIONS
+#
+hlsl_oversampling         0
+shadow_mask_alpha         0.0
+curvature                 0.0
+round_corner              0.0
+smooth_border             0.0
+reflection                0.0
+vignetting                0.0
+scanline_alpha            0.0
+defocus                   0.0,0.0
+converge_x                0.0,0.0,0.0
+converge_y                0.0,0.0,0.0
+radial_converge_x         0.0,0.0,0.0
+radial_converge_y         0.0,0.0,0.0
+red_ratio                 1.0,0.0,0.0
+grn_ratio                 0.0,1.0,0.0
+blu_ratio                 0.0,0.0,1.0
+saturation                1.0
+offset                    0.0,0.0,0.0
+scale                     1.0,1.0,1.0
+power                     1.0,1.0,1.0
+floor                     0.0,0.0,0.0
+phosphor_life             0.5,0.5,0.5
+
+#
+# NTSC POST-PROCESSING OPTIONS
+#
+yiq_enable                0
+
+#
+# VECTOR POST-PROCESSING OPTIONS
+#
+vector_length_scale       0.8
+vector_length_ratio       500.0
+
+#
+# BLOOM POST-PROCESSING OPTIONS
+#
+bloom_blend_mode          0
+bloom_scale               0.75
+bloom_overdrive           1.00,1.00,1.00
+bloom_lvl0_weight         1.00
+bloom_lvl1_weight         0.48
+bloom_lvl2_weight         0.32
+bloom_lvl3_weight         0.24
+bloom_lvl4_weight         0.16
+bloom_lvl5_weight         0.24
+bloom_lvl6_weight         0.32
+bloom_lvl7_weight         0.48
+bloom_lvl8_weight         0.64

ini/presets/vector.ini

@@ -56,16 +56,14 @@ vector_length_ratio       500.0
 # BLOOM POST-PROCESSING OPTIONS
 #
 bloom_blend_mode          0
-bloom_scale               1.50
+bloom_scale               0.75
 bloom_overdrive           1.00,1.00,1.00
 bloom_lvl0_weight         1.00
-bloom_lvl1_weight         0.64
+bloom_lvl1_weight         0.48
 bloom_lvl2_weight         0.32
-bloom_lvl3_weight         0.16
+bloom_lvl3_weight         0.24
-bloom_lvl4_weight         0.24
+bloom_lvl4_weight         0.16
-bloom_lvl5_weight         0.32
+bloom_lvl5_weight         0.24
-bloom_lvl6_weight         0.48
+bloom_lvl6_weight         0.32
-bloom_lvl7_weight         0.32
+bloom_lvl7_weight         0.48
-bloom_lvl8_weight         0.24
+bloom_lvl8_weight         0.64
-bloom_lvl9_weight         0.16
-bloom_lvl10_weight        0.08

language/Afrikaans/strings.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-25 23:59+0100\n"
+"POT-Creation-Date: 2016-03-28 09:02+0200\n"
 "PO-Revision-Date: 2016-02-20 18:03+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: MAME Language Team\n"
@@ -59,14 +59,14 @@ msgstr ""
 msgid "Autofire Status"
 msgstr ""
 
-#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742
+#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
 msgid "Disabled"
 msgstr ""
 
-#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742
+#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
@@ -642,11 +642,11 @@ msgstr ""
 msgid "Display Options"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:159
+#: src/emu/ui/filesel.cpp:161
 msgid "File Already Exists - Override?"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1560
+#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1560
 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562
 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564
 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566
@@ -654,7 +654,7 @@ msgstr ""
 msgid "No"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:162 src/emu/ui/selgame.cpp:1560
+#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1560
 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562
 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564
 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566
@@ -662,55 +662,55 @@ msgstr ""
 msgid "Yes"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:271
+#: src/emu/ui/filesel.cpp:275
 msgid "New Image Name:"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:277
+#: src/emu/ui/filesel.cpp:281
 msgid "Image Format:"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:283
+#: src/emu/ui/filesel.cpp:287
 msgid "Create"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:314
+#: src/emu/ui/filesel.cpp:318
 msgid "Please enter a file extension too"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:502 src/emu/ui/swlist.cpp:65
+#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65
 msgid "[empty slot]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:506
+#: src/emu/ui/filesel.cpp:510
 msgid "[create]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:510 src/emu/ui/swlist.cpp:76
+#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76
 msgid "[software list]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:802
+#: src/emu/ui/filesel.cpp:806
 msgid "Select image format"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:862
+#: src/emu/ui/filesel.cpp:866
 msgid "Select access mode"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:863
+#: src/emu/ui/filesel.cpp:867
 msgid "Read-only"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:865
+#: src/emu/ui/filesel.cpp:869
 msgid "Read-write"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:866
+#: src/emu/ui/filesel.cpp:870
 msgid "Read this image, write to another image"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:867
+#: src/emu/ui/filesel.cpp:871
 msgid "Read this image, write to diff"
 msgstr ""
 
@@ -1571,92 +1571,80 @@ msgstr ""
 msgid "Fast Forward"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:415
+#: src/emu/ui/ui.cpp:410
 msgid "This driver requires images to be loaded in the following device(s): "
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1043
+#: src/emu/ui/ui.cpp:1060
-#, c-format
-msgid ""
-"Usage of emulators in conjunction with ROMs you don't own is forbidden by "
-"copyright law.\n"
-"\n"
-"IF YOU ARE NOT LEGALLY ENTITLED TO PLAY \"%1$s\" ON THIS EMULATOR, PRESS "
-"ESC.\n"
-"\n"
-"Otherwise, type OK or move the joystick left then right to continue"
-msgstr ""
-
-#: src/emu/ui/ui.cpp:1081
 msgid ""
 "One or more ROMs/CHDs for this machine are incorrect. The machine may not "
 "run correctly.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1094
+#: src/emu/ui/ui.cpp:1073
 msgid ""
 "There are known problems with this machine\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1098
+#: src/emu/ui/ui.cpp:1077
 msgid ""
 "One or more ROMs/CHDs for this machine have not been correctly dumped.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1102
+#: src/emu/ui/ui.cpp:1081
 #, c-format
 msgid "The keyboard emulation may not be 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1104
+#: src/emu/ui/ui.cpp:1083
 #, c-format
 msgid "The colors aren't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1106
+#: src/emu/ui/ui.cpp:1085
 msgid "The colors are completely wrong.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1108
+#: src/emu/ui/ui.cpp:1087
 #, c-format
 msgid "The video emulation isn't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1110
+#: src/emu/ui/ui.cpp:1089
 #, c-format
 msgid "The sound emulation isn't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1112
+#: src/emu/ui/ui.cpp:1091
 msgid "The machine lacks sound.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1115
+#: src/emu/ui/ui.cpp:1094
 msgid "Screen flipping in cocktail mode is not supported.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1119
+#: src/emu/ui/ui.cpp:1098
 msgid "The machine requires external artwork files\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1124
+#: src/emu/ui/ui.cpp:1103
 msgid ""
 "This machine was never completed. It may exhibit strange behavior or missing "
 "elements that are not bugs in the emulation.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1129
+#: src/emu/ui/ui.cpp:1108
 msgid ""
 "This machine has no sound hardware, MAME will produce no sounds, this is "
 "expected behaviour.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1137
+#: src/emu/ui/ui.cpp:1116
 msgid "The machine has protection which isn't fully emulated.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1140
+#: src/emu/ui/ui.cpp:1119
 msgid ""
 "\n"
 "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet "
@@ -1664,7 +1652,7 @@ msgid ""
 "the developers to improve the emulation.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1144
+#: src/emu/ui/ui.cpp:1123
 msgid ""
 "\n"
 "Certain elements of this machine cannot be emulated as it requires actual "
@@ -1672,21 +1660,21 @@ msgid ""
 "to fully play this machine.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1163
+#: src/emu/ui/ui.cpp:1142
 msgid ""
 "\n"
 "\n"
 "There are working clones of this machine: "
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1177
+#: src/emu/ui/ui.cpp:1156
 msgid ""
 "\n"
 "\n"
-"Type OK or move the joystick left then right to continue"
+"Press any key to continue"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1192
+#: src/emu/ui/ui.cpp:1171
 #, c-format
 msgid ""
 "%1$s\n"
@@ -1696,98 +1684,98 @@ msgid ""
 "CPU:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267
+#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246
 msgid "MHz"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267
+#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246
 msgid "kHz"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1242
+#: src/emu/ui/ui.cpp:1221
 msgid ""
 "\n"
 "Sound:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1271
+#: src/emu/ui/ui.cpp:1250
 msgid ""
 "\n"
 "Video:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1275
+#: src/emu/ui/ui.cpp:1254
 msgid "None\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1282
+#: src/emu/ui/ui.cpp:1261
 msgid "Vector"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1293
+#: src/emu/ui/ui.cpp:1272
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1293
+#: src/emu/ui/ui.cpp:1272
 msgid "%2$s\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1577 src/emu/ui/ui.cpp:1587
+#: src/emu/ui/ui.cpp:1527 src/emu/ui/ui.cpp:1537
 msgid "Keyboard Emulation Status"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1579
+#: src/emu/ui/ui.cpp:1529
 msgid "Mode: PARTIAL Emulation"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1580
+#: src/emu/ui/ui.cpp:1530
 msgid "UI:   Enabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1582 src/emu/ui/ui.cpp:1592
+#: src/emu/ui/ui.cpp:1532 src/emu/ui/ui.cpp:1542
 msgid "**Use ScrLock to toggle**"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1589
+#: src/emu/ui/ui.cpp:1539
 msgid "Mode: FULL Emulation"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1590
+#: src/emu/ui/ui.cpp:1540
 msgid "UI:   Disabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1736
+#: src/emu/ui/ui.cpp:1686
 msgid "Autofire can't be enabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1775
+#: src/emu/ui/ui.cpp:1725
 msgid "Select position to save to"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1777
+#: src/emu/ui/ui.cpp:1727
 msgid "Select position to load from"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1801
+#: src/emu/ui/ui.cpp:1751
 msgid "Save cancelled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1803
+#: src/emu/ui/ui.cpp:1753
 msgid "Load cancelled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1846
+#: src/emu/ui/ui.cpp:1796
 #, c-format
 msgid "Save to position %s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1851
+#: src/emu/ui/ui.cpp:1801
 #, c-format
 msgid "Load from position %s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1891
+#: src/emu/ui/ui.cpp:1841
 #, c-format
 msgid ""
 "Are you sure you want to quit?\n"
@@ -1796,173 +1784,173 @@ msgid ""
 "Press ''%2$s'' to return to emulation."
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1966
+#: src/emu/ui/ui.cpp:1916
 msgid "Master Volume"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1976
+#: src/emu/ui/ui.cpp:1926
 #, c-format
 msgid "%1$s Volume"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1998
+#: src/emu/ui/ui.cpp:1948
 #, c-format
 msgid "Overclock CPU %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2018
+#: src/emu/ui/ui.cpp:1968
 #, c-format
 msgid "%1$s Refresh Rate"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2024
+#: src/emu/ui/ui.cpp:1974
 #, c-format
 msgid "%1$s Brightness"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2027
+#: src/emu/ui/ui.cpp:1977
 #, c-format
 msgid "%1$s Contrast"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2030
+#: src/emu/ui/ui.cpp:1980
 #, c-format
 msgid "%1$s Gamma"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2035
+#: src/emu/ui/ui.cpp:1985
 #, c-format
 msgid "%1$s Horiz Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2038
+#: src/emu/ui/ui.cpp:1988
 #, c-format
 msgid "%1$s Horiz Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2041
+#: src/emu/ui/ui.cpp:1991
 #, c-format
 msgid "%1$s Vert Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2044
+#: src/emu/ui/ui.cpp:1994
 #, c-format
 msgid "%1$s Vert Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2062
+#: src/emu/ui/ui.cpp:2012
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2065
+#: src/emu/ui/ui.cpp:2015
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2068
+#: src/emu/ui/ui.cpp:2018
 #, c-format
 msgid "Laserdisc '%1$s' Vert Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2071
+#: src/emu/ui/ui.cpp:2021
 #, c-format
 msgid "Laserdisc '%1$s' Vert Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2080
+#: src/emu/ui/ui.cpp:2030
 msgid "Vector Flicker"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2082
+#: src/emu/ui/ui.cpp:2032
 msgid "Beam Width Minimum"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2084
+#: src/emu/ui/ui.cpp:2034
 msgid "Beam Width Maximum"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2086
+#: src/emu/ui/ui.cpp:2036
 msgid "Beam Intensity Weight"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2098
+#: src/emu/ui/ui.cpp:2048
 #, c-format
 msgid "Crosshair Scale %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101
+#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051
 msgid "X"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101
+#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051
 msgid "Y"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2101
+#: src/emu/ui/ui.cpp:2051
 #, c-format
 msgid "Crosshair Offset %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2120
+#: src/emu/ui/ui.cpp:2070
 #, c-format
 msgid "%1$3ddB"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2164
+#: src/emu/ui/ui.cpp:2114
 #, c-format
 msgid "%1$d%%"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2180
+#: src/emu/ui/ui.cpp:2130
 #, c-format
 msgid "%1$3.0f%%"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2203
+#: src/emu/ui/ui.cpp:2153
 #, c-format
 msgid "%1$.3ffps"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2226 src/emu/ui/ui.cpp:2248 src/emu/ui/ui.cpp:2269
+#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219
-#: src/emu/ui/ui.cpp:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335
+#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285
-#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401
+#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351
-#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445
+#: src/emu/ui/ui.cpp:2373 src/emu/ui/ui.cpp:2395
 #, c-format
 msgid "%1$.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2461 src/emu/ui/ui.cpp:2477 src/emu/ui/ui.cpp:2493
+#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443
-#: src/emu/ui/ui.cpp:2509
+#: src/emu/ui/ui.cpp:2459
 #, c-format
 msgid "%1$1.2f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2525
+#: src/emu/ui/ui.cpp:2475
 #, c-format
 msgid "Screen '%1$s'"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2527
+#: src/emu/ui/ui.cpp:2477
 msgid "Screen"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2543
+#: src/emu/ui/ui.cpp:2493
 #, c-format
 msgid "Crosshair Scale X %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2543
+#: src/emu/ui/ui.cpp:2493
 #, c-format
 msgid "Crosshair Scale Y %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2562
+#: src/emu/ui/ui.cpp:2512
 #, c-format
 msgid "Crosshair Offset X %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2562
+#: src/emu/ui/ui.cpp:2512
 #, c-format
 msgid "Crosshair Offset Y %1$1.3f"
 msgstr ""

language/Albanian/strings.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-25 23:59+0100\n"
+"POT-Creation-Date: 2016-03-28 09:02+0200\n"
 "PO-Revision-Date: 2016-02-20 18:03+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: MAME Language Team\n"
@@ -59,14 +59,14 @@ msgstr ""
 msgid "Autofire Status"
 msgstr ""
 
-#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742
+#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
 msgid "Disabled"
 msgstr ""
 
-#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742
+#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
@@ -642,11 +642,11 @@ msgstr ""
 msgid "Display Options"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:159
+#: src/emu/ui/filesel.cpp:161
 msgid "File Already Exists - Override?"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1560
+#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1560
 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562
 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564
 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566
@@ -654,7 +654,7 @@ msgstr ""
 msgid "No"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:162 src/emu/ui/selgame.cpp:1560
+#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1560
 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562
 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564
 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566
@@ -662,55 +662,55 @@ msgstr ""
 msgid "Yes"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:271
+#: src/emu/ui/filesel.cpp:275
 msgid "New Image Name:"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:277
+#: src/emu/ui/filesel.cpp:281
 msgid "Image Format:"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:283
+#: src/emu/ui/filesel.cpp:287
 msgid "Create"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:314
+#: src/emu/ui/filesel.cpp:318
 msgid "Please enter a file extension too"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:502 src/emu/ui/swlist.cpp:65
+#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65
 msgid "[empty slot]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:506
+#: src/emu/ui/filesel.cpp:510
 msgid "[create]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:510 src/emu/ui/swlist.cpp:76
+#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76
 msgid "[software list]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:802
+#: src/emu/ui/filesel.cpp:806
 msgid "Select image format"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:862
+#: src/emu/ui/filesel.cpp:866
 msgid "Select access mode"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:863
+#: src/emu/ui/filesel.cpp:867
 msgid "Read-only"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:865
+#: src/emu/ui/filesel.cpp:869
 msgid "Read-write"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:866
+#: src/emu/ui/filesel.cpp:870
 msgid "Read this image, write to another image"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:867
+#: src/emu/ui/filesel.cpp:871
 msgid "Read this image, write to diff"
 msgstr ""
 
@@ -1571,92 +1571,80 @@ msgstr ""
 msgid "Fast Forward"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:415
+#: src/emu/ui/ui.cpp:410
 msgid "This driver requires images to be loaded in the following device(s): "
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1043
+#: src/emu/ui/ui.cpp:1060
-#, c-format
-msgid ""
-"Usage of emulators in conjunction with ROMs you don't own is forbidden by "
-"copyright law.\n"
-"\n"
-"IF YOU ARE NOT LEGALLY ENTITLED TO PLAY \"%1$s\" ON THIS EMULATOR, PRESS "
-"ESC.\n"
-"\n"
-"Otherwise, type OK or move the joystick left then right to continue"
-msgstr ""
-
-#: src/emu/ui/ui.cpp:1081
 msgid ""
 "One or more ROMs/CHDs for this machine are incorrect. The machine may not "
 "run correctly.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1094
+#: src/emu/ui/ui.cpp:1073
 msgid ""
 "There are known problems with this machine\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1098
+#: src/emu/ui/ui.cpp:1077
 msgid ""
 "One or more ROMs/CHDs for this machine have not been correctly dumped.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1102
+#: src/emu/ui/ui.cpp:1081
 #, c-format
 msgid "The keyboard emulation may not be 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1104
+#: src/emu/ui/ui.cpp:1083
 #, c-format
 msgid "The colors aren't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1106
+#: src/emu/ui/ui.cpp:1085
 msgid "The colors are completely wrong.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1108
+#: src/emu/ui/ui.cpp:1087
 #, c-format
 msgid "The video emulation isn't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1110
+#: src/emu/ui/ui.cpp:1089
 #, c-format
 msgid "The sound emulation isn't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1112
+#: src/emu/ui/ui.cpp:1091
 msgid "The machine lacks sound.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1115
+#: src/emu/ui/ui.cpp:1094
 msgid "Screen flipping in cocktail mode is not supported.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1119
+#: src/emu/ui/ui.cpp:1098
 msgid "The machine requires external artwork files\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1124
+#: src/emu/ui/ui.cpp:1103
 msgid ""
 "This machine was never completed. It may exhibit strange behavior or missing "
 "elements that are not bugs in the emulation.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1129
+#: src/emu/ui/ui.cpp:1108
 msgid ""
 "This machine has no sound hardware, MAME will produce no sounds, this is "
 "expected behaviour.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1137
+#: src/emu/ui/ui.cpp:1116
 msgid "The machine has protection which isn't fully emulated.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1140
+#: src/emu/ui/ui.cpp:1119
 msgid ""
 "\n"
 "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet "
@@ -1664,7 +1652,7 @@ msgid ""
 "the developers to improve the emulation.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1144
+#: src/emu/ui/ui.cpp:1123
 msgid ""
 "\n"
 "Certain elements of this machine cannot be emulated as it requires actual "
@@ -1672,21 +1660,21 @@ msgid ""
 "to fully play this machine.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1163
+#: src/emu/ui/ui.cpp:1142
 msgid ""
 "\n"
 "\n"
 "There are working clones of this machine: "
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1177
+#: src/emu/ui/ui.cpp:1156
 msgid ""
 "\n"
 "\n"
-"Type OK or move the joystick left then right to continue"
+"Press any key to continue"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1192
+#: src/emu/ui/ui.cpp:1171
 #, c-format
 msgid ""
 "%1$s\n"
@@ -1696,98 +1684,98 @@ msgid ""
 "CPU:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267
+#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246
 msgid "MHz"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267
+#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246
 msgid "kHz"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1242
+#: src/emu/ui/ui.cpp:1221
 msgid ""
 "\n"
 "Sound:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1271
+#: src/emu/ui/ui.cpp:1250
 msgid ""
 "\n"
 "Video:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1275
+#: src/emu/ui/ui.cpp:1254
 msgid "None\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1282
+#: src/emu/ui/ui.cpp:1261
 msgid "Vector"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1293
+#: src/emu/ui/ui.cpp:1272
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1293
+#: src/emu/ui/ui.cpp:1272
 msgid "%2$s\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1577 src/emu/ui/ui.cpp:1587
+#: src/emu/ui/ui.cpp:1527 src/emu/ui/ui.cpp:1537
 msgid "Keyboard Emulation Status"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1579
+#: src/emu/ui/ui.cpp:1529
 msgid "Mode: PARTIAL Emulation"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1580
+#: src/emu/ui/ui.cpp:1530
 msgid "UI:   Enabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1582 src/emu/ui/ui.cpp:1592
+#: src/emu/ui/ui.cpp:1532 src/emu/ui/ui.cpp:1542
 msgid "**Use ScrLock to toggle**"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1589
+#: src/emu/ui/ui.cpp:1539
 msgid "Mode: FULL Emulation"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1590
+#: src/emu/ui/ui.cpp:1540
 msgid "UI:   Disabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1736
+#: src/emu/ui/ui.cpp:1686
 msgid "Autofire can't be enabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1775
+#: src/emu/ui/ui.cpp:1725
 msgid "Select position to save to"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1777
+#: src/emu/ui/ui.cpp:1727
 msgid "Select position to load from"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1801
+#: src/emu/ui/ui.cpp:1751
 msgid "Save cancelled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1803
+#: src/emu/ui/ui.cpp:1753
 msgid "Load cancelled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1846
+#: src/emu/ui/ui.cpp:1796
 #, c-format
 msgid "Save to position %s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1851
+#: src/emu/ui/ui.cpp:1801
 #, c-format
 msgid "Load from position %s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1891
+#: src/emu/ui/ui.cpp:1841
 #, c-format
 msgid ""
 "Are you sure you want to quit?\n"
@@ -1796,173 +1784,173 @@ msgid ""
 "Press ''%2$s'' to return to emulation."
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1966
+#: src/emu/ui/ui.cpp:1916
 msgid "Master Volume"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1976
+#: src/emu/ui/ui.cpp:1926
 #, c-format
 msgid "%1$s Volume"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1998
+#: src/emu/ui/ui.cpp:1948
 #, c-format
 msgid "Overclock CPU %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2018
+#: src/emu/ui/ui.cpp:1968
 #, c-format
 msgid "%1$s Refresh Rate"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2024
+#: src/emu/ui/ui.cpp:1974
 #, c-format
 msgid "%1$s Brightness"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2027
+#: src/emu/ui/ui.cpp:1977
 #, c-format
 msgid "%1$s Contrast"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2030
+#: src/emu/ui/ui.cpp:1980
 #, c-format
 msgid "%1$s Gamma"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2035
+#: src/emu/ui/ui.cpp:1985
 #, c-format
 msgid "%1$s Horiz Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2038
+#: src/emu/ui/ui.cpp:1988
 #, c-format
 msgid "%1$s Horiz Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2041
+#: src/emu/ui/ui.cpp:1991
 #, c-format
 msgid "%1$s Vert Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2044
+#: src/emu/ui/ui.cpp:1994
 #, c-format
 msgid "%1$s Vert Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2062
+#: src/emu/ui/ui.cpp:2012
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2065
+#: src/emu/ui/ui.cpp:2015
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2068
+#: src/emu/ui/ui.cpp:2018
 #, c-format
 msgid "Laserdisc '%1$s' Vert Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2071
+#: src/emu/ui/ui.cpp:2021
 #, c-format
 msgid "Laserdisc '%1$s' Vert Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2080
+#: src/emu/ui/ui.cpp:2030
 msgid "Vector Flicker"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2082
+#: src/emu/ui/ui.cpp:2032
 msgid "Beam Width Minimum"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2084
+#: src/emu/ui/ui.cpp:2034
 msgid "Beam Width Maximum"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2086
+#: src/emu/ui/ui.cpp:2036
 msgid "Beam Intensity Weight"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2098
+#: src/emu/ui/ui.cpp:2048
 #, c-format
 msgid "Crosshair Scale %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101
+#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051
 msgid "X"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101
+#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051
 msgid "Y"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2101
+#: src/emu/ui/ui.cpp:2051
 #, c-format
 msgid "Crosshair Offset %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2120
+#: src/emu/ui/ui.cpp:2070
 #, c-format
 msgid "%1$3ddB"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2164
+#: src/emu/ui/ui.cpp:2114
 #, c-format
 msgid "%1$d%%"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2180
+#: src/emu/ui/ui.cpp:2130
 #, c-format
 msgid "%1$3.0f%%"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2203
+#: src/emu/ui/ui.cpp:2153
 #, c-format
 msgid "%1$.3ffps"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2226 src/emu/ui/ui.cpp:2248 src/emu/ui/ui.cpp:2269
+#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219
-#: src/emu/ui/ui.cpp:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335
+#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285
-#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401
+#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351
-#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445
+#: src/emu/ui/ui.cpp:2373 src/emu/ui/ui.cpp:2395
 #, c-format
 msgid "%1$.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2461 src/emu/ui/ui.cpp:2477 src/emu/ui/ui.cpp:2493
+#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443
-#: src/emu/ui/ui.cpp:2509
+#: src/emu/ui/ui.cpp:2459
 #, c-format
 msgid "%1$1.2f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2525
+#: src/emu/ui/ui.cpp:2475
 #, c-format
 msgid "Screen '%1$s'"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2527
+#: src/emu/ui/ui.cpp:2477
 msgid "Screen"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2543
+#: src/emu/ui/ui.cpp:2493
 #, c-format
 msgid "Crosshair Scale X %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2543
+#: src/emu/ui/ui.cpp:2493
 #, c-format
 msgid "Crosshair Scale Y %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2562
+#: src/emu/ui/ui.cpp:2512
 #, c-format
 msgid "Crosshair Offset X %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2562
+#: src/emu/ui/ui.cpp:2512
 #, c-format
 msgid "Crosshair Offset Y %1$1.3f"
 msgstr ""

language/Arabic/strings.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-25 23:59+0100\n"
+"POT-Creation-Date: 2016-03-28 09:02+0200\n"
 "PO-Revision-Date: 2016-02-20 18:03+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: MAME Language Team\n"
@@ -59,14 +59,14 @@ msgstr ""
 msgid "Autofire Status"
 msgstr ""
 
-#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742
+#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
 msgid "Disabled"
 msgstr ""
 
-#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742
+#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
@@ -642,11 +642,11 @@ msgstr ""
 msgid "Display Options"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:159
+#: src/emu/ui/filesel.cpp:161
 msgid "File Already Exists - Override?"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1560
+#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1560
 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562
 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564
 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566
@@ -654,7 +654,7 @@ msgstr ""
 msgid "No"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:162 src/emu/ui/selgame.cpp:1560
+#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1560
 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562
 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564
 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566
@@ -662,55 +662,55 @@ msgstr ""
 msgid "Yes"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:271
+#: src/emu/ui/filesel.cpp:275
 msgid "New Image Name:"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:277
+#: src/emu/ui/filesel.cpp:281
 msgid "Image Format:"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:283
+#: src/emu/ui/filesel.cpp:287
 msgid "Create"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:314
+#: src/emu/ui/filesel.cpp:318
 msgid "Please enter a file extension too"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:502 src/emu/ui/swlist.cpp:65
+#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65
 msgid "[empty slot]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:506
+#: src/emu/ui/filesel.cpp:510
 msgid "[create]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:510 src/emu/ui/swlist.cpp:76
+#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76
 msgid "[software list]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:802
+#: src/emu/ui/filesel.cpp:806
 msgid "Select image format"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:862
+#: src/emu/ui/filesel.cpp:866
 msgid "Select access mode"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:863
+#: src/emu/ui/filesel.cpp:867
 msgid "Read-only"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:865
+#: src/emu/ui/filesel.cpp:869
 msgid "Read-write"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:866
+#: src/emu/ui/filesel.cpp:870
 msgid "Read this image, write to another image"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:867
+#: src/emu/ui/filesel.cpp:871
 msgid "Read this image, write to diff"
 msgstr ""
 
@@ -1571,92 +1571,80 @@ msgstr ""
 msgid "Fast Forward"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:415
+#: src/emu/ui/ui.cpp:410
 msgid "This driver requires images to be loaded in the following device(s): "
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1043
+#: src/emu/ui/ui.cpp:1060
-#, c-format
-msgid ""
-"Usage of emulators in conjunction with ROMs you don't own is forbidden by "
-"copyright law.\n"
-"\n"
-"IF YOU ARE NOT LEGALLY ENTITLED TO PLAY \"%1$s\" ON THIS EMULATOR, PRESS "
-"ESC.\n"
-"\n"
-"Otherwise, type OK or move the joystick left then right to continue"
-msgstr ""
-
-#: src/emu/ui/ui.cpp:1081
 msgid ""
 "One or more ROMs/CHDs for this machine are incorrect. The machine may not "
 "run correctly.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1094
+#: src/emu/ui/ui.cpp:1073
 msgid ""
 "There are known problems with this machine\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1098
+#: src/emu/ui/ui.cpp:1077
 msgid ""
 "One or more ROMs/CHDs for this machine have not been correctly dumped.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1102
+#: src/emu/ui/ui.cpp:1081
 #, c-format
 msgid "The keyboard emulation may not be 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1104
+#: src/emu/ui/ui.cpp:1083
 #, c-format
 msgid "The colors aren't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1106
+#: src/emu/ui/ui.cpp:1085
 msgid "The colors are completely wrong.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1108
+#: src/emu/ui/ui.cpp:1087
 #, c-format
 msgid "The video emulation isn't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1110
+#: src/emu/ui/ui.cpp:1089
 #, c-format
 msgid "The sound emulation isn't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1112
+#: src/emu/ui/ui.cpp:1091
 msgid "The machine lacks sound.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1115
+#: src/emu/ui/ui.cpp:1094
 msgid "Screen flipping in cocktail mode is not supported.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1119
+#: src/emu/ui/ui.cpp:1098
 msgid "The machine requires external artwork files\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1124
+#: src/emu/ui/ui.cpp:1103
 msgid ""
 "This machine was never completed. It may exhibit strange behavior or missing "
 "elements that are not bugs in the emulation.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1129
+#: src/emu/ui/ui.cpp:1108
 msgid ""
 "This machine has no sound hardware, MAME will produce no sounds, this is "
 "expected behaviour.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1137
+#: src/emu/ui/ui.cpp:1116
 msgid "The machine has protection which isn't fully emulated.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1140
+#: src/emu/ui/ui.cpp:1119
 msgid ""
 "\n"
 "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet "
@@ -1664,7 +1652,7 @@ msgid ""
 "the developers to improve the emulation.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1144
+#: src/emu/ui/ui.cpp:1123
 msgid ""
 "\n"
 "Certain elements of this machine cannot be emulated as it requires actual "
@@ -1672,21 +1660,21 @@ msgid ""
 "to fully play this machine.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1163
+#: src/emu/ui/ui.cpp:1142
 msgid ""
 "\n"
 "\n"
 "There are working clones of this machine: "
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1177
+#: src/emu/ui/ui.cpp:1156
 msgid ""
 "\n"
 "\n"
-"Type OK or move the joystick left then right to continue"
+"Press any key to continue"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1192
+#: src/emu/ui/ui.cpp:1171
 #, c-format
 msgid ""
 "%1$s\n"
@@ -1696,98 +1684,98 @@ msgid ""
 "CPU:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267
+#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246
 msgid "MHz"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267
+#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246
 msgid "kHz"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1242
+#: src/emu/ui/ui.cpp:1221
 msgid ""
 "\n"
 "Sound:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1271
+#: src/emu/ui/ui.cpp:1250
 msgid ""
 "\n"
 "Video:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1275
+#: src/emu/ui/ui.cpp:1254
 msgid "None\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1282
+#: src/emu/ui/ui.cpp:1261
 msgid "Vector"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1293
+#: src/emu/ui/ui.cpp:1272
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1293
+#: src/emu/ui/ui.cpp:1272
 msgid "%2$s\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1577 src/emu/ui/ui.cpp:1587
+#: src/emu/ui/ui.cpp:1527 src/emu/ui/ui.cpp:1537
 msgid "Keyboard Emulation Status"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1579
+#: src/emu/ui/ui.cpp:1529
 msgid "Mode: PARTIAL Emulation"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1580
+#: src/emu/ui/ui.cpp:1530
 msgid "UI:   Enabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1582 src/emu/ui/ui.cpp:1592
+#: src/emu/ui/ui.cpp:1532 src/emu/ui/ui.cpp:1542
 msgid "**Use ScrLock to toggle**"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1589
+#: src/emu/ui/ui.cpp:1539
 msgid "Mode: FULL Emulation"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1590
+#: src/emu/ui/ui.cpp:1540
 msgid "UI:   Disabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1736
+#: src/emu/ui/ui.cpp:1686
 msgid "Autofire can't be enabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1775
+#: src/emu/ui/ui.cpp:1725
 msgid "Select position to save to"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1777
+#: src/emu/ui/ui.cpp:1727
 msgid "Select position to load from"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1801
+#: src/emu/ui/ui.cpp:1751
 msgid "Save cancelled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1803
+#: src/emu/ui/ui.cpp:1753
 msgid "Load cancelled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1846
+#: src/emu/ui/ui.cpp:1796
 #, c-format
 msgid "Save to position %s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1851
+#: src/emu/ui/ui.cpp:1801
 #, c-format
 msgid "Load from position %s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1891
+#: src/emu/ui/ui.cpp:1841
 #, c-format
 msgid ""
 "Are you sure you want to quit?\n"
@@ -1796,173 +1784,173 @@ msgid ""
 "Press ''%2$s'' to return to emulation."
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1966
+#: src/emu/ui/ui.cpp:1916
 msgid "Master Volume"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1976
+#: src/emu/ui/ui.cpp:1926
 #, c-format
 msgid "%1$s Volume"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1998
+#: src/emu/ui/ui.cpp:1948
 #, c-format
 msgid "Overclock CPU %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2018
+#: src/emu/ui/ui.cpp:1968
 #, c-format
 msgid "%1$s Refresh Rate"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2024
+#: src/emu/ui/ui.cpp:1974
 #, c-format
 msgid "%1$s Brightness"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2027
+#: src/emu/ui/ui.cpp:1977
 #, c-format
 msgid "%1$s Contrast"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2030
+#: src/emu/ui/ui.cpp:1980
 #, c-format
 msgid "%1$s Gamma"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2035
+#: src/emu/ui/ui.cpp:1985
 #, c-format
 msgid "%1$s Horiz Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2038
+#: src/emu/ui/ui.cpp:1988
 #, c-format
 msgid "%1$s Horiz Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2041
+#: src/emu/ui/ui.cpp:1991
 #, c-format
 msgid "%1$s Vert Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2044
+#: src/emu/ui/ui.cpp:1994
 #, c-format
 msgid "%1$s Vert Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2062
+#: src/emu/ui/ui.cpp:2012
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2065
+#: src/emu/ui/ui.cpp:2015
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2068
+#: src/emu/ui/ui.cpp:2018
 #, c-format
 msgid "Laserdisc '%1$s' Vert Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2071
+#: src/emu/ui/ui.cpp:2021
 #, c-format
 msgid "Laserdisc '%1$s' Vert Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2080
+#: src/emu/ui/ui.cpp:2030
 msgid "Vector Flicker"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2082
+#: src/emu/ui/ui.cpp:2032
 msgid "Beam Width Minimum"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2084
+#: src/emu/ui/ui.cpp:2034
 msgid "Beam Width Maximum"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2086
+#: src/emu/ui/ui.cpp:2036
 msgid "Beam Intensity Weight"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2098
+#: src/emu/ui/ui.cpp:2048
 #, c-format
 msgid "Crosshair Scale %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101
+#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051
 msgid "X"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101
+#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051
 msgid "Y"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2101
+#: src/emu/ui/ui.cpp:2051
 #, c-format
 msgid "Crosshair Offset %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2120
+#: src/emu/ui/ui.cpp:2070
 #, c-format
 msgid "%1$3ddB"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2164
+#: src/emu/ui/ui.cpp:2114
 #, c-format
 msgid "%1$d%%"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2180
+#: src/emu/ui/ui.cpp:2130
 #, c-format
 msgid "%1$3.0f%%"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2203
+#: src/emu/ui/ui.cpp:2153
 #, c-format
 msgid "%1$.3ffps"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2226 src/emu/ui/ui.cpp:2248 src/emu/ui/ui.cpp:2269
+#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219
-#: src/emu/ui/ui.cpp:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335
+#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285
-#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401
+#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351
-#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445
+#: src/emu/ui/ui.cpp:2373 src/emu/ui/ui.cpp:2395
 #, c-format
 msgid "%1$.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2461 src/emu/ui/ui.cpp:2477 src/emu/ui/ui.cpp:2493
+#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443
-#: src/emu/ui/ui.cpp:2509
+#: src/emu/ui/ui.cpp:2459
 #, c-format
 msgid "%1$1.2f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2525
+#: src/emu/ui/ui.cpp:2475
 #, c-format
 msgid "Screen '%1$s'"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2527
+#: src/emu/ui/ui.cpp:2477
 msgid "Screen"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2543
+#: src/emu/ui/ui.cpp:2493
 #, c-format
 msgid "Crosshair Scale X %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2543
+#: src/emu/ui/ui.cpp:2493
 #, c-format
 msgid "Crosshair Scale Y %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2562
+#: src/emu/ui/ui.cpp:2512
 #, c-format
 msgid "Crosshair Offset X %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2562
+#: src/emu/ui/ui.cpp:2512
 #, c-format
 msgid "Crosshair Offset Y %1$1.3f"
 msgstr ""

language/Basque/strings.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-25 23:59+0100\n"
+"POT-Creation-Date: 2016-03-28 09:02+0200\n"
 "PO-Revision-Date: 2016-02-20 18:03+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: MAME Language Team\n"
@@ -60,14 +60,14 @@ msgstr ""
 msgid "Autofire Status"
 msgstr ""
 
-#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742
+#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
 msgid "Disabled"
 msgstr ""
 
-#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742
+#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
@@ -643,11 +643,11 @@ msgstr ""
 msgid "Display Options"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:159
+#: src/emu/ui/filesel.cpp:161
 msgid "File Already Exists - Override?"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1560
+#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1560
 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562
 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564
 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566
@@ -655,7 +655,7 @@ msgstr ""
 msgid "No"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:162 src/emu/ui/selgame.cpp:1560
+#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1560
 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562
 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564
 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566
@@ -663,55 +663,55 @@ msgstr ""
 msgid "Yes"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:271
+#: src/emu/ui/filesel.cpp:275
 msgid "New Image Name:"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:277
+#: src/emu/ui/filesel.cpp:281
 msgid "Image Format:"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:283
+#: src/emu/ui/filesel.cpp:287
 msgid "Create"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:314
+#: src/emu/ui/filesel.cpp:318
 msgid "Please enter a file extension too"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:502 src/emu/ui/swlist.cpp:65
+#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65
 msgid "[empty slot]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:506
+#: src/emu/ui/filesel.cpp:510
 msgid "[create]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:510 src/emu/ui/swlist.cpp:76
+#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76
 msgid "[software list]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:802
+#: src/emu/ui/filesel.cpp:806
 msgid "Select image format"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:862
+#: src/emu/ui/filesel.cpp:866
 msgid "Select access mode"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:863
+#: src/emu/ui/filesel.cpp:867
 msgid "Read-only"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:865
+#: src/emu/ui/filesel.cpp:869
 msgid "Read-write"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:866
+#: src/emu/ui/filesel.cpp:870
 msgid "Read this image, write to another image"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:867
+#: src/emu/ui/filesel.cpp:871
 msgid "Read this image, write to diff"
 msgstr ""
 
@@ -1572,92 +1572,80 @@ msgstr ""
 msgid "Fast Forward"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:415
+#: src/emu/ui/ui.cpp:410
 msgid "This driver requires images to be loaded in the following device(s): "
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1043
+#: src/emu/ui/ui.cpp:1060
-#, c-format
-msgid ""
-"Usage of emulators in conjunction with ROMs you don't own is forbidden by "
-"copyright law.\n"
-"\n"
-"IF YOU ARE NOT LEGALLY ENTITLED TO PLAY \"%1$s\" ON THIS EMULATOR, PRESS "
-"ESC.\n"
-"\n"
-"Otherwise, type OK or move the joystick left then right to continue"
-msgstr ""
-
-#: src/emu/ui/ui.cpp:1081
 msgid ""
 "One or more ROMs/CHDs for this machine are incorrect. The machine may not "
 "run correctly.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1094
+#: src/emu/ui/ui.cpp:1073
 msgid ""
 "There are known problems with this machine\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1098
+#: src/emu/ui/ui.cpp:1077
 msgid ""
 "One or more ROMs/CHDs for this machine have not been correctly dumped.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1102
+#: src/emu/ui/ui.cpp:1081
 #, c-format
 msgid "The keyboard emulation may not be 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1104
+#: src/emu/ui/ui.cpp:1083
 #, c-format
 msgid "The colors aren't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1106
+#: src/emu/ui/ui.cpp:1085
 msgid "The colors are completely wrong.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1108
+#: src/emu/ui/ui.cpp:1087
 #, c-format
 msgid "The video emulation isn't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1110
+#: src/emu/ui/ui.cpp:1089
 #, c-format
 msgid "The sound emulation isn't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1112
+#: src/emu/ui/ui.cpp:1091
 msgid "The machine lacks sound.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1115
+#: src/emu/ui/ui.cpp:1094
 msgid "Screen flipping in cocktail mode is not supported.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1119
+#: src/emu/ui/ui.cpp:1098
 msgid "The machine requires external artwork files\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1124
+#: src/emu/ui/ui.cpp:1103
 msgid ""
 "This machine was never completed. It may exhibit strange behavior or missing "
 "elements that are not bugs in the emulation.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1129
+#: src/emu/ui/ui.cpp:1108
 msgid ""
 "This machine has no sound hardware, MAME will produce no sounds, this is "
 "expected behaviour.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1137
+#: src/emu/ui/ui.cpp:1116
 msgid "The machine has protection which isn't fully emulated.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1140
+#: src/emu/ui/ui.cpp:1119
 msgid ""
 "\n"
 "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet "
@@ -1665,7 +1653,7 @@ msgid ""
 "the developers to improve the emulation.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1144
+#: src/emu/ui/ui.cpp:1123
 msgid ""
 "\n"
 "Certain elements of this machine cannot be emulated as it requires actual "
@@ -1673,21 +1661,21 @@ msgid ""
 "to fully play this machine.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1163
+#: src/emu/ui/ui.cpp:1142
 msgid ""
 "\n"
 "\n"
 "There are working clones of this machine: "
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1177
+#: src/emu/ui/ui.cpp:1156
 msgid ""
 "\n"
 "\n"
-"Type OK or move the joystick left then right to continue"
+"Press any key to continue"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1192
+#: src/emu/ui/ui.cpp:1171
 #, c-format
 msgid ""
 "%1$s\n"
@@ -1697,98 +1685,98 @@ msgid ""
 "CPU:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267
+#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246
 msgid "MHz"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267
+#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246
 msgid "kHz"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1242
+#: src/emu/ui/ui.cpp:1221
 msgid ""
 "\n"
 "Sound:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1271
+#: src/emu/ui/ui.cpp:1250
 msgid ""
 "\n"
 "Video:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1275
+#: src/emu/ui/ui.cpp:1254
 msgid "None\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1282
+#: src/emu/ui/ui.cpp:1261
 msgid "Vector"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1293
+#: src/emu/ui/ui.cpp:1272
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1293
+#: src/emu/ui/ui.cpp:1272
 msgid "%2$s\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1577 src/emu/ui/ui.cpp:1587
+#: src/emu/ui/ui.cpp:1527 src/emu/ui/ui.cpp:1537
 msgid "Keyboard Emulation Status"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1579
+#: src/emu/ui/ui.cpp:1529
 msgid "Mode: PARTIAL Emulation"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1580
+#: src/emu/ui/ui.cpp:1530
 msgid "UI:   Enabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1582 src/emu/ui/ui.cpp:1592
+#: src/emu/ui/ui.cpp:1532 src/emu/ui/ui.cpp:1542
 msgid "**Use ScrLock to toggle**"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1589
+#: src/emu/ui/ui.cpp:1539
 msgid "Mode: FULL Emulation"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1590
+#: src/emu/ui/ui.cpp:1540
 msgid "UI:   Disabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1736
+#: src/emu/ui/ui.cpp:1686
 msgid "Autofire can't be enabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1775
+#: src/emu/ui/ui.cpp:1725
 msgid "Select position to save to"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1777
+#: src/emu/ui/ui.cpp:1727
 msgid "Select position to load from"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1801
+#: src/emu/ui/ui.cpp:1751
 msgid "Save cancelled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1803
+#: src/emu/ui/ui.cpp:1753
 msgid "Load cancelled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1846
+#: src/emu/ui/ui.cpp:1796
 #, c-format
 msgid "Save to position %s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1851
+#: src/emu/ui/ui.cpp:1801
 #, c-format
 msgid "Load from position %s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1891
+#: src/emu/ui/ui.cpp:1841
 #, c-format
 msgid ""
 "Are you sure you want to quit?\n"
@@ -1797,173 +1785,173 @@ msgid ""
 "Press ''%2$s'' to return to emulation."
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1966
+#: src/emu/ui/ui.cpp:1916
 msgid "Master Volume"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1976
+#: src/emu/ui/ui.cpp:1926
 #, c-format
 msgid "%1$s Volume"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1998
+#: src/emu/ui/ui.cpp:1948
 #, c-format
 msgid "Overclock CPU %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2018
+#: src/emu/ui/ui.cpp:1968
 #, c-format
 msgid "%1$s Refresh Rate"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2024
+#: src/emu/ui/ui.cpp:1974
 #, c-format
 msgid "%1$s Brightness"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2027
+#: src/emu/ui/ui.cpp:1977
 #, c-format
 msgid "%1$s Contrast"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2030
+#: src/emu/ui/ui.cpp:1980
 #, c-format
 msgid "%1$s Gamma"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2035
+#: src/emu/ui/ui.cpp:1985
 #, c-format
 msgid "%1$s Horiz Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2038
+#: src/emu/ui/ui.cpp:1988
 #, c-format
 msgid "%1$s Horiz Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2041
+#: src/emu/ui/ui.cpp:1991
 #, c-format
 msgid "%1$s Vert Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2044
+#: src/emu/ui/ui.cpp:1994
 #, c-format
 msgid "%1$s Vert Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2062
+#: src/emu/ui/ui.cpp:2012
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2065
+#: src/emu/ui/ui.cpp:2015
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2068
+#: src/emu/ui/ui.cpp:2018
 #, c-format
 msgid "Laserdisc '%1$s' Vert Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2071
+#: src/emu/ui/ui.cpp:2021
 #, c-format
 msgid "Laserdisc '%1$s' Vert Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2080
+#: src/emu/ui/ui.cpp:2030
 msgid "Vector Flicker"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2082
+#: src/emu/ui/ui.cpp:2032
 msgid "Beam Width Minimum"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2084
+#: src/emu/ui/ui.cpp:2034
 msgid "Beam Width Maximum"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2086
+#: src/emu/ui/ui.cpp:2036
 msgid "Beam Intensity Weight"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2098
+#: src/emu/ui/ui.cpp:2048
 #, c-format
 msgid "Crosshair Scale %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101
+#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051
 msgid "X"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101
+#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051
 msgid "Y"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2101
+#: src/emu/ui/ui.cpp:2051
 #, c-format
 msgid "Crosshair Offset %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2120
+#: src/emu/ui/ui.cpp:2070
 #, c-format
 msgid "%1$3ddB"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2164
+#: src/emu/ui/ui.cpp:2114
 #, c-format
 msgid "%1$d%%"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2180
+#: src/emu/ui/ui.cpp:2130
 #, c-format
 msgid "%1$3.0f%%"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2203
+#: src/emu/ui/ui.cpp:2153
 #, c-format
 msgid "%1$.3ffps"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2226 src/emu/ui/ui.cpp:2248 src/emu/ui/ui.cpp:2269
+#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219
-#: src/emu/ui/ui.cpp:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335
+#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285
-#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401
+#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351
-#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445
+#: src/emu/ui/ui.cpp:2373 src/emu/ui/ui.cpp:2395
 #, c-format
 msgid "%1$.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2461 src/emu/ui/ui.cpp:2477 src/emu/ui/ui.cpp:2493
+#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443
-#: src/emu/ui/ui.cpp:2509
+#: src/emu/ui/ui.cpp:2459
 #, c-format
 msgid "%1$1.2f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2525
+#: src/emu/ui/ui.cpp:2475
 #, c-format
 msgid "Screen '%1$s'"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2527
+#: src/emu/ui/ui.cpp:2477
 msgid "Screen"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2543
+#: src/emu/ui/ui.cpp:2493
 #, c-format
 msgid "Crosshair Scale X %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2543
+#: src/emu/ui/ui.cpp:2493
 #, c-format
 msgid "Crosshair Scale Y %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2562
+#: src/emu/ui/ui.cpp:2512
 #, c-format
 msgid "Crosshair Offset X %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2562
+#: src/emu/ui/ui.cpp:2512
 #, c-format
 msgid "Crosshair Offset Y %1$1.3f"
 msgstr ""

language/Belarusian/strings.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-25 23:59+0100\n"
+"POT-Creation-Date: 2016-03-28 09:02+0200\n"
 "PO-Revision-Date: 2016-02-20 18:03+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: MAME Language Team\n"
@@ -62,14 +62,14 @@ msgstr ""
 msgid "Autofire Status"
 msgstr ""
 
-#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742
+#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
 msgid "Disabled"
 msgstr ""
 
-#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1742
+#: src/emu/ui/cheatopt.cpp:258 src/emu/ui/ui.cpp:1692
 #: src/emu/ui/videoopt.cpp:207 src/emu/ui/videoopt.cpp:211
 #: src/emu/ui/videoopt.cpp:215 src/emu/ui/videoopt.cpp:219
 #: src/emu/ui/videoopt.cpp:223
@@ -645,11 +645,11 @@ msgstr ""
 msgid "Display Options"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:159
+#: src/emu/ui/filesel.cpp:161
 msgid "File Already Exists - Override?"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:161 src/emu/ui/selgame.cpp:1560
+#: src/emu/ui/filesel.cpp:163 src/emu/ui/selgame.cpp:1560
 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562
 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564
 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566
@@ -657,7 +657,7 @@ msgstr ""
 msgid "No"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:162 src/emu/ui/selgame.cpp:1560
+#: src/emu/ui/filesel.cpp:164 src/emu/ui/selgame.cpp:1560
 #: src/emu/ui/selgame.cpp:1561 src/emu/ui/selgame.cpp:1562
 #: src/emu/ui/selgame.cpp:1563 src/emu/ui/selgame.cpp:1564
 #: src/emu/ui/selgame.cpp:1565 src/emu/ui/selgame.cpp:1566
@@ -665,55 +665,55 @@ msgstr ""
 msgid "Yes"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:271
+#: src/emu/ui/filesel.cpp:275
 msgid "New Image Name:"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:277
+#: src/emu/ui/filesel.cpp:281
 msgid "Image Format:"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:283
+#: src/emu/ui/filesel.cpp:287
 msgid "Create"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:314
+#: src/emu/ui/filesel.cpp:318
 msgid "Please enter a file extension too"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:502 src/emu/ui/swlist.cpp:65
+#: src/emu/ui/filesel.cpp:506 src/emu/ui/swlist.cpp:65
 msgid "[empty slot]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:506
+#: src/emu/ui/filesel.cpp:510
 msgid "[create]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:510 src/emu/ui/swlist.cpp:76
+#: src/emu/ui/filesel.cpp:514 src/emu/ui/swlist.cpp:76
 msgid "[software list]"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:802
+#: src/emu/ui/filesel.cpp:806
 msgid "Select image format"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:862
+#: src/emu/ui/filesel.cpp:866
 msgid "Select access mode"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:863
+#: src/emu/ui/filesel.cpp:867
 msgid "Read-only"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:865
+#: src/emu/ui/filesel.cpp:869
 msgid "Read-write"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:866
+#: src/emu/ui/filesel.cpp:870
 msgid "Read this image, write to another image"
 msgstr ""
 
-#: src/emu/ui/filesel.cpp:867
+#: src/emu/ui/filesel.cpp:871
 msgid "Read this image, write to diff"
 msgstr ""
 
@@ -1574,92 +1574,80 @@ msgstr ""
 msgid "Fast Forward"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:415
+#: src/emu/ui/ui.cpp:410
 msgid "This driver requires images to be loaded in the following device(s): "
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1043
+#: src/emu/ui/ui.cpp:1060
-#, c-format
-msgid ""
-"Usage of emulators in conjunction with ROMs you don't own is forbidden by "
-"copyright law.\n"
-"\n"
-"IF YOU ARE NOT LEGALLY ENTITLED TO PLAY \"%1$s\" ON THIS EMULATOR, PRESS "
-"ESC.\n"
-"\n"
-"Otherwise, type OK or move the joystick left then right to continue"
-msgstr ""
-
-#: src/emu/ui/ui.cpp:1081
 msgid ""
 "One or more ROMs/CHDs for this machine are incorrect. The machine may not "
 "run correctly.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1094
+#: src/emu/ui/ui.cpp:1073
 msgid ""
 "There are known problems with this machine\n"
 "\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1098
+#: src/emu/ui/ui.cpp:1077
 msgid ""
 "One or more ROMs/CHDs for this machine have not been correctly dumped.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1102
+#: src/emu/ui/ui.cpp:1081
 #, c-format
 msgid "The keyboard emulation may not be 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1104
+#: src/emu/ui/ui.cpp:1083
 #, c-format
 msgid "The colors aren't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1106
+#: src/emu/ui/ui.cpp:1085
 msgid "The colors are completely wrong.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1108
+#: src/emu/ui/ui.cpp:1087
 #, c-format
 msgid "The video emulation isn't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1110
+#: src/emu/ui/ui.cpp:1089
 #, c-format
 msgid "The sound emulation isn't 100% accurate.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1112
+#: src/emu/ui/ui.cpp:1091
 msgid "The machine lacks sound.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1115
+#: src/emu/ui/ui.cpp:1094
 msgid "Screen flipping in cocktail mode is not supported.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1119
+#: src/emu/ui/ui.cpp:1098
 msgid "The machine requires external artwork files\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1124
+#: src/emu/ui/ui.cpp:1103
 msgid ""
 "This machine was never completed. It may exhibit strange behavior or missing "
 "elements that are not bugs in the emulation.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1129
+#: src/emu/ui/ui.cpp:1108
 msgid ""
 "This machine has no sound hardware, MAME will produce no sounds, this is "
 "expected behaviour.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1137
+#: src/emu/ui/ui.cpp:1116
 msgid "The machine has protection which isn't fully emulated.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1140
+#: src/emu/ui/ui.cpp:1119
 msgid ""
 "\n"
 "THIS MACHINE DOESN'T WORK. The emulation for this machine is not yet "
@@ -1667,7 +1655,7 @@ msgid ""
 "the developers to improve the emulation.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1144
+#: src/emu/ui/ui.cpp:1123
 msgid ""
 "\n"
 "Certain elements of this machine cannot be emulated as it requires actual "
@@ -1675,21 +1663,21 @@ msgid ""
 "to fully play this machine.\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1163
+#: src/emu/ui/ui.cpp:1142
 msgid ""
 "\n"
 "\n"
 "There are working clones of this machine: "
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1177
+#: src/emu/ui/ui.cpp:1156
 msgid ""
 "\n"
 "\n"
-"Type OK or move the joystick left then right to continue"
+"Press any key to continue"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1192
+#: src/emu/ui/ui.cpp:1171
 #, c-format
 msgid ""
 "%1$s\n"
@@ -1699,98 +1687,98 @@ msgid ""
 "CPU:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267
+#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246
 msgid "MHz"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1228 src/emu/ui/ui.cpp:1267
+#: src/emu/ui/ui.cpp:1207 src/emu/ui/ui.cpp:1246
 msgid "kHz"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1242
+#: src/emu/ui/ui.cpp:1221
 msgid ""
 "\n"
 "Sound:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1271
+#: src/emu/ui/ui.cpp:1250
 msgid ""
 "\n"
 "Video:\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1275
+#: src/emu/ui/ui.cpp:1254
 msgid "None\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1282
+#: src/emu/ui/ui.cpp:1261
 msgid "Vector"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1293
+#: src/emu/ui/ui.cpp:1272
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1293
+#: src/emu/ui/ui.cpp:1272
 msgid "%2$s\n"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1577 src/emu/ui/ui.cpp:1587
+#: src/emu/ui/ui.cpp:1527 src/emu/ui/ui.cpp:1537
 msgid "Keyboard Emulation Status"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1579
+#: src/emu/ui/ui.cpp:1529
 msgid "Mode: PARTIAL Emulation"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1580
+#: src/emu/ui/ui.cpp:1530
 msgid "UI:   Enabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1582 src/emu/ui/ui.cpp:1592
+#: src/emu/ui/ui.cpp:1532 src/emu/ui/ui.cpp:1542
 msgid "**Use ScrLock to toggle**"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1589
+#: src/emu/ui/ui.cpp:1539
 msgid "Mode: FULL Emulation"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1590
+#: src/emu/ui/ui.cpp:1540
 msgid "UI:   Disabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1736
+#: src/emu/ui/ui.cpp:1686
 msgid "Autofire can't be enabled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1775
+#: src/emu/ui/ui.cpp:1725
 msgid "Select position to save to"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1777
+#: src/emu/ui/ui.cpp:1727
 msgid "Select position to load from"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1801
+#: src/emu/ui/ui.cpp:1751
 msgid "Save cancelled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1803
+#: src/emu/ui/ui.cpp:1753
 msgid "Load cancelled"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1846
+#: src/emu/ui/ui.cpp:1796
 #, c-format
 msgid "Save to position %s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1851
+#: src/emu/ui/ui.cpp:1801
 #, c-format
 msgid "Load from position %s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1891
+#: src/emu/ui/ui.cpp:1841
 #, c-format
 msgid ""
 "Are you sure you want to quit?\n"
@@ -1799,173 +1787,173 @@ msgid ""
 "Press ''%2$s'' to return to emulation."
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1966
+#: src/emu/ui/ui.cpp:1916
 msgid "Master Volume"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1976
+#: src/emu/ui/ui.cpp:1926
 #, c-format
 msgid "%1$s Volume"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:1998
+#: src/emu/ui/ui.cpp:1948
 #, c-format
 msgid "Overclock CPU %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2018
+#: src/emu/ui/ui.cpp:1968
 #, c-format
 msgid "%1$s Refresh Rate"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2024
+#: src/emu/ui/ui.cpp:1974
 #, c-format
 msgid "%1$s Brightness"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2027
+#: src/emu/ui/ui.cpp:1977
 #, c-format
 msgid "%1$s Contrast"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2030
+#: src/emu/ui/ui.cpp:1980
 #, c-format
 msgid "%1$s Gamma"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2035
+#: src/emu/ui/ui.cpp:1985
 #, c-format
 msgid "%1$s Horiz Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2038
+#: src/emu/ui/ui.cpp:1988
 #, c-format
 msgid "%1$s Horiz Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2041
+#: src/emu/ui/ui.cpp:1991
 #, c-format
 msgid "%1$s Vert Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2044
+#: src/emu/ui/ui.cpp:1994
 #, c-format
 msgid "%1$s Vert Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2062
+#: src/emu/ui/ui.cpp:2012
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2065
+#: src/emu/ui/ui.cpp:2015
 #, c-format
 msgid "Laserdisc '%1$s' Horiz Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2068
+#: src/emu/ui/ui.cpp:2018
 #, c-format
 msgid "Laserdisc '%1$s' Vert Stretch"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2071
+#: src/emu/ui/ui.cpp:2021
 #, c-format
 msgid "Laserdisc '%1$s' Vert Position"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2080
+#: src/emu/ui/ui.cpp:2030
 msgid "Vector Flicker"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2082
+#: src/emu/ui/ui.cpp:2032
 msgid "Beam Width Minimum"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2084
+#: src/emu/ui/ui.cpp:2034
 msgid "Beam Width Maximum"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2086
+#: src/emu/ui/ui.cpp:2036
 msgid "Beam Intensity Weight"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2098
+#: src/emu/ui/ui.cpp:2048
 #, c-format
 msgid "Crosshair Scale %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101
+#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051
 msgid "X"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2098 src/emu/ui/ui.cpp:2101
+#: src/emu/ui/ui.cpp:2048 src/emu/ui/ui.cpp:2051
 msgid "Y"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2101
+#: src/emu/ui/ui.cpp:2051
 #, c-format
 msgid "Crosshair Offset %1$s"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2120
+#: src/emu/ui/ui.cpp:2070
 #, c-format
 msgid "%1$3ddB"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2164
+#: src/emu/ui/ui.cpp:2114
 #, c-format
 msgid "%1$d%%"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2180
+#: src/emu/ui/ui.cpp:2130
 #, c-format
 msgid "%1$3.0f%%"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2203
+#: src/emu/ui/ui.cpp:2153
 #, c-format
 msgid "%1$.3ffps"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2226 src/emu/ui/ui.cpp:2248 src/emu/ui/ui.cpp:2269
+#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219
-#: src/emu/ui/ui.cpp:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335
+#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285
-#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401
+#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351
-#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445
+#: src/emu/ui/ui.cpp:2373 src/emu/ui/ui.cpp:2395
 #, c-format
 msgid "%1$.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2461 src/emu/ui/ui.cpp:2477 src/emu/ui/ui.cpp:2493
+#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443
-#: src/emu/ui/ui.cpp:2509
+#: src/emu/ui/ui.cpp:2459
 #, c-format
 msgid "%1$1.2f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2525
+#: src/emu/ui/ui.cpp:2475
 #, c-format
 msgid "Screen '%1$s'"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2527
+#: src/emu/ui/ui.cpp:2477
 msgid "Screen"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2543
+#: src/emu/ui/ui.cpp:2493
 #, c-format
 msgid "Crosshair Scale X %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2543
+#: src/emu/ui/ui.cpp:2493
 #, c-format
 msgid "Crosshair Scale Y %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2562
+#: src/emu/ui/ui.cpp:2512
 #, c-format
 msgid "Crosshair Offset X %1$1.3f"
 msgstr ""
 
-#: src/emu/ui/ui.cpp:2562
+#: src/emu/ui/ui.cpp:2512
 #, c-format
 msgid "Crosshair Offset Y %1$1.3f"
 msgstr ""