summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rw-r--r--3rdparty/libjpeg/jconfig.h1
-rw-r--r--README.md6
-rw-r--r--android-project/.gitignore7
-rw-r--r--android-project/app/build.gradle29
-rw-r--r--android-project/app/src/main/AndroidManifest.xml53
-rw-r--r--android-project/app/src/main/java/org/libsdl/app/SDLActivity.java1661
-rw-r--r--android-project/app/src/main/java/org/mamedev/mame/MAME.java9
-rw-r--r--android-project/app/src/main/libs/arm64-v8a/.gitignore1
-rw-r--r--android-project/app/src/main/libs/armeabi-v7a/.gitignore1
-rw-r--r--android-project/app/src/main/libs/mips/.gitignore1
-rw-r--r--android-project/app/src/main/libs/mips64/.gitignore1
-rw-r--r--android-project/app/src/main/libs/x86/.gitignore1
-rw-r--r--android-project/app/src/main/libs/x86_64/.gitignore1
-rw-r--r--android-project/app/src/main/res/drawable-hdpi/ic_launcher.pngbin0 -> 2683 bytes
-rw-r--r--android-project/app/src/main/res/drawable-mdpi/ic_launcher.pngbin0 -> 1698 bytes
-rw-r--r--android-project/app/src/main/res/drawable-xhdpi/ic_launcher.pngbin0 -> 3872 bytes
-rw-r--r--android-project/app/src/main/res/drawable-xxhdpi/ic_launcher.pngbin0 -> 6874 bytes
-rw-r--r--android-project/app/src/main/res/layout/main.xml13
-rw-r--r--android-project/app/src/main/res/values/strings.xml4
-rw-r--r--android-project/build.gradle15
-rw-r--r--android-project/gradle/wrapper/gradle-wrapper.jarbin0 -> 49896 bytes
-rw-r--r--android-project/gradle/wrapper/gradle-wrapper.properties6
-rw-r--r--android-project/gradlew164
-rw-r--r--android-project/gradlew.bat90
-rw-r--r--android-project/settings.gradle1
-rw-r--r--bgfx/chains/hlsl.json48
-rw-r--r--hash/sms.xml105
-rw-r--r--language/Afrikaans/strings.po214
-rw-r--r--language/Albanian/strings.po214
-rw-r--r--language/Arabic/strings.po214
-rw-r--r--language/Basque/strings.po214
-rw-r--r--language/Belarusian/strings.po214
-rw-r--r--language/Bosnian/strings.po214
-rw-r--r--language/Bulgarian/strings.po214
-rw-r--r--language/Burmese/strings.po214
-rw-r--r--language/Catalan/strings.po214
-rw-r--r--language/Chinese_Simplified/strings.po226
-rw-r--r--language/Chinese_Traditional/strings.po223
-rw-r--r--language/Croatian/strings.po214
-rw-r--r--language/Czech/strings.po214
-rw-r--r--language/Danish/strings.po214
-rw-r--r--language/Dutch/strings.po395
-rw-r--r--language/English/strings.po214
-rw-r--r--language/Estonian/strings.po214
-rw-r--r--language/Finnish/strings.po214
-rw-r--r--language/French/strings.po251
-rw-r--r--language/French_Belgium/strings.po250
-rw-r--r--language/French_Canada/strings.po214
-rw-r--r--language/Georgian/strings.po214
-rw-r--r--language/German/strings.po261
-rw-r--r--language/Greek/strings.po263
-rw-r--r--language/Hebrew/strings.po214
-rw-r--r--language/Hindi/strings.po214
-rw-r--r--language/Hungarian/strings.po214
-rw-r--r--language/Indonesian/strings.po214
-rw-r--r--language/Italian/strings.po253
-rw-r--r--language/Japanese/strings.po250
-rw-r--r--language/Korean/strings.po214
-rw-r--r--language/Latvian/strings.po214
-rw-r--r--language/Lithuanian/strings.po214
-rw-r--r--language/Macedonian/strings.po214
-rw-r--r--language/Norwegian/strings.po214
-rw-r--r--language/Persian/strings.po214
-rw-r--r--language/Polish/strings.po214
-rw-r--r--language/Portuguese/strings.po214
-rw-r--r--language/Portuguese_Brazil/strings.po248
-rw-r--r--language/Romanian/strings.po214
-rw-r--r--language/Russian/strings.po227
-rw-r--r--language/Serbian/strings.po254
-rw-r--r--language/Serbian_Cyrillic/strings.po254
-rw-r--r--language/Slovak/strings.po214
-rw-r--r--language/Slovenian/strings.po214
-rw-r--r--language/Spanish/strings.po248
-rw-r--r--language/Spanish_Mexico/strings.po214
-rw-r--r--language/Swedish/strings.po214
-rw-r--r--language/Thai/strings.po214
-rw-r--r--language/Turkish/strings.po214
-rw-r--r--language/Ukrainian/strings.po214
-rw-r--r--language/Vietnamese/strings.po214
-rw-r--r--makefile63
-rw-r--r--nl_examples/kidniki.c28
-rw-r--r--plugins/hiscore/hiscore.dat6
-rw-r--r--plugins/hiscore/init.lua21
-rw-r--r--scripts/src/3rdparty.lua39
-rw-r--r--scripts/src/bus.lua2
-rw-r--r--scripts/src/main.lua40
-rw-r--r--scripts/src/netlist.lua1
-rw-r--r--scripts/src/osd/modules.lua6
-rw-r--r--scripts/src/osd/sdl.lua8
-rw-r--r--scripts/target/mame/arcade.lua2
-rw-r--r--src/devices/bus/a2bus/pc_xporter.cpp255
-rw-r--r--src/devices/bus/a2bus/pc_xporter.h53
-rw-r--r--src/devices/bus/coleco/exp.cpp2
-rw-r--r--src/devices/bus/coleco/exp.h2
-rw-r--r--src/devices/bus/megadrive/md_slot.cpp2
-rw-r--r--src/devices/bus/sms_ctrl/joypad.cpp17
-rw-r--r--src/devices/bus/sms_ctrl/joypad.h2
-rw-r--r--src/devices/bus/sms_ctrl/lphaser.cpp8
-rw-r--r--src/devices/bus/sms_ctrl/paddle.cpp19
-rw-r--r--src/devices/bus/sms_ctrl/paddle.h2
-rw-r--r--src/devices/bus/sms_ctrl/rfu.cpp18
-rw-r--r--src/devices/bus/sms_ctrl/rfu.h2
-rw-r--r--src/devices/bus/sms_ctrl/sports.cpp58
-rw-r--r--src/devices/bus/sms_ctrl/sportsjp.cpp23
-rw-r--r--src/devices/bus/sms_exp/gender.cpp14
-rw-r--r--src/devices/cpu/sm510/sm510op.cpp2
-rw-r--r--src/emu/emuopts.cpp55
-rw-r--r--src/emu/luaengine.cpp11
-rw-r--r--src/emu/luaengine.h1
-rw-r--r--src/emu/machine.cpp2
-rw-r--r--src/emu/mame.cpp33
-rw-r--r--src/emu/rendlay.cpp6
-rw-r--r--src/emu/rendutil.cpp85
-rw-r--r--src/emu/rendutil.h1
-rw-r--r--src/emu/ui/sliders.cpp19
-rw-r--r--src/emu/ui/ui.cpp66
-rw-r--r--src/emu/ui/ui.h4
-rw-r--r--src/emu/ui/utils.h88
-rw-r--r--src/lib/netlist/devices/nld_mm5837.cpp2
-rw-r--r--src/lib/netlist/devices/nld_system.cpp1
-rw-r--r--src/lib/netlist/macro/nlm_ttl74xx.cpp2
-rw-r--r--src/lib/netlist/nl_base.cpp5
-rw-r--r--src/lib/netlist/nl_base.h22
-rw-r--r--src/lib/netlist/nl_util.h4
-rw-r--r--src/lib/netlist/plib/pfmtlog.h4
-rw-r--r--src/lib/netlist/solver/nld_matrix_solver.h144
-rw-r--r--src/lib/netlist/solver/nld_ms_direct.h222
-rw-r--r--src/lib/netlist/solver/nld_ms_direct1.h38
-rw-r--r--src/lib/netlist/solver/nld_ms_direct2.h20
-rw-r--r--src/lib/netlist/solver/nld_ms_direct_lu.h53
-rw-r--r--src/lib/netlist/solver/nld_ms_gmres.h44
-rw-r--r--src/lib/netlist/solver/nld_ms_sm.h674
-rw-r--r--src/lib/netlist/solver/nld_ms_sor.h13
-rw-r--r--src/lib/netlist/solver/nld_ms_sor_mat.h17
-rw-r--r--src/lib/netlist/solver/nld_solver.cpp66
-rw-r--r--src/lib/netlist/solver/nld_solver.h141
-rw-r--r--src/mame/audio/irem.cpp9
-rw-r--r--src/mame/drivers/apple2e.cpp2
-rw-r--r--src/mame/drivers/chihiro.cpp6
-rw-r--r--src/mame/drivers/crimfght.cpp94
-rw-r--r--src/mame/drivers/eolith.cpp8
-rw-r--r--src/mame/drivers/hh_hmcs40.cpp4
-rw-r--r--src/mame/drivers/mcr3.cpp370
-rw-r--r--src/mame/drivers/spartanxtec.cpp441
-rw-r--r--src/mame/drivers/spyhuntertec.cpp795
-rw-r--r--src/mame/drivers/toki.cpp44
-rw-r--r--src/mame/drivers/tourvis.cpp5
-rw-r--r--src/mame/includes/mcr3.h6
-rw-r--r--src/mame/includes/xbox.h9
-rw-r--r--src/mame/machine/xbox.cpp95
-rw-r--r--src/mame/mame.lst8
-rw-r--r--src/mame/video/mcr3.cpp48
-rw-r--r--src/osd/modules/file/posixfile.cpp14
-rw-r--r--src/osd/modules/file/posixptty.cpp7
-rw-r--r--src/osd/modules/font/font_sdl.cpp2
-rw-r--r--src/osd/modules/render/bgfx/chainentry.cpp2
-rw-r--r--src/osd/modules/render/drawbgfx.cpp233
-rw-r--r--src/osd/modules/render/drawbgfx.h12
-rw-r--r--src/osd/sdl/sdldir.cpp2
-rw-r--r--src/osd/sdl/sdlmain.cpp6
-rw-r--r--src/osd/sdl/sdlos_unix.cpp8
-rw-r--r--src/osd/sdl/sdlprefix.h4
163 files changed, 11293 insertions, 7433 deletions
diff --git a/.gitignore b/.gitignore
index 083e0369858..aec8b94c19b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,7 @@
/*
/*/
!/3rdparty/
+!/android-project/
!/benchmarks/
!/artwork/
!/bgfx/
diff --git a/3rdparty/libjpeg/jconfig.h b/3rdparty/libjpeg/jconfig.h
index 719ff11eac2..68b254dec30 100644
--- a/3rdparty/libjpeg/jconfig.h
+++ b/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
diff --git a/README.md b/README.md
index 4cdcd8e7d03..bd89327d5db 100644
--- a/README.md
+++ b/README.md
@@ -73,10 +73,14 @@ All contributors need to either add a standard header for license info (on new f
License
=======
-The MAME project as a whole is distributed under the terms of the [GNU General Public License, version 2 or later](http://opensource.org/licenses/GPL-2.0) (GPL-2.0+), since it contains code made available under multiple GPL-compatible licenses. A great majority of files (over 90% including core files) are under the [BSD-3-Clause License](http://opensource.org/licenses/BSD-3-Clause) and we would encourage new contributors to distribute files under this license.
+The MAME project as a whole is distributed under the terms of the [GNU General Public License, version 2](http://opensource.org/licenses/GPL-2.0) or later (GPL-2.0+), since it contains code made available under multiple GPL-compatible licenses. A great majority of files (over 90% including core files) are under the [BSD-3-Clause License](http://opensource.org/licenses/BSD-3-Clause) and we would encourage new contributors to distribute files under this license.
Please note that MAME is a registered trademark of Nicola Salmoria, and permission is required to use the "MAME" name, logo, or wordmark.
+<a href="http://opensource.org/licenses/GPL-2.0" target="_blank">
+<img align="right" src="http://opensource.org/trademarks/opensource/OSI-Approved-License-100x137.png">
+</a>
+
Copyright (C) 1997-2016 MAMEDev and contributors
This program is free software; you can redistribute it and/or modify
diff --git a/android-project/.gitignore b/android-project/.gitignore
new file mode 100644
index 00000000000..731d58fc5e5
--- /dev/null
+++ b/android-project/.gitignore
@@ -0,0 +1,7 @@
+.idea
+.gradle
+local.properties
+*.iml
+*.so
+*.apk
+build
diff --git a/android-project/app/build.gradle b/android-project/app/build.gradle
new file mode 100644
index 00000000000..1e913c88438
--- /dev/null
+++ b/android-project/app/build.gradle
@@ -0,0 +1,29 @@
+apply plugin: 'com.android.application'
+
+android {
+ compileSdkVersion 18
+ buildToolsVersion "22.0.1"
+
+ defaultConfig {
+ applicationId "org.mamedev.mame"
+ minSdkVersion 18
+ targetSdkVersion 18
+
+ ndk {
+ moduleName 'main'
+ }
+
+ }
+
+ sourceSets.main {
+ jni.srcDirs = []
+ jniLibs.srcDir 'src/main/libs'
+ }
+
+ buildTypes {
+ release {
+ minifyEnabled false
+ proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
+ }
+ }
+}
diff --git a/android-project/app/src/main/AndroidManifest.xml b/android-project/app/src/main/AndroidManifest.xml
new file mode 100644
index 00000000000..a1f0ffe9849
--- /dev/null
+++ b/android-project/app/src/main/AndroidManifest.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Replace org.libsdl.app with the identifier of your game below, e.g.
+ com.gamemaker.game
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="org.mamedev.mame"
+ android:versionCode="1"
+ android:versionName="0.172"
+ android:installLocation="auto">
+
+ <!-- Android 4.0 -->
+ <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="14" />
+
+ <!-- OpenGL ES 2.0 -->
+ <uses-feature android:glEsVersion="0x00020000" />
+
+ <!-- Allow writing to external storage -->
+ <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+
+ <!-- Create a Java class extending SDLActivity and place it in a
+ directory under src matching the package, e.g.
+ src/com/gamemaker/game/MyGame.java
+
+ then replace "SDLActivity" with the name of your class (e.g. "MyGame")
+ in the XML below.
+
+ An example Java class can be found in README-android.txt
+ -->
+ <application android:label="@string/app_name"
+ android:icon="@drawable/ic_launcher"
+ android:allowBackup="true"
+ android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
+ android:hardwareAccelerated="true" >
+ <activity android:name="MAME"
+ android:label="@string/app_name"
+ android:configChanges="keyboardHidden|orientation"
+ >
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+ <category android:name="android.intent.category.LAUNCHER" />
+ </intent-filter>
+ <!-- Drop file event -->
+ <!--
+ <intent-filter>
+ <action android:name="android.intent.action.VIEW" />
+ <category android:name="android.intent.category.DEFAULT" />
+ <data android:mimeType="*/*" />
+ </intent-filter>
+ -->
+ </activity>
+ </application>
+
+</manifest>
diff --git a/android-project/app/src/main/java/org/libsdl/app/SDLActivity.java b/android-project/app/src/main/java/org/libsdl/app/SDLActivity.java
new file mode 100644
index 00000000000..0a2e5d87e31
--- /dev/null
+++ b/android-project/app/src/main/java/org/libsdl/app/SDLActivity.java
@@ -0,0 +1,1661 @@
+package org.libsdl.app;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.lang.reflect.Method;
+
+import android.app.*;
+import android.content.*;
+import android.text.InputType;
+import android.view.*;
+import android.view.inputmethod.BaseInputConnection;
+import android.view.inputmethod.EditorInfo;
+import android.view.inputmethod.InputConnection;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.AbsoluteLayout;
+import android.widget.Button;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+import android.os.*;
+import android.util.Log;
+import android.util.SparseArray;
+import android.graphics.*;
+import android.graphics.drawable.Drawable;
+import android.media.*;
+import android.hardware.*;
+import android.content.pm.ActivityInfo;
+
+/**
+ SDL Activity
+*/
+public class SDLActivity extends Activity {
+ private static final String TAG = "SDL";
+
+ // Keep track of the paused state
+ public static boolean mIsPaused, mIsSurfaceReady, mHasFocus;
+ public static boolean mExitCalledFromJava;
+
+ /** If shared libraries (e.g. SDL or the native application) could not be loaded. */
+ public static boolean mBrokenLibraries;
+
+ // If we want to separate mouse and touch events.
+ // This is only toggled in native code when a hint is set!
+ public static boolean mSeparateMouseAndTouch;
+
+ // Main components
+ protected static SDLActivity mSingleton;
+ protected static SDLSurface mSurface;
+ protected static View mTextEdit;
+ protected static ViewGroup mLayout;
+ protected static SDLJoystickHandler mJoystickHandler;
+
+ // This is what SDL runs in. It invokes SDL_main(), eventually
+ protected static Thread mSDLThread;
+
+ // Audio
+ protected static AudioTrack mAudioTrack;
+
+ /**
+ * This method is called by SDL before loading the native shared libraries.
+ * It can be overridden to provide names of shared libraries to be loaded.
+ * The default implementation returns the defaults. It never returns null.
+ * An array returned by a new implementation must at least contain "SDL2".
+ * Also keep in mind that the order the libraries are loaded may matter.
+ * @return names of shared libraries to be loaded (e.g. "SDL2", "main").
+ */
+ protected String[] getLibraries() {
+ return new String[] {
+ "SDL2",
+ // "SDL2_image",
+ // "SDL2_mixer",
+ // "SDL2_net",
+ // "SDL2_ttf",
+ "main"
+ };
+ }
+
+ // Load the .so
+ public void loadLibraries() {
+ for (String lib : getLibraries()) {
+ System.loadLibrary(lib);
+ }
+ }
+
+ /**
+ * This method is called by SDL before starting the native application thread.
+ * It can be overridden to provide the arguments after the application name.
+ * The default implementation returns an empty array. It never returns null.
+ * @return arguments for the native application.
+ */
+ protected String[] getArguments() {
+ return new String[0];
+ }
+
+ public static void initialize() {
+ // The static nature of the singleton and Android quirkyness force us to initialize everything here
+ // Otherwise, when exiting the app and returning to it, these variables *keep* their pre exit values
+ mSingleton = null;
+ mSurface = null;
+ mTextEdit = null;
+ mLayout = null;
+ mJoystickHandler = null;
+ mSDLThread = null;
+ mAudioTrack = null;
+ mExitCalledFromJava = false;
+ mBrokenLibraries = false;
+ mIsPaused = false;
+ mIsSurfaceReady = false;
+ mHasFocus = true;
+ }
+
+ // Setup
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ Log.v(TAG, "Device: " + android.os.Build.DEVICE);
+ Log.v(TAG, "Model: " + android.os.Build.MODEL);
+ Log.v(TAG, "onCreate(): " + mSingleton);
+ super.onCreate(savedInstanceState);
+
+ SDLActivity.initialize();
+ // So we can call stuff from static callbacks
+ mSingleton = this;
+
+ // Load shared libraries
+ String errorMsgBrokenLib = "";
+ try {
+ loadLibraries();
+ } catch(UnsatisfiedLinkError e) {
+ System.err.println(e.getMessage());
+ mBrokenLibraries = true;
+ errorMsgBrokenLib = e.getMessage();
+ } catch(Exception e) {
+ System.err.println(e.getMessage());
+ mBrokenLibraries = true;
+ errorMsgBrokenLib = e.getMessage();
+ }
+
+ if (mBrokenLibraries)
+ {
+ AlertDialog.Builder dlgAlert = new AlertDialog.Builder(this);
+ dlgAlert.setMessage("An error occurred while trying to start the application. Please try again and/or reinstall."
+ + System.getProperty("line.separator")
+ + System.getProperty("line.separator")
+ + "Error: " + errorMsgBrokenLib);
+ dlgAlert.setTitle("SDL Error");
+ dlgAlert.setPositiveButton("Exit",
+ new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialog,int id) {
+ // if this button is clicked, close current activity
+ SDLActivity.mSingleton.finish();
+ }
+ });
+ dlgAlert.setCancelable(false);
+ dlgAlert.create().show();
+
+ return;
+ }
+
+ // Set up the surface
+ mSurface = new SDLSurface(getApplication());
+
+ if(Build.VERSION.SDK_INT >= 12) {
+ mJoystickHandler = new SDLJoystickHandler_API12();
+ }
+ else {
+ mJoystickHandler = new SDLJoystickHandler();
+ }
+
+ mLayout = new AbsoluteLayout(this);
+ mLayout.addView(mSurface);
+
+ setContentView(mLayout);
+
+ // Get filename from "Open with" of another application
+ Intent intent = getIntent();
+
+ if (intent != null && intent.getData() != null) {
+ String filename = intent.getData().getPath();
+ if (filename != null) {
+ Log.v(TAG, "Got filename: " + filename);
+ SDLActivity.onNativeDropFile(filename);
+ }
+ }
+ }
+
+ // Events
+ @Override
+ protected void onPause() {
+ Log.v(TAG, "onPause()");
+ super.onPause();
+
+ if (SDLActivity.mBrokenLibraries) {
+ return;
+ }
+
+ SDLActivity.handlePause();
+ }
+
+ @Override
+ protected void onResume() {
+ Log.v(TAG, "onResume()");
+ super.onResume();
+
+ if (SDLActivity.mBrokenLibraries) {
+ return;
+ }
+
+ SDLActivity.handleResume();
+ }
+
+
+ @Override
+ public void onWindowFocusChanged(boolean hasFocus) {
+ super.onWindowFocusChanged(hasFocus);
+ Log.v(TAG, "onWindowFocusChanged(): " + hasFocus);
+
+ if (SDLActivity.mBrokenLibraries) {
+ return;
+ }
+
+ SDLActivity.mHasFocus = hasFocus;
+ if (hasFocus) {
+ SDLActivity.handleResume();
+ }
+ }
+
+ @Override
+ public void onLowMemory() {
+ Log.v(TAG, "onLowMemory()");
+ super.onLowMemory();
+
+ if (SDLActivity.mBrokenLibraries) {
+ return;
+ }
+
+ SDLActivity.nativeLowMemory();
+ }
+
+ @Override
+ protected void onDestroy() {
+ Log.v(TAG, "onDestroy()");
+
+ if (SDLActivity.mBrokenLibraries) {
+ super.onDestroy();
+ // Reset everything in case the user re opens the app
+ SDLActivity.initialize();
+ return;
+ }
+
+ // Send a quit message to the application
+ SDLActivity.mExitCalledFromJava = true;
+ SDLActivity.nativeQuit();
+
+ // Now wait for the SDL thread to quit
+ if (SDLActivity.mSDLThread != null) {
+ try {
+ SDLActivity.mSDLThread.join();
+ } catch(Exception e) {
+ Log.v(TAG, "Problem stopping thread: " + e);
+ }
+ SDLActivity.mSDLThread = null;
+
+ //Log.v(TAG, "Finished waiting for SDL thread");
+ }
+
+ super.onDestroy();
+ // Reset everything in case the user re opens the app
+ SDLActivity.initialize();
+ }
+
+ @Override
+ public boolean dispatchKeyEvent(KeyEvent event) {
+
+ if (SDLActivity.mBrokenLibraries) {
+ return false;
+ }
+
+ int keyCode = event.getKeyCode();
+ // Ignore certain special keys so they're handled by Android
+ if (keyCode == KeyEvent.KEYCODE_VOLUME_DOWN ||
+ keyCode == KeyEvent.KEYCODE_VOLUME_UP ||
+ keyCode == KeyEvent.KEYCODE_CAMERA ||
+ keyCode == 168 || /* API 11: KeyEvent.KEYCODE_ZOOM_IN */
+ keyCode == 169 /* API 11: KeyEvent.KEYCODE_ZOOM_OUT */
+ ) {
+ return false;
+ }
+ return super.dispatchKeyEvent(event);
+ }
+
+ /** Called by onPause or surfaceDestroyed. Even if surfaceDestroyed
+ * is the first to be called, mIsSurfaceReady should still be set
+ * to 'true' during the call to onPause (in a usual scenario).
+ */
+ public static void handlePause() {
+ if (!SDLActivity.mIsPaused && SDLActivity.mIsSurfaceReady) {
+ SDLActivity.mIsPaused = true;
+ SDLActivity.nativePause();
+ mSurface.handlePause();
+ }
+ }
+
+ /** Called by onResume or surfaceCreated. An actual resume should be done only when the surface is ready.
+ * Note: Some Android variants may send multiple surfaceChanged events, so we don't need to resume
+ * every time we get one of those events, only if it comes after surfaceDestroyed
+ */
+ public static void handleResume() {
+ if (SDLActivity.mIsPaused && SDLActivity.mIsSurfaceReady && SDLActivity.mHasFocus) {
+ SDLActivity.mIsPaused = false;
+ SDLActivity.nativeResume();
+ mSurface.handleResume();
+ }
+ }
+
+ /* The native thread has finished */
+ public static void handleNativeExit() {
+ SDLActivity.mSDLThread = null;
+ mSingleton.finish();
+ }
+
+
+ // Messages from the SDLMain thread
+ static final int COMMAND_CHANGE_TITLE = 1;
+ static final int COMMAND_UNUSED = 2;
+ static final int COMMAND_TEXTEDIT_HIDE = 3;
+ static final int COMMAND_SET_KEEP_SCREEN_ON = 5;
+
+ protected static final int COMMAND_USER = 0x8000;
+
+ /**
+ * This method is called by SDL if SDL did not handle a message itself.
+ * This happens if a received message contains an unsupported command.
+ * Method can be overwritten to handle Messages in a different class.
+ * @param command the command of the message.
+ * @param param the parameter of the message. May be null.
+ * @return if the message was handled in overridden method.
+ */
+ protected boolean onUnhandledMessage(int command, Object param) {
+ return false;
+ }
+
+ /**
+ * A Handler class for Messages from native SDL applications.
+ * It uses current Activities as target (e.g. for the title).
+ * static to prevent implicit references to enclosing object.
+ */
+ protected static class SDLCommandHandler extends Handler {
+ @Override
+ public void handleMessage(Message msg) {
+ Context context = getContext();
+ if (context == null) {
+ Log.e(TAG, "error handling message, getContext() returned null");
+ return;
+ }
+ switch (msg.arg1) {
+ case COMMAND_CHANGE_TITLE:
+ if (context instanceof Activity) {
+ ((Activity) context).setTitle((String)msg.obj);
+ } else {
+ Log.e(TAG, "error handling message, getContext() returned no Activity");
+ }
+ break;
+ case COMMAND_TEXTEDIT_HIDE:
+ if (mTextEdit != null) {
+ mTextEdit.setVisibility(View.GONE);
+
+ InputMethodManager imm = (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE);
+ imm.hideSoftInputFromWindow(mTextEdit.getWindowToken(), 0);
+ }
+ break;
+ case COMMAND_SET_KEEP_SCREEN_ON:
+ {
+ Window window = ((Activity) context).getWindow();
+ if (window != null) {
+ if ((msg.obj instanceof Integer) && (((Integer) msg.obj).intValue() != 0)) {
+ window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+ } else {
+ window.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+ }
+ }
+ break;
+ }
+ default:
+ if ((context instanceof SDLActivity) && !((SDLActivity) context).onUnhandledMessage(msg.arg1, msg.obj)) {
+ Log.e(TAG, "error handling message, command is " + msg.arg1);
+ }
+ }
+ }
+ }
+
+ // Handler for the messages
+ Handler commandHandler = new SDLCommandHandler();
+
+ // Send a message from the SDLMain thread
+ boolean sendCommand(int command, Object data) {
+ Message msg = commandHandler.obtainMessage();
+ msg.arg1 = command;
+ msg.obj = data;
+ return commandHandler.sendMessage(msg);
+ }
+
+ // C functions we call
+ public static native int nativeInit(Object arguments);
+ public static native void nativeLowMemory();
+ public static native void nativeQuit();
+ public static native void nativePause();
+ public static native void nativeResume();
+ public static native void onNativeDropFile(String filename);
+ public static native void onNativeResize(int x, int y, int format, float rate);
+ public static native int onNativePadDown(int device_id, int keycode);
+ public static native int onNativePadUp(int device_id, int keycode);
+ public static native void onNativeJoy(int device_id, int axis,
+ float value);
+ public static native void onNativeHat(int device_id, int hat_id,
+ int x, int y);
+ public static native void onNativeKeyDown(int keycode);
+ public static native void onNativeKeyUp(int keycode);
+ public static native void onNativeKeyboardFocusLost();
+ public static native void onNativeMouse(int button, int action, float x, float y);
+ public static native void onNativeTouch(int touchDevId, int pointerFingerId,
+ int action, float x,
+ float y, float p);
+ public static native void onNativeAccel(float x, float y, float z);
+ public static native void onNativeSurfaceChanged();
+ public static native void onNativeSurfaceDestroyed();
+ public static native int nativeAddJoystick(int device_id, String name,
+ int is_accelerometer, int nbuttons,
+ int naxes, int nhats, int nballs);
+ public static native int nativeRemoveJoystick(int device_id);
+ public static native String nativeGetHint(String name);
+
+ /**
+ * This method is called by SDL using JNI.
+ */
+ public static boolean setActivityTitle(String title) {
+ // Called from SDLMain() thread and can't directly affect the view
+ return mSingleton.sendCommand(COMMAND_CHANGE_TITLE, title);
+ }
+
+ /**
+ * This method is called by SDL using JNI.
+ */
+ public static boolean sendMessage(int command, int param) {
+ return mSingleton.sendCommand(command, Integer.valueOf(param));
+ }
+
+ /**
+ * This method is called by SDL using JNI.
+ */
+ public static Context getContext() {
+ return mSingleton;
+ }
+
+ /**
+ * This method is called by SDL using JNI.
+ * @return result of getSystemService(name) but executed on UI thread.
+ */
+ public Object getSystemServiceFromUiThread(final String name) {
+ final Object lock = new Object();
+ final Object[] results = new Object[2]; // array for writable variables
+ synchronized (lock) {
+ runOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ synchronized (lock) {
+ results[0] = getSystemService(name);
+ results[1] = Boolean.TRUE;
+ lock.notify();
+ }
+ }
+ });
+ if (results[1] == null) {
+ try {
+ lock.wait();
+ } catch (InterruptedException ex) {
+ ex.printStackTrace();
+ }
+ }
+ }
+ return results[0];
+ }
+
+ static class ShowTextInputTask implements Runnable {
+ /*
+ * This is used to regulate the pan&scan method to have some offset from
+ * the bottom edge of the input region and the top edge of an input
+ * method (soft keyboard)
+ */
+ static final int HEIGHT_PADDING = 15;
+
+ public int x, y, w, h;
+
+ public ShowTextInputTask(int x, int y, int w, int h) {
+ this.x = x;
+ this.y = y;
+ this.w = w;
+ this.h = h;
+ }
+
+ @Override
+ public void run() {
+ AbsoluteLayout.LayoutParams params = new AbsoluteLayout.LayoutParams(
+ w, h + HEIGHT_PADDING, x, y);
+
+ if (mTextEdit == null) {
+ mTextEdit = new DummyEdit(getContext());
+
+ mLayout.addView(mTextEdit, params);
+ } else {
+ mTextEdit.setLayoutParams(params);
+ }
+
+ mTextEdit.setVisibility(View.VISIBLE);
+ mTextEdit.requestFocus();
+
+ InputMethodManager imm = (InputMethodManager) getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
+ imm.showSoftInput(mTextEdit, 0);
+ }
+ }
+
+ /**
+ * This method is called by SDL using JNI.
+ */
+ public static boolean showTextInput(int x, int y, int w, int h) {
+ // Transfer the task to the main thread as a Runnable
+ return mSingleton.commandHandler.post(new ShowTextInputTask(x, y, w, h));
+ }
+
+ /**
+ * This method is called by SDL using JNI.
+ */
+ public static Surface getNativeSurface() {
+ return SDLActivity.mSurface.getNativeSurface();
+ }
+
+ // Audio
+
+ /**
+ * This method is called by SDL using JNI.
+ */
+ public static int audioInit(int sampleRate, boolean is16Bit, boolean isStereo, int desiredFrames) {
+ int channelConfig = isStereo ? AudioFormat.CHANNEL_CONFIGURATION_STEREO : AudioFormat.CHANNEL_CONFIGURATION_MONO;
+ int audioFormat = is16Bit ? AudioFormat.ENCODING_PCM_16BIT : AudioFormat.ENCODING_PCM_8BIT;
+ int frameSize = (isStereo ? 2 : 1) * (is16Bit ? 2 : 1);
+
+ Log.v(TAG, "SDL audio: wanted " + (isStereo ? "stereo" : "mono") + " " + (is16Bit ? "16-bit" : "8-bit") + " " + (sampleRate / 1000f) + "kHz, " + desiredFrames + " frames buffer");
+
+ // Let the user pick a larger buffer if they really want -- but ye
+ // gods they probably shouldn't, the minimums are horrifyingly high
+ // latency already
+ desiredFrames = Math.max(desiredFrames, (AudioTrack.getMinBufferSize(sampleRate, channelConfig, audioFormat) + frameSize - 1) / frameSize);
+
+ if (mAudioTrack == null) {
+ mAudioTrack = new AudioTrack(AudioManager.STREAM_MUSIC, sampleRate,
+ channelConfig, audioFormat, desiredFrames * frameSize, AudioTrack.MODE_STREAM);
+
+ // Instantiating AudioTrack can "succeed" without an exception and the track may still be invalid
+ // Ref: https://android.googlesource.com/platform/frameworks/base/+/refs/heads/master/media/java/android/media/AudioTrack.java
+ // Ref: http://developer.android.com/reference/android/media/AudioTrack.html#getState()
+
+ if (mAudioTrack.getState() != AudioTrack.STATE_INITIALIZED) {
+ Log.e(TAG, "Failed during initialization of Audio Track");
+ mAudioTrack = null;
+ return -1;
+ }
+
+ mAudioTrack.play();
+ }
+
+ Log.v(TAG, "SDL audio: got " + ((mAudioTrack.getChannelCount() >= 2) ? "stereo" : "mono") + " " + ((mAudioTrack.getAudioFormat() == AudioFormat.ENCODING_PCM_16BIT) ? "16-bit" : "8-bit") + " " + (mAudioTrack.getSampleRate() / 1000f) + "kHz, " + desiredFrames + " frames buffer");
+
+ return 0;
+ }
+
+ /**
+ * This method is called by SDL using JNI.
+ */
+ public static void audioWriteShortBuffer(short[] buffer) {
+ for (int i = 0; i < buffer.length; ) {
+ int result = mAudioTrack.write(buffer, i, buffer.length - i);
+ if (result > 0) {
+ i += result;
+ } else if (result == 0) {
+ try {
+ Thread.sleep(1);
+ } catch(InterruptedException e) {
+ // Nom nom
+ }
+ } else {
+ Log.w(TAG, "SDL audio: error return from write(short)");
+ return;
+ }
+ }
+ }
+
+ /**
+ * This method is called by SDL using JNI.
+ */
+ public static void audioWriteByteBuffer(byte[] buffer) {
+ for (int i = 0; i < buffer.length; ) {
+ int result = mAudioTrack.write(buffer, i, buffer.length - i);
+ if (result > 0) {
+ i += result;
+ } else if (result == 0) {
+ try {
+ Thread.sleep(1);
+ } catch(InterruptedException e) {
+ // Nom nom
+ }
+ } else {
+ Log.w(TAG, "SDL audio: error return from write(byte)");
+ return;
+ }
+ }
+ }
+
+ /**
+ * This method is called by SDL using JNI.
+ */
+ public static void audioQuit() {
+ if (mAudioTrack != null) {
+ mAudioTrack.stop();
+ mAudioTrack = null;
+ }
+ }
+
+ // Input
+
+ /**
+ * This method is called by SDL using JNI.
+ * @return an array which may be empty but is never null.
+ */
+ public static int[] inputGetInputDeviceIds(int sources) {
+ int[] ids = InputDevice.getDeviceIds();
+ int[] filtered = new int[ids.length];
+ int used = 0;
+ for (int i = 0; i < ids.length; ++i) {
+ InputDevice device = InputDevice.getDevice(ids[i]);
+ if ((device != null) && ((device.getSources() & sources) != 0)) {
+ filtered[used++] = device.getId();
+ }
+ }
+ return Arrays.copyOf(filtered, used);
+ }
+
+ // Joystick glue code, just a series of stubs that redirect to the SDLJoystickHandler instance
+ public static boolean handleJoystickMotionEvent(MotionEvent event) {
+ return mJoystickHandler.handleMotionEvent(event);
+ }
+
+ /**
+ * This method is called by SDL using JNI.
+ */
+ public static void pollInputDevices() {
+ if (SDLActivity.mSDLThread != null) {
+ mJoystickHandler.pollInputDevices();
+ }
+ }
+
+ // APK expansion files support
+
+ /** com.android.vending.expansion.zipfile.ZipResourceFile object or null. */
+ private Object expansionFile;
+
+ /** com.android.vending.expansion.zipfile.ZipResourceFile's getInputStream() or null. */
+ private Method expansionFileMethod;
+
+ /**
+ * This method was called by SDL using JNI.
+ * @deprecated because of an incorrect name
+ */
+ @Deprecated
+ public InputStream openAPKExtensionInputStream(String fileName) throws IOException {
+ return openAPKExpansionInputStream(fileName);
+ }
+
+ /**
+ * This method is called by SDL using JNI.
+ * @return an InputStream on success or null if no expansion file was used.
+ * @throws IOException on errors. Message is set for the SDL error message.
+ */
+ public InputStream openAPKExpansionInputStream(String fileName) throws IOException {
+ // Get a ZipResourceFile representing a merger of both the main and patch files
+ if (expansionFile == null) {
+ String mainHint = nativeGetHint("SDL_ANDROID_APK_EXPANSION_MAIN_FILE_VERSION");
+ if (mainHint == null) {
+ return null; // no expansion use if no main version was set
+ }
+ String patchHint = nativeGetHint("SDL_ANDROID_APK_EXPANSION_PATCH_FILE_VERSION");
+ if (patchHint == null) {
+ return null; // no expansion use if no patch version was set
+ }
+
+ Integer mainVersion;
+ Integer patchVersion;
+ try {
+ mainVersion = Integer.valueOf(mainHint);
+ patchVersion = Integer.valueOf(patchHint);
+ } catch (NumberFormatException ex) {
+ ex.printStackTrace();
+ throw new IOException("No valid file versions set for APK expansion files", ex);
+ }
+
+ try {
+ // To avoid direct dependency on Google APK expansion library that is
+ // not a part of Android SDK we access it using reflection
+ expansionFile = Class.forName("com.android.vending.expansion.zipfile.APKExpansionSupport")
+ .getMethod("getAPKExpansionZipFile", Context.class, int.class, int.class)
+ .invoke(null, this, mainVersion, patchVersion);
+
+ expansionFileMethod = expansionFile.getClass()
+ .getMethod("getInputStream", String.class);
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ expansionFile = null;
+ expansionFileMethod = null;
+ throw new IOException("Could not access APK expansion support library", ex);
+ }
+ }
+
+ // Get an input stream for a known file inside the expansion file ZIPs
+ InputStream fileStream;
+ try {
+ fileStream = (InputStream)expansionFileMethod.invoke(expansionFile, fileName);
+ } catch (Exception ex) {
+ // calling "getInputStream" failed
+ ex.printStackTrace();
+ throw new IOException("Could not open stream from APK expansion file", ex);
+ }
+
+ if (fileStream == null) {
+ // calling "getInputStream" was successful but null was returned
+ throw new IOException("Could not find path in APK expansion file");
+ }
+
+ return fileStream;
+ }
+
+ // Messagebox
+
+ /** Result of current messagebox. Also used for blocking the calling thread. */
+ protected final int[] messageboxSelection = new int[1];
+
+ /** Id of current dialog. */
+ protected int dialogs = 0;
+
+ /**
+ * This method is called by SDL using JNI.
+ * Shows the messagebox from UI thread and block calling thread.
+ * buttonFlags, buttonIds and buttonTexts must have same length.
+ * @param buttonFlags array containing flags for every button.
+ * @param buttonIds array containing id for every button.
+ * @param buttonTexts array containing text for every button.
+ * @param colors null for default or array of length 5 containing colors.
+ * @return button id or -1.
+ */
+ public int messageboxShowMessageBox(
+ final int flags,
+ final String title,
+ final String message,
+ final int[] buttonFlags,
+ final int[] buttonIds,
+ final String[] buttonTexts,
+ final int[] colors) {
+
+ messageboxSelection[0] = -1;
+
+ // sanity checks
+
+ if ((buttonFlags.length != buttonIds.length) && (buttonIds.length != buttonTexts.length)) {
+ return -1; // implementation broken
+ }
+
+ // collect arguments for Dialog
+
+ final Bundle args = new Bundle();
+ args.putInt("flags", flags);
+ args.putString("title", title);
+ args.putString("message", message);
+ args.putIntArray("buttonFlags", buttonFlags);
+ args.putIntArray("buttonIds", buttonIds);
+ args.putStringArray("buttonTexts", buttonTexts);
+ args.putIntArray("colors", colors);
+
+ // trigger Dialog creation on UI thread
+
+ runOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ showDialog(dialogs++, args);
+ }
+ });
+
+ // block the calling thread
+
+ synchronized (messageboxSelection) {
+ try {
+ messageboxSelection.wait();
+ } catch (InterruptedException ex) {
+ ex.printStackTrace();
+ return -1;
+ }
+ }
+
+ // return selected value
+
+ return messageboxSelection[0];
+ }
+
+ @Override
+ protected Dialog onCreateDialog(int ignore, Bundle args) {
+
+ // TODO set values from "flags" to messagebox dialog
+
+ // get colors
+
+ int[] colors = args.getIntArray("colors");
+ int backgroundColor;
+ int textColor;
+ int buttonBorderColor;
+ int buttonBackgroundColor;
+ int buttonSelectedColor;
+ if (colors != null) {
+ int i = -1;
+ backgroundColor = colors[++i];
+ textColor = colors[++i];
+ buttonBorderColor = colors[++i];
+ buttonBackgroundColor = colors[++i];
+ buttonSelectedColor = colors[++i];
+ } else {
+ backgroundColor = Color.TRANSPARENT;
+ textColor = Color.TRANSPARENT;
+ buttonBorderColor = Color.TRANSPARENT;
+ buttonBackgroundColor = Color.TRANSPARENT;
+ buttonSelectedColor = Color.TRANSPARENT;
+ }
+
+ // create dialog with title and a listener to wake up calling thread
+
+ final Dialog dialog = new Dialog(this);
+ dialog.setTitle(args.getString("title"));
+ dialog.setCancelable(false);
+ dialog.setOnDismissListener(new DialogInterface.OnDismissListener() {
+ @Override
+ public void onDismiss(DialogInterface unused) {
+ synchronized (messageboxSelection) {
+ messageboxSelection.notify();
+ }
+ }
+ });
+
+ // create text
+
+ TextView message = new TextView(this);
+ message.setGravity(Gravity.CENTER);
+ message.setText(args.getString("message"));
+ if (textColor != Color.TRANSPARENT) {
+ message.setTextColor(textColor);
+ }
+
+ // create buttons
+
+ int[] buttonFlags = args.getIntArray("buttonFlags");
+ int[] buttonIds = args.getIntArray("buttonIds");
+ String[] buttonTexts = args.getStringArray("buttonTexts");
+
+ final SparseArray<Button> mapping = new SparseArray<Button>();
+
+ LinearLayout buttons = new LinearLayout(this);
+ buttons.setOrientation(LinearLayout.HORIZONTAL);
+ buttons.setGravity(Gravity.CENTER);
+ for (int i = 0; i < buttonTexts.length; ++i) {
+ Button button = new Button(this);
+ final int id = buttonIds[i];
+ button.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ messageboxSelection[0] = id;
+ dialog.dismiss();
+ }
+ });
+ if (buttonFlags[i] != 0) {
+ // see SDL_messagebox.h
+ if ((buttonFlags[i] & 0x00000001) != 0) {
+ mapping.put(KeyEvent.KEYCODE_ENTER, button);
+ }
+ if ((buttonFlags[i] & 0x00000002) != 0) {
+ mapping.put(111, button); /* API 11: KeyEvent.KEYCODE_ESCAPE */
+ }
+ }
+ button.setText(buttonTexts[i]);
+ if (textColor != Color.TRANSPARENT) {
+ button.setTextColor(textColor);
+ }
+ if (buttonBorderColor != Color.TRANSPARENT) {
+ // TODO set color for border of messagebox button
+ }
+ if (buttonBackgroundColor != Color.TRANSPARENT) {
+ Drawable drawable = button.getBackground();
+ if (drawable == null) {
+ // setting the color this way removes the style
+ button.setBackgroundColor(buttonBackgroundColor);
+ } else {
+ // setting the color this way keeps the style (gradient, padding, etc.)
+ drawable.setColorFilter(buttonBackgroundColor, PorterDuff.Mode.MULTIPLY);
+ }
+ }
+ if (buttonSelectedColor != Color.TRANSPARENT) {
+ // TODO set color for selected messagebox button
+ }
+ buttons.addView(button);
+ }
+
+ // create content
+
+ LinearLayout content = new LinearLayout(this);
+ content.setOrientation(LinearLayout.VERTICAL);
+ content.addView(message);
+ content.addView(buttons);
+ if (backgroundColor != Color.TRANSPARENT) {
+ content.setBackgroundColor(backgroundColor);
+ }
+
+ // add content to dialog and return
+
+ dialog.setContentView(content);
+ dialog.setOnKeyListener(new Dialog.OnKeyListener() {
+ @Override
+ public boolean onKey(DialogInterface d, int keyCode, KeyEvent event) {
+ Button button = mapping.get(keyCode);
+ if (button != null) {
+ if (event.getAction() == KeyEvent.ACTION_UP) {
+ button.performClick();
+ }
+ return true; // also for ignored actions
+ }
+ return false;
+ }
+ });
+
+ return dialog;
+ }
+}
+
+/**
+ Simple nativeInit() runnable
+*/
+class SDLMain implements Runnable {
+ @Override
+ public void run() {
+ // Runs SDL_main()
+ SDLActivity.nativeInit(SDLActivity.mSingleton.getArguments());
+
+ //Log.v("SDL", "SDL thread terminated");
+ }
+}
+
+
+/**
+ SDLSurface. This is what we draw on, so we need to know when it's created
+ in order to do anything useful.
+
+ Because of this, that's where we set up the SDL thread
+*/
+class SDLSurface extends SurfaceView implements SurfaceHolder.Callback,
+ View.OnKeyListener, View.OnTouchListener, SensorEventListener {
+
+ // Sensors
+ protected static SensorManager mSensorManager;
+ protected static Display mDisplay;
+
+ // Keep track of the surface size to normalize touch events
+ protected static float mWidth, mHeight;
+
+ // Startup
+ public SDLSurface(Context context) {
+ super(context);
+ getHolder().addCallback(this);
+
+ setFocusable(true);
+ setFocusableInTouchMode(true);
+ requestFocus();
+ setOnKeyListener(this);
+ setOnTouchListener(this);
+
+ mDisplay = ((WindowManager)context.getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay();
+ mSensorManager = (SensorManager)context.getSystemService(Context.SENSOR_SERVICE);
+
+ if(Build.VERSION.SDK_INT >= 12) {
+ setOnGenericMotionListener(new SDLGenericMotionListener_API12());
+ }
+
+ // Some arbitrary defaults to avoid a potential division by zero
+ mWidth = 1.0f;
+ mHeight = 1.0f;
+ }
+
+ public void handlePause() {
+ enableSensor(Sensor.TYPE_ACCELEROMETER, false);
+ }
+
+ public void handleResume() {
+ setFocusable(true);
+ setFocusableInTouchMode(true);
+ requestFocus();
+ setOnKeyListener(this);
+ setOnTouchListener(this);
+ enableSensor(Sensor.TYPE_ACCELEROMETER, true);
+ }
+
+ public Surface getNativeSurface() {
+ return getHolder().getSurface();
+ }
+
+ // Called when we have a valid drawing surface
+ @Override
+ public void surfaceCreated(SurfaceHolder holder) {
+ Log.v("SDL", "surfaceCreated()");
+ holder.setType(SurfaceHolder.SURFACE_TYPE_GPU);
+ }
+
+ // Called when we lose the surface
+ @Override
+ public void surfaceDestroyed(SurfaceHolder holder) {
+ Log.v("SDL", "surfaceDestroyed()");
+ // Call this *before* setting mIsSurfaceReady to 'false'
+ SDLActivity.handlePause();
+ SDLActivity.mIsSurfaceReady = false;
+ SDLActivity.onNativeSurfaceDestroyed();
+ }
+
+ // Called when the surface is resized
+ @Override
+ public void surfaceChanged(SurfaceHolder holder,
+ int format, int width, int height) {
+ Log.v("SDL", "surfaceChanged()");
+
+ int sdlFormat = 0x15151002; // SDL_PIXELFORMAT_RGB565 by default
+ switch (format) {
+ case PixelFormat.A_8:
+ Log.v("SDL", "pixel format A_8");
+ break;
+ case PixelFormat.LA_88:
+ Log.v("SDL", "pixel format LA_88");
+ break;
+ case PixelFormat.L_8:
+ Log.v("SDL", "pixel format L_8");
+ break;
+ case PixelFormat.RGBA_4444:
+ Log.v("SDL", "pixel format RGBA_4444");
+ sdlFormat = 0x15421002; // SDL_PIXELFORMAT_RGBA4444
+ break;
+ case PixelFormat.RGBA_5551:
+ Log.v("SDL", "pixel format RGBA_5551");
+ sdlFormat = 0x15441002; // SDL_PIXELFORMAT_RGBA5551
+ break;
+ case PixelFormat.RGBA_8888:
+ Log.v("SDL", "pixel format RGBA_8888");
+ sdlFormat = 0x16462004; // SDL_PIXELFORMAT_RGBA8888
+ break;
+ case PixelFormat.RGBX_8888:
+ Log.v("SDL", "pixel format RGBX_8888");
+ sdlFormat = 0x16261804; // SDL_PIXELFORMAT_RGBX8888
+ break;
+ case PixelFormat.RGB_332:
+ Log.v("SDL", "pixel format RGB_332");
+ sdlFormat = 0x14110801; // SDL_PIXELFORMAT_RGB332
+ break;
+ case PixelFormat.RGB_565:
+ Log.v("SDL", "pixel format RGB_565");
+ sdlFormat = 0x15151002; // SDL_PIXELFORMAT_RGB565
+ break;
+ case PixelFormat.RGB_888:
+ Log.v("SDL", "pixel format RGB_888");
+ // Not sure this is right, maybe SDL_PIXELFORMAT_RGB24 instead?
+ sdlFormat = 0x16161804; // SDL_PIXELFORMAT_RGB888
+ break;
+ default:
+ Log.v("SDL", "pixel format unknown " + format);
+ break;
+ }
+
+ mWidth = width;
+ mHeight = height;
+ SDLActivity.onNativeResize(width, height, sdlFormat, mDisplay.getRefreshRate());
+ Log.v("SDL", "Window size: " + width + "x" + height);
+
+
+ boolean skip = false;
+ int requestedOrientation = SDLActivity.mSingleton.getRequestedOrientation();
+
+ if (requestedOrientation == ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED)
+ {
+ // Accept any
+ }
+ else if (requestedOrientation == ActivityInfo.SCREEN_ORIENTATION_PORTRAIT)
+ {
+ if (mWidth > mHeight) {
+ skip = true;
+ }
+ } else if (requestedOrientation == ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE) {
+ if (mWidth < mHeight) {
+ skip = true;
+ }
+ }
+
+ // Special Patch for Square Resolution: Black Berry Passport
+ if (skip) {
+ double min = Math.min(mWidth, mHeight);
+ double max = Math.max(mWidth, mHeight);
+
+ if (max / min < 1.20) {
+ Log.v("SDL", "Don't skip on such aspect-ratio. Could be a square resolution.");
+ skip = false;
+ }
+ }
+
+ if (skip) {
+ Log.v("SDL", "Skip .. Surface is not ready.");
+ return;
+ }
+
+
+ // Set mIsSurfaceReady to 'true' *before* making a call to handleResume
+ SDLActivity.mIsSurfaceReady = true;
+ SDLActivity.onNativeSurfaceChanged();
+
+
+ if (SDLActivity.mSDLThread == null) {
+ // This is the entry point to the C app.
+ // Start up the C app thread and enable sensor input for the first time
+
+ final Thread sdlThread = new Thread(new SDLMain(), "SDLThread");
+ enableSensor(Sensor.TYPE_ACCELEROMETER, true);
+ sdlThread.start();
+
+ // Set up a listener thread to catch when the native thread ends
+ SDLActivity.mSDLThread = new Thread(new Runnable(){
+ @Override
+ public void run(){
+ try {
+ sdlThread.join();
+ }
+ catch(Exception e){}
+ finally{
+ // Native thread has finished
+ if (! SDLActivity.mExitCalledFromJava) {
+ SDLActivity.handleNativeExit();
+ }
+ }
+ }
+ }, "SDLThreadListener");
+ SDLActivity.mSDLThread.start();
+ }
+
+ if (SDLActivity.mHasFocus) {
+ SDLActivity.handleResume();
+ }
+ }
+
+ // Key events
+ @Override
+ public boolean onKey(View v, int keyCode, KeyEvent event) {
+ // Dispatch the different events depending on where they come from
+ // Some SOURCE_DPAD or SOURCE_GAMEPAD are also SOURCE_KEYBOARD
+ // So, we try to process them as DPAD or GAMEPAD events first, if that fails we try them as KEYBOARD
+
+ if ( (event.getSource() & InputDevice.SOURCE_GAMEPAD) != 0 ||
+ (event.getSource() & InputDevice.SOURCE_DPAD) != 0 ) {
+ if (event.getAction() == KeyEvent.ACTION_DOWN) {
+ if (SDLActivity.onNativePadDown(event.getDeviceId(), keyCode) == 0) {
+ return true;
+ }
+ } else if (event.getAction() == KeyEvent.ACTION_UP) {
+ if (SDLActivity.onNativePadUp(event.getDeviceId(), keyCode) == 0) {
+ return true;
+ }
+ }
+ }
+
+ if( (event.getSource() & InputDevice.SOURCE_KEYBOARD) != 0) {
+ if (event.getAction() == KeyEvent.ACTION_DOWN) {
+ //Log.v("SDL", "key down: " + keyCode);
+ SDLActivity.onNativeKeyDown(keyCode);
+ return true;
+ }
+ else if (event.getAction() == KeyEvent.ACTION_UP) {
+ //Log.v("SDL", "key up: " + keyCode);
+ SDLActivity.onNativeKeyUp(keyCode);
+ return true;
+ }
+ }
+
+ return false;
+ }
+
+ // Touch events
+ @Override
+ public boolean onTouch(View v, MotionEvent event) {
+ /* Ref: http://developer.android.com/training/gestures/multi.html */
+ final int touchDevId = event.getDeviceId();
+ final int pointerCount = event.getPointerCount();
+ int action = event.getActionMasked();
+ int pointerFingerId;
+ int mouseButton;
+ int i = -1;
+ float x,y,p;
+
+ // !!! FIXME: dump this SDK check after 2.0.4 ships and require API14.
+ if (event.getSource() == InputDevice.SOURCE_MOUSE && SDLActivity.mSeparateMouseAndTouch) {
+ if (Build.VERSION.SDK_INT < 14) {
+ mouseButton = 1; // For Android==12 all mouse buttons are the left button
+ } else {
+ try {
+ mouseButton = (Integer) event.getClass().getMethod("getButtonState").invoke(event);
+ } catch(Exception e) {
+ mouseButton = 1; // oh well.
+ }
+ }
+ SDLActivity.onNativeMouse(mouseButton, action, event.getX(0), event.getY(0));
+ } else {
+ switch(action) {
+ case MotionEvent.ACTION_MOVE:
+ for (i = 0; i < pointerCount; i++) {
+ pointerFingerId = event.getPointerId(i);
+ x = event.getX(i) / mWidth;
+ y = event.getY(i) / mHeight;
+ p = event.getPressure(i);
+ if (p > 1.0f) {
+ // may be larger than 1.0f on some devices
+ // see the documentation of getPressure(i)
+ p = 1.0f;
+ }
+ SDLActivity.onNativeTouch(touchDevId, pointerFingerId, action, x, y, p);
+ }
+ break;
+
+ case MotionEvent.ACTION_UP:
+ case MotionEvent.ACTION_DOWN:
+ // Primary pointer up/down, the index is always zero
+ i = 0;
+ case MotionEvent.ACTION_POINTER_UP:
+ case MotionEvent.ACTION_POINTER_DOWN:
+ // Non primary pointer up/down
+ if (i == -1) {
+ i = event.getActionIndex();
+ }
+
+ pointerFingerId = event.getPointerId(i);
+ x = event.getX(i) / mWidth;
+ y = event.getY(i) / mHeight;
+ p = event.getPressure(i);
+ if (p > 1.0f) {
+ // may be larger than 1.0f on some devices
+ // see the documentation of getPressure(i)
+ p = 1.0f;
+ }
+ SDLActivity.onNativeTouch(touchDevId, pointerFingerId, action, x, y, p);
+ break;
+
+ case MotionEvent.ACTION_CANCEL:
+ for (i = 0; i < pointerCount; i++) {
+ pointerFingerId = event.getPointerId(i);
+ x = event.getX(i) / mWidth;
+ y = event.getY(i) / mHeight;
+ p = event.getPressure(i);
+ if (p > 1.0f) {
+ // may be larger than 1.0f on some devices
+ // see the documentation of getPressure(i)
+ p = 1.0f;
+ }
+ SDLActivity.onNativeTouch(touchDevId, pointerFingerId, MotionEvent.ACTION_UP, x, y, p);
+ }
+ break;
+
+ default:
+ break;
+ }
+ }
+
+ return true;
+ }
+
+ // Sensor events
+ public void enableSensor(int sensortype, boolean enabled) {
+ // TODO: This uses getDefaultSensor - what if we have >1 accels?
+ if (enabled) {
+ mSensorManager.registerListener(this,
+ mSensorManager.getDefaultSensor(sensortype),
+ SensorManager.SENSOR_DELAY_GAME, null);
+ } else {
+ mSensorManager.unregisterListener(this,
+ mSensorManager.getDefaultSensor(sensortype));
+ }
+ }
+
+ @Override
+ public void onAccuracyChanged(Sensor sensor, int accuracy) {
+ // TODO
+ }
+
+ @Override
+ public void onSensorChanged(SensorEvent event) {
+ if (event.sensor.getType() == Sensor.TYPE_ACCELEROMETER) {
+ float x, y;
+ switch (mDisplay.getRotation()) {
+ case Surface.ROTATION_90:
+ x = -event.values[1];
+ y = event.values[0];
+ break;
+ case Surface.ROTATION_270:
+ x = event.values[1];
+ y = -event.values[0];
+ break;
+ case Surface.ROTATION_180:
+ x = -event.values[1];
+ y = -event.values[0];
+ break;
+ default:
+ x = event.values[0];
+ y = event.values[1];
+ break;
+ }
+ SDLActivity.onNativeAccel(-x / SensorManager.GRAVITY_EARTH,
+ y / SensorManager.GRAVITY_EARTH,
+ event.values[2] / SensorManager.GRAVITY_EARTH - 1);
+ }
+ }
+}
+
+/* This is a fake invisible editor view that receives the input and defines the
+ * pan&scan region
+ */
+class DummyEdit extends View implements View.OnKeyListener {
+ InputConnection ic;
+
+ public DummyEdit(Context context) {
+ super(context);
+ setFocusableInTouchMode(true);
+ setFocusable(true);
+ setOnKeyListener(this);
+ }
+
+ @Override
+ public boolean onCheckIsTextEditor() {
+ return true;
+ }
+
+ @Override
+ public boolean onKey(View v, int keyCode, KeyEvent event) {
+
+ // This handles the hardware keyboard input
+ if (event.isPrintingKey()) {
+ if (event.getAction() == KeyEvent.ACTION_DOWN) {
+ ic.commitText(String.valueOf((char) event.getUnicodeChar()), 1);
+ }
+ return true;
+ }
+
+ if (event.getAction() == KeyEvent.ACTION_DOWN) {
+ SDLActivity.onNativeKeyDown(keyCode);
+ return true;
+ } else if (event.getAction() == KeyEvent.ACTION_UP) {
+ SDLActivity.onNativeKeyUp(keyCode);
+ return true;
+ }
+
+ return false;
+ }
+
+ //
+ @Override
+ public boolean onKeyPreIme (int keyCode, KeyEvent event) {
+ // As seen on StackOverflow: http://stackoverflow.com/questions/7634346/keyboard-hide-event
+ // FIXME: Discussion at http://bugzilla.libsdl.org/show_bug.cgi?id=1639
+ // FIXME: This is not a 100% effective solution to the problem of detecting if the keyboard is showing or not
+ // FIXME: A more effective solution would be to change our Layout from AbsoluteLayout to Relative or Linear
+ // FIXME: And determine the keyboard presence doing this: http://stackoverflow.com/questions/2150078/how-to-check-visibility-of-software-keyboard-in-android
+ // FIXME: An even more effective way would be if Android provided this out of the box, but where would the fun be in that :)
+ if (event.getAction()==KeyEvent.ACTION_UP && keyCode == KeyEvent.KEYCODE_BACK) {
+ if (SDLActivity.mTextEdit != null && SDLActivity.mTextEdit.getVisibility() == View.VISIBLE) {
+ SDLActivity.onNativeKeyboardFocusLost();
+ }
+ }
+ return super.onKeyPreIme(keyCode, event);
+ }
+
+ @Override
+ public InputConnection onCreateInputConnection(EditorInfo outAttrs) {
+ ic = new SDLInputConnection(this, true);
+
+ outAttrs.inputType = InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD;
+ outAttrs.imeOptions = EditorInfo.IME_FLAG_NO_EXTRACT_UI
+ | 33554432 /* API 11: EditorInfo.IME_FLAG_NO_FULLSCREEN */;
+
+ return ic;
+ }
+}
+
+class SDLInputConnection extends BaseInputConnection {
+
+ public SDLInputConnection(View targetView, boolean fullEditor) {
+ super(targetView, fullEditor);
+
+ }
+
+ @Override
+ public boolean sendKeyEvent(KeyEvent event) {
+
+ /*
+ * This handles the keycodes from soft keyboard (and IME-translated
+ * input from hardkeyboard)
+ */
+ int keyCode = event.getKeyCode();
+ if (event.getAction() == KeyEvent.ACTION_DOWN) {
+ if (event.isPrintingKey()) {
+ commitText(String.valueOf((char) event.getUnicodeChar()), 1);
+ }
+ SDLActivity.onNativeKeyDown(keyCode);
+ return true;
+ } else if (event.getAction() == KeyEvent.ACTION_UP) {
+
+ SDLActivity.onNativeKeyUp(keyCode);
+ return true;
+ }
+ return super.sendKeyEvent(event);
+ }
+
+ @Override
+ public boolean commitText(CharSequence text, int newCursorPosition) {
+
+ nativeCommitText(text.toString(), newCursorPosition);
+
+ return super.commitText(text, newCursorPosition);
+ }
+
+ @Override
+ public boolean setComposingText(CharSequence text, int newCursorPosition) {
+
+ nativeSetComposingText(text.toString(), newCursorPosition);
+
+ return super.setComposingText(text, newCursorPosition);
+ }
+
+ public native void nativeCommitText(String text, int newCursorPosition);
+
+ public native void nativeSetComposingText(String text, int newCursorPosition);
+
+ @Override
+ public boolean deleteSurroundingText(int beforeLength, int afterLength) {
+ // Workaround to capture backspace key. Ref: http://stackoverflow.com/questions/14560344/android-backspace-in-webview-baseinputconnection
+ if (beforeLength == 1 && afterLength == 0) {
+ // backspace
+ return super.sendKeyEvent(new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DEL))
+ && super.sendKeyEvent(new KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_DEL));
+ }
+
+ return super.deleteSurroundingText(beforeLength, afterLength);
+ }
+}
+
+/* A null joystick handler for API level < 12 devices (the accelerometer is handled separately) */
+class SDLJoystickHandler {
+
+ /**
+ * Handles given MotionEvent.
+ * @param event the event to be handled.
+ * @return if given event was processed.
+ */
+ public boolean handleMotionEvent(MotionEvent event) {
+ return false;
+ }
+
+ /**
+ * Handles adding and removing of input devices.
+ */
+ public void pollInputDevices() {
+ }
+}
+
+/* Actual joystick functionality available for API >= 12 devices */
+class SDLJoystickHandler_API12 extends SDLJoystickHandler {
+
+ static class SDLJoystick {
+ public int device_id;
+ public String name;
+ public ArrayList<InputDevice.MotionRange> axes;
+ public ArrayList<InputDevice.MotionRange> hats;
+ }
+ static class RangeComparator implements Comparator<InputDevice.MotionRange> {
+ @Override
+ public int compare(InputDevice.MotionRange arg0, InputDevice.MotionRange arg1) {
+ return arg0.getAxis() - arg1.getAxis();
+ }
+ }
+
+ private ArrayList<SDLJoystick> mJoysticks;
+
+ public SDLJoystickHandler_API12() {
+
+ mJoysticks = new ArrayList<SDLJoystick>();
+ }
+
+ @Override
+ public void pollInputDevices() {
+ int[] deviceIds = InputDevice.getDeviceIds();
+ // It helps processing the device ids in reverse order
+ // For example, in the case of the XBox 360 wireless dongle,
+ // so the first controller seen by SDL matches what the receiver
+ // considers to be the first controller
+
+ for(int i=deviceIds.length-1; i>-1; i--) {
+ SDLJoystick joystick = getJoystick(deviceIds[i]);
+ if (joystick == null) {
+ joystick = new SDLJoystick();
+ InputDevice joystickDevice = InputDevice.getDevice(deviceIds[i]);
+
+ if (
+ (joystickDevice.getSources() & InputDevice.SOURCE_CLASS_JOYSTICK) != 0
+ ||
+ (joystickDevice.getSources() & InputDevice.SOURCE_CLASS_BUTTON) != 0
+ )
+ {
+ joystick.device_id = deviceIds[i];
+ joystick.name = joystickDevice.getName();
+ joystick.axes = new ArrayList<InputDevice.MotionRange>();
+ joystick.hats = new ArrayList<InputDevice.MotionRange>();
+
+ List<InputDevice.MotionRange> ranges = joystickDevice.getMotionRanges();
+ Collections.sort(ranges, new RangeComparator());
+ for (InputDevice.MotionRange range : ranges ) {
+ if ((range.getSource() & InputDevice.SOURCE_CLASS_JOYSTICK) != 0 ) {
+ if (range.getAxis() == MotionEvent.AXIS_HAT_X ||
+ range.getAxis() == MotionEvent.AXIS_HAT_Y) {
+ joystick.hats.add(range);
+ }
+ else {
+ joystick.axes.add(range);
+ }
+ }
+ }
+
+ mJoysticks.add(joystick);
+ SDLActivity.nativeAddJoystick(joystick.device_id, joystick.name, 0, -1,
+ joystick.axes.size(), joystick.hats.size()/2, 0);
+ }
+ }
+ }
+
+ /* Check removed devices */
+ ArrayList<Integer> removedDevices = new ArrayList<Integer>();
+ for(int i=0; i < mJoysticks.size(); i++) {
+ int device_id = mJoysticks.get(i).device_id;
+ int j;
+ for (j=0; j < deviceIds.length; j++) {
+ if (device_id == deviceIds[j]) break;
+ }
+ if (j == deviceIds.length) {
+ removedDevices.add(Integer.valueOf(device_id));
+ }
+ }
+
+ for(int i=0; i < removedDevices.size(); i++) {
+ int device_id = removedDevices.get(i).intValue();
+ SDLActivity.nativeRemoveJoystick(device_id);
+ for (int j=0; j < mJoysticks.size(); j++) {
+ if (mJoysticks.get(j).device_id == device_id) {
+ mJoysticks.remove(j);
+ break;
+ }
+ }
+ }
+ }
+
+ protected SDLJoystick getJoystick(int device_id) {
+ for(int i=0; i < mJoysticks.size(); i++) {
+ if (mJoysticks.get(i).device_id == device_id) {
+ return mJoysticks.get(i);
+ }
+ }
+ return null;
+ }
+
+ @Override
+ public boolean handleMotionEvent(MotionEvent event) {
+ if ( (event.getSource() & InputDevice.SOURCE_JOYSTICK) != 0) {
+ int actionPointerIndex = event.getActionIndex();
+ int action = event.getActionMasked();
+ switch(action) {
+ case MotionEvent.ACTION_MOVE:
+ SDLJoystick joystick = getJoystick(event.getDeviceId());
+ if ( joystick != null ) {
+ for (int i = 0; i < joystick.axes.size(); i++) {
+ InputDevice.MotionRange range = joystick.axes.get(i);
+ /* Normalize the value to -1...1 */
+ float value = ( event.getAxisValue( range.getAxis(), actionPointerIndex) - range.getMin() ) / range.getRange() * 2.0f - 1.0f;
+ SDLActivity.onNativeJoy(joystick.device_id, i, value );
+ }
+ for (int i = 0; i < joystick.hats.size(); i+=2) {
+ int hatX = Math.round(event.getAxisValue( joystick.hats.get(i).getAxis(), actionPointerIndex ) );
+ int hatY = Math.round(event.getAxisValue( joystick.hats.get(i+1).getAxis(), actionPointerIndex ) );
+ SDLActivity.onNativeHat(joystick.device_id, i/2, hatX, hatY );
+ }
+ }
+ break;
+ default:
+ break;
+ }
+ }
+ return true;
+ }
+}
+
+class SDLGenericMotionListener_API12 implements View.OnGenericMotionListener {
+ // Generic Motion (mouse hover, joystick...) events go here
+ @Override
+ public boolean onGenericMotion(View v, MotionEvent event) {
+ float x, y;
+ int action;
+
+ switch ( event.getSource() ) {
+ case InputDevice.SOURCE_JOYSTICK:
+ case InputDevice.SOURCE_GAMEPAD:
+ case InputDevice.SOURCE_DPAD:
+ SDLActivity.handleJoystickMotionEvent(event);
+ return true;
+
+ case InputDevice.SOURCE_MOUSE:
+ action = event.getActionMasked();
+ switch (action) {
+ case MotionEvent.ACTION_SCROLL:
+ x = event.getAxisValue(MotionEvent.AXIS_HSCROLL, 0);
+ y = event.getAxisValue(MotionEvent.AXIS_VSCROLL, 0);
+ SDLActivity.onNativeMouse(0, action, x, y);
+ return true;
+
+ case MotionEvent.ACTION_HOVER_MOVE:
+ x = event.getX(0);
+ y = event.getY(0);
+
+ SDLActivity.onNativeMouse(0, action, x, y);
+ return true;
+
+ default:
+ break;
+ }
+ break;
+
+ default:
+ break;
+ }
+
+ // Event was not managed
+ return false;
+ }
+}
diff --git a/android-project/app/src/main/java/org/mamedev/mame/MAME.java b/android-project/app/src/main/java/org/mamedev/mame/MAME.java
new file mode 100644
index 00000000000..d243b59159f
--- /dev/null
+++ b/android-project/app/src/main/java/org/mamedev/mame/MAME.java
@@ -0,0 +1,9 @@
+package org.mamedev.mame;
+
+import org.libsdl.app.SDLActivity;
+/**
+ SDL Activity
+*/
+public class MAME extends SDLActivity {
+
+}
diff --git a/android-project/app/src/main/libs/arm64-v8a/.gitignore b/android-project/app/src/main/libs/arm64-v8a/.gitignore
new file mode 100644
index 00000000000..140f8cf80f2
--- /dev/null
+++ b/android-project/app/src/main/libs/arm64-v8a/.gitignore
@@ -0,0 +1 @@
+*.so
diff --git a/android-project/app/src/main/libs/armeabi-v7a/.gitignore b/android-project/app/src/main/libs/armeabi-v7a/.gitignore
new file mode 100644
index 00000000000..140f8cf80f2
--- /dev/null
+++ b/android-project/app/src/main/libs/armeabi-v7a/.gitignore
@@ -0,0 +1 @@
+*.so
diff --git a/android-project/app/src/main/libs/mips/.gitignore b/android-project/app/src/main/libs/mips/.gitignore
new file mode 100644
index 00000000000..140f8cf80f2
--- /dev/null
+++ b/android-project/app/src/main/libs/mips/.gitignore
@@ -0,0 +1 @@
+*.so
diff --git a/android-project/app/src/main/libs/mips64/.gitignore b/android-project/app/src/main/libs/mips64/.gitignore
new file mode 100644
index 00000000000..140f8cf80f2
--- /dev/null
+++ b/android-project/app/src/main/libs/mips64/.gitignore
@@ -0,0 +1 @@
+*.so
diff --git a/android-project/app/src/main/libs/x86/.gitignore b/android-project/app/src/main/libs/x86/.gitignore
new file mode 100644
index 00000000000..140f8cf80f2
--- /dev/null
+++ b/android-project/app/src/main/libs/x86/.gitignore
@@ -0,0 +1 @@
+*.so
diff --git a/android-project/app/src/main/libs/x86_64/.gitignore b/android-project/app/src/main/libs/x86_64/.gitignore
new file mode 100644
index 00000000000..140f8cf80f2
--- /dev/null
+++ b/android-project/app/src/main/libs/x86_64/.gitignore
@@ -0,0 +1 @@
+*.so
diff --git a/android-project/app/src/main/res/drawable-hdpi/ic_launcher.png b/android-project/app/src/main/res/drawable-hdpi/ic_launcher.png
new file mode 100644
index 00000000000..d50bdaae06e
--- /dev/null
+++ b/android-project/app/src/main/res/drawable-hdpi/ic_launcher.png
Binary files differ
diff --git a/android-project/app/src/main/res/drawable-mdpi/ic_launcher.png b/android-project/app/src/main/res/drawable-mdpi/ic_launcher.png
new file mode 100644
index 00000000000..0a299eb3cc0
--- /dev/null
+++ b/android-project/app/src/main/res/drawable-mdpi/ic_launcher.png
Binary files differ
diff --git a/android-project/app/src/main/res/drawable-xhdpi/ic_launcher.png b/android-project/app/src/main/res/drawable-xhdpi/ic_launcher.png
new file mode 100644
index 00000000000..a336ad5c2ba
--- /dev/null
+++ b/android-project/app/src/main/res/drawable-xhdpi/ic_launcher.png
Binary files differ
diff --git a/android-project/app/src/main/res/drawable-xxhdpi/ic_launcher.png b/android-project/app/src/main/res/drawable-xxhdpi/ic_launcher.png
new file mode 100644
index 00000000000..d423dac2624
--- /dev/null
+++ b/android-project/app/src/main/res/drawable-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/android-project/app/src/main/res/layout/main.xml b/android-project/app/src/main/res/layout/main.xml
new file mode 100644
index 00000000000..123c4b6eac5
--- /dev/null
+++ b/android-project/app/src/main/res/layout/main.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:orientation="vertical"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ >
+<TextView
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:text="Hello World, SDLActivity"
+ />
+</LinearLayout>
+
diff --git a/android-project/app/src/main/res/values/strings.xml b/android-project/app/src/main/res/values/strings.xml
new file mode 100644
index 00000000000..28dd1ee79a1
--- /dev/null
+++ b/android-project/app/src/main/res/values/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <string name="app_name">MAME</string>
+</resources>
diff --git a/android-project/build.gradle b/android-project/build.gradle
new file mode 100644
index 00000000000..88d246d44a6
--- /dev/null
+++ b/android-project/build.gradle
@@ -0,0 +1,15 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+buildscript {
+ repositories {
+ jcenter()
+ }
+ dependencies {
+ classpath 'com.android.tools.build:gradle:1.2.3'
+ }
+}
+
+allprojects {
+ repositories {
+ jcenter()
+ }
+}
diff --git a/android-project/gradle/wrapper/gradle-wrapper.jar b/android-project/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 00000000000..8c0fb64a869
--- /dev/null
+++ b/android-project/gradle/wrapper/gradle-wrapper.jar
Binary files differ
diff --git a/android-project/gradle/wrapper/gradle-wrapper.properties b/android-project/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 00000000000..0c71e760dc9
--- /dev/null
+++ b/android-project/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Wed Apr 10 15:27:10 PDT 2013
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
diff --git a/android-project/gradlew b/android-project/gradlew
new file mode 100644
index 00000000000..91a7e269e19
--- /dev/null
+++ b/android-project/gradlew
@@ -0,0 +1,164 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+## Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+ echo "$*"
+}
+
+die ( ) {
+ echo
+ echo "$*"
+ echo
+ exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+ CYGWIN* )
+ cygwin=true
+ ;;
+ Darwin* )
+ darwin=true
+ ;;
+ MINGW* )
+ msys=true
+ ;;
+esac
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched.
+if $cygwin ; then
+ [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+fi
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+ ls=`ls -ld "$PRG"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '/.*' > /dev/null; then
+ PRG="$link"
+ else
+ PRG=`dirname "$PRG"`"/$link"
+ fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >&-
+APP_HOME="`pwd -P`"
+cd "$SAVED" >&-
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+ # IBM's JDK on AIX uses strange locations for the executables
+ JAVACMD="$JAVA_HOME/jre/sh/java"
+ else
+ JAVACMD="$JAVA_HOME/bin/java"
+ fi
+ if [ ! -x "$JAVACMD" ] ; then
+ die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+ fi
+else
+ JAVACMD="java"
+ which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+ MAX_FD_LIMIT=`ulimit -H -n`
+ if [ $? -eq 0 ] ; then
+ if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+ MAX_FD="$MAX_FD_LIMIT"
+ fi
+ ulimit -n $MAX_FD
+ if [ $? -ne 0 ] ; then
+ warn "Could not set maximum file descriptor limit: $MAX_FD"
+ fi
+ else
+ warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+ fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+ GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+ APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+ CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
+ # We build the pattern for arguments to be converted via cygpath
+ ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+ SEP=""
+ for dir in $ROOTDIRSRAW ; do
+ ROOTDIRS="$ROOTDIRS$SEP$dir"
+ SEP="|"
+ done
+ OURCYGPATTERN="(^($ROOTDIRS))"
+ # Add a user-defined pattern to the cygpath arguments
+ if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+ OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+ fi
+ # Now convert the arguments - kludge to limit ourselves to /bin/sh
+ i=0
+ for arg in "$@" ; do
+ CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+ CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
+
+ if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
+ eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+ else
+ eval `echo args$i`="\"$arg\""
+ fi
+ i=$((i+1))
+ done
+ case $i in
+ (0) set -- ;;
+ (1) set -- "$args0" ;;
+ (2) set -- "$args0" "$args1" ;;
+ (3) set -- "$args0" "$args1" "$args2" ;;
+ (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+ (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+ (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+ (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+ (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+ (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+ esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+ JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
diff --git a/android-project/gradlew.bat b/android-project/gradlew.bat
new file mode 100644
index 00000000000..8a0b282aa68
--- /dev/null
+++ b/android-project/gradlew.bat
@@ -0,0 +1,90 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/android-project/settings.gradle b/android-project/settings.gradle
new file mode 100644
index 00000000000..e7b4def49cb
--- /dev/null
+++ b/android-project/settings.gradle
@@ -0,0 +1 @@
+include ':app'
diff --git a/bgfx/chains/hlsl.json b/bgfx/chains/hlsl.json
index f6064635850..17757bb8c38 100644
--- a/bgfx/chains/hlsl.json
+++ b/bgfx/chains/hlsl.json
@@ -17,7 +17,7 @@
// sliders (optional): The list of sliders used by all of the entries in this chain. Can be omitted if no entries use any sliders.
"sliders": [
// type (required): The sliders's conceptual type. Is it a list of string selections? Is it a single floating-point value? Does it require RGB values, or XY values?
- // values: "int_enum", "int", "float", "vec2", "color"
+ // values: "intenum", "int", "float", "vec2", "color"
//
// name (required): The internal name of the slider, used to attach it to entry uniforms.
// value: Any valid ASCII string.
@@ -27,7 +27,7 @@
//
// default (required): The value that this slider should have upon creation.
// type: Either a single integer value or an array of integer values corresponding to the size of the slider type:
- // "int_enum": Single integer value
+ // "intenum": Single integer value
// "int": Single integer value
// "float": Single integer value
// "vec2": Array of two integer values
@@ -52,12 +52,12 @@
// values: "none", "raster", "vector", "crt", "vectorraster", "lcd", "nonvector", "lcdraster", "lcdvector", "any", "all"
// "crt", "nonvector", and "all" are provided as aliases for "vectorraster", "lcdraster", and "any"
//
- // strings (optional): A list of strings to use with the "int_enum" type, to select from a list of text options instead of simply numbers.
+ // strings (optional): A list of strings to use with the "intenum" type, to select from a list of text options instead of simply numbers.
// value: An array of 2 or more entries, with one entry per possible slider setting from "min" to "max" inclusive.
- { "type": "int_enum", "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": "adjustments", "text": "Enable Adjustments", "default": 0, "max": 1, "min": 0, "step": 1, "scale": 1.0, "format": "%s", "screen": "any", "strings": [ "Off", "On" ] },
- { "type": "int_enum", "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": "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" },
@@ -84,31 +84,31 @@
{ "type": "vec2", "name": "radial_converge_green", "text": "Green Radial Convergence, ", "default": [ 0, 0 ], "max": [ 8000, 6000 ], "min": [ -8000, -6000 ], "step": 1, "scale": 0.1, "format": "%3.1f", "screen": "raster" },
{ "type": "vec2", "name": "radial_converge_blue", "text": "Blue Radial Convergence, ", "default": [ 0, 0 ], "max": [ 8000, 6000 ], "min": [ -8000, -6000 ], "step": 1, "scale": 0.1, "format": "%3.1f", "screen": "raster" },
- { "type": "vec2", "name": "defocus", "text": "Defocus, ", "default": [ 5, 5 ], "max": [ 500, 500 ], "min": [ 0, 0 ], "step": 1, "scale": 0.1, "format": "%2.1f", "screen": "crt" },
+ { "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": [ 45, 45, 45 ], "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": [ 55, 55, 55 ], "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": 100, "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_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_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_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": "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_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": "int_enum", "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": "float", "name": "humbar_alpha", "text": "Hum Bar Amount", "default": 0, "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": "color", "name": "floor", "text": "Signal Floor, ", "default": [ 0, 0, 0 ], "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": "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_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_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_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": "shadow_alpha", "text": "Shadow Mask Amount", "default": 0, "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_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": "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": "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": "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": "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": "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": 30, "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" }
],
// parameters (optional): A list of procedurally-generated parameters that can be bound to entry uniforms.
@@ -197,7 +197,7 @@
//
// value (required): The value against which we are comparing to determine whether this disabler is active.
// type: Either a single integer value or an array of integer values corresponding to the size of the slider's type:
- // "int_enum": Single integer value
+ // "intenum": Single integer value
// "int": Single integer value
// "float": Single integer value
// "vec2": Array of two integer values
diff --git a/hash/sms.xml b/hash/sms.xml
index 4a5e8e0bc2d..80d88195eee 100644
--- a/hash/sms.xml
+++ b/hash/sms.xml
@@ -252,6 +252,7 @@
<info name="serial" value="G-1330"/>
<info name="release" value="19871115"/>
<info name="alt_title" value="アレックスキッド BMXトライアル" />
+ <sharedfeat name="ctrl1_default" value="paddle" />
<part name="cart" interface="sms_cart">
<dataarea name="rom" size="131072">
<rom name="alex kidd bmx trial (japan).bin" size="131072" crc="f9dbb533" sha1="77cc767bfae01e9cc81612c780c939ed954a6312" offset="000000" />
@@ -392,6 +393,7 @@
</part>
</software>
+ <!-- Notes: FM support -->
<software name="altbeast">
<description>Altered Beast (Euro, USA, Bra)</description>
<year>1989</year>
@@ -534,6 +536,7 @@
<year>1990</year>
<publisher>Sega</publisher>
<info name="serial" value="7040"/>
+ <sharedfeat name="ctrl1_default" value="lphaser" />
<part name="cart" interface="sms_cart">
<dataarea name="rom" size="262144">
<rom name="assault city (europe) (light phaser).bin" size="262144" crc="861b6e79" sha1="835217550ecb92422d887a3353ff43890c71566b" offset="000000" />
@@ -665,6 +668,7 @@
</part>
</software>
+ <!-- Notes: FM support -->
<software name="aliensyn">
<description>Alien Syndrome (Euro, USA, Bra)</description>
<year>1987</year>
@@ -752,6 +756,7 @@
<description>Back to the Future Part III (Euro)</description>
<year>1992</year>
<publisher>Image Works</publisher>
+ <info name="usage" value="Only runs with PAL/50Hz drivers, e.g. smspal" />
<info name="serial" value="MK-27020-50"/>
<part name="cart" interface="sms_cart">
<dataarea name="rom" size="262144">
@@ -1022,6 +1027,7 @@
</part>
</software>
+ <!-- Notes: 3D glasses support -->
<software name="bladeag1" cloneof="bladeag">
<description>Blade Eagle (USA, Prototype)</description>
<year>1988</year>
@@ -1245,6 +1251,7 @@
</part>
</software>
+ <!-- Notes: FM support -->
<software name="calgames">
<description>California Games (Euro, USA, Bra)</description>
<year>1989</year>
@@ -1278,6 +1285,7 @@
</part>
</software>
+ <!-- Notes: FM support -->
<software name="captsilvu" cloneof="captsilv">
<description>Captain Silver (USA)</description>
<year>1988</year>
@@ -1290,6 +1298,7 @@
</part>
</software>
+ <!-- Notes: FM support -->
<software name="casino">
<description>Casino Games (Euro, USA)</description>
<year>1989</year>
@@ -1505,6 +1514,7 @@
</part>
</software>
+ <!-- Notes: FM support -->
<software name="cloudmst">
<description>Cloud Master (Euro, USA)</description>
<year>1989</year>
@@ -1603,10 +1613,12 @@
</part>
</software>
+ <!-- Notes: Requires an extra-height video mode absent on the 315-5124 VDP -->
<software name="cosmic">
<description>Cosmic Spacehead (Euro)</description>
<year>1993</year>
<publisher>Codemasters</publisher>
+ <info name="usage" value="Video mode is correct only on SMS 2 drivers, e.g. smspal" />
<info name="serial" value="MK-27074-50"/>
<part name="cart" interface="sms_cart">
<feature name="slot" value="codemasters" />
@@ -1639,6 +1651,7 @@
</part>
</software>
+ <!-- Notes: FM support -->
<software name="cyborgh">
<description>Cyborg Hunter (Euro, USA, Bra)</description>
<year>1988</year>
@@ -1719,6 +1732,7 @@
</part>
</software>
+ <!-- Notes: FM support -->
<software name="ddragonk" cloneof="ddragon">
<description>Double Dragon (Kor)</description>
<year>198?</year>
@@ -1828,6 +1842,7 @@
</part>
</software>
+ <!-- Notes: FM support -->
<software name="dokidokip" cloneof="pengland">
<description>Doki Doki Penguin Land - Uchuu Daibouken (Jpn, Prototype)</description>
<year>1987</year>
@@ -2139,10 +2154,12 @@
</part>
</software>
+ <!-- Notes: Requires an extra-height video mode absent on the 315-5124 VDP -->
<software name="excdizzy" supported="no">
<description>The Excellent Dizzy Collection (Euro, USA, Prototype)</description>
<year>19??</year>
<publisher>Codemasters</publisher>
+ <info name="usage" value="Video mode is correct only on SMS 2 drivers, e.g. smspal" />
<part name="cart" interface="sms_cart">
<feature name="slot" value="codemasters" />
<dataarea name="rom" size="262144">
@@ -2249,10 +2266,12 @@
</part>
</software>
+ <!-- Notes: Requires an extra-height video mode absent on the 315-5124 VDP -->
<software name="fantdizz">
<description>Fantastic Dizzy (Euro)</description>
<year>1993</year>
<publisher>Codemasters</publisher>
+ <info name="usage" value="Video mode is correct only on SMS 2 drivers, e.g. smspal" />
<info name="serial" value="MK-27074-50"/>
<part name="cart" interface="sms_cart">
<feature name="slot" value="codemasters" />
@@ -2262,6 +2281,7 @@
</part>
</software>
+ <!-- Notes: FM support -->
<software name="fantzon2">
<description>Fantasy Zone II - The Tears of Opa-Opa (Euro, USA, Bra)</description>
<year>1987</year>
@@ -2350,6 +2370,7 @@
</part>
</software>
+ <!-- Notes: FM support -->
<software name="fantzonm">
<description>Fantasy Zone - The Maze (Euro, USA)</description>
<year>1987</year>
@@ -2547,6 +2568,8 @@
<info name="serial" value="G-1348"/>
<info name="release" value="19880221"/>
<info name="alt_title" value="ギャラクティック プロテクター" />
+ <sharedfeat name="ctrl1_default" value="paddle" />
+ <sharedfeat name="ctrl2_default" value="paddle" />
<part name="cart" interface="sms_cart">
<!-- PCB info based on SMS Power -->
<feature name="pcb" value="171-5552" />
@@ -2569,6 +2592,7 @@
</part>
</software>
+ <!-- Notes: FM support -->
<software name="gforce">
<description>Galaxy Force (Euro, Bra)</description>
<year>1989</year>
@@ -2585,6 +2609,7 @@
</part>
</software>
+ <!-- Notes: FM support -->
<software name="gforceu" cloneof="gforce">
<description>Galaxy Force (USA)</description>
<year>1989</year>
@@ -2597,6 +2622,7 @@
</part>
</software>
+ <!-- Notes: FM support -->
<software name="gamebox">
<description>Game Box Série Esportes Radicais (Bra)</description>
<year>19??</year>
@@ -2634,6 +2660,8 @@
<year>1987</year>
<publisher>Sega</publisher>
<info name="serial" value="5074, 023.120"/>
+ <sharedfeat name="ctrl1_default" value="lphaser" />
+ <sharedfeat name="ctrl2_default" value="lphaser" />
<part name="cart" interface="sms_cart">
<!-- PCB info based on US cart (nepereny's), to check the cart with MPR-10577 -->
<feature name="pcb" value="171-5519" />
@@ -2778,6 +2806,7 @@
</part>
</software>
+ <!-- Notes: FM support -->
<software name="globald">
<description>Global Defense (Euro, USA)</description>
<year>1987</year>
@@ -2793,6 +2822,7 @@
</part>
</software>
+ <!-- Notes: FM support -->
<software name="globaldp" cloneof="globald">
<description>Global Defense (Euro, USA, Prototype)</description>
<year>1987</year>
@@ -2816,6 +2846,7 @@
</part>
</software>
+ <!-- Notes: FM support -->
<software name="golfaman">
<description>Golfamania (Euro, Bra)</description>
<year>1990</year>
@@ -2836,6 +2867,7 @@
</part>
</software>
+ <!-- Notes: FM support -->
<software name="golfamanp" cloneof="golfaman">
<description>Golfamania (Prototype)</description>
<year>1990</year>
@@ -2850,6 +2882,7 @@
</part>
</software>
+ <!-- Notes: FM support -->
<software name="golvell">
<description>Golvellius (Euro, USA)</description>
<year>1988</year>
@@ -2955,6 +2988,7 @@
</part>
</software>
+ <!-- Notes: FM support -->
<software name="greatglf1" cloneof="greatglf">
<description>Great Golf (Euro, USA, v1.0)</description>
<year>1987</year>
@@ -3008,6 +3042,8 @@
<year>1987</year>
<publisher>Sega</publisher>
<info name="serial" value="5062 (USA)"/>
+ <sharedfeat name="ctrl1_default" value="sportspad" />
+ <sharedfeat name="ctrl2_default" value="sportspad" />
<part name="cart" interface="sms_cart">
<!-- PCB info based on SMS Power (Jpn cart) -->
<feature name="pcb" value="171-5552" />
@@ -3270,6 +3306,7 @@
</part>
</software>
+ <!-- Notes: FM support -->
<software name="hwaran" cloneof="kenseid">
<description>Hwarang Ui Geom (Kor)</description>
<year>1988</year>
@@ -3484,6 +3521,7 @@
</part>
</software>
+ <!-- Notes: FM support -->
<software name="kenseid">
<description>Kenseiden (Euro, USA, Bra)</description>
<year>1988</year>
@@ -3631,6 +3669,7 @@
</part>
</software>
+ <!-- Notes: optional Light Phaser support -->
<software name="lghost">
<description>Laser Ghost (Euro)</description>
<year>1991</year>
@@ -3695,10 +3734,12 @@
</part>
</software>
+ <!-- Notes: 3D glasses support -->
<software name="loffire">
<description>Line of Fire (Euro, Bra, Kor)</description>
<year>1991</year>
<publisher>Sega</publisher>
+ <info name="usage" value="To play in 3-D on SMS1, hold buttons 1 and 2 while powering up the system." />
<info name="serial" value="9006, GB-4011JG"/>
<part name="cart" interface="sms_cart">
<dataarea name="rom" size="524288">
@@ -3720,6 +3761,7 @@
</part>
</software>
+ <!-- Notes: FM support -->
<software name="lordswrd">
<description>Lord of the Sword (Euro, USA, Bra)</description>
<year>1988</year>
@@ -3881,6 +3923,7 @@
<year>1986</year>
<publisher>Sega</publisher>
<info name="serial" value="6080"/>
+ <sharedfeat name="ctrl1_default" value="lphaser" />
<part name="cart" interface="sms_cart">
<!-- PCB info based on SMS Power -->
<feature name="pcb" value="??" />
@@ -3897,6 +3940,7 @@
<year>1986</year>
<publisher>Sega</publisher>
<info name="serial" value="6003"/>
+ <sharedfeat name="ctrl1_default" value="lphaser" />
<part name="cart" interface="sms_cart">
<dataarea name="rom" size="131072">
<rom name="marksman shooting &amp; trap shooting (usa).bin" size="131072" crc="e8ea842c" sha1="5491cce7b9c19cb49060da94ab8f9c4331e77cb3" offset="000000" />
@@ -3931,6 +3975,7 @@
</part>
</software>
+ <!-- Notes: FM support, 3D glasses support -->
<software name="mazehunt">
<description>Maze Hunter 3-D (Euro, USA, Bra)</description>
<year>1988</year>
@@ -3972,6 +4017,7 @@
<info name="serial" value="G-1359"/>
<info name="release" value="19880730"/>
<info name="alt_title" value="(ã‚)組レスキュー" />
+ <sharedfeat name="ctrl1_default" value="paddle" />
<part name="cart" interface="sms_cart">
<dataarea name="rom" size="131072">
<rom name="megumi rescue (japan).bin" size="131072" crc="29bc7fad" sha1="7bd156cf8dc2ad07c666ac58ccb3c0ff6671b93f" offset="000000" />
@@ -4022,10 +4068,12 @@
</part>
</software>
+ <!-- Notes: Requires an extra-height video mode absent on the 315-5124 VDP -->
<software name="micromac">
<description>Micro Machines (Euro)</description>
<year>1994</year>
<publisher>Codemasters</publisher>
+ <info name="usage" value="Video mode is correct only on SMS 2 drivers, e.g. smspal" />
<info name="serial" value="19001"/>
<part name="cart" interface="sms_cart">
<feature name="slot" value="codemasters" />
@@ -4046,6 +4094,7 @@
</part>
</software>
+ <!-- Notes: FM support -->
<software name="miracle">
<description>Miracle Warriors - Seal of the Dark Lord (Euro, USA, Bra)</description>
<year>1987</year>
@@ -4061,6 +4110,7 @@
</part>
</software>
+ <!-- Notes: FM support -->
<software name="miraclep" cloneof="miracle">
<description>Miracle Warriors - Seal of the Dark Lord (Prototype)</description>
<year>1987</year>
@@ -4075,11 +4125,13 @@
</part>
</software>
+ <!-- Notes: 3D glasses support -->
<software name="missil3d">
<description>Missile Defense 3-D (Euro, USA, Bra)</description>
<year>19??</year>
<publisher>Sega</publisher>
<info name="serial" value="8001, 023.230"/>
+ <sharedfeat name="ctrl1_default" value="lphaser" />
<part name="cart" interface="sms_cart">
<!-- PCB info based on US cart (nepereny's) -->
<feature name="pcb" value="171-5519" />
@@ -4129,6 +4181,7 @@
</part>
</software>
+ <!-- Notes: FM support -->
<software name="monica" cloneof="wboymlnd">
<description>Mônica no Castelo do Dragao (Bra)</description>
<year>1991</year>
@@ -4457,6 +4510,7 @@
<year>1990</year>
<publisher>Sega</publisher>
<info name="serial" value="7039"/>
+ <sharedfeat name="ctrl1_default" value="lphaser" />
<part name="cart" interface="sms_cart">
<dataarea name="rom" size="262144">
<rom name="operation wolf (europe).bin" size="262144" crc="205caae8" sha1="064040452b6bacc75443dae7916a0fd573f1600d" offset="000000" />
@@ -4476,7 +4530,7 @@
</part>
</software>
- <!-- Notes: FM support -->
+ <!-- Notes: FM support, optional Paddle Control support -->
<software name="outrun">
<description>Out Run (World)</description>
<year>1987</year>
@@ -4494,6 +4548,7 @@
</part>
</software>
+ <!-- Notes: FM support, 3D glasses support, optional Paddle Control support -->
<software name="outrun3d">
<description>Out Run 3-D (Euro, Bra)</description>
<year>1991</year>
@@ -4560,6 +4615,7 @@
</part>
</software>
+ <!-- Notes: FM support -->
<software name="parlour">
<description>Parlour Games (Euro, USA)</description>
<year>1987</year>
@@ -4600,6 +4656,7 @@
</part>
</software>
+ <!-- Notes: FM support -->
<software name="pengland">
<description>Penguin Land (Euro, USA)</description>
<year>1987</year>
@@ -4680,6 +4737,7 @@
</part>
</software>
+ <!-- Notes: FM support, 3D glasses support -->
<software name="poseidon">
<description>Poseidon Wars 3-D (Euro, USA, Bra)</description>
<year>1988</year>
@@ -4695,6 +4753,7 @@
</part>
</software>
+ <!-- Notes: FM support -->
<software name="pstrike">
<description>Power Strike (Euro, Bra, Kor)</description>
<year>1988</year>
@@ -4866,6 +4925,7 @@
</part>
</software>
+ <!-- Notes: FM support -->
<!-- This is the MegaDrive version (released in 1994), also included in "Phantasy Star Collection" for the Sega Saturn -->
<!-- It currently does not work in the megadrij driver -->
<software name="pstarjmd" cloneof="pstar">
@@ -5026,6 +5086,7 @@
<year>1988</year>
<publisher>Sega</publisher>
<info name="serial" value="7015"/>
+ <sharedfeat name="ctrl1_default" value="lphaser" />
<part name="cart" interface="sms_cart">
<!-- PCB info based on US cart (nepereny's) -->
<feature name="pcb" value="171-5507" />
@@ -5036,6 +5097,7 @@
</part>
</software>
+ <!-- Notes: FM support -->
<software name="rampage">
<description>Rampage (Euro, USA, Bra)</description>
<year>1988</year>
@@ -5063,6 +5125,7 @@
</part>
</software>
+ <!-- Notes: FM support -->
<software name="rastan">
<description>Rastan (Euro, USA, Bra)</description>
<year>1988</year>
@@ -5125,11 +5188,13 @@
</part>
</software>
+ <!-- Notes: FM support -->
<software name="rescuems">
<description>Rescue Mission (Euro, USA, Bra)</description>
<year>1988</year>
<publisher>Sega</publisher>
<info name="serial" value="5106"/>
+ <sharedfeat name="ctrl1_default" value="lphaser" />
<part name="cart" interface="sms_cart">
<!-- PCB info based on US cart (nepereny's) -->
<feature name="pcb" value="171-5519" />
@@ -5236,6 +5301,7 @@
</part>
</software>
+ <!-- Notes: FM support -->
<software name="rtypep" cloneof="rtype">
<description>R-Type (Prototype)</description>
<year>1988</year>
@@ -5381,6 +5447,7 @@
</part>
</software>
+ <!-- Notes: FM support -->
<software name="sspirits">
<description>Scramble Spirits (Euro, Bra)</description>
<year>1989</year>
@@ -5438,6 +5505,7 @@
<description>Sega Graphic Board (Jpn, Prototype v2.0)</description>
<year>1987</year>
<publisher>Sega</publisher>
+ <sharedfeat name="ctrl1_default" value="graphic" />
<part name="cart" interface="sms_cart">
<dataarea name="rom" size="32768">
<rom name="graphic board v2.0.bin" size="32768" crc="276aa542" sha1="d04ea11e1f6743ab4e73eadd95fa9f9fb2eb01fe" offset="000000" />
@@ -5528,6 +5596,7 @@
</part>
</software>
+ <!-- Notes: FM support -->
<software name="shanghai">
<description>Shanghai (Euro, USA)</description>
<year>1988</year>
@@ -5540,6 +5609,7 @@
</part>
</software>
+ <!-- Notes: FM support -->
<software name="shanghaip" cloneof="shanghai">
<description>Shanghai (Prototype)</description>
<year>1988</year>
@@ -5566,6 +5636,7 @@
</part>
</software>
+ <!-- Notes: FM support, 3D glasses support -->
<software name="sharr3d">
<description>Space Harrier 3-D (Euro, USA, Bra)</description>
<year>1988</year>
@@ -5616,6 +5687,7 @@
</part>
</software>
+ <!-- Notes: FM support -->
<software name="shinobi">
<description>Shinobi (Euro, USA, Bra, v1)</description>
<year>1988</year>
@@ -5648,6 +5720,7 @@
<year>1987</year>
<publisher>Sega</publisher>
<info name="serial" value="5072"/>
+ <sharedfeat name="ctrl1_default" value="lphaser" />
<part name="cart" interface="sms_cart">
<!-- PCB info based on SMS Power -->
<feature name="pcb" value="??" />
@@ -5944,6 +6017,7 @@
<year>1992</year>
<publisher>Sega</publisher>
<info name="serial" value="9010"/>
+ <sharedfeat name="ctrl1_default" value="lphaser" />
<part name="cart" interface="sms_cart">
<!-- PCB info based on SMS Power (Euro cart?) -->
<feature name="pcb" value="171-5559-01D" />
@@ -5991,6 +6065,7 @@
</part>
</software>
+ <!-- Notes: FM support -->
<software name="spellcst">
<description>SpellCaster (Euro, USA, Bra)</description>
<year>1988</year>
@@ -6039,6 +6114,8 @@
<year>1987</year>
<publisher>Sega</publisher>
<info name="serial" value="5060"/>
+ <sharedfeat name="ctrl1_default" value="sportspad" />
+ <sharedfeat name="ctrl2_default" value="sportspad" />
<part name="cart" interface="sms_cart">
<dataarea name="rom" size="131072">
<rom name="sports pad football (usa).bin" size="131072" crc="e42e4998" sha1="556d9ab4ba3c3a34440b36c6fc8e972f70f16d72" offset="000000" />
@@ -6046,7 +6123,6 @@
</part>
</software>
- <!-- Notes: Sports Pad support -->
<software name="sportssc" cloneof="worldsoc">
<description>Sports Pad Soccer (Jpn)</description>
<year>1988</year>
@@ -6054,6 +6130,8 @@
<info name="serial" value="G-1365"/>
<info name="release" value="19881029"/>
<info name="alt_title" value="スãƒãƒ¼ãƒ„パッドサッカー" />
+ <sharedfeat name="ctrl1_default" value="sportspadjp" />
+ <sharedfeat name="ctrl2_default" value="sportspadjp" />
<part name="cart" interface="sms_cart">
<dataarea name="rom" size="131072">
<rom name="sports pad soccer (japan).bin" size="131072" crc="41c948bf" sha1="7634ce39e87049dad1ee4f32a80d728e4bd1f81f" offset="000000" />
@@ -6284,10 +6362,13 @@
</part>
</software>
+ <!-- Notes: This clone replaced the original paddle code with code for the regular controller, but like the former it is used only when
+ the system region is detected as Japanese, what happens with Korean Mark-III/SMS1 versions, but not with Korean SMS2 versions. -->
<software name="superark" cloneof="woodypop">
<description>Super Arkanoid (Kor)</description>
<year>1989</year>
<publisher>HiCom</publisher>
+ <info name="usage" value="Input works only with drivers of Japanese region, e.g. sms1kr,smsj" />
<info name="serial" value="G-2101"/>
<info name="alt_title" value="슈í¼ì•Œì¹´ë…¸ì´ë“œ" />
<part name="cart" interface="sms_cart">
@@ -6396,7 +6477,7 @@
</part>
</software>
- <!-- Notes: FM support -->
+ <!-- Notes: FM support, optional Paddle Control support -->
<software name="superrac">
<description>Super Racing (Jpn)</description>
<year>1988</year>
@@ -6528,6 +6609,7 @@
</part>
</software>
+ <!-- Notes: FM support -->
<software name="tennis">
<description>Tennis Ace (Euro, Bra)</description>
<year>1989</year>
@@ -6591,6 +6673,7 @@
</part>
</software>
+ <!-- Notes: FM support -->
<software name="tblade">
<description>Thunder Blade (Euro, USA, Bra)</description>
<year>1988</year>
@@ -6621,6 +6704,7 @@
</part>
</software>
+ <!-- Notes: FM support -->
<software name="timesold">
<description>Time Soldiers (Euro, USA, Bra)</description>
<year>1989</year>
@@ -6733,6 +6817,7 @@
</part>
</software>
+ <!-- Notes: FM support -->
<software name="turmamon" cloneof="wboy3">
<description>Turma da Mônica em O Resgate (Bra)</description>
<year>1993</year>
@@ -6760,6 +6845,7 @@
</part>
</software>
+ <!-- Notes: FM support -->
<software name="ultima4">
<description>Ultima IV - Quest of the Avatar (Euro, Bra)</description>
<year>1990</year>
@@ -6780,6 +6866,7 @@
</part>
</software>
+ <!-- Notes: FM support -->
<software name="ultima4p" cloneof="ultima4">
<description>Ultima IV - Quest of the Avatar (Euro, Prototype)</description>
<year>1990</year>
@@ -6829,6 +6916,7 @@
</part>
</software>
+ <!-- Notes: FM support -->
<software name="vigilant">
<description>Vigilante (Euro, USA, Bra)</description>
<year>1989</year>
@@ -6861,6 +6949,7 @@
<year>1989</year>
<publisher>Sega</publisher>
<info name="serial" value="5118"/>
+ <sharedfeat name="ctrl1_default" value="lphaser" />
<part name="cart" interface="sms_cart">
<!-- PCB info based on SMS Power (Euro cart?) -->
<feature name="pcb" value="??" />
@@ -6898,6 +6987,7 @@
</part>
</software>
+ <!-- Notes: FM support -->
<software name="wboy3">
<description>Wonder Boy III - The Dragon's Trap (Euro, USA, Kor)</description>
<year>1989</year>
@@ -6913,6 +7003,7 @@
</part>
</software>
+ <!-- Notes: FM support -->
<software name="wboymlnd">
<description>Wonder Boy in Monster Land (Euro, USA)</description>
<year>1988</year>
@@ -6928,6 +7019,7 @@
</part>
</software>
+ <!-- Notes: FM support -->
<software name="wboymlndp" cloneof="wboymlnd">
<description>Wonder Boy in Monster Land (Prototype)</description>
<year>1988</year>
@@ -6954,6 +7046,7 @@
</part>
</software>
+ <!-- Notes: FM support -->
<!-- From Bock: "This hack does two things: force the game to run in Japanese mode (with an harder difficulty level), and allows to
Pause the game by pressing LEFT+RIGHT+Button 2 on joypad 1 (a combination that cannot be done on a normal SMS joypad). -->
<software name="wboymlnda" cloneof="wboymlnd">
@@ -7187,6 +7280,7 @@
</part>
</software>
+ <!-- Notes: optional Sports Pad (US model) support -->
<software name="worldsoc">
<description>World Soccer (Euro, Jpn, Kor) ~ Great Soccer (USA)</description>
<year>1987</year>
@@ -7288,11 +7382,12 @@
</part>
</software>
- <!-- Notes: FM support -->
+ <!-- Notes: FM support, video code relies on the tilemap mirroring bug of the 315-5124 VDP -->
<software name="ysj" cloneof="ys">
<description>Ys (Jpn)</description>
<year>1988</year>
<publisher>Sega</publisher>
+ <info name="usage" value="Video only works correctly on drivers with SMS1 VDP, e.g. smsj" />
<info name="serial" value="G-1370"/>
<info name="release" value="19881015"/>
<info name="alt_title" value="イース" />
@@ -7354,6 +7449,7 @@
</part>
</software>
+ <!-- Notes: 3D glasses support -->
<software name="zaxxon3dp" cloneof="zaxxon3d">
<description>Zaxxon 3-D (World, Prototype)</description>
<year>1987</year>
@@ -7792,6 +7888,7 @@
<publisher>Sega</publisher>
<info name="serial" value="C-519"/>
<info name="release" value="19870315"/>
+ <sharedfeat name="ctrl1_default" value="paddle" />
<part name="cart" interface="sms_card">
<dataarea name="rom" size="32768">
<rom name="woody pop - shinjinrui no block kuzushi (japan).bin" size="32768" crc="315917d4" sha1="b74078c4a3e6d20d21ca81e88c0cb3381b0c84a4" offset="000000" />
diff --git a/language/Afrikaans/strings.po b/language/Afrikaans/strings.po
index 97ed4a7678c..9fc78e87309 100644
--- a/language/Afrikaans/strings.po
+++ b/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
-#, 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
+#: src/emu/ui/ui.cpp:1060
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:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335
-#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401
-#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445
+#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219
+#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285
+#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351
+#: 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:2509
+#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443
+#: 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 ""
diff --git a/language/Albanian/strings.po b/language/Albanian/strings.po
index 234d9bab5a7..103406497b6 100644
--- a/language/Albanian/strings.po
+++ b/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
-#, 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
+#: src/emu/ui/ui.cpp:1060
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:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335
-#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401
-#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445
+#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219
+#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285
+#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351
+#: 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:2509
+#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443
+#: 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 ""
diff --git a/language/Arabic/strings.po b/language/Arabic/strings.po
index 9ca4446b4b7..0cbffed36c5 100644
--- a/language/Arabic/strings.po
+++ b/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
-#, 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
+#: src/emu/ui/ui.cpp:1060
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:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335
-#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401
-#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445
+#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219
+#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285
+#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351
+#: 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:2509
+#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443
+#: 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 ""
diff --git a/language/Basque/strings.po b/language/Basque/strings.po
index 80d97f6431b..f8049df77cb 100644
--- a/language/Basque/strings.po
+++ b/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
-#, 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
+#: src/emu/ui/ui.cpp:1060
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:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335
-#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401
-#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445
+#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219
+#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285
+#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351
+#: 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:2509
+#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443
+#: 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 ""
diff --git a/language/Belarusian/strings.po b/language/Belarusian/strings.po
index dee99ad6d2d..58ce868f9c9 100644
--- a/language/Belarusian/strings.po
+++ b/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
-#, 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
+#: src/emu/ui/ui.cpp:1060
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:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335
-#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401
-#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445
+#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219
+#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285
+#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351
+#: 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:2509
+#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443
+#: 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 ""
diff --git a/language/Bosnian/strings.po b/language/Bosnian/strings.po
index 047d69bb2b7..c9ef3444210 100644
--- a/language/Bosnian/strings.po
+++ b/language/Bosnian/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
-#, 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
+#: src/emu/ui/ui.cpp:1060
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:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335
-#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401
-#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445
+#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219
+#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285
+#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351
+#: 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:2509
+#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443
+#: 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 ""
diff --git a/language/Bulgarian/strings.po b/language/Bulgarian/strings.po
index 16672a642ac..08aac218aed 100644
--- a/language/Bulgarian/strings.po
+++ b/language/Bulgarian/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"
@@ -61,14 +61,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
@@ -644,11 +644,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
@@ -656,7 +656,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
@@ -664,55 +664,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 ""
@@ -1573,92 +1573,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
-#, 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
+#: src/emu/ui/ui.cpp:1060
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 "
@@ -1666,7 +1654,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 "
@@ -1674,21 +1662,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"
@@ -1698,98 +1686,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"
@@ -1798,173 +1786,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:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335
-#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401
-#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445
+#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219
+#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285
+#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351
+#: 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:2509
+#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443
+#: 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 ""
diff --git a/language/Burmese/strings.po b/language/Burmese/strings.po
index d1990732f2b..ff2e30a8ddc 100644
--- a/language/Burmese/strings.po
+++ b/language/Burmese/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
-#, 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
+#: src/emu/ui/ui.cpp:1060
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:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335
-#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401
-#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445
+#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219
+#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285
+#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351
+#: 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:2509
+#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443
+#: 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 ""
diff --git a/language/Catalan/strings.po b/language/Catalan/strings.po
index b3c79f27986..af52c00a958 100644
--- a/language/Catalan/strings.po
+++ b/language/Catalan/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
-#, 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
+#: src/emu/ui/ui.cpp:1060
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:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335
-#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401
-#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445
+#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219
+#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285
+#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351
+#: 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:2509
+#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443
+#: 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 ""
diff --git a/language/Chinese_Simplified/strings.po b/language/Chinese_Simplified/strings.po
index f20edcf5c0f..6872834ffca 100644
--- a/language/Chinese_Simplified/strings.po
+++ b/language/Chinese_Simplified/strings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: MAME\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-25 23:59+0100\n"
-"PO-Revision-Date: 2016-03-26 13:57+0800\n"
+"POT-Creation-Date: 2016-03-28 09:02+0200\n"
+"PO-Revision-Date: 2016-03-28 16:32+0800\n"
"Last-Translator: YuiFAN\n"
"Language-Team: MAME Language Team\n"
"Language: zh\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 "读å–此映åƒæ¡£ï¼Œå†™å…¥å·®å¼‚æ¡£"
@@ -1597,34 +1597,17 @@ 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
-#, 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 ""
-"著作æƒæ³•ç¦æ­¢ä½¿ç”¨æ¨¡æ‹Ÿå™¨æ‰§è¡Œéžæ³•æŒæœ‰çš„ ROM 档案。\n"
-"\n"
-"如果您没有在本模拟器上执行 \"%s\" çš„åˆæ³•æƒåŠ›ï¼Œè¯·æŒ‰ ESC 键。\n"
-"\n"
-"å¦åˆ™ï¼Œè¯·é”®å…¥ OK 或移动摇æ†çš„å·¦ã€å³æ–¹å‘继续"
-
-#: src/emu/ui/ui.cpp:1081
+#: src/emu/ui/ui.cpp:1060
msgid ""
"One or more ROMs/CHDs for this machine are incorrect. The machine may not "
"run correctly.\n"
msgstr "本机械有一个或更多的 ROM/CHD 是ä¸æ­£ç¡®çš„。此机械å¯èƒ½æ— æ³•æ­£ç¡®æ‰§è¡Œã€‚\n"
-#: src/emu/ui/ui.cpp:1094
+#: src/emu/ui/ui.cpp:1073
msgid ""
"There are known problems with this machine\n"
"\n"
@@ -1632,64 +1615,64 @@ msgstr ""
"本机械已知具有下列的问题\n"
"\n"
-#: 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 "本机械有一个或更多的 ROM/CHD 尚未正确地被 DUMP。\n"
-#: 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 "键盘模拟å¯èƒ½æœªè¾¾åˆ° 100% 精确。"
-#: 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 "色彩尚未达到 100% 精确。"
-#: src/emu/ui/ui.cpp:1108
+#: src/emu/ui/ui.cpp:1087
#, c-format
msgid "The video emulation isn't 100% accurate.\n"
msgstr "视讯模拟尚未达到 100% 精确。"
-#: src/emu/ui/ui.cpp:1110
+#: src/emu/ui/ui.cpp:1089
#, c-format
msgid "The sound emulation isn't 100% accurate.\n"
msgstr "声音模拟尚未达到 100% 精确。"
-#: 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 "本机械无法完æˆï¼Œå¹¶éžæ¨¡æ‹Ÿä¸­çš„错误而å¯èƒ½å‘ˆçŽ°æ€ªå¼‚的行为或缺少元件。\n"
-#: 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 "本机械无声音硬体,故 MAME å°†ä¸ä¼šäº§ç”Ÿå£°éŸ³ï¼Œè¿™æ˜¯å¯é¢„期的行为。\n"
-#: 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 "
@@ -1699,7 +1682,7 @@ msgstr ""
"此机械无法执行,机械的模拟还ä¸å®Œå…¨ã€‚除了等待开å‘人员改良模拟之外,没有方法å¯"
"以解决这个问题。\n"
-#: 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 "
@@ -1710,7 +1693,7 @@ msgstr ""
"本机械的的部分元件无法模拟,因其需è¦å®žé™…活动的互动或机械装置的组åˆã€‚故无法完"
"æˆæ­¤æ¸¸æˆçš„执行。\n"
-#: src/emu/ui/ui.cpp:1163
+#: src/emu/ui/ui.cpp:1142
msgid ""
"\n"
"\n"
@@ -1720,14 +1703,14 @@ msgstr ""
"\n"
"本机械尚有å¯æ‰§è¡Œçš„仿制版: "
-#: 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"
-msgstr "请键入 OK 或移动摇æ†çš„å·¦ã€å³æ–¹å‘继续"
+"Press any key to continue"
+msgstr "按任æ„按键继续"
-#: src/emu/ui/ui.cpp:1192
+#: src/emu/ui/ui.cpp:1171
#, c-format
msgid ""
"%1$s\n"
@@ -1742,15 +1725,15 @@ msgstr ""
"\n"
"CPU:\n"
-#: 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 "MHz"
-#: 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 "kHz"
-#: src/emu/ui/ui.cpp:1242
+#: src/emu/ui/ui.cpp:1221
msgid ""
"\n"
"Sound:\n"
@@ -1758,7 +1741,7 @@ msgstr ""
"\n"
"声音:\n"
-#: src/emu/ui/ui.cpp:1271
+#: src/emu/ui/ui.cpp:1250
msgid ""
"\n"
"Video:\n"
@@ -1766,78 +1749,78 @@ msgstr ""
"\n"
"视讯:\n"
-#: src/emu/ui/ui.cpp:1275
+#: src/emu/ui/ui.cpp:1254
msgid "None\n"
msgstr "æ— \n"
-#: 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 "%1$s: %2$s\n"
-#: src/emu/ui/ui.cpp:1293
+#: src/emu/ui/ui.cpp:1272
msgid "%2$s\n"
msgstr "%2$s\n"
-#: 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 "UI: å·²å¯ç”¨"
-#: 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 "**使用 ScrLock 键切æ¢**"
-#: 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 "UI: å·²åœç”¨"
-#: 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 "ä¿å­˜è‡³ä½ç½® %s"
-#: src/emu/ui/ui.cpp:1851
+#: src/emu/ui/ui.cpp:1801
#, c-format
msgid "Load from position %s"
msgstr "从ä½ç½® %s 载入"
-#: src/emu/ui/ui.cpp:1891
+#: src/emu/ui/ui.cpp:1841
#, c-format
msgid ""
"Are you sure you want to quit?\n"
@@ -1850,173 +1833,173 @@ msgstr ""
"按 ''%1$s'' 退出,\n"
"按 ''%2$s'' 继续模拟。"
-#: 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 "%1$s 音é‡"
-#: src/emu/ui/ui.cpp:1998
+#: src/emu/ui/ui.cpp:1948
#, c-format
msgid "Overclock CPU %1$s"
msgstr "超频 CPU %1$s"
-#: src/emu/ui/ui.cpp:2018
+#: src/emu/ui/ui.cpp:1968
#, c-format
msgid "%1$s Refresh Rate"
msgstr "%1$s 刷新率"
-#: src/emu/ui/ui.cpp:2024
+#: src/emu/ui/ui.cpp:1974
#, c-format
msgid "%1$s Brightness"
msgstr "%1$s 亮度"
-#: src/emu/ui/ui.cpp:2027
+#: src/emu/ui/ui.cpp:1977
#, c-format
msgid "%1$s Contrast"
msgstr "%1$s 对比"
-#: src/emu/ui/ui.cpp:2030
+#: src/emu/ui/ui.cpp:1980
#, c-format
msgid "%1$s Gamma"
msgstr "%1$s 迦玛值"
-#: src/emu/ui/ui.cpp:2035
+#: src/emu/ui/ui.cpp:1985
#, c-format
msgid "%1$s Horiz Stretch"
msgstr "%1$s 水平延展"
-#: src/emu/ui/ui.cpp:2038
+#: src/emu/ui/ui.cpp:1988
#, c-format
msgid "%1$s Horiz Position"
msgstr "%1$s æ°´å¹³ä½ç½®"
-#: src/emu/ui/ui.cpp:2041
+#: src/emu/ui/ui.cpp:1991
#, c-format
msgid "%1$s Vert Stretch"
msgstr "%1$s 垂直延展"
-#: src/emu/ui/ui.cpp:2044
+#: src/emu/ui/ui.cpp:1994
#, c-format
msgid "%1$s Vert Position"
msgstr "%1$s åž‚ç›´ä½ç½®"
-#: src/emu/ui/ui.cpp:2062
+#: src/emu/ui/ui.cpp:2012
#, c-format
msgid "Laserdisc '%1$s' Horiz Stretch"
msgstr "激光影碟 %1$s 水平延展"
-#: src/emu/ui/ui.cpp:2065
+#: src/emu/ui/ui.cpp:2015
#, c-format
msgid "Laserdisc '%1$s' Horiz Position"
msgstr "激光影碟 %1$s æ°´å¹³ä½ç½®"
-#: src/emu/ui/ui.cpp:2068
+#: src/emu/ui/ui.cpp:2018
#, c-format
msgid "Laserdisc '%1$s' Vert Stretch"
msgstr "激光影碟 %1$s 垂直延展"
-#: src/emu/ui/ui.cpp:2071
+#: src/emu/ui/ui.cpp:2021
#, c-format
msgid "Laserdisc '%1$s' Vert Position"
msgstr "激光影碟 %1$s åž‚ç›´ä½ç½®"
-#: 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 "å字准星尺度 %1$s"
-#: 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 "X"
-#: 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 "Y"
-#: src/emu/ui/ui.cpp:2101
+#: src/emu/ui/ui.cpp:2051
#, c-format
msgid "Crosshair Offset %1$s"
msgstr "å字准星ä½ç§» %1$s"
-#: src/emu/ui/ui.cpp:2120
+#: src/emu/ui/ui.cpp:2070
#, c-format
msgid "%1$3ddB"
msgstr "%1$3ddB"
-#: src/emu/ui/ui.cpp:2164
+#: src/emu/ui/ui.cpp:2114
#, c-format
msgid "%1$d%%"
msgstr "%1$d%%"
-#: src/emu/ui/ui.cpp:2180
+#: src/emu/ui/ui.cpp:2130
#, c-format
msgid "%1$3.0f%%"
msgstr "%1$3.0f%%"
-#: src/emu/ui/ui.cpp:2203
+#: src/emu/ui/ui.cpp:2153
#, c-format
msgid "%1$.3ffps"
msgstr "%1$.3ffps"
-#: src/emu/ui/ui.cpp:2226 src/emu/ui/ui.cpp:2248 src/emu/ui/ui.cpp:2269
-#: src/emu/ui/ui.cpp:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335
-#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401
-#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445
+#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219
+#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285
+#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351
+#: src/emu/ui/ui.cpp:2373 src/emu/ui/ui.cpp:2395
#, c-format
msgid "%1$.3f"
msgstr "%1$.3f"
-#: src/emu/ui/ui.cpp:2461 src/emu/ui/ui.cpp:2477 src/emu/ui/ui.cpp:2493
-#: src/emu/ui/ui.cpp:2509
+#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443
+#: 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 "ç”»é¢ '%1$s'"
-#: 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 "å字准星尺度 X %1$1.3f"
-#: src/emu/ui/ui.cpp:2543
+#: src/emu/ui/ui.cpp:2493
#, c-format
msgid "Crosshair Scale Y %1$1.3f"
msgstr "å字准星尺度 Y %1$1.3f"
-#: src/emu/ui/ui.cpp:2562
+#: src/emu/ui/ui.cpp:2512
#, c-format
msgid "Crosshair Offset X %1$1.3f"
msgstr "å字准星ä½ç§» X %1$1.3f"
-#: src/emu/ui/ui.cpp:2562
+#: src/emu/ui/ui.cpp:2512
#, c-format
msgid "Crosshair Offset Y %1$1.3f"
msgstr "å字准星ä½ç§» Y %1$1.3f"
@@ -2065,6 +2048,3 @@ msgstr " 色彩"
#: src/emu/ui/viewgfx.cpp:391
msgid " PENS"
msgstr " PENS"
-
-#~ msgid "Configure Machine"
-#~ msgstr "设定机械"
diff --git a/language/Chinese_Traditional/strings.po b/language/Chinese_Traditional/strings.po
index 1df5bf00cde..bdba0a5e52c 100644
--- a/language/Chinese_Traditional/strings.po
+++ b/language/Chinese_Traditional/strings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: MAME\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-25 23:59+0100\n"
-"PO-Revision-Date: 2016-03-26 13:55+0800\n"
+"POT-Creation-Date: 2016-03-28 09:02+0200\n"
+"PO-Revision-Date: 2016-03-28 16:32+0800\n"
"Last-Translator: YuiFAN\n"
"Language-Team: MAME Language Team\n"
"Language: zh_TW\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 "讀å–此映åƒæª”,寫入差異檔"
@@ -1597,34 +1597,17 @@ 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
-#, 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 ""
-"著作權法ç¦æ­¢ä½¿ç”¨æ¨¡æ“¬å™¨åŸ·è¡Œéžæ³•æŒæœ‰çš„ ROM 檔案。\n"
-"\n"
-"如果您沒有在本模擬器上執行 \"%s\" çš„åˆæ³•æ¬ŠåŠ›ï¼Œè«‹æŒ‰ ESC éµã€‚\n"
-"\n"
-"å¦å‰‡ï¼Œè«‹éµå…¥ OK 或移動æ–æ¡¿çš„å·¦ã€å³æ–¹å‘繼續"
-
-#: src/emu/ui/ui.cpp:1081
+#: src/emu/ui/ui.cpp:1060
msgid ""
"One or more ROMs/CHDs for this machine are incorrect. The machine may not "
"run correctly.\n"
msgstr "本機å°æœ‰ä¸€å€‹æˆ–更多的 ROM/CHD 是ä¸æ­£ç¢ºçš„。此機å°å¯èƒ½ç„¡æ³•æ­£ç¢ºåŸ·è¡Œã€‚\n"
-#: src/emu/ui/ui.cpp:1094
+#: src/emu/ui/ui.cpp:1073
msgid ""
"There are known problems with this machine\n"
"\n"
@@ -1632,64 +1615,64 @@ msgstr ""
"本機å°å·²çŸ¥å…·æœ‰ä¸‹åˆ—çš„å•é¡Œ\n"
"\n"
-#: 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 "本機å°æœ‰ä¸€å€‹æˆ–更多的 ROM/CHD 尚未正確地被 DUMP。\n"
-#: 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 "éµç›¤æ¨¡æ“¬å¯èƒ½æœªé”到 100% 精確。"
-#: 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 "色彩尚未é”到 100% 精確。"
-#: src/emu/ui/ui.cpp:1108
+#: src/emu/ui/ui.cpp:1087
#, c-format
msgid "The video emulation isn't 100% accurate.\n"
msgstr "視訊模擬尚未é”到 100% 精確。"
-#: src/emu/ui/ui.cpp:1110
+#: src/emu/ui/ui.cpp:1089
#, c-format
msgid "The sound emulation isn't 100% accurate.\n"
msgstr "è²éŸ³æ¨¡æ“¬å°šæœªé”到 100% 精確。"
-#: 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 "本機å°ç„¡æ³•å®Œæˆï¼Œä¸¦éžæ¨¡æ“¬æ™‚的錯誤而å¯èƒ½å‘ˆç¾æ€ªç•°çš„行為或缺少元件。\n"
-#: 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 "本機å°ç„¡è²éŸ³ç¡¬é«”,故 MAME å°‡ä¸æœƒç”¢ç”Ÿè²éŸ³ï¼Œé€™æ˜¯å¯é æœŸçš„行為。\n"
-#: 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 "
@@ -1699,7 +1682,7 @@ msgstr ""
"此機å°ç„¡æ³•åŸ·è¡Œï¼Œæ©Ÿå°çš„模擬還ä¸å®Œå…¨ã€‚除了等待開發人員改良模擬之外,沒有方法å¯"
"以解決這個å•é¡Œã€‚\n"
-#: 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 "
@@ -1710,7 +1693,7 @@ msgstr ""
"本機å°çš„的部分元件無法模擬,因其需è¦å¯¦éš›æ´»å‹•çš„互動或機械è£ç½®çš„組åˆã€‚故無法完"
"æˆæ­¤éŠæˆ²çš„執行。\n"
-#: src/emu/ui/ui.cpp:1163
+#: src/emu/ui/ui.cpp:1142
msgid ""
"\n"
"\n"
@@ -1720,14 +1703,14 @@ msgstr ""
"\n"
"本機å°å°šæœ‰å¯åŸ·è¡Œçš„仿製版: "
-#: 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"
-msgstr "è«‹éµå…¥ OK 或移動æ–æ¡¿çš„å·¦ã€å³æ–¹å‘繼續"
+"Press any key to continue"
+msgstr "按任æ„éµç¹¼çºŒ"
-#: src/emu/ui/ui.cpp:1192
+#: src/emu/ui/ui.cpp:1171
#, c-format
msgid ""
"%1$s\n"
@@ -1742,15 +1725,15 @@ msgstr ""
"\n"
"CPU:\n"
-#: 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 "MHz"
-#: 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 "kHz"
-#: src/emu/ui/ui.cpp:1242
+#: src/emu/ui/ui.cpp:1221
msgid ""
"\n"
"Sound:\n"
@@ -1758,7 +1741,7 @@ msgstr ""
"\n"
"è²éŸ³ï¼š\n"
-#: src/emu/ui/ui.cpp:1271
+#: src/emu/ui/ui.cpp:1250
msgid ""
"\n"
"Video:\n"
@@ -1766,78 +1749,78 @@ msgstr ""
"\n"
"視訊:\n"
-#: src/emu/ui/ui.cpp:1275
+#: src/emu/ui/ui.cpp:1254
msgid "None\n"
msgstr "ç„¡\n"
-#: 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 "%1$s: %2$s\n"
-#: src/emu/ui/ui.cpp:1293
+#: src/emu/ui/ui.cpp:1272
msgid "%2$s\n"
msgstr "%2$s\n"
-#: 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 "UI: 已啟用"
-#: 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 "**使用 ScrLock éµåˆ‡æ›**"
-#: 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 "UI: å·²åœç”¨"
-#: 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 "儲存至ä½ç½® %s"
-#: src/emu/ui/ui.cpp:1851
+#: src/emu/ui/ui.cpp:1801
#, c-format
msgid "Load from position %s"
msgstr "從ä½ç½® %s 載入"
-#: src/emu/ui/ui.cpp:1891
+#: src/emu/ui/ui.cpp:1841
#, c-format
msgid ""
"Are you sure you want to quit?\n"
@@ -1850,173 +1833,173 @@ msgstr ""
"按『%1$sã€é€€å‡ºï¼Œ\n"
"按『%2$sã€ç¹¼çºŒæ¨¡æ“¬ã€‚"
-#: 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 "%1$s 音é‡"
-#: src/emu/ui/ui.cpp:1998
+#: src/emu/ui/ui.cpp:1948
#, c-format
msgid "Overclock CPU %1$s"
msgstr "超頻 CPU %1$s"
-#: src/emu/ui/ui.cpp:2018
+#: src/emu/ui/ui.cpp:1968
#, c-format
msgid "%1$s Refresh Rate"
msgstr "%1$s 更新率"
-#: src/emu/ui/ui.cpp:2024
+#: src/emu/ui/ui.cpp:1974
#, c-format
msgid "%1$s Brightness"
msgstr "%1$s 亮度"
-#: src/emu/ui/ui.cpp:2027
+#: src/emu/ui/ui.cpp:1977
#, c-format
msgid "%1$s Contrast"
msgstr "%1$s å°æ¯”"
-#: src/emu/ui/ui.cpp:2030
+#: src/emu/ui/ui.cpp:1980
#, c-format
msgid "%1$s Gamma"
msgstr "%1$s Gamma 值"
-#: src/emu/ui/ui.cpp:2035
+#: src/emu/ui/ui.cpp:1985
#, c-format
msgid "%1$s Horiz Stretch"
msgstr "%1$s 水平延展"
-#: src/emu/ui/ui.cpp:2038
+#: src/emu/ui/ui.cpp:1988
#, c-format
msgid "%1$s Horiz Position"
msgstr "%1$s æ°´å¹³ä½ç½®"
-#: src/emu/ui/ui.cpp:2041
+#: src/emu/ui/ui.cpp:1991
#, c-format
msgid "%1$s Vert Stretch"
msgstr "%1$s 垂直延展"
-#: src/emu/ui/ui.cpp:2044
+#: src/emu/ui/ui.cpp:1994
#, c-format
msgid "%1$s Vert Position"
msgstr "%1$s åž‚ç›´ä½ç½®"
-#: src/emu/ui/ui.cpp:2062
+#: src/emu/ui/ui.cpp:2012
#, c-format
msgid "Laserdisc '%1$s' Horiz Stretch"
msgstr "雷射影碟 %1$s 水平延展"
-#: src/emu/ui/ui.cpp:2065
+#: src/emu/ui/ui.cpp:2015
#, c-format
msgid "Laserdisc '%1$s' Horiz Position"
msgstr "雷射影碟 %1$s æ°´å¹³ä½ç½®"
-#: src/emu/ui/ui.cpp:2068
+#: src/emu/ui/ui.cpp:2018
#, c-format
msgid "Laserdisc '%1$s' Vert Stretch"
msgstr "雷射影碟 %1$s 垂直延展"
-#: src/emu/ui/ui.cpp:2071
+#: src/emu/ui/ui.cpp:2021
#, c-format
msgid "Laserdisc '%1$s' Vert Position"
msgstr "雷射影碟 %1$s åž‚ç›´ä½ç½®"
-#: 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 "å字準星尺度 %1$s"
-#: 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 "X"
-#: 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 "Y"
-#: src/emu/ui/ui.cpp:2101
+#: src/emu/ui/ui.cpp:2051
#, c-format
msgid "Crosshair Offset %1$s"
msgstr "å字準星ä½ç§» %1$s"
-#: src/emu/ui/ui.cpp:2120
+#: src/emu/ui/ui.cpp:2070
#, c-format
msgid "%1$3ddB"
msgstr "%1$3ddB"
-#: src/emu/ui/ui.cpp:2164
+#: src/emu/ui/ui.cpp:2114
#, c-format
msgid "%1$d%%"
msgstr "%1$d%%"
-#: src/emu/ui/ui.cpp:2180
+#: src/emu/ui/ui.cpp:2130
#, c-format
msgid "%1$3.0f%%"
msgstr "%1$3.0f%%"
-#: src/emu/ui/ui.cpp:2203
+#: src/emu/ui/ui.cpp:2153
#, c-format
msgid "%1$.3ffps"
msgstr "%1$.3ffps"
-#: src/emu/ui/ui.cpp:2226 src/emu/ui/ui.cpp:2248 src/emu/ui/ui.cpp:2269
-#: src/emu/ui/ui.cpp:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335
-#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401
-#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445
+#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219
+#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285
+#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351
+#: src/emu/ui/ui.cpp:2373 src/emu/ui/ui.cpp:2395
#, c-format
msgid "%1$.3f"
msgstr "%1$.3f"
-#: src/emu/ui/ui.cpp:2461 src/emu/ui/ui.cpp:2477 src/emu/ui/ui.cpp:2493
-#: src/emu/ui/ui.cpp:2509
+#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443
+#: 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 "ç•«é¢ '%1$s'"
-#: 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 "å字準星尺度 X %1$1.3f"
-#: src/emu/ui/ui.cpp:2543
+#: src/emu/ui/ui.cpp:2493
#, c-format
msgid "Crosshair Scale Y %1$1.3f"
msgstr "å字準星尺度 Y %1$1.3f"
-#: src/emu/ui/ui.cpp:2562
+#: src/emu/ui/ui.cpp:2512
#, c-format
msgid "Crosshair Offset X %1$1.3f"
msgstr "å字準星ä½ç§» X %1$1.3f"
-#: src/emu/ui/ui.cpp:2562
+#: src/emu/ui/ui.cpp:2512
#, c-format
msgid "Crosshair Offset Y %1$1.3f"
msgstr "å字準星ä½ç§» Y %1$1.3f"
diff --git a/language/Croatian/strings.po b/language/Croatian/strings.po
index 948c2e5ec71..2425b2d03f0 100644
--- a/language/Croatian/strings.po
+++ b/language/Croatian/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"
@@ -61,14 +61,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
@@ -644,11 +644,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
@@ -656,7 +656,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
@@ -664,55 +664,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 ""
@@ -1573,92 +1573,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
-#, 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
+#: src/emu/ui/ui.cpp:1060
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 "
@@ -1666,7 +1654,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 "
@@ -1674,21 +1662,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"
@@ -1698,98 +1686,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"
@@ -1798,173 +1786,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:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335
-#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401
-#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445
+#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219
+#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285
+#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351
+#: 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:2509
+#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443
+#: 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 ""
diff --git a/language/Czech/strings.po b/language/Czech/strings.po
index 4734bf61316..15e007cc05b 100644
--- a/language/Czech/strings.po
+++ b/language/Czech/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"
@@ -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
-#, 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
+#: src/emu/ui/ui.cpp:1060
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:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335
-#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401
-#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445
+#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219
+#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285
+#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351
+#: 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:2509
+#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443
+#: 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 ""
diff --git a/language/Danish/strings.po b/language/Danish/strings.po
index 22b48869b88..e7c6d9f99af 100644
--- a/language/Danish/strings.po
+++ b/language/Danish/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"
@@ -61,14 +61,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
@@ -644,11 +644,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
@@ -656,7 +656,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
@@ -664,55 +664,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 ""
@@ -1573,92 +1573,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
-#, 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
+#: src/emu/ui/ui.cpp:1060
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 "
@@ -1666,7 +1654,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 "
@@ -1674,21 +1662,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"
@@ -1698,98 +1686,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"
@@ -1798,173 +1786,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:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335
-#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401
-#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445
+#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219
+#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285
+#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351
+#: 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:2509
+#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443
+#: 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 ""
diff --git a/language/Dutch/strings.po b/language/Dutch/strings.po
index 730f1f8ba97..c71de261aab 100644
--- a/language/Dutch/strings.po
+++ b/language/Dutch/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"
@@ -40,7 +40,7 @@ msgid ""
"Cheat Comment:\n"
"%s"
msgstr ""
-"Valsspeel commentaar:\n"
+"Cheat commentaar:\n"
"\n"
#: src/emu/ui/cheatopt.cpp:90
@@ -63,14 +63,14 @@ msgstr "Alles opnieuw inlezen"
msgid "Autofire Status"
msgstr "Autofire status"
-#: 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 "Uitgeschakeld"
-#: 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
@@ -97,7 +97,7 @@ msgstr "Geen knoppen gevonden op deze machine!"
#: src/emu/ui/cheatopt.cpp:312 src/emu/ui/cheatopt.cpp:316
msgid "Autofire Delay"
-msgstr "Autofire vertraging"
+msgstr "Vertraging autofire"
#: src/emu/ui/ctrlmenu.cpp:20
msgid "Lightgun Device Assignment"
@@ -121,11 +121,11 @@ msgstr "Paddle toewijzing"
#: src/emu/ui/ctrlmenu.cpp:25
msgid "Dial Device Assignment"
-msgstr "Dial toewijzing"
+msgstr "Dial-apparaat toewijzing"
#: src/emu/ui/ctrlmenu.cpp:26
msgid "Positional Device Assignment"
-msgstr "Positie toewijzing"
+msgstr "Positie-apparaat toewijzing"
#: src/emu/ui/ctrlmenu.cpp:27
msgid "Mouse Device Assignment"
@@ -134,7 +134,7 @@ msgstr "Muis toewijzing"
#: src/emu/ui/ctrlmenu.cpp:106 src/emu/ui/ctrlmenu.cpp:126
#: src/emu/ui/optsmenu.cpp:264
msgid "Device Mapping"
-msgstr "Invoerapparaat toewijzing"
+msgstr "Invoerapparaat mapping"
#: src/emu/ui/custmenu.cpp:157 src/emu/ui/custmenu.cpp:445
msgid "Main filter"
@@ -172,7 +172,7 @@ msgstr "^!Uitgever"
#: src/emu/ui/custmenu.cpp:481
msgid "^!Software List"
-msgstr "^!Software lijst"
+msgstr "^!Softwarelijst"
#: src/emu/ui/custmenu.cpp:490
msgid "^!Device type"
@@ -240,15 +240,16 @@ msgstr "Lijnen"
#: src/emu/ui/custui.cpp:364
msgid "Infos text size"
-msgstr "Infos tekst grootte"
+msgstr "Tekstgrootte informatie"
#: src/emu/ui/custui.cpp:381
msgid "UI Fonts Settings"
-msgstr "UI Lettertype Instellingen"
+msgstr "Instellingen lettertype gebruikersinterface"
#: src/emu/ui/custui.cpp:408
msgid "Sample text - Lorem ipsum dolor sit amet, consectetur adipiscing elit."
-msgstr "Voorbeeld tekst - De kat krabt de krullen van de trap."
+msgstr ""
+"Voorbeeldtekst - Lorem ipsum dolor sit amet, consectetur adipiscing elit."
#: src/emu/ui/custui.cpp:506
msgid "Normal text"
@@ -264,15 +265,15 @@ msgstr "Normale tekst achtergrond"
#: src/emu/ui/custui.cpp:509
msgid "Selected background color"
-msgstr "Geselecteerde achtergrond kleur"
+msgstr "Geselecteerde achtergrondkleur"
#: src/emu/ui/custui.cpp:510
msgid "Subitem color"
-msgstr "Subitem kleur"
+msgstr "Kleur subitem"
#: src/emu/ui/custui.cpp:511 src/emu/ui/custui.cpp:606
msgid "Clone"
-msgstr "Kloon"
+msgstr "Clone/Variant"
#: src/emu/ui/custui.cpp:512
msgid "Border"
@@ -292,11 +293,11 @@ msgstr "Niet beschikbaar kleur"
#: src/emu/ui/custui.cpp:516
msgid "Slider color"
-msgstr "Schuif kleur"
+msgstr "Slider kleur"
#: src/emu/ui/custui.cpp:517
msgid "Gfx viewer background"
-msgstr "Gfx viewer achtergrond"
+msgstr "Gfx-viewer achtergrond"
#: src/emu/ui/custui.cpp:518
msgid "Mouse over color"
@@ -320,7 +321,7 @@ msgstr "Herstel originele kleuren"
#: src/emu/ui/custui.cpp:540
msgid "UI Colors Settings"
-msgstr "UI Kleur Instellingen"
+msgstr "Kleurinstellingen gebruikersinterface"
#: src/emu/ui/custui.cpp:568
#, c-format
@@ -479,7 +480,7 @@ msgstr "Iconen"
#: src/emu/ui/dirmenu.cpp:39 src/emu/ui/miscmenu.cpp:560
msgid "Cheats"
-msgstr "Valsspelen"
+msgstr "Cheats"
#: src/emu/ui/dirmenu.cpp:40 src/emu/ui/menu.cpp:43
msgid "Snapshots"
@@ -523,7 +524,7 @@ msgstr "Artwork"
#: src/emu/ui/dirmenu.cpp:50 src/emu/ui/menu.cpp:51
msgid "Bosses"
-msgstr "Bazen"
+msgstr "Eindbazen"
#: src/emu/ui/dirmenu.cpp:51
msgid "Artworks Preview"
@@ -535,7 +536,7 @@ msgstr "Selecteer"
#: src/emu/ui/dirmenu.cpp:53
msgid "GameOver"
-msgstr "Einde spel"
+msgstr "Game over"
#: src/emu/ui/dirmenu.cpp:54 src/emu/ui/menu.cpp:55
msgid "HowTo"
@@ -564,7 +565,7 @@ msgstr "Map instellingen"
#: src/emu/ui/dirmenu.cpp:183
#, c-format
msgid "Current %1$s Folders"
-msgstr "Huidige %$1s mappen"
+msgstr "Huidige %1$s mappen"
#: src/emu/ui/dirmenu.cpp:195
msgid "Change Folder"
@@ -581,12 +582,12 @@ msgstr "Verwijder map"
#: src/emu/ui/dirmenu.cpp:496
#, c-format
msgid "Change %1$s Folder - Search: %2$s_"
-msgstr "Wijzig %$1s map - Zoek: %2$s_"
+msgstr "Wijzig %1$s map - Zoek: %2$s_"
#: src/emu/ui/dirmenu.cpp:497
#, c-format
msgid "Add %1$s Folder - Search: %2$s_"
-msgstr "Voeg %$1s map toe - Zoek: %2$s_"
+msgstr "Voeg %1$s map toe - Zoek: %2$s_"
#: src/emu/ui/dirmenu.cpp:534
msgid "Press TAB to set"
@@ -595,7 +596,7 @@ msgstr "Druk op TAB om te kiezen"
#: src/emu/ui/dirmenu.cpp:640
#, c-format
msgid "Remove %1$s Folder"
-msgstr "Verwijder %$1s map"
+msgstr "Verwijder %1$s map"
#: src/emu/ui/dsplmenu.cpp:38
msgid "Video Mode"
@@ -603,7 +604,7 @@ msgstr "Video modus"
#: src/emu/ui/dsplmenu.cpp:40
msgid "Triple Buffering"
-msgstr "Driedubbele buffering"
+msgstr "Drievoudige buffering"
#: src/emu/ui/dsplmenu.cpp:41
msgid "HLSL"
@@ -619,7 +620,7 @@ msgstr "Bilineaire filtering"
#: src/emu/ui/dsplmenu.cpp:45
msgid "Bitmap Prescaling"
-msgstr "Bitmapvoorschaling"
+msgstr "Bitmap prescaling"
#: src/emu/ui/dsplmenu.cpp:46
msgid "Window Mode"
@@ -639,18 +640,18 @@ msgstr "Gesynchroniseerde verversing"
#: src/emu/ui/dsplmenu.cpp:50
msgid "Wait Vertical Sync"
-msgstr "Wacht verticale synchronisatie"
+msgstr "Wacht V-Sync"
#: src/emu/ui/dsplmenu.cpp:202 src/emu/ui/dsplmenu.cpp:222
#: src/emu/ui/optsmenu.cpp:261
msgid "Display Options"
-msgstr "Schermopties"
+msgstr "Video-opties"
-#: src/emu/ui/filesel.cpp:159
+#: src/emu/ui/filesel.cpp:161
msgid "File Already Exists - Override?"
msgstr "Bestand bestaat al - Overschrijven?"
-#: 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
@@ -658,7 +659,7 @@ msgstr "Bestand bestaat al - Overschrijven?"
msgid "No"
msgstr "Nee"
-#: 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
@@ -666,55 +667,55 @@ msgstr "Nee"
msgid "Yes"
msgstr "Ja"
-#: src/emu/ui/filesel.cpp:271
+#: src/emu/ui/filesel.cpp:275
msgid "New Image Name:"
-msgstr "Naam nieuw bestand:"
+msgstr "Nieuwe bestandsnaam:"
-#: src/emu/ui/filesel.cpp:277
+#: src/emu/ui/filesel.cpp:281
msgid "Image Format:"
msgstr "Bestandsformaat:"
-#: src/emu/ui/filesel.cpp:283
+#: src/emu/ui/filesel.cpp:287
msgid "Create"
-msgstr "Creëer"
+msgstr "Aanmaken"
-#: src/emu/ui/filesel.cpp:314
+#: src/emu/ui/filesel.cpp:318
msgid "Please enter a file extension too"
msgstr "Vul ook een bestandsextensie in"
-#: 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 "[lege plek]"
-#: src/emu/ui/filesel.cpp:506
+#: src/emu/ui/filesel.cpp:510
msgid "[create]"
-msgstr "[creëer]"
+msgstr "[aanmaken]"
-#: 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 "[software lijst]"
-#: src/emu/ui/filesel.cpp:802
+#: src/emu/ui/filesel.cpp:806
msgid "Select image format"
msgstr "Selecteer bestandsformaat"
-#: src/emu/ui/filesel.cpp:862
+#: src/emu/ui/filesel.cpp:866
msgid "Select access mode"
msgstr "Selecteer toegangsmodus"
-#: src/emu/ui/filesel.cpp:863
+#: src/emu/ui/filesel.cpp:867
msgid "Read-only"
msgstr "Alleen lezen"
-#: src/emu/ui/filesel.cpp:865
+#: src/emu/ui/filesel.cpp:869
msgid "Read-write"
msgstr "Lezen en schrijven"
-#: src/emu/ui/filesel.cpp:866
+#: src/emu/ui/filesel.cpp:870
msgid "Read this image, write to another image"
msgstr "Lees dit bestamd, schrijf naar een ander bestand"
-#: src/emu/ui/filesel.cpp:867
+#: src/emu/ui/filesel.cpp:871
msgid "Read this image, write to diff"
msgstr "Lees dit bestand, schrijf naar een diff"
@@ -837,7 +838,7 @@ msgstr "Vizieropties"
#: src/emu/ui/mainmenu.cpp:132
msgid "Cheat"
-msgstr "Valsspelen"
+msgstr "Cheat"
#: src/emu/ui/mainmenu.cpp:136
msgid "External DAT View"
@@ -849,7 +850,7 @@ msgstr "Voeg toe aan favorieten"
#: src/emu/ui/mainmenu.cpp:144
msgid "Remove From Favorites"
-msgstr "Verwijder uit favorieten"
+msgstr "Verwijder van favorieten"
#: src/emu/ui/mainmenu.cpp:151
msgid "Select New Machine"
@@ -861,7 +862,7 @@ msgstr "Bedieningspanelen"
#: src/emu/ui/menu.cpp:50
msgid "Artwork Preview"
-msgstr "Artwork voorvertoning"
+msgstr "Voorvertoning Artwork"
#: src/emu/ui/menu.cpp:54
msgid "Game Over"
@@ -873,7 +874,7 @@ msgstr "Naar of van favorietenlijst"
#: src/emu/ui/menu.cpp:65
msgid "Export displayed list to file"
-msgstr "Exporteer lijst naar bestand"
+msgstr "Exporteer getoonde lijst naar bestand"
#: src/emu/ui/menu.cpp:66
msgid "Show DATs view"
@@ -957,7 +958,7 @@ msgstr " (afgeschermd)"
#: src/emu/ui/miscmenu.cpp:518
msgid "Visible Delay"
-msgstr "Zichtbaar vertraging"
+msgstr "Vertraging zichtbaarheid"
#: src/emu/ui/miscmenu.cpp:557
msgid "Re-select last machine played"
@@ -965,7 +966,7 @@ msgstr "Kies laatst gespeelde machine opnieuw"
#: src/emu/ui/miscmenu.cpp:558
msgid "Enlarge images in the right panel"
-msgstr "Vergroot plaatsen in het rechter paneel"
+msgstr "Vergroot plaatjes in het rechter paneel"
#: src/emu/ui/miscmenu.cpp:559
msgid "DATs info"
@@ -985,7 +986,7 @@ msgstr "Sla informatiescherm bij het opstarten over"
#: src/emu/ui/miscmenu.cpp:564
msgid "Force 4:3 appearance for software snapshot"
-msgstr "Toon software snapshot geforceerd in 4:3 formaat"
+msgstr "Toon software snapshot altijd in 4:3 formaat"
#: src/emu/ui/miscmenu.cpp:565
msgid "Use image as background"
@@ -1007,7 +1008,7 @@ msgstr "Overige opties"
#: src/emu/ui/miscmenu.cpp:737
#, c-format
msgid "%s.xml saved under ui folder."
-msgstr "%s.xml opgeslagen in 'ui' map."
+msgstr "%s.xml is opgeslagen in de map 'ui'."
#: src/emu/ui/miscmenu.cpp:765
msgid "Name: Description:\n"
@@ -1016,7 +1017,7 @@ msgstr "Naam: Omschrijving:\n"
#: src/emu/ui/miscmenu.cpp:777
#, c-format
msgid "%s.txt saved under ui folder."
-msgstr "%s.txt opgeslagen in 'ui' map."
+msgstr "%s.txt is opgeslagen in de map 'ui'."
#: src/emu/ui/miscmenu.cpp:795
msgid "Export XML format (like -listxml)"
@@ -1037,7 +1038,7 @@ msgstr "Sla machineconfiguratie op"
#: src/emu/ui/miscmenu.cpp:967 src/emu/ui/miscmenu.cpp:987
#: src/emu/ui/selgame.cpp:587
msgid "Plugins"
-msgstr ""
+msgstr "Plugins"
#: src/emu/ui/optsmenu.cpp:214
msgid "Filter"
@@ -1057,7 +1058,7 @@ msgstr "^!Stel eigen filter in"
#: src/emu/ui/optsmenu.cpp:258
msgid "Customize UI"
-msgstr "Pas UI aan"
+msgstr "Pas gebruikersinterface aan"
#: src/emu/ui/optsmenu.cpp:259
msgid "Configure Directories"
@@ -1119,7 +1120,7 @@ msgid ""
" added to favorites list."
msgstr ""
"%s\n"
-" toegevoegd aan favorieten."
+" toegevoegd aan favorietenlijst."
#: src/emu/ui/selgame.cpp:376 src/emu/ui/selgame.cpp:385
#: src/emu/ui/selsoft.cpp:283
@@ -1129,7 +1130,7 @@ msgid ""
" removed from favorites list."
msgstr ""
"%s\n"
-" verwijderd van favorieten."
+" verwijderd van favorietenlijst."
#: src/emu/ui/selgame.cpp:446
msgid ""
@@ -1182,11 +1183,11 @@ msgstr "%1$s, %2$-.100s"
#: src/emu/ui/selgame.cpp:839 src/emu/ui/selsoft.cpp:755
#, c-format
msgid "Driver is clone of: %1$-.100s"
-msgstr "Driver is een kloon van: %1$-.100s"
+msgstr "Driver is een variant van: %1$-.100s"
#: src/emu/ui/selgame.cpp:841 src/emu/ui/selsoft.cpp:757
msgid "Driver is parent"
-msgstr "Driver is ouder"
+msgstr "Driver is hoofddriver"
#: src/emu/ui/selgame.cpp:845 src/emu/ui/selsoft.cpp:761
#: src/emu/ui/simpleselgame.cpp:332
@@ -1231,11 +1232,11 @@ msgstr "Systeem: %1$-.100s"
#: src/emu/ui/selgame.cpp:886 src/emu/ui/selsoft.cpp:803
#, c-format
msgid "Software is clone of: %1$-.100s"
-msgstr "Software is kloon van: %1$-.100s"
+msgstr "Software is een variant van: %1$-.100s"
#: src/emu/ui/selgame.cpp:888 src/emu/ui/selsoft.cpp:805
msgid "Software is parent"
-msgstr "Software is ouder"
+msgstr "Software is hoofdsoftware"
#: src/emu/ui/selgame.cpp:893 src/emu/ui/selsoft.cpp:810
msgid "Supported: No"
@@ -1277,11 +1278,11 @@ msgstr "Fabrikant: %1$-.100s\n"
#: src/emu/ui/selgame.cpp:1533
#, c-format
msgid "Driver is Clone of: %1$-.100s\n"
-msgstr "Driver is kloon van: %1$-.100s\n"
+msgstr "Driver is een variant van: %1$-.100s\n"
#: src/emu/ui/selgame.cpp:1535
msgid "Driver is Parent\n"
-msgstr "Driver is ouder\n"
+msgstr "Driver is hoofddriver\n"
#: src/emu/ui/selgame.cpp:1538
msgid "Overall: NOT WORKING\n"
@@ -1342,7 +1343,7 @@ msgstr "Vereist klikbare artwork: %1$s\n"
#: src/emu/ui/selgame.cpp:1564
#, c-format
msgid "Support Cocktail: %1$s\n"
-msgstr "Ondersteund cocktail: %1$s\n"
+msgstr "Ondersteunt cocktail: %1$s\n"
#: src/emu/ui/selgame.cpp:1565
#, c-format
@@ -1374,31 +1375,31 @@ msgstr "Vereist CHD: %1$s\n"
#: src/emu/ui/selgame.cpp:1588
msgid "Roms Audit Pass: OK\n"
-msgstr "Roms controle stap: OK\n"
+msgstr "Roms controle: OK\n"
#: src/emu/ui/selgame.cpp:1590
msgid "Roms Audit Pass: BAD\n"
-msgstr "Roms controle stap: FOUT\n"
+msgstr "Roms controle: FOUT\n"
#: src/emu/ui/selgame.cpp:1593
msgid "Samples Audit Pass: None Needed\n"
-msgstr "Samples controle stap: Geen benodigd\n"
+msgstr "Samples controle: Niet nodig\n"
#: src/emu/ui/selgame.cpp:1595
msgid "Samples Audit Pass: OK\n"
-msgstr "Samples controle stap: OK\n"
+msgstr "Samples controle: OK\n"
#: src/emu/ui/selgame.cpp:1597
msgid "Samples Audit Pass: BAD\n"
-msgstr "Samples controle stap: FOUT\n"
+msgstr "Samples controle: FOUT\n"
#: src/emu/ui/selgame.cpp:1600
msgid ""
"Roms Audit Pass: Disabled\n"
"Samples Audit Pass: Disabled\n"
msgstr ""
-"Roms controle stap: Uitgeschakeld\n"
-"Samples controle stap: Uitgeschakeld\n"
+"Roms controle: Uitgeschakeld\n"
+"Samples controle: Uitgeschakeld\n"
#: src/emu/ui/selgame.cpp:2039 src/emu/ui/selgame.cpp:2200
#: src/emu/ui/selsoft.cpp:1657
@@ -1428,7 +1429,7 @@ msgstr ""
#: src/emu/ui/selsoft.cpp:682
#, c-format
msgid "%1$s %2$s ( %3$d / %4$d softwares )"
-msgstr "%1$s %2$s ( %3$d / %4$d softwares )"
+msgstr "%1$s %2$s ( %3$d / %4$d software )"
#: src/emu/ui/selsoft.cpp:683
#, c-format
@@ -1546,12 +1547,12 @@ msgstr "[Bestandsbeheer]"
#: src/emu/ui/swlist.cpp:235
msgid "Switch Item Ordering"
-msgstr "Wissel onderdeel volgorde"
+msgstr "Wijzig de volgorde van de onderdelen"
#: src/emu/ui/swlist.cpp:268
#, c-format
msgid "Switched Order: entries now ordered by %s"
-msgstr "Volgorde gewijzigd: elementen zijn nu gesorteerd op %s"
+msgstr "Volgorde gewijzigd: de elementen zijn nu gesorteerd op %s"
#: src/emu/ui/swlist.cpp:268
msgid "shortname"
@@ -1575,7 +1576,7 @@ msgstr "afspelen"
#: src/emu/ui/tapectrl.cpp:86
msgid "(playing)"
-msgstr "(afspelen)"
+msgstr "(aan het afspelen)"
#: src/emu/ui/tapectrl.cpp:87
msgid "recording"
@@ -1583,7 +1584,7 @@ msgstr "opnemen"
#: src/emu/ui/tapectrl.cpp:87
msgid "(recording)"
-msgstr "(opnemen)"
+msgstr "(aan het opnemen)"
#: src/emu/ui/tapectrl.cpp:94
msgid "Pause/Stop"
@@ -1591,7 +1592,7 @@ msgstr "Pauzeer/Stop"
#: src/emu/ui/tapectrl.cpp:97
msgid "Play"
-msgstr "Speel"
+msgstr "Speel af"
#: src/emu/ui/tapectrl.cpp:100
msgid "Record"
@@ -1599,29 +1600,17 @@ msgstr "Neem op"
#: src/emu/ui/tapectrl.cpp:103
msgid "Rewind"
-msgstr "Terugspoelen"
+msgstr "Terug spoelen"
#: src/emu/ui/tapectrl.cpp:106
msgid "Fast Forward"
-msgstr "Snel vooruit"
+msgstr "Vooruit spoelen"
-#: 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 "Deze driver vereist images ingelezen in de volgende device(s): "
+msgstr "Deze driver vereist software ingelezen in de volgende device(s): "
-#: src/emu/ui/ui.cpp:1043
-#, 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
+#: src/emu/ui/ui.cpp:1060
msgid ""
"One or more ROMs/CHDs for this machine are incorrect. The machine may not "
"run correctly.\n"
@@ -1629,76 +1618,78 @@ msgstr ""
"Één of meerdere ROMs/CHDs voor deze machine zijn niet correct. De machine "
"kan mogelijk niet goed functioneren.\n"
-#: src/emu/ui/ui.cpp:1094
+#: src/emu/ui/ui.cpp:1073
msgid ""
"There are known problems with this machine\n"
"\n"
msgstr ""
-"Er zijn bekende problemen met deze machine\n"
+"Er zijn problemen bekend met de emulatie van deze machine\n"
"\n"
-#: 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 "Éémn of meerder ROMs/CHDs voor de machine zijn niet correct gedumpt.\n"
+msgstr ""
+"Één of meerdere ROMs/CHDs voor deze machine zijn niet correct gedumpt.\n"
-#: 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 "De toetsenbordemulatie is mogelijk niet 100% accuraat.\n"
-#: src/emu/ui/ui.cpp:1104
+#: src/emu/ui/ui.cpp:1083
#, c-format
msgid "The colors aren't 100% accurate.\n"
msgstr "De kleuren zijn niet 100% accuraat.\n"
-#: src/emu/ui/ui.cpp:1106
+#: src/emu/ui/ui.cpp:1085
msgid "The colors are completely wrong.\n"
msgstr "De kleuren zijn zeker fout.\n"
-#: src/emu/ui/ui.cpp:1108
+#: src/emu/ui/ui.cpp:1087
#, c-format
msgid "The video emulation isn't 100% accurate.\n"
msgstr "De beeldemulatie is niet 100% accuraat.\n"
-#: src/emu/ui/ui.cpp:1110
+#: src/emu/ui/ui.cpp:1089
#, c-format
msgid "The sound emulation isn't 100% accurate.\n"
msgstr "De geluidsemulatie is niet 100% accuraat.\n"
-#: src/emu/ui/ui.cpp:1112
+#: src/emu/ui/ui.cpp:1091
msgid "The machine lacks sound.\n"
msgstr "Deze machine heeft geen geluid.\n"
-#: src/emu/ui/ui.cpp:1115
+#: src/emu/ui/ui.cpp:1094
msgid "Screen flipping in cocktail mode is not supported.\n"
-msgstr "Schermflippen in cocktail modus is niet ondersteund.\n"
+msgstr "Schermflippen wordt in cocktailmodus niet ondersteund.\n"
-#: src/emu/ui/ui.cpp:1119
+#: src/emu/ui/ui.cpp:1098
msgid "The machine requires external artwork files\n"
-msgstr "Deze machine vereist extern artwork bestanden\n"
+msgstr "Deze machine vereist externe artwork bestanden\n"
-#: 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 ""
"Deze machine was nooit afgemaakt. Het kan vreemd gedrag vertonen of "
-"elementen missen die geen fouten zijn met de emulatie.\n"
+"elementen missen; dit zijn geen fouten van de emulatie.\n"
-#: 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 ""
-"Deze machine heeft geen geluidhardware, MAME zal geen geluid produceren, dit "
-"is verwacht gedrag.\n"
+"Deze machine heeft geen geluidshardware, MAME zal geen geluid produceren, "
+"dit is verwacht gedrag.\n"
-#: src/emu/ui/ui.cpp:1137
+#: src/emu/ui/ui.cpp:1116
msgid "The machine has protection which isn't fully emulated.\n"
-msgstr "Deze machine heeft beveiliging die nog niet volledig is geëmuleerd.\n"
+msgstr ""
+"Deze machine heeft een beveiliging die nog niet volledig is geëmuleerd.\n"
-#: 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 "
@@ -1707,9 +1698,9 @@ msgid ""
msgstr ""
"DEZE MACHINE DOET HET NIET. De emulatie van deze machine is nog niet "
"compleet. Er is niets wat je kunt doen om dit probleem te verhelpen afgezien "
-"van het afwachten tot de ontwikkelaars de emulatie verder verbeteren.\n"
+"van het afwachten tot ontwikkelaars de emulatie verder verbeteren.\n"
-#: 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 "
@@ -1719,9 +1710,9 @@ msgstr ""
"\n"
"Bepaalde onderdelen van deze machine kunnen niet worden geëmuleerd in "
"verband met fysieke interactie of het gebruik van mechanische componenten. "
-"Het is niet mogelijk deze machine volledig te spelen.\n"
+"Het is niet mogelijk om deze machine volledig te spelen.\n"
-#: src/emu/ui/ui.cpp:1163
+#: src/emu/ui/ui.cpp:1142
msgid ""
"\n"
"\n"
@@ -1731,17 +1722,14 @@ msgstr ""
"\n"
"Dit zijn werkende klonen van de machine: "
-#: 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 ""
-"\n"
-"\n"
-"Type OK of beweeg de joystick naar links en rechts om verder te gaan"
-#: src/emu/ui/ui.cpp:1192
+#: src/emu/ui/ui.cpp:1171
#, c-format
msgid ""
"%1$s\n"
@@ -1756,15 +1744,15 @@ msgstr ""
"\n"
"Processor:\n"
-#: 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 "MHz"
-#: 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 "kHz"
-#: src/emu/ui/ui.cpp:1242
+#: src/emu/ui/ui.cpp:1221
msgid ""
"\n"
"Sound:\n"
@@ -1772,7 +1760,7 @@ msgstr ""
"\n"
"Geluid:\n"
-#: src/emu/ui/ui.cpp:1271
+#: src/emu/ui/ui.cpp:1250
msgid ""
"\n"
"Video:\n"
@@ -1780,78 +1768,78 @@ msgstr ""
"\n"
"Beeld:\n"
-#: src/emu/ui/ui.cpp:1275
+#: src/emu/ui/ui.cpp:1254
msgid "None\n"
msgstr "Geen\n"
-#: src/emu/ui/ui.cpp:1282
+#: src/emu/ui/ui.cpp:1261
msgid "Vector"
msgstr "Vector"
-#: src/emu/ui/ui.cpp:1293
+#: src/emu/ui/ui.cpp:1272
#, c-format
msgid "%1$s: %2$s\n"
msgstr "%1$s: %2$s\n"
-#: src/emu/ui/ui.cpp:1293
+#: src/emu/ui/ui.cpp:1272
msgid "%2$s\n"
msgstr "%2$s\n"
-#: 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 "Toetsenbord emulatiestatus"
-#: src/emu/ui/ui.cpp:1579
+#: src/emu/ui/ui.cpp:1529
msgid "Mode: PARTIAL Emulation"
msgstr "Modus: GEDEELTELIJKE emulatie"
-#: src/emu/ui/ui.cpp:1580
+#: src/emu/ui/ui.cpp:1530
msgid "UI: Enabled"
msgstr "UI: Ingeschakeld"
-#: 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 "**Gebruik ScrLock om te wisselen**"
-#: src/emu/ui/ui.cpp:1589
+#: src/emu/ui/ui.cpp:1539
msgid "Mode: FULL Emulation"
msgstr "Modus: VOLLEDIGE emulatie"
-#: src/emu/ui/ui.cpp:1590
+#: src/emu/ui/ui.cpp:1540
msgid "UI: Disabled"
msgstr "UI: Uitgeschakeld"
-#: src/emu/ui/ui.cpp:1736
+#: src/emu/ui/ui.cpp:1686
msgid "Autofire can't be enabled"
msgstr "Autofire kan niet worden ingeschakeld"
-#: src/emu/ui/ui.cpp:1775
+#: src/emu/ui/ui.cpp:1725
msgid "Select position to save to"
msgstr "Selecteer positie om naar op te slaan"
-#: src/emu/ui/ui.cpp:1777
+#: src/emu/ui/ui.cpp:1727
msgid "Select position to load from"
msgstr "Selecteer positie om van in te lezen"
-#: src/emu/ui/ui.cpp:1801
+#: src/emu/ui/ui.cpp:1751
msgid "Save cancelled"
msgstr "Opslaan afgebroken"
-#: src/emu/ui/ui.cpp:1803
+#: src/emu/ui/ui.cpp:1753
msgid "Load cancelled"
msgstr "Inlezen afgebroken"
-#: src/emu/ui/ui.cpp:1846
+#: src/emu/ui/ui.cpp:1796
#, c-format
msgid "Save to position %s"
msgstr "Opslaan naar positie %s"
-#: src/emu/ui/ui.cpp:1851
+#: src/emu/ui/ui.cpp:1801
#, c-format
msgid "Load from position %s"
msgstr "Inlezen van positie %s"
-#: src/emu/ui/ui.cpp:1891
+#: src/emu/ui/ui.cpp:1841
#, c-format
msgid ""
"Are you sure you want to quit?\n"
@@ -1864,173 +1852,173 @@ msgstr ""
"Druk op ''%1%s'' om te stoppen,\n"
"druk op ''%2$s'' om terug te keren naar de emulatie."
-#: src/emu/ui/ui.cpp:1966
+#: src/emu/ui/ui.cpp:1916
msgid "Master Volume"
msgstr "Hoofdvolume"
-#: src/emu/ui/ui.cpp:1976
+#: src/emu/ui/ui.cpp:1926
#, c-format
msgid "%1$s Volume"
msgstr "%1$s volume"
-#: src/emu/ui/ui.cpp:1998
+#: src/emu/ui/ui.cpp:1948
#, c-format
msgid "Overclock CPU %1$s"
msgstr "Overklok CPU %1$s"
-#: src/emu/ui/ui.cpp:2018
+#: src/emu/ui/ui.cpp:1968
#, c-format
msgid "%1$s Refresh Rate"
msgstr "%1$s verversingfrequentie"
-#: src/emu/ui/ui.cpp:2024
+#: src/emu/ui/ui.cpp:1974
#, c-format
msgid "%1$s Brightness"
msgstr "%1$s helderheid"
-#: src/emu/ui/ui.cpp:2027
+#: src/emu/ui/ui.cpp:1977
#, c-format
msgid "%1$s Contrast"
msgstr "%1$s contrast"
-#: src/emu/ui/ui.cpp:2030
+#: src/emu/ui/ui.cpp:1980
#, c-format
msgid "%1$s Gamma"
msgstr "%1$s gamma"
-#: src/emu/ui/ui.cpp:2035
+#: src/emu/ui/ui.cpp:1985
#, c-format
msgid "%1$s Horiz Stretch"
-msgstr "%1$s horizontale strekking"
+msgstr "%1$s horizontale stretch"
-#: src/emu/ui/ui.cpp:2038
+#: src/emu/ui/ui.cpp:1988
#, c-format
msgid "%1$s Horiz Position"
msgstr "%1$s horizontale positie"
-#: src/emu/ui/ui.cpp:2041
+#: src/emu/ui/ui.cpp:1991
#, c-format
msgid "%1$s Vert Stretch"
-msgstr "%1$s verticale strekking"
+msgstr "%1$s verticale stretch"
-#: src/emu/ui/ui.cpp:2044
+#: src/emu/ui/ui.cpp:1994
#, c-format
msgid "%1$s Vert Position"
msgstr "%1$s verticale positie"
-#: src/emu/ui/ui.cpp:2062
+#: src/emu/ui/ui.cpp:2012
#, c-format
msgid "Laserdisc '%1$s' Horiz Stretch"
-msgstr "Laserdisc '%1$s' horizontale strekking"
+msgstr "Laserdisc '%1$s' horizontale stretch"
-#: src/emu/ui/ui.cpp:2065
+#: src/emu/ui/ui.cpp:2015
#, c-format
msgid "Laserdisc '%1$s' Horiz Position"
msgstr "Laserdisc '%1$s' horizontale positie"
-#: src/emu/ui/ui.cpp:2068
+#: src/emu/ui/ui.cpp:2018
#, c-format
msgid "Laserdisc '%1$s' Vert Stretch"
-msgstr "Laserdic '%1$s' verticale strekking"
+msgstr "Laserdic '%1$s' verticale stretch"
-#: src/emu/ui/ui.cpp:2071
+#: src/emu/ui/ui.cpp:2021
#, c-format
msgid "Laserdisc '%1$s' Vert Position"
msgstr "Laserdisc '%1$s' verticale positie"
-#: 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 "Minimale straal breedte"
+msgstr "Minimale straalbreedte"
-#: src/emu/ui/ui.cpp:2084
+#: src/emu/ui/ui.cpp:2034
msgid "Beam Width Maximum"
-msgstr "Maximale straal breedte"
+msgstr "Maximale straalbreedte"
-#: src/emu/ui/ui.cpp:2086
+#: src/emu/ui/ui.cpp:2036
msgid "Beam Intensity Weight"
-msgstr "Gewicht straal intensiteit"
+msgstr "Gewicht straalintensiteit"
-#: src/emu/ui/ui.cpp:2098
+#: src/emu/ui/ui.cpp:2048
#, c-format
msgid "Crosshair Scale %1$s"
msgstr "Vizier schaal %1$s"
-#: 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 "X"
-#: 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 "Y"
-#: src/emu/ui/ui.cpp:2101
+#: src/emu/ui/ui.cpp:2051
#, c-format
msgid "Crosshair Offset %1$s"
msgstr "Vizier offset %1$s"
-#: src/emu/ui/ui.cpp:2120
+#: src/emu/ui/ui.cpp:2070
#, c-format
msgid "%1$3ddB"
msgstr "%1$3d dB"
-#: src/emu/ui/ui.cpp:2164
+#: src/emu/ui/ui.cpp:2114
#, c-format
msgid "%1$d%%"
msgstr "%1$d%%"
-#: src/emu/ui/ui.cpp:2180
+#: src/emu/ui/ui.cpp:2130
#, c-format
msgid "%1$3.0f%%"
msgstr "%1$3.0f%%"
-#: src/emu/ui/ui.cpp:2203
+#: src/emu/ui/ui.cpp:2153
#, c-format
msgid "%1$.3ffps"
msgstr "%1$.3f fps"
-#: src/emu/ui/ui.cpp:2226 src/emu/ui/ui.cpp:2248 src/emu/ui/ui.cpp:2269
-#: src/emu/ui/ui.cpp:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335
-#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401
-#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445
+#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219
+#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285
+#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351
+#: src/emu/ui/ui.cpp:2373 src/emu/ui/ui.cpp:2395
#, c-format
msgid "%1$.3f"
msgstr "%1$.3f"
-#: src/emu/ui/ui.cpp:2461 src/emu/ui/ui.cpp:2477 src/emu/ui/ui.cpp:2493
-#: src/emu/ui/ui.cpp:2509
+#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443
+#: src/emu/ui/ui.cpp:2459
#, c-format
msgid "%1$1.2f"
msgstr "%1$1.2f"
-#: src/emu/ui/ui.cpp:2525
+#: src/emu/ui/ui.cpp:2475
#, c-format
msgid "Screen '%1$s'"
msgstr "Scherm '%1$s'"
-#: src/emu/ui/ui.cpp:2527
+#: src/emu/ui/ui.cpp:2477
msgid "Screen"
msgstr "Scherm"
-#: src/emu/ui/ui.cpp:2543
+#: src/emu/ui/ui.cpp:2493
#, c-format
msgid "Crosshair Scale X %1$1.3f"
msgstr "Vizier X-schaal %1$1.3f"
-#: src/emu/ui/ui.cpp:2543
+#: src/emu/ui/ui.cpp:2493
#, c-format
msgid "Crosshair Scale Y %1$1.3f"
msgstr "Vizier Y-schaal %1$1.3f"
-#: src/emu/ui/ui.cpp:2562
+#: src/emu/ui/ui.cpp:2512
#, c-format
msgid "Crosshair Offset X %1$1.3f"
msgstr "Vizier X-offset %1$1.3f"
-#: src/emu/ui/ui.cpp:2562
+#: src/emu/ui/ui.cpp:2512
#, c-format
msgid "Crosshair Offset Y %1$1.3f"
msgstr "Vizier Y-offset %1$1.3f"
@@ -2080,8 +2068,17 @@ msgstr " KLEUREN"
msgid " PENS"
msgstr " PENNEN"
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "Type OK or move the joystick left then right to continue"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "Type OK of beweeg de joystick naar links en rechts om verder te gaan"
+
#~ msgid "Configure Machine"
#~ msgstr "Configureer machine"
#~ msgid "Multi-Threaded Rendering"
-#~ msgstr "Multithreaded tekenen"
+#~ msgstr "Multithreaded renderen"
diff --git a/language/English/strings.po b/language/English/strings.po
index 821f9b03148..31576b9cd7a 100644
--- a/language/English/strings.po
+++ b/language/English/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"
@@ -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
-#, 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
+#: src/emu/ui/ui.cpp:1060
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:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335
-#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401
-#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445
+#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219
+#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285
+#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351
+#: 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:2509
+#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443
+#: 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 ""
diff --git a/language/Estonian/strings.po b/language/Estonian/strings.po
index 91efc8399f8..7567f51accf 100644
--- a/language/Estonian/strings.po
+++ b/language/Estonian/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"
@@ -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
-#, 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
+#: src/emu/ui/ui.cpp:1060
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:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335
-#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401
-#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445
+#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219
+#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285
+#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351
+#: 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:2509
+#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443
+#: 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 ""
diff --git a/language/Finnish/strings.po b/language/Finnish/strings.po
index a3fd2d0a456..3df2bdf8528 100644
--- a/language/Finnish/strings.po
+++ b/language/Finnish/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"
@@ -61,14 +61,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
@@ -644,11 +644,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
@@ -656,7 +656,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
@@ -664,55 +664,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 ""
@@ -1573,92 +1573,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
-#, 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
+#: src/emu/ui/ui.cpp:1060
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 "
@@ -1666,7 +1654,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 "
@@ -1674,21 +1662,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"
@@ -1698,98 +1686,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"
@@ -1798,173 +1786,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:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335
-#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401
-#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445
+#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219
+#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285
+#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351
+#: 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:2509
+#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443
+#: 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 ""
diff --git a/language/French/strings.po b/language/French/strings.po
index bf0a6c85c84..ebf194942eb 100644
--- a/language/French/strings.po
+++ b/language/French/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: Benjamin Siskoo\n"
@@ -63,14 +63,14 @@ msgstr "Tout Recharger"
msgid "Autofire Status"
msgstr "Statut du Tir Auto"
-#: 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 "Désactivé"
-#: 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
@@ -648,11 +648,11 @@ msgstr "Attente de la Synchro Verticale"
msgid "Display Options"
msgstr "Options D'Affichage"
-#: src/emu/ui/filesel.cpp:159
+#: src/emu/ui/filesel.cpp:161
msgid "File Already Exists - Override?"
msgstr "Le Fichier Existe Déjà - Continuer ?"
-#: 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
@@ -660,7 +660,7 @@ msgstr "Le Fichier Existe Déjà - Continuer ?"
msgid "No"
msgstr "Non"
-#: 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
@@ -668,55 +668,55 @@ msgstr "Non"
msgid "Yes"
msgstr "Oui"
-#: src/emu/ui/filesel.cpp:271
+#: src/emu/ui/filesel.cpp:275
msgid "New Image Name:"
msgstr "Nouveau Nom de l'Image :"
-#: src/emu/ui/filesel.cpp:277
+#: src/emu/ui/filesel.cpp:281
msgid "Image Format:"
msgstr "Format de l'Image :"
-#: src/emu/ui/filesel.cpp:283
+#: src/emu/ui/filesel.cpp:287
msgid "Create"
msgstr "Créer"
-#: src/emu/ui/filesel.cpp:314
+#: src/emu/ui/filesel.cpp:318
msgid "Please enter a file extension too"
msgstr "Veuillez entrer l'extension du fichier aussi"
-#: 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 "[emplacement vide]"
-#: src/emu/ui/filesel.cpp:506
+#: src/emu/ui/filesel.cpp:510
msgid "[create]"
msgstr "[créer]"
-#: 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 "[Liste de Logiciel]"
-#: src/emu/ui/filesel.cpp:802
+#: src/emu/ui/filesel.cpp:806
msgid "Select image format"
msgstr "Sélection du Format de l'Image"
-#: src/emu/ui/filesel.cpp:862
+#: src/emu/ui/filesel.cpp:866
msgid "Select access mode"
msgstr "Sélection du Mode d'Accès"
-#: src/emu/ui/filesel.cpp:863
+#: src/emu/ui/filesel.cpp:867
msgid "Read-only"
msgstr "Lecture Seule"
-#: src/emu/ui/filesel.cpp:865
+#: src/emu/ui/filesel.cpp:869
msgid "Read-write"
msgstr "Lecture-Ecriture"
-#: src/emu/ui/filesel.cpp:866
+#: src/emu/ui/filesel.cpp:870
msgid "Read this image, write to another image"
msgstr "Lire Cette Image, Ecrire vers une Autre Image"
-#: src/emu/ui/filesel.cpp:867
+#: src/emu/ui/filesel.cpp:871
msgid "Read this image, write to diff"
msgstr "Lire cette image, écrire la différence"
@@ -1606,32 +1606,13 @@ msgstr "Rembobiner"
msgid "Fast Forward"
msgstr "Avancée Rapide"
-#: 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 ""
"Ce driver nécessite les images pour être chargé dans les périphérique(s) "
"suivant(s) : "
-#: src/emu/ui/ui.cpp:1043
-#, 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 ""
-"L'utilisation des émulateurs avec des ROMs qui ne vous appartiennent pas est "
-"interdite par la loi sur les droits d'auteurs.\n"
-"\n"
-"SI VOUS N'ETES PAS LEGALEMENT HABILITE A LANCER \"%1$s\" SUR CETTE "
-"EMULATEUR, PRESSEZ LA TOUCHE ECHAP.\n"
-"\n"
-"Autrement, taper OK ou bouger le joystick de gauche à droite pour continuer"
-
-#: src/emu/ui/ui.cpp:1081
+#: src/emu/ui/ui.cpp:1060
msgid ""
"One or more ROMs/CHDs for this machine are incorrect. The machine may not "
"run correctly.\n"
@@ -1639,7 +1620,7 @@ msgstr ""
"Une ou plusieurs ROMS/CHD de ce jeu est (sont)incorrecte(s). Ce jeu pourrait "
"ne pas se lancer correctement.\n"
-#: src/emu/ui/ui.cpp:1094
+#: src/emu/ui/ui.cpp:1073
msgid ""
"There are known problems with this machine\n"
"\n"
@@ -1647,50 +1628,50 @@ msgstr ""
"Il y a des problèmes connus avec ce jeu\n"
"\n"
-#: 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 ""
"Une ou plusieurs ROMs/CHDs de ce jeu n'a (n'ont) pas été(s) correctement "
"copiée(s).\n"
-#: 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 "L'émulation du clavier peut ne pas être précise à 100%.\n"
-#: src/emu/ui/ui.cpp:1104
+#: src/emu/ui/ui.cpp:1083
#, c-format
msgid "The colors aren't 100% accurate.\n"
msgstr "Les couleurs ne sont pas parfaites à 100%.\n"
-#: src/emu/ui/ui.cpp:1106
+#: src/emu/ui/ui.cpp:1085
msgid "The colors are completely wrong.\n"
msgstr "Les couleurs sont complétement fausses.\n"
-#: src/emu/ui/ui.cpp:1108
+#: src/emu/ui/ui.cpp:1087
#, c-format
msgid "The video emulation isn't 100% accurate.\n"
msgstr "L'émulation vidéo n'est pas précise à 100%.\n"
-#: src/emu/ui/ui.cpp:1110
+#: src/emu/ui/ui.cpp:1089
#, c-format
msgid "The sound emulation isn't 100% accurate.\n"
msgstr "L'émulation du son n'est pas précise à 100%.\n"
-#: src/emu/ui/ui.cpp:1112
+#: src/emu/ui/ui.cpp:1091
msgid "The machine lacks sound.\n"
msgstr "Il n'y a aucun son pour ce jeu.\n"
-#: src/emu/ui/ui.cpp:1115
+#: src/emu/ui/ui.cpp:1094
msgid "Screen flipping in cocktail mode is not supported.\n"
msgstr "Le retournement d'écran dans le mode cocktail n'est pas supporté.\n"
-#: src/emu/ui/ui.cpp:1119
+#: src/emu/ui/ui.cpp:1098
msgid "The machine requires external artwork files\n"
msgstr "La machine nécessite un fichier artwork externe\n"
-#: 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"
@@ -1698,7 +1679,7 @@ msgstr ""
"Ce jeu n'a jamais été terminé. Il peut y avoir des comportements étranges ou "
"des éléments manquants qui ne sont pas des bugs d'émulation.\n"
-#: 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"
@@ -1706,11 +1687,11 @@ msgstr ""
"Ce jeu ne possède pas de son à l'origine, MAME ne produira aucun son, c'est "
"un fonctionnement normal pour ce jeu.\n"
-#: src/emu/ui/ui.cpp:1137
+#: src/emu/ui/ui.cpp:1116
msgid "The machine has protection which isn't fully emulated.\n"
msgstr "Cette machine a une protection qui n'est pas complétement émulée.\n"
-#: 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 "
@@ -1721,7 +1702,7 @@ msgstr ""
"Il n'y a rien que vous puissiez faire pour corriger ce problème sauf "
"d'attendre que les développeurs améliorent l'émulation.\n"
-#: 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 "
@@ -1732,24 +1713,21 @@ msgstr ""
"une interaction physique ou comporte des périphériques mécaniques. Il n'est "
"pas possible de jouer à 100% avec ce jeu.\n"
-#: src/emu/ui/ui.cpp:1163
+#: src/emu/ui/ui.cpp:1142
msgid ""
"\n"
"\n"
"There are working clones of this machine: "
msgstr "Il y a des clones de ce jeu qui fonctionnent :"
-#: 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 ""
-"\n"
-"\n"
-"Taper OK ou bouger le joystick de gauche à droite"
-#: src/emu/ui/ui.cpp:1192
+#: src/emu/ui/ui.cpp:1171
#, c-format
msgid ""
"%1$s\n"
@@ -1764,15 +1742,15 @@ msgstr ""
"\n"
"CPU:\n"
-#: 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 "MHz"
-#: 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 "kHz"
-#: src/emu/ui/ui.cpp:1242
+#: src/emu/ui/ui.cpp:1221
msgid ""
"\n"
"Sound:\n"
@@ -1780,7 +1758,7 @@ msgstr ""
"\n"
"Son :\n"
-#: src/emu/ui/ui.cpp:1271
+#: src/emu/ui/ui.cpp:1250
msgid ""
"\n"
"Video:\n"
@@ -1788,78 +1766,78 @@ msgstr ""
"\n"
"Vidéo :\n"
-#: src/emu/ui/ui.cpp:1275
+#: src/emu/ui/ui.cpp:1254
msgid "None\n"
msgstr "Aucun\n"
-#: 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 "%1$s: %2$s\n"
-#: src/emu/ui/ui.cpp:1293
+#: src/emu/ui/ui.cpp:1272
msgid "%2$s\n"
msgstr "%2$s\n"
-#: 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 "Statut d'Emulation du Clavier"
-#: src/emu/ui/ui.cpp:1579
+#: src/emu/ui/ui.cpp:1529
msgid "Mode: PARTIAL Emulation"
msgstr "Mode : Emulation PARTIELLE"
-#: src/emu/ui/ui.cpp:1580
+#: src/emu/ui/ui.cpp:1530
msgid "UI: Enabled"
msgstr "UI : Activé"
-#: 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 "**Utiliser ScrLock pour changer**"
-#: src/emu/ui/ui.cpp:1589
+#: src/emu/ui/ui.cpp:1539
msgid "Mode: FULL Emulation"
msgstr "Mode : Emulation COMPLETE"
-#: src/emu/ui/ui.cpp:1590
+#: src/emu/ui/ui.cpp:1540
msgid "UI: Disabled"
msgstr "UI : Désactivé"
-#: src/emu/ui/ui.cpp:1736
+#: src/emu/ui/ui.cpp:1686
msgid "Autofire can't be enabled"
msgstr "Le Tir Auto ne peut pas être activé"
-#: src/emu/ui/ui.cpp:1775
+#: src/emu/ui/ui.cpp:1725
msgid "Select position to save to"
msgstr "Sélection de la position pour sauvegarder vers"
-#: src/emu/ui/ui.cpp:1777
+#: src/emu/ui/ui.cpp:1727
msgid "Select position to load from"
msgstr "Sélection de la position pour charger depuis"
-#: src/emu/ui/ui.cpp:1801
+#: src/emu/ui/ui.cpp:1751
msgid "Save cancelled"
msgstr "Sauvegarde annulée"
-#: src/emu/ui/ui.cpp:1803
+#: src/emu/ui/ui.cpp:1753
msgid "Load cancelled"
msgstr "Chargement annulé"
-#: src/emu/ui/ui.cpp:1846
+#: src/emu/ui/ui.cpp:1796
#, c-format
msgid "Save to position %s"
msgstr "Sauvegarder la position %s"
-#: src/emu/ui/ui.cpp:1851
+#: src/emu/ui/ui.cpp:1801
#, c-format
msgid "Load from position %s"
msgstr "Charger depuis la position %s"
-#: src/emu/ui/ui.cpp:1891
+#: src/emu/ui/ui.cpp:1841
#, c-format
msgid ""
"Are you sure you want to quit?\n"
@@ -1868,173 +1846,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 "Volume Maître"
-#: 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 "Overclock le CPU %1$s"
-#: src/emu/ui/ui.cpp:2018
+#: src/emu/ui/ui.cpp:1968
#, c-format
msgid "%1$s Refresh Rate"
msgstr "%1$s Taux de Rafraîchissement"
-#: src/emu/ui/ui.cpp:2024
+#: src/emu/ui/ui.cpp:1974
#, c-format
msgid "%1$s Brightness"
msgstr "%1$s Luminosité"
-#: src/emu/ui/ui.cpp:2027
+#: src/emu/ui/ui.cpp:1977
#, c-format
msgid "%1$s Contrast"
msgstr "%1$s Contraste"
-#: src/emu/ui/ui.cpp:2030
+#: src/emu/ui/ui.cpp:1980
#, c-format
msgid "%1$s Gamma"
msgstr "%1$s Gamma"
-#: src/emu/ui/ui.cpp:2035
+#: src/emu/ui/ui.cpp:1985
#, c-format
msgid "%1$s Horiz Stretch"
msgstr "%1$s Etirer Horiz"
-#: src/emu/ui/ui.cpp:2038
+#: src/emu/ui/ui.cpp:1988
#, c-format
msgid "%1$s Horiz Position"
msgstr "%1$s Position Horiz"
-#: src/emu/ui/ui.cpp:2041
+#: src/emu/ui/ui.cpp:1991
#, c-format
msgid "%1$s Vert Stretch"
msgstr "%1$s Etirer Vert"
-#: src/emu/ui/ui.cpp:2044
+#: src/emu/ui/ui.cpp:1994
#, c-format
msgid "%1$s Vert Position"
msgstr "%1$s Position Vert"
-#: src/emu/ui/ui.cpp:2062
+#: src/emu/ui/ui.cpp:2012
#, c-format
msgid "Laserdisc '%1$s' Horiz Stretch"
msgstr "Laserdisc '%1$s' Etirer Horiz"
-#: src/emu/ui/ui.cpp:2065
+#: src/emu/ui/ui.cpp:2015
#, c-format
msgid "Laserdisc '%1$s' Horiz Position"
msgstr "Laserdisc '%1$s' Position Horiz"
-#: src/emu/ui/ui.cpp:2068
+#: src/emu/ui/ui.cpp:2018
#, c-format
msgid "Laserdisc '%1$s' Vert Stretch"
msgstr "Laserdisc '%1$s' Etirer Vert"
-#: src/emu/ui/ui.cpp:2071
+#: src/emu/ui/ui.cpp:2021
#, c-format
msgid "Laserdisc '%1$s' Vert Position"
msgstr "Laserdisc '%1$s' Position Vert"
-#: src/emu/ui/ui.cpp:2080
+#: src/emu/ui/ui.cpp:2030
msgid "Vector Flicker"
msgstr "Scintillement - Vector"
-#: src/emu/ui/ui.cpp:2082
+#: src/emu/ui/ui.cpp:2032
msgid "Beam Width Minimum"
msgstr "Largeur Minimum du Rayon"
-#: src/emu/ui/ui.cpp:2084
+#: src/emu/ui/ui.cpp:2034
msgid "Beam Width Maximum"
msgstr "Largeur Maximum du Rayon"
-#: src/emu/ui/ui.cpp:2086
+#: src/emu/ui/ui.cpp:2036
msgid "Beam Intensity Weight"
msgstr "Intensité du Poids du Rayon"
-#: src/emu/ui/ui.cpp:2098
+#: src/emu/ui/ui.cpp:2048
#, c-format
msgid "Crosshair Scale %1$s"
msgstr "Echelle du Viseur %1$s"
-#: 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 "X"
-#: 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 "Y"
-#: src/emu/ui/ui.cpp:2101
+#: src/emu/ui/ui.cpp:2051
#, c-format
msgid "Crosshair Offset %1$s"
msgstr "Etalonnage du Viseur %1$s"
-#: src/emu/ui/ui.cpp:2120
+#: src/emu/ui/ui.cpp:2070
#, c-format
msgid "%1$3ddB"
msgstr "%1$3ddB"
-#: src/emu/ui/ui.cpp:2164
+#: src/emu/ui/ui.cpp:2114
#, c-format
msgid "%1$d%%"
msgstr "%1$d%%"
-#: src/emu/ui/ui.cpp:2180
+#: src/emu/ui/ui.cpp:2130
#, c-format
msgid "%1$3.0f%%"
msgstr "%1$3.0f%%"
-#: src/emu/ui/ui.cpp:2203
+#: src/emu/ui/ui.cpp:2153
#, c-format
msgid "%1$.3ffps"
msgstr "%1$.3ffps"
-#: src/emu/ui/ui.cpp:2226 src/emu/ui/ui.cpp:2248 src/emu/ui/ui.cpp:2269
-#: src/emu/ui/ui.cpp:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335
-#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401
-#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445
+#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219
+#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285
+#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351
+#: src/emu/ui/ui.cpp:2373 src/emu/ui/ui.cpp:2395
#, c-format
msgid "%1$.3f"
msgstr "%1$.3f"
-#: src/emu/ui/ui.cpp:2461 src/emu/ui/ui.cpp:2477 src/emu/ui/ui.cpp:2493
-#: src/emu/ui/ui.cpp:2509
+#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443
+#: src/emu/ui/ui.cpp:2459
#, c-format
msgid "%1$1.2f"
msgstr "%1$1.2f"
-#: src/emu/ui/ui.cpp:2525
+#: src/emu/ui/ui.cpp:2475
#, c-format
msgid "Screen '%1$s'"
msgstr "Ecran '%1$s'"
-#: src/emu/ui/ui.cpp:2527
+#: src/emu/ui/ui.cpp:2477
msgid "Screen"
msgstr "Ecran"
-#: src/emu/ui/ui.cpp:2543
+#: src/emu/ui/ui.cpp:2493
#, c-format
msgid "Crosshair Scale X %1$1.3f"
msgstr "Echelle du Viseur X %1$1.3f"
-#: src/emu/ui/ui.cpp:2543
+#: src/emu/ui/ui.cpp:2493
#, c-format
msgid "Crosshair Scale Y %1$1.3f"
msgstr "Echelle du Viseur Y %1$1.3f"
-#: src/emu/ui/ui.cpp:2562
+#: src/emu/ui/ui.cpp:2512
#, c-format
msgid "Crosshair Offset X %1$1.3f"
msgstr "Etalonnage du Viseur X %1$1.3f"
-#: src/emu/ui/ui.cpp:2562
+#: src/emu/ui/ui.cpp:2512
#, c-format
msgid "Crosshair Offset Y %1$1.3f"
msgstr "Etalonnage du Viseur Y %1$1.3f"
@@ -2084,6 +2062,33 @@ msgstr " COULEURS"
msgid " PENS"
msgstr " PENS"
+#~ 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 ""
+#~ "L'utilisation des émulateurs avec des ROMs qui ne vous appartiennent pas "
+#~ "est interdite par la loi sur les droits d'auteurs.\n"
+#~ "\n"
+#~ "SI VOUS N'ETES PAS LEGALEMENT HABILITE A LANCER \"%1$s\" SUR CETTE "
+#~ "EMULATEUR, PRESSEZ LA TOUCHE ECHAP.\n"
+#~ "\n"
+#~ "Autrement, taper OK ou bouger le joystick de gauche à droite pour "
+#~ "continuer"
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "Type OK or move the joystick left then right to continue"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "Taper OK ou bouger le joystick de gauche à droite"
+
#~ msgid "Configure Machine"
#~ msgstr "Configurer la Machine"
diff --git a/language/French_Belgium/strings.po b/language/French_Belgium/strings.po
index 38c5a274996..020a133438c 100644
--- a/language/French_Belgium/strings.po
+++ b/language/French_Belgium/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-03-06 10:44+0100\n"
"Last-Translator: Mevi <mevi.mame@gmail.com>\n"
"Language-Team: MAME Language Team\n"
@@ -62,14 +62,14 @@ msgstr "Tout recharger"
msgid "Autofire Status"
msgstr "Statut du tir automatique"
-#: 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 "Désactivé"
-#: 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
@@ -647,11 +647,11 @@ msgstr "Attendre V-Sync"
msgid "Display Options"
msgstr "Options d'affichage"
-#: src/emu/ui/filesel.cpp:159
+#: src/emu/ui/filesel.cpp:161
msgid "File Already Exists - Override?"
msgstr "Ce fichier existe déjà - Écraser ?"
-#: 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
@@ -659,7 +659,7 @@ msgstr "Ce fichier existe déjà - Écraser ?"
msgid "No"
msgstr "Non"
-#: 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
@@ -667,55 +667,55 @@ msgstr "Non"
msgid "Yes"
msgstr "Oui"
-#: src/emu/ui/filesel.cpp:271
+#: src/emu/ui/filesel.cpp:275
msgid "New Image Name:"
msgstr "Nouveau nom de l'image :"
-#: src/emu/ui/filesel.cpp:277
+#: src/emu/ui/filesel.cpp:281
msgid "Image Format:"
msgstr "Format de l'image :"
-#: src/emu/ui/filesel.cpp:283
+#: src/emu/ui/filesel.cpp:287
msgid "Create"
msgstr "Créer"
-#: src/emu/ui/filesel.cpp:314
+#: src/emu/ui/filesel.cpp:318
msgid "Please enter a file extension too"
msgstr "Veuillez entrer également l'extension du fichier"
-#: 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 "[emplacement vide]"
-#: src/emu/ui/filesel.cpp:506
+#: src/emu/ui/filesel.cpp:510
msgid "[create]"
msgstr "[créer]"
-#: 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 "[liste des logiciels]"
-#: src/emu/ui/filesel.cpp:802
+#: src/emu/ui/filesel.cpp:806
msgid "Select image format"
msgstr "Sélectionner le format de l'image"
-#: src/emu/ui/filesel.cpp:862
+#: src/emu/ui/filesel.cpp:866
msgid "Select access mode"
msgstr "Sélectionner le mode d'accès"
-#: src/emu/ui/filesel.cpp:863
+#: src/emu/ui/filesel.cpp:867
msgid "Read-only"
msgstr "Lecture seule"
-#: src/emu/ui/filesel.cpp:865
+#: src/emu/ui/filesel.cpp:869
msgid "Read-write"
msgstr "Lecture-écriture"
-#: src/emu/ui/filesel.cpp:866
+#: src/emu/ui/filesel.cpp:870
msgid "Read this image, write to another image"
msgstr "Lire cette image, écrire dans une autre image"
-#: src/emu/ui/filesel.cpp:867
+#: src/emu/ui/filesel.cpp:871
msgid "Read this image, write to diff"
msgstr "Lire cette image, écrire vers diff"
@@ -1608,32 +1608,13 @@ 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 ""
"Ce driver nécessite le chargement d'images dans le(s) périphérique(s) "
"suivant(s) : "
-#: src/emu/ui/ui.cpp:1043
-#, 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 ""
-"L'utilisation conjointe d'émulateurs et de ROMs que vous ne possédez pas est "
-"interdite par la législation sur le droit d'auteur.\n"
-"\n"
-"SI VOUS N'ÊTES PAS LÉGALEMENT AUTORISÉ À UTILISER \"%s\" SUR CET ÉMULATEUR, "
-"APPUYEZ SUR ESC.\n"
-"Dans le cas contraire, taper OK ou bouger le joystick à gauche puis à droite "
-"pour continuer"
-
-#: src/emu/ui/ui.cpp:1081
+#: src/emu/ui/ui.cpp:1060
msgid ""
"One or more ROMs/CHDs for this machine are incorrect. The machine may not "
"run correctly.\n"
@@ -1642,7 +1623,7 @@ msgstr ""
"cette machine sont incorrects. Il est possible qu'elle ne fonctionne pas "
"correctement.\n"
-#: src/emu/ui/ui.cpp:1094
+#: src/emu/ui/ui.cpp:1073
msgid ""
"There are known problems with this machine\n"
"\n"
@@ -1650,50 +1631,50 @@ msgstr ""
"On rencontre les problèmes suivants avec cette machine :\n"
"\n"
-#: 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 ""
"Un ou plusieurs fichiers ROMs/CHDs nécessaires à l'utilisation de cette "
"machine n'ont pas été dumpés correctement.\n"
-#: 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 "L'émulation du clavier peut ne pas être fidèle à 100%.\n"
-#: src/emu/ui/ui.cpp:1104
+#: src/emu/ui/ui.cpp:1083
#, c-format
msgid "The colors aren't 100% accurate.\n"
msgstr "Les couleurs ne sont pas fidèles à 100%.\n"
-#: src/emu/ui/ui.cpp:1106
+#: src/emu/ui/ui.cpp:1085
msgid "The colors are completely wrong.\n"
msgstr "Les couleurs sont complètement fausses.\n"
-#: src/emu/ui/ui.cpp:1108
+#: src/emu/ui/ui.cpp:1087
#, c-format
msgid "The video emulation isn't 100% accurate.\n"
msgstr "L'émulation vidéo n'est pas fidèle à 100%.\n"
-#: src/emu/ui/ui.cpp:1110
+#: src/emu/ui/ui.cpp:1089
#, c-format
msgid "The sound emulation isn't 100% accurate.\n"
msgstr "L'émulation du son n'est pas fidèle à 100%.\n"
-#: src/emu/ui/ui.cpp:1112
+#: src/emu/ui/ui.cpp:1091
msgid "The machine lacks sound.\n"
msgstr "La machine n'a pas de son.\n"
-#: src/emu/ui/ui.cpp:1115
+#: src/emu/ui/ui.cpp:1094
msgid "Screen flipping in cocktail mode is not supported.\n"
msgstr "Le retournement de l'écran en mode cocktail n'est pas supporté.\n"
-#: src/emu/ui/ui.cpp:1119
+#: src/emu/ui/ui.cpp:1098
msgid "The machine requires external artwork files\n"
msgstr "La machine nécessite l'utilisation de fichiers artwork externes\n"
-#: 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"
@@ -1702,7 +1683,7 @@ msgstr ""
"bizarrement ou que certains composants soient manquants. Cela ne constitue "
"en aucun cas des bugs d'émulation.\n"
-#: 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"
@@ -1710,11 +1691,11 @@ msgstr ""
"Cette machine n'a pas de dispositif sonore. Par conséquent, MAME ne produira "
"aucun son. Il s'agit d'un comportement attendu.\n"
-#: src/emu/ui/ui.cpp:1137
+#: src/emu/ui/ui.cpp:1116
msgid "The machine has protection which isn't fully emulated.\n"
msgstr "La machine possède une protection qui n'est pas complètement émulée.\n"
-#: 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 "
@@ -1726,7 +1707,7 @@ msgstr ""
"encore complète. Il n'y a rien que vous puissiez faire pour résoudre ce "
"problème sauf attendre que les développeurs améliorent l'émulation.\n"
-#: 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 "
@@ -1738,7 +1719,7 @@ msgstr ""
"nécessitent une interaction physique ou comportent des éléments mécaniques. "
"Il n'est donc pas possible d'y jouer complètement.\n"
-#: src/emu/ui/ui.cpp:1163
+#: src/emu/ui/ui.cpp:1142
msgid ""
"\n"
"\n"
@@ -1748,17 +1729,14 @@ msgstr ""
"\n"
"Il existe des clones de cette machine qui fonctionnent correctement : "
-#: 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 ""
-"\n"
-"\n"
-"Tapez OK ou bouger le joystick à gauche puis à droite pour continuer"
-#: src/emu/ui/ui.cpp:1192
+#: src/emu/ui/ui.cpp:1171
#, c-format
msgid ""
"%1$s\n"
@@ -1773,15 +1751,15 @@ msgstr ""
"\n"
"Processeur(s) :\n"
-#: 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"
@@ -1789,7 +1767,7 @@ msgstr ""
"\n"
"Son :\n"
-#: src/emu/ui/ui.cpp:1271
+#: src/emu/ui/ui.cpp:1250
msgid ""
"\n"
"Video:\n"
@@ -1797,78 +1775,78 @@ msgstr ""
"\n"
"Vidéo :\n"
-#: src/emu/ui/ui.cpp:1275
+#: src/emu/ui/ui.cpp:1254
msgid "None\n"
msgstr "Aucun\n"
-#: src/emu/ui/ui.cpp:1282
+#: src/emu/ui/ui.cpp:1261
msgid "Vector"
msgstr "Graphismes vectoriels"
-#: src/emu/ui/ui.cpp:1293
+#: src/emu/ui/ui.cpp:1272
#, c-format
msgid "%1$s: %2$s\n"
msgstr "%1$s : %2$s\n"
-#: 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 "Statut de l'émulation du clavier"
-#: src/emu/ui/ui.cpp:1579
+#: src/emu/ui/ui.cpp:1529
msgid "Mode: PARTIAL Emulation"
msgstr "Mode : Émulation PARTIELLE"
-#: src/emu/ui/ui.cpp:1580
+#: src/emu/ui/ui.cpp:1530
msgid "UI: Enabled"
msgstr "Interface : Activée"
-#: 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 "**Utiliser ScrLock pour basculer**"
-#: src/emu/ui/ui.cpp:1589
+#: src/emu/ui/ui.cpp:1539
msgid "Mode: FULL Emulation"
msgstr "Mode : Émulation COMPLÈTE"
-#: src/emu/ui/ui.cpp:1590
+#: src/emu/ui/ui.cpp:1540
msgid "UI: Disabled"
msgstr "Interface : désactivée"
-#: src/emu/ui/ui.cpp:1736
+#: src/emu/ui/ui.cpp:1686
msgid "Autofire can't be enabled"
msgstr "Le tir automatique ne peut pas être activé"
-#: src/emu/ui/ui.cpp:1775
+#: src/emu/ui/ui.cpp:1725
msgid "Select position to save to"
msgstr "Sauvegarder à la position"
-#: src/emu/ui/ui.cpp:1777
+#: src/emu/ui/ui.cpp:1727
msgid "Select position to load from"
msgstr "Charger depuis la position"
-#: src/emu/ui/ui.cpp:1801
+#: src/emu/ui/ui.cpp:1751
msgid "Save cancelled"
msgstr "Sauvegarde annulée"
-#: src/emu/ui/ui.cpp:1803
+#: src/emu/ui/ui.cpp:1753
msgid "Load cancelled"
msgstr "Chargement annulé"
-#: src/emu/ui/ui.cpp:1846
+#: src/emu/ui/ui.cpp:1796
#, c-format
msgid "Save to position %s"
msgstr "Sauvegarde à la position %s"
-#: src/emu/ui/ui.cpp:1851
+#: src/emu/ui/ui.cpp:1801
#, c-format
msgid "Load from position %s"
msgstr "Chargement depuis la position %s"
-#: src/emu/ui/ui.cpp:1891
+#: src/emu/ui/ui.cpp:1841
#, c-format
msgid ""
"Are you sure you want to quit?\n"
@@ -1881,173 +1859,173 @@ msgstr ""
"Appuyez sur ''%1$s'' pour quitter,\n"
"Appuyez sur ''%2$s'' pour retourner à l'émulation."
-#: src/emu/ui/ui.cpp:1966
+#: src/emu/ui/ui.cpp:1916
msgid "Master Volume"
msgstr "Volume principal"
-#: src/emu/ui/ui.cpp:1976
+#: src/emu/ui/ui.cpp:1926
#, c-format
msgid "%1$s Volume"
msgstr "Volume %1$s"
-#: src/emu/ui/ui.cpp:1998
+#: src/emu/ui/ui.cpp:1948
#, c-format
msgid "Overclock CPU %1$s"
msgstr "Overclock du processeur %1$s"
-#: src/emu/ui/ui.cpp:2018
+#: src/emu/ui/ui.cpp:1968
#, c-format
msgid "%1$s Refresh Rate"
msgstr "%1$s - Taux de rafraîchissement"
-#: src/emu/ui/ui.cpp:2024
+#: src/emu/ui/ui.cpp:1974
#, c-format
msgid "%1$s Brightness"
msgstr "%1$s - Luminosité"
-#: src/emu/ui/ui.cpp:2027
+#: src/emu/ui/ui.cpp:1977
#, c-format
msgid "%1$s Contrast"
msgstr "%1$s - Contraste"
-#: src/emu/ui/ui.cpp:2030
+#: src/emu/ui/ui.cpp:1980
#, c-format
msgid "%1$s Gamma"
msgstr "%1$s - Gamma"
-#: src/emu/ui/ui.cpp:2035
+#: src/emu/ui/ui.cpp:1985
#, c-format
msgid "%1$s Horiz Stretch"
msgstr "%1$s - Stretch Horizontal"
-#: src/emu/ui/ui.cpp:2038
+#: src/emu/ui/ui.cpp:1988
#, c-format
msgid "%1$s Horiz Position"
msgstr "%1$s - Position Horizontale"
-#: src/emu/ui/ui.cpp:2041
+#: src/emu/ui/ui.cpp:1991
#, c-format
msgid "%1$s Vert Stretch"
msgstr "%1$s - Stretch Vertical"
-#: src/emu/ui/ui.cpp:2044
+#: src/emu/ui/ui.cpp:1994
#, c-format
msgid "%1$s Vert Position"
msgstr "%1$s - Position Verticale"
-#: src/emu/ui/ui.cpp:2062
+#: src/emu/ui/ui.cpp:2012
#, c-format
msgid "Laserdisc '%1$s' Horiz Stretch"
msgstr "'%1$s' Laserdisc - Stretch Horizontal"
-#: src/emu/ui/ui.cpp:2065
+#: src/emu/ui/ui.cpp:2015
#, c-format
msgid "Laserdisc '%1$s' Horiz Position"
msgstr "'%1$s' Laserdisc - Position Horizontale"
-#: src/emu/ui/ui.cpp:2068
+#: src/emu/ui/ui.cpp:2018
#, c-format
msgid "Laserdisc '%1$s' Vert Stretch"
msgstr "'%1$s' Laserdisc - Stretch Vertical"
-#: src/emu/ui/ui.cpp:2071
+#: src/emu/ui/ui.cpp:2021
#, c-format
msgid "Laserdisc '%1$s' Vert Position"
msgstr "'%1$s' Laserdisc - Position Verticale"
-#: src/emu/ui/ui.cpp:2080
+#: src/emu/ui/ui.cpp:2030
msgid "Vector Flicker"
msgstr "Scintillement de l'affichage vectoriel"
-#: src/emu/ui/ui.cpp:2082
+#: src/emu/ui/ui.cpp:2032
msgid "Beam Width Minimum"
msgstr "Largeur de rayon minimum"
-#: src/emu/ui/ui.cpp:2084
+#: src/emu/ui/ui.cpp:2034
msgid "Beam Width Maximum"
msgstr "Largeur de rayon maximum"
-#: src/emu/ui/ui.cpp:2086
+#: src/emu/ui/ui.cpp:2036
msgid "Beam Intensity Weight"
msgstr "Intensité du rayon"
-#: src/emu/ui/ui.cpp:2098
+#: src/emu/ui/ui.cpp:2048
#, c-format
msgid "Crosshair Scale %1$s"
msgstr "Viseur - Échelle %1$s"
-#: 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 "Viseur - Offset %1$s"
-#: 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:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335
-#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401
-#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445
+#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219
+#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285
+#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351
+#: 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:2509
+#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443
+#: 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 "Écran '%1$s'"
-#: src/emu/ui/ui.cpp:2527
+#: src/emu/ui/ui.cpp:2477
msgid "Screen"
msgstr "Écran"
-#: src/emu/ui/ui.cpp:2543
+#: src/emu/ui/ui.cpp:2493
#, c-format
msgid "Crosshair Scale X %1$1.3f"
msgstr "Viseur - Échelle X %1$1.3f"
-#: src/emu/ui/ui.cpp:2543
+#: src/emu/ui/ui.cpp:2493
#, c-format
msgid "Crosshair Scale Y %1$1.3f"
msgstr "Viseur - Échelle Y %1$1.3f"
-#: src/emu/ui/ui.cpp:2562
+#: src/emu/ui/ui.cpp:2512
#, c-format
msgid "Crosshair Offset X %1$1.3f"
msgstr "Viseur - Offset X %1$1.3f"
-#: src/emu/ui/ui.cpp:2562
+#: src/emu/ui/ui.cpp:2512
#, c-format
msgid "Crosshair Offset Y %1$1.3f"
msgstr "Viseur - Offset Y %1$1.3f"
@@ -2097,6 +2075,32 @@ msgstr " COULEURS"
msgid " PENS"
msgstr " MARQUEURS"
+#~ 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 ""
+#~ "L'utilisation conjointe d'émulateurs et de ROMs que vous ne possédez pas "
+#~ "est interdite par la législation sur le droit d'auteur.\n"
+#~ "\n"
+#~ "SI VOUS N'ÊTES PAS LÉGALEMENT AUTORISÉ À UTILISER \"%s\" SUR CET "
+#~ "ÉMULATEUR, APPUYEZ SUR ESC.\n"
+#~ "Dans le cas contraire, taper OK ou bouger le joystick à gauche puis à "
+#~ "droite pour continuer"
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "Type OK or move the joystick left then right to continue"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "Tapez OK ou bouger le joystick à gauche puis à droite pour continuer"
+
#~ msgid "Configure Machine"
#~ msgstr "Configurer la machine"
diff --git a/language/French_Canada/strings.po b/language/French_Canada/strings.po
index c3548166c98..029e1fa02f2 100644
--- a/language/French_Canada/strings.po
+++ b/language/French_Canada/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"
@@ -61,14 +61,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
@@ -644,11 +644,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
@@ -656,7 +656,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
@@ -664,55 +664,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 ""
@@ -1573,92 +1573,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
-#, 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
+#: src/emu/ui/ui.cpp:1060
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 "
@@ -1666,7 +1654,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 "
@@ -1674,21 +1662,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"
@@ -1698,98 +1686,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"
@@ -1798,173 +1786,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:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335
-#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401
-#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445
+#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219
+#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285
+#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351
+#: 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:2509
+#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443
+#: 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 ""
diff --git a/language/Georgian/strings.po b/language/Georgian/strings.po
index 5d3694a639e..47e70366e0b 100644
--- a/language/Georgian/strings.po
+++ b/language/Georgian/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
-#, 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
+#: src/emu/ui/ui.cpp:1060
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:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335
-#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401
-#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445
+#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219
+#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285
+#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351
+#: 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:2509
+#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443
+#: 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 ""
diff --git a/language/German/strings.po b/language/German/strings.po
index cdd4a7d0c44..1726fa1dcfa 100644
--- a/language/German/strings.po
+++ b/language/German/strings.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: MAME\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-25 23:59+0100\n"
-"PO-Revision-Date: 2016-03-25 12:00+0100\n"
+"POT-Creation-Date: 2016-03-28 09:02+0200\n"
+"PO-Revision-Date: 2016-03-28 11:54+0200\n"
"Last-Translator: Lothar Serra Mari <scummvm@rootfather.de>\n"
"Language-Team: MAME Language Team\n"
"Language: de\n"
@@ -64,14 +64,14 @@ msgstr "Alle neu laden"
msgid "Autofire Status"
msgstr "Dauerfeuer-Status"
-#: 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 "Deaktiviert"
-#: 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
@@ -445,7 +445,7 @@ msgstr "Mamespielstand"
#: src/emu/ui/datmenu.cpp:294 src/emu/ui/selgame.cpp:44
msgid "Gameinit"
-msgstr ""
+msgstr "Gameinit"
#: src/emu/ui/datmenu.cpp:296 src/emu/ui/selgame.cpp:43
msgid "Command"
@@ -648,11 +648,11 @@ msgstr "Warten auf vertikalen Synchronisationsimpuls"
msgid "Display Options"
msgstr "Anzeigeeinstellungen"
-#: src/emu/ui/filesel.cpp:159
+#: src/emu/ui/filesel.cpp:161
msgid "File Already Exists - Override?"
msgstr "Datei existiert bereits - Ãœberschreiben?"
-#: 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
@@ -660,7 +660,7 @@ msgstr "Datei existiert bereits - Ãœberschreiben?"
msgid "No"
msgstr "Nein"
-#: 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
@@ -668,55 +668,55 @@ msgstr "Nein"
msgid "Yes"
msgstr "Ja"
-#: src/emu/ui/filesel.cpp:271
+#: src/emu/ui/filesel.cpp:275
msgid "New Image Name:"
msgstr "Neuer Image-Name:"
-#: src/emu/ui/filesel.cpp:277
+#: src/emu/ui/filesel.cpp:281
msgid "Image Format:"
msgstr "Image-Format"
-#: src/emu/ui/filesel.cpp:283
+#: src/emu/ui/filesel.cpp:287
msgid "Create"
msgstr "Erzeugen"
-#: src/emu/ui/filesel.cpp:314
+#: src/emu/ui/filesel.cpp:318
msgid "Please enter a file extension too"
msgstr "Bitte geben Sie auch eine Dateierweiterung ein"
-#: 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 "[leerer Steckplatz]"
-#: src/emu/ui/filesel.cpp:506
+#: src/emu/ui/filesel.cpp:510
msgid "[create]"
msgstr "[erzeugen]"
-#: 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 "[Softwareliste]"
-#: src/emu/ui/filesel.cpp:802
+#: src/emu/ui/filesel.cpp:806
msgid "Select image format"
msgstr "Image-Format auswählen"
-#: src/emu/ui/filesel.cpp:862
+#: src/emu/ui/filesel.cpp:866
msgid "Select access mode"
msgstr "Zugriffsart wählen"
-#: src/emu/ui/filesel.cpp:863
+#: src/emu/ui/filesel.cpp:867
msgid "Read-only"
msgstr "Nur lesend"
-#: src/emu/ui/filesel.cpp:865
+#: src/emu/ui/filesel.cpp:869
msgid "Read-write"
msgstr "Lesend und schreibend"
-#: src/emu/ui/filesel.cpp:866
+#: src/emu/ui/filesel.cpp:870
msgid "Read this image, write to another image"
msgstr "Lesen von diesem Image, Schreiben auf ein anderes Image"
-#: src/emu/ui/filesel.cpp:867
+#: src/emu/ui/filesel.cpp:871
msgid "Read this image, write to diff"
msgstr "Lesen von diesem Image, Schreiben in diff"
@@ -1030,7 +1030,7 @@ msgstr "Im TXT-Format exportieren"
#: src/emu/ui/miscmenu.cpp:854
msgid "Dummy"
-msgstr "Dummy"
+msgstr "Platzhalter"
#: src/emu/ui/miscmenu.cpp:856
msgid "Save machine configuration"
@@ -1607,33 +1607,12 @@ msgstr "Zurückspulen"
msgid "Fast Forward"
msgstr "Vorspulen"
-#: 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 ""
"Für diese Maschine müssen Abbilder in die folgenden Geräte eingehängt werden:"
-#: src/emu/ui/ui.cpp:1043
-#, 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 ""
-"Die unlizenzierte Beschaffung und Verwendung von Computerprogrammen "
-"(einschließlich ROM-Inhalten), beispielsweise zur Nutzung in einem Emulator, "
-"stellt einen Verstoß gegen das Urheberrecht dar.\n"
-"\n"
-"WENN SIE NICHT BERECHTIGT SIND, \"%s\" IN DIESEM EMULATOR ZU VERWENDEN, "
-"DRÃœCKEN SIE ESC.\n"
-"\n"
-"Andernfalls geben Sie \"OK\" ein oder bewegen Sie den Joystick nach links "
-"und dann nach rechts um fortzufahren"
-
-#: src/emu/ui/ui.cpp:1081
+#: src/emu/ui/ui.cpp:1060
msgid ""
"One or more ROMs/CHDs for this machine are incorrect. The machine may not "
"run correctly.\n"
@@ -1641,7 +1620,7 @@ msgstr ""
"Ein oder mehrere ROMs/CHDs für diese Maschine sind nicht korrekt. Eventuell "
"wird die Maschine nicht richtig laufen.\n"
-#: src/emu/ui/ui.cpp:1094
+#: src/emu/ui/ui.cpp:1073
msgid ""
"There are known problems with this machine\n"
"\n"
@@ -1649,49 +1628,49 @@ msgstr ""
"Es gibt bekannte Probleme mit dieser Maschine\n"
"\n"
-#: 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 ""
"Ein oder mehrere ROMs/CHDs dieser Maschine wurden nicht korrekt ausgelesen.\n"
-#: 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 "Die Tastaturemulation könnte nicht 100% korrekt sein.\n"
-#: src/emu/ui/ui.cpp:1104
+#: src/emu/ui/ui.cpp:1083
#, c-format
msgid "The colors aren't 100% accurate.\n"
msgstr "Die Farben sind nicht 100% korrekt.\n"
-#: src/emu/ui/ui.cpp:1106
+#: src/emu/ui/ui.cpp:1085
msgid "The colors are completely wrong.\n"
msgstr "Die Farben sind völlig falsch.\n"
-#: src/emu/ui/ui.cpp:1108
+#: src/emu/ui/ui.cpp:1087
#, c-format
msgid "The video emulation isn't 100% accurate.\n"
msgstr "Die Videoemulation ist nicht 100% korrekt.\n"
-#: src/emu/ui/ui.cpp:1110
+#: src/emu/ui/ui.cpp:1089
#, c-format
msgid "The sound emulation isn't 100% accurate.\n"
msgstr "Die Soundemulation ist nicht 100% korrekt.\n"
-#: src/emu/ui/ui.cpp:1112
+#: src/emu/ui/ui.cpp:1091
msgid "The machine lacks sound.\n"
msgstr "Der Maschine fehlt die Soundemulation.\n"
-#: src/emu/ui/ui.cpp:1115
+#: src/emu/ui/ui.cpp:1094
msgid "Screen flipping in cocktail mode is not supported.\n"
msgstr "Die Bildschirmdrehung im Cocktailmodus wird nicht unterstützt.\n"
-#: src/emu/ui/ui.cpp:1119
+#: src/emu/ui/ui.cpp:1098
msgid "The machine requires external artwork files\n"
msgstr "Die Maschine benötigt externe Illustrationsdateien\n"
-#: 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"
@@ -1700,7 +1679,7 @@ msgstr ""
"oder fehlende Elemente aufweisen, die nicht auf Fehler der Emulation "
"zurückzuführen sind.\n"
-#: 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"
@@ -1708,13 +1687,13 @@ msgstr ""
"Diese Maschine besitzt keine Sound-Hardware; MAME wird erwartungsgemäß keine "
"Töne ausgeben.\n"
-#: src/emu/ui/ui.cpp:1137
+#: src/emu/ui/ui.cpp:1116
msgid "The machine has protection which isn't fully emulated.\n"
msgstr ""
"Die Maschine besitzt einen Kopierschutz, der nicht vollständig emuliert "
"ist.\n"
-#: 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 "
@@ -1726,7 +1705,7 @@ msgstr ""
"nicht vollständig. Sie können nur darauf warten, dass die Entwickler die "
"Emulation verbessern.\n"
-#: 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 "
@@ -1738,7 +1717,7 @@ msgstr ""
"echte physische Interaktion voraussetzen oder mechanische Komponenten "
"beinhalten. Es ist nicht möglich, diese Maschine vollständig zu verwenden.\n"
-#: src/emu/ui/ui.cpp:1163
+#: src/emu/ui/ui.cpp:1142
msgid ""
"\n"
"\n"
@@ -1748,18 +1727,17 @@ msgstr ""
"\n"
"Es gibt funktionsfähige Klone dieser Maschine: "
-#: 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 ""
"\n"
"\n"
-"Geben Sie \"OK\" ein oder bewegen Sie den Joystick nach links und dann nach "
-"rechts, um fortzufahren"
+"Drücken Sie eine beliebige Taste zum Fortfahren."
-#: src/emu/ui/ui.cpp:1192
+#: src/emu/ui/ui.cpp:1171
#, c-format
msgid ""
"%1$s\n"
@@ -1774,15 +1752,15 @@ msgstr ""
"\n"
"CPU:\n"
-#: 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 "MHz"
-#: 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 "kHz"
-#: src/emu/ui/ui.cpp:1242
+#: src/emu/ui/ui.cpp:1221
msgid ""
"\n"
"Sound:\n"
@@ -1790,7 +1768,7 @@ msgstr ""
"\n"
"Sound:\n"
-#: src/emu/ui/ui.cpp:1271
+#: src/emu/ui/ui.cpp:1250
msgid ""
"\n"
"Video:\n"
@@ -1798,78 +1776,78 @@ msgstr ""
"\n"
"Video:\n"
-#: src/emu/ui/ui.cpp:1275
+#: src/emu/ui/ui.cpp:1254
msgid "None\n"
msgstr "Keine\n"
-#: src/emu/ui/ui.cpp:1282
+#: src/emu/ui/ui.cpp:1261
msgid "Vector"
msgstr "Vektor"
-#: src/emu/ui/ui.cpp:1293
+#: src/emu/ui/ui.cpp:1272
#, c-format
msgid "%1$s: %2$s\n"
msgstr "%1$s: %2$s\n"
-#: src/emu/ui/ui.cpp:1293
+#: src/emu/ui/ui.cpp:1272
msgid "%2$s\n"
msgstr "%2$s\n"
-#: 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 "Status Tastaturemulation"
-#: src/emu/ui/ui.cpp:1579
+#: src/emu/ui/ui.cpp:1529
msgid "Mode: PARTIAL Emulation"
msgstr "Modus: TEILWEISE Emulation"
-#: src/emu/ui/ui.cpp:1580
+#: src/emu/ui/ui.cpp:1530
msgid "UI: Enabled"
msgstr "Benutzeroberfläche: Aktiviert"
-#: 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 "** Verwenden Sie ScrLock zum Umschalten**"
-#: src/emu/ui/ui.cpp:1589
+#: src/emu/ui/ui.cpp:1539
msgid "Mode: FULL Emulation"
msgstr "Modus: VOLLSTÄNDIGE Emulation"
-#: src/emu/ui/ui.cpp:1590
+#: src/emu/ui/ui.cpp:1540
msgid "UI: Disabled"
msgstr "Benutzeroberfläche: Deaktiviert"
-#: src/emu/ui/ui.cpp:1736
+#: src/emu/ui/ui.cpp:1686
msgid "Autofire can't be enabled"
msgstr "Dauerfeuer kann nicht aktiviert werden"
-#: src/emu/ui/ui.cpp:1775
+#: src/emu/ui/ui.cpp:1725
msgid "Select position to save to"
msgstr "Speicherposition wählen"
-#: src/emu/ui/ui.cpp:1777
+#: src/emu/ui/ui.cpp:1727
msgid "Select position to load from"
msgstr "Ladeposition wählen"
-#: src/emu/ui/ui.cpp:1801
+#: src/emu/ui/ui.cpp:1751
msgid "Save cancelled"
msgstr "Speichern abgebrochen"
-#: src/emu/ui/ui.cpp:1803
+#: src/emu/ui/ui.cpp:1753
msgid "Load cancelled"
msgstr "Laden abgebrochen"
-#: src/emu/ui/ui.cpp:1846
+#: src/emu/ui/ui.cpp:1796
#, c-format
msgid "Save to position %s"
msgstr "Speichere an Position %s"
-#: src/emu/ui/ui.cpp:1851
+#: src/emu/ui/ui.cpp:1801
#, c-format
msgid "Load from position %s"
msgstr "Lade von Position %s"
-#: src/emu/ui/ui.cpp:1891
+#: src/emu/ui/ui.cpp:1841
#, c-format
msgid ""
"Are you sure you want to quit?\n"
@@ -1882,173 +1860,173 @@ msgstr ""
"Zum Beenden drücken Sie ''%1$s''.\n"
"Um zur Emulation zurückzukehren drücken Sie ''%2$s''."
-#: src/emu/ui/ui.cpp:1966
+#: src/emu/ui/ui.cpp:1916
msgid "Master Volume"
msgstr "Gesamtlautstärke"
-#: src/emu/ui/ui.cpp:1976
+#: src/emu/ui/ui.cpp:1926
#, c-format
msgid "%1$s Volume"
msgstr "%1$s Lautstärke"
-#: src/emu/ui/ui.cpp:1998
+#: src/emu/ui/ui.cpp:1948
#, c-format
msgid "Overclock CPU %1$s"
msgstr "CPU %1$s übertakten"
-#: src/emu/ui/ui.cpp:2018
+#: src/emu/ui/ui.cpp:1968
#, c-format
msgid "%1$s Refresh Rate"
msgstr "%1$s Aktualisierungsrate"
-#: src/emu/ui/ui.cpp:2024
+#: src/emu/ui/ui.cpp:1974
#, c-format
msgid "%1$s Brightness"
msgstr "%1$s Helligkeit"
-#: src/emu/ui/ui.cpp:2027
+#: src/emu/ui/ui.cpp:1977
#, c-format
msgid "%1$s Contrast"
msgstr "%1$s Kontrast"
-#: src/emu/ui/ui.cpp:2030
+#: src/emu/ui/ui.cpp:1980
#, c-format
msgid "%1$s Gamma"
msgstr "%1$s Gamma"
-#: src/emu/ui/ui.cpp:2035
+#: src/emu/ui/ui.cpp:1985
#, c-format
msgid "%1$s Horiz Stretch"
msgstr "%1$s Horizontale Streckung"
-#: src/emu/ui/ui.cpp:2038
+#: src/emu/ui/ui.cpp:1988
#, c-format
msgid "%1$s Horiz Position"
msgstr "%1$s Horizontale Position"
-#: src/emu/ui/ui.cpp:2041
+#: src/emu/ui/ui.cpp:1991
#, c-format
msgid "%1$s Vert Stretch"
msgstr "%1$s Vertikale Streckung"
-#: src/emu/ui/ui.cpp:2044
+#: src/emu/ui/ui.cpp:1994
#, c-format
msgid "%1$s Vert Position"
msgstr "%1$s Vertikale Position"
-#: src/emu/ui/ui.cpp:2062
+#: src/emu/ui/ui.cpp:2012
#, c-format
msgid "Laserdisc '%1$s' Horiz Stretch"
msgstr "Laserdisc '%1$s' Horizontale Streckung"
-#: src/emu/ui/ui.cpp:2065
+#: src/emu/ui/ui.cpp:2015
#, c-format
msgid "Laserdisc '%1$s' Horiz Position"
msgstr "Laserdisc '%1$s' Horizontale Position"
-#: src/emu/ui/ui.cpp:2068
+#: src/emu/ui/ui.cpp:2018
#, c-format
msgid "Laserdisc '%1$s' Vert Stretch"
msgstr "Laserdisc '%1$s' Vertikale Streckung"
-#: src/emu/ui/ui.cpp:2071
+#: src/emu/ui/ui.cpp:2021
#, c-format
msgid "Laserdisc '%1$s' Vert Position"
msgstr "Laserdisc '%1$s' Vertikale Position"
-#: src/emu/ui/ui.cpp:2080
+#: src/emu/ui/ui.cpp:2030
msgid "Vector Flicker"
msgstr "Vektorflimmern"
-#: src/emu/ui/ui.cpp:2082
+#: src/emu/ui/ui.cpp:2032
msgid "Beam Width Minimum"
msgstr "Minimale Strahlbreite"
-#: src/emu/ui/ui.cpp:2084
+#: src/emu/ui/ui.cpp:2034
msgid "Beam Width Maximum"
msgstr "Maximale Strahlbreite"
-#: src/emu/ui/ui.cpp:2086
+#: src/emu/ui/ui.cpp:2036
msgid "Beam Intensity Weight"
msgstr "Gewichtung der Strahlintensität"
-#: src/emu/ui/ui.cpp:2098
+#: src/emu/ui/ui.cpp:2048
#, c-format
msgid "Crosshair Scale %1$s"
msgstr "Fadenkreuzskalierung %1$s"
-#: 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 "X"
-#: 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 "Y"
-#: src/emu/ui/ui.cpp:2101
+#: src/emu/ui/ui.cpp:2051
#, c-format
msgid "Crosshair Offset %1$s"
msgstr "Fadenkreuzversatz %1$s"
-#: src/emu/ui/ui.cpp:2120
+#: src/emu/ui/ui.cpp:2070
#, c-format
msgid "%1$3ddB"
msgstr "%1$3ddB"
-#: src/emu/ui/ui.cpp:2164
+#: src/emu/ui/ui.cpp:2114
#, c-format
msgid "%1$d%%"
msgstr "%1$d%%"
-#: src/emu/ui/ui.cpp:2180
+#: src/emu/ui/ui.cpp:2130
#, c-format
msgid "%1$3.0f%%"
msgstr "%1$3.0f%%"
-#: src/emu/ui/ui.cpp:2203
+#: src/emu/ui/ui.cpp:2153
#, c-format
msgid "%1$.3ffps"
msgstr "%1$.3ffps"
-#: src/emu/ui/ui.cpp:2226 src/emu/ui/ui.cpp:2248 src/emu/ui/ui.cpp:2269
-#: src/emu/ui/ui.cpp:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335
-#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401
-#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445
+#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219
+#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285
+#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351
+#: src/emu/ui/ui.cpp:2373 src/emu/ui/ui.cpp:2395
#, c-format
msgid "%1$.3f"
msgstr "%1$.3f"
-#: src/emu/ui/ui.cpp:2461 src/emu/ui/ui.cpp:2477 src/emu/ui/ui.cpp:2493
-#: src/emu/ui/ui.cpp:2509
+#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443
+#: src/emu/ui/ui.cpp:2459
#, c-format
msgid "%1$1.2f"
msgstr "%1$1.2f"
-#: src/emu/ui/ui.cpp:2525
+#: src/emu/ui/ui.cpp:2475
#, c-format
msgid "Screen '%1$s'"
msgstr "Bildschirm '%1$s'"
-#: src/emu/ui/ui.cpp:2527
+#: src/emu/ui/ui.cpp:2477
msgid "Screen"
msgstr "Bildschirm"
-#: src/emu/ui/ui.cpp:2543
+#: src/emu/ui/ui.cpp:2493
#, c-format
msgid "Crosshair Scale X %1$1.3f"
msgstr "Fadenkreuzskalierung X %1$1.3f"
-#: src/emu/ui/ui.cpp:2543
+#: src/emu/ui/ui.cpp:2493
#, c-format
msgid "Crosshair Scale Y %1$1.3f"
msgstr "Fadenkreuzskalierung Y %1$1.3f"
-#: src/emu/ui/ui.cpp:2562
+#: src/emu/ui/ui.cpp:2512
#, c-format
msgid "Crosshair Offset X %1$1.3f"
msgstr "Fadenkreuzversatz X %1$1.3f"
-#: src/emu/ui/ui.cpp:2562
+#: src/emu/ui/ui.cpp:2512
#, c-format
msgid "Crosshair Offset Y %1$1.3f"
msgstr "Fadenkreuzversatz Y %1$1.3f"
@@ -2098,6 +2076,35 @@ msgstr " FARBEN"
msgid " PENS"
msgstr " STIFTE"
+#~ 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 ""
+#~ "Die unlizenzierte Beschaffung und Verwendung von Computerprogrammen "
+#~ "(einschließlich ROM-Inhalten), beispielsweise zur Nutzung in einem "
+#~ "Emulator, stellt einen Verstoß gegen das Urheberrecht dar.\n"
+#~ "\n"
+#~ "WENN SIE NICHT BERECHTIGT SIND, \"%s\" IN DIESEM EMULATOR ZU VERWENDEN, "
+#~ "DRÃœCKEN SIE ESC.\n"
+#~ "\n"
+#~ "Andernfalls geben Sie \"OK\" ein oder bewegen Sie den Joystick nach links "
+#~ "und dann nach rechts um fortzufahren"
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "Type OK or move the joystick left then right to continue"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "Geben Sie \"OK\" ein oder bewegen Sie den Joystick nach links und dann "
+#~ "nach rechts, um fortzufahren"
+
#~ msgid "Configure Machine"
#~ msgstr "Maschine konfigurieren"
diff --git a/language/Greek/strings.po b/language/Greek/strings.po
index 7950e5484e7..8d541097689 100644
--- a/language/Greek/strings.po
+++ b/language/Greek/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-03-26 02:10+0200\n"
"Last-Translator: Mame.gr\n"
"Language-Team: MAME Language Team\n"
@@ -62,14 +62,14 @@ msgstr "ΕπαναφόÏτωση όλων"
msgid "Autofire Status"
msgstr "Κατάσταση Autofire"
-#: 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
@@ -247,7 +247,8 @@ msgstr "Ρυθμίσεις γÏαμματοσειÏών UI"
#: src/emu/ui/custui.cpp:408
msgid "Sample text - Lorem ipsum dolor sit amet, consectetur adipiscing elit."
-msgstr "Δείγμα κειμένου - Lorem ipsum dolor sit amet, consectetur adipiscing elit."
+msgstr ""
+"Δείγμα κειμένου - Lorem ipsum dolor sit amet, consectetur adipiscing elit."
#: src/emu/ui/custui.cpp:506
msgid "Normal text"
@@ -645,11 +646,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 +658,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 +666,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 "Ανάγνωση αυτής της εικόνας, εγγÏαφή σε αÏχείο αλλαγών"
@@ -1605,32 +1606,12 @@ 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
-#, 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 ""
-"Η ΧÏήση των εξομοιωτών σε συνδυασμό με ROMs που δεν κατέχετε απαγοÏεÏεται "
-"από το νόμο πεÏί πνευματικών δικαιωμάτων.\n"
-"\n"
-"ΑΠΔΕΠΚΑΤΕΧΕΤΕ ÎΟΜΙΜΑ ΤΟ ΔΙΚΑΙΩΜΑ ÎΑ ΠΑΙΞΕΤΕ ΤΟ «%1$s» ΣΕ ΑΥΤΟ ΤΟΠ"
-"ΕΞΟΜΟΙΩΤΗ, ΠΙΕΣΤΕ ΤΟ ΠΛΗΚΤΡΟ ESC.\n"
-"\n"
-"ΔιαφοÏετικά, πληκτÏολογήστε OK ή να μετακινήσετε το μοχλό αÏιστεÏά και μετά "
-"δεξιά για να συνεχίσετε"
-
-#: src/emu/ui/ui.cpp:1081
+#: src/emu/ui/ui.cpp:1060
msgid ""
"One or more ROMs/CHDs for this machine are incorrect. The machine may not "
"run correctly.\n"
@@ -1638,7 +1619,7 @@ msgstr ""
"Μία ή πεÏισσότεÏες ROMs/CHDs για αυτό το μηχάνημα είναι εσφαλμένες. Το "
"μηχάνημα μποÏεί να μην εκτελείται σωστά.\n"
-#: src/emu/ui/ui.cpp:1094
+#: src/emu/ui/ui.cpp:1073
msgid ""
"There are known problems with this machine\n"
"\n"
@@ -1646,50 +1627,51 @@ msgstr ""
"ΥπάÏχουν γνωστά Ï€Ïοβλήματα με αυτό το μηχάνημα\n"
"\n"
-#: 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 ""
"Μία ή πεÏισσότεÏες ROMs/CHDs για αυτό το μηχάνημα δεν έχουν γίνει dump "
"σωστά.\n"
-#: 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 "Η εξομοίωση πληκτÏολογίου δεν είναι σωστή 100%.\n"
-#: src/emu/ui/ui.cpp:1104
+#: src/emu/ui/ui.cpp:1083
#, c-format
msgid "The colors aren't 100% accurate.\n"
msgstr "Τα χÏώματα δεν είναι σωστά 100%.\n"
-#: src/emu/ui/ui.cpp:1106
+#: src/emu/ui/ui.cpp:1085
msgid "The colors are completely wrong.\n"
msgstr "Τα χÏώματα είναι εντελώς λάθος.\n"
-#: src/emu/ui/ui.cpp:1108
+#: src/emu/ui/ui.cpp:1087
#, c-format
msgid "The video emulation isn't 100% accurate.\n"
msgstr "Η εξομοίωση βίντεο δεν είναι σωστή 100%.\n"
-#: src/emu/ui/ui.cpp:1110
+#: src/emu/ui/ui.cpp:1089
#, c-format
msgid "The sound emulation isn't 100% accurate.\n"
msgstr "Η εξομοίωση ήχου δεν είναι σωστή 100%.\n"
-#: src/emu/ui/ui.cpp:1112
+#: src/emu/ui/ui.cpp:1091
msgid "The machine lacks sound.\n"
msgstr "Το μηχάνημα δεν έχει ήχο.\n"
-#: src/emu/ui/ui.cpp:1115
+#: src/emu/ui/ui.cpp:1094
msgid "Screen flipping in cocktail mode is not supported.\n"
-msgstr "Το αναποδογÏÏισμα της οθόνης σε κοκτέιλ λειτουÏγία δεν υποστηÏίζεται.\n"
+msgstr ""
+"Το αναποδογÏÏισμα της οθόνης σε κοκτέιλ λειτουÏγία δεν υποστηÏίζεται.\n"
-#: src/emu/ui/ui.cpp:1119
+#: src/emu/ui/ui.cpp:1098
msgid "The machine requires external artwork files\n"
msgstr "Το μηχάνημα απαιτεί εξωτεÏικό αÏχείο Artwork\n"
-#: 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"
@@ -1697,7 +1679,7 @@ msgstr ""
"Αυτό το μηχάνημα δεν ολοκληÏώθηκε ποτέ. Αυτό μποÏεί να εμφανίσει ασυνήθιστη "
"συμπεÏιφοÏά ή στοιχεία να λείπουν που δεν είναι σφάλματα στην εξομοίωση.\n"
-#: 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"
@@ -1705,11 +1687,12 @@ msgstr ""
"Αυτό το μηχάνημα δεν έχει κανένα υλικό ήχου, το MAME δεν θα παÏάγει κανένα "
"ήχο, αυτή είναι αναμενόμενη συμπεÏιφοÏά.\n"
-#: src/emu/ui/ui.cpp:1137
+#: src/emu/ui/ui.cpp:1116
msgid "The machine has protection which isn't fully emulated.\n"
-msgstr "Αυτό το μηχάνημα έχει Ï€Ïοστασία η οποία δεν είναι πλήÏως εξομοιωμένη.\n"
+msgstr ""
+"Αυτό το μηχάνημα έχει Ï€Ïοστασία η οποία δεν είναι πλήÏως εξομοιωμένη.\n"
-#: 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 "
@@ -1722,7 +1705,7 @@ msgstr ""
"αυτό το Ï€Ïόβλημα εκτός από την αναμονή για τους Ï€ÏογÏαμματιστές να "
"βελτιώσουν την εξομοίωση.\n"
-#: 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 "
@@ -1734,7 +1717,7 @@ msgstr ""
"καθώς απαιτείται Ï€Ïαγματική φυσική αλληλεπίδÏαση ή αποτελείται από μηχανικές "
"συσκευές. Δεν είναι δυνατόν να παιχτεί πλήÏως αυτό το μηχάνημα.\n"
-#: src/emu/ui/ui.cpp:1163
+#: src/emu/ui/ui.cpp:1142
msgid ""
"\n"
"\n"
@@ -1744,18 +1727,14 @@ msgstr ""
"\n"
"ΥπάÏχουν κλώνοι Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… μηχανήματος που λειτουÏγοÏν: "
-#: 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 ""
-"\n"
-"\n"
-"ΠληκτÏολογήστε OK ή μετακινήσετε το μοχλό αÏιστεÏά και στη συνέχεια δεξιά "
-"για να συνεχίσετε"
-#: src/emu/ui/ui.cpp:1192
+#: src/emu/ui/ui.cpp:1171
#, c-format
msgid ""
"%1$s\n"
@@ -1770,15 +1749,15 @@ msgstr ""
"\n"
"CPU:\n"
-#: 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 "MHz"
-#: 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 "kHz"
-#: src/emu/ui/ui.cpp:1242
+#: src/emu/ui/ui.cpp:1221
msgid ""
"\n"
"Sound:\n"
@@ -1786,7 +1765,7 @@ msgstr ""
"\n"
"Ήχος:\n"
-#: src/emu/ui/ui.cpp:1271
+#: src/emu/ui/ui.cpp:1250
msgid ""
"\n"
"Video:\n"
@@ -1794,78 +1773,78 @@ msgstr ""
"\n"
"Βίντεο:\n"
-#: src/emu/ui/ui.cpp:1275
+#: src/emu/ui/ui.cpp:1254
msgid "None\n"
msgstr "Κανένα\n"
-#: 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 "%1$s: %2$s\n"
-#: src/emu/ui/ui.cpp:1293
+#: src/emu/ui/ui.cpp:1272
msgid "%2$s\n"
msgstr "%2$s\n"
-#: 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 "UI: ΕνεÏγοποιημένο"
-#: 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 "**ΧÏήση ScrLock να εναλλαγή**"
-#: 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 "UI: ΑπενεÏγοποιημένο"
-#: src/emu/ui/ui.cpp:1736
+#: src/emu/ui/ui.cpp:1686
msgid "Autofire can't be enabled"
msgstr "Δεν μποÏεί να ενεÏγοποιηθεί το Autofire"
-#: 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 "Αποθήκευση σε θέση %s"
-#: src/emu/ui/ui.cpp:1851
+#: src/emu/ui/ui.cpp:1801
#, c-format
msgid "Load from position %s"
msgstr "ΦόÏτωση από θέση %s"
-#: src/emu/ui/ui.cpp:1891
+#: src/emu/ui/ui.cpp:1841
#, c-format
msgid ""
"Are you sure you want to quit?\n"
@@ -1878,173 +1857,173 @@ msgstr ""
"Πατήστε ''%1$s'' για να εγκαταλείψετε,\n"
"Πατήστε ''%2$s'' για να επιστÏέψετε στην εξομοίωση."
-#: 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 "%1$s Ένταση"
-#: src/emu/ui/ui.cpp:1998
+#: src/emu/ui/ui.cpp:1948
#, c-format
msgid "Overclock CPU %1$s"
msgstr "ΥπεÏχÏονισμός CPU %1$s"
-#: src/emu/ui/ui.cpp:2018
+#: src/emu/ui/ui.cpp:1968
#, c-format
msgid "%1$s Refresh Rate"
msgstr "%1$s Ρυθμός Ανανέωσης"
-#: src/emu/ui/ui.cpp:2024
+#: src/emu/ui/ui.cpp:1974
#, c-format
msgid "%1$s Brightness"
msgstr "%1$s Φωτεινότητα"
-#: src/emu/ui/ui.cpp:2027
+#: src/emu/ui/ui.cpp:1977
#, c-format
msgid "%1$s Contrast"
msgstr "%1$s Αντίθεση"
-#: src/emu/ui/ui.cpp:2030
+#: src/emu/ui/ui.cpp:1980
#, c-format
msgid "%1$s Gamma"
msgstr "%1$s Γάμμα"
-#: src/emu/ui/ui.cpp:2035
+#: src/emu/ui/ui.cpp:1985
#, c-format
msgid "%1$s Horiz Stretch"
msgstr "%1$s ΟÏιζόντια Επέκταση"
-#: src/emu/ui/ui.cpp:2038
+#: src/emu/ui/ui.cpp:1988
#, c-format
msgid "%1$s Horiz Position"
msgstr "%1$s ΟÏιζόντια Θέση"
-#: src/emu/ui/ui.cpp:2041
+#: src/emu/ui/ui.cpp:1991
#, c-format
msgid "%1$s Vert Stretch"
msgstr "%1$s Κάθετη Επέκταση"
-#: src/emu/ui/ui.cpp:2044
+#: src/emu/ui/ui.cpp:1994
#, c-format
msgid "%1$s Vert Position"
msgstr "%1$s Κάθετη Θέση"
-#: src/emu/ui/ui.cpp:2062
+#: src/emu/ui/ui.cpp:2012
#, c-format
msgid "Laserdisc '%1$s' Horiz Stretch"
msgstr "Laserdisc '%1$s' ΟÏιζόντια Επέκταση"
-#: src/emu/ui/ui.cpp:2065
+#: src/emu/ui/ui.cpp:2015
#, c-format
msgid "Laserdisc '%1$s' Horiz Position"
msgstr "Laserdisc '%1$s' ΟÏιζόντια Θέση"
-#: src/emu/ui/ui.cpp:2068
+#: src/emu/ui/ui.cpp:2018
#, c-format
msgid "Laserdisc '%1$s' Vert Stretch"
msgstr "Laserdisc '%1$s' Κάθετη Επέκταση"
-#: src/emu/ui/ui.cpp:2071
+#: src/emu/ui/ui.cpp:2021
#, c-format
msgid "Laserdisc '%1$s' Vert Position"
msgstr "Laserdisc '%1$s' Κάθετη Θέση"
-#: 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 "Κλίμακα ΣτόχαστÏου %1$s"
-#: 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 "X"
-#: 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 "Y"
-#: src/emu/ui/ui.cpp:2101
+#: src/emu/ui/ui.cpp:2051
#, c-format
msgid "Crosshair Offset %1$s"
msgstr "Μετατόπιση ΣτοχάστÏου %1$s"
-#: src/emu/ui/ui.cpp:2120
+#: src/emu/ui/ui.cpp:2070
#, c-format
msgid "%1$3ddB"
msgstr "%1$3ddB"
-#: src/emu/ui/ui.cpp:2164
+#: src/emu/ui/ui.cpp:2114
#, c-format
msgid "%1$d%%"
msgstr "%1$d%%"
-#: src/emu/ui/ui.cpp:2180
+#: src/emu/ui/ui.cpp:2130
#, c-format
msgid "%1$3.0f%%"
msgstr "%1$3.0f%%"
-#: src/emu/ui/ui.cpp:2203
+#: src/emu/ui/ui.cpp:2153
#, c-format
msgid "%1$.3ffps"
msgstr "%1$.3ffps"
-#: src/emu/ui/ui.cpp:2226 src/emu/ui/ui.cpp:2248 src/emu/ui/ui.cpp:2269
-#: src/emu/ui/ui.cpp:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335
-#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401
-#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445
+#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219
+#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285
+#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351
+#: src/emu/ui/ui.cpp:2373 src/emu/ui/ui.cpp:2395
#, c-format
msgid "%1$.3f"
msgstr "%1$.3f"
-#: src/emu/ui/ui.cpp:2461 src/emu/ui/ui.cpp:2477 src/emu/ui/ui.cpp:2493
-#: src/emu/ui/ui.cpp:2509
+#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443
+#: src/emu/ui/ui.cpp:2459
#, c-format
msgid "%1$1.2f"
msgstr "%1$1.2f"
-#: src/emu/ui/ui.cpp:2525
+#: src/emu/ui/ui.cpp:2475
#, c-format
msgid "Screen '%1$s'"
msgstr "Οθόνη '%1$s'"
-#: 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 "Κλίμακα ΣτόχαστÏου X %1$1.3f"
-#: src/emu/ui/ui.cpp:2543
+#: src/emu/ui/ui.cpp:2493
#, c-format
msgid "Crosshair Scale Y %1$1.3f"
msgstr "Κλίμακα ΣτόχαστÏου Y %1$1.3f"
-#: src/emu/ui/ui.cpp:2562
+#: src/emu/ui/ui.cpp:2512
#, c-format
msgid "Crosshair Offset X %1$1.3f"
msgstr "Μετατόπιση ΣτοχάστÏου X %1$1.3f"
-#: src/emu/ui/ui.cpp:2562
+#: src/emu/ui/ui.cpp:2512
#, c-format
msgid "Crosshair Offset Y %1$1.3f"
msgstr "Μετατόπιση ΣτοχάστÏου Y %1$1.3f"
@@ -2093,3 +2072,31 @@ msgstr " ΧΡΩΜΑΤΑ"
#: src/emu/ui/viewgfx.cpp:391
msgid " PENS"
msgstr " ΓΡΑΦΙΔΕΣ"
+
+#~ 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 ""
+#~ "Η ΧÏήση των εξομοιωτών σε συνδυασμό με ROMs που δεν κατέχετε απαγοÏεÏεται "
+#~ "από το νόμο πεÏί πνευματικών δικαιωμάτων.\n"
+#~ "\n"
+#~ "ΑΠΔΕΠΚΑΤΕΧΕΤΕ ÎΟΜΙΜΑ ΤΟ ΔΙΚΑΙΩΜΑ ÎΑ ΠΑΙΞΕΤΕ ΤΟ «%1$s» ΣΕ ΑΥΤΟ ΤΟΠ"
+#~ "ΕΞΟΜΟΙΩΤΗ, ΠΙΕΣΤΕ ΤΟ ΠΛΗΚΤΡΟ ESC.\n"
+#~ "\n"
+#~ "ΔιαφοÏετικά, πληκτÏολογήστε OK ή να μετακινήσετε το μοχλό αÏιστεÏά και "
+#~ "μετά δεξιά για να συνεχίσετε"
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "Type OK or move the joystick left then right to continue"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "ΠληκτÏολογήστε OK ή μετακινήσετε το μοχλό αÏιστεÏά και στη συνέχεια δεξιά "
+#~ "για να συνεχίσετε"
diff --git a/language/Hebrew/strings.po b/language/Hebrew/strings.po
index a098ef8e005..8f0a4e9ceb4 100644
--- a/language/Hebrew/strings.po
+++ b/language/Hebrew/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"
@@ -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
-#, 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
+#: src/emu/ui/ui.cpp:1060
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:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335
-#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401
-#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445
+#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219
+#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285
+#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351
+#: 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:2509
+#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443
+#: 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 ""
diff --git a/language/Hindi/strings.po b/language/Hindi/strings.po
index ac722d7e173..39e376a59fd 100644
--- a/language/Hindi/strings.po
+++ b/language/Hindi/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
-#, 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
+#: src/emu/ui/ui.cpp:1060
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:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335
-#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401
-#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445
+#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219
+#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285
+#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351
+#: 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:2509
+#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443
+#: 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 ""
diff --git a/language/Hungarian/strings.po b/language/Hungarian/strings.po
index 5f5904a99d8..df2290c9552 100644
--- a/language/Hungarian/strings.po
+++ b/language/Hungarian/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"
@@ -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
-#, 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
+#: src/emu/ui/ui.cpp:1060
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:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335
-#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401
-#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445
+#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219
+#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285
+#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351
+#: 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:2509
+#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443
+#: 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 ""
diff --git a/language/Indonesian/strings.po b/language/Indonesian/strings.po
index c2023c82170..6fe83a37672 100644
--- a/language/Indonesian/strings.po
+++ b/language/Indonesian/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
-#, 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
+#: src/emu/ui/ui.cpp:1060
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:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335
-#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401
-#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445
+#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219
+#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285
+#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351
+#: 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:2509
+#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443
+#: 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 ""
diff --git a/language/Italian/strings.po b/language/Italian/strings.po
index ec589e8057d..b52d4e073aa 100644
--- a/language/Italian/strings.po
+++ b/language/Italian/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: Angelo Salese,Antonio Paradossi,Fabio Priuli\n"
"Language-Team: MAME Language Team\n"
@@ -63,14 +63,14 @@ msgstr "Ricarica Tutto"
msgid "Autofire Status"
msgstr "Stato Autofire"
-#: 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 "Disabilitato"
-#: 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
@@ -647,11 +647,11 @@ msgstr ""
msgid "Display Options"
msgstr "Opzioni Display"
-#: 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
@@ -659,7 +659,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
@@ -667,55 +667,55 @@ msgstr ""
msgid "Yes"
msgstr "Si"
-#: 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 ""
@@ -1594,32 +1594,12 @@ 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 ""
"Questo driver richiede software caricato nel(i) dispositivo(i) seguente(i): "
-#: src/emu/ui/ui.cpp:1043
-#, 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 ""
-"Usage of emulators in conjunction with ROMs you don't own is forbidden by "
-"copyright law.\n"
-"\n"
-"SE NON SEI LEGALMENTE AUTORIZZATO A GIOCARE \"%1$s\" CON QUESTO EMULATORE, "
-"PREMI ESC.\n"
-"\n"
-"Altrimenti, digita OK o muovi il joystick a sinistra e a destra per "
-"continuare"
-
-#: src/emu/ui/ui.cpp:1081
+#: src/emu/ui/ui.cpp:1060
msgid ""
"One or more ROMs/CHDs for this machine are incorrect. The machine may not "
"run correctly.\n"
@@ -1627,7 +1607,7 @@ msgstr ""
"Uno o più ROM/CHD per questa macchina non sono corretti. La macchina "
"potrebbe non funzionare correttamente.\n"
-#: src/emu/ui/ui.cpp:1094
+#: src/emu/ui/ui.cpp:1073
msgid ""
"There are known problems with this machine\n"
"\n"
@@ -1635,48 +1615,48 @@ msgstr ""
"Ci sono problemi noti per questa macchina\n"
"\n"
-#: 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 "Uno o più ROM/CHD per questa macchina non è dumpato correttamente.\n"
-#: 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 "L'emulazione della tastiera potrebbe non essere corretta al 100%.\n"
-#: src/emu/ui/ui.cpp:1104
+#: src/emu/ui/ui.cpp:1083
#, c-format
msgid "The colors aren't 100% accurate.\n"
msgstr "I colori non sono corretti al 100%.\n"
-#: src/emu/ui/ui.cpp:1106
+#: src/emu/ui/ui.cpp:1085
msgid "The colors are completely wrong.\n"
msgstr "I colori sono completamente sbagliati.\n"
-#: src/emu/ui/ui.cpp:1108
+#: src/emu/ui/ui.cpp:1087
#, c-format
msgid "The video emulation isn't 100% accurate.\n"
msgstr "L'emulazione video non è corretta al 100%.\n"
-#: src/emu/ui/ui.cpp:1110
+#: src/emu/ui/ui.cpp:1089
#, c-format
msgid "The sound emulation isn't 100% accurate.\n"
msgstr "L'emulazione audio non è corretta al 100%.\n"
-#: src/emu/ui/ui.cpp:1112
+#: src/emu/ui/ui.cpp:1091
msgid "The machine lacks sound.\n"
msgstr "La macchina ha problemi con l'audio.\n"
-#: src/emu/ui/ui.cpp:1115
+#: src/emu/ui/ui.cpp:1094
msgid "Screen flipping in cocktail mode is not supported.\n"
msgstr "L'inversione dello schermo in modalità cocktail non è supportata"
-#: src/emu/ui/ui.cpp:1119
+#: src/emu/ui/ui.cpp:1098
msgid "The machine requires external artwork files\n"
msgstr "La macchina richiede file di artwork extra\n"
-#: 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"
@@ -1684,7 +1664,7 @@ msgstr ""
"Questa macchina non è mai stata completata. Potrebbe mostrare fenomeni "
"strani o elementi mancanti che non sono bug nell'emulazione.\n"
-#: 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"
@@ -1692,11 +1672,11 @@ msgstr ""
"Questa macchina non ha alcun componente audio, MAME non produrrà alcun suono "
"e questo è il comportamento atteso e non un bug.\n"
-#: src/emu/ui/ui.cpp:1137
+#: src/emu/ui/ui.cpp:1116
msgid "The machine has protection which isn't fully emulated.\n"
msgstr "La macchina ha delle protezioni che non sono emulate completamente.\n"
-#: 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 "
@@ -1708,7 +1688,7 @@ msgstr ""
"completa. Non c'è nulla che tu possa fare per risolvere questo problema "
"eccetto aspettare che gli sviluppatori migliorino l'emulazione.\n"
-#: 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 "
@@ -1720,7 +1700,7 @@ msgstr ""
"richiedono interazioni fisiche oppure dispositivi meccanici. Non è possibile "
"giocare in maniera completa con questa macchina.\n"
-#: src/emu/ui/ui.cpp:1163
+#: src/emu/ui/ui.cpp:1142
msgid ""
"\n"
"\n"
@@ -1730,17 +1710,14 @@ msgstr ""
"\n"
"Ci sono cloni funzionanti di questa macchina: "
-#: 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 ""
-"\n"
-"\n"
-"Scrivi OK oppure muovi il joystick a sinistra e poi a destra per continuare"
-#: src/emu/ui/ui.cpp:1192
+#: src/emu/ui/ui.cpp:1171
#, c-format
msgid ""
"%1$s\n"
@@ -1750,15 +1727,15 @@ 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"
@@ -1766,7 +1743,7 @@ msgstr ""
"\n"
"Audio:\n"
-#: src/emu/ui/ui.cpp:1271
+#: src/emu/ui/ui.cpp:1250
msgid ""
"\n"
"Video:\n"
@@ -1774,78 +1751,78 @@ msgstr ""
"\n"
"Video:\n"
-#: src/emu/ui/ui.cpp:1275
+#: src/emu/ui/ui.cpp:1254
msgid "None\n"
msgstr "Nessuno\n"
-#: src/emu/ui/ui.cpp:1282
+#: src/emu/ui/ui.cpp:1261
msgid "Vector"
msgstr "Vettoriale"
-#: 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 "Stato Emulazione Tastiera"
-#: src/emu/ui/ui.cpp:1579
+#: src/emu/ui/ui.cpp:1529
msgid "Mode: PARTIAL Emulation"
msgstr "Modalità: Emulazione PARZIALE"
-#: src/emu/ui/ui.cpp:1580
+#: src/emu/ui/ui.cpp:1530
msgid "UI: Enabled"
msgstr "UI: Abilitato"
-#: 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 "**Usa ScrLock per cambiare**"
-#: src/emu/ui/ui.cpp:1589
+#: src/emu/ui/ui.cpp:1539
msgid "Mode: FULL Emulation"
msgstr "Modalità: Emulazione COMPLETA"
-#: src/emu/ui/ui.cpp:1590
+#: src/emu/ui/ui.cpp:1540
msgid "UI: Disabled"
msgstr "UI: Disabilitato"
-#: src/emu/ui/ui.cpp:1736
+#: src/emu/ui/ui.cpp:1686
msgid "Autofire can't be enabled"
msgstr "Autofire non può essere abilitato"
-#: src/emu/ui/ui.cpp:1775
+#: src/emu/ui/ui.cpp:1725
msgid "Select position to save to"
msgstr "Seleziona la posizione in cui salvare"
-#: src/emu/ui/ui.cpp:1777
+#: src/emu/ui/ui.cpp:1727
msgid "Select position to load from"
msgstr "Seleziona la posizione da cui caricare"
-#: src/emu/ui/ui.cpp:1801
+#: src/emu/ui/ui.cpp:1751
msgid "Save cancelled"
msgstr "Salvataggio annullato"
-#: src/emu/ui/ui.cpp:1803
+#: src/emu/ui/ui.cpp:1753
msgid "Load cancelled"
msgstr "Caricamento annullato"
-#: src/emu/ui/ui.cpp:1846
+#: src/emu/ui/ui.cpp:1796
#, c-format
msgid "Save to position %s"
msgstr "Salva in %s"
-#: src/emu/ui/ui.cpp:1851
+#: src/emu/ui/ui.cpp:1801
#, c-format
msgid "Load from position %s"
msgstr "Carica da %s"
-#: src/emu/ui/ui.cpp:1891
+#: src/emu/ui/ui.cpp:1841
#, c-format
msgid ""
"Are you sure you want to quit?\n"
@@ -1854,173 +1831,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 "Volume Principale"
-#: 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 "%1$s Frequenza di aggiornamento"
-#: src/emu/ui/ui.cpp:2024
+#: src/emu/ui/ui.cpp:1974
#, c-format
msgid "%1$s Brightness"
msgstr "%1$s Luminosità"
-#: src/emu/ui/ui.cpp:2027
+#: src/emu/ui/ui.cpp:1977
#, c-format
msgid "%1$s Contrast"
msgstr "%1$s Contrasto"
-#: 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 "%1$s Allungamento Orizzontale"
-#: src/emu/ui/ui.cpp:2038
+#: src/emu/ui/ui.cpp:1988
#, c-format
msgid "%1$s Horiz Position"
msgstr "%1$s Posizione Orizzontale"
-#: src/emu/ui/ui.cpp:2041
+#: src/emu/ui/ui.cpp:1991
#, c-format
msgid "%1$s Vert Stretch"
msgstr "%1$s Allungamento Verticale"
-#: src/emu/ui/ui.cpp:2044
+#: src/emu/ui/ui.cpp:1994
#, c-format
msgid "%1$s Vert Position"
msgstr "%1$s Posizione Verticale"
-#: 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:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335
-#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401
-#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445
+#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219
+#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285
+#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351
+#: 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:2509
+#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443
+#: 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 "Schermo"
-#: src/emu/ui/ui.cpp:2543
+#: src/emu/ui/ui.cpp:2493
#, c-format
msgid "Crosshair Scale X %1$1.3f"
msgstr "Scala del Puntatore X %1$1.3f"
-#: src/emu/ui/ui.cpp:2543
+#: src/emu/ui/ui.cpp:2493
#, c-format
msgid "Crosshair Scale Y %1$1.3f"
msgstr "Scala del Puntatore Y %1$1.3f"
-#: 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 ""
@@ -2070,6 +2047,34 @@ msgstr " COLORI"
msgid " PENS"
msgstr " PEN"
+#~ 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 ""
+#~ "Usage of emulators in conjunction with ROMs you don't own is forbidden by "
+#~ "copyright law.\n"
+#~ "\n"
+#~ "SE NON SEI LEGALMENTE AUTORIZZATO A GIOCARE \"%1$s\" CON QUESTO "
+#~ "EMULATORE, PREMI ESC.\n"
+#~ "\n"
+#~ "Altrimenti, digita OK o muovi il joystick a sinistra e a destra per "
+#~ "continuare"
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "Type OK or move the joystick left then right to continue"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "Scrivi OK oppure muovi il joystick a sinistra e poi a destra per "
+#~ "continuare"
+
#~ msgid "Double click or press "
#~ msgstr "Doppio click o premi "
diff --git a/language/Japanese/strings.po b/language/Japanese/strings.po
index f63407d4725..f4b871677e5 100644
--- a/language/Japanese/strings.po
+++ b/language/Japanese/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-23 01:39+0900\n"
"Last-Translator: Automatically generated\n"
"Language-Team: MAME Language Team\n"
@@ -63,14 +63,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
@@ -647,11 +647,11 @@ msgstr "V-Syncã‚’å¾…ã¤"
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
@@ -659,7 +659,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
@@ -667,55 +667,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 "ã“ã®ã‚¤ãƒ¡ãƒ¼ã‚¸ã‹ã‚‰èª­ã¿å–ã‚Šã€å·®åˆ†ï¼ˆdiff)ã«æ›¸ã込む"
@@ -1606,30 +1606,11 @@ 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
-#, 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 ""
-"ã‚ãªãŸãŒæ‰€æœ‰ã—ã¦ã„ãªã„ROMをエミュレータã§åˆ©ç”¨ã™ã‚‹ã“ã¨ã¯è‘—作権法ã§ç¦ã˜ã‚‰ã‚Œã¦ã„"
-"ã¾ã™ã€‚\n"
-"\n"
-"ã‚‚ã—ã‚ãªãŸãŒåˆæ³•çš„ã«ã€Œ%1$sã€ã‚’プレイã™ã‚‹è³‡æ ¼ãŒãªã„å ´åˆã¯ã€ESCキーを押ã—ã¦ä¸‹ã•"
-"ã„。\n"
-"\n"
-"ãã†ã§ãªã‘ã‚Œã°OKã¨ã‚¿ã‚¤ãƒ—ã™ã‚‹ã‹ã‚¸ãƒ§ã‚¤ã‚¹ãƒ†ã‚£ãƒƒã‚¯ã‚’å·¦å³ã«å…¥åŠ›ã—ã¦é€²ã¿ã¾ã™ã€‚"
-
-#: src/emu/ui/ui.cpp:1081
+#: src/emu/ui/ui.cpp:1060
msgid ""
"One or more ROMs/CHDs for this machine are incorrect. The machine may not "
"run correctly.\n"
@@ -1637,7 +1618,7 @@ msgstr ""
"ã“ã®ãƒžã‚·ãƒ³ç”¨ã®ROM/CHDãŒæ­£ã—ãã‚ã‚Šã¾ã›ã‚“。ãã®ãŸã‚æ­£ã—ã動作ã—ãªã„å¯èƒ½æ€§ãŒã‚ã‚Š"
"ã¾ã™ã€‚\n"
-#: src/emu/ui/ui.cpp:1094
+#: src/emu/ui/ui.cpp:1073
msgid ""
"There are known problems with this machine\n"
"\n"
@@ -1645,50 +1626,50 @@ msgstr ""
"ã“ã®ãƒžã‚·ãƒ³ã«ã¯ä»¥ä¸‹ã®ã‚ˆã†ãªå•é¡Œç‚¹ãŒã‚ã‚Šã¾ã™\n"
"\n"
-#: 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 ""
"ã“ã®ãƒžã‚·ãƒ³ç”¨ã®ROM/CHDã¯å…¨ã¦æ­£ã—ãå¸ã„出ã•ã‚Œã¦ã„ã¾ã›ã‚“。\n"
"\n"
-#: 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 "キーボードエミュレーションãŒ100%正確ã§ã¯ã‚ã‚Šã¾ã›ã‚“。\n"
-#: src/emu/ui/ui.cpp:1104
+#: src/emu/ui/ui.cpp:1083
#, c-format
msgid "The colors aren't 100% accurate.\n"
msgstr "表示色ãŒ100%正確ã§ã¯ã‚ã‚Šã¾ã›ã‚“。\n"
-#: src/emu/ui/ui.cpp:1106
+#: src/emu/ui/ui.cpp:1085
msgid "The colors are completely wrong.\n"
msgstr "表示色ãŒå®Œå…¨ã«é–“é•ã£ã¦ã„ã¾ã™ã€‚\n"
-#: src/emu/ui/ui.cpp:1108
+#: src/emu/ui/ui.cpp:1087
#, c-format
msgid "The video emulation isn't 100% accurate.\n"
msgstr "表示系ã®ã‚¨ãƒŸãƒ¥ãƒ¬ãƒ¼ã‚·ãƒ§ãƒ³ãŒ100%正確ã§ã¯ã‚ã‚Šã¾ã›ã‚“。\n"
-#: src/emu/ui/ui.cpp:1110
+#: src/emu/ui/ui.cpp:1089
#, c-format
msgid "The sound emulation isn't 100% accurate.\n"
msgstr "サウンドエミュレーションãŒ100%正確ã§ã¯ã‚ã‚Šã¾ã›ã‚“。\n"
-#: src/emu/ui/ui.cpp:1112
+#: src/emu/ui/ui.cpp:1091
msgid "The machine lacks sound.\n"
msgstr "ã“ã®ãƒžã‚·ãƒ³ã¯éŸ³ãŒé³´ã‚Šã¾ã›ã‚“。\n"
-#: src/emu/ui/ui.cpp:1115
+#: src/emu/ui/ui.cpp:1094
msgid "Screen flipping in cocktail mode is not supported.\n"
msgstr "カクテルモードã§ã®ç”»é¢å転表示ã¯ã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã›ã‚“。\n"
-#: src/emu/ui/ui.cpp:1119
+#: src/emu/ui/ui.cpp:1098
msgid "The machine requires external artwork files\n"
msgstr "ã“ã®ãƒžã‚·ãƒ³ã¯åˆ¥é€”アートワークファイルãŒå¿…è¦ã§ã™ã€‚\n"
-#: 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"
@@ -1696,7 +1677,7 @@ msgstr ""
"ã“ã®ãƒžã‚·ãƒ³ã¯æœªå®Œæˆã§ã™ã€‚動作ã®ä¸å…·åˆã‚„ä¸è¶³ã—ãŸè¦ç´ ãŒã‚ã£ã¦ã‚‚エミュレーション"
"ã®ãƒã‚°ã§ã¯ã‚ã‚Šã¾ã›ã‚“。\n"
-#: 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"
@@ -1704,11 +1685,11 @@ msgstr ""
"ã“ã®ãƒžã‚·ãƒ³ã«ã¯ã‚µã‚¦ãƒ³ãƒ‰ãƒãƒ¼ãƒ‰ã‚¦ã‚§ã‚¢ãŒã‚ã‚Šã¾ã›ã‚“。音ãŒå‡ºãªãã¦ã‚‚正常ãªå‹•ä½œã§"
"ã™ã€‚\n"
-#: src/emu/ui/ui.cpp:1137
+#: src/emu/ui/ui.cpp:1116
msgid "The machine has protection which isn't fully emulated.\n"
msgstr "ã“ã®ãƒžã‚·ãƒ³ã®ãƒ—ロテクトã¯å®Œå…¨ã«ã‚¨ãƒŸãƒ¥ãƒ¬ãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã›ã‚“。\n"
-#: 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 "
@@ -1719,7 +1700,7 @@ msgstr ""
"ã“ã®ãƒžã‚·ãƒ³ã¯å‹•ä½œã—ã¾ã›ã‚“。エミュレーションã¯æœªå®Œæˆã§ã™ã€‚開発者ãŒã‚¨ãƒŸãƒ¥ãƒ¬ãƒ¼"
"ションを改良ã™ã‚‹ã®ã‚’ãŠå¾…ã¡ä¸‹ã•ã„。\n"
-#: 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 "
@@ -1730,7 +1711,7 @@ msgstr ""
"ã“ã®ãƒžã‚·ãƒ³ã®ä¸€éƒ¨ã®è¦ç´ ã¯ã€æ©Ÿæ¢°çš„デãƒã‚¤ã‚¹ã«ã‚ˆã‚‹å®Ÿéš›ã®å‹•ä½œãŒå¿…è¦ãªãŸã‚エミュ"
"レートã§ãã¾ã›ã‚“。ãã®ãŸã‚ã€ã“ã®ãƒžã‚·ãƒ³ã‚’完全ã«ãƒ—レイã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“。\n"
-#: src/emu/ui/ui.cpp:1163
+#: src/emu/ui/ui.cpp:1142
msgid ""
"\n"
"\n"
@@ -1740,17 +1721,14 @@ msgstr ""
"\n"
"ã“ã®ãƒžã‚·ãƒ³ã®å‹•ä½œå¯èƒ½ãªã‚¯ãƒ­ãƒ¼ãƒ³ã‚»ãƒƒãƒˆ:"
-#: 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 ""
-"\n"
-"\n"
-"OKã¨ã‚¿ã‚¤ãƒ—ã™ã‚‹ã‹ã€ã‚¸ãƒ§ã‚¤ã‚¹ãƒ†ã‚£ãƒƒã‚¯ã‚’å·¦å³ã«å‹•ã‹ã—ã¦é€²ã‚€"
-#: src/emu/ui/ui.cpp:1192
+#: src/emu/ui/ui.cpp:1171
#, c-format
msgid ""
"%1$s\n"
@@ -1765,15 +1743,15 @@ msgstr ""
"\n"
"CPU:\n"
-#: 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 "MHz"
-#: 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 "kHz"
-#: src/emu/ui/ui.cpp:1242
+#: src/emu/ui/ui.cpp:1221
msgid ""
"\n"
"Sound:\n"
@@ -1781,7 +1759,7 @@ msgstr ""
"\n"
"サウンド:\n"
-#: src/emu/ui/ui.cpp:1271
+#: src/emu/ui/ui.cpp:1250
msgid ""
"\n"
"Video:\n"
@@ -1789,78 +1767,78 @@ msgstr ""
"\n"
"表示:\n"
-#: src/emu/ui/ui.cpp:1275
+#: src/emu/ui/ui.cpp:1254
msgid "None\n"
msgstr "ãªã—\n"
-#: 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 "%1$s:%2$s\n"
-#: src/emu/ui/ui.cpp:1293
+#: src/emu/ui/ui.cpp:1272
msgid "%2$s\n"
msgstr "%2$s\n"
-#: 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 "UI: 有効"
-#: 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 "** ScrLockキーã§åˆ‡ã‚Šæ›¿ãˆ **"
-#: 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 "UI: 無効"
-#: 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 "%sã«ã‚»ãƒ¼ãƒ–ã—ã¾ã—ãŸ"
-#: src/emu/ui/ui.cpp:1851
+#: src/emu/ui/ui.cpp:1801
#, c-format
msgid "Load from position %s"
msgstr "%sã‹ã‚‰ãƒ­ãƒ¼ãƒ‰ã—ã¾ã—ãŸ"
-#: src/emu/ui/ui.cpp:1891
+#: src/emu/ui/ui.cpp:1841
#, c-format
msgid ""
"Are you sure you want to quit?\n"
@@ -1873,173 +1851,173 @@ msgstr ""
"「%1$sã€ã§çµ‚了\n"
"「%2$sã€ã§ã‚¨ãƒŸãƒ¥ãƒ¬ãƒ¼ã‚·ãƒ§ãƒ³ã«æˆ»ã‚‹"
-#: 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 "%1$sã®éŸ³é‡"
-#: src/emu/ui/ui.cpp:1998
+#: src/emu/ui/ui.cpp:1948
#, c-format
msgid "Overclock CPU %1$s"
msgstr "CPU %1$sã®ã‚ªãƒ¼ãƒãƒ¼ã‚¯ãƒ­ãƒƒã‚¯"
-#: src/emu/ui/ui.cpp:2018
+#: src/emu/ui/ui.cpp:1968
#, c-format
msgid "%1$s Refresh Rate"
msgstr "%1$sã®ãƒªãƒ•ãƒ¬ãƒƒã‚·ãƒ¥ãƒ¬ãƒ¼ãƒˆ"
-#: src/emu/ui/ui.cpp:2024
+#: src/emu/ui/ui.cpp:1974
#, c-format
msgid "%1$s Brightness"
msgstr "%1$sã®è¼åº¦"
-#: src/emu/ui/ui.cpp:2027
+#: src/emu/ui/ui.cpp:1977
#, c-format
msgid "%1$s Contrast"
msgstr "%1$sã®ã‚³ãƒ³ãƒˆãƒ©ã‚¹ãƒˆ"
-#: src/emu/ui/ui.cpp:2030
+#: src/emu/ui/ui.cpp:1980
#, c-format
msgid "%1$s Gamma"
msgstr "%1$sã®ã‚¬ãƒ³ãƒž"
-#: src/emu/ui/ui.cpp:2035
+#: src/emu/ui/ui.cpp:1985
#, c-format
msgid "%1$s Horiz Stretch"
msgstr "%1$s 横方å‘ã®æ‹¡å¤§"
-#: src/emu/ui/ui.cpp:2038
+#: src/emu/ui/ui.cpp:1988
#, c-format
msgid "%1$s Horiz Position"
msgstr "%1$s 横方å‘ã®ä½ç½®"
-#: src/emu/ui/ui.cpp:2041
+#: src/emu/ui/ui.cpp:1991
#, c-format
msgid "%1$s Vert Stretch"
msgstr "%1$s 縦方å‘ã®æ‹¡å¤§"
-#: src/emu/ui/ui.cpp:2044
+#: src/emu/ui/ui.cpp:1994
#, c-format
msgid "%1$s Vert Position"
msgstr "%1$s 縦方å‘ã®ä½ç½®"
-#: src/emu/ui/ui.cpp:2062
+#: src/emu/ui/ui.cpp:2012
#, c-format
msgid "Laserdisc '%1$s' Horiz Stretch"
msgstr "レーザーディスク '%1$s' 横方å‘ã®æ‹¡å¤§"
-#: src/emu/ui/ui.cpp:2065
+#: src/emu/ui/ui.cpp:2015
#, c-format
msgid "Laserdisc '%1$s' Horiz Position"
msgstr "レーザーディスク '%1$s' 横方å‘ã®ä½ç½®"
-#: src/emu/ui/ui.cpp:2068
+#: src/emu/ui/ui.cpp:2018
#, c-format
msgid "Laserdisc '%1$s' Vert Stretch"
msgstr "レーザーディスク '%1$s' 縦方å‘ã®æ‹¡å¤§"
-#: src/emu/ui/ui.cpp:2071
+#: src/emu/ui/ui.cpp:2021
#, c-format
msgid "Laserdisc '%1$s' Vert Position"
msgstr "レーザーディスク '%1$s' 縦方å‘ã®ä½ç½®"
-#: 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 "照準ã®å¤§ãã• %1$s"
-#: 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 "照準ã®ã‚ªãƒ•ã‚»ãƒƒãƒˆ %1$s"
-#: 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:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335
-#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401
-#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445
+#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219
+#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285
+#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351
+#: src/emu/ui/ui.cpp:2373 src/emu/ui/ui.cpp:2395
#, c-format
msgid "%1$.3f"
msgstr "%1$.3f"
-#: src/emu/ui/ui.cpp:2461 src/emu/ui/ui.cpp:2477 src/emu/ui/ui.cpp:2493
-#: src/emu/ui/ui.cpp:2509
+#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443
+#: src/emu/ui/ui.cpp:2459
#, c-format
msgid "%1$1.2f"
msgstr "%1$1.2f"
-#: src/emu/ui/ui.cpp:2525
+#: src/emu/ui/ui.cpp:2475
#, c-format
msgid "Screen '%1$s'"
msgstr "ç”»é¢ã€Œ%1$sã€"
-#: 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 "照準ã®å¤§ãã• X %1$1.3f"
-#: src/emu/ui/ui.cpp:2543
+#: src/emu/ui/ui.cpp:2493
#, c-format
msgid "Crosshair Scale Y %1$1.3f"
msgstr "照準ã®å¤§ãã• Y %1$1.3f"
-#: src/emu/ui/ui.cpp:2562
+#: src/emu/ui/ui.cpp:2512
#, c-format
msgid "Crosshair Offset X %1$1.3f"
msgstr "照準ã®ã‚ªãƒ•ã‚»ãƒƒãƒˆ X %1$1.3f"
-#: src/emu/ui/ui.cpp:2562
+#: src/emu/ui/ui.cpp:2512
#, c-format
msgid "Crosshair Offset Y %1$1.3f"
msgstr "照準ã®ã‚ªãƒ•ã‚»ãƒƒãƒˆ Y %1$1.3f"
@@ -2089,6 +2067,32 @@ msgstr " 色"
msgid " PENS"
msgstr " ペン"
+#~ 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 ""
+#~ "ã‚ãªãŸãŒæ‰€æœ‰ã—ã¦ã„ãªã„ROMをエミュレータã§åˆ©ç”¨ã™ã‚‹ã“ã¨ã¯è‘—作権法ã§ç¦ã˜ã‚‰ã‚Œ"
+#~ "ã¦ã„ã¾ã™ã€‚\n"
+#~ "\n"
+#~ "ã‚‚ã—ã‚ãªãŸãŒåˆæ³•çš„ã«ã€Œ%1$sã€ã‚’プレイã™ã‚‹è³‡æ ¼ãŒãªã„å ´åˆã¯ã€ESCキーを押ã—ã¦"
+#~ "下ã•ã„。\n"
+#~ "\n"
+#~ "ãã†ã§ãªã‘ã‚Œã°OKã¨ã‚¿ã‚¤ãƒ—ã™ã‚‹ã‹ã‚¸ãƒ§ã‚¤ã‚¹ãƒ†ã‚£ãƒƒã‚¯ã‚’å·¦å³ã«å…¥åŠ›ã—ã¦é€²ã¿ã¾ã™ã€‚"
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "Type OK or move the joystick left then right to continue"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "OKã¨ã‚¿ã‚¤ãƒ—ã™ã‚‹ã‹ã€ã‚¸ãƒ§ã‚¤ã‚¹ãƒ†ã‚£ãƒƒã‚¯ã‚’å·¦å³ã«å‹•ã‹ã—ã¦é€²ã‚€"
+
#~ msgid "Configure Machine"
#~ msgstr "マシンã®è¨­å®š"
diff --git a/language/Korean/strings.po b/language/Korean/strings.po
index bd043223ba5..198a73fcb65 100644
--- a/language/Korean/strings.po
+++ b/language/Korean/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"
@@ -61,14 +61,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
@@ -644,11 +644,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
@@ -656,7 +656,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
@@ -664,55 +664,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 ""
@@ -1573,92 +1573,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
-#, 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
+#: src/emu/ui/ui.cpp:1060
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 "
@@ -1666,7 +1654,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 "
@@ -1674,21 +1662,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"
@@ -1698,98 +1686,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"
@@ -1798,173 +1786,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:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335
-#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401
-#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445
+#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219
+#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285
+#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351
+#: 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:2509
+#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443
+#: 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 ""
diff --git a/language/Latvian/strings.po b/language/Latvian/strings.po
index e3571e2ef54..4bb6f42d893 100644
--- a/language/Latvian/strings.po
+++ b/language/Latvian/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"
@@ -61,14 +61,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
@@ -644,11 +644,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
@@ -656,7 +656,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
@@ -664,55 +664,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 ""
@@ -1573,92 +1573,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
-#, 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
+#: src/emu/ui/ui.cpp:1060
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 "
@@ -1666,7 +1654,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 "
@@ -1674,21 +1662,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"
@@ -1698,98 +1686,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"
@@ -1798,173 +1786,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:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335
-#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401
-#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445
+#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219
+#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285
+#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351
+#: 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:2509
+#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443
+#: 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 ""
diff --git a/language/Lithuanian/strings.po b/language/Lithuanian/strings.po
index 3ef9cccb19a..39030f0d506 100644
--- a/language/Lithuanian/strings.po
+++ b/language/Lithuanian/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"
@@ -61,14 +61,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
@@ -644,11 +644,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
@@ -656,7 +656,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
@@ -664,55 +664,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 ""
@@ -1573,92 +1573,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
-#, 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
+#: src/emu/ui/ui.cpp:1060
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 "
@@ -1666,7 +1654,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 "
@@ -1674,21 +1662,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"
@@ -1698,98 +1686,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"
@@ -1798,173 +1786,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:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335
-#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401
-#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445
+#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219
+#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285
+#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351
+#: 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:2509
+#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443
+#: 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 ""
diff --git a/language/Macedonian/strings.po b/language/Macedonian/strings.po
index eb1d22f0ac6..25c4119eadc 100644
--- a/language/Macedonian/strings.po
+++ b/language/Macedonian/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
-#, 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
+#: src/emu/ui/ui.cpp:1060
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:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335
-#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401
-#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445
+#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219
+#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285
+#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351
+#: 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:2509
+#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443
+#: 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 ""
diff --git a/language/Norwegian/strings.po b/language/Norwegian/strings.po
index e70544659d4..704a8f42c75 100644
--- a/language/Norwegian/strings.po
+++ b/language/Norwegian/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"
@@ -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
-#, 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
+#: src/emu/ui/ui.cpp:1060
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:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335
-#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401
-#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445
+#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219
+#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285
+#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351
+#: 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:2509
+#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443
+#: 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 ""
diff --git a/language/Persian/strings.po b/language/Persian/strings.po
index 54e02332306..559837e17b5 100644
--- a/language/Persian/strings.po
+++ b/language/Persian/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
-#, 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
+#: src/emu/ui/ui.cpp:1060
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:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335
-#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401
-#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445
+#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219
+#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285
+#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351
+#: 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:2509
+#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443
+#: 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 ""
diff --git a/language/Polish/strings.po b/language/Polish/strings.po
index 6cf4bc61d1e..23989fede0a 100644
--- a/language/Polish/strings.po
+++ b/language/Polish/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
-#, 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
+#: src/emu/ui/ui.cpp:1060
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:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335
-#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401
-#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445
+#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219
+#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285
+#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351
+#: 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:2509
+#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443
+#: 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 ""
diff --git a/language/Portuguese/strings.po b/language/Portuguese/strings.po
index cf6d13c2003..d950b6320b0 100644
--- a/language/Portuguese/strings.po
+++ b/language/Portuguese/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"
@@ -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
-#, 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
+#: src/emu/ui/ui.cpp:1060
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:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335
-#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401
-#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445
+#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219
+#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285
+#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351
+#: 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:2509
+#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443
+#: 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 ""
diff --git a/language/Portuguese_Brazil/strings.po b/language/Portuguese_Brazil/strings.po
index 447ae5dabc7..2522a63b58b 100644
--- a/language/Portuguese_Brazil/strings.po
+++ b/language/Portuguese_Brazil/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-03-02 14:00+0100\n"
"Last-Translator: Ashura-X\n"
"Language-Team: MAME Language Team\n"
@@ -61,14 +61,14 @@ msgstr "Recarregar Tudo"
msgid "Autofire Status"
msgstr "Situação do Autodisparo"
-#: 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 "Desativado"
-#: 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 "Aguardar Sincronismo Vertical"
msgid "Display Options"
msgstr "Opções de Tela"
-#: src/emu/ui/filesel.cpp:159
+#: src/emu/ui/filesel.cpp:161
msgid "File Already Exists - Override?"
msgstr "Arquivo Já Existe - Sobrescrever?"
-#: 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 "Arquivo Já Existe - Sobrescrever?"
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 ""
@@ -1578,33 +1578,13 @@ msgstr "Rebobinar"
msgid "Fast Forward"
msgstr "Avanço Rápido"
-#: 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 ""
"Este driver necessita de imagens para ser carregado nos seguintes "
"dispositivo(s): "
-#: src/emu/ui/ui.cpp:1043
-#, 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 ""
-"O uso de emuladores em conjunto com ROMs que você não possui é proibido por "
-"leis de direitos autorais\n"
-"\n"
-"SE VOCÊ NÃO ESTà LEGALMENTE ENTITULADO PARA JOGAR \"%1$s\" NESTE EMULADOR, "
-"PRESSIONE ESC.\n"
-"\n"
-"Caso contrário, digite OK ou mova o joystick para a esquerda e direita para "
-"continuar"
-
-#: src/emu/ui/ui.cpp:1081
+#: src/emu/ui/ui.cpp:1060
msgid ""
"One or more ROMs/CHDs for this machine are incorrect. The machine may not "
"run correctly.\n"
@@ -1612,56 +1592,56 @@ msgstr ""
"Uma ou mais ROMs/CHDs para esta máquina estão incorretas. A máquina não irá "
"funcionar corretamente"
-#: src/emu/ui/ui.cpp:1094
+#: src/emu/ui/ui.cpp:1073
msgid ""
"There are known problems with this machine\n"
"\n"
msgstr "Existem problemas conhecidos com esta máquina"
-#: 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 ""
"Uma ou mais ROMs/CHDs para esta máquina não foram corretamente dumpadas. \n"
" "
-#: 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 "A emulação do teclado talvez não seja 100% perfeita.\n"
-#: src/emu/ui/ui.cpp:1104
+#: src/emu/ui/ui.cpp:1083
#, c-format
msgid "The colors aren't 100% accurate.\n"
msgstr "As cores não são 100% perfeitas.\n"
-#: src/emu/ui/ui.cpp:1106
+#: src/emu/ui/ui.cpp:1085
msgid "The colors are completely wrong.\n"
msgstr "As cores são completamente erradas.\n"
-#: src/emu/ui/ui.cpp:1108
+#: src/emu/ui/ui.cpp:1087
#, c-format
msgid "The video emulation isn't 100% accurate.\n"
msgstr "A emulação do vídeo não é 100% perfeita.\n"
-#: src/emu/ui/ui.cpp:1110
+#: src/emu/ui/ui.cpp:1089
#, c-format
msgid "The sound emulation isn't 100% accurate.\n"
msgstr "A emulação do som não é 100% perfeita.\n"
-#: src/emu/ui/ui.cpp:1112
+#: src/emu/ui/ui.cpp:1091
msgid "The machine lacks sound.\n"
msgstr "A máquina tem problemas no som.\n"
-#: src/emu/ui/ui.cpp:1115
+#: src/emu/ui/ui.cpp:1094
msgid "Screen flipping in cocktail mode is not supported.\n"
msgstr "Inversão de tela no modo coquetel não é suportada.\n"
-#: src/emu/ui/ui.cpp:1119
+#: src/emu/ui/ui.cpp:1098
msgid "The machine requires external artwork files\n"
msgstr "Esta máquina requer arquivos externos de artwork\n"
-#: 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"
@@ -1669,7 +1649,7 @@ msgstr ""
"Esta máquina nunca foi completada. Ela poderá ter um comportamento estranho "
"or faltar elementos que não são bugs na emulação"
-#: 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"
@@ -1677,11 +1657,11 @@ msgstr ""
"Esta máquina não tem hardware de som, MAME não irá produzir som algum, isto "
"já é esperado."
-#: src/emu/ui/ui.cpp:1137
+#: src/emu/ui/ui.cpp:1116
msgid "The machine has protection which isn't fully emulated.\n"
msgstr "A máquina possui proteção a qual não é completamente emulada.\n"
-#: 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 "
@@ -1692,7 +1672,7 @@ msgstr ""
"Não há nada que você possa fazer para fixar isto exceto aguardar os "
"desenvolvedores improvisarem a emulação.\n"
-#: 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 "
@@ -1703,22 +1683,21 @@ msgstr ""
"interação física ou de dispositivos mecânicos. Não é possível jogar esta "
"máquina plenamente.\n"
-#: src/emu/ui/ui.cpp:1163
+#: src/emu/ui/ui.cpp:1142
msgid ""
"\n"
"\n"
"There are working clones of this machine: "
msgstr "Existem clones funcionando para esta máquina: "
-#: 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 ""
-"Pressione OK ou mova o joysticks para esquerda e direita para continuar"
-#: src/emu/ui/ui.cpp:1192
+#: src/emu/ui/ui.cpp:1171
#, c-format
msgid ""
"%1$s\n"
@@ -1728,98 +1707,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 "MHz"
-#: 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 "kHz"
-#: src/emu/ui/ui.cpp:1242
+#: src/emu/ui/ui.cpp:1221
msgid ""
"\n"
"Sound:\n"
msgstr "Som:"
-#: src/emu/ui/ui.cpp:1271
+#: src/emu/ui/ui.cpp:1250
msgid ""
"\n"
"Video:\n"
msgstr "Vídeo:"
-#: src/emu/ui/ui.cpp:1275
+#: src/emu/ui/ui.cpp:1254
msgid "None\n"
msgstr "Nada"
-#: src/emu/ui/ui.cpp:1282
+#: src/emu/ui/ui.cpp:1261
msgid "Vector"
msgstr "Vetorial"
-#: 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 "Situação da Emulação do Teclado"
-#: src/emu/ui/ui.cpp:1579
+#: src/emu/ui/ui.cpp:1529
msgid "Mode: PARTIAL Emulation"
msgstr "Modo: Emulação PARCIAL"
-#: src/emu/ui/ui.cpp:1580
+#: src/emu/ui/ui.cpp:1530
msgid "UI: Enabled"
msgstr "UI: Ativo"
-#: 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 "**Usar ScrLock para alternar"
-#: src/emu/ui/ui.cpp:1589
+#: src/emu/ui/ui.cpp:1539
msgid "Mode: FULL Emulation"
msgstr "Modo: Emulação COMPLETA"
-#: src/emu/ui/ui.cpp:1590
+#: src/emu/ui/ui.cpp:1540
msgid "UI: Disabled"
msgstr "UI: Desativado"
-#: src/emu/ui/ui.cpp:1736
+#: src/emu/ui/ui.cpp:1686
msgid "Autofire can't be enabled"
msgstr "Autodisparo não pode ser ativado"
-#: src/emu/ui/ui.cpp:1775
+#: src/emu/ui/ui.cpp:1725
msgid "Select position to save to"
msgstr "Selecione a posição para salvar em"
-#: src/emu/ui/ui.cpp:1777
+#: src/emu/ui/ui.cpp:1727
msgid "Select position to load from"
msgstr "Selecione a posição para carregar de"
-#: src/emu/ui/ui.cpp:1801
+#: src/emu/ui/ui.cpp:1751
msgid "Save cancelled"
msgstr "Salvar cancelado"
-#: src/emu/ui/ui.cpp:1803
+#: src/emu/ui/ui.cpp:1753
msgid "Load cancelled"
msgstr "Carregar cancelado"
-#: src/emu/ui/ui.cpp:1846
+#: src/emu/ui/ui.cpp:1796
#, c-format
msgid "Save to position %s"
msgstr "Salvar para a posição %s"
-#: src/emu/ui/ui.cpp:1851
+#: src/emu/ui/ui.cpp:1801
#, c-format
msgid "Load from position %s"
msgstr "Carregar da posição %s"
-#: src/emu/ui/ui.cpp:1891
+#: src/emu/ui/ui.cpp:1841
#, c-format
msgid ""
"Are you sure you want to quit?\n"
@@ -1832,173 +1811,173 @@ msgstr ""
"Pressione ''%1$s'' para sair,\n"
"Pressione ''%2$s'' para retornar à emulação."
-#: src/emu/ui/ui.cpp:1966
+#: src/emu/ui/ui.cpp:1916
msgid "Master Volume"
msgstr "Volume Mestre"
-#: src/emu/ui/ui.cpp:1976
+#: src/emu/ui/ui.cpp:1926
#, c-format
msgid "%1$s Volume"
msgstr "%1$s Volume"
-#: src/emu/ui/ui.cpp:1998
+#: src/emu/ui/ui.cpp:1948
#, c-format
msgid "Overclock CPU %1$s"
msgstr "Overclock CPU %1$s"
-#: src/emu/ui/ui.cpp:2018
+#: src/emu/ui/ui.cpp:1968
#, c-format
msgid "%1$s Refresh Rate"
msgstr "Taxa de Atualização da %1$s"
-#: src/emu/ui/ui.cpp:2024
+#: src/emu/ui/ui.cpp:1974
#, c-format
msgid "%1$s Brightness"
msgstr "Brilho da %1$s"
-#: src/emu/ui/ui.cpp:2027
+#: src/emu/ui/ui.cpp:1977
#, c-format
msgid "%1$s Contrast"
msgstr "Contraste da %1$s"
-#: src/emu/ui/ui.cpp:2030
+#: src/emu/ui/ui.cpp:1980
#, c-format
msgid "%1$s Gamma"
msgstr "Gama da %1$s"
-#: src/emu/ui/ui.cpp:2035
+#: src/emu/ui/ui.cpp:1985
#, c-format
msgid "%1$s Horiz Stretch"
msgstr "Extensão Horizontal da %1$s"
-#: src/emu/ui/ui.cpp:2038
+#: src/emu/ui/ui.cpp:1988
#, c-format
msgid "%1$s Horiz Position"
msgstr "Posição Horizontal %1$s"
-#: src/emu/ui/ui.cpp:2041
+#: src/emu/ui/ui.cpp:1991
#, c-format
msgid "%1$s Vert Stretch"
msgstr "Extensão Vertical da %1$s"
-#: src/emu/ui/ui.cpp:2044
+#: src/emu/ui/ui.cpp:1994
#, c-format
msgid "%1$s Vert Position"
msgstr "Posição Vertical da %1$s"
-#: src/emu/ui/ui.cpp:2062
+#: src/emu/ui/ui.cpp:2012
#, c-format
msgid "Laserdisc '%1$s' Horiz Stretch"
msgstr "Laserdisc '%1$s' Extensão Horizontal"
-#: src/emu/ui/ui.cpp:2065
+#: src/emu/ui/ui.cpp:2015
#, c-format
msgid "Laserdisc '%1$s' Horiz Position"
msgstr "Laserdisc '%1$s' Posição Horizontal"
-#: src/emu/ui/ui.cpp:2068
+#: src/emu/ui/ui.cpp:2018
#, c-format
msgid "Laserdisc '%1$s' Vert Stretch"
msgstr "Laserdisc '%1$s' Extensão Vertical"
-#: src/emu/ui/ui.cpp:2071
+#: src/emu/ui/ui.cpp:2021
#, c-format
msgid "Laserdisc '%1$s' Vert Position"
msgstr "Laserdisc '%1$s' Posição Vertical"
-#: src/emu/ui/ui.cpp:2080
+#: src/emu/ui/ui.cpp:2030
msgid "Vector Flicker"
msgstr "Flicker Vetorial"
-#: src/emu/ui/ui.cpp:2082
+#: src/emu/ui/ui.cpp:2032
msgid "Beam Width Minimum"
msgstr "Largura Mínima do Feixe de Luz"
-#: src/emu/ui/ui.cpp:2084
+#: src/emu/ui/ui.cpp:2034
msgid "Beam Width Maximum"
msgstr "Largura Máxima do Feixe de Luz"
-#: src/emu/ui/ui.cpp:2086
+#: src/emu/ui/ui.cpp:2036
msgid "Beam Intensity Weight"
msgstr "Intensidade do tamanho do Feixe de Luz"
-#: src/emu/ui/ui.cpp:2098
+#: src/emu/ui/ui.cpp:2048
#, c-format
msgid "Crosshair Scale %1$s"
msgstr "Escala da Mira %1$s"
-#: 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 "X"
-#: 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 "Y"
-#: src/emu/ui/ui.cpp:2101
+#: src/emu/ui/ui.cpp:2051
#, c-format
msgid "Crosshair Offset %1$s"
msgstr "Ajuste da Mira"
-#: src/emu/ui/ui.cpp:2120
+#: src/emu/ui/ui.cpp:2070
#, c-format
msgid "%1$3ddB"
msgstr "%1$3ddB"
-#: src/emu/ui/ui.cpp:2164
+#: src/emu/ui/ui.cpp:2114
#, c-format
msgid "%1$d%%"
msgstr "%1$d%%"
-#: src/emu/ui/ui.cpp:2180
+#: src/emu/ui/ui.cpp:2130
#, c-format
msgid "%1$3.0f%%"
msgstr "%1$3.0f%%"
-#: src/emu/ui/ui.cpp:2203
+#: src/emu/ui/ui.cpp:2153
#, c-format
msgid "%1$.3ffps"
msgstr "%1$.3ffps"
-#: src/emu/ui/ui.cpp:2226 src/emu/ui/ui.cpp:2248 src/emu/ui/ui.cpp:2269
-#: src/emu/ui/ui.cpp:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335
-#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401
-#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445
+#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219
+#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285
+#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351
+#: src/emu/ui/ui.cpp:2373 src/emu/ui/ui.cpp:2395
#, c-format
msgid "%1$.3f"
msgstr "%1$.3f"
-#: src/emu/ui/ui.cpp:2461 src/emu/ui/ui.cpp:2477 src/emu/ui/ui.cpp:2493
-#: src/emu/ui/ui.cpp:2509
+#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443
+#: src/emu/ui/ui.cpp:2459
#, c-format
msgid "%1$1.2f"
msgstr "%1$1.2f"
-#: src/emu/ui/ui.cpp:2525
+#: src/emu/ui/ui.cpp:2475
#, c-format
msgid "Screen '%1$s'"
msgstr "Tela '%1$s'"
-#: src/emu/ui/ui.cpp:2527
+#: src/emu/ui/ui.cpp:2477
msgid "Screen"
msgstr "Tela"
-#: src/emu/ui/ui.cpp:2543
+#: src/emu/ui/ui.cpp:2493
#, c-format
msgid "Crosshair Scale X %1$1.3f"
msgstr "Escala da Mira X %1$1.3f"
-#: src/emu/ui/ui.cpp:2543
+#: src/emu/ui/ui.cpp:2493
#, c-format
msgid "Crosshair Scale Y %1$1.3f"
msgstr "Escala da Mira Y %1$1.3f"
-#: src/emu/ui/ui.cpp:2562
+#: src/emu/ui/ui.cpp:2512
#, c-format
msgid "Crosshair Offset X %1$1.3f"
msgstr "Ajuste da Mira X %1$1.3f"
-#: src/emu/ui/ui.cpp:2562
+#: src/emu/ui/ui.cpp:2512
#, c-format
msgid "Crosshair Offset Y %1$1.3f"
msgstr "Ajuste da Mira Y %1$1.3f"
@@ -2048,6 +2027,31 @@ msgstr " CORES"
msgid " PENS"
msgstr " CANETAS"
+#~ 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 ""
+#~ "O uso de emuladores em conjunto com ROMs que você não possui é proibido "
+#~ "por leis de direitos autorais\n"
+#~ "\n"
+#~ "SE VOCÊ NÃO ESTà LEGALMENTE ENTITULADO PARA JOGAR \"%1$s\" NESTE "
+#~ "EMULADOR, PRESSIONE ESC.\n"
+#~ "\n"
+#~ "Caso contrário, digite OK ou mova o joystick para a esquerda e direita "
+#~ "para continuar"
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "Type OK or move the joystick left then right to continue"
+#~ msgstr ""
+#~ "Pressione OK ou mova o joysticks para esquerda e direita para continuar"
+
#~ msgid "Configure Machine"
#~ msgstr "Configurar Máquina"
diff --git a/language/Romanian/strings.po b/language/Romanian/strings.po
index 6c8bef2066e..d954640fa81 100644
--- a/language/Romanian/strings.po
+++ b/language/Romanian/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
-#, 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
+#: src/emu/ui/ui.cpp:1060
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:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335
-#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401
-#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445
+#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219
+#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285
+#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351
+#: 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:2509
+#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443
+#: 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 ""
diff --git a/language/Russian/strings.po b/language/Russian/strings.po
index e581887a29a..4f134885e27 100644
--- a/language/Russian/strings.po
+++ b/language/Russian/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"
@@ -64,14 +64,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
@@ -647,11 +647,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
@@ -659,7 +659,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
@@ -667,55 +667,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 ""
@@ -1576,23 +1576,11 @@ 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
-#, 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
+#: src/emu/ui/ui.cpp:1060
msgid ""
"One or more ROMs/CHDs for this machine are incorrect. The machine may not "
"run correctly.\n"
@@ -1600,7 +1588,7 @@ msgstr ""
"Один или неÑколько ROM/CHD Ñтой ÑиÑтемы не верные. Эта ÑиÑтема может "
"работать не правильно.\n"
-#: src/emu/ui/ui.cpp:1094
+#: src/emu/ui/ui.cpp:1073
msgid ""
"There are known problems with this machine\n"
"\n"
@@ -1608,48 +1596,48 @@ msgstr ""
"ИмеютÑÑ Ð¸Ð·Ð²ÐµÑтные проблемы Ñ Ñтой ÑиÑтемой\n"
"\n"
-#: 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 "Один или неÑколько ROM/CHD Ñтой ÑиÑтемы не были нормально Ñдамплены.\n"
-#: 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 "ЭмулÑÑ†Ð¸Ñ ÐºÐ»Ð°Ð²Ð¸Ð°Ñ‚ÑƒÑ€Ñ‹ не 100% точнаÑ.\n"
-#: src/emu/ui/ui.cpp:1104
+#: src/emu/ui/ui.cpp:1083
#, c-format
msgid "The colors aren't 100% accurate.\n"
msgstr "Цвета не 100% точные.\n"
-#: src/emu/ui/ui.cpp:1106
+#: src/emu/ui/ui.cpp:1085
msgid "The colors are completely wrong.\n"
msgstr "Цвета ÑовÑем не правильные.\n"
-#: src/emu/ui/ui.cpp:1108
+#: src/emu/ui/ui.cpp:1087
#, c-format
msgid "The video emulation isn't 100% accurate.\n"
msgstr "ЭмулÑÑ†Ð¸Ñ Ð²Ð¸Ð´ÐµÐ¾ не 100% точнаÑ.\n"
-#: src/emu/ui/ui.cpp:1110
+#: src/emu/ui/ui.cpp:1089
#, c-format
msgid "The sound emulation isn't 100% accurate.\n"
msgstr "ЭмулÑÑ†Ð¸Ñ Ð·Ð²ÑƒÐºÐ° не 100% точнаÑ.\n"
-#: src/emu/ui/ui.cpp:1112
+#: src/emu/ui/ui.cpp:1091
msgid "The machine lacks sound.\n"
msgstr "Звук не ÑмулируетÑÑ.\n"
-#: src/emu/ui/ui.cpp:1115
+#: src/emu/ui/ui.cpp:1094
msgid "Screen flipping in cocktail mode is not supported.\n"
msgstr "Переворот Ñкрана в режиме коктейль-Ñтола не поддерживаетÑÑ.\n"
-#: src/emu/ui/ui.cpp:1119
+#: src/emu/ui/ui.cpp:1098
msgid "The machine requires external artwork files\n"
msgstr "Этой ÑиÑтеме нужны внешние файлы оформлениÑ\n"
-#: 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"
@@ -1657,7 +1645,7 @@ msgstr ""
"Разработка Ñтой ÑиÑтемы так и не была завершена. Может наблюдатьÑÑ Ñтранное "
"поведение или отÑутÑвующие Ñлементы. Это не ÑвлÑетÑÑ Ð¾ÑˆÐ¸Ð±ÐºÐ°Ð¼Ð¸ ÑмулÑции.\n"
-#: 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"
@@ -1665,11 +1653,11 @@ msgstr ""
"У Ñтой ÑиÑтемы нет звукового оборудованиÑ, в процеÑÑе ÑмулÑции не будет "
"никаких звуков, так и должно быть.\n"
-#: src/emu/ui/ui.cpp:1137
+#: src/emu/ui/ui.cpp:1116
msgid "The machine has protection which isn't fully emulated.\n"
msgstr "Защита Ñтой ÑиÑтемы ÑмулируетÑÑ Ð½Ðµ полноÑтью.\n"
-#: 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 "
@@ -1680,7 +1668,7 @@ msgstr ""
"ЭТРСИСТЕМРÐЕ РÐБОТÐЕТ. ЭмулÑÑ†Ð¸Ñ Ñтой ÑиÑтемы не завершена. Ð’Ñ‹ никак не "
"Ñможете иÑправить проблемы, лишь ждать когда разработчики улучшат ÑмулÑцию.\n"
-#: 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 "
@@ -1688,7 +1676,7 @@ msgid ""
"to fully play this machine.\n"
msgstr ""
-#: src/emu/ui/ui.cpp:1163
+#: src/emu/ui/ui.cpp:1142
msgid ""
"\n"
"\n"
@@ -1698,17 +1686,14 @@ msgstr ""
"\n"
"ИзвеÑтные работающие клоны Ñтой ÑиÑтемы: "
-#: 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 ""
-"\n"
-"\n"
-"Ð”Ð»Ñ Ð¿Ñ€Ð¾Ð´Ð¾Ð»Ð¶ÐµÐ½Ð¸Ñ Ð½Ð°Ð¿ÐµÑ‡Ð°Ñ‚Ð°Ð¹Ñ‚Ðµ OK либо нажмите влево затем вправо на джойÑтике"
-#: src/emu/ui/ui.cpp:1192
+#: src/emu/ui/ui.cpp:1171
#, c-format
msgid ""
"%1$s\n"
@@ -1718,15 +1703,15 @@ 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"
@@ -1734,7 +1719,7 @@ msgstr ""
"\n"
"Звук:\n"
-#: src/emu/ui/ui.cpp:1271
+#: src/emu/ui/ui.cpp:1250
msgid ""
"\n"
"Video:\n"
@@ -1742,78 +1727,78 @@ msgstr ""
"\n"
"Видео:\n"
-#: src/emu/ui/ui.cpp:1275
+#: src/emu/ui/ui.cpp:1254
msgid "None\n"
msgstr "Ðет\n"
-#: 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 "UI: Включен"
-#: 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 "**Ðажмите ScrLock Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ**"
-#: 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 "UI: Выключен"
-#: 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 "Сохранение ÑоÑтоÑÐ½Ð¸Ñ %s"
-#: src/emu/ui/ui.cpp:1851
+#: src/emu/ui/ui.cpp:1801
#, c-format
msgid "Load from position %s"
msgstr "Загрузка ÑоÑтоÑÐ½Ð¸Ñ %s"
-#: src/emu/ui/ui.cpp:1891
+#: src/emu/ui/ui.cpp:1841
#, c-format
msgid ""
"Are you sure you want to quit?\n"
@@ -1822,173 +1807,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:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335
-#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401
-#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445
+#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219
+#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285
+#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351
+#: 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:2509
+#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443
+#: 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 ""
@@ -2038,6 +2023,16 @@ msgstr " ЦВЕТÐ"
msgid " PENS"
msgstr ""
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "Type OK or move the joystick left then right to continue"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "Ð”Ð»Ñ Ð¿Ñ€Ð¾Ð´Ð¾Ð»Ð¶ÐµÐ½Ð¸Ñ Ð½Ð°Ð¿ÐµÑ‡Ð°Ñ‚Ð°Ð¹Ñ‚Ðµ OK либо нажмите влево затем вправо на "
+#~ "джойÑтике"
+
#~ msgid "Double click or press "
#~ msgstr "Кликните два раза или нажмите "
diff --git a/language/Serbian/strings.po b/language/Serbian/strings.po
index 265f1e7f088..f801e746e33 100644
--- a/language/Serbian/strings.po
+++ b/language/Serbian/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-03-02 21:46+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: MAME Language Team\n"
@@ -64,14 +64,14 @@ msgstr "Ponovo uÄitaj sve"
msgid "Autofire Status"
msgstr "Stanje automatskog pucanja"
-#: 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 "Onemogućeno"
-#: 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
@@ -648,11 +648,11 @@ msgstr ""
msgid "Display Options"
msgstr "Opcije prikaza"
-#: 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
@@ -660,7 +660,7 @@ msgstr ""
msgid "No"
msgstr "Ne"
-#: 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
@@ -668,55 +668,55 @@ msgstr "Ne"
msgid "Yes"
msgstr "Da"
-#: 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 ""
@@ -1601,31 +1601,11 @@ 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 "Za ovaj drajver je neophodno da slike budu uÄitane u sledeće ureÄ‘aje:"
-#: src/emu/ui/ui.cpp:1043
-#, 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 ""
-"Upotreba emulatora u vezi sa ROM-ovima koje ne posedujete je zabranjena "
-"zakonom o autorskim pravima.\n"
-"\n"
-"AKO VAM NIJE DOZVOLJENO ZAKONOM DA IGRATE \"%1$s\" NA OVOM EMULATORU, "
-"PRITISNITE ESC.\n"
-"\n"
-"U suprotnom, otkucajte OK ili pomerite komandnu palicu (džojstik) levo, pa "
-"desno da nastavite"
-
-#: src/emu/ui/ui.cpp:1081
+#: src/emu/ui/ui.cpp:1060
msgid ""
"One or more ROMs/CHDs for this machine are incorrect. The machine may not "
"run correctly.\n"
@@ -1633,7 +1613,7 @@ msgstr ""
"Jedan ili više ROM/CHD fajlova za ovu mašinu su neispravni. Mašina možda "
"neće ispravno raditi.\n"
-#: src/emu/ui/ui.cpp:1094
+#: src/emu/ui/ui.cpp:1073
msgid ""
"There are known problems with this machine\n"
"\n"
@@ -1641,49 +1621,49 @@ msgstr ""
"Postoje poznati problemi s ovom mašinom\n"
"\n"
-#: 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 ""
"Jedan ili više ROM/CHD fajlova za ovu mašinu nisu ispravno napravljeni.\n"
-#: 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 "Emulacija tastature možda nije 100% taÄna.\n"
-#: src/emu/ui/ui.cpp:1104
+#: src/emu/ui/ui.cpp:1083
#, c-format
msgid "The colors aren't 100% accurate.\n"
msgstr "Boje nisu 100% taÄne.\n"
-#: src/emu/ui/ui.cpp:1106
+#: src/emu/ui/ui.cpp:1085
msgid "The colors are completely wrong.\n"
msgstr "Boje su potpuno pogrešne.\n"
-#: src/emu/ui/ui.cpp:1108
+#: src/emu/ui/ui.cpp:1087
#, c-format
msgid "The video emulation isn't 100% accurate.\n"
msgstr "Video emulacija nije 100% taÄna.\n"
-#: src/emu/ui/ui.cpp:1110
+#: src/emu/ui/ui.cpp:1089
#, c-format
msgid "The sound emulation isn't 100% accurate.\n"
msgstr "Emulacija zvuka nije 100% taÄna.\n"
-#: src/emu/ui/ui.cpp:1112
+#: src/emu/ui/ui.cpp:1091
msgid "The machine lacks sound.\n"
msgstr "Mašini nedostaje zvuk.\n"
-#: src/emu/ui/ui.cpp:1115
+#: src/emu/ui/ui.cpp:1094
msgid "Screen flipping in cocktail mode is not supported.\n"
msgstr "Obrtanje ekrana u \"koktel\" modu nije podržano.\n"
-#: src/emu/ui/ui.cpp:1119
+#: src/emu/ui/ui.cpp:1098
msgid "The machine requires external artwork files\n"
msgstr "Mašina zahteva dodatne ilustracione fajlove\n"
-#: 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"
@@ -1691,7 +1671,7 @@ msgstr ""
"MaÅ¡sina nije nikad zavrÅ¡ena. Može se javiti Äudno ponaÅ¡anje ili nedostatak "
"elemenata sto ne predstavlja problem s emulacijom.\n"
-#: 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"
@@ -1699,11 +1679,11 @@ msgstr ""
"MaÅ¡ina ne poseduje ureÄ‘aj za zvuk, MAME neće puÅ¡tati zvuk, ovo je oÄekivano "
"ponašanje.\n"
-#: src/emu/ui/ui.cpp:1137
+#: src/emu/ui/ui.cpp:1116
msgid "The machine has protection which isn't fully emulated.\n"
msgstr "Mašina ima zaštitu koja nije potpuno emulirana.\n"
-#: 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 "
@@ -1714,7 +1694,7 @@ msgstr ""
"OVA MAŠINA NE RADI. Emulacija ove mašine još nije potpuna. Ne možete ništa "
"uraditi u vezi s tim, osim da saÄekate programere da unaprede emulaciju.\n"
-#: 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 "
@@ -1726,7 +1706,7 @@ msgstr ""
"interakciju ili se sastoje od mehaniÄkih ureÄ‘aja. Nemoguće je igrati se na "
"ovoj mašini u potpunosti.\n"
-#: src/emu/ui/ui.cpp:1163
+#: src/emu/ui/ui.cpp:1142
msgid ""
"\n"
"\n"
@@ -1736,18 +1716,14 @@ msgstr ""
"\n"
"Postoji klonovi ove mašine koji rade: "
-#: 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 ""
-"\n"
-"\n"
-"Otkucajte OK ili pomerite komandnu palicu (džojstik) levo, pa desno da "
-"nastavite"
-#: src/emu/ui/ui.cpp:1192
+#: src/emu/ui/ui.cpp:1171
#, c-format
msgid ""
"%1$s\n"
@@ -1762,15 +1738,15 @@ msgstr ""
"\n"
"CPU:\n"
-#: 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 "MHz"
-#: 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 "kHz"
-#: src/emu/ui/ui.cpp:1242
+#: src/emu/ui/ui.cpp:1221
msgid ""
"\n"
"Sound:\n"
@@ -1778,7 +1754,7 @@ msgstr ""
"\n"
"Zvuk:\n"
-#: src/emu/ui/ui.cpp:1271
+#: src/emu/ui/ui.cpp:1250
msgid ""
"\n"
"Video:\n"
@@ -1786,80 +1762,80 @@ msgstr ""
"\n"
"Video:\n"
-#: src/emu/ui/ui.cpp:1275
+#: src/emu/ui/ui.cpp:1254
msgid "None\n"
msgstr ""
"Nijedan\n"
"\n"
-#: src/emu/ui/ui.cpp:1282
+#: src/emu/ui/ui.cpp:1261
msgid "Vector"
msgstr "Vektor"
-#: src/emu/ui/ui.cpp:1293
+#: src/emu/ui/ui.cpp:1272
#, c-format
msgid "%1$s: %2$s\n"
msgstr "%1$s: %2$s\n"
-#: src/emu/ui/ui.cpp:1293
+#: src/emu/ui/ui.cpp:1272
msgid "%2$s\n"
msgstr "%2$s\n"
-#: 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 "Stanje emulacije tastature"
-#: src/emu/ui/ui.cpp:1579
+#: src/emu/ui/ui.cpp:1529
msgid "Mode: PARTIAL Emulation"
msgstr "Mod: DELIMIÄŒNA emulacija"
-#: src/emu/ui/ui.cpp:1580
+#: src/emu/ui/ui.cpp:1530
msgid "UI: Enabled"
msgstr "KorisniÄki interfejs: omogućen"
-#: 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 "**Koristite ScrLock da promenite radno stanje**"
-#: src/emu/ui/ui.cpp:1589
+#: src/emu/ui/ui.cpp:1539
msgid "Mode: FULL Emulation"
msgstr "Mod: POTPUNA emulacija"
-#: src/emu/ui/ui.cpp:1590
+#: src/emu/ui/ui.cpp:1540
msgid "UI: Disabled"
msgstr "KorisniÄki interfejs: onesposobljen"
-#: src/emu/ui/ui.cpp:1736
+#: src/emu/ui/ui.cpp:1686
msgid "Autofire can't be enabled"
msgstr "Automatsko pucanje ne može da se omogući"
-#: src/emu/ui/ui.cpp:1775
+#: src/emu/ui/ui.cpp:1725
msgid "Select position to save to"
msgstr "Izaberite poziciju na koju želite da snimite"
-#: src/emu/ui/ui.cpp:1777
+#: src/emu/ui/ui.cpp:1727
msgid "Select position to load from"
msgstr "Izaberite poziciju sa koje želite da uÄitate"
-#: src/emu/ui/ui.cpp:1801
+#: src/emu/ui/ui.cpp:1751
msgid "Save cancelled"
msgstr "ÄŒuvanje stanja igre otkazano"
-#: src/emu/ui/ui.cpp:1803
+#: src/emu/ui/ui.cpp:1753
msgid "Load cancelled"
msgstr "UÄitavanje stanja igre otkazano"
-#: src/emu/ui/ui.cpp:1846
+#: src/emu/ui/ui.cpp:1796
#, c-format
msgid "Save to position %s"
msgstr "SaÄuvaj na poziciju %s"
-#: src/emu/ui/ui.cpp:1851
+#: src/emu/ui/ui.cpp:1801
#, c-format
msgid "Load from position %s"
msgstr "UÄitaj sa pozicije %s"
-#: src/emu/ui/ui.cpp:1891
+#: src/emu/ui/ui.cpp:1841
#, c-format
msgid ""
"Are you sure you want to quit?\n"
@@ -1872,173 +1848,173 @@ msgstr ""
"Pritisnite ''%s'' za napuštanje programa,\n"
"Pritisnite ''%s'' za nastavak emulacije."
-#: src/emu/ui/ui.cpp:1966
+#: src/emu/ui/ui.cpp:1916
msgid "Master Volume"
msgstr "Glavna jaÄina zvuka"
-#: src/emu/ui/ui.cpp:1976
+#: src/emu/ui/ui.cpp:1926
#, c-format
msgid "%1$s Volume"
msgstr "%1$s jaÄina zvuka"
-#: src/emu/ui/ui.cpp:1998
+#: src/emu/ui/ui.cpp:1948
#, c-format
msgid "Overclock CPU %1$s"
msgstr "Ubrzanje osnovnog takta CPU %1$s"
-#: src/emu/ui/ui.cpp:2018
+#: src/emu/ui/ui.cpp:1968
#, c-format
msgid "%1$s Refresh Rate"
msgstr "%1$s frekvencija osvežavanja"
-#: src/emu/ui/ui.cpp:2024
+#: src/emu/ui/ui.cpp:1974
#, c-format
msgid "%1$s Brightness"
msgstr "%1$s osvetljenost"
-#: src/emu/ui/ui.cpp:2027
+#: src/emu/ui/ui.cpp:1977
#, c-format
msgid "%1$s Contrast"
msgstr "%1$s kontrast"
-#: src/emu/ui/ui.cpp:2030
+#: src/emu/ui/ui.cpp:1980
#, c-format
msgid "%1$s Gamma"
msgstr "%1$s gamut"
-#: src/emu/ui/ui.cpp:2035
+#: src/emu/ui/ui.cpp:1985
#, c-format
msgid "%1$s Horiz Stretch"
msgstr "%1$s rastezanje po horizontali"
-#: src/emu/ui/ui.cpp:2038
+#: src/emu/ui/ui.cpp:1988
#, c-format
msgid "%1$s Horiz Position"
msgstr "%1$s horizontalna pozicija"
-#: src/emu/ui/ui.cpp:2041
+#: src/emu/ui/ui.cpp:1991
#, c-format
msgid "%1$s Vert Stretch"
msgstr "%1$s rastezanje po vertikali"
-#: src/emu/ui/ui.cpp:2044
+#: src/emu/ui/ui.cpp:1994
#, c-format
msgid "%1$s Vert Position"
msgstr "%1$s vertikalna pozicija"
-#: src/emu/ui/ui.cpp:2062
+#: src/emu/ui/ui.cpp:2012
#, c-format
msgid "Laserdisc '%1$s' Horiz Stretch"
msgstr "Laserdisc '%1$s' rastezanje po horizontali"
-#: src/emu/ui/ui.cpp:2065
+#: src/emu/ui/ui.cpp:2015
#, c-format
msgid "Laserdisc '%1$s' Horiz Position"
msgstr "Laserdisc '%1$s' horizontalna pozicija"
-#: src/emu/ui/ui.cpp:2068
+#: src/emu/ui/ui.cpp:2018
#, c-format
msgid "Laserdisc '%1$s' Vert Stretch"
msgstr "Laserdisc '%1$s' rastezanje po vertikali"
-#: src/emu/ui/ui.cpp:2071
+#: src/emu/ui/ui.cpp:2021
#, c-format
msgid "Laserdisc '%1$s' Vert Position"
msgstr "Laserdisc '%1$s' vertikalna pozicija"
-#: src/emu/ui/ui.cpp:2080
+#: src/emu/ui/ui.cpp:2030
msgid "Vector Flicker"
msgstr "Treperenje vektora"
-#: src/emu/ui/ui.cpp:2082
+#: src/emu/ui/ui.cpp:2032
msgid "Beam Width Minimum"
msgstr "Minimalna Å¡irina snopa"
-#: src/emu/ui/ui.cpp:2084
+#: src/emu/ui/ui.cpp:2034
msgid "Beam Width Maximum"
msgstr "Maksimalna Å¡irinia snopa"
-#: src/emu/ui/ui.cpp:2086
+#: src/emu/ui/ui.cpp:2036
msgid "Beam Intensity Weight"
msgstr "Intenzitet snopa"
-#: src/emu/ui/ui.cpp:2098
+#: src/emu/ui/ui.cpp:2048
#, c-format
msgid "Crosshair Scale %1$s"
msgstr "Razmera nišana %1$s"
-#: 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 "X"
-#: 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 "Y"
-#: src/emu/ui/ui.cpp:2101
+#: src/emu/ui/ui.cpp:2051
#, c-format
msgid "Crosshair Offset %1$s"
msgstr "Pomeraj nišana %1$s"
-#: src/emu/ui/ui.cpp:2120
+#: src/emu/ui/ui.cpp:2070
#, c-format
msgid "%1$3ddB"
msgstr "%1$3ddB"
-#: src/emu/ui/ui.cpp:2164
+#: src/emu/ui/ui.cpp:2114
#, c-format
msgid "%1$d%%"
msgstr "%1$d%%"
-#: src/emu/ui/ui.cpp:2180
+#: src/emu/ui/ui.cpp:2130
#, c-format
msgid "%1$3.0f%%"
msgstr "%1$3.0f%%"
-#: src/emu/ui/ui.cpp:2203
+#: src/emu/ui/ui.cpp:2153
#, c-format
msgid "%1$.3ffps"
msgstr "%1$.3ffps"
-#: src/emu/ui/ui.cpp:2226 src/emu/ui/ui.cpp:2248 src/emu/ui/ui.cpp:2269
-#: src/emu/ui/ui.cpp:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335
-#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401
-#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445
+#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219
+#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285
+#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351
+#: src/emu/ui/ui.cpp:2373 src/emu/ui/ui.cpp:2395
#, c-format
msgid "%1$.3f"
msgstr "%1$.3f"
-#: src/emu/ui/ui.cpp:2461 src/emu/ui/ui.cpp:2477 src/emu/ui/ui.cpp:2493
-#: src/emu/ui/ui.cpp:2509
+#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443
+#: src/emu/ui/ui.cpp:2459
#, c-format
msgid "%1$1.2f"
msgstr "%1$1.2f"
-#: src/emu/ui/ui.cpp:2525
+#: src/emu/ui/ui.cpp:2475
#, c-format
msgid "Screen '%1$s'"
msgstr "Ekran '%1$s'"
-#: src/emu/ui/ui.cpp:2527
+#: src/emu/ui/ui.cpp:2477
msgid "Screen"
msgstr "Ekran"
-#: src/emu/ui/ui.cpp:2543
+#: src/emu/ui/ui.cpp:2493
#, c-format
msgid "Crosshair Scale X %1$1.3f"
msgstr "Razmera nišana X %1$1.3f"
-#: src/emu/ui/ui.cpp:2543
+#: src/emu/ui/ui.cpp:2493
#, c-format
msgid "Crosshair Scale Y %1$1.3f"
msgstr "Razmera nišana Y %1$1.3f"
-#: src/emu/ui/ui.cpp:2562
+#: src/emu/ui/ui.cpp:2512
#, c-format
msgid "Crosshair Offset X %1$1.3f"
msgstr "Pomeraj nišana X %1$1.3f"
-#: src/emu/ui/ui.cpp:2562
+#: src/emu/ui/ui.cpp:2512
#, c-format
msgid "Crosshair Offset Y %1$1.3f"
msgstr "Pomeraj nišana Y %1$1.3f"
@@ -2088,6 +2064,34 @@ msgstr " BOJE"
msgid " PENS"
msgstr ""
+#~ 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 ""
+#~ "Upotreba emulatora u vezi sa ROM-ovima koje ne posedujete je zabranjena "
+#~ "zakonom o autorskim pravima.\n"
+#~ "\n"
+#~ "AKO VAM NIJE DOZVOLJENO ZAKONOM DA IGRATE \"%1$s\" NA OVOM EMULATORU, "
+#~ "PRITISNITE ESC.\n"
+#~ "\n"
+#~ "U suprotnom, otkucajte OK ili pomerite komandnu palicu (džojstik) levo, "
+#~ "pa desno da nastavite"
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "Type OK or move the joystick left then right to continue"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "Otkucajte OK ili pomerite komandnu palicu (džojstik) levo, pa desno da "
+#~ "nastavite"
+
#~ msgid "Configure Machine"
#~ msgstr "Konfiguracija mašine"
diff --git a/language/Serbian_Cyrillic/strings.po b/language/Serbian_Cyrillic/strings.po
index ed2538b6ba6..f910d74bbf4 100644
--- a/language/Serbian_Cyrillic/strings.po
+++ b/language/Serbian_Cyrillic/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-23 12:43+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: MAME Language Team\n"
@@ -64,14 +64,14 @@ msgstr "Поново учитаj Ñвe"
msgid "Autofire Status"
msgstr "Стањe аутоматÑког пуцања"
-#: 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 "Онeмогућeно"
-#: 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
@@ -648,11 +648,11 @@ msgstr ""
msgid "Display Options"
msgstr "Опциje приказа"
-#: 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
@@ -660,7 +660,7 @@ msgstr ""
msgid "No"
msgstr "Ðe"
-#: 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
@@ -668,55 +668,55 @@ msgstr "Ðe"
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 ""
@@ -1601,31 +1601,11 @@ 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 "За оваj драjвeÑ€ je нeопходно да Ñликe буду учитанe у ÑлeдeÑ›e урeђаje:"
-#: src/emu/ui/ui.cpp:1043
-#, 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 ""
-"Употрeба eмулатора у вeзи Ñа РОМ-овима коje нe поÑeдуjeÑ‚e je забрањeна "
-"законом о ауторÑким правима.\n"
-"\n"
-"ÐКО Ð’ÐÐœ ÐИЈЕ ДОЗВОЉЕÐО ЗÐКОÐОМ ДРИГРÐТЕ \"%1$s\" ÐРОВОМ ЕМУЛÐТОРУ, "
-"ПРИТИСÐИТЕ ЕСЦ.\n"
-"\n"
-"У Ñупротном, откуцаjÑ‚e ОК или помeритe командну палицу (џоjÑтик) лeво, па "
-"дeÑно да наÑтавитe"
-
-#: src/emu/ui/ui.cpp:1081
+#: src/emu/ui/ui.cpp:1060
msgid ""
"One or more ROMs/CHDs for this machine are incorrect. The machine may not "
"run correctly.\n"
@@ -1633,7 +1613,7 @@ msgstr ""
"Јeдан или вишe РОМ/ЦХД фаjлова за ову машину Ñу нeиÑправни. Машина можда "
"нeÑ›e иÑправно радити.\n"
-#: src/emu/ui/ui.cpp:1094
+#: src/emu/ui/ui.cpp:1073
msgid ""
"There are known problems with this machine\n"
"\n"
@@ -1641,49 +1621,49 @@ msgstr ""
"ПоÑтоje познати проблeми Ñ Ð¾Ð²Ð¾Ð¼ машином\n"
"\n"
-#: 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 ""
"Јeдан или вишe РОМ/ЦХД фаjлова за ову машину ниÑу иÑправно направљeни.\n"
-#: 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 "Емулациjа таÑтатурe можда ниje 100% тачна.\n"
-#: src/emu/ui/ui.cpp:1104
+#: src/emu/ui/ui.cpp:1083
#, c-format
msgid "The colors aren't 100% accurate.\n"
msgstr "Боje ниÑу 100% тачнe.\n"
-#: src/emu/ui/ui.cpp:1106
+#: src/emu/ui/ui.cpp:1085
msgid "The colors are completely wrong.\n"
msgstr "Боje Ñу потпуно погрeшнe.\n"
-#: src/emu/ui/ui.cpp:1108
+#: src/emu/ui/ui.cpp:1087
#, c-format
msgid "The video emulation isn't 100% accurate.\n"
msgstr "Видeо eмулациjа ниje 100% тачна.\n"
-#: src/emu/ui/ui.cpp:1110
+#: src/emu/ui/ui.cpp:1089
#, c-format
msgid "The sound emulation isn't 100% accurate.\n"
msgstr "Емулациjа звука ниje 100% тачна.\n"
-#: src/emu/ui/ui.cpp:1112
+#: src/emu/ui/ui.cpp:1091
msgid "The machine lacks sound.\n"
msgstr "Машини нeдоÑтаje звук.\n"
-#: src/emu/ui/ui.cpp:1115
+#: src/emu/ui/ui.cpp:1094
msgid "Screen flipping in cocktail mode is not supported.\n"
msgstr "Обртањe eкрана у \"коктeл\" моду ниje подржано.\n"
-#: src/emu/ui/ui.cpp:1119
+#: src/emu/ui/ui.cpp:1098
msgid "The machine requires external artwork files\n"
msgstr "Машина захтeва додатнe илуÑтрационe фаjловe\n"
-#: 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"
@@ -1691,7 +1671,7 @@ msgstr ""
"МашÑина ниje никад завршeна. Можe Ñe jавити чудно понашањe или нeдоÑтатак "
"eлeмeната Ñто нe прeдÑтавља проблeм Ñ eмулациjом.\n"
-#: 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"
@@ -1699,11 +1679,11 @@ msgstr ""
"Машина нe поÑeдуje урeђаj за звук, ÐœÐМЕ нeÑ›e пуштати звук, ово je очeкивано "
"понашањe.\n"
-#: src/emu/ui/ui.cpp:1137
+#: src/emu/ui/ui.cpp:1116
msgid "The machine has protection which isn't fully emulated.\n"
msgstr "Машина има заштиту коjа ниje потпуно eмулирана.\n"
-#: 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 "
@@ -1714,7 +1694,7 @@ msgstr ""
"ОВРМÐШИÐÐ ÐЕ РÐДИ. Емулациjа овe машинe jош ниje потпуна. Ðe можeÑ‚e ништа "
"урадити у вeзи Ñ Ñ‚Ð¸Ð¼, оÑим да Ñачeкатe програмeÑ€e да унапрeдe eмулациjу.\n"
-#: 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 "
@@ -1726,7 +1706,7 @@ msgstr ""
"интeракциjу или Ñe ÑаÑтоje од мeханичких урeђаjа. Ðeмогућe je играти Ñe на "
"овоj машини у потпуноÑти.\n"
-#: src/emu/ui/ui.cpp:1163
+#: src/emu/ui/ui.cpp:1142
msgid ""
"\n"
"\n"
@@ -1736,18 +1716,14 @@ msgstr ""
"\n"
"ПоÑтоjи клонови овe машинe коjи радe: "
-#: 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 ""
-"\n"
-"\n"
-"ОткуцаjÑ‚e ОК или помeритe командну палицу (џоjÑтик) лeво, па дeÑно да "
-"наÑтавитe"
-#: src/emu/ui/ui.cpp:1192
+#: src/emu/ui/ui.cpp:1171
#, c-format
msgid ""
"%1$s\n"
@@ -1762,15 +1738,15 @@ msgstr ""
"\n"
"ЦПУ:\n"
-#: 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 "MHz"
-#: 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 "kHz"
-#: src/emu/ui/ui.cpp:1242
+#: src/emu/ui/ui.cpp:1221
msgid ""
"\n"
"Sound:\n"
@@ -1778,7 +1754,7 @@ msgstr ""
"\n"
"Звук:\n"
-#: src/emu/ui/ui.cpp:1271
+#: src/emu/ui/ui.cpp:1250
msgid ""
"\n"
"Video:\n"
@@ -1786,78 +1762,78 @@ msgstr ""
"\n"
"Видeо:\n"
-#: src/emu/ui/ui.cpp:1275
+#: src/emu/ui/ui.cpp:1254
msgid "None\n"
msgstr "Ðиjeдан\n"
-#: src/emu/ui/ui.cpp:1282
+#: src/emu/ui/ui.cpp:1261
msgid "Vector"
msgstr "Вeктор"
-#: 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 "Стањe eмулациje таÑтатурe"
-#: src/emu/ui/ui.cpp:1579
+#: src/emu/ui/ui.cpp:1529
msgid "Mode: PARTIAL Emulation"
msgstr "Мод: ДЕЛИМИЧÐÐ eмулациjа"
-#: src/emu/ui/ui.cpp:1580
+#: src/emu/ui/ui.cpp:1530
msgid "UI: Enabled"
msgstr "КориÑнички интeрфejÑ: омогућeн"
-#: 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 "**КориÑтитe ScrLock да промeнитe радно Ñтањe**"
-#: src/emu/ui/ui.cpp:1589
+#: src/emu/ui/ui.cpp:1539
msgid "Mode: FULL Emulation"
msgstr "Мод: ПОТПУÐÐ eмулациjа"
-#: src/emu/ui/ui.cpp:1590
+#: src/emu/ui/ui.cpp:1540
msgid "UI: Disabled"
msgstr "КориÑнички интeрфejÑ: онeÑпоÑобљeн"
-#: src/emu/ui/ui.cpp:1736
+#: src/emu/ui/ui.cpp:1686
msgid "Autofire can't be enabled"
msgstr "ÐутоматÑко пуцањe нe можe да Ñe омогући"
-#: src/emu/ui/ui.cpp:1775
+#: src/emu/ui/ui.cpp:1725
msgid "Select position to save to"
msgstr "Изабeритe позициjу на коjу жeлитe да Ñнимитe"
-#: src/emu/ui/ui.cpp:1777
+#: src/emu/ui/ui.cpp:1727
msgid "Select position to load from"
msgstr "Изабeритe позициjу Ñа коje жeлитe да учитатe"
-#: src/emu/ui/ui.cpp:1801
+#: src/emu/ui/ui.cpp:1751
msgid "Save cancelled"
msgstr "Чувањe Ñтања игрe отказано"
-#: src/emu/ui/ui.cpp:1803
+#: src/emu/ui/ui.cpp:1753
msgid "Load cancelled"
msgstr "Учитавањe Ñтања игрe отказано"
-#: src/emu/ui/ui.cpp:1846
+#: src/emu/ui/ui.cpp:1796
#, c-format
msgid "Save to position %s"
msgstr "Сачуваj на позициjу %s"
-#: src/emu/ui/ui.cpp:1851
+#: src/emu/ui/ui.cpp:1801
#, c-format
msgid "Load from position %s"
msgstr "Учитаj Ñа позициje %s"
-#: src/emu/ui/ui.cpp:1891
+#: src/emu/ui/ui.cpp:1841
#, c-format
msgid ""
"Are you sure you want to quit?\n"
@@ -1870,173 +1846,173 @@ msgstr ""
"ПритиÑнитe ''%s'' за напуштањe програма,\n"
"ПритиÑнитe ''%s'' за наÑтавак eмулациje."
-#: src/emu/ui/ui.cpp:1966
+#: src/emu/ui/ui.cpp:1916
msgid "Master Volume"
msgstr "Главна jачина звука"
-#: src/emu/ui/ui.cpp:1976
+#: src/emu/ui/ui.cpp:1926
#, c-format
msgid "%1$s Volume"
msgstr "%1$s jачина звука"
-#: src/emu/ui/ui.cpp:1998
+#: src/emu/ui/ui.cpp:1948
#, c-format
msgid "Overclock CPU %1$s"
msgstr "Убрзањe оÑновног такта ЦПУ %1$s"
-#: src/emu/ui/ui.cpp:2018
+#: src/emu/ui/ui.cpp:1968
#, c-format
msgid "%1$s Refresh Rate"
msgstr "%1$s Ñ„Ñ€eквeнциjа оÑвeжавања"
-#: src/emu/ui/ui.cpp:2024
+#: src/emu/ui/ui.cpp:1974
#, c-format
msgid "%1$s Brightness"
msgstr "%1$s оÑвeÑ‚Ñ™eноÑÑ‚"
-#: src/emu/ui/ui.cpp:2027
+#: src/emu/ui/ui.cpp:1977
#, c-format
msgid "%1$s Contrast"
msgstr "%1$s контраÑÑ‚"
-#: src/emu/ui/ui.cpp:2030
+#: src/emu/ui/ui.cpp:1980
#, c-format
msgid "%1$s Gamma"
msgstr "%1$s гамут"
-#: src/emu/ui/ui.cpp:2035
+#: src/emu/ui/ui.cpp:1985
#, c-format
msgid "%1$s Horiz Stretch"
msgstr "%1$s раÑÑ‚eзањe по хоризонтали"
-#: src/emu/ui/ui.cpp:2038
+#: src/emu/ui/ui.cpp:1988
#, c-format
msgid "%1$s Horiz Position"
msgstr "%1$s хоризонтална позициjа"
-#: src/emu/ui/ui.cpp:2041
+#: src/emu/ui/ui.cpp:1991
#, c-format
msgid "%1$s Vert Stretch"
msgstr "%1$s раÑÑ‚eзањe по вeртикали"
-#: src/emu/ui/ui.cpp:2044
+#: src/emu/ui/ui.cpp:1994
#, c-format
msgid "%1$s Vert Position"
msgstr "%1$s вeртикална позициjа"
-#: src/emu/ui/ui.cpp:2062
+#: src/emu/ui/ui.cpp:2012
#, c-format
msgid "Laserdisc '%1$s' Horiz Stretch"
msgstr "ЛаÑeрдиÑц '%1$s' раÑÑ‚eзањe по хоризонтали"
-#: src/emu/ui/ui.cpp:2065
+#: src/emu/ui/ui.cpp:2015
#, c-format
msgid "Laserdisc '%1$s' Horiz Position"
msgstr "ЛаÑeрдиÑц '%1$s' хоризонтална позициjа"
-#: src/emu/ui/ui.cpp:2068
+#: src/emu/ui/ui.cpp:2018
#, c-format
msgid "Laserdisc '%1$s' Vert Stretch"
msgstr "ЛаÑeрдиÑц '%1$s' раÑÑ‚eзањe по вeртикали"
-#: src/emu/ui/ui.cpp:2071
+#: src/emu/ui/ui.cpp:2021
#, c-format
msgid "Laserdisc '%1$s' Vert Position"
msgstr "ЛаÑeрдиÑц '%1$s' вeртикална позициjа"
-#: src/emu/ui/ui.cpp:2080
+#: src/emu/ui/ui.cpp:2030
msgid "Vector Flicker"
msgstr "Трeпeрeњe вeктора"
-#: 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 "ИнтeнзитeÑ‚ Ñнопа"
-#: src/emu/ui/ui.cpp:2098
+#: src/emu/ui/ui.cpp:2048
#, c-format
msgid "Crosshair Scale %1$s"
msgstr "Размeра нишана %1$s"
-#: 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 "Помeраj нишана %1$s"
-#: 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:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335
-#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401
-#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445
+#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219
+#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285
+#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351
+#: 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:2509
+#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443
+#: 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 "Екран '%1$s'"
-#: 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 "Размeра нишана КС %1$1.3f"
-#: src/emu/ui/ui.cpp:2543
+#: src/emu/ui/ui.cpp:2493
#, c-format
msgid "Crosshair Scale Y %1$1.3f"
msgstr "Размeра нишана И %1$1.3f"
-#: src/emu/ui/ui.cpp:2562
+#: src/emu/ui/ui.cpp:2512
#, c-format
msgid "Crosshair Offset X %1$1.3f"
msgstr "Помeраj нишана КС %1$1.3f"
-#: src/emu/ui/ui.cpp:2562
+#: src/emu/ui/ui.cpp:2512
#, c-format
msgid "Crosshair Offset Y %1$1.3f"
msgstr "Помeраj нишана И %1$1.3f"
@@ -2086,6 +2062,34 @@ msgstr " БОЈЕ"
msgid " PENS"
msgstr ""
+#~ 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 ""
+#~ "Употрeба eмулатора у вeзи Ñа РОМ-овима коje нe поÑeдуjeÑ‚e je забрањeна "
+#~ "законом о ауторÑким правима.\n"
+#~ "\n"
+#~ "ÐКО Ð’ÐÐœ ÐИЈЕ ДОЗВОЉЕÐО ЗÐКОÐОМ ДРИГРÐТЕ \"%1$s\" ÐРОВОМ ЕМУЛÐТОРУ, "
+#~ "ПРИТИСÐИТЕ ЕСЦ.\n"
+#~ "\n"
+#~ "У Ñупротном, откуцаjÑ‚e ОК или помeритe командну палицу (џоjÑтик) лeво, па "
+#~ "дeÑно да наÑтавитe"
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "Type OK or move the joystick left then right to continue"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "ОткуцаjÑ‚e ОК или помeритe командну палицу (џоjÑтик) лeво, па дeÑно да "
+#~ "наÑтавитe"
+
#~ msgid "Configure Machine"
#~ msgstr "Конфигурациjа машинe"
diff --git a/language/Slovak/strings.po b/language/Slovak/strings.po
index 153a321d95a..beeb13ab2a9 100644
--- a/language/Slovak/strings.po
+++ b/language/Slovak/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"
@@ -61,14 +61,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
@@ -644,11 +644,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
@@ -656,7 +656,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
@@ -664,55 +664,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 ""
@@ -1573,92 +1573,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
-#, 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
+#: src/emu/ui/ui.cpp:1060
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 "
@@ -1666,7 +1654,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 "
@@ -1674,21 +1662,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"
@@ -1698,98 +1686,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"
@@ -1798,173 +1786,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:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335
-#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401
-#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445
+#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219
+#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285
+#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351
+#: 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:2509
+#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443
+#: 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 ""
diff --git a/language/Slovenian/strings.po b/language/Slovenian/strings.po
index f866bd4c639..36c560beabd 100644
--- a/language/Slovenian/strings.po
+++ b/language/Slovenian/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
-#, 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
+#: src/emu/ui/ui.cpp:1060
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:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335
-#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401
-#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445
+#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219
+#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285
+#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351
+#: 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:2509
+#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443
+#: 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 ""
diff --git a/language/Spanish/strings.po b/language/Spanish/strings.po
index 899af9d5351..da444f4d2bd 100644
--- a/language/Spanish/strings.po
+++ b/language/Spanish/strings.po
@@ -9,7 +9,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-03-05 13:02+0100\n"
"Last-Translator: aviloria\n"
"Language-Team: Español; Castellano <>\n"
@@ -65,14 +65,14 @@ msgstr "Recargar todo"
msgid "Autofire Status"
msgstr "Estado del disparo automático"
-#: 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 "Desactivado"
-#: 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
@@ -650,11 +650,11 @@ msgstr "Esperar a la sincronización vertical"
msgid "Display Options"
msgstr "Ajustes visuales"
-#: src/emu/ui/filesel.cpp:159
+#: src/emu/ui/filesel.cpp:161
msgid "File Already Exists - Override?"
msgstr "El archivo ya existe ¿Quieres sobreescribirlo?"
-#: 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
@@ -662,7 +662,7 @@ msgstr "El archivo ya existe ¿Quieres sobreescribirlo?"
msgid "No"
msgstr "No"
-#: 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
@@ -670,55 +670,55 @@ msgstr "No"
msgid "Yes"
msgstr "Sí"
-#: src/emu/ui/filesel.cpp:271
+#: src/emu/ui/filesel.cpp:275
msgid "New Image Name:"
msgstr "Nuevo nombre de imagen:"
-#: src/emu/ui/filesel.cpp:277
+#: src/emu/ui/filesel.cpp:281
msgid "Image Format:"
msgstr "Formato de imagen:"
-#: src/emu/ui/filesel.cpp:283
+#: src/emu/ui/filesel.cpp:287
msgid "Create"
msgstr "Crear"
-#: src/emu/ui/filesel.cpp:314
+#: src/emu/ui/filesel.cpp:318
msgid "Please enter a file extension too"
msgstr "Por favor, introduzca también la extensión del fichero"
-#: 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 "[ranura vacía]"
-#: src/emu/ui/filesel.cpp:506
+#: src/emu/ui/filesel.cpp:510
msgid "[create]"
msgstr "[crear]"
-#: 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 "[lista de software]"
-#: src/emu/ui/filesel.cpp:802
+#: src/emu/ui/filesel.cpp:806
msgid "Select image format"
msgstr "Elige el formato de imagen"
-#: src/emu/ui/filesel.cpp:862
+#: src/emu/ui/filesel.cpp:866
msgid "Select access mode"
msgstr "Elige el modo de acceso"
-#: src/emu/ui/filesel.cpp:863
+#: src/emu/ui/filesel.cpp:867
msgid "Read-only"
msgstr "Sólo lectura"
-#: src/emu/ui/filesel.cpp:865
+#: src/emu/ui/filesel.cpp:869
msgid "Read-write"
msgstr "Lectura y escritura"
-#: src/emu/ui/filesel.cpp:866
+#: src/emu/ui/filesel.cpp:870
msgid "Read this image, write to another image"
msgstr "Leer esta imagen, escribir en otra imagen"
-#: src/emu/ui/filesel.cpp:867
+#: src/emu/ui/filesel.cpp:871
msgid "Read this image, write to diff"
msgstr "Leer esta imagen, escribir en diferencial"
@@ -1610,31 +1610,13 @@ msgstr "Rebobinar"
msgid "Fast Forward"
msgstr "Avance rápido"
-#: 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 ""
"Este controlador necesita que se carguen imágenes en los siguientes "
"dispositivos: "
-#: src/emu/ui/ui.cpp:1043
-#, 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 ""
-"El uso de emuladores junto con ROMs que no poseas legalmente está prohibido "
-"por las leyes de propiedad intelectual.\n"
-"\n"
-"SI NO TIENES PERMISO PARA JUGAR A «%1$s» PULSA ESC.\n"
-"\n"
-"De lo contrario escribe OK o mueve el joystick de izquierda a derecha."
-
-#: src/emu/ui/ui.cpp:1081
+#: src/emu/ui/ui.cpp:1060
msgid ""
"One or more ROMs/CHDs for this machine are incorrect. The machine may not "
"run correctly.\n"
@@ -1642,7 +1624,7 @@ msgstr ""
"Uno o más ROMs/CHDs de esta máquina son incorrectos. La máquina podría no "
"funcionar correctamente.\n"
-#: src/emu/ui/ui.cpp:1094
+#: src/emu/ui/ui.cpp:1073
msgid ""
"There are known problems with this machine\n"
"\n"
@@ -1650,48 +1632,48 @@ msgstr ""
"Existen problemas conocidos con esta máquina\n"
"\n"
-#: 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 "Uno o más ROMs/CHDs de esta máquina no se han volcado correctamente.\n"
-#: 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 "La emulación del teclado puede no ser del todo precisa.\n"
-#: src/emu/ui/ui.cpp:1104
+#: src/emu/ui/ui.cpp:1083
#, c-format
msgid "The colors aren't 100% accurate.\n"
msgstr "Los colores no son del todo precisos.\n"
-#: src/emu/ui/ui.cpp:1106
+#: src/emu/ui/ui.cpp:1085
msgid "The colors are completely wrong.\n"
msgstr "Los colores son completamente erróneos.\n"
-#: src/emu/ui/ui.cpp:1108
+#: src/emu/ui/ui.cpp:1087
#, c-format
msgid "The video emulation isn't 100% accurate.\n"
msgstr "La emulación de vídeo no es del todo precisa.\n"
-#: src/emu/ui/ui.cpp:1110
+#: src/emu/ui/ui.cpp:1089
#, c-format
msgid "The sound emulation isn't 100% accurate.\n"
msgstr "La emulación de sonido no es del todo precisa.\n"
-#: src/emu/ui/ui.cpp:1112
+#: src/emu/ui/ui.cpp:1091
msgid "The machine lacks sound.\n"
msgstr "A esta máquina le falta el sonido.\n"
-#: src/emu/ui/ui.cpp:1115
+#: src/emu/ui/ui.cpp:1094
msgid "Screen flipping in cocktail mode is not supported.\n"
msgstr "Voltear la pantalla en modo cóctel no está soportado.\n"
-#: src/emu/ui/ui.cpp:1119
+#: src/emu/ui/ui.cpp:1098
msgid "The machine requires external artwork files\n"
msgstr "La máquina requiere ficheros de arte externos\n"
-#: 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"
@@ -1699,7 +1681,7 @@ msgstr ""
"Esta máquina nunca se terminó. Podría comportarse de forma extraña o mostrar "
"signos de mal funcionamiento que en ningún caso son defectos de emulación.\n"
-#: 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"
@@ -1707,11 +1689,11 @@ msgstr ""
"Esta máquina no soporta sonido, por lo que MAME no reproducirá audio, este "
"es el comportamiento esperado.\n"
-#: src/emu/ui/ui.cpp:1137
+#: src/emu/ui/ui.cpp:1116
msgid "The machine has protection which isn't fully emulated.\n"
msgstr "La máquina todavía no emula completamente el sistema de protección.\n"
-#: 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 "
@@ -1722,7 +1704,7 @@ msgstr ""
"completada. No hay nada que se pueda hacer para arreglar el problema salvo "
"esperar a que los desarrolladores mejoren la emulación.\n"
-#: 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 "
@@ -1733,7 +1715,7 @@ msgstr ""
"una interacción física o se basan en dispositivos mecánicos. Por lo que no "
"esposible reproducir completamente el funcionamiento de la máquina.\n"
-#: src/emu/ui/ui.cpp:1163
+#: src/emu/ui/ui.cpp:1142
msgid ""
"\n"
"\n"
@@ -1743,17 +1725,14 @@ msgstr ""
"\n"
"Existen clones funcionales de esta máquina: "
-#: 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 ""
-"\n"
-"\n"
-"Teclea OK o mueve el joystick de izquierda a derecha para continuar"
-#: src/emu/ui/ui.cpp:1192
+#: src/emu/ui/ui.cpp:1171
#, c-format
msgid ""
"%1$s\n"
@@ -1768,15 +1747,15 @@ msgstr ""
"\n"
"Procesador:\n"
-#: 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 "MHz"
-#: 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 "kHz"
-#: src/emu/ui/ui.cpp:1242
+#: src/emu/ui/ui.cpp:1221
msgid ""
"\n"
"Sound:\n"
@@ -1784,7 +1763,7 @@ msgstr ""
"\n"
"Sonido:\n"
-#: src/emu/ui/ui.cpp:1271
+#: src/emu/ui/ui.cpp:1250
msgid ""
"\n"
"Video:\n"
@@ -1792,78 +1771,78 @@ msgstr ""
"\n"
"Vídeo:\n"
-#: src/emu/ui/ui.cpp:1275
+#: src/emu/ui/ui.cpp:1254
msgid "None\n"
msgstr "Ninguno\n"
-#: src/emu/ui/ui.cpp:1282
+#: src/emu/ui/ui.cpp:1261
msgid "Vector"
msgstr "Vector"
-#: src/emu/ui/ui.cpp:1293
+#: src/emu/ui/ui.cpp:1272
#, c-format
msgid "%1$s: %2$s\n"
msgstr "%1$s: %2$s\n"
-#: src/emu/ui/ui.cpp:1293
+#: src/emu/ui/ui.cpp:1272
msgid "%2$s\n"
msgstr "%2$s\n"
-#: 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 "Estado de la emulación del teclado"
-#: src/emu/ui/ui.cpp:1579
+#: src/emu/ui/ui.cpp:1529
msgid "Mode: PARTIAL Emulation"
msgstr "Modo: Emulación PARCIAL"
-#: src/emu/ui/ui.cpp:1580
+#: src/emu/ui/ui.cpp:1530
msgid "UI: Enabled"
msgstr "Interfaz: Activada"
-#: 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 "**Utiliza ScrLock para activar y desactivar**"
-#: src/emu/ui/ui.cpp:1589
+#: src/emu/ui/ui.cpp:1539
msgid "Mode: FULL Emulation"
msgstr "Modo: Emulación COMPLETA"
-#: src/emu/ui/ui.cpp:1590
+#: src/emu/ui/ui.cpp:1540
msgid "UI: Disabled"
msgstr "Interfaz: Desactivada"
-#: src/emu/ui/ui.cpp:1736
+#: src/emu/ui/ui.cpp:1686
msgid "Autofire can't be enabled"
msgstr "No se puede activar el disparo automático"
-#: src/emu/ui/ui.cpp:1775
+#: src/emu/ui/ui.cpp:1725
msgid "Select position to save to"
msgstr "Selecciona la posición a la que guardar"
-#: src/emu/ui/ui.cpp:1777
+#: src/emu/ui/ui.cpp:1727
msgid "Select position to load from"
msgstr "Selecciona la posición desde la que cargar"
-#: src/emu/ui/ui.cpp:1801
+#: src/emu/ui/ui.cpp:1751
msgid "Save cancelled"
msgstr "Guardado cancelado"
-#: src/emu/ui/ui.cpp:1803
+#: src/emu/ui/ui.cpp:1753
msgid "Load cancelled"
msgstr "Lectura cancelada"
-#: src/emu/ui/ui.cpp:1846
+#: src/emu/ui/ui.cpp:1796
#, c-format
msgid "Save to position %s"
msgstr "Guardar en posición %s"
-#: src/emu/ui/ui.cpp:1851
+#: src/emu/ui/ui.cpp:1801
#, c-format
msgid "Load from position %s"
msgstr "Lectura desde posición %s"
-#: src/emu/ui/ui.cpp:1891
+#: src/emu/ui/ui.cpp:1841
#, c-format
msgid ""
"Are you sure you want to quit?\n"
@@ -1876,173 +1855,173 @@ msgstr ""
"Presiona «%1$s» para salir,\n"
"Presiona «%2$s» para volver al emulador."
-#: src/emu/ui/ui.cpp:1966
+#: src/emu/ui/ui.cpp:1916
msgid "Master Volume"
msgstr "Volumen principal"
-#: src/emu/ui/ui.cpp:1976
+#: src/emu/ui/ui.cpp:1926
#, c-format
msgid "%1$s Volume"
msgstr "Volumen %1$s"
-#: src/emu/ui/ui.cpp:1998
+#: src/emu/ui/ui.cpp:1948
#, c-format
msgid "Overclock CPU %1$s"
msgstr "Acelerar CPU %1$s"
-#: src/emu/ui/ui.cpp:2018
+#: src/emu/ui/ui.cpp:1968
#, c-format
msgid "%1$s Refresh Rate"
msgstr "Tasa de refresco %1$s"
-#: src/emu/ui/ui.cpp:2024
+#: src/emu/ui/ui.cpp:1974
#, c-format
msgid "%1$s Brightness"
msgstr "Brillo %1$s"
-#: src/emu/ui/ui.cpp:2027
+#: src/emu/ui/ui.cpp:1977
#, c-format
msgid "%1$s Contrast"
msgstr "Contraste %1$s"
-#: src/emu/ui/ui.cpp:2030
+#: src/emu/ui/ui.cpp:1980
#, c-format
msgid "%1$s Gamma"
msgstr "Gamma %1$s"
-#: src/emu/ui/ui.cpp:2035
+#: src/emu/ui/ui.cpp:1985
#, c-format
msgid "%1$s Horiz Stretch"
msgstr "Estiramiento horizontal %1$s"
-#: src/emu/ui/ui.cpp:2038
+#: src/emu/ui/ui.cpp:1988
#, c-format
msgid "%1$s Horiz Position"
msgstr "Posición horizontal %1$s"
-#: src/emu/ui/ui.cpp:2041
+#: src/emu/ui/ui.cpp:1991
#, c-format
msgid "%1$s Vert Stretch"
msgstr "Estiramiento vertical %1$s"
-#: src/emu/ui/ui.cpp:2044
+#: src/emu/ui/ui.cpp:1994
#, c-format
msgid "%1$s Vert Position"
msgstr "Posición vertical %1$s"
-#: src/emu/ui/ui.cpp:2062
+#: src/emu/ui/ui.cpp:2012
#, c-format
msgid "Laserdisc '%1$s' Horiz Stretch"
msgstr "Estiramiento horizontal de Laserdisc «%1$s»"
-#: src/emu/ui/ui.cpp:2065
+#: src/emu/ui/ui.cpp:2015
#, c-format
msgid "Laserdisc '%1$s' Horiz Position"
msgstr "Posición horizontal de Laserdisc «%1$s»"
-#: src/emu/ui/ui.cpp:2068
+#: src/emu/ui/ui.cpp:2018
#, c-format
msgid "Laserdisc '%1$s' Vert Stretch"
msgstr "Estiramiento vertical de Laserdisc «%1$s»"
-#: src/emu/ui/ui.cpp:2071
+#: src/emu/ui/ui.cpp:2021
#, c-format
msgid "Laserdisc '%1$s' Vert Position"
msgstr "Posición vertical de Laserdisc «%1$s»"
-#: src/emu/ui/ui.cpp:2080
+#: src/emu/ui/ui.cpp:2030
msgid "Vector Flicker"
msgstr "Vector de parpadeo"
-#: src/emu/ui/ui.cpp:2082
+#: src/emu/ui/ui.cpp:2032
msgid "Beam Width Minimum"
msgstr "Anchura mín. del haz"
-#: src/emu/ui/ui.cpp:2084
+#: src/emu/ui/ui.cpp:2034
msgid "Beam Width Maximum"
msgstr "Anchura max. del haz"
-#: src/emu/ui/ui.cpp:2086
+#: src/emu/ui/ui.cpp:2036
msgid "Beam Intensity Weight"
msgstr "Peso de intensidad del haz"
-#: src/emu/ui/ui.cpp:2098
+#: src/emu/ui/ui.cpp:2048
#, c-format
msgid "Crosshair Scale %1$s"
msgstr "Escala de diana %1$s"
-#: 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 "Horizontal"
-#: 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 "Vertical"
-#: src/emu/ui/ui.cpp:2101
+#: src/emu/ui/ui.cpp:2051
#, c-format
msgid "Crosshair Offset %1$s"
msgstr "Posición de diana %1$s"
-#: src/emu/ui/ui.cpp:2120
+#: src/emu/ui/ui.cpp:2070
#, c-format
msgid "%1$3ddB"
msgstr "%1$3ddB"
-#: src/emu/ui/ui.cpp:2164
+#: src/emu/ui/ui.cpp:2114
#, c-format
msgid "%1$d%%"
msgstr "%1$d%%"
-#: src/emu/ui/ui.cpp:2180
+#: src/emu/ui/ui.cpp:2130
#, c-format
msgid "%1$3.0f%%"
msgstr "%1$3.0f%%"
-#: src/emu/ui/ui.cpp:2203
+#: src/emu/ui/ui.cpp:2153
#, c-format
msgid "%1$.3ffps"
msgstr "%1$.3ffps"
-#: src/emu/ui/ui.cpp:2226 src/emu/ui/ui.cpp:2248 src/emu/ui/ui.cpp:2269
-#: src/emu/ui/ui.cpp:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335
-#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401
-#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445
+#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219
+#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285
+#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351
+#: src/emu/ui/ui.cpp:2373 src/emu/ui/ui.cpp:2395
#, c-format
msgid "%1$.3f"
msgstr "%1$.3f"
-#: src/emu/ui/ui.cpp:2461 src/emu/ui/ui.cpp:2477 src/emu/ui/ui.cpp:2493
-#: src/emu/ui/ui.cpp:2509
+#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443
+#: src/emu/ui/ui.cpp:2459
#, c-format
msgid "%1$1.2f"
msgstr "%1$1.2f"
-#: src/emu/ui/ui.cpp:2525
+#: src/emu/ui/ui.cpp:2475
#, c-format
msgid "Screen '%1$s'"
msgstr "Pantalla «%1$s»"
-#: src/emu/ui/ui.cpp:2527
+#: src/emu/ui/ui.cpp:2477
msgid "Screen"
msgstr "Pantalla"
-#: src/emu/ui/ui.cpp:2543
+#: src/emu/ui/ui.cpp:2493
#, c-format
msgid "Crosshair Scale X %1$1.3f"
msgstr "Escala horizontal de diana %1$1.3f"
-#: src/emu/ui/ui.cpp:2543
+#: src/emu/ui/ui.cpp:2493
#, c-format
msgid "Crosshair Scale Y %1$1.3f"
msgstr "Escala vertical de diana %1$1.3f"
-#: src/emu/ui/ui.cpp:2562
+#: src/emu/ui/ui.cpp:2512
#, c-format
msgid "Crosshair Offset X %1$1.3f"
msgstr "Posición horizontal de diana %1$1.3f"
-#: src/emu/ui/ui.cpp:2562
+#: src/emu/ui/ui.cpp:2512
#, c-format
msgid "Crosshair Offset Y %1$1.3f"
msgstr "Posición vertical de diana %1$1.3f"
@@ -2092,6 +2071,31 @@ msgstr " COLORES"
msgid " PENS"
msgstr " PLUMAS"
+#~ 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 ""
+#~ "El uso de emuladores junto con ROMs que no poseas legalmente está "
+#~ "prohibido por las leyes de propiedad intelectual.\n"
+#~ "\n"
+#~ "SI NO TIENES PERMISO PARA JUGAR A «%1$s» PULSA ESC.\n"
+#~ "\n"
+#~ "De lo contrario escribe OK o mueve el joystick de izquierda a derecha."
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "Type OK or move the joystick left then right to continue"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "Teclea OK o mueve el joystick de izquierda a derecha para continuar"
+
#~ msgid "Configure Machine"
#~ msgstr "Configurar máquina"
diff --git a/language/Spanish_Mexico/strings.po b/language/Spanish_Mexico/strings.po
index 733643c7ab2..73ab0238885 100644
--- a/language/Spanish_Mexico/strings.po
+++ b/language/Spanish_Mexico/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"
@@ -61,14 +61,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
@@ -644,11 +644,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
@@ -656,7 +656,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
@@ -664,55 +664,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 ""
@@ -1573,92 +1573,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
-#, 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
+#: src/emu/ui/ui.cpp:1060
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 "
@@ -1666,7 +1654,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 "
@@ -1674,21 +1662,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"
@@ -1698,98 +1686,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"
@@ -1798,173 +1786,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:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335
-#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401
-#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445
+#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219
+#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285
+#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351
+#: 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:2509
+#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443
+#: 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 ""
diff --git a/language/Swedish/strings.po b/language/Swedish/strings.po
index 31028db6ecc..a7d5f498e7b 100644
--- a/language/Swedish/strings.po
+++ b/language/Swedish/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"
@@ -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
-#, 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
+#: src/emu/ui/ui.cpp:1060
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:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335
-#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401
-#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445
+#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219
+#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285
+#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351
+#: 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:2509
+#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443
+#: 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 ""
diff --git a/language/Thai/strings.po b/language/Thai/strings.po
index 1d263f063d0..3509e49e298 100644
--- a/language/Thai/strings.po
+++ b/language/Thai/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
-#, 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
+#: src/emu/ui/ui.cpp:1060
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:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335
-#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401
-#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445
+#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219
+#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285
+#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351
+#: 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:2509
+#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443
+#: 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 ""
diff --git a/language/Turkish/strings.po b/language/Turkish/strings.po
index 49a0a85c978..49b2461f3ad 100644
--- a/language/Turkish/strings.po
+++ b/language/Turkish/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"
@@ -61,14 +61,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
@@ -644,11 +644,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
@@ -656,7 +656,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
@@ -664,55 +664,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 ""
@@ -1573,92 +1573,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
-#, 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
+#: src/emu/ui/ui.cpp:1060
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 "
@@ -1666,7 +1654,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 "
@@ -1674,21 +1662,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"
@@ -1698,98 +1686,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"
@@ -1798,173 +1786,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:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335
-#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401
-#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445
+#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219
+#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285
+#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351
+#: 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:2509
+#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443
+#: 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 ""
diff --git a/language/Ukrainian/strings.po b/language/Ukrainian/strings.po
index 0279b671f62..dc8ff9c6003 100644
--- a/language/Ukrainian/strings.po
+++ b/language/Ukrainian/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"
@@ -61,14 +61,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
@@ -644,11 +644,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
@@ -656,7 +656,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
@@ -664,55 +664,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 ""
@@ -1573,92 +1573,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
-#, 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
+#: src/emu/ui/ui.cpp:1060
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 "
@@ -1666,7 +1654,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 "
@@ -1674,21 +1662,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"
@@ -1698,98 +1686,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"
@@ -1798,173 +1786,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:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335
-#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401
-#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445
+#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219
+#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285
+#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351
+#: 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:2509
+#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443
+#: 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 ""
diff --git a/language/Vietnamese/strings.po b/language/Vietnamese/strings.po
index 6b33b5d6c63..9d158d320df 100644
--- a/language/Vietnamese/strings.po
+++ b/language/Vietnamese/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"
@@ -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
-#, 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
+#: src/emu/ui/ui.cpp:1060
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:2291 src/emu/ui/ui.cpp:2313 src/emu/ui/ui.cpp:2335
-#: src/emu/ui/ui.cpp:2357 src/emu/ui/ui.cpp:2379 src/emu/ui/ui.cpp:2401
-#: src/emu/ui/ui.cpp:2423 src/emu/ui/ui.cpp:2445
+#: src/emu/ui/ui.cpp:2176 src/emu/ui/ui.cpp:2198 src/emu/ui/ui.cpp:2219
+#: src/emu/ui/ui.cpp:2241 src/emu/ui/ui.cpp:2263 src/emu/ui/ui.cpp:2285
+#: src/emu/ui/ui.cpp:2307 src/emu/ui/ui.cpp:2329 src/emu/ui/ui.cpp:2351
+#: 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:2509
+#: src/emu/ui/ui.cpp:2411 src/emu/ui/ui.cpp:2427 src/emu/ui/ui.cpp:2443
+#: 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 ""
diff --git a/makefile b/makefile
index 31782fa36fe..29eb6c018cc 100644
--- a/makefile
+++ b/makefile
@@ -273,6 +273,9 @@ endif
endif
ifeq ($(OS),windows)
+ifndef MINGW64
+ARCHITECTURE := _x86
+endif
ifeq ($(ARCHITECTURE),_x64)
WINDRES := $(MINGW64)/bin/windres
else
@@ -975,145 +978,145 @@ endif
# android-arm
#-------------------------------------------------
-$(PROJECTDIR_MINI)/gmake-android-arm/Makefile: makefile $(SCRIPTS) $(GENIE)
+$(PROJECTDIR_SDL)/gmake-android-arm/Makefile: makefile $(SCRIPTS) $(GENIE)
ifndef ANDROID_NDK_ARM
$(error ANDROID_NDK_ARM is not set)
endif
ifndef ANDROID_NDK_ROOT
$(error ANDROID_NDK_ROOT is not set)
endif
- $(SILENT) $(GENIE) $(PARAMS) --gcc=android-arm --gcc_version=3.8.0 --osd=osdmini --targetos=android-arm --targetos=android --PLATFORM=arm --NOASM=1 gmake
+ $(SILENT) $(GENIE) $(PARAMS) --gcc=android-arm --gcc_version=3.8.0 --osd=sdl --targetos=android --PLATFORM=arm --NO_USE_MIDI=1 --NO_OPENGL=1 --USE_QTDEBUG=0 --NO_X11=1 --DONT_USE_NETWORK=1 --NOASM=1 gmake
.PHONY: android-arm
-android-arm: generate $(PROJECTDIR_MINI)/gmake-android-arm/Makefile
+android-arm: generate $(PROJECTDIR_SDL)/gmake-android-arm/Makefile
ifndef ANDROID_NDK_ARM
$(error ANDROID_NDK_ARM is not set)
endif
ifndef ANDROID_NDK_ROOT
$(error ANDROID_NDK_ROOT is not set)
endif
- $(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR_MINI)/gmake-android-arm config=$(CONFIG) precompile
- $(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR_MINI)/gmake-android-arm config=$(CONFIG)
+ $(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR_SDL)/gmake-android-arm config=$(CONFIG) precompile
+ $(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR_SDL)/gmake-android-arm config=$(CONFIG)
#-------------------------------------------------
# android-arm64
#-------------------------------------------------
-$(PROJECTDIR_MINI)/gmake-android-arm64/Makefile: makefile $(SCRIPTS) $(GENIE)
+$(PROJECTDIR_SDL)/gmake-android-arm64/Makefile: makefile $(SCRIPTS) $(GENIE)
ifndef ANDROID_NDK_ARM64
$(error ANDROID_NDK_ARM64 is not set)
endif
ifndef ANDROID_NDK_ROOT
$(error ANDROID_NDK_ROOT is not set)
endif
- $(SILENT) $(GENIE) $(PARAMS) --gcc=android-arm64 --gcc_version=3.8.0 --osd=osdmini --targetos=android-arm64 --targetos=android --PLATFORM=arm64 --NOASM=1 gmake
+ $(SILENT) $(GENIE) $(PARAMS) --gcc=android-arm64 --gcc_version=3.8.0 --osd=sdl --targetos=android --PLATFORM=arm64 --NO_USE_MIDI=1 --NO_OPENGL=1 --USE_QTDEBUG=0 --NO_X11=1 --DONT_USE_NETWORK=1 --NOASM=1 gmake
.PHONY: android-arm64
-android-arm64: generate $(PROJECTDIR_MINI)/gmake-android-arm64/Makefile
+android-arm64: generate $(PROJECTDIR_SDL)/gmake-android-arm64/Makefile
ifndef ANDROID_NDK_ARM64
$(error ANDROID_NDK_ARM64 is not set)
endif
ifndef ANDROID_NDK_ROOT
$(error ANDROID_NDK_ROOT is not set)
endif
- $(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR_MINI)/gmake-android-arm64 config=$(CONFIG) precompile
- $(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR_MINI)/gmake-android-arm64 config=$(CONFIG)
+ $(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR_SDL)/gmake-android-arm64 config=$(CONFIG) precompile
+ $(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR_SDL)/gmake-android-arm64 config=$(CONFIG)
#-------------------------------------------------
# android-mips
#-------------------------------------------------
-$(PROJECTDIR_MINI)/gmake-android-mips/Makefile: makefile $(SCRIPTS) $(GENIE)
+$(PROJECTDIR_SDL)/gmake-android-mips/Makefile: makefile $(SCRIPTS) $(GENIE)
ifndef ANDROID_NDK_MIPS
$(error ANDROID_NDK_MIPS is not set)
endif
ifndef ANDROID_NDK_ROOT
$(error ANDROID_NDK_ROOT is not set)
endif
- $(SILENT) $(GENIE) $(PARAMS) --gcc=android-mips --gcc_version=3.8.0 --osd=osdmini --targetos=android-mips --targetos=android --PLATFORM=mips --NOASM=1 gmake
+ $(SILENT) $(GENIE) $(PARAMS) --gcc=android-mips --gcc_version=3.8.0 --osd=sdl --targetos=android --PLATFORM=mips --NO_USE_MIDI=1 --NO_OPENGL=1 --USE_QTDEBUG=0 --NO_X11=1 --DONT_USE_NETWORK=1 --NOASM=1 gmake
.PHONY: android-mips
-android-mips: generate $(PROJECTDIR_MINI)/gmake-android-mips/Makefile
+android-mips: generate $(PROJECTDIR_SDL)/gmake-android-mips/Makefile
ifndef ANDROID_NDK_MIPS
$(error ANDROID_NDK_MIPS is not set)
endif
ifndef ANDROID_NDK_ROOT
$(error ANDROID_NDK_ROOT is not set)
endif
- $(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR_MINI)/gmake-android-mips config=$(CONFIG) precompile
- $(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR_MINI)/gmake-android-mips config=$(CONFIG)
+ $(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR_SDL)/gmake-android-mips config=$(CONFIG) precompile
+ $(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR_SDL)/gmake-android-mips config=$(CONFIG)
#-------------------------------------------------
# android-mips64
#-------------------------------------------------
-$(PROJECTDIR_MINI)/gmake-android-mips64/Makefile: makefile $(SCRIPTS) $(GENIE)
+$(PROJECTDIR_SDL)/gmake-android-mips64/Makefile: makefile $(SCRIPTS) $(GENIE)
ifndef ANDROID_NDK_MIPS64
$(error ANDROID_NDK_MIPS64 is not set)
endif
ifndef ANDROID_NDK_ROOT
$(error ANDROID_NDK_ROOT is not set)
endif
- $(SILENT) $(GENIE) $(PARAMS) --gcc=android-mips64 --gcc_version=3.8.0 --osd=osdmini --targetos=android-mips64 --targetos=android --PLATFORM=mips64 --NOASM=1 gmake
+ $(SILENT) $(GENIE) $(PARAMS) --gcc=android-mips64 --gcc_version=3.8.0 --osd=sdl --targetos=android --PLATFORM=mips64 --NO_USE_MIDI=1 --NO_OPENGL=1 --USE_QTDEBUG=0 --NO_X11=1 --DONT_USE_NETWORK=1 --NOASM=1 gmake
.PHONY: android-mips64
-android-mips64: generate $(PROJECTDIR_MINI)/gmake-android-mips64/Makefile
+android-mips64: generate $(PROJECTDIR_SDL)/gmake-android-mips64/Makefile
ifndef ANDROID_NDK_MIPS64
$(error ANDROID_NDK_MIPS64 is not set)
endif
ifndef ANDROID_NDK_ROOT
$(error ANDROID_NDK_ROOT is not set)
endif
- $(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR_MINI)/gmake-android-mips64 config=$(CONFIG) precompile
- $(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR_MINI)/gmake-android-mips64 config=$(CONFIG)
+ $(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR_SDL)/gmake-android-mips64 config=$(CONFIG) precompile
+ $(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR_SDL)/gmake-android-mips64 config=$(CONFIG)
#-------------------------------------------------
# android-x86
#-------------------------------------------------
-$(PROJECTDIR_MINI)/gmake-android-x86/Makefile: makefile $(SCRIPTS) $(GENIE)
+$(PROJECTDIR_SDL)/gmake-android-x86/Makefile: makefile $(SCRIPTS) $(GENIE)
ifndef ANDROID_NDK_X86
$(error ANDROID_NDK_X86 is not set)
endif
ifndef ANDROID_NDK_ROOT
$(error ANDROID_NDK_ROOT is not set)
endif
- $(SILENT) $(GENIE) $(PARAMS) --gcc=android-x86 --gcc_version=3.8.0 --osd=osdmini --targetos=android-x86 --targetos=android --PLATFORM=x86 gmake
+ $(SILENT) $(GENIE) $(PARAMS) --gcc=android-x86 --gcc_version=3.8.0 --osd=sdl --targetos=android --PLATFORM=x86 --NO_USE_MIDI=1 --NO_OPENGL=1 --USE_QTDEBUG=0 --NO_X11=1 --DONT_USE_NETWORK=1 gmake
.PHONY: android-x86
-android-x86: generate $(PROJECTDIR_MINI)/gmake-android-x86/Makefile
+android-x86: generate $(PROJECTDIR_SDL)/gmake-android-x86/Makefile
ifndef ANDROID_NDK_X86
$(error ANDROID_NDK_X86 is not set)
endif
ifndef ANDROID_NDK_ROOT
$(error ANDROID_NDK_ROOT is not set)
endif
- $(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR_MINI)/gmake-android-x86 config=$(CONFIG) precompile
- $(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR_MINI)/gmake-android-x86 config=$(CONFIG)
+ $(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR_SDL)/gmake-android-x86 config=$(CONFIG) precompile
+ $(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR_SDL)/gmake-android-x86 config=$(CONFIG)
#-------------------------------------------------
# android-x64
#-------------------------------------------------
-$(PROJECTDIR_MINI)/gmake-android-x64/Makefile: makefile $(SCRIPTS) $(GENIE)
+$(PROJECTDIR_SDL)/gmake-android-x64/Makefile: makefile $(SCRIPTS) $(GENIE)
ifndef ANDROID_NDK_X64
$(error ANDROID_NDK_X64 is not set)
endif
ifndef ANDROID_NDK_ROOT
$(error ANDROID_NDK_ROOT is not set)
endif
- $(SILENT) $(GENIE) $(PARAMS) --gcc=android-x64 --gcc_version=3.8.0 --osd=osdmini --targetos=android-x64 --targetos=android --PLATFORM=x64 gmake
+ $(SILENT) $(GENIE) $(PARAMS) --gcc=android-x64 --gcc_version=3.8.0 --osd=sdl --targetos=android --PLATFORM=x64 --NO_USE_MIDI=1 --NO_OPENGL=1 --USE_QTDEBUG=0 --NO_X11=1 --DONT_USE_NETWORK=1 gmake
.PHONY: android-x64
-android-x64: generate $(PROJECTDIR_MINI)/gmake-android-x64/Makefile
+android-x64: generate $(PROJECTDIR_SDL)/gmake-android-x64/Makefile
ifndef ANDROID_NDK_X64
$(error ANDROID_NDK_X64 is not set)
endif
ifndef ANDROID_NDK_ROOT
$(error ANDROID_NDK_ROOT is not set)
endif
- $(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR_MINI)/gmake-android-x64 config=$(CONFIG) precompile
- $(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR_MINI)/gmake-android-x64 config=$(CONFIG)
+ $(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR_SDL)/gmake-android-x64 config=$(CONFIG) precompile
+ $(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR_SDL)/gmake-android-x64 config=$(CONFIG)
#-------------------------------------------------
# asmjs / Emscripten
diff --git a/nl_examples/kidniki.c b/nl_examples/kidniki.c
index ba53fb3867b..603d2064f8d 100644
--- a/nl_examples/kidniki.c
+++ b/nl_examples/kidniki.c
@@ -8,15 +8,22 @@
#define USE_FIXED_STV 1
NETLIST_START(dummy)
-#if (USE_FRONTIERS)
+#if (1 || USE_FRONTIERS)
SOLVER(Solver, 18000)
PARAM(Solver.ACCURACY, 1e-8)
PARAM(Solver.NR_LOOPS, 300)
PARAM(Solver.GS_LOOPS, 1)
PARAM(Solver.GS_THRESHOLD, 6)
- PARAM(Solver.ITERATIVE, "SOR")
+ //PARAM(Solver.ITERATIVE, "SM")
+ PARAM(Solver.ITERATIVE, "MAT")
+ //PARAM(Solver.ITERATIVE, "GMRES")
+ //PARAM(Solver.ITERATIVE, "SOR")
+ PARAM(Solver.DYNAMIC_TS, 0)
+ PARAM(Solver.DYNAMIC_LTE, 5e-3)
+ PARAM(Solver.MIN_TIMESTEP, 10e-6)
PARAM(Solver.PARALLEL, 0)
PARAM(Solver.SOR_FACTOR, 1.00)
+ PARAM(Solver.PIVOT, 0)
#else
SOLVER(Solver, 12000)
PARAM(Solver.ACCURACY, 1e-8)
@@ -45,14 +52,15 @@ NETLIST_START(dummy)
//ANALOG_INPUT(I_V0, 0)
ALIAS(I_V0.Q, GND)
#if 0
- ANALOG_INPUT(I_SD0, 0)
- ANALOG_INPUT(I_BD0, 0)
- ANALOG_INPUT(I_CH0, 0)
- ANALOG_INPUT(I_OH0, 0)
- ANALOG_INPUT(I_SOUNDIC0, 0)
- ANALOG_INPUT(I_OKI0, 0)
- ANALOG_INPUT(I_SOUND0, 0)
- ANALOG_INPUT(I_SINH0, 0)
+ TTL_INPUT(I_SD0, 0)
+ TTL_INPUT(I_BD0, 0)
+ TTL_INPUT(I_CH0, 0)
+ TTL_INPUT(I_OH0, 0)
+ TTL_INPUT(I_SOUNDIC0, 0)
+ ANALOG_INPUT(I_MSM2K0, 0)
+ ANALOG_INPUT(I_MSM3K0, 0)
+ TTL_INPUT(I_SOUND0, 0)
+ TTL_INPUT(I_SINH0, 0)
#else
TTL_INPUT(I_SD0, 1)
//CLOCK(I_SD0, 5)
diff --git a/plugins/hiscore/hiscore.dat b/plugins/hiscore/hiscore.dat
index 00a4d5fb36b..17bd85d3dfd 100644
--- a/plugins/hiscore/hiscore.dat
+++ b/plugins/hiscore/hiscore.dat
@@ -9,6 +9,9 @@
;This file can be edited with a text editor, but keep the same format:
; all fields are separated by a comma (,)
; <gamename>:
+; or
+; <gamename>,<softwarename>:
+; for machines with softlists
; @<cputag>,<addressspace>,<address>,<length>,<value to wait for
; in the first byte/word>,<value to wait for in the last byte/word>
; [repeat the above as many times as necessary]
@@ -13965,3 +13968,6 @@ zodiack:
@:maincpu,program,b35f,1,08,08
@:maincpu,program,b37f,1,00,00
@:maincpu,program,b39f,1,00,00
+
+genesis,tf3:
+@:maincpu,program,fff2ac,4,00,90
diff --git a/plugins/hiscore/init.lua b/plugins/hiscore/init.lua
index 5c54a53912b..228892e7539 100644
--- a/plugins/hiscore/init.lua
+++ b/plugins/hiscore/init.lua
@@ -64,7 +64,11 @@ function hiscore.startplugin()
if not file then
file = io.open( hiscore_plugin_path .. "/hiscore.dat", "r" );
end
- rm_match = '^' .. emu.romname() .. ':';
+ if emu.softname() ~= "" then
+ rm_match = '^' .. emu.romname() .. ',' .. emu.softname() .. ':';
+ else
+ rm_match = '^' .. emu.romname() .. ':';
+ end
cluster = "";
current_is_match = false;
if file then
@@ -113,7 +117,11 @@ function hiscore.startplugin()
function get_file_name ()
- r = hiscore_path .. '/' .. emu.romname() .. ".hi";
+ if emu.softname() ~= "" then
+ r = hiscore_path .. '/' .. emu.romname() .. "_" .. emu.softname() .. ".hi";
+ else
+ r = hiscore_path .. '/' .. emu.romname() .. ".hi";
+ end
return r;
end
@@ -225,19 +233,18 @@ function hiscore.startplugin()
write_scores(positions)
end
end
- current_game = nil
+ current_game = ""
mem_check_passed = false
+ scores_have_been_read = false;
end
emu.register_start(function()
print("Starting " .. emu.gamename())
-- check if we've just soft reset
- if reset then
- reset()
- end
+ -- reset() -- there's no way to reliably save scores after a soft reset currently
current_game = emu.romname()
dat = read_hiscore_dat()
- if dat then
+ if dat and dat ~= "" then
print( "found hiscore.dat entry for " .. emu.romname() );
positions = parse_table( dat );
if not positions then
diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua
index ecd83a5ae99..688615cbbc3 100644
--- a/scripts/src/3rdparty.lua
+++ b/scripts/src/3rdparty.lua
@@ -1182,9 +1182,42 @@ end
if _OPTIONS["with-bundled-sdl2"] then
project "SDL2"
uuid "caab3327-574f-4abf-b25b-74d5238ae59b"
+if _OPTIONS["targetos"]=="android" then
+ kind "SharedLib"
+ targetextension ".so"
+ targetprefix "lib"
+ links {
+ "GLESv1_CM",
+ "GLESv2",
+ "log",
+ }
+ linkoptions {
+ "-Wl,-soname,liSDL2.so"
+ }
+
+ if _OPTIONS["SEPARATE_BIN"]~="1" then
+ if _OPTIONS["PLATFORM"]=="arm" then
+ targetdir(MAME_DIR .. "android-project/app/src/main/libs/armeabi-v7a")
+ end
+ if _OPTIONS["PLATFORM"]=="arm64" then
+ targetdir(MAME_DIR .. "android-project/app/src/main/libs/arm64-v8a")
+ end
+ if _OPTIONS["PLATFORM"]=="mips" then
+ targetdir(MAME_DIR .. "android-project/app/src/main/libs/mips")
+ end
+ if _OPTIONS["PLATFORM"]=="mips64" then
+ targetdir(MAME_DIR .. "android-project/app/src/main/libs/mips64")
+ end
+ if _OPTIONS["PLATFORM"]=="x86" then
+ targetdir(MAME_DIR .. "android-project/app/src/main/libs/x86")
+ end
+ if _OPTIONS["PLATFORM"]=="x64" then
+ targetdir(MAME_DIR .. "android-project/app/src/main/libs/x86_64")
+ end
+ end
+else
kind "StaticLib"
-
- configuration { }
+end
files {
MAME_DIR .. "3rdparty/SDL2/include/begin_code.h",
@@ -1356,7 +1389,6 @@ project "SDL2"
MAME_DIR .. "3rdparty/SDL2/src/stdlib/SDL_qsort.c",
MAME_DIR .. "3rdparty/SDL2/src/stdlib/SDL_stdlib.c",
MAME_DIR .. "3rdparty/SDL2/src/stdlib/SDL_string.c",
- MAME_DIR .. "3rdparty/SDL2/src/thread/generic/SDL_syscond.c",
MAME_DIR .. "3rdparty/SDL2/src/thread/SDL_systhread.h",
MAME_DIR .. "3rdparty/SDL2/src/thread/SDL_thread.c",
MAME_DIR .. "3rdparty/SDL2/src/thread/SDL_thread_c.h",
@@ -1520,6 +1552,7 @@ project "SDL2"
if _OPTIONS["targetos"]=="windows" then
files {
+ MAME_DIR .. "3rdparty/SDL2/src/thread/generic/SDL_syscond.c",
MAME_DIR .. "3rdparty/SDL2/src/audio/directsound/SDL_directsound.c",
MAME_DIR .. "3rdparty/SDL2/src/audio/directsound/SDL_directsound.h",
MAME_DIR .. "3rdparty/SDL2/src/audio/winmm/SDL_winmm.c",
diff --git a/scripts/src/bus.lua b/scripts/src/bus.lua
index 76010b7679d..5423c224127 100644
--- a/scripts/src/bus.lua
+++ b/scripts/src/bus.lua
@@ -1445,6 +1445,8 @@ if (BUSES["A2BUS"]~=null) then
MAME_DIR .. "src/devices/bus/a2bus/ramcard128k.h",
MAME_DIR .. "src/devices/bus/a2bus/ezcgi.cpp",
MAME_DIR .. "src/devices/bus/a2bus/ezcgi.h",
+ MAME_DIR .. "src/devices/bus/a2bus/pc_xporter.cpp",
+ MAME_DIR .. "src/devices/bus/a2bus/pc_xporter.h",
}
end
diff --git a/scripts/src/main.lua b/scripts/src/main.lua
index 8f03031d8aa..c0f2072607b 100644
--- a/scripts/src/main.lua
+++ b/scripts/src/main.lua
@@ -27,13 +27,18 @@ end
kind "ConsoleApp"
configuration { "android*" }
+ targetprefix "lib"
+ targetname "main"
targetextension ".so"
linkoptions {
"-shared",
+ "-Wl,-soname,libmain.so"
}
links {
"EGL",
+ "GLESv1_CM",
"GLESv2",
+ "SDL2",
}
configuration { "pnacl" }
kind "ConsoleApp"
@@ -132,8 +137,39 @@ end
configuration { }
- if _OPTIONS["SEPARATE_BIN"]~="1" then
- targetdir(MAME_DIR)
+ if _OPTIONS["targetos"]=="android" then
+ includedirs {
+ MAME_DIR .. "3rdparty/SDL2/include",
+ }
+
+ files {
+ MAME_DIR .. "3rdparty/SDL2/src/main/android/SDL_android_main.c",
+ }
+ targetsuffix ""
+ if _OPTIONS["SEPARATE_BIN"]~="1" then
+ if _OPTIONS["PLATFORM"]=="arm" then
+ targetdir(MAME_DIR .. "android-project/app/src/main/libs/armeabi-v7a")
+ end
+ if _OPTIONS["PLATFORM"]=="arm64" then
+ targetdir(MAME_DIR .. "android-project/app/src/main/libs/arm64-v8a")
+ end
+ if _OPTIONS["PLATFORM"]=="mips" then
+ targetdir(MAME_DIR .. "android-project/app/src/main/libs/mips")
+ end
+ if _OPTIONS["PLATFORM"]=="mips64" then
+ targetdir(MAME_DIR .. "android-project/app/src/main/libs/mips64")
+ end
+ if _OPTIONS["PLATFORM"]=="x86" then
+ targetdir(MAME_DIR .. "android-project/app/src/main/libs/x86")
+ end
+ if _OPTIONS["PLATFORM"]=="x64" then
+ targetdir(MAME_DIR .. "android-project/app/src/main/libs/x86_64")
+ end
+ end
+ else
+ if _OPTIONS["SEPARATE_BIN"]~="1" then
+ targetdir(MAME_DIR)
+ end
end
findfunction("linkProjects_" .. _OPTIONS["target"] .. "_" .. _OPTIONS["subtarget"])(_OPTIONS["target"], _OPTIONS["subtarget"])
diff --git a/scripts/src/netlist.lua b/scripts/src/netlist.lua
index 65b8ca29336..29bc8f0a7bb 100644
--- a/scripts/src/netlist.lua
+++ b/scripts/src/netlist.lua
@@ -73,6 +73,7 @@ project "netlist"
MAME_DIR .. "src/lib/netlist/analog/nld_opamps.h",
MAME_DIR .. "src/lib/netlist/solver/nld_solver.cpp",
MAME_DIR .. "src/lib/netlist/solver/nld_solver.h",
+ MAME_DIR .. "src/lib/netlist/solver/nld_matrix_solver.h",
MAME_DIR .. "src/lib/netlist/solver/nld_ms_direct.h",
MAME_DIR .. "src/lib/netlist/solver/nld_ms_direct1.h",
MAME_DIR .. "src/lib/netlist/solver/nld_ms_direct2.h",
diff --git a/scripts/src/osd/modules.lua b/scripts/src/osd/modules.lua
index dcce1a8e07b..5ea9bec2f1c 100644
--- a/scripts/src/osd/modules.lua
+++ b/scripts/src/osd/modules.lua
@@ -122,6 +122,12 @@ function osdmodulesbuild()
end
end
+ defines {
+ "__STDC_LIMIT_MACROS",
+ "__STDC_FORMAT_MACROS",
+ "__STDC_CONSTANT_MACROS",
+ }
+
files {
MAME_DIR .. "src/osd/modules/render/drawbgfx.cpp",
MAME_DIR .. "src/osd/modules/render/binpacker.cpp",
diff --git a/scripts/src/osd/sdl.lua b/scripts/src/osd/sdl.lua
index 47a8b0ff3b6..03e82ffcb2f 100644
--- a/scripts/src/osd/sdl.lua
+++ b/scripts/src/osd/sdl.lua
@@ -38,7 +38,7 @@ function maintargetosdoptions(_target,_subtarget)
}
end
- if BASE_TARGETOS=="unix" and _OPTIONS["targetos"]~="macosx" then
+ if BASE_TARGETOS=="unix" and _OPTIONS["targetos"]~="macosx" and _OPTIONS["targetos"]~="android" then
links {
"SDL2_ttf",
}
@@ -239,7 +239,7 @@ elseif _OPTIONS["targetos"]=="macosx" then
SDL_NETWORK = "pcap"
end
-if _OPTIONS["with-bundled-sdl2"]~=nil then
+if _OPTIONS["with-bundled-sdl2"]~=nil or _OPTIONS["targetos"]=="android" then
includedirs {
GEN_DIR .. "includes",
}
@@ -295,7 +295,7 @@ if BASE_TARGETOS=="unix" then
"/usr/openwin/lib",
}
end
- if _OPTIONS["with-bundled-sdl2"]~=nil then
+ if _OPTIONS["with-bundled-sdl2"]~=nil and _OPTIONS["targetos"]~="android" then
links {
"SDL2",
}
@@ -305,7 +305,7 @@ if BASE_TARGETOS=="unix" then
addoptionsfromstring(str)
end
- if _OPTIONS["targetos"]~="haiku" then
+ if _OPTIONS["targetos"]~="haiku" and _OPTIONS["targetos"]~="android" then
links {
"m",
"pthread",
diff --git a/scripts/target/mame/arcade.lua b/scripts/target/mame/arcade.lua
index a8d2f4e8b1d..9a8937f0a78 100644
--- a/scripts/target/mame/arcade.lua
+++ b/scripts/target/mame/arcade.lua
@@ -1862,6 +1862,7 @@ files {
MAME_DIR .. "src/mame/drivers/m62.cpp",
MAME_DIR .. "src/mame/includes/m62.h",
MAME_DIR .. "src/mame/video/m62.cpp",
+ MAME_DIR .. "src/mame/drivers/spartanxtec.cpp",
MAME_DIR .. "src/mame/drivers/m63.cpp",
MAME_DIR .. "src/mame/drivers/m72.cpp",
MAME_DIR .. "src/mame/includes/m72.h",
@@ -2442,6 +2443,7 @@ files {
MAME_DIR .. "src/mame/drivers/mcr3.cpp",
MAME_DIR .. "src/mame/includes/mcr3.h",
MAME_DIR .. "src/mame/video/mcr3.cpp",
+ MAME_DIR .. "src/mame/drivers/spyhuntertec.cpp",
MAME_DIR .. "src/mame/drivers/mcr68.cpp",
MAME_DIR .. "src/mame/includes/mcr68.h",
MAME_DIR .. "src/mame/machine/mcr68.cpp",
diff --git a/src/devices/bus/a2bus/pc_xporter.cpp b/src/devices/bus/a2bus/pc_xporter.cpp
new file mode 100644
index 00000000000..2a5f9b38acf
--- /dev/null
+++ b/src/devices/bus/a2bus/pc_xporter.cpp
@@ -0,0 +1,255 @@
+// license:BSD-3-Clause
+// copyright-holders:R. Belmont
+/*********************************************************************
+
+ pcxporter.cpp
+
+ Implementation of the Applied Engineering PC Transporter card
+ Preliminary version by R. Belmont
+
+ The PC Transporter is basically a PC-XT on an Apple II card.
+ Features include:
+ - V30 CPU @ 4.77 MHz
+ - 768K of RAM, which defines the V30 address space from 0x00000 to 0xBFFFF
+ and is fully read/writable by the Apple's CPU.
+ - Usual XT hardware, mostly inside custom ASICs. There's a discrete
+ NEC uPD71054 (i8254-compatible PIT) though.
+ - CGA-compatible video, output to a separate CGA monitor or NTSC-compliant analog
+ RGB monitor (e.g. the IIgs RGB monitor).
+ - XT-compatible keyboard interface.
+ - PC-style floppy controller: supports 360K 5.25" disks and 720K 3.5" disks
+ - HDD controller which is redirected to a file on the Apple's filesystem
+
+ The V30 BIOS is downloaded by the Apple; the Apple also writes text to the CGA screen prior to
+ the V30's being launched.
+
+ The board was developed by The Engineering Department, a company made up mostly of early Apple
+ engineers including Apple /// designer Dr. Wendall Sander and ProDOS creator Dick Huston.
+
+ Software and user documentation at:
+ http://mirrors.apple2.org.za/Apple%20II%20Documentation%20Project/Interface%20Cards/CPU/AE%20PC%20Transporter/
+
+ Notes:
+ Registers live at CFxx; access CFFF to clear C800 reservation,
+ then read Cn00 to map C800-CFFF first.
+
+ PC RAM from 0xA0000-0xAFFFF is where the V30 BIOS is downloaded,
+ plus used for general storage by the system.
+ RAM from 0xB0000-0xBFFFF is the CGA framebuffer as usual.
+
+ CF00: PC memory pointer (bits 0-7)
+ CF01: PC memory pointer (bits 8-15)
+ CF02: PC memory pointer (bits 16-23)
+ CF03: read/write PC memory at the pointer and increment the pointer
+ CF04: read/write PC memory at the pointer and *don't* increment the pointer
+
+ TODO:
+ - A2 probably also can access the V30's I/O space: where's that at? CF0E/CF0F
+ are suspects...
+ - There's likely A2 ROM at CnXX and C800-CBFF to support the "Slinky" memory
+ expansion card emulation function inside one of the custom ASICs. Need to
+ dump this...
+
+*********************************************************************/
+
+#include "pc_xporter.h"
+
+/***************************************************************************
+ PARAMETERS
+***************************************************************************/
+
+//**************************************************************************
+// GLOBAL VARIABLES
+//**************************************************************************
+
+const device_type A2BUS_PCXPORTER = &device_creator<a2bus_pcxporter_device>;
+
+static MACHINE_CONFIG_FRAGMENT( pcxporter )
+MACHINE_CONFIG_END
+
+/***************************************************************************
+ FUNCTION PROTOTYPES
+***************************************************************************/
+
+//-------------------------------------------------
+// machine_config_additions - device-specific
+// machine configurations
+//-------------------------------------------------
+
+machine_config_constructor a2bus_pcxporter_device::device_mconfig_additions() const
+{
+ return MACHINE_CONFIG_NAME( pcxporter );
+}
+
+//**************************************************************************
+// LIVE DEVICE
+//**************************************************************************
+
+a2bus_pcxporter_device::a2bus_pcxporter_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source) :
+ device_t(mconfig, type, name, tag, owner, clock, shortname, source),
+ device_a2bus_card_interface(mconfig, *this)
+{
+}
+
+a2bus_pcxporter_device::a2bus_pcxporter_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock) :
+ device_t(mconfig, A2BUS_PCXPORTER, "Applied Engineering PC Transporter", tag, owner, clock, "a2pcxport", __FILE__),
+ device_a2bus_card_interface(mconfig, *this)
+{
+}
+
+//-------------------------------------------------
+// device_start - device-specific startup
+//-------------------------------------------------
+
+void a2bus_pcxporter_device::device_start()
+{
+ // set_a2bus_device makes m_slot valid
+ set_a2bus_device();
+
+ memset(m_ram, 0, 768*1024);
+ memset(m_regs, 0, 0x400);
+ m_offset = 0;
+
+ save_item(NAME(m_ram));
+ save_item(NAME(m_regs));
+ save_item(NAME(m_offset));
+}
+
+void a2bus_pcxporter_device::device_reset()
+{
+}
+
+
+/*-------------------------------------------------
+ read_c0nx - called for reads from this card's c0nx space
+-------------------------------------------------*/
+
+UINT8 a2bus_pcxporter_device::read_c0nx(address_space &space, UINT8 offset)
+{
+ switch (offset)
+ {
+ default:
+ printf("Read c0n%x (PC=%x)\n", offset, space.device().safe_pc());
+ break;
+ }
+
+ return 0xff;
+}
+
+
+/*-------------------------------------------------
+ write_c0nx - called for writes to this card's c0nx space
+-------------------------------------------------*/
+
+void a2bus_pcxporter_device::write_c0nx(address_space &space, UINT8 offset, UINT8 data)
+{
+ switch (offset)
+ {
+ default:
+ printf("Write %02x to c0n%x (PC=%x)\n", data, offset, space.device().safe_pc());
+ break;
+ }
+}
+
+/*-------------------------------------------------
+ read_cnxx - called for reads from this card's cnxx space
+-------------------------------------------------*/
+
+UINT8 a2bus_pcxporter_device::read_cnxx(address_space &space, UINT8 offset)
+{
+ // read only to trigger C800?
+ return 0xff;
+}
+
+void a2bus_pcxporter_device::write_cnxx(address_space &space, UINT8 offset, UINT8 data)
+{
+ printf("Write %02x to cn%02x (PC=%x)\n", data, offset, space.device().safe_pc());
+}
+
+/*-------------------------------------------------
+ read_c800 - called for reads from this card's c800 space
+-------------------------------------------------*/
+
+UINT8 a2bus_pcxporter_device::read_c800(address_space &space, UINT16 offset)
+{
+// printf("Read C800 at %x\n", offset + 0xc800);
+
+ if (offset < 0x400)
+ {
+ return 0xff;
+ }
+ else
+ {
+ UINT8 rv;
+
+ switch (offset)
+ {
+ case 0x700:
+ return m_offset & 0xff;
+
+ case 0x701:
+ return (m_offset >> 8) & 0xff;
+
+ case 0x702:
+ return (m_offset >> 16) & 0xff;
+
+ case 0x703: // read with increment
+ rv = m_ram[m_offset];
+ m_offset++;
+ return rv;
+
+ case 0x704: // read w/o increment
+ rv = m_ram[m_offset];
+ return rv;
+ }
+
+ return m_regs[offset];
+ }
+}
+
+/*-------------------------------------------------
+ write_c800 - called for writes to this card's c800 space
+-------------------------------------------------*/
+void a2bus_pcxporter_device::write_c800(address_space &space, UINT16 offset, UINT8 data)
+{
+ if (offset < 0x400)
+ {
+ }
+ else
+ {
+ switch (offset)
+ {
+ case 0x700:
+ m_offset &= ~0xff;
+ m_offset |= data;
+// printf("offset now %x (PC=%x)\n", m_offset, space.device().safe_pc());
+ break;
+
+ case 0x701:
+ m_offset &= ~0xff00;
+ m_offset |= (data<<8);
+// printf("offset now %x (PC=%x)\n", m_offset, space.device().safe_pc());
+ break;
+
+ case 0x702:
+ m_offset &= ~0xff0000;
+ m_offset |= (data<<16);
+// printf("offset now %x (PC=%x)\n", m_offset, space.device().safe_pc());
+ break;
+
+ case 0x703: // write w/increment
+ m_ram[m_offset] = data;
+ m_offset++;
+ break;
+
+ case 0x704: // write w/o increment
+ m_ram[m_offset] = data;
+ break;
+
+ default:
+ printf("%02x to C800 at %x\n", data, offset + 0xc800);
+ m_regs[offset] = data;
+ break;
+ }
+ }
+}
diff --git a/src/devices/bus/a2bus/pc_xporter.h b/src/devices/bus/a2bus/pc_xporter.h
new file mode 100644
index 00000000000..7126439a265
--- /dev/null
+++ b/src/devices/bus/a2bus/pc_xporter.h
@@ -0,0 +1,53 @@
+// license:BSD-3-Clause
+// copyright-holders:R. Belmont
+/*********************************************************************
+
+ pc_xporter.h
+
+ Implementation of the Applied Engineering PC Transporter card
+
+*********************************************************************/
+
+#pragma once
+
+#include "emu.h"
+#include "a2bus.h"
+#include "machine/genpc.h"
+
+//**************************************************************************
+// TYPE DEFINITIONS
+//**************************************************************************
+
+class a2bus_pcxporter_device:
+ public device_t,
+ public device_a2bus_card_interface
+{
+public:
+ // construction/destruction
+ a2bus_pcxporter_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
+ a2bus_pcxporter_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
+
+ // optional information overrides
+ virtual machine_config_constructor device_mconfig_additions() const override;
+
+protected:
+ virtual void device_start() override;
+ virtual void device_reset() override;
+
+ // overrides of standard a2bus slot functions
+ virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override;
+ virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override;
+ virtual UINT8 read_cnxx(address_space &space, UINT8 offset) override;
+ virtual void write_cnxx(address_space &space, UINT8 offset, UINT8 data) override;
+ virtual UINT8 read_c800(address_space &space, UINT16 offset) override;
+ virtual void write_c800(address_space &space, UINT16 offset, UINT8 data) override;
+
+private:
+ UINT8 m_ram[768*1024];
+ UINT8 m_regs[0x400];
+ UINT32 m_offset;
+};
+
+// device type definition
+extern const device_type A2BUS_PCXPORTER;
+
diff --git a/src/devices/bus/coleco/exp.cpp b/src/devices/bus/coleco/exp.cpp
index 53953f82859..2b2093f2b1d 100644
--- a/src/devices/bus/coleco/exp.cpp
+++ b/src/devices/bus/coleco/exp.cpp
@@ -38,7 +38,7 @@ void device_colecovision_cartridge_interface::rom_alloc(size_t size)
{
if (m_rom == nullptr)
{
- m_rom = device().machine().memory().region_alloc("coleco_cart:rom", size, 1, ENDIANNESS_LITTLE)->base();
+ m_rom = device().machine().memory().region_alloc(":coleco_cart:rom", size, 1, ENDIANNESS_LITTLE)->base();
m_rom_size = size;
}
}
diff --git a/src/devices/bus/coleco/exp.h b/src/devices/bus/coleco/exp.h
index e64e3c8d6d1..09511c5357f 100644
--- a/src/devices/bus/coleco/exp.h
+++ b/src/devices/bus/coleco/exp.h
@@ -88,7 +88,7 @@ protected:
virtual bool is_creatable() const override { return 0; }
virtual bool must_be_loaded() const override { return 0; }
virtual bool is_reset_on_load() const override { return 1; }
- virtual const char *image_interface() const override { return "coleco_cart"; }
+ virtual const char *image_interface() const override { return ":coleco_cart"; }
virtual const char *file_extensions() const override { return "rom,col,bin"; }
virtual const option_guide *create_option_guide() const override { return nullptr; }
diff --git a/src/devices/bus/megadrive/md_slot.cpp b/src/devices/bus/megadrive/md_slot.cpp
index f44e0597cd4..5a496ac124a 100644
--- a/src/devices/bus/megadrive/md_slot.cpp
+++ b/src/devices/bus/megadrive/md_slot.cpp
@@ -87,7 +87,7 @@ void device_md_cart_interface::rom_alloc(size_t size, const char *tag)
{
if (m_rom == nullptr)
{
- m_rom = (UINT16 *)device().machine().memory().region_alloc(std::string(tag).append(MDSLOT_ROM_REGION_TAG).c_str(), size, 2, ENDIANNESS_LITTLE)->base();
+ m_rom = (UINT16 *)device().machine().memory().region_alloc(std::string(tag).append(MDSLOT_ROM_REGION_TAG).c_str(), size, 2, ENDIANNESS_BIG)->base();
m_rom_size = size;
}
}
diff --git a/src/devices/bus/sms_ctrl/joypad.cpp b/src/devices/bus/sms_ctrl/joypad.cpp
index b2537453c6a..99ca264cec4 100644
--- a/src/devices/bus/sms_ctrl/joypad.cpp
+++ b/src/devices/bus/sms_ctrl/joypad.cpp
@@ -2,7 +2,22 @@
// copyright-holders:Fabio Priuli
/**********************************************************************
- Sega Master System "Control Pad"/generic joystick emulation
+ Sega Mark III "Joypad" / Master System "Control Pad" emulation
+
+
+Release data from the Sega Retro project:
+
+- Joypad:
+
+ Year: 1985 Country/region: JP Model code: SJ-152
+
+- Control Pad:
+
+ Year: 1986 Country/region: US Model code: 3020
+ Year: 1987 Country/region: JP Model code: 3020
+ Year: 1987 Country/region: EU Model code: ?
+ Year: 1989 Country/region: BR Model code: 011770
+ Year: 1989 Country/region: KR Model code: ?
**********************************************************************/
diff --git a/src/devices/bus/sms_ctrl/joypad.h b/src/devices/bus/sms_ctrl/joypad.h
index a67dd5f78b0..d8028bef6c3 100644
--- a/src/devices/bus/sms_ctrl/joypad.h
+++ b/src/devices/bus/sms_ctrl/joypad.h
@@ -2,7 +2,7 @@
// copyright-holders:Fabio Priuli
/**********************************************************************
- Sega Master System "Control Pad"/generic joystick emulation
+ Sega Mark III "Joypad" / Master System "Control Pad" emulation
**********************************************************************/
diff --git a/src/devices/bus/sms_ctrl/lphaser.cpp b/src/devices/bus/sms_ctrl/lphaser.cpp
index 7c1056da5f0..8a49c9a1554 100644
--- a/src/devices/bus/sms_ctrl/lphaser.cpp
+++ b/src/devices/bus/sms_ctrl/lphaser.cpp
@@ -4,6 +4,14 @@
Sega Master System "Light Phaser" (light gun) emulation
+
+Release data from the Sega Retro project:
+
+ Year: 1986 Country/region: US Model code: 3050
+ Year: 1987 Country/region: EU Model code: ?
+ Year: 1989 Country/region: BR Model code: 010470
+ Year: 198? Country/region: KR Model code: ?
+
**********************************************************************/
#include "lphaser.h"
diff --git a/src/devices/bus/sms_ctrl/paddle.cpp b/src/devices/bus/sms_ctrl/paddle.cpp
index 5486c9a50bd..ec5acd4a5ee 100644
--- a/src/devices/bus/sms_ctrl/paddle.cpp
+++ b/src/devices/bus/sms_ctrl/paddle.cpp
@@ -2,7 +2,24 @@
// copyright-holders:Fabio Priuli
/**********************************************************************
- Sega Master System "Paddle Control" emulation
+ Sega Mark III "Paddle Control" emulation
+
+
+Release data from the Sega Retro project:
+
+ Year: 1987 Country/region: JP Model code: HPD-200
+
+Notes:
+
+ The main chip contained in the device is labeled 315-5243.
+
+ The Paddle Control was only released in Japan. To work with the device,
+ paddle games need to detect the system region as Japanese, else they switch
+ to a different mode that uses the TH line as output to select which nibble
+ of the X axis will be read. This other mode is similar to how the US Sports
+ Pad works, so on an Export system, paddle games are somewhat playable with
+ that device, though it needs to be used inverted and the trackball needs to
+ be moved slowly, else the software for the paddle think it's moving backward.
**********************************************************************/
diff --git a/src/devices/bus/sms_ctrl/paddle.h b/src/devices/bus/sms_ctrl/paddle.h
index 8e092d63afe..fae7a93fb19 100644
--- a/src/devices/bus/sms_ctrl/paddle.h
+++ b/src/devices/bus/sms_ctrl/paddle.h
@@ -2,7 +2,7 @@
// copyright-holders:Fabio Priuli
/**********************************************************************
- Sega Master System "Paddle Control" emulation
+ Sega Mark III "Paddle Control" emulation
**********************************************************************/
diff --git a/src/devices/bus/sms_ctrl/rfu.cpp b/src/devices/bus/sms_ctrl/rfu.cpp
index 0ccc5ae4e9c..3c27307c137 100644
--- a/src/devices/bus/sms_ctrl/rfu.cpp
+++ b/src/devices/bus/sms_ctrl/rfu.cpp
@@ -2,12 +2,22 @@
// copyright-holders:Fabio Priuli
/**********************************************************************
- Sega Master System "Rapid Fire Unit" emulation
+ Sega SG-1000/Mark-III/SMS "Rapid Fire Unit" emulation
-**********************************************************************/
-// This emulated device is the version released by Sega. In Brazil, Tec Toy
-// released a version that does not have any switch to turn on/off auto-repeat.
+Release data from the Sega Retro project:
+
+ Year: 1985 Country/region: JP Model code: RF-150
+ Year: 1987 Country/region: US Model code: 3046
+ Year: 1988 Country/region: EU Model code: MK-3046-50
+ Year: 1989 Country/region: BR Model code: 011050
+
+Notes:
+
+ This emulated device is the version released by Sega. In Brazil, Tec Toy
+ released a version that does not have any switch to turn on/off auto-repeat.
+
+**********************************************************************/
#include "rfu.h"
diff --git a/src/devices/bus/sms_ctrl/rfu.h b/src/devices/bus/sms_ctrl/rfu.h
index adc9a3443ba..6a56b06ae3a 100644
--- a/src/devices/bus/sms_ctrl/rfu.h
+++ b/src/devices/bus/sms_ctrl/rfu.h
@@ -2,7 +2,7 @@
// copyright-holders:Fabio Priuli
/**********************************************************************
- Sega Master System "Rapid Fire Unit" emulation
+ Sega SG-1000/Mark-III/SMS "Rapid Fire Unit" emulation
**********************************************************************/
diff --git a/src/devices/bus/sms_ctrl/sports.cpp b/src/devices/bus/sms_ctrl/sports.cpp
index 77356cec41f..b4bd54d81a1 100644
--- a/src/devices/bus/sms_ctrl/sports.cpp
+++ b/src/devices/bus/sms_ctrl/sports.cpp
@@ -4,29 +4,43 @@
Sega Master System "Sports Pad" (US model) emulation
-**********************************************************************/
-// The games designed for the US model of the Sports Pad controller use the
-// TH line of the controller port to select which nibble, of the two axis
-// bytes, will be read at a time. The Japanese cartridge Sports Pad Soccer
-// uses a different mode, because the Sega Mark III lacks the TH line, so
-// there is a different Sports Pad model released in Japan (see sportsjp.c).
-
-// The Japanese SMS has the TH line connected, but doesn't report TH input
-// on port 0xDD. However, a magazine raffled the US Sports Pad along with a
-// Great Ice Hockey cartridge, in Japanese format, to owners of that console.
-// So, Great Ice Hockey seems to just need TH pin as output to work, while
-// other games designed for the US Sports Pad don't work on the Japanese SMS.
-
-// It was discovered that games designed for the Paddle Controller, released
-// in Japan, switch to a mode incompatible with the original Paddle when
-// detect the system region as Export. Similar to how the US model of the
-// Sports Pad works, that mode uses the TH line as output to select which
-// nibble of the X axis will be read. So, on an Export console version, paddle
-// games are somewhat playable with the US Sport Pad model, though it needs to
-// be used inverted and the trackball needs to be moved slowly, else the
-// software for the paddle think it's moving backward.
-// See http://mametesters.org/view.php?id=5872 for discussion.
+Release data from the Sega Retro project:
+
+ Year: 1987 Country/region: US Model code: 3040
+
+TODO:
+
+- For low-level emulation, a device for the TMP42C66P, a Toshiba 4bit
+ microcontroller, needs to be created, but a dump of its internal ROM
+ seems to be required.
+- Auto-repeat and Control/Sports mode switches are not emulated.
+
+Notes:
+
+ Games designed for the US model of the Sports Pad controller use the
+ TH line of the controller port to select which nibble, of the two axis
+ bytes, will be read at a time. The Japanese cartridge Sports Pad Soccer
+ uses a different mode, because the Sega Mark III lacks the TH line, so
+ there is a different Sports Pad model released in Japan (see sportsjp.c).
+
+ The Japanese SMS has the TH line connected, but doesn't report TH input
+ on port 0xDD. However, a magazine raffled the US Sports Pad along with a
+ Great Ice Hockey cartridge, in Japanese format, to owners of that console.
+ So, Great Ice Hockey seems to just need TH pin as output to work, while
+ other games designed for the US Sports Pad don't work on the Japanese SMS.
+
+ It was discovered that games designed for the Paddle Controller, released
+ in Japan, switch to a mode incompatible with the original Paddle when
+ detect the system region as Export. Similar to how the US model of the
+ Sports Pad works, that mode uses the TH line as output to select which
+ nibble of the X axis will be read. So, on an Export console version,
+ paddle games are somewhat playable with the US Sport Pad model, though it
+ needs to be used inverted and the trackball needs to be moved slowly, else
+ the software for the paddle think it's moving backward.
+ See http://mametesters.org/view.php?id=5872 for discussion.
+
+**********************************************************************/
#include "sports.h"
diff --git a/src/devices/bus/sms_ctrl/sportsjp.cpp b/src/devices/bus/sms_ctrl/sportsjp.cpp
index 16c5198721c..ca2c3de1748 100644
--- a/src/devices/bus/sms_ctrl/sportsjp.cpp
+++ b/src/devices/bus/sms_ctrl/sportsjp.cpp
@@ -4,12 +4,25 @@
Sega Master System "Sports Pad" (Japanese model) emulation
-**********************************************************************/
-// The Japanese Sports Pad controller is only required to play the cartridge
-// Sports Pad Soccer, released in Japan. It uses a different mode than the
-// used by the US model, due to the missing TH line on Sega Mark III
-// controller ports.
+Release data from the Sega Retro project:
+
+ Year: 1988 Country/region: JP Model code: SP-500
+
+TODO:
+
+- For low-level emulation, a device for the TMP42C66P, a Toshiba 4bit
+ microcontroller, needs to be created, but a dump of its internal ROM
+ seems to be required.
+
+Notes:
+
+ The Japanese Sports Pad controller is only required to play the cartridge
+ Sports Pad Soccer, released in Japan. It uses a different mode than the
+ used by the US model, due to the missing TH line on Sega Mark III
+ controller ports.
+
+**********************************************************************/
#include "sportsjp.h"
diff --git a/src/devices/bus/sms_exp/gender.cpp b/src/devices/bus/sms_exp/gender.cpp
index 3de8961050c..49ccc50e24e 100644
--- a/src/devices/bus/sms_exp/gender.cpp
+++ b/src/devices/bus/sms_exp/gender.cpp
@@ -4,14 +4,14 @@
Sega Master System "Gender Adapter" emulation
-**********************************************************************/
+The Gender Adapter is not an official Sega product. It is produced since 2006
+by the SMSPower website to permit to plug a cartridge on the expansion slot
+on any SMS 1 model. This includes the Japanese SMS, which has FM sound, so
+it is a way to get FM music of western cartridges that have FM code but were
+not released in Japan. Some games have compatibility issues, confirmed on the
+real hardware, when run plugged-in to the SMS expansion slot.
-// The Gender Adapter is not an official Sega product. It is produced by the
-// SMSPower website to permit to plug a cartridge on the expansion slot on any
-// SMS 1 model. This includes the Japanese SMS, which has FM sound, so it is
-// a way to get FM music of western cartridges that have FM code but were not
-// released in Japan. Some games have compatibility issues, confirmed on the
-// real hardware, when run plugged-in to the SMS expansion slot.
+**********************************************************************/
#include "gender.h"
diff --git a/src/devices/cpu/sm510/sm510op.cpp b/src/devices/cpu/sm510/sm510op.cpp
index c2d0658ba6f..3f0659bac16 100644
--- a/src/devices/cpu/sm510/sm510op.cpp
+++ b/src/devices/cpu/sm510/sm510op.cpp
@@ -67,7 +67,7 @@ void sm510_base_device::op_lb()
UINT8 hi = 0;
switch (m_bl)
{
- case 0: hi = 3; break;
+ case 0: hi = 0; break;
case 1: hi = 0; break;
case 2: hi = 0; break;
case 3: hi = 3; break;
diff --git a/src/emu/emuopts.cpp b/src/emu/emuopts.cpp
index 35a8fae6333..e5906562d2a 100644
--- a/src/emu/emuopts.cpp
+++ b/src/emu/emuopts.cpp
@@ -376,6 +376,9 @@ void emu_options::remove_device_options()
remove_entry(*curentry);
}
+ // take also care of ramsize options
+ set_default_value(OPTION_RAMSIZE, "");
+
// reset counters
m_slot_options = 0;
m_device_options = 0;
@@ -541,20 +544,66 @@ void emu_options::set_system_name(const char *name)
{
// remember the original system name
std::string old_system_name(system_name());
+ bool new_system = old_system_name.compare(name)!=0;
// if the system name changed, fix up the device options
- if (old_system_name.compare(name)!=0)
+ if (new_system)
{
// first set the new name
std::string error;
set_value(OPTION_SYSTEMNAME, name, OPTION_PRIORITY_CMDLINE, error);
assert(error.empty());
- // remove any existing device options and then add them afresh
+ // remove any existing device options
remove_device_options();
- while (add_slot_options()) { }
+ }
+
+ // get the new system
+ const game_driver *cursystem = system();
+ if (cursystem == nullptr)
+ return;
+
+ if (*software_name() != 0)
+ {
+ std::string sw_load(software_name());
+ std::string sw_list, sw_name, sw_part, sw_instance, option_errors, error_string;
+ int left = sw_load.find_first_of(':');
+ int middle = sw_load.find_first_of(':', left + 1);
+ int right = sw_load.find_last_of(':');
+
+ sw_list = sw_load.substr(0, left - 1);
+ sw_name = sw_load.substr(left + 1, middle - left - 1);
+ sw_part = sw_load.substr(middle + 1, right - middle - 1);
+ sw_instance = sw_load.substr(right + 1);
+ sw_load.assign(sw_load.substr(0, right));
+
+ // look up the software part
+ machine_config config(*cursystem, *this);
+ software_list_device *swlist = software_list_device::find_by_name(config, sw_list.c_str());
+ software_info *swinfo = swlist != nullptr ? swlist->find(sw_name.c_str()) : nullptr;
+ software_part *swpart = swinfo != nullptr ? swinfo->find_part(sw_part.c_str()) : nullptr;
// then add the options
+ if (new_system)
+ {
+ while (add_slot_options(swpart)) { }
+ add_device_options();
+ }
+
+ set_value(OPTION_SOFTWARENAME, sw_name.c_str(), OPTION_PRIORITY_CMDLINE, error_string);
+ if (exists(sw_instance.c_str()))
+ set_value(sw_instance.c_str(), sw_load.c_str(), OPTION_PRIORITY_SUBCMD, error_string);
+
+ int num;
+ do {
+ num = options_count();
+ update_slot_options(swpart);
+ } while(num != options_count());
+ }
+ else if (new_system)
+ {
+ // add the options afresh
+ while (add_slot_options()) { }
add_device_options();
int num;
do {
diff --git a/src/emu/luaengine.cpp b/src/emu/luaengine.cpp
index 0cf57ef61c0..fbd2e64fc76 100644
--- a/src/emu/luaengine.cpp
+++ b/src/emu/luaengine.cpp
@@ -245,6 +245,16 @@ int lua_engine::l_emu_romname(lua_State *L)
}
//-------------------------------------------------
+// emu_softname - returns softlist name
+//-------------------------------------------------
+
+int lua_engine::l_emu_softname(lua_State *L)
+{
+ lua_pushstring(L, luaThis->machine().options().software_name());
+ return 1;
+}
+
+//-------------------------------------------------
// emu_pause/emu_unpause - pause/unpause game
//-------------------------------------------------
@@ -1418,6 +1428,7 @@ void lua_engine::initialize()
.addCFunction ("app_version", l_emu_app_version )
.addCFunction ("gamename", l_emu_gamename )
.addCFunction ("romname", l_emu_romname )
+ .addCFunction ("softname", l_emu_softname )
.addCFunction ("keypost", l_emu_keypost )
.addCFunction ("hook_output", l_emu_hook_output )
.addCFunction ("sethook", l_emu_set_hook )
diff --git a/src/emu/luaengine.h b/src/emu/luaengine.h
index 19c362c66a2..2f0f4ad7a34 100644
--- a/src/emu/luaengine.h
+++ b/src/emu/luaengine.h
@@ -106,6 +106,7 @@ private:
static int l_emu_time(lua_State *L);
static int l_emu_gamename(lua_State *L);
static int l_emu_romname(lua_State *L);
+ static int l_emu_softname(lua_State *L);
static int l_emu_keypost(lua_State *L);
static int l_emu_hook_output(lua_State *L);
static int l_emu_exit(lua_State *L);
diff --git a/src/emu/machine.cpp b/src/emu/machine.cpp
index 7c465be0cd8..d76ad49676d 100644
--- a/src/emu/machine.cpp
+++ b/src/emu/machine.cpp
@@ -356,7 +356,7 @@ int running_machine::run(bool firstrun)
ui().initialize(*this);
// display the startup screens
- ui().display_startup_screens(firstrun, false);
+ ui().display_startup_screens(firstrun);
// perform a soft reset -- this takes us to the running phase
soft_reset();
diff --git a/src/emu/mame.cpp b/src/emu/mame.cpp
index 9232ee9443f..9e872c7a96f 100644
--- a/src/emu/mame.cpp
+++ b/src/emu/mame.cpp
@@ -251,40 +251,9 @@ int machine_manager::execute()
// check the state of the machine
if (m_new_driver_pending)
{
- std::string old_system_name(m_options.system_name());
- bool new_system = (old_system_name.compare(m_new_driver_pending->name)!=0);
- // first: if we scheduled a new system, remove device options of the old system
- // notice that, if we relaunch the same system, there is no effect on the emulation
- if (new_system)
- m_options.remove_device_options();
- // second: set up new system name (and the related device options)
+ // set up new system name and adjust device options accordingly
m_options.set_system_name(m_new_driver_pending->name);
- // third: if we scheduled a new system, take also care of ramsize options
- if (new_system)
- {
- std::string error_string;
- m_options.set_value(OPTION_RAMSIZE, "", OPTION_PRIORITY_CMDLINE, error_string);
- }
firstrun = true;
- if (m_options.software_name())
- {
- std::string sw_load(m_options.software_name());
- std::string sw_list, sw_name, sw_part, sw_instance, option_errors, error_string;
- int left = sw_load.find_first_of(':');
- int middle = sw_load.find_first_of(':', left + 1);
- int right = sw_load.find_last_of(':');
-
- sw_list = sw_load.substr(0, left - 1);
- sw_name = sw_load.substr(left + 1, middle - left - 1);
- sw_part = sw_load.substr(middle + 1, right - middle - 1);
- sw_instance = sw_load.substr(right + 1);
- sw_load.assign(sw_load.substr(0, right));
-
- char arg[] = "mame";
- char *argv = &arg[0];
- m_options.set_value(OPTION_SOFTWARENAME, sw_name.c_str(), OPTION_PRIORITY_CMDLINE, error_string);
- m_options.parse_slot_devices(1, &argv, option_errors, sw_instance.c_str(), sw_load.c_str());
- }
}
else
{
diff --git a/src/emu/rendlay.cpp b/src/emu/rendlay.cpp
index a69ea831e44..41fffd964aa 100644
--- a/src/emu/rendlay.cpp
+++ b/src/emu/rendlay.cpp
@@ -1303,7 +1303,7 @@ void layout_element::component::draw_beltreel(running_machine &machine, bitmap_a
//-------------------------------------------------
-// load_bitmap - load a PNG file with artwork for
+// load_bitmap - load a PNG/JPG file with artwork for
// a component
//-------------------------------------------------
@@ -1317,6 +1317,10 @@ void layout_element::component::load_bitmap()
if (m_bitmap[0].valid() && !m_alphafile[0].empty())
render_load_png(m_bitmap[0], *m_file[0], m_dirname.c_str(), m_alphafile[0].c_str(), true);
+ // PNG failed, let's try JPG
+ if (!m_bitmap[0].valid())
+ render_load_jpeg(m_bitmap[0], *m_file[0], m_dirname.c_str(), m_imagefile[0].c_str());
+
// if we can't load the bitmap, allocate a dummy one and report an error
if (!m_bitmap[0].valid())
{
diff --git a/src/emu/rendutil.cpp b/src/emu/rendutil.cpp
index 4c49c6c8a62..eed35713a92 100644
--- a/src/emu/rendutil.cpp
+++ b/src/emu/rendutil.cpp
@@ -12,7 +12,7 @@
#include "rendutil.h"
#include "png.h"
-
+#include "libjpeg/jpeglib.h"
/***************************************************************************
FUNCTION PROTOTYPES
@@ -524,6 +524,89 @@ void render_line_to_quad(const render_bounds *bounds, float width, render_bounds
/*-------------------------------------------------
+ render_load_jpeg - load a JPG file into a
+ bitmap
+-------------------------------------------------*/
+
+void render_load_jpeg(bitmap_argb32 &bitmap, emu_file &file, const char *dirname, const char *filename)
+{
+ // deallocate previous bitmap
+ bitmap.reset();
+
+ // define file's full name
+ std::string fname;
+
+ if (dirname == nullptr)
+ fname = filename;
+ else
+ fname.assign(dirname).append(PATH_SEPARATOR).append(filename);
+
+ osd_file::error filerr = file.open(fname.c_str());
+
+ if (filerr != osd_file::error::NONE)
+ return;
+
+ // define standard JPEG structures
+ jpeg_decompress_struct cinfo;
+ jpeg_error_mgr jerr;
+ cinfo.err = jpeg_std_error(&jerr);
+ jpeg_create_decompress(&cinfo);
+
+ // allocates a buffer for the image
+ UINT64 jpg_size = file.size();
+ unsigned char *jpg_buffer = global_alloc_array(unsigned char, jpg_size + 100);
+
+ // read data from the file and set them in the buffer
+ file.read(jpg_buffer, jpg_size);
+ jpeg_mem_src(&cinfo, jpg_buffer, jpg_size);
+
+ // read JPEG header and start decompression
+ jpeg_read_header(&cinfo, TRUE);
+ jpeg_start_decompress(&cinfo);
+
+ // allocates the destination bitmap
+ int w = cinfo.output_width;
+ int h = cinfo.output_height;
+ int s = cinfo.output_components;
+ bitmap.allocate(w, h);
+
+ // allocates a buffer to receive the information and copy them into the bitmap
+ int row_stride = cinfo.output_width * cinfo.output_components;
+ JSAMPARRAY buffer = (JSAMPARRAY)malloc(sizeof(JSAMPROW));
+ buffer[0] = (JSAMPROW)malloc(sizeof(JSAMPLE) * row_stride);
+
+ while ( cinfo.output_scanline < cinfo.output_height )
+ {
+ int j = cinfo.output_scanline;
+ jpeg_read_scanlines(&cinfo, buffer, 1);
+
+ if (s == 1)
+ for (int i = 0; i < w; ++i)
+ bitmap.pix32(j, i) = rgb_t(0xFF, buffer[0][i], buffer[0][i], buffer[0][i]);
+
+ else if (s == 3)
+ for (int i = 0; i < w; ++i)
+ bitmap.pix32(j, i) = rgb_t(0xFF, buffer[0][i * s], buffer[0][i * s + 1], buffer[0][i * s + 2]);
+
+ else
+ {
+ osd_printf_error("Cannot read JPEG data from %s file.\n", fname.c_str());
+ bitmap.reset();
+ break;
+ }
+ }
+
+ // finish decompression and frees the memory
+ jpeg_finish_decompress(&cinfo);
+ jpeg_destroy_decompress(&cinfo);
+ file.close();
+ free(buffer[0]);
+ free(buffer);
+ global_free_array(jpg_buffer);
+}
+
+
+/*-------------------------------------------------
render_load_png - load a PNG file into a
bitmap
-------------------------------------------------*/
diff --git a/src/emu/rendutil.h b/src/emu/rendutil.h
index 34a9c2ef75c..bdf01592307 100644
--- a/src/emu/rendutil.h
+++ b/src/emu/rendutil.h
@@ -25,6 +25,7 @@ void render_resample_argb_bitmap_hq(bitmap_argb32 &dest, bitmap_argb32 &source,
int render_clip_line(render_bounds *bounds, const render_bounds *clip);
int render_clip_quad(render_bounds *bounds, const render_bounds *clip, render_quad_texuv *texcoords);
void render_line_to_quad(const render_bounds *bounds, float width, render_bounds *bounds0, render_bounds *bounds1);
+void render_load_jpeg(bitmap_argb32 &bitmap, emu_file &file, const char *dirname, const char *filename);
bool render_load_png(bitmap_argb32 &bitmap, emu_file &file, const char *dirname, const char *filename, bool load_as_alpha_to_existing = false);
diff --git a/src/emu/ui/sliders.cpp b/src/emu/ui/sliders.cpp
index 86f85bd0026..25dd8afa06d 100644
--- a/src/emu/ui/sliders.cpp
+++ b/src/emu/ui/sliders.cpp
@@ -44,6 +44,9 @@ void ui_menu_sliders::handle()
const slider_state *slider = (const slider_state *)menu_event->itemref;
INT32 curvalue = (*slider->update)(machine(), slider->arg, nullptr, SLIDER_NOCHANGE);
INT32 increment = 0;
+ bool alt_pressed = machine().input().code_pressed(KEYCODE_LALT) || machine().input().code_pressed(KEYCODE_RALT);
+ bool ctrl_pressed = machine().input().code_pressed(KEYCODE_LCONTROL) || machine().input().code_pressed(KEYCODE_RCONTROL);
+ bool shift_pressed = machine().input().code_pressed(KEYCODE_LSHIFT) || machine().input().code_pressed(KEYCODE_RSHIFT);
switch (menu_event->iptkey)
{
@@ -57,11 +60,13 @@ void ui_menu_sliders::handle()
/* decrease value */
case IPT_UI_LEFT:
- if (machine().input().code_pressed(KEYCODE_LALT) || machine().input().code_pressed(KEYCODE_RALT))
+ if (alt_pressed && shift_pressed)
increment = -1;
- else if (machine().input().code_pressed(KEYCODE_LSHIFT) || machine().input().code_pressed(KEYCODE_RSHIFT))
+ if (alt_pressed)
+ increment = -(curvalue - slider->minval);
+ else if (shift_pressed)
increment = (slider->incval > 10) ? -(slider->incval / 10) : -1;
- else if (machine().input().code_pressed(KEYCODE_LCONTROL) || machine().input().code_pressed(KEYCODE_RCONTROL))
+ else if (ctrl_pressed)
increment = -slider->incval * 10;
else
increment = -slider->incval;
@@ -69,11 +74,13 @@ void ui_menu_sliders::handle()
/* increase value */
case IPT_UI_RIGHT:
- if (machine().input().code_pressed(KEYCODE_LALT) || machine().input().code_pressed(KEYCODE_RALT))
+ if (alt_pressed && shift_pressed)
increment = 1;
- else if (machine().input().code_pressed(KEYCODE_LSHIFT) || machine().input().code_pressed(KEYCODE_RSHIFT))
+ if (alt_pressed)
+ increment = slider->maxval - curvalue;
+ else if (shift_pressed)
increment = (slider->incval > 10) ? (slider->incval / 10) : 1;
- else if (machine().input().code_pressed(KEYCODE_LCONTROL) || machine().input().code_pressed(KEYCODE_RCONTROL))
+ else if (ctrl_pressed)
increment = slider->incval * 10;
else
increment = slider->incval;
diff --git a/src/emu/ui/ui.cpp b/src/emu/ui/ui.cpp
index cc8b18c8154..0b15f24edc6 100644
--- a/src/emu/ui/ui.cpp
+++ b/src/emu/ui/ui.cpp
@@ -359,9 +359,9 @@ UINT32 ui_manager::set_handler(ui_callback callback, UINT32 param)
// various startup screens
//-------------------------------------------------
-void ui_manager::display_startup_screens(bool first_time, bool show_disclaimer)
+void ui_manager::display_startup_screens(bool first_time)
{
- const int maxstate = 4;
+ const int maxstate = 3;
int str = machine().options().seconds_to_run();
bool show_gameinfo = !machine().options().skip_gameinfo();
bool show_warnings = true, show_mandatory_fileman = true;
@@ -370,11 +370,11 @@ void ui_manager::display_startup_screens(bool first_time, bool show_disclaimer)
// disable everything if we are using -str for 300 or fewer seconds, or if we're the empty driver,
// or if we are debugging
if (!first_time || (str > 0 && str < 60*5) || &machine().system() == &GAME_NAME(___empty) || (machine().debug_flags & DEBUG_FLAG_ENABLED) != 0)
- show_gameinfo = show_warnings = show_disclaimer = show_mandatory_fileman = FALSE;
+ show_gameinfo = show_warnings = show_mandatory_fileman = FALSE;
#if defined(EMSCRIPTEN)
// also disable for the JavaScript port since the startup screens do not run asynchronously
- show_gameinfo = show_warnings = show_disclaimer = FALSE;
+ show_gameinfo = show_warnings = FALSE;
#endif
// loop over states
@@ -388,14 +388,9 @@ void ui_manager::display_startup_screens(bool first_time, bool show_disclaimer)
switch (state)
{
case 0:
- if (show_disclaimer && disclaimer_string(messagebox_text).length() > 0)
- set_handler(handler_messagebox_ok, 0);
- break;
-
- case 1:
if (show_warnings && warnings_string(messagebox_text).length() > 0)
{
- set_handler(handler_messagebox_ok, 0);
+ set_handler(handler_messagebox_anykey, 0);
if (machine().system().flags & (MACHINE_WRONG_COLORS | MACHINE_IMPERFECT_COLORS | MACHINE_REQUIRES_ARTWORK | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_KEYBOARD | MACHINE_NO_SOUND))
messagebox_backcolor = UI_YELLOW_COLOR;
if (machine().system().flags & (MACHINE_NOT_WORKING | MACHINE_UNEMULATED_PROTECTION | MACHINE_MECHANICAL))
@@ -403,12 +398,12 @@ void ui_manager::display_startup_screens(bool first_time, bool show_disclaimer)
}
break;
- case 2:
+ case 1:
if (show_gameinfo && game_info_astring(messagebox_text).length() > 0)
set_handler(handler_messagebox_anykey, 0);
break;
- case 3:
+ case 2:
if (show_mandatory_fileman && machine().image().mandatory_scan(messagebox_text).length() > 0)
{
std::string warning;
@@ -1033,22 +1028,6 @@ bool ui_manager::show_timecode_total()
***************************************************************************/
//-------------------------------------------------
-// disclaimer_string - print the disclaimer
-// text to the given buffer
-//-------------------------------------------------
-
-std::string &ui_manager::disclaimer_string(std::string &str)
-{
- str = string_format(
- _("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"),
- machine().system().description);
- return str;
-}
-
-
-//-------------------------------------------------
// warnings_string - print the warning flags
// text to the given buffer
//-------------------------------------------------
@@ -1174,7 +1153,7 @@ std::string &ui_manager::warnings_string(std::string &str)
}
// add the 'press OK' string
- str.append(_("\n\nType OK or move the joystick left then right to continue"));
+ str.append(_("\n\nPress any key to continue"));
return str;
}
@@ -1317,35 +1296,6 @@ UINT32 ui_manager::handler_messagebox(running_machine &machine, render_container
//-------------------------------------------------
-// handler_messagebox_ok - displays the current
-// messagebox_text string and waits for an OK
-//-------------------------------------------------
-
-UINT32 ui_manager::handler_messagebox_ok(running_machine &machine, render_container *container, UINT32 state)
-{
- // draw a standard message window
- machine.ui().draw_text_box(container, messagebox_text.c_str(), JUSTIFY_LEFT, 0.5f, 0.5f, messagebox_backcolor);
-
- // an 'O' or left joystick kicks us to the next state
- if (state == 0 && (machine.input().code_pressed_once(KEYCODE_O) || machine.ui_input().pressed(IPT_UI_LEFT)))
- state++;
-
- // a 'K' or right joystick exits the state
- else if (state == 1 && (machine.input().code_pressed_once(KEYCODE_K) || machine.ui_input().pressed(IPT_UI_RIGHT)))
- state = UI_HANDLER_CANCEL;
-
- // if the user cancels, exit out completely
- else if (machine.ui_input().pressed(IPT_UI_CANCEL))
- {
- machine.schedule_exit();
- state = UI_HANDLER_CANCEL;
- }
-
- return state;
-}
-
-
-//-------------------------------------------------
// handler_messagebox_anykey - displays the
// current messagebox_text string and waits for
// any keypress
diff --git a/src/emu/ui/ui.h b/src/emu/ui/ui.h
index c50d444120e..ea117a74d82 100644
--- a/src/emu/ui/ui.h
+++ b/src/emu/ui/ui.h
@@ -129,7 +129,7 @@ public:
// methods
void initialize(running_machine &machine);
UINT32 set_handler(ui_callback callback, UINT32 param);
- void display_startup_screens(bool first_time, bool show_disclaimer);
+ void display_startup_screens(bool first_time);
void set_startup_text(const char *text, bool force);
void update_and_render(render_container *container);
render_font *get_font();
@@ -213,12 +213,10 @@ private:
static slider_state *slider_current;
// text generators
- std::string &disclaimer_string(std::string &buffer);
std::string &warnings_string(std::string &buffer);
// UI handlers
static UINT32 handler_messagebox(running_machine &machine, render_container *container, UINT32 state);
- static UINT32 handler_messagebox_ok(running_machine &machine, render_container *container, UINT32 state);
static UINT32 handler_messagebox_anykey(running_machine &machine, render_container *container, UINT32 state);
static UINT32 handler_ingame(running_machine &machine, render_container *container, UINT32 state);
static UINT32 handler_load_save(running_machine &machine, render_container *container, UINT32 state);
diff --git a/src/emu/ui/utils.h b/src/emu/ui/utils.h
index a8737fb2e6b..81107c0911c 100644
--- a/src/emu/ui/utils.h
+++ b/src/emu/ui/utils.h
@@ -14,8 +14,7 @@
#define __UI_UTILS_H__
#include "osdepend.h"
-#include "render.h"
-#include "libjpeg/jpeglib.h"
+#include "rendutil.h"
#define MAX_CHAR_INFO 256
#define MAX_CUST_FILTER 8
@@ -255,90 +254,5 @@ char* chartrimcarriage(char str[]);
const char* strensure(const char* s);
-// jpeg loader
-template <typename _T>
-void render_load_jpeg(_T &bitmap, emu_file &file, const char *dirname, const char *filename)
-{
- // deallocate previous bitmap
- bitmap.reset();
-
- bitmap_format format = bitmap.format();
-
- // define file's full name
- std::string fname;
-
- if (dirname == nullptr)
- fname = filename;
- else
- fname.assign(dirname).append(PATH_SEPARATOR).append(filename);
-
- osd_file::error filerr = file.open(fname.c_str());
-
- if (filerr != osd_file::error::NONE)
- return;
-
- // define standard JPEG structures
- jpeg_decompress_struct cinfo;
- jpeg_error_mgr jerr;
- cinfo.err = jpeg_std_error(&jerr);
- jpeg_create_decompress(&cinfo);
-
- // allocates a buffer for the image
- UINT64 jpg_size = file.size();
- unsigned char *jpg_buffer = global_alloc_array(unsigned char, jpg_size + 100);
-
- // read data from the file and set them in the buffer
- file.read(jpg_buffer, jpg_size);
- jpeg_mem_src(&cinfo, jpg_buffer, jpg_size);
-
- // read JPEG header and start decompression
- jpeg_read_header(&cinfo, TRUE);
- jpeg_start_decompress(&cinfo);
-
- // allocates the destination bitmap
- int w = cinfo.output_width;
- int h = cinfo.output_height;
- int s = cinfo.output_components;
- bitmap.allocate(w, h);
-
- // allocates a buffer to receive the information and copy them into the bitmap
- int row_stride = cinfo.output_width * cinfo.output_components;
- JSAMPARRAY buffer = (JSAMPARRAY)malloc(sizeof(JSAMPROW));
- buffer[0] = (JSAMPROW)malloc(sizeof(JSAMPLE) * row_stride);
-
- while ( cinfo.output_scanline < cinfo.output_height )
- {
- int j = cinfo.output_scanline;
- jpeg_read_scanlines(&cinfo, buffer, 1);
-
- if (s == 1)
- for (int i = 0; i < w; ++i)
- if (format == BITMAP_FORMAT_ARGB32)
- bitmap.pix32(j, i) = rgb_t(0xFF, buffer[0][i], buffer[0][i], buffer[0][i]);
- else
- bitmap.pix32(j, i) = rgb_t(buffer[0][i], buffer[0][i], buffer[0][i]);
-
- else if (s == 3)
- for (int i = 0; i < w; ++i)
- if (format == BITMAP_FORMAT_ARGB32)
- bitmap.pix32(j, i) = rgb_t(0xFF, buffer[0][i * s], buffer[0][i * s + 1], buffer[0][i * s + 2]);
- else
- bitmap.pix32(j, i) = rgb_t(buffer[0][i * s], buffer[0][i * s + 1], buffer[0][i * s + 2]);
-
- else
- {
- osd_printf_info("Error! Cannot read JPEG data from %s file.\n", fname.c_str());
- break;
- }
- }
-
- // finish decompression and frees the memory
- jpeg_finish_decompress(&cinfo);
- jpeg_destroy_decompress(&cinfo);
- file.close();
- free(buffer[0]);
- free(buffer);
- global_free_array(jpg_buffer);
-}
#endif /* __UI_UTILS_H__ */
diff --git a/src/lib/netlist/devices/nld_mm5837.cpp b/src/lib/netlist/devices/nld_mm5837.cpp
index 7f7ab6f8660..82e774b4923 100644
--- a/src/lib/netlist/devices/nld_mm5837.cpp
+++ b/src/lib/netlist/devices/nld_mm5837.cpp
@@ -5,7 +5,7 @@
*
*/
-#include <solver/nld_solver.h>
+#include <solver/nld_matrix_solver.h>
#include "nld_mm5837.h"
#include "nl_setup.h"
diff --git a/src/lib/netlist/devices/nld_system.cpp b/src/lib/netlist/devices/nld_system.cpp
index dbf6926437d..e861bf05171 100644
--- a/src/lib/netlist/devices/nld_system.cpp
+++ b/src/lib/netlist/devices/nld_system.cpp
@@ -6,6 +6,7 @@
*/
#include <solver/nld_solver.h>
+#include <solver/nld_matrix_solver.h>
#include "nld_system.h"
NETLIB_NAMESPACE_DEVICES_START()
diff --git a/src/lib/netlist/macro/nlm_ttl74xx.cpp b/src/lib/netlist/macro/nlm_ttl74xx.cpp
index de42f26d730..49fea3c55c8 100644
--- a/src/lib/netlist/macro/nlm_ttl74xx.cpp
+++ b/src/lib/netlist/macro/nlm_ttl74xx.cpp
@@ -84,7 +84,7 @@ NETLIST_START(TTL74XX_lib)
TT_FAMILY("74XX")
TRUTHTABLE_END()
- TRUTHTABLE_START(TTL_7400_NAND, 2, 1, 0, "+A,B")
+ TRUTHTABLE_START(TTL_7400_NAND, 2, 1, 0, "A,B")
TT_HEAD("A,B|Q ")
TT_LINE("0,X|1|22")
TT_LINE("X,0|1|22")
diff --git a/src/lib/netlist/nl_base.cpp b/src/lib/netlist/nl_base.cpp
index 6ea052b4132..7afa0285ef8 100644
--- a/src/lib/netlist/nl_base.cpp
+++ b/src/lib/netlist/nl_base.cpp
@@ -5,7 +5,8 @@
*
*/
-#include <solver/nld_solver.h>
+#include <solver/nld_matrix_solver.h>
+
#include <cstring>
#include <algorithm>
@@ -840,10 +841,10 @@ ATTR_COLD void core_terminal_t::set_net(net_t &anet)
ATTR_COLD terminal_t::terminal_t()
: analog_t(TERMINAL)
+, m_otherterm(NULL)
, m_Idr1(NULL)
, m_go1(NULL)
, m_gt1(NULL)
-, m_otherterm(NULL)
{
}
diff --git a/src/lib/netlist/nl_base.h b/src/lib/netlist/nl_base.h
index 24f2cde585a..52a91704607 100644
--- a/src/lib/netlist/nl_base.h
+++ b/src/lib/netlist/nl_base.h
@@ -551,10 +551,6 @@ namespace netlist
ATTR_COLD terminal_t();
- nl_double *m_Idr1; // drive current
- nl_double *m_go1; // conductance for Voltage from other term
- nl_double *m_gt1; // conductance for total conductance
-
terminal_t *m_otherterm;
ATTR_HOT void set(const nl_double G)
@@ -581,19 +577,31 @@ namespace netlist
ATTR_HOT void schedule_solve();
ATTR_HOT void schedule_after(const netlist_time &after);
+ void set_ptrs(nl_double *gt, nl_double *go, nl_double *Idr)
+ {
+ m_gt1 = gt;
+ m_go1 = go;
+ m_Idr1 = Idr;
+ }
+
protected:
virtual void save_register() override;
virtual void reset() override;
private:
- ATTR_HOT void set_ptr(nl_double *ptr, const nl_double val)
+ ATTR_HOT void set_ptr(nl_double *ptr, const nl_double val)
{
if (ptr != NULL && *ptr != val)
{
*ptr = val;
}
}
- };
+
+ nl_double *m_Idr1; // drive current
+ nl_double *m_go1; // conductance for Voltage from other term
+ nl_double *m_gt1; // conductance for total conductance
+
+};
// -----------------------------------------------------------------------------
@@ -1054,7 +1062,7 @@ namespace netlist
ATTR_HOT nl_double INPANALOG(const analog_input_t &inp) const { return inp.Q_Analog(); }
- ATTR_HOT nl_double TERMANALOG(const terminal_t &term) const { return term.net().as_analog().Q_Analog(); }
+ ATTR_HOT nl_double TERMANALOG(const terminal_t &term) const { return term.net().Q_Analog(); }
ATTR_HOT void OUTANALOG(analog_output_t &out, const nl_double val)
{
diff --git a/src/lib/netlist/nl_util.h b/src/lib/netlist/nl_util.h
index bb5a564dd74..87ec2270231 100644
--- a/src/lib/netlist/nl_util.h
+++ b/src/lib/netlist/nl_util.h
@@ -41,8 +41,8 @@ private:
public:
ATTR_HOT inline static float exp(const float x) { return std::exp(x); }
- ATTR_HOT inline static double abs(const double x) { return std::abs(x); }
- ATTR_HOT inline static float abs(const float x) { return std::abs(x); }
+ ATTR_HOT inline static double abs(const double x) { return std::fabs(x); }
+ ATTR_HOT inline static float abs(const float x) { return std::fabs(x); }
ATTR_HOT inline static double log(const double x) { return std::log(x); }
ATTR_HOT inline static float log(const float x) { return std::log(x); }
#if defined(_MSC_VER) && _MSC_VER < 1800
diff --git a/src/lib/netlist/plib/pfmtlog.h b/src/lib/netlist/plib/pfmtlog.h
index 7a63d14fc3a..d72bdc6ce6b 100644
--- a/src/lib/netlist/plib/pfmtlog.h
+++ b/src/lib/netlist/plib/pfmtlog.h
@@ -110,6 +110,10 @@ public:
ATTR_COLD P & e(const double x, const char *f = "") { format_element(f, "", "e", x); return static_cast<P &>(*this); }
ATTR_COLD P & g(const double x, const char *f = "") { format_element(f, "", "g", x); return static_cast<P &>(*this); }
+ ATTR_COLD P &operator ()(const float x, const char *f = "") { format_element(f, "", "f", x); return static_cast<P &>(*this); }
+ ATTR_COLD P & e(const float x, const char *f = "") { format_element(f, "", "e", x); return static_cast<P &>(*this); }
+ ATTR_COLD P & g(const float x, const char *f = "") { format_element(f, "", "g", x); return static_cast<P &>(*this); }
+
ATTR_COLD P &operator ()(const char *x, const char *f = "") { format_element(f, "", "s", x); return static_cast<P &>(*this); }
ATTR_COLD P &operator ()(char *x, const char *f = "") { format_element(f, "", "s", x); return static_cast<P &>(*this); }
ATTR_COLD P &operator ()(const void *x, const char *f = "") { format_element(f, "", "p", x); return static_cast<P &>(*this); }
diff --git a/src/lib/netlist/solver/nld_matrix_solver.h b/src/lib/netlist/solver/nld_matrix_solver.h
new file mode 100644
index 00000000000..715eab6756a
--- /dev/null
+++ b/src/lib/netlist/solver/nld_matrix_solver.h
@@ -0,0 +1,144 @@
+// license:GPL-2.0+
+// copyright-holders:Couriersud
+/*
+ * nld_matrix_solver.h
+ *
+ */
+
+#ifndef NLD_MATRIX_SOLVER_H_
+#define NLD_MATRIX_SOLVER_H_
+
+#include "solver/nld_solver.h"
+
+NETLIB_NAMESPACE_DEVICES_START()
+
+class terms_t
+{
+ P_PREVENT_COPYING(terms_t)
+
+ public:
+ ATTR_COLD terms_t() : m_railstart(0)
+ {}
+
+ ATTR_COLD void clear()
+ {
+ m_term.clear();
+ m_net_other.clear();
+ m_gt.clear();
+ m_go.clear();
+ m_Idr.clear();
+ m_other_curanalog.clear();
+ }
+
+ ATTR_COLD void add(terminal_t *term, int net_other, bool sorted);
+
+ inline unsigned count() { return m_term.size(); }
+
+ inline terminal_t **terms() { return m_term.data(); }
+ inline int *net_other() { return m_net_other.data(); }
+ inline nl_double *gt() { return m_gt.data(); }
+ inline nl_double *go() { return m_go.data(); }
+ inline nl_double *Idr() { return m_Idr.data(); }
+ inline nl_double **other_curanalog() { return m_other_curanalog.data(); }
+
+ ATTR_COLD void set_pointers();
+
+ unsigned m_railstart;
+
+ pvector_t<unsigned> m_nz; /* all non zero for multiplication */
+ pvector_t<unsigned> m_nzrd; /* non zero right of the diagonal for elimination, may include RHS element */
+ pvector_t<unsigned> m_nzbd; /* non zero below of the diagonal for elimination */
+private:
+ pvector_t<terminal_t *> m_term;
+ pvector_t<int> m_net_other;
+ pvector_t<nl_double> m_go;
+ pvector_t<nl_double> m_gt;
+ pvector_t<nl_double> m_Idr;
+ pvector_t<nl_double *> m_other_curanalog;
+};
+
+class matrix_solver_t : public device_t
+{
+public:
+ typedef pvector_t<matrix_solver_t *> list_t;
+ typedef core_device_t::list_t dev_list_t;
+
+ enum eSolverType
+ {
+ GAUSSIAN_ELIMINATION,
+ GAUSS_SEIDEL
+ };
+
+ matrix_solver_t(const eSolverType type, const solver_parameters_t *params);
+ virtual ~matrix_solver_t();
+
+ void setup(analog_net_t::list_t &nets) { vsetup(nets); }
+
+ netlist_time solve_base();
+
+ netlist_time solve();
+
+ inline bool is_dynamic() const { return m_dynamic_devices.size() > 0; }
+ inline bool is_timestep() const { return m_step_devices.size() > 0; }
+
+ void update_forced();
+ void update_after(const netlist_time after)
+ {
+ m_Q_sync.net().reschedule_in_queue(after);
+ }
+
+ /* netdevice functions */
+ virtual void update() override;
+ virtual void start() override;
+ virtual void reset() override;
+
+ ATTR_COLD int get_net_idx(net_t *net);
+
+ eSolverType type() const { return m_type; }
+ plog_base<NL_DEBUG> &log() { return netlist().log(); }
+
+ virtual void log_stats();
+
+protected:
+
+ ATTR_COLD void setup_base(analog_net_t::list_t &nets);
+ void update_dynamic();
+
+ virtual void add_term(int net_idx, terminal_t *term) = 0;
+ virtual void vsetup(analog_net_t::list_t &nets) = 0;
+ virtual int vsolve_non_dynamic(const bool newton_raphson) = 0;
+ virtual netlist_time compute_next_timestep() = 0;
+
+ pvector_t<analog_net_t *> m_nets;
+ pvector_t<analog_output_t *> m_inps;
+
+ int m_stat_calculations;
+ int m_stat_newton_raphson;
+ int m_stat_vsolver_calls;
+ int m_iterative_fail;
+ int m_iterative_total;
+
+ const solver_parameters_t &m_params;
+
+ inline nl_double current_timestep() { return m_cur_ts; }
+private:
+
+ netlist_time m_last_step;
+ nl_double m_cur_ts;
+ dev_list_t m_step_devices;
+ dev_list_t m_dynamic_devices;
+
+ logic_input_t m_fb_sync;
+ logic_output_t m_Q_sync;
+
+ void step(const netlist_time &delta);
+
+ void update_inputs();
+
+ const eSolverType m_type;
+};
+
+
+NETLIB_NAMESPACE_DEVICES_END()
+
+#endif /* NLD_MS_DIRECT_H_ */
diff --git a/src/lib/netlist/solver/nld_ms_direct.h b/src/lib/netlist/solver/nld_ms_direct.h
index bdcec31ad44..6911e6aa360 100644
--- a/src/lib/netlist/solver/nld_ms_direct.h
+++ b/src/lib/netlist/solver/nld_ms_direct.h
@@ -13,11 +13,18 @@
#include "solver/nld_solver.h"
#include "solver/vector_base.h"
+/* Disabling dynamic allocation gives a ~10% boost in performance
+ * This flag has been added to support continuous storage for arrays
+ * going forward in case we implement cuda solvers in the future.
+ */
+#define NL_USE_DYNAMIC_ALLOCATION (0)
+
+
NETLIB_NAMESPACE_DEVICES_START()
//#define nl_ext_double __float128 // slow, very slow
//#define nl_ext_double long double // slightly slower
-#define nl_ext_double double
+#define nl_ext_double nl_double
template <unsigned m_N, unsigned _storage_N>
class matrix_solver_direct_t: public matrix_solver_t
@@ -32,48 +39,57 @@ public:
virtual void vsetup(analog_net_t::list_t &nets) override;
virtual void reset() override { matrix_solver_t::reset(); }
- ATTR_HOT inline unsigned N() const { if (m_N == 0) return m_dim; else return m_N; }
-
- ATTR_HOT inline int vsolve_non_dynamic(const bool newton_raphson);
-
protected:
virtual void add_term(int net_idx, terminal_t *term) override;
+ virtual int vsolve_non_dynamic(const bool newton_raphson) override;
+ int solve_non_dynamic(const bool newton_raphson);
- ATTR_HOT virtual nl_double vsolve() override;
+ inline const unsigned N() const { if (m_N == 0) return m_dim; else return m_N; }
- ATTR_HOT int solve_non_dynamic(const bool newton_raphson);
- ATTR_HOT void build_LE_A();
- ATTR_HOT void build_LE_RHS(nl_double * RESTRICT rhs);
- ATTR_HOT void LE_solve();
- ATTR_HOT void LE_back_subst(nl_double * RESTRICT x);
+ void build_LE_A();
+ void build_LE_RHS();
+ void LE_solve();
- /* Full LU back substitution, not used currently, in for future use */
+ template <typename T>
+ void LE_back_subst(T * RESTRICT x);
- ATTR_HOT void LE_back_subst_full(nl_double * RESTRICT x);
+ template <typename T>
+ T delta(const T * RESTRICT V);
- ATTR_HOT nl_double delta(const nl_double * RESTRICT V);
- ATTR_HOT void store(const nl_double * RESTRICT V);
+ template <typename T>
+ void store(const T * RESTRICT V);
- /* bring the whole system to the current time
- * Don't schedule a new calculation time. The recalculation has to be
- * triggered by the caller after the netlist element was changed.
- */
- ATTR_HOT nl_double compute_next_timestep();
+ virtual netlist_time compute_next_timestep() override;
+#if (NL_USE_DYNAMIC_ALLOCATION)
template <typename T1, typename T2>
- inline nl_ext_double &A(const T1 r, const T2 c) { return m_A[r][c]; }
-
- ATTR_ALIGN nl_double m_RHS[_storage_N];
+ inline nl_ext_double &A(const T1 &r, const T2 &c) { return m_A[r * m_pitch + c]; }
+ template <typename T1>
+ inline nl_ext_double &RHS(const T1 &r) { return m_A[r * m_pitch + N()]; }
+#else
+ template <typename T1, typename T2>
+ inline nl_ext_double &A(const T1 &r, const T2 &c) { return m_A[r][c]; }
+ template <typename T1>
+ inline nl_ext_double &RHS(const T1 &r) { return m_A[r][N()]; }
+#endif
ATTR_ALIGN nl_double m_last_RHS[_storage_N]; // right hand side - contains currents
ATTR_ALIGN nl_double m_last_V[_storage_N];
- terms_t **m_terms;
+ terms_t * m_terms[_storage_N];
terms_t *m_rails_temp;
private:
- ATTR_ALIGN nl_ext_double m_A[_storage_N][((_storage_N + 7) / 8) * 8];
+ static const std::size_t m_pitch = (((_storage_N + 1) + 7) / 8) * 8;
+#if (NL_USE_DYNAMIC_ALLOCATION)
+ ATTR_ALIGN nl_ext_double * RESTRICT m_A;
+#else
+ ATTR_ALIGN nl_ext_double m_A[_storage_N][m_pitch];
+ ATTR_ALIGN nl_ext_double m_B[_storage_N][m_pitch];
+#endif
+ //ATTR_ALIGN nl_ext_double m_RHSx[_storage_N];
const unsigned m_dim;
+
};
// ----------------------------------------------------------------------------------------
@@ -87,12 +103,14 @@ matrix_solver_direct_t<m_N, _storage_N>::~matrix_solver_direct_t()
{
pfree(m_terms[k]);
}
- pfree_array(m_terms);
pfree_array(m_rails_temp);
+#if (NL_USE_DYNAMIC_ALLOCATION)
+ pfree_array(m_A);
+#endif
}
template <unsigned m_N, unsigned _storage_N>
-ATTR_HOT nl_double matrix_solver_direct_t<m_N, _storage_N>::compute_next_timestep()
+netlist_time matrix_solver_direct_t<m_N, _storage_N>::compute_next_timestep()
{
nl_double new_solver_timestep = m_params.m_max_timestep;
@@ -121,13 +139,15 @@ ATTR_HOT nl_double matrix_solver_direct_t<m_N, _storage_N>::compute_next_timeste
if (new_net_timestep < new_solver_timestep)
new_solver_timestep = new_net_timestep;
+
+ m_last_V[k] = n->Q_Analog();
}
if (new_solver_timestep < m_params.m_min_timestep)
new_solver_timestep = m_params.m_min_timestep;
}
//if (new_solver_timestep > 10.0 * hn)
// new_solver_timestep = 10.0 * hn;
- return new_solver_timestep;
+ return netlist_time::from_double(new_solver_timestep);
}
template <unsigned m_N, unsigned _storage_N>
@@ -166,7 +186,7 @@ ATTR_COLD void matrix_solver_direct_t<m_N, _storage_N>::vsetup(analog_net_t::lis
m_rails_temp[k].clear();
}
- matrix_solver_t::setup(nets);
+ matrix_solver_t::setup_base(nets);
for (unsigned k = 0; k < N(); k++)
{
@@ -249,19 +269,23 @@ ATTR_COLD void matrix_solver_direct_t<m_N, _storage_N>::vsetup(analog_net_t::lis
}
}
- for (unsigned j = 0; j < N(); j++)
+ for (unsigned i = 0; i < t->m_railstart; i++)
{
- for (unsigned i = 0; i < t->m_railstart; i++)
- {
- if (!t->m_nzrd.contains(other[i]) && other[i] >= (int) (k + 1))
- t->m_nzrd.push_back(other[i]);
- if (!t->m_nz.contains(other[i]))
- t->m_nz.push_back(other[i]);
- }
+ if (!t->m_nzrd.contains(other[i]) && other[i] >= (int) (k + 1))
+ t->m_nzrd.push_back(other[i]);
+ if (!t->m_nz.contains(other[i]))
+ t->m_nz.push_back(other[i]);
}
+
+ /* Add RHS element */
+ if (!t->m_nzrd.contains(N()))
+ t->m_nzrd.push_back(N());
+
+ /* and sort */
psort_list(t->m_nzrd);
t->m_nz.push_back(k); // add diagonal
+
psort_list(t->m_nz);
}
@@ -304,7 +328,6 @@ ATTR_COLD void matrix_solver_direct_t<m_N, _storage_N>::vsetup(analog_net_t::lis
/*
* save states
*/
- save(NLNAME(m_RHS));
save(NLNAME(m_last_RHS));
save(NLNAME(m_last_V));
@@ -312,6 +335,8 @@ ATTR_COLD void matrix_solver_direct_t<m_N, _storage_N>::vsetup(analog_net_t::lis
{
pstring num = pfmt("{1}")(k);
+ save(RHS(k), "RHS" + num);
+
save(m_terms[k]->go(),"GO" + num, m_terms[k]->count());
save(m_terms[k]->gt(),"GT" + num, m_terms[k]->count());
save(m_terms[k]->Idr(),"IDR" + num , m_terms[k]->count());
@@ -321,7 +346,7 @@ ATTR_COLD void matrix_solver_direct_t<m_N, _storage_N>::vsetup(analog_net_t::lis
template <unsigned m_N, unsigned _storage_N>
-ATTR_HOT void matrix_solver_direct_t<m_N, _storage_N>::build_LE_A()
+void matrix_solver_direct_t<m_N, _storage_N>::build_LE_A()
{
const unsigned iN = N();
for (unsigned k = 0; k < iN; k++)
@@ -350,7 +375,7 @@ ATTR_HOT void matrix_solver_direct_t<m_N, _storage_N>::build_LE_A()
}
template <unsigned m_N, unsigned _storage_N>
-ATTR_HOT void matrix_solver_direct_t<m_N, _storage_N>::build_LE_RHS(nl_double * RESTRICT rhs)
+void matrix_solver_direct_t<m_N, _storage_N>::build_LE_RHS()
{
const unsigned iN = N();
for (unsigned k = 0; k < iN; k++)
@@ -370,12 +395,12 @@ ATTR_HOT void matrix_solver_direct_t<m_N, _storage_N>::build_LE_RHS(nl_double *
//rhsk = rhsk + go[i] * terms[i]->m_otherterm->net().as_analog().Q_Analog();
rhsk_b = rhsk_b + go[i] * *other_cur_analog[i];
- rhs[k] = rhsk_a + rhsk_b;
+ RHS(k) = rhsk_a + rhsk_b;
}
}
template <unsigned m_N, unsigned _storage_N>
-ATTR_HOT void matrix_solver_direct_t<m_N, _storage_N>::LE_solve()
+void matrix_solver_direct_t<m_N, _storage_N>::LE_solve()
{
const unsigned kN = N();
@@ -395,10 +420,10 @@ ATTR_HOT void matrix_solver_direct_t<m_N, _storage_N>::LE_solve()
if (maxrow != i)
{
/* Swap the maxrow and ith row */
- for (unsigned k = 0; k < kN; k++) {
+ for (unsigned k = 0; k < kN + 1; k++) {
std::swap(A(i,k), A(maxrow,k));
}
- std::swap(m_RHS[i], m_RHS[maxrow]);
+ //std::swap(RHS(i), RHS(maxrow));
}
/* FIXME: Singular matrix? */
const nl_double f = 1.0 / A(i,i);
@@ -410,14 +435,18 @@ ATTR_HOT void matrix_solver_direct_t<m_N, _storage_N>::LE_solve()
const nl_double f1 = - A(j,i) * f;
if (f1 != NL_FCONST(0.0))
{
- nl_double * RESTRICT pi = &m_A[i][i+1];
- nl_double * RESTRICT pj = &m_A[j][i+1];
+ const nl_double * RESTRICT pi = &A(i,i+1);
+ nl_double * RESTRICT pj = &A(j,i+1);
+#if 1
+ vec_add_mult_scalar(kN-i,pi,f1,pj);
+#else
vec_add_mult_scalar(kN-i-1,pj,f1,pi);
//for (unsigned k = i+1; k < kN; k++)
// pj[k] = pj[k] + pi[k] * f1;
//for (unsigned k = i+1; k < kN; k++)
//A(j,k) += A(i,k) * f1;
- m_RHS[j] += m_RHS[i] * f1;
+ RHS(j) += RHS(i) * f1;
+#endif
}
}
}
@@ -436,23 +465,18 @@ ATTR_HOT void matrix_solver_direct_t<m_N, _storage_N>::LE_solve()
{
const unsigned j = pb[jb];
const nl_double f1 = - A(j,i) * f;
-#if 0
- nl_double * RESTRICT pi = &m_A[i][i+1];
- nl_double * RESTRICT pj = &m_A[j][i+1];
- vec_add_mult_scalar(kN-i-1,pi,f1,pj);
-#else
for (unsigned k = 0; k < e; k++)
A(j,p[k]) += A(i,p[k]) * f1;
-#endif
- m_RHS[j] += m_RHS[i] * f1;
+ //RHS(j) += RHS(i) * f1;
}
}
}
}
template <unsigned m_N, unsigned _storage_N>
-ATTR_HOT void matrix_solver_direct_t<m_N, _storage_N>::LE_back_subst(
- nl_double * RESTRICT x)
+template <typename T>
+void matrix_solver_direct_t<m_N, _storage_N>::LE_back_subst(
+ T * RESTRICT x)
{
const unsigned kN = N();
@@ -461,68 +485,36 @@ ATTR_HOT void matrix_solver_direct_t<m_N, _storage_N>::LE_back_subst(
{
for (int j = kN - 1; j >= 0; j--)
{
- nl_double tmp = 0;
+ T tmp = 0;
for (unsigned k = j+1; k < kN; k++)
tmp += A(j,k) * x[k];
- x[j] = (m_RHS[j] - tmp) / A(j,j);
+ x[j] = (RHS(j) - tmp) / A(j,j);
}
}
else
{
for (int j = kN - 1; j >= 0; j--)
{
- nl_double tmp = 0;
+ T tmp = 0;
const unsigned *p = m_terms[j]->m_nzrd.data();
- const unsigned e = m_terms[j]->m_nzrd.size();
+ const unsigned e = m_terms[j]->m_nzrd.size() - 1; /* exclude RHS element */
for (unsigned k = 0; k < e; k++)
{
const unsigned pk = p[k];
tmp += A(j,pk) * x[pk];
}
- x[j] = (m_RHS[j] - tmp) / A(j,j);
+ x[j] = (RHS(j) - tmp) / A(j,j);
}
}
}
-template <unsigned m_N, unsigned _storage_N>
-ATTR_HOT void matrix_solver_direct_t<m_N, _storage_N>::LE_back_subst_full(
- nl_double * RESTRICT x)
-{
- const unsigned kN = N();
-
- /* back substitution */
-
- // int ip;
- // ii=-1
-
- //for (int i=0; i < kN; i++)
- // x[i] = m_RHS[i];
-
- for (int i=0; i < kN; i++)
- {
- //ip=indx[i]; USE_PIVOT_SEARCH
- //sum=b[ip];
- //b[ip]=b[i];
- double sum=m_RHS[i];//x[i];
- for (int j=0; j < i; j++)
- sum -= A(i,j) * x[j];
- x[i]=sum;
- }
- for (int i=kN-1; i >= 0; i--)
- {
- double sum=x[i];
- for (int j = i+1; j < kN; j++)
- sum -= A(i,j)*x[j];
- x[i] = sum / A(i,i);
- }
-
-}
template <unsigned m_N, unsigned _storage_N>
-ATTR_HOT nl_double matrix_solver_direct_t<m_N, _storage_N>::delta(
- const nl_double * RESTRICT V)
+template <typename T>
+T matrix_solver_direct_t<m_N, _storage_N>::delta(
+ const T * RESTRICT V)
{
/* FIXME: Ideally we should also include currents (RHS) here. This would
* need a revaluation of the right hand side after voltages have been updated
@@ -530,15 +522,16 @@ ATTR_HOT nl_double matrix_solver_direct_t<m_N, _storage_N>::delta(
*/
const unsigned iN = this->N();
- nl_double cerr = 0;
+ T cerr = 0;
for (unsigned i = 0; i < iN; i++)
- cerr = std::max(cerr, nl_math::abs(V[i] - this->m_nets[i]->m_cur_Analog));
+ cerr = std::fmax(cerr, nl_math::abs(V[i] - (T) this->m_nets[i]->m_cur_Analog));
return cerr;
}
template <unsigned m_N, unsigned _storage_N>
-ATTR_HOT void matrix_solver_direct_t<m_N, _storage_N>::store(
- const nl_double * RESTRICT V)
+template <typename T>
+void matrix_solver_direct_t<m_N, _storage_N>::store(
+ const T * RESTRICT V)
{
for (unsigned i = 0, iN=N(); i < iN; i++)
{
@@ -546,19 +539,13 @@ ATTR_HOT void matrix_solver_direct_t<m_N, _storage_N>::store(
}
}
-template <unsigned m_N, unsigned _storage_N>
-ATTR_HOT nl_double matrix_solver_direct_t<m_N, _storage_N>::vsolve()
-{
- this->solve_base(this);
- return this->compute_next_timestep();
-}
-
template <unsigned m_N, unsigned _storage_N>
-ATTR_HOT int matrix_solver_direct_t<m_N, _storage_N>::solve_non_dynamic(ATTR_UNUSED const bool newton_raphson)
+int matrix_solver_direct_t<m_N, _storage_N>::solve_non_dynamic(ATTR_UNUSED const bool newton_raphson)
{
nl_double new_V[_storage_N]; // = { 0.0 };
+ this->LE_solve();
this->LE_back_subst(new_V);
if (newton_raphson)
@@ -577,18 +564,15 @@ ATTR_HOT int matrix_solver_direct_t<m_N, _storage_N>::solve_non_dynamic(ATTR_UNU
}
template <unsigned m_N, unsigned _storage_N>
-ATTR_HOT inline int matrix_solver_direct_t<m_N, _storage_N>::vsolve_non_dynamic(const bool newton_raphson)
+inline int matrix_solver_direct_t<m_N, _storage_N>::vsolve_non_dynamic(const bool newton_raphson)
{
this->build_LE_A();
- this->build_LE_RHS(m_last_RHS);
+ this->build_LE_RHS();
for (unsigned i=0, iN=N(); i < iN; i++)
- m_RHS[i] = m_last_RHS[i];
-
- this->LE_solve();
+ m_last_RHS[i] = RHS(i);
this->m_stat_calculations++;
-
return this->solve_non_dynamic(newton_raphson);
}
@@ -597,9 +581,10 @@ matrix_solver_direct_t<m_N, _storage_N>::matrix_solver_direct_t(const solver_par
: matrix_solver_t(GAUSSIAN_ELIMINATION, params)
, m_dim(size)
{
- m_terms = palloc_array(terms_t *, N());
m_rails_temp = palloc_array(terms_t, N());
-
+#if (NL_USE_DYNAMIC_ALLOCATION)
+ m_A = palloc_array(nl_ext_double, N() * m_pitch);
+#endif
for (unsigned k = 0; k < N(); k++)
{
m_terms[k] = palloc(terms_t);
@@ -613,9 +598,10 @@ matrix_solver_direct_t<m_N, _storage_N>::matrix_solver_direct_t(const eSolverTyp
: matrix_solver_t(type, params)
, m_dim(size)
{
- m_terms = palloc_array(terms_t *, N());
m_rails_temp = palloc_array(terms_t, N());
-
+#if (NL_USE_DYNAMIC_ALLOCATION)
+ m_A = palloc_array(nl_ext_double, N() * m_pitch);
+#endif
for (unsigned k = 0; k < N(); k++)
{
m_terms[k] = palloc(terms_t);
diff --git a/src/lib/netlist/solver/nld_ms_direct1.h b/src/lib/netlist/solver/nld_ms_direct1.h
index fe5a439a9db..ab19c92a4cb 100644
--- a/src/lib/netlist/solver/nld_ms_direct1.h
+++ b/src/lib/netlist/solver/nld_ms_direct1.h
@@ -20,43 +20,33 @@ public:
matrix_solver_direct1_t(const solver_parameters_t *params)
: matrix_solver_direct_t<1, 1>(params, 1)
{}
- ATTR_HOT inline int vsolve_non_dynamic(const bool newton_raphson);
-protected:
- ATTR_HOT virtual nl_double vsolve() override;
-private:
+ virtual int vsolve_non_dynamic(const bool newton_raphson) override;
+
};
// ----------------------------------------------------------------------------------------
// matrix_solver - Direct1
// ----------------------------------------------------------------------------------------
-ATTR_HOT nl_double matrix_solver_direct1_t::vsolve()
-{
- solve_base<matrix_solver_direct1_t>(this);
- return this->compute_next_timestep();
-}
-
-ATTR_HOT inline int matrix_solver_direct1_t::vsolve_non_dynamic(ATTR_UNUSED const bool newton_raphson)
+inline int matrix_solver_direct1_t::vsolve_non_dynamic(ATTR_UNUSED const bool newton_raphson)
{
- analog_net_t *net = m_nets[0];
this->build_LE_A();
- this->build_LE_RHS(m_RHS);
+ this->build_LE_RHS();
//NL_VERBOSE_OUT(("{1} {2}\n", new_val, m_RHS[0] / m_A[0][0]);
- nl_double new_val = m_RHS[0] / A(0,0);
+ nl_double new_val[1] = { RHS(0) / A(0,0) };
- nl_double e = (new_val - net->Q_Analog());
- nl_double cerr = nl_math::abs(e);
-
- net->m_cur_Analog = new_val;
-
- if (is_dynamic() && (cerr > m_params.m_accuracy))
+ if (is_dynamic())
{
- return 2;
+ nl_double err = this->delta(new_val);
+ store(new_val);
+ if (err > m_params.m_accuracy )
+ return 2;
+ else
+ return 1;
}
- else
- return 1;
-
+ store(new_val);
+ return 1;
}
NETLIB_NAMESPACE_DEVICES_END()
diff --git a/src/lib/netlist/solver/nld_ms_direct2.h b/src/lib/netlist/solver/nld_ms_direct2.h
index 06f00302d3c..2488e573bf2 100644
--- a/src/lib/netlist/solver/nld_ms_direct2.h
+++ b/src/lib/netlist/solver/nld_ms_direct2.h
@@ -20,26 +20,18 @@ public:
matrix_solver_direct2_t(const solver_parameters_t *params)
: matrix_solver_direct_t<2, 2>(params, 2)
{}
- ATTR_HOT inline int vsolve_non_dynamic(const bool newton_raphson);
-protected:
- ATTR_HOT virtual nl_double vsolve() override;
-private:
+ virtual int vsolve_non_dynamic(const bool newton_raphson) override;
+
};
// ----------------------------------------------------------------------------------------
// matrix_solver - Direct2
// ----------------------------------------------------------------------------------------
-ATTR_HOT nl_double matrix_solver_direct2_t::vsolve()
-{
- solve_base<matrix_solver_direct2_t>(this);
- return this->compute_next_timestep();
-}
-
-ATTR_HOT inline int matrix_solver_direct2_t::vsolve_non_dynamic(ATTR_UNUSED const bool newton_raphson)
+inline int matrix_solver_direct2_t::vsolve_non_dynamic(ATTR_UNUSED const bool newton_raphson)
{
build_LE_A();
- build_LE_RHS(m_RHS);
+ build_LE_RHS();
const nl_double a = A(0,0);
const nl_double b = A(0,1);
@@ -47,8 +39,8 @@ ATTR_HOT inline int matrix_solver_direct2_t::vsolve_non_dynamic(ATTR_UNUSED cons
const nl_double d = A(1,1);
nl_double new_val[2];
- new_val[1] = (a * m_RHS[1] - c * m_RHS[0]) / (a * d - b * c);
- new_val[0] = (m_RHS[0] - b * new_val[1]) / a;
+ new_val[1] = (a * RHS(1) - c * RHS(0)) / (a * d - b * c);
+ new_val[0] = (RHS(0) - b * new_val[1]) / a;
if (is_dynamic())
{
diff --git a/src/lib/netlist/solver/nld_ms_direct_lu.h b/src/lib/netlist/solver/nld_ms_direct_lu.h
index 07b3b9cb568..2109b0f3e41 100644
--- a/src/lib/netlist/solver/nld_ms_direct_lu.h
+++ b/src/lib/netlist/solver/nld_ms_direct_lu.h
@@ -33,18 +33,16 @@ public:
virtual void vsetup(analog_net_t::list_t &nets) override;
virtual void reset() override { matrix_solver_t::reset(); }
- ATTR_HOT inline unsigned N() const { if (m_N == 0) return m_dim; else return m_N; }
+ inline unsigned N() const { if (m_N == 0) return m_dim; else return m_N; }
- ATTR_HOT inline int vsolve_non_dynamic(const bool newton_raphson);
+ inline int vsolve_non_dynamic(const bool newton_raphson);
protected:
virtual void add_term(int net_idx, terminal_t *term) override;
- ATTR_HOT virtual nl_double vsolve() override;
-
- ATTR_HOT int solve_non_dynamic(const bool newton_raphson);
- ATTR_HOT void build_LE_A();
- ATTR_HOT void build_LE_RHS(nl_double * RESTRICT rhs);
+ int solve_non_dynamic(const bool newton_raphson);
+ void build_LE_A();
+ void build_LE_RHS(nl_double * RESTRICT rhs);
template<unsigned k>
void LEk()
@@ -68,7 +66,7 @@ protected:
}
}
- ATTR_HOT void LE_solve()
+ void LE_solve()
{
const unsigned kN = N();
unsigned sk = 1;
@@ -127,15 +125,15 @@ protected:
}
}
}
- ATTR_HOT void LE_back_subst(nl_double * RESTRICT x);
- ATTR_HOT nl_double delta(const nl_double * RESTRICT V);
- ATTR_HOT void store(const nl_double * RESTRICT V);
+ void LE_back_subst(nl_double * RESTRICT x);
+ nl_double delta(const nl_double * RESTRICT V);
+ void store(const nl_double * RESTRICT V);
/* bring the whole system to the current time
* Don't schedule a new calculation time. The recalculation has to be
* triggered by the caller after the netlist element was changed.
*/
- ATTR_HOT nl_double compute_next_timestep();
+ nl_double compute_next_timestep();
template <typename T1, typename T2>
inline nl_ext_double &A(const T1 r, const T2 c) { return m_A[r][c]; }
@@ -171,7 +169,7 @@ matrix_solver_direct_t<m_N, _storage_N>::~matrix_solver_direct_t()
}
template <unsigned m_N, unsigned _storage_N>
-ATTR_HOT nl_double matrix_solver_direct_t<m_N, _storage_N>::compute_next_timestep()
+nl_double matrix_solver_direct_t<m_N, _storage_N>::compute_next_timestep()
{
nl_double new_solver_timestep = m_params.m_max_timestep;
@@ -245,7 +243,7 @@ ATTR_COLD void matrix_solver_direct_t<m_N, _storage_N>::vsetup(analog_net_t::lis
m_rails_temp[k].clear();
}
- matrix_solver_t::setup(nets);
+ matrix_solver_t::setup_base(nets);
for (unsigned k = 0; k < N(); k++)
{
@@ -373,7 +371,7 @@ ATTR_COLD void matrix_solver_direct_t<m_N, _storage_N>::vsetup(analog_net_t::lis
template <unsigned m_N, unsigned _storage_N>
-ATTR_HOT void matrix_solver_direct_t<m_N, _storage_N>::build_LE_A()
+void matrix_solver_direct_t<m_N, _storage_N>::build_LE_A()
{
const unsigned iN = N();
for (unsigned k = 0; k < iN; k++)
@@ -399,7 +397,7 @@ ATTR_HOT void matrix_solver_direct_t<m_N, _storage_N>::build_LE_A()
}
template <unsigned m_N, unsigned _storage_N>
-ATTR_HOT void matrix_solver_direct_t<m_N, _storage_N>::build_LE_RHS(nl_double * RESTRICT rhs)
+void matrix_solver_direct_t<m_N, _storage_N>::build_LE_RHS(nl_double * RESTRICT rhs)
{
const unsigned iN = N();
for (unsigned k = 0; k < iN; k++)
@@ -427,7 +425,7 @@ ATTR_HOT void matrix_solver_direct_t<m_N, _storage_N>::build_LE_RHS(nl_double *
#else
// Crout algo
template <unsigned m_N, unsigned _storage_N>
-ATTR_HOT void matrix_solver_direct_t<m_N, _storage_N>::LE_solve()
+void matrix_solver_direct_t<m_N, _storage_N>::LE_solve()
{
const unsigned kN = N();
@@ -509,7 +507,7 @@ ATTR_HOT void matrix_solver_direct_t<m_N, _storage_N>::LE_solve()
#endif
template <unsigned m_N, unsigned _storage_N>
-ATTR_HOT void matrix_solver_direct_t<m_N, _storage_N>::LE_back_subst(
+void matrix_solver_direct_t<m_N, _storage_N>::LE_back_subst(
nl_double * RESTRICT x)
{
const unsigned kN = N();
@@ -543,7 +541,7 @@ ATTR_HOT void matrix_solver_direct_t<m_N, _storage_N>::LE_back_subst(
}
template <unsigned m_N, unsigned _storage_N>
-ATTR_HOT nl_double matrix_solver_direct_t<m_N, _storage_N>::delta(
+nl_double matrix_solver_direct_t<m_N, _storage_N>::delta(
const nl_double * RESTRICT V)
{
/* FIXME: Ideally we should also include currents (RHS) here. This would
@@ -554,12 +552,12 @@ ATTR_HOT nl_double matrix_solver_direct_t<m_N, _storage_N>::delta(
const unsigned iN = this->N();
nl_double cerr = 0;
for (unsigned i = 0; i < iN; i++)
- cerr = std::max(cerr, nl_math::abs(V[i] - this->m_nets[i]->m_cur_Analog));
+ cerr = std::fmax(cerr, nl_math::abs(V[i] - this->m_nets[i]->m_cur_Analog));
return cerr;
}
template <unsigned m_N, unsigned _storage_N>
-ATTR_HOT void matrix_solver_direct_t<m_N, _storage_N>::store(
+void matrix_solver_direct_t<m_N, _storage_N>::store(
const nl_double * RESTRICT V)
{
for (unsigned i = 0, iN=N(); i < iN; i++)
@@ -568,16 +566,9 @@ ATTR_HOT void matrix_solver_direct_t<m_N, _storage_N>::store(
}
}
-template <unsigned m_N, unsigned _storage_N>
-ATTR_HOT nl_double matrix_solver_direct_t<m_N, _storage_N>::vsolve()
-{
- this->solve_base(this);
- return this->compute_next_timestep();
-}
-
template <unsigned m_N, unsigned _storage_N>
-ATTR_HOT int matrix_solver_direct_t<m_N, _storage_N>::solve_non_dynamic(ATTR_UNUSED const bool newton_raphson)
+int matrix_solver_direct_t<m_N, _storage_N>::solve_non_dynamic(ATTR_UNUSED const bool newton_raphson)
{
nl_double new_V[_storage_N]; // = { 0.0 };
@@ -599,7 +590,7 @@ ATTR_HOT int matrix_solver_direct_t<m_N, _storage_N>::solve_non_dynamic(ATTR_UNU
}
template <unsigned m_N, unsigned _storage_N>
-ATTR_HOT inline int matrix_solver_direct_t<m_N, _storage_N>::vsolve_non_dynamic(const bool newton_raphson)
+inline int matrix_solver_direct_t<m_N, _storage_N>::vsolve_non_dynamic(const bool newton_raphson)
{
this->build_LE_A();
this->build_LE_RHS(m_last_RHS);
@@ -607,8 +598,6 @@ ATTR_HOT inline int matrix_solver_direct_t<m_N, _storage_N>::vsolve_non_dynamic(
for (unsigned i=0, iN=N(); i < iN; i++)
m_RHS[i] = m_last_RHS[i];
- this->LE_solve();
-
return this->solve_non_dynamic(newton_raphson);
}
diff --git a/src/lib/netlist/solver/nld_ms_gmres.h b/src/lib/netlist/solver/nld_ms_gmres.h
index 0ae7f5eab56..6ff0d43f421 100644
--- a/src/lib/netlist/solver/nld_ms_gmres.h
+++ b/src/lib/netlist/solver/nld_ms_gmres.h
@@ -54,13 +54,11 @@ public:
}
virtual void vsetup(analog_net_t::list_t &nets) override;
- ATTR_HOT virtual int vsolve_non_dynamic(const bool newton_raphson);
-protected:
- ATTR_HOT virtual nl_double vsolve() override;
+ virtual int vsolve_non_dynamic(const bool newton_raphson) override;
private:
- int solve_ilu_gmres(nl_double * RESTRICT x, nl_double * RESTRICT rhs, const unsigned restart_max, const unsigned mr, nl_double accuracy);
+ int solve_ilu_gmres(nl_double * RESTRICT x, const nl_double * RESTRICT rhs, const unsigned restart_max, const unsigned mr, nl_double accuracy);
pvector_t<int> m_term_cr[_storage_N];
@@ -126,14 +124,7 @@ void matrix_solver_GMRES_t<m_N, _storage_N>::vsetup(analog_net_t::list_t &nets)
}
template <unsigned m_N, unsigned _storage_N>
-ATTR_HOT nl_double matrix_solver_GMRES_t<m_N, _storage_N>::vsolve()
-{
- this->solve_base(this);
- return this->compute_next_timestep();
-}
-
-template <unsigned m_N, unsigned _storage_N>
-ATTR_HOT inline int matrix_solver_GMRES_t<m_N, _storage_N>::vsolve_non_dynamic(const bool newton_raphson)
+int matrix_solver_GMRES_t<m_N, _storage_N>::vsolve_non_dynamic(const bool newton_raphson)
{
const unsigned iN = this->N();
@@ -166,6 +157,7 @@ ATTR_HOT inline int matrix_solver_GMRES_t<m_N, _storage_N>::vsolve_non_dynamic(c
const nl_double * const * RESTRICT other_cur_analog = this->m_terms[k]->other_curanalog();
l_V[k] = new_V[k] = this->m_nets[k]->m_cur_Analog;
+
for (unsigned i = 0; i < term_count; i++)
{
gtot_t = gtot_t + gt[i];
@@ -189,7 +181,7 @@ ATTR_HOT inline int matrix_solver_GMRES_t<m_N, _storage_N>::vsolve_non_dynamic(c
mat.ia[iN] = mat.nz_num;
const nl_double accuracy = this->m_params.m_accuracy;
-#if 1
+
int mr = _storage_N;
if (_storage_N > 3 )
mr = (int) sqrt(iN);
@@ -197,19 +189,12 @@ ATTR_HOT inline int matrix_solver_GMRES_t<m_N, _storage_N>::vsolve_non_dynamic(c
int iter = 4;
int gsl = solve_ilu_gmres(new_V, RHS, iter, mr, accuracy);
int failed = mr * iter;
-#else
- int failed = 6;
- //int gsl = tt_ilu_cr(new_V, RHS, failed, accuracy);
- int gsl = tt_gs_cr(new_V, RHS, failed, accuracy);
-#endif
+
this->m_iterative_total += gsl;
this->m_stat_calculations++;
if (gsl>=failed)
{
- //for (int k = 0; k < iN; k++)
- // this->m_nets[k]->m_cur_Analog = new_V[k];
- // Fallback to direct solver ...
this->m_iterative_fail++;
return matrix_solver_direct_t<m_N, _storage_N>::vsolve_non_dynamic(newton_raphson);
}
@@ -235,17 +220,18 @@ ATTR_HOT inline int matrix_solver_GMRES_t<m_N, _storage_N>::vsolve_non_dynamic(c
}
}
-static inline void givens_mult( const nl_double c, const nl_double s, nl_double * RESTRICT g0, nl_double * RESTRICT g1 )
+template <typename T>
+inline void givens_mult( const T c, const T s, T & g0, T & g1 )
{
- const double tg0 = c * *g0 - s * *g1;
- const double tg1 = s * *g0 + c * *g1;
+ const T tg0 = c * g0 - s * g1;
+ const T tg1 = s * g0 + c * g1;
- *g0 = tg0;
- *g1 = tg1;
+ g0 = tg0;
+ g1 = tg1;
}
template <unsigned m_N, unsigned _storage_N>
-int matrix_solver_GMRES_t<m_N, _storage_N>::solve_ilu_gmres (nl_double * RESTRICT x, nl_double * RESTRICT rhs, const unsigned restart_max, const unsigned mr, nl_double accuracy)
+int matrix_solver_GMRES_t<m_N, _storage_N>::solve_ilu_gmres (nl_double * RESTRICT x, const nl_double * RESTRICT rhs, const unsigned restart_max, const unsigned mr, nl_double accuracy)
{
/*-------------------------------------------------------------------------
* The code below was inspired by code published by John Burkardt under
@@ -351,7 +337,7 @@ int matrix_solver_GMRES_t<m_N, _storage_N>::solve_ilu_gmres (nl_double * RESTRIC
vec_scale(n, m_v[k1], NL_FCONST(1.0) / m_ht[k1][k]);
for (unsigned j = 0; j < k; j++)
- givens_mult(m_c[j], m_s[j], &m_ht[j][k], &m_ht[j+1][k]);
+ givens_mult(m_c[j], m_s[j], m_ht[j][k], m_ht[j+1][k]);
mu = std::sqrt(std::pow(m_ht[k][k], 2) + std::pow(m_ht[k1][k], 2));
@@ -360,7 +346,7 @@ int matrix_solver_GMRES_t<m_N, _storage_N>::solve_ilu_gmres (nl_double * RESTRIC
m_ht[k][k] = m_c[k] * m_ht[k][k] - m_s[k] * m_ht[k1][k];
m_ht[k1][k] = 0.0;
- givens_mult(m_c[k], m_s[k], &m_g[k], &m_g[k1]);
+ givens_mult(m_c[k], m_s[k], m_g[k], m_g[k1]);
rho = std::abs(m_g[k1]);
diff --git a/src/lib/netlist/solver/nld_ms_sm.h b/src/lib/netlist/solver/nld_ms_sm.h
new file mode 100644
index 00000000000..7336e060510
--- /dev/null
+++ b/src/lib/netlist/solver/nld_ms_sm.h
@@ -0,0 +1,674 @@
+// license:GPL-2.0+
+// copyright-holders:Couriersud
+/*
+ * nld_ms_direct.h
+ *
+ *
+ * Sherman-Morrison Solver
+ *
+ * Computes the updated inverse of A given that the change in A is
+ *
+ * A <- A + (u x v) u,v vectors
+ *
+ * In this specific implementation, u is a unit vector specifying the row which
+ * changed. Thus v contains the changed column.
+ *
+ * Than z = Aâ»Â¹ u , w = transpose(Aâ»Â¹) v , lambda = v z
+ *
+ * Aâ»Â¹ <- 1.0 / (1.0 + lambda) * (z x w)
+ *
+ * The approach is iterative and applied for each row changed.
+ *
+ * The performance for a typical circuit like kidniki compared to Gaussian
+ * elimination is poor:
+ *
+ * a) The code needs to be run for each row change.
+ * b) The inverse of A typically is fully occupied.
+ *
+ * It may have advantages for circuits with a high number of elements and only
+ * few dynamic/active components.
+ *
+ */
+
+#ifndef NLD_MS_SM_H_
+#define NLD_MS_SM_H_
+
+#include <algorithm>
+
+#include "solver/nld_solver.h"
+#include "solver/vector_base.h"
+
+NETLIB_NAMESPACE_DEVICES_START()
+
+//#define nl_ext_double __float128 // slow, very slow
+//#define nl_ext_double long double // slightly slower
+#define nl_ext_double nl_double
+
+template <unsigned m_N, unsigned _storage_N>
+class matrix_solver_sm_t: public matrix_solver_t
+{
+public:
+
+ matrix_solver_sm_t(const solver_parameters_t *params, const int size);
+ matrix_solver_sm_t(const eSolverType type, const solver_parameters_t *params, const int size);
+
+ virtual ~matrix_solver_sm_t();
+
+ virtual void vsetup(analog_net_t::list_t &nets) override;
+ virtual void reset() override { matrix_solver_t::reset(); }
+
+protected:
+ virtual void add_term(int net_idx, terminal_t *term) override;
+ virtual int vsolve_non_dynamic(const bool newton_raphson) override;
+ int solve_non_dynamic(const bool newton_raphson);
+
+ inline const unsigned N() const { if (m_N == 0) return m_dim; else return m_N; }
+
+ void build_LE_A();
+ void build_LE_RHS();
+ void LE_invert();
+
+ template <typename T>
+ void LE_compute_x(T * RESTRICT x);
+
+ template <typename T>
+ T delta(const T * RESTRICT V);
+
+ template <typename T>
+ void store(const T * RESTRICT V);
+
+ virtual netlist_time compute_next_timestep() override;
+
+ template <typename T1, typename T2>
+ inline nl_ext_double &A(const T1 &r, const T2 &c) { return m_A[r][c]; }
+ template <typename T1, typename T2>
+ inline nl_ext_double &W(const T1 &r, const T2 &c) { return m_W[r][c]; }
+ template <typename T1, typename T2>
+ inline nl_ext_double &Ainv(const T1 &r, const T2 &c) { return m_Ainv[r][c]; }
+ template <typename T1>
+ inline nl_ext_double &RHS(const T1 &r) { return m_RHS[r]; }
+
+
+ template <typename T1, typename T2>
+ inline nl_ext_double &lA(const T1 &r, const T2 &c) { return m_lA[r][c]; }
+ template <typename T1, typename T2>
+ inline nl_ext_double &lAinv(const T1 &r, const T2 &c) { return m_lAinv[r][c]; }
+
+ ATTR_ALIGN nl_double m_last_RHS[_storage_N]; // right hand side - contains currents
+ ATTR_ALIGN nl_double m_last_V[_storage_N];
+
+ terms_t * m_terms[_storage_N];
+ terms_t *m_rails_temp;
+
+private:
+ static const std::size_t m_pitch = ((( _storage_N) + 7) / 8) * 8;
+ ATTR_ALIGN nl_ext_double m_A[_storage_N][m_pitch];
+ ATTR_ALIGN nl_ext_double m_Ainv[_storage_N][m_pitch];
+ ATTR_ALIGN nl_ext_double m_W[_storage_N][m_pitch];
+ ATTR_ALIGN nl_ext_double m_RHS[_storage_N]; // right hand side - contains currents
+
+ ATTR_ALIGN nl_ext_double m_lA[_storage_N][m_pitch];
+ ATTR_ALIGN nl_ext_double m_lAinv[_storage_N][m_pitch];
+
+ //ATTR_ALIGN nl_ext_double m_RHSx[_storage_N];
+
+ const unsigned m_dim;
+
+};
+
+// ----------------------------------------------------------------------------------------
+// matrix_solver_direct
+// ----------------------------------------------------------------------------------------
+
+template <unsigned m_N, unsigned _storage_N>
+matrix_solver_sm_t<m_N, _storage_N>::~matrix_solver_sm_t()
+{
+ for (unsigned k = 0; k < N(); k++)
+ {
+ pfree(m_terms[k]);
+ }
+ pfree_array(m_rails_temp);
+#if (NL_USE_DYNAMIC_ALLOCATION)
+ pfree_array(m_A);
+#endif
+}
+
+template <unsigned m_N, unsigned _storage_N>
+netlist_time matrix_solver_sm_t<m_N, _storage_N>::compute_next_timestep()
+{
+ nl_double new_solver_timestep = m_params.m_max_timestep;
+
+ if (m_params.m_dynamic)
+ {
+ /*
+ * FIXME: We should extend the logic to use either all nets or
+ * only output nets.
+ */
+ for (unsigned k = 0, iN=N(); k < iN; k++)
+ {
+ analog_net_t *n = m_nets[k];
+
+ const nl_double DD_n = (n->Q_Analog() - m_last_V[k]);
+ const nl_double hn = current_timestep();
+
+ nl_double DD2 = (DD_n / hn - n->m_DD_n_m_1 / n->m_h_n_m_1) / (hn + n->m_h_n_m_1);
+ nl_double new_net_timestep;
+
+ n->m_h_n_m_1 = hn;
+ n->m_DD_n_m_1 = DD_n;
+ if (nl_math::abs(DD2) > NL_FCONST(1e-30)) // avoid div-by-zero
+ new_net_timestep = nl_math::sqrt(m_params.m_lte / nl_math::abs(NL_FCONST(0.5)*DD2));
+ else
+ new_net_timestep = m_params.m_max_timestep;
+
+ if (new_net_timestep < new_solver_timestep)
+ new_solver_timestep = new_net_timestep;
+
+ m_last_V[k] = n->Q_Analog();
+ }
+ if (new_solver_timestep < m_params.m_min_timestep)
+ new_solver_timestep = m_params.m_min_timestep;
+ }
+ //if (new_solver_timestep > 10.0 * hn)
+ // new_solver_timestep = 10.0 * hn;
+ return netlist_time::from_double(new_solver_timestep);
+}
+
+template <unsigned m_N, unsigned _storage_N>
+ATTR_COLD void matrix_solver_sm_t<m_N, _storage_N>::add_term(int k, terminal_t *term)
+{
+ if (term->m_otherterm->net().isRailNet())
+ {
+ m_rails_temp[k].add(term, -1, false);
+ }
+ else
+ {
+ int ot = get_net_idx(&term->m_otherterm->net());
+ if (ot>=0)
+ {
+ m_terms[k]->add(term, ot, true);
+ }
+ /* Should this be allowed ? */
+ else // if (ot<0)
+ {
+ m_rails_temp[k].add(term, ot, true);
+ log().fatal("found term with missing othernet {1}\n", term->name());
+ }
+ }
+}
+
+
+template <unsigned m_N, unsigned _storage_N>
+ATTR_COLD void matrix_solver_sm_t<m_N, _storage_N>::vsetup(analog_net_t::list_t &nets)
+{
+ if (m_dim < nets.size())
+ log().fatal("Dimension {1} less than {2}", m_dim, nets.size());
+
+ for (unsigned k = 0; k < N(); k++)
+ {
+ m_terms[k]->clear();
+ m_rails_temp[k].clear();
+ }
+
+ matrix_solver_t::setup_base(nets);
+
+ for (unsigned k = 0; k < N(); k++)
+ {
+ m_terms[k]->m_railstart = m_terms[k]->count();
+ for (unsigned i = 0; i < m_rails_temp[k].count(); i++)
+ this->m_terms[k]->add(m_rails_temp[k].terms()[i], m_rails_temp[k].net_other()[i], false);
+
+ m_rails_temp[k].clear(); // no longer needed
+ m_terms[k]->set_pointers();
+ }
+
+#if 1
+
+ /* Sort in descending order by number of connected matrix voltages.
+ * The idea is, that for Gauss-Seidel algo the first voltage computed
+ * depends on the greatest number of previous voltages thus taking into
+ * account the maximum amout of information.
+ *
+ * This actually improves performance on popeye slightly. Average
+ * GS computations reduce from 2.509 to 2.370
+ *
+ * Smallest to largest : 2.613
+ * Unsorted : 2.509
+ * Largest to smallest : 2.370
+ *
+ * Sorting as a general matrix pre-conditioning is mentioned in
+ * literature but I have found no articles about Gauss Seidel.
+ *
+ * For Gaussian Elimination however increasing order is better suited.
+ * FIXME: Even better would be to sort on elements right of the matrix diagonal.
+ *
+ */
+
+ int sort_order = (type() == GAUSS_SEIDEL ? 1 : -1);
+
+ for (unsigned k = 0; k < N() / 2; k++)
+ for (unsigned i = 0; i < N() - 1; i++)
+ {
+ if ((m_terms[i]->m_railstart - m_terms[i+1]->m_railstart) * sort_order < 0)
+ {
+ std::swap(m_terms[i], m_terms[i+1]);
+ std::swap(m_nets[i], m_nets[i+1]);
+ }
+ }
+
+ for (unsigned k = 0; k < N(); k++)
+ {
+ int *other = m_terms[k]->net_other();
+ for (unsigned i = 0; i < m_terms[k]->count(); i++)
+ if (other[i] != -1)
+ other[i] = get_net_idx(&m_terms[k]->terms()[i]->m_otherterm->net());
+ }
+
+#endif
+
+ /* create a list of non zero elements right of the diagonal
+ * These list anticipate the population of array elements by
+ * Gaussian elimination.
+ */
+ for (unsigned k = 0; k < N(); k++)
+ {
+ terms_t * t = m_terms[k];
+ /* pretty brutal */
+ int *other = t->net_other();
+
+ t->m_nz.clear();
+
+ if (k==0)
+ t->m_nzrd.clear();
+ else
+ {
+ t->m_nzrd = m_terms[k-1]->m_nzrd;
+ unsigned j=0;
+ while(j < t->m_nzrd.size())
+ {
+ if (t->m_nzrd[j] < k + 1)
+ t->m_nzrd.remove_at(j);
+ else
+ j++;
+ }
+ }
+
+ for (unsigned i = 0; i < t->m_railstart; i++)
+ {
+ if (!t->m_nzrd.contains(other[i]) && other[i] >= (int) (k + 1))
+ t->m_nzrd.push_back(other[i]);
+ if (!t->m_nz.contains(other[i]))
+ t->m_nz.push_back(other[i]);
+ }
+
+ /* and sort */
+ psort_list(t->m_nzrd);
+
+ t->m_nz.push_back(k); // add diagonal
+
+ psort_list(t->m_nz);
+ }
+
+ /* create a list of non zero elements below diagonal k
+ * This should reduce cache misses ...
+ */
+
+ bool touched[_storage_N][_storage_N] = { { false } };
+ for (unsigned k = 0; k < N(); k++)
+ {
+ m_terms[k]->m_nzbd.clear();
+ for (unsigned j = 0; j < m_terms[k]->m_nz.size(); j++)
+ touched[k][m_terms[k]->m_nz[j]] = true;
+ }
+
+ for (unsigned k = 0; k < N(); k++)
+ {
+ for (unsigned row = k + 1; row < N(); row++)
+ {
+ if (touched[row][k])
+ {
+ if (!m_terms[k]->m_nzbd.contains(row))
+ m_terms[k]->m_nzbd.push_back(row);
+ for (unsigned col = k; col < N(); col++)
+ if (touched[k][col])
+ touched[row][col] = true;
+ }
+ }
+ }
+
+ if (0)
+ for (unsigned k = 0; k < N(); k++)
+ {
+ pstring line = pfmt("{1}")(k, "3");
+ for (unsigned j = 0; j < m_terms[k]->m_nzrd.size(); j++)
+ line += pfmt(" {1}")(m_terms[k]->m_nzrd[j], "3");
+ log().verbose("{1}", line);
+ }
+
+ /*
+ * save states
+ */
+ save(NLNAME(m_last_RHS));
+ save(NLNAME(m_last_V));
+
+ for (unsigned k = 0; k < N(); k++)
+ {
+ pstring num = pfmt("{1}")(k);
+
+ save(RHS(k), "RHS" + num);
+
+ save(m_terms[k]->go(),"GO" + num, m_terms[k]->count());
+ save(m_terms[k]->gt(),"GT" + num, m_terms[k]->count());
+ save(m_terms[k]->Idr(),"IDR" + num , m_terms[k]->count());
+ }
+
+}
+
+
+template <unsigned m_N, unsigned _storage_N>
+void matrix_solver_sm_t<m_N, _storage_N>::build_LE_A()
+{
+ const unsigned iN = N();
+ for (unsigned k = 0; k < iN; k++)
+ {
+ for (unsigned i=0; i < iN; i++)
+ A(k,i) = 0.0;
+
+ const unsigned terms_count = m_terms[k]->count();
+ const unsigned railstart = m_terms[k]->m_railstart;
+ const nl_double * RESTRICT gt = m_terms[k]->gt();
+
+ {
+ nl_double akk = 0.0;
+ for (unsigned i = 0; i < terms_count; i++)
+ akk += gt[i];
+
+ A(k,k) = akk;
+ }
+
+ const nl_double * RESTRICT go = m_terms[k]->go();
+ const int * RESTRICT net_other = m_terms[k]->net_other();
+
+ for (unsigned i = 0; i < railstart; i++)
+ A(k,net_other[i]) -= go[i];
+ }
+}
+
+template <unsigned m_N, unsigned _storage_N>
+void matrix_solver_sm_t<m_N, _storage_N>::build_LE_RHS()
+{
+ const unsigned iN = N();
+ for (unsigned k = 0; k < iN; k++)
+ {
+ nl_double rhsk_a = 0.0;
+ nl_double rhsk_b = 0.0;
+
+ const int terms_count = m_terms[k]->count();
+ const nl_double * RESTRICT go = m_terms[k]->go();
+ const nl_double * RESTRICT Idr = m_terms[k]->Idr();
+ const nl_double * const * RESTRICT other_cur_analog = m_terms[k]->other_curanalog();
+
+ for (int i = 0; i < terms_count; i++)
+ rhsk_a = rhsk_a + Idr[i];
+
+ for (int i = m_terms[k]->m_railstart; i < terms_count; i++)
+ //rhsk = rhsk + go[i] * terms[i]->m_otherterm->net().as_analog().Q_Analog();
+ rhsk_b = rhsk_b + go[i] * *other_cur_analog[i];
+
+ RHS(k) = rhsk_a + rhsk_b;
+ }
+}
+
+template <unsigned m_N, unsigned _storage_N>
+void matrix_solver_sm_t<m_N, _storage_N>::LE_invert()
+{
+ const unsigned kN = N();
+
+ for (unsigned i = 0; i < kN; i++)
+ {
+ for (unsigned j = 0; j < kN; j++)
+ {
+ W(i,j) = lA(i,j) = A(i,j);
+ Ainv(i,j) = 0.0;
+ }
+ Ainv(i,i) = 1.0;
+ }
+ /* down */
+ for (unsigned i = 0; i < kN; i++)
+ {
+ /* FIXME: Singular matrix? */
+ const nl_double f = 1.0 / W(i,i);
+ const unsigned * RESTRICT const p = m_terms[i]->m_nzrd.data();
+ const unsigned e = m_terms[i]->m_nzrd.size();
+
+ /* Eliminate column i from row j */
+
+ const unsigned * RESTRICT const pb = m_terms[i]->m_nzbd.data();
+ const unsigned eb = m_terms[i]->m_nzbd.size();
+ for (unsigned jb = 0; jb < eb; jb++)
+ {
+ const unsigned j = pb[jb];
+ const nl_double f1 = - W(j,i) * f;
+ if (f1 != 0.0)
+ {
+ for (unsigned k = 0; k < e; k++)
+ W(j,p[k]) += W(i,p[k]) * f1;
+ for (unsigned k = 0; k <= i; k ++)
+ Ainv(j,k) += Ainv(i,k) * f1;
+ }
+ }
+ }
+ /* up */
+ for (int i = kN - 1; i >= 0; i--)
+ {
+ /* FIXME: Singular matrix? */
+ const nl_double f = 1.0 / W(i,i);
+ for (int j = i - 1; j>=0; j--)
+ {
+ const nl_double f1 = - W(j,i) * f;
+ if (f1 != 0.0)
+ {
+ for (unsigned k = i; k < kN; k++)
+ W(j,k) += W(i,k) * f1;
+ for (unsigned k = 0; k < kN; k++)
+ Ainv(j,k) += Ainv(i,k) * f1;
+ }
+ }
+ for (unsigned k = 0; k < kN; k++)
+ {
+ Ainv(i,k) *= f;
+ lAinv(i,k) = Ainv(i,k);
+ }
+ }
+}
+
+template <unsigned m_N, unsigned _storage_N>
+template <typename T>
+void matrix_solver_sm_t<m_N, _storage_N>::LE_compute_x(
+ T * RESTRICT x)
+{
+ const unsigned kN = N();
+
+ for (int i=0; i<kN; i++)
+ x[i] = 0.0;
+
+ for (int k=0; k<kN; k++)
+ {
+ const nl_double f = RHS(k);
+
+ for (int i=0; i<kN; i++)
+ x[i] += Ainv(i,k) * f;
+ }
+}
+
+
+template <unsigned m_N, unsigned _storage_N>
+template <typename T>
+T matrix_solver_sm_t<m_N, _storage_N>::delta(
+ const T * RESTRICT V)
+{
+ /* FIXME: Ideally we should also include currents (RHS) here. This would
+ * need a revaluation of the right hand side after voltages have been updated
+ * and thus belong into a different calculation. This applies to all solvers.
+ */
+
+ const unsigned iN = this->N();
+ T cerr = 0;
+ for (unsigned i = 0; i < iN; i++)
+ cerr = std::fmax(cerr, nl_math::abs(V[i] - (T) this->m_nets[i]->m_cur_Analog));
+ return cerr;
+}
+
+template <unsigned m_N, unsigned _storage_N>
+template <typename T>
+void matrix_solver_sm_t<m_N, _storage_N>::store(
+ const T * RESTRICT V)
+{
+ for (unsigned i = 0, iN=N(); i < iN; i++)
+ {
+ this->m_nets[i]->m_cur_Analog = V[i];
+ }
+}
+
+
+template <unsigned m_N, unsigned _storage_N>
+int matrix_solver_sm_t<m_N, _storage_N>::solve_non_dynamic(ATTR_UNUSED const bool newton_raphson)
+{
+ static const bool incremental = true;
+ static uint cnt = 0;
+
+ nl_double new_V[_storage_N]; // = { 0.0 };
+
+ if (0 || ((cnt % 200) == 0))
+ {
+ /* complete calculation */
+ this->LE_invert();
+ }
+ else
+ {
+ const auto iN = N();
+
+ if (not incremental)
+ {
+ for (int row = 0; row < iN; row ++)
+ for (int k = 0; k < iN; k++)
+ Ainv(row,k) = lAinv(row, k);
+ }
+ for (int row = 0; row < iN; row ++)
+ {
+ nl_double v[m_pitch] = {0};
+ unsigned cols[m_pitch];
+ unsigned colcount = 0;
+
+ auto &nz = m_terms[row]->m_nz;
+ for (auto & col : nz)
+ {
+ v[col] = A(row,col) - lA(row,col);
+ if (incremental)
+ lA(row,col) = A(row,col);
+ if (v[col] != 0.0)
+ cols[colcount++] = col;
+ }
+
+ if (colcount > 0)
+ {
+ nl_double lamba = 0.0;
+ nl_double w[m_pitch] = {0};
+ nl_double z[m_pitch];
+ /* compute w and lamba */
+ for (unsigned i = 0; i < iN; i++)
+ z[i] = Ainv(i, row); /* u is row'th column */
+
+ for (unsigned j = 0; j < colcount; j++)
+ lamba += v[cols[j]] * z[cols[j]];
+
+ for (unsigned j=0; j<colcount; j++)
+ {
+ auto col = cols[j];
+ auto f = v[col];
+ for (unsigned k = 0; k < iN; k++)
+ w[k] += Ainv(col,k) * f; /* Transpose(Ainv) * v */
+ }
+
+ lamba = -1.0 / (1.0 + lamba);
+ for (int i=0; i<iN; i++)
+ {
+ const nl_double f = lamba * z[i];
+ if (f != 0.0)
+ for (int k = 0; k < iN; k++)
+ Ainv(i,k) += f * w[k];
+ }
+ }
+
+ }
+ }
+
+ cnt++;
+
+ this->LE_compute_x(new_V);
+
+ if (newton_raphson)
+ {
+ nl_double err = delta(new_V);
+
+ store(new_V);
+
+ return (err > this->m_params.m_accuracy) ? 2 : 1;
+ }
+ else
+ {
+ store(new_V);
+ return 1;
+ }
+}
+
+template <unsigned m_N, unsigned _storage_N>
+inline int matrix_solver_sm_t<m_N, _storage_N>::vsolve_non_dynamic(const bool newton_raphson)
+{
+ this->build_LE_A();
+ this->build_LE_RHS();
+
+ for (unsigned i=0, iN=N(); i < iN; i++)
+ m_last_RHS[i] = RHS(i);
+
+ this->m_stat_calculations++;
+ return this->solve_non_dynamic(newton_raphson);
+}
+
+template <unsigned m_N, unsigned _storage_N>
+matrix_solver_sm_t<m_N, _storage_N>::matrix_solver_sm_t(const solver_parameters_t *params, const int size)
+: matrix_solver_t(GAUSSIAN_ELIMINATION, params)
+, m_dim(size)
+{
+ m_rails_temp = palloc_array(terms_t, N());
+#if (NL_USE_DYNAMIC_ALLOCATION)
+ m_A = palloc_array(nl_ext_double, N() * m_pitch);
+#endif
+ for (unsigned k = 0; k < N(); k++)
+ {
+ m_terms[k] = palloc(terms_t);
+ m_last_RHS[k] = 0.0;
+ m_last_V[k] = 0.0;
+ }
+}
+
+template <unsigned m_N, unsigned _storage_N>
+matrix_solver_sm_t<m_N, _storage_N>::matrix_solver_sm_t(const eSolverType type, const solver_parameters_t *params, const int size)
+: matrix_solver_t(type, params)
+, m_dim(size)
+{
+ m_rails_temp = palloc_array(terms_t, N());
+#if (NL_USE_DYNAMIC_ALLOCATION)
+ m_A = palloc_array(nl_ext_double, N() * m_pitch);
+#endif
+ for (unsigned k = 0; k < N(); k++)
+ {
+ m_terms[k] = palloc(terms_t);
+ m_last_RHS[k] = 0.0;
+ m_last_V[k] = 0.0;
+ }
+}
+
+NETLIB_NAMESPACE_DEVICES_END()
+
+#endif /* NLD_MS_DIRECT_H_ */
diff --git a/src/lib/netlist/solver/nld_ms_sor.h b/src/lib/netlist/solver/nld_ms_sor.h
index 556e9fddd7f..1805b23a9d0 100644
--- a/src/lib/netlist/solver/nld_ms_sor.h
+++ b/src/lib/netlist/solver/nld_ms_sor.h
@@ -33,9 +33,7 @@ public:
virtual ~matrix_solver_SOR_t() {}
virtual void vsetup(analog_net_t::list_t &nets) override;
- ATTR_HOT virtual int vsolve_non_dynamic(const bool newton_raphson);
-protected:
- ATTR_HOT virtual nl_double vsolve() override;
+ virtual int vsolve_non_dynamic(const bool newton_raphson) override;
private:
nl_double m_lp_fact;
@@ -54,14 +52,7 @@ void matrix_solver_SOR_t<m_N, _storage_N>::vsetup(analog_net_t::list_t &nets)
}
template <unsigned m_N, unsigned _storage_N>
-ATTR_HOT nl_double matrix_solver_SOR_t<m_N, _storage_N>::vsolve()
-{
- this->solve_base(this);
- return this->compute_next_timestep();
-}
-
-template <unsigned m_N, unsigned _storage_N>
-ATTR_HOT inline int matrix_solver_SOR_t<m_N, _storage_N>::vsolve_non_dynamic(const bool newton_raphson)
+int matrix_solver_SOR_t<m_N, _storage_N>::vsolve_non_dynamic(const bool newton_raphson)
{
const unsigned iN = this->N();
bool resched = false;
diff --git a/src/lib/netlist/solver/nld_ms_sor_mat.h b/src/lib/netlist/solver/nld_ms_sor_mat.h
index 4312c3039be..a4fce8dec2a 100644
--- a/src/lib/netlist/solver/nld_ms_sor_mat.h
+++ b/src/lib/netlist/solver/nld_ms_sor_mat.h
@@ -37,9 +37,7 @@ public:
virtual void vsetup(analog_net_t::list_t &nets) override;
- ATTR_HOT inline int vsolve_non_dynamic(const bool newton_raphson);
-protected:
- ATTR_HOT virtual nl_double vsolve() override;
+ virtual int vsolve_non_dynamic(const bool newton_raphson) override;
private:
nl_double m_Vdelta[_storage_N];
@@ -65,9 +63,10 @@ void matrix_solver_SOR_mat_t<m_N, _storage_N>::vsetup(analog_net_t::list_t &nets
this->save(NLNAME(m_Vdelta));
}
-
+#if 0
+//FIXME: move to solve_base
template <unsigned m_N, unsigned _storage_N>
-ATTR_HOT nl_double matrix_solver_SOR_mat_t<m_N, _storage_N>::vsolve()
+nl_double matrix_solver_SOR_mat_t<m_N, _storage_N>::vsolve()
{
/*
* enable linear prediction on first newton pass
@@ -111,9 +110,10 @@ ATTR_HOT nl_double matrix_solver_SOR_mat_t<m_N, _storage_N>::vsolve()
return this->compute_next_timestep();
}
+#endif
template <unsigned m_N, unsigned _storage_N>
-ATTR_HOT inline int matrix_solver_SOR_mat_t<m_N, _storage_N>::vsolve_non_dynamic(const bool newton_raphson)
+int matrix_solver_SOR_mat_t<m_N, _storage_N>::vsolve_non_dynamic(const bool newton_raphson)
{
/* The matrix based code looks a lot nicer but actually is 30% slower than
* the optimized code which works directly on the data structures.
@@ -129,7 +129,7 @@ ATTR_HOT inline int matrix_solver_SOR_mat_t<m_N, _storage_N>::vsolve_non_dynamic
int resched_cnt = 0;
this->build_LE_A();
- this->build_LE_RHS(this->m_RHS);
+ this->build_LE_RHS();
#if 0
static int ws_cnt = 0;
@@ -184,7 +184,7 @@ ATTR_HOT inline int matrix_solver_SOR_mat_t<m_N, _storage_N>::vsolve_non_dynamic
for (unsigned i = 0; i < e; i++)
Idrive = Idrive + this->A(k,p[i]) * new_v[p[i]];
- const nl_double delta = m_omega * (this->m_RHS[k] - Idrive) / this->A(k,k);
+ const nl_double delta = m_omega * (this->RHS(k) - Idrive) / this->A(k,k);
cerr = std::max(cerr, nl_math::abs(delta));
new_v[k] += delta;
}
@@ -204,7 +204,6 @@ ATTR_HOT inline int matrix_solver_SOR_mat_t<m_N, _storage_N>::vsolve_non_dynamic
//this->netlist().warning("Falling back to direct solver .. Consider increasing RESCHED_LOOPS");
this->m_gs_fail++;
- this->LE_solve();
return matrix_solver_direct_t<m_N, _storage_N>::solve_non_dynamic(newton_raphson);
}
else {
diff --git a/src/lib/netlist/solver/nld_solver.cpp b/src/lib/netlist/solver/nld_solver.cpp
index 3c8b0f4a663..388f21bda77 100644
--- a/src/lib/netlist/solver/nld_solver.cpp
+++ b/src/lib/netlist/solver/nld_solver.cpp
@@ -31,23 +31,27 @@
#include <iostream>
#include <algorithm>
+//#include "nld_twoterm.h"
+#include "nl_lists.h"
+
+#if HAS_OPENMP
+#include "omp.h"
+#endif
+
#include "nld_solver.h"
+#include "nld_matrix_solver.h"
+
#if 1
#include "nld_ms_direct.h"
#else
#include "nld_ms_direct_lu.h"
#endif
+#include "nld_ms_sm.h"
#include "nld_ms_direct1.h"
#include "nld_ms_direct2.h"
#include "nld_ms_sor.h"
#include "nld_ms_sor_mat.h"
#include "nld_ms_gmres.h"
-//#include "nld_twoterm.h"
-#include "nl_lists.h"
-
-#if HAS_OPENMP
-#include "omp.h"
-#endif
NETLIB_NAMESPACE_DEVICES_START()
@@ -79,9 +83,7 @@ ATTR_COLD void terms_t::set_pointers()
{
for (unsigned i = 0; i < count(); i++)
{
- m_term[i]->m_gt1 = &m_gt[i];
- m_term[i]->m_go1 = &m_go[i];
- m_term[i]->m_Idr1 = &m_Idr[i];
+ m_term[i]->set_ptrs(&m_gt[i], &m_go[i], &m_Idr[i]);
m_other_curanalog[i] = &m_term[i]->m_otherterm->net().m_cur_Analog;
}
}
@@ -107,7 +109,7 @@ ATTR_COLD matrix_solver_t::~matrix_solver_t()
m_inps.clear_and_free();
}
-ATTR_COLD void matrix_solver_t::setup(analog_net_t::list_t &nets)
+ATTR_COLD void matrix_solver_t::setup_base(analog_net_t::list_t &nets)
{
log().debug("New solver setup\n");
@@ -187,14 +189,14 @@ ATTR_COLD void matrix_solver_t::setup(analog_net_t::list_t &nets)
}
-ATTR_HOT void matrix_solver_t::update_inputs()
+void matrix_solver_t::update_inputs()
{
// avoid recursive calls. Inputs are updated outside this call
for (std::size_t i=0; i<m_inps.size(); i++)
m_inps[i]->set_Q(m_inps[i]->m_proxied_net->Q_Analog());
}
-ATTR_HOT void matrix_solver_t::update_dynamic()
+void matrix_solver_t::update_dynamic()
{
/* update all non-linear devices */
for (std::size_t i=0; i < m_dynamic_devices.size(); i++)
@@ -224,29 +226,28 @@ ATTR_COLD void matrix_solver_t::reset()
ATTR_COLD void matrix_solver_t::update()
{
- const nl_double new_timestep = solve();
+ const netlist_time new_timestep = solve();
- if (m_params.m_dynamic && is_timestep() && new_timestep > 0)
- m_Q_sync.net().reschedule_in_queue(netlist_time::from_double(new_timestep));
+ if (m_params.m_dynamic && is_timestep() && new_timestep > netlist_time::zero)
+ m_Q_sync.net().reschedule_in_queue(new_timestep);
}
ATTR_COLD void matrix_solver_t::update_forced()
{
- ATTR_UNUSED const nl_double new_timestep = solve();
+ ATTR_UNUSED const netlist_time new_timestep = solve();
if (m_params.m_dynamic && is_timestep())
m_Q_sync.net().reschedule_in_queue(netlist_time::from_double(m_params.m_min_timestep));
}
-ATTR_HOT void matrix_solver_t::step(const netlist_time delta)
+void matrix_solver_t::step(const netlist_time &delta)
{
const nl_double dd = delta.as_double();
for (std::size_t k=0; k < m_step_devices.size(); k++)
m_step_devices[k]->step_time(dd);
}
-template<class C >
-void matrix_solver_t::solve_base(C *p)
+netlist_time matrix_solver_t::solve_base()
{
m_stat_vsolver_calls++;
if (is_dynamic())
@@ -257,7 +258,7 @@ void matrix_solver_t::solve_base(C *p)
{
update_dynamic();
// Gauss-Seidel will revert to Gaussian elemination if steps exceeded.
- this_resched = p->vsolve_non_dynamic(true);
+ this_resched = this->vsolve_non_dynamic(true);
newton_loops++;
} while (this_resched > 1 && newton_loops < m_params.m_nr_loops);
@@ -271,11 +272,12 @@ void matrix_solver_t::solve_base(C *p)
}
else
{
- p->vsolve_non_dynamic(false);
+ this->vsolve_non_dynamic(false);
}
+ return this->compute_next_timestep();
}
-ATTR_HOT nl_double matrix_solver_t::solve()
+netlist_time matrix_solver_t::solve()
{
const netlist_time now = netlist().time();
const netlist_time delta = now - m_last_step;
@@ -283,7 +285,7 @@ ATTR_HOT nl_double matrix_solver_t::solve()
// We are already up to date. Avoid oscillations.
// FIXME: Make this a parameter!
if (delta < netlist_time::from_nsec(1)) // 20000
- return -1.0;
+ return netlist_time::from_nsec(0);
/* update all terminals for new time step */
m_last_step = now;
@@ -291,7 +293,7 @@ ATTR_HOT nl_double matrix_solver_t::solve()
step(delta);
- const nl_double next_time_step = vsolve();
+ const netlist_time next_time_step = solve_base();
update_inputs();
return next_time_step;
@@ -307,7 +309,7 @@ ATTR_COLD int matrix_solver_t::get_net_idx(net_t *net)
void matrix_solver_t::log_stats()
{
- //if (this->m_stat_calculations != 0 && this->m_params.m_log_stats)
+ if (this->m_stat_calculations != 0 && this->m_stat_vsolver_calls && this->m_params.m_log_stats)
{
log().verbose("==============================================");
log().verbose("Solver {1}", this->name());
@@ -360,7 +362,7 @@ NETLIB_START(solver)
/* automatic time step */
register_param("DYNAMIC_TS", m_dynamic, 0);
- register_param("LTE", m_lte, 5e-5); // diff/timestep
+ register_param("DYNAMIC_LTE", m_lte, 5e-5); // diff/timestep
register_param("MIN_TIMESTEP", m_min_timestep, 1e-6); // nl_double timestep resolution
register_param("LOG_STATS", m_log_stats, 1); // nl_double timestep resolution
@@ -429,7 +431,7 @@ NETLIB_UPDATE(solver)
for (auto & solver : m_mat_solvers)
if (solver->is_timestep())
// Ignore return value
- ATTR_UNUSED const nl_double ts = solver->solve();
+ ATTR_UNUSED const netlist_time ts = solver->solve();
#endif
/* step circuit */
@@ -457,7 +459,13 @@ matrix_solver_t * NETLIB_NAME(solver)::create_solver(int size, const bool use_sp
}
else if (pstring("MAT").equals(m_iterative_solver))
{
- typedef matrix_solver_direct_t<m_N,_storage_N> solver_mat;
+ typedef matrix_solver_sm_t<m_N,_storage_N> solver_mat;
+ return palloc(solver_mat(&m_params, size));
+ }
+ else if (pstring("SM").equals(m_iterative_solver))
+ {
+ /* Sherman-Morrison Formula */
+ typedef matrix_solver_sm_t<m_N,_storage_N> solver_mat;
return palloc(solver_mat(&m_params, size));
}
else if (pstring("SOR").equals(m_iterative_solver))
@@ -620,7 +628,7 @@ ATTR_COLD void NETLIB_NAME(solver)::post_start()
register_sub(pfmt("Solver_{1}")(m_mat_solvers.size()), *ms);
- ms->vsetup(grp);
+ ms->setup(grp);
m_mat_solvers.push_back(ms);
diff --git a/src/lib/netlist/solver/nld_solver.h b/src/lib/netlist/solver/nld_solver.h
index 06a98d063c6..6d08e0bbb73 100644
--- a/src/lib/netlist/solver/nld_solver.h
+++ b/src/lib/netlist/solver/nld_solver.h
@@ -48,134 +48,7 @@ struct solver_parameters_t
};
-class terms_t
-{
- P_PREVENT_COPYING(terms_t)
-
- public:
- ATTR_COLD terms_t() : m_railstart(0)
- {}
-
- ATTR_COLD void clear()
- {
- m_term.clear();
- m_net_other.clear();
- m_gt.clear();
- m_go.clear();
- m_Idr.clear();
- m_other_curanalog.clear();
- }
-
- ATTR_COLD void add(terminal_t *term, int net_other, bool sorted);
-
- ATTR_HOT inline unsigned count() { return m_term.size(); }
-
- ATTR_HOT inline terminal_t **terms() { return m_term.data(); }
- ATTR_HOT inline int *net_other() { return m_net_other.data(); }
- ATTR_HOT inline nl_double *gt() { return m_gt.data(); }
- ATTR_HOT inline nl_double *go() { return m_go.data(); }
- ATTR_HOT inline nl_double *Idr() { return m_Idr.data(); }
- ATTR_HOT inline nl_double **other_curanalog() { return m_other_curanalog.data(); }
-
- ATTR_COLD void set_pointers();
-
- unsigned m_railstart;
-
- pvector_t<unsigned> m_nz; /* all non zero for multiplication */
- pvector_t<unsigned> m_nzrd; /* non zero right of the diagonal for elimination */
- pvector_t<unsigned> m_nzbd; /* non zero below of the diagonal for elimination */
-private:
- pvector_t<terminal_t *> m_term;
- pvector_t<int> m_net_other;
- pvector_t<nl_double> m_go;
- pvector_t<nl_double> m_gt;
- pvector_t<nl_double> m_Idr;
- pvector_t<nl_double *> m_other_curanalog;
-};
-
-class matrix_solver_t : public device_t
-{
-public:
- typedef pvector_t<matrix_solver_t *> list_t;
- typedef core_device_t::list_t dev_list_t;
-
- enum eSolverType
- {
- GAUSSIAN_ELIMINATION,
- GAUSS_SEIDEL
- };
-
- ATTR_COLD matrix_solver_t(const eSolverType type, const solver_parameters_t *params);
- virtual ~matrix_solver_t();
-
- virtual void vsetup(analog_net_t::list_t &nets) = 0;
-
- template<class C>
- void solve_base(C *p);
-
- ATTR_HOT nl_double solve();
-
- ATTR_HOT inline bool is_dynamic() { return m_dynamic_devices.size() > 0; }
- ATTR_HOT inline bool is_timestep() { return m_step_devices.size() > 0; }
-
- ATTR_HOT void update_forced();
- ATTR_HOT inline void update_after(const netlist_time after)
- {
- m_Q_sync.net().reschedule_in_queue(after);
- }
-
- /* netdevice functions */
- ATTR_HOT virtual void update() override;
- virtual void start() override;
- virtual void reset() override;
-
- ATTR_COLD int get_net_idx(net_t *net);
-
- inline eSolverType type() const { return m_type; }
- plog_base<NL_DEBUG> &log() { return netlist().log(); }
-
- virtual void log_stats();
-
-protected:
-
- ATTR_COLD void setup(analog_net_t::list_t &nets);
- ATTR_HOT void update_dynamic();
-
- // should return next time step
- ATTR_HOT virtual nl_double vsolve() = 0;
-
- virtual void add_term(int net_idx, terminal_t *term) = 0;
-
- pvector_t<analog_net_t *> m_nets;
- pvector_t<analog_output_t *> m_inps;
-
- int m_stat_calculations;
- int m_stat_newton_raphson;
- int m_stat_vsolver_calls;
- int m_iterative_fail;
- int m_iterative_total;
-
- const solver_parameters_t &m_params;
-
- ATTR_HOT inline nl_double current_timestep() { return m_cur_ts; }
-private:
-
- netlist_time m_last_step;
- nl_double m_cur_ts;
- dev_list_t m_step_devices;
- dev_list_t m_dynamic_devices;
-
- logic_input_t m_fb_sync;
- logic_output_t m_Q_sync;
-
- ATTR_HOT void step(const netlist_time delta);
-
- ATTR_HOT void update_inputs();
-
- const eSolverType m_type;
-};
-
-
+class matrix_solver_t;
class NETLIB_NAME(solver) : public device_t
{
@@ -188,13 +61,13 @@ public:
ATTR_COLD void post_start();
ATTR_COLD void stop() override;
- ATTR_HOT inline nl_double gmin() { return m_gmin.Value(); }
+ inline nl_double gmin() { return m_gmin.Value(); }
protected:
- ATTR_HOT void update() override;
- ATTR_HOT void start() override;
- ATTR_HOT void reset() override;
- ATTR_HOT void update_param() override;
+ void update() override;
+ void start() override;
+ void reset() override;
+ void update_param() override;
logic_input_t m_fb_step;
logic_output_t m_Q_step;
@@ -217,7 +90,7 @@ protected:
param_logic_t m_log_stats;
- matrix_solver_t::list_t m_mat_solvers;
+ pvector_t<matrix_solver_t *> m_mat_solvers;
private:
solver_parameters_t m_params;
diff --git a/src/mame/audio/irem.cpp b/src/mame/audio/irem.cpp
index 0020c880c30..0a7469091fc 100644
--- a/src/mame/audio/irem.cpp
+++ b/src/mame/audio/irem.cpp
@@ -419,11 +419,14 @@ NETLIST_START(kidniki_interface)
PARAM(Solver.NR_LOOPS, 300)
PARAM(Solver.GS_LOOPS, 1)
PARAM(Solver.GS_THRESHOLD, 6)
- //PARAM(Solver.ITERATIVE, "SOR")
+ PARAM(Solver.ITERATIVE, "SOR")
//PARAM(Solver.ITERATIVE, "MAT")
- PARAM(Solver.ITERATIVE, "GMRES")
- PARAM(Solver.PARALLEL, 1)
+ //PARAM(Solver.ITERATIVE, "GMRES")
+ PARAM(Solver.PARALLEL, 0)
PARAM(Solver.SOR_FACTOR, 1.00)
+ PARAM(Solver.DYNAMIC_TS, 0)
+ PARAM(Solver.DYNAMIC_LTE, 5e-4)
+ PARAM(Solver.MIN_TIMESTEP, 20e-6)
#else
SOLVER(Solver, 12000)
PARAM(Solver.ACCURACY, 1e-8)
diff --git a/src/mame/drivers/apple2e.cpp b/src/mame/drivers/apple2e.cpp
index 7727c74379f..27b3dd0fc59 100644
--- a/src/mame/drivers/apple2e.cpp
+++ b/src/mame/drivers/apple2e.cpp
@@ -144,6 +144,7 @@ Address bus A0-A11 is Y0-Y11
#include "bus/a2bus/timemasterho.h"
#include "bus/a2bus/mouse.h"
#include "bus/a2bus/ezcgi.h"
+#include "bus/a2bus/pc_xporter.h"
#include "bus/a2bus/a2eauxslot.h"
#include "bus/a2bus/a2estd80col.h"
#include "bus/a2bus/a2eext80col.h"
@@ -3188,6 +3189,7 @@ static SLOT_INTERFACE_START(apple2_cards)
SLOT_INTERFACE("ezcgi9938", A2BUS_EZCGI_9938) /* E-Z Color Graphics Interface (TMS9938) */
SLOT_INTERFACE("ezcgi9958", A2BUS_EZCGI_9958) /* E-Z Color Graphics Interface (TMS9958) */
// SLOT_INTERFACE("magicmusician", A2BUS_MAGICMUSICIAN) /* Magic Musician Card */
+ SLOT_INTERFACE("pcxport", A2BUS_PCXPORTER) /* Applied Engineering PC Transporter */
SLOT_INTERFACE_END
static SLOT_INTERFACE_START(apple2eaux_cards)
diff --git a/src/mame/drivers/chihiro.cpp b/src/mame/drivers/chihiro.cpp
index 5cd8a9dd229..c63b2043d53 100644
--- a/src/mame/drivers/chihiro.cpp
+++ b/src/mame/drivers/chihiro.cpp
@@ -240,8 +240,8 @@ Notes:
24LC64 - Microchip 24LC64 64K I2C Serial EEPROM (SOIC8)
24LC024 - Microchip 24LC024 2K I2C Serial EEPROM (SOIC8)
M68AF127B - ST Microelectronics 1Mbit (128K x8), 5V Asynchronous SRAM (SOP32)
- AN2131QC - Cypress AN2131 EZ-USB-Family 8051-based High-Speed USB IC's (QFP80)
- AN2131SC / (QFP44)
+ AN2131QC - Cypress AN2131 EZ-USB-Family 8051-based High-Speed USB IC's (QFP80) firmware in IC11
+ AN2131SC / (QFP44) firmware in IC32
ADM3222 - Analog Devices ADM3222 High-Speed, +3.3V, 2-Channel RS232/V.28 Interface Device (SOIC20)
SN65240 - Texas Instruments SN65240 USB Port Transient Suppressor (SOIC8)
BA7623 - Rohm BA7623 75-Ohm driver IC with 3 internal circuits (SOIC8)
@@ -572,7 +572,7 @@ static const struct {
UINT32 address;
UINT8 write_byte;
} modify[16];
-} hacks[2] = { { "chihiro", { { 0x6a79f, 0x01 }, { 0x6a7a0, 0x00 }, { 0x6b575, 0x00 }, { 0x6b576, 0x00 }, { 0x6b5af, 0x75 }, { 0x6b78a, 0x75 }, { 0x6b7ca, 0x00 }, { 0x6b7b8, 0x00 }, { 0x8f5b2, 0x75 }, { 0x79a9e, 0x74 }, { 0x79b80, 0x74 }, { 0x79b97, 0x74 }, { 0, 0 } } },
+} hacks[2] = { { "chihiro", { { 0x6a79f/*3f79f*/, 0x01 }, { 0x6a7a0/*3f7a0*/, 0x00 }, { 0x6b575/*40575*/, 0x00 }, { 0x6b576/*40576*/, 0x00 }, { 0x6b5af/*405af*/, 0x75 }, { 0x6b78a/*4078a*/, 0x75 }, { 0x6b7ca/*407ca*/, 0x00 }, { 0x6b7b8/*407b8*/, 0x00 }, { 0x8f5b2, 0x75 }, { 0x79a9e/*2ea9e*/, 0x74 }, { 0x79b80/*2eb80*/, 0x74 }, { 0x79b97/*2eb97*/, 0x74 }, { 0, 0 } } },
{ "outr2", { { 0x12e4cf, 0x01 }, { 0x12e4d0, 0x00 }, { 0x4793e, 0x01 }, { 0x4793f, 0x00 }, { 0x47aa3, 0x01 }, { 0x47aa4, 0x00 }, { 0x14f2b6, 0x84 }, { 0x14f2d1, 0x75 }, { 0x8732f, 0x7d }, { 0x87384, 0x7d }, { 0x87388, 0xeb }, { 0, 0 } } } };
void chihiro_state::hack_usb()
diff --git a/src/mame/drivers/crimfght.cpp b/src/mame/drivers/crimfght.cpp
index 460e133caa6..d2d96443c6d 100644
--- a/src/mame/drivers/crimfght.cpp
+++ b/src/mame/drivers/crimfght.cpp
@@ -134,8 +134,8 @@ static INPUT_PORTS_START( crimfght )
PORT_DIPSETTING( 0x0b, DEF_STR( 1C_5C ))
PORT_DIPSETTING( 0x0a, DEF_STR( 1C_6C ))
PORT_DIPSETTING( 0x09, DEF_STR( 1C_7C ))
- PORT_DIPSETTING( 0x00, "Void")
- PORT_DIPNAME(0xf0, 0x00, "Coin B (unused)") PORT_DIPLOCATION("SW1:5,6,7,8")
+ PORT_DIPSETTING( 0x00, DEF_STR( Free_Play ))
+ PORT_DIPNAME(0xf0, 0xf0, "Coin B") PORT_DIPLOCATION("SW1:5,6,7,8")
PORT_DIPSETTING( 0x20, DEF_STR( 4C_1C ))
PORT_DIPSETTING( 0x50, DEF_STR( 3C_1C ))
PORT_DIPSETTING( 0x80, DEF_STR( 2C_1C ))
@@ -151,11 +151,14 @@ static INPUT_PORTS_START( crimfght )
PORT_DIPSETTING( 0xb0, DEF_STR( 1C_5C ))
PORT_DIPSETTING( 0xa0, DEF_STR( 1C_6C ))
PORT_DIPSETTING( 0x90, DEF_STR( 1C_7C ))
- PORT_DIPSETTING( 0x00, "Void")
+ PORT_DIPSETTING( 0x00, DEF_STR( Unused ))
PORT_START("DSW2")
- PORT_DIPUNUSED_DIPLOC(0x01, 0x01, "SW2:1")
- PORT_DIPUNUSED_DIPLOC(0x02, 0x02, "SW2:2")
+ PORT_DIPNAME( 0x03, 0x02, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW2:1,2")
+ PORT_DIPSETTING( 0x03, "1" )
+ PORT_DIPSETTING( 0x02, "2" )
+ PORT_DIPSETTING( 0x01, "3" )
+ PORT_DIPSETTING( 0x00, "4" )
PORT_DIPUNUSED_DIPLOC(0x04, 0x04, "SW2:3")
PORT_DIPUNUSED_DIPLOC(0x08, 0x08, "SW2:4")
PORT_DIPUNUSED_DIPLOC(0x10, 0x10, "SW2:5")
@@ -178,63 +181,74 @@ static INPUT_PORTS_START( crimfght )
PORT_BIT(0xf0, IP_ACTIVE_HIGH, IPT_SPECIAL) PORT_CUSTOM_MEMBER(DEVICE_SELF, crimfght_state, system_r, NULL)
PORT_START("P1")
- KONAMI8_B12_UNK(1)
+ KONAMI8_B123_START(1)
PORT_START("P2")
- KONAMI8_B12_UNK(2)
+ KONAMI8_B123_START(2)
PORT_START("P3")
- KONAMI8_B12_UNK(3)
+ PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_START("P4")
- KONAMI8_B12_UNK(4)
+ PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_START("SYSTEM")
PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_COIN1)
PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_COIN2)
- PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_COIN3)
- PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_COIN4)
+ PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_UNKNOWN)
+ PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_UNKNOWN)
PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_SERVICE1)
PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_SERVICE2)
- PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_SERVICE3)
- PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_SERVICE4)
+ PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_UNKNOWN)
+ PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_UNKNOWN)
INPUT_PORTS_END
-static INPUT_PORTS_START( crimfghtj )
+static INPUT_PORTS_START( crimfghtu )
PORT_INCLUDE( crimfght )
PORT_MODIFY("DSW1")
- KONAMI_COINAGE_LOC(DEF_STR( Free_Play ), "No Coin B", SW1)
- /* "No Coin B" = coins produce sound, but no effect on coin counter */
+ PORT_DIPNAME(0xf0, 0x00, "Coin B (Unused)") PORT_DIPLOCATION("SW1:5,6,7,8")
+ PORT_DIPSETTING( 0x20, DEF_STR( 4C_1C ))
+ PORT_DIPSETTING( 0x50, DEF_STR( 3C_1C ))
+ PORT_DIPSETTING( 0x80, DEF_STR( 2C_1C ))
+ PORT_DIPSETTING( 0x40, DEF_STR( 3C_2C ))
+ PORT_DIPSETTING( 0x10, DEF_STR( 4C_3C ))
+ PORT_DIPSETTING( 0xf0, DEF_STR( 1C_1C ))
+ PORT_DIPSETTING( 0x30, DEF_STR( 3C_4C ))
+ PORT_DIPSETTING( 0x70, DEF_STR( 2C_3C ))
+ PORT_DIPSETTING( 0xe0, DEF_STR( 1C_2C ))
+ PORT_DIPSETTING( 0x60, DEF_STR( 2C_5C ))
+ PORT_DIPSETTING( 0xd0, DEF_STR( 1C_3C ))
+ PORT_DIPSETTING( 0xc0, DEF_STR( 1C_4C ))
+ PORT_DIPSETTING( 0xb0, DEF_STR( 1C_5C ))
+ PORT_DIPSETTING( 0xa0, DEF_STR( 1C_6C ))
+ PORT_DIPSETTING( 0x90, DEF_STR( 1C_7C ))
+ PORT_DIPSETTING( 0x00, DEF_STR( Unused ))
PORT_MODIFY("DSW2")
- PORT_DIPNAME( 0x03, 0x02, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW2:1,2")
- PORT_DIPSETTING( 0x03, "1" )
- PORT_DIPSETTING( 0x02, "2" )
- PORT_DIPSETTING( 0x01, "3" )
- PORT_DIPSETTING( 0x00, "4" )
+ PORT_DIPUNUSED_DIPLOC(0x01, 0x01, "SW2:1")
+ PORT_DIPUNUSED_DIPLOC(0x02, 0x02, "SW2:2")
- PORT_MODIFY("P1")
- KONAMI8_B123_START(1)
+ PORT_MODIFY("P1")
+ KONAMI8_B12_UNK(1)
- PORT_MODIFY("P2")
- KONAMI8_B123_START(2)
+ PORT_MODIFY("P2")
+ KONAMI8_B12_UNK(2)
- PORT_MODIFY("P3")
- PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_MODIFY("P3")
+ KONAMI8_B12_UNK(3)
- PORT_MODIFY("P4")
- PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_MODIFY("P4")
+ KONAMI8_B12_UNK(4)
PORT_MODIFY("SYSTEM")
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN3 )
+ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_COIN4 )
+ PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE3 )
+ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE4 )
INPUT_PORTS_END
-
/***************************************************************************
Machine Driver
@@ -344,7 +358,7 @@ MACHINE_CONFIG_END
ROM_START( crimfght )
ROM_REGION( 0x20000, "maincpu", 0 ) /* code + banked roms */
- ROM_LOAD( "821l02.f24", 0x00000, 0x20000, CRC(588e7da6) SHA1(285febb3bcca31f82b34af3695a59eafae01cd30) )
+ ROM_LOAD( "821r02.f24", 0x00000, 0x20000, CRC(4ecdd923) SHA1(78e5260c4bb9b18d7818fb6300d7e1d3a577fb63) )
ROM_REGION( 0x10000, "audiocpu", 0 ) /* 64k for the sound CPU */
ROM_LOAD( "821l01.h4", 0x0000, 0x8000, CRC(0faca89e) SHA1(21c9c6d736b398a29e8709e1187c5bf3cacdc99d) )
@@ -386,9 +400,9 @@ ROM_START( crimfghtj )
ROM_LOAD( "821k03.e5", 0x00000, 0x40000, CRC(fef8505a) SHA1(5c5121609f69001838963e961cb227d6b64e4f5f) )
ROM_END
-ROM_START( crimfght2 )
+ROM_START( crimfghtu )
ROM_REGION( 0x20000, "maincpu", 0 ) /* code + banked roms */
- ROM_LOAD( "821r02.f24", 0x00000, 0x20000, CRC(4ecdd923) SHA1(78e5260c4bb9b18d7818fb6300d7e1d3a577fb63) )
+ ROM_LOAD( "821l02.f24", 0x00000, 0x20000, CRC(588e7da6) SHA1(285febb3bcca31f82b34af3695a59eafae01cd30) )
ROM_REGION( 0x10000, "audiocpu", 0 ) /* 64k for the sound CPU */
ROM_LOAD( "821l01.h4", 0x0000, 0x8000, CRC(0faca89e) SHA1(21c9c6d736b398a29e8709e1187c5bf3cacdc99d) )
@@ -414,6 +428,6 @@ ROM_END
***************************************************************************/
-GAME( 1989, crimfght, 0, crimfght, crimfght, driver_device, 0, ROT0, "Konami", "Crime Fighters (US 4 players)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, crimfght2, crimfght, crimfght, crimfghtj, driver_device,0, ROT0, "Konami", "Crime Fighters (World 2 Players)", MACHINE_SUPPORTS_SAVE )
-GAME( 1989, crimfghtj, crimfght, crimfght, crimfghtj, driver_device,0, ROT0, "Konami", "Crime Fighters (Japan 2 Players)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, crimfght, 0, crimfght, crimfght, driver_device, 0, ROT0, "Konami", "Crime Fighters (World 2 players)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, crimfghtu, crimfght, crimfght, crimfghtu, driver_device,0, ROT0, "Konami", "Crime Fighters (US 4 Players)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, crimfghtj, crimfght, crimfght, crimfght, driver_device,0, ROT0, "Konami", "Crime Fighters (Japan 2 Players)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/eolith.cpp b/src/mame/drivers/eolith.cpp
index 101d6788365..80879dbb7ae 100644
--- a/src/mame/drivers/eolith.cpp
+++ b/src/mame/drivers/eolith.cpp
@@ -36,7 +36,8 @@
1999 - Land Breaker (pcb ver 3.03) (MCU internal flash dump is missing)
1999 - Land Breaker (pcb ver 3.02)
1999 - New Hidden Catch (pcb ver 3.02)
- 1999 - Penfan Girls
+ 1999 - Penfan Girls (set 1, pcb ver 3.03)
+ 1999 - Penfan Girls (set 2, pcb ver 3.03P)
2000 - Hidden Catch 3 (v. 1.00 / pcb ver 3.05)
2001 - Fortress 2 Blue Arcade (v. 1.01 / pcb ver 3.05)
2001 - Fortress 2 Blue Arcade (v. 1.00 / pcb ver 3.05)
@@ -1199,8 +1200,9 @@ ROM_START( penfana )
ROM_LOAD32_WORD_SWAP( "11.u11", 0x1400002, 0x200000, CRC(ddcd2bae) SHA1(c4fa5ebbaf801a7f06222150658033955966fe1b) )
ROM_LOAD32_WORD_SWAP( "12.u17", 0x1800000, 0x200000, CRC(2eed0f64) SHA1(3b9e65e41d8699a93ea74225ba12a3f66ecba11d) )
ROM_LOAD32_WORD_SWAP( "13.u12", 0x1800002, 0x200000, CRC(cc3068a8) SHA1(0022fad5a4d36678d35e99092c870f2b99d3d8d4) )
- ROM_LOAD32_WORD_SWAP( "14.u18", 0x1c00000, 0x200000, CRC(20a9a08e) SHA1(fe4071cdf78d362bccaee92cdc70c66f7e30f817) ) // not checked by rom check
- ROM_LOAD32_WORD_SWAP( "15.u13", 0x1c00002, 0x200000, CRC(872fa9c4) SHA1(4902faa97c9a3a9671cfefc6a711cfcd25f2d6bc) ) // not checked by rom check
+ // The 3.03P version doesn't even have these populated
+ //ROM_LOAD32_WORD_SWAP( "14.u18", 0x1c00000, 0x200000, CRC(20a9a08e) SHA1(fe4071cdf78d362bccaee92cdc70c66f7e30f817) ) // not checked by rom check
+ //ROM_LOAD32_WORD_SWAP( "15.u13", 0x1c00002, 0x200000, CRC(872fa9c4) SHA1(4902faa97c9a3a9671cfefc6a711cfcd25f2d6bc) ) // not checked by rom check
ROM_REGION( 0x008000, "soundcpu", 0 ) /* Sound (80c301) CPU Code */
ROM_LOAD( "pfg.u111", 0x0000, 0x8000, CRC(79012474) SHA1(09a2d5705d7bc52cc2d1644c87c1e31ee44813ef) )
diff --git a/src/mame/drivers/hh_hmcs40.cpp b/src/mame/drivers/hh_hmcs40.cpp
index acf581c19b5..783f16be481 100644
--- a/src/mame/drivers/hh_hmcs40.cpp
+++ b/src/mame/drivers/hh_hmcs40.cpp
@@ -1035,7 +1035,7 @@ INPUT_CHANGED_MEMBER(bzaxxon_state::input_changed)
static MACHINE_CONFIG_START( bzaxxon, bzaxxon_state )
/* basic machine hardware */
- MCFG_CPU_ADD("maincpu", HD38800, 400000) // approximation
+ MCFG_CPU_ADD("maincpu", HD38800, 450000) // approximation
MCFG_HMCS40_WRITE_R_CB(0, WRITE8(bzaxxon_state, plate_w))
MCFG_HMCS40_WRITE_R_CB(1, WRITE8(bzaxxon_state, plate_w))
MCFG_HMCS40_WRITE_R_CB(2, WRITE8(bzaxxon_state, plate_w))
@@ -4087,7 +4087,7 @@ CONS( 1979, bmboxing, 0, 0, bmboxing, bmboxing, driver_device, 0, "Bambi
CONS( 1982, bfriskyt, 0, 0, bfriskyt, bfriskyt, driver_device, 0, "Bandai", "Frisky Tom (Bandai)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
CONS( 1981, packmon, 0, 0, packmon, packmon, driver_device, 0, "Bandai", "Packri Monster", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
CONS( 1982, msthawk, 0, 0, msthawk, msthawk, driver_device, 0, "Bandai (Mattel license)", "Star Hawk (Mattel)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1982, bzaxxon, 0, 0, bzaxxon, bzaxxon, driver_device, 0, "Bandai", "Zaxxon (Bandai)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK | MACHINE_NOT_WORKING )
+CONS( 1982, bzaxxon, 0, 0, bzaxxon, bzaxxon, driver_device, 0, "Bandai", "Zaxxon (Bandai)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
CONS( 1983, zackman, 0, 0, zackman, zackman, driver_device, 0, "Bandai", "Zackman", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
CONS( 1983, bpengo, 0, 0, bpengo, bpengo, driver_device, 0, "Bandai", "Pengo (Bandai)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
CONS( 1983, bbtime, 0, 0, bbtime, bbtime, driver_device, 0, "Bandai", "Burger Time (Bandai)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
diff --git a/src/mame/drivers/mcr3.cpp b/src/mame/drivers/mcr3.cpp
index 150e0f54b32..3d2bc6b2d5b 100644
--- a/src/mame/drivers/mcr3.cpp
+++ b/src/mame/drivers/mcr3.cpp
@@ -535,51 +535,6 @@ static ADDRESS_MAP_START( spyhunt_portmap, AS_IO, 8, mcr3_state )
ADDRESS_MAP_END
-
-WRITE8_MEMBER(mcr3_state::spyhuntpr_fd00_w)
-{
-}
-
-static ADDRESS_MAP_START( spyhuntpr_map, AS_PROGRAM, 8, mcr3_state )
- ADDRESS_MAP_UNMAP_HIGH
- AM_RANGE(0xa800, 0xa8ff) AM_RAM // the ROM is a solid fill in these areas, and they get tested as RAM, I think they moved the 'real' scroll regs here
- AM_RANGE(0xa900, 0xa9ff) AM_RAM
-
- AM_RANGE(0x0000, 0xdfff) AM_ROM
-
-
-
-
- AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE(spyhunt_videoram_w) AM_SHARE("videoram")
- AM_RANGE(0xe800, 0xebff) AM_MIRROR(0x0400) AM_RAM_WRITE(spyhunt_alpharam_w) AM_SHARE("spyhunt_alpha")
- AM_RANGE(0xf000, 0xf7ff) AM_RAM //AM_SHARE("nvram")
- AM_RANGE(0xf800, 0xf9ff) AM_RAM AM_SHARE("spriteram")
- AM_RANGE(0xfa00, 0xfa7f) AM_MIRROR(0x0180) AM_RAM_WRITE(spyhuntpr_paletteram_w) AM_SHARE("paletteram")
-
- AM_RANGE(0xfc00, 0xfc00) AM_READ_PORT("DSW0")
- AM_RANGE(0xfc01, 0xfc01) AM_READ_PORT("DSW1")
- AM_RANGE(0xfc02, 0xfc02) AM_READ_PORT("IN2")
- AM_RANGE(0xfc03, 0xfc03) AM_READ_PORT("IN3")
-
- AM_RANGE(0xfd00, 0xfd00) AM_WRITE( spyhuntpr_fd00_w )
-
- AM_RANGE(0xfe00, 0xffff) AM_RAM // a modified copy of spriteram for this hw??
-ADDRESS_MAP_END
-
-WRITE8_MEMBER(mcr3_state::spyhuntpr_port04_w)
-{
-}
-
-static ADDRESS_MAP_START( spyhuntpr_portmap, AS_IO, 8, mcr3_state )
- ADDRESS_MAP_UNMAP_HIGH
- ADDRESS_MAP_GLOBAL_MASK(0xff)
- AM_RANGE(0x04, 0x04) AM_WRITE(spyhuntpr_port04_w)
- AM_RANGE(0x84, 0x86) AM_WRITE(spyhunt_scroll_value_w)
- AM_RANGE(0xe0, 0xe0) AM_WRITENOP // was watchdog
-// AM_RANGE(0xe8, 0xe8) AM_WRITENOP
- AM_RANGE(0xf0, 0xf3) AM_DEVREADWRITE("ctc", z80ctc_device, read, write)
-ADDRESS_MAP_END
-
/*************************************
*
* Port definitions
@@ -979,109 +934,6 @@ static INPUT_PORTS_START( spyhunt )
PORT_BIT( 0xff, 0x74, IPT_PADDLE ) PORT_MINMAX(0x34,0xb4) PORT_SENSITIVITY(40) PORT_KEYDELTA(10)
INPUT_PORTS_END
-static INPUT_PORTS_START( spyhuntpr )
- PORT_START("DSW0")
- PORT_DIPNAME( 0x01, 0x01, "DSW0-01" )
- PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x02, 0x02, "DSW0-02" )
- PORT_DIPSETTING( 0x02, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x04, 0x04, "DSW0-04" )
- PORT_DIPSETTING( 0x04, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x08, 0x08, "DSW0-08" )
- PORT_DIPSETTING( 0x08, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x10, 0x10, "DSW0-10" )
- PORT_DIPSETTING( 0x10, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x20, 0x20, "DSW0-20" )
- PORT_DIPSETTING( 0x20, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x40, 0x40, "DSW0-40" )
- PORT_DIPSETTING( 0x40, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x80, 0x80, "DSW0-80" )
- PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
-
- PORT_START("DSW1")
- PORT_DIPNAME( 0x01, 0x01, "DSW1-01" )
- PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x02, 0x02, "DSW1-02" )
- PORT_DIPSETTING( 0x02, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_SERVICE( 0x04, IP_ACTIVE_LOW )
- PORT_DIPNAME( 0x08, 0x08, "DSW1-08" )
- PORT_DIPSETTING( 0x08, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x10, 0x10, "DSW1-10" )
- PORT_DIPSETTING( 0x10, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x20, 0x20, "DSW1-20" )
- PORT_DIPSETTING( 0x20, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x40, 0x40, "DSW1-40" )
- PORT_DIPSETTING( 0x40, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_DIPNAME( 0x80, 0x80, "DSW1-80" )
- PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x00, DEF_STR( On ) )
-
- PORT_START("IN2")
- PORT_DIPNAME( 0x0001, 0x0001, "2" )
- PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_DIPNAME( 0x0002, 0x0002, "start" ) // start
- PORT_DIPSETTING( 0x0002, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_DIPNAME( 0x0004, 0x0004, DEF_STR( Unknown ) )
- PORT_DIPSETTING( 0x0004, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_DIPNAME( 0x0008, 0x0008, DEF_STR( Unknown ) )
- PORT_DIPSETTING( 0x0008, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_DIPNAME( 0x0010, 0x0010, "handbrake?" )
- PORT_DIPSETTING( 0x0010, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_DIPNAME( 0x0020, 0x0020, DEF_STR( Unknown ) )
- PORT_DIPSETTING( 0x0020, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_DIPNAME( 0x0040, 0x0040, "pedal inverse" )
- PORT_DIPSETTING( 0x0040, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_DIPNAME( 0x0080, 0x0080, DEF_STR( Unknown ) )
- PORT_DIPSETTING( 0x0080, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
-
- PORT_START("IN3")
- PORT_DIPNAME( 0x0001, 0x0001, "3" )
- PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_DIPNAME( 0x0002, 0x0002, DEF_STR( Unknown ) )
- PORT_DIPSETTING( 0x0002, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_DIPNAME( 0x0004, 0x0004, DEF_STR( Unknown ) )
- PORT_DIPSETTING( 0x0004, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_DIPNAME( 0x0008, 0x0008, DEF_STR( Unknown ) )
- PORT_DIPSETTING( 0x0008, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_DIPNAME( 0x0010, 0x0010, DEF_STR( Unknown ) )
- PORT_DIPSETTING( 0x0010, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_DIPNAME( 0x0020, 0x0020, DEF_STR( Unknown ) )
- PORT_DIPSETTING( 0x0020, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_DIPNAME( 0x0040, 0x0040, "coin" ) // coin?
- PORT_DIPSETTING( 0x0040, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
- PORT_DIPNAME( 0x0080, 0x0080, "machineguns" ) // machine guns
- PORT_DIPSETTING( 0x0080, DEF_STR( Off ) )
- PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
-INPUT_PORTS_END
/* not verified, no manual found */
static INPUT_PORTS_START( crater )
@@ -1206,52 +1058,6 @@ static const gfx_layout spyhunt_alphalayout =
16*8
};
-static const gfx_layout spyhuntpr_alphalayout =
-{
- 16,8,
- RGN_FRAC(1,1),
- 2,
- { 0, 4},
- { 0, 0, 1, 1, 2, 2, 3, 3, 8, 8, 9, 9, 10, 10, 11, 11 },
- { 0, 2*8, 4*8, 6*8, 8*8, 10*8, 12*8, 14*8 },
- 16*8
-};
-
-
-const gfx_layout spyhuntpr_sprite_layout =
-{
- 32,16,
- RGN_FRAC(1,4),
- 4,
- { RGN_FRAC(3,4), RGN_FRAC(2,4), RGN_FRAC(1,4), RGN_FRAC(0,4) },
- { 6,7, 4,5, 2,3, 0,1, 14,15, 12,13, 10,11, 8,9, 22,23, 20,21, 18,19, 16,17, 30,31, 28,29, 26,27, 24,25 },
- { 0*32,1*32,2*32,3*32,4*32,5*32,6*32,7*32,8*32,9*32,10*32,11*32,12*32,13*32,14*32,15*32 },
-
- 16*32
-};
-
-
-static const UINT32 spyhuntp_charlayout_xoffset[64] =
-{
- 0x0000*8,0x0000*8, 0x0000*8+1,0x0000*8+1, 0x0000*8+2,0x0000*8+2, 0x0000*8+3,0x0000*8+3, 0x0000*8+4,0x0000*8+4, 0x0000*8+5,0x0000*8+5, 0x0000*8+6,0x0000*8+6, 0x0000*8+7,0x0000*8+7,
- 0x1000*8,0x1000*8, 0x1000*8+1,0x1000*8+1, 0x1000*8+2,0x1000*8+2, 0x1000*8+3,0x1000*8+3, 0x1000*8+4,0x1000*8+4, 0x1000*8+5,0x1000*8+5, 0x1000*8+6,0x1000*8+6, 0x1000*8+7,0x1000*8+7,
- 0x2000*8,0x2000*8, 0x2000*8+1,0x2000*8+1, 0x2000*8+2,0x2000*8+2, 0x2000*8+3,0x2000*8+3, 0x2000*8+4,0x2000*8+4, 0x2000*8+5,0x2000*8+5, 0x2000*8+6,0x2000*8+6, 0x2000*8+7,0x2000*8+7,
- 0x3000*8,0x3000*8, 0x3000*8+1,0x3000*8+1, 0x3000*8+2,0x3000*8+2, 0x3000*8+3,0x3000*8+3, 0x3000*8+4,0x3000*8+4, 0x3000*8+5,0x3000*8+5, 0x3000*8+6,0x3000*8+6, 0x3000*8+7,0x3000*8+7,
-};
-
-
-static const gfx_layout spyhuntpr_charlayout =
-{
- 64,16,
- RGN_FRAC(1,8),
- 4,
- { 0*8, 0x4000*8 + 2*8, 0x4000*8 + 0*8, 2*8 },
- EXTENDED_XOFFS,
- { 0*8, 4*8, 8*8, 12*8, 16*8, 20*8, 24*8, 28*8, 1*8, 5*8, 9*8, 13*8, 17*8, 21*8, 25*8, 29*8 },
- 32*8,
- spyhuntp_charlayout_xoffset,
- nullptr
-};
static GFXDECODE_START( mcr3 )
GFXDECODE_SCALE( "gfx1", 0, mcr_bg_layout, 0, 4, 2, 2 )
@@ -1265,11 +1071,6 @@ static GFXDECODE_START( spyhunt )
GFXDECODE_ENTRY( "gfx3", 0, spyhunt_alphalayout, 4*16, 1 )
GFXDECODE_END
-static GFXDECODE_START( spyhuntpr )
- GFXDECODE_ENTRY( "gfx1", 0, spyhuntpr_charlayout, 3*16, 1 )
- GFXDECODE_ENTRY( "gfx2", 0, spyhuntpr_sprite_layout, 0*16, 4 )
- GFXDECODE_ENTRY( "gfx3", 0, spyhuntpr_alphalayout, 4*16, 1 )
-GFXDECODE_END
/*************************************
*
@@ -1379,78 +1180,6 @@ MACHINE_CONFIG_END
-static ADDRESS_MAP_START( spyhuntpr_sound_map, AS_PROGRAM, 8, mcr3_state )
- AM_RANGE(0x0000, 0x1fff) AM_ROM
- AM_RANGE(0x8000, 0x83ff) AM_RAM
-// AM_RANGE(0xfe00, 0xffff) AM_RAM
-ADDRESS_MAP_END
-
-static ADDRESS_MAP_START( spyhuntpr_sound_portmap, AS_IO, 8, mcr3_state )
- ADDRESS_MAP_UNMAP_HIGH
- ADDRESS_MAP_GLOBAL_MASK(0xff)
-
- AM_RANGE(0x12, 0x13) AM_DEVWRITE("ay1", ay8912_device, address_data_w)
- AM_RANGE(0x14, 0x15) AM_DEVWRITE("ay2", ay8912_device, address_data_w)
- AM_RANGE(0x18, 0x19) AM_DEVWRITE("ay3", ay8912_device, address_data_w)
-
-ADDRESS_MAP_END
-
-
-
-static MACHINE_CONFIG_START( spyhuntpr, mcr3_state )
-
-// note: no ctc, no nvram
-// 2*z80, 3*ay8912
-
- /* basic machine hardware */
- MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/4)
- MCFG_CPU_PROGRAM_MAP(spyhuntpr_map)
- MCFG_CPU_IO_MAP(spyhuntpr_portmap)
- MCFG_CPU_CONFIG(mcr_daisy_chain)
- MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", mcr3_state, mcr_interrupt, "screen", 0, 1)
-
- MCFG_DEVICE_ADD("ctc", Z80CTC, MASTER_CLOCK/4 /* same as "maincpu" */)
- MCFG_Z80CTC_INTR_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0))
- MCFG_Z80CTC_ZC0_CB(DEVWRITELINE("ctc", z80ctc_device, trg1))
-
- //MCFG_WATCHDOG_VBLANK_INIT(16)
- MCFG_MACHINE_START_OVERRIDE(mcr3_state,mcr)
- MCFG_MACHINE_RESET_OVERRIDE(mcr3_state,mcr)
-
-// MCFG_NVRAM_ADD_0FILL("nvram")
-
- /* video hardware */
- MCFG_SCREEN_ADD("screen", RASTER)
- MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
- MCFG_SCREEN_REFRESH_RATE(60)
- MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
- MCFG_SCREEN_SIZE(30*16, 30*8)
- MCFG_SCREEN_VISIBLE_AREA(0, 30*16-1, 0, 30*8-1)
- MCFG_SCREEN_UPDATE_DRIVER(mcr3_state, screen_update_spyhuntpr)
- MCFG_SCREEN_PALETTE("palette")
-
- MCFG_GFXDECODE_ADD("gfxdecode", "palette", spyhuntpr)
- MCFG_PALETTE_ADD("palette", 64+4)
-
- MCFG_PALETTE_INIT_OWNER(mcr3_state,spyhunt)
- MCFG_VIDEO_START_OVERRIDE(mcr3_state,spyhuntpr)
-
-
- MCFG_CPU_ADD("audiocpu", Z80, 3000000 )
- MCFG_CPU_PROGRAM_MAP(spyhuntpr_sound_map)
- MCFG_CPU_IO_MAP(spyhuntpr_sound_portmap)
-// MCFG_CPU_PERIODIC_INT_DRIVER(mcr3_state, irq0_line_hold, 4*60)
-
- MCFG_SPEAKER_STANDARD_MONO("mono")
-
- MCFG_SOUND_ADD("ay1", AY8912, 3000000/2) // AY-3-8912
- MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("ay2", AY8912, 3000000/2) // "
- MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
- MCFG_SOUND_ADD("ay3", AY8912, 3000000/2) // "
- MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
-
-MACHINE_CONFIG_END
@@ -1729,93 +1458,6 @@ ROM_START( spyhuntp )
ROM_END
-ROM_START( spyhuntpr )
- ROM_REGION( 0x10000, "maincpu", 0 )
- ROM_LOAD( "1.bin", 0x0000, 0x4000, CRC(2a2f77cb) SHA1(e1b74c951efb2a49bef0507ab3268b274515f339) )
- ROM_LOAD( "2.bin", 0x4000, 0x4000, CRC(00778aff) SHA1(7c0b24c393f841e8379d4bba57ba502e3d2512f9) )
- ROM_LOAD( "3.bin", 0x8000, 0x4000, CRC(2183b4af) SHA1(2b958afc40b26c9bc8d5254b0600426649f4ebf0) )
- ROM_LOAD( "4.bin", 0xc000, 0x2000, CRC(3ea6a65c) SHA1(1320ce17044307ed3c4f2459631a9aa1734f1f30) )
-
- ROM_REGION( 0x10000, "audiocpu", 0 )
- ROM_LOAD( "5.bin", 0x0000, 0x2000, CRC(33fe2829) SHA1(e6950dbf681242bf23542ca6604e62eacb431101) )
-
-
- ROM_REGION( 0x08000, "gfx1", 0 )
- ROM_LOAD32_BYTE( "6.bin", 0x0000, 0x200, CRC(6b76f46a) SHA1(4b398084c42a60fcfa4a9bf14f844e36a3f42723) )
- ROM_CONTINUE(0x0001, 0x200)
- ROM_CONTINUE(0x0800, 0x200)
- ROM_CONTINUE(0x0801, 0x200)
- ROM_CONTINUE(0x1000, 0x200)
- ROM_CONTINUE(0x1001, 0x200)
- ROM_CONTINUE(0x1800, 0x200)
- ROM_CONTINUE(0x1801, 0x200)
- ROM_CONTINUE(0x2000, 0x200)
- ROM_CONTINUE(0x2001, 0x200)
- ROM_CONTINUE(0x2800, 0x200)
- ROM_CONTINUE(0x2801, 0x200)
- ROM_CONTINUE(0x3000, 0x200)
- ROM_CONTINUE(0x3001, 0x200)
- ROM_CONTINUE(0x3800, 0x200)
- ROM_CONTINUE(0x3801, 0x200)
- ROM_LOAD32_BYTE( "7.bin", 0x0002, 0x200, CRC(085bd7a7) SHA1(c35c309b6c6485baec54d4434dea44abf4d48f41) )
- ROM_CONTINUE(0x0003, 0x200)
- ROM_CONTINUE(0x0802, 0x200)
- ROM_CONTINUE(0x0803, 0x200)
- ROM_CONTINUE(0x1002, 0x200)
- ROM_CONTINUE(0x1003, 0x200)
- ROM_CONTINUE(0x1802, 0x200)
- ROM_CONTINUE(0x1803, 0x200)
- ROM_CONTINUE(0x2002, 0x200)
- ROM_CONTINUE(0x2003, 0x200)
- ROM_CONTINUE(0x2802, 0x200)
- ROM_CONTINUE(0x2803, 0x200)
- ROM_CONTINUE(0x3002, 0x200)
- ROM_CONTINUE(0x3003, 0x200)
- ROM_CONTINUE(0x3802, 0x200)
- ROM_CONTINUE(0x3803, 0x200)
- ROM_LOAD32_BYTE( "8.bin", 0x4000, 0x200, CRC(e699b329) SHA1(cb4b8c7b6fa1cb1144a18f1442dc3b267c408914) )
- ROM_CONTINUE(0x4001, 0x200)
- ROM_CONTINUE(0x4800, 0x200)
- ROM_CONTINUE(0x4801, 0x200)
- ROM_CONTINUE(0x5000, 0x200)
- ROM_CONTINUE(0x5001, 0x200)
- ROM_CONTINUE(0x5800, 0x200)
- ROM_CONTINUE(0x5801, 0x200)
- ROM_CONTINUE(0x6000, 0x200)
- ROM_CONTINUE(0x6001, 0x200)
- ROM_CONTINUE(0x6800, 0x200)
- ROM_CONTINUE(0x6801, 0x200)
- ROM_CONTINUE(0x7000, 0x200)
- ROM_CONTINUE(0x7001, 0x200)
- ROM_CONTINUE(0x7800, 0x200)
- ROM_CONTINUE(0x7801, 0x200)
- ROM_LOAD32_BYTE( "9.bin", 0x4002, 0x200, CRC(6d462ec7) SHA1(0ff37f75b0eeceb86177a3f7c93834d5c0e24515) )
- ROM_CONTINUE(0x4003, 0x200)
- ROM_CONTINUE(0x4802, 0x200)
- ROM_CONTINUE(0x4803, 0x200)
- ROM_CONTINUE(0x5002, 0x200)
- ROM_CONTINUE(0x5003, 0x200)
- ROM_CONTINUE(0x5802, 0x200)
- ROM_CONTINUE(0x5803, 0x200)
- ROM_CONTINUE(0x6002, 0x200)
- ROM_CONTINUE(0x6003, 0x200)
- ROM_CONTINUE(0x6802, 0x200)
- ROM_CONTINUE(0x6803, 0x200)
- ROM_CONTINUE(0x7002, 0x200)
- ROM_CONTINUE(0x7003, 0x200)
- ROM_CONTINUE(0x7802, 0x200)
- ROM_CONTINUE(0x7803, 0x200)
-
- ROM_REGION( 0x10000, "gfx2", ROMREGION_INVERT )
- ROM_LOAD( "10.bin", 0x00000, 0x4000, CRC(6f9fd416) SHA1(a51c86e5b22c91fc44673f53400b58af40b18065) )
- ROM_LOAD( "11.bin", 0x04000, 0x4000, CRC(75526ffe) SHA1(ff1adf6f9b6595114d0bd06b72d9eb7bbf70144d) )
- ROM_LOAD( "12.bin", 0x08000, 0x4000, CRC(82ee7a4d) SHA1(184720de76680275bf7c4a171f03a0ce771d91fc) )
- ROM_LOAD( "13.bin", 0x0c000, 0x4000, CRC(0cc592a3) SHA1(b3563bde83432cdbaedb88d4d222da30bf679b08) )
-
-
- ROM_REGION( 0x01000, "gfx3", 0 )
- ROM_LOAD( "14.bin", 0x00000, 0x1000, CRC(87a4c130) SHA1(7792afdc36b0f3bd51c387d04d38f60c85fd2e93) )
-ROM_END
ROM_START( crater )
@@ -1976,16 +1618,7 @@ DRIVER_INIT_MEMBER(mcr3_state,spyhunt)
m_spyhunt_scroll_offset = 16;
}
-DRIVER_INIT_MEMBER(mcr3_state,spyhuntpr)
-{
- mcr_common_init();
-// machine().device<midway_ssio_device>("ssio")->set_custom_input(1, 0x60, read8_delegate(FUNC(mcr3_state::spyhunt_ip1_r),this));
-// machine().device<midway_ssio_device>("ssio")->set_custom_input(2, 0xff, read8_delegate(FUNC(mcr3_state::spyhunt_ip2_r),this));
-// machine().device<midway_ssio_device>("ssio")->set_custom_output(4, 0xff, write8_delegate(FUNC(mcr3_state::spyhunt_op4_w),this));
- m_spyhunt_sprite_color_mask = 0x00;
- m_spyhunt_scroll_offset = 16;
-}
DRIVER_INIT_MEMBER(mcr3_state,crater)
{
@@ -2036,6 +1669,3 @@ GAMEL(1983, spyhuntp, spyhunt, mcrsc_csd, spyhunt, mcr3_state, spyhunt, ROT9
GAME( 1984, crater, 0, mcrscroll, crater, mcr3_state, crater, ORIENTATION_FLIP_X, "Bally Midway", "Crater Raider", MACHINE_SUPPORTS_SAVE )
GAMEL(1985, turbotag, 0, mcrsc_csd, turbotag, mcr3_state, turbotag, ROT90, "Bally Midway", "Turbo Tag (prototype)", MACHINE_SUPPORTS_SAVE, layout_turbotag )
-// very different hardware, probably bootleg despite the license text printed on the PCB, similar to '1942p' in 1942.c. Probably should be put in separate driver.
-// PCB made by Tecfri for Recreativos Franco S.A. in Spain, has Bally Midway logo, and licensing text on the PCB. Board is dated '85' so seems to be a low-cost rebuild? it is unclear if it made it to market.
-GAME (1983, spyhuntpr,spyhunt, spyhuntpr, spyhuntpr,mcr3_state, spyhuntpr,ROT90, "Bally Midway (Recreativos Franco S.A. license)", "Spy Hunter (Spain, Tecfri / Recreativos Franco S.A. PCB)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/spartanxtec.cpp b/src/mame/drivers/spartanxtec.cpp
new file mode 100644
index 00000000000..e6e31577864
--- /dev/null
+++ b/src/mame/drivers/spartanxtec.cpp
@@ -0,0 +1,441 @@
+// license:BSD-3-Clause
+// copyright-holders:David Haywood
+/*
+
+Kung-Fu Master / Spartan X (Tecfri bootleg)
+single PCB with 2x Z80
+similar looking to the '1942p' and 'spyhuntpr' PCBs
+
+
+P2 inputs don't work in 'cocktail' mode (maybe it's just unsupported on this PCB?)
+
+DIPS etc. are near the 2nd CPU, should it be reading them?
+
+visible area is 16 lines less than the original, otherwise you get bad sprites
+but I think this is probably correct.
+
+some sprites are a bit glitchy when entering playfield (see title screen)
+probably an original bug?
+
+*/
+
+#include "emu.h"
+#include "cpu/z80/z80.h"
+#include "includes/iremipt.h"
+#include "sound/ay8910.h"
+
+class spartanxtec_state : public driver_device
+{
+public:
+ spartanxtec_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag),
+ m_m62_tileram(*this, "m62_tileram"),
+ m_spriteram(*this, "spriteram"),
+ m_scroll_lo(*this, "scroll_lo"),
+ m_scroll_hi(*this, "scroll_hi"),
+ m_maincpu(*this, "maincpu"),
+ m_audiocpu(*this, "audiocpu"),
+ m_palette(*this, "palette"),
+ m_gfxdecode(*this, "gfxdecode")
+ { }
+
+ required_shared_ptr<UINT8> m_m62_tileram;
+ required_shared_ptr<UINT8> m_spriteram;
+ required_shared_ptr<UINT8> m_scroll_lo;
+ required_shared_ptr<UINT8> m_scroll_hi;
+ required_device<cpu_device> m_maincpu;
+ required_device<cpu_device> m_audiocpu;
+
+ virtual void machine_start() override;
+ virtual void machine_reset() override;
+ virtual void video_start() override;
+ void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect);
+ UINT32 screen_update_spartanxtec(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
+ DECLARE_PALETTE_INIT(spartanxtec);
+
+ tilemap_t* m_bg_tilemap;
+ DECLARE_WRITE8_MEMBER(kungfum_tileram_w);
+ TILE_GET_INFO_MEMBER(get_kungfum_bg_tile_info);
+ DECLARE_WRITE8_MEMBER(spartanxtec_soundlatch_w);
+ DECLARE_WRITE8_MEMBER(a801_w);
+ DECLARE_WRITE8_MEMBER(sound_irq_ack);
+ DECLARE_WRITE8_MEMBER(irq_ack);
+
+ required_device<palette_device> m_palette;
+ required_device<gfxdecode_device> m_gfxdecode;
+
+
+};
+
+
+
+
+WRITE8_MEMBER(spartanxtec_state::kungfum_tileram_w)
+{
+ m_m62_tileram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset & 0x7ff);
+}
+
+
+TILE_GET_INFO_MEMBER(spartanxtec_state::get_kungfum_bg_tile_info)
+{
+ int code;
+ int color;
+ int flags;
+ code = m_m62_tileram[tile_index];
+ color = m_m62_tileram[tile_index + 0x800];
+ flags = 0;
+ if ((color & 0x20))
+ {
+ flags |= TILE_FLIPX;
+ }
+ SET_TILE_INFO_MEMBER(0, code | ((color & 0xc0)<< 2), color & 0x1f, flags);
+
+ /* is the following right? */
+ if ((tile_index / 64) < 6 || ((color & 0x1f) >> 1) > 0x0c)
+ tileinfo.category = 1;
+ else
+ tileinfo.category = 0;
+}
+
+void spartanxtec_state::video_start()
+{
+ m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(spartanxtec_state::get_kungfum_bg_tile_info),this), TILEMAP_SCAN_ROWS, 8, 8, 64, 32);
+ m_bg_tilemap->set_scroll_rows(32);
+}
+
+
+void spartanxtec_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect )
+{
+ gfx_element *gfx = m_gfxdecode->gfx(1);
+
+ for (int i = 0; i < 0x400; i += 4)
+ {
+ int x = m_spriteram[i+2]+128;
+ int y = (224-m_spriteram[i+1])&0xff;
+ int code = m_spriteram[i+0];
+ int attr = m_spriteram[i+3];
+ code |= (attr & 0xc0) << 2;
+
+ int colour = attr & 0x1f;
+ int flipx = attr & 0x20;
+ int flipy = 0;
+
+ gfx->transpen(bitmap,cliprect,code,colour,flipx,flipy,x,y,7);
+
+ }
+
+
+}
+
+
+UINT32 spartanxtec_state::screen_update_spartanxtec(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
+{
+ // there are 4 sets of scroll registers
+ // how to split them isn't clear, 4 groups of 8 rows would be logical
+ // but only 6 rows should use the first scroll register and the
+ // remaining 2 rows scroll values from there can't wrap onto the bottom
+ // as that doesn't work. (breaks bottom 2 lines of playfield scroll)
+ // HOWEVER sprites are also broken in that area, so I think this bootleg
+ // probably just displays less lines.
+
+
+ for (int i = 0; i < 32; i++)
+ {
+ int scrollval;
+
+ scrollval = m_scroll_lo[i/8] | (m_scroll_hi[i/8] << 8);
+
+ m_bg_tilemap->set_scrollx((i-2)&0xff, scrollval+28-128);
+ }
+
+ m_bg_tilemap->draw(screen, bitmap, cliprect, 0, 0);
+ draw_sprites(bitmap, cliprect);
+ m_bg_tilemap->draw(screen, bitmap, cliprect, 1, 0);
+
+ return 0;
+}
+
+
+
+
+WRITE8_MEMBER(spartanxtec_state::spartanxtec_soundlatch_w)
+{
+ soundlatch_byte_w(space, 0, data);
+ m_audiocpu->set_input_line(INPUT_LINE_NMI, PULSE_LINE);
+}
+
+WRITE8_MEMBER(spartanxtec_state::a801_w)
+{
+ if (data != 0xf0) printf("a801_w %02x\n", data);
+}
+
+WRITE8_MEMBER(spartanxtec_state::irq_ack)
+{
+ m_maincpu->set_input_line(INPUT_LINE_IRQ0, CLEAR_LINE);
+}
+
+
+static ADDRESS_MAP_START( spartanxtec_map, AS_PROGRAM, 8, spartanxtec_state )
+ AM_RANGE(0x0000, 0x7fff) AM_ROM
+ AM_RANGE(0xc400, 0xc7ff) AM_RAM AM_SHARE("spriteram")
+
+ AM_RANGE(0x8000, 0x8000) AM_WRITE(spartanxtec_soundlatch_w)
+
+ AM_RANGE(0x8100, 0x8100) AM_READ_PORT("DSW1")
+ AM_RANGE(0x8101, 0x8101) AM_READ_PORT("DSW2")
+ AM_RANGE(0x8102, 0x8102) AM_READ_PORT("SYSTEM")
+ AM_RANGE(0x8103, 0x8103) AM_READ_PORT("P1")
+
+ AM_RANGE(0x8200, 0x8200) AM_WRITE(irq_ack)
+
+ AM_RANGE(0xA801, 0xA801) AM_WRITE(a801_w)
+
+ AM_RANGE(0xa900, 0xa903) AM_RAM AM_SHARE("scroll_lo")
+ AM_RANGE(0xa980, 0xa983) AM_RAM AM_SHARE("scroll_hi")
+
+ AM_RANGE(0xd000, 0xdfff) AM_RAM_WRITE(kungfum_tileram_w) AM_SHARE("m62_tileram")
+
+ AM_RANGE(0xe000, 0xefff) AM_RAM
+
+ADDRESS_MAP_END
+
+
+
+WRITE8_MEMBER(spartanxtec_state::sound_irq_ack)
+{
+ m_audiocpu->set_input_line(INPUT_LINE_IRQ0, CLEAR_LINE);
+}
+
+
+static ADDRESS_MAP_START( spartanxtec_sound_map, AS_PROGRAM, 8, spartanxtec_state )
+
+ AM_RANGE(0x0000, 0x0fff) AM_ROM
+ AM_RANGE(0x8000, 0x83ff) AM_RAM
+
+ AM_RANGE(0xc000, 0xc000) AM_READ(soundlatch_byte_r)
+ADDRESS_MAP_END
+
+static ADDRESS_MAP_START( spartanxtec_sound_io, AS_IO, 8, spartanxtec_state )
+ ADDRESS_MAP_GLOBAL_MASK(0xff)
+ AM_RANGE(0x0000, 0x0000) AM_WRITE( sound_irq_ack )
+
+ AM_RANGE(0x0012, 0x0013) AM_DEVWRITE("ay3", ay8910_device, address_data_w)
+ AM_RANGE(0x0012, 0x0012) AM_DEVREAD("ay3", ay8910_device, data_r)
+
+ AM_RANGE(0x0014, 0x0015) AM_DEVWRITE("ay1", ay8910_device, address_data_w)
+ AM_RANGE(0x0014, 0x0014) AM_DEVREAD("ay1", ay8910_device, data_r)
+
+ AM_RANGE(0x0018, 0x0019) AM_DEVWRITE("ay2", ay8910_device, address_data_w)
+ AM_RANGE(0x0018, 0x0018) AM_DEVREAD("ay2", ay8910_device, data_r)
+ADDRESS_MAP_END
+
+
+
+
+static INPUT_PORTS_START( spartanxtec )
+ PORT_START("DSW1")
+ PORT_DIPNAME( 0x01, 0x01, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW1:1")
+ PORT_DIPSETTING( 0x01, DEF_STR( Easy ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( Hard ) )
+ PORT_DIPNAME( 0x02, 0x02, "Energy Loss" ) PORT_DIPLOCATION("SW1:2")
+ PORT_DIPSETTING( 0x02, "Slow" )
+ PORT_DIPSETTING( 0x00, "Fast" )
+ PORT_DIPNAME( 0x0c, 0x0c, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW1:3,4")
+ PORT_DIPSETTING( 0x08, "2" )
+ PORT_DIPSETTING( 0x0c, "3" )
+ PORT_DIPSETTING( 0x04, "4" )
+ PORT_DIPSETTING( 0x00, "5" )
+ /* Manual says that only coin mode 1 is available and SW2:3 should be always OFF */
+ /* However, coin mode 2 works perfectly. */
+ IREM_Z80_COINAGE_TYPE_3_LOC(SW1)
+
+ PORT_START("DSW2")
+ PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW2:1")
+ PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( On ) )
+ PORT_DIPNAME( 0x02, 0x00, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("SW2:2")
+ PORT_DIPSETTING( 0x00, DEF_STR( Upright ) )
+ PORT_DIPSETTING( 0x02, "Cocktail (invalid?)" )
+ PORT_DIPNAME( 0x04, 0x04, "Coin Mode" ) PORT_DIPLOCATION("SW2:3")
+ PORT_DIPSETTING( 0x04, "Mode 1" )
+ PORT_DIPSETTING( 0x00, "Mode 2" )
+ /* In slowmo mode, press 2 to slow game speed */
+ PORT_DIPNAME( 0x08, 0x08, "Slow Motion Mode (Cheat)" ) PORT_DIPLOCATION("SW2:4")
+ PORT_DIPSETTING( 0x08, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( On ) )
+ /* In freeze mode, press 2 to stop and 1 to restart */
+ PORT_DIPNAME( 0x10, 0x10, "Freeze (Cheat)" ) PORT_DIPLOCATION("SW2:5")
+ PORT_DIPSETTING( 0x10, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( On ) )
+ /* In level selection mode, press 1 to select and 2 to restart */
+ PORT_DIPNAME( 0x20, 0x20, "Level Selection Mode (Cheat)" ) PORT_DIPLOCATION("SW2:6")
+ PORT_DIPSETTING( 0x20, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( On ) )
+ PORT_DIPNAME( 0x40, 0x40, "Invulnerability (Cheat)" ) PORT_DIPLOCATION("SW2:7")
+ PORT_DIPSETTING( 0x40, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( On ) )
+ PORT_SERVICE_DIPLOC( 0x80, IP_ACTIVE_LOW, "SW2:8" )
+
+ PORT_START("SYSTEM")
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START1 )
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 )
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_IMPULSE(19)
+ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_COIN1 )
+ PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
+
+ PORT_START("P1")
+ PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY
+ PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY
+ PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY
+ PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
+ PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 )
+ PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* probably unused */
+ PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 )
+INPUT_PORTS_END
+
+
+static const gfx_layout tiles8x8_layout =
+{
+ 8,8,
+ RGN_FRAC(1,3),
+ 3,
+ { RGN_FRAC(0,3),RGN_FRAC(1,3),RGN_FRAC(2,3) },
+ { 0,1,2,3,4,5,6,7 },
+ { 0*8, 1*8, 2*8, 3*8, 4*8, 5*8, 6*8, 7*8 },
+ 8*8
+};
+
+static const gfx_layout tiles16x16_layout =
+{
+ 16,16,
+ RGN_FRAC(1,3),
+ 3,
+ { RGN_FRAC(0,3),RGN_FRAC(1,3),RGN_FRAC(2,3) },
+ { 0,1,2,3,4,5,6,7, 128, 129, 130, 131, 132, 133, 134, 135 },
+ { 0*8, 1*8, 2*8, 3*8, 4*8, 5*8, 6*8, 7*8, 8*8, 9*8, 10*8, 11*8, 12*8, 13*8, 14*8, 15*8 },
+ 32*8
+};
+
+
+static GFXDECODE_START( news )
+ GFXDECODE_ENTRY( "gfx1", 0, tiles8x8_layout, 0x100, 32 )
+ GFXDECODE_ENTRY( "gfx2", 0, tiles16x16_layout, 0, 32 )
+GFXDECODE_END
+
+
+
+void spartanxtec_state::machine_start()
+{
+}
+
+void spartanxtec_state::machine_reset()
+{
+}
+
+PALETTE_INIT_MEMBER(spartanxtec_state, spartanxtec)
+{
+ // todo, proper weights for this bootleg PCB
+ const UINT8 *color_prom = memregion("cprom")->base();
+ for (int i = 0; i < 0x200; i++)
+ {
+ int r, g, b;
+
+ b = (color_prom[i+0x000]&0x0f)<<4;
+ g = (color_prom[i+0x200]&0x0f)<<4;
+ r = (color_prom[i+0x400]&0x0f)<<4;
+
+ palette.set_pen_color(i, rgb_t(r,g,b));
+ }
+}
+
+
+
+static MACHINE_CONFIG_START( spartanxtec, spartanxtec_state )
+
+ /* basic machine hardware */
+ MCFG_CPU_ADD("maincpu", Z80,4000000) /* ? MHz */
+ MCFG_CPU_PROGRAM_MAP(spartanxtec_map)
+ MCFG_CPU_VBLANK_INT_DRIVER("screen", spartanxtec_state, irq0_line_assert)
+
+ MCFG_CPU_ADD("audiocpu", Z80,4000000)
+ MCFG_CPU_PROGRAM_MAP(spartanxtec_sound_map)
+ MCFG_CPU_IO_MAP(spartanxtec_sound_io)
+ MCFG_CPU_PERIODIC_INT_DRIVER(spartanxtec_state, irq0_line_assert, 1000) // controls speed of music
+// MCFG_CPU_VBLANK_INT_DRIVER("screen", spartanxtec_state, irq0_line_hold)
+
+ /* video hardware */
+ // todo, proper screen timings for this bootleg PCB - as visible area is less it's probably ~60hz, not 55
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(1790))
+ MCFG_SCREEN_SIZE(64*8, 32*8)
+ MCFG_SCREEN_VISIBLE_AREA((64*8-256)/2, 64*8-(64*8-256)/2-1, 0*8, 32*8-1-16)
+ MCFG_SCREEN_UPDATE_DRIVER(spartanxtec_state, screen_update_spartanxtec)
+ MCFG_SCREEN_PALETTE("palette")
+
+ MCFG_PALETTE_ADD("palette", 0x200)
+ MCFG_PALETTE_INIT_OWNER(spartanxtec_state,spartanxtec)
+
+ MCFG_GFXDECODE_ADD("gfxdecode", "palette", news)
+
+ /* sound hardware */
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+
+ MCFG_SOUND_ADD("ay1", AY8910, 1000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ay2", AY8910, 1000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_SOUND_ADD("ay3", AY8910, 1000000)
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+
+MACHINE_CONFIG_END
+
+
+
+ROM_START( spartanxtec )
+ ROM_REGION( 0x10000, "maincpu", 0 )
+ ROM_LOAD( "1.bin", 0x00000, 0x04000, CRC(d5d6cddf) SHA1(baaec83be455bf2267d51ea2a2c1fcda22f27bd5) )
+ ROM_LOAD( "2.bin", 0x04000, 0x04000, CRC(2803bb72) SHA1(d0f93c61f3f08fb866e2a4617a7824e72f61c97f) )
+
+ ROM_REGION( 0x10000, "audiocpu", 0 )
+ ROM_LOAD( "3.bin", 0x00000, 0x01000, CRC(9a18af94) SHA1(1644295aa0c837dced5934360e41d77e0a93ccd1) )
+
+ ROM_REGION( 0x6000, "gfx1", ROMREGION_INVERT )
+ ROM_LOAD( "5.bin", 0x00000, 0x0800, CRC(8a3d2978) SHA1(e50ba8d63e894c6a555d92c3144682be68f111b0))
+ ROM_CONTINUE(0x1000, 0x0800)
+ ROM_CONTINUE(0x0800, 0x0800)
+ ROM_CONTINUE(0x1800, 0x0800)
+ ROM_LOAD( "6.bin", 0x02000, 0x0800, CRC(b1570b6b) SHA1(380a692309690e6ff6b57fda657192fff95167e0) )
+ ROM_CONTINUE(0x3000, 0x0800)
+ ROM_CONTINUE(0x2800, 0x0800)
+ ROM_CONTINUE(0x3800, 0x0800)
+ ROM_LOAD( "4.bin", 0x04000, 0x0800, CRC(b55672ef) SHA1(7bd556a76e130be1262aa7db09df84c6463ce9ef) )
+ ROM_CONTINUE(0x5000, 0x0800)
+ ROM_CONTINUE(0x4800, 0x0800)
+ ROM_CONTINUE(0x5800, 0x0800)
+
+ ROM_REGION( 0x18000, "gfx2", ROMREGION_INVERT )
+ ROM_LOAD( "7.bin", 0x00000, 0x08000, CRC(aa897e30) SHA1(90b3b316800be106d3baa6783ca894703f369d4e) )
+ ROM_LOAD( "8.bin", 0x08000, 0x08000, CRC(98a1803b) SHA1(3edfc45c289f850b07a0231ce0b792cbec6fb245) )
+ ROM_LOAD( "9.bin", 0x10000, 0x08000, CRC(e3bf0d73) SHA1(4562422c07399e240081792b96b9018d1e7dd97b) )
+
+ ROM_REGION( 0x600, "cprom", 0 )
+ // first half of all of these is empty
+ ROM_LOAD( "4_MCM7643_82s137.BIN", 0x0000, 0x0200, CRC(548a0ab1) SHA1(e414b61feba73bcc1a53e17c848aceea3b8100e7) ) ROM_CONTINUE(0x0000,0x0200)
+ ROM_LOAD( "5_MCM7643_82s137.BIN", 0x0200, 0x0200, CRC(a678480e) SHA1(515fa2b09c666a46dc145313eda3c465afff4451) ) ROM_CONTINUE(0x0200,0x0200)
+ ROM_LOAD( "6_MCM7643_82s137.BIN", 0x0400, 0x0200, CRC(5a707f85) SHA1(35932daf453787780550464b78465581e1ef35e1) ) ROM_CONTINUE(0x0400,0x0200)
+
+ ROM_REGION( 0x18000, "timing", 0 ) // i think
+ ROM_LOAD( "7_82s147.BIN", 0x0000, 0x0200, CRC(54a9e294) SHA1(d44d21ab8141bdfe697fd303cdc1b5c4177909bc) )
+
+ ROM_REGION( 0x18000, "unkprom", 0 ) // just linear increasing value
+ ROM_LOAD( "1_tbp24s10_82s129.BIN", 0x0000, 0x0100, CRC(b6135ee0) SHA1(248a978987cff86c2bbad10ef332f63a6abd5bee) )
+ ROM_LOAD( "2_tbp24s10_82s129.BIN", 0x0000, 0x0100, CRC(b6135ee0) SHA1(248a978987cff86c2bbad10ef332f63a6abd5bee) )
+ROM_END
+
+
+
+GAME( 1987, spartanxtec, kungfum, spartanxtec, spartanxtec, driver_device, 0, ROT0, "bootleg (Tecfri)", "Spartan X (Tecfri hardware bootleg)", 0 )
+
diff --git a/src/mame/drivers/spyhuntertec.cpp b/src/mame/drivers/spyhuntertec.cpp
new file mode 100644
index 00000000000..783dc87905c
--- /dev/null
+++ b/src/mame/drivers/spyhuntertec.cpp
@@ -0,0 +1,795 @@
+// license:BSD-3-Clause
+// copyright-holders:David Haywood
+/*
+
+Spy Hunter(Tecfri bootleg)
+single PCB with 2x Z80
+
+significant changes compared to original HW
+
+Very different hardware, probably bootleg despite the license text printed on the PCB, similar to '1942p' and 'spartanxtec.cpp'
+PCB made by Tecfri for Recreativos Franco S.A. in Spain, has Bally Midway logo, and licensing text on the PCB.
+Board is dated '85' so seems to be a low-cost rebuild? it is unclear if it made it to market.
+
+non-interlaced
+
+sound system appears to be the same as 'spartanxtec.cpp'
+
+analog inputs seem to be read by the sound CPU, with serial communication
+
+*/
+
+#include "emu.h"
+#include "cpu/z80/z80.h"
+#include "sound/ay8910.h"
+
+
+#define MASTER_CLOCK XTAL_20MHz // ??
+
+class spyhuntertec_state : public driver_device
+{
+public:
+ spyhuntertec_state(const machine_config &mconfig, device_type type, const char *tag)
+ : driver_device(mconfig, type, tag),
+ m_audiocpu(*this, "audiocpu"),
+ m_videoram(*this, "videoram"),
+ m_spriteram(*this, "spriteram"),
+ m_spriteram2(*this, "spriteram2"),
+ m_paletteram(*this, "paletteram"),
+ m_spyhunt_alpharam(*this, "spyhunt_alpha"),
+ m_palette(*this, "palette"),
+ m_gfxdecode(*this, "gfxdecode"),
+ m_screen(*this, "screen")
+ { }
+
+
+ required_device<cpu_device> m_audiocpu;
+ required_shared_ptr<UINT8> m_videoram;
+ required_shared_ptr<UINT8> m_spriteram;
+ required_shared_ptr<UINT8> m_spriteram2;
+ required_shared_ptr<UINT8> m_paletteram;
+ required_shared_ptr<UINT8> m_spyhunt_alpharam;
+
+ virtual void machine_start() override;
+ virtual void machine_reset() override;
+ virtual void video_start() override;
+ void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect);
+ UINT32 screen_update_spyhuntertec(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
+
+
+ required_device<palette_device> m_palette;
+ required_device<gfxdecode_device> m_gfxdecode;
+ required_device<screen_device> m_screen;
+
+ UINT8 m_spyhunt_sprite_color_mask;
+ INT16 m_spyhunt_scroll_offset;
+ INT16 m_spyhunt_scrollx;
+ INT16 m_spyhunt_scrolly;
+
+ int mcr_cocktail_flip;
+
+ tilemap_t *m_alpha_tilemap;
+ tilemap_t *m_bg_tilemap;
+ DECLARE_WRITE8_MEMBER(spyhuntertec_paletteram_w);
+ DECLARE_DRIVER_INIT(spyhuntertec);
+// DECLARE_VIDEO_START(spyhuntertec);
+// UINT32 screen_update_spyhuntertec(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
+ DECLARE_WRITE8_MEMBER(spyhuntertec_port04_w);
+ DECLARE_WRITE8_MEMBER(spyhuntertec_fd00_w);
+ DECLARE_WRITE8_MEMBER(spyhuntertec_portf0_w);
+
+ DECLARE_WRITE8_MEMBER(spyhunt_videoram_w);
+ DECLARE_WRITE8_MEMBER(spyhunt_alpharam_w);
+ DECLARE_WRITE8_MEMBER(spyhunt_scroll_value_w);
+ DECLARE_WRITE8_MEMBER(sound_irq_ack);
+
+
+ DECLARE_WRITE8_MEMBER(ay1_porta_w);
+ DECLARE_READ8_MEMBER(ay1_porta_r);
+
+ DECLARE_WRITE8_MEMBER(ay2_porta_w);
+ DECLARE_READ8_MEMBER(ay2_porta_r);
+
+ DECLARE_READ8_MEMBER(spyhuntertec_in2_r);
+ DECLARE_READ8_MEMBER(spyhuntertec_in3_r);
+
+ TILEMAP_MAPPER_MEMBER(spyhunt_bg_scan);
+ TILE_GET_INFO_MEMBER(spyhunt_get_bg_tile_info);
+ TILE_GET_INFO_MEMBER(spyhunt_get_alpha_tile_info);
+ void mcr3_update_sprites(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int color_mask, int code_xor, int dx, int dy, int interlaced);
+
+
+};
+
+WRITE8_MEMBER(spyhuntertec_state::ay1_porta_w)
+{
+// printf("ay1_porta_w %02x\n", data);
+}
+
+READ8_MEMBER(spyhuntertec_state::ay1_porta_r)
+{
+// printf("ay1_porta_r\n");
+ return 0;
+}
+
+
+
+WRITE8_MEMBER(spyhuntertec_state::ay2_porta_w)
+{
+// printf("ay2_porta_w %02x\n", data);
+}
+
+READ8_MEMBER(spyhuntertec_state::ay2_porta_r)
+{
+// read often, even if port is set to output mode
+// maybe latches something?
+// printf("ay2_porta_r\n");
+ return rand();
+}
+
+WRITE8_MEMBER(spyhuntertec_state::spyhunt_videoram_w)
+{
+ UINT8 *videoram = m_videoram;
+ videoram[offset] = data;
+ m_bg_tilemap->mark_tile_dirty(offset);
+}
+
+
+WRITE8_MEMBER(spyhuntertec_state::spyhunt_alpharam_w)
+{
+ m_spyhunt_alpharam[offset] = data;
+ m_alpha_tilemap->mark_tile_dirty(offset);
+}
+
+
+WRITE8_MEMBER(spyhuntertec_state::spyhunt_scroll_value_w)
+{
+ switch (offset)
+ {
+ case 0:
+ /* low 8 bits of horizontal scroll */
+ m_spyhunt_scrollx = (m_spyhunt_scrollx & ~0xff) | data;
+ break;
+
+ case 1:
+ /* upper 3 bits of horizontal scroll and upper 1 bit of vertical scroll */
+ m_spyhunt_scrollx = (m_spyhunt_scrollx & 0xff) | ((data & 0x07) << 8);
+ m_spyhunt_scrolly = (m_spyhunt_scrolly & 0xff) | ((data & 0x80) << 1);
+ break;
+
+ case 2:
+ /* low 8 bits of vertical scroll */
+ m_spyhunt_scrolly = (m_spyhunt_scrolly & ~0xff) | data;
+ break;
+ }
+}
+
+
+WRITE8_MEMBER(spyhuntertec_state::spyhuntertec_paletteram_w)
+{
+ m_paletteram[offset] = data;
+ offset = (offset & 0x0f) | (offset & 0x60) >> 1;
+
+ int r = (data & 0x07) >> 0;
+ int g = (data & 0x38) >> 3;
+ int b = (data & 0xc0) >> 6;
+
+ m_palette->set_pen_color(offset^0xf, rgb_t(r<<5,g<<5,b<<6));
+}
+
+
+TILEMAP_MAPPER_MEMBER(spyhuntertec_state::spyhunt_bg_scan)
+{
+ /* logical (col,row) -> memory offset */
+ return (row & 0x0f) | ((col & 0x3f) << 4) | ((row & 0x10) << 6);
+}
+
+
+TILE_GET_INFO_MEMBER(spyhuntertec_state::spyhunt_get_bg_tile_info)
+{
+ UINT8 *videoram = m_videoram;
+ int data = videoram[tile_index];
+ int code = (data & 0x3f) | ((data >> 1) & 0x40);
+ SET_TILE_INFO_MEMBER(0, code, 0, (data & 0x40) ? TILE_FLIPY : 0);
+}
+
+
+TILE_GET_INFO_MEMBER(spyhuntertec_state::spyhunt_get_alpha_tile_info)
+{
+ SET_TILE_INFO_MEMBER(2, m_spyhunt_alpharam[tile_index], 0, 0);
+}
+
+
+
+void spyhuntertec_state::video_start()
+{
+ /* initialize the background tilemap */
+ m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(spyhuntertec_state::spyhunt_get_bg_tile_info),this), tilemap_mapper_delegate(FUNC(spyhuntertec_state::spyhunt_bg_scan),this), 64,16, 64,32);
+
+ /* initialize the text tilemap */
+ m_alpha_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(spyhuntertec_state::spyhunt_get_alpha_tile_info),this), TILEMAP_SCAN_COLS, 16,8, 32,32);
+ m_alpha_tilemap->set_transparent_pen(0);
+ m_alpha_tilemap->set_scrollx(0, 16);
+
+ save_item(NAME(m_spyhunt_sprite_color_mask));
+ save_item(NAME(m_spyhunt_scrollx));
+ save_item(NAME(m_spyhunt_scrolly));
+ save_item(NAME(m_spyhunt_scroll_offset));
+}
+
+
+
+
+void spyhuntertec_state::mcr3_update_sprites(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int color_mask, int code_xor, int dx, int dy, int interlaced)
+{
+ UINT8 *spriteram = m_spriteram;
+ int offs;
+
+ m_screen->priority().fill(1, cliprect);
+
+ /* loop over sprite RAM */
+ for (offs = m_spriteram.bytes() - 4; offs >= 0; offs -= 4)
+ {
+ int code, color, flipx, flipy, sx, sy, flags;
+
+ /* skip if zero */
+ if (spriteram[offs] == 0)
+ continue;
+
+/*
+ monoboard:
+ flags.d0 -> ICG0~ -> PCG0~/PCG2~/PCG4~/PCG6~ -> bit 4 of linebuffer
+ flags.d1 -> ICG1~ -> PCG1~/PCG3~/PCG5~/PCG7~ -> bit 5 of linebuffer
+ flags.d2 -> IPPR -> PPR0 /PPR1 /PPR2 /PPR3 -> bit 6 of linebuffer
+ flags.d3 -> IRA15 ----------------------------> address line 15 of FG ROMs
+ flags.d4 -> HFLIP
+ flags.d5 -> VFLIP
+
+*/
+
+ /* extract the bits of information */
+ flags = spriteram[offs + 1];
+ code = spriteram[offs + 2] + 256 * ((flags >> 3) & 0x01);
+ color = ~flags & color_mask;
+ flipx = flags & 0x10;
+ flipy = flags & 0x20;
+ sx = (spriteram[offs + 3] - 3) * 2;
+ sy = (241 - spriteram[offs]);
+
+ if (interlaced == 1) sy *= 2;
+
+ code ^= code_xor;
+
+ sx += dx;
+ sy += dy;
+
+ /* sprites use color 0 for background pen and 8 for the 'under tile' pen.
+ The color 8 is used to cover over other sprites. */
+ if (!mcr_cocktail_flip)
+ {
+ /* first draw the sprite, visible */
+ m_gfxdecode->gfx(1)->prio_transmask(bitmap,cliprect, code, color, flipx, flipy, sx, sy,
+ screen.priority(), 0x00, 0x0101);
+
+ /* then draw the mask, behind the background but obscuring following sprites */
+ m_gfxdecode->gfx(1)->prio_transmask(bitmap,cliprect, code, color, flipx, flipy, sx, sy,
+ screen.priority(), 0x02, 0xfeff);
+ }
+ else
+ {
+ /* first draw the sprite, visible */
+ m_gfxdecode->gfx(1)->prio_transmask(bitmap,cliprect, code, color, !flipx, !flipy, 480 - sx, 452 - sy,
+ screen.priority(), 0x00, 0x0101);
+
+ /* then draw the mask, behind the background but obscuring following sprites */
+ m_gfxdecode->gfx(1)->prio_transmask(bitmap,cliprect, code, color, !flipx, !flipy, 480 - sx, 452 - sy,
+ screen.priority(), 0x02, 0xfeff);
+ }
+ }
+}
+
+
+UINT32 spyhuntertec_state::screen_update_spyhuntertec(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
+{
+ /* for every character in the Video RAM, check if it has been modified */
+ /* since last time and update it accordingly. */
+ m_bg_tilemap->set_scrollx(0, m_spyhunt_scrollx * 2 + m_spyhunt_scroll_offset);
+ m_bg_tilemap->set_scrolly(0, m_spyhunt_scrolly * 2);
+ m_bg_tilemap->draw(screen, bitmap, cliprect, 0, 0);
+
+ /* draw the sprites */
+ mcr3_update_sprites(screen, bitmap, cliprect, m_spyhunt_sprite_color_mask, 0, -12, 0, 0);
+
+ /* render any characters on top */
+ m_alpha_tilemap->draw(screen, bitmap, cliprect, 0, 0);
+ return 0;
+}
+
+
+
+WRITE8_MEMBER(spyhuntertec_state::spyhuntertec_fd00_w)
+{
+// printf("%04x spyhuntertec_fd00_w %02x\n", space.device().safe_pc(), data);
+ soundlatch_byte_w(space, 0, data);
+ m_audiocpu->set_input_line(INPUT_LINE_NMI, PULSE_LINE);
+}
+
+READ8_MEMBER(spyhuntertec_state::spyhuntertec_in2_r)
+{
+ // it writes 04 / 14 to the sound latch (spyhuntertec_fd00_w) before
+ // reading bit 6 here a minimum of 32 times.
+ // seems to be how it reads the analog controls? probably via sound CPU??
+
+ /* note, these commands trigger a read from ay2_porta on the sound cpu side, followed by 2 writes
+
+ a52a spyhuntertec_fd00_w 14
+ ay2_porta_r
+ ay2_porta_w 80
+ ay2_porta_w 00
+ a52a spyhuntertec_fd00_w 04
+ ay2_porta_r
+ ay2_porta_w 81
+ ay2_porta_w 01
+ */
+
+ /*
+
+ -- input reading code here
+ A388: 3E 14 ld a,$14
+ A38A: 28 04 jr z,$A390
+ A38C: DD 23 inc ix
+ A38E: 3E 04 ld a,$04
+ A390: CD 20 A5 call $A520 << write command to sub-cpu
+
+ -- delay loop / timeout loop for reading result? value of b doesn't get used in the end
+ A393: 06 1F ld b,$1F << loop counter
+ A395: 21 02 FC ld hl,$FC02
+ loopstart:
+ A398: CB 76 bit 6,(hl)
+ A39A: 28 06 jr z,$A3A2 to dest2
+ A39C: 10 FA djnz $A398 (to loopstart)
+
+ A39E: 06 0F ld b,$0F <
+ A3A0: 18 1E jr $A3C0 to dest 3
+
+ dest2:
+ A3A2: 06 33 ld b,$33 << loop counter
+ loop2start:
+ A3A4: CB 76 bit 6,(hl)
+ A3A6: 20 11 jr nz,$A3B9 (to outofloop)
+ A3A8: CB 76 bit 6,(hl)
+ A3AA: 00 nop
+ A3AB: CB 76 bit 6,(hl)
+ A3AD: 20 0A jr nz,$A3B9 (to outofloop)
+ A3AF: 10 F3 djnz $A3A4 (to loop2start)
+
+ A3B1: 00 nop
+ A3B2: 00 nop
+ A3B3: 00 nop
+ A3B4: 00 nop
+ A3B5: 00 nop
+ A3B6: 00 nop
+ A3B7: 00 nop
+ A3B8: 00 nop
+
+ outofloop:
+ A3B9: 78 ld a,b
+ A3BA: FE 20 cp $20
+ A3BC: 38 02 jr c,$A3C0
+ A3BE: 06 1F ld b,$1F
+
+ dest3:
+ A3C0: 21 B6 A6 ld hl,$A6B6
+ ...
+
+
+ */
+
+ UINT8 ret = ioport("IN2")->read();
+// printf("%04x spyhuntertec_in2_r\n", space.device().safe_pc());
+ return ret;
+}
+
+READ8_MEMBER(spyhuntertec_state::spyhuntertec_in3_r)
+{
+ UINT8 ret = ioport("IN3")->read();
+// printf("%04x spyhuntertec_in3_r\n", space.device().safe_pc());
+ return ret;
+}
+
+static ADDRESS_MAP_START( spyhuntertec_map, AS_PROGRAM, 8, spyhuntertec_state )
+ ADDRESS_MAP_UNMAP_HIGH
+ AM_RANGE(0xa800, 0xa8ff) AM_RAM // the ROM is a solid fill in these areas, and they get tested as RAM, I think they moved the 'real' scroll regs here
+ AM_RANGE(0xa900, 0xa9ff) AM_RAM
+
+ AM_RANGE(0x0000, 0xdfff) AM_ROM
+
+ AM_RANGE(0xe000, 0xe7ff) AM_RAM_WRITE(spyhunt_videoram_w) AM_SHARE("videoram")
+ AM_RANGE(0xe800, 0xebff) AM_MIRROR(0x0400) AM_RAM_WRITE(spyhunt_alpharam_w) AM_SHARE("spyhunt_alpha")
+ AM_RANGE(0xf000, 0xf7ff) AM_RAM //AM_SHARE("nvram")
+ AM_RANGE(0xf800, 0xf9ff) AM_RAM AM_SHARE("spriteram") // origional spriteram
+ AM_RANGE(0xfa00, 0xfa7f) AM_MIRROR(0x0180) AM_RAM_WRITE(spyhuntertec_paletteram_w) AM_SHARE("paletteram")
+
+ AM_RANGE(0xfc00, 0xfc00) AM_READ_PORT("DSW0")
+ AM_RANGE(0xfc01, 0xfc01) AM_READ_PORT("DSW1")
+ AM_RANGE(0xfc02, 0xfc02) AM_READ(spyhuntertec_in2_r)
+ AM_RANGE(0xfc03, 0xfc03) AM_READ(spyhuntertec_in3_r)
+
+ AM_RANGE(0xfd00, 0xfd00) AM_WRITE( spyhuntertec_fd00_w )
+
+ AM_RANGE(0xfe00, 0xffff) AM_RAM AM_SHARE("spriteram2") // actual spriteram for this hw??
+ADDRESS_MAP_END
+
+WRITE8_MEMBER(spyhuntertec_state::spyhuntertec_port04_w)
+{
+}
+
+WRITE8_MEMBER(spyhuntertec_state::spyhuntertec_portf0_w)
+{
+ // 0x08 on startup, then 0x03, probably CTC leftovers from the original.
+ if ((data != 0x03) && (data != 0x08)) printf("spyhuntertec_portf0_w %02x\n", data);
+}
+
+static ADDRESS_MAP_START( spyhuntertec_portmap, AS_IO, 8, spyhuntertec_state )
+ ADDRESS_MAP_UNMAP_HIGH
+ ADDRESS_MAP_GLOBAL_MASK(0xff)
+ AM_RANGE(0x04, 0x04) AM_WRITE(spyhuntertec_port04_w)
+ AM_RANGE(0x84, 0x86) AM_WRITE(spyhunt_scroll_value_w)
+ AM_RANGE(0xe0, 0xe0) AM_WRITENOP // was watchdog
+// AM_RANGE(0xe8, 0xe8) AM_WRITENOP
+ AM_RANGE(0xf0, 0xf0) AM_WRITE( spyhuntertec_portf0_w )
+ADDRESS_MAP_END
+
+
+static ADDRESS_MAP_START( spyhuntertec_sound_map, AS_PROGRAM, 8, spyhuntertec_state )
+ AM_RANGE(0x0000, 0x1fff) AM_ROM
+ AM_RANGE(0x8000, 0x83ff) AM_RAM
+
+ AM_RANGE(0xc000, 0xc000) AM_READ(soundlatch_byte_r)
+ADDRESS_MAP_END
+
+
+WRITE8_MEMBER(spyhuntertec_state::sound_irq_ack)
+{
+ m_audiocpu->set_input_line(INPUT_LINE_IRQ0, CLEAR_LINE);
+}
+
+static ADDRESS_MAP_START( spyhuntertec_sound_portmap, AS_IO, 8, spyhuntertec_state )
+ ADDRESS_MAP_UNMAP_HIGH
+ ADDRESS_MAP_GLOBAL_MASK(0xff)
+
+ AM_RANGE(0x00, 0x00) AM_WRITE(sound_irq_ack)
+
+ AM_RANGE(0x0012, 0x0013) AM_DEVWRITE("ay3", ay8910_device, address_data_w)
+ AM_RANGE(0x0012, 0x0012) AM_DEVREAD("ay3", ay8910_device, data_r)
+
+ AM_RANGE(0x0014, 0x0015) AM_DEVWRITE("ay1", ay8910_device, address_data_w)
+ AM_RANGE(0x0014, 0x0014) AM_DEVREAD("ay1", ay8910_device, data_r)
+
+ AM_RANGE(0x0018, 0x0019) AM_DEVWRITE("ay2", ay8910_device, address_data_w) // data written to port a
+ AM_RANGE(0x0018, 0x0018) AM_DEVREAD("ay2", ay8910_device, data_r) // actually read
+
+ADDRESS_MAP_END
+
+
+
+static INPUT_PORTS_START( spyhuntertec )
+ PORT_START("DSW0")
+ PORT_DIPNAME( 0x01, 0x01, "DSW0-01" )
+ PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( On ) )
+ PORT_DIPNAME( 0x02, 0x02, "DSW0-02" )
+ PORT_DIPSETTING( 0x02, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( On ) )
+ PORT_DIPNAME( 0x04, 0x04, "DSW0-04" )
+ PORT_DIPSETTING( 0x04, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( On ) )
+ PORT_DIPNAME( 0x08, 0x08, "DSW0-08" )
+ PORT_DIPSETTING( 0x08, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( On ) )
+ PORT_DIPNAME( 0x10, 0x10, "DSW0-10" )
+ PORT_DIPSETTING( 0x10, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( On ) )
+ PORT_DIPNAME( 0x20, 0x20, "DSW0-20" )
+ PORT_DIPSETTING( 0x20, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( On ) )
+ PORT_DIPNAME( 0x40, 0x40, "DSW0-40" )
+ PORT_DIPSETTING( 0x40, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( On ) )
+ PORT_DIPNAME( 0x80, 0x80, "DSW0-80" )
+ PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( On ) )
+
+ PORT_START("DSW1")
+ PORT_DIPNAME( 0x01, 0x01, "DSW1-01" )
+ PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( On ) )
+ PORT_DIPNAME( 0x02, 0x02, "DSW1-02" )
+ PORT_DIPSETTING( 0x02, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( On ) )
+ PORT_SERVICE( 0x04, IP_ACTIVE_LOW )
+ PORT_DIPNAME( 0x08, 0x08, "DSW1-08" )
+ PORT_DIPSETTING( 0x08, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( On ) )
+ PORT_DIPNAME( 0x10, 0x10, "DSW1-10" )
+ PORT_DIPSETTING( 0x10, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( On ) )
+ PORT_DIPNAME( 0x20, 0x20, "DSW1-20" )
+ PORT_DIPSETTING( 0x20, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( On ) )
+ PORT_DIPNAME( 0x40, 0x40, "DSW1-40" )
+ PORT_DIPSETTING( 0x40, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( On ) )
+ PORT_DIPNAME( 0x80, 0x80, "DSW1-80" )
+ PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x00, DEF_STR( On ) )
+
+ PORT_START("IN2")
+ PORT_DIPNAME( 0x0001, 0x0001, "2" )
+ PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
+ PORT_DIPNAME( 0x0002, 0x0002, "start" ) // start
+ PORT_DIPSETTING( 0x0002, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
+ PORT_DIPNAME( 0x0004, 0x0004, DEF_STR( Unknown ) )
+ PORT_DIPSETTING( 0x0004, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
+ PORT_DIPNAME( 0x0008, 0x0008, DEF_STR( Unknown ) )
+ PORT_DIPSETTING( 0x0008, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
+ PORT_DIPNAME( 0x0010, 0x0010, "handbrake?" )
+ PORT_DIPSETTING( 0x0010, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
+ PORT_DIPNAME( 0x0020, 0x0020, DEF_STR( Unknown ) )
+ PORT_DIPSETTING( 0x0020, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
+ PORT_DIPNAME( 0x0040, 0x0040, "pedal inverse" )
+ PORT_DIPSETTING( 0x0040, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
+ PORT_DIPNAME( 0x0080, 0x0080, DEF_STR( Unknown ) )
+ PORT_DIPSETTING( 0x0080, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
+
+ PORT_START("IN3")
+ PORT_DIPNAME( 0x0001, 0x0001, "3" )
+ PORT_DIPSETTING( 0x0001, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
+ PORT_DIPNAME( 0x0002, 0x0002, DEF_STR( Unknown ) )
+ PORT_DIPSETTING( 0x0002, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
+ PORT_DIPNAME( 0x0004, 0x0004, DEF_STR( Unknown ) )
+ PORT_DIPSETTING( 0x0004, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
+ PORT_DIPNAME( 0x0008, 0x0008, DEF_STR( Unknown ) )
+ PORT_DIPSETTING( 0x0008, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
+ PORT_DIPNAME( 0x0010, 0x0010, DEF_STR( Unknown ) )
+ PORT_DIPSETTING( 0x0010, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
+ PORT_DIPNAME( 0x0020, 0x0020, DEF_STR( Unknown ) )
+ PORT_DIPSETTING( 0x0020, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
+ PORT_DIPNAME( 0x0040, 0x0040, "coin" ) // coin?
+ PORT_DIPSETTING( 0x0040, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
+ PORT_DIPNAME( 0x0080, 0x0080, "machineguns" ) // machine guns
+ PORT_DIPSETTING( 0x0080, DEF_STR( Off ) )
+ PORT_DIPSETTING( 0x0000, DEF_STR( On ) )
+INPUT_PORTS_END
+
+
+static const gfx_layout spyhuntertec_alphalayout =
+{
+ 16,8,
+ RGN_FRAC(1,1),
+ 2,
+ { 0, 4},
+ { 0, 0, 1, 1, 2, 2, 3, 3, 8, 8, 9, 9, 10, 10, 11, 11 },
+ { 0, 2*8, 4*8, 6*8, 8*8, 10*8, 12*8, 14*8 },
+ 16*8
+};
+
+
+const gfx_layout spyhuntertec_sprite_layout =
+{
+ 32,16,
+ RGN_FRAC(1,4),
+ 4,
+ { RGN_FRAC(3,4), RGN_FRAC(2,4), RGN_FRAC(1,4), RGN_FRAC(0,4) },
+ { 6,7, 4,5, 2,3, 0,1, 14,15, 12,13, 10,11, 8,9, 22,23, 20,21, 18,19, 16,17, 30,31, 28,29, 26,27, 24,25 },
+ { 0*32,1*32,2*32,3*32,4*32,5*32,6*32,7*32,8*32,9*32,10*32,11*32,12*32,13*32,14*32,15*32 },
+
+ 16*32
+};
+
+
+static const UINT32 spyhuntp_charlayout_xoffset[64] =
+{
+ 0x0000*8,0x0000*8, 0x0000*8+1,0x0000*8+1, 0x0000*8+2,0x0000*8+2, 0x0000*8+3,0x0000*8+3, 0x0000*8+4,0x0000*8+4, 0x0000*8+5,0x0000*8+5, 0x0000*8+6,0x0000*8+6, 0x0000*8+7,0x0000*8+7,
+ 0x1000*8,0x1000*8, 0x1000*8+1,0x1000*8+1, 0x1000*8+2,0x1000*8+2, 0x1000*8+3,0x1000*8+3, 0x1000*8+4,0x1000*8+4, 0x1000*8+5,0x1000*8+5, 0x1000*8+6,0x1000*8+6, 0x1000*8+7,0x1000*8+7,
+ 0x2000*8,0x2000*8, 0x2000*8+1,0x2000*8+1, 0x2000*8+2,0x2000*8+2, 0x2000*8+3,0x2000*8+3, 0x2000*8+4,0x2000*8+4, 0x2000*8+5,0x2000*8+5, 0x2000*8+6,0x2000*8+6, 0x2000*8+7,0x2000*8+7,
+ 0x3000*8,0x3000*8, 0x3000*8+1,0x3000*8+1, 0x3000*8+2,0x3000*8+2, 0x3000*8+3,0x3000*8+3, 0x3000*8+4,0x3000*8+4, 0x3000*8+5,0x3000*8+5, 0x3000*8+6,0x3000*8+6, 0x3000*8+7,0x3000*8+7,
+};
+
+
+static const gfx_layout spyhuntertec_charlayout =
+{
+ 64,16,
+ RGN_FRAC(1,8),
+ 4,
+ { 0*8, 0x4000*8 + 2*8, 0x4000*8 + 0*8, 2*8 },
+ EXTENDED_XOFFS,
+ { 0*8, 4*8, 8*8, 12*8, 16*8, 20*8, 24*8, 28*8, 1*8, 5*8, 9*8, 13*8, 17*8, 21*8, 25*8, 29*8 },
+ 32*8,
+ spyhuntp_charlayout_xoffset,
+ nullptr
+};
+
+
+static GFXDECODE_START( spyhuntertec )
+ GFXDECODE_ENTRY( "gfx1", 0, spyhuntertec_charlayout, 3*16, 1 )
+ GFXDECODE_ENTRY( "gfx2", 0, spyhuntertec_sprite_layout, 0*16, 4 )
+ GFXDECODE_ENTRY( "gfx3", 0, spyhuntertec_alphalayout, 4*16, 1 )
+GFXDECODE_END
+
+
+
+void spyhuntertec_state::machine_start()
+{
+}
+
+void spyhuntertec_state::machine_reset()
+{
+}
+
+
+
+
+static MACHINE_CONFIG_START( spyhuntertec, spyhuntertec_state )
+
+// note: no ctc, no nvram
+// 2*z80, 3*ay8912
+
+ /* basic machine hardware */
+ MCFG_CPU_ADD("maincpu", Z80, MASTER_CLOCK/4)
+ MCFG_CPU_PROGRAM_MAP(spyhuntertec_map)
+ MCFG_CPU_IO_MAP(spyhuntertec_portmap)
+ MCFG_CPU_VBLANK_INT_DRIVER("screen", spyhuntertec_state, irq0_line_hold)
+
+ /* video hardware */
+ MCFG_SCREEN_ADD("screen", RASTER)
+ MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_BEFORE_VBLANK)
+ MCFG_SCREEN_REFRESH_RATE(60)
+ MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */)
+ MCFG_SCREEN_SIZE(30*16, 30*8)
+ MCFG_SCREEN_VISIBLE_AREA(0, 30*16-1, 0, 30*8-1)
+ MCFG_SCREEN_UPDATE_DRIVER(spyhuntertec_state, screen_update_spyhuntertec)
+ MCFG_SCREEN_PALETTE("palette")
+
+ MCFG_GFXDECODE_ADD("gfxdecode", "palette", spyhuntertec)
+ MCFG_PALETTE_ADD("palette", 64+4)
+
+// MCFG_PALETTE_INIT_OWNER(spyhuntertec_state,spyhunt)
+
+
+ MCFG_CPU_ADD("audiocpu", Z80, 4000000 )
+ MCFG_CPU_PROGRAM_MAP(spyhuntertec_sound_map)
+ MCFG_CPU_IO_MAP(spyhuntertec_sound_portmap)
+ MCFG_CPU_PERIODIC_INT_DRIVER(spyhuntertec_state, irq0_line_assert, 1000)
+
+ MCFG_SPEAKER_STANDARD_MONO("mono")
+
+ MCFG_SOUND_ADD("ay1", AY8912, 3000000/2) // AY-3-8912
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_AY8910_PORT_A_READ_CB(READ8(spyhuntertec_state, ay1_porta_r))
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(spyhuntertec_state, ay1_porta_w))
+
+ MCFG_SOUND_ADD("ay2", AY8912, 3000000/2) // "
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+ MCFG_AY8910_PORT_A_READ_CB(READ8(spyhuntertec_state, ay2_porta_r))
+ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(spyhuntertec_state, ay2_porta_w))
+
+ MCFG_SOUND_ADD("ay3", AY8912, 3000000/2) // "
+ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
+
+MACHINE_CONFIG_END
+
+
+
+
+ROM_START( spyhuntpr )
+ ROM_REGION( 0x10000, "maincpu", 0 )
+ ROM_LOAD( "1.bin", 0x0000, 0x4000, CRC(2a2f77cb) SHA1(e1b74c951efb2a49bef0507ab3268b274515f339) )
+ ROM_LOAD( "2.bin", 0x4000, 0x4000, CRC(00778aff) SHA1(7c0b24c393f841e8379d4bba57ba502e3d2512f9) )
+ ROM_LOAD( "3.bin", 0x8000, 0x4000, CRC(2183b4af) SHA1(2b958afc40b26c9bc8d5254b0600426649f4ebf0) )
+ ROM_LOAD( "4.bin", 0xc000, 0x2000, CRC(3ea6a65c) SHA1(1320ce17044307ed3c4f2459631a9aa1734f1f30) )
+
+ ROM_REGION( 0x10000, "audiocpu", 0 )
+ ROM_LOAD( "5.bin", 0x0000, 0x2000, CRC(33fe2829) SHA1(e6950dbf681242bf23542ca6604e62eacb431101) )
+
+
+ ROM_REGION( 0x08000, "gfx1", 0 )
+ ROM_LOAD32_BYTE( "6.bin", 0x0000, 0x200, CRC(6b76f46a) SHA1(4b398084c42a60fcfa4a9bf14f844e36a3f42723) )
+ ROM_CONTINUE(0x0001, 0x200)
+ ROM_CONTINUE(0x0800, 0x200)
+ ROM_CONTINUE(0x0801, 0x200)
+ ROM_CONTINUE(0x1000, 0x200)
+ ROM_CONTINUE(0x1001, 0x200)
+ ROM_CONTINUE(0x1800, 0x200)
+ ROM_CONTINUE(0x1801, 0x200)
+ ROM_CONTINUE(0x2000, 0x200)
+ ROM_CONTINUE(0x2001, 0x200)
+ ROM_CONTINUE(0x2800, 0x200)
+ ROM_CONTINUE(0x2801, 0x200)
+ ROM_CONTINUE(0x3000, 0x200)
+ ROM_CONTINUE(0x3001, 0x200)
+ ROM_CONTINUE(0x3800, 0x200)
+ ROM_CONTINUE(0x3801, 0x200)
+ ROM_LOAD32_BYTE( "7.bin", 0x0002, 0x200, CRC(085bd7a7) SHA1(c35c309b6c6485baec54d4434dea44abf4d48f41) )
+ ROM_CONTINUE(0x0003, 0x200)
+ ROM_CONTINUE(0x0802, 0x200)
+ ROM_CONTINUE(0x0803, 0x200)
+ ROM_CONTINUE(0x1002, 0x200)
+ ROM_CONTINUE(0x1003, 0x200)
+ ROM_CONTINUE(0x1802, 0x200)
+ ROM_CONTINUE(0x1803, 0x200)
+ ROM_CONTINUE(0x2002, 0x200)
+ ROM_CONTINUE(0x2003, 0x200)
+ ROM_CONTINUE(0x2802, 0x200)
+ ROM_CONTINUE(0x2803, 0x200)
+ ROM_CONTINUE(0x3002, 0x200)
+ ROM_CONTINUE(0x3003, 0x200)
+ ROM_CONTINUE(0x3802, 0x200)
+ ROM_CONTINUE(0x3803, 0x200)
+ ROM_LOAD32_BYTE( "8.bin", 0x4000, 0x200, CRC(e699b329) SHA1(cb4b8c7b6fa1cb1144a18f1442dc3b267c408914) )
+ ROM_CONTINUE(0x4001, 0x200)
+ ROM_CONTINUE(0x4800, 0x200)
+ ROM_CONTINUE(0x4801, 0x200)
+ ROM_CONTINUE(0x5000, 0x200)
+ ROM_CONTINUE(0x5001, 0x200)
+ ROM_CONTINUE(0x5800, 0x200)
+ ROM_CONTINUE(0x5801, 0x200)
+ ROM_CONTINUE(0x6000, 0x200)
+ ROM_CONTINUE(0x6001, 0x200)
+ ROM_CONTINUE(0x6800, 0x200)
+ ROM_CONTINUE(0x6801, 0x200)
+ ROM_CONTINUE(0x7000, 0x200)
+ ROM_CONTINUE(0x7001, 0x200)
+ ROM_CONTINUE(0x7800, 0x200)
+ ROM_CONTINUE(0x7801, 0x200)
+ ROM_LOAD32_BYTE( "9.bin", 0x4002, 0x200, CRC(6d462ec7) SHA1(0ff37f75b0eeceb86177a3f7c93834d5c0e24515) )
+ ROM_CONTINUE(0x4003, 0x200)
+ ROM_CONTINUE(0x4802, 0x200)
+ ROM_CONTINUE(0x4803, 0x200)
+ ROM_CONTINUE(0x5002, 0x200)
+ ROM_CONTINUE(0x5003, 0x200)
+ ROM_CONTINUE(0x5802, 0x200)
+ ROM_CONTINUE(0x5803, 0x200)
+ ROM_CONTINUE(0x6002, 0x200)
+ ROM_CONTINUE(0x6003, 0x200)
+ ROM_CONTINUE(0x6802, 0x200)
+ ROM_CONTINUE(0x6803, 0x200)
+ ROM_CONTINUE(0x7002, 0x200)
+ ROM_CONTINUE(0x7003, 0x200)
+ ROM_CONTINUE(0x7802, 0x200)
+ ROM_CONTINUE(0x7803, 0x200)
+
+ ROM_REGION( 0x10000, "gfx2", ROMREGION_INVERT )
+ ROM_LOAD( "10.bin", 0x00000, 0x4000, CRC(6f9fd416) SHA1(a51c86e5b22c91fc44673f53400b58af40b18065) )
+ ROM_LOAD( "11.bin", 0x04000, 0x4000, CRC(75526ffe) SHA1(ff1adf6f9b6595114d0bd06b72d9eb7bbf70144d) )
+ ROM_LOAD( "12.bin", 0x08000, 0x4000, CRC(82ee7a4d) SHA1(184720de76680275bf7c4a171f03a0ce771d91fc) )
+ ROM_LOAD( "13.bin", 0x0c000, 0x4000, CRC(0cc592a3) SHA1(b3563bde83432cdbaedb88d4d222da30bf679b08) )
+
+
+ ROM_REGION( 0x01000, "gfx3", 0 )
+ ROM_LOAD( "14.bin", 0x00000, 0x1000, CRC(87a4c130) SHA1(7792afdc36b0f3bd51c387d04d38f60c85fd2e93) )
+ROM_END
+
+DRIVER_INIT_MEMBER(spyhuntertec_state,spyhuntertec)
+{
+ m_spyhunt_sprite_color_mask = 0x00;
+ m_spyhunt_scroll_offset = 16;
+}
+
+
+GAME (1983, spyhuntpr,spyhunt, spyhuntertec, spyhuntertec,spyhuntertec_state, spyhuntertec,ROT90, "Bally Midway (Recreativos Franco S.A. license)", "Spy Hunter (Spain, Tecfri / Recreativos Franco S.A. PCB)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/toki.cpp b/src/mame/drivers/toki.cpp
index 5799e0d239c..46d0ef11f0f 100644
--- a/src/mame/drivers/toki.cpp
+++ b/src/mame/drivers/toki.cpp
@@ -542,6 +542,47 @@ ROM_START( toki )
ROM_END
+ROM_START( tokip )
+ ROM_REGION( 0x60000, "maincpu", 0 ) /* 6*64k for 68000 code */
+ ROM_LOAD16_BYTE( "6 10-M", 0x00000, 0x20000, CRC(91b554a3) SHA1(ab003e82552eba381099eb2d00577f952cad42f7) ) // different
+ ROM_LOAD16_BYTE( "4 10-K", 0x00001, 0x20000, CRC(404220f7) SHA1(f614692d05f1280cbe801fe0486a611f38b5e866) ) // different
+ ROM_LOAD16_BYTE( "5 12-M", 0x40000, 0x10000, CRC(d6a82808) SHA1(9fcd3e97f7eaada5374347383dc8a6cea2378f7f) )
+ ROM_LOAD16_BYTE( "3 12-K", 0x40001, 0x10000, CRC(a01a5b10) SHA1(76d6da114105402aab9dd5167c0c00a0bddc3bba) )
+
+ ROM_REGION( 0x20000, "audiocpu", 0 ) /* Z80 code, banked data */
+ ROM_LOAD( "8 3-M", 0x00000, 0x02000, CRC(6c87c4c5) SHA1(d76822bcde3d42afae72a0945b6acbf3c6a1d955) ) /* encrypted */
+ ROM_LOAD( "7 7-M", 0x10000, 0x10000, CRC(a67969c4) SHA1(99781fbb005b6ba4a19a9cc83c8b257a3b425fa6) ) /* banked stuff */
+
+ ROM_REGION( 0x020000, "gfx1", 0 )
+ ROM_LOAD( "1 5-C", 0x000000, 0x10000, CRC(fd0ff303) SHA1(e861b8efd7b3050b95a7d9ff1732bb9641e4dbcc) ) /* chars */ // different
+ ROM_LOAD( "2 3-C", 0x010000, 0x10000, CRC(86e87e48) SHA1(29634d8c58ef7195cd0ce166f1b7fae01bbc110b) )
+
+ ROM_REGION( 0x100000, "gfx2", 0 )
+ ROM_LOAD16_BYTE( "OBJ 1-0.ROM10", 0x00000, 0x20000, CRC(a027bd8e) SHA1(33cc4ae75332ab35df1c03f74db8cb17f2749ead) )
+ ROM_LOAD16_BYTE( "OBJ 1-1.ROM9", 0x00001, 0x20000, CRC(43a767ea) SHA1(bfc879ff714828f7a1b8f784db8728c91287ed20) )
+ ROM_LOAD16_BYTE( "OBJ 1-2.ROM12", 0x40000, 0x20000, CRC(1aecc9d8) SHA1(e7a79783e71de472f07761f9dc71f2a78e629676) )
+ ROM_LOAD16_BYTE( "OBJ 1-3.ROM11", 0x40001, 0x20000, CRC(d65c0c6d) SHA1(6b895ce06dae1ecc21c64993defbb3be6b6f8ac2) )
+ ROM_LOAD16_BYTE( "OBJ 2-0.ROM14", 0x80000, 0x20000, CRC(cedaccaf) SHA1(82f135c9f6a51e49df543e370861918d582a7923) )
+ ROM_LOAD16_BYTE( "OBJ 2-1.ROM13", 0x80001, 0x20000, CRC(013f539b) SHA1(d62c048a95b9c331cedc5343f70947bb50e49c87) )
+ ROM_LOAD16_BYTE( "OBJ 2-2.ROM16", 0xc0000, 0x20000, CRC(6a8e6e22) SHA1(a6144201e9a18aa46f65957694653a40071d92d4) )
+ ROM_LOAD16_BYTE( "OBJ 2-3.ROM15", 0xc0001, 0x20000, CRC(25d9a16c) SHA1(059d1e2e874bb41f8ef576e0cf33bdbffb57ddc0) )
+
+ ROM_REGION( 0x080000, "gfx3", 0 )
+ ROM_LOAD16_BYTE( "BACK 1-0.ROM5", 0x00000, 0x20000, CRC(fac7e32f) SHA1(13f789c209aa6a6866dfc5a83ca68d83271b12c6) )
+ ROM_LOAD16_BYTE( "BACK 1-1.ROM6", 0x00001, 0x20000 ,CRC(ee1135d6) SHA1(299bb3f82d6ded4f401fb407e298842a47a45b1d) )
+ ROM_LOAD16_BYTE( "BACK 1-2.ROM7", 0x40000, 0x20000, CRC(78db8d57) SHA1(a03bb854205c410c05d9a82f20354370c0af0bda) )
+ ROM_LOAD16_BYTE( "BACK 1-3.ROM8", 0x40001, 0x20000, CRC(d719de71) SHA1(decbb5213d97f75b80ae74e4ccf2ff465d1dfad9) )
+
+ ROM_REGION( 0x080000, "gfx4", 0 )
+ ROM_LOAD16_BYTE( "BACK 2-0.ROM1", 0x00000, 0x20000, CRC(949d8025) SHA1(919821647d1bfd0b5b35afcb1c76fddc51a74854))
+ ROM_LOAD16_BYTE( "BACK 2-1.ROM2", 0x00001, 0x20000, CRC(4b28b4b4) SHA1(22e5d9098069833ab1dcc89abe07f9ade1b00459) )
+ ROM_LOAD16_BYTE( "BACK 2-2.ROM3", 0x40000, 0x20000, CRC(1aa9a5cf) SHA1(305101589f6f56584c8147456dbb4360eaa31fef) )
+ ROM_LOAD16_BYTE( "BACK 2-3.ROM4", 0x40001, 0x20000, CRC(6759571f) SHA1(bff3a73ed33c236b38425570f3eb0bbf9a3ca84c) )
+
+ ROM_REGION( 0x40000, "oki", 0 ) /* ADPCM samples */
+ ROM_LOAD( "9 1-M", 0x00000, 0x20000, CRC(ae7a6b8b) SHA1(1d410f91354ffd1774896b2e64f20a2043607805) ) //
+ROM_END
+
ROM_START( tokia )
ROM_REGION( 0x60000, "maincpu", 0 ) /* 6*64k for 68000 code */
ROM_LOAD16_BYTE( "6.m10", 0x00000, 0x20000, CRC(03d726b1) SHA1(bbe3a1ea1943cd73b821b3de4d5bf3dfbffd2168) )
@@ -912,6 +953,9 @@ DRIVER_INIT_MEMBER(toki_state,jujuba)
GAME( 1989, toki, 0, tokie, toki, toki_state, toki, ROT0, "TAD Corporation", "Toki (World, set 1)", MACHINE_SUPPORTS_SAVE )
GAME( 1989, tokiu, toki, tokie, toki, toki_state, toki, ROT0, "TAD Corporation (Fabtek license)", "Toki (US, set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1989, tokip, toki, tokie, toki, toki_state, toki, ROT0, "TAD Corporation (Fabtek license)", "Toki (US, prototype?)", MACHINE_SUPPORTS_SAVE )
+
+
// these 3 are all the same revision, only the region byte differs
GAME( 1989, tokia, toki, tokie, toki, toki_state, toki, ROT0, "TAD Corporation", "Toki (World, set 2)", MACHINE_SUPPORTS_SAVE )
GAME( 1989, tokiua,toki, tokie, toki, toki_state, toki, ROT0, "TAD Corporation (Fabtek license)", "Toki (US, set 2)", MACHINE_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/tourvis.cpp b/src/mame/drivers/tourvis.cpp
index 769171d5b2f..153c8f6e2ce 100644
--- a/src/mame/drivers/tourvis.cpp
+++ b/src/mame/drivers/tourvis.cpp
@@ -92,13 +92,12 @@
USA Pro Basketball
Veigues
* Vigilante
- # Volfied
+ Volfied
W-Ring
Winning Shot
Xevious
* Denotes Not Dumped
-# Denotes Redump Needed
_______________________________________________________________________________________________________________________________________________
| |
@@ -1008,7 +1007,7 @@ ROM_END
/* Volfied - Taito */
ROM_START(tvvolfd)
ROM_REGION( 0x100000, "maincpu", 0 )
- ROM_LOAD( "tourv_volfd.bin", 0x00000, 0x100000, BAD_DUMP CRC(c33efba5) SHA1(41ad4f85e551321487be61e2adbeae67e65c47de) )
+ ROM_LOAD( "tourv_volfd.bin", 0x00000, 0x100000, CRC(6349113d) SHA1(b413342122409ea4ed981bd5077285cdcf337890) )
TOURVISION_BIOS
ROM_END
diff --git a/src/mame/includes/mcr3.h b/src/mame/includes/mcr3.h
index dbfcb3529e9..18e2b688d09 100644
--- a/src/mame/includes/mcr3.h
+++ b/src/mame/includes/mcr3.h
@@ -33,7 +33,6 @@ public:
tilemap_t *m_bg_tilemap;
tilemap_t *m_alpha_tilemap;
- DECLARE_WRITE8_MEMBER(spyhuntpr_paletteram_w);
DECLARE_WRITE8_MEMBER(mcr3_videoram_w);
DECLARE_WRITE8_MEMBER(spyhunt_videoram_w);
DECLARE_WRITE8_MEMBER(spyhunt_alpharam_w);
@@ -67,7 +66,6 @@ public:
DECLARE_DRIVER_INIT(maxrpm);
DECLARE_DRIVER_INIT(rampage);
DECLARE_DRIVER_INIT(spyhunt);
- DECLARE_DRIVER_INIT(spyhuntpr);
DECLARE_DRIVER_INIT(sarge);
TILE_GET_INFO_MEMBER(mcrmono_get_bg_tile_info);
TILEMAP_MAPPER_MEMBER(spyhunt_bg_scan);
@@ -75,14 +73,10 @@ public:
TILE_GET_INFO_MEMBER(spyhunt_get_alpha_tile_info);
DECLARE_VIDEO_START(mcrmono);
DECLARE_VIDEO_START(spyhunt);
- DECLARE_VIDEO_START(spyhuntpr);
DECLARE_PALETTE_INIT(spyhunt);
UINT32 screen_update_mcr3(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
UINT32 screen_update_spyhunt(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
- UINT32 screen_update_spyhuntpr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
void mcr3_update_sprites(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect, int color_mask, int code_xor, int dx, int dy, int interlaced);
void mcr_common_init();
- DECLARE_WRITE8_MEMBER(spyhuntpr_port04_w);
- DECLARE_WRITE8_MEMBER(spyhuntpr_fd00_w);
};
diff --git a/src/mame/includes/xbox.h b/src/mame/includes/xbox.h
index 5022fda6b7b..0dd37a23405 100644
--- a/src/mame/includes/xbox.h
+++ b/src/mame/includes/xbox.h
@@ -261,7 +261,7 @@ class ohci_function_device {
public:
ohci_function_device(running_machine &machine);
void execute_reset();
- int execute_transfer(int address, int endpoint, int pid, UINT8 *buffer, int size) ;
+ int execute_transfer(int address, int endpoint, int pid, UINT8 *buffer, int size);
protected:
virtual int handle_nonstandard_request(int endpoint, USBSetupPacket *setup) { return -1; };
virtual int handle_get_status_request(int endpoint, USBSetupPacket *setup) { return 0; };
@@ -269,6 +269,8 @@ protected:
virtual int handle_set_feature_request(int endpoint, USBSetupPacket *setup) { return 0; };
virtual int handle_set_descriptor_request(int endpoint, USBSetupPacket *setup) { return 0; };
virtual int handle_synch_frame_request(int endpoint, USBSetupPacket *setup) { return 0; };
+ virtual void handle_status_stage(int endpoint) { return; };
+ virtual int handle_bulk_pid(int endpoint, int pid, UINT8 *buffer, int size) { return 0; };
void add_device_descriptor(const USBStandardDeviceDescriptor &descriptor);
void add_configuration_descriptor(const USBStandardConfigurationDescriptor &descriptor);
@@ -297,6 +299,7 @@ protected:
int configurationvalue;
UINT8 *descriptors;
int descriptors_pos;
+ bool wantstatuscallback;
USBStandardDeviceDescriptor device_descriptor;
std::forward_list<usb_device_configuration *> configurations;
std::forward_list<usb_device_string *> device_strings;
@@ -323,6 +326,8 @@ class ohci_hlean2131qc_device: public ohci_function_device
public:
ohci_hlean2131qc_device(running_machine &machine);
int handle_nonstandard_request(int endpoint, USBSetupPacket *setup) override;
+ int handle_bulk_pid(int endpoint, int pid, UINT8 *buffer, int size) override;
+ void set_region_base(UINT8 *data);
private:
static const USBStandardDeviceDescriptor devdesc;
static const USBStandardConfigurationDescriptor condesc;
@@ -340,6 +345,8 @@ private:
static const UINT8 strdesc0[];
static const UINT8 strdesc1[];
static const UINT8 strdesc2[];
+ int maximum_send;
+ UINT8 *region;
};
class ohci_hlean2131sc_device : public ohci_function_device
diff --git a/src/mame/machine/xbox.cpp b/src/mame/machine/xbox.cpp
index 8924adf9cbf..295347c1d06 100644
--- a/src/mame/machine/xbox.cpp
+++ b/src/mame/machine/xbox.cpp
@@ -984,6 +984,7 @@ ohci_function_device::ohci_function_device(running_machine &machine)
endpoints[e].position = nullptr;
}
endpoints[0].type = ControlEndpoint;
+ wantstatuscallback = false;
settingaddress = false;
configurationvalue = 0;
selected_configuration = nullptr;
@@ -1253,13 +1254,22 @@ int ohci_function_device::execute_transfer(int address, int endpoint, int pid, U
if (pid == SetupPid) {
USBSetupPacket *p=(USBSetupPacket *)buffer;
+ // control transfers are done in 3 stages: first the setup stage, then an optional data stage, then a status stage
+ // so there are 3 cases:
+ // 1- control transfer with a data stage where the host sends data to the device
+ // in this case the sequence of pids transferred is control pid, data out pid, data in pid
+ // 2- control transfer with a data stage where the host receives data from the device
+ // in this case the sequence of pids transferred is control pid, data in pid, data out pid
+ // 3- control transfer without a data stage
+ // in this case the sequence of pids transferred is control pid, data in pid
// define direction 0:host->device 1:device->host
- // case == 1, IN data stage and OUT status stage
- // case == 0, OUT data stage and IN status stage
- // data stage is optional, IN status stage
+ // direction == 1 -> IN data stage and OUT status stage
+ // direction == 0 -> OUT data stage and IN status stage
+ // data stage not present -> IN status stage
endpoints[endpoint].controldirection = (p->bmRequestType & 128) >> 7;
endpoints[endpoint].controltype = (p->bmRequestType & 0x60) >> 5;
endpoints[endpoint].controlrecipient = p->bmRequestType & 0x1f;
+ wantstatuscallback = false;
if (endpoint == 0) {
endpoints[endpoint].position = nullptr;
// number of byte to transfer in data stage (0 no data stage)
@@ -1341,23 +1351,26 @@ int ohci_function_device::execute_transfer(int address, int endpoint, int pid, U
return handle_nonstandard_request(endpoint, p);
}
else if (pid == InPid) {
- if (endpoint == 0) {
+ if (endpoints[endpoint].type == ControlEndpoint) { //if (endpoint == 0) {
// if no data has been transferred (except for the setup stage)
// and the lenght of this IN transaction is 0
// assume this is the status stage
- if ((size == 0) && (endpoints[endpoint].remain == 0)) {
- if (settingaddress == true)
+ if ((endpoints[endpoint].remain == 0) && (size == 0)) {
+ if ((endpoint == 0) && (settingaddress == true))
{
// set of address is active at end of status stage
address = newaddress;
settingaddress = false;
state = AddressState;
}
+ if (wantstatuscallback == true)
+ handle_status_stage(endpoint);
+ wantstatuscallback = false;
return 0;
}
// case ==1, give data
// case ==0, nothing
- // if device->host
+ // if device->host, since InPid then this is data stage
if (endpoints[endpoint].controldirection == DeviceToHost) {
// data stage
if (size > endpoints[endpoint].remain)
@@ -1367,15 +1380,22 @@ int ohci_function_device::execute_transfer(int address, int endpoint, int pid, U
endpoints[endpoint].position = endpoints[endpoint].position + size;
endpoints[endpoint].remain = endpoints[endpoint].remain - size;
}
+ else {
+ if (wantstatuscallback == true)
+ handle_status_stage(endpoint);
+ wantstatuscallback = false;
+ }
}
+ else if (endpoints[endpoint].type == BulkEndpoint)
+ return handle_bulk_pid(endpoint, pid, buffer, size);
else
return -1;
}
else if (pid == OutPid) {
- if (endpoint == 0) {
+ if (endpoints[endpoint].type == ControlEndpoint) { //if (endpoint == 0) {
// case ==1, nothing
// case ==0, give data
- // if host->device
+ // if host->device, since OutPid then this is data stage
if (endpoints[endpoint].controldirection == HostToDevice) {
// data stage
if (size > endpoints[endpoint].remain)
@@ -1385,7 +1405,14 @@ int ohci_function_device::execute_transfer(int address, int endpoint, int pid, U
endpoints[endpoint].position = endpoints[endpoint].position + size;
endpoints[endpoint].remain = endpoints[endpoint].remain - size;
}
+ else {
+ if (wantstatuscallback == true)
+ handle_status_stage(endpoint);
+ wantstatuscallback = false;
+ }
}
+ else if (endpoints[endpoint].type == BulkEndpoint)
+ return handle_bulk_pid(endpoint, pid, buffer, size);
else
return -1;
}
@@ -1454,25 +1481,43 @@ ohci_hlean2131qc_device::ohci_hlean2131qc_device(running_machine &machine) :
add_device_descriptor(devdesc);
add_configuration_descriptor(condesc);
add_interface_descriptor(intdesc);
- add_endpoint_descriptor(enddesc81);
- add_endpoint_descriptor(enddesc82);
- add_endpoint_descriptor(enddesc83);
- add_endpoint_descriptor(enddesc84);
- add_endpoint_descriptor(enddesc85);
+ // it is important to add the endpoints in the same order they are found in the device firmware
add_endpoint_descriptor(enddesc01);
add_endpoint_descriptor(enddesc02);
add_endpoint_descriptor(enddesc03);
add_endpoint_descriptor(enddesc04);
add_endpoint_descriptor(enddesc05);
+ add_endpoint_descriptor(enddesc81);
+ add_endpoint_descriptor(enddesc82);
+ add_endpoint_descriptor(enddesc83);
+ add_endpoint_descriptor(enddesc84);
+ add_endpoint_descriptor(enddesc85);
add_string_descriptor(strdesc0);
add_string_descriptor(strdesc1);
add_string_descriptor(strdesc2);
+ maximum_send = 0;
+ region = nullptr;
+}
+
+void ohci_hlean2131qc_device::set_region_base(UINT8 *data)
+{
+ region = data;
}
int ohci_hlean2131qc_device::handle_nonstandard_request(int endpoint, USBSetupPacket *setup)
{
if (endpoint != 0)
return -1;
+ printf("Control request: %x %x %x %x %x %x %x\n\r", endpoint, endpoints[endpoint].controldirection, setup->bmRequestType, setup->bRequest, setup->wValue, setup->wIndex, setup->wLength);
+ //if ((setup->bRequest == 0x18) && (setup->wValue == 0x8000))
+ if (setup->bRequest == 0x17)
+ {
+ maximum_send = setup->wIndex;
+ if (maximum_send > 0x40)
+ maximum_send = 0x40;
+ endpoints[2].remain = maximum_send;
+ endpoints[2].position = region + 0x2000 + setup->wValue;
+ }
for (int n = 0; n < setup->wLength; n++)
endpoints[endpoint].buffer[n] = 0xa0 ^ n;
endpoints[endpoint].buffer[0] = 0;
@@ -1481,6 +1526,20 @@ int ohci_hlean2131qc_device::handle_nonstandard_request(int endpoint, USBSetupPa
return 0;
}
+int ohci_hlean2131qc_device::handle_bulk_pid(int endpoint, int pid, UINT8 *buffer, int size)
+{
+ printf("Bulk request: %x %d %x\n\r", endpoint, pid, size);
+ if ((endpoint == 2) && (pid == InPid))
+ {
+ if (size > endpoints[2].remain)
+ size = endpoints[2].remain;
+ memcpy(buffer, endpoints[2].position, size);
+ endpoints[2].position = endpoints[3].position + size;
+ endpoints[2].remain = endpoints[3].remain - size;
+ }
+ return size;
+}
+
//pc20
const USBStandardDeviceDescriptor ohci_hlean2131sc_device::devdesc = { 0x12,0x01,0x0100,0x60,0x01,0x00,0x40,0x0CA3,0x0003,0x0110,0x01,0x02,0x00,0x01 };
const USBStandardConfigurationDescriptor ohci_hlean2131sc_device::condesc = { 0x09,0x02,0x003C,0x01,0x01,0x00,0x80,0x96 };
@@ -1501,12 +1560,13 @@ ohci_hlean2131sc_device::ohci_hlean2131sc_device(running_machine &machine) :
add_device_descriptor(devdesc);
add_configuration_descriptor(condesc);
add_interface_descriptor(intdesc);
- add_endpoint_descriptor(enddesc81);
- add_endpoint_descriptor(enddesc82);
- add_endpoint_descriptor(enddesc83);
+ // it is important to add the endpoints in the same order they are found in the device firmware
add_endpoint_descriptor(enddesc01);
add_endpoint_descriptor(enddesc02);
add_endpoint_descriptor(enddesc03);
+ add_endpoint_descriptor(enddesc81);
+ add_endpoint_descriptor(enddesc82);
+ add_endpoint_descriptor(enddesc83);
add_string_descriptor(strdesc0);
add_string_descriptor(strdesc1);
add_string_descriptor(strdesc2);
@@ -2221,6 +2281,7 @@ void xbox_base_state::machine_start()
ohcist.timer->enable(false);
//usb_device = new ohci_game_controller_device(machine());
usb_device = new ohci_hlean2131qc_device(machine());
+ usb_device->set_region_base(memregion(":others")->base()); // temporary, should be in chihiro
//usb_device = new ohci_hlean2131sc_device(machine());
usb_ohci_plug(1, usb_device); // test connect
#endif
diff --git a/src/mame/mame.lst b/src/mame/mame.lst
index 2c65ae0d192..b689e94997f 100644
--- a/src/mame/mame.lst
+++ b/src/mame/mame.lst
@@ -9935,8 +9935,8 @@ crgolfc // (c) 1984 Nasco Japan
crgolfhi // (c) 1984 Nasco Japan
@source:crimfght.cpp
-crimfght // GX821 (c) 1989 (US)
-crimfght2 // GX821 (c) 1989 (World)
+crimfght // GX821 (c) 1989 (World)
+crimfghtu // GX821 (c) 1989 (US)
crimfghtj // GX821 (c) 1989 (Japan)
@source:crospang.cpp
@@ -16757,6 +16757,9 @@ spelunkrj // (c) 1985 licensed from Broderbund
yanchamr // (c) 1986 (Japan)
youjyudn // (c) 1986 (Japan)
+@source:spartanxtec.cpp
+spartanxtec
+
@source:m63.cpp
atomboy // M63 (c) 1985 Irem + Memetron license
atomboya // M63 (c) 1985 Irem + Memetron license
@@ -34978,6 +34981,7 @@ tokia // (c) 1989 Tad (World)
tokib // bootleg
tokiu // (c) 1989 Tad + Fabtek license (US)
tokiua // (c) 1989 Tad + Fabtek license (US)
+tokip
@source:tokyocop.cpp
tokyocop // (c) 2003 (Arcade TV Game List - P.168, Right, 19 from bottom)
diff --git a/src/mame/video/mcr3.cpp b/src/mame/video/mcr3.cpp
index 9385307c12f..ecd8b72a49a 100644
--- a/src/mame/video/mcr3.cpp
+++ b/src/mame/video/mcr3.cpp
@@ -125,40 +125,8 @@ VIDEO_START_MEMBER(mcr3_state,spyhunt)
save_item(NAME(m_spyhunt_scroll_offset));
}
-VIDEO_START_MEMBER(mcr3_state,spyhuntpr)
-{
- /* initialize the background tilemap */
- m_bg_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(mcr3_state::spyhunt_get_bg_tile_info),this), tilemap_mapper_delegate(FUNC(mcr3_state::spyhunt_bg_scan),this), 64,16, 64,32);
- /* initialize the text tilemap */
- m_alpha_tilemap = &machine().tilemap().create(m_gfxdecode, tilemap_get_info_delegate(FUNC(mcr3_state::spyhunt_get_alpha_tile_info),this), TILEMAP_SCAN_COLS, 16,8, 32,32);
- m_alpha_tilemap->set_transparent_pen(0);
- m_alpha_tilemap->set_scrollx(0, 16);
- save_item(NAME(m_spyhunt_sprite_color_mask));
- save_item(NAME(m_spyhunt_scrollx));
- save_item(NAME(m_spyhunt_scrolly));
- save_item(NAME(m_spyhunt_scroll_offset));
-}
-
-
-/*************************************
- *
- * Palette RAM writes
- *
- *************************************/
-
-WRITE8_MEMBER(mcr3_state::spyhuntpr_paletteram_w)
-{
- m_paletteram[offset] = data;
- offset = (offset & 0x0f) | (offset & 0x60) >> 1;
-
- int r = (data & 0x07) >> 0;
- int g = (data & 0x38) >> 3;
- int b = (data & 0xc0) >> 6;
-
- m_palette->set_pen_color(offset^0xf, rgb_t(r<<5,g<<5,b<<6));
-}
/*************************************
@@ -326,19 +294,3 @@ UINT32 mcr3_state::screen_update_spyhunt(screen_device &screen, bitmap_ind16 &bi
return 0;
}
-
-UINT32 mcr3_state::screen_update_spyhuntpr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
-{
- /* for every character in the Video RAM, check if it has been modified */
- /* since last time and update it accordingly. */
- m_bg_tilemap->set_scrollx(0, m_spyhunt_scrollx * 2 + m_spyhunt_scroll_offset);
- m_bg_tilemap->set_scrolly(0, m_spyhunt_scrolly * 2);
- m_bg_tilemap->draw(screen, bitmap, cliprect, 0, 0);
-
- /* draw the sprites */
- mcr3_update_sprites(screen, bitmap, cliprect, m_spyhunt_sprite_color_mask, 0, -12, 0, 0);
-
- /* render any characters on top */
- m_alpha_tilemap->draw(screen, bitmap, cliprect, 0, 0);
- return 0;
-}
diff --git a/src/osd/modules/file/posixfile.cpp b/src/osd/modules/file/posixfile.cpp
index a5e3fe6a54e..513a3cbfd70 100644
--- a/src/osd/modules/file/posixfile.cpp
+++ b/src/osd/modules/file/posixfile.cpp
@@ -88,7 +88,7 @@ public:
{
ssize_t result;
-#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__DragonFly__) || defined(EMSCRIPTEN)
+#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__DragonFly__) || defined(EMSCRIPTEN) || defined(__ANDROID__)
result = ::pread(m_fd, buffer, size_t(count), off_t(std::make_unsigned_t<off_t>(offset)));
#elif defined(WIN32) || defined(SDLMAME_NO64BITIO)
if (lseek(m_fd, off_t(std::make_unsigned_t<off_t>(offset)), SEEK_SET) < 0)
@@ -109,7 +109,7 @@ public:
{
ssize_t result;
-#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__DragonFly__) || defined(EMSCRIPTEN)
+#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__DragonFly__) || defined(EMSCRIPTEN) || defined(__ANDROID__)
result = ::pwrite(m_fd, buffer, size_t(count), off_t(std::make_unsigned_t<off_t>(offset)));
#elif defined(WIN32) || defined(SDLMAME_NO64BITIO)
if (lseek(m_fd, off_t(std::make_unsigned_t<off_t>(offset)), SEEK_SET) < 0)
@@ -130,7 +130,7 @@ public:
{
int result;
-#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__DragonFly__) || defined(EMSCRIPTEN) || defined(WIN32) || defined(SDLMAME_NO64BITIO)
+#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__DragonFly__) || defined(EMSCRIPTEN) || defined(WIN32) || defined(SDLMAME_NO64BITIO) || defined(__ANDROID__)
result = ::ftruncate(m_fd, off_t(std::make_unsigned_t<off_t>(offset)));
#else
result = ::ftruncate64(m_fd, off64_t(offset));
@@ -236,7 +236,7 @@ osd_file::error osd_file::open(std::string const &path, std::uint32_t openflags,
// attempt to open the file
int fd = -1;
-#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__DragonFly__) || defined(__HAIKU__) || defined(WIN32) || defined(SDLMAME_NO64BITIO)
+#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__DragonFly__) || defined(__HAIKU__) || defined(WIN32) || defined(SDLMAME_NO64BITIO) || defined(__ANDROID__)
fd = ::open(dst.c_str(), access, 0666);
#else
fd = ::open64(dst.c_str(), access, 0666);
@@ -256,7 +256,7 @@ osd_file::error osd_file::open(std::string const &path, std::uint32_t openflags,
// attempt to reopen the file
if (error == osd_file::error::NONE)
{
-#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__DragonFly__) || defined(__HAIKU__) || defined(WIN32) || defined(SDLMAME_NO64BITIO)
+#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__DragonFly__) || defined(__HAIKU__) || defined(WIN32) || defined(SDLMAME_NO64BITIO) || defined(__ANDROID__)
fd = ::open(dst.c_str(), access, 0666);
#else
fd = ::open64(dst.c_str(), access, 0666);
@@ -273,7 +273,7 @@ osd_file::error osd_file::open(std::string const &path, std::uint32_t openflags,
}
// get the file size
-#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__DragonFly__) || defined(__HAIKU__) || defined(WIN32) || defined(SDLMAME_NO64BITIO)
+#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__DragonFly__) || defined(__HAIKU__) || defined(WIN32) || defined(SDLMAME_NO64BITIO) || defined(__ANDROID__)
struct stat st;
if (::fstat(fd, &st) < 0)
#else
@@ -340,7 +340,7 @@ int osd_get_physical_drive_geometry(const char *filename, UINT32 *cylinders, UIN
osd_directory_entry *osd_stat(const std::string &path)
{
-#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__DragonFly__) || defined(__HAIKU__) || defined(WIN32) || defined(SDLMAME_NO64BITIO)
+#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__DragonFly__) || defined(__HAIKU__) || defined(WIN32) || defined(SDLMAME_NO64BITIO) || defined(__ANDROID__)
struct stat st;
int const err = ::stat(path.c_str(), &st);
#else
diff --git a/src/osd/modules/file/posixptty.cpp b/src/osd/modules/file/posixptty.cpp
index b84838c0578..f7842574312 100644
--- a/src/osd/modules/file/posixptty.cpp
+++ b/src/osd/modules/file/posixptty.cpp
@@ -22,7 +22,7 @@
#if defined(__FreeBSD__) || defined(__DragonFly__)
#include <termios.h>
#include <libutil.h>
-#elif defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__)
+#elif defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__) || defined(__ANDROID__)
#include <termios.h>
#include <util.h>
#elif defined(__linux__) || defined(EMSCRIPTEN)
@@ -141,7 +141,10 @@ osd_file::error posix_open_ptty(std::uint32_t openflags, osd_file::ptr &file, st
::close(masterfd);
return errno_to_file_error(err);
}
-#else
+#elif defined(__ANDROID__)
+ int masterfd = -1, slavefd = -1;
+ char slavepath[PATH_MAX];
+#else
struct termios tios;
std::memset(&tios, 0, sizeof(tios));
::cfmakeraw(&tios);
diff --git a/src/osd/modules/font/font_sdl.cpp b/src/osd/modules/font/font_sdl.cpp
index c6f45635623..c5a73b0a541 100644
--- a/src/osd/modules/font/font_sdl.cpp
+++ b/src/osd/modules/font/font_sdl.cpp
@@ -8,7 +8,7 @@
#include "font_module.h"
#include "modules/osdmodule.h"
-#if defined(SDLMAME_UNIX) && !defined(SDLMAME_MACOSX) && !defined(SDLMAME_SOLARIS) && !defined(SDLMAME_HAIKU)
+#if defined(SDLMAME_UNIX) && !defined(SDLMAME_MACOSX) && !defined(SDLMAME_SOLARIS) && !defined(SDLMAME_HAIKU) && !defined(SDLMAME_ANDROID)
#include "corestr.h"
#include "corealloc.h"
diff --git a/src/osd/modules/render/bgfx/chainentry.cpp b/src/osd/modules/render/bgfx/chainentry.cpp
index ff56559e430..f3bbbb42378 100644
--- a/src/osd/modules/render/bgfx/chainentry.cpp
+++ b/src/osd/modules/render/bgfx/chainentry.cpp
@@ -179,7 +179,7 @@ bool bgfx_chain_entry::setup_view(int view, uint16_t screen_width, uint16_t scre
bx::mtxOrtho(projMat, 0.0f, 1.0f, 1.0f, 0.0f, 0.0f, 100.0f);
bgfx::setViewTransform(view, nullptr, projMat);
- bgfx::setViewClear(view, BGFX_CLEAR_COLOR | BGFX_CLEAR_DEPTH, 0x00ff00ff, 1.0f, 0);
+ bgfx::setViewClear(view, BGFX_CLEAR_COLOR | BGFX_CLEAR_DEPTH, 0x00000000, 1.0f, 0);
return true;
}
diff --git a/src/osd/modules/render/drawbgfx.cpp b/src/osd/modules/render/drawbgfx.cpp
index 3ef04cbf5cf..d955f8c76f2 100644
--- a/src/osd/modules/render/drawbgfx.cpp
+++ b/src/osd/modules/render/drawbgfx.cpp
@@ -5,10 +5,6 @@
// drawbgfx.cpp - BGFX renderer
//
//============================================================
-#define __STDC_LIMIT_MACROS
-#define __STDC_FORMAT_MACROS
-#define __STDC_CONSTANT_MACROS
-
#if defined(SDLMAME_WIN32) || defined(OSD_WINDOWS)
// standard windows headers
#define WIN32_LEAN_AND_MEAN
@@ -65,6 +61,7 @@ const char* renderer_bgfx::WINDOW_PREFIX = "Window 0, ";
//============================================================
#define GIBBERISH (0)
+#define SCENE_VIEW (0)
//============================================================
// STATICS
@@ -95,7 +92,7 @@ static void* sdlNativeWindowHandle(SDL_Window* _window)
return wmi.info.win.window;
# elif BX_PLATFORM_STEAMLINK
return wmi.info.vivante.window;
-# elif BX_PLATFORM_EMSCRIPTEN
+# elif BX_PLATFORM_EMSCRIPTEN || BX_PLATFORM_ANDROID
return nullptr;
# endif // BX_PLATFORM_
}
@@ -304,8 +301,13 @@ void renderer_bgfx::put_packed_quad(render_primitive *prim, UINT32 hash, ScreenV
v0 += 0.5f / float(CACHE_SIZE);
UINT32 rgba = u32Color(prim->color.r * 255, prim->color.g * 255, prim->color.b * 255, prim->color.a * 255);
- float x[4] = { prim->bounds.x0, prim->bounds.x1, prim->bounds.x0, prim->bounds.x1 };
- float y[4] = { prim->bounds.y0, prim->bounds.y0, prim->bounds.y1, prim->bounds.y1 };
+ const float x0 = prim->bounds.x0;
+ const float x1 = prim->bounds.x1;
+ const float y0 = prim->bounds.y0;
+ const float y1 = prim->bounds.y1;
+
+ float x[4] = { x0, x1, x0, x1 };
+ float y[4] = { y0, y0, y1, y1 };
float u[4] = { u0, u1, u0, u1 };
float v[4] = { v0, v0, v1, v1 };
@@ -410,28 +412,6 @@ void renderer_bgfx::render_post_screen_quad(int view, render_primitive* prim, bg
float u[4] = { prim->texcoords.tl.u, prim->texcoords.tr.u, prim->texcoords.bl.u, prim->texcoords.br.u };
float v[4] = { prim->texcoords.tl.v, prim->texcoords.tr.v, prim->texcoords.bl.v, prim->texcoords.br.v };
- if (false)//PRIMFLAG_GET_TEXORIENT(prim->flags) & ORIENTATION_SWAP_XY)
- {
- std::swap(u[1], u[2]);
- std::swap(v[1], v[2]);
- }
-
- if (false)//PRIMFLAG_GET_TEXORIENT(prim->flags) & ORIENTATION_FLIP_X)
- {
- std::swap(u[0], u[1]);
- std::swap(v[0], v[1]);
- std::swap(u[2], u[3]);
- std::swap(v[2], v[3]);
- }
-
- if (false)//PRIMFLAG_GET_TEXORIENT(prim->flags) & ORIENTATION_FLIP_Y)
- {
- std::swap(u[0], u[2]);
- std::swap(v[0], v[2]);
- std::swap(u[1], u[3]);
- std::swap(v[1], v[3]);
- }
-
vertex[0].m_x = x[0];
vertex[0].m_y = y[0];
vertex[0].m_z = 0;
@@ -480,7 +460,7 @@ void renderer_bgfx::render_post_screen_quad(int view, render_primitive* prim, bg
m_screen_effect[blend]->submit(view);
}
-void renderer_bgfx::render_textured_quad(int view, render_primitive* prim, bgfx::TransientVertexBuffer* buffer)
+void renderer_bgfx::render_textured_quad(render_primitive* prim, bgfx::TransientVertexBuffer* buffer)
{
ScreenVertex* vertex = reinterpret_cast<ScreenVertex*>(buffer->data);
@@ -547,7 +527,7 @@ void renderer_bgfx::render_textured_quad(int view, render_primitive* prim, bgfx:
UINT32 blend = PRIMFLAG_GET_BLENDMODE(prim->flags);
bgfx::setVertexBuffer(buffer);
bgfx::setTexture(0, effects[blend]->uniform("s_tex")->handle(), texture);
- effects[blend]->submit(view);
+ effects[blend]->submit(m_ui_view);
bgfx::destroyTexture(texture);
}
@@ -847,63 +827,29 @@ int renderer_bgfx::draw(int update)
s_current_view = 0;
}
- handle_screen_chains();
- int view_index = s_current_view;
+ m_ui_view = -1;
// Set view 0 default viewport.
osd_dim wdim = window().get_size();
m_width[window_index] = wdim.width();
m_height[window_index] = wdim.height();
- if (window_index == 0)
+ handle_screen_chains();
+
+ bool skip_frame = update_dimensions();
+ if (skip_frame)
{
- if ((m_dimensions != osd_dim(m_width[window_index], m_height[window_index])))
- {
- bgfx::reset(m_width[window_index], m_height[window_index], video_config.waitvsync ? BGFX_RESET_VSYNC : BGFX_RESET_NONE);
- m_dimensions = osd_dim(m_width[window_index], m_height[window_index]);
- }
+ return 0;
}
- else
- {
- if ((m_dimensions != osd_dim(m_width[window_index], m_height[window_index])))
- {
- bgfx::reset(window().m_main->get_size().width(), window().m_main->get_size().height(), video_config.waitvsync ? BGFX_RESET_VSYNC : BGFX_RESET_NONE);
- delete m_framebuffer;
-#ifdef OSD_WINDOWS
- m_framebuffer = m_targets->create_backbuffer(window().m_hwnd, m_width[window_index], m_height[window_index]);
-#else
- m_framebuffer = m_targets->create_backbuffer(sdlNativeWindowHandle(window().sdl_window()), m_width[window_index], m_height[window_index]);
-#endif
- bgfx::setViewFrameBuffer(view_index, m_framebuffer->target());
- m_dimensions = osd_dim(m_width[window_index], m_height[window_index]);
- bgfx::setViewClear(view_index
- , BGFX_CLEAR_COLOR | BGFX_CLEAR_DEPTH
- , 0x00ff00ff
- , 1.0f
- , 0
- );
- bgfx::touch(view_index);
- bgfx::frame();
- return 0;
- }
- bgfx::setViewFrameBuffer(view_index, m_framebuffer->target());
+ if (s_current_view > m_max_view)
+ {
+ m_max_view = s_current_view;
+ }
+ else
+ {
+ s_current_view = m_max_view;
}
-
- bgfx::setViewSeq(view_index, true);
- bgfx::setViewRect(view_index, 0, 0, m_width[window_index], m_height[window_index]);
-
- // Setup view transform.
- float proj[16];
- bx::mtxOrtho(proj, 0.0f, m_width[window_index], m_height[window_index], 0.0f, 0.0f, 100.0f);
- bgfx::setViewTransform(view_index, nullptr, proj);
-
- bgfx::setViewClear(view_index
- , BGFX_CLEAR_COLOR | BGFX_CLEAR_DEPTH
- , 0x000000ff
- , 1.0f
- , 0
- );
window().m_primlist->acquire_lock();
@@ -919,7 +865,7 @@ int renderer_bgfx::draw(int update)
bgfx::TransientVertexBuffer buffer;
allocate_buffer(prim, blend, &buffer);
- int32_t screen = 0;
+ int32_t screen = -1;
if (PRIMFLAG_GET_SCREENTEX(prim->flags))
{
for (screen = 0; screen < screens.size(); screen++)
@@ -935,13 +881,13 @@ int renderer_bgfx::draw(int update)
}
}
- buffer_status status = buffer_primitives(view_index, atlas_valid, &prim, &buffer, screen);
+ buffer_status status = buffer_primitives(atlas_valid, &prim, &buffer, screen);
if (status != BUFFER_EMPTY && status != BUFFER_SCREEN)
{
bgfx::setVertexBuffer(&buffer);
bgfx::setTexture(0, m_gui_effect[blend]->uniform("s_tex")->handle(), m_texture_cache->texture());
- m_gui_effect[blend]->submit(view_index);
+ m_gui_effect[blend]->submit(m_ui_view);
}
if (status != BUFFER_DONE && status != BUFFER_PRE_FLUSH)
@@ -954,7 +900,7 @@ int renderer_bgfx::draw(int update)
// This dummy draw call is here to make sure that view 0 is cleared
// if no other draw calls are submitted to view 0.
- bgfx::touch(view_index);
+ bgfx::touch(s_current_view > 0 ? s_current_view - 1 : 0);
// Advance to next frame. Rendering thread will be kicked to
// process submitted rendering primitives.
@@ -963,12 +909,113 @@ int renderer_bgfx::draw(int update)
bgfx::frame();
}
- s_current_view++;
-
return 0;
}
-renderer_bgfx::buffer_status renderer_bgfx::buffer_primitives(int view, bool atlas_valid, render_primitive** prim, bgfx::TransientVertexBuffer* buffer, int32_t screen)
+bool renderer_bgfx::update_dimensions()
+{
+ const uint32_t window_index = window().m_index;
+ const uint32_t width = m_width[window_index];
+ const uint32_t height = m_height[window_index];
+
+ if (window_index == 0)
+ {
+ if ((m_dimensions != osd_dim(width, height)))
+ {
+ bgfx::reset(width, height, video_config.waitvsync ? BGFX_RESET_VSYNC : BGFX_RESET_NONE);
+ m_dimensions = osd_dim(width, height);
+ }
+ }
+ else
+ {
+ if ((m_dimensions != osd_dim(width, height)))
+ {
+ bgfx::reset(window().m_main->get_size().width(), window().m_main->get_size().height(), video_config.waitvsync ? BGFX_RESET_VSYNC : BGFX_RESET_NONE);
+ m_dimensions = osd_dim(width, height);
+
+ delete m_framebuffer;
+#ifdef OSD_WINDOWS
+ m_framebuffer = m_targets->create_backbuffer(window().m_hwnd, width, height);
+#else
+ m_framebuffer = m_targets->create_backbuffer(sdlNativeWindowHandle(window().sdl_window()), width, height);
+#endif
+
+ bgfx::setViewFrameBuffer(s_current_view, m_framebuffer->target());
+ bgfx::setViewClear(s_current_view, BGFX_CLEAR_COLOR | BGFX_CLEAR_DEPTH, 0x000000ff, 1.0f, 0);
+ bgfx::touch(s_current_view);
+ bgfx::frame();
+ return true;
+ }
+ }
+ return false;
+}
+
+void renderer_bgfx::setup_view(uint32_t view_index, bool screen)
+{
+ const uint32_t window_index = window().m_index;
+ const uint32_t width = m_width[window_index];
+ const uint32_t height = m_height[window_index];
+
+ if (window_index != 0)
+ {
+ bgfx::setViewFrameBuffer(view_index, m_framebuffer->target());
+ }
+
+ bgfx::setViewSeq(view_index, true);
+ bgfx::setViewRect(view_index, 0, 0, width, height);
+
+#if SCENE_VIEW
+ if (view_index == m_max_view)
+#endif
+ {
+ bgfx::setViewClear(view_index, BGFX_CLEAR_COLOR | BGFX_CLEAR_DEPTH, 0x00000000, 1.0f, 0);
+ }
+
+ setup_matrices(view_index, screen);
+}
+
+void renderer_bgfx::setup_matrices(uint32_t view_index, bool screen)
+{
+ const uint32_t window_index = window().m_index;
+ const uint32_t width = m_width[window_index];
+ const uint32_t height = m_height[window_index];
+
+ float proj[16];
+ float view[16];
+ if (screen)
+ {
+ static float offset = 0.0f;
+ offset += 0.5f;
+ float up[3] = { 0.0f, -1.0f, 0.0f };
+ float cam_z = width * 0.5f * (float(height) / float(width));
+ cam_z *= 1.05f;
+ float eye_height = height * 0.5f * 1.05f;
+ float at[3] = { width * 0.5f, height * 0.5f, 0.0f };
+ float eye[3] = { width * 0.5f, eye_height, cam_z };
+ bx::mtxLookAt(view, eye, at, up);
+
+ bx::mtxProj(proj, 90.0f, float(width) / float(height), 0.1f, 5000.0f);
+ }
+ else
+ {
+ bx::mtxIdentity(view);
+ bx::mtxOrtho(proj, 0.0f, width, height, 0.0f, 0.0f, 100.0f);
+ }
+
+ bgfx::setViewTransform(view_index, view, proj);
+}
+
+void renderer_bgfx::init_ui_view()
+{
+ if (m_ui_view < 0)
+ {
+ m_ui_view = s_current_view;
+ setup_view(m_ui_view, false);
+ s_current_view++;
+ }
+}
+
+renderer_bgfx::buffer_status renderer_bgfx::buffer_primitives(bool atlas_valid, render_primitive** prim, bgfx::TransientVertexBuffer* buffer, int32_t screen)
{
int vertices = 0;
@@ -978,6 +1025,7 @@ renderer_bgfx::buffer_status renderer_bgfx::buffer_primitives(int view, bool atl
switch ((*prim)->type)
{
case render_primitive::LINE:
+ init_ui_view();
put_line((*prim)->bounds.x0, (*prim)->bounds.y0, (*prim)->bounds.x1, (*prim)->bounds.y1, 1.0f, u32Color((*prim)->color.r * 255, (*prim)->color.g * 255, (*prim)->color.b * 255, (*prim)->color.a * 255), (ScreenVertex*)buffer->data + vertices, 1.0f);
vertices += 30;
break;
@@ -985,6 +1033,7 @@ renderer_bgfx::buffer_status renderer_bgfx::buffer_primitives(int view, bool atl
case render_primitive::QUAD:
if ((*prim)->texture.base == nullptr)
{
+ init_ui_view();
put_packed_quad(*prim, WHITE_HASH, (ScreenVertex*)buffer->data + vertices);
vertices += 6;
}
@@ -993,6 +1042,7 @@ renderer_bgfx::buffer_status renderer_bgfx::buffer_primitives(int view, bool atl
const UINT32 hash = get_texture_hash(*prim);
if (atlas_valid && (*prim)->packable(PACKABLE_SIZE) && hash != 0 && m_hash_to_entry[hash].hash())
{
+ init_ui_view();
put_packed_quad(*prim, hash, (ScreenVertex*)buffer->data + vertices);
vertices += 6;
}
@@ -1005,12 +1055,21 @@ renderer_bgfx::buffer_status renderer_bgfx::buffer_primitives(int view, bool atl
if (PRIMFLAG_GET_SCREENTEX((*prim)->flags) && m_screen_chains.size() > window().m_index && screen < m_screen_chains[window().m_index].size())
{
- render_post_screen_quad(view, *prim, buffer, screen);
+#if SCENE_VIEW
+ setup_view(s_current_view, true);
+ render_post_screen_quad(s_current_view, *prim, buffer, screen);
+ s_current_view++;
+ m_ui_view = -1;
+#else
+ init_ui_view();
+ render_post_screen_quad(m_ui_view, *prim, buffer, screen);
+#endif
return BUFFER_SCREEN;
}
else
{
- render_textured_quad(view, *prim, buffer);
+ init_ui_view();
+ render_textured_quad(*prim, buffer);
return BUFFER_EMPTY;
}
}
diff --git a/src/osd/modules/render/drawbgfx.h b/src/osd/modules/render/drawbgfx.h
index 95cd613bb2f..823472f5c4a 100644
--- a/src/osd/modules/render/drawbgfx.h
+++ b/src/osd/modules/render/drawbgfx.h
@@ -30,6 +30,7 @@ public:
renderer_bgfx(osd_window *w)
: osd_renderer(w, FLAG_NONE)
, m_dimensions(0, 0)
+ , m_max_view(0)
{
}
virtual ~renderer_bgfx();
@@ -64,6 +65,11 @@ private:
void parse_screen_chains(std::string chain_str);
bgfx_chain* screen_chain(int32_t screen);
+ bool update_dimensions();
+ void setup_view(uint32_t view_index, bool screen);
+ void init_ui_view();
+ void setup_matrices(uint32_t view_index, bool screen);
+
void allocate_buffer(render_primitive *prim, UINT32 blend, bgfx::TransientVertexBuffer *buffer);
enum buffer_status
{
@@ -73,10 +79,10 @@ private:
BUFFER_EMPTY,
BUFFER_DONE
};
- buffer_status buffer_primitives(int view, bool atlas_valid, render_primitive** prim, bgfx::TransientVertexBuffer* buffer, int32_t screen);
+ buffer_status buffer_primitives(bool atlas_valid, render_primitive** prim, bgfx::TransientVertexBuffer* buffer, int32_t screen);
void process_screen_quad(int view, render_primitive* prim);
- void render_textured_quad(int view, render_primitive* prim, bgfx::TransientVertexBuffer* buffer);
+ void render_textured_quad(render_primitive* prim, bgfx::TransientVertexBuffer* buffer);
void render_post_screen_quad(int view, render_primitive* prim, bgfx::TransientVertexBuffer* buffer, int32_t screen);
void put_packed_quad(render_primitive *prim, UINT32 hash, ScreenVertex* vertex);
@@ -117,6 +123,8 @@ private:
uint32_t m_width[16];
uint32_t m_height[16];
uint32_t m_white[16*16];
+ int32_t m_ui_view;
+ uint32_t m_max_view;
static const uint16_t CACHE_SIZE;
static const uint32_t PACKABLE_SIZE;
diff --git a/src/osd/sdl/sdldir.cpp b/src/osd/sdl/sdldir.cpp
index 439eb0a9792..abf1f126b94 100644
--- a/src/osd/sdl/sdldir.cpp
+++ b/src/osd/sdl/sdldir.cpp
@@ -50,7 +50,7 @@
#define INVPATHSEPCH '\\'
#endif
-#if defined(SDLMAME_DARWIN) || defined(SDLMAME_WIN32) || defined(SDLMAME_NO64BITIO) || defined(SDLMAME_BSD) || defined(SDLMAME_HAIKU) || defined(SDLMAME_EMSCRIPTEN)
+#if defined(SDLMAME_DARWIN) || defined(SDLMAME_WIN32) || defined(SDLMAME_NO64BITIO) || defined(SDLMAME_BSD) || defined(SDLMAME_HAIKU) || defined(SDLMAME_EMSCRIPTEN) || defined(SDLMAME_ANDROID)
typedef struct dirent sdl_dirent;
typedef struct stat sdl_stat;
#define sdl_readdir readdir
diff --git a/src/osd/sdl/sdlmain.cpp b/src/osd/sdl/sdlmain.cpp
index ad71a48aa08..ef4c6b7c927 100644
--- a/src/osd/sdl/sdlmain.cpp
+++ b/src/osd/sdl/sdlmain.cpp
@@ -10,7 +10,7 @@
#ifdef SDLMAME_UNIX
-#if (!defined(SDLMAME_MACOSX)) && (!defined(SDLMAME_EMSCRIPTEN))
+#if (!defined(SDLMAME_MACOSX)) && (!defined(SDLMAME_EMSCRIPTEN)) && (!defined(SDLMAME_ANDROID))
#ifndef SDLMAME_HAIKU
#include <fontconfig/fontconfig.h>
#endif
@@ -202,7 +202,7 @@ int main(int argc, char *argv[])
#ifdef SDLMAME_UNIX
sdl_entered_debugger = 0;
-#if (!defined(SDLMAME_MACOSX)) && (!defined(SDLMAME_HAIKU)) && (!defined(SDLMAME_EMSCRIPTEN))
+#if (!defined(SDLMAME_MACOSX)) && (!defined(SDLMAME_HAIKU)) && (!defined(SDLMAME_EMSCRIPTEN)) && (!defined(SDLMAME_ANDROID))
FcInit();
#endif
#endif
@@ -216,7 +216,7 @@ int main(int argc, char *argv[])
}
#ifdef SDLMAME_UNIX
-#if (!defined(SDLMAME_MACOSX)) && (!defined(SDLMAME_HAIKU)) && (!defined(SDLMAME_EMSCRIPTEN))
+#if (!defined(SDLMAME_MACOSX)) && (!defined(SDLMAME_HAIKU)) && (!defined(SDLMAME_EMSCRIPTEN)) && (!defined(SDLMAME_ANDROID))
if (!sdl_entered_debugger)
{
FcFini();
diff --git a/src/osd/sdl/sdlos_unix.cpp b/src/osd/sdl/sdlos_unix.cpp
index 23080512e91..82e11ebc07c 100644
--- a/src/osd/sdl/sdlos_unix.cpp
+++ b/src/osd/sdl/sdlos_unix.cpp
@@ -23,6 +23,12 @@
// MAME headers
#include "osdcore.h"
+#ifdef SDLMAME_ANDROID
+char *osd_get_clipboard_text(void)
+{
+ return nullptr;
+}
+#else
//============================================================
// osd_get_clipboard_text
//============================================================
@@ -40,3 +46,5 @@ char *osd_get_clipboard_text(void)
}
return result;
}
+
+#endif \ No newline at end of file
diff --git a/src/osd/sdl/sdlprefix.h b/src/osd/sdl/sdlprefix.h
index 2acc6a9d98e..9ba0001ccc5 100644
--- a/src/osd/sdl/sdlprefix.h
+++ b/src/osd/sdl/sdlprefix.h
@@ -70,6 +70,10 @@
struct _IO_FILE {}; //_IO_FILE is an opaque type in the emscripten libc which makes clang cranky
#endif
+#if defined(__ANDROID__)
+#define SDLMAME_ANDROID 1
+#endif
+
// fix for Ubuntu 8.10
#ifdef _FORTIFY_SOURCE
#undef _FORTIFY_SOURCE