aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS2
-rw-r--r--audio/decoders/quicktime.cpp2
-rw-r--r--backends/midi/sndio.cpp152
-rw-r--r--backends/module.mk1
-rw-r--r--base/plugins.cpp3
-rw-r--r--base/version.cpp4
-rw-r--r--common/coroutines.cpp884
-rw-r--r--common/coroutines.h (renamed from engines/tinsel/coroutine.h)207
-rw-r--r--common/module.mk1
-rw-r--r--common/quicktime.cpp6
-rwxr-xr-xconfigure30
-rw-r--r--devtools/create_project/msbuild.cpp4
-rw-r--r--devtools/create_project/visualstudio.cpp4
-rw-r--r--engines/cruise/cruise.cpp3
-rw-r--r--engines/cruise/detection.cpp13
-rw-r--r--engines/cruise/staticres.cpp4
-rw-r--r--engines/cruise/staticres.h1
-rw-r--r--engines/dreamweb/detection_tables.h60
-rw-r--r--engines/dreamweb/dreamweb.cpp6
-rw-r--r--engines/dreamweb/dreamweb.h1
-rw-r--r--engines/dreamweb/monitor.cpp5
-rw-r--r--engines/dreamweb/saveload.cpp5
-rw-r--r--engines/dreamweb/sound.cpp13
-rw-r--r--engines/kyra/items_lol.cpp53
-rw-r--r--engines/kyra/lol.cpp12
-rw-r--r--engines/kyra/lol.h10
-rw-r--r--engines/kyra/script_lol.cpp5
-rw-r--r--engines/kyra/sprites_lol.cpp70
-rw-r--r--engines/mohawk/cursors.cpp4
-rw-r--r--engines/mohawk/myst_stacks/dni.cpp2
-rw-r--r--engines/mohawk/riven.cpp2
-rw-r--r--engines/mohawk/riven_external.cpp4
-rw-r--r--engines/mohawk/video.cpp6
-rw-r--r--engines/mohawk/video.h2
-rw-r--r--engines/pegasus/movie.cpp2
-rw-r--r--engines/pegasus/pegasus.cpp2
-rw-r--r--engines/saga/introproc_ite.cpp32
-rw-r--r--engines/sci/console.cpp54
-rw-r--r--engines/sci/console.h2
-rw-r--r--engines/sci/engine/kernel.h2
-rw-r--r--engines/sci/engine/kernel_tables.h23
-rw-r--r--engines/sci/engine/kfile.cpp46
-rw-r--r--engines/sci/engine/kgraphics.cpp623
-rw-r--r--engines/sci/engine/kgraphics32.cpp622
-rw-r--r--engines/sci/engine/script_patches.cpp2
-rw-r--r--engines/sci/engine/selector.cpp1
-rw-r--r--engines/sci/engine/selector.h1
-rw-r--r--engines/sci/engine/vm.h2
-rw-r--r--engines/sci/engine/workarounds.cpp4
-rw-r--r--engines/sci/graphics/frameout.cpp61
-rw-r--r--engines/sci/graphics/frameout.h3
-rw-r--r--engines/sci/graphics/text32.cpp7
-rw-r--r--engines/sci/graphics/view.cpp13
-rw-r--r--engines/sci/module.mk1
-rw-r--r--engines/sci/resource.cpp15
-rw-r--r--engines/sci/resource.h18
-rw-r--r--engines/sci/sci.cpp2
-rw-r--r--engines/scumm/he/resource_he.cpp2
-rw-r--r--engines/sword1/animation.cpp4
-rw-r--r--engines/sword1/animation.h2
-rw-r--r--engines/sword2/animation.cpp4
-rw-r--r--engines/sword2/animation.h2
-rw-r--r--engines/sword25/fmv/movieplayer.cpp2
-rw-r--r--engines/sword25/fmv/theora_decoder.cpp6
-rw-r--r--engines/sword25/fmv/theora_decoder.h2
-rw-r--r--engines/tinsel/actors.cpp12
-rw-r--r--engines/tinsel/background.h2
-rw-r--r--engines/tinsel/bg.cpp6
-rw-r--r--engines/tinsel/bmv.cpp4
-rw-r--r--engines/tinsel/bmv.h2
-rw-r--r--engines/tinsel/coroutine.cpp82
-rw-r--r--engines/tinsel/dialogs.cpp20
-rw-r--r--engines/tinsel/drives.cpp6
-rw-r--r--engines/tinsel/drives.h2
-rw-r--r--engines/tinsel/effect.cpp2
-rw-r--r--engines/tinsel/events.cpp18
-rw-r--r--engines/tinsel/events.h4
-rw-r--r--engines/tinsel/faders.cpp4
-rw-r--r--engines/tinsel/handle.cpp2
-rw-r--r--engines/tinsel/module.mk1
-rw-r--r--engines/tinsel/move.cpp4
-rw-r--r--engines/tinsel/pcode.cpp20
-rw-r--r--engines/tinsel/pcode.h12
-rw-r--r--engines/tinsel/pdisplay.cpp6
-rw-r--r--engines/tinsel/play.cpp16
-rw-r--r--engines/tinsel/play.h2
-rw-r--r--engines/tinsel/polygons.cpp4
-rw-r--r--engines/tinsel/rince.cpp8
-rw-r--r--engines/tinsel/rince.h3
-rw-r--r--engines/tinsel/savescn.cpp10
-rw-r--r--engines/tinsel/scene.cpp20
-rw-r--r--engines/tinsel/sched.cpp487
-rw-r--r--engines/tinsel/sched.h93
-rw-r--r--engines/tinsel/text.h2
-rw-r--r--engines/tinsel/tinlib.cpp12
-rw-r--r--engines/tinsel/tinsel.cpp33
-rw-r--r--engines/tinsel/token.cpp14
-rw-r--r--engines/tsage/ringworld2/ringworld2_scenes1.cpp4
-rw-r--r--engines/tsage/ringworld2/ringworld2_scenes3.cpp2
-rw-r--r--graphics/decoders/bmp.cpp12
-rw-r--r--graphics/decoders/bmp.h2
-rw-r--r--graphics/decoders/image_decoder.h5
-rw-r--r--graphics/decoders/pict.cpp7
-rw-r--r--graphics/decoders/pict.h2
-rw-r--r--graphics/decoders/png.cpp4
-rw-r--r--graphics/decoders/png.h1
-rw-r--r--graphics/wincursor.cpp40
-rw-r--r--graphics/wincursor.h42
-rw-r--r--gui/widget.cpp4
-rw-r--r--po/ca_ES.po594
-rw-r--r--po/cs_CZ.po596
-rw-r--r--po/da_DA.po594
-rw-r--r--po/de_DE.po598
-rw-r--r--po/es_ES.po594
-rw-r--r--po/eu.po596
-rw-r--r--po/fr_FR.po594
-rw-r--r--po/hu_HU.po594
-rw-r--r--po/it_IT.po594
-rw-r--r--po/nb_NO.po594
-rw-r--r--po/nn_NO.po592
-rw-r--r--po/pl_PL.po594
-rw-r--r--po/pt_BR.po594
-rw-r--r--po/ru_RU.po598
-rw-r--r--po/scummvm.pot587
-rw-r--r--po/se_SE.po594
-rw-r--r--po/uk_UA.po594
-rw-r--r--video/avi_decoder.cpp4
-rw-r--r--video/avi_decoder.h2
-rw-r--r--video/bink_decoder.cpp2
-rw-r--r--video/bink_decoder.h2
-rw-r--r--video/psx_decoder.cpp6
-rw-r--r--video/psx_decoder.h2
-rw-r--r--video/qt_decoder.cpp8
-rw-r--r--video/qt_decoder.h4
-rw-r--r--video/smk_decoder.cpp4
-rw-r--r--video/smk_decoder.h2
-rw-r--r--video/video_decoder.cpp4
-rw-r--r--video/video_decoder.h22
138 files changed, 8843 insertions, 5501 deletions
diff --git a/NEWS b/NEWS
index 0a48ccab9a..4b3203dc66 100644
--- a/NEWS
+++ b/NEWS
@@ -27,6 +27,8 @@ For a more comprehensive changelog of the latest experimental code, see:
Engine tab when adding or editing a configuration for a game. In most
cases, you will have to run each game once or readd them all in ScummVM's
launcher in order to get the custom options tab.
+ - Improved predicitve dialog look.
+ - Various GUI improvements.
SDL ports:
- Added support for OpenGL (GSoC Task).
diff --git a/audio/decoders/quicktime.cpp b/audio/decoders/quicktime.cpp
index 99c1527a71..8874a61c2e 100644
--- a/audio/decoders/quicktime.cpp
+++ b/audio/decoders/quicktime.cpp
@@ -338,7 +338,7 @@ bool QuickTimeAudioDecoder::QuickTimeAudioTrack::seek(const Timestamp &where) {
_queue = createStream();
_samplesQueued = 0;
- if (where > getLength()) {
+ if (where >= getLength()) {
// We're done
_curEdit = _parentTrack->editCount;
return true;
diff --git a/backends/midi/sndio.cpp b/backends/midi/sndio.cpp
new file mode 100644
index 0000000000..21c9ea4fec
--- /dev/null
+++ b/backends/midi/sndio.cpp
@@ -0,0 +1,152 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+// Disable symbol overrides so that we can use system headers.
+#define FORBIDDEN_SYMBOL_ALLOW_ALL
+
+#include "common/scummsys.h"
+
+#if defined(USE_SNDIO)
+
+#include "common/error.h"
+#include "common/textconsole.h"
+#include "common/util.h"
+#include "audio/musicplugin.h"
+#include "audio/mpu401.h"
+
+#include <sndio.h>
+
+////////////////////////////////////////
+//
+// sndio MIDI driver
+//
+////////////////////////////////////////
+
+class MidiDriver_Sndio : public MidiDriver_MPU401 {
+public:
+ MidiDriver_Sndio();
+ int open();
+ bool isOpen() const { return hdl != NULL; }
+ void close();
+ void send(uint32 b);
+ void sysEx(const byte *msg, uint16 length);
+
+private:
+ struct mio_hdl *hdl;
+};
+
+MidiDriver_Sndio::MidiDriver_Sndio() {
+ hdl = NULL;
+}
+
+int MidiDriver_Sndio::open() {
+ if (hdl != NULL)
+ return MERR_ALREADY_OPEN;
+
+ hdl = ::mio_open(NULL, MIO_OUT, 0);
+ if (hdl == NULL)
+ warning("Could open MIDI port (no music)");
+ return 0;
+}
+
+void MidiDriver_Sndio::close() {
+ MidiDriver_MPU401::close();
+ if (!hdl)
+ return;
+ mio_close(hdl);
+ hdl = NULL;
+}
+
+void MidiDriver_Sndio::send(uint32 b) {
+ unsigned char buf[4];
+ unsigned int len;
+
+ if (!hdl)
+ return;
+ buf[0] = b & 0xff;
+ buf[1] = (b >> 8) & 0xff;
+ buf[2] = (b >> 16) & 0xff;
+ buf[3] = (b >> 24) & 0xff;
+ switch (buf[0] & 0xf0) {
+ case 0xf0:
+ return;
+ case 0xc0:
+ case 0xd0:
+ len = 2;
+ break;
+ default:
+ len = 3;
+ }
+ mio_write(hdl, buf, len);
+}
+
+void MidiDriver_Sndio::sysEx(const byte *msg, uint16 length) {
+ if (!hdl)
+ return;
+
+ unsigned char buf[266];
+
+ assert(length + 2 <= ARRAYSIZE(buf));
+
+ // Add SysEx frame
+ buf[0] = 0xF0;
+ memcpy(buf + 1, msg, length);
+ buf[length + 1] = 0xF7;
+
+ mio_write(hdl, buf, length + 2);
+}
+
+
+// Plugin interface
+
+class SndioMusicPlugin : public MusicPluginObject {
+public:
+ const char *getName() const {
+ return "Sndio";
+ }
+
+ const char *getId() const {
+ return "sndio";
+ }
+
+ MusicDevices getDevices() const;
+ Common::Error createInstance(MidiDriver **mididriver, MidiDriver::DeviceHandle = 0) const;
+};
+
+MusicDevices SndioMusicPlugin::getDevices() const {
+ MusicDevices devices;
+ devices.push_back(MusicDevice(this, "", MT_GM));
+ return devices;
+}
+
+Common::Error SndioMusicPlugin::createInstance(MidiDriver **mididriver, MidiDriver::DeviceHandle) const {
+ *mididriver = new MidiDriver_Sndio();
+
+ return Common::kNoError;
+}
+
+//#if PLUGIN_ENABLED_DYNAMIC(Sndio)
+ //REGISTER_PLUGIN_DYNAMIC(SNDIO, PLUGIN_TYPE_MUSIC, SndioMusicPlugin);
+//#else
+ REGISTER_PLUGIN_STATIC(SNDIO, PLUGIN_TYPE_MUSIC, SndioMusicPlugin);
+//#endif
+
+#endif
diff --git a/backends/module.mk b/backends/module.mk
index 95725d9d87..a4f525d21d 100644
--- a/backends/module.mk
+++ b/backends/module.mk
@@ -11,6 +11,7 @@ MODULE_OBJS := \
midi/alsa.o \
midi/dmedia.o \
midi/seq.o \
+ midi/sndio.o \
midi/stmidi.o \
midi/timidity.o \
saves/savefile.o \
diff --git a/base/plugins.cpp b/base/plugins.cpp
index c19b60782d..b8cd097683 100644
--- a/base/plugins.cpp
+++ b/base/plugins.cpp
@@ -101,6 +101,9 @@ public:
#if defined(USE_SEQ_MIDI)
LINK_PLUGIN(SEQ)
#endif
+ #if defined(USE_SNDIO)
+ LINK_PLUGIN(SNDIO)
+ #endif
#if defined(__MINT__)
LINK_PLUGIN(STMIDI)
#endif
diff --git a/base/version.cpp b/base/version.cpp
index 7943552418..89fae90c2e 100644
--- a/base/version.cpp
+++ b/base/version.cpp
@@ -94,6 +94,10 @@ const char *gScummVMFeatures = ""
"SEQ "
#endif
+#ifdef USE_SNDIO
+ "sndio "
+#endif
+
#ifdef USE_TIMIDITY
"TiMidity "
#endif
diff --git a/common/coroutines.cpp b/common/coroutines.cpp
new file mode 100644
index 0000000000..d511ab4b35
--- /dev/null
+++ b/common/coroutines.cpp
@@ -0,0 +1,884 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#include "common/coroutines.h"
+#include "common/algorithm.h"
+#include "common/debug.h"
+#include "common/hashmap.h"
+#include "common/hash-str.h"
+#include "common/system.h"
+#include "common/textconsole.h"
+
+namespace Common {
+
+/** Helper null context instance */
+CoroContext nullContext = NULL;
+
+DECLARE_SINGLETON(CoroutineScheduler);
+
+
+#ifdef COROUTINE_DEBUG
+namespace {
+static int s_coroCount = 0;
+
+typedef Common::HashMap<Common::String, int> CoroHashMap;
+static CoroHashMap *s_coroFuncs = 0;
+
+static void changeCoroStats(const char *func, int change) {
+ if (!s_coroFuncs)
+ s_coroFuncs = new CoroHashMap();
+
+ (*s_coroFuncs)[func] += change;
+}
+
+static void displayCoroStats() {
+ debug("%d active coros", s_coroCount);
+
+ // Loop over s_coroFuncs and print info about active coros
+ if (!s_coroFuncs)
+ return;
+ for (CoroHashMap::const_iterator it = s_coroFuncs->begin();
+ it != s_coroFuncs->end(); ++it) {
+ if (it->_value != 0)
+ debug(" %3d x %s", it->_value, it->_key.c_str());
+ }
+}
+
+}
+#endif
+
+CoroBaseContext::CoroBaseContext(const char *func)
+ : _line(0), _sleep(0), _subctx(0) {
+#ifdef COROUTINE_DEBUG
+ _funcName = func;
+ changeCoroStats(_funcName, +1);
+ s_coroCount++;
+#endif
+}
+
+CoroBaseContext::~CoroBaseContext() {
+#ifdef COROUTINE_DEBUG
+ s_coroCount--;
+ changeCoroStats(_funcName, -1);
+ debug("Deleting coro in %s at %p (subctx %p)",
+ _funcName, (void *)this, (void *)_subctx);
+ displayCoroStats();
+#endif
+ delete _subctx;
+}
+
+//--------------------- Scheduler Class ------------------------
+
+/**
+ * Constructor
+ */
+CoroutineScheduler::CoroutineScheduler() {
+ processList = NULL;
+ pFreeProcesses = NULL;
+ pCurrent = NULL;
+
+#ifdef DEBUG
+ // diagnostic process counters
+ numProcs = 0;
+ maxProcs = 0;
+#endif
+
+ pRCfunction = NULL;
+ pidCounter = 0;
+
+ active = new PROCESS;
+ active->pPrevious = NULL;
+ active->pNext = NULL;
+
+ reset();
+}
+
+/**
+ * Destructor
+ */
+CoroutineScheduler::~CoroutineScheduler() {
+ // Kill all running processes (i.e. free memory allocated for their state).
+ PROCESS *pProc = active->pNext;
+ while (pProc != NULL) {
+ delete pProc->state;
+ pProc->state = 0;
+ pProc = pProc->pNext;
+ }
+
+ free(processList);
+ processList = NULL;
+
+ delete active;
+ active = 0;
+
+ // Clear the event list
+ Common::List<EVENT *>::iterator i;
+ for (i = _events.begin(); i != _events.end(); ++i)
+ delete (*i);
+}
+
+/**
+ * Kills all processes and places them on the free list.
+ */
+void CoroutineScheduler::reset() {
+
+#ifdef DEBUG
+ // clear number of process in use
+ numProcs = 0;
+#endif
+
+ if (processList == NULL) {
+ // first time - allocate memory for process list
+ processList = (PROCESS *)calloc(CORO_MAX_PROCESSES, sizeof(PROCESS));
+
+ // make sure memory allocated
+ if (processList == NULL) {
+ error("Cannot allocate memory for process data");
+ }
+
+ // fill with garbage
+ memset(processList, 'S', CORO_MAX_PROCESSES * sizeof(PROCESS));
+ }
+
+ // Kill all running processes (i.e. free memory allocated for their state).
+ PROCESS *pProc = active->pNext;
+ while (pProc != NULL) {
+ delete pProc->state;
+ pProc->state = 0;
+ Common::fill(&pProc->pidWaiting[0], &pProc->pidWaiting[CORO_MAX_PID_WAITING], 0);
+ pProc = pProc->pNext;
+ }
+
+ // no active processes
+ pCurrent = active->pNext = NULL;
+
+ // place first process on free list
+ pFreeProcesses = processList;
+
+ // link all other processes after first
+ for (int i = 1; i <= CORO_NUM_PROCESS; i++) {
+ processList[i - 1].pNext = (i == CORO_NUM_PROCESS) ? NULL : processList + i;
+ processList[i - 1].pPrevious = (i == 1) ? active : processList + (i - 2);
+ }
+}
+
+
+#ifdef DEBUG
+/**
+ * Shows the maximum number of process used at once.
+ */
+void CoroutineScheduler::printStats() {
+ debug("%i process of %i used", maxProcs, CORO_NUM_PROCESS);
+}
+#endif
+
+#ifdef DEBUG
+/**
+ * Checks both the active and free process list to insure all the links are valid,
+ * and that no processes have been lost
+ */
+void CoroutineScheduler::CheckStack() {
+ Common::List<PROCESS *> pList;
+
+ // Check both the active and free process lists
+ for (int i = 0; i < 2; ++i) {
+ PROCESS *p = (i == 0) ? active : pFreeProcesses;
+
+ if (p != NULL) {
+ // Make sure the linkages are correct
+ while (p->pNext != NULL) {
+ assert(p->pNext->pPrevious == p);
+ pList.push_back(p);
+ p = p->pNext;
+ }
+ pList.push_back(p);
+ }
+ }
+
+ // Make sure all processes are accounted for
+ for (int idx = 0; idx < CORO_NUM_PROCESS; idx++) {
+ bool found = false;
+ for (Common::List<PROCESS *>::iterator i = pList.begin(); i != pList.end(); ++i) {
+ PROCESS *pTemp = *i;
+ if (*i == &processList[idx]) {
+ found = true;
+ break;
+ }
+ }
+
+ assert(found);
+ }
+}
+#endif
+
+/**
+ * Give all active processes a chance to run
+ */
+void CoroutineScheduler::schedule() {
+ // start dispatching active process list
+ PROCESS *pNext;
+ PROCESS *pProc = active->pNext;
+ while (pProc != NULL) {
+ pNext = pProc->pNext;
+
+ if (--pProc->sleepTime <= 0) {
+ // process is ready for dispatch, activate it
+ pCurrent = pProc;
+ pProc->coroAddr(pProc->state, pProc->param);
+
+ if (!pProc->state || pProc->state->_sleep <= 0) {
+ // Coroutine finished
+ pCurrent = pCurrent->pPrevious;
+ killProcess(pProc);
+ } else {
+ pProc->sleepTime = pProc->state->_sleep;
+ }
+
+ // pCurrent may have been changed
+ pNext = pCurrent->pNext;
+ pCurrent = NULL;
+ }
+
+ pProc = pNext;
+ }
+}
+
+/**
+ * Reschedules all the processes to run again this query
+ */
+void CoroutineScheduler::rescheduleAll() {
+ assert(pCurrent);
+
+ // Unlink current process
+ pCurrent->pPrevious->pNext = pCurrent->pNext;
+ if (pCurrent->pNext)
+ pCurrent->pNext->pPrevious = pCurrent->pPrevious;
+
+ // Add process to the start of the active list
+ pCurrent->pNext = active->pNext;
+ active->pNext->pPrevious = pCurrent;
+ active->pNext = pCurrent;
+ pCurrent->pPrevious = active;
+}
+
+/**
+ * If the specified process has already run on this tick, make it run
+ * again on the current tick.
+ */
+void CoroutineScheduler::reschedule(PPROCESS pReSchedProc) {
+ // If not currently processing the schedule list, then no action is needed
+ if (!pCurrent)
+ return;
+
+ if (!pReSchedProc)
+ pReSchedProc = pCurrent;
+
+ PPROCESS pEnd;
+
+ // Find the last process in the list.
+ // But if the target process is down the list from here, do nothing
+ for (pEnd = pCurrent; pEnd->pNext != NULL; pEnd = pEnd->pNext) {
+ if (pEnd->pNext == pReSchedProc)
+ return;
+ }
+
+ assert(pEnd->pNext == NULL);
+
+ // Could be in the middle of a KillProc()!
+ // Dying process was last and this process was penultimate
+ if (pReSchedProc->pNext == NULL)
+ return;
+
+ // If we're moving the current process, move it back by one, so that the next
+ // schedule() iteration moves to the now next one
+ if (pCurrent == pReSchedProc)
+ pCurrent = pCurrent->pPrevious;
+
+ // Unlink the process, and add it at the end
+ pReSchedProc->pPrevious->pNext = pReSchedProc->pNext;
+ pReSchedProc->pNext->pPrevious = pReSchedProc->pPrevious;
+ pEnd->pNext = pReSchedProc;
+ pReSchedProc->pPrevious = pEnd;
+ pReSchedProc->pNext = NULL;
+}
+
+/**
+ * Moves the specified process to the end of the dispatch queue
+ * allowing it to run again within the current game cycle.
+ * @param pGiveProc Which process
+ */
+void CoroutineScheduler::giveWay(PPROCESS pReSchedProc) {
+ // If not currently processing the schedule list, then no action is needed
+ if (!pCurrent)
+ return;
+
+ if (!pReSchedProc)
+ pReSchedProc = pCurrent;
+
+ // If the process is already at the end of the queue, nothing has to be done
+ if (!pReSchedProc->pNext)
+ return;
+
+ PPROCESS pEnd;
+
+ // Find the last process in the list.
+ for (pEnd = pCurrent; pEnd->pNext != NULL; pEnd = pEnd->pNext)
+ ;
+ assert(pEnd->pNext == NULL);
+
+
+ // If we're moving the current process, move it back by one, so that the next
+ // schedule() iteration moves to the now next one
+ if (pCurrent == pReSchedProc)
+ pCurrent = pCurrent->pPrevious;
+
+ // Unlink the process, and add it at the end
+ pReSchedProc->pPrevious->pNext = pReSchedProc->pNext;
+ pReSchedProc->pNext->pPrevious = pReSchedProc->pPrevious;
+ pEnd->pNext = pReSchedProc;
+ pReSchedProc->pPrevious = pEnd;
+ pReSchedProc->pNext = NULL;
+}
+
+/**
+ * Continously makes a given process wait for another process to finish or event to signal.
+ *
+ * @param pid Process/Event identifier
+ * @param duration Duration in milliseconds
+ * @param expired If specified, set to true if delay period expired
+ */
+void CoroutineScheduler::waitForSingleObject(CORO_PARAM, int pid, uint32 duration, bool *expired) {
+ if (!pCurrent)
+ error("Called CoroutineScheduler::waitForSingleObject from the main process");
+
+ CORO_BEGIN_CONTEXT;
+ uint32 endTime;
+ PROCESS *pProcess;
+ EVENT *pEvent;
+ CORO_END_CONTEXT(_ctx);
+
+ CORO_BEGIN_CODE(_ctx);
+
+ // Signal the process Id this process is now waiting for
+ pCurrent->pidWaiting[0] = pid;
+
+ _ctx->endTime = (duration == CORO_INFINITE) ? CORO_INFINITE : g_system->getMillis() + duration;
+ if (expired)
+ // Presume it will expire
+ *expired = true;
+
+ // Outer loop for doing checks until expiry
+ while (g_system->getMillis() < _ctx->endTime) {
+ // Check to see if a process or event with the given Id exists
+ _ctx->pProcess = getProcess(pid);
+ _ctx->pEvent = !_ctx->pProcess ? getEvent(pid) : NULL;
+
+ // If there's no active process or event, presume it's a process that's finished,
+ // so the waiting can immediately exit
+ if ((_ctx->pProcess == NULL) && (_ctx->pEvent == NULL)) {
+ if (expired)
+ *expired = false;
+ break;
+ }
+
+ // If a process was found, don't go into the if statement, and keep waiting.
+ // Likewise if it's an event that's not yet signalled
+ if ((_ctx->pEvent != NULL) && _ctx->pEvent->signalled) {
+ // Unless the event is flagged for manual reset, reset it now
+ if (!_ctx->pEvent->manualReset)
+ _ctx->pEvent->signalled = false;
+
+ if (expired)
+ *expired = false;
+ break;
+ }
+
+ // Sleep until the next cycle
+ CORO_SLEEP(1);
+ }
+
+ // Signal waiting is done
+ Common::fill(&pCurrent->pidWaiting[0], &pCurrent->pidWaiting[CORO_MAX_PID_WAITING], 0);
+
+ CORO_END_CODE;
+}
+
+/**
+ * Continously makes a given process wait for given prcesses to finished or events to be set
+ *
+ * @param nCount Number of Id's being passed
+ * @param evtList List of pids to wait for
+ * @param bWaitAll Specifies whether all or any of the processes/events
+ * @param duration Duration in milliseconds
+ * @param expired Set to true if delay period expired
+ */
+void CoroutineScheduler::waitForMultipleObjects(CORO_PARAM, int nCount, uint32 *pidList, bool bWaitAll,
+ uint32 duration, bool *expired) {
+ if (!pCurrent)
+ error("Called CoroutineScheduler::waitForMultipleEvents from the main process");
+
+ CORO_BEGIN_CONTEXT;
+ uint32 endTime;
+ bool signalled;
+ bool pidSignalled;
+ int i;
+ PROCESS *pProcess;
+ EVENT *pEvent;
+ CORO_END_CONTEXT(_ctx);
+
+ CORO_BEGIN_CODE(_ctx);
+
+ // Signal the waiting events
+ assert(nCount < CORO_MAX_PID_WAITING);
+ Common::copy(pidList, pidList + nCount, pCurrent->pidWaiting);
+
+ _ctx->endTime = (duration == CORO_INFINITE) ? CORO_INFINITE : g_system->getMillis() + duration;
+ if (expired)
+ // Presume that delay will expire
+ *expired = true;
+
+ // Outer loop for doing checks until expiry
+ while (g_system->getMillis() < _ctx->endTime) {
+ _ctx->signalled = bWaitAll;
+
+ for (_ctx->i = 0; _ctx->i < nCount; ++_ctx->i) {
+ _ctx->pProcess = getProcess(pidList[_ctx->i]);
+ _ctx->pEvent = !_ctx->pProcess ? getEvent(pidList[_ctx->i]) : NULL;
+
+ // Determine the signalled state
+ _ctx->pidSignalled = (_ctx->pProcess) || !_ctx->pEvent ? false : _ctx->pEvent->signalled;
+
+ if (bWaitAll && _ctx->pidSignalled)
+ _ctx->signalled = false;
+ else if (!bWaitAll & _ctx->pidSignalled)
+ _ctx->signalled = true;
+ }
+
+ // At this point, if the signalled variable is set, waiting is finished
+ if (_ctx->signalled) {
+ // Automatically reset any events not flagged for manual reset
+ for (_ctx->i = 0; _ctx->i < nCount; ++_ctx->i) {
+ _ctx->pEvent = getEvent(pidList[_ctx->i]);
+
+ if (_ctx->pEvent->manualReset)
+ _ctx->pEvent->signalled = false;
+ }
+
+ if (expired)
+ *expired = false;
+ break;
+ }
+
+ // Sleep until the next cycle
+ CORO_SLEEP(1);
+ }
+
+ // Signal waiting is done
+ Common::fill(&pCurrent->pidWaiting[0], &pCurrent->pidWaiting[CORO_MAX_PID_WAITING], 0);
+
+ CORO_END_CODE;
+}
+
+/**
+ * Make the active process sleep for the given duration in milliseconds
+ * @param duration Duration in milliseconds
+ * @remarks This duration won't be precise, since it relies on the frequency the
+ * scheduler is called.
+ */
+void CoroutineScheduler::sleep(CORO_PARAM, uint32 duration) {
+ if (!pCurrent)
+ error("Called CoroutineScheduler::waitForSingleObject from the main process");
+
+ CORO_BEGIN_CONTEXT;
+ uint32 endTime;
+ PROCESS *pProcess;
+ EVENT *pEvent;
+ CORO_END_CONTEXT(_ctx);
+
+ CORO_BEGIN_CODE(_ctx);
+
+ _ctx->endTime = g_system->getMillis() + duration;
+
+ // Outer loop for doing checks until expiry
+ while (g_system->getMillis() < _ctx->endTime) {
+ // Sleep until the next cycle
+ CORO_SLEEP(1);
+ }
+
+ CORO_END_CODE;
+}
+
+/**
+ * Creates a new process.
+ *
+ * @param pid process identifier
+ * @param CORO_ADDR coroutine start address
+ * @param pParam process specific info
+ * @param sizeParam size of process specific info
+ */
+PROCESS *CoroutineScheduler::createProcess(uint32 pid, CORO_ADDR coroAddr, const void *pParam, int sizeParam) {
+ PROCESS *pProc;
+
+ // get a free process
+ pProc = pFreeProcesses;
+
+ // trap no free process
+ assert(pProc != NULL); // Out of processes
+
+#ifdef DEBUG
+ // one more process in use
+ if (++numProcs > maxProcs)
+ maxProcs = numProcs;
+#endif
+
+ // get link to next free process
+ pFreeProcesses = pProc->pNext;
+ if (pFreeProcesses)
+ pFreeProcesses->pPrevious = NULL;
+
+ if (pCurrent != NULL) {
+ // place new process before the next active process
+ pProc->pNext = pCurrent->pNext;
+ if (pProc->pNext)
+ pProc->pNext->pPrevious = pProc;
+
+ // make this new process the next active process
+ pCurrent->pNext = pProc;
+ pProc->pPrevious = pCurrent;
+
+ } else { // no active processes, place process at head of list
+ pProc->pNext = active->pNext;
+ pProc->pPrevious = active;
+
+ if (pProc->pNext)
+ pProc->pNext->pPrevious = pProc;
+ active->pNext = pProc;
+
+ }
+
+ // set coroutine entry point
+ pProc->coroAddr = coroAddr;
+
+ // clear coroutine state
+ pProc->state = 0;
+
+ // wake process up as soon as possible
+ pProc->sleepTime = 1;
+
+ // set new process id
+ pProc->pid = pid;
+
+ // set new process specific info
+ if (sizeParam) {
+ assert(sizeParam > 0 && sizeParam <= CORO_PARAM_SIZE);
+
+ // set new process specific info
+ memcpy(pProc->param, pParam, sizeParam);
+ }
+
+ // return created process
+ return pProc;
+}
+
+/**
+ * Creates a new process with an auto-incrementing Process Id.
+ *
+ * @param CORO_ADDR coroutine start address
+ * @param pParam process specific info
+ * @param sizeParam size of process specific info
+ */
+uint32 CoroutineScheduler::createProcess(CORO_ADDR coroAddr, const void *pParam, int sizeParam) {
+ PROCESS *pProc = createProcess(++pidCounter, coroAddr, pParam, sizeParam);
+ return pProc->pid;
+}
+
+/**
+ * Creates a new process with an auto-incrementing Process Id, and a single pointer parameter.
+ *
+ * @param CORO_ADDR coroutine start address
+ * @param pParam process specific info
+ * @param sizeParam size of process specific info
+ */
+uint32 CoroutineScheduler::createProcess(CORO_ADDR coroAddr, const void *pParam) {
+ return createProcess(coroAddr, &pParam, sizeof(void *));
+}
+
+
+/**
+ * Kills the specified process.
+ *
+ * @param pKillProc which process to kill
+ */
+void CoroutineScheduler::killProcess(PROCESS *pKillProc) {
+ // make sure a valid process pointer
+ assert(pKillProc >= processList && pKillProc <= processList + CORO_NUM_PROCESS - 1);
+
+ // can not kill the current process using killProcess !
+ assert(pCurrent != pKillProc);
+
+#ifdef DEBUG
+ // one less process in use
+ --numProcs;
+ assert(numProcs >= 0);
+#endif
+
+ // Free process' resources
+ if (pRCfunction != NULL)
+ (pRCfunction)(pKillProc);
+
+ delete pKillProc->state;
+ pKillProc->state = 0;
+
+ // Take the process out of the active chain list
+ pKillProc->pPrevious->pNext = pKillProc->pNext;
+ if (pKillProc->pNext)
+ pKillProc->pNext->pPrevious = pKillProc->pPrevious;
+
+ // link first free process after pProc
+ pKillProc->pNext = pFreeProcesses;
+ if (pFreeProcesses)
+ pKillProc->pNext->pPrevious = pKillProc;
+ pKillProc->pPrevious = NULL;
+
+ // make pKillProc the first free process
+ pFreeProcesses = pKillProc;
+}
+
+
+
+/**
+ * Returns a pointer to the currently running process.
+ */
+PROCESS *CoroutineScheduler::getCurrentProcess() {
+ return pCurrent;
+}
+
+/**
+ * Returns the process identifier of the specified process.
+ *
+ * @param pProc which process
+ */
+int CoroutineScheduler::getCurrentPID() const {
+ PROCESS *pProc = pCurrent;
+
+ // make sure a valid process pointer
+ assert(pProc >= processList && pProc <= processList + CORO_NUM_PROCESS - 1);
+
+ // return processes PID
+ return pProc->pid;
+}
+
+/**
+ * Kills any process matching the specified PID. The current
+ * process cannot be killed.
+ *
+ * @param pidKill process identifier of process to kill
+ * @param pidMask mask to apply to process identifiers before comparison
+ * @return The number of processes killed is returned.
+ */
+int CoroutineScheduler::killMatchingProcess(uint32 pidKill, int pidMask) {
+ int numKilled = 0;
+ PROCESS *pProc, *pPrev; // process list pointers
+
+ for (pProc = active->pNext, pPrev = active; pProc != NULL; pPrev = pProc, pProc = pProc->pNext) {
+ if ((pProc->pid & (uint32)pidMask) == pidKill) {
+ // found a matching process
+
+ // dont kill the current process
+ if (pProc != pCurrent) {
+ // kill this process
+ numKilled++;
+
+ // Free the process' resources
+ if (pRCfunction != NULL)
+ (pRCfunction)(pProc);
+
+ delete pProc->state;
+ pProc->state = 0;
+
+ // make prev point to next to unlink pProc
+ pPrev->pNext = pProc->pNext;
+ if (pProc->pNext)
+ pPrev->pNext->pPrevious = pPrev;
+
+ // link first free process after pProc
+ pProc->pNext = pFreeProcesses;
+ pProc->pPrevious = NULL;
+ pFreeProcesses->pPrevious = pProc;
+
+ // make pProc the first free process
+ pFreeProcesses = pProc;
+
+ // set to a process on the active list
+ pProc = pPrev;
+ }
+ }
+ }
+
+#ifdef DEBUG
+ // adjust process in use
+ numProcs -= numKilled;
+ assert(numProcs >= 0);
+#endif
+
+ // return number of processes killed
+ return numKilled;
+}
+
+/**
+ * Set pointer to a function to be called by killProcess().
+ *
+ * May be called by a resource allocator, the function supplied is
+ * called by killProcess() to allow the resource allocator to free
+ * resources allocated to the dying process.
+ *
+ * @param pFunc Function to be called by killProcess()
+ */
+void CoroutineScheduler::setResourceCallback(VFPTRPP pFunc) {
+ pRCfunction = pFunc;
+}
+
+PROCESS *CoroutineScheduler::getProcess(uint32 pid) {
+ PROCESS *pProc = active->pNext;
+ while ((pProc != NULL) && (pProc->pid != pid))
+ pProc = pProc->pNext;
+
+ return pProc;
+}
+
+EVENT *CoroutineScheduler::getEvent(uint32 pid) {
+ Common::List<EVENT *>::iterator i;
+ for (i = _events.begin(); i != _events.end(); ++i) {
+ EVENT *evt = *i;
+ if (evt->pid == pid)
+ return evt;
+ }
+
+ return NULL;
+}
+
+
+/**
+ * Creates a new event object
+ * @param bManualReset Events needs to be manually reset. Otherwise, events
+ * will be automatically reset after a process waits on the event finishes
+ * @param bInitialState Specifies whether the event is signalled or not initially
+ */
+uint32 CoroutineScheduler::createEvent(bool bManualReset, bool bInitialState) {
+ EVENT *evt = new EVENT();
+ evt->pid = ++pidCounter;
+ evt->manualReset = bManualReset;
+ evt->signalled = bInitialState;
+
+ _events.push_back(evt);
+ return evt->pid;
+}
+
+/**
+ * Destroys the given event
+ * @param pidEvent Event PID
+ */
+void CoroutineScheduler::closeEvent(uint32 pidEvent) {
+ EVENT *evt = getEvent(pidEvent);
+ if (evt) {
+ _events.remove(evt);
+ delete evt;
+ }
+}
+
+/**
+ * Sets the event
+ * @param pidEvent Event PID
+ */
+void CoroutineScheduler::setEvent(uint32 pidEvent) {
+ EVENT *evt = getEvent(pidEvent);
+ if (evt)
+ evt->signalled = true;
+}
+
+/**
+ * Resets the event
+ * @param pidEvent Event PID
+ */
+void CoroutineScheduler::resetEvent(uint32 pidEvent) {
+ EVENT *evt = getEvent(pidEvent);
+ if (evt)
+ evt->signalled = false;
+}
+
+/**
+ * Temporarily sets a given event to true, and then runs all waiting processes, allowing any
+ * processes waiting on the event to be fired. It then immediately resets the event again.
+ * @param pidEvent Event PID
+ *
+ * @remarks Should not be run inside of another process
+ */
+void CoroutineScheduler::pulseEvent(uint32 pidEvent) {
+ EVENT *evt = getEvent(pidEvent);
+ if (!evt)
+ return;
+
+ // Set the event as true
+ evt->signalled = true;
+
+ // start dispatching active process list for any processes that are currently waiting
+ PROCESS *pOriginal = pCurrent;
+ PROCESS *pNext;
+ PROCESS *pProc = active->pNext;
+ while (pProc != NULL) {
+ pNext = pProc->pNext;
+
+ // Only call processes that are currently waiting (either in waitForSingleObject or
+ // waitForMultipleObjects) for the given event Pid
+ for (int i = 0; i < CORO_MAX_PID_WAITING; ++i) {
+ if (pProc->pidWaiting[i] == pidEvent) {
+ // Dispatch the process
+ pCurrent = pProc;
+ pProc->coroAddr(pProc->state, pProc->param);
+
+ if (!pProc->state || pProc->state->_sleep <= 0) {
+ // Coroutine finished
+ pCurrent = pCurrent->pPrevious;
+ killProcess(pProc);
+ } else {
+ pProc->sleepTime = pProc->state->_sleep;
+ }
+
+ // pCurrent may have been changed
+ pNext = pCurrent->pNext;
+ pCurrent = NULL;
+
+ break;
+ }
+ }
+
+ pProc = pNext;
+ }
+
+ // Restore the original current process (if one was active)
+ pCurrent = pOriginal;
+
+ // Reset the event back to non-signalled
+ evt->signalled = false;
+}
+
+
+} // end of namespace Common
diff --git a/engines/tinsel/coroutine.h b/common/coroutines.h
index 5bcf1149d9..6df843887c 100644
--- a/engines/tinsel/coroutine.h
+++ b/common/coroutines.h
@@ -8,57 +8,42 @@
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
-
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
-
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
*/
-#ifndef TINSEL_COROUTINE_H
-#define TINSEL_COROUTINE_H
+#ifndef COMMON_COROUTINES_H
+#define COMMON_COROUTINES_H
#include "common/scummsys.h"
#include "common/util.h" // for SCUMMVM_CURRENT_FUNCTION
+#include "common/list.h"
+#include "common/singleton.h"
-namespace Tinsel {
+namespace Common {
/**
- * @defgroup TinselCoroutines Coroutine support for Tinsel
+ * @defgroup Coroutine support for simulating multi-threading.
*
* The following is loosely based on an article by Simon Tatham:
* <http://www.chiark.greenend.org.uk/~sgtatham/coroutines.html>.
* However, many improvements and tweaks have been made, in particular
* by taking advantage of C++ features not available in C.
- *
- * Why is this code here? Well, the Tinsel engine apparently used
- * setjmp/longjmp based coroutines as a core tool from the start, and
- * so they are deeply ingrained into the whole code base. When we
- * started to get Tinsel ready for ScummVM, we had to deal with that.
- * It soon got clear that we could not simply rewrite the code to work
- * without some form of coroutines. While possible in principle, it
- * would have meant a major restructuring of the entire code base, a
- * rather daunting task. Also, it would have very likely introduced
- * tons of regressons.
- *
- * So instead of getting rid of the coroutines, we chose to implement
- * them in an alternate way, using Simon Tatham's trick as described
- * above. While the trick is dirty, the result seems to be clear enough,
- * we hope; plus, it allowed us to stay relatively close to the
- * original structure of the code, which made it easier to avoid
- * regressions, and will be helpful in the future when comparing things
- * against the original code base.
*/
//@{
+#define CoroScheduler (Common::CoroutineScheduler::instance())
+
// Enable this macro to enable some debugging support in the coroutine code.
-//#define COROUTINE_DEBUG 1
+//#define COROUTINE_DEBUG
/**
* The core of any coroutine context which captures the 'state' of a coroutine.
@@ -68,17 +53,20 @@ struct CoroBaseContext {
int _line;
int _sleep;
CoroBaseContext *_subctx;
-#if COROUTINE_DEBUG
+#ifdef COROUTINE_DEBUG
const char *_funcName;
#endif
CoroBaseContext(const char *func);
- ~CoroBaseContext();
+ virtual ~CoroBaseContext();
};
typedef CoroBaseContext *CoroContext;
-// FIXME: Document this!
+/** This is a special constant that can be temporarily used as a parameter to call coroutine-ised
+ * from methods from methods that haven't yet been converted to being a coroutine, so code at least
+ * compiles correctly. Be aware, though, that if you use this, you will get runtime errors.
+ */
extern CoroContext nullContext;
/**
@@ -105,8 +93,8 @@ public:
}
};
-
-#define CORO_PARAM CoroContext &coroParam
+/** Methods that have been converted to being a coroutine should have this as the first parameter */
+#define CORO_PARAM Common::CoroContext &coroParam
/**
@@ -131,7 +119,7 @@ public:
* context, and so compilers won't complain about ";" following the macro.
*/
#define CORO_BEGIN_CONTEXT \
- struct CoroContextTag : CoroBaseContext { \
+ struct CoroContextTag : Common::CoroBaseContext { \
CoroContextTag() : CoroBaseContext(SCUMMVM_CURRENT_FUNCTION) {} \
int DUMMY
@@ -148,9 +136,9 @@ public:
* @see CORO_BEGIN_CODE
*/
#define CORO_BEGIN_CODE(x) \
- if (&coroParam == &nullContext) assert(!nullContext);\
+ if (&coroParam == &Common::nullContext) assert(!Common::nullContext);\
if (!x) {coroParam = x = new CoroContextTag();}\
- CoroContextHolder tmpHolder(coroParam);\
+ Common::CoroContextHolder tmpHolder(coroParam);\
switch (coroParam->_line) { case 0:;
/**
@@ -158,9 +146,9 @@ public:
* @see CORO_END_CODE
*/
#define CORO_END_CODE \
- if (&coroParam == &nullContext) { \
- delete nullContext; \
- nullContext = NULL; \
+ if (&coroParam == &Common::nullContext) { \
+ delete Common::nullContext; \
+ Common::nullContext = NULL; \
} \
}
@@ -170,12 +158,12 @@ public:
#define CORO_SLEEP(delay) do {\
coroParam->_line = __LINE__;\
coroParam->_sleep = delay;\
- assert(&coroParam != &nullContext);\
+ assert(&coroParam != &Common::nullContext);\
return; case __LINE__:;\
} while (0)
-#define CORO_GIVE_WAY do { g_scheduler->giveWay(); CORO_SLEEP(1); } while (0)
-#define CORO_RESCHEDULE do { g_scheduler->reschedule(); CORO_SLEEP(1); } while (0)
+#define CORO_GIVE_WAY do { CoroScheduler.giveWay(); CORO_SLEEP(1); } while (0)
+#define CORO_RESCHEDULE do { CoroScheduler.reschedule(); CORO_SLEEP(1); } while (0)
/**
* Stop the currently running coroutine and all calling coroutines.
@@ -186,7 +174,7 @@ public:
* then delete the entire coroutine's state, including all subcontexts).
*/
#define CORO_KILL_SELF() \
- do { if (&coroParam != &nullContext) { coroParam->_sleep = -1; } return; } while (0)
+ do { if (&coroParam != &Common::nullContext) { coroParam->_sleep = -1; } return; } while (0)
/**
@@ -223,7 +211,7 @@ public:
subCoro ARGS;\
if (!coroParam->_subctx) break;\
coroParam->_sleep = coroParam->_subctx->_sleep;\
- assert(&coroParam != &nullContext);\
+ assert(&coroParam != &Common::nullContext);\
return; case __LINE__:;\
} while (1);\
} while (0)
@@ -242,7 +230,7 @@ public:
subCoro ARGS;\
if (!coroParam->_subctx) break;\
coroParam->_sleep = coroParam->_subctx->_sleep;\
- assert(&coroParam != &nullContext);\
+ assert(&coroParam != &Common::nullContext);\
return RESULT; case __LINE__:;\
} while (1);\
} while (0)
@@ -275,8 +263,137 @@ public:
#define CORO_INVOKE_3(subCoroutine, a0,a1,a2) \
CORO_INVOKE_ARGS(subCoroutine,(CORO_SUBCTX,a0,a1,a2))
+/**
+ * Convenience wrapper for CORO_INVOKE_ARGS for invoking a coroutine
+ * with four parameters.
+ */
+#define CORO_INVOKE_4(subCoroutine, a0,a1,a2,a3) \
+ CORO_INVOKE_ARGS(subCoroutine,(CORO_SUBCTX,a0,a1,a2,a3))
+
+
+
+// the size of process specific info
+#define CORO_PARAM_SIZE 32
+
+// the maximum number of processes
+#define CORO_NUM_PROCESS 100
+#define CORO_MAX_PROCESSES 100
+#define CORO_MAX_PID_WAITING 5
+
+#define CORO_INFINITE 0xffffffff
+#define CORO_INVALID_PID_VALUE 0
+
+typedef void (*CORO_ADDR)(CoroContext &, const void *);
+
+/** process structure */
+struct PROCESS {
+ PROCESS *pNext; ///< pointer to next process in active or free list
+ PROCESS *pPrevious; ///< pointer to previous process in active or free list
+
+ CoroContext state; ///< the state of the coroutine
+ CORO_ADDR coroAddr; ///< the entry point of the coroutine
+
+ int sleepTime; ///< number of scheduler cycles to sleep
+ uint32 pid; ///< process ID
+ uint32 pidWaiting[CORO_MAX_PID_WAITING]; ///< Process ID(s) process is currently waiting on
+ char param[CORO_PARAM_SIZE]; ///< process specific info
+};
+typedef PROCESS *PPROCESS;
+
+
+/** Event structure */
+struct EVENT {
+ uint32 pid;
+ bool manualReset;
+ bool signalled;
+};
+
+
+/**
+ * Creates and manages "processes" (really coroutines).
+ */
+class CoroutineScheduler: public Singleton<CoroutineScheduler> {
+public:
+ /** Pointer to a function of the form "void function(PPROCESS)" */
+ typedef void (*VFPTRPP)(PROCESS *);
+
+private:
+
+ /** list of all processes */
+ PROCESS *processList;
+
+ /** active process list - also saves scheduler state */
+ PROCESS *active;
+
+ /** pointer to free process list */
+ PROCESS *pFreeProcesses;
+
+ /** the currently active process */
+ PROCESS *pCurrent;
+
+ /** Auto-incrementing process Id */
+ int pidCounter;
+
+ /** Event list */
+ Common::List<EVENT *> _events;
+
+#ifdef DEBUG
+ // diagnostic process counters
+ int numProcs;
+ int maxProcs;
+
+ void CheckStack();
+#endif
+
+ /**
+ * Called from killProcess() to enable other resources
+ * a process may be allocated to be released.
+ */
+ VFPTRPP pRCfunction;
+
+ PROCESS *getProcess(uint32 pid);
+ EVENT *getEvent(uint32 pid);
+public:
+
+ CoroutineScheduler();
+ ~CoroutineScheduler();
+
+ void reset();
+
+ #ifdef DEBUG
+ void printStats();
+ #endif
+
+ void schedule();
+ void rescheduleAll();
+ void reschedule(PPROCESS pReSchedProc = NULL);
+ void giveWay(PPROCESS pReSchedProc = NULL);
+ void waitForSingleObject(CORO_PARAM, int pid, uint32 duration, bool *expired = NULL);
+ void waitForMultipleObjects(CORO_PARAM, int nCount, uint32 *pidList, bool bWaitAll,
+ uint32 duration, bool *expired = NULL);
+ void sleep(CORO_PARAM, uint32 duration);
+
+ PROCESS *createProcess(uint32 pid, CORO_ADDR coroAddr, const void *pParam, int sizeParam);
+ uint32 createProcess(CORO_ADDR coroAddr, const void *pParam, int sizeParam);
+ uint32 createProcess(CORO_ADDR coroAddr, const void *pParam);
+ void killProcess(PROCESS *pKillProc);
+
+ PROCESS *getCurrentProcess();
+ int getCurrentPID() const;
+ int killMatchingProcess(uint32 pidKill, int pidMask = -1);
+
+ void setResourceCallback(VFPTRPP pFunc);
+
+ /* Event methods */
+ uint32 createEvent(bool bManualReset, bool bInitialState);
+ void closeEvent(uint32 pidEvent);
+ void setEvent(uint32 pidEvent);
+ void resetEvent(uint32 pidEvent);
+ void pulseEvent(uint32 pidEvent);
+};
+
//@}
-} // End of namespace Tinsel
+} // end of namespace Common
-#endif // TINSEL_COROUTINE_H
+#endif // COMMON_COROUTINES_H
diff --git a/common/module.mk b/common/module.mk
index 7e31ddfa01..92279740e5 100644
--- a/common/module.mk
+++ b/common/module.mk
@@ -4,6 +4,7 @@ MODULE_OBJS := \
archive.o \
config-file.o \
config-manager.o \
+ coroutines.o \
dcl.o \
debug.o \
error.o \
diff --git a/common/quicktime.cpp b/common/quicktime.cpp
index 5176f83a35..173d3c6a97 100644
--- a/common/quicktime.cpp
+++ b/common/quicktime.cpp
@@ -217,7 +217,11 @@ int QuickTimeParser::readDefault(Atom atom) {
a.size -= 8;
- if (_parseTable[i].type == 0) { // skip leaf atoms data
+ if (a.size + (uint32)_fd->pos() > (uint32)_fd->size()) {
+ _fd->seek(_fd->size());
+ debug(0, "Skipping junk found at the end of the QuickTime file");
+ return 0;
+ } else if (_parseTable[i].type == 0) { // skip leaf atom data
debug(0, ">>> Skipped [%s]", tag2str(a.type));
_fd->seek(a.size, SEEK_CUR);
diff --git a/configure b/configure
index 88dc161595..d310148f06 100755
--- a/configure
+++ b/configure
@@ -93,6 +93,7 @@ _flac=auto
_mad=auto
_alsa=auto
_seq_midi=auto
+_sndio=auto
_timidity=auto
_zlib=auto
_sparkle=auto
@@ -852,6 +853,9 @@ Optional Libraries:
--with-libunity-prefix=DIR Prefix where libunity is installed (optional)
--disable-libunity disable Unity launcher integration [autodetect]
+ --with-sndio-prefix=DIR Prefix where sndio is installed (optional)
+ --disable-sndio disable sndio MIDI driver [autodetect]
+
Some influential environment variables:
LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
nonstandard directory <lib dir>
@@ -877,6 +881,8 @@ for ac_option in $@; do
--disable-alsa) _alsa=no ;;
--enable-seq-midi) _seq_midi=yes ;;
--disable-seq-midi) _seq_midi=no ;;
+ --enable-sndio) _sndio=yes ;;
+ --disable-sndio) _sndio=no ;;
--enable-timidity) _timidity=yes ;;
--disable-timidity) _timidity=no ;;
--enable-vorbis) _vorbis=yes ;;
@@ -937,6 +943,11 @@ for ac_option in $@; do
ALSA_CFLAGS="-I$arg/include"
ALSA_LIBS="-L$arg/lib"
;;
+ --with-sndio-prefix=*)
+ arg=`echo $ac_option | cut -d '=' -f 2`
+ SNDIO_CFLAGS="-I$arg/include"
+ SNDIO_LIBS="-L$arg/lib"
+ ;;
--with-ogg-prefix=*)
arg=`echo $ac_option | cut -d '=' -f 2`
OGG_CFLAGS="-I$arg/include"
@@ -3258,6 +3269,25 @@ define_in_config_h_if_yes "$_seq_midi" 'USE_SEQ_MIDI'
echo "$_seq_midi"
#
+# Check for sndio
+#
+echocheck "sndio"
+if test "$_sndio" = auto ; then
+ _sndio=no
+ cat > $TMPC << EOF
+#include <sndio.h>
+int main(void) { struct sio_par par; sio_initpar(&par); return 0; }
+EOF
+ cc_check $SNDIO_CFLAGS $SNDIO_LIBS -lsndio && _sndio=yes
+fi
+if test "$_sndio" = yes ; then
+ LIBS="$LIBS $SNDIO_LIBS -lsndio"
+ INCLUDES="$INCLUDES $SNDIO_CFLAGS"
+fi
+define_in_config_h_if_yes "$_sndio" 'USE_SNDIO'
+echo "$_sndio"
+
+#
# Check for TiMidity(++)
#
echocheck "TiMidity"
diff --git a/devtools/create_project/msbuild.cpp b/devtools/create_project/msbuild.cpp
index f8768ecc73..dfd3f1d1c7 100644
--- a/devtools/create_project/msbuild.cpp
+++ b/devtools/create_project/msbuild.cpp
@@ -235,7 +235,7 @@ void MSBuildProvider::outputProjectSettings(std::ofstream &project, const std::s
std::map<std::string, StringList>::iterator warningsIterator = _projectWarnings.find(name);
// Nothing to add here, move along!
- if (!setup.devTools && name != setup.projectName && name != "sword25" && name != "tinsel" && name != "grim" && warningsIterator == _projectWarnings.end())
+ if (!setup.devTools && name != setup.projectName && name != "sword25" && name != "scummvm" && name != "grim" && warningsIterator == _projectWarnings.end())
return;
std::string warnings = "";
@@ -250,7 +250,7 @@ void MSBuildProvider::outputProjectSettings(std::ofstream &project, const std::s
if (setup.devTools || name == setup.projectName || name == "sword25" || name == "grim") {
project << "\t\t\t<DisableLanguageExtensions>false</DisableLanguageExtensions>\n";
} else {
- if (name == "tinsel" && !isRelease)
+ if (name == "scummvm" && !isRelease)
project << "\t\t\t<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\n";
if (warningsIterator != _projectWarnings.end())
diff --git a/devtools/create_project/visualstudio.cpp b/devtools/create_project/visualstudio.cpp
index a0fd239db4..62b30ddcd0 100644
--- a/devtools/create_project/visualstudio.cpp
+++ b/devtools/create_project/visualstudio.cpp
@@ -110,7 +110,7 @@ void VisualStudioProvider::createProjectFile(const std::string &name, const std:
std::string toolConfig;
toolConfig = (!warnings.empty() ? "DisableSpecificWarnings=\"" + warnings + "\"" : "");
- toolConfig += (name == "tinsel" ? "DebugInformationFormat=\"3\" " : "");
+ toolConfig += (name == "scummvm" ? "DebugInformationFormat=\"3\" " : "");
toolConfig += (name == "sword25" ? "DisableLanguageExtensions=\"false\" " : "");
toolConfig += (name == "grim" ? "DisableLanguageExtensions=\"false\" " : "");
@@ -144,7 +144,7 @@ void VisualStudioProvider::createProjectFile(const std::string &name, const std:
void VisualStudioProvider::outputConfiguration(std::ostream &project, const BuildSetup &setup, const std::string &libraries, const std::string &config, const std::string &platform, const std::string &props, const bool isWin32) {
project << "\t\t<Configuration Name=\"" << config << "|" << platform << "\" ConfigurationType=\"1\" InheritedPropertySheets=\".\\" << setup.projectDescription << "_" << config << props << ".vsprops\">\n"
- "\t\t\t<Tool\tName=\"VCCLCompilerTool\" DisableLanguageExtensions=\"false\" />\n"
+ "\t\t\t<Tool\tName=\"VCCLCompilerTool\" DisableLanguageExtensions=\"false\" DebugInformationFormat=\"3\" />\n"
"\t\t\t<Tool\tName=\"VCLinkerTool\" OutputFile=\"$(OutDir)/" << setup.projectName << ".exe\"\n"
"\t\t\t\tAdditionalDependencies=\"" << libraries << "\"\n"
"\t\t\t/>\n";
diff --git a/engines/cruise/cruise.cpp b/engines/cruise/cruise.cpp
index cf01d9bdbc..2147419886 100644
--- a/engines/cruise/cruise.cpp
+++ b/engines/cruise/cruise.cpp
@@ -169,6 +169,9 @@ bool CruiseEngine::loadLanguageStrings() {
case Common::DE_DEU:
p = germanLanguageStrings;
break;
+ case Common::IT_ITA:
+ p = italianLanguageStrings;
+ break;
default:
return false;
}
diff --git a/engines/cruise/detection.cpp b/engines/cruise/detection.cpp
index eb7c1c524f..b2e267ca49 100644
--- a/engines/cruise/detection.cpp
+++ b/engines/cruise/detection.cpp
@@ -171,6 +171,19 @@ static const CRUISEGameDescription gameDescriptions[] = {
GType_CRUISE,
0,
},
+ { // Amiga Italian US GOLD edition.
+ {
+ "cruise",
+ 0,
+ AD_ENTRY1("D1", "a0011075413b7335e003e8e3c9cf51b9"),
+ Common::IT_ITA,
+ Common::kPlatformAmiga,
+ ADGF_NO_FLAGS,
+ GUIO0()
+ },
+ GType_CRUISE,
+ 0,
+ },
{ // AtariST English KixxXL edition.
{
"cruise",
diff --git a/engines/cruise/staticres.cpp b/engines/cruise/staticres.cpp
index 1565f254d0..a3fc4f884b 100644
--- a/engines/cruise/staticres.cpp
+++ b/engines/cruise/staticres.cpp
@@ -320,5 +320,9 @@ const char *germanLanguageStrings[13] = {
" ", NULL, NULL, NULL, NULL, "Inventar", "Sprechen ""\xFC""ber", "Speilermen\xFC", "Speicherlaufwerk",
"Speichern", "Laden", "Neu beginnen", "Ende"
};
+const char *italianLanguageStrings[13] = {
+ "Pausa", NULL, NULL, NULL, NULL, "Inventario", "Parla di...", "Menu giocatore", NULL,
+ "Salva", "Carica", "Ricomincia", "Esci"
+};
} // End of namespace Cruise
diff --git a/engines/cruise/staticres.h b/engines/cruise/staticres.h
index a3cf13e41c..acf0b640be 100644
--- a/engines/cruise/staticres.h
+++ b/engines/cruise/staticres.h
@@ -57,6 +57,7 @@ extern const byte mouseCursorMagnifyingGlass[];
extern const char *englishLanguageStrings[13];
extern const char *frenchLanguageStrings[13];
extern const char *germanLanguageStrings[13];
+extern const char *italianLanguageStrings[13];
} // End of namespace Cruise
diff --git a/engines/dreamweb/detection_tables.h b/engines/dreamweb/detection_tables.h
index d54b2402c8..063aabbd89 100644
--- a/engines/dreamweb/detection_tables.h
+++ b/engines/dreamweb/detection_tables.h
@@ -41,6 +41,7 @@ static const DreamWebGameDescription gameDescriptions[] = {
{
{"dreamweb.r00", 0, "3b5c87717fc40cc5a5ae19c155662ee3", 152918},
{"dreamweb.r02", 0, "28458718167a040d7e988cf7d2298eae", 210466},
+ {"dreamweb.exe", 0, "56b1d73aa56e964b45872ff552402341", 64985},
AD_LISTEND
},
Common::EN_ANY,
@@ -67,6 +68,27 @@ static const DreamWebGameDescription gameDescriptions[] = {
},
},
+ // UK-V (Early UK) CD Release - From bug #3526483
+ // Note: r00 and r02 files are identical to international floppy release
+ // so was misidentified as floppy, resulting in disabled CD speech.
+ // Added executable to detection to avoid this.
+ {
+ {
+ "dreamweb",
+ "CD",
+ {
+ {"dreamweb.r00", 0, "3b5c87717fc40cc5a5ae19c155662ee3", 152918},
+ {"dreamweb.r02", 0, "28458718167a040d7e988cf7d2298eae", 210466},
+ {"dreamweb.exe", 0, "dd1c7793b151489e67b83cd1ecab51cd", -1},
+ AD_LISTEND
+ },
+ Common::EN_GRB,
+ Common::kPlatformPC,
+ ADGF_CD | ADGF_TESTING,
+ GUIO2(GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_BRIGHTPALETTE)
+ },
+ },
+
// US CD release
{
{
@@ -79,7 +101,7 @@ static const DreamWebGameDescription gameDescriptions[] = {
},
Common::EN_USA,
Common::kPlatformPC,
- ADGF_CD,
+ ADGF_CD | ADGF_TESTING,
GUIO2(GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_BRIGHTPALETTE)
},
},
@@ -101,6 +123,24 @@ static const DreamWebGameDescription gameDescriptions[] = {
},
},
+ // French CD release
+ // From bug #3524362
+ {
+ {
+ "dreamweb",
+ "CD",
+ {
+ {"dreamwfr.r00", 0, "e354582a8564faf5c515df92f207e8d1", 154657},
+ {"dreamwfr.r02", 0, "cb99f08d5aefd04184eac76927eced80", 200575},
+ AD_LISTEND
+ },
+ Common::FR_FRA,
+ Common::kPlatformPC,
+ ADGF_CD | ADGF_TESTING,
+ GUIO2(GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_BRIGHTPALETTE)
+ },
+ },
+
// German floppy release
{
{
@@ -169,6 +209,24 @@ static const DreamWebGameDescription gameDescriptions[] = {
},
},
+ // Spanish CD release
+ // From bug #3524362
+ {
+ {
+ "dreamweb",
+ "CD",
+ {
+ {"dreamwsp.r00", 0, "2df07174321de39c4f17c9ff654b268a", 153608},
+ {"dreamwsp.r02", 0, "f97d435ad5da08fb1bcf6ea3dd6e0b9e", 199499},
+ AD_LISTEND
+ },
+ Common::ES_ESP,
+ Common::kPlatformPC,
+ ADGF_CD | ADGF_TESTING,
+ GUIO2(GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_BRIGHTPALETTE)
+ },
+ },
+
// Italian floppy release
{
{
diff --git a/engines/dreamweb/dreamweb.cpp b/engines/dreamweb/dreamweb.cpp
index 299dd74b53..11e8e3f8cc 100644
--- a/engines/dreamweb/dreamweb.cpp
+++ b/engines/dreamweb/dreamweb.cpp
@@ -63,14 +63,18 @@ DreamWebEngine::DreamWebEngine(OSystem *syst, const DreamWebGameDescription *gam
_channel1 = 0;
_datafilePrefix = "DREAMWEB.";
+ _speechDirName = "SPEECH";
// ES and FR CD release use a different data file prefix
+ // and speech directory naming.
if (isCD()) {
switch(getLanguage()) {
case Common::ES_ESP:
_datafilePrefix = "DREAMWSP.";
+ _speechDirName = "SPANISH";
break;
case Common::FR_FRA:
_datafilePrefix = "DREAMWFR.";
+ _speechDirName = "FRENCH";
break;
default:
// Nothing to do
@@ -381,7 +385,7 @@ Common::Error DreamWebEngine::run() {
ConfMan.registerDefault("originalsaveload", "false");
ConfMan.registerDefault("bright_palette", true);
- _hasSpeech = Common::File::exists("speech/r01c0000.raw") && !ConfMan.getBool("speech_mute");
+ _hasSpeech = Common::File::exists(_speechDirName + "/r01c0000.raw") && !ConfMan.getBool("speech_mute");
_brightPalette = ConfMan.getBool("bright_palette");
_timer->installTimerProc(vSyncInterrupt, 1000000 / 70, this, "dreamwebVSync");
diff --git a/engines/dreamweb/dreamweb.h b/engines/dreamweb/dreamweb.h
index 4065e5a860..6744b53ebc 100644
--- a/engines/dreamweb/dreamweb.h
+++ b/engines/dreamweb/dreamweb.h
@@ -164,6 +164,7 @@ private:
const DreamWebGameDescription *_gameDescription;
Common::RandomSource _rnd;
Common::String _datafilePrefix;
+ Common::String _speechDirName;
uint _speed;
bool _turbo;
diff --git a/engines/dreamweb/monitor.cpp b/engines/dreamweb/monitor.cpp
index 95aa400c3a..25435ae0e9 100644
--- a/engines/dreamweb/monitor.cpp
+++ b/engines/dreamweb/monitor.cpp
@@ -626,15 +626,12 @@ void DreamWebEngine::signOn() {
_monAdX = prevX;
_monAdY = prevY;
- inputLine = (const char *)_inputLine;
- inputLine.toUppercase();
-
// The entered line has zeroes in-between each character
uint32 len = strlen(monitorKeyEntries[foundIndex].password);
bool found = true;
for (uint32 i = 0; i < len; i++) {
- if (monitorKeyEntries[foundIndex].password[i] != inputLine[i * 2]) {
+ if (monitorKeyEntries[foundIndex].password[i] != _inputLine[i * 2]) {
found = false;
break;
}
diff --git a/engines/dreamweb/saveload.cpp b/engines/dreamweb/saveload.cpp
index 5d7f02c5cf..d30bf754de 100644
--- a/engines/dreamweb/saveload.cpp
+++ b/engines/dreamweb/saveload.cpp
@@ -839,8 +839,9 @@ void DreamWebEngine::showOpBox() {
// This call displays half of the ops dialog in the CD version. It's not
// in the floppy version, and if it's called, a stray red dot is shown in
- // the game dialogs.
- if (isCD())
+ // the game dialogs. It is included in the early UK CD release, which had
+ // similar data files as the floppy release (bug #3528160).
+ if (isCD() && getLanguage() != Common::EN_GRB)
showFrame(_saveGraphics, kOpsx, kOpsy + 55, 4, 0);
}
diff --git a/engines/dreamweb/sound.cpp b/engines/dreamweb/sound.cpp
index b51527a8cd..b3d5db9e0d 100644
--- a/engines/dreamweb/sound.cpp
+++ b/engines/dreamweb/sound.cpp
@@ -55,6 +55,7 @@ void DreamWebEngine::volumeAdjust() {
}
void DreamWebEngine::playChannel0(uint8 index, uint8 repeat) {
+ debug(1, "playChannel0(index:%d, repeat:%d)", index, repeat);
_channel0Playing = index;
if (index >= 12)
index -= 12;
@@ -72,6 +73,7 @@ void DreamWebEngine::playChannel1(uint8 index) {
}
void DreamWebEngine::cancelCh0() {
+ debug(1, "cancelCh0()");
_channel0Repeat = 0;
_channel0Playing = 255;
stopSound(0);
@@ -83,6 +85,7 @@ void DreamWebEngine::cancelCh1() {
}
void DreamWebEngine::loadRoomsSample() {
+ debug(1, "loadRoomsSample() _roomsSample:%d", _roomsSample);
uint8 sample = _roomsSample;
if (sample == 255 || _currentSample == sample)
@@ -177,7 +180,7 @@ bool DreamWebEngine::loadSpeech(const Common::String &filename) {
return false;
Common::File file;
- if (!file.open("speech/" + filename))
+ if (!file.open(_speechDirName + "/" + filename))
return false;
debug(1, "loadSpeech(%s)", filename.c_str());
@@ -190,6 +193,11 @@ bool DreamWebEngine::loadSpeech(const Common::String &filename) {
}
void DreamWebEngine::soundHandler() {
+ static uint8 volumeOld = 0, channel0Old = 0, channel0PlayingOld = 0;
+ if (_volume != volumeOld || _channel0 != channel0Old || _channel0Playing != channel0PlayingOld)
+ debug(1, "soundHandler() _volume: %d _channel0: %d _channel0Playing: %d", _volume, _channel0, _channel0Playing);
+ volumeOld = _volume, channel0Old = _channel0, channel0PlayingOld = _channel0Playing;
+
_subtitles = ConfMan.getBool("subtitles");
volumeAdjust();
@@ -230,6 +238,8 @@ void DreamWebEngine::soundHandler() {
}
}
if (!_mixer->isSoundHandleActive(_channelHandle[0])) {
+ if (_channel0Playing != 255 && _channel0 != 0)
+ debug(1, "!_mixer->isSoundHandleActive _channelHandle[0] _channel0Playing:%d _channel0:%d", _channel0Playing, _channel0);
_channel0Playing = 255;
_channel0 = 0;
}
@@ -237,7 +247,6 @@ void DreamWebEngine::soundHandler() {
_channel1Playing = 255;
_channel1 = 0;
}
-
}
void DreamWebEngine::loadSounds(uint bank, const Common::String &suffix) {
diff --git a/engines/kyra/items_lol.cpp b/engines/kyra/items_lol.cpp
index ea2acaf64d..409b53f6f0 100644
--- a/engines/kyra/items_lol.cpp
+++ b/engines/kyra/items_lol.cpp
@@ -441,20 +441,20 @@ bool LoLEngine::launchObject(int objectType, Item item, int startX, int startY,
return true;
}
-void LoLEngine::endObjectFlight(FlyingObject *t, int x, int y, int collisionObject) {
+void LoLEngine::endObjectFlight(FlyingObject *t, int x, int y, int collisionType) {
int cx = x;
int cy = y;
uint16 block = calcBlockIndex(t->x, t->y);
removeAssignedObjectFromBlock(&_levelBlockProperties[block], t->item);
removeDrawObjectFromBlock(&_levelBlockProperties[block], t->item);
- if (collisionObject == 1) {
+ if (collisionType == 1) {
cx = t->x;
cy = t->y;
}
if (t->objectType == 0 || t->objectType == 1) {
- objectFlightProcessHits(t, cx, cy, collisionObject);
+ objectFlightProcessHits(t, cx, cy, collisionType);
t->x = (cx & 0xffc0) | 0x40;
t->y = (cy & 0xffc0) | 0x40;
t->flyingHeight = 0;
@@ -488,27 +488,23 @@ void LoLEngine::updateObjectFlightPosition(FlyingObject *t) {
}
}
-void LoLEngine::objectFlightProcessHits(FlyingObject *t, int x, int y, int objectOnNextBlock) {
- uint16 r = 0;
-
- if (objectOnNextBlock == 1) {
+void LoLEngine::objectFlightProcessHits(FlyingObject *t, int x, int y, int collisionType) {
+ if (collisionType == 1) {
runLevelScriptCustom(calcNewBlockPosition(_itemsInPlay[t->item].block, t->direction >> 1), 0x8000, -1, t->item, 0, 0);
- } else if (objectOnNextBlock == 2) {
+ } else if (collisionType == 2) {
if (_itemProperties[_itemsInPlay[t->item].itemPropertyIndex].flags & 0x4000) {
- int o = _levelBlockProperties[_itemsInPlay[t->item].block].assignedObjects;
- while (o & 0x8000) {
- LoLObject *i = findObject(o);
- o = i->nextAssignedObject;
- runItemScript(t->attackerId, t->item, 0x8000, o, 0);
+ uint16 obj = _levelBlockProperties[_itemsInPlay[t->item].block].assignedObjects;
+ while (obj & 0x8000) {
+ runItemScript(t->attackerId, t->item, 0x8000, obj, 0);
+ obj = findObject(obj)->nextAssignedObject;
}
} else {
- r = getNearestMonsterFromPos(x, y);
- runItemScript(t->attackerId, t->item, 0x8000, r, 0);
+ runItemScript(t->attackerId, t->item, 0x8000, getNearestMonsterFromPos(x, y), 0);
}
- } else if (objectOnNextBlock == 4) {
+ } else if (collisionType == 4) {
_partyAwake = true;
if (_itemProperties[_itemsInPlay[t->item].itemPropertyIndex].flags & 0x4000) {
for (int i = 0; i < 4; i++) {
@@ -516,8 +512,7 @@ void LoLEngine::objectFlightProcessHits(FlyingObject *t, int x, int y, int objec
runItemScript(t->attackerId, t->item, 0x8000, i, 0);
}
} else {
- r = getNearestPartyMemberFromPos(x, y);
- runItemScript(t->attackerId, t->item, 0x8000, r, 0);
+ runItemScript(t->attackerId, t->item, 0x8000, getNearestPartyMemberFromPos(x, y), 0);
}
}
}
@@ -543,9 +538,9 @@ void LoLEngine::updateFlyingObject(FlyingObject *t) {
middle of a block (or making the monsters align to the middle before casting them) wouldn't help here
(and wouldn't be faithful to the original either).
*/
- int objectOnNextBlock = checkBlockBeforeObjectPlacement(x, y, /*_itemProperties[_itemsInPlay[t->item].itemPropertyIndex].flags & 0x4000 ? 256 :*/ 63, t->flags, t->wallFlags);
- if (objectOnNextBlock) {
- endObjectFlight(t, x, y, objectOnNextBlock);
+ int collisionType = checkBlockBeforeObjectPlacement(x, y, /*_itemProperties[_itemsInPlay[t->item].itemPropertyIndex].flags & 0x4000 ? 256 :*/ 63, t->flags, t->wallFlags);
+ if (collisionType) {
+ endObjectFlight(t, x, y, collisionType);
} else {
if (--t->distance) {
processObjectFlight(t, x, y);
@@ -567,16 +562,16 @@ void LoLEngine::assignItemToBlock(uint16 *assignedBlockObjects, int id) {
*assignedBlockObjects = id;
}
-int LoLEngine::checkDrawObjectSpace(int itemX, int itemY, int partyX, int partyY) {
- int a = itemX - partyX;
- if (a < 0)
- a = -a;
+int LoLEngine::checkDrawObjectSpace(int x1, int y1, int x2, int y2) {
+ int dx = x1 - x2;
+ if (dx < 0)
+ dx = -dx;
- int b = itemY - partyY;
- if (b < 0)
- b = -b;
+ int dy = y1 - y2;
+ if (dy < 0)
+ dy = -dy;
- return a + b;
+ return dx + dy;
}
int LoLEngine::checkSceneForItems(uint16 *blockDrawObjects, int color) {
diff --git a/engines/kyra/lol.cpp b/engines/kyra/lol.cpp
index 38e9d33259..d3028c5e2d 100644
--- a/engines/kyra/lol.cpp
+++ b/engines/kyra/lol.cpp
@@ -1436,7 +1436,7 @@ void LoLEngine::increaseExperience(int charNum, int skill, uint32 points) {
bool loop = true;
while (loop) {
- if (_characters[charNum].experiencePts[skill] <= _expRequirements[_characters[charNum].skillLevels[skill]])
+ if (_characters[charNum].experiencePts[skill] < _expRequirements[_characters[charNum].skillLevels[skill]])
break;
_characters[charNum].skillLevels[skill]++;
@@ -2894,11 +2894,11 @@ int LoLEngine::processMagicVaelansCube() {
uint8 s = _levelBlockProperties[bl].walls[_currentDirection ^ 2];
uint8 flg = _wllWallFlags[s];
- int v = (s == 47 && (_currentLevel == 17 || _currentLevel == 24)) ? 1 : 0;
- if ((_wllVmpMap[s] == 1 || _wllVmpMap[s] == 2) && (flg & 1) && (_currentLevel == 22)) {
+ int res = (s == 47 && (_currentLevel == 17 || _currentLevel == 24)) ? 1 : 0;
+ if ((_wllVmpMap[s] == 1 || _wllVmpMap[s] == 2) && (!(flg & 1)) && (_currentLevel != 22)) {
memset(_levelBlockProperties[bl].walls, 0, 4);
gui_drawScene(0);
- v = 1;
+ res = 1;
}
uint16 o = _levelBlockProperties[bl].assignedObjects;
@@ -2906,7 +2906,7 @@ int LoLEngine::processMagicVaelansCube() {
LoLMonster *m = &_monsters[o & 0x7fff];
if (m->properties->flags & 0x1000) {
inflictDamage(o, 100, 0xffff, 0, 0x80);
- v = 1;
+ res = 1;
}
o = m->nextAssignedObject;
}
@@ -2922,7 +2922,7 @@ int LoLEngine::processMagicVaelansCube() {
delete[] tmpPal1;
delete[] tmpPal2;
- return v;
+ return res;
}
int LoLEngine::processMagicGuardian(int charNum) {
diff --git a/engines/kyra/lol.h b/engines/kyra/lol.h
index dbd461267f..dcd13804b3 100644
--- a/engines/kyra/lol.h
+++ b/engines/kyra/lol.h
@@ -1047,14 +1047,14 @@ private:
void setItemPosition(Item item, uint16 x, uint16 y, int flyingHeight, int moveable);
void removeLevelItem(Item item, int block);
bool launchObject(int objectType, Item item, int startX, int startY, int flyingHeight, int direction, int, int attackerId, int c);
- void endObjectFlight(FlyingObject *t, int x, int y, int collisionObject);
+ void endObjectFlight(FlyingObject *t, int x, int y, int collisionType);
void processObjectFlight(FlyingObject *t, int x, int y);
void updateObjectFlightPosition(FlyingObject *t);
- void objectFlightProcessHits(FlyingObject *t, int x, int y, int objectOnNextBlock);
+ void objectFlightProcessHits(FlyingObject *t, int x, int y, int collisionType);
void updateFlyingObject(FlyingObject *t);
void assignItemToBlock(uint16 *assignedBlockObjects, int id);
- int checkDrawObjectSpace(int itemX, int itemY, int partyX, int partyY);
+ int checkDrawObjectSpace(int x1, int y1, int x2, int y2);
int checkSceneForItems(uint16 *blockDrawObjects, int color);
uint8 _moneyColumnHeight[5];
@@ -1095,7 +1095,7 @@ private:
void monsterDropItems(LoLMonster *monster);
void giveItemToMonster(LoLMonster *monster, Item item);
int checkBlockBeforeObjectPlacement(uint16 x, uint16 y, uint16 objectWidth, uint16 testFlag, uint16 wallFlag);
- int checkBlockForWallsAndSufficientSpace(int block, int x, int y, int objectWidth, int testFlag, int wallFlag);
+ int testBlockPassability(int block, int x, int y, int objectWidth, int testFlag, int wallFlag);
int calcMonsterSkillLevel(int id, int a);
int checkBlockOccupiedByParty(int x, int y, int testFlag);
const uint16 *getCharacterOrMonsterStats(int id);
@@ -1122,7 +1122,7 @@ private:
int checkForPossibleDistanceAttack(uint16 monsterBlock, int direction, int distance, uint16 curBlock);
int walkMonsterCheckDest(int x, int y, LoLMonster *monster, int unk);
void getNextStepCoords(int16 monsterX, int16 monsterY, int &newX, int &newY, uint16 direction);
- void rearrangeAttackingMonster(LoLMonster *monster);
+ void alignMonsterToParty(LoLMonster *monster);
void moveStrayingMonster(LoLMonster *monster);
void killMonster(LoLMonster *monster);
diff --git a/engines/kyra/script_lol.cpp b/engines/kyra/script_lol.cpp
index c5d1d49030..9c0fe21ad4 100644
--- a/engines/kyra/script_lol.cpp
+++ b/engines/kyra/script_lol.cpp
@@ -958,10 +958,9 @@ int LoLEngine::olol_loadMonsterProperties(EMCState *script) {
l->hitPoints = stackPos(26);
l->speedTotalWaitTicks = 1;
l->flags = stackPos(27);
- l->unk5 = stackPos(28);
- // FIXME???
+ // This is what the original does here (setting the value first to stackPos(28) and then to stackPos(29):
+ //l->unk5 = stackPos(28);
l->unk5 = stackPos(29);
- //
l->numDistAttacks = stackPos(30);
l->numDistWeapons = stackPos(31);
diff --git a/engines/kyra/sprites_lol.cpp b/engines/kyra/sprites_lol.cpp
index a07abd4580..f4bae113c5 100644
--- a/engines/kyra/sprites_lol.cpp
+++ b/engines/kyra/sprites_lol.cpp
@@ -355,7 +355,7 @@ int LoLEngine::checkBlockBeforeObjectPlacement(uint16 x, uint16 y, uint16 object
int yOffs = 0;
int flag = 0;
- int r = checkBlockForWallsAndSufficientSpace(calcBlockIndex(x, y), x, y, objectWidth, testFlag, wallFlag);
+ int r = testBlockPassability(calcBlockIndex(x, y), x, y, objectWidth, testFlag, wallFlag);
if (r)
return r;
@@ -369,7 +369,7 @@ int LoLEngine::checkBlockBeforeObjectPlacement(uint16 x, uint16 y, uint16 object
_objectLastDirection = 2;
x2 = x + objectWidth;
- r = checkBlockForWallsAndSufficientSpace(calcBlockIndex(x2, y), x, y, objectWidth, testFlag, wallFlag);
+ r = testBlockPassability(calcBlockIndex(x2, y), x, y, objectWidth, testFlag, wallFlag);
if (r)
return r;
@@ -385,7 +385,7 @@ int LoLEngine::checkBlockBeforeObjectPlacement(uint16 x, uint16 y, uint16 object
_objectLastDirection = 6;
x2 = x - objectWidth;
- r = checkBlockForWallsAndSufficientSpace(calcBlockIndex(x2, y), x, y, objectWidth, testFlag, wallFlag);
+ r = testBlockPassability(calcBlockIndex(x2, y), x, y, objectWidth, testFlag, wallFlag);
if (r)
return r;
@@ -403,7 +403,7 @@ int LoLEngine::checkBlockBeforeObjectPlacement(uint16 x, uint16 y, uint16 object
_objectLastDirection = 4;
y2 = y + objectWidth;
- r = checkBlockForWallsAndSufficientSpace(calcBlockIndex(x, y2), x, y, objectWidth, testFlag, wallFlag);
+ r = testBlockPassability(calcBlockIndex(x, y2), x, y, objectWidth, testFlag, wallFlag);
if (r)
return r;
@@ -420,7 +420,7 @@ int LoLEngine::checkBlockBeforeObjectPlacement(uint16 x, uint16 y, uint16 object
_objectLastDirection = 0;
y2 = y - objectWidth;
- r = checkBlockForWallsAndSufficientSpace(calcBlockIndex(x, y2), x, y, objectWidth, testFlag, wallFlag);
+ r = testBlockPassability(calcBlockIndex(x, y2), x, y, objectWidth, testFlag, wallFlag);
if (r)
return r;
@@ -436,7 +436,7 @@ int LoLEngine::checkBlockBeforeObjectPlacement(uint16 x, uint16 y, uint16 object
if (!flag)
return 0;
- r = checkBlockForWallsAndSufficientSpace(calcBlockIndex(x2, y2), x, y, objectWidth, testFlag, wallFlag);
+ r = testBlockPassability(calcBlockIndex(x2, y2), x, y, objectWidth, testFlag, wallFlag);
if (r)
return r;
@@ -447,7 +447,7 @@ int LoLEngine::checkBlockBeforeObjectPlacement(uint16 x, uint16 y, uint16 object
return 0;
}
-int LoLEngine::checkBlockForWallsAndSufficientSpace(int block, int x, int y, int objectWidth, int testFlag, int wallFlag) {
+int LoLEngine::testBlockPassability(int block, int x, int y, int objectWidth, int testFlag, int wallFlag) {
if (block == _currentBlock)
testFlag &= 0xfffe;
@@ -461,9 +461,9 @@ int LoLEngine::checkBlockForWallsAndSufficientSpace(int block, int x, int y, int
if (!(testFlag & 2))
return 0;
- uint16 b = _levelBlockProperties[block].assignedObjects;
- while (b & 0x8000) {
- LoLMonster *monster = &_monsters[b & 0x7fff];
+ uint16 obj = _levelBlockProperties[block].assignedObjects;
+ while (obj & 0x8000) {
+ LoLMonster *monster = &_monsters[obj & 0x7fff];
if (monster->mode < 13) {
int r = checkDrawObjectSpace(x, y, monster->x, monster->y);
@@ -471,7 +471,7 @@ int LoLEngine::checkBlockForWallsAndSufficientSpace(int block, int x, int y, int
return 2;
}
- b = findObject(b)->nextAssignedObject;
+ obj = findObject(obj)->nextAssignedObject;
}
return 0;
@@ -1105,7 +1105,7 @@ void LoLEngine::updateMonster(LoLMonster *monster) {
if ((monster->fightCurTick <= 0) || (checkDrawObjectSpace(_partyPosX, _partyPosY, monster->x, monster->y) > 256) || (monster->flags & 8))
setMonsterMode(monster, 7);
else
- rearrangeAttackingMonster(monster);
+ alignMonsterToParty(monster);
break;
case 6:
@@ -1428,26 +1428,26 @@ int LoLEngine::walkMonsterCheckDest(int x, int y, LoLMonster *monster, int unk)
uint8 m = monster->mode;
monster->mode = 15;
- int res = checkBlockBeforeObjectPlacement(x, y, monster->properties->maxWidth, 7, monster->properties->flags & 0x1000 ? 32 : unk);
+ int objType = checkBlockBeforeObjectPlacement(x, y, monster->properties->maxWidth, 7, monster->properties->flags & 0x1000 ? 32 : unk);
monster->mode = m;
- return res;
+ return objType;
}
void LoLEngine::getNextStepCoords(int16 srcX, int16 srcY, int &newX, int &newY, uint16 direction) {
- static const int8 shiftTableX[] = { 0, 32, 32, 32, 0, -32, -32, -32 };
- static const int8 shiftTableY[] = { -32, -32, 0, 32, 32, 32, 0, -32 };
+ static const int8 stepAdjustX[] = { 0, 32, 32, 32, 0, -32, -32, -32 };
+ static const int8 stepAdjustY[] = { -32, -32, 0, 32, 32, 32, 0, -32 };
- newX = (srcX + shiftTableX[direction]) & 0x1fff;
- newY = (srcY + shiftTableY[direction]) & 0x1fff;
+ newX = (srcX + stepAdjustX[direction]) & 0x1fff;
+ newY = (srcY + stepAdjustY[direction]) & 0x1fff;
}
-void LoLEngine::rearrangeAttackingMonster(LoLMonster *monster) {
- int t = (monster->direction >> 1);
+void LoLEngine::alignMonsterToParty(LoLMonster *monster) {
+ uint8 mdir = monster->direction >> 1;
uint16 mx = monster->x;
uint16 my = monster->y;
- uint16 *c = (t & 1) ? &my : &mx;
- bool centered = (*c & 0x7f) == 0;
+ uint16 *pos = (mdir & 1) ? &my : &mx;
+ bool centered = (*pos & 0x7f) == 0;
bool posFlag = true;
if (monster->properties->maxWidth <= 63) {
@@ -1464,11 +1464,13 @@ void LoLEngine::rearrangeAttackingMonster(LoLMonster *monster) {
r = true;
} else {
for (int i = 0; i < 3; i++) {
- t = (t + 1) & 3;
- id = _levelBlockProperties[calcNewBlockPosition(monster->block, t)].assignedObjects;
+ mdir = (mdir + 1) & 3;
+ id = _levelBlockProperties[calcNewBlockPosition(monster->block, mdir)].assignedObjects;
id = (id & 0x8000) ? (id & 0x7fff) : 0xffff;
- if (id != 0xffff)
+ if (id != 0xffff) {
r = true;
+ break;
+ }
}
}
}
@@ -1484,15 +1486,15 @@ void LoLEngine::rearrangeAttackingMonster(LoLMonster *monster) {
return;
if (posFlag) {
- if (*c & 0x80)
- *c -= 32;
+ if (*pos & 0x80)
+ *pos -= 32;
else
- *c += 32;
+ *pos += 32;
} else {
- if (*c & 0x80)
- *c += 32;
+ if (*pos & 0x80)
+ *pos += 32;
else
- *c -= 32;
+ *pos -= 32;
}
if (walkMonsterCheckDest(mx, my, monster, 4))
@@ -1502,8 +1504,10 @@ void LoLEngine::rearrangeAttackingMonster(LoLMonster *monster) {
int fy = _partyPosY;
calcSpriteRelPosition(mx, my, fx, fy, monster->direction >> 1);
- t = (fx < 0) ? -fx : fx;
- if (fy > 160 || t > 80)
+ if (fx < 0)
+ fx = -fx;
+
+ if (fy > 160 || fx > 80)
return;
placeMonster(monster, mx, my);
diff --git a/engines/mohawk/cursors.cpp b/engines/mohawk/cursors.cpp
index 8c72c9875e..3cf5ac740e 100644
--- a/engines/mohawk/cursors.cpp
+++ b/engines/mohawk/cursors.cpp
@@ -157,7 +157,7 @@ void NECursorManager::setCursor(uint16 id) {
Graphics::WinCursorGroup *cursorGroup = Graphics::WinCursorGroup::createCursorGroup(*_exe, id);
if (cursorGroup) {
- Graphics::WinCursor *cursor = cursorGroup->cursors[0].cursor;
+ Graphics::Cursor *cursor = cursorGroup->cursors[0].cursor;
CursorMan.replaceCursor(cursor->getSurface(), cursor->getWidth(), cursor->getHeight(), cursor->getHotspotX(), cursor->getHotspotY(), cursor->getKeyColor());
CursorMan.replaceCursorPalette(cursor->getPalette(), 0, 256);
return;
@@ -257,7 +257,7 @@ void PECursorManager::setCursor(uint16 id) {
Graphics::WinCursorGroup *cursorGroup = Graphics::WinCursorGroup::createCursorGroup(*_exe, id);
if (cursorGroup) {
- Graphics::WinCursor *cursor = cursorGroup->cursors[0].cursor;
+ Graphics::Cursor *cursor = cursorGroup->cursors[0].cursor;
CursorMan.replaceCursor(cursor->getSurface(), cursor->getWidth(), cursor->getHeight(), cursor->getHotspotX(), cursor->getHotspotY(), cursor->getKeyColor());
CursorMan.replaceCursorPalette(cursor->getPalette(), 0, 256);
delete cursorGroup;
diff --git a/engines/mohawk/myst_stacks/dni.cpp b/engines/mohawk/myst_stacks/dni.cpp
index 2ced265f02..cae165ccf0 100644
--- a/engines/mohawk/myst_stacks/dni.cpp
+++ b/engines/mohawk/myst_stacks/dni.cpp
@@ -103,7 +103,7 @@ void Dni::o_handPage(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
VideoHandle atrus = _vm->_video->findVideoHandle(_video);
// Good ending and Atrus asked to give page
- if (_globals.ending == 1 && _vm->_video->getElapsedTime(atrus) > (uint)Audio::Timestamp(0, 6801, 600).msecs()) {
+ if (_globals.ending == 1 && _vm->_video->getTime(atrus) > (uint)Audio::Timestamp(0, 6801, 600).msecs()) {
_globals.ending = 2;
_globals.heldPage = 0;
_vm->setMainCursor(kDefaultMystCursor);
diff --git a/engines/mohawk/riven.cpp b/engines/mohawk/riven.cpp
index 95a8313536..07b1b59929 100644
--- a/engines/mohawk/riven.cpp
+++ b/engines/mohawk/riven.cpp
@@ -979,7 +979,7 @@ void MohawkEngine_Riven::doVideoTimer(VideoHandle handle, bool force) {
return;
// Run the opcode if we can at this point
- if (force || _video->getElapsedTime(handle) >= _scriptMan->getStoredMovieOpcodeTime())
+ if (force || _video->getTime(handle) >= _scriptMan->getStoredMovieOpcodeTime())
_scriptMan->runStoredMovieOpcode();
}
diff --git a/engines/mohawk/riven_external.cpp b/engines/mohawk/riven_external.cpp
index 8dfc74ebf0..337a57e3e1 100644
--- a/engines/mohawk/riven_external.cpp
+++ b/engines/mohawk/riven_external.cpp
@@ -2059,7 +2059,7 @@ void RivenExternal::xbookclick(uint16 argc, uint16 *argv) {
debug(0, "\tHotspot = %d -> %d", argv[3], hotspotMap[argv[3] - 1]);
// Just let the video play while we wait until Gehn opens the trap book for us
- while (_vm->_video->getElapsedTime(video) < startTime && !_vm->shouldQuit()) {
+ while (_vm->_video->getTime(video) < startTime && !_vm->shouldQuit()) {
if (_vm->_video->updateMovies())
_vm->_system->updateScreen();
@@ -2084,7 +2084,7 @@ void RivenExternal::xbookclick(uint16 argc, uint16 *argv) {
// OK, Gehn has opened the trap book and has asked us to go in. Let's watch
// and see what the player will do...
- while (_vm->_video->getElapsedTime(video) < endTime && !_vm->shouldQuit()) {
+ while (_vm->_video->getTime(video) < endTime && !_vm->shouldQuit()) {
bool updateScreen = _vm->_video->updateMovies();
Common::Event event;
diff --git a/engines/mohawk/video.cpp b/engines/mohawk/video.cpp
index 80fa4bf9a0..83fca9ac35 100644
--- a/engines/mohawk/video.cpp
+++ b/engines/mohawk/video.cpp
@@ -49,7 +49,7 @@ void VideoEntry::clear() {
}
bool VideoEntry::endOfVideo() {
- return !video || video->endOfVideo() || video->getElapsedTime() >= (uint)end.msecs();
+ return !video || video->endOfVideo() || video->getTime() >= (uint)end.msecs();
}
VideoManager::VideoManager(MohawkEngine* vm) : _vm(vm) {
@@ -481,9 +481,9 @@ uint32 VideoManager::getFrameCount(VideoHandle handle) {
return _videoStreams[handle]->getFrameCount();
}
-uint32 VideoManager::getElapsedTime(VideoHandle handle) {
+uint32 VideoManager::getTime(VideoHandle handle) {
assert(handle != NULL_VID_HANDLE);
- return _videoStreams[handle]->getElapsedTime();
+ return _videoStreams[handle]->getTime();
}
uint32 VideoManager::getDuration(VideoHandle handle) {
diff --git a/engines/mohawk/video.h b/engines/mohawk/video.h
index 34c287497f..8736782d7a 100644
--- a/engines/mohawk/video.h
+++ b/engines/mohawk/video.h
@@ -100,7 +100,7 @@ public:
VideoHandle findVideoHandle(const Common::String &filename);
int32 getCurFrame(VideoHandle handle);
uint32 getFrameCount(VideoHandle handle);
- uint32 getElapsedTime(VideoHandle handle);
+ uint32 getTime(VideoHandle handle);
uint32 getDuration(VideoHandle videoHandle);
bool endOfVideo(VideoHandle handle);
void setVideoBounds(VideoHandle handle, Audio::Timestamp start, Audio::Timestamp end);
diff --git a/engines/pegasus/movie.cpp b/engines/pegasus/movie.cpp
index 9a13864cab..f4aa9eecee 100644
--- a/engines/pegasus/movie.cpp
+++ b/engines/pegasus/movie.cpp
@@ -198,7 +198,7 @@ void Movie::updateTime() {
uint32 startTime = _startTime * getScale() / _startScale;
uint32 stopTime = _stopTime * getScale() / _stopScale;
- uint32 actualTime = CLIP<int>(_video->getElapsedTime() * getScale() / 1000, startTime, stopTime);
+ uint32 actualTime = CLIP<int>(_video->getTime() * getScale() / 1000, startTime, stopTime);
_time = Common::Rational(actualTime, getScale());
}
}
diff --git a/engines/pegasus/pegasus.cpp b/engines/pegasus/pegasus.cpp
index 701c4161bb..1665b474ee 100644
--- a/engines/pegasus/pegasus.cpp
+++ b/engines/pegasus/pegasus.cpp
@@ -2093,7 +2093,7 @@ void PegasusEngine::doSubChase() {
if (!video->loadFile("Images/Norad Alpha/Sub Chase Movie"))
error("Failed to load sub chase");
- while (!shouldQuit() && !video->endOfVideo() && video->getElapsedTime() < endTime) {
+ while (!shouldQuit() && !video->endOfVideo() && video->getTime() < endTime) {
if (video->needsUpdate()) {
const Graphics::Surface *frame = video->decodeNextFrame();
diff --git a/engines/saga/introproc_ite.cpp b/engines/saga/introproc_ite.cpp
index 9248f2b530..484ebe1779 100644
--- a/engines/saga/introproc_ite.cpp
+++ b/engines/saga/introproc_ite.cpp
@@ -126,21 +126,25 @@ EventColumns *Scene::ITEQueueDialogue(EventColumns *eventColumns, int n_dialogue
textEntry.text = dialogue[i].i_str;
entry = _vm->_scene->_textList.addEntry(textEntry);
- // Display text
- event.type = kEvTOneshot;
- event.code = kTextEvent;
- event.op = kEventDisplay;
- event.data = entry;
- event.time = (i == 0) ? 0 : VOICE_PAD;
- eventColumns = _vm->_events->chain(eventColumns, event);
+ if (_vm->_subtitlesEnabled) {
+ // Display text
+ event.type = kEvTOneshot;
+ event.code = kTextEvent;
+ event.op = kEventDisplay;
+ event.data = entry;
+ event.time = (i == 0) ? 0 : VOICE_PAD;
+ eventColumns = _vm->_events->chain(eventColumns, event);
+ }
- // Play voice
- event.type = kEvTOneshot;
- event.code = kVoiceEvent;
- event.op = kEventPlay;
- event.param = dialogue[i].i_voice_rn;
- event.time = 0;
- _vm->_events->chain(eventColumns, event);
+ if (_vm->_voicesEnabled) {
+ // Play voice
+ event.type = kEvTOneshot;
+ event.code = kVoiceEvent;
+ event.op = kEventPlay;
+ event.param = dialogue[i].i_voice_rn;
+ event.time = 0;
+ _vm->_events->chain(eventColumns, event);
+ }
voice_len = _vm->_sndRes->getVoiceLength(dialogue[i].i_voice_rn);
if (voice_len < 0) {
diff --git a/engines/sci/console.cpp b/engines/sci/console.cpp
index 9607a8e66d..5b5301b468 100644
--- a/engines/sci/console.cpp
+++ b/engines/sci/console.cpp
@@ -53,6 +53,7 @@
#include "video/avi_decoder.h"
#include "sci/video/seq_decoder.h"
#ifdef ENABLE_SCI32
+#include "sci/graphics/frameout.h"
#include "video/coktel_decoder.h"
#include "sci/video/robot_decoder.h"
#endif
@@ -131,6 +132,10 @@ Console::Console(SciEngine *engine) : GUI::Debugger(),
DCmd_Register("al", WRAP_METHOD(Console, cmdAnimateList)); // alias
DCmd_Register("window_list", WRAP_METHOD(Console, cmdWindowList));
DCmd_Register("wl", WRAP_METHOD(Console, cmdWindowList)); // alias
+ DCmd_Register("plane_list", WRAP_METHOD(Console, cmdPlaneList));
+ DCmd_Register("pl", WRAP_METHOD(Console, cmdPlaneList)); // alias
+ DCmd_Register("plane_items", WRAP_METHOD(Console, cmdPlaneItemList));
+ DCmd_Register("pi", WRAP_METHOD(Console, cmdPlaneItemList)); // alias
DCmd_Register("saved_bits", WRAP_METHOD(Console, cmdSavedBits));
DCmd_Register("show_saved_bits", WRAP_METHOD(Console, cmdShowSavedBits));
// Segments
@@ -365,7 +370,9 @@ bool Console::cmdHelp(int argc, const char **argv) {
DebugPrintf(" pic_visualize - Enables visualization of the drawing process of EGA pictures\n");
DebugPrintf(" undither - Enable/disable undithering\n");
DebugPrintf(" play_video - Plays a SEQ, AVI, VMD, RBT or DUK video\n");
- DebugPrintf(" animate_object_list / al - Shows the current list of objects in kAnimate's draw list\n");
+ DebugPrintf(" animate_list / al - Shows the current list of objects in kAnimate's draw list (SCI0 - SCI1.1)\n");
+ DebugPrintf(" window_list / wl - Shows a list of all the windows (ports) in the draw list (SCI0 - SCI1.1)\n");
+ DebugPrintf(" plane_list / pl - Shows a list of all the planes in the draw list (SCI2+)\n");
DebugPrintf(" saved_bits - List saved bits on the hunk\n");
DebugPrintf(" show_saved_bits - Display saved bits\n");
DebugPrintf("\n");
@@ -1589,6 +1596,8 @@ bool Console::cmdAnimateList(int argc, const char **argv) {
if (_engine->_gfxAnimate) {
DebugPrintf("Animate list:\n");
_engine->_gfxAnimate->printAnimateList(this);
+ } else {
+ DebugPrintf("This SCI version does not have an animate list\n");
}
return true;
}
@@ -1597,9 +1606,52 @@ bool Console::cmdWindowList(int argc, const char **argv) {
if (_engine->_gfxPorts) {
DebugPrintf("Window list:\n");
_engine->_gfxPorts->printWindowList(this);
+ } else {
+ DebugPrintf("This SCI version does not have a list of ports\n");
}
return true;
+}
+bool Console::cmdPlaneList(int argc, const char **argv) {
+#ifdef ENABLE_SCI32
+ if (_engine->_gfxFrameout) {
+ DebugPrintf("Plane list:\n");
+ _engine->_gfxFrameout->printPlaneList(this);
+ } else {
+ DebugPrintf("This SCI version does not have a list of planes\n");
+ }
+#else
+ DebugPrintf("SCI32 isn't included in this compiled executable\n");
+#endif
+ return true;
+}
+
+bool Console::cmdPlaneItemList(int argc, const char **argv) {
+ if (argc != 2) {
+ DebugPrintf("Shows the list of items for a plane\n");
+ DebugPrintf("Usage: %s <plane address>\n", argv[0]);
+ return true;
+ }
+
+ reg_t planeObject = NULL_REG;
+
+ if (parse_reg_t(_engine->_gamestate, argv[1], &planeObject, false)) {
+ DebugPrintf("Invalid address passed.\n");
+ DebugPrintf("Check the \"addresses\" command on how to use addresses\n");
+ return true;
+ }
+
+#ifdef ENABLE_SCI32
+ if (_engine->_gfxFrameout) {
+ DebugPrintf("Plane item list:\n");
+ _engine->_gfxFrameout->printPlaneItemList(this, planeObject);
+ } else {
+ DebugPrintf("This SCI version does not have a list of plane items\n");
+ }
+#else
+ DebugPrintf("SCI32 isn't included in this compiled executable\n");
+#endif
+ return true;
}
bool Console::cmdSavedBits(int argc, const char **argv) {
diff --git a/engines/sci/console.h b/engines/sci/console.h
index d943923ba1..be17fdb728 100644
--- a/engines/sci/console.h
+++ b/engines/sci/console.h
@@ -94,6 +94,8 @@ private:
bool cmdPlayVideo(int argc, const char **argv);
bool cmdAnimateList(int argc, const char **argv);
bool cmdWindowList(int argc, const char **argv);
+ bool cmdPlaneList(int argc, const char **argv);
+ bool cmdPlaneItemList(int argc, const char **argv);
bool cmdSavedBits(int argc, const char **argv);
bool cmdShowSavedBits(int argc, const char **argv);
// Segments
diff --git a/engines/sci/engine/kernel.h b/engines/sci/engine/kernel.h
index e549c1f8ae..42651ec4a5 100644
--- a/engines/sci/engine/kernel.h
+++ b/engines/sci/engine/kernel.h
@@ -458,6 +458,8 @@ reg_t kListAllTrue(EngineState *s, int argc, reg_t *argv);
reg_t kInPolygon(EngineState *s, int argc, reg_t *argv);
reg_t kObjectIntersect(EngineState *s, int argc, reg_t *argv);
reg_t kEditText(EngineState *s, int argc, reg_t *argv);
+reg_t kMakeSaveCatName(EngineState *s, int argc, reg_t *argv);
+reg_t kMakeSaveFileName(EngineState *s, int argc, reg_t *argv);
// SCI2.1 Kernel Functions
reg_t kText(EngineState *s, int argc, reg_t *argv);
diff --git a/engines/sci/engine/kernel_tables.h b/engines/sci/engine/kernel_tables.h
index 622511c906..1fa12b01fd 100644
--- a/engines/sci/engine/kernel_tables.h
+++ b/engines/sci/engine/kernel_tables.h
@@ -500,29 +500,26 @@ static SciKernelMapEntry s_kernelMap[] = {
{ MAP_CALL(UpdateScreenItem), SIG_EVERYWHERE, "o", NULL, NULL },
{ MAP_CALL(ObjectIntersect), SIG_EVERYWHERE, "oo", NULL, NULL },
{ MAP_CALL(EditText), SIG_EVERYWHERE, "o", NULL, NULL },
+ { MAP_CALL(MakeSaveCatName), SIG_EVERYWHERE, "rr", NULL, NULL },
+ { MAP_CALL(MakeSaveFileName), SIG_EVERYWHERE, "rri", NULL, NULL },
// SCI2 unmapped functions - TODO!
// SetScroll - called by script 64909, Styler::doit()
// PalCycle - called by Game::newRoom. Related to RemapColors.
- // VibrateMouse - used in QFG4
// SCI2 Empty functions
// Debug function used to track resources
{ MAP_EMPTY(ResourceTrack), SIG_EVERYWHERE, "(.*)", NULL, NULL },
-
- // SCI2 functions that are used in the original save/load menus. Marked as dummy, so
- // that the engine errors out on purpose. TODO: Implement once the original save/load
- // menus are implemented.
-
- // Creates the name of the save catalogue/directory to save into.
- // TODO: Implement once the original save/load menus are implemented.
- { MAP_DUMMY(MakeSaveCatName), SIG_EVERYWHERE, "(.*)", NULL, NULL },
-
- // Creates the name of the save file to save into
- // TODO: Implement once the original save/load menus are implemented.
- { MAP_DUMMY(MakeSaveFileName), SIG_EVERYWHERE, "(.*)", NULL, NULL },
+ // Future TODO: This call is used in the floppy version of QFG4 to add
+ // vibration to exotic mice with force feedback, such as the Logitech
+ // Cyberman and Wingman mice. Since this is only used for very exotic
+ // hardware and we have no direct and cross-platform way of communicating
+ // with them via SDL, plus we would probably need to make changes to common
+ // code, this call is mapped to an empty function for now as it's a rare
+ // feature not worth the effort.
+ { MAP_EMPTY(VibrateMouse), SIG_EVERYWHERE, "(.*)", NULL, NULL },
// Unused / debug SCI2 unused functions, always mapped to kDummy
diff --git a/engines/sci/engine/kfile.cpp b/engines/sci/engine/kfile.cpp
index 312497720a..af438bdaff 100644
--- a/engines/sci/engine/kfile.cpp
+++ b/engines/sci/engine/kfile.cpp
@@ -331,7 +331,7 @@ reg_t kDeviceInfo(EngineState *s, int argc, reg_t *argv) {
s->_segMan->strcpy(argv[1], "__throwaway");
debug(3, "K_DEVICE_INFO_GET_SAVEFILE_NAME(%s,%d) -> %s", game_prefix.c_str(), virtualId, "__throwaway");
if ((virtualId < SAVEGAMEID_OFFICIALRANGE_START) || (virtualId > SAVEGAMEID_OFFICIALRANGE_END))
- error("kDeviceInfo(deleteSave): invalid savegame-id specified");
+ error("kDeviceInfo(deleteSave): invalid savegame ID specified");
uint savegameId = virtualId - SAVEGAMEID_OFFICIALRANGE_START;
Common::Array<SavegameDesc> saves;
listSavegames(saves);
@@ -526,7 +526,7 @@ reg_t kGetSaveFiles(EngineState *s, int argc, reg_t *argv) {
char *saveNamePtr = saveNames;
for (uint i = 0; i < totalSaves; i++) {
- *slot++ = make_reg(0, saves[i].id + SAVEGAMEID_OFFICIALRANGE_START); // Store the virtual savegame-id ffs. see above
+ *slot++ = make_reg(0, saves[i].id + SAVEGAMEID_OFFICIALRANGE_START); // Store the virtual savegame ID ffs. see above
strcpy(saveNamePtr, saves[i].name);
saveNamePtr += SCI_MAX_SAVENAME_LENGTH;
}
@@ -863,6 +863,10 @@ reg_t kFileIOUnlink(EngineState *s, int argc, reg_t *argv) {
int savedir_nr = saves[slotNum].id;
name = g_sci->getSavegameName(savedir_nr);
result = saveFileMan->removeSavefile(name);
+ } else if (getSciVersion() >= SCI_VERSION_2) {
+ // We don't need to wrap the filename in SCI32 games, as it's already
+ // constructed here
+ result = saveFileMan->removeSavefile(name);
} else {
const Common::String wrappedName = g_sci->wrapFilename(name);
result = saveFileMan->removeSavefile(wrappedName);
@@ -1168,6 +1172,35 @@ reg_t kCD(EngineState *s, int argc, reg_t *argv) {
return NULL_REG;
}
+reg_t kMakeSaveCatName(EngineState *s, int argc, reg_t *argv) {
+ // Normally, this creates the name of the save catalogue/directory to save into.
+ // First parameter is the string to save the result into. Second is a string
+ // with game parameters. We don't have a use for this at all, as we have our own
+ // savegame directory management, thus we always return an empty string.
+ return argv[0];
+}
+
+reg_t kMakeSaveFileName(EngineState *s, int argc, reg_t *argv) {
+ // Creates a savegame name from a slot number. Used when deleting saved games.
+ // Param 0: the output buffer (same as in kMakeSaveCatName)
+ // Param 1: a string with game parameters, ignored
+ // Param 2: the selected slot
+
+ SciString *resultString = s->_segMan->lookupString(argv[0]);
+ uint16 virtualId = argv[2].toUint16();
+ if ((virtualId < SAVEGAMEID_OFFICIALRANGE_START) || (virtualId > SAVEGAMEID_OFFICIALRANGE_END))
+ error("kMakeSaveFileName: invalid savegame ID specified");
+ uint saveSlot = virtualId - SAVEGAMEID_OFFICIALRANGE_START;
+
+ Common::Array<SavegameDesc> saves;
+ listSavegames(saves);
+
+ Common::String filename = g_sci->getSavegameName(saveSlot);
+ resultString->fromString(filename);
+
+ return argv[0];
+}
+
reg_t kSave(EngineState *s, int argc, reg_t *argv) {
switch (argv[0].toUint16()) {
case 0:
@@ -1181,12 +1214,9 @@ reg_t kSave(EngineState *s, int argc, reg_t *argv) {
case 5:
return kGetSaveFiles(s, argc - 1, argv + 1);
case 6:
- // This is used in Shivers to delete saved games, however it
- // always passes the same file name (SHIVER), so it doesn't
- // actually delete anything...
- // TODO: Check why this happens
- // argv[1] is a string (most likely the save game directory)
- return kFileIOUnlink(s, argc - 2, argv + 2);
+ return kMakeSaveCatName(s, argc - 1, argv + 1);
+ case 7:
+ return kMakeSaveFileName(s, argc - 1, argv + 1);
case 8:
// TODO
// This is a timer callback, with 1 parameter: the timer object
diff --git a/engines/sci/engine/kgraphics.cpp b/engines/sci/engine/kgraphics.cpp
index caae562d67..8bf7be4ca3 100644
--- a/engines/sci/engine/kgraphics.cpp
+++ b/engines/sci/engine/kgraphics.cpp
@@ -25,12 +25,10 @@
#include "engines/util.h"
#include "graphics/cursorman.h"
#include "graphics/surface.h"
-#include "graphics/palette.h" // temporary, for the fadeIn()/fadeOut() functions below
#include "gui/message.h"
#include "sci/sci.h"
-#include "sci/debug.h" // for g_debug_sleeptime_factor
#include "sci/event.h"
#include "sci/resource.h"
#include "sci/engine/features.h"
@@ -50,10 +48,7 @@
#include "sci/graphics/text16.h"
#include "sci/graphics/view.h"
#ifdef ENABLE_SCI32
-#include "sci/graphics/controls32.h"
-#include "sci/graphics/font.h" // TODO: remove once kBitmap is moved in a separate class
#include "sci/graphics/text32.h"
-#include "sci/graphics/frameout.h"
#endif
namespace Sci {
@@ -1275,622 +1270,4 @@ reg_t kRemapColors(EngineState *s, int argc, reg_t *argv) {
return s->r_acc;
}
-#ifdef ENABLE_SCI32
-
-reg_t kIsHiRes(EngineState *s, int argc, reg_t *argv) {
- // Returns 0 if the screen width or height is less than 640 or 400,
- // respectively.
- if (g_system->getWidth() < 640 || g_system->getHeight() < 400)
- return make_reg(0, 0);
-
- return make_reg(0, 1);
-}
-
-// SCI32 variant, can't work like sci16 variants
-reg_t kCantBeHere32(EngineState *s, int argc, reg_t *argv) {
- // TODO
-// reg_t curObject = argv[0];
-// reg_t listReference = (argc > 1) ? argv[1] : NULL_REG;
-
- return NULL_REG;
-}
-
-reg_t kAddScreenItem(EngineState *s, int argc, reg_t *argv) {
- if (g_sci->_gfxFrameout->findScreenItem(argv[0]) == NULL)
- g_sci->_gfxFrameout->kernelAddScreenItem(argv[0]);
- else
- g_sci->_gfxFrameout->kernelUpdateScreenItem(argv[0]);
- return s->r_acc;
-}
-
-reg_t kUpdateScreenItem(EngineState *s, int argc, reg_t *argv) {
- g_sci->_gfxFrameout->kernelUpdateScreenItem(argv[0]);
- return s->r_acc;
-}
-
-reg_t kDeleteScreenItem(EngineState *s, int argc, reg_t *argv) {
- g_sci->_gfxFrameout->kernelDeleteScreenItem(argv[0]);
- return s->r_acc;
-}
-
-reg_t kAddPlane(EngineState *s, int argc, reg_t *argv) {
- g_sci->_gfxFrameout->kernelAddPlane(argv[0]);
- return s->r_acc;
-}
-
-reg_t kDeletePlane(EngineState *s, int argc, reg_t *argv) {
- g_sci->_gfxFrameout->kernelDeletePlane(argv[0]);
- return s->r_acc;
-}
-
-reg_t kUpdatePlane(EngineState *s, int argc, reg_t *argv) {
- g_sci->_gfxFrameout->kernelUpdatePlane(argv[0]);
- return s->r_acc;
-}
-
-reg_t kAddPicAt(EngineState *s, int argc, reg_t *argv) {
- reg_t planeObj = argv[0];
- GuiResourceId pictureId = argv[1].toUint16();
- int16 pictureX = argv[2].toSint16();
- int16 pictureY = argv[3].toSint16();
-
- g_sci->_gfxFrameout->kernelAddPicAt(planeObj, pictureId, pictureX, pictureY);
- return s->r_acc;
-}
-
-reg_t kGetHighPlanePri(EngineState *s, int argc, reg_t *argv) {
- return make_reg(0, g_sci->_gfxFrameout->kernelGetHighPlanePri());
-}
-
-reg_t kFrameOut(EngineState *s, int argc, reg_t *argv) {
- g_sci->_gfxFrameout->kernelFrameout();
- return NULL_REG;
-}
-
-reg_t kObjectIntersect(EngineState *s, int argc, reg_t *argv) {
- Common::Rect objRect1 = g_sci->_gfxCompare->getNSRect(argv[0]);
- Common::Rect objRect2 = g_sci->_gfxCompare->getNSRect(argv[1]);
- return make_reg(0, objRect1.intersects(objRect2));
-}
-
-// Tests if the coordinate is on the passed object
-reg_t kIsOnMe(EngineState *s, int argc, reg_t *argv) {
- uint16 x = argv[0].toUint16();
- uint16 y = argv[1].toUint16();
- reg_t targetObject = argv[2];
- uint16 illegalBits = argv[3].offset;
- Common::Rect nsRect = g_sci->_gfxCompare->getNSRect(targetObject, true);
-
- // we assume that x, y are local coordinates
-
- bool contained = nsRect.contains(x, y);
- if (contained && illegalBits) {
- // If illegalbits are set, we check the color of the pixel that got clicked on
- // for now, we return false if the pixel is transparent
- // although illegalBits may get differently set, don't know yet how this really works out
- uint16 viewId = readSelectorValue(s->_segMan, targetObject, SELECTOR(view));
- int16 loopNo = readSelectorValue(s->_segMan, targetObject, SELECTOR(loop));
- int16 celNo = readSelectorValue(s->_segMan, targetObject, SELECTOR(cel));
- if (g_sci->_gfxCompare->kernelIsItSkip(viewId, loopNo, celNo, Common::Point(x - nsRect.left, y - nsRect.top)))
- contained = false;
- }
- return make_reg(0, contained);
-}
-
-reg_t kCreateTextBitmap(EngineState *s, int argc, reg_t *argv) {
- switch (argv[0].toUint16()) {
- case 0: {
- if (argc != 4) {
- warning("kCreateTextBitmap(0): expected 4 arguments, got %i", argc);
- return NULL_REG;
- }
- reg_t object = argv[3];
- Common::String text = s->_segMan->getString(readSelector(s->_segMan, object, SELECTOR(text)));
- debugC(kDebugLevelStrings, "kCreateTextBitmap case 0 (%04x:%04x, %04x:%04x, %04x:%04x)",
- PRINT_REG(argv[1]), PRINT_REG(argv[2]), PRINT_REG(argv[3]));
- debugC(kDebugLevelStrings, "%s", text.c_str());
- uint16 maxWidth = argv[1].toUint16(); // nsRight - nsLeft + 1
- uint16 maxHeight = argv[2].toUint16(); // nsBottom - nsTop + 1
- return g_sci->_gfxText32->createTextBitmap(object, maxWidth, maxHeight);
- }
- case 1: {
- if (argc != 2) {
- warning("kCreateTextBitmap(1): expected 2 arguments, got %i", argc);
- return NULL_REG;
- }
- reg_t object = argv[1];
- Common::String text = s->_segMan->getString(readSelector(s->_segMan, object, SELECTOR(text)));
- debugC(kDebugLevelStrings, "kCreateTextBitmap case 1 (%04x:%04x)", PRINT_REG(argv[1]));
- debugC(kDebugLevelStrings, "%s", text.c_str());
- return g_sci->_gfxText32->createTextBitmap(object);
- }
- default:
- warning("CreateTextBitmap(%d)", argv[0].toUint16());
- return NULL_REG;
- }
-}
-
-reg_t kDisposeTextBitmap(EngineState *s, int argc, reg_t *argv) {
- g_sci->_gfxText32->disposeTextBitmap(argv[0]);
- return s->r_acc;
-}
-
-reg_t kGetWindowsOption(EngineState *s, int argc, reg_t *argv) {
- uint16 windowsOption = argv[0].toUint16();
- switch (windowsOption) {
- case 0:
- // Title bar on/off in Phantasmagoria, we return 0 (off)
- return NULL_REG;
- default:
- warning("GetWindowsOption: Unknown option %d", windowsOption);
- return NULL_REG;
- }
-}
-
-reg_t kWinHelp(EngineState *s, int argc, reg_t *argv) {
- switch (argv[0].toUint16()) {
- case 1:
- // Load a help file
- // Maybe in the future we can implement this, but for now this message should suffice
- showScummVMDialog("Please use an external viewer to open the game's help file: " + s->_segMan->getString(argv[1]));
- break;
- case 2:
- // Looks like some init function
- break;
- default:
- warning("Unknown kWinHelp subop %d", argv[0].toUint16());
- }
-
- return s->r_acc;
-}
-
-// Taken from the SCI16 GfxTransitions class
-static void fadeOut() {
- byte oldPalette[3 * 256], workPalette[3 * 256];
- int16 stepNr, colorNr;
- // Sierra did not fade in/out color 255 for sci1.1, but they used it in
- // several pictures (e.g. qfg3 demo/intro), so the fading looked weird
- int16 tillColorNr = getSciVersion() >= SCI_VERSION_1_1 ? 255 : 254;
-
- g_system->getPaletteManager()->grabPalette(oldPalette, 0, 256);
-
- for (stepNr = 100; stepNr >= 0; stepNr -= 10) {
- for (colorNr = 1; colorNr <= tillColorNr; colorNr++) {
- if (g_sci->_gfxPalette->colorIsFromMacClut(colorNr)) {
- workPalette[colorNr * 3 + 0] = oldPalette[colorNr * 3];
- workPalette[colorNr * 3 + 1] = oldPalette[colorNr * 3 + 1];
- workPalette[colorNr * 3 + 2] = oldPalette[colorNr * 3 + 2];
- } else {
- workPalette[colorNr * 3 + 0] = oldPalette[colorNr * 3] * stepNr / 100;
- workPalette[colorNr * 3 + 1] = oldPalette[colorNr * 3 + 1] * stepNr / 100;
- workPalette[colorNr * 3 + 2] = oldPalette[colorNr * 3 + 2] * stepNr / 100;
- }
- }
- g_system->getPaletteManager()->setPalette(workPalette + 3, 1, tillColorNr);
- g_sci->getEngineState()->wait(2);
- }
-}
-
-// Taken from the SCI16 GfxTransitions class
-static void fadeIn() {
- int16 stepNr;
- // Sierra did not fade in/out color 255 for sci1.1, but they used it in
- // several pictures (e.g. qfg3 demo/intro), so the fading looked weird
- int16 tillColorNr = getSciVersion() >= SCI_VERSION_1_1 ? 255 : 254;
-
- for (stepNr = 0; stepNr <= 100; stepNr += 10) {
- g_sci->_gfxPalette->kernelSetIntensity(1, tillColorNr + 1, stepNr, true);
- g_sci->getEngineState()->wait(2);
- }
-}
-
-/**
- * Used for scene transitions, replacing (but reusing parts of) the old
- * transition code.
- */
-reg_t kSetShowStyle(EngineState *s, int argc, reg_t *argv) {
- // Can be called with 7 or 8 parameters
- // The style defines which transition to perform. Related to the transition
- // tables inside graphics/transitions.cpp
- uint16 showStyle = argv[0].toUint16(); // 0 - 15
- reg_t planeObj = argv[1]; // the affected plane
- uint16 seconds = argv[2].toUint16(); // seconds that the transition lasts
- uint16 backColor = argv[3].toUint16(); // target back color(?). When fading out, it's 0x0000. When fading in, it's 0xffff
- int16 priority = argv[4].toSint16(); // always 0xc8 (200) when fading in/out
- uint16 animate = argv[5].toUint16(); // boolean, animate or not while the transition lasts
- uint16 refFrame = argv[6].toUint16(); // refFrame, always 0 when fading in/out
- int16 divisions;
-
- // If the game has the pFadeArray selector, another parameter is used here,
- // before the optional last parameter
- bool hasFadeArray = g_sci->getKernel()->findSelector("pFadeArray") > 0;
- if (hasFadeArray) {
- // argv[7]
- divisions = (argc >= 9) ? argv[8].toSint16() : -1; // divisions (transition steps?)
- } else {
- divisions = (argc >= 8) ? argv[7].toSint16() : -1; // divisions (transition steps?)
- }
-
- if (showStyle > 15) {
- warning("kSetShowStyle: Illegal style %d for plane %04x:%04x", showStyle, PRINT_REG(planeObj));
- return s->r_acc;
- }
-
- // TODO: Proper implementation. This is a very basic version. I'm not even
- // sure if the rest of the styles will work with this mechanism.
-
- // Check if the passed parameters are the ones we expect
- if (showStyle == 13 || showStyle == 14) { // fade out / fade in
- if (seconds != 1)
- warning("kSetShowStyle(fade): seconds isn't 1, it's %d", seconds);
- if (backColor != 0 && backColor != 0xFFFF)
- warning("kSetShowStyle(fade): backColor isn't 0 or 0xFFFF, it's %d", backColor);
- if (priority != 200)
- warning("kSetShowStyle(fade): priority isn't 200, it's %d", priority);
- if (animate != 0)
- warning("kSetShowStyle(fade): animate isn't 0, it's %d", animate);
- if (refFrame != 0)
- warning("kSetShowStyle(fade): refFrame isn't 0, it's %d", refFrame);
- if (divisions >= 0 && divisions != 20)
- warning("kSetShowStyle(fade): divisions isn't 20, it's %d", divisions);
- }
-
- // TODO: Check if the plane is in the list of planes to draw
-
- switch (showStyle) {
- //case 0: // no transition, perhaps? (like in the previous SCI versions)
- case 13: // fade out
- // TODO: Temporary implementation, which ignores all additional parameters
- fadeOut();
- break;
- case 14: // fade in
- // TODO: Temporary implementation, which ignores all additional parameters
- g_sci->_gfxFrameout->kernelFrameout(); // draw new scene before fading in
- fadeIn();
- break;
- default:
- // TODO: This is all a stub/skeleton, thus we're invoking kStub() for now
- kStub(s, argc, argv);
- break;
- }
-
- return s->r_acc;
-}
-
-reg_t kCelInfo(EngineState *s, int argc, reg_t *argv) {
- // Used by Shivers 1, room 23601 to determine what blocks on the red door puzzle board
- // are occupied by pieces already
-
- switch (argv[0].toUint16()) { // subops 0 - 4
- // 0 - return the view
- // 1 - return the loop
- // 2, 3 - nop
- case 4: {
- GuiResourceId viewId = argv[1].toSint16();
- int16 loopNo = argv[2].toSint16();
- int16 celNo = argv[3].toSint16();
- int16 x = argv[4].toUint16();
- int16 y = argv[5].toUint16();
- byte color = g_sci->_gfxCache->kernelViewGetColorAtCoordinate(viewId, loopNo, celNo, x, y);
- return make_reg(0, color);
- }
- default: {
- kStub(s, argc, argv);
- return s->r_acc;
- }
- }
-}
-
-reg_t kScrollWindow(EngineState *s, int argc, reg_t *argv) {
- // Used by Phantasmagoria 1 and SQ6. In SQ6, it is used for the messages
- // shown in the scroll window at the bottom of the screen.
-
- // TODO: This is all a stub/skeleton, thus we're invoking kStub() for now
- kStub(s, argc, argv);
-
- switch (argv[0].toUint16()) {
- case 0: // Init
- // 2 parameters
- // argv[1] points to the scroll object (e.g. textScroller in SQ6)
- // argv[2] is an integer (e.g. 0x32)
- break;
- case 1: // Show message
- // 5 or 6 parameters
- // Seems to be called with 5 parameters when the narrator speaks, and
- // with 6 when Roger speaks
- // argv[1] unknown (usually 0)
- // argv[2] the text to show
- // argv[3] a small integer (e.g. 0x32)
- // argv[4] a small integer (e.g. 0x54)
- // argv[5] optional, unknown (usually 0)
- warning("kScrollWindow: '%s'", s->_segMan->getString(argv[2]).c_str());
- break;
- case 2: // Clear
- // 2 parameters
- // TODO
- break;
- case 3: // Page up
- // 2 parameters
- // TODO
- break;
- case 4: // Page down
- // 2 parameters
- // TODO
- break;
- case 5: // Up arrow
- // 2 parameters
- // TODO
- break;
- case 6: // Down arrow
- // 2 parameters
- // TODO
- break;
- case 7: // Home
- // 2 parameters
- // TODO
- break;
- case 8: // End
- // 2 parameters
- // TODO
- break;
- case 9: // Resize
- // 3 parameters
- // TODO
- break;
- case 10: // Where
- // 3 parameters
- // TODO
- break;
- case 11: // Go
- // 4 parameters
- // TODO
- break;
- case 12: // Insert
- // 7 parameters
- // TODO
- break;
- case 13: // Delete
- // 3 parameters
- // TODO
- break;
- case 14: // Modify
- // 7 or 8 parameters
- // TODO
- break;
- case 15: // Hide
- // 2 parameters
- // TODO
- break;
- case 16: // Show
- // 2 parameters
- // TODO
- break;
- case 17: // Destroy
- // 2 parameters
- // TODO
- break;
- case 18: // Text
- // 2 parameters
- // TODO
- break;
- case 19: // Reconstruct
- // 3 parameters
- // TODO
- break;
- default:
- error("kScrollWindow: unknown subop %d", argv[0].toUint16());
- break;
- }
-
- return s->r_acc;
-}
-
-reg_t kSetFontRes(EngineState *s, int argc, reg_t *argv) {
- // TODO: This defines the resolution that the fonts are supposed to be displayed
- // in. Currently, this is only used for showing high-res fonts in GK1 Mac, but
- // should be extended to handle other font resolutions such as those
-
- int xResolution = argv[0].toUint16();
- //int yResolution = argv[1].toUint16();
-
- g_sci->_gfxScreen->setFontIsUpscaled(xResolution == 640 &&
- g_sci->_gfxScreen->getUpscaledHires() != GFX_SCREEN_UPSCALED_DISABLED);
-
- return s->r_acc;
-}
-
-reg_t kFont(EngineState *s, int argc, reg_t *argv) {
- // Handle font settings for SCI2.1
-
- switch (argv[0].toUint16()) {
- case 1:
- // Set font resolution
- return kSetFontRes(s, argc - 1, argv + 1);
- default:
- warning("kFont: unknown subop %d", argv[0].toUint16());
- }
-
- return s->r_acc;
-}
-
-// TODO: Eventually, all of the kBitmap operations should be put
-// in a separate class
-
-#define BITMAP_HEADER_SIZE 46
-
-reg_t kBitmap(EngineState *s, int argc, reg_t *argv) {
- // Used for bitmap operations in SCI2.1 and SCI3.
- // This is the SCI2.1 version, the functionality seems to have changed in SCI3.
-
- switch (argv[0].toUint16()) {
- case 0: // init bitmap surface
- {
- // 6 params, called e.g. from TextView::init() in Torin's Passage,
- // script 64890 and TransView::init() in script 64884
- uint16 width = argv[1].toUint16();
- uint16 height = argv[2].toUint16();
- //uint16 skip = argv[3].toUint16();
- uint16 back = argv[4].toUint16(); // usually equals skip
- //uint16 width2 = (argc >= 6) ? argv[5].toUint16() : 0;
- //uint16 height2 = (argc >= 7) ? argv[6].toUint16() : 0;
- //uint16 transparentFlag = (argc >= 8) ? argv[7].toUint16() : 0;
-
- // TODO: skip, width2, height2, transparentFlag
- // (used for transparent bitmaps)
- int entrySize = width * height + BITMAP_HEADER_SIZE;
- reg_t memoryId = s->_segMan->allocateHunkEntry("Bitmap()", entrySize);
- byte *memoryPtr = s->_segMan->getHunkPointer(memoryId);
- memset(memoryPtr, 0, BITMAP_HEADER_SIZE); // zero out the bitmap header
- memset(memoryPtr + BITMAP_HEADER_SIZE, back, width * height);
- // Save totalWidth, totalHeight
- // TODO: Save the whole bitmap header, like SSCI does
- WRITE_LE_UINT16(memoryPtr, width);
- WRITE_LE_UINT16(memoryPtr + 2, height);
- return memoryId;
- }
- break;
- case 1: // dispose text bitmap surface
- return kDisposeTextBitmap(s, argc - 1, argv + 1);
- case 2: // dispose bitmap surface, with extra param
- // 2 params, called e.g. from MenuItem::dispose in Torin's Passage,
- // script 64893
- warning("kBitmap(2), unk1 %d, bitmap ptr %04x:%04x", argv[1].toUint16(), PRINT_REG(argv[2]));
- break;
- case 3: // tiled surface
- {
- // 6 params, called e.g. from TiledBitmap::resize() in Torin's Passage,
- // script 64869
- reg_t hunkId = argv[1]; // obtained from kBitmap(0)
- // The tiled view seems to always have 2 loops.
- // These loops need to have 1 cel in loop 0 and 8 cels in loop 1.
- uint16 viewNum = argv[2].toUint16(); // vTiles selector
- uint16 loop = argv[3].toUint16();
- uint16 cel = argv[4].toUint16();
- uint16 x = argv[5].toUint16();
- uint16 y = argv[6].toUint16();
-
- byte *memoryPtr = s->_segMan->getHunkPointer(hunkId);
- // Get totalWidth, totalHeight
- uint16 totalWidth = READ_LE_UINT16(memoryPtr);
- uint16 totalHeight = READ_LE_UINT16(memoryPtr + 2);
- byte *bitmap = memoryPtr + BITMAP_HEADER_SIZE;
-
- GfxView *view = g_sci->_gfxCache->getView(viewNum);
- uint16 tileWidth = view->getWidth(loop, cel);
- uint16 tileHeight = view->getHeight(loop, cel);
- const byte *tileBitmap = view->getBitmap(loop, cel);
- uint16 width = MIN<uint16>(totalWidth - x, tileWidth);
- uint16 height = MIN<uint16>(totalHeight - y, tileHeight);
-
- for (uint16 curY = 0; curY < height; curY++) {
- for (uint16 curX = 0; curX < width; curX++) {
- bitmap[(curY + y) * totalWidth + (curX + x)] = tileBitmap[curY * tileWidth + curX];
- }
- }
-
- }
- break;
- case 4: // add text to bitmap
- {
- // 13 params, called e.g. from TextButton::createBitmap() in Torin's Passage,
- // script 64894
- reg_t hunkId = argv[1]; // obtained from kBitmap(0)
- Common::String text = s->_segMan->getString(argv[2]);
- uint16 textX = argv[3].toUint16();
- uint16 textY = argv[4].toUint16();
- //reg_t unk5 = argv[5];
- //reg_t unk6 = argv[6];
- //reg_t unk7 = argv[7]; // skip?
- //reg_t unk8 = argv[8]; // back?
- //reg_t unk9 = argv[9];
- uint16 fontId = argv[10].toUint16();
- //uint16 mode = argv[11].toUint16();
- uint16 dimmed = argv[12].toUint16();
- //warning("kBitmap(4): bitmap ptr %04x:%04x, font %d, mode %d, dimmed %d - text: \"%s\"",
- // PRINT_REG(bitmapPtr), font, mode, dimmed, text.c_str());
- uint16 foreColor = 255; // TODO
-
- byte *memoryPtr = s->_segMan->getHunkPointer(hunkId);
- // Get totalWidth, totalHeight
- uint16 totalWidth = READ_LE_UINT16(memoryPtr);
- uint16 totalHeight = READ_LE_UINT16(memoryPtr + 2);
- byte *bitmap = memoryPtr + BITMAP_HEADER_SIZE;
-
- GfxFont *font = g_sci->_gfxCache->getFont(fontId);
-
- int16 charCount = 0;
- uint16 curX = textX, curY = textY;
- const char *txt = text.c_str();
-
- while (*txt) {
- charCount = g_sci->_gfxText32->GetLongest(txt, totalWidth, font);
- if (charCount == 0)
- break;
-
- for (int i = 0; i < charCount; i++) {
- unsigned char curChar = txt[i];
- font->drawToBuffer(curChar, curY, curX, foreColor, dimmed, bitmap, totalWidth, totalHeight);
- curX += font->getCharWidth(curChar);
- }
-
- curX = textX;
- curY += font->getHeight();
- txt += charCount;
- while (*txt == ' ')
- txt++; // skip over breaking spaces
- }
-
- }
- break;
- case 5: // fill with color
- {
- // 6 params, called e.g. from TextView::init() and TextView::draw()
- // in Torin's Passage, script 64890
- reg_t hunkId = argv[1]; // obtained from kBitmap(0)
- uint16 x = argv[2].toUint16();
- uint16 y = argv[3].toUint16();
- uint16 fillWidth = argv[4].toUint16(); // width - 1
- uint16 fillHeight = argv[5].toUint16(); // height - 1
- uint16 back = argv[6].toUint16();
-
- byte *memoryPtr = s->_segMan->getHunkPointer(hunkId);
- // Get totalWidth, totalHeight
- uint16 totalWidth = READ_LE_UINT16(memoryPtr);
- uint16 totalHeight = READ_LE_UINT16(memoryPtr + 2);
- uint16 width = MIN<uint16>(totalWidth - x, fillWidth);
- uint16 height = MIN<uint16>(totalHeight - y, fillHeight);
- byte *bitmap = memoryPtr + BITMAP_HEADER_SIZE;
-
- for (uint16 curY = 0; curY < height; curY++) {
- for (uint16 curX = 0; curX < width; curX++) {
- bitmap[(curY + y) * totalWidth + (curX + x)] = back;
- }
- }
-
- }
- break;
- default:
- kStub(s, argc, argv);
- break;
- }
-
- return s->r_acc;
-}
-
-// Used for edit boxes in save/load dialogs. It's a rewritten version of kEditControl,
-// but it handles events on its own, using an internal loop, instead of using SCI
-// scripts for event management like kEditControl does. Called by script 64914,
-// DEdit::hilite().
-reg_t kEditText(EngineState *s, int argc, reg_t *argv) {
- reg_t controlObject = argv[0];
-
- if (!controlObject.isNull()) {
- g_sci->_gfxControls32->kernelTexteditChange(controlObject);
- }
-
- return s->r_acc;
-}
-
-#endif
-
} // End of namespace Sci
diff --git a/engines/sci/engine/kgraphics32.cpp b/engines/sci/engine/kgraphics32.cpp
new file mode 100644
index 0000000000..2bb8288cb7
--- /dev/null
+++ b/engines/sci/engine/kgraphics32.cpp
@@ -0,0 +1,622 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "common/system.h"
+
+#include "engines/util.h"
+#include "graphics/cursorman.h"
+#include "graphics/surface.h"
+
+#include "gui/message.h"
+
+#include "sci/sci.h"
+#include "sci/event.h"
+#include "sci/resource.h"
+#include "sci/engine/features.h"
+#include "sci/engine/state.h"
+#include "sci/engine/selector.h"
+#include "sci/engine/kernel.h"
+#include "sci/graphics/animate.h"
+#include "sci/graphics/cache.h"
+#include "sci/graphics/compare.h"
+#include "sci/graphics/controls16.h"
+#include "sci/graphics/cursor.h"
+#include "sci/graphics/palette.h"
+#include "sci/graphics/paint16.h"
+#include "sci/graphics/picture.h"
+#include "sci/graphics/ports.h"
+#include "sci/graphics/screen.h"
+#include "sci/graphics/text16.h"
+#include "sci/graphics/view.h"
+#ifdef ENABLE_SCI32
+#include "sci/graphics/controls32.h"
+#include "sci/graphics/font.h" // TODO: remove once kBitmap is moved in a separate class
+#include "sci/graphics/text32.h"
+#include "sci/graphics/frameout.h"
+#endif
+
+namespace Sci {
+#ifdef ENABLE_SCI32
+
+extern void showScummVMDialog(const Common::String &message);
+
+reg_t kIsHiRes(EngineState *s, int argc, reg_t *argv) {
+ // Returns 0 if the screen width or height is less than 640 or 400,
+ // respectively.
+ if (g_system->getWidth() < 640 || g_system->getHeight() < 400)
+ return make_reg(0, 0);
+
+ return make_reg(0, 1);
+}
+
+// SCI32 variant, can't work like sci16 variants
+reg_t kCantBeHere32(EngineState *s, int argc, reg_t *argv) {
+ // TODO
+// reg_t curObject = argv[0];
+// reg_t listReference = (argc > 1) ? argv[1] : NULL_REG;
+
+ return NULL_REG;
+}
+
+reg_t kAddScreenItem(EngineState *s, int argc, reg_t *argv) {
+ if (g_sci->_gfxFrameout->findScreenItem(argv[0]) == NULL)
+ g_sci->_gfxFrameout->kernelAddScreenItem(argv[0]);
+ else
+ g_sci->_gfxFrameout->kernelUpdateScreenItem(argv[0]);
+ return s->r_acc;
+}
+
+reg_t kUpdateScreenItem(EngineState *s, int argc, reg_t *argv) {
+ g_sci->_gfxFrameout->kernelUpdateScreenItem(argv[0]);
+ return s->r_acc;
+}
+
+reg_t kDeleteScreenItem(EngineState *s, int argc, reg_t *argv) {
+ g_sci->_gfxFrameout->kernelDeleteScreenItem(argv[0]);
+ return s->r_acc;
+}
+
+reg_t kAddPlane(EngineState *s, int argc, reg_t *argv) {
+ g_sci->_gfxFrameout->kernelAddPlane(argv[0]);
+ return s->r_acc;
+}
+
+reg_t kDeletePlane(EngineState *s, int argc, reg_t *argv) {
+ g_sci->_gfxFrameout->kernelDeletePlane(argv[0]);
+ return s->r_acc;
+}
+
+reg_t kUpdatePlane(EngineState *s, int argc, reg_t *argv) {
+ g_sci->_gfxFrameout->kernelUpdatePlane(argv[0]);
+ return s->r_acc;
+}
+
+reg_t kAddPicAt(EngineState *s, int argc, reg_t *argv) {
+ reg_t planeObj = argv[0];
+ GuiResourceId pictureId = argv[1].toUint16();
+ int16 pictureX = argv[2].toSint16();
+ int16 pictureY = argv[3].toSint16();
+
+ g_sci->_gfxFrameout->kernelAddPicAt(planeObj, pictureId, pictureX, pictureY);
+ return s->r_acc;
+}
+
+reg_t kGetHighPlanePri(EngineState *s, int argc, reg_t *argv) {
+ return make_reg(0, g_sci->_gfxFrameout->kernelGetHighPlanePri());
+}
+
+reg_t kFrameOut(EngineState *s, int argc, reg_t *argv) {
+ g_sci->_gfxFrameout->kernelFrameout();
+ return NULL_REG;
+}
+
+reg_t kObjectIntersect(EngineState *s, int argc, reg_t *argv) {
+ Common::Rect objRect1 = g_sci->_gfxCompare->getNSRect(argv[0]);
+ Common::Rect objRect2 = g_sci->_gfxCompare->getNSRect(argv[1]);
+ return make_reg(0, objRect1.intersects(objRect2));
+}
+
+// Tests if the coordinate is on the passed object
+reg_t kIsOnMe(EngineState *s, int argc, reg_t *argv) {
+ uint16 x = argv[0].toUint16();
+ uint16 y = argv[1].toUint16();
+ reg_t targetObject = argv[2];
+ uint16 illegalBits = argv[3].offset;
+ Common::Rect nsRect = g_sci->_gfxCompare->getNSRect(targetObject, true);
+
+ // we assume that x, y are local coordinates
+
+ bool contained = nsRect.contains(x, y);
+ if (contained && illegalBits) {
+ // If illegalbits are set, we check the color of the pixel that got clicked on
+ // for now, we return false if the pixel is transparent
+ // although illegalBits may get differently set, don't know yet how this really works out
+ uint16 viewId = readSelectorValue(s->_segMan, targetObject, SELECTOR(view));
+ int16 loopNo = readSelectorValue(s->_segMan, targetObject, SELECTOR(loop));
+ int16 celNo = readSelectorValue(s->_segMan, targetObject, SELECTOR(cel));
+ if (g_sci->_gfxCompare->kernelIsItSkip(viewId, loopNo, celNo, Common::Point(x - nsRect.left, y - nsRect.top)))
+ contained = false;
+ }
+ return make_reg(0, contained);
+}
+
+reg_t kCreateTextBitmap(EngineState *s, int argc, reg_t *argv) {
+ switch (argv[0].toUint16()) {
+ case 0: {
+ if (argc != 4) {
+ warning("kCreateTextBitmap(0): expected 4 arguments, got %i", argc);
+ return NULL_REG;
+ }
+ reg_t object = argv[3];
+ Common::String text = s->_segMan->getString(readSelector(s->_segMan, object, SELECTOR(text)));
+ debugC(kDebugLevelStrings, "kCreateTextBitmap case 0 (%04x:%04x, %04x:%04x, %04x:%04x)",
+ PRINT_REG(argv[1]), PRINT_REG(argv[2]), PRINT_REG(argv[3]));
+ debugC(kDebugLevelStrings, "%s", text.c_str());
+ uint16 maxWidth = argv[1].toUint16(); // nsRight - nsLeft + 1
+ uint16 maxHeight = argv[2].toUint16(); // nsBottom - nsTop + 1
+ return g_sci->_gfxText32->createTextBitmap(object, maxWidth, maxHeight);
+ }
+ case 1: {
+ if (argc != 2) {
+ warning("kCreateTextBitmap(1): expected 2 arguments, got %i", argc);
+ return NULL_REG;
+ }
+ reg_t object = argv[1];
+ Common::String text = s->_segMan->getString(readSelector(s->_segMan, object, SELECTOR(text)));
+ debugC(kDebugLevelStrings, "kCreateTextBitmap case 1 (%04x:%04x)", PRINT_REG(argv[1]));
+ debugC(kDebugLevelStrings, "%s", text.c_str());
+ return g_sci->_gfxText32->createTextBitmap(object);
+ }
+ default:
+ warning("CreateTextBitmap(%d)", argv[0].toUint16());
+ return NULL_REG;
+ }
+}
+
+reg_t kDisposeTextBitmap(EngineState *s, int argc, reg_t *argv) {
+ g_sci->_gfxText32->disposeTextBitmap(argv[0]);
+ return s->r_acc;
+}
+
+reg_t kGetWindowsOption(EngineState *s, int argc, reg_t *argv) {
+ uint16 windowsOption = argv[0].toUint16();
+ switch (windowsOption) {
+ case 0:
+ // Title bar on/off in Phantasmagoria, we return 0 (off)
+ return NULL_REG;
+ default:
+ warning("GetWindowsOption: Unknown option %d", windowsOption);
+ return NULL_REG;
+ }
+}
+
+reg_t kWinHelp(EngineState *s, int argc, reg_t *argv) {
+ switch (argv[0].toUint16()) {
+ case 1:
+ // Load a help file
+ // Maybe in the future we can implement this, but for now this message should suffice
+ showScummVMDialog("Please use an external viewer to open the game's help file: " + s->_segMan->getString(argv[1]));
+ break;
+ case 2:
+ // Looks like some init function
+ break;
+ default:
+ warning("Unknown kWinHelp subop %d", argv[0].toUint16());
+ }
+
+ return s->r_acc;
+}
+
+/**
+ * Used for scene transitions, replacing (but reusing parts of) the old
+ * transition code.
+ */
+reg_t kSetShowStyle(EngineState *s, int argc, reg_t *argv) {
+ // Can be called with 7 or 8 parameters
+ // The style defines which transition to perform. Related to the transition
+ // tables inside graphics/transitions.cpp
+ uint16 showStyle = argv[0].toUint16(); // 0 - 15
+ reg_t planeObj = argv[1]; // the affected plane
+ //uint16 seconds = argv[2].toUint16(); // seconds that the transition lasts
+ //uint16 backColor = argv[3].toUint16(); // target back color(?). When fading out, it's 0x0000. When fading in, it's 0xffff
+ //int16 priority = argv[4].toSint16(); // always 0xc8 (200) when fading in/out
+ //uint16 animate = argv[5].toUint16(); // boolean, animate or not while the transition lasts
+ //uint16 refFrame = argv[6].toUint16(); // refFrame, always 0 when fading in/out
+ int16 divisions;
+
+ // If the game has the pFadeArray selector, another parameter is used here,
+ // before the optional last parameter
+ bool hasFadeArray = g_sci->getKernel()->findSelector("pFadeArray") > 0;
+ if (hasFadeArray) {
+ // argv[7]
+ divisions = (argc >= 9) ? argv[8].toSint16() : -1; // divisions (transition steps?)
+ } else {
+ divisions = (argc >= 8) ? argv[7].toSint16() : -1; // divisions (transition steps?)
+ }
+
+ if (showStyle > 15) {
+ warning("kSetShowStyle: Illegal style %d for plane %04x:%04x", showStyle, PRINT_REG(planeObj));
+ return s->r_acc;
+ }
+
+ // GK1 calls fadeout (13) / fadein (14) with the following parameters:
+ // seconds: 1
+ // backColor: 0 / -1
+ // fade: 200
+ // animate: 0
+ // refFrame: 0
+ // divisions: 0 / 20
+
+ // TODO: Check if the plane is in the list of planes to draw
+
+ switch (showStyle) {
+ //case 0: // no transition, perhaps? (like in the previous SCI versions)
+ case 13: // fade out
+ // TODO
+ case 14: // fade in
+ // TODO
+ default:
+ // TODO: This is all a stub/skeleton, thus we're invoking kStub() for now
+ kStub(s, argc, argv);
+ break;
+ }
+
+ return s->r_acc;
+}
+
+reg_t kCelInfo(EngineState *s, int argc, reg_t *argv) {
+ // Used by Shivers 1, room 23601 to determine what blocks on the red door puzzle board
+ // are occupied by pieces already
+
+ switch (argv[0].toUint16()) { // subops 0 - 4
+ // 0 - return the view
+ // 1 - return the loop
+ // 2, 3 - nop
+ case 4: {
+ GuiResourceId viewId = argv[1].toSint16();
+ int16 loopNo = argv[2].toSint16();
+ int16 celNo = argv[3].toSint16();
+ int16 x = argv[4].toUint16();
+ int16 y = argv[5].toUint16();
+ byte color = g_sci->_gfxCache->kernelViewGetColorAtCoordinate(viewId, loopNo, celNo, x, y);
+ return make_reg(0, color);
+ }
+ default: {
+ kStub(s, argc, argv);
+ return s->r_acc;
+ }
+ }
+}
+
+reg_t kScrollWindow(EngineState *s, int argc, reg_t *argv) {
+ // Used by Phantasmagoria 1 and SQ6. In SQ6, it is used for the messages
+ // shown in the scroll window at the bottom of the screen.
+
+ // TODO: This is all a stub/skeleton, thus we're invoking kStub() for now
+ kStub(s, argc, argv);
+
+ switch (argv[0].toUint16()) {
+ case 0: // Init
+ // 2 parameters
+ // argv[1] points to the scroll object (e.g. textScroller in SQ6)
+ // argv[2] is an integer (e.g. 0x32)
+ break;
+ case 1: // Show message
+ // 5 or 6 parameters
+ // Seems to be called with 5 parameters when the narrator speaks, and
+ // with 6 when Roger speaks
+ // argv[1] unknown (usually 0)
+ // argv[2] the text to show
+ // argv[3] a small integer (e.g. 0x32)
+ // argv[4] a small integer (e.g. 0x54)
+ // argv[5] optional, unknown (usually 0)
+ warning("kScrollWindow: '%s'", s->_segMan->getString(argv[2]).c_str());
+ break;
+ case 2: // Clear
+ // 2 parameters
+ // TODO
+ break;
+ case 3: // Page up
+ // 2 parameters
+ // TODO
+ break;
+ case 4: // Page down
+ // 2 parameters
+ // TODO
+ break;
+ case 5: // Up arrow
+ // 2 parameters
+ // TODO
+ break;
+ case 6: // Down arrow
+ // 2 parameters
+ // TODO
+ break;
+ case 7: // Home
+ // 2 parameters
+ // TODO
+ break;
+ case 8: // End
+ // 2 parameters
+ // TODO
+ break;
+ case 9: // Resize
+ // 3 parameters
+ // TODO
+ break;
+ case 10: // Where
+ // 3 parameters
+ // TODO
+ break;
+ case 11: // Go
+ // 4 parameters
+ // TODO
+ break;
+ case 12: // Insert
+ // 7 parameters
+ // TODO
+ break;
+ case 13: // Delete
+ // 3 parameters
+ // TODO
+ break;
+ case 14: // Modify
+ // 7 or 8 parameters
+ // TODO
+ break;
+ case 15: // Hide
+ // 2 parameters
+ // TODO
+ break;
+ case 16: // Show
+ // 2 parameters
+ // TODO
+ break;
+ case 17: // Destroy
+ // 2 parameters
+ // TODO
+ break;
+ case 18: // Text
+ // 2 parameters
+ // TODO
+ break;
+ case 19: // Reconstruct
+ // 3 parameters
+ // TODO
+ break;
+ default:
+ error("kScrollWindow: unknown subop %d", argv[0].toUint16());
+ break;
+ }
+
+ return s->r_acc;
+}
+
+reg_t kSetFontRes(EngineState *s, int argc, reg_t *argv) {
+ // TODO: This defines the resolution that the fonts are supposed to be displayed
+ // in. Currently, this is only used for showing high-res fonts in GK1 Mac, but
+ // should be extended to handle other font resolutions such as those
+
+ int xResolution = argv[0].toUint16();
+ //int yResolution = argv[1].toUint16();
+
+ g_sci->_gfxScreen->setFontIsUpscaled(xResolution == 640 &&
+ g_sci->_gfxScreen->getUpscaledHires() != GFX_SCREEN_UPSCALED_DISABLED);
+
+ return s->r_acc;
+}
+
+reg_t kFont(EngineState *s, int argc, reg_t *argv) {
+ // Handle font settings for SCI2.1
+
+ switch (argv[0].toUint16()) {
+ case 1:
+ // Set font resolution
+ return kSetFontRes(s, argc - 1, argv + 1);
+ default:
+ warning("kFont: unknown subop %d", argv[0].toUint16());
+ }
+
+ return s->r_acc;
+}
+
+// TODO: Eventually, all of the kBitmap operations should be put
+// in a separate class
+
+#define BITMAP_HEADER_SIZE 46
+
+reg_t kBitmap(EngineState *s, int argc, reg_t *argv) {
+ // Used for bitmap operations in SCI2.1 and SCI3.
+ // This is the SCI2.1 version, the functionality seems to have changed in SCI3.
+
+ switch (argv[0].toUint16()) {
+ case 0: // init bitmap surface
+ {
+ // 6 params, called e.g. from TextView::init() in Torin's Passage,
+ // script 64890 and TransView::init() in script 64884
+ uint16 width = argv[1].toUint16();
+ uint16 height = argv[2].toUint16();
+ //uint16 skip = argv[3].toUint16();
+ uint16 back = argv[4].toUint16(); // usually equals skip
+ //uint16 width2 = (argc >= 6) ? argv[5].toUint16() : 0;
+ //uint16 height2 = (argc >= 7) ? argv[6].toUint16() : 0;
+ //uint16 transparentFlag = (argc >= 8) ? argv[7].toUint16() : 0;
+
+ // TODO: skip, width2, height2, transparentFlag
+ // (used for transparent bitmaps)
+ int entrySize = width * height + BITMAP_HEADER_SIZE;
+ reg_t memoryId = s->_segMan->allocateHunkEntry("Bitmap()", entrySize);
+ byte *memoryPtr = s->_segMan->getHunkPointer(memoryId);
+ memset(memoryPtr, 0, BITMAP_HEADER_SIZE); // zero out the bitmap header
+ memset(memoryPtr + BITMAP_HEADER_SIZE, back, width * height);
+ // Save totalWidth, totalHeight
+ // TODO: Save the whole bitmap header, like SSCI does
+ WRITE_LE_UINT16(memoryPtr, width);
+ WRITE_LE_UINT16(memoryPtr + 2, height);
+ return memoryId;
+ }
+ break;
+ case 1: // dispose text bitmap surface
+ return kDisposeTextBitmap(s, argc - 1, argv + 1);
+ case 2: // dispose bitmap surface, with extra param
+ // 2 params, called e.g. from MenuItem::dispose in Torin's Passage,
+ // script 64893
+ warning("kBitmap(2), unk1 %d, bitmap ptr %04x:%04x", argv[1].toUint16(), PRINT_REG(argv[2]));
+ break;
+ case 3: // tiled surface
+ {
+ // 6 params, called e.g. from TiledBitmap::resize() in Torin's Passage,
+ // script 64869
+ reg_t hunkId = argv[1]; // obtained from kBitmap(0)
+ // The tiled view seems to always have 2 loops.
+ // These loops need to have 1 cel in loop 0 and 8 cels in loop 1.
+ uint16 viewNum = argv[2].toUint16(); // vTiles selector
+ uint16 loop = argv[3].toUint16();
+ uint16 cel = argv[4].toUint16();
+ uint16 x = argv[5].toUint16();
+ uint16 y = argv[6].toUint16();
+
+ byte *memoryPtr = s->_segMan->getHunkPointer(hunkId);
+ // Get totalWidth, totalHeight
+ uint16 totalWidth = READ_LE_UINT16(memoryPtr);
+ uint16 totalHeight = READ_LE_UINT16(memoryPtr + 2);
+ byte *bitmap = memoryPtr + BITMAP_HEADER_SIZE;
+
+ GfxView *view = g_sci->_gfxCache->getView(viewNum);
+ uint16 tileWidth = view->getWidth(loop, cel);
+ uint16 tileHeight = view->getHeight(loop, cel);
+ const byte *tileBitmap = view->getBitmap(loop, cel);
+ uint16 width = MIN<uint16>(totalWidth - x, tileWidth);
+ uint16 height = MIN<uint16>(totalHeight - y, tileHeight);
+
+ for (uint16 curY = 0; curY < height; curY++) {
+ for (uint16 curX = 0; curX < width; curX++) {
+ bitmap[(curY + y) * totalWidth + (curX + x)] = tileBitmap[curY * tileWidth + curX];
+ }
+ }
+
+ }
+ break;
+ case 4: // add text to bitmap
+ {
+ // 13 params, called e.g. from TextButton::createBitmap() in Torin's Passage,
+ // script 64894
+ reg_t hunkId = argv[1]; // obtained from kBitmap(0)
+ Common::String text = s->_segMan->getString(argv[2]);
+ uint16 textX = argv[3].toUint16();
+ uint16 textY = argv[4].toUint16();
+ //reg_t unk5 = argv[5];
+ //reg_t unk6 = argv[6];
+ //reg_t unk7 = argv[7]; // skip?
+ //reg_t unk8 = argv[8]; // back?
+ //reg_t unk9 = argv[9];
+ uint16 fontId = argv[10].toUint16();
+ //uint16 mode = argv[11].toUint16();
+ uint16 dimmed = argv[12].toUint16();
+ //warning("kBitmap(4): bitmap ptr %04x:%04x, font %d, mode %d, dimmed %d - text: \"%s\"",
+ // PRINT_REG(bitmapPtr), font, mode, dimmed, text.c_str());
+ uint16 foreColor = 255; // TODO
+
+ byte *memoryPtr = s->_segMan->getHunkPointer(hunkId);
+ // Get totalWidth, totalHeight
+ uint16 totalWidth = READ_LE_UINT16(memoryPtr);
+ uint16 totalHeight = READ_LE_UINT16(memoryPtr + 2);
+ byte *bitmap = memoryPtr + BITMAP_HEADER_SIZE;
+
+ GfxFont *font = g_sci->_gfxCache->getFont(fontId);
+
+ int16 charCount = 0;
+ uint16 curX = textX, curY = textY;
+ const char *txt = text.c_str();
+
+ while (*txt) {
+ charCount = g_sci->_gfxText32->GetLongest(txt, totalWidth, font);
+ if (charCount == 0)
+ break;
+
+ for (int i = 0; i < charCount; i++) {
+ unsigned char curChar = txt[i];
+ font->drawToBuffer(curChar, curY, curX, foreColor, dimmed, bitmap, totalWidth, totalHeight);
+ curX += font->getCharWidth(curChar);
+ }
+
+ curX = textX;
+ curY += font->getHeight();
+ txt += charCount;
+ while (*txt == ' ')
+ txt++; // skip over breaking spaces
+ }
+
+ }
+ break;
+ case 5: // fill with color
+ {
+ // 6 params, called e.g. from TextView::init() and TextView::draw()
+ // in Torin's Passage, script 64890
+ reg_t hunkId = argv[1]; // obtained from kBitmap(0)
+ uint16 x = argv[2].toUint16();
+ uint16 y = argv[3].toUint16();
+ uint16 fillWidth = argv[4].toUint16(); // width - 1
+ uint16 fillHeight = argv[5].toUint16(); // height - 1
+ uint16 back = argv[6].toUint16();
+
+ byte *memoryPtr = s->_segMan->getHunkPointer(hunkId);
+ // Get totalWidth, totalHeight
+ uint16 totalWidth = READ_LE_UINT16(memoryPtr);
+ uint16 totalHeight = READ_LE_UINT16(memoryPtr + 2);
+ uint16 width = MIN<uint16>(totalWidth - x, fillWidth);
+ uint16 height = MIN<uint16>(totalHeight - y, fillHeight);
+ byte *bitmap = memoryPtr + BITMAP_HEADER_SIZE;
+
+ for (uint16 curY = 0; curY < height; curY++) {
+ for (uint16 curX = 0; curX < width; curX++) {
+ bitmap[(curY + y) * totalWidth + (curX + x)] = back;
+ }
+ }
+
+ }
+ break;
+ default:
+ kStub(s, argc, argv);
+ break;
+ }
+
+ return s->r_acc;
+}
+
+// Used for edit boxes in save/load dialogs. It's a rewritten version of kEditControl,
+// but it handles events on its own, using an internal loop, instead of using SCI
+// scripts for event management like kEditControl does. Called by script 64914,
+// DEdit::hilite().
+reg_t kEditText(EngineState *s, int argc, reg_t *argv) {
+ reg_t controlObject = argv[0];
+
+ if (!controlObject.isNull()) {
+ g_sci->_gfxControls32->kernelTexteditChange(controlObject);
+ }
+
+ return s->r_acc;
+}
+
+#endif
+
+} // End of namespace Sci
diff --git a/engines/sci/engine/script_patches.cpp b/engines/sci/engine/script_patches.cpp
index 187f1ce021..69eb377684 100644
--- a/engines/sci/engine/script_patches.cpp
+++ b/engines/sci/engine/script_patches.cpp
@@ -775,7 +775,7 @@ const uint16 mothergoose256PatchReplay[] = {
PATCH_END
};
-// when saving, it also checks if the savegame-id is below 13.
+// when saving, it also checks if the savegame ID is below 13.
// we change this to check if below 113 instead
const byte mothergoose256SignatureSaveLimit[] = {
5,
diff --git a/engines/sci/engine/selector.cpp b/engines/sci/engine/selector.cpp
index a8b1cf7ec2..2f6b4d58dd 100644
--- a/engines/sci/engine/selector.cpp
+++ b/engines/sci/engine/selector.cpp
@@ -181,6 +181,7 @@ void Kernel::mapSelectors() {
FIND_SELECTOR(skip);
FIND_SELECTOR(fixPriority);
FIND_SELECTOR(mirrored);
+ FIND_SELECTOR(visible);
FIND_SELECTOR(useInsetRect);
FIND_SELECTOR(inTop);
FIND_SELECTOR(inLeft);
diff --git a/engines/sci/engine/selector.h b/engines/sci/engine/selector.h
index 4b913a866a..2308a6c387 100644
--- a/engines/sci/engine/selector.h
+++ b/engines/sci/engine/selector.h
@@ -149,6 +149,7 @@ struct SelectorCache {
Selector fixPriority;
Selector mirrored;
+ Selector visible;
Selector useInsetRect;
Selector inTop, inLeft, inBottom, inRight;
diff --git a/engines/sci/engine/vm.h b/engines/sci/engine/vm.h
index 334d224baf..cdd9b9a06e 100644
--- a/engines/sci/engine/vm.h
+++ b/engines/sci/engine/vm.h
@@ -139,7 +139,7 @@ enum {
GC_INTERVAL = 0x8000
};
-enum sci_opcodes {
+enum SciOpcodes {
op_bnot = 0x00, // 000
op_add = 0x01, // 001
op_sub = 0x02, // 002
diff --git a/engines/sci/engine/workarounds.cpp b/engines/sci/engine/workarounds.cpp
index 4a0aea81ff..c1d4a3d9f9 100644
--- a/engines/sci/engine/workarounds.cpp
+++ b/engines/sci/engine/workarounds.cpp
@@ -176,6 +176,7 @@ const SciWorkaroundEntry kAbs_workarounds[] = {
{ GID_HOYLE1, 2, 2, 0, "room2", "doit", -1, 0, { WORKAROUND_FAKE, 0x3e9 } }, // old maid - called with objects instead of integers
{ GID_HOYLE1, 3, 3, 0, "room3", "doit", -1, 0, { WORKAROUND_FAKE, 0x3e9 } }, // hearts - called with objects instead of integers
{ GID_QFG1VGA, -1, -1, 0, NULL, "doit", -1, 0, { WORKAROUND_FAKE, 0x3e9 } }, // when the game is patched with the NRS patch
+ { GID_QFG3 , -1, -1, 0, NULL, "doit", -1, 0, { WORKAROUND_FAKE, 0x3e9 } }, // when the game is patched with the NRS patch (bugs #3528416, #3528542)
SCI_WORKAROUNDENTRY_TERMINATOR
};
@@ -321,8 +322,9 @@ const SciWorkaroundEntry kGraphRedrawBox_workarounds[] = {
// gameID, room,script,lvl, object-name, method-name, call,index, workaround
const SciWorkaroundEntry kGraphUpdateBox_workarounds[] = {
{ GID_ECOQUEST2, 100, 333, 0, "showEcorder", "changeState", -1, 0, { WORKAROUND_STILLCALL, 0 } }, // necessary workaround for our ecorder script patch, because there isn't enough space to patch the function
- { GID_PQ3, 202, 202, 0, "MapEdit", "movePt", -1, 0, { WORKAROUND_STILLCALL, 0 } }, // when plotting crimes, gets called with 2 extra parameters - bug #3038077
{ GID_PQ3, 202, 202, 0, "MapEdit", "addPt", -1, 0, { WORKAROUND_STILLCALL, 0 } }, // when plotting crimes, gets called with 2 extra parameters - bug #3038077
+ { GID_PQ3, 202, 202, 0, "MapEdit", "movePt", -1, 0, { WORKAROUND_STILLCALL, 0 } }, // when plotting crimes, gets called with 2 extra parameters - bug #3038077
+ { GID_PQ3, 202, 202, 0, "MapEdit", "dispose", -1, 0, { WORKAROUND_STILLCALL, 0 } }, // when plotting crimes, gets called with 2 extra parameters
SCI_WORKAROUNDENTRY_TERMINATOR
};
diff --git a/engines/sci/graphics/frameout.cpp b/engines/sci/graphics/frameout.cpp
index b12413ab69..709a708d8b 100644
--- a/engines/sci/graphics/frameout.cpp
+++ b/engines/sci/graphics/frameout.cpp
@@ -31,6 +31,7 @@
#include "graphics/surface.h"
#include "sci/sci.h"
+#include "sci/console.h"
#include "sci/engine/kernel.h"
#include "sci/engine/state.h"
#include "sci/engine/selector.h"
@@ -237,6 +238,7 @@ void GfxFrameout::kernelAddScreenItem(reg_t object) {
memset(itemEntry, 0, sizeof(FrameoutEntry));
itemEntry->object = object;
itemEntry->givenOrderNr = _screenItems.size();
+ itemEntry->visible = true;
_screenItems.push_back(itemEntry);
kernelUpdateScreenItem(object);
@@ -266,6 +268,11 @@ void GfxFrameout::kernelUpdateScreenItem(reg_t object) {
itemEntry->signal = readSelectorValue(_segMan, object, SELECTOR(signal));
itemEntry->scaleX = readSelectorValue(_segMan, object, SELECTOR(scaleX));
itemEntry->scaleY = readSelectorValue(_segMan, object, SELECTOR(scaleY));
+ itemEntry->visible = true;
+
+ // Check if the entry can be hidden
+ if (lookupSelector(_segMan, object, SELECTOR(visible), NULL, NULL) != kSelectorNone)
+ itemEntry->visible = readSelectorValue(_segMan, object, SELECTOR(visible));
}
void GfxFrameout::kernelDeleteScreenItem(reg_t object) {
@@ -433,6 +440,7 @@ void GfxFrameout::createPlaneItemList(reg_t planeObject, FrameoutList &itemList)
picEntry->x = planePicture->getSci32celX(pictureCelNr);
picEntry->picStartX = pictureIt->startX;
picEntry->picStartY = pictureIt->startY;
+ picEntry->visible = true;
picEntry->priority = planePicture->getSci32celPriority(pictureCelNr);
@@ -541,6 +549,9 @@ void GfxFrameout::kernelFrameout() {
for (FrameoutList::iterator listIterator = itemList.begin(); listIterator != itemList.end(); listIterator++) {
FrameoutEntry *itemEntry = *listIterator;
+ if (!itemEntry->visible)
+ continue;
+
if (itemEntry->object.isNull()) {
// Picture cel data
itemEntry->x = upscaleHorizontalCoordinate(itemEntry->x);
@@ -667,4 +678,54 @@ void GfxFrameout::kernelFrameout() {
g_sci->getEngineState()->_throttleTrigger = true;
}
+void GfxFrameout::printPlaneList(Console *con) {
+ for (PlaneList::const_iterator it = _planes.begin(); it != _planes.end(); ++it) {
+ PlaneEntry p = *it;
+ Common::String curPlaneName = _segMan->getObjectName(p.object);
+ Common::Rect r = p.upscaledPlaneRect;
+ Common::Rect cr = p.upscaledPlaneClipRect;
+
+ con->DebugPrintf("%04x:%04x (%s): prio %d, lastprio %d, offsetX %d, offsetY %d, pic %d, mirror %d, back %d\n",
+ PRINT_REG(p.object), curPlaneName.c_str(),
+ (int16)p.priority, (int16)p.lastPriority,
+ p.planeOffsetX, p.planeOffsetY, p.pictureId,
+ p.planePictureMirrored, p.planeBack);
+ con->DebugPrintf(" rect: (%d, %d, %d, %d), clip rect: (%d, %d, %d, %d)\n",
+ r.left, r.top, r.right, r.bottom,
+ cr.left, cr.top, cr.right, cr.bottom);
+
+ if (p.pictureId != 0xffff && p.pictureId != 0xfffe) {
+ con->DebugPrintf("Pictures:\n");
+
+ for (PlanePictureList::iterator pictureIt = _planePictures.begin(); pictureIt != _planePictures.end(); pictureIt++) {
+ if (pictureIt->object == p.object) {
+ con->DebugPrintf(" Picture %d: x %d, y %d\n", pictureIt->pictureId, pictureIt->startX, pictureIt->startY);
+ }
+ }
+ }
+ }
+}
+
+void GfxFrameout::printPlaneItemList(Console *con, reg_t planeObject) {
+ for (FrameoutList::iterator listIterator = _screenItems.begin(); listIterator != _screenItems.end(); listIterator++) {
+ FrameoutEntry *e = *listIterator;
+ reg_t itemPlane = readSelector(_segMan, e->object, SELECTOR(plane));
+
+ if (planeObject == itemPlane) {
+ Common::String curItemName = _segMan->getObjectName(e->object);
+ Common::Rect icr = e->celRect;
+ GuiResourceId picId = e->picture ? e->picture->getResourceId() : 0;
+
+ con->DebugPrintf("%d: %04x:%04x (%s), view %d, loop %d, cel %d, x %d, y %d, z %d, "
+ "signal %d, scale signal %d, scaleX %d, scaleY %d, rect (%d, %d, %d, %d), "
+ "pic %d, picX %d, picY %d, visible %d\n",
+ e->givenOrderNr, PRINT_REG(e->object), curItemName.c_str(),
+ e->viewId, e->loopNo, e->celNo, e->x, e->y, e->z,
+ e->signal, e->scaleSignal, e->scaleX, e->scaleY,
+ icr.left, icr.top, icr.right, icr.bottom,
+ picId, e->picStartX, e->picStartY, e->visible);
+ }
+ }
+}
+
} // End of namespace Sci
diff --git a/engines/sci/graphics/frameout.h b/engines/sci/graphics/frameout.h
index 8c3cc261d5..ec4de62c0a 100644
--- a/engines/sci/graphics/frameout.h
+++ b/engines/sci/graphics/frameout.h
@@ -60,6 +60,7 @@ struct FrameoutEntry {
GfxPicture *picture;
int16 picStartX;
int16 picStartY;
+ bool visible;
};
typedef Common::List<FrameoutEntry *> FrameoutList;
@@ -103,6 +104,8 @@ public:
void addPlanePicture(reg_t object, GuiResourceId pictureId, uint16 startX, uint16 startY = 0);
void deletePlanePictures(reg_t object);
void clear();
+ void printPlaneList(Console *con);
+ void printPlaneItemList(Console *con, reg_t planeObject);
private:
void showVideo();
diff --git a/engines/sci/graphics/text32.cpp b/engines/sci/graphics/text32.cpp
index 7894c7109c..cd24ca5a99 100644
--- a/engines/sci/graphics/text32.cpp
+++ b/engines/sci/graphics/text32.cpp
@@ -187,8 +187,11 @@ void GfxText32::drawTextBitmap(int16 x, int16 y, Common::Rect planeRect, reg_t t
byte *memoryPtr = _segMan->getHunkPointer(hunkId);
- if (!memoryPtr)
- error("Attempt to draw an invalid text bitmap");
+ if (!memoryPtr) {
+ // Happens when restoring in some SCI32 games
+ warning("Attempt to draw an invalid text bitmap");
+ return;
+ }
byte *surface = memoryPtr + BITMAP_HEADER_SIZE;
diff --git a/engines/sci/graphics/view.cpp b/engines/sci/graphics/view.cpp
index a77bcccc52..4e5c4da8b2 100644
--- a/engines/sci/graphics/view.cpp
+++ b/engines/sci/graphics/view.cpp
@@ -720,6 +720,19 @@ void GfxView::draw(const Common::Rect &rect, const Common::Rect &clipRect, const
bitmap += (clipRect.top - rect.top) * celWidth + (clipRect.left - rect.left);
+ // WORKAROUND: EcoQuest French and German draw the fish and anemone sprites
+ // with priority 15 in scene 440. Afterwards, a dialog is shown on top of
+ // these sprites with priority 15 as well. This is undefined behavior
+ // actually, as the sprites and dialog share the same priority, so in our
+ // implementation the sprites get drawn incorrectly on top of the dialog.
+ // Perhaps this worked by mistake in SSCI because of subtle differences in
+ // how sprites are drawn. We compensate for this by resetting the priority
+ // of all sprites that have a priority of 15 in scene 440 to priority 14,
+ // so that the speech bubble can be drawn correctly on top of them. Fixes
+ // bug #3040625.
+ if (g_sci->getGameId() == GID_ECOQUEST && g_sci->getEngineState()->currentRoomNumber() == 440 && priority == 15)
+ priority = 14;
+
if (!_EGAmapping) {
for (y = 0; y < height; y++, bitmap += celWidth) {
for (x = 0; x < width; x++) {
diff --git a/engines/sci/module.mk b/engines/sci/module.mk
index 90a0f33f06..b6d5837b31 100644
--- a/engines/sci/module.mk
+++ b/engines/sci/module.mk
@@ -79,6 +79,7 @@ MODULE_OBJS := \
ifdef ENABLE_SCI32
MODULE_OBJS += \
+ engine/kgraphics32.o \
graphics/controls32.o \
graphics/frameout.o \
graphics/paint32.o \
diff --git a/engines/sci/resource.cpp b/engines/sci/resource.cpp
index 77a6a40a92..f8ddf64551 100644
--- a/engines/sci/resource.cpp
+++ b/engines/sci/resource.cpp
@@ -93,7 +93,7 @@ const char *getSciVersionDesc(SciVersion version) {
//#define SCI_VERBOSE_RESMAN 1
-static const char *const sci_error_types[] = {
+static const char *const s_errorDescriptions[] = {
"No error",
"I/O error",
"Resource is empty (size 0)",
@@ -101,10 +101,8 @@ static const char *const sci_error_types[] = {
"resource.map file not found",
"No resource files found",
"Unknown compression method",
- "Decompression failed: Decompression buffer overflow",
"Decompression failed: Sanity check failed",
- "Decompression failed: Resource too big",
- "SCI version is unsupported"
+ "Decompression failed: Resource too big"
};
static const char *const s_resourceTypeNames[] = {
@@ -576,7 +574,7 @@ void ResourceSource::loadResource(ResourceManager *resMan, Resource *res) {
if (error) {
warning("Error %d occurred while reading %s from resource file %s: %s",
error, res->_id.toString().c_str(), res->getResourceLocation().c_str(),
- sci_error_types[error]);
+ s_errorDescriptions[error]);
res->unalloc();
}
@@ -1876,6 +1874,9 @@ int Resource::readResourceInfo(ResVersion volVersion, Common::SeekableReadStream
uint32 wCompression, szUnpacked;
ResourceType type;
+ if (file->size() == 0)
+ return SCI_ERROR_EMPTY_RESOURCE;
+
switch (volVersion) {
case kResVersionSci0Sci1Early:
case kResVersionSci1Middle:
@@ -1920,7 +1921,7 @@ int Resource::readResourceInfo(ResVersion volVersion, Common::SeekableReadStream
break;
#endif
default:
- return SCI_ERROR_INVALID_RESMAP_ENTRY;
+ return SCI_ERROR_RESMAP_INVALID_ENTRY;
}
// check if there were errors while reading
@@ -1961,7 +1962,7 @@ int Resource::readResourceInfo(ResVersion volVersion, Common::SeekableReadStream
compression = kCompUnknown;
}
- return compression == kCompUnknown ? SCI_ERROR_UNKNOWN_COMPRESSION : 0;
+ return (compression == kCompUnknown) ? SCI_ERROR_UNKNOWN_COMPRESSION : SCI_ERROR_NONE;
}
int Resource::decompress(ResVersion volVersion, Common::SeekableReadStream *file) {
diff --git a/engines/sci/resource.h b/engines/sci/resource.h
index 294a4672e2..4baf39c67f 100644
--- a/engines/sci/resource.h
+++ b/engines/sci/resource.h
@@ -54,17 +54,17 @@ enum ResourceStatus {
kResStatusLocked /**< Allocated and in use */
};
-/** Initialization result types */
-enum {
+/** Resource error codes. Should be in sync with s_errorDescriptions */
+enum ResourceErrorCodes {
+ SCI_ERROR_NONE = 0,
SCI_ERROR_IO_ERROR = 1,
- SCI_ERROR_INVALID_RESMAP_ENTRY = 2, /**< Invalid resource.map entry */
- SCI_ERROR_RESMAP_NOT_FOUND = 3,
- SCI_ERROR_NO_RESOURCE_FILES_FOUND = 4, /**< No resource at all was found */
- SCI_ERROR_UNKNOWN_COMPRESSION = 5,
- SCI_ERROR_DECOMPRESSION_ERROR = 6, /**< sanity checks failed during decompression */
+ SCI_ERROR_EMPTY_RESOURCE = 2,
+ SCI_ERROR_RESMAP_INVALID_ENTRY = 3, /**< Invalid resource.map entry */
+ SCI_ERROR_RESMAP_NOT_FOUND = 4,
+ SCI_ERROR_NO_RESOURCE_FILES_FOUND = 5, /**< No resource at all was found */
+ SCI_ERROR_UNKNOWN_COMPRESSION = 6,
+ SCI_ERROR_DECOMPRESSION_ERROR = 7, /**< sanity checks failed during decompression */
SCI_ERROR_RESOURCE_TOO_BIG = 8 /**< Resource size exceeds SCI_MAX_RESOURCE_SIZE */
-
- /* the first critical error number */
};
enum {
diff --git a/engines/sci/sci.cpp b/engines/sci/sci.cpp
index 9b0ee6924b..960016764a 100644
--- a/engines/sci/sci.cpp
+++ b/engines/sci/sci.cpp
@@ -385,7 +385,7 @@ bool SciEngine::gameHasFanMadePatch() {
{ GID_PQ3, 994, 4686, 1291, 0x78 }, // English
{ GID_PQ3, 994, 4734, 1283, 0x78 }, // German
{ GID_QFG1VGA, 994, 4388, 0, 0x00 },
- { GID_QFG3, 994, 4714, 0, 0x00 },
+ { GID_QFG3, 33, 260, 0, 0x00 },
// TODO: Disabled, as it fixes a whole lot of bugs which can't be tested till SCI2.1 support is finished
//{ GID_QFG4, 710, 11477, 0, 0x00 },
{ GID_SQ1, 994, 4740, 0, 0x00 },
diff --git a/engines/scumm/he/resource_he.cpp b/engines/scumm/he/resource_he.cpp
index 42748d08ed..ce4b2239d2 100644
--- a/engines/scumm/he/resource_he.cpp
+++ b/engines/scumm/he/resource_he.cpp
@@ -129,7 +129,7 @@ bool Win32ResExtractor::extractResource(int id, CachedCursor *cc) {
if (!group)
return false;
- Graphics::WinCursor *cursor = group->cursors[0].cursor;
+ Graphics::Cursor *cursor = group->cursors[0].cursor;
cc->bitmap = new byte[cursor->getWidth() * cursor->getHeight()];
cc->width = cursor->getWidth();
diff --git a/engines/sword1/animation.cpp b/engines/sword1/animation.cpp
index 1e2964054a..a70ca960ba 100644
--- a/engines/sword1/animation.cpp
+++ b/engines/sword1/animation.cpp
@@ -510,11 +510,11 @@ DXADecoderWithSound::DXADecoderWithSound(Audio::Mixer *mixer, Audio::SoundHandle
: _mixer(mixer), _bgSoundHandle(bgSoundHandle) {
}
-uint32 DXADecoderWithSound::getElapsedTime() const {
+uint32 DXADecoderWithSound::getTime() const {
if (_mixer->isSoundHandleActive(*_bgSoundHandle))
return _mixer->getSoundElapsedTime(*_bgSoundHandle);
- return DXADecoder::getElapsedTime();
+ return DXADecoder::getTime();
}
///////////////////////////////////////////////////////////////////////////////
diff --git a/engines/sword1/animation.h b/engines/sword1/animation.h
index f64b03dd1b..c2ed86a1a3 100644
--- a/engines/sword1/animation.h
+++ b/engines/sword1/animation.h
@@ -60,7 +60,7 @@ public:
DXADecoderWithSound(Audio::Mixer *mixer, Audio::SoundHandle *bgSoundHandle);
~DXADecoderWithSound() {}
- uint32 getElapsedTime() const;
+ uint32 getTime() const;
private:
Audio::Mixer *_mixer;
diff --git a/engines/sword2/animation.cpp b/engines/sword2/animation.cpp
index e77ae98163..90ee7375ab 100644
--- a/engines/sword2/animation.cpp
+++ b/engines/sword2/animation.cpp
@@ -410,11 +410,11 @@ DXADecoderWithSound::DXADecoderWithSound(Audio::Mixer *mixer, Audio::SoundHandle
: _mixer(mixer), _bgSoundHandle(bgSoundHandle) {
}
-uint32 DXADecoderWithSound::getElapsedTime() const {
+uint32 DXADecoderWithSound::getTime() const {
if (_mixer->isSoundHandleActive(*_bgSoundHandle))
return _mixer->getSoundElapsedTime(*_bgSoundHandle);
- return DXADecoder::getElapsedTime();
+ return DXADecoder::getTime();
}
///////////////////////////////////////////////////////////////////////////////
diff --git a/engines/sword2/animation.h b/engines/sword2/animation.h
index 3ef8dac754..3d5c42b7f7 100644
--- a/engines/sword2/animation.h
+++ b/engines/sword2/animation.h
@@ -60,7 +60,7 @@ public:
DXADecoderWithSound(Audio::Mixer *mixer, Audio::SoundHandle *bgSoundHandle);
~DXADecoderWithSound() {}
- uint32 getElapsedTime() const;
+ uint32 getTime() const;
private:
Audio::Mixer *_mixer;
Audio::SoundHandle *_bgSoundHandle;
diff --git a/engines/sword25/fmv/movieplayer.cpp b/engines/sword25/fmv/movieplayer.cpp
index 1acb366b3a..4609565223 100644
--- a/engines/sword25/fmv/movieplayer.cpp
+++ b/engines/sword25/fmv/movieplayer.cpp
@@ -167,7 +167,7 @@ void MoviePlayer::setScaleFactor(float scaleFactor) {
}
double MoviePlayer::getTime() {
- return _decoder.getElapsedTime() / 1000.0;
+ return _decoder.getTime() / 1000.0;
}
#else // USE_THEORADEC
diff --git a/engines/sword25/fmv/theora_decoder.cpp b/engines/sword25/fmv/theora_decoder.cpp
index a7ebb5df8c..082c569fda 100644
--- a/engines/sword25/fmv/theora_decoder.cpp
+++ b/engines/sword25/fmv/theora_decoder.cpp
@@ -507,7 +507,7 @@ uint32 TheoraDecoder::getTimeToNextFrame() const {
if (endOfVideo() || _curFrame < 0)
return 0;
- uint32 elapsedTime = getElapsedTime();
+ uint32 elapsedTime = getTime();
uint32 nextFrameStartTime = (uint32)(_nextFrameStartTime * 1000);
if (nextFrameStartTime <= elapsedTime)
@@ -516,11 +516,11 @@ uint32 TheoraDecoder::getTimeToNextFrame() const {
return nextFrameStartTime - elapsedTime;
}
-uint32 TheoraDecoder::getElapsedTime() const {
+uint32 TheoraDecoder::getTime() const {
if (_audStream)
return g_system->getMixer()->getSoundElapsedTime(*_audHandle);
- return VideoDecoder::getElapsedTime();
+ return VideoDecoder::getTime();
}
void TheoraDecoder::pauseVideoIntern(bool pause) {
diff --git a/engines/sword25/fmv/theora_decoder.h b/engines/sword25/fmv/theora_decoder.h
index e8cc5ab8b9..4fd7cc0f03 100644
--- a/engines/sword25/fmv/theora_decoder.h
+++ b/engines/sword25/fmv/theora_decoder.h
@@ -81,7 +81,7 @@ public:
}
Graphics::PixelFormat getPixelFormat() const { return _displaySurface.format; }
- uint32 getElapsedTime() const;
+ uint32 getTime() const;
uint32 getTimeToNextFrame() const;
bool endOfVideo() const;
diff --git a/engines/tinsel/actors.cpp b/engines/tinsel/actors.cpp
index acacd89667..a784ff5788 100644
--- a/engines/tinsel/actors.cpp
+++ b/engines/tinsel/actors.cpp
@@ -340,7 +340,7 @@ void RestoreActorProcess(int id, INT_CONTEXT *pic, bool savegameFlag) {
if (savegameFlag)
pic->resumeState = RES_SAVEGAME;
- g_scheduler->createProcess(PID_TCODE, ActorRestoredProcess, &r, sizeof(r));
+ CoroScheduler.createProcess(PID_TCODE, ActorRestoredProcess, &r, sizeof(r));
}
/**
@@ -358,7 +358,7 @@ void ActorEvent(int ano, TINSEL_EVENT event, PLR_EVENT be) {
atp.event = event;
atp.bev = be;
atp.pic = NULL;
- g_scheduler->createProcess(PID_TCODE, ActorTinselProcess, &atp, sizeof(atp));
+ CoroScheduler.createProcess(PID_TCODE, ActorTinselProcess, &atp, sizeof(atp));
}
}
@@ -369,7 +369,7 @@ void ActorEvent(CORO_PARAM, int ano, TINSEL_EVENT tEvent, bool bWait, int myEsca
ATP_INIT atp;
int index;
CORO_BEGIN_CONTEXT;
- PPROCESS pProc;
+ Common::PPROCESS pProc;
CORO_END_CONTEXT(_ctx);
CORO_BEGIN_CODE(_ctx);
@@ -389,7 +389,7 @@ void ActorEvent(CORO_PARAM, int ano, TINSEL_EVENT tEvent, bool bWait, int myEsca
myEscape);
if (atp.pic != NULL) {
- _ctx->pProc = g_scheduler->createProcess(PID_TCODE, ActorTinselProcess, &atp, sizeof(atp));
+ _ctx->pProc = CoroScheduler.createProcess(PID_TCODE, ActorTinselProcess, &atp, sizeof(atp));
AttachInterpret(atp.pic, _ctx->pProc);
if (bWait)
@@ -474,8 +474,8 @@ void StartTaggedActors(SCNHANDLE ah, int numActors, bool bRunScript) {
// Run actor's script for this scene
if (bRunScript) {
// Send in reverse order - they get swapped round in the scheduler
- ActorEvent(nullContext, taggedActors[i].id, SHOWEVENT, false, 0);
- ActorEvent(nullContext, taggedActors[i].id, STARTUP, false, 0);
+ ActorEvent(Common::nullContext, taggedActors[i].id, SHOWEVENT, false, 0);
+ ActorEvent(Common::nullContext, taggedActors[i].id, STARTUP, false, 0);
}
}
}
diff --git a/engines/tinsel/background.h b/engines/tinsel/background.h
index 34f1bd6dd2..cfa3998eda 100644
--- a/engines/tinsel/background.h
+++ b/engines/tinsel/background.h
@@ -24,9 +24,9 @@
#ifndef TINSEL_BACKGND_H // prevent multiple includes
#define TINSEL_BACKGND_H
+#include "common/coroutines.h"
#include "common/frac.h"
#include "common/rect.h"
-#include "tinsel/coroutine.h"
#include "tinsel/dw.h" // for SCNHANDLE
#include "tinsel/palette.h" // palette definitions
diff --git a/engines/tinsel/bg.cpp b/engines/tinsel/bg.cpp
index 72ba05f0b9..a3e21a8227 100644
--- a/engines/tinsel/bg.cpp
+++ b/engines/tinsel/bg.cpp
@@ -255,17 +255,17 @@ void StartupBackground(CORO_PARAM, SCNHANDLE hFilm) {
g_BGspeed = ONE_SECOND / FROM_LE_32(pfilm->frate);
// Start display process for each reel in the film
- g_scheduler->createProcess(PID_REEL, BGmainProcess, &pfilm->reels[0], sizeof(FREEL));
+ CoroScheduler.createProcess(PID_REEL, BGmainProcess, &pfilm->reels[0], sizeof(FREEL));
if (TinselV0) {
for (uint i = 1; i < FROM_LE_32(pfilm->numreels); ++i)
- g_scheduler->createProcess(PID_REEL, BGotherProcess, &pfilm->reels[i], sizeof(FREEL));
+ CoroScheduler.createProcess(PID_REEL, BGotherProcess, &pfilm->reels[i], sizeof(FREEL));
}
if (g_pBG[0] == NULL)
ControlStartOff();
- if (TinselV2 && (coroParam != nullContext))
+ if (TinselV2 && (coroParam != Common::nullContext))
CORO_GIVE_WAY;
CORO_END_CODE;
diff --git a/engines/tinsel/bmv.cpp b/engines/tinsel/bmv.cpp
index 24d47b920f..438fd52a81 100644
--- a/engines/tinsel/bmv.cpp
+++ b/engines/tinsel/bmv.cpp
@@ -529,7 +529,7 @@ int BMVPlayer::MovieCommand(char cmd, int commandOffset) {
if (cmd & CD_PRINT) {
PRINT_CMD *pCmd = (PRINT_CMD *)(bigBuffer + commandOffset);
- MovieText(nullContext, (int16)READ_LE_UINT16(&pCmd->stringId),
+ MovieText(Common::nullContext, (int16)READ_LE_UINT16(&pCmd->stringId),
(int16)READ_LE_UINT16(&pCmd->x),
(int16)READ_LE_UINT16(&pCmd->y),
pCmd->fontId,
@@ -542,7 +542,7 @@ int BMVPlayer::MovieCommand(char cmd, int commandOffset) {
TALK_CMD *pCmd = (TALK_CMD *)(bigBuffer + commandOffset);
talkColor = TINSEL_RGB(pCmd->r, pCmd->g, pCmd->b);
- MovieText(nullContext, (int16)READ_LE_UINT16(&pCmd->stringId),
+ MovieText(Common::nullContext, (int16)READ_LE_UINT16(&pCmd->stringId),
(int16)READ_LE_UINT16(&pCmd->x),
(int16)READ_LE_UINT16(&pCmd->y),
0,
diff --git a/engines/tinsel/bmv.h b/engines/tinsel/bmv.h
index eadf65c3aa..fa254ed26d 100644
--- a/engines/tinsel/bmv.h
+++ b/engines/tinsel/bmv.h
@@ -24,12 +24,12 @@
#ifndef TINSEL_BMV_H
#define TINSEL_BMV_H
+#include "common/coroutines.h"
#include "common/file.h"
#include "audio/audiostream.h"
#include "audio/mixer.h"
-#include "tinsel/coroutine.h"
#include "tinsel/object.h"
#include "tinsel/palette.h"
diff --git a/engines/tinsel/coroutine.cpp b/engines/tinsel/coroutine.cpp
deleted file mode 100644
index ef0097f043..0000000000
--- a/engines/tinsel/coroutine.cpp
+++ /dev/null
@@ -1,82 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-#include "tinsel/coroutine.h"
-#include "common/hashmap.h"
-#include "common/hash-str.h"
-
-namespace Tinsel {
-
-
-CoroContext nullContext = NULL; // FIXME: Avoid non-const global vars
-
-
-#if COROUTINE_DEBUG
-namespace {
-static int s_coroCount = 0;
-
-typedef Common::HashMap<Common::String, int> CoroHashMap;
-static CoroHashMap *s_coroFuncs = 0;
-
-static void changeCoroStats(const char *func, int change) {
- if (!s_coroFuncs)
- s_coroFuncs = new CoroHashMap();
-
- (*s_coroFuncs)[func] += change;
-}
-
-static void displayCoroStats() {
- debug("%d active coros", s_coroCount);
-
- // Loop over s_coroFuncs and print info about active coros
- if (!s_coroFuncs)
- return;
- for (CoroHashMap::const_iterator it = s_coroFuncs->begin();
- it != s_coroFuncs->end(); ++it) {
- if (it->_value != 0)
- debug(" %3d x %s", it->_value, it->_key.c_str());
- }
-}
-
-}
-#endif
-
-CoroBaseContext::CoroBaseContext(const char *func)
- : _line(0), _sleep(0), _subctx(0) {
-#if COROUTINE_DEBUG
- _funcName = func;
- changeCoroStats(_funcName, +1);
- s_coroCount++;
-#endif
-}
-
-CoroBaseContext::~CoroBaseContext() {
-#if COROUTINE_DEBUG
- s_coroCount--;
- changeCoroStats(_funcName, -1);
- debug("Deleting coro in %s at %p (subctx %p)",
- _funcName, (void *)this, (void *)_subctx);
- displayCoroStats();
-#endif
- delete _subctx;
-}
-
-} // End of namespace Tinsel
diff --git a/engines/tinsel/dialogs.cpp b/engines/tinsel/dialogs.cpp
index 5396e47566..fbe9e8d1f6 100644
--- a/engines/tinsel/dialogs.cpp
+++ b/engines/tinsel/dialogs.cpp
@@ -1075,7 +1075,7 @@ static void PrimeSceneHopper() {
uint32 vSize;
// Open the file (it's on the CD)
- CdCD(nullContext);
+ CdCD(Common::nullContext);
if (!f.open(HOPPER_FILENAME))
error(CANNOT_FIND_FILE, HOPPER_FILENAME);
@@ -1191,13 +1191,13 @@ static void HopAction() {
debugC(DEBUG_BASIC, kTinselDebugAnimations, "Scene hopper chose scene %xh,%d\n", hScene, eNumber);
if (FROM_LE_32(pEntry->flags) & fCall) {
- SaveScene(nullContext);
- NewScene(nullContext, g_pChosenScene->hScene, pEntry->eNumber, TRANS_FADE);
+ SaveScene(Common::nullContext);
+ NewScene(Common::nullContext, g_pChosenScene->hScene, pEntry->eNumber, TRANS_FADE);
}
else if (FROM_LE_32(pEntry->flags) & fHook)
HookScene(hScene, eNumber, TRANS_FADE);
else
- NewScene(nullContext, hScene, eNumber, TRANS_CUT);
+ NewScene(Common::nullContext, hScene, eNumber, TRANS_CUT);
}
/**************************************************************************/
@@ -1406,13 +1406,13 @@ static void InvTinselEvent(INV_OBJECT *pinvo, TINSEL_EVENT event, PLR_EVENT be,
return;
g_GlitterIndex = index;
- g_scheduler->createProcess(PID_TCODE, ObjectProcess, &to, sizeof(to));
+ CoroScheduler.createProcess(PID_TCODE, ObjectProcess, &to, sizeof(to));
}
extern void ObjectEvent(CORO_PARAM, int objId, TINSEL_EVENT event, bool bWait, int myEscape, bool *result) {
// COROUTINE
CORO_BEGIN_CONTEXT;
- PROCESS *pProc;
+ Common::PROCESS *pProc;
INV_OBJECT *pInvo;
OP_INIT op;
CORO_END_CONTEXT(_ctx);
@@ -1428,7 +1428,7 @@ extern void ObjectEvent(CORO_PARAM, int objId, TINSEL_EVENT event, bool bWait, i
_ctx->op.event = event;
_ctx->op.myEscape = myEscape;
- g_scheduler->createProcess(PID_TCODE, ObjectProcess, &_ctx->op, sizeof(_ctx->op));
+ CoroScheduler.createProcess(PID_TCODE, ObjectProcess, &_ctx->op, sizeof(_ctx->op));
if (bWait)
CORO_INVOKE_2(WaitInterpret, _ctx->pProc, result);
@@ -3540,9 +3540,9 @@ extern void ConvAction(int index) {
}
if (g_thisConvPoly != NOPOLY)
- PolygonEvent(nullContext, g_thisConvPoly, CONVERSE, 0, false, 0);
+ PolygonEvent(Common::nullContext, g_thisConvPoly, CONVERSE, 0, false, 0);
else
- ActorEvent(nullContext, g_thisConvActor, CONVERSE, false, 0);
+ ActorEvent(Common::nullContext, g_thisConvActor, CONVERSE, false, 0);
}
}
@@ -5128,7 +5128,7 @@ static void InvPickup(int index) {
if (TinselV2)
InvPutDown(index);
else
- g_scheduler->createProcess(PID_TCODE, InvPdProcess, &index, sizeof(index));
+ CoroScheduler.createProcess(PID_TCODE, InvPdProcess, &index, sizeof(index));
}
}
}
diff --git a/engines/tinsel/drives.cpp b/engines/tinsel/drives.cpp
index d815fd165d..5c4b939e4e 100644
--- a/engines/tinsel/drives.cpp
+++ b/engines/tinsel/drives.cpp
@@ -48,13 +48,13 @@ void CdCD(CORO_PARAM) {
CORO_BEGIN_CODE(_ctx);
while (g_bChangingCD) {
- if (g_scheduler->getCurrentProcess()) {
- // FIXME: CdCD gets passed a nullContext in RegisterGlobals() and
+ if (CoroScheduler.getCurrentProcess()) {
+ // FIXME: CdCD gets passed a Common::nullContext in RegisterGlobals() and
// PrimeSceneHopper(), because I didn't know how to get a proper
// context without converting the whole calling stack to CORO'd
// functions. If these functions really get called while a CD
// change is requested, this needs to be resolved.
- if (coroParam == nullContext)
+ if (coroParam == Common::nullContext)
error("CdCD needs context");
CORO_SLEEP(1);
} else
diff --git a/engines/tinsel/drives.h b/engines/tinsel/drives.h
index 907071d2f8..9e97b92fa5 100644
--- a/engines/tinsel/drives.h
+++ b/engines/tinsel/drives.h
@@ -24,9 +24,9 @@
#ifndef TINSEL_DRIVES_H
#define TINSEL_DRIVES_H
+#include "common/coroutines.h"
#include "common/stream.h"
#include "tinsel/dw.h"
-#include "tinsel/coroutine.h"
namespace Tinsel {
diff --git a/engines/tinsel/effect.cpp b/engines/tinsel/effect.cpp
index 22027b0f02..f5adb63c2b 100644
--- a/engines/tinsel/effect.cpp
+++ b/engines/tinsel/effect.cpp
@@ -108,7 +108,7 @@ static void FettleEffectPolys(int x, int y, int index, PMOVER pActor) {
epi.hEpoly = hPoly;
epi.pMover = pActor;
epi.index = index;
- g_scheduler->createProcess(PID_TCODE, EffectProcess, &epi, sizeof(epi));
+ CoroScheduler.createProcess(PID_TCODE, EffectProcess, &epi, sizeof(epi));
}
}
}
diff --git a/engines/tinsel/events.cpp b/engines/tinsel/events.cpp
index 74454c5f2a..1aa4d34227 100644
--- a/engines/tinsel/events.cpp
+++ b/engines/tinsel/events.cpp
@@ -22,10 +22,10 @@
* Also provides a couple of utility functions.
*/
+#include "common/coroutines.h"
#include "tinsel/actors.h"
#include "tinsel/background.h"
#include "tinsel/config.h"
-#include "tinsel/coroutine.h"
#include "tinsel/cursor.h"
#include "tinsel/dw.h"
#include "tinsel/events.h"
@@ -276,7 +276,7 @@ static void WalkProcess(CORO_PARAM, const void *param) {
void WalkTo(int x, int y) {
WP_INIT to = { x, y };
- g_scheduler->createProcess(PID_TCODE, WalkProcess, &to, sizeof(to));
+ CoroScheduler.createProcess(PID_TCODE, WalkProcess, &to, sizeof(to));
}
/**
@@ -295,7 +295,7 @@ static void ProcessUserEvent(TINSEL_EVENT uEvent, const Common::Point &coOrds, P
if ((actor = GetTaggedActor()) != 0) {
// Event for a tagged actor
if (TinselV2)
- ActorEvent(nullContext, actor, uEvent, false, 0);
+ ActorEvent(Common::nullContext, actor, uEvent, false, 0);
else
ActorEvent(actor, uEvent, be);
} else if ((hPoly = GetTaggedPoly()) != NOPOLY) {
@@ -303,7 +303,7 @@ static void ProcessUserEvent(TINSEL_EVENT uEvent, const Common::Point &coOrds, P
if (!TinselV2)
RunPolyTinselCode(hPoly, uEvent, be, false);
else if (uEvent != PROV_WALKTO)
- PolygonEvent(nullContext, hPoly, uEvent, 0, false, 0);
+ PolygonEvent(Common::nullContext, hPoly, uEvent, 0, false, 0);
} else {
GetCursorXY(&aniX, &aniY, true);
@@ -312,7 +312,7 @@ static void ProcessUserEvent(TINSEL_EVENT uEvent, const Common::Point &coOrds, P
if ((hPoly = InPolygon(aniX, aniY, TAG)) != NOPOLY ||
(!TinselV2 && ((hPoly = InPolygon(aniX, aniY, EXIT)) != NOPOLY))) {
if (TinselV2 && (uEvent != PROV_WALKTO))
- PolygonEvent(nullContext, hPoly, uEvent, 0, false, 0);
+ PolygonEvent(Common::nullContext, hPoly, uEvent, 0, false, 0);
else if (!TinselV2)
RunPolyTinselCode(hPoly, uEvent, be, false);
} else if ((uEvent == PROV_WALKTO) || (uEvent == WALKTO)) {
@@ -604,7 +604,7 @@ void PolyTinselProcess(CORO_PARAM, const void *param) {
void PolygonEvent(CORO_PARAM, HPOLYGON hPoly, TINSEL_EVENT tEvent, int actor, bool bWait,
int myEscape, bool *result) {
CORO_BEGIN_CONTEXT;
- PPROCESS pProc;
+ Common::PPROCESS pProc;
CORO_END_CONTEXT(_ctx);
CORO_BEGIN_CODE(_ctx);
@@ -623,7 +623,7 @@ void PolygonEvent(CORO_PARAM, HPOLYGON hPoly, TINSEL_EVENT tEvent, int actor, bo
NULL, // No Object
myEscape);
if (to.pic != NULL) {
- _ctx->pProc = g_scheduler->createProcess(PID_TCODE, PolyTinselProcess, &to, sizeof(to));
+ _ctx->pProc = CoroScheduler.createProcess(PID_TCODE, PolyTinselProcess, &to, sizeof(to));
AttachInterpret(to.pic, _ctx->pProc);
if (bWait)
@@ -640,14 +640,14 @@ void RunPolyTinselCode(HPOLYGON hPoly, TINSEL_EVENT event, PLR_EVENT be, bool tc
PTP_INIT to = { hPoly, event, be, tc, 0, NULL };
assert(!TinselV2);
- g_scheduler->createProcess(PID_TCODE, PolyTinselProcess, &to, sizeof(to));
+ CoroScheduler.createProcess(PID_TCODE, PolyTinselProcess, &to, sizeof(to));
}
void effRunPolyTinselCode(HPOLYGON hPoly, TINSEL_EVENT event, int actor) {
PTP_INIT to = { hPoly, event, PLR_NOEVENT, false, actor, NULL };
assert(!TinselV2);
- g_scheduler->createProcess(PID_TCODE, PolyTinselProcess, &to, sizeof(to));
+ CoroScheduler.createProcess(PID_TCODE, PolyTinselProcess, &to, sizeof(to));
}
/**
diff --git a/engines/tinsel/events.h b/engines/tinsel/events.h
index f2b4d7f663..cdf5ae2ae4 100644
--- a/engines/tinsel/events.h
+++ b/engines/tinsel/events.h
@@ -24,9 +24,9 @@
#ifndef TINSEL_EVENTS_H
#define TINSEL_EVENTS_H
-#include "tinsel/dw.h"
-#include "tinsel/coroutine.h"
+#include "common/coroutines.h"
#include "common/rect.h"
+#include "tinsel/dw.h"
namespace Tinsel {
diff --git a/engines/tinsel/faders.cpp b/engines/tinsel/faders.cpp
index 86d117af81..c1574ff963 100644
--- a/engines/tinsel/faders.cpp
+++ b/engines/tinsel/faders.cpp
@@ -145,7 +145,7 @@ static void Fader(const long multTable[], SCNHANDLE noFadeTable[]) {
if (TinselV2) {
// The is only ever one cuncurrent fade
// But this could be a fade out and the fade in is still going!
- g_scheduler->killMatchingProcess(PID_FADER);
+ CoroScheduler.killMatchingProcess(PID_FADER);
NoFadingPalettes();
}
@@ -176,7 +176,7 @@ static void Fader(const long multTable[], SCNHANDLE noFadeTable[]) {
fade.pPalQ = pPal;
// create a fader process for this palette
- g_scheduler->createProcess(PID_FADER, FadeProcess, (void *)&fade, sizeof(FADE));
+ CoroScheduler.createProcess(PID_FADER, FadeProcess, (void *)&fade, sizeof(FADE));
}
}
}
diff --git a/engines/tinsel/handle.cpp b/engines/tinsel/handle.cpp
index e31b2141f5..c3089db990 100644
--- a/engines/tinsel/handle.cpp
+++ b/engines/tinsel/handle.cpp
@@ -361,7 +361,7 @@ byte *LockMem(SCNHANDLE offset) {
if (TinselV2) {
SetCD(pH->flags2 & fAllCds);
- CdCD(nullContext);
+ CdCD(Common::nullContext);
}
LoadFile(pH);
}
diff --git a/engines/tinsel/module.mk b/engines/tinsel/module.mk
index 2ab94b830a..3485bac74b 100644
--- a/engines/tinsel/module.mk
+++ b/engines/tinsel/module.mk
@@ -9,7 +9,6 @@ MODULE_OBJS := \
bmv.o \
cliprect.o \
config.o \
- coroutine.o \
cursor.o \
debugger.o \
detection.o \
diff --git a/engines/tinsel/move.cpp b/engines/tinsel/move.cpp
index bb49e59fe7..275b6006f5 100644
--- a/engines/tinsel/move.cpp
+++ b/engines/tinsel/move.cpp
@@ -1299,14 +1299,14 @@ static void SetOffWithinNodePath(PMOVER pMover, HPOLYGON StartPath, HPOLYGON Des
*/
void SSetActorDest(PMOVER pActor) {
if (pActor->UtargetX != -1 && pActor->UtargetY != -1) {
- Stand(nullContext, pActor->actorID, pActor->objX, pActor->objY, 0);
+ Stand(Common::nullContext, pActor->actorID, pActor->objX, pActor->objY, 0);
if (pActor->UtargetX != -1 && pActor->UtargetY != -1) {
SetActorDest(pActor, pActor->UtargetX, pActor->UtargetY,
pActor->bIgPath, 0);
}
} else {
- Stand(nullContext, pActor->actorID, pActor->objX, pActor->objY, 0);
+ Stand(Common::nullContext, pActor->actorID, pActor->objX, pActor->objY, 0);
}
}
diff --git a/engines/tinsel/pcode.cpp b/engines/tinsel/pcode.cpp
index 145a6a8e5d..60f04b47fd 100644
--- a/engines/tinsel/pcode.cpp
+++ b/engines/tinsel/pcode.cpp
@@ -243,13 +243,13 @@ static INT_CONTEXT *AllocateInterpretContext(GSORT gsort) {
for (i = 0, pic = g_icList; i < NUM_INTERPRET; i++, pic++) {
if (pic->GSort == GS_NONE) {
- pic->pProc = g_scheduler->getCurrentProcess();
+ pic->pProc = CoroScheduler.getCurrentProcess();
pic->GSort = gsort;
return pic;
}
#ifdef DEBUG
else {
- if (pic->pProc == g_scheduler->getCurrentProcess())
+ if (pic->pProc == CoroScheduler.getCurrentProcess())
error("Found unreleased interpret context");
}
#endif
@@ -277,7 +277,7 @@ static void FreeWaitCheck(PINT_CONTEXT pic, bool bVoluntary) {
if ((g_icList + i)->waitNumber1 == pic->waitNumber2) {
(g_icList + i)->waitNumber1 = 0;
(g_icList + i)->resumeCode = bVoluntary ? RES_FINISHED : RES_CUTSHORT;
- g_scheduler->reschedule((g_icList + i)->pProc);
+ CoroScheduler.reschedule((g_icList + i)->pProc);
break;
}
}
@@ -301,7 +301,7 @@ static void FreeInterpretContextPi(INT_CONTEXT *pic) {
* Ensures that interpret contexts don't get lost when an Interpret()
* call doesn't complete.
*/
-void FreeInterpretContextPr(PROCESS *pProc) {
+void FreeInterpretContextPr(Common::PROCESS *pProc) {
INT_CONTEXT *pic;
int i;
@@ -393,7 +393,7 @@ INT_CONTEXT *RestoreInterpretContext(INT_CONTEXT *ric) {
ic = AllocateInterpretContext(GS_NONE); // Sort will soon be overridden
memcpy(ic, ric, sizeof(INT_CONTEXT));
- ic->pProc = g_scheduler->getCurrentProcess();
+ ic->pProc = CoroScheduler.getCurrentProcess();
ic->resumeState = RES_1;
LockCode(ic);
@@ -422,7 +422,7 @@ void RegisterGlobals(int num) {
if (g_icList == NULL) {
error("Cannot allocate memory for interpret contexts");
}
- g_scheduler->setResourceCallback(FreeInterpretContextPr);
+ CoroScheduler.setResourceCallback(FreeInterpretContextPr);
} else {
// Check size is still the same
assert(g_numGlobals == num);
@@ -433,7 +433,7 @@ void RegisterGlobals(int num) {
if (TinselV2) {
// read initial values
- CdCD(nullContext);
+ CdCD(Common::nullContext);
Common::File f;
if (!f.open(GLOBALS_FILENAME))
@@ -839,7 +839,7 @@ void Interpret(CORO_PARAM, INT_CONTEXT *ic) {
* Associates an interpret context with the
* process that will run it.
*/
-void AttachInterpret(INT_CONTEXT *pic, PROCESS *pProc) {
+void AttachInterpret(INT_CONTEXT *pic, Common::PROCESS *pProc) {
// Attach the process which is using this context
pic->pProc = pProc;
}
@@ -869,9 +869,9 @@ static uint32 UniqueWaitNumber() {
/**
* WaitInterpret
*/
-void WaitInterpret(CORO_PARAM, PPROCESS pWaitProc, bool *result) {
+void WaitInterpret(CORO_PARAM, Common::PPROCESS pWaitProc, bool *result) {
int i;
- PPROCESS currentProcess = g_scheduler->getCurrentProcess();
+ Common::PPROCESS currentProcess = CoroScheduler.getCurrentProcess();
assert(currentProcess);
assert(currentProcess != pWaitProc);
if (result) *result = false;
diff --git a/engines/tinsel/pcode.h b/engines/tinsel/pcode.h
index 5d16dae432..4980fc6ed9 100644
--- a/engines/tinsel/pcode.h
+++ b/engines/tinsel/pcode.h
@@ -25,7 +25,7 @@
#define TINSEL_PCODE_H
#include "tinsel/events.h" // for TINSEL_EVENT
-#include "tinsel/sched.h" // for PROCESS
+#include "tinsel/sched.h" // for Common::PROCESS
namespace Common {
class Serializer;
@@ -56,7 +56,7 @@ struct WorkaroundEntry;
struct INT_CONTEXT {
// Elements for interpret context management
- PROCESS *pProc; ///< processes owning this context
+ Common::PROCESS *pProc; ///< processes owning this context
GSORT GSort; ///< sort of this context
// Previously parameters to Interpret()
@@ -114,12 +114,12 @@ void SaveInterpretContexts(INT_CONTEXT *sICInfo);
void RegisterGlobals(int num);
void FreeGlobals();
-void AttachInterpret(INT_CONTEXT *pic, PROCESS *pProc);
+void AttachInterpret(INT_CONTEXT *pic, Common::PROCESS *pProc);
-void WaitInterpret(CORO_PARAM, PPROCESS pWaitProc, bool *result);
+void WaitInterpret(CORO_PARAM, Common::PPROCESS pWaitProc, bool *result);
-#define NUM_INTERPRET (NUM_PROCESS - 20)
-#define MAX_INTERPRET (MAX_PROCESSES - 20)
+#define NUM_INTERPRET (CORO_NUM_PROCESS - 20)
+#define MAX_INTERPRET (CORO_MAX_PROCESSES - 20)
/*----------------------------------------------------------------------*\
|* Library Procedure and Function codes parameter enums *|
diff --git a/engines/tinsel/pdisplay.cpp b/engines/tinsel/pdisplay.cpp
index 9a9e6ab00f..b821c5dee2 100644
--- a/engines/tinsel/pdisplay.cpp
+++ b/engines/tinsel/pdisplay.cpp
@@ -23,9 +23,9 @@
* PointProcess()
*/
+#include "common/coroutines.h"
#include "tinsel/actors.h"
#include "tinsel/background.h"
-#include "tinsel/coroutine.h"
#include "tinsel/cursor.h"
#include "tinsel/dw.h"
#include "tinsel/events.h"
@@ -265,7 +265,7 @@ void DisablePointing() {
if (hPoly != NOPOLY && PolyType(hPoly) == TAG && PolyIsPointedTo(hPoly)) {
SetPolyPointedTo(hPoly, false);
SetPolyTagWanted(hPoly, false, false, 0);
- PolygonEvent(nullContext, hPoly, UNPOINT, 0, false, 0);
+ PolygonEvent(Common::nullContext, hPoly, UNPOINT, 0, false, 0);
}
}
@@ -275,7 +275,7 @@ void DisablePointing() {
SetActorPointedTo(i, false);
SetActorTagWanted(i, false, false, 0);
- ActorEvent(nullContext, i, UNPOINT, false, 0);
+ ActorEvent(Common::nullContext, i, UNPOINT, false, 0);
}
}
}
diff --git a/engines/tinsel/play.cpp b/engines/tinsel/play.cpp
index 40729d9f3a..9e0baa749e 100644
--- a/engines/tinsel/play.cpp
+++ b/engines/tinsel/play.cpp
@@ -21,9 +21,9 @@
* Plays films within a scene, takes into account the actor in each 'column'. |
*/
+#include "common/coroutines.h"
#include "tinsel/actors.h"
#include "tinsel/background.h"
-#include "tinsel/coroutine.h"
#include "tinsel/dw.h"
#include "tinsel/film.h"
#include "tinsel/handle.h"
@@ -395,7 +395,7 @@ static void SoundReelWaitCheck() {
if (--g_soundReelWait == 0) {
for (int i = 0; i < MAX_SOUNDREELS; i++) {
if (g_soundReels[i].hFilm) {
- g_scheduler->createProcess(PID_REEL, ResSoundReel, &i, sizeof(i));
+ CoroScheduler.createProcess(PID_REEL, ResSoundReel, &i, sizeof(i));
}
}
}
@@ -1001,7 +1001,7 @@ void PlayFilm(CORO_PARAM, SCNHANDLE hFilm, int x, int y, int actorid, bool splay
NewestFilm(hFilm, &pFilm->reels[i]);
ppi.column = i;
- g_scheduler->createProcess(PID_REEL, PlayProcess, &ppi, sizeof(PPINIT));
+ CoroScheduler.createProcess(PID_REEL, PlayProcess, &ppi, sizeof(PPINIT));
}
if (TinselV2) {
@@ -1011,7 +1011,7 @@ void PlayFilm(CORO_PARAM, SCNHANDLE hFilm, int x, int y, int actorid, bool splay
CORO_GIVE_WAY;
if (myescEvent && myescEvent != GetEscEvents())
- g_scheduler->rescheduleAll();
+ CoroScheduler.rescheduleAll();
}
CORO_END_CODE;
@@ -1063,7 +1063,7 @@ void PlayFilmc(CORO_PARAM, SCNHANDLE hFilm, int x, int y, int actorid, bool spla
NewestFilm(hFilm, &pFilm->reels[i]);
_ctx->ppi.column = i;
- g_scheduler->createProcess(PID_REEL, PlayProcess, &_ctx->ppi, sizeof(PPINIT));
+ CoroScheduler.createProcess(PID_REEL, PlayProcess, &_ctx->ppi, sizeof(PPINIT));
}
if (TinselV2) {
@@ -1078,7 +1078,7 @@ void PlayFilmc(CORO_PARAM, SCNHANDLE hFilm, int x, int y, int actorid, bool spla
// Wait until film changes or loop count increases
while (GetActorPresFilm(_ctx->i) == hFilm && GetLoopCount(_ctx->i) == _ctx->loopCount) {
if (myescEvent && myescEvent != GetEscEvents()) {
- g_scheduler->rescheduleAll();
+ CoroScheduler.rescheduleAll();
break;
}
@@ -1126,7 +1126,7 @@ void RestoreActorReels(SCNHANDLE hFilm, short reelnum, short z, int x, int y) {
NewestFilm(hFilm, &pfilm->reels[reelnum]);
// Start display process for the reel
- g_scheduler->createProcess(PID_REEL, PlayProcess, &ppi, sizeof(ppi));
+ CoroScheduler.createProcess(PID_REEL, PlayProcess, &ppi, sizeof(ppi));
}
/**
@@ -1160,7 +1160,7 @@ void RestoreActorReels(SCNHANDLE hFilm, int actor, int x, int y) {
NewestFilm(hFilm, &pFilm->reels[i]);
// Start display process for the reel
- g_scheduler->createProcess(PID_REEL, PlayProcess, &ppi, sizeof(ppi));
+ CoroScheduler.createProcess(PID_REEL, PlayProcess, &ppi, sizeof(ppi));
g_soundReelWait++;
}
diff --git a/engines/tinsel/play.h b/engines/tinsel/play.h
index 041b7096a8..fffa8a9329 100644
--- a/engines/tinsel/play.h
+++ b/engines/tinsel/play.h
@@ -24,7 +24,7 @@
#ifndef TINSEL_PLAY_H // prevent multiple includes
#define TINSEL_PLAY_H
-#include "tinsel/coroutine.h"
+#include "common/coroutines.h"
#include "tinsel/dw.h"
#include "tinsel/multiobj.h"
diff --git a/engines/tinsel/polygons.cpp b/engines/tinsel/polygons.cpp
index 6fc1c65ec5..d8c1cef0b6 100644
--- a/engines/tinsel/polygons.cpp
+++ b/engines/tinsel/polygons.cpp
@@ -1469,7 +1469,7 @@ static void SetExTags(SCNHANDLE ph) {
pts = &TagStates[SceneTags[i].offset];
for (j = 0; j < SceneTags[i].nooftags; j++, pts++) {
if (!pts->enabled)
- DisableTag(nullContext, pts->tid);
+ DisableTag(Common::nullContext, pts->tid);
}
return;
}
@@ -1873,7 +1873,7 @@ void InitPolygons(SCNHANDLE ph, int numPoly, bool bRestart) {
} else {
for (int i = numPoly - 1; i >= 0; i--) {
if (Polys[i]->polyType == TAG) {
- PolygonEvent(nullContext, i, STARTUP, 0, false, 0);
+ PolygonEvent(Common::nullContext, i, STARTUP, 0, false, 0);
}
}
}
diff --git a/engines/tinsel/rince.cpp b/engines/tinsel/rince.cpp
index bb0aeabd2f..ba8f47f9cf 100644
--- a/engines/tinsel/rince.cpp
+++ b/engines/tinsel/rince.cpp
@@ -202,8 +202,8 @@ void KillMover(PMOVER pMover) {
pMover->bActive = false;
MultiDeleteObject(GetPlayfieldList(FIELD_WORLD), pMover->actorObj);
pMover->actorObj = NULL;
- assert(g_scheduler->getCurrentProcess() != pMover->pProc);
- g_scheduler->killProcess(pMover->pProc);
+ assert(CoroScheduler.getCurrentProcess() != pMover->pProc);
+ CoroScheduler.killProcess(pMover->pProc);
}
}
@@ -856,10 +856,10 @@ void MoverProcessCreate(int X, int Y, int id, PMOVER pMover) {
iStruct.Y = Y;
iStruct.pMover = pMover;
- g_scheduler->createProcess(PID_MOVER, T2MoverProcess, &iStruct, sizeof(MAINIT));
+ CoroScheduler.createProcess(PID_MOVER, T2MoverProcess, &iStruct, sizeof(MAINIT));
} else {
MoverProcessHelper(X, Y, id, pMover);
- pMover->pProc = g_scheduler->createProcess(PID_MOVER, T1MoverProcess, &pMover, sizeof(PMOVER));
+ pMover->pProc = CoroScheduler.createProcess(PID_MOVER, T1MoverProcess, &pMover, sizeof(PMOVER));
}
}
diff --git a/engines/tinsel/rince.h b/engines/tinsel/rince.h
index 93fd191172..623f3ee137 100644
--- a/engines/tinsel/rince.h
+++ b/engines/tinsel/rince.h
@@ -31,7 +31,6 @@
namespace Tinsel {
struct OBJECT;
-struct PROCESS;
enum NPS {NOT_IN, GOING_UP, GOING_DOWN, LEAVING, ENTERING};
@@ -110,7 +109,7 @@ struct MOVER {
/* NOTE: If effect polys can overlap, this needs improving */
bool bInEffect;
- PROCESS *pProc;
+ Common::PROCESS *pProc;
// Discworld 2 specific fields
int32 zOverride;
diff --git a/engines/tinsel/savescn.cpp b/engines/tinsel/savescn.cpp
index 1b06e3929c..0c0cc5c81e 100644
--- a/engines/tinsel/savescn.cpp
+++ b/engines/tinsel/savescn.cpp
@@ -190,7 +190,7 @@ void sortActors(SAVED_DATA *sd) {
RestoreAuxScales(sd->SavedMoverInfo);
for (int i = 0; i < MAX_MOVERS; i++) {
if (sd->SavedMoverInfo[i].bActive)
- Stand(nullContext, sd->SavedMoverInfo[i].actorID, sd->SavedMoverInfo[i].objX,
+ Stand(Common::nullContext, sd->SavedMoverInfo[i].actorID, sd->SavedMoverInfo[i].objX,
sd->SavedMoverInfo[i].objY, sd->SavedMoverInfo[i].hLastfilm);
}
}
@@ -245,7 +245,7 @@ static void SortMAProcess(CORO_PARAM, const void *) {
void ResumeInterprets() {
// Master script only affected on restore game, not restore scene
if (!TinselV2 && (g_rsd == &g_sgData)) {
- g_scheduler->killMatchingProcess(PID_MASTER_SCR, -1);
+ CoroScheduler.killMatchingProcess(PID_MASTER_SCR, -1);
FreeMasterInterpretContext();
}
@@ -314,7 +314,7 @@ static int DoRestoreSceneFrame(SAVED_DATA *sd, int n) {
// Master script only affected on restore game, not restore scene
if (sd == &g_sgData) {
- g_scheduler->killMatchingProcess(PID_MASTER_SCR);
+ CoroScheduler.killMatchingProcess(PID_MASTER_SCR);
KillGlobalProcesses();
FreeMasterInterpretContext();
}
@@ -340,7 +340,7 @@ static int DoRestoreSceneFrame(SAVED_DATA *sd, int n) {
SetDoFadeIn(!g_bNoFade);
g_bNoFade = false;
- StartupBackground(nullContext, sd->SavedBgroundHandle);
+ StartupBackground(Common::nullContext, sd->SavedBgroundHandle);
if (TinselV2) {
Offset(EX_USEXY, sd->SavedLoffset, sd->SavedToffset);
@@ -354,7 +354,7 @@ static int DoRestoreSceneFrame(SAVED_DATA *sd, int n) {
if (TinselV2) {
// create process to sort out the moving actors
- g_scheduler->createProcess(PID_MOVER, SortMAProcess, NULL, 0);
+ CoroScheduler.createProcess(PID_MOVER, SortMAProcess, NULL, 0);
g_bNotDoneYet = true;
RestoreActorZ(sd->savedActorZ);
diff --git a/engines/tinsel/scene.cpp b/engines/tinsel/scene.cpp
index f635ce13a3..79bb30f7a3 100644
--- a/engines/tinsel/scene.cpp
+++ b/engines/tinsel/scene.cpp
@@ -193,7 +193,7 @@ void SendSceneTinselProcess(TINSEL_EVENT event) {
init.event = event;
init.hTinselCode = ss->hSceneScript;
- g_scheduler->createProcess(PID_TCODE, SceneTinselProcess, &init, sizeof(init));
+ CoroScheduler.createProcess(PID_TCODE, SceneTinselProcess, &init, sizeof(init));
}
}
}
@@ -271,7 +271,7 @@ static void LoadScene(SCNHANDLE scene, int entry) {
init.event = STARTUP;
init.hTinselCode = es->hScript;
- g_scheduler->createProcess(PID_TCODE, SceneTinselProcess, &init, sizeof(init));
+ CoroScheduler.createProcess(PID_TCODE, SceneTinselProcess, &init, sizeof(init));
}
break;
}
@@ -291,7 +291,7 @@ static void LoadScene(SCNHANDLE scene, int entry) {
init.event = STARTUP;
init.hTinselCode = ss->hSceneScript;
- g_scheduler->createProcess(PID_TCODE, SceneTinselProcess, &init, sizeof(init));
+ CoroScheduler.createProcess(PID_TCODE, SceneTinselProcess, &init, sizeof(init));
}
}
@@ -344,7 +344,7 @@ void EndScene() {
KillAllObjects();
// kill all destructable process
- g_scheduler->killMatchingProcess(PID_DESTROY, PID_DESTROY);
+ CoroScheduler.killMatchingProcess(PID_DESTROY, PID_DESTROY);
}
/**
@@ -405,16 +405,16 @@ void PrimeScene() {
if (!TinselV2)
EnableTags(); // Next scene with tags enabled
- g_scheduler->createProcess(PID_SCROLL, ScrollProcess, NULL, 0);
- g_scheduler->createProcess(PID_SCROLL, EffectPolyProcess, NULL, 0);
+ CoroScheduler.createProcess(PID_SCROLL, ScrollProcess, NULL, 0);
+ CoroScheduler.createProcess(PID_SCROLL, EffectPolyProcess, NULL, 0);
#ifdef DEBUG
if (g_ShowPosition)
- g_scheduler->createProcess(PID_POSITION, CursorPositionProcess, NULL, 0);
+ CoroScheduler.createProcess(PID_POSITION, CursorPositionProcess, NULL, 0);
#endif
- g_scheduler->createProcess(PID_TAG, TagProcess, NULL, 0);
- g_scheduler->createProcess(PID_TAG, PointProcess, NULL, 0);
+ CoroScheduler.createProcess(PID_TAG, TagProcess, NULL, 0);
+ CoroScheduler.createProcess(PID_TAG, PointProcess, NULL, 0);
// init the current background
PrimeBackground();
@@ -471,7 +471,7 @@ void DoHailScene(SCNHANDLE scene) {
init.event = NOEVENT;
init.hTinselCode = ss->hSceneScript;
- g_scheduler->createProcess(PID_TCODE, SceneTinselProcess, &init, sizeof(init));
+ CoroScheduler.createProcess(PID_TCODE, SceneTinselProcess, &init, sizeof(init));
}
}
diff --git a/engines/tinsel/sched.cpp b/engines/tinsel/sched.cpp
index 343758d924..4bf356ba36 100644
--- a/engines/tinsel/sched.cpp
+++ b/engines/tinsel/sched.cpp
@@ -32,8 +32,6 @@
namespace Tinsel {
-Scheduler *g_scheduler = 0;
-
#include "common/pack-start.h" // START STRUCT PACKING
struct PROCESS_STRUC {
@@ -53,471 +51,6 @@ static SCNHANDLE g_hSceneProcess;
static uint32 g_numGlobalProcess;
static PROCESS_STRUC *g_pGlobalProcess;
-//--------------------- FUNCTIONS ------------------------
-
-Scheduler::Scheduler() {
- processList = 0;
- pFreeProcesses = 0;
- pCurrent = 0;
-
-#ifdef DEBUG
- // diagnostic process counters
- numProcs = 0;
- maxProcs = 0;
-#endif
-
- pRCfunction = 0;
-
- active = new PROCESS;
- active->pPrevious = NULL;
- active->pNext = NULL;
-
- g_scheduler = this; // FIXME HACK
-}
-
-Scheduler::~Scheduler() {
- // Kill all running processes (i.e. free memory allocated for their state).
- PROCESS *pProc = active->pNext;
- while (pProc != NULL) {
- delete pProc->state;
- pProc->state = 0;
- pProc = pProc->pNext;
- }
-
- free(processList);
- processList = NULL;
-
- delete active;
- active = 0;
-}
-
-/**
- * Kills all processes and places them on the free list.
- */
-void Scheduler::reset() {
-
-#ifdef DEBUG
- // clear number of process in use
- numProcs = 0;
-#endif
-
- if (processList == NULL) {
- // first time - allocate memory for process list
- processList = (PROCESS *)calloc(MAX_PROCESSES, sizeof(PROCESS));
-
- // make sure memory allocated
- if (processList == NULL) {
- error("Cannot allocate memory for process data");
- }
-
- // fill with garbage
- memset(processList, 'S', MAX_PROCESSES * sizeof(PROCESS));
- }
-
- // Kill all running processes (i.e. free memory allocated for their state).
- PROCESS *pProc = active->pNext;
- while (pProc != NULL) {
- delete pProc->state;
- pProc->state = 0;
- pProc = pProc->pNext;
- }
-
- // no active processes
- pCurrent = active->pNext = NULL;
-
- // place first process on free list
- pFreeProcesses = processList;
-
- // link all other processes after first
- for (int i = 1; i <= NUM_PROCESS; i++) {
- processList[i - 1].pNext = (i == NUM_PROCESS) ? NULL : processList + i;
- processList[i - 1].pPrevious = (i == 1) ? active : processList + (i - 2);
- }
-}
-
-
-#ifdef DEBUG
-/**
- * Shows the maximum number of process used at once.
- */
-void Scheduler::printStats() {
- debug("%i process of %i used", maxProcs, NUM_PROCESS);
-}
-#endif
-
-#ifdef DEBUG
-/**
- * Checks both the active and free process list to insure all the links are valid,
- * and that no processes have been lost
- */
-void Scheduler::CheckStack() {
- Common::List<PROCESS *> pList;
-
- // Check both the active and free process lists
- for (int i = 0; i < 2; ++i) {
- PROCESS *p = (i == 0) ? active : pFreeProcesses;
-
- if (p != NULL) {
- // Make sure the linkages are correct
- while (p->pNext != NULL) {
- assert(p->pNext->pPrevious == p);
- pList.push_back(p);
- p = p->pNext;
- }
- pList.push_back(p);
- }
- }
-
- // Make sure all processes are accounted for
- for (int idx = 0; idx < NUM_PROCESS; idx++) {
- bool found = false;
- for (Common::List<PROCESS *>::iterator i = pList.begin(); i != pList.end(); ++i) {
- PROCESS *pTemp = *i;
- if (*i == &processList[idx]) {
- found = true;
- break;
- }
- }
-
- assert(found);
- }
-}
-#endif
-
-/**
- * Give all active processes a chance to run
- */
-void Scheduler::schedule() {
- // start dispatching active process list
- PROCESS *pNext;
- PROCESS *pProc = active->pNext;
- while (pProc != NULL) {
- pNext = pProc->pNext;
-
- if (--pProc->sleepTime <= 0) {
- // process is ready for dispatch, activate it
- pCurrent = pProc;
- pProc->coroAddr(pProc->state, pProc->param);
-
- if (!pProc->state || pProc->state->_sleep <= 0) {
- // Coroutine finished
- pCurrent = pCurrent->pPrevious;
- killProcess(pProc);
- } else {
- pProc->sleepTime = pProc->state->_sleep;
- }
-
- // pCurrent may have been changed
- pNext = pCurrent->pNext;
- pCurrent = NULL;
- }
-
- pProc = pNext;
- }
-}
-
-/**
- * Reschedules all the processes to run again this query
- */
-void Scheduler::rescheduleAll() {
- assert(pCurrent);
-
- // Unlink current process
- pCurrent->pPrevious->pNext = pCurrent->pNext;
- if (pCurrent->pNext)
- pCurrent->pNext->pPrevious = pCurrent->pPrevious;
-
- // Add process to the start of the active list
- pCurrent->pNext = active->pNext;
- active->pNext->pPrevious = pCurrent;
- active->pNext = pCurrent;
- pCurrent->pPrevious = active;
-}
-
-/**
- * If the specified process has already run on this tick, make it run
- * again on the current tick.
- */
-void Scheduler::reschedule(PPROCESS pReSchedProc) {
- // If not currently processing the schedule list, then no action is needed
- if (!pCurrent)
- return;
-
- if (!pReSchedProc)
- pReSchedProc = pCurrent;
-
- PPROCESS pEnd;
-
- // Find the last process in the list.
- // But if the target process is down the list from here, do nothing
- for (pEnd = pCurrent; pEnd->pNext != NULL; pEnd = pEnd->pNext) {
- if (pEnd->pNext == pReSchedProc)
- return;
- }
-
- assert(pEnd->pNext == NULL);
-
- // Could be in the middle of a KillProc()!
- // Dying process was last and this process was penultimate
- if (pReSchedProc->pNext == NULL)
- return;
-
- // If we're moving the current process, move it back by one, so that the next
- // schedule() iteration moves to the now next one
- if (pCurrent == pReSchedProc)
- pCurrent = pCurrent->pPrevious;
-
- // Unlink the process, and add it at the end
- pReSchedProc->pPrevious->pNext = pReSchedProc->pNext;
- pReSchedProc->pNext->pPrevious = pReSchedProc->pPrevious;
- pEnd->pNext = pReSchedProc;
- pReSchedProc->pPrevious = pEnd;
- pReSchedProc->pNext = NULL;
-}
-
-/**
- * Moves the specified process to the end of the dispatch queue
- * allowing it to run again within the current game cycle.
- * @param pGiveProc Which process
- */
-void Scheduler::giveWay(PPROCESS pReSchedProc) {
- // If not currently processing the schedule list, then no action is needed
- if (!pCurrent)
- return;
-
- if (!pReSchedProc)
- pReSchedProc = pCurrent;
-
- // If the process is already at the end of the queue, nothing has to be done
- if (!pReSchedProc->pNext)
- return;
-
- PPROCESS pEnd;
-
- // Find the last process in the list.
- for (pEnd = pCurrent; pEnd->pNext != NULL; pEnd = pEnd->pNext)
- ;
- assert(pEnd->pNext == NULL);
-
-
- // If we're moving the current process, move it back by one, so that the next
- // schedule() iteration moves to the now next one
- if (pCurrent == pReSchedProc)
- pCurrent = pCurrent->pPrevious;
-
- // Unlink the process, and add it at the end
- pReSchedProc->pPrevious->pNext = pReSchedProc->pNext;
- pReSchedProc->pNext->pPrevious = pReSchedProc->pPrevious;
- pEnd->pNext = pReSchedProc;
- pReSchedProc->pPrevious = pEnd;
- pReSchedProc->pNext = NULL;
-}
-
-/**
- * Creates a new process.
- *
- * @param pid process identifier
- * @param CORO_ADDR coroutine start address
- * @param pParam process specific info
- * @param sizeParam size of process specific info
- */
-PROCESS *Scheduler::createProcess(int pid, CORO_ADDR coroAddr, const void *pParam, int sizeParam) {
- PROCESS *pProc;
-
- // get a free process
- pProc = pFreeProcesses;
-
- // trap no free process
- assert(pProc != NULL); // Out of processes
-
-#ifdef DEBUG
- // one more process in use
- if (++numProcs > maxProcs)
- maxProcs = numProcs;
-#endif
-
- // get link to next free process
- pFreeProcesses = pProc->pNext;
- if (pFreeProcesses)
- pFreeProcesses->pPrevious = NULL;
-
- if (pCurrent != NULL) {
- // place new process before the next active process
- pProc->pNext = pCurrent->pNext;
- if (pProc->pNext)
- pProc->pNext->pPrevious = pProc;
-
- // make this new process the next active process
- pCurrent->pNext = pProc;
- pProc->pPrevious = pCurrent;
-
- } else { // no active processes, place process at head of list
- pProc->pNext = active->pNext;
- pProc->pPrevious = active;
-
- if (pProc->pNext)
- pProc->pNext->pPrevious = pProc;
- active->pNext = pProc;
-
- }
-
- // set coroutine entry point
- pProc->coroAddr = coroAddr;
-
- // clear coroutine state
- pProc->state = 0;
-
- // wake process up as soon as possible
- pProc->sleepTime = 1;
-
- // set new process id
- pProc->pid = pid;
-
- // set new process specific info
- if (sizeParam) {
- assert(sizeParam > 0 && sizeParam <= PARAM_SIZE);
-
- // set new process specific info
- memcpy(pProc->param, pParam, sizeParam);
- }
-
- // return created process
- return pProc;
-}
-
-/**
- * Kills the specified process.
- *
- * @param pKillProc which process to kill
- */
-void Scheduler::killProcess(PROCESS *pKillProc) {
- // make sure a valid process pointer
- assert(pKillProc >= processList && pKillProc <= processList + NUM_PROCESS - 1);
-
- // can not kill the current process using killProcess !
- assert(pCurrent != pKillProc);
-
-#ifdef DEBUG
- // one less process in use
- --numProcs;
- assert(numProcs >= 0);
-#endif
-
- // Free process' resources
- if (pRCfunction != NULL)
- (pRCfunction)(pKillProc);
-
- delete pKillProc->state;
- pKillProc->state = 0;
-
- // Take the process out of the active chain list
- pKillProc->pPrevious->pNext = pKillProc->pNext;
- if (pKillProc->pNext)
- pKillProc->pNext->pPrevious = pKillProc->pPrevious;
-
- // link first free process after pProc
- pKillProc->pNext = pFreeProcesses;
- if (pFreeProcesses)
- pKillProc->pNext->pPrevious = pKillProc;
- pKillProc->pPrevious = NULL;
-
- // make pKillProc the first free process
- pFreeProcesses = pKillProc;
-}
-
-
-
-/**
- * Returns a pointer to the currently running process.
- */
-PROCESS *Scheduler::getCurrentProcess() {
- return pCurrent;
-}
-
-/**
- * Returns the process identifier of the specified process.
- *
- * @param pProc which process
- */
-int Scheduler::getCurrentPID() const {
- PROCESS *pProc = pCurrent;
-
- // make sure a valid process pointer
- assert(pProc >= processList && pProc <= processList + NUM_PROCESS - 1);
-
- // return processes PID
- return pProc->pid;
-}
-
-/**
- * Kills any process matching the specified PID. The current
- * process cannot be killed.
- *
- * @param pidKill process identifier of process to kill
- * @param pidMask mask to apply to process identifiers before comparison
- * @return The number of processes killed is returned.
- */
-int Scheduler::killMatchingProcess(int pidKill, int pidMask) {
- int numKilled = 0;
- PROCESS *pProc, *pPrev; // process list pointers
-
- for (pProc = active->pNext, pPrev = active; pProc != NULL; pPrev = pProc, pProc = pProc->pNext) {
- if ((pProc->pid & pidMask) == pidKill) {
- // found a matching process
-
- // dont kill the current process
- if (pProc != pCurrent) {
- // kill this process
- numKilled++;
-
- // Free the process' resources
- if (pRCfunction != NULL)
- (pRCfunction)(pProc);
-
- delete pProc->state;
- pProc->state = 0;
-
- // make prev point to next to unlink pProc
- pPrev->pNext = pProc->pNext;
- if (pProc->pNext)
- pPrev->pNext->pPrevious = pPrev;
-
- // link first free process after pProc
- pProc->pNext = pFreeProcesses;
- pProc->pPrevious = NULL;
- pFreeProcesses->pPrevious = pProc;
-
- // make pProc the first free process
- pFreeProcesses = pProc;
-
- // set to a process on the active list
- pProc = pPrev;
- }
- }
- }
-
-#ifdef DEBUG
- // adjust process in use
- numProcs -= numKilled;
- assert(numProcs >= 0);
-#endif
-
- // return number of processes killed
- return numKilled;
-}
-
-/**
- * Set pointer to a function to be called by killProcess().
- *
- * May be called by a resource allocator, the function supplied is
- * called by killProcess() to allow the resource allocator to free
- * resources allocated to the dying process.
- *
- * @param pFunc Function to be called by killProcess()
- */
-void Scheduler::setResourceCallback(VFPTRPP pFunc) {
- pRCfunction = pFunc;
-}
/**************************************************************************\
|*********** Stuff to do with scene and global processes ************|
@@ -537,7 +70,7 @@ static void RestoredProcessProcess(CORO_PARAM, const void *param) {
_ctx->pic = *(const PINT_CONTEXT *)param;
_ctx->pic = RestoreInterpretContext(_ctx->pic);
- AttachInterpret(_ctx->pic, g_scheduler->getCurrentProcess());
+ AttachInterpret(_ctx->pic, CoroScheduler.getCurrentProcess());
CORO_INVOKE_1(Interpret, _ctx->pic);
@@ -577,7 +110,7 @@ void RestoreSceneProcess(INT_CONTEXT *pic) {
pStruc = (PROCESS_STRUC *)LockMem(g_hSceneProcess);
for (i = 0; i < g_numSceneProcess; i++) {
if (FROM_LE_32(pStruc[i].hProcessCode) == pic->hCode) {
- g_scheduler->createProcess(PID_PROCESS + i, RestoredProcessProcess,
+ CoroScheduler.createProcess(PID_PROCESS + i, RestoredProcessProcess,
&pic, sizeof(pic));
break;
}
@@ -596,7 +129,7 @@ void SceneProcessEvent(CORO_PARAM, uint32 procID, TINSEL_EVENT event, bool bWait
CORO_BEGIN_CONTEXT;
PROCESS_STRUC *pStruc;
- PPROCESS pProc;
+ Common::PPROCESS pProc;
PINT_CONTEXT pic;
CORO_END_CONTEXT(_ctx);
@@ -617,7 +150,7 @@ void SceneProcessEvent(CORO_PARAM, uint32 procID, TINSEL_EVENT event, bool bWait
if (_ctx->pic == NULL)
return;
- _ctx->pProc = g_scheduler->createProcess(PID_PROCESS + i, ProcessTinselProcess,
+ _ctx->pProc = CoroScheduler.createProcess(PID_PROCESS + i, ProcessTinselProcess,
&_ctx->pic, sizeof(_ctx->pic));
AttachInterpret(_ctx->pic, _ctx->pProc);
break;
@@ -644,7 +177,7 @@ void KillSceneProcess(uint32 procID) {
pStruc = (PROCESS_STRUC *) LockMem(g_hSceneProcess);
for (i = 0; i < g_numSceneProcess; i++) {
if (FROM_LE_32(pStruc[i].processId) == procID) {
- g_scheduler->killMatchingProcess(PID_PROCESS + i, -1);
+ CoroScheduler.killMatchingProcess(PID_PROCESS + i, -1);
break;
}
}
@@ -671,7 +204,7 @@ void RestoreGlobalProcess(INT_CONTEXT *pic) {
for (i = 0; i < g_numGlobalProcess; i++) {
if (g_pGlobalProcess[i].hProcessCode == pic->hCode) {
- g_scheduler->createProcess(PID_GPROCESS + i, RestoredProcessProcess,
+ CoroScheduler.createProcess(PID_GPROCESS + i, RestoredProcessProcess,
&pic, sizeof(pic));
break;
}
@@ -686,7 +219,7 @@ void RestoreGlobalProcess(INT_CONTEXT *pic) {
void KillGlobalProcesses() {
for (uint32 i = 0; i < g_numGlobalProcess; ++i) {
- g_scheduler->killMatchingProcess(PID_GPROCESS + i, -1);
+ CoroScheduler.killMatchingProcess(PID_GPROCESS + i, -1);
}
}
@@ -696,7 +229,7 @@ void KillGlobalProcesses() {
bool GlobalProcessEvent(CORO_PARAM, uint32 procID, TINSEL_EVENT event, bool bWait, int myEscape) {
CORO_BEGIN_CONTEXT;
PINT_CONTEXT pic;
- PPROCESS pProc;
+ Common::PPROCESS pProc;
CORO_END_CONTEXT(_ctx);
bool result = false;
@@ -720,7 +253,7 @@ bool GlobalProcessEvent(CORO_PARAM, uint32 procID, TINSEL_EVENT event, bool bWai
if (_ctx->pic != NULL) {
- _ctx->pProc = g_scheduler->createProcess(PID_GPROCESS + i, ProcessTinselProcess,
+ _ctx->pProc = CoroScheduler.createProcess(PID_GPROCESS + i, ProcessTinselProcess,
&_ctx->pic, sizeof(_ctx->pic));
AttachInterpret(_ctx->pic, _ctx->pProc);
}
@@ -745,7 +278,7 @@ void xKillGlobalProcess(uint32 procID) {
for (i = 0; i < g_numGlobalProcess; ++i) {
if (g_pGlobalProcess[i].processId == procID) {
- g_scheduler->killMatchingProcess(PID_GPROCESS + i, -1);
+ CoroScheduler.killMatchingProcess(PID_GPROCESS + i, -1);
break;
}
}
diff --git a/engines/tinsel/sched.h b/engines/tinsel/sched.h
index a1eafcdc47..3e791cecd8 100644
--- a/engines/tinsel/sched.h
+++ b/engines/tinsel/sched.h
@@ -24,105 +24,16 @@
#ifndef TINSEL_SCHED_H // prevent multiple includes
#define TINSEL_SCHED_H
+#include "common/coroutines.h"
#include "tinsel/dw.h" // new data types
-#include "tinsel/coroutine.h"
#include "tinsel/events.h"
+#include "tinsel/pcode.h"
#include "tinsel/tinsel.h"
namespace Tinsel {
-// the size of process specific info
-#define PARAM_SIZE 32
-
-// the maximum number of processes
-#define NUM_PROCESS (TinselV2 ? 70 : 64)
-#define MAX_PROCESSES 70
-
-typedef void (*CORO_ADDR)(CoroContext &, const void *);
-
-/** process structure */
-struct PROCESS {
- PROCESS *pNext; ///< pointer to next process in active or free list
- PROCESS *pPrevious; ///< pointer to previous process in active or free list
-
- CoroContext state; ///< the state of the coroutine
- CORO_ADDR coroAddr; ///< the entry point of the coroutine
-
- int sleepTime; ///< number of scheduler cycles to sleep
- int pid; ///< process ID
- char param[PARAM_SIZE]; ///< process specific info
-};
-typedef PROCESS *PPROCESS;
-
struct INT_CONTEXT;
-/**
- * Create and manage "processes" (really coroutines).
- */
-class Scheduler {
-public:
- /** Pointer to a function of the form "void function(PPROCESS)" */
- typedef void (*VFPTRPP)(PROCESS *);
-
-private:
-
- /** list of all processes */
- PROCESS *processList;
-
- /** active process list - also saves scheduler state */
- PROCESS *active;
-
- /** pointer to free process list */
- PROCESS *pFreeProcesses;
-
- /** the currently active process */
- PROCESS *pCurrent;
-
-#ifdef DEBUG
- // diagnostic process counters
- int numProcs;
- int maxProcs;
-
- void CheckStack();
-#endif
-
- /**
- * Called from killProcess() to enable other resources
- * a process may be allocated to be released.
- */
- VFPTRPP pRCfunction;
-
-
-public:
-
- Scheduler();
- ~Scheduler();
-
- void reset();
-
- #ifdef DEBUG
- void printStats();
- #endif
-
- void schedule();
- void rescheduleAll();
- void reschedule(PPROCESS pReSchedProc = NULL);
- void giveWay(PPROCESS pReSchedProc = NULL);
-
- PROCESS *createProcess(int pid, CORO_ADDR coroAddr, const void *pParam, int sizeParam);
- void killProcess(PROCESS *pKillProc);
-
- PROCESS *getCurrentProcess();
- int getCurrentPID() const;
- int killMatchingProcess(int pidKill, int pidMask = -1);
-
-
- void setResourceCallback(VFPTRPP pFunc);
-
-};
-
-extern Scheduler *g_scheduler; // FIXME: Temporary global var, to be used until everything has been OOifyied
-
//----------------- FUNCTION PROTOTYPES --------------------
void SceneProcesses(uint32 numProcess, SCNHANDLE hProcess);
diff --git a/engines/tinsel/text.h b/engines/tinsel/text.h
index 4c80300c46..97e82c7a93 100644
--- a/engines/tinsel/text.h
+++ b/engines/tinsel/text.h
@@ -24,7 +24,7 @@
#ifndef TINSEL_TEXT_H // prevent multiple includes
#define TINSEL_TEXT_H
-#include "tinsel/coroutine.h"
+#include "common/coroutines.h"
#include "tinsel/object.h" // object manager defines
namespace Tinsel {
diff --git a/engines/tinsel/tinlib.cpp b/engines/tinsel/tinlib.cpp
index cd65a4ec32..5dda836144 100644
--- a/engines/tinsel/tinlib.cpp
+++ b/engines/tinsel/tinlib.cpp
@@ -28,11 +28,11 @@
#define BODGE
+#include "common/coroutines.h"
#include "tinsel/actors.h"
#include "tinsel/background.h"
#include "tinsel/bmv.h"
#include "tinsel/config.h"
-#include "tinsel/coroutine.h"
#include "tinsel/cursor.h"
#include "tinsel/drives.h"
#include "tinsel/dw.h"
@@ -1468,7 +1468,7 @@ void NewScene(CORO_PARAM, SCNHANDLE scene, int entrance, int transition) {
++g_sceneCtr;
// Prevent code subsequent to this call running before scene changes
- if (g_scheduler->getCurrentPID() != PID_MASTER_SCR)
+ if (CoroScheduler.getCurrentPID() != PID_MASTER_SCR)
CORO_KILL_SELF();
CORO_END_CODE;
}
@@ -2594,7 +2594,7 @@ static void Scroll(CORO_PARAM, EXTREME extreme, int xp, int yp, int xIter, int y
sm.y = _ctx->y;
sm.thisScroll = g_scrollNumber;
sm.myEscape = myEscape;
- g_scheduler->createProcess(PID_TCODE, ScrollMonitorProcess, &sm, sizeof(sm));
+ CoroScheduler.createProcess(PID_TCODE, ScrollMonitorProcess, &sm, sizeof(sm));
}
}
CORO_END_CODE;
@@ -2975,12 +2975,12 @@ static void StandTag(int actor, HPOLYGON hp) {
&& hFilm != TF_LEFT && hFilm != TF_RIGHT)
hFilm = 0;
- Stand(nullContext, actor, pnodex, pnodey, hFilm);
+ Stand(Common::nullContext, actor, pnodex, pnodey, hFilm);
} else if (hFilm && (actor == LEAD_ACTOR || actor == GetLeadId()))
- Stand(nullContext, actor, pnodex, pnodey, hFilm);
+ Stand(Common::nullContext, actor, pnodex, pnodey, hFilm);
else
- Stand(nullContext, actor, pnodex, pnodey, 0);
+ Stand(Common::nullContext, actor, pnodex, pnodey, 0);
}
diff --git a/engines/tinsel/tinsel.cpp b/engines/tinsel/tinsel.cpp
index 65900cc7f3..e09e2c1dcf 100644
--- a/engines/tinsel/tinsel.cpp
+++ b/engines/tinsel/tinsel.cpp
@@ -109,8 +109,8 @@ static Scene g_NextScene = { 0, 0, 0 };
static Scene g_HookScene = { 0, 0, 0 };
static Scene g_DelayedScene = { 0, 0, 0 };
-static PROCESS *g_pMouseProcess = 0;
-static PROCESS *g_pKeyboardProcess = 0;
+static Common::PROCESS *g_pMouseProcess = 0;
+static Common::PROCESS *g_pKeyboardProcess = 0;
static SCNHANDLE g_hCdChangeScene;
@@ -324,7 +324,7 @@ static void MouseProcess(CORO_PARAM, const void *) {
if (TinselV2) {
// Kill off the button process and fire off the action command
- g_scheduler->killMatchingProcess(PID_BTN_CLICK, -1);
+ CoroScheduler.killMatchingProcess(PID_BTN_CLICK, -1);
PlayerEvent(PLR_ACTION, _ctx->clickPos);
} else {
// signal left drag start
@@ -368,7 +368,7 @@ static void MouseProcess(CORO_PARAM, const void *) {
// will activate a single button click
if (TinselV2 && ControlIsOn()) {
_ctx->clickPos = mousePos;
- g_scheduler->createProcess(PID_BTN_CLICK, SingleLeftProcess, &_ctx->clickPos, sizeof(Common::Point));
+ CoroScheduler.createProcess(PID_BTN_CLICK, SingleLeftProcess, &_ctx->clickPos, sizeof(Common::Point));
}
} else
_ctx->lastLeftClick -= _vm->_config->_dclickSpeed;
@@ -616,11 +616,11 @@ static void RestoredProcess(CORO_PARAM, const void *param) {
}
void RestoreProcess(INT_CONTEXT *pic) {
- g_scheduler->createProcess(PID_TCODE, RestoredProcess, &pic, sizeof(pic));
+ CoroScheduler.createProcess(PID_TCODE, RestoredProcess, &pic, sizeof(pic));
}
void RestoreMasterProcess(INT_CONTEXT *pic) {
- g_scheduler->createProcess(PID_MASTER_SCR, RestoredProcess, &pic, sizeof(pic));
+ CoroScheduler.createProcess(PID_MASTER_SCR, RestoredProcess, &pic, sizeof(pic));
}
// FIXME: CountOut is used by ChangeScene
@@ -878,7 +878,6 @@ TinselEngine::~TinselEngine() {
FreeObjectList();
FreeGlobalProcesses();
FreeGlobals();
- delete _scheduler;
delete _config;
@@ -905,7 +904,7 @@ Common::Error TinselEngine::run() {
_console = new Console();
- _scheduler = new Scheduler();
+ CoroScheduler.reset();
InitSysVars();
@@ -1022,7 +1021,7 @@ void TinselEngine::NextGameCycle() {
ResetEcount();
// schedule process
- _scheduler->schedule();
+ CoroScheduler.schedule();
if (_bmv->MoviePlaying())
_bmv->CopyMovieToScreen();
@@ -1078,11 +1077,11 @@ bool TinselEngine::pollEvent() {
*/
void TinselEngine::CreateConstProcesses() {
// Process to run the master script
- _scheduler->createProcess(PID_MASTER_SCR, MasterScriptProcess, NULL, 0);
+ CoroScheduler.createProcess(PID_MASTER_SCR, MasterScriptProcess, NULL, 0);
// Processes to run the cursor and inventory,
- _scheduler->createProcess(PID_CURSOR, CursorProcess, NULL, 0);
- _scheduler->createProcess(PID_INVENTORY, InventoryProcess, NULL, 0);
+ CoroScheduler.createProcess(PID_CURSOR, CursorProcess, NULL, 0);
+ CoroScheduler.createProcess(PID_INVENTORY, InventoryProcess, NULL, 0);
}
/**
@@ -1132,11 +1131,11 @@ void TinselEngine::RestartDrivers() {
KillAllObjects();
// init the process scheduler
- _scheduler->reset();
+ CoroScheduler.reset();
// init the event handlers
- g_pMouseProcess = _scheduler->createProcess(PID_MOUSE, MouseProcess, NULL, 0);
- g_pKeyboardProcess = _scheduler->createProcess(PID_KEYBOARD, KeyboardProcess, NULL, 0);
+ g_pMouseProcess = CoroScheduler.createProcess(PID_MOUSE, MouseProcess, NULL, 0);
+ g_pKeyboardProcess = CoroScheduler.createProcess(PID_KEYBOARD, KeyboardProcess, NULL, 0);
// open MIDI files
OpenMidiFiles();
@@ -1164,8 +1163,8 @@ void TinselEngine::ChopDrivers() {
DeleteMidiBuffer();
// remove event drivers
- _scheduler->killProcess(g_pMouseProcess);
- _scheduler->killProcess(g_pKeyboardProcess);
+ CoroScheduler.killProcess(g_pMouseProcess);
+ CoroScheduler.killProcess(g_pKeyboardProcess);
}
/**
diff --git a/engines/tinsel/token.cpp b/engines/tinsel/token.cpp
index c26fa40466..080c005c3c 100644
--- a/engines/tinsel/token.cpp
+++ b/engines/tinsel/token.cpp
@@ -31,7 +31,7 @@ namespace Tinsel {
//----------------- LOCAL GLOBAL DATA --------------------
struct Token {
- PROCESS *proc;
+ Common::PROCESS *proc;
};
static Token g_tokens[NUMTOKENS]; // FIXME: Avoid non-const global vars
@@ -40,7 +40,7 @@ static Token g_tokens[NUMTOKENS]; // FIXME: Avoid non-const global vars
/**
* Release all tokens held by this process, and kill the process.
*/
-static void TerminateProcess(PROCESS *tProc) {
+static void TerminateProcess(Common::PROCESS *tProc) {
// Release tokens held by the process
for (int i = 0; i < NUMTOKENS; i++) {
@@ -50,7 +50,7 @@ static void TerminateProcess(PROCESS *tProc) {
}
// Kill the process
- g_scheduler->killProcess(tProc);
+ CoroScheduler.killProcess(tProc);
}
/**
@@ -60,7 +60,7 @@ void GetControlToken() {
const int which = TOKEN_CONTROL;
if (g_tokens[which].proc == NULL) {
- g_tokens[which].proc = g_scheduler->getCurrentProcess();
+ g_tokens[which].proc = CoroScheduler.getCurrentProcess();
}
}
@@ -85,11 +85,11 @@ void GetToken(int which) {
assert(TOKEN_LEAD <= which && which < NUMTOKENS);
if (g_tokens[which].proc != NULL) {
- assert(g_tokens[which].proc != g_scheduler->getCurrentProcess());
+ assert(g_tokens[which].proc != CoroScheduler.getCurrentProcess());
TerminateProcess(g_tokens[which].proc);
}
- g_tokens[which].proc = g_scheduler->getCurrentProcess();
+ g_tokens[which].proc = CoroScheduler.getCurrentProcess();
}
/**
@@ -99,7 +99,7 @@ void GetToken(int which) {
void FreeToken(int which) {
assert(TOKEN_LEAD <= which && which < NUMTOKENS);
- assert(g_tokens[which].proc == g_scheduler->getCurrentProcess()); // we'd have been killed if some other proc had taken this token
+ assert(g_tokens[which].proc == CoroScheduler.getCurrentProcess()); // we'd have been killed if some other proc had taken this token
g_tokens[which].proc = NULL;
}
diff --git a/engines/tsage/ringworld2/ringworld2_scenes1.cpp b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
index 304d3a4298..216444e722 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes1.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes1.cpp
@@ -5571,7 +5571,7 @@ void Scene1337::subCF979() {
tmpVal = subC26CB(0, i);
if (tmpVal != -1) {
- bool flag = false;;
+ bool flag = false;
for (int j = 0; j <= 7; j++) {
if (_arrunkObj1337[0]._arr2[j]._field34 == _arrunkObj1337[0]._arr1[tmpVal]._field34) {
flag = true;
@@ -11068,7 +11068,7 @@ bool Scene1850::Actor5::startAction(CursorType action, Event &event) {
case R2_REBREATHER_TANK:
if (R2_INVENTORY.getObjectScene(R2_AIRBAG) == 1850) {
if (R2_GLOBALS.getFlag(30))
- return SceneActor::startAction(action, event);;
+ return SceneActor::startAction(action, event);
R2_GLOBALS._player.disableControl();
scene->_sceneMode = 1878;
diff --git a/engines/tsage/ringworld2/ringworld2_scenes3.cpp b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
index 3dd566c900..61711d0a4f 100644
--- a/engines/tsage/ringworld2/ringworld2_scenes3.cpp
+++ b/engines/tsage/ringworld2/ringworld2_scenes3.cpp
@@ -3294,7 +3294,7 @@ void Scene3500::Action1::signal() {
NpcMover *mover = new NpcMover();
scene->_actor8.addMover(mover, &pt, this);
- scene->_actor9.setPosition(Common::Point(160 + ((_field1E * 2) * 160), 73));;
+ scene->_actor9.setPosition(Common::Point(160 + ((_field1E * 2) * 160), 73));
scene->_actor9._moveDiff.x = 160 - scene->_field126E;
scene->_fieldB9E = 160;
Common::Point pt2(scene->_fieldB9E, 73);
diff --git a/graphics/decoders/bmp.cpp b/graphics/decoders/bmp.cpp
index 0d44881d7c..5f764e1bd3 100644
--- a/graphics/decoders/bmp.cpp
+++ b/graphics/decoders/bmp.cpp
@@ -31,6 +31,7 @@ namespace Graphics {
BitmapDecoder::BitmapDecoder() {
_surface = 0;
_palette = 0;
+ _paletteColorCount = 0;
}
BitmapDecoder::~BitmapDecoder() {
@@ -44,6 +45,7 @@ void BitmapDecoder::destroy() {
}
delete[] _palette; _palette = 0;
+ _paletteColorCount = 0;
}
bool BitmapDecoder::loadStream(Common::SeekableReadStream &stream) {
@@ -95,16 +97,16 @@ bool BitmapDecoder::loadStream(Common::SeekableReadStream &stream) {
/* uint32 imageSize = */ stream.readUint32LE();
/* uint32 pixelsPerMeterX = */ stream.readUint32LE();
/* uint32 pixelsPerMeterY = */ stream.readUint32LE();
- uint32 colorsUsed = stream.readUint32LE();
+ _paletteColorCount = stream.readUint32LE();
/* uint32 colorsImportant = */ stream.readUint32LE();
- if (colorsUsed == 0)
- colorsUsed = 256;
+ if (_paletteColorCount == 0)
+ _paletteColorCount = 256;
if (bitsPerPixel == 8) {
// Read the palette
- _palette = new byte[colorsUsed * 3];
- for (uint16 i = 0; i < colorsUsed; i++) {
+ _palette = new byte[_paletteColorCount * 3];
+ for (uint16 i = 0; i < _paletteColorCount; i++) {
_palette[i * 3 + 2] = stream.readByte();
_palette[i * 3 + 1] = stream.readByte();
_palette[i * 3 + 0] = stream.readByte();
diff --git a/graphics/decoders/bmp.h b/graphics/decoders/bmp.h
index 8a37538ee1..59da682e4d 100644
--- a/graphics/decoders/bmp.h
+++ b/graphics/decoders/bmp.h
@@ -52,10 +52,12 @@ public:
virtual bool loadStream(Common::SeekableReadStream &stream);
virtual const Surface *getSurface() const { return _surface; }
const byte *getPalette() const { return _palette; }
+ uint16 getPaletteColorCount() const { return _paletteColorCount; }
private:
Surface *_surface;
byte *_palette;
+ uint16 _paletteColorCount;
};
} // End of namespace Graphics
diff --git a/graphics/decoders/image_decoder.h b/graphics/decoders/image_decoder.h
index e768f7f9a2..7fa00749ff 100644
--- a/graphics/decoders/image_decoder.h
+++ b/graphics/decoders/image_decoder.h
@@ -78,6 +78,11 @@ public:
* @return the decoded palette, or 0 if no palette is present
*/
virtual const byte *getPalette() const { return 0; }
+
+ /** Return the starting index of the palette. */
+ virtual byte getPaletteStartIndex() const { return 0; }
+ /** Return the number of colors in the palette. */
+ virtual uint16 getPaletteColorCount() const { return 0; }
};
} // End of namespace Graphics
diff --git a/graphics/decoders/pict.cpp b/graphics/decoders/pict.cpp
index bdb733a87d..7eddd3b893 100644
--- a/graphics/decoders/pict.cpp
+++ b/graphics/decoders/pict.cpp
@@ -38,6 +38,7 @@ namespace Graphics {
PICTDecoder::PICTDecoder() {
_outputSurface = 0;
+ _paletteColorCount = 0;
}
PICTDecoder::~PICTDecoder() {
@@ -50,6 +51,8 @@ void PICTDecoder::destroy() {
delete _outputSurface;
_outputSurface = 0;
}
+
+ _paletteColorCount = 0;
}
#define OPCODE(a, b, c) _opcodes.push_back(PICTOpcode(a, &PICTDecoder::b, c))
@@ -298,9 +301,9 @@ void PICTDecoder::unpackBitsRect(Common::SeekableReadStream &stream, bool hasPal
// See http://developer.apple.com/legacy/mac/library/documentation/mac/QuickDraw/QuickDraw-267.html
stream.readUint32BE(); // seed
stream.readUint16BE(); // flags
- uint16 colorCount = stream.readUint16BE() + 1;
+ _paletteColorCount = stream.readUint16BE() + 1;
- for (uint32 i = 0; i < colorCount; i++) {
+ for (uint32 i = 0; i < _paletteColorCount; i++) {
stream.readUint16BE();
_palette[i * 3] = stream.readUint16BE() >> 8;
_palette[i * 3 + 1] = stream.readUint16BE() >> 8;
diff --git a/graphics/decoders/pict.h b/graphics/decoders/pict.h
index 1d07df1ab9..417a7c5134 100644
--- a/graphics/decoders/pict.h
+++ b/graphics/decoders/pict.h
@@ -57,6 +57,7 @@ public:
void destroy();
const Surface *getSurface() const { return _outputSurface; }
const byte *getPalette() const { return _palette; }
+ uint16 getPaletteColorCount() const { return _paletteColorCount; }
struct PixMap {
uint32 baseAddr;
@@ -81,6 +82,7 @@ public:
private:
Common::Rect _imageRect;
byte _palette[256 * 3];
+ uint16 _paletteColorCount;
Graphics::Surface *_outputSurface;
bool _continueParsing;
diff --git a/graphics/decoders/png.cpp b/graphics/decoders/png.cpp
index b87b6fdc7a..492c69779f 100644
--- a/graphics/decoders/png.cpp
+++ b/graphics/decoders/png.cpp
@@ -99,7 +99,7 @@ enum PNGFilters {
};
PNGDecoder::PNGDecoder() : _compressedBuffer(0), _compressedBufferSize(0),
- _transparentColorSpecified(false), _outputSurface(0) {
+ _transparentColorSpecified(false), _outputSurface(0), _paletteEntries(0) {
}
PNGDecoder::~PNGDecoder() {
@@ -112,6 +112,8 @@ void PNGDecoder::destroy() {
delete _outputSurface;
_outputSurface = 0;
}
+
+ _paletteEntries = 0;
}
bool PNGDecoder::loadStream(Common::SeekableReadStream &stream) {
diff --git a/graphics/decoders/png.h b/graphics/decoders/png.h
index 1da0bea1ab..ca204f6dd3 100644
--- a/graphics/decoders/png.h
+++ b/graphics/decoders/png.h
@@ -73,6 +73,7 @@ public:
void destroy();
const Graphics::Surface *getSurface() const { return _outputSurface; }
const byte *getPalette() const { return _palette; }
+ uint16 getPaletteColorCount() const { return _paletteEntries; }
private:
enum PNGColorType {
diff --git a/graphics/wincursor.cpp b/graphics/wincursor.cpp
index 2db72a2874..1d599f7130 100644
--- a/graphics/wincursor.cpp
+++ b/graphics/wincursor.cpp
@@ -30,6 +30,46 @@
namespace Graphics {
+/** A Windows cursor. */
+class WinCursor : public Cursor {
+public:
+ WinCursor();
+ ~WinCursor();
+
+ /** Return the cursor's width. */
+ uint16 getWidth() const;
+ /** Return the cursor's height. */
+ uint16 getHeight() const;
+ /** Return the cursor's hotspot's x coordinate. */
+ uint16 getHotspotX() const;
+ /** Return the cursor's hotspot's y coordinate. */
+ uint16 getHotspotY() const;
+ /** Return the cursor's transparent key. */
+ byte getKeyColor() const;
+
+ const byte *getSurface() const { return _surface; }
+
+ const byte *getPalette() const { return _palette; }
+ byte getPaletteStartIndex() const { return 0; }
+ uint16 getPaletteCount() const { return 256; }
+
+ /** Read the cursor's data out of a stream. */
+ bool readFromStream(Common::SeekableReadStream &stream);
+
+private:
+ byte *_surface;
+ byte _palette[256 * 3];
+
+ uint16 _width; ///< The cursor's width.
+ uint16 _height; ///< The cursor's height.
+ uint16 _hotspotX; ///< The cursor's hotspot's x coordinate.
+ uint16 _hotspotY; ///< The cursor's hotspot's y coordinate.
+ byte _keyColor; ///< The cursor's transparent key
+
+ /** Clear the cursor. */
+ void clear();
+};
+
WinCursor::WinCursor() {
_width = 0;
_height = 0;
diff --git a/graphics/wincursor.h b/graphics/wincursor.h
index e6b35dc80c..9e73e3a12f 100644
--- a/graphics/wincursor.h
+++ b/graphics/wincursor.h
@@ -36,46 +36,6 @@ class SeekableReadStream;
namespace Graphics {
-/** A Windows cursor. */
-class WinCursor : public Cursor {
-public:
- WinCursor();
- ~WinCursor();
-
- /** Return the cursor's width. */
- uint16 getWidth() const;
- /** Return the cursor's height. */
- uint16 getHeight() const;
- /** Return the cursor's hotspot's x coordinate. */
- uint16 getHotspotX() const;
- /** Return the cursor's hotspot's y coordinate. */
- uint16 getHotspotY() const;
- /** Return the cursor's transparent key. */
- byte getKeyColor() const;
-
- const byte *getSurface() const { return _surface; }
-
- const byte *getPalette() const { return _palette; }
- byte getPaletteStartIndex() const { return 0; }
- uint16 getPaletteCount() const { return 256; }
-
- /** Read the cursor's data out of a stream. */
- bool readFromStream(Common::SeekableReadStream &stream);
-
-private:
- byte *_surface;
- byte _palette[256 * 3];
-
- uint16 _width; ///< The cursor's width.
- uint16 _height; ///< The cursor's height.
- uint16 _hotspotX; ///< The cursor's hotspot's x coordinate.
- uint16 _hotspotY; ///< The cursor's hotspot's y coordinate.
- byte _keyColor; ///< The cursor's transparent key
-
- /** Clear the cursor. */
- void clear();
-};
-
/**
* A structure holding an array of cursors from a single Windows Executable cursor group.
*
@@ -91,7 +51,7 @@ struct WinCursorGroup {
struct CursorItem {
Common::WinResourceID id;
- WinCursor *cursor;
+ Cursor *cursor;
};
Common::Array<CursorItem> cursors;
diff --git a/gui/widget.cpp b/gui/widget.cpp
index 6ae4e5cee5..fc6510b976 100644
--- a/gui/widget.cpp
+++ b/gui/widget.cpp
@@ -281,7 +281,7 @@ ButtonWidget::ButtonWidget(GuiObject *boss, int x, int y, int w, int h, const Co
if (hotkey == 0)
_hotkey = parseHotkey(label);
- setFlags(WIDGET_ENABLED/* | WIDGET_BORDER*/ | WIDGET_CLEARBG | WIDGET_WANT_TICKLE);
+ setFlags(WIDGET_ENABLED/* | WIDGET_BORDER*/ | WIDGET_CLEARBG);
_type = kButtonWidget;
}
@@ -290,7 +290,7 @@ ButtonWidget::ButtonWidget(GuiObject *boss, const Common::String &name, const Co
_cmd(cmd), _lastTime(0) {
if (hotkey == 0)
_hotkey = parseHotkey(label);
- setFlags(WIDGET_ENABLED/* | WIDGET_BORDER*/ | WIDGET_CLEARBG | WIDGET_WANT_TICKLE);
+ setFlags(WIDGET_ENABLED/* | WIDGET_BORDER*/ | WIDGET_CLEARBG);
_type = kButtonWidget;
}
diff --git a/po/ca_ES.po b/po/ca_ES.po
index 4c0ad8bbbe..35d5810ed6 100644
--- a/po/ca_ES.po
+++ b/po/ca_ES.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ScummVM 1.3.0svn\n"
"Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n"
-"POT-Creation-Date: 2012-03-07 22:09+0000\n"
+"POT-Creation-Date: 2012-05-20 22:39+0100\n"
"PO-Revision-Date: 2011-10-04 20:51+0100\n"
"Last-Translator: Jordi Vilalta Prat <jvprat@jvprat.com>\n"
"Language-Team: Catalan <scummvm-devel@lists.sf.net>\n"
@@ -43,7 +43,7 @@ msgid "Go up"
msgstr "Amunt"
#: gui/browser.cpp:69 gui/chooser.cpp:45 gui/KeysDialog.cpp:43
-#: gui/launcher.cpp:320 gui/massadd.cpp:94 gui/options.cpp:1253
+#: gui/launcher.cpp:345 gui/massadd.cpp:94 gui/options.cpp:1228
#: gui/saveload.cpp:63 gui/saveload.cpp:155 gui/themebrowser.cpp:54
#: engines/engine.cpp:442 engines/scumm/dialogs.cpp:190
#: engines/sword1/control.cpp:865 engines/parallaction/saveload.cpp:281
@@ -68,15 +68,15 @@ msgstr "Tanca"
msgid "Mouse click"
msgstr "Clic del ratolэ"
-#: gui/gui-manager.cpp:122 base/main.cpp:288
+#: gui/gui-manager.cpp:122 base/main.cpp:300
msgid "Display keyboard"
msgstr "Mostra el teclat"
-#: gui/gui-manager.cpp:126 base/main.cpp:292
+#: gui/gui-manager.cpp:126 base/main.cpp:304
msgid "Remap keys"
msgstr "Assigna les tecles"
-#: gui/gui-manager.cpp:129 base/main.cpp:295
+#: gui/gui-manager.cpp:129 base/main.cpp:307
#, fuzzy
msgid "Toggle FullScreen"
msgstr "Commuta la pantalla completa"
@@ -89,8 +89,8 @@ msgstr "SelЗleccioneu una acciѓ a assignar"
msgid "Map"
msgstr "Assigna"
-#: gui/KeysDialog.cpp:42 gui/launcher.cpp:321 gui/launcher.cpp:960
-#: gui/launcher.cpp:964 gui/massadd.cpp:91 gui/options.cpp:1254
+#: gui/KeysDialog.cpp:42 gui/launcher.cpp:346 gui/launcher.cpp:1001
+#: gui/launcher.cpp:1005 gui/massadd.cpp:91 gui/options.cpp:1229
#: engines/engine.cpp:361 engines/engine.cpp:372 engines/scumm/dialogs.cpp:192
#: engines/scumm/scumm.cpp:1775 engines/agos/animation.cpp:551
#: engines/groovie/script.cpp:420 engines/sky/compact.cpp:131
@@ -127,15 +127,15 @@ msgstr "Seleccioneu una acciѓ"
msgid "Press the key to associate"
msgstr "Premeu la tecla a associar"
-#: gui/launcher.cpp:170
+#: gui/launcher.cpp:187
msgid "Game"
msgstr "Joc"
-#: gui/launcher.cpp:174
+#: gui/launcher.cpp:191
msgid "ID:"
msgstr "Identificador:"
-#: gui/launcher.cpp:174 gui/launcher.cpp:176 gui/launcher.cpp:177
+#: gui/launcher.cpp:191 gui/launcher.cpp:193 gui/launcher.cpp:194
msgid ""
"Short game identifier used for referring to savegames and running the game "
"from the command line"
@@ -143,29 +143,29 @@ msgstr ""
"Identificador de joc curt utilitzat per referir-se a les partides i per "
"executar el joc des de la lэnia de comandes"
-#: gui/launcher.cpp:176
+#: gui/launcher.cpp:193
msgctxt "lowres"
msgid "ID:"
msgstr "ID:"
-#: gui/launcher.cpp:181
+#: gui/launcher.cpp:198
msgid "Name:"
msgstr "Nom:"
-#: gui/launcher.cpp:181 gui/launcher.cpp:183 gui/launcher.cpp:184
+#: gui/launcher.cpp:198 gui/launcher.cpp:200 gui/launcher.cpp:201
msgid "Full title of the game"
msgstr "Tэtol complet del joc"
-#: gui/launcher.cpp:183
+#: gui/launcher.cpp:200
msgctxt "lowres"
msgid "Name:"
msgstr "Nom:"
-#: gui/launcher.cpp:187
+#: gui/launcher.cpp:204
msgid "Language:"
msgstr "Idioma:"
-#: gui/launcher.cpp:187 gui/launcher.cpp:188
+#: gui/launcher.cpp:204 gui/launcher.cpp:205
msgid ""
"Language of the game. This will not turn your Spanish game version into "
"English"
@@ -173,283 +173,288 @@ msgstr ""
"Idioma del joc. Aixђ no convertirр la vostra versiѓ Espanyola del joc a "
"Anglшs"
-#: gui/launcher.cpp:189 gui/launcher.cpp:203 gui/options.cpp:80
-#: gui/options.cpp:745 gui/options.cpp:758 gui/options.cpp:1224
+#: gui/launcher.cpp:206 gui/launcher.cpp:220 gui/options.cpp:80
+#: gui/options.cpp:730 gui/options.cpp:743 gui/options.cpp:1199
#: audio/null.cpp:40
msgid "<default>"
msgstr "<per defecte>"
-#: gui/launcher.cpp:199
+#: gui/launcher.cpp:216
msgid "Platform:"
msgstr "Plataforma:"
-#: gui/launcher.cpp:199 gui/launcher.cpp:201 gui/launcher.cpp:202
+#: gui/launcher.cpp:216 gui/launcher.cpp:218 gui/launcher.cpp:219
msgid "Platform the game was originally designed for"
msgstr "Plataforma per la que el joc es va dissenyar originalment"
-#: gui/launcher.cpp:201
+#: gui/launcher.cpp:218
msgctxt "lowres"
msgid "Platform:"
msgstr "Platafor.:"
-#: gui/launcher.cpp:213 gui/options.cpp:1087 gui/options.cpp:1104
+#: gui/launcher.cpp:231
+#, fuzzy
+msgid "Engine"
+msgstr "Examina"
+
+#: gui/launcher.cpp:239 gui/options.cpp:1062 gui/options.cpp:1079
msgid "Graphics"
msgstr "Grрfics"
-#: gui/launcher.cpp:213 gui/options.cpp:1087 gui/options.cpp:1104
+#: gui/launcher.cpp:239 gui/options.cpp:1062 gui/options.cpp:1079
msgid "GFX"
msgstr "GFX"
-#: gui/launcher.cpp:216
+#: gui/launcher.cpp:242
msgid "Override global graphic settings"
msgstr "Fer canvis sobre les opcions globals de grрfics"
-#: gui/launcher.cpp:218
+#: gui/launcher.cpp:244
msgctxt "lowres"
msgid "Override global graphic settings"
msgstr "Canviar les opcions de grрfics"
-#: gui/launcher.cpp:225 gui/options.cpp:1110
+#: gui/launcher.cpp:251 gui/options.cpp:1085
msgid "Audio"
msgstr "Рudio"
-#: gui/launcher.cpp:228
+#: gui/launcher.cpp:254
msgid "Override global audio settings"
msgstr "Fer canvis sobre les opcions globals d'рudio"
-#: gui/launcher.cpp:230
+#: gui/launcher.cpp:256
msgctxt "lowres"
msgid "Override global audio settings"
msgstr "Canviar les opcions d'рudio"
-#: gui/launcher.cpp:239 gui/options.cpp:1115
+#: gui/launcher.cpp:265 gui/options.cpp:1090
msgid "Volume"
msgstr "Volum"
-#: gui/launcher.cpp:241 gui/options.cpp:1117
+#: gui/launcher.cpp:267 gui/options.cpp:1092
msgctxt "lowres"
msgid "Volume"
msgstr "Volum"
-#: gui/launcher.cpp:244
+#: gui/launcher.cpp:270
msgid "Override global volume settings"
msgstr "Fer canvis sobre les opcions globals de volum"
-#: gui/launcher.cpp:246
+#: gui/launcher.cpp:272
msgctxt "lowres"
msgid "Override global volume settings"
msgstr "Canviar les opcions de volum"
-#: gui/launcher.cpp:254 gui/options.cpp:1125
+#: gui/launcher.cpp:280 gui/options.cpp:1100
msgid "MIDI"
msgstr "MIDI"
-#: gui/launcher.cpp:257
+#: gui/launcher.cpp:283
msgid "Override global MIDI settings"
msgstr "Fer canvis sobre les opcions globals de MIDI"
-#: gui/launcher.cpp:259
+#: gui/launcher.cpp:285
msgctxt "lowres"
msgid "Override global MIDI settings"
msgstr "Canviar les opcions de MIDI"
-#: gui/launcher.cpp:268 gui/options.cpp:1131
+#: gui/launcher.cpp:294 gui/options.cpp:1106
msgid "MT-32"
msgstr "MT-32"
-#: gui/launcher.cpp:271
+#: gui/launcher.cpp:297
msgid "Override global MT-32 settings"
msgstr "Fer canvis sobre les opcions globals de MT-32"
-#: gui/launcher.cpp:273
+#: gui/launcher.cpp:299
msgctxt "lowres"
msgid "Override global MT-32 settings"
msgstr "Canviar les opcions de MT-32"
-#: gui/launcher.cpp:282 gui/options.cpp:1138
+#: gui/launcher.cpp:308 gui/options.cpp:1113
msgid "Paths"
msgstr "Camins"
-#: gui/launcher.cpp:284 gui/options.cpp:1140
+#: gui/launcher.cpp:310 gui/options.cpp:1115
msgctxt "lowres"
msgid "Paths"
msgstr "Camins"
-#: gui/launcher.cpp:291
+#: gui/launcher.cpp:317
msgid "Game Path:"
msgstr "Camэ del joc:"
-#: gui/launcher.cpp:293
+#: gui/launcher.cpp:319
msgctxt "lowres"
msgid "Game Path:"
msgstr "Camэ joc:"
-#: gui/launcher.cpp:298 gui/options.cpp:1164
+#: gui/launcher.cpp:324 gui/options.cpp:1139
msgid "Extra Path:"
msgstr "Camэ extra:"
-#: gui/launcher.cpp:298 gui/launcher.cpp:300 gui/launcher.cpp:301
+#: gui/launcher.cpp:324 gui/launcher.cpp:326 gui/launcher.cpp:327
msgid "Specifies path to additional data used the game"
msgstr "Especifica el camэ de dades addicionals utilitzades pel joc"
-#: gui/launcher.cpp:300 gui/options.cpp:1166
+#: gui/launcher.cpp:326 gui/options.cpp:1141
msgctxt "lowres"
msgid "Extra Path:"
msgstr "Camэ extra:"
-#: gui/launcher.cpp:307 gui/options.cpp:1148
+#: gui/launcher.cpp:333 gui/options.cpp:1123
msgid "Save Path:"
msgstr "Camэ de partides:"
-#: gui/launcher.cpp:307 gui/launcher.cpp:309 gui/launcher.cpp:310
-#: gui/options.cpp:1148 gui/options.cpp:1150 gui/options.cpp:1151
+#: gui/launcher.cpp:333 gui/launcher.cpp:335 gui/launcher.cpp:336
+#: gui/options.cpp:1123 gui/options.cpp:1125 gui/options.cpp:1126
msgid "Specifies where your savegames are put"
msgstr "Especifica on es desaran les partides"
-#: gui/launcher.cpp:309 gui/options.cpp:1150
+#: gui/launcher.cpp:335 gui/options.cpp:1125
msgctxt "lowres"
msgid "Save Path:"
msgstr "Partides:"
-#: gui/launcher.cpp:329 gui/launcher.cpp:416 gui/launcher.cpp:469
-#: gui/launcher.cpp:523 gui/options.cpp:1159 gui/options.cpp:1167
-#: gui/options.cpp:1176 gui/options.cpp:1283 gui/options.cpp:1289
-#: gui/options.cpp:1297 gui/options.cpp:1327 gui/options.cpp:1333
-#: gui/options.cpp:1340 gui/options.cpp:1433 gui/options.cpp:1436
-#: gui/options.cpp:1448
+#: gui/launcher.cpp:354 gui/launcher.cpp:453 gui/launcher.cpp:511
+#: gui/launcher.cpp:565 gui/options.cpp:1134 gui/options.cpp:1142
+#: gui/options.cpp:1151 gui/options.cpp:1258 gui/options.cpp:1264
+#: gui/options.cpp:1272 gui/options.cpp:1302 gui/options.cpp:1308
+#: gui/options.cpp:1315 gui/options.cpp:1408 gui/options.cpp:1411
+#: gui/options.cpp:1423
msgctxt "path"
msgid "None"
msgstr "Cap"
-#: gui/launcher.cpp:334 gui/launcher.cpp:422 gui/launcher.cpp:527
-#: gui/options.cpp:1277 gui/options.cpp:1321 gui/options.cpp:1439
+#: gui/launcher.cpp:359 gui/launcher.cpp:459 gui/launcher.cpp:569
+#: gui/options.cpp:1252 gui/options.cpp:1296 gui/options.cpp:1414
#: backends/platform/wii/options.cpp:56
msgid "Default"
msgstr "Per defecte"
-#: gui/launcher.cpp:462 gui/options.cpp:1442
+#: gui/launcher.cpp:504 gui/options.cpp:1417
msgid "Select SoundFont"
msgstr "Seleccioneu el fitxer SoundFont"
-#: gui/launcher.cpp:481 gui/launcher.cpp:636
+#: gui/launcher.cpp:523 gui/launcher.cpp:677
msgid "Select directory with game data"
msgstr "Seleccioneu el directori amb les dades del joc"
-#: gui/launcher.cpp:499
+#: gui/launcher.cpp:541
msgid "Select additional game directory"
msgstr "Seleccioneu el directori addicional del joc"
-#: gui/launcher.cpp:511
+#: gui/launcher.cpp:553
msgid "Select directory for saved games"
msgstr "Seleccioneu el directori de les partides desades"
-#: gui/launcher.cpp:538
+#: gui/launcher.cpp:580
msgid "This game ID is already taken. Please choose another one."
msgstr ""
"Aquest identificador de joc ja estр en њs. Si us plau, trieu-ne un altre."
-#: gui/launcher.cpp:579 engines/dialogs.cpp:110
+#: gui/launcher.cpp:621 engines/dialogs.cpp:110
msgid "~Q~uit"
msgstr "~T~anca"
-#: gui/launcher.cpp:579 backends/platform/sdl/macosx/appmenu_osx.mm:96
+#: gui/launcher.cpp:621 backends/platform/sdl/macosx/appmenu_osx.mm:96
msgid "Quit ScummVM"
msgstr "Surt de ScummVM"
-#: gui/launcher.cpp:580
+#: gui/launcher.cpp:622
msgid "A~b~out..."
msgstr "~Q~uant a..."
-#: gui/launcher.cpp:580 backends/platform/sdl/macosx/appmenu_osx.mm:70
+#: gui/launcher.cpp:622 backends/platform/sdl/macosx/appmenu_osx.mm:70
msgid "About ScummVM"
msgstr "Quant a ScummVM"
-#: gui/launcher.cpp:581
+#: gui/launcher.cpp:623
msgid "~O~ptions..."
msgstr "~O~pcions..."
-#: gui/launcher.cpp:581
+#: gui/launcher.cpp:623
msgid "Change global ScummVM options"
msgstr "Canvia les opcions globals de ScummVM"
-#: gui/launcher.cpp:583
+#: gui/launcher.cpp:625
msgid "~S~tart"
msgstr "~I~nicia"
-#: gui/launcher.cpp:583
+#: gui/launcher.cpp:625
msgid "Start selected game"
msgstr "Iniciant el joc seleccionat"
-#: gui/launcher.cpp:586
+#: gui/launcher.cpp:628
msgid "~L~oad..."
msgstr "~C~arrega..."
-#: gui/launcher.cpp:586
+#: gui/launcher.cpp:628
msgid "Load savegame for selected game"
msgstr "Carrega una partida pel joc seleccionat"
-#: gui/launcher.cpp:591 gui/launcher.cpp:1079
+#: gui/launcher.cpp:633 gui/launcher.cpp:1120
msgid "~A~dd Game..."
msgstr "~A~fegeix Joc..."
-#: gui/launcher.cpp:591 gui/launcher.cpp:598
+#: gui/launcher.cpp:633 gui/launcher.cpp:640
msgid "Hold Shift for Mass Add"
msgstr "Mantingueu premut Shift per a l'Addiciѓ Massiva"
-#: gui/launcher.cpp:593
+#: gui/launcher.cpp:635
msgid "~E~dit Game..."
msgstr "~E~dita Joc..."
-#: gui/launcher.cpp:593 gui/launcher.cpp:600
+#: gui/launcher.cpp:635 gui/launcher.cpp:642
msgid "Change game options"
msgstr "Canvia les opcions del joc"
-#: gui/launcher.cpp:595
+#: gui/launcher.cpp:637
msgid "~R~emove Game"
msgstr "~S~uprimeix Joc"
-#: gui/launcher.cpp:595 gui/launcher.cpp:602
+#: gui/launcher.cpp:637 gui/launcher.cpp:644
msgid "Remove game from the list. The game data files stay intact"
msgstr ""
"Elimina un joc de la llista. Els fitxers de dades del joc es mantenen "
"intactes"
-#: gui/launcher.cpp:598 gui/launcher.cpp:1079
+#: gui/launcher.cpp:640 gui/launcher.cpp:1120
msgctxt "lowres"
msgid "~A~dd Game..."
msgstr "~A~fegeix Joc..."
-#: gui/launcher.cpp:600
+#: gui/launcher.cpp:642
msgctxt "lowres"
msgid "~E~dit Game..."
msgstr "~E~dita Joc..."
-#: gui/launcher.cpp:602
+#: gui/launcher.cpp:644
msgctxt "lowres"
msgid "~R~emove Game"
msgstr "~S~uprimeix"
-#: gui/launcher.cpp:610
+#: gui/launcher.cpp:652
msgid "Search in game list"
msgstr "Cerca a la llista de jocs"
-#: gui/launcher.cpp:614 gui/launcher.cpp:1126
+#: gui/launcher.cpp:656 gui/launcher.cpp:1167
msgid "Search:"
msgstr "Cerca:"
-#: gui/launcher.cpp:639 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255
+#: gui/launcher.cpp:680 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255
#: engines/mohawk/riven.cpp:716 engines/cruise/menu.cpp:216
msgid "Load game:"
msgstr "Carrega partida:"
-#: gui/launcher.cpp:639 engines/dialogs.cpp:114 engines/scumm/dialogs.cpp:188
+#: gui/launcher.cpp:680 engines/dialogs.cpp:114 engines/scumm/dialogs.cpp:188
#: engines/mohawk/myst.cpp:255 engines/mohawk/riven.cpp:716
#: engines/cruise/menu.cpp:216 backends/platform/wince/CEActionsPocket.cpp:267
#: backends/platform/wince/CEActionsSmartphone.cpp:231
msgid "Load"
msgstr "Carrega"
-#: gui/launcher.cpp:747
+#: gui/launcher.cpp:788
msgid ""
"Do you really want to run the mass game detector? This could potentially add "
"a huge number of games."
@@ -457,7 +462,7 @@ msgstr ""
"Esteu segur que voleu executar el detector massiu de jocs? Aixђ pot afegir "
"una gran quantitat de jocs."
-#: gui/launcher.cpp:748 gui/launcher.cpp:896
+#: gui/launcher.cpp:789 gui/launcher.cpp:937
#: backends/events/symbiansdl/symbiansdl-events.cpp:184
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
@@ -465,7 +470,7 @@ msgstr ""
msgid "Yes"
msgstr "Sэ"
-#: gui/launcher.cpp:748 gui/launcher.cpp:896
+#: gui/launcher.cpp:789 gui/launcher.cpp:937
#: backends/events/symbiansdl/symbiansdl-events.cpp:184
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
@@ -473,37 +478,37 @@ msgstr "Sэ"
msgid "No"
msgstr "No"
-#: gui/launcher.cpp:796
+#: gui/launcher.cpp:837
msgid "ScummVM couldn't open the specified directory!"
msgstr "ScummVM no ha pogut obrir el directori especificat!"
-#: gui/launcher.cpp:808
+#: gui/launcher.cpp:849
msgid "ScummVM could not find any game in the specified directory!"
msgstr "ScummVM no ha pogut trobar cap joc al directori especificat!"
-#: gui/launcher.cpp:822
+#: gui/launcher.cpp:863
msgid "Pick the game:"
msgstr "Seleccioneu el joc:"
-#: gui/launcher.cpp:896
+#: gui/launcher.cpp:937
msgid "Do you really want to remove this game configuration?"
msgstr "Realment voleu suprimir la configuraciѓ d'aquest joc?"
-#: gui/launcher.cpp:960
+#: gui/launcher.cpp:1001
msgid "This game does not support loading games from the launcher."
msgstr "Aquest joc no suporta la cрrrega de partides des del llanчador."
-#: gui/launcher.cpp:964
+#: gui/launcher.cpp:1005
msgid "ScummVM could not find any engine capable of running the selected game!"
msgstr ""
"ScummVM no ha pogut trobar cap motor capaч d'executar el joc seleccionat!"
-#: gui/launcher.cpp:1078
+#: gui/launcher.cpp:1119
msgctxt "lowres"
msgid "Mass Add..."
msgstr "Afegeix Jocs"
-#: gui/launcher.cpp:1078
+#: gui/launcher.cpp:1119
msgid "Mass Add..."
msgstr "Addiciѓ Massiva..."
@@ -571,101 +576,93 @@ msgstr "44 kHz"
msgid "48 kHz"
msgstr "48 kHz"
-#: gui/options.cpp:257 gui/options.cpp:485 gui/options.cpp:586
-#: gui/options.cpp:659 gui/options.cpp:868
+#: gui/options.cpp:248 gui/options.cpp:474 gui/options.cpp:575
+#: gui/options.cpp:644 gui/options.cpp:852
msgctxt "soundfont"
msgid "None"
msgstr "Cap"
-#: gui/options.cpp:393
+#: gui/options.cpp:382
msgid "Failed to apply some of the graphic options changes:"
msgstr "No s'han pogut aplicar alguns canvis de les opcions grрfiques:"
-#: gui/options.cpp:405
+#: gui/options.cpp:394
msgid "the video mode could not be changed."
msgstr "no s'ha pogut canviar el mode de vэdeo"
-#: gui/options.cpp:411
+#: gui/options.cpp:400
msgid "the fullscreen setting could not be changed"
msgstr "no s'ha pogut canviar l'ajust de pantalla completa"
-#: gui/options.cpp:417
+#: gui/options.cpp:406
msgid "the aspect ratio setting could not be changed"
msgstr "no s'ha pogut canviar l'ajust de la correcciѓ d'aspecte"
-#: gui/options.cpp:742
+#: gui/options.cpp:727
msgid "Graphics mode:"
msgstr "Mode grрfic:"
-#: gui/options.cpp:756
+#: gui/options.cpp:741
msgid "Render mode:"
msgstr "Mode de pintat:"
-#: gui/options.cpp:756 gui/options.cpp:757
+#: gui/options.cpp:741 gui/options.cpp:742
msgid "Special dithering modes supported by some games"
msgstr "Modes de tramat especials suportats per alguns jocs"
-#: gui/options.cpp:768
+#: gui/options.cpp:753
#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2248
#: backends/graphics/openglsdl/openglsdl-graphics.cpp:472
msgid "Fullscreen mode"
msgstr "Mode pantalla completa"
-#: gui/options.cpp:771
+#: gui/options.cpp:756
msgid "Aspect ratio correction"
msgstr "Correcciѓ de la relaciѓ d'aspecte"
-#: gui/options.cpp:771
+#: gui/options.cpp:756
msgid "Correct aspect ratio for 320x200 games"
msgstr "Corregeix la relaciѓ d'aspecte per jocs de 320x200"
-#: gui/options.cpp:772
-msgid "EGA undithering"
-msgstr "Elimina el tramat d'EGA"
-
-#: gui/options.cpp:772
-msgid "Enable undithering in EGA games that support it"
-msgstr "Activa l'eliminaciѓ del tramat en els jocs EGA que ho suportin"
-
-#: gui/options.cpp:780
+#: gui/options.cpp:764
msgid "Preferred Device:"
msgstr "Disp. preferit:"
-#: gui/options.cpp:780
+#: gui/options.cpp:764
msgid "Music Device:"
msgstr "Disp. de mњsica:"
-#: gui/options.cpp:780 gui/options.cpp:782
+#: gui/options.cpp:764 gui/options.cpp:766
msgid "Specifies preferred sound device or sound card emulator"
msgstr "Especifica el dispositiu de so o l'emulador de tarja de so preferit"
-#: gui/options.cpp:780 gui/options.cpp:782 gui/options.cpp:783
+#: gui/options.cpp:764 gui/options.cpp:766 gui/options.cpp:767
msgid "Specifies output sound device or sound card emulator"
msgstr "Especifica el dispositiu de so o l'emulador de tarja de so de sortida"
-#: gui/options.cpp:782
+#: gui/options.cpp:766
msgctxt "lowres"
msgid "Preferred Dev.:"
msgstr "Disp. preferit:"
-#: gui/options.cpp:782
+#: gui/options.cpp:766
msgctxt "lowres"
msgid "Music Device:"
msgstr "Disp. de mњsica:"
-#: gui/options.cpp:809
+#: gui/options.cpp:793
msgid "AdLib emulator:"
msgstr "Emulador AdLib:"
-#: gui/options.cpp:809 gui/options.cpp:810
+#: gui/options.cpp:793 gui/options.cpp:794
msgid "AdLib is used for music in many games"
msgstr "AdLib s'utilitza per la mњsica de molts jocs"
-#: gui/options.cpp:820
+#: gui/options.cpp:804
msgid "Output rate:"
msgstr "Freq. sortida:"
-#: gui/options.cpp:820 gui/options.cpp:821
+#: gui/options.cpp:804 gui/options.cpp:805
msgid ""
"Higher value specifies better sound quality but may be not supported by your "
"soundcard"
@@ -673,63 +670,63 @@ msgstr ""
"Valors mщs alts especifiquen millor qualitat de so perђ pot ser que la "
"vostra tarja de so no ho suporti"
-#: gui/options.cpp:831
+#: gui/options.cpp:815
msgid "GM Device:"
msgstr "Dispositiu GM:"
-#: gui/options.cpp:831
+#: gui/options.cpp:815
msgid "Specifies default sound device for General MIDI output"
msgstr ""
"Especifica el dispositiu de so per defecte per a la sortida General MIDI"
-#: gui/options.cpp:842
+#: gui/options.cpp:826
msgid "Don't use General MIDI music"
msgstr "No utilitzis mњsica General MIDI"
-#: gui/options.cpp:853 gui/options.cpp:915
+#: gui/options.cpp:837 gui/options.cpp:899
msgid "Use first available device"
msgstr "Utilitza el primer dispositiu disponible"
-#: gui/options.cpp:865
+#: gui/options.cpp:849
msgid "SoundFont:"
msgstr "Fitxer SoundFont:"
-#: gui/options.cpp:865 gui/options.cpp:867 gui/options.cpp:868
+#: gui/options.cpp:849 gui/options.cpp:851 gui/options.cpp:852
msgid "SoundFont is supported by some audio cards, Fluidsynth and Timidity"
msgstr "Algunes targes de so, Fluidsynth i Timidity suporten SoundFont"
-#: gui/options.cpp:867
+#: gui/options.cpp:851
msgctxt "lowres"
msgid "SoundFont:"
msgstr "SoundFont:"
-#: gui/options.cpp:873
+#: gui/options.cpp:857
msgid "Mixed AdLib/MIDI mode"
msgstr "Mode combinat AdLib/MIDI"
-#: gui/options.cpp:873
+#: gui/options.cpp:857
msgid "Use both MIDI and AdLib sound generation"
msgstr "Utilitza MIDI i la generaciѓ de so AdLib alhora"
-#: gui/options.cpp:876
+#: gui/options.cpp:860
msgid "MIDI gain:"
msgstr "Guany MIDI:"
-#: gui/options.cpp:886
+#: gui/options.cpp:870
msgid "MT-32 Device:"
msgstr "Disposit. MT-32:"
-#: gui/options.cpp:886
+#: gui/options.cpp:870
msgid "Specifies default sound device for Roland MT-32/LAPC1/CM32l/CM64 output"
msgstr ""
"Especifica el dispositiu de so per defecte per a la sortida de Roland MT-32/"
"LAPC1/CM32l/CM64"
-#: gui/options.cpp:891
+#: gui/options.cpp:875
msgid "True Roland MT-32 (disable GM emulation)"
msgstr "Roland MT-32 real (desactiva l'emulaciѓ GM)"
-#: gui/options.cpp:891 gui/options.cpp:893
+#: gui/options.cpp:875 gui/options.cpp:877
msgid ""
"Check if you want to use your real hardware Roland-compatible sound device "
"connected to your computer"
@@ -737,196 +734,196 @@ msgstr ""
"Marqueu si voleu utilitzar el vostre dispositiu hardware real de so "
"compatible amb Roland connectat al vostre ordinador"
-#: gui/options.cpp:893
+#: gui/options.cpp:877
msgctxt "lowres"
msgid "True Roland MT-32 (no GM emulation)"
msgstr "Roland MT-32 real (sense emulaciѓ GM)"
-#: gui/options.cpp:896
+#: gui/options.cpp:880
msgid "Enable Roland GS Mode"
msgstr "Activa el Mode Roland GS"
-#: gui/options.cpp:896
+#: gui/options.cpp:880
msgid "Turns off General MIDI mapping for games with Roland MT-32 soundtrack"
msgstr ""
"Desactiva la conversiѓ General MIDI pels jocs que tenen banda sonora per a "
"Roland MT-32"
-#: gui/options.cpp:905
+#: gui/options.cpp:889
msgid "Don't use Roland MT-32 music"
msgstr "No utilitzis mњsica de Roland MT-32"
-#: gui/options.cpp:932
+#: gui/options.cpp:916
msgid "Text and Speech:"
msgstr "Text i Veus:"
-#: gui/options.cpp:936 gui/options.cpp:946
+#: gui/options.cpp:920 gui/options.cpp:930
msgid "Speech"
msgstr "Veus"
-#: gui/options.cpp:937 gui/options.cpp:947
+#: gui/options.cpp:921 gui/options.cpp:931
msgid "Subtitles"
msgstr "Subtэtols"
-#: gui/options.cpp:938
+#: gui/options.cpp:922
msgid "Both"
msgstr "Ambdѓs"
-#: gui/options.cpp:940
+#: gui/options.cpp:924
msgid "Subtitle speed:"
msgstr "Velocitat de subt.:"
-#: gui/options.cpp:942
+#: gui/options.cpp:926
msgctxt "lowres"
msgid "Text and Speech:"
msgstr "Text i Veus:"
-#: gui/options.cpp:946
+#: gui/options.cpp:930
msgid "Spch"
msgstr "Veus"
-#: gui/options.cpp:947
+#: gui/options.cpp:931
msgid "Subs"
msgstr "Subt"
-#: gui/options.cpp:948
+#: gui/options.cpp:932
msgctxt "lowres"
msgid "Both"
msgstr "Ambdѓs"
-#: gui/options.cpp:948
+#: gui/options.cpp:932
msgid "Show subtitles and play speech"
msgstr "Mostra els subtэtols i reprodueix la veu"
-#: gui/options.cpp:950
+#: gui/options.cpp:934
msgctxt "lowres"
msgid "Subtitle speed:"
msgstr "Veloc. de subt.:"
-#: gui/options.cpp:966
+#: gui/options.cpp:950
msgid "Music volume:"
msgstr "Volum de mњsica:"
-#: gui/options.cpp:968
+#: gui/options.cpp:952
msgctxt "lowres"
msgid "Music volume:"
msgstr "Volum de mњsica:"
-#: gui/options.cpp:975
+#: gui/options.cpp:959
msgid "Mute All"
msgstr "Silenciar tot"
-#: gui/options.cpp:978
+#: gui/options.cpp:962
msgid "SFX volume:"
msgstr "Volum d'efectes:"
-#: gui/options.cpp:978 gui/options.cpp:980 gui/options.cpp:981
+#: gui/options.cpp:962 gui/options.cpp:964 gui/options.cpp:965
msgid "Special sound effects volume"
msgstr "Volum dels sons d'efectes especials"
-#: gui/options.cpp:980
+#: gui/options.cpp:964
msgctxt "lowres"
msgid "SFX volume:"
msgstr "Volum d'efectes:"
-#: gui/options.cpp:988
+#: gui/options.cpp:972
msgid "Speech volume:"
msgstr "Volum de veus:"
-#: gui/options.cpp:990
+#: gui/options.cpp:974
msgctxt "lowres"
msgid "Speech volume:"
msgstr "Volum de veus:"
-#: gui/options.cpp:1156
+#: gui/options.cpp:1131
msgid "Theme Path:"
msgstr "Camэ dels temes:"
-#: gui/options.cpp:1158
+#: gui/options.cpp:1133
msgctxt "lowres"
msgid "Theme Path:"
msgstr "Camэ temes:"
-#: gui/options.cpp:1164 gui/options.cpp:1166 gui/options.cpp:1167
+#: gui/options.cpp:1139 gui/options.cpp:1141 gui/options.cpp:1142
msgid "Specifies path to additional data used by all games or ScummVM"
msgstr ""
"Especifica el camэ de les dades addicionals utilitzades per tots els jocs o "
"pel ScummVM"
-#: gui/options.cpp:1173
+#: gui/options.cpp:1148
msgid "Plugins Path:"
msgstr "Camэ dels connectors:"
-#: gui/options.cpp:1175
+#: gui/options.cpp:1150
msgctxt "lowres"
msgid "Plugins Path:"
msgstr "Camэ de connectors:"
-#: gui/options.cpp:1184
+#: gui/options.cpp:1159
msgid "Misc"
msgstr "Misc"
-#: gui/options.cpp:1186
+#: gui/options.cpp:1161
msgctxt "lowres"
msgid "Misc"
msgstr "Misc"
-#: gui/options.cpp:1188
+#: gui/options.cpp:1163
msgid "Theme:"
msgstr "Tema:"
-#: gui/options.cpp:1192
+#: gui/options.cpp:1167
msgid "GUI Renderer:"
msgstr "Pintat GUI:"
-#: gui/options.cpp:1204
+#: gui/options.cpp:1179
msgid "Autosave:"
msgstr "Desat automрtic:"
-#: gui/options.cpp:1206
+#: gui/options.cpp:1181
msgctxt "lowres"
msgid "Autosave:"
msgstr "Auto-desat:"
-#: gui/options.cpp:1214
+#: gui/options.cpp:1189
msgid "Keys"
msgstr "Tecles"
-#: gui/options.cpp:1221
+#: gui/options.cpp:1196
msgid "GUI Language:"
msgstr "Idioma GUI:"
-#: gui/options.cpp:1221
+#: gui/options.cpp:1196
msgid "Language of ScummVM GUI"
msgstr "Idioma de la interfэcie d'usuari de ScummVM"
-#: gui/options.cpp:1372
+#: gui/options.cpp:1347
msgid "You have to restart ScummVM before your changes will take effect."
msgstr "Heu de reiniciar ScummVM perquш tots els canvis tinguin efecte."
-#: gui/options.cpp:1385
+#: gui/options.cpp:1360
msgid "Select directory for savegames"
msgstr "Seleccioneu el directori de les partides desades"
-#: gui/options.cpp:1392
+#: gui/options.cpp:1367
msgid "The chosen directory cannot be written to. Please select another one."
msgstr ""
"No es pot escriure al directori seleccionat. Si us plau, escolliu-ne un "
"altre."
-#: gui/options.cpp:1401
+#: gui/options.cpp:1376
msgid "Select directory for GUI themes"
msgstr "Seleccioneu el directori dels temes"
-#: gui/options.cpp:1411
+#: gui/options.cpp:1386
msgid "Select directory for extra files"
msgstr "Seleccioneu el directori dels fitxers extra"
-#: gui/options.cpp:1422
+#: gui/options.cpp:1397
msgid "Select directory for plugins"
msgstr "Seleccioneu el directori dels connectors"
-#: gui/options.cpp:1475
+#: gui/options.cpp:1450
msgid ""
"The theme you selected does not support your current language. If you want "
"to use this theme you need to switch to another language first."
@@ -974,64 +971,64 @@ msgstr "Partida sense tэtol"
msgid "Select a Theme"
msgstr "Seleccioneu un Tema"
-#: gui/ThemeEngine.cpp:333
+#: gui/ThemeEngine.cpp:335
msgid "Disabled GFX"
msgstr "GFX desactivats"
-#: gui/ThemeEngine.cpp:333
+#: gui/ThemeEngine.cpp:335
msgctxt "lowres"
msgid "Disabled GFX"
msgstr "GFX desactivats"
-#: gui/ThemeEngine.cpp:334
+#: gui/ThemeEngine.cpp:336
msgid "Standard Renderer (16bpp)"
msgstr "Pintat estрndard (16bpp)"
-#: gui/ThemeEngine.cpp:334
+#: gui/ThemeEngine.cpp:336
msgid "Standard (16bpp)"
msgstr "Estрndard (16bpp)"
-#: gui/ThemeEngine.cpp:336
+#: gui/ThemeEngine.cpp:338
msgid "Antialiased Renderer (16bpp)"
msgstr "Pintat amb antialias (16bpp)"
-#: gui/ThemeEngine.cpp:336
+#: gui/ThemeEngine.cpp:338
msgid "Antialiased (16bpp)"
msgstr "Amb antialias (16bpp)"
-#: gui/widget.cpp:312 gui/widget.cpp:314 gui/widget.cpp:320 gui/widget.cpp:322
+#: gui/widget.cpp:322 gui/widget.cpp:324 gui/widget.cpp:330 gui/widget.cpp:332
msgid "Clear value"
msgstr "Neteja el valor"
-#: base/main.cpp:203
+#: base/main.cpp:209
#, c-format
msgid "Engine does not support debug level '%s'"
msgstr "El motor no suporta el nivell de depuraciѓ '%s'"
-#: base/main.cpp:275
+#: base/main.cpp:287
msgid "Menu"
msgstr "Menњ"
-#: base/main.cpp:278 backends/platform/symbian/src/SymbianActions.cpp:45
+#: base/main.cpp:290 backends/platform/symbian/src/SymbianActions.cpp:45
#: backends/platform/wince/CEActionsPocket.cpp:45
#: backends/platform/wince/CEActionsSmartphone.cpp:46
msgid "Skip"
msgstr "Salta"
-#: base/main.cpp:281 backends/platform/symbian/src/SymbianActions.cpp:50
+#: base/main.cpp:293 backends/platform/symbian/src/SymbianActions.cpp:50
#: backends/platform/wince/CEActionsPocket.cpp:42
msgid "Pause"
msgstr "Pausa"
-#: base/main.cpp:284
+#: base/main.cpp:296
msgid "Skip line"
msgstr "Salta la lэnia"
-#: base/main.cpp:455
+#: base/main.cpp:467
msgid "Error running game:"
msgstr "Error al executar el joc:"
-#: base/main.cpp:479
+#: base/main.cpp:491
msgid "Could not find any engine capable of running the selected game"
msgstr "No s'ha pogut trobar cap motor capaч d'executar el joc seleccionat"
@@ -1099,17 +1096,17 @@ msgstr "CancelЗlat per l'usuari"
msgid "Unknown error"
msgstr "Error desconegut"
-#: engines/advancedDetector.cpp:296
+#: engines/advancedDetector.cpp:324
#, c-format
msgid "The game in '%s' seems to be unknown."
msgstr "El joc a '%s' sembla ser desconegut."
-#: engines/advancedDetector.cpp:297
+#: engines/advancedDetector.cpp:325
msgid "Please, report the following data to the ScummVM team along with name"
msgstr ""
"Informeu de la segќent informaciѓ a l'equip de ScummVM juntament amb el"
-#: engines/advancedDetector.cpp:299
+#: engines/advancedDetector.cpp:327
msgid "of the game you tried to add and its version/language/etc.:"
msgstr "nom del joc que heu provat d'afegir i la seva versiѓ/llengua/etc.:"
@@ -1146,13 +1143,14 @@ msgctxt "lowres"
msgid "~R~eturn to Launcher"
msgstr "~R~etorna al Llanчador"
-#: engines/dialogs.cpp:116 engines/cruise/menu.cpp:214
-#: engines/sci/engine/kfile.cpp:566
+#: engines/dialogs.cpp:116 engines/agi/saveload.cpp:805
+#: engines/cruise/menu.cpp:214 engines/sci/engine/kfile.cpp:567
msgid "Save game:"
msgstr "Desa la partida:"
-#: engines/dialogs.cpp:116 engines/scumm/dialogs.cpp:187
-#: engines/cruise/menu.cpp:214 engines/sci/engine/kfile.cpp:566
+#: engines/dialogs.cpp:116 engines/agi/saveload.cpp:805
+#: engines/scumm/dialogs.cpp:187 engines/cruise/menu.cpp:214
+#: engines/sci/engine/kfile.cpp:567
#: backends/platform/symbian/src/SymbianActions.cpp:44
#: backends/platform/wince/CEActionsPocket.cpp:43
#: backends/platform/wince/CEActionsPocket.cpp:267
@@ -1260,6 +1258,88 @@ msgstr ""
msgid "Start anyway"
msgstr "Inicia de totes maneres"
+#: engines/agi/detection.cpp:145 engines/dreamweb/detection.cpp:47
+#: engines/sci/detection.cpp:390
+msgid "Use original save/load screens"
+msgstr ""
+
+#: engines/agi/detection.cpp:146 engines/dreamweb/detection.cpp:48
+#: engines/sci/detection.cpp:391
+msgid "Use the original save/load screens, instead of the ScummVM ones"
+msgstr ""
+
+#: engines/agi/saveload.cpp:827 engines/sci/engine/kfile.cpp:674
+msgid "Restore game:"
+msgstr "Recupera la partida:"
+
+#: engines/agi/saveload.cpp:827 engines/sci/engine/kfile.cpp:674
+msgid "Restore"
+msgstr "Restaura"
+
+#: engines/dreamweb/detection.cpp:57
+#, fuzzy
+msgid "Use bright palette mode"
+msgstr "Element superior dret"
+
+#: engines/dreamweb/detection.cpp:58
+msgid "Display graphics using the game's bright palette"
+msgstr ""
+
+#: engines/sci/detection.cpp:370
+msgid "EGA undithering"
+msgstr "Elimina el tramat d'EGA"
+
+#: engines/sci/detection.cpp:371
+#, fuzzy
+msgid "Enable undithering in EGA games"
+msgstr "Activa l'eliminaciѓ del tramat en els jocs EGA que ho suportin"
+
+#: engines/sci/detection.cpp:380
+#, fuzzy
+msgid "Prefer digital sound effects"
+msgstr "Volum dels sons d'efectes especials"
+
+#: engines/sci/detection.cpp:381
+msgid "Prefer digital sound effects instead of synthesized ones"
+msgstr ""
+
+#: engines/sci/detection.cpp:400
+msgid "Use IMF/Yahama FB-01 for MIDI output"
+msgstr ""
+
+#: engines/sci/detection.cpp:401
+msgid ""
+"Use an IBM Music Feature card or a Yahama FB-01 FM synth module for MIDI "
+"output"
+msgstr ""
+
+#: engines/sci/detection.cpp:411
+msgid "Use CD audio"
+msgstr ""
+
+#: engines/sci/detection.cpp:412
+msgid "Use CD audio instead of in-game audio, if available"
+msgstr ""
+
+#: engines/sci/detection.cpp:422
+msgid "Use Windows cursors"
+msgstr ""
+
+#: engines/sci/detection.cpp:423
+msgid ""
+"Use the Windows cursors (smaller and monochrome) instead of the DOS ones"
+msgstr ""
+
+#: engines/sci/detection.cpp:433
+#, fuzzy
+msgid "Use silver cursors"
+msgstr "Cursor normal"
+
+#: engines/sci/detection.cpp:434
+msgid ""
+"Use the alternate set of silver cursors, instead of the normal golden ones"
+msgstr ""
+
#: engines/scumm/dialogs.cpp:175
#, c-format
msgid "Insert Disk %c and Press Button to Continue."
@@ -1917,7 +1997,7 @@ msgstr ""
"El suport de MIDI natiu requereix l'actualitzaciѓ Roland de LucasArts,\n"
"perђ no s'ha trobat %s. S'utilitzarр AdLib."
-#: engines/scumm/scumm.cpp:2271 engines/agos/saveload.cpp:189
+#: engines/scumm/scumm.cpp:2271 engines/agos/saveload.cpp:202
#, c-format
msgid ""
"Failed to save game state to file:\n"
@@ -1928,7 +2008,7 @@ msgstr ""
"\n"
"%s"
-#: engines/scumm/scumm.cpp:2278 engines/agos/saveload.cpp:154
+#: engines/scumm/scumm.cpp:2278 engines/agos/saveload.cpp:167
#, c-format
msgid ""
"Failed to load game state from file:\n"
@@ -1939,7 +2019,7 @@ msgstr ""
"\n"
"%s"
-#: engines/scumm/scumm.cpp:2290 engines/agos/saveload.cpp:197
+#: engines/scumm/scumm.cpp:2290 engines/agos/saveload.cpp:210
#, c-format
msgid ""
"Successfully saved game state in file:\n"
@@ -1986,14 +2066,6 @@ msgstr "~M~enњ Principal"
msgid "~W~ater Effect Enabled"
msgstr "~E~fecte de l'aigua activat"
-#: engines/sci/engine/kfile.cpp:673
-msgid "Restore game:"
-msgstr "Recupera la partida:"
-
-#: engines/sci/engine/kfile.cpp:673
-msgid "Restore"
-msgstr "Restaura"
-
#: engines/agos/animation.cpp:550
#, c-format
msgid "Cutscene file '%s' not found!"
@@ -2016,6 +2088,66 @@ msgstr "No s'ha pogut esborrar el fitxer."
msgid "Failed to save game"
msgstr "No s'ha pogut desar l'estat del joc"
+#. I18N: Studio audience adds an applause and cheering sounds whenever
+#. Malcolm makes a joke.
+#: engines/kyra/detection.cpp:62
+msgid "Studio audience"
+msgstr ""
+
+#: engines/kyra/detection.cpp:63
+msgid "Enable studio audience"
+msgstr ""
+
+#. I18N: This option allows the user to skip text and cutscenes.
+#: engines/kyra/detection.cpp:73
+msgid "Skip support"
+msgstr ""
+
+#: engines/kyra/detection.cpp:74
+msgid "Allow text and cutscenes to be skipped"
+msgstr ""
+
+#. I18N: Helium mode makes people sound like they've inhaled Helium.
+#: engines/kyra/detection.cpp:84
+msgid "Helium mode"
+msgstr ""
+
+#: engines/kyra/detection.cpp:85
+#, fuzzy
+msgid "Enable helium mode"
+msgstr "Activa el Mode Roland GS"
+
+#. I18N: When enabled, this option makes scrolling smoother when
+#. changing from one screen to another.
+#: engines/kyra/detection.cpp:99
+msgid "Smooth scrolling"
+msgstr ""
+
+#: engines/kyra/detection.cpp:100
+msgid "Enable smooth scrolling when walking"
+msgstr ""
+
+#. I18N: When enabled, this option changes the cursor when it floats to the
+#. edge of the screen to a directional arrow. The player can then click to
+#. walk towards that direction.
+#: engines/kyra/detection.cpp:112
+#, fuzzy
+msgid "Floating cursors"
+msgstr "Cursor normal"
+
+#: engines/kyra/detection.cpp:113
+msgid "Enable floating cursors"
+msgstr ""
+
+#. I18N: HP stands for Hit Points
+#: engines/kyra/detection.cpp:127
+msgid "HP bar graphs"
+msgstr ""
+
+#: engines/kyra/detection.cpp:128
+msgid "Enable hit point bar graphs"
+msgstr ""
+
#: engines/kyra/lol.cpp:478
msgid "Attack 1"
msgstr ""
@@ -2084,6 +2216,14 @@ msgstr ""
"Roland MT32 als de General MIDI. Щs possible\n"
"que algunes pistes no es reprodueixin correctament."
+#: engines/queen/queen.cpp:59 engines/sky/detection.cpp:44
+msgid "Floppy intro"
+msgstr ""
+
+#: engines/queen/queen.cpp:60 engines/sky/detection.cpp:45
+msgid "Use the floppy version's intro (CD version only)"
+msgstr ""
+
#: engines/sky/compact.cpp:130
msgid ""
"Unable to find \"sky.cpt\" file!\n"
@@ -2167,6 +2307,14 @@ msgstr ""
"S'han trobat escenes en DXA, perђ s'ha compilat el ScummVM sense suport de "
"zlib"
+#: engines/sword2/sword2.cpp:79
+msgid "Show object labels"
+msgstr ""
+
+#: engines/sword2/sword2.cpp:80
+msgid "Show labels for objects on mouse hover"
+msgstr ""
+
#: engines/parallaction/saveload.cpp:133
#, c-format
msgid ""
@@ -2403,19 +2551,19 @@ msgstr "Alta qualitat d'рudio (mщs lent) (reiniciar)"
msgid "Disable power off"
msgstr "Desactiva l'apagat automрtic"
-#: backends/platform/iphone/osys_events.cpp:301
+#: backends/platform/iphone/osys_events.cpp:300
msgid "Mouse-click-and-drag mode enabled."
msgstr "S'ha activat el mode de clic-i-arrossega."
-#: backends/platform/iphone/osys_events.cpp:303
+#: backends/platform/iphone/osys_events.cpp:302
msgid "Mouse-click-and-drag mode disabled."
msgstr "S'ha desactivat el mode clic-i-arrossega."
-#: backends/platform/iphone/osys_events.cpp:314
+#: backends/platform/iphone/osys_events.cpp:313
msgid "Touchpad mode enabled."
msgstr "Mode Touchpad activat."
-#: backends/platform/iphone/osys_events.cpp:316
+#: backends/platform/iphone/osys_events.cpp:315
msgid "Touchpad mode disabled."
msgstr "Mode Touchpad desactivat."
@@ -2492,15 +2640,15 @@ msgstr "Filtre de grрfics actiu:"
msgid "Windowed mode"
msgstr "Mode de finestra"
-#: backends/graphics/opengl/opengl-graphics.cpp:130
+#: backends/graphics/opengl/opengl-graphics.cpp:135
msgid "OpenGL Normal"
msgstr "OpenGL Normal"
-#: backends/graphics/opengl/opengl-graphics.cpp:131
+#: backends/graphics/opengl/opengl-graphics.cpp:136
msgid "OpenGL Conserve"
msgstr "OpenGL Conserva"
-#: backends/graphics/opengl/opengl-graphics.cpp:132
+#: backends/graphics/opengl/opengl-graphics.cpp:137
msgid "OpenGL Original"
msgstr "OpenGL Original"
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index 9d786be555..f6005d02f1 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
@@ -7,14 +7,14 @@ msgid ""
msgstr ""
"Project-Id-Version: ScummVM 1.4.0git\n"
"Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n"
-"POT-Creation-Date: 2012-03-07 22:09+0000\n"
+"POT-Creation-Date: 2012-05-20 22:39+0100\n"
"PO-Revision-Date: 2012-03-17 19:07+0100\n"
"Last-Translator: Zbynьk Schwarz <zbynek.schwarz@gmail.com>\n"
"Language-Team: \n"
-"Language: Cesky\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=iso-8859-2\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: Cesky\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
"X-Poedit-Language: Czech\n"
"X-Poedit-Country: CZECH REPUBLIC\n"
@@ -47,7 +47,7 @@ msgid "Go up"
msgstr "Jэt nahoru"
#: gui/browser.cpp:69 gui/chooser.cpp:45 gui/KeysDialog.cpp:43
-#: gui/launcher.cpp:320 gui/massadd.cpp:94 gui/options.cpp:1253
+#: gui/launcher.cpp:345 gui/massadd.cpp:94 gui/options.cpp:1228
#: gui/saveload.cpp:63 gui/saveload.cpp:155 gui/themebrowser.cpp:54
#: engines/engine.cpp:442 engines/scumm/dialogs.cpp:190
#: engines/sword1/control.cpp:865 engines/parallaction/saveload.cpp:281
@@ -72,15 +72,15 @@ msgstr "Zavјэt"
msgid "Mouse click"
msgstr "Kliknutэ myЙэ"
-#: gui/gui-manager.cpp:122 base/main.cpp:288
+#: gui/gui-manager.cpp:122 base/main.cpp:300
msgid "Display keyboard"
msgstr "Zobrazit klсvesnici"
-#: gui/gui-manager.cpp:126 base/main.cpp:292
+#: gui/gui-manager.cpp:126 base/main.cpp:304
msgid "Remap keys"
msgstr "Pјemapovat klсvesy"
-#: gui/gui-manager.cpp:129 base/main.cpp:295
+#: gui/gui-manager.cpp:129 base/main.cpp:307
msgid "Toggle FullScreen"
msgstr "Pјepnout celou obrazovku"
@@ -92,8 +92,8 @@ msgstr "Zvolte шinnost k mapovсnэ"
msgid "Map"
msgstr "Mapovat"
-#: gui/KeysDialog.cpp:42 gui/launcher.cpp:321 gui/launcher.cpp:960
-#: gui/launcher.cpp:964 gui/massadd.cpp:91 gui/options.cpp:1254
+#: gui/KeysDialog.cpp:42 gui/launcher.cpp:346 gui/launcher.cpp:1001
+#: gui/launcher.cpp:1005 gui/massadd.cpp:91 gui/options.cpp:1229
#: engines/engine.cpp:361 engines/engine.cpp:372 engines/scumm/dialogs.cpp:192
#: engines/scumm/scumm.cpp:1775 engines/agos/animation.cpp:551
#: engines/groovie/script.cpp:420 engines/sky/compact.cpp:131
@@ -130,15 +130,15 @@ msgstr "Prosэm vyberte шinnost"
msgid "Press the key to associate"
msgstr "Zmсшknьte klсvesu pro pјiјazenэ"
-#: gui/launcher.cpp:170
+#: gui/launcher.cpp:187
msgid "Game"
msgstr "Hra"
-#: gui/launcher.cpp:174
+#: gui/launcher.cpp:191
msgid "ID:"
msgstr "ID:"
-#: gui/launcher.cpp:174 gui/launcher.cpp:176 gui/launcher.cpp:177
+#: gui/launcher.cpp:191 gui/launcher.cpp:193 gui/launcher.cpp:194
msgid ""
"Short game identifier used for referring to savegames and running the game "
"from the command line"
@@ -146,308 +146,313 @@ msgstr ""
"Krсtk§ identifikсtor her, pouОэvan§ jako odkaz k uloОen§m hrсm a spuЙtьnэ "
"hry z pјэkazovщho јсdku"
-#: gui/launcher.cpp:176
+#: gui/launcher.cpp:193
msgctxt "lowres"
msgid "ID:"
msgstr "ID:"
-#: gui/launcher.cpp:181
+#: gui/launcher.cpp:198
msgid "Name:"
msgstr "Jmщno"
-#: gui/launcher.cpp:181 gui/launcher.cpp:183 gui/launcher.cpp:184
+#: gui/launcher.cpp:198 gui/launcher.cpp:200 gui/launcher.cpp:201
msgid "Full title of the game"
msgstr "кpln§ nсzev hry"
-#: gui/launcher.cpp:183
+#: gui/launcher.cpp:200
msgctxt "lowres"
msgid "Name:"
msgstr "Jmщno:"
-#: gui/launcher.cpp:187
+#: gui/launcher.cpp:204
msgid "Language:"
msgstr "Jazyk:"
-#: gui/launcher.cpp:187 gui/launcher.cpp:188
+#: gui/launcher.cpp:204 gui/launcher.cpp:205
msgid ""
"Language of the game. This will not turn your Spanish game version into "
"English"
msgstr "Jazyk hry. Toto z VaЙэ Љpanьlskщ verze neudьlс Anglickou"
-#: gui/launcher.cpp:189 gui/launcher.cpp:203 gui/options.cpp:80
-#: gui/options.cpp:745 gui/options.cpp:758 gui/options.cpp:1224
+#: gui/launcher.cpp:206 gui/launcher.cpp:220 gui/options.cpp:80
+#: gui/options.cpp:730 gui/options.cpp:743 gui/options.cpp:1199
#: audio/null.cpp:40
msgid "<default>"
msgstr "<v§chozэ>"
-#: gui/launcher.cpp:199
+#: gui/launcher.cpp:216
msgid "Platform:"
msgstr "Platforma:"
-#: gui/launcher.cpp:199 gui/launcher.cpp:201 gui/launcher.cpp:202
+#: gui/launcher.cpp:216 gui/launcher.cpp:218 gui/launcher.cpp:219
msgid "Platform the game was originally designed for"
msgstr "Platforma, pro kterou byla hra pљvodnь vytvoјena"
-#: gui/launcher.cpp:201
+#: gui/launcher.cpp:218
msgctxt "lowres"
msgid "Platform:"
msgstr "Platforma:"
-#: gui/launcher.cpp:213 gui/options.cpp:1087 gui/options.cpp:1104
+#: gui/launcher.cpp:231
+#, fuzzy
+msgid "Engine"
+msgstr "Prohlщdnout"
+
+#: gui/launcher.cpp:239 gui/options.cpp:1062 gui/options.cpp:1079
msgid "Graphics"
msgstr "Obraz"
-#: gui/launcher.cpp:213 gui/options.cpp:1087 gui/options.cpp:1104
+#: gui/launcher.cpp:239 gui/options.cpp:1062 gui/options.cpp:1079
msgid "GFX"
msgstr "GFX"
-#: gui/launcher.cpp:216
+#: gui/launcher.cpp:242
msgid "Override global graphic settings"
msgstr "Potlaшit globсlnэ nastavenэ obrazu"
-#: gui/launcher.cpp:218
+#: gui/launcher.cpp:244
msgctxt "lowres"
msgid "Override global graphic settings"
msgstr "Potlaшit globсlnэ nastavenэ obrazu"
-#: gui/launcher.cpp:225 gui/options.cpp:1110
+#: gui/launcher.cpp:251 gui/options.cpp:1085
msgid "Audio"
msgstr "Zvuk"
-#: gui/launcher.cpp:228
+#: gui/launcher.cpp:254
msgid "Override global audio settings"
msgstr "Potlaшit globсlnэ nastavenэ zvuku"
-#: gui/launcher.cpp:230
+#: gui/launcher.cpp:256
msgctxt "lowres"
msgid "Override global audio settings"
msgstr "Potlaшit globсlnэ nastavenэ zvuku"
-#: gui/launcher.cpp:239 gui/options.cpp:1115
+#: gui/launcher.cpp:265 gui/options.cpp:1090
msgid "Volume"
msgstr "Hlasitost"
-#: gui/launcher.cpp:241 gui/options.cpp:1117
+#: gui/launcher.cpp:267 gui/options.cpp:1092
msgctxt "lowres"
msgid "Volume"
msgstr "Hlasitost"
-#: gui/launcher.cpp:244
+#: gui/launcher.cpp:270
msgid "Override global volume settings"
msgstr "Potlaшit globсlnэ nastavenэ hlasitosti"
-#: gui/launcher.cpp:246
+#: gui/launcher.cpp:272
msgctxt "lowres"
msgid "Override global volume settings"
msgstr "Potlaшit globсlnэ nastavenэ hlasitosti"
-#: gui/launcher.cpp:254 gui/options.cpp:1125
+#: gui/launcher.cpp:280 gui/options.cpp:1100
msgid "MIDI"
msgstr "MIDI"
-#: gui/launcher.cpp:257
+#: gui/launcher.cpp:283
msgid "Override global MIDI settings"
msgstr "Potlaшit globсlnэ nastavenэ MIDI"
-#: gui/launcher.cpp:259
+#: gui/launcher.cpp:285
msgctxt "lowres"
msgid "Override global MIDI settings"
msgstr "Potlaшit globсlnэ nastavenэ MIDI"
-#: gui/launcher.cpp:268 gui/options.cpp:1131
+#: gui/launcher.cpp:294 gui/options.cpp:1106
msgid "MT-32"
msgstr "MT-32"
-#: gui/launcher.cpp:271
+#: gui/launcher.cpp:297
msgid "Override global MT-32 settings"
msgstr "Potlaшit globсlnэ nastavenэ MT-32"
-#: gui/launcher.cpp:273
+#: gui/launcher.cpp:299
msgctxt "lowres"
msgid "Override global MT-32 settings"
msgstr "Potlaшit globсlnэ nastavenэ MT-32"
-#: gui/launcher.cpp:282 gui/options.cpp:1138
+#: gui/launcher.cpp:308 gui/options.cpp:1113
msgid "Paths"
msgstr "Cesty"
-#: gui/launcher.cpp:284 gui/options.cpp:1140
+#: gui/launcher.cpp:310 gui/options.cpp:1115
msgctxt "lowres"
msgid "Paths"
msgstr "Cesty"
-#: gui/launcher.cpp:291
+#: gui/launcher.cpp:317
msgid "Game Path:"
msgstr "Cesta Hry:"
-#: gui/launcher.cpp:293
+#: gui/launcher.cpp:319
msgctxt "lowres"
msgid "Game Path:"
msgstr "Cesta Hry:"
-#: gui/launcher.cpp:298 gui/options.cpp:1164
+#: gui/launcher.cpp:324 gui/options.cpp:1139
msgid "Extra Path:"
msgstr "Dodateшnс Cesta:"
-#: gui/launcher.cpp:298 gui/launcher.cpp:300 gui/launcher.cpp:301
+#: gui/launcher.cpp:324 gui/launcher.cpp:326 gui/launcher.cpp:327
msgid "Specifies path to additional data used the game"
msgstr "Stanovэ cestu pro dodateшnс data pouОitс ve hјe"
-#: gui/launcher.cpp:300 gui/options.cpp:1166
+#: gui/launcher.cpp:326 gui/options.cpp:1141
msgctxt "lowres"
msgid "Extra Path:"
msgstr "Dodateшnс Cesta:"
-#: gui/launcher.cpp:307 gui/options.cpp:1148
+#: gui/launcher.cpp:333 gui/options.cpp:1123
msgid "Save Path:"
msgstr "Cesta pro uloОenэ:"
-#: gui/launcher.cpp:307 gui/launcher.cpp:309 gui/launcher.cpp:310
-#: gui/options.cpp:1148 gui/options.cpp:1150 gui/options.cpp:1151
+#: gui/launcher.cpp:333 gui/launcher.cpp:335 gui/launcher.cpp:336
+#: gui/options.cpp:1123 gui/options.cpp:1125 gui/options.cpp:1126
msgid "Specifies where your savegames are put"
msgstr "Stanovuje, kam jsou umэstьny VaЙe uloОenщ hry"
-#: gui/launcher.cpp:309 gui/options.cpp:1150
+#: gui/launcher.cpp:335 gui/options.cpp:1125
msgctxt "lowres"
msgid "Save Path:"
msgstr "Cesta pro uloОenэ:"
-#: gui/launcher.cpp:329 gui/launcher.cpp:416 gui/launcher.cpp:469
-#: gui/launcher.cpp:523 gui/options.cpp:1159 gui/options.cpp:1167
-#: gui/options.cpp:1176 gui/options.cpp:1283 gui/options.cpp:1289
-#: gui/options.cpp:1297 gui/options.cpp:1327 gui/options.cpp:1333
-#: gui/options.cpp:1340 gui/options.cpp:1433 gui/options.cpp:1436
-#: gui/options.cpp:1448
+#: gui/launcher.cpp:354 gui/launcher.cpp:453 gui/launcher.cpp:511
+#: gui/launcher.cpp:565 gui/options.cpp:1134 gui/options.cpp:1142
+#: gui/options.cpp:1151 gui/options.cpp:1258 gui/options.cpp:1264
+#: gui/options.cpp:1272 gui/options.cpp:1302 gui/options.cpp:1308
+#: gui/options.cpp:1315 gui/options.cpp:1408 gui/options.cpp:1411
+#: gui/options.cpp:1423
msgctxt "path"
msgid "None"
msgstr "Ўсdnщ"
-#: gui/launcher.cpp:334 gui/launcher.cpp:422 gui/launcher.cpp:527
-#: gui/options.cpp:1277 gui/options.cpp:1321 gui/options.cpp:1439
+#: gui/launcher.cpp:359 gui/launcher.cpp:459 gui/launcher.cpp:569
+#: gui/options.cpp:1252 gui/options.cpp:1296 gui/options.cpp:1414
#: backends/platform/wii/options.cpp:56
msgid "Default"
msgstr "V§chozэ"
-#: gui/launcher.cpp:462 gui/options.cpp:1442
+#: gui/launcher.cpp:504 gui/options.cpp:1417
msgid "Select SoundFont"
msgstr "Vybrat SoundFont"
-#: gui/launcher.cpp:481 gui/launcher.cpp:636
+#: gui/launcher.cpp:523 gui/launcher.cpp:677
msgid "Select directory with game data"
msgstr "Vyberte adresсј s daty hry"
-#: gui/launcher.cpp:499
+#: gui/launcher.cpp:541
msgid "Select additional game directory"
msgstr "Vyberte dodateшn§ adresсј hry"
-#: gui/launcher.cpp:511
+#: gui/launcher.cpp:553
msgid "Select directory for saved games"
msgstr "Vyberte adresсј pro uloОenщ hry"
-#: gui/launcher.cpp:538
+#: gui/launcher.cpp:580
msgid "This game ID is already taken. Please choose another one."
msgstr "Toto ID hry je uО zabranщ. Vyberte si, prosэm, jinщ."
-#: gui/launcher.cpp:579 engines/dialogs.cpp:110
+#: gui/launcher.cpp:621 engines/dialogs.cpp:110
msgid "~Q~uit"
msgstr "~U~konшit"
-#: gui/launcher.cpp:579 backends/platform/sdl/macosx/appmenu_osx.mm:96
+#: gui/launcher.cpp:621 backends/platform/sdl/macosx/appmenu_osx.mm:96
msgid "Quit ScummVM"
msgstr "Ukonшit ScummVM"
-#: gui/launcher.cpp:580
+#: gui/launcher.cpp:622
msgid "A~b~out..."
msgstr "~O~ Programu..."
-#: gui/launcher.cpp:580 backends/platform/sdl/macosx/appmenu_osx.mm:70
+#: gui/launcher.cpp:622 backends/platform/sdl/macosx/appmenu_osx.mm:70
msgid "About ScummVM"
msgstr "O ScummVM"
-#: gui/launcher.cpp:581
+#: gui/launcher.cpp:623
msgid "~O~ptions..."
msgstr "~V~olby..."
-#: gui/launcher.cpp:581
+#: gui/launcher.cpp:623
msgid "Change global ScummVM options"
msgstr "Zmьnit globсlnэ volby ScummVM"
-#: gui/launcher.cpp:583
+#: gui/launcher.cpp:625
msgid "~S~tart"
msgstr "~S~pustit"
-#: gui/launcher.cpp:583
+#: gui/launcher.cpp:625
msgid "Start selected game"
msgstr "Spustit zvolenou hru"
-#: gui/launcher.cpp:586
+#: gui/launcher.cpp:628
msgid "~L~oad..."
msgstr "~N~ahrсt..."
-#: gui/launcher.cpp:586
+#: gui/launcher.cpp:628
msgid "Load savegame for selected game"
msgstr "Nahrсt uloОenou pozici pro zvolenou hru"
-#: gui/launcher.cpp:591 gui/launcher.cpp:1079
+#: gui/launcher.cpp:633 gui/launcher.cpp:1120
msgid "~A~dd Game..."
msgstr "~P~јidat hru..."
-#: gui/launcher.cpp:591 gui/launcher.cpp:598
+#: gui/launcher.cpp:633 gui/launcher.cpp:640
msgid "Hold Shift for Mass Add"
msgstr "PodrОte Shift pro Hromadnщ Pјidсnэ"
-#: gui/launcher.cpp:593
+#: gui/launcher.cpp:635
msgid "~E~dit Game..."
msgstr "~U~pravit Hru..."
-#: gui/launcher.cpp:593 gui/launcher.cpp:600
+#: gui/launcher.cpp:635 gui/launcher.cpp:642
msgid "Change game options"
msgstr "Zmьnit volby hry"
-#: gui/launcher.cpp:595
+#: gui/launcher.cpp:637
msgid "~R~emove Game"
msgstr "~O~dstranit Hru"
-#: gui/launcher.cpp:595 gui/launcher.cpp:602
+#: gui/launcher.cpp:637 gui/launcher.cpp:644
msgid "Remove game from the list. The game data files stay intact"
msgstr "Odstranit hru ze seznamu. Hernэ data zљstanou zachovсna"
-#: gui/launcher.cpp:598 gui/launcher.cpp:1079
+#: gui/launcher.cpp:640 gui/launcher.cpp:1120
msgctxt "lowres"
msgid "~A~dd Game..."
msgstr "~P~јidat hru..."
-#: gui/launcher.cpp:600
+#: gui/launcher.cpp:642
msgctxt "lowres"
msgid "~E~dit Game..."
msgstr "~U~pravit hru..."
-#: gui/launcher.cpp:602
+#: gui/launcher.cpp:644
msgctxt "lowres"
msgid "~R~emove Game"
msgstr "~O~dstranit hru"
-#: gui/launcher.cpp:610
+#: gui/launcher.cpp:652
msgid "Search in game list"
msgstr "Hledat v seznamu her"
-#: gui/launcher.cpp:614 gui/launcher.cpp:1126
+#: gui/launcher.cpp:656 gui/launcher.cpp:1167
msgid "Search:"
msgstr "Hledat:"
-#: gui/launcher.cpp:639 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255
+#: gui/launcher.cpp:680 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255
#: engines/mohawk/riven.cpp:716 engines/cruise/menu.cpp:216
msgid "Load game:"
msgstr "Nahrсt hru:"
-#: gui/launcher.cpp:639 engines/dialogs.cpp:114 engines/scumm/dialogs.cpp:188
+#: gui/launcher.cpp:680 engines/dialogs.cpp:114 engines/scumm/dialogs.cpp:188
#: engines/mohawk/myst.cpp:255 engines/mohawk/riven.cpp:716
#: engines/cruise/menu.cpp:216 backends/platform/wince/CEActionsPocket.cpp:267
#: backends/platform/wince/CEActionsSmartphone.cpp:231
msgid "Load"
msgstr "Nahrсt"
-#: gui/launcher.cpp:747
+#: gui/launcher.cpp:788
msgid ""
"Do you really want to run the mass game detector? This could potentially add "
"a huge number of games."
@@ -455,7 +460,7 @@ msgstr ""
"Opravdu chcete spustit hromadnou detekci her? Toto by mohlo potenciсlnь "
"pјidat velkou spoustu her. "
-#: gui/launcher.cpp:748 gui/launcher.cpp:896
+#: gui/launcher.cpp:789 gui/launcher.cpp:937
#: backends/events/symbiansdl/symbiansdl-events.cpp:184
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
@@ -463,7 +468,7 @@ msgstr ""
msgid "Yes"
msgstr "Ano"
-#: gui/launcher.cpp:748 gui/launcher.cpp:896
+#: gui/launcher.cpp:789 gui/launcher.cpp:937
#: backends/events/symbiansdl/symbiansdl-events.cpp:184
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
@@ -471,36 +476,36 @@ msgstr "Ano"
msgid "No"
msgstr "Ne"
-#: gui/launcher.cpp:796
+#: gui/launcher.cpp:837
msgid "ScummVM couldn't open the specified directory!"
msgstr "ScummVM nemohl tento adresсј otevјэt!"
-#: gui/launcher.cpp:808
+#: gui/launcher.cpp:849
msgid "ScummVM could not find any game in the specified directory!"
msgstr "ScummVM nemohl v zadanщm adresсјi najэt Осdnou hru!"
-#: gui/launcher.cpp:822
+#: gui/launcher.cpp:863
msgid "Pick the game:"
msgstr "Vybrat hru:"
-#: gui/launcher.cpp:896
+#: gui/launcher.cpp:937
msgid "Do you really want to remove this game configuration?"
msgstr "Opravdu chcete odstranit nastavenэ tщto hry?"
-#: gui/launcher.cpp:960
+#: gui/launcher.cpp:1001
msgid "This game does not support loading games from the launcher."
msgstr "Tato hra nepodporuje spouЙtьnэ her ze spouЙtьшe"
-#: gui/launcher.cpp:964
+#: gui/launcher.cpp:1005
msgid "ScummVM could not find any engine capable of running the selected game!"
msgstr "ScummVM nemohl najэt Осdnщ jсdro schopnщ vybranou hru spustit!"
-#: gui/launcher.cpp:1078
+#: gui/launcher.cpp:1119
msgctxt "lowres"
msgid "Mass Add..."
msgstr "Hromadnщ Pјidсnэ..."
-#: gui/launcher.cpp:1078
+#: gui/launcher.cpp:1119
msgid "Mass Add..."
msgstr "Hromadnщ Pјidсnэ..."
@@ -567,101 +572,93 @@ msgstr "44 kHz"
msgid "48 kHz"
msgstr "48 kHz"
-#: gui/options.cpp:257 gui/options.cpp:485 gui/options.cpp:586
-#: gui/options.cpp:659 gui/options.cpp:868
+#: gui/options.cpp:248 gui/options.cpp:474 gui/options.cpp:575
+#: gui/options.cpp:644 gui/options.cpp:852
msgctxt "soundfont"
msgid "None"
msgstr "Ўсdnщ"
-#: gui/options.cpp:393
+#: gui/options.cpp:382
msgid "Failed to apply some of the graphic options changes:"
msgstr "Nelze pouОэt nьkterщ zmьny moОnostэ grafiky:"
-#: gui/options.cpp:405
+#: gui/options.cpp:394
msgid "the video mode could not be changed."
msgstr "reОim obrazu nemohl b§t zmьnьn."
-#: gui/options.cpp:411
+#: gui/options.cpp:400
msgid "the fullscreen setting could not be changed"
msgstr "nastavenэ celщ obrazovky nemohlo b§t zmьnьno"
-#: gui/options.cpp:417
+#: gui/options.cpp:406
msgid "the aspect ratio setting could not be changed"
msgstr "nastavenэ pomьru stran nemohlo b§t zmьnьno"
-#: gui/options.cpp:742
+#: gui/options.cpp:727
msgid "Graphics mode:"
msgstr "ReОim obrazu:"
-#: gui/options.cpp:756
+#: gui/options.cpp:741
msgid "Render mode:"
msgstr "ReОim vykreslenэ:"
-#: gui/options.cpp:756 gui/options.cpp:757
+#: gui/options.cpp:741 gui/options.cpp:742
msgid "Special dithering modes supported by some games"
msgstr "Speciсlnэ reОimy chvьnэ podporovanщ nьkter§mi hrami"
-#: gui/options.cpp:768
+#: gui/options.cpp:753
#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2248
#: backends/graphics/openglsdl/openglsdl-graphics.cpp:472
msgid "Fullscreen mode"
msgstr "ReОim celщ obrazovky"
-#: gui/options.cpp:771
+#: gui/options.cpp:756
msgid "Aspect ratio correction"
msgstr "Korekce pomьru stran"
-#: gui/options.cpp:771
+#: gui/options.cpp:756
msgid "Correct aspect ratio for 320x200 games"
msgstr "Korigovat pomьr stran pro hry 320x200"
-#: gui/options.cpp:772
-msgid "EGA undithering"
-msgstr "Nerozklсdсnэ EGA"
-
-#: gui/options.cpp:772
-msgid "Enable undithering in EGA games that support it"
-msgstr "Povolit nerozklсdсnэ v EGA hrсch, kterщ to podporujэ"
-
-#: gui/options.cpp:780
+#: gui/options.cpp:764
msgid "Preferred Device:"
msgstr "Prioritnэ Zaјэzenэ:"
-#: gui/options.cpp:780
+#: gui/options.cpp:764
msgid "Music Device:"
msgstr "Hudebnэ zaјэzenэ"
-#: gui/options.cpp:780 gui/options.cpp:782
+#: gui/options.cpp:764 gui/options.cpp:766
msgid "Specifies preferred sound device or sound card emulator"
msgstr "Stanovэ prioritnэ zvukovщ zaјэzenэ nebo emulсtor zvukovщ karty"
-#: gui/options.cpp:780 gui/options.cpp:782 gui/options.cpp:783
+#: gui/options.cpp:764 gui/options.cpp:766 gui/options.cpp:767
msgid "Specifies output sound device or sound card emulator"
msgstr "Stanovэ v§stupnэ zvukovщ zaјэzenэ nebo emulсtor zvukovщ karty"
-#: gui/options.cpp:782
+#: gui/options.cpp:766
msgctxt "lowres"
msgid "Preferred Dev.:"
msgstr "Prioritnэ Zaј.:"
-#: gui/options.cpp:782
+#: gui/options.cpp:766
msgctxt "lowres"
msgid "Music Device:"
msgstr "Hudebnэ zaјэzenэ"
-#: gui/options.cpp:809
+#: gui/options.cpp:793
msgid "AdLib emulator:"
msgstr "AdLib emulсtor"
-#: gui/options.cpp:809 gui/options.cpp:810
+#: gui/options.cpp:793 gui/options.cpp:794
msgid "AdLib is used for music in many games"
msgstr "AdLib se pouОэvс pro hudbu v mnoha hrсch"
-#: gui/options.cpp:820
+#: gui/options.cpp:804
msgid "Output rate:"
msgstr "V§stup. frekvence:"
-#: gui/options.cpp:820 gui/options.cpp:821
+#: gui/options.cpp:804 gui/options.cpp:805
msgid ""
"Higher value specifies better sound quality but may be not supported by your "
"soundcard"
@@ -669,62 +666,62 @@ msgstr ""
"VyЙЙэ hodnota zpљsobэ lepЙэ kvalitu zvuku, ale nemusэ b§t podporovсna VaЙi "
"zvukovou kartou"
-#: gui/options.cpp:831
+#: gui/options.cpp:815
msgid "GM Device:"
msgstr "GM Zaјэzenэ:"
-#: gui/options.cpp:831
+#: gui/options.cpp:815
msgid "Specifies default sound device for General MIDI output"
msgstr "Stanovэ v§chozэ zvukovщ zaјэzenэ pro v§stup General MIDI"
-#: gui/options.cpp:842
+#: gui/options.cpp:826
msgid "Don't use General MIDI music"
msgstr "NepouОэvat hudbu General MIDI"
-#: gui/options.cpp:853 gui/options.cpp:915
+#: gui/options.cpp:837 gui/options.cpp:899
msgid "Use first available device"
msgstr "PouОэt prvnэ dostupnщ zaјэzenэ"
-#: gui/options.cpp:865
+#: gui/options.cpp:849
msgid "SoundFont:"
msgstr "SoundFont:"
-#: gui/options.cpp:865 gui/options.cpp:867 gui/options.cpp:868
+#: gui/options.cpp:849 gui/options.cpp:851 gui/options.cpp:852
msgid "SoundFont is supported by some audio cards, Fluidsynth and Timidity"
msgstr ""
"SoundFont je podporovсn nьkter§mi zvukov§mi kartami, Fluidsynth a Timidity"
-#: gui/options.cpp:867
+#: gui/options.cpp:851
msgctxt "lowres"
msgid "SoundFont:"
msgstr "SoundFont:"
-#: gui/options.cpp:873
+#: gui/options.cpp:857
msgid "Mixed AdLib/MIDI mode"
msgstr "SmэЙen§ reОim AdLib/MIDI"
-#: gui/options.cpp:873
+#: gui/options.cpp:857
msgid "Use both MIDI and AdLib sound generation"
msgstr "PouОэt obь zvukovщ generace MIDI a AdLib"
-#: gui/options.cpp:876
+#: gui/options.cpp:860
msgid "MIDI gain:"
msgstr "Zesэlenэ MIDI:"
-#: gui/options.cpp:886
+#: gui/options.cpp:870
msgid "MT-32 Device:"
msgstr "Zaјэzenэ MT-32:"
-#: gui/options.cpp:886
+#: gui/options.cpp:870
msgid "Specifies default sound device for Roland MT-32/LAPC1/CM32l/CM64 output"
msgstr ""
"Stanovэ v§chozэ zvukovщ v§stupnэ zaјэzenэ pro Roland MT-32/LAPC1/CM32l/CM64"
-#: gui/options.cpp:891
+#: gui/options.cpp:875
msgid "True Roland MT-32 (disable GM emulation)"
msgstr "Opravdov§ Roland MT-32 (vypne GM emulaci)"
-#: gui/options.cpp:891 gui/options.cpp:893
+#: gui/options.cpp:875 gui/options.cpp:877
msgid ""
"Check if you want to use your real hardware Roland-compatible sound device "
"connected to your computer"
@@ -732,190 +729,190 @@ msgstr ""
"ZaЙkrtnьte, pokud chcete pouОэt pravщ hardwarovщ zaјэzenэ kompatibilnэ s "
"Roland, pјipojenщ k VaЙemu poшэtaшi"
-#: gui/options.cpp:893
+#: gui/options.cpp:877
msgctxt "lowres"
msgid "True Roland MT-32 (no GM emulation)"
msgstr "Opravdov§ Roland MT-32 (Осdnс GM emulace)"
-#: gui/options.cpp:896
+#: gui/options.cpp:880
msgid "Enable Roland GS Mode"
msgstr "Zapnout reОim Roland GS"
-#: gui/options.cpp:896
+#: gui/options.cpp:880
msgid "Turns off General MIDI mapping for games with Roland MT-32 soundtrack"
msgstr "Vypne mapovсnэ General MIDI pro hry s Roland MT-32 zvukov§m doprovodem"
-#: gui/options.cpp:905
+#: gui/options.cpp:889
msgid "Don't use Roland MT-32 music"
msgstr "NepouОэvat hudbu Roland MT-32"
-#: gui/options.cpp:932
+#: gui/options.cpp:916
msgid "Text and Speech:"
msgstr "Text a иeш"
-#: gui/options.cpp:936 gui/options.cpp:946
+#: gui/options.cpp:920 gui/options.cpp:930
msgid "Speech"
msgstr "иeш"
-#: gui/options.cpp:937 gui/options.cpp:947
+#: gui/options.cpp:921 gui/options.cpp:931
msgid "Subtitles"
msgstr "Titulky"
-#: gui/options.cpp:938
+#: gui/options.cpp:922
msgid "Both"
msgstr "Oba"
-#: gui/options.cpp:940
+#: gui/options.cpp:924
msgid "Subtitle speed:"
msgstr "Rychlost titulkљ:"
-#: gui/options.cpp:942
+#: gui/options.cpp:926
msgctxt "lowres"
msgid "Text and Speech:"
msgstr "Text a иeш:"
-#: gui/options.cpp:946
+#: gui/options.cpp:930
msgid "Spch"
msgstr "иeш"
-#: gui/options.cpp:947
+#: gui/options.cpp:931
msgid "Subs"
msgstr "Titl"
-#: gui/options.cpp:948
+#: gui/options.cpp:932
msgctxt "lowres"
msgid "Both"
msgstr "Oba"
-#: gui/options.cpp:948
+#: gui/options.cpp:932
msgid "Show subtitles and play speech"
msgstr "Zobrazit titulky a pјehrсvat јeш"
-#: gui/options.cpp:950
+#: gui/options.cpp:934
msgctxt "lowres"
msgid "Subtitle speed:"
msgstr "Rychlost titulkљ"
-#: gui/options.cpp:966
+#: gui/options.cpp:950
msgid "Music volume:"
msgstr "Hlasitost hudby"
-#: gui/options.cpp:968
+#: gui/options.cpp:952
msgctxt "lowres"
msgid "Music volume:"
msgstr "Hlasitost hudby"
-#: gui/options.cpp:975
+#: gui/options.cpp:959
msgid "Mute All"
msgstr "Ztlumit VЙe"
-#: gui/options.cpp:978
+#: gui/options.cpp:962
msgid "SFX volume:"
msgstr "Hlasitost zvukљ"
-#: gui/options.cpp:978 gui/options.cpp:980 gui/options.cpp:981
+#: gui/options.cpp:962 gui/options.cpp:964 gui/options.cpp:965
msgid "Special sound effects volume"
msgstr "Hlasitost speciсlnэch zvukov§ch efektљ"
-#: gui/options.cpp:980
+#: gui/options.cpp:964
msgctxt "lowres"
msgid "SFX volume:"
msgstr "Hlasitost zvukљ"
-#: gui/options.cpp:988
+#: gui/options.cpp:972
msgid "Speech volume:"
msgstr "Hlasitost јeшi"
-#: gui/options.cpp:990
+#: gui/options.cpp:974
msgctxt "lowres"
msgid "Speech volume:"
msgstr "Hlasitost јeшi"
-#: gui/options.cpp:1156
+#: gui/options.cpp:1131
msgid "Theme Path:"
msgstr "Cesta ke Vzhledu:"
-#: gui/options.cpp:1158
+#: gui/options.cpp:1133
msgctxt "lowres"
msgid "Theme Path:"
msgstr "Cesta ke Vzhledu:"
-#: gui/options.cpp:1164 gui/options.cpp:1166 gui/options.cpp:1167
+#: gui/options.cpp:1139 gui/options.cpp:1141 gui/options.cpp:1142
msgid "Specifies path to additional data used by all games or ScummVM"
msgstr "Stanovэ cestu k dodateшn§m datљm pouОэvanс vЙemi hrami nebo ScummVM"
-#: gui/options.cpp:1173
+#: gui/options.cpp:1148
msgid "Plugins Path:"
msgstr "Cesta k Pluginљm:"
-#: gui/options.cpp:1175
+#: gui/options.cpp:1150
msgctxt "lowres"
msgid "Plugins Path:"
msgstr "Cesta k Pluginљm:"
-#: gui/options.cpp:1184
+#: gui/options.cpp:1159
msgid "Misc"
msgstr "Rљznщ"
-#: gui/options.cpp:1186
+#: gui/options.cpp:1161
msgctxt "lowres"
msgid "Misc"
msgstr "Rљznщ"
-#: gui/options.cpp:1188
+#: gui/options.cpp:1163
msgid "Theme:"
msgstr "Vzhled:"
-#: gui/options.cpp:1192
+#: gui/options.cpp:1167
msgid "GUI Renderer:"
msgstr "GUI Vykreslovaш:"
-#: gui/options.cpp:1204
+#: gui/options.cpp:1179
msgid "Autosave:"
msgstr "Autouklсdсnэ:"
-#: gui/options.cpp:1206
+#: gui/options.cpp:1181
msgctxt "lowres"
msgid "Autosave:"
msgstr "Autouklсdсnэ:"
-#: gui/options.cpp:1214
+#: gui/options.cpp:1189
msgid "Keys"
msgstr "Klсvesy"
-#: gui/options.cpp:1221
+#: gui/options.cpp:1196
msgid "GUI Language:"
msgstr "Jazyk GUI"
-#: gui/options.cpp:1221
+#: gui/options.cpp:1196
msgid "Language of ScummVM GUI"
msgstr "Jazyk GUI ScummVM"
-#: gui/options.cpp:1372
+#: gui/options.cpp:1347
msgid "You have to restart ScummVM before your changes will take effect."
msgstr "Pro pouОitэ tьchto nastavenэ musэte restartovat ScummVM."
-#: gui/options.cpp:1385
+#: gui/options.cpp:1360
msgid "Select directory for savegames"
msgstr "Vybrat adresсј pro uloОenщ hry"
-#: gui/options.cpp:1392
+#: gui/options.cpp:1367
msgid "The chosen directory cannot be written to. Please select another one."
msgstr "Do zvolenщho adresсјe nelze zapisovat. Vyberte, prosэm, jin§."
-#: gui/options.cpp:1401
+#: gui/options.cpp:1376
msgid "Select directory for GUI themes"
msgstr "Vyberte adresсј pro vhledy GUI"
-#: gui/options.cpp:1411
+#: gui/options.cpp:1386
msgid "Select directory for extra files"
msgstr "Vyberte adresсј pro dodateшnщ soubory"
-#: gui/options.cpp:1422
+#: gui/options.cpp:1397
msgid "Select directory for plugins"
msgstr "Vyberte adresсј pro zсsuvnщ moduly"
-#: gui/options.cpp:1475
+#: gui/options.cpp:1450
msgid ""
"The theme you selected does not support your current language. If you want "
"to use this theme you need to switch to another language first."
@@ -963,64 +960,64 @@ msgstr "Bezejmenn§ uloОen§ stav"
msgid "Select a Theme"
msgstr "Vyberte Vzhled"
-#: gui/ThemeEngine.cpp:333
+#: gui/ThemeEngine.cpp:335
msgid "Disabled GFX"
msgstr "GFX zakсzсno"
-#: gui/ThemeEngine.cpp:333
+#: gui/ThemeEngine.cpp:335
msgctxt "lowres"
msgid "Disabled GFX"
msgstr "GFX zakсzсno"
-#: gui/ThemeEngine.cpp:334
+#: gui/ThemeEngine.cpp:336
msgid "Standard Renderer (16bpp)"
msgstr "Standardnэ Vykreslovaш (16bpp)"
-#: gui/ThemeEngine.cpp:334
+#: gui/ThemeEngine.cpp:336
msgid "Standard (16bpp)"
msgstr "Standardnэ (16bpp)"
-#: gui/ThemeEngine.cpp:336
+#: gui/ThemeEngine.cpp:338
msgid "Antialiased Renderer (16bpp)"
msgstr "Vykreslovaш s vyhlazen§mi hranami (16bpp)"
-#: gui/ThemeEngine.cpp:336
+#: gui/ThemeEngine.cpp:338
msgid "Antialiased (16bpp)"
msgstr "S vyhlazen§mi hranami (16bpp)"
-#: gui/widget.cpp:312 gui/widget.cpp:314 gui/widget.cpp:320 gui/widget.cpp:322
+#: gui/widget.cpp:322 gui/widget.cpp:324 gui/widget.cpp:330 gui/widget.cpp:332
msgid "Clear value"
msgstr "Vyшistit hodnotu"
-#: base/main.cpp:203
+#: base/main.cpp:209
#, c-format
msgid "Engine does not support debug level '%s'"
msgstr "Jсdro nepodporuje њroveђ ladьnэ '%s'"
-#: base/main.cpp:275
+#: base/main.cpp:287
msgid "Menu"
msgstr "Menu"
-#: base/main.cpp:278 backends/platform/symbian/src/SymbianActions.cpp:45
+#: base/main.cpp:290 backends/platform/symbian/src/SymbianActions.cpp:45
#: backends/platform/wince/CEActionsPocket.cpp:45
#: backends/platform/wince/CEActionsSmartphone.cpp:46
msgid "Skip"
msgstr "Pјeskoшit"
-#: base/main.cpp:281 backends/platform/symbian/src/SymbianActions.cpp:50
+#: base/main.cpp:293 backends/platform/symbian/src/SymbianActions.cpp:50
#: backends/platform/wince/CEActionsPocket.cpp:42
msgid "Pause"
msgstr "Pauza"
-#: base/main.cpp:284
+#: base/main.cpp:296
msgid "Skip line"
msgstr "Pјeskoшit јсdek"
-#: base/main.cpp:455
+#: base/main.cpp:467
msgid "Error running game:"
msgstr "Chyba pјi spuЙtьnэ hry:"
-#: base/main.cpp:479
+#: base/main.cpp:491
msgid "Could not find any engine capable of running the selected game"
msgstr "Nelze nalщzt Осdnщ jсdro schopnщ vybranou hru spustit"
@@ -1088,16 +1085,16 @@ msgstr "ZruЙeno uОivatelem"
msgid "Unknown error"
msgstr "Neznсmс chyba"
-#: engines/advancedDetector.cpp:296
+#: engines/advancedDetector.cpp:324
#, c-format
msgid "The game in '%s' seems to be unknown."
msgstr "Hra v '%s' se zdс b§t neznсmс."
-#: engines/advancedDetector.cpp:297
+#: engines/advancedDetector.cpp:325
msgid "Please, report the following data to the ScummVM team along with name"
msgstr "Prosэm nahlaste nсsledujэcэ data t§mu ScummVM spolu se jmщnem"
-#: engines/advancedDetector.cpp:299
+#: engines/advancedDetector.cpp:327
msgid "of the game you tried to add and its version/language/etc.:"
msgstr "hry, kterou jste se pokusili pјidat a jejэ verzi/jazyk/atd.:"
@@ -1134,13 +1131,14 @@ msgctxt "lowres"
msgid "~R~eturn to Launcher"
msgstr "~N~сvrat do SpouЙtьшe"
-#: engines/dialogs.cpp:116 engines/cruise/menu.cpp:214
-#: engines/sci/engine/kfile.cpp:566
+#: engines/dialogs.cpp:116 engines/agi/saveload.cpp:805
+#: engines/cruise/menu.cpp:214 engines/sci/engine/kfile.cpp:567
msgid "Save game:"
msgstr "UloОit hru:"
-#: engines/dialogs.cpp:116 engines/scumm/dialogs.cpp:187
-#: engines/cruise/menu.cpp:214 engines/sci/engine/kfile.cpp:566
+#: engines/dialogs.cpp:116 engines/agi/saveload.cpp:805
+#: engines/scumm/dialogs.cpp:187 engines/cruise/menu.cpp:214
+#: engines/sci/engine/kfile.cpp:567
#: backends/platform/symbian/src/SymbianActions.cpp:44
#: backends/platform/wince/CEActionsPocket.cpp:43
#: backends/platform/wince/CEActionsPocket.cpp:267
@@ -1249,6 +1247,88 @@ msgstr ""
msgid "Start anyway"
msgstr "Pјesto spustit"
+#: engines/agi/detection.cpp:145 engines/dreamweb/detection.cpp:47
+#: engines/sci/detection.cpp:390
+msgid "Use original save/load screens"
+msgstr ""
+
+#: engines/agi/detection.cpp:146 engines/dreamweb/detection.cpp:48
+#: engines/sci/detection.cpp:391
+msgid "Use the original save/load screens, instead of the ScummVM ones"
+msgstr ""
+
+#: engines/agi/saveload.cpp:827 engines/sci/engine/kfile.cpp:674
+msgid "Restore game:"
+msgstr "Obnovit hru"
+
+#: engines/agi/saveload.cpp:827 engines/sci/engine/kfile.cpp:674
+msgid "Restore"
+msgstr "Obnovit"
+
+#: engines/dreamweb/detection.cpp:57
+#, fuzzy
+msgid "Use bright palette mode"
+msgstr "PoloОka vpravo nahoјe"
+
+#: engines/dreamweb/detection.cpp:58
+msgid "Display graphics using the game's bright palette"
+msgstr ""
+
+#: engines/sci/detection.cpp:370
+msgid "EGA undithering"
+msgstr "Nerozklсdсnэ EGA"
+
+#: engines/sci/detection.cpp:371
+#, fuzzy
+msgid "Enable undithering in EGA games"
+msgstr "Povolit nerozklсdсnэ v EGA hrсch, kterщ to podporujэ"
+
+#: engines/sci/detection.cpp:380
+#, fuzzy
+msgid "Prefer digital sound effects"
+msgstr "Hlasitost speciсlnэch zvukov§ch efektљ"
+
+#: engines/sci/detection.cpp:381
+msgid "Prefer digital sound effects instead of synthesized ones"
+msgstr ""
+
+#: engines/sci/detection.cpp:400
+msgid "Use IMF/Yahama FB-01 for MIDI output"
+msgstr ""
+
+#: engines/sci/detection.cpp:401
+msgid ""
+"Use an IBM Music Feature card or a Yahama FB-01 FM synth module for MIDI "
+"output"
+msgstr ""
+
+#: engines/sci/detection.cpp:411
+msgid "Use CD audio"
+msgstr ""
+
+#: engines/sci/detection.cpp:412
+msgid "Use CD audio instead of in-game audio, if available"
+msgstr ""
+
+#: engines/sci/detection.cpp:422
+msgid "Use Windows cursors"
+msgstr ""
+
+#: engines/sci/detection.cpp:423
+msgid ""
+"Use the Windows cursors (smaller and monochrome) instead of the DOS ones"
+msgstr ""
+
+#: engines/sci/detection.cpp:433
+#, fuzzy
+msgid "Use silver cursors"
+msgstr "Obyшejn§ kurzor"
+
+#: engines/sci/detection.cpp:434
+msgid ""
+"Use the alternate set of silver cursors, instead of the normal golden ones"
+msgstr ""
+
#: engines/scumm/dialogs.cpp:175
#, c-format
msgid "Insert Disk %c and Press Button to Continue."
@@ -1905,7 +1985,7 @@ msgstr ""
"Pјirozenс podpora MIDI vyОaduje Aktualizaci Roland od LucasArts,\n"
"ale %s chybэ. Mэsto toho je pouОit AdLib."
-#: engines/scumm/scumm.cpp:2271 engines/agos/saveload.cpp:189
+#: engines/scumm/scumm.cpp:2271 engines/agos/saveload.cpp:202
#, c-format
msgid ""
"Failed to save game state to file:\n"
@@ -1916,7 +1996,7 @@ msgstr ""
"\n"
"%s"
-#: engines/scumm/scumm.cpp:2278 engines/agos/saveload.cpp:154
+#: engines/scumm/scumm.cpp:2278 engines/agos/saveload.cpp:167
#, c-format
msgid ""
"Failed to load game state from file:\n"
@@ -1927,7 +2007,7 @@ msgstr ""
"\n"
"%s"
-#: engines/scumm/scumm.cpp:2290 engines/agos/saveload.cpp:197
+#: engines/scumm/scumm.cpp:2290 engines/agos/saveload.cpp:210
#, c-format
msgid ""
"Successfully saved game state in file:\n"
@@ -1974,14 +2054,6 @@ msgstr "~H~lavnэ Menu"
msgid "~W~ater Effect Enabled"
msgstr "~E~fekt Vody Zapnut"
-#: engines/sci/engine/kfile.cpp:673
-msgid "Restore game:"
-msgstr "Obnovit hru"
-
-#: engines/sci/engine/kfile.cpp:673
-msgid "Restore"
-msgstr "Obnovit"
-
#: engines/agos/animation.cpp:550
#, c-format
msgid "Cutscene file '%s' not found!"
@@ -2004,6 +2076,66 @@ msgstr "Nelze smazat soubor."
msgid "Failed to save game"
msgstr "Nelze uloОit hru."
+#. I18N: Studio audience adds an applause and cheering sounds whenever
+#. Malcolm makes a joke.
+#: engines/kyra/detection.cpp:62
+msgid "Studio audience"
+msgstr ""
+
+#: engines/kyra/detection.cpp:63
+msgid "Enable studio audience"
+msgstr ""
+
+#. I18N: This option allows the user to skip text and cutscenes.
+#: engines/kyra/detection.cpp:73
+msgid "Skip support"
+msgstr ""
+
+#: engines/kyra/detection.cpp:74
+msgid "Allow text and cutscenes to be skipped"
+msgstr ""
+
+#. I18N: Helium mode makes people sound like they've inhaled Helium.
+#: engines/kyra/detection.cpp:84
+msgid "Helium mode"
+msgstr ""
+
+#: engines/kyra/detection.cpp:85
+#, fuzzy
+msgid "Enable helium mode"
+msgstr "Zapnout reОim Roland GS"
+
+#. I18N: When enabled, this option makes scrolling smoother when
+#. changing from one screen to another.
+#: engines/kyra/detection.cpp:99
+msgid "Smooth scrolling"
+msgstr ""
+
+#: engines/kyra/detection.cpp:100
+msgid "Enable smooth scrolling when walking"
+msgstr ""
+
+#. I18N: When enabled, this option changes the cursor when it floats to the
+#. edge of the screen to a directional arrow. The player can then click to
+#. walk towards that direction.
+#: engines/kyra/detection.cpp:112
+#, fuzzy
+msgid "Floating cursors"
+msgstr "Obyшejn§ kurzor"
+
+#: engines/kyra/detection.cpp:113
+msgid "Enable floating cursors"
+msgstr ""
+
+#. I18N: HP stands for Hit Points
+#: engines/kyra/detection.cpp:127
+msgid "HP bar graphs"
+msgstr ""
+
+#: engines/kyra/detection.cpp:128
+msgid "Enable hit point bar graphs"
+msgstr ""
+
#: engines/kyra/lol.cpp:478
msgid "Attack 1"
msgstr "кtok 1"
@@ -2066,6 +2198,14 @@ msgstr ""
"ty od General MIDI. Po tomto se mљОe stсt,\n"
"Оe pсr stop nebude sprсvnь pјehrсno."
+#: engines/queen/queen.cpp:59 engines/sky/detection.cpp:44
+msgid "Floppy intro"
+msgstr ""
+
+#: engines/queen/queen.cpp:60 engines/sky/detection.cpp:45
+msgid "Use the floppy version's intro (CD version only)"
+msgstr ""
+
#: engines/sky/compact.cpp:130
msgid ""
"Unable to find \"sky.cpt\" file!\n"
@@ -2144,6 +2284,14 @@ msgid ""
"PSX cutscenes found but ScummVM has been built without RGB color support"
msgstr "Videa PSX nalezena, ale ScummVM byl sestaven bez podpory barev RGB"
+#: engines/sword2/sword2.cpp:79
+msgid "Show object labels"
+msgstr ""
+
+#: engines/sword2/sword2.cpp:80
+msgid "Show labels for objects on mouse hover"
+msgstr ""
+
#: engines/parallaction/saveload.cpp:133
#, c-format
msgid ""
@@ -2378,19 +2526,19 @@ msgstr "Vysokс kvalita zvuku (pomalejЙэ) (restart) "
msgid "Disable power off"
msgstr "Zakсzat vypnutэ"
-#: backends/platform/iphone/osys_events.cpp:301
+#: backends/platform/iphone/osys_events.cpp:300
msgid "Mouse-click-and-drag mode enabled."
msgstr "ReОim pјetсhnutэ myЙi zapnut."
-#: backends/platform/iphone/osys_events.cpp:303
+#: backends/platform/iphone/osys_events.cpp:302
msgid "Mouse-click-and-drag mode disabled."
msgstr "ReОim pјetсhnutэ myЙi vypnut."
-#: backends/platform/iphone/osys_events.cpp:314
+#: backends/platform/iphone/osys_events.cpp:313
msgid "Touchpad mode enabled."
msgstr "Touchpad reОim zapnut"
-#: backends/platform/iphone/osys_events.cpp:316
+#: backends/platform/iphone/osys_events.cpp:315
msgid "Touchpad mode disabled."
msgstr "Touchpad reОim vypnut"
@@ -2466,15 +2614,15 @@ msgstr "Aktivnэ grafick§ filtr:"
msgid "Windowed mode"
msgstr "ReОim do okna"
-#: backends/graphics/opengl/opengl-graphics.cpp:130
+#: backends/graphics/opengl/opengl-graphics.cpp:135
msgid "OpenGL Normal"
msgstr "OpenGL Normсlnэ"
-#: backends/graphics/opengl/opengl-graphics.cpp:131
+#: backends/graphics/opengl/opengl-graphics.cpp:136
msgid "OpenGL Conserve"
msgstr "OpenGL Zachovсvajэcэ"
-#: backends/graphics/opengl/opengl-graphics.cpp:132
+#: backends/graphics/opengl/opengl-graphics.cpp:137
msgid "OpenGL Original"
msgstr "OpenGL Pљvodnэ"
diff --git a/po/da_DA.po b/po/da_DA.po
index 59f7ae63a7..76374027ba 100644
--- a/po/da_DA.po
+++ b/po/da_DA.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ScummVM 1.3.0svn\n"
"Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n"
-"POT-Creation-Date: 2012-03-07 22:09+0000\n"
+"POT-Creation-Date: 2012-05-20 22:39+0100\n"
"PO-Revision-Date: 2011-01-08 22:53+0100\n"
"Last-Translator: Steffen Nyeland <steffen@nyeland.dk>\n"
"Language-Team: Steffen Nyeland <steffen@nyeland.dk>\n"
@@ -43,7 +43,7 @@ msgid "Go up"
msgstr "Gх op"
#: gui/browser.cpp:69 gui/chooser.cpp:45 gui/KeysDialog.cpp:43
-#: gui/launcher.cpp:320 gui/massadd.cpp:94 gui/options.cpp:1253
+#: gui/launcher.cpp:345 gui/massadd.cpp:94 gui/options.cpp:1228
#: gui/saveload.cpp:63 gui/saveload.cpp:155 gui/themebrowser.cpp:54
#: engines/engine.cpp:442 engines/scumm/dialogs.cpp:190
#: engines/sword1/control.cpp:865 engines/parallaction/saveload.cpp:281
@@ -68,15 +68,15 @@ msgstr "Luk"
msgid "Mouse click"
msgstr "Muse klik"
-#: gui/gui-manager.cpp:122 base/main.cpp:288
+#: gui/gui-manager.cpp:122 base/main.cpp:300
msgid "Display keyboard"
msgstr "Vis tastatur"
-#: gui/gui-manager.cpp:126 base/main.cpp:292
+#: gui/gui-manager.cpp:126 base/main.cpp:304
msgid "Remap keys"
msgstr "Kortlцg taster"
-#: gui/gui-manager.cpp:129 base/main.cpp:295
+#: gui/gui-manager.cpp:129 base/main.cpp:307
#, fuzzy
msgid "Toggle FullScreen"
msgstr "Skift fuldskцrm"
@@ -89,8 +89,8 @@ msgstr "Vцlg en handling at kortlцgge"
msgid "Map"
msgstr "Kortlцg"
-#: gui/KeysDialog.cpp:42 gui/launcher.cpp:321 gui/launcher.cpp:960
-#: gui/launcher.cpp:964 gui/massadd.cpp:91 gui/options.cpp:1254
+#: gui/KeysDialog.cpp:42 gui/launcher.cpp:346 gui/launcher.cpp:1001
+#: gui/launcher.cpp:1005 gui/massadd.cpp:91 gui/options.cpp:1229
#: engines/engine.cpp:361 engines/engine.cpp:372 engines/scumm/dialogs.cpp:192
#: engines/scumm/scumm.cpp:1775 engines/agos/animation.cpp:551
#: engines/groovie/script.cpp:420 engines/sky/compact.cpp:131
@@ -127,15 +127,15 @@ msgstr "Vцlg venligst en handling"
msgid "Press the key to associate"
msgstr "Tryk tasten for at tilknytte"
-#: gui/launcher.cpp:170
+#: gui/launcher.cpp:187
msgid "Game"
msgstr "Spil"
-#: gui/launcher.cpp:174
+#: gui/launcher.cpp:191
msgid "ID:"
msgstr "ID:"
-#: gui/launcher.cpp:174 gui/launcher.cpp:176 gui/launcher.cpp:177
+#: gui/launcher.cpp:191 gui/launcher.cpp:193 gui/launcher.cpp:194
msgid ""
"Short game identifier used for referring to savegames and running the game "
"from the command line"
@@ -143,29 +143,29 @@ msgstr ""
"Kort spil identifikator til brug for gemmer, og for at kјre spillet fra "
"kommandolinien"
-#: gui/launcher.cpp:176
+#: gui/launcher.cpp:193
msgctxt "lowres"
msgid "ID:"
msgstr "ID:"
-#: gui/launcher.cpp:181
+#: gui/launcher.cpp:198
msgid "Name:"
msgstr "Navn:"
-#: gui/launcher.cpp:181 gui/launcher.cpp:183 gui/launcher.cpp:184
+#: gui/launcher.cpp:198 gui/launcher.cpp:200 gui/launcher.cpp:201
msgid "Full title of the game"
msgstr "Fuld titel pх spillet"
-#: gui/launcher.cpp:183
+#: gui/launcher.cpp:200
msgctxt "lowres"
msgid "Name:"
msgstr "Navn:"
-#: gui/launcher.cpp:187
+#: gui/launcher.cpp:204
msgid "Language:"
msgstr "Sprog:"
-#: gui/launcher.cpp:187 gui/launcher.cpp:188
+#: gui/launcher.cpp:204 gui/launcher.cpp:205
msgid ""
"Language of the game. This will not turn your Spanish game version into "
"English"
@@ -173,280 +173,285 @@ msgstr ""
"Spillets sprog. Dette vil ikke цndre din spanske version af spillet til "
"engelsk"
-#: gui/launcher.cpp:189 gui/launcher.cpp:203 gui/options.cpp:80
-#: gui/options.cpp:745 gui/options.cpp:758 gui/options.cpp:1224
+#: gui/launcher.cpp:206 gui/launcher.cpp:220 gui/options.cpp:80
+#: gui/options.cpp:730 gui/options.cpp:743 gui/options.cpp:1199
#: audio/null.cpp:40
msgid "<default>"
msgstr "<standard>"
-#: gui/launcher.cpp:199
+#: gui/launcher.cpp:216
msgid "Platform:"
msgstr "Platform:"
-#: gui/launcher.cpp:199 gui/launcher.cpp:201 gui/launcher.cpp:202
+#: gui/launcher.cpp:216 gui/launcher.cpp:218 gui/launcher.cpp:219
msgid "Platform the game was originally designed for"
msgstr "Platform som spillet oprindeligt var designet til"
-#: gui/launcher.cpp:201
+#: gui/launcher.cpp:218
msgctxt "lowres"
msgid "Platform:"
msgstr "Platform:"
-#: gui/launcher.cpp:213 gui/options.cpp:1087 gui/options.cpp:1104
+#: gui/launcher.cpp:231
+#, fuzzy
+msgid "Engine"
+msgstr "Undersјg"
+
+#: gui/launcher.cpp:239 gui/options.cpp:1062 gui/options.cpp:1079
msgid "Graphics"
msgstr "Grafik"
-#: gui/launcher.cpp:213 gui/options.cpp:1087 gui/options.cpp:1104
+#: gui/launcher.cpp:239 gui/options.cpp:1062 gui/options.cpp:1079
msgid "GFX"
msgstr "GFX"
-#: gui/launcher.cpp:216
+#: gui/launcher.cpp:242
msgid "Override global graphic settings"
msgstr "Overstyr globale grafik indstillinger"
-#: gui/launcher.cpp:218
+#: gui/launcher.cpp:244
msgctxt "lowres"
msgid "Override global graphic settings"
msgstr "Overstyr globale grafik indstillinger"
-#: gui/launcher.cpp:225 gui/options.cpp:1110
+#: gui/launcher.cpp:251 gui/options.cpp:1085
msgid "Audio"
msgstr "Lyd"
-#: gui/launcher.cpp:228
+#: gui/launcher.cpp:254
msgid "Override global audio settings"
msgstr "Overstyr globale lyd indstillinger"
-#: gui/launcher.cpp:230
+#: gui/launcher.cpp:256
msgctxt "lowres"
msgid "Override global audio settings"
msgstr "Overstyr globale lyd indstillinger"
-#: gui/launcher.cpp:239 gui/options.cpp:1115
+#: gui/launcher.cpp:265 gui/options.cpp:1090
msgid "Volume"
msgstr "Lydstyrke"
-#: gui/launcher.cpp:241 gui/options.cpp:1117
+#: gui/launcher.cpp:267 gui/options.cpp:1092
msgctxt "lowres"
msgid "Volume"
msgstr "Lydstyrke"
-#: gui/launcher.cpp:244
+#: gui/launcher.cpp:270
msgid "Override global volume settings"
msgstr "Overstyr globale lydstyrke indstillinger"
-#: gui/launcher.cpp:246
+#: gui/launcher.cpp:272
msgctxt "lowres"
msgid "Override global volume settings"
msgstr "Overstyr globale lydstyrke indstillinger"
-#: gui/launcher.cpp:254 gui/options.cpp:1125
+#: gui/launcher.cpp:280 gui/options.cpp:1100
msgid "MIDI"
msgstr "MIDI"
-#: gui/launcher.cpp:257
+#: gui/launcher.cpp:283
msgid "Override global MIDI settings"
msgstr "Overstyr globale MIDI indstillinger"
-#: gui/launcher.cpp:259
+#: gui/launcher.cpp:285
msgctxt "lowres"
msgid "Override global MIDI settings"
msgstr "Overstyr globale MIDI indstillinger"
-#: gui/launcher.cpp:268 gui/options.cpp:1131
+#: gui/launcher.cpp:294 gui/options.cpp:1106
msgid "MT-32"
msgstr "MT-32"
-#: gui/launcher.cpp:271
+#: gui/launcher.cpp:297
msgid "Override global MT-32 settings"
msgstr "Overstyr globale MT-32 indstillinger"
-#: gui/launcher.cpp:273
+#: gui/launcher.cpp:299
msgctxt "lowres"
msgid "Override global MT-32 settings"
msgstr "Overstyr globale MT-32 indstillinger"
-#: gui/launcher.cpp:282 gui/options.cpp:1138
+#: gui/launcher.cpp:308 gui/options.cpp:1113
msgid "Paths"
msgstr "Stier"
-#: gui/launcher.cpp:284 gui/options.cpp:1140
+#: gui/launcher.cpp:310 gui/options.cpp:1115
msgctxt "lowres"
msgid "Paths"
msgstr "Stier"
-#: gui/launcher.cpp:291
+#: gui/launcher.cpp:317
msgid "Game Path:"
msgstr "Spil sti:"
-#: gui/launcher.cpp:293
+#: gui/launcher.cpp:319
msgctxt "lowres"
msgid "Game Path:"
msgstr "Spil sti:"
-#: gui/launcher.cpp:298 gui/options.cpp:1164
+#: gui/launcher.cpp:324 gui/options.cpp:1139
msgid "Extra Path:"
msgstr "Ekstra sti:"
-#: gui/launcher.cpp:298 gui/launcher.cpp:300 gui/launcher.cpp:301
+#: gui/launcher.cpp:324 gui/launcher.cpp:326 gui/launcher.cpp:327
msgid "Specifies path to additional data used the game"
msgstr "Angiver sti til ekstra data der bruges i spillet"
-#: gui/launcher.cpp:300 gui/options.cpp:1166
+#: gui/launcher.cpp:326 gui/options.cpp:1141
msgctxt "lowres"
msgid "Extra Path:"
msgstr "Ekstra sti:"
-#: gui/launcher.cpp:307 gui/options.cpp:1148
+#: gui/launcher.cpp:333 gui/options.cpp:1123
msgid "Save Path:"
msgstr "Gemme sti:"
-#: gui/launcher.cpp:307 gui/launcher.cpp:309 gui/launcher.cpp:310
-#: gui/options.cpp:1148 gui/options.cpp:1150 gui/options.cpp:1151
+#: gui/launcher.cpp:333 gui/launcher.cpp:335 gui/launcher.cpp:336
+#: gui/options.cpp:1123 gui/options.cpp:1125 gui/options.cpp:1126
msgid "Specifies where your savegames are put"
msgstr "Angiver hvor dine gemmer bliver lagt"
-#: gui/launcher.cpp:309 gui/options.cpp:1150
+#: gui/launcher.cpp:335 gui/options.cpp:1125
msgctxt "lowres"
msgid "Save Path:"
msgstr "Gemme sti:"
-#: gui/launcher.cpp:329 gui/launcher.cpp:416 gui/launcher.cpp:469
-#: gui/launcher.cpp:523 gui/options.cpp:1159 gui/options.cpp:1167
-#: gui/options.cpp:1176 gui/options.cpp:1283 gui/options.cpp:1289
-#: gui/options.cpp:1297 gui/options.cpp:1327 gui/options.cpp:1333
-#: gui/options.cpp:1340 gui/options.cpp:1433 gui/options.cpp:1436
-#: gui/options.cpp:1448
+#: gui/launcher.cpp:354 gui/launcher.cpp:453 gui/launcher.cpp:511
+#: gui/launcher.cpp:565 gui/options.cpp:1134 gui/options.cpp:1142
+#: gui/options.cpp:1151 gui/options.cpp:1258 gui/options.cpp:1264
+#: gui/options.cpp:1272 gui/options.cpp:1302 gui/options.cpp:1308
+#: gui/options.cpp:1315 gui/options.cpp:1408 gui/options.cpp:1411
+#: gui/options.cpp:1423
msgctxt "path"
msgid "None"
msgstr "Ingen"
-#: gui/launcher.cpp:334 gui/launcher.cpp:422 gui/launcher.cpp:527
-#: gui/options.cpp:1277 gui/options.cpp:1321 gui/options.cpp:1439
+#: gui/launcher.cpp:359 gui/launcher.cpp:459 gui/launcher.cpp:569
+#: gui/options.cpp:1252 gui/options.cpp:1296 gui/options.cpp:1414
#: backends/platform/wii/options.cpp:56
msgid "Default"
msgstr "Standard"
-#: gui/launcher.cpp:462 gui/options.cpp:1442
+#: gui/launcher.cpp:504 gui/options.cpp:1417
msgid "Select SoundFont"
msgstr "Vцlg SoundFont"
-#: gui/launcher.cpp:481 gui/launcher.cpp:636
+#: gui/launcher.cpp:523 gui/launcher.cpp:677
msgid "Select directory with game data"
msgstr "Vцlg bibliotek med spil data"
-#: gui/launcher.cpp:499
+#: gui/launcher.cpp:541
msgid "Select additional game directory"
msgstr "Vцlg ekstra spil bibliotek"
-#: gui/launcher.cpp:511
+#: gui/launcher.cpp:553
msgid "Select directory for saved games"
msgstr "Vцlg bibliotek til spil gemmer"
-#: gui/launcher.cpp:538
+#: gui/launcher.cpp:580
msgid "This game ID is already taken. Please choose another one."
msgstr "Dette spil ID er allerede i brug. Vцlg venligst et andet."
-#: gui/launcher.cpp:579 engines/dialogs.cpp:110
+#: gui/launcher.cpp:621 engines/dialogs.cpp:110
msgid "~Q~uit"
msgstr "~A~fslut"
-#: gui/launcher.cpp:579 backends/platform/sdl/macosx/appmenu_osx.mm:96
+#: gui/launcher.cpp:621 backends/platform/sdl/macosx/appmenu_osx.mm:96
msgid "Quit ScummVM"
msgstr "Slut ScummVM"
-#: gui/launcher.cpp:580
+#: gui/launcher.cpp:622
msgid "A~b~out..."
msgstr "~O~m..."
-#: gui/launcher.cpp:580 backends/platform/sdl/macosx/appmenu_osx.mm:70
+#: gui/launcher.cpp:622 backends/platform/sdl/macosx/appmenu_osx.mm:70
msgid "About ScummVM"
msgstr "Om ScummVM"
-#: gui/launcher.cpp:581
+#: gui/launcher.cpp:623
msgid "~O~ptions..."
msgstr "~I~ndstillinger..."
-#: gui/launcher.cpp:581
+#: gui/launcher.cpp:623
msgid "Change global ScummVM options"
msgstr "Цndre globale ScummVM indstillinger"
-#: gui/launcher.cpp:583
+#: gui/launcher.cpp:625
msgid "~S~tart"
msgstr "~S~tart"
-#: gui/launcher.cpp:583
+#: gui/launcher.cpp:625
msgid "Start selected game"
msgstr "Start det valgte spil"
-#: gui/launcher.cpp:586
+#: gui/launcher.cpp:628
msgid "~L~oad..."
msgstr "~H~ent..."
-#: gui/launcher.cpp:586
+#: gui/launcher.cpp:628
msgid "Load savegame for selected game"
msgstr "Hent gemmer for det valgte spil"
-#: gui/launcher.cpp:591 gui/launcher.cpp:1079
+#: gui/launcher.cpp:633 gui/launcher.cpp:1120
msgid "~A~dd Game..."
msgstr "~T~ilfјj spil..."
-#: gui/launcher.cpp:591 gui/launcher.cpp:598
+#: gui/launcher.cpp:633 gui/launcher.cpp:640
msgid "Hold Shift for Mass Add"
msgstr "Hold Skift for at tilfјje flere"
-#: gui/launcher.cpp:593
+#: gui/launcher.cpp:635
msgid "~E~dit Game..."
msgstr "~R~ediger spil..."
-#: gui/launcher.cpp:593 gui/launcher.cpp:600
+#: gui/launcher.cpp:635 gui/launcher.cpp:642
msgid "Change game options"
msgstr "Цndre spil indstillinger"
-#: gui/launcher.cpp:595
+#: gui/launcher.cpp:637
msgid "~R~emove Game"
msgstr "~F~jern spil"
-#: gui/launcher.cpp:595 gui/launcher.cpp:602
+#: gui/launcher.cpp:637 gui/launcher.cpp:644
msgid "Remove game from the list. The game data files stay intact"
msgstr "Fjerner spil fra listen. Spillets data filer forbliver uberјrt"
-#: gui/launcher.cpp:598 gui/launcher.cpp:1079
+#: gui/launcher.cpp:640 gui/launcher.cpp:1120
msgctxt "lowres"
msgid "~A~dd Game..."
msgstr "~T~ilfјj spil..."
-#: gui/launcher.cpp:600
+#: gui/launcher.cpp:642
msgctxt "lowres"
msgid "~E~dit Game..."
msgstr "~R~ediger spil..."
-#: gui/launcher.cpp:602
+#: gui/launcher.cpp:644
msgctxt "lowres"
msgid "~R~emove Game"
msgstr "~F~jern spil"
-#: gui/launcher.cpp:610
+#: gui/launcher.cpp:652
msgid "Search in game list"
msgstr "Sјg i spil liste"
-#: gui/launcher.cpp:614 gui/launcher.cpp:1126
+#: gui/launcher.cpp:656 gui/launcher.cpp:1167
msgid "Search:"
msgstr "Sјg:"
-#: gui/launcher.cpp:639 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255
+#: gui/launcher.cpp:680 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255
#: engines/mohawk/riven.cpp:716 engines/cruise/menu.cpp:216
msgid "Load game:"
msgstr "Indlцs spil:"
-#: gui/launcher.cpp:639 engines/dialogs.cpp:114 engines/scumm/dialogs.cpp:188
+#: gui/launcher.cpp:680 engines/dialogs.cpp:114 engines/scumm/dialogs.cpp:188
#: engines/mohawk/myst.cpp:255 engines/mohawk/riven.cpp:716
#: engines/cruise/menu.cpp:216 backends/platform/wince/CEActionsPocket.cpp:267
#: backends/platform/wince/CEActionsSmartphone.cpp:231
msgid "Load"
msgstr "Indlцs"
-#: gui/launcher.cpp:747
+#: gui/launcher.cpp:788
msgid ""
"Do you really want to run the mass game detector? This could potentially add "
"a huge number of games."
@@ -454,7 +459,7 @@ msgstr ""
"Vil du virkelig kјre fler spils detektoren? Dette kunne potentielt tilfјje "
"et stort antal spil."
-#: gui/launcher.cpp:748 gui/launcher.cpp:896
+#: gui/launcher.cpp:789 gui/launcher.cpp:937
#: backends/events/symbiansdl/symbiansdl-events.cpp:184
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
@@ -462,7 +467,7 @@ msgstr ""
msgid "Yes"
msgstr "Ja"
-#: gui/launcher.cpp:748 gui/launcher.cpp:896
+#: gui/launcher.cpp:789 gui/launcher.cpp:937
#: backends/events/symbiansdl/symbiansdl-events.cpp:184
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
@@ -470,37 +475,37 @@ msgstr "Ja"
msgid "No"
msgstr "Nej"
-#: gui/launcher.cpp:796
+#: gui/launcher.cpp:837
msgid "ScummVM couldn't open the specified directory!"
msgstr "ScummVM kunne ikke хbne det angivne bibliotek!"
-#: gui/launcher.cpp:808
+#: gui/launcher.cpp:849
msgid "ScummVM could not find any game in the specified directory!"
msgstr "ScummVM kunne ikke finde noget spil i det angivne bibliotek!"
-#: gui/launcher.cpp:822
+#: gui/launcher.cpp:863
msgid "Pick the game:"
msgstr "Vцlg spillet:"
-#: gui/launcher.cpp:896
+#: gui/launcher.cpp:937
msgid "Do you really want to remove this game configuration?"
msgstr "Vil du virkelig fjerne denne spil konfiguration?"
-#: gui/launcher.cpp:960
+#: gui/launcher.cpp:1001
msgid "This game does not support loading games from the launcher."
msgstr "Dette spil understјtter ikke hentning af spil fra spiloversigten."
-#: gui/launcher.cpp:964
+#: gui/launcher.cpp:1005
msgid "ScummVM could not find any engine capable of running the selected game!"
msgstr ""
"ScummVM kunne ikke finde en motor, istand til at afvikle det valgte spil!"
-#: gui/launcher.cpp:1078
+#: gui/launcher.cpp:1119
msgctxt "lowres"
msgid "Mass Add..."
msgstr "Tilfјj flere..."
-#: gui/launcher.cpp:1078
+#: gui/launcher.cpp:1119
msgid "Mass Add..."
msgstr "Tilfјj flere..."
@@ -567,101 +572,93 @@ msgstr "44 kHz"
msgid "48 kHz"
msgstr "48 kHz"
-#: gui/options.cpp:257 gui/options.cpp:485 gui/options.cpp:586
-#: gui/options.cpp:659 gui/options.cpp:868
+#: gui/options.cpp:248 gui/options.cpp:474 gui/options.cpp:575
+#: gui/options.cpp:644 gui/options.cpp:852
msgctxt "soundfont"
msgid "None"
msgstr "Ingen"
-#: gui/options.cpp:393
+#: gui/options.cpp:382
msgid "Failed to apply some of the graphic options changes:"
msgstr ""
-#: gui/options.cpp:405
+#: gui/options.cpp:394
msgid "the video mode could not be changed."
msgstr ""
-#: gui/options.cpp:411
+#: gui/options.cpp:400
msgid "the fullscreen setting could not be changed"
msgstr ""
-#: gui/options.cpp:417
+#: gui/options.cpp:406
msgid "the aspect ratio setting could not be changed"
msgstr ""
-#: gui/options.cpp:742
+#: gui/options.cpp:727
msgid "Graphics mode:"
msgstr "Grafik tilstand:"
-#: gui/options.cpp:756
+#: gui/options.cpp:741
msgid "Render mode:"
msgstr "Rendere tilstand:"
-#: gui/options.cpp:756 gui/options.cpp:757
+#: gui/options.cpp:741 gui/options.cpp:742
msgid "Special dithering modes supported by some games"
msgstr "Speciel farvereduceringstilstand understјttet a nogle spil"
-#: gui/options.cpp:768
+#: gui/options.cpp:753
#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2248
#: backends/graphics/openglsdl/openglsdl-graphics.cpp:472
msgid "Fullscreen mode"
msgstr "Fuldskцrms tilstand"
-#: gui/options.cpp:771
+#: gui/options.cpp:756
msgid "Aspect ratio correction"
msgstr "Billedformat korrektion"
-#: gui/options.cpp:771
+#: gui/options.cpp:756
msgid "Correct aspect ratio for 320x200 games"
msgstr "Korrekt billedformat til 320x200 spil"
-#: gui/options.cpp:772
-msgid "EGA undithering"
-msgstr "EGA farveforјgelse"
-
-#: gui/options.cpp:772
-msgid "Enable undithering in EGA games that support it"
-msgstr "Aktiver farveforјgelse i EGA spil der understјtter det"
-
-#: gui/options.cpp:780
+#: gui/options.cpp:764
msgid "Preferred Device:"
msgstr "Foretruk. enhed:"
-#: gui/options.cpp:780
+#: gui/options.cpp:764
msgid "Music Device:"
msgstr "Musik enhed:"
-#: gui/options.cpp:780 gui/options.cpp:782
+#: gui/options.cpp:764 gui/options.cpp:766
msgid "Specifies preferred sound device or sound card emulator"
msgstr "Angiver foretukket lyd enhed eller lydkort emulator"
-#: gui/options.cpp:780 gui/options.cpp:782 gui/options.cpp:783
+#: gui/options.cpp:764 gui/options.cpp:766 gui/options.cpp:767
msgid "Specifies output sound device or sound card emulator"
msgstr "Angiver lyd udgangsenhed eller lydkorts emulator"
-#: gui/options.cpp:782
+#: gui/options.cpp:766
msgctxt "lowres"
msgid "Preferred Dev.:"
msgstr "Foretruk. enh.:"
-#: gui/options.cpp:782
+#: gui/options.cpp:766
msgctxt "lowres"
msgid "Music Device:"
msgstr "Musik enhed:"
-#: gui/options.cpp:809
+#: gui/options.cpp:793
msgid "AdLib emulator:"
msgstr "AdLib emulator:"
-#: gui/options.cpp:809 gui/options.cpp:810
+#: gui/options.cpp:793 gui/options.cpp:794
msgid "AdLib is used for music in many games"
msgstr "AdLib bliver brugt til musik i mange spil"
-#: gui/options.cpp:820
+#: gui/options.cpp:804
msgid "Output rate:"
msgstr "Udgangsfrekvens:"
-#: gui/options.cpp:820 gui/options.cpp:821
+#: gui/options.cpp:804 gui/options.cpp:805
msgid ""
"Higher value specifies better sound quality but may be not supported by your "
"soundcard"
@@ -669,60 +666,60 @@ msgstr ""
"Hјjere vцrdi angiver bedre lyd kvalitet, men understјttes mхske ikke af dit "
"lydkort"
-#: gui/options.cpp:831
+#: gui/options.cpp:815
msgid "GM Device:"
msgstr "GM enhed:"
-#: gui/options.cpp:831
+#: gui/options.cpp:815
msgid "Specifies default sound device for General MIDI output"
msgstr "Angiver standard lyd enhed for General MIDI udgang"
-#: gui/options.cpp:842
+#: gui/options.cpp:826
msgid "Don't use General MIDI music"
msgstr "Brug ikke General MIDI musik"
-#: gui/options.cpp:853 gui/options.cpp:915
+#: gui/options.cpp:837 gui/options.cpp:899
msgid "Use first available device"
msgstr "Brug fјrste tilgцngelig enhed"
-#: gui/options.cpp:865
+#: gui/options.cpp:849
msgid "SoundFont:"
msgstr "SoundFont:"
-#: gui/options.cpp:865 gui/options.cpp:867 gui/options.cpp:868
+#: gui/options.cpp:849 gui/options.cpp:851 gui/options.cpp:852
msgid "SoundFont is supported by some audio cards, Fluidsynth and Timidity"
msgstr "SoundFont er understјttet af nogle lydkort, Fluidsynth og Timidity"
-#: gui/options.cpp:867
+#: gui/options.cpp:851
msgctxt "lowres"
msgid "SoundFont:"
msgstr "SoundFont:"
-#: gui/options.cpp:873
+#: gui/options.cpp:857
msgid "Mixed AdLib/MIDI mode"
msgstr "Blandet AdLib/MIDI tilstand"
-#: gui/options.cpp:873
+#: gui/options.cpp:857
msgid "Use both MIDI and AdLib sound generation"
msgstr "Brug bхde MIDI og AdLib lyd generering"
-#: gui/options.cpp:876
+#: gui/options.cpp:860
msgid "MIDI gain:"
msgstr "MIDI lydstyrke:"
-#: gui/options.cpp:886
+#: gui/options.cpp:870
msgid "MT-32 Device:"
msgstr "MT-32 enhed:"
-#: gui/options.cpp:886
+#: gui/options.cpp:870
msgid "Specifies default sound device for Roland MT-32/LAPC1/CM32l/CM64 output"
msgstr "Angiver standard lyd enhed for Roland MT-32/LAPC1/CM32I/CM64 udgang"
-#: gui/options.cpp:891
+#: gui/options.cpp:875
msgid "True Roland MT-32 (disable GM emulation)"
msgstr "Цgte Roland MT-32 (undlad GM emulering)"
-#: gui/options.cpp:891 gui/options.cpp:893
+#: gui/options.cpp:875 gui/options.cpp:877
msgid ""
"Check if you want to use your real hardware Roland-compatible sound device "
"connected to your computer"
@@ -730,191 +727,191 @@ msgstr ""
"Kontroller om du vil bruge din rigtige hardware Roland-kompatible lyd enhed "
"tilsluttet til din computer"
-#: gui/options.cpp:893
+#: gui/options.cpp:877
msgctxt "lowres"
msgid "True Roland MT-32 (no GM emulation)"
msgstr "Цgte Roland MT-32 (ingen GM emulering)"
-#: gui/options.cpp:896
+#: gui/options.cpp:880
msgid "Enable Roland GS Mode"
msgstr "Aktivщr Roland GS tilstand"
-#: gui/options.cpp:896
+#: gui/options.cpp:880
msgid "Turns off General MIDI mapping for games with Roland MT-32 soundtrack"
msgstr "Sluk for General MIDI kortlцgning for spil med Roland MT-32 lydspor"
-#: gui/options.cpp:905
+#: gui/options.cpp:889
msgid "Don't use Roland MT-32 music"
msgstr "Brug ikke Roland MT-32 musik"
-#: gui/options.cpp:932
+#: gui/options.cpp:916
msgid "Text and Speech:"
msgstr "Tekst og tale:"
-#: gui/options.cpp:936 gui/options.cpp:946
+#: gui/options.cpp:920 gui/options.cpp:930
msgid "Speech"
msgstr "Tale"
-#: gui/options.cpp:937 gui/options.cpp:947
+#: gui/options.cpp:921 gui/options.cpp:931
msgid "Subtitles"
msgstr "Undertekster"
-#: gui/options.cpp:938
+#: gui/options.cpp:922
msgid "Both"
msgstr "Begge"
-#: gui/options.cpp:940
+#: gui/options.cpp:924
msgid "Subtitle speed:"
msgstr "Tekst hastighed:"
-#: gui/options.cpp:942
+#: gui/options.cpp:926
msgctxt "lowres"
msgid "Text and Speech:"
msgstr "Tekst og tale:"
-#: gui/options.cpp:946
+#: gui/options.cpp:930
msgid "Spch"
msgstr "Tale"
-#: gui/options.cpp:947
+#: gui/options.cpp:931
msgid "Subs"
msgstr "Tekst"
-#: gui/options.cpp:948
+#: gui/options.cpp:932
msgctxt "lowres"
msgid "Both"
msgstr "Begge"
-#: gui/options.cpp:948
+#: gui/options.cpp:932
msgid "Show subtitles and play speech"
msgstr "Vis undertekster og afspil tale"
-#: gui/options.cpp:950
+#: gui/options.cpp:934
msgctxt "lowres"
msgid "Subtitle speed:"
msgstr "Tekst hastighed:"
-#: gui/options.cpp:966
+#: gui/options.cpp:950
msgid "Music volume:"
msgstr "Musik lydstyrke:"
-#: gui/options.cpp:968
+#: gui/options.cpp:952
msgctxt "lowres"
msgid "Music volume:"
msgstr "Musik lydstyrke:"
-#: gui/options.cpp:975
+#: gui/options.cpp:959
msgid "Mute All"
msgstr "Mute alle"
-#: gui/options.cpp:978
+#: gui/options.cpp:962
msgid "SFX volume:"
msgstr "SFX lydstyrke:"
-#: gui/options.cpp:978 gui/options.cpp:980 gui/options.cpp:981
+#: gui/options.cpp:962 gui/options.cpp:964 gui/options.cpp:965
msgid "Special sound effects volume"
msgstr "Lydstyrke for specielle lydeffekter"
-#: gui/options.cpp:980
+#: gui/options.cpp:964
msgctxt "lowres"
msgid "SFX volume:"
msgstr "SFX lydstyrke:"
-#: gui/options.cpp:988
+#: gui/options.cpp:972
msgid "Speech volume:"
msgstr "Tale lydstyrke:"
-#: gui/options.cpp:990
+#: gui/options.cpp:974
msgctxt "lowres"
msgid "Speech volume:"
msgstr "Tale lydstyrke:"
-#: gui/options.cpp:1156
+#: gui/options.cpp:1131
msgid "Theme Path:"
msgstr "Tema sti:"
-#: gui/options.cpp:1158
+#: gui/options.cpp:1133
msgctxt "lowres"
msgid "Theme Path:"
msgstr "Tema sti:"
-#: gui/options.cpp:1164 gui/options.cpp:1166 gui/options.cpp:1167
+#: gui/options.cpp:1139 gui/options.cpp:1141 gui/options.cpp:1142
msgid "Specifies path to additional data used by all games or ScummVM"
msgstr "Angiver sti til ekstra data brugt af alle spil eller ScummVM"
-#: gui/options.cpp:1173
+#: gui/options.cpp:1148
msgid "Plugins Path:"
msgstr "Plugin sti:"
-#: gui/options.cpp:1175
+#: gui/options.cpp:1150
msgctxt "lowres"
msgid "Plugins Path:"
msgstr "Plugin sti:"
-#: gui/options.cpp:1184
+#: gui/options.cpp:1159
msgid "Misc"
msgstr "Andet"
-#: gui/options.cpp:1186
+#: gui/options.cpp:1161
msgctxt "lowres"
msgid "Misc"
msgstr "Andet"
-#: gui/options.cpp:1188
+#: gui/options.cpp:1163
msgid "Theme:"
msgstr "Tema:"
-#: gui/options.cpp:1192
+#: gui/options.cpp:1167
msgid "GUI Renderer:"
msgstr "GUI renderer:"
-#: gui/options.cpp:1204
+#: gui/options.cpp:1179
msgid "Autosave:"
msgstr "Auto gemme:"
-#: gui/options.cpp:1206
+#: gui/options.cpp:1181
msgctxt "lowres"
msgid "Autosave:"
msgstr "Auto gemme:"
-#: gui/options.cpp:1214
+#: gui/options.cpp:1189
msgid "Keys"
msgstr "Taster"
-#: gui/options.cpp:1221
+#: gui/options.cpp:1196
msgid "GUI Language:"
msgstr "Sprog:"
-#: gui/options.cpp:1221
+#: gui/options.cpp:1196
msgid "Language of ScummVM GUI"
msgstr "Sprog for brugerfladen i ScummVM"
-#: gui/options.cpp:1372
+#: gui/options.cpp:1347
#, fuzzy
msgid "You have to restart ScummVM before your changes will take effect."
msgstr "Du skal genstarte ScummVM for at цndringer vises."
-#: gui/options.cpp:1385
+#: gui/options.cpp:1360
msgid "Select directory for savegames"
msgstr "Vцlg bibliotek til gemmer"
-#: gui/options.cpp:1392
+#: gui/options.cpp:1367
msgid "The chosen directory cannot be written to. Please select another one."
msgstr "Der kan ikke skrives til det valgte bibliotek. Vцlg venligst et andet."
-#: gui/options.cpp:1401
+#: gui/options.cpp:1376
msgid "Select directory for GUI themes"
msgstr "Vцlg bibliotek for GUI temaer"
-#: gui/options.cpp:1411
+#: gui/options.cpp:1386
msgid "Select directory for extra files"
msgstr "Vцlg bibliotek for ekstra filer"
-#: gui/options.cpp:1422
+#: gui/options.cpp:1397
msgid "Select directory for plugins"
msgstr "Vцlg bibliotek for plugins"
-#: gui/options.cpp:1475
+#: gui/options.cpp:1450
msgid ""
"The theme you selected does not support your current language. If you want "
"to use this theme you need to switch to another language first."
@@ -962,64 +959,64 @@ msgstr "Unavngivet gemmetilstand"
msgid "Select a Theme"
msgstr "Vцlg et tema"
-#: gui/ThemeEngine.cpp:333
+#: gui/ThemeEngine.cpp:335
msgid "Disabled GFX"
msgstr "Deaktiveret GFX"
-#: gui/ThemeEngine.cpp:333
+#: gui/ThemeEngine.cpp:335
msgctxt "lowres"
msgid "Disabled GFX"
msgstr "Deaktiveret GFX"
-#: gui/ThemeEngine.cpp:334
+#: gui/ThemeEngine.cpp:336
msgid "Standard Renderer (16bpp)"
msgstr "Standard renderer (16bpp)"
-#: gui/ThemeEngine.cpp:334
+#: gui/ThemeEngine.cpp:336
msgid "Standard (16bpp)"
msgstr "Standard (16bpp)"
-#: gui/ThemeEngine.cpp:336
+#: gui/ThemeEngine.cpp:338
msgid "Antialiased Renderer (16bpp)"
msgstr "Antialias renderer (16bpp)"
-#: gui/ThemeEngine.cpp:336
+#: gui/ThemeEngine.cpp:338
msgid "Antialiased (16bpp)"
msgstr "Antialias (16bpp)"
-#: gui/widget.cpp:312 gui/widget.cpp:314 gui/widget.cpp:320 gui/widget.cpp:322
+#: gui/widget.cpp:322 gui/widget.cpp:324 gui/widget.cpp:330 gui/widget.cpp:332
msgid "Clear value"
msgstr "Slet vцrdi"
-#: base/main.cpp:203
+#: base/main.cpp:209
#, c-format
msgid "Engine does not support debug level '%s'"
msgstr "Motor understјtter ikke fejlfindingsniveau '%s'"
-#: base/main.cpp:275
+#: base/main.cpp:287
msgid "Menu"
msgstr "Menu"
-#: base/main.cpp:278 backends/platform/symbian/src/SymbianActions.cpp:45
+#: base/main.cpp:290 backends/platform/symbian/src/SymbianActions.cpp:45
#: backends/platform/wince/CEActionsPocket.cpp:45
#: backends/platform/wince/CEActionsSmartphone.cpp:46
msgid "Skip"
msgstr "Spring over"
-#: base/main.cpp:281 backends/platform/symbian/src/SymbianActions.cpp:50
+#: base/main.cpp:293 backends/platform/symbian/src/SymbianActions.cpp:50
#: backends/platform/wince/CEActionsPocket.cpp:42
msgid "Pause"
msgstr "Pause"
-#: base/main.cpp:284
+#: base/main.cpp:296
msgid "Skip line"
msgstr "Spring linje over"
-#: base/main.cpp:455
+#: base/main.cpp:467
msgid "Error running game:"
msgstr "Fejl ved kјrsel af spil:"
-#: base/main.cpp:479
+#: base/main.cpp:491
msgid "Could not find any engine capable of running the selected game"
msgstr "Kunne ikke finde nogen motor istand til at afvikle det valgte spil"
@@ -1094,16 +1091,16 @@ msgstr ""
msgid "Unknown error"
msgstr "Ukendt fejl"
-#: engines/advancedDetector.cpp:296
+#: engines/advancedDetector.cpp:324
#, c-format
msgid "The game in '%s' seems to be unknown."
msgstr ""
-#: engines/advancedDetector.cpp:297
+#: engines/advancedDetector.cpp:325
msgid "Please, report the following data to the ScummVM team along with name"
msgstr ""
-#: engines/advancedDetector.cpp:299
+#: engines/advancedDetector.cpp:327
msgid "of the game you tried to add and its version/language/etc.:"
msgstr ""
@@ -1140,13 +1137,14 @@ msgctxt "lowres"
msgid "~R~eturn to Launcher"
msgstr "~R~etur til oversigt"
-#: engines/dialogs.cpp:116 engines/cruise/menu.cpp:214
-#: engines/sci/engine/kfile.cpp:566
+#: engines/dialogs.cpp:116 engines/agi/saveload.cpp:805
+#: engines/cruise/menu.cpp:214 engines/sci/engine/kfile.cpp:567
msgid "Save game:"
msgstr "Gemmer:"
-#: engines/dialogs.cpp:116 engines/scumm/dialogs.cpp:187
-#: engines/cruise/menu.cpp:214 engines/sci/engine/kfile.cpp:566
+#: engines/dialogs.cpp:116 engines/agi/saveload.cpp:805
+#: engines/scumm/dialogs.cpp:187 engines/cruise/menu.cpp:214
+#: engines/sci/engine/kfile.cpp:567
#: backends/platform/symbian/src/SymbianActions.cpp:44
#: backends/platform/wince/CEActionsPocket.cpp:43
#: backends/platform/wince/CEActionsPocket.cpp:267
@@ -1237,6 +1235,88 @@ msgstr ""
msgid "Start anyway"
msgstr ""
+#: engines/agi/detection.cpp:145 engines/dreamweb/detection.cpp:47
+#: engines/sci/detection.cpp:390
+msgid "Use original save/load screens"
+msgstr ""
+
+#: engines/agi/detection.cpp:146 engines/dreamweb/detection.cpp:48
+#: engines/sci/detection.cpp:391
+msgid "Use the original save/load screens, instead of the ScummVM ones"
+msgstr ""
+
+#: engines/agi/saveload.cpp:827 engines/sci/engine/kfile.cpp:674
+msgid "Restore game:"
+msgstr "Gendan spil:"
+
+#: engines/agi/saveload.cpp:827 engines/sci/engine/kfile.cpp:674
+msgid "Restore"
+msgstr "Gendan"
+
+#: engines/dreamweb/detection.cpp:57
+#, fuzzy
+msgid "Use bright palette mode"
+msgstr "иverste hјjre punkt"
+
+#: engines/dreamweb/detection.cpp:58
+msgid "Display graphics using the game's bright palette"
+msgstr ""
+
+#: engines/sci/detection.cpp:370
+msgid "EGA undithering"
+msgstr "EGA farveforјgelse"
+
+#: engines/sci/detection.cpp:371
+#, fuzzy
+msgid "Enable undithering in EGA games"
+msgstr "Aktiver farveforјgelse i EGA spil der understјtter det"
+
+#: engines/sci/detection.cpp:380
+#, fuzzy
+msgid "Prefer digital sound effects"
+msgstr "Lydstyrke for specielle lydeffekter"
+
+#: engines/sci/detection.cpp:381
+msgid "Prefer digital sound effects instead of synthesized ones"
+msgstr ""
+
+#: engines/sci/detection.cpp:400
+msgid "Use IMF/Yahama FB-01 for MIDI output"
+msgstr ""
+
+#: engines/sci/detection.cpp:401
+msgid ""
+"Use an IBM Music Feature card or a Yahama FB-01 FM synth module for MIDI "
+"output"
+msgstr ""
+
+#: engines/sci/detection.cpp:411
+msgid "Use CD audio"
+msgstr ""
+
+#: engines/sci/detection.cpp:412
+msgid "Use CD audio instead of in-game audio, if available"
+msgstr ""
+
+#: engines/sci/detection.cpp:422
+msgid "Use Windows cursors"
+msgstr ""
+
+#: engines/sci/detection.cpp:423
+msgid ""
+"Use the Windows cursors (smaller and monochrome) instead of the DOS ones"
+msgstr ""
+
+#: engines/sci/detection.cpp:433
+#, fuzzy
+msgid "Use silver cursors"
+msgstr "Normal markјr"
+
+#: engines/sci/detection.cpp:434
+msgid ""
+"Use the alternate set of silver cursors, instead of the normal golden ones"
+msgstr ""
+
#: engines/scumm/dialogs.cpp:175
#, c-format
msgid "Insert Disk %c and Press Button to Continue."
@@ -1900,7 +1980,7 @@ msgid ""
"but %s is missing. Using AdLib instead."
msgstr ""
-#: engines/scumm/scumm.cpp:2271 engines/agos/saveload.cpp:189
+#: engines/scumm/scumm.cpp:2271 engines/agos/saveload.cpp:202
#, c-format
msgid ""
"Failed to save game state to file:\n"
@@ -1911,7 +1991,7 @@ msgstr ""
"\n"
"%s"
-#: engines/scumm/scumm.cpp:2278 engines/agos/saveload.cpp:154
+#: engines/scumm/scumm.cpp:2278 engines/agos/saveload.cpp:167
#, c-format
msgid ""
"Failed to load game state from file:\n"
@@ -1922,7 +2002,7 @@ msgstr ""
"\n"
"%s"
-#: engines/scumm/scumm.cpp:2290 engines/agos/saveload.cpp:197
+#: engines/scumm/scumm.cpp:2290 engines/agos/saveload.cpp:210
#, c-format
msgid ""
"Successfully saved game state in file:\n"
@@ -1967,14 +2047,6 @@ msgstr "ScummVM Hovedmenu"
msgid "~W~ater Effect Enabled"
msgstr "~V~andeffekter aktiveret"
-#: engines/sci/engine/kfile.cpp:673
-msgid "Restore game:"
-msgstr "Gendan spil:"
-
-#: engines/sci/engine/kfile.cpp:673
-msgid "Restore"
-msgstr "Gendan"
-
#: engines/agos/animation.cpp:550
#, c-format
msgid "Cutscene file '%s' not found!"
@@ -2013,6 +2085,66 @@ msgstr ""
"\n"
"%s"
+#. I18N: Studio audience adds an applause and cheering sounds whenever
+#. Malcolm makes a joke.
+#: engines/kyra/detection.cpp:62
+msgid "Studio audience"
+msgstr ""
+
+#: engines/kyra/detection.cpp:63
+msgid "Enable studio audience"
+msgstr ""
+
+#. I18N: This option allows the user to skip text and cutscenes.
+#: engines/kyra/detection.cpp:73
+msgid "Skip support"
+msgstr ""
+
+#: engines/kyra/detection.cpp:74
+msgid "Allow text and cutscenes to be skipped"
+msgstr ""
+
+#. I18N: Helium mode makes people sound like they've inhaled Helium.
+#: engines/kyra/detection.cpp:84
+msgid "Helium mode"
+msgstr ""
+
+#: engines/kyra/detection.cpp:85
+#, fuzzy
+msgid "Enable helium mode"
+msgstr "Aktivщr Roland GS tilstand"
+
+#. I18N: When enabled, this option makes scrolling smoother when
+#. changing from one screen to another.
+#: engines/kyra/detection.cpp:99
+msgid "Smooth scrolling"
+msgstr ""
+
+#: engines/kyra/detection.cpp:100
+msgid "Enable smooth scrolling when walking"
+msgstr ""
+
+#. I18N: When enabled, this option changes the cursor when it floats to the
+#. edge of the screen to a directional arrow. The player can then click to
+#. walk towards that direction.
+#: engines/kyra/detection.cpp:112
+#, fuzzy
+msgid "Floating cursors"
+msgstr "Normal markјr"
+
+#: engines/kyra/detection.cpp:113
+msgid "Enable floating cursors"
+msgstr ""
+
+#. I18N: HP stands for Hit Points
+#: engines/kyra/detection.cpp:127
+msgid "HP bar graphs"
+msgstr ""
+
+#: engines/kyra/detection.cpp:128
+msgid "Enable hit point bar graphs"
+msgstr ""
+
#: engines/kyra/lol.cpp:478
msgid "Attack 1"
msgstr ""
@@ -2076,6 +2208,14 @@ msgid ""
"that a few tracks will not be correctly played."
msgstr ""
+#: engines/queen/queen.cpp:59 engines/sky/detection.cpp:44
+msgid "Floppy intro"
+msgstr ""
+
+#: engines/queen/queen.cpp:60 engines/sky/detection.cpp:45
+msgid "Use the floppy version's intro (CD version only)"
+msgstr ""
+
#: engines/sky/compact.cpp:130
msgid ""
"Unable to find \"sky.cpt\" file!\n"
@@ -2141,6 +2281,14 @@ msgid ""
"PSX cutscenes found but ScummVM has been built without RGB color support"
msgstr ""
+#: engines/sword2/sword2.cpp:79
+msgid "Show object labels"
+msgstr ""
+
+#: engines/sword2/sword2.cpp:80
+msgid "Show labels for objects on mouse hover"
+msgstr ""
+
#: engines/parallaction/saveload.cpp:133
#, c-format
msgid ""
@@ -2359,21 +2507,21 @@ msgstr "Hјj lydkvalitet (langsommere) (genstart)"
msgid "Disable power off"
msgstr "Deaktiver slukning"
-#: backends/platform/iphone/osys_events.cpp:301
+#: backends/platform/iphone/osys_events.cpp:300
#, fuzzy
msgid "Mouse-click-and-drag mode enabled."
msgstr "Pegeplade tilstand aktiveret."
-#: backends/platform/iphone/osys_events.cpp:303
+#: backends/platform/iphone/osys_events.cpp:302
#, fuzzy
msgid "Mouse-click-and-drag mode disabled."
msgstr "Pegeplade tilstand deaktiveret."
-#: backends/platform/iphone/osys_events.cpp:314
+#: backends/platform/iphone/osys_events.cpp:313
msgid "Touchpad mode enabled."
msgstr "Pegeplade tilstand aktiveret."
-#: backends/platform/iphone/osys_events.cpp:316
+#: backends/platform/iphone/osys_events.cpp:315
msgid "Touchpad mode disabled."
msgstr "Pegeplade tilstand deaktiveret."
@@ -2455,15 +2603,15 @@ msgstr "Skift mellem grafik filtre"
msgid "Windowed mode"
msgstr "Rendere tilstand:"
-#: backends/graphics/opengl/opengl-graphics.cpp:130
+#: backends/graphics/opengl/opengl-graphics.cpp:135
msgid "OpenGL Normal"
msgstr "OpenGL Normal"
-#: backends/graphics/opengl/opengl-graphics.cpp:131
+#: backends/graphics/opengl/opengl-graphics.cpp:136
msgid "OpenGL Conserve"
msgstr "OpenGL Bevar"
-#: backends/graphics/opengl/opengl-graphics.cpp:132
+#: backends/graphics/opengl/opengl-graphics.cpp:137
msgid "OpenGL Original"
msgstr "OpenGL Original"
diff --git a/po/de_DE.po b/po/de_DE.po
index fd60d11d4a..e11a3d4fc7 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ScummVM 1.4.0git\n"
"Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n"
-"POT-Creation-Date: 2012-03-07 22:09+0000\n"
+"POT-Creation-Date: 2012-05-20 22:39+0100\n"
"PO-Revision-Date: 2012-01-29 21:11+0100\n"
"Last-Translator: Simon Sawatzki <SimSaw@gmx.de>\n"
"Language-Team: Simon Sawatzki <SimSaw@gmx.de> (Lead), Lothar Serra Mari "
@@ -45,7 +45,7 @@ msgid "Go up"
msgstr "Pfad hoch"
#: gui/browser.cpp:69 gui/chooser.cpp:45 gui/KeysDialog.cpp:43
-#: gui/launcher.cpp:320 gui/massadd.cpp:94 gui/options.cpp:1253
+#: gui/launcher.cpp:345 gui/massadd.cpp:94 gui/options.cpp:1228
#: gui/saveload.cpp:63 gui/saveload.cpp:155 gui/themebrowser.cpp:54
#: engines/engine.cpp:442 engines/scumm/dialogs.cpp:190
#: engines/sword1/control.cpp:865 engines/parallaction/saveload.cpp:281
@@ -70,15 +70,15 @@ msgstr "Schlieпen"
msgid "Mouse click"
msgstr "Mausklick"
-#: gui/gui-manager.cpp:122 base/main.cpp:288
+#: gui/gui-manager.cpp:122 base/main.cpp:300
msgid "Display keyboard"
msgstr "Tastatur anzeigen"
-#: gui/gui-manager.cpp:126 base/main.cpp:292
+#: gui/gui-manager.cpp:126 base/main.cpp:304
msgid "Remap keys"
msgstr "Tasten neu zuweisen"
-#: gui/gui-manager.cpp:129 base/main.cpp:295
+#: gui/gui-manager.cpp:129 base/main.cpp:307
#, fuzzy
msgid "Toggle FullScreen"
msgstr "Vollbild-/Fenster-Modus"
@@ -91,8 +91,8 @@ msgstr "Eine Aktion zum Zuweisen auswфhlen"
msgid "Map"
msgstr "Zuweisen"
-#: gui/KeysDialog.cpp:42 gui/launcher.cpp:321 gui/launcher.cpp:960
-#: gui/launcher.cpp:964 gui/massadd.cpp:91 gui/options.cpp:1254
+#: gui/KeysDialog.cpp:42 gui/launcher.cpp:346 gui/launcher.cpp:1001
+#: gui/launcher.cpp:1005 gui/massadd.cpp:91 gui/options.cpp:1229
#: engines/engine.cpp:361 engines/engine.cpp:372 engines/scumm/dialogs.cpp:192
#: engines/scumm/scumm.cpp:1775 engines/agos/animation.cpp:551
#: engines/groovie/script.cpp:420 engines/sky/compact.cpp:131
@@ -129,15 +129,15 @@ msgstr "Bitte eine Aktion auswфhlen"
msgid "Press the key to associate"
msgstr "Taste drќcken, um sie zuzuweisen"
-#: gui/launcher.cpp:170
+#: gui/launcher.cpp:187
msgid "Game"
msgstr "Spiel"
-#: gui/launcher.cpp:174
+#: gui/launcher.cpp:191
msgid "ID:"
msgstr "Kennung:"
-#: gui/launcher.cpp:174 gui/launcher.cpp:176 gui/launcher.cpp:177
+#: gui/launcher.cpp:191 gui/launcher.cpp:193 gui/launcher.cpp:194
msgid ""
"Short game identifier used for referring to savegames and running the game "
"from the command line"
@@ -145,29 +145,29 @@ msgstr ""
"Kurzer Spielname, um die Spielstфnde zuzuordnen und das Spiel von der "
"Kommandozeile aus starten zu kіnnen"
-#: gui/launcher.cpp:176
+#: gui/launcher.cpp:193
msgctxt "lowres"
msgid "ID:"
msgstr "ID:"
-#: gui/launcher.cpp:181
+#: gui/launcher.cpp:198
msgid "Name:"
msgstr "Name:"
-#: gui/launcher.cpp:181 gui/launcher.cpp:183 gui/launcher.cpp:184
+#: gui/launcher.cpp:198 gui/launcher.cpp:200 gui/launcher.cpp:201
msgid "Full title of the game"
msgstr "Voller Name des Spiels"
-#: gui/launcher.cpp:183
+#: gui/launcher.cpp:200
msgctxt "lowres"
msgid "Name:"
msgstr "Name:"
-#: gui/launcher.cpp:187
+#: gui/launcher.cpp:204
msgid "Language:"
msgstr "Sprache:"
-#: gui/launcher.cpp:187 gui/launcher.cpp:188
+#: gui/launcher.cpp:204 gui/launcher.cpp:205
msgid ""
"Language of the game. This will not turn your Spanish game version into "
"English"
@@ -175,282 +175,287 @@ msgstr ""
"Sprache des Spiels. Diese Funktion wird nicht eine spanische Version des "
"Spiels in eine deutsche verwandeln."
-#: gui/launcher.cpp:189 gui/launcher.cpp:203 gui/options.cpp:80
-#: gui/options.cpp:745 gui/options.cpp:758 gui/options.cpp:1224
+#: gui/launcher.cpp:206 gui/launcher.cpp:220 gui/options.cpp:80
+#: gui/options.cpp:730 gui/options.cpp:743 gui/options.cpp:1199
#: audio/null.cpp:40
msgid "<default>"
msgstr "<Standard>"
-#: gui/launcher.cpp:199
+#: gui/launcher.cpp:216
msgid "Platform:"
msgstr "Plattform:"
-#: gui/launcher.cpp:199 gui/launcher.cpp:201 gui/launcher.cpp:202
+#: gui/launcher.cpp:216 gui/launcher.cpp:218 gui/launcher.cpp:219
msgid "Platform the game was originally designed for"
msgstr "Plattform, fќr die das Spiel ursprќnglich erstellt wurde"
-#: gui/launcher.cpp:201
+#: gui/launcher.cpp:218
msgctxt "lowres"
msgid "Platform:"
msgstr "Plattform:"
-#: gui/launcher.cpp:213 gui/options.cpp:1087 gui/options.cpp:1104
+#: gui/launcher.cpp:231
+#, fuzzy
+msgid "Engine"
+msgstr "Betrachte"
+
+#: gui/launcher.cpp:239 gui/options.cpp:1062 gui/options.cpp:1079
msgid "Graphics"
msgstr "Grafik"
-#: gui/launcher.cpp:213 gui/options.cpp:1087 gui/options.cpp:1104
+#: gui/launcher.cpp:239 gui/options.cpp:1062 gui/options.cpp:1079
msgid "GFX"
msgstr "GFX"
-#: gui/launcher.cpp:216
+#: gui/launcher.cpp:242
msgid "Override global graphic settings"
msgstr "Globale Grafikeinstellungen ќbergehen"
-#: gui/launcher.cpp:218
+#: gui/launcher.cpp:244
msgctxt "lowres"
msgid "Override global graphic settings"
msgstr "Globale Grafikeinstellungen ќbergehen"
-#: gui/launcher.cpp:225 gui/options.cpp:1110
+#: gui/launcher.cpp:251 gui/options.cpp:1085
msgid "Audio"
msgstr "Audio"
-#: gui/launcher.cpp:228
+#: gui/launcher.cpp:254
msgid "Override global audio settings"
msgstr "Globale Audioeinstellungen ќbergehen"
-#: gui/launcher.cpp:230
+#: gui/launcher.cpp:256
msgctxt "lowres"
msgid "Override global audio settings"
msgstr "Globale Audioeinstellungen ќbergehen"
-#: gui/launcher.cpp:239 gui/options.cpp:1115
+#: gui/launcher.cpp:265 gui/options.cpp:1090
msgid "Volume"
msgstr "Lautstфrke"
-#: gui/launcher.cpp:241 gui/options.cpp:1117
+#: gui/launcher.cpp:267 gui/options.cpp:1092
msgctxt "lowres"
msgid "Volume"
msgstr "Lautst."
-#: gui/launcher.cpp:244
+#: gui/launcher.cpp:270
msgid "Override global volume settings"
msgstr "Globale Lautstфrke-Einstellungen ќbergehen"
-#: gui/launcher.cpp:246
+#: gui/launcher.cpp:272
msgctxt "lowres"
msgid "Override global volume settings"
msgstr "Globale Lautstфrkeeinstellungen ќbergehen"
-#: gui/launcher.cpp:254 gui/options.cpp:1125
+#: gui/launcher.cpp:280 gui/options.cpp:1100
msgid "MIDI"
msgstr "MIDI"
-#: gui/launcher.cpp:257
+#: gui/launcher.cpp:283
msgid "Override global MIDI settings"
msgstr "Globale MIDI-Einstellungen ќbergehen"
-#: gui/launcher.cpp:259
+#: gui/launcher.cpp:285
msgctxt "lowres"
msgid "Override global MIDI settings"
msgstr "Globale MIDI-Einstellungen ќbergehen"
-#: gui/launcher.cpp:268 gui/options.cpp:1131
+#: gui/launcher.cpp:294 gui/options.cpp:1106
msgid "MT-32"
msgstr "MT-32"
-#: gui/launcher.cpp:271
+#: gui/launcher.cpp:297
msgid "Override global MT-32 settings"
msgstr "Globale MT-32-Einstellungen ќbergehen"
-#: gui/launcher.cpp:273
+#: gui/launcher.cpp:299
msgctxt "lowres"
msgid "Override global MT-32 settings"
msgstr "Globale MT-32-Einstellungen ќbergehen"
-#: gui/launcher.cpp:282 gui/options.cpp:1138
+#: gui/launcher.cpp:308 gui/options.cpp:1113
msgid "Paths"
msgstr "Pfade"
-#: gui/launcher.cpp:284 gui/options.cpp:1140
+#: gui/launcher.cpp:310 gui/options.cpp:1115
msgctxt "lowres"
msgid "Paths"
msgstr "Pfade"
-#: gui/launcher.cpp:291
+#: gui/launcher.cpp:317
msgid "Game Path:"
msgstr "Spielpfad:"
-#: gui/launcher.cpp:293
+#: gui/launcher.cpp:319
msgctxt "lowres"
msgid "Game Path:"
msgstr "Spielpfad:"
-#: gui/launcher.cpp:298 gui/options.cpp:1164
+#: gui/launcher.cpp:324 gui/options.cpp:1139
msgid "Extra Path:"
msgstr "Extrapfad:"
-#: gui/launcher.cpp:298 gui/launcher.cpp:300 gui/launcher.cpp:301
+#: gui/launcher.cpp:324 gui/launcher.cpp:326 gui/launcher.cpp:327
msgid "Specifies path to additional data used the game"
msgstr "Legt das Verzeichnis fќr zusфtzliche Spieldateien fest."
-#: gui/launcher.cpp:300 gui/options.cpp:1166
+#: gui/launcher.cpp:326 gui/options.cpp:1141
msgctxt "lowres"
msgid "Extra Path:"
msgstr "Extrapfad:"
-#: gui/launcher.cpp:307 gui/options.cpp:1148
+#: gui/launcher.cpp:333 gui/options.cpp:1123
msgid "Save Path:"
msgstr "Spielstфnde:"
-#: gui/launcher.cpp:307 gui/launcher.cpp:309 gui/launcher.cpp:310
-#: gui/options.cpp:1148 gui/options.cpp:1150 gui/options.cpp:1151
+#: gui/launcher.cpp:333 gui/launcher.cpp:335 gui/launcher.cpp:336
+#: gui/options.cpp:1123 gui/options.cpp:1125 gui/options.cpp:1126
msgid "Specifies where your savegames are put"
msgstr "Legt fest, wo die Spielstфnde abgelegt werden."
-#: gui/launcher.cpp:309 gui/options.cpp:1150
+#: gui/launcher.cpp:335 gui/options.cpp:1125
msgctxt "lowres"
msgid "Save Path:"
msgstr "Speichern:"
-#: gui/launcher.cpp:329 gui/launcher.cpp:416 gui/launcher.cpp:469
-#: gui/launcher.cpp:523 gui/options.cpp:1159 gui/options.cpp:1167
-#: gui/options.cpp:1176 gui/options.cpp:1283 gui/options.cpp:1289
-#: gui/options.cpp:1297 gui/options.cpp:1327 gui/options.cpp:1333
-#: gui/options.cpp:1340 gui/options.cpp:1433 gui/options.cpp:1436
-#: gui/options.cpp:1448
+#: gui/launcher.cpp:354 gui/launcher.cpp:453 gui/launcher.cpp:511
+#: gui/launcher.cpp:565 gui/options.cpp:1134 gui/options.cpp:1142
+#: gui/options.cpp:1151 gui/options.cpp:1258 gui/options.cpp:1264
+#: gui/options.cpp:1272 gui/options.cpp:1302 gui/options.cpp:1308
+#: gui/options.cpp:1315 gui/options.cpp:1408 gui/options.cpp:1411
+#: gui/options.cpp:1423
msgctxt "path"
msgid "None"
msgstr "Keiner"
-#: gui/launcher.cpp:334 gui/launcher.cpp:422 gui/launcher.cpp:527
-#: gui/options.cpp:1277 gui/options.cpp:1321 gui/options.cpp:1439
+#: gui/launcher.cpp:359 gui/launcher.cpp:459 gui/launcher.cpp:569
+#: gui/options.cpp:1252 gui/options.cpp:1296 gui/options.cpp:1414
#: backends/platform/wii/options.cpp:56
msgid "Default"
msgstr "Standard"
-#: gui/launcher.cpp:462 gui/options.cpp:1442
+#: gui/launcher.cpp:504 gui/options.cpp:1417
msgid "Select SoundFont"
msgstr "SoundFont auswфhlen"
-#: gui/launcher.cpp:481 gui/launcher.cpp:636
+#: gui/launcher.cpp:523 gui/launcher.cpp:677
msgid "Select directory with game data"
msgstr "Verzeichnis mit Spieldateien auswфhlen"
-#: gui/launcher.cpp:499
+#: gui/launcher.cpp:541
msgid "Select additional game directory"
msgstr "Verzeichnis mit zusфtzlichen Dateien auswфhlen"
-#: gui/launcher.cpp:511
+#: gui/launcher.cpp:553
msgid "Select directory for saved games"
msgstr "Verzeichnis fќr Spielstфnde auswфhlen"
-#: gui/launcher.cpp:538
+#: gui/launcher.cpp:580
msgid "This game ID is already taken. Please choose another one."
msgstr "Diese Spielkennung ist schon vergeben. Bitte eine andere wфhlen."
-#: gui/launcher.cpp:579 engines/dialogs.cpp:110
+#: gui/launcher.cpp:621 engines/dialogs.cpp:110
msgid "~Q~uit"
msgstr "~B~eenden"
-#: gui/launcher.cpp:579 backends/platform/sdl/macosx/appmenu_osx.mm:96
+#: gui/launcher.cpp:621 backends/platform/sdl/macosx/appmenu_osx.mm:96
msgid "Quit ScummVM"
msgstr "ScummVM beenden"
-#: gui/launcher.cpp:580
+#: gui/launcher.cpp:622
msgid "A~b~out..."
msgstr "мbe~r~"
-#: gui/launcher.cpp:580 backends/platform/sdl/macosx/appmenu_osx.mm:70
+#: gui/launcher.cpp:622 backends/platform/sdl/macosx/appmenu_osx.mm:70
msgid "About ScummVM"
msgstr "мber ScummVM"
-#: gui/launcher.cpp:581
+#: gui/launcher.cpp:623
msgid "~O~ptions..."
msgstr "~O~ptionen"
-#: gui/launcher.cpp:581
+#: gui/launcher.cpp:623
msgid "Change global ScummVM options"
msgstr "Globale ScummVM-Einstellungen bearbeiten"
-#: gui/launcher.cpp:583
+#: gui/launcher.cpp:625
msgid "~S~tart"
msgstr "~S~tarten"
-#: gui/launcher.cpp:583
+#: gui/launcher.cpp:625
msgid "Start selected game"
msgstr "Ausgewфhltes Spiel starten"
-#: gui/launcher.cpp:586
+#: gui/launcher.cpp:628
msgid "~L~oad..."
msgstr "~L~aden..."
-#: gui/launcher.cpp:586
+#: gui/launcher.cpp:628
msgid "Load savegame for selected game"
msgstr "Spielstand fќr ausgewфhltes Spiel laden"
-#: gui/launcher.cpp:591 gui/launcher.cpp:1079
+#: gui/launcher.cpp:633 gui/launcher.cpp:1120
msgid "~A~dd Game..."
msgstr "Spiel ~h~inzufќgen"
-#: gui/launcher.cpp:591 gui/launcher.cpp:598
+#: gui/launcher.cpp:633 gui/launcher.cpp:640
msgid "Hold Shift for Mass Add"
msgstr ""
"Umschalttaste (Shift) gedrќckt halten, um Verzeichnisse nach Spielen zu "
"durchsuchen"
-#: gui/launcher.cpp:593
+#: gui/launcher.cpp:635
msgid "~E~dit Game..."
msgstr "Spielo~p~tionen"
-#: gui/launcher.cpp:593 gui/launcher.cpp:600
+#: gui/launcher.cpp:635 gui/launcher.cpp:642
msgid "Change game options"
msgstr "Spieloptionen фndern"
-#: gui/launcher.cpp:595
+#: gui/launcher.cpp:637
msgid "~R~emove Game"
msgstr "Spiel ~e~ntfernen"
-#: gui/launcher.cpp:595 gui/launcher.cpp:602
+#: gui/launcher.cpp:637 gui/launcher.cpp:644
msgid "Remove game from the list. The game data files stay intact"
msgstr "Spiel aus der Liste entfernen. Die Spieldateien bleiben erhalten."
-#: gui/launcher.cpp:598 gui/launcher.cpp:1079
+#: gui/launcher.cpp:640 gui/launcher.cpp:1120
msgctxt "lowres"
msgid "~A~dd Game..."
msgstr "~H~inzufќgen"
-#: gui/launcher.cpp:600
+#: gui/launcher.cpp:642
msgctxt "lowres"
msgid "~E~dit Game..."
msgstr "Spielo~p~tion"
-#: gui/launcher.cpp:602
+#: gui/launcher.cpp:644
msgctxt "lowres"
msgid "~R~emove Game"
msgstr "~E~ntfernen"
-#: gui/launcher.cpp:610
+#: gui/launcher.cpp:652
msgid "Search in game list"
msgstr "In Spieleliste suchen"
-#: gui/launcher.cpp:614 gui/launcher.cpp:1126
+#: gui/launcher.cpp:656 gui/launcher.cpp:1167
msgid "Search:"
msgstr "Suchen:"
-#: gui/launcher.cpp:639 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255
+#: gui/launcher.cpp:680 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255
#: engines/mohawk/riven.cpp:716 engines/cruise/menu.cpp:216
msgid "Load game:"
msgstr "Spiel laden:"
-#: gui/launcher.cpp:639 engines/dialogs.cpp:114 engines/scumm/dialogs.cpp:188
+#: gui/launcher.cpp:680 engines/dialogs.cpp:114 engines/scumm/dialogs.cpp:188
#: engines/mohawk/myst.cpp:255 engines/mohawk/riven.cpp:716
#: engines/cruise/menu.cpp:216 backends/platform/wince/CEActionsPocket.cpp:267
#: backends/platform/wince/CEActionsSmartphone.cpp:231
msgid "Load"
msgstr "Laden"
-#: gui/launcher.cpp:747
+#: gui/launcher.cpp:788
msgid ""
"Do you really want to run the mass game detector? This could potentially add "
"a huge number of games."
@@ -458,7 +463,7 @@ msgstr ""
"Mіchten Sie wirklich den PC nach Spielen durchsuchen? Mіglicherweise wird "
"dabei eine grіпere Menge an Spielen hinzugefќgt."
-#: gui/launcher.cpp:748 gui/launcher.cpp:896
+#: gui/launcher.cpp:789 gui/launcher.cpp:937
#: backends/events/symbiansdl/symbiansdl-events.cpp:184
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
@@ -466,7 +471,7 @@ msgstr ""
msgid "Yes"
msgstr "Ja"
-#: gui/launcher.cpp:748 gui/launcher.cpp:896
+#: gui/launcher.cpp:789 gui/launcher.cpp:937
#: backends/events/symbiansdl/symbiansdl-events.cpp:184
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
@@ -474,37 +479,37 @@ msgstr "Ja"
msgid "No"
msgstr "Nein"
-#: gui/launcher.cpp:796
+#: gui/launcher.cpp:837
msgid "ScummVM couldn't open the specified directory!"
msgstr "ScummVM konnte das gewфhlte Verzeichnis nicht іffnen!"
-#: gui/launcher.cpp:808
+#: gui/launcher.cpp:849
msgid "ScummVM could not find any game in the specified directory!"
msgstr "ScummVM konnte im gewфhlten Verzeichnis kein Spiel finden!"
-#: gui/launcher.cpp:822
+#: gui/launcher.cpp:863
msgid "Pick the game:"
msgstr "Spiel auswфhlen:"
-#: gui/launcher.cpp:896
+#: gui/launcher.cpp:937
msgid "Do you really want to remove this game configuration?"
msgstr "Mіchten Sie wirklich diese Spielkonfiguration entfernen?"
-#: gui/launcher.cpp:960
+#: gui/launcher.cpp:1001
msgid "This game does not support loading games from the launcher."
msgstr ""
"Fќr dieses Spiel wird das Laden aus der Spieleliste heraus nicht unterstќtzt."
-#: gui/launcher.cpp:964
+#: gui/launcher.cpp:1005
msgid "ScummVM could not find any engine capable of running the selected game!"
msgstr "ScummVM konnte keine Engine finden, um das Spiel zu starten!"
-#: gui/launcher.cpp:1078
+#: gui/launcher.cpp:1119
msgctxt "lowres"
msgid "Mass Add..."
msgstr "Durchsuchen"
-#: gui/launcher.cpp:1078
+#: gui/launcher.cpp:1119
msgid "Mass Add..."
msgstr "Durchsuchen"
@@ -571,106 +576,96 @@ msgstr "44 kHz"
msgid "48 kHz"
msgstr "48 kHz"
-#: gui/options.cpp:257 gui/options.cpp:485 gui/options.cpp:586
-#: gui/options.cpp:659 gui/options.cpp:868
+#: gui/options.cpp:248 gui/options.cpp:474 gui/options.cpp:575
+#: gui/options.cpp:644 gui/options.cpp:852
msgctxt "soundfont"
msgid "None"
msgstr "-"
-#: gui/options.cpp:393
+#: gui/options.cpp:382
msgid "Failed to apply some of the graphic options changes:"
msgstr "Fehler bei einigen Фnderungen in Grafikoptionen:"
-#: gui/options.cpp:405
+#: gui/options.cpp:394
msgid "the video mode could not be changed."
msgstr "Grafikmodus konnte nicht geфndert werden."
-#: gui/options.cpp:411
+#: gui/options.cpp:400
msgid "the fullscreen setting could not be changed"
msgstr "Vollbildeinstellung konnte nicht geфndert werden."
-#: gui/options.cpp:417
+#: gui/options.cpp:406
msgid "the aspect ratio setting could not be changed"
msgstr ""
"Einstellung fќr Seitenverhфltniskorrektur konnte nicht geфndert werden."
-#: gui/options.cpp:742
+#: gui/options.cpp:727
msgid "Graphics mode:"
msgstr "Grafikmodus:"
-#: gui/options.cpp:756
+#: gui/options.cpp:741
msgid "Render mode:"
msgstr "Render-Modus:"
-#: gui/options.cpp:756 gui/options.cpp:757
+#: gui/options.cpp:741 gui/options.cpp:742
msgid "Special dithering modes supported by some games"
msgstr ""
"Spezielle Farbmischungsmethoden werden von manchen Spielen unterstќtzt."
-#: gui/options.cpp:768
+#: gui/options.cpp:753
#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2248
#: backends/graphics/openglsdl/openglsdl-graphics.cpp:472
msgid "Fullscreen mode"
msgstr "Vollbildmodus"
-#: gui/options.cpp:771
+#: gui/options.cpp:756
msgid "Aspect ratio correction"
msgstr "Seitenverhфltnis korrigieren"
-#: gui/options.cpp:771
+#: gui/options.cpp:756
msgid "Correct aspect ratio for 320x200 games"
msgstr "Seitenverhфltnis fќr Spiele mit der Auflіsung 320x200 korrigieren"
-#: gui/options.cpp:772
-msgid "EGA undithering"
-msgstr "Antifehlerdiffusion fќr EGA"
-
-#: gui/options.cpp:772
-msgid "Enable undithering in EGA games that support it"
-msgstr ""
-"Aktiviert die Aufhebung der Fehlerdiffusion in EGA-Spielen, die dies "
-"unterstќtzen."
-
-#: gui/options.cpp:780
+#: gui/options.cpp:764
msgid "Preferred Device:"
msgstr "Standard-Gerфt:"
-#: gui/options.cpp:780
+#: gui/options.cpp:764
msgid "Music Device:"
msgstr "Musikgerфt:"
-#: gui/options.cpp:780 gui/options.cpp:782
+#: gui/options.cpp:764 gui/options.cpp:766
msgid "Specifies preferred sound device or sound card emulator"
msgstr ""
"Legt das bevorzugte Tonwiedergabe-Gerфt oder den Soundkarten-Emulator fest."
-#: gui/options.cpp:780 gui/options.cpp:782 gui/options.cpp:783
+#: gui/options.cpp:764 gui/options.cpp:766 gui/options.cpp:767
msgid "Specifies output sound device or sound card emulator"
msgstr "Legt das Musikwiedergabe-Gerфt oder den Soundkarten-Emulator fest."
-#: gui/options.cpp:782
+#: gui/options.cpp:766
msgctxt "lowres"
msgid "Preferred Dev.:"
msgstr "Standard-Gerфt:"
-#: gui/options.cpp:782
+#: gui/options.cpp:766
msgctxt "lowres"
msgid "Music Device:"
msgstr "Musikgerфt:"
-#: gui/options.cpp:809
+#: gui/options.cpp:793
msgid "AdLib emulator:"
msgstr "AdLib-Emulator"
-#: gui/options.cpp:809 gui/options.cpp:810
+#: gui/options.cpp:793 gui/options.cpp:794
msgid "AdLib is used for music in many games"
msgstr "AdLib wird fќr die Musik in vielen Spielen verwendet."
-#: gui/options.cpp:820
+#: gui/options.cpp:804
msgid "Output rate:"
msgstr "Ausgabefrequenz:"
-#: gui/options.cpp:820 gui/options.cpp:821
+#: gui/options.cpp:804 gui/options.cpp:805
msgid ""
"Higher value specifies better sound quality but may be not supported by your "
"soundcard"
@@ -678,64 +673,64 @@ msgstr ""
"Hіhere Werte bewirken eine bessere Soundqualitфt, werden aber mіglicherweise "
"nicht von jeder Soundkarte unterstќtzt."
-#: gui/options.cpp:831
+#: gui/options.cpp:815
msgid "GM Device:"
msgstr "GM-Gerфt:"
-#: gui/options.cpp:831
+#: gui/options.cpp:815
msgid "Specifies default sound device for General MIDI output"
msgstr ""
"Legt das standardmфпige Musikwiedergabe-Gerфt fќr General-MIDI-Ausgabe fest."
-#: gui/options.cpp:842
+#: gui/options.cpp:826
msgid "Don't use General MIDI music"
msgstr "Keine General-MIDI-Musik"
-#: gui/options.cpp:853 gui/options.cpp:915
+#: gui/options.cpp:837 gui/options.cpp:899
msgid "Use first available device"
msgstr "Erstes verfќgbares Gerфt"
-#: gui/options.cpp:865
+#: gui/options.cpp:849
msgid "SoundFont:"
msgstr "SoundFont:"
-#: gui/options.cpp:865 gui/options.cpp:867 gui/options.cpp:868
+#: gui/options.cpp:849 gui/options.cpp:851 gui/options.cpp:852
msgid "SoundFont is supported by some audio cards, Fluidsynth and Timidity"
msgstr ""
"SoundFont wird von einigen Soundkarten, Fluidsynth und Timidity unterstќtzt."
-#: gui/options.cpp:867
+#: gui/options.cpp:851
msgctxt "lowres"
msgid "SoundFont:"
msgstr "SoundFont:"
-#: gui/options.cpp:873
+#: gui/options.cpp:857
msgid "Mixed AdLib/MIDI mode"
msgstr "AdLib-/MIDI-Modus"
-#: gui/options.cpp:873
+#: gui/options.cpp:857
msgid "Use both MIDI and AdLib sound generation"
msgstr "Benutzt MIDI und AdLib zur Sounderzeugung."
-#: gui/options.cpp:876
+#: gui/options.cpp:860
msgid "MIDI gain:"
msgstr "MIDI-Lautstфrke:"
-#: gui/options.cpp:886
+#: gui/options.cpp:870
msgid "MT-32 Device:"
msgstr "MT-32-Gerфt:"
-#: gui/options.cpp:886
+#: gui/options.cpp:870
msgid "Specifies default sound device for Roland MT-32/LAPC1/CM32l/CM64 output"
msgstr ""
"Legt das standardmфпige Tonwiedergabe-Gerфt fќr die Ausgabe von Roland MT-32/"
"LAPC1/CM32l/CM64 fest."
-#: gui/options.cpp:891
+#: gui/options.cpp:875
msgid "True Roland MT-32 (disable GM emulation)"
msgstr "Echte Roland-MT-32-Emulation (GM-Emulation deaktiviert)"
-#: gui/options.cpp:891 gui/options.cpp:893
+#: gui/options.cpp:875 gui/options.cpp:877
msgid ""
"Check if you want to use your real hardware Roland-compatible sound device "
"connected to your computer"
@@ -743,197 +738,197 @@ msgstr ""
"Wфhlen Sie dies aus, wenn Sie Ihre echte Hardware, die mit einer Roland-"
"kompatiblen Soundkarte verbunden ist, verwenden mіchten."
-#: gui/options.cpp:893
+#: gui/options.cpp:877
msgctxt "lowres"
msgid "True Roland MT-32 (no GM emulation)"
msgstr "Echte Roland-MT-32-Emulation (kein GM)"
-#: gui/options.cpp:896
+#: gui/options.cpp:880
msgid "Enable Roland GS Mode"
msgstr "Roland-GS-Modus"
-#: gui/options.cpp:896
+#: gui/options.cpp:880
msgid "Turns off General MIDI mapping for games with Roland MT-32 soundtrack"
msgstr ""
"Schaltet die General-MIDI-Zuweisung fќr Spiele mit Roland-MT-32-Audiospur "
"aus."
-#: gui/options.cpp:905
+#: gui/options.cpp:889
msgid "Don't use Roland MT-32 music"
msgstr "Keine Roland-MT-32-Musik"
-#: gui/options.cpp:932
+#: gui/options.cpp:916
msgid "Text and Speech:"
msgstr "Sprache und Text:"
-#: gui/options.cpp:936 gui/options.cpp:946
+#: gui/options.cpp:920 gui/options.cpp:930
msgid "Speech"
msgstr "Sprache"
-#: gui/options.cpp:937 gui/options.cpp:947
+#: gui/options.cpp:921 gui/options.cpp:931
msgid "Subtitles"
msgstr "Untertitel"
-#: gui/options.cpp:938
+#: gui/options.cpp:922
msgid "Both"
msgstr "Beides"
-#: gui/options.cpp:940
+#: gui/options.cpp:924
msgid "Subtitle speed:"
msgstr "Untertitel-Tempo:"
-#: gui/options.cpp:942
+#: gui/options.cpp:926
msgctxt "lowres"
msgid "Text and Speech:"
msgstr "Sprache + Text:"
-#: gui/options.cpp:946
+#: gui/options.cpp:930
msgid "Spch"
msgstr "Spr."
-#: gui/options.cpp:947
+#: gui/options.cpp:931
msgid "Subs"
msgstr "TXT"
-#: gui/options.cpp:948
+#: gui/options.cpp:932
msgctxt "lowres"
msgid "Both"
msgstr "S+T"
-#: gui/options.cpp:948
+#: gui/options.cpp:932
msgid "Show subtitles and play speech"
msgstr "Untertitel anzeigen und Sprachausgabe aktivieren"
-#: gui/options.cpp:950
+#: gui/options.cpp:934
msgctxt "lowres"
msgid "Subtitle speed:"
msgstr "Text-Tempo:"
-#: gui/options.cpp:966
+#: gui/options.cpp:950
msgid "Music volume:"
msgstr "Musiklautstфrke:"
-#: gui/options.cpp:968
+#: gui/options.cpp:952
msgctxt "lowres"
msgid "Music volume:"
msgstr "Musiklautstфrke:"
-#: gui/options.cpp:975
+#: gui/options.cpp:959
msgid "Mute All"
msgstr "Alles aus"
-#: gui/options.cpp:978
+#: gui/options.cpp:962
msgid "SFX volume:"
msgstr "Effektlautstфrke:"
-#: gui/options.cpp:978 gui/options.cpp:980 gui/options.cpp:981
+#: gui/options.cpp:962 gui/options.cpp:964 gui/options.cpp:965
msgid "Special sound effects volume"
msgstr "Lautstфrke spezieller Soundeffekte"
-#: gui/options.cpp:980
+#: gui/options.cpp:964
msgctxt "lowres"
msgid "SFX volume:"
msgstr "Effektlautst.:"
-#: gui/options.cpp:988
+#: gui/options.cpp:972
msgid "Speech volume:"
msgstr "Sprachlautstфrke:"
-#: gui/options.cpp:990
+#: gui/options.cpp:974
msgctxt "lowres"
msgid "Speech volume:"
msgstr "Sprachlautst.:"
-#: gui/options.cpp:1156
+#: gui/options.cpp:1131
msgid "Theme Path:"
msgstr "Themenpfad:"
-#: gui/options.cpp:1158
+#: gui/options.cpp:1133
msgctxt "lowres"
msgid "Theme Path:"
msgstr "Themenpfad:"
-#: gui/options.cpp:1164 gui/options.cpp:1166 gui/options.cpp:1167
+#: gui/options.cpp:1139 gui/options.cpp:1141 gui/options.cpp:1142
msgid "Specifies path to additional data used by all games or ScummVM"
msgstr ""
"Legt das Verzeichnis fќr zusфtzliche Spieldateien fќr alle Spiele in ScummVM "
"fest."
-#: gui/options.cpp:1173
+#: gui/options.cpp:1148
msgid "Plugins Path:"
msgstr "Plugin-Pfad:"
-#: gui/options.cpp:1175
+#: gui/options.cpp:1150
msgctxt "lowres"
msgid "Plugins Path:"
msgstr "Plugin-Pfad:"
-#: gui/options.cpp:1184
+#: gui/options.cpp:1159
msgid "Misc"
msgstr "Sonstiges"
-#: gui/options.cpp:1186
+#: gui/options.cpp:1161
msgctxt "lowres"
msgid "Misc"
msgstr "Andere"
-#: gui/options.cpp:1188
+#: gui/options.cpp:1163
msgid "Theme:"
msgstr "Thema:"
-#: gui/options.cpp:1192
+#: gui/options.cpp:1167
msgid "GUI Renderer:"
msgstr "GUI-Renderer:"
-#: gui/options.cpp:1204
+#: gui/options.cpp:1179
msgid "Autosave:"
msgstr "Autom. Speichern:"
-#: gui/options.cpp:1206
+#: gui/options.cpp:1181
msgctxt "lowres"
msgid "Autosave:"
msgstr "Speich.(auto)"
-#: gui/options.cpp:1214
+#: gui/options.cpp:1189
msgid "Keys"
msgstr "Tasten"
-#: gui/options.cpp:1221
+#: gui/options.cpp:1196
msgid "GUI Language:"
msgstr "Sprache:"
-#: gui/options.cpp:1221
+#: gui/options.cpp:1196
msgid "Language of ScummVM GUI"
msgstr "Sprache der ScummVM-Oberflфche"
-#: gui/options.cpp:1372
+#: gui/options.cpp:1347
msgid "You have to restart ScummVM before your changes will take effect."
msgstr "Sie mќssen ScummVM neu starten, damit die Фnderungen wirksam werden."
-#: gui/options.cpp:1385
+#: gui/options.cpp:1360
msgid "Select directory for savegames"
msgstr "Verzeichnis fќr Spielstфnde auswфhlen"
-#: gui/options.cpp:1392
+#: gui/options.cpp:1367
msgid "The chosen directory cannot be written to. Please select another one."
msgstr ""
"In das gewфhlte Verzeichnis kann nicht geschrieben werden. Bitte ein anderes "
"auswфhlen."
-#: gui/options.cpp:1401
+#: gui/options.cpp:1376
msgid "Select directory for GUI themes"
msgstr "Verzeichnis fќr Oberflфchen-Themen"
-#: gui/options.cpp:1411
+#: gui/options.cpp:1386
msgid "Select directory for extra files"
msgstr "Verzeichnis fќr zusфtzliche Dateien auswфhlen"
-#: gui/options.cpp:1422
+#: gui/options.cpp:1397
msgid "Select directory for plugins"
msgstr "Verzeichnis fќr Erweiterungen auswфhlen"
# Nicht ќbersetzen, da diese Nachricht nur fќr nicht-lateinische Sprachen relevant ist.
-#: gui/options.cpp:1475
+#: gui/options.cpp:1450
msgid ""
"The theme you selected does not support your current language. If you want "
"to use this theme you need to switch to another language first."
@@ -979,64 +974,64 @@ msgstr "Unbenannt"
msgid "Select a Theme"
msgstr "Thema auswфhlen"
-#: gui/ThemeEngine.cpp:333
+#: gui/ThemeEngine.cpp:335
msgid "Disabled GFX"
msgstr "GFX ausgeschaltet"
-#: gui/ThemeEngine.cpp:333
+#: gui/ThemeEngine.cpp:335
msgctxt "lowres"
msgid "Disabled GFX"
msgstr "GFX ausgeschaltet"
-#: gui/ThemeEngine.cpp:334
+#: gui/ThemeEngine.cpp:336
msgid "Standard Renderer (16bpp)"
msgstr "Standard-Renderer (16bpp)"
-#: gui/ThemeEngine.cpp:334
+#: gui/ThemeEngine.cpp:336
msgid "Standard (16bpp)"
msgstr "Standard (16bpp)"
-#: gui/ThemeEngine.cpp:336
+#: gui/ThemeEngine.cpp:338
msgid "Antialiased Renderer (16bpp)"
msgstr "Kantenglфttung (16bpp)"
-#: gui/ThemeEngine.cpp:336
+#: gui/ThemeEngine.cpp:338
msgid "Antialiased (16bpp)"
msgstr "Kantenglфttung (16bpp)"
-#: gui/widget.cpp:312 gui/widget.cpp:314 gui/widget.cpp:320 gui/widget.cpp:322
+#: gui/widget.cpp:322 gui/widget.cpp:324 gui/widget.cpp:330 gui/widget.cpp:332
msgid "Clear value"
msgstr "Wert lіschen"
-#: base/main.cpp:203
+#: base/main.cpp:209
#, c-format
msgid "Engine does not support debug level '%s'"
msgstr "Engine unterstќtzt den Debug-Level \"%s\" nicht."
-#: base/main.cpp:275
+#: base/main.cpp:287
msgid "Menu"
msgstr "Menќ"
-#: base/main.cpp:278 backends/platform/symbian/src/SymbianActions.cpp:45
+#: base/main.cpp:290 backends/platform/symbian/src/SymbianActions.cpp:45
#: backends/platform/wince/CEActionsPocket.cpp:45
#: backends/platform/wince/CEActionsSmartphone.cpp:46
msgid "Skip"
msgstr "мberspringen"
-#: base/main.cpp:281 backends/platform/symbian/src/SymbianActions.cpp:50
+#: base/main.cpp:293 backends/platform/symbian/src/SymbianActions.cpp:50
#: backends/platform/wince/CEActionsPocket.cpp:42
msgid "Pause"
msgstr "Pause"
-#: base/main.cpp:284
+#: base/main.cpp:296
msgid "Skip line"
msgstr "Zeile ќberspringen"
-#: base/main.cpp:455
+#: base/main.cpp:467
msgid "Error running game:"
msgstr "Fehler beim Ausfќhren des Spiels:"
-#: base/main.cpp:479
+#: base/main.cpp:491
msgid "Could not find any engine capable of running the selected game"
msgstr "Konnte keine Spiel-Engine finden, die dieses Spiel starten kann."
@@ -1104,18 +1099,18 @@ msgstr "Abbruch durch Benutzer"
msgid "Unknown error"
msgstr "Unbekannter Fehler"
-#: engines/advancedDetector.cpp:296
+#: engines/advancedDetector.cpp:324
#, c-format
msgid "The game in '%s' seems to be unknown."
msgstr "Das Spiel im Verzeichnis \"%s\" scheint nicht bekannt zu sein."
-#: engines/advancedDetector.cpp:297
+#: engines/advancedDetector.cpp:325
msgid "Please, report the following data to the ScummVM team along with name"
msgstr ""
"Bitte geben Sie die folgenden Daten auf Englisch an das ScummVM-Team weiter "
"sowie"
-#: engines/advancedDetector.cpp:299
+#: engines/advancedDetector.cpp:327
msgid "of the game you tried to add and its version/language/etc.:"
msgstr ""
"den Namen des Spiels, das Sie hinzufќgen wollten, als auch die Version/"
@@ -1154,13 +1149,14 @@ msgctxt "lowres"
msgid "~R~eturn to Launcher"
msgstr "Zur Spiele~l~iste"
-#: engines/dialogs.cpp:116 engines/cruise/menu.cpp:214
-#: engines/sci/engine/kfile.cpp:566
+#: engines/dialogs.cpp:116 engines/agi/saveload.cpp:805
+#: engines/cruise/menu.cpp:214 engines/sci/engine/kfile.cpp:567
msgid "Save game:"
msgstr "Speichern:"
-#: engines/dialogs.cpp:116 engines/scumm/dialogs.cpp:187
-#: engines/cruise/menu.cpp:214 engines/sci/engine/kfile.cpp:566
+#: engines/dialogs.cpp:116 engines/agi/saveload.cpp:805
+#: engines/scumm/dialogs.cpp:187 engines/cruise/menu.cpp:214
+#: engines/sci/engine/kfile.cpp:567
#: backends/platform/symbian/src/SymbianActions.cpp:44
#: backends/platform/wince/CEActionsPocket.cpp:43
#: backends/platform/wince/CEActionsPocket.cpp:267
@@ -1275,6 +1271,90 @@ msgstr ""
msgid "Start anyway"
msgstr "Trotzdem starten"
+#: engines/agi/detection.cpp:145 engines/dreamweb/detection.cpp:47
+#: engines/sci/detection.cpp:390
+msgid "Use original save/load screens"
+msgstr ""
+
+#: engines/agi/detection.cpp:146 engines/dreamweb/detection.cpp:48
+#: engines/sci/detection.cpp:391
+msgid "Use the original save/load screens, instead of the ScummVM ones"
+msgstr ""
+
+#: engines/agi/saveload.cpp:827 engines/sci/engine/kfile.cpp:674
+msgid "Restore game:"
+msgstr "Spiel laden:"
+
+#: engines/agi/saveload.cpp:827 engines/sci/engine/kfile.cpp:674
+msgid "Restore"
+msgstr "Laden"
+
+#: engines/dreamweb/detection.cpp:57
+#, fuzzy
+msgid "Use bright palette mode"
+msgstr "Oberer rechter Gegenstand"
+
+#: engines/dreamweb/detection.cpp:58
+msgid "Display graphics using the game's bright palette"
+msgstr ""
+
+#: engines/sci/detection.cpp:370
+msgid "EGA undithering"
+msgstr "Antifehlerdiffusion fќr EGA"
+
+#: engines/sci/detection.cpp:371
+#, fuzzy
+msgid "Enable undithering in EGA games"
+msgstr ""
+"Aktiviert die Aufhebung der Fehlerdiffusion in EGA-Spielen, die dies "
+"unterstќtzen."
+
+#: engines/sci/detection.cpp:380
+#, fuzzy
+msgid "Prefer digital sound effects"
+msgstr "Lautstфrke spezieller Soundeffekte"
+
+#: engines/sci/detection.cpp:381
+msgid "Prefer digital sound effects instead of synthesized ones"
+msgstr ""
+
+#: engines/sci/detection.cpp:400
+msgid "Use IMF/Yahama FB-01 for MIDI output"
+msgstr ""
+
+#: engines/sci/detection.cpp:401
+msgid ""
+"Use an IBM Music Feature card or a Yahama FB-01 FM synth module for MIDI "
+"output"
+msgstr ""
+
+#: engines/sci/detection.cpp:411
+msgid "Use CD audio"
+msgstr ""
+
+#: engines/sci/detection.cpp:412
+msgid "Use CD audio instead of in-game audio, if available"
+msgstr ""
+
+#: engines/sci/detection.cpp:422
+msgid "Use Windows cursors"
+msgstr ""
+
+#: engines/sci/detection.cpp:423
+msgid ""
+"Use the Windows cursors (smaller and monochrome) instead of the DOS ones"
+msgstr ""
+
+#: engines/sci/detection.cpp:433
+#, fuzzy
+msgid "Use silver cursors"
+msgstr "Normaler Mauszeiger"
+
+#: engines/sci/detection.cpp:434
+msgid ""
+"Use the alternate set of silver cursors, instead of the normal golden ones"
+msgstr ""
+
#: engines/scumm/dialogs.cpp:175
#, c-format
msgid "Insert Disk %c and Press Button to Continue."
@@ -1931,7 +2011,7 @@ msgstr ""
"Systemeigene MIDI-мnterstќtzung erfordert das Roland-Upgrade von LucasArts,\n"
"aber %s fehlt. Stattdessen wird AdLib verwendet."
-#: engines/scumm/scumm.cpp:2271 engines/agos/saveload.cpp:189
+#: engines/scumm/scumm.cpp:2271 engines/agos/saveload.cpp:202
#, c-format
msgid ""
"Failed to save game state to file:\n"
@@ -1942,7 +2022,7 @@ msgstr ""
"\n"
"%s"
-#: engines/scumm/scumm.cpp:2278 engines/agos/saveload.cpp:154
+#: engines/scumm/scumm.cpp:2278 engines/agos/saveload.cpp:167
#, c-format
msgid ""
"Failed to load game state from file:\n"
@@ -1953,7 +2033,7 @@ msgstr ""
"\n"
"%s"
-#: engines/scumm/scumm.cpp:2290 engines/agos/saveload.cpp:197
+#: engines/scumm/scumm.cpp:2290 engines/agos/saveload.cpp:210
#, c-format
msgid ""
"Successfully saved game state in file:\n"
@@ -2001,14 +2081,6 @@ msgstr "Haupt~m~enќ"
msgid "~W~ater Effect Enabled"
msgstr "~W~assereffekt aktiviert"
-#: engines/sci/engine/kfile.cpp:673
-msgid "Restore game:"
-msgstr "Spiel laden:"
-
-#: engines/sci/engine/kfile.cpp:673
-msgid "Restore"
-msgstr "Laden"
-
#: engines/agos/animation.cpp:550
#, c-format
msgid "Cutscene file '%s' not found!"
@@ -2031,6 +2103,66 @@ msgstr "Konnte Datei nicht lіschen."
msgid "Failed to save game"
msgstr "Konnte Spielstand nicht speichern."
+#. I18N: Studio audience adds an applause and cheering sounds whenever
+#. Malcolm makes a joke.
+#: engines/kyra/detection.cpp:62
+msgid "Studio audience"
+msgstr ""
+
+#: engines/kyra/detection.cpp:63
+msgid "Enable studio audience"
+msgstr ""
+
+#. I18N: This option allows the user to skip text and cutscenes.
+#: engines/kyra/detection.cpp:73
+msgid "Skip support"
+msgstr ""
+
+#: engines/kyra/detection.cpp:74
+msgid "Allow text and cutscenes to be skipped"
+msgstr ""
+
+#. I18N: Helium mode makes people sound like they've inhaled Helium.
+#: engines/kyra/detection.cpp:84
+msgid "Helium mode"
+msgstr ""
+
+#: engines/kyra/detection.cpp:85
+#, fuzzy
+msgid "Enable helium mode"
+msgstr "Roland-GS-Modus"
+
+#. I18N: When enabled, this option makes scrolling smoother when
+#. changing from one screen to another.
+#: engines/kyra/detection.cpp:99
+msgid "Smooth scrolling"
+msgstr ""
+
+#: engines/kyra/detection.cpp:100
+msgid "Enable smooth scrolling when walking"
+msgstr ""
+
+#. I18N: When enabled, this option changes the cursor when it floats to the
+#. edge of the screen to a directional arrow. The player can then click to
+#. walk towards that direction.
+#: engines/kyra/detection.cpp:112
+#, fuzzy
+msgid "Floating cursors"
+msgstr "Normaler Mauszeiger"
+
+#: engines/kyra/detection.cpp:113
+msgid "Enable floating cursors"
+msgstr ""
+
+#. I18N: HP stands for Hit Points
+#: engines/kyra/detection.cpp:127
+msgid "HP bar graphs"
+msgstr ""
+
+#: engines/kyra/detection.cpp:128
+msgid "Enable hit point bar graphs"
+msgstr ""
+
#: engines/kyra/lol.cpp:478
msgid "Attack 1"
msgstr "Attacke 1"
@@ -2094,6 +2226,14 @@ msgstr ""
"zuzuordnen. Es kann jedoch vorkommen, dass ein\n"
"paar Musikstќcke nicht richtig abgespielt werden."
+#: engines/queen/queen.cpp:59 engines/sky/detection.cpp:44
+msgid "Floppy intro"
+msgstr ""
+
+#: engines/queen/queen.cpp:60 engines/sky/detection.cpp:45
+msgid "Use the floppy version's intro (CD version only)"
+msgstr ""
+
#: engines/sky/compact.cpp:130
msgid ""
"Unable to find \"sky.cpt\" file!\n"
@@ -2179,6 +2319,14 @@ msgstr ""
"DXA-Zwischensequenzen gefunden, aber ScummVM wurde ohne Zlib-Unterstќtzung "
"erstellt."
+#: engines/sword2/sword2.cpp:79
+msgid "Show object labels"
+msgstr ""
+
+#: engines/sword2/sword2.cpp:80
+msgid "Show labels for objects on mouse hover"
+msgstr ""
+
#: engines/parallaction/saveload.cpp:133
#, c-format
msgid ""
@@ -2415,19 +2563,19 @@ msgstr "Hohe Audioqualitфt (lansamer) (erfordert Neustart)"
msgid "Disable power off"
msgstr "Stromsparmodus abschalten"
-#: backends/platform/iphone/osys_events.cpp:301
+#: backends/platform/iphone/osys_events.cpp:300
msgid "Mouse-click-and-drag mode enabled."
msgstr "Maus-klick-und-zieh-Modus aktiviert."
-#: backends/platform/iphone/osys_events.cpp:303
+#: backends/platform/iphone/osys_events.cpp:302
msgid "Mouse-click-and-drag mode disabled."
msgstr "Maus-klick-und-zieh-Modus ausgeschaltet."
-#: backends/platform/iphone/osys_events.cpp:314
+#: backends/platform/iphone/osys_events.cpp:313
msgid "Touchpad mode enabled."
msgstr "Touchpad-Modus aktiviert."
-#: backends/platform/iphone/osys_events.cpp:316
+#: backends/platform/iphone/osys_events.cpp:315
msgid "Touchpad mode disabled."
msgstr "Touchpad-Modus ausgeschaltet."
@@ -2504,15 +2652,15 @@ msgstr "Aktiver Grafikfilter:"
msgid "Windowed mode"
msgstr "Fenstermodus"
-#: backends/graphics/opengl/opengl-graphics.cpp:130
+#: backends/graphics/opengl/opengl-graphics.cpp:135
msgid "OpenGL Normal"
msgstr "OpenGL: normal"
-#: backends/graphics/opengl/opengl-graphics.cpp:131
+#: backends/graphics/opengl/opengl-graphics.cpp:136
msgid "OpenGL Conserve"
msgstr "OpenGL: beibehalten"
-#: backends/graphics/opengl/opengl-graphics.cpp:132
+#: backends/graphics/opengl/opengl-graphics.cpp:137
msgid "OpenGL Original"
msgstr "OpenGL: original"
diff --git a/po/es_ES.po b/po/es_ES.po
index 2be6dd051c..366dcf4905 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ScummVM 1.4.0svn\n"
"Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n"
-"POT-Creation-Date: 2012-03-07 22:09+0000\n"
+"POT-Creation-Date: 2012-05-20 22:39+0100\n"
"PO-Revision-Date: 2011-10-23 21:53+0100\n"
"Last-Translator: Tomсs Maidagan\n"
"Language-Team: \n"
@@ -43,7 +43,7 @@ msgid "Go up"
msgstr "Arriba"
#: gui/browser.cpp:69 gui/chooser.cpp:45 gui/KeysDialog.cpp:43
-#: gui/launcher.cpp:320 gui/massadd.cpp:94 gui/options.cpp:1253
+#: gui/launcher.cpp:345 gui/massadd.cpp:94 gui/options.cpp:1228
#: gui/saveload.cpp:63 gui/saveload.cpp:155 gui/themebrowser.cpp:54
#: engines/engine.cpp:442 engines/scumm/dialogs.cpp:190
#: engines/sword1/control.cpp:865 engines/parallaction/saveload.cpp:281
@@ -68,15 +68,15 @@ msgstr "Cerrar"
msgid "Mouse click"
msgstr "Clic de ratѓn"
-#: gui/gui-manager.cpp:122 base/main.cpp:288
+#: gui/gui-manager.cpp:122 base/main.cpp:300
msgid "Display keyboard"
msgstr "Mostrar el teclado"
-#: gui/gui-manager.cpp:126 base/main.cpp:292
+#: gui/gui-manager.cpp:126 base/main.cpp:304
msgid "Remap keys"
msgstr "Asignar teclas"
-#: gui/gui-manager.cpp:129 base/main.cpp:295
+#: gui/gui-manager.cpp:129 base/main.cpp:307
#, fuzzy
msgid "Toggle FullScreen"
msgstr "Activar pantalla completa"
@@ -89,8 +89,8 @@ msgstr "Elige la acciѓn a asociar"
msgid "Map"
msgstr "Asignar"
-#: gui/KeysDialog.cpp:42 gui/launcher.cpp:321 gui/launcher.cpp:960
-#: gui/launcher.cpp:964 gui/massadd.cpp:91 gui/options.cpp:1254
+#: gui/KeysDialog.cpp:42 gui/launcher.cpp:346 gui/launcher.cpp:1001
+#: gui/launcher.cpp:1005 gui/massadd.cpp:91 gui/options.cpp:1229
#: engines/engine.cpp:361 engines/engine.cpp:372 engines/scumm/dialogs.cpp:192
#: engines/scumm/scumm.cpp:1775 engines/agos/animation.cpp:551
#: engines/groovie/script.cpp:420 engines/sky/compact.cpp:131
@@ -127,15 +127,15 @@ msgstr "Por favor, selecciona una acciѓn"
msgid "Press the key to associate"
msgstr "Pulsa la tecla a asignar"
-#: gui/launcher.cpp:170
+#: gui/launcher.cpp:187
msgid "Game"
msgstr "Juego"
-#: gui/launcher.cpp:174
+#: gui/launcher.cpp:191
msgid "ID:"
msgstr "ID:"
-#: gui/launcher.cpp:174 gui/launcher.cpp:176 gui/launcher.cpp:177
+#: gui/launcher.cpp:191 gui/launcher.cpp:193 gui/launcher.cpp:194
msgid ""
"Short game identifier used for referring to savegames and running the game "
"from the command line"
@@ -143,29 +143,29 @@ msgstr ""
"Identificador usado para las partidas guardadas y para ejecutar el juego "
"desde la lэnea de comando"
-#: gui/launcher.cpp:176
+#: gui/launcher.cpp:193
msgctxt "lowres"
msgid "ID:"
msgstr "ID:"
-#: gui/launcher.cpp:181
+#: gui/launcher.cpp:198
msgid "Name:"
msgstr "Nombre:"
-#: gui/launcher.cpp:181 gui/launcher.cpp:183 gui/launcher.cpp:184
+#: gui/launcher.cpp:198 gui/launcher.cpp:200 gui/launcher.cpp:201
msgid "Full title of the game"
msgstr "Tэtulo completo del juego"
-#: gui/launcher.cpp:183
+#: gui/launcher.cpp:200
msgctxt "lowres"
msgid "Name:"
msgstr "Nom.:"
-#: gui/launcher.cpp:187
+#: gui/launcher.cpp:204
msgid "Language:"
msgstr "Idioma:"
-#: gui/launcher.cpp:187 gui/launcher.cpp:188
+#: gui/launcher.cpp:204 gui/launcher.cpp:205
msgid ""
"Language of the game. This will not turn your Spanish game version into "
"English"
@@ -173,280 +173,285 @@ msgstr ""
"Idioma del juego. No sirve para pasar al inglщs la versiѓn espaёola de un "
"juego"
-#: gui/launcher.cpp:189 gui/launcher.cpp:203 gui/options.cpp:80
-#: gui/options.cpp:745 gui/options.cpp:758 gui/options.cpp:1224
+#: gui/launcher.cpp:206 gui/launcher.cpp:220 gui/options.cpp:80
+#: gui/options.cpp:730 gui/options.cpp:743 gui/options.cpp:1199
#: audio/null.cpp:40
msgid "<default>"
msgstr "<por defecto>"
-#: gui/launcher.cpp:199
+#: gui/launcher.cpp:216
msgid "Platform:"
msgstr "Plataforma:"
-#: gui/launcher.cpp:199 gui/launcher.cpp:201 gui/launcher.cpp:202
+#: gui/launcher.cpp:216 gui/launcher.cpp:218 gui/launcher.cpp:219
msgid "Platform the game was originally designed for"
msgstr "Plataforma para la que se diseёѓ el juego"
-#: gui/launcher.cpp:201
+#: gui/launcher.cpp:218
msgctxt "lowres"
msgid "Platform:"
msgstr "Plat.:"
-#: gui/launcher.cpp:213 gui/options.cpp:1087 gui/options.cpp:1104
+#: gui/launcher.cpp:231
+#, fuzzy
+msgid "Engine"
+msgstr "Examinar"
+
+#: gui/launcher.cpp:239 gui/options.cpp:1062 gui/options.cpp:1079
msgid "Graphics"
msgstr "Grсficos"
-#: gui/launcher.cpp:213 gui/options.cpp:1087 gui/options.cpp:1104
+#: gui/launcher.cpp:239 gui/options.cpp:1062 gui/options.cpp:1079
msgid "GFX"
msgstr "GFX"
-#: gui/launcher.cpp:216
+#: gui/launcher.cpp:242
msgid "Override global graphic settings"
msgstr "Ignorar opciones grсficas generales"
-#: gui/launcher.cpp:218
+#: gui/launcher.cpp:244
msgctxt "lowres"
msgid "Override global graphic settings"
msgstr "Opciones grсficas especэficas"
-#: gui/launcher.cpp:225 gui/options.cpp:1110
+#: gui/launcher.cpp:251 gui/options.cpp:1085
msgid "Audio"
msgstr "Sonido"
-#: gui/launcher.cpp:228
+#: gui/launcher.cpp:254
msgid "Override global audio settings"
msgstr "Ignorar opciones de sonido generales"
-#: gui/launcher.cpp:230
+#: gui/launcher.cpp:256
msgctxt "lowres"
msgid "Override global audio settings"
msgstr "Opciones de sonido especэficas"
-#: gui/launcher.cpp:239 gui/options.cpp:1115
+#: gui/launcher.cpp:265 gui/options.cpp:1090
msgid "Volume"
msgstr "Volumen"
-#: gui/launcher.cpp:241 gui/options.cpp:1117
+#: gui/launcher.cpp:267 gui/options.cpp:1092
msgctxt "lowres"
msgid "Volume"
msgstr "Volumen"
-#: gui/launcher.cpp:244
+#: gui/launcher.cpp:270
msgid "Override global volume settings"
msgstr "Ignorar opciones de volumen generales"
-#: gui/launcher.cpp:246
+#: gui/launcher.cpp:272
msgctxt "lowres"
msgid "Override global volume settings"
msgstr "Opciones de volumen especэficas"
-#: gui/launcher.cpp:254 gui/options.cpp:1125
+#: gui/launcher.cpp:280 gui/options.cpp:1100
msgid "MIDI"
msgstr "MIDI"
-#: gui/launcher.cpp:257
+#: gui/launcher.cpp:283
msgid "Override global MIDI settings"
msgstr "Ignorar opciones de MIDI generales"
-#: gui/launcher.cpp:259
+#: gui/launcher.cpp:285
msgctxt "lowres"
msgid "Override global MIDI settings"
msgstr "Opciones de MIDI especэficas"
-#: gui/launcher.cpp:268 gui/options.cpp:1131
+#: gui/launcher.cpp:294 gui/options.cpp:1106
msgid "MT-32"
msgstr "MT-32"
-#: gui/launcher.cpp:271
+#: gui/launcher.cpp:297
msgid "Override global MT-32 settings"
msgstr "Ignorar opciones de MT-32 generales"
-#: gui/launcher.cpp:273
+#: gui/launcher.cpp:299
msgctxt "lowres"
msgid "Override global MT-32 settings"
msgstr "Opciones de MT-32 especэficas"
-#: gui/launcher.cpp:282 gui/options.cpp:1138
+#: gui/launcher.cpp:308 gui/options.cpp:1113
msgid "Paths"
msgstr "Rutas"
-#: gui/launcher.cpp:284 gui/options.cpp:1140
+#: gui/launcher.cpp:310 gui/options.cpp:1115
msgctxt "lowres"
msgid "Paths"
msgstr "Rutas"
-#: gui/launcher.cpp:291
+#: gui/launcher.cpp:317
msgid "Game Path:"
msgstr "Juego:"
-#: gui/launcher.cpp:293
+#: gui/launcher.cpp:319
msgctxt "lowres"
msgid "Game Path:"
msgstr "Juego:"
-#: gui/launcher.cpp:298 gui/options.cpp:1164
+#: gui/launcher.cpp:324 gui/options.cpp:1139
msgid "Extra Path:"
msgstr "Adicional:"
-#: gui/launcher.cpp:298 gui/launcher.cpp:300 gui/launcher.cpp:301
+#: gui/launcher.cpp:324 gui/launcher.cpp:326 gui/launcher.cpp:327
msgid "Specifies path to additional data used the game"
msgstr "Especifica un directorio para datos adicionales del juego"
-#: gui/launcher.cpp:300 gui/options.cpp:1166
+#: gui/launcher.cpp:326 gui/options.cpp:1141
msgctxt "lowres"
msgid "Extra Path:"
msgstr "Adicional:"
-#: gui/launcher.cpp:307 gui/options.cpp:1148
+#: gui/launcher.cpp:333 gui/options.cpp:1123
msgid "Save Path:"
msgstr "Partidas:"
-#: gui/launcher.cpp:307 gui/launcher.cpp:309 gui/launcher.cpp:310
-#: gui/options.cpp:1148 gui/options.cpp:1150 gui/options.cpp:1151
+#: gui/launcher.cpp:333 gui/launcher.cpp:335 gui/launcher.cpp:336
+#: gui/options.cpp:1123 gui/options.cpp:1125 gui/options.cpp:1126
msgid "Specifies where your savegames are put"
msgstr "Especifica dѓnde guardar tus partidas"
-#: gui/launcher.cpp:309 gui/options.cpp:1150
+#: gui/launcher.cpp:335 gui/options.cpp:1125
msgctxt "lowres"
msgid "Save Path:"
msgstr "Partidas:"
-#: gui/launcher.cpp:329 gui/launcher.cpp:416 gui/launcher.cpp:469
-#: gui/launcher.cpp:523 gui/options.cpp:1159 gui/options.cpp:1167
-#: gui/options.cpp:1176 gui/options.cpp:1283 gui/options.cpp:1289
-#: gui/options.cpp:1297 gui/options.cpp:1327 gui/options.cpp:1333
-#: gui/options.cpp:1340 gui/options.cpp:1433 gui/options.cpp:1436
-#: gui/options.cpp:1448
+#: gui/launcher.cpp:354 gui/launcher.cpp:453 gui/launcher.cpp:511
+#: gui/launcher.cpp:565 gui/options.cpp:1134 gui/options.cpp:1142
+#: gui/options.cpp:1151 gui/options.cpp:1258 gui/options.cpp:1264
+#: gui/options.cpp:1272 gui/options.cpp:1302 gui/options.cpp:1308
+#: gui/options.cpp:1315 gui/options.cpp:1408 gui/options.cpp:1411
+#: gui/options.cpp:1423
msgctxt "path"
msgid "None"
msgstr "Ninguna"
-#: gui/launcher.cpp:334 gui/launcher.cpp:422 gui/launcher.cpp:527
-#: gui/options.cpp:1277 gui/options.cpp:1321 gui/options.cpp:1439
+#: gui/launcher.cpp:359 gui/launcher.cpp:459 gui/launcher.cpp:569
+#: gui/options.cpp:1252 gui/options.cpp:1296 gui/options.cpp:1414
#: backends/platform/wii/options.cpp:56
msgid "Default"
msgstr "Por defecto"
-#: gui/launcher.cpp:462 gui/options.cpp:1442
+#: gui/launcher.cpp:504 gui/options.cpp:1417
msgid "Select SoundFont"
msgstr "Selecciona un SoundFont"
-#: gui/launcher.cpp:481 gui/launcher.cpp:636
+#: gui/launcher.cpp:523 gui/launcher.cpp:677
msgid "Select directory with game data"
msgstr "Selecciona el directorio del juego"
-#: gui/launcher.cpp:499
+#: gui/launcher.cpp:541
msgid "Select additional game directory"
msgstr "Selecciona el directorio adicional"
-#: gui/launcher.cpp:511
+#: gui/launcher.cpp:553
msgid "Select directory for saved games"
msgstr "Selecciona el directorio para partidas guardadas"
-#: gui/launcher.cpp:538
+#: gui/launcher.cpp:580
msgid "This game ID is already taken. Please choose another one."
msgstr "Esta ID ya estс siendo usada. Por favor, elige otra."
-#: gui/launcher.cpp:579 engines/dialogs.cpp:110
+#: gui/launcher.cpp:621 engines/dialogs.cpp:110
msgid "~Q~uit"
msgstr "~S~alir"
-#: gui/launcher.cpp:579 backends/platform/sdl/macosx/appmenu_osx.mm:96
+#: gui/launcher.cpp:621 backends/platform/sdl/macosx/appmenu_osx.mm:96
msgid "Quit ScummVM"
msgstr "Salir de ScummVM"
-#: gui/launcher.cpp:580
+#: gui/launcher.cpp:622
msgid "A~b~out..."
msgstr "Acerca ~d~e"
-#: gui/launcher.cpp:580 backends/platform/sdl/macosx/appmenu_osx.mm:70
+#: gui/launcher.cpp:622 backends/platform/sdl/macosx/appmenu_osx.mm:70
msgid "About ScummVM"
msgstr "Acerca de ScummVM"
-#: gui/launcher.cpp:581
+#: gui/launcher.cpp:623
msgid "~O~ptions..."
msgstr "~O~pciones..."
-#: gui/launcher.cpp:581
+#: gui/launcher.cpp:623
msgid "Change global ScummVM options"
msgstr "Cambiar opciones generales de ScummVM"
-#: gui/launcher.cpp:583
+#: gui/launcher.cpp:625
msgid "~S~tart"
msgstr "~J~ugar"
-#: gui/launcher.cpp:583
+#: gui/launcher.cpp:625
msgid "Start selected game"
msgstr "Jugar al juego seleccionado"
-#: gui/launcher.cpp:586
+#: gui/launcher.cpp:628
msgid "~L~oad..."
msgstr "~C~argar..."
-#: gui/launcher.cpp:586
+#: gui/launcher.cpp:628
msgid "Load savegame for selected game"
msgstr "Cargar partida del juego seleccionado"
-#: gui/launcher.cpp:591 gui/launcher.cpp:1079
+#: gui/launcher.cpp:633 gui/launcher.cpp:1120
msgid "~A~dd Game..."
msgstr "~A~ёadir juego..."
-#: gui/launcher.cpp:591 gui/launcher.cpp:598
+#: gui/launcher.cpp:633 gui/launcher.cpp:640
msgid "Hold Shift for Mass Add"
msgstr "Mantener pulsado Mayњs para aёadir varios juegos"
-#: gui/launcher.cpp:593
+#: gui/launcher.cpp:635
msgid "~E~dit Game..."
msgstr "~E~ditar juego..."
-#: gui/launcher.cpp:593 gui/launcher.cpp:600
+#: gui/launcher.cpp:635 gui/launcher.cpp:642
msgid "Change game options"
msgstr "Cambiar opciones de juego"
-#: gui/launcher.cpp:595
+#: gui/launcher.cpp:637
msgid "~R~emove Game"
msgstr "E~l~iminar juego"
-#: gui/launcher.cpp:595 gui/launcher.cpp:602
+#: gui/launcher.cpp:637 gui/launcher.cpp:644
msgid "Remove game from the list. The game data files stay intact"
msgstr "Eliminar el juego de la lista. Los archivos no se borran"
-#: gui/launcher.cpp:598 gui/launcher.cpp:1079
+#: gui/launcher.cpp:640 gui/launcher.cpp:1120
msgctxt "lowres"
msgid "~A~dd Game..."
msgstr "~A~ёadir..."
-#: gui/launcher.cpp:600
+#: gui/launcher.cpp:642
msgctxt "lowres"
msgid "~E~dit Game..."
msgstr "~E~ditar..."
-#: gui/launcher.cpp:602
+#: gui/launcher.cpp:644
msgctxt "lowres"
msgid "~R~emove Game"
msgstr "E~l~iminar"
-#: gui/launcher.cpp:610
+#: gui/launcher.cpp:652
msgid "Search in game list"
msgstr "Buscar en la lista de juegos"
-#: gui/launcher.cpp:614 gui/launcher.cpp:1126
+#: gui/launcher.cpp:656 gui/launcher.cpp:1167
msgid "Search:"
msgstr "Buscar:"
-#: gui/launcher.cpp:639 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255
+#: gui/launcher.cpp:680 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255
#: engines/mohawk/riven.cpp:716 engines/cruise/menu.cpp:216
msgid "Load game:"
msgstr "Cargar juego:"
-#: gui/launcher.cpp:639 engines/dialogs.cpp:114 engines/scumm/dialogs.cpp:188
+#: gui/launcher.cpp:680 engines/dialogs.cpp:114 engines/scumm/dialogs.cpp:188
#: engines/mohawk/myst.cpp:255 engines/mohawk/riven.cpp:716
#: engines/cruise/menu.cpp:216 backends/platform/wince/CEActionsPocket.cpp:267
#: backends/platform/wince/CEActionsSmartphone.cpp:231
msgid "Load"
msgstr "Cargar"
-#: gui/launcher.cpp:747
+#: gui/launcher.cpp:788
msgid ""
"Do you really want to run the mass game detector? This could potentially add "
"a huge number of games."
@@ -454,7 +459,7 @@ msgstr ""
"ПSeguro que quieres ejecutar la detecciѓn masiva? Puede que se aёada un gran "
"nњmero de juegos."
-#: gui/launcher.cpp:748 gui/launcher.cpp:896
+#: gui/launcher.cpp:789 gui/launcher.cpp:937
#: backends/events/symbiansdl/symbiansdl-events.cpp:184
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
@@ -462,7 +467,7 @@ msgstr ""
msgid "Yes"
msgstr "Sэ"
-#: gui/launcher.cpp:748 gui/launcher.cpp:896
+#: gui/launcher.cpp:789 gui/launcher.cpp:937
#: backends/events/symbiansdl/symbiansdl-events.cpp:184
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
@@ -470,37 +475,37 @@ msgstr "Sэ"
msgid "No"
msgstr "No"
-#: gui/launcher.cpp:796
+#: gui/launcher.cpp:837
msgid "ScummVM couldn't open the specified directory!"
msgstr "ЁScummVM no ha podido abrir el directorio!"
-#: gui/launcher.cpp:808
+#: gui/launcher.cpp:849
msgid "ScummVM could not find any game in the specified directory!"
msgstr "ЁScummVM no ha encontrado ningњn juego en el directorio!"
-#: gui/launcher.cpp:822
+#: gui/launcher.cpp:863
msgid "Pick the game:"
msgstr "Elige el juego:"
-#: gui/launcher.cpp:896
+#: gui/launcher.cpp:937
msgid "Do you really want to remove this game configuration?"
msgstr "ПSeguro que quieres eliminar la configuraciѓn de este juego?"
-#: gui/launcher.cpp:960
+#: gui/launcher.cpp:1001
msgid "This game does not support loading games from the launcher."
msgstr "Este juego no permite cargar partidas desde el lanzador."
-#: gui/launcher.cpp:964
+#: gui/launcher.cpp:1005
msgid "ScummVM could not find any engine capable of running the selected game!"
msgstr ""
"ЁScummVM no ha podido encontrar ningњn motor capaz de ejecutar el juego!"
-#: gui/launcher.cpp:1078
+#: gui/launcher.cpp:1119
msgctxt "lowres"
msgid "Mass Add..."
msgstr "Aёad. varios"
-#: gui/launcher.cpp:1078
+#: gui/launcher.cpp:1119
msgid "Mass Add..."
msgstr "Aёadir varios..."
@@ -567,104 +572,96 @@ msgstr "44 kHz"
msgid "48 kHz"
msgstr "48 kHz"
-#: gui/options.cpp:257 gui/options.cpp:485 gui/options.cpp:586
-#: gui/options.cpp:659 gui/options.cpp:868
+#: gui/options.cpp:248 gui/options.cpp:474 gui/options.cpp:575
+#: gui/options.cpp:644 gui/options.cpp:852
msgctxt "soundfont"
msgid "None"
msgstr "Ninguno"
-#: gui/options.cpp:393
+#: gui/options.cpp:382
msgid "Failed to apply some of the graphic options changes:"
msgstr "Fallo al aplicar algunos cambios en las opciones grсficas:"
-#: gui/options.cpp:405
+#: gui/options.cpp:394
msgid "the video mode could not be changed."
msgstr "no se ha podido cambiar el modo de vэdeo."
-#: gui/options.cpp:411
+#: gui/options.cpp:400
msgid "the fullscreen setting could not be changed"
msgstr "no se ha podido cambiar el ajuste de pantalla completa"
-#: gui/options.cpp:417
+#: gui/options.cpp:406
msgid "the aspect ratio setting could not be changed"
msgstr "no se ha podido cambiar el ajuste de correcciѓn de aspecto"
-#: gui/options.cpp:742
+#: gui/options.cpp:727
msgid "Graphics mode:"
msgstr "Modo grсfico:"
-#: gui/options.cpp:756
+#: gui/options.cpp:741
msgid "Render mode:"
msgstr "Renderizado:"
-#: gui/options.cpp:756 gui/options.cpp:757
+#: gui/options.cpp:741 gui/options.cpp:742
msgid "Special dithering modes supported by some games"
msgstr "Modos especiales de expansiѓn soportados por algunos juegos"
-#: gui/options.cpp:768
+#: gui/options.cpp:753
#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2248
#: backends/graphics/openglsdl/openglsdl-graphics.cpp:472
msgid "Fullscreen mode"
msgstr "Pantalla completa"
-#: gui/options.cpp:771
+#: gui/options.cpp:756
msgid "Aspect ratio correction"
msgstr "Correcciѓn de aspecto"
-#: gui/options.cpp:771
+#: gui/options.cpp:756
msgid "Correct aspect ratio for 320x200 games"
msgstr "Corregir relaciѓn de aspecto en juegos 320x200"
-#: gui/options.cpp:772
-msgid "EGA undithering"
-msgstr "Difuminado EGA"
-
-#: gui/options.cpp:772
-msgid "Enable undithering in EGA games that support it"
-msgstr "Activar difuminado en los juegos EGA compatibles"
-
-#: gui/options.cpp:780
+#: gui/options.cpp:764
msgid "Preferred Device:"
msgstr "Disp. preferido:"
-#: gui/options.cpp:780
+#: gui/options.cpp:764
msgid "Music Device:"
msgstr "Disp. de mњsica:"
-#: gui/options.cpp:780 gui/options.cpp:782
+#: gui/options.cpp:764 gui/options.cpp:766
msgid "Specifies preferred sound device or sound card emulator"
msgstr ""
"Especifica quщ dispositivo de sonido o emulador de tarjeta de sonido "
"prefieres"
-#: gui/options.cpp:780 gui/options.cpp:782 gui/options.cpp:783
+#: gui/options.cpp:764 gui/options.cpp:766 gui/options.cpp:767
msgid "Specifies output sound device or sound card emulator"
msgstr ""
"Especifica el dispositivo de sonido o emulador de tarjeta de sonido de salida"
-#: gui/options.cpp:782
+#: gui/options.cpp:766
msgctxt "lowres"
msgid "Preferred Dev.:"
msgstr "Disp. preferido:"
-#: gui/options.cpp:782
+#: gui/options.cpp:766
msgctxt "lowres"
msgid "Music Device:"
msgstr "Disp. de mњsica:"
-#: gui/options.cpp:809
+#: gui/options.cpp:793
msgid "AdLib emulator:"
msgstr "Emul. de AdLib:"
-#: gui/options.cpp:809 gui/options.cpp:810
+#: gui/options.cpp:793 gui/options.cpp:794
msgid "AdLib is used for music in many games"
msgstr "AdLib se usa para la mњsica en muchos juegos"
-#: gui/options.cpp:820
+#: gui/options.cpp:804
msgid "Output rate:"
msgstr "Frec. de salida:"
-#: gui/options.cpp:820 gui/options.cpp:821
+#: gui/options.cpp:804 gui/options.cpp:805
msgid ""
"Higher value specifies better sound quality but may be not supported by your "
"soundcard"
@@ -672,64 +669,64 @@ msgstr ""
"Los valores mсs altos ofrecen mayor calidad, pero puede que tu tarjeta de "
"sonido no sea compatible"
-#: gui/options.cpp:831
+#: gui/options.cpp:815
msgid "GM Device:"
msgstr "Dispositivo GM:"
-#: gui/options.cpp:831
+#: gui/options.cpp:815
msgid "Specifies default sound device for General MIDI output"
msgstr "Especifica el dispositivo de salida General MIDI por defecto"
-#: gui/options.cpp:842
+#: gui/options.cpp:826
msgid "Don't use General MIDI music"
msgstr "No usar mњsica General MIDI"
-#: gui/options.cpp:853 gui/options.cpp:915
+#: gui/options.cpp:837 gui/options.cpp:899
msgid "Use first available device"
msgstr "Utilizar el primer dispositivo disponible"
-#: gui/options.cpp:865
+#: gui/options.cpp:849
msgid "SoundFont:"
msgstr "SoundFont:"
-#: gui/options.cpp:865 gui/options.cpp:867 gui/options.cpp:868
+#: gui/options.cpp:849 gui/options.cpp:851 gui/options.cpp:852
msgid "SoundFont is supported by some audio cards, Fluidsynth and Timidity"
msgstr ""
"SoundFont estс soportado por algunas tarjetas de sonido, ademсs de "
"Fluidsynth y Timidity"
-#: gui/options.cpp:867
+#: gui/options.cpp:851
msgctxt "lowres"
msgid "SoundFont:"
msgstr "SoundFont:"
-#: gui/options.cpp:873
+#: gui/options.cpp:857
msgid "Mixed AdLib/MIDI mode"
msgstr "Modo AdLib/MIDI"
-#: gui/options.cpp:873
+#: gui/options.cpp:857
msgid "Use both MIDI and AdLib sound generation"
msgstr "Usar tanto MIDI como AdLib en la generaciѓn de sonido"
-#: gui/options.cpp:876
+#: gui/options.cpp:860
msgid "MIDI gain:"
msgstr "Ganancia MIDI:"
-#: gui/options.cpp:886
+#: gui/options.cpp:870
msgid "MT-32 Device:"
msgstr "Disp. MT-32:"
-#: gui/options.cpp:886
+#: gui/options.cpp:870
msgid "Specifies default sound device for Roland MT-32/LAPC1/CM32l/CM64 output"
msgstr ""
"Especifica el dispositivo de sonido para la salida Roland MT-32/LAPC1/CM32l/"
"CM64 por defecto"
-#: gui/options.cpp:891
+#: gui/options.cpp:875
msgid "True Roland MT-32 (disable GM emulation)"
msgstr "Roland MT-32 autщntica (desactivar emulaciѓn GM)"
-#: gui/options.cpp:891 gui/options.cpp:893
+#: gui/options.cpp:875 gui/options.cpp:877
msgid ""
"Check if you want to use your real hardware Roland-compatible sound device "
"connected to your computer"
@@ -737,191 +734,191 @@ msgstr ""
"Marcar si se quiere usar un dispositivo de sonido real conectado al "
"ordenador y compatible con Roland"
-#: gui/options.cpp:893
+#: gui/options.cpp:877
msgctxt "lowres"
msgid "True Roland MT-32 (no GM emulation)"
msgstr "Roland MT-32 real (sin emulaciѓn GM)"
-#: gui/options.cpp:896
+#: gui/options.cpp:880
msgid "Enable Roland GS Mode"
msgstr "Activar modo Roland GS"
-#: gui/options.cpp:896
+#: gui/options.cpp:880
msgid "Turns off General MIDI mapping for games with Roland MT-32 soundtrack"
msgstr "Desactiva la conversiѓn General MIDI en juegos con sonido Roland MT-32"
-#: gui/options.cpp:905
+#: gui/options.cpp:889
msgid "Don't use Roland MT-32 music"
msgstr "No usar mњsica Roland MT-32"
-#: gui/options.cpp:932
+#: gui/options.cpp:916
msgid "Text and Speech:"
msgstr "Texto y voces:"
-#: gui/options.cpp:936 gui/options.cpp:946
+#: gui/options.cpp:920 gui/options.cpp:930
msgid "Speech"
msgstr "Voces"
-#: gui/options.cpp:937 gui/options.cpp:947
+#: gui/options.cpp:921 gui/options.cpp:931
msgid "Subtitles"
msgstr "Subtэtulos"
-#: gui/options.cpp:938
+#: gui/options.cpp:922
msgid "Both"
msgstr "Ambos"
-#: gui/options.cpp:940
+#: gui/options.cpp:924
msgid "Subtitle speed:"
msgstr "Vel. de subtэtulos:"
-#: gui/options.cpp:942
+#: gui/options.cpp:926
msgctxt "lowres"
msgid "Text and Speech:"
msgstr "Texto y voces:"
-#: gui/options.cpp:946
+#: gui/options.cpp:930
msgid "Spch"
msgstr "Voz"
-#: gui/options.cpp:947
+#: gui/options.cpp:931
msgid "Subs"
msgstr "Subt"
-#: gui/options.cpp:948
+#: gui/options.cpp:932
msgctxt "lowres"
msgid "Both"
msgstr "V&S"
-#: gui/options.cpp:948
+#: gui/options.cpp:932
msgid "Show subtitles and play speech"
msgstr "Reproducir voces y subtэtulos"
-#: gui/options.cpp:950
+#: gui/options.cpp:934
msgctxt "lowres"
msgid "Subtitle speed:"
msgstr "Vel. de subt.:"
-#: gui/options.cpp:966
+#: gui/options.cpp:950
msgid "Music volume:"
msgstr "Mњsica:"
-#: gui/options.cpp:968
+#: gui/options.cpp:952
msgctxt "lowres"
msgid "Music volume:"
msgstr "Mњsica:"
-#: gui/options.cpp:975
+#: gui/options.cpp:959
msgid "Mute All"
msgstr "Silenciar"
-#: gui/options.cpp:978
+#: gui/options.cpp:962
msgid "SFX volume:"
msgstr "Efectos:"
-#: gui/options.cpp:978 gui/options.cpp:980 gui/options.cpp:981
+#: gui/options.cpp:962 gui/options.cpp:964 gui/options.cpp:965
msgid "Special sound effects volume"
msgstr "Volumen de los efectos de sonido"
-#: gui/options.cpp:980
+#: gui/options.cpp:964
msgctxt "lowres"
msgid "SFX volume:"
msgstr "Efectos:"
-#: gui/options.cpp:988
+#: gui/options.cpp:972
msgid "Speech volume:"
msgstr "Voces:"
-#: gui/options.cpp:990
+#: gui/options.cpp:974
msgctxt "lowres"
msgid "Speech volume:"
msgstr "Voces:"
-#: gui/options.cpp:1156
+#: gui/options.cpp:1131
msgid "Theme Path:"
msgstr "Temas:"
-#: gui/options.cpp:1158
+#: gui/options.cpp:1133
msgctxt "lowres"
msgid "Theme Path:"
msgstr "Temas:"
-#: gui/options.cpp:1164 gui/options.cpp:1166 gui/options.cpp:1167
+#: gui/options.cpp:1139 gui/options.cpp:1141 gui/options.cpp:1142
msgid "Specifies path to additional data used by all games or ScummVM"
msgstr "Especifica el directorio adicional usado por los juegos y ScummVM"
-#: gui/options.cpp:1173
+#: gui/options.cpp:1148
msgid "Plugins Path:"
msgstr "Plugins:"
-#: gui/options.cpp:1175
+#: gui/options.cpp:1150
msgctxt "lowres"
msgid "Plugins Path:"
msgstr "Plugins:"
-#: gui/options.cpp:1184
+#: gui/options.cpp:1159
msgid "Misc"
msgstr "Otras"
-#: gui/options.cpp:1186
+#: gui/options.cpp:1161
msgctxt "lowres"
msgid "Misc"
msgstr "Otras"
-#: gui/options.cpp:1188
+#: gui/options.cpp:1163
msgid "Theme:"
msgstr "Tema:"
-#: gui/options.cpp:1192
+#: gui/options.cpp:1167
msgid "GUI Renderer:"
msgstr "Interfaz:"
-#: gui/options.cpp:1204
+#: gui/options.cpp:1179
msgid "Autosave:"
msgstr "Autoguardado:"
-#: gui/options.cpp:1206
+#: gui/options.cpp:1181
msgctxt "lowres"
msgid "Autosave:"
msgstr "Autoguardado:"
-#: gui/options.cpp:1214
+#: gui/options.cpp:1189
msgid "Keys"
msgstr "Teclas"
-#: gui/options.cpp:1221
+#: gui/options.cpp:1196
msgid "GUI Language:"
msgstr "Idioma:"
-#: gui/options.cpp:1221
+#: gui/options.cpp:1196
msgid "Language of ScummVM GUI"
msgstr "Idioma de la interfaz de ScummVM"
-#: gui/options.cpp:1372
+#: gui/options.cpp:1347
msgid "You have to restart ScummVM before your changes will take effect."
msgstr "Tienes que reiniciar ScummVM para que los cambios surjan efecto."
-#: gui/options.cpp:1385
+#: gui/options.cpp:1360
msgid "Select directory for savegames"
msgstr "Selecciona el directorio de guardado"
-#: gui/options.cpp:1392
+#: gui/options.cpp:1367
msgid "The chosen directory cannot be written to. Please select another one."
msgstr ""
"No se puede escribir en el directorio elegido. Por favor, selecciona otro."
-#: gui/options.cpp:1401
+#: gui/options.cpp:1376
msgid "Select directory for GUI themes"
msgstr "Selecciona el directorio de temas"
-#: gui/options.cpp:1411
+#: gui/options.cpp:1386
msgid "Select directory for extra files"
msgstr "Selecciona el directorio adicional"
-#: gui/options.cpp:1422
+#: gui/options.cpp:1397
msgid "Select directory for plugins"
msgstr "Selecciona el directorio de plugins"
-#: gui/options.cpp:1475
+#: gui/options.cpp:1450
msgid ""
"The theme you selected does not support your current language. If you want "
"to use this theme you need to switch to another language first."
@@ -969,64 +966,64 @@ msgstr "Partida sin nombre"
msgid "Select a Theme"
msgstr "Selecciona un tema"
-#: gui/ThemeEngine.cpp:333
+#: gui/ThemeEngine.cpp:335
msgid "Disabled GFX"
msgstr "GFX desactivados"
-#: gui/ThemeEngine.cpp:333
+#: gui/ThemeEngine.cpp:335
msgctxt "lowres"
msgid "Disabled GFX"
msgstr "GFX desactivados"
-#: gui/ThemeEngine.cpp:334
+#: gui/ThemeEngine.cpp:336
msgid "Standard Renderer (16bpp)"
msgstr "Estсndar (16bpp)"
-#: gui/ThemeEngine.cpp:334
+#: gui/ThemeEngine.cpp:336
msgid "Standard (16bpp)"
msgstr "Estсndar (16bpp)"
-#: gui/ThemeEngine.cpp:336
+#: gui/ThemeEngine.cpp:338
msgid "Antialiased Renderer (16bpp)"
msgstr "Suavizado (16bpp)"
-#: gui/ThemeEngine.cpp:336
+#: gui/ThemeEngine.cpp:338
msgid "Antialiased (16bpp)"
msgstr "Suavizado (16bpp)"
-#: gui/widget.cpp:312 gui/widget.cpp:314 gui/widget.cpp:320 gui/widget.cpp:322
+#: gui/widget.cpp:322 gui/widget.cpp:324 gui/widget.cpp:330 gui/widget.cpp:332
msgid "Clear value"
msgstr "Eliminar valor"
-#: base/main.cpp:203
+#: base/main.cpp:209
#, c-format
msgid "Engine does not support debug level '%s'"
msgstr "El motor no soporta el nivel de debug '%s'"
-#: base/main.cpp:275
+#: base/main.cpp:287
msgid "Menu"
msgstr "Menњ"
-#: base/main.cpp:278 backends/platform/symbian/src/SymbianActions.cpp:45
+#: base/main.cpp:290 backends/platform/symbian/src/SymbianActions.cpp:45
#: backends/platform/wince/CEActionsPocket.cpp:45
#: backends/platform/wince/CEActionsSmartphone.cpp:46
msgid "Skip"
msgstr "Saltar"
-#: base/main.cpp:281 backends/platform/symbian/src/SymbianActions.cpp:50
+#: base/main.cpp:293 backends/platform/symbian/src/SymbianActions.cpp:50
#: backends/platform/wince/CEActionsPocket.cpp:42
msgid "Pause"
msgstr "Pausar"
-#: base/main.cpp:284
+#: base/main.cpp:296
msgid "Skip line"
msgstr "Saltar frase"
-#: base/main.cpp:455
+#: base/main.cpp:467
msgid "Error running game:"
msgstr "Error al ejecutar el juego:"
-#: base/main.cpp:479
+#: base/main.cpp:491
msgid "Could not find any engine capable of running the selected game"
msgstr "No se ha podido encontrar ningњn motor capaz de ejecutar el juego"
@@ -1094,16 +1091,16 @@ msgstr "CancelЗlat per l'usuari"
msgid "Unknown error"
msgstr "Error desconocido"
-#: engines/advancedDetector.cpp:296
+#: engines/advancedDetector.cpp:324
#, c-format
msgid "The game in '%s' seems to be unknown."
msgstr "El juego en '%s' parece ser desconocido."
-#: engines/advancedDetector.cpp:297
+#: engines/advancedDetector.cpp:325
msgid "Please, report the following data to the ScummVM team along with name"
msgstr "Por favor, envэa al equipo de ScummVM esta informaciѓn junto al nombre"
-#: engines/advancedDetector.cpp:299
+#: engines/advancedDetector.cpp:327
msgid "of the game you tried to add and its version/language/etc.:"
msgstr "del juego que has intentado aёadir y su versiѓn/idioma/etc.:"
@@ -1140,13 +1137,14 @@ msgctxt "lowres"
msgid "~R~eturn to Launcher"
msgstr "~V~olver al lanzador"
-#: engines/dialogs.cpp:116 engines/cruise/menu.cpp:214
-#: engines/sci/engine/kfile.cpp:566
+#: engines/dialogs.cpp:116 engines/agi/saveload.cpp:805
+#: engines/cruise/menu.cpp:214 engines/sci/engine/kfile.cpp:567
msgid "Save game:"
msgstr "Guardar partida"
-#: engines/dialogs.cpp:116 engines/scumm/dialogs.cpp:187
-#: engines/cruise/menu.cpp:214 engines/sci/engine/kfile.cpp:566
+#: engines/dialogs.cpp:116 engines/agi/saveload.cpp:805
+#: engines/scumm/dialogs.cpp:187 engines/cruise/menu.cpp:214
+#: engines/sci/engine/kfile.cpp:567
#: backends/platform/symbian/src/SymbianActions.cpp:44
#: backends/platform/wince/CEActionsPocket.cpp:43
#: backends/platform/wince/CEActionsPocket.cpp:267
@@ -1257,6 +1255,88 @@ msgstr ""
msgid "Start anyway"
msgstr "Jugar de todos modos"
+#: engines/agi/detection.cpp:145 engines/dreamweb/detection.cpp:47
+#: engines/sci/detection.cpp:390
+msgid "Use original save/load screens"
+msgstr ""
+
+#: engines/agi/detection.cpp:146 engines/dreamweb/detection.cpp:48
+#: engines/sci/detection.cpp:391
+msgid "Use the original save/load screens, instead of the ScummVM ones"
+msgstr ""
+
+#: engines/agi/saveload.cpp:827 engines/sci/engine/kfile.cpp:674
+msgid "Restore game:"
+msgstr "Cargar partida:"
+
+#: engines/agi/saveload.cpp:827 engines/sci/engine/kfile.cpp:674
+msgid "Restore"
+msgstr "Cargar"
+
+#: engines/dreamweb/detection.cpp:57
+#, fuzzy
+msgid "Use bright palette mode"
+msgstr "Objeto superior derecho"
+
+#: engines/dreamweb/detection.cpp:58
+msgid "Display graphics using the game's bright palette"
+msgstr ""
+
+#: engines/sci/detection.cpp:370
+msgid "EGA undithering"
+msgstr "Difuminado EGA"
+
+#: engines/sci/detection.cpp:371
+#, fuzzy
+msgid "Enable undithering in EGA games"
+msgstr "Activar difuminado en los juegos EGA compatibles"
+
+#: engines/sci/detection.cpp:380
+#, fuzzy
+msgid "Prefer digital sound effects"
+msgstr "Volumen de los efectos de sonido"
+
+#: engines/sci/detection.cpp:381
+msgid "Prefer digital sound effects instead of synthesized ones"
+msgstr ""
+
+#: engines/sci/detection.cpp:400
+msgid "Use IMF/Yahama FB-01 for MIDI output"
+msgstr ""
+
+#: engines/sci/detection.cpp:401
+msgid ""
+"Use an IBM Music Feature card or a Yahama FB-01 FM synth module for MIDI "
+"output"
+msgstr ""
+
+#: engines/sci/detection.cpp:411
+msgid "Use CD audio"
+msgstr ""
+
+#: engines/sci/detection.cpp:412
+msgid "Use CD audio instead of in-game audio, if available"
+msgstr ""
+
+#: engines/sci/detection.cpp:422
+msgid "Use Windows cursors"
+msgstr ""
+
+#: engines/sci/detection.cpp:423
+msgid ""
+"Use the Windows cursors (smaller and monochrome) instead of the DOS ones"
+msgstr ""
+
+#: engines/sci/detection.cpp:433
+#, fuzzy
+msgid "Use silver cursors"
+msgstr "Cursor normal"
+
+#: engines/sci/detection.cpp:434
+msgid ""
+"Use the alternate set of silver cursors, instead of the normal golden ones"
+msgstr ""
+
#: engines/scumm/dialogs.cpp:175
#, c-format
msgid "Insert Disk %c and Press Button to Continue."
@@ -1913,7 +1993,7 @@ msgstr ""
"El soporte MIDI nativo requiere la actualizaciѓn Roland de LucasArts,\n"
"pero %s no estс disponible. Se usarс AdLib."
-#: engines/scumm/scumm.cpp:2271 engines/agos/saveload.cpp:189
+#: engines/scumm/scumm.cpp:2271 engines/agos/saveload.cpp:202
#, c-format
msgid ""
"Failed to save game state to file:\n"
@@ -1924,7 +2004,7 @@ msgstr ""
"\n"
"%s"
-#: engines/scumm/scumm.cpp:2278 engines/agos/saveload.cpp:154
+#: engines/scumm/scumm.cpp:2278 engines/agos/saveload.cpp:167
#, c-format
msgid ""
"Failed to load game state from file:\n"
@@ -1935,7 +2015,7 @@ msgstr ""
"\n"
"%s"
-#: engines/scumm/scumm.cpp:2290 engines/agos/saveload.cpp:197
+#: engines/scumm/scumm.cpp:2290 engines/agos/saveload.cpp:210
#, c-format
msgid ""
"Successfully saved game state in file:\n"
@@ -1982,14 +2062,6 @@ msgstr "~M~enњ principal"
msgid "~W~ater Effect Enabled"
msgstr "Efecto ag~u~a activado"
-#: engines/sci/engine/kfile.cpp:673
-msgid "Restore game:"
-msgstr "Cargar partida:"
-
-#: engines/sci/engine/kfile.cpp:673
-msgid "Restore"
-msgstr "Cargar"
-
#: engines/agos/animation.cpp:550
#, c-format
msgid "Cutscene file '%s' not found!"
@@ -2012,6 +2084,66 @@ msgstr "Fallo al borrar el archivo."
msgid "Failed to save game"
msgstr "Fallo al guardar la partida"
+#. I18N: Studio audience adds an applause and cheering sounds whenever
+#. Malcolm makes a joke.
+#: engines/kyra/detection.cpp:62
+msgid "Studio audience"
+msgstr ""
+
+#: engines/kyra/detection.cpp:63
+msgid "Enable studio audience"
+msgstr ""
+
+#. I18N: This option allows the user to skip text and cutscenes.
+#: engines/kyra/detection.cpp:73
+msgid "Skip support"
+msgstr ""
+
+#: engines/kyra/detection.cpp:74
+msgid "Allow text and cutscenes to be skipped"
+msgstr ""
+
+#. I18N: Helium mode makes people sound like they've inhaled Helium.
+#: engines/kyra/detection.cpp:84
+msgid "Helium mode"
+msgstr ""
+
+#: engines/kyra/detection.cpp:85
+#, fuzzy
+msgid "Enable helium mode"
+msgstr "Activar modo Roland GS"
+
+#. I18N: When enabled, this option makes scrolling smoother when
+#. changing from one screen to another.
+#: engines/kyra/detection.cpp:99
+msgid "Smooth scrolling"
+msgstr ""
+
+#: engines/kyra/detection.cpp:100
+msgid "Enable smooth scrolling when walking"
+msgstr ""
+
+#. I18N: When enabled, this option changes the cursor when it floats to the
+#. edge of the screen to a directional arrow. The player can then click to
+#. walk towards that direction.
+#: engines/kyra/detection.cpp:112
+#, fuzzy
+msgid "Floating cursors"
+msgstr "Cursor normal"
+
+#: engines/kyra/detection.cpp:113
+msgid "Enable floating cursors"
+msgstr ""
+
+#. I18N: HP stands for Hit Points
+#: engines/kyra/detection.cpp:127
+msgid "HP bar graphs"
+msgstr ""
+
+#: engines/kyra/detection.cpp:128
+msgid "Enable hit point bar graphs"
+msgstr ""
+
#: engines/kyra/lol.cpp:478
msgid "Attack 1"
msgstr ""
@@ -2080,6 +2212,14 @@ msgstr ""
"a los de General MIDI, pero es posible que algunas\n"
"de las pistas no se reproduzcan correctamente."
+#: engines/queen/queen.cpp:59 engines/sky/detection.cpp:44
+msgid "Floppy intro"
+msgstr ""
+
+#: engines/queen/queen.cpp:60 engines/sky/detection.cpp:45
+msgid "Use the floppy version's intro (CD version only)"
+msgstr ""
+
#: engines/sky/compact.cpp:130
msgid ""
"Unable to find \"sky.cpt\" file!\n"
@@ -2161,6 +2301,14 @@ msgid ""
msgstr ""
"Se han encontrado vэdeos DXA, pero se ha compilado ScummVM sin soporte zlib"
+#: engines/sword2/sword2.cpp:79
+msgid "Show object labels"
+msgstr ""
+
+#: engines/sword2/sword2.cpp:80
+msgid "Show labels for objects on mouse hover"
+msgstr ""
+
#: engines/parallaction/saveload.cpp:133
#, c-format
msgid ""
@@ -2397,19 +2545,19 @@ msgstr "Sonido de alta calidad (mсs lento) (reinicio)"
msgid "Disable power off"
msgstr "Desactivar apagado"
-#: backends/platform/iphone/osys_events.cpp:301
+#: backends/platform/iphone/osys_events.cpp:300
msgid "Mouse-click-and-drag mode enabled."
msgstr "Modo clic-de-ratѓn-y-arrastrar activado."
-#: backends/platform/iphone/osys_events.cpp:303
+#: backends/platform/iphone/osys_events.cpp:302
msgid "Mouse-click-and-drag mode disabled."
msgstr "Modo clic-de-ratѓn-y-arrastrar desactivado."
-#: backends/platform/iphone/osys_events.cpp:314
+#: backends/platform/iphone/osys_events.cpp:313
msgid "Touchpad mode enabled."
msgstr "Modo Touchpad activado."
-#: backends/platform/iphone/osys_events.cpp:316
+#: backends/platform/iphone/osys_events.cpp:315
msgid "Touchpad mode disabled."
msgstr "Modo Touchpad desactivado."
@@ -2486,15 +2634,15 @@ msgstr "Filtro de grсficos activo:"
msgid "Windowed mode"
msgstr "Modo ventana"
-#: backends/graphics/opengl/opengl-graphics.cpp:130
+#: backends/graphics/opengl/opengl-graphics.cpp:135
msgid "OpenGL Normal"
msgstr "OpenGL Normal"
-#: backends/graphics/opengl/opengl-graphics.cpp:131
+#: backends/graphics/opengl/opengl-graphics.cpp:136
msgid "OpenGL Conserve"
msgstr "OpenGL Conservar"
-#: backends/graphics/opengl/opengl-graphics.cpp:132
+#: backends/graphics/opengl/opengl-graphics.cpp:137
msgid "OpenGL Original"
msgstr "OpenGL Original"
diff --git a/po/eu.po b/po/eu.po
index ab677fda82..7df042dc14 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -7,14 +7,14 @@ msgid ""
msgstr ""
"Project-Id-Version: ScummVM 1.5.0git\n"
"Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n"
-"POT-Creation-Date: 2012-03-07 22:09+0000\n"
+"POT-Creation-Date: 2012-05-20 22:39+0100\n"
"PO-Revision-Date: 2011-12-15 14:53+0100\n"
"Last-Translator: Mikel Iturbe Urretxa <mikel@hamahiru.org>\n"
"Language-Team: Librezale <librezale@librezale.org>\n"
-"Language: Euskara\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: Euskara\n"
#: gui/about.cpp:91
#, c-format
@@ -43,7 +43,7 @@ msgid "Go up"
msgstr "Joan gora"
#: gui/browser.cpp:69 gui/chooser.cpp:45 gui/KeysDialog.cpp:43
-#: gui/launcher.cpp:320 gui/massadd.cpp:94 gui/options.cpp:1253
+#: gui/launcher.cpp:345 gui/massadd.cpp:94 gui/options.cpp:1228
#: gui/saveload.cpp:63 gui/saveload.cpp:155 gui/themebrowser.cpp:54
#: engines/engine.cpp:442 engines/scumm/dialogs.cpp:190
#: engines/sword1/control.cpp:865 engines/parallaction/saveload.cpp:281
@@ -68,15 +68,15 @@ msgstr "Itxi"
msgid "Mouse click"
msgstr "Sagu-klika"
-#: gui/gui-manager.cpp:122 base/main.cpp:288
+#: gui/gui-manager.cpp:122 base/main.cpp:300
msgid "Display keyboard"
msgstr "Teklatua erakutsi"
-#: gui/gui-manager.cpp:126 base/main.cpp:292
+#: gui/gui-manager.cpp:126 base/main.cpp:304
msgid "Remap keys"
msgstr "Teklak esleitu"
-#: gui/gui-manager.cpp:129 base/main.cpp:295
+#: gui/gui-manager.cpp:129 base/main.cpp:307
msgid "Toggle FullScreen"
msgstr "Txandakatu pantaila osoa"
@@ -88,8 +88,8 @@ msgstr "Aukeratu esleituko den ekintza"
msgid "Map"
msgstr "Esleitu"
-#: gui/KeysDialog.cpp:42 gui/launcher.cpp:321 gui/launcher.cpp:960
-#: gui/launcher.cpp:964 gui/massadd.cpp:91 gui/options.cpp:1254
+#: gui/KeysDialog.cpp:42 gui/launcher.cpp:346 gui/launcher.cpp:1001
+#: gui/launcher.cpp:1005 gui/massadd.cpp:91 gui/options.cpp:1229
#: engines/engine.cpp:361 engines/engine.cpp:372 engines/scumm/dialogs.cpp:192
#: engines/scumm/scumm.cpp:1775 engines/agos/animation.cpp:551
#: engines/groovie/script.cpp:420 engines/sky/compact.cpp:131
@@ -126,15 +126,15 @@ msgstr "Mesedez, aukeratu ekintza bat"
msgid "Press the key to associate"
msgstr "Sakatu esleituko den tekla"
-#: gui/launcher.cpp:170
+#: gui/launcher.cpp:187
msgid "Game"
msgstr "Jokoa"
-#: gui/launcher.cpp:174
+#: gui/launcher.cpp:191
msgid "ID:"
msgstr "ID:"
-#: gui/launcher.cpp:174 gui/launcher.cpp:176 gui/launcher.cpp:177
+#: gui/launcher.cpp:191 gui/launcher.cpp:193 gui/launcher.cpp:194
msgid ""
"Short game identifier used for referring to savegames and running the game "
"from the command line"
@@ -142,309 +142,314 @@ msgstr ""
"Partida gordeak identifikatzeko eta jokoa komando lerrotik abiarazteko "
"erabiltzen den identifikatzailea"
-#: gui/launcher.cpp:176
+#: gui/launcher.cpp:193
msgctxt "lowres"
msgid "ID:"
msgstr "ID:"
-#: gui/launcher.cpp:181
+#: gui/launcher.cpp:198
msgid "Name:"
msgstr "Izena:"
-#: gui/launcher.cpp:181 gui/launcher.cpp:183 gui/launcher.cpp:184
+#: gui/launcher.cpp:198 gui/launcher.cpp:200 gui/launcher.cpp:201
msgid "Full title of the game"
msgstr "Jokoaren izen osoa"
-#: gui/launcher.cpp:183
+#: gui/launcher.cpp:200
msgctxt "lowres"
msgid "Name:"
msgstr "Izena:"
-#: gui/launcher.cpp:187
+#: gui/launcher.cpp:204
msgid "Language:"
msgstr "Hizkuntza:"
-#: gui/launcher.cpp:187 gui/launcher.cpp:188
+#: gui/launcher.cpp:204 gui/launcher.cpp:205
msgid ""
"Language of the game. This will not turn your Spanish game version into "
"English"
msgstr ""
"Jokoaren hizkuntza. Honek ez du zure ingelesezko bertsioa frantsesera pasako"
-#: gui/launcher.cpp:189 gui/launcher.cpp:203 gui/options.cpp:80
-#: gui/options.cpp:745 gui/options.cpp:758 gui/options.cpp:1224
+#: gui/launcher.cpp:206 gui/launcher.cpp:220 gui/options.cpp:80
+#: gui/options.cpp:730 gui/options.cpp:743 gui/options.cpp:1199
#: audio/null.cpp:40
msgid "<default>"
msgstr "<lehenetsia>"
-#: gui/launcher.cpp:199
+#: gui/launcher.cpp:216
msgid "Platform:"
msgstr "Plataforma:"
-#: gui/launcher.cpp:199 gui/launcher.cpp:201 gui/launcher.cpp:202
+#: gui/launcher.cpp:216 gui/launcher.cpp:218 gui/launcher.cpp:219
msgid "Platform the game was originally designed for"
msgstr "Jatorriz, jokoa diseinatua izan zen plataforma"
-#: gui/launcher.cpp:201
+#: gui/launcher.cpp:218
msgctxt "lowres"
msgid "Platform:"
msgstr "Plataforma:"
-#: gui/launcher.cpp:213 gui/options.cpp:1087 gui/options.cpp:1104
+#: gui/launcher.cpp:231
+#, fuzzy
+msgid "Engine"
+msgstr "Aztertu"
+
+#: gui/launcher.cpp:239 gui/options.cpp:1062 gui/options.cpp:1079
msgid "Graphics"
msgstr "Grafikoak"
-#: gui/launcher.cpp:213 gui/options.cpp:1087 gui/options.cpp:1104
+#: gui/launcher.cpp:239 gui/options.cpp:1062 gui/options.cpp:1079
msgid "GFX"
msgstr "GFX"
-#: gui/launcher.cpp:216
+#: gui/launcher.cpp:242
msgid "Override global graphic settings"
msgstr "Ezarpen grafiko globalak baliogabetu"
-#: gui/launcher.cpp:218
+#: gui/launcher.cpp:244
msgctxt "lowres"
msgid "Override global graphic settings"
msgstr "Ezarpen grafiko globalak baliogabetu"
-#: gui/launcher.cpp:225 gui/options.cpp:1110
+#: gui/launcher.cpp:251 gui/options.cpp:1085
msgid "Audio"
msgstr "Soinua"
-#: gui/launcher.cpp:228
+#: gui/launcher.cpp:254
msgid "Override global audio settings"
msgstr "Soinu ezarpen globalak baliogabetu"
-#: gui/launcher.cpp:230
+#: gui/launcher.cpp:256
msgctxt "lowres"
msgid "Override global audio settings"
msgstr "Soinu ezarpen globalak baliogabetu"
-#: gui/launcher.cpp:239 gui/options.cpp:1115
+#: gui/launcher.cpp:265 gui/options.cpp:1090
msgid "Volume"
msgstr "Bolumena"
-#: gui/launcher.cpp:241 gui/options.cpp:1117
+#: gui/launcher.cpp:267 gui/options.cpp:1092
msgctxt "lowres"
msgid "Volume"
msgstr "Bolumena"
-#: gui/launcher.cpp:244
+#: gui/launcher.cpp:270
msgid "Override global volume settings"
msgstr "Bolumen ezarpen globalak baliogabetu"
-#: gui/launcher.cpp:246
+#: gui/launcher.cpp:272
msgctxt "lowres"
msgid "Override global volume settings"
msgstr "Bolumen ezarpen globalak baliogabetu"
-#: gui/launcher.cpp:254 gui/options.cpp:1125
+#: gui/launcher.cpp:280 gui/options.cpp:1100
msgid "MIDI"
msgstr "MIDI"
-#: gui/launcher.cpp:257
+#: gui/launcher.cpp:283
msgid "Override global MIDI settings"
msgstr "MIDI ezarpen globalak baliogabetu"
-#: gui/launcher.cpp:259
+#: gui/launcher.cpp:285
msgctxt "lowres"
msgid "Override global MIDI settings"
msgstr "MIDI ezarpen globalak baliogabetu"
-#: gui/launcher.cpp:268 gui/options.cpp:1131
+#: gui/launcher.cpp:294 gui/options.cpp:1106
msgid "MT-32"
msgstr "MT-32"
-#: gui/launcher.cpp:271
+#: gui/launcher.cpp:297
msgid "Override global MT-32 settings"
msgstr "MT-32 ezarpen globalak baliogabetu"
-#: gui/launcher.cpp:273
+#: gui/launcher.cpp:299
msgctxt "lowres"
msgid "Override global MT-32 settings"
msgstr "MT-32 ezarpen globalak baliogabetu"
-#: gui/launcher.cpp:282 gui/options.cpp:1138
+#: gui/launcher.cpp:308 gui/options.cpp:1113
msgid "Paths"
msgstr "Bide-izenak"
-#: gui/launcher.cpp:284 gui/options.cpp:1140
+#: gui/launcher.cpp:310 gui/options.cpp:1115
msgctxt "lowres"
msgid "Paths"
msgstr "Bideak"
-#: gui/launcher.cpp:291
+#: gui/launcher.cpp:317
msgid "Game Path:"
msgstr "Jokoa:"
-#: gui/launcher.cpp:293
+#: gui/launcher.cpp:319
msgctxt "lowres"
msgid "Game Path:"
msgstr "Jokoa:"
-#: gui/launcher.cpp:298 gui/options.cpp:1164
+#: gui/launcher.cpp:324 gui/options.cpp:1139
msgid "Extra Path:"
msgstr "Gehigarriak:"
-#: gui/launcher.cpp:298 gui/launcher.cpp:300 gui/launcher.cpp:301
+#: gui/launcher.cpp:324 gui/launcher.cpp:326 gui/launcher.cpp:327
msgid "Specifies path to additional data used the game"
msgstr "Jokoak erabiltzen duen datu gehigarrien bide-izena"
-#: gui/launcher.cpp:300 gui/options.cpp:1166
+#: gui/launcher.cpp:326 gui/options.cpp:1141
msgctxt "lowres"
msgid "Extra Path:"
msgstr "Gehigarria:"
-#: gui/launcher.cpp:307 gui/options.cpp:1148
+#: gui/launcher.cpp:333 gui/options.cpp:1123
msgid "Save Path:"
msgstr "Partida gordeak:"
-#: gui/launcher.cpp:307 gui/launcher.cpp:309 gui/launcher.cpp:310
-#: gui/options.cpp:1148 gui/options.cpp:1150 gui/options.cpp:1151
+#: gui/launcher.cpp:333 gui/launcher.cpp:335 gui/launcher.cpp:336
+#: gui/options.cpp:1123 gui/options.cpp:1125 gui/options.cpp:1126
msgid "Specifies where your savegames are put"
msgstr "Zure gordetako partidak non gordeko diren zehazten du"
-#: gui/launcher.cpp:309 gui/options.cpp:1150
+#: gui/launcher.cpp:335 gui/options.cpp:1125
msgctxt "lowres"
msgid "Save Path:"
msgstr "Partida gordeak:"
-#: gui/launcher.cpp:329 gui/launcher.cpp:416 gui/launcher.cpp:469
-#: gui/launcher.cpp:523 gui/options.cpp:1159 gui/options.cpp:1167
-#: gui/options.cpp:1176 gui/options.cpp:1283 gui/options.cpp:1289
-#: gui/options.cpp:1297 gui/options.cpp:1327 gui/options.cpp:1333
-#: gui/options.cpp:1340 gui/options.cpp:1433 gui/options.cpp:1436
-#: gui/options.cpp:1448
+#: gui/launcher.cpp:354 gui/launcher.cpp:453 gui/launcher.cpp:511
+#: gui/launcher.cpp:565 gui/options.cpp:1134 gui/options.cpp:1142
+#: gui/options.cpp:1151 gui/options.cpp:1258 gui/options.cpp:1264
+#: gui/options.cpp:1272 gui/options.cpp:1302 gui/options.cpp:1308
+#: gui/options.cpp:1315 gui/options.cpp:1408 gui/options.cpp:1411
+#: gui/options.cpp:1423
msgctxt "path"
msgid "None"
msgstr "Bat ere ez"
-#: gui/launcher.cpp:334 gui/launcher.cpp:422 gui/launcher.cpp:527
-#: gui/options.cpp:1277 gui/options.cpp:1321 gui/options.cpp:1439
+#: gui/launcher.cpp:359 gui/launcher.cpp:459 gui/launcher.cpp:569
+#: gui/options.cpp:1252 gui/options.cpp:1296 gui/options.cpp:1414
#: backends/platform/wii/options.cpp:56
msgid "Default"
msgstr "Lehenetsia"
-#: gui/launcher.cpp:462 gui/options.cpp:1442
+#: gui/launcher.cpp:504 gui/options.cpp:1417
msgid "Select SoundFont"
msgstr "SoundFont-a aukeratu"
-#: gui/launcher.cpp:481 gui/launcher.cpp:636
+#: gui/launcher.cpp:523 gui/launcher.cpp:677
msgid "Select directory with game data"
msgstr "Jokoaren direktorioa aukeratu"
-#: gui/launcher.cpp:499
+#: gui/launcher.cpp:541
msgid "Select additional game directory"
msgstr "Direktorio gehigarria aukeratu"
-#: gui/launcher.cpp:511
+#: gui/launcher.cpp:553
msgid "Select directory for saved games"
msgstr "Partida gordeen direktorioa aukeratu"
-#: gui/launcher.cpp:538
+#: gui/launcher.cpp:580
msgid "This game ID is already taken. Please choose another one."
msgstr "ID hau jada erabilia izaten ari da. Mesedez, aukeratu beste bat."
-#: gui/launcher.cpp:579 engines/dialogs.cpp:110
+#: gui/launcher.cpp:621 engines/dialogs.cpp:110
msgid "~Q~uit"
msgstr "~I~rten"
-#: gui/launcher.cpp:579 backends/platform/sdl/macosx/appmenu_osx.mm:96
+#: gui/launcher.cpp:621 backends/platform/sdl/macosx/appmenu_osx.mm:96
msgid "Quit ScummVM"
msgstr "Irten ScummVM-tik"
-#: gui/launcher.cpp:580
+#: gui/launcher.cpp:622
msgid "A~b~out..."
msgstr "Ho~n~i buruz..."
-#: gui/launcher.cpp:580 backends/platform/sdl/macosx/appmenu_osx.mm:70
+#: gui/launcher.cpp:622 backends/platform/sdl/macosx/appmenu_osx.mm:70
msgid "About ScummVM"
msgstr "ScummVM-i buruz"
-#: gui/launcher.cpp:581
+#: gui/launcher.cpp:623
msgid "~O~ptions..."
msgstr "~A~ukerak"
-#: gui/launcher.cpp:581
+#: gui/launcher.cpp:623
msgid "Change global ScummVM options"
msgstr "ScummVM-ren aukera globalak aldatu"
-#: gui/launcher.cpp:583
+#: gui/launcher.cpp:625
msgid "~S~tart"
msgstr "~H~asi"
-#: gui/launcher.cpp:583
+#: gui/launcher.cpp:625
msgid "Start selected game"
msgstr "Aukeraturiko jokora jolastu"
-#: gui/launcher.cpp:586
+#: gui/launcher.cpp:628
msgid "~L~oad..."
msgstr "~K~argatu"
-#: gui/launcher.cpp:586
+#: gui/launcher.cpp:628
msgid "Load savegame for selected game"
msgstr "Aukeraturiko jokorako partida gordea kargatu"
-#: gui/launcher.cpp:591 gui/launcher.cpp:1079
+#: gui/launcher.cpp:633 gui/launcher.cpp:1120
msgid "~A~dd Game..."
msgstr "~G~ehitu..."
-#: gui/launcher.cpp:591 gui/launcher.cpp:598
+#: gui/launcher.cpp:633 gui/launcher.cpp:640
msgid "Hold Shift for Mass Add"
msgstr "Shift mantendu sakaturik hainbat joko gehitzeko"
-#: gui/launcher.cpp:593
+#: gui/launcher.cpp:635
msgid "~E~dit Game..."
msgstr "~E~ditatu..."
-#: gui/launcher.cpp:593 gui/launcher.cpp:600
+#: gui/launcher.cpp:635 gui/launcher.cpp:642
msgid "Change game options"
msgstr "Aldatu jokoaren aukerak"
-#: gui/launcher.cpp:595
+#: gui/launcher.cpp:637
msgid "~R~emove Game"
msgstr "~K~endu jokoa"
-#: gui/launcher.cpp:595 gui/launcher.cpp:602
+#: gui/launcher.cpp:637 gui/launcher.cpp:644
msgid "Remove game from the list. The game data files stay intact"
msgstr "Jokoa zerrendatik kendu. Jokoaren fitxategiak ez dira ezabatzen"
-#: gui/launcher.cpp:598 gui/launcher.cpp:1079
+#: gui/launcher.cpp:640 gui/launcher.cpp:1120
msgctxt "lowres"
msgid "~A~dd Game..."
msgstr "~G~ehitu..."
-#: gui/launcher.cpp:600
+#: gui/launcher.cpp:642
msgctxt "lowres"
msgid "~E~dit Game..."
msgstr "~E~ditatu..."
-#: gui/launcher.cpp:602
+#: gui/launcher.cpp:644
msgctxt "lowres"
msgid "~R~emove Game"
msgstr "~K~endu"
-#: gui/launcher.cpp:610
+#: gui/launcher.cpp:652
msgid "Search in game list"
msgstr "Bilatu joko-zerrendan"
-#: gui/launcher.cpp:614 gui/launcher.cpp:1126
+#: gui/launcher.cpp:656 gui/launcher.cpp:1167
msgid "Search:"
msgstr "Bilatu:"
-#: gui/launcher.cpp:639 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255
+#: gui/launcher.cpp:680 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255
#: engines/mohawk/riven.cpp:716 engines/cruise/menu.cpp:216
msgid "Load game:"
msgstr "Jokoa kargatu:"
-#: gui/launcher.cpp:639 engines/dialogs.cpp:114 engines/scumm/dialogs.cpp:188
+#: gui/launcher.cpp:680 engines/dialogs.cpp:114 engines/scumm/dialogs.cpp:188
#: engines/mohawk/myst.cpp:255 engines/mohawk/riven.cpp:716
#: engines/cruise/menu.cpp:216 backends/platform/wince/CEActionsPocket.cpp:267
#: backends/platform/wince/CEActionsSmartphone.cpp:231
msgid "Load"
msgstr "Kargatu"
-#: gui/launcher.cpp:747
+#: gui/launcher.cpp:788
msgid ""
"Do you really want to run the mass game detector? This could potentially add "
"a huge number of games."
@@ -452,7 +457,7 @@ msgstr ""
"Joko detektatzaile masiboa exekutatu nahi al duzu? Honek joko kantitate "
"handia gehitu dezake."
-#: gui/launcher.cpp:748 gui/launcher.cpp:896
+#: gui/launcher.cpp:789 gui/launcher.cpp:937
#: backends/events/symbiansdl/symbiansdl-events.cpp:184
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
@@ -460,7 +465,7 @@ msgstr ""
msgid "Yes"
msgstr "Bai"
-#: gui/launcher.cpp:748 gui/launcher.cpp:896
+#: gui/launcher.cpp:789 gui/launcher.cpp:937
#: backends/events/symbiansdl/symbiansdl-events.cpp:184
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
@@ -468,38 +473,38 @@ msgstr "Bai"
msgid "No"
msgstr "Ez"
-#: gui/launcher.cpp:796
+#: gui/launcher.cpp:837
msgid "ScummVM couldn't open the specified directory!"
msgstr "ScummVM-k ezin izan du zehazturiko direktorioa ireki!"
-#: gui/launcher.cpp:808
+#: gui/launcher.cpp:849
msgid "ScummVM could not find any game in the specified directory!"
msgstr "ScummVM-k ezin izan du jokorik aurkitu zehazturiko direktorioan!"
-#: gui/launcher.cpp:822
+#: gui/launcher.cpp:863
msgid "Pick the game:"
msgstr "Jokoa aukeratu:"
-#: gui/launcher.cpp:896
+#: gui/launcher.cpp:937
msgid "Do you really want to remove this game configuration?"
msgstr "Benetan ezabatu nahi duzu joko-konfigurazio hau?"
-#: gui/launcher.cpp:960
+#: gui/launcher.cpp:1001
msgid "This game does not support loading games from the launcher."
msgstr "Joko honek ez du uzten partidak abiarazletik kargatzen."
-#: gui/launcher.cpp:964
+#: gui/launcher.cpp:1005
msgid "ScummVM could not find any engine capable of running the selected game!"
msgstr ""
"ScummVM-k ezin izan du aukeraturiko jokoa exekutatzeko gai den motorerik "
"aurkitu!"
-#: gui/launcher.cpp:1078
+#: gui/launcher.cpp:1119
msgctxt "lowres"
msgid "Mass Add..."
msgstr "Hainbat gehitu..."
-#: gui/launcher.cpp:1078
+#: gui/launcher.cpp:1119
msgid "Mass Add..."
msgstr "Hainbat gehitu..."
@@ -568,101 +573,93 @@ msgstr "44 kHz"
msgid "48 kHz"
msgstr "48 kHz"
-#: gui/options.cpp:257 gui/options.cpp:485 gui/options.cpp:586
-#: gui/options.cpp:659 gui/options.cpp:868
+#: gui/options.cpp:248 gui/options.cpp:474 gui/options.cpp:575
+#: gui/options.cpp:644 gui/options.cpp:852
msgctxt "soundfont"
msgid "None"
msgstr "Bat ere ez"
-#: gui/options.cpp:393
+#: gui/options.cpp:382
msgid "Failed to apply some of the graphic options changes:"
msgstr "Ezin izan da grafikoen aukeretako batzuk aplikatu:"
-#: gui/options.cpp:405
+#: gui/options.cpp:394
msgid "the video mode could not be changed."
msgstr "ezin izan da bideo-modua aldatu."
-#: gui/options.cpp:411
+#: gui/options.cpp:400
msgid "the fullscreen setting could not be changed"
msgstr "ezin izan da pantaila-osoaren ezarpena aldatu"
-#: gui/options.cpp:417
+#: gui/options.cpp:406
msgid "the aspect ratio setting could not be changed"
msgstr "formatu-ratioaren ezarpena ezin izan da aldatu"
-#: gui/options.cpp:742
+#: gui/options.cpp:727
msgid "Graphics mode:"
msgstr "Modu grafikoa:"
-#: gui/options.cpp:756
+#: gui/options.cpp:741
msgid "Render mode:"
msgstr "Renderizazioa:"
-#: gui/options.cpp:756 gui/options.cpp:757
+#: gui/options.cpp:741 gui/options.cpp:742
msgid "Special dithering modes supported by some games"
msgstr "Joko batzuk onarturiko lausotze-modu bereziak"
-#: gui/options.cpp:768
+#: gui/options.cpp:753
#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2248
#: backends/graphics/openglsdl/openglsdl-graphics.cpp:472
msgid "Fullscreen mode"
msgstr "Pantaila osoa"
-#: gui/options.cpp:771
+#: gui/options.cpp:756
msgid "Aspect ratio correction"
msgstr "Formatu-ratioaren zuzenketa"
-#: gui/options.cpp:771
+#: gui/options.cpp:756
msgid "Correct aspect ratio for 320x200 games"
msgstr "320x200 jokoentzako formatu-ratioa zuzendu"
-#: gui/options.cpp:772
-msgid "EGA undithering"
-msgstr "EGA lausotzea"
-
-#: gui/options.cpp:772
-msgid "Enable undithering in EGA games that support it"
-msgstr "EGA lausotzea gaitu joko bateragarrietan"
-
-#: gui/options.cpp:780
+#: gui/options.cpp:764
msgid "Preferred Device:"
msgstr "Gogoko gailua:"
-#: gui/options.cpp:780
+#: gui/options.cpp:764
msgid "Music Device:"
msgstr "Musika gailua:"
-#: gui/options.cpp:780 gui/options.cpp:782
+#: gui/options.cpp:764 gui/options.cpp:766
msgid "Specifies preferred sound device or sound card emulator"
msgstr "Gogoko soinu txartel edo emuladorea zein den ezartzen du"
-#: gui/options.cpp:780 gui/options.cpp:782 gui/options.cpp:783
+#: gui/options.cpp:764 gui/options.cpp:766 gui/options.cpp:767
msgid "Specifies output sound device or sound card emulator"
msgstr "Irteerako soinu txartel edo emuladorea ezartzen du"
-#: gui/options.cpp:782
+#: gui/options.cpp:766
msgctxt "lowres"
msgid "Preferred Dev.:"
msgstr "Gail. gogokoa:"
-#: gui/options.cpp:782
+#: gui/options.cpp:766
msgctxt "lowres"
msgid "Music Device:"
msgstr "Musika gailua:"
-#: gui/options.cpp:809
+#: gui/options.cpp:793
msgid "AdLib emulator:"
msgstr "AdLib emuladorea:"
-#: gui/options.cpp:809 gui/options.cpp:810
+#: gui/options.cpp:793 gui/options.cpp:794
msgid "AdLib is used for music in many games"
msgstr "AdLib musikarako hainbat jokotan erabiltzen da"
-#: gui/options.cpp:820
+#: gui/options.cpp:804
msgid "Output rate:"
msgstr "Irteera maizt.:"
-#: gui/options.cpp:820 gui/options.cpp:821
+#: gui/options.cpp:804 gui/options.cpp:805
msgid ""
"Higher value specifies better sound quality but may be not supported by your "
"soundcard"
@@ -670,64 +667,64 @@ msgstr ""
"Balio altuagoek soinu kalitate hobea ezartzen dute, baina baliteke zure "
"soinu-txartela bateragarria ez izatea"
-#: gui/options.cpp:831
+#: gui/options.cpp:815
msgid "GM Device:"
msgstr "GM gailua:"
-#: gui/options.cpp:831
+#: gui/options.cpp:815
msgid "Specifies default sound device for General MIDI output"
msgstr "Defektuzko soinu txartela ezartzen du General MIDI irteerarako"
-#: gui/options.cpp:842
+#: gui/options.cpp:826
msgid "Don't use General MIDI music"
msgstr "Ez erabili General MIDI musika"
-#: gui/options.cpp:853 gui/options.cpp:915
+#: gui/options.cpp:837 gui/options.cpp:899
msgid "Use first available device"
msgstr "Erabilgarri dagoen lehen gailua erabili"
-#: gui/options.cpp:865
+#: gui/options.cpp:849
msgid "SoundFont:"
msgstr "SoundFont:"
-#: gui/options.cpp:865 gui/options.cpp:867 gui/options.cpp:868
+#: gui/options.cpp:849 gui/options.cpp:851 gui/options.cpp:852
msgid "SoundFont is supported by some audio cards, Fluidsynth and Timidity"
msgstr ""
"Zenbait soinu txartel bateragarriak dira SoundFont-ekin, Fluidsynth eta "
"Timidity besteak beste"
-#: gui/options.cpp:867
+#: gui/options.cpp:851
msgctxt "lowres"
msgid "SoundFont:"
msgstr "SoundFont:"
-#: gui/options.cpp:873
+#: gui/options.cpp:857
msgid "Mixed AdLib/MIDI mode"
msgstr "AdLib/MIDI modua"
-#: gui/options.cpp:873
+#: gui/options.cpp:857
msgid "Use both MIDI and AdLib sound generation"
msgstr "Soinua sortzerakoan MIDI eta AdLib erabili"
-#: gui/options.cpp:876
+#: gui/options.cpp:860
msgid "MIDI gain:"
msgstr "MIDI irabazia:"
-#: gui/options.cpp:886
+#: gui/options.cpp:870
msgid "MT-32 Device:"
msgstr "MT-32 gailua:"
-#: gui/options.cpp:886
+#: gui/options.cpp:870
msgid "Specifies default sound device for Roland MT-32/LAPC1/CM32l/CM64 output"
msgstr ""
"Roland MT-32/LAPC1/CM32l/CM64 irteerarako defektuzko soinu txartela ezartzen "
"du"
-#: gui/options.cpp:891
+#: gui/options.cpp:875
msgid "True Roland MT-32 (disable GM emulation)"
msgstr "Benetako Roland MT-32 (GM emulazio gabe)"
-#: gui/options.cpp:891 gui/options.cpp:893
+#: gui/options.cpp:875 gui/options.cpp:877
msgid ""
"Check if you want to use your real hardware Roland-compatible sound device "
"connected to your computer"
@@ -735,192 +732,192 @@ msgstr ""
"Markatu ordenagailura konektaturiko Roland-ekin bateragarria den soinu-"
"gailua erabiltzeko"
-#: gui/options.cpp:893
+#: gui/options.cpp:877
msgctxt "lowres"
msgid "True Roland MT-32 (no GM emulation)"
msgstr "Benetako Roland MT-32 (GM emulazio gabe)"
-#: gui/options.cpp:896
+#: gui/options.cpp:880
msgid "Enable Roland GS Mode"
msgstr "Roland GS modua gaitu"
-#: gui/options.cpp:896
+#: gui/options.cpp:880
msgid "Turns off General MIDI mapping for games with Roland MT-32 soundtrack"
msgstr ""
"Roland MT-32 soinua duten jokoetan General MIDI bihurtzea desgaitzen du"
-#: gui/options.cpp:905
+#: gui/options.cpp:889
msgid "Don't use Roland MT-32 music"
msgstr "Ez erabili Roland MT-32 musika"
-#: gui/options.cpp:932
+#: gui/options.cpp:916
msgid "Text and Speech:"
msgstr "Testu eta ahotsa:"
-#: gui/options.cpp:936 gui/options.cpp:946
+#: gui/options.cpp:920 gui/options.cpp:930
msgid "Speech"
msgstr "Ahotsa"
-#: gui/options.cpp:937 gui/options.cpp:947
+#: gui/options.cpp:921 gui/options.cpp:931
msgid "Subtitles"
msgstr "Azpitituluak"
-#: gui/options.cpp:938
+#: gui/options.cpp:922
msgid "Both"
msgstr "Biak"
-#: gui/options.cpp:940
+#: gui/options.cpp:924
msgid "Subtitle speed:"
msgstr "Azpitit. abiadura:"
-#: gui/options.cpp:942
+#: gui/options.cpp:926
msgctxt "lowres"
msgid "Text and Speech:"
msgstr "Testu eta ahotsa:"
-#: gui/options.cpp:946
+#: gui/options.cpp:930
msgid "Spch"
msgstr "Ahots."
-#: gui/options.cpp:947
+#: gui/options.cpp:931
msgid "Subs"
msgstr "Azp."
-#: gui/options.cpp:948
+#: gui/options.cpp:932
msgctxt "lowres"
msgid "Both"
msgstr "Biak"
-#: gui/options.cpp:948
+#: gui/options.cpp:932
msgid "Show subtitles and play speech"
msgstr "Ahotsak erreproduzitu eta azpitituluak erakutsi"
-#: gui/options.cpp:950
+#: gui/options.cpp:934
msgctxt "lowres"
msgid "Subtitle speed:"
msgstr "Azpit. abiadura:"
-#: gui/options.cpp:966
+#: gui/options.cpp:950
msgid "Music volume:"
msgstr "Musika:"
-#: gui/options.cpp:968
+#: gui/options.cpp:952
msgctxt "lowres"
msgid "Music volume:"
msgstr "Musika:"
-#: gui/options.cpp:975
+#: gui/options.cpp:959
msgid "Mute All"
msgstr "Mututu dena"
-#: gui/options.cpp:978
+#: gui/options.cpp:962
msgid "SFX volume:"
msgstr "Efektuak:"
-#: gui/options.cpp:978 gui/options.cpp:980 gui/options.cpp:981
+#: gui/options.cpp:962 gui/options.cpp:964 gui/options.cpp:965
msgid "Special sound effects volume"
msgstr "Soinu efektu berezien bolumena"
-#: gui/options.cpp:980
+#: gui/options.cpp:964
msgctxt "lowres"
msgid "SFX volume:"
msgstr "Efektuak:"
-#: gui/options.cpp:988
+#: gui/options.cpp:972
msgid "Speech volume:"
msgstr "Ahotsak:"
-#: gui/options.cpp:990
+#: gui/options.cpp:974
msgctxt "lowres"
msgid "Speech volume:"
msgstr "Ahotsak:"
-#: gui/options.cpp:1156
+#: gui/options.cpp:1131
msgid "Theme Path:"
msgstr "Gaiak:"
-#: gui/options.cpp:1158
+#: gui/options.cpp:1133
msgctxt "lowres"
msgid "Theme Path:"
msgstr "Gaiak:"
-#: gui/options.cpp:1164 gui/options.cpp:1166 gui/options.cpp:1167
+#: gui/options.cpp:1139 gui/options.cpp:1141 gui/options.cpp:1142
msgid "Specifies path to additional data used by all games or ScummVM"
msgstr ""
"Joko guztiek edo ScummVM-k darabilten datu gehigarrien bide-izena ezartzen du"
-#: gui/options.cpp:1173
+#: gui/options.cpp:1148
msgid "Plugins Path:"
msgstr "Pluginak:"
-#: gui/options.cpp:1175
+#: gui/options.cpp:1150
msgctxt "lowres"
msgid "Plugins Path:"
msgstr "Pluginak:"
-#: gui/options.cpp:1184
+#: gui/options.cpp:1159
msgid "Misc"
msgstr "Beste"
-#: gui/options.cpp:1186
+#: gui/options.cpp:1161
msgctxt "lowres"
msgid "Misc"
msgstr "Beste"
-#: gui/options.cpp:1188
+#: gui/options.cpp:1163
msgid "Theme:"
msgstr "Gaia:"
-#: gui/options.cpp:1192
+#: gui/options.cpp:1167
msgid "GUI Renderer:"
msgstr "Interfazea:"
-#: gui/options.cpp:1204
+#: gui/options.cpp:1179
msgid "Autosave:"
msgstr "Autogordetzea:"
-#: gui/options.cpp:1206
+#: gui/options.cpp:1181
msgctxt "lowres"
msgid "Autosave:"
msgstr "Autogordetzea:"
-#: gui/options.cpp:1214
+#: gui/options.cpp:1189
msgid "Keys"
msgstr "Teklak"
-#: gui/options.cpp:1221
+#: gui/options.cpp:1196
msgid "GUI Language:"
msgstr "Hizkuntza"
-#: gui/options.cpp:1221
+#: gui/options.cpp:1196
msgid "Language of ScummVM GUI"
msgstr "ScummVM interfazearen hizkuntza"
-#: gui/options.cpp:1372
+#: gui/options.cpp:1347
msgid "You have to restart ScummVM before your changes will take effect."
msgstr "ScummVM berrabiarazi behar duzu aldaketak indarrean jartzeko"
-#: gui/options.cpp:1385
+#: gui/options.cpp:1360
msgid "Select directory for savegames"
msgstr "Gordetako partiden direktorioa aukeratu"
-#: gui/options.cpp:1392
+#: gui/options.cpp:1367
msgid "The chosen directory cannot be written to. Please select another one."
msgstr "Aukeraturiko direktorioan ezin da idatzi. Mesedez, aukeratu beste bat."
-#: gui/options.cpp:1401
+#: gui/options.cpp:1376
msgid "Select directory for GUI themes"
msgstr "Gaien direktorioa aukeratu"
-#: gui/options.cpp:1411
+#: gui/options.cpp:1386
msgid "Select directory for extra files"
msgstr "Fitxategi gehigarrien direktorioa aukeratu"
-#: gui/options.cpp:1422
+#: gui/options.cpp:1397
msgid "Select directory for plugins"
msgstr "Pluginen direktorioa aukeratu"
-#: gui/options.cpp:1475
+#: gui/options.cpp:1450
msgid ""
"The theme you selected does not support your current language. If you want "
"to use this theme you need to switch to another language first."
@@ -968,64 +965,64 @@ msgstr "Titulurik gabeko partida"
msgid "Select a Theme"
msgstr "Gaia aukeratu"
-#: gui/ThemeEngine.cpp:333
+#: gui/ThemeEngine.cpp:335
msgid "Disabled GFX"
msgstr "GFX desgaituta"
-#: gui/ThemeEngine.cpp:333
+#: gui/ThemeEngine.cpp:335
msgctxt "lowres"
msgid "Disabled GFX"
msgstr "GFX desgaituta"
-#: gui/ThemeEngine.cpp:334
+#: gui/ThemeEngine.cpp:336
msgid "Standard Renderer (16bpp)"
msgstr "Estandarra (16bpp)"
-#: gui/ThemeEngine.cpp:334
+#: gui/ThemeEngine.cpp:336
msgid "Standard (16bpp)"
msgstr "Estandarra (16bpp)"
-#: gui/ThemeEngine.cpp:336
+#: gui/ThemeEngine.cpp:338
msgid "Antialiased Renderer (16bpp)"
msgstr "Lausotua (16bpp)"
-#: gui/ThemeEngine.cpp:336
+#: gui/ThemeEngine.cpp:338
msgid "Antialiased (16bpp)"
msgstr "Lausotua (16bpp)"
-#: gui/widget.cpp:312 gui/widget.cpp:314 gui/widget.cpp:320 gui/widget.cpp:322
+#: gui/widget.cpp:322 gui/widget.cpp:324 gui/widget.cpp:330 gui/widget.cpp:332
msgid "Clear value"
msgstr "Balioa kendu:"
-#: base/main.cpp:203
+#: base/main.cpp:209
#, c-format
msgid "Engine does not support debug level '%s'"
msgstr "Motoreak ez da '%s' debug mailarekin bateragarria"
-#: base/main.cpp:275
+#: base/main.cpp:287
msgid "Menu"
msgstr "Menua"
-#: base/main.cpp:278 backends/platform/symbian/src/SymbianActions.cpp:45
+#: base/main.cpp:290 backends/platform/symbian/src/SymbianActions.cpp:45
#: backends/platform/wince/CEActionsPocket.cpp:45
#: backends/platform/wince/CEActionsSmartphone.cpp:46
msgid "Skip"
msgstr "Saltatu"
-#: base/main.cpp:281 backends/platform/symbian/src/SymbianActions.cpp:50
+#: base/main.cpp:293 backends/platform/symbian/src/SymbianActions.cpp:50
#: backends/platform/wince/CEActionsPocket.cpp:42
msgid "Pause"
msgstr "Gelditu"
-#: base/main.cpp:284
+#: base/main.cpp:296
msgid "Skip line"
msgstr "Lerroa saltatu"
-#: base/main.cpp:455
+#: base/main.cpp:467
msgid "Error running game:"
msgstr "Jokoa exekutatzean errorea:"
-#: base/main.cpp:479
+#: base/main.cpp:491
msgid "Could not find any engine capable of running the selected game"
msgstr "Ezin izan da aukeraturiko jokoa exekutatzeko gai den motorerik aurkitu"
@@ -1093,16 +1090,16 @@ msgstr "Erabiltzaileak utzia"
msgid "Unknown error"
msgstr "Errore ezezaguna"
-#: engines/advancedDetector.cpp:296
+#: engines/advancedDetector.cpp:324
#, c-format
msgid "The game in '%s' seems to be unknown."
msgstr "'%s'-(e)ko jokoa ezezaguna dela dirudi"
-#: engines/advancedDetector.cpp:297
+#: engines/advancedDetector.cpp:325
msgid "Please, report the following data to the ScummVM team along with name"
msgstr "Mesedez, bidali hurrengo datuak ScummVM taldeari gehitzen saiatu zaren"
-#: engines/advancedDetector.cpp:299
+#: engines/advancedDetector.cpp:327
msgid "of the game you tried to add and its version/language/etc.:"
msgstr "jokoaren izen, bertsio/hizkuntza/e.a.-ekin batera:"
@@ -1139,13 +1136,14 @@ msgctxt "lowres"
msgid "~R~eturn to Launcher"
msgstr "It~z~uli abiarazlera"
-#: engines/dialogs.cpp:116 engines/cruise/menu.cpp:214
-#: engines/sci/engine/kfile.cpp:566
+#: engines/dialogs.cpp:116 engines/agi/saveload.cpp:805
+#: engines/cruise/menu.cpp:214 engines/sci/engine/kfile.cpp:567
msgid "Save game:"
msgstr "Gorde jokoa:"
-#: engines/dialogs.cpp:116 engines/scumm/dialogs.cpp:187
-#: engines/cruise/menu.cpp:214 engines/sci/engine/kfile.cpp:566
+#: engines/dialogs.cpp:116 engines/agi/saveload.cpp:805
+#: engines/scumm/dialogs.cpp:187 engines/cruise/menu.cpp:214
+#: engines/sci/engine/kfile.cpp:567
#: backends/platform/symbian/src/SymbianActions.cpp:44
#: backends/platform/wince/CEActionsPocket.cpp:43
#: backends/platform/wince/CEActionsPocket.cpp:267
@@ -1253,6 +1251,88 @@ msgstr ""
msgid "Start anyway"
msgstr "Jolastu berdin-berdin"
+#: engines/agi/detection.cpp:145 engines/dreamweb/detection.cpp:47
+#: engines/sci/detection.cpp:390
+msgid "Use original save/load screens"
+msgstr ""
+
+#: engines/agi/detection.cpp:146 engines/dreamweb/detection.cpp:48
+#: engines/sci/detection.cpp:391
+msgid "Use the original save/load screens, instead of the ScummVM ones"
+msgstr ""
+
+#: engines/agi/saveload.cpp:827 engines/sci/engine/kfile.cpp:674
+msgid "Restore game:"
+msgstr "Jokoa kargatu:"
+
+#: engines/agi/saveload.cpp:827 engines/sci/engine/kfile.cpp:674
+msgid "Restore"
+msgstr "Kargatu"
+
+#: engines/dreamweb/detection.cpp:57
+#, fuzzy
+msgid "Use bright palette mode"
+msgstr "Goiko eskuineko objektua"
+
+#: engines/dreamweb/detection.cpp:58
+msgid "Display graphics using the game's bright palette"
+msgstr ""
+
+#: engines/sci/detection.cpp:370
+msgid "EGA undithering"
+msgstr "EGA lausotzea"
+
+#: engines/sci/detection.cpp:371
+#, fuzzy
+msgid "Enable undithering in EGA games"
+msgstr "EGA lausotzea gaitu joko bateragarrietan"
+
+#: engines/sci/detection.cpp:380
+#, fuzzy
+msgid "Prefer digital sound effects"
+msgstr "Soinu efektu berezien bolumena"
+
+#: engines/sci/detection.cpp:381
+msgid "Prefer digital sound effects instead of synthesized ones"
+msgstr ""
+
+#: engines/sci/detection.cpp:400
+msgid "Use IMF/Yahama FB-01 for MIDI output"
+msgstr ""
+
+#: engines/sci/detection.cpp:401
+msgid ""
+"Use an IBM Music Feature card or a Yahama FB-01 FM synth module for MIDI "
+"output"
+msgstr ""
+
+#: engines/sci/detection.cpp:411
+msgid "Use CD audio"
+msgstr ""
+
+#: engines/sci/detection.cpp:412
+msgid "Use CD audio instead of in-game audio, if available"
+msgstr ""
+
+#: engines/sci/detection.cpp:422
+msgid "Use Windows cursors"
+msgstr ""
+
+#: engines/sci/detection.cpp:423
+msgid ""
+"Use the Windows cursors (smaller and monochrome) instead of the DOS ones"
+msgstr ""
+
+#: engines/sci/detection.cpp:433
+#, fuzzy
+msgid "Use silver cursors"
+msgstr "Kurtsore normala"
+
+#: engines/sci/detection.cpp:434
+msgid ""
+"Use the alternate set of silver cursors, instead of the normal golden ones"
+msgstr ""
+
#: engines/scumm/dialogs.cpp:175
#, c-format
msgid "Insert Disk %c and Press Button to Continue."
@@ -1909,7 +1989,7 @@ msgstr ""
"MIDI euskarri natiboak LucasArts-en Roland eguneraketa behar du,\n"
"baina %s ez dago eskuragarri. AdLib erabiliko da."
-#: engines/scumm/scumm.cpp:2271 engines/agos/saveload.cpp:189
+#: engines/scumm/scumm.cpp:2271 engines/agos/saveload.cpp:202
#, c-format
msgid ""
"Failed to save game state to file:\n"
@@ -1920,7 +2000,7 @@ msgstr ""
"\n"
"%s"
-#: engines/scumm/scumm.cpp:2278 engines/agos/saveload.cpp:154
+#: engines/scumm/scumm.cpp:2278 engines/agos/saveload.cpp:167
#, c-format
msgid ""
"Failed to load game state from file:\n"
@@ -1931,7 +2011,7 @@ msgstr ""
"\n"
"%s"
-#: engines/scumm/scumm.cpp:2290 engines/agos/saveload.cpp:197
+#: engines/scumm/scumm.cpp:2290 engines/agos/saveload.cpp:210
#, c-format
msgid ""
"Successfully saved game state in file:\n"
@@ -1978,14 +2058,6 @@ msgstr "Menu ~n~agusia"
msgid "~W~ater Effect Enabled"
msgstr "~U~r-efektua gaituta"
-#: engines/sci/engine/kfile.cpp:673
-msgid "Restore game:"
-msgstr "Jokoa kargatu:"
-
-#: engines/sci/engine/kfile.cpp:673
-msgid "Restore"
-msgstr "Kargatu"
-
#: engines/agos/animation.cpp:550
#, c-format
msgid "Cutscene file '%s' not found!"
@@ -2008,6 +2080,66 @@ msgstr "Ezin izan da fitxategia ezabatu"
msgid "Failed to save game"
msgstr "Ezin izan da jokoa gorde"
+#. I18N: Studio audience adds an applause and cheering sounds whenever
+#. Malcolm makes a joke.
+#: engines/kyra/detection.cpp:62
+msgid "Studio audience"
+msgstr ""
+
+#: engines/kyra/detection.cpp:63
+msgid "Enable studio audience"
+msgstr ""
+
+#. I18N: This option allows the user to skip text and cutscenes.
+#: engines/kyra/detection.cpp:73
+msgid "Skip support"
+msgstr ""
+
+#: engines/kyra/detection.cpp:74
+msgid "Allow text and cutscenes to be skipped"
+msgstr ""
+
+#. I18N: Helium mode makes people sound like they've inhaled Helium.
+#: engines/kyra/detection.cpp:84
+msgid "Helium mode"
+msgstr ""
+
+#: engines/kyra/detection.cpp:85
+#, fuzzy
+msgid "Enable helium mode"
+msgstr "Roland GS modua gaitu"
+
+#. I18N: When enabled, this option makes scrolling smoother when
+#. changing from one screen to another.
+#: engines/kyra/detection.cpp:99
+msgid "Smooth scrolling"
+msgstr ""
+
+#: engines/kyra/detection.cpp:100
+msgid "Enable smooth scrolling when walking"
+msgstr ""
+
+#. I18N: When enabled, this option changes the cursor when it floats to the
+#. edge of the screen to a directional arrow. The player can then click to
+#. walk towards that direction.
+#: engines/kyra/detection.cpp:112
+#, fuzzy
+msgid "Floating cursors"
+msgstr "Kurtsore normala"
+
+#: engines/kyra/detection.cpp:113
+msgid "Enable floating cursors"
+msgstr ""
+
+#. I18N: HP stands for Hit Points
+#: engines/kyra/detection.cpp:127
+msgid "HP bar graphs"
+msgstr ""
+
+#: engines/kyra/detection.cpp:128
+msgid "Enable hit point bar graphs"
+msgstr ""
+
#: engines/kyra/lol.cpp:478
msgid "Attack 1"
msgstr "1 erasoa"
@@ -2070,6 +2202,14 @@ msgstr ""
"General MIDIkoetara egokitzen saiatuko gara,\n"
"baina posible da pista batzuk egoki ez entzutea."
+#: engines/queen/queen.cpp:59 engines/sky/detection.cpp:44
+msgid "Floppy intro"
+msgstr ""
+
+#: engines/queen/queen.cpp:60 engines/sky/detection.cpp:45
+msgid "Use the floppy version's intro (CD version only)"
+msgstr ""
+
#: engines/sky/compact.cpp:130
msgid ""
"Unable to find \"sky.cpt\" file!\n"
@@ -2151,6 +2291,14 @@ msgstr ""
"PSX eszenak aurkitu dira, baina ScummVM RGB kolorearen euskarri gabe "
"konpilatu da"
+#: engines/sword2/sword2.cpp:79
+msgid "Show object labels"
+msgstr ""
+
+#: engines/sword2/sword2.cpp:80
+msgid "Show labels for objects on mouse hover"
+msgstr ""
+
#: engines/parallaction/saveload.cpp:133
#, c-format
msgid ""
@@ -2386,19 +2534,19 @@ msgstr "Kalitate altuko soinua (geldoagoa) (berrabiarazi)"
msgid "Disable power off"
msgstr "Itzaltzea desgaitu"
-#: backends/platform/iphone/osys_events.cpp:301
+#: backends/platform/iphone/osys_events.cpp:300
msgid "Mouse-click-and-drag mode enabled."
msgstr "Saguko klik-eta-arrastratu modua gaituta."
-#: backends/platform/iphone/osys_events.cpp:303
+#: backends/platform/iphone/osys_events.cpp:302
msgid "Mouse-click-and-drag mode disabled."
msgstr "Saguko klik-eta-arrastratu modua desgaituta."
-#: backends/platform/iphone/osys_events.cpp:314
+#: backends/platform/iphone/osys_events.cpp:313
msgid "Touchpad mode enabled."
msgstr "Touchpad modua gaituta."
-#: backends/platform/iphone/osys_events.cpp:316
+#: backends/platform/iphone/osys_events.cpp:315
msgid "Touchpad mode disabled."
msgstr "Touchpad modua desgaituta."
@@ -2474,15 +2622,15 @@ msgstr "Filtro grafiko aktiboa:"
msgid "Windowed mode"
msgstr "Leiho modua"
-#: backends/graphics/opengl/opengl-graphics.cpp:130
+#: backends/graphics/opengl/opengl-graphics.cpp:135
msgid "OpenGL Normal"
msgstr "OpenGL normala"
-#: backends/graphics/opengl/opengl-graphics.cpp:131
+#: backends/graphics/opengl/opengl-graphics.cpp:136
msgid "OpenGL Conserve"
msgstr "OpenGL aurreztu"
-#: backends/graphics/opengl/opengl-graphics.cpp:132
+#: backends/graphics/opengl/opengl-graphics.cpp:137
msgid "OpenGL Original"
msgstr "OpenGL jatorrizkoa"
diff --git a/po/fr_FR.po b/po/fr_FR.po
index bf6ac4424d..6270ab3f73 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ScummVM 1.3.0svn\n"
"Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n"
-"POT-Creation-Date: 2012-03-07 22:09+0000\n"
+"POT-Creation-Date: 2012-05-20 22:39+0100\n"
"PO-Revision-Date: 2011-10-23 14:52+0100\n"
"Last-Translator: Thierry Crozat <criezy@scummvm.org>\n"
"Language-Team: French <scummvm-devel@lists.sf.net>\n"
@@ -44,7 +44,7 @@ msgid "Go up"
msgstr "Remonter"
#: gui/browser.cpp:69 gui/chooser.cpp:45 gui/KeysDialog.cpp:43
-#: gui/launcher.cpp:320 gui/massadd.cpp:94 gui/options.cpp:1253
+#: gui/launcher.cpp:345 gui/massadd.cpp:94 gui/options.cpp:1228
#: gui/saveload.cpp:63 gui/saveload.cpp:155 gui/themebrowser.cpp:54
#: engines/engine.cpp:442 engines/scumm/dialogs.cpp:190
#: engines/sword1/control.cpp:865 engines/parallaction/saveload.cpp:281
@@ -69,15 +69,15 @@ msgstr "Fermer"
msgid "Mouse click"
msgstr "Clic de souris"
-#: gui/gui-manager.cpp:122 base/main.cpp:288
+#: gui/gui-manager.cpp:122 base/main.cpp:300
msgid "Display keyboard"
msgstr "Afficher le clavier"
-#: gui/gui-manager.cpp:126 base/main.cpp:292
+#: gui/gui-manager.cpp:126 base/main.cpp:304
msgid "Remap keys"
msgstr "Changer l'affectation des touches"
-#: gui/gui-manager.cpp:129 base/main.cpp:295
+#: gui/gui-manager.cpp:129 base/main.cpp:307
msgid "Toggle FullScreen"
msgstr "Basculer en plein щcran"
@@ -89,8 +89,8 @@ msgstr "Sщlectionnez une action р affecter"
msgid "Map"
msgstr "Affecter"
-#: gui/KeysDialog.cpp:42 gui/launcher.cpp:321 gui/launcher.cpp:960
-#: gui/launcher.cpp:964 gui/massadd.cpp:91 gui/options.cpp:1254
+#: gui/KeysDialog.cpp:42 gui/launcher.cpp:346 gui/launcher.cpp:1001
+#: gui/launcher.cpp:1005 gui/massadd.cpp:91 gui/options.cpp:1229
#: engines/engine.cpp:361 engines/engine.cpp:372 engines/scumm/dialogs.cpp:192
#: engines/scumm/scumm.cpp:1775 engines/agos/animation.cpp:551
#: engines/groovie/script.cpp:420 engines/sky/compact.cpp:131
@@ -127,15 +127,15 @@ msgstr "Selectionnez une action"
msgid "Press the key to associate"
msgstr "Appuyez sur la touche р associer"
-#: gui/launcher.cpp:170
+#: gui/launcher.cpp:187
msgid "Game"
msgstr "Jeu"
-#: gui/launcher.cpp:174
+#: gui/launcher.cpp:191
msgid "ID:"
msgstr "ID:"
-#: gui/launcher.cpp:174 gui/launcher.cpp:176 gui/launcher.cpp:177
+#: gui/launcher.cpp:191 gui/launcher.cpp:193 gui/launcher.cpp:194
msgid ""
"Short game identifier used for referring to savegames and running the game "
"from the command line"
@@ -143,29 +143,29 @@ msgstr ""
"ID compact du jeu utilisщe pour identifier les sauvegardes et dщmarrer le "
"jeu depuis la ligne de commande"
-#: gui/launcher.cpp:176
+#: gui/launcher.cpp:193
msgctxt "lowres"
msgid "ID:"
msgstr "ID:"
-#: gui/launcher.cpp:181
+#: gui/launcher.cpp:198
msgid "Name:"
msgstr "Nom:"
-#: gui/launcher.cpp:181 gui/launcher.cpp:183 gui/launcher.cpp:184
+#: gui/launcher.cpp:198 gui/launcher.cpp:200 gui/launcher.cpp:201
msgid "Full title of the game"
msgstr "Nom complet du jeu"
-#: gui/launcher.cpp:183
+#: gui/launcher.cpp:200
msgctxt "lowres"
msgid "Name:"
msgstr "Nom:"
-#: gui/launcher.cpp:187
+#: gui/launcher.cpp:204
msgid "Language:"
msgstr "Langue:"
-#: gui/launcher.cpp:187 gui/launcher.cpp:188
+#: gui/launcher.cpp:204 gui/launcher.cpp:205
msgid ""
"Language of the game. This will not turn your Spanish game version into "
"English"
@@ -173,281 +173,286 @@ msgstr ""
"Langue du jeu. Cela ne traduira pas en anglais par magie votre version "
"espagnole du jeu."
-#: gui/launcher.cpp:189 gui/launcher.cpp:203 gui/options.cpp:80
-#: gui/options.cpp:745 gui/options.cpp:758 gui/options.cpp:1224
+#: gui/launcher.cpp:206 gui/launcher.cpp:220 gui/options.cpp:80
+#: gui/options.cpp:730 gui/options.cpp:743 gui/options.cpp:1199
#: audio/null.cpp:40
msgid "<default>"
msgstr "<defaut>"
-#: gui/launcher.cpp:199
+#: gui/launcher.cpp:216
msgid "Platform:"
msgstr "Plateforme:"
-#: gui/launcher.cpp:199 gui/launcher.cpp:201 gui/launcher.cpp:202
+#: gui/launcher.cpp:216 gui/launcher.cpp:218 gui/launcher.cpp:219
msgid "Platform the game was originally designed for"
msgstr "Plateforme pour laquelle votre jeu a щtщ conчu"
-#: gui/launcher.cpp:201
+#: gui/launcher.cpp:218
msgctxt "lowres"
msgid "Platform:"
msgstr "Systшme:"
-#: gui/launcher.cpp:213 gui/options.cpp:1087 gui/options.cpp:1104
+#: gui/launcher.cpp:231
+#, fuzzy
+msgid "Engine"
+msgstr "Examiner"
+
+#: gui/launcher.cpp:239 gui/options.cpp:1062 gui/options.cpp:1079
msgid "Graphics"
msgstr "Graphique"
-#: gui/launcher.cpp:213 gui/options.cpp:1087 gui/options.cpp:1104
+#: gui/launcher.cpp:239 gui/options.cpp:1062 gui/options.cpp:1079
msgid "GFX"
msgstr "GFX"
-#: gui/launcher.cpp:216
+#: gui/launcher.cpp:242
msgid "Override global graphic settings"
msgstr "Utiliser des rщglages graphiques spщcifiques р ce jeux"
-#: gui/launcher.cpp:218
+#: gui/launcher.cpp:244
msgctxt "lowres"
msgid "Override global graphic settings"
msgstr "Rщglages spщcifiques р ce jeux"
-#: gui/launcher.cpp:225 gui/options.cpp:1110
+#: gui/launcher.cpp:251 gui/options.cpp:1085
msgid "Audio"
msgstr "Audio"
-#: gui/launcher.cpp:228
+#: gui/launcher.cpp:254
msgid "Override global audio settings"
msgstr "Utiliser des rщglages audio spщcifiques р ce jeux"
-#: gui/launcher.cpp:230
+#: gui/launcher.cpp:256
msgctxt "lowres"
msgid "Override global audio settings"
msgstr "Rщglages spщcifiques р ce jeux"
-#: gui/launcher.cpp:239 gui/options.cpp:1115
+#: gui/launcher.cpp:265 gui/options.cpp:1090
msgid "Volume"
msgstr "Volume"
-#: gui/launcher.cpp:241 gui/options.cpp:1117
+#: gui/launcher.cpp:267 gui/options.cpp:1092
msgctxt "lowres"
msgid "Volume"
msgstr "Volume"
-#: gui/launcher.cpp:244
+#: gui/launcher.cpp:270
msgid "Override global volume settings"
msgstr "Utiliser des rщglages de volume sonore spщcifiques р ce jeux"
-#: gui/launcher.cpp:246
+#: gui/launcher.cpp:272
msgctxt "lowres"
msgid "Override global volume settings"
msgstr "Rщglages spщcifiques р ce jeux"
-#: gui/launcher.cpp:254 gui/options.cpp:1125
+#: gui/launcher.cpp:280 gui/options.cpp:1100
msgid "MIDI"
msgstr "MIDI"
-#: gui/launcher.cpp:257
+#: gui/launcher.cpp:283
msgid "Override global MIDI settings"
msgstr "Utiliser des rщglages MIDI spщcifiques р ce jeux"
-#: gui/launcher.cpp:259
+#: gui/launcher.cpp:285
msgctxt "lowres"
msgid "Override global MIDI settings"
msgstr "Rщglages spщcifiques р ce jeux"
-#: gui/launcher.cpp:268 gui/options.cpp:1131
+#: gui/launcher.cpp:294 gui/options.cpp:1106
msgid "MT-32"
msgstr "MT-32"
-#: gui/launcher.cpp:271
+#: gui/launcher.cpp:297
msgid "Override global MT-32 settings"
msgstr "Utiliser des rщglages MT-32 spщcifiques р ce jeux"
-#: gui/launcher.cpp:273
+#: gui/launcher.cpp:299
msgctxt "lowres"
msgid "Override global MT-32 settings"
msgstr "Rщglages spщcifiques р ce jeux"
-#: gui/launcher.cpp:282 gui/options.cpp:1138
+#: gui/launcher.cpp:308 gui/options.cpp:1113
msgid "Paths"
msgstr "Chemins"
-#: gui/launcher.cpp:284 gui/options.cpp:1140
+#: gui/launcher.cpp:310 gui/options.cpp:1115
msgctxt "lowres"
msgid "Paths"
msgstr "Chemins"
-#: gui/launcher.cpp:291
+#: gui/launcher.cpp:317
msgid "Game Path:"
msgstr "Chemin du Jeu:"
-#: gui/launcher.cpp:293
+#: gui/launcher.cpp:319
msgctxt "lowres"
msgid "Game Path:"
msgstr "Chemin du Jeu:"
-#: gui/launcher.cpp:298 gui/options.cpp:1164
+#: gui/launcher.cpp:324 gui/options.cpp:1139
msgid "Extra Path:"
msgstr "Extra:"
-#: gui/launcher.cpp:298 gui/launcher.cpp:300 gui/launcher.cpp:301
+#: gui/launcher.cpp:324 gui/launcher.cpp:326 gui/launcher.cpp:327
msgid "Specifies path to additional data used the game"
msgstr "Dщfinie un chemin vers des donnщes suplщmentaires utilisщes par le jeu"
-#: gui/launcher.cpp:300 gui/options.cpp:1166
+#: gui/launcher.cpp:326 gui/options.cpp:1141
msgctxt "lowres"
msgid "Extra Path:"
msgstr "Extra:"
-#: gui/launcher.cpp:307 gui/options.cpp:1148
+#: gui/launcher.cpp:333 gui/options.cpp:1123
msgid "Save Path:"
msgstr "Sauvegardes:"
-#: gui/launcher.cpp:307 gui/launcher.cpp:309 gui/launcher.cpp:310
-#: gui/options.cpp:1148 gui/options.cpp:1150 gui/options.cpp:1151
+#: gui/launcher.cpp:333 gui/launcher.cpp:335 gui/launcher.cpp:336
+#: gui/options.cpp:1123 gui/options.cpp:1125 gui/options.cpp:1126
msgid "Specifies where your savegames are put"
msgstr "Dщfinie l'emplacement oљ les fichiers de sauvegarde sont crщщs"
-#: gui/launcher.cpp:309 gui/options.cpp:1150
+#: gui/launcher.cpp:335 gui/options.cpp:1125
msgctxt "lowres"
msgid "Save Path:"
msgstr "Sauvegardes:"
-#: gui/launcher.cpp:329 gui/launcher.cpp:416 gui/launcher.cpp:469
-#: gui/launcher.cpp:523 gui/options.cpp:1159 gui/options.cpp:1167
-#: gui/options.cpp:1176 gui/options.cpp:1283 gui/options.cpp:1289
-#: gui/options.cpp:1297 gui/options.cpp:1327 gui/options.cpp:1333
-#: gui/options.cpp:1340 gui/options.cpp:1433 gui/options.cpp:1436
-#: gui/options.cpp:1448
+#: gui/launcher.cpp:354 gui/launcher.cpp:453 gui/launcher.cpp:511
+#: gui/launcher.cpp:565 gui/options.cpp:1134 gui/options.cpp:1142
+#: gui/options.cpp:1151 gui/options.cpp:1258 gui/options.cpp:1264
+#: gui/options.cpp:1272 gui/options.cpp:1302 gui/options.cpp:1308
+#: gui/options.cpp:1315 gui/options.cpp:1408 gui/options.cpp:1411
+#: gui/options.cpp:1423
msgctxt "path"
msgid "None"
msgstr "Aucun"
-#: gui/launcher.cpp:334 gui/launcher.cpp:422 gui/launcher.cpp:527
-#: gui/options.cpp:1277 gui/options.cpp:1321 gui/options.cpp:1439
+#: gui/launcher.cpp:359 gui/launcher.cpp:459 gui/launcher.cpp:569
+#: gui/options.cpp:1252 gui/options.cpp:1296 gui/options.cpp:1414
#: backends/platform/wii/options.cpp:56
msgid "Default"
msgstr "Dщfaut"
-#: gui/launcher.cpp:462 gui/options.cpp:1442
+#: gui/launcher.cpp:504 gui/options.cpp:1417
msgid "Select SoundFont"
msgstr "Choisir une banque de sons"
-#: gui/launcher.cpp:481 gui/launcher.cpp:636
+#: gui/launcher.cpp:523 gui/launcher.cpp:677
msgid "Select directory with game data"
msgstr "Sщlectionner le rщpertoire contenant les donnщes du jeu"
-#: gui/launcher.cpp:499
+#: gui/launcher.cpp:541
msgid "Select additional game directory"
msgstr "Sщlectionner un rщpertoire supplщmentaire"
-#: gui/launcher.cpp:511
+#: gui/launcher.cpp:553
msgid "Select directory for saved games"
msgstr "Sщlectionner le rщpertoire pour les sauvegardes"
-#: gui/launcher.cpp:538
+#: gui/launcher.cpp:580
msgid "This game ID is already taken. Please choose another one."
msgstr "Cet ID est dщjр utilisщ par un autre jeu. Choisissez en un autre svp."
-#: gui/launcher.cpp:579 engines/dialogs.cpp:110
+#: gui/launcher.cpp:621 engines/dialogs.cpp:110
msgid "~Q~uit"
msgstr "~Q~uitter"
-#: gui/launcher.cpp:579 backends/platform/sdl/macosx/appmenu_osx.mm:96
+#: gui/launcher.cpp:621 backends/platform/sdl/macosx/appmenu_osx.mm:96
msgid "Quit ScummVM"
msgstr "Quitter ScummVM"
-#: gui/launcher.cpp:580
+#: gui/launcher.cpp:622
msgid "A~b~out..."
msgstr "Р ~P~ropos..."
-#: gui/launcher.cpp:580 backends/platform/sdl/macosx/appmenu_osx.mm:70
+#: gui/launcher.cpp:622 backends/platform/sdl/macosx/appmenu_osx.mm:70
msgid "About ScummVM"
msgstr "Р propos de ScummVM"
-#: gui/launcher.cpp:581
+#: gui/launcher.cpp:623
msgid "~O~ptions..."
msgstr "~O~ptions..."
-#: gui/launcher.cpp:581
+#: gui/launcher.cpp:623
msgid "Change global ScummVM options"
msgstr "Change les options globales de ScummVM"
-#: gui/launcher.cpp:583
+#: gui/launcher.cpp:625
msgid "~S~tart"
msgstr "~D~щmarrer"
-#: gui/launcher.cpp:583
+#: gui/launcher.cpp:625
msgid "Start selected game"
msgstr "Dщmarre le jeu sщlectionnщ"
-#: gui/launcher.cpp:586
+#: gui/launcher.cpp:628
msgid "~L~oad..."
msgstr "~C~harger"
-#: gui/launcher.cpp:586
+#: gui/launcher.cpp:628
msgid "Load savegame for selected game"
msgstr "Charge une sauvegarde pour le jeu sщlectionnщ"
-#: gui/launcher.cpp:591 gui/launcher.cpp:1079
+#: gui/launcher.cpp:633 gui/launcher.cpp:1120
msgid "~A~dd Game..."
msgstr "~A~jouter..."
-#: gui/launcher.cpp:591 gui/launcher.cpp:598
+#: gui/launcher.cpp:633 gui/launcher.cpp:640
msgid "Hold Shift for Mass Add"
msgstr ""
"Ajoute un jeu р la Liste. Maintenez Shift enfoncщe pour un Ajout Massif"
-#: gui/launcher.cpp:593
+#: gui/launcher.cpp:635
msgid "~E~dit Game..."
msgstr "~E~diter..."
-#: gui/launcher.cpp:593 gui/launcher.cpp:600
+#: gui/launcher.cpp:635 gui/launcher.cpp:642
msgid "Change game options"
msgstr "Change les options du jeu"
-#: gui/launcher.cpp:595
+#: gui/launcher.cpp:637
msgid "~R~emove Game"
msgstr "~S~upprimer"
-#: gui/launcher.cpp:595 gui/launcher.cpp:602
+#: gui/launcher.cpp:637 gui/launcher.cpp:644
msgid "Remove game from the list. The game data files stay intact"
msgstr "Supprime le jeu de la liste. Les fichiers sont conservщs"
-#: gui/launcher.cpp:598 gui/launcher.cpp:1079
+#: gui/launcher.cpp:640 gui/launcher.cpp:1120
msgctxt "lowres"
msgid "~A~dd Game..."
msgstr "~A~jouter..."
-#: gui/launcher.cpp:600
+#: gui/launcher.cpp:642
msgctxt "lowres"
msgid "~E~dit Game..."
msgstr "~E~diter..."
-#: gui/launcher.cpp:602
+#: gui/launcher.cpp:644
msgctxt "lowres"
msgid "~R~emove Game"
msgstr "~S~upprimer"
-#: gui/launcher.cpp:610
+#: gui/launcher.cpp:652
msgid "Search in game list"
msgstr "Recherche dans la liste de jeux"
-#: gui/launcher.cpp:614 gui/launcher.cpp:1126
+#: gui/launcher.cpp:656 gui/launcher.cpp:1167
msgid "Search:"
msgstr "Filtre:"
-#: gui/launcher.cpp:639 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255
+#: gui/launcher.cpp:680 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255
#: engines/mohawk/riven.cpp:716 engines/cruise/menu.cpp:216
msgid "Load game:"
msgstr "Charger le jeu:"
-#: gui/launcher.cpp:639 engines/dialogs.cpp:114 engines/scumm/dialogs.cpp:188
+#: gui/launcher.cpp:680 engines/dialogs.cpp:114 engines/scumm/dialogs.cpp:188
#: engines/mohawk/myst.cpp:255 engines/mohawk/riven.cpp:716
#: engines/cruise/menu.cpp:216 backends/platform/wince/CEActionsPocket.cpp:267
#: backends/platform/wince/CEActionsSmartphone.cpp:231
msgid "Load"
msgstr "Charger"
-#: gui/launcher.cpp:747
+#: gui/launcher.cpp:788
msgid ""
"Do you really want to run the mass game detector? This could potentially add "
"a huge number of games."
@@ -455,7 +460,7 @@ msgstr ""
"Voulez-vous vraiment lancer la dщtection automatique des jeux? Cela peut "
"potentiellement ajouter un grand nombre de jeux."
-#: gui/launcher.cpp:748 gui/launcher.cpp:896
+#: gui/launcher.cpp:789 gui/launcher.cpp:937
#: backends/events/symbiansdl/symbiansdl-events.cpp:184
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
@@ -463,7 +468,7 @@ msgstr ""
msgid "Yes"
msgstr "Oui"
-#: gui/launcher.cpp:748 gui/launcher.cpp:896
+#: gui/launcher.cpp:789 gui/launcher.cpp:937
#: backends/events/symbiansdl/symbiansdl-events.cpp:184
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
@@ -471,37 +476,37 @@ msgstr "Oui"
msgid "No"
msgstr "Non"
-#: gui/launcher.cpp:796
+#: gui/launcher.cpp:837
msgid "ScummVM couldn't open the specified directory!"
msgstr "ScummVM n'a pas pu ouvrir le rщpertoire sщlectionnщ."
-#: gui/launcher.cpp:808
+#: gui/launcher.cpp:849
msgid "ScummVM could not find any game in the specified directory!"
msgstr "ScummVM n'a pas trouvщ de jeux dans le rщpertoire sщlectionnщ."
-#: gui/launcher.cpp:822
+#: gui/launcher.cpp:863
msgid "Pick the game:"
msgstr "Choisissez le jeu:"
-#: gui/launcher.cpp:896
+#: gui/launcher.cpp:937
msgid "Do you really want to remove this game configuration?"
msgstr "Voulez-vous vraiment supprimer ce jeu?"
-#: gui/launcher.cpp:960
+#: gui/launcher.cpp:1001
msgid "This game does not support loading games from the launcher."
msgstr ""
"Le chargement de sauvegarde depuis le lanceur n'est pas supportщ pour ce jeu."
-#: gui/launcher.cpp:964
+#: gui/launcher.cpp:1005
msgid "ScummVM could not find any engine capable of running the selected game!"
msgstr "ScummVM n'a pas pu trouvщ de moteur pour lancer le jeu sщlectionnщ."
-#: gui/launcher.cpp:1078
+#: gui/launcher.cpp:1119
msgctxt "lowres"
msgid "Mass Add..."
msgstr "Ajout Massif..."
-#: gui/launcher.cpp:1078
+#: gui/launcher.cpp:1119
msgid "Mass Add..."
msgstr "Ajout Massif..."
@@ -569,103 +574,95 @@ msgstr "44 kHz"
msgid "48 kHz"
msgstr "48 kHz"
-#: gui/options.cpp:257 gui/options.cpp:485 gui/options.cpp:586
-#: gui/options.cpp:659 gui/options.cpp:868
+#: gui/options.cpp:248 gui/options.cpp:474 gui/options.cpp:575
+#: gui/options.cpp:644 gui/options.cpp:852
msgctxt "soundfont"
msgid "None"
msgstr "Aucune"
-#: gui/options.cpp:393
+#: gui/options.cpp:382
msgid "Failed to apply some of the graphic options changes:"
msgstr "Certaines options graphiques n'ont pu ъtre changщes:"
-#: gui/options.cpp:405
+#: gui/options.cpp:394
msgid "the video mode could not be changed."
msgstr "le mode vidщo n'a pu ъtre changщ."
-#: gui/options.cpp:411
+#: gui/options.cpp:400
msgid "the fullscreen setting could not be changed"
msgstr "le mode plein щcran n'a pu ъtre changщ."
-#: gui/options.cpp:417
+#: gui/options.cpp:406
msgid "the aspect ratio setting could not be changed"
msgstr "la correction de rapport d'aspect n'a pu ъtre changщe."
-#: gui/options.cpp:742
+#: gui/options.cpp:727
msgid "Graphics mode:"
msgstr "Mode graphique:"
-#: gui/options.cpp:756
+#: gui/options.cpp:741
msgid "Render mode:"
msgstr "Mode de rendu:"
-#: gui/options.cpp:756 gui/options.cpp:757
+#: gui/options.cpp:741 gui/options.cpp:742
msgid "Special dithering modes supported by some games"
msgstr "Mode spщcial de tramage supportщ par certains jeux"
-#: gui/options.cpp:768
+#: gui/options.cpp:753
#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2248
#: backends/graphics/openglsdl/openglsdl-graphics.cpp:472
msgid "Fullscreen mode"
msgstr "Plein щcran"
-#: gui/options.cpp:771
+#: gui/options.cpp:756
msgid "Aspect ratio correction"
msgstr "Correction du rapport d'aspect"
-#: gui/options.cpp:771
+#: gui/options.cpp:756
msgid "Correct aspect ratio for 320x200 games"
msgstr "Corrige le rapport d'aspect pour les jeu 320x200"
-#: gui/options.cpp:772
-msgid "EGA undithering"
-msgstr "Dщtramage EGA"
-
-#: gui/options.cpp:772
-msgid "Enable undithering in EGA games that support it"
-msgstr "Active le dщtramage dans les jeux EGA qui le supporte"
-
-#: gui/options.cpp:780
+#: gui/options.cpp:764
msgid "Preferred Device:"
msgstr "Sortie Prщfщrщ:"
-#: gui/options.cpp:780
+#: gui/options.cpp:764
msgid "Music Device:"
msgstr "Sortie Audio:"
-#: gui/options.cpp:780 gui/options.cpp:782
+#: gui/options.cpp:764 gui/options.cpp:766
msgid "Specifies preferred sound device or sound card emulator"
msgstr ""
"Spщcifie le pщriphщrique de sortie audio ou l'щmulateur de carte audio "
"prщfщrщ"
-#: gui/options.cpp:780 gui/options.cpp:782 gui/options.cpp:783
+#: gui/options.cpp:764 gui/options.cpp:766 gui/options.cpp:767
msgid "Specifies output sound device or sound card emulator"
msgstr "Spщcifie le pщriphщrique de sortie audio ou l'щmulateur de carte audio"
-#: gui/options.cpp:782
+#: gui/options.cpp:766
msgctxt "lowres"
msgid "Preferred Dev.:"
msgstr "Sortie Prщfщrщ:"
-#: gui/options.cpp:782
+#: gui/options.cpp:766
msgctxt "lowres"
msgid "Music Device:"
msgstr "Sortie Audio:"
-#: gui/options.cpp:809
+#: gui/options.cpp:793
msgid "AdLib emulator:"
msgstr "Щmulateur AdLib:"
-#: gui/options.cpp:809 gui/options.cpp:810
+#: gui/options.cpp:793 gui/options.cpp:794
msgid "AdLib is used for music in many games"
msgstr "AdLib est utilisщ pour la musique dans de nombreux jeux"
-#: gui/options.cpp:820
+#: gui/options.cpp:804
msgid "Output rate:"
msgstr "Frщquence:"
-#: gui/options.cpp:820 gui/options.cpp:821
+#: gui/options.cpp:804 gui/options.cpp:805
msgid ""
"Higher value specifies better sound quality but may be not supported by your "
"soundcard"
@@ -673,64 +670,64 @@ msgstr ""
"Une valeur plus щlevщe donne une meilleure qualitщ audio mais peut ne pas "
"ъtre supportщ par votre carte son"
-#: gui/options.cpp:831
+#: gui/options.cpp:815
msgid "GM Device:"
msgstr "Sortie GM:"
-#: gui/options.cpp:831
+#: gui/options.cpp:815
msgid "Specifies default sound device for General MIDI output"
msgstr "Spщcifie le pщriphщrique audio par dщfaut pour la sortie General MIDI"
-#: gui/options.cpp:842
+#: gui/options.cpp:826
msgid "Don't use General MIDI music"
msgstr "Ne pas utiliser la musique General MIDI"
-#: gui/options.cpp:853 gui/options.cpp:915
+#: gui/options.cpp:837 gui/options.cpp:899
msgid "Use first available device"
msgstr "Utiliser le premier pщriphщrique disponible"
-#: gui/options.cpp:865
+#: gui/options.cpp:849
msgid "SoundFont:"
msgstr "Banque de sons:"
-#: gui/options.cpp:865 gui/options.cpp:867 gui/options.cpp:868
+#: gui/options.cpp:849 gui/options.cpp:851 gui/options.cpp:852
msgid "SoundFont is supported by some audio cards, Fluidsynth and Timidity"
msgstr ""
"La banque de sons (SoundFont) est utilisщe par certaines cartes audio, "
"Fluidsynth et Timidity"
-#: gui/options.cpp:867
+#: gui/options.cpp:851
msgctxt "lowres"
msgid "SoundFont:"
msgstr "SoundFont:"
-#: gui/options.cpp:873
+#: gui/options.cpp:857
msgid "Mixed AdLib/MIDI mode"
msgstr "Mode mixe AdLib/MIDI"
-#: gui/options.cpp:873
+#: gui/options.cpp:857
msgid "Use both MIDI and AdLib sound generation"
msgstr "Utiliser р la fois MIDI et AdLib"
-#: gui/options.cpp:876
+#: gui/options.cpp:860
msgid "MIDI gain:"
msgstr "Gain MIDI:"
-#: gui/options.cpp:886
+#: gui/options.cpp:870
msgid "MT-32 Device:"
msgstr "Sortie MT-32:"
-#: gui/options.cpp:886
+#: gui/options.cpp:870
msgid "Specifies default sound device for Roland MT-32/LAPC1/CM32l/CM64 output"
msgstr ""
"Spщcifie le pщriphщrique audio par dщfaut pour la sortie Roland MT-32/LAPC1/"
"CM32l/CM64"
-#: gui/options.cpp:891
+#: gui/options.cpp:875
msgid "True Roland MT-32 (disable GM emulation)"
msgstr "Roland MT-32 exacte (dщsactive l'щmulation GM)"
-#: gui/options.cpp:891 gui/options.cpp:893
+#: gui/options.cpp:875 gui/options.cpp:877
msgid ""
"Check if you want to use your real hardware Roland-compatible sound device "
"connected to your computer"
@@ -738,195 +735,195 @@ msgstr ""
"Vщrifie si vous voulez utiliser un pщriphщrique audio compatible Roland "
"connectщ р l'ordinateur"
-#: gui/options.cpp:893
+#: gui/options.cpp:877
msgctxt "lowres"
msgid "True Roland MT-32 (no GM emulation)"
msgstr "Roland MT-32 exacte (pas d'щmu GM)"
-#: gui/options.cpp:896
+#: gui/options.cpp:880
msgid "Enable Roland GS Mode"
msgstr "Activer le mode Roland GS"
-#: gui/options.cpp:896
+#: gui/options.cpp:880
msgid "Turns off General MIDI mapping for games with Roland MT-32 soundtrack"
msgstr "Dщsactiver la conversion des pistes MT-32 en General MIDI"
-#: gui/options.cpp:905
+#: gui/options.cpp:889
msgid "Don't use Roland MT-32 music"
msgstr "Ne pas utiliser la musique Roland MT-32"
-#: gui/options.cpp:932
+#: gui/options.cpp:916
msgid "Text and Speech:"
msgstr "Dialogue:"
-#: gui/options.cpp:936 gui/options.cpp:946
+#: gui/options.cpp:920 gui/options.cpp:930
msgid "Speech"
msgstr "Voix"
-#: gui/options.cpp:937 gui/options.cpp:947
+#: gui/options.cpp:921 gui/options.cpp:931
msgid "Subtitles"
msgstr "Sous-titres"
-#: gui/options.cpp:938
+#: gui/options.cpp:922
msgid "Both"
msgstr "Les deux"
-#: gui/options.cpp:940
+#: gui/options.cpp:924
msgid "Subtitle speed:"
msgstr "Vitesse des ST:"
-#: gui/options.cpp:942
+#: gui/options.cpp:926
msgctxt "lowres"
msgid "Text and Speech:"
msgstr "Dialogue:"
-#: gui/options.cpp:946
+#: gui/options.cpp:930
msgid "Spch"
msgstr "Voix"
-#: gui/options.cpp:947
+#: gui/options.cpp:931
msgid "Subs"
msgstr "Subs"
-#: gui/options.cpp:948
+#: gui/options.cpp:932
msgctxt "lowres"
msgid "Both"
msgstr "V&S"
-#: gui/options.cpp:948
+#: gui/options.cpp:932
msgid "Show subtitles and play speech"
msgstr "Affiche les sous-titres et joue les dialogues audio"
-#: gui/options.cpp:950
+#: gui/options.cpp:934
msgctxt "lowres"
msgid "Subtitle speed:"
msgstr "Vitesse des ST:"
-#: gui/options.cpp:966
+#: gui/options.cpp:950
msgid "Music volume:"
msgstr "Volume Musique:"
-#: gui/options.cpp:968
+#: gui/options.cpp:952
msgctxt "lowres"
msgid "Music volume:"
msgstr "Musique:"
-#: gui/options.cpp:975
+#: gui/options.cpp:959
msgid "Mute All"
msgstr "Silence"
-#: gui/options.cpp:978
+#: gui/options.cpp:962
msgid "SFX volume:"
msgstr "Volume Bruitage:"
-#: gui/options.cpp:978 gui/options.cpp:980 gui/options.cpp:981
+#: gui/options.cpp:962 gui/options.cpp:964 gui/options.cpp:965
msgid "Special sound effects volume"
msgstr "Volume des effets spщciaux sonores"
-#: gui/options.cpp:980
+#: gui/options.cpp:964
msgctxt "lowres"
msgid "SFX volume:"
msgstr "Bruitage:"
-#: gui/options.cpp:988
+#: gui/options.cpp:972
msgid "Speech volume:"
msgstr "Volume Dialogues:"
-#: gui/options.cpp:990
+#: gui/options.cpp:974
msgctxt "lowres"
msgid "Speech volume:"
msgstr "Dialogues:"
-#: gui/options.cpp:1156
+#: gui/options.cpp:1131
msgid "Theme Path:"
msgstr "Thшmes:"
-#: gui/options.cpp:1158
+#: gui/options.cpp:1133
msgctxt "lowres"
msgid "Theme Path:"
msgstr "Thшmes:"
-#: gui/options.cpp:1164 gui/options.cpp:1166 gui/options.cpp:1167
+#: gui/options.cpp:1139 gui/options.cpp:1141 gui/options.cpp:1142
msgid "Specifies path to additional data used by all games or ScummVM"
msgstr ""
"Spщcifie un chemin vers des donnщes supplщmentaires utilisщes par tous les "
"jeux ou ScummVM"
-#: gui/options.cpp:1173
+#: gui/options.cpp:1148
msgid "Plugins Path:"
msgstr "Plugins:"
-#: gui/options.cpp:1175
+#: gui/options.cpp:1150
msgctxt "lowres"
msgid "Plugins Path:"
msgstr "Plugins:"
-#: gui/options.cpp:1184
+#: gui/options.cpp:1159
msgid "Misc"
msgstr "Divers"
-#: gui/options.cpp:1186
+#: gui/options.cpp:1161
msgctxt "lowres"
msgid "Misc"
msgstr "Divers"
-#: gui/options.cpp:1188
+#: gui/options.cpp:1163
msgid "Theme:"
msgstr "Thшme:"
-#: gui/options.cpp:1192
+#: gui/options.cpp:1167
msgid "GUI Renderer:"
msgstr "Interface:"
-#: gui/options.cpp:1204
+#: gui/options.cpp:1179
msgid "Autosave:"
msgstr "Sauvegarde auto:"
-#: gui/options.cpp:1206
+#: gui/options.cpp:1181
msgctxt "lowres"
msgid "Autosave:"
msgstr "Sauvegarde:"
-#: gui/options.cpp:1214
+#: gui/options.cpp:1189
msgid "Keys"
msgstr "Touches"
-#: gui/options.cpp:1221
+#: gui/options.cpp:1196
msgid "GUI Language:"
msgstr "Langue:"
-#: gui/options.cpp:1221
+#: gui/options.cpp:1196
msgid "Language of ScummVM GUI"
msgstr "Langue de l'interface graphique de ScummVM"
-#: gui/options.cpp:1372
+#: gui/options.cpp:1347
msgid "You have to restart ScummVM before your changes will take effect."
msgstr ""
"Vous devez relancer ScummVM pour que le changement soit pris en compte."
-#: gui/options.cpp:1385
+#: gui/options.cpp:1360
msgid "Select directory for savegames"
msgstr "Sщlectionner le rщpertoire pour les sauvegardes"
-#: gui/options.cpp:1392
+#: gui/options.cpp:1367
msgid "The chosen directory cannot be written to. Please select another one."
msgstr ""
"Le rщpertoire sщlectionnщ est vщrouillщ en щcriture. Sщlectionnez un autre "
"rщpertoire."
-#: gui/options.cpp:1401
+#: gui/options.cpp:1376
msgid "Select directory for GUI themes"
msgstr "Sщlectionner le rщpertoire des thшmes d'interface"
-#: gui/options.cpp:1411
+#: gui/options.cpp:1386
msgid "Select directory for extra files"
msgstr "Sщlectionner le rщpertoire pour les fichiers suplщmentaires"
-#: gui/options.cpp:1422
+#: gui/options.cpp:1397
msgid "Select directory for plugins"
msgstr "Sщlectionner le rщpertoire des plugins"
-#: gui/options.cpp:1475
+#: gui/options.cpp:1450
msgid ""
"The theme you selected does not support your current language. If you want "
"to use this theme you need to switch to another language first."
@@ -974,64 +971,64 @@ msgstr "Sauvegarde sans nom"
msgid "Select a Theme"
msgstr "Sщlectionnez un Thшme"
-#: gui/ThemeEngine.cpp:333
+#: gui/ThemeEngine.cpp:335
msgid "Disabled GFX"
msgstr "GFX dщsactivщ"
-#: gui/ThemeEngine.cpp:333
+#: gui/ThemeEngine.cpp:335
msgctxt "lowres"
msgid "Disabled GFX"
msgstr "GFX dщsactivщ"
-#: gui/ThemeEngine.cpp:334
+#: gui/ThemeEngine.cpp:336
msgid "Standard Renderer (16bpp)"
msgstr "Rendu Standard (16bpp)"
-#: gui/ThemeEngine.cpp:334
+#: gui/ThemeEngine.cpp:336
msgid "Standard (16bpp)"
msgstr "Standard (16bpp)"
-#: gui/ThemeEngine.cpp:336
+#: gui/ThemeEngine.cpp:338
msgid "Antialiased Renderer (16bpp)"
msgstr "Rendu Anti-crщnelщ (16 bpp)"
-#: gui/ThemeEngine.cpp:336
+#: gui/ThemeEngine.cpp:338
msgid "Antialiased (16bpp)"
msgstr "Anti-crщnelщ (16 bpp)"
-#: gui/widget.cpp:312 gui/widget.cpp:314 gui/widget.cpp:320 gui/widget.cpp:322
+#: gui/widget.cpp:322 gui/widget.cpp:324 gui/widget.cpp:330 gui/widget.cpp:332
msgid "Clear value"
msgstr "Effacer la valeur"
-#: base/main.cpp:203
+#: base/main.cpp:209
#, c-format
msgid "Engine does not support debug level '%s'"
msgstr "Le niveau de debug '%s' n'est pas supportщ par ce moteur de jeu"
-#: base/main.cpp:275
+#: base/main.cpp:287
msgid "Menu"
msgstr "Menu"
-#: base/main.cpp:278 backends/platform/symbian/src/SymbianActions.cpp:45
+#: base/main.cpp:290 backends/platform/symbian/src/SymbianActions.cpp:45
#: backends/platform/wince/CEActionsPocket.cpp:45
#: backends/platform/wince/CEActionsSmartphone.cpp:46
msgid "Skip"
msgstr "Passer"
-#: base/main.cpp:281 backends/platform/symbian/src/SymbianActions.cpp:50
+#: base/main.cpp:293 backends/platform/symbian/src/SymbianActions.cpp:50
#: backends/platform/wince/CEActionsPocket.cpp:42
msgid "Pause"
msgstr "Mettre en pause"
-#: base/main.cpp:284
+#: base/main.cpp:296
msgid "Skip line"
msgstr "Passer la phrase"
-#: base/main.cpp:455
+#: base/main.cpp:467
msgid "Error running game:"
msgstr "Erreur lors de l'щxщcution du jeu:"
-#: base/main.cpp:479
+#: base/main.cpp:491
msgid "Could not find any engine capable of running the selected game"
msgstr "Impossible de trouver un moteur pour exщcuter le jeu sщlectionnщ"
@@ -1099,18 +1096,18 @@ msgstr "Annuler par l'utilisateur"
msgid "Unknown error"
msgstr "Erreur inconnue"
-#: engines/advancedDetector.cpp:296
+#: engines/advancedDetector.cpp:324
#, c-format
msgid "The game in '%s' seems to be unknown."
msgstr "Le jeu dans '%s' n'est pas reconnu."
-#: engines/advancedDetector.cpp:297
+#: engines/advancedDetector.cpp:325
msgid "Please, report the following data to the ScummVM team along with name"
msgstr ""
"Veuillez reporter les informations suivantes р l'щquipe ScummVM ainsi que le "
"nom"
-#: engines/advancedDetector.cpp:299
+#: engines/advancedDetector.cpp:327
msgid "of the game you tried to add and its version/language/etc.:"
msgstr "du jeu que vous avez essayщ d'ajouter, sa version, le langage, etc..."
@@ -1147,13 +1144,14 @@ msgctxt "lowres"
msgid "~R~eturn to Launcher"
msgstr "Retour au ~L~anceur"
-#: engines/dialogs.cpp:116 engines/cruise/menu.cpp:214
-#: engines/sci/engine/kfile.cpp:566
+#: engines/dialogs.cpp:116 engines/agi/saveload.cpp:805
+#: engines/cruise/menu.cpp:214 engines/sci/engine/kfile.cpp:567
msgid "Save game:"
msgstr "Sauvegarde:"
-#: engines/dialogs.cpp:116 engines/scumm/dialogs.cpp:187
-#: engines/cruise/menu.cpp:214 engines/sci/engine/kfile.cpp:566
+#: engines/dialogs.cpp:116 engines/agi/saveload.cpp:805
+#: engines/scumm/dialogs.cpp:187 engines/cruise/menu.cpp:214
+#: engines/sci/engine/kfile.cpp:567
#: backends/platform/symbian/src/SymbianActions.cpp:44
#: backends/platform/wince/CEActionsPocket.cpp:43
#: backends/platform/wince/CEActionsPocket.cpp:267
@@ -1264,6 +1262,88 @@ msgstr ""
msgid "Start anyway"
msgstr "Jouer quand mъme"
+#: engines/agi/detection.cpp:145 engines/dreamweb/detection.cpp:47
+#: engines/sci/detection.cpp:390
+msgid "Use original save/load screens"
+msgstr ""
+
+#: engines/agi/detection.cpp:146 engines/dreamweb/detection.cpp:48
+#: engines/sci/detection.cpp:391
+msgid "Use the original save/load screens, instead of the ScummVM ones"
+msgstr ""
+
+#: engines/agi/saveload.cpp:827 engines/sci/engine/kfile.cpp:674
+msgid "Restore game:"
+msgstr "Charger le jeu:"
+
+#: engines/agi/saveload.cpp:827 engines/sci/engine/kfile.cpp:674
+msgid "Restore"
+msgstr "Charger"
+
+#: engines/dreamweb/detection.cpp:57
+#, fuzzy
+msgid "Use bright palette mode"
+msgstr "Щlщment en haut р droite"
+
+#: engines/dreamweb/detection.cpp:58
+msgid "Display graphics using the game's bright palette"
+msgstr ""
+
+#: engines/sci/detection.cpp:370
+msgid "EGA undithering"
+msgstr "Dщtramage EGA"
+
+#: engines/sci/detection.cpp:371
+#, fuzzy
+msgid "Enable undithering in EGA games"
+msgstr "Active le dщtramage dans les jeux EGA qui le supporte"
+
+#: engines/sci/detection.cpp:380
+#, fuzzy
+msgid "Prefer digital sound effects"
+msgstr "Volume des effets spщciaux sonores"
+
+#: engines/sci/detection.cpp:381
+msgid "Prefer digital sound effects instead of synthesized ones"
+msgstr ""
+
+#: engines/sci/detection.cpp:400
+msgid "Use IMF/Yahama FB-01 for MIDI output"
+msgstr ""
+
+#: engines/sci/detection.cpp:401
+msgid ""
+"Use an IBM Music Feature card or a Yahama FB-01 FM synth module for MIDI "
+"output"
+msgstr ""
+
+#: engines/sci/detection.cpp:411
+msgid "Use CD audio"
+msgstr ""
+
+#: engines/sci/detection.cpp:412
+msgid "Use CD audio instead of in-game audio, if available"
+msgstr ""
+
+#: engines/sci/detection.cpp:422
+msgid "Use Windows cursors"
+msgstr ""
+
+#: engines/sci/detection.cpp:423
+msgid ""
+"Use the Windows cursors (smaller and monochrome) instead of the DOS ones"
+msgstr ""
+
+#: engines/sci/detection.cpp:433
+#, fuzzy
+msgid "Use silver cursors"
+msgstr "Curseur normal"
+
+#: engines/sci/detection.cpp:434
+msgid ""
+"Use the alternate set of silver cursors, instead of the normal golden ones"
+msgstr ""
+
#: engines/scumm/dialogs.cpp:175
#, c-format
msgid "Insert Disk %c and Press Button to Continue."
@@ -1920,7 +2000,7 @@ msgstr ""
"Support MIDI natif requiшre la mise р jour Roland de LucasArt,\n"
"mais %s manque. Utilise AdLib р la place."
-#: engines/scumm/scumm.cpp:2271 engines/agos/saveload.cpp:189
+#: engines/scumm/scumm.cpp:2271 engines/agos/saveload.cpp:202
#, c-format
msgid ""
"Failed to save game state to file:\n"
@@ -1931,7 +2011,7 @@ msgstr ""
"\n"
"%s"
-#: engines/scumm/scumm.cpp:2278 engines/agos/saveload.cpp:154
+#: engines/scumm/scumm.cpp:2278 engines/agos/saveload.cpp:167
#, c-format
msgid ""
"Failed to load game state from file:\n"
@@ -1942,7 +2022,7 @@ msgstr ""
"\n"
"%s"
-#: engines/scumm/scumm.cpp:2290 engines/agos/saveload.cpp:197
+#: engines/scumm/scumm.cpp:2290 engines/agos/saveload.cpp:210
#, c-format
msgid ""
"Successfully saved game state in file:\n"
@@ -1990,14 +2070,6 @@ msgstr "~M~enu Principal"
msgid "~W~ater Effect Enabled"
msgstr "~E~ffets de l'Eau Activщs"
-#: engines/sci/engine/kfile.cpp:673
-msgid "Restore game:"
-msgstr "Charger le jeu:"
-
-#: engines/sci/engine/kfile.cpp:673
-msgid "Restore"
-msgstr "Charger"
-
#: engines/agos/animation.cpp:550
#, c-format
msgid "Cutscene file '%s' not found!"
@@ -2020,6 +2092,66 @@ msgstr "Щchec de la suppression du fichier."
msgid "Failed to save game"
msgstr "Щchec de la sauvegarde."
+#. I18N: Studio audience adds an applause and cheering sounds whenever
+#. Malcolm makes a joke.
+#: engines/kyra/detection.cpp:62
+msgid "Studio audience"
+msgstr ""
+
+#: engines/kyra/detection.cpp:63
+msgid "Enable studio audience"
+msgstr ""
+
+#. I18N: This option allows the user to skip text and cutscenes.
+#: engines/kyra/detection.cpp:73
+msgid "Skip support"
+msgstr ""
+
+#: engines/kyra/detection.cpp:74
+msgid "Allow text and cutscenes to be skipped"
+msgstr ""
+
+#. I18N: Helium mode makes people sound like they've inhaled Helium.
+#: engines/kyra/detection.cpp:84
+msgid "Helium mode"
+msgstr ""
+
+#: engines/kyra/detection.cpp:85
+#, fuzzy
+msgid "Enable helium mode"
+msgstr "Activer le mode Roland GS"
+
+#. I18N: When enabled, this option makes scrolling smoother when
+#. changing from one screen to another.
+#: engines/kyra/detection.cpp:99
+msgid "Smooth scrolling"
+msgstr ""
+
+#: engines/kyra/detection.cpp:100
+msgid "Enable smooth scrolling when walking"
+msgstr ""
+
+#. I18N: When enabled, this option changes the cursor when it floats to the
+#. edge of the screen to a directional arrow. The player can then click to
+#. walk towards that direction.
+#: engines/kyra/detection.cpp:112
+#, fuzzy
+msgid "Floating cursors"
+msgstr "Curseur normal"
+
+#: engines/kyra/detection.cpp:113
+msgid "Enable floating cursors"
+msgstr ""
+
+#. I18N: HP stands for Hit Points
+#: engines/kyra/detection.cpp:127
+msgid "HP bar graphs"
+msgstr ""
+
+#: engines/kyra/detection.cpp:128
+msgid "Enable hit point bar graphs"
+msgstr ""
+
#: engines/kyra/lol.cpp:478
msgid "Attack 1"
msgstr "Attaque 1"
@@ -2082,6 +2214,14 @@ msgstr ""
"MIDI. Mais il est possible que quelquespistes ne soient pas jouщes "
"correctement."
+#: engines/queen/queen.cpp:59 engines/sky/detection.cpp:44
+msgid "Floppy intro"
+msgstr ""
+
+#: engines/queen/queen.cpp:60 engines/sky/detection.cpp:45
+msgid "Use the floppy version's intro (CD version only)"
+msgstr ""
+
#: engines/sky/compact.cpp:130
msgid ""
"Unable to find \"sky.cpt\" file!\n"
@@ -2165,6 +2305,14 @@ msgstr ""
"Les sщquences DXA sont prщsente mais ScummVM a щtщ compilщ sans le support "
"zlib."
+#: engines/sword2/sword2.cpp:79
+msgid "Show object labels"
+msgstr ""
+
+#: engines/sword2/sword2.cpp:80
+msgid "Show labels for objects on mouse hover"
+msgstr ""
+
#: engines/parallaction/saveload.cpp:133
#, c-format
msgid ""
@@ -2399,19 +2547,19 @@ msgstr "Audio haute qualitщ (plus lent) (redщmarrer)"
msgid "Disable power off"
msgstr "Dщsactivщ l'extinction"
-#: backends/platform/iphone/osys_events.cpp:301
+#: backends/platform/iphone/osys_events.cpp:300
msgid "Mouse-click-and-drag mode enabled."
msgstr "Mode souris-cliquer-et-dщplacer activщ"
-#: backends/platform/iphone/osys_events.cpp:303
+#: backends/platform/iphone/osys_events.cpp:302
msgid "Mouse-click-and-drag mode disabled."
msgstr "Mode souris-cliquer-et-dщplacer dщsactivщ"
-#: backends/platform/iphone/osys_events.cpp:314
+#: backends/platform/iphone/osys_events.cpp:313
msgid "Touchpad mode enabled."
msgstr "Mode touchpad activщ"
-#: backends/platform/iphone/osys_events.cpp:316
+#: backends/platform/iphone/osys_events.cpp:315
msgid "Touchpad mode disabled."
msgstr "Mode touchpad dщsactivщ"
@@ -2487,15 +2635,15 @@ msgstr "Mode graphique actif:"
msgid "Windowed mode"
msgstr "Mode Fenъtre"
-#: backends/graphics/opengl/opengl-graphics.cpp:130
+#: backends/graphics/opengl/opengl-graphics.cpp:135
msgid "OpenGL Normal"
msgstr "OpenGL Normal"
-#: backends/graphics/opengl/opengl-graphics.cpp:131
+#: backends/graphics/opengl/opengl-graphics.cpp:136
msgid "OpenGL Conserve"
msgstr "OpenGL Prщserve"
-#: backends/graphics/opengl/opengl-graphics.cpp:132
+#: backends/graphics/opengl/opengl-graphics.cpp:137
msgid "OpenGL Original"
msgstr "OpenGL Originel"
diff --git a/po/hu_HU.po b/po/hu_HU.po
index 76e01da44b..321e5b7e70 100644
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ScummVM 1.3.0svn\n"
"Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n"
-"POT-Creation-Date: 2012-03-07 22:09+0000\n"
+"POT-Creation-Date: 2012-05-20 22:39+0100\n"
"PO-Revision-Date: 2012-04-18 08:20+0100\n"
"Last-Translator: Gruby <grubycza@hotmail.com>\n"
"Language-Team: Hungarian\n"
@@ -47,7 +47,7 @@ msgid "Go up"
msgstr "Feljebb"
#: gui/browser.cpp:69 gui/chooser.cpp:45 gui/KeysDialog.cpp:43
-#: gui/launcher.cpp:320 gui/massadd.cpp:94 gui/options.cpp:1253
+#: gui/launcher.cpp:345 gui/massadd.cpp:94 gui/options.cpp:1228
#: gui/saveload.cpp:63 gui/saveload.cpp:155 gui/themebrowser.cpp:54
#: engines/engine.cpp:442 engines/scumm/dialogs.cpp:190
#: engines/sword1/control.cpp:865 engines/parallaction/saveload.cpp:281
@@ -72,15 +72,15 @@ msgstr "Bezсr"
msgid "Mouse click"
msgstr "Egщrkattintсs"
-#: gui/gui-manager.cpp:122 base/main.cpp:288
+#: gui/gui-manager.cpp:122 base/main.cpp:300
msgid "Display keyboard"
msgstr "Billentyћzet beсllэtсsok"
-#: gui/gui-manager.cpp:126 base/main.cpp:292
+#: gui/gui-manager.cpp:126 base/main.cpp:304
msgid "Remap keys"
msgstr "Billentyћk сtсllэtсsa"
-#: gui/gui-manager.cpp:129 base/main.cpp:295
+#: gui/gui-manager.cpp:129 base/main.cpp:307
msgid "Toggle FullScreen"
msgstr "Teljeskщpernyѕ kapcsolѓ"
@@ -92,8 +92,8 @@ msgstr "Vсlassz mћveletet a kiosztсshoz"
msgid "Map"
msgstr "Kiosztсs"
-#: gui/KeysDialog.cpp:42 gui/launcher.cpp:321 gui/launcher.cpp:960
-#: gui/launcher.cpp:964 gui/massadd.cpp:91 gui/options.cpp:1254
+#: gui/KeysDialog.cpp:42 gui/launcher.cpp:346 gui/launcher.cpp:1001
+#: gui/launcher.cpp:1005 gui/massadd.cpp:91 gui/options.cpp:1229
#: engines/engine.cpp:361 engines/engine.cpp:372 engines/scumm/dialogs.cpp:192
#: engines/scumm/scumm.cpp:1775 engines/agos/animation.cpp:551
#: engines/groovie/script.cpp:420 engines/sky/compact.cpp:131
@@ -130,324 +130,329 @@ msgstr "Vсlassz egy mћveletet"
msgid "Press the key to associate"
msgstr "Nyomj egy billentyћt a tсrsэtсshoz"
-#: gui/launcher.cpp:170
+#: gui/launcher.cpp:187
msgid "Game"
msgstr "Jсtщk"
-#: gui/launcher.cpp:174
+#: gui/launcher.cpp:191
msgid "ID:"
msgstr "ID:"
-#: gui/launcher.cpp:174 gui/launcher.cpp:176 gui/launcher.cpp:177
+#: gui/launcher.cpp:191 gui/launcher.cpp:193 gui/launcher.cpp:194
msgid ""
"Short game identifier used for referring to savegames and running the game "
"from the command line"
msgstr ""
"Rіvid jсtщkazonosэtѓ a jсtщkmentщsekhez щs a jсtщk parancssori futtatсsсhoz"
-#: gui/launcher.cpp:176
+#: gui/launcher.cpp:193
msgctxt "lowres"
msgid "ID:"
msgstr "ID:"
-#: gui/launcher.cpp:181
+#: gui/launcher.cpp:198
msgid "Name:"
msgstr "Nщv:"
-#: gui/launcher.cpp:181 gui/launcher.cpp:183 gui/launcher.cpp:184
+#: gui/launcher.cpp:198 gui/launcher.cpp:200 gui/launcher.cpp:201
msgid "Full title of the game"
msgstr "A jсtщk teljes neve"
-#: gui/launcher.cpp:183
+#: gui/launcher.cpp:200
msgctxt "lowres"
msgid "Name:"
msgstr "Nщv:"
-#: gui/launcher.cpp:187
+#: gui/launcher.cpp:204
msgid "Language:"
msgstr "Nyelv:"
-#: gui/launcher.cpp:187 gui/launcher.cpp:188
+#: gui/launcher.cpp:204 gui/launcher.cpp:205
msgid ""
"Language of the game. This will not turn your Spanish game version into "
"English"
msgstr ""
"A jсtщk nyelve. Ne сllэtsd сt a pl. Spanyol nyelvћ jсtщkodat Angol nyelvre"
-#: gui/launcher.cpp:189 gui/launcher.cpp:203 gui/options.cpp:80
-#: gui/options.cpp:745 gui/options.cpp:758 gui/options.cpp:1224
+#: gui/launcher.cpp:206 gui/launcher.cpp:220 gui/options.cpp:80
+#: gui/options.cpp:730 gui/options.cpp:743 gui/options.cpp:1199
#: audio/null.cpp:40
msgid "<default>"
msgstr "<alapщrtelmezett>"
-#: gui/launcher.cpp:199
+#: gui/launcher.cpp:216
msgid "Platform:"
msgstr "Platform:"
-#: gui/launcher.cpp:199 gui/launcher.cpp:201 gui/launcher.cpp:202
+#: gui/launcher.cpp:216 gui/launcher.cpp:218 gui/launcher.cpp:219
msgid "Platform the game was originally designed for"
msgstr "Platform amire a jсtщkot eredetileg kщszэtettщk"
-#: gui/launcher.cpp:201
+#: gui/launcher.cpp:218
msgctxt "lowres"
msgid "Platform:"
msgstr "Platform:"
-#: gui/launcher.cpp:213 gui/options.cpp:1087 gui/options.cpp:1104
+#: gui/launcher.cpp:231
+#, fuzzy
+msgid "Engine"
+msgstr "Vizsgсl"
+
+#: gui/launcher.cpp:239 gui/options.cpp:1062 gui/options.cpp:1079
msgid "Graphics"
msgstr "Grafika"
-#: gui/launcher.cpp:213 gui/options.cpp:1087 gui/options.cpp:1104
+#: gui/launcher.cpp:239 gui/options.cpp:1062 gui/options.cpp:1079
msgid "GFX"
msgstr "GFX"
-#: gui/launcher.cpp:216
+#: gui/launcher.cpp:242
msgid "Override global graphic settings"
msgstr "Globсlis grafikai beсllэtсsok felќlbэrсlсsa"
-#: gui/launcher.cpp:218
+#: gui/launcher.cpp:244
msgctxt "lowres"
msgid "Override global graphic settings"
msgstr "Globсlis grafikai beсllэtсsok felќlbэrсlсsa"
-#: gui/launcher.cpp:225 gui/options.cpp:1110
+#: gui/launcher.cpp:251 gui/options.cpp:1085
msgid "Audio"
msgstr "Audiѓ"
-#: gui/launcher.cpp:228
+#: gui/launcher.cpp:254
msgid "Override global audio settings"
msgstr "Globсlis audiѓ beсllэtсsok felќlbэrсlсsa"
-#: gui/launcher.cpp:230
+#: gui/launcher.cpp:256
msgctxt "lowres"
msgid "Override global audio settings"
msgstr "Globсlis audiѓ beсllэtсsok felќlbэrсlсsa"
-#: gui/launcher.cpp:239 gui/options.cpp:1115
+#: gui/launcher.cpp:265 gui/options.cpp:1090
msgid "Volume"
msgstr "Hangerѕ"
-#: gui/launcher.cpp:241 gui/options.cpp:1117
+#: gui/launcher.cpp:267 gui/options.cpp:1092
msgctxt "lowres"
msgid "Volume"
msgstr "Hangerѕ"
-#: gui/launcher.cpp:244
+#: gui/launcher.cpp:270
msgid "Override global volume settings"
msgstr "Globсlis hangerѕbeсllэtсsok felќlbэrсlсsa"
-#: gui/launcher.cpp:246
+#: gui/launcher.cpp:272
msgctxt "lowres"
msgid "Override global volume settings"
msgstr "Globсlis hangerѕbeсllэtсsok felќlbэrсlсsa"
-#: gui/launcher.cpp:254 gui/options.cpp:1125
+#: gui/launcher.cpp:280 gui/options.cpp:1100
msgid "MIDI"
msgstr "MIDI"
-#: gui/launcher.cpp:257
+#: gui/launcher.cpp:283
msgid "Override global MIDI settings"
msgstr "Globсlis MIDI beсllэtсsok felќlbэrсlсsa"
-#: gui/launcher.cpp:259
+#: gui/launcher.cpp:285
msgctxt "lowres"
msgid "Override global MIDI settings"
msgstr "Globсlis MIDI beсllэtсsok felќlbэrсlсsa"
-#: gui/launcher.cpp:268 gui/options.cpp:1131
+#: gui/launcher.cpp:294 gui/options.cpp:1106
msgid "MT-32"
msgstr "MT-32"
-#: gui/launcher.cpp:271
+#: gui/launcher.cpp:297
msgid "Override global MT-32 settings"
msgstr "Globсlis MT-32 beсllэtсsok felќlbэrсlсsa"
-#: gui/launcher.cpp:273
+#: gui/launcher.cpp:299
msgctxt "lowres"
msgid "Override global MT-32 settings"
msgstr "Globсlis MT-32 beсllэtсsok felќlbэrсlсsa"
-#: gui/launcher.cpp:282 gui/options.cpp:1138
+#: gui/launcher.cpp:308 gui/options.cpp:1113
msgid "Paths"
msgstr "Mappсk"
-#: gui/launcher.cpp:284 gui/options.cpp:1140
+#: gui/launcher.cpp:310 gui/options.cpp:1115
msgctxt "lowres"
msgid "Paths"
msgstr "Mappсk"
-#: gui/launcher.cpp:291
+#: gui/launcher.cpp:317
msgid "Game Path:"
msgstr "Jсtщk Mappa:"
-#: gui/launcher.cpp:293
+#: gui/launcher.cpp:319
msgctxt "lowres"
msgid "Game Path:"
msgstr "Jсtщk Mappa:"
-#: gui/launcher.cpp:298 gui/options.cpp:1164
+#: gui/launcher.cpp:324 gui/options.cpp:1139
msgid "Extra Path:"
msgstr "Extra Mappa:"
-#: gui/launcher.cpp:298 gui/launcher.cpp:300 gui/launcher.cpp:301
+#: gui/launcher.cpp:324 gui/launcher.cpp:326 gui/launcher.cpp:327
msgid "Specifies path to additional data used the game"
msgstr "Mappa kivсlasztсs a jсtщkok kiegщszэtѕ fсjljaihoz"
-#: gui/launcher.cpp:300 gui/options.cpp:1166
+#: gui/launcher.cpp:326 gui/options.cpp:1141
msgctxt "lowres"
msgid "Extra Path:"
msgstr "Extra Mappa:"
-#: gui/launcher.cpp:307 gui/options.cpp:1148
+#: gui/launcher.cpp:333 gui/options.cpp:1123
msgid "Save Path:"
msgstr "Mentщs Mappa:"
-#: gui/launcher.cpp:307 gui/launcher.cpp:309 gui/launcher.cpp:310
-#: gui/options.cpp:1148 gui/options.cpp:1150 gui/options.cpp:1151
+#: gui/launcher.cpp:333 gui/launcher.cpp:335 gui/launcher.cpp:336
+#: gui/options.cpp:1123 gui/options.cpp:1125 gui/options.cpp:1126
msgid "Specifies where your savegames are put"
msgstr "Jсtщkmentщsek helyщnek meghatсrozсsa"
-#: gui/launcher.cpp:309 gui/options.cpp:1150
+#: gui/launcher.cpp:335 gui/options.cpp:1125
msgctxt "lowres"
msgid "Save Path:"
msgstr "Mentщs Mappa:"
-#: gui/launcher.cpp:329 gui/launcher.cpp:416 gui/launcher.cpp:469
-#: gui/launcher.cpp:523 gui/options.cpp:1159 gui/options.cpp:1167
-#: gui/options.cpp:1176 gui/options.cpp:1283 gui/options.cpp:1289
-#: gui/options.cpp:1297 gui/options.cpp:1327 gui/options.cpp:1333
-#: gui/options.cpp:1340 gui/options.cpp:1433 gui/options.cpp:1436
-#: gui/options.cpp:1448
+#: gui/launcher.cpp:354 gui/launcher.cpp:453 gui/launcher.cpp:511
+#: gui/launcher.cpp:565 gui/options.cpp:1134 gui/options.cpp:1142
+#: gui/options.cpp:1151 gui/options.cpp:1258 gui/options.cpp:1264
+#: gui/options.cpp:1272 gui/options.cpp:1302 gui/options.cpp:1308
+#: gui/options.cpp:1315 gui/options.cpp:1408 gui/options.cpp:1411
+#: gui/options.cpp:1423
msgctxt "path"
msgid "None"
msgstr "Nincs"
-#: gui/launcher.cpp:334 gui/launcher.cpp:422 gui/launcher.cpp:527
-#: gui/options.cpp:1277 gui/options.cpp:1321 gui/options.cpp:1439
+#: gui/launcher.cpp:359 gui/launcher.cpp:459 gui/launcher.cpp:569
+#: gui/options.cpp:1252 gui/options.cpp:1296 gui/options.cpp:1414
#: backends/platform/wii/options.cpp:56
msgid "Default"
msgstr "Alapщrtelmezett"
-#: gui/launcher.cpp:462 gui/options.cpp:1442
+#: gui/launcher.cpp:504 gui/options.cpp:1417
msgid "Select SoundFont"
msgstr "SoundFont kivсlasztсs"
-#: gui/launcher.cpp:481 gui/launcher.cpp:636
+#: gui/launcher.cpp:523 gui/launcher.cpp:677
msgid "Select directory with game data"
msgstr "Jсtщkok helyщnek kivсlasztсsa"
-#: gui/launcher.cpp:499
+#: gui/launcher.cpp:541
msgid "Select additional game directory"
msgstr "Vсlassz mappсt a jсtщk kiegщszэtѕkhіz"
-#: gui/launcher.cpp:511
+#: gui/launcher.cpp:553
msgid "Select directory for saved games"
msgstr "Vсlaszz jсtщkmentщseknek mappсt"
-#: gui/launcher.cpp:538
+#: gui/launcher.cpp:580
msgid "This game ID is already taken. Please choose another one."
msgstr "Ez a jсtщkazonosэtѓ ID mсr foglalt, Vсlassz egy mсsikat."
-#: gui/launcher.cpp:579 engines/dialogs.cpp:110
+#: gui/launcher.cpp:621 engines/dialogs.cpp:110
msgid "~Q~uit"
msgstr "Kilщpщs"
-#: gui/launcher.cpp:579 backends/platform/sdl/macosx/appmenu_osx.mm:96
+#: gui/launcher.cpp:621 backends/platform/sdl/macosx/appmenu_osx.mm:96
msgid "Quit ScummVM"
msgstr "ScummVM bezсrсsa"
-#: gui/launcher.cpp:580
+#: gui/launcher.cpp:622
msgid "A~b~out..."
msgstr "Nщvjegy"
-#: gui/launcher.cpp:580 backends/platform/sdl/macosx/appmenu_osx.mm:70
+#: gui/launcher.cpp:622 backends/platform/sdl/macosx/appmenu_osx.mm:70
msgid "About ScummVM"
msgstr "ScummVM nщvjegy"
-#: gui/launcher.cpp:581
+#: gui/launcher.cpp:623
msgid "~O~ptions..."
msgstr "~O~pciѓk..."
-#: gui/launcher.cpp:581
+#: gui/launcher.cpp:623
msgid "Change global ScummVM options"
msgstr "Globсlis ScummVM opciѓk cserщje"
-#: gui/launcher.cpp:583
+#: gui/launcher.cpp:625
msgid "~S~tart"
msgstr "Indэtсs"
-#: gui/launcher.cpp:583
+#: gui/launcher.cpp:625
msgid "Start selected game"
msgstr "A vсlasztott jсtщk indэtсsa"
-#: gui/launcher.cpp:586
+#: gui/launcher.cpp:628
msgid "~L~oad..."
msgstr "Betіltщs"
-#: gui/launcher.cpp:586
+#: gui/launcher.cpp:628
msgid "Load savegame for selected game"
msgstr "Kimentett jсtщkсllсs betіltщse"
-#: gui/launcher.cpp:591 gui/launcher.cpp:1079
+#: gui/launcher.cpp:633 gui/launcher.cpp:1120
msgid "~A~dd Game..."
msgstr "Jсtщk hozzсadсs"
-#: gui/launcher.cpp:591 gui/launcher.cpp:598
+#: gui/launcher.cpp:633 gui/launcher.cpp:640
msgid "Hold Shift for Mass Add"
msgstr "Tratsd lenyomva a Shift-et a Masszэv mѓdhoz"
-#: gui/launcher.cpp:593
+#: gui/launcher.cpp:635
msgid "~E~dit Game..."
msgstr "Jсtщkopciѓk"
-#: gui/launcher.cpp:593 gui/launcher.cpp:600
+#: gui/launcher.cpp:635 gui/launcher.cpp:642
msgid "Change game options"
msgstr "Jсtщk beсllэtсsok megvсltoztatсsa"
-#: gui/launcher.cpp:595
+#: gui/launcher.cpp:637
msgid "~R~emove Game"
msgstr "Jсtщk tіrlщse"
-#: gui/launcher.cpp:595 gui/launcher.cpp:602
+#: gui/launcher.cpp:637 gui/launcher.cpp:644
msgid "Remove game from the list. The game data files stay intact"
msgstr "Tіrli a jсtщk nevщt a listсrѓl. A jсtщkfсjlok megmaradnak"
-#: gui/launcher.cpp:598 gui/launcher.cpp:1079
+#: gui/launcher.cpp:640 gui/launcher.cpp:1120
msgctxt "lowres"
msgid "~A~dd Game..."
msgstr "Jсtщk hozzсadсs"
-#: gui/launcher.cpp:600
+#: gui/launcher.cpp:642
msgctxt "lowres"
msgid "~E~dit Game..."
msgstr "Jсtщkopciѓk"
-#: gui/launcher.cpp:602
+#: gui/launcher.cpp:644
msgctxt "lowres"
msgid "~R~emove Game"
msgstr "Jсtщk tіrlщse"
-#: gui/launcher.cpp:610
+#: gui/launcher.cpp:652
msgid "Search in game list"
msgstr "Keresщs a jсtщklistсban"
-#: gui/launcher.cpp:614 gui/launcher.cpp:1126
+#: gui/launcher.cpp:656 gui/launcher.cpp:1167
msgid "Search:"
msgstr "Keresщs:"
-#: gui/launcher.cpp:639 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255
+#: gui/launcher.cpp:680 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255
#: engines/mohawk/riven.cpp:716 engines/cruise/menu.cpp:216
msgid "Load game:"
msgstr "Jсtщk betіltщse:"
-#: gui/launcher.cpp:639 engines/dialogs.cpp:114 engines/scumm/dialogs.cpp:188
+#: gui/launcher.cpp:680 engines/dialogs.cpp:114 engines/scumm/dialogs.cpp:188
#: engines/mohawk/myst.cpp:255 engines/mohawk/riven.cpp:716
#: engines/cruise/menu.cpp:216 backends/platform/wince/CEActionsPocket.cpp:267
#: backends/platform/wince/CEActionsSmartphone.cpp:231
msgid "Load"
msgstr "Betіltщs"
-#: gui/launcher.cpp:747
+#: gui/launcher.cpp:788
msgid ""
"Do you really want to run the mass game detector? This could potentially add "
"a huge number of games."
@@ -455,7 +460,7 @@ msgstr ""
"Biztos hogy futtatod a Masszэv jсtщkdetektort? Ez potenciсlisan sok jсtщkot "
"hozzсad a listсhoz."
-#: gui/launcher.cpp:748 gui/launcher.cpp:896
+#: gui/launcher.cpp:789 gui/launcher.cpp:937
#: backends/events/symbiansdl/symbiansdl-events.cpp:184
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
@@ -463,7 +468,7 @@ msgstr ""
msgid "Yes"
msgstr "Igen"
-#: gui/launcher.cpp:748 gui/launcher.cpp:896
+#: gui/launcher.cpp:789 gui/launcher.cpp:937
#: backends/events/symbiansdl/symbiansdl-events.cpp:184
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
@@ -471,37 +476,37 @@ msgstr "Igen"
msgid "No"
msgstr "Nem"
-#: gui/launcher.cpp:796
+#: gui/launcher.cpp:837
msgid "ScummVM couldn't open the specified directory!"
msgstr "ScummVM nem tudja megnyitni a vсlasztott mappсt!"
-#: gui/launcher.cpp:808
+#: gui/launcher.cpp:849
msgid "ScummVM could not find any game in the specified directory!"
msgstr "A ScummVM nem talсlt egy jсtщkot sem a vсlasztott mappсban!"
-#: gui/launcher.cpp:822
+#: gui/launcher.cpp:863
msgid "Pick the game:"
msgstr "Vсlassztott jсtщk:"
-#: gui/launcher.cpp:896
+#: gui/launcher.cpp:937
msgid "Do you really want to remove this game configuration?"
msgstr "Biztosan tіrіlni akarod ezt a jсtщkkonfigurсciѓt?"
-#: gui/launcher.cpp:960
+#: gui/launcher.cpp:1001
msgid "This game does not support loading games from the launcher."
msgstr "Ez a jсtщk nem tсmogatja a jсtщkсllсs betіltщst az indэtѓbѓl."
-#: gui/launcher.cpp:964
+#: gui/launcher.cpp:1005
msgid "ScummVM could not find any engine capable of running the selected game!"
msgstr ""
"ScummVM nem talсlt olyan jсtщkmotort ami a vсlasztott jсtщkot tсmogatja!"
-#: gui/launcher.cpp:1078
+#: gui/launcher.cpp:1119
msgctxt "lowres"
msgid "Mass Add..."
msgstr "Masszэv mѓd..."
-#: gui/launcher.cpp:1078
+#: gui/launcher.cpp:1119
msgid "Mass Add..."
msgstr "Masszэv mѓd..."
@@ -568,162 +573,154 @@ msgstr "44 kHz"
msgid "48 kHz"
msgstr "48 kHz"
-#: gui/options.cpp:257 gui/options.cpp:485 gui/options.cpp:586
-#: gui/options.cpp:659 gui/options.cpp:868
+#: gui/options.cpp:248 gui/options.cpp:474 gui/options.cpp:575
+#: gui/options.cpp:644 gui/options.cpp:852
msgctxt "soundfont"
msgid "None"
msgstr "Nincs"
-#: gui/options.cpp:393
+#: gui/options.cpp:382
msgid "Failed to apply some of the graphic options changes:"
msgstr "Nщhсny grafikus opciѓ vсltoztatсsa sikertelen:"
-#: gui/options.cpp:405
+#: gui/options.cpp:394
msgid "the video mode could not be changed."
msgstr "a videѓmѓd nem vсltozott."
-#: gui/options.cpp:411
+#: gui/options.cpp:400
msgid "the fullscreen setting could not be changed"
msgstr "a teljeskщpernyѕs beсllэtсs nem vсltozott"
-#: gui/options.cpp:417
+#: gui/options.cpp:406
msgid "the aspect ratio setting could not be changed"
msgstr "a kщpmщretarсny beсllэtсsok nem vсltoztak"
-#: gui/options.cpp:742
+#: gui/options.cpp:727
msgid "Graphics mode:"
msgstr "Grafikus mѓd:"
-#: gui/options.cpp:756
+#: gui/options.cpp:741
msgid "Render mode:"
msgstr "Kirajzolсs mѓd:"
-#: gui/options.cpp:756 gui/options.cpp:757
+#: gui/options.cpp:741 gui/options.cpp:742
msgid "Special dithering modes supported by some games"
msgstr "Nщhсny jсtщk tсmogatja a speciсlis сrnyalсsi mѓdokat"
-#: gui/options.cpp:768
+#: gui/options.cpp:753
#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2248
#: backends/graphics/openglsdl/openglsdl-graphics.cpp:472
msgid "Fullscreen mode"
msgstr "Teljeskщpernyѕs mѓd:"
-#: gui/options.cpp:771
+#: gui/options.cpp:756
msgid "Aspect ratio correction"
msgstr "Kщpmщretarсny korrekciѓ"
-#: gui/options.cpp:771
+#: gui/options.cpp:756
msgid "Correct aspect ratio for 320x200 games"
msgstr "Helyes oldalarсny a 320x200 jсtщkokhoz"
-#: gui/options.cpp:772
-msgid "EGA undithering"
-msgstr "EGA szinjavэtсs"
-
-#: gui/options.cpp:772
-msgid "Enable undithering in EGA games that support it"
-msgstr "EGA szэnjavэtсs tсmogatott EGA jсtщkokban"
-
-#: gui/options.cpp:780
+#: gui/options.cpp:764
msgid "Preferred Device:"
msgstr "Elsѕdleges eszkіz:"
-#: gui/options.cpp:780
+#: gui/options.cpp:764
msgid "Music Device:"
msgstr "Zene eszkіz:"
-#: gui/options.cpp:780 gui/options.cpp:782
+#: gui/options.cpp:764 gui/options.cpp:766
msgid "Specifies preferred sound device or sound card emulator"
msgstr "Elsѕdleges hangeszkіz vagy hang emulсtor beсllэtсsok"
-#: gui/options.cpp:780 gui/options.cpp:782 gui/options.cpp:783
+#: gui/options.cpp:764 gui/options.cpp:766 gui/options.cpp:767
msgid "Specifies output sound device or sound card emulator"
msgstr "Hangeszkіz vagy hangkсrtya emulсtor beсllэtсsok"
-#: gui/options.cpp:782
+#: gui/options.cpp:766
msgctxt "lowres"
msgid "Preferred Dev.:"
msgstr "Elsѕdleges eszk.:"
-#: gui/options.cpp:782
+#: gui/options.cpp:766
msgctxt "lowres"
msgid "Music Device:"
msgstr "Zene eszkіz:"
-#: gui/options.cpp:809
+#: gui/options.cpp:793
msgid "AdLib emulator:"
msgstr "AdLib emulсtor:"
-#: gui/options.cpp:809 gui/options.cpp:810
+#: gui/options.cpp:793 gui/options.cpp:794
msgid "AdLib is used for music in many games"
msgstr "AdLib meghajtѓt sok jсtщk hasznсlja zenщhez"
-#: gui/options.cpp:820
+#: gui/options.cpp:804
msgid "Output rate:"
msgstr "Kimeneti rсta:"
-#: gui/options.cpp:820 gui/options.cpp:821
+#: gui/options.cpp:804 gui/options.cpp:805
msgid ""
"Higher value specifies better sound quality but may be not supported by your "
"soundcard"
msgstr ""
"Nagyobb щrtщkek jobb hangminѕsщget adnak, de nem minden hangkсrtya tсmogatja"
-#: gui/options.cpp:831
+#: gui/options.cpp:815
msgid "GM Device:"
msgstr "GM Eszkіz:"
-#: gui/options.cpp:831
+#: gui/options.cpp:815
msgid "Specifies default sound device for General MIDI output"
msgstr "Alapщrtelmezett hangeszkіz General MIDI kimenethez"
-#: gui/options.cpp:842
+#: gui/options.cpp:826
msgid "Don't use General MIDI music"
msgstr "Ne hasznсlj General MIDI zenщt"
-#: gui/options.cpp:853 gui/options.cpp:915
+#: gui/options.cpp:837 gui/options.cpp:899
msgid "Use first available device"
msgstr "Elsѕ elщrhetѕ eszkіz hasznсlata"
-#: gui/options.cpp:865
+#: gui/options.cpp:849
msgid "SoundFont:"
msgstr "SoundFont:"
-#: gui/options.cpp:865 gui/options.cpp:867 gui/options.cpp:868
+#: gui/options.cpp:849 gui/options.cpp:851 gui/options.cpp:852
msgid "SoundFont is supported by some audio cards, Fluidsynth and Timidity"
msgstr ""
"Nщhсny hangkсrya, Fluidsynth щs Timidyti tсmogatja a SoundFont betіltщsщt"
-#: gui/options.cpp:867
+#: gui/options.cpp:851
msgctxt "lowres"
msgid "SoundFont:"
msgstr "SoundFont:"
-#: gui/options.cpp:873
+#: gui/options.cpp:857
msgid "Mixed AdLib/MIDI mode"
msgstr "Vegyes AdLib/MIDI mѓd"
-#: gui/options.cpp:873
+#: gui/options.cpp:857
msgid "Use both MIDI and AdLib sound generation"
msgstr "MIDI щs AdLib hanggenerсtorok hasznсlata"
-#: gui/options.cpp:876
+#: gui/options.cpp:860
msgid "MIDI gain:"
msgstr "MIDI erѕsэtщs:"
-#: gui/options.cpp:886
+#: gui/options.cpp:870
msgid "MT-32 Device:"
msgstr "MT-32 Eszkіz:"
-#: gui/options.cpp:886
+#: gui/options.cpp:870
msgid "Specifies default sound device for Roland MT-32/LAPC1/CM32l/CM64 output"
msgstr "Roland MT-32/LAPC1/CM32l/CM64 alapщrtelmezett hangeszkіzіk beсllэtсsa"
-#: gui/options.cpp:891
+#: gui/options.cpp:875
msgid "True Roland MT-32 (disable GM emulation)"
msgstr "Roland MT-32 Hardver (GM emulсciѓ tiltva)"
-#: gui/options.cpp:891 gui/options.cpp:893
+#: gui/options.cpp:875 gui/options.cpp:877
msgid ""
"Check if you want to use your real hardware Roland-compatible sound device "
"connected to your computer"
@@ -731,190 +728,190 @@ msgstr ""
"Jelіld be, ha hardveres Roland-Kompatibilis hangeszkіz van csatlakoztatva a "
"gщpedhez щs hasznсlni akarod"
-#: gui/options.cpp:893
+#: gui/options.cpp:877
msgctxt "lowres"
msgid "True Roland MT-32 (no GM emulation)"
msgstr "Roland MT-32 Hardver (GM emulсciѓ nincs)"
-#: gui/options.cpp:896
+#: gui/options.cpp:880
msgid "Enable Roland GS Mode"
msgstr "Roland GS Mѓd engedщlyezve"
-#: gui/options.cpp:896
+#: gui/options.cpp:880
msgid "Turns off General MIDI mapping for games with Roland MT-32 soundtrack"
msgstr "General MIDI lekщpezщs Roland MT-32 zenщs jсtщkokhoz kikapcsolva"
-#: gui/options.cpp:905
+#: gui/options.cpp:889
msgid "Don't use Roland MT-32 music"
msgstr "Ne hasznсlj Roland MT-32 zenщt"
-#: gui/options.cpp:932
+#: gui/options.cpp:916
msgid "Text and Speech:"
msgstr "Szіveg щs beszщd:"
-#: gui/options.cpp:936 gui/options.cpp:946
+#: gui/options.cpp:920 gui/options.cpp:930
msgid "Speech"
msgstr "Csak beszщd"
-#: gui/options.cpp:937 gui/options.cpp:947
+#: gui/options.cpp:921 gui/options.cpp:931
msgid "Subtitles"
msgstr "Csak felirat"
-#: gui/options.cpp:938
+#: gui/options.cpp:922
msgid "Both"
msgstr "Mind"
-#: gui/options.cpp:940
+#: gui/options.cpp:924
msgid "Subtitle speed:"
msgstr "Felirat sebessщg:"
-#: gui/options.cpp:942
+#: gui/options.cpp:926
msgctxt "lowres"
msgid "Text and Speech:"
msgstr "Felirat щs beszщd:"
-#: gui/options.cpp:946
+#: gui/options.cpp:930
msgid "Spch"
msgstr "Besz"
-#: gui/options.cpp:947
+#: gui/options.cpp:931
msgid "Subs"
msgstr "Text"
-#: gui/options.cpp:948
+#: gui/options.cpp:932
msgctxt "lowres"
msgid "Both"
msgstr "Mind"
-#: gui/options.cpp:948
+#: gui/options.cpp:932
msgid "Show subtitles and play speech"
msgstr "Hang щs feliratok megjelenэtщse"
-#: gui/options.cpp:950
+#: gui/options.cpp:934
msgctxt "lowres"
msgid "Subtitle speed:"
msgstr "Felirat sebessщg:"
-#: gui/options.cpp:966
+#: gui/options.cpp:950
msgid "Music volume:"
msgstr "Zene hangerѕ:"
-#: gui/options.cpp:968
+#: gui/options.cpp:952
msgctxt "lowres"
msgid "Music volume:"
msgstr "Zene hangerѕ:"
-#: gui/options.cpp:975
+#: gui/options.cpp:959
msgid "Mute All"
msgstr "жsszes nщmэtсsa"
-#: gui/options.cpp:978
+#: gui/options.cpp:962
msgid "SFX volume:"
msgstr "SFX hangerѕ:"
-#: gui/options.cpp:978 gui/options.cpp:980 gui/options.cpp:981
+#: gui/options.cpp:962 gui/options.cpp:964 gui/options.cpp:965
msgid "Special sound effects volume"
msgstr "Speciсlis hangeffektusok hangereje"
-#: gui/options.cpp:980
+#: gui/options.cpp:964
msgctxt "lowres"
msgid "SFX volume:"
msgstr "SFX hangerѕ:"
-#: gui/options.cpp:988
+#: gui/options.cpp:972
msgid "Speech volume:"
msgstr "Beszщd hangerѕ:"
-#: gui/options.cpp:990
+#: gui/options.cpp:974
msgctxt "lowres"
msgid "Speech volume:"
msgstr "Beszщd hangerѕ:"
-#: gui/options.cpp:1156
+#: gui/options.cpp:1131
msgid "Theme Path:"
msgstr "Tщma Mappa:"
-#: gui/options.cpp:1158
+#: gui/options.cpp:1133
msgctxt "lowres"
msgid "Theme Path:"
msgstr "Tщma Mappa:"
-#: gui/options.cpp:1164 gui/options.cpp:1166 gui/options.cpp:1167
+#: gui/options.cpp:1139 gui/options.cpp:1141 gui/options.cpp:1142
msgid "Specifies path to additional data used by all games or ScummVM"
msgstr "Minden jщtщk щs ScummVM kiegщszэtѕ fсjljainak mappсja:"
-#: gui/options.cpp:1173
+#: gui/options.cpp:1148
msgid "Plugins Path:"
msgstr "Plugin Mappa:"
-#: gui/options.cpp:1175
+#: gui/options.cpp:1150
msgctxt "lowres"
msgid "Plugins Path:"
msgstr "Plugin Mappa:"
-#: gui/options.cpp:1184
+#: gui/options.cpp:1159
msgid "Misc"
msgstr "Vegyes"
-#: gui/options.cpp:1186
+#: gui/options.cpp:1161
msgctxt "lowres"
msgid "Misc"
msgstr "Vegyes"
-#: gui/options.cpp:1188
+#: gui/options.cpp:1163
msgid "Theme:"
msgstr "Tщma:"
-#: gui/options.cpp:1192
+#: gui/options.cpp:1167
msgid "GUI Renderer:"
msgstr "GUI Renderelѕ:"
-#: gui/options.cpp:1204
+#: gui/options.cpp:1179
msgid "Autosave:"
msgstr "Automentщs:"
-#: gui/options.cpp:1206
+#: gui/options.cpp:1181
msgctxt "lowres"
msgid "Autosave:"
msgstr "Automentщs:"
-#: gui/options.cpp:1214
+#: gui/options.cpp:1189
msgid "Keys"
msgstr "Billentyћk"
-#: gui/options.cpp:1221
+#: gui/options.cpp:1196
msgid "GUI Language:"
msgstr "GUI nyelve:"
-#: gui/options.cpp:1221
+#: gui/options.cpp:1196
msgid "Language of ScummVM GUI"
msgstr "A ScummVM GUI nyelve"
-#: gui/options.cpp:1372
+#: gui/options.cpp:1347
msgid "You have to restart ScummVM before your changes will take effect."
msgstr "Indэtsd њjra a ScummVM-et a vсltozсsok щrvщnyesэtщsщhez."
-#: gui/options.cpp:1385
+#: gui/options.cpp:1360
msgid "Select directory for savegames"
msgstr "Vсlassz jсtщkmentщs mappсt"
-#: gui/options.cpp:1392
+#: gui/options.cpp:1367
msgid "The chosen directory cannot be written to. Please select another one."
msgstr "A kivсlasztott mappсba nem lehet эrni, vсlassz egy mсsikat"
-#: gui/options.cpp:1401
+#: gui/options.cpp:1376
msgid "Select directory for GUI themes"
msgstr "GUI tщma mappa kivсlasztсsa"
-#: gui/options.cpp:1411
+#: gui/options.cpp:1386
msgid "Select directory for extra files"
msgstr "Mappa vсlasztсs az extra fсjloknak"
-#: gui/options.cpp:1422
+#: gui/options.cpp:1397
msgid "Select directory for plugins"
msgstr "Plugin mappa kivсlasztсsa"
-#: gui/options.cpp:1475
+#: gui/options.cpp:1450
msgid ""
"The theme you selected does not support your current language. If you want "
"to use this theme you need to switch to another language first."
@@ -962,64 +959,64 @@ msgstr "Nщvtelen jсtщkсllсs"
msgid "Select a Theme"
msgstr "Vсlassz tщmсt"
-#: gui/ThemeEngine.cpp:333
+#: gui/ThemeEngine.cpp:335
msgid "Disabled GFX"
msgstr "GFX letiltva"
-#: gui/ThemeEngine.cpp:333
+#: gui/ThemeEngine.cpp:335
msgctxt "lowres"
msgid "Disabled GFX"
msgstr "GFX letiltva"
-#: gui/ThemeEngine.cpp:334
+#: gui/ThemeEngine.cpp:336
msgid "Standard Renderer (16bpp)"
msgstr "Standard lekщpezѕ (16bpp)"
-#: gui/ThemeEngine.cpp:334
+#: gui/ThemeEngine.cpp:336
msgid "Standard (16bpp)"
msgstr "Standard (16bpp)"
-#: gui/ThemeEngine.cpp:336
+#: gui/ThemeEngine.cpp:338
msgid "Antialiased Renderer (16bpp)"
msgstr "Щlsimэtсsos lekщpezѕ (16bpp)"
-#: gui/ThemeEngine.cpp:336
+#: gui/ThemeEngine.cpp:338
msgid "Antialiased (16bpp)"
msgstr "Щlsimэtott (16bpp)"
-#: gui/widget.cpp:312 gui/widget.cpp:314 gui/widget.cpp:320 gui/widget.cpp:322
+#: gui/widget.cpp:322 gui/widget.cpp:324 gui/widget.cpp:330 gui/widget.cpp:332
msgid "Clear value"
msgstr "Щrtщk tіrlщse"
-#: base/main.cpp:203
+#: base/main.cpp:209
#, c-format
msgid "Engine does not support debug level '%s'"
msgstr "A motor nem tсmogatja a '%s' debug szintet"
-#: base/main.cpp:275
+#: base/main.cpp:287
msgid "Menu"
msgstr "Menќ"
-#: base/main.cpp:278 backends/platform/symbian/src/SymbianActions.cpp:45
+#: base/main.cpp:290 backends/platform/symbian/src/SymbianActions.cpp:45
#: backends/platform/wince/CEActionsPocket.cpp:45
#: backends/platform/wince/CEActionsSmartphone.cpp:46
msgid "Skip"
msgstr "Tovсbb"
-#: base/main.cpp:281 backends/platform/symbian/src/SymbianActions.cpp:50
+#: base/main.cpp:293 backends/platform/symbian/src/SymbianActions.cpp:50
#: backends/platform/wince/CEActionsPocket.cpp:42
msgid "Pause"
msgstr "Szќnet"
-#: base/main.cpp:284
+#: base/main.cpp:296
msgid "Skip line"
msgstr "Sor сtlщpщse"
-#: base/main.cpp:455
+#: base/main.cpp:467
msgid "Error running game:"
msgstr "Hiba a jсtщk futtatсsakor:"
-#: base/main.cpp:479
+#: base/main.cpp:491
msgid "Could not find any engine capable of running the selected game"
msgstr "Nem talсlhatѓ olyan jсtщkmotor ami a vсlasztott jсtщkot tсmogatja"
@@ -1087,16 +1084,16 @@ msgstr "Felhasznсlѓi megszakэtсs"
msgid "Unknown error"
msgstr "Ismeretlen hiba"
-#: engines/advancedDetector.cpp:296
+#: engines/advancedDetector.cpp:324
#, c-format
msgid "The game in '%s' seems to be unknown."
msgstr "A '%s' jсtщk ismeretlennek tћnik."
-#: engines/advancedDetector.cpp:297
+#: engines/advancedDetector.cpp:325
msgid "Please, report the following data to the ScummVM team along with name"
msgstr "Kщrlek jelezd a ScummVM csapatnak a kіvetkezѕ adatokat, egyќtt a jсtщk"
-#: engines/advancedDetector.cpp:299
+#: engines/advancedDetector.cpp:327
msgid "of the game you tried to add and its version/language/etc.:"
msgstr "cэmщvel щs megbэzhatѓ adataival jсtщkverziѓ/nyelv(ek)/stb.:"
@@ -1133,13 +1130,14 @@ msgctxt "lowres"
msgid "~R~eturn to Launcher"
msgstr "Visszatщrщs az indэtѓba"
-#: engines/dialogs.cpp:116 engines/cruise/menu.cpp:214
-#: engines/sci/engine/kfile.cpp:566
+#: engines/dialogs.cpp:116 engines/agi/saveload.cpp:805
+#: engines/cruise/menu.cpp:214 engines/sci/engine/kfile.cpp:567
msgid "Save game:"
msgstr "Jсtщk mentщse:"
-#: engines/dialogs.cpp:116 engines/scumm/dialogs.cpp:187
-#: engines/cruise/menu.cpp:214 engines/sci/engine/kfile.cpp:566
+#: engines/dialogs.cpp:116 engines/agi/saveload.cpp:805
+#: engines/scumm/dialogs.cpp:187 engines/cruise/menu.cpp:214
+#: engines/sci/engine/kfile.cpp:567
#: backends/platform/symbian/src/SymbianActions.cpp:44
#: backends/platform/wince/CEActionsPocket.cpp:43
#: backends/platform/wince/CEActionsPocket.cpp:267
@@ -1247,6 +1245,88 @@ msgstr ""
msgid "Start anyway"
msgstr "Indэtсs эgy is"
+#: engines/agi/detection.cpp:145 engines/dreamweb/detection.cpp:47
+#: engines/sci/detection.cpp:390
+msgid "Use original save/load screens"
+msgstr ""
+
+#: engines/agi/detection.cpp:146 engines/dreamweb/detection.cpp:48
+#: engines/sci/detection.cpp:391
+msgid "Use the original save/load screens, instead of the ScummVM ones"
+msgstr ""
+
+#: engines/agi/saveload.cpp:827 engines/sci/engine/kfile.cpp:674
+msgid "Restore game:"
+msgstr "Jсtщkmenet visszaсllэtсsa:"
+
+#: engines/agi/saveload.cpp:827 engines/sci/engine/kfile.cpp:674
+msgid "Restore"
+msgstr "Visszaсllэtсs"
+
+#: engines/dreamweb/detection.cpp:57
+#, fuzzy
+msgid "Use bright palette mode"
+msgstr "Jobb felsѕ tсrgy"
+
+#: engines/dreamweb/detection.cpp:58
+msgid "Display graphics using the game's bright palette"
+msgstr ""
+
+#: engines/sci/detection.cpp:370
+msgid "EGA undithering"
+msgstr "EGA szinjavэtсs"
+
+#: engines/sci/detection.cpp:371
+#, fuzzy
+msgid "Enable undithering in EGA games"
+msgstr "EGA szэnjavэtсs tсmogatott EGA jсtщkokban"
+
+#: engines/sci/detection.cpp:380
+#, fuzzy
+msgid "Prefer digital sound effects"
+msgstr "Speciсlis hangeffektusok hangereje"
+
+#: engines/sci/detection.cpp:381
+msgid "Prefer digital sound effects instead of synthesized ones"
+msgstr ""
+
+#: engines/sci/detection.cpp:400
+msgid "Use IMF/Yahama FB-01 for MIDI output"
+msgstr ""
+
+#: engines/sci/detection.cpp:401
+msgid ""
+"Use an IBM Music Feature card or a Yahama FB-01 FM synth module for MIDI "
+"output"
+msgstr ""
+
+#: engines/sci/detection.cpp:411
+msgid "Use CD audio"
+msgstr ""
+
+#: engines/sci/detection.cpp:412
+msgid "Use CD audio instead of in-game audio, if available"
+msgstr ""
+
+#: engines/sci/detection.cpp:422
+msgid "Use Windows cursors"
+msgstr ""
+
+#: engines/sci/detection.cpp:423
+msgid ""
+"Use the Windows cursors (smaller and monochrome) instead of the DOS ones"
+msgstr ""
+
+#: engines/sci/detection.cpp:433
+#, fuzzy
+msgid "Use silver cursors"
+msgstr "Szabvсny kurzor"
+
+#: engines/sci/detection.cpp:434
+msgid ""
+"Use the alternate set of silver cursors, instead of the normal golden ones"
+msgstr ""
+
#: engines/scumm/dialogs.cpp:175
#, c-format
msgid "Insert Disk %c and Press Button to Continue."
@@ -1903,7 +1983,7 @@ msgstr ""
"Native MIDI tсmogatсshoz kell a Roland Upgrade a LucasArts-tѓl,\n"
"a %s hiсnyzik. AdLib-ot hasznсlok helyette."
-#: engines/scumm/scumm.cpp:2271 engines/agos/saveload.cpp:189
+#: engines/scumm/scumm.cpp:2271 engines/agos/saveload.cpp:202
#, c-format
msgid ""
"Failed to save game state to file:\n"
@@ -1914,7 +1994,7 @@ msgstr ""
"\n"
"%s fсjlba nem sikerќlt"
-#: engines/scumm/scumm.cpp:2278 engines/agos/saveload.cpp:154
+#: engines/scumm/scumm.cpp:2278 engines/agos/saveload.cpp:167
#, c-format
msgid ""
"Failed to load game state from file:\n"
@@ -1925,7 +2005,7 @@ msgstr ""
"\n"
"%s fсjlbѓl nem sikerќlt"
-#: engines/scumm/scumm.cpp:2290 engines/agos/saveload.cpp:197
+#: engines/scumm/scumm.cpp:2290 engines/agos/saveload.cpp:210
#, c-format
msgid ""
"Successfully saved game state in file:\n"
@@ -1972,14 +2052,6 @@ msgstr "Fѕ~M~enќ"
msgid "~W~ater Effect Enabled"
msgstr "Vэzeffektus engedщlyezve"
-#: engines/sci/engine/kfile.cpp:673
-msgid "Restore game:"
-msgstr "Jсtщkmenet visszaсllэtсsa:"
-
-#: engines/sci/engine/kfile.cpp:673
-msgid "Restore"
-msgstr "Visszaсllэtсs"
-
#: engines/agos/animation.cpp:550
#, c-format
msgid "Cutscene file '%s' not found!"
@@ -2002,6 +2074,66 @@ msgstr "Fсjl tіrlщs sikertelen."
msgid "Failed to save game"
msgstr "Jсtщk mentщs nem sikerќlt"
+#. I18N: Studio audience adds an applause and cheering sounds whenever
+#. Malcolm makes a joke.
+#: engines/kyra/detection.cpp:62
+msgid "Studio audience"
+msgstr ""
+
+#: engines/kyra/detection.cpp:63
+msgid "Enable studio audience"
+msgstr ""
+
+#. I18N: This option allows the user to skip text and cutscenes.
+#: engines/kyra/detection.cpp:73
+msgid "Skip support"
+msgstr ""
+
+#: engines/kyra/detection.cpp:74
+msgid "Allow text and cutscenes to be skipped"
+msgstr ""
+
+#. I18N: Helium mode makes people sound like they've inhaled Helium.
+#: engines/kyra/detection.cpp:84
+msgid "Helium mode"
+msgstr ""
+
+#: engines/kyra/detection.cpp:85
+#, fuzzy
+msgid "Enable helium mode"
+msgstr "Roland GS Mѓd engedщlyezve"
+
+#. I18N: When enabled, this option makes scrolling smoother when
+#. changing from one screen to another.
+#: engines/kyra/detection.cpp:99
+msgid "Smooth scrolling"
+msgstr ""
+
+#: engines/kyra/detection.cpp:100
+msgid "Enable smooth scrolling when walking"
+msgstr ""
+
+#. I18N: When enabled, this option changes the cursor when it floats to the
+#. edge of the screen to a directional arrow. The player can then click to
+#. walk towards that direction.
+#: engines/kyra/detection.cpp:112
+#, fuzzy
+msgid "Floating cursors"
+msgstr "Szabvсny kurzor"
+
+#: engines/kyra/detection.cpp:113
+msgid "Enable floating cursors"
+msgstr ""
+
+#. I18N: HP stands for Hit Points
+#: engines/kyra/detection.cpp:127
+msgid "HP bar graphs"
+msgstr ""
+
+#: engines/kyra/detection.cpp:128
+msgid "Enable hit point bar graphs"
+msgstr ""
+
#: engines/kyra/lol.cpp:478
msgid "Attack 1"
msgstr "Tсmadсs 1"
@@ -2064,6 +2196,14 @@ msgstr ""
"a General MIDI-t. Kќlіnben nщhсny\n"
"sсvot nem lehet rendesen lejсtszani."
+#: engines/queen/queen.cpp:59 engines/sky/detection.cpp:44
+msgid "Floppy intro"
+msgstr ""
+
+#: engines/queen/queen.cpp:60 engines/sky/detection.cpp:45
+msgid "Use the floppy version's intro (CD version only)"
+msgstr ""
+
#: engines/sky/compact.cpp:130
msgid ""
"Unable to find \"sky.cpt\" file!\n"
@@ -2144,6 +2284,14 @@ msgstr ""
"PSX сtvezetѕfilmet talсltam, de ez a ScummVM RGB szэntсmogatсs nщlkќl van "
"lefordэtva"
+#: engines/sword2/sword2.cpp:79
+msgid "Show object labels"
+msgstr ""
+
+#: engines/sword2/sword2.cpp:80
+msgid "Show labels for objects on mouse hover"
+msgstr ""
+
#: engines/parallaction/saveload.cpp:133
#, c-format
msgid ""
@@ -2376,19 +2524,19 @@ msgstr "Jѓminѕsщgќ audiѓ (lassabb)(њjraindэtсs)"
msgid "Disable power off"
msgstr "Leсllэtсs tiltva"
-#: backends/platform/iphone/osys_events.cpp:301
+#: backends/platform/iphone/osys_events.cpp:300
msgid "Mouse-click-and-drag mode enabled."
msgstr "Egщr kattint-щs-hњz mѓd engedщlyezve."
-#: backends/platform/iphone/osys_events.cpp:303
+#: backends/platform/iphone/osys_events.cpp:302
msgid "Mouse-click-and-drag mode disabled."
msgstr "Egщr kattint-щs-hњz mѓd letiltva."
-#: backends/platform/iphone/osys_events.cpp:314
+#: backends/platform/iphone/osys_events.cpp:313
msgid "Touchpad mode enabled."
msgstr "Touchpad mѓd engedщlyezve."
-#: backends/platform/iphone/osys_events.cpp:316
+#: backends/platform/iphone/osys_events.cpp:315
msgid "Touchpad mode disabled."
msgstr "Touchpad mѓd letiltva."
@@ -2464,15 +2612,15 @@ msgstr "Aktэv grafikus szћrѕk:"
msgid "Windowed mode"
msgstr "Ablakos mѓd"
-#: backends/graphics/opengl/opengl-graphics.cpp:130
+#: backends/graphics/opengl/opengl-graphics.cpp:135
msgid "OpenGL Normal"
msgstr "OpenGL Normсl"
-#: backends/graphics/opengl/opengl-graphics.cpp:131
+#: backends/graphics/opengl/opengl-graphics.cpp:136
msgid "OpenGL Conserve"
msgstr "OpenGL Megtartott"
-#: backends/graphics/opengl/opengl-graphics.cpp:132
+#: backends/graphics/opengl/opengl-graphics.cpp:137
msgid "OpenGL Original"
msgstr "OpenGL Eredeti"
diff --git a/po/it_IT.po b/po/it_IT.po
index 8ac8a62216..bee74f5a68 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ScummVM 1.3.0svn\n"
"Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n"
-"POT-Creation-Date: 2012-03-07 22:09+0000\n"
+"POT-Creation-Date: 2012-05-20 22:39+0100\n"
"PO-Revision-Date: 2011-10-08 17:29+0100\n"
"Last-Translator: Matteo 'Maff' Angelino <matteo.maff at gmail dot com>\n"
"Language-Team: Italian\n"
@@ -43,7 +43,7 @@ msgid "Go up"
msgstr "Su"
#: gui/browser.cpp:69 gui/chooser.cpp:45 gui/KeysDialog.cpp:43
-#: gui/launcher.cpp:320 gui/massadd.cpp:94 gui/options.cpp:1253
+#: gui/launcher.cpp:345 gui/massadd.cpp:94 gui/options.cpp:1228
#: gui/saveload.cpp:63 gui/saveload.cpp:155 gui/themebrowser.cpp:54
#: engines/engine.cpp:442 engines/scumm/dialogs.cpp:190
#: engines/sword1/control.cpp:865 engines/parallaction/saveload.cpp:281
@@ -68,15 +68,15 @@ msgstr "Chiudi"
msgid "Mouse click"
msgstr "Clic del mouse"
-#: gui/gui-manager.cpp:122 base/main.cpp:288
+#: gui/gui-manager.cpp:122 base/main.cpp:300
msgid "Display keyboard"
msgstr "Mostra tastiera"
-#: gui/gui-manager.cpp:126 base/main.cpp:292
+#: gui/gui-manager.cpp:126 base/main.cpp:304
msgid "Remap keys"
msgstr "Riprogramma tasti"
-#: gui/gui-manager.cpp:129 base/main.cpp:295
+#: gui/gui-manager.cpp:129 base/main.cpp:307
#, fuzzy
msgid "Toggle FullScreen"
msgstr "Attiva / disattiva schermo intero"
@@ -89,8 +89,8 @@ msgstr "Scegli un'azione da mappare"
msgid "Map"
msgstr "Mappa"
-#: gui/KeysDialog.cpp:42 gui/launcher.cpp:321 gui/launcher.cpp:960
-#: gui/launcher.cpp:964 gui/massadd.cpp:91 gui/options.cpp:1254
+#: gui/KeysDialog.cpp:42 gui/launcher.cpp:346 gui/launcher.cpp:1001
+#: gui/launcher.cpp:1005 gui/massadd.cpp:91 gui/options.cpp:1229
#: engines/engine.cpp:361 engines/engine.cpp:372 engines/scumm/dialogs.cpp:192
#: engines/scumm/scumm.cpp:1775 engines/agos/animation.cpp:551
#: engines/groovie/script.cpp:420 engines/sky/compact.cpp:131
@@ -127,15 +127,15 @@ msgstr "Seleziona un'azione"
msgid "Press the key to associate"
msgstr "Premi il tasto da associare"
-#: gui/launcher.cpp:170
+#: gui/launcher.cpp:187
msgid "Game"
msgstr "Gioco"
-#: gui/launcher.cpp:174
+#: gui/launcher.cpp:191
msgid "ID:"
msgstr "ID:"
-#: gui/launcher.cpp:174 gui/launcher.cpp:176 gui/launcher.cpp:177
+#: gui/launcher.cpp:191 gui/launcher.cpp:193 gui/launcher.cpp:194
msgid ""
"Short game identifier used for referring to savegames and running the game "
"from the command line"
@@ -143,309 +143,314 @@ msgstr ""
"Breve identificatore di gioco utilizzato per il riferimento a salvataggi e "
"per l'esecuzione del gioco dalla riga di comando"
-#: gui/launcher.cpp:176
+#: gui/launcher.cpp:193
msgctxt "lowres"
msgid "ID:"
msgstr "ID:"
-#: gui/launcher.cpp:181
+#: gui/launcher.cpp:198
msgid "Name:"
msgstr "Nome:"
-#: gui/launcher.cpp:181 gui/launcher.cpp:183 gui/launcher.cpp:184
+#: gui/launcher.cpp:198 gui/launcher.cpp:200 gui/launcher.cpp:201
msgid "Full title of the game"
msgstr "Titolo completo del gioco"
-#: gui/launcher.cpp:183
+#: gui/launcher.cpp:200
msgctxt "lowres"
msgid "Name:"
msgstr "Nome:"
-#: gui/launcher.cpp:187
+#: gui/launcher.cpp:204
msgid "Language:"
msgstr "Lingua:"
-#: gui/launcher.cpp:187 gui/launcher.cpp:188
+#: gui/launcher.cpp:204 gui/launcher.cpp:205
msgid ""
"Language of the game. This will not turn your Spanish game version into "
"English"
msgstr ""
"Lingua del gioco. Un gioco inglese non potrр risultare tradotto in italiano"
-#: gui/launcher.cpp:189 gui/launcher.cpp:203 gui/options.cpp:80
-#: gui/options.cpp:745 gui/options.cpp:758 gui/options.cpp:1224
+#: gui/launcher.cpp:206 gui/launcher.cpp:220 gui/options.cpp:80
+#: gui/options.cpp:730 gui/options.cpp:743 gui/options.cpp:1199
#: audio/null.cpp:40
msgid "<default>"
msgstr "<predefinito>"
-#: gui/launcher.cpp:199
+#: gui/launcher.cpp:216
msgid "Platform:"
msgstr "Piattaforma:"
-#: gui/launcher.cpp:199 gui/launcher.cpp:201 gui/launcher.cpp:202
+#: gui/launcher.cpp:216 gui/launcher.cpp:218 gui/launcher.cpp:219
msgid "Platform the game was originally designed for"
msgstr "La piattaforma per la quale il gioco ш stato concepito"
-#: gui/launcher.cpp:201
+#: gui/launcher.cpp:218
msgctxt "lowres"
msgid "Platform:"
msgstr "Piattaf.:"
-#: gui/launcher.cpp:213 gui/options.cpp:1087 gui/options.cpp:1104
+#: gui/launcher.cpp:231
+#, fuzzy
+msgid "Engine"
+msgstr "Esamina"
+
+#: gui/launcher.cpp:239 gui/options.cpp:1062 gui/options.cpp:1079
msgid "Graphics"
msgstr "Grafica"
-#: gui/launcher.cpp:213 gui/options.cpp:1087 gui/options.cpp:1104
+#: gui/launcher.cpp:239 gui/options.cpp:1062 gui/options.cpp:1079
msgid "GFX"
msgstr "Grafica"
-#: gui/launcher.cpp:216
+#: gui/launcher.cpp:242
msgid "Override global graphic settings"
msgstr "Ignora le impostazioni grafiche globali"
-#: gui/launcher.cpp:218
+#: gui/launcher.cpp:244
msgctxt "lowres"
msgid "Override global graphic settings"
msgstr "Ignora le impostazioni grafiche globali"
-#: gui/launcher.cpp:225 gui/options.cpp:1110
+#: gui/launcher.cpp:251 gui/options.cpp:1085
msgid "Audio"
msgstr "Audio"
-#: gui/launcher.cpp:228
+#: gui/launcher.cpp:254
msgid "Override global audio settings"
msgstr "Ignora le impostazioni audio globali"
-#: gui/launcher.cpp:230
+#: gui/launcher.cpp:256
msgctxt "lowres"
msgid "Override global audio settings"
msgstr "Ignora le impostazioni audio globali"
-#: gui/launcher.cpp:239 gui/options.cpp:1115
+#: gui/launcher.cpp:265 gui/options.cpp:1090
msgid "Volume"
msgstr "Volume"
-#: gui/launcher.cpp:241 gui/options.cpp:1117
+#: gui/launcher.cpp:267 gui/options.cpp:1092
msgctxt "lowres"
msgid "Volume"
msgstr "Volume"
-#: gui/launcher.cpp:244
+#: gui/launcher.cpp:270
msgid "Override global volume settings"
msgstr "Ignora le impostazioni globali di volume"
-#: gui/launcher.cpp:246
+#: gui/launcher.cpp:272
msgctxt "lowres"
msgid "Override global volume settings"
msgstr "Ignora le impostazioni globali di volume"
-#: gui/launcher.cpp:254 gui/options.cpp:1125
+#: gui/launcher.cpp:280 gui/options.cpp:1100
msgid "MIDI"
msgstr "MIDI"
-#: gui/launcher.cpp:257
+#: gui/launcher.cpp:283
msgid "Override global MIDI settings"
msgstr "Ignora le impostazioni MIDI globali"
-#: gui/launcher.cpp:259
+#: gui/launcher.cpp:285
msgctxt "lowres"
msgid "Override global MIDI settings"
msgstr "Ignora le impostazioni MIDI globali"
-#: gui/launcher.cpp:268 gui/options.cpp:1131
+#: gui/launcher.cpp:294 gui/options.cpp:1106
msgid "MT-32"
msgstr "MT-32"
-#: gui/launcher.cpp:271
+#: gui/launcher.cpp:297
msgid "Override global MT-32 settings"
msgstr "Ignora le impostazioni MT-32 globali"
-#: gui/launcher.cpp:273
+#: gui/launcher.cpp:299
msgctxt "lowres"
msgid "Override global MT-32 settings"
msgstr "Ignora le impostazioni MT-32 globali"
-#: gui/launcher.cpp:282 gui/options.cpp:1138
+#: gui/launcher.cpp:308 gui/options.cpp:1113
msgid "Paths"
msgstr "Percorsi"
-#: gui/launcher.cpp:284 gui/options.cpp:1140
+#: gui/launcher.cpp:310 gui/options.cpp:1115
msgctxt "lowres"
msgid "Paths"
msgstr "Perc."
-#: gui/launcher.cpp:291
+#: gui/launcher.cpp:317
msgid "Game Path:"
msgstr "Percorso gioco:"
-#: gui/launcher.cpp:293
+#: gui/launcher.cpp:319
msgctxt "lowres"
msgid "Game Path:"
msgstr "Perc. gioco:"
-#: gui/launcher.cpp:298 gui/options.cpp:1164
+#: gui/launcher.cpp:324 gui/options.cpp:1139
msgid "Extra Path:"
msgstr "Percorso extra:"
-#: gui/launcher.cpp:298 gui/launcher.cpp:300 gui/launcher.cpp:301
+#: gui/launcher.cpp:324 gui/launcher.cpp:326 gui/launcher.cpp:327
msgid "Specifies path to additional data used the game"
msgstr "Specifica il percorso di ulteriori dati usati dal gioco"
-#: gui/launcher.cpp:300 gui/options.cpp:1166
+#: gui/launcher.cpp:326 gui/options.cpp:1141
msgctxt "lowres"
msgid "Extra Path:"
msgstr "Perc. extra:"
-#: gui/launcher.cpp:307 gui/options.cpp:1148
+#: gui/launcher.cpp:333 gui/options.cpp:1123
msgid "Save Path:"
msgstr "Salvataggi:"
-#: gui/launcher.cpp:307 gui/launcher.cpp:309 gui/launcher.cpp:310
-#: gui/options.cpp:1148 gui/options.cpp:1150 gui/options.cpp:1151
+#: gui/launcher.cpp:333 gui/launcher.cpp:335 gui/launcher.cpp:336
+#: gui/options.cpp:1123 gui/options.cpp:1125 gui/options.cpp:1126
msgid "Specifies where your savegames are put"
msgstr "Specifica dove archiviare i salvataggi"
-#: gui/launcher.cpp:309 gui/options.cpp:1150
+#: gui/launcher.cpp:335 gui/options.cpp:1125
msgctxt "lowres"
msgid "Save Path:"
msgstr "Salvataggi:"
-#: gui/launcher.cpp:329 gui/launcher.cpp:416 gui/launcher.cpp:469
-#: gui/launcher.cpp:523 gui/options.cpp:1159 gui/options.cpp:1167
-#: gui/options.cpp:1176 gui/options.cpp:1283 gui/options.cpp:1289
-#: gui/options.cpp:1297 gui/options.cpp:1327 gui/options.cpp:1333
-#: gui/options.cpp:1340 gui/options.cpp:1433 gui/options.cpp:1436
-#: gui/options.cpp:1448
+#: gui/launcher.cpp:354 gui/launcher.cpp:453 gui/launcher.cpp:511
+#: gui/launcher.cpp:565 gui/options.cpp:1134 gui/options.cpp:1142
+#: gui/options.cpp:1151 gui/options.cpp:1258 gui/options.cpp:1264
+#: gui/options.cpp:1272 gui/options.cpp:1302 gui/options.cpp:1308
+#: gui/options.cpp:1315 gui/options.cpp:1408 gui/options.cpp:1411
+#: gui/options.cpp:1423
msgctxt "path"
msgid "None"
msgstr "Nessuno"
-#: gui/launcher.cpp:334 gui/launcher.cpp:422 gui/launcher.cpp:527
-#: gui/options.cpp:1277 gui/options.cpp:1321 gui/options.cpp:1439
+#: gui/launcher.cpp:359 gui/launcher.cpp:459 gui/launcher.cpp:569
+#: gui/options.cpp:1252 gui/options.cpp:1296 gui/options.cpp:1414
#: backends/platform/wii/options.cpp:56
msgid "Default"
msgstr "Predefinito"
-#: gui/launcher.cpp:462 gui/options.cpp:1442
+#: gui/launcher.cpp:504 gui/options.cpp:1417
msgid "Select SoundFont"
msgstr "Seleziona SoundFont"
-#: gui/launcher.cpp:481 gui/launcher.cpp:636
+#: gui/launcher.cpp:523 gui/launcher.cpp:677
msgid "Select directory with game data"
msgstr "Seleziona la cartella contenente i file di gioco"
-#: gui/launcher.cpp:499
+#: gui/launcher.cpp:541
msgid "Select additional game directory"
msgstr "Seleziona la cartella di gioco aggiuntiva"
-#: gui/launcher.cpp:511
+#: gui/launcher.cpp:553
msgid "Select directory for saved games"
msgstr "Seleziona la cartella dei salvataggi"
-#: gui/launcher.cpp:538
+#: gui/launcher.cpp:580
msgid "This game ID is already taken. Please choose another one."
msgstr "Questo ID di gioco ш giр in uso. Si prega di sceglierne un'altro."
-#: gui/launcher.cpp:579 engines/dialogs.cpp:110
+#: gui/launcher.cpp:621 engines/dialogs.cpp:110
msgid "~Q~uit"
msgstr "C~h~iudi"
-#: gui/launcher.cpp:579 backends/platform/sdl/macosx/appmenu_osx.mm:96
+#: gui/launcher.cpp:621 backends/platform/sdl/macosx/appmenu_osx.mm:96
msgid "Quit ScummVM"
msgstr "Esci da ScummVM"
-#: gui/launcher.cpp:580
+#: gui/launcher.cpp:622
msgid "A~b~out..."
msgstr "~I~nfo..."
-#: gui/launcher.cpp:580 backends/platform/sdl/macosx/appmenu_osx.mm:70
+#: gui/launcher.cpp:622 backends/platform/sdl/macosx/appmenu_osx.mm:70
msgid "About ScummVM"
msgstr "Informazioni su ScummVM"
-#: gui/launcher.cpp:581
+#: gui/launcher.cpp:623
msgid "~O~ptions..."
msgstr "~O~pzioni..."
-#: gui/launcher.cpp:581
+#: gui/launcher.cpp:623
msgid "Change global ScummVM options"
msgstr "Modifica le opzioni globali di ScummVM"
-#: gui/launcher.cpp:583
+#: gui/launcher.cpp:625
msgid "~S~tart"
msgstr "~G~ioca"
-#: gui/launcher.cpp:583
+#: gui/launcher.cpp:625
msgid "Start selected game"
msgstr "Esegue il gioco selezionato"
-#: gui/launcher.cpp:586
+#: gui/launcher.cpp:628
msgid "~L~oad..."
msgstr "~C~arica..."
-#: gui/launcher.cpp:586
+#: gui/launcher.cpp:628
msgid "Load savegame for selected game"
msgstr "Carica un salvataggio del gioco selezionato"
-#: gui/launcher.cpp:591 gui/launcher.cpp:1079
+#: gui/launcher.cpp:633 gui/launcher.cpp:1120
msgid "~A~dd Game..."
msgstr "~A~ggiungi gioco..."
-#: gui/launcher.cpp:591 gui/launcher.cpp:598
+#: gui/launcher.cpp:633 gui/launcher.cpp:640
msgid "Hold Shift for Mass Add"
msgstr "Tieni premuto Shift per l'aggiunta in massa"
-#: gui/launcher.cpp:593
+#: gui/launcher.cpp:635
msgid "~E~dit Game..."
msgstr "~M~odifica gioco..."
-#: gui/launcher.cpp:593 gui/launcher.cpp:600
+#: gui/launcher.cpp:635 gui/launcher.cpp:642
msgid "Change game options"
msgstr "Modifica le opzioni di gioco"
-#: gui/launcher.cpp:595
+#: gui/launcher.cpp:637
msgid "~R~emove Game"
msgstr "~R~imuovi gioco"
-#: gui/launcher.cpp:595 gui/launcher.cpp:602
+#: gui/launcher.cpp:637 gui/launcher.cpp:644
msgid "Remove game from the list. The game data files stay intact"
msgstr "Rimuove il gioco dalla lista. I file del gioco rimarranno intatti"
-#: gui/launcher.cpp:598 gui/launcher.cpp:1079
+#: gui/launcher.cpp:640 gui/launcher.cpp:1120
msgctxt "lowres"
msgid "~A~dd Game..."
msgstr "~A~gg. gioco..."
-#: gui/launcher.cpp:600
+#: gui/launcher.cpp:642
msgctxt "lowres"
msgid "~E~dit Game..."
msgstr "~M~odif. gioco..."
-#: gui/launcher.cpp:602
+#: gui/launcher.cpp:644
msgctxt "lowres"
msgid "~R~emove Game"
msgstr "~R~im. gioco"
-#: gui/launcher.cpp:610
+#: gui/launcher.cpp:652
msgid "Search in game list"
msgstr "Cerca nella lista dei giochi"
-#: gui/launcher.cpp:614 gui/launcher.cpp:1126
+#: gui/launcher.cpp:656 gui/launcher.cpp:1167
msgid "Search:"
msgstr "Cerca:"
-#: gui/launcher.cpp:639 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255
+#: gui/launcher.cpp:680 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255
#: engines/mohawk/riven.cpp:716 engines/cruise/menu.cpp:216
msgid "Load game:"
msgstr "Carica gioco:"
-#: gui/launcher.cpp:639 engines/dialogs.cpp:114 engines/scumm/dialogs.cpp:188
+#: gui/launcher.cpp:680 engines/dialogs.cpp:114 engines/scumm/dialogs.cpp:188
#: engines/mohawk/myst.cpp:255 engines/mohawk/riven.cpp:716
#: engines/cruise/menu.cpp:216 backends/platform/wince/CEActionsPocket.cpp:267
#: backends/platform/wince/CEActionsSmartphone.cpp:231
msgid "Load"
msgstr "Carica"
-#: gui/launcher.cpp:747
+#: gui/launcher.cpp:788
msgid ""
"Do you really want to run the mass game detector? This could potentially add "
"a huge number of games."
@@ -453,7 +458,7 @@ msgstr ""
"Vuoi davvero eseguire il rilevatore di giochi in massa? Potrebbe aggiungere "
"un numero enorme di giochi."
-#: gui/launcher.cpp:748 gui/launcher.cpp:896
+#: gui/launcher.cpp:789 gui/launcher.cpp:937
#: backends/events/symbiansdl/symbiansdl-events.cpp:184
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
@@ -461,7 +466,7 @@ msgstr ""
msgid "Yes"
msgstr "Sь"
-#: gui/launcher.cpp:748 gui/launcher.cpp:896
+#: gui/launcher.cpp:789 gui/launcher.cpp:937
#: backends/events/symbiansdl/symbiansdl-events.cpp:184
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
@@ -469,40 +474,40 @@ msgstr "Sь"
msgid "No"
msgstr "No"
-#: gui/launcher.cpp:796
+#: gui/launcher.cpp:837
msgid "ScummVM couldn't open the specified directory!"
msgstr "ScummVM non ha potuto aprire la cartella specificata!"
-#: gui/launcher.cpp:808
+#: gui/launcher.cpp:849
msgid "ScummVM could not find any game in the specified directory!"
msgstr "ScummVM non ha potuto trovare nessun gioco nella cartella specificata!"
-#: gui/launcher.cpp:822
+#: gui/launcher.cpp:863
msgid "Pick the game:"
msgstr "Scegli il gioco:"
-#: gui/launcher.cpp:896
+#: gui/launcher.cpp:937
msgid "Do you really want to remove this game configuration?"
msgstr "Sei sicuro di voler rimuovere questa configurazione di gioco?"
-#: gui/launcher.cpp:960
+#: gui/launcher.cpp:1001
msgid "This game does not support loading games from the launcher."
msgstr ""
"Questo gioco non supporta il caricamento di salvataggi dalla schermata di "
"avvio."
-#: gui/launcher.cpp:964
+#: gui/launcher.cpp:1005
msgid "ScummVM could not find any engine capable of running the selected game!"
msgstr ""
"ScummVM non ha potuto trovare un motore in grado di eseguire il gioco "
"selezionato!"
-#: gui/launcher.cpp:1078
+#: gui/launcher.cpp:1119
msgctxt "lowres"
msgid "Mass Add..."
msgstr "Agg. massa..."
-#: gui/launcher.cpp:1078
+#: gui/launcher.cpp:1119
msgid "Mass Add..."
msgstr "Agg. in massa..."
@@ -569,103 +574,95 @@ msgstr "44 kHz"
msgid "48 kHz"
msgstr "48 kHz"
-#: gui/options.cpp:257 gui/options.cpp:485 gui/options.cpp:586
-#: gui/options.cpp:659 gui/options.cpp:868
+#: gui/options.cpp:248 gui/options.cpp:474 gui/options.cpp:575
+#: gui/options.cpp:644 gui/options.cpp:852
msgctxt "soundfont"
msgid "None"
msgstr "Nessuno"
-#: gui/options.cpp:393
+#: gui/options.cpp:382
msgid "Failed to apply some of the graphic options changes:"
msgstr "Impossibile applicare alcuni dei cambiamenti nelle opzioni grafiche."
-#: gui/options.cpp:405
+#: gui/options.cpp:394
msgid "the video mode could not be changed."
msgstr "impossibile modificare la modalitр video."
-#: gui/options.cpp:411
+#: gui/options.cpp:400
msgid "the fullscreen setting could not be changed"
msgstr "impossibile modificare l'impostazione schermo intero"
-#: gui/options.cpp:417
+#: gui/options.cpp:406
msgid "the aspect ratio setting could not be changed"
msgstr "impossibile modificare l'impostazione proporzioni"
-#: gui/options.cpp:742
+#: gui/options.cpp:727
msgid "Graphics mode:"
msgstr "Modalitр:"
-#: gui/options.cpp:756
+#: gui/options.cpp:741
msgid "Render mode:"
msgstr "Resa grafica:"
-#: gui/options.cpp:756 gui/options.cpp:757
+#: gui/options.cpp:741 gui/options.cpp:742
msgid "Special dithering modes supported by some games"
msgstr "Modalitр di resa grafica speciali supportate da alcuni giochi"
-#: gui/options.cpp:768
+#: gui/options.cpp:753
#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2248
#: backends/graphics/openglsdl/openglsdl-graphics.cpp:472
msgid "Fullscreen mode"
msgstr "Modalitр a schermo intero"
-#: gui/options.cpp:771
+#: gui/options.cpp:756
msgid "Aspect ratio correction"
msgstr "Correzione proporzioni"
-#: gui/options.cpp:771
+#: gui/options.cpp:756
msgid "Correct aspect ratio for 320x200 games"
msgstr "Corregge le proporzioni dei giochi 320x200"
-#: gui/options.cpp:772
-msgid "EGA undithering"
-msgstr "Undithering EGA"
-
-#: gui/options.cpp:772
-msgid "Enable undithering in EGA games that support it"
-msgstr "Attiva undithering nei giochi EGA che lo supportano"
-
-#: gui/options.cpp:780
+#: gui/options.cpp:764
msgid "Preferred Device:"
msgstr "Disp. preferito:"
-#: gui/options.cpp:780
+#: gui/options.cpp:764
msgid "Music Device:"
msgstr "Dispositivo audio:"
-#: gui/options.cpp:780 gui/options.cpp:782
+#: gui/options.cpp:764 gui/options.cpp:766
msgid "Specifies preferred sound device or sound card emulator"
msgstr ""
"Specifica il dispositivo audio o l'emulatore della scheda audio preferiti"
-#: gui/options.cpp:780 gui/options.cpp:782 gui/options.cpp:783
+#: gui/options.cpp:764 gui/options.cpp:766 gui/options.cpp:767
msgid "Specifies output sound device or sound card emulator"
msgstr ""
"Specifica il dispositivo di output audio o l'emulatore della scheda audio"
-#: gui/options.cpp:782
+#: gui/options.cpp:766
msgctxt "lowres"
msgid "Preferred Dev.:"
msgstr "Disp. preferito:"
-#: gui/options.cpp:782
+#: gui/options.cpp:766
msgctxt "lowres"
msgid "Music Device:"
msgstr "Disposit. audio:"
-#: gui/options.cpp:809
+#: gui/options.cpp:793
msgid "AdLib emulator:"
msgstr "Emulatore AdLib:"
-#: gui/options.cpp:809 gui/options.cpp:810
+#: gui/options.cpp:793 gui/options.cpp:794
msgid "AdLib is used for music in many games"
msgstr "AdLib ш utilizzato per la musica in molti giochi"
-#: gui/options.cpp:820
+#: gui/options.cpp:804
msgid "Output rate:"
msgstr "Frequenza:"
-#: gui/options.cpp:820 gui/options.cpp:821
+#: gui/options.cpp:804 gui/options.cpp:805
msgid ""
"Higher value specifies better sound quality but may be not supported by your "
"soundcard"
@@ -673,62 +670,62 @@ msgstr ""
"Valori piљ alti restituiscono un suono di maggior qualitр, ma potrebbero non "
"essere supportati dalla tua scheda audio"
-#: gui/options.cpp:831
+#: gui/options.cpp:815
msgid "GM Device:"
msgstr "Dispositivo GM:"
-#: gui/options.cpp:831
+#: gui/options.cpp:815
msgid "Specifies default sound device for General MIDI output"
msgstr "Specifica il dispositivo audio predefinito per l'output General MIDI"
-#: gui/options.cpp:842
+#: gui/options.cpp:826
msgid "Don't use General MIDI music"
msgstr "Non utilizzare la musica General MIDI"
-#: gui/options.cpp:853 gui/options.cpp:915
+#: gui/options.cpp:837 gui/options.cpp:899
msgid "Use first available device"
msgstr "Utilizza il primo dispositivo disponibile"
-#: gui/options.cpp:865
+#: gui/options.cpp:849
msgid "SoundFont:"
msgstr "SoundFont:"
-#: gui/options.cpp:865 gui/options.cpp:867 gui/options.cpp:868
+#: gui/options.cpp:849 gui/options.cpp:851 gui/options.cpp:852
msgid "SoundFont is supported by some audio cards, Fluidsynth and Timidity"
msgstr "SoundFont ш supportato da alcune schede audio, Fluidsynth e Timidity"
-#: gui/options.cpp:867
+#: gui/options.cpp:851
msgctxt "lowres"
msgid "SoundFont:"
msgstr "SoundFont:"
-#: gui/options.cpp:873
+#: gui/options.cpp:857
msgid "Mixed AdLib/MIDI mode"
msgstr "Modalitр mista AdLib/MIDI"
-#: gui/options.cpp:873
+#: gui/options.cpp:857
msgid "Use both MIDI and AdLib sound generation"
msgstr "Utilizza generazione di suono sia MIDI che AdLib"
-#: gui/options.cpp:876
+#: gui/options.cpp:860
msgid "MIDI gain:"
msgstr "Guadagno MIDI:"
-#: gui/options.cpp:886
+#: gui/options.cpp:870
msgid "MT-32 Device:"
msgstr "Disposit. MT-32:"
-#: gui/options.cpp:886
+#: gui/options.cpp:870
msgid "Specifies default sound device for Roland MT-32/LAPC1/CM32l/CM64 output"
msgstr ""
"Specifica il dispositivo audio predefinito per l'output Roland MT-32/LAPC1/"
"CM32l/CM64"
-#: gui/options.cpp:891
+#: gui/options.cpp:875
msgid "True Roland MT-32 (disable GM emulation)"
msgstr "Roland MT-32 effettivo (disattiva emulazione GM)"
-#: gui/options.cpp:891 gui/options.cpp:893
+#: gui/options.cpp:875 gui/options.cpp:877
msgid ""
"Check if you want to use your real hardware Roland-compatible sound device "
"connected to your computer"
@@ -736,192 +733,192 @@ msgstr ""
"Seleziona se vuoi usare il dispositivo hardware audio compatibile con Roland "
"che ш connesso al tuo computer"
-#: gui/options.cpp:893
+#: gui/options.cpp:877
msgctxt "lowres"
msgid "True Roland MT-32 (no GM emulation)"
msgstr "Roland MT-32 effettivo (disat.emul.GM)"
-#: gui/options.cpp:896
+#: gui/options.cpp:880
msgid "Enable Roland GS Mode"
msgstr "Attiva la modalitр Roland GS"
-#: gui/options.cpp:896
+#: gui/options.cpp:880
msgid "Turns off General MIDI mapping for games with Roland MT-32 soundtrack"
msgstr ""
"Disattiva la mappatura General MIDI per i giochi con colonna sonora Roland "
"MT-32"
-#: gui/options.cpp:905
+#: gui/options.cpp:889
msgid "Don't use Roland MT-32 music"
msgstr "Non utilizzare la musica Roland MT-32"
-#: gui/options.cpp:932
+#: gui/options.cpp:916
msgid "Text and Speech:"
msgstr "Testo e voci:"
-#: gui/options.cpp:936 gui/options.cpp:946
+#: gui/options.cpp:920 gui/options.cpp:930
msgid "Speech"
msgstr "Voci"
-#: gui/options.cpp:937 gui/options.cpp:947
+#: gui/options.cpp:921 gui/options.cpp:931
msgid "Subtitles"
msgstr "Sottotitoli"
-#: gui/options.cpp:938
+#: gui/options.cpp:922
msgid "Both"
msgstr "Entrambi"
-#: gui/options.cpp:940
+#: gui/options.cpp:924
msgid "Subtitle speed:"
msgstr "Velocitр testo:"
-#: gui/options.cpp:942
+#: gui/options.cpp:926
msgctxt "lowres"
msgid "Text and Speech:"
msgstr "Testo e voci:"
-#: gui/options.cpp:946
+#: gui/options.cpp:930
msgid "Spch"
msgstr "Voci"
-#: gui/options.cpp:947
+#: gui/options.cpp:931
msgid "Subs"
msgstr "Sub"
-#: gui/options.cpp:948
+#: gui/options.cpp:932
msgctxt "lowres"
msgid "Both"
msgstr "Entr."
-#: gui/options.cpp:948
+#: gui/options.cpp:932
msgid "Show subtitles and play speech"
msgstr "Mostra i sottotitoli e attiva le voci"
-#: gui/options.cpp:950
+#: gui/options.cpp:934
msgctxt "lowres"
msgid "Subtitle speed:"
msgstr "Velocitр testo:"
-#: gui/options.cpp:966
+#: gui/options.cpp:950
msgid "Music volume:"
msgstr "Volume musica:"
-#: gui/options.cpp:968
+#: gui/options.cpp:952
msgctxt "lowres"
msgid "Music volume:"
msgstr "Volume musica:"
-#: gui/options.cpp:975
+#: gui/options.cpp:959
msgid "Mute All"
msgstr "Disattiva audio"
-#: gui/options.cpp:978
+#: gui/options.cpp:962
msgid "SFX volume:"
msgstr "Volume effetti:"
-#: gui/options.cpp:978 gui/options.cpp:980 gui/options.cpp:981
+#: gui/options.cpp:962 gui/options.cpp:964 gui/options.cpp:965
msgid "Special sound effects volume"
msgstr "Volume degli effetti sonori"
-#: gui/options.cpp:980
+#: gui/options.cpp:964
msgctxt "lowres"
msgid "SFX volume:"
msgstr "Volume effetti:"
-#: gui/options.cpp:988
+#: gui/options.cpp:972
msgid "Speech volume:"
msgstr "Volume voci:"
-#: gui/options.cpp:990
+#: gui/options.cpp:974
msgctxt "lowres"
msgid "Speech volume:"
msgstr "Volume voci:"
-#: gui/options.cpp:1156
+#: gui/options.cpp:1131
msgid "Theme Path:"
msgstr "Percorso tema:"
-#: gui/options.cpp:1158
+#: gui/options.cpp:1133
msgctxt "lowres"
msgid "Theme Path:"
msgstr "Perc. tema:"
-#: gui/options.cpp:1164 gui/options.cpp:1166 gui/options.cpp:1167
+#: gui/options.cpp:1139 gui/options.cpp:1141 gui/options.cpp:1142
msgid "Specifies path to additional data used by all games or ScummVM"
msgstr "Specifica il percorso di ulteriori dati usati dai giochi o da ScummVM"
-#: gui/options.cpp:1173
+#: gui/options.cpp:1148
msgid "Plugins Path:"
msgstr "Percorso plugin:"
-#: gui/options.cpp:1175
+#: gui/options.cpp:1150
msgctxt "lowres"
msgid "Plugins Path:"
msgstr "Perc. plugin:"
-#: gui/options.cpp:1184
+#: gui/options.cpp:1159
msgid "Misc"
msgstr "Varie"
-#: gui/options.cpp:1186
+#: gui/options.cpp:1161
msgctxt "lowres"
msgid "Misc"
msgstr "Varie"
-#: gui/options.cpp:1188
+#: gui/options.cpp:1163
msgid "Theme:"
msgstr "Tema:"
-#: gui/options.cpp:1192
+#: gui/options.cpp:1167
msgid "GUI Renderer:"
msgstr "Renderer GUI:"
-#: gui/options.cpp:1204
+#: gui/options.cpp:1179
msgid "Autosave:"
msgstr "Autosalva:"
-#: gui/options.cpp:1206
+#: gui/options.cpp:1181
msgctxt "lowres"
msgid "Autosave:"
msgstr "Autosalva:"
-#: gui/options.cpp:1214
+#: gui/options.cpp:1189
msgid "Keys"
msgstr "Tasti"
-#: gui/options.cpp:1221
+#: gui/options.cpp:1196
msgid "GUI Language:"
msgstr "Lingua GUI:"
-#: gui/options.cpp:1221
+#: gui/options.cpp:1196
msgid "Language of ScummVM GUI"
msgstr "Lingua dell'interfaccia grafica di ScummVM"
-#: gui/options.cpp:1372
+#: gui/options.cpp:1347
msgid "You have to restart ScummVM before your changes will take effect."
msgstr "Devi riavviare ScummVM affinchщ le modifiche abbiano effetto."
-#: gui/options.cpp:1385
+#: gui/options.cpp:1360
msgid "Select directory for savegames"
msgstr "Seleziona la cartella per i salvataggi"
-#: gui/options.cpp:1392
+#: gui/options.cpp:1367
msgid "The chosen directory cannot be written to. Please select another one."
msgstr "La cartella scelta ш in sola lettura. Si prega di sceglierne un'altra."
-#: gui/options.cpp:1401
+#: gui/options.cpp:1376
msgid "Select directory for GUI themes"
msgstr "Seleziona la cartella dei temi dell'interfaccia"
-#: gui/options.cpp:1411
+#: gui/options.cpp:1386
msgid "Select directory for extra files"
msgstr "Seleziona la cartella dei file aggiuntivi"
-#: gui/options.cpp:1422
+#: gui/options.cpp:1397
msgid "Select directory for plugins"
msgstr "Seleziona la cartella dei plugin"
-#: gui/options.cpp:1475
+#: gui/options.cpp:1450
msgid ""
"The theme you selected does not support your current language. If you want "
"to use this theme you need to switch to another language first."
@@ -969,64 +966,64 @@ msgstr "Salvataggio senza titolo"
msgid "Select a Theme"
msgstr "Seleziona un tema"
-#: gui/ThemeEngine.cpp:333
+#: gui/ThemeEngine.cpp:335
msgid "Disabled GFX"
msgstr "Grafica disattivata"
-#: gui/ThemeEngine.cpp:333
+#: gui/ThemeEngine.cpp:335
msgctxt "lowres"
msgid "Disabled GFX"
msgstr "Grafica disattivata"
-#: gui/ThemeEngine.cpp:334
+#: gui/ThemeEngine.cpp:336
msgid "Standard Renderer (16bpp)"
msgstr "Renderer standard (16bpp)"
-#: gui/ThemeEngine.cpp:334
+#: gui/ThemeEngine.cpp:336
msgid "Standard (16bpp)"
msgstr "Standard (16bpp)"
-#: gui/ThemeEngine.cpp:336
+#: gui/ThemeEngine.cpp:338
msgid "Antialiased Renderer (16bpp)"
msgstr "Renderer con antialiasing (16bpp)"
-#: gui/ThemeEngine.cpp:336
+#: gui/ThemeEngine.cpp:338
msgid "Antialiased (16bpp)"
msgstr "Con antialiasing (16bpp)"
-#: gui/widget.cpp:312 gui/widget.cpp:314 gui/widget.cpp:320 gui/widget.cpp:322
+#: gui/widget.cpp:322 gui/widget.cpp:324 gui/widget.cpp:330 gui/widget.cpp:332
msgid "Clear value"
msgstr "Cancella"
-#: base/main.cpp:203
+#: base/main.cpp:209
#, c-format
msgid "Engine does not support debug level '%s'"
msgstr "Il motore non supporta il livello di debug '%s'"
-#: base/main.cpp:275
+#: base/main.cpp:287
msgid "Menu"
msgstr "Menu"
-#: base/main.cpp:278 backends/platform/symbian/src/SymbianActions.cpp:45
+#: base/main.cpp:290 backends/platform/symbian/src/SymbianActions.cpp:45
#: backends/platform/wince/CEActionsPocket.cpp:45
#: backends/platform/wince/CEActionsSmartphone.cpp:46
msgid "Skip"
msgstr "Salta"
-#: base/main.cpp:281 backends/platform/symbian/src/SymbianActions.cpp:50
+#: base/main.cpp:293 backends/platform/symbian/src/SymbianActions.cpp:50
#: backends/platform/wince/CEActionsPocket.cpp:42
msgid "Pause"
msgstr "Pausa"
-#: base/main.cpp:284
+#: base/main.cpp:296
msgid "Skip line"
msgstr "Salta battuta"
-#: base/main.cpp:455
+#: base/main.cpp:467
msgid "Error running game:"
msgstr "Errore nell'esecuzione del gioco:"
-#: base/main.cpp:479
+#: base/main.cpp:491
msgid "Could not find any engine capable of running the selected game"
msgstr ""
"Impossibile trovare un motore in grado di eseguire il gioco selezionato"
@@ -1095,16 +1092,16 @@ msgstr "Utente cancellato"
msgid "Unknown error"
msgstr "Errore sconosciuto"
-#: engines/advancedDetector.cpp:296
+#: engines/advancedDetector.cpp:324
#, c-format
msgid "The game in '%s' seems to be unknown."
msgstr "Il gioco in '%s' sembra essere sconosciuto."
-#: engines/advancedDetector.cpp:297
+#: engines/advancedDetector.cpp:325
msgid "Please, report the following data to the ScummVM team along with name"
msgstr "Per favore, riporta i seguenti dati al team di ScummVM con il nome"
-#: engines/advancedDetector.cpp:299
+#: engines/advancedDetector.cpp:327
msgid "of the game you tried to add and its version/language/etc.:"
msgstr "del gioco che hai provato ad aggiungere e la sua versione/lingua/ecc.:"
@@ -1141,13 +1138,14 @@ msgctxt "lowres"
msgid "~R~eturn to Launcher"
msgstr "~V~ai a elenco giochi"
-#: engines/dialogs.cpp:116 engines/cruise/menu.cpp:214
-#: engines/sci/engine/kfile.cpp:566
+#: engines/dialogs.cpp:116 engines/agi/saveload.cpp:805
+#: engines/cruise/menu.cpp:214 engines/sci/engine/kfile.cpp:567
msgid "Save game:"
msgstr "Salva gioco:"
-#: engines/dialogs.cpp:116 engines/scumm/dialogs.cpp:187
-#: engines/cruise/menu.cpp:214 engines/sci/engine/kfile.cpp:566
+#: engines/dialogs.cpp:116 engines/agi/saveload.cpp:805
+#: engines/scumm/dialogs.cpp:187 engines/cruise/menu.cpp:214
+#: engines/sci/engine/kfile.cpp:567
#: backends/platform/symbian/src/SymbianActions.cpp:44
#: backends/platform/wince/CEActionsPocket.cpp:43
#: backends/platform/wince/CEActionsPocket.cpp:267
@@ -1258,6 +1256,88 @@ msgstr ""
msgid "Start anyway"
msgstr "Avvia comunque"
+#: engines/agi/detection.cpp:145 engines/dreamweb/detection.cpp:47
+#: engines/sci/detection.cpp:390
+msgid "Use original save/load screens"
+msgstr ""
+
+#: engines/agi/detection.cpp:146 engines/dreamweb/detection.cpp:48
+#: engines/sci/detection.cpp:391
+msgid "Use the original save/load screens, instead of the ScummVM ones"
+msgstr ""
+
+#: engines/agi/saveload.cpp:827 engines/sci/engine/kfile.cpp:674
+msgid "Restore game:"
+msgstr "Ripristina gioco:"
+
+#: engines/agi/saveload.cpp:827 engines/sci/engine/kfile.cpp:674
+msgid "Restore"
+msgstr "Ripristina"
+
+#: engines/dreamweb/detection.cpp:57
+#, fuzzy
+msgid "Use bright palette mode"
+msgstr "Oggetto in alto a destra"
+
+#: engines/dreamweb/detection.cpp:58
+msgid "Display graphics using the game's bright palette"
+msgstr ""
+
+#: engines/sci/detection.cpp:370
+msgid "EGA undithering"
+msgstr "Undithering EGA"
+
+#: engines/sci/detection.cpp:371
+#, fuzzy
+msgid "Enable undithering in EGA games"
+msgstr "Attiva undithering nei giochi EGA che lo supportano"
+
+#: engines/sci/detection.cpp:380
+#, fuzzy
+msgid "Prefer digital sound effects"
+msgstr "Volume degli effetti sonori"
+
+#: engines/sci/detection.cpp:381
+msgid "Prefer digital sound effects instead of synthesized ones"
+msgstr ""
+
+#: engines/sci/detection.cpp:400
+msgid "Use IMF/Yahama FB-01 for MIDI output"
+msgstr ""
+
+#: engines/sci/detection.cpp:401
+msgid ""
+"Use an IBM Music Feature card or a Yahama FB-01 FM synth module for MIDI "
+"output"
+msgstr ""
+
+#: engines/sci/detection.cpp:411
+msgid "Use CD audio"
+msgstr ""
+
+#: engines/sci/detection.cpp:412
+msgid "Use CD audio instead of in-game audio, if available"
+msgstr ""
+
+#: engines/sci/detection.cpp:422
+msgid "Use Windows cursors"
+msgstr ""
+
+#: engines/sci/detection.cpp:423
+msgid ""
+"Use the Windows cursors (smaller and monochrome) instead of the DOS ones"
+msgstr ""
+
+#: engines/sci/detection.cpp:433
+#, fuzzy
+msgid "Use silver cursors"
+msgstr "Cursore normale"
+
+#: engines/sci/detection.cpp:434
+msgid ""
+"Use the alternate set of silver cursors, instead of the normal golden ones"
+msgstr ""
+
#: engines/scumm/dialogs.cpp:175
#, c-format
msgid "Insert Disk %c and Press Button to Continue."
@@ -1914,7 +1994,7 @@ msgstr ""
"Il supporto nativo MIDI richiede il Roland Upgrade della LucasArts,\n"
"ma %s non ш presente. Verrр usato AdLib."
-#: engines/scumm/scumm.cpp:2271 engines/agos/saveload.cpp:189
+#: engines/scumm/scumm.cpp:2271 engines/agos/saveload.cpp:202
#, c-format
msgid ""
"Failed to save game state to file:\n"
@@ -1925,7 +2005,7 @@ msgstr ""
"\n"
"%s"
-#: engines/scumm/scumm.cpp:2278 engines/agos/saveload.cpp:154
+#: engines/scumm/scumm.cpp:2278 engines/agos/saveload.cpp:167
#, c-format
msgid ""
"Failed to load game state from file:\n"
@@ -1936,7 +2016,7 @@ msgstr ""
"\n"
"%s"
-#: engines/scumm/scumm.cpp:2290 engines/agos/saveload.cpp:197
+#: engines/scumm/scumm.cpp:2290 engines/agos/saveload.cpp:210
#, c-format
msgid ""
"Successfully saved game state in file:\n"
@@ -1984,14 +2064,6 @@ msgstr "~M~enu principale"
msgid "~W~ater Effect Enabled"
msgstr "~E~ffetto acqua attivo"
-#: engines/sci/engine/kfile.cpp:673
-msgid "Restore game:"
-msgstr "Ripristina gioco:"
-
-#: engines/sci/engine/kfile.cpp:673
-msgid "Restore"
-msgstr "Ripristina"
-
#: engines/agos/animation.cpp:550
#, c-format
msgid "Cutscene file '%s' not found!"
@@ -2014,6 +2086,66 @@ msgstr "Impossibile eliminare il file."
msgid "Failed to save game"
msgstr "Impossibile salvare il gioco"
+#. I18N: Studio audience adds an applause and cheering sounds whenever
+#. Malcolm makes a joke.
+#: engines/kyra/detection.cpp:62
+msgid "Studio audience"
+msgstr ""
+
+#: engines/kyra/detection.cpp:63
+msgid "Enable studio audience"
+msgstr ""
+
+#. I18N: This option allows the user to skip text and cutscenes.
+#: engines/kyra/detection.cpp:73
+msgid "Skip support"
+msgstr ""
+
+#: engines/kyra/detection.cpp:74
+msgid "Allow text and cutscenes to be skipped"
+msgstr ""
+
+#. I18N: Helium mode makes people sound like they've inhaled Helium.
+#: engines/kyra/detection.cpp:84
+msgid "Helium mode"
+msgstr ""
+
+#: engines/kyra/detection.cpp:85
+#, fuzzy
+msgid "Enable helium mode"
+msgstr "Attiva la modalitр Roland GS"
+
+#. I18N: When enabled, this option makes scrolling smoother when
+#. changing from one screen to another.
+#: engines/kyra/detection.cpp:99
+msgid "Smooth scrolling"
+msgstr ""
+
+#: engines/kyra/detection.cpp:100
+msgid "Enable smooth scrolling when walking"
+msgstr ""
+
+#. I18N: When enabled, this option changes the cursor when it floats to the
+#. edge of the screen to a directional arrow. The player can then click to
+#. walk towards that direction.
+#: engines/kyra/detection.cpp:112
+#, fuzzy
+msgid "Floating cursors"
+msgstr "Cursore normale"
+
+#: engines/kyra/detection.cpp:113
+msgid "Enable floating cursors"
+msgstr ""
+
+#. I18N: HP stands for Hit Points
+#: engines/kyra/detection.cpp:127
+msgid "HP bar graphs"
+msgstr ""
+
+#: engines/kyra/detection.cpp:128
+msgid "Enable hit point bar graphs"
+msgstr ""
+
#: engines/kyra/lol.cpp:478
msgid "Attack 1"
msgstr ""
@@ -2082,6 +2214,14 @@ msgstr ""
"Roland MT32 in quelli General MIDI. Alcune tracce\n"
"potrebbero non essere riprodotte correttamente."
+#: engines/queen/queen.cpp:59 engines/sky/detection.cpp:44
+msgid "Floppy intro"
+msgstr ""
+
+#: engines/queen/queen.cpp:60 engines/sky/detection.cpp:45
+msgid "Use the floppy version's intro (CD version only)"
+msgstr ""
+
#: engines/sky/compact.cpp:130
msgid ""
"Unable to find \"sky.cpt\" file!\n"
@@ -2165,6 +2305,14 @@ msgstr ""
"Sono state trovare scene di intermezzo DXA ma ScummVM ш stato compilato "
"senza il supporto zlib"
+#: engines/sword2/sword2.cpp:79
+msgid "Show object labels"
+msgstr ""
+
+#: engines/sword2/sword2.cpp:80
+msgid "Show labels for objects on mouse hover"
+msgstr ""
+
#: engines/parallaction/saveload.cpp:133
#, c-format
msgid ""
@@ -2401,19 +2549,19 @@ msgstr "Audio ad alta qualitр (piљ lento) (riavviare)"
msgid "Disable power off"
msgstr "Disattiva spegnimento in chiusura"
-#: backends/platform/iphone/osys_events.cpp:301
+#: backends/platform/iphone/osys_events.cpp:300
msgid "Mouse-click-and-drag mode enabled."
msgstr "Modalitр mouse-clicca-e-trascina attivata."
-#: backends/platform/iphone/osys_events.cpp:303
+#: backends/platform/iphone/osys_events.cpp:302
msgid "Mouse-click-and-drag mode disabled."
msgstr "Modalitр mouse-clicca-e-trascina disattivata."
-#: backends/platform/iphone/osys_events.cpp:314
+#: backends/platform/iphone/osys_events.cpp:313
msgid "Touchpad mode enabled."
msgstr "Modalitр touchpad attivata."
-#: backends/platform/iphone/osys_events.cpp:316
+#: backends/platform/iphone/osys_events.cpp:315
msgid "Touchpad mode disabled."
msgstr "Modalitр touchpad disattivata."
@@ -2490,15 +2638,15 @@ msgstr "Filtro grafico attivo:"
msgid "Windowed mode"
msgstr "Modalitр finestra"
-#: backends/graphics/opengl/opengl-graphics.cpp:130
+#: backends/graphics/opengl/opengl-graphics.cpp:135
msgid "OpenGL Normal"
msgstr "OpenGL Normal"
-#: backends/graphics/opengl/opengl-graphics.cpp:131
+#: backends/graphics/opengl/opengl-graphics.cpp:136
msgid "OpenGL Conserve"
msgstr "OpenGL Conserve"
-#: backends/graphics/opengl/opengl-graphics.cpp:132
+#: backends/graphics/opengl/opengl-graphics.cpp:137
msgid "OpenGL Original"
msgstr "OpenGL Original"
diff --git a/po/nb_NO.po b/po/nb_NO.po
index 780cd8daa7..cdc102f394 100644
--- a/po/nb_NO.po
+++ b/po/nb_NO.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ScummVM 1.3.0svn\n"
"Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n"
-"POT-Creation-Date: 2012-03-07 22:09+0000\n"
+"POT-Creation-Date: 2012-05-20 22:39+0100\n"
"PO-Revision-Date: 2011-04-25 22:56+0100\n"
"Last-Translator: Einar Johan T. Sјmхen <einarjohants@gmail.com>\n"
"Language-Team: somaen <einarjohants@gmail.com>\n"
@@ -47,7 +47,7 @@ msgid "Go up"
msgstr "Gх tilbake"
#: gui/browser.cpp:69 gui/chooser.cpp:45 gui/KeysDialog.cpp:43
-#: gui/launcher.cpp:320 gui/massadd.cpp:94 gui/options.cpp:1253
+#: gui/launcher.cpp:345 gui/massadd.cpp:94 gui/options.cpp:1228
#: gui/saveload.cpp:63 gui/saveload.cpp:155 gui/themebrowser.cpp:54
#: engines/engine.cpp:442 engines/scumm/dialogs.cpp:190
#: engines/sword1/control.cpp:865 engines/parallaction/saveload.cpp:281
@@ -72,15 +72,15 @@ msgstr "Lukk"
msgid "Mouse click"
msgstr "Musklikk"
-#: gui/gui-manager.cpp:122 base/main.cpp:288
+#: gui/gui-manager.cpp:122 base/main.cpp:300
msgid "Display keyboard"
msgstr "Vis tastatur"
-#: gui/gui-manager.cpp:126 base/main.cpp:292
+#: gui/gui-manager.cpp:126 base/main.cpp:304
msgid "Remap keys"
msgstr "Omkoble taster"
-#: gui/gui-manager.cpp:129 base/main.cpp:295
+#: gui/gui-manager.cpp:129 base/main.cpp:307
#, fuzzy
msgid "Toggle FullScreen"
msgstr "Veksle fullskjerm"
@@ -93,8 +93,8 @@ msgstr "Velg en handling for kobling"
msgid "Map"
msgstr "Koble"
-#: gui/KeysDialog.cpp:42 gui/launcher.cpp:321 gui/launcher.cpp:960
-#: gui/launcher.cpp:964 gui/massadd.cpp:91 gui/options.cpp:1254
+#: gui/KeysDialog.cpp:42 gui/launcher.cpp:346 gui/launcher.cpp:1001
+#: gui/launcher.cpp:1005 gui/massadd.cpp:91 gui/options.cpp:1229
#: engines/engine.cpp:361 engines/engine.cpp:372 engines/scumm/dialogs.cpp:192
#: engines/scumm/scumm.cpp:1775 engines/agos/animation.cpp:551
#: engines/groovie/script.cpp:420 engines/sky/compact.cpp:131
@@ -131,15 +131,15 @@ msgstr "Vennligst velg en handling"
msgid "Press the key to associate"
msgstr "Trykk tasten som skal kobles"
-#: gui/launcher.cpp:170
+#: gui/launcher.cpp:187
msgid "Game"
msgstr "Spill"
-#: gui/launcher.cpp:174
+#: gui/launcher.cpp:191
msgid "ID:"
msgstr "ID:"
-#: gui/launcher.cpp:174 gui/launcher.cpp:176 gui/launcher.cpp:177
+#: gui/launcher.cpp:191 gui/launcher.cpp:193 gui/launcher.cpp:194
msgid ""
"Short game identifier used for referring to savegames and running the game "
"from the command line"
@@ -147,29 +147,29 @@ msgstr ""
"Kort spill-identifikator, brukt for х referere til lagrede spill, og х kjјre "
"spillet fra kommandolinjen"
-#: gui/launcher.cpp:176
+#: gui/launcher.cpp:193
msgctxt "lowres"
msgid "ID:"
msgstr "ID:"
-#: gui/launcher.cpp:181
+#: gui/launcher.cpp:198
msgid "Name:"
msgstr "Navn:"
-#: gui/launcher.cpp:181 gui/launcher.cpp:183 gui/launcher.cpp:184
+#: gui/launcher.cpp:198 gui/launcher.cpp:200 gui/launcher.cpp:201
msgid "Full title of the game"
msgstr "Full spilltittel"
-#: gui/launcher.cpp:183
+#: gui/launcher.cpp:200
msgctxt "lowres"
msgid "Name:"
msgstr "Navn:"
-#: gui/launcher.cpp:187
+#: gui/launcher.cpp:204
msgid "Language:"
msgstr "Sprхk:"
-#: gui/launcher.cpp:187 gui/launcher.cpp:188
+#: gui/launcher.cpp:204 gui/launcher.cpp:205
msgid ""
"Language of the game. This will not turn your Spanish game version into "
"English"
@@ -177,280 +177,285 @@ msgstr ""
"Spillets sprхk. Dette vil ikke gjјre din spanske spillversjon om til engelsk "
"versjon"
-#: gui/launcher.cpp:189 gui/launcher.cpp:203 gui/options.cpp:80
-#: gui/options.cpp:745 gui/options.cpp:758 gui/options.cpp:1224
+#: gui/launcher.cpp:206 gui/launcher.cpp:220 gui/options.cpp:80
+#: gui/options.cpp:730 gui/options.cpp:743 gui/options.cpp:1199
#: audio/null.cpp:40
msgid "<default>"
msgstr "<standard>"
-#: gui/launcher.cpp:199
+#: gui/launcher.cpp:216
msgid "Platform:"
msgstr "Plattform:"
-#: gui/launcher.cpp:199 gui/launcher.cpp:201 gui/launcher.cpp:202
+#: gui/launcher.cpp:216 gui/launcher.cpp:218 gui/launcher.cpp:219
msgid "Platform the game was originally designed for"
msgstr "Plattform spillet opprinnelig ble designet for"
-#: gui/launcher.cpp:201
+#: gui/launcher.cpp:218
msgctxt "lowres"
msgid "Platform:"
msgstr "Plattform:"
-#: gui/launcher.cpp:213 gui/options.cpp:1087 gui/options.cpp:1104
+#: gui/launcher.cpp:231
+#, fuzzy
+msgid "Engine"
+msgstr "Undersјk"
+
+#: gui/launcher.cpp:239 gui/options.cpp:1062 gui/options.cpp:1079
msgid "Graphics"
msgstr "Grafikk"
-#: gui/launcher.cpp:213 gui/options.cpp:1087 gui/options.cpp:1104
+#: gui/launcher.cpp:239 gui/options.cpp:1062 gui/options.cpp:1079
msgid "GFX"
msgstr "GFX"
-#: gui/launcher.cpp:216
+#: gui/launcher.cpp:242
msgid "Override global graphic settings"
msgstr "Overstyr globale grafikkinstillinger"
-#: gui/launcher.cpp:218
+#: gui/launcher.cpp:244
msgctxt "lowres"
msgid "Override global graphic settings"
msgstr "Overstyr globale grafikkinstillinger"
-#: gui/launcher.cpp:225 gui/options.cpp:1110
+#: gui/launcher.cpp:251 gui/options.cpp:1085
msgid "Audio"
msgstr "Lyd"
-#: gui/launcher.cpp:228
+#: gui/launcher.cpp:254
msgid "Override global audio settings"
msgstr "Overstyr globale lydinstillinger"
-#: gui/launcher.cpp:230
+#: gui/launcher.cpp:256
msgctxt "lowres"
msgid "Override global audio settings"
msgstr "Overstyr globale lydinstillinger"
-#: gui/launcher.cpp:239 gui/options.cpp:1115
+#: gui/launcher.cpp:265 gui/options.cpp:1090
msgid "Volume"
msgstr "Volum"
-#: gui/launcher.cpp:241 gui/options.cpp:1117
+#: gui/launcher.cpp:267 gui/options.cpp:1092
msgctxt "lowres"
msgid "Volume"
msgstr "Volum"
-#: gui/launcher.cpp:244
+#: gui/launcher.cpp:270
msgid "Override global volume settings"
msgstr "Overstyr globale voluminstillinger"
-#: gui/launcher.cpp:246
+#: gui/launcher.cpp:272
msgctxt "lowres"
msgid "Override global volume settings"
msgstr "Overstyr globale voluminstillinger"
-#: gui/launcher.cpp:254 gui/options.cpp:1125
+#: gui/launcher.cpp:280 gui/options.cpp:1100
msgid "MIDI"
msgstr "MIDI"
-#: gui/launcher.cpp:257
+#: gui/launcher.cpp:283
msgid "Override global MIDI settings"
msgstr "Overstyr globale MIDI-instillinger"
-#: gui/launcher.cpp:259
+#: gui/launcher.cpp:285
msgctxt "lowres"
msgid "Override global MIDI settings"
msgstr "Overstyr globale MIDI-instillinger"
-#: gui/launcher.cpp:268 gui/options.cpp:1131
+#: gui/launcher.cpp:294 gui/options.cpp:1106
msgid "MT-32"
msgstr "MT-32"
-#: gui/launcher.cpp:271
+#: gui/launcher.cpp:297
msgid "Override global MT-32 settings"
msgstr "Overstyr globale MT-32-instillinger"
-#: gui/launcher.cpp:273
+#: gui/launcher.cpp:299
msgctxt "lowres"
msgid "Override global MT-32 settings"
msgstr "Overstyr globale MT-32-instillinger"
-#: gui/launcher.cpp:282 gui/options.cpp:1138
+#: gui/launcher.cpp:308 gui/options.cpp:1113
msgid "Paths"
msgstr "Sti"
-#: gui/launcher.cpp:284 gui/options.cpp:1140
+#: gui/launcher.cpp:310 gui/options.cpp:1115
msgctxt "lowres"
msgid "Paths"
msgstr "Sti"
-#: gui/launcher.cpp:291
+#: gui/launcher.cpp:317
msgid "Game Path:"
msgstr "Spillsti:"
-#: gui/launcher.cpp:293
+#: gui/launcher.cpp:319
msgctxt "lowres"
msgid "Game Path:"
msgstr "Spillsti:"
-#: gui/launcher.cpp:298 gui/options.cpp:1164
+#: gui/launcher.cpp:324 gui/options.cpp:1139
msgid "Extra Path:"
msgstr "Ekstrasti:"
-#: gui/launcher.cpp:298 gui/launcher.cpp:300 gui/launcher.cpp:301
+#: gui/launcher.cpp:324 gui/launcher.cpp:326 gui/launcher.cpp:327
msgid "Specifies path to additional data used the game"
msgstr "Bestemmer sti til ytterligere data brukt av spillet"
-#: gui/launcher.cpp:300 gui/options.cpp:1166
+#: gui/launcher.cpp:326 gui/options.cpp:1141
msgctxt "lowres"
msgid "Extra Path:"
msgstr "Ekstrasti:"
-#: gui/launcher.cpp:307 gui/options.cpp:1148
+#: gui/launcher.cpp:333 gui/options.cpp:1123
msgid "Save Path:"
msgstr "Lagringssti:"
-#: gui/launcher.cpp:307 gui/launcher.cpp:309 gui/launcher.cpp:310
-#: gui/options.cpp:1148 gui/options.cpp:1150 gui/options.cpp:1151
+#: gui/launcher.cpp:333 gui/launcher.cpp:335 gui/launcher.cpp:336
+#: gui/options.cpp:1123 gui/options.cpp:1125 gui/options.cpp:1126
msgid "Specifies where your savegames are put"
msgstr "Bestemmer sti til lagrede spill"
-#: gui/launcher.cpp:309 gui/options.cpp:1150
+#: gui/launcher.cpp:335 gui/options.cpp:1125
msgctxt "lowres"
msgid "Save Path:"
msgstr "Lagringssti:"
-#: gui/launcher.cpp:329 gui/launcher.cpp:416 gui/launcher.cpp:469
-#: gui/launcher.cpp:523 gui/options.cpp:1159 gui/options.cpp:1167
-#: gui/options.cpp:1176 gui/options.cpp:1283 gui/options.cpp:1289
-#: gui/options.cpp:1297 gui/options.cpp:1327 gui/options.cpp:1333
-#: gui/options.cpp:1340 gui/options.cpp:1433 gui/options.cpp:1436
-#: gui/options.cpp:1448
+#: gui/launcher.cpp:354 gui/launcher.cpp:453 gui/launcher.cpp:511
+#: gui/launcher.cpp:565 gui/options.cpp:1134 gui/options.cpp:1142
+#: gui/options.cpp:1151 gui/options.cpp:1258 gui/options.cpp:1264
+#: gui/options.cpp:1272 gui/options.cpp:1302 gui/options.cpp:1308
+#: gui/options.cpp:1315 gui/options.cpp:1408 gui/options.cpp:1411
+#: gui/options.cpp:1423
msgctxt "path"
msgid "None"
msgstr "Ingen"
-#: gui/launcher.cpp:334 gui/launcher.cpp:422 gui/launcher.cpp:527
-#: gui/options.cpp:1277 gui/options.cpp:1321 gui/options.cpp:1439
+#: gui/launcher.cpp:359 gui/launcher.cpp:459 gui/launcher.cpp:569
+#: gui/options.cpp:1252 gui/options.cpp:1296 gui/options.cpp:1414
#: backends/platform/wii/options.cpp:56
msgid "Default"
msgstr "Standard"
-#: gui/launcher.cpp:462 gui/options.cpp:1442
+#: gui/launcher.cpp:504 gui/options.cpp:1417
msgid "Select SoundFont"
msgstr "Velg SoundFont"
-#: gui/launcher.cpp:481 gui/launcher.cpp:636
+#: gui/launcher.cpp:523 gui/launcher.cpp:677
msgid "Select directory with game data"
msgstr "Velg mappe med spilldata"
-#: gui/launcher.cpp:499
+#: gui/launcher.cpp:541
msgid "Select additional game directory"
msgstr "Velg mappe med ytterligere data"
-#: gui/launcher.cpp:511
+#: gui/launcher.cpp:553
msgid "Select directory for saved games"
msgstr "Velg mappe for lagrede spill"
-#: gui/launcher.cpp:538
+#: gui/launcher.cpp:580
msgid "This game ID is already taken. Please choose another one."
msgstr "Denne spill-IDen er allerede i bruk. Vennligst velg en annen."
-#: gui/launcher.cpp:579 engines/dialogs.cpp:110
+#: gui/launcher.cpp:621 engines/dialogs.cpp:110
msgid "~Q~uit"
msgstr "~A~vslutt"
-#: gui/launcher.cpp:579 backends/platform/sdl/macosx/appmenu_osx.mm:96
+#: gui/launcher.cpp:621 backends/platform/sdl/macosx/appmenu_osx.mm:96
msgid "Quit ScummVM"
msgstr "Avslutt ScummVM"
-#: gui/launcher.cpp:580
+#: gui/launcher.cpp:622
msgid "A~b~out..."
msgstr "~O~m..."
-#: gui/launcher.cpp:580 backends/platform/sdl/macosx/appmenu_osx.mm:70
+#: gui/launcher.cpp:622 backends/platform/sdl/macosx/appmenu_osx.mm:70
msgid "About ScummVM"
msgstr "Om ScummVM"
-#: gui/launcher.cpp:581
+#: gui/launcher.cpp:623
msgid "~O~ptions..."
msgstr "~V~alg..."
-#: gui/launcher.cpp:581
+#: gui/launcher.cpp:623
msgid "Change global ScummVM options"
msgstr "Endre globale ScummVM-innstillinger"
-#: gui/launcher.cpp:583
+#: gui/launcher.cpp:625
msgid "~S~tart"
msgstr "~S~tart"
-#: gui/launcher.cpp:583
+#: gui/launcher.cpp:625
msgid "Start selected game"
msgstr "Start valgt spill"
-#: gui/launcher.cpp:586
+#: gui/launcher.cpp:628
msgid "~L~oad..."
msgstr "~Х~pne..."
-#: gui/launcher.cpp:586
+#: gui/launcher.cpp:628
msgid "Load savegame for selected game"
msgstr "Хpne lagret spill for det valgte spillet"
-#: gui/launcher.cpp:591 gui/launcher.cpp:1079
+#: gui/launcher.cpp:633 gui/launcher.cpp:1120
msgid "~A~dd Game..."
msgstr "~L~egg til spill..."
-#: gui/launcher.cpp:591 gui/launcher.cpp:598
+#: gui/launcher.cpp:633 gui/launcher.cpp:640
msgid "Hold Shift for Mass Add"
msgstr "Hold Shift for х legge til flere"
-#: gui/launcher.cpp:593
+#: gui/launcher.cpp:635
msgid "~E~dit Game..."
msgstr "~R~ediger spill..."
-#: gui/launcher.cpp:593 gui/launcher.cpp:600
+#: gui/launcher.cpp:635 gui/launcher.cpp:642
msgid "Change game options"
msgstr "Endre spillinstillinger"
-#: gui/launcher.cpp:595
+#: gui/launcher.cpp:637
msgid "~R~emove Game"
msgstr "~F~jern spill"
-#: gui/launcher.cpp:595 gui/launcher.cpp:602
+#: gui/launcher.cpp:637 gui/launcher.cpp:644
msgid "Remove game from the list. The game data files stay intact"
msgstr "Fjern spill fra listen. Spilldataene forblir intakte"
-#: gui/launcher.cpp:598 gui/launcher.cpp:1079
+#: gui/launcher.cpp:640 gui/launcher.cpp:1120
msgctxt "lowres"
msgid "~A~dd Game..."
msgstr "~L~egg til spill..."
-#: gui/launcher.cpp:600
+#: gui/launcher.cpp:642
msgctxt "lowres"
msgid "~E~dit Game..."
msgstr "~R~ediger spill..."
-#: gui/launcher.cpp:602
+#: gui/launcher.cpp:644
msgctxt "lowres"
msgid "~R~emove Game"
msgstr "~F~jern spill"
-#: gui/launcher.cpp:610
+#: gui/launcher.cpp:652
msgid "Search in game list"
msgstr "Sјk i spilliste"
-#: gui/launcher.cpp:614 gui/launcher.cpp:1126
+#: gui/launcher.cpp:656 gui/launcher.cpp:1167
msgid "Search:"
msgstr "Sјk:"
-#: gui/launcher.cpp:639 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255
+#: gui/launcher.cpp:680 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255
#: engines/mohawk/riven.cpp:716 engines/cruise/menu.cpp:216
msgid "Load game:"
msgstr "Хpne spill:"
-#: gui/launcher.cpp:639 engines/dialogs.cpp:114 engines/scumm/dialogs.cpp:188
+#: gui/launcher.cpp:680 engines/dialogs.cpp:114 engines/scumm/dialogs.cpp:188
#: engines/mohawk/myst.cpp:255 engines/mohawk/riven.cpp:716
#: engines/cruise/menu.cpp:216 backends/platform/wince/CEActionsPocket.cpp:267
#: backends/platform/wince/CEActionsSmartphone.cpp:231
msgid "Load"
msgstr "Хpne"
-#: gui/launcher.cpp:747
+#: gui/launcher.cpp:788
msgid ""
"Do you really want to run the mass game detector? This could potentially add "
"a huge number of games."
@@ -458,7 +463,7 @@ msgstr ""
"Vil du virkelig kjјre flerspill-finneren? Dette kan potensielt legge til et "
"stort antall spill."
-#: gui/launcher.cpp:748 gui/launcher.cpp:896
+#: gui/launcher.cpp:789 gui/launcher.cpp:937
#: backends/events/symbiansdl/symbiansdl-events.cpp:184
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
@@ -466,7 +471,7 @@ msgstr ""
msgid "Yes"
msgstr "Ja"
-#: gui/launcher.cpp:748 gui/launcher.cpp:896
+#: gui/launcher.cpp:789 gui/launcher.cpp:937
#: backends/events/symbiansdl/symbiansdl-events.cpp:184
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
@@ -474,37 +479,37 @@ msgstr "Ja"
msgid "No"
msgstr "Nei"
-#: gui/launcher.cpp:796
+#: gui/launcher.cpp:837
msgid "ScummVM couldn't open the specified directory!"
msgstr "ScummVM kunne ikke хpne den valgte mappen!"
-#: gui/launcher.cpp:808
+#: gui/launcher.cpp:849
msgid "ScummVM could not find any game in the specified directory!"
msgstr "ScummVM kunne ikke finne noe spill i den valgte mappen!"
-#: gui/launcher.cpp:822
+#: gui/launcher.cpp:863
msgid "Pick the game:"
msgstr "Velg spill:"
-#: gui/launcher.cpp:896
+#: gui/launcher.cpp:937
msgid "Do you really want to remove this game configuration?"
msgstr "Vil du virkelig fjerne denne spillkonfigurasjonen?"
-#: gui/launcher.cpp:960
+#: gui/launcher.cpp:1001
msgid "This game does not support loading games from the launcher."
msgstr "Dette spillet stјtter ikke lasting av spill fra oppstarteren."
-#: gui/launcher.cpp:964
+#: gui/launcher.cpp:1005
msgid "ScummVM could not find any engine capable of running the selected game!"
msgstr ""
"ScummVM kunne ikke finne noen motor som kunne kjјre det valgte spillet!"
-#: gui/launcher.cpp:1078
+#: gui/launcher.cpp:1119
msgctxt "lowres"
msgid "Mass Add..."
msgstr "Legg til flere..."
-#: gui/launcher.cpp:1078
+#: gui/launcher.cpp:1119
msgid "Mass Add..."
msgstr "Legg til flere..."
@@ -571,101 +576,93 @@ msgstr "44 kHz"
msgid "48 kHz"
msgstr "48 kHz"
-#: gui/options.cpp:257 gui/options.cpp:485 gui/options.cpp:586
-#: gui/options.cpp:659 gui/options.cpp:868
+#: gui/options.cpp:248 gui/options.cpp:474 gui/options.cpp:575
+#: gui/options.cpp:644 gui/options.cpp:852
msgctxt "soundfont"
msgid "None"
msgstr "Ingen"
-#: gui/options.cpp:393
+#: gui/options.cpp:382
msgid "Failed to apply some of the graphic options changes:"
msgstr ""
-#: gui/options.cpp:405
+#: gui/options.cpp:394
msgid "the video mode could not be changed."
msgstr ""
-#: gui/options.cpp:411
+#: gui/options.cpp:400
msgid "the fullscreen setting could not be changed"
msgstr ""
-#: gui/options.cpp:417
+#: gui/options.cpp:406
msgid "the aspect ratio setting could not be changed"
msgstr ""
-#: gui/options.cpp:742
+#: gui/options.cpp:727
msgid "Graphics mode:"
msgstr "Grafikkmodus:"
-#: gui/options.cpp:756
+#: gui/options.cpp:741
msgid "Render mode:"
msgstr "Tegnemodus:"
-#: gui/options.cpp:756 gui/options.cpp:757
+#: gui/options.cpp:741 gui/options.cpp:742
msgid "Special dithering modes supported by some games"
msgstr "Spesiel dithering-modus stјttet av enkelte spill"
-#: gui/options.cpp:768
+#: gui/options.cpp:753
#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2248
#: backends/graphics/openglsdl/openglsdl-graphics.cpp:472
msgid "Fullscreen mode"
msgstr "Fullskjermsmodus"
-#: gui/options.cpp:771
+#: gui/options.cpp:756
msgid "Aspect ratio correction"
msgstr "Aspekt-rate korrigering"
-#: gui/options.cpp:771
+#: gui/options.cpp:756
msgid "Correct aspect ratio for 320x200 games"
msgstr "Korriger aspekt-rate for 320x200-spill"
-#: gui/options.cpp:772
-msgid "EGA undithering"
-msgstr "EGA av-dithering"
-
-#: gui/options.cpp:772
-msgid "Enable undithering in EGA games that support it"
-msgstr "Slхr av dithering i EGA-spill som stјtter det."
-
-#: gui/options.cpp:780
+#: gui/options.cpp:764
msgid "Preferred Device:"
msgstr "Foretrukket enhet:"
-#: gui/options.cpp:780
+#: gui/options.cpp:764
msgid "Music Device:"
msgstr "Musikkenhet:"
-#: gui/options.cpp:780 gui/options.cpp:782
+#: gui/options.cpp:764 gui/options.cpp:766
msgid "Specifies preferred sound device or sound card emulator"
msgstr "Velger foretrukket lydenhet eller lydkort-emulator"
-#: gui/options.cpp:780 gui/options.cpp:782 gui/options.cpp:783
+#: gui/options.cpp:764 gui/options.cpp:766 gui/options.cpp:767
msgid "Specifies output sound device or sound card emulator"
msgstr "Velger ut-lydenhet eller lydkortemulator"
-#: gui/options.cpp:782
+#: gui/options.cpp:766
msgctxt "lowres"
msgid "Preferred Dev.:"
msgstr "Foretrukket enh.:"
-#: gui/options.cpp:782
+#: gui/options.cpp:766
msgctxt "lowres"
msgid "Music Device:"
msgstr "Musikkenhet:"
-#: gui/options.cpp:809
+#: gui/options.cpp:793
msgid "AdLib emulator:"
msgstr "AdLib-emulator:"
-#: gui/options.cpp:809 gui/options.cpp:810
+#: gui/options.cpp:793 gui/options.cpp:794
msgid "AdLib is used for music in many games"
msgstr "AdLib brukes til musikk i mange spill"
-#: gui/options.cpp:820
+#: gui/options.cpp:804
msgid "Output rate:"
msgstr "Utrate:"
-#: gui/options.cpp:820 gui/options.cpp:821
+#: gui/options.cpp:804 gui/options.cpp:805
msgid ""
"Higher value specifies better sound quality but may be not supported by your "
"soundcard"
@@ -673,60 +670,60 @@ msgstr ""
"Hјyere verdier gir bedre lydkvalitet, men stјttes kanskje ikke av ditt "
"lydkort "
-#: gui/options.cpp:831
+#: gui/options.cpp:815
msgid "GM Device:"
msgstr "GM-enhet:"
-#: gui/options.cpp:831
+#: gui/options.cpp:815
msgid "Specifies default sound device for General MIDI output"
msgstr "Velger standard lydenhet for General MIDI-utdata"
-#: gui/options.cpp:842
+#: gui/options.cpp:826
msgid "Don't use General MIDI music"
msgstr "Ikke bruk General MIDI-musikk"
-#: gui/options.cpp:853 gui/options.cpp:915
+#: gui/options.cpp:837 gui/options.cpp:899
msgid "Use first available device"
msgstr "Bruk fјrste tilgjengelige enhet"
-#: gui/options.cpp:865
+#: gui/options.cpp:849
msgid "SoundFont:"
msgstr "SoundFont:"
-#: gui/options.cpp:865 gui/options.cpp:867 gui/options.cpp:868
+#: gui/options.cpp:849 gui/options.cpp:851 gui/options.cpp:852
msgid "SoundFont is supported by some audio cards, Fluidsynth and Timidity"
msgstr "SoundFont stјttes ikke av enkelte lydkort, FluidSynth og Timidity"
-#: gui/options.cpp:867
+#: gui/options.cpp:851
msgctxt "lowres"
msgid "SoundFont:"
msgstr "SoundFont:"
-#: gui/options.cpp:873
+#: gui/options.cpp:857
msgid "Mixed AdLib/MIDI mode"
msgstr "Mikset AdLib/MIDI-modus"
-#: gui/options.cpp:873
+#: gui/options.cpp:857
msgid "Use both MIDI and AdLib sound generation"
msgstr "Bruk bхde MIDI- og AdLib- lydgenerering"
-#: gui/options.cpp:876
+#: gui/options.cpp:860
msgid "MIDI gain:"
msgstr "MIDI gain:"
-#: gui/options.cpp:886
+#: gui/options.cpp:870
msgid "MT-32 Device:"
msgstr "MT-32 Enhet:"
-#: gui/options.cpp:886
+#: gui/options.cpp:870
msgid "Specifies default sound device for Roland MT-32/LAPC1/CM32l/CM64 output"
msgstr "Velger standard lydenhet for Roland MT-32/LAPC1/CM32I/CM64-avspilling"
-#: gui/options.cpp:891
+#: gui/options.cpp:875
msgid "True Roland MT-32 (disable GM emulation)"
msgstr "Ekte Roland MT-32 (deaktiver GM-emulering)"
-#: gui/options.cpp:891 gui/options.cpp:893
+#: gui/options.cpp:875 gui/options.cpp:877
msgid ""
"Check if you want to use your real hardware Roland-compatible sound device "
"connected to your computer"
@@ -734,191 +731,191 @@ msgstr ""
"Velg hvis du har et ekte Roland-kompatible lydkort tilkoblet maskinen, og "
"vil bruke dette."
-#: gui/options.cpp:893
+#: gui/options.cpp:877
msgctxt "lowres"
msgid "True Roland MT-32 (no GM emulation)"
msgstr "Ekte Roland MT-32 (deaktiver GM-emulering)"
-#: gui/options.cpp:896
+#: gui/options.cpp:880
msgid "Enable Roland GS Mode"
msgstr "Aktiver Roland GS-modus"
-#: gui/options.cpp:896
+#: gui/options.cpp:880
msgid "Turns off General MIDI mapping for games with Roland MT-32 soundtrack"
msgstr "Slх av General MIDI-kobling for spill som har Roland MT-32-lydspor"
-#: gui/options.cpp:905
+#: gui/options.cpp:889
msgid "Don't use Roland MT-32 music"
msgstr "Ikke bruk Roland MT-32-musikk"
-#: gui/options.cpp:932
+#: gui/options.cpp:916
msgid "Text and Speech:"
msgstr "Tekst og Tale:"
-#: gui/options.cpp:936 gui/options.cpp:946
+#: gui/options.cpp:920 gui/options.cpp:930
msgid "Speech"
msgstr "Tale"
-#: gui/options.cpp:937 gui/options.cpp:947
+#: gui/options.cpp:921 gui/options.cpp:931
msgid "Subtitles"
msgstr "Undertekster"
-#: gui/options.cpp:938
+#: gui/options.cpp:922
msgid "Both"
msgstr "Begge"
-#: gui/options.cpp:940
+#: gui/options.cpp:924
msgid "Subtitle speed:"
msgstr "Teksthastighet:"
-#: gui/options.cpp:942
+#: gui/options.cpp:926
msgctxt "lowres"
msgid "Text and Speech:"
msgstr "Tekst og Tale:"
-#: gui/options.cpp:946
+#: gui/options.cpp:930
msgid "Spch"
msgstr "Tale"
-#: gui/options.cpp:947
+#: gui/options.cpp:931
msgid "Subs"
msgstr "Tekst"
-#: gui/options.cpp:948
+#: gui/options.cpp:932
msgctxt "lowres"
msgid "Both"
msgstr "Begge"
-#: gui/options.cpp:948
+#: gui/options.cpp:932
msgid "Show subtitles and play speech"
msgstr "Vis undertekster, og spill av tale"
-#: gui/options.cpp:950
+#: gui/options.cpp:934
msgctxt "lowres"
msgid "Subtitle speed:"
msgstr "Underteksthastighet:"
-#: gui/options.cpp:966
+#: gui/options.cpp:950
msgid "Music volume:"
msgstr "Musikkvolum:"
-#: gui/options.cpp:968
+#: gui/options.cpp:952
msgctxt "lowres"
msgid "Music volume:"
msgstr "Musikkvolum:"
-#: gui/options.cpp:975
+#: gui/options.cpp:959
msgid "Mute All"
msgstr "Demp alle"
-#: gui/options.cpp:978
+#: gui/options.cpp:962
msgid "SFX volume:"
msgstr "Lydeffektvolum:"
-#: gui/options.cpp:978 gui/options.cpp:980 gui/options.cpp:981
+#: gui/options.cpp:962 gui/options.cpp:964 gui/options.cpp:965
msgid "Special sound effects volume"
msgstr "Volum for spesielle lydeffekter"
-#: gui/options.cpp:980
+#: gui/options.cpp:964
msgctxt "lowres"
msgid "SFX volume:"
msgstr "Lydeffektvolum:"
-#: gui/options.cpp:988
+#: gui/options.cpp:972
msgid "Speech volume:"
msgstr "Talevolum:"
-#: gui/options.cpp:990
+#: gui/options.cpp:974
msgctxt "lowres"
msgid "Speech volume:"
msgstr "Talevolum:"
-#: gui/options.cpp:1156
+#: gui/options.cpp:1131
msgid "Theme Path:"
msgstr "Temasti:"
-#: gui/options.cpp:1158
+#: gui/options.cpp:1133
msgctxt "lowres"
msgid "Theme Path:"
msgstr "Temasti:"
-#: gui/options.cpp:1164 gui/options.cpp:1166 gui/options.cpp:1167
+#: gui/options.cpp:1139 gui/options.cpp:1141 gui/options.cpp:1142
msgid "Specifies path to additional data used by all games or ScummVM"
msgstr "Velger sti for ytterligere data brukt av alle spill eller ScummVM"
-#: gui/options.cpp:1173
+#: gui/options.cpp:1148
msgid "Plugins Path:"
msgstr "Pluginsti:"
-#: gui/options.cpp:1175
+#: gui/options.cpp:1150
msgctxt "lowres"
msgid "Plugins Path:"
msgstr "Pluginsti:"
-#: gui/options.cpp:1184
+#: gui/options.cpp:1159
msgid "Misc"
msgstr "Div"
-#: gui/options.cpp:1186
+#: gui/options.cpp:1161
msgctxt "lowres"
msgid "Misc"
msgstr "Div"
-#: gui/options.cpp:1188
+#: gui/options.cpp:1163
msgid "Theme:"
msgstr "Tema:"
-#: gui/options.cpp:1192
+#: gui/options.cpp:1167
msgid "GUI Renderer:"
msgstr "GUI-tegner:"
-#: gui/options.cpp:1204
+#: gui/options.cpp:1179
msgid "Autosave:"
msgstr "Autolagre:"
-#: gui/options.cpp:1206
+#: gui/options.cpp:1181
msgctxt "lowres"
msgid "Autosave:"
msgstr "Autolagre:"
-#: gui/options.cpp:1214
+#: gui/options.cpp:1189
msgid "Keys"
msgstr "Taster"
-#: gui/options.cpp:1221
+#: gui/options.cpp:1196
msgid "GUI Language:"
msgstr "GUI-sprхk:"
-#: gui/options.cpp:1221
+#: gui/options.cpp:1196
msgid "Language of ScummVM GUI"
msgstr "Sprхk i ScummVM-GUIet"
-#: gui/options.cpp:1372
+#: gui/options.cpp:1347
#, fuzzy
msgid "You have to restart ScummVM before your changes will take effect."
msgstr "Du mх omstarte ScummVM for at endringene skal skje. "
-#: gui/options.cpp:1385
+#: gui/options.cpp:1360
msgid "Select directory for savegames"
msgstr "Velg mappe for lagrede spill"
-#: gui/options.cpp:1392
+#: gui/options.cpp:1367
msgid "The chosen directory cannot be written to. Please select another one."
msgstr "Den valgte mappen kan ikke skrives til. Vennligst velg en annen."
-#: gui/options.cpp:1401
+#: gui/options.cpp:1376
msgid "Select directory for GUI themes"
msgstr "Velg mappe for GUI-temaer"
-#: gui/options.cpp:1411
+#: gui/options.cpp:1386
msgid "Select directory for extra files"
msgstr "Velg mappe for ytterligere filer"
-#: gui/options.cpp:1422
+#: gui/options.cpp:1397
msgid "Select directory for plugins"
msgstr "Velg mappe for plugins"
-#: gui/options.cpp:1475
+#: gui/options.cpp:1450
msgid ""
"The theme you selected does not support your current language. If you want "
"to use this theme you need to switch to another language first."
@@ -966,64 +963,64 @@ msgstr "Ikke navngitt spilltilstand"
msgid "Select a Theme"
msgstr "Velg et tema"
-#: gui/ThemeEngine.cpp:333
+#: gui/ThemeEngine.cpp:335
msgid "Disabled GFX"
msgstr "Deaktivert GFX"
-#: gui/ThemeEngine.cpp:333
+#: gui/ThemeEngine.cpp:335
msgctxt "lowres"
msgid "Disabled GFX"
msgstr "Deaktivert GFX"
-#: gui/ThemeEngine.cpp:334
+#: gui/ThemeEngine.cpp:336
msgid "Standard Renderer (16bpp)"
msgstr "Standard Tegner (16bpp)"
-#: gui/ThemeEngine.cpp:334
+#: gui/ThemeEngine.cpp:336
msgid "Standard (16bpp)"
msgstr "Standard (16bpp)"
-#: gui/ThemeEngine.cpp:336
+#: gui/ThemeEngine.cpp:338
msgid "Antialiased Renderer (16bpp)"
msgstr "Antialiased Tegner (16bpp)"
-#: gui/ThemeEngine.cpp:336
+#: gui/ThemeEngine.cpp:338
msgid "Antialiased (16bpp)"
msgstr "Antialiased (16bpp)"
-#: gui/widget.cpp:312 gui/widget.cpp:314 gui/widget.cpp:320 gui/widget.cpp:322
+#: gui/widget.cpp:322 gui/widget.cpp:324 gui/widget.cpp:330 gui/widget.cpp:332
msgid "Clear value"
msgstr "Tјm verdi"
-#: base/main.cpp:203
+#: base/main.cpp:209
#, c-format
msgid "Engine does not support debug level '%s'"
msgstr "Motoren stјtter ikke debug-nivх '%s'"
-#: base/main.cpp:275
+#: base/main.cpp:287
msgid "Menu"
msgstr "Meny"
-#: base/main.cpp:278 backends/platform/symbian/src/SymbianActions.cpp:45
+#: base/main.cpp:290 backends/platform/symbian/src/SymbianActions.cpp:45
#: backends/platform/wince/CEActionsPocket.cpp:45
#: backends/platform/wince/CEActionsSmartphone.cpp:46
msgid "Skip"
msgstr "Hopp over"
-#: base/main.cpp:281 backends/platform/symbian/src/SymbianActions.cpp:50
+#: base/main.cpp:293 backends/platform/symbian/src/SymbianActions.cpp:50
#: backends/platform/wince/CEActionsPocket.cpp:42
msgid "Pause"
msgstr "Pause"
-#: base/main.cpp:284
+#: base/main.cpp:296
msgid "Skip line"
msgstr "Hopp over linje"
-#: base/main.cpp:455
+#: base/main.cpp:467
msgid "Error running game:"
msgstr "Problem ved kjјring av spill:"
-#: base/main.cpp:479
+#: base/main.cpp:491
msgid "Could not find any engine capable of running the selected game"
msgstr "Kunne ikke finne noen motor som kunne kjјre det valgte spillet"
@@ -1091,16 +1088,16 @@ msgstr ""
msgid "Unknown error"
msgstr "Ukjent feil"
-#: engines/advancedDetector.cpp:296
+#: engines/advancedDetector.cpp:324
#, c-format
msgid "The game in '%s' seems to be unknown."
msgstr ""
-#: engines/advancedDetector.cpp:297
+#: engines/advancedDetector.cpp:325
msgid "Please, report the following data to the ScummVM team along with name"
msgstr ""
-#: engines/advancedDetector.cpp:299
+#: engines/advancedDetector.cpp:327
msgid "of the game you tried to add and its version/language/etc.:"
msgstr ""
@@ -1137,13 +1134,14 @@ msgctxt "lowres"
msgid "~R~eturn to Launcher"
msgstr "~T~ilbake til oppstarter"
-#: engines/dialogs.cpp:116 engines/cruise/menu.cpp:214
-#: engines/sci/engine/kfile.cpp:566
+#: engines/dialogs.cpp:116 engines/agi/saveload.cpp:805
+#: engines/cruise/menu.cpp:214 engines/sci/engine/kfile.cpp:567
msgid "Save game:"
msgstr "Lagret spill:"
-#: engines/dialogs.cpp:116 engines/scumm/dialogs.cpp:187
-#: engines/cruise/menu.cpp:214 engines/sci/engine/kfile.cpp:566
+#: engines/dialogs.cpp:116 engines/agi/saveload.cpp:805
+#: engines/scumm/dialogs.cpp:187 engines/cruise/menu.cpp:214
+#: engines/sci/engine/kfile.cpp:567
#: backends/platform/symbian/src/SymbianActions.cpp:44
#: backends/platform/wince/CEActionsPocket.cpp:43
#: backends/platform/wince/CEActionsPocket.cpp:267
@@ -1234,6 +1232,88 @@ msgstr ""
msgid "Start anyway"
msgstr ""
+#: engines/agi/detection.cpp:145 engines/dreamweb/detection.cpp:47
+#: engines/sci/detection.cpp:390
+msgid "Use original save/load screens"
+msgstr ""
+
+#: engines/agi/detection.cpp:146 engines/dreamweb/detection.cpp:48
+#: engines/sci/detection.cpp:391
+msgid "Use the original save/load screens, instead of the ScummVM ones"
+msgstr ""
+
+#: engines/agi/saveload.cpp:827 engines/sci/engine/kfile.cpp:674
+msgid "Restore game:"
+msgstr "Gjennopprett spill:"
+
+#: engines/agi/saveload.cpp:827 engines/sci/engine/kfile.cpp:674
+msgid "Restore"
+msgstr "Gjenopprett"
+
+#: engines/dreamweb/detection.cpp:57
+#, fuzzy
+msgid "Use bright palette mode"
+msgstr "иvre hјyre gjenstand"
+
+#: engines/dreamweb/detection.cpp:58
+msgid "Display graphics using the game's bright palette"
+msgstr ""
+
+#: engines/sci/detection.cpp:370
+msgid "EGA undithering"
+msgstr "EGA av-dithering"
+
+#: engines/sci/detection.cpp:371
+#, fuzzy
+msgid "Enable undithering in EGA games"
+msgstr "Slхr av dithering i EGA-spill som stјtter det."
+
+#: engines/sci/detection.cpp:380
+#, fuzzy
+msgid "Prefer digital sound effects"
+msgstr "Volum for spesielle lydeffekter"
+
+#: engines/sci/detection.cpp:381
+msgid "Prefer digital sound effects instead of synthesized ones"
+msgstr ""
+
+#: engines/sci/detection.cpp:400
+msgid "Use IMF/Yahama FB-01 for MIDI output"
+msgstr ""
+
+#: engines/sci/detection.cpp:401
+msgid ""
+"Use an IBM Music Feature card or a Yahama FB-01 FM synth module for MIDI "
+"output"
+msgstr ""
+
+#: engines/sci/detection.cpp:411
+msgid "Use CD audio"
+msgstr ""
+
+#: engines/sci/detection.cpp:412
+msgid "Use CD audio instead of in-game audio, if available"
+msgstr ""
+
+#: engines/sci/detection.cpp:422
+msgid "Use Windows cursors"
+msgstr ""
+
+#: engines/sci/detection.cpp:423
+msgid ""
+"Use the Windows cursors (smaller and monochrome) instead of the DOS ones"
+msgstr ""
+
+#: engines/sci/detection.cpp:433
+#, fuzzy
+msgid "Use silver cursors"
+msgstr "Vanlig muspeker"
+
+#: engines/sci/detection.cpp:434
+msgid ""
+"Use the alternate set of silver cursors, instead of the normal golden ones"
+msgstr ""
+
#: engines/scumm/dialogs.cpp:175
#, c-format
msgid "Insert Disk %c and Press Button to Continue."
@@ -1897,7 +1977,7 @@ msgid ""
"but %s is missing. Using AdLib instead."
msgstr ""
-#: engines/scumm/scumm.cpp:2271 engines/agos/saveload.cpp:189
+#: engines/scumm/scumm.cpp:2271 engines/agos/saveload.cpp:202
#, c-format
msgid ""
"Failed to save game state to file:\n"
@@ -1908,7 +1988,7 @@ msgstr ""
"\n"
"%s"
-#: engines/scumm/scumm.cpp:2278 engines/agos/saveload.cpp:154
+#: engines/scumm/scumm.cpp:2278 engines/agos/saveload.cpp:167
#, c-format
msgid ""
"Failed to load game state from file:\n"
@@ -1919,7 +1999,7 @@ msgstr ""
"\n"
"%s"
-#: engines/scumm/scumm.cpp:2290 engines/agos/saveload.cpp:197
+#: engines/scumm/scumm.cpp:2290 engines/agos/saveload.cpp:210
#, c-format
msgid ""
"Successfully saved game state in file:\n"
@@ -1967,14 +2047,6 @@ msgstr "ScummVM Hovedmeny"
msgid "~W~ater Effect Enabled"
msgstr "~V~anneffekt aktivert"
-#: engines/sci/engine/kfile.cpp:673
-msgid "Restore game:"
-msgstr "Gjennopprett spill:"
-
-#: engines/sci/engine/kfile.cpp:673
-msgid "Restore"
-msgstr "Gjenopprett"
-
#: engines/agos/animation.cpp:550
#, c-format
msgid "Cutscene file '%s' not found!"
@@ -2013,6 +2085,66 @@ msgstr ""
"\n"
"%s"
+#. I18N: Studio audience adds an applause and cheering sounds whenever
+#. Malcolm makes a joke.
+#: engines/kyra/detection.cpp:62
+msgid "Studio audience"
+msgstr ""
+
+#: engines/kyra/detection.cpp:63
+msgid "Enable studio audience"
+msgstr ""
+
+#. I18N: This option allows the user to skip text and cutscenes.
+#: engines/kyra/detection.cpp:73
+msgid "Skip support"
+msgstr ""
+
+#: engines/kyra/detection.cpp:74
+msgid "Allow text and cutscenes to be skipped"
+msgstr ""
+
+#. I18N: Helium mode makes people sound like they've inhaled Helium.
+#: engines/kyra/detection.cpp:84
+msgid "Helium mode"
+msgstr ""
+
+#: engines/kyra/detection.cpp:85
+#, fuzzy
+msgid "Enable helium mode"
+msgstr "Aktiver Roland GS-modus"
+
+#. I18N: When enabled, this option makes scrolling smoother when
+#. changing from one screen to another.
+#: engines/kyra/detection.cpp:99
+msgid "Smooth scrolling"
+msgstr ""
+
+#: engines/kyra/detection.cpp:100
+msgid "Enable smooth scrolling when walking"
+msgstr ""
+
+#. I18N: When enabled, this option changes the cursor when it floats to the
+#. edge of the screen to a directional arrow. The player can then click to
+#. walk towards that direction.
+#: engines/kyra/detection.cpp:112
+#, fuzzy
+msgid "Floating cursors"
+msgstr "Vanlig muspeker"
+
+#: engines/kyra/detection.cpp:113
+msgid "Enable floating cursors"
+msgstr ""
+
+#. I18N: HP stands for Hit Points
+#: engines/kyra/detection.cpp:127
+msgid "HP bar graphs"
+msgstr ""
+
+#: engines/kyra/detection.cpp:128
+msgid "Enable hit point bar graphs"
+msgstr ""
+
#: engines/kyra/lol.cpp:478
msgid "Attack 1"
msgstr ""
@@ -2076,6 +2208,14 @@ msgid ""
"that a few tracks will not be correctly played."
msgstr ""
+#: engines/queen/queen.cpp:59 engines/sky/detection.cpp:44
+msgid "Floppy intro"
+msgstr ""
+
+#: engines/queen/queen.cpp:60 engines/sky/detection.cpp:45
+msgid "Use the floppy version's intro (CD version only)"
+msgstr ""
+
#: engines/sky/compact.cpp:130
msgid ""
"Unable to find \"sky.cpt\" file!\n"
@@ -2141,6 +2281,14 @@ msgid ""
"PSX cutscenes found but ScummVM has been built without RGB color support"
msgstr ""
+#: engines/sword2/sword2.cpp:79
+msgid "Show object labels"
+msgstr ""
+
+#: engines/sword2/sword2.cpp:80
+msgid "Show labels for objects on mouse hover"
+msgstr ""
+
#: engines/parallaction/saveload.cpp:133
#, c-format
msgid ""
@@ -2359,21 +2507,21 @@ msgstr "Hјy lydkvalitet (tregere) (omstart)"
msgid "Disable power off"
msgstr "Deaktiver strјmsparing"
-#: backends/platform/iphone/osys_events.cpp:301
+#: backends/platform/iphone/osys_events.cpp:300
#, fuzzy
msgid "Mouse-click-and-drag mode enabled."
msgstr "Touchpad-modus aktivert."
-#: backends/platform/iphone/osys_events.cpp:303
+#: backends/platform/iphone/osys_events.cpp:302
#, fuzzy
msgid "Mouse-click-and-drag mode disabled."
msgstr "Touchpad-modus deaktivert."
-#: backends/platform/iphone/osys_events.cpp:314
+#: backends/platform/iphone/osys_events.cpp:313
msgid "Touchpad mode enabled."
msgstr "Touchpad-modus aktivert."
-#: backends/platform/iphone/osys_events.cpp:316
+#: backends/platform/iphone/osys_events.cpp:315
msgid "Touchpad mode disabled."
msgstr "Touchpad-modus deaktivert."
@@ -2455,15 +2603,15 @@ msgstr "Bytt grafikkfiltre"
msgid "Windowed mode"
msgstr "Tegnemodus:"
-#: backends/graphics/opengl/opengl-graphics.cpp:130
+#: backends/graphics/opengl/opengl-graphics.cpp:135
msgid "OpenGL Normal"
msgstr "OpenGL Normal"
-#: backends/graphics/opengl/opengl-graphics.cpp:131
+#: backends/graphics/opengl/opengl-graphics.cpp:136
msgid "OpenGL Conserve"
msgstr "OpenGL Bevar"
-#: backends/graphics/opengl/opengl-graphics.cpp:132
+#: backends/graphics/opengl/opengl-graphics.cpp:137
msgid "OpenGL Original"
msgstr "OpenGL Original"
diff --git a/po/nn_NO.po b/po/nn_NO.po
index 00dce83302..a5b01a7c52 100644
--- a/po/nn_NO.po
+++ b/po/nn_NO.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ScummVM 1.3.0svn\n"
"Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n"
-"POT-Creation-Date: 2012-03-07 22:09+0000\n"
+"POT-Creation-Date: 2012-05-20 22:39+0100\n"
"PO-Revision-Date: 2011-04-25 23:07+0100\n"
"Last-Translator: Einar Johan T. Sјmхen <einarjohants@gmail.com>\n"
"Language-Team: somaen <einarjohants@gmail.com>\n"
@@ -47,7 +47,7 @@ msgid "Go up"
msgstr "Gх tilbake"
#: gui/browser.cpp:69 gui/chooser.cpp:45 gui/KeysDialog.cpp:43
-#: gui/launcher.cpp:320 gui/massadd.cpp:94 gui/options.cpp:1253
+#: gui/launcher.cpp:345 gui/massadd.cpp:94 gui/options.cpp:1228
#: gui/saveload.cpp:63 gui/saveload.cpp:155 gui/themebrowser.cpp:54
#: engines/engine.cpp:442 engines/scumm/dialogs.cpp:190
#: engines/sword1/control.cpp:865 engines/parallaction/saveload.cpp:281
@@ -72,15 +72,15 @@ msgstr "Steng"
msgid "Mouse click"
msgstr "Musklikk"
-#: gui/gui-manager.cpp:122 base/main.cpp:288
+#: gui/gui-manager.cpp:122 base/main.cpp:300
msgid "Display keyboard"
msgstr "Syn Tastatur"
-#: gui/gui-manager.cpp:126 base/main.cpp:292
+#: gui/gui-manager.cpp:126 base/main.cpp:304
msgid "Remap keys"
msgstr "Omkople tastar"
-#: gui/gui-manager.cpp:129 base/main.cpp:295
+#: gui/gui-manager.cpp:129 base/main.cpp:307
#, fuzzy
msgid "Toggle FullScreen"
msgstr "Veksle fullskjerm"
@@ -93,8 +93,8 @@ msgstr "Vel ei handling for kopling:"
msgid "Map"
msgstr "Kople"
-#: gui/KeysDialog.cpp:42 gui/launcher.cpp:321 gui/launcher.cpp:960
-#: gui/launcher.cpp:964 gui/massadd.cpp:91 gui/options.cpp:1254
+#: gui/KeysDialog.cpp:42 gui/launcher.cpp:346 gui/launcher.cpp:1001
+#: gui/launcher.cpp:1005 gui/massadd.cpp:91 gui/options.cpp:1229
#: engines/engine.cpp:361 engines/engine.cpp:372 engines/scumm/dialogs.cpp:192
#: engines/scumm/scumm.cpp:1775 engines/agos/animation.cpp:551
#: engines/groovie/script.cpp:420 engines/sky/compact.cpp:131
@@ -131,15 +131,15 @@ msgstr "Vel ei handling"
msgid "Press the key to associate"
msgstr "Trykk tasten du vil kople"
-#: gui/launcher.cpp:170
+#: gui/launcher.cpp:187
msgid "Game"
msgstr "Spel"
-#: gui/launcher.cpp:174
+#: gui/launcher.cpp:191
msgid "ID:"
msgstr "ID:"
-#: gui/launcher.cpp:174 gui/launcher.cpp:176 gui/launcher.cpp:177
+#: gui/launcher.cpp:191 gui/launcher.cpp:193 gui/launcher.cpp:194
msgid ""
"Short game identifier used for referring to savegames and running the game "
"from the command line"
@@ -147,29 +147,29 @@ msgstr ""
"Kort spelidentifikator nytta for х referere til lagra spel, og х kјyre "
"spelet frх kommandolinja"
-#: gui/launcher.cpp:176
+#: gui/launcher.cpp:193
msgctxt "lowres"
msgid "ID:"
msgstr "ID:"
-#: gui/launcher.cpp:181
+#: gui/launcher.cpp:198
msgid "Name:"
msgstr "Namn:"
-#: gui/launcher.cpp:181 gui/launcher.cpp:183 gui/launcher.cpp:184
+#: gui/launcher.cpp:198 gui/launcher.cpp:200 gui/launcher.cpp:201
msgid "Full title of the game"
msgstr "Full speltittel:"
-#: gui/launcher.cpp:183
+#: gui/launcher.cpp:200
msgctxt "lowres"
msgid "Name:"
msgstr "Namn:"
-#: gui/launcher.cpp:187
+#: gui/launcher.cpp:204
msgid "Language:"
msgstr "Sprхk:"
-#: gui/launcher.cpp:187 gui/launcher.cpp:188
+#: gui/launcher.cpp:204 gui/launcher.cpp:205
msgid ""
"Language of the game. This will not turn your Spanish game version into "
"English"
@@ -177,286 +177,291 @@ msgstr ""
"Spelets sprхk. Dette vil ikkje gjere den spanske versjonen av spelet til ein "
"engelsk versjon"
-#: gui/launcher.cpp:189 gui/launcher.cpp:203 gui/options.cpp:80
-#: gui/options.cpp:745 gui/options.cpp:758 gui/options.cpp:1224
+#: gui/launcher.cpp:206 gui/launcher.cpp:220 gui/options.cpp:80
+#: gui/options.cpp:730 gui/options.cpp:743 gui/options.cpp:1199
#: audio/null.cpp:40
msgid "<default>"
msgstr "<standard>"
-#: gui/launcher.cpp:199
+#: gui/launcher.cpp:216
msgid "Platform:"
msgstr "Plattform:"
-#: gui/launcher.cpp:199 gui/launcher.cpp:201 gui/launcher.cpp:202
+#: gui/launcher.cpp:216 gui/launcher.cpp:218 gui/launcher.cpp:219
msgid "Platform the game was originally designed for"
msgstr "Plattform spelet opprineleg vart designa for"
-#: gui/launcher.cpp:201
+#: gui/launcher.cpp:218
msgctxt "lowres"
msgid "Platform:"
msgstr "Plattform:"
-#: gui/launcher.cpp:213 gui/options.cpp:1087 gui/options.cpp:1104
+#: gui/launcher.cpp:231
+#, fuzzy
+msgid "Engine"
+msgstr "Undersјk"
+
+#: gui/launcher.cpp:239 gui/options.cpp:1062 gui/options.cpp:1079
msgid "Graphics"
msgstr "Grafikk"
-#: gui/launcher.cpp:213 gui/options.cpp:1087 gui/options.cpp:1104
+#: gui/launcher.cpp:239 gui/options.cpp:1062 gui/options.cpp:1079
msgid "GFX"
msgstr "GFX"
-#: gui/launcher.cpp:216
+#: gui/launcher.cpp:242
msgid "Override global graphic settings"
msgstr "Overstyr globale grafikkinstillingar"
-#: gui/launcher.cpp:218
+#: gui/launcher.cpp:244
msgctxt "lowres"
msgid "Override global graphic settings"
msgstr "Overstyr globale grafikkinstillingar"
-#: gui/launcher.cpp:225 gui/options.cpp:1110
+#: gui/launcher.cpp:251 gui/options.cpp:1085
msgid "Audio"
msgstr "Lyd"
-#: gui/launcher.cpp:228
+#: gui/launcher.cpp:254
msgid "Override global audio settings"
msgstr "Overstyr globale lydinstillingar"
-#: gui/launcher.cpp:230
+#: gui/launcher.cpp:256
msgctxt "lowres"
msgid "Override global audio settings"
msgstr "Overstyr globale lydinstillingar"
-#: gui/launcher.cpp:239 gui/options.cpp:1115
+#: gui/launcher.cpp:265 gui/options.cpp:1090
msgid "Volume"
msgstr "Volum"
-#: gui/launcher.cpp:241 gui/options.cpp:1117
+#: gui/launcher.cpp:267 gui/options.cpp:1092
msgctxt "lowres"
msgid "Volume"
msgstr "Volum"
-#: gui/launcher.cpp:244
+#: gui/launcher.cpp:270
msgid "Override global volume settings"
msgstr "Overstyr globale voluminstillingar"
-#: gui/launcher.cpp:246
+#: gui/launcher.cpp:272
msgctxt "lowres"
msgid "Override global volume settings"
msgstr "Overstyr globale voluminstillingar"
-#: gui/launcher.cpp:254 gui/options.cpp:1125
+#: gui/launcher.cpp:280 gui/options.cpp:1100
msgid "MIDI"
msgstr "MIDI"
-#: gui/launcher.cpp:257
+#: gui/launcher.cpp:283
msgid "Override global MIDI settings"
msgstr "Overstyr globale MIDI-instillingar"
-#: gui/launcher.cpp:259
+#: gui/launcher.cpp:285
msgctxt "lowres"
msgid "Override global MIDI settings"
msgstr "Overstyr globale MIDI-instillingar"
-#: gui/launcher.cpp:268 gui/options.cpp:1131
+#: gui/launcher.cpp:294 gui/options.cpp:1106
msgid "MT-32"
msgstr "MT-32"
-#: gui/launcher.cpp:271
+#: gui/launcher.cpp:297
msgid "Override global MT-32 settings"
msgstr "Overstyr globale MT-32-instillingar"
-#: gui/launcher.cpp:273
+#: gui/launcher.cpp:299
msgctxt "lowres"
msgid "Override global MT-32 settings"
msgstr "Overstyr globale MT-32-instillingar"
-#: gui/launcher.cpp:282 gui/options.cpp:1138
+#: gui/launcher.cpp:308 gui/options.cpp:1113
msgid "Paths"
msgstr "Stiar"
-#: gui/launcher.cpp:284 gui/options.cpp:1140
+#: gui/launcher.cpp:310 gui/options.cpp:1115
msgctxt "lowres"
msgid "Paths"
msgstr "Stiar"
-#: gui/launcher.cpp:291
+#: gui/launcher.cpp:317
msgid "Game Path:"
msgstr "Spelsti:"
-#: gui/launcher.cpp:293
+#: gui/launcher.cpp:319
msgctxt "lowres"
msgid "Game Path:"
msgstr "Spelsti:"
-#: gui/launcher.cpp:298 gui/options.cpp:1164
+#: gui/launcher.cpp:324 gui/options.cpp:1139
msgid "Extra Path:"
msgstr "Ekstrasti:"
-#: gui/launcher.cpp:298 gui/launcher.cpp:300 gui/launcher.cpp:301
+#: gui/launcher.cpp:324 gui/launcher.cpp:326 gui/launcher.cpp:327
msgid "Specifies path to additional data used the game"
msgstr ""
-#: gui/launcher.cpp:300 gui/options.cpp:1166
+#: gui/launcher.cpp:326 gui/options.cpp:1141
msgctxt "lowres"
msgid "Extra Path:"
msgstr "Ekstrasti:"
-#: gui/launcher.cpp:307 gui/options.cpp:1148
+#: gui/launcher.cpp:333 gui/options.cpp:1123
msgid "Save Path:"
msgstr "Lagringssti:"
-#: gui/launcher.cpp:307 gui/launcher.cpp:309 gui/launcher.cpp:310
-#: gui/options.cpp:1148 gui/options.cpp:1150 gui/options.cpp:1151
+#: gui/launcher.cpp:333 gui/launcher.cpp:335 gui/launcher.cpp:336
+#: gui/options.cpp:1123 gui/options.cpp:1125 gui/options.cpp:1126
msgid "Specifies where your savegames are put"
msgstr ""
-#: gui/launcher.cpp:309 gui/options.cpp:1150
+#: gui/launcher.cpp:335 gui/options.cpp:1125
msgctxt "lowres"
msgid "Save Path:"
msgstr "Lagringssti:"
-#: gui/launcher.cpp:329 gui/launcher.cpp:416 gui/launcher.cpp:469
-#: gui/launcher.cpp:523 gui/options.cpp:1159 gui/options.cpp:1167
-#: gui/options.cpp:1176 gui/options.cpp:1283 gui/options.cpp:1289
-#: gui/options.cpp:1297 gui/options.cpp:1327 gui/options.cpp:1333
-#: gui/options.cpp:1340 gui/options.cpp:1433 gui/options.cpp:1436
-#: gui/options.cpp:1448
+#: gui/launcher.cpp:354 gui/launcher.cpp:453 gui/launcher.cpp:511
+#: gui/launcher.cpp:565 gui/options.cpp:1134 gui/options.cpp:1142
+#: gui/options.cpp:1151 gui/options.cpp:1258 gui/options.cpp:1264
+#: gui/options.cpp:1272 gui/options.cpp:1302 gui/options.cpp:1308
+#: gui/options.cpp:1315 gui/options.cpp:1408 gui/options.cpp:1411
+#: gui/options.cpp:1423
msgctxt "path"
msgid "None"
msgstr "Ingen"
-#: gui/launcher.cpp:334 gui/launcher.cpp:422 gui/launcher.cpp:527
-#: gui/options.cpp:1277 gui/options.cpp:1321 gui/options.cpp:1439
+#: gui/launcher.cpp:359 gui/launcher.cpp:459 gui/launcher.cpp:569
+#: gui/options.cpp:1252 gui/options.cpp:1296 gui/options.cpp:1414
#: backends/platform/wii/options.cpp:56
msgid "Default"
msgstr "Standard"
-#: gui/launcher.cpp:462 gui/options.cpp:1442
+#: gui/launcher.cpp:504 gui/options.cpp:1417
msgid "Select SoundFont"
msgstr "Vel SoundFont"
-#: gui/launcher.cpp:481 gui/launcher.cpp:636
+#: gui/launcher.cpp:523 gui/launcher.cpp:677
msgid "Select directory with game data"
msgstr "Vel mappe med speldata"
-#: gui/launcher.cpp:499
+#: gui/launcher.cpp:541
msgid "Select additional game directory"
msgstr ""
-#: gui/launcher.cpp:511
+#: gui/launcher.cpp:553
msgid "Select directory for saved games"
msgstr "Vel mappe for lagra spel"
-#: gui/launcher.cpp:538
+#: gui/launcher.cpp:580
msgid "This game ID is already taken. Please choose another one."
msgstr ""
-#: gui/launcher.cpp:579 engines/dialogs.cpp:110
+#: gui/launcher.cpp:621 engines/dialogs.cpp:110
msgid "~Q~uit"
msgstr "~A~vslutt"
-#: gui/launcher.cpp:579 backends/platform/sdl/macosx/appmenu_osx.mm:96
+#: gui/launcher.cpp:621 backends/platform/sdl/macosx/appmenu_osx.mm:96
msgid "Quit ScummVM"
msgstr "Avslutt ScummVM"
-#: gui/launcher.cpp:580
+#: gui/launcher.cpp:622
msgid "A~b~out..."
msgstr "~O~m..."
-#: gui/launcher.cpp:580 backends/platform/sdl/macosx/appmenu_osx.mm:70
+#: gui/launcher.cpp:622 backends/platform/sdl/macosx/appmenu_osx.mm:70
msgid "About ScummVM"
msgstr "Om ScummVM"
-#: gui/launcher.cpp:581
+#: gui/launcher.cpp:623
msgid "~O~ptions..."
msgstr "~V~al..."
-#: gui/launcher.cpp:581
+#: gui/launcher.cpp:623
msgid "Change global ScummVM options"
msgstr "Endre globale ScummVM-instillingar"
-#: gui/launcher.cpp:583
+#: gui/launcher.cpp:625
msgid "~S~tart"
msgstr "~S~tart"
-#: gui/launcher.cpp:583
+#: gui/launcher.cpp:625
msgid "Start selected game"
msgstr "Start det velde spelet"
-#: gui/launcher.cpp:586
+#: gui/launcher.cpp:628
msgid "~L~oad..."
msgstr "~Х~pne..."
-#: gui/launcher.cpp:586
+#: gui/launcher.cpp:628
msgid "Load savegame for selected game"
msgstr "Хpne eit lagra spel for the velde spelet"
-#: gui/launcher.cpp:591 gui/launcher.cpp:1079
+#: gui/launcher.cpp:633 gui/launcher.cpp:1120
msgid "~A~dd Game..."
msgstr "~L~egg til spel..."
-#: gui/launcher.cpp:591 gui/launcher.cpp:598
+#: gui/launcher.cpp:633 gui/launcher.cpp:640
msgid "Hold Shift for Mass Add"
msgstr "Hold Shift nede for х legge til fleire"
-#: gui/launcher.cpp:593
+#: gui/launcher.cpp:635
msgid "~E~dit Game..."
msgstr "~R~ediger spel..."
-#: gui/launcher.cpp:593 gui/launcher.cpp:600
+#: gui/launcher.cpp:635 gui/launcher.cpp:642
msgid "Change game options"
msgstr "Endre spelinstillingar"
-#: gui/launcher.cpp:595
+#: gui/launcher.cpp:637
msgid "~R~emove Game"
msgstr "~F~jern spel"
-#: gui/launcher.cpp:595 gui/launcher.cpp:602
+#: gui/launcher.cpp:637 gui/launcher.cpp:644
msgid "Remove game from the list. The game data files stay intact"
msgstr ""
-#: gui/launcher.cpp:598 gui/launcher.cpp:1079
+#: gui/launcher.cpp:640 gui/launcher.cpp:1120
msgctxt "lowres"
msgid "~A~dd Game..."
msgstr "~L~egg til spel..."
-#: gui/launcher.cpp:600
+#: gui/launcher.cpp:642
msgctxt "lowres"
msgid "~E~dit Game..."
msgstr "~R~ediger spel..."
-#: gui/launcher.cpp:602
+#: gui/launcher.cpp:644
msgctxt "lowres"
msgid "~R~emove Game"
msgstr "~F~jern spel"
-#: gui/launcher.cpp:610
+#: gui/launcher.cpp:652
msgid "Search in game list"
msgstr "Sјk i spelliste"
-#: gui/launcher.cpp:614 gui/launcher.cpp:1126
+#: gui/launcher.cpp:656 gui/launcher.cpp:1167
msgid "Search:"
msgstr "Sјk:"
-#: gui/launcher.cpp:639 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255
+#: gui/launcher.cpp:680 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255
#: engines/mohawk/riven.cpp:716 engines/cruise/menu.cpp:216
msgid "Load game:"
msgstr "Хpne spel:"
-#: gui/launcher.cpp:639 engines/dialogs.cpp:114 engines/scumm/dialogs.cpp:188
+#: gui/launcher.cpp:680 engines/dialogs.cpp:114 engines/scumm/dialogs.cpp:188
#: engines/mohawk/myst.cpp:255 engines/mohawk/riven.cpp:716
#: engines/cruise/menu.cpp:216 backends/platform/wince/CEActionsPocket.cpp:267
#: backends/platform/wince/CEActionsSmartphone.cpp:231
msgid "Load"
msgstr "Хpne"
-#: gui/launcher.cpp:747
+#: gui/launcher.cpp:788
msgid ""
"Do you really want to run the mass game detector? This could potentially add "
"a huge number of games."
msgstr ""
-#: gui/launcher.cpp:748 gui/launcher.cpp:896
+#: gui/launcher.cpp:789 gui/launcher.cpp:937
#: backends/events/symbiansdl/symbiansdl-events.cpp:184
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
@@ -464,7 +469,7 @@ msgstr ""
msgid "Yes"
msgstr "Ja"
-#: gui/launcher.cpp:748 gui/launcher.cpp:896
+#: gui/launcher.cpp:789 gui/launcher.cpp:937
#: backends/events/symbiansdl/symbiansdl-events.cpp:184
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
@@ -472,38 +477,38 @@ msgstr "Ja"
msgid "No"
msgstr "Nei"
-#: gui/launcher.cpp:796
+#: gui/launcher.cpp:837
msgid "ScummVM couldn't open the specified directory!"
msgstr "ScummVM kunne ikkje хpne den velde mappa!"
-#: gui/launcher.cpp:808
+#: gui/launcher.cpp:849
msgid "ScummVM could not find any game in the specified directory!"
msgstr "ScummVM kunne ikkje finne noko spel i den velde mappa!"
-#: gui/launcher.cpp:822
+#: gui/launcher.cpp:863
msgid "Pick the game:"
msgstr "Vel spelet:"
-#: gui/launcher.cpp:896
+#: gui/launcher.cpp:937
msgid "Do you really want to remove this game configuration?"
msgstr "Vil du verkeleg fjerne denne spelkonfigurasjonen?"
-#: gui/launcher.cpp:960
+#: gui/launcher.cpp:1001
msgid "This game does not support loading games from the launcher."
msgstr "Dette spelet stјttar ikkje хpning av lagra spel frх oppstartaren."
-#: gui/launcher.cpp:964
+#: gui/launcher.cpp:1005
msgid "ScummVM could not find any engine capable of running the selected game!"
msgstr ""
"ScummVM kunne ikkje finne nokon motor som var i stand til х kјyre det velde "
"spelet!"
-#: gui/launcher.cpp:1078
+#: gui/launcher.cpp:1119
msgctxt "lowres"
msgid "Mass Add..."
msgstr "Legg til fleire..."
-#: gui/launcher.cpp:1078
+#: gui/launcher.cpp:1119
msgid "Mass Add..."
msgstr "Legg til fleire..."
@@ -570,101 +575,93 @@ msgstr "44 kHz"
msgid "48 kHz"
msgstr "48 kHz"
-#: gui/options.cpp:257 gui/options.cpp:485 gui/options.cpp:586
-#: gui/options.cpp:659 gui/options.cpp:868
+#: gui/options.cpp:248 gui/options.cpp:474 gui/options.cpp:575
+#: gui/options.cpp:644 gui/options.cpp:852
msgctxt "soundfont"
msgid "None"
msgstr "Ingen"
-#: gui/options.cpp:393
+#: gui/options.cpp:382
msgid "Failed to apply some of the graphic options changes:"
msgstr ""
-#: gui/options.cpp:405
+#: gui/options.cpp:394
msgid "the video mode could not be changed."
msgstr ""
-#: gui/options.cpp:411
+#: gui/options.cpp:400
msgid "the fullscreen setting could not be changed"
msgstr ""
-#: gui/options.cpp:417
+#: gui/options.cpp:406
msgid "the aspect ratio setting could not be changed"
msgstr ""
-#: gui/options.cpp:742
+#: gui/options.cpp:727
msgid "Graphics mode:"
msgstr "Grafikkmodus:"
-#: gui/options.cpp:756
+#: gui/options.cpp:741
msgid "Render mode:"
msgstr "Teiknemodus:"
-#: gui/options.cpp:756 gui/options.cpp:757
+#: gui/options.cpp:741 gui/options.cpp:742
msgid "Special dithering modes supported by some games"
msgstr "Spesielle dithering-modus som stјttast av nokre spel"
-#: gui/options.cpp:768
+#: gui/options.cpp:753
#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2248
#: backends/graphics/openglsdl/openglsdl-graphics.cpp:472
msgid "Fullscreen mode"
msgstr "Fullskjermsmodus"
-#: gui/options.cpp:771
+#: gui/options.cpp:756
msgid "Aspect ratio correction"
msgstr "Aspekt-korrigering"
-#: gui/options.cpp:771
+#: gui/options.cpp:756
msgid "Correct aspect ratio for 320x200 games"
msgstr "Rett opp aspekt for 320x200 spel"
-#: gui/options.cpp:772
-msgid "EGA undithering"
-msgstr ""
-
-#: gui/options.cpp:772
-msgid "Enable undithering in EGA games that support it"
-msgstr ""
-
-#: gui/options.cpp:780
+#: gui/options.cpp:764
msgid "Preferred Device:"
msgstr "Fјretrukken eining:"
-#: gui/options.cpp:780
+#: gui/options.cpp:764
msgid "Music Device:"
msgstr ""
-#: gui/options.cpp:780 gui/options.cpp:782
+#: gui/options.cpp:764 gui/options.cpp:766
msgid "Specifies preferred sound device or sound card emulator"
msgstr ""
-#: gui/options.cpp:780 gui/options.cpp:782 gui/options.cpp:783
+#: gui/options.cpp:764 gui/options.cpp:766 gui/options.cpp:767
msgid "Specifies output sound device or sound card emulator"
msgstr ""
-#: gui/options.cpp:782
+#: gui/options.cpp:766
msgctxt "lowres"
msgid "Preferred Dev.:"
msgstr ""
-#: gui/options.cpp:782
+#: gui/options.cpp:766
msgctxt "lowres"
msgid "Music Device:"
msgstr ""
-#: gui/options.cpp:809
+#: gui/options.cpp:793
msgid "AdLib emulator:"
msgstr "AdLib emulator:"
-#: gui/options.cpp:809 gui/options.cpp:810
+#: gui/options.cpp:793 gui/options.cpp:794
msgid "AdLib is used for music in many games"
msgstr "AdLib nyttast til musikk i mange spel"
-#: gui/options.cpp:820
+#: gui/options.cpp:804
msgid "Output rate:"
msgstr ""
-#: gui/options.cpp:820 gui/options.cpp:821
+#: gui/options.cpp:804 gui/options.cpp:805
msgid ""
"Higher value specifies better sound quality but may be not supported by your "
"soundcard"
@@ -672,250 +669,250 @@ msgstr ""
"Hјgare verdier gir betre lydkvalitet, men stјttast kanskje ikkje av "
"lydkortet ditt"
-#: gui/options.cpp:831
+#: gui/options.cpp:815
msgid "GM Device:"
msgstr ""
-#: gui/options.cpp:831
+#: gui/options.cpp:815
msgid "Specifies default sound device for General MIDI output"
msgstr ""
-#: gui/options.cpp:842
+#: gui/options.cpp:826
msgid "Don't use General MIDI music"
msgstr "Ikkje nytt General MIDI musikk"
-#: gui/options.cpp:853 gui/options.cpp:915
+#: gui/options.cpp:837 gui/options.cpp:899
msgid "Use first available device"
msgstr ""
-#: gui/options.cpp:865
+#: gui/options.cpp:849
msgid "SoundFont:"
msgstr "SoundFont:"
-#: gui/options.cpp:865 gui/options.cpp:867 gui/options.cpp:868
+#: gui/options.cpp:849 gui/options.cpp:851 gui/options.cpp:852
msgid "SoundFont is supported by some audio cards, Fluidsynth and Timidity"
msgstr "SoundFont stјttast av enkelte lydkort, Fluidsynth og Timidity"
-#: gui/options.cpp:867
+#: gui/options.cpp:851
msgctxt "lowres"
msgid "SoundFont:"
msgstr "SoundFont:"
-#: gui/options.cpp:873
+#: gui/options.cpp:857
msgid "Mixed AdLib/MIDI mode"
msgstr "Blanda AdLib/MIDI-modus"
-#: gui/options.cpp:873
+#: gui/options.cpp:857
msgid "Use both MIDI and AdLib sound generation"
msgstr "Nytt bхe MIDI og AdLib lydskaping"
-#: gui/options.cpp:876
+#: gui/options.cpp:860
msgid "MIDI gain:"
msgstr "MIDI gain:"
-#: gui/options.cpp:886
+#: gui/options.cpp:870
msgid "MT-32 Device:"
msgstr ""
-#: gui/options.cpp:886
+#: gui/options.cpp:870
msgid "Specifies default sound device for Roland MT-32/LAPC1/CM32l/CM64 output"
msgstr ""
-#: gui/options.cpp:891
+#: gui/options.cpp:875
msgid "True Roland MT-32 (disable GM emulation)"
msgstr "Ekte Roland MT-32 (deaktiver GM-emulering)"
-#: gui/options.cpp:891 gui/options.cpp:893
+#: gui/options.cpp:875 gui/options.cpp:877
msgid ""
"Check if you want to use your real hardware Roland-compatible sound device "
"connected to your computer"
msgstr ""
-#: gui/options.cpp:893
+#: gui/options.cpp:877
msgctxt "lowres"
msgid "True Roland MT-32 (no GM emulation)"
msgstr "Ekte Roland MT-32 (ingen GS-emulering)"
-#: gui/options.cpp:896
+#: gui/options.cpp:880
msgid "Enable Roland GS Mode"
msgstr "Aktiver Roland GS-modus"
-#: gui/options.cpp:896
+#: gui/options.cpp:880
msgid "Turns off General MIDI mapping for games with Roland MT-32 soundtrack"
msgstr "Slхr av General MIDI-kopling for spel med Roland MT-32 lydspor"
-#: gui/options.cpp:905
+#: gui/options.cpp:889
msgid "Don't use Roland MT-32 music"
msgstr "Ikkje nytt Roland MT-32 musikk"
-#: gui/options.cpp:932
+#: gui/options.cpp:916
msgid "Text and Speech:"
msgstr "Tekst og Tale:"
-#: gui/options.cpp:936 gui/options.cpp:946
+#: gui/options.cpp:920 gui/options.cpp:930
msgid "Speech"
msgstr "Tale"
-#: gui/options.cpp:937 gui/options.cpp:947
+#: gui/options.cpp:921 gui/options.cpp:931
msgid "Subtitles"
msgstr "Teksting"
-#: gui/options.cpp:938
+#: gui/options.cpp:922
msgid "Both"
msgstr "Begge"
-#: gui/options.cpp:940
+#: gui/options.cpp:924
msgid "Subtitle speed:"
msgstr "Undertekstfart:"
-#: gui/options.cpp:942
+#: gui/options.cpp:926
msgctxt "lowres"
msgid "Text and Speech:"
msgstr "Tekst og Tale:"
-#: gui/options.cpp:946
+#: gui/options.cpp:930
msgid "Spch"
msgstr "Tale"
-#: gui/options.cpp:947
+#: gui/options.cpp:931
msgid "Subs"
msgstr "Tekst"
-#: gui/options.cpp:948
+#: gui/options.cpp:932
msgctxt "lowres"
msgid "Both"
msgstr "Bхe"
-#: gui/options.cpp:948
+#: gui/options.cpp:932
msgid "Show subtitles and play speech"
msgstr "Vis teksting og spel av tale"
-#: gui/options.cpp:950
+#: gui/options.cpp:934
msgctxt "lowres"
msgid "Subtitle speed:"
msgstr "Undertekstfart:"
-#: gui/options.cpp:966
+#: gui/options.cpp:950
msgid "Music volume:"
msgstr "Musikkvolum:"
-#: gui/options.cpp:968
+#: gui/options.cpp:952
msgctxt "lowres"
msgid "Music volume:"
msgstr "Musikkvolum:"
-#: gui/options.cpp:975
+#: gui/options.cpp:959
msgid "Mute All"
msgstr "Demp alle"
-#: gui/options.cpp:978
+#: gui/options.cpp:962
msgid "SFX volume:"
msgstr "Lydeffektvolum:"
-#: gui/options.cpp:978 gui/options.cpp:980 gui/options.cpp:981
+#: gui/options.cpp:962 gui/options.cpp:964 gui/options.cpp:965
msgid "Special sound effects volume"
msgstr ""
-#: gui/options.cpp:980
+#: gui/options.cpp:964
msgctxt "lowres"
msgid "SFX volume:"
msgstr "Lydeffektvolum:"
-#: gui/options.cpp:988
+#: gui/options.cpp:972
msgid "Speech volume:"
msgstr "Talevolum:"
-#: gui/options.cpp:990
+#: gui/options.cpp:974
msgctxt "lowres"
msgid "Speech volume:"
msgstr "Talevolum:"
-#: gui/options.cpp:1156
+#: gui/options.cpp:1131
msgid "Theme Path:"
msgstr "Temasti:"
-#: gui/options.cpp:1158
+#: gui/options.cpp:1133
msgctxt "lowres"
msgid "Theme Path:"
msgstr "Temasti:"
-#: gui/options.cpp:1164 gui/options.cpp:1166 gui/options.cpp:1167
+#: gui/options.cpp:1139 gui/options.cpp:1141 gui/options.cpp:1142
msgid "Specifies path to additional data used by all games or ScummVM"
msgstr ""
-#: gui/options.cpp:1173
+#: gui/options.cpp:1148
msgid "Plugins Path:"
msgstr "Pluginsti:"
-#: gui/options.cpp:1175
+#: gui/options.cpp:1150
msgctxt "lowres"
msgid "Plugins Path:"
msgstr "Pluginsti:"
-#: gui/options.cpp:1184
+#: gui/options.cpp:1159
msgid "Misc"
msgstr "Div"
-#: gui/options.cpp:1186
+#: gui/options.cpp:1161
msgctxt "lowres"
msgid "Misc"
msgstr "Div"
-#: gui/options.cpp:1188
+#: gui/options.cpp:1163
msgid "Theme:"
msgstr "Tema:"
-#: gui/options.cpp:1192
+#: gui/options.cpp:1167
msgid "GUI Renderer:"
msgstr "GUI-teiknar:"
-#: gui/options.cpp:1204
+#: gui/options.cpp:1179
msgid "Autosave:"
msgstr "Autolagre:"
-#: gui/options.cpp:1206
+#: gui/options.cpp:1181
msgctxt "lowres"
msgid "Autosave:"
msgstr "Autolagre:"
-#: gui/options.cpp:1214
+#: gui/options.cpp:1189
msgid "Keys"
msgstr "Tastar"
-#: gui/options.cpp:1221
+#: gui/options.cpp:1196
msgid "GUI Language:"
msgstr "GUI-sprхk:"
-#: gui/options.cpp:1221
+#: gui/options.cpp:1196
msgid "Language of ScummVM GUI"
msgstr "Sprхk i ScummVM-GUIet"
-#: gui/options.cpp:1372
+#: gui/options.cpp:1347
#, fuzzy
msgid "You have to restart ScummVM before your changes will take effect."
msgstr "Du mх omstarte ScummVM for at endringane skal skje."
-#: gui/options.cpp:1385
+#: gui/options.cpp:1360
msgid "Select directory for savegames"
msgstr "Vel mappe for lagra spel"
-#: gui/options.cpp:1392
+#: gui/options.cpp:1367
msgid "The chosen directory cannot be written to. Please select another one."
msgstr "Den velde mappa kan ikkje skrivast til. Vennlegst vel ein annan."
-#: gui/options.cpp:1401
+#: gui/options.cpp:1376
msgid "Select directory for GUI themes"
msgstr "Vel ei mappe for GUI-tema:"
-#: gui/options.cpp:1411
+#: gui/options.cpp:1386
msgid "Select directory for extra files"
msgstr "Vel ei mappe for ekstra filer"
-#: gui/options.cpp:1422
+#: gui/options.cpp:1397
msgid "Select directory for plugins"
msgstr "Vel ei mappe for plugins"
-#: gui/options.cpp:1475
+#: gui/options.cpp:1450
msgid ""
"The theme you selected does not support your current language. If you want "
"to use this theme you need to switch to another language first."
@@ -963,64 +960,64 @@ msgstr "Ikkje navngjeven speltilstand"
msgid "Select a Theme"
msgstr "Vel eit tema"
-#: gui/ThemeEngine.cpp:333
+#: gui/ThemeEngine.cpp:335
msgid "Disabled GFX"
msgstr "Deaktivert GFX"
-#: gui/ThemeEngine.cpp:333
+#: gui/ThemeEngine.cpp:335
msgctxt "lowres"
msgid "Disabled GFX"
msgstr "Deaktivert GFX"
-#: gui/ThemeEngine.cpp:334
+#: gui/ThemeEngine.cpp:336
msgid "Standard Renderer (16bpp)"
msgstr "Standard Teiknar (16bpp)"
-#: gui/ThemeEngine.cpp:334
+#: gui/ThemeEngine.cpp:336
msgid "Standard (16bpp)"
msgstr "Standard (16bpp)"
-#: gui/ThemeEngine.cpp:336
+#: gui/ThemeEngine.cpp:338
msgid "Antialiased Renderer (16bpp)"
msgstr "Antialiased Teiknar (16bpp)"
-#: gui/ThemeEngine.cpp:336
+#: gui/ThemeEngine.cpp:338
msgid "Antialiased (16bpp)"
msgstr "Antialiased (16bpp)"
-#: gui/widget.cpp:312 gui/widget.cpp:314 gui/widget.cpp:320 gui/widget.cpp:322
+#: gui/widget.cpp:322 gui/widget.cpp:324 gui/widget.cpp:330 gui/widget.cpp:332
msgid "Clear value"
msgstr "Tјm verdi"
-#: base/main.cpp:203
+#: base/main.cpp:209
#, c-format
msgid "Engine does not support debug level '%s'"
msgstr "Motoren stјttar ikkje debug-nivх '%s'"
-#: base/main.cpp:275
+#: base/main.cpp:287
msgid "Menu"
msgstr "Meny"
-#: base/main.cpp:278 backends/platform/symbian/src/SymbianActions.cpp:45
+#: base/main.cpp:290 backends/platform/symbian/src/SymbianActions.cpp:45
#: backends/platform/wince/CEActionsPocket.cpp:45
#: backends/platform/wince/CEActionsSmartphone.cpp:46
msgid "Skip"
msgstr "Hopp over"
-#: base/main.cpp:281 backends/platform/symbian/src/SymbianActions.cpp:50
+#: base/main.cpp:293 backends/platform/symbian/src/SymbianActions.cpp:50
#: backends/platform/wince/CEActionsPocket.cpp:42
msgid "Pause"
msgstr "Pause"
-#: base/main.cpp:284
+#: base/main.cpp:296
msgid "Skip line"
msgstr "Hopp over linje"
-#: base/main.cpp:455
+#: base/main.cpp:467
msgid "Error running game:"
msgstr "Feil under kјyring av spel:"
-#: base/main.cpp:479
+#: base/main.cpp:491
msgid "Could not find any engine capable of running the selected game"
msgstr "Kunne ikkje finne nokon motor som kunne kјyre det velde spelet."
@@ -1089,16 +1086,16 @@ msgstr ""
msgid "Unknown error"
msgstr "Ukjend feil"
-#: engines/advancedDetector.cpp:296
+#: engines/advancedDetector.cpp:324
#, c-format
msgid "The game in '%s' seems to be unknown."
msgstr ""
-#: engines/advancedDetector.cpp:297
+#: engines/advancedDetector.cpp:325
msgid "Please, report the following data to the ScummVM team along with name"
msgstr ""
-#: engines/advancedDetector.cpp:299
+#: engines/advancedDetector.cpp:327
msgid "of the game you tried to add and its version/language/etc.:"
msgstr ""
@@ -1137,13 +1134,14 @@ msgctxt "lowres"
msgid "~R~eturn to Launcher"
msgstr "~T~ilbake til oppstarter"
-#: engines/dialogs.cpp:116 engines/cruise/menu.cpp:214
-#: engines/sci/engine/kfile.cpp:566
+#: engines/dialogs.cpp:116 engines/agi/saveload.cpp:805
+#: engines/cruise/menu.cpp:214 engines/sci/engine/kfile.cpp:567
msgid "Save game:"
msgstr "Lagra spel:"
-#: engines/dialogs.cpp:116 engines/scumm/dialogs.cpp:187
-#: engines/cruise/menu.cpp:214 engines/sci/engine/kfile.cpp:566
+#: engines/dialogs.cpp:116 engines/agi/saveload.cpp:805
+#: engines/scumm/dialogs.cpp:187 engines/cruise/menu.cpp:214
+#: engines/sci/engine/kfile.cpp:567
#: backends/platform/symbian/src/SymbianActions.cpp:44
#: backends/platform/wince/CEActionsPocket.cpp:43
#: backends/platform/wince/CEActionsPocket.cpp:267
@@ -1234,6 +1232,86 @@ msgstr ""
msgid "Start anyway"
msgstr ""
+#: engines/agi/detection.cpp:145 engines/dreamweb/detection.cpp:47
+#: engines/sci/detection.cpp:390
+msgid "Use original save/load screens"
+msgstr ""
+
+#: engines/agi/detection.cpp:146 engines/dreamweb/detection.cpp:48
+#: engines/sci/detection.cpp:391
+msgid "Use the original save/load screens, instead of the ScummVM ones"
+msgstr ""
+
+#: engines/agi/saveload.cpp:827 engines/sci/engine/kfile.cpp:674
+msgid "Restore game:"
+msgstr "Gjenopprett spel:"
+
+#: engines/agi/saveload.cpp:827 engines/sci/engine/kfile.cpp:674
+msgid "Restore"
+msgstr "Gjenopprett"
+
+#: engines/dreamweb/detection.cpp:57
+#, fuzzy
+msgid "Use bright palette mode"
+msgstr "иvre hјgre gjenstand"
+
+#: engines/dreamweb/detection.cpp:58
+msgid "Display graphics using the game's bright palette"
+msgstr ""
+
+#: engines/sci/detection.cpp:370
+msgid "EGA undithering"
+msgstr ""
+
+#: engines/sci/detection.cpp:371
+msgid "Enable undithering in EGA games"
+msgstr ""
+
+#: engines/sci/detection.cpp:380
+msgid "Prefer digital sound effects"
+msgstr ""
+
+#: engines/sci/detection.cpp:381
+msgid "Prefer digital sound effects instead of synthesized ones"
+msgstr ""
+
+#: engines/sci/detection.cpp:400
+msgid "Use IMF/Yahama FB-01 for MIDI output"
+msgstr ""
+
+#: engines/sci/detection.cpp:401
+msgid ""
+"Use an IBM Music Feature card or a Yahama FB-01 FM synth module for MIDI "
+"output"
+msgstr ""
+
+#: engines/sci/detection.cpp:411
+msgid "Use CD audio"
+msgstr ""
+
+#: engines/sci/detection.cpp:412
+msgid "Use CD audio instead of in-game audio, if available"
+msgstr ""
+
+#: engines/sci/detection.cpp:422
+msgid "Use Windows cursors"
+msgstr ""
+
+#: engines/sci/detection.cpp:423
+msgid ""
+"Use the Windows cursors (smaller and monochrome) instead of the DOS ones"
+msgstr ""
+
+#: engines/sci/detection.cpp:433
+#, fuzzy
+msgid "Use silver cursors"
+msgstr "Vanleg peikar"
+
+#: engines/sci/detection.cpp:434
+msgid ""
+"Use the alternate set of silver cursors, instead of the normal golden ones"
+msgstr ""
+
#: engines/scumm/dialogs.cpp:175
#, c-format
msgid "Insert Disk %c and Press Button to Continue."
@@ -1897,7 +1975,7 @@ msgid ""
"but %s is missing. Using AdLib instead."
msgstr ""
-#: engines/scumm/scumm.cpp:2271 engines/agos/saveload.cpp:189
+#: engines/scumm/scumm.cpp:2271 engines/agos/saveload.cpp:202
#, c-format
msgid ""
"Failed to save game state to file:\n"
@@ -1905,7 +1983,7 @@ msgid ""
"%s"
msgstr ""
-#: engines/scumm/scumm.cpp:2278 engines/agos/saveload.cpp:154
+#: engines/scumm/scumm.cpp:2278 engines/agos/saveload.cpp:167
#, c-format
msgid ""
"Failed to load game state from file:\n"
@@ -1913,7 +1991,7 @@ msgid ""
"%s"
msgstr ""
-#: engines/scumm/scumm.cpp:2290 engines/agos/saveload.cpp:197
+#: engines/scumm/scumm.cpp:2290 engines/agos/saveload.cpp:210
#, c-format
msgid ""
"Successfully saved game state in file:\n"
@@ -1958,14 +2036,6 @@ msgstr "ScummVM Hovudmeny"
msgid "~W~ater Effect Enabled"
msgstr "~V~anneffekt aktivert"
-#: engines/sci/engine/kfile.cpp:673
-msgid "Restore game:"
-msgstr "Gjenopprett spel:"
-
-#: engines/sci/engine/kfile.cpp:673
-msgid "Restore"
-msgstr "Gjenopprett"
-
#: engines/agos/animation.cpp:550
#, c-format
msgid "Cutscene file '%s' not found!"
@@ -1989,6 +2059,66 @@ msgstr ""
msgid "Failed to save game"
msgstr "Full speltittel:"
+#. I18N: Studio audience adds an applause and cheering sounds whenever
+#. Malcolm makes a joke.
+#: engines/kyra/detection.cpp:62
+msgid "Studio audience"
+msgstr ""
+
+#: engines/kyra/detection.cpp:63
+msgid "Enable studio audience"
+msgstr ""
+
+#. I18N: This option allows the user to skip text and cutscenes.
+#: engines/kyra/detection.cpp:73
+msgid "Skip support"
+msgstr ""
+
+#: engines/kyra/detection.cpp:74
+msgid "Allow text and cutscenes to be skipped"
+msgstr ""
+
+#. I18N: Helium mode makes people sound like they've inhaled Helium.
+#: engines/kyra/detection.cpp:84
+msgid "Helium mode"
+msgstr ""
+
+#: engines/kyra/detection.cpp:85
+#, fuzzy
+msgid "Enable helium mode"
+msgstr "Aktiver Roland GS-modus"
+
+#. I18N: When enabled, this option makes scrolling smoother when
+#. changing from one screen to another.
+#: engines/kyra/detection.cpp:99
+msgid "Smooth scrolling"
+msgstr ""
+
+#: engines/kyra/detection.cpp:100
+msgid "Enable smooth scrolling when walking"
+msgstr ""
+
+#. I18N: When enabled, this option changes the cursor when it floats to the
+#. edge of the screen to a directional arrow. The player can then click to
+#. walk towards that direction.
+#: engines/kyra/detection.cpp:112
+#, fuzzy
+msgid "Floating cursors"
+msgstr "Vanleg peikar"
+
+#: engines/kyra/detection.cpp:113
+msgid "Enable floating cursors"
+msgstr ""
+
+#. I18N: HP stands for Hit Points
+#: engines/kyra/detection.cpp:127
+msgid "HP bar graphs"
+msgstr ""
+
+#: engines/kyra/detection.cpp:128
+msgid "Enable hit point bar graphs"
+msgstr ""
+
#: engines/kyra/lol.cpp:478
msgid "Attack 1"
msgstr ""
@@ -2052,6 +2182,14 @@ msgid ""
"that a few tracks will not be correctly played."
msgstr ""
+#: engines/queen/queen.cpp:59 engines/sky/detection.cpp:44
+msgid "Floppy intro"
+msgstr ""
+
+#: engines/queen/queen.cpp:60 engines/sky/detection.cpp:45
+msgid "Use the floppy version's intro (CD version only)"
+msgstr ""
+
#: engines/sky/compact.cpp:130
msgid ""
"Unable to find \"sky.cpt\" file!\n"
@@ -2117,6 +2255,14 @@ msgid ""
"PSX cutscenes found but ScummVM has been built without RGB color support"
msgstr ""
+#: engines/sword2/sword2.cpp:79
+msgid "Show object labels"
+msgstr ""
+
+#: engines/sword2/sword2.cpp:80
+msgid "Show labels for objects on mouse hover"
+msgstr ""
+
#: engines/parallaction/saveload.cpp:133
#, c-format
msgid ""
@@ -2335,19 +2481,19 @@ msgstr ""
msgid "Disable power off"
msgstr "Deaktiver strјmsparing"
-#: backends/platform/iphone/osys_events.cpp:301
+#: backends/platform/iphone/osys_events.cpp:300
msgid "Mouse-click-and-drag mode enabled."
msgstr ""
-#: backends/platform/iphone/osys_events.cpp:303
+#: backends/platform/iphone/osys_events.cpp:302
msgid "Mouse-click-and-drag mode disabled."
msgstr ""
-#: backends/platform/iphone/osys_events.cpp:314
+#: backends/platform/iphone/osys_events.cpp:313
msgid "Touchpad mode enabled."
msgstr ""
-#: backends/platform/iphone/osys_events.cpp:316
+#: backends/platform/iphone/osys_events.cpp:315
msgid "Touchpad mode disabled."
msgstr ""
@@ -2429,15 +2575,15 @@ msgstr "Veksle grafikkfiltre"
msgid "Windowed mode"
msgstr "Teiknemodus:"
-#: backends/graphics/opengl/opengl-graphics.cpp:130
+#: backends/graphics/opengl/opengl-graphics.cpp:135
msgid "OpenGL Normal"
msgstr "OpenGL Normal"
-#: backends/graphics/opengl/opengl-graphics.cpp:131
+#: backends/graphics/opengl/opengl-graphics.cpp:136
msgid "OpenGL Conserve"
msgstr "OpenGL Bevar"
-#: backends/graphics/opengl/opengl-graphics.cpp:132
+#: backends/graphics/opengl/opengl-graphics.cpp:137
msgid "OpenGL Original"
msgstr "OpenGL Original"
diff --git a/po/pl_PL.po b/po/pl_PL.po
index d74c40f47d..94929760cc 100644
--- a/po/pl_PL.po
+++ b/po/pl_PL.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ScummVM 1.3.0\n"
"Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n"
-"POT-Creation-Date: 2012-03-07 22:09+0000\n"
+"POT-Creation-Date: 2012-05-20 22:39+0100\n"
"PO-Revision-Date: 2011-10-24 21:14+0100\n"
"Last-Translator: MichaГ ZiБbkowski <mziab@o2.pl>\n"
"Language-Team: Grajpopolsku.pl <grajpopolsku@gmail.com>\n"
@@ -47,7 +47,7 @@ msgid "Go up"
msgstr "W gѓrъ"
#: gui/browser.cpp:69 gui/chooser.cpp:45 gui/KeysDialog.cpp:43
-#: gui/launcher.cpp:320 gui/massadd.cpp:94 gui/options.cpp:1253
+#: gui/launcher.cpp:345 gui/massadd.cpp:94 gui/options.cpp:1228
#: gui/saveload.cpp:63 gui/saveload.cpp:155 gui/themebrowser.cpp:54
#: engines/engine.cpp:442 engines/scumm/dialogs.cpp:190
#: engines/sword1/control.cpp:865 engines/parallaction/saveload.cpp:281
@@ -72,15 +72,15 @@ msgstr "Zamknij"
msgid "Mouse click"
msgstr "Klikniъcie"
-#: gui/gui-manager.cpp:122 base/main.cpp:288
+#: gui/gui-manager.cpp:122 base/main.cpp:300
msgid "Display keyboard"
msgstr "WyЖwietl klawiaturъ"
-#: gui/gui-manager.cpp:126 base/main.cpp:292
+#: gui/gui-manager.cpp:126 base/main.cpp:304
msgid "Remap keys"
msgstr "Dostosuj klawisze"
-#: gui/gui-manager.cpp:129 base/main.cpp:295
+#: gui/gui-manager.cpp:129 base/main.cpp:307
#, fuzzy
msgid "Toggle FullScreen"
msgstr "WГБcz/wyГБcz peГny ekran"
@@ -93,8 +93,8 @@ msgstr "Wybierz akcjъ do przypisania"
msgid "Map"
msgstr "Przypisz"
-#: gui/KeysDialog.cpp:42 gui/launcher.cpp:321 gui/launcher.cpp:960
-#: gui/launcher.cpp:964 gui/massadd.cpp:91 gui/options.cpp:1254
+#: gui/KeysDialog.cpp:42 gui/launcher.cpp:346 gui/launcher.cpp:1001
+#: gui/launcher.cpp:1005 gui/massadd.cpp:91 gui/options.cpp:1229
#: engines/engine.cpp:361 engines/engine.cpp:372 engines/scumm/dialogs.cpp:192
#: engines/scumm/scumm.cpp:1775 engines/agos/animation.cpp:551
#: engines/groovie/script.cpp:420 engines/sky/compact.cpp:131
@@ -131,15 +131,15 @@ msgstr "Wybierz akcjъ"
msgid "Press the key to associate"
msgstr "WciЖnij klawisz do przypisania"
-#: gui/launcher.cpp:170
+#: gui/launcher.cpp:187
msgid "Game"
msgstr "Gra"
-#: gui/launcher.cpp:174
+#: gui/launcher.cpp:191
msgid "ID:"
msgstr "ID:"
-#: gui/launcher.cpp:174 gui/launcher.cpp:176 gui/launcher.cpp:177
+#: gui/launcher.cpp:191 gui/launcher.cpp:193 gui/launcher.cpp:194
msgid ""
"Short game identifier used for referring to savegames and running the game "
"from the command line"
@@ -147,315 +147,320 @@ msgstr ""
"Krѓtki identyfikator gry uПywany do rozpoznawania zapisѓw i uruchamiania gry "
"z linii komend"
-#: gui/launcher.cpp:176
+#: gui/launcher.cpp:193
msgctxt "lowres"
msgid "ID:"
msgstr "ID:"
-#: gui/launcher.cpp:181
+#: gui/launcher.cpp:198
msgid "Name:"
msgstr "Nazwa:"
-#: gui/launcher.cpp:181 gui/launcher.cpp:183 gui/launcher.cpp:184
+#: gui/launcher.cpp:198 gui/launcher.cpp:200 gui/launcher.cpp:201
msgid "Full title of the game"
msgstr "PeГny tytuГ gry:"
-#: gui/launcher.cpp:183
+#: gui/launcher.cpp:200
msgctxt "lowres"
msgid "Name:"
msgstr "Nazwa:"
-#: gui/launcher.cpp:187
+#: gui/launcher.cpp:204
msgid "Language:"
msgstr "Jъzyk:"
-#: gui/launcher.cpp:187 gui/launcher.cpp:188
+#: gui/launcher.cpp:204 gui/launcher.cpp:205
msgid ""
"Language of the game. This will not turn your Spanish game version into "
"English"
msgstr "Jъzyk gry. Nie zmieni to hiszpaёskiej wersji gry w angielskБ."
-#: gui/launcher.cpp:189 gui/launcher.cpp:203 gui/options.cpp:80
-#: gui/options.cpp:745 gui/options.cpp:758 gui/options.cpp:1224
+#: gui/launcher.cpp:206 gui/launcher.cpp:220 gui/options.cpp:80
+#: gui/options.cpp:730 gui/options.cpp:743 gui/options.cpp:1199
#: audio/null.cpp:40
msgid "<default>"
msgstr "<domyЖlne>"
-#: gui/launcher.cpp:199
+#: gui/launcher.cpp:216
msgid "Platform:"
msgstr "Platforma:"
-#: gui/launcher.cpp:199 gui/launcher.cpp:201 gui/launcher.cpp:202
+#: gui/launcher.cpp:216 gui/launcher.cpp:218 gui/launcher.cpp:219
msgid "Platform the game was originally designed for"
msgstr "Platforma, na ktѓrБ stworzono grъ"
-#: gui/launcher.cpp:201
+#: gui/launcher.cpp:218
msgctxt "lowres"
msgid "Platform:"
msgstr "Platforma:"
-#: gui/launcher.cpp:213 gui/options.cpp:1087 gui/options.cpp:1104
+#: gui/launcher.cpp:231
+#, fuzzy
+msgid "Engine"
+msgstr "Zbadaj"
+
+#: gui/launcher.cpp:239 gui/options.cpp:1062 gui/options.cpp:1079
msgid "Graphics"
msgstr "Grafika"
-#: gui/launcher.cpp:213 gui/options.cpp:1087 gui/options.cpp:1104
+#: gui/launcher.cpp:239 gui/options.cpp:1062 gui/options.cpp:1079
msgid "GFX"
msgstr "Grafika"
-#: gui/launcher.cpp:216
+#: gui/launcher.cpp:242
msgid "Override global graphic settings"
msgstr "UПyj wГasnych ustawieё grafiki"
-#: gui/launcher.cpp:218
+#: gui/launcher.cpp:244
msgctxt "lowres"
msgid "Override global graphic settings"
msgstr "UПyj wГasnych ustawieё grafiki"
-#: gui/launcher.cpp:225 gui/options.cpp:1110
+#: gui/launcher.cpp:251 gui/options.cpp:1085
msgid "Audio"
msgstr "DМwiъk"
-#: gui/launcher.cpp:228
+#: gui/launcher.cpp:254
msgid "Override global audio settings"
msgstr "UПyj wГasnych ustawieё dМwiъku"
-#: gui/launcher.cpp:230
+#: gui/launcher.cpp:256
msgctxt "lowres"
msgid "Override global audio settings"
msgstr "UПyj wГasnych ustawieё dМwiъku"
-#: gui/launcher.cpp:239 gui/options.cpp:1115
+#: gui/launcher.cpp:265 gui/options.cpp:1090
msgid "Volume"
msgstr "GГoЖnoЖц"
-#: gui/launcher.cpp:241 gui/options.cpp:1117
+#: gui/launcher.cpp:267 gui/options.cpp:1092
msgctxt "lowres"
msgid "Volume"
msgstr "GГoЖnoЖц"
-#: gui/launcher.cpp:244
+#: gui/launcher.cpp:270
msgid "Override global volume settings"
msgstr "UПyj wГasnych ustawieё gГoЖnoЖci"
-#: gui/launcher.cpp:246
+#: gui/launcher.cpp:272
msgctxt "lowres"
msgid "Override global volume settings"
msgstr "UПyj wГasnych ustawieё gГoЖnoЖci"
-#: gui/launcher.cpp:254 gui/options.cpp:1125
+#: gui/launcher.cpp:280 gui/options.cpp:1100
msgid "MIDI"
msgstr "MIDI"
-#: gui/launcher.cpp:257
+#: gui/launcher.cpp:283
msgid "Override global MIDI settings"
msgstr "UПyj wГasnych ustawieё MIDI"
-#: gui/launcher.cpp:259
+#: gui/launcher.cpp:285
msgctxt "lowres"
msgid "Override global MIDI settings"
msgstr "UПyj wГasnych ustawieё MIDI"
-#: gui/launcher.cpp:268 gui/options.cpp:1131
+#: gui/launcher.cpp:294 gui/options.cpp:1106
msgid "MT-32"
msgstr "MT-32"
-#: gui/launcher.cpp:271
+#: gui/launcher.cpp:297
msgid "Override global MT-32 settings"
msgstr "UПyj wГasnych ustawieё MT-32"
-#: gui/launcher.cpp:273
+#: gui/launcher.cpp:299
msgctxt "lowres"
msgid "Override global MT-32 settings"
msgstr "UПyj wГasnych ustawieё MT-32"
-#: gui/launcher.cpp:282 gui/options.cpp:1138
+#: gui/launcher.cpp:308 gui/options.cpp:1113
msgid "Paths"
msgstr "ІcieПki"
-#: gui/launcher.cpp:284 gui/options.cpp:1140
+#: gui/launcher.cpp:310 gui/options.cpp:1115
msgctxt "lowres"
msgid "Paths"
msgstr "ІcieПki"
-#: gui/launcher.cpp:291
+#: gui/launcher.cpp:317
msgid "Game Path:"
msgstr "ІcieПka gry:"
-#: gui/launcher.cpp:293
+#: gui/launcher.cpp:319
msgctxt "lowres"
msgid "Game Path:"
msgstr "ІcieПka gry:"
-#: gui/launcher.cpp:298 gui/options.cpp:1164
+#: gui/launcher.cpp:324 gui/options.cpp:1139
msgid "Extra Path:"
msgstr "Іc. dodatkѓw:"
-#: gui/launcher.cpp:298 gui/launcher.cpp:300 gui/launcher.cpp:301
+#: gui/launcher.cpp:324 gui/launcher.cpp:326 gui/launcher.cpp:327
msgid "Specifies path to additional data used the game"
msgstr "OkreЖla ЖcieПkъ dodatkowych danych gry"
-#: gui/launcher.cpp:300 gui/options.cpp:1166
+#: gui/launcher.cpp:326 gui/options.cpp:1141
msgctxt "lowres"
msgid "Extra Path:"
msgstr "Іc. dodatkѓw:"
-#: gui/launcher.cpp:307 gui/options.cpp:1148
+#: gui/launcher.cpp:333 gui/options.cpp:1123
msgid "Save Path:"
msgstr "ІcieПka zapisѓw:"
-#: gui/launcher.cpp:307 gui/launcher.cpp:309 gui/launcher.cpp:310
-#: gui/options.cpp:1148 gui/options.cpp:1150 gui/options.cpp:1151
+#: gui/launcher.cpp:333 gui/launcher.cpp:335 gui/launcher.cpp:336
+#: gui/options.cpp:1123 gui/options.cpp:1125 gui/options.cpp:1126
msgid "Specifies where your savegames are put"
msgstr "OkreЖla gdzie zapisywaц stan gry"
-#: gui/launcher.cpp:309 gui/options.cpp:1150
+#: gui/launcher.cpp:335 gui/options.cpp:1125
msgctxt "lowres"
msgid "Save Path:"
msgstr "ІcieПka zapisѓw:"
-#: gui/launcher.cpp:329 gui/launcher.cpp:416 gui/launcher.cpp:469
-#: gui/launcher.cpp:523 gui/options.cpp:1159 gui/options.cpp:1167
-#: gui/options.cpp:1176 gui/options.cpp:1283 gui/options.cpp:1289
-#: gui/options.cpp:1297 gui/options.cpp:1327 gui/options.cpp:1333
-#: gui/options.cpp:1340 gui/options.cpp:1433 gui/options.cpp:1436
-#: gui/options.cpp:1448
+#: gui/launcher.cpp:354 gui/launcher.cpp:453 gui/launcher.cpp:511
+#: gui/launcher.cpp:565 gui/options.cpp:1134 gui/options.cpp:1142
+#: gui/options.cpp:1151 gui/options.cpp:1258 gui/options.cpp:1264
+#: gui/options.cpp:1272 gui/options.cpp:1302 gui/options.cpp:1308
+#: gui/options.cpp:1315 gui/options.cpp:1408 gui/options.cpp:1411
+#: gui/options.cpp:1423
msgctxt "path"
msgid "None"
msgstr "Brak"
-#: gui/launcher.cpp:334 gui/launcher.cpp:422 gui/launcher.cpp:527
-#: gui/options.cpp:1277 gui/options.cpp:1321 gui/options.cpp:1439
+#: gui/launcher.cpp:359 gui/launcher.cpp:459 gui/launcher.cpp:569
+#: gui/options.cpp:1252 gui/options.cpp:1296 gui/options.cpp:1414
#: backends/platform/wii/options.cpp:56
msgid "Default"
msgstr "DomyЖlnie"
-#: gui/launcher.cpp:462 gui/options.cpp:1442
+#: gui/launcher.cpp:504 gui/options.cpp:1417
msgid "Select SoundFont"
msgstr "Wybierz SoundFont"
-#: gui/launcher.cpp:481 gui/launcher.cpp:636
+#: gui/launcher.cpp:523 gui/launcher.cpp:677
msgid "Select directory with game data"
msgstr "Wybierz katalog z plikami gry"
-#: gui/launcher.cpp:499
+#: gui/launcher.cpp:541
msgid "Select additional game directory"
msgstr "Wybierz dodatkowy katalog gry"
-#: gui/launcher.cpp:511
+#: gui/launcher.cpp:553
msgid "Select directory for saved games"
msgstr "Wybierz katalog dla zapisѓw"
-#: gui/launcher.cpp:538
+#: gui/launcher.cpp:580
msgid "This game ID is already taken. Please choose another one."
msgstr "Identyfikator jest juП zajъty. Wybierz inny."
-#: gui/launcher.cpp:579 engines/dialogs.cpp:110
+#: gui/launcher.cpp:621 engines/dialogs.cpp:110
msgid "~Q~uit"
msgstr "~Z~akoёcz"
-#: gui/launcher.cpp:579 backends/platform/sdl/macosx/appmenu_osx.mm:96
+#: gui/launcher.cpp:621 backends/platform/sdl/macosx/appmenu_osx.mm:96
msgid "Quit ScummVM"
msgstr "Zakoёcz ScummVM"
-#: gui/launcher.cpp:580
+#: gui/launcher.cpp:622
msgid "A~b~out..."
msgstr "I~n~formacje..."
-#: gui/launcher.cpp:580 backends/platform/sdl/macosx/appmenu_osx.mm:70
+#: gui/launcher.cpp:622 backends/platform/sdl/macosx/appmenu_osx.mm:70
msgid "About ScummVM"
msgstr "KsiБПka ScummVM"
-#: gui/launcher.cpp:581
+#: gui/launcher.cpp:623
msgid "~O~ptions..."
msgstr "~O~pcje..."
-#: gui/launcher.cpp:581
+#: gui/launcher.cpp:623
msgid "Change global ScummVM options"
msgstr "Zmieё ustawienia ScummVM"
-#: gui/launcher.cpp:583
+#: gui/launcher.cpp:625
msgid "~S~tart"
msgstr "~S~tart"
-#: gui/launcher.cpp:583
+#: gui/launcher.cpp:625
msgid "Start selected game"
msgstr "Rozpocznij wybranБ grъ"
-#: gui/launcher.cpp:586
+#: gui/launcher.cpp:628
msgid "~L~oad..."
msgstr "~W~czytaj..."
-#: gui/launcher.cpp:586
+#: gui/launcher.cpp:628
msgid "Load savegame for selected game"
msgstr "Wczytaj zapis wybranej gry"
-#: gui/launcher.cpp:591 gui/launcher.cpp:1079
+#: gui/launcher.cpp:633 gui/launcher.cpp:1120
msgid "~A~dd Game..."
msgstr "~D~odaj grъ..."
-#: gui/launcher.cpp:591 gui/launcher.cpp:598
+#: gui/launcher.cpp:633 gui/launcher.cpp:640
msgid "Hold Shift for Mass Add"
msgstr "Przytrzymaj Shift, by dodawaц zbiorowo"
-#: gui/launcher.cpp:593
+#: gui/launcher.cpp:635
msgid "~E~dit Game..."
msgstr "~E~dytuj grъ..."
-#: gui/launcher.cpp:593 gui/launcher.cpp:600
+#: gui/launcher.cpp:635 gui/launcher.cpp:642
msgid "Change game options"
msgstr "Zmieё opcje gry"
-#: gui/launcher.cpp:595
+#: gui/launcher.cpp:637
msgid "~R~emove Game"
msgstr "~U~suё grъ"
-#: gui/launcher.cpp:595 gui/launcher.cpp:602
+#: gui/launcher.cpp:637 gui/launcher.cpp:644
msgid "Remove game from the list. The game data files stay intact"
msgstr "Usuwa grъ z listy. Pliki gry pozostajБ nietkniъte"
-#: gui/launcher.cpp:598 gui/launcher.cpp:1079
+#: gui/launcher.cpp:640 gui/launcher.cpp:1120
msgctxt "lowres"
msgid "~A~dd Game..."
msgstr "~D~odaj grъ..."
-#: gui/launcher.cpp:600
+#: gui/launcher.cpp:642
msgctxt "lowres"
msgid "~E~dit Game..."
msgstr "~E~dytuj grъ..."
-#: gui/launcher.cpp:602
+#: gui/launcher.cpp:644
msgctxt "lowres"
msgid "~R~emove Game"
msgstr "~U~suё grъ"
-#: gui/launcher.cpp:610
+#: gui/launcher.cpp:652
msgid "Search in game list"
msgstr "Wyszukaj grъ na liЖcie"
-#: gui/launcher.cpp:614 gui/launcher.cpp:1126
+#: gui/launcher.cpp:656 gui/launcher.cpp:1167
msgid "Search:"
msgstr "Szukaj"
-#: gui/launcher.cpp:639 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255
+#: gui/launcher.cpp:680 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255
#: engines/mohawk/riven.cpp:716 engines/cruise/menu.cpp:216
msgid "Load game:"
msgstr "Wczytaj grъ:"
-#: gui/launcher.cpp:639 engines/dialogs.cpp:114 engines/scumm/dialogs.cpp:188
+#: gui/launcher.cpp:680 engines/dialogs.cpp:114 engines/scumm/dialogs.cpp:188
#: engines/mohawk/myst.cpp:255 engines/mohawk/riven.cpp:716
#: engines/cruise/menu.cpp:216 backends/platform/wince/CEActionsPocket.cpp:267
#: backends/platform/wince/CEActionsSmartphone.cpp:231
msgid "Load"
msgstr "Wczytaj"
-#: gui/launcher.cpp:747
+#: gui/launcher.cpp:788
msgid ""
"Do you really want to run the mass game detector? This could potentially add "
"a huge number of games."
msgstr ""
"Chcesz uruchomiц masowy detektor gier? MoПe dodaц wiele tytuГѓw do listy"
-#: gui/launcher.cpp:748 gui/launcher.cpp:896
+#: gui/launcher.cpp:789 gui/launcher.cpp:937
#: backends/events/symbiansdl/symbiansdl-events.cpp:184
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
@@ -463,7 +468,7 @@ msgstr ""
msgid "Yes"
msgstr "Tak"
-#: gui/launcher.cpp:748 gui/launcher.cpp:896
+#: gui/launcher.cpp:789 gui/launcher.cpp:937
#: backends/events/symbiansdl/symbiansdl-events.cpp:184
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
@@ -471,36 +476,36 @@ msgstr "Tak"
msgid "No"
msgstr "Nie"
-#: gui/launcher.cpp:796
+#: gui/launcher.cpp:837
msgid "ScummVM couldn't open the specified directory!"
msgstr "ScummVM nie moПe otworzyц katalogu!"
-#: gui/launcher.cpp:808
+#: gui/launcher.cpp:849
msgid "ScummVM could not find any game in the specified directory!"
msgstr "ScummVM nie znalazГ Пadnej gry w tym katalogu!"
-#: gui/launcher.cpp:822
+#: gui/launcher.cpp:863
msgid "Pick the game:"
msgstr "Wybierz grъ:"
-#: gui/launcher.cpp:896
+#: gui/launcher.cpp:937
msgid "Do you really want to remove this game configuration?"
msgstr "Na pewno chcesz usunБц tъ grъ z konfiguracji?"
-#: gui/launcher.cpp:960
+#: gui/launcher.cpp:1001
msgid "This game does not support loading games from the launcher."
msgstr "Ta gra nie wspiera wczytywania z launchera."
-#: gui/launcher.cpp:964
+#: gui/launcher.cpp:1005
msgid "ScummVM could not find any engine capable of running the selected game!"
msgstr "ScummVM nie znalazГ silnika zdolnego uruchomiц wybranБ grъ!"
-#: gui/launcher.cpp:1078
+#: gui/launcher.cpp:1119
msgctxt "lowres"
msgid "Mass Add..."
msgstr "Masowe dodawanie..."
-#: gui/launcher.cpp:1078
+#: gui/launcher.cpp:1119
msgid "Mass Add..."
msgstr "Masowe dodawanie..."
@@ -567,101 +572,93 @@ msgstr "44 kHz"
msgid "48 kHz"
msgstr "48 kHz"
-#: gui/options.cpp:257 gui/options.cpp:485 gui/options.cpp:586
-#: gui/options.cpp:659 gui/options.cpp:868
+#: gui/options.cpp:248 gui/options.cpp:474 gui/options.cpp:575
+#: gui/options.cpp:644 gui/options.cpp:852
msgctxt "soundfont"
msgid "None"
msgstr "Brak"
-#: gui/options.cpp:393
+#: gui/options.cpp:382
msgid "Failed to apply some of the graphic options changes:"
msgstr "Nie udaГo siъ zastosowaц czъЖci zmian opcji grafiki:"
-#: gui/options.cpp:405
+#: gui/options.cpp:394
msgid "the video mode could not be changed."
msgstr "nie udaГo siъ zmieniц trybu wideo."
-#: gui/options.cpp:411
+#: gui/options.cpp:400
msgid "the fullscreen setting could not be changed"
msgstr "nie udaГo siъ zmieniц trybu peГnoekranowego"
-#: gui/options.cpp:417
+#: gui/options.cpp:406
msgid "the aspect ratio setting could not be changed"
msgstr "nie udaГo siъ zmieniц formatu obrazu"
-#: gui/options.cpp:742
+#: gui/options.cpp:727
msgid "Graphics mode:"
msgstr "Tryb grafiki:"
-#: gui/options.cpp:756
+#: gui/options.cpp:741
msgid "Render mode:"
msgstr "Renderer:"
-#: gui/options.cpp:756 gui/options.cpp:757
+#: gui/options.cpp:741 gui/options.cpp:742
msgid "Special dithering modes supported by some games"
msgstr "Specjalne tryby ditheringu wspierane przez niektѓre gry"
-#: gui/options.cpp:768
+#: gui/options.cpp:753
#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2248
#: backends/graphics/openglsdl/openglsdl-graphics.cpp:472
msgid "Fullscreen mode"
msgstr "PeГny ekran"
-#: gui/options.cpp:771
+#: gui/options.cpp:756
msgid "Aspect ratio correction"
msgstr "Korekcja formatu obrazu"
-#: gui/options.cpp:771
+#: gui/options.cpp:756
msgid "Correct aspect ratio for 320x200 games"
msgstr "Korekcja formatu obrazu dla gier 320x200"
-#: gui/options.cpp:772
-msgid "EGA undithering"
-msgstr "Anty-dithering EGA"
-
-#: gui/options.cpp:772
-msgid "Enable undithering in EGA games that support it"
-msgstr "WГБcz anty-dithering we wspieranych grach EGA"
-
-#: gui/options.cpp:780
+#: gui/options.cpp:764
msgid "Preferred Device:"
msgstr "Pref. urzБdzenie:"
-#: gui/options.cpp:780
+#: gui/options.cpp:764
msgid "Music Device:"
msgstr "Urz. muzyczne:"
-#: gui/options.cpp:780 gui/options.cpp:782
+#: gui/options.cpp:764 gui/options.cpp:766
msgid "Specifies preferred sound device or sound card emulator"
msgstr "OkreЖla preferowane urzБdzenie dМwiъkowe lub emulator karty dМwiъkowej"
-#: gui/options.cpp:780 gui/options.cpp:782 gui/options.cpp:783
+#: gui/options.cpp:764 gui/options.cpp:766 gui/options.cpp:767
msgid "Specifies output sound device or sound card emulator"
msgstr "OkreЖla wyjЖciowe urzБdzenie dМwiъkowe lub emulator karty dМwiъkowej"
-#: gui/options.cpp:782
+#: gui/options.cpp:766
msgctxt "lowres"
msgid "Preferred Dev.:"
msgstr "Pref. urzБdzenie:"
-#: gui/options.cpp:782
+#: gui/options.cpp:766
msgctxt "lowres"
msgid "Music Device:"
msgstr "Urz. muzyczne:"
-#: gui/options.cpp:809
+#: gui/options.cpp:793
msgid "AdLib emulator:"
msgstr "Emulator AdLib:"
-#: gui/options.cpp:809 gui/options.cpp:810
+#: gui/options.cpp:793 gui/options.cpp:794
msgid "AdLib is used for music in many games"
msgstr "AdLib jest uПywany do muzyki w wielu grach"
-#: gui/options.cpp:820
+#: gui/options.cpp:804
msgid "Output rate:"
msgstr "Czъst. wyj.:"
-#: gui/options.cpp:820 gui/options.cpp:821
+#: gui/options.cpp:804 gui/options.cpp:805
msgid ""
"Higher value specifies better sound quality but may be not supported by your "
"soundcard"
@@ -669,63 +666,63 @@ msgstr ""
"WyПsze wartoЖci dajБ lepszБ jakoЖц dМwiъku, ale mogБ byц nieobsГugiwane "
"przez twojБ kartъ dМwiъkowБ"
-#: gui/options.cpp:831
+#: gui/options.cpp:815
msgid "GM Device:"
msgstr "UrzБdzenie GM:"
-#: gui/options.cpp:831
+#: gui/options.cpp:815
msgid "Specifies default sound device for General MIDI output"
msgstr "OkreЖla domyЖlne urzБdzenie dМwiъkowe dla wyjЖcia General MIDI"
-#: gui/options.cpp:842
+#: gui/options.cpp:826
msgid "Don't use General MIDI music"
msgstr "Nie uПywaj muzyki General MIDI"
-#: gui/options.cpp:853 gui/options.cpp:915
+#: gui/options.cpp:837 gui/options.cpp:899
msgid "Use first available device"
msgstr "UПyj pierwszego dostъpnego urzБdzenia"
-#: gui/options.cpp:865
+#: gui/options.cpp:849
msgid "SoundFont:"
msgstr "SoundFont:"
-#: gui/options.cpp:865 gui/options.cpp:867 gui/options.cpp:868
+#: gui/options.cpp:849 gui/options.cpp:851 gui/options.cpp:852
msgid "SoundFont is supported by some audio cards, Fluidsynth and Timidity"
msgstr ""
"SoundFont jest wspierany przez niektѓre karty dМwiъkowe, Fluidsynth i "
"Timidity"
-#: gui/options.cpp:867
+#: gui/options.cpp:851
msgctxt "lowres"
msgid "SoundFont:"
msgstr "SoundFont:"
-#: gui/options.cpp:873
+#: gui/options.cpp:857
msgid "Mixed AdLib/MIDI mode"
msgstr "Tryb miksowanego AdLib/MIDI"
-#: gui/options.cpp:873
+#: gui/options.cpp:857
msgid "Use both MIDI and AdLib sound generation"
msgstr "UПywaj obu generatorѓw dМwiъku, MIDI i AdLib, jednoczeЖnie"
-#: gui/options.cpp:876
+#: gui/options.cpp:860
msgid "MIDI gain:"
msgstr "Wzm. MIDI:"
-#: gui/options.cpp:886
+#: gui/options.cpp:870
msgid "MT-32 Device:"
msgstr "UrzБdzenie MT-32:"
-#: gui/options.cpp:886
+#: gui/options.cpp:870
msgid "Specifies default sound device for Roland MT-32/LAPC1/CM32l/CM64 output"
msgstr ""
"OkreЖla domyЖlne urzБdzenie dМwiъku dla wyjЖcia Roland MT-32/LAPC1/CM32l/CM64"
-#: gui/options.cpp:891
+#: gui/options.cpp:875
msgid "True Roland MT-32 (disable GM emulation)"
msgstr "Prawdziwy Roland MT-32 (wyГБcz emulacjъ GM)"
-#: gui/options.cpp:891 gui/options.cpp:893
+#: gui/options.cpp:875 gui/options.cpp:877
msgid ""
"Check if you want to use your real hardware Roland-compatible sound device "
"connected to your computer"
@@ -733,191 +730,191 @@ msgstr ""
"Zaznacz, jeЖli chcesz uПywaц swojej prawdziwej karty kompatybilnej z Roland "
"podГБczonej do twojego komputera"
-#: gui/options.cpp:893
+#: gui/options.cpp:877
msgctxt "lowres"
msgid "True Roland MT-32 (no GM emulation)"
msgstr "Prawdziwy Roland MT-32 (brak emulacji GM)"
-#: gui/options.cpp:896
+#: gui/options.cpp:880
msgid "Enable Roland GS Mode"
msgstr "WГБcz tryb Roland GS"
-#: gui/options.cpp:896
+#: gui/options.cpp:880
msgid "Turns off General MIDI mapping for games with Roland MT-32 soundtrack"
msgstr ""
"WyГБcza mapowanie General MIDI dla gier ze ЖcieПkБ dМwiъkowБ Roland MT-32"
-#: gui/options.cpp:905
+#: gui/options.cpp:889
msgid "Don't use Roland MT-32 music"
msgstr "Nie uПywaj muzyki Roland MT-32"
-#: gui/options.cpp:932
+#: gui/options.cpp:916
msgid "Text and Speech:"
msgstr "Tekst i mowa:"
-#: gui/options.cpp:936 gui/options.cpp:946
+#: gui/options.cpp:920 gui/options.cpp:930
msgid "Speech"
msgstr "Mowa"
-#: gui/options.cpp:937 gui/options.cpp:947
+#: gui/options.cpp:921 gui/options.cpp:931
msgid "Subtitles"
msgstr "Napisy"
-#: gui/options.cpp:938
+#: gui/options.cpp:922
msgid "Both"
msgstr "Oba"
-#: gui/options.cpp:940
+#: gui/options.cpp:924
msgid "Subtitle speed:"
msgstr "Prъd. napisѓw:"
-#: gui/options.cpp:942
+#: gui/options.cpp:926
msgctxt "lowres"
msgid "Text and Speech:"
msgstr "Tekst i mowa:"
-#: gui/options.cpp:946
+#: gui/options.cpp:930
msgid "Spch"
msgstr "Mowa"
-#: gui/options.cpp:947
+#: gui/options.cpp:931
msgid "Subs"
msgstr "Napisy"
-#: gui/options.cpp:948
+#: gui/options.cpp:932
msgctxt "lowres"
msgid "Both"
msgstr "Oba"
-#: gui/options.cpp:948
+#: gui/options.cpp:932
msgid "Show subtitles and play speech"
msgstr "WyЖwietlaj napisy i odtwarzaj mowъ"
-#: gui/options.cpp:950
+#: gui/options.cpp:934
msgctxt "lowres"
msgid "Subtitle speed:"
msgstr "Prъd. napisѓw:"
-#: gui/options.cpp:966
+#: gui/options.cpp:950
msgid "Music volume:"
msgstr "GГoЖnoЖц muzyki:"
-#: gui/options.cpp:968
+#: gui/options.cpp:952
msgctxt "lowres"
msgid "Music volume:"
msgstr "GГoЖnoЖц muzyki:"
-#: gui/options.cpp:975
+#: gui/options.cpp:959
msgid "Mute All"
msgstr "Wycisz"
-#: gui/options.cpp:978
+#: gui/options.cpp:962
msgid "SFX volume:"
msgstr "GГ. efekt. dМw.:"
-#: gui/options.cpp:978 gui/options.cpp:980 gui/options.cpp:981
+#: gui/options.cpp:962 gui/options.cpp:964 gui/options.cpp:965
msgid "Special sound effects volume"
msgstr "GГoЖnoЖц efektѓw dМw."
-#: gui/options.cpp:980
+#: gui/options.cpp:964
msgctxt "lowres"
msgid "SFX volume:"
msgstr "GГ. efekt. dМw.:"
-#: gui/options.cpp:988
+#: gui/options.cpp:972
msgid "Speech volume:"
msgstr "GГoЖnoЖц mowy:"
-#: gui/options.cpp:990
+#: gui/options.cpp:974
msgctxt "lowres"
msgid "Speech volume:"
msgstr "GГoЖnoЖц mowy:"
-#: gui/options.cpp:1156
+#: gui/options.cpp:1131
msgid "Theme Path:"
msgstr "ІcieПka stylu:"
-#: gui/options.cpp:1158
+#: gui/options.cpp:1133
msgctxt "lowres"
msgid "Theme Path:"
msgstr "ІcieПka stylu:"
-#: gui/options.cpp:1164 gui/options.cpp:1166 gui/options.cpp:1167
+#: gui/options.cpp:1139 gui/options.cpp:1141 gui/options.cpp:1142
msgid "Specifies path to additional data used by all games or ScummVM"
msgstr "OkreЖla ЖcieПkъ dla dodatkowych danych dla wszystkich gier lub ScummVM"
-#: gui/options.cpp:1173
+#: gui/options.cpp:1148
msgid "Plugins Path:"
msgstr "ІcieПka wtyczek:"
-#: gui/options.cpp:1175
+#: gui/options.cpp:1150
msgctxt "lowres"
msgid "Plugins Path:"
msgstr "ІcieПka wtyczek:"
-#: gui/options.cpp:1184
+#: gui/options.cpp:1159
msgid "Misc"
msgstr "RѓПne"
-#: gui/options.cpp:1186
+#: gui/options.cpp:1161
msgctxt "lowres"
msgid "Misc"
msgstr "RѓПne"
-#: gui/options.cpp:1188
+#: gui/options.cpp:1163
msgid "Theme:"
msgstr "Styl:"
-#: gui/options.cpp:1192
+#: gui/options.cpp:1167
msgid "GUI Renderer:"
msgstr "Renderer interf.:"
-#: gui/options.cpp:1204
+#: gui/options.cpp:1179
msgid "Autosave:"
msgstr "Autozapis:"
-#: gui/options.cpp:1206
+#: gui/options.cpp:1181
msgctxt "lowres"
msgid "Autosave:"
msgstr "Autozapis:"
-#: gui/options.cpp:1214
+#: gui/options.cpp:1189
msgid "Keys"
msgstr "Klawisze"
-#: gui/options.cpp:1221
+#: gui/options.cpp:1196
msgid "GUI Language:"
msgstr "Jъzyk interfejsu:"
-#: gui/options.cpp:1221
+#: gui/options.cpp:1196
msgid "Language of ScummVM GUI"
msgstr "Jъzyk interfejsu ScummVM"
-#: gui/options.cpp:1372
+#: gui/options.cpp:1347
msgid "You have to restart ScummVM before your changes will take effect."
msgstr "Musisz zrestartowaц ScummVM, by zmiany zostaГy uwzglъdnione."
-#: gui/options.cpp:1385
+#: gui/options.cpp:1360
msgid "Select directory for savegames"
msgstr "Wybierz katalog zapisѓw"
-#: gui/options.cpp:1392
+#: gui/options.cpp:1367
msgid "The chosen directory cannot be written to. Please select another one."
msgstr "Ten katalog jest zabezpieczony przed zapisem. Wybierz inny."
-#: gui/options.cpp:1401
+#: gui/options.cpp:1376
msgid "Select directory for GUI themes"
msgstr "Wybierz katalog dla stylѓw GUI."
-#: gui/options.cpp:1411
+#: gui/options.cpp:1386
msgid "Select directory for extra files"
msgstr "Wybierz katalog dla dodatkowych plikѓw"
-#: gui/options.cpp:1422
+#: gui/options.cpp:1397
msgid "Select directory for plugins"
msgstr "Wybierz katalog dla wtyczek"
-#: gui/options.cpp:1475
+#: gui/options.cpp:1450
msgid ""
"The theme you selected does not support your current language. If you want "
"to use this theme you need to switch to another language first."
@@ -965,64 +962,64 @@ msgstr "Zapis bez nazwy"
msgid "Select a Theme"
msgstr "Wybierz styl"
-#: gui/ThemeEngine.cpp:333
+#: gui/ThemeEngine.cpp:335
msgid "Disabled GFX"
msgstr "WyГБczona grafika"
-#: gui/ThemeEngine.cpp:333
+#: gui/ThemeEngine.cpp:335
msgctxt "lowres"
msgid "Disabled GFX"
msgstr "WyГБczona grafika"
-#: gui/ThemeEngine.cpp:334
+#: gui/ThemeEngine.cpp:336
msgid "Standard Renderer (16bpp)"
msgstr "Standardowy renderer (16bpp)"
-#: gui/ThemeEngine.cpp:334
+#: gui/ThemeEngine.cpp:336
msgid "Standard (16bpp)"
msgstr "Standardowy (16bpp)"
-#: gui/ThemeEngine.cpp:336
+#: gui/ThemeEngine.cpp:338
msgid "Antialiased Renderer (16bpp)"
msgstr "WygГadzany renderer (16bpp)"
-#: gui/ThemeEngine.cpp:336
+#: gui/ThemeEngine.cpp:338
msgid "Antialiased (16bpp)"
msgstr "WygГadzany (16bpp)"
-#: gui/widget.cpp:312 gui/widget.cpp:314 gui/widget.cpp:320 gui/widget.cpp:322
+#: gui/widget.cpp:322 gui/widget.cpp:324 gui/widget.cpp:330 gui/widget.cpp:332
msgid "Clear value"
msgstr "WyczyЖц"
-#: base/main.cpp:203
+#: base/main.cpp:209
#, c-format
msgid "Engine does not support debug level '%s'"
msgstr "Silnik nie wspiera poziomu debugowania '%s'"
-#: base/main.cpp:275
+#: base/main.cpp:287
msgid "Menu"
msgstr "Menu"
-#: base/main.cpp:278 backends/platform/symbian/src/SymbianActions.cpp:45
+#: base/main.cpp:290 backends/platform/symbian/src/SymbianActions.cpp:45
#: backends/platform/wince/CEActionsPocket.cpp:45
#: backends/platform/wince/CEActionsSmartphone.cpp:46
msgid "Skip"
msgstr "Pomiё"
-#: base/main.cpp:281 backends/platform/symbian/src/SymbianActions.cpp:50
+#: base/main.cpp:293 backends/platform/symbian/src/SymbianActions.cpp:50
#: backends/platform/wince/CEActionsPocket.cpp:42
msgid "Pause"
msgstr "Wstrzymaj"
-#: base/main.cpp:284
+#: base/main.cpp:296
msgid "Skip line"
msgstr "Pomiё liniъ"
-#: base/main.cpp:455
+#: base/main.cpp:467
msgid "Error running game:"
msgstr "BГБd podczas uruchamiania gry:"
-#: base/main.cpp:479
+#: base/main.cpp:491
msgid "Could not find any engine capable of running the selected game"
msgstr "Nie udaГo siъ znaleМц silnika zdolnego do uruchomienia zaznaczonej gry"
@@ -1090,16 +1087,16 @@ msgstr "Przerwane przez uПytkownika"
msgid "Unknown error"
msgstr "Nieznany bГБd"
-#: engines/advancedDetector.cpp:296
+#: engines/advancedDetector.cpp:324
#, c-format
msgid "The game in '%s' seems to be unknown."
msgstr "Gra w '%s' wyglБda na nieznanБ."
-#: engines/advancedDetector.cpp:297
+#: engines/advancedDetector.cpp:325
msgid "Please, report the following data to the ScummVM team along with name"
msgstr "PrzekaП poniПsze dane zespoГowi ScummVM razem z nazwБ"
-#: engines/advancedDetector.cpp:299
+#: engines/advancedDetector.cpp:327
msgid "of the game you tried to add and its version/language/etc.:"
msgstr "gry, ktѓrБ prѓbowaГeЖ dodaц oraz jej wersjБ, jъzykiem itd.:"
@@ -1136,13 +1133,14 @@ msgctxt "lowres"
msgid "~R~eturn to Launcher"
msgstr "~P~owrѓt do launchera"
-#: engines/dialogs.cpp:116 engines/cruise/menu.cpp:214
-#: engines/sci/engine/kfile.cpp:566
+#: engines/dialogs.cpp:116 engines/agi/saveload.cpp:805
+#: engines/cruise/menu.cpp:214 engines/sci/engine/kfile.cpp:567
msgid "Save game:"
msgstr "Zapis:"
-#: engines/dialogs.cpp:116 engines/scumm/dialogs.cpp:187
-#: engines/cruise/menu.cpp:214 engines/sci/engine/kfile.cpp:566
+#: engines/dialogs.cpp:116 engines/agi/saveload.cpp:805
+#: engines/scumm/dialogs.cpp:187 engines/cruise/menu.cpp:214
+#: engines/sci/engine/kfile.cpp:567
#: backends/platform/symbian/src/SymbianActions.cpp:44
#: backends/platform/wince/CEActionsPocket.cpp:43
#: backends/platform/wince/CEActionsPocket.cpp:267
@@ -1249,6 +1247,88 @@ msgstr ""
msgid "Start anyway"
msgstr "WГБcz mimo tego"
+#: engines/agi/detection.cpp:145 engines/dreamweb/detection.cpp:47
+#: engines/sci/detection.cpp:390
+msgid "Use original save/load screens"
+msgstr ""
+
+#: engines/agi/detection.cpp:146 engines/dreamweb/detection.cpp:48
+#: engines/sci/detection.cpp:391
+msgid "Use the original save/load screens, instead of the ScummVM ones"
+msgstr ""
+
+#: engines/agi/saveload.cpp:827 engines/sci/engine/kfile.cpp:674
+msgid "Restore game:"
+msgstr "Wznѓw grъ:"
+
+#: engines/agi/saveload.cpp:827 engines/sci/engine/kfile.cpp:674
+msgid "Restore"
+msgstr "Wznѓw"
+
+#: engines/dreamweb/detection.cpp:57
+#, fuzzy
+msgid "Use bright palette mode"
+msgstr "Przedmiot u gѓry, z prawej"
+
+#: engines/dreamweb/detection.cpp:58
+msgid "Display graphics using the game's bright palette"
+msgstr ""
+
+#: engines/sci/detection.cpp:370
+msgid "EGA undithering"
+msgstr "Anty-dithering EGA"
+
+#: engines/sci/detection.cpp:371
+#, fuzzy
+msgid "Enable undithering in EGA games"
+msgstr "WГБcz anty-dithering we wspieranych grach EGA"
+
+#: engines/sci/detection.cpp:380
+#, fuzzy
+msgid "Prefer digital sound effects"
+msgstr "GГoЖnoЖц efektѓw dМw."
+
+#: engines/sci/detection.cpp:381
+msgid "Prefer digital sound effects instead of synthesized ones"
+msgstr ""
+
+#: engines/sci/detection.cpp:400
+msgid "Use IMF/Yahama FB-01 for MIDI output"
+msgstr ""
+
+#: engines/sci/detection.cpp:401
+msgid ""
+"Use an IBM Music Feature card or a Yahama FB-01 FM synth module for MIDI "
+"output"
+msgstr ""
+
+#: engines/sci/detection.cpp:411
+msgid "Use CD audio"
+msgstr ""
+
+#: engines/sci/detection.cpp:412
+msgid "Use CD audio instead of in-game audio, if available"
+msgstr ""
+
+#: engines/sci/detection.cpp:422
+msgid "Use Windows cursors"
+msgstr ""
+
+#: engines/sci/detection.cpp:423
+msgid ""
+"Use the Windows cursors (smaller and monochrome) instead of the DOS ones"
+msgstr ""
+
+#: engines/sci/detection.cpp:433
+#, fuzzy
+msgid "Use silver cursors"
+msgstr "ZwykГy kursor"
+
+#: engines/sci/detection.cpp:434
+msgid ""
+"Use the alternate set of silver cursors, instead of the normal golden ones"
+msgstr ""
+
#: engines/scumm/dialogs.cpp:175
#, c-format
msgid "Insert Disk %c and Press Button to Continue."
@@ -1906,7 +1986,7 @@ msgstr ""
"Natywne wsparcie MIDI wymaga aktualizacji Rolanda od LucasArts,\n"
"ale brakuje %s. PrzeГБczam na tryb AdLib."
-#: engines/scumm/scumm.cpp:2271 engines/agos/saveload.cpp:189
+#: engines/scumm/scumm.cpp:2271 engines/agos/saveload.cpp:202
#, c-format
msgid ""
"Failed to save game state to file:\n"
@@ -1917,7 +1997,7 @@ msgstr ""
"\n"
"%s"
-#: engines/scumm/scumm.cpp:2278 engines/agos/saveload.cpp:154
+#: engines/scumm/scumm.cpp:2278 engines/agos/saveload.cpp:167
#, c-format
msgid ""
"Failed to load game state from file:\n"
@@ -1928,7 +2008,7 @@ msgstr ""
"\n"
"%s"
-#: engines/scumm/scumm.cpp:2290 engines/agos/saveload.cpp:197
+#: engines/scumm/scumm.cpp:2290 engines/agos/saveload.cpp:210
#, c-format
msgid ""
"Successfully saved game state in file:\n"
@@ -1975,14 +2055,6 @@ msgstr "~M~enu gГѓwne"
msgid "~W~ater Effect Enabled"
msgstr "~E~fekty wody wГБczone"
-#: engines/sci/engine/kfile.cpp:673
-msgid "Restore game:"
-msgstr "Wznѓw grъ:"
-
-#: engines/sci/engine/kfile.cpp:673
-msgid "Restore"
-msgstr "Wznѓw"
-
#: engines/agos/animation.cpp:550
#, c-format
msgid "Cutscene file '%s' not found!"
@@ -2005,6 +2077,66 @@ msgstr "Nie udaГo siъ usunБц pliku."
msgid "Failed to save game"
msgstr "Nie udaГo siъ zapisaц stanu gry"
+#. I18N: Studio audience adds an applause and cheering sounds whenever
+#. Malcolm makes a joke.
+#: engines/kyra/detection.cpp:62
+msgid "Studio audience"
+msgstr ""
+
+#: engines/kyra/detection.cpp:63
+msgid "Enable studio audience"
+msgstr ""
+
+#. I18N: This option allows the user to skip text and cutscenes.
+#: engines/kyra/detection.cpp:73
+msgid "Skip support"
+msgstr ""
+
+#: engines/kyra/detection.cpp:74
+msgid "Allow text and cutscenes to be skipped"
+msgstr ""
+
+#. I18N: Helium mode makes people sound like they've inhaled Helium.
+#: engines/kyra/detection.cpp:84
+msgid "Helium mode"
+msgstr ""
+
+#: engines/kyra/detection.cpp:85
+#, fuzzy
+msgid "Enable helium mode"
+msgstr "WГБcz tryb Roland GS"
+
+#. I18N: When enabled, this option makes scrolling smoother when
+#. changing from one screen to another.
+#: engines/kyra/detection.cpp:99
+msgid "Smooth scrolling"
+msgstr ""
+
+#: engines/kyra/detection.cpp:100
+msgid "Enable smooth scrolling when walking"
+msgstr ""
+
+#. I18N: When enabled, this option changes the cursor when it floats to the
+#. edge of the screen to a directional arrow. The player can then click to
+#. walk towards that direction.
+#: engines/kyra/detection.cpp:112
+#, fuzzy
+msgid "Floating cursors"
+msgstr "ZwykГy kursor"
+
+#: engines/kyra/detection.cpp:113
+msgid "Enable floating cursors"
+msgstr ""
+
+#. I18N: HP stands for Hit Points
+#: engines/kyra/detection.cpp:127
+msgid "HP bar graphs"
+msgstr ""
+
+#: engines/kyra/detection.cpp:128
+msgid "Enable hit point bar graphs"
+msgstr ""
+
#: engines/kyra/lol.cpp:478
msgid "Attack 1"
msgstr ""
@@ -2072,6 +2204,14 @@ msgstr ""
"Prѓbujemy przypisaц instrumenty Rolanda MT32 do instrumentѓw General MIDI. "
"Niektѓre utwory mogБ byц Мle odtwarzane."
+#: engines/queen/queen.cpp:59 engines/sky/detection.cpp:44
+msgid "Floppy intro"
+msgstr ""
+
+#: engines/queen/queen.cpp:60 engines/sky/detection.cpp:45
+msgid "Use the floppy version's intro (CD version only)"
+msgstr ""
+
#: engines/sky/compact.cpp:130
msgid ""
"Unable to find \"sky.cpt\" file!\n"
@@ -2155,6 +2295,14 @@ msgstr ""
"Znaleziono przerywniki w formacie DXA, ale ScummVM jest skompilowany bez "
"obsГugi zlib"
+#: engines/sword2/sword2.cpp:79
+msgid "Show object labels"
+msgstr ""
+
+#: engines/sword2/sword2.cpp:80
+msgid "Show labels for objects on mouse hover"
+msgstr ""
+
#: engines/parallaction/saveload.cpp:133
#, c-format
msgid ""
@@ -2390,19 +2538,19 @@ msgstr "DМwiъk wysokiej jakoЖci (wolniejszy) (restart)"
msgid "Disable power off"
msgstr "Nie wyГБczaj zasilania"
-#: backends/platform/iphone/osys_events.cpp:301
+#: backends/platform/iphone/osys_events.cpp:300
msgid "Mouse-click-and-drag mode enabled."
msgstr "WГБczono tryb kliknij i przeciБgaj."
-#: backends/platform/iphone/osys_events.cpp:303
+#: backends/platform/iphone/osys_events.cpp:302
msgid "Mouse-click-and-drag mode disabled."
msgstr "WyГБczono tryb kliknij i przeciБgaj."
-#: backends/platform/iphone/osys_events.cpp:314
+#: backends/platform/iphone/osys_events.cpp:313
msgid "Touchpad mode enabled."
msgstr "Tryb touchpada wГБczony."
-#: backends/platform/iphone/osys_events.cpp:316
+#: backends/platform/iphone/osys_events.cpp:315
msgid "Touchpad mode disabled."
msgstr "Tryb touchpada wyГБczony."
@@ -2479,15 +2627,15 @@ msgstr "Aktywny filtr graficzny:"
msgid "Windowed mode"
msgstr "Okno"
-#: backends/graphics/opengl/opengl-graphics.cpp:130
+#: backends/graphics/opengl/opengl-graphics.cpp:135
msgid "OpenGL Normal"
msgstr "OpenGL - normalny"
-#: backends/graphics/opengl/opengl-graphics.cpp:131
+#: backends/graphics/opengl/opengl-graphics.cpp:136
msgid "OpenGL Conserve"
msgstr "OpenGL - zachowanie proporcji"
-#: backends/graphics/opengl/opengl-graphics.cpp:132
+#: backends/graphics/opengl/opengl-graphics.cpp:137
msgid "OpenGL Original"
msgstr "OpenGL - oryginalny rozmiar"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 16293a543f..2c3a530b30 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ScummVM 1.3.0svn\n"
"Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n"
-"POT-Creation-Date: 2012-03-07 22:09+0000\n"
+"POT-Creation-Date: 2012-05-20 22:39+0100\n"
"PO-Revision-Date: 2011-10-21 21:30-0300\n"
"Last-Translator: Saulo Benigno <saulobenigno@gmail.com>\n"
"Language-Team: ScummBR (www.scummbr.com) <scummbr@yahoo.com.br>\n"
@@ -47,7 +47,7 @@ msgid "Go up"
msgstr "Acima"
#: gui/browser.cpp:69 gui/chooser.cpp:45 gui/KeysDialog.cpp:43
-#: gui/launcher.cpp:320 gui/massadd.cpp:94 gui/options.cpp:1253
+#: gui/launcher.cpp:345 gui/massadd.cpp:94 gui/options.cpp:1228
#: gui/saveload.cpp:63 gui/saveload.cpp:155 gui/themebrowser.cpp:54
#: engines/engine.cpp:442 engines/scumm/dialogs.cpp:190
#: engines/sword1/control.cpp:865 engines/parallaction/saveload.cpp:281
@@ -72,15 +72,15 @@ msgstr "Fechar"
msgid "Mouse click"
msgstr "Clique do mouse"
-#: gui/gui-manager.cpp:122 base/main.cpp:288
+#: gui/gui-manager.cpp:122 base/main.cpp:300
msgid "Display keyboard"
msgstr "Mostrar teclado"
-#: gui/gui-manager.cpp:126 base/main.cpp:292
+#: gui/gui-manager.cpp:126 base/main.cpp:304
msgid "Remap keys"
msgstr "Remapear teclas"
-#: gui/gui-manager.cpp:129 base/main.cpp:295
+#: gui/gui-manager.cpp:129 base/main.cpp:307
#, fuzzy
msgid "Toggle FullScreen"
msgstr "Habilita Tela Cheia"
@@ -93,8 +93,8 @@ msgstr "Selecione uma aчуo para mapear"
msgid "Map"
msgstr "Mapear"
-#: gui/KeysDialog.cpp:42 gui/launcher.cpp:321 gui/launcher.cpp:960
-#: gui/launcher.cpp:964 gui/massadd.cpp:91 gui/options.cpp:1254
+#: gui/KeysDialog.cpp:42 gui/launcher.cpp:346 gui/launcher.cpp:1001
+#: gui/launcher.cpp:1005 gui/massadd.cpp:91 gui/options.cpp:1229
#: engines/engine.cpp:361 engines/engine.cpp:372 engines/scumm/dialogs.cpp:192
#: engines/scumm/scumm.cpp:1775 engines/agos/animation.cpp:551
#: engines/groovie/script.cpp:420 engines/sky/compact.cpp:131
@@ -131,15 +131,15 @@ msgstr "Por favor selecione uma aчуo"
msgid "Press the key to associate"
msgstr "Pressione a tecla para associar"
-#: gui/launcher.cpp:170
+#: gui/launcher.cpp:187
msgid "Game"
msgstr "Jogo"
-#: gui/launcher.cpp:174
+#: gui/launcher.cpp:191
msgid "ID:"
msgstr "Cѓdigo:"
-#: gui/launcher.cpp:174 gui/launcher.cpp:176 gui/launcher.cpp:177
+#: gui/launcher.cpp:191 gui/launcher.cpp:193 gui/launcher.cpp:194
msgid ""
"Short game identifier used for referring to savegames and running the game "
"from the command line"
@@ -147,309 +147,314 @@ msgstr ""
"Cѓdigo identificador usado para se referir a jogos salvos e execuчуo do jogo "
"a partir da linha de comando"
-#: gui/launcher.cpp:176
+#: gui/launcher.cpp:193
msgctxt "lowres"
msgid "ID:"
msgstr "Cѓdigo:"
-#: gui/launcher.cpp:181
+#: gui/launcher.cpp:198
msgid "Name:"
msgstr "Nome:"
-#: gui/launcher.cpp:181 gui/launcher.cpp:183 gui/launcher.cpp:184
+#: gui/launcher.cpp:198 gui/launcher.cpp:200 gui/launcher.cpp:201
msgid "Full title of the game"
msgstr "Tэtulo completo do jogo"
-#: gui/launcher.cpp:183
+#: gui/launcher.cpp:200
msgctxt "lowres"
msgid "Name:"
msgstr "Nome:"
-#: gui/launcher.cpp:187
+#: gui/launcher.cpp:204
msgid "Language:"
msgstr "Idioma:"
-#: gui/launcher.cpp:187 gui/launcher.cpp:188
+#: gui/launcher.cpp:204 gui/launcher.cpp:205
msgid ""
"Language of the game. This will not turn your Spanish game version into "
"English"
msgstr "Idioma do jogo. Isto nуo irс passar seu jogo Inglъs para Portuguъs"
-#: gui/launcher.cpp:189 gui/launcher.cpp:203 gui/options.cpp:80
-#: gui/options.cpp:745 gui/options.cpp:758 gui/options.cpp:1224
+#: gui/launcher.cpp:206 gui/launcher.cpp:220 gui/options.cpp:80
+#: gui/options.cpp:730 gui/options.cpp:743 gui/options.cpp:1199
#: audio/null.cpp:40
msgid "<default>"
msgstr "<padrуo>"
-#: gui/launcher.cpp:199
+#: gui/launcher.cpp:216
msgid "Platform:"
msgstr "Sistema:"
-#: gui/launcher.cpp:199 gui/launcher.cpp:201 gui/launcher.cpp:202
+#: gui/launcher.cpp:216 gui/launcher.cpp:218 gui/launcher.cpp:219
msgid "Platform the game was originally designed for"
msgstr "Sistema que o jogo foi desenvolvido originalmente"
-#: gui/launcher.cpp:201
+#: gui/launcher.cpp:218
msgctxt "lowres"
msgid "Platform:"
msgstr "Sistema:"
-#: gui/launcher.cpp:213 gui/options.cpp:1087 gui/options.cpp:1104
+#: gui/launcher.cpp:231
+#, fuzzy
+msgid "Engine"
+msgstr "Examinar"
+
+#: gui/launcher.cpp:239 gui/options.cpp:1062 gui/options.cpp:1079
msgid "Graphics"
msgstr "Grсficos"
-#: gui/launcher.cpp:213 gui/options.cpp:1087 gui/options.cpp:1104
+#: gui/launcher.cpp:239 gui/options.cpp:1062 gui/options.cpp:1079
msgid "GFX"
msgstr "GFX"
-#: gui/launcher.cpp:216
+#: gui/launcher.cpp:242
msgid "Override global graphic settings"
msgstr "Sobrepor configuraчуo global de grсficos"
-#: gui/launcher.cpp:218
+#: gui/launcher.cpp:244
msgctxt "lowres"
msgid "Override global graphic settings"
msgstr "Sobrepor configuraчуo global de grсficos"
-#: gui/launcher.cpp:225 gui/options.cpp:1110
+#: gui/launcher.cpp:251 gui/options.cpp:1085
msgid "Audio"
msgstr "Сudio"
-#: gui/launcher.cpp:228
+#: gui/launcher.cpp:254
msgid "Override global audio settings"
msgstr "Sobrepor configuraчуo global de сudio"
-#: gui/launcher.cpp:230
+#: gui/launcher.cpp:256
msgctxt "lowres"
msgid "Override global audio settings"
msgstr "Sobrepor configuraчуo global de сudio"
-#: gui/launcher.cpp:239 gui/options.cpp:1115
+#: gui/launcher.cpp:265 gui/options.cpp:1090
msgid "Volume"
msgstr "Volume"
-#: gui/launcher.cpp:241 gui/options.cpp:1117
+#: gui/launcher.cpp:267 gui/options.cpp:1092
msgctxt "lowres"
msgid "Volume"
msgstr "Volume"
-#: gui/launcher.cpp:244
+#: gui/launcher.cpp:270
msgid "Override global volume settings"
msgstr "Sobrepor configuraчуo global de volume"
-#: gui/launcher.cpp:246
+#: gui/launcher.cpp:272
msgctxt "lowres"
msgid "Override global volume settings"
msgstr "Sobrepor configuraчуo global de volume"
-#: gui/launcher.cpp:254 gui/options.cpp:1125
+#: gui/launcher.cpp:280 gui/options.cpp:1100
msgid "MIDI"
msgstr "MIDI"
-#: gui/launcher.cpp:257
+#: gui/launcher.cpp:283
msgid "Override global MIDI settings"
msgstr "Sobrepor configuraчуo global de MIDI"
-#: gui/launcher.cpp:259
+#: gui/launcher.cpp:285
msgctxt "lowres"
msgid "Override global MIDI settings"
msgstr "Sobrepor configuraчуo global de MIDI"
-#: gui/launcher.cpp:268 gui/options.cpp:1131
+#: gui/launcher.cpp:294 gui/options.cpp:1106
msgid "MT-32"
msgstr "MT-32"
-#: gui/launcher.cpp:271
+#: gui/launcher.cpp:297
msgid "Override global MT-32 settings"
msgstr "Sobrepor configuraчуo global de MT-32"
-#: gui/launcher.cpp:273
+#: gui/launcher.cpp:299
msgctxt "lowres"
msgid "Override global MT-32 settings"
msgstr "Sobrepor configuraчуo global de MT-32"
-#: gui/launcher.cpp:282 gui/options.cpp:1138
+#: gui/launcher.cpp:308 gui/options.cpp:1113
msgid "Paths"
msgstr "Pastas"
-#: gui/launcher.cpp:284 gui/options.cpp:1140
+#: gui/launcher.cpp:310 gui/options.cpp:1115
msgctxt "lowres"
msgid "Paths"
msgstr "Pastas"
-#: gui/launcher.cpp:291
+#: gui/launcher.cpp:317
msgid "Game Path:"
msgstr "Pasta do Jogo:"
-#: gui/launcher.cpp:293
+#: gui/launcher.cpp:319
msgctxt "lowres"
msgid "Game Path:"
msgstr "Pasta do Jogo:"
-#: gui/launcher.cpp:298 gui/options.cpp:1164
+#: gui/launcher.cpp:324 gui/options.cpp:1139
msgid "Extra Path:"
msgstr "Pasta de Extras"
-#: gui/launcher.cpp:298 gui/launcher.cpp:300 gui/launcher.cpp:301
+#: gui/launcher.cpp:324 gui/launcher.cpp:326 gui/launcher.cpp:327
msgid "Specifies path to additional data used the game"
msgstr "Especifique a pasta para dados utilizados no jogo"
-#: gui/launcher.cpp:300 gui/options.cpp:1166
+#: gui/launcher.cpp:326 gui/options.cpp:1141
msgctxt "lowres"
msgid "Extra Path:"
msgstr "Pasta de Extras"
-#: gui/launcher.cpp:307 gui/options.cpp:1148
+#: gui/launcher.cpp:333 gui/options.cpp:1123
msgid "Save Path:"
msgstr "Pasta para Salvar"
-#: gui/launcher.cpp:307 gui/launcher.cpp:309 gui/launcher.cpp:310
-#: gui/options.cpp:1148 gui/options.cpp:1150 gui/options.cpp:1151
+#: gui/launcher.cpp:333 gui/launcher.cpp:335 gui/launcher.cpp:336
+#: gui/options.cpp:1123 gui/options.cpp:1125 gui/options.cpp:1126
msgid "Specifies where your savegames are put"
msgstr "Especifique onde guardar seus jogos salvos"
-#: gui/launcher.cpp:309 gui/options.cpp:1150
+#: gui/launcher.cpp:335 gui/options.cpp:1125
msgctxt "lowres"
msgid "Save Path:"
msgstr "Pasta para Salvar"
-#: gui/launcher.cpp:329 gui/launcher.cpp:416 gui/launcher.cpp:469
-#: gui/launcher.cpp:523 gui/options.cpp:1159 gui/options.cpp:1167
-#: gui/options.cpp:1176 gui/options.cpp:1283 gui/options.cpp:1289
-#: gui/options.cpp:1297 gui/options.cpp:1327 gui/options.cpp:1333
-#: gui/options.cpp:1340 gui/options.cpp:1433 gui/options.cpp:1436
-#: gui/options.cpp:1448
+#: gui/launcher.cpp:354 gui/launcher.cpp:453 gui/launcher.cpp:511
+#: gui/launcher.cpp:565 gui/options.cpp:1134 gui/options.cpp:1142
+#: gui/options.cpp:1151 gui/options.cpp:1258 gui/options.cpp:1264
+#: gui/options.cpp:1272 gui/options.cpp:1302 gui/options.cpp:1308
+#: gui/options.cpp:1315 gui/options.cpp:1408 gui/options.cpp:1411
+#: gui/options.cpp:1423
msgctxt "path"
msgid "None"
msgstr "Nenhum(a)"
-#: gui/launcher.cpp:334 gui/launcher.cpp:422 gui/launcher.cpp:527
-#: gui/options.cpp:1277 gui/options.cpp:1321 gui/options.cpp:1439
+#: gui/launcher.cpp:359 gui/launcher.cpp:459 gui/launcher.cpp:569
+#: gui/options.cpp:1252 gui/options.cpp:1296 gui/options.cpp:1414
#: backends/platform/wii/options.cpp:56
msgid "Default"
msgstr "Padrуo"
-#: gui/launcher.cpp:462 gui/options.cpp:1442
+#: gui/launcher.cpp:504 gui/options.cpp:1417
msgid "Select SoundFont"
msgstr "Selecione o SoundFont"
-#: gui/launcher.cpp:481 gui/launcher.cpp:636
+#: gui/launcher.cpp:523 gui/launcher.cpp:677
msgid "Select directory with game data"
msgstr "Selecione a pasta com os arquivos do jogo"
-#: gui/launcher.cpp:499
+#: gui/launcher.cpp:541
msgid "Select additional game directory"
msgstr "Selecione a pasta adicional do jogo"
-#: gui/launcher.cpp:511
+#: gui/launcher.cpp:553
msgid "Select directory for saved games"
msgstr "Selecione a pasta para os jogos salvos"
-#: gui/launcher.cpp:538
+#: gui/launcher.cpp:580
msgid "This game ID is already taken. Please choose another one."
msgstr "Este cѓdigo jс esta sendo utilizado. Por favor, escolha outro."
-#: gui/launcher.cpp:579 engines/dialogs.cpp:110
+#: gui/launcher.cpp:621 engines/dialogs.cpp:110
msgid "~Q~uit"
msgstr "~S~air"
-#: gui/launcher.cpp:579 backends/platform/sdl/macosx/appmenu_osx.mm:96
+#: gui/launcher.cpp:621 backends/platform/sdl/macosx/appmenu_osx.mm:96
msgid "Quit ScummVM"
msgstr "Sair do ScummVM"
-#: gui/launcher.cpp:580
+#: gui/launcher.cpp:622
msgid "A~b~out..."
msgstr "So~b~re..."
-#: gui/launcher.cpp:580 backends/platform/sdl/macosx/appmenu_osx.mm:70
+#: gui/launcher.cpp:622 backends/platform/sdl/macosx/appmenu_osx.mm:70
msgid "About ScummVM"
msgstr "Sobre o ScumnmVM"
-#: gui/launcher.cpp:581
+#: gui/launcher.cpp:623
msgid "~O~ptions..."
msgstr "~O~pчѕes"
-#: gui/launcher.cpp:581
+#: gui/launcher.cpp:623
msgid "Change global ScummVM options"
msgstr "Alterar opчѕes globais do ScummVM"
-#: gui/launcher.cpp:583
+#: gui/launcher.cpp:625
msgid "~S~tart"
msgstr "~I~niciar"
-#: gui/launcher.cpp:583
+#: gui/launcher.cpp:625
msgid "Start selected game"
msgstr "Iniciar jogo selecionado"
-#: gui/launcher.cpp:586
+#: gui/launcher.cpp:628
msgid "~L~oad..."
msgstr "~C~arregar"
-#: gui/launcher.cpp:586
+#: gui/launcher.cpp:628
msgid "Load savegame for selected game"
msgstr "Carregar jogo salvo do jogo selecionado"
-#: gui/launcher.cpp:591 gui/launcher.cpp:1079
+#: gui/launcher.cpp:633 gui/launcher.cpp:1120
msgid "~A~dd Game..."
msgstr "~A~dicionar Jogo..."
-#: gui/launcher.cpp:591 gui/launcher.cpp:598
+#: gui/launcher.cpp:633 gui/launcher.cpp:640
msgid "Hold Shift for Mass Add"
msgstr "Segure Shift para Multi-Adiчуo"
-#: gui/launcher.cpp:593
+#: gui/launcher.cpp:635
msgid "~E~dit Game..."
msgstr "~E~ditar Jogo..."
-#: gui/launcher.cpp:593 gui/launcher.cpp:600
+#: gui/launcher.cpp:635 gui/launcher.cpp:642
msgid "Change game options"
msgstr "Alterar opчѕes do jogo"
-#: gui/launcher.cpp:595
+#: gui/launcher.cpp:637
msgid "~R~emove Game"
msgstr "~R~emover Jogo"
-#: gui/launcher.cpp:595 gui/launcher.cpp:602
+#: gui/launcher.cpp:637 gui/launcher.cpp:644
msgid "Remove game from the list. The game data files stay intact"
msgstr ""
"Remover jogo da lista. Os arquivos de dados do jogo permanecem intactos"
-#: gui/launcher.cpp:598 gui/launcher.cpp:1079
+#: gui/launcher.cpp:640 gui/launcher.cpp:1120
msgctxt "lowres"
msgid "~A~dd Game..."
msgstr "~A~dicionar Jogo..."
-#: gui/launcher.cpp:600
+#: gui/launcher.cpp:642
msgctxt "lowres"
msgid "~E~dit Game..."
msgstr "~E~ditar Jogo..."
-#: gui/launcher.cpp:602
+#: gui/launcher.cpp:644
msgctxt "lowres"
msgid "~R~emove Game"
msgstr "~R~emover Jogo"
-#: gui/launcher.cpp:610
+#: gui/launcher.cpp:652
msgid "Search in game list"
msgstr "Pesquisar na lista de jogos"
-#: gui/launcher.cpp:614 gui/launcher.cpp:1126
+#: gui/launcher.cpp:656 gui/launcher.cpp:1167
msgid "Search:"
msgstr "Pesquisar:"
-#: gui/launcher.cpp:639 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255
+#: gui/launcher.cpp:680 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255
#: engines/mohawk/riven.cpp:716 engines/cruise/menu.cpp:216
msgid "Load game:"
msgstr "Carregar jogo:"
-#: gui/launcher.cpp:639 engines/dialogs.cpp:114 engines/scumm/dialogs.cpp:188
+#: gui/launcher.cpp:680 engines/dialogs.cpp:114 engines/scumm/dialogs.cpp:188
#: engines/mohawk/myst.cpp:255 engines/mohawk/riven.cpp:716
#: engines/cruise/menu.cpp:216 backends/platform/wince/CEActionsPocket.cpp:267
#: backends/platform/wince/CEActionsSmartphone.cpp:231
msgid "Load"
msgstr "Carregar"
-#: gui/launcher.cpp:747
+#: gui/launcher.cpp:788
msgid ""
"Do you really want to run the mass game detector? This could potentially add "
"a huge number of games."
@@ -457,7 +462,7 @@ msgstr ""
"Vocъ realmente deseja adicionar vсrios jogos ao mesmo tempo? Isso poderс "
"resultar em uma adiчуo gigantesca de jogos."
-#: gui/launcher.cpp:748 gui/launcher.cpp:896
+#: gui/launcher.cpp:789 gui/launcher.cpp:937
#: backends/events/symbiansdl/symbiansdl-events.cpp:184
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
@@ -465,7 +470,7 @@ msgstr ""
msgid "Yes"
msgstr "Sim"
-#: gui/launcher.cpp:748 gui/launcher.cpp:896
+#: gui/launcher.cpp:789 gui/launcher.cpp:937
#: backends/events/symbiansdl/symbiansdl-events.cpp:184
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
@@ -473,38 +478,38 @@ msgstr "Sim"
msgid "No"
msgstr "Nуo"
-#: gui/launcher.cpp:796
+#: gui/launcher.cpp:837
msgid "ScummVM couldn't open the specified directory!"
msgstr "ScummVM nуo conseguiu abrir a pasta especificada!"
-#: gui/launcher.cpp:808
+#: gui/launcher.cpp:849
msgid "ScummVM could not find any game in the specified directory!"
msgstr "ScummVM nуo encontrou nenhum jogo na pasta especificada!"
-#: gui/launcher.cpp:822
+#: gui/launcher.cpp:863
msgid "Pick the game:"
msgstr "Escolha o jogo:"
-#: gui/launcher.cpp:896
+#: gui/launcher.cpp:937
msgid "Do you really want to remove this game configuration?"
msgstr "Vocъ deseja realmente remover a configuraчуo deste jogo?"
-#: gui/launcher.cpp:960
+#: gui/launcher.cpp:1001
msgid "This game does not support loading games from the launcher."
msgstr "Este jogo nуo suporta abrir jogos a partir do menu principal."
-#: gui/launcher.cpp:964
+#: gui/launcher.cpp:1005
msgid "ScummVM could not find any engine capable of running the selected game!"
msgstr ""
"ScummVM nуo conseguiu encontrar qualquer programa capaz de rodar o jogo "
"selecionado!"
-#: gui/launcher.cpp:1078
+#: gui/launcher.cpp:1119
msgctxt "lowres"
msgid "Mass Add..."
msgstr "Multi-Adiчуo..."
-#: gui/launcher.cpp:1078
+#: gui/launcher.cpp:1119
msgid "Mass Add..."
msgstr "Multi-Adiчуo..."
@@ -575,101 +580,93 @@ msgstr "44 kHz"
msgid "48 kHz"
msgstr "48 kHz"
-#: gui/options.cpp:257 gui/options.cpp:485 gui/options.cpp:586
-#: gui/options.cpp:659 gui/options.cpp:868
+#: gui/options.cpp:248 gui/options.cpp:474 gui/options.cpp:575
+#: gui/options.cpp:644 gui/options.cpp:852
msgctxt "soundfont"
msgid "None"
msgstr "Nenhum(a)"
-#: gui/options.cpp:393
+#: gui/options.cpp:382
msgid "Failed to apply some of the graphic options changes:"
msgstr "Falha ao aplicar algumas mudanчas nas opчѕes de grсfico:"
-#: gui/options.cpp:405
+#: gui/options.cpp:394
msgid "the video mode could not be changed."
msgstr "o modo de vэdeo nуo pєde ser alterado."
-#: gui/options.cpp:411
+#: gui/options.cpp:400
msgid "the fullscreen setting could not be changed"
msgstr "a configuraчуo de tela cheia nуo pєde ser mudada"
-#: gui/options.cpp:417
+#: gui/options.cpp:406
msgid "the aspect ratio setting could not be changed"
msgstr "a configuraчуo de proporчуo nуo pєde ser mudada"
-#: gui/options.cpp:742
+#: gui/options.cpp:727
msgid "Graphics mode:"
msgstr "Modo grсfico:"
-#: gui/options.cpp:756
+#: gui/options.cpp:741
msgid "Render mode:"
msgstr "Renderizaчуo"
-#: gui/options.cpp:756 gui/options.cpp:757
+#: gui/options.cpp:741 gui/options.cpp:742
msgid "Special dithering modes supported by some games"
msgstr "Modos especiais de dithering suportados por alguns jogos"
-#: gui/options.cpp:768
+#: gui/options.cpp:753
#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2248
#: backends/graphics/openglsdl/openglsdl-graphics.cpp:472
msgid "Fullscreen mode"
msgstr "Modo Tela Cheia"
-#: gui/options.cpp:771
+#: gui/options.cpp:756
msgid "Aspect ratio correction"
msgstr "Correчуo de proporчуo"
-#: gui/options.cpp:771
+#: gui/options.cpp:756
msgid "Correct aspect ratio for 320x200 games"
msgstr "Correчуo de proporчуo para jogos 320x200"
-#: gui/options.cpp:772
-msgid "EGA undithering"
-msgstr "EGA sem dithering"
-
-#: gui/options.cpp:772
-msgid "Enable undithering in EGA games that support it"
-msgstr "Habilita EGA sem dithering em jogos com suporte"
-
-#: gui/options.cpp:780
+#: gui/options.cpp:764
msgid "Preferred Device:"
msgstr "Dispositivo pref.:"
-#: gui/options.cpp:780
+#: gui/options.cpp:764
msgid "Music Device:"
msgstr "Disp. de mњsica:"
-#: gui/options.cpp:780 gui/options.cpp:782
+#: gui/options.cpp:764 gui/options.cpp:766
msgid "Specifies preferred sound device or sound card emulator"
msgstr "Especifica o dispositivo de som preferido ou emulador de placa de som"
-#: gui/options.cpp:780 gui/options.cpp:782 gui/options.cpp:783
+#: gui/options.cpp:764 gui/options.cpp:766 gui/options.cpp:767
msgid "Specifies output sound device or sound card emulator"
msgstr "Especifica o dispositivo de saэda de som ou emulador de placa de som"
-#: gui/options.cpp:782
+#: gui/options.cpp:766
msgctxt "lowres"
msgid "Preferred Dev.:"
msgstr "Dispositivo pref.:"
-#: gui/options.cpp:782
+#: gui/options.cpp:766
msgctxt "lowres"
msgid "Music Device:"
msgstr "Dispositivo de mњsica:"
-#: gui/options.cpp:809
+#: gui/options.cpp:793
msgid "AdLib emulator:"
msgstr "Emulador AdLib:"
-#: gui/options.cpp:809 gui/options.cpp:810
+#: gui/options.cpp:793 gui/options.cpp:794
msgid "AdLib is used for music in many games"
msgstr "AdLib щ utilizado para mњsica em vсrios jogos"
-#: gui/options.cpp:820
+#: gui/options.cpp:804
msgid "Output rate:"
msgstr "Taxa de saэda:"
-#: gui/options.cpp:820 gui/options.cpp:821
+#: gui/options.cpp:804 gui/options.cpp:805
msgid ""
"Higher value specifies better sound quality but may be not supported by your "
"soundcard"
@@ -677,62 +674,62 @@ msgstr ""
"Maior valor especifica melhor qualidade de som, mas pode nуo ser suportado "
"por sua placa de som"
-#: gui/options.cpp:831
+#: gui/options.cpp:815
msgid "GM Device:"
msgstr "Dispositivo GM:"
-#: gui/options.cpp:831
+#: gui/options.cpp:815
msgid "Specifies default sound device for General MIDI output"
msgstr "Especifique o dispositivo de som padrуo para a saэda General MIDI"
-#: gui/options.cpp:842
+#: gui/options.cpp:826
msgid "Don't use General MIDI music"
msgstr "Nуo usar mњsica General MIDI"
-#: gui/options.cpp:853 gui/options.cpp:915
+#: gui/options.cpp:837 gui/options.cpp:899
msgid "Use first available device"
msgstr "Usar o primeiro dispositivo disponэvel"
-#: gui/options.cpp:865
+#: gui/options.cpp:849
msgid "SoundFont:"
msgstr "SoundFont:"
-#: gui/options.cpp:865 gui/options.cpp:867 gui/options.cpp:868
+#: gui/options.cpp:849 gui/options.cpp:851 gui/options.cpp:852
msgid "SoundFont is supported by some audio cards, Fluidsynth and Timidity"
msgstr "SoundFont щ suportado por algumas placas de som, Fluidsynth e Timidity"
-#: gui/options.cpp:867
+#: gui/options.cpp:851
msgctxt "lowres"
msgid "SoundFont:"
msgstr "SoundFont:"
-#: gui/options.cpp:873
+#: gui/options.cpp:857
msgid "Mixed AdLib/MIDI mode"
msgstr "Mixar AdLib/MIDI"
-#: gui/options.cpp:873
+#: gui/options.cpp:857
msgid "Use both MIDI and AdLib sound generation"
msgstr "Usar MIDI e AdLib juntos na geraчуo de som"
-#: gui/options.cpp:876
+#: gui/options.cpp:860
msgid "MIDI gain:"
msgstr "Ganho MIDI:"
-#: gui/options.cpp:886
+#: gui/options.cpp:870
msgid "MT-32 Device:"
msgstr "Dispositivo MT-32:"
-#: gui/options.cpp:886
+#: gui/options.cpp:870
msgid "Specifies default sound device for Roland MT-32/LAPC1/CM32l/CM64 output"
msgstr ""
"Especifique o dispositivo de som padrуo para a saэda Roland MT-32/LAPC1/"
"CM32l/CM64"
-#: gui/options.cpp:891
+#: gui/options.cpp:875
msgid "True Roland MT-32 (disable GM emulation)"
msgstr "Roland MT-32 real (desligar emulaчуo GM)"
-#: gui/options.cpp:891 gui/options.cpp:893
+#: gui/options.cpp:875 gui/options.cpp:877
msgid ""
"Check if you want to use your real hardware Roland-compatible sound device "
"connected to your computer"
@@ -740,193 +737,193 @@ msgstr ""
"Verifique se vocъ quer usar o seu dispositivo de hardware de som compatэvel "
"com Roland"
-#: gui/options.cpp:893
+#: gui/options.cpp:877
msgctxt "lowres"
msgid "True Roland MT-32 (no GM emulation)"
msgstr "Roland MT-32 real (sem emulaчуo GM)"
-#: gui/options.cpp:896
+#: gui/options.cpp:880
msgid "Enable Roland GS Mode"
msgstr "Ligar modo Roland GS"
-#: gui/options.cpp:896
+#: gui/options.cpp:880
msgid "Turns off General MIDI mapping for games with Roland MT-32 soundtrack"
msgstr ""
"Desliga o mapeamento General MIDI para jogos com trilha sonora Roland MT-32"
-#: gui/options.cpp:905
+#: gui/options.cpp:889
msgid "Don't use Roland MT-32 music"
msgstr "Nуo usar mњsica Roland MT-32"
-#: gui/options.cpp:932
+#: gui/options.cpp:916
msgid "Text and Speech:"
msgstr "Texto e Voz:"
-#: gui/options.cpp:936 gui/options.cpp:946
+#: gui/options.cpp:920 gui/options.cpp:930
msgid "Speech"
msgstr "Voz"
-#: gui/options.cpp:937 gui/options.cpp:947
+#: gui/options.cpp:921 gui/options.cpp:931
msgid "Subtitles"
msgstr "Legendas"
-#: gui/options.cpp:938
+#: gui/options.cpp:922
msgid "Both"
msgstr "Ambos"
-#: gui/options.cpp:940
+#: gui/options.cpp:924
msgid "Subtitle speed:"
msgstr "Rapidez legendas:"
-#: gui/options.cpp:942
+#: gui/options.cpp:926
msgctxt "lowres"
msgid "Text and Speech:"
msgstr "Texto e Voz:"
-#: gui/options.cpp:946
+#: gui/options.cpp:930
msgid "Spch"
msgstr "Voz"
-#: gui/options.cpp:947
+#: gui/options.cpp:931
msgid "Subs"
msgstr "Legs"
-#: gui/options.cpp:948
+#: gui/options.cpp:932
msgctxt "lowres"
msgid "Both"
msgstr "Ambos"
-#: gui/options.cpp:948
+#: gui/options.cpp:932
msgid "Show subtitles and play speech"
msgstr "Mostrar legenda e vozes (dublagem)"
-#: gui/options.cpp:950
+#: gui/options.cpp:934
msgctxt "lowres"
msgid "Subtitle speed:"
msgstr "Velocidade das legendas:"
-#: gui/options.cpp:966
+#: gui/options.cpp:950
msgid "Music volume:"
msgstr "Volume da Mњsica:"
-#: gui/options.cpp:968
+#: gui/options.cpp:952
msgctxt "lowres"
msgid "Music volume:"
msgstr "Volume da Mњsica:"
-#: gui/options.cpp:975
+#: gui/options.cpp:959
msgid "Mute All"
msgstr "Mudo"
-#: gui/options.cpp:978
+#: gui/options.cpp:962
msgid "SFX volume:"
msgstr "Volume dos Sons:"
-#: gui/options.cpp:978 gui/options.cpp:980 gui/options.cpp:981
+#: gui/options.cpp:962 gui/options.cpp:964 gui/options.cpp:965
msgid "Special sound effects volume"
msgstr "Volume dos efeitos sonoros especiais"
-#: gui/options.cpp:980
+#: gui/options.cpp:964
msgctxt "lowres"
msgid "SFX volume:"
msgstr "Volume dos Sons:"
-#: gui/options.cpp:988
+#: gui/options.cpp:972
msgid "Speech volume:"
msgstr "Volume da Voz:"
-#: gui/options.cpp:990
+#: gui/options.cpp:974
msgctxt "lowres"
msgid "Speech volume:"
msgstr "Volume da Voz:"
-#: gui/options.cpp:1156
+#: gui/options.cpp:1131
msgid "Theme Path:"
msgstr "Pasta do Tema"
-#: gui/options.cpp:1158
+#: gui/options.cpp:1133
msgctxt "lowres"
msgid "Theme Path:"
msgstr "Pasta do Tema"
-#: gui/options.cpp:1164 gui/options.cpp:1166 gui/options.cpp:1167
+#: gui/options.cpp:1139 gui/options.cpp:1141 gui/options.cpp:1142
msgid "Specifies path to additional data used by all games or ScummVM"
msgstr ""
"Especifica a pasta para os dados adicionais usados por todos os jogos ou "
"ScummVM"
-#: gui/options.cpp:1173
+#: gui/options.cpp:1148
msgid "Plugins Path:"
msgstr "Pasta de Plugins:"
-#: gui/options.cpp:1175
+#: gui/options.cpp:1150
msgctxt "lowres"
msgid "Plugins Path:"
msgstr "Pasta de Plugins:"
-#: gui/options.cpp:1184
+#: gui/options.cpp:1159
msgid "Misc"
msgstr "Outros"
-#: gui/options.cpp:1186
+#: gui/options.cpp:1161
msgctxt "lowres"
msgid "Misc"
msgstr "Outros"
-#: gui/options.cpp:1188
+#: gui/options.cpp:1163
msgid "Theme:"
msgstr "Tema:"
-#: gui/options.cpp:1192
+#: gui/options.cpp:1167
msgid "GUI Renderer:"
msgstr "Renderizador GUI:"
-#: gui/options.cpp:1204
+#: gui/options.cpp:1179
msgid "Autosave:"
msgstr "Auto-Salvar:"
-#: gui/options.cpp:1206
+#: gui/options.cpp:1181
msgctxt "lowres"
msgid "Autosave:"
msgstr "Auto-Salvar:"
-#: gui/options.cpp:1214
+#: gui/options.cpp:1189
msgid "Keys"
msgstr "Teclas"
-#: gui/options.cpp:1221
+#: gui/options.cpp:1196
msgid "GUI Language:"
msgstr "Idioma do GUI:"
-#: gui/options.cpp:1221
+#: gui/options.cpp:1196
msgid "Language of ScummVM GUI"
msgstr "Linguagem do ScummVM GUI"
-#: gui/options.cpp:1372
+#: gui/options.cpp:1347
msgid "You have to restart ScummVM before your changes will take effect."
msgstr "Vocъ tem que reiniciar o ScummVM para funcionar."
-#: gui/options.cpp:1385
+#: gui/options.cpp:1360
msgid "Select directory for savegames"
msgstr "Selecione a pasta para o jogos salvos"
-#: gui/options.cpp:1392
+#: gui/options.cpp:1367
msgid "The chosen directory cannot be written to. Please select another one."
msgstr "O diretѓrio escolhido nуo pode ser usado. Por favor, selecione outro."
-#: gui/options.cpp:1401
+#: gui/options.cpp:1376
msgid "Select directory for GUI themes"
msgstr "Selecione a pasta para os temas da Interface de Uso Grсfico"
-#: gui/options.cpp:1411
+#: gui/options.cpp:1386
msgid "Select directory for extra files"
msgstr "Selecione a pasta para os arquivos extras"
-#: gui/options.cpp:1422
+#: gui/options.cpp:1397
msgid "Select directory for plugins"
msgstr "Selecione a pasta para os plugins"
-#: gui/options.cpp:1475
+#: gui/options.cpp:1450
msgid ""
"The theme you selected does not support your current language. If you want "
"to use this theme you need to switch to another language first."
@@ -974,64 +971,64 @@ msgstr "Nуo-titulado arquivo de save"
msgid "Select a Theme"
msgstr "Selecione um Tema"
-#: gui/ThemeEngine.cpp:333
+#: gui/ThemeEngine.cpp:335
msgid "Disabled GFX"
msgstr "GFX desabilitado"
-#: gui/ThemeEngine.cpp:333
+#: gui/ThemeEngine.cpp:335
msgctxt "lowres"
msgid "Disabled GFX"
msgstr "GFX desabilitado"
-#: gui/ThemeEngine.cpp:334
+#: gui/ThemeEngine.cpp:336
msgid "Standard Renderer (16bpp)"
msgstr "Renderizador padrуo (16bpp)"
-#: gui/ThemeEngine.cpp:334
+#: gui/ThemeEngine.cpp:336
msgid "Standard (16bpp)"
msgstr "Padrуo (16bpp)"
-#: gui/ThemeEngine.cpp:336
+#: gui/ThemeEngine.cpp:338
msgid "Antialiased Renderer (16bpp)"
msgstr "Renderizador Anti-Serrilhamento (16bpp)"
-#: gui/ThemeEngine.cpp:336
+#: gui/ThemeEngine.cpp:338
msgid "Antialiased (16bpp)"
msgstr "Anti-Serrilhamento (16bpp)"
-#: gui/widget.cpp:312 gui/widget.cpp:314 gui/widget.cpp:320 gui/widget.cpp:322
+#: gui/widget.cpp:322 gui/widget.cpp:324 gui/widget.cpp:330 gui/widget.cpp:332
msgid "Clear value"
msgstr "Limpar valor"
-#: base/main.cpp:203
+#: base/main.cpp:209
#, c-format
msgid "Engine does not support debug level '%s'"
msgstr "Esse programa nуo suporta o nэvel de debug '%s'"
-#: base/main.cpp:275
+#: base/main.cpp:287
msgid "Menu"
msgstr "Menu"
-#: base/main.cpp:278 backends/platform/symbian/src/SymbianActions.cpp:45
+#: base/main.cpp:290 backends/platform/symbian/src/SymbianActions.cpp:45
#: backends/platform/wince/CEActionsPocket.cpp:45
#: backends/platform/wince/CEActionsSmartphone.cpp:46
msgid "Skip"
msgstr "Pular"
-#: base/main.cpp:281 backends/platform/symbian/src/SymbianActions.cpp:50
+#: base/main.cpp:293 backends/platform/symbian/src/SymbianActions.cpp:50
#: backends/platform/wince/CEActionsPocket.cpp:42
msgid "Pause"
msgstr "Pausar"
-#: base/main.cpp:284
+#: base/main.cpp:296
msgid "Skip line"
msgstr "Pula linha"
-#: base/main.cpp:455
+#: base/main.cpp:467
msgid "Error running game:"
msgstr "Erro ao executar o jogo:"
-#: base/main.cpp:479
+#: base/main.cpp:491
msgid "Could not find any engine capable of running the selected game"
msgstr ""
"Nуo foi possэvel encontrar qualquer programa capaz de rodar o jogo "
@@ -1101,17 +1098,17 @@ msgstr "Usuсrio cancelou"
msgid "Unknown error"
msgstr "Erro desconhecido"
-#: engines/advancedDetector.cpp:296
+#: engines/advancedDetector.cpp:324
#, c-format
msgid "The game in '%s' seems to be unknown."
msgstr "O jogo em '% s' parece ser desconhecido."
-#: engines/advancedDetector.cpp:297
+#: engines/advancedDetector.cpp:325
msgid "Please, report the following data to the ScummVM team along with name"
msgstr ""
"Por favor, informe os seguintes dados para a equipe ScummVM junto com o nome"
-#: engines/advancedDetector.cpp:299
+#: engines/advancedDetector.cpp:327
msgid "of the game you tried to add and its version/language/etc.:"
msgstr "do jogo que vocъ tentou adicionar e sua versуo/idioma/etc.:"
@@ -1148,13 +1145,14 @@ msgctxt "lowres"
msgid "~R~eturn to Launcher"
msgstr "~V~oltar ao menu"
-#: engines/dialogs.cpp:116 engines/cruise/menu.cpp:214
-#: engines/sci/engine/kfile.cpp:566
+#: engines/dialogs.cpp:116 engines/agi/saveload.cpp:805
+#: engines/cruise/menu.cpp:214 engines/sci/engine/kfile.cpp:567
msgid "Save game:"
msgstr "Salvar jogo:"
-#: engines/dialogs.cpp:116 engines/scumm/dialogs.cpp:187
-#: engines/cruise/menu.cpp:214 engines/sci/engine/kfile.cpp:566
+#: engines/dialogs.cpp:116 engines/agi/saveload.cpp:805
+#: engines/scumm/dialogs.cpp:187 engines/cruise/menu.cpp:214
+#: engines/sci/engine/kfile.cpp:567
#: backends/platform/symbian/src/SymbianActions.cpp:44
#: backends/platform/wince/CEActionsPocket.cpp:43
#: backends/platform/wince/CEActionsPocket.cpp:267
@@ -1265,6 +1263,88 @@ msgstr ""
msgid "Start anyway"
msgstr "Iniciar de qualquer maneira"
+#: engines/agi/detection.cpp:145 engines/dreamweb/detection.cpp:47
+#: engines/sci/detection.cpp:390
+msgid "Use original save/load screens"
+msgstr ""
+
+#: engines/agi/detection.cpp:146 engines/dreamweb/detection.cpp:48
+#: engines/sci/detection.cpp:391
+msgid "Use the original save/load screens, instead of the ScummVM ones"
+msgstr ""
+
+#: engines/agi/saveload.cpp:827 engines/sci/engine/kfile.cpp:674
+msgid "Restore game:"
+msgstr "Restaurar jogo:"
+
+#: engines/agi/saveload.cpp:827 engines/sci/engine/kfile.cpp:674
+msgid "Restore"
+msgstr "Restaurar"
+
+#: engines/dreamweb/detection.cpp:57
+#, fuzzy
+msgid "Use bright palette mode"
+msgstr "Item da direita superior"
+
+#: engines/dreamweb/detection.cpp:58
+msgid "Display graphics using the game's bright palette"
+msgstr ""
+
+#: engines/sci/detection.cpp:370
+msgid "EGA undithering"
+msgstr "EGA sem dithering"
+
+#: engines/sci/detection.cpp:371
+#, fuzzy
+msgid "Enable undithering in EGA games"
+msgstr "Habilita EGA sem dithering em jogos com suporte"
+
+#: engines/sci/detection.cpp:380
+#, fuzzy
+msgid "Prefer digital sound effects"
+msgstr "Volume dos efeitos sonoros especiais"
+
+#: engines/sci/detection.cpp:381
+msgid "Prefer digital sound effects instead of synthesized ones"
+msgstr ""
+
+#: engines/sci/detection.cpp:400
+msgid "Use IMF/Yahama FB-01 for MIDI output"
+msgstr ""
+
+#: engines/sci/detection.cpp:401
+msgid ""
+"Use an IBM Music Feature card or a Yahama FB-01 FM synth module for MIDI "
+"output"
+msgstr ""
+
+#: engines/sci/detection.cpp:411
+msgid "Use CD audio"
+msgstr ""
+
+#: engines/sci/detection.cpp:412
+msgid "Use CD audio instead of in-game audio, if available"
+msgstr ""
+
+#: engines/sci/detection.cpp:422
+msgid "Use Windows cursors"
+msgstr ""
+
+#: engines/sci/detection.cpp:423
+msgid ""
+"Use the Windows cursors (smaller and monochrome) instead of the DOS ones"
+msgstr ""
+
+#: engines/sci/detection.cpp:433
+#, fuzzy
+msgid "Use silver cursors"
+msgstr "Cursor normal"
+
+#: engines/sci/detection.cpp:434
+msgid ""
+"Use the alternate set of silver cursors, instead of the normal golden ones"
+msgstr ""
+
#: engines/scumm/dialogs.cpp:175
#, c-format
msgid "Insert Disk %c and Press Button to Continue."
@@ -1923,7 +2003,7 @@ msgstr ""
"LucasArts,\n"
"mas %s estс faltando. Utilizando AdLib ao invщs."
-#: engines/scumm/scumm.cpp:2271 engines/agos/saveload.cpp:189
+#: engines/scumm/scumm.cpp:2271 engines/agos/saveload.cpp:202
#, c-format
msgid ""
"Failed to save game state to file:\n"
@@ -1934,7 +2014,7 @@ msgstr ""
"\n"
"%s"
-#: engines/scumm/scumm.cpp:2278 engines/agos/saveload.cpp:154
+#: engines/scumm/scumm.cpp:2278 engines/agos/saveload.cpp:167
#, c-format
msgid ""
"Failed to load game state from file:\n"
@@ -1945,7 +2025,7 @@ msgstr ""
"\n"
"%s"
-#: engines/scumm/scumm.cpp:2290 engines/agos/saveload.cpp:197
+#: engines/scumm/scumm.cpp:2290 engines/agos/saveload.cpp:210
#, c-format
msgid ""
"Successfully saved game state in file:\n"
@@ -1993,14 +2073,6 @@ msgstr "~M~enu Principal ScummVM"
msgid "~W~ater Effect Enabled"
msgstr "Modo ~E~feitos de сgua ativado"
-#: engines/sci/engine/kfile.cpp:673
-msgid "Restore game:"
-msgstr "Restaurar jogo:"
-
-#: engines/sci/engine/kfile.cpp:673
-msgid "Restore"
-msgstr "Restaurar"
-
#: engines/agos/animation.cpp:550
#, c-format
msgid "Cutscene file '%s' not found!"
@@ -2029,6 +2101,66 @@ msgstr "Falha ao excluir arquivo."
msgid "Failed to save game"
msgstr "Falha ao salvar o jogo"
+#. I18N: Studio audience adds an applause and cheering sounds whenever
+#. Malcolm makes a joke.
+#: engines/kyra/detection.cpp:62
+msgid "Studio audience"
+msgstr ""
+
+#: engines/kyra/detection.cpp:63
+msgid "Enable studio audience"
+msgstr ""
+
+#. I18N: This option allows the user to skip text and cutscenes.
+#: engines/kyra/detection.cpp:73
+msgid "Skip support"
+msgstr ""
+
+#: engines/kyra/detection.cpp:74
+msgid "Allow text and cutscenes to be skipped"
+msgstr ""
+
+#. I18N: Helium mode makes people sound like they've inhaled Helium.
+#: engines/kyra/detection.cpp:84
+msgid "Helium mode"
+msgstr ""
+
+#: engines/kyra/detection.cpp:85
+#, fuzzy
+msgid "Enable helium mode"
+msgstr "Ligar modo Roland GS"
+
+#. I18N: When enabled, this option makes scrolling smoother when
+#. changing from one screen to another.
+#: engines/kyra/detection.cpp:99
+msgid "Smooth scrolling"
+msgstr ""
+
+#: engines/kyra/detection.cpp:100
+msgid "Enable smooth scrolling when walking"
+msgstr ""
+
+#. I18N: When enabled, this option changes the cursor when it floats to the
+#. edge of the screen to a directional arrow. The player can then click to
+#. walk towards that direction.
+#: engines/kyra/detection.cpp:112
+#, fuzzy
+msgid "Floating cursors"
+msgstr "Cursor normal"
+
+#: engines/kyra/detection.cpp:113
+msgid "Enable floating cursors"
+msgstr ""
+
+#. I18N: HP stands for Hit Points
+#: engines/kyra/detection.cpp:127
+msgid "HP bar graphs"
+msgstr ""
+
+#: engines/kyra/detection.cpp:128
+msgid "Enable hit point bar graphs"
+msgstr ""
+
#: engines/kyra/lol.cpp:478
msgid "Attack 1"
msgstr ""
@@ -2097,6 +2229,14 @@ msgstr ""
"o modelo General MIDI. Talvez possa acontecer\n"
"que algumas faixas nуo sejam corretamente tocadas."
+#: engines/queen/queen.cpp:59 engines/sky/detection.cpp:44
+msgid "Floppy intro"
+msgstr ""
+
+#: engines/queen/queen.cpp:60 engines/sky/detection.cpp:45
+msgid "Use the floppy version's intro (CD version only)"
+msgstr ""
+
#: engines/sky/compact.cpp:130
msgid ""
"Unable to find \"sky.cpt\" file!\n"
@@ -2180,6 +2320,14 @@ msgstr ""
"Vэdeos no formato DXA foram encontrados, mas o ScummVM foi compilado sem "
"suporte a zlib"
+#: engines/sword2/sword2.cpp:79
+msgid "Show object labels"
+msgstr ""
+
+#: engines/sword2/sword2.cpp:80
+msgid "Show labels for objects on mouse hover"
+msgstr ""
+
#: engines/parallaction/saveload.cpp:133
#, c-format
msgid ""
@@ -2416,19 +2564,19 @@ msgstr "Som de alta qualidade (mais lento) (reiniciar)"
msgid "Disable power off"
msgstr "Desativar desligamento"
-#: backends/platform/iphone/osys_events.cpp:301
+#: backends/platform/iphone/osys_events.cpp:300
msgid "Mouse-click-and-drag mode enabled."
msgstr "Modo clique-e-arraste do mouse ligado."
-#: backends/platform/iphone/osys_events.cpp:303
+#: backends/platform/iphone/osys_events.cpp:302
msgid "Mouse-click-and-drag mode disabled."
msgstr "Modo clique-e-arraste do mouse desligado."
-#: backends/platform/iphone/osys_events.cpp:314
+#: backends/platform/iphone/osys_events.cpp:313
msgid "Touchpad mode enabled."
msgstr "Modo Touchpad ligado."
-#: backends/platform/iphone/osys_events.cpp:316
+#: backends/platform/iphone/osys_events.cpp:315
msgid "Touchpad mode disabled."
msgstr "Modo Touchpad desligado."
@@ -2505,15 +2653,15 @@ msgstr "Ativa os filtros grсficos"
msgid "Windowed mode"
msgstr "Modo janela"
-#: backends/graphics/opengl/opengl-graphics.cpp:130
+#: backends/graphics/opengl/opengl-graphics.cpp:135
msgid "OpenGL Normal"
msgstr "OpenGL Normal"
-#: backends/graphics/opengl/opengl-graphics.cpp:131
+#: backends/graphics/opengl/opengl-graphics.cpp:136
msgid "OpenGL Conserve"
msgstr "OpenGL Conserve"
-#: backends/graphics/opengl/opengl-graphics.cpp:132
+#: backends/graphics/opengl/opengl-graphics.cpp:137
msgid "OpenGL Original"
msgstr "OpenGL Original"
diff --git a/po/ru_RU.po b/po/ru_RU.po
index fe2204f6e5..dbeb07298e 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ScummVM 1.3.0svn\n"
"Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n"
-"POT-Creation-Date: 2012-03-07 22:09+0000\n"
+"POT-Creation-Date: 2012-05-20 22:39+0100\n"
"PO-Revision-Date: 2012-02-16 13:09+0200+0200\n"
"Last-Translator: Eugene Sandulenko <sev@scummvm.org>\n"
"Language-Team: Russian\n"
@@ -45,7 +45,7 @@ msgid "Go up"
msgstr "Вверх"
#: gui/browser.cpp:69 gui/chooser.cpp:45 gui/KeysDialog.cpp:43
-#: gui/launcher.cpp:320 gui/massadd.cpp:94 gui/options.cpp:1253
+#: gui/launcher.cpp:345 gui/massadd.cpp:94 gui/options.cpp:1228
#: gui/saveload.cpp:63 gui/saveload.cpp:155 gui/themebrowser.cpp:54
#: engines/engine.cpp:442 engines/scumm/dialogs.cpp:190
#: engines/sword1/control.cpp:865 engines/parallaction/saveload.cpp:281
@@ -70,15 +70,15 @@ msgstr "Закрыть"
msgid "Mouse click"
msgstr "Клик мышью"
-#: gui/gui-manager.cpp:122 base/main.cpp:288
+#: gui/gui-manager.cpp:122 base/main.cpp:300
msgid "Display keyboard"
msgstr "Показать клавиатуру"
-#: gui/gui-manager.cpp:126 base/main.cpp:292
+#: gui/gui-manager.cpp:126 base/main.cpp:304
msgid "Remap keys"
msgstr "Переназначить клавиши"
-#: gui/gui-manager.cpp:129 base/main.cpp:295
+#: gui/gui-manager.cpp:129 base/main.cpp:307
msgid "Toggle FullScreen"
msgstr "Переключение на весь экран"
@@ -90,8 +90,8 @@ msgstr "Выберите действие для назначения"
msgid "Map"
msgstr "Назначить"
-#: gui/KeysDialog.cpp:42 gui/launcher.cpp:321 gui/launcher.cpp:960
-#: gui/launcher.cpp:964 gui/massadd.cpp:91 gui/options.cpp:1254
+#: gui/KeysDialog.cpp:42 gui/launcher.cpp:346 gui/launcher.cpp:1001
+#: gui/launcher.cpp:1005 gui/massadd.cpp:91 gui/options.cpp:1229
#: engines/engine.cpp:361 engines/engine.cpp:372 engines/scumm/dialogs.cpp:192
#: engines/scumm/scumm.cpp:1775 engines/agos/animation.cpp:551
#: engines/groovie/script.cpp:420 engines/sky/compact.cpp:131
@@ -128,15 +128,15 @@ msgstr "Пожалуйста, выберите действие"
msgid "Press the key to associate"
msgstr "Нажмите клавишу для назначения"
-#: gui/launcher.cpp:170
+#: gui/launcher.cpp:187
msgid "Game"
msgstr "Игра"
-#: gui/launcher.cpp:174
+#: gui/launcher.cpp:191
msgid "ID:"
msgstr "ID:"
-#: gui/launcher.cpp:174 gui/launcher.cpp:176 gui/launcher.cpp:177
+#: gui/launcher.cpp:191 gui/launcher.cpp:193 gui/launcher.cpp:194
msgid ""
"Short game identifier used for referring to savegames and running the game "
"from the command line"
@@ -144,309 +144,314 @@ msgstr ""
"Короткий идентификатор, используемый для имен сохранений игр и для запуска "
"из командной строки"
-#: gui/launcher.cpp:176
+#: gui/launcher.cpp:193
msgctxt "lowres"
msgid "ID:"
msgstr "ID:"
-#: gui/launcher.cpp:181
+#: gui/launcher.cpp:198
msgid "Name:"
msgstr "Название:"
-#: gui/launcher.cpp:181 gui/launcher.cpp:183 gui/launcher.cpp:184
+#: gui/launcher.cpp:198 gui/launcher.cpp:200 gui/launcher.cpp:201
msgid "Full title of the game"
msgstr "Полное название игры"
-#: gui/launcher.cpp:183
+#: gui/launcher.cpp:200
msgctxt "lowres"
msgid "Name:"
msgstr "Назв:"
-#: gui/launcher.cpp:187
+#: gui/launcher.cpp:204
msgid "Language:"
msgstr "Язык:"
-#: gui/launcher.cpp:187 gui/launcher.cpp:188
+#: gui/launcher.cpp:204 gui/launcher.cpp:205
msgid ""
"Language of the game. This will not turn your Spanish game version into "
"English"
msgstr ""
"Язык игры. Изменение этой настройки не превратит игру на английском в русскую"
-#: gui/launcher.cpp:189 gui/launcher.cpp:203 gui/options.cpp:80
-#: gui/options.cpp:745 gui/options.cpp:758 gui/options.cpp:1224
+#: gui/launcher.cpp:206 gui/launcher.cpp:220 gui/options.cpp:80
+#: gui/options.cpp:730 gui/options.cpp:743 gui/options.cpp:1199
#: audio/null.cpp:40
msgid "<default>"
msgstr "<по умолчанию>"
-#: gui/launcher.cpp:199
+#: gui/launcher.cpp:216
msgid "Platform:"
msgstr "Платформа:"
-#: gui/launcher.cpp:199 gui/launcher.cpp:201 gui/launcher.cpp:202
+#: gui/launcher.cpp:216 gui/launcher.cpp:218 gui/launcher.cpp:219
msgid "Platform the game was originally designed for"
msgstr "Платформа, для которой игра была изначально разработана"
-#: gui/launcher.cpp:201
+#: gui/launcher.cpp:218
msgctxt "lowres"
msgid "Platform:"
msgstr "Платформа:"
-#: gui/launcher.cpp:213 gui/options.cpp:1087 gui/options.cpp:1104
+#: gui/launcher.cpp:231
+#, fuzzy
+msgid "Engine"
+msgstr "Проверить"
+
+#: gui/launcher.cpp:239 gui/options.cpp:1062 gui/options.cpp:1079
msgid "Graphics"
msgstr "Графика"
-#: gui/launcher.cpp:213 gui/options.cpp:1087 gui/options.cpp:1104
+#: gui/launcher.cpp:239 gui/options.cpp:1062 gui/options.cpp:1079
msgid "GFX"
msgstr "Грф"
-#: gui/launcher.cpp:216
+#: gui/launcher.cpp:242
msgid "Override global graphic settings"
msgstr "Перекрыть глобальные установки графики"
-#: gui/launcher.cpp:218
+#: gui/launcher.cpp:244
msgctxt "lowres"
msgid "Override global graphic settings"
msgstr "Перекрыть глобальные установки графики"
-#: gui/launcher.cpp:225 gui/options.cpp:1110
+#: gui/launcher.cpp:251 gui/options.cpp:1085
msgid "Audio"
msgstr "Аудио"
-#: gui/launcher.cpp:228
+#: gui/launcher.cpp:254
msgid "Override global audio settings"
msgstr "Перекрыть глобальные установки аудио"
-#: gui/launcher.cpp:230
+#: gui/launcher.cpp:256
msgctxt "lowres"
msgid "Override global audio settings"
msgstr "Перекрыть глобальные установки аудио"
-#: gui/launcher.cpp:239 gui/options.cpp:1115
+#: gui/launcher.cpp:265 gui/options.cpp:1090
msgid "Volume"
msgstr "Громкость"
-#: gui/launcher.cpp:241 gui/options.cpp:1117
+#: gui/launcher.cpp:267 gui/options.cpp:1092
msgctxt "lowres"
msgid "Volume"
msgstr "Громк"
-#: gui/launcher.cpp:244
+#: gui/launcher.cpp:270
msgid "Override global volume settings"
msgstr "Перекрыть глобальные установки громкости"
-#: gui/launcher.cpp:246
+#: gui/launcher.cpp:272
msgctxt "lowres"
msgid "Override global volume settings"
msgstr "Перекрыть глобальные установки громкости"
-#: gui/launcher.cpp:254 gui/options.cpp:1125
+#: gui/launcher.cpp:280 gui/options.cpp:1100
msgid "MIDI"
msgstr "MIDI"
-#: gui/launcher.cpp:257
+#: gui/launcher.cpp:283
msgid "Override global MIDI settings"
msgstr "Перекрыть глобальные установки MIDI"
-#: gui/launcher.cpp:259
+#: gui/launcher.cpp:285
msgctxt "lowres"
msgid "Override global MIDI settings"
msgstr "Перекрыть глобальные установки MIDI"
-#: gui/launcher.cpp:268 gui/options.cpp:1131
+#: gui/launcher.cpp:294 gui/options.cpp:1106
msgid "MT-32"
msgstr "MT-32"
-#: gui/launcher.cpp:271
+#: gui/launcher.cpp:297
msgid "Override global MT-32 settings"
msgstr "Перекрыть глобальные установки MT-32"
-#: gui/launcher.cpp:273
+#: gui/launcher.cpp:299
msgctxt "lowres"
msgid "Override global MT-32 settings"
msgstr "Перекрыть глобальные установки MT-32"
-#: gui/launcher.cpp:282 gui/options.cpp:1138
+#: gui/launcher.cpp:308 gui/options.cpp:1113
msgid "Paths"
msgstr "Пути"
-#: gui/launcher.cpp:284 gui/options.cpp:1140
+#: gui/launcher.cpp:310 gui/options.cpp:1115
msgctxt "lowres"
msgid "Paths"
msgstr "Пути"
-#: gui/launcher.cpp:291
+#: gui/launcher.cpp:317
msgid "Game Path:"
msgstr "Путь к игре:"
-#: gui/launcher.cpp:293
+#: gui/launcher.cpp:319
msgctxt "lowres"
msgid "Game Path:"
msgstr "Где игра:"
-#: gui/launcher.cpp:298 gui/options.cpp:1164
+#: gui/launcher.cpp:324 gui/options.cpp:1139
msgid "Extra Path:"
msgstr "Доп. путь:"
-#: gui/launcher.cpp:298 gui/launcher.cpp:300 gui/launcher.cpp:301
+#: gui/launcher.cpp:324 gui/launcher.cpp:326 gui/launcher.cpp:327
msgid "Specifies path to additional data used the game"
msgstr "Указывает путь к дополнительным файлам данных для игры"
-#: gui/launcher.cpp:300 gui/options.cpp:1166
+#: gui/launcher.cpp:326 gui/options.cpp:1141
msgctxt "lowres"
msgid "Extra Path:"
msgstr "Доп. путь:"
-#: gui/launcher.cpp:307 gui/options.cpp:1148
+#: gui/launcher.cpp:333 gui/options.cpp:1123
msgid "Save Path:"
msgstr "Сохранения игр:"
-#: gui/launcher.cpp:307 gui/launcher.cpp:309 gui/launcher.cpp:310
-#: gui/options.cpp:1148 gui/options.cpp:1150 gui/options.cpp:1151
+#: gui/launcher.cpp:333 gui/launcher.cpp:335 gui/launcher.cpp:336
+#: gui/options.cpp:1123 gui/options.cpp:1125 gui/options.cpp:1126
msgid "Specifies where your savegames are put"
msgstr "Указывает путь к сохранениям игры"
-#: gui/launcher.cpp:309 gui/options.cpp:1150
+#: gui/launcher.cpp:335 gui/options.cpp:1125
msgctxt "lowres"
msgid "Save Path:"
msgstr "Путь сохр:"
-#: gui/launcher.cpp:329 gui/launcher.cpp:416 gui/launcher.cpp:469
-#: gui/launcher.cpp:523 gui/options.cpp:1159 gui/options.cpp:1167
-#: gui/options.cpp:1176 gui/options.cpp:1283 gui/options.cpp:1289
-#: gui/options.cpp:1297 gui/options.cpp:1327 gui/options.cpp:1333
-#: gui/options.cpp:1340 gui/options.cpp:1433 gui/options.cpp:1436
-#: gui/options.cpp:1448
+#: gui/launcher.cpp:354 gui/launcher.cpp:453 gui/launcher.cpp:511
+#: gui/launcher.cpp:565 gui/options.cpp:1134 gui/options.cpp:1142
+#: gui/options.cpp:1151 gui/options.cpp:1258 gui/options.cpp:1264
+#: gui/options.cpp:1272 gui/options.cpp:1302 gui/options.cpp:1308
+#: gui/options.cpp:1315 gui/options.cpp:1408 gui/options.cpp:1411
+#: gui/options.cpp:1423
msgctxt "path"
msgid "None"
msgstr "Не задан"
-#: gui/launcher.cpp:334 gui/launcher.cpp:422 gui/launcher.cpp:527
-#: gui/options.cpp:1277 gui/options.cpp:1321 gui/options.cpp:1439
+#: gui/launcher.cpp:359 gui/launcher.cpp:459 gui/launcher.cpp:569
+#: gui/options.cpp:1252 gui/options.cpp:1296 gui/options.cpp:1414
#: backends/platform/wii/options.cpp:56
msgid "Default"
msgstr "По умолчанию"
-#: gui/launcher.cpp:462 gui/options.cpp:1442
+#: gui/launcher.cpp:504 gui/options.cpp:1417
msgid "Select SoundFont"
msgstr "Выберите SoundFont"
-#: gui/launcher.cpp:481 gui/launcher.cpp:636
+#: gui/launcher.cpp:523 gui/launcher.cpp:677
msgid "Select directory with game data"
msgstr "Выберите директорию с файлами игры"
-#: gui/launcher.cpp:499
+#: gui/launcher.cpp:541
msgid "Select additional game directory"
msgstr "Выберите дополнительную директорию игры"
-#: gui/launcher.cpp:511
+#: gui/launcher.cpp:553
msgid "Select directory for saved games"
msgstr "Выберите директорию для сохранений"
-#: gui/launcher.cpp:538
+#: gui/launcher.cpp:580
msgid "This game ID is already taken. Please choose another one."
msgstr "Этот ID игры уже используется. Пожалуйста, выберите другой."
-#: gui/launcher.cpp:579 engines/dialogs.cpp:110
+#: gui/launcher.cpp:621 engines/dialogs.cpp:110
msgid "~Q~uit"
msgstr "~В~ыход"
-#: gui/launcher.cpp:579 backends/platform/sdl/macosx/appmenu_osx.mm:96
+#: gui/launcher.cpp:621 backends/platform/sdl/macosx/appmenu_osx.mm:96
msgid "Quit ScummVM"
msgstr "Завершить ScummVM"
-#: gui/launcher.cpp:580
+#: gui/launcher.cpp:622
msgid "A~b~out..."
msgstr "О п~р~ограмме..."
-#: gui/launcher.cpp:580 backends/platform/sdl/macosx/appmenu_osx.mm:70
+#: gui/launcher.cpp:622 backends/platform/sdl/macosx/appmenu_osx.mm:70
msgid "About ScummVM"
msgstr "О программе ScummVM"
-#: gui/launcher.cpp:581
+#: gui/launcher.cpp:623
msgid "~O~ptions..."
msgstr "~Н~астройки..."
-#: gui/launcher.cpp:581
+#: gui/launcher.cpp:623
msgid "Change global ScummVM options"
msgstr "Изменить глобальные настройки ScummVM"
-#: gui/launcher.cpp:583
+#: gui/launcher.cpp:625
msgid "~S~tart"
msgstr "П~у~ск"
-#: gui/launcher.cpp:583
+#: gui/launcher.cpp:625
msgid "Start selected game"
msgstr "Запустить выбранную игру"
-#: gui/launcher.cpp:586
+#: gui/launcher.cpp:628
msgid "~L~oad..."
msgstr "~З~агрузить..."
-#: gui/launcher.cpp:586
+#: gui/launcher.cpp:628
msgid "Load savegame for selected game"
msgstr "Загрузить сохрнение для выбранной игры"
-#: gui/launcher.cpp:591 gui/launcher.cpp:1079
+#: gui/launcher.cpp:633 gui/launcher.cpp:1120
msgid "~A~dd Game..."
msgstr "~Д~обавить игру..."
-#: gui/launcher.cpp:591 gui/launcher.cpp:598
+#: gui/launcher.cpp:633 gui/launcher.cpp:640
msgid "Hold Shift for Mass Add"
msgstr "Удерживайте клавишу Shift для того, чтобы добавить несколько игр"
-#: gui/launcher.cpp:593
+#: gui/launcher.cpp:635
msgid "~E~dit Game..."
msgstr "Н~а~стройки игры..."
-#: gui/launcher.cpp:593 gui/launcher.cpp:600
+#: gui/launcher.cpp:635 gui/launcher.cpp:642
msgid "Change game options"
msgstr "Изменить настройки игры"
-#: gui/launcher.cpp:595
+#: gui/launcher.cpp:637
msgid "~R~emove Game"
msgstr "~У~далить игру"
-#: gui/launcher.cpp:595 gui/launcher.cpp:602
+#: gui/launcher.cpp:637 gui/launcher.cpp:644
msgid "Remove game from the list. The game data files stay intact"
msgstr "Удалить игру из списка. Не удаляет игру с жесткого диска"
-#: gui/launcher.cpp:598 gui/launcher.cpp:1079
+#: gui/launcher.cpp:640 gui/launcher.cpp:1120
msgctxt "lowres"
msgid "~A~dd Game..."
msgstr "~Д~об. игру..."
-#: gui/launcher.cpp:600
+#: gui/launcher.cpp:642
msgctxt "lowres"
msgid "~E~dit Game..."
msgstr "Н~а~с. игры..."
-#: gui/launcher.cpp:602
+#: gui/launcher.cpp:644
msgctxt "lowres"
msgid "~R~emove Game"
msgstr "~У~далить игру"
-#: gui/launcher.cpp:610
+#: gui/launcher.cpp:652
msgid "Search in game list"
msgstr "Поиск в списке игр"
-#: gui/launcher.cpp:614 gui/launcher.cpp:1126
+#: gui/launcher.cpp:656 gui/launcher.cpp:1167
msgid "Search:"
msgstr "Поиск:"
-#: gui/launcher.cpp:639 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255
+#: gui/launcher.cpp:680 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255
#: engines/mohawk/riven.cpp:716 engines/cruise/menu.cpp:216
msgid "Load game:"
msgstr "Загрузить игру:"
-#: gui/launcher.cpp:639 engines/dialogs.cpp:114 engines/scumm/dialogs.cpp:188
+#: gui/launcher.cpp:680 engines/dialogs.cpp:114 engines/scumm/dialogs.cpp:188
#: engines/mohawk/myst.cpp:255 engines/mohawk/riven.cpp:716
#: engines/cruise/menu.cpp:216 backends/platform/wince/CEActionsPocket.cpp:267
#: backends/platform/wince/CEActionsSmartphone.cpp:231
msgid "Load"
msgstr "Загрузить"
-#: gui/launcher.cpp:747
+#: gui/launcher.cpp:788
msgid ""
"Do you really want to run the mass game detector? This could potentially add "
"a huge number of games."
@@ -454,7 +459,7 @@ msgstr ""
"Вы действительно хотите запустить детектор всех игр? Это потенциально может "
"добавить большое количество игр."
-#: gui/launcher.cpp:748 gui/launcher.cpp:896
+#: gui/launcher.cpp:789 gui/launcher.cpp:937
#: backends/events/symbiansdl/symbiansdl-events.cpp:184
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
@@ -462,7 +467,7 @@ msgstr ""
msgid "Yes"
msgstr "Да"
-#: gui/launcher.cpp:748 gui/launcher.cpp:896
+#: gui/launcher.cpp:789 gui/launcher.cpp:937
#: backends/events/symbiansdl/symbiansdl-events.cpp:184
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
@@ -470,36 +475,36 @@ msgstr "Да"
msgid "No"
msgstr "Нет"
-#: gui/launcher.cpp:796
+#: gui/launcher.cpp:837
msgid "ScummVM couldn't open the specified directory!"
msgstr "ScummVM не может открыть указанную директорию!"
-#: gui/launcher.cpp:808
+#: gui/launcher.cpp:849
msgid "ScummVM could not find any game in the specified directory!"
msgstr "ScummVM не может найти игру в указанной директории!"
-#: gui/launcher.cpp:822
+#: gui/launcher.cpp:863
msgid "Pick the game:"
msgstr "Выберите игру:"
-#: gui/launcher.cpp:896
+#: gui/launcher.cpp:937
msgid "Do you really want to remove this game configuration?"
msgstr "Вы действительно хотите удалить настройки для этой игры?"
-#: gui/launcher.cpp:960
+#: gui/launcher.cpp:1001
msgid "This game does not support loading games from the launcher."
msgstr "Эта игра не поддерживает загрузку сохранений через главное меню."
-#: gui/launcher.cpp:964
+#: gui/launcher.cpp:1005
msgid "ScummVM could not find any engine capable of running the selected game!"
msgstr "ScummVM не смог найти движок для запуска выбранной игры!"
-#: gui/launcher.cpp:1078
+#: gui/launcher.cpp:1119
msgctxt "lowres"
msgid "Mass Add..."
msgstr "Много игр..."
-#: gui/launcher.cpp:1078
+#: gui/launcher.cpp:1119
msgid "Mass Add..."
msgstr "Много игр..."
@@ -566,104 +571,94 @@ msgstr "44 кГц"
msgid "48 kHz"
msgstr "48 кГц"
-#: gui/options.cpp:257 gui/options.cpp:485 gui/options.cpp:586
-#: gui/options.cpp:659 gui/options.cpp:868
+#: gui/options.cpp:248 gui/options.cpp:474 gui/options.cpp:575
+#: gui/options.cpp:644 gui/options.cpp:852
msgctxt "soundfont"
msgid "None"
msgstr "Не задан"
-#: gui/options.cpp:393
+#: gui/options.cpp:382
msgid "Failed to apply some of the graphic options changes:"
msgstr "Не удалось применить изменения некторых графических настроек:"
-#: gui/options.cpp:405
+#: gui/options.cpp:394
msgid "the video mode could not be changed."
msgstr "видеорежим не может быть изменён."
-#: gui/options.cpp:411
+#: gui/options.cpp:400
msgid "the fullscreen setting could not be changed"
msgstr "полноэкранный режим не может быть изменён"
-#: gui/options.cpp:417
+#: gui/options.cpp:406
msgid "the aspect ratio setting could not be changed"
msgstr "режим корректировки соотношения сторон не может быть изменён"
-#: gui/options.cpp:742
+#: gui/options.cpp:727
msgid "Graphics mode:"
msgstr "Граф. режим:"
-#: gui/options.cpp:756
+#: gui/options.cpp:741
msgid "Render mode:"
msgstr "Режим растра:"
-#: gui/options.cpp:756 gui/options.cpp:757
+#: gui/options.cpp:741 gui/options.cpp:742
msgid "Special dithering modes supported by some games"
msgstr "Специальные режимы рендеринга, поддерживаемые некоторыми играми"
-#: gui/options.cpp:768
+#: gui/options.cpp:753
#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2248
#: backends/graphics/openglsdl/openglsdl-graphics.cpp:472
msgid "Fullscreen mode"
msgstr "Полноэкранный режим"
-#: gui/options.cpp:771
+#: gui/options.cpp:756
msgid "Aspect ratio correction"
msgstr "Коррекция соотношения сторон"
-#: gui/options.cpp:771
+#: gui/options.cpp:756
msgid "Correct aspect ratio for 320x200 games"
msgstr "Корректировать соотношение сторон для игр с разрешением 320x200"
-#: gui/options.cpp:772
-msgid "EGA undithering"
-msgstr "EGA без растра"
-
-#: gui/options.cpp:772
-msgid "Enable undithering in EGA games that support it"
-msgstr ""
-"Включает режим без растрирования в EGA играх, которые поддерживают такой "
-"режим"
-
-#: gui/options.cpp:780
+#: gui/options.cpp:764
msgid "Preferred Device:"
msgstr "Предпочитаемое:"
-#: gui/options.cpp:780
+#: gui/options.cpp:764
msgid "Music Device:"
msgstr "Звуковое уст-во:"
-#: gui/options.cpp:780 gui/options.cpp:782
+#: gui/options.cpp:764 gui/options.cpp:766
msgid "Specifies preferred sound device or sound card emulator"
msgstr ""
"Указывает предпочитаемое звуковое устройство или эмулятор звуковой карты"
-#: gui/options.cpp:780 gui/options.cpp:782 gui/options.cpp:783
+#: gui/options.cpp:764 gui/options.cpp:766 gui/options.cpp:767
msgid "Specifies output sound device or sound card emulator"
msgstr "Указывает выходное звуковое устройство или эмулятор звуковой карты"
-#: gui/options.cpp:782
+#: gui/options.cpp:766
msgctxt "lowres"
msgid "Preferred Dev.:"
msgstr "Предпочитаемое:"
-#: gui/options.cpp:782
+#: gui/options.cpp:766
msgctxt "lowres"
msgid "Music Device:"
msgstr "Звуковое уст-во:"
-#: gui/options.cpp:809
+#: gui/options.cpp:793
msgid "AdLib emulator:"
msgstr "Эмулятор AdLib:"
-#: gui/options.cpp:809 gui/options.cpp:810
+#: gui/options.cpp:793 gui/options.cpp:794
msgid "AdLib is used for music in many games"
msgstr "Звуковая карта AdLib используется многими играми"
-#: gui/options.cpp:820
+#: gui/options.cpp:804
msgid "Output rate:"
msgstr "Частота звука:"
-#: gui/options.cpp:820 gui/options.cpp:821
+#: gui/options.cpp:804 gui/options.cpp:805
msgid ""
"Higher value specifies better sound quality but may be not supported by your "
"soundcard"
@@ -671,64 +666,64 @@ msgstr ""
"БОльшие значения задают лучшее качество звука, однако они могут не "
"поддерживаться вашей звуковой картой"
-#: gui/options.cpp:831
+#: gui/options.cpp:815
msgid "GM Device:"
msgstr "Устройство GM:"
-#: gui/options.cpp:831
+#: gui/options.cpp:815
msgid "Specifies default sound device for General MIDI output"
msgstr "Указывает выходное звуковое устройство для MIDI"
-#: gui/options.cpp:842
+#: gui/options.cpp:826
msgid "Don't use General MIDI music"
msgstr "Не использовать музыку для General MIDI"
-#: gui/options.cpp:853 gui/options.cpp:915
+#: gui/options.cpp:837 gui/options.cpp:899
msgid "Use first available device"
msgstr "Использовать первое доступное устройство"
-#: gui/options.cpp:865
+#: gui/options.cpp:849
msgid "SoundFont:"
msgstr "SoundFont:"
-#: gui/options.cpp:865 gui/options.cpp:867 gui/options.cpp:868
+#: gui/options.cpp:849 gui/options.cpp:851 gui/options.cpp:852
msgid "SoundFont is supported by some audio cards, Fluidsynth and Timidity"
msgstr ""
"SoundFontы поддердживаются некоторыми звуковыми картами, Fluidsynth и "
"Timidity"
-#: gui/options.cpp:867
+#: gui/options.cpp:851
msgctxt "lowres"
msgid "SoundFont:"
msgstr "SoundFont:"
-#: gui/options.cpp:873
+#: gui/options.cpp:857
msgid "Mixed AdLib/MIDI mode"
msgstr "Смешанный режим AdLib/MIDI"
-#: gui/options.cpp:873
+#: gui/options.cpp:857
msgid "Use both MIDI and AdLib sound generation"
msgstr "Использовать и MIDI и AdLib для генерации звука"
-#: gui/options.cpp:876
+#: gui/options.cpp:860
msgid "MIDI gain:"
msgstr "Усиление MIDI:"
-#: gui/options.cpp:886
+#: gui/options.cpp:870
msgid "MT-32 Device:"
msgstr "Устр. MT-32:"
-#: gui/options.cpp:886
+#: gui/options.cpp:870
msgid "Specifies default sound device for Roland MT-32/LAPC1/CM32l/CM64 output"
msgstr ""
"Указывает звуковое устройство по умолчания для вывода на Roland MT-32/LAPC1/"
"CM32l/CM64"
-#: gui/options.cpp:891
+#: gui/options.cpp:875
msgid "True Roland MT-32 (disable GM emulation)"
msgstr "Настоящий Roland MT-32 (запретить эмуляцию GM)"
-#: gui/options.cpp:891 gui/options.cpp:893
+#: gui/options.cpp:875 gui/options.cpp:877
msgid ""
"Check if you want to use your real hardware Roland-compatible sound device "
"connected to your computer"
@@ -736,193 +731,193 @@ msgstr ""
"Отметьте, если у вас подключено Roland-совместимое звуковое устройство и вы "
"хотите его использовать"
-#: gui/options.cpp:893
+#: gui/options.cpp:877
msgctxt "lowres"
msgid "True Roland MT-32 (no GM emulation)"
msgstr "Настоящий Roland MT-32 (запретить GM)"
-#: gui/options.cpp:896
+#: gui/options.cpp:880
msgid "Enable Roland GS Mode"
msgstr "Включить режим Roland GS"
-#: gui/options.cpp:896
+#: gui/options.cpp:880
msgid "Turns off General MIDI mapping for games with Roland MT-32 soundtrack"
msgstr ""
"Выключает маппинг General MIDI для игр с звуковой дорожкой для Roland MT-32"
-#: gui/options.cpp:905
+#: gui/options.cpp:889
msgid "Don't use Roland MT-32 music"
msgstr "Не использовать музыку для MT-32"
-#: gui/options.cpp:932
+#: gui/options.cpp:916
msgid "Text and Speech:"
msgstr "Текст и озвучка:"
-#: gui/options.cpp:936 gui/options.cpp:946
+#: gui/options.cpp:920 gui/options.cpp:930
msgid "Speech"
msgstr "Озвучка"
-#: gui/options.cpp:937 gui/options.cpp:947
+#: gui/options.cpp:921 gui/options.cpp:931
msgid "Subtitles"
msgstr "Субтитры"
-#: gui/options.cpp:938
+#: gui/options.cpp:922
msgid "Both"
msgstr "Оба"
-#: gui/options.cpp:940
+#: gui/options.cpp:924
msgid "Subtitle speed:"
msgstr "Скорость титров:"
-#: gui/options.cpp:942
+#: gui/options.cpp:926
msgctxt "lowres"
msgid "Text and Speech:"
msgstr "Текст и озвучка:"
-#: gui/options.cpp:946
+#: gui/options.cpp:930
msgid "Spch"
msgstr "Озв"
-#: gui/options.cpp:947
+#: gui/options.cpp:931
msgid "Subs"
msgstr "Суб"
-#: gui/options.cpp:948
+#: gui/options.cpp:932
msgctxt "lowres"
msgid "Both"
msgstr "Оба"
-#: gui/options.cpp:948
+#: gui/options.cpp:932
msgid "Show subtitles and play speech"
msgstr "Показывать субтитры и воспроизводить речь"
-#: gui/options.cpp:950
+#: gui/options.cpp:934
msgctxt "lowres"
msgid "Subtitle speed:"
msgstr "Скорость титров:"
-#: gui/options.cpp:966
+#: gui/options.cpp:950
msgid "Music volume:"
msgstr "Громк. музыки:"
-#: gui/options.cpp:968
+#: gui/options.cpp:952
msgctxt "lowres"
msgid "Music volume:"
msgstr "Громк. музыки:"
-#: gui/options.cpp:975
+#: gui/options.cpp:959
msgid "Mute All"
msgstr "Выкл. всё"
-#: gui/options.cpp:978
+#: gui/options.cpp:962
msgid "SFX volume:"
msgstr "Громкость SFX:"
-#: gui/options.cpp:978 gui/options.cpp:980 gui/options.cpp:981
+#: gui/options.cpp:962 gui/options.cpp:964 gui/options.cpp:965
msgid "Special sound effects volume"
msgstr "Громкость специальных звуковых эффектов"
-#: gui/options.cpp:980
+#: gui/options.cpp:964
msgctxt "lowres"
msgid "SFX volume:"
msgstr "Громк. SFX:"
-#: gui/options.cpp:988
+#: gui/options.cpp:972
msgid "Speech volume:"
msgstr "Громк. озвучки:"
-#: gui/options.cpp:990
+#: gui/options.cpp:974
msgctxt "lowres"
msgid "Speech volume:"
msgstr "Громк. озвучки:"
-#: gui/options.cpp:1156
+#: gui/options.cpp:1131
msgid "Theme Path:"
msgstr "Путь к темам:"
-#: gui/options.cpp:1158
+#: gui/options.cpp:1133
msgctxt "lowres"
msgid "Theme Path:"
msgstr "Где темы:"
-#: gui/options.cpp:1164 gui/options.cpp:1166 gui/options.cpp:1167
+#: gui/options.cpp:1139 gui/options.cpp:1141 gui/options.cpp:1142
msgid "Specifies path to additional data used by all games or ScummVM"
msgstr ""
"Указывает путь к дополнительным файлам данных, используемых всеми играми, "
"либо ScummVM"
-#: gui/options.cpp:1173
+#: gui/options.cpp:1148
msgid "Plugins Path:"
msgstr "Путь к плагинам:"
-#: gui/options.cpp:1175
+#: gui/options.cpp:1150
msgctxt "lowres"
msgid "Plugins Path:"
msgstr "Путь к плагинам:"
-#: gui/options.cpp:1184
+#: gui/options.cpp:1159
msgid "Misc"
msgstr "Разное"
-#: gui/options.cpp:1186
+#: gui/options.cpp:1161
msgctxt "lowres"
msgid "Misc"
msgstr "Разное"
-#: gui/options.cpp:1188
+#: gui/options.cpp:1163
msgid "Theme:"
msgstr "Тема:"
-#: gui/options.cpp:1192
+#: gui/options.cpp:1167
msgid "GUI Renderer:"
msgstr "Рисовалка GUI:"
-#: gui/options.cpp:1204
+#: gui/options.cpp:1179
msgid "Autosave:"
msgstr "Автосохранение:"
-#: gui/options.cpp:1206
+#: gui/options.cpp:1181
msgctxt "lowres"
msgid "Autosave:"
msgstr "Автосохр.:"
-#: gui/options.cpp:1214
+#: gui/options.cpp:1189
msgid "Keys"
msgstr "Клавиши"
-#: gui/options.cpp:1221
+#: gui/options.cpp:1196
msgid "GUI Language:"
msgstr "Язык GUI:"
-#: gui/options.cpp:1221
+#: gui/options.cpp:1196
msgid "Language of ScummVM GUI"
msgstr "Язык графического интерфейса ScummVM"
-#: gui/options.cpp:1372
+#: gui/options.cpp:1347
msgid "You have to restart ScummVM before your changes will take effect."
msgstr "Вы должны перезапустить ScummVM чтобы применить изменения."
-#: gui/options.cpp:1385
+#: gui/options.cpp:1360
msgid "Select directory for savegames"
msgstr "Выберите директорию для сохранений"
-#: gui/options.cpp:1392
+#: gui/options.cpp:1367
msgid "The chosen directory cannot be written to. Please select another one."
msgstr "Не могу писать в выбранную директорию. Пожалуйста, укажите другую."
-#: gui/options.cpp:1401
+#: gui/options.cpp:1376
msgid "Select directory for GUI themes"
msgstr "Выберите директорию для тем GUI"
-#: gui/options.cpp:1411
+#: gui/options.cpp:1386
msgid "Select directory for extra files"
msgstr "Выберите директорию с дополнительными файлами"
-#: gui/options.cpp:1422
+#: gui/options.cpp:1397
msgid "Select directory for plugins"
msgstr "Выберите директорию с плагинами"
-#: gui/options.cpp:1475
+#: gui/options.cpp:1450
msgid ""
"The theme you selected does not support your current language. If you want "
"to use this theme you need to switch to another language first."
@@ -970,64 +965,64 @@ msgstr "Сохранение без имени"
msgid "Select a Theme"
msgstr "Выберите тему"
-#: gui/ThemeEngine.cpp:333
+#: gui/ThemeEngine.cpp:335
msgid "Disabled GFX"
msgstr "Без графики"
-#: gui/ThemeEngine.cpp:333
+#: gui/ThemeEngine.cpp:335
msgctxt "lowres"
msgid "Disabled GFX"
msgstr "Без графики"
-#: gui/ThemeEngine.cpp:334
+#: gui/ThemeEngine.cpp:336
msgid "Standard Renderer (16bpp)"
msgstr "Стандартный растеризатор (16bpp)"
-#: gui/ThemeEngine.cpp:334
+#: gui/ThemeEngine.cpp:336
msgid "Standard (16bpp)"
msgstr "Стандартный растеризатор (16bpp)"
-#: gui/ThemeEngine.cpp:336
+#: gui/ThemeEngine.cpp:338
msgid "Antialiased Renderer (16bpp)"
msgstr "Растеризатор со сглаживанием (16bpp)"
-#: gui/ThemeEngine.cpp:336
+#: gui/ThemeEngine.cpp:338
msgid "Antialiased (16bpp)"
msgstr "Растеризатор со сглаживанием (16bpp)"
-#: gui/widget.cpp:312 gui/widget.cpp:314 gui/widget.cpp:320 gui/widget.cpp:322
+#: gui/widget.cpp:322 gui/widget.cpp:324 gui/widget.cpp:330 gui/widget.cpp:332
msgid "Clear value"
msgstr "Очистить значение"
-#: base/main.cpp:203
+#: base/main.cpp:209
#, c-format
msgid "Engine does not support debug level '%s'"
msgstr "Движок не поддерживает уровень отладки '%s'"
-#: base/main.cpp:275
+#: base/main.cpp:287
msgid "Menu"
msgstr "Меню"
-#: base/main.cpp:278 backends/platform/symbian/src/SymbianActions.cpp:45
+#: base/main.cpp:290 backends/platform/symbian/src/SymbianActions.cpp:45
#: backends/platform/wince/CEActionsPocket.cpp:45
#: backends/platform/wince/CEActionsSmartphone.cpp:46
msgid "Skip"
msgstr "Пропустить"
-#: base/main.cpp:281 backends/platform/symbian/src/SymbianActions.cpp:50
+#: base/main.cpp:293 backends/platform/symbian/src/SymbianActions.cpp:50
#: backends/platform/wince/CEActionsPocket.cpp:42
msgid "Pause"
msgstr "Пауза"
-#: base/main.cpp:284
+#: base/main.cpp:296
msgid "Skip line"
msgstr "Пропустить строку"
-#: base/main.cpp:455
+#: base/main.cpp:467
msgid "Error running game:"
msgstr "Ошибка запуска игры:"
-#: base/main.cpp:479
+#: base/main.cpp:491
msgid "Could not find any engine capable of running the selected game"
msgstr "Не могу найти движок для запуска выбранной игры"
@@ -1095,17 +1090,17 @@ msgstr "Прервано пользователем"
msgid "Unknown error"
msgstr "Неизвестная ошибка"
-#: engines/advancedDetector.cpp:296
+#: engines/advancedDetector.cpp:324
#, c-format
msgid "The game in '%s' seems to be unknown."
msgstr "Кажется, что игра '%s' ещё неизвестна."
-#: engines/advancedDetector.cpp:297
+#: engines/advancedDetector.cpp:325
msgid "Please, report the following data to the ScummVM team along with name"
msgstr ""
"Пожалуйста, передайте следующие данные команде ScummVM вместе с названием"
-#: engines/advancedDetector.cpp:299
+#: engines/advancedDetector.cpp:327
msgid "of the game you tried to add and its version/language/etc.:"
msgstr "игры, которую вы пытаетесь добавить, и укажите её версию, язык и т.д."
@@ -1142,13 +1137,14 @@ msgctxt "lowres"
msgid "~R~eturn to Launcher"
msgstr "~В~ главное меню"
-#: engines/dialogs.cpp:116 engines/cruise/menu.cpp:214
-#: engines/sci/engine/kfile.cpp:566
+#: engines/dialogs.cpp:116 engines/agi/saveload.cpp:805
+#: engines/cruise/menu.cpp:214 engines/sci/engine/kfile.cpp:567
msgid "Save game:"
msgstr "Сохранить игру:"
-#: engines/dialogs.cpp:116 engines/scumm/dialogs.cpp:187
-#: engines/cruise/menu.cpp:214 engines/sci/engine/kfile.cpp:566
+#: engines/dialogs.cpp:116 engines/agi/saveload.cpp:805
+#: engines/scumm/dialogs.cpp:187 engines/cruise/menu.cpp:214
+#: engines/sci/engine/kfile.cpp:567
#: backends/platform/symbian/src/SymbianActions.cpp:44
#: backends/platform/wince/CEActionsPocket.cpp:43
#: backends/platform/wince/CEActionsPocket.cpp:267
@@ -1260,6 +1256,90 @@ msgstr ""
msgid "Start anyway"
msgstr "Всё равно запустить"
+#: engines/agi/detection.cpp:145 engines/dreamweb/detection.cpp:47
+#: engines/sci/detection.cpp:390
+msgid "Use original save/load screens"
+msgstr ""
+
+#: engines/agi/detection.cpp:146 engines/dreamweb/detection.cpp:48
+#: engines/sci/detection.cpp:391
+msgid "Use the original save/load screens, instead of the ScummVM ones"
+msgstr ""
+
+#: engines/agi/saveload.cpp:827 engines/sci/engine/kfile.cpp:674
+msgid "Restore game:"
+msgstr "Восстановить игру:"
+
+#: engines/agi/saveload.cpp:827 engines/sci/engine/kfile.cpp:674
+msgid "Restore"
+msgstr "Восствновить"
+
+#: engines/dreamweb/detection.cpp:57
+#, fuzzy
+msgid "Use bright palette mode"
+msgstr "Верхний правый предмет"
+
+#: engines/dreamweb/detection.cpp:58
+msgid "Display graphics using the game's bright palette"
+msgstr ""
+
+#: engines/sci/detection.cpp:370
+msgid "EGA undithering"
+msgstr "EGA без растра"
+
+#: engines/sci/detection.cpp:371
+#, fuzzy
+msgid "Enable undithering in EGA games"
+msgstr ""
+"Включает режим без растрирования в EGA играх, которые поддерживают такой "
+"режим"
+
+#: engines/sci/detection.cpp:380
+#, fuzzy
+msgid "Prefer digital sound effects"
+msgstr "Громкость специальных звуковых эффектов"
+
+#: engines/sci/detection.cpp:381
+msgid "Prefer digital sound effects instead of synthesized ones"
+msgstr ""
+
+#: engines/sci/detection.cpp:400
+msgid "Use IMF/Yahama FB-01 for MIDI output"
+msgstr ""
+
+#: engines/sci/detection.cpp:401
+msgid ""
+"Use an IBM Music Feature card or a Yahama FB-01 FM synth module for MIDI "
+"output"
+msgstr ""
+
+#: engines/sci/detection.cpp:411
+msgid "Use CD audio"
+msgstr ""
+
+#: engines/sci/detection.cpp:412
+msgid "Use CD audio instead of in-game audio, if available"
+msgstr ""
+
+#: engines/sci/detection.cpp:422
+msgid "Use Windows cursors"
+msgstr ""
+
+#: engines/sci/detection.cpp:423
+msgid ""
+"Use the Windows cursors (smaller and monochrome) instead of the DOS ones"
+msgstr ""
+
+#: engines/sci/detection.cpp:433
+#, fuzzy
+msgid "Use silver cursors"
+msgstr "Обычный курсор"
+
+#: engines/sci/detection.cpp:434
+msgid ""
+"Use the alternate set of silver cursors, instead of the normal golden ones"
+msgstr ""
+
#: engines/scumm/dialogs.cpp:175
#, c-format
msgid "Insert Disk %c and Press Button to Continue."
@@ -1916,7 +1996,7 @@ msgstr ""
"Режим \"родного\" MIDI требует обновление Roland Upgrade от\n"
"LucasArts, но не хватает %s. Переключаюсь на AdLib."
-#: engines/scumm/scumm.cpp:2271 engines/agos/saveload.cpp:189
+#: engines/scumm/scumm.cpp:2271 engines/agos/saveload.cpp:202
#, c-format
msgid ""
"Failed to save game state to file:\n"
@@ -1927,7 +2007,7 @@ msgstr ""
"\n"
"%s"
-#: engines/scumm/scumm.cpp:2278 engines/agos/saveload.cpp:154
+#: engines/scumm/scumm.cpp:2278 engines/agos/saveload.cpp:167
#, c-format
msgid ""
"Failed to load game state from file:\n"
@@ -1938,7 +2018,7 @@ msgstr ""
"\n"
"%s"
-#: engines/scumm/scumm.cpp:2290 engines/agos/saveload.cpp:197
+#: engines/scumm/scumm.cpp:2290 engines/agos/saveload.cpp:210
#, c-format
msgid ""
"Successfully saved game state in file:\n"
@@ -1985,14 +2065,6 @@ msgstr "Главное меню"
msgid "~W~ater Effect Enabled"
msgstr "Эффекты воды включены"
-#: engines/sci/engine/kfile.cpp:673
-msgid "Restore game:"
-msgstr "Восстановить игру:"
-
-#: engines/sci/engine/kfile.cpp:673
-msgid "Restore"
-msgstr "Восствновить"
-
#: engines/agos/animation.cpp:550
#, c-format
msgid "Cutscene file '%s' not found!"
@@ -2015,6 +2087,66 @@ msgstr "Не удалось удалить файл."
msgid "Failed to save game"
msgstr "Не удалось сохранить игру"
+#. I18N: Studio audience adds an applause and cheering sounds whenever
+#. Malcolm makes a joke.
+#: engines/kyra/detection.cpp:62
+msgid "Studio audience"
+msgstr ""
+
+#: engines/kyra/detection.cpp:63
+msgid "Enable studio audience"
+msgstr ""
+
+#. I18N: This option allows the user to skip text and cutscenes.
+#: engines/kyra/detection.cpp:73
+msgid "Skip support"
+msgstr ""
+
+#: engines/kyra/detection.cpp:74
+msgid "Allow text and cutscenes to be skipped"
+msgstr ""
+
+#. I18N: Helium mode makes people sound like they've inhaled Helium.
+#: engines/kyra/detection.cpp:84
+msgid "Helium mode"
+msgstr ""
+
+#: engines/kyra/detection.cpp:85
+#, fuzzy
+msgid "Enable helium mode"
+msgstr "Включить режим Roland GS"
+
+#. I18N: When enabled, this option makes scrolling smoother when
+#. changing from one screen to another.
+#: engines/kyra/detection.cpp:99
+msgid "Smooth scrolling"
+msgstr ""
+
+#: engines/kyra/detection.cpp:100
+msgid "Enable smooth scrolling when walking"
+msgstr ""
+
+#. I18N: When enabled, this option changes the cursor when it floats to the
+#. edge of the screen to a directional arrow. The player can then click to
+#. walk towards that direction.
+#: engines/kyra/detection.cpp:112
+#, fuzzy
+msgid "Floating cursors"
+msgstr "Обычный курсор"
+
+#: engines/kyra/detection.cpp:113
+msgid "Enable floating cursors"
+msgstr ""
+
+#. I18N: HP stands for Hit Points
+#: engines/kyra/detection.cpp:127
+msgid "HP bar graphs"
+msgstr ""
+
+#: engines/kyra/detection.cpp:128
+msgid "Enable hit point bar graphs"
+msgstr ""
+
#: engines/kyra/lol.cpp:478
msgid "Attack 1"
msgstr "Атака 1"
@@ -2078,6 +2210,14 @@ msgstr ""
"может так получиться, что некоторые треки будут\n"
"сыграны неверно."
+#: engines/queen/queen.cpp:59 engines/sky/detection.cpp:44
+msgid "Floppy intro"
+msgstr ""
+
+#: engines/queen/queen.cpp:60 engines/sky/detection.cpp:45
+msgid "Use the floppy version's intro (CD version only)"
+msgstr ""
+
#: engines/sky/compact.cpp:130
msgid ""
"Unable to find \"sky.cpt\" file!\n"
@@ -2158,6 +2298,14 @@ msgid ""
msgstr ""
"Найдены заставки в формате DXA, но ScummVM был собран без поддержки zlib"
+#: engines/sword2/sword2.cpp:79
+msgid "Show object labels"
+msgstr ""
+
+#: engines/sword2/sword2.cpp:80
+msgid "Show labels for objects on mouse hover"
+msgstr ""
+
#: engines/parallaction/saveload.cpp:133
#, c-format
msgid ""
@@ -2392,19 +2540,19 @@ msgstr "Высокое качество звука (медленнее) (ребут)"
msgid "Disable power off"
msgstr "Запретить выключение"
-#: backends/platform/iphone/osys_events.cpp:301
+#: backends/platform/iphone/osys_events.cpp:300
msgid "Mouse-click-and-drag mode enabled."
msgstr "Режим мыши нажать-и-тянуть включен."
-#: backends/platform/iphone/osys_events.cpp:303
+#: backends/platform/iphone/osys_events.cpp:302
msgid "Mouse-click-and-drag mode disabled."
msgstr "Режим мыши нажать-и-тянуть выключен."
-#: backends/platform/iphone/osys_events.cpp:314
+#: backends/platform/iphone/osys_events.cpp:313
msgid "Touchpad mode enabled."
msgstr "Режим тачпада включен."
-#: backends/platform/iphone/osys_events.cpp:316
+#: backends/platform/iphone/osys_events.cpp:315
msgid "Touchpad mode disabled."
msgstr "Режим тачпада выключен."
@@ -2480,15 +2628,15 @@ msgstr "Активный графический фильтр:"
msgid "Windowed mode"
msgstr "Оконный режим"
-#: backends/graphics/opengl/opengl-graphics.cpp:130
+#: backends/graphics/opengl/opengl-graphics.cpp:135
msgid "OpenGL Normal"
msgstr "OpenGL без увеличения"
-#: backends/graphics/opengl/opengl-graphics.cpp:131
+#: backends/graphics/opengl/opengl-graphics.cpp:136
msgid "OpenGL Conserve"
msgstr "OpenGL с сохранением"
-#: backends/graphics/opengl/opengl-graphics.cpp:132
+#: backends/graphics/opengl/opengl-graphics.cpp:137
msgid "OpenGL Original"
msgstr "OpenGL изначальный"
diff --git a/po/scummvm.pot b/po/scummvm.pot
index 989779fc91..33ab8552db 100644
--- a/po/scummvm.pot
+++ b/po/scummvm.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ScummVM 1.5.0git\n"
"Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n"
-"POT-Creation-Date: 2012-03-07 22:09+0000\n"
+"POT-Creation-Date: 2012-05-20 22:39+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -43,7 +43,7 @@ msgid "Go up"
msgstr ""
#: gui/browser.cpp:69 gui/chooser.cpp:45 gui/KeysDialog.cpp:43
-#: gui/launcher.cpp:320 gui/massadd.cpp:94 gui/options.cpp:1253
+#: gui/launcher.cpp:345 gui/massadd.cpp:94 gui/options.cpp:1228
#: gui/saveload.cpp:63 gui/saveload.cpp:155 gui/themebrowser.cpp:54
#: engines/engine.cpp:442 engines/scumm/dialogs.cpp:190
#: engines/sword1/control.cpp:865 engines/parallaction/saveload.cpp:281
@@ -68,15 +68,15 @@ msgstr ""
msgid "Mouse click"
msgstr ""
-#: gui/gui-manager.cpp:122 base/main.cpp:288
+#: gui/gui-manager.cpp:122 base/main.cpp:300
msgid "Display keyboard"
msgstr ""
-#: gui/gui-manager.cpp:126 base/main.cpp:292
+#: gui/gui-manager.cpp:126 base/main.cpp:304
msgid "Remap keys"
msgstr ""
-#: gui/gui-manager.cpp:129 base/main.cpp:295
+#: gui/gui-manager.cpp:129 base/main.cpp:307
msgid "Toggle FullScreen"
msgstr ""
@@ -88,8 +88,8 @@ msgstr ""
msgid "Map"
msgstr ""
-#: gui/KeysDialog.cpp:42 gui/launcher.cpp:321 gui/launcher.cpp:960
-#: gui/launcher.cpp:964 gui/massadd.cpp:91 gui/options.cpp:1254
+#: gui/KeysDialog.cpp:42 gui/launcher.cpp:346 gui/launcher.cpp:1001
+#: gui/launcher.cpp:1005 gui/massadd.cpp:91 gui/options.cpp:1229
#: engines/engine.cpp:361 engines/engine.cpp:372 engines/scumm/dialogs.cpp:192
#: engines/scumm/scumm.cpp:1775 engines/agos/animation.cpp:551
#: engines/groovie/script.cpp:420 engines/sky/compact.cpp:131
@@ -126,328 +126,332 @@ msgstr ""
msgid "Press the key to associate"
msgstr ""
-#: gui/launcher.cpp:170
+#: gui/launcher.cpp:187
msgid "Game"
msgstr ""
-#: gui/launcher.cpp:174
+#: gui/launcher.cpp:191
msgid "ID:"
msgstr ""
-#: gui/launcher.cpp:174 gui/launcher.cpp:176 gui/launcher.cpp:177
+#: gui/launcher.cpp:191 gui/launcher.cpp:193 gui/launcher.cpp:194
msgid ""
"Short game identifier used for referring to savegames and running the game "
"from the command line"
msgstr ""
-#: gui/launcher.cpp:176
+#: gui/launcher.cpp:193
msgctxt "lowres"
msgid "ID:"
msgstr ""
-#: gui/launcher.cpp:181
+#: gui/launcher.cpp:198
msgid "Name:"
msgstr ""
-#: gui/launcher.cpp:181 gui/launcher.cpp:183 gui/launcher.cpp:184
+#: gui/launcher.cpp:198 gui/launcher.cpp:200 gui/launcher.cpp:201
msgid "Full title of the game"
msgstr ""
-#: gui/launcher.cpp:183
+#: gui/launcher.cpp:200
msgctxt "lowres"
msgid "Name:"
msgstr ""
-#: gui/launcher.cpp:187
+#: gui/launcher.cpp:204
msgid "Language:"
msgstr ""
-#: gui/launcher.cpp:187 gui/launcher.cpp:188
+#: gui/launcher.cpp:204 gui/launcher.cpp:205
msgid ""
"Language of the game. This will not turn your Spanish game version into "
"English"
msgstr ""
-#: gui/launcher.cpp:189 gui/launcher.cpp:203 gui/options.cpp:80
-#: gui/options.cpp:745 gui/options.cpp:758 gui/options.cpp:1224
+#: gui/launcher.cpp:206 gui/launcher.cpp:220 gui/options.cpp:80
+#: gui/options.cpp:730 gui/options.cpp:743 gui/options.cpp:1199
#: audio/null.cpp:40
msgid "<default>"
msgstr ""
-#: gui/launcher.cpp:199
+#: gui/launcher.cpp:216
msgid "Platform:"
msgstr ""
-#: gui/launcher.cpp:199 gui/launcher.cpp:201 gui/launcher.cpp:202
+#: gui/launcher.cpp:216 gui/launcher.cpp:218 gui/launcher.cpp:219
msgid "Platform the game was originally designed for"
msgstr ""
-#: gui/launcher.cpp:201
+#: gui/launcher.cpp:218
msgctxt "lowres"
msgid "Platform:"
msgstr ""
-#: gui/launcher.cpp:213 gui/options.cpp:1087 gui/options.cpp:1104
+#: gui/launcher.cpp:231
+msgid "Engine"
+msgstr ""
+
+#: gui/launcher.cpp:239 gui/options.cpp:1062 gui/options.cpp:1079
msgid "Graphics"
msgstr ""
-#: gui/launcher.cpp:213 gui/options.cpp:1087 gui/options.cpp:1104
+#: gui/launcher.cpp:239 gui/options.cpp:1062 gui/options.cpp:1079
msgid "GFX"
msgstr ""
-#: gui/launcher.cpp:216
+#: gui/launcher.cpp:242
msgid "Override global graphic settings"
msgstr ""
-#: gui/launcher.cpp:218
+#: gui/launcher.cpp:244
msgctxt "lowres"
msgid "Override global graphic settings"
msgstr ""
-#: gui/launcher.cpp:225 gui/options.cpp:1110
+#: gui/launcher.cpp:251 gui/options.cpp:1085
msgid "Audio"
msgstr ""
-#: gui/launcher.cpp:228
+#: gui/launcher.cpp:254
msgid "Override global audio settings"
msgstr ""
-#: gui/launcher.cpp:230
+#: gui/launcher.cpp:256
msgctxt "lowres"
msgid "Override global audio settings"
msgstr ""
-#: gui/launcher.cpp:239 gui/options.cpp:1115
+#: gui/launcher.cpp:265 gui/options.cpp:1090
msgid "Volume"
msgstr ""
-#: gui/launcher.cpp:241 gui/options.cpp:1117
+#: gui/launcher.cpp:267 gui/options.cpp:1092
msgctxt "lowres"
msgid "Volume"
msgstr ""
-#: gui/launcher.cpp:244
+#: gui/launcher.cpp:270
msgid "Override global volume settings"
msgstr ""
-#: gui/launcher.cpp:246
+#: gui/launcher.cpp:272
msgctxt "lowres"
msgid "Override global volume settings"
msgstr ""
-#: gui/launcher.cpp:254 gui/options.cpp:1125
+#: gui/launcher.cpp:280 gui/options.cpp:1100
msgid "MIDI"
msgstr ""
-#: gui/launcher.cpp:257
+#: gui/launcher.cpp:283
msgid "Override global MIDI settings"
msgstr ""
-#: gui/launcher.cpp:259
+#: gui/launcher.cpp:285
msgctxt "lowres"
msgid "Override global MIDI settings"
msgstr ""
-#: gui/launcher.cpp:268 gui/options.cpp:1131
+#: gui/launcher.cpp:294 gui/options.cpp:1106
msgid "MT-32"
msgstr ""
-#: gui/launcher.cpp:271
+#: gui/launcher.cpp:297
msgid "Override global MT-32 settings"
msgstr ""
-#: gui/launcher.cpp:273
+#: gui/launcher.cpp:299
msgctxt "lowres"
msgid "Override global MT-32 settings"
msgstr ""
-#: gui/launcher.cpp:282 gui/options.cpp:1138
+#: gui/launcher.cpp:308 gui/options.cpp:1113
msgid "Paths"
msgstr ""
-#: gui/launcher.cpp:284 gui/options.cpp:1140
+#: gui/launcher.cpp:310 gui/options.cpp:1115
msgctxt "lowres"
msgid "Paths"
msgstr ""
-#: gui/launcher.cpp:291
+#: gui/launcher.cpp:317
msgid "Game Path:"
msgstr ""
-#: gui/launcher.cpp:293
+#: gui/launcher.cpp:319
msgctxt "lowres"
msgid "Game Path:"
msgstr ""
-#: gui/launcher.cpp:298 gui/options.cpp:1164
+#: gui/launcher.cpp:324 gui/options.cpp:1139
msgid "Extra Path:"
msgstr ""
-#: gui/launcher.cpp:298 gui/launcher.cpp:300 gui/launcher.cpp:301
+#: gui/launcher.cpp:324 gui/launcher.cpp:326 gui/launcher.cpp:327
msgid "Specifies path to additional data used the game"
msgstr ""
-#: gui/launcher.cpp:300 gui/options.cpp:1166
+#: gui/launcher.cpp:326 gui/options.cpp:1141
msgctxt "lowres"
msgid "Extra Path:"
msgstr ""
-#: gui/launcher.cpp:307 gui/options.cpp:1148
+#: gui/launcher.cpp:333 gui/options.cpp:1123
msgid "Save Path:"
msgstr ""
-#: gui/launcher.cpp:307 gui/launcher.cpp:309 gui/launcher.cpp:310
-#: gui/options.cpp:1148 gui/options.cpp:1150 gui/options.cpp:1151
+#: gui/launcher.cpp:333 gui/launcher.cpp:335 gui/launcher.cpp:336
+#: gui/options.cpp:1123 gui/options.cpp:1125 gui/options.cpp:1126
msgid "Specifies where your savegames are put"
msgstr ""
-#: gui/launcher.cpp:309 gui/options.cpp:1150
+#: gui/launcher.cpp:335 gui/options.cpp:1125
msgctxt "lowres"
msgid "Save Path:"
msgstr ""
-#: gui/launcher.cpp:329 gui/launcher.cpp:416 gui/launcher.cpp:469
-#: gui/launcher.cpp:523 gui/options.cpp:1159 gui/options.cpp:1167
-#: gui/options.cpp:1176 gui/options.cpp:1283 gui/options.cpp:1289
-#: gui/options.cpp:1297 gui/options.cpp:1327 gui/options.cpp:1333
-#: gui/options.cpp:1340 gui/options.cpp:1433 gui/options.cpp:1436
-#: gui/options.cpp:1448
+#: gui/launcher.cpp:354 gui/launcher.cpp:453 gui/launcher.cpp:511
+#: gui/launcher.cpp:565 gui/options.cpp:1134 gui/options.cpp:1142
+#: gui/options.cpp:1151 gui/options.cpp:1258 gui/options.cpp:1264
+#: gui/options.cpp:1272 gui/options.cpp:1302 gui/options.cpp:1308
+#: gui/options.cpp:1315 gui/options.cpp:1408 gui/options.cpp:1411
+#: gui/options.cpp:1423
msgctxt "path"
msgid "None"
msgstr ""
-#: gui/launcher.cpp:334 gui/launcher.cpp:422 gui/launcher.cpp:527
-#: gui/options.cpp:1277 gui/options.cpp:1321 gui/options.cpp:1439
+#: gui/launcher.cpp:359 gui/launcher.cpp:459 gui/launcher.cpp:569
+#: gui/options.cpp:1252 gui/options.cpp:1296 gui/options.cpp:1414
#: backends/platform/wii/options.cpp:56
msgid "Default"
msgstr ""
-#: gui/launcher.cpp:462 gui/options.cpp:1442
+#: gui/launcher.cpp:504 gui/options.cpp:1417
msgid "Select SoundFont"
msgstr ""
-#: gui/launcher.cpp:481 gui/launcher.cpp:636
+#: gui/launcher.cpp:523 gui/launcher.cpp:677
msgid "Select directory with game data"
msgstr ""
-#: gui/launcher.cpp:499
+#: gui/launcher.cpp:541
msgid "Select additional game directory"
msgstr ""
-#: gui/launcher.cpp:511
+#: gui/launcher.cpp:553
msgid "Select directory for saved games"
msgstr ""
-#: gui/launcher.cpp:538
+#: gui/launcher.cpp:580
msgid "This game ID is already taken. Please choose another one."
msgstr ""
-#: gui/launcher.cpp:579 engines/dialogs.cpp:110
+#: gui/launcher.cpp:621 engines/dialogs.cpp:110
msgid "~Q~uit"
msgstr ""
-#: gui/launcher.cpp:579 backends/platform/sdl/macosx/appmenu_osx.mm:96
+#: gui/launcher.cpp:621 backends/platform/sdl/macosx/appmenu_osx.mm:96
msgid "Quit ScummVM"
msgstr ""
-#: gui/launcher.cpp:580
+#: gui/launcher.cpp:622
msgid "A~b~out..."
msgstr ""
-#: gui/launcher.cpp:580 backends/platform/sdl/macosx/appmenu_osx.mm:70
+#: gui/launcher.cpp:622 backends/platform/sdl/macosx/appmenu_osx.mm:70
msgid "About ScummVM"
msgstr ""
-#: gui/launcher.cpp:581
+#: gui/launcher.cpp:623
msgid "~O~ptions..."
msgstr ""
-#: gui/launcher.cpp:581
+#: gui/launcher.cpp:623
msgid "Change global ScummVM options"
msgstr ""
-#: gui/launcher.cpp:583
+#: gui/launcher.cpp:625
msgid "~S~tart"
msgstr ""
-#: gui/launcher.cpp:583
+#: gui/launcher.cpp:625
msgid "Start selected game"
msgstr ""
-#: gui/launcher.cpp:586
+#: gui/launcher.cpp:628
msgid "~L~oad..."
msgstr ""
-#: gui/launcher.cpp:586
+#: gui/launcher.cpp:628
msgid "Load savegame for selected game"
msgstr ""
-#: gui/launcher.cpp:591 gui/launcher.cpp:1079
+#: gui/launcher.cpp:633 gui/launcher.cpp:1120
msgid "~A~dd Game..."
msgstr ""
-#: gui/launcher.cpp:591 gui/launcher.cpp:598
+#: gui/launcher.cpp:633 gui/launcher.cpp:640
msgid "Hold Shift for Mass Add"
msgstr ""
-#: gui/launcher.cpp:593
+#: gui/launcher.cpp:635
msgid "~E~dit Game..."
msgstr ""
-#: gui/launcher.cpp:593 gui/launcher.cpp:600
+#: gui/launcher.cpp:635 gui/launcher.cpp:642
msgid "Change game options"
msgstr ""
-#: gui/launcher.cpp:595
+#: gui/launcher.cpp:637
msgid "~R~emove Game"
msgstr ""
-#: gui/launcher.cpp:595 gui/launcher.cpp:602
+#: gui/launcher.cpp:637 gui/launcher.cpp:644
msgid "Remove game from the list. The game data files stay intact"
msgstr ""
-#: gui/launcher.cpp:598 gui/launcher.cpp:1079
+#: gui/launcher.cpp:640 gui/launcher.cpp:1120
msgctxt "lowres"
msgid "~A~dd Game..."
msgstr ""
-#: gui/launcher.cpp:600
+#: gui/launcher.cpp:642
msgctxt "lowres"
msgid "~E~dit Game..."
msgstr ""
-#: gui/launcher.cpp:602
+#: gui/launcher.cpp:644
msgctxt "lowres"
msgid "~R~emove Game"
msgstr ""
-#: gui/launcher.cpp:610
+#: gui/launcher.cpp:652
msgid "Search in game list"
msgstr ""
-#: gui/launcher.cpp:614 gui/launcher.cpp:1126
+#: gui/launcher.cpp:656 gui/launcher.cpp:1167
msgid "Search:"
msgstr ""
-#: gui/launcher.cpp:639 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255
+#: gui/launcher.cpp:680 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255
#: engines/mohawk/riven.cpp:716 engines/cruise/menu.cpp:216
msgid "Load game:"
msgstr ""
-#: gui/launcher.cpp:639 engines/dialogs.cpp:114 engines/scumm/dialogs.cpp:188
+#: gui/launcher.cpp:680 engines/dialogs.cpp:114 engines/scumm/dialogs.cpp:188
#: engines/mohawk/myst.cpp:255 engines/mohawk/riven.cpp:716
#: engines/cruise/menu.cpp:216 backends/platform/wince/CEActionsPocket.cpp:267
#: backends/platform/wince/CEActionsSmartphone.cpp:231
msgid "Load"
msgstr ""
-#: gui/launcher.cpp:747
+#: gui/launcher.cpp:788
msgid ""
"Do you really want to run the mass game detector? This could potentially add "
"a huge number of games."
msgstr ""
-#: gui/launcher.cpp:748 gui/launcher.cpp:896
+#: gui/launcher.cpp:789 gui/launcher.cpp:937
#: backends/events/symbiansdl/symbiansdl-events.cpp:184
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
@@ -455,7 +459,7 @@ msgstr ""
msgid "Yes"
msgstr ""
-#: gui/launcher.cpp:748 gui/launcher.cpp:896
+#: gui/launcher.cpp:789 gui/launcher.cpp:937
#: backends/events/symbiansdl/symbiansdl-events.cpp:184
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
@@ -463,36 +467,36 @@ msgstr ""
msgid "No"
msgstr ""
-#: gui/launcher.cpp:796
+#: gui/launcher.cpp:837
msgid "ScummVM couldn't open the specified directory!"
msgstr ""
-#: gui/launcher.cpp:808
+#: gui/launcher.cpp:849
msgid "ScummVM could not find any game in the specified directory!"
msgstr ""
-#: gui/launcher.cpp:822
+#: gui/launcher.cpp:863
msgid "Pick the game:"
msgstr ""
-#: gui/launcher.cpp:896
+#: gui/launcher.cpp:937
msgid "Do you really want to remove this game configuration?"
msgstr ""
-#: gui/launcher.cpp:960
+#: gui/launcher.cpp:1001
msgid "This game does not support loading games from the launcher."
msgstr ""
-#: gui/launcher.cpp:964
+#: gui/launcher.cpp:1005
msgid "ScummVM could not find any engine capable of running the selected game!"
msgstr ""
-#: gui/launcher.cpp:1078
+#: gui/launcher.cpp:1119
msgctxt "lowres"
msgid "Mass Add..."
msgstr ""
-#: gui/launcher.cpp:1078
+#: gui/launcher.cpp:1119
msgid "Mass Add..."
msgstr ""
@@ -559,349 +563,341 @@ msgstr ""
msgid "48 kHz"
msgstr ""
-#: gui/options.cpp:257 gui/options.cpp:485 gui/options.cpp:586
-#: gui/options.cpp:659 gui/options.cpp:868
+#: gui/options.cpp:248 gui/options.cpp:474 gui/options.cpp:575
+#: gui/options.cpp:644 gui/options.cpp:852
msgctxt "soundfont"
msgid "None"
msgstr ""
-#: gui/options.cpp:393
+#: gui/options.cpp:382
msgid "Failed to apply some of the graphic options changes:"
msgstr ""
-#: gui/options.cpp:405
+#: gui/options.cpp:394
msgid "the video mode could not be changed."
msgstr ""
-#: gui/options.cpp:411
+#: gui/options.cpp:400
msgid "the fullscreen setting could not be changed"
msgstr ""
-#: gui/options.cpp:417
+#: gui/options.cpp:406
msgid "the aspect ratio setting could not be changed"
msgstr ""
-#: gui/options.cpp:742
+#: gui/options.cpp:727
msgid "Graphics mode:"
msgstr ""
-#: gui/options.cpp:756
+#: gui/options.cpp:741
msgid "Render mode:"
msgstr ""
-#: gui/options.cpp:756 gui/options.cpp:757
+#: gui/options.cpp:741 gui/options.cpp:742
msgid "Special dithering modes supported by some games"
msgstr ""
-#: gui/options.cpp:768
+#: gui/options.cpp:753
#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2248
#: backends/graphics/openglsdl/openglsdl-graphics.cpp:472
msgid "Fullscreen mode"
msgstr ""
-#: gui/options.cpp:771
+#: gui/options.cpp:756
msgid "Aspect ratio correction"
msgstr ""
-#: gui/options.cpp:771
+#: gui/options.cpp:756
msgid "Correct aspect ratio for 320x200 games"
msgstr ""
-#: gui/options.cpp:772
-msgid "EGA undithering"
-msgstr ""
-
-#: gui/options.cpp:772
-msgid "Enable undithering in EGA games that support it"
-msgstr ""
-
-#: gui/options.cpp:780
+#: gui/options.cpp:764
msgid "Preferred Device:"
msgstr ""
-#: gui/options.cpp:780
+#: gui/options.cpp:764
msgid "Music Device:"
msgstr ""
-#: gui/options.cpp:780 gui/options.cpp:782
+#: gui/options.cpp:764 gui/options.cpp:766
msgid "Specifies preferred sound device or sound card emulator"
msgstr ""
-#: gui/options.cpp:780 gui/options.cpp:782 gui/options.cpp:783
+#: gui/options.cpp:764 gui/options.cpp:766 gui/options.cpp:767
msgid "Specifies output sound device or sound card emulator"
msgstr ""
-#: gui/options.cpp:782
+#: gui/options.cpp:766
msgctxt "lowres"
msgid "Preferred Dev.:"
msgstr ""
-#: gui/options.cpp:782
+#: gui/options.cpp:766
msgctxt "lowres"
msgid "Music Device:"
msgstr ""
-#: gui/options.cpp:809
+#: gui/options.cpp:793
msgid "AdLib emulator:"
msgstr ""
-#: gui/options.cpp:809 gui/options.cpp:810
+#: gui/options.cpp:793 gui/options.cpp:794
msgid "AdLib is used for music in many games"
msgstr ""
-#: gui/options.cpp:820
+#: gui/options.cpp:804
msgid "Output rate:"
msgstr ""
-#: gui/options.cpp:820 gui/options.cpp:821
+#: gui/options.cpp:804 gui/options.cpp:805
msgid ""
"Higher value specifies better sound quality but may be not supported by your "
"soundcard"
msgstr ""
-#: gui/options.cpp:831
+#: gui/options.cpp:815
msgid "GM Device:"
msgstr ""
-#: gui/options.cpp:831
+#: gui/options.cpp:815
msgid "Specifies default sound device for General MIDI output"
msgstr ""
-#: gui/options.cpp:842
+#: gui/options.cpp:826
msgid "Don't use General MIDI music"
msgstr ""
-#: gui/options.cpp:853 gui/options.cpp:915
+#: gui/options.cpp:837 gui/options.cpp:899
msgid "Use first available device"
msgstr ""
-#: gui/options.cpp:865
+#: gui/options.cpp:849
msgid "SoundFont:"
msgstr ""
-#: gui/options.cpp:865 gui/options.cpp:867 gui/options.cpp:868
+#: gui/options.cpp:849 gui/options.cpp:851 gui/options.cpp:852
msgid "SoundFont is supported by some audio cards, Fluidsynth and Timidity"
msgstr ""
-#: gui/options.cpp:867
+#: gui/options.cpp:851
msgctxt "lowres"
msgid "SoundFont:"
msgstr ""
-#: gui/options.cpp:873
+#: gui/options.cpp:857
msgid "Mixed AdLib/MIDI mode"
msgstr ""
-#: gui/options.cpp:873
+#: gui/options.cpp:857
msgid "Use both MIDI and AdLib sound generation"
msgstr ""
-#: gui/options.cpp:876
+#: gui/options.cpp:860
msgid "MIDI gain:"
msgstr ""
-#: gui/options.cpp:886
+#: gui/options.cpp:870
msgid "MT-32 Device:"
msgstr ""
-#: gui/options.cpp:886
+#: gui/options.cpp:870
msgid "Specifies default sound device for Roland MT-32/LAPC1/CM32l/CM64 output"
msgstr ""
-#: gui/options.cpp:891
+#: gui/options.cpp:875
msgid "True Roland MT-32 (disable GM emulation)"
msgstr ""
-#: gui/options.cpp:891 gui/options.cpp:893
+#: gui/options.cpp:875 gui/options.cpp:877
msgid ""
"Check if you want to use your real hardware Roland-compatible sound device "
"connected to your computer"
msgstr ""
-#: gui/options.cpp:893
+#: gui/options.cpp:877
msgctxt "lowres"
msgid "True Roland MT-32 (no GM emulation)"
msgstr ""
-#: gui/options.cpp:896
+#: gui/options.cpp:880
msgid "Enable Roland GS Mode"
msgstr ""
-#: gui/options.cpp:896
+#: gui/options.cpp:880
msgid "Turns off General MIDI mapping for games with Roland MT-32 soundtrack"
msgstr ""
-#: gui/options.cpp:905
+#: gui/options.cpp:889
msgid "Don't use Roland MT-32 music"
msgstr ""
-#: gui/options.cpp:932
+#: gui/options.cpp:916
msgid "Text and Speech:"
msgstr ""
-#: gui/options.cpp:936 gui/options.cpp:946
+#: gui/options.cpp:920 gui/options.cpp:930
msgid "Speech"
msgstr ""
-#: gui/options.cpp:937 gui/options.cpp:947
+#: gui/options.cpp:921 gui/options.cpp:931
msgid "Subtitles"
msgstr ""
-#: gui/options.cpp:938
+#: gui/options.cpp:922
msgid "Both"
msgstr ""
-#: gui/options.cpp:940
+#: gui/options.cpp:924
msgid "Subtitle speed:"
msgstr ""
-#: gui/options.cpp:942
+#: gui/options.cpp:926
msgctxt "lowres"
msgid "Text and Speech:"
msgstr ""
-#: gui/options.cpp:946
+#: gui/options.cpp:930
msgid "Spch"
msgstr ""
-#: gui/options.cpp:947
+#: gui/options.cpp:931
msgid "Subs"
msgstr ""
-#: gui/options.cpp:948
+#: gui/options.cpp:932
msgctxt "lowres"
msgid "Both"
msgstr ""
-#: gui/options.cpp:948
+#: gui/options.cpp:932
msgid "Show subtitles and play speech"
msgstr ""
-#: gui/options.cpp:950
+#: gui/options.cpp:934
msgctxt "lowres"
msgid "Subtitle speed:"
msgstr ""
-#: gui/options.cpp:966
+#: gui/options.cpp:950
msgid "Music volume:"
msgstr ""
-#: gui/options.cpp:968
+#: gui/options.cpp:952
msgctxt "lowres"
msgid "Music volume:"
msgstr ""
-#: gui/options.cpp:975
+#: gui/options.cpp:959
msgid "Mute All"
msgstr ""
-#: gui/options.cpp:978
+#: gui/options.cpp:962
msgid "SFX volume:"
msgstr ""
-#: gui/options.cpp:978 gui/options.cpp:980 gui/options.cpp:981
+#: gui/options.cpp:962 gui/options.cpp:964 gui/options.cpp:965
msgid "Special sound effects volume"
msgstr ""
-#: gui/options.cpp:980
+#: gui/options.cpp:964
msgctxt "lowres"
msgid "SFX volume:"
msgstr ""
-#: gui/options.cpp:988
+#: gui/options.cpp:972
msgid "Speech volume:"
msgstr ""
-#: gui/options.cpp:990
+#: gui/options.cpp:974
msgctxt "lowres"
msgid "Speech volume:"
msgstr ""
-#: gui/options.cpp:1156
+#: gui/options.cpp:1131
msgid "Theme Path:"
msgstr ""
-#: gui/options.cpp:1158
+#: gui/options.cpp:1133
msgctxt "lowres"
msgid "Theme Path:"
msgstr ""
-#: gui/options.cpp:1164 gui/options.cpp:1166 gui/options.cpp:1167
+#: gui/options.cpp:1139 gui/options.cpp:1141 gui/options.cpp:1142
msgid "Specifies path to additional data used by all games or ScummVM"
msgstr ""
-#: gui/options.cpp:1173
+#: gui/options.cpp:1148
msgid "Plugins Path:"
msgstr ""
-#: gui/options.cpp:1175
+#: gui/options.cpp:1150
msgctxt "lowres"
msgid "Plugins Path:"
msgstr ""
-#: gui/options.cpp:1184
+#: gui/options.cpp:1159
msgid "Misc"
msgstr ""
-#: gui/options.cpp:1186
+#: gui/options.cpp:1161
msgctxt "lowres"
msgid "Misc"
msgstr ""
-#: gui/options.cpp:1188
+#: gui/options.cpp:1163
msgid "Theme:"
msgstr ""
-#: gui/options.cpp:1192
+#: gui/options.cpp:1167
msgid "GUI Renderer:"
msgstr ""
-#: gui/options.cpp:1204
+#: gui/options.cpp:1179
msgid "Autosave:"
msgstr ""
-#: gui/options.cpp:1206
+#: gui/options.cpp:1181
msgctxt "lowres"
msgid "Autosave:"
msgstr ""
-#: gui/options.cpp:1214
+#: gui/options.cpp:1189
msgid "Keys"
msgstr ""
-#: gui/options.cpp:1221
+#: gui/options.cpp:1196
msgid "GUI Language:"
msgstr ""
-#: gui/options.cpp:1221
+#: gui/options.cpp:1196
msgid "Language of ScummVM GUI"
msgstr ""
-#: gui/options.cpp:1372
+#: gui/options.cpp:1347
msgid "You have to restart ScummVM before your changes will take effect."
msgstr ""
-#: gui/options.cpp:1385
+#: gui/options.cpp:1360
msgid "Select directory for savegames"
msgstr ""
-#: gui/options.cpp:1392
+#: gui/options.cpp:1367
msgid "The chosen directory cannot be written to. Please select another one."
msgstr ""
-#: gui/options.cpp:1401
+#: gui/options.cpp:1376
msgid "Select directory for GUI themes"
msgstr ""
-#: gui/options.cpp:1411
+#: gui/options.cpp:1386
msgid "Select directory for extra files"
msgstr ""
-#: gui/options.cpp:1422
+#: gui/options.cpp:1397
msgid "Select directory for plugins"
msgstr ""
-#: gui/options.cpp:1475
+#: gui/options.cpp:1450
msgid ""
"The theme you selected does not support your current language. If you want "
"to use this theme you need to switch to another language first."
@@ -947,64 +943,64 @@ msgstr ""
msgid "Select a Theme"
msgstr ""
-#: gui/ThemeEngine.cpp:333
+#: gui/ThemeEngine.cpp:335
msgid "Disabled GFX"
msgstr ""
-#: gui/ThemeEngine.cpp:333
+#: gui/ThemeEngine.cpp:335
msgctxt "lowres"
msgid "Disabled GFX"
msgstr ""
-#: gui/ThemeEngine.cpp:334
+#: gui/ThemeEngine.cpp:336
msgid "Standard Renderer (16bpp)"
msgstr ""
-#: gui/ThemeEngine.cpp:334
+#: gui/ThemeEngine.cpp:336
msgid "Standard (16bpp)"
msgstr ""
-#: gui/ThemeEngine.cpp:336
+#: gui/ThemeEngine.cpp:338
msgid "Antialiased Renderer (16bpp)"
msgstr ""
-#: gui/ThemeEngine.cpp:336
+#: gui/ThemeEngine.cpp:338
msgid "Antialiased (16bpp)"
msgstr ""
-#: gui/widget.cpp:312 gui/widget.cpp:314 gui/widget.cpp:320 gui/widget.cpp:322
+#: gui/widget.cpp:322 gui/widget.cpp:324 gui/widget.cpp:330 gui/widget.cpp:332
msgid "Clear value"
msgstr ""
-#: base/main.cpp:203
+#: base/main.cpp:209
#, c-format
msgid "Engine does not support debug level '%s'"
msgstr ""
-#: base/main.cpp:275
+#: base/main.cpp:287
msgid "Menu"
msgstr ""
-#: base/main.cpp:278 backends/platform/symbian/src/SymbianActions.cpp:45
+#: base/main.cpp:290 backends/platform/symbian/src/SymbianActions.cpp:45
#: backends/platform/wince/CEActionsPocket.cpp:45
#: backends/platform/wince/CEActionsSmartphone.cpp:46
msgid "Skip"
msgstr ""
-#: base/main.cpp:281 backends/platform/symbian/src/SymbianActions.cpp:50
+#: base/main.cpp:293 backends/platform/symbian/src/SymbianActions.cpp:50
#: backends/platform/wince/CEActionsPocket.cpp:42
msgid "Pause"
msgstr ""
-#: base/main.cpp:284
+#: base/main.cpp:296
msgid "Skip line"
msgstr ""
-#: base/main.cpp:455
+#: base/main.cpp:467
msgid "Error running game:"
msgstr ""
-#: base/main.cpp:479
+#: base/main.cpp:491
msgid "Could not find any engine capable of running the selected game"
msgstr ""
@@ -1072,16 +1068,16 @@ msgstr ""
msgid "Unknown error"
msgstr ""
-#: engines/advancedDetector.cpp:296
+#: engines/advancedDetector.cpp:324
#, c-format
msgid "The game in '%s' seems to be unknown."
msgstr ""
-#: engines/advancedDetector.cpp:297
+#: engines/advancedDetector.cpp:325
msgid "Please, report the following data to the ScummVM team along with name"
msgstr ""
-#: engines/advancedDetector.cpp:299
+#: engines/advancedDetector.cpp:327
msgid "of the game you tried to add and its version/language/etc.:"
msgstr ""
@@ -1118,13 +1114,14 @@ msgctxt "lowres"
msgid "~R~eturn to Launcher"
msgstr ""
-#: engines/dialogs.cpp:116 engines/cruise/menu.cpp:214
-#: engines/sci/engine/kfile.cpp:566
+#: engines/dialogs.cpp:116 engines/agi/saveload.cpp:805
+#: engines/cruise/menu.cpp:214 engines/sci/engine/kfile.cpp:567
msgid "Save game:"
msgstr ""
-#: engines/dialogs.cpp:116 engines/scumm/dialogs.cpp:187
-#: engines/cruise/menu.cpp:214 engines/sci/engine/kfile.cpp:566
+#: engines/dialogs.cpp:116 engines/agi/saveload.cpp:805
+#: engines/scumm/dialogs.cpp:187 engines/cruise/menu.cpp:214
+#: engines/sci/engine/kfile.cpp:567
#: backends/platform/symbian/src/SymbianActions.cpp:44
#: backends/platform/wince/CEActionsPocket.cpp:43
#: backends/platform/wince/CEActionsPocket.cpp:267
@@ -1213,6 +1210,84 @@ msgstr ""
msgid "Start anyway"
msgstr ""
+#: engines/agi/detection.cpp:145 engines/dreamweb/detection.cpp:47
+#: engines/sci/detection.cpp:390
+msgid "Use original save/load screens"
+msgstr ""
+
+#: engines/agi/detection.cpp:146 engines/dreamweb/detection.cpp:48
+#: engines/sci/detection.cpp:391
+msgid "Use the original save/load screens, instead of the ScummVM ones"
+msgstr ""
+
+#: engines/agi/saveload.cpp:827 engines/sci/engine/kfile.cpp:674
+msgid "Restore game:"
+msgstr ""
+
+#: engines/agi/saveload.cpp:827 engines/sci/engine/kfile.cpp:674
+msgid "Restore"
+msgstr ""
+
+#: engines/dreamweb/detection.cpp:57
+msgid "Use bright palette mode"
+msgstr ""
+
+#: engines/dreamweb/detection.cpp:58
+msgid "Display graphics using the game's bright palette"
+msgstr ""
+
+#: engines/sci/detection.cpp:370
+msgid "EGA undithering"
+msgstr ""
+
+#: engines/sci/detection.cpp:371
+msgid "Enable undithering in EGA games"
+msgstr ""
+
+#: engines/sci/detection.cpp:380
+msgid "Prefer digital sound effects"
+msgstr ""
+
+#: engines/sci/detection.cpp:381
+msgid "Prefer digital sound effects instead of synthesized ones"
+msgstr ""
+
+#: engines/sci/detection.cpp:400
+msgid "Use IMF/Yahama FB-01 for MIDI output"
+msgstr ""
+
+#: engines/sci/detection.cpp:401
+msgid ""
+"Use an IBM Music Feature card or a Yahama FB-01 FM synth module for MIDI "
+"output"
+msgstr ""
+
+#: engines/sci/detection.cpp:411
+msgid "Use CD audio"
+msgstr ""
+
+#: engines/sci/detection.cpp:412
+msgid "Use CD audio instead of in-game audio, if available"
+msgstr ""
+
+#: engines/sci/detection.cpp:422
+msgid "Use Windows cursors"
+msgstr ""
+
+#: engines/sci/detection.cpp:423
+msgid ""
+"Use the Windows cursors (smaller and monochrome) instead of the DOS ones"
+msgstr ""
+
+#: engines/sci/detection.cpp:433
+msgid "Use silver cursors"
+msgstr ""
+
+#: engines/sci/detection.cpp:434
+msgid ""
+"Use the alternate set of silver cursors, instead of the normal golden ones"
+msgstr ""
+
#: engines/scumm/dialogs.cpp:175
#, c-format
msgid "Insert Disk %c and Press Button to Continue."
@@ -1867,7 +1942,7 @@ msgid ""
"but %s is missing. Using AdLib instead."
msgstr ""
-#: engines/scumm/scumm.cpp:2271 engines/agos/saveload.cpp:189
+#: engines/scumm/scumm.cpp:2271 engines/agos/saveload.cpp:202
#, c-format
msgid ""
"Failed to save game state to file:\n"
@@ -1875,7 +1950,7 @@ msgid ""
"%s"
msgstr ""
-#: engines/scumm/scumm.cpp:2278 engines/agos/saveload.cpp:154
+#: engines/scumm/scumm.cpp:2278 engines/agos/saveload.cpp:167
#, c-format
msgid ""
"Failed to load game state from file:\n"
@@ -1883,7 +1958,7 @@ msgid ""
"%s"
msgstr ""
-#: engines/scumm/scumm.cpp:2290 engines/agos/saveload.cpp:197
+#: engines/scumm/scumm.cpp:2290 engines/agos/saveload.cpp:210
#, c-format
msgid ""
"Successfully saved game state in file:\n"
@@ -1924,14 +1999,6 @@ msgstr ""
msgid "~W~ater Effect Enabled"
msgstr ""
-#: engines/sci/engine/kfile.cpp:673
-msgid "Restore game:"
-msgstr ""
-
-#: engines/sci/engine/kfile.cpp:673
-msgid "Restore"
-msgstr ""
-
#: engines/agos/animation.cpp:550
#, c-format
msgid "Cutscene file '%s' not found!"
@@ -1954,6 +2021,64 @@ msgstr ""
msgid "Failed to save game"
msgstr ""
+#. I18N: Studio audience adds an applause and cheering sounds whenever
+#. Malcolm makes a joke.
+#: engines/kyra/detection.cpp:62
+msgid "Studio audience"
+msgstr ""
+
+#: engines/kyra/detection.cpp:63
+msgid "Enable studio audience"
+msgstr ""
+
+#. I18N: This option allows the user to skip text and cutscenes.
+#: engines/kyra/detection.cpp:73
+msgid "Skip support"
+msgstr ""
+
+#: engines/kyra/detection.cpp:74
+msgid "Allow text and cutscenes to be skipped"
+msgstr ""
+
+#. I18N: Helium mode makes people sound like they've inhaled Helium.
+#: engines/kyra/detection.cpp:84
+msgid "Helium mode"
+msgstr ""
+
+#: engines/kyra/detection.cpp:85
+msgid "Enable helium mode"
+msgstr ""
+
+#. I18N: When enabled, this option makes scrolling smoother when
+#. changing from one screen to another.
+#: engines/kyra/detection.cpp:99
+msgid "Smooth scrolling"
+msgstr ""
+
+#: engines/kyra/detection.cpp:100
+msgid "Enable smooth scrolling when walking"
+msgstr ""
+
+#. I18N: When enabled, this option changes the cursor when it floats to the
+#. edge of the screen to a directional arrow. The player can then click to
+#. walk towards that direction.
+#: engines/kyra/detection.cpp:112
+msgid "Floating cursors"
+msgstr ""
+
+#: engines/kyra/detection.cpp:113
+msgid "Enable floating cursors"
+msgstr ""
+
+#. I18N: HP stands for Hit Points
+#: engines/kyra/detection.cpp:127
+msgid "HP bar graphs"
+msgstr ""
+
+#: engines/kyra/detection.cpp:128
+msgid "Enable hit point bar graphs"
+msgstr ""
+
#: engines/kyra/lol.cpp:478
msgid "Attack 1"
msgstr ""
@@ -2011,6 +2136,14 @@ msgid ""
"that a few tracks will not be correctly played."
msgstr ""
+#: engines/queen/queen.cpp:59 engines/sky/detection.cpp:44
+msgid "Floppy intro"
+msgstr ""
+
+#: engines/queen/queen.cpp:60 engines/sky/detection.cpp:45
+msgid "Use the floppy version's intro (CD version only)"
+msgstr ""
+
#: engines/sky/compact.cpp:130
msgid ""
"Unable to find \"sky.cpt\" file!\n"
@@ -2076,6 +2209,14 @@ msgid ""
"PSX cutscenes found but ScummVM has been built without RGB color support"
msgstr ""
+#: engines/sword2/sword2.cpp:79
+msgid "Show object labels"
+msgstr ""
+
+#: engines/sword2/sword2.cpp:80
+msgid "Show labels for objects on mouse hover"
+msgstr ""
+
#: engines/parallaction/saveload.cpp:133
#, c-format
msgid ""
@@ -2290,19 +2431,19 @@ msgstr ""
msgid "Disable power off"
msgstr ""
-#: backends/platform/iphone/osys_events.cpp:301
+#: backends/platform/iphone/osys_events.cpp:300
msgid "Mouse-click-and-drag mode enabled."
msgstr ""
-#: backends/platform/iphone/osys_events.cpp:303
+#: backends/platform/iphone/osys_events.cpp:302
msgid "Mouse-click-and-drag mode disabled."
msgstr ""
-#: backends/platform/iphone/osys_events.cpp:314
+#: backends/platform/iphone/osys_events.cpp:313
msgid "Touchpad mode enabled."
msgstr ""
-#: backends/platform/iphone/osys_events.cpp:316
+#: backends/platform/iphone/osys_events.cpp:315
msgid "Touchpad mode disabled."
msgstr ""
@@ -2378,15 +2519,15 @@ msgstr ""
msgid "Windowed mode"
msgstr ""
-#: backends/graphics/opengl/opengl-graphics.cpp:130
+#: backends/graphics/opengl/opengl-graphics.cpp:135
msgid "OpenGL Normal"
msgstr ""
-#: backends/graphics/opengl/opengl-graphics.cpp:131
+#: backends/graphics/opengl/opengl-graphics.cpp:136
msgid "OpenGL Conserve"
msgstr ""
-#: backends/graphics/opengl/opengl-graphics.cpp:132
+#: backends/graphics/opengl/opengl-graphics.cpp:137
msgid "OpenGL Original"
msgstr ""
diff --git a/po/se_SE.po b/po/se_SE.po
index 812852ca53..592fbcdd58 100644
--- a/po/se_SE.po
+++ b/po/se_SE.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ScummVM 1.3.0svn\n"
"Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n"
-"POT-Creation-Date: 2012-03-07 22:09+0000\n"
+"POT-Creation-Date: 2012-05-20 22:39+0100\n"
"PO-Revision-Date: 2011-11-27 19:00+0100\n"
"Last-Translator: Hampus Flink <hampus.flink@gmail.com>\n"
"Language-Team: \n"
@@ -47,7 +47,7 @@ msgid "Go up"
msgstr "Uppхt"
#: gui/browser.cpp:69 gui/chooser.cpp:45 gui/KeysDialog.cpp:43
-#: gui/launcher.cpp:320 gui/massadd.cpp:94 gui/options.cpp:1253
+#: gui/launcher.cpp:345 gui/massadd.cpp:94 gui/options.cpp:1228
#: gui/saveload.cpp:63 gui/saveload.cpp:155 gui/themebrowser.cpp:54
#: engines/engine.cpp:442 engines/scumm/dialogs.cpp:190
#: engines/sword1/control.cpp:865 engines/parallaction/saveload.cpp:281
@@ -72,15 +72,15 @@ msgstr "Stфng"
msgid "Mouse click"
msgstr "Musklick"
-#: gui/gui-manager.cpp:122 base/main.cpp:288
+#: gui/gui-manager.cpp:122 base/main.cpp:300
msgid "Display keyboard"
msgstr "Visa tangentbord"
-#: gui/gui-manager.cpp:126 base/main.cpp:292
+#: gui/gui-manager.cpp:126 base/main.cpp:304
msgid "Remap keys"
msgstr "Stфll in tangenter"
-#: gui/gui-manager.cpp:129 base/main.cpp:295
+#: gui/gui-manager.cpp:129 base/main.cpp:307
#, fuzzy
msgid "Toggle FullScreen"
msgstr "Fullskфrmslфge"
@@ -93,8 +93,8 @@ msgstr "Vфlj en handling att stфlla in"
msgid "Map"
msgstr "Stфll in"
-#: gui/KeysDialog.cpp:42 gui/launcher.cpp:321 gui/launcher.cpp:960
-#: gui/launcher.cpp:964 gui/massadd.cpp:91 gui/options.cpp:1254
+#: gui/KeysDialog.cpp:42 gui/launcher.cpp:346 gui/launcher.cpp:1001
+#: gui/launcher.cpp:1005 gui/massadd.cpp:91 gui/options.cpp:1229
#: engines/engine.cpp:361 engines/engine.cpp:372 engines/scumm/dialogs.cpp:192
#: engines/scumm/scumm.cpp:1775 engines/agos/animation.cpp:551
#: engines/groovie/script.cpp:420 engines/sky/compact.cpp:131
@@ -131,15 +131,15 @@ msgstr "Var god vфlj en handling"
msgid "Press the key to associate"
msgstr "Tryck pх en tangent fіr att stфlla in"
-#: gui/launcher.cpp:170
+#: gui/launcher.cpp:187
msgid "Game"
msgstr "Spel"
-#: gui/launcher.cpp:174
+#: gui/launcher.cpp:191
msgid "ID:"
msgstr "ID:"
-#: gui/launcher.cpp:174 gui/launcher.cpp:176 gui/launcher.cpp:177
+#: gui/launcher.cpp:191 gui/launcher.cpp:193 gui/launcher.cpp:194
msgid ""
"Short game identifier used for referring to savegames and running the game "
"from the command line"
@@ -147,29 +147,29 @@ msgstr ""
"Kortnamn fіr spel. Anvфnds fіr att hфnvisa till spardata och att starta "
"spelet frхn kommandoraden"
-#: gui/launcher.cpp:176
+#: gui/launcher.cpp:193
msgctxt "lowres"
msgid "ID:"
msgstr "ID:"
-#: gui/launcher.cpp:181
+#: gui/launcher.cpp:198
msgid "Name:"
msgstr "Namn:"
-#: gui/launcher.cpp:181 gui/launcher.cpp:183 gui/launcher.cpp:184
+#: gui/launcher.cpp:198 gui/launcher.cpp:200 gui/launcher.cpp:201
msgid "Full title of the game"
msgstr "Spelets fullstфndiga titel"
-#: gui/launcher.cpp:183
+#: gui/launcher.cpp:200
msgctxt "lowres"
msgid "Name:"
msgstr "Namn:"
-#: gui/launcher.cpp:187
+#: gui/launcher.cpp:204
msgid "Language:"
msgstr "Sprхk:"
-#: gui/launcher.cpp:187 gui/launcher.cpp:188
+#: gui/launcher.cpp:204 gui/launcher.cpp:205
msgid ""
"Language of the game. This will not turn your Spanish game version into "
"English"
@@ -177,280 +177,285 @@ msgstr ""
"Spelets sprхk. Den hфr instфllningen omvandlar inte din spanska spelversion "
"till en engelsk"
-#: gui/launcher.cpp:189 gui/launcher.cpp:203 gui/options.cpp:80
-#: gui/options.cpp:745 gui/options.cpp:758 gui/options.cpp:1224
+#: gui/launcher.cpp:206 gui/launcher.cpp:220 gui/options.cpp:80
+#: gui/options.cpp:730 gui/options.cpp:743 gui/options.cpp:1199
#: audio/null.cpp:40
msgid "<default>"
msgstr "<standard>"
-#: gui/launcher.cpp:199
+#: gui/launcher.cpp:216
msgid "Platform:"
msgstr "Plattform:"
-#: gui/launcher.cpp:199 gui/launcher.cpp:201 gui/launcher.cpp:202
+#: gui/launcher.cpp:216 gui/launcher.cpp:218 gui/launcher.cpp:219
msgid "Platform the game was originally designed for"
msgstr "Plattformen spelet ursprungligen tillverkades fіr"
-#: gui/launcher.cpp:201
+#: gui/launcher.cpp:218
msgctxt "lowres"
msgid "Platform:"
msgstr "Plattform:"
-#: gui/launcher.cpp:213 gui/options.cpp:1087 gui/options.cpp:1104
+#: gui/launcher.cpp:231
+#, fuzzy
+msgid "Engine"
+msgstr "Undersіk"
+
+#: gui/launcher.cpp:239 gui/options.cpp:1062 gui/options.cpp:1079
msgid "Graphics"
msgstr "Grafik"
-#: gui/launcher.cpp:213 gui/options.cpp:1087 gui/options.cpp:1104
+#: gui/launcher.cpp:239 gui/options.cpp:1062 gui/options.cpp:1079
msgid "GFX"
msgstr "GFX"
-#: gui/launcher.cpp:216
+#: gui/launcher.cpp:242
msgid "Override global graphic settings"
msgstr "жverskrid globala grafikinstфllningar"
-#: gui/launcher.cpp:218
+#: gui/launcher.cpp:244
msgctxt "lowres"
msgid "Override global graphic settings"
msgstr "жverskrid globala grafikinstфllningar"
-#: gui/launcher.cpp:225 gui/options.cpp:1110
+#: gui/launcher.cpp:251 gui/options.cpp:1085
msgid "Audio"
msgstr "Ljud"
-#: gui/launcher.cpp:228
+#: gui/launcher.cpp:254
msgid "Override global audio settings"
msgstr "жverskrid globala ljudinstфllningar"
-#: gui/launcher.cpp:230
+#: gui/launcher.cpp:256
msgctxt "lowres"
msgid "Override global audio settings"
msgstr "жverskrid globala ljudinstфllningar"
-#: gui/launcher.cpp:239 gui/options.cpp:1115
+#: gui/launcher.cpp:265 gui/options.cpp:1090
msgid "Volume"
msgstr "Volym"
-#: gui/launcher.cpp:241 gui/options.cpp:1117
+#: gui/launcher.cpp:267 gui/options.cpp:1092
msgctxt "lowres"
msgid "Volume"
msgstr "Volym"
-#: gui/launcher.cpp:244
+#: gui/launcher.cpp:270
msgid "Override global volume settings"
msgstr "жverskrid globala volyminstфllningar"
-#: gui/launcher.cpp:246
+#: gui/launcher.cpp:272
msgctxt "lowres"
msgid "Override global volume settings"
msgstr "жverskrid globala volyminstфllningar"
-#: gui/launcher.cpp:254 gui/options.cpp:1125
+#: gui/launcher.cpp:280 gui/options.cpp:1100
msgid "MIDI"
msgstr "MIDI"
-#: gui/launcher.cpp:257
+#: gui/launcher.cpp:283
msgid "Override global MIDI settings"
msgstr "жverskrid globala MIDI-instфllningar"
-#: gui/launcher.cpp:259
+#: gui/launcher.cpp:285
msgctxt "lowres"
msgid "Override global MIDI settings"
msgstr "жverskrid globala MIDI-instфllningar"
-#: gui/launcher.cpp:268 gui/options.cpp:1131
+#: gui/launcher.cpp:294 gui/options.cpp:1106
msgid "MT-32"
msgstr "MT-32"
-#: gui/launcher.cpp:271
+#: gui/launcher.cpp:297
msgid "Override global MT-32 settings"
msgstr "жverskrid globala MT-32 instфllningar"
-#: gui/launcher.cpp:273
+#: gui/launcher.cpp:299
msgctxt "lowres"
msgid "Override global MT-32 settings"
msgstr "жverskrid globala MT-32 instфllningar"
-#: gui/launcher.cpp:282 gui/options.cpp:1138
+#: gui/launcher.cpp:308 gui/options.cpp:1113
msgid "Paths"
msgstr "Sіkvфgar"
-#: gui/launcher.cpp:284 gui/options.cpp:1140
+#: gui/launcher.cpp:310 gui/options.cpp:1115
msgctxt "lowres"
msgid "Paths"
msgstr "Sіkvфgar"
-#: gui/launcher.cpp:291
+#: gui/launcher.cpp:317
msgid "Game Path:"
msgstr "Sіkv. spel:"
-#: gui/launcher.cpp:293
+#: gui/launcher.cpp:319
msgctxt "lowres"
msgid "Game Path:"
msgstr "Sіkv. spel:"
-#: gui/launcher.cpp:298 gui/options.cpp:1164
+#: gui/launcher.cpp:324 gui/options.cpp:1139
msgid "Extra Path:"
msgstr "Sіkv. extra:"
-#: gui/launcher.cpp:298 gui/launcher.cpp:300 gui/launcher.cpp:301
+#: gui/launcher.cpp:324 gui/launcher.cpp:326 gui/launcher.cpp:327
msgid "Specifies path to additional data used the game"
msgstr "Bestфmmer sіkvфgen till ytterligare data som spelet anvфnder"
-#: gui/launcher.cpp:300 gui/options.cpp:1166
+#: gui/launcher.cpp:326 gui/options.cpp:1141
msgctxt "lowres"
msgid "Extra Path:"
msgstr "Sіkv. extra:"
-#: gui/launcher.cpp:307 gui/options.cpp:1148
+#: gui/launcher.cpp:333 gui/options.cpp:1123
msgid "Save Path:"
msgstr "Sіkv. sparat:"
-#: gui/launcher.cpp:307 gui/launcher.cpp:309 gui/launcher.cpp:310
-#: gui/options.cpp:1148 gui/options.cpp:1150 gui/options.cpp:1151
+#: gui/launcher.cpp:333 gui/launcher.cpp:335 gui/launcher.cpp:336
+#: gui/options.cpp:1123 gui/options.cpp:1125 gui/options.cpp:1126
msgid "Specifies where your savegames are put"
msgstr "Bestфmmer var dina spardata lagras"
-#: gui/launcher.cpp:309 gui/options.cpp:1150
+#: gui/launcher.cpp:335 gui/options.cpp:1125
msgctxt "lowres"
msgid "Save Path:"
msgstr "Sіkv. sparat:"
-#: gui/launcher.cpp:329 gui/launcher.cpp:416 gui/launcher.cpp:469
-#: gui/launcher.cpp:523 gui/options.cpp:1159 gui/options.cpp:1167
-#: gui/options.cpp:1176 gui/options.cpp:1283 gui/options.cpp:1289
-#: gui/options.cpp:1297 gui/options.cpp:1327 gui/options.cpp:1333
-#: gui/options.cpp:1340 gui/options.cpp:1433 gui/options.cpp:1436
-#: gui/options.cpp:1448
+#: gui/launcher.cpp:354 gui/launcher.cpp:453 gui/launcher.cpp:511
+#: gui/launcher.cpp:565 gui/options.cpp:1134 gui/options.cpp:1142
+#: gui/options.cpp:1151 gui/options.cpp:1258 gui/options.cpp:1264
+#: gui/options.cpp:1272 gui/options.cpp:1302 gui/options.cpp:1308
+#: gui/options.cpp:1315 gui/options.cpp:1408 gui/options.cpp:1411
+#: gui/options.cpp:1423
msgctxt "path"
msgid "None"
msgstr "Ingen"
-#: gui/launcher.cpp:334 gui/launcher.cpp:422 gui/launcher.cpp:527
-#: gui/options.cpp:1277 gui/options.cpp:1321 gui/options.cpp:1439
+#: gui/launcher.cpp:359 gui/launcher.cpp:459 gui/launcher.cpp:569
+#: gui/options.cpp:1252 gui/options.cpp:1296 gui/options.cpp:1414
#: backends/platform/wii/options.cpp:56
msgid "Default"
msgstr "Standard"
-#: gui/launcher.cpp:462 gui/options.cpp:1442
+#: gui/launcher.cpp:504 gui/options.cpp:1417
msgid "Select SoundFont"
msgstr "Vфlj SoundFont"
-#: gui/launcher.cpp:481 gui/launcher.cpp:636
+#: gui/launcher.cpp:523 gui/launcher.cpp:677
msgid "Select directory with game data"
msgstr "Vфlj katalog med speldata"
-#: gui/launcher.cpp:499
+#: gui/launcher.cpp:541
msgid "Select additional game directory"
msgstr "Vфlj en ytterligare spelkatalog"
-#: gui/launcher.cpp:511
+#: gui/launcher.cpp:553
msgid "Select directory for saved games"
msgstr "Vфlj katalog fіr spardata"
-#: gui/launcher.cpp:538
+#: gui/launcher.cpp:580
msgid "This game ID is already taken. Please choose another one."
msgstr "Detta ID-namn фr upptaget. Var god vфlj ett annat."
-#: gui/launcher.cpp:579 engines/dialogs.cpp:110
+#: gui/launcher.cpp:621 engines/dialogs.cpp:110
msgid "~Q~uit"
msgstr "~A~vsluta"
-#: gui/launcher.cpp:579 backends/platform/sdl/macosx/appmenu_osx.mm:96
+#: gui/launcher.cpp:621 backends/platform/sdl/macosx/appmenu_osx.mm:96
msgid "Quit ScummVM"
msgstr "Avsluta ScummVM"
-#: gui/launcher.cpp:580
+#: gui/launcher.cpp:622
msgid "A~b~out..."
msgstr "O~m~..."
-#: gui/launcher.cpp:580 backends/platform/sdl/macosx/appmenu_osx.mm:70
+#: gui/launcher.cpp:622 backends/platform/sdl/macosx/appmenu_osx.mm:70
msgid "About ScummVM"
msgstr "Om ScummVM"
-#: gui/launcher.cpp:581
+#: gui/launcher.cpp:623
msgid "~O~ptions..."
msgstr "~I~nstфllningar..."
-#: gui/launcher.cpp:581
+#: gui/launcher.cpp:623
msgid "Change global ScummVM options"
msgstr "Redigera globala ScummVM-instфllningar"
-#: gui/launcher.cpp:583
+#: gui/launcher.cpp:625
msgid "~S~tart"
msgstr "~S~tarta"
-#: gui/launcher.cpp:583
+#: gui/launcher.cpp:625
msgid "Start selected game"
msgstr "Starta det valda spelet"
-#: gui/launcher.cpp:586
+#: gui/launcher.cpp:628
msgid "~L~oad..."
msgstr "~L~adda..."
-#: gui/launcher.cpp:586
+#: gui/launcher.cpp:628
msgid "Load savegame for selected game"
msgstr "Ladda spardata fіr det valda spelet"
-#: gui/launcher.cpp:591 gui/launcher.cpp:1079
+#: gui/launcher.cpp:633 gui/launcher.cpp:1120
msgid "~A~dd Game..."
msgstr "Lф~g~g till spel..."
-#: gui/launcher.cpp:591 gui/launcher.cpp:598
+#: gui/launcher.cpp:633 gui/launcher.cpp:640
msgid "Hold Shift for Mass Add"
msgstr "Hхll ned Skift fіr masstillфgg"
-#: gui/launcher.cpp:593
+#: gui/launcher.cpp:635
msgid "~E~dit Game..."
msgstr "R~e~digera spel..."
-#: gui/launcher.cpp:593 gui/launcher.cpp:600
+#: gui/launcher.cpp:635 gui/launcher.cpp:642
msgid "Change game options"
msgstr "Redigera spelinstфllningarna"
-#: gui/launcher.cpp:595
+#: gui/launcher.cpp:637
msgid "~R~emove Game"
msgstr "~R~adera spel"
-#: gui/launcher.cpp:595 gui/launcher.cpp:602
+#: gui/launcher.cpp:637 gui/launcher.cpp:644
msgid "Remove game from the list. The game data files stay intact"
msgstr "Radera spelet frхn listan. Spelets datafiler pхverkas inte."
-#: gui/launcher.cpp:598 gui/launcher.cpp:1079
+#: gui/launcher.cpp:640 gui/launcher.cpp:1120
msgctxt "lowres"
msgid "~A~dd Game..."
msgstr "Lф~g~g till spel..."
-#: gui/launcher.cpp:600
+#: gui/launcher.cpp:642
msgctxt "lowres"
msgid "~E~dit Game..."
msgstr "R~e~digera spel..."
-#: gui/launcher.cpp:602
+#: gui/launcher.cpp:644
msgctxt "lowres"
msgid "~R~emove Game"
msgstr "~R~adera spel"
-#: gui/launcher.cpp:610
+#: gui/launcher.cpp:652
msgid "Search in game list"
msgstr "Sіk i spellistan"
-#: gui/launcher.cpp:614 gui/launcher.cpp:1126
+#: gui/launcher.cpp:656 gui/launcher.cpp:1167
msgid "Search:"
msgstr "Sіk:"
-#: gui/launcher.cpp:639 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255
+#: gui/launcher.cpp:680 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255
#: engines/mohawk/riven.cpp:716 engines/cruise/menu.cpp:216
msgid "Load game:"
msgstr "Ladda spel:"
-#: gui/launcher.cpp:639 engines/dialogs.cpp:114 engines/scumm/dialogs.cpp:188
+#: gui/launcher.cpp:680 engines/dialogs.cpp:114 engines/scumm/dialogs.cpp:188
#: engines/mohawk/myst.cpp:255 engines/mohawk/riven.cpp:716
#: engines/cruise/menu.cpp:216 backends/platform/wince/CEActionsPocket.cpp:267
#: backends/platform/wince/CEActionsSmartphone.cpp:231
msgid "Load"
msgstr "Ladda"
-#: gui/launcher.cpp:747
+#: gui/launcher.cpp:788
msgid ""
"Do you really want to run the mass game detector? This could potentially add "
"a huge number of games."
@@ -458,7 +463,7 @@ msgstr ""
"Vill du verkligen anvфnda mass-speldetektorn? Processen kan potentiellt "
"lфgga till ett enormt antal spel."
-#: gui/launcher.cpp:748 gui/launcher.cpp:896
+#: gui/launcher.cpp:789 gui/launcher.cpp:937
#: backends/events/symbiansdl/symbiansdl-events.cpp:184
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
@@ -466,7 +471,7 @@ msgstr ""
msgid "Yes"
msgstr "Ja"
-#: gui/launcher.cpp:748 gui/launcher.cpp:896
+#: gui/launcher.cpp:789 gui/launcher.cpp:937
#: backends/events/symbiansdl/symbiansdl-events.cpp:184
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
@@ -474,37 +479,37 @@ msgstr "Ja"
msgid "No"
msgstr "Nej"
-#: gui/launcher.cpp:796
+#: gui/launcher.cpp:837
msgid "ScummVM couldn't open the specified directory!"
msgstr "ScummVM kunde inte іppna den valda katalogen!"
-#: gui/launcher.cpp:808
+#: gui/launcher.cpp:849
msgid "ScummVM could not find any game in the specified directory!"
msgstr "ScummVM kunde inte hitta nхgra spel i den valda katalogen!"
-#: gui/launcher.cpp:822
+#: gui/launcher.cpp:863
msgid "Pick the game:"
msgstr "Vфlj spel:"
-#: gui/launcher.cpp:896
+#: gui/launcher.cpp:937
msgid "Do you really want to remove this game configuration?"
msgstr "Vill du verkligen radera den hфr spelkonfigurationen?"
-#: gui/launcher.cpp:960
+#: gui/launcher.cpp:1001
msgid "This game does not support loading games from the launcher."
msgstr "Det hфr spelet stіder inte laddning av spardata frхn launchern."
-#: gui/launcher.cpp:964
+#: gui/launcher.cpp:1005
msgid "ScummVM could not find any engine capable of running the selected game!"
msgstr ""
"ScummVM kunde inte hitta en motor kapabel till att kіra det valda spelet!"
-#: gui/launcher.cpp:1078
+#: gui/launcher.cpp:1119
msgctxt "lowres"
msgid "Mass Add..."
msgstr "Masstillфgg..."
-#: gui/launcher.cpp:1078
+#: gui/launcher.cpp:1119
msgid "Mass Add..."
msgstr "Masstillфgg..."
@@ -571,101 +576,93 @@ msgstr "44 kHz"
msgid "48 kHz"
msgstr "48 kHz"
-#: gui/options.cpp:257 gui/options.cpp:485 gui/options.cpp:586
-#: gui/options.cpp:659 gui/options.cpp:868
+#: gui/options.cpp:248 gui/options.cpp:474 gui/options.cpp:575
+#: gui/options.cpp:644 gui/options.cpp:852
msgctxt "soundfont"
msgid "None"
msgstr "Ingen"
-#: gui/options.cpp:393
+#: gui/options.cpp:382
msgid "Failed to apply some of the graphic options changes:"
msgstr "Kunde inte verkstфlla nхgra av grafikinstфllningarna:"
-#: gui/options.cpp:405
+#: gui/options.cpp:394
msgid "the video mode could not be changed."
msgstr "videolфget kunde inte фndras."
-#: gui/options.cpp:411
+#: gui/options.cpp:400
msgid "the fullscreen setting could not be changed"
msgstr "fullskфrmsinstфllningen kunde inte фndras."
-#: gui/options.cpp:417
+#: gui/options.cpp:406
msgid "the aspect ratio setting could not be changed"
msgstr "instфllningen fіr bildfіrhхllandet kunde inte фndras."
-#: gui/options.cpp:742
+#: gui/options.cpp:727
msgid "Graphics mode:"
msgstr "Grafiklфge:"
-#: gui/options.cpp:756
+#: gui/options.cpp:741
msgid "Render mode:"
msgstr "Renderingslфge:"
-#: gui/options.cpp:756 gui/options.cpp:757
+#: gui/options.cpp:741 gui/options.cpp:742
msgid "Special dithering modes supported by some games"
msgstr "Speciella gitterlфgen stіdda av vissa spel"
-#: gui/options.cpp:768
+#: gui/options.cpp:753
#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2248
#: backends/graphics/openglsdl/openglsdl-graphics.cpp:472
msgid "Fullscreen mode"
msgstr "Fullskфrmslфge"
-#: gui/options.cpp:771
+#: gui/options.cpp:756
msgid "Aspect ratio correction"
msgstr "Korrektion av bildfіrhхllande"
-#: gui/options.cpp:771
+#: gui/options.cpp:756
msgid "Correct aspect ratio for 320x200 games"
msgstr "Korrigerar bildfіrhхllanden fіr 320x200-spel"
-#: gui/options.cpp:772
-msgid "EGA undithering"
-msgstr "EGA anti-gitter"
-
-#: gui/options.cpp:772
-msgid "Enable undithering in EGA games that support it"
-msgstr "Aktiverar anti-gitter i EGA spel som stіder det"
-
-#: gui/options.cpp:780
+#: gui/options.cpp:764
msgid "Preferred Device:"
msgstr "Fіredragen enhet:"
-#: gui/options.cpp:780
+#: gui/options.cpp:764
msgid "Music Device:"
msgstr "Musikenhet:"
-#: gui/options.cpp:780 gui/options.cpp:782
+#: gui/options.cpp:764 gui/options.cpp:766
msgid "Specifies preferred sound device or sound card emulator"
msgstr "Bestфmmer din fіredragna emulator fіr ljudenhet eller ljudkort"
-#: gui/options.cpp:780 gui/options.cpp:782 gui/options.cpp:783
+#: gui/options.cpp:764 gui/options.cpp:766 gui/options.cpp:767
msgid "Specifies output sound device or sound card emulator"
msgstr "Bestфmmer emulator fіr ljudenhet eller ljudkort"
-#: gui/options.cpp:782
+#: gui/options.cpp:766
msgctxt "lowres"
msgid "Preferred Dev.:"
msgstr "Fіredr. enhet:"
-#: gui/options.cpp:782
+#: gui/options.cpp:766
msgctxt "lowres"
msgid "Music Device:"
msgstr "Musikenhet:"
-#: gui/options.cpp:809
+#: gui/options.cpp:793
msgid "AdLib emulator:"
msgstr "AdLib-emulator:"
-#: gui/options.cpp:809 gui/options.cpp:810
+#: gui/options.cpp:793 gui/options.cpp:794
msgid "AdLib is used for music in many games"
msgstr "AdLib anvфnds fіr musik i mхnga spel"
-#: gui/options.cpp:820
+#: gui/options.cpp:804
msgid "Output rate:"
msgstr "Ljudfrekvens:"
-#: gui/options.cpp:820 gui/options.cpp:821
+#: gui/options.cpp:804 gui/options.cpp:805
msgid ""
"Higher value specifies better sound quality but may be not supported by your "
"soundcard"
@@ -673,61 +670,61 @@ msgstr ""
"Ett hіgre vфrde betecknar bфttre ljudkvalitet men stіds kanske inte av ditt "
"ljudkort"
-#: gui/options.cpp:831
+#: gui/options.cpp:815
msgid "GM Device:"
msgstr "GM-enhet:"
-#: gui/options.cpp:831
+#: gui/options.cpp:815
msgid "Specifies default sound device for General MIDI output"
msgstr "Bestфmmer standardenheten fіr General MIDI-uppspelning"
-#: gui/options.cpp:842
+#: gui/options.cpp:826
msgid "Don't use General MIDI music"
msgstr "Anvфnd inte General MIDI-musik"
-#: gui/options.cpp:853 gui/options.cpp:915
+#: gui/options.cpp:837 gui/options.cpp:899
msgid "Use first available device"
msgstr "Anvфnd fіrsta tillgфngliga enhet"
-#: gui/options.cpp:865
+#: gui/options.cpp:849
msgid "SoundFont:"
msgstr "SoundFont:"
-#: gui/options.cpp:865 gui/options.cpp:867 gui/options.cpp:868
+#: gui/options.cpp:849 gui/options.cpp:851 gui/options.cpp:852
msgid "SoundFont is supported by some audio cards, Fluidsynth and Timidity"
msgstr "SoundFont stіds endast av vissa ljudkort, Fluidsynth och Timidity"
-#: gui/options.cpp:867
+#: gui/options.cpp:851
msgctxt "lowres"
msgid "SoundFont:"
msgstr "SoundFont:"
-#: gui/options.cpp:873
+#: gui/options.cpp:857
msgid "Mixed AdLib/MIDI mode"
msgstr "Blandat AdLib/MIDI-lфge"
-#: gui/options.cpp:873
+#: gui/options.cpp:857
msgid "Use both MIDI and AdLib sound generation"
msgstr "Anvфnd bхde MIDI och AdLib fіr ljudgeneration"
-#: gui/options.cpp:876
+#: gui/options.cpp:860
msgid "MIDI gain:"
msgstr "MIDI gain:"
-#: gui/options.cpp:886
+#: gui/options.cpp:870
msgid "MT-32 Device:"
msgstr "MT-32 enhet:"
-#: gui/options.cpp:886
+#: gui/options.cpp:870
msgid "Specifies default sound device for Roland MT-32/LAPC1/CM32l/CM64 output"
msgstr ""
"Bestфmmer standardenheten fіr Roland MT-32/LAPC1/CM32I/CM64-uppspelning"
-#: gui/options.cpp:891
+#: gui/options.cpp:875
msgid "True Roland MT-32 (disable GM emulation)"
msgstr "Фkta Roland MT-32 (inaktivera GM-emulation)"
-#: gui/options.cpp:891 gui/options.cpp:893
+#: gui/options.cpp:875 gui/options.cpp:877
msgid ""
"Check if you want to use your real hardware Roland-compatible sound device "
"connected to your computer"
@@ -735,193 +732,193 @@ msgstr ""
"Aktivera om du vill anvфnda din verkliga Roland-kompatibla och dator-"
"anslutna ljudenhet"
-#: gui/options.cpp:893
+#: gui/options.cpp:877
msgctxt "lowres"
msgid "True Roland MT-32 (no GM emulation)"
msgstr "Фkta Roland MT-32 (ingen GM-emulation)"
-#: gui/options.cpp:896
+#: gui/options.cpp:880
msgid "Enable Roland GS Mode"
msgstr "Aktivera Roland GS-lфge"
-#: gui/options.cpp:896
+#: gui/options.cpp:880
msgid "Turns off General MIDI mapping for games with Roland MT-32 soundtrack"
msgstr ""
"Stфnger av General MIDI-kartlфggning fіr spel med Roland MT-32 soundtrack"
-#: gui/options.cpp:905
+#: gui/options.cpp:889
msgid "Don't use Roland MT-32 music"
msgstr "Anvфnd inte Roland MT-32 musik"
-#: gui/options.cpp:932
+#: gui/options.cpp:916
msgid "Text and Speech:"
msgstr "Undertext och tal:"
-#: gui/options.cpp:936 gui/options.cpp:946
+#: gui/options.cpp:920 gui/options.cpp:930
msgid "Speech"
msgstr "Tal"
-#: gui/options.cpp:937 gui/options.cpp:947
+#: gui/options.cpp:921 gui/options.cpp:931
msgid "Subtitles"
msgstr "Undertexter"
-#: gui/options.cpp:938
+#: gui/options.cpp:922
msgid "Both"
msgstr "Bхda"
-#: gui/options.cpp:940
+#: gui/options.cpp:924
msgid "Subtitle speed:"
msgstr "Texthastighet:"
-#: gui/options.cpp:942
+#: gui/options.cpp:926
msgctxt "lowres"
msgid "Text and Speech:"
msgstr "Text och tal:"
-#: gui/options.cpp:946
+#: gui/options.cpp:930
msgid "Spch"
msgstr "Tal"
-#: gui/options.cpp:947
+#: gui/options.cpp:931
msgid "Subs"
msgstr "Text"
-#: gui/options.cpp:948
+#: gui/options.cpp:932
msgctxt "lowres"
msgid "Both"
msgstr "Bхda"
-#: gui/options.cpp:948
+#: gui/options.cpp:932
msgid "Show subtitles and play speech"
msgstr "Visa undertexter och spela upp tal"
-#: gui/options.cpp:950
+#: gui/options.cpp:934
msgctxt "lowres"
msgid "Subtitle speed:"
msgstr "Texthastighet:"
-#: gui/options.cpp:966
+#: gui/options.cpp:950
msgid "Music volume:"
msgstr "Musikvolym:"
-#: gui/options.cpp:968
+#: gui/options.cpp:952
msgctxt "lowres"
msgid "Music volume:"
msgstr "Musikvolym:"
-#: gui/options.cpp:975
+#: gui/options.cpp:959
msgid "Mute All"
msgstr "Ljud av"
-#: gui/options.cpp:978
+#: gui/options.cpp:962
msgid "SFX volume:"
msgstr "SFX-volym:"
-#: gui/options.cpp:978 gui/options.cpp:980 gui/options.cpp:981
+#: gui/options.cpp:962 gui/options.cpp:964 gui/options.cpp:965
msgid "Special sound effects volume"
msgstr "Volym fіr specialeffekter"
-#: gui/options.cpp:980
+#: gui/options.cpp:964
msgctxt "lowres"
msgid "SFX volume:"
msgstr "SFX-volym:"
-#: gui/options.cpp:988
+#: gui/options.cpp:972
msgid "Speech volume:"
msgstr "Talvolym:"
-#: gui/options.cpp:990
+#: gui/options.cpp:974
msgctxt "lowres"
msgid "Speech volume:"
msgstr "Talvolym:"
-#: gui/options.cpp:1156
+#: gui/options.cpp:1131
msgid "Theme Path:"
msgstr "Sіkv. tema:"
-#: gui/options.cpp:1158
+#: gui/options.cpp:1133
msgctxt "lowres"
msgid "Theme Path:"
msgstr "Sіkv. tema:"
-#: gui/options.cpp:1164 gui/options.cpp:1166 gui/options.cpp:1167
+#: gui/options.cpp:1139 gui/options.cpp:1141 gui/options.cpp:1142
msgid "Specifies path to additional data used by all games or ScummVM"
msgstr ""
"Bestфmmer sіkvфg till andra data som anvфnds av alla spel eller ScummVM"
-#: gui/options.cpp:1173
+#: gui/options.cpp:1148
msgid "Plugins Path:"
msgstr "Sіkv. tillфgg:"
-#: gui/options.cpp:1175
+#: gui/options.cpp:1150
msgctxt "lowres"
msgid "Plugins Path:"
msgstr "Sіkv. tillфgg:"
-#: gui/options.cpp:1184
+#: gui/options.cpp:1159
msgid "Misc"
msgstr "Diverse"
-#: gui/options.cpp:1186
+#: gui/options.cpp:1161
msgctxt "lowres"
msgid "Misc"
msgstr "Diverse"
-#: gui/options.cpp:1188
+#: gui/options.cpp:1163
msgid "Theme:"
msgstr "Tema:"
-#: gui/options.cpp:1192
+#: gui/options.cpp:1167
msgid "GUI Renderer:"
msgstr "GUI-rendering:"
-#: gui/options.cpp:1204
+#: gui/options.cpp:1179
msgid "Autosave:"
msgstr "Autospara:"
-#: gui/options.cpp:1206
+#: gui/options.cpp:1181
msgctxt "lowres"
msgid "Autosave:"
msgstr "Autospara:"
-#: gui/options.cpp:1214
+#: gui/options.cpp:1189
msgid "Keys"
msgstr "Tangenter"
-#: gui/options.cpp:1221
+#: gui/options.cpp:1196
msgid "GUI Language:"
msgstr "GUI-sprхk:"
-#: gui/options.cpp:1221
+#: gui/options.cpp:1196
msgid "Language of ScummVM GUI"
msgstr "Sprхk fіr ScummVM:s anvфndargrфnssnitt"
-#: gui/options.cpp:1372
+#: gui/options.cpp:1347
msgid "You have to restart ScummVM before your changes will take effect."
msgstr "Du mхste starta om ScummVM fіr att фndringarna ska fх effekt."
-#: gui/options.cpp:1385
+#: gui/options.cpp:1360
msgid "Select directory for savegames"
msgstr "Vфlj katalog fіr spardata"
-#: gui/options.cpp:1392
+#: gui/options.cpp:1367
msgid "The chosen directory cannot be written to. Please select another one."
msgstr ""
"Det gхr inte att skriva till den valda katalogen. Var god vфlj en annan."
-#: gui/options.cpp:1401
+#: gui/options.cpp:1376
msgid "Select directory for GUI themes"
msgstr "Vфlj katalog fіr GUI-teman"
-#: gui/options.cpp:1411
+#: gui/options.cpp:1386
msgid "Select directory for extra files"
msgstr "Vфlj katalog fіr extra filer"
-#: gui/options.cpp:1422
+#: gui/options.cpp:1397
msgid "Select directory for plugins"
msgstr "Vфlj katalog fіr tillфgg"
-#: gui/options.cpp:1475
+#: gui/options.cpp:1450
msgid ""
"The theme you selected does not support your current language. If you want "
"to use this theme you need to switch to another language first."
@@ -969,64 +966,64 @@ msgstr "Namnlіs spardata"
msgid "Select a Theme"
msgstr "Vфlj ett tema"
-#: gui/ThemeEngine.cpp:333
+#: gui/ThemeEngine.cpp:335
msgid "Disabled GFX"
msgstr "Inaktiverad GFX"
-#: gui/ThemeEngine.cpp:333
+#: gui/ThemeEngine.cpp:335
msgctxt "lowres"
msgid "Disabled GFX"
msgstr "Inaktiverad GFX"
-#: gui/ThemeEngine.cpp:334
+#: gui/ThemeEngine.cpp:336
msgid "Standard Renderer (16bpp)"
msgstr "Standard rendering (16 bpp)"
-#: gui/ThemeEngine.cpp:334
+#: gui/ThemeEngine.cpp:336
msgid "Standard (16bpp)"
msgstr "Standard (16 bpp)"
-#: gui/ThemeEngine.cpp:336
+#: gui/ThemeEngine.cpp:338
msgid "Antialiased Renderer (16bpp)"
msgstr "Antialiserad rendering (16 bpp)"
-#: gui/ThemeEngine.cpp:336
+#: gui/ThemeEngine.cpp:338
msgid "Antialiased (16bpp)"
msgstr "Antialiserad (16 bpp)"
-#: gui/widget.cpp:312 gui/widget.cpp:314 gui/widget.cpp:320 gui/widget.cpp:322
+#: gui/widget.cpp:322 gui/widget.cpp:324 gui/widget.cpp:330 gui/widget.cpp:332
msgid "Clear value"
msgstr "Tіm sіkfфltet"
-#: base/main.cpp:203
+#: base/main.cpp:209
#, c-format
msgid "Engine does not support debug level '%s'"
msgstr "Motorn stіder inte debug-nivх '%s'"
-#: base/main.cpp:275
+#: base/main.cpp:287
msgid "Menu"
msgstr "Meny"
-#: base/main.cpp:278 backends/platform/symbian/src/SymbianActions.cpp:45
+#: base/main.cpp:290 backends/platform/symbian/src/SymbianActions.cpp:45
#: backends/platform/wince/CEActionsPocket.cpp:45
#: backends/platform/wince/CEActionsSmartphone.cpp:46
msgid "Skip"
msgstr "Skippa"
-#: base/main.cpp:281 backends/platform/symbian/src/SymbianActions.cpp:50
+#: base/main.cpp:293 backends/platform/symbian/src/SymbianActions.cpp:50
#: backends/platform/wince/CEActionsPocket.cpp:42
msgid "Pause"
msgstr "Paus"
-#: base/main.cpp:284
+#: base/main.cpp:296
msgid "Skip line"
msgstr "Skippa rad"
-#: base/main.cpp:455
+#: base/main.cpp:467
msgid "Error running game:"
msgstr "Fel under kіrning av spel:"
-#: base/main.cpp:479
+#: base/main.cpp:491
msgid "Could not find any engine capable of running the selected game"
msgstr "Kunde inte hitta en motor kapabel till att kіra det valda spelet"
@@ -1094,17 +1091,17 @@ msgstr "Avbrutit av anvфndaren"
msgid "Unknown error"
msgstr "Okфnt fel"
-#: engines/advancedDetector.cpp:296
+#: engines/advancedDetector.cpp:324
#, c-format
msgid "The game in '%s' seems to be unknown."
msgstr "Spelet i '%s' verkar vara okфnt."
-#: engines/advancedDetector.cpp:297
+#: engines/advancedDetector.cpp:325
msgid "Please, report the following data to the ScummVM team along with name"
msgstr ""
"Var god rapportera fіljande data till ScummVM-teamet tillsammans med namnet"
-#: engines/advancedDetector.cpp:299
+#: engines/advancedDetector.cpp:327
msgid "of the game you tried to add and its version/language/etc.:"
msgstr "pх spelet du fіrsіkte lфgga till och dess version/sprхk/etc.:"
@@ -1141,13 +1138,14 @@ msgctxt "lowres"
msgid "~R~eturn to Launcher"
msgstr "Хte~r~vфnd till launcher"
-#: engines/dialogs.cpp:116 engines/cruise/menu.cpp:214
-#: engines/sci/engine/kfile.cpp:566
+#: engines/dialogs.cpp:116 engines/agi/saveload.cpp:805
+#: engines/cruise/menu.cpp:214 engines/sci/engine/kfile.cpp:567
msgid "Save game:"
msgstr "Spara spelet:"
-#: engines/dialogs.cpp:116 engines/scumm/dialogs.cpp:187
-#: engines/cruise/menu.cpp:214 engines/sci/engine/kfile.cpp:566
+#: engines/dialogs.cpp:116 engines/agi/saveload.cpp:805
+#: engines/scumm/dialogs.cpp:187 engines/cruise/menu.cpp:214
+#: engines/sci/engine/kfile.cpp:567
#: backends/platform/symbian/src/SymbianActions.cpp:44
#: backends/platform/wince/CEActionsPocket.cpp:43
#: backends/platform/wince/CEActionsPocket.cpp:267
@@ -1258,6 +1256,88 @@ msgstr ""
msgid "Start anyway"
msgstr "Starta фndх"
+#: engines/agi/detection.cpp:145 engines/dreamweb/detection.cpp:47
+#: engines/sci/detection.cpp:390
+msgid "Use original save/load screens"
+msgstr ""
+
+#: engines/agi/detection.cpp:146 engines/dreamweb/detection.cpp:48
+#: engines/sci/detection.cpp:391
+msgid "Use the original save/load screens, instead of the ScummVM ones"
+msgstr ""
+
+#: engines/agi/saveload.cpp:827 engines/sci/engine/kfile.cpp:674
+msgid "Restore game:"
+msgstr "Хterstфll spel:"
+
+#: engines/agi/saveload.cpp:827 engines/sci/engine/kfile.cpp:674
+msgid "Restore"
+msgstr "Хterstфll"
+
+#: engines/dreamweb/detection.cpp:57
+#, fuzzy
+msgid "Use bright palette mode"
+msgstr "жvre hіgra fіremхlet"
+
+#: engines/dreamweb/detection.cpp:58
+msgid "Display graphics using the game's bright palette"
+msgstr ""
+
+#: engines/sci/detection.cpp:370
+msgid "EGA undithering"
+msgstr "EGA anti-gitter"
+
+#: engines/sci/detection.cpp:371
+#, fuzzy
+msgid "Enable undithering in EGA games"
+msgstr "Aktiverar anti-gitter i EGA spel som stіder det"
+
+#: engines/sci/detection.cpp:380
+#, fuzzy
+msgid "Prefer digital sound effects"
+msgstr "Volym fіr specialeffekter"
+
+#: engines/sci/detection.cpp:381
+msgid "Prefer digital sound effects instead of synthesized ones"
+msgstr ""
+
+#: engines/sci/detection.cpp:400
+msgid "Use IMF/Yahama FB-01 for MIDI output"
+msgstr ""
+
+#: engines/sci/detection.cpp:401
+msgid ""
+"Use an IBM Music Feature card or a Yahama FB-01 FM synth module for MIDI "
+"output"
+msgstr ""
+
+#: engines/sci/detection.cpp:411
+msgid "Use CD audio"
+msgstr ""
+
+#: engines/sci/detection.cpp:412
+msgid "Use CD audio instead of in-game audio, if available"
+msgstr ""
+
+#: engines/sci/detection.cpp:422
+msgid "Use Windows cursors"
+msgstr ""
+
+#: engines/sci/detection.cpp:423
+msgid ""
+"Use the Windows cursors (smaller and monochrome) instead of the DOS ones"
+msgstr ""
+
+#: engines/sci/detection.cpp:433
+#, fuzzy
+msgid "Use silver cursors"
+msgstr "Vanlig pekare"
+
+#: engines/sci/detection.cpp:434
+msgid ""
+"Use the alternate set of silver cursors, instead of the normal golden ones"
+msgstr ""
+
#: engines/scumm/dialogs.cpp:175
#, c-format
msgid "Insert Disk %c and Press Button to Continue."
@@ -1915,7 +1995,7 @@ msgstr ""
"Stіd fіr Native MIDI krфver Roland-uppdateringen frхn LucasArts,\n"
"men %s saknas. Anvфnder AdLib istфllet."
-#: engines/scumm/scumm.cpp:2271 engines/agos/saveload.cpp:189
+#: engines/scumm/scumm.cpp:2271 engines/agos/saveload.cpp:202
#, c-format
msgid ""
"Failed to save game state to file:\n"
@@ -1926,7 +2006,7 @@ msgstr ""
"\n"
"%s"
-#: engines/scumm/scumm.cpp:2278 engines/agos/saveload.cpp:154
+#: engines/scumm/scumm.cpp:2278 engines/agos/saveload.cpp:167
#, c-format
msgid ""
"Failed to load game state from file:\n"
@@ -1937,7 +2017,7 @@ msgstr ""
"\n"
"%s"
-#: engines/scumm/scumm.cpp:2290 engines/agos/saveload.cpp:197
+#: engines/scumm/scumm.cpp:2290 engines/agos/saveload.cpp:210
#, c-format
msgid ""
"Successfully saved game state in file:\n"
@@ -1984,14 +2064,6 @@ msgstr "Huvud~m~eny"
msgid "~W~ater Effect Enabled"
msgstr "~V~atteneffekt aktiverad"
-#: engines/sci/engine/kfile.cpp:673
-msgid "Restore game:"
-msgstr "Хterstфll spel:"
-
-#: engines/sci/engine/kfile.cpp:673
-msgid "Restore"
-msgstr "Хterstфll"
-
#: engines/agos/animation.cpp:550
#, c-format
msgid "Cutscene file '%s' not found!"
@@ -2014,6 +2086,66 @@ msgstr "Kunde inte radera filen."
msgid "Failed to save game"
msgstr "Kunde inte spara spelet."
+#. I18N: Studio audience adds an applause and cheering sounds whenever
+#. Malcolm makes a joke.
+#: engines/kyra/detection.cpp:62
+msgid "Studio audience"
+msgstr ""
+
+#: engines/kyra/detection.cpp:63
+msgid "Enable studio audience"
+msgstr ""
+
+#. I18N: This option allows the user to skip text and cutscenes.
+#: engines/kyra/detection.cpp:73
+msgid "Skip support"
+msgstr ""
+
+#: engines/kyra/detection.cpp:74
+msgid "Allow text and cutscenes to be skipped"
+msgstr ""
+
+#. I18N: Helium mode makes people sound like they've inhaled Helium.
+#: engines/kyra/detection.cpp:84
+msgid "Helium mode"
+msgstr ""
+
+#: engines/kyra/detection.cpp:85
+#, fuzzy
+msgid "Enable helium mode"
+msgstr "Aktivera Roland GS-lфge"
+
+#. I18N: When enabled, this option makes scrolling smoother when
+#. changing from one screen to another.
+#: engines/kyra/detection.cpp:99
+msgid "Smooth scrolling"
+msgstr ""
+
+#: engines/kyra/detection.cpp:100
+msgid "Enable smooth scrolling when walking"
+msgstr ""
+
+#. I18N: When enabled, this option changes the cursor when it floats to the
+#. edge of the screen to a directional arrow. The player can then click to
+#. walk towards that direction.
+#: engines/kyra/detection.cpp:112
+#, fuzzy
+msgid "Floating cursors"
+msgstr "Vanlig pekare"
+
+#: engines/kyra/detection.cpp:113
+msgid "Enable floating cursors"
+msgstr ""
+
+#. I18N: HP stands for Hit Points
+#: engines/kyra/detection.cpp:127
+msgid "HP bar graphs"
+msgstr ""
+
+#: engines/kyra/detection.cpp:128
+msgid "Enable hit point bar graphs"
+msgstr ""
+
#: engines/kyra/lol.cpp:478
msgid "Attack 1"
msgstr "Attack 1"
@@ -2076,6 +2208,14 @@ msgstr ""
"General MIDI instrument. Det kan trots allt hфnda\n"
"att ett fхtal ljudspхr inte spelas korrekt."
+#: engines/queen/queen.cpp:59 engines/sky/detection.cpp:44
+msgid "Floppy intro"
+msgstr ""
+
+#: engines/queen/queen.cpp:60 engines/sky/detection.cpp:45
+msgid "Use the floppy version's intro (CD version only)"
+msgstr ""
+
#: engines/sky/compact.cpp:130
msgid ""
"Unable to find \"sky.cpt\" file!\n"
@@ -2155,6 +2295,14 @@ msgid ""
"PSX cutscenes found but ScummVM has been built without RGB color support"
msgstr "DXA filmscener hittades men ScummVM har byggts utan stіd fіr zlib"
+#: engines/sword2/sword2.cpp:79
+msgid "Show object labels"
+msgstr ""
+
+#: engines/sword2/sword2.cpp:80
+msgid "Show labels for objects on mouse hover"
+msgstr ""
+
#: engines/parallaction/saveload.cpp:133
#, c-format
msgid ""
@@ -2391,19 +2539,19 @@ msgstr "Hіg ljudkvalitet (lхngsammare) (omstart)"
msgid "Disable power off"
msgstr "Inaktivera strіmsparning"
-#: backends/platform/iphone/osys_events.cpp:301
+#: backends/platform/iphone/osys_events.cpp:300
msgid "Mouse-click-and-drag mode enabled."
msgstr "Dra-och-slфpp-lфge med mus aktiverat."
-#: backends/platform/iphone/osys_events.cpp:303
+#: backends/platform/iphone/osys_events.cpp:302
msgid "Mouse-click-and-drag mode disabled."
msgstr "Dra-och-slфpp-lфge med mus deaktiverat."
-#: backends/platform/iphone/osys_events.cpp:314
+#: backends/platform/iphone/osys_events.cpp:313
msgid "Touchpad mode enabled."
msgstr "Touchpad-lфge aktiverat."
-#: backends/platform/iphone/osys_events.cpp:316
+#: backends/platform/iphone/osys_events.cpp:315
msgid "Touchpad mode disabled."
msgstr "Touchpad-lфge inaktiverat."
@@ -2480,15 +2628,15 @@ msgstr "Aktivt grafikfilter:"
msgid "Windowed mode"
msgstr "Fіnsterlфge"
-#: backends/graphics/opengl/opengl-graphics.cpp:130
+#: backends/graphics/opengl/opengl-graphics.cpp:135
msgid "OpenGL Normal"
msgstr "OpenGL normal"
-#: backends/graphics/opengl/opengl-graphics.cpp:131
+#: backends/graphics/opengl/opengl-graphics.cpp:136
msgid "OpenGL Conserve"
msgstr "OpenGL konservation"
-#: backends/graphics/opengl/opengl-graphics.cpp:132
+#: backends/graphics/opengl/opengl-graphics.cpp:137
msgid "OpenGL Original"
msgstr "OpenGL original"
diff --git a/po/uk_UA.po b/po/uk_UA.po
index 3971b29f6e..3d8ec456a6 100644
--- a/po/uk_UA.po
+++ b/po/uk_UA.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ScummVM 1.3.0svn\n"
"Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n"
-"POT-Creation-Date: 2012-03-07 22:09+0000\n"
+"POT-Creation-Date: 2012-05-20 22:39+0100\n"
"PO-Revision-Date: 2012-02-16 13:09+0200\n"
"Last-Translator: Eugene Sandulenko\n"
"Language-Team: Ukrainian\n"
@@ -45,7 +45,7 @@ msgid "Go up"
msgstr "Вгору"
#: gui/browser.cpp:69 gui/chooser.cpp:45 gui/KeysDialog.cpp:43
-#: gui/launcher.cpp:320 gui/massadd.cpp:94 gui/options.cpp:1253
+#: gui/launcher.cpp:345 gui/massadd.cpp:94 gui/options.cpp:1228
#: gui/saveload.cpp:63 gui/saveload.cpp:155 gui/themebrowser.cpp:54
#: engines/engine.cpp:442 engines/scumm/dialogs.cpp:190
#: engines/sword1/control.cpp:865 engines/parallaction/saveload.cpp:281
@@ -70,15 +70,15 @@ msgstr "Закрити"
msgid "Mouse click"
msgstr "Клік мишкою"
-#: gui/gui-manager.cpp:122 base/main.cpp:288
+#: gui/gui-manager.cpp:122 base/main.cpp:300
msgid "Display keyboard"
msgstr "Показати клавіатуру"
-#: gui/gui-manager.cpp:126 base/main.cpp:292
+#: gui/gui-manager.cpp:126 base/main.cpp:304
msgid "Remap keys"
msgstr "Перепризначити клавіші"
-#: gui/gui-manager.cpp:129 base/main.cpp:295
+#: gui/gui-manager.cpp:129 base/main.cpp:307
msgid "Toggle FullScreen"
msgstr "Перемкнути повноекранний режим"
@@ -90,8 +90,8 @@ msgstr "Виберіть дію для призначення"
msgid "Map"
msgstr "Призначити"
-#: gui/KeysDialog.cpp:42 gui/launcher.cpp:321 gui/launcher.cpp:960
-#: gui/launcher.cpp:964 gui/massadd.cpp:91 gui/options.cpp:1254
+#: gui/KeysDialog.cpp:42 gui/launcher.cpp:346 gui/launcher.cpp:1001
+#: gui/launcher.cpp:1005 gui/massadd.cpp:91 gui/options.cpp:1229
#: engines/engine.cpp:361 engines/engine.cpp:372 engines/scumm/dialogs.cpp:192
#: engines/scumm/scumm.cpp:1775 engines/agos/animation.cpp:551
#: engines/groovie/script.cpp:420 engines/sky/compact.cpp:131
@@ -128,15 +128,15 @@ msgstr "Будь ласка, виберіть дію"
msgid "Press the key to associate"
msgstr "Натисніть клавішу для призначення"
-#: gui/launcher.cpp:170
+#: gui/launcher.cpp:187
msgid "Game"
msgstr "Гра"
-#: gui/launcher.cpp:174
+#: gui/launcher.cpp:191
msgid "ID:"
msgstr "ID:"
-#: gui/launcher.cpp:174 gui/launcher.cpp:176 gui/launcher.cpp:177
+#: gui/launcher.cpp:191 gui/launcher.cpp:193 gui/launcher.cpp:194
msgid ""
"Short game identifier used for referring to savegames and running the game "
"from the command line"
@@ -144,29 +144,29 @@ msgstr ""
"Короткий ідентифікатор, який використовується для назв збережених ігор і для "
"запуску з командної стрічки"
-#: gui/launcher.cpp:176
+#: gui/launcher.cpp:193
msgctxt "lowres"
msgid "ID:"
msgstr "ID:"
-#: gui/launcher.cpp:181
+#: gui/launcher.cpp:198
msgid "Name:"
msgstr "Назва:"
-#: gui/launcher.cpp:181 gui/launcher.cpp:183 gui/launcher.cpp:184
+#: gui/launcher.cpp:198 gui/launcher.cpp:200 gui/launcher.cpp:201
msgid "Full title of the game"
msgstr "Повна назва гри"
-#: gui/launcher.cpp:183
+#: gui/launcher.cpp:200
msgctxt "lowres"
msgid "Name:"
msgstr "Назва:"
-#: gui/launcher.cpp:187
+#: gui/launcher.cpp:204
msgid "Language:"
msgstr "Мова:"
-#: gui/launcher.cpp:187 gui/launcher.cpp:188
+#: gui/launcher.cpp:204 gui/launcher.cpp:205
msgid ""
"Language of the game. This will not turn your Spanish game version into "
"English"
@@ -174,280 +174,285 @@ msgstr ""
"Мова гри. Зміна цього налаштування не перетворить гру англійською на "
"українську"
-#: gui/launcher.cpp:189 gui/launcher.cpp:203 gui/options.cpp:80
-#: gui/options.cpp:745 gui/options.cpp:758 gui/options.cpp:1224
+#: gui/launcher.cpp:206 gui/launcher.cpp:220 gui/options.cpp:80
+#: gui/options.cpp:730 gui/options.cpp:743 gui/options.cpp:1199
#: audio/null.cpp:40
msgid "<default>"
msgstr "<за умовчанням>"
-#: gui/launcher.cpp:199
+#: gui/launcher.cpp:216
msgid "Platform:"
msgstr "Платформа:"
-#: gui/launcher.cpp:199 gui/launcher.cpp:201 gui/launcher.cpp:202
+#: gui/launcher.cpp:216 gui/launcher.cpp:218 gui/launcher.cpp:219
msgid "Platform the game was originally designed for"
msgstr "Платформа, для якої гру було розроблено початково"
-#: gui/launcher.cpp:201
+#: gui/launcher.cpp:218
msgctxt "lowres"
msgid "Platform:"
msgstr "Платформа:"
-#: gui/launcher.cpp:213 gui/options.cpp:1087 gui/options.cpp:1104
+#: gui/launcher.cpp:231
+#, fuzzy
+msgid "Engine"
+msgstr "Розглянути"
+
+#: gui/launcher.cpp:239 gui/options.cpp:1062 gui/options.cpp:1079
msgid "Graphics"
msgstr "Графіка"
-#: gui/launcher.cpp:213 gui/options.cpp:1087 gui/options.cpp:1104
+#: gui/launcher.cpp:239 gui/options.cpp:1062 gui/options.cpp:1079
msgid "GFX"
msgstr "Грф"
-#: gui/launcher.cpp:216
+#: gui/launcher.cpp:242
msgid "Override global graphic settings"
msgstr "Перекрити глобальні установки графіки"
-#: gui/launcher.cpp:218
+#: gui/launcher.cpp:244
msgctxt "lowres"
msgid "Override global graphic settings"
msgstr "Перекрити глобальні установки графіки"
-#: gui/launcher.cpp:225 gui/options.cpp:1110
+#: gui/launcher.cpp:251 gui/options.cpp:1085
msgid "Audio"
msgstr "Аудіо"
-#: gui/launcher.cpp:228
+#: gui/launcher.cpp:254
msgid "Override global audio settings"
msgstr "Перекрити глобальні установки аудіо"
-#: gui/launcher.cpp:230
+#: gui/launcher.cpp:256
msgctxt "lowres"
msgid "Override global audio settings"
msgstr "Перекрити глобальні установки аудіо"
-#: gui/launcher.cpp:239 gui/options.cpp:1115
+#: gui/launcher.cpp:265 gui/options.cpp:1090
msgid "Volume"
msgstr "Гучність"
-#: gui/launcher.cpp:241 gui/options.cpp:1117
+#: gui/launcher.cpp:267 gui/options.cpp:1092
msgctxt "lowres"
msgid "Volume"
msgstr "Гучн."
-#: gui/launcher.cpp:244
+#: gui/launcher.cpp:270
msgid "Override global volume settings"
msgstr "Перекрити глобальні установки гучності"
-#: gui/launcher.cpp:246
+#: gui/launcher.cpp:272
msgctxt "lowres"
msgid "Override global volume settings"
msgstr "Перекрити глобальні установки гучності"
-#: gui/launcher.cpp:254 gui/options.cpp:1125
+#: gui/launcher.cpp:280 gui/options.cpp:1100
msgid "MIDI"
msgstr "MIDI"
-#: gui/launcher.cpp:257
+#: gui/launcher.cpp:283
msgid "Override global MIDI settings"
msgstr "Перекрити глобальні установки MIDI"
-#: gui/launcher.cpp:259
+#: gui/launcher.cpp:285
msgctxt "lowres"
msgid "Override global MIDI settings"
msgstr "Перекрити глобальні установки MIDI"
-#: gui/launcher.cpp:268 gui/options.cpp:1131
+#: gui/launcher.cpp:294 gui/options.cpp:1106
msgid "MT-32"
msgstr "MT-32"
-#: gui/launcher.cpp:271
+#: gui/launcher.cpp:297
msgid "Override global MT-32 settings"
msgstr "Перекрити глобальні установки MT-32"
-#: gui/launcher.cpp:273
+#: gui/launcher.cpp:299
msgctxt "lowres"
msgid "Override global MT-32 settings"
msgstr "Перекрити глобальні установки MT-32"
-#: gui/launcher.cpp:282 gui/options.cpp:1138
+#: gui/launcher.cpp:308 gui/options.cpp:1113
msgid "Paths"
msgstr "Шляхи"
-#: gui/launcher.cpp:284 gui/options.cpp:1140
+#: gui/launcher.cpp:310 gui/options.cpp:1115
msgctxt "lowres"
msgid "Paths"
msgstr "Шляхи"
-#: gui/launcher.cpp:291
+#: gui/launcher.cpp:317
msgid "Game Path:"
msgstr "Шлях до гри:"
-#: gui/launcher.cpp:293
+#: gui/launcher.cpp:319
msgctxt "lowres"
msgid "Game Path:"
msgstr "Шлях до гри:"
-#: gui/launcher.cpp:298 gui/options.cpp:1164
+#: gui/launcher.cpp:324 gui/options.cpp:1139
msgid "Extra Path:"
msgstr "Додатк. шлях:"
-#: gui/launcher.cpp:298 gui/launcher.cpp:300 gui/launcher.cpp:301
+#: gui/launcher.cpp:324 gui/launcher.cpp:326 gui/launcher.cpp:327
msgid "Specifies path to additional data used the game"
msgstr "Вказує шлях до додаткових файлів даних для гри"
-#: gui/launcher.cpp:300 gui/options.cpp:1166
+#: gui/launcher.cpp:326 gui/options.cpp:1141
msgctxt "lowres"
msgid "Extra Path:"
msgstr "Дод. шлях:"
-#: gui/launcher.cpp:307 gui/options.cpp:1148
+#: gui/launcher.cpp:333 gui/options.cpp:1123
msgid "Save Path:"
msgstr "Шлях збер.:"
-#: gui/launcher.cpp:307 gui/launcher.cpp:309 gui/launcher.cpp:310
-#: gui/options.cpp:1148 gui/options.cpp:1150 gui/options.cpp:1151
+#: gui/launcher.cpp:333 gui/launcher.cpp:335 gui/launcher.cpp:336
+#: gui/options.cpp:1123 gui/options.cpp:1125 gui/options.cpp:1126
msgid "Specifies where your savegames are put"
msgstr "Вказує шлях до збережень гри"
-#: gui/launcher.cpp:309 gui/options.cpp:1150
+#: gui/launcher.cpp:335 gui/options.cpp:1125
msgctxt "lowres"
msgid "Save Path:"
msgstr "Шлях збер.:"
-#: gui/launcher.cpp:329 gui/launcher.cpp:416 gui/launcher.cpp:469
-#: gui/launcher.cpp:523 gui/options.cpp:1159 gui/options.cpp:1167
-#: gui/options.cpp:1176 gui/options.cpp:1283 gui/options.cpp:1289
-#: gui/options.cpp:1297 gui/options.cpp:1327 gui/options.cpp:1333
-#: gui/options.cpp:1340 gui/options.cpp:1433 gui/options.cpp:1436
-#: gui/options.cpp:1448
+#: gui/launcher.cpp:354 gui/launcher.cpp:453 gui/launcher.cpp:511
+#: gui/launcher.cpp:565 gui/options.cpp:1134 gui/options.cpp:1142
+#: gui/options.cpp:1151 gui/options.cpp:1258 gui/options.cpp:1264
+#: gui/options.cpp:1272 gui/options.cpp:1302 gui/options.cpp:1308
+#: gui/options.cpp:1315 gui/options.cpp:1408 gui/options.cpp:1411
+#: gui/options.cpp:1423
msgctxt "path"
msgid "None"
msgstr "Не завданий"
-#: gui/launcher.cpp:334 gui/launcher.cpp:422 gui/launcher.cpp:527
-#: gui/options.cpp:1277 gui/options.cpp:1321 gui/options.cpp:1439
+#: gui/launcher.cpp:359 gui/launcher.cpp:459 gui/launcher.cpp:569
+#: gui/options.cpp:1252 gui/options.cpp:1296 gui/options.cpp:1414
#: backends/platform/wii/options.cpp:56
msgid "Default"
msgstr "За умовчанням"
-#: gui/launcher.cpp:462 gui/options.cpp:1442
+#: gui/launcher.cpp:504 gui/options.cpp:1417
msgid "Select SoundFont"
msgstr "Виберіть SoundFont"
-#: gui/launcher.cpp:481 gui/launcher.cpp:636
+#: gui/launcher.cpp:523 gui/launcher.cpp:677
msgid "Select directory with game data"
msgstr "Виберіть папку з файлами гри"
-#: gui/launcher.cpp:499
+#: gui/launcher.cpp:541
msgid "Select additional game directory"
msgstr "Виберіть додаткову папку гри"
-#: gui/launcher.cpp:511
+#: gui/launcher.cpp:553
msgid "Select directory for saved games"
msgstr "Виберіть папку для збережень"
-#: gui/launcher.cpp:538
+#: gui/launcher.cpp:580
msgid "This game ID is already taken. Please choose another one."
msgstr "Цей ID гри вже використовується. Будь ласка, виберіть інший."
-#: gui/launcher.cpp:579 engines/dialogs.cpp:110
+#: gui/launcher.cpp:621 engines/dialogs.cpp:110
msgid "~Q~uit"
msgstr "~В~ихід"
-#: gui/launcher.cpp:579 backends/platform/sdl/macosx/appmenu_osx.mm:96
+#: gui/launcher.cpp:621 backends/platform/sdl/macosx/appmenu_osx.mm:96
msgid "Quit ScummVM"
msgstr "Вихід зі ScummVM"
-#: gui/launcher.cpp:580
+#: gui/launcher.cpp:622
msgid "A~b~out..."
msgstr "Про п~р~ограму..."
-#: gui/launcher.cpp:580 backends/platform/sdl/macosx/appmenu_osx.mm:70
+#: gui/launcher.cpp:622 backends/platform/sdl/macosx/appmenu_osx.mm:70
msgid "About ScummVM"
msgstr "Про ScummVM"
-#: gui/launcher.cpp:581
+#: gui/launcher.cpp:623
msgid "~O~ptions..."
msgstr "~Н~алаштування"
-#: gui/launcher.cpp:581
+#: gui/launcher.cpp:623
msgid "Change global ScummVM options"
msgstr "Змінити глобальні налаштування ScummVM"
-#: gui/launcher.cpp:583
+#: gui/launcher.cpp:625
msgid "~S~tart"
msgstr "З~а~пуск"
-#: gui/launcher.cpp:583
+#: gui/launcher.cpp:625
msgid "Start selected game"
msgstr "Запустити вибрану гру"
-#: gui/launcher.cpp:586
+#: gui/launcher.cpp:628
msgid "~L~oad..."
msgstr "~З~авантажити..."
-#: gui/launcher.cpp:586
+#: gui/launcher.cpp:628
msgid "Load savegame for selected game"
msgstr "Завантажити збереження для вибраної гри"
-#: gui/launcher.cpp:591 gui/launcher.cpp:1079
+#: gui/launcher.cpp:633 gui/launcher.cpp:1120
msgid "~A~dd Game..."
msgstr "~Д~одати гру..."
-#: gui/launcher.cpp:591 gui/launcher.cpp:598
+#: gui/launcher.cpp:633 gui/launcher.cpp:640
msgid "Hold Shift for Mass Add"
msgstr "Утримуйте клавішу Shift для того, щоб додати декілька ігор"
-#: gui/launcher.cpp:593
+#: gui/launcher.cpp:635
msgid "~E~dit Game..."
msgstr "Реда~г~увати гру"
-#: gui/launcher.cpp:593 gui/launcher.cpp:600
+#: gui/launcher.cpp:635 gui/launcher.cpp:642
msgid "Change game options"
msgstr "Змінити налаштування гри"
-#: gui/launcher.cpp:595
+#: gui/launcher.cpp:637
msgid "~R~emove Game"
msgstr "~В~идалити гру"
-#: gui/launcher.cpp:595 gui/launcher.cpp:602
+#: gui/launcher.cpp:637 gui/launcher.cpp:644
msgid "Remove game from the list. The game data files stay intact"
msgstr "Видалити гру зі списку. Не видаляє гру з жорсткого диску"
-#: gui/launcher.cpp:598 gui/launcher.cpp:1079
+#: gui/launcher.cpp:640 gui/launcher.cpp:1120
msgctxt "lowres"
msgid "~A~dd Game..."
msgstr "~Д~одати гру..."
-#: gui/launcher.cpp:600
+#: gui/launcher.cpp:642
msgctxt "lowres"
msgid "~E~dit Game..."
msgstr "Реда~г~. гру..."
-#: gui/launcher.cpp:602
+#: gui/launcher.cpp:644
msgctxt "lowres"
msgid "~R~emove Game"
msgstr "~В~идалити гру"
-#: gui/launcher.cpp:610
+#: gui/launcher.cpp:652
msgid "Search in game list"
msgstr "Пошук у списку ігор"
-#: gui/launcher.cpp:614 gui/launcher.cpp:1126
+#: gui/launcher.cpp:656 gui/launcher.cpp:1167
msgid "Search:"
msgstr "Пошук:"
-#: gui/launcher.cpp:639 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255
+#: gui/launcher.cpp:680 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255
#: engines/mohawk/riven.cpp:716 engines/cruise/menu.cpp:216
msgid "Load game:"
msgstr "Завантажити гру:"
-#: gui/launcher.cpp:639 engines/dialogs.cpp:114 engines/scumm/dialogs.cpp:188
+#: gui/launcher.cpp:680 engines/dialogs.cpp:114 engines/scumm/dialogs.cpp:188
#: engines/mohawk/myst.cpp:255 engines/mohawk/riven.cpp:716
#: engines/cruise/menu.cpp:216 backends/platform/wince/CEActionsPocket.cpp:267
#: backends/platform/wince/CEActionsSmartphone.cpp:231
msgid "Load"
msgstr "Завантажити"
-#: gui/launcher.cpp:747
+#: gui/launcher.cpp:788
msgid ""
"Do you really want to run the mass game detector? This could potentially add "
"a huge number of games."
@@ -455,7 +460,7 @@ msgstr ""
"Чи ви дійсно хочете запустити пошук усіх ігор? Це потенційно може додати "
"велику кількість ігор."
-#: gui/launcher.cpp:748 gui/launcher.cpp:896
+#: gui/launcher.cpp:789 gui/launcher.cpp:937
#: backends/events/symbiansdl/symbiansdl-events.cpp:184
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
@@ -463,7 +468,7 @@ msgstr ""
msgid "Yes"
msgstr "Так"
-#: gui/launcher.cpp:748 gui/launcher.cpp:896
+#: gui/launcher.cpp:789 gui/launcher.cpp:937
#: backends/events/symbiansdl/symbiansdl-events.cpp:184
#: backends/platform/wince/CEActionsPocket.cpp:326
#: backends/platform/wince/CEActionsSmartphone.cpp:287
@@ -471,36 +476,36 @@ msgstr "Так"
msgid "No"
msgstr "Ні"
-#: gui/launcher.cpp:796
+#: gui/launcher.cpp:837
msgid "ScummVM couldn't open the specified directory!"
msgstr "ScummVM не може відкрити вказану папку!"
-#: gui/launcher.cpp:808
+#: gui/launcher.cpp:849
msgid "ScummVM could not find any game in the specified directory!"
msgstr "ScummVM не може знайти гру у вказаній папці!"
-#: gui/launcher.cpp:822
+#: gui/launcher.cpp:863
msgid "Pick the game:"
msgstr "Виберіть гру:"
-#: gui/launcher.cpp:896
+#: gui/launcher.cpp:937
msgid "Do you really want to remove this game configuration?"
msgstr "Ви дійсно хочете видалити установки для цієї гри?"
-#: gui/launcher.cpp:960
+#: gui/launcher.cpp:1001
msgid "This game does not support loading games from the launcher."
msgstr "Ця гра не підтримує завантаження збережень через головне меню."
-#: gui/launcher.cpp:964
+#: gui/launcher.cpp:1005
msgid "ScummVM could not find any engine capable of running the selected game!"
msgstr "ScummVM не зміг знайти движок для запуску вибраної гри!"
-#: gui/launcher.cpp:1078
+#: gui/launcher.cpp:1119
msgctxt "lowres"
msgid "Mass Add..."
msgstr "Дод. багато..."
-#: gui/launcher.cpp:1078
+#: gui/launcher.cpp:1119
msgid "Mass Add..."
msgstr "Дод. багато..."
@@ -567,101 +572,93 @@ msgstr "44 кГц"
msgid "48 kHz"
msgstr "48 кГц"
-#: gui/options.cpp:257 gui/options.cpp:485 gui/options.cpp:586
-#: gui/options.cpp:659 gui/options.cpp:868
+#: gui/options.cpp:248 gui/options.cpp:474 gui/options.cpp:575
+#: gui/options.cpp:644 gui/options.cpp:852
msgctxt "soundfont"
msgid "None"
msgstr "Не заданий"
-#: gui/options.cpp:393
+#: gui/options.cpp:382
msgid "Failed to apply some of the graphic options changes:"
msgstr "Не вдалося застосувати деякі зі змін графічних налаштувань:"
-#: gui/options.cpp:405
+#: gui/options.cpp:394
msgid "the video mode could not be changed."
msgstr "не вдалося змінити графічний режим."
-#: gui/options.cpp:411
+#: gui/options.cpp:400
msgid "the fullscreen setting could not be changed"
msgstr "не вдалося змінити режим повного екрану"
-#: gui/options.cpp:417
+#: gui/options.cpp:406
msgid "the aspect ratio setting could not be changed"
msgstr "не вдалося змінити режим корекції співвідношення сторін"
-#: gui/options.cpp:742
+#: gui/options.cpp:727
msgid "Graphics mode:"
msgstr "Графічн. режим:"
-#: gui/options.cpp:756
+#: gui/options.cpp:741
msgid "Render mode:"
msgstr "Режим раструв.:"
-#: gui/options.cpp:756 gui/options.cpp:757
+#: gui/options.cpp:741 gui/options.cpp:742
msgid "Special dithering modes supported by some games"
msgstr "Спеціальні режими растрування, які підтримують деякі ігри"
-#: gui/options.cpp:768
+#: gui/options.cpp:753
#: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2248
#: backends/graphics/openglsdl/openglsdl-graphics.cpp:472
msgid "Fullscreen mode"
msgstr "Повноекранний режим"
-#: gui/options.cpp:771
+#: gui/options.cpp:756
msgid "Aspect ratio correction"
msgstr "Корекція співвідношення сторін"
-#: gui/options.cpp:771
+#: gui/options.cpp:756
msgid "Correct aspect ratio for 320x200 games"
msgstr "Коригувати співвідношення сторін для ігор з графікою 320x200"
-#: gui/options.cpp:772
-msgid "EGA undithering"
-msgstr "EGA без растрування"
-
-#: gui/options.cpp:772
-msgid "Enable undithering in EGA games that support it"
-msgstr "Вімкнути растрування в EGA іграх які це підтримують"
-
-#: gui/options.cpp:780
+#: gui/options.cpp:764
msgid "Preferred Device:"
msgstr "Уподобаний пристрій:"
-#: gui/options.cpp:780
+#: gui/options.cpp:764
msgid "Music Device:"
msgstr "Музич. пристрій:"
-#: gui/options.cpp:780 gui/options.cpp:782
+#: gui/options.cpp:764 gui/options.cpp:766
msgid "Specifies preferred sound device or sound card emulator"
msgstr "Вказує уподобаний звуковий пристрій або емулятор звукової карти"
-#: gui/options.cpp:780 gui/options.cpp:782 gui/options.cpp:783
+#: gui/options.cpp:764 gui/options.cpp:766 gui/options.cpp:767
msgid "Specifies output sound device or sound card emulator"
msgstr "Вказує вихідний звуковий пристрій або емулятор звукової карти"
-#: gui/options.cpp:782
+#: gui/options.cpp:766
msgctxt "lowres"
msgid "Preferred Dev.:"
msgstr "Уподоб. пристрій:"
-#: gui/options.cpp:782
+#: gui/options.cpp:766
msgctxt "lowres"
msgid "Music Device:"
msgstr "Музичний пристрій:"
-#: gui/options.cpp:809
+#: gui/options.cpp:793
msgid "AdLib emulator:"
msgstr "Емулятор AdLib:"
-#: gui/options.cpp:809 gui/options.cpp:810
+#: gui/options.cpp:793 gui/options.cpp:794
msgid "AdLib is used for music in many games"
msgstr "Звукова карта AdLib використовується багатьма іграми"
-#: gui/options.cpp:820
+#: gui/options.cpp:804
msgid "Output rate:"
msgstr "Вихідна частота:"
-#: gui/options.cpp:820 gui/options.cpp:821
+#: gui/options.cpp:804 gui/options.cpp:805
msgid ""
"Higher value specifies better sound quality but may be not supported by your "
"soundcard"
@@ -669,63 +666,63 @@ msgstr ""
"Великі значення задають кращу якість звуку, проте вони можуть не "
"підтримуватися вашою звуковою картою"
-#: gui/options.cpp:831
+#: gui/options.cpp:815
msgid "GM Device:"
msgstr "Пристрій GM:"
-#: gui/options.cpp:831
+#: gui/options.cpp:815
msgid "Specifies default sound device for General MIDI output"
msgstr "Вказує вихідний звуковий пристрій для General MIDI"
-#: gui/options.cpp:842
+#: gui/options.cpp:826
msgid "Don't use General MIDI music"
msgstr "Не використовувати музику General MIDI"
-#: gui/options.cpp:853 gui/options.cpp:915
+#: gui/options.cpp:837 gui/options.cpp:899
msgid "Use first available device"
msgstr "Використовувати перший наявний пристрій"
-#: gui/options.cpp:865
+#: gui/options.cpp:849
msgid "SoundFont:"
msgstr "SoundFont:"
-#: gui/options.cpp:865 gui/options.cpp:867 gui/options.cpp:868
+#: gui/options.cpp:849 gui/options.cpp:851 gui/options.cpp:852
msgid "SoundFont is supported by some audio cards, Fluidsynth and Timidity"
msgstr ""
"SoundFont підтримується деякими звуковими картами, Fluidsynth та Timidity"
-#: gui/options.cpp:867
+#: gui/options.cpp:851
msgctxt "lowres"
msgid "SoundFont:"
msgstr "SoundFont:"
-#: gui/options.cpp:873
+#: gui/options.cpp:857
msgid "Mixed AdLib/MIDI mode"
msgstr "Змішаний режим AdLib/MIDI"
-#: gui/options.cpp:873
+#: gui/options.cpp:857
msgid "Use both MIDI and AdLib sound generation"
msgstr "Використовувати і MIDI і AdLib для генерації звуку"
-#: gui/options.cpp:876
+#: gui/options.cpp:860
msgid "MIDI gain:"
msgstr "Посилення MIDI:"
-#: gui/options.cpp:886
+#: gui/options.cpp:870
msgid "MT-32 Device:"
msgstr "Пристрій MT-32:"
-#: gui/options.cpp:886
+#: gui/options.cpp:870
msgid "Specifies default sound device for Roland MT-32/LAPC1/CM32l/CM64 output"
msgstr ""
"Вказує звуковий пристрій за умовчанням для виводу на Roland MT-32/LAPC1/"
"CM32l/CM64"
-#: gui/options.cpp:891
+#: gui/options.cpp:875
msgid "True Roland MT-32 (disable GM emulation)"
msgstr "Справжній Roland MT-32 (вимкнути емуляцию GM)"
-#: gui/options.cpp:891 gui/options.cpp:893
+#: gui/options.cpp:875 gui/options.cpp:877
msgid ""
"Check if you want to use your real hardware Roland-compatible sound device "
"connected to your computer"
@@ -733,193 +730,193 @@ msgstr ""
"Відмітьте, якщо у вас підключено Roland-сумісний звуковий пристрій і ви "
"хочете його використовувати"
-#: gui/options.cpp:893
+#: gui/options.cpp:877
msgctxt "lowres"
msgid "True Roland MT-32 (no GM emulation)"
msgstr "Справжній Roland MT-32 (вимкнути емуляцию GM)"
-#: gui/options.cpp:896
+#: gui/options.cpp:880
msgid "Enable Roland GS Mode"
msgstr "Увімкнути режим Roland GS"
-#: gui/options.cpp:896
+#: gui/options.cpp:880
msgid "Turns off General MIDI mapping for games with Roland MT-32 soundtrack"
msgstr ""
"Вимикає мапінг General MIDI для ігор зі звуковою доріжкою для Roland MT-32"
-#: gui/options.cpp:905
+#: gui/options.cpp:889
msgid "Don't use Roland MT-32 music"
msgstr "Не використовувати Roland MT-32"
-#: gui/options.cpp:932
+#: gui/options.cpp:916
msgid "Text and Speech:"
msgstr "Текст і озвучка:"
-#: gui/options.cpp:936 gui/options.cpp:946
+#: gui/options.cpp:920 gui/options.cpp:930
msgid "Speech"
msgstr "Озвучка"
-#: gui/options.cpp:937 gui/options.cpp:947
+#: gui/options.cpp:921 gui/options.cpp:931
msgid "Subtitles"
msgstr "Субтитри"
-#: gui/options.cpp:938
+#: gui/options.cpp:922
msgid "Both"
msgstr "Все"
-#: gui/options.cpp:940
+#: gui/options.cpp:924
msgid "Subtitle speed:"
msgstr "Швид. субтитрів:"
-#: gui/options.cpp:942
+#: gui/options.cpp:926
msgctxt "lowres"
msgid "Text and Speech:"
msgstr "Текст і озвучка:"
-#: gui/options.cpp:946
+#: gui/options.cpp:930
msgid "Spch"
msgstr "Озв"
-#: gui/options.cpp:947
+#: gui/options.cpp:931
msgid "Subs"
msgstr "Суб"
-#: gui/options.cpp:948
+#: gui/options.cpp:932
msgctxt "lowres"
msgid "Both"
msgstr "Все"
-#: gui/options.cpp:948
+#: gui/options.cpp:932
msgid "Show subtitles and play speech"
msgstr "Показувати субтитри і відтворювати мову"
-#: gui/options.cpp:950
+#: gui/options.cpp:934
msgctxt "lowres"
msgid "Subtitle speed:"
msgstr "Швид. субтитрів:"
-#: gui/options.cpp:966
+#: gui/options.cpp:950
msgid "Music volume:"
msgstr "Гучність музики:"
-#: gui/options.cpp:968
+#: gui/options.cpp:952
msgctxt "lowres"
msgid "Music volume:"
msgstr "Гучність музики:"
-#: gui/options.cpp:975
+#: gui/options.cpp:959
msgid "Mute All"
msgstr "Вимкнути все"
-#: gui/options.cpp:978
+#: gui/options.cpp:962
msgid "SFX volume:"
msgstr "Гучність ефектів:"
-#: gui/options.cpp:978 gui/options.cpp:980 gui/options.cpp:981
+#: gui/options.cpp:962 gui/options.cpp:964 gui/options.cpp:965
msgid "Special sound effects volume"
msgstr "Гучність спеціальних звукових ефектів"
-#: gui/options.cpp:980
+#: gui/options.cpp:964
msgctxt "lowres"
msgid "SFX volume:"
msgstr "Гучн. ефектів:"
-#: gui/options.cpp:988
+#: gui/options.cpp:972
msgid "Speech volume:"
msgstr "Гучність озвучки:"
-#: gui/options.cpp:990
+#: gui/options.cpp:974
msgctxt "lowres"
msgid "Speech volume:"
msgstr "Гучн. озвучки:"
-#: gui/options.cpp:1156
+#: gui/options.cpp:1131
msgid "Theme Path:"
msgstr "Шлях до тем:"
-#: gui/options.cpp:1158
+#: gui/options.cpp:1133
msgctxt "lowres"
msgid "Theme Path:"
msgstr "Шлях до тем:"
-#: gui/options.cpp:1164 gui/options.cpp:1166 gui/options.cpp:1167
+#: gui/options.cpp:1139 gui/options.cpp:1141 gui/options.cpp:1142
msgid "Specifies path to additional data used by all games or ScummVM"
msgstr ""
"Вказує шлях до додаткових файлів даних, які використовуються усіма іграми "
"або ScummVM"
-#: gui/options.cpp:1173
+#: gui/options.cpp:1148
msgid "Plugins Path:"
msgstr "Шлях до втулків:"
-#: gui/options.cpp:1175
+#: gui/options.cpp:1150
msgctxt "lowres"
msgid "Plugins Path:"
msgstr "Шлях до втулків:"
-#: gui/options.cpp:1184
+#: gui/options.cpp:1159
msgid "Misc"
msgstr "Різне"
-#: gui/options.cpp:1186
+#: gui/options.cpp:1161
msgctxt "lowres"
msgid "Misc"
msgstr "Різне"
-#: gui/options.cpp:1188
+#: gui/options.cpp:1163
msgid "Theme:"
msgstr "Тема:"
-#: gui/options.cpp:1192
+#: gui/options.cpp:1167
msgid "GUI Renderer:"
msgstr "Растер. GUI:"
-#: gui/options.cpp:1204
+#: gui/options.cpp:1179
msgid "Autosave:"
msgstr "Автозбереження:"
-#: gui/options.cpp:1206
+#: gui/options.cpp:1181
msgctxt "lowres"
msgid "Autosave:"
msgstr "Автозбереж.:"
-#: gui/options.cpp:1214
+#: gui/options.cpp:1189
msgid "Keys"
msgstr "Клавіші"
-#: gui/options.cpp:1221
+#: gui/options.cpp:1196
msgid "GUI Language:"
msgstr "Мова інтерф.:"
-#: gui/options.cpp:1221
+#: gui/options.cpp:1196
msgid "Language of ScummVM GUI"
msgstr "Мова графічного інтерфейсу ScummVM"
-#: gui/options.cpp:1372
+#: gui/options.cpp:1347
msgid "You have to restart ScummVM before your changes will take effect."
msgstr "Ви повинні перезапустити ScummVM щоб застосувати зміни."
-#: gui/options.cpp:1385
+#: gui/options.cpp:1360
msgid "Select directory for savegames"
msgstr "Виберіть папку для збережень"
-#: gui/options.cpp:1392
+#: gui/options.cpp:1367
msgid "The chosen directory cannot be written to. Please select another one."
msgstr "Не можу писати у вибрану папку. Будь ласка, вкажіть іншу."
-#: gui/options.cpp:1401
+#: gui/options.cpp:1376
msgid "Select directory for GUI themes"
msgstr "Виберіть папку для тем GUI"
-#: gui/options.cpp:1411
+#: gui/options.cpp:1386
msgid "Select directory for extra files"
msgstr "Виберіть папку з додатковими файлами"
-#: gui/options.cpp:1422
+#: gui/options.cpp:1397
msgid "Select directory for plugins"
msgstr "Виберіть папку зі втулками"
-#: gui/options.cpp:1475
+#: gui/options.cpp:1450
msgid ""
"The theme you selected does not support your current language. If you want "
"to use this theme you need to switch to another language first."
@@ -967,64 +964,64 @@ msgstr "Збереження без імені"
msgid "Select a Theme"
msgstr "Виберіть тему"
-#: gui/ThemeEngine.cpp:333
+#: gui/ThemeEngine.cpp:335
msgid "Disabled GFX"
msgstr "Без графіки"
-#: gui/ThemeEngine.cpp:333
+#: gui/ThemeEngine.cpp:335
msgctxt "lowres"
msgid "Disabled GFX"
msgstr "Без графіки"
-#: gui/ThemeEngine.cpp:334
+#: gui/ThemeEngine.cpp:336
msgid "Standard Renderer (16bpp)"
msgstr "Стандартний растеризатор (16bpp)"
-#: gui/ThemeEngine.cpp:334
+#: gui/ThemeEngine.cpp:336
msgid "Standard (16bpp)"
msgstr "Стандартний растеризатор (16bpp)"
-#: gui/ThemeEngine.cpp:336
+#: gui/ThemeEngine.cpp:338
msgid "Antialiased Renderer (16bpp)"
msgstr "Растеризатор зі згладжуванням (16bpp)"
-#: gui/ThemeEngine.cpp:336
+#: gui/ThemeEngine.cpp:338
msgid "Antialiased (16bpp)"
msgstr "Растеризатор зі згладжуванням (16bpp)"
-#: gui/widget.cpp:312 gui/widget.cpp:314 gui/widget.cpp:320 gui/widget.cpp:322
+#: gui/widget.cpp:322 gui/widget.cpp:324 gui/widget.cpp:330 gui/widget.cpp:332
msgid "Clear value"
msgstr "Очистити значення"
-#: base/main.cpp:203
+#: base/main.cpp:209
#, c-format
msgid "Engine does not support debug level '%s'"
msgstr "Движок не підтримує рівень відладки '%s'"
-#: base/main.cpp:275
+#: base/main.cpp:287
msgid "Menu"
msgstr "Меню"
-#: base/main.cpp:278 backends/platform/symbian/src/SymbianActions.cpp:45
+#: base/main.cpp:290 backends/platform/symbian/src/SymbianActions.cpp:45
#: backends/platform/wince/CEActionsPocket.cpp:45
#: backends/platform/wince/CEActionsSmartphone.cpp:46
msgid "Skip"
msgstr "Пропустити"
-#: base/main.cpp:281 backends/platform/symbian/src/SymbianActions.cpp:50
+#: base/main.cpp:293 backends/platform/symbian/src/SymbianActions.cpp:50
#: backends/platform/wince/CEActionsPocket.cpp:42
msgid "Pause"
msgstr "Пауза"
-#: base/main.cpp:284
+#: base/main.cpp:296
msgid "Skip line"
msgstr "Пропустити рядок"
-#: base/main.cpp:455
+#: base/main.cpp:467
msgid "Error running game:"
msgstr "Помилка запуску гри:"
-#: base/main.cpp:479
+#: base/main.cpp:491
msgid "Could not find any engine capable of running the selected game"
msgstr "Не можу знайти движок для запуску вибраної гри"
@@ -1092,16 +1089,16 @@ msgstr "Відмінено користувачем"
msgid "Unknown error"
msgstr "Невідома помилка"
-#: engines/advancedDetector.cpp:296
+#: engines/advancedDetector.cpp:324
#, c-format
msgid "The game in '%s' seems to be unknown."
msgstr "Гра у '%s' невідома."
-#: engines/advancedDetector.cpp:297
+#: engines/advancedDetector.cpp:325
msgid "Please, report the following data to the ScummVM team along with name"
msgstr "Будь ласка, передайте нижченаведену інформацію команді ScummVM разом з"
-#: engines/advancedDetector.cpp:299
+#: engines/advancedDetector.cpp:327
msgid "of the game you tried to add and its version/language/etc.:"
msgstr "назвою гри, яку ви намагаєтесь додати, а також її версію/мову/та інше:"
@@ -1138,13 +1135,14 @@ msgctxt "lowres"
msgid "~R~eturn to Launcher"
msgstr "~П~овер.в головне меню"
-#: engines/dialogs.cpp:116 engines/cruise/menu.cpp:214
-#: engines/sci/engine/kfile.cpp:566
+#: engines/dialogs.cpp:116 engines/agi/saveload.cpp:805
+#: engines/cruise/menu.cpp:214 engines/sci/engine/kfile.cpp:567
msgid "Save game:"
msgstr "Зберегти гру: "
-#: engines/dialogs.cpp:116 engines/scumm/dialogs.cpp:187
-#: engines/cruise/menu.cpp:214 engines/sci/engine/kfile.cpp:566
+#: engines/dialogs.cpp:116 engines/agi/saveload.cpp:805
+#: engines/scumm/dialogs.cpp:187 engines/cruise/menu.cpp:214
+#: engines/sci/engine/kfile.cpp:567
#: backends/platform/symbian/src/SymbianActions.cpp:44
#: backends/platform/wince/CEActionsPocket.cpp:43
#: backends/platform/wince/CEActionsPocket.cpp:267
@@ -1255,6 +1253,88 @@ msgstr ""
msgid "Start anyway"
msgstr "Все одно запустити"
+#: engines/agi/detection.cpp:145 engines/dreamweb/detection.cpp:47
+#: engines/sci/detection.cpp:390
+msgid "Use original save/load screens"
+msgstr ""
+
+#: engines/agi/detection.cpp:146 engines/dreamweb/detection.cpp:48
+#: engines/sci/detection.cpp:391
+msgid "Use the original save/load screens, instead of the ScummVM ones"
+msgstr ""
+
+#: engines/agi/saveload.cpp:827 engines/sci/engine/kfile.cpp:674
+msgid "Restore game:"
+msgstr "Відновити гру:"
+
+#: engines/agi/saveload.cpp:827 engines/sci/engine/kfile.cpp:674
+msgid "Restore"
+msgstr "Відновити"
+
+#: engines/dreamweb/detection.cpp:57
+#, fuzzy
+msgid "Use bright palette mode"
+msgstr "Верхня справа річ"
+
+#: engines/dreamweb/detection.cpp:58
+msgid "Display graphics using the game's bright palette"
+msgstr ""
+
+#: engines/sci/detection.cpp:370
+msgid "EGA undithering"
+msgstr "EGA без растрування"
+
+#: engines/sci/detection.cpp:371
+#, fuzzy
+msgid "Enable undithering in EGA games"
+msgstr "Вімкнути растрування в EGA іграх які це підтримують"
+
+#: engines/sci/detection.cpp:380
+#, fuzzy
+msgid "Prefer digital sound effects"
+msgstr "Гучність спеціальних звукових ефектів"
+
+#: engines/sci/detection.cpp:381
+msgid "Prefer digital sound effects instead of synthesized ones"
+msgstr ""
+
+#: engines/sci/detection.cpp:400
+msgid "Use IMF/Yahama FB-01 for MIDI output"
+msgstr ""
+
+#: engines/sci/detection.cpp:401
+msgid ""
+"Use an IBM Music Feature card or a Yahama FB-01 FM synth module for MIDI "
+"output"
+msgstr ""
+
+#: engines/sci/detection.cpp:411
+msgid "Use CD audio"
+msgstr ""
+
+#: engines/sci/detection.cpp:412
+msgid "Use CD audio instead of in-game audio, if available"
+msgstr ""
+
+#: engines/sci/detection.cpp:422
+msgid "Use Windows cursors"
+msgstr ""
+
+#: engines/sci/detection.cpp:423
+msgid ""
+"Use the Windows cursors (smaller and monochrome) instead of the DOS ones"
+msgstr ""
+
+#: engines/sci/detection.cpp:433
+#, fuzzy
+msgid "Use silver cursors"
+msgstr "Звичайний курсор"
+
+#: engines/sci/detection.cpp:434
+msgid ""
+"Use the alternate set of silver cursors, instead of the normal golden ones"
+msgstr ""
+
#: engines/scumm/dialogs.cpp:175
#, c-format
msgid "Insert Disk %c and Press Button to Continue."
@@ -1911,7 +1991,7 @@ msgstr ""
"Режим \"рідного\" MIDI потребує поновлення Roland Upgrade від\n"
"LucasArts, проте %s відсутній. Перемикаюсь на AdLib."
-#: engines/scumm/scumm.cpp:2271 engines/agos/saveload.cpp:189
+#: engines/scumm/scumm.cpp:2271 engines/agos/saveload.cpp:202
#, c-format
msgid ""
"Failed to save game state to file:\n"
@@ -1922,7 +2002,7 @@ msgstr ""
"\n"
"%s"
-#: engines/scumm/scumm.cpp:2278 engines/agos/saveload.cpp:154
+#: engines/scumm/scumm.cpp:2278 engines/agos/saveload.cpp:167
#, c-format
msgid ""
"Failed to load game state from file:\n"
@@ -1933,7 +2013,7 @@ msgstr ""
"\n"
"%s"
-#: engines/scumm/scumm.cpp:2290 engines/agos/saveload.cpp:197
+#: engines/scumm/scumm.cpp:2290 engines/agos/saveload.cpp:210
#, c-format
msgid ""
"Successfully saved game state in file:\n"
@@ -1980,14 +2060,6 @@ msgstr "Головне меню"
msgid "~W~ater Effect Enabled"
msgstr "Ефекти води увімкнено"
-#: engines/sci/engine/kfile.cpp:673
-msgid "Restore game:"
-msgstr "Відновити гру:"
-
-#: engines/sci/engine/kfile.cpp:673
-msgid "Restore"
-msgstr "Відновити"
-
#: engines/agos/animation.cpp:550
#, c-format
msgid "Cutscene file '%s' not found!"
@@ -2010,6 +2082,66 @@ msgstr "Не вдалося видалити файл."
msgid "Failed to save game"
msgstr "Не вдалося записати гру"
+#. I18N: Studio audience adds an applause and cheering sounds whenever
+#. Malcolm makes a joke.
+#: engines/kyra/detection.cpp:62
+msgid "Studio audience"
+msgstr ""
+
+#: engines/kyra/detection.cpp:63
+msgid "Enable studio audience"
+msgstr ""
+
+#. I18N: This option allows the user to skip text and cutscenes.
+#: engines/kyra/detection.cpp:73
+msgid "Skip support"
+msgstr ""
+
+#: engines/kyra/detection.cpp:74
+msgid "Allow text and cutscenes to be skipped"
+msgstr ""
+
+#. I18N: Helium mode makes people sound like they've inhaled Helium.
+#: engines/kyra/detection.cpp:84
+msgid "Helium mode"
+msgstr ""
+
+#: engines/kyra/detection.cpp:85
+#, fuzzy
+msgid "Enable helium mode"
+msgstr "Увімкнути режим Roland GS"
+
+#. I18N: When enabled, this option makes scrolling smoother when
+#. changing from one screen to another.
+#: engines/kyra/detection.cpp:99
+msgid "Smooth scrolling"
+msgstr ""
+
+#: engines/kyra/detection.cpp:100
+msgid "Enable smooth scrolling when walking"
+msgstr ""
+
+#. I18N: When enabled, this option changes the cursor when it floats to the
+#. edge of the screen to a directional arrow. The player can then click to
+#. walk towards that direction.
+#: engines/kyra/detection.cpp:112
+#, fuzzy
+msgid "Floating cursors"
+msgstr "Звичайний курсор"
+
+#: engines/kyra/detection.cpp:113
+msgid "Enable floating cursors"
+msgstr ""
+
+#. I18N: HP stands for Hit Points
+#: engines/kyra/detection.cpp:127
+msgid "HP bar graphs"
+msgstr ""
+
+#: engines/kyra/detection.cpp:128
+msgid "Enable hit point bar graphs"
+msgstr ""
+
#: engines/kyra/lol.cpp:478
msgid "Attack 1"
msgstr "Атака 1"
@@ -2072,6 +2204,14 @@ msgstr ""
"MT32 на General MIDI. Але в результаті може\n"
"статися, що деякі треки будуть грати неправильно."
+#: engines/queen/queen.cpp:59 engines/sky/detection.cpp:44
+msgid "Floppy intro"
+msgstr ""
+
+#: engines/queen/queen.cpp:60 engines/sky/detection.cpp:45
+msgid "Use the floppy version's intro (CD version only)"
+msgstr ""
+
#: engines/sky/compact.cpp:130
msgid ""
"Unable to find \"sky.cpt\" file!\n"
@@ -2150,6 +2290,14 @@ msgid ""
"PSX cutscenes found but ScummVM has been built without RGB color support"
msgstr "Знайдено заставки DXA, але ScummVM був побудований без підтримки zlib"
+#: engines/sword2/sword2.cpp:79
+msgid "Show object labels"
+msgstr ""
+
+#: engines/sword2/sword2.cpp:80
+msgid "Show labels for objects on mouse hover"
+msgstr ""
+
#: engines/parallaction/saveload.cpp:133
#, c-format
msgid ""
@@ -2384,19 +2532,19 @@ msgstr "Висока якість звуку (повільніше) (ребут)"
msgid "Disable power off"
msgstr "Заборонити вимкнення"
-#: backends/platform/iphone/osys_events.cpp:301
+#: backends/platform/iphone/osys_events.cpp:300
msgid "Mouse-click-and-drag mode enabled."
msgstr "Режим миші клікнути-та-тягнути увімкнено."
-#: backends/platform/iphone/osys_events.cpp:303
+#: backends/platform/iphone/osys_events.cpp:302
msgid "Mouse-click-and-drag mode disabled."
msgstr "Режим миші клікнути-та-тягнути вимкнено."
-#: backends/platform/iphone/osys_events.cpp:314
+#: backends/platform/iphone/osys_events.cpp:313
msgid "Touchpad mode enabled."
msgstr "Режим тачпаду увімкнено."
-#: backends/platform/iphone/osys_events.cpp:316
+#: backends/platform/iphone/osys_events.cpp:315
msgid "Touchpad mode disabled."
msgstr "Режим тачпаду вимкнено."
@@ -2472,15 +2620,15 @@ msgstr "Поточний графічний фільтр:"
msgid "Windowed mode"
msgstr "Віконний режим"
-#: backends/graphics/opengl/opengl-graphics.cpp:130
+#: backends/graphics/opengl/opengl-graphics.cpp:135
msgid "OpenGL Normal"
msgstr "OpenGL нормальний"
-#: backends/graphics/opengl/opengl-graphics.cpp:131
+#: backends/graphics/opengl/opengl-graphics.cpp:136
msgid "OpenGL Conserve"
msgstr "OpenGL Збережений"
-#: backends/graphics/opengl/opengl-graphics.cpp:132
+#: backends/graphics/opengl/opengl-graphics.cpp:137
msgid "OpenGL Original"
msgstr "OpenGL Оригінальний"
diff --git a/video/avi_decoder.cpp b/video/avi_decoder.cpp
index 9685952304..28fa712d4f 100644
--- a/video/avi_decoder.cpp
+++ b/video/avi_decoder.cpp
@@ -305,11 +305,11 @@ void AviDecoder::close() {
reset();
}
-uint32 AviDecoder::getElapsedTime() const {
+uint32 AviDecoder::getTime() const {
if (_audStream)
return _mixer->getSoundElapsedTime(*_audHandle);
- return FixedRateVideoDecoder::getElapsedTime();
+ return FixedRateVideoDecoder::getTime();
}
const Graphics::Surface *AviDecoder::decodeNextFrame() {
diff --git a/video/avi_decoder.h b/video/avi_decoder.h
index 508760ec89..edd08c42a0 100644
--- a/video/avi_decoder.h
+++ b/video/avi_decoder.h
@@ -195,7 +195,7 @@ public:
uint16 getWidth() const { return _header.width; }
uint16 getHeight() const { return _header.height; }
uint32 getFrameCount() const { return _header.totalFrames; }
- uint32 getElapsedTime() const;
+ uint32 getTime() const;
const Graphics::Surface *decodeNextFrame();
Graphics::PixelFormat getPixelFormat() const;
const byte *getPalette() { _dirtyPalette = false; return _palette; }
diff --git a/video/bink_decoder.cpp b/video/bink_decoder.cpp
index 884ca69f17..4738c3c8c0 100644
--- a/video/bink_decoder.cpp
+++ b/video/bink_decoder.cpp
@@ -181,7 +181,7 @@ void BinkDecoder::close() {
_frames.clear();
}
-uint32 BinkDecoder::getElapsedTime() const {
+uint32 BinkDecoder::getTime() const {
if (_audioStream && g_system->getMixer()->isSoundHandleActive(_audioHandle))
return g_system->getMixer()->getSoundElapsedTime(_audioHandle) + _audioStartOffset;
diff --git a/video/bink_decoder.h b/video/bink_decoder.h
index 3d5e882dd7..f1eadc6f17 100644
--- a/video/bink_decoder.h
+++ b/video/bink_decoder.h
@@ -70,7 +70,7 @@ public:
uint16 getHeight() const { return _surface.h; }
Graphics::PixelFormat getPixelFormat() const { return _surface.format; }
uint32 getFrameCount() const { return _frames.size(); }
- uint32 getElapsedTime() const;
+ uint32 getTime() const;
const Graphics::Surface *decodeNextFrame();
// FixedRateVideoDecoder
diff --git a/video/psx_decoder.cpp b/video/psx_decoder.cpp
index 7c04b7f041..74f740f614 100644
--- a/video/psx_decoder.cpp
+++ b/video/psx_decoder.cpp
@@ -236,13 +236,13 @@ void PSXStreamDecoder::close() {
reset();
}
-uint32 PSXStreamDecoder::getElapsedTime() const {
+uint32 PSXStreamDecoder::getTime() const {
// TODO: Currently, the audio is always after the video so using this
// can often lead to gaps in the audio...
//if (_audStream)
// return _mixer->getSoundElapsedTime(_audHandle);
- return VideoDecoder::getElapsedTime();
+ return VideoDecoder::getTime();
}
uint32 PSXStreamDecoder::getTimeToNextFrame() const {
@@ -250,7 +250,7 @@ uint32 PSXStreamDecoder::getTimeToNextFrame() const {
return 0;
uint32 nextTimeMillis = _nextFrameStartTime.msecs();
- uint32 elapsedTime = getElapsedTime();
+ uint32 elapsedTime = getTime();
if (elapsedTime > nextTimeMillis)
return 0;
diff --git a/video/psx_decoder.h b/video/psx_decoder.h
index c8ad92c45a..3695cb0f42 100644
--- a/video/psx_decoder.h
+++ b/video/psx_decoder.h
@@ -75,7 +75,7 @@ public:
uint16 getWidth() const { return _surface->w; }
uint16 getHeight() const { return _surface->h; }
uint32 getFrameCount() const { return _frameCount; }
- uint32 getElapsedTime() const;
+ uint32 getTime() const;
uint32 getTimeToNextFrame() const;
const Graphics::Surface *decodeNextFrame();
Graphics::PixelFormat getPixelFormat() const { return _surface->format; }
diff --git a/video/qt_decoder.cpp b/video/qt_decoder.cpp
index 0d80c93a1f..585f5927a1 100644
--- a/video/qt_decoder.cpp
+++ b/video/qt_decoder.cpp
@@ -185,7 +185,7 @@ bool QuickTimeDecoder::endOfVideo() const {
return true;
}
-uint32 QuickTimeDecoder::getElapsedTime() const {
+uint32 QuickTimeDecoder::getTime() const {
// Try to base sync off an active audio track
for (uint32 i = 0; i < _audioHandles.size(); i++) {
if (g_system->getMixer()->isSoundHandleActive(_audioHandles[i])) {
@@ -196,7 +196,7 @@ uint32 QuickTimeDecoder::getElapsedTime() const {
}
// Just use time elapsed since the beginning
- return SeekableVideoDecoder::getElapsedTime();
+ return SeekableVideoDecoder::getTime();
}
uint32 QuickTimeDecoder::getTimeToNextFrame() const {
@@ -211,7 +211,7 @@ uint32 QuickTimeDecoder::getTimeToNextFrame() const {
// TODO: Add support for rate modification
- uint32 elapsedTime = getElapsedTime();
+ uint32 elapsedTime = getTime();
if (elapsedTime < nextFrameStartTime)
return nextFrameStartTime - elapsedTime;
@@ -406,7 +406,7 @@ void QuickTimeDecoder::freeAllTrackHandlers() {
_handlers.clear();
}
-void QuickTimeDecoder::seekToTime(Audio::Timestamp time) {
+void QuickTimeDecoder::seekToTime(const Audio::Timestamp &time) {
stopAudio();
_audioStartOffset = time;
diff --git a/video/qt_decoder.h b/video/qt_decoder.h
index 583b4b44b5..1f614df18b 100644
--- a/video/qt_decoder.h
+++ b/video/qt_decoder.h
@@ -106,13 +106,13 @@ public:
bool isVideoLoaded() const { return isOpen(); }
const Graphics::Surface *decodeNextFrame();
bool endOfVideo() const;
- uint32 getElapsedTime() const;
+ uint32 getTime() const;
uint32 getTimeToNextFrame() const;
Graphics::PixelFormat getPixelFormat() const;
// SeekableVideoDecoder API
void seekToFrame(uint32 frame);
- void seekToTime(Audio::Timestamp time);
+ void seekToTime(const Audio::Timestamp &time);
uint32 getDuration() const { return _duration * 1000 / _timeScale; }
protected:
diff --git a/video/smk_decoder.cpp b/video/smk_decoder.cpp
index 084028300d..439fe9027d 100644
--- a/video/smk_decoder.cpp
+++ b/video/smk_decoder.cpp
@@ -289,11 +289,11 @@ SmackerDecoder::~SmackerDecoder() {
close();
}
-uint32 SmackerDecoder::getElapsedTime() const {
+uint32 SmackerDecoder::getTime() const {
if (_audioStream && _audioStarted)
return _mixer->getSoundElapsedTime(_audioHandle);
- return FixedRateVideoDecoder::getElapsedTime();
+ return FixedRateVideoDecoder::getTime();
}
bool SmackerDecoder::loadStream(Common::SeekableReadStream *stream) {
diff --git a/video/smk_decoder.h b/video/smk_decoder.h
index 72cd32a222..fd5d658bdd 100644
--- a/video/smk_decoder.h
+++ b/video/smk_decoder.h
@@ -69,7 +69,7 @@ public:
uint16 getWidth() const { return _surface->w; }
uint16 getHeight() const { return _surface->h; }
uint32 getFrameCount() const { return _frameCount; }
- uint32 getElapsedTime() const;
+ uint32 getTime() const;
const Graphics::Surface *decodeNextFrame();
Graphics::PixelFormat getPixelFormat() const { return Graphics::PixelFormat::createFormatCLUT8(); }
const byte *getPalette() { _dirtyPalette = false; return _palette; }
diff --git a/video/video_decoder.cpp b/video/video_decoder.cpp
index e1122132a8..ae82a3374c 100644
--- a/video/video_decoder.cpp
+++ b/video/video_decoder.cpp
@@ -45,7 +45,7 @@ bool VideoDecoder::loadFile(const Common::String &filename) {
return loadStream(file);
}
-uint32 VideoDecoder::getElapsedTime() const {
+uint32 VideoDecoder::getTime() const {
return g_system->getMillis() - _startTime;
}
@@ -98,7 +98,7 @@ uint32 FixedRateVideoDecoder::getTimeToNextFrame() const {
if (endOfVideo() || _curFrame < 0)
return 0;
- uint32 elapsedTime = getElapsedTime();
+ uint32 elapsedTime = getTime();
uint32 nextFrameStartTime = getFrameBeginTime(_curFrame + 1);
// If the time that the next frame should be shown has past
diff --git a/video/video_decoder.h b/video/video_decoder.h
index 52ced4777c..2b99a2b1bf 100644
--- a/video/video_decoder.h
+++ b/video/video_decoder.h
@@ -125,15 +125,20 @@ public:
virtual uint32 getFrameCount() const = 0;
/**
- * Returns the time (in ms) that the video has been running.
- * This is based on the "wall clock" time as determined by
- * OSystem::getMillis, and takes pausing the video into account.
+ * Returns the time position (in ms) of the current video.
+ * This can be based on the "wall clock" time as determined by
+ * OSystem::getMillis() or the current time of any audio track
+ * running in the video, and takes pausing the video into account.
*
- * As such, it can differ from what multiplying getCurFrame() by
+ * As such, it will differ from what multiplying getCurFrame() by
* some constant would yield, e.g. for a video with non-constant
* frame rate.
+ *
+ * Due to the nature of the timing, this value may not always be
+ * completely accurate (since our mixer does not have precise
+ * timing).
*/
- virtual uint32 getElapsedTime() const;
+ virtual uint32 getTime() const;
/**
* Return the time (in ms) until the next frame should be displayed.
@@ -247,13 +252,8 @@ class SeekableVideoDecoder : public virtual RewindableVideoDecoder {
public:
/**
* Seek to the specified time.
- *
- * This will round to the previous frame showing. If the time would happen to
- * land while a frame is showing, this function will seek to the beginning of that
- * frame. In other words, there is *no* subframe accuracy. This may change in a
- * later revision of the API.
*/
- virtual void seekToTime(Audio::Timestamp time) = 0;
+ virtual void seekToTime(const Audio::Timestamp &time) = 0;
/**
* Seek to the specified time (in ms).